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

This commit is contained in:
golem galvanize
2018-12-18 20:23:32 -05:00
11 changed files with 6562 additions and 13009 deletions
+3 -2
View File
@@ -225,7 +225,8 @@ SECTIONS {
src/battle_anim_sound_tasks.o(.text);
src/battle_controller_safari.o(.text);
src/fldeff_sweetscent.o(.text);
asm/battle_anim_815A0D4.o(.text);
src/battle_anim_effects_3.o(.text);
asm/battle_anim_effects_3.o(.text);
src/learn_move.o(.text);
src/fldeff_softboiled.o(.text);
src/decoration_inventory.o(.text);
@@ -539,7 +540,7 @@ SECTIONS {
data/field_effect_helpers.o(.rodata);
src/contest_ai.o(.rodata);
src/battle_controller_safari.o(.rodata);
data/battle_anim_815A0D4.o(.rodata);
src/battle_anim_effects_3.o(.rodata);
src/learn_move.o(.rodata);
src/roamer.o(.rodata);
src/battle_tower.o(.rodata);