wOAMBuffer -> wShadowOAM (#95)

constants/gfx_constants.asm

@@ -22,7 +22,7 @@ DEF HP_BAR_GREEN  EQU 0
 DEF HP_BAR_YELLOW EQU 1
 DEF HP_BAR_RED    EQU 2
 
-; wOAMBuffer
+; wShadowOAM
 DEF NUM_SPRITE_OAM_STRUCTS EQU 40
 
 ; hAutoBGTransferEnabled

engine/battle/animations.asm

@@ -174,7 +174,7 @@ DrawFrameBlock:
 	jr z, .resetFrameBlockDestAddr
 	call AnimationCleanOAM
 .resetFrameBlockDestAddr
-	ld hl, wOAMBuffer ; OAM buffer
+	ld hl, wShadowOAM
 	ld a, l
 	ld [wFBDestAddr + 1], a
 	ld a, h
@@ -622,7 +622,7 @@ PlaySubanimation:
 	call GetMoveSound
 	call PlaySound
 .skipPlayingSound
-	ld hl, wOAMBuffer ; base address of OAM buffer
+	ld hl, wShadowOAM
 	ld a, l
 	ld [wFBDestAddr + 1], a
 	ld a, h
@@ -895,7 +895,7 @@ TradeShakePokeball:
 ; if it's the end of the animation, make the ball jump up
 	ld de, BallMoveDistances1
 .loop
-	ld hl, wOAMBuffer ; OAM buffer
+	ld hl, wShadowOAM
 	ld bc, 4
 .innerLoop
 	ld a, [de]
@@ -925,7 +925,7 @@ BallMoveDistances1:
 TradeJumpPokeball:
 	ld de, BallMoveDistances2
 .loop
-	ld hl, wOAMBuffer ; OAM buffer
+	ld hl, wShadowOAM
 	ld bc, 4
 .innerLoop
 	ld a, [de]
@@ -965,8 +965,8 @@ BallMoveDistances2:
 ; this function copies the current musical note graphic
 ; so that there are two musical notes flying towards the defending pokemon
 DoGrowlSpecialEffects:
-	ld hl, wOAMBuffer ; OAM buffer
-	ld de, wOAMBuffer + $10
+	ld hl, wShadowOAM
+	ld de, wShadowOAMSprite04
 	ld bc, $10
 	call CopyData ; copy the musical note graphic
 	ld a, [wSubAnimCounter]
@@ -1180,7 +1180,7 @@ AnimationWaterDropletsEverywhere:
 	ret
 
 _AnimationWaterDroplets:
-	ld hl, wOAMBuffer
+	ld hl, wShadowOAM
 .loop
 	ld a, $1
 	ld [wdef5], a
@@ -1323,7 +1323,7 @@ ShakeEnemyHUD_WritePlayerMonPicOAM:
 	ld [wBaseCoordX], a
 	ld a, $30
 	ld [wBaseCoordY], a
-	ld hl, wOAMBuffer
+	ld hl, wShadowOAM
 	ld d, 0
 	ld c, 7
 .loop
@@ -1571,7 +1571,7 @@ AnimationSpiralBallsInward:
 .loop
 	push hl
 	ld c, 3
-	ld de, wOAMBuffer
+	ld de, wShadowOAM
 .innerLoop
 	ld a, [hl]
 	cp $ff
@@ -1723,7 +1723,7 @@ _AnimationShootBallsUpward:
 	call LoadAnimationTileset
 	pop bc
 	ld d, $7a ; ball tile
-	ld hl, wOAMBuffer
+	ld hl, wShadowOAM
 	push bc
 	ld a, [wBaseCoordY]
 	ld e, a
@@ -1737,7 +1737,7 @@ _AnimationShootBallsUpward:
 	ld [wNumShootingBalls], a
 .loop
 	push bc
-	ld hl, wOAMBuffer
+	ld hl, wShadowOAM
 .innerLoop
 	ld a, [wBaseCoordY]
 	add 8
@@ -2240,7 +2240,7 @@ InitMultipleObjectsOAM:
 	xor a
 	ld e, a
 	ld [wBaseCoordX], a
-	ld hl, wOAMBuffer
+	ld hl, wShadowOAM
 .loop
 	call BattleAnimWriteOAMEntry
 	dec c
@@ -2494,7 +2494,7 @@ AnimationFallingObjects:
 	call InitMultipleObjectsOAM
 	call FallingObjects_InitXCoords
 	call FallingObjects_InitMovementData
-	ld hl, wOAMBuffer
+	ld hl, wShadowOAM
 	ld [hl], 0
 .loop
 	ld hl, wFallingObjectsMovementData
@@ -2521,7 +2521,7 @@ AnimationFallingObjects:
 	dec c
 	jr nz, .innerLoop
 	call Delay3
-	ld hl, wOAMBuffer
+	ld hl, wShadowOAM
 	ld a, [hl] ; Y
 	cp 104 ; has the top falling object reached 104 yet?
 	jr nz, .loop ; keep moving the falling objects down until it does
@@ -2530,7 +2530,7 @@ AnimationFallingObjects:
 FallingObjects_UpdateOAMEntry:
 ; Increases Y by 2 pixels and adjusts X and X flip based on the falling object's
 ; movement byte.
-	ld hl, wOAMBuffer
+	ld hl, wShadowOAM
 	add hl, de
 	ld a, $1
 	ld [wdef5], a
@@ -2616,7 +2616,7 @@ FallingObjects_UpdateMovementByte:
 	ret
 
 FallingObjects_InitXCoords:
-	ld hl, wOAMBuffer + $01
+	ld hl, wShadowOAMSprite00XCoord
 	ld de, FallingObjects_InitialXCoords
 	ld a, [wNumFallingObjects]
 	ld c, a

engine/battle/battle_transitions.asm

@@ -26,7 +26,7 @@ BattleTransition:
 	jr nz, .loop1
 
 ; Clear OAM except for the blocks used by the player and enemy trainer sprites.
-	ld hl, wOAMBuffer + $10
+	ld hl, wShadowOAMSprite04
 	ld c, 9
 .loop2
 	ld a, b

engine/battle/core.asm

@@ -108,7 +108,7 @@ SlidePlayerAndEnemySilhouettesOnScreen:
 ; instead, the enemy pic is part of the background and uses the scroll register, while the player's head is a sprite and is slid by changing its X coordinates in a loop
 SlidePlayerHeadLeft:
 	push bc
-	ld hl, wOAMBuffer + $01
+	ld hl, wShadowOAMSprite00XCoord
 	ld c, $15 ; number of OAM entries
 	ld de, $4 ; size of OAM entry
 .loop
@@ -6511,7 +6511,7 @@ LoadPlayerBackPic:
 	ASSERT BANK(RedPicBack) == BANK(ProfOakPicBack)
 	call UncompressSpriteFromDE
 	predef ScaleSpriteByTwo
-	ld hl, wOAMBuffer
+	ld hl, wShadowOAM
 	xor a
 	ldh [hOAMTile], a ; initial tile number
 	ld b, $7 ; 7 columns

engine/battle/draw_hud_pokeball_gfx.asm

@@ -29,7 +29,7 @@ SetupOwnPartyPokeballs:
 	ld [wHUDPokeballGfxOffsetX], a
 	xor a
 	ld [wdef5], a
-	ld hl, wOAMBuffer
+	ld hl, wShadowOAM
 	jp WritePokeballOAMData
 
 SetupEnemyPartyPokeballs:
@@ -45,7 +45,7 @@ SetupEnemyPartyPokeballs:
 	ld [wHUDPokeballGfxOffsetX], a
 	ld a, $1
 	ld [wdef5], a
-	ld hl, wOAMBuffer + PARTY_LENGTH * 4
+	ld hl, wShadowOAMSprite06
 	jp WritePokeballOAMData
 
 SetupPokeballs:
@@ -180,7 +180,7 @@ SetupPlayerAndEnemyPokeballs:
 	ld [wHUDPokeballGfxOffsetX], a
 	xor a
 	ld [wdef5], a
-	ld hl, wOAMBuffer
+	ld hl, wShadowOAM
 	call WritePokeballOAMData
 	ld hl, wEnemyMons
 	ld de, wEnemyPartyCount
@@ -191,7 +191,7 @@ SetupPlayerAndEnemyPokeballs:
 	ld [hl], $68
 	ld a, $1
 	ld [wdef5], a
-	ld hl, wOAMBuffer + $18
+	ld hl, wShadowOAMSprite06
 	jp WritePokeballOAMData
 
 ; four tiles: pokeball, black pokeball (status ailment), crossed out pokeball (fainted) and pokeball slot (no mon)

engine/battle/ghost_marowak_anim.asm

@@ -61,7 +61,7 @@ CopyMonPicFromBGToSpriteVRAM:
 	ld [wBaseCoordY], a
 	ld a, $70
 	ld [wBaseCoordX], a
-	ld hl, wOAMBuffer
+	ld hl, wShadowOAM
 	lb bc, 6, 6
 	ld d, $8
 .oamLoop

engine/gfx/animated_objects.asm

@@ -28,10 +28,10 @@ RunObjectAnimations:
 	jr nz, .loop
 	ld a, [wCurrentAnimatedObjectOAMBufferOffset]
 	ld l, a
-	ld h, HIGH(wOAMBuffer)
+	ld h, HIGH(wShadowOAM)
 .deinit_unused_oam_loop
 	ld a, l
-	cp LOW(wOAMBufferEnd)
+	cp LOW(wShadowOAMEnd)
 	jr nc, .quit
 	xor a
 	ld [hli], a
@@ -158,7 +158,7 @@ UpdateCurrentAnimatedObjectFrame:
 	push bc
 	ld a, [wCurrentAnimatedObjectOAMBufferOffset]
 	ld e, a
-	ld d, HIGH(wOAMBuffer)
+	ld d, HIGH(wShadowOAM)
 	ld a, [hli]
 	ld c, a
 .loop
@@ -205,7 +205,7 @@ UpdateCurrentAnimatedObjectFrame:
 	inc de
 	ld a, e
 	ld [wCurrentAnimatedObjectOAMBufferOffset], a
-	cp LOW(wOAMBufferEnd)
+	cp LOW(wShadowOAMEnd)
 	jr nc, .oam_is_full
 	dec c
 	jr nz, .loop

engine/gfx/mon_icons.asm

@@ -43,15 +43,15 @@ GetAnimationSpeed:
 .resetSprites
 	push bc
 	ld hl, wMonPartySpritesSavedOAM
-	ld de, wOAMBuffer
+	ld de, wShadowOAM
 	ld bc, $60
 	call CopyData
 	pop bc
 	xor a
 	jr .incTimer
 .animateSprite
 	push bc
-	ld hl, wOAMBuffer + $02 ; OAM tile id
+	ld hl, wShadowOAMSprite00TileID
 	ld bc, $10
 	ld a, [wCurrentMenuItem]
 	call AddNTimes
@@ -186,7 +186,7 @@ WriteMonPartySpriteOAMByPartyIndex:
 	ret
 
 .asm_7191f
-	ld hl, wOAMBuffer
+	ld hl, wShadowOAM
 	ld de, wMonPartySpritesSavedOAM
 	ld bc, $60
 	call CopyData
@@ -248,7 +248,7 @@ WriteMonPartySpriteOAM:
 ; make a copy at wMonPartySpritesSavedOAM.
 	push af
 	ld c, $10
-	ld h, HIGH(wOAMBuffer)
+	ld h, HIGH(wShadowOAM)
 	ldh a, [hPartyMonIndex]
 	swap a
 	ld l, a
@@ -264,7 +264,7 @@ WriteMonPartySpriteOAM:
 ; Make a copy of the OAM buffer with the first animation frame written so that
 ; we can flip back to it from the second frame by copying it back.
 .makeCopy
-	ld hl, wOAMBuffer
+	ld hl, wShadowOAM
 	ld de, wMonPartySpritesSavedOAM
 	ld bc, $60
 	jp CopyData

engine/gfx/oam_dma.asm

@@ -16,7 +16,7 @@ DMARoutine:
 LOAD "OAM DMA", HRAM
 hDMARoutine::
 	; initiate DMA
-	ld a, HIGH(wOAMBuffer)
+	ld a, HIGH(wShadowOAM)
 	ldh [rDMA], a
 	; wait for DMA to finish
 	ld a, $28

engine/gfx/sprite_oam.asm

@@ -1,6 +1,6 @@
 PrepareOAMData::
 ; Determine OAM data for currently visible
-; sprites and write it to wOAMBuffer.
+; sprites and write it to wShadowOAM.
 ; Yellow code has been changed to use registers more efficiently
 ; as well as tweaking the code to show gbc palettes
 
@@ -83,7 +83,7 @@ PrepareOAMData::
 	ldh a, [hOAMBufferOffset]
 
 	ld e, a
-	ld d, HIGH(wOAMBuffer)
+	ld d, HIGH(wShadowOAM)
 
 .tileLoop
 	ld a, [hli]
@@ -153,7 +153,7 @@ PrepareOAMData::
 	cp c
 	ret nc
 	ld l, a
-	ld h, HIGH(wOAMBuffer)
+	ld h, HIGH(wShadowOAM)
 	ld a, c
 	ld de, $4 ; entry size
 	ld b, $a0

engine/items/item_effects.asm

@@ -1295,7 +1295,7 @@ ItemUseMedicine:
 	xor a
 	ld [wBattleMonStatus], a ; remove the status ailment in the in-battle pokemon data
 .calculateHPBarCoords
-	ld hl, wOAMBuffer + $90
+	ld hl, wShadowOAMSprite36
 	ld bc, 2 * SCREEN_WIDTH
 	inc d
 .calculateHPBarCoordsLoop