diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm
index a317d083c..cba020701 100644
--- a/maps/NationalPark.asm
+++ b/maps/NationalPark.asm
@@ -103,7 +103,7 @@ UnknownScript_0x5c074:
 UnknownScript_0x5c088:
 	scall UnknownScript_0x5c114
 	winlosstext SchoolboyJack1BeatenText, $0000
-	copybytetovar JackFightCount
+	copybytetovar wJackFightCount
 	if_equal 4, .Fight4
 	if_equal 3, .Fight3
 	if_equal 2, .Fight2
@@ -125,7 +125,7 @@ UnknownScript_0x5c088:
 	loadtrainer SCHOOLBOY, JACK1
 	startbattle
 	returnafterbattle
-	loadvar JackFightCount, 1
+	loadvar wJackFightCount, 1
 	clearflag ENGINE_JACK
 	end
 
@@ -133,7 +133,7 @@ UnknownScript_0x5c088:
 	loadtrainer SCHOOLBOY, JACK2
 	startbattle
 	returnafterbattle
-	loadvar JackFightCount, 2
+	loadvar wJackFightCount, 2
 	clearflag ENGINE_JACK
 	end
 
@@ -141,7 +141,7 @@ UnknownScript_0x5c088:
 	loadtrainer SCHOOLBOY, JACK3
 	startbattle
 	returnafterbattle
-	loadvar JackFightCount, 3
+	loadvar wJackFightCount, 3
 	clearflag ENGINE_JACK
 	end
 
@@ -149,7 +149,7 @@ UnknownScript_0x5c088:
 	loadtrainer SCHOOLBOY, JACK4
 	startbattle
 	returnafterbattle
-	loadvar JackFightCount, 4
+	loadvar wJackFightCount, 4
 	clearflag ENGINE_JACK
 	end
 
diff --git a/maps/OlivineLighthouse2F.asm b/maps/OlivineLighthouse2F.asm
index 987dcf5d2..decae23a5 100644
--- a/maps/OlivineLighthouse2F.asm
+++ b/maps/OlivineLighthouse2F.asm
@@ -78,7 +78,7 @@ UnknownScript_0x5afb3:
 UnknownScript_0x5afc7:
 	scall UnknownScript_0x5b06b
 	winlosstext SailorHuey1BeatenText, $0000
-	copybytetovar HueyFightCount
+	copybytetovar wHueyFightCount
 	if_equal 3, .Fight3
 	if_equal 2, .Fight2
 	if_equal 1, .Fight1
@@ -96,7 +96,7 @@ UnknownScript_0x5afc7:
 	loadtrainer SAILOR, HUEY1
 	startbattle
 	returnafterbattle
-	loadvar HueyFightCount, 1
+	loadvar wHueyFightCount, 1
 	clearflag ENGINE_HUEY
 	end
 
@@ -104,7 +104,7 @@ UnknownScript_0x5afc7:
 	loadtrainer SAILOR, HUEY2
 	startbattle
 	returnafterbattle
-	loadvar HueyFightCount, 2
+	loadvar wHueyFightCount, 2
 	clearflag ENGINE_HUEY
 	end
 
@@ -112,7 +112,7 @@ UnknownScript_0x5afc7:
 	loadtrainer SAILOR, HUEY3
 	startbattle
 	returnafterbattle
-	loadvar HueyFightCount, 3
+	loadvar wHueyFightCount, 3
 	clearflag ENGINE_HUEY
 	end
 
diff --git a/maps/Route26.asm b/maps/Route26.asm
index 1fad5b7e2..781528b64 100644
--- a/maps/Route26.asm
+++ b/maps/Route26.asm
@@ -80,7 +80,7 @@ UnknownScript_0x1a4d65:
 UnknownScript_0x1a4d79:
 	scall UnknownScript_0x1a4dd7
 	winlosstext CooltrainermGaven3BeatenText, $0000
-	copybytetovar GavenFightCount
+	copybytetovar wGavenFightCount
 	if_equal 2, .Fight2
 	if_equal 1, .Fight1
 	if_equal 0, .LoadFight0
@@ -94,7 +94,7 @@ UnknownScript_0x1a4d79:
 	loadtrainer COOLTRAINERM, GAVEN3
 	startbattle
 	returnafterbattle
-	loadvar GavenFightCount, 1
+	loadvar wGavenFightCount, 1
 	clearflag ENGINE_GAVEN
 	end
 
@@ -102,7 +102,7 @@ UnknownScript_0x1a4d79:
 	loadtrainer COOLTRAINERM, GAVEN1
 	startbattle
 	returnafterbattle
-	loadvar GavenFightCount, 2
+	loadvar wGavenFightCount, 2
 	clearflag ENGINE_GAVEN
 	end
 
@@ -216,7 +216,7 @@ UnknownScript_0x1a4e21:
 UnknownScript_0x1a4e35:
 	scall UnknownScript_0x1a4e93
 	winlosstext CooltrainerfBeth1BeatenText, $0000
