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

2018-02-07 19:31:33 -05:00
parent 4a903279df 250538fcae
commit 03f8d0d6ce
60 changed files with 2730 additions and 6983 deletions
@@ -248,8 +248,7 @@ SECTIONS {
        src/battle_dome_cards.o(.text);
        src/lilycove_lady.o(.text);
        asm/battle_frontier_1.o(.text);
-        asm/new_menu_helpers.o(.text);
-        asm/menu.o(.text);
+        src/menu.o(.text);
        asm/battle_frontier_2.o(.text);
        asm/item_menu.o(.text);
        asm/list_menu.o(.text);
@@ -520,7 +519,7 @@ SECTIONS {
        src/battle_dome_cards.o(.rodata);
        src/lilycove_lady.o(.rodata);
        data/battle_frontier_1.o(.rodata);
-        data/new_menu_helpers.o(.rodata);
+        src/menu.o(.rodata);
        data/battle_frontier_2.o(.rodata);
        data/item_menu.o(.rodata);
        data/menu_indicators.o(.rodata);