diff options
Diffstat (limited to 'asm/contest.s')
| -rw-r--r-- | asm/contest.s | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/asm/contest.s b/asm/contest.s index 2f048fbc3..391dd3f43 100644 --- a/asm/contest.s +++ b/asm/contest.s @@ -6186,7 +6186,7 @@ _080AE48E: movs r0, 0x4 b _080AE50A _080AE49E: - ldr r0, _080AE4B0 @ =gScriptContestCategory + ldr r0, _080AE4B0 @ =gSpecialVar_ContestCategory ldrh r0, [r0] cmp r0, 0x4 bhi _080AE4F2 @@ -6196,7 +6196,7 @@ _080AE49E: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080AE4B0: .4byte gScriptContestCategory +_080AE4B0: .4byte gSpecialVar_ContestCategory _080AE4B4: .4byte _080AE4B8 .align 2, 0 _080AE4B8: @@ -6233,7 +6233,7 @@ _080AE4F2: movs r0, 0 b _080AE50A _080AE4F6: - ldr r0, _080AE510 @ =gScriptContestRank + ldr r0, _080AE510 @ =gSpecialVar_ContestRank adds r2, r1, 0 ldrh r1, [r0] movs r0, 0x2 @@ -6248,7 +6248,7 @@ _080AE50A: pop {r1} bx r1 .align 2, 0 -_080AE510: .4byte gScriptContestRank +_080AE510: .4byte gSpecialVar_ContestRank thumb_func_end sub_80AE47C thumb_func_start sub_80AE514 @@ -13238,7 +13238,7 @@ contest_get_move_excitement: @ 80B19FC ldrb r1, [r0, 0x1] lsls r1, 29 lsrs r1, 29 - ldr r0, _080B1A28 @ =gScriptContestCategory + ldr r0, _080B1A28 @ =gSpecialVar_ContestCategory ldrh r2, [r0] lsls r0, r2, 2 adds r0, r2 @@ -13250,7 +13250,7 @@ contest_get_move_excitement: @ 80B19FC .align 2, 0 _080B1A20: .4byte gContestExcitementTable _080B1A24: .4byte gContestMoves -_080B1A28: .4byte gScriptContestCategory +_080B1A28: .4byte gSpecialVar_ContestCategory thumb_func_end contest_get_move_excitement thumb_func_start sub_80B1A2C @@ -15400,7 +15400,7 @@ _080B2AB6: _080B2AC8: .4byte gUnknown_02038690 _080B2ACC: .4byte gContestPlayerMonIndex _080B2AD0: - ldr r0, _080B2AE4 @ =gScriptContestCategory + ldr r0, _080B2AE4 @ =gSpecialVar_ContestCategory ldrh r0, [r0] cmp r0, 0x4 bhi _080B2B16 @@ -15410,7 +15410,7 @@ _080B2AD0: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080B2AE4: .4byte gScriptContestCategory +_080B2AE4: .4byte gSpecialVar_ContestCategory _080B2AE8: .4byte _080B2AEC .align 2, 0 _080B2AEC: @@ -15491,7 +15491,7 @@ _080B2B16: mov r1, r9 cmp r1, 0xFF beq _080B2BB8 - ldr r0, _080B2BB0 @ =gScriptContestCategory + ldr r0, _080B2BB0 @ =gSpecialVar_ContestCategory ldrh r1, [r0] ldr r0, _080B2BB4 @ =0x00002e06 add r0, r8 @@ -15504,7 +15504,7 @@ _080B2BA0: .4byte gContestMons _080B2BA4: .4byte 0x00002e04 _080B2BA8: .4byte 0x00002e07 _080B2BAC: .4byte 0x00002e12 -_080B2BB0: .4byte gScriptContestCategory +_080B2BB0: .4byte gSpecialVar_ContestCategory _080B2BB4: .4byte 0x00002e06 _080B2BB8: ldr r0, _080B2BC0 @ =0x00002e06 @@ -15658,7 +15658,7 @@ _080B2CCA: .align 2, 0 _080B2CD0: .4byte gSaveBlock1 + 0x2DFC _080B2CD4: - ldr r0, _080B2CE8 @ =gScriptContestCategory + ldr r0, _080B2CE8 @ =gSpecialVar_ContestCategory ldrh r0, [r0] cmp r0, 0x4 bhi _080B2D14 @@ -15668,7 +15668,7 @@ _080B2CD4: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080B2CE8: .4byte gScriptContestCategory +_080B2CE8: .4byte gSpecialVar_ContestCategory _080B2CEC: .4byte _080B2CF0 .align 2, 0 _080B2CF0: |