name used and unnamed vars

17 files changed, 84 insertions, 84 deletions

diff --git a/data/event_scripts.s b/data/event_scripts.s
index a05069709..191fe5d60 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -1118,7 +1118,7 @@ EverGrandeCity_HallOfFame_EventScript_2717C1:: @ 82717C1
 	call_if_unset FLAG_RECEIVED_BELDUM, EverGrandeCity_HallOfFame_EventScript_27183F
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM
-	compare VAR_0x40D3, 0
+	compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 0
 	call_if_eq EverGrandeCity_HallOfFame_EventScript_271851
 	return
 
@@ -1145,7 +1145,7 @@ EverGrandeCity_HallOfFame_EventScript_271843:: @ 8271843
 	return
 
 EverGrandeCity_HallOfFame_EventScript_271851:: @ 8271851
-	setvar VAR_0x40D3, 1
+	setvar VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 1
 	return
 
 EventScript_WhiteOut:: @ 8271857
diff --git a/data/maps/DewfordTown/scripts.inc b/data/maps/DewfordTown/scripts.inc
index 1fcaab8d6..f56411104 100644
--- a/data/maps/DewfordTown/scripts.inc
+++ b/data/maps/DewfordTown/scripts.inc
@@ -138,7 +138,7 @@ DewfordTown_EventScript_1E9660:: @ 81E9660
 	clearflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT
 	setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN
 	hideobjectat 4, MAP_DEWFORD_TOWN
-	setvar VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 2
+	setvar VAR_BOARD_BRINEY_BOAT_STATE, 2
 	resetobjectpriority EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN
 	warp MAP_ROUTE104_MR_BRINEYS_HOUSE, 255, 5, 4
 	copyvar VAR_BRINEY_LOCATION, VAR_0x8008
diff --git a/data/maps/LittlerootTown/map.json b/data/maps/LittlerootTown/map.json
index 7ef696a58..5ab56e0a5 100644
--- a/data/maps/LittlerootTown/map.json
+++ b/data/maps/LittlerootTown/map.json
@@ -154,7 +154,7 @@
       "x": 10,
       "y": 1,
       "elevation": 3,
-      "var": "VAR_0x4050",
+      "var": "VAR_LITTLEROOT_STATE",
       "var_value": "0",
       "script": "LittlerootTown_EventScript_1E8091"
     },
@@ -163,7 +163,7 @@
       "x": 11,
       "y": 1,
       "elevation": 3,
-      "var": "VAR_0x4050",
+      "var": "VAR_LITTLEROOT_STATE",
       "var_value": "0",
       "script": "LittlerootTown_EventScript_1E80EF"
     },
@@ -172,7 +172,7 @@
       "x": 11,
       "y": 1,
       "elevation": 3,
-      "var": "VAR_0x4050",
+      "var": "VAR_LITTLEROOT_STATE",
       "var_value": "1",
       "script": "LittlerootTown_EventScript_1E811F"
     },
@@ -181,7 +181,7 @@
       "x": 8,
       "y": 9,
       "elevation": 3,
-      "var": "VAR_0x4050",
+      "var": "VAR_LITTLEROOT_STATE",
       "var_value": "3",
       "script": "LittlerootTown_EventScript_1E81F9"
     },
@@ -190,7 +190,7 @@
       "x": 9,
       "y": 9,
       "elevation": 3,
-      "var": "VAR_0x4050",
+      "var": "VAR_LITTLEROOT_STATE",
       "var_value": "3",
       "script": "LittlerootTown_EventScript_1E8205"
     },
@@ -199,7 +199,7 @@
       "x": 10,
       "y": 9,
       "elevation": 3,
-      "var": "VAR_0x4050",
+      "var": "VAR_LITTLEROOT_STATE",
       "var_value": "3",
       "script": "LittlerootTown_EventScript_1E81E1"
     },
@@ -208,7 +208,7 @@
       "x": 11,
       "y": 9,
       "elevation": 3,
-      "var": "VAR_0x4050",
+      "var": "VAR_LITTLEROOT_STATE",
       "var_value": "3",
       "script": "LittlerootTown_EventScript_1E81ED"
     },
@@ -217,7 +217,7 @@
       "x": 10,
       "y": 2,
       "elevation": 3,
