diff --git a/src/openrct2/drawing/Drawing.cpp b/src/openrct2/drawing/Drawing.cpp index 48f419e213..655e4748fe 100644 --- a/src/openrct2/drawing/Drawing.cpp +++ b/src/openrct2/drawing/Drawing.cpp @@ -781,13 +781,12 @@ void LoadPalette() return; } + uint32_t palette = SPR_DEFAULT_PALETTE; + auto water_type = OpenRCT2::ObjectManager::GetObjectEntry(0); - - uint32_t palette = 0x5FC; - if (water_type != nullptr) { - Guard::Assert(water_type->image_id != 0xFFFFFFFF, "Failed to load water palette"); + Guard::Assert(water_type->image_id != ImageIndexUndefined, "Failed to load water palette"); palette = water_type->image_id; } diff --git a/src/openrct2/sprites.h b/src/openrct2/sprites.h index 90c6f68439..235fe5d510 100644 --- a/src/openrct2/sprites.h +++ b/src/openrct2/sprites.h @@ -19,6 +19,8 @@ enum // Used for on-demand drawing of dynamic memory SPR_TEMP = 0x7FFFE, + SPR_DEFAULT_PALETTE = 1532, + SPR_SCROLLING_TEXT_LEGACY_START = 1542, SPR_SCROLLING_TEXT_LEGACY_END = SPR_SCROLLING_TEXT_LEGACY_START + OpenRCT2::MaxScrollingTextLegacyEntries, SPR_SCROLLING_TEXT_DEFAULT = 1574,