overworld item & movement code, cable club code, remove more instances of W_, add PIKAHAPPY_TRADE

Also make replace.sh take args

42 files changed, 126 insertions, 126 deletions

diff --git a/scripts/agatha.asm b/scripts/agatha.asm
index 1e34c99c..39db37d5 100755
--- a/scripts/agatha.asm
+++ b/scripts/agatha.asm
@@ -105,7 +105,7 @@ AgathaScript3: ; 764da (1d:64da)
 
 AgathaScript2: ; 764ed (1d:64ed)
 	call EndTrainerBattle
-	ld a, [W_ISINBATTLE]
+	ld a, [wIsInBattle]
 	cp $ff
 	jp z, AgathaScript_76464
 	ld a, $1
diff --git a/scripts/bruno.asm b/scripts/bruno.asm
index bdfd7e24..5318ecba 100755
--- a/scripts/bruno.asm
+++ b/scripts/bruno.asm
@@ -105,7 +105,7 @@ BrunoScript3: ; 76383 (1d:6383)
 
 BrunoScript2: ; 76396 (1d:6396)
 	call EndTrainerBattle
-	ld a, [W_ISINBATTLE]
+	ld a, [wIsInBattle]
 	cp $ff
 	jp z, BrunoScript_7630d
 	ld a, $1
diff --git a/scripts/celadongamecorner.asm b/scripts/celadongamecorner.asm
index 787a2f3d..c3872bab 100755
--- a/scripts/celadongamecorner.asm
+++ b/scripts/celadongamecorner.asm
@@ -51,7 +51,7 @@ CeladonGameCornerScript0: ; 48c18 (12:4c18)
 	ret
 
 CeladonGameCornerScript1: ; 48c19 (12:4c19)
-	ld a, [W_ISINBATTLE]
+	ld a, [wIsInBattle]
 	cp $ff
 	jp z, CeladonGameCornerScript_48c07
 	ld a, $f0
@@ -63,13 +63,13 @@ CeladonGameCornerScript1: ; 48c19 (12:4c19)
 	ld [H_SPRITEINDEX], a
 	call SetSpriteMovementBytesToFF
 	ld de, MovementData_48c5a
-	ld a, [W_YCOORD]
+	ld a, [wYCoord]
 	cp $6
 	jr nz, .asm_48c43
 	ld de, MovementData_48c63
 	jr .asm_48c4d
 .asm_48c43
-	ld a, [W_XCOORD]
+	ld a, [wXCoord]
 	cp $8
 	jr nz, .asm_48c4d
 	ld de, MovementData_48c63
diff --git a/scripts/celadongym.asm b/scripts/celadongym.asm
index 459ba4b5..6588b25e 100755
--- a/scripts/celadongym.asm
+++ b/scripts/celadongym.asm
@@ -36,7 +36,7 @@ CeladonGymScriptPointers: ; 4894e (12:494e)
 	dw CeladonGymScript3
 
 CeladonGymScript3: ; 48956 (12:4956)
-	ld a, [W_ISINBATTLE]
+	ld a, [wIsInBattle]
 	cp $ff
 	jp z, CeladonGymText_48943
 	ld a, $f0
@@ -176,7 +176,7 @@ CeladonGymText1: ; 48a11 (12:4a11)
 	call EngageMapTrainer
 	call InitBattleEnemyParameters
 	ld a, $4
-	ld [W_GYMLEADERNO], a
+	ld [wGymLeaderNo], a
 	ld a, $3
 	ld [W_CELADONGYMCURSCRIPT], a
 	ld [W_CURMAPSCRIPT], a
diff --git a/scripts/ceruleancity.asm b/scripts/ceruleancity.asm
index e0444a1c..58c67e9d 100755
--- a/scripts/ceruleancity.asm
+++ b/scripts/ceruleancity.asm
@@ -20,7 +20,7 @@ CeruleanCityScriptPointers: ; 1949d (6:549d)
 	dw CeruleanCityScript4
 
 CeruleanCityScript4: ; 194a7 (6:54a7)
-	ld a, [W_ISINBATTLE]
+	ld a, [wIsInBattle]
 	cp $ff
 	jp z, CeruleanCityScript_1948c
 	ld a, $f0
@@ -75,7 +75,7 @@ CeruleanCityScript0: ; 194c8 (6:54c8)
 	ld [hJoyHeld], a
 	ld a, $f0
 	ld [wJoyIgnore], a
-	ld a, [W_XCOORD]
+	ld a, [wXCoord]
 	cp $14
 	jr z, .asm_19535
 	ld a, $1
@@ -135,7 +135,7 @@ CeruleanCityScript1: ; 19567 (6:5567)
 	ld de, CeruleanCityText_19672
 	call SaveEndBattleTextPointers
 	ld a, OPP_SONY1
-	ld [W_CUROPPONENT], a
+	ld [wCurOpponent], a
 
 	; select which team to use during the encounter
 	ld a, [W_RIVALSTARTER]
@@ -161,7 +161,7 @@ CeruleanCityScript1: ; 19567 (6:5567)
 	ret
 
 CeruleanCityScript2: ; 195b1 (6:55b1)
-	ld a, [W_ISINBATTLE]
+	ld a, [wIsInBattle]
 	cp $ff
 	jp z, CeruleanCityScript_1948c
 	call CeruleanCityScript_1955d
@@ -178,7 +178,7 @@ CeruleanCityScript2: ; 195b1 (6:55b1)
 	ld a, $1
 	ld [H_SPRITEINDEX], a
 	call SetSpriteMovementBytesToFF
-	ld a, [W_XCOORD]
+	ld a, [wXCoord]
 	cp $14
 	jr nz, .asm_195f0
 	ld de, CeruleanCityMovement4
diff --git a/scripts/ceruleangym.asm b/scripts/ceruleangym.asm
index 0507a1d4..fe0faea0 100755
--- a/scripts/ceruleangym.asm
+++ b/scripts/ceruleangym.asm
@@ -36,7 +36,7 @@ CeruleanGymScriptPointers: ; 5c6f8 (17:46f8)
 	dw CeruleanGymScript3
 
 CeruleanGymScript3: ; 5c700 (17:4700)
-	ld a, [W_ISINBATTLE]
+	ld a, [wIsInBattle]
 	cp $ff
 	jp z, CeruleanGymScript_5c6ed
 	ld a, $f0
@@ -127,7 +127,7 @@ CeruleanGymText1: ; 5c771 (17:4771)
 	call EngageMapTrainer
 	call InitBattleEnemyParameters
 	ld a, $2
