contest rank var

6 files changed, 12 insertions, 12 deletions

diff --git a/data/event_scripts.s b/data/event_scripts.s
index d70145f6a..e76663f7f 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -26,7 +26,7 @@ gSpecialVars::
 	.4byte gScriptResult
 	.4byte gScriptItemId
 	.4byte gScriptLastTalked
-	.4byte gSpecialVar_0x8010
+	.4byte gScriptContestRank
 	.4byte gScriptContestCategory
 
 	.include "data/specials.inc"
diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc
index 9e1c8a9d9..a8b134c0b 100644
--- a/data/scripts/contest_hall.inc
+++ b/data/scripts/contest_hall.inc
@@ -25,7 +25,7 @@ FallarborTown_ContestLobby_EventScript_1A4EDD:: @ 81A4EDD
 	return
 
 FallarborTown_ContestLobby_EventScript_1A4EE1:: @ 81A4EE1
-	compare 0x8010, 0
+	compare CONTEST_RANK, 0
 	jumpeq FallarborTown_ContestLobby_EventScript_1A4EF6
 	msgbox FallarborTown_ContestLobby_Text_1A6340, 4
 	releaseall
@@ -207,7 +207,7 @@ LinkContestRoom1_EventScript_1A514D:: @ 81A514D
 	return
 
 LinkContestRoom1_EventScript_1A51A0:: @ 81A51A0
-	switch 0x8010
+	switch CONTEST_RANK
 	case 0, LinkContestRoom1_EventScript_1A51D2
 	case 1, LinkContestRoom1_EventScript_1A51D8
 	case 2, LinkContestRoom1_EventScript_1A51DE
@@ -1033,7 +1033,7 @@ LinkContestRoom1_EventScript_1A5C23:: @ 81A5C23
 	return
 
 LinkContestRoom1_EventScript_1A5C32:: @ 81A5C32
-	compare 0x8010, 3
+	compare CONTEST_RANK, 3
 	jumpeq LinkContestRoom1_EventScript_1A5C41
 	setflag 2
 	return
@@ -1123,7 +1123,7 @@ LinkContestRoom1_EventScript_1A5CFC:: @ 81A5CFC
 	specialval RESULT, 88
 	compare RESULT, 0
 	jumpeq LinkContestRoom1_EventScript_1A5D5B
-	compare 0x8010, 3
+	compare CONTEST_RANK, 3
 	jumpeq LinkContestRoom1_EventScript_1A5D3B
 	msgbox LinkContestRoom1_Text_1A6DF1, 3
 	return
diff --git a/data/scripts/maps/FallarborTown_ContestLobby.inc b/data/scripts/maps/FallarborTown_ContestLobby.inc
index 9bbd48722..706d9aa5f 100644
--- a/data/scripts/maps/FallarborTown_ContestLobby.inc
+++ b/data/scripts/maps/FallarborTown_ContestLobby.inc
@@ -8,7 +8,7 @@ FallarborTown_ContestLobby_MapScript1_1539C7:: @ 81539C7
 
 FallarborTown_ContestLobby_EventScript_1539CD:: @ 81539CD
 	setvar 0x800b, 6
-	setvar 0x8010, 1
+	setvar CONTEST_RANK, 1
 	call FallarborTown_ContestLobby_EventScript_1A4E92
 	call FallarborTown_ContestLobby_EventScript_1539F8
 	special 83
diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc
index 576e13d84..419e04a8f 100644
--- a/data/scripts/maps/LilycoveCity_ContestLobby.inc
+++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc
@@ -359,7 +359,7 @@ LilycoveCity_ContestLobby_EventScript_158C35:: @ 8158C35
 
 LilycoveCity_ContestLobby_EventScript_158C42:: @ 8158C42
 	msgbox LilycoveCity_ContestLobby_Text_188703, 4
-	setvar 0x8010, 0
+	setvar CONTEST_RANK, 0
 	choosecontestpkmn
 	compare 0x8004, 255
 	jumpeq LilycoveCity_ContestLobby_EventScript_158CEA
@@ -484,7 +484,7 @@ LilycoveCity_ContestLobby_EventScript_158DEE:: @ 8158DEE
 	setvar 0x4086, 1
 	special 86
 	setvar 0x4088, 5
-	setvar 0x8010, 3
+	setvar CONTEST_RANK, 3
 	call LilycoveCity_ContestLobby_EventScript_158F08
 	end
 
@@ -572,7 +572,7 @@ LilycoveCity_ContestLobby_EventScript_158EB0:: @ 8158EB0
 	compare RESULT, 1
 	jumpeq LilycoveCity_ContestLobby_EventScript_158EE8
 	setvar 0x800b, 8
-	setvar 0x8010, 3
+	setvar CONTEST_RANK, 3
 	call LilycoveCity_ContestLobby_EventScript_1A4E92
 	call LilycoveCity_ContestLobby_EventScript_158F86
 	special 83
@@ -587,7 +587,7 @@ LilycoveCity_ContestLobby_EventScript_158EE8:: @ 8158EE8
 	copyvar 0x4094, 0x1
 	additem ITEM_CONTEST_PASS, 1
 	setvar 0x800b, 8
-	setvar 0x8010, 3
+	setvar CONTEST_RANK, 3
 	setvar 0x4099, 1
 	setflag 2107
 	end
diff --git a/data/scripts/maps/SlateportCity_ContestLobby.inc b/data/scripts/maps/SlateportCity_ContestLobby.inc
index 46b595034..b2cce5312 100644
--- a/data/scripts/maps/SlateportCity_ContestLobby.inc
+++ b/data/scripts/maps/SlateportCity_ContestLobby.inc
@@ -8,7 +8,7 @@ SlateportCity_ContestLobby_MapScript1_155417:: @ 8155417
 
 SlateportCity_ContestLobby_EventScript_15541D:: @ 815541D
 	setvar 0x800b, 7
-	setvar 0x8010, 2
+	setvar CONTEST_RANK, 2
 	call SlateportCity_ContestLobby_EventScript_1A4E92
 	call SlateportCity_ContestLobby_EventScript_155448
 	special 83
diff --git a/data/scripts/maps/VerdanturfTown_ContestLobby.inc b/data/scripts/maps/VerdanturfTown_ContestLobby.inc
index 7033e4fb1..066ecbdce 100644
--- a/data/scripts/maps/VerdanturfTown_ContestLobby.inc
+++ b/data/scripts/maps/VerdanturfTown_ContestLobby.inc
@@ -8,7 +8,7 @@ VerdanturfTown_ContestLobby_MapScript1_153D70:: @ 8153D70
 
 VerdanturfTown_ContestLobby_EventScript_153D76:: @ 8153D76
 	setvar 0x800b, 5
-	setvar 0x8010, 0
+	setvar CONTEST_RANK, 0
 	call VerdanturfTown_ContestLobby_EventScript_1A4E92
 	call VerdanturfTown_ContestLobby_EventScript_153DA1
 	special 83