From 77542118c41bde6066d370fc2156c2ddd2121a40 Mon Sep 17 00:00:00 2001 From: Trevor Finney <8711258+finneyt@users.noreply.github.com> Date: Mon, 20 Feb 2023 11:15:43 -0500 Subject: [PATCH] Add Glass Palettes --- data/language/en-GB.txt | 4 +- .../palette_map_glass_aqua_dark.png | Bin 0 -> 207 bytes .../palette_map_glass_bordeaux_red_dark.png | Bin 0 -> 202 bytes .../palette_map_glass_bordeaux_red_light.png | Bin 0 -> 204 bytes .../palette_map_glass_dark_olive_dark.png | Bin 0 -> 201 bytes .../palette_map_glass_dark_olive_light.png | Bin 0 -> 205 bytes .../palette_map_glass_dull_brown_dark.png | Bin 0 -> 205 bytes .../palette_map_glass_dull_brown_light.png | Bin 0 -> 208 bytes .../palette_map_glass_dull_green_dark.png | Bin 0 -> 205 bytes .../palette_map_glass_dull_green_light.png | Bin 0 -> 206 bytes .../palette_map_glass_dull_purple_light.png | Bin 0 -> 205 bytes .../palette_map_glass_grass_green_dark.png | Bin 0 -> 203 bytes .../palette_map_glass_grass_green_light.png | Bin 0 -> 202 bytes .../palette_map_glass_invisible.png | Bin 0 -> 604 bytes .../palette_map_glass_magenta_light.png | Bin 0 -> 206 bytes .../palette_map_glass_olive_dark.png | Bin 0 -> 210 bytes .../palette_map_glass_olive_light.png | Bin 0 -> 203 bytes .../palette_map_glass_orange_light.png | Bin 0 -> 198 bytes ...alette_map_glass_saturated_brown_light.png | Bin 0 -> 208 bytes ...alette_map_glass_saturated_green_light.png | Bin 0 -> 203 bytes ...alette_map_glass_saturated_purple_dark.png | Bin 0 -> 211 bytes ...lette_map_glass_saturated_purple_light.png | Bin 0 -> 206 bytes .../palette_map_glass_tan_dark.png | Bin 0 -> 194 bytes .../palette_map_glass_tan_light.png | Bin 0 -> 204 bytes .../g2/palette_map/palette_map_glass_void.png | Bin 0 -> 132 bytes resources/g2/sprites.json | 72 ++++++++++++++++++ src/openrct2/interface/Colour.cpp | 2 +- src/openrct2/sprites.h | 30 +++++++- 28 files changed, 102 insertions(+), 6 deletions(-) create mode 100644 resources/g2/palette_map/palette_map_glass_aqua_dark.png create mode 100644 resources/g2/palette_map/palette_map_glass_bordeaux_red_dark.png create mode 100644 resources/g2/palette_map/palette_map_glass_bordeaux_red_light.png create mode 100644 resources/g2/palette_map/palette_map_glass_dark_olive_dark.png create mode 100644 resources/g2/palette_map/palette_map_glass_dark_olive_light.png create mode 100644 resources/g2/palette_map/palette_map_glass_dull_brown_dark.png create mode 100644 resources/g2/palette_map/palette_map_glass_dull_brown_light.png create mode 100644 resources/g2/palette_map/palette_map_glass_dull_green_dark.png create mode 100644 resources/g2/palette_map/palette_map_glass_dull_green_light.png create mode 100644 resources/g2/palette_map/palette_map_glass_dull_purple_light.png create mode 100644 resources/g2/palette_map/palette_map_glass_grass_green_dark.png create mode 100644 resources/g2/palette_map/palette_map_glass_grass_green_light.png create mode 100644 resources/g2/palette_map/palette_map_glass_invisible.png create mode 100644 resources/g2/palette_map/palette_map_glass_magenta_light.png create mode 100644 resources/g2/palette_map/palette_map_glass_olive_dark.png create mode 100644 resources/g2/palette_map/palette_map_glass_olive_light.png create mode 100644 resources/g2/palette_map/palette_map_glass_orange_light.png create mode 100644 resources/g2/palette_map/palette_map_glass_saturated_brown_light.png create mode 100644 resources/g2/palette_map/palette_map_glass_saturated_green_light.png create mode 100644 resources/g2/palette_map/palette_map_glass_saturated_purple_dark.png create mode 100644 resources/g2/palette_map/palette_map_glass_saturated_purple_light.png create mode 100644 resources/g2/palette_map/palette_map_glass_tan_dark.png create mode 100644 resources/g2/palette_map/palette_map_glass_tan_light.png create mode 100644 resources/g2/palette_map/palette_map_glass_void.png diff --git a/data/language/en-GB.txt b/data/language/en-GB.txt index dbe35ec22c..6c12b48fa4 100644 --- a/data/language/en-GB.txt +++ b/data/language/en-GB.txt @@ -3657,7 +3657,7 @@ STR_6551 :Army green STR_6552 :Honeydew STR_6553 :Tan STR_6554 :Maroon -STR_6555 :Coral Pink +STR_6555 :Coral pink STR_6556 :Forest green STR_6557 :Chartreuse STR_6558 :Hunter green @@ -3665,7 +3665,7 @@ STR_6559 :Celadon STR_6560 :Lime green STR_6561 :Sepia STR_6562 :Peach -STR_6563 :Lilac +STR_6563 :Periwinkle STR_6564 :Viridian STR_6565 :Seafoam green STR_6566 :Violet diff --git a/resources/g2/palette_map/palette_map_glass_aqua_dark.png b/resources/g2/palette_map/palette_map_glass_aqua_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..9b7d605e5a1d65b248910dc4de43f9b5227a49aa GIT binary patch literal 207 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K57&+L0q+w)1IfzpnRtvY3H^?;r>>?wFYU7ATnF>Eak-;h&shaP7bTzlYq+iXVa+*iSJr z$?++$eQKN$>(b)L(BbN$B9YRtg=az-!=B23|7^J{9RG?=M}e+#1?0z2T8@+ zUIt$p8Ft;NpDO{Qdk&*RNa^|7v0YW+Q;DO>gTe~DWM4fCW$|k literal 0 HcmV?d00001 diff --git a/resources/g2/palette_map/palette_map_glass_bordeaux_red_dark.png b/resources/g2/palette_map/palette_map_glass_bordeaux_red_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..d5586f2acf68e4de30af49a518b348da20df04a4 GIT binary patch literal 202 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K57&+L0q+w)1IfzpnRtvY3H^?;r>>?wFYU7AP3+>Eak-;h!9mmhj`htE7hzgH8E+r$`&gadCnai`&)yRq~RtvY3H^?;r>>?wFYU7ATnL>Eak-;h)@-p8kKovs+uEz=w)YEshP% z&5jN2>^-h7E)pya5iU+mjtm{HA|eM~C6qL^A7Ak+@ay7Nogwy$%FT+)7BQV+>oh%b vB;f@!W656ctgHv0jKy>mPWrjIySp)H&vs)9ejc|QXc>d2tDnm{r-UW|Ml3-$ literal 0 HcmV?d00001 diff --git a/resources/g2/palette_map/palette_map_glass_dark_olive_dark.png b/resources/g2/palette_map/palette_map_glass_dark_olive_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..cdc2a77f8ff755515a1d2df08aab438f99ec401c GIT binary patch literal 201 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K57&+L0q+w)1IfzpnRtvY3H^?;r>>?wFYU7AP3!>Eak-;h$`BE&a#;C*4NOiVBB|#ZM(A zJb2i6fr;r3j}4QIgOt(%Wd(-x^^rv)KFtSK{0jWK_|?bN_cuP&XzpvYiQ!oyA1mL| tyGncszgqp{Q_&k_I0TZ@Q(p$UF-%HwV>%-IIRR)BgQu&X%Q~loCIGk7K?(o> literal 0 HcmV?d00001 diff --git a/resources/g2/palette_map/palette_map_glass_dark_olive_light.png b/resources/g2/palette_map/palette_map_glass_dark_olive_light.png new file mode 100644 index 0000000000000000000000000000000000000000..2b3b74fa5a20a028aa6264a8727d2d01affd6dbf GIT binary patch literal 205 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K57&+L0q+w)1IfzpnRtvY3H^?;r>>?wFYU7ATnH>Eak-;h+5F`?G)bkJ?z66%!VIY-)6G zXm)gHVE5o|$Yf*`WMdR$WD^w7WiWJhVQ~^qN$FW7A8Nm9p2t_?v@ZrNEk_z|Dr}tB wC&g2nU}>^fJM2uu>Gd-RtvY3H^?;r>>?wFYU7ATnH>Eak-;h!8Lp7!Ivqr=Qb0f8R{;-{E4 zRo+nC!oc3#(ZJB$(81B7uXIpBX(2<}`58u{KFtSK{0jWK_|?bN@f#EPnmarBVtAIw x$I8#>T_(PSU#jG_K@O1TaS?83{1OPWVKl}gy literal 0 HcmV?d00001 diff --git a/resources/g2/palette_map/palette_map_glass_dull_brown_light.png b/resources/g2/palette_map/palette_map_glass_dull_brown_light.png new file mode 100644 index 0000000000000000000000000000000000000000..d6d3b94fe259aff27cd18dacb56c06f2ab82bf30 GIT binary patch literal 208 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K57&+L0q+w)1IfzpnRtvY3H^?;r>>?wFYU7ATnN>Eak-;h$V`{rUg;hus{^iU|ikw>i2v zG&nlAuym+OxTuIoxHRN&atbO$GkJJ7T=n!g(U8e6-5mIJ@hkVM!YlVJQ)yRRzJ%!v zTjx`imV_6~j3s-8tEwJ+veh+Jxq0%$>JuCctzK?SS=Vp%04-$jboFyt=akR{0F%T* A0RR91 literal 0 HcmV?d00001 diff --git a/resources/g2/palette_map/palette_map_glass_dull_green_dark.png b/resources/g2/palette_map/palette_map_glass_dull_green_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..5dd90f23c0dc8bc9a8498cc95fcca6c14e2f5995 GIT binary patch literal 205 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K57&+L0q+w)1IfzpnRtvY3H^?;r>>?wFYU7ATnH>Eak-;h+5E+Oz-XKRdTH3j8?qk?mAc zLc+s`43}k?WO!_BYY)wDOX28p|_?7$B{#D1<|2xno%fn@*RbV)w yuB29>VV(FAezpIPjtOs&;SflEe(Y3h55xQSZcI0Jus8#4WAJqKb6Mw<&;$StDnpw9 literal 0 HcmV?d00001 diff --git a/resources/g2/palette_map/palette_map_glass_dull_green_light.png b/resources/g2/palette_map/palette_map_glass_dull_green_light.png new file mode 100644 index 0000000000000000000000000000000000000000..560f9eb5d995318a6a98a58921993af183210399 GIT binary patch literal 206 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K57&+L0q+w)1IfzpnRtvY3H^?;r>>?wFYU7ATnP>Eak-;h!v0KK=jsg7(%%g@B)j4;(&x z_<*tk!!ac#B?p~@3XDrsRZ=8UTv8645^2a0_`p#p5o*7xF2r`?t754l2`?k91342S yoE&-D>;xRH-!@pvsAr#kOk~mRtvY3H^?;r>>?wFYU7ATnH>Eak-;h$_`=Kufyle2PcP7ZEIS{vKl z8ysC6S{xl1Ji0p=3_HXUCQJ}Wm@rYWVMX&LJvqt6uiUTpuTl@H^*kxl*3=|mAgwZO w(xv8w{45u~mX+i*oc5n-*sNmB$|@zopr0MnvAtN;K2 literal 0 HcmV?d00001 diff --git a/resources/g2/palette_map/palette_map_glass_grass_green_dark.png b/resources/g2/palette_map/palette_map_glass_grass_green_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..de235de19b869a9cae3b1a513b8682988b2b6375 GIT binary patch literal 203 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K57&+L0q+w)1IfzpnRtvY3H^?;r>>?wFYU7ATnD>Eak-;h#LkOzhwP=gkbviU*WFFrG?E zc<>-G@qyrjh9ogIMvdqO_6|oAf$|WUhE;N*_N(ebY!$x>NA($4u&g+6G_7RLfeY+R vFRHHV>|~n0zvu~T1TTj`a{9X0QEm)>&$%(}=sK|qXcvR0tDnm{r-UW|qxwL> literal 0 HcmV?d00001 diff --git a/resources/g2/palette_map/palette_map_glass_grass_green_light.png b/resources/g2/palette_map/palette_map_glass_grass_green_light.png new file mode 100644 index 0000000000000000000000000000000000000000..617c8bcdbf456065a37b0b334e4079d245887a5b GIT binary patch literal 202 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K57&+L0q+w)1IfzpnRtvY3H^?;r>>?wFYU7AP3+>Eak-;h%iv`}F_+A8~OrD=IAf+}`Nk zz}yij!E(Tay_tbupgF_f8RKeU#!Ze37Ns0t@hkA_;#Zv^`x8z|vdPQK8c3^{C7u%G vsa0rLSAKSycEL|m?{yPWmM?$hPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!2kdb!2!6DYwZ940r5#hK~y+Tjgz5n z95E1v|C21Or8tr!xr%{-r7YM;3l1D8NI=zs0|5a60S78IAmG4(z=D#nyh7iieTTkP z`;EO9rKq*^X?$9H{LepgE3wWmE`D45*9tK<;+vR^lvHw7UZU~o>Qo_!Gbfz&#IW26 zkQ9^MCC1GCtcUFbzn!vu51cpHTmC@aK+Xsu74BBu&exn3ZyJMgAr=o#W%LS#4`D5N za2t)QYt7UUhe6R>etU=fBiHFl~3Ip2wa@PD`bf?4~EeRcY3Mz2(Zlz4WXzSk$J!<<=n(6J@*y#4=Qk8id z4Zq;*!Z~om1_Uh)JYC(tP%nqjVGQVPbAa|jEW}Ejn28Y%tD*@->4d(TpT09Pi>Vel zw7Y7g7N@H-X25#d`((KzITJlGk1~U6GnX4h@9+2ewf~7|G=txNVgB%HA@Zgz`)`?_ qrfa6Iue;sr+RtvY3H^?;r>>?wFYU7ATnP>Eak-;h((b*|z`o?vFT`6(@XhYIAIH zZ*Xj3ZVGh~k#G@7k%&lPk%$m+h+tX6cZ97`YH~y1*Tt{guL`fMb9Z2FKHb7(Ag!|P y$YKU(c^|&W_j9MP7X0kf)K$58a)ssz4hDuuHzpfBj`u+87(8A5T-G@yGywpC8a(a* literal 0 HcmV?d00001 diff --git a/resources/g2/palette_map/palette_map_glass_olive_dark.png b/resources/g2/palette_map/palette_map_glass_olive_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..bfda62a3f42f42735d9284db0c8a4000b417f3bf GIT binary patch literal 210 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K57&+L0q+w)1IfzpnRtvY3H^?;r>>?wFYU7ATnR>Eak-;h#LkeEPrtk9pad6%QzWVm_6W zARzD{;laa)43}(pm~3o#l!R<}goKz1&Ky=gBp`g5G1PWdUC7@RRZg#pi_{EUTy7jV zYGm{*;RQ2e$zEOE><6FR{q8WVW@JoyvnBLwDhtEQxo%81*~_bdRx)_H`njxgN@xNA DH`PL9 literal 0 HcmV?d00001 diff --git a/resources/g2/palette_map/palette_map_glass_olive_light.png b/resources/g2/palette_map/palette_map_glass_olive_light.png new file mode 100644 index 0000000000000000000000000000000000000000..73b86ac9c15d22305a211f25b414299de20ed3d0 GIT binary patch literal 203 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K57&+L0q+w)1IfzpnRtvY3H^?;r>>?wFYU7ATnD>Eak-;h(&P@7llm=ZE;&oE(leG&?#p zv^zGmw>!EtwL3aFG4xedxEzpRVPR1@P~zirZpE*_uZv%GhS(<_Vrgq>;V_U^2@Ag1 uw2+_W!q;^X8yWQOU)t2BVl8SZE6KQ!%Z;fzRL~G;7lWs(pUXO@geCy3_C8hs literal 0 HcmV?d00001 diff --git a/resources/g2/palette_map/palette_map_glass_orange_light.png b/resources/g2/palette_map/palette_map_glass_orange_light.png new file mode 100644 index 0000000000000000000000000000000000000000..54b518ba8d3894255146ec05c8e11df7e6055724 GIT binary patch literal 198 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K57&+L0q+w)1IfzpnRtvY3H^?;r>>?wFYU7AP3)>Eak-;h#Jw=lqBLPdkm66$6xur#rSb zGd4vwFd02^&^dfSf$@k^01p$BK$Vx*n-#wTzb<~&8FD^Ako(A60keQNew+dJyX*uU qu3Il<(X&rI=Qin0N=R=i3&S357pC7Fg0FzqFnGH9xvXRtvY3H^?;r>>?wFYU7ATnN>Eak-;h%iwyV(EzkJ$K`6$KW4Y;|mC zXKrGxkZ@sPk*IKSk*H8nkzi?<;qJn=#?Qfp(I@;!OV29#Q2SN$Jicm2aY@)1aUIB+ zaHD6E2v2Q-rODpvWhMunPCparIBD*jrfoe8ZMWQ*OrJ#F0$Rx6>FVdQ&MBb@0L+v> A%m4rY literal 0 HcmV?d00001 diff --git a/resources/g2/palette_map/palette_map_glass_saturated_green_light.png b/resources/g2/palette_map/palette_map_glass_saturated_green_light.png new file mode 100644 index 0000000000000000000000000000000000000000..7bb97ffa0e96f9ce0d93f178f02284afd3aa5db7 GIT binary patch literal 203 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K57&+L0q+w)1IfzpnRtvY3H^?;r>>?wFYU7ATnD>Eak-;h!wxpZ??g2KSkb3I#h)A5c8R zaO4dS6BAQ{j*RtvY3H^?;r>>?wFYU7ATnE>Eak-;h(%Ez2kqq^G^RtvY3H^?;r>>?wFYU7ATnP>Eak-;h)U&Z2kXwmlRHB#e~mlZH?{@ z4UO&X?T!vC9?Tm%I40;aE=gsPP%)`E@G50NNt4&%6~6+%E`HS+a$j&$o8q#g%xBm- yLoLo6yui-%qH1}{o5s`YXKZLvv95HLlw@Rl>BgkDrZ@~}9fPNRtvY3H^?;r>>?wFYU7AP3*>Eak-;h+5Fy4b(^N9_#EiU|ilGM-9G z5P0~o;Q|v=f==@>_Qp0*=>sMlJ*(tH?N`a||D_pSX0YQ$#(|>_zb<}lWY`rq!A|1$ niK)^FmI4aL{0`sR*~75rt{an;>zYMCD;PXo{an^LB{Ts5J(xge literal 0 HcmV?d00001 diff --git a/resources/g2/palette_map/palette_map_glass_tan_light.png b/resources/g2/palette_map/palette_map_glass_tan_light.png new file mode 100644 index 0000000000000000000000000000000000000000..2f7152e92b73d8e85d93d645fd80070c0cab6cb3 GIT binary patch literal 204 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K57&+L0q+w)1IfzpnRtvY3H^?;r>>?wFYU7ATnL>Eak-;h(Hie*NG62j}?NoD>{en;l&o z8XVi$oth2WI~bVxCAtj?I64}x7It_vyzH9N6Zm!UEBC9yE9=g;aPpWL3MQC&d2tDnm{r-UW|mTW&5 literal 0 HcmV?d00001 diff --git a/resources/g2/palette_map/palette_map_glass_void.png b/resources/g2/palette_map/palette_map_glass_void.png new file mode 100644 index 0000000000000000000000000000000000000000..c80ca77e7b2dd92dbc7b41a6088be59978b97085 GIT binary patch literal 132 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K57&+L0q+w)1IfzpnRtvY3H^?;r>>?wFYU7APp`>Eak-;h!uL9`^6N0hilB4T-`BPw(#T ZVW_#w!gS}ja5GR5gQu&X%Q~loCIDSdBKrUU literal 0 HcmV?d00001 diff --git a/resources/g2/sprites.json b/resources/g2/sprites.json index 91f727dc09..d47d64bc25 100644 --- a/resources/g2/sprites.json +++ b/resources/g2/sprites.json @@ -20660,5 +20660,77 @@ }, { "path": "palette_map/palette_map_void.png" + }, + { + "path": "palette_map/palette_map_glass_dark_olive_dark.png" + }, + { + "path": "palette_map/palette_map_glass_dark_olive_light.png" + }, + { + "path": "palette_map/palette_map_glass_saturated_brown_light.png" + }, + { + "path": "palette_map/palette_map_glass_bordeaux_red_dark.png" + }, + { + "path": "palette_map/palette_map_glass_bordeaux_red_light.png" + }, + { + "path": "palette_map/palette_map_glass_grass_green_dark.png" + }, + { + "path": "palette_map/palette_map_glass_grass_green_light.png" + }, + { + "path": "palette_map/palette_map_glass_olive_dark.png" + }, + { + "path": "palette_map/palette_map_glass_olive_light.png" + }, + { + "path": "palette_map/palette_map_glass_saturated_green_light.png" + }, + { + "path": "palette_map/palette_map_glass_tan_dark.png" + }, + { + "path": "palette_map/palette_map_glass_tan_light.png" + }, + { + "path": "palette_map/palette_map_glass_dull_purple_light.png" + }, + { + "path": "palette_map/palette_map_glass_dull_green_dark.png" + }, + { + "path": "palette_map/palette_map_glass_dull_green_light.png" + }, + { + "path": "palette_map/palette_map_glass_saturated_purple_dark.png" + }, + { + "path": "palette_map/palette_map_glass_saturated_purple_light.png" + }, + { + "path": "palette_map/palette_map_glass_orange_light.png" + }, + { + "path": "palette_map/palette_map_glass_aqua_dark.png" + }, + { + "path": "palette_map/palette_map_glass_magenta_light.png" + }, + { + "path": "palette_map/palette_map_glass_dull_brown_dark.png" + }, + { + "path": "palette_map/palette_map_glass_dull_brown_light.png" + }, + { + "path": "palette_map/palette_map_glass_invisible.png" + }, + { + "path": "palette_map/palette_map_glass_void.png" } ] diff --git a/src/openrct2/interface/Colour.cpp b/src/openrct2/interface/Colour.cpp index 1c7f6e1039..04981f08c9 100644 --- a/src/openrct2/interface/Colour.cpp +++ b/src/openrct2/interface/Colour.cpp @@ -59,7 +59,7 @@ void ColoursInitMaps() // G2 Palette Init for (int32_t i = COLOUR_NUM_ORIGINAL; i < COLOUR_COUNT; i++) { - const G1Element* g1 = GfxGetG1Element(SPR_G2_PAL_REMAP_BEGIN + i - COLOUR_NUM_ORIGINAL); + const G1Element* g1 = GfxGetG1Element(SPR_G2_PALETTE_BEGIN + i - COLOUR_NUM_ORIGINAL); if (g1 != nullptr) { ColourMapA[i].colour_0 = g1->offset[INDEX_COLOUR_0]; diff --git a/src/openrct2/sprites.h b/src/openrct2/sprites.h index 0dff54916d..2da7fba9d5 100644 --- a/src/openrct2/sprites.h +++ b/src/openrct2/sprites.h @@ -1364,7 +1364,7 @@ enum SPR_G2_ALPINE_LIFT_TRACK_GENTLE_DIAGONAL = SPR_G2_ALPINE_LIFT_TRACK_FLAT_DIAGONAL + 4, SPR_G2_ALPINE_END = SPR_G2_ALPINE_LIFT_TRACK_GENTLE_DIAGONAL + 12, - SPR_G2_PAL_REMAP_BEGIN = SPR_G2_ALPINE_END, + SPR_G2_PALETTE_BEGIN = SPR_G2_ALPINE_END, SPR_G2_PAL_REMAP_DARK_OLIVE_DARK, SPR_G2_PAL_REMAP_DARK_OLIVE_LIGHT, SPR_G2_PAL_REMAP_SATURATED_BROWN_LIGHT, @@ -1389,9 +1389,33 @@ enum SPR_G2_PAL_REMAP_DULL_BROWN_LIGHT, SPR_G2_PAL_REMAP_INVISIBLE, SPR_G2_PAL_REMAP_VOID, - SPR_G2_PAL_REMAP_END = SPR_G2_PAL_REMAP_VOID, + SPR_G2_PAL_GLASS_DARK_OLIVE_DARK, + SPR_G2_PAL_GLASS_DARK_OLIVE_LIGHT, + SPR_G2_PAL_GLASS_SATURATED_BROWN_LIGHT, + SPR_G2_PAL_GLASS_BORDEAUX_RED_DARK, + SPR_G2_PAL_GLASS_BORDEAUX_RED_LIGHT, + SPR_G2_PAL_GLASS_GRASS_GREEN_DARK, + SPR_G2_PAL_GLASS_GRASS_GREEN_LIGHT, + SPR_G2_PAL_GLASS_OLIVE_DARK, + SPR_G2_PAL_GLASS_OLIVE_LIGHT, + SPR_G2_PAL_GLASS_SATURATED_GREEN_LIGHT, + SPR_G2_PAL_GLASS_TAN_DARK, + SPR_G2_PAL_GLASS_TAN_LIGHT, + SPR_G2_PAL_GLASS_DULL_PURPLE_LIGHT, + SPR_G2_PAL_GLASS_DULL_GREEN_DARK, + SPR_G2_PAL_GLASS_DULL_GREEN_LIGHT, + SPR_G2_PAL_GLASS_SATURATED_PURPLE_DARK, + SPR_G2_PAL_GLASS_SATURATED_PURPLE_LIGHT, + SPR_G2_PAL_GLASS_ORANGE_LIGHT, + SPR_G2_PAL_GLASS_AQUA_DARK, + SPR_G2_PAL_GLASS_MAGENTA_LIGHT, + SPR_G2_PAL_GLASS_DULL_BROWN_DARK, + SPR_G2_PAL_GLASS_DULL_BROWN_LIGHT, + SPR_G2_PAL_GLASS_INVISIBLE, + SPR_G2_PAL_GLASS_VOID, + SPR_G2_PALETTE_END = SPR_G2_PAL_GLASS_VOID, - SPR_G2_END = SPR_G2_PAL_REMAP_END, + SPR_G2_END = SPR_G2_PALETTE_END, SPR_CSG_BEGIN = SPR_G2_END, SPR_CSG_END = SPR_CSG_BEGIN + RCT1::Limits::Num_LL_CSG_Entries,