-	ld [W_GYMLEADERNO], a
+	ld [wGymLeaderNo], a
 	xor a
 	ld [hJoyHeld], a
 	ld a, $3
diff --git a/scripts/cinnabargym.asm b/scripts/cinnabargym.asm
index 73aad423..649609b3 100755
--- a/scripts/cinnabargym.asm
+++ b/scripts/cinnabargym.asm
@@ -92,7 +92,7 @@ CinnabarGymFlagAction: ; 757f1 (1d:57f1)
 	predef_jump FlagActionPredef
 
 CinnabarGymScript2: ; 757f6 (1d:57f6)
-	ld a, [W_ISINBATTLE]
+	ld a, [wIsInBattle]
 	cp $ff
 	jp z, CinnabarGymScript_75792
 	ld a, [wTrainerHeaderFlagBit]
@@ -134,7 +134,7 @@ CinnabarGymScript2: ; 757f6 (1d:57f6)
 	ret
 
 CinnabarGymScript3: ; 7584a (1d:584a)
-	ld a, [W_ISINBATTLE]
+	ld a, [wIsInBattle]
 	cp $ff
 	jp z, CinnabarGymScript_75792
 	ld a, $f0
@@ -224,7 +224,7 @@ CinnabarGymText1: ; 758df (1d:58df)
 	ld de, BlaineEndBattleText
 	call SaveEndBattleTextPointers
 	ld a, $7
-	ld [W_GYMLEADERNO], a
+	ld [wGymLeaderNo], a
 	jp CinnabarGymScript_758b7
 
 BlaineBattleText: ; 75914 (1d:5914)
diff --git a/scripts/cinnabarisland.asm b/scripts/cinnabarisland.asm
index c06c784c..48ded740 100755
--- a/scripts/cinnabarisland.asm
+++ b/scripts/cinnabarisland.asm
@@ -16,10 +16,10 @@ CinnabarIslandScript0: ; 1ca38 (7:4a38)
 	ld b, SECRET_KEY
 	call IsItemInBag
 	ret nz
-	ld a, [W_YCOORD]
+	ld a, [wYCoord]
 	cp $4
 	ret nz
-	ld a, [W_XCOORD]
+	ld a, [wXCoord]
 	cp $12
 	ret nz
 	ld a, PLAYER_DIR_UP
diff --git a/scripts/daycarem.asm b/scripts/daycarem.asm
index 3eabb0bc..4a46e648 100755
--- a/scripts/daycarem.asm
+++ b/scripts/daycarem.asm
@@ -7,7 +7,7 @@ DayCareMTextPointers: ; 56252 (15:6252)
 DayCareMText1: ; 56254 (15:6254)
 	TX_ASM
 	call SaveScreenTilesToBuffer2
-	ld a, [W_DAYCARE_IN_USE]
+	ld a, [wDayCareInUse]
 	and a
 	jp nz, .daycareInUse
 	ld hl, DayCareIntroText
@@ -46,7 +46,7 @@ DayCareMText1: ; 56254 (15:6254)
 	ld hl, DayCareWillLookAfterMonText
 	call PrintText
 	ld a, 1
-	ld [W_DAYCARE_IN_USE], a
+	ld [wDayCareInUse], a
 	ld a, PARTY_TO_DAYCARE
 	ld [wMoveMonType], a
 	call MoveMon
@@ -60,7 +60,7 @@ DayCareMText1: ; 56254 (15:6254)
 
 .daycareInUse
 	xor a
-	ld hl, W_DAYCAREMONNAME
+	ld hl, wDayCareMonName
 	call GetPartyMonName
 	ld a, DAYCARE_DATA
 	ld [wMonDataLocation], a
@@ -150,7 +150,7 @@ DayCareMText1: ; 56254 (15:6254)
 
 .enoughMoney
 	xor a
-	ld [W_DAYCARE_IN_USE], a
+	ld [wDayCareInUse], a
 	ld hl, wDayCareNumLevelsGrown
 	ld [hli], a
 	inc hl
diff --git a/scripts/fightingdojo.asm b/scripts/fightingdojo.asm
index fa05d486..101701b1 100755
--- a/scripts/fightingdojo.asm
+++ b/scripts/fightingdojo.asm
@@ -32,10 +32,10 @@ FightingDojoScript1: ; 5cd83 (17:4d83)
 	xor a
 	ld [hJoyHeld], a
 	ld [wcf0d], a
-	ld a, [W_YCOORD]
+	ld a, [wYCoord]
 	cp $3
 	ret nz
-	ld a, [W_XCOORD]
+	ld a, [wXCoord]
 	cp $4
 	ret nz
 	ld a, $1
@@ -53,7 +53,7 @@ FightingDojoScript1: ; 5cd83 (17:4d83)
 	ret
 
 FightingDojoScript3: ; 5cdc6 (17:4dc6)
-	ld a, [W_ISINBATTLE]
+	ld a, [wIsInBattle]
 	cp $ff
 	jp z, FightingDojoScript_5cd70
 	ld a, [wcf0d]
diff --git a/scripts/fuchsiagym.asm b/scripts/fuchsiagym.asm
index e10f534e..70f9fff0 100755
--- a/scripts/fuchsiagym.asm
+++ b/scripts/fuchsiagym.asm
@@ -37,7 +37,7 @@ FuchsiaGymScriptPointers: ; 75482 (1d:5482)
 	dw FuchsiaGymScript3
 
 FuchsiaGymScript3: ; 7548a (1d:548a)
-	ld a, [W_ISINBATTLE]
+	ld a, [wIsInBattle]
 	cp $ff
 	jp z, FuchsiaGymScript_75477
 	ld a, $f0
@@ -167,7 +167,7 @@ FuchsiaGymText1: ; 75534 (1d:5534)
 	call EngageMapTrainer
 	call InitBattleEnemyParameters
 	ld a, $5
-	ld [W_GYMLEADERNO], a
+	ld [wGymLeaderNo], a
 	xor a
 	ld [hJoyHeld], a
 	ld a, $3
diff --git a/scripts/gary.asm b/scripts/gary.asm
index 3215a04f..197ed93b 100755
--- a/scripts/gary.asm
+++ b/scripts/gary.asm
@@ -52,7 +52,7 @@ GaryScript2: ; 75f6a (1d:5f6a)
 	call Delay3
 	xor a
 	ld [wJoyIgnore], a
-	ld hl, W_OPTIONS
+	ld hl, wOptions
 	res 7, [hl]
 	ld a, $1
 	ld [hSpriteIndexOrTextID], a
