diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-31 17:06:06 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2019-10-31 18:45:07 -0400 |
| commit | 079310c70baecd11bd72ab493ee012f483ea2bf9 (patch) | |
| tree | 3e08157597383fc414ac2523cc13e6eed0868334 /asm/field_control_avatar.s | |
| parent | b07b36c6d29fbfdb8e75e343870ae8e87e9308bd (diff) | |
Finish decomp of wild_encounter
Diffstat (limited to 'asm/field_control_avatar.s')
| -rw-r--r-- | asm/field_control_avatar.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/field_control_avatar.s b/asm/field_control_avatar.s index 46587dc52..dd84f75c1 100644 --- a/asm/field_control_avatar.s +++ b/asm/field_control_avatar.s @@ -1725,7 +1725,7 @@ sub_806D5E8: @ 806D5E8 lsls r0, 24 cmp r0, 0 bne _0806D658 - bl sub_80830B8 + bl UpdateRepelCounter lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -1956,7 +1956,7 @@ _0806D7E2: thumb_func_start RestartWildEncounterImmunitySteps RestartWildEncounterImmunitySteps: @ 806D7E8 push {lr} - bl sub_80832D4 + bl ResetEncounterRateModifiers pop {r0} bx r0 thumb_func_end RestartWildEncounterImmunitySteps @@ -1964,7 +1964,7 @@ RestartWildEncounterImmunitySteps: @ 806D7E8 thumb_func_start is_it_battle_time_3 is_it_battle_time_3: @ 806D7F4 push {lr} - bl sub_80833B0 + bl TryStandardWildEncounter lsls r0, 24 lsrs r0, 24 pop {r1} |