Fix wVirtualOAM labels, part 2.

22 files changed, 44 insertions, 44 deletions

diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index 3742f00c9..0fe77df40 100644
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -9327,7 +9327,7 @@ CopyBackpic: ; 3fc30
 ; 3fc5b
 
 .LoadTrainerBackpicAsOAM: ; 3fc5b
-	ld hl, wSprite01
+	ld hl, wVirtualOAMSprite00
 	xor a
 	ld [hMapObjectIndexBuffer], a
 	ld b, 6
diff --git a/engine/battle/sliding_intro.asm b/engine/battle/sliding_intro.asm
index 781d30f38..667f18191 100755
--- a/engine/battle/sliding_intro.asm
+++ b/engine/battle/sliding_intro.asm
@@ -60,7 +60,7 @@ BattleIntroSlidingPics: ; 4e980
 ; 4e9d6
 
 .subfunction3 ; 4e9d6
-	ld hl, wSprite01XCoord
+	ld hl, wVirtualOAMSprite00XCoord
 	ld c, $12 ; 18
 	ld de, SPRITEOAMSTRUCT_LENGTH
 .loop3
diff --git a/engine/battle/trainer_huds.asm b/engine/battle/trainer_huds.asm
index f35d2fcdd..0a18098ed 100755
--- a/engine/battle/trainer_huds.asm
+++ b/engine/battle/trainer_huds.asm
@@ -28,7 +28,7 @@ ShowPlayerMonsRemaining: ; 2c01c
 	ld [hl], a
 	ld a, 8
 	ld [wPlaceBallsDirection], a
-	ld hl, wSprite01
+	ld hl, wVirtualOAMSprite00
 	jp LoadTrainerHudOAM
 ; 2c03a
 
@@ -44,7 +44,7 @@ ShowOTTrainerMonsRemaining: ; 2c03a
 	ld [hl], 4 * 8
 	ld a, -8
 	ld [wPlaceBallsDirection], a
-	ld hl, wSprite01 + PARTY_LENGTH * SPRITEOAMSTRUCT_LENGTH
+	ld hl, wVirtualOAMSprite00 + PARTY_LENGTH * SPRITEOAMSTRUCT_LENGTH
 	jp LoadTrainerHudOAM
 ; 2c059
 
@@ -193,7 +193,7 @@ LinkBattle_TrainerHuds: ; 2c10d
 	ld [hl], 8 * 8
 	ld a, $8
 	ld [wPlaceBallsDirection], a
-	ld hl, wSprite01
+	ld hl, wVirtualOAMSprite00
 	call LoadTrainerHudOAM
 
 	ld hl, wOTPartyMon1HP
@@ -203,7 +203,7 @@ LinkBattle_TrainerHuds: ; 2c10d
 	ld a, 10 * 8
 	ld [hli], a
 	ld [hl], 13 * 8
-	ld hl, wSprite01 + PARTY_LENGTH * SPRITEOAMSTRUCT_LENGTH
+	ld hl, wVirtualOAMSprite00 + PARTY_LENGTH * SPRITEOAMSTRUCT_LENGTH
 	jp LoadTrainerHudOAM
 ; 2c143
 
diff --git a/engine/battle_anims/anim_commands.asm b/engine/battle_anims/anim_commands.asm
index e0573d3d5..a063a213a 100644
--- a/engine/battle_anims/anim_commands.asm
+++ b/engine/battle_anims/anim_commands.asm
@@ -257,7 +257,7 @@ BattleAnim_ClearCGB_OAMFlags: ; cc23d
 	bit 3, a
 	jr z, .delete
 
-	ld hl, wSprite01Attributes
+	ld hl, wVirtualOAMSprite00Attributes
 	ld c, NUM_SPRITE_OAM_STRUCTS
 .loop
 	ld a, [hl]
diff --git a/engine/billspc.asm b/engine/billspc.asm
index 53451e9c0..57c4faac4 100755
--- a/engine/billspc.asm
+++ b/engine/billspc.asm
@@ -1498,7 +1498,7 @@ BillsPC_UpdateSelectionCursor: ; e2e01 (38:6e01)
 
 .place_cursor
 	ld hl, .OAM
-	ld de, wSprite01
+	ld de, wVirtualOAMSprite00
 .loop
 	ld a, [hl]
 	cp -1
@@ -1548,7 +1548,7 @@ endr
 
 BillsPC_UpdateInsertCursor: ; e2e8c
 	ld hl, .OAM
-	ld de, wSprite01
+	ld de, wVirtualOAMSprite00
 .loop
 	ld a, [hl]
 	cp -1
diff --git a/engine/card_flip.asm b/engine/card_flip.asm
index 0e85ef21b..fbeb3e3b6 100755
--- a/engine/card_flip.asm
+++ b/engine/card_flip.asm
@@ -601,7 +601,7 @@ CardFlip_CopyToBox: ; e04f7 (38:44f7)
 ; e0509 (38:4509)
 
 CardFlip_CopyOAM: ; e0509
-	ld de, wSprite01
+	ld de, wVirtualOAMSprite00
 	ld a, [hli]
 .loop
 	push af
diff --git a/engine/events/celebi.asm b/engine/events/celebi.asm
index 082a2318d..2c3950f0b 100755
--- a/engine/events/celebi.asm
+++ b/engine/events/celebi.asm
@@ -52,7 +52,7 @@ Special_CelebiShrineEvent: ; 4989a
 ; 498f9
 
 .RestorePlayerSprite_DespawnLeaves: ; 498f9
-	ld hl, wSprite01TileID
+	ld hl, wVirtualOAMSprite00TileID
 	xor a
 	ld c, 4
 .OAMloop:
@@ -63,8 +63,8 @@ endr
 	inc a
 	dec c
 	jr nz, .OAMloop
-	ld hl, wSprite05
-	ld bc, wSpritesEnd - wSprite05
+	ld hl, wVirtualOAMSprite04
+	ld bc, wSpritesEnd - wVirtualOAMSprite04
 	xor a
 	call ByteFill
 	ret
diff --git a/engine/events/field_moves.asm b/engine/events/field_moves.asm
index 5fc069602..7ff726af2 100755
--- a/engine/events/field_moves.asm
+++ b/engine/events/field_moves.asm
@@ -62,8 +62,8 @@ ShakeHeadbuttTree: ; 8c80a
 	xor a
 	ld [hBGMapMode], a
 	farcall ClearSpriteAnims
-	ld hl, wSprite37
-	ld bc, wSpritesEnd - wSprite37
+	ld hl, wVirtualOAMSprite36
+	ld bc, wSpritesEnd - wVirtualOAMSprite36
 	xor a
 	call ByteFill
 	ld de, Font
@@ -393,7 +393,7 @@ FlyToAnim: ; 8cb33
 	ret
 
 .RestorePlayerSprite_DespawnLeaves: ; 8cb82 (23:4b82)
-	ld hl, wSprite01TileID
+	ld hl, wVirtualOAMSprite00TileID
 	xor a
 	ld c, 4
 .OAMloop
@@ -404,8 +404,8 @@ endr
 	inc a
 	dec c
 	jr nz, .OAMloop
-	ld hl, wSprite05
-	ld bc, wSpritesEnd - wSprite05
+	ld hl, wVirtualOAMSprite04
+	ld bc, wSpritesEnd - wVirtualOAMSprite04
 	xor a
 	call ByteFill
 	ret
diff --git a/engine/events/heal_machine_anim.asm b/engine/events/heal_machine_anim.asm
index 5e60425f6..400645b47 100755
--- a/engine/events/heal_machine_anim.asm
+++ b/engine/events/heal_machine_anim.asm
@@ -97,14 +97,14 @@ ENDM
 ; 12393
 
 .PC_LoadBallsOntoMachine: ; 12393
