diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-12-22 14:51:12 -0600 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-12-22 14:51:12 -0600 |
| commit | 9c9bcee1e2fbd3fd374023146f99d0417cd8ab52 (patch) | |
| tree | 848c1688fe743dd0410183b182024ee961f07980 /asm/contest_effect.s | |
| parent | ce74d72c31a3ebda26adc6ae888700213f64b113 (diff) | |
| parent | 62bdd4d480ced306b85791c828ee8497e9fa2acc (diff) | |
fix merge conflicts
Diffstat (limited to 'asm/contest_effect.s')
| -rw-r--r-- | asm/contest_effect.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/contest_effect.s b/asm/contest_effect.s index 2b339670b..d06789976 100644 --- a/asm/contest_effect.s +++ b/asm/contest_effect.s @@ -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 |