Name and use general purpose vars

26 files changed, 88 insertions, 88 deletions

diff --git a/data/maps/events/CaveOfOrigin_B4F.inc b/data/maps/events/CaveOfOrigin_B4F.inc
index 9b1dfea01..ad2217b46 100644
--- a/data/maps/events/CaveOfOrigin_B4F.inc
+++ b/data/maps/events/CaveOfOrigin_B4F.inc
@@ -5,7 +5,7 @@ CaveOfOrigin_B4F_MapWarps:: @ 838D898
 	warp_def 12, 5, 3, 1, MAP_CAVE_OF_ORIGIN_B3F
 
 CaveOfOrigin_B4F_MapCoordEvents:: @ 838D8A0
-	coord_event 9, 13, 3, 0, 0x409b, 0, 0, CaveOfOrigin_B4F_EventScript_15DDD7
+	coord_event 9, 13, 3, 0, VAR_CAVE_OF_ORIGIN_B4F_STATE, 0, 0, CaveOfOrigin_B4F_EventScript_15DDD7
 	coord_event 13, 9, 3, 0, VAR_TEMP_5, 0, 0, CaveOfOrigin_B4F_EventScript_1A04A0
 	coord_event 5, 9, 3, 0, VAR_TEMP_5, 0, 0, CaveOfOrigin_B4F_EventScript_1A04A0
 
diff --git a/data/maps/events/InsideOfTruck.inc b/data/maps/events/InsideOfTruck.inc
index 3b177129a..d89f267e3 100644
--- a/data/maps/events/InsideOfTruck.inc
+++ b/data/maps/events/InsideOfTruck.inc
@@ -9,9 +9,9 @@ InsideOfTruck_MapWarps:: @ 8391660
 	warp_def 4, 3, 0, 127, MAP_NONE
 
 InsideOfTruck_MapCoordEvents:: @ 8391678
-	coord_event 3, 1, 3, 0, 0x4092, 0, 0, InsideOfTruck_EventScript_15FC29
-	coord_event 3, 2, 3, 0, 0x4092, 0, 0, InsideOfTruck_EventScript_15FC29
-	coord_event 3, 3, 3, 0, 0x4092, 0, 0, InsideOfTruck_EventScript_15FC29
+	coord_event 3, 1, 3, 0, VAR_LITTLEROOT_INTRO_STATE, 0, 0, InsideOfTruck_EventScript_15FC29
+	coord_event 3, 2, 3, 0, VAR_LITTLEROOT_INTRO_STATE, 0, 0, InsideOfTruck_EventScript_15FC29
+	coord_event 3, 3, 3, 0, VAR_LITTLEROOT_INTRO_STATE, 0, 0, InsideOfTruck_EventScript_15FC29
 
 InsideOfTruck_MapBGEvents:: @ 83916A8
 	bg_event 1, 0, 0, 0, 0, InsideOfTruck_EventScript_15FC8B
diff --git a/data/maps/events/LittlerootTown.inc b/data/maps/events/LittlerootTown.inc
index 23debe434..c2842c68e 100644
--- a/data/maps/events/LittlerootTown.inc
+++ b/data/maps/events/LittlerootTown.inc
@@ -12,15 +12,15 @@ LittlerootTown_MapWarps:: @ 838098C
 	warp_def 7, 16, 0, 0, MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB
 
 LittlerootTown_MapCoordEvents:: @ 83809A4
-	coord_event 10, 1, 3, 0, 0x4050, 0, 0, LittlerootTown_EventScript_14D739
-	coord_event 11, 1, 3, 0, 0x4050, 0, 0, LittlerootTown_EventScript_14D797
-	coord_event 11, 1, 3, 0, 0x4050, 1, 0, LittlerootTown_EventScript_14D7C7
-	coord_event 8, 9, 3, 0, 0x4050, 3, 0, LittlerootTown_EventScript_14D89E
-	coord_event 9, 9, 3, 0, 0x4050, 3, 0, LittlerootTown_EventScript_14D8AA
-	coord_event 10, 9, 3, 0, 0x4050, 3, 0, LittlerootTown_EventScript_14D886
-	coord_event 11, 9, 3, 0, 0x4050, 3, 0, LittlerootTown_EventScript_14D892
-	coord_event 10, 2, 3, 0, 0x4050, 3, 0, LittlerootTown_EventScript_14D860
-	coord_event 11, 2, 3, 0, 0x4050, 3, 0, LittlerootTown_EventScript_14D873
+	coord_event 10, 1, 3, 0, VAR_LITTLEROOT_STATE, 0, 0, LittlerootTown_EventScript_14D739
+	coord_event 11, 1, 3, 0, VAR_LITTLEROOT_STATE, 0, 0, LittlerootTown_EventScript_14D797
+	coord_event 11, 1, 3, 0, VAR_LITTLEROOT_STATE, 1, 0, LittlerootTown_EventScript_14D7C7
+	coord_event 8, 9, 3, 0, VAR_LITTLEROOT_STATE, 3, 0, LittlerootTown_EventScript_14D89E
+	coord_event 9, 9, 3, 0, VAR_LITTLEROOT_STATE, 3, 0, LittlerootTown_EventScript_14D8AA
+	coord_event 10, 9, 3, 0, VAR_LITTLEROOT_STATE, 3, 0, LittlerootTown_EventScript_14D886
+	coord_event 11, 9, 3, 0, VAR_LITTLEROOT_STATE, 3, 0, LittlerootTown_EventScript_14D892
+	coord_event 10, 2, 3, 0, VAR_LITTLEROOT_STATE, 3, 0, LittlerootTown_EventScript_14D860
+	coord_event 11, 2, 3, 0, VAR_LITTLEROOT_STATE, 3, 0, LittlerootTown_EventScript_14D873
 
 LittlerootTown_MapBGEvents:: @ 8380A34
 	bg_event 15, 13, 0, 0, 0, LittlerootTown_EventScript_14D7F6
