diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-12-23 13:39:13 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-12-23 13:39:13 -0500 |
| commit | 73c16c109cdb996fa59f5aa63e9f030c21cbe54f (patch) | |
| tree | b0b4b7eefc77441d711105cf036b273f22ce2ec2 /asm/contest_effect.s | |
| parent | 56bf99fd9106b3cc8fac45cc051cbeeec40e34aa (diff) | |
| parent | aa13f45ebb79aed62171fbfe654d8b542fc9aa6c (diff) | |
Merge branch 'master' into slot_machine
Diffstat (limited to 'asm/contest_effect.s')
| -rw-r--r-- | asm/contest_effect.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/contest_effect.s b/asm/contest_effect.s index 4b21b780b..d06789976 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 @@ -2412,7 +2412,7 @@ ContestEffect_44: @ 80B8EBC adds r0, r3 ldrb r0, [r0, 0x1] lsls r0, 29 - ldr r1, _080B8EF8 @ =gScriptContestCategory + ldr r1, _080B8EF8 @ =gSpecialVar_ContestCategory lsrs r0, 29 ldrh r1, [r1] cmp r0, r1 @@ -2427,7 +2427,7 @@ _080B8EEA: .align 2, 0 _080B8EF0: .4byte gContestMoves _080B8EF4: .4byte gSharedMem + 0x192D0 -_080B8EF8: .4byte gScriptContestCategory +_080B8EF8: .4byte gSpecialVar_ContestCategory thumb_func_end ContestEffect_44 thumb_func_start ContestEffect_45 |