Finish moving pokeruby vars

data/event_scripts.s

@@ -1114,7 +1114,7 @@ EverGrandeCity_HallOfFame_EventScript_2717C1:: @ 82717C1
 	setflag FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY
 	clearflag FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY
 	clearflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_INVISIBLE_NINJA_BOY
-	setvar VAR_0x40C6, 2
+	setvar VAR_STEVENS_HOUSE_STATE, 2
 	setflag FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY
 	clearflag FLAG_HIDE_VICTORY_ROAD_EXIT_WALLY
 	clearflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_SS_TIDAL
@@ -4560,7 +4560,7 @@ BattleFrontier_BattleTowerLobby_EventScript_28CC7A:: @ 828CC7A
 	end
 
 BattleFrontier_BattleTowerLobby_EventScript_28CC84:: @ 828CC84
-	compare VAR_0x40BC, 0
+	compare VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0
 	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_28CCA6
 	setvar VAR_0x8005, 7
 	special InterviewBefore

data/maps/BattleFrontier_BattleTowerLobby/scripts.inc

@@ -231,7 +231,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E8EE:: @ 823E8EE
 	end
 
 BattleFrontier_BattleTowerLobby_EventScript_23E930:: @ 823E930
-	setvar VAR_0x40BC, 1
+	setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 1
 	return
 
 BattleFrontier_BattleTowerLobby_EventScript_23E936:: @ 823E936
@@ -305,7 +305,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EA2A:: @ 823EA2A
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0
 	incrementgamestat 30
-	setvar VAR_0x40BC, 1
+	setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 1
 	goto BattleFrontier_BattleTowerLobby_EventScript_23F0F3
 	end
 
@@ -385,7 +385,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EB93:: @ 823EB93
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0
 	incrementgamestat 30
-	setvar VAR_0x40BC, 0
+	setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0
 	goto BattleFrontier_BattleTowerLobby_EventScript_23F0F3
 	end
 
@@ -466,7 +466,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23ECFF:: @ 823ECFF
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23F0D0
 	incrementgamestat 30
-	setvar VAR_0x40BC, 0
+	setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0
 	goto BattleFrontier_BattleTowerLobby_EventScript_23F0F3
 	end
 
@@ -995,7 +995,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F3A6:: @ 823F3A6
 
 BattleFrontier_BattleTowerLobby_EventScript_23F3AF:: @ 823F3AF
 	incrementgamestat 30
-	setvar VAR_0x40BC, 0
+	setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0
 	message BattleFrontier_BattleTowerLobby_Text_24144D
 	waitmessage
 	setvar VAR_0x8004, 6
@@ -1058,7 +1058,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F463:: @ 823F463
 
 BattleFrontier_BattleTowerLobby_EventScript_23F496:: @ 823F496
 	incrementgamestat 30
-	setvar VAR_0x40BC, 0
+	setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0
 	message BattleFrontier_BattleTowerLobby_Text_24144D
 	waitmessage
 	setvar VAR_0x8004, 6

data/maps/BattleFrontier_OutsideEast/scripts.inc

@@ -15,7 +15,7 @@ BattleFrontier_OutsideEast_EventScript_242C19:: @ 8242C19
 	return
 
 BattleFrontier_OutsideEast_MapScript1_242C2D: @ 8242C2D
-	setvar VAR_0x40BC, 0
+	setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0
 	setflag FLAG_HIDE_BATTLE_TOWER_REPORTER
 	call_if_unset FLAG_DEFEATED_SUDOWOODO, BattleFrontier_OutsideEast_EventScript_242C3F
 	end

data/maps/BattleFrontier_OutsideWest/scripts.inc

@@ -3,7 +3,7 @@ BattleFrontier_OutsideWest_MapScripts:: @ 823D3E1
 	.byte 0
 
 BattleFrontier_OutsideWest_MapScript1_23D3E7: @ 823D3E7
-	setvar VAR_0x40BC, 0
+	setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0
 	setflag FLAG_HIDE_BATTLE_TOWER_REPORTER
 	end
 

data/maps/JaggedPass/scripts.inc

@@ -21,7 +21,7 @@ JaggedPass_EventScript_230685:: @ 8230685
 	return
 
 JaggedPass_MapScript1_23068B: @ 823068B
-	compare VAR_0x40BD, 1
+	compare VAR_JAGGED_PASS_ASH_WEATHER, 1
 	call_if_eq JaggedPass_EventScript_230697
 	end
 

data/maps/LittlerootTown/scripts.inc

@@ -16,7 +16,7 @@ LittlerootTown_MapScript1_1E7DDB: @ 81E7DDB
 	call_if_eq LittlerootTown_EventScript_1E7E5C
 	compare VAR_LITTLEROOT_HOUSES_STATE_2, 4
 	call_if_eq LittlerootTown_EventScript_1E7E5C
-	compare VAR_0x40C7, 1
+	compare VAR_OLDALE_STATE, 1
 	call_if_eq LittlerootTown_EventScript_1E7E53
 	compare VAR_LITTLEROOT_RIVAL_STATE, 3
 	call_if_eq LittlerootTown_EventScript_1E7E4F
@@ -39,7 +39,7 @@ LittlerootTown_EventScript_1E7E4F:: @ 81E7E4F
 	return
 
 LittlerootTown_EventScript_1E7E53:: @ 81E7E53
-	setvar VAR_0x40C7, 2
+	setvar VAR_OLDALE_STATE, 2
 	setflag FLAG_HIDE_OLDALE_TOWN_RIVAL
 	return
 

data/maps/MagmaHideout_1F/scripts.inc

@@ -3,7 +3,7 @@ MagmaHideout_1F_MapScripts:: @ 8239880
 	.byte 0
 
 MagmaHideout_1F_MapScript1_239886: @ 8239886
-	setvar VAR_0x40BD, 0
+	setvar VAR_JAGGED_PASS_ASH_WEATHER, 0
 	end
 
 MagmaHideout_1F_EventScript_23988C:: @ 823988C

data/maps/MagmaHideout_4F/scripts.inc

@@ -64,7 +64,7 @@ MagmaHideout_4F_EventScript_23A560:: @ 823A560
 	clearflag FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY
 	setvar VAR_SLATEPORT_STATE, 1
 	setflag FLAG_GROUDON_AWAKENED_MAGMA_HIDEOUT
-	setvar VAR_0x40A0, 1
+	setvar VAR_SLATEPORT_HARBOR_STATE, 1
 	fadescreen 1
 	removeobject 6
 	removeobject 2

data/maps/MauvilleCity/scripts.inc

@@ -421,7 +421,7 @@ MauvilleCity_EventScript_1DF73A:: @ 81DF73A
 	lock
 	faceplayer
 	goto_if_set FLAG_GOT_TM24_FROM_WATTSON, MauvilleCity_EventScript_1DF7B0
-	compare VAR_0x40BA, 2
+	compare VAR_NEW_MAUVILLE_STATE, 2
 	goto_if_eq MauvilleCity_EventScript_1DF784
 	goto_if_set FLAG_GOT_BASEMENT_KEY_FROM_WATTSON, MauvilleCity_EventScript_1DF77A
 	msgbox MauvilleCity_Text_1DFFE4, MSGBOX_DEFAULT

data/maps/MauvilleCity_Gym/scripts.inc

@@ -79,7 +79,7 @@ MauvilleCity_Gym_EventScript_20DEEB:: @ 820DEEB
 	compare VAR_RESULT, 1
 	goto_if_eq MauvilleCity_Gym_EventScript_20DFDE
 	goto_if_unset FLAG_RECEIVED_TM34, MauvilleCity_Gym_EventScript_20DF8D
-	compare VAR_0x40BA, 2
+	compare VAR_NEW_MAUVILLE_STATE, 2
 	goto_if_eq MauvilleCity_Gym_EventScript_20DFD4
 	msgbox MauvilleCity_Gym_Text_20E8E3, MSGBOX_DEFAULT
 	release

data/maps/MeteorFalls_1F_1R/map.json

@@ -195,7 +195,7 @@
       "x": 14,
       "y": 18,
       "elevation": 4,
-      "var": "VAR_0x40BF",
+      "var": "VAR_METEOR_FALLS_STATE",
       "var_value": "0",
       "script": "MeteorFalls_1F_1R_EventScript_22BD5F"
     }

data/maps/MeteorFalls_1F_1R/scripts.inc

@@ -86,7 +86,7 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F
 	setflag FLAG_HIDE_ROUTE_112_TEAM_MAGMA
 	setflag FLAG_MET_ARCHIE_METEOR_FALLS
 	setflag FLAG_HIDE_FALLORBOR_TOWN_BATTLE_TENT_SCOTT
-	setvar VAR_0x40BF, 1
+	setvar VAR_METEOR_FALLS_STATE, 1
 	releaseall
 	end
 

data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc

@@ -315,7 +315,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_224071:: @ 8224071
 	removeobject 4
 	setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_INVISIBLE_NINJA_BOY
 	clearflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_STEVEN
-	setvar VAR_0x40C6, 1
+	setvar VAR_STEVENS_HOUSE_STATE, 1
 	setflag FLAG_HIDE_MOSSDEEP_CITY_SCOTT
 	removeobject 3
 	setobjectxyperm 3, 5, 6

data/maps/MossdeepCity_StevensHouse/scripts.inc

@@ -13,7 +13,7 @@ MossdeepCity_StevensHouse_EventScript_22279E:: @ 822279E
 	return
 
 MossdeepCity_StevensHouse_MapScript1_2227A8: @ 82227A8
-	compare VAR_0x40C6, 2
+	compare VAR_STEVENS_HOUSE_STATE, 2
 	call_if_eq MossdeepCity_StevensHouse_EventScript_2227B4
 	end
 
@@ -23,7 +23,7 @@ MossdeepCity_StevensHouse_EventScript_2227B4:: @ 82227B4
 	return
 
 MossdeepCity_StevensHouse_MapScript2_2227C0: @ 82227C0
-	map_script_2 VAR_0x40C6, 1, MossdeepCity_StevensHouse_EventScript_2227CA
+	map_script_2 VAR_STEVENS_HOUSE_STATE, 1, MossdeepCity_StevensHouse_EventScript_2227CA
 	.2byte 0
 
 MossdeepCity_StevensHouse_EventScript_2227CA:: @ 82227CA
@@ -48,7 +48,7 @@ MossdeepCity_StevensHouse_EventScript_2227CA:: @ 82227CA
 	waitmovement 0
 	setflag FLAG_HIDE_MOSSDEEP_CITY_SCOTT
 	setflag FLAG_HIDE_SEAFLOOR_CAVERN_ENTRANCE_AQUA_GRUNT
-	setvar VAR_0x40C6, 2
+	setvar VAR_STEVENS_HOUSE_STATE, 2
 	releaseall
 	end
 

data/maps/MtChimney/scripts.inc

@@ -4,7 +4,7 @@ MtChimney_MapScripts:: @ 822EDC1
 	.byte 0
 
 MtChimney_MapScript1_22EDCC: @ 822EDCC
-	setvar VAR_0x40BD, 1
+	setvar VAR_JAGGED_PASS_ASH_WEATHER, 1
 	end
 
 MtChimney_MapScript1_22EDD2: @ 822EDD2

data/maps/MtChimney_CableCarStation/scripts.inc

@@ -4,7 +4,7 @@ MtChimney_CableCarStation_MapScripts:: @ 822ABFA
 	.byte 0
 
 MtChimney_CableCarStation_MapScript1_22AC05: @ 822AC05