diff --git a/data/maps/events/LittlerootTown_BrendansHouse_1F.inc b/data/maps/events/LittlerootTown_BrendansHouse_1F.inc
index bb3d3b195..58c8f8993 100644
--- a/data/maps/events/LittlerootTown_BrendansHouse_1F.inc
+++ b/data/maps/events/LittlerootTown_BrendansHouse_1F.inc
@@ -11,7 +11,7 @@ LittlerootTown_BrendansHouse_1F_MapWarps:: @ 83856EC
 	warp_def 8, 2, 0, 0, MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F
 
 LittlerootTown_BrendansHouse_1F_MapCoordEvents:: @ 8385704
-	coord_event 8, 8, 0, 0, 0x4092, 4, 0, LittlerootTown_BrendansHouse_1F_EventScript_152789
+	coord_event 8, 8, 0, 0, VAR_LITTLEROOT_INTRO_STATE, 4, 0, LittlerootTown_BrendansHouse_1F_EventScript_152789
 
 LittlerootTown_BrendansHouse_1F_MapEvents:: @ 8385714
 	map_events LittlerootTown_BrendansHouse_1F_MapObjects, LittlerootTown_BrendansHouse_1F_MapWarps, LittlerootTown_BrendansHouse_1F_MapCoordEvents, 0x0
diff --git a/data/maps/events/LittlerootTown_MaysHouse_1F.inc b/data/maps/events/LittlerootTown_MaysHouse_1F.inc
index 27a0efbed..cbeccb348 100644
--- a/data/maps/events/LittlerootTown_MaysHouse_1F.inc
+++ b/data/maps/events/LittlerootTown_MaysHouse_1F.inc
@@ -11,7 +11,7 @@ LittlerootTown_MaysHouse_1F_MapWarps:: @ 838593C
 	warp_def 2, 2, 0, 0, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F
 
 LittlerootTown_MaysHouse_1F_MapCoordEvents:: @ 8385954
-	coord_event 2, 8, 0, 0, 0x4092, 4, 0, LittlerootTown_MaysHouse_1F_EventScript_152A35
+	coord_event 2, 8, 0, 0, VAR_LITTLEROOT_INTRO_STATE, 4, 0, LittlerootTown_MaysHouse_1F_EventScript_152A35
 
 LittlerootTown_MaysHouse_1F_MapEvents:: @ 8385964
 	map_events LittlerootTown_MaysHouse_1F_MapObjects, LittlerootTown_MaysHouse_1F_MapWarps, LittlerootTown_MaysHouse_1F_MapCoordEvents, 0x0
diff --git a/data/maps/events/MeteorFalls_1F_1R.inc b/data/maps/events/MeteorFalls_1F_1R.inc
index e34cb92e8..17efa037a 100644
--- a/data/maps/events/MeteorFalls_1F_1R.inc
+++ b/data/maps/events/MeteorFalls_1F_1R.inc
@@ -18,7 +18,7 @@ MeteorFalls_1F_1R_MapWarps:: @ 838BBBC
 	warp_def 26, 28, 3, 5, MAP_METEOR_FALLS_B1F_1R
 
 MeteorFalls_1F_1R_MapCoordEvents:: @ 838BBE4
-	coord_event 14, 18, 4, 0, 0x40bf, 0, 0, MeteorFalls_1F_1R_EventScript_15C49C
+	coord_event 14, 18, 4, 0, VAR_METEOR_FALLS_STATE, 0, 0, MeteorFalls_1F_1R_EventScript_15C49C
 
 MeteorFalls_1F_1R_MapBGEvents:: @ 838BBF4
 	bg_event 38, 9, 0, 1, 0, MeteorFalls_1F_1R_EventScript_14E842
diff --git a/data/maps/events/MtPyre_Summit.inc b/data/maps/events/MtPyre_Summit.inc
index d0e3ce713..3aaf21244 100644
--- a/data/maps/events/MtPyre_Summit.inc
+++ b/data/maps/events/MtPyre_Summit.inc
@@ -12,12 +12,12 @@ MtPyre_Summit_MapWarps:: @ 838CC68
 	warp_def 24, 31, 3, 1, MAP_MT_PYRE_EXTERIOR
 
 MtPyre_Summit_MapCoordEvents:: @ 838CC80