-	copybytetovar BethFightCount
+	copybytetovar wBethFightCount
 	if_equal 2, .Fight2
 	if_equal 1, .Fight1
 	if_equal 0, .LoadFight0
@@ -230,7 +230,7 @@ UnknownScript_0x1a4e35:
 	loadtrainer COOLTRAINERF, BETH1
 	startbattle
 	returnafterbattle
-	loadvar BethFightCount, 1
+	loadvar wBethFightCount, 1
 	clearflag ENGINE_BETH
 	end
 
@@ -238,7 +238,7 @@ UnknownScript_0x1a4e35:
 	loadtrainer COOLTRAINERF, BETH2
 	startbattle
 	returnafterbattle
-	loadvar BethFightCount, 2
+	loadvar wBethFightCount, 2
 	clearflag ENGINE_BETH
 	end
 
diff --git a/maps/Route27.asm b/maps/Route27.asm
index f9e87f330..7969b906e 100644
--- a/maps/Route27.asm
+++ b/maps/Route27.asm
@@ -116,7 +116,7 @@ UnknownScript_0x1a08eb:
 UnknownScript_0x1a08ff:
 	scall UnknownScript_0x1a096f
 	winlosstext Bird_keeperJose2BeatenText, $0000
-	copybytetovar JoseFightCount
+	copybytetovar wJoseFightCount
 	if_equal 2, .Fight2
 	if_equal 1, .Fight1
 	if_equal 0, .LoadFight0
@@ -130,7 +130,7 @@ UnknownScript_0x1a08ff:
 	loadtrainer BIRD_KEEPER, JOSE2
 	startbattle
 	returnafterbattle
-	loadvar JoseFightCount, 1
+	loadvar wJoseFightCount, 1
 	clearflag ENGINE_JOSE
 	end
 
@@ -138,7 +138,7 @@ UnknownScript_0x1a08ff:
 	loadtrainer BIRD_KEEPER, JOSE1
 	startbattle
 	returnafterbattle
-	loadvar JoseFightCount, 2
+	loadvar wJoseFightCount, 2
 	clearflag ENGINE_JOSE
 	end
 
@@ -297,7 +297,7 @@ UnknownScript_0x1a09d5:
 UnknownScript_0x1a09e9:
 	scall UnknownScript_0x1a0a47
 	winlosstext CooltrainerfReena1BeatenText, $0000
-	copybytetovar ReenaFightCount
+	copybytetovar wReenaFightCount
 	if_equal 2, .Fight2
 	if_equal 1, .Fight1
 	if_equal 0, .LoadFight0
@@ -311,7 +311,7 @@ UnknownScript_0x1a09e9:
 	loadtrainer COOLTRAINERF, REENA1
 	startbattle
 	returnafterbattle
-	loadvar ReenaFightCount, 1
+	loadvar wReenaFightCount, 1
 	clearflag ENGINE_REENA
 	end
 
@@ -319,7 +319,7 @@ UnknownScript_0x1a09e9:
 	loadtrainer COOLTRAINERF, REENA2
 	startbattle
 	returnafterbattle
-	loadvar ReenaFightCount, 2
+	loadvar wReenaFightCount, 2
 	clearflag ENGINE_REENA
 	end
 
diff --git a/maps/Route30.asm b/maps/Route30.asm
index 58a530916..2283688c9 100644
--- a/maps/Route30.asm
+++ b/maps/Route30.asm
@@ -73,7 +73,7 @@ UnknownScript_0x1a16cc:
 UnknownScript_0x1a16e0:
 	scall UnknownScript_0x1a179b
 	winlosstext YoungsterJoey1BeatenText, $0000
-	copybytetovar JoeyFightCount
+	copybytetovar wJoeyFightCount
 	if_equal 4, .Fight4
 	if_equal 3, .Fight3
 	if_equal 2, .Fight2
@@ -95,7 +95,7 @@ UnknownScript_0x1a16e0:
 	loadtrainer YOUNGSTER, JOEY1
 	startbattle
 	returnafterbattle
-	loadvar JoeyFightCount, 1
+	loadvar wJoeyFightCount, 1
 	clearflag ENGINE_JOEY
 	end
 
@@ -103,7 +103,7 @@ UnknownScript_0x1a16e0:
 	loadtrainer YOUNGSTER, JOEY2
 	startbattle
 	returnafterbattle
-	loadvar JoeyFightCount, 2
+	loadvar wJoeyFightCount, 2
 	clearflag ENGINE_JOEY
 	end
 
@@ -111,7 +111,7 @@ UnknownScript_0x1a16e0:
 	loadtrainer YOUNGSTER, JOEY3
 	startbattle
 	returnafterbattle
-	loadvar JoeyFightCount, 3
+	loadvar wJoeyFightCount, 3
 	clearflag ENGINE_JOEY
 	end
 
@@ -119,7 +119,7 @@ UnknownScript_0x1a16e0:
 	loadtrainer YOUNGSTER, JOEY4
 	startbattle
 	returnafterbattle
-	loadvar JoeyFightCount, 4
+	loadvar wJoeyFightCount, 4
 	clearflag ENGINE_JOEY
 	end
 