-	compare VAR_0x40A3, 1
+	compare VAR_CABLE_CAR_STATION_STATE, 1
 	call_if_eq MtChimney_CableCarStation_EventScript_22AC11
 	end
 
@@ -14,7 +14,7 @@ MtChimney_CableCarStation_EventScript_22AC11:: @ 822AC11
 	return
 
 MtChimney_CableCarStation_MapScript2_22AC1D: @ 822AC1D
-	map_script_2 VAR_0x40A3, 1, MtChimney_CableCarStation_EventScript_22AC27
+	map_script_2 VAR_CABLE_CAR_STATION_STATE, 1, MtChimney_CableCarStation_EventScript_22AC27
 	.2byte 0
 
 MtChimney_CableCarStation_EventScript_22AC27:: @ 822AC27
@@ -22,7 +22,7 @@ MtChimney_CableCarStation_EventScript_22AC27:: @ 822AC27
 	applymovement EVENT_OBJ_ID_PLAYER, MtChimney_CableCarStation_Movement_22ACB4
 	applymovement 1, MtChimney_CableCarStation_Movement_22ACAA
 	waitmovement 0
-	setvar VAR_0x40A3, 0
+	setvar VAR_CABLE_CAR_STATION_STATE, 0
 	setobjectxyperm 1, 6, 7
 	setobjectmovementtype 1, MOVEMENT_TYPE_FACE_DOWN
 	releaseall
@@ -45,7 +45,7 @@ MtChimney_CableCarStation_EventScript_22AC6C:: @ 822AC6C
 	applymovement EVENT_OBJ_ID_PLAYER, MtChimney_CableCarStation_Movement_22ACAF
 	waitmovement 0
 	setvar VAR_0x8004, 1
-	setvar VAR_0x40A3, 2
+	setvar VAR_CABLE_CAR_STATION_STATE, 2
 	incrementgamestat 48
 	special CableCarWarp
 	special CableCar

data/maps/MtPyre_Summit/map.json

@@ -148,7 +148,7 @@
       "x": 22,
       "y": 7,
       "elevation": 3,
-      "var": "VAR_0x40B9",
+      "var": "VAR_MT_PYRE_STATE",
       "var_value": "0",
       "script": "MtPyre_Summit_EventScript_232018"
     },
@@ -157,7 +157,7 @@
       "x": 23,
       "y": 7,
       "elevation": 3,
-      "var": "VAR_0x40B9",
+      "var": "VAR_MT_PYRE_STATE",
       "var_value": "0",
       "script": "MtPyre_Summit_EventScript_232024"
     },
@@ -166,7 +166,7 @@
       "x": 24,
       "y": 7,
       "elevation": 3,
-      "var": "VAR_0x40B9",
+      "var": "VAR_MT_PYRE_STATE",
       "var_value": "0",
       "script": "MtPyre_Summit_EventScript_232030"
     },
@@ -175,7 +175,7 @@
       "x": 22,
       "y": 9,
       "elevation": 3,
-      "var": "VAR_0x40B9",
+      "var": "VAR_MT_PYRE_STATE",
       "var_value": "2",
       "script": "MtPyre_Summit_EventScript_2321EC"
     },
@@ -184,7 +184,7 @@
       "x": 23,
       "y": 9,
       "elevation": 3,
-      "var": "VAR_0x40B9",
+      "var": "VAR_MT_PYRE_STATE",
       "var_value": "2",
       "script": "MtPyre_Summit_EventScript_2321F8"
     },
@@ -193,7 +193,7 @@
       "x": 24,
       "y": 9,
       "elevation": 3,
-      "var": "VAR_0x40B9",
+      "var": "VAR_MT_PYRE_STATE",
       "var_value": "2",
       "script": "MtPyre_Summit_EventScript_232204"
     }

data/maps/MtPyre_Summit/scripts.inc

@@ -3,7 +3,7 @@ MtPyre_Summit_MapScripts:: @ 8231FF7
 	.byte 0
 
 MtPyre_Summit_MapScript1_231FFD: @ 8231FFD
-	compare VAR_0x40B9, 2
+	compare VAR_MT_PYRE_STATE, 2
 	call_if_eq MtPyre_Summit_EventScript_232009
 	end
 
@@ -56,7 +56,7 @@ MtPyre_Summit_EventScript_23203C:: @ 823203C
 	fadedefaultbgm
 	fadescreen 0
 	delay 20
-	setvar VAR_0x40B9, 1
+	setvar VAR_MT_PYRE_STATE, 1
 	compare VAR_0x8008, 0
 	call_if_eq MtPyre_Summit_EventScript_2320F7
 	compare VAR_0x8008, 1
@@ -165,7 +165,7 @@ MtPyre_Summit_EventScript_2321A2:: @ 82321A2
 	lock
 	faceplayer
 	goto_if_set FLAG_RETURNED_RED_OR_BLUE_ORB, MtPyre_Summit_EventScript_2321E2
-	compare VAR_0x40B9, 3
+	compare VAR_MT_PYRE_STATE, 3
 	call_if_ge MtPyre_Summit_EventScript_2321CB
 	goto_if_set FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, MtPyre_Summit_EventScript_2321D8
 	msgbox MtPyre_Summit_Text_232AD8, MSGBOX_DEFAULT
@@ -242,7 +242,7 @@ MtPyre_Summit_EventScript_232210:: @ 8232210
 	waitmovement 0
 	removeobject 2
 	removeobject 8
-	setvar VAR_0x40B9, 3
+	setvar VAR_MT_PYRE_STATE, 3
 	releaseall
 	end
 

data/maps/NewMauville_Entrance/map.json

@@ -36,7 +36,7 @@
       "x": 4,
       "y": 2,
       "elevation": 3,
-      "var": "VAR_0x40BA",
+      "var": "VAR_NEW_MAUVILLE_STATE",
       "var_value": "0",
       "script": "NewMauville_Entrance_EventScript_2372FF"
     }

data/maps/NewMauville_Entrance/scripts.inc

@@ -4,7 +4,7 @@ NewMauville_Entrance_MapScripts:: @ 82372AD
 	.byte 0
 
 NewMauville_Entrance_MapScript1_2372B8: @ 82372B8
-	compare VAR_0x40BA, 0
+	compare VAR_NEW_MAUVILLE_STATE, 0
 	call_if_eq NewMauville_Entrance_EventScript_2372C4
 	end
 
@@ -41,7 +41,7 @@ NewMauville_Entrance_EventScript_2372FF:: @ 82372FF
 	setmetatile 5, 1, 717, 1
 	special DrawWholeMapView
 	playse SE_BAN
-	setvar VAR_0x40BA, 1
+	setvar VAR_NEW_MAUVILLE_STATE, 1
 	releaseall
 	end
 

data/maps/NewMauville_Inside/map.json

@@ -215,7 +215,7 @@
       "x": 33,
       "y": 6,
       "elevation": 3,
-      "var": "VAR_0x40BA",
+      "var": "VAR_NEW_MAUVILLE_STATE",
       "var_value": "1",
       "script": "NewMauville_Inside_EventScript_237725"
     }

data/maps/NewMauville_Inside/scripts.inc

@@ -40,7 +40,7 @@ NewMauville_Inside_EventScript_237449:: @ 8237449
 	return
 
 NewMauville_Inside_MapScript1_23744D: @ 823744D
-	compare VAR_0x40BA, 2
+	compare VAR_NEW_MAUVILLE_STATE, 2
 	call_if_eq NewMauville_Inside_EventScript_23773A
 	end
 
@@ -148,7 +148,7 @@ NewMauville_Inside_EventScript_237725:: @ 8237725
 	lockall
 	msgbox NewMauville_Inside_Text_237932, MSGBOX_DEFAULT
 	call NewMauville_Inside_EventScript_23773A
-	setvar VAR_0x40BA, 2
+	setvar VAR_NEW_MAUVILLE_STATE, 2
 	releaseall
 	end
 
@@ -167,7 +167,7 @@ NewMauville_Inside_EventScript_23773A:: @ 823773A
 
 NewMauville_Inside_EventScript_23778F:: @ 823778F
 	lockall
-	compare VAR_0x40BA, 2
+	compare VAR_NEW_MAUVILLE_STATE, 2
 	goto_if_eq NewMauville_Inside_EventScript_2377A5
 	msgbox NewMauville_Inside_Text_237896, MSGBOX_DEFAULT
 	releaseall

data/maps/OldaleTown/map.json

@@ -128,7 +128,7 @@
       "x": 8,
       "y": 19,
       "elevation": 3,
-      "var": "VAR_0x40C7",
+      "var": "VAR_OLDALE_STATE",
       "var_value": "1",
       "script": "OldaleTown_EventScript_1E9086"
     },
@@ -137,7 +137,7 @@
       "x": 9,
       "y": 19,
       "elevation": 3,
-      "var": "VAR_0x40C7",
+      "var": "VAR_OLDALE_STATE",
       "var_value": "1",
       "script": "OldaleTown_EventScript_1E90A6"
     },
@@ -146,7 +146,7 @@
       "x": 10,
       "y": 19,
       "elevation": 3,
-      "var": "VAR_0x40C7",
+      "var": "VAR_OLDALE_STATE",
       "var_value": "1",
       "script": "OldaleTown_EventScript_1E90C6"
     }

data/maps/OldaleTown/scripts.inc

@@ -280,7 +280,7 @@ OldaleTown_EventScript_1E911A:: @ 81E911A
 	applymovement 4, OldaleTown_Movement_1E9177
 	waitmovement 0
 	removeobject 4
-	setvar VAR_0x40C7, 2
+	setvar VAR_OLDALE_STATE, 2
 	setflag FLAG_HIDE_OLDALE_TOWN_RIVAL
 	releaseall
 	end

data/maps/Route103/scripts.inc

@@ -143,7 +143,7 @@ Route103_EventScript_1EC5A2:: @ 81EC5A2
 	setvar VAR_BIRCH_LAB_STATE, 4
 	clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_RIVAL
 	setflag FLAG_DEFEATED_RIVAL_ROUTE103
-	setvar VAR_0x40C7, 1
+	setvar VAR_OLDALE_STATE, 1
 	clearflag FLAG_HIDE_OLDALE_TOWN_RIVAL
 	savebgm MUS_DUMMY
 	fadedefaultbgm

data/maps/Route110_TrickHouseCorridor/scripts.inc

@@ -3,6 +3,6 @@ Route110_TrickHouseCorridor_MapScripts:: @ 826B903
 	.byte 0
 
 Route110_TrickHouseCorridor_MapScript1_26B909: @ 826B909
-	setvar VAR_0x40B5, 1
+	setvar VAR_TRICK_HOUSE_STATE, 1
 	end
 

data/maps/Route110_TrickHouseEnd/scripts.inc

@@ -59,7 +59,7 @@ Route110_TrickHouseEnd_EventScript_26AD17:: @ 826AD17
 Route110_TrickHouseEnd_EventScript_26AD84:: @ 826AD84
 	msgbox Route110_TrickHouseEnd_Text_26B0BC, MSGBOX_DEFAULT
 	msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT
-	setvar VAR_0x40C1, 0
+	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
 	giveitem_std ITEM_RARE_CANDY
 	compare VAR_RESULT, 0
 	call_if_eq Route110_TrickHouseEnd_EventScript_26AFEF
@@ -72,7 +72,7 @@ Route110_TrickHouseEnd_EventScript_26AD84:: @ 826AD84
 Route110_TrickHouseEnd_EventScript_26ADC0:: @ 826ADC0
 	msgbox Route110_TrickHouseEnd_Text_26B13B, MSGBOX_DEFAULT
 	msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT
