Merge remote-tracking branch 'upstream/master'

This commit is contained in:
paul
2018-11-20 19:03:24 +01:00
26 changed files with 3705 additions and 4921 deletions
+2 -2
View File
@@ -12103,7 +12103,7 @@ sub_8124998: @ 8124998
bl sub_8058F78
lsls r0, 24
lsrs r0, 24
bl sub_8059CC8
bl MetatileBehavior_IsSemiDeepWater
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -12166,7 +12166,7 @@ _08124A24:
bl sub_8058F78
lsls r0, 24
lsrs r0, 24
bl sub_8059CC8
bl MetatileBehavior_IsSemiDeepWater
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1