@@ -65,7 +65,7 @@ GaryScript2: ; 75f6a (1d:5f6a)
 	ld de, GaryText_760fe
 	call SaveEndBattleTextPointers
 	ld a, OPP_SONY3
-	ld [W_CUROPPONENT], a
+	ld [wCurOpponent], a
 
 	; select which team to use during the encounter
 	ld a, [W_RIVALSTARTER]
@@ -90,7 +90,7 @@ GaryScript2: ; 75f6a (1d:5f6a)
 	ret
 
 GaryScript3: ; 75fbb (1d:5fbb)
-	ld a, [W_ISINBATTLE]
+	ld a, [wIsInBattle]
 	cp $ff
 	jp z, GaryScript_75f29
 	call UpdateSprites
diff --git a/scripts/lance.asm b/scripts/lance.asm
index e2c43614..4d9d393c 100755
--- a/scripts/lance.asm
+++ b/scripts/lance.asm
@@ -85,7 +85,7 @@ CoordsData_5a33e: ; 5a33e (16:633e)
 
 LanceScript2: ; 5a349 (16:6349)
 	call EndTrainerBattle
-	ld a, [W_ISINBATTLE]
+	ld a, [wIsInBattle]
 	cp $ff
 	jp z, LanceScript_5a2f5
 	ld a, $1
diff --git a/scripts/lorelei.asm b/scripts/lorelei.asm
index 43eee966..d50fc1dc 100755
--- a/scripts/lorelei.asm
+++ b/scripts/lorelei.asm
@@ -105,7 +105,7 @@ LoreleiScript3: ; 7622c (1d:622c)
 	ret
 LoreleiScript2: ; 7623f (1d:623f)
 	call EndTrainerBattle
-	ld a, [W_ISINBATTLE]
+	ld a, [wIsInBattle]
 	cp $ff
 	jp z, LoreleiScript_761b6
 	ld a, $1
diff --git a/scripts/mtmoon3.asm b/scripts/mtmoon3.asm
index 84c00981..b3a994e2 100755
--- a/scripts/mtmoon3.asm
+++ b/scripts/mtmoon3.asm
@@ -55,10 +55,10 @@ MtMoon3ScriptPointers: ; 49d63 (12:5d63)
 MtMoon3Script0: ; 49d6f (12:5d6f)
 	CheckEvent EVENT_BEAT_MT_MOON_EXIT_SUPER_NERD
 	jp nz, MtMoon3Script_49d91
-	ld a, [W_YCOORD]
+	ld a, [wYCoord]
 	cp $8
 	jp nz, MtMoon3Script_49d91
-	ld a, [W_XCOORD]
+	ld a, [wXCoord]
 	cp $d
 	jp nz, MtMoon3Script_49d91
 	xor a
@@ -73,7 +73,7 @@ MtMoon3Script_49d91: ; 49d91 (12:5d91)
 	ret
 
 MtMoon3Script3: ; 49d9a (12:5d9a)
-	ld a, [W_ISINBATTLE]
+	ld a, [wIsInBattle]
 	cp $ff
 	jp z, MtMoon3Script_49d58
 	call UpdateSprites
diff --git a/scripts/museum1f.asm b/scripts/museum1f.asm
index ac552c6d..75dc1ce8 100755
--- a/scripts/museum1f.asm
+++ b/scripts/museum1f.asm
@@ -12,13 +12,13 @@ Museum1FScriptPointers: ; 5c109 (17:4109)
 	dw Museum1FScript1
 
 Museum1FScript0: ; 5c10d (17:410d)
-	ld a, [W_YCOORD]
+	ld a, [wYCoord]
 	cp $4
 	ret nz
-	ld a, [W_XCOORD]
+	ld a, [wXCoord]
 	cp $9
 	jr z, .asm_5c120
-	ld a, [W_XCOORD]
+	ld a, [wXCoord]
 	cp $a
 	ret nz
 .asm_5c120
@@ -40,17 +40,17 @@ Museum1FTextPointers: ; 5c12b (17:412b)
 
 Museum1FText1: ; 5c135 (17:4135)
 	TX_ASM
-	ld a, [W_YCOORD]
+	ld a, [wYCoord]
 	cp $4
 	jr nz, .asm_8774b
-	ld a, [W_XCOORD]
+	ld a, [wXCoord]
 	cp $d
 	jp z, Museum1FScript_5c1f9
 	jr .asm_b8709
 .asm_8774b
 	cp $3
 	jr nz, .asm_d49e7
-	ld a, [W_XCOORD]
+	ld a, [wXCoord]
 	cp $c
 	jp z, Museum1FScript_5c1f9
 .asm_d49e7
diff --git a/scripts/oakslab.asm b/scripts/oakslab.asm
index c5ca2e6e..d6494078 100755
--- a/scripts/oakslab.asm
+++ b/scripts/oakslab.asm
@@ -151,7 +151,7 @@ OaksLabScript5: ; 1cbfd (7:4bfd)
 	ret
 
 OaksLabScript6: ; 1cc36 (7:4c36)
-	ld a, [W_YCOORD]
+	ld a, [wYCoord]
 	cp $6
 	ret nz
 	ld a, $5
@@ -199,7 +199,7 @@ OaksLabScript8: ; 1cc80 (7:4c80)
 	jr .Bulbasaur
 .Charmander
 	ld de, .MiddleBallMovement1
-	ld a, [W_YCOORD]
+	ld a, [wYCoord]
 	cp $4 ; is the player standing below the table?
 	jr z, .asm_1ccf3
 	ld de, .MiddleBallMovement2
@@ -223,7 +223,7 @@ OaksLabScript8: ; 1cc80 (7:4c80)
 
 .Squirtle
 	ld de, .RightBallMovement1
-	ld a, [W_YCOORD]
+	ld a, [wYCoord]
 	cp $4 ; is the player standing below the table?
 	jr z, .asm_1ccf3
 	ld de, .RightBallMovement2
@@ -249,7 +249,7 @@ OaksLabScript8: ; 1cc80 (7:4c80)
 
 .Bulbasaur
 	ld de, .LeftBallMovement1
-	ld a, [W_XCOORD]
+	ld a, [wXCoord]
 	cp $9 ; is the player standing to the right of the table?
 	jr nz, .asm_1ccf3
 	push hl
@@ -340,7 +340,7 @@ OaksLabScript9: ; 1cd00 (7:4d00)
 	ret
 
 OaksLabScript10: ; 1cd6d (7:4d6d)
-	ld a, [W_YCOORD]
+	ld a, [wYCoord]
 	cp $6
 	ret nz
 	ld a, $1
