diff options
author | Marcus Huderle <huderlem@gmail.com> | 2017-12-21 11:40:26 -0600 |
---|---|---|
committer | Marcus Huderle <huderlem@gmail.com> | 2017-12-21 11:40:37 -0600 |
commit | 754e911b4e95205bafa5dc93242da9cee3f2c5c6 (patch) | |
tree | e544ba9723182224bf99c4fc144654517037296e /asm-de | |
parent | a753c44277c050fb24aaf97a8947c7f54e0dacd7 (diff) |
Rename gScript* vars to gSpecialVar_*
Diffstat (limited to 'asm-de')
-rw-r--r-- | asm-de/contest_link_80C2020.s | 60 | ||||
-rw-r--r-- | asm-de/easy_chat.s | 8 |
2 files changed, 34 insertions, 34 deletions
diff --git a/asm-de/contest_link_80C2020.s b/asm-de/contest_link_80C2020.s index ee555287a..0c07937f8 100644 --- a/asm-de/contest_link_80C2020.s +++ b/asm-de/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 @@ -2978,7 +2978,7 @@ _de_080C39DC: .4byte gIsLinkContest _de_080C39E0: .4byte 0x0600e000 _de_080C39E4: .4byte gUnknown_08E964B8 _de_080C39E8: - ldr r0, _de_080C3A08 @ =gScriptContestRank + ldr r0, _de_080C3A08 @ =gSpecialVar_ContestRank ldrh r0, [r0] cmp r0, 0 bne _de_080C3A14 @@ -2994,7 +2994,7 @@ _de_080C39E8: str r2, [sp, 0xC] b _de_080C3A6C .align 2, 0 -_de_080C3A08: .4byte gScriptContestRank +_de_080C3A08: .4byte gSpecialVar_ContestRank _de_080C3A0C: .4byte 0x0600e000 _de_080C3A10: .4byte gUnknown_08E964B8 _de_080C3A14: @@ -3061,7 +3061,7 @@ de_sub_80C3A84: @ 80C3A84 push {r4,lr} sub sp, 0x10 adds r2, r0, 0 - ldr r0, _de_080C3AAC @ =gScriptContestCategory + ldr r0, _de_080C3AAC @ =gSpecialVar_ContestCategory ldrh r4, [r0] cmp r4, 0 bne _de_080C3AB8 @@ -3079,7 +3079,7 @@ de_sub_80C3A84: @ 80C3A84 str r4, [sp, 0xC] b _de_080C3AD6 .align 2, 0 -_de_080C3AAC: .4byte gScriptContestCategory +_de_080C3AAC: .4byte gSpecialVar_ContestCategory _de_080C3AB0: .4byte 0x0600e000 _de_080C3AB4: .4byte gUnknown_08E964B8 _de_080C3AB8: @@ -4604,15 +4604,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} @@ -4620,9 +4620,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 @@ -4635,7 +4635,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 @@ -4647,7 +4647,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: @@ -4677,7 +4677,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 @@ -4688,7 +4688,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 @@ -4704,7 +4704,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 @@ -4718,7 +4718,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: @@ -4740,7 +4740,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 @@ -4762,7 +4762,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 @@ -4776,7 +4776,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 @@ -4793,7 +4793,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 @@ -4807,7 +4807,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 @@ -4824,7 +4824,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 @@ -4838,7 +4838,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 @@ -4858,7 +4858,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 @@ -4872,7 +4872,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 @@ -4895,7 +4895,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 @@ -5491,7 +5491,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 @@ -5507,7 +5507,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 diff --git a/asm-de/easy_chat.s b/asm-de/easy_chat.s index 795713490..89ea03b69 100644 --- a/asm-de/easy_chat.s +++ b/asm-de/easy_chat.s @@ -1578,13 +1578,13 @@ _080E6D3E: beq _080E6D58 b _080E6D72 _080E6D44: - ldr r0, _080E6D50 @ =gScriptResult + ldr r0, _080E6D50 @ =gSpecialVar_Result strh r1, [r0] ldr r0, _080E6D54 @ =sub_80E752C bl sub_80E682C b _080E6D72 .align 2, 0 -_080E6D50: .4byte gScriptResult +_080E6D50: .4byte gSpecialVar_Result _080E6D54: .4byte sub_80E752C _080E6D58: ldr r1, _080E6D60 @ =gSharedMem + 0x1000 @@ -1722,7 +1722,7 @@ _080E6E56: beq _080E6EDC b _080E6F5E _080E6E5C: - ldr r7, _080E6EC8 @ =gScriptResult + ldr r7, _080E6EC8 @ =gSpecialVar_Result bl sub_80E7FA8 lsls r0, 24 lsrs r0, 24 @@ -1774,7 +1774,7 @@ _080E6EBE: bl sub_80E682C b _080E6F5E .align 2, 0 -_080E6EC8: .4byte gScriptResult +_080E6EC8: .4byte gSpecialVar_Result _080E6ECC: .4byte gSpecialVar_0x8004 _080E6ED0: .4byte 0x00009fa8 _080E6ED4: .4byte 0x0000ffff |