Merge branch 'master' into pok_jump

This commit is contained in:
DizzyEggg
2019-08-04 00:02:13 +02:00
44 changed files with 6484 additions and 12643 deletions
File diff suppressed because it is too large Load Diff
+1 -1
View File
@@ -943,7 +943,7 @@ sub_81CA0C8: @ 81CA0C8
lsls r2, r0, 3
subs r2, r0
lsls r2, 2
ldr r1, =gUnknown_08620244
ldr r1, =gUnknown_08620240+4
adds r0, r2, r1
subs r1, 0x4
adds r2, r1