diff options
| author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-10-25 09:22:50 +0800 |
|---|---|---|
| committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-10-25 09:22:50 +0800 |
| commit | 2f87855072fb4fdca6ce22d60bfb1b7fdc000134 (patch) | |
| tree | a3a6d928910ed170904b5b367084afb2d1fb8b3d /asm/field_control_avatar.s | |
| parent | 6ca932e5e98fcd69c281d798406e53aee5a4d816 (diff) | |
| parent | 7579fc65c12bd46c045d10eb8cd9a2320fd1f3f0 (diff) | |
Merge branch 'master' into battle
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 a3333aacc..46587dc52 100644 --- a/asm/field_control_avatar.s +++ b/asm/field_control_avatar.s @@ -366,9 +366,9 @@ sub_806CAC8: @ 806CAC8 bl IncrementGameStat bl MENewsJisanStepCounter bl IncrementRenewableHiddenItemStepCounter - bl sub_80CC918 - bl sub_80CB054 - bl sub_80CCFBC + bl RunMassageCooldownStepCounter + bl IncrementResortGorgeousStepCounter + bl BirthIslandDeoxysStepCounter mov r0, sp adds r1, r4, 0 adds r2, r6, 0 |