Merge branch 'master' into battle

This commit is contained in:
jiangzhengwenjz
2019-10-25 09:22:50 +08:00
136 changed files with 3963 additions and 6605 deletions
+1 -1
View File
@@ -785,7 +785,7 @@ gUnknown_83E0248:: @ 83E0248
.4byte gUnknown_841807D, NULL
.4byte gUnknown_841808E, NULL
.4byte gUnknown_841809C, NULL
.4byte gUnknown_8417929, NULL
.4byte gOtherText_Quit, NULL
gUnknown_83E0268:: @ 83E0268
.4byte gUnknown_8417DFE, NULL