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
@@ -1802,7 +1802,7 @@ _080D8120:
cmp r1, 0
beq _080D8134
mov r0, sp
bl sub_80E7460
bl CopyEReaderTrainerName5
mov r4, sp
b _080D8382
_080D8134: