Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Temp fixes

Browse Source
This commit is contained in:
Eduardo Quezada 2025-01-26 12:08:26 -03:00
parent 00241cf569
commit 0b8aa7b0dc
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/field_weather.c
View File

@ -898,12 +898,14 @@ void UpdateSpritePaletteWithWeather(u8 spritePaletteIndex, bool8 allowFog)
// If faded out, i.e due to fadescreenswapbuffers,
// Copy unfaded palette to pal decomp buffer
// so it will be restored on fade-in
/*
if (gPaletteFade.y == 16)
CpuFastCopy(
gPlttBufferUnfaded + OBJ_PLTT_ID(spritePaletteIndex),
gDecompressionBuffer + 2 * OBJ_PLTT_ID(spritePaletteIndex),
PLTT_SIZE_4BPP
);
*/
}
void ApplyWeatherColorMapToPals(u8 startPalIndex, u8 numPalettes)

2
src/fieldmap.c
View File

@ -901,7 +901,7 @@ static void LoadTilesetPalette(struct Tileset const *tileset, u16 destOffset, u1
// All 'gTilesetPalettes_' arrays should have ALIGNED(4) in them,
// but we use SmartCopy here just in case they don't
if (skipFaded) {
CpuSmartCopy16(tileset->palettes[NUM_PALS_IN_PRIMARY], &gPlttBufferUnfaded[destOffset], size);
CpuCopy16(tileset->palettes[NUM_PALS_IN_PRIMARY], &gPlttBufferUnfaded[destOffset], size);
} else
LoadPaletteFast(tileset->palettes[NUM_PALS_IN_PRIMARY], destOffset, size);
low = NUM_PALS_IN_PRIMARY;