diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-08-16 22:53:01 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-08-16 22:53:01 +0200 |
| commit | 0bfe894566fe3c19c0f12342a273a40c5d6e12da (patch) | |
| tree | 37ef4a4f7be61b3bd70c2118dff9421140c67abe /asm/contest.s | |
| parent | ba225f8eaab5e46f7fc825adc6df833f3996b38d (diff) | |
| parent | 2b81db7acecd8baa3e343de66fd229040ec81381 (diff) | |
Merge with master
Diffstat (limited to 'asm/contest.s')
| -rw-r--r-- | asm/contest.s | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/asm/contest.s b/asm/contest.s index aec0becbb..b984a98b6 100644 --- a/asm/contest.s +++ b/asm/contest.s @@ -55,8 +55,8 @@ _080DB8D0: cmp r4, r0 beq _080DB8F4 adds r0, r4, 0 - bl sub_81562C4 - bl sub_8156324 + bl ContestAI_ResetAI + bl ContestAI_GetActionToUse lsls r0, 24 ldr r2, =gContestMons lsrs r0, 23 @@ -533,7 +533,7 @@ _080DBC3C: ldr r0, [r3, 0x4] adds r0, r4, r0 ldrh r0, [r0, 0x6] - bl sub_80DD9F0 + bl Contest_GetMoveExcitement ldr r1, [r5] ldr r2, [r1] ldrb r1, [r2, 0x1] @@ -3425,7 +3425,7 @@ _080DD334: ldr r0, [r0, 0x4] adds r0, r4, r0 ldrh r0, [r0, 0x6] - bl sub_80DD9F0 + bl Contest_GetMoveExcitement ldr r1, [r5] ldr r1, [r1, 0x10] strb r0, [r1] @@ -4213,8 +4213,8 @@ _080DD9C8: .pool thumb_func_end sub_80DD940 - thumb_func_start sub_80DD9F0 -sub_80DD9F0: @ 80DD9F0 + thumb_func_start Contest_GetMoveExcitement +Contest_GetMoveExcitement: @ 80DD9F0 lsls r0, 16 ldr r3, =gUnknown_085899EC ldr r1, =gContestMoves @@ -4233,7 +4233,7 @@ sub_80DD9F0: @ 80DD9F0 ldrsb r0, [r1, r0] bx lr .pool - thumb_func_end sub_80DD9F0 + thumb_func_end Contest_GetMoveExcitement thumb_func_start sub_80DDA20 sub_80DDA20: @ 80DDA20 |