diff --git a/maps/Route31.asm b/maps/Route31.asm
index da91e4a56..266bf8ac7 100644
--- a/maps/Route31.asm
+++ b/maps/Route31.asm
@@ -68,7 +68,7 @@ UnknownScript_0x1a547f:
 UnknownScript_0x1a5493:
 	scall UnknownScript_0x1a5564
 	winlosstext Bug_catcherWade1BeatenText, $0000
-	copybytetovar WadeFightCount
+	copybytetovar wWadeFightCount
 	if_equal 4, .Fight4
 	if_equal 3, .Fight3
 	if_equal 2, .Fight2
@@ -90,7 +90,7 @@ UnknownScript_0x1a5493:
 	loadtrainer BUG_CATCHER, WADE1
 	startbattle
 	returnafterbattle
-	loadvar WadeFightCount, 1
+	loadvar wWadeFightCount, 1
 	clearflag ENGINE_WADE
 	end
 
@@ -98,7 +98,7 @@ UnknownScript_0x1a5493:
 	loadtrainer BUG_CATCHER, WADE2
 	startbattle
 	returnafterbattle
-	loadvar WadeFightCount, 2
+	loadvar wWadeFightCount, 2
 	clearflag ENGINE_WADE
 	end
 
@@ -106,7 +106,7 @@ UnknownScript_0x1a5493:
 	loadtrainer BUG_CATCHER, WADE3
 	startbattle
 	returnafterbattle
-	loadvar WadeFightCount, 3
+	loadvar wWadeFightCount, 3
 	clearflag ENGINE_WADE
 	end
 
@@ -114,7 +114,7 @@ UnknownScript_0x1a5493:
 	loadtrainer BUG_CATCHER, WADE4
 	startbattle
 	returnafterbattle
-	loadvar WadeFightCount, 4
+	loadvar wWadeFightCount, 4
 	clearflag ENGINE_WADE
 	end
 
diff --git a/maps/Route32.asm b/maps/Route32.asm
index c85f6f234..fe53dac19 100644
--- a/maps/Route32.asm
+++ b/maps/Route32.asm
@@ -236,7 +236,7 @@ UnknownScript_0x190569:
 UnknownScript_0x19057d:
 	scall UnknownScript_0x19060f
 	winlosstext FisherRalph1BeatenText, $0000
-	copybytetovar RalphFightCount
+	copybytetovar wRalphFightCount
 	if_equal 4, .Fight4
 	if_equal 3, .Fight3
 	if_equal 2, .Fight2
@@ -258,7 +258,7 @@ UnknownScript_0x19057d:
 	loadtrainer FISHER, RALPH1
 	startbattle
 	returnafterbattle
-	loadvar RalphFightCount, 1
+	loadvar wRalphFightCount, 1
 	clearflag ENGINE_RALPH
 	end
 
@@ -266,7 +266,7 @@ UnknownScript_0x19057d:
 	loadtrainer FISHER, RALPH2
 	startbattle
 	returnafterbattle
-	loadvar RalphFightCount, 2
+	loadvar wRalphFightCount, 2
 	clearflag ENGINE_RALPH
 	end
 
@@ -274,7 +274,7 @@ UnknownScript_0x19057d:
 	loadtrainer FISHER, RALPH3
 	startbattle
 	returnafterbattle
-	loadvar RalphFightCount, 3
+	loadvar wRalphFightCount, 3
 	clearflag ENGINE_RALPH
 	end
 
@@ -282,7 +282,7 @@ UnknownScript_0x19057d:
 	loadtrainer FISHER, RALPH4
 	startbattle
 	returnafterbattle
-	loadvar RalphFightCount, 4
+	loadvar wRalphFightCount, 4
 	clearflag ENGINE_RALPH
 	end
 
@@ -402,7 +402,7 @@ UnknownScript_0x190659:
 UnknownScript_0x19066d:
 	scall UnknownScript_0x1906f9
 	winlosstext PicnickerLiz1BeatenText, $0000
-	copybytetovar LizFightCount
+	copybytetovar wLizFightCount
 	if_equal 4, .Fight4
 	if_equal 3, .Fight3
 	if_equal 2, .Fight2
@@ -424,7 +424,7 @@ UnknownScript_0x19066d:
 	loadtrainer PICNICKER, LIZ1
 	startbattle
 	returnafterbattle
-	loadvar LizFightCount, 1
+	loadvar wLizFightCount, 1
 	clearflag ENGINE_LIZ
 	end
 
@@ -432,7 +432,7 @@ UnknownScript_0x19066d:
 	loadtrainer PICNICKER, LIZ2
 	startbattle
 	returnafterbattle
-	loadvar LizFightCount, 2
+	loadvar wLizFightCount, 2
 	clearflag ENGINE_LIZ
 	end
 
@@ -440,7 +440,7 @@ UnknownScript_0x19066d:
 	loadtrainer PICNICKER, LIZ3
 	startbattle
 	returnafterbattle
