Merge branch 'master' into field_map_obj

2017-09-18 19:21:34 -04:00
parent 25c7b4cd92 e23fb64dad
commit ee73040717
21 changed files with 6969 additions and 11534 deletions
@@ -58,7 +58,7 @@ SECTIONS {
        src/decompress.o(.text);
        asm/battle_1.o(.text);
        asm/battle_2.o(.text);
-        asm/battle_3.o(.text);
+        src/battle_3.o(.text);
        src/battle_4.o(.text);
        asm/battle_4.o(.text);
        asm/battle_5.o(.text);