Merge branch 'master' into battle_records

This commit is contained in:
PikalaxALT
2019-07-14 11:29:23 -04:00
48 changed files with 1191 additions and 3782 deletions
+1 -1
View File
@@ -8586,7 +8586,7 @@ _0811A168:
_0811A174:
cmp r5, 0
beq _0811A186
bl sub_81100E8
bl DestroyYesNoMenu
movs r0, 0
strb r0, [r4]
movs r0, 0x3