From 35e33c00bc47f24655b1eb45a42ad7adddfa9394 Mon Sep 17 00:00:00 2001
From: cawtds <38510667+cawtds@users.noreply.github.com>
Date: Tue, 29 Oct 2024 20:50:49 +0100
Subject: [PATCH] seasonal tilesets for saffron city

---
 data/layouts/layouts.json                     |   2 +-
 data/maps/SaffronCity/map.json                |   8 ++-
 .../metatile_attributes.bin                   | Bin 0 -> 800 bytes
 .../saffron_city_autumn/metatiles.bin         | Bin 0 -> 3200 bytes
 .../saffron_city_autumn/palettes/00.pal       |  19 ++++++
 .../saffron_city_autumn/palettes/01.pal       |  19 ++++++
 .../saffron_city_autumn/palettes/02.pal       |  19 ++++++
 .../saffron_city_autumn/palettes/03.pal       |  19 ++++++
 .../saffron_city_autumn/palettes/04.pal       |  19 ++++++
 .../saffron_city_autumn/palettes/05.pal       |  19 ++++++
 .../saffron_city_autumn/palettes/06.pal       |  19 ++++++
 .../saffron_city_autumn/palettes/07.pal       |  19 ++++++
 .../saffron_city_autumn/palettes/08.pal       |  19 ++++++
 .../saffron_city_autumn/palettes/09.pal       |  19 ++++++
 .../saffron_city_autumn/palettes/10.pal       |  19 ++++++
 .../saffron_city_autumn/palettes/11.pal       |  19 ++++++
 .../saffron_city_autumn/palettes/12.pal       |  19 ++++++
 .../saffron_city_autumn/palettes/13.pal       |  19 ++++++
 .../saffron_city_autumn/palettes/14.pal       |  19 ++++++
 .../saffron_city_autumn/palettes/15.pal       |  19 ++++++
 .../secondary/saffron_city_autumn/tiles.png   | Bin 0 -> 2377 bytes
 .../metatile_attributes.bin                   | Bin 0 -> 800 bytes
 .../saffron_city_summer/metatiles.bin         | Bin 0 -> 3200 bytes
 .../saffron_city_summer/palettes/00.pal       |  19 ++++++
 .../saffron_city_summer/palettes/01.pal       |  19 ++++++
 .../saffron_city_summer/palettes/02.pal       |  19 ++++++
 .../saffron_city_summer/palettes/03.pal       |  19 ++++++
 .../saffron_city_summer/palettes/04.pal       |  19 ++++++
 .../saffron_city_summer/palettes/05.pal       |  19 ++++++
 .../saffron_city_summer/palettes/06.pal       |  19 ++++++
 .../saffron_city_summer/palettes/07.pal       |  19 ++++++
 .../saffron_city_summer/palettes/08.pal       |  19 ++++++
 .../saffron_city_summer/palettes/09.pal       |  19 ++++++
 .../saffron_city_summer/palettes/10.pal       |  19 ++++++
 .../saffron_city_summer/palettes/11.pal       |  19 ++++++
 .../saffron_city_summer/palettes/12.pal       |  19 ++++++
 .../saffron_city_summer/palettes/13.pal       |  19 ++++++
 .../saffron_city_summer/palettes/14.pal       |  19 ++++++
 .../saffron_city_summer/palettes/15.pal       |  19 ++++++
 .../secondary/saffron_city_summer/tiles.png   | Bin 0 -> 2377 bytes
 .../metatile_attributes.bin                   | Bin 0 -> 800 bytes
 .../saffron_city_winter/metatiles.bin         | Bin 0 -> 3200 bytes
 .../saffron_city_winter/palettes/00.pal       |  19 ++++++
 .../saffron_city_winter/palettes/01.pal       |  19 ++++++
 .../saffron_city_winter/palettes/02.pal       |  19 ++++++
 .../saffron_city_winter/palettes/03.pal       |  19 ++++++
 .../saffron_city_winter/palettes/04.pal       |  19 ++++++
 .../saffron_city_winter/palettes/05.pal       |  19 ++++++
 .../saffron_city_winter/palettes/06.pal       |  19 ++++++
 .../saffron_city_winter/palettes/07.pal       |  19 ++++++
 .../saffron_city_winter/palettes/08.pal       |  19 ++++++
 .../saffron_city_winter/palettes/09.pal       |  19 ++++++
 .../saffron_city_winter/palettes/10.pal       |  19 ++++++
 .../saffron_city_winter/palettes/11.pal       |  19 ++++++
 .../saffron_city_winter/palettes/12.pal       |  19 ++++++
 .../saffron_city_winter/palettes/13.pal       |  19 ++++++
 .../saffron_city_winter/palettes/14.pal       |  19 ++++++
 .../saffron_city_winter/palettes/15.pal       |  19 ++++++
 .../secondary/saffron_city_winter/tiles.png   | Bin 0 -> 2377 bytes
 src/data/tilesets/graphics.h                  |  57 ++++++++++++++++++
 src/data/tilesets/headers.h                   |  33 ++++++++++
 src/data/tilesets/metatiles.h                 |   9 +++
 src/tilesets.c                                |   6 ++
 63 files changed, 1023 insertions(+), 4 deletions(-)
 create mode 100644 data/tilesets/secondary/saffron_city_autumn/metatile_attributes.bin
 create mode 100644 data/tilesets/secondary/saffron_city_autumn/metatiles.bin
 create mode 100644 data/tilesets/secondary/saffron_city_autumn/palettes/00.pal
 create mode 100644 data/tilesets/secondary/saffron_city_autumn/palettes/01.pal
 create mode 100644 data/tilesets/secondary/saffron_city_autumn/palettes/02.pal
 create mode 100644 data/tilesets/secondary/saffron_city_autumn/palettes/03.pal
 create mode 100644 data/tilesets/secondary/saffron_city_autumn/palettes/04.pal
 create mode 100644 data/tilesets/secondary/saffron_city_autumn/palettes/05.pal
 create mode 100644 data/tilesets/secondary/saffron_city_autumn/palettes/06.pal
 create mode 100644 data/tilesets/secondary/saffron_city_autumn/palettes/07.pal
 create mode 100644 data/tilesets/secondary/saffron_city_autumn/palettes/08.pal
 create mode 100644 data/tilesets/secondary/saffron_city_autumn/palettes/09.pal
 create mode 100644 data/tilesets/secondary/saffron_city_autumn/palettes/10.pal
 create mode 100644 data/tilesets/secondary/saffron_city_autumn/palettes/11.pal
 create mode 100644 data/tilesets/secondary/saffron_city_autumn/palettes/12.pal
 create mode 100644 data/tilesets/secondary/saffron_city_autumn/palettes/13.pal
 create mode 100644 data/tilesets/secondary/saffron_city_autumn/palettes/14.pal
 create mode 100644 data/tilesets/secondary/saffron_city_autumn/palettes/15.pal
 create mode 100644 data/tilesets/secondary/saffron_city_autumn/tiles.png
 create mode 100644 data/tilesets/secondary/saffron_city_summer/metatile_attributes.bin
 create mode 100644 data/tilesets/secondary/saffron_city_summer/metatiles.bin
 create mode 100644 data/tilesets/secondary/saffron_city_summer/palettes/00.pal
 create mode 100644 data/tilesets/secondary/saffron_city_summer/palettes/01.pal
 create mode 100644 data/tilesets/secondary/saffron_city_summer/palettes/02.pal
 create mode 100644 data/tilesets/secondary/saffron_city_summer/palettes/03.pal
 create mode 100644 data/tilesets/secondary/saffron_city_summer/palettes/04.pal
 create mode 100644 data/tilesets/secondary/saffron_city_summer/palettes/05.pal
 create mode 100644 data/tilesets/secondary/saffron_city_summer/palettes/06.pal
 create mode 100644 data/tilesets/secondary/saffron_city_summer/palettes/07.pal
 create mode 100644 data/tilesets/secondary/saffron_city_summer/palettes/08.pal
 create mode 100644 data/tilesets/secondary/saffron_city_summer/palettes/09.pal
 create mode 100644 data/tilesets/secondary/saffron_city_summer/palettes/10.pal
 create mode 100644 data/tilesets/secondary/saffron_city_summer/palettes/11.pal
 create mode 100644 data/tilesets/secondary/saffron_city_summer/palettes/12.pal
 create mode 100644 data/tilesets/secondary/saffron_city_summer/palettes/13.pal
 create mode 100644 data/tilesets/secondary/saffron_city_summer/palettes/14.pal
 create mode 100644 data/tilesets/secondary/saffron_city_summer/palettes/15.pal
 create mode 100644 data/tilesets/secondary/saffron_city_summer/tiles.png
 create mode 100644 data/tilesets/secondary/saffron_city_winter/metatile_attributes.bin
 create mode 100644 data/tilesets/secondary/saffron_city_winter/metatiles.bin
 create mode 100644 data/tilesets/secondary/saffron_city_winter/palettes/00.pal
 create mode 100644 data/tilesets/secondary/saffron_city_winter/palettes/01.pal
 create mode 100644 data/tilesets/secondary/saffron_city_winter/palettes/02.pal
 create mode 100644 data/tilesets/secondary/saffron_city_winter/palettes/03.pal
 create mode 100644 data/tilesets/secondary/saffron_city_winter/palettes/04.pal
 create mode 100644 data/tilesets/secondary/saffron_city_winter/palettes/05.pal
 create mode 100644 data/tilesets/secondary/saffron_city_winter/palettes/06.pal
 create mode 100644 data/tilesets/secondary/saffron_city_winter/palettes/07.pal
 create mode 100644 data/tilesets/secondary/saffron_city_winter/palettes/08.pal
 create mode 100644 data/tilesets/secondary/saffron_city_winter/palettes/09.pal
 create mode 100644 data/tilesets/secondary/saffron_city_winter/palettes/10.pal
 create mode 100644 data/tilesets/secondary/saffron_city_winter/palettes/11.pal
 create mode 100644 data/tilesets/secondary/saffron_city_winter/palettes/12.pal
 create mode 100644 data/tilesets/secondary/saffron_city_winter/palettes/13.pal
 create mode 100644 data/tilesets/secondary/saffron_city_winter/palettes/14.pal
 create mode 100644 data/tilesets/secondary/saffron_city_winter/palettes/15.pal
 create mode 100644 data/tilesets/secondary/saffron_city_winter/tiles.png

diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json
index 6a8354437..31c410ba6 100644
--- a/data/layouts/layouts.json
+++ b/data/layouts/layouts.json
@@ -1016,7 +1016,7 @@
       "height": 60,
       "border_width": 2,
       "border_height": 2,
-      "primary_tileset": "gTileset_General",
+      "primary_tileset": "gTileset_GeneralAutumn",
       "secondary_tileset": "gTileset_LavenderTown",
       "border_filepath": "data/layouts/Route14/border.bin",
       "blockdata_filepath": "data/layouts/Route14/map.bin"
diff --git a/data/maps/SaffronCity/map.json b/data/maps/SaffronCity/map.json
index 31eb5193c..c83dc428c 100644
--- a/data/maps/SaffronCity/map.json
+++ b/data/maps/SaffronCity/map.json
@@ -35,7 +35,6 @@
       "direction": "right"
     }
   ],
-  "connections_no_include": true,
   "object_events": [
     {
       "type": "object",
@@ -355,7 +354,9 @@
       "dest_warp_id": "0"
     }
   ],
-  "coord_events": [],
+  "coord_events": [
+
+  ],
   "bg_events": [
     {
       "type": "sign",
@@ -429,5 +430,6 @@
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
       "script": "SaffronCity_EventScript_TrainerFanClubSign"
     }
-  ]
+  ],
+  "connections_no_include": true
 }