@@ -382,7 +382,7 @@ OaksLabScript11: ; 1cdb9 (7:4db9)
 
 	; define which team rival uses, and fight it
 	ld a, OPP_SONY1
-	ld [W_CUROPPONENT], a
+	ld [wCurOpponent], a
 	ld a, [W_RIVALSTARTER]
 	cp STARTER2
 	jr nz, .NotSquirtle
@@ -446,7 +446,7 @@ OaksLabScript13: ; 1ce32 (7:4e32)
 	ld [H_SPRITEINDEX], a
 	ld de, .RivalExitMovement
 	call MoveSprite
-	ld a, [W_XCOORD]
+	ld a, [wXCoord]
 	cp $4
 	; move left or right depending on where the player is standing
 	jr nz, .moveLeft
@@ -488,7 +488,7 @@ OaksLabScript14: ; 1ce6d (7:4e6d)
 	ld a, [wNPCNumScriptedSteps]
 	cp $5
 	jr nz, .asm_1cea8
-	ld a, [W_XCOORD]
+	ld a, [wXCoord]
 	cp $4
 	jr nz, .asm_1cea1
 	ld a, SPRITE_FACING_RIGHT
@@ -675,7 +675,7 @@ OaksLabScript_1d02b: ; 1d02b (7:502b)
 	ld [$ffeb], a
 	ld a, $8
 	ld [$ffee], a
-	ld a, [W_YCOORD]
+	ld a, [wYCoord]
 	cp $3
 	jr nz, .asm_1d045
 	ld a, $4
@@ -695,7 +695,7 @@ OaksLabScript_1d02b: ; 1d02b (7:502b)
 	ld a, $3
 	ld [wNPCMovementDirections2Index], a
 	ld b, $a
-	ld a, [W_XCOORD]
+	ld a, [wXCoord]
 	cp $4
 	jr nz, .asm_1d066
 	ld a, $40
@@ -925,7 +925,7 @@ OaksLabMonChoiceMenu: ; 1d1b3 (7:51b3)
 	xor a ; PLAYER_PARTY_DATA
 	ld [wMonDataLocation], a
 	ld a, 5
-	ld [W_CURENEMYLVL], a
+	ld [wCurEnemyLVL], a
 	ld a, [wcf91]
 	ld [wd11e], a
 	call AddPartyMon
diff --git a/scripts/pallettown.asm b/scripts/pallettown.asm
index e4c3f135..106d8ec0 100755
--- a/scripts/pallettown.asm
+++ b/scripts/pallettown.asm
@@ -20,7 +20,7 @@ PalletTownScriptPointers: ; 18e73 (6:4e73)
 PalletTownScript0: ; 18e81 (6:4e81)
 	CheckEvent EVENT_FOLLOWED_OAK_INTO_LAB
 	ret nz
-	ld a,[W_YCOORD]
+	ld a,[wYCoord]
 	cp 1 ; is player near north exit?
 	ret nz
 	xor a
@@ -67,7 +67,7 @@ PalletTownScript2: ; 18ed2 (6:4ed2)
 	call SetSpriteFacingDirectionAndDelay
 	call Delay3
 	ld a,1
-	ld [W_YCOORD],a
+	ld [wYCoord],a
 	ld a,1
 	ld [hNPCPlayerRelativePosPerspective],a
 	ld a,1
diff --git a/scripts/pewtergym.asm b/scripts/pewtergym.asm
index 608fa4cd..1e6e5476 100755
--- a/scripts/pewtergym.asm
+++ b/scripts/pewtergym.asm
@@ -36,7 +36,7 @@ PewterGymScriptPointers: ; 5c3ca (17:43ca)
 	dw PewterGymScript3
 
 PewterGymScript3: ; 5c3d2 (17:43d2)
-	ld a, [W_ISINBATTLE]
+	ld a, [wIsInBattle]
 	cp $ff
 	jp z, PewterGymScript_5c3bf
 	ld a, $f0
@@ -126,7 +126,7 @@ PewterGymText1: ; 5c44e (17:444e)
 	call EngageMapTrainer
 	call InitBattleEnemyParameters
 	ld a, $1
-	ld [W_GYMLEADERNO], a
+	ld [wGymLeaderNo], a
 	xor a
 	ld [hJoyHeld], a
 	ld a, $3
diff --git a/scripts/pokemontower2.asm b/scripts/pokemontower2.asm
index bee2b3b2..078c0147 100755
--- a/scripts/pokemontower2.asm
+++ b/scripts/pokemontower2.asm
@@ -59,7 +59,7 @@ CoordsData_6055e: ; 6055e (18:455e)
 	db $0F ; isn't this supposed to end in $ff?
 
 PokemonTower2Script1: ; 60563 (18:4563)
-	ld a, [W_ISINBATTLE]
+	ld a, [wIsInBattle]
 	cp $ff
 	jp z, PokemonTower2Script_604fe
 	ld a, $f0
@@ -143,7 +143,7 @@ PokemonTower2Text1: ; 605df (18:45df)
 	ld de, PokemonTower2Text_60637
 	call SaveEndBattleTextPointers
 	ld a, OPP_SONY2
-	ld [W_CUROPPONENT], a
+	ld [wCurOpponent], a
 
 	; select which team to use during the encounter
 	ld a, [W_RIVALSTARTER]
diff --git a/scripts/pokemontower6.asm b/scripts/pokemontower6.asm
index 37ca1b33..1c3b1050 100755
--- a/scripts/pokemontower6.asm
+++ b/scripts/pokemontower6.asm
@@ -33,9 +33,9 @@ PokemonTower6Script0: ; 60b17 (18:4b17)
 	ld [hSpriteIndexOrTextID], a
 	call DisplayTextID
 	ld a, MAROWAK
-	ld [W_CUROPPONENT], a
+	ld [wCurOpponent], a
 	ld a, 30
-	ld [W_CURENEMYLVL], a
+	ld [wCurEnemyLVL], a
 	ld a, $4
 	ld [W_POKEMONTOWER6CURSCRIPT], a
 	ld [W_CURMAPSCRIPT], a
@@ -45,7 +45,7 @@ CoordsData_60b45: ; 60b45 (18:4b45)
 	db $10,$0A,$FF
 
 PokemonTower6Script4: ; 60b48 (18:4b48)
-	ld a, [W_ISINBATTLE]
+	ld a, [wIsInBattle]
 	cp $ff
 	jp z, PokemonTower6Script_60b02
 	ld a, $ff
