diff options
| author | yenatch <yenatch@gmail.com> | 2018-07-17 18:16:12 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-17 18:16:12 -0400 |
| commit | 3e14c1f26e91b1fc1d18eed389518ae8454e938f (patch) | |
| tree | 64db6e9f438a62248ef0f0fe8e874ca6cf94b720 /data/sprites/emotes.asm | |
| parent | 89c2646ccaa2c9a0afb358c1d9738e9bb0d42c97 (diff) | |
| parent | b23f0b2bdaa993f17d8312bcde5f2b8a59ef9c90 (diff) | |
Merge pull request #539 from Rangi42/master
[RTM] Miscellaneous reorganization fixes
Diffstat (limited to 'data/sprites/emotes.asm')
| -rw-r--r-- | data/sprites/emotes.asm | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/data/sprites/emotes.asm b/data/sprites/emotes.asm index 76ca2f0b9..2371c4624 100644 --- a/data/sprites/emotes.asm +++ b/data/sprites/emotes.asm @@ -2,20 +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: ; 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 + 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 |