From 5e3c48acfc7faf0bc24b4cfc1cf7f159c06bb087 Mon Sep 17 00:00:00 2001 From: Ariel A <24759293+aarant@users.noreply.github.com> Date: Sun, 16 Jan 2022 17:08:09 -0500 Subject: [PATCH] Fixed bug where `lighting` branch wouldn't build on modern. Credit: Jaizu --- include/overworld.h | 2 -- include/palette.h | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/overworld.h b/include/overworld.h index 0469c8b9ed..5061bb304d 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -69,8 +69,6 @@ extern struct TimeBlendSettings currentTimeBlend; // Exported ROM declarations extern const struct UCoords32 gDirectionToVectors[]; -extern const struct BlendSettings gTimeOfDayBlend[]; - void DoWhiteOut(void); void Overworld_ResetStateAfterFly(void); void Overworld_ResetStateAfterTeleport(void); diff --git a/include/palette.h b/include/palette.h index 7e9ed0cae0..abb00be6ca 100644 --- a/include/palette.h +++ b/include/palette.h @@ -56,6 +56,8 @@ struct PaletteFadeControl u8 deltaY:4; // rate of change of blend coefficient }; +extern const struct BlendSettings gTimeOfDayBlend[]; + extern struct PaletteFadeControl gPaletteFade; extern u32 gPlttBufferTransferPending; extern u8 gPaletteDecompressionBuffer[];