From ea2feab376fe2cbc8aeb7ac33afaa6f5b96ca687 Mon Sep 17 00:00:00 2001 From: Vortyne <104168801+Vortyne@users.noreply.github.com> Date: Thu, 26 Sep 2024 07:38:46 -0400 Subject: [PATCH] Wrong macro used for EmotionBubblesOAM It's actually just the last 2 bytes of 4 OAM entries, see WriteOAMBlock for when it is used. BC is pre-loaded with the x and y pixels, whereas de (emotionBubblesOAM) is the tile id and attributes only. Not sure if there's a specific macro for this type of declaration. --- engine/overworld/emotion_bubbles.asm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/engine/overworld/emotion_bubbles.asm b/engine/overworld/emotion_bubbles.asm index d25d5ff19e..d8271b4fc4 100644 --- a/engine/overworld/emotion_bubbles.asm +++ b/engine/overworld/emotion_bubbles.asm @@ -67,9 +67,12 @@ EmotionBubblesPointerTable: dw QuestionEmote dw HappyEmote +; tile ID and attribute EmotionBubblesOAM: - dbsprite 0, -1, 0, 0, $f9, 0 - dbsprite 0, -1, 0, 2, $fb, 0 + db $f8, 0 + db $f9, 0 + db $fa, 0 + db $fb, 0 EmotionBubbles: ShockEmote: INCBIN "gfx/emotes/shock.2bpp"