diff --git a/include/constants/field_effects.h b/include/constants/field_effects.h index 84dbead76e..a29fd4e60c 100644 --- a/include/constants/field_effects.h +++ b/include/constants/field_effects.h @@ -137,5 +137,7 @@ // Duplicates of event_object_movement tags #define FLDEFF_PAL_TAG_MAY 0x1110 // OBJ_EVENT_PAL_TAG_MAY #define FLDEFF_PAL_TAG_BRENDAN 0x1100 // OBJ_EVENT_PAL_TAG_BRENDAN +#define FLDEFF_PAL_TAG_NPC_1 0x1103 // OBJ_EVENT_PAL_TAG_NPC_1 +#define FLDEFF_PAL_TAG_NPC_2 0x1104 // OBJ_EVENT_PAL_TAG_NPC_2 #endif // GUARD_FIELD_EFFECT_CONSTANTS_H diff --git a/src/data/field_effects/field_effect_objects.h b/src/data/field_effects/field_effect_objects.h index a61bcb0364..f9fa5b2b23 100755 --- a/src/data/field_effects/field_effect_objects.h +++ b/src/data/field_effects/field_effect_objects.h @@ -1020,7 +1020,7 @@ static const union AnimCmd *const sAnimTable_Sparkle[] = const struct SpriteTemplate gFieldEffectObjectTemplate_Sparkle = { .tileTag = TAG_NONE, - .paletteTag = TAG_NONE, + .paletteTag = FLDEFF_PAL_TAG_NPC_2, .oam = &gObjectEventBaseOam_16x16, .anims = sAnimTable_Sparkle, .images = sPicTable_Sparkle, diff --git a/src/event_object_movement.c b/src/event_object_movement.c index b48835117f..2ab35418f4 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -517,7 +517,7 @@ static const struct SpritePalette sObjectEventSpritePalettes[] = { {gObjectEventPaletteLight2, OBJ_EVENT_PAL_TAG_LIGHT_2}, {gObjectEventPaletteEmotes, OBJ_EVENT_PAL_TAG_EMOTES}, {gObjectEventPaletteNeonLight, OBJ_EVENT_PAL_TAG_NEON_LIGHT}, - {NULL, 0x0000}, + {NULL, OBJ_EVENT_PAL_TAG_NONE}, }; static const u16 sReflectionPaletteTags_Brendan[] = { diff --git a/src/field_effect_helpers.c b/src/field_effect_helpers.c index 18d76c3dc8..5fe15936ee 100755 --- a/src/field_effect_helpers.c +++ b/src/field_effect_helpers.c @@ -1446,7 +1446,7 @@ u32 FldEff_BerryTreeGrowthSparkle(void) sprite = &gSprites[spriteId]; sprite->coordOffsetEnabled = TRUE; sprite->oam.priority = gFieldEffectArguments[3]; - sprite->oam.paletteNum = 5; // TODO: What paletteTag does this use? + UpdateSpritePaletteByTemplate(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_SPARKLE], sprite); sprite->data[0] = FLDEFF_BERRY_TREE_GROWTH_SPARKLE; } return 0; diff --git a/src/fldeff_misc.c b/src/fldeff_misc.c index bb2cdf82c6..36d64b3fcd 100644 --- a/src/fldeff_misc.c +++ b/src/fldeff_misc.c @@ -1024,7 +1024,7 @@ void DoSecretBaseGlitterMatSparkle(void) { gSprites[spriteId].coordOffsetEnabled = TRUE; gSprites[spriteId].oam.priority = 1; - gSprites[spriteId].oam.paletteNum = 5; // TODO: What palette should this use? + UpdateSpritePaletteByTemplate(gFieldEffectObjectTemplatePointers[FLDEFFOBJ_SPARKLE], &gSprites[spriteId]); gSprites[spriteId].callback = SpriteCB_GlitterMatSparkle; gSprites[spriteId].data[0] = 0; } diff --git a/src/trainer_see.c b/src/trainer_see.c index 0e478c9415..19200bffac 100644 --- a/src/trainer_see.c +++ b/src/trainer_see.c @@ -303,7 +303,7 @@ static const struct SpriteTemplate sSpriteTemplate_ExclamationQuestionMark = static const struct SpriteTemplate sSpriteTemplate_HeartIcon = { .tileTag = TAG_NONE, - .paletteTag = FLDEFF_PAL_TAG_GENERAL_0, + .paletteTag = FLDEFF_PAL_TAG_NPC_1, .oam = &sOamData_Icons, .anims = sSpriteAnimTable_Icons, .images = sSpriteImageTable_HeartIcon, @@ -870,7 +870,7 @@ u8 FldEff_HeartIcon(void) struct Sprite *sprite = &gSprites[spriteId]; SetIconSpriteData(sprite, FLDEFF_HEART_ICON, 0); - sprite->oam.paletteNum = 2; // TODO: What palette should this use? + UpdateSpritePaletteByTemplate(&sSpriteTemplate_HeartIcon, sprite); } return 0;