wOAMBuffer -> wShadowOAM (#370)

This commit is contained in:
Colton G. Rushton 2022-07-09 18:18:18 -03:00 committed by GitHub
parent b045ac4f16
commit cc46b0e510
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
29 changed files with 105 additions and 105 deletions

View file

@ -158,7 +158,7 @@ AnimateIntroNidorino:
jr AnimateIntroNidorino
UpdateIntroNidorinoOAM:
ld hl, wOAMBuffer
ld hl, wShadowOAM
ld a, [wIntroNidorinoBaseTile]
ld d, a
.loop
@ -177,7 +177,7 @@ UpdateIntroNidorinoOAM:
ret
InitIntroNidorinoOAM:
ld hl, wOAMBuffer
ld hl, wShadowOAM
ld d, 0
.loop
push bc

View file

@ -16,11 +16,11 @@ LoadShootingStarGraphics:
lb bc, BANK(FallingStar), (FallingStarEnd - FallingStar) / $10
call CopyVideoData
ld hl, GameFreakLogoOAMData
ld de, wOAMBuffer + $60
ld de, wShadowOAMSprite24
ld bc, GameFreakLogoOAMDataEnd - GameFreakLogoOAMData
call CopyData
ld hl, GameFreakShootingStarOAMData
ld de, wOAMBuffer
ld de, wShadowOAM
ld bc, GameFreakShootingStarOAMDataEnd - GameFreakShootingStarOAMData
jp CopyData
@ -30,7 +30,7 @@ AnimateShootingStar:
call PlaySound
; Move the big star down and left across the screen.
ld hl, wOAMBuffer
ld hl, wShadowOAM
lb bc, $a0, $4
.bigStarLoop
push hl
@ -60,7 +60,7 @@ AnimateShootingStar:
jr nz, .bigStarLoop
; Clear big star OAM.
ld hl, wOAMBuffer
ld hl, wShadowOAM
ld c, 4
ld de, 4
.clearOAMLoop
@ -83,7 +83,7 @@ AnimateShootingStar:
; Copy 24 instances of the small stars OAM data.
; Note that their coordinates put them off-screen.
ld de, wOAMBuffer
ld de, wShadowOAM
ld a, 24
.initSmallStarsOAMLoop
push af
@ -106,7 +106,7 @@ AnimateShootingStar:
ld d, a
push bc
push hl
ld hl, wOAMBuffer + $50
ld hl, wShadowOAMSprite20
ld c, 4
.smallStarsInnerLoop ; introduce new wave of 4 small stars OAM entries
ld a, [de]
@ -131,8 +131,8 @@ AnimateShootingStar:
push af
; shift the existing OAM entries down to make room for the next wave
ld hl, wOAMBuffer + $10
ld de, wOAMBuffer
ld hl, wShadowOAMSprite04
ld de, wShadowOAM
ld bc, $50
call CopyData
@ -186,7 +186,7 @@ SmallStarsEmptyWave:
MoveDownSmallStars:
ld b, 8
.loop
ld hl, wOAMBuffer + $5c
ld hl, wShadowOAMSprite23
ld a, [wMoveDownSmallStarsOAMCount]
ld de, -4
ld c, a

View file

@ -93,7 +93,7 @@ DisplayTitleScreen:
call DrawPlayerCharacter
; put a pokeball in the player's hand
ld hl, wOAMBuffer + $28
ld hl, wShadowOAMSprite10
ld a, $74
ld [hl], a
@ -322,7 +322,7 @@ DrawPlayerCharacter:
call ClearSprites
xor a
ld [wPlayerCharacterOAMTile], a
ld hl, wOAMBuffer
ld hl, wShadowOAM
lb de, $60, $5a
ld b, 7
.loop

View file

@ -115,6 +115,6 @@ GetTitleBallY:
pop de
and a
ret z
ld [wOAMBuffer + $28], a
ld [wShadowOAMSprite10YCoord], a
inc e
ret

View file

@ -315,7 +315,7 @@ Trade_AnimateBallEnteringLinkCable:
xor $1
ld [wLinkCableAnimBulgeToggle], a
add $7e
ld hl, wOAMBuffer + $02
ld hl, wShadowOAMSprite00TileID
ld de, 4
ld c, e
.cycleLinkCableBulgeTile
@ -599,7 +599,7 @@ Trade_AnimCircledMon:
ldh a, [rBGP]
xor $3c ; make link cable flash
ldh [rBGP], a
ld hl, wOAMBuffer + $02
ld hl, wShadowOAMSprite00TileID
ld de, $4
ld c, $14
.loop
@ -619,7 +619,7 @@ Trade_WriteCircledMonOAM:
call Trade_WriteCircleOAM
Trade_AddOffsetsToOAMCoords:
ld hl, wOAMBuffer
ld hl, wShadowOAM
ld c, $14
.loop
ld a, [wBaseCoordY]