Merge branch 'master' into battle

This commit is contained in:
jiangzhengwenjz
2019-08-25 06:58:56 +08:00
31 changed files with 8275 additions and 1631 deletions
+1 -2
View File
@@ -660,8 +660,7 @@ gUnknown_2037101: @ 2037101
gUnknown_2037104: @ 2037104
.space 0x4
gUnknown_2037108: @ 2037108
.space 0xF0
.include "src/tileset_anims.o"
gPlttBufferUnfaded: @ 20371F8
.space 0x400