-	setvar VAR_0x40C1, 0
+	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
 	giveitem_std ITEM_TIMER_BALL
 	compare VAR_RESULT, 0
 	call_if_eq Route110_TrickHouseEnd_EventScript_26AFEF
@@ -85,7 +85,7 @@ Route110_TrickHouseEnd_EventScript_26ADC0:: @ 826ADC0
 Route110_TrickHouseEnd_EventScript_26ADFC:: @ 826ADFC
 	msgbox Route110_TrickHouseEnd_Text_26B1AD, MSGBOX_DEFAULT
 	msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT
-	setvar VAR_0x40C1, 0
+	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
 	giveitem_std ITEM_HARD_STONE
 	compare VAR_RESULT, 0
 	call_if_eq Route110_TrickHouseEnd_EventScript_26AFEF
@@ -98,7 +98,7 @@ Route110_TrickHouseEnd_EventScript_26ADFC:: @ 826ADFC
 Route110_TrickHouseEnd_EventScript_26AE38:: @ 826AE38
 	msgbox Route110_TrickHouseEnd_Text_26B223, MSGBOX_DEFAULT
 	msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT
-	setvar VAR_0x40C1, 0
+	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
 	giveitem_std ITEM_SMOKE_BALL
 	compare VAR_RESULT, 0
 	call_if_eq Route110_TrickHouseEnd_EventScript_26AFEF
@@ -111,7 +111,7 @@ Route110_TrickHouseEnd_EventScript_26AE38:: @ 826AE38
 Route110_TrickHouseEnd_EventScript_26AE74:: @ 826AE74
 	msgbox Route110_TrickHouseEnd_Text_26B293, MSGBOX_DEFAULT
 	msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT
-	setvar VAR_0x40C1, 0
+	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
 	giveitem_std ITEM_TM12
 	compare VAR_RESULT, 0
 	call_if_eq Route110_TrickHouseEnd_EventScript_26AFEF
@@ -124,7 +124,7 @@ Route110_TrickHouseEnd_EventScript_26AE74:: @ 826AE74
 Route110_TrickHouseEnd_EventScript_26AEB0:: @ 826AEB0
 	msgbox Route110_TrickHouseEnd_Text_26B315, MSGBOX_DEFAULT
 	msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT
-	setvar VAR_0x40C1, 0
+	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
 	giveitem_std ITEM_MAGNET
 	compare VAR_RESULT, 0
 	call_if_eq Route110_TrickHouseEnd_EventScript_26AFEF
@@ -137,7 +137,7 @@ Route110_TrickHouseEnd_EventScript_26AEB0:: @ 826AEB0
 Route110_TrickHouseEnd_EventScript_26AEEC:: @ 826AEEC
 	msgbox Route110_TrickHouseEnd_Text_26B365, MSGBOX_DEFAULT
 	msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT
-	setvar VAR_0x40C1, 0
+	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
 	giveitem_std ITEM_PP_MAX
 	compare VAR_RESULT, 0
 	call_if_eq Route110_TrickHouseEnd_EventScript_26AFEF
@@ -165,7 +165,7 @@ Route110_TrickHouseEnd_EventScript_26AF28:: @ 826AF28
 	waitmovement 0
 	delay 30
 	msgbox Route110_TrickHouseEnd_Text_26B485, MSGBOX_DEFAULT
-	setvar VAR_0x40C1, 0
+	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
 	call Route110_TrickHouseEnd_EventScript_26AFA5
 	compare VAR_RESULT, 0
 	call_if_eq Route110_TrickHouseEnd_EventScript_26B002
@@ -202,13 +202,13 @@ Route110_TrickHouseEnd_EventScript_26AFCF:: @ 826AFCF
 Route110_TrickHouseEnd_EventScript_26AFEF:: @ 826AFEF
 	call Route110_TrickHouseEnd_EventScript_27205E
 	msgbox Route110_TrickHouseEnd_Text_26B760, MSGBOX_DEFAULT
-	setvar VAR_0x40C1, 1
+	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 1
 	return
 
 Route110_TrickHouseEnd_EventScript_26B002:: @ 826B002
 	call Route110_TrickHouseEnd_EventScript_272071
 	msgbox Route110_TrickHouseEnd_Text_26B615, MSGBOX_DEFAULT
-	setvar VAR_0x40C1, 1
+	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 1
 	return
 
 Route110_TrickHouseEnd_EventScript_26B015:: @ 826B015

data/maps/Route110_TrickHouseEntrance/map.json

@@ -57,7 +57,7 @@
       "x": 4,
       "y": 7,
       "elevation": 3,
-      "var": "VAR_0x40A5",
+      "var": "VAR_TRICK_HOUSE_ENTRANCE_STATE_1",
       "var_value": "0",
       "script": "Route110_TrickHouseEntrance_EventScript_26A3F8"
     },
@@ -66,7 +66,7 @@
       "x": 5,
       "y": 6,
       "elevation": 3,
-      "var": "VAR_0x40A5",
+      "var": "VAR_TRICK_HOUSE_ENTRANCE_STATE_1",
       "var_value": "0",
       "script": "Route110_TrickHouseEntrance_EventScript_26A3F8"
     },
@@ -75,7 +75,7 @@
       "x": 6,
       "y": 6,
       "elevation": 3,
-      "var": "VAR_0x40A5",
+      "var": "VAR_TRICK_HOUSE_ENTRANCE_STATE_1",
       "var_value": "0",
       "script": "Route110_TrickHouseEntrance_EventScript_26A3F8"
     },
@@ -84,7 +84,7 @@
       "x": 7,
       "y": 7,
       "elevation": 3,
-      "var": "VAR_0x40A5",
+      "var": "VAR_TRICK_HOUSE_ENTRANCE_STATE_1",
       "var_value": "0",
       "script": "Route110_TrickHouseEntrance_EventScript_26A3F8"
     }

data/maps/Route110_TrickHouseEntrance/scripts.inc

@@ -6,19 +6,19 @@ Route110_TrickHouseEntrance_MapScripts:: @ 8269A50
 
 Route110_TrickHouseEntrance_MapScript1_269A60: @ 8269A60
 	setflag FLAG_LANDMARK_TRICK_HOUSE
-	compare VAR_0x40B5, 1
+	compare VAR_TRICK_HOUSE_STATE, 1
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_269AF3
-	compare VAR_0x40C1, 1
+	compare VAR_TRICK_HOUSE_PRIZE_PICKUP, 1
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_269AD7
-	compare VAR_0x40A6, 1
+	compare VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_269BB3
-	compare VAR_0x40A7, 5
+	compare VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 5
 	call_if_eq Route110_TrickHouseEntrance_EventScript_269B03
-	compare VAR_0x40A7, 3
+	compare VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3
 	call_if_eq Route110_TrickHouseEntrance_EventScript_269B03
-	compare VAR_0x40A7, 0
+	compare VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 0
 	call_if_eq Route110_TrickHouseEntrance_EventScript_269B03
-	switch VAR_0x40A7
+	switch VAR_TRICK_HOUSE_ENTRANCE_STATE_3
 	case 0, Route110_TrickHouseEntrance_EventScript_269BBB
 	case 1, Route110_TrickHouseEntrance_EventScript_269BC1
 	case 3, Route110_TrickHouseEntrance_EventScript_269BC7
@@ -26,24 +26,24 @@ Route110_TrickHouseEntrance_MapScript1_269A60: @ 8269A60
 	end
 
 Route110_TrickHouseEntrance_EventScript_269AD7:: @ 8269AD7
-	setvar VAR_0x40A5, 1
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_1, 1
 	compare VAR_0x4044, 8
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_269AED
-	setvar VAR_0x40A7, 2
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 2
 	end
 
 Route110_TrickHouseEntrance_EventScript_269AED:: @ 8269AED
-	setvar VAR_0x40A7, 6
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 6
 	end
 
 Route110_TrickHouseEntrance_EventScript_269AF3:: @ 8269AF3
-	setvar VAR_0x40B5, 0
+	setvar VAR_TRICK_HOUSE_STATE, 0
-	setvar VAR_0x40A7, 5
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 5
-	setvar VAR_0x40A5, 1
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_1, 1
 	end
 
 Route110_TrickHouseEntrance_EventScript_269B03:: @ 8269B03
-	setvar VAR_0x40A7, 0
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 0
 	compare VAR_0x4044, 1
 	call_if_eq Route110_TrickHouseEntrance_EventScript_269B61
 	compare VAR_0x4044, 2
@@ -91,11 +91,11 @@ Route110_TrickHouseEntrance_EventScript_269B9D:: @ 8269B9D
 	return
 
 Route110_TrickHouseEntrance_EventScript_269BA7:: @ 8269BA7
-	setvar VAR_0x40A7, 4
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 4
 	return
 
 Route110_TrickHouseEntrance_EventScript_269BAD:: @ 8269BAD
-	setvar VAR_0x40A7, 3
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3
 	return
 
 Route110_TrickHouseEntrance_EventScript_269BB3:: @ 8269BB3
@@ -103,30 +103,30 @@ Route110_TrickHouseEntrance_EventScript_269BB3:: @ 8269BB3
 	end
 
 Route110_TrickHouseEntrance_EventScript_269BBB:: @ 8269BBB
-	setvar VAR_0x40A5, 0
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_1, 0
 	end
 
 Route110_TrickHouseEntrance_EventScript_269BC1:: @ 8269BC1
-	setvar VAR_0x40A5, 1
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_1, 1
 	end
 
 Route110_TrickHouseEntrance_EventScript_269BC7:: @ 8269BC7
-	setvar VAR_0x40A5, 1
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_1, 1
 	end
 
 Route110_TrickHouseEntrance_EventScript_269BCD:: @ 8269BCD
-	setvar VAR_0x40A5, 1
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_1, 1
 	end
 
 Route110_TrickHouseEntrance_MapScript2_269BD3: @ 8269BD3
-	map_script_2 VAR_0x40A6, 1, Route110_TrickHouseEntrance_EventScript_269C15
+	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1, Route110_TrickHouseEntrance_EventScript_269C15
-	map_script_2 VAR_0x40A7, 0, Route110_TrickHouseEntrance_EventScript_269C26
+	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 0, Route110_TrickHouseEntrance_EventScript_269C26
-	map_script_2 VAR_0x40A7, 1, Route110_TrickHouseEntrance_EventScript_269CCC
+	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 1, Route110_TrickHouseEntrance_EventScript_269CCC
-	map_script_2 VAR_0x40A7, 2, Route110_TrickHouseEntrance_EventScript_269CD0
+	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 2, Route110_TrickHouseEntrance_EventScript_269CD0
-	map_script_2 VAR_0x40A7, 3, Route110_TrickHouseEntrance_EventScript_269CD0
+	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3, Route110_TrickHouseEntrance_EventScript_269CD0
-	map_script_2 VAR_0x40A7, 4, Route110_TrickHouseEntrance_EventScript_269CCC
+	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 4, Route110_TrickHouseEntrance_EventScript_269CCC
-	map_script_2 VAR_0x40A7, 5, Route110_TrickHouseEntrance_EventScript_269CCC
+	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 5, Route110_TrickHouseEntrance_EventScript_269CCC
-	map_script_2 VAR_0x40A7, 6, Route110_TrickHouseEntrance_EventScript_269CDF
+	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 6, Route110_TrickHouseEntrance_EventScript_269CDF
 	.2byte 0
 
 Route110_TrickHouseEntrance_EventScript_269C15:: @ 8269C15
@@ -199,7 +199,7 @@ Route110_TrickHouseEntrance_EventScript_269CDF:: @ 8269CDF
 	end
 
 Route110_TrickHouseEntrance_MapScript2_269CEE: @ 8269CEE
