diff options
| author | dannye <33dannye@gmail.com> | 2025-07-02 21:15:13 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2025-07-02 21:15:13 -0500 |
| commit | ca019eac8fd96559f4d4e712f0b53e95492e5dcb (patch) | |
| tree | 209a500e3bda6c2109e5acec60448e9e52f8c2af /engine/gfx/animated_objects.asm | |
| parent | Use more ldpikacry (diff) | |
| parent | Require RGBDS 0.9.3 for its DMG palette specs (#513) (diff) | |
| download | pokeyellow-ca019eac8fd96559f4d4e712f0b53e95492e5dcb.tar.gz pokeyellow-ca019eac8fd96559f4d4e712f0b53e95492e5dcb.tar.xz pokeyellow-ca019eac8fd96559f4d4e712f0b53e95492e5dcb.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'engine/gfx/animated_objects.asm')
| -rw-r--r-- | engine/gfx/animated_objects.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/gfx/animated_objects.asm b/engine/gfx/animated_objects.asm index 0a71f59d..83d36aa9 100644 --- a/engine/gfx/animated_objects.asm +++ b/engine/gfx/animated_objects.asm @@ -227,7 +227,7 @@ GetCurrentAnimatedObjectTileYCoordinate: push hl ld a, [hl] ld hl, wCurAnimatedObjectOAMAttributes - bit OAM_Y_FLIP, [hl] + bit B_OAM_YFLIP, [hl] jr z, .no_flip add $8 xor $ff @@ -240,7 +240,7 @@ GetCurrentAnimatedObjectTileXCoordinate: push hl ld a, [hl] ld hl, wCurAnimatedObjectOAMAttributes - bit OAM_X_FLIP, [hl] + bit B_OAM_XFLIP, [hl] jr z, .no_flip add $8 xor $ff @@ -254,12 +254,12 @@ SetCurrentAnimatedObjectOAMAttributes: ld b, a ld a, [hl] xor b - and OAM_HFLIP | OAM_VFLIP | OAM_BEHIND_BG + and OAM_XFLIP | OAM_YFLIP | OAM_PRIO ld b, a ld a, [hl] - and OAM_OBP1 + and OAM_PAL1 or b - bit OAM_OBP_NUM, a + bit B_OAM_PAL1, a ret z or OAM_HIGH_PALS ret |