-	ld hl, wSprite33
+	ld hl, wVirtualOAMSprite32
 	ld de, .PC_ElmsLab_OAM
 	call .PlaceHealingMachineTile
 	call .PlaceHealingMachineTile
 	jr .LoadBallsOntoMachine
 
 .HOF_LoadBallsOntoMachine: ; 123a1
-	ld hl, wSprite33
+	ld hl, wVirtualOAMSprite32
 	ld de, .HOF_OAM
 
 .LoadBallsOntoMachine: ; 123a7
diff --git a/engine/evolution_animation.asm b/engine/evolution_animation.asm
index 5b9623a29..e78423ef1 100755
--- a/engine/evolution_animation.asm
+++ b/engine/evolution_animation.asm
@@ -346,7 +346,7 @@ EvolutionAnimation: ; 4e5e1
 	inc a
 	and $7
 	ld b, a
-	ld hl, wSprite01Attributes
+	ld hl, wVirtualOAMSprite00Attributes
 	ld c, NUM_SPRITE_OAM_STRUCTS
 .loop6
 	ld a, [hl]
diff --git a/engine/intro_menu.asm b/engine/intro_menu.asm
index 00c09aa30..74daec6d8 100755
--- a/engine/intro_menu.asm
+++ b/engine/intro_menu.asm
@@ -969,7 +969,7 @@ Intro_PlacePlayerSprite: ; 61cd
 	ld hl, vTiles0
 	call Request2bpp
 
-	ld hl, wSprite01
+	ld hl, wVirtualOAMSprite00
 	ld de, .sprites
 	ld a, [de]
 	inc de
diff --git a/engine/mystery_gift.asm b/engine/mystery_gift.asm
index 56b09000a..dc1daa1a3 100755
--- a/engine/mystery_gift.asm
+++ b/engine/mystery_gift.asm
@@ -1458,7 +1458,7 @@ Function105688: ; 105688 (41:5688)
 Function1056eb: ; 1056eb (41:56eb)
 	ld c, 16
 .loop
-	ld hl, wSprite01YCoord
+	ld hl, wVirtualOAMSprite00YCoord
 	ld b, 8
 .dec_y_loop
 	dec [hl]
@@ -1467,7 +1467,7 @@ rept SPRITEOAMSTRUCT_LENGTH
 endr
 	dec b
 	jr nz, .dec_y_loop
-	ld hl, wSprite09YCoord
+	ld hl, wVirtualOAMSprite08YCoord
 	ld b, 8
 .inc_y_loop
 	inc [hl]
@@ -1656,7 +1656,7 @@ Function1057d7: ; 1057d7 (41:57d7)
 	ld [hl], $3c
 	hlcoord 17, 15
 	ld [hl], $3e
-	ld de, wSprite01
+	ld de, wVirtualOAMSprite00
 	ld hl, .OAM_data
 	ld bc, 16 * SPRITEOAMSTRUCT_LENGTH
 	call CopyBytes
diff --git a/engine/pokedex/pokedex.asm b/engine/pokedex/pokedex.asm
index 70c5c4601..04b4a6472 100644
--- a/engine/pokedex/pokedex.asm
+++ b/engine/pokedex/pokedex.asm
@@ -2117,7 +2117,7 @@ Pokedex_UpdateSearchResultsCursorOAM: ; 41281 (10:5281)
 	db -1
 
 Pokedex_LoadCursorOAM: ; 412f1 (10:52f1)
-	ld de, wSprite01
+	ld de, wVirtualOAMSprite00
 .loop
 	ld a, [hl]
 	cp -1