-	map_script_2 VAR_0x40A6, 1, Route110_TrickHouseEntrance_EventScript_269CF8
+	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1, Route110_TrickHouseEntrance_EventScript_269CF8
 	.2byte 0
 
 Route110_TrickHouseEntrance_EventScript_269CF8:: @ 8269CF8
@@ -216,8 +216,8 @@ Route110_TrickHouseEntrance_EventScript_269CF8:: @ 8269CF8
 	applymovement 1, Route110_TrickHouseEntrance_Movement_269E3F
 	waitmovement 0
 	removeobject 1
-	setvar VAR_0x40A7, 1
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 1
-	setvar VAR_0x40A6, 0
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 0
 	releaseall
 	end
 
@@ -227,7 +227,7 @@ Route110_TrickHouseEntrance_EventScript_269D39:: @ 8269D39
 
 Route110_TrickHouseEntrance_EventScript_269D3B:: @ 8269D3B
 	lockall
-	switch VAR_0x40A7
+	switch VAR_TRICK_HOUSE_ENTRANCE_STATE_3
 	case 0, Route110_TrickHouseEntrance_EventScript_269D6E
 	case 2, Route110_TrickHouseEntrance_EventScript_269E8F
 	case 3, Route110_TrickHouseEntrance_EventScript_269E51
@@ -257,7 +257,7 @@ Route110_TrickHouseEntrance_EventScript_269D6E:: @ 8269D6E
 	compare VAR_0x4044, 7
 	call_if_eq Route110_TrickHouseEntrance_EventScript_269E2D
 	closemessage
-	setvar VAR_0x40A6, 1
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1
 	warpsilent MAP_ROUTE110_TRICK_HOUSE_ENTRANCE, 255, 6, 2
 	waitstate
 	releaseall
@@ -430,8 +430,8 @@ Route110_TrickHouseEntrance_EventScript_269FF7:: @ 8269FF7
 	end
 
 Route110_TrickHouseEntrance_EventScript_26A023:: @ 826A023
-	setvar VAR_0x40C1, 0
+	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
-	setvar VAR_0x40A7, 3
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3
 	applymovement 1, Route110_TrickHouseEntrance_Movement_2725A6
 	waitmovement 0
 	releaseall
@@ -475,14 +475,14 @@ Route110_TrickHouseEntrance_EventScript_26A09A:: @ 826A09A
 	applymovement 1, Route110_TrickHouseEntrance_Movement_269E3F
 	waitmovement 0
 	removeobject 1
-	setvar VAR_0x40C1, 0
+	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
-	setvar VAR_0x40A7, 5
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 5
 	releaseall
 	end
 
 Route110_TrickHouseEntrance_EventScript_26A0D3:: @ 826A0D3
 	lockall
-	switch VAR_0x40A7
+	switch VAR_TRICK_HOUSE_ENTRANCE_STATE_3
 	case 0, Route110_TrickHouseEntrance_EventScript_26A106
 	case 1, Route110_TrickHouseEntrance_EventScript_26A110
 	case 4, Route110_TrickHouseEntrance_EventScript_26A201
@@ -604,88 +604,88 @@ Route110_TrickHouseEntrance_EventScript_26A22A:: @ 826A22A
 	end
 
 Route110_TrickHouseEntrance_EventScript_26A289:: @ 826A289
-	compare VAR_0x40AB, 0
+	compare VAR_TRICK_HOUSE_PUZZLE_1_STATE, 0
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1
 	msgbox Route110_TrickHousePuzzle1_Text_26B98D, MSGBOX_DEFAULT
 	playse SE_PIN
-	setvar VAR_0x40AB, 2
+	setvar VAR_TRICK_HOUSE_PUZZLE_1_STATE, 2
 	setmetatile 13, 1, 523, 0
 	special DrawWholeMapView
 	releaseall
 	end
 
 Route110_TrickHouseEntrance_EventScript_26A2B2:: @ 826A2B2
-	compare VAR_0x40AC, 0
+	compare VAR_TRICK_HOUSE_PUZZLE_2_STATE, 0
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1
 	msgbox Route110_TrickHousePuzzle2_Text_26BCBA, MSGBOX_DEFAULT
 	playse SE_PIN
-	setvar VAR_0x40AC, 2
+	setvar VAR_TRICK_HOUSE_PUZZLE_2_STATE, 2
 	setmetatile 13, 1, 523, 0
 	special DrawWholeMapView
 	releaseall
 	end
 
 Route110_TrickHouseEntrance_EventScript_26A2DB:: @ 826A2DB
-	compare VAR_0x40AD, 0
+	compare VAR_TRICK_HOUSE_PUZZLE_3_STATE, 0
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1
 	msgbox Route110_TrickHousePuzzle3_Text_26C609, MSGBOX_DEFAULT
 	playse SE_PIN
-	setvar VAR_0x40AD, 2
+	setvar VAR_TRICK_HOUSE_PUZZLE_3_STATE, 2
 	setmetatile 13, 1, 523, 0
 	special DrawWholeMapView
 	releaseall
 	end
 
 Route110_TrickHouseEntrance_EventScript_26A304:: @ 826A304
-	compare VAR_0x40AE, 0
+	compare VAR_TRICK_HOUSE_PUZZLE_4_STATE, 0
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1
 	msgbox Route110_TrickHousePuzzle4_Text_26C8C3, MSGBOX_DEFAULT
 	playse SE_PIN
-	setvar VAR_0x40AE, 2
+	setvar VAR_TRICK_HOUSE_PUZZLE_4_STATE, 2
 	setmetatile 13, 1, 523, 0
 	special DrawWholeMapView
 	releaseall
 	end
 
 Route110_TrickHouseEntrance_EventScript_26A32D:: @ 826A32D
-	compare VAR_0x40AF, 0
+	compare VAR_TRICK_HOUSE_PUZZLE_5_STATE, 0
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1
 	msgbox Route110_TrickHousePuzzle5_Text_26D660, MSGBOX_DEFAULT
 	playse SE_PIN
-	setvar VAR_0x40AF, 2
+	setvar VAR_TRICK_HOUSE_PUZZLE_5_STATE, 2
 	setmetatile 13, 1, 523, 0
 	special DrawWholeMapView
 	releaseall
 	end
 
 Route110_TrickHouseEntrance_EventScript_26A356:: @ 826A356
-	compare VAR_0x40B0, 0
+	compare VAR_TRICK_HOUSE_PUZZLE_6_STATE, 0
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1
 	msgbox Route110_TrickHousePuzzle6_Text_26DE26, MSGBOX_DEFAULT
 	playse SE_PIN
-	setvar VAR_0x40B0, 2
+	setvar VAR_TRICK_HOUSE_PUZZLE_6_STATE, 2
 	setmetatile 13, 1, 523, 0
 	special DrawWholeMapView
 	releaseall
 	end
 
 Route110_TrickHouseEntrance_EventScript_26A37F:: @ 826A37F
-	compare VAR_0x40B1, 0
+	compare VAR_TRICK_HOUSE_PUZZLE_7_STATE, 0
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1
 	msgbox Route110_TrickHousePuzzle7_EventScript_26E413, MSGBOX_DEFAULT
 	playse SE_PIN
-	setvar VAR_0x40B1, 2
+	setvar VAR_TRICK_HOUSE_PUZZLE_7_STATE, 2
 	setmetatile 13, 1, 523, 0
 	special DrawWholeMapView
 	releaseall
 	end
 
 Route110_TrickHouseEntrance_EventScript_26A3A8:: @ 826A3A8
-	compare VAR_0x40B2, 0
+	compare VAR_TRICK_HOUSE_PUZZLE_8_STATE, 0
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1
 	msgbox Route110_TrickHousePuzzle8_EventScript_26E864, MSGBOX_DEFAULT
 	playse SE_PIN
-	setvar VAR_0x40B2, 2
+	setvar VAR_TRICK_HOUSE_PUZZLE_8_STATE, 2
 	setmetatile 13, 1, 523, 0
 	special DrawWholeMapView
 	releaseall
@@ -733,7 +733,7 @@ Route110_TrickHouseEntrance_EventScript_26A3F8:: @ 826A3F8
 	call_if_eq Route110_TrickHouseEntrance_EventScript_26A439
 	compare VAR_0x4044, 2
 	call_if_eq Route110_TrickHouseEntrance_EventScript_26A449
-	setvar VAR_0x40A5, 1
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_1, 1
 	end
 
 Route110_TrickHouseEntrance_EventScript_26A429:: @ 826A429

data/maps/Route110_TrickHousePuzzle1/scripts.inc

@@ -3,7 +3,7 @@ Route110_TrickHousePuzzle1_MapScripts:: @ 826B90F
 	.byte 0
 
 Route110_TrickHousePuzzle1_MapScript1_26B915: @ 826B915
-	compare VAR_0x40AB, 2
+	compare VAR_TRICK_HOUSE_PUZZLE_1_STATE, 2
 	goto_if_eq Route110_TrickHousePuzzle1_EventScript_26B921
 	end
 
@@ -13,13 +13,13 @@ Route110_TrickHousePuzzle1_EventScript_26B921:: @ 826B921
 
 Route110_TrickHousePuzzle1_EventScript_26B92B:: @ 826B92B
 	lockall
-	compare VAR_0x40AB, 0
+	compare VAR_TRICK_HOUSE_PUZZLE_1_STATE, 0
 	goto_if_eq Route110_TrickHousePuzzle1_EventScript_26B93D
 	goto Route110_TrickHousePuzzle1_EventScript_26A3DB
 	end
 
 Route110_TrickHousePuzzle1_EventScript_26B93D:: @ 826B93D
-	setvar VAR_0x40AB, 1
+	setvar VAR_TRICK_HOUSE_PUZZLE_1_STATE, 1
 	goto Route110_TrickHousePuzzle1_EventScript_26A3E5
 	end
 

data/maps/Route110_TrickHousePuzzle2/scripts.inc

@@ -23,13 +23,13 @@ Route110_TrickHousePuzzle2_MapScript1_26BBAB: @ 826BBAB
 
 Route110_TrickHousePuzzle2_EventScript_26BBC0:: @ 826BBC0
 	lockall
-	compare VAR_0x40AC, 0
+	compare VAR_TRICK_HOUSE_PUZZLE_2_STATE, 0
 	goto_if_eq Route110_TrickHousePuzzle2_EventScript_26BBD2
 	goto Route110_TrickHousePuzzle2_EventScript_26A3DB
 	end
 
 Route110_TrickHousePuzzle2_EventScript_26BBD2:: @ 826BBD2
-	setvar VAR_0x40AC, 1
+	setvar VAR_TRICK_HOUSE_PUZZLE_2_STATE, 1
 	goto Route110_TrickHousePuzzle2_EventScript_26A3E5
 	end
 

data/maps/Route110_TrickHousePuzzle3/scripts.inc

@@ -291,13 +291,13 @@ Route110_TrickHousePuzzle3_EventScript_26C5A0:: @ 826C5A0
 
 Route110_TrickHousePuzzle3_EventScript_26C5A7:: @ 826C5A7
 	lockall
-	compare VAR_0x40AD, 0
+	compare VAR_TRICK_HOUSE_PUZZLE_3_STATE, 0
 	goto_if_eq Route110_TrickHousePuzzle3_EventScript_26C5B9
 	goto Route110_TrickHousePuzzle3_EventScript_26A3DB
 	end
 
 Route110_TrickHousePuzzle3_EventScript_26C5B9:: @ 826C5B9