-      "var": "VAR_0x4050",
+      "var": "VAR_LITTLEROOT_STATE",
       "var_value": "3",
       "script": "LittlerootTown_EventScript_1E81BB"
     },
@@ -226,7 +226,7 @@
       "x": 11,
       "y": 2,
       "elevation": 3,
-      "var": "VAR_0x4050",
+      "var": "VAR_LITTLEROOT_STATE",
       "var_value": "3",
       "script": "LittlerootTown_EventScript_1E81CE"
     }
@@ -265,4 +265,4 @@
       "script": "LittlerootTown_EventScript_1E818F"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/data/maps/LittlerootTown/scripts.inc b/data/maps/LittlerootTown/scripts.inc
index f347811f8..abbdfde37 100644
--- a/data/maps/LittlerootTown/scripts.inc
+++ b/data/maps/LittlerootTown/scripts.inc
@@ -10,7 +10,7 @@ LittlerootTown_MapScript1_1E7DDB: @ 81E7DDB
 	compare VAR_LITTLEROOT_INTRO_STATE, 2
 	call_if_eq LittlerootTown_EventScript_1E7E67
 	call_if_unset FLAG_RESCUED_BIRCH, LittlerootTown_EventScript_1E7E6F
-	compare VAR_0x4050, 3
+	compare VAR_LITTLEROOT_STATE, 3
 	call_if_eq LittlerootTown_EventScript_1E7E92
 	compare VAR_LITTLEROOT_HOUSES_STATE, 4
 	call_if_eq LittlerootTown_EventScript_1E7E5C
@@ -20,14 +20,14 @@ LittlerootTown_MapScript1_1E7DDB: @ 81E7DDB
 	call_if_eq LittlerootTown_EventScript_1E7E53
 	compare VAR_LITTLEROOT_RIVAL_STATE, 3
 	call_if_eq LittlerootTown_EventScript_1E7E4F
-	compare VAR_0x40D3, 1
+	compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 1
 	call_if_eq LittlerootTown_EventScript_1E7E4B
-	compare VAR_0x40D3, 2
+	compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 2
 	call_if_eq LittlerootTown_EventScript_1E7E45
 	end
 
 LittlerootTown_EventScript_1E7E45:: @ 81E7E45
-	setvar VAR_0x40D3, 3
+	setvar VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 3
 	return
 
 LittlerootTown_EventScript_1E7E4B:: @ 81E7E4B
@@ -53,7 +53,7 @@ LittlerootTown_EventScript_1E7E67:: @ 81E7E67
 	return
 
 LittlerootTown_EventScript_1E7E6F:: @ 81E7E6F
-	compare VAR_0x4050, 0
+	compare VAR_LITTLEROOT_STATE, 0
 	goto_if_eq LittlerootTown_EventScript_1E7E86
 	setobjectxyperm 1, 10, 1
 	setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP
@@ -85,7 +85,7 @@ LittlerootTown_EventScript_1E7EB9:: @ 81E7EB9
 LittlerootTown_MapScript2_1E7EC1: @ 81E7EC1
 	map_script_2 VAR_LITTLEROOT_INTRO_STATE, 1, LittlerootTown_EventScript_1E7EDB
 	map_script_2 VAR_LITTLEROOT_INTRO_STATE, 2, LittlerootTown_EventScript_1E7EF9
-	map_script_2 VAR_0x40D3, 1, LittlerootTown_EventScript_1E7FB1
+	map_script_2 VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 1, LittlerootTown_EventScript_1E7FB1
 	.2byte 0
 
 LittlerootTown_EventScript_1E7EDB:: @ 81E7EDB
@@ -201,7 +201,7 @@ LittlerootTown_EventScript_1E7FB1:: @ 81E7FB1
 	end
 
 LittlerootTown_MapScript2_1E7FE2: @ 81E7FE2
-	map_script_2 VAR_0x40D3, 1, LittlerootTown_EventScript_1E7FEC
+	map_script_2 VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 1, LittlerootTown_EventScript_1E7FEC
 	.2byte 0
 
 LittlerootTown_EventScript_1E7FEC:: @ 81E7FEC
@@ -236,7 +236,7 @@ LittlerootTown_EventScript_1E8034:: @ 81E8034
 	faceplayer
 	goto_if_set FLAG_ADVENTURE_STARTED, LittlerootTown_EventScript_1E8087
 	goto_if_set FLAG_RESCUED_BIRCH, LittlerootTown_EventScript_1E807A
