Merge branch 'decompile_frontier_2' of https://github.com/DizzyEggg/pokeemerald into factory-data

2018-09-09 15:51:13 +01:00
parent e1834c9d7b 6454740587
commit 1ba17e1666
74 changed files with 3838 additions and 10262 deletions
@@ -247,6 +247,7 @@ SECTIONS {
        src/battle_frontier_1.o(.text);
        asm/battle_frontier_1.o(.text);
        src/menu.o(.text);
+        src/battle_factory.o(.text);
        asm/battle_frontier_2.o(.text);
        src/item_menu.o(.text);
        src/list_menu.o(.text);
@@ -528,6 +529,7 @@ SECTIONS {
        src/battle_dome.o(.rodata);
        data/battle_frontier_1.o(.rodata);
        src/menu.o(.rodata);
+        src/battle_factory.o(.rodata);
        data/battle_frontier_2.o(.rodata);
        src/item_menu.o(.rodata);
        src/list_menu.o(.rodata);