diff --git a/data/tilesets/secondary/saffron_city_autumn/metatile_attributes.bin b/data/tilesets/secondary/saffron_city_autumn/metatile_attributes.bin
new file mode 100644
index 0000000000000000000000000000000000000000..c6f6551c0f21d3604e156382f7089e1d589cdc63
GIT binary patch
literal 800
zcmb_YK@Na02;(Vznpgi}qR-aOF@a4Z$(j_Q1w=(WRuOo`RrJW2z_l#$&wkEif%<*O
z4u14=SEOx!_4fJyvc30sZfaU0;mrg}G-2!avS&n{8hNVO9_Fg+Git7`w@@os`gz<=
Oi!k@oBQ0PG<~RYguM7?V

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/saffron_city_autumn/metatiles.bin b/data/tilesets/secondary/saffron_city_autumn/metatiles.bin
new file mode 100644
index 0000000000000000000000000000000000000000..dd43794df62a3c4a938ad5f08ea01d60c0fc66b9
GIT binary patch
literal 3200
zcmZvcd2mxj7{DLpK^0Jv${`e)w{2oM#7RO_Xo2yh2<p@qA>tn%GdiP=3aI?2A_1bD
z9rx)*L1BEWaw(mp9>~>pi(#Z(t*9fVFd!p}BDW}t<9-R>W?%7TUZ=nJ?S8*KzFouk
z|7W&Hh&Kck7)?l~9-bq~QSq-5*~GVr?-JO4u9zp@6mO|`Qp^!dYhRhJOwZ4xGT0tm
zx({5s4_vxWWVeaK;(L|<YazrB@(bqsKzt}Z6`v{oNcR7{lYez)zVg2>T#*(T)!xmz
zB9q<fW%&j3Lwu{=UT_($7iBJSOI*JT?S`a>rgg4LS9y3?dUzW1HOcX}iZ<mF*}bAI
zd!)cZWZUEyY`<5wKjLZMEThe;{iyWlG`!dz)*F7v6VsE@@FIi%khXr{KdiI#>kNLK
zg>)YlKPvwO>3%Kqx>{dwr!uP*gZu5wI~jd_79<uXbY9q*lM9j^tb^`kJ1LBNIbA_@
zUU3;OXNCD~lk+Ro3yl9uZT*%emL=fD_RHk|@GJ1rq->EyUPtTb7TS;-2Yjoeb*zCl
zC|@00#~Roc#rggGLamR~XV;7Miov}mu~zdflce*~<l4lV<XAq2kKi}(U351+Ko8P)
zBkx5%j(ifqabbKn+r<vD1InMTFU>FaSNCtA8|il1qUN)SZl*hEew`urX0}<ad!9G3
zoot87zmaWVEo?i({X0odQN!utAfKkES&>teLO#V#vMwnjh2!2w+dcmMw8P`q_Zj+h
zu>Br?JKLA@W4<%=EbZ!;4)QsAj&*aoDc@OkhMB3Zicd&?Z>KQ-%l(~wC#0`;Y78GM
zcVh&vrL}AoU8UB~=lC7VA<AFkl%&d>GUfB9d?}K$Qn+7>=wiB3_D5bqYb6!9mMzKU
z$M|BlNb*W{9Uqjd2bd?^H#)<8qchw$*xyIKu`EJ};dXI-m+mXbQ6xEcfAx|e-y*lG
z<ZE2`AKp^w8!l%IZQ;@L=XtOk&y6bHdg)#%HoKes&3-1{6Wxtsqo2{=u;hKI`>{UI
zSLT*`{8h64bwAE0HyHV6EFb6b<2{Bxyti;X;19WB7yE-h0(@z{;E%W?6@z~gzemjv
z{P%izoaFmFaX7EO@FB|zlQ53AB<Ks41+5^iUt_2#v?tUWLKdNBNo|UoqaxZCZH;2Q
zDcUG$PgJd!oIs=1Wa%s{;o)YhIiSaz0*!%cbG#Whr<mJoT59&ywAYL`s*Nc|+-Q;9
zE`J!moOj6R{u-PQtlz`r5rTZd+8XLXdWLnM2#5g2XNG-2Labnw^i7pMc%Xi(%}OI~
zPRudXuO0{1<5<tI{?CzV<P|b2=Le4Pk^FXk2M0gwC+<Ho?mv!aASopvMZT5{@bF-A
z+%k-d7RHYUO3B4Qp?ztm{-tD4u0PgS!Jn@u^yB#p@i4!Y-^TI$6~>>h|0utS-^uUF
z%?Hls^ZW&#;Byq;%x~f2d9}Qa^7V*uWQ^z6Z;A<XJ!&7d@%%l&C-cYo6Dprx|8V{>
zj`P>^Lw#d@Jg=kpXg-18%`tzaJP{M+_@OQ20Dld+pJ04CpTS?{vz5Q|{9oiV`CL9P
z*B5g1jrENOW5GC%r%(L)SRh_868#VIsr*U)l=43$`#&xFqyJIz7@1CHkjdd`MU%s`
zieNlH$@Qo-^Ysr5>*M90?SbV3D~6R1tAIE>=pRrqq<*OUiur%BkJ*2T3pVnv_HXvz
zk$)n{$L&6`i;+MK`49WN-91*U_`Kv|5C19oiWvHi*}vNt?0*IJf5!i;|0Vy+e&j3b
zd&FRT$UW<O)$4p!{eW`A7+Q{TaO-|>>wa+S{vNTbbNTRmV|{dHyf3jHVEk}Cu^#>d
D#IYy$

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/saffron_city_autumn/palettes/00.pal b/data/tilesets/secondary/saffron_city_autumn/palettes/00.pal
new file mode 100644
index 000000000..9dcb673aa
--- /dev/null
+++ b/data/tilesets/secondary/saffron_city_autumn/palettes/00.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+189 255 139
+131 213 98
+57 148 49
+57 82 0
+115 98 98
+65 57 49
+255 0 255
+139 222 189
+255 197 115
+238 131 106
+197 49 65
+164 230 197
+115 205 164
+65 180 139
+24 164 106
diff --git a/data/tilesets/secondary/saffron_city_autumn/palettes/01.pal b/data/tilesets/secondary/saffron_city_autumn/palettes/01.pal
new file mode 100644
index 000000000..391d1e3d1
--- /dev/null
+++ b/data/tilesets/secondary/saffron_city_autumn/palettes/01.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+222 230 230
+197 205 213
+172 189 205
+131 131 139
+65 49 65
+230 238 238
+90 189 139
+255 0 255
+238 213 197
+222 189 164
+189 148 139
+156 115 115
+123 82 82
+90 57 74
+115 205 164
diff --git a/data/tilesets/secondary/saffron_city_autumn/palettes/02.pal b/data/tilesets/secondary/saffron_city_autumn/palettes/02.pal
new file mode 100644
index 000000000..6b019b884
--- /dev/null
+++ b/data/tilesets/secondary/saffron_city_autumn/palettes/02.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+246 246 255
+205 222 238
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+156 123 98
+197 172 139
+255 205 139
+238 148 115
+222 106 98
+205 82 74
+172 32 41
+74 131 197
diff --git a/data/tilesets/secondary/saffron_city_autumn/palettes/03.pal b/data/tilesets/secondary/saffron_city_autumn/palettes/03.pal
new file mode 100644
index 000000000..973765509
--- /dev/null
+++ b/data/tilesets/secondary/saffron_city_autumn/palettes/03.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+246 246 255
+205 222 238
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+230 222 164
+205 180 106
+156 213 255
+115 189 246
+98 164 222
+74 131 197
+49 98 164
+115 205 164
diff --git a/data/tilesets/secondary/saffron_city_autumn/palettes/04.pal b/data/tilesets/secondary/saffron_city_autumn/palettes/04.pal
new file mode 100644
index 000000000..702db8a90
--- /dev/null
+++ b/data/tilesets/secondary/saffron_city_autumn/palettes/04.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+222 222 172
+189 189 139
+156 156 106
+115 115 65
+255 255 213
+255 238 180
+238 222 156
+172 197 197
+148 189 189
+123 180 180
+230 246 255
+189 222 222
+172 213 222
+148 205 205
+255 255 255
diff --git a/data/tilesets/secondary/saffron_city_autumn/palettes/05.pal b/data/tilesets/secondary/saffron_city_autumn/palettes/05.pal
new file mode 100644
index 000000000..3a2db72a7
--- /dev/null
+++ b/data/tilesets/secondary/saffron_city_autumn/palettes/05.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+222 230 238
+172 189 205
+123 123 131
+90 90 115
+65 74 106
+230 222 164
+222 205 131
+205 180 106
+180 139 74
+238 230 139
+222 197 139
+213 189 106
+189 230 164
+172 222 164
+115 205 164
diff --git a/data/tilesets/secondary/saffron_city_autumn/palettes/06.pal b/data/tilesets/secondary/saffron_city_autumn/palettes/06.pal
new file mode 100644
index 000000000..93518605a
--- /dev/null
+++ b/data/tilesets/secondary/saffron_city_autumn/palettes/06.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
diff --git a/data/tilesets/secondary/saffron_city_autumn/palettes/07.pal b/data/tilesets/secondary/saffron_city_autumn/palettes/07.pal
new file mode 100644
index 000000000..93518605a
--- /dev/null
+++ b/data/tilesets/secondary/saffron_city_autumn/palettes/07.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
diff --git a/data/tilesets/secondary/saffron_city_autumn/palettes/08.pal b/data/tilesets/secondary/saffron_city_autumn/palettes/08.pal
new file mode 100644
index 000000000..b1e168855
--- /dev/null
+++ b/data/tilesets/secondary/saffron_city_autumn/palettes/08.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+197 197 197
+222 222 230
+148 164 180
+123 123 131
+65 74 106
+246 246 255
+205 164 255
+164 131 205
+123 90 164
+255 0 255
+255 0 255
+255 0 255
+164 131 205
+205 164 255
+90 90 115
diff --git a/data/tilesets/secondary/saffron_city_autumn/palettes/09.pal b/data/tilesets/secondary/saffron_city_autumn/palettes/09.pal
new file mode 100644
index 000000000..7a88fdbbf
--- /dev/null
+++ b/data/tilesets/secondary/saffron_city_autumn/palettes/09.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+255 255 255
+205 205 213
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+230 238 246
+255 238 139
+230 189 82
+238 148 115
+222 246 255
+172 230 255
+123 205 213
+197 106 74
diff --git a/data/tilesets/secondary/saffron_city_autumn/palettes/10.pal b/data/tilesets/secondary/saffron_city_autumn/palettes/10.pal
new file mode 100644
index 000000000..28745a938
--- /dev/null
+++ b/data/tilesets/secondary/saffron_city_autumn/palettes/10.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+24 255 82
+238 238 238
+222 222 230
+123 123 131
+172 189 205
+65 74 106
+222 222 205
+205 205 189
+180 180 164
+213 213 164
+189 189 139
+148 148 98
+32 82 164
+156 205 246
+82 164 205
+123 178 116
diff --git a/data/tilesets/secondary/saffron_city_autumn/palettes/11.pal b/data/tilesets/secondary/saffron_city_autumn/palettes/11.pal
new file mode 100644
index 000000000..d1ae629c8
--- /dev/null
+++ b/data/tilesets/secondary/saffron_city_autumn/palettes/11.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+246 246 255
+205 222 238
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+197 197 205
+49 98 164
+172 222 180
+139 189 148
+106 156 115
+82 131 90
+65 115 74
+255 0 255
diff --git a/data/tilesets/secondary/saffron_city_autumn/palettes/12.pal b/data/tilesets/secondary/saffron_city_autumn/palettes/12.pal
new file mode 100644
index 000000000..b66bd774a
--- /dev/null
+++ b/data/tilesets/secondary/saffron_city_autumn/palettes/12.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+255 255 255
+222 222 230
+139 156 172
+123 123 131
+82 82 106
+213 205 32
+246 238 74
+164 131 205
+164 156 16
+205 197 106
+255 255 148
+139 189 148
+74 131 197
+197 197 205
+115 189 246
diff --git a/data/tilesets/secondary/saffron_city_autumn/palettes/13.pal b/data/tilesets/secondary/saffron_city_autumn/palettes/13.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/saffron_city_autumn/palettes/13.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/saffron_city_autumn/palettes/14.pal b/data/tilesets/secondary/saffron_city_autumn/palettes/14.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/saffron_city_autumn/palettes/14.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/saffron_city_autumn/palettes/15.pal b/data/tilesets/secondary/saffron_city_autumn/palettes/15.pal
new file mode 100644
index 000000000..3ffc684ac
--- /dev/null
+++ b/data/tilesets/secondary/saffron_city_autumn/palettes/15.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+230 222 164
+222 205 131
+205 180 106
+213 213 197
+197 197 180
+164 164 148
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/saffron_city_autumn/tiles.png b/data/tilesets/secondary/saffron_city_autumn/tiles.png
new file mode 100644
index 0000000000000000000000000000000000000000..ea835f8ddf1b599a2aeff38b004fcdbfce767ea3
GIT binary patch
literal 2377
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

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/saffron_city_summer/metatile_attributes.bin b/data/tilesets/secondary/saffron_city_summer/metatile_attributes.bin
new file mode 100644
index 0000000000000000000000000000000000000000..c6f6551c0f21d3604e156382f7089e1d589cdc63
GIT binary patch
literal 800
zcmb_YK@Na02;(Vznpgi}qR-aOF@a4Z$(j_Q1w=(WRuOo`RrJW2z_l#$&wkEif%<*O
z4u14=SEOx!_4fJyvc30sZfaU0;mrg}G-2!avS&n{8hNVO9_Fg+Git7`w@@os`gz<=
Oi!k@oBQ0PG<~RYguM7?V

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/saffron_city_summer/metatiles.bin b/data/tilesets/secondary/saffron_city_summer/metatiles.bin
new file mode 100644
index 0000000000000000000000000000000000000000..dd43794df62a3c4a938ad5f08ea01d60c0fc66b9
GIT binary patch
literal 3200
zcmZvcd2mxj7{DLpK^0Jv${`e)w{2oM#7RO_Xo2yh2<p@qA>tn%GdiP=3aI?2A_1bD
z9rx)*L1BEWaw(mp9>~>pi(#Z(t*9fVFd!p}BDW}t<9-R>W?%7TUZ=nJ?S8*KzFouk
z|7W&Hh&Kck7)?l~9-bq~QSq-5*~GVr?-JO4u9zp@6mO|`Qp^!dYhRhJOwZ4xGT0tm
zx({5s4_vxWWVeaK;(L|<YazrB@(bqsKzt}Z6`v{oNcR7{lYez)zVg2>T#*(T)!xmz
zB9q<fW%&j3Lwu{=UT_($7iBJSOI*JT?S`a>rgg4LS9y3?dUzW1HOcX}iZ<mF*}bAI
zd!)cZWZUEyY`<5wKjLZMEThe;{iyWlG`!dz)*F7v6VsE@@FIi%khXr{KdiI#>kNLK
zg>)YlKPvwO>3%Kqx>{dwr!uP*gZu5wI~jd_79<uXbY9q*lM9j^tb^`kJ1LBNIbA_@
zUU3;OXNCD~lk+Ro3yl9uZT*%emL=fD_RHk|@GJ1rq->EyUPtTb7TS;-2Yjoeb*zCl
zC|@00#~Roc#rggGLamR~XV;7Miov}mu~zdflce*~<l4lV<XAq2kKi}(U351+Ko8P)
zBkx5%j(ifqabbKn+r<vD1InMTFU>FaSNCtA8|il1qUN)SZl*hEew`urX0}<ad!9G3
zoot87zmaWVEo?i({X0odQN!utAfKkES&>teLO#V#vMwnjh2!2w+dcmMw8P`q_Zj+h
zu>Br?JKLA@W4<%=EbZ!;4)QsAj&*aoDc@OkhMB3Zicd&?Z>KQ-%l(~wC#0`;Y78GM
zcVh&vrL}AoU8UB~=lC7VA<AFkl%&d>GUfB9d?}K$Qn+7>=wiB3_D5bqYb6!9mMzKU
z$M|BlNb*W{9Uqjd2bd?^H#)<8qchw$*xyIKu`EJ};dXI-m+mXbQ6xEcfAx|e-y*lG
z<ZE2`AKp^w8!l%IZQ;@L=XtOk&y6bHdg)#%HoKes&3-1{6Wxtsqo2{=u;hKI`>{UI
zSLT*`{8h64bwAE0HyHV6EFb6b<2{Bxyti;X;19WB7yE-h0(@z{;E%W?6@z~gzemjv
z{P%izoaFmFaX7EO@FB|zlQ53AB<Ks41+5^iUt_2#v?tUWLKdNBNo|UoqaxZCZH;2Q
zDcUG$PgJd!oIs=1Wa%s{;o)YhIiSaz0*!%cbG#Whr<mJoT59&ywAYL`s*Nc|+-Q;9
zE`J!moOj6R{u-PQtlz`r5rTZd+8XLXdWLnM2#5g2XNG-2Labnw^i7pMc%Xi(%}OI~
zPRudXuO0{1<5<tI{?CzV<P|b2=Le4Pk^FXk2M0gwC+<Ho?mv!aASopvMZT5{@bF-A
z+%k-d7RHYUO3B4Qp?ztm{-tD4u0PgS!Jn@u^yB#p@i4!Y-^TI$6~>>h|0utS-^uUF
z%?Hls^ZW&#;Byq;%x~f2d9}Qa^7V*uWQ^z6Z;A<XJ!&7d@%%l&C-cYo6Dprx|8V{>
zj`P>^Lw#d@Jg=kpXg-18%`tzaJP{M+_@OQ20Dld+pJ04CpTS?{vz5Q|{9oiV`CL9P
z*B5g1jrENOW5GC%r%(L)SRh_868#VIsr*U)l=43$`#&xFqyJIz7@1CHkjdd`MU%s`
zieNlH$@Qo-^Ysr5>*M90?SbV3D~6R1tAIE>=pRrqq<*OUiur%BkJ*2T3pVnv_HXvz
zk$)n{$L&6`i;+MK`49WN-91*U_`Kv|5C19oiWvHi*}vNt?0*IJf5!i;|0Vy+e&j3b
zd&FRT$UW<O)$4p!{eW`A7+Q{TaO-|>>wa+S{vNTbbNTRmV|{dHyf3jHVEk}Cu^#>d
D#IYy$

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/saffron_city_summer/palettes/00.pal b/data/tilesets/secondary/saffron_city_summer/palettes/00.pal
new file mode 100644
index 000000000..9dcb673aa
--- /dev/null
+++ b/data/tilesets/secondary/saffron_city_summer/palettes/00.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+189 255 139
+131 213 98
+57 148 49
+57 82 0
+115 98 98
+65 57 49
+255 0 255
+139 222 189
+255 197 115
+238 131 106
+197 49 65
+164 230 197
+115 205 164
+65 180 139
+24 164 106
diff --git a/data/tilesets/secondary/saffron_city_summer/palettes/01.pal b/data/tilesets/secondary/saffron_city_summer/palettes/01.pal
new file mode 100644
index 000000000..391d1e3d1
--- /dev/null
+++ b/data/tilesets/secondary/saffron_city_summer/palettes/01.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+222 230 230
+197 205 213
+172 189 205
+131 131 139
+65 49 65
+230 238 238
+90 189 139
+255 0 255
+238 213 197
+222 189 164
+189 148 139
+156 115 115
+123 82 82
+90 57 74
+115 205 164
diff --git a/data/tilesets/secondary/saffron_city_summer/palettes/02.pal b/data/tilesets/secondary/saffron_city_summer/palettes/02.pal
new file mode 100644
index 000000000..6b019b884
--- /dev/null
+++ b/data/tilesets/secondary/saffron_city_summer/palettes/02.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+246 246 255
+205 222 238
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+156 123 98
+197 172 139
+255 205 139
+238 148 115
+222 106 98
+205 82 74
+172 32 41
+74 131 197
diff --git a/data/tilesets/secondary/saffron_city_summer/palettes/03.pal b/data/tilesets/secondary/saffron_city_summer/palettes/03.pal
new file mode 100644
index 000000000..973765509
--- /dev/null
+++ b/data/tilesets/secondary/saffron_city_summer/palettes/03.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+246 246 255
+205 222 238
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+230 222 164
+205 180 106
+156 213 255
+115 189 246
+98 164 222
+74 131 197
+49 98 164
+115 205 164
diff --git a/data/tilesets/secondary/saffron_city_summer/palettes/04.pal b/data/tilesets/secondary/saffron_city_summer/palettes/04.pal
new file mode 100644
index 000000000..702db8a90
--- /dev/null
+++ b/data/tilesets/secondary/saffron_city_summer/palettes/04.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+222 222 172
+189 189 139
+156 156 106
+115 115 65
+255 255 213
+255 238 180
+238 222 156
+172 197 197
+148 189 189
+123 180 180
+230 246 255
+189 222 222
+172 213 222
+148 205 205
+255 255 255
diff --git a/data/tilesets/secondary/saffron_city_summer/palettes/05.pal b/data/tilesets/secondary/saffron_city_summer/palettes/05.pal
new file mode 100644
index 000000000..3a2db72a7
--- /dev/null
+++ b/data/tilesets/secondary/saffron_city_summer/palettes/05.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+222 230 238
+172 189 205
+123 123 131
+90 90 115
+65 74 106
+230 222 164
+222 205 131
+205 180 106
+180 139 74
+238 230 139
+222 197 139
+213 189 106
+189 230 164
+172 222 164
+115 205 164
diff --git a/data/tilesets/secondary/saffron_city_summer/palettes/06.pal b/data/tilesets/secondary/saffron_city_summer/palettes/06.pal
new file mode 100644
index 000000000..93518605a
--- /dev/null
+++ b/data/tilesets/secondary/saffron_city_summer/palettes/06.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
diff --git a/data/tilesets/secondary/saffron_city_summer/palettes/07.pal b/data/tilesets/secondary/saffron_city_summer/palettes/07.pal
new file mode 100644
index 000000000..93518605a
--- /dev/null
+++ b/data/tilesets/secondary/saffron_city_summer/palettes/07.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
diff --git a/data/tilesets/secondary/saffron_city_summer/palettes/08.pal b/data/tilesets/secondary/saffron_city_summer/palettes/08.pal
new file mode 100644
index 000000000..b1e168855
--- /dev/null
+++ b/data/tilesets/secondary/saffron_city_summer/palettes/08.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+197 197 197
+222 222 230
+148 164 180
+123 123 131
+65 74 106
+246 246 255
+205 164 255
+164 131 205
+123 90 164
+255 0 255
+255 0 255
+255 0 255
+164 131 205
+205 164 255
+90 90 115
diff --git a/data/tilesets/secondary/saffron_city_summer/palettes/09.pal b/data/tilesets/secondary/saffron_city_summer/palettes/09.pal
new file mode 100644
index 000000000..7a88fdbbf
--- /dev/null
+++ b/data/tilesets/secondary/saffron_city_summer/palettes/09.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+255 255 255
+205 205 213
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+230 238 246
+255 238 139
+230 189 82
+238 148 115
+222 246 255
+172 230 255
+123 205 213
+197 106 74
diff --git a/data/tilesets/secondary/saffron_city_summer/palettes/10.pal b/data/tilesets/secondary/saffron_city_summer/palettes/10.pal
new file mode 100644
index 000000000..8d78784f7
--- /dev/null
+++ b/data/tilesets/secondary/saffron_city_summer/palettes/10.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+24 255 82
+238 238 238
+222 222 230
+123 123 131
+172 189 205
+65 74 106
+222 222 205
+205 205 189
+180 180 164
+213 213 164
+189 189 139
+148 148 98
+32 82 164
+156 205 246
+82 164 205
+121 205 86
diff --git a/data/tilesets/secondary/saffron_city_summer/palettes/11.pal b/data/tilesets/secondary/saffron_city_summer/palettes/11.pal
new file mode 100644
index 000000000..d1ae629c8
--- /dev/null
+++ b/data/tilesets/secondary/saffron_city_summer/palettes/11.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+246 246 255
+205 222 238
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+197 197 205
+49 98 164
+172 222 180
+139 189 148
+106 156 115
+82 131 90
+65 115 74
+255 0 255
diff --git a/data/tilesets/secondary/saffron_city_summer/palettes/12.pal b/data/tilesets/secondary/saffron_city_summer/palettes/12.pal
new file mode 100644
index 000000000..b66bd774a
--- /dev/null
+++ b/data/tilesets/secondary/saffron_city_summer/palettes/12.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+255 255 255
+222 222 230
+139 156 172
+123 123 131
+82 82 106
+213 205 32
+246 238 74
+164 131 205
+164 156 16
+205 197 106
+255 255 148
+139 189 148
+74 131 197
+197 197 205
+115 189 246
diff --git a/data/tilesets/secondary/saffron_city_summer/palettes/13.pal b/data/tilesets/secondary/saffron_city_summer/palettes/13.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/saffron_city_summer/palettes/13.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/saffron_city_summer/palettes/14.pal b/data/tilesets/secondary/saffron_city_summer/palettes/14.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/saffron_city_summer/palettes/14.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/saffron_city_summer/palettes/15.pal b/data/tilesets/secondary/saffron_city_summer/palettes/15.pal
new file mode 100644
index 000000000..3ffc684ac
--- /dev/null
+++ b/data/tilesets/secondary/saffron_city_summer/palettes/15.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+230 222 164
+222 205 131
+205 180 106
+213 213 197
+197 197 180
+164 164 148
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/saffron_city_summer/tiles.png b/data/tilesets/secondary/saffron_city_summer/tiles.png
new file mode 100644
index 0000000000000000000000000000000000000000..ea835f8ddf1b599a2aeff38b004fcdbfce767ea3
GIT binary patch
literal 2377
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

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/saffron_city_winter/metatile_attributes.bin b/data/tilesets/secondary/saffron_city_winter/metatile_attributes.bin
new file mode 100644
index 0000000000000000000000000000000000000000..c6f6551c0f21d3604e156382f7089e1d589cdc63
GIT binary patch
literal 800
zcmb_YK@Na02;(Vznpgi}qR-aOF@a4Z$(j_Q1w=(WRuOo`RrJW2z_l#$&wkEif%<*O
z4u14=SEOx!_4fJyvc30sZfaU0;mrg}G-2!avS&n{8hNVO9_Fg+Git7`w@@os`gz<=
Oi!k@oBQ0PG<~RYguM7?V

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/saffron_city_winter/metatiles.bin b/data/tilesets/secondary/saffron_city_winter/metatiles.bin
new file mode 100644
index 0000000000000000000000000000000000000000..dd43794df62a3c4a938ad5f08ea01d60c0fc66b9
GIT binary patch
literal 3200
zcmZvcd2mxj7{DLpK^0Jv${`e)w{2oM#7RO_Xo2yh2<p@qA>tn%GdiP=3aI?2A_1bD
z9rx)*L1BEWaw(mp9>~>pi(#Z(t*9fVFd!p}BDW}t<9-R>W?%7TUZ=nJ?S8*KzFouk
z|7W&Hh&Kck7)?l~9-bq~QSq-5*~GVr?-JO4u9zp@6mO|`Qp^!dYhRhJOwZ4xGT0tm
zx({5s4_vxWWVeaK;(L|<YazrB@(bqsKzt}Z6`v{oNcR7{lYez)zVg2>T#*(T)!xmz
zB9q<fW%&j3Lwu{=UT_($7iBJSOI*JT?S`a>rgg4LS9y3?dUzW1HOcX}iZ<mF*}bAI
zd!)cZWZUEyY`<5wKjLZMEThe;{iyWlG`!dz)*F7v6VsE@@FIi%khXr{KdiI#>kNLK
zg>)YlKPvwO>3%Kqx>{dwr!uP*gZu5wI~jd_79<uXbY9q*lM9j^tb^`kJ1LBNIbA_@
zUU3;OXNCD~lk+Ro3yl9uZT*%emL=fD_RHk|@GJ1rq->EyUPtTb7TS;-2Yjoeb*zCl
zC|@00#~Roc#rggGLamR~XV;7Miov}mu~zdflce*~<l4lV<XAq2kKi}(U351+Ko8P)
zBkx5%j(ifqabbKn+r<vD1InMTFU>FaSNCtA8|il1qUN)SZl*hEew`urX0}<ad!9G3
zoot87zmaWVEo?i({X0odQN!utAfKkES&>teLO#V#vMwnjh2!2w+dcmMw8P`q_Zj+h
zu>Br?JKLA@W4<%=EbZ!;4)QsAj&*aoDc@OkhMB3Zicd&?Z>KQ-%l(~wC#0`;Y78GM
zcVh&vrL}AoU8UB~=lC7VA<AFkl%&d>GUfB9d?}K$Qn+7>=wiB3_D5bqYb6!9mMzKU
z$M|BlNb*W{9Uqjd2bd?^H#)<8qchw$*xyIKu`EJ};dXI-m+mXbQ6xEcfAx|e-y*lG
z<ZE2`AKp^w8!l%IZQ;@L=XtOk&y6bHdg)#%HoKes&3-1{6Wxtsqo2{=u;hKI`>{UI
zSLT*`{8h64bwAE0HyHV6EFb6b<2{Bxyti;X;19WB7yE-h0(@z{;E%W?6@z~gzemjv
z{P%izoaFmFaX7EO@FB|zlQ53AB<Ks41+5^iUt_2#v?tUWLKdNBNo|UoqaxZCZH;2Q
zDcUG$PgJd!oIs=1Wa%s{;o)YhIiSaz0*!%cbG#Whr<mJoT59&ywAYL`s*Nc|+-Q;9
zE`J!moOj6R{u-PQtlz`r5rTZd+8XLXdWLnM2#5g2XNG-2Labnw^i7pMc%Xi(%}OI~
zPRudXuO0{1<5<tI{?CzV<P|b2=Le4Pk^FXk2M0gwC+<Ho?mv!aASopvMZT5{@bF-A
z+%k-d7RHYUO3B4Qp?ztm{-tD4u0PgS!Jn@u^yB#p@i4!Y-^TI$6~>>h|0utS-^uUF
z%?Hls^ZW&#;Byq;%x~f2d9}Qa^7V*uWQ^z6Z;A<XJ!&7d@%%l&C-cYo6Dprx|8V{>
zj`P>^Lw#d@Jg=kpXg-18%`tzaJP{M+_@OQ20Dld+pJ04CpTS?{vz5Q|{9oiV`CL9P
z*B5g1jrENOW5GC%r%(L)SRh_868#VIsr*U)l=43$`#&xFqyJIz7@1CHkjdd`MU%s`
zieNlH$@Qo-^Ysr5>*M90?SbV3D~6R1tAIE>=pRrqq<*OUiur%BkJ*2T3pVnv_HXvz
zk$)n{$L&6`i;+MK`49WN-91*U_`Kv|5C19oiWvHi*}vNt?0*IJf5!i;|0Vy+e&j3b
zd&FRT$UW<O)$4p!{eW`A7+Q{TaO-|>>wa+S{vNTbbNTRmV|{dHyf3jHVEk}Cu^#>d
D#IYy$

literal 0
HcmV?d00001

diff --git a/data/tilesets/secondary/saffron_city_winter/palettes/00.pal b/data/tilesets/secondary/saffron_city_winter/palettes/00.pal
new file mode 100644
index 000000000..9dcb673aa
--- /dev/null
+++ b/data/tilesets/secondary/saffron_city_winter/palettes/00.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+189 255 139
+131 213 98
+57 148 49
+57 82 0
+115 98 98
+65 57 49
+255 0 255
+139 222 189
+255 197 115
+238 131 106
+197 49 65
+164 230 197
+115 205 164
+65 180 139
+24 164 106
diff --git a/data/tilesets/secondary/saffron_city_winter/palettes/01.pal b/data/tilesets/secondary/saffron_city_winter/palettes/01.pal
new file mode 100644
index 000000000..391d1e3d1
--- /dev/null
+++ b/data/tilesets/secondary/saffron_city_winter/palettes/01.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+222 230 230
+197 205 213
+172 189 205
+131 131 139
+65 49 65
+230 238 238
+90 189 139
+255 0 255
+238 213 197
+222 189 164
+189 148 139
+156 115 115
+123 82 82
+90 57 74
+115 205 164
diff --git a/data/tilesets/secondary/saffron_city_winter/palettes/02.pal b/data/tilesets/secondary/saffron_city_winter/palettes/02.pal
new file mode 100644
index 000000000..6b019b884
--- /dev/null
+++ b/data/tilesets/secondary/saffron_city_winter/palettes/02.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+246 246 255
+205 222 238
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+156 123 98
+197 172 139
+255 205 139
+238 148 115
+222 106 98
+205 82 74
+172 32 41
+74 131 197
diff --git a/data/tilesets/secondary/saffron_city_winter/palettes/03.pal b/data/tilesets/secondary/saffron_city_winter/palettes/03.pal
new file mode 100644
index 000000000..973765509
--- /dev/null
+++ b/data/tilesets/secondary/saffron_city_winter/palettes/03.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+246 246 255
+205 222 238
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+230 222 164
+205 180 106
+156 213 255
+115 189 246
+98 164 222
+74 131 197
+49 98 164
+115 205 164
diff --git a/data/tilesets/secondary/saffron_city_winter/palettes/04.pal b/data/tilesets/secondary/saffron_city_winter/palettes/04.pal
new file mode 100644
index 000000000..702db8a90
--- /dev/null
+++ b/data/tilesets/secondary/saffron_city_winter/palettes/04.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+222 222 172
+189 189 139
+156 156 106
+115 115 65
+255 255 213
+255 238 180
+238 222 156
+172 197 197
+148 189 189
+123 180 180
+230 246 255
+189 222 222
+172 213 222
+148 205 205
+255 255 255
diff --git a/data/tilesets/secondary/saffron_city_winter/palettes/05.pal b/data/tilesets/secondary/saffron_city_winter/palettes/05.pal
new file mode 100644
index 000000000..3a2db72a7
--- /dev/null
+++ b/data/tilesets/secondary/saffron_city_winter/palettes/05.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+222 230 238
+172 189 205
+123 123 131
+90 90 115
+65 74 106
+230 222 164
+222 205 131
+205 180 106
+180 139 74
+238 230 139
+222 197 139
+213 189 106
+189 230 164
+172 222 164
+115 205 164
diff --git a/data/tilesets/secondary/saffron_city_winter/palettes/06.pal b/data/tilesets/secondary/saffron_city_winter/palettes/06.pal
new file mode 100644
index 000000000..93518605a
--- /dev/null
+++ b/data/tilesets/secondary/saffron_city_winter/palettes/06.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
diff --git a/data/tilesets/secondary/saffron_city_winter/palettes/07.pal b/data/tilesets/secondary/saffron_city_winter/palettes/07.pal
new file mode 100644
index 000000000..93518605a
--- /dev/null
+++ b/data/tilesets/secondary/saffron_city_winter/palettes/07.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
+0 0 255
diff --git a/data/tilesets/secondary/saffron_city_winter/palettes/08.pal b/data/tilesets/secondary/saffron_city_winter/palettes/08.pal
new file mode 100644
index 000000000..b1e168855
--- /dev/null
+++ b/data/tilesets/secondary/saffron_city_winter/palettes/08.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+197 197 197
+222 222 230
+148 164 180
+123 123 131
+65 74 106
+246 246 255
+205 164 255
+164 131 205
+123 90 164
+255 0 255
+255 0 255
+255 0 255
+164 131 205
+205 164 255
+90 90 115
diff --git a/data/tilesets/secondary/saffron_city_winter/palettes/09.pal b/data/tilesets/secondary/saffron_city_winter/palettes/09.pal
new file mode 100644
index 000000000..7a88fdbbf
--- /dev/null
+++ b/data/tilesets/secondary/saffron_city_winter/palettes/09.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 255
+255 255 255
+205 205 213
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+230 238 246
+255 238 139
+230 189 82
+238 148 115
+222 246 255
+172 230 255
+123 205 213
+197 106 74
diff --git a/data/tilesets/secondary/saffron_city_winter/palettes/10.pal b/data/tilesets/secondary/saffron_city_winter/palettes/10.pal
new file mode 100644
index 000000000..e14a6898d
--- /dev/null
+++ b/data/tilesets/secondary/saffron_city_winter/palettes/10.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+24 255 82
+238 238 238
+222 222 230
+123 123 131
+172 189 205
+65 74 106
+222 222 205
+205 205 189
+180 180 164
+213 213 164
+189 189 139
+148 148 98
+32 82 164
+156 205 246
+82 164 205
+255 255 255
diff --git a/data/tilesets/secondary/saffron_city_winter/palettes/11.pal b/data/tilesets/secondary/saffron_city_winter/palettes/11.pal
new file mode 100644
index 000000000..d1ae629c8
--- /dev/null
+++ b/data/tilesets/secondary/saffron_city_winter/palettes/11.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+246 246 255
+205 222 238
+172 189 205
+148 164 180
+123 123 131
+90 90 115
+65 74 106
+197 197 205
+49 98 164
+172 222 180
+139 189 148
+106 156 115
+82 131 90
+65 115 74
+255 0 255
diff --git a/data/tilesets/secondary/saffron_city_winter/palettes/12.pal b/data/tilesets/secondary/saffron_city_winter/palettes/12.pal
new file mode 100644
index 000000000..b66bd774a
--- /dev/null
+++ b/data/tilesets/secondary/saffron_city_winter/palettes/12.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 205 164
+255 255 255
+222 222 230
+139 156 172
+123 123 131
+82 82 106
+213 205 32
+246 238 74
+164 131 205
+164 156 16
+205 197 106
+255 255 148
+139 189 148
+74 131 197
+197 197 205
+115 189 246
diff --git a/data/tilesets/secondary/saffron_city_winter/palettes/13.pal b/data/tilesets/secondary/saffron_city_winter/palettes/13.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/saffron_city_winter/palettes/13.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/saffron_city_winter/palettes/14.pal b/data/tilesets/secondary/saffron_city_winter/palettes/14.pal
new file mode 100644
index 000000000..4b0812f09
--- /dev/null
+++ b/data/tilesets/secondary/saffron_city_winter/palettes/14.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/saffron_city_winter/palettes/15.pal b/data/tilesets/secondary/saffron_city_winter/palettes/15.pal
new file mode 100644
index 000000000..3ffc684ac
--- /dev/null
+++ b/data/tilesets/secondary/saffron_city_winter/palettes/15.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+230 222 164
+222 205 131
+205 180 106
+213 213 197
+197 197 180
+164 164 148
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/data/tilesets/secondary/saffron_city_winter/tiles.png b/data/tilesets/secondary/saffron_city_winter/tiles.png
new file mode 100644
index 0000000000000000000000000000000000000000..ea835f8ddf1b599a2aeff38b004fcdbfce767ea3
GIT binary patch
literal 2377
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

literal 0
HcmV?d00001

diff --git a/src/data/tilesets/graphics.h b/src/data/tilesets/graphics.h
index bf1651573..4ae649123 100644
--- a/src/data/tilesets/graphics.h
+++ b/src/data/tilesets/graphics.h
@@ -1635,3 +1635,60 @@ const u16 gTilesetPalettes_LavenderTownWinter[][16] =
 };
 
 const u32 gTilesetTiles_LavenderTownWinter[] = INCBIN_U32("data/tilesets/secondary/lavender_town_winter/tiles.4bpp.lz");
+
+const u16 gTilesetPalettes_SaffronCitySummer[][16] =
+{
+    INCBIN_U16("data/tilesets/secondary/saffron_city_summer/palettes/00.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/saffron_city_summer/palettes/01.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/saffron_city_summer/palettes/02.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/saffron_city_summer/palettes/03.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/saffron_city_summer/palettes/04.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/saffron_city_summer/palettes/05.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/saffron_city_summer/palettes/06.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/saffron_city_summer/palettes/07.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/saffron_city_summer/palettes/08.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/saffron_city_summer/palettes/09.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/saffron_city_summer/palettes/10.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/saffron_city_summer/palettes/11.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/saffron_city_summer/palettes/12.gbapal"),
+};
+
+const u32 gTilesetTiles_SaffronCitySummer[] = INCBIN_U32("data/tilesets/secondary/saffron_city_summer/tiles.4bpp.lz");
+
+const u16 gTilesetPalettes_SaffronCityAutumn[][16] =
+{
+    INCBIN_U16("data/tilesets/secondary/saffron_city_autumn/palettes/00.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/saffron_city_autumn/palettes/01.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/saffron_city_autumn/palettes/02.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/saffron_city_autumn/palettes/03.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/saffron_city_autumn/palettes/04.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/saffron_city_autumn/palettes/05.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/saffron_city_autumn/palettes/06.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/saffron_city_autumn/palettes/07.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/saffron_city_autumn/palettes/08.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/saffron_city_autumn/palettes/09.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/saffron_city_autumn/palettes/10.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/saffron_city_autumn/palettes/11.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/saffron_city_autumn/palettes/12.gbapal"),
+};
+
+const u32 gTilesetTiles_SaffronCityAutumn[] = INCBIN_U32("data/tilesets/secondary/saffron_city_autumn/tiles.4bpp.lz");
+
+const u16 gTilesetPalettes_SaffronCityWinter[][16] =
+{
+    INCBIN_U16("data/tilesets/secondary/saffron_city_winter/palettes/00.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/saffron_city_winter/palettes/01.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/saffron_city_winter/palettes/02.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/saffron_city_winter/palettes/03.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/saffron_city_winter/palettes/04.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/saffron_city_winter/palettes/05.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/saffron_city_winter/palettes/06.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/saffron_city_winter/palettes/07.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/saffron_city_winter/palettes/08.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/saffron_city_winter/palettes/09.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/saffron_city_winter/palettes/10.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/saffron_city_winter/palettes/11.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/saffron_city_winter/palettes/12.gbapal"),
+};
+
+const u32 gTilesetTiles_SaffronCityWinter[] = INCBIN_U32("data/tilesets/secondary/saffron_city_winter/tiles.4bpp.lz");
diff --git a/src/data/tilesets/headers.h b/src/data/tilesets/headers.h
index 017f30356..1311ace3b 100644
--- a/src/data/tilesets/headers.h
+++ b/src/data/tilesets/headers.h
@@ -878,3 +878,36 @@ const struct Tileset gTileset_LavenderTownWinter =
     .metatileAttributes = gMetatileAttributes_LavenderTownWinter,
     .callback = NULL,
 };
+
+const struct Tileset gTileset_SaffronCitySummer =
+{
+    .isCompressed = TRUE,
+    .isSecondary = TRUE,
+    .tiles = gTilesetTiles_SaffronCitySummer,
+    .palettes = gTilesetPalettes_SaffronCitySummer,
+    .metatiles = gMetatiles_SaffronCitySummer,
+    .metatileAttributes = gMetatileAttributes_SaffronCitySummer,
+    .callback = NULL,
+};
+
+const struct Tileset gTileset_SaffronCityAutumn =
+{
+    .isCompressed = TRUE,
+    .isSecondary = TRUE,
+    .tiles = gTilesetTiles_SaffronCityAutumn,
+    .palettes = gTilesetPalettes_SaffronCityAutumn,
+    .metatiles = gMetatiles_SaffronCityAutumn,
+    .metatileAttributes = gMetatileAttributes_SaffronCityAutumn,
+    .callback = NULL,
+};
+
+const struct Tileset gTileset_SaffronCityWinter =
+{
+    .isCompressed = TRUE,
+    .isSecondary = TRUE,
+    .tiles = gTilesetTiles_SaffronCityWinter,
+    .palettes = gTilesetPalettes_SaffronCityWinter,
+    .metatiles = gMetatiles_SaffronCityWinter,
+    .metatileAttributes = gMetatileAttributes_SaffronCityWinter,
+    .callback = NULL,
+};
diff --git a/src/data/tilesets/metatiles.h b/src/data/tilesets/metatiles.h
index a4ef18007..4a7b76496 100644
--- a/src/data/tilesets/metatiles.h
+++ b/src/data/tilesets/metatiles.h
@@ -237,3 +237,12 @@ const u32 gMetatileAttributes_LavenderTownAutumn[] = INCBIN_U32("data/tilesets/s
 
 const u16 gMetatiles_LavenderTownWinter[] = INCBIN_U16("data/tilesets/secondary/lavender_town_winter/metatiles.bin");
 const u32 gMetatileAttributes_LavenderTownWinter[] = INCBIN_U32("data/tilesets/secondary/lavender_town_winter/metatile_attributes.bin");
+
+const u16 gMetatiles_SaffronCitySummer[] = INCBIN_U16("data/tilesets/secondary/saffron_city_summer/metatiles.bin");
+const u32 gMetatileAttributes_SaffronCitySummer[] = INCBIN_U32("data/tilesets/secondary/saffron_city_summer/metatile_attributes.bin");
+
+const u16 gMetatiles_SaffronCityAutumn[] = INCBIN_U16("data/tilesets/secondary/saffron_city_autumn/metatiles.bin");
+const u32 gMetatileAttributes_SaffronCityAutumn[] = INCBIN_U32("data/tilesets/secondary/saffron_city_autumn/metatile_attributes.bin");
+
+const u16 gMetatiles_SaffronCityWinter[] = INCBIN_U16("data/tilesets/secondary/saffron_city_winter/metatiles.bin");
+const u32 gMetatileAttributes_SaffronCityWinter[] = INCBIN_U32("data/tilesets/secondary/saffron_city_winter/metatile_attributes.bin");
diff --git a/src/tilesets.c b/src/tilesets.c
index 852037839..c033fd683 100644
--- a/src/tilesets.c
+++ b/src/tilesets.c
@@ -53,6 +53,12 @@ static const struct Tileset* const gSeasonTilesetsSecondary[][SEASON_WINTER + 1]
         [SEASON_AUTUMN] = &gTileset_LavenderTownAutumn,
         [SEASON_WINTER] = &gTileset_LavenderTownWinter,
     },
+    {
+        [SEASON_SPRING] = &gTileset_SaffronCity,
+        [SEASON_SUMMER] = &gTileset_SaffronCitySummer,
+        [SEASON_AUTUMN] = &gTileset_SaffronCityAutumn,
+        [SEASON_WINTER] = &gTileset_SaffronCityWinter,
+    },
     SEASON_TILESETS_TERMINATOR
 };