-	compare VAR_0x4050, 0
+	compare VAR_LITTLEROOT_STATE, 0
 	goto_if_ne LittlerootTown_EventScript_1E805D
 	msgbox LittlerootTown_Text_1E8BB8, MSGBOX_DEFAULT
 	release
@@ -248,7 +248,7 @@ LittlerootTown_EventScript_1E805D:: @ 81E805D
 	closemessage
 	applymovement 1, Common_Movement_FaceOriginalDirection
 	waitmovement 0
-	setvar VAR_0x4050, 2
+	setvar VAR_LITTLEROOT_STATE, 2
 	release
 	end
 
@@ -366,7 +366,7 @@ LittlerootTown_EventScript_1E811F:: @ 81E811F
 	closemessage
 	applymovement 1, Common_Movement_FaceOriginalDirection
 	waitmovement 0
-	setvar VAR_0x4050, 2
+	setvar VAR_LITTLEROOT_STATE, 2
 	releaseall
 	end
 
@@ -909,7 +909,7 @@ LittlerootTown_EventScript_1E863D:: @ 81E863D
 LittlerootTown_EventScript_1E8686:: @ 81E8686
 	removeobject 4
 	setflag FLAG_SYS_B_DASH
-	setvar VAR_0x4050, 4
+	setvar VAR_LITTLEROOT_STATE, 4
 	release
 	end
 
diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc
index d81340c6c..b2f1e68b7 100644
--- a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc
+++ b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc
@@ -174,7 +174,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F78E2:: @ 81F78E2
 	clearflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM
 	delay 30
 	setvar VAR_LITTLEROOT_RIVAL_STATE, 3
-	setvar VAR_0x4050, 1
+	setvar VAR_LITTLEROOT_STATE, 1
 	savebgm MUS_DUMMY
 	fadedefaultbgm
 	releaseall
diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc
index a49c51499..bc2a7bf0c 100644
--- a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc
+++ b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc
@@ -24,7 +24,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8433:: @ 81F8433
 	checkplayergender
 	compare VAR_RESULT, 0
 	goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8456
-	compare VAR_0x40D3, 2
+	compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 2
 	goto_if_ge LittlerootTown_BrendansHouse_2F_EventScript_1F9309
 	setobjectxyperm 1, 0, 2
 	setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP
@@ -84,7 +84,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8497:: @ 81F8497
 	setvar VAR_LITTLEROOT_RIVAL_STATE, 3
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_POKE_BALL
 	clearflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM
-	setvar VAR_0x4050, 1
+	setvar VAR_LITTLEROOT_STATE, 1
 	savebgm MUS_DUMMY
 	fadedefaultbgm
 	releaseall
diff --git a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc
index 0557330a8..f9c481d73 100644
--- a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc
+++ b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc
@@ -211,7 +211,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F8A8B:: @ 81F8A8B
 	clearflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM
 	delay 30
 	setvar VAR_LITTLEROOT_RIVAL_STATE, 3
-	setvar VAR_0x4050, 1
+	setvar VAR_LITTLEROOT_STATE, 1
 	savebgm MUS_DUMMY
 	fadedefaultbgm
 	releaseall
diff --git a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc
index 76bf7d6a8..92aef365f 100644
--- a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc
+++ b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc
@@ -24,7 +24,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F92E6:: @ 81F92E6
 	checkplayergender
 	compare VAR_RESULT, 1
 	goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F9309
-	compare VAR_0x40D3, 2
+	compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 2
 	goto_if_ge LittlerootTown_MaysHouse_2F_EventScript_1F9309
 	setobjectxyperm 1, 8, 2
 	setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP
@@ -85,7 +85,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F934A:: @ 81F934A
 	setvar VAR_LITTLEROOT_RIVAL_STATE, 3
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_POKE_BALL
 	clearflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM
-	setvar VAR_0x4050, 1
+	setvar VAR_LITTLEROOT_STATE, 1
 	savebgm MUS_DUMMY
 	fadedefaultbgm
 	releaseall
diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
index 2b0dde7ae..91cf393f2 100644
--- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
+++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
@@ -7,11 +7,11 @@ LittlerootTown_ProfessorBirchsLab_MapScripts:: @ 81F9C91
 LittlerootTown_ProfessorBirchsLab_MapScript1_1F9CA1: @ 81F9CA1
 	call Common_EventScript_SetupRivalGender
 	call LittlerootTown_ProfessorBirchsLab_EventScript_2720AD
