Emote use same palette as parent actor
@@ -801,14 +801,15 @@ void Script_ActorSetCollisions_b() {
*/
void Script_ActorSetEmote_b() {
unsigned char* emote_ptr;
+ UBYTE palette = actors[script_actor].palette_index;
emote_sprite = SpritePoolNext();
emote_timer = 1;
script_update_fn = ScriptUpdate_Emote;
emote_ptr = (BankDataPtr(EMOTES_SPRITE_BANK)) + EMOTES_SPRITE_BANK_OFFSET;
SetBankedSpriteData(EMOTES_SPRITE_BANK, EMOTE_SPRITE, 4,
emote_ptr + ((UWORD)script_cmd_args[0] * 64));
- set_sprite_prop(emote_sprite, 0);
- set_sprite_prop(emote_sprite + 1, 0);
+ set_sprite_prop(emote_sprite, palette);
+ set_sprite_prop(emote_sprite + 1, palette);
set_sprite_tile(emote_sprite, EMOTE_SPRITE);
set_sprite_tile(emote_sprite + 1, EMOTE_SPRITE + 2);
}
