5 files changed, 11 insertions, 10 deletions
diff --git a/src/field/battle_tower.c b/src/field/battle_tower.c
index c4a94b172..12337631f 100644
--- a/src/field/battle_tower.c
+++ b/src/field/battle_tower.c
@@ -801,7 +801,7 @@ void SetBattleTowerTrainerGfxId(u8 trainerIndex)
     if (i != 30)
     {
         u8 trainerObjectGfxId = sMaleTrainerGfxIds[i];
-        VarSet(0x4010, trainerObjectGfxId);
+        VarSet(VAR_OBJ_GFX_ID_0, trainerObjectGfxId);
         return;
     }
 
@@ -809,11 +809,11 @@ void SetBattleTowerTrainerGfxId(u8 trainerIndex)
     if (i != 20)
     {
         u8 trainerObjectGfxId = sFemaleTrainerGfxIds[i];
-        VarSet(0x4010, trainerObjectGfxId);
+        VarSet(VAR_OBJ_GFX_ID_0, trainerObjectGfxId);
         return;
     }
 
-    VarSet(0x4010, MAP_OBJ_GFX_BOY_1);
+    VarSet(VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_BOY_1);
 }
 
 void SetEReaderTrainerGfxId(void)
diff --git a/src/field/event_data.c b/src/field/event_data.c
index 587da8138..86045df15 100644
--- a/src/field/event_data.c
+++ b/src/field/event_data.c
@@ -138,7 +138,7 @@ bool8 VarSet(u16 id, u16 value)
 
 u8 VarGetFieldObjectGraphicsId(u8 id)
 {
-    return VarGet(0x4010 + id);
+    return VarGet(VAR_OBJ_GFX_ID_0 + id);
 }
 
 u8 *GetFlagPointer(u16 id)
diff --git a/src/field/mauville_man.c b/src/field/mauville_man.c
index 30f6f5233..4db513f65 100644
--- a/src/field/mauville_man.c
+++ b/src/field/mauville_man.c
@@ -10,6 +10,7 @@
 #include "overworld.h"
 #include "random.h"
 #include "script.h"
+#include "constants/map_objects.h"
 #include "constants/songs.h"
 #include "sound.h"
 #include "string_util.h"
@@ -974,7 +975,7 @@ static void Task_BardSong(u8 taskId)
 
 void sub_80F83D0(void)
 {
-    VarSet(0x4010, 0x45 + GetCurrentMauvilleOldMan());
+    VarSet(VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_BARD + GetCurrentMauvilleOldMan());
 }
 
 struct Story
diff --git a/src/field/secret_base.c b/src/field/secret_base.c
index 7589ab1e3..19f8e18dc 100644
--- a/src/field/secret_base.c
+++ b/src/field/secret_base.c
@@ -479,7 +479,7 @@ void sub_80BBDD0(void)
 void sub_80BBFA4(void)
 {
     int curBase = VarGet(VAR_0x4054);
-    VarSet(VAR_0x401F, gUnknown_083D13EC[sub_80BCCA4(curBase)]);
+    VarSet(VAR_OBJ_GFX_ID_F, gUnknown_083D13EC[sub_80BCCA4(curBase)]);
 }
 
 void sub_80BBFD8(struct MapPosition *position, struct MapEvents *events)
diff --git a/src/script_pokemon_util_80C4BF0.c b/src/script_pokemon_util_80C4BF0.c
index 0f409bfe1..fc94b1b01 100644
--- a/src/script_pokemon_util_80C4BF0.c
+++ b/src/script_pokemon_util_80C4BF0.c
@@ -249,10 +249,10 @@ void ShowContestWinner(void)
 
 void sub_80C4F70(void)
 {
-    VarSet(0x4010, gContestMons[0].trainerGfxId);
-    VarSet(0x4011, gContestMons[1].trainerGfxId);
-    VarSet(0x4012, gContestMons[2].trainerGfxId);
-    VarSet(0x4013, gContestMons[3].trainerGfxId);
+    VarSet(VAR_OBJ_GFX_ID_0, gContestMons[0].trainerGfxId);
+    VarSet(VAR_OBJ_GFX_ID_1, gContestMons[1].trainerGfxId);
+    VarSet(VAR_OBJ_GFX_ID_2, gContestMons[2].trainerGfxId);
+    VarSet(VAR_OBJ_GFX_ID_3, gContestMons[3].trainerGfxId);
 }
 
 bool8 GiveMonArtistRibbon(void)