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

PR feedback - 32 bit params, multiline condition formatting

Browse source
This commit is contained in:
RavePossum 2024-06-03 00:10:10 -04:00
parent afb66b4d2b
commit 69b367e350
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/field_weather.h
View file

@ -170,7 +170,7 @@ void SetWeatherScreenFadeOut(void);
void SetWeatherPalStateIdle(void); void SetWeatherPalStateIdle(void);
void PreservePaletteInWeather(u8 preservedPalIndex); void PreservePaletteInWeather(u8 preservedPalIndex);
void ResetPreservedPalettesInWeather(void); void ResetPreservedPalettesInWeather(void);
bool8 IsWeatherAlphaBlend(void); bool32 IsWeatherAlphaBlend(void);
// field_weather_effect.c // field_weather_effect.c
void Clouds_InitVars(void); void Clouds_InitVars(void);

2
include/rtc.h
View file

@ -118,6 +118,6 @@ void RtcCalcLocalTimeOffset(s32 days, s32 hours, s32 minutes, s32 seconds);
void CalcTimeDifference(struct Time *result, struct Time *t1, struct Time *t2); void CalcTimeDifference(struct Time *result, struct Time *t1, struct Time *t2);
u32 RtcGetMinuteCount(void); u32 RtcGetMinuteCount(void);
u32 RtcGetLocalDayCount(void); u32 RtcGetLocalDayCount(void);
void FormatDecimalTimeWithoutSeconds(u8 *dest, s8 hour, s8 minute, bool8 is24Hour); void FormatDecimalTimeWithoutSeconds(u8 *dest, s8 hour, s8 minute, bool32 is24Hour);
#endif // GUARD_RTC_UTIL_H #endif // GUARD_RTC_UTIL_H

10
src/field_weather.c
View file

@ -1105,10 +1105,10 @@ void ResetPreservedPalettesInWeather(void)
sPaletteColorMapTypes = sBasePaletteColorMapTypes; sPaletteColorMapTypes = sBasePaletteColorMapTypes;
} }
bool8 IsWeatherAlphaBlend(void) bool32 IsWeatherAlphaBlend(void)
{ {
return (gWeatherPtr->currWeather == WEATHER_FOG_HORIZONTAL) || return (gWeatherPtr->currWeather == WEATHER_FOG_HORIZONTAL
(gWeatherPtr->currWeather == WEATHER_FOG_DIAGONAL) || || gWeatherPtr->currWeather == WEATHER_FOG_DIAGONAL
(gWeatherPtr->currWeather == WEATHER_UNDERWATER_BUBBLES) || || gWeatherPtr->currWeather == WEATHER_UNDERWATER_BUBBLES
(gWeatherPtr->currWeather == WEATHER_UNDERWATER); || gWeatherPtr->currWeather == WEATHER_UNDERWATER);
} }

2
src/rtc.c
View file

@ -366,7 +366,7 @@ u32 RtcGetLocalDayCount(void)
return RtcGetDayCount(&sRtc); return RtcGetDayCount(&sRtc);
} }
void FormatDecimalTimeWithoutSeconds(u8 *txtPtr, s8 hour, s8 minute, bool8 is24Hour) void FormatDecimalTimeWithoutSeconds(u8 *txtPtr, s8 hour, s8 minute, bool32 is24Hour)
{ {
if (is24Hour) if (is24Hour)
{ {