wOAMBuffer -> wShadowOAM (#370)

6 files changed, 30 insertions, 30 deletions

diff --git a/engine/overworld/cut.asm b/engine/overworld/cut.asm
index 6a92ccc0..4a337e8d 100644
--- a/engine/overworld/cut.asm
+++ b/engine/overworld/cut.asm
@@ -99,7 +99,7 @@ InitCutAnimOAM:
 	ld hl, vChars1 tile $7f
 	call LoadCutGrassAnimationTilePattern
 	call WriteCutOrBoulderDustAnimationOAMBlock
-	ld hl, wOAMBuffer + $93
+	ld hl, wShadowOAMSprite36Attributes
 	ld de, 4
 	ld a, $30
 	ld c, e
diff --git a/engine/overworld/cut2.asm b/engine/overworld/cut2.asm
index 3d4a5905..69c8cb13 100644
--- a/engine/overworld/cut2.asm
+++ b/engine/overworld/cut2.asm
@@ -5,12 +5,12 @@ AnimCut:
 	ld c, $8
 .cutTreeLoop
 	push bc
-	ld hl, wOAMBuffer + $91
+	ld hl, wShadowOAMSprite36XCoord
 	ld a, 1
 	ld [wCoordAdjustmentAmount], a
 	ld c, 2
 	call AdjustOAMBlockXPos2
-	ld hl, wOAMBuffer + $99
+	ld hl, wShadowOAMSprite38XCoord
 	ld a, -1
 	ld [wCoordAdjustmentAmount], a
 	ld c, 2
@@ -33,7 +33,7 @@ AnimCut:
 	ld c, $8
 	call AnimCutGrass_UpdateOAMEntries
 	call AnimCutGrass_SwapOAMEntries
-	ld hl, wOAMBuffer + $90
+	ld hl, wShadowOAMSprite36YCoord
 	ld a, 2
 	ld [wCoordAdjustmentAmount], a
 	ld c, 4
@@ -45,22 +45,22 @@ AnimCut:
 
 AnimCutGrass_UpdateOAMEntries:
 	push bc
-	ld hl, wOAMBuffer + $91
+	ld hl, wShadowOAMSprite36XCoord
 	ld a, 1
 	ld [wCoordAdjustmentAmount], a
 	ld c, 1
 	call AdjustOAMBlockXPos2
-	ld hl, wOAMBuffer + $95
+	ld hl, wShadowOAMSprite37XCoord
 	ld a, 2
 	ld [wCoordAdjustmentAmount], a
 	ld c, 1
 	call AdjustOAMBlockXPos2
-	ld hl, wOAMBuffer + $99
+	ld hl, wShadowOAMSprite38XCoord
 	ld a, -2
 	ld [wCoordAdjustmentAmount], a
 	ld c, 1
 	call AdjustOAMBlockXPos2
-	ld hl, wOAMBuffer + $9d
+	ld hl, wShadowOAMSprite39XCoord
 	ld a, -1
 	ld [wCoordAdjustmentAmount], a
 	ld c, 1
@@ -75,15 +75,15 @@ AnimCutGrass_UpdateOAMEntries:
 	ret
 
 AnimCutGrass_SwapOAMEntries:
-	ld hl, wOAMBuffer + $90
+	ld hl, wShadowOAMSprite36
 	ld de, wBuffer
 	ld bc, $8
 	call CopyData
-	ld hl, wOAMBuffer + $98
-	ld de, wOAMBuffer + $90
+	ld hl, wShadowOAMSprite38
+	ld de, wShadowOAMSprite36
 	ld bc, $8
 	call CopyData
 	ld hl, wBuffer
-	ld de, wOAMBuffer + $98
+	ld de, wShadowOAMSprite38
 	ld bc, $8
 	jp CopyData
diff --git a/engine/overworld/dust_smoke.asm b/engine/overworld/dust_smoke.asm
index c97b3e56..96dd364a 100644
--- a/engine/overworld/dust_smoke.asm
+++ b/engine/overworld/dust_smoke.asm
@@ -43,7 +43,7 @@ GetMoveBoulderDustFunctionPointer:
 	ld h, [hl]
 	ld l, a
 	push hl
-	ld hl, wOAMBuffer + $90
+	ld hl, wShadowOAMSprite36
 	ld d, $0
 	add hl, de
 	ld e, l
diff --git a/engine/overworld/emotion_bubbles.asm b/engine/overworld/emotion_bubbles.asm
index 5a41c226..84b13f17 100644
--- a/engine/overworld/emotion_bubbles.asm
+++ b/engine/overworld/emotion_bubbles.asm
@@ -17,11 +17,11 @@ EmotionBubble:
 	ld [wUpdateSpritesEnabled], a
 	ld a, [wd736]
 	bit 6, a ; are the last 4 OAM entries reserved for a shadow or fishing rod?
-	ld hl, wOAMBuffer + 4 * 35 + $3 ; $8f
-	ld de, wOAMBuffer + 4 * 39 + $3 ; $9f
+	ld hl, wShadowOAMSprite35Attributes
+	ld de, wShadowOAMSprite39Attributes
 	jr z, .next
-	ld hl, wOAMBuffer + 4 * 31 + $3 ; $7f
-	ld de, wOAMBuffer + 4 * 35 + $3 ; $8f
+	ld hl, wShadowOAMSprite31Attributes
+	ld de, wShadowOAMSprite35Attributes
 
 ; Copy OAM data 16 bytes forward to make room for emotion bubble OAM data at the
 ; start of the OAM buffer.
diff --git a/engine/overworld/healing_machine.asm b/engine/overworld/healing_machine.asm
index 63c8f9ea..e297762c 100644
--- a/engine/overworld/healing_machine.asm
+++ b/engine/overworld/healing_machine.asm
@@ -12,7 +12,7 @@ AnimateHealingMachine:
 	push af
 	ld a, $e0
 	ldh [rOBP1], a
-	ld hl, wOAMBuffer + $84
+	ld hl, wShadowOAMSprite33
 	ld de, PokeCenterOAMData
 	call CopyHealingMachineOAM
 	ld a, 4
diff --git a/engine/overworld/player_animations.asm b/engine/overworld/player_animations.asm
index 6a890cfd..bec59369 100644
--- a/engine/overworld/player_animations.asm
+++ b/engine/overworld/player_animations.asm
@@ -205,19 +205,19 @@ LeaveMapThroughHoleAnim:
 	ld a, $ff
 	ld [wUpdateSpritesEnabled], a ; disable UpdateSprites
 	; shift upper half of player's sprite down 8 pixels and hide lower half
-	ld a, [wOAMBuffer + 0 * 4 + 2]
-	ld [wOAMBuffer + 2 * 4 + 2], a
-	ld a, [wOAMBuffer + 1 * 4 + 2]
-	ld [wOAMBuffer + 3 * 4 + 2], a
+	ld a, [wShadowOAMSprite00TileID]
+	ld [wShadowOAMSprite02TileID], a
+	ld a, [wShadowOAMSprite01TileID]
+	ld [wShadowOAMSprite03TileID], a
 	ld a, $a0
-	ld [wOAMBuffer + 0 * 4], a
-	ld [wOAMBuffer + 1 * 4], a
+	ld [wShadowOAMSprite00YCoord], a
+	ld [wShadowOAMSprite01YCoord], a
 	ld c, 2
 	call DelayFrames
 	; hide upper half of player's sprite
 	ld a, $a0
-	ld [wOAMBuffer + 2 * 4], a
-	ld [wOAMBuffer + 3 * 4], a
+	ld [wShadowOAMSprite02YCoord], a
+	ld [wShadowOAMSprite03YCoord], a
 	call GBFadeOutToWhite
 	ld a, $1
 	ld [wUpdateSpritesEnabled], a ; enable UpdateSprites
@@ -392,7 +392,7 @@ FishingAnim:
 	ld b, $0
 	ld hl, FishingRodOAM
 	add hl, bc
-	ld de, wOAMBuffer + $9c
+	ld de, wShadowOAMSprite39
 	ld bc, $4
 	call CopyData
 	ld c, 100
@@ -412,7 +412,7 @@ FishingAnim:
 .loop
 	ld hl, wSpritePlayerStateData1YPixels
 	call .ShakePlayerSprite
-	ld hl, wOAMBuffer + $9c
+	ld hl, wShadowOAMSprite39
 	call .ShakePlayerSprite
 	call Delay3
 	dec b
@@ -424,7 +424,7 @@ FishingAnim:
 	cp SPRITE_FACING_UP
 	jr nz, .skipHidingFishingRod
 	ld a, $a0
-	ld [wOAMBuffer + $9c], a
+	ld [wShadowOAMSprite39YCoord], a
 
 .skipHidingFishingRod
 	ld hl, wEmotionBubbleSpriteIndex
@@ -438,7 +438,7 @@ FishingAnim:
 	cp SPRITE_FACING_UP
 	jr nz, .skipUnhidingFishingRod
 	ld a, $44
-	ld [wOAMBuffer + $9c], a
+	ld [wShadowOAMSprite39YCoord], a
 
 .skipUnhidingFishingRod
 	ld hl, ItsABiteText