ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 03:34:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use constants for overworld object palette slots

Browse Source
This commit is contained in:
GriffinR 2022-09-27 20:16:48 -04:00
parent f0744641d1
commit 6db489e2d5
4 changed files with 339 additions and 310 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
include/event_object_movement.h
View File

@ -3,6 +3,28 @@
#include "constants/event_object_movement.h"
// Palette slots for overworld NPCs.
// The same standard set of palettes for overworld objects are normally always loaded at the same
// time while walking around the overworld. The only exceptions are the palettes for the player and
// the "special" NPC, which can be swapped out. This also means that e.g. two "special" NPCs
// with competing palettes cannot be properly loaded at the same time.
enum {
PALSLOT_PLAYER,
PALSLOT_PLAYER_REFLECTION,
PALSLOT_NPC_1,
PALSLOT_NPC_2,
PALSLOT_NPC_3,
PALSLOT_NPC_4,
PALSLOT_NPC_1_REFLECTION,
PALSLOT_NPC_2_REFLECTION,
PALSLOT_NPC_3_REFLECTION,
PALSLOT_NPC_4_REFLECTION,
PALSLOT_NPC_SPECIAL,
PALSLOT_NPC_SPECIAL_REFLECTION,
OBJ_PALSLOT_COUNT
// the remaining sprite palette slots (12-15) are used by field effects, the interface, etc.
};
enum SpinnerRunnerFollowPatterns
{
RUNFOLLOW_ANY,

490
src/data/object_events/object_event_graphics_info.h
View File

File diff suppressed because it is too large Load Diff

127
src/event_object_movement.c
View File

@ -168,7 +168,20 @@ static bool8 AreElevationsCompatible(u8, u8);
static const struct SpriteFrameImage sPicTable_PechaBerryTree[];
const u8 gReflectionEffectPaletteMap[] = {1, 1, 6, 7, 8, 9, 6, 7, 8, 9, 11, 11, 0, 0, 0, 0};
const u8 gReflectionEffectPaletteMap[16] = {
[PALSLOT_PLAYER] = PALSLOT_PLAYER_REFLECTION,
[PALSLOT_PLAYER_REFLECTION] = PALSLOT_PLAYER_REFLECTION,
[PALSLOT_NPC_1] = PALSLOT_NPC_1_REFLECTION,
[PALSLOT_NPC_2] = PALSLOT_NPC_2_REFLECTION,
[PALSLOT_NPC_3] = PALSLOT_NPC_3_REFLECTION,
[PALSLOT_NPC_4] = PALSLOT_NPC_4_REFLECTION,
[PALSLOT_NPC_1_REFLECTION] = PALSLOT_NPC_1_REFLECTION,
[PALSLOT_NPC_2_REFLECTION] = PALSLOT_NPC_2_REFLECTION,
[PALSLOT_NPC_3_REFLECTION] = PALSLOT_NPC_3_REFLECTION,
[PALSLOT_NPC_4_REFLECTION] = PALSLOT_NPC_4_REFLECTION,
[PALSLOT_NPC_SPECIAL] = PALSLOT_NPC_SPECIAL_REFLECTION,
[PALSLOT_NPC_SPECIAL_REFLECTION] = PALSLOT_NPC_SPECIAL_REFLECTION
};
static const struct SpriteTemplate sCameraSpriteTemplate = {
.tileTag = 0,
@ -610,55 +623,55 @@ static const struct PairedPalettes sSpecialObjectReflectionPaletteSets[] = {
};
static const u16 sObjectPaletteTags0[] = {
OBJ_EVENT_PAL_TAG_BRENDAN,
OBJ_EVENT_PAL_TAG_BRENDAN_REFLECTION,
OBJ_EVENT_PAL_TAG_NPC_1,
OBJ_EVENT_PAL_TAG_NPC_2,
OBJ_EVENT_PAL_TAG_NPC_3,
OBJ_EVENT_PAL_TAG_NPC_4,
OBJ_EVENT_PAL_TAG_NPC_1_REFLECTION,
OBJ_EVENT_PAL_TAG_NPC_2_REFLECTION,
OBJ_EVENT_PAL_TAG_NPC_3_REFLECTION,
OBJ_EVENT_PAL_TAG_NPC_4_REFLECTION,
[PALSLOT_PLAYER] = OBJ_EVENT_PAL_TAG_BRENDAN,
[PALSLOT_PLAYER_REFLECTION] = OBJ_EVENT_PAL_TAG_BRENDAN_REFLECTION,
[PALSLOT_NPC_1] = OBJ_EVENT_PAL_TAG_NPC_1,
[PALSLOT_NPC_2] = OBJ_EVENT_PAL_TAG_NPC_2,
[PALSLOT_NPC_3] = OBJ_EVENT_PAL_TAG_NPC_3,
[PALSLOT_NPC_4] = OBJ_EVENT_PAL_TAG_NPC_4,
[PALSLOT_NPC_1_REFLECTION] = OBJ_EVENT_PAL_TAG_NPC_1_REFLECTION,
[PALSLOT_NPC_2_REFLECTION] = OBJ_EVENT_PAL_TAG_NPC_2_REFLECTION,
[PALSLOT_NPC_3_REFLECTION] = OBJ_EVENT_PAL_TAG_NPC_3_REFLECTION,
[PALSLOT_NPC_4_REFLECTION] = OBJ_EVENT_PAL_TAG_NPC_4_REFLECTION,
};
static const u16 sObjectPaletteTags1[] = {
OBJ_EVENT_PAL_TAG_BRENDAN,
OBJ_EVENT_PAL_TAG_BRENDAN_REFLECTION,
OBJ_EVENT_PAL_TAG_NPC_1,
OBJ_EVENT_PAL_TAG_NPC_2,
OBJ_EVENT_PAL_TAG_NPC_3,
OBJ_EVENT_PAL_TAG_NPC_4,
OBJ_EVENT_PAL_TAG_NPC_1_REFLECTION,
OBJ_EVENT_PAL_TAG_NPC_2_REFLECTION,
OBJ_EVENT_PAL_TAG_NPC_3_REFLECTION,
OBJ_EVENT_PAL_TAG_NPC_4_REFLECTION,
[PALSLOT_PLAYER] = OBJ_EVENT_PAL_TAG_BRENDAN,
[PALSLOT_PLAYER_REFLECTION] = OBJ_EVENT_PAL_TAG_BRENDAN_REFLECTION,
[PALSLOT_NPC_1] = OBJ_EVENT_PAL_TAG_NPC_1,
[PALSLOT_NPC_2] = OBJ_EVENT_PAL_TAG_NPC_2,
[PALSLOT_NPC_3] = OBJ_EVENT_PAL_TAG_NPC_3,
[PALSLOT_NPC_4] = OBJ_EVENT_PAL_TAG_NPC_4,
[PALSLOT_NPC_1_REFLECTION] = OBJ_EVENT_PAL_TAG_NPC_1_REFLECTION,
[PALSLOT_NPC_2_REFLECTION] = OBJ_EVENT_PAL_TAG_NPC_2_REFLECTION,
[PALSLOT_NPC_3_REFLECTION] = OBJ_EVENT_PAL_TAG_NPC_3_REFLECTION,
[PALSLOT_NPC_4_REFLECTION] = OBJ_EVENT_PAL_TAG_NPC_4_REFLECTION,
};
static const u16 sObjectPaletteTags2[] = {
OBJ_EVENT_PAL_TAG_BRENDAN,
OBJ_EVENT_PAL_TAG_BRENDAN_REFLECTION,
OBJ_EVENT_PAL_TAG_NPC_1,
OBJ_EVENT_PAL_TAG_NPC_2,
OBJ_EVENT_PAL_TAG_NPC_3,
OBJ_EVENT_PAL_TAG_NPC_4,
OBJ_EVENT_PAL_TAG_NPC_1_REFLECTION,
OBJ_EVENT_PAL_TAG_NPC_2_REFLECTION,
OBJ_EVENT_PAL_TAG_NPC_3_REFLECTION,
OBJ_EVENT_PAL_TAG_NPC_4_REFLECTION,
[PALSLOT_PLAYER] = OBJ_EVENT_PAL_TAG_BRENDAN,
[PALSLOT_PLAYER_REFLECTION] = OBJ_EVENT_PAL_TAG_BRENDAN_REFLECTION,
[PALSLOT_NPC_1] = OBJ_EVENT_PAL_TAG_NPC_1,
[PALSLOT_NPC_2] = OBJ_EVENT_PAL_TAG_NPC_2,
[PALSLOT_NPC_3] = OBJ_EVENT_PAL_TAG_NPC_3,
[PALSLOT_NPC_4] = OBJ_EVENT_PAL_TAG_NPC_4,
[PALSLOT_NPC_1_REFLECTION] = OBJ_EVENT_PAL_TAG_NPC_1_REFLECTION,
[PALSLOT_NPC_2_REFLECTION] = OBJ_EVENT_PAL_TAG_NPC_2_REFLECTION,
[PALSLOT_NPC_3_REFLECTION] = OBJ_EVENT_PAL_TAG_NPC_3_REFLECTION,
[PALSLOT_NPC_4_REFLECTION] = OBJ_EVENT_PAL_TAG_NPC_4_REFLECTION,
};
static const u16 sObjectPaletteTags3[] = {
OBJ_EVENT_PAL_TAG_BRENDAN,
OBJ_EVENT_PAL_TAG_BRENDAN_REFLECTION,
OBJ_EVENT_PAL_TAG_NPC_1,
OBJ_EVENT_PAL_TAG_NPC_2,
OBJ_EVENT_PAL_TAG_NPC_3,
OBJ_EVENT_PAL_TAG_NPC_4,
OBJ_EVENT_PAL_TAG_NPC_1_REFLECTION,
OBJ_EVENT_PAL_TAG_NPC_2_REFLECTION,
OBJ_EVENT_PAL_TAG_NPC_3_REFLECTION,
OBJ_EVENT_PAL_TAG_NPC_4_REFLECTION,
[PALSLOT_PLAYER] = OBJ_EVENT_PAL_TAG_BRENDAN,
[PALSLOT_PLAYER_REFLECTION] = OBJ_EVENT_PAL_TAG_BRENDAN_REFLECTION,
[PALSLOT_NPC_1] = OBJ_EVENT_PAL_TAG_NPC_1,
[PALSLOT_NPC_2] = OBJ_EVENT_PAL_TAG_NPC_2,
[PALSLOT_NPC_3] = OBJ_EVENT_PAL_TAG_NPC_3,
[PALSLOT_NPC_4] = OBJ_EVENT_PAL_TAG_NPC_4,
[PALSLOT_NPC_1_REFLECTION] = OBJ_EVENT_PAL_TAG_NPC_1_REFLECTION,
[PALSLOT_NPC_2_REFLECTION] = OBJ_EVENT_PAL_TAG_NPC_2_REFLECTION,
[PALSLOT_NPC_3_REFLECTION] = OBJ_EVENT_PAL_TAG_NPC_3_REFLECTION,
[PALSLOT_NPC_4_REFLECTION] = OBJ_EVENT_PAL_TAG_NPC_4_REFLECTION,
};
static const u16 *const sObjectPaletteTagSets[] = {
@ -1396,13 +1409,13 @@ static u8 TrySetupObjectEventSprite(struct ObjectEventTemplate *objectEventTempl
objectEvent = &gObjectEvents[objectEventId];
graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId);
paletteSlot = graphicsInfo->paletteSlot;
if (paletteSlot == 0)
if (paletteSlot == PALSLOT_PLAYER)
{
LoadPlayerObjectReflectionPalette(graphicsInfo->paletteTag, 0);
LoadPlayerObjectReflectionPalette(graphicsInfo->paletteTag, paletteSlot);
}
else if (paletteSlot == 10)
else if (paletteSlot == PALSLOT_NPC_SPECIAL)
{
LoadSpecialObjectReflectionPalette(graphicsInfo->paletteTag, 10);
LoadSpecialObjectReflectionPalette(graphicsInfo->paletteTag, paletteSlot);
}
else if (paletteSlot >= 16)
{
@ -1590,7 +1603,7 @@ u8 CreateVirtualObject(u8 graphicsId, u8 virtualObjId, s16 x, s16 y, u8 elevatio
sprite->coordOffsetEnabled = TRUE;
sprite->sVirtualObjId = virtualObjId;
sprite->sVirtualObjElev = elevation;
if (graphicsInfo->paletteSlot == 10)
if (graphicsInfo->paletteSlot == PALSLOT_NPC_SPECIAL)
LoadSpecialObjectReflectionPalette(graphicsInfo->paletteTag, graphicsInfo->paletteSlot);
else if (graphicsInfo->paletteSlot >= 16)
_PatchObjectPalette(graphicsInfo->paletteTag, graphicsInfo->paletteSlot | 0xf0);
@ -1716,11 +1729,11 @@ static void SpawnObjectEventOnReturnToField(u8 objectEventId, s16 x, s16 y)
*(u16 *)&spriteTemplate.paletteTag = TAG_NONE;
paletteSlot = graphicsInfo->paletteSlot;
if (paletteSlot == 0)
if (paletteSlot == PALSLOT_PLAYER)
{
LoadPlayerObjectReflectionPalette(graphicsInfo->paletteTag, graphicsInfo->paletteSlot);
}
else if (paletteSlot == 10)
else if (paletteSlot == PALSLOT_NPC_SPECIAL)
{
LoadSpecialObjectReflectionPalette(graphicsInfo->paletteTag, graphicsInfo->paletteSlot);
}
@ -1791,11 +1804,11 @@ void ObjectEventSetGraphicsId(struct ObjectEvent *objectEvent, u8 graphicsId)
graphicsInfo = GetObjectEventGraphicsInfo(graphicsId);
sprite = &gSprites[objectEvent->spriteId];
paletteSlot = graphicsInfo->paletteSlot;
if (paletteSlot == 0)
if (paletteSlot == PALSLOT_PLAYER)
{
PatchObjectPalette(graphicsInfo->paletteTag, graphicsInfo->paletteSlot);
}
else if (paletteSlot == 10)
else if (paletteSlot == PALSLOT_NPC_SPECIAL)
{
LoadSpecialObjectReflectionPalette(graphicsInfo->paletteTag, graphicsInfo->paletteSlot);
}
@ -1973,7 +1986,7 @@ void SetObjectEventSpritePosByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup,
void FreeAndReserveObjectSpritePalettes(void)
{
FreeAllSpritePalettes();
gReservedSpritePaletteCount = 12;
gReservedSpritePaletteCount = OBJ_PALSLOT_COUNT;
}
static void LoadObjectEventPalette(u16 paletteTag)
@ -2499,19 +2512,19 @@ void OverrideSecretBaseDecorationSpriteScript(u8 localId, u8 mapNum, u8 mapGroup
}
}
void InitObjectEventPalettes(u8 palSlot)
void InitObjectEventPalettes(u8 reflectionType)
{
FreeAndReserveObjectSpritePalettes();
sCurrentSpecialObjectPaletteTag = OBJ_EVENT_PAL_TAG_NONE;
sCurrentReflectionType = palSlot;
if (palSlot == 1)
sCurrentReflectionType = reflectionType;
if (reflectionType == 1)
{
PatchObjectPaletteRange(sObjectPaletteTagSets[sCurrentReflectionType], 0, 6);
PatchObjectPaletteRange(sObjectPaletteTagSets[sCurrentReflectionType], PALSLOT_PLAYER, PALSLOT_NPC_4 + 1);
gReservedSpritePaletteCount = 8;
}
else
{
PatchObjectPaletteRange(sObjectPaletteTagSets[sCurrentReflectionType], 0, 10);
PatchObjectPaletteRange(sObjectPaletteTagSets[sCurrentReflectionType], PALSLOT_PLAYER, PALSLOT_NPC_4_REFLECTION + 1);
}
}
@ -2519,7 +2532,7 @@ u16 GetObjectPaletteTag(u8 palSlot)
{
u8 i;
if (palSlot < 10)
if (palSlot < PALSLOT_NPC_SPECIAL)
return sObjectPaletteTagSets[sCurrentReflectionType][palSlot];
for (i = 0; sSpecialObjectReflectionPaletteSets[i].tag != OBJ_EVENT_PAL_TAG_NONE; i++)

10
src/field_effect_helpers.c
View File

@ -97,18 +97,12 @@ static void LoadObjectRegularReflectionPalette(struct ObjectEvent *objectEvent,
graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId);
if (graphicsInfo->reflectionPaletteTag != OBJ_EVENT_PAL_TAG_NONE)
{
if (graphicsInfo->paletteSlot == 0)
{
if (graphicsInfo->paletteSlot == PALSLOT_PLAYER)
LoadPlayerObjectReflectionPalette(graphicsInfo->paletteTag, paletteIndex);
}
else if (graphicsInfo->paletteSlot == 10)
{
else if (graphicsInfo->paletteSlot == PALSLOT_NPC_SPECIAL)
LoadSpecialObjectReflectionPalette(graphicsInfo->paletteTag, paletteIndex);
}
else
{
PatchObjectPalette(GetObjectPaletteTag(paletteIndex), paletteIndex);
}
UpdateSpritePaletteWithWeather(paletteIndex);
}
}