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_effect_helpers.s
+9 -9
View File
@@ -134,13 +134,13 @@ npc_pal_op: @ 80DAE54
cmp r0, 0
bne _080DAEB0
ldrb r0, [r5, 0x1F]
bl sub_8059F5C
bl MetatileBehavior_ReturnFalse_7
lsls r0, 24
lsrs r0, 24
cmp r0, 0
bne _080DAE96
ldrb r0, [r5, 0x1E]
bl sub_8059F5C
bl MetatileBehavior_ReturnFalse_7
lsls r0, 24
lsrs r0, 24
cmp r0, 0
@@ -714,27 +714,27 @@ _080DB2AE:
cmp r0, r1
bne _080DB32C
ldrb r0, [r4, 0x1E]
bl sub_8059B44
bl MetatileBehavior_IsTallGrass
lsls r0, 24
cmp r0, 0
bne _080DB32C
ldrb r0, [r4, 0x1E]
bl sub_8059CA4
bl MetatileBehavior_IsSurfable
lsls r0, 24
cmp r0, 0
bne _080DB32C
ldrb r0, [r4, 0x1F]
bl sub_8059CA4
bl MetatileBehavior_IsSurfable
lsls r0, 24
cmp r0, 0
bne _080DB32C
ldrb r0, [r4, 0x1E]
bl sub_8059B90
bl MetatileBehavior_IsReflective
lsls r0, 24
cmp r0, 0
bne _080DB32C
ldrb r0, [r4, 0x1F]
bl sub_8059B90
bl MetatileBehavior_IsReflective
lsls r0, 24
cmp r0, 0
beq _080DB334
@@ -900,7 +900,7 @@ _080DB438:
cmp r0, 0
bne _080DB48C
adds r0, r6, 0
bl sub_8059F34
bl MetatileBehavior_IsTallGrass_2
lsls r0, 24
cmp r0, 0
beq _080DB48C
@@ -1251,7 +1251,7 @@ _080DB6E8:
cmp r0, 0
bne _080DB73C
adds r0, r4, 0
bl sub_8059F4C
bl MetatileBehavior_ReturnFalse_3
lsls r0, 24
cmp r0, 0
beq _080DB73C