Merge branch 'learn_move' of git://github.com/Edwearth/pokeemerald into Edwearth-learn_move

2018-08-11 19:03:38 -07:00
parent 40cf61307b 2f96282c7f
commit a000eb4f36
6 changed files with 167 additions and 10 deletions
@@ -204,6 +204,7 @@ SECTIONS {
        src/battle_controller_safari.o(.text);
        src/fldeff_sweetscent.o(.text);
        asm/battle_anim_815A0D4.o(.text);
+        src/learn_move.o(.text);
        asm/learn_move.o(.text);
        src/fldeff_softboiled.o(.text);
        src/decoration_inventory.o(.text);
@@ -486,6 +487,7 @@ SECTIONS {
        src/battle_controller_safari.o(.rodata);
        data/battle_anim_815A0D4.o(.rodata);
        data/learn_move.o(.rodata);
+        src/learn_move.o(.rodata);
        src/roamer.o(.rodata);
        data/battle_tower.o(.rodata);
        src/use_pokeblock.o(.rodata);