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
+1 -1
View File
@@ -801,7 +801,7 @@ sub_815A540: @ 815A540
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl sub_8059CA4
bl MetatileBehavior_IsSurfable
lsls r0, 24
cmp r0, 0
bne _0815A5A4