Merge branch 'master' into decomp_egg_hatch

This commit is contained in:
DizzyEggg
2017-09-18 23:50:08 +02:00
21 changed files with 6969 additions and 11534 deletions

View File

@@ -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);