diff --git a/constants/tileset_constants.asm b/constants/tileset_constants.asm index ce9d0d0..fa4f662 100644 --- a/constants/tileset_constants.asm +++ b/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 diff --git a/data/tilesets.asm b/data/tilesets.asm index c531ccd..2b57a37 100644 --- a/data/tilesets.asm +++ b/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 diff --git a/data/tilesets/museum_attributes.bin b/data/tilesets/museum_attributes.bin index 42dec29..1fedbd1 100644 Binary files a/data/tilesets/museum_attributes.bin and b/data/tilesets/museum_attributes.bin differ diff --git a/data/tilesets/museum_collision.asm b/data/tilesets/museum_collision.asm index b9261b0..d68912c 100644 --- a/data/tilesets/museum_collision.asm +++ b/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 diff --git a/data/tilesets/museum_metatiles.bin b/data/tilesets/museum_metatiles.bin index 442127b..decfe0d 100644 Binary files a/data/tilesets/museum_metatiles.bin and b/data/tilesets/museum_metatiles.bin differ diff --git a/data/tilesets/nihon_birdon_attributes.bin b/data/tilesets/nihon_birdon_attributes.bin new file mode 100644 index 0000000..e69de29 diff --git a/data/tilesets/nihon_birdon_collision.asm b/data/tilesets/nihon_birdon_collision.asm new file mode 100644 index 0000000..e69de29 diff --git a/data/tilesets/nihon_birdon_metatiles.bin b/data/tilesets/nihon_birdon_metatiles.bin new file mode 100644 index 0000000..e69de29 diff --git a/data/tilesets/nihon_font_attributes.bin b/data/tilesets/nihon_font_attributes.bin new file mode 100644 index 0000000..e69de29 diff --git a/data/tilesets/nihon_font_collision.asm b/data/tilesets/nihon_font_collision.asm new file mode 100644 index 0000000..e69de29 diff --git a/data/tilesets/nihon_font_metatiles.bin b/data/tilesets/nihon_font_metatiles.bin new file mode 100644 index 0000000..e69de29 diff --git a/data/tilesets/nihon_hightech_attributes.bin b/data/tilesets/nihon_hightech_attributes.bin new file mode 100644 index 0000000..e69de29 diff --git a/data/tilesets/nihon_hightech_collision.asm b/data/tilesets/nihon_hightech_collision.asm new file mode 100644 index 0000000..e69de29 diff --git a/data/tilesets/nihon_hightech_metatiles.bin b/data/tilesets/nihon_hightech_metatiles.bin new file mode 100644 index 0000000..e69de29 diff --git a/data/tilesets/nihon_old_attributes.bin b/data/tilesets/nihon_old_attributes.bin new file mode 100644 index 0000000..e69de29 diff --git a/data/tilesets/nihon_old_collision.asm b/data/tilesets/nihon_old_collision.asm new file mode 100644 index 0000000..e69de29 diff --git a/data/tilesets/nihon_old_metatiles.bin b/data/tilesets/nihon_old_metatiles.bin new file mode 100644 index 0000000..e69de29 diff --git a/data/tilesets/nihon_snowy_attributes.bin b/data/tilesets/nihon_snowy_attributes.bin new file mode 100644 index 0000000..8275bcd Binary files /dev/null and b/data/tilesets/nihon_snowy_attributes.bin differ diff --git a/data/tilesets/nihon_snowy_collision.asm b/data/tilesets/nihon_snowy_collision.asm new file mode 100644 index 0000000..4a901e2 --- /dev/null +++ b/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 diff --git a/data/tilesets/nihon_snowy_metatiles.bin b/data/tilesets/nihon_snowy_metatiles.bin new file mode 100644 index 0000000..86c74e0 Binary files /dev/null and b/data/tilesets/nihon_snowy_metatiles.bin differ diff --git a/data/tilesets/nihon_south_attributes.bin b/data/tilesets/nihon_south_attributes.bin new file mode 100644 index 0000000..e69de29 diff --git a/data/tilesets/nihon_south_collision.asm b/data/tilesets/nihon_south_collision.asm new file mode 100644 index 0000000..e69de29 diff --git a/data/tilesets/nihon_south_metatiles.bin b/data/tilesets/nihon_south_metatiles.bin new file mode 100644 index 0000000..e69de29 diff --git a/data/tilesets/nihon_west_attributes.bin b/data/tilesets/nihon_west_attributes.bin new file mode 100644 index 0000000..e69de29 diff --git a/data/tilesets/nihon_west_collision.asm b/data/tilesets/nihon_west_collision.asm new file mode 100644 index 0000000..e69de29 diff --git a/data/tilesets/nihon_west_metatiles.bin b/data/tilesets/nihon_west_metatiles.bin new file mode 100644 index 0000000..e69de29 diff --git a/engine/tilesets/tileset_anims.asm b/engine/tilesets/tileset_anims.asm index 5d568ee..4a7cb2c 100644 --- a/engine/tilesets/tileset_anims.asm +++ b/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 @@ -272,6 +278,19 @@ TilesetForestKantoAnim: dw NULL, AnimateWaterPalette 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: diff --git a/gfx/tilesets.asm b/gfx/tilesets.asm index 5a97b66..cea72a6 100644 --- a/gfx/tilesets.asm +++ b/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" @@ -488,4 +535,42 @@ TilesetTraditionalHouseMeta:: INCBIN "data/tilesets/traditional_house_metatiles.bin" TilesetTraditionalHouseColl:: -INCLUDE "data/tilesets/traditional_house_collision.asm" \ No newline at end of file +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" \ No newline at end of file diff --git a/gfx/tilesets/nihon01.png b/gfx/tilesets/nihon01.png index 552dcc8..87df7a4 100644 Binary files a/gfx/tilesets/nihon01.png and b/gfx/tilesets/nihon01.png differ diff --git a/gfx/tilesets/nihon_birdon.png b/gfx/tilesets/nihon_birdon.png new file mode 100644 index 0000000..ae61864 Binary files /dev/null and b/gfx/tilesets/nihon_birdon.png differ diff --git a/gfx/tilesets/nihon_font.png b/gfx/tilesets/nihon_font.png new file mode 100644 index 0000000..b8b04b0 Binary files /dev/null and b/gfx/tilesets/nihon_font.png differ diff --git a/gfx/tilesets/nihon_hightech.png b/gfx/tilesets/nihon_hightech.png new file mode 100644 index 0000000..5dc4ddc Binary files /dev/null and b/gfx/tilesets/nihon_hightech.png differ diff --git a/gfx/tilesets/nihon_old.png b/gfx/tilesets/nihon_old.png new file mode 100644 index 0000000..a9b2f44 Binary files /dev/null and b/gfx/tilesets/nihon_old.png differ diff --git a/gfx/tilesets/nihon_snowy.png b/gfx/tilesets/nihon_snowy.png new file mode 100644 index 0000000..09bb716 Binary files /dev/null and b/gfx/tilesets/nihon_snowy.png differ diff --git a/gfx/tilesets/nihon_south.png b/gfx/tilesets/nihon_south.png new file mode 100644 index 0000000..7e013e5 Binary files /dev/null and b/gfx/tilesets/nihon_south.png differ diff --git a/gfx/tilesets/nihon_west.png b/gfx/tilesets/nihon_west.png new file mode 100644 index 0000000..9c8a6e9 Binary files /dev/null and b/gfx/tilesets/nihon_west.png differ diff --git a/gfx/tilesets/snowy.pal b/gfx/tilesets/snowy.pal new file mode 100644 index 0000000..4ad6bb4 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/maps/Museum1F.ablk b/maps/Museum1F.ablk index 0efaefa..6925090 100644 Binary files a/maps/Museum1F.ablk and b/maps/Museum1F.ablk differ diff --git a/maps/Museum2F.ablk b/maps/Museum2F.ablk index 355e5d8..fedc9f5 100644 Binary files a/maps/Museum2F.ablk and b/maps/Museum2F.ablk differ