-	setvar VAR_0x40AD, 1
+	setvar VAR_TRICK_HOUSE_PUZZLE_3_STATE, 1
 	goto Route110_TrickHousePuzzle3_EventScript_26A3E5
 	end
 

data/maps/Route110_TrickHousePuzzle4/scripts.inc

@@ -3,13 +3,13 @@ Route110_TrickHousePuzzle4_MapScripts:: @ 826C860
 
 Route110_TrickHousePuzzle4_EventScript_26C861:: @ 826C861
 	lockall
-	compare VAR_0x40AE, 0
+	compare VAR_TRICK_HOUSE_PUZZLE_4_STATE, 0
 	goto_if_eq Route110_TrickHousePuzzle4_EventScript_26C873
 	goto Route110_TrickHousePuzzle4_EventScript_26A3DB
 	end
 
 Route110_TrickHousePuzzle4_EventScript_26C873:: @ 826C873
-	setvar VAR_0x40AE, 1
+	setvar VAR_TRICK_HOUSE_PUZZLE_4_STATE, 1
 	goto Route110_TrickHousePuzzle4_EventScript_26A3E5
 	end
 

data/maps/Route110_TrickHousePuzzle5/scripts.inc

@@ -13,13 +13,13 @@ Route110_TrickHousePuzzle5_MapScript1_26CAF6: @ 826CAF6
 
 Route110_TrickHousePuzzle5_EventScript_26CB15:: @ 826CB15
 	lockall
-	compare VAR_0x40AF, 0
+	compare VAR_TRICK_HOUSE_PUZZLE_5_STATE, 0
 	goto_if_eq Route110_TrickHousePuzzle5_EventScript_26CB27
 	goto Route110_TrickHousePuzzle5_EventScript_26A3DB
 	end
 
 Route110_TrickHousePuzzle5_EventScript_26CB27:: @ 826CB27
-	setvar VAR_0x40AF, 1
+	setvar VAR_TRICK_HOUSE_PUZZLE_5_STATE, 1
 	goto Route110_TrickHousePuzzle5_EventScript_26A3E5
 	end
 

data/maps/Route110_TrickHousePuzzle6/scripts.inc

@@ -17,13 +17,13 @@ Route110_TrickHousePuzzle6_EventScript_26DDC0:: @ 826DDC0
 
 Route110_TrickHousePuzzle6_EventScript_26DDC4:: @ 826DDC4
 	lockall
-	compare VAR_0x40B0, 0
+	compare VAR_TRICK_HOUSE_PUZZLE_6_STATE, 0
 	goto_if_eq Route110_TrickHousePuzzle6_EventScript_26DDD6
 	goto Route110_TrickHousePuzzle6_EventScript_26A3DB
 	end
 
 Route110_TrickHousePuzzle6_EventScript_26DDD6:: @ 826DDD6
-	setvar VAR_0x40B0, 1
+	setvar VAR_TRICK_HOUSE_PUZZLE_6_STATE, 1
 	goto Route110_TrickHousePuzzle6_EventScript_26A3E5
 	end
 

data/maps/Route110_TrickHousePuzzle7/scripts.inc

@@ -68,7 +68,7 @@ Route110_TrickHousePuzzle7_EventScript_26E185:: @ 826E185
 	return
 
 Route110_TrickHousePuzzle7_MapScript1_26E198: @ 826E198
-	compare VAR_0x40B6, 1
+	compare VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 1
 	goto_if_eq Route110_TrickHousePuzzle7_EventScript_26E1B3
 	clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1
 	clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2
@@ -81,33 +81,33 @@ Route110_TrickHousePuzzle7_EventScript_26E1B3:: @ 826E1B3
 	end
 
 Route110_TrickHousePuzzle7_MapScript1_26E1B4: @ 826E1B4
-	compare VAR_0x40B6, 1
+	compare VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 1
 	call_if_eq Route110_TrickHousePuzzle7_EventScript_26E0AC
 	end
 
 Route110_TrickHousePuzzle7_MapScript2_26E1C0: @ 826E1C0
-	map_script_2 VAR_0x40B6, 1, Route110_TrickHousePuzzle7_EventScript_26E1CA
+	map_script_2 VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 1, Route110_TrickHousePuzzle7_EventScript_26E1CA
 	.2byte 0
 
 Route110_TrickHousePuzzle7_EventScript_26E1CA:: @ 826E1CA
-	setvar VAR_0x40B6, 0
+	setvar VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 0
 	end
 
 Route110_TrickHousePuzzle7_EventScript_26E1D0:: @ 826E1D0
 	lockall
-	compare VAR_0x40B1, 0
+	compare VAR_TRICK_HOUSE_PUZZLE_7_STATE, 0
 	goto_if_eq Route110_TrickHousePuzzle7_EventScript_26E1E2
 	goto Route110_TrickHousePuzzle7_EventScript_26A3DB
 	end
 
 Route110_TrickHousePuzzle7_EventScript_26E1E2:: @ 826E1E2
-	setvar VAR_0x40B1, 1
+	setvar VAR_TRICK_HOUSE_PUZZLE_7_STATE, 1
 	goto Route110_TrickHousePuzzle7_EventScript_26A3E5
 	end
 
 Route110_TrickHousePuzzle7_EventScript_26E1ED:: @ 826E1ED
 	lockall
-	setvar VAR_0x40B6, 1
+	setvar VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 1
 	warpteleport MAP_ROUTE110_TRICK_HOUSE_PUZZLE7, 255, 3, 19
 	waitstate
 	releaseall

data/maps/Route110_TrickHousePuzzle8/scripts.inc

@@ -3,13 +3,13 @@ Route110_TrickHousePuzzle8_MapScripts:: @ 826E801
 
 Route110_TrickHousePuzzle8_EventScript_26E802:: @ 826E802
 	lockall
-	compare VAR_0x40B2, 0
+	compare VAR_TRICK_HOUSE_PUZZLE_8_STATE, 0
 	goto_if_eq Route110_TrickHousePuzzle8_EventScript_26E814
 	goto Route110_TrickHousePuzzle8_EventScript_26A3DB
 	end
 
 Route110_TrickHousePuzzle8_EventScript_26E814:: @ 826E814
-	setvar VAR_0x40B2, 1
+	setvar VAR_TRICK_HOUSE_PUZZLE_8_STATE, 1
 	goto Route110_TrickHousePuzzle8_EventScript_26A3E5
 	end
 

data/maps/Route112/scripts.inc

@@ -4,7 +4,7 @@ Route112_MapScripts:: @ 81F1DA8
 
 Route112_MapScript1_1F1DAE: @ 81F1DAE
 	clearflag FLAG_FORCE_MIRAGE_TOWER_VISIBLE
-	setvar VAR_0x40BD, 0
+	setvar VAR_JAGGED_PASS_ASH_WEATHER, 0
 	end
 
 Route112_EventScript_1F1DB7:: @ 81F1DB7

data/maps/Route112_CableCarStation/scripts.inc

@@ -5,7 +5,7 @@ Route112_CableCarStation_MapScripts:: @ 822AABE
 
 Route112_CableCarStation_MapScript1_22AAC9: @ 822AAC9
 	setescapewarp MAP_ROUTE112, 255, 28, 28
-	compare VAR_0x40A3, 2
+	compare VAR_CABLE_CAR_STATION_STATE, 2
 	call_if_eq Route112_CableCarStation_EventScript_22AADD
 	end
 
@@ -15,7 +15,7 @@ Route112_CableCarStation_EventScript_22AADD:: @ 822AADD
 	return
 
 Route112_CableCarStation_MapScript2_22AAE9: @ 822AAE9
-	map_script_2 VAR_0x40A3, 2, Route112_CableCarStation_EventScript_22AAF3
+	map_script_2 VAR_CABLE_CAR_STATION_STATE, 2, Route112_CableCarStation_EventScript_22AAF3
 	.2byte 0
 
 Route112_CableCarStation_EventScript_22AAF3:: @ 822AAF3
@@ -23,7 +23,7 @@ Route112_CableCarStation_EventScript_22AAF3:: @ 822AAF3
 	applymovement EVENT_OBJ_ID_PLAYER, Route112_CableCarStation_Movement_22AB80
 	applymovement 1, Route112_CableCarStation_Movement_22AB76
 	waitmovement 0
-	setvar VAR_0x40A3, 0
+	setvar VAR_CABLE_CAR_STATION_STATE, 0
 	setobjectxyperm 1, 6, 7
 	setobjectmovementtype 1, MOVEMENT_TYPE_FACE_DOWN
 	releaseall
@@ -46,7 +46,7 @@ Route112_CableCarStation_EventScript_22AB38:: @ 822AB38
 	applymovement EVENT_OBJ_ID_PLAYER, Route112_CableCarStation_Movement_22AB7B
 	waitmovement 0
 	setvar VAR_0x8004, 0
-	setvar VAR_0x40A3, 1
+	setvar VAR_CABLE_CAR_STATION_STATE, 1
 	incrementgamestat 48
 	special CableCarWarp
 	special CableCar

data/maps/Route113_GlassWorkshop/scripts.inc

@@ -4,26 +4,26 @@ Route113_GlassWorkshop_MapScripts:: @ 826ED03
 
 Route113_GlassWorkshop_MapScript1_26ED09: @ 826ED09
 	setflag FLAG_LANDMARK_GLASS_WORKSHOP
-	compare VAR_0x40BE, 1
+	compare VAR_GLASS_WORKSHOP_STATE, 1
 	call_if_eq Route113_GlassWorkshop_EventScript_26ED18
 	end
 
 Route113_GlassWorkshop_EventScript_26ED18:: @ 826ED18
-	setvar VAR_0x40BE, 2
+	setvar VAR_GLASS_WORKSHOP_STATE, 2
 	return
 
 Route113_GlassWorkshop_EventScript_26ED1E:: @ 826ED1E
 	lock
 	faceplayer
-	compare VAR_0x40BE, 10
+	compare VAR_GLASS_WORKSHOP_STATE, 10
 	goto_if_ge Route113_GlassWorkshop_EventScript_26F090
-	compare VAR_0x40BE, 2
+	compare VAR_GLASS_WORKSHOP_STATE, 2
 	goto_if_eq Route113_GlassWorkshop_EventScript_26ED6E
-	compare VAR_0x40BE, 1
+	compare VAR_GLASS_WORKSHOP_STATE, 1
 	goto_if_eq Route113_GlassWorkshop_EventScript_26ED64
 	msgbox Route113_GlassWorkshop_Text_26F19D, MSGBOX_DEFAULT
 	giveitem_std ITEM_SOOT_SACK
-	setvar VAR_0x40BE, 1
+	setvar VAR_GLASS_WORKSHOP_STATE, 1
 	msgbox Route113_GlassWorkshop_Text_26F252, MSGBOX_DEFAULT
 	release
 	end
@@ -76,7 +76,7 @@ Route113_GlassWorkshop_EventScript_26EE1E:: @ 826EE1E
 	msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO
 	compare VAR_RESULT, 0
 	goto_if_eq Route113_GlassWorkshop_EventScript_26F003
-	setvar VAR_0x40BE, 10
+	setvar VAR_GLASS_WORKSHOP_STATE, 10
 	subvar VAR_ASH_GATHER_COUNT, 250
 	goto Route113_GlassWorkshop_EventScript_26F00F
 	end
@@ -90,7 +90,7 @@ Route113_GlassWorkshop_EventScript_26EE5A:: @ 826EE5A
 	msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO
 	compare VAR_RESULT, 0
 	goto_if_eq Route113_GlassWorkshop_EventScript_26F003