-	compare VAR_0x40D3, 6
+	compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6
 	goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF7
-	compare VAR_0x40D3, 4
+	compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 4
 	goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF3
-	compare VAR_0x40D3, 3
+	compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 3
 	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9CCD
 	end
 
@@ -24,7 +24,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9CCD:: @ 81F9CCD
 	end
 
 LittlerootTown_ProfessorBirchsLab_EventScript_1F9CE9:: @ 81F9CE9
-	setvar VAR_0x40D3, 4
+	setvar VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 4
 	goto LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF3
 
 LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF3:: @ 81F9CF3
@@ -39,12 +39,12 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF7:: @ 81F9CF7
 
 LittlerootTown_ProfessorBirchsLab_MapScript2_1F9D06: @ 81F9D06
 	map_script_2 VAR_BIRCH_LAB_STATE, 2, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D40
-	map_script_2 VAR_0x40D3, 1, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D45
-	map_script_2 VAR_0x40D3, 2, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D45
-	map_script_2 VAR_0x40D3, 3, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D71
-	map_script_2 VAR_0x40D3, 6, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D71
-	map_script_2 VAR_0x40D3, 4, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D75
-	map_script_2 VAR_0x40D3, 5, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D75
+	map_script_2 VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 1, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D45
+	map_script_2 VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 2, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D45
+	map_script_2 VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 3, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D71
+	map_script_2 VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D71
+	map_script_2 VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 4, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D75
+	map_script_2 VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 5, LittlerootTown_ProfessorBirchsLab_EventScript_1F9D75
 	.2byte 0
 
 LittlerootTown_ProfessorBirchsLab_EventScript_1F9D40:: @ 81F9D40
@@ -87,8 +87,8 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9D75:: @ 81F9D75
 LittlerootTown_ProfessorBirchsLab_MapScript2_1F9DB9: @ 81F9DB9
 	map_script_2 VAR_BIRCH_LAB_STATE, 2, LittlerootTown_ProfessorBirchsLab_EventScript_1F9DDB
 	map_script_2 VAR_BIRCH_LAB_STATE, 4, LittlerootTown_ProfessorBirchsLab_EventScript_1F9E67
-	map_script_2 VAR_0x40D3, 1, LittlerootTown_ProfessorBirchsLab_EventScript_1F9E80
-	map_script_2 VAR_0x40D3, 4, LittlerootTown_ProfessorBirchsLab_EventScript_1F9F62
+	map_script_2 VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 1, LittlerootTown_ProfessorBirchsLab_EventScript_1F9E80
+	map_script_2 VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 4, LittlerootTown_ProfessorBirchsLab_EventScript_1F9F62
 	.2byte 0
 
 LittlerootTown_ProfessorBirchsLab_EventScript_1F9DDB:: @ 81F9DDB
@@ -194,7 +194,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9E80:: @ 81F9E80
 	closemessage
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCH
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_RIVAL
-	setvar VAR_0x40D3, 2
+	setvar VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 2
 	setvar VAR_SCOTT_CALL_STEP_COUNTER, 0
 	setflag FLAG_SCOTT_CALL_NATIONAL_DEX
 	releaseall
@@ -247,7 +247,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9F62:: @ 81F9F62
 	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_ProfessorBirchsLab_Movement_1F9F7C
 	waitmovement 0
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB5F9, MSGBOX_DEFAULT
-	setvar VAR_0x40D3, 5
+	setvar VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 5
 	releaseall
 	end
 
@@ -284,7 +284,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9FB1:: @ 81F9FB1
 
 LittlerootTown_ProfessorBirchsLab_EventScript_1F9FBB:: @ 81F9FBB
 	release
-	compare VAR_0x40D3, 6
+	compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6
 	goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA057
 	applymovement 2, Common_Movement_WalkInPlaceRight
 	waitmovement 0
@@ -297,7 +297,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9FBB:: @ 81F9FBB
 
 LittlerootTown_ProfessorBirchsLab_EventScript_1F9FEF:: @ 81F9FEF
 	release
-	compare VAR_0x40D3, 6
+	compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6
 	goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA057
 	applymovement 2, Common_Movement_WalkInPlaceRight
 	waitmovement 0
