diff options
| author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-07-03 01:34:39 +0800 |
|---|---|---|
| committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-07-07 01:46:05 +0800 |
| commit | d97925df0edcac9212ba827b31ff75c7968703f3 (patch) | |
| tree | bcea1cbd328ae08e736a94a640dce6f90104633a /asm/field_control_avatar.s | |
| parent | 40a808351a5b76b0a536c5fac6c9479284468af8 (diff) | |
finished field_poison
Diffstat (limited to 'asm/field_control_avatar.s')
| -rw-r--r-- | asm/field_control_avatar.s | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/asm/field_control_avatar.s b/asm/field_control_avatar.s index b2f9e70bf..226f65fd7 100644 --- a/asm/field_control_avatar.s +++ b/asm/field_control_avatar.s @@ -1817,7 +1817,7 @@ _0806D6E0: .4byte gUnknown_203ADFA _0806D6E4: .4byte gPlayerAvatar _0806D6E8: .4byte gUnknown_81A8CED _0806D6EC: - bl overworld_poison_step + bl DoPoisonFieldEffect_step lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -1901,8 +1901,8 @@ _0806D780: .4byte 0x00004021 _0806D784: .4byte gPlayerParty thumb_func_end AdjustFriendship_step - thumb_func_start overworld_poison_timer_set -overworld_poison_timer_set: @ 806D788 + thumb_func_start DoPoisonFieldEffect_timer_set +DoPoisonFieldEffect_timer_set: @ 806D788 push {lr} ldr r0, _0806D798 @ =0x00004022 movs r1, 0 @@ -1911,10 +1911,10 @@ overworld_poison_timer_set: @ 806D788 bx r0 .align 2, 0 _0806D798: .4byte 0x00004022 - thumb_func_end overworld_poison_timer_set + thumb_func_end DoPoisonFieldEffect_timer_set - thumb_func_start overworld_poison_step -overworld_poison_step: @ 806D79C + thumb_func_start DoPoisonFieldEffect_step +DoPoisonFieldEffect_step: @ 806D79C push {r4,lr} ldr r0, _0806D7D8 @ =gMapHeader ldrb r0, [r0, 0x17] @@ -1933,7 +1933,7 @@ overworld_poison_step: @ 806D79C lsls r0, 16 cmp r0, 0 bne _0806D7E0 - bl overworld_poison + bl DoPoisonFieldEffect cmp r0, 0x1 beq _0806D7E0 cmp r0, 0x1 @@ -1951,7 +1951,7 @@ _0806D7E2: pop {r4} pop {r1} bx r1 - thumb_func_end overworld_poison_step + thumb_func_end DoPoisonFieldEffect_step thumb_func_start sub_806D7E8 sub_806D7E8: @ 806D7E8 |