diff options
| author | paul <nintendo6496@googlemail.com> | 2018-11-20 19:03:24 +0100 |
|---|---|---|
| committer | paul <nintendo6496@googlemail.com> | 2018-11-20 19:03:24 +0100 |
| commit | 284bbf91af43b0c9928865894cbc1d3001e57c16 (patch) | |
| tree | 99c33fee6cda995ceebc081a2d71b23ab025ffa2 /asm/field_effect_helpers.s | |
| parent | 4fc60e3f707b92e1c8912b851f0611fed4ab593a (diff) | |
| parent | 2ed26ab8fcd4e302ab4aac6bb01dba7b5c985914 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'asm/field_effect_helpers.s')
| -rw-r--r-- | asm/field_effect_helpers.s | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/asm/field_effect_helpers.s b/asm/field_effect_helpers.s index dfdc880fb..afddfa3fc 100644 --- a/asm/field_effect_helpers.s +++ b/asm/field_effect_helpers.s @@ -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 |