-	loadvar LizFightCount, 3
+	loadvar wLizFightCount, 3
 	clearflag ENGINE_LIZ
 	end
 
@@ -448,7 +448,7 @@ UnknownScript_0x19066d:
 	loadtrainer PICNICKER, LIZ4
 	startbattle
 	returnafterbattle
-	loadvar LizFightCount, 4
+	loadvar wLizFightCount, 4
 	clearflag ENGINE_LIZ
 	end
 
diff --git a/maps/Route33.asm b/maps/Route33.asm
index 3f4d8700a..fc4cf9586 100644
--- a/maps/Route33.asm
+++ b/maps/Route33.asm
@@ -58,7 +58,7 @@ UnknownScript_0x1ac03d:
 UnknownScript_0x1ac051:
 	scall UnknownScript_0x1ac0e3
 	winlosstext HikerAnthony2BeatenText, $0000
-	copybytetovar AnthonyFightCount
+	copybytetovar wAnthonyFightCount
 	if_equal 4, .Fight4
 	if_equal 3, .Fight3
 	if_equal 2, .Fight2
@@ -80,7 +80,7 @@ UnknownScript_0x1ac051:
 	loadtrainer HIKER, ANTHONY2
 	startbattle
 	returnafterbattle
-	loadvar AnthonyFightCount, 1
+	loadvar wAnthonyFightCount, 1
 	clearflag ENGINE_ANTHONY
 	end
 
@@ -88,7 +88,7 @@ UnknownScript_0x1ac051:
 	loadtrainer HIKER, ANTHONY1
 	startbattle
 	returnafterbattle
-	loadvar AnthonyFightCount, 2
+	loadvar wAnthonyFightCount, 2
 	clearflag ENGINE_ANTHONY
 	end
 
@@ -96,7 +96,7 @@ UnknownScript_0x1ac051:
 	loadtrainer HIKER, ANTHONY3
 	startbattle
 	returnafterbattle
-	loadvar AnthonyFightCount, 3
+	loadvar wAnthonyFightCount, 3
 	clearflag ENGINE_ANTHONY
 	end
 
@@ -104,7 +104,7 @@ UnknownScript_0x1ac051:
 	loadtrainer HIKER, ANTHONY4
 	startbattle
 	returnafterbattle
-	loadvar AnthonyFightCount, 4
+	loadvar wAnthonyFightCount, 4
 	clearflag ENGINE_ANTHONY
 	end
 
diff --git a/maps/Route34.asm b/maps/Route34.asm
index 10732dd6a..58871957f 100644
--- a/maps/Route34.asm
+++ b/maps/Route34.asm
@@ -125,7 +125,7 @@ UnknownScript_0x780a9:
 UnknownScript_0x780bd:
 	scall UnknownScript_0x7814f
 	winlosstext CamperTodd1BeatenText, $0000
-	copybytetovar ToddFightCount
+	copybytetovar wToddFightCount
 	if_equal 4, .Fight4
 	if_equal 3, .Fight3
 	if_equal 2, .Fight2
@@ -147,7 +147,7 @@ UnknownScript_0x780bd:
 	loadtrainer CAMPER, TODD1
 	startbattle
 	returnafterbattle
-	loadvar ToddFightCount, 1
+	loadvar wToddFightCount, 1
 	clearflag ENGINE_TODD
 	end
 
@@ -155,7 +155,7 @@ UnknownScript_0x780bd:
 	loadtrainer CAMPER, TODD2
 	startbattle
 	returnafterbattle
-	loadvar ToddFightCount, 2
+	loadvar wToddFightCount, 2
 	clearflag ENGINE_TODD
 	end
 
@@ -163,7 +163,7 @@ UnknownScript_0x780bd:
 	loadtrainer CAMPER, TODD3
 	startbattle
 	returnafterbattle
-	loadvar ToddFightCount, 3
+	loadvar wToddFightCount, 3
 	clearflag ENGINE_TODD
 	end
 
@@ -171,7 +171,7 @@ UnknownScript_0x780bd:
 	loadtrainer CAMPER, TODD4
 	startbattle
 	returnafterbattle
-	loadvar ToddFightCount, 4
+	loadvar wToddFightCount, 4
 	clearflag ENGINE_TODD
 	end
 
@@ -266,7 +266,7 @@ UnknownScript_0x7818b:
 UnknownScript_0x7819f:
 	scall UnknownScript_0x78240
 	winlosstext PicnickerGina1BeatenText, $0000
-	copybytetovar GinaFightCount
+	copybytetovar wGinaFightCount
 	if_equal 4, .Fight4
 	if_equal 3, .Fight3
 	if_equal 2, .Fight2
@@ -288,7 +288,7 @@ UnknownScript_0x7819f:
 	loadtrainer PICNICKER, GINA1
 	startbattle
 	returnafterbattle
-	loadvar GinaFightCount, 1
+	loadvar wGinaFightCount, 1
 	clearflag ENGINE_GINA
 	end
 
@@ -296,7 +296,7 @@ UnknownScript_0x7819f:
 	loadtrainer PICNICKER, GINA2
 	startbattle
 	returnafterbattle
