Merge branch 'master' into quest_log

This commit is contained in:
PikalaxALT
2018-11-21 09:00:41 -05:00
44 changed files with 5266 additions and 6718 deletions
+2 -2
View File
@@ -12103,7 +12103,7 @@ sub_8124998: @ 8124998
bl MapGridGetMetatileBehaviorAt
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 MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl sub_8059CC8
bl MetatileBehavior_IsSemiDeepWater
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1