Move left palette index constants out of Colour.h

src/openrct2/drawing/Drawing.Sprite.cpp

@@ -33,6 +33,8 @@ using namespace OpenRCT2;
 using namespace OpenRCT2::Drawing;
 using namespace OpenRCT2::Ui;
 
+static constexpr uint8_t kPaletteLengthRemap = 12;
+
 /**
  * 12 elements from 0xF3 are the peep top colour, 12 elements from 0xCA are peep trouser colour
  *

src/openrct2/drawing/Drawing.cpp

@@ -34,6 +34,15 @@
 using namespace OpenRCT2;
 using namespace OpenRCT2::Drawing;
 
+static constexpr auto kPaletteOffsetDynamic = PaletteIndex::pi10;
+static constexpr uint8_t kPaletteLengthDynamic = 236;
+
+static constexpr uint8_t kPaletteLengthWaterWaves = 5;
+static constexpr uint8_t kPaletteLengthWaterSparkles = 5;
+
+static constexpr auto kPaletteOffsetAnimated = PaletteIndex::waterWaves0;
+static constexpr uint8_t kPaletteLengthAnimated = 16;
+
 static auto _defaultPaletteMapping = []() {
     std::array<PaletteIndex, 256> res;
     for (size_t i = 0; i < std::size(res); i++)

src/openrct2/drawing/TextColour.h

@@ -1,7 +1,17 @@
+/*****************************************************************************
+ * Copyright (c) 2014-2026 OpenRCT2 developers
+ *
+ * For a complete list of all authors, please refer to contributors.md
+ * Interested in contributing? Visit https://github.com/OpenRCT2/OpenRCT2
+ *
+ * OpenRCT2 is licensed under the GNU General Public License version 3.
+ *****************************************************************************/
+
 #pragma once
 
-#include "../interface/Colour.h"
+#include "PaletteIndex.h"
 
+#include <cstddef>
 #include <cstdint>
 
 namespace OpenRCT2::Drawing

src/openrct2/interface/Colour.h

@@ -10,7 +10,6 @@
 #pragma once
 
 #include "../core/StringTypes.h"
-#include "../drawing/PaletteIndex.h"
 
 #include <cstdint>
 #include <string_view>
@@ -97,17 +96,6 @@ enum
     COLOUR_DEEP_WATER = 50
 };
 
-constexpr auto kPaletteOffsetDynamic = OpenRCT2::Drawing::PaletteIndex::pi10;
-constexpr uint8_t kPaletteLengthDynamic = 236;
-
-constexpr uint8_t kPaletteLengthWaterWaves = 5;
-constexpr uint8_t kPaletteLengthWaterSparkles = 5;
-
-constexpr uint8_t kPaletteLengthRemap = 12;
-
-constexpr auto kPaletteOffsetAnimated = OpenRCT2::Drawing::PaletteIndex::waterWaves0;
-constexpr uint8_t kPaletteLengthAnimated = 16;
-
 constexpr uint8_t kColourNumOriginal = 32;
 constexpr uint8_t kColourNumNormal = 54;
 

src/openrct2/object/TerrainSurfaceObject.h

@@ -10,6 +10,7 @@
 #pragma once
 
 #include "../core/Money.hpp"
+#include "../drawing/PaletteIndex.h"
 #include "../interface/Colour.h"
 #include "Object.h"
 

src/openrct2/world/tile_element/LargeSceneryElement.cpp

@@ -9,6 +9,7 @@
 
 #include "LargeSceneryElement.h"
 
+#include "../../interface/Colour.h"
 #include "../../object/LargeSceneryEntry.h"
 #include "../../object/ObjectEntryManager.h"
 #include "../../object/ObjectManager.h"