@@ -310,7 +310,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9FEF:: @ 81F9FEF
 
 LittlerootTown_ProfessorBirchsLab_EventScript_1FA023:: @ 81FA023
 	release
-	compare VAR_0x40D3, 6
+	compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6
 	goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA057
 	applymovement 2, Common_Movement_WalkInPlaceRight
 	waitmovement 0
@@ -373,7 +373,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA0F2:: @ 81FA0F2
 LittlerootTown_ProfessorBirchsLab_EventScript_1FA0FD:: @ 81FA0FD
 	erasemonpic
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBA2C, MSGBOX_DEFAULT
-	setvar VAR_0x40D3, 6
+	setvar VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6
 	releaseall
 	end
 
@@ -418,7 +418,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA193:: @ 81FA193
 LittlerootTown_ProfessorBirchsLab_EventScript_1FA19E:: @ 81FA19E
 	erasemonpic
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBA2C, MSGBOX_DEFAULT
-	setvar VAR_0x40D3, 6
+	setvar VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6
 	releaseall
 	end
 
@@ -463,7 +463,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA234:: @ 81FA234
 LittlerootTown_ProfessorBirchsLab_EventScript_1FA23F:: @ 81FA23F
 	erasemonpic
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_1FBA2C, MSGBOX_DEFAULT
-	setvar VAR_0x40D3, 6
+	setvar VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6
 	releaseall
 	end
 
@@ -477,9 +477,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA24F:: @ 81FA24F
 LittlerootTown_ProfessorBirchsLab_EventScript_1FA25A:: @ 81FA25A
 	lock
 	faceplayer
-	compare VAR_0x40D3, 5
+	compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 5
 	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA28A
-	compare VAR_0x40D3, 2
+	compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 2
 	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA294
 	goto_if_unset FLAG_HAS_MATCH_CALL, LittlerootTown_ProfessorBirchsLab_EventScript_1FA29E
 	goto_if_unset FLAG_ENABLE_PROF_BIRCH_MATCH_CALL, LittlerootTown_ProfessorBirchsLab_EventScript_1FA2D2
@@ -498,9 +498,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA294:: @ 81FA294
 
 LittlerootTown_ProfessorBirchsLab_EventScript_1FA29E:: @ 81FA29E
 	goto_if_unset FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380, LittlerootTown_ProfessorBirchsLab_EventScript_272141
-	compare VAR_0x40D3, 3
+	compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 3
 	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_272141
-	compare VAR_0x40D3, 6
+	compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6
 	goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_272141
 	compare VAR_BIRCH_LAB_STATE, 5
 	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA3C4
@@ -519,7 +519,7 @@ Route101_EventScript_1FA2D2:: @ 81FA2D2
 	closemessage
 	delay 30
 	setflag FLAG_ENABLE_PROF_BIRCH_MATCH_CALL
-	setvar VAR_0x40DA, 2
+	setvar VAR_REGISTER_BIRCH_STATE, 2
 	release
 	end
 
@@ -541,7 +541,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA2F8:: @ 81FA2F8
 	setflag FLAG_ADVENTURE_STARTED
 	setvar VAR_ROUTE102_ACCESSIBLE, 1
 	setvar VAR_LITTLEROOT_RIVAL_STATE, 4
-	setvar VAR_0x4050, 3
+	setvar VAR_LITTLEROOT_STATE, 3
 	releaseall
 	end
 
@@ -598,11 +598,11 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA3E3:: @ 81FA3E3
 LittlerootTown_ProfessorBirchsLab_EventScript_1FA3EC:: @ 81FA3EC
 	lock
 	faceplayer
-	compare VAR_0x40D3, 5
+	compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 5
 	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA43A
-	compare VAR_0x40D3, 6
+	compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6
 	goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA465
-	compare VAR_0x40D3, 2
+	compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 2
 	goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA490
 	checkplayergender
 	compare VAR_RESULT, MALE
diff --git a/data/maps/Route104/map.json b/data/maps/Route104/map.json
index d2c7cc146..a02a1e170 100644
--- a/data/maps/Route104/map.json
+++ b/data/maps/Route104/map.json
@@ -537,7 +537,7 @@
       "x": 17,
       "y": 51,
       "elevation": 3,