-	setvar VAR_0x40BE, 11
+	setvar VAR_GLASS_WORKSHOP_STATE, 11
 	subvar VAR_ASH_GATHER_COUNT, 500
 	goto Route113_GlassWorkshop_EventScript_26F00F
 	end
@@ -104,7 +104,7 @@ Route113_GlassWorkshop_EventScript_26EE96:: @ 826EE96
 	msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO
 	compare VAR_RESULT, 0
 	goto_if_eq Route113_GlassWorkshop_EventScript_26F003
-	setvar VAR_0x40BE, 12
+	setvar VAR_GLASS_WORKSHOP_STATE, 12
 	subvar VAR_ASH_GATHER_COUNT, 500
 	goto Route113_GlassWorkshop_EventScript_26F00F
 	end
@@ -118,7 +118,7 @@ Route113_GlassWorkshop_EventScript_26EED2:: @ 826EED2
 	msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO
 	compare VAR_RESULT, 0
 	goto_if_eq Route113_GlassWorkshop_EventScript_26F003
-	setvar VAR_0x40BE, 13
+	setvar VAR_GLASS_WORKSHOP_STATE, 13
 	subvar VAR_ASH_GATHER_COUNT, 1000
 	goto Route113_GlassWorkshop_EventScript_26F00F
 	end
@@ -132,7 +132,7 @@ Route113_GlassWorkshop_EventScript_26EF0E:: @ 826EF0E
 	msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO
 	compare VAR_RESULT, 0
 	goto_if_eq Route113_GlassWorkshop_EventScript_26F003
-	setvar VAR_0x40BE, 14
+	setvar VAR_GLASS_WORKSHOP_STATE, 14
 	subvar VAR_ASH_GATHER_COUNT, 1000
 	goto Route113_GlassWorkshop_EventScript_26F00F
 	end
@@ -147,7 +147,7 @@ Route113_GlassWorkshop_EventScript_26EF4A:: @ 826EF4A
 	msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO
 	compare VAR_RESULT, 0
 	goto_if_eq Route113_GlassWorkshop_EventScript_26F003
-	setvar VAR_0x40BE, 15
+	setvar VAR_GLASS_WORKSHOP_STATE, 15
 	subvar VAR_ASH_GATHER_COUNT, 6000
 	goto Route113_GlassWorkshop_EventScript_26F00F
 	end
@@ -162,7 +162,7 @@ Route113_GlassWorkshop_EventScript_26EF8B:: @ 826EF8B
 	msgbox Route113_GlassWorkshop_Text_26F480, MSGBOX_YESNO
 	compare VAR_RESULT, 0
 	goto_if_eq Route113_GlassWorkshop_EventScript_26F003
-	setvar VAR_0x40BE, 16
+	setvar VAR_GLASS_WORKSHOP_STATE, 16
 	subvar VAR_ASH_GATHER_COUNT, 8000
 	goto Route113_GlassWorkshop_EventScript_26F00F
 	end
@@ -206,7 +206,7 @@ Route113_GlassWorkshop_EventScript_26F00F:: @ 826F00F
 	call_if_eq Route113_GlassWorkshop_EventScript_26F047
 	compare VAR_0x8009, 1
 	call_if_eq Route113_GlassWorkshop_EventScript_26F05F
-	setvar VAR_0x40BE, 2
+	setvar VAR_GLASS_WORKSHOP_STATE, 2
 	release
 	end
 
@@ -235,7 +235,7 @@ Route113_GlassWorkshop_EventScript_26F081:: @ 826F081
 	end
 
 Route113_GlassWorkshop_EventScript_26F090:: @ 826F090
-	switch VAR_0x40BE
+	switch VAR_GLASS_WORKSHOP_STATE
 	case 10, Route113_GlassWorkshop_EventScript_26F0E3
 	case 11, Route113_GlassWorkshop_EventScript_26F0F7
 	case 12, Route113_GlassWorkshop_EventScript_26F10B
@@ -300,7 +300,7 @@ Route113_GlassWorkshop_EventScript_26F16F:: @ 826F16F
 	call_if_eq Route113_GlassWorkshop_EventScript_26F047
 	compare VAR_0x8009, 1
 	call_if_eq Route113_GlassWorkshop_EventScript_26F05F
-	setvar VAR_0x40BE, 2
+	setvar VAR_GLASS_WORKSHOP_STATE, 2
 	release
 	end
 

data/maps/Route121_SafariZoneEntrance/scripts.inc

@@ -3,14 +3,14 @@ Route121_SafariZoneEntrance_MapScripts:: @ 822BBBB
 	.byte 0
 
 Route121_SafariZoneEntrance_MapScript2_22BBC1: @ 822BBC1
-	map_script_2 VAR_0x40A4, 1, Route121_SafariZoneEntrance_EventScript_22BBCB
+	map_script_2 VAR_SAFARI_ZONE_STATE, 1, Route121_SafariZoneEntrance_EventScript_22BBCB
 	.2byte 0
 
 Route121_SafariZoneEntrance_EventScript_22BBCB:: @ 822BBCB
 	lockall
 	applymovement EVENT_OBJ_ID_PLAYER, Route121_SafariZoneEntrance_Movement_22BBDD
 	waitmovement 0
-	setvar VAR_0x40A4, 0
+	setvar VAR_SAFARI_ZONE_STATE, 0
 	releaseall
 	end
 
@@ -81,7 +81,7 @@ Route121_SafariZoneEntrance_EventScript_22BC48:: @ 822BC48
 	applymovement EVENT_OBJ_ID_PLAYER, Route121_SafariZoneEntrance_Movement_22BD18
 	waitmovement 0
 	special EnterSafariMode
-	setvar VAR_0x40A4, 2
+	setvar VAR_SAFARI_ZONE_STATE, 2
 	clearflag FLAG_GOOD_LUCK_SAFARI_ZONE
 	warp MAP_SAFARI_ZONE_SOUTH, 255, 32, 33
 	waitstate

data/maps/RustboroCity_DevonCorp_2F/scripts.inc

@@ -3,18 +3,18 @@ RustboroCity_DevonCorp_2F_MapScripts:: @ 8211857
 	.byte 0
 
 RustboroCity_DevonCorp_2F_MapScript1_21185D: @ 821185D
-	compare VAR_0x40C4, 1
+	compare VAR_FOSSIL_RESURRECTION_STATE, 1
 	call_if_eq RustboroCity_DevonCorp_2F_EventScript_211869
 	end
 
 RustboroCity_DevonCorp_2F_EventScript_211869:: @ 8211869
-	setvar VAR_0x40C4, 2
+	setvar VAR_FOSSIL_RESURRECTION_STATE, 2
 	return
 
 RustboroCity_DevonCorp_2F_EventScript_21186F:: @ 821186F
 	lock
 	faceplayer
-	compare VAR_0x40C4, 1
+	compare VAR_FOSSIL_RESURRECTION_STATE, 1
 	call_if_eq RustboroCity_DevonCorp_2F_EventScript_211869
 	msgbox RustboroCity_DevonCorp_2F_Text_211BFB, MSGBOX_DEFAULT
 	release
@@ -23,7 +23,7 @@ RustboroCity_DevonCorp_2F_EventScript_21186F:: @ 821186F
 RustboroCity_DevonCorp_2F_EventScript_211886:: @ 8211886
 	lock
 	faceplayer
-	compare VAR_0x40C4, 1
+	compare VAR_FOSSIL_RESURRECTION_STATE, 1
 	call_if_eq RustboroCity_DevonCorp_2F_EventScript_211869
 	goto_if_set FLAG_MET_DEVON_EMPLOYEE, RustboroCity_DevonCorp_2F_EventScript_2118A6
 	msgbox RustboroCity_DevonCorp_2F_Text_211C50, MSGBOX_DEFAULT
@@ -38,7 +38,7 @@ RustboroCity_DevonCorp_2F_EventScript_2118A6:: @ 82118A6
 RustboroCity_DevonCorp_2F_EventScript_2118B0:: @ 82118B0
 	lock
 	faceplayer
-	compare VAR_0x40C4, 1
+	compare VAR_FOSSIL_RESURRECTION_STATE, 1
 	call_if_eq RustboroCity_DevonCorp_2F_EventScript_211869
 	goto_if_set FLAG_RECEIVED_POKENAV, RustboroCity_DevonCorp_2F_EventScript_2118D0
 	msgbox RustboroCity_DevonCorp_2F_Text_211D9F, MSGBOX_DEFAULT
@@ -53,7 +53,7 @@ RustboroCity_DevonCorp_2F_EventScript_2118D0:: @ 82118D0
 RustboroCity_DevonCorp_2F_EventScript_2118DA:: @ 82118DA
 	lock
 	faceplayer
-	compare VAR_0x40C4, 1
+	compare VAR_FOSSIL_RESURRECTION_STATE, 1
 	call_if_eq RustboroCity_DevonCorp_2F_EventScript_211869
 	msgbox RustboroCity_DevonCorp_2F_Text_211EE0, MSGBOX_DEFAULT
 	release
@@ -62,9 +62,9 @@ RustboroCity_DevonCorp_2F_EventScript_2118DA:: @ 82118DA
 RustboroCity_DevonCorp_2F_EventScript_2118F1:: @ 82118F1
 	lock
 	faceplayer
-	compare VAR_0x40C4, 2
+	compare VAR_FOSSIL_RESURRECTION_STATE, 2
 	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211A03
-	compare VAR_0x40C4, 1
+	compare VAR_FOSSIL_RESURRECTION_STATE, 1
 	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_2119F9
 	msgbox RustboroCity_DevonCorp_2F_Text_211F48, MSGBOX_DEFAULT
 	checkitem ITEM_ROOT_FOSSIL, 1
@@ -96,8 +96,8 @@ RustboroCity_DevonCorp_2F_EventScript_211974:: @ 8211974
 	bufferitemname 0, ITEM_ROOT_FOSSIL
 	msgbox RustboroCity_DevonCorp_2F_Text_212153, MSGBOX_DEFAULT
 	takeitem ITEM_ROOT_FOSSIL, 1
-	setvar VAR_0x40C4, 1
+	setvar VAR_FOSSIL_RESURRECTION_STATE, 1
-	setvar VAR_0x40C5, 1
+	setvar VAR_WHICH_FOSSIL_REVIVED, 1
 	release
 	end
 
@@ -121,8 +121,8 @@ RustboroCity_DevonCorp_2F_EventScript_2119D2:: @ 82119D2
 	bufferitemname 0, ITEM_CLAW_FOSSIL
 	msgbox RustboroCity_DevonCorp_2F_Text_212153, MSGBOX_DEFAULT
 	takeitem ITEM_CLAW_FOSSIL, 1
-	setvar VAR_0x40C4, 1
+	setvar VAR_FOSSIL_RESURRECTION_STATE, 1
-	setvar VAR_0x40C5, 2
+	setvar VAR_WHICH_FOSSIL_REVIVED, 2
 	release
 	end
 
@@ -137,9 +137,9 @@ RustboroCity_DevonCorp_2F_EventScript_2119F9:: @ 82119F9
 	end
 
 RustboroCity_DevonCorp_2F_EventScript_211A03:: @ 8211A03
-	compare VAR_0x40C5, 1
+	compare VAR_WHICH_FOSSIL_REVIVED, 1
 	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211A1A
-	compare VAR_0x40C5, 2
+	compare VAR_WHICH_FOSSIL_REVIVED, 2
 	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_211A2C
 	end
 
@@ -199,7 +199,7 @@ RustboroCity_DevonCorp_2F_EventScript_211AC4:: @ 8211AC4
 	return
 
 RustboroCity_DevonCorp_2F_EventScript_211AD7:: @ 8211AD7
