diff options
| author | Colton G. Rushton <colton51919@gmail.com> | 2022-07-09 18:18:20 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-09 17:18:20 -0400 |
| commit | c0085ea1b21a171ef9f4c73ad28a5306558f2cc3 (patch) | |
| tree | 311a4a64f13395e2f711b46f8b13bbc1b5ff849e /engine/gfx | |
| parent | Fix typo: HeatButt -> HeadButt (diff) | |
| download | pokeyellow-c0085ea1b21a171ef9f4c73ad28a5306558f2cc3.tar.gz pokeyellow-c0085ea1b21a171ef9f4c73ad28a5306558f2cc3.tar.xz pokeyellow-c0085ea1b21a171ef9f4c73ad28a5306558f2cc3.zip | |
wOAMBuffer -> wShadowOAM (#95)
Diffstat (limited to 'engine/gfx')
| -rw-r--r-- | engine/gfx/animated_objects.asm | 8 | ||||
| -rw-r--r-- | engine/gfx/mon_icons.asm | 10 | ||||
| -rw-r--r-- | engine/gfx/oam_dma.asm | 2 | ||||
| -rw-r--r-- | engine/gfx/sprite_oam.asm | 6 |
4 files changed, 13 insertions, 13 deletions
diff --git a/engine/gfx/animated_objects.asm b/engine/gfx/animated_objects.asm index 971af6b5..208a2f85 100644 --- a/engine/gfx/animated_objects.asm +++ b/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 diff --git a/engine/gfx/mon_icons.asm b/engine/gfx/mon_icons.asm index cb5534d0..dce62c9a 100644 --- a/engine/gfx/mon_icons.asm +++ b/engine/gfx/mon_icons.asm @@ -43,7 +43,7 @@ GetAnimationSpeed: .resetSprites push bc ld hl, wMonPartySpritesSavedOAM - ld de, wOAMBuffer + ld de, wShadowOAM ld bc, $60 call CopyData pop bc @@ -51,7 +51,7 @@ GetAnimationSpeed: 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 diff --git a/engine/gfx/oam_dma.asm b/engine/gfx/oam_dma.asm index fe93e90d..11e52694 100644 --- a/engine/gfx/oam_dma.asm +++ b/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 diff --git a/engine/gfx/sprite_oam.asm b/engine/gfx/sprite_oam.asm index 3ffd995f..406d44fd 100644 --- a/engine/gfx/sprite_oam.asm +++ b/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 |