diff --git a/scripts/pokemontower7.asm b/scripts/pokemontower7.asm
index a4635aa3..eb6d62e4 100755
--- a/scripts/pokemontower7.asm
+++ b/scripts/pokemontower7.asm
@@ -24,7 +24,7 @@ PokemonTower7ScriptPointers:
 PokemonTower7Script2: ; 60d23 (18:4d23)
 	ld hl, wFlags_0xcd60
 	res 0, [hl]
-	ld a, [W_ISINBATTLE]
+	ld a, [wIsInBattle]
 	cp $ff
 	jp z, PokemonTower7Script_60d18
 	call EndTrainerBattle
@@ -43,7 +43,7 @@ PokemonTower7Script3: ; 60d56 (18:4d56)
 	ld a, [wd730]
 	bit 0, a
 	ret nz
-	ld hl, W_MISSABLEOBJECTLIST
+	ld hl, wMissableObjectList
 	ld a, [wSpriteIndex]
 	ld b, a
 .missableObjectsListLoop
@@ -92,9 +92,9 @@ PokemonTower7Script_60db6: ; 60db6 (18:4db6)
 	ld d, $0
 	ld e, a
 	add hl, de
-	ld a, [W_YCOORD]
+	ld a, [wYCoord]
 	ld b, a
-	ld a, [W_XCOORD]
+	ld a, [wXCoord]
 	ld c, a
 .asm_60dcb
 	ld a, [hli]
diff --git a/scripts/rockethideout2.asm b/scripts/rockethideout2.asm
index ec4a536e..0b45967f 100755
--- a/scripts/rockethideout2.asm
+++ b/scripts/rockethideout2.asm
@@ -14,9 +14,9 @@ RocketHideout2ScriptPointers: ; 44e3a (11:4e3a)
 	dw RocketHideout2Script3
 
 RocketHideout2Script0: ; 44e42 (11:4e42)
-	ld a, [W_YCOORD]
+	ld a, [wYCoord]
 	ld b, a
-	ld a, [W_XCOORD]
+	ld a, [wXCoord]
 	ld c, a
 	ld hl, RocketHideout2ArrowTilePlayerMovement
 	call DecodeArrowMovementRLE
diff --git a/scripts/rockethideout3.asm b/scripts/rockethideout3.asm
index 1f6d5b41..4cdacea3 100755
--- a/scripts/rockethideout3.asm
+++ b/scripts/rockethideout3.asm
@@ -14,9 +14,9 @@ RocketHideout3ScriptPointers: ; 45238 (11:5238)
 	dw RocketHideout3Script3
 
 RocketHideout3Script0: ; 45240 (11:5240)
-	ld a, [W_YCOORD]
+	ld a, [wYCoord]
 	ld b, a
-	ld a, [W_XCOORD]
+	ld a, [wXCoord]
 	ld c, a
 	ld hl, RocketHideout3ArrowTilePlayerMovement
 	call DecodeArrowMovementRLE
diff --git a/scripts/rockethideout4.asm b/scripts/rockethideout4.asm
index a71e444c..815f6090 100755
--- a/scripts/rockethideout4.asm
+++ b/scripts/rockethideout4.asm
@@ -44,7 +44,7 @@ RocketHideout4ScriptPointers: ; 454ae (11:54ae)c
 	dw RocketHideout4Script3
 
 RocketHideout4Script3: ; 454b6 (11:54b6)
-	ld a, [W_ISINBATTLE]
+	ld a, [wIsInBattle]
 	cp $ff
 	jp z, RocketHideout4Script_454a3
 	call UpdateSprites
diff --git a/scripts/route12.asm b/scripts/route12.asm
index 4057ce03..01a5e93c 100755
--- a/scripts/route12.asm
+++ b/scripts/route12.asm
@@ -30,9 +30,9 @@ Route12Script0: ; 59619 (16:5619)
 	ld [hSpriteIndexOrTextID], a
 	call DisplayTextID
 	ld a, SNORLAX
-	ld [W_CUROPPONENT], a
+	ld [wCurOpponent], a
 	ld a, 30
-	ld [W_CURENEMYLVL], a
+	ld [wCurEnemyLVL], a
 	ld a, HS_ROUTE_12_SNORLAX
 	ld [wMissableObjectIndex], a
 	predef HideObject
@@ -42,7 +42,7 @@ Route12Script0: ; 59619 (16:5619)
 	ret
 
 Route12Script3: ; 5964c (16:564c)
-	ld a, [W_ISINBATTLE]
+	ld a, [wIsInBattle]
 	cp $ff
 	jr z, Route12Script_59606
 	call UpdateSprites
diff --git a/scripts/route16.asm b/scripts/route16.asm
index c762c999..760beb01 100755
--- a/scripts/route16.asm
+++ b/scripts/route16.asm
@@ -30,9 +30,9 @@ Route16Script0: ; 59959 (16:5959)
 	ld [hSpriteIndexOrTextID], a
 	call DisplayTextID
 	ld a, SNORLAX
-	ld [W_CUROPPONENT], a
+	ld [wCurOpponent], a
 	ld a, 30
-	ld [W_CURENEMYLVL], a
+	ld [wCurEnemyLVL], a
 	ld a, HS_ROUTE_16_SNORLAX
 	ld [wMissableObjectIndex], a
 	predef HideObject
@@ -43,7 +43,7 @@ Route16Script0: ; 59959 (16:5959)
 	ret
 
 Route16Script3: ; 5998f (16:598f)
-	ld a, [W_ISINBATTLE]
+	ld a, [wIsInBattle]
 	cp $ff
 	jp z, Route16Script_59946
 	call UpdateSprites
diff --git a/scripts/route22.asm b/scripts/route22.asm
index 1244f0ff..ff506793 100755
--- a/scripts/route22.asm
+++ b/scripts/route22.asm
@@ -132,7 +132,7 @@ Route22Script1: ; 50f62 (14:4f62)
 	ld de, Route22Text_511bc
 	call SaveEndBattleTextPointers
 	ld a, OPP_SONY1
-	ld [W_CUROPPONENT], a
+	ld [wCurOpponent], a
 	ld hl, StarterMons_50faf
 	call Route22Script_50ed6
 	ld a, $2
@@ -146,7 +146,7 @@ StarterMons_50faf: ; 50faf (14:4faf)
 	db STARTER1,$06
 
 Route22Script2: ; 50fb5 (14:4fb5)
-	ld a, [W_ISINBATTLE]
+	ld a, [wIsInBattle]
 	cp $ff
 	jp z, Route22Script_50ece
 	ld a, [wSpriteStateData1 + 9]
