diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-02-11 20:12:40 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-02-11 20:12:40 -0500 |
| commit | 590c4b500b9dd37d372a935865aa4df0ab0bf43c (patch) | |
| tree | 5572d76c91e106e74e1401076f130fb902f6b67b /asm/contest_effect.s | |
| parent | bc063b45d05716d1eab283f6d474bcdc601cafde (diff) | |
| parent | 14a76793e596d612efd273169c4172922c270f13 (diff) | |
Merge branch 'master' into record_mixing
Diffstat (limited to 'asm/contest_effect.s')
| -rw-r--r-- | asm/contest_effect.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/contest_effect.s b/asm/contest_effect.s index f3c234503..65a720a65 100644 --- a/asm/contest_effect.s +++ b/asm/contest_effect.s @@ -2590,7 +2590,7 @@ ContestEffectFunc_080E6778: @ 80E6778 adds r0, r3 ldrb r0, [r0, 0x1] lsls r0, 29 - ldr r1, =gScriptContestCategory + ldr r1, =gSpecialVar_ContestCategory lsrs r0, 29 ldrh r1, [r1] cmp r0, r1 |