dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into quest_log

Browse Source
This commit is contained in:
PikalaxALT
2018-11-21 09:00:41 -05:00
parent 6bcabeab1e 2ed26ab8fc
commit 77d7434df2
44 changed files with 5266 additions and 6718 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/field_tasks.s
+2 -2
View File
@@ -481,7 +481,7 @@ _0806EB8E:
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
bl sub_8059F50
bl MetatileBehavior_ReturnFalse_4
lsls r0, 24
cmp r0, 0
beq _0806EBF6
@@ -633,7 +633,7 @@ _0806ECCE:
strh r0, [r5, 0x6]
lsls r0, r7, 24
lsrs r0, 24
bl sub_805A1D8
bl MetatileBehavior_ReturnFalse_13
lsls r0, 24
cmp r0, 0
beq _0806ED2E