@@ -288,7 +288,7 @@ Route22Script4: ; 51087 (14:5087)
 	ld de, Route22Text_511d0
 	call SaveEndBattleTextPointers
 	ld a, OPP_SONY2
-	ld [W_CUROPPONENT], a
+	ld [wCurOpponent], a
 	ld hl, StarterMons_510d9
 	call Route22Script_50ed6
 	ld a, $5
@@ -301,7 +301,7 @@ StarterMons_510d9: ; 510d9 (14:50d9)
 	db STARTER1,$0c
 
 Route22Script5: ; 510df (14:50df)
-	ld a, [W_ISINBATTLE]
+	ld a, [wIsInBattle]
 	cp $ff
 	jp z, Route22Script_50ece
 	ld a, $2
diff --git a/scripts/route22gate.asm b/scripts/route22gate.asm
index e17380f5..f0b5b92d 100755
--- a/scripts/route22gate.asm
+++ b/scripts/route22gate.asm
@@ -3,7 +3,7 @@ Route22GateScript: ; 1e683 (7:6683)
 	ld hl, Route22GateScriptPointers
 	ld a, [W_ROUTE22GATECURSCRIPT]
 	call CallFunctionInTable
-	ld a, [W_YCOORD]
+	ld a, [wYCoord]
 	cp $4
 	ld a, ROUTE_23
 	jr c, .asm_1e69a
diff --git a/scripts/route23.asm b/scripts/route23.asm
index 6462ec88..6fc0eef1 100755
--- a/scripts/route23.asm
+++ b/scripts/route23.asm
@@ -26,7 +26,7 @@ Route23ScriptPointers: ; 51213 (14:5213)
 
 Route23Script0: ; 51219 (14:5219)
 	ld hl, YCoordsData_51255
-	ld a, [W_YCOORD]
+	ld a, [wYCoord]
 	ld b, a
 	ld e, $0
 	EventFlagBit c, EVENT_PASSED_EARTHBADGE_CHECK + 1, EVENT_PASSED_CASCADEBADGE_CHECK
@@ -40,7 +40,7 @@ Route23Script0: ; 51219 (14:5219)
 	jr nz, .asm_51224
 	cp $23
 	jr nz, .asm_51237
-	ld a, [W_XCOORD]
+	ld a, [wXCoord]
 	cp $e
 	ret nc
 .asm_51237
diff --git a/scripts/route24.asm b/scripts/route24.asm
index 6eba1d35..61df4377 100755
--- a/scripts/route24.asm
+++ b/scripts/route24.asm
@@ -58,7 +58,7 @@ Route24Script4: ; 51411 (14:5411)
 	ret
 
 Route24Script3: ; 51422 (14:5422)
-	ld a, [W_ISINBATTLE]
+	ld a, [wIsInBattle]
 	cp $ff
 	jp z, Route24Script_513c0
 	call UpdateSprites
diff --git a/scripts/safarizoneentrance-yellow.asm b/scripts/safarizoneentrance-yellow.asm
index 4a37f0e6..ac51c2d5 100644
--- a/scripts/safarizoneentrance-yellow.asm
+++ b/scripts/safarizoneentrance-yellow.asm
@@ -56,7 +56,7 @@
 	ld a,30
 	lb hl, (502 / $100),  (502 % $100)
 .xf1ff2
-	ld [W_NUMSAFARIBALLS],a
+	ld [wNumSafariBalls],a
 	ld a,h
 	ld [wSafariSteps],a
 	ld a,l
diff --git a/scripts/safarizoneentrance.asm b/scripts/safarizoneentrance.asm
index e4e2e2a8..a24b790f 100755
--- a/scripts/safarizoneentrance.asm
+++ b/scripts/safarizoneentrance.asm
@@ -84,7 +84,7 @@ SafariZoneEntranceScriptPointers: ; 751d9 (1d:51d9)
 	ld [hSpriteIndexOrTextID], a
 	call DisplayTextID
 	xor a
-	ld [W_NUMSAFARIBALLS], a
+	ld [wNumSafariBalls], a
 	ld a, D_DOWN
 	ld c, $3
 	call SafariZoneEntranceAutoWalk
@@ -181,7 +181,7 @@ SafariZoneEntranceTextPointers: ; 752b9 (1d:52b9)
 	ld hl,.MakePaymentText
 	call PrintText
 	ld a,30
-	ld [W_NUMSAFARIBALLS],a
+	ld [wNumSafariBalls],a
 	ld a,502 / $100
 	ld [wSafariSteps],a
 	ld a, 502 % $100
diff --git a/scripts/saffrongym.asm b/scripts/saffrongym.asm
index 567f79d8..cae60f45 100755
--- a/scripts/saffrongym.asm
+++ b/scripts/saffrongym.asm
@@ -36,7 +36,7 @@ SaffronGymScriptPointers: ; 5d053 (17:5053)
 	dw SaffronGymScript3
 
 SaffronGymScript3: ; 5d05b (17:505b)
-	ld a, [W_ISINBATTLE]
+	ld a, [wIsInBattle]
 	cp $ff
 	jp z, SaffronGymText_5d048
 	ld a, $f0
@@ -177,7 +177,7 @@ SaffronGymText1: ; 5d118 (17:5118)
 	call EngageMapTrainer
 	call InitBattleEnemyParameters
 	ld a, $6
-	ld [W_GYMLEADERNO], a
+	ld [wGymLeaderNo], a
 	ld a, $3
 	ld [W_SAFFRONGYMCURSCRIPT], a
 .asm_5d15f
diff --git a/scripts/seafoamislands4.asm b/scripts/seafoamislands4.asm
index f7407e48..90d282cf 100755
--- a/scripts/seafoamislands4.asm
+++ b/scripts/seafoamislands4.asm
@@ -41,7 +41,7 @@ SeafoamIslands4Script: ; 4658d (11:658d)
 	ret nz
 .asm_465ed
 	ld hl, SeafoamIslands4ScriptPointers
-	ld a, [W_SEAFOAMISLANDS4CURSCRIPT]
+	ld a, [wSeafoamIslands4CurScript]
 	jp CallFunctionInTable
 
 Seafoam4HolesCoords: ; 465f6 (11:65f6)
@@ -58,10 +58,10 @@ SeafoamIslands4ScriptPointers: ; 465fb (11:65fb)
 SeafoamIslands4Script0: ; 46603 (11:6603)
 	CheckBothEventsSet EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM3_BOULDER2_DOWN_HOLE
 	ret z
-	ld a, [W_YCOORD]
+	ld a, [wYCoord]
 	cp $8
 	ret nz
