diff options
| author | dannye <33dannye@gmail.com> | 2023-11-21 20:56:28 -0600 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2023-11-21 20:56:28 -0600 |
| commit | 04f7f7f506a1dbb877e4678601261e8157fd0e57 (patch) | |
| tree | bfe62d3872c5f031ee40df9488910bd58b0e1b15 /engine/gfx | |
| parent | Extend tools/pcm.c to allow decoding .pcm to .wav (diff) | |
| parent | Fix some map text constants (diff) | |
| download | pokeyellow-04f7f7f506a1dbb877e4678601261e8157fd0e57.tar.gz pokeyellow-04f7f7f506a1dbb877e4678601261e8157fd0e57.tar.xz pokeyellow-04f7f7f506a1dbb877e4678601261e8157fd0e57.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'engine/gfx')
| -rw-r--r-- | engine/gfx/sprite_oam.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/gfx/sprite_oam.asm b/engine/gfx/sprite_oam.asm index 406d44fd..4660eaf6 100644 --- a/engine/gfx/sprite_oam.asm +++ b/engine/gfx/sprite_oam.asm @@ -30,7 +30,7 @@ PrepareOAMData:: inc e inc e ld a, [de] ; [x#SPRITESTATEDATA1_IMAGEINDEX] - ld [wd5cd], a + ld [wSavedSpriteImageIndex], a cp $ff ; off-screen (don't draw) jr nz, .visible @@ -79,7 +79,7 @@ PrepareOAMData:: jr nc, .asm_4a41 .hidden call Func_4a7b - ld [wd5cd], a + ld [wSavedSpriteImageIndex], a ldh a, [hOAMBufferOffset] ld e, a @@ -101,7 +101,7 @@ PrepareOAMData:: ld [de], a inc hl inc e - ld a, [wd5cd] + ld a, [wSavedSpriteImageIndex] add [hl] cp $80 jr c, .asm_4a1c @@ -188,7 +188,7 @@ GetSpriteScreenXY: Func_4a7b: push bc - ld a, [wd5cd] ; temp copy of [x#SPRITESTATEDATA1_IMAGEINDEX] + ld a, [wSavedSpriteImageIndex] swap a ; high nybble determines sprite used (0 is always player sprite, next are some npcs) and $f |