diff options
| author | Vortyne <104168801+Vortyne@users.noreply.github.com> | 2024-09-29 18:54:41 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-29 18:54:41 -0400 |
| commit | 1aa3fb24ec2d5002dc7b755776f42e855b709970 (patch) | |
| tree | f00a69c046526d3a4caeb0d92560975c594133d7 /engine/overworld | |
| parent | Implement .pic to .2bpp decompression (#470) (diff) | |
| download | pokeyellow-1aa3fb24ec2d5002dc7b755776f42e855b709970.tar.gz pokeyellow-1aa3fb24ec2d5002dc7b755776f42e855b709970.tar.xz pokeyellow-1aa3fb24ec2d5002dc7b755776f42e855b709970.zip | |
`dbsprite` is the wrong macro for `WriteOAMBlock` data (#472)
Diffstat (limited to 'engine/overworld')
| -rw-r--r-- | engine/overworld/cut.asm | 11 | ||||
| -rw-r--r-- | engine/overworld/emotion_bubbles.asm | 11 | ||||
| -rw-r--r-- | engine/overworld/ledges.asm | 11 |
3 files changed, 21 insertions, 12 deletions
diff --git a/engine/overworld/cut.asm b/engine/overworld/cut.asm index 3e514672..2f839f8c 100644 --- a/engine/overworld/cut.asm +++ b/engine/overworld/cut.asm @@ -119,12 +119,15 @@ LoadCutGrassAnimationTilePattern: WriteCutOrBoulderDustAnimationOAMBlock: call GetCutOrBoulderDustAnimationOffsets ld a, $9 - ld de, CutOrBoulderDustAnimationTilesAndAttributes + ld de, .OAMBlock jp WriteOAMBlock -CutOrBoulderDustAnimationTilesAndAttributes: - dbsprite 2, -1, 0, 4, $fd, OAM_OBP1 - dbsprite 2, -1, 0, 6, $ff, OAM_OBP1 +.OAMBlock: +; tile ID, attributes + db $fc, OAM_OBP1 + db $fd, OAM_OBP1 + db $fe, OAM_OBP1 + db $ff, OAM_OBP1 GetCutOrBoulderDustAnimationOffsets: ld hl, wSpritePlayerStateData1YPixels diff --git a/engine/overworld/emotion_bubbles.asm b/engine/overworld/emotion_bubbles.asm index d25d5ff1..d44a12ce 100644 --- a/engine/overworld/emotion_bubbles.asm +++ b/engine/overworld/emotion_bubbles.asm @@ -51,7 +51,7 @@ EmotionBubble: add $8 ld c, a - ld de, EmotionBubblesOAM + ld de, EmotionBubblesOAMBlock xor a call WriteOAMBlock ld c, 60 @@ -67,9 +67,12 @@ EmotionBubblesPointerTable: dw QuestionEmote dw HappyEmote -EmotionBubblesOAM: - dbsprite 0, -1, 0, 0, $f9, 0 - dbsprite 0, -1, 0, 2, $fb, 0 +EmotionBubblesOAMBlock: +; tile ID, attributes + db $f8, 0 + db $f9, 0 + db $fa, 0 + db $fb, 0 EmotionBubbles: ShockEmote: INCBIN "gfx/emotes/shock.2bpp" diff --git a/engine/overworld/ledges.asm b/engine/overworld/ledges.asm index 73733e15..d88cef76 100644 --- a/engine/overworld/ledges.asm +++ b/engine/overworld/ledges.asm @@ -63,7 +63,7 @@ LoadHoppingShadowOAM: call CopyVideoDataDouble ld a, $9 lb bc, $54, $48 ; b, c = y, x coordinates of shadow - ld de, LedgeHoppingShadowOAM + ld de, LedgeHoppingShadowOAMBlock call WriteOAMBlock ret @@ -71,6 +71,9 @@ LedgeHoppingShadow: INCBIN "gfx/overworld/shadow.1bpp" LedgeHoppingShadowEnd: -LedgeHoppingShadowOAM: - dbsprite 2, -1, 0, 7, $ff, OAM_HFLIP - dbsprite 8, -1, 0, 7, $ff, OAM_HFLIP | OAM_VFLIP +LedgeHoppingShadowOAMBlock: +; tile ID, attributes + db $ff, OAM_OBP1 + db $ff, OAM_HFLIP + db $ff, OAM_VFLIP + db $ff, OAM_HFLIP | OAM_VFLIP |