diff --git a/constants/tileset_constants.asm b/constants/tileset_constants.asm index a2023c7..c259ac2 100644 --- a/constants/tileset_constants.asm +++ b/constants/tileset_constants.asm @@ -37,6 +37,7 @@ const TILESET_OMANYTE_WORD_ROOM ; 23 const TILESET_AERODACTYL_WORD_ROOM ; 24 const TILESET_NIHON_01 ; 25 + const TILESET_FOREST_KANTO ; 26 DEF NUM_TILESETS EQU const_value - 1 ; wTileset struct size diff --git a/data/tilesets.asm b/data/tilesets.asm index 903b17f..57a6454 100644 --- a/data/tilesets.asm +++ b/data/tilesets.asm @@ -49,4 +49,5 @@ Tilesets:: tileset TilesetOmanyteWordRoom tileset TilesetAerodactylWordRoom tileset TilesetNihon1 + tileset TilesetForestKanto assert_table_length NUM_TILESETS + 1 diff --git a/data/tilesets/forest_kanto_attributes.bin b/data/tilesets/forest_kanto_attributes.bin new file mode 100644 index 0000000..e9bd02c Binary files /dev/null and b/data/tilesets/forest_kanto_attributes.bin differ diff --git a/data/tilesets/forest_kanto_collision.asm b/data/tilesets/forest_kanto_collision.asm new file mode 100644 index 0000000..b90198e --- /dev/null +++ b/data/tilesets/forest_kanto_collision.asm @@ -0,0 +1,52 @@ + tilecoll WALL, WALL, WALL, WALL ; 00 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 + tilecoll WATER, WATER, WATER, WATER ; 02 + tilecoll WATER, WATER, WATER, WATER ; 03 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 + tilecoll WALL, WALL, WALL, WALL ; 05 + tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 06 + tilecoll WATER, WATER, WATER, WATER ; 07 + tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, FLOOR ; 08 + tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, FLOOR ; 09 + tilecoll WATER, WATER, WATER, WATER ; 0a + tilecoll WATER, WATER, WATER, WATER ; 0b + tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, FLOOR ; 0c + tilecoll WATER, WATER, WATER, WATER ; 0d + tilecoll FLOOR, HEADBUTT_TREE, FLOOR, HEADBUTT_TREE ; 0e + tilecoll FLOOR, FLOOR, CUT_TREE, HEADBUTT_TREE ; 0f + tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 10 + tilecoll FLOOR, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 11 + tilecoll FLOOR, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 12 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 13 + tilecoll HEADBUTT_TREE, FLOOR, FLOOR, FLOOR ; 14 + tilecoll FLOOR, HEADBUTT_TREE, FLOOR, FLOOR ; 15 + tilecoll FLOOR, FLOOR, HEADBUTT_TREE, FLOOR ; 16 + tilecoll FLOOR, FLOOR, FLOOR, HEADBUTT_TREE ; 17 + tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 18 + tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 19 + tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 1a + tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 1b + tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 1c + tilecoll WALL, WALL, WALL, WALL ; 1d + tilecoll WALL, WALL, WALL, WALL ; 1e + tilecoll WALL, WALL, WALL, WALL ; 1f + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 20 + tilecoll WALL, WALL, WALL, WALL ; 21 + tilecoll WALL, WALL, WALL, WALL ; 22 + tilecoll WALL, WALL, WALL, WALL ; 23 + tilecoll WALL, WALL, WALL, DOOR ; 24 + tilecoll WALL, WALL, WALL, WALL ; 25 + tilecoll WALL, WALL, WALL, WALL ; 26 + tilecoll WALL, WALL, WALL, WALL ; 27 + tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 28 + tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 29 + tilecoll WALL, TALL_GRASS, WALL, TALL_GRASS ; 2a + tilecoll TALL_GRASS, WALL, TALL_GRASS, WALL ; 2b + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2d + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 2e + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 2f + tilecoll WALL, FLOOR, WALL, FLOOR ; 30 + tilecoll FLOOR, WALL, FLOOR, WALL ; 31 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 32 + tilecoll LONG_GRASS, LONG_GRASS, LONG_GRASS, LONG_GRASS ; 33 diff --git a/data/tilesets/forest_kanto_metatiles.bin b/data/tilesets/forest_kanto_metatiles.bin new file mode 100644 index 0000000..48dceac Binary files /dev/null and b/data/tilesets/forest_kanto_metatiles.bin differ diff --git a/gfx/tilesets.asm b/gfx/tilesets.asm index 4648c0a..cc179bc 100644 --- a/gfx/tilesets.asm +++ b/gfx/tilesets.asm @@ -336,6 +336,15 @@ INCBIN "data/tilesets/nihon01_metatiles.bin" TilesetNihon1Coll:: INCLUDE "data/tilesets/nihon01_collision.asm" +TilesetForestKantoGFX:: +INCBIN "gfx/tilesets/forest_kanto.2bpp.lz" + +TilesetForestKantoMeta:: +INCBIN "data/tilesets/forest_kanto_metatiles.bin" + +TilesetForestKantoColl:: +INCLUDE "data/tilesets/forest_kanto_collision.asm" + SECTION "Tileset Data 9", ROMX @@ -455,6 +464,9 @@ INCBIN "data/tilesets/aerodactyl_word_room_attributes.bin" TilesetNihon1Attr:: INCBIN "data/tilesets/nihon01_attributes.bin" +TilesetForestKantoAttr:: +INCBIN "data/tilesets/forest_kanto_attributes.bin" + SECTION "Tileset Data 12", ROMX TilesetTraditionalHouseGFX:: diff --git a/gfx/tilesets/forest_kanto.png b/gfx/tilesets/forest_kanto.png new file mode 100644 index 0000000..9f2e21b Binary files /dev/null and b/gfx/tilesets/forest_kanto.png differ