diff options
Diffstat (limited to 'asm/contest_link_80C2020.s')
| -rw-r--r-- | asm/contest_link_80C2020.s | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/asm/contest_link_80C2020.s b/asm/contest_link_80C2020.s index 2f281593c..5390a8765 100644 --- a/asm/contest_link_80C2020.s +++ b/asm/contest_link_80C2020.s @@ -1713,7 +1713,7 @@ sub_80C2E14: @ 80C2E14 bl sub_80BE284 movs r0, 0x2 bl sub_810FB10 - ldr r0, _080C2E88 @ =gScriptContestRank + ldr r0, _080C2E88 @ =gSpecialVar_ContestRank ldrb r0, [r0] bl sub_80B2A7C movs r0, 0xFE @@ -1750,7 +1750,7 @@ sub_80C2E14: @ 80C2E14 .align 2, 0 _080C2E80: .4byte gUnknown_02038690 _080C2E84: .4byte gContestPlayerMonIndex -_080C2E88: .4byte gScriptContestRank +_080C2E88: .4byte gSpecialVar_ContestRank _080C2E8C: .4byte gSharedMem _080C2E90: .4byte 0x00015ddf _080C2E94: .4byte 0x00015dde @@ -2971,7 +2971,7 @@ _080C3808: .4byte gIsLinkContest _080C380C: .4byte 0x0600e000 _080C3810: .4byte gUnknown_08E964B8 _080C3814: - ldr r0, _080C3830 @ =gScriptContestRank + ldr r0, _080C3830 @ =gSpecialVar_ContestRank ldrh r2, [r0] cmp r2, 0 bne _080C383C @@ -2986,7 +2986,7 @@ _080C3814: str r1, [sp, 0xC] b _080C3870 .align 2, 0 -_080C3830: .4byte gScriptContestRank +_080C3830: .4byte gSpecialVar_ContestRank _080C3834: .4byte 0x0600e000 _080C3838: .4byte gUnknown_08E964B8 _080C383C: @@ -3040,7 +3040,7 @@ _080C3884: bl sub_809D104 _080C389E: adds r4, 0xD - ldr r0, _080C38C8 @ =gScriptContestCategory + ldr r0, _080C38C8 @ =gSpecialVar_ContestCategory ldrh r0, [r0] cmp r0, 0 bne _080C38CC @@ -3058,7 +3058,7 @@ _080C389E: .align 2, 0 _080C38C0: .4byte 0x0600e000 _080C38C4: .4byte gUnknown_08E964B8 -_080C38C8: .4byte gScriptContestCategory +_080C38C8: .4byte gSpecialVar_ContestCategory _080C38CC: cmp r0, 0x1 bne _080C38EC @@ -4545,15 +4545,15 @@ sub_80C43F4: @ 80C43F4 adds r5, r0, 0 cmp r5, 0 beq _080C4422 - ldr r4, _080C4434 @ =gScriptContestCategory + ldr r4, _080C4434 @ =gSpecialVar_ContestCategory ldrb r0, [r4] - ldr r1, _080C4438 @ =gScriptContestRank + ldr r1, _080C4438 @ =gSpecialVar_ContestRank ldrb r1, [r1] bl sub_80AE398 ldrb r0, [r4] bl sub_80AE82C _080C4422: - ldr r0, _080C443C @ =gScriptResult + ldr r0, _080C443C @ =gSpecialVar_Result strh r5, [r0] pop {r4,r5} pop {r0} @@ -4561,9 +4561,9 @@ _080C4422: .align 2, 0 _080C442C: .4byte gUnknown_02038694 _080C4430: .4byte gPlayerParty -_080C4434: .4byte gScriptContestCategory -_080C4438: .4byte gScriptContestRank -_080C443C: .4byte gScriptResult +_080C4434: .4byte gSpecialVar_ContestCategory +_080C4438: .4byte gSpecialVar_ContestRank +_080C443C: .4byte gSpecialVar_Result thumb_func_end sub_80C43F4 thumb_func_start sub_80C4440 @@ -4576,7 +4576,7 @@ sub_80C4440: @ 80C4440 muls r1, r0 ldr r0, _080C4468 @ =gPlayerParty adds r2, r1, r0 - ldr r0, _080C446C @ =gScriptContestCategory + ldr r0, _080C446C @ =gSpecialVar_ContestCategory ldrh r0, [r0] cmp r0, 0x4 bhi _080C44B2 @@ -4588,7 +4588,7 @@ sub_80C4440: @ 80C4440 .align 2, 0 _080C4464: .4byte gUnknown_02038694 _080C4468: .4byte gPlayerParty -_080C446C: .4byte gScriptContestCategory +_080C446C: .4byte gSpecialVar_ContestCategory _080C4470: .4byte _080C4474 .align 2, 0 _080C4474: @@ -4618,7 +4618,7 @@ _080C44A0: movs r1, 0x36 _080C44A4: bl GetMonData - ldr r1, _080C44BC @ =gScriptContestRank + ldr r1, _080C44BC @ =gSpecialVar_ContestRank ldrh r1, [r1] cmp r0, r1 bls _080C44B2 @@ -4629,7 +4629,7 @@ _080C44B2: pop {r1} bx r1 .align 2, 0 -_080C44BC: .4byte gScriptContestRank +_080C44BC: .4byte gSpecialVar_ContestRank thumb_func_end sub_80C4440 thumb_func_start sub_80C44C0 @@ -4645,7 +4645,7 @@ sub_80C44C0: @ 80C44C0 beq _080C44D4 b _080C465E _080C44D4: - ldr r0, _080C44F0 @ =gScriptContestCategory + ldr r0, _080C44F0 @ =gSpecialVar_ContestCategory ldrh r0, [r0] cmp r0, 0x4 bls _080C44DE @@ -4659,7 +4659,7 @@ _080C44DE: .align 2, 0 _080C44E8: .4byte gUnknown_02038690 _080C44EC: .4byte gContestPlayerMonIndex -_080C44F0: .4byte gScriptContestCategory +_080C44F0: .4byte gSpecialVar_ContestCategory _080C44F4: .4byte _080C44F8 .align 2, 0 _080C44F8: @@ -4681,7 +4681,7 @@ _080C450C: lsrs r1, r0, 24 mov r0, sp strb r1, [r0] - ldr r0, _080C4550 @ =gScriptContestRank + ldr r0, _080C4550 @ =gSpecialVar_ContestRank ldrh r0, [r0] cmp r1, r0 bls _080C4530 @@ -4703,7 +4703,7 @@ _080C4538: .align 2, 0 _080C4548: .4byte gUnknown_02038694 _080C454C: .4byte gPlayerParty -_080C4550: .4byte gScriptContestRank +_080C4550: .4byte gSpecialVar_ContestRank _080C4554: mov r4, sp ldr r7, _080C458C @ =gUnknown_02038694 @@ -4717,7 +4717,7 @@ _080C4554: strb r0, [r4] mov r0, sp ldrb r2, [r0] - ldr r0, _080C4594 @ =gScriptContestRank + ldr r0, _080C4594 @ =gSpecialVar_ContestRank ldrh r0, [r0] cmp r2, r0 bhi _080C465E @@ -4734,7 +4734,7 @@ _080C4554: .align 2, 0 _080C458C: .4byte gUnknown_02038694 _080C4590: .4byte gPlayerParty -_080C4594: .4byte gScriptContestRank +_080C4594: .4byte gSpecialVar_ContestRank _080C4598: mov r4, sp ldr r7, _080C45D0 @ =gUnknown_02038694 @@ -4748,7 +4748,7 @@ _080C4598: strb r0, [r4] mov r0, sp ldrb r2, [r0] - ldr r0, _080C45D8 @ =gScriptContestRank + ldr r0, _080C45D8 @ =gSpecialVar_ContestRank ldrh r0, [r0] cmp r2, r0 bhi _080C465E @@ -4765,7 +4765,7 @@ _080C4598: .align 2, 0 _080C45D0: .4byte gUnknown_02038694 _080C45D4: .4byte gPlayerParty -_080C45D8: .4byte gScriptContestRank +_080C45D8: .4byte gSpecialVar_ContestRank _080C45DC: mov r4, sp ldr r7, _080C4618 @ =gUnknown_02038694 @@ -4779,7 +4779,7 @@ _080C45DC: strb r0, [r4] mov r0, sp ldrb r2, [r0] - ldr r0, _080C4620 @ =gScriptContestRank + ldr r0, _080C4620 @ =gSpecialVar_ContestRank ldrh r0, [r0] cmp r2, r0 bhi _080C465E @@ -4799,7 +4799,7 @@ _080C4610: .align 2, 0 _080C4618: .4byte gUnknown_02038694 _080C461C: .4byte gPlayerParty -_080C4620: .4byte gScriptContestRank +_080C4620: .4byte gSpecialVar_ContestRank _080C4624: mov r4, sp ldr r7, _080C4668 @ =gUnknown_02038694 @@ -4813,7 +4813,7 @@ _080C4624: strb r0, [r4] mov r0, sp ldrb r2, [r0] - ldr r0, _080C4670 @ =gScriptContestRank + ldr r0, _080C4670 @ =gSpecialVar_ContestRank ldrh r0, [r0] cmp r2, r0 bhi _080C465E @@ -4836,7 +4836,7 @@ _080C465E: .align 2, 0 _080C4668: .4byte gUnknown_02038694 _080C466C: .4byte gPlayerParty -_080C4670: .4byte gScriptContestRank +_080C4670: .4byte gSpecialVar_ContestRank thumb_func_end sub_80C44C0 thumb_func_start sub_80C4674 @@ -5432,7 +5432,7 @@ _080C4AB8: bl sub_80C4B34 ldr r1, _080C4AFC @ =gUnknown_0203869B strb r0, [r1] - ldr r0, _080C4B00 @ =gScriptContestCategory + ldr r0, _080C4B00 @ =gSpecialVar_ContestCategory ldrb r0, [r0] bl sub_80AE82C ldr r1, _080C4B04 @ =sub_80C8EBC @@ -5448,7 +5448,7 @@ _080C4AB8: .align 2, 0 _080C4AF8: .4byte gTasks + 0x8 _080C4AFC: .4byte gUnknown_0203869B -_080C4B00: .4byte gScriptContestCategory +_080C4B00: .4byte gSpecialVar_ContestCategory _080C4B04: .4byte sub_80C8EBC _080C4B08: .4byte sub_80C4B0C thumb_func_end sub_80C4A44 |