-	ld a, [W_XCOORD]
+	ld a, [wXCoord]
 	cp $f
 	ret nz
 	ld hl, wSimulatedJoypadStatesEnd
@@ -73,7 +73,7 @@ SeafoamIslands4Script0: ; 46603 (11:6603)
 	ld hl, W_FLAGS_D733
 	set 2, [hl]
 	ld a, $1
-	ld [W_SEAFOAMISLANDS4CURSCRIPT], a
+	ld [wSeafoamIslands4CurScript], a
 	ret
 
 RLEMovement46632: ; 46632 (11:6632)
@@ -87,13 +87,13 @@ SeafoamIslands4Script1: ; 46639 (11:6639)
 	and a
 	ret nz
 	ld a, $0
-	ld [W_SEAFOAMISLANDS4CURSCRIPT], a
+	ld [wSeafoamIslands4CurScript], a
 	ret
 
 SeafoamIslands4Script2: ; 46644 (11:6644)
 	CheckBothEventsSet EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM3_BOULDER2_DOWN_HOLE
 	ret z
-	ld a, [W_XCOORD]
+	ld a, [wXCoord]
 	cp $12
 	jr z, .asm_4665e
 	cp $13
@@ -116,7 +116,7 @@ SeafoamIslands4Script2: ; 46644 (11:6644)
 	set 2, [hl]
 	ld a, $3
 .asm_4667b
-	ld [W_SEAFOAMISLANDS4CURSCRIPT], a
+	ld [wSeafoamIslands4CurScript], a
 	ret
 
 RLEData_4667f: ; 4667f (11:667f)
@@ -137,7 +137,7 @@ SeafoamIslands4Script3: ; 4668f (11:668f)
 	and a
 	ret nz
 	ld a, $0
-	ld [W_SEAFOAMISLANDS4CURSCRIPT], a
+	ld [wSeafoamIslands4CurScript], a
 	ret
 
 SeafoamIslands4TextPointers: ; 4669a (11:669a)
diff --git a/scripts/seafoamislands5.asm b/scripts/seafoamislands5.asm
index 87942ca0..17ea82cb 100755
--- a/scripts/seafoamislands5.asm
+++ b/scripts/seafoamislands5.asm
@@ -1,12 +1,12 @@
 SeafoamIslands5Script: ; 46799 (11:6799)
 	call EnableAutoTextBoxDrawing
-	ld a, [W_SEAFOAMISLANDS5CURSCRIPT]
+	ld a, [wSeafoamIslands5CurScript]
 	ld hl, SeafoamIslands5ScriptPointers
 	jp CallFunctionInTable
 
 SeafoamIslands5Script_467a5: ; 467a5 (11:67a5)
 	xor a
-	ld [W_SEAFOAMISLANDS5CURSCRIPT], a
+	ld [wSeafoamIslands5CurScript], a
 	ld [wJoyIgnore], a
 	ret
 
@@ -18,12 +18,12 @@ SeafoamIslands5ScriptPointers: ; 467ad (11:67ad)
 	dw SeafoamIslands5Script4
 
 SeafoamIslands5Script4: ; 467b7 (11:67b7)
-	ld a, [W_ISINBATTLE]
+	ld a, [wIsInBattle]
 	cp $ff
 	jr z, SeafoamIslands5Script_467a5
 	call EndTrainerBattle
 	ld a, $0
-	ld [W_SEAFOAMISLANDS5CURSCRIPT], a
+	ld [wSeafoamIslands5CurScript], a
 	ret
 
 SeafoamIslands5Script0: ; 467c7 (11:67c7)
@@ -49,7 +49,7 @@ SeafoamIslands5Script0: ; 467c7 (11:67c7)
 	ld hl, W_FLAGS_D733
 	res 2, [hl]
 	ld a, $1
-	ld [W_SEAFOAMISLANDS5CURSCRIPT], a
+	ld [wSeafoamIslands5CurScript], a
 	ret
 
 CoordsData_467fe: ; 467fe (11:67fe)
@@ -66,7 +66,7 @@ SeafoamIslands5Script1: ; 46807 (11:6807)
 	xor a
 	ld [wJoyIgnore], a
 	ld a, $0
-	ld [W_SEAFOAMISLANDS5CURSCRIPT], a
+	ld [wSeafoamIslands5CurScript], a
 	ret
 
 SeafoamIslands5Script2: ; 46816 (11:6816)
@@ -92,7 +92,7 @@ SeafoamIslands5Script2: ; 46816 (11:6816)
 	call StartSimulatingJoypadStates
 	ld a, $3
 .asm_46849
-	ld [W_SEAFOAMISLANDS5CURSCRIPT], a
+	ld [wSeafoamIslands5CurScript], a
 	ret
 
 CoordsData_4684d: ; 4684d (11:684d)
@@ -121,7 +121,7 @@ SeafoamIslands5Script3: ; 46860 (11:6860)
 	and a
 	ret nz
 	ld a, $0
-	ld [W_SEAFOAMISLANDS5CURSCRIPT], a
+	ld [wSeafoamIslands5CurScript], a
 	ret
 
 SeaFoamIslands5Script_46872: ; 46872 (11:6872)
@@ -154,7 +154,7 @@ SeafoamIslands5Text3: ; 46893 (11:6893)
 	ld hl, SeafoamIslands5TrainerHeader0
 	call TalkToTrainer
 	ld a, $4
-	ld [W_SEAFOAMISLANDS5CURSCRIPT], a
+	ld [wSeafoamIslands5CurScript], a
 	jp TextScriptEnd
 
 SeafoamIslands5BattleText2: ; 468a2 (11:68a2)
diff --git a/scripts/silphco11.asm b/scripts/silphco11.asm
index 4c83c20d..6cb2e7ed 100755
--- a/scripts/silphco11.asm
+++ b/scripts/silphco11.asm
@@ -205,7 +205,7 @@ SilphCo11Script_6221a: ; 6221a (18:621a)
 	jp SetSpriteFacingDirectionAndDelay
 
 SilphCo11Script5: ; 62227 (18:6227)
-	ld a, [W_ISINBATTLE]
+	ld a, [wIsInBattle]
 	cp $ff
 	jp z, SilphCo11Script_621c4
 	ld a, [wcf0d]
diff --git a/scripts/silphco7.asm b/scripts/silphco7.asm
index 5333e07f..d535c04b 100755
--- a/scripts/silphco7.asm
+++ b/scripts/silphco7.asm
@@ -184,7 +184,7 @@ SilphCo7Script3: ; 51c82 (14:5c82)
 	ld de, SilphCo7Text_51ecd
 	call SaveEndBattleTextPointers
 	ld a, OPP_SONY2