-	setvar VAR_0x40C4, 0
+	setvar VAR_FOSSIL_RESURRECTION_STATE, 0
 	setflag FLAG_RECEIVED_REVIVED_FOSSIL_MON
 	release
 	end
@@ -248,7 +248,7 @@ RustboroCity_DevonCorp_2F_EventScript_211B67:: @ 8211B67
 	return
 
 RustboroCity_DevonCorp_2F_EventScript_211B7A:: @ 8211B7A
-	setvar VAR_0x40C4, 0
+	setvar VAR_FOSSIL_RESURRECTION_STATE, 0
 	setflag FLAG_RECEIVED_REVIVED_FOSSIL_MON
 	release
 	end
@@ -279,7 +279,7 @@ RustboroCity_DevonCorp_2F_EventScript_211BCD:: @ 8211BCD
 RustboroCity_DevonCorp_2F_EventScript_211BCF:: @ 8211BCF
 	lock
 	faceplayer
-	compare VAR_0x40C4, 1
+	compare VAR_FOSSIL_RESURRECTION_STATE, 1
 	call_if_eq RustboroCity_DevonCorp_2F_EventScript_211869
 	compare VAR_RUSTBORO_STATE, 6
 	goto_if_ge RustboroCity_DevonCorp_2F_EventScript_211BF1

data/maps/SafariZone_South/scripts.inc

@@ -4,7 +4,7 @@ SafariZone_South_MapScripts:: @ 823D279
 	.byte 0
 
 SafariZone_South_MapScript2_23D284: @ 823D284
-	map_script_2 VAR_0x40A4, 2, SafariZone_South_EventScript_23D28E
+	map_script_2 VAR_SAFARI_ZONE_STATE, 2, SafariZone_South_EventScript_23D28E
 	.2byte 0
 
 SafariZone_South_EventScript_23D28E:: @ 823D28E
@@ -14,12 +14,12 @@ SafariZone_South_EventScript_23D28E:: @ 823D28E
 	applymovement 1, SafariZone_South_Movement_23D2C7
 	waitmovement 0
 	setobjectxyperm 1, 32, 34
-	setvar VAR_0x40A4, 0
+	setvar VAR_SAFARI_ZONE_STATE, 0
 	releaseall
 	end
 
 SafariZone_South_MapScript1_23D2B1: @ 823D2B1
-	compare VAR_0x40A4, 2
+	compare VAR_SAFARI_ZONE_STATE, 2
 	call_if_eq SafariZone_South_EventScript_23D2BD
 	end
 
@@ -90,7 +90,7 @@ SafariZone_South_EventScript_23D359:: @ 823D359
 	end
 
 SafariZone_South_EventScript_23D373:: @ 823D373
-	setvar VAR_0x40A4, 1
+	setvar VAR_SAFARI_ZONE_STATE, 1
 	special ExitSafariMode
 	warpdoor MAP_ROUTE121_SAFARI_ZONE_ENTRANCE, 255, 2, 5
 	waitstate

data/maps/SeafloorCavern_Room9/map.json

@@ -121,7 +121,7 @@
       "x": 17,
       "y": 42,
       "elevation": 3,
-      "var": "VAR_0x40A2",
+      "var": "VAR_SEAFLOOR_CAVERN_STATE",
       "var_value": "0",
       "script": "SeafloorCavern_Room9_EventScript_234DC9"
     }

data/maps/SeafloorCavern_Room9/scripts.inc

@@ -133,8 +133,8 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9
 	setflag FLAG_SYS_WEATHER_CTRL
 	setflag FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN
 	setflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_STEVEN
-	setvar VAR_0x40C6, 2
+	setvar VAR_STEVENS_HOUSE_STATE, 2
-	setvar VAR_0x40A2, 1
+	setvar VAR_SEAFLOOR_CAVERN_STATE, 1
 	setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_ARCHIE
 	setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAXIE
 	setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAGMA_GRUNTS

data/maps/SlateportCity/scripts.inc

@@ -4,7 +4,7 @@ SlateportCity_MapScripts:: @ 81DCC61
 	.byte 0
 
 SlateportCity_MapScript1_1DCC6C: @ 81DCC6C
-	setvar VAR_0x40AA, 0
+	setvar VAR_SLATEPORT_MUSEUM_1F_STATE, 0
 	call SlateportCity_EventScript_1DCC8D
 	compare VAR_SLATEPORT_STATE, 1
 	call_if_eq SlateportCity_EventScript_1DCC99

data/maps/SlateportCity_Harbor/map.json

@@ -155,7 +155,7 @@
       "x": 8,
       "y": 11,
       "elevation": 3,
-      "var": "VAR_0x40A0",
+      "var": "VAR_SLATEPORT_HARBOR_STATE",
       "var_value": "1",
       "script": "SlateportCity_Harbor_EventScript_20C9BB"
     },
@@ -164,7 +164,7 @@
       "x": 8,
       "y": 12,
       "elevation": 3,
-      "var": "VAR_0x40A0",
+      "var": "VAR_SLATEPORT_HARBOR_STATE",
       "var_value": "1",
       "script": "SlateportCity_Harbor_EventScript_20C9C7"
     },
@@ -173,7 +173,7 @@
       "x": 8,
       "y": 13,
       "elevation": 3,
-      "var": "VAR_0x40A0",
+      "var": "VAR_SLATEPORT_HARBOR_STATE",
       "var_value": "1",
       "script": "SlateportCity_Harbor_EventScript_20C9D3"
     },
@@ -182,7 +182,7 @@
       "x": 8,
       "y": 14,
       "elevation": 3,
-      "var": "VAR_0x40A0",
+      "var": "VAR_SLATEPORT_HARBOR_STATE",
       "var_value": "1",
       "script": "SlateportCity_Harbor_EventScript_20C9DF"
     }

data/maps/SlateportCity_Harbor/scripts.inc

@@ -5,7 +5,7 @@ SlateportCity_Harbor_MapScripts:: @ 820C97D
 SlateportCity_Harbor_MapScript1_20C983: @ 820C983
 	setescapewarp MAP_SLATEPORT_CITY, 255, 28, 13
 	setvar VAR_TEMP_1, 0
-	compare VAR_0x40A0, 1
+	compare VAR_SLATEPORT_HARBOR_STATE, 1
 	call_if_eq SlateportCity_Harbor_EventScript_20C9A9
 	call_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_20C9A5
 	end
@@ -62,7 +62,7 @@ SlateportCity_Harbor_EventScript_20C9F5:: @ 820C9F5
 	removeobject 6
 	removeobject 7
 	removeobject 8
-	setvar VAR_0x40A0, 2
+	setvar VAR_SLATEPORT_HARBOR_STATE, 2
 	setflag FLAG_MET_TEAM_AQUA_HARBOR
 	setflag FLAG_HIDE_LILCOVE_MOTEL_SCOTT
 	compare VAR_0x8008, 0
@@ -296,7 +296,7 @@ SlateportCity_Harbor_EventScript_20CCA2:: @ 820CCA2
 	goto_if_set FLAG_BADGE07_GET, SlateportCity_Harbor_EventScript_20CD00
 	goto_if_set FLAG_EVIL_TEAM_ESCAPED_STERN_SPOKE, SlateportCity_Harbor_EventScript_20CCF6
 	goto_if_set FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE, SlateportCity_Harbor_EventScript_20CCE9
-	compare VAR_0x40A0, 2
+	compare VAR_SLATEPORT_HARBOR_STATE, 2
 	goto_if_eq SlateportCity_Harbor_EventScript_20CCDF
 	msgbox SlateportCity_Harbor_Text_20D232, MSGBOX_DEFAULT
 	closemessage

data/maps/SlateportCity_OceanicMuseum_1F/map.json

@@ -226,7 +226,7 @@
       "x": 9,
       "y": 7,
       "elevation": 3,
-      "var": "VAR_0x40AA",
+      "var": "VAR_SLATEPORT_MUSEUM_1F_STATE",
       "var_value": "0",
       "script": "SlateportCity_OceanicMuseum_1F_EventScript_20AD9F"
     },
@@ -235,7 +235,7 @@
       "x": 10,
       "y": 7,
       "elevation": 3,
-      "var": "VAR_0x40AA",
+      "var": "VAR_SLATEPORT_MUSEUM_1F_STATE",
       "var_value": "0",
       "script": "SlateportCity_OceanicMuseum_1F_EventScript_20ADB0"
     }

data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc

@@ -42,7 +42,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_20ADE8:: @ 820ADE8
 	updatemoneybox 0, 0
 	nop
 	msgbox SlateportCity_OceanicMuseum_1F_Text_20B026, MSGBOX_DEFAULT
-	setvar VAR_0x40AA, 1
+	setvar VAR_SLATEPORT_MUSEUM_1F_STATE, 1
 	hidemoneybox
 	nop
 	nop
@@ -63,7 +63,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_20AE18:: @ 820AE18
 
 SlateportCity_OceanicMuseum_1F_EventScript_20AE39:: @ 820AE39
 	msgbox SlateportCity_OceanicMuseum_1F_Text_20B075, MSGBOX_DEFAULT
-	setvar VAR_0x40AA, 1
+	setvar VAR_SLATEPORT_MUSEUM_1F_STATE, 1
 	hidemoneybox
 	nop
 	nop

data/maps/SlateportCity_PokemonFanClub/scripts.inc

@@ -6,7 +6,7 @@ SlateportCity_PokemonFanClub_EventScript_209E96:: @ 8209E96
 	faceplayer
 	goto_if_unset FLAG_ENTERED_LINK_CONTEST, SlateportCity_PokemonFanClub_EventScript_20A152
 	call_if_unset FLAG_MET_SLATEPORT_FANCLUB_CHAIRMAN, SlateportCity_PokemonFanClub_EventScript_20A172
-	switch VAR_0x40B7
+	switch VAR_SLATEPORT_FAN_CLUB_STATE
 	case 0, SlateportCity_PokemonFanClub_EventScript_209ED2
 	case 1, SlateportCity_PokemonFanClub_EventScript_209EE5
 	case 2, SlateportCity_PokemonFanClub_EventScript_209F3B
@@ -14,7 +14,7 @@ SlateportCity_PokemonFanClub_EventScript_209E96:: @ 8209E96
 	end
 
 SlateportCity_PokemonFanClub_EventScript_209ED2:: @ 8209ED2
-	setvar VAR_0x40B7, 1
+	setvar VAR_SLATEPORT_FAN_CLUB_STATE, 1
 	msgbox SlateportCity_PokemonFanClub_Text_20A445, MSGBOX_DEFAULT
 	goto SlateportCity_PokemonFanClub_EventScript_209F45
 	end
@@ -28,7 +28,7 @@ SlateportCity_PokemonFanClub_EventScript_209EE5:: @ 8209EE5
 	call_if_set FLAG_RECEIVED_RED_SCARF, SlateportCity_PokemonFanClub_EventScript_209FD0
 	compare VAR_TEMP_2, 5
 	call_if_eq SlateportCity_PokemonFanClub_EventScript_209FCA
-	compare VAR_0x40B7, 2
+	compare VAR_SLATEPORT_FAN_CLUB_STATE, 2
 	goto_if_eq SlateportCity_PokemonFanClub_EventScript_209F3B
 	msgbox SlateportCity_PokemonFanClub_Text_20A62A, MSGBOX_DEFAULT
 	goto SlateportCity_PokemonFanClub_EventScript_209F45
@@ -59,7 +59,7 @@ SlateportCity_PokemonFanClub_EventScript_209F45:: @ 8209F45
 	end
 
 SlateportCity_PokemonFanClub_EventScript_209FCA:: @ 8209FCA
