From be74612b9ec0da9217123b701821518c0f63e231 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Sun, 26 Jan 2025 17:17:37 -0300 Subject: [PATCH] u32 in FadeScreenHardware --- include/field_weather.h | 2 +- src/field_weather.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/field_weather.h b/include/field_weather.h index a8cbcc572a..3a614affbf 100644 --- a/include/field_weather.h +++ b/include/field_weather.h @@ -148,7 +148,7 @@ void SetCurrentAndNextWeatherNoDelay(u8 weather); void ApplyWeatherColorMapIfIdle(s8 colorMapIndex); void ApplyWeatherColorMapIfIdle_Gradual(u8 colorMapIndex, u8 targetColorMapIndex, u8 colorMapStepDelay); void FadeScreen(u8 mode, s8 delay); -u16 FadeScreenHardware(u8 mode, s8 delay); +u32 FadeScreenHardware(u32 mode, s32 delay); bool8 IsWeatherNotFadingIn(void); void UpdateSpritePaletteWithWeather(u8 spritePaletteIndex, bool8 allowFog); void ApplyWeatherColorMapToPals(u8 startPalIndex, u8 numPalettes); diff --git a/src/field_weather.c b/src/field_weather.c index 2e38022f54..4086870ae8 100644 --- a/src/field_weather.c +++ b/src/field_weather.c @@ -811,9 +811,9 @@ void FadeScreen(u8 mode, s8 delay) // Note: This enables blending in all windows; // These bits may need to be disabled later // (i.e if blending lighting effects using WINOBJ) -u16 FadeScreenHardware(u8 mode, s8 delay) +u32 FadeScreenHardware(u32 mode, s32 delay) { - u16 bldCnt = GetGpuReg(REG_OFFSET_BLDCNT) & BLDCNT_TGT2_ALL; + u32 bldCnt = GetGpuReg(REG_OFFSET_BLDCNT) & BLDCNT_TGT2_ALL; bldCnt |= BLDCNT_TGT1_ALL; // enable blend in all windows SetGpuRegBits(REG_OFFSET_WININ, WININ_WIN0_CLR | WININ_WIN1_CLR);