Nihon Tilesets

Blocks aren't set up properly yet but ASIDE FROM THAT

constants/tileset_constants.asm

@@ -39,6 +39,13 @@
 	const TILESET_NIHON_01             ; 25
 	const TILESET_FOREST_KANTO         ; 26
 	const TILESET_MUSEUM               ; 27
+	const TILESET_NIHON_SNOWY          ; 28
+	const TILESET_NIHON_BIRDON         ; 29
+	const TILESET_NIHON_FONT           ; 2A
+	const TILESET_NIHON_HIGHTECH       ; 2B
+	const TILESET_NIHON_OLD            ; 2C
+	const TILESET_NIHON_SOUTH          ; 2D
+	const TILESET_NIHON_WEST           ; 2E
 DEF NUM_TILESETS EQU const_value - 1
 
 ; wTileset struct size

data/tilesets.asm

@@ -51,4 +51,11 @@ Tilesets::
 	tileset TilesetNihon1
 	tileset TilesetForestKanto
 	tileset TilesetMuseum
+	tileset TilesetNihonSnowy
+	tileset TilesetNihonBirdon
+	tileset TilesetNihonFont
+	tileset TilesetNihonHighTech
+	tileset TilesetNihonOld
+	tileset TilesetNihonSouth
+	tileset TilesetNihonWest
 	assert_table_length NUM_TILESETS + 1

data/tilesets/museum_collision.asm

@@ -1,4 +1,4 @@
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 00
+	tilecoll WALL, WALL, WALL, WALL ; 00
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03
@@ -8,7 +8,7 @@
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 07
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 08
 	tilecoll WALL, FLOOR, WALL, FLOOR ; 09
-	tilecoll WALL, WALL, WALL, WALL ; 0a
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a
 	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0b
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0c
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d

data/tilesets/nihon_snowy_collision.asm

@@ -0,0 +1,4 @@
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 00
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03

engine/tilesets/tileset_anims.asm

@@ -251,6 +251,12 @@ UnusedTilesetAnim5: ; unreferenced
 	dw NULL,  DoneTileAnimation
 
 TilesetNihon1Anim:
+TilesetNihonBirdonAnim:
+TilesetNihonFontAnim:
+TilesetNihonHighTechAnim:
+TilesetNihonOldAnim:
+TilesetNihonSouthAnim:
+TilesetNihonWestAnim:
 	dw vTiles2 tile $14, AnimateWaterTile
 	dw NULL,  WaitTileAnimation
 	dw NULL,  WaitTileAnimation
@@ -273,6 +279,19 @@ TilesetForestKantoAnim:
 	dw NULL,  StandingTileFrame8
 	dw NULL,  DoneTileAnimation
 	
+TilesetNihonSnowyAnim:
+	dw vTiles2 tile $14, AnimateWaterTile
+	dw NULL,  WaitTileAnimation
+	dw NULL,  WaitTileAnimation
+	dw NULL,  WaitTileAnimation
+	dw NULL,  AnimateWaterPalette
+	dw NULL,  WaitTileAnimation
+	dw NULL,  AnimateFlowerTile
+	dw NULL,  WaitTileAnimation
+	dw NULL,  WaitTileAnimation
+	dw NULL,  StandingTileFrame8
+	dw NULL,  DoneTileAnimation
+
 TilesetBattleTowerOutsideAnim:
 TilesetHouseAnim:
 TilesetPlayersHouseAnim:

gfx/tilesets.asm

@@ -354,6 +354,14 @@ INCBIN "data/tilesets/museum_metatiles.bin"
 TilesetMuseumColl::
 INCLUDE "data/tilesets/museum_collision.asm"
 
+TilesetNihonSnowyGFX::
+INCBIN "gfx/tilesets/nihon_snowy.2bpp.lz"
+
+TilesetNihonSnowyMeta::
+INCBIN "data/tilesets/nihon_snowy_metatiles.bin"
+
+TilesetNihonSnowyColl::
+INCLUDE "data/tilesets/nihon_snowy_collision.asm"
 
 SECTION "Tileset Data 9", ROMX
 
@@ -481,6 +489,45 @@ SECTION "Tileset Data 12", ROMX
 TilesetMuseumAttr::
 INCBIN "data/tilesets/museum_attributes.bin"
 
