atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed high bridge (Route 120) reflections.

Browse source
This commit is contained in:
Ariel Antonitis 2020-06-17 21:08:15 -04:00
parent 8598c59fad
commit e9711b7cd5
2 changed files with 75 additions and 83 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/event_object_movement.c
View file

@ -1884,17 +1884,12 @@ static void SetPlayerAvatarObjectEventIdAndObjectId(u8 objectEventId, u8 spriteI
// Update sprite's palette, freeing old palette if necessary // Update sprite's palette, freeing old palette if necessary
static u8 UpdateSpritePalette(const struct SpritePalette * spritePalette, struct Sprite * sprite) { static u8 UpdateSpritePalette(const struct SpritePalette * spritePalette, struct Sprite * sprite) {
u8 paletteNum = sprite->oam.paletteNum;
// Free palette if otherwise unused // Free palette if otherwise unused
sprite->inUse = FALSE; sprite->inUse = FALSE;
FieldEffectFreePaletteIfUnused(paletteNum); FieldEffectFreePaletteIfUnused(sprite->oam.paletteNum);
sprite->inUse = TRUE; sprite->inUse = TRUE;
paletteNum = IndexOfSpritePaletteTag(spritePalette->tag); sprite->oam.paletteNum = LoadSpritePalette(spritePalette);
if (paletteNum == 0xFF) { return sprite->oam.paletteNum;
paletteNum = LoadSpritePalette(spritePalette);
}
sprite->oam.paletteNum = paletteNum;
return paletteNum;
} }
// Find and update based on template's paletteTag // Find and update based on template's paletteTag

147
src/field_effect_helpers.c
View file

@ -19,7 +19,7 @@
static void UpdateObjectReflectionSprite(struct Sprite *); static void UpdateObjectReflectionSprite(struct Sprite *);
static void LoadObjectReflectionPalette(struct ObjectEvent *objectEvent, struct Sprite *sprite); static void LoadObjectReflectionPalette(struct ObjectEvent *objectEvent, struct Sprite *sprite);
static void LoadObjectHighBridgeReflectionPalette(struct ObjectEvent *, u8); static void LoadObjectHighBridgeReflectionPalette(struct ObjectEvent *, struct Sprite *sprite);
static void LoadObjectRegularReflectionPalette(struct ObjectEvent *, struct Sprite *); static void LoadObjectRegularReflectionPalette(struct ObjectEvent *, struct Sprite *);
static void sub_81561FC(struct Sprite *, u8, u8); static void sub_81561FC(struct Sprite *, u8, u8);
static void FadeFootprintsTireTracks_Step0(struct Sprite *); static void FadeFootprintsTireTracks_Step0(struct Sprite *);
@ -73,12 +73,12 @@ static void LoadObjectReflectionPalette(struct ObjectEvent *objectEvent, struct
reflectionSprite->sReflectionVerticalOffset = 0; reflectionSprite->sReflectionVerticalOffset = 0;
if (!GetObjectEventGraphicsInfo(objectEvent->graphicsId)->disableReflectionPaletteLoad && ((bridgeType = MetatileBehavior_GetBridgeType(objectEvent->previousMetatileBehavior)) || (bridgeType = MetatileBehavior_GetBridgeType(objectEvent->currentMetatileBehavior)))) if (!GetObjectEventGraphicsInfo(objectEvent->graphicsId)->disableReflectionPaletteLoad && ((bridgeType = MetatileBehavior_GetBridgeType(objectEvent->previousMetatileBehavior)) || (bridgeType = MetatileBehavior_GetBridgeType(objectEvent->currentMetatileBehavior))))
{ {
reflectionSprite->sReflectionVerticalOffset = bridgeReflectionVerticalOffsets[bridgeType - 1]; reflectionSprite->data[2] = bridgeReflectionVerticalOffsets[bridgeType - 1];
LoadObjectHighBridgeReflectionPalette(objectEvent, reflectionSprite->oam.paletteNum); LoadObjectHighBridgeReflectionPalette(objectEvent, reflectionSprite);
} }
else else
{ {
LoadObjectRegularReflectionPalette(objectEvent, sprite); LoadObjectRegularReflectionPalette(objectEvent, reflectionSprite);
} }
} }
@ -103,98 +103,95 @@ static void ApplyReflectionFilter(u8 paletteNum, u16 *dest) {
static void LoadObjectRegularReflectionPalette(struct ObjectEvent *objectEvent, struct Sprite *sprite) static void LoadObjectRegularReflectionPalette(struct ObjectEvent *objectEvent, struct Sprite *sprite)
{ {
const struct ObjectEventGraphicsInfo *graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId); const struct ObjectEventGraphicsInfo *graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId);
u16 baseTag = gSprites[objectEvent->spriteId].oam.paletteNum; const struct Sprite *mainSprite = &gSprites[objectEvent->spriteId];
u16 paletteTag = baseTag + OBJ_EVENT_PAL_TAG_NONE + 0x1000; u16 baseTag = GetSpritePaletteTagByPaletteNum(mainSprite->oam.paletteNum);
struct SpritePalette filteredPalette; u16 paletteTag = baseTag == 0xFFFF ? mainSprite->oam.paletteNum + 0x2000 : baseTag + 0x2000;
u16 filteredData[16] = {0}; u8 paletteNum = IndexOfSpritePaletteTag(paletteTag);
u8 paletteIndex = IndexOfSpritePaletteTag(paletteTag); if (paletteNum == 0xFF) { // Load filtered palette
u32 *debugPtr = (u32*) 0x0203d600; u16 filteredData[16] = {0};
if (paletteIndex == 0xFF) { // Build filtered palette struct SpritePalette filteredPalette = {.tag = paletteTag, .data = filteredData};
*(debugPtr) = baseTag;
*(debugPtr + 1) = (u32) filteredData;
__asm__(".2byte 0xBE00");
ApplyReflectionFilter(baseTag, filteredData); ApplyReflectionFilter(baseTag, filteredData);
*(debugPtr + 1) = (u32) filteredData; paletteNum = LoadSpritePalette(&filteredPalette);
__asm__(".2byte 0xBE00"); UpdateSpritePaletteWithWeather(paletteNum);
filteredPalette.tag = paletteTag;
filteredPalette.data = filteredData;
paletteIndex = LoadSpritePalette(&filteredPalette);
// UpdateSpritePaletteWithWeather(paletteIndex);
} }
sprite->oam.paletteNum = paletteIndex; sprite->oam.paletteNum = paletteNum;
} }
#define HIGH_BRIDGE_PAL_TAG 0x4000
// When walking on a bridge high above water (Route 120), the reflection is a solid dark blue color. // When walking on a bridge high above water (Route 120), the reflection is a solid dark blue color.
// This is so the sprite blends in with the dark water metatile underneath the bridge. // This is so the sprite blends in with the dark water metatile underneath the bridge.
static void LoadObjectHighBridgeReflectionPalette(struct ObjectEvent *objectEvent, u8 paletteNum) static void LoadObjectHighBridgeReflectionPalette(struct ObjectEvent *objectEvent, struct Sprite *sprite)
{ {
const struct ObjectEventGraphicsInfo *graphicsInfo; u16 blueData[16] = {0};
struct SpritePalette bluePalette = {.tag = HIGH_BRIDGE_PAL_TAG, .data = blueData};
graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId); u8 i;
if (graphicsInfo->reflectionPaletteTag != OBJ_EVENT_PAL_TAG_NONE) for (i = 1; i < 16; i++) {
{ blueData[i] = 0x55c9;
PatchObjectPalette(graphicsInfo->reflectionPaletteTag, paletteNum);
UpdateSpritePaletteWithWeather(paletteNum);
} }
sprite->oam.paletteNum = LoadSpritePalette(&bluePalette);
UpdateSpritePaletteWithWeather(sprite->oam.paletteNum);
} }
static void UpdateObjectReflectionSprite(struct Sprite *reflectionSprite) static void UpdateObjectReflectionSprite(struct Sprite *reflectionSprite)
{ {
struct ObjectEvent *objectEvent = &gObjectEvents[reflectionSprite->data[0]]; struct ObjectEvent *objectEvent = &gObjectEvents[reflectionSprite->data[0]];
struct Sprite *mainSprite = &gSprites[objectEvent->spriteId]; struct Sprite *mainSprite = &gSprites[objectEvent->spriteId];
u16 baseTag = mainSprite->oam.paletteNum;
u16 paletteTag = baseTag + OBJ_EVENT_PAL_TAG_NONE + 0x1000;
struct SpritePalette filteredPalette;
u16 filteredData[16] = {0};
u8 paletteNum;
if (!objectEvent->active || !objectEvent->hasReflection || objectEvent->localId != reflectionSprite->data[1]) if (!objectEvent->active || !objectEvent->hasReflection || objectEvent->localId != reflectionSprite->data[1])
{ {
reflectionSprite->inUse = FALSE; reflectionSprite->inUse = FALSE;
FieldEffectFreePaletteIfUnused(reflectionSprite->oam.paletteNum); FieldEffectFreePaletteIfUnused(reflectionSprite->oam.paletteNum);
return;
} }
else
// Only filter palette if not using the high bridge blue palette
if (IndexOfSpritePaletteTag(HIGH_BRIDGE_PAL_TAG) != reflectionSprite->oam.paletteNum) {
u16 baseTag = GetSpritePaletteTagByPaletteNum(mainSprite->oam.paletteNum);
u16 paletteTag = baseTag == 0xFFFF ? mainSprite->oam.paletteNum + 0x2000 : baseTag + 0x2000;
u8 paletteNum;
// Free palette if unused
reflectionSprite->inUse = FALSE;
FieldEffectFreePaletteIfUnused(reflectionSprite->oam.paletteNum);
reflectionSprite->inUse = TRUE;
paletteNum = IndexOfSpritePaletteTag(paletteTag);
if (paletteNum == 0xFF) { // Build filtered palette
u16 filteredData[16] = {0};
struct SpritePalette filteredPalette = {.tag = paletteTag, .data = filteredData};
ApplyReflectionFilter(mainSprite->oam.paletteNum, filteredData);
paletteNum = LoadSpritePalette(&filteredPalette);
UpdateSpritePaletteWithWeather(paletteNum);
}
reflectionSprite->oam.paletteNum = paletteNum;
}
reflectionSprite->oam.shape = mainSprite->oam.shape;
reflectionSprite->oam.size = mainSprite->oam.size;
reflectionSprite->oam.matrixNum = mainSprite->oam.matrixNum | ST_OAM_VFLIP;
reflectionSprite->oam.tileNum = mainSprite->oam.tileNum;
reflectionSprite->subspriteTables = mainSprite->subspriteTables;
reflectionSprite->subspriteTableNum = mainSprite->subspriteTableNum;
reflectionSprite->invisible = mainSprite->invisible;
reflectionSprite->pos1.x = mainSprite->pos1.x;
// reflectionSprite->data[2] holds an additional vertical offset, used by the high bridges on Route 120
reflectionSprite->pos1.y = mainSprite->pos1.y + GetReflectionVerticalOffset(objectEvent) + reflectionSprite->data[2];
reflectionSprite->centerToCornerVecX = mainSprite->centerToCornerVecX;
reflectionSprite->centerToCornerVecY = mainSprite->centerToCornerVecY;
reflectionSprite->pos2.x = mainSprite->pos2.x;
reflectionSprite->pos2.y = -mainSprite->pos2.y;
reflectionSprite->coordOffsetEnabled = mainSprite->coordOffsetEnabled;
if (objectEvent->hideReflection == TRUE)
reflectionSprite->invisible = TRUE;
// Check if the reflection is not still.
if (reflectionSprite->data[7] == FALSE)
{ {
// Free palette if unused // Sets the reflection sprite's rot/scale matrix to the appropriate
reflectionSprite->inUse = FALSE; // matrix based on whether or not the main sprite is horizontally flipped.
FieldEffectFreePaletteIfUnused(reflectionSprite->oam.paletteNum); // If the sprite is facing to the east, then it is flipped, and its matrixNum is 8.
reflectionSprite->inUse = TRUE; reflectionSprite->oam.matrixNum = 0;
paletteNum = IndexOfSpritePaletteTag(paletteTag); if (mainSprite->oam.matrixNum & ST_OAM_HFLIP)
if (paletteNum == 0xFF) { // Build filtered palette reflectionSprite->oam.matrixNum = 1;
ApplyReflectionFilter(baseTag, filteredData);
filteredPalette.tag = paletteTag;
filteredPalette.data = filteredData;
paletteNum = LoadSpritePalette(&filteredPalette);
}
reflectionSprite->oam.paletteNum = paletteNum;
reflectionSprite->oam.shape = mainSprite->oam.shape;
reflectionSprite->oam.size = mainSprite->oam.size;
reflectionSprite->oam.matrixNum = mainSprite->oam.matrixNum | ST_OAM_VFLIP;
reflectionSprite->oam.tileNum = mainSprite->oam.tileNum;
reflectionSprite->subspriteTables = mainSprite->subspriteTables;
reflectionSprite->subspriteTableNum = mainSprite->subspriteTableNum;
reflectionSprite->invisible = mainSprite->invisible;
reflectionSprite->pos1.x = mainSprite->pos1.x;
reflectionSprite->pos1.y = mainSprite->pos1.y + GetReflectionVerticalOffset(objectEvent) + reflectionSprite->sReflectionVerticalOffset;
reflectionSprite->centerToCornerVecX = mainSprite->centerToCornerVecX;
reflectionSprite->centerToCornerVecY = mainSprite->centerToCornerVecY;
reflectionSprite->pos2.x = mainSprite->pos2.x;
reflectionSprite->pos2.y = -mainSprite->pos2.y;
reflectionSprite->coordOffsetEnabled = mainSprite->coordOffsetEnabled;
if (objectEvent->hideReflection == TRUE)
reflectionSprite->invisible = TRUE;
if (reflectionSprite->sIsStillReflection == FALSE)
{
// Sets the reflection sprite's rot/scale matrix to the appropriate
// matrix based on whether or not the main sprite is horizontally flipped.
// If the sprite is facing to the east, then it is flipped, and its matrixNum is 8.
reflectionSprite->oam.matrixNum = 0;
if (mainSprite->oam.matrixNum & ST_OAM_HFLIP)
reflectionSprite->oam.matrixNum = 1;
}
} }
} }