Name and use dynamic object gfx id vars

5 files changed, 41 insertions, 41 deletions

diff --git a/data/event_scripts.s b/data/event_scripts.s
index b18e4eb1a..d66ec1eb3 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -1854,11 +1854,11 @@ RustboroCity_EventScript_1A014E:: @ 81A014E
 	end
 
 RustboroCity_EventScript_1A0166:: @ 81A0166
-	setvar 0x4010, 105
+	setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_RIVAL_MAY_NORMAL
 	return
 
 RustboroCity_EventScript_1A016C:: @ 81A016C
-	setvar 0x4010, 100
+	setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL
 	return
 
 LavaridgeTown_EventScript_1A0172:: @ 81A0172
@@ -1872,11 +1872,11 @@ Route119_EventScript_1A0172:: @ 81A0172
 	end
 
 LavaridgeTown_EventScript_1A018A:: @ 81A018A
-	setvar 0x4013, 106
+	setvar VAR_OBJ_GFX_ID_3, MAP_OBJ_GFX_RIVAL_MAY_MACH_BIKE
 	return
 
 LavaridgeTown_EventScript_1A0190:: @ 81A0190
-	setvar 0x4013, 101
+	setvar VAR_OBJ_GFX_ID_3, MAP_OBJ_GFX_RIVAL_BRENDAN_MACH_BIKE
 	return
 
 AquaHideout_1F_EventScript_1A0196:: @ 81A0196
@@ -1903,30 +1903,30 @@ SeafloorCavern_Room4_EventScript_1A0196:: @ 81A0196
 SeafloorCavern_Room9_EventScript_1A0196:: @ 81A0196
 SlateportCity_OceanicMuseum_2F_EventScript_1A0196:: @ 81A0196
 	.ifdef SAPPHIRE
-	setvar 0x4011, 117
-	setvar 0x4012, 118
-	setvar 0x4014, 119
-	setvar 0x4015, 120
-	setvar 0x4016, 195
-	setvar 0x4017, 196
+	setvar VAR_OBJ_GFX_ID_1, MAP_OBJ_GFX_AQUA_MEMBER_M
+	setvar VAR_OBJ_GFX_ID_2, MAP_OBJ_GFX_AQUA_MEMBER_F
+	setvar VAR_OBJ_GFX_ID_4, MAP_OBJ_GFX_MAGMA_MEMBER_M
+	setvar VAR_OBJ_GFX_ID_5, MAP_OBJ_GFX_MAGMA_MEMBER_F
+	setvar VAR_OBJ_GFX_ID_6, MAP_OBJ_GFX_ARCHIE
+	setvar VAR_OBJ_GFX_ID_7, MAP_OBJ_GFX_MAXIE
 	.else
-	setvar 0x4011, 119
-	setvar 0x4012, 120
-	setvar 0x4014, 117
-	setvar 0x4015, 118
-	setvar 0x4016, 196
-	setvar 0x4017, 195
+	setvar VAR_OBJ_GFX_ID_1, MAP_OBJ_GFX_MAGMA_MEMBER_M
+	setvar VAR_OBJ_GFX_ID_2, MAP_OBJ_GFX_MAGMA_MEMBER_F
+	setvar VAR_OBJ_GFX_ID_4, MAP_OBJ_GFX_AQUA_MEMBER_M
+	setvar VAR_OBJ_GFX_ID_5, MAP_OBJ_GFX_AQUA_MEMBER_F
+	setvar VAR_OBJ_GFX_ID_6, MAP_OBJ_GFX_MAXIE
+	setvar VAR_OBJ_GFX_ID_7, MAP_OBJ_GFX_ARCHIE
 	.endif
 	return
 
 CaveOfOrigin_B4F_EventScript_1A01B5:: @ 81A01B5
 SeafloorCavern_Room9_EventScript_1A01B5:: @ 81A01B5
 	.ifdef SAPPHIRE
-	setvar 0x4018, 197
-	setvar 0x4019, 205
+	setvar VAR_OBJ_GFX_ID_8, MAP_OBJ_GFX_KYOGRE_1
+	setvar VAR_OBJ_GFX_ID_9, MAP_OBJ_GFX_KYOGRE_2
 	.else
-	setvar 0x4018, 198
-	setvar 0x4019, 206
+	setvar VAR_OBJ_GFX_ID_8, MAP_OBJ_GFX_GROUDON_1
+	setvar VAR_OBJ_GFX_ID_9, MAP_OBJ_GFX_GROUDON_2
 	.endif
 	return
 
diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc
index 56fc0e59b..796775aa2 100644
--- a/data/scripts/maps/SlateportCity.inc
+++ b/data/scripts/maps/SlateportCity.inc
@@ -4,11 +4,11 @@ SlateportCity_MapScripts:: @ 814BA36
 
 SlateportCity_MapScript1_14BA3C:: @ 814BA3C
 	.ifdef SAPPHIRE
-	setvar 0x4010, MAP_OBJ_GFX_AQUA_MEMBER_F
-	setvar 0x4011, MAP_OBJ_GFX_AQUA_MEMBER_M
+	setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_AQUA_MEMBER_F
+	setvar VAR_OBJ_GFX_ID_1, MAP_OBJ_GFX_AQUA_MEMBER_M
 	.else
-	setvar 0x4010, MAP_OBJ_GFX_MAGMA_MEMBER_F
-	setvar 0x4011, MAP_OBJ_GFX_MAGMA_MEMBER_M
+	setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_MAGMA_MEMBER_F
+	setvar VAR_OBJ_GFX_ID_1, MAP_OBJ_GFX_MAGMA_MEMBER_M
 	.endif
 	setvar 0x40aa, 0
 	call SlateportCity_EventScript_14BA5C
diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc
index 9e002e61e..98d2160a8 100644
--- a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc
+++ b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc
@@ -4,11 +4,11 @@ SlateportCity_OceanicMuseum_1F_MapScripts:: @ 8155ACA
 
 SlateportCity_OceanicMuseum_1F_MapScript1_155AD0:: @ 8155AD0
 	.ifdef SAPPHIRE
-	setvar 0x4010, MAP_OBJ_GFX_AQUA_MEMBER_F
-	setvar 0x4011, MAP_OBJ_GFX_AQUA_MEMBER_M
+	setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_AQUA_MEMBER_F
+	setvar VAR_OBJ_GFX_ID_1, MAP_OBJ_GFX_AQUA_MEMBER_M
 	.else
-	setvar 0x4010, MAP_OBJ_GFX_MAGMA_MEMBER_F
-	setvar 0x4011, MAP_OBJ_GFX_MAGMA_MEMBER_M
+	setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_MAGMA_MEMBER_F
+	setvar VAR_OBJ_GFX_ID_1, MAP_OBJ_GFX_MAGMA_MEMBER_M
 	.endif
 	end
 
diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/scripts/maps/SouthernIsland_Interior.inc
index ea2f852f4..6386c3b82 100644
--- a/data/scripts/maps/SouthernIsland_Interior.inc
+++ b/data/scripts/maps/SouthernIsland_Interior.inc
@@ -14,9 +14,9 @@ SouthernIsland_Interior_EventScript_160B68:: @ 8160B68
 
 SouthernIsland_Interior_MapScript1_160B6C:: @ 8160B6C
 	.ifdef SAPPHIRE
-	setvar 0x4011, 188
+	setvar VAR_OBJ_GFX_ID_1, MAP_OBJ_GFX_LATIOS
 	.else
-	setvar 0x4011, 187
+	setvar VAR_OBJ_GFX_ID_1, MAP_OBJ_GFX_LATIAS
 	.endif
 	call SouthernIsland_Interior_EventScript_160B77
 	end
@@ -30,11 +30,11 @@ SouthernIsland_Interior_EventScript_160B77:: @ 8160B77
 	end
 
 SouthernIsland_Interior_EventScript_160B8F:: @ 8160B8F
-	setvar 0x4010, 100
+	setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL
 	return
 
 SouthernIsland_Interior_EventScript_160B95:: @ 8160B95
-	setvar 0x4010, 105
+	setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_RIVAL_MAY_NORMAL
 	return
 
 SouthernIsland_Interior_EventScript_160B9B:: @ 8160B9B
diff --git a/data/scripts/maps/UnknownMap_25_34.inc b/data/scripts/maps/UnknownMap_25_34.inc
index c31eef6ba..6c25c34c5 100644
--- a/data/scripts/maps/UnknownMap_25_34.inc
+++ b/data/scripts/maps/UnknownMap_25_34.inc
@@ -91,37 +91,37 @@ LinkContestRoom1_EventScript_15F646:: @ 815F646
 	end
 
 LinkContestRoom1_EventScript_15F699:: @ 815F699
-	copyvar 0x4014, VAR_TEMP_1
+	copyvar VAR_OBJ_GFX_ID_4, VAR_TEMP_1
 	addvar VAR_TEMP_0, 1
 	return
 
 LinkContestRoom1_EventScript_15F6A4:: @ 815F6A4
-	copyvar 0x4015, VAR_TEMP_1
+	copyvar VAR_OBJ_GFX_ID_5, VAR_TEMP_1
 	addvar VAR_TEMP_0, 1
 	return
 
 LinkContestRoom1_EventScript_15F6AF:: @ 815F6AF
-	copyvar 0x4016, VAR_TEMP_1
+	copyvar VAR_OBJ_GFX_ID_6, VAR_TEMP_1
 	addvar VAR_TEMP_0, 1
 	return
 
 LinkContestRoom1_EventScript_15F6BA:: @ 815F6BA
-	copyvar 0x4017, VAR_TEMP_1
+	copyvar VAR_OBJ_GFX_ID_7, VAR_TEMP_1
 	addvar VAR_TEMP_0, 1
 	return
 
 LinkContestRoom1_EventScript_15F6C5:: @ 815F6C5
-	copyvar 0x4018, VAR_TEMP_1
+	copyvar VAR_OBJ_GFX_ID_8, VAR_TEMP_1
 	addvar VAR_TEMP_0, 1
 	return
 
 LinkContestRoom1_EventScript_15F6D0:: @ 815F6D0
-	copyvar 0x4019, VAR_TEMP_1
+	copyvar VAR_OBJ_GFX_ID_9, VAR_TEMP_1
 	addvar VAR_TEMP_0, 1
 	return
 
 LinkContestRoom1_EventScript_15F6DB:: @ 815F6DB
-	copyvar 0x401a, VAR_TEMP_1
+	copyvar VAR_OBJ_GFX_ID_A, VAR_TEMP_1
 	addvar VAR_TEMP_0, 1
 	return
 
@@ -421,9 +421,9 @@ VerdanturfTown_ContestLobby_EventScript_15FBDB:: @ 815FBDB
 	return
 
 FallarborTown_ContestLobby_EventScript_15FBF3:: @ 815FBF3
-	setvar 0x4013, 100
+	setvar VAR_OBJ_GFX_ID_3, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL
 	return
 
 FallarborTown_ContestLobby_EventScript_15FBF9:: @ 815FBF9
-	setvar 0x4013, 105
+	setvar VAR_OBJ_GFX_ID_3, MAP_OBJ_GFX_RIVAL_MAY_NORMAL
 	return