Leahnaya/pokefirered
1
0
Fork 0
mirror of https://github.com/pret/pokefirered.git synced 2026-10-01 05:20:00 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

seasonal tilesets for saffron city

Browse Source
This commit is contained in:
cawtds
2024-10-29 20:50:49 +01:00
parent 8888724d6d
commit 35e33c00bc
63 changed files with 1023 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/layouts/layouts.json
View File

@@ -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"

8
data/maps/SaffronCity/map.json
View File

@@ -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
}

BIN
data/tilesets/secondary/saffron_city_autumn/metatile_attributes.bin Normal file
View File

Binary file not shown.

BIN
data/tilesets/secondary/saffron_city_autumn/metatiles.bin Normal file
View File

Binary file not shown.

19
data/tilesets/secondary/saffron_city_autumn/palettes/00.pal Normal file
View File

@@ -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

19
data/tilesets/secondary/saffron_city_autumn/palettes/01.pal Normal file
View File

@@ -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

19
data/tilesets/secondary/saffron_city_autumn/palettes/02.pal Normal file
View File

@@ -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

19
data/tilesets/secondary/saffron_city_autumn/palettes/03.pal Normal file
View File

@@ -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

19
data/tilesets/secondary/saffron_city_autumn/palettes/04.pal Normal file
View File

@@ -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

19
data/tilesets/secondary/saffron_city_autumn/palettes/05.pal Normal file
View File

@@ -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

19
data/tilesets/secondary/saffron_city_autumn/palettes/06.pal Normal file
View File

@@ -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

19
data/tilesets/secondary/saffron_city_autumn/palettes/07.pal Normal file
View File

@@ -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

19
data/tilesets/secondary/saffron_city_autumn/palettes/08.pal Normal file
View File

@@ -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

19
data/tilesets/secondary/saffron_city_autumn/palettes/09.pal Normal file
View File

@@ -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

19
data/tilesets/secondary/saffron_city_autumn/palettes/10.pal Normal file
View File

@@ -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

19
data/tilesets/secondary/saffron_city_autumn/palettes/11.pal Normal file
View File

@@ -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

19
data/tilesets/secondary/saffron_city_autumn/palettes/12.pal Normal file
View File

@@ -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

19
data/tilesets/secondary/saffron_city_autumn/palettes/13.pal Normal file
View File

@@ -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

19
data/tilesets/secondary/saffron_city_autumn/palettes/14.pal Normal file
View File

@@ -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

19
data/tilesets/secondary/saffron_city_autumn/palettes/15.pal Normal file
View File

@@ -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

BIN
data/tilesets/secondary/saffron_city_autumn/tiles.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
data/tilesets/secondary/saffron_city_summer/metatile_attributes.bin Normal file
View File

Binary file not shown.

BIN
data/tilesets/secondary/saffron_city_summer/metatiles.bin Normal file
View File

Binary file not shown.

19
data/tilesets/secondary/saffron_city_summer/palettes/00.pal Normal file
View File

@@ -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

19
data/tilesets/secondary/saffron_city_summer/palettes/01.pal Normal file
View File

@@ -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

19
data/tilesets/secondary/saffron_city_summer/palettes/02.pal Normal file
View File

@@ -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

19
data/tilesets/secondary/saffron_city_summer/palettes/03.pal Normal file
View File

@@ -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

19
data/tilesets/secondary/saffron_city_summer/palettes/04.pal Normal file
View File

@@ -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

19
data/tilesets/secondary/saffron_city_summer/palettes/05.pal Normal file
View File

@@ -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

19
data/tilesets/secondary/saffron_city_summer/palettes/06.pal Normal file
View File

@@ -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

19
data/tilesets/secondary/saffron_city_summer/palettes/07.pal Normal file
View File

@@ -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

19
data/tilesets/secondary/saffron_city_summer/palettes/08.pal Normal file
View File

@@ -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

19
data/tilesets/secondary/saffron_city_summer/palettes/09.pal Normal file
View File

@@ -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

19
data/tilesets/secondary/saffron_city_summer/palettes/10.pal Normal file
View File

@@ -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

19
data/tilesets/secondary/saffron_city_summer/palettes/11.pal Normal file
View File

@@ -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

19
data/tilesets/secondary/saffron_city_summer/palettes/12.pal Normal file
View File

@@ -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

19
data/tilesets/secondary/saffron_city_summer/palettes/13.pal Normal file
View File

@@ -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

19
data/tilesets/secondary/saffron_city_summer/palettes/14.pal Normal file
View File

@@ -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

19
data/tilesets/secondary/saffron_city_summer/palettes/15.pal Normal file
View File

@@ -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

BIN
data/tilesets/secondary/saffron_city_summer/tiles.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
data/tilesets/secondary/saffron_city_winter/metatile_attributes.bin Normal file
View File

Binary file not shown.

BIN
data/tilesets/secondary/saffron_city_winter/metatiles.bin Normal file
View File

Binary file not shown.

19
data/tilesets/secondary/saffron_city_winter/palettes/00.pal Normal file
View File

@@ -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

19
data/tilesets/secondary/saffron_city_winter/palettes/01.pal Normal file
View File

@@ -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

19
data/tilesets/secondary/saffron_city_winter/palettes/02.pal Normal file
View File

@@ -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

19
data/tilesets/secondary/saffron_city_winter/palettes/03.pal Normal file
View File

@@ -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

19
data/tilesets/secondary/saffron_city_winter/palettes/04.pal Normal file
View File

@@ -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

19
data/tilesets/secondary/saffron_city_winter/palettes/05.pal Normal file
View File

@@ -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

19
data/tilesets/secondary/saffron_city_winter/palettes/06.pal Normal file
View File

@@ -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

19
data/tilesets/secondary/saffron_city_winter/palettes/07.pal Normal file
View File

@@ -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

19
data/tilesets/secondary/saffron_city_winter/palettes/08.pal Normal file
View File

@@ -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

19
data/tilesets/secondary/saffron_city_winter/palettes/09.pal Normal file
View File

@@ -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

19
data/tilesets/secondary/saffron_city_winter/palettes/10.pal Normal file
View File

@@ -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

19
data/tilesets/secondary/saffron_city_winter/palettes/11.pal Normal file
View File

@@ -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

19
data/tilesets/secondary/saffron_city_winter/palettes/12.pal Normal file
View File

@@ -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

19
data/tilesets/secondary/saffron_city_winter/palettes/13.pal Normal file
View File

@@ -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

19
data/tilesets/secondary/saffron_city_winter/palettes/14.pal Normal file
View File

@@ -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

19
data/tilesets/secondary/saffron_city_winter/palettes/15.pal Normal file
View File

@@ -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

BIN
data/tilesets/secondary/saffron_city_winter/tiles.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.3 KiB

57
src/data/tilesets/graphics.h
View File

@@ -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");

33
src/data/tilesets/headers.h
View File

@@ -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,
};

9
src/data/tilesets/metatiles.h
View File

@@ -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");

6
src/tilesets.c
View File

@@ -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
};