Merge branch 'master' into quest_log

2018-10-17 10:53:16 -07:00
parent 0ba5268858 d05339979e
commit 46e006b94c
20 changed files with 354 additions and 873 deletions
@@ -86,7 +86,7 @@ SECTIONS {
        asm/battle_interface.o(.text);
        asm/smokescreen.o(.text);
        asm/pokeball.o(.text);
-        asm/load_save.o(.text);
+        src/load_save.o(.text);
        asm/trade.o(.text);
        asm/play_time.o(.text);
        asm/new_game.o(.text);