diff options
| author | itskobold <itskobold@users.noreply.github.com> | 2017-11-20 18:27:23 +0000 |
|---|---|---|
| committer | itskobold <itskobold@users.noreply.github.com> | 2017-11-20 18:27:23 +0000 |
| commit | caf952e02eb29f56a0c8b8571a6c5c4f8d0d2ef2 (patch) | |
| tree | f0592fc84aeb433b0fb59d9ceabd025b5589f83b /asm/field_control_avatar.s | |
| parent | 625be4bf04c9f14c4e1ee2e1ab74e7a5a7964a33 (diff) | |
| parent | 1e4f12e6fa9e3b22d4f1a60ca69313b5dec0ca38 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald
Diffstat (limited to 'asm/field_control_avatar.s')
| -rw-r--r-- | asm/field_control_avatar.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/field_control_avatar.s b/asm/field_control_avatar.s index b85c6de07..29164ed7b 100644 --- a/asm/field_control_avatar.s +++ b/asm/field_control_avatar.s @@ -1246,7 +1246,7 @@ sub_809C8DC: @ 809C8DC lsrs r0, 24 cmp r0, 0x1 beq _0809C92E - bl sub_80B5870 + bl UpdateRepelCounter lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -1607,7 +1607,7 @@ _0809CC0C: ldr r5, =gUnknown_020375D6 ldrh r1, [r5] adds r0, r4, 0 - bl is_it_battle_time_2 + bl StandardWildEncounter lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 |