-	loadvar GinaFightCount, 2
+	loadvar wGinaFightCount, 2
 	clearflag ENGINE_GINA
 	end
 
@@ -304,7 +304,7 @@ UnknownScript_0x7819f:
 	loadtrainer PICNICKER, GINA3
 	startbattle
 	returnafterbattle
-	loadvar GinaFightCount, 3
+	loadvar wGinaFightCount, 3
 	clearflag ENGINE_GINA
 	end
 
@@ -312,7 +312,7 @@ UnknownScript_0x7819f:
 	loadtrainer PICNICKER, GINA4
 	startbattle
 	returnafterbattle
-	loadvar GinaFightCount, 4
+	loadvar wGinaFightCount, 4
 	clearflag ENGINE_GINA
 	end
 
diff --git a/maps/Route35.asm b/maps/Route35.asm
index c29e3148b..1f5b6143d 100644
--- a/maps/Route35.asm
+++ b/maps/Route35.asm
@@ -261,7 +261,7 @@ UnknownScript_0x19c9a7:
 UnknownScript_0x19c9bb:
 	scall UnknownScript_0x19c91b
 	winlosstext Bug_catcherArnie1BeatenText, $0000
-	copybytetovar ArnieFightCount
+	copybytetovar wArnieFightCount
 	if_equal 4, .Fight4
 	if_equal 3, .Fight3
 	if_equal 2, .Fight2
@@ -283,7 +283,7 @@ UnknownScript_0x19c9bb:
 	loadtrainer BUG_CATCHER, ARNIE1
 	startbattle
 	returnafterbattle
-	loadvar ArnieFightCount, 1
+	loadvar wArnieFightCount, 1
 	clearflag ENGINE_ARNIE
 	end
 
@@ -291,7 +291,7 @@ UnknownScript_0x19c9bb:
 	loadtrainer BUG_CATCHER, ARNIE2
 	startbattle
 	returnafterbattle
-	loadvar ArnieFightCount, 2
+	loadvar wArnieFightCount, 2
 	clearflag ENGINE_ARNIE
 	end
 
@@ -299,7 +299,7 @@ UnknownScript_0x19c9bb:
 	loadtrainer BUG_CATCHER, ARNIE3
 	startbattle
 	returnafterbattle
-	loadvar ArnieFightCount, 3
+	loadvar wArnieFightCount, 3
 	clearflag ENGINE_ARNIE
 	end
 
@@ -307,7 +307,7 @@ UnknownScript_0x19c9bb:
 	loadtrainer BUG_CATCHER, ARNIE4
 	startbattle
 	returnafterbattle
-	loadvar ArnieFightCount, 4
+	loadvar wArnieFightCount, 4
 	clearflag ENGINE_ARNIE
 	end
 
diff --git a/maps/Route36.asm b/maps/Route36.asm
index e95331833..ca8dfbb7d 100644
--- a/maps/Route36.asm
+++ b/maps/Route36.asm
@@ -211,7 +211,7 @@ UnknownScript_0x19412c:
 UnknownScript_0x194140:
 	scall UnknownScript_0x1941e1
 	winlosstext SchoolboyAlan1BeatenText, $0000
-	copybytetovar AlanFightCount
+	copybytetovar wAlanFightCount
 	if_equal 4, .Fight4
 	if_equal 3, .Fight3
 	if_equal 2, .Fight2
@@ -233,7 +233,7 @@ UnknownScript_0x194140:
 	loadtrainer SCHOOLBOY, ALAN1
 	startbattle
 	returnafterbattle
-	loadvar AlanFightCount, 1
+	loadvar wAlanFightCount, 1
 	clearflag ENGINE_ALAN
 	end
 
@@ -241,7 +241,7 @@ UnknownScript_0x194140:
 	loadtrainer SCHOOLBOY, ALAN2
 	startbattle
 	returnafterbattle
-	loadvar AlanFightCount, 2
+	loadvar wAlanFightCount, 2
 	clearflag ENGINE_ALAN
 	end
 
@@ -249,7 +249,7 @@ UnknownScript_0x194140:
 	loadtrainer SCHOOLBOY, ALAN3
 	startbattle
 	returnafterbattle
-	loadvar AlanFightCount, 3
+	loadvar wAlanFightCount, 3
 	clearflag ENGINE_ALAN
 	end
 
@@ -257,7 +257,7 @@ UnknownScript_0x194140:
 	loadtrainer SCHOOLBOY, ALAN4
 	startbattle
 	returnafterbattle
-	loadvar AlanFightCount, 4
+	loadvar wAlanFightCount, 4
 	clearflag ENGINE_ALAN
 	end
 
diff --git a/maps/Route38.asm b/maps/Route38.asm
index 5d7b1229f..694c0cb7d 100644
--- a/maps/Route38.asm
+++ b/maps/Route38.asm
@@ -109,7 +109,7 @@ UnknownScript_0x1a1d6e:
 UnknownScript_0x1a1d82:
 	scall UnknownScript_0x1a1e23
 	winlosstext LassDana1BeatenText, $0000