diff --git a/engine/pokedex/pokedex_2.asm b/engine/pokedex/pokedex_2.asm
index 6f4e27405..a467fe02c 100644
--- a/engine/pokedex/pokedex_2.asm
+++ b/engine/pokedex/pokedex_2.asm
@@ -41,7 +41,7 @@ AnimateDexSearchSlowpoke: ; 441cf
 DoDexSearchSlowpokeFrame: ; 44207
 	ld a, [wDexSearchSlowpokeFrame]
 	ld hl, .SlowpokeSpriteData
-	ld de, wSprite01
+	ld de, wVirtualOAMSprite00
 .loop
 	ld a, [hli]
 	cp -1
diff --git a/engine/pokegear.asm b/engine/pokegear.asm
index affe9d6bd..1b816725b 100755
--- a/engine/pokegear.asm
+++ b/engine/pokegear.asm
@@ -2627,7 +2627,7 @@ Pokedex_GetArea: ; 91d11
 	ld e, a
 	farcall FindNest ; load nest landmarks into wTileMap[0,0]
 	decoord 0, 0
-	ld hl, wSprite01
+	ld hl, wVirtualOAMSprite00
 .nestloop
 	ld a, [de]
 	and a
@@ -2671,7 +2671,7 @@ Pokedex_GetArea: ; 91d11
 	ld c, e
 	ld b, d
 	ld de, .PlayerOAM
-	ld hl, wSprite01
+	ld hl, wVirtualOAMSprite00
 .ShowPlayerLoop:
 	ld a, [de]
 	cp $80
@@ -2700,8 +2700,8 @@ Pokedex_GetArea: ; 91d11
 	jr .ShowPlayerLoop
 
 .clear_oam
-	ld hl, wSprite05
-	ld bc, wSpritesEnd - wSprite05
+	ld hl, wVirtualOAMSprite04
+	ld bc, wSpritesEnd - wVirtualOAMSprite04
 	xor a
 	call ByteFill
 	ret
diff --git a/engine/routines/switchpartymons.asm b/engine/routines/switchpartymons.asm
index f1de8e276..b01178417 100644
--- a/engine/routines/switchpartymons.asm
+++ b/engine/routines/switchpartymons.asm
@@ -25,7 +25,7 @@ _SwitchPartyMons:
 	ld a, " "
 	call ByteFill
 	pop af
-	ld hl, wSprite01
+	ld hl, wVirtualOAMSprite00
 	ld bc, 4 * SPRITEOAMSTRUCT_LENGTH
 	call AddNTimes
 	ld de, SPRITEOAMSTRUCT_LENGTH
diff --git a/engine/slot_machine.asm b/engine/slot_machine.asm
index db0838094..fe9ea52d9 100755
--- a/engine/slot_machine.asm
+++ b/engine/slot_machine.asm
@@ -261,7 +261,7 @@ Unreferenced_Function9282c: ; 9282c
 	inc [hl]
 	and $7
 	ret nz
-	ld hl, wSprite17TileID
+	ld hl, wVirtualOAMSprite16TileID
 	ld c, NUM_SPRITE_OAM_STRUCTS - 16
 .loop
 	ld a, [hl]
@@ -671,7 +671,7 @@ Slots_InitReelTiles: ; 92a98 (24:6a98)
 	ld bc, wReel1
 	ld hl, REEL_OAM_ADDR
 	add hl, bc
-	ld de, wSprite17
+	ld de, wVirtualOAMSprite16
 	ld [hl], e
 	inc hl
 	ld [hl], d
@@ -689,7 +689,7 @@ Slots_InitReelTiles: ; 92a98 (24:6a98)
 	ld bc, wReel2
 	ld hl, REEL_OAM_ADDR
 	add hl, bc
-	ld de, wSprite25
+	ld de, wVirtualOAMSprite24
 	ld [hl], e
 	inc hl
 	ld [hl], d
@@ -707,7 +707,7 @@ Slots_InitReelTiles: ; 92a98 (24:6a98)
 	ld bc, wReel3
 	ld hl, REEL_OAM_ADDR
 	add hl, bc
