diff options
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/contest_ai.s | 6 | ||||
| -rw-r--r-- | asm/contest_effect.s | 2 | ||||
| -rw-r--r-- | asm/contest_link_80C2020.s | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/asm/contest_ai.s b/asm/contest_ai.s index d2061c84e..33862eb8c 100644 --- a/asm/contest_ai.s +++ b/asm/contest_ai.s @@ -1414,7 +1414,7 @@ ContestAICmd_get_move_excitement: @ 81292E4 adds r2, 0x1E adds r1, r2 ldrh r0, [r1] - bl contest_get_move_excitement + bl Contest_GetMoveExcitement lsls r0, 24 asrs r0, 24 strh r0, [r4, 0x18] @@ -3319,7 +3319,7 @@ ContestAICmd_check_can_participate: @ 812A0BC bl sub_8128A7C lsls r0, 24 lsrs r0, 24 - bl sub_80AF59C + bl Contest_IsMonsTurnDisabled lsls r0, 24 cmp r0, 0 beq _0812A0E4 @@ -5049,7 +5049,7 @@ _0812AD06: ldrh r0, [r1] cmp r0, 0 beq _0812AD30 - bl contest_get_move_excitement + bl Contest_GetMoveExcitement lsls r0, 24 asrs r0, 24 cmp r0, 0x1 diff --git a/asm/contest_effect.s b/asm/contest_effect.s index 4b21b780b..2b339670b 100644 --- a/asm/contest_effect.s +++ b/asm/contest_effect.s @@ -860,7 +860,7 @@ _080B8340: bne _080B836E lsls r0, r6, 24 lsrs r0, 24 - bl sub_80AF59C + bl Contest_IsMonsTurnDisabled lsls r0, 24 cmp r0, 0 bne _080B836E diff --git a/asm/contest_link_80C2020.s b/asm/contest_link_80C2020.s index 2f281593c..101f25cda 100644 --- a/asm/contest_link_80C2020.s +++ b/asm/contest_link_80C2020.s @@ -5125,12 +5125,12 @@ _080C4888: .4byte gStringVar1 thumb_func_start sub_80C488C sub_80C488C: @ 80C488C push {lr} - ldr r0, _080C4898 @ =sub_80AB47C + ldr r0, _080C4898 @ =CB2_StartContest bl SetMainCallback2 pop {r0} bx r0 .align 2, 0 -_080C4898: .4byte sub_80AB47C +_080C4898: .4byte CB2_StartContest thumb_func_end sub_80C488C thumb_func_start sub_80C489C @@ -5293,7 +5293,7 @@ sub_80C49C4: @ 80C49C4 lsrs r4, 24 ldr r0, _080C49E4 @ =gUnknown_02038694 ldrb r0, [r0] - bl sub_80AE098 + bl CreatePlayerContestMon ldr r1, _080C49E8 @ =sub_80C8734 ldr r2, _080C49EC @ =sub_80C49F0 adds r0, r4, 0 |