-	copybytetovar DanaFightCount
+	copybytetovar wDanaFightCount
 	if_equal 4, .Fight4
 	if_equal 3, .Fight3
 	if_equal 2, .Fight2
@@ -131,7 +131,7 @@ UnknownScript_0x1a1d82:
 	loadtrainer LASS, DANA1
 	startbattle
 	returnafterbattle
-	loadvar DanaFightCount, 1
+	loadvar wDanaFightCount, 1
 	clearflag ENGINE_DANA
 	end
 
@@ -139,7 +139,7 @@ UnknownScript_0x1a1d82:
 	loadtrainer LASS, DANA2
 	startbattle
 	returnafterbattle
-	loadvar DanaFightCount, 2
+	loadvar wDanaFightCount, 2
 	clearflag ENGINE_DANA
 	end
 
@@ -147,7 +147,7 @@ UnknownScript_0x1a1d82:
 	loadtrainer LASS, DANA3
 	startbattle
 	returnafterbattle
-	loadvar DanaFightCount, 3
+	loadvar wDanaFightCount, 3
 	clearflag ENGINE_DANA
 	end
 
@@ -155,7 +155,7 @@ UnknownScript_0x1a1d82:
 	loadtrainer LASS, DANA4
 	startbattle
 	returnafterbattle
-	loadvar DanaFightCount, 4
+	loadvar wDanaFightCount, 4
 	clearflag ENGINE_DANA
 	end
 
@@ -261,7 +261,7 @@ UnknownScript_0x1a1e61:
 UnknownScript_0x1a1e75:
 	scall UnknownScript_0x1a1f01
 	winlosstext SchoolboyChad1BeatenText, $0000
-	copybytetovar ChadFightCount
+	copybytetovar wChadFightCount
 	if_equal 4, .Fight4
 	if_equal 3, .Fight3
 	if_equal 2, .Fight2
@@ -283,7 +283,7 @@ UnknownScript_0x1a1e75:
 	loadtrainer SCHOOLBOY, CHAD1
 	startbattle
 	returnafterbattle
-	loadvar ChadFightCount, 1
+	loadvar wChadFightCount, 1
 	clearflag ENGINE_CHAD
 	end
 
@@ -291,7 +291,7 @@ UnknownScript_0x1a1e75:
 	loadtrainer SCHOOLBOY, CHAD2
 	startbattle
 	returnafterbattle
-	loadvar ChadFightCount, 2
+	loadvar wChadFightCount, 2
 	clearflag ENGINE_CHAD
 	end
 
@@ -299,7 +299,7 @@ UnknownScript_0x1a1e75:
 	loadtrainer SCHOOLBOY, CHAD3
 	startbattle
 	returnafterbattle
-	loadvar ChadFightCount, 3
+	loadvar wChadFightCount, 3
 	clearflag ENGINE_CHAD
 	end
 
@@ -307,7 +307,7 @@ UnknownScript_0x1a1e75:
 	loadtrainer SCHOOLBOY, CHAD4
 	startbattle
 	returnafterbattle
-	loadvar ChadFightCount, 4
+	loadvar wChadFightCount, 4
 	clearflag ENGINE_CHAD
 	end
 
diff --git a/maps/Route42.asm b/maps/Route42.asm
index fd0d79198..2f56ecf7d 100644
--- a/maps/Route42.asm
+++ b/maps/Route42.asm
@@ -77,7 +77,7 @@ UnknownScript_0x1a926b:
 UnknownScript_0x1a927f:
 	scall UnknownScript_0x1a9309
 	winlosstext FisherTully1BeatenText, $0000
-	copybytetovar TullyFightCount
+	copybytetovar wTullyFightCount
 	if_equal 3, .Fight3
 	if_equal 2, .Fight2
 	if_equal 1, .Fight1
@@ -95,7 +95,7 @@ UnknownScript_0x1a927f:
 	loadtrainer FISHER, TULLY1
 	startbattle
 	returnafterbattle
-	loadvar TullyFightCount, 1
+	loadvar wTullyFightCount, 1
 	clearflag ENGINE_TULLY
 	end
 
@@ -103,7 +103,7 @@ UnknownScript_0x1a927f:
 	loadtrainer FISHER, TULLY2
 	startbattle
 	returnafterbattle
-	loadvar TullyFightCount, 2
+	loadvar wTullyFightCount, 2
 	clearflag ENGINE_TULLY
 	end
 
@@ -111,7 +111,7 @@ UnknownScript_0x1a927f:
 	loadtrainer FISHER, TULLY3
 	startbattle
 	returnafterbattle
-	loadvar TullyFightCount, 3
+	loadvar wTullyFightCount, 3
 	clearflag ENGINE_TULLY
 	end
 
diff --git a/maps/Route43.asm b/maps/Route43.asm
index 1a1fe8f3b..264ac1a22 100644
--- a/maps/Route43.asm
+++ b/maps/Route43.asm
@@ -121,7 +121,7 @@ UnknownScript_0x19d0bb:
 UnknownScript_0x19d0cf:
 	scall UnknownScript_0x19d144
 	winlosstext PokemaniacBrent1BeatenText, $0000