-	coord_event 22, 7, 3, 0, 0x40b9, 0, 0, MtPyre_Summit_EventScript_15D4BD
-	coord_event 23, 7, 3, 0, 0x40b9, 0, 0, MtPyre_Summit_EventScript_15D4C9
-	coord_event 24, 7, 3, 0, 0x40b9, 0, 0, MtPyre_Summit_EventScript_15D4D5
-	coord_event 22, 7, 3, 0, 0x40b9, 2, 0, MtPyre_Summit_EventScript_15D6CE
-	coord_event 23, 7, 3, 0, 0x40b9, 2, 0, MtPyre_Summit_EventScript_15D6DA
-	coord_event 24, 7, 3, 0, 0x40b9, 2, 0, MtPyre_Summit_EventScript_15D6E6
+	coord_event 22, 7, 3, 0, VAR_MT_PYRE_STATE, 0, 0, MtPyre_Summit_EventScript_15D4BD
+	coord_event 23, 7, 3, 0, VAR_MT_PYRE_STATE, 0, 0, MtPyre_Summit_EventScript_15D4C9
+	coord_event 24, 7, 3, 0, VAR_MT_PYRE_STATE, 0, 0, MtPyre_Summit_EventScript_15D4D5
+	coord_event 22, 7, 3, 0, VAR_MT_PYRE_STATE, 2, 0, MtPyre_Summit_EventScript_15D6CE
+	coord_event 23, 7, 3, 0, VAR_MT_PYRE_STATE, 2, 0, MtPyre_Summit_EventScript_15D6DA
+	coord_event 24, 7, 3, 0, VAR_MT_PYRE_STATE, 2, 0, MtPyre_Summit_EventScript_15D6E6
 
 MtPyre_Summit_MapBGEvents:: @ 838CCE0
 	bg_event 9, 25, 0, 7, 0, ITEM_ZINC, 79, 0
diff --git a/data/maps/events/NewMauville_Entrance.inc b/data/maps/events/NewMauville_Entrance.inc
index 65405fbe7..8967a1df0 100644
--- a/data/maps/events/NewMauville_Entrance.inc
+++ b/data/maps/events/NewMauville_Entrance.inc
@@ -3,7 +3,7 @@ NewMauville_Entrance_MapWarps:: @ 838DED4
 	warp_def 4, 1, 3, 0, MAP_NEW_MAUVILLE_INSIDE
 
 NewMauville_Entrance_MapCoordEvents:: @ 838DEE4
-	coord_event 4, 2, 3, 0, 0x40ba, 0, 0, NewMauville_Entrance_EventScript_15E4DC
+	coord_event 4, 2, 3, 0, VAR_NEW_MAUVILLE_STATE, 0, 0, NewMauville_Entrance_EventScript_15E4DC
 
 NewMauville_Entrance_MapEvents:: @ 838DEF4
 	map_events 0x0, NewMauville_Entrance_MapWarps, NewMauville_Entrance_MapCoordEvents, 0x0
diff --git a/data/maps/events/NewMauville_Inside.inc b/data/maps/events/NewMauville_Inside.inc
index cb7420edc..c88c554c6 100644
--- a/data/maps/events/NewMauville_Inside.inc
+++ b/data/maps/events/NewMauville_Inside.inc
@@ -21,7 +21,7 @@ NewMauville_Inside_MapCoordEvents:: @ 838DFD0
 	coord_event 6, 11, 3, 0, VAR_TEMP_1, 0, 0, NewMauville_Inside_EventScript_15E5AA
 	coord_event 13, 10, 3, 0, VAR_TEMP_1, 0, 0, NewMauville_Inside_EventScript_15E5AA
 	coord_event 17, 10, 3, 0, VAR_TEMP_2, 0, 0, NewMauville_Inside_EventScript_15E5C2
-	coord_event 33, 6, 3, 0, 0x40ba, 1, 0, NewMauville_Inside_EventScript_15E876
+	coord_event 33, 6, 3, 0, VAR_NEW_MAUVILLE_STATE, 1, 0, NewMauville_Inside_EventScript_15E876
 
 NewMauville_Inside_MapBGEvents:: @ 838E070
 	bg_event 32, 4, 3, 0, 0, NewMauville_Inside_EventScript_15E8E0
diff --git a/data/maps/events/OldaleTown.inc b/data/maps/events/OldaleTown.inc
index 8a41c1bf7..cad717a21 100644
--- a/data/maps/events/OldaleTown.inc
+++ b/data/maps/events/OldaleTown.inc
@@ -11,10 +11,10 @@ OldaleTown_MapWarps:: @ 8380AD8
 	warp_def 14, 6, 0, 0, MAP_OLDALE_TOWN_MART
 
 OldaleTown_MapCoordEvents:: @ 8380AF8
-	coord_event 0, 10, 3, 0, 0x4051, 0, 0, OldaleTown_EventScript_14DEFF
-	coord_event 8, 19, 3, 0, 0x40c7, 1, 0, OldaleTown_EventScript_14DF41
-	coord_event 9, 19, 3, 0, 0x40c7, 1, 0, OldaleTown_EventScript_14DF5C
-	coord_event 10, 19, 3, 0, 0x40c7, 1, 0, OldaleTown_EventScript_14DF77
+	coord_event 0, 10, 3, 0, VAR_ROUTE102_ACCESSIBLE, 0, 0, OldaleTown_EventScript_14DEFF
+	coord_event 8, 19, 3, 0, VAR_OLDALE_STATE, 1, 0, OldaleTown_EventScript_14DF41
+	coord_event 9, 19, 3, 0, VAR_OLDALE_STATE, 1, 0, OldaleTown_EventScript_14DF5C
+	coord_event 10, 19, 3, 0, VAR_OLDALE_STATE, 1, 0, OldaleTown_EventScript_14DF77
 
 OldaleTown_MapBGEvents:: @ 8380B38
 	bg_event 11, 9, 0, 0, 0, OldaleTown_EventScript_14DDAA