-	setvar VAR_0x40B7, 2
+	setvar VAR_SLATEPORT_FAN_CLUB_STATE, 2
 	return
 
 SlateportCity_PokemonFanClub_EventScript_209FD0:: @ 8209FD0

data/maps/SootopolisCity/scripts.inc

@@ -1435,7 +1435,7 @@ SootopolisCity_EventScript_1E654C:: @ 81E654C
 	setflag FLAG_SOOTOPOLIS_ARCHIE_MAXIE_LEAVE
 	clearflag FLAG_HIDE_MT_PYRE_SUMMIT_MAXIE
 	clearflag FLAG_HIDE_MT_PYRE_SUMMIT_ARCHIE
-	setvar VAR_0x40B9, 2
+	setvar VAR_MT_PYRE_STATE, 2
 	warpsilent MAP_SOOTOPOLIS_CITY, 255, 31, 34
 	waitstate
 	releaseall

data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc

@@ -8,7 +8,7 @@ SootopolisCity_MysteryEventsHouse_1F_MapScript1_22795E: @ 822795E
 	special CallFrontierUtilFunc
 	compare VAR_RESULT, 0
 	call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_22797D
-	compare VAR_0x40C0, 0
+	compare VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 0
 	call_if_ne SootopolisCity_MysteryEventsHouse_1F_EventScript_227991
 	end
 
@@ -25,9 +25,9 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_227991:: @ 8227991
 	return
 
 SootopolisCity_MysteryEventsHouse_1F_MapScript2_22799D: @ 822799D
-	map_script_2 VAR_0x40C0, 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7
+	map_script_2 VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7
-	map_script_2 VAR_0x40C0, 2, SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7
+	map_script_2 VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 2, SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7
-	map_script_2 VAR_0x40C0, 3, SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7
+	map_script_2 VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 3, SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7
 	.2byte 0
 
 SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7:: @ 82279B7
@@ -39,14 +39,14 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7:: @ 82279B7
 	moveobjectoffscreen 1
 	applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_MysteryEventsHouse_1F_Movement_2725A6
 	waitmovement 0
-	compare VAR_0x40C0, 1
+	compare VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 1
 	call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227A04
-	compare VAR_0x40C0, 2
+	compare VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 2
 	call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227A0D
-	compare VAR_0x40C0, 3
+	compare VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 3
 	call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227A16
 	special LoadPlayerParty
-	setvar VAR_0x40C0, 0
+	setvar VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 0
 	releaseall
 	end
 

data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc

@@ -40,19 +40,19 @@ SootopolisCity_MysteryEventsHouse_B1F_EventScript_227E68:: @ 8227E68
 	end
 
 SootopolisCity_MysteryEventsHouse_B1F_EventScript_227ECF:: @ 8227ECF
-	setvar VAR_0x40C0, 3
+	setvar VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 3
 	msgbox SootopolisCity_MysteryEventsHouse_B1F_Text_227D40, MSGBOX_DEFAULT
 	return
 
 SootopolisCity_MysteryEventsHouse_B1F_EventScript_227EDD:: @ 8227EDD
-	setvar VAR_0x40C0, 1
+	setvar VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 1
 	special ShowFieldMessageStringVar4
 	waitmessage
 	waitbuttonpress
 	return
 
 SootopolisCity_MysteryEventsHouse_B1F_EventScript_227EE8:: @ 8227EE8
-	setvar VAR_0x40C0, 2
+	setvar VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 2
 	special ShowFieldMessageStringVar4
 	waitmessage
 	waitbuttonpress

data/maps/VictoryRoad_1F/map.json

@@ -175,7 +175,7 @@
       "x": 2,
       "y": 23,
       "elevation": 4,
-      "var": "VAR_0x40C3",
+      "var": "VAR_VICTORY_ROAD_1F_STATE",
       "var_value": "0",
       "script": "VictoryRoad_1F_EventScript_235DAF"
     },
@@ -184,7 +184,7 @@
       "x": 3,
       "y": 23,
       "elevation": 4,
-      "var": "VAR_0x40C3",
+      "var": "VAR_VICTORY_ROAD_1F_STATE",
       "var_value": "0",
       "script": "VictoryRoad_1F_EventScript_235DC8"
     }

data/maps/VictoryRoad_1F/scripts.inc

@@ -3,9 +3,9 @@ VictoryRoad_1F_MapScripts:: @ 8235D7A
 	.byte 0
 
 VictoryRoad_1F_MapScript1_235D80: @ 8235D80
-	compare VAR_0x40C3, 1
+	compare VAR_VICTORY_ROAD_1F_STATE, 1
 	call_if_eq VictoryRoad_1F_EventScript_235D97
-	compare VAR_0x40C3, 2
+	compare VAR_VICTORY_ROAD_1F_STATE, 2
 	call_if_eq VictoryRoad_1F_EventScript_235DA3
 	end
 
@@ -46,7 +46,7 @@ VictoryRoad_1F_EventScript_235DE1:: @ 8235DE1
 	clearflag FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY
 	moveobjectoffscreen 4
 	setflag FLAG_DEFEATED_WALLY_VICTORY_ROAD
-	copyvar VAR_0x40C3, VAR_0x8008
+	copyvar VAR_VICTORY_ROAD_1F_STATE, VAR_0x8008
 	releaseall
 	end
 

data/scripts/safari_zone.inc

@@ -1,11 +1,11 @@
 EventScript_2A4B4C:: @ 82A4B4C
-	setvar VAR_0x40A4, 1
+	setvar VAR_SAFARI_ZONE_STATE, 1
 	special ExitSafariMode
 	setwarp MAP_ROUTE121_SAFARI_ZONE_ENTRANCE, 255, 2, 5
 	end
 
 EventScript_2A4B5D:: @ 82A4B5D
-	setvar VAR_0x40A4, 1
+	setvar VAR_SAFARI_ZONE_STATE, 1
 	special ExitSafariMode
 	warp MAP_ROUTE121_SAFARI_ZONE_ENTRANCE, 255, 2, 5
 	waitstate

include/constants/vars.h

@@ -176,46 +176,46 @@
 #define VAR_0x409D                 0x409D
 #define VAR_0x409E                 0x409E
 #define VAR_0x409F                 0x409F
-#define VAR_0x40A0                 0x40A0
+#define VAR_SLATEPORT_HARBOR_STATE                 0x40A0
 #define VAR_0x40A1                 0x40A1
-#define VAR_0x40A2                 0x40A2
+#define VAR_SEAFLOOR_CAVERN_STATE                 0x40A2
-#define VAR_0x40A3                 0x40A3
+#define VAR_CABLE_CAR_STATION_STATE                 0x40A3
-#define VAR_0x40A4                 0x40A4
+#define VAR_SAFARI_ZONE_STATE                 0x40A4
-#define VAR_0x40A5                 0x40A5
+#define VAR_TRICK_HOUSE_ENTRANCE_STATE_1                 0x40A5
-#define VAR_0x40A6                 0x40A6
+#define VAR_TRICK_HOUSE_ENTRANCE_STATE_2                 0x40A6
-#define VAR_0x40A7                 0x40A7
+#define VAR_TRICK_HOUSE_ENTRANCE_STATE_3                 0x40A7
 #define VAR_0x40A8                 0x40A8
 #define VAR_CYCLING_CHALLENGE_STATE                 0x40A9
-#define VAR_0x40AA                 0x40AA
+#define VAR_SLATEPORT_MUSEUM_1F_STATE                 0x40AA
-#define VAR_0x40AB                 0x40AB
+#define VAR_TRICK_HOUSE_PUZZLE_1_STATE                 0x40AB
-#define VAR_0x40AC                 0x40AC
+#define VAR_TRICK_HOUSE_PUZZLE_2_STATE                 0x40AC
-#define VAR_0x40AD                 0x40AD
+#define VAR_TRICK_HOUSE_PUZZLE_3_STATE                 0x40AD
-#define VAR_0x40AE                 0x40AE
+#define VAR_TRICK_HOUSE_PUZZLE_4_STATE                 0x40AE
-#define VAR_0x40AF                 0x40AF
+#define VAR_TRICK_HOUSE_PUZZLE_5_STATE                 0x40AF
-#define VAR_0x40B0                 0x40B0
+#define VAR_TRICK_HOUSE_PUZZLE_6_STATE                 0x40B0
-#define VAR_0x40B1                 0x40B1
+#define VAR_TRICK_HOUSE_PUZZLE_7_STATE                 0x40B1
-#define VAR_0x40B2                 0x40B2
+#define VAR_TRICK_HOUSE_PUZZLE_8_STATE                 0x40B2
 #define VAR_WEATHER_INSTITUTE_STATE                 0x40B3
 #define VAR_PORTHOLE_STATE               0x40B4
-#define VAR_0x40B5                 0x40B5
+#define VAR_TRICK_HOUSE_STATE                 0x40B5  // TODO: needs some further investigation
-#define VAR_0x40B6                 0x40B6
+#define VAR_TRICK_HOUSE_PUZZLE_7_STATE_2                 0x40B6
-#define VAR_0x40B7                 0x40B7
+#define VAR_SLATEPORT_FAN_CLUB_STATE                 0x40B7
 #define VAR_0x40B8                 0x40B8
-#define VAR_0x40B9                 0x40B9
+#define VAR_MT_PYRE_STATE                 0x40B9
-#define VAR_0x40BA                 0x40BA
+#define VAR_NEW_MAUVILLE_STATE                 0x40BA
 #define VAR_0x40BB                 0x40BB
-#define VAR_0x40BC                 0x40BC
+#define VAR_BRAVO_TRAINER_BATTLE_TOWER_ON                 0x40BC
-#define VAR_0x40BD                 0x40BD
+#define VAR_JAGGED_PASS_ASH_WEATHER                 0x40BD
-#define VAR_0x40BE                 0x40BE
+#define VAR_GLASS_WORKSHOP_STATE                 0x40BE
-#define VAR_0x40BF                 0x40BF
+#define VAR_METEOR_FALLS_STATE                 0x40BF
-#define VAR_0x40C0                 0x40C0
+#define VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE                 0x40C0
-#define VAR_0x40C1                 0x40C1
+#define VAR_TRICK_HOUSE_PRIZE_PICKUP                 0x40C1
 #define VAR_PACIFIDLOG_TM_RECEIVED_DAY                 0x40C2
-#define VAR_0x40C3                 0x40C3
+#define VAR_VICTORY_ROAD_1F_STATE                 0x40C3
-#define VAR_0x40C4                 0x40C4
+#define VAR_FOSSIL_RESURRECTION_STATE                 0x40C4
-#define VAR_0x40C5                 0x40C5
+#define VAR_WHICH_FOSSIL_REVIVED                 0x40C5
-#define VAR_0x40C6                 0x40C6
+#define VAR_STEVENS_HOUSE_STATE                 0x40C6
-#define VAR_0x40C7                 0x40C7
+#define VAR_OLDALE_STATE                 0x40C7
 #define VAR_0x40C8                 0x40C8
 #define VAR_0x40C9                 0x40C9
 #define VAR_0x40CA                 0x40CA

src/tv.c

@@ -3603,7 +3603,7 @@ void GetMomOrDadStringForTVMessage(void)
 
 void sub_80F01B8(void)
 {
-    VarSet(VAR_0x40BC, 0);
+    VarSet(VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0);
     RemoveEventObjectByLocalIdAndMap(5, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
     FlagSet(FLAG_HIDE_BATTLE_TOWER_REPORTER);
 }