dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More PALSLOT constant usage

Browse Source
This commit is contained in:
GriffinR
2023-08-07 00:44:46 -04:00
parent e180611de6
commit 120fbb0578
2 changed files with 156 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/data/object_events/object_event_graphics_info.h
+154 -154
View File
File diff suppressed because it is too large Load Diff
src/field_effect_helpers.c
+2 -8
View File
@@ -81,18 +81,12 @@ static void LoadObjectRegularReflectionPalette(struct ObjectEvent * objectEvent,
graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId); graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId);
if (graphicsInfo->reflectionPaletteTag != OBJ_EVENT_PAL_TAG_NONE) if (graphicsInfo->reflectionPaletteTag != OBJ_EVENT_PAL_TAG_NONE)
{ {
if (graphicsInfo->paletteSlot == 0) if (graphicsInfo->paletteSlot == PALSLOT_PLAYER)
{
LoadPlayerObjectReflectionPalette(graphicsInfo->paletteTag, paletteIndex); LoadPlayerObjectReflectionPalette(graphicsInfo->paletteTag, paletteIndex);
} else if (graphicsInfo->paletteSlot == PALSLOT_NPC_SPECIAL)
else if (graphicsInfo->paletteSlot == 10)
{
LoadSpecialObjectReflectionPalette(graphicsInfo->paletteTag, paletteIndex); LoadSpecialObjectReflectionPalette(graphicsInfo->paletteTag, paletteIndex);
}
else else
{
PatchObjectPalette(GetObjectPaletteTag(paletteIndex), paletteIndex); PatchObjectPalette(GetObjectPaletteTag(paletteIndex), paletteIndex);
}
UpdateSpritePaletteWithWeather(paletteIndex); UpdateSpritePaletteWithWeather(paletteIndex);
} }
} }