diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-11-21 21:25:48 -0500 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-11-21 21:25:48 -0500 |
| commit | adba0bacfccd15540f853dfd714ab8c91767e9c6 (patch) | |
| tree | 9965f9c76e18bbab55474f1ae071d40ad3616c38 /asm/field_control_avatar.s | |
| parent | 161a37809bab3ab646c503a63d9ef258d9d518af (diff) | |
| parent | 1e4f12e6fa9e3b22d4f1a60ca69313b5dec0ca38 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into load_save
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 |