-	copybytetovar BrentFightCount
+	copybytetovar wBrentFightCount
 	if_equal 3, .Fight3
 	if_equal 2, .Fight2
 	if_equal 1, .Fight1
@@ -139,7 +139,7 @@ UnknownScript_0x19d0cf:
 	loadtrainer POKEMANIAC, BRENT1
 	startbattle
 	returnafterbattle
-	loadvar BrentFightCount, 1
+	loadvar wBrentFightCount, 1
 	clearflag ENGINE_BRENT
 	end
 
@@ -147,7 +147,7 @@ UnknownScript_0x19d0cf:
 	loadtrainer POKEMANIAC, BRENT2
 	startbattle
 	returnafterbattle
-	loadvar BrentFightCount, 2
+	loadvar wBrentFightCount, 2
 	clearflag ENGINE_BRENT
 	end
 
@@ -155,7 +155,7 @@ UnknownScript_0x19d0cf:
 	loadtrainer POKEMANIAC, BRENT3
 	startbattle
 	returnafterbattle
-	loadvar BrentFightCount, 3
+	loadvar wBrentFightCount, 3
 	clearflag ENGINE_BRENT
 	end
 
@@ -300,7 +300,7 @@ UnknownScript_0x19d1ad:
 UnknownScript_0x19d1c1:
 	scall UnknownScript_0x19d251
 	winlosstext PicnickerTiffany3BeatenText, $0000
-	copybytetovar TiffanyFightCount
+	copybytetovar wTiffanyFightCount
 	if_equal 3, .Fight3
 	if_equal 2, .Fight2
 	if_equal 1, .Fight1
@@ -318,7 +318,7 @@ UnknownScript_0x19d1c1:
 	loadtrainer PICNICKER, TIFFANY3
 	startbattle
 	returnafterbattle
-	loadvar TiffanyFightCount, 1
+	loadvar wTiffanyFightCount, 1
 	clearflag ENGINE_TIFFANY
 	end
 
@@ -326,7 +326,7 @@ UnknownScript_0x19d1c1:
 	loadtrainer PICNICKER, TIFFANY1
 	startbattle
 	returnafterbattle
-	loadvar TiffanyFightCount, 2
+	loadvar wTiffanyFightCount, 2
 	clearflag ENGINE_TIFFANY
 	end
 
@@ -334,7 +334,7 @@ UnknownScript_0x19d1c1:
 	loadtrainer PICNICKER, TIFFANY2
 	startbattle
 	returnafterbattle
-	loadvar TiffanyFightCount, 3
+	loadvar wTiffanyFightCount, 3
 	clearflag ENGINE_TIFFANY
 	end
 
diff --git a/maps/Route44.asm b/maps/Route44.asm
index 5394740a0..9d64736e4 100644
--- a/maps/Route44.asm
+++ b/maps/Route44.asm
@@ -53,7 +53,7 @@ UnknownScript_0x19d856:
 UnknownScript_0x19d86a:
 	scall UnknownScript_0x19d8f7
 	winlosstext Bird_keeperVance1BeatenText, $0000
-	copybytetovar VanceFightCount
+	copybytetovar wVanceFightCount
 	if_equal 2, .Fight2
 	if_equal 1, .Fight1
 	if_equal 0, .LoadFight0
@@ -67,7 +67,7 @@ UnknownScript_0x19d86a:
 	loadtrainer BIRD_KEEPER, VANCE1
 	startbattle
 	returnafterbattle
-	loadvar VanceFightCount, 1
+	loadvar wVanceFightCount, 1
 	clearflag ENGINE_VANCE
 	end
 
@@ -75,7 +75,7 @@ UnknownScript_0x19d86a:
 	loadtrainer BIRD_KEEPER, VANCE2
 	startbattle
 	returnafterbattle
-	loadvar VanceFightCount, 2
+	loadvar wVanceFightCount, 2
 	clearflag ENGINE_VANCE
 	end
 
@@ -229,7 +229,7 @@ UnknownScript_0x19d95a:
 UnknownScript_0x19d96e:
 	scall UnknownScript_0x19d8f7
 	winlosstext FisherWilton1BeatenText, $0000
-	copybytetovar WiltonFightCount
+	copybytetovar wWiltonFightCount
 	if_equal 2, .Fight2
 	if_equal 1, .Fight1
 	if_equal 0, .LoadFight0
@@ -243,7 +243,7 @@ UnknownScript_0x19d96e:
 	loadtrainer FISHER, WILTON1
 	startbattle
 	returnafterbattle
-	loadvar WiltonFightCount, 1
+	loadvar wWiltonFightCount, 1
 	clearflag ENGINE_WILTON
 	end
 
@@ -251,7 +251,7 @@ UnknownScript_0x19d96e:
 	loadtrainer FISHER, WILTON2
 	startbattle
 	returnafterbattle