-      "var": "VAR_0x4063",
+      "var": "VAR_ROUTE104_STATE",
       "var_value": "1",
       "script": "Route104_EventScript_1ECCB3"
     }
@@ -624,4 +624,4 @@
       "flag": "FLAG_HIDDEN_ITEM_ROUTE_104_HEART_SCALE"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc
index 33200b800..5c8bf68ff 100644
--- a/data/maps/Route104/scripts.inc
+++ b/data/maps/Route104/scripts.inc
@@ -4,7 +4,7 @@ Route104_MapScripts:: @ 81ECC32
 	.byte 0
 
 Route104_MapScript2_1ECC3D: @ 81ECC3D
-	map_script_2 VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 1, Route104_EventScript_1ECC47
+	map_script_2 VAR_BOARD_BRINEY_BOAT_STATE, 1, Route104_EventScript_1ECC47
 	.2byte 0
 
 Route104_EventScript_1ECC47:: @ 81ECC47
@@ -29,7 +29,7 @@ Route104_EventScript_1ECC74:: @ 81ECC74
 	return
 
 Route104_EventScript_1ECC78:: @ 81ECC78
-	compare VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 1
+	compare VAR_BOARD_BRINEY_BOAT_STATE, 1
 	goto_if_ge Route104_EventScript_1ECC9D
 	goto_if_set FLAG_MET_RIVAL_RUSTBORO, Route104_EventScript_1ECC9D
 	goto_if_unset FLAG_REGISTER_RIVAL_POKENAV, Route104_EventScript_1ECC9D
@@ -50,7 +50,7 @@ Route104_EventScript_1ECCB3:: @ 81ECCB3
 	lockall
 	setflag FLAG_HIDE_RUSBORO_CITY_RIVAL
 	setvar VAR_RUSTBORO_STATE, 8
-	setvar VAR_0x4063, 2
+	setvar VAR_ROUTE104_STATE, 2
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp
 	waitmovement 0
 	delay 10
@@ -417,7 +417,7 @@ Route104_EventScript_1ED139:: @ 81ED139
 	resetobjectpriority EVENT_OBJ_ID_PLAYER, MAP_ROUTE104
 	resetobjectpriority 2, MAP_DEWFORD_TOWN
 	moveobjectoffscreen 2
-	setvar VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 0
+	setvar VAR_BOARD_BRINEY_BOAT_STATE, 0
 	goto_if_unset FLAG_DELIVERED_STEVEN_LETTER, Route104_EventScript_1ED1B4
 	goto_if_set FLAG_DELIVERED_STEVEN_LETTER, Route104_EventScript_1ED1BE
 	end
diff --git a/data/maps/Route104_MrBrineysHouse/scripts.inc b/data/maps/Route104_MrBrineysHouse/scripts.inc
index 52fd4b96d..1a4d21606 100644
--- a/data/maps/Route104_MrBrineysHouse/scripts.inc
+++ b/data/maps/Route104_MrBrineysHouse/scripts.inc
@@ -75,12 +75,12 @@ Route104_MrBrineysHouse_EventScript_229E1D:: @ 8229E1D
 Route104_MrBrineysHouse_EventScript_229E27:: @ 8229E27
 	msgbox Route104_MrBrineysHouse_Text_229FE9, MSGBOX_DEFAULT
 	call Route104_MrBrineysHouse_EventScript_271E95
-	setvar VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 1
+	setvar VAR_BOARD_BRINEY_BOAT_STATE, 1
 	clearflag FLAG_HIDE_ROUTE_104_MR_BRINEY
 	setflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY
 	setflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO
 	setvar VAR_RUSTBORO_STATE, 8
-	setvar VAR_0x4063, 2
+	setvar VAR_ROUTE104_STATE, 2
 	setflag FLAG_HIDE_RUSBORO_CITY_RIVAL
 	setflag FLAG_HIDE_ROUTE_104_RIVAL
 	warp MAP_ROUTE104, 255, 13, 51
diff --git a/data/maps/Route110/map.json b/data/maps/Route110/map.json
index 8cbc93af6..570c38dcc 100644
--- a/data/maps/Route110/map.json
+++ b/data/maps/Route110/map.json
@@ -594,7 +594,7 @@
       "x": 7,
       "y": 85,
       "elevation": 3,