+TilesetNihonSnowyAttr::
+INCBIN "data/tilesets/nihon_snowy_attributes.bin"
+
+TilesetNihonBirdonGFX::
+INCBIN "gfx/tilesets/nihon_birdon.2bpp.lz"
+
+TilesetNihonBirdonMeta::
+INCBIN "data/tilesets/nihon_birdon_metatiles.bin"
+
+TilesetNihonBirdonColl::
+INCLUDE "data/tilesets/nihon_birdon_collision.asm"
+
+TilesetNihonFontGFX::
+INCBIN "gfx/tilesets/nihon_font.2bpp.lz"
+
+TilesetNihonFontMeta::
+INCBIN "data/tilesets/nihon_font_metatiles.bin"
+
+TilesetNihonFontColl::
+INCLUDE "data/tilesets/nihon_font_collision.asm"
+
+TilesetNihonHighTechGFX::
+INCBIN "gfx/tilesets/nihon_hightech.2bpp.lz"
+
+TilesetNihonHighTechMeta::
+INCBIN "data/tilesets/nihon_hightech_metatiles.bin"
+
+TilesetNihonHighTechColl::
+INCLUDE "data/tilesets/nihon_hightech_collision.asm"
+
+TilesetNihonOldGFX::
+INCBIN "gfx/tilesets/nihon_old.2bpp.lz"
+
+TilesetNihonOldMeta::
+INCBIN "data/tilesets/nihon_old_metatiles.bin"
+
+TilesetNihonOldColl::
+INCLUDE "data/tilesets/nihon_old_collision.asm"
+
 TilesetTraditionalHouseGFX::
 INCBIN "gfx/tilesets/traditional_house.2bpp.lz"
 
@@ -489,3 +536,41 @@ INCBIN "data/tilesets/traditional_house_metatiles.bin"
 
 TilesetTraditionalHouseColl::
 INCLUDE "data/tilesets/traditional_house_collision.asm"
+
+SECTION "Tileset Data 13", ROMX
+
+TilesetNihonSouthGFX::
+INCBIN "gfx/tilesets/nihon_south.2bpp.lz"
+
+TilesetNihonSouthMeta::
+INCBIN "data/tilesets/nihon_south_metatiles.bin"
+
+TilesetNihonSouthColl::
+INCLUDE "data/tilesets/nihon_south_collision.asm"
+
+TilesetNihonWestGFX::
+INCBIN "gfx/tilesets/nihon_west.2bpp.lz"
+
+TilesetNihonWestMeta::
+INCBIN "data/tilesets/nihon_west_metatiles.bin"
+
+TilesetNihonWestColl::
+INCLUDE "data/tilesets/nihon_west_collision.asm"
+
+TilesetNihonBirdonAttr::
+INCBIN "data/tilesets/nihon_birdon_attributes.bin"
+
+TilesetNihonFontAttr::
+INCBIN "data/tilesets/nihon_font_attributes.bin"
+
+TilesetNihonHighTechAttr::
+INCBIN "data/tilesets/nihon_hightech_attributes.bin"
+
+TilesetNihonOldAttr::
+INCBIN "data/tilesets/nihon_old_attributes.bin"
+
+TilesetNihonSouthAttr::
+INCBIN "data/tilesets/nihon_south_attributes.bin"
+
+TilesetNihonWestAttr::
+INCBIN "data/tilesets/nihon_west_attributes.bin"

gfx/tilesets/snowy.pal

@@ -0,0 +1,29 @@
+; morn
+	RGB 29,31,21, 23,23,31, 13,13,18, 07,07,07 ; gray
+	RGB 29,31,21, 31,19,24, 30,10,06, 07,07,07 ; red
+	RGB 29,31,21, 12,25,01, 05,14,00, 07,07,07 ; green (cyan)
+	RGB 31,31,31, 08,12,31, 01,04,31, 07,07,07 ; water
+	RGB 29,31,21, 31,31,07, 31,16,01, 07,07,07 ; yellow
+	RGB 29,31,21, 24,18,07, 20,15,03, 07,07,07 ; brown
+	RGB 29,31,21, 15,31,31, 05,17,31, 07,07,07 ; roof
+	RGB 31,31,16, 31,31,16, 14,09,00, 00,00,00 ; text
+
+; day
+	RGB 27,31,31, 23,23,31, 13,13,18, 07,07,07 ; gray
+	RGB 27,31,31, 31,19,24, 30,10,06, 07,07,07 ; red
+	RGB 27,31,31, 12,25,01, 05,14,00, 07,07,07 ; green  (cyan)
+	RGB 31,31,31, 08,12,31, 01,04,31, 07,07,07 ; water
+	RGB 27,31,31, 31,31,07, 31,16,01, 07,07,07 ; yellow
+	RGB 27,31,31, 24,18,07, 20,15,03, 07,07,07 ; brown
+	RGB 27,31,31, 15,31,31, 05,17,31, 07,07,07 ; roof
+	RGB 31,31,16, 31,31,16, 14,09,00, 00,00,00 ; text
+
+; nite
+	RGB 15,14,24, 11,11,22, 07,07,16, 00,00,00 ; gray
+	RGB 15,14,24, 14,07,17, 13,00,08, 00,00,00 ; red
+	RGB 15,14,24, 02,12,23, 05,05,17, 00,00,00 ; green  (cyan)
+	RGB 15,14,24, 05,05,17, 03,03,10, 00,00,00 ; water
+	RGB 30,30,11, 16,14,18, 16,14,10, 00,00,00 ; yellow
+	RGB 15,14,24, 12,09,15, 08,04,05, 00,00,00 ; brown
+	RGB 15,14,24, 13,12,23, 11,09,20, 00,00,00 ; roof
+	RGB 31,31,16, 31,31,16, 14,09,00, 00,00,00 ; text