From 1895e6263b9ad823578663f157223ddef73792e3 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Sun, 23 Feb 2025 16:44:05 -0300 Subject: [PATCH] Applied a proper fix to blending --- include/constants/event_objects.h | 9 +++++---- src/event_object_movement.c | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/include/constants/event_objects.h b/include/constants/event_objects.h index 0d66215be9..7cd210275c 100644 --- a/include/constants/event_objects.h +++ b/include/constants/event_objects.h @@ -271,10 +271,11 @@ #define OBJ_EVENT_GFX_VAR_E (OBJ_EVENT_GFX_VARS + 0xE) #define OBJ_EVENT_GFX_VAR_F (OBJ_EVENT_GFX_VARS + 0xF) -#define OBJ_EVENT_MON (1u << 15) -#define OBJ_EVENT_MON_SHINY (1u << 14) -#define OBJ_EVENT_MON_FEMALE (1u << 13) -#define OBJ_EVENT_MON_SPECIES_MASK (~(7u << 13)) +// Don't use (1u << 15) to avoid conflict with BLEND_IMMUNE_FLAG. +#define OBJ_EVENT_MON (1u << 14) +#define OBJ_EVENT_MON_SHINY (1u << 13) +#define OBJ_EVENT_MON_FEMALE (1u << 12) +#define OBJ_EVENT_MON_SPECIES_MASK (~(7u << 12)) // Used to call a specific species' follower graphics. Useful for static encounters. #define OBJ_EVENT_GFX_SPECIES(name) (SPECIES_##name + OBJ_EVENT_MON) diff --git a/src/event_object_movement.c b/src/event_object_movement.c index 72cd0cbe41..1794d532f7 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -2004,7 +2004,7 @@ static u32 LoadDynamicFollowerPalette(u32 species, bool32 shiny, bool32 female) || (!shiny && gSpeciesInfo[species].overworldShinyPalette)) { struct SpritePalette spritePalette; - u16 palTag = species + (shiny ? OBJ_EVENT_MON_SHINY : 0); + u16 palTag = species + OBJ_EVENT_MON + (shiny ? OBJ_EVENT_MON_SHINY : 0); #if P_GENDER_DIFFERENCES if (female && gSpeciesInfo[species].overworldShinyPaletteFemale != NULL) palTag += OBJ_EVENT_MON_FEMALE;