Fix naming conflicts

2017-09-17 23:42:44 -04:00
parent 380858293e
commit 16f2e40576
5 changed files with 4 additions and 12 deletions
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -207,7 +207,7 @@ SECTIONS {
        asm/battle_controller_wally.o(.text);
        asm/player_pc.o(.text);
        asm/intro.o(.text);
-        src/rom_81700F8.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);