From 4ba7383b22f702e087427d1c9560241e1b1d9c2b Mon Sep 17 00:00:00 2001 From: HylianFreddy <82058772+HylianFreddy@users.noreply.github.com> Date: Sat, 30 Dec 2023 22:25:59 +0100 Subject: [PATCH] formatting --- code/src/colors.c | 9 +++++---- code/src/fairy.c | 8 ++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/code/src/colors.c b/code/src/colors.c index f571d35f..032f31ac 100644 --- a/code/src/colors.c +++ b/code/src/colors.c @@ -2,7 +2,8 @@ #include "colors.h" #include "common.h" -// This function is taken from OoTR: https://github.com/OoTRandomizer/OoT-Randomizer/blob/1827fbb8089d3fe3e816a297a5f3ce2c99a6e0c5/ASM/c/rainbow.c +// This function is taken from OoTR: +// https://github.com/OoTRandomizer/OoT-Randomizer/blob/1827fbb8089d3fe3e816a297a5f3ce2c99a6e0c5/ASM/c/rainbow.c Color_RGBA8 Colors_GetRainbowColor(u32 curFrame, u32 stepFrames) { static Color_RGBA8 cycleColors[] = { { 0xE0, 0x10, 0x10, 0x00 }, // red @@ -35,7 +36,7 @@ Color_RGBA8 Colors_GetRainbowColor(u32 curFrame, u32 stepFrames) { void Colors_ChangeRainbowColorRGBA8(Color_RGBA8* color, u32 stepFrames, u8 stepOffset) { Color_RGBA8 newColor = Colors_GetRainbowColor(rGameplayFrames + stepOffset * stepFrames, stepFrames); - color->r = newColor.r; - color->g = newColor.g; - color->b = newColor.b; + color->r = newColor.r; + color->g = newColor.g; + color->b = newColor.b; } diff --git a/code/src/fairy.c b/code/src/fairy.c index e32c6d5b..0c5ec07f 100644 --- a/code/src/fairy.c +++ b/code/src/fairy.c @@ -72,7 +72,7 @@ void Fairy_ApplyColorToTargetCMAB(void* cmab, Color_RGBA8 color8) { void Fairy_UpdateRainbowNaviColors(EnElf* navi) { if (Fairy_IsNaviInnerRainbowForActorType(lastTargetActorType)) { Color_RGBA8 newColor = Colors_GetRainbowColor(rGameplayFrames, NAVI_CYCLE_FRAMES_INNER); - staticRainbowColor = newColor; + staticRainbowColor = newColor; // Navi color components go up to 255.0f instead of 1.0f navi->innerColor.r = newColor.r / 1.0f; navi->innerColor.g = newColor.g / 1.0f; @@ -80,9 +80,9 @@ void Fairy_UpdateRainbowNaviColors(EnElf* navi) { } if (Fairy_IsNaviOuterRainbowForActorType(lastTargetActorType)) { Color_RGBA8 newColor = Colors_GetRainbowColor(rGameplayFrames, NAVI_CYCLE_FRAMES_OUTER); - navi->outerColor.r = newColor.r / 1.0f; - navi->outerColor.g = newColor.g / 1.0f; - navi->outerColor.b = newColor.b / 1.0f; + navi->outerColor.r = newColor.r / 1.0f; + navi->outerColor.g = newColor.g / 1.0f; + navi->outerColor.b = newColor.b / 1.0f; } // Handle target pointer color