diff options
| author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2017-12-22 17:58:40 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-22 17:58:40 -0600 |
| commit | aa13f45ebb79aed62171fbfe654d8b542fc9aa6c (patch) | |
| tree | 89d4bc15a468733180a0d76041f73ee5364e5d89 /asm/contest_ai.s | |
| parent | 62bdd4d480ced306b85791c828ee8497e9fa2acc (diff) | |
| parent | 7bf8a1c67fb373854673e870b15ba5170e7b0243 (diff) | |
Merge pull request #490 from camthesaxman/decompile_contest
decompile contest.s
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 |