-	ld [W_CUROPPONENT], a
+	ld [wCurOpponent], a
 	ld a, [W_RIVALSTARTER]
 	cp STARTER2
 	jr nz, .asm_51cb6
@@ -203,7 +203,7 @@ SilphCo7Script3: ; 51c82 (14:5c82)
 	jp SilphCo7Text_51c10
 
 SilphCo7Script4: ; 51cc8 (14:5cc8)
-	ld a, [W_ISINBATTLE]
+	ld a, [wIsInBattle]
 	cp $ff
 	jp z, SilphCo7Text_51c0c
 	ld a, $f0
diff --git a/scripts/ssanne2.asm b/scripts/ssanne2.asm
index 8bcc2b17..52b9792c 100755
--- a/scripts/ssanne2.asm
+++ b/scripts/ssanne2.asm
@@ -71,7 +71,7 @@ CoordsData_61411: ; 61411 (18:5411)
 	db $FF
 
 SSAnne2Script_61416: ; 61416 (18:5416)
-	ld a, [W_XCOORD]
+	ld a, [wXCoord]
 	cp $25
 	jr nz, .asm_61426
 	ld a, PLAYER_DIR_LEFT
@@ -98,7 +98,7 @@ SSAnne2Script1: ; 61430 (18:5430)
 	call DisplayTextID
 	call Delay3
 	ld a, OPP_SONY2
-	ld [W_CUROPPONENT], a
+	ld [wCurOpponent], a
 
 	; select which team to use during the encounter
 	ld a, [W_RIVALSTARTER]
@@ -122,7 +122,7 @@ SSAnne2Script1: ; 61430 (18:5430)
 	ret
 
 SSAnne2Script2: ; 6146d (18:546d)
-	ld a, [W_ISINBATTLE]
+	ld a, [wIsInBattle]
 	cp $ff
 	jp z, SSAnne2Script_613ab
 	call SSAnne2Script_61416
@@ -134,7 +134,7 @@ SSAnne2Script2: ; 6146d (18:546d)
 	ld a, $2
 	ld [H_SPRITEINDEX], a
 	call SetSpriteMovementBytesToFF
-	ld a, [W_XCOORD]
+	ld a, [wXCoord]
 	cp $25
 	jr nz, .asm_61497
 	ld de, MovementData_614b9
diff --git a/scripts/vermiliongym.asm b/scripts/vermiliongym.asm
index 6dae0751..d672a419 100755
--- a/scripts/vermiliongym.asm
+++ b/scripts/vermiliongym.asm
@@ -55,7 +55,7 @@ VermilionGymScriptPointers: ; 5ca95 (17:4a95)
 	dw VermilionGymScript3
 
 VermilionGymScript3: ; 5ca9d (17:4a9d)
-	ld a, [W_ISINBATTLE]
+	ld a, [wIsInBattle]
 	cp $ff
 	jp z, VermilionGymScript_5ca8a
 	ld a, $f0
@@ -156,7 +156,7 @@ VermilionGymText1: ; 5cb1d (17:4b1d)
 	call EngageMapTrainer
 	call InitBattleEnemyParameters
 	ld a, $3
-	ld [W_GYMLEADERNO], a
+	ld [wGymLeaderNo], a
 	xor a
 	ld [hJoyHeld], a
 	ld a, $3
diff --git a/scripts/viridiancity.asm b/scripts/viridiancity.asm
index be7872e6..a660898b 100755
--- a/scripts/viridiancity.asm
+++ b/scripts/viridiancity.asm
@@ -23,10 +23,10 @@ ViridianCityScript_1900b: ; 1900b (6:500b)
 	SetEvent EVENT_VIRIDIAN_GYM_OPEN
 	ret
 .asm_1901e
-	ld a, [W_YCOORD]
+	ld a, [wYCoord]
 	cp $8
 	ret nz
-	ld a, [W_XCOORD]
+	ld a, [wXCoord]
 	cp $20
 	ret nz
 	ld a, $e
@@ -42,10 +42,10 @@ ViridianCityScript_1900b: ; 1900b (6:500b)
 ViridianCityScript_1903d: ; 1903d (6:503d)
 	CheckEvent EVENT_GOT_POKEDEX
 	ret nz
-	ld a, [W_YCOORD]
+	ld a, [wYCoord]
 	cp $9
 	ret nz
-	ld a, [W_XCOORD]
+	ld a, [wXCoord]
 	cp $13
 	ret nz
 	ld a, $5
@@ -74,9 +74,9 @@ ViridianCityScript1: ; 19062 (6:5062)
 	ld a, $1
 	ld [W_BATTLETYPE], a
 	ld a, 5
-	ld [W_CURENEMYLVL], a
+	ld [wCurEnemyLVL], a
 	ld a, WEEDLE
-	ld [W_CUROPPONENT], a
+	ld [wCurOpponent], a
 	ld a, $2
 	ld [W_VIRIDIANCITYCURSCRIPT], a
 	ret
diff --git a/scripts/viridiangym.asm b/scripts/viridiangym.asm
index 1848e5f0..873a397d 100755
--- a/scripts/viridiangym.asm
+++ b/scripts/viridiangym.asm
@@ -30,9 +30,9 @@ ViridianGymScriptPointers: ; 748e1 (1d:48e1)
 	dw ViridianGymScript4
 
 ViridianGymScript0: ; 748eb (1d:48eb)
-	ld a, [W_YCOORD]
+	ld a, [wYCoord]
 	ld b, a
-	ld a, [W_XCOORD]
+	ld a, [wXCoord]
 	ld c, a
 	ld hl, ViridianGymArrowTilePlayerMovement
 	call DecodeArrowMovementRLE
@@ -131,7 +131,7 @@ ViridianGymScript4: ; 7496b (1d:496b)
 	jpba LoadSpinnerArrowTiles
 
 ViridianGymScript3: ; 74988 (1d:4988)
-	ld a, [W_ISINBATTLE]
+	ld a, [wIsInBattle]
 	cp $ff
 	jp z, ViridianGymScript_748d6
 	ld a, $f0
@@ -295,7 +295,7 @@ ViridianGymText1: ; 74a69 (1d:4a69)
 	call EngageMapTrainer
 	call InitBattleEnemyParameters
 	ld a, $8
-	ld [W_GYMLEADERNO], a
+	ld [wGymLeaderNo], a
 	ld a, $3
 	ld [W_VIRIDIANGYMCURSCRIPT], a
 .asm_6dff7