Merge branch 'master' into decomp_battle2

This commit is contained in:
DizzyEggg
2017-10-04 11:18:50 +02:00
297 changed files with 2056 additions and 2880 deletions
+1 -3
View File
@@ -744,9 +744,7 @@ gUnknown_02037621: @ 2037621
gUnknown_02037622: @ 2037622
.space 0x2
gUnknown_02037624: @ 2037624
.space 0xF0
.include "src/tileset_anims.o"
.include "src/palette.o"
.include "src/sound.o"