Merge branch 'master' of https://github.com/pret/pokeemerald

ld_script.txt

@@ -57,7 +57,7 @@ SECTIONS {
         asm/link_rfu.o(.text);
         asm/rom_8011DC0.o(.text);
         src/rtc.o(.text);
-        asm/main_menu.o(.text);
+        src/main_menu.o(.text);
         src/battle_controllers.o(.text);
         src/decompress.o(.text);
         asm/rom_8034C54.o(.text);
@@ -371,7 +371,7 @@ SECTIONS {
         src/link_rfu.o(.rodata);
         data/rom_8011DC0.o(.rodata);
         src/rtc.o(.rodata);
-        data/main_menu.o(.rodata);
+        src/main_menu.o(.rodata);
         data/battle_1.o(.rodata);
         data/data2b.o(.rodata);
         src/battle_main.o(.rodata);