-	ld de, wSprite33
+	ld de, wVirtualOAMSprite32
 	ld [hl], e
 	inc hl
 	ld [hl], d
diff --git a/engine/sprites.asm b/engine/sprites.asm
index d97dab374..3451687fc 100755
--- a/engine/sprites.asm
+++ b/engine/sprites.asm
@@ -100,11 +100,11 @@ DoNextFrameForFirst16Sprites: ; 8cfa8 (23:4fa8)
 
 	ld a, [wCurrSpriteOAMAddr]
 	ld l, a
-	ld h, HIGH(wSprite17)
+	ld h, HIGH(wVirtualOAMSprite16)
 
 .loop2 ; Clear (wVirtualOAM + [wCurrSpriteOAMAddr] --> Sprites + $40)
 	ld a, l
-	cp LOW(wSprite17)
+	cp LOW(wVirtualOAMSprite16)
 	jr nc, .done
 	xor a
 	ld [hli], a
@@ -649,7 +649,7 @@ AnimateEndOfExpBar: ; 8e79d
 ; 8e7c6
 
 .AnimateFrame: ; 8e7c6
-	ld hl, wSprite01
+	ld hl, wVirtualOAMSprite00
 	ld c, 8 ; number of animated circles
 .anim_loop
 	ld a, c
diff --git a/engine/title.asm b/engine/title.asm
index 91bb21064..310e4d164 100644
--- a/engine/title.asm
+++ b/engine/title.asm
@@ -323,7 +323,7 @@ DrawTitleGraphic: ; 10eeef
 ; 10ef06
 
 InitializeBackground: ; 10ef06
-	ld hl, wSprite01
+	ld hl, wVirtualOAMSprite00
 	ld d, -$22
 	ld e, $0
 	ld c, 5
@@ -366,7 +366,7 @@ AnimateTitleCrystal: ; 10ef32
 
 ; Stop at y=6
 ; y is really from the bottom of the sprite, which is two tiles high
-	ld hl, wSprite01YCoord
+	ld hl, wVirtualOAMSprite00YCoord
 	ld a, [hl]
 	cp 6 + 2 * TILE_WIDTH
 	ret z
diff --git a/engine/trainer_card.asm b/engine/trainer_card.asm
index e9d9147f5..cd6705e5c 100755
--- a/engine/trainer_card.asm
+++ b/engine/trainer_card.asm
@@ -479,7 +479,7 @@ TrainerCard_Page2_3_OAMUpdate: ; 25448 (9:5448)
 	ld d, a
 	ld a, [de]
 	ld c, a
-	ld de, wSprite01
+	ld de, wVirtualOAMSprite00
 	ld b, NUM_JOHTO_BADGES
 .loop
 	srl c
diff --git a/engine/unown_puzzle.asm b/engine/unown_puzzle.asm
index 53d0b4d0c..dcad1ce20 100755
--- a/engine/unown_puzzle.asm
+++ b/engine/unown_puzzle.asm
@@ -549,7 +549,7 @@ RedrawUnownPuzzlePieces: ; e14d9
 	ld hl, .OAM_NotHoldingPiece
 
 .load
-	ld de, wSprite01
+	ld de, wVirtualOAMSprite00
 .loop
 	ld a, [hli]
 	cp -1
diff --git a/engine/unused_title.asm b/engine/unused_title.asm
index cb6ab808a..8e52a71bb 100644
--- a/engine/unused_title.asm
+++ b/engine/unused_title.asm
@@ -49,7 +49,7 @@ UnusedTitleScreen: ; 10c000
 	jr nz, .copy
 
 	ld hl, UnusedTitleFG_OAM
-	ld de, wSprite01
+	ld de, wVirtualOAMSprite00
 	ld bc, SPRITEOAMSTRUCT_LENGTH * NUM_SPRITE_OAM_STRUCTS
 	call CopyBytes