-      "var": "VAR_0x40DA",
+      "var": "VAR_REGISTER_BIRCH_STATE",
       "var_value": "1",
       "script": "Route110_EventScript_1EF9CB"
     },
@@ -603,7 +603,7 @@
       "x": 8,
       "y": 85,
       "elevation": 3,
-      "var": "VAR_0x40DA",
+      "var": "VAR_REGISTER_BIRCH_STATE",
       "var_value": "1",
       "script": "Route110_EventScript_1EF9D6"
     },
@@ -612,7 +612,7 @@
       "x": 9,
       "y": 85,
       "elevation": 3,
-      "var": "VAR_0x40DA",
+      "var": "VAR_REGISTER_BIRCH_STATE",
       "var_value": "1",
       "script": "Route110_EventScript_1EF9E1"
     },
@@ -621,7 +621,7 @@
       "x": 10,
       "y": 85,
       "elevation": 3,
-      "var": "VAR_0x40DA",
+      "var": "VAR_REGISTER_BIRCH_STATE",
       "var_value": "1",
       "script": "Route110_EventScript_1EF9EC"
     }
@@ -762,4 +762,4 @@
       "script": "Route110_EventScript_1EF34A"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/data/maps/Route110/scripts.inc b/data/maps/Route110/scripts.inc
index bc4768207..67fbbd0a8 100644
--- a/data/maps/Route110/scripts.inc
+++ b/data/maps/Route110/scripts.inc
@@ -660,7 +660,7 @@ Route110_EventScript_1EF9F7:: @ 81EF9F7
 	compare VAR_0x8008, 4
 	call_if_eq Route110_EventScript_1EFB25
 	removeobject 36
-	setvar VAR_0x40DA, 2
+	setvar VAR_REGISTER_BIRCH_STATE, 2
 	releaseall
 	end
 
diff --git a/data/maps/RustboroCity/scripts.inc b/data/maps/RustboroCity/scripts.inc
index e72496ff3..d38a2b4f2 100644
--- a/data/maps/RustboroCity/scripts.inc
+++ b/data/maps/RustboroCity/scripts.inc
@@ -33,7 +33,7 @@ RustboroCity_MapScript2_1E070B: @ 81E070B
 
 RustboroCity_EventScript_1E0715:: @ 81E0715
 	lockall
-	setvar VAR_0x4063, 1
+	setvar VAR_ROUTE104_STATE, 1
 	applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_1E0850
 	waitmovement 0
 	playse SE_KAIDAN
@@ -841,7 +841,7 @@ RustboroCity_EventScript_1E100B:: @ 81E100B
 	delay 30
 	setflag FLAG_ENABLE_RIVAL_MATCH_CALL
 	setvar VAR_RUSTBORO_STATE, 8
-	setvar VAR_0x4063, 2
+	setvar VAR_ROUTE104_STATE, 2
 	setvar VAR_0x8008, 0
 	msgbox RustboroCity_Text_1E1AFA, MSGBOX_YESNO
 	compare VAR_RESULT, 1
@@ -912,7 +912,7 @@ RustboroCity_EventScript_1E1114:: @ 81E1114
 	delay 30
 	setflag FLAG_ENABLE_RIVAL_MATCH_CALL
 	setvar VAR_RUSTBORO_STATE, 8
-	setvar VAR_0x4063, 2
+	setvar VAR_ROUTE104_STATE, 2
 	msgbox RustboroCity_Text_1E1E34, MSGBOX_YESNO
 	compare VAR_RESULT, 1
 	goto_if_eq RustboroCity_EventScript_1E1191
diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
index 96ae96685..d15a23558 100644
--- a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
+++ b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
@@ -81,7 +81,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BB00:: @ 820BB00
 	special HealPlayerParty
 	removeobject 1
 	setflag FLAG_HIDE_ROUTE_110_TEAM_AQUA
-	compare VAR_0x40DA, 0
+	compare VAR_REGISTER_BIRCH_STATE, 0
 	call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_20BC8C
 	setflag FLAG_DELIVERED_DEVON_GOODS
 	clearflag FLAG_HIDE_ROUTE_116_DEVON_EMPLOYEE
@@ -92,7 +92,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BB00:: @ 820BB00
 	end
 
 SlateportCity_OceanicMuseum_2F_EventScript_20BC8C:: @ 820BC8C
