Merge branch 'master' into lilycove_lady

2017-09-20 20:17:31 -04:00
parent 25ffdf7342 d485f17784
commit 45d53d9242
10 changed files with 58 additions and 69 deletions
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -217,7 +217,7 @@ SECTIONS {
        asm/battle_controller_wally.o(.text);
        asm/player_pc.o(.text);
        asm/intro.o(.text);
-        asm/reset_save_heap.o(.text);
+        src/reset_save_heap.o(.text);
        asm/field_region_map.o(.text);
        asm/battle_anim_8170478.o(.text);
        asm/hall_of_fame.o(.text);