From 6fdb6a9e34ac2490fff306090c01f776561aea0a Mon Sep 17 00:00:00 2001 From: hedara90 <90hedara@gmail.com> Date: Wed, 23 Apr 2025 12:17:54 +0200 Subject: [PATCH 1/2] Fixed broken palette load for shiny followers in the sprite visualizer (#6683) Co-authored-by: Hedara --- src/event_object_movement.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/event_object_movement.c b/src/event_object_movement.c index a8d1605438..cdc2c66f8e 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -1840,13 +1840,10 @@ u8 CreateObjectGraphicsSprite(u16 graphicsId, void (*callback)(struct Sprite *), const struct ObjectEventGraphicsInfo *graphicsInfo = GetObjectEventGraphicsInfo(graphicsId); struct Sprite *sprite; u8 spriteId; - bool32 isShiny = graphicsId & OBJ_EVENT_MON_SHINY; spriteTemplate = Alloc(sizeof(struct SpriteTemplate)); CopyObjectGraphicsInfoToSpriteTemplate(graphicsId, callback, spriteTemplate, &subspriteTables); - if (isShiny) - graphicsId -= SPECIES_SHINY_TAG; if (OW_GFX_COMPRESS) { From 20799d5835f8d86db878aa802cbc1473e904285a Mon Sep 17 00:00:00 2001 From: Alex <93446519+AlexOn1ine@users.noreply.github.com> Date: Wed, 23 Apr 2025 14:24:25 +0200 Subject: [PATCH 2/2] Remove misleading comment (#6684) --- src/battle_script_commands.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index c812df97c8..ede0a7749d 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -4594,7 +4594,6 @@ void SetMoveEffect(bool32 primary, bool32 certain) static bool32 CanApplyAdditionalEffect(const struct AdditionalEffect *additionalEffect) { - // Self-targeting move effects only apply after the last mon has been hit if (additionalEffect->self && NumAffectedSpreadMoveTargets() > 1 && GetNextTarget(GetBattlerMoveTargetType(gBattlerAttacker, gCurrentMove), TRUE) != MAX_BATTLERS_COUNT)