summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
Diffstat (limited to 'asm')
-rw-r--r--asm/battle_2.s4
-rw-r--r--asm/contest.s24
-rw-r--r--asm/contest_ai.s4
-rw-r--r--asm/contest_effect.s4
-rw-r--r--asm/contest_link_80C2020.s60
-rw-r--r--asm/easy_chat.s8
6 files changed, 52 insertions, 52 deletions
diff --git a/asm/battle_2.s b/asm/battle_2.s
index c8f8eb0f4..dd720ec79 100644
--- a/asm/battle_2.s
+++ b/asm/battle_2.s
@@ -3336,7 +3336,7 @@ _08013ECE:
cmp r0, 0
bne _08013F2A
_08013EE0:
- ldr r1, _08013F3C @ =gScriptResult
+ ldr r1, _08013F3C @ =gSpecialVar_Result
ldr r5, _08013F40 @ =gBattleOutcome
ldrb r0, [r5]
strh r0, [r1]
@@ -3379,7 +3379,7 @@ _08013F2A:
_08013F30: .4byte gBattleTypeFlags
_08013F34: .4byte gPlayerParty
_08013F38: .4byte gReceivedRemoteLinkPlayers
-_08013F3C: .4byte gScriptResult
+_08013F3C: .4byte gSpecialVar_Result
_08013F40: .4byte gBattleOutcome
_08013F44: .4byte gMain
_08013F48: .4byte 0x0000043d
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:
diff --git a/asm/contest_ai.s b/asm/contest_ai.s
index d2061c84e..5cf1e0b62 100644
--- a/asm/contest_ai.s
+++ b/asm/contest_ai.s
@@ -1315,7 +1315,7 @@ _0812923C:
thumb_func_start ContestAICmd_get_contest_type
ContestAICmd_get_contest_type: @ 8129244
ldr r1, _08129258 @ =gSharedMem + 0x192E4
- ldr r0, _0812925C @ =gScriptContestCategory
+ ldr r0, _0812925C @ =gSpecialVar_ContestCategory
ldrh r0, [r0]
strh r0, [r1, 0x18]
ldr r1, _08129260 @ =gAIScriptPtr
@@ -1325,7 +1325,7 @@ ContestAICmd_get_contest_type: @ 8129244
bx lr
.align 2, 0
_08129258: .4byte gSharedMem + 0x192E4
-_0812925C: .4byte gScriptContestCategory
+_0812925C: .4byte gSpecialVar_ContestCategory
_08129260: .4byte gAIScriptPtr
thumb_func_end ContestAICmd_get_contest_type
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
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
diff --git a/asm/easy_chat.s b/asm/easy_chat.s
index 547ce174e..e08d71083 100644
--- a/asm/easy_chat.s
+++ b/asm/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 0x00009c7c
_080E6ED4: .4byte 0x0000ffff
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-22 02:43:51 +0000