diff --git a/data/maps/events/PetalburgCity.inc b/data/maps/events/PetalburgCity.inc
index 739cbf905..4b169abac 100644
--- a/data/maps/events/PetalburgCity.inc
+++ b/data/maps/events/PetalburgCity.inc
@@ -18,10 +18,10 @@ PetalburgCity_MapWarps:: @ 837F6C8
 	warp_def 25, 12, 0, 0, MAP_PETALBURG_CITY_MART
 
 PetalburgCity_MapCoordEvents:: @ 837F6F8
-	coord_event 8, 10, 3, 0, 0x4057, 0, 0, PetalburgCity_EventScript_14B836
-	coord_event 8, 11, 3, 0, 0x4057, 0, 0, PetalburgCity_EventScript_14B842
-	coord_event 8, 12, 3, 0, 0x4057, 0, 0, PetalburgCity_EventScript_14B84E
-	coord_event 8, 13, 3, 0, 0x4057, 0, 0, PetalburgCity_EventScript_14B85A
+	coord_event 8, 10, 3, 0, VAR_PETALBURG_STATE, 0, 0, PetalburgCity_EventScript_14B836
+	coord_event 8, 11, 3, 0, VAR_PETALBURG_STATE, 0, 0, PetalburgCity_EventScript_14B842
+	coord_event 8, 12, 3, 0, VAR_PETALBURG_STATE, 0, 0, PetalburgCity_EventScript_14B84E
+	coord_event 8, 13, 3, 0, VAR_PETALBURG_STATE, 0, 0, PetalburgCity_EventScript_14B85A
 
 PetalburgCity_MapBGEvents:: @ 837F738
 	bg_event 17, 10, 0, 0, 0, PetalburgCity_EventScript_14B812
diff --git a/data/maps/events/PetalburgWoods.inc b/data/maps/events/PetalburgWoods.inc
index 0a1230a37..4094fc103 100644
--- a/data/maps/events/PetalburgWoods.inc
+++ b/data/maps/events/PetalburgWoods.inc
@@ -22,8 +22,8 @@ PetalburgWoods_MapWarps:: @ 838C284
 	warp_def 37, 38, 0, 7, MAP_ROUTE104
 
 PetalburgWoods_MapCoordEvents:: @ 838C2B4
-	coord_event 26, 23, 3, 0, 0x4098, 0, 0, PetalburgWoods_EventScript_15CCA8
-	coord_event 27, 23, 3, 0, 0x4098, 0, 0, PetalburgWoods_EventScript_15CD42
+	coord_event 26, 23, 3, 0, VAR_PETALBURG_WOODS_STATE, 0, 0, PetalburgWoods_EventScript_15CCA8
+	coord_event 27, 23, 3, 0, VAR_PETALBURG_WOODS_STATE, 0, 0, PetalburgWoods_EventScript_15CD42
 
 PetalburgWoods_MapBGEvents:: @ 838C2D4
 	bg_event 14, 32, 3, 0, 0, PetalburgWoods_EventScript_15CF15
diff --git a/data/maps/events/Route101.inc b/data/maps/events/Route101.inc
index a527ada51..b19dc1cf0 100644
--- a/data/maps/events/Route101.inc
+++ b/data/maps/events/Route101.inc
@@ -7,15 +7,15 @@ Route101_MapObjects:: @ 83810BC
 	object_event 6, MAP_OBJ_GFX_BOY_2, 0, 2, 0, 13, 0, 3, 5, 17, 0, 0, 0, 0, 0, Route101_EventScript_14EA6D, FLAG_HIDE_BOY_ROUTE101, 0, 0
 
 Route101_MapCoordEvents:: @ 838114C
-	coord_event 10, 19, 3, 0, 0x4060, 1, 0, Route101_EventScript_14E948
-	coord_event 11, 19, 3, 0, 0x4060, 1, 0, Route101_EventScript_14E948
-	coord_event 10, 18, 3, 0, 0x4060, 2, 0, Route101_EventScript_14E9B8
-	coord_event 11, 18, 3, 0, 0x4060, 2, 0, Route101_EventScript_14E9B8
-	coord_event 6, 16, 3, 0, 0x4060, 2, 0, Route101_EventScript_14E9CE
-	coord_event 6, 15, 3, 0, 0x4060, 2, 0, Route101_EventScript_14E9CE
-	coord_event 6, 17, 3, 0, 0x4060, 2, 0, Route101_EventScript_14E9CE
-	coord_event 6, 18, 3, 0, 0x4060, 2, 0, Route101_EventScript_14E9CE
-	coord_event 7, 13, 3, 0, 0x4060, 2, 0, Route101_EventScript_14E9E4
+	coord_event 10, 19, 3, 0, VAR_ROUTE101_STATE, 1, 0, Route101_EventScript_14E948
+	coord_event 11, 19, 3, 0, VAR_ROUTE101_STATE, 1, 0, Route101_EventScript_14E948
+	coord_event 10, 18, 3, 0, VAR_ROUTE101_STATE, 2, 0, Route101_EventScript_14E9B8
+	coord_event 11, 18, 3, 0, VAR_ROUTE101_STATE, 2, 0, Route101_EventScript_14E9B8
+	coord_event 6, 16, 3, 0, VAR_ROUTE101_STATE, 2, 0, Route101_EventScript_14E9CE
+	coord_event 6, 15, 3, 0, VAR_ROUTE101_STATE, 2, 0, Route101_EventScript_14E9CE
+	coord_event 6, 17, 3, 0, VAR_ROUTE101_STATE, 2, 0, Route101_EventScript_14E9CE
+	coord_event 6, 18, 3, 0, VAR_ROUTE101_STATE, 2, 0, Route101_EventScript_14E9CE
+	coord_event 7, 13, 3, 0, VAR_ROUTE101_STATE, 2, 0, Route101_EventScript_14E9E4
 
 Route101_MapBGEvents:: @ 83811DC
 	bg_event 5, 9, 0, 0, 0, Route101_EventScript_14EA76
