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

Review comments

Browse Source
This commit is contained in:
Hedara 2025-04-12 08:58:23 +02:00
parent 66a6e92417
commit 51c3709a56
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/field_weather.h
View File

@ -166,7 +166,7 @@ void PlayRainStoppingSoundEffect(void);
u8 IsWeatherChangeComplete(void);
void SetWeatherScreenFadeOut(void);
void SetWeatherPalStateIdle(void);
const u8* SetPaletteColorMapType(u8 paletteIndex, enum ColorMapType colorMapType);
const u8 *SetPaletteColorMapType(u8 paletteIndex, enum ColorMapType colorMapType);
void PreservePaletteInWeather(u8 preservedPalIndex);
void ResetPaletteColorMapType(u8 paletteIndex);
void ResetPreservedPalettesInWeather(void);

5
src/field_weather.c
View File

@ -1170,9 +1170,8 @@ void PreservePaletteInWeather(u8 preservedPalIndex)
void ResetPaletteColorMapType(u8 paletteIndex)
{
if (sPaletteColorMapTypes == sBasePaletteColorMapTypes)
return;
sFieldEffectPaletteColorMapTypes[paletteIndex] = sBasePaletteColorMapTypes[paletteIndex];
if (sPaletteColorMapTypes != sBasePaletteColorMapTypes)
sFieldEffectPaletteColorMapTypes[paletteIndex] = sBasePaletteColorMapTypes[paletteIndex];
}
void ResetPreservedPalettesInWeather(void)

8
src/overworld.c
View File

@ -1629,11 +1629,9 @@ bool32 MapHasNaturalLight(u8 mapType)
bool32 CurrentMapHasShadows(void)
{
bool32 shouldHaveShadows = TRUE;
u32 currentMapType = gMapHeader.mapType;
if (currentMapType == MAP_TYPE_UNDERGROUND)
shouldHaveShadows = FALSE;
return shouldHaveShadows;
// Add all conditionals here for maps that shouldn't have shadows
// By default only cave maps are excluded from having shadows under object events
return (gMapHeader.mapType != MAP_TYPE_UNDERGROUND);
}
// Update & mix day / night bg palettes (into unfaded)