Merge branch 'master' into link

2019-10-06 18:06:24 -04:00
parent 5620b0ed1a fb9b695f9a
commit 736b89ae3d
46 changed files with 297 additions and 430 deletions
@@ -88,7 +88,7 @@ SECTIONS {
        src/load_save.o(.text);
        asm/trade.o(.text);
        src/play_time.o(.text);
-        asm/new_game.o(.text);
+        src/new_game.o(.text);
        asm/overworld.o(.text);
        src/fieldmap.o(.text);
        src/metatile_behavior.o(.text);