From 0b45e2e846c8b2feb7d2c4c4ebb854db07cf06fd Mon Sep 17 00:00:00 2001
From: luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com>
Date: Tue, 30 Jan 2018 14:52:46 -0500
Subject: Fix wVirtualOAM labels, part 2.

---
 engine/events/celebi.asm            |  6 +++---
 engine/events/field_moves.asm       | 10 +++++-----
 engine/events/heal_machine_anim.asm |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'engine/events')

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
-- 
cgit v1.2.3