diff options
author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-12-21 13:25:12 -0500 |
---|---|---|
committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-12-21 13:25:12 -0500 |
commit | 0f116854b2408ea7750e9c3f8da4d4ea2a3e0d38 (patch) | |
tree | 38bb9b6d56ea6c60be2087e9ff4e76b82c6a8d1b /asm/contest_effect.s | |
parent | 272cd213391b5ce87cb2aeac263b3eedb0f19a07 (diff) | |
parent | 85a8e5f1ded5a0a2354916617dd0b82091a42ee0 (diff) |
Merge branch 'master' of https://github.com/pret/pokeruby into assert
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 4b21b780b..1f7c7b109 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 |