diff options
| author | sceptillion <33798691+sceptillion@users.noreply.github.com> | 2017-12-17 03:12:04 -0800 |
|---|---|---|
| committer | sceptillion <33798691+sceptillion@users.noreply.github.com> | 2017-12-17 03:12:04 -0800 |
| commit | 3ff48ec8c890d95c5fbc467896414a018bf523ad (patch) | |
| tree | 3ca566fb4c60545bbd36c2851b00d8b644f612ba /asm/field_ground_effect.s | |
| parent | ae3ef7fec619413ae6a997f0dca4cb08fbd8e8c1 (diff) | |
import pokeemerald names again
Diffstat (limited to 'asm/field_ground_effect.s')
| -rw-r--r-- | asm/field_ground_effect.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/field_ground_effect.s b/asm/field_ground_effect.s index bdc089b8e..98c64a45a 100644 --- a/asm/field_ground_effect.s +++ b/asm/field_ground_effect.s @@ -486,12 +486,12 @@ GetGroundEffectFlags_HotSprings: @ 8067EBC adds r4, r0, 0 adds r5, r1, 0 ldrb r0, [r4, 0x1E] - bl sub_805A0F0 + bl MetatileBehavior_IsHotSprings lsls r0, 24 cmp r0, 0 beq _08067EFA ldrb r0, [r4, 0x1F] - bl sub_805A0F0 + bl MetatileBehavior_IsHotSprings lsls r0, 24 cmp r0, 0 beq _08067EFA @@ -755,7 +755,7 @@ GetReflectionTypeByMetatileBehavior: @ 80680C8 lsls r0, 24 lsrs r4, r0, 24 adds r0, r4, 0 - bl sub_8059BB4 + bl MetatileBehavior_IsIce lsls r0, 24 cmp r0, 0 beq _080680DE |