diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json index 31c410ba6..6a8354437 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_GeneralAutumn", + "primary_tileset": "gTileset_General", "secondary_tileset": "gTileset_LavenderTown", "border_filepath": "data/layouts/Route14/border.bin", "blockdata_filepath": "data/layouts/Route14/map.bin" diff --git a/data/maps/Route14/map.json b/data/maps/Route14/map.json index c3b58cf4b..5ca609960 100644 --- a/data/maps/Route14/map.json +++ b/data/maps/Route14/map.json @@ -237,8 +237,12 @@ "flag": "0" } ], - "warp_events": [], - "coord_events": [], + "warp_events": [ + + ], + "coord_events": [ + + ], "bg_events": [ { "type": "sign", diff --git a/data/maps/Route16/map.json b/data/maps/Route16/map.json index 97a8592cb..baf741423 100644 --- a/data/maps/Route16/map.json +++ b/data/maps/Route16/map.json @@ -204,7 +204,9 @@ "dest_warp_id": "3" } ], - "coord_events": [], + "coord_events": [ + + ], "bg_events": [ { "type": "sign", diff --git a/data/tilesets/secondary/celadon_city_autumn/anim/fountain/0.png b/data/tilesets/secondary/celadon_city_autumn/anim/fountain/0.png new file mode 100644 index 000000000..c5783f481 Binary files /dev/null and b/data/tilesets/secondary/celadon_city_autumn/anim/fountain/0.png differ diff --git a/data/tilesets/secondary/celadon_city_autumn/anim/fountain/1.png b/data/tilesets/secondary/celadon_city_autumn/anim/fountain/1.png new file mode 100644 index 000000000..7d1f6fb2e Binary files /dev/null and b/data/tilesets/secondary/celadon_city_autumn/anim/fountain/1.png differ diff --git a/data/tilesets/secondary/celadon_city_autumn/anim/fountain/2.png b/data/tilesets/secondary/celadon_city_autumn/anim/fountain/2.png new file mode 100644 index 000000000..91b54ad6e Binary files /dev/null and b/data/tilesets/secondary/celadon_city_autumn/anim/fountain/2.png differ diff --git a/data/tilesets/secondary/celadon_city_autumn/anim/fountain/3.png b/data/tilesets/secondary/celadon_city_autumn/anim/fountain/3.png new file mode 100644 index 000000000..45f2e40ad Binary files /dev/null and b/data/tilesets/secondary/celadon_city_autumn/anim/fountain/3.png differ diff --git a/data/tilesets/secondary/celadon_city_autumn/anim/fountain/4.png b/data/tilesets/secondary/celadon_city_autumn/anim/fountain/4.png new file mode 100644 index 000000000..dd9a94d47 Binary files /dev/null and b/data/tilesets/secondary/celadon_city_autumn/anim/fountain/4.png differ diff --git a/data/tilesets/secondary/celadon_city_autumn/metatile_attributes.bin b/data/tilesets/secondary/celadon_city_autumn/metatile_attributes.bin new file mode 100644 index 000000000..5dd139155 Binary files /dev/null and b/data/tilesets/secondary/celadon_city_autumn/metatile_attributes.bin differ diff --git a/data/tilesets/secondary/celadon_city_autumn/metatiles.bin b/data/tilesets/secondary/celadon_city_autumn/metatiles.bin new file mode 100644 index 000000000..3bfb9d239 Binary files /dev/null and b/data/tilesets/secondary/celadon_city_autumn/metatiles.bin differ diff --git a/data/tilesets/secondary/celadon_city_autumn/palettes/00.pal b/data/tilesets/secondary/celadon_city_autumn/palettes/00.pal new file mode 100644 index 000000000..7af5bb7d2 --- /dev/null +++ b/data/tilesets/secondary/celadon_city_autumn/palettes/00.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +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/celadon_city_autumn/palettes/01.pal b/data/tilesets/secondary/celadon_city_autumn/palettes/01.pal new file mode 100644 index 000000000..391d1e3d1 --- /dev/null +++ b/data/tilesets/secondary/celadon_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/celadon_city_autumn/palettes/02.pal b/data/tilesets/secondary/celadon_city_autumn/palettes/02.pal new file mode 100644 index 000000000..6b019b884 --- /dev/null +++ b/data/tilesets/secondary/celadon_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/celadon_city_autumn/palettes/03.pal b/data/tilesets/secondary/celadon_city_autumn/palettes/03.pal new file mode 100644 index 000000000..973765509 --- /dev/null +++ b/data/tilesets/secondary/celadon_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/celadon_city_autumn/palettes/04.pal b/data/tilesets/secondary/celadon_city_autumn/palettes/04.pal new file mode 100644 index 000000000..702db8a90 --- /dev/null +++ b/data/tilesets/secondary/celadon_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/celadon_city_autumn/palettes/05.pal b/data/tilesets/secondary/celadon_city_autumn/palettes/05.pal new file mode 100644 index 000000000..3a2db72a7 --- /dev/null +++ b/data/tilesets/secondary/celadon_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/celadon_city_autumn/palettes/06.pal b/data/tilesets/secondary/celadon_city_autumn/palettes/06.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/celadon_city_autumn/palettes/06.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/celadon_city_autumn/palettes/07.pal b/data/tilesets/secondary/celadon_city_autumn/palettes/07.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/celadon_city_autumn/palettes/07.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/celadon_city_autumn/palettes/08.pal b/data/tilesets/secondary/celadon_city_autumn/palettes/08.pal new file mode 100644 index 000000000..86930c1d1 --- /dev/null +++ b/data/tilesets/secondary/celadon_city_autumn/palettes/08.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +255 255 255 +222 222 230 +123 123 131 +82 82 106 +197 238 255 +172 213 255 +123 164 222 +98 139 189 +246 230 139 +197 180 115 +172 156 90 +123 164 189 +148 189 238 +255 205 139 +230 131 115 diff --git a/data/tilesets/secondary/celadon_city_autumn/palettes/09.pal b/data/tilesets/secondary/celadon_city_autumn/palettes/09.pal new file mode 100644 index 000000000..5dc82505a --- /dev/null +++ b/data/tilesets/secondary/celadon_city_autumn/palettes/09.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +255 255 255 +222 222 230 +123 123 131 +82 82 106 +197 197 205 +255 213 164 +222 123 82 +189 90 57 +189 230 222 +131 189 164 +106 148 139 +246 238 189 +222 213 156 +213 189 123 +197 180 106 diff --git a/data/tilesets/secondary/celadon_city_autumn/palettes/10.pal b/data/tilesets/secondary/celadon_city_autumn/palettes/10.pal new file mode 100644 index 000000000..361b133e6 --- /dev/null +++ b/data/tilesets/secondary/celadon_city_autumn/palettes/10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +255 255 255 +222 222 230 +123 123 131 +82 82 106 +238 230 255 +222 197 255 +180 148 222 +131 106 172 +255 0 255 +115 189 246 +74 148 205 +41 115 172 +148 164 180 +246 238 148 +213 172 74 diff --git a/data/tilesets/secondary/celadon_city_autumn/palettes/11.pal b/data/tilesets/secondary/celadon_city_autumn/palettes/11.pal new file mode 100644 index 000000000..5e02e6a7d --- /dev/null +++ b/data/tilesets/secondary/celadon_city_autumn/palettes/11.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 255 255 +180 205 213 +148 164 180 +123 123 131 +82 82 106 +205 222 238 +197 213 222 +164 180 197 +222 180 82 +230 238 238 +255 205 139 +222 106 98 +197 74 65 +154 196 149 +123 178 116 diff --git a/data/tilesets/secondary/celadon_city_autumn/palettes/12.pal b/data/tilesets/secondary/celadon_city_autumn/palettes/12.pal new file mode 100644 index 000000000..4257575ae --- /dev/null +++ b/data/tilesets/secondary/celadon_city_autumn/palettes/12.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +246 246 255 +213 222 164 +180 189 131 +139 148 90 +123 123 131 +90 90 115 +65 74 106 +180 148 222 +131 106 172 +189 230 222 +148 205 180 +115 172 148 +106 148 139 +74 115 106 +115 205 164 diff --git a/data/tilesets/secondary/celadon_city_autumn/palettes/13.pal b/data/tilesets/secondary/celadon_city_autumn/palettes/13.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/celadon_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/celadon_city_autumn/palettes/14.pal b/data/tilesets/secondary/celadon_city_autumn/palettes/14.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/celadon_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/celadon_city_autumn/palettes/15.pal b/data/tilesets/secondary/celadon_city_autumn/palettes/15.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/celadon_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 +0 0 0 +0 0 0 +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/celadon_city_autumn/tiles.png b/data/tilesets/secondary/celadon_city_autumn/tiles.png new file mode 100644 index 000000000..db18cb938 Binary files /dev/null and b/data/tilesets/secondary/celadon_city_autumn/tiles.png differ diff --git a/data/tilesets/secondary/celadon_city_summer/anim/fountain/0.png b/data/tilesets/secondary/celadon_city_summer/anim/fountain/0.png new file mode 100644 index 000000000..c5783f481 Binary files /dev/null and b/data/tilesets/secondary/celadon_city_summer/anim/fountain/0.png differ diff --git a/data/tilesets/secondary/celadon_city_summer/anim/fountain/1.png b/data/tilesets/secondary/celadon_city_summer/anim/fountain/1.png new file mode 100644 index 000000000..7d1f6fb2e Binary files /dev/null and b/data/tilesets/secondary/celadon_city_summer/anim/fountain/1.png differ diff --git a/data/tilesets/secondary/celadon_city_summer/anim/fountain/2.png b/data/tilesets/secondary/celadon_city_summer/anim/fountain/2.png new file mode 100644 index 000000000..91b54ad6e Binary files /dev/null and b/data/tilesets/secondary/celadon_city_summer/anim/fountain/2.png differ diff --git a/data/tilesets/secondary/celadon_city_summer/anim/fountain/3.png b/data/tilesets/secondary/celadon_city_summer/anim/fountain/3.png new file mode 100644 index 000000000..45f2e40ad Binary files /dev/null and b/data/tilesets/secondary/celadon_city_summer/anim/fountain/3.png differ diff --git a/data/tilesets/secondary/celadon_city_summer/anim/fountain/4.png b/data/tilesets/secondary/celadon_city_summer/anim/fountain/4.png new file mode 100644 index 000000000..dd9a94d47 Binary files /dev/null and b/data/tilesets/secondary/celadon_city_summer/anim/fountain/4.png differ diff --git a/data/tilesets/secondary/celadon_city_summer/metatile_attributes.bin b/data/tilesets/secondary/celadon_city_summer/metatile_attributes.bin new file mode 100644 index 000000000..5dd139155 Binary files /dev/null and b/data/tilesets/secondary/celadon_city_summer/metatile_attributes.bin differ diff --git a/data/tilesets/secondary/celadon_city_summer/metatiles.bin b/data/tilesets/secondary/celadon_city_summer/metatiles.bin new file mode 100644 index 000000000..3bfb9d239 Binary files /dev/null and b/data/tilesets/secondary/celadon_city_summer/metatiles.bin differ diff --git a/data/tilesets/secondary/celadon_city_summer/palettes/00.pal b/data/tilesets/secondary/celadon_city_summer/palettes/00.pal new file mode 100644 index 000000000..7af5bb7d2 --- /dev/null +++ b/data/tilesets/secondary/celadon_city_summer/palettes/00.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +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/celadon_city_summer/palettes/01.pal b/data/tilesets/secondary/celadon_city_summer/palettes/01.pal new file mode 100644 index 000000000..391d1e3d1 --- /dev/null +++ b/data/tilesets/secondary/celadon_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/celadon_city_summer/palettes/02.pal b/data/tilesets/secondary/celadon_city_summer/palettes/02.pal new file mode 100644 index 000000000..6b019b884 --- /dev/null +++ b/data/tilesets/secondary/celadon_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/celadon_city_summer/palettes/03.pal b/data/tilesets/secondary/celadon_city_summer/palettes/03.pal new file mode 100644 index 000000000..973765509 --- /dev/null +++ b/data/tilesets/secondary/celadon_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/celadon_city_summer/palettes/04.pal b/data/tilesets/secondary/celadon_city_summer/palettes/04.pal new file mode 100644 index 000000000..702db8a90 --- /dev/null +++ b/data/tilesets/secondary/celadon_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/celadon_city_summer/palettes/05.pal b/data/tilesets/secondary/celadon_city_summer/palettes/05.pal new file mode 100644 index 000000000..3a2db72a7 --- /dev/null +++ b/data/tilesets/secondary/celadon_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/celadon_city_summer/palettes/06.pal b/data/tilesets/secondary/celadon_city_summer/palettes/06.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/celadon_city_summer/palettes/06.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/celadon_city_summer/palettes/07.pal b/data/tilesets/secondary/celadon_city_summer/palettes/07.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/celadon_city_summer/palettes/07.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/celadon_city_summer/palettes/08.pal b/data/tilesets/secondary/celadon_city_summer/palettes/08.pal new file mode 100644 index 000000000..86930c1d1 --- /dev/null +++ b/data/tilesets/secondary/celadon_city_summer/palettes/08.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +255 255 255 +222 222 230 +123 123 131 +82 82 106 +197 238 255 +172 213 255 +123 164 222 +98 139 189 +246 230 139 +197 180 115 +172 156 90 +123 164 189 +148 189 238 +255 205 139 +230 131 115 diff --git a/data/tilesets/secondary/celadon_city_summer/palettes/09.pal b/data/tilesets/secondary/celadon_city_summer/palettes/09.pal new file mode 100644 index 000000000..5dc82505a --- /dev/null +++ b/data/tilesets/secondary/celadon_city_summer/palettes/09.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +255 255 255 +222 222 230 +123 123 131 +82 82 106 +197 197 205 +255 213 164 +222 123 82 +189 90 57 +189 230 222 +131 189 164 +106 148 139 +246 238 189 +222 213 156 +213 189 123 +197 180 106 diff --git a/data/tilesets/secondary/celadon_city_summer/palettes/10.pal b/data/tilesets/secondary/celadon_city_summer/palettes/10.pal new file mode 100644 index 000000000..361b133e6 --- /dev/null +++ b/data/tilesets/secondary/celadon_city_summer/palettes/10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +255 255 255 +222 222 230 +123 123 131 +82 82 106 +238 230 255 +222 197 255 +180 148 222 +131 106 172 +255 0 255 +115 189 246 +74 148 205 +41 115 172 +148 164 180 +246 238 148 +213 172 74 diff --git a/data/tilesets/secondary/celadon_city_summer/palettes/11.pal b/data/tilesets/secondary/celadon_city_summer/palettes/11.pal new file mode 100644 index 000000000..ca121927c --- /dev/null +++ b/data/tilesets/secondary/celadon_city_summer/palettes/11.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 255 255 +180 205 213 +148 164 180 +123 123 131 +82 82 106 +205 222 238 +197 213 222 +164 180 197 +222 180 82 +230 238 238 +255 205 139 +222 106 98 +197 74 65 +151 216 123 +121 205 86 diff --git a/data/tilesets/secondary/celadon_city_summer/palettes/12.pal b/data/tilesets/secondary/celadon_city_summer/palettes/12.pal new file mode 100644 index 000000000..4257575ae --- /dev/null +++ b/data/tilesets/secondary/celadon_city_summer/palettes/12.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +246 246 255 +213 222 164 +180 189 131 +139 148 90 +123 123 131 +90 90 115 +65 74 106 +180 148 222 +131 106 172 +189 230 222 +148 205 180 +115 172 148 +106 148 139 +74 115 106 +115 205 164 diff --git a/data/tilesets/secondary/celadon_city_summer/palettes/13.pal b/data/tilesets/secondary/celadon_city_summer/palettes/13.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/celadon_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/celadon_city_summer/palettes/14.pal b/data/tilesets/secondary/celadon_city_summer/palettes/14.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/celadon_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/celadon_city_summer/palettes/15.pal b/data/tilesets/secondary/celadon_city_summer/palettes/15.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/celadon_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 +0 0 0 +0 0 0 +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/celadon_city_summer/tiles.png b/data/tilesets/secondary/celadon_city_summer/tiles.png new file mode 100644 index 000000000..db18cb938 Binary files /dev/null and b/data/tilesets/secondary/celadon_city_summer/tiles.png differ diff --git a/data/tilesets/secondary/celadon_city_winter/anim/fountain/0.png b/data/tilesets/secondary/celadon_city_winter/anim/fountain/0.png new file mode 100644 index 000000000..c5783f481 Binary files /dev/null and b/data/tilesets/secondary/celadon_city_winter/anim/fountain/0.png differ diff --git a/data/tilesets/secondary/celadon_city_winter/anim/fountain/1.png b/data/tilesets/secondary/celadon_city_winter/anim/fountain/1.png new file mode 100644 index 000000000..7d1f6fb2e Binary files /dev/null and b/data/tilesets/secondary/celadon_city_winter/anim/fountain/1.png differ diff --git a/data/tilesets/secondary/celadon_city_winter/anim/fountain/2.png b/data/tilesets/secondary/celadon_city_winter/anim/fountain/2.png new file mode 100644 index 000000000..91b54ad6e Binary files /dev/null and b/data/tilesets/secondary/celadon_city_winter/anim/fountain/2.png differ diff --git a/data/tilesets/secondary/celadon_city_winter/anim/fountain/3.png b/data/tilesets/secondary/celadon_city_winter/anim/fountain/3.png new file mode 100644 index 000000000..45f2e40ad Binary files /dev/null and b/data/tilesets/secondary/celadon_city_winter/anim/fountain/3.png differ diff --git a/data/tilesets/secondary/celadon_city_winter/anim/fountain/4.png b/data/tilesets/secondary/celadon_city_winter/anim/fountain/4.png new file mode 100644 index 000000000..dd9a94d47 Binary files /dev/null and b/data/tilesets/secondary/celadon_city_winter/anim/fountain/4.png differ diff --git a/data/tilesets/secondary/celadon_city_winter/metatile_attributes.bin b/data/tilesets/secondary/celadon_city_winter/metatile_attributes.bin new file mode 100644 index 000000000..5dd139155 Binary files /dev/null and b/data/tilesets/secondary/celadon_city_winter/metatile_attributes.bin differ diff --git a/data/tilesets/secondary/celadon_city_winter/metatiles.bin b/data/tilesets/secondary/celadon_city_winter/metatiles.bin new file mode 100644 index 000000000..3bfb9d239 Binary files /dev/null and b/data/tilesets/secondary/celadon_city_winter/metatiles.bin differ diff --git a/data/tilesets/secondary/celadon_city_winter/palettes/00.pal b/data/tilesets/secondary/celadon_city_winter/palettes/00.pal new file mode 100644 index 000000000..7af5bb7d2 --- /dev/null +++ b/data/tilesets/secondary/celadon_city_winter/palettes/00.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +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/celadon_city_winter/palettes/01.pal b/data/tilesets/secondary/celadon_city_winter/palettes/01.pal new file mode 100644 index 000000000..391d1e3d1 --- /dev/null +++ b/data/tilesets/secondary/celadon_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/celadon_city_winter/palettes/02.pal b/data/tilesets/secondary/celadon_city_winter/palettes/02.pal new file mode 100644 index 000000000..6b019b884 --- /dev/null +++ b/data/tilesets/secondary/celadon_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/celadon_city_winter/palettes/03.pal b/data/tilesets/secondary/celadon_city_winter/palettes/03.pal new file mode 100644 index 000000000..973765509 --- /dev/null +++ b/data/tilesets/secondary/celadon_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/celadon_city_winter/palettes/04.pal b/data/tilesets/secondary/celadon_city_winter/palettes/04.pal new file mode 100644 index 000000000..702db8a90 --- /dev/null +++ b/data/tilesets/secondary/celadon_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/celadon_city_winter/palettes/05.pal b/data/tilesets/secondary/celadon_city_winter/palettes/05.pal new file mode 100644 index 000000000..3a2db72a7 --- /dev/null +++ b/data/tilesets/secondary/celadon_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/celadon_city_winter/palettes/06.pal b/data/tilesets/secondary/celadon_city_winter/palettes/06.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/celadon_city_winter/palettes/06.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/celadon_city_winter/palettes/07.pal b/data/tilesets/secondary/celadon_city_winter/palettes/07.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/celadon_city_winter/palettes/07.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/celadon_city_winter/palettes/08.pal b/data/tilesets/secondary/celadon_city_winter/palettes/08.pal new file mode 100644 index 000000000..86930c1d1 --- /dev/null +++ b/data/tilesets/secondary/celadon_city_winter/palettes/08.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +255 255 255 +222 222 230 +123 123 131 +82 82 106 +197 238 255 +172 213 255 +123 164 222 +98 139 189 +246 230 139 +197 180 115 +172 156 90 +123 164 189 +148 189 238 +255 205 139 +230 131 115 diff --git a/data/tilesets/secondary/celadon_city_winter/palettes/09.pal b/data/tilesets/secondary/celadon_city_winter/palettes/09.pal new file mode 100644 index 000000000..5dc82505a --- /dev/null +++ b/data/tilesets/secondary/celadon_city_winter/palettes/09.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +255 255 255 +222 222 230 +123 123 131 +82 82 106 +197 197 205 +255 213 164 +222 123 82 +189 90 57 +189 230 222 +131 189 164 +106 148 139 +246 238 189 +222 213 156 +213 189 123 +197 180 106 diff --git a/data/tilesets/secondary/celadon_city_winter/palettes/10.pal b/data/tilesets/secondary/celadon_city_winter/palettes/10.pal new file mode 100644 index 000000000..361b133e6 --- /dev/null +++ b/data/tilesets/secondary/celadon_city_winter/palettes/10.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +255 255 255 +222 222 230 +123 123 131 +82 82 106 +238 230 255 +222 197 255 +180 148 222 +131 106 172 +255 0 255 +115 189 246 +74 148 205 +41 115 172 +148 164 180 +246 238 148 +213 172 74 diff --git a/data/tilesets/secondary/celadon_city_winter/palettes/11.pal b/data/tilesets/secondary/celadon_city_winter/palettes/11.pal new file mode 100644 index 000000000..b1e13b2fe --- /dev/null +++ b/data/tilesets/secondary/celadon_city_winter/palettes/11.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +255 255 255 +180 205 213 +148 164 180 +123 123 131 +82 82 106 +205 222 238 +197 213 222 +164 180 197 +222 180 82 +230 238 238 +255 205 139 +222 106 98 +197 74 65 +210 235 255 +255 255 255 diff --git a/data/tilesets/secondary/celadon_city_winter/palettes/12.pal b/data/tilesets/secondary/celadon_city_winter/palettes/12.pal new file mode 100644 index 000000000..4257575ae --- /dev/null +++ b/data/tilesets/secondary/celadon_city_winter/palettes/12.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +115 205 164 +246 246 255 +213 222 164 +180 189 131 +139 148 90 +123 123 131 +90 90 115 +65 74 106 +180 148 222 +131 106 172 +189 230 222 +148 205 180 +115 172 148 +106 148 139 +74 115 106 +115 205 164 diff --git a/data/tilesets/secondary/celadon_city_winter/palettes/13.pal b/data/tilesets/secondary/celadon_city_winter/palettes/13.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/celadon_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/celadon_city_winter/palettes/14.pal b/data/tilesets/secondary/celadon_city_winter/palettes/14.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/celadon_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/celadon_city_winter/palettes/15.pal b/data/tilesets/secondary/celadon_city_winter/palettes/15.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/tilesets/secondary/celadon_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 +0 0 0 +0 0 0 +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/celadon_city_winter/tiles.png b/data/tilesets/secondary/celadon_city_winter/tiles.png new file mode 100644 index 000000000..db18cb938 Binary files /dev/null and b/data/tilesets/secondary/celadon_city_winter/tiles.png differ diff --git a/src/data/tilesets/graphics.h b/src/data/tilesets/graphics.h index 4ae649123..0e7ebe386 100644 --- a/src/data/tilesets/graphics.h +++ b/src/data/tilesets/graphics.h @@ -1692,3 +1692,60 @@ const u16 gTilesetPalettes_SaffronCityWinter[][16] = }; const u32 gTilesetTiles_SaffronCityWinter[] = INCBIN_U32("data/tilesets/secondary/saffron_city_winter/tiles.4bpp.lz"); + +const u16 gTilesetPalettes_CeladonCitySummer[][16] = +{ + INCBIN_U16("data/tilesets/secondary/celadon_city_summer/palettes/00.gbapal"), + INCBIN_U16("data/tilesets/secondary/celadon_city_summer/palettes/01.gbapal"), + INCBIN_U16("data/tilesets/secondary/celadon_city_summer/palettes/02.gbapal"), + INCBIN_U16("data/tilesets/secondary/celadon_city_summer/palettes/03.gbapal"), + INCBIN_U16("data/tilesets/secondary/celadon_city_summer/palettes/04.gbapal"), + INCBIN_U16("data/tilesets/secondary/celadon_city_summer/palettes/05.gbapal"), + INCBIN_U16("data/tilesets/secondary/celadon_city_summer/palettes/06.gbapal"), + INCBIN_U16("data/tilesets/secondary/celadon_city_summer/palettes/07.gbapal"), + INCBIN_U16("data/tilesets/secondary/celadon_city_summer/palettes/08.gbapal"), + INCBIN_U16("data/tilesets/secondary/celadon_city_summer/palettes/09.gbapal"), + INCBIN_U16("data/tilesets/secondary/celadon_city_summer/palettes/10.gbapal"), + INCBIN_U16("data/tilesets/secondary/celadon_city_summer/palettes/11.gbapal"), + INCBIN_U16("data/tilesets/secondary/celadon_city_summer/palettes/12.gbapal"), +}; + +const u32 gTilesetTiles_CeladonCitySummer[] = INCBIN_U32("data/tilesets/secondary/celadon_city_summer/tiles.4bpp.lz"); + +const u16 gTilesetPalettes_CeladonCityAutumn[][16] = +{ + INCBIN_U16("data/tilesets/secondary/celadon_city_autumn/palettes/00.gbapal"), + INCBIN_U16("data/tilesets/secondary/celadon_city_autumn/palettes/01.gbapal"), + INCBIN_U16("data/tilesets/secondary/celadon_city_autumn/palettes/02.gbapal"), + INCBIN_U16("data/tilesets/secondary/celadon_city_autumn/palettes/03.gbapal"), + INCBIN_U16("data/tilesets/secondary/celadon_city_autumn/palettes/04.gbapal"), + INCBIN_U16("data/tilesets/secondary/celadon_city_autumn/palettes/05.gbapal"), + INCBIN_U16("data/tilesets/secondary/celadon_city_autumn/palettes/06.gbapal"), + INCBIN_U16("data/tilesets/secondary/celadon_city_autumn/palettes/07.gbapal"), + INCBIN_U16("data/tilesets/secondary/celadon_city_autumn/palettes/08.gbapal"), + INCBIN_U16("data/tilesets/secondary/celadon_city_autumn/palettes/09.gbapal"), + INCBIN_U16("data/tilesets/secondary/celadon_city_autumn/palettes/10.gbapal"), + INCBIN_U16("data/tilesets/secondary/celadon_city_autumn/palettes/11.gbapal"), + INCBIN_U16("data/tilesets/secondary/celadon_city_autumn/palettes/12.gbapal"), +}; + +const u32 gTilesetTiles_CeladonCityAutumn[] = INCBIN_U32("data/tilesets/secondary/celadon_city_autumn/tiles.4bpp.lz"); + +const u16 gTilesetPalettes_CeladonCityWinter[][16] = +{ + INCBIN_U16("data/tilesets/secondary/celadon_city_winter/palettes/00.gbapal"), + INCBIN_U16("data/tilesets/secondary/celadon_city_winter/palettes/01.gbapal"), + INCBIN_U16("data/tilesets/secondary/celadon_city_winter/palettes/02.gbapal"), + INCBIN_U16("data/tilesets/secondary/celadon_city_winter/palettes/03.gbapal"), + INCBIN_U16("data/tilesets/secondary/celadon_city_winter/palettes/04.gbapal"), + INCBIN_U16("data/tilesets/secondary/celadon_city_winter/palettes/05.gbapal"), + INCBIN_U16("data/tilesets/secondary/celadon_city_winter/palettes/06.gbapal"), + INCBIN_U16("data/tilesets/secondary/celadon_city_winter/palettes/07.gbapal"), + INCBIN_U16("data/tilesets/secondary/celadon_city_winter/palettes/08.gbapal"), + INCBIN_U16("data/tilesets/secondary/celadon_city_winter/palettes/09.gbapal"), + INCBIN_U16("data/tilesets/secondary/celadon_city_winter/palettes/10.gbapal"), + INCBIN_U16("data/tilesets/secondary/celadon_city_winter/palettes/11.gbapal"), + INCBIN_U16("data/tilesets/secondary/celadon_city_winter/palettes/12.gbapal"), +}; + +const u32 gTilesetTiles_CeladonCityWinter[] = INCBIN_U32("data/tilesets/secondary/celadon_city_winter/tiles.4bpp.lz"); diff --git a/src/data/tilesets/headers.h b/src/data/tilesets/headers.h index 1311ace3b..ed4887be5 100644 --- a/src/data/tilesets/headers.h +++ b/src/data/tilesets/headers.h @@ -911,3 +911,36 @@ const struct Tileset gTileset_SaffronCityWinter = .metatileAttributes = gMetatileAttributes_SaffronCityWinter, .callback = NULL, }; + +const struct Tileset gTileset_CeladonCitySummer = +{ + .isCompressed = TRUE, + .isSecondary = TRUE, + .tiles = gTilesetTiles_CeladonCitySummer, + .palettes = gTilesetPalettes_CeladonCitySummer, + .metatiles = gMetatiles_CeladonCitySummer, + .metatileAttributes = gMetatileAttributes_CeladonCitySummer, + .callback = InitTilesetAnim_CeladonCity, +}; + +const struct Tileset gTileset_CeladonCityAutumn = +{ + .isCompressed = TRUE, + .isSecondary = TRUE, + .tiles = gTilesetTiles_CeladonCityAutumn, + .palettes = gTilesetPalettes_CeladonCityAutumn, + .metatiles = gMetatiles_CeladonCityAutumn, + .metatileAttributes = gMetatileAttributes_CeladonCityAutumn, + .callback = InitTilesetAnim_CeladonCity, +}; + +const struct Tileset gTileset_CeladonCityWinter = +{ + .isCompressed = TRUE, + .isSecondary = TRUE, + .tiles = gTilesetTiles_CeladonCityWinter, + .palettes = gTilesetPalettes_CeladonCityWinter, + .metatiles = gMetatiles_CeladonCityWinter, + .metatileAttributes = gMetatileAttributes_CeladonCityWinter, + .callback = InitTilesetAnim_CeladonCity, +}; diff --git a/src/data/tilesets/metatiles.h b/src/data/tilesets/metatiles.h index 4a7b76496..23f45bf9a 100644 --- a/src/data/tilesets/metatiles.h +++ b/src/data/tilesets/metatiles.h @@ -246,3 +246,12 @@ const u32 gMetatileAttributes_SaffronCityAutumn[] = INCBIN_U32("data/tilesets/se 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"); + +const u16 gMetatiles_CeladonCitySummer[] = INCBIN_U16("data/tilesets/secondary/celadon_city_summer/metatiles.bin"); +const u32 gMetatileAttributes_CeladonCitySummer[] = INCBIN_U32("data/tilesets/secondary/celadon_city_summer/metatile_attributes.bin"); + +const u16 gMetatiles_CeladonCityAutumn[] = INCBIN_U16("data/tilesets/secondary/celadon_city_autumn/metatiles.bin"); +const u32 gMetatileAttributes_CeladonCityAutumn[] = INCBIN_U32("data/tilesets/secondary/celadon_city_autumn/metatile_attributes.bin"); + +const u16 gMetatiles_CeladonCityWinter[] = INCBIN_U16("data/tilesets/secondary/celadon_city_winter/metatiles.bin"); +const u32 gMetatileAttributes_CeladonCityWinter[] = INCBIN_U32("data/tilesets/secondary/celadon_city_winter/metatile_attributes.bin"); diff --git a/src/tilesets.c b/src/tilesets.c index c033fd683..a97d71bfd 100644 --- a/src/tilesets.c +++ b/src/tilesets.c @@ -59,6 +59,12 @@ static const struct Tileset* const gSeasonTilesetsSecondary[][SEASON_WINTER + 1] [SEASON_AUTUMN] = &gTileset_SaffronCityAutumn, [SEASON_WINTER] = &gTileset_SaffronCityWinter, }, + { + [SEASON_SPRING] = &gTileset_CeladonCity, + [SEASON_SUMMER] = &gTileset_CeladonCitySummer, + [SEASON_AUTUMN] = &gTileset_CeladonCityAutumn, + [SEASON_WINTER] = &gTileset_CeladonCityWinter, + }, SEASON_TILESETS_TERMINATOR };