diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-12-22 18:58:56 -0500 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-12-22 18:58:56 -0500 |
| commit | 0cee36de656fb3c220b8f449fcb0183d54247826 (patch) | |
| tree | eacd2de208dd3caaf48f97809304fa9f3fe2eb66 /asm/contest_ai.s | |
| parent | bce1ed4a093cf0f846b00466dd0ea6fc669936e5 (diff) | |
| parent | aa13f45ebb79aed62171fbfe654d8b542fc9aa6c (diff) | |
Merge branch 'master' of https://github.com/pret/pokeruby into assert
Diffstat (limited to 'asm/contest_ai.s')
| -rw-r--r-- | asm/contest_ai.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/contest_ai.s b/asm/contest_ai.s index 5cf1e0b62..94347f2ad 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 |