diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-11-24 15:59:14 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-24 15:59:14 -0500 |
| commit | 8d29f65c6c7f34aa53ae2e7ae3e4f34a95025602 (patch) | |
| tree | 5b62a9457d2ddc4145763f94eb1e03257dc38665 /src/field_effect_helpers.c | |
| parent | c0e3c71673b12ce8380f0c0f189398c7c535493c (diff) | |
| parent | 9d056e865655af52c16be7c04df42be378259439 (diff) | |
Merge pull request #1255 from GriffinRichards/doc-paltags
Name object event palettes and tags
Diffstat (limited to 'src/field_effect_helpers.c')
| -rwxr-xr-x | src/field_effect_helpers.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/field_effect_helpers.c b/src/field_effect_helpers.c index 886e023d1..2322232b8 100755 --- a/src/field_effect_helpers.c +++ b/src/field_effect_helpers.c @@ -81,15 +81,15 @@ static void LoadObjectRegularReflectionPalette(struct ObjectEvent *objectEvent, const struct ObjectEventGraphicsInfo *graphicsInfo; graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId); - if (graphicsInfo->paletteTag2 != OBJ_EVENT_PAL_TAG_NONE) + if (graphicsInfo->reflectionPaletteTag != OBJ_EVENT_PAL_TAG_NONE) { if (graphicsInfo->paletteSlot == 0) { - LoadPlayerObjectReflectionPalette(graphicsInfo->paletteTag1, paletteIndex); + LoadPlayerObjectReflectionPalette(graphicsInfo->paletteTag, paletteIndex); } else if (graphicsInfo->paletteSlot == 10) { - LoadSpecialObjectReflectionPalette(graphicsInfo->paletteTag1, paletteIndex); + LoadSpecialObjectReflectionPalette(graphicsInfo->paletteTag, paletteIndex); } else { @@ -106,9 +106,9 @@ static void LoadObjectHighBridgeReflectionPalette(struct ObjectEvent *objectEven const struct ObjectEventGraphicsInfo *graphicsInfo; graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId); - if (graphicsInfo->paletteTag2 != OBJ_EVENT_PAL_TAG_NONE) + if (graphicsInfo->reflectionPaletteTag != OBJ_EVENT_PAL_TAG_NONE) { - PatchObjectPalette(graphicsInfo->paletteTag2, paletteNum); + PatchObjectPalette(graphicsInfo->reflectionPaletteTag, paletteNum); UpdateSpritePaletteWithWeather(paletteNum); } } |