diff --git a/data/maps/events/Route110.inc b/data/maps/events/Route110.inc
index 2f21186f4..278fee52b 100644
--- a/data/maps/events/Route110.inc
+++ b/data/maps/events/Route110.inc
@@ -40,11 +40,11 @@ Route110_MapWarps:: @ 8382040
 	warp_def 19, 88, 0, 2, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE
 
 Route110_MapCoordEvents:: @ 8382070
-	coord_event 28, 92, 3, 0, 0x40a9, 2, 0, Route110_EventScript_14FC27
-	coord_event 29, 92, 3, 0, 0x40a9, 2, 0, Route110_EventScript_14FC27
-	coord_event 33, 56, 3, 0, 0x4069, 0, 0, Route110_EventScript_14FD13
-	coord_event 34, 56, 3, 0, 0x4069, 0, 0, Route110_EventScript_14FD1E
-	coord_event 35, 56, 3, 0, 0x4069, 0, 0, Route110_EventScript_14FD29
+	coord_event 28, 92, 3, 0, VAR_CYCLING_CHALLENGE_STATE, 2, 0, Route110_EventScript_14FC27
+	coord_event 29, 92, 3, 0, VAR_CYCLING_CHALLENGE_STATE, 2, 0, Route110_EventScript_14FC27
+	coord_event 33, 56, 3, 0, VAR_ROUTE110_STATE, 0, 0, Route110_EventScript_14FD13
+	coord_event 34, 56, 3, 0, VAR_ROUTE110_STATE, 0, 0, Route110_EventScript_14FD1E
+	coord_event 35, 56, 3, 0, VAR_ROUTE110_STATE, 0, 0, Route110_EventScript_14FD29
 
 Route110_MapBGEvents:: @ 83820C0
 	bg_event 15, 25, 0, 0, 0, Route110_EventScript_14F9EF
diff --git a/data/maps/events/Route110_TrickHouseEntrance.inc b/data/maps/events/Route110_TrickHouseEntrance.inc
index 9f6e305cc..903d893c3 100644
--- a/data/maps/events/Route110_TrickHouseEntrance.inc
+++ b/data/maps/events/Route110_TrickHouseEntrance.inc
@@ -7,10 +7,10 @@ Route110_TrickHouseEntrance_MapWarps:: @ 8392158
 	warp_def 5, 2, 3, 0, MAP_ROUTE110_TRICK_HOUSE_PUZZLE1
 
 Route110_TrickHouseEntrance_MapCoordEvents:: @ 8392170
-	coord_event 4, 7, 3, 0, 0x40a5, 0, 0, Route110_TrickHouseEntrance_EventScript_1618B0
-	coord_event 5, 6, 3, 0, 0x40a5, 0, 0, Route110_TrickHouseEntrance_EventScript_1618B0
-	coord_event 6, 6, 3, 0, 0x40a5, 0, 0, Route110_TrickHouseEntrance_EventScript_1618B0
-	coord_event 7, 7, 3, 0, 0x40a5, 0, 0, Route110_TrickHouseEntrance_EventScript_1618B0
+	coord_event 4, 7, 3, 0, VAR_TRICK_HOUSE_ENTRANCE_STATE, 0, 0, Route110_TrickHouseEntrance_EventScript_1618B0
+	coord_event 5, 6, 3, 0, VAR_TRICK_HOUSE_ENTRANCE_STATE, 0, 0, Route110_TrickHouseEntrance_EventScript_1618B0
+	coord_event 6, 6, 3, 0, VAR_TRICK_HOUSE_ENTRANCE_STATE, 0, 0, Route110_TrickHouseEntrance_EventScript_1618B0
+	coord_event 7, 7, 3, 0, VAR_TRICK_HOUSE_ENTRANCE_STATE, 0, 0, Route110_TrickHouseEntrance_EventScript_1618B0
 
 Route110_TrickHouseEntrance_MapBGEvents:: @ 83921B0
 	bg_event 5, 1, 0, 1, 0, Route110_TrickHouseEntrance_EventScript_16158A
diff --git a/data/maps/events/Route116.inc b/data/maps/events/Route116.inc
index 77262f4c1..3b1858f33 100644
--- a/data/maps/events/Route116.inc
+++ b/data/maps/events/Route116.inc
@@ -28,7 +28,7 @@ Route116_MapWarps:: @ 8383380
 	warp_def 65, 10, 0, 2, MAP_RUSTURF_TUNNEL
 
 Route116_MapCoordEvents:: @ 8383398
-	coord_event 47, 9, 3, 0, 0x406f, 1, 0, Route116_EventScript_150B6E
+	coord_event 47, 9, 3, 0, VAR_ROUTE116_STATE, 1, 0, Route116_EventScript_150B6E
 
 Route116_MapBGEvents:: @ 83833A8
 	bg_event 5, 10, 0, 0, 0, Route116_EventScript_150B30
