wVirtualOAM -> wShadowOAM and hTransferVirtualOAM -> hTransferShadowOAM (#971)

This commit is contained in:
Colton G. Rushton
2022-07-09 18:18:22 -03:00
committed by GitHub
parent ef9b9bb437
commit 145d8dd5c2
37 changed files with 113 additions and 113 deletions

View File

@@ -470,15 +470,15 @@ GetMapMusic_MaybeSpecial::
PlaceBCDNumberSprite:: ; unreferenced
; Places a BCD number at the upper center of the screen.
ld a, 4 * TILE_WIDTH
ld [wVirtualOAMSprite38YCoord], a
ld [wVirtualOAMSprite39YCoord], a
ld [wShadowOAMSprite38YCoord], a
ld [wShadowOAMSprite39YCoord], a
ld a, 10 * TILE_WIDTH
ld [wVirtualOAMSprite38XCoord], a
ld [wShadowOAMSprite38XCoord], a
ld a, 11 * TILE_WIDTH
ld [wVirtualOAMSprite39XCoord], a
ld [wShadowOAMSprite39XCoord], a
xor a
ld [wVirtualOAMSprite38Attributes], a
ld [wVirtualOAMSprite39Attributes], a
ld [wShadowOAMSprite38Attributes], a
ld [wShadowOAMSprite39Attributes], a
ld a, [wUnusedBCDNumber]
cp 100
jr nc, .max
@@ -488,17 +488,17 @@ PlaceBCDNumberSprite:: ; unreferenced
swap a
and $f
add "0"
ld [wVirtualOAMSprite38TileID], a
ld [wShadowOAMSprite38TileID], a
ld a, b
and $f
add "0"
ld [wVirtualOAMSprite39TileID], a
ld [wShadowOAMSprite39TileID], a
ret
.max
ld a, "9"
ld [wVirtualOAMSprite38TileID], a
ld [wVirtualOAMSprite39TileID], a
ld [wShadowOAMSprite38TileID], a
ld [wShadowOAMSprite39TileID], a
ret
CheckSFX::

View File

@@ -1,7 +1,7 @@
ClearSprites::
; Erase OAM data
ld hl, wVirtualOAM
ld b, wVirtualOAMEnd - wVirtualOAM
ld hl, wShadowOAM
ld b, wShadowOAMEnd - wShadowOAM
xor a
.loop
ld [hli], a
@@ -11,7 +11,7 @@ ClearSprites::
HideSprites::
; Set all OAM y-positions to 160 to hide them offscreen
ld hl, wVirtualOAMSprite00YCoord
ld hl, wShadowOAMSprite00YCoord
ld de, SPRITEOAMSTRUCT_LENGTH
ld b, NUM_SPRITE_OAM_STRUCTS
ld a, SCREEN_WIDTH_PX

View File

@@ -109,7 +109,7 @@ VBlank0::
ldh a, [hOAMUpdate]
and a
jr nz, .done_oam
call hTransferVirtualOAM
call hTransferShadowOAM
.done_oam
; vblank-sensitive operations are done
@@ -183,7 +183,7 @@ VBlank1::
call UpdateBGMap
call Serve2bppRequest_VBlank
call hTransferVirtualOAM
call hTransferShadowOAM
.done
xor a
@@ -269,7 +269,7 @@ VBlank3::
call UpdateBGMap
call Serve2bppRequest_VBlank
call hTransferVirtualOAM
call hTransferShadowOAM
.done
xor a
@@ -323,7 +323,7 @@ VBlank4::
call UpdateBGMap
call Serve2bppRequest
call hTransferVirtualOAM
call hTransferShadowOAM
call UpdateJoypad