Merge remote-tracking branch 'EternalCode/master'

2018-01-01 16:31:35 -06:00
parent ad277a69dd d8c329b888
commit 4f726232b8
3 changed files with 57 additions and 85 deletions
@@ -237,7 +237,7 @@ SECTIONS {
        asm/intro_credits_graphics.o(.text);
        src/evolution_graphics.o(.text);
        src/bard_music.o(.text);
-        asm/fldeff_teleport.o(.text);
+        src/fldeff_teleport.o(.text);
        asm/battle_link_817C95C.o(.text);
        asm/pokemon_animation.o(.text);
        src/recorded_battle.o(.text);