summaryrefslogtreecommitdiff
path: root/data/sprites/emotes.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/sprites/emotes.asm')
-rw-r--r--data/sprites/emotes.asm29
1 files changed, 14 insertions, 15 deletions
diff --git a/data/sprites/emotes.asm b/data/sprites/emotes.asm
index 2e25e52b5..2371c4624 100644
--- a/data/sprites/emotes.asm
+++ b/data/sprites/emotes.asm
@@ -2,21 +2,20 @@ emote: MACRO
; graphics pointer, length, starting tile
dw \1
db \2 tiles, BANK(\1)
- dw vTiles1 tile \3
+ dw vTiles0 tile \3
ENDM
-Emotes: ; 144d
+Emotes:
; entries correspond to EMOTE_* constants
- emote ShockEmote, 4, $78
- emote QuestionEmote, 4, $78
- emote HappyEmote, 4, $78
- emote SadEmote, 4, $78
- emote HeartEmote, 4, $78
- emote BoltEmote, 4, $78
- emote SleepEmote, 4, $78
- emote FishEmote, 4, $78
- emote JumpShadowGFX, 1, $7c
- emote FishingRodGFX, 2, $7c
- emote BoulderDustGFX, 2, $7e
- emote GrassRustleGFX, 1, $7e
-; 14495
+ emote ShockEmote, 4, $f8
+ emote QuestionEmote, 4, $f8
+ emote HappyEmote, 4, $f8
+ emote SadEmote, 4, $f8
+ emote HeartEmote, 4, $f8
+ emote BoltEmote, 4, $f8
+ emote SleepEmote, 4, $f8
+ emote FishEmote, 4, $f8
+ emote JumpShadowGFX, 1, $fc
+ emote FishingRodGFX, 2, $fc
+ emote BoulderDustGFX, 2, $fe
+ emote GrassRustleGFX, 1, $fe