diff --git a/data/maps/events/Route118.inc b/data/maps/events/Route118.inc
index 2faff5e7d..154b96b75 100644
--- a/data/maps/events/Route118.inc
+++ b/data/maps/events/Route118.inc
@@ -21,9 +21,9 @@ Route118_MapObjects:: @ 8383684
 	object_event 20, MAP_OBJ_GFX_ITEM_BALL, 0, 69, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route118_EventScript_1B15B2, FLAG_ITEM_ROUTE118_1, 0, 0
 
 Route118_MapCoordEvents:: @ 8383864
-	coord_event 43, 11, 3, 0, 0x4071, 0, 0, Route118_EventScript_150FAE
-	coord_event 44, 11, 3, 0, 0x4071, 0, 0, Route118_EventScript_150FCE
-	coord_event 45, 11, 3, 0, 0x4071, 0, 0, Route118_EventScript_150FE4
+	coord_event 43, 11, 3, 0, VAR_ROUTE118_STATE, 0, 0, Route118_EventScript_150FAE
+	coord_event 44, 11, 3, 0, VAR_ROUTE118_STATE, 0, 0, Route118_EventScript_150FCE
+	coord_event 45, 11, 3, 0, VAR_ROUTE118_STATE, 0, 0, Route118_EventScript_150FE4
 
 Route118_MapBGEvents:: @ 8383894
 	bg_event 47, 14, 0, 8, 0, ITEM_MASTER_BALL, 0, 0
diff --git a/data/maps/events/Route119.inc b/data/maps/events/Route119.inc
index 4db19c38a..ae3cdce20 100644
--- a/data/maps/events/Route119.inc
+++ b/data/maps/events/Route119.inc
@@ -42,8 +42,8 @@ Route119_MapWarps:: @ 8383C8C
 	warp_def 33, 109, 0, 0, MAP_ROUTE119_HOUSE
 
 Route119_MapCoordEvents:: @ 8383C9C
-	coord_event 25, 31, 0, 0, 0x4072, 0, 0, Route119_EventScript_1511C5
-	coord_event 26, 31, 0, 0, 0x4072, 0, 0, Route119_EventScript_1511D0
+	coord_event 25, 31, 0, 0, VAR_ROUTE119_STATE, 0, 0, Route119_EventScript_1511C5
+	coord_event 26, 31, 0, 0, VAR_ROUTE119_STATE, 0, 0, Route119_EventScript_1511D0
 	coord_event 28, 13, 0, 0, 20, 0, 0, 0x0
 	coord_event 29, 13, 3, 0, 20, 0, 0, 0x0
 	coord_event 30, 13, 3, 0, 20, 0, 0, 0x0
diff --git a/data/maps/events/Route121.inc b/data/maps/events/Route121.inc
index a2b108ec1..0aae42562 100644
--- a/data/maps/events/Route121.inc
+++ b/data/maps/events/Route121.inc
@@ -26,10 +26,10 @@ Route121_MapWarps:: @ 8384714
 	warp_def 37, 5, 0, 2, MAP_ROUTE121_SAFARI_ZONE_ENTRANCE
 
 Route121_MapCoordEvents:: @ 838471C
-	coord_event 25, 5, 3, 0, 0x4074, 0, 0, Route121_EventScript_151B25
-	coord_event 25, 6, 3, 0, 0x4074, 0, 0, Route121_EventScript_151B25
-	coord_event 25, 7, 3, 0, 0x4074, 0, 0, Route121_EventScript_151B25
-	coord_event 25, 8, 3, 0, 0x4074, 0, 0, Route121_EventScript_151B25
+	coord_event 25, 5, 3, 0, VAR_ROUTE121_STATE, 0, 0, Route121_EventScript_151B25
+	coord_event 25, 6, 3, 0, VAR_ROUTE121_STATE, 0, 0, Route121_EventScript_151B25
+	coord_event 25, 7, 3, 0, VAR_ROUTE121_STATE, 0, 0, Route121_EventScript_151B25
+	coord_event 25, 8, 3, 0, VAR_ROUTE121_STATE, 0, 0, Route121_EventScript_151B25
 
 Route121_MapBGEvents:: @ 838475C
 	bg_event 32, 14, 0, 0, 0, Route121_EventScript_151B13
diff --git a/data/maps/events/RustboroCity.inc b/data/maps/events/RustboroCity.inc
index d718ecd06..64a1d1a66 100644
--- a/data/maps/events/RustboroCity.inc
+++ b/data/maps/events/RustboroCity.inc
@@ -29,19 +29,19 @@ RustboroCity_MapWarps:: @ 837FE64
 	warp_def 26, 46, 0, 0, MAP_RUSTBORO_CITY_HOUSE3
 
 RustboroCity_MapCoordEvents:: @ 837FEC4
