diff --git a/include/field_weather.h b/include/field_weather.h index eda06834bc..9805dc491d 100644 --- a/include/field_weather.h +++ b/include/field_weather.h @@ -170,7 +170,7 @@ void SetWeatherScreenFadeOut(void); void SetWeatherPalStateIdle(void); void PreservePaletteInWeather(u8 preservedPalIndex); void ResetPreservedPalettesInWeather(void); -bool8 IsWeatherAlphaBlend(void); +bool32 IsWeatherAlphaBlend(void); // field_weather_effect.c void Clouds_InitVars(void); diff --git a/include/rtc.h b/include/rtc.h index 2645458f68..bf8ff9aa93 100644 --- a/include/rtc.h +++ b/include/rtc.h @@ -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); u32 RtcGetMinuteCount(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 diff --git a/src/field_weather.c b/src/field_weather.c index d1a0b531eb..152f3efe63 100644 --- a/src/field_weather.c +++ b/src/field_weather.c @@ -1105,10 +1105,10 @@ void ResetPreservedPalettesInWeather(void) sPaletteColorMapTypes = sBasePaletteColorMapTypes; } -bool8 IsWeatherAlphaBlend(void) +bool32 IsWeatherAlphaBlend(void) { - return (gWeatherPtr->currWeather == WEATHER_FOG_HORIZONTAL) || - (gWeatherPtr->currWeather == WEATHER_FOG_DIAGONAL) || - (gWeatherPtr->currWeather == WEATHER_UNDERWATER_BUBBLES) || - (gWeatherPtr->currWeather == WEATHER_UNDERWATER); + return (gWeatherPtr->currWeather == WEATHER_FOG_HORIZONTAL + || gWeatherPtr->currWeather == WEATHER_FOG_DIAGONAL + || gWeatherPtr->currWeather == WEATHER_UNDERWATER_BUBBLES + || gWeatherPtr->currWeather == WEATHER_UNDERWATER); } diff --git a/src/rtc.c b/src/rtc.c index c77d7dd9fd..a53d5e1fd8 100644 --- a/src/rtc.c +++ b/src/rtc.c @@ -366,7 +366,7 @@ u32 RtcGetLocalDayCount(void) 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) {