diff --git a/src/nostalgia/modules/gfx/include/nostalgia/gfx/color.hpp b/src/nostalgia/modules/gfx/include/nostalgia/gfx/color.hpp index 68f17a596..f59dc82c7 100644 --- a/src/nostalgia/modules/gfx/include/nostalgia/gfx/color.hpp +++ b/src/nostalgia/modules/gfx/include/nostalgia/gfx/color.hpp @@ -142,9 +142,9 @@ constexpr Color16 color16(int r, int g, int b, int a = 0) noexcept { [[nodiscard]] constexpr Color16 color16(uint8_t r, uint8_t g, uint8_t b, uint8_t a = 0) noexcept { return static_cast(ox::min(r, 31)) - | static_cast(ox::min(g, 31) << 5) - | static_cast(ox::min(b, 31) << 10) - | static_cast(a << 15); + | static_cast(ox::min(g, 31) << 5) + | static_cast(ox::min(b, 31) << 10) + | static_cast(a << 15); } static_assert(color16(0, 31, 0) == 992); diff --git a/src/nostalgia/modules/gfx/src/studio/paletteeditor/paletteeditor-imgui.cpp b/src/nostalgia/modules/gfx/src/studio/paletteeditor/paletteeditor-imgui.cpp index d133843c0..af8d051e3 100644 --- a/src/nostalgia/modules/gfx/src/studio/paletteeditor/paletteeditor-imgui.cpp +++ b/src/nostalgia/modules/gfx/src/studio/paletteeditor/paletteeditor-imgui.cpp @@ -311,7 +311,7 @@ void PaletteEditorImGui::drawColorEditor() noexcept { { ImGui::PushStyleColor( ImGuiCol_ChildBg, - color32(color16(static_cast(r), static_cast(g), static_cast(b))) | 0xff'00'00'00); + color32(color16(r, g, b)) | 0xff'00'00'00); ImGui::BeginChild("ColorPreview", {0, 25}); ImGui::EndChild(); ImGui::PopStyleColor();