aboutsummaryrefslogtreecommitdiffstats
path: root/engine/overworld/emotion_bubbles.asm
diff options
context:
space:
mode:
authorVortyne <104168801+Vortyne@users.noreply.github.com>2024-09-29 18:54:41 -0400
committerGitHub <noreply@github.com>2024-09-29 18:54:41 -0400
commit1aa3fb24ec2d5002dc7b755776f42e855b709970 (patch)
treef00a69c046526d3a4caeb0d92560975c594133d7 /engine/overworld/emotion_bubbles.asm
parentImplement .pic to .2bpp decompression (#470) (diff)
downloadpokeyellow-1aa3fb24ec2d5002dc7b755776f42e855b709970.tar.gz
pokeyellow-1aa3fb24ec2d5002dc7b755776f42e855b709970.tar.xz
pokeyellow-1aa3fb24ec2d5002dc7b755776f42e855b709970.zip
`dbsprite` is the wrong macro for `WriteOAMBlock` data (#472)
Diffstat (limited to 'engine/overworld/emotion_bubbles.asm')
-rw-r--r--engine/overworld/emotion_bubbles.asm11
1 files changed, 7 insertions, 4 deletions
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"