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

This commit is contained in:
golem galvanize
2018-02-08 16:03:53 -05:00
125 changed files with 39599 additions and 33959 deletions

View File

@@ -247,8 +247,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);
src/item_menu.o(.text);
asm/list_menu.o(.text);
@@ -384,6 +383,8 @@ SECTIONS {
src/battle_controller_opponent.o(.rodata);
src/battle_controller_link_opponent.o(.rodata);
data/data2c.o(.rodata);
src/pokemon_1.o(.rodata);
data/data2e.o(.rodata);
src/trig.o(.rodata);
src/util.o(.rodata);
src/daycare.o(.rodata);
@@ -423,7 +424,7 @@ SECTIONS {
src/battle_setup.o(.rodata);
data/cable_club.o(.rodata);
src/trainer_see.o(.rodata);
data/wild_encounter.o(.rodata);
src/wild_encounter.o(.rodata);
data/field_effect.o(.rodata);
src/option_menu.o(.rodata);
src/pokedex.o(.rodata);
@@ -519,7 +520,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);