diff options
| author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-10-21 03:07:59 +0800 |
|---|---|---|
| committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-10-21 03:08:10 +0800 |
| commit | b0400ef6ba6e6cf49ad2bdc19a29eb2abef26701 (patch) | |
| tree | 60276257dd8cccfa1278bb0302cf948ae8ab79fa /asm/field_effect_helpers.s | |
| parent | e48725d9b54ed9f71f65c3ba5577cffa8f4887d1 (diff) | |
battle_setup funcs
Diffstat (limited to 'asm/field_effect_helpers.s')
| -rw-r--r-- | asm/field_effect_helpers.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/field_effect_helpers.s b/asm/field_effect_helpers.s index be79c3b21..7003a10f2 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 MetatileBehavior_ReturnFalse_7 + bl MetatileBehavior_GetBridgeType lsls r0, 24 lsrs r0, 24 cmp r0, 0 bne _080DAE96 ldrb r0, [r5, 0x1E] - bl MetatileBehavior_ReturnFalse_7 + bl MetatileBehavior_GetBridgeType lsls r0, 24 lsrs r0, 24 cmp r0, 0 @@ -1251,7 +1251,7 @@ _080DB6E8: cmp r0, 0 bne _080DB73C adds r0, r4, 0 - bl MetatileBehavior_ReturnFalse_3 + bl MetatileBehavior_IsLongGrass lsls r0, 24 cmp r0, 0 beq _080DB73C |