-	coord_event 23, 20, 3, 0, 0x405a, 1, 0, RustboroCity_EventScript_14C481
-	coord_event 23, 21, 3, 0, 0x405a, 1, 0, RustboroCity_EventScript_14C498
-	coord_event 23, 22, 3, 0, 0x405a, 1, 0, RustboroCity_EventScript_14C4AF
-	coord_event 23, 23, 3, 0, 0x405a, 1, 0, RustboroCity_EventScript_14C4C6
-	coord_event 23, 24, 3, 0, 0x405a, 1, 0, RustboroCity_EventScript_14C4DD
-	coord_event 30, 9, 3, 0, 0x405a, 2, 0, RustboroCity_EventScript_14C620
-	coord_event 29, 10, 3, 0, 0x405a, 2, 0, RustboroCity_EventScript_14C62C
-	coord_event 30, 11, 3, 0, 0x405a, 2, 0, RustboroCity_EventScript_14C638
-	coord_event 30, 12, 3, 0, 0x405a, 2, 0, RustboroCity_EventScript_14C644
-	coord_event 30, 9, 3, 0, 0x405a, 4, 0, RustboroCity_EventScript_14C74D
-	coord_event 31, 10, 3, 0, 0x405a, 4, 0, RustboroCity_EventScript_14C759
-	coord_event 30, 11, 3, 0, 0x405a, 4, 0, RustboroCity_EventScript_14C765
-	coord_event 30, 12, 3, 0, 0x405a, 4, 0, RustboroCity_EventScript_14C771
+	coord_event 23, 20, 3, 0, VAR_RUSTBORO_STATE, 1, 0, RustboroCity_EventScript_14C481
+	coord_event 23, 21, 3, 0, VAR_RUSTBORO_STATE, 1, 0, RustboroCity_EventScript_14C498
+	coord_event 23, 22, 3, 0, VAR_RUSTBORO_STATE, 1, 0, RustboroCity_EventScript_14C4AF
+	coord_event 23, 23, 3, 0, VAR_RUSTBORO_STATE, 1, 0, RustboroCity_EventScript_14C4C6
+	coord_event 23, 24, 3, 0, VAR_RUSTBORO_STATE, 1, 0, RustboroCity_EventScript_14C4DD
+	coord_event 30, 9, 3, 0, VAR_RUSTBORO_STATE, 2, 0, RustboroCity_EventScript_14C620
+	coord_event 29, 10, 3, 0, VAR_RUSTBORO_STATE, 2, 0, RustboroCity_EventScript_14C62C
+	coord_event 30, 11, 3, 0, VAR_RUSTBORO_STATE, 2, 0, RustboroCity_EventScript_14C638
+	coord_event 30, 12, 3, 0, VAR_RUSTBORO_STATE, 2, 0, RustboroCity_EventScript_14C644
+	coord_event 30, 9, 3, 0, VAR_RUSTBORO_STATE, 4, 0, RustboroCity_EventScript_14C74D
+	coord_event 31, 10, 3, 0, VAR_RUSTBORO_STATE, 4, 0, RustboroCity_EventScript_14C759
+	coord_event 30, 11, 3, 0, VAR_RUSTBORO_STATE, 4, 0, RustboroCity_EventScript_14C765
+	coord_event 30, 12, 3, 0, VAR_RUSTBORO_STATE, 4, 0, RustboroCity_EventScript_14C771
 
 RustboroCity_MapBGEvents:: @ 837FF94
 	bg_event 23, 19, 0, 0, 0, RustboroCity_EventScript_14C41C
diff --git a/data/maps/events/RusturfTunnel.inc b/data/maps/events/RusturfTunnel.inc
index 6d79e5722..f0b67df82 100644
--- a/data/maps/events/RusturfTunnel.inc
+++ b/data/maps/events/RusturfTunnel.inc
@@ -17,8 +17,8 @@ RusturfTunnel_MapWarps:: @ 838BE1C
 
 RusturfTunnel_MapCoordEvents:: @ 838BE34
 	coord_event 23, 4, 3, 0, 0, 0, 0, RusturfTunnel_EventScript_15C999
-	coord_event 9, 4, 3, 0, 0x409a, 2, 0, RusturfTunnel_EventScript_15C9AB
-	coord_event 9, 5, 3, 0, 0x409a, 2, 0, RusturfTunnel_EventScript_15C9AB
+	coord_event 9, 4, 3, 0, VAR_RUSTURF_TUNNEL_STATE, 2, 0, RusturfTunnel_EventScript_15C9AB
+	coord_event 9, 5, 3, 0, VAR_RUSTURF_TUNNEL_STATE, 2, 0, RusturfTunnel_EventScript_15C9AB
 	coord_event 25, 4, 3, 0, 0, 0, 0, RusturfTunnel_EventScript_15C99F
 	coord_event 25, 5, 3, 0, 0, 0, 0, RusturfTunnel_EventScript_15C9A5
 
diff --git a/data/maps/events/SeafloorCavern_Room9.inc b/data/maps/events/SeafloorCavern_Room9.inc
index 8651bb61c..09a94cf27 100644
--- a/data/maps/events/SeafloorCavern_Room9.inc
+++ b/data/maps/events/SeafloorCavern_Room9.inc
@@ -11,7 +11,7 @@ SeafloorCavern_Room9_MapWarps:: @ 838D6C8
 	warp_def 5, 4, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM8
 
 SeafloorCavern_Room9_MapCoordEvents:: @ 838D6D0
-	coord_event 17, 42, 3, 0, 0x40a2, 0, 0, SeafloorCavern_Room9_EventScript_15DAFA
+	coord_event 17, 42, 3, 0, VAR_SEAFLOOR_CAVERN_STATE, 0, 0, SeafloorCavern_Room9_EventScript_15DAFA
 
 SeafloorCavern_Room9_MapEvents:: @ 838D6E0
 	map_events SeafloorCavern_Room9_MapObjects, SeafloorCavern_Room9_MapWarps, SeafloorCavern_Room9_MapCoordEvents, 0x0
diff --git a/data/maps/events/SlateportCity_Harbor.inc b/data/maps/events/SlateportCity_Harbor.inc
index 0498d8b16..77f0735cd 100644
--- a/data/maps/events/SlateportCity_Harbor.inc
+++ b/data/maps/events/SlateportCity_Harbor.inc
@@ -15,10 +15,10 @@ SlateportCity_Harbor_MapWarps:: @ 8387FF0
 	warp_def 20, 15, 0, 9, MAP_SLATEPORT_CITY
 
 SlateportCity_Harbor_MapCoordEvents:: @ 8388010
