diff --git a/data/maps/PetalburgCity/map.json b/data/maps/PetalburgCity/map.json
index 3d09ae706..6a9a6b33d 100644
--- a/data/maps/PetalburgCity/map.json
+++ b/data/maps/PetalburgCity/map.json
@@ -229,7 +229,7 @@
       "x": 4,
       "y": 10,
       "elevation": 3,
-      "var": "VAR_0x40C9",
+      "var": "VAR_SCOTT_PETALBURG_ENCOUNTER",
       "var_value": "0",
       "script": "PetalburgCity_EventScript_1DC691"
     },
@@ -238,7 +238,7 @@
       "x": 4,
       "y": 11,
       "elevation": 3,
-      "var": "VAR_0x40C9",
+      "var": "VAR_SCOTT_PETALBURG_ENCOUNTER",
       "var_value": "0",
       "script": "PetalburgCity_EventScript_1DC6A7"
     },
@@ -247,7 +247,7 @@
       "x": 4,
       "y": 12,
       "elevation": 3,
-      "var": "VAR_0x40C9",
+      "var": "VAR_SCOTT_PETALBURG_ENCOUNTER",
       "var_value": "0",
       "script": "PetalburgCity_EventScript_1DC6BD"
     },
@@ -256,7 +256,7 @@
       "x": 4,
       "y": 13,
       "elevation": 3,
-      "var": "VAR_0x40C9",
+      "var": "VAR_SCOTT_PETALBURG_ENCOUNTER",
       "var_value": "0",
       "script": "PetalburgCity_EventScript_1DC6D3"
     }
diff --git a/data/maps/PetalburgCity/scripts.inc b/data/maps/PetalburgCity/scripts.inc
index 0520fe044..5a652ab15 100644
--- a/data/maps/PetalburgCity/scripts.inc
+++ b/data/maps/PetalburgCity/scripts.inc
@@ -572,7 +572,7 @@ PetalburgCity_EventScript_1DC6E9:: @ 81DC6E9
 	call_if_eq PetalburgCity_EventScript_1DC7B2
 	compare VAR_0x8008, 3
 	call_if_eq PetalburgCity_EventScript_1DC7C4
-	setvar VAR_0x40C9, 1
+	setvar VAR_SCOTT_PETALBURG_ENCOUNTER, 1
 	removeobject 9
 	releaseall
 	end
diff --git a/data/maps/PetalburgCity_Gym/scripts.inc b/data/maps/PetalburgCity_Gym/scripts.inc
index fef5c4048..a256a6547 100644
--- a/data/maps/PetalburgCity_Gym/scripts.inc
+++ b/data/maps/PetalburgCity_Gym/scripts.inc
@@ -60,7 +60,7 @@ PetalburgCity_Gym_EventScript_204955:: @ 8204955
 	return
 
 PetalburgCity_Gym_EventScript_20495D:: @ 820495D
-	setorcopyvar VAR_NEVER_READ_0x8015, 269
+	setorcopyvar VAR_TRAINER_BATTLE_OPPONENT_A, 269
 	specialvar VAR_RESULT, IsTrainerReadyForRematch
 	compare VAR_RESULT, 1
 	goto_if_eq PetalburgCity_Gym_EventScript_204985
diff --git a/include/constants/vars.h b/include/constants/vars.h
index 99d1813da..3bd5d8efe 100644
--- a/include/constants/vars.h
+++ b/include/constants/vars.h
@@ -217,7 +217,7 @@
 #define VAR_STEVENS_HOUSE_STATE              0x40C6
 #define VAR_OLDALE_STATE                     0x40C7
 #define VAR_JAGGED_PASS_STATE                0x40C8
-#define VAR_0x40C9                           0x40C9
+#define VAR_SCOTT_PETALBURG_ENCOUNTER        0x40C9
 #define VAR_SKY_PILLAR_STATE                 0x40CA
 #define VAR_ROUTE_111_STATE                  0x40CB
 #define VAR_FOSSIL_MANIAC_STATE              0x40CC
@@ -276,27 +276,27 @@
 #define SPECIAL_VARS_START 0x8000
 // special vars
 // They are commonly used as parameters to commands, or return values from commands.
-#define VAR_0x8000                 0x8000
-#define VAR_0x8001                 0x8001
-#define VAR_0x8002                 0x8002
-#define VAR_0x8003                 0x8003
-#define VAR_0x8004                 0x8004
-#define VAR_0x8005                 0x8005
-#define VAR_0x8006                 0x8006
-#define VAR_0x8007                 0x8007
-#define VAR_0x8008                 0x8008
-#define VAR_0x8009                 0x8009
-#define VAR_0x800A                 0x800A
-#define VAR_0x800B                 0x800B
-#define VAR_FACING                 0x800C
-#define VAR_RESULT                 0x800D
-#define VAR_ITEM_ID                0x800E
-#define VAR_LAST_TALKED            0x800F
-#define VAR_CONTEST_RANK           0x8010
-#define VAR_CONTEST_CATEGORY       0x8011
-#define VAR_MON_BOX_ID             0x8012
-#define VAR_MON_BOX_POS            0x8013
-#define VAR_UNUSED_0x8014          0x8014
-#define VAR_NEVER_READ_0x8015      0x8015 // Written to, but never read
+#define VAR_0x8000                    0x8000
+#define VAR_0x8001                    0x8001
+#define VAR_0x8002                    0x8002
+#define VAR_0x8003                    0x8003
+#define VAR_0x8004                    0x8004
+#define VAR_0x8005                    0x8005
+#define VAR_0x8006                    0x8006
+#define VAR_0x8007                    0x8007
+#define VAR_0x8008                    0x8008
+#define VAR_0x8009                    0x8009
+#define VAR_0x800A                    0x800A
+#define VAR_0x800B                    0x800B
+#define VAR_FACING                    0x800C
+#define VAR_RESULT                    0x800D
+#define VAR_ITEM_ID                   0x800E
+#define VAR_LAST_TALKED               0x800F
+#define VAR_CONTEST_RANK              0x8010
+#define VAR_CONTEST_CATEGORY          0x8011
+#define VAR_MON_BOX_ID                0x8012
+#define VAR_MON_BOX_POS               0x8013
+#define VAR_UNUSED_0x8014             0x8014
+#define VAR_TRAINER_BATTLE_OPPONENT_A 0x8015 // Alias of gTrainerBattleOpponent_A
 
 #endif // GUARD_CONSTANTS_VARS_H