-	loadvar WiltonFightCount, 2
+	loadvar wWiltonFightCount, 2
 	clearflag ENGINE_WILTON
 	end
 
diff --git a/maps/Route45.asm b/maps/Route45.asm
index 40aecd320..f16cecd45 100644
--- a/maps/Route45.asm
+++ b/maps/Route45.asm
@@ -227,7 +227,7 @@ UnknownScript_0x19e1a4:
 UnknownScript_0x19e1b8:
 	scall UnknownScript_0x19e133
 	winlosstext HikerParry3BeatenText, $0000
-	copybytetovar ParryFightCount
+	copybytetovar wParryFightCount
 	if_equal 2, .Fight2
 	if_equal 1, .Fight1
 	if_equal 0, .LoadFight0
@@ -241,7 +241,7 @@ UnknownScript_0x19e1b8:
 	loadtrainer HIKER, PARRY3
 	startbattle
 	returnafterbattle
-	loadvar ParryFightCount, 1
+	loadvar wParryFightCount, 1
 	clearflag ENGINE_PARRY
 	end
 
@@ -249,7 +249,7 @@ UnknownScript_0x19e1b8:
 	loadtrainer HIKER, PARRY1
 	startbattle
 	returnafterbattle
-	loadvar ParryFightCount, 2
+	loadvar wParryFightCount, 2
 	clearflag ENGINE_PARRY
 	end
 
diff --git a/maps/Route46.asm b/maps/Route46.asm
index 6fe802683..1074b41d3 100644
--- a/maps/Route46.asm
+++ b/maps/Route46.asm
@@ -80,7 +80,7 @@ UnknownScript_0x1a96c6:
 UnknownScript_0x1a96da:
 	scall UnknownScript_0x1a9767
 	winlosstext PicnickerErin1BeatenText, $0000
-	copybytetovar ErinFightCount
+	copybytetovar wErinFightCount
 	if_equal 2, .Fight2
 	if_equal 1, .Fight1
 	if_equal 0, .LoadFight0
@@ -94,7 +94,7 @@ UnknownScript_0x1a96da:
 	loadtrainer PICNICKER, ERIN1
 	startbattle
 	returnafterbattle
-	loadvar ErinFightCount, 1
+	loadvar wErinFightCount, 1
 	clearflag ENGINE_ERIN
 	end
 
@@ -102,7 +102,7 @@ UnknownScript_0x1a96da:
 	loadtrainer PICNICKER, ERIN2
 	startbattle
 	returnafterbattle
-	loadvar ErinFightCount, 2
+	loadvar wErinFightCount, 2
 	clearflag ENGINE_ERIN
 	end
 
diff --git a/wram.asm b/wram.asm
index 4495ef9db..45e3a6c7a 100644
--- a/wram.asm
+++ b/wram.asm
@@ -2216,36 +2216,36 @@ wMobileBattleRoomTrigger::                   ds 1 ; d9c0
 
 SECTION "Events", WRAMX, BANK [1]
 
-JackFightCount::    ds 1
-                    ds 1
-HueyFightCount::    ds 1
-GavenFightCount::   ds 1
-BethFightCount::    ds 1
-JoseFightCount::    ds 1
-ReenaFightCount::   ds 1
-JoeyFightCount::    ds 1
-WadeFightCount::    ds 1
-RalphFightCount::   ds 1
-LizFightCount::     ds 1
-AnthonyFightCount:: ds 1
-ToddFightCount::    ds 1
-GinaFightCount::    ds 1
+wJackFightCount::    ds 1
+                     ds 1
+wHueyFightCount::    ds 1
+wGavenFightCount::   ds 1
+wBethFightCount::    ds 1
+wJoseFightCount::    ds 1
+wReenaFightCount::   ds 1
+wJoeyFightCount::    ds 1
+wWadeFightCount::    ds 1
+wRalphFightCount::   ds 1
+wLizFightCount::     ds 1
+wAnthonyFightCount:: ds 1
+wToddFightCount::    ds 1
+wGinaFightCount::    ds 1
 
 wda00:: ds 1
 
-ArnieFightCount::   ds 1
-AlanFightCount::    ds 1
-DanaFightCount::    ds 1
-ChadFightCount::    ds 1
-	            ds 1
-TullyFightCount::   ds 1
-BrentFightCount::   ds 1
-TiffanyFightCount:: ds 1
-VanceFightCount::   ds 1
-WiltonFightCount::  ds 1
-                    ds 1
-ParryFightCount::   ds 1
-ErinFightCount::    ds 1
+wArnieFightCount::   ds 1
+wAlanFightCount::    ds 1
+wDanaFightCount::    ds 1
+wChadFightCount::    ds 1
+                     ds 1
+wTullyFightCount::   ds 1
+wBrentFightCount::   ds 1
+wTiffanyFightCount:: ds 1
+wVanceFightCount::   ds 1
+wWiltonFightCount::  ds 1
+                     ds 1
+wParryFightCount::   ds 1
+wErinFightCount::    ds 1
 
 	ds 100