Resolved merge conflicts in commits over the last month

Commit d2d5c09b renamed SECTION definitions in main.asm and wram.asm. This caused merge conflicts when applied to future commits. This was redone in the merge commit.

This replaces pull request #163.