aboutsummaryrefslogtreecommitdiffstats
path: root/engine/overworld/emotion_bubbles.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-06-27 16:27:30 -0400
committerRangi <35663410+Rangi42@users.noreply.github.com>2020-06-27 21:43:32 -0400
commitd5089d3c623e2b147b035cf12569810d604bf47d (patch)
tree9d64a8943a11fef8a2b1afe0c4c8eda29e4ecfe1 /engine/overworld/emotion_bubbles.asm
parentSeparate maps.asm, pics.asm, sprites.asm, and tilesets.asm from main.asm (#251) (diff)
downloadpokeyellow-d5089d3c623e2b147b035cf12569810d604bf47d.tar.gz
pokeyellow-d5089d3c623e2b147b035cf12569810d604bf47d.tar.xz
pokeyellow-d5089d3c623e2b147b035cf12569810d604bf47d.zip
Organize gfx/
Diffstat (limited to 'engine/overworld/emotion_bubbles.asm')
-rwxr-xr-xengine/overworld/emotion_bubbles.asm10
1 files changed, 6 insertions, 4 deletions
diff --git a/engine/overworld/emotion_bubbles.asm b/engine/overworld/emotion_bubbles.asm
index ac4276bd..20309fc1 100755
--- a/engine/overworld/emotion_bubbles.asm
+++ b/engine/overworld/emotion_bubbles.asm
@@ -62,13 +62,15 @@ EmotionBubble:
jp UpdateSprites
EmotionBubblesPointerTable:
- dw EmotionBubbles
- dw EmotionBubbles + $40
- dw EmotionBubbles + $80
+ dw ShockEmote
+ dw QuestionEmote
+ dw HappyEmote
EmotionBubblesOAM:
db $F8,$00,$F9,$00
db $FA,$00,$FB,$00
EmotionBubbles:
- INCBIN "gfx/emotion_bubbles.2bpp"
+ShockEmote: INCBIN "gfx/emotes/shock.2bpp"
+QuestionEmote: INCBIN "gfx/emotes/question.2bpp"
+HappyEmote: INCBIN "gfx/emotes/happy.2bpp"