-	setvar VAR_0x40DA, 1
+	setvar VAR_REGISTER_BIRCH_STATE, 1
 	return
 
 SlateportCity_OceanicMuseum_2F_EventScript_20BC92:: @ 820BC92
diff --git a/include/constants/vars.h b/include/constants/vars.h
index 6fd1c16dd..b04fbcdfe 100644
--- a/include/constants/vars.h
+++ b/include/constants/vars.h
@@ -94,7 +94,7 @@
 #define VAR_POKELOT_PRIZE_PLACE              0x404D
 #define VAR_UNUSED_0x404E                    0x404E // Unused Var
 #define VAR_LOTAD_SIZE_RECORD                0x404F
-#define VAR_0x4050                           0x4050
+#define VAR_LITTLEROOT_STATE                 0x4050
 #define VAR_ROUTE102_ACCESSIBLE              0x4051
 #define VAR_UNUSED_0x4052                    0x4052 // Unused Var
 #define VAR_LAVARIDGE_RIVAL_STATE            0x4053
@@ -113,7 +113,7 @@
 #define VAR_ROUTE101_STATE                   0x4060
 #define VAR_UNUSED_0x4061                    0x4061 // Unused Var
 #define VAR_UNUSED_0x4062                    0x4062 // Unused Var
-#define VAR_0x4063                           0x4063
+#define VAR_ROUTE104_STATE                   0x4063
 #define VAR_UNUSED_0x4064                    0x4064 // Unused Var
 #define VAR_UNUSED_0x4065                    0x4065 // Unused Var
 #define VAR_UNUSED_0x4066                    0x4066 // Unused Var
@@ -156,7 +156,7 @@
 #define VAR_UNUSED_0x408B                    0x408B // Unused Var
 #define VAR_LITTLEROOT_HOUSES_STATE_2        0x408C
 #define VAR_LITTLEROOT_RIVAL_STATE           0x408D
-#define VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE 0x408E
+#define VAR_BOARD_BRINEY_BOAT_STATE          0x408E
 #define VAR_DEVON_CORP_3F_STATE              0x408F
 #define VAR_BRINEY_HOUSE_STATE               0x4090
 #define VAR_UNUSED_0x4091                    0x4091 // Unused Var
@@ -165,7 +165,7 @@
 #define VAR_LILYCOVE_MUSEUM_2F_STATE         0x4094
 #define VAR_LILYCOVE_FAN_CLUB_STATE          0x4095
 #define VAR_BRINEY_LOCATION                  0x4096
-#define VAR_INIT_SECRET_BASE       0x4097
+#define VAR_INIT_SECRET_BASE                 0x4097
 #define VAR_PETALBURG_WOODS_STATE            0x4098
 #define VAR_LILYCOVE_CONTEST_LOBBY_STATE     0x4099
 #define VAR_RUSTURF_TUNNEL_STATE             0x409A
@@ -225,14 +225,14 @@
 #define VAR_HAS_ENTERED_BATTLE_FRONTIER      0x40D0 // Var is used like a flag.
 #define VAR_SCOTT_STATE                      0x40D1
 #define VAR_SLATEPORT_OUTSIDE_MUSEUM_STATE   0x40D2
-#define VAR_0x40D3                           0x40D3
+#define VAR_DEX_UPGRADE_JOHTO_STARTER_STATE  0x40D3
 #define VAR_SS_TIDAL_SCOTT_STATE             0x40D4 // Always equal to FLAG_MET_SCOTT_ON_SS_TIDAL
 #define VAR_ROAMER_POKEMON                   0x40D5 // 0 = Latias, 1 = Latios
 #define VAR_TRAINER_HILL_IS_ACTIVE           0x40D6
 #define VAR_SKY_PILLAR_RAQUAZA_CRY_DONE      0x40D7
 #define VAR_SOOTOPOLIS_STATE                 0x40D8
 #define VAR_HAS_TALKED_TO_SEAFLOOR_CAVERN_ENTRANCE_GRUNT 0x40D9
-#define VAR_0x40DA                           0x40DA
+#define VAR_REGISTER_BIRCH_STATE             0x40DA
 #define VAR_UNUSED_0x40DB                    0x40DB // Unused Var
 #define VAR_UNUSED_0x40DC                    0x40DC // Unused Var
 #define VAR_EVENT_PICHU_SLOT                 0x40DD