-	coord_event 8, 11, 3, 0, 0x40a0, 1, 0, SlateportCity_Harbor_EventScript_155F9B
-	coord_event 8, 12, 3, 0, 0x40a0, 1, 0, SlateportCity_Harbor_EventScript_155FA7
-	coord_event 8, 13, 3, 0, 0x40a0, 1, 0, SlateportCity_Harbor_EventScript_155FB3
-	coord_event 8, 14, 3, 0, 0x40a0, 1, 0, SlateportCity_Harbor_EventScript_155FBF
+	coord_event 8, 11, 3, 0, VAR_SLATEPORT_HARBOR_STATE, 1, 0, SlateportCity_Harbor_EventScript_155F9B
+	coord_event 8, 12, 3, 0, VAR_SLATEPORT_HARBOR_STATE, 1, 0, SlateportCity_Harbor_EventScript_155FA7
+	coord_event 8, 13, 3, 0, VAR_SLATEPORT_HARBOR_STATE, 1, 0, SlateportCity_Harbor_EventScript_155FB3
+	coord_event 8, 14, 3, 0, VAR_SLATEPORT_HARBOR_STATE, 1, 0, SlateportCity_Harbor_EventScript_155FBF
 
 SlateportCity_Harbor_MapEvents:: @ 8388050
 	map_events SlateportCity_Harbor_MapObjects, SlateportCity_Harbor_MapWarps, SlateportCity_Harbor_MapCoordEvents, 0x0
diff --git a/data/maps/events/SlateportCity_OceanicMuseum_1F.inc b/data/maps/events/SlateportCity_OceanicMuseum_1F.inc
index 1650b9f27..b432f3c3e 100644
--- a/data/maps/events/SlateportCity_OceanicMuseum_1F.inc
+++ b/data/maps/events/SlateportCity_OceanicMuseum_1F.inc
@@ -20,8 +20,8 @@ SlateportCity_OceanicMuseum_1F_MapWarps:: @ 8387C88
 	warp_def 6, 1, 0, 0, MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_2F
 
 SlateportCity_OceanicMuseum_1F_MapCoordEvents:: @ 8387CA0
-	coord_event 9, 7, 3, 0, 0x40aa, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155AE4
-	coord_event 10, 7, 3, 0, 0x40aa, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155AF5
+	coord_event 9, 7, 3, 0, VAR_SLATEPORT_MUSEUM_1F_STATE, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155AE4
+	coord_event 10, 7, 3, 0, VAR_SLATEPORT_MUSEUM_1F_STATE, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155AF5
 
 SlateportCity_OceanicMuseum_1F_MapBGEvents:: @ 8387CC0
 	bg_event 2, 7, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BC5
diff --git a/data/maps/events/SootopolisCity.inc b/data/maps/events/SootopolisCity.inc
index 3bbd87f0b..e725b8e80 100644
--- a/data/maps/events/SootopolisCity.inc
+++ b/data/maps/events/SootopolisCity.inc
@@ -26,7 +26,7 @@ SootopolisCity_MapWarps:: @ 8380710
 	warp_def 48, 25, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE8
 
 SootopolisCity_MapCoordEvents:: @ 8380770
-	coord_event 25, 6, 3, 0, 0x405e, 1, 0, SootopolisCity_EventScript_14D308
+	coord_event 25, 6, 3, 0, VAR_SOOTOPOLIS_STATE, 1, 0, SootopolisCity_EventScript_14D308
 
 SootopolisCity_MapBGEvents:: @ 8380780
 	bg_event 32, 34, 0, 0, 0, SootopolisCity_EventScript_14D2ED
diff --git a/data/maps/events/VictoryRoad_1F.inc b/data/maps/events/VictoryRoad_1F.inc
index 593f2df02..c88f9363c 100644
--- a/data/maps/events/VictoryRoad_1F.inc
+++ b/data/maps/events/VictoryRoad_1F.inc
@@ -15,9 +15,9 @@ VictoryRoad_1F_MapWarps:: @ 838D98C
 	warp_def 9, 14, 4, 4, MAP_VICTORY_ROAD_B1F
 
 VictoryRoad_1F_MapCoordEvents:: @ 838D9B4
-	coord_event 34, 3, 3, 0, 0x40c3, 0, 0, VictoryRoad_1F_EventScript_15DE97
-	coord_event 34, 4, 3, 0, 0x40c3, 0, 0, VictoryRoad_1F_EventScript_15DEAB
-	coord_event 34, 5, 3, 0, 0x40c3, 0, 0, VictoryRoad_1F_EventScript_15DEBF
+	coord_event 34, 3, 3, 0, VAR_VICTORY_ROAD_1F_STATE, 0, 0, VictoryRoad_1F_EventScript_15DE97
+	coord_event 34, 4, 3, 0, VAR_VICTORY_ROAD_1F_STATE, 0, 0, VictoryRoad_1F_EventScript_15DEAB
+	coord_event 34, 5, 3, 0, VAR_VICTORY_ROAD_1F_STATE, 0, 0, VictoryRoad_1F_EventScript_15DEBF
 
 VictoryRoad_1F_MapBGEvents:: @ 838D9E4
 	bg_event 30, 39, 4, 7, 0, ITEM_ULTRA_BALL, 81, 0