From cf907d225fe91510bbcb7996333e0055880e45ea Mon Sep 17 00:00:00 2001
From: Zeta_Null <z0zetanull@gmail.com>
Date: Fri, 20 Oct 2023 16:57:41 -0400
Subject: [PATCH] Nihon Tileset Added Nihon01 tileset

---
 constants/tileset_constants.asm      |   1 +
 data/maps/maps.asm                   |   2 +-
 data/tilesets.asm                    |   1 +
 data/tilesets/nihon01_attributes.bin | Bin 0 -> 2048 bytes
 data/tilesets/nihon01_collision.asm  | 128 +++++++++++++++++++++++++++
 data/tilesets/nihon01_metatiles.bin  | Bin 0 -> 2048 bytes
 engine/tilesets/tileset_anims.asm    |  13 +++
 gfx/tilesets.asm                     |  12 +++
 gfx/tilesets/nihon01.png             | Bin 0 -> 3030 bytes
 maps/SilentHills.ablk                |   4 +-
 maps/SilentHills.asm                 |   2 +-
 11 files changed, 159 insertions(+), 4 deletions(-)
 create mode 100644 data/tilesets/nihon01_attributes.bin
 create mode 100644 data/tilesets/nihon01_collision.asm
 create mode 100644 data/tilesets/nihon01_metatiles.bin
 create mode 100644 gfx/tilesets/nihon01.png

diff --git a/constants/tileset_constants.asm b/constants/tileset_constants.asm
index 02ceab1..a2023c7 100644
--- a/constants/tileset_constants.asm
+++ b/constants/tileset_constants.asm
@@ -36,6 +36,7 @@
 	const TILESET_KABUTO_WORD_ROOM     ; 22
 	const TILESET_OMANYTE_WORD_ROOM    ; 23
 	const TILESET_AERODACTYL_WORD_ROOM ; 24
+	const TILESET_NIHON_01             ; 25
 DEF NUM_TILESETS EQU const_value - 1
 
 ; wTileset struct size
diff --git a/data/maps/maps.asm b/data/maps/maps.asm
index c0268f1..2a2c40d 100644
--- a/data/maps/maps.asm
+++ b/data/maps/maps.asm
@@ -540,5 +540,5 @@ MapGroup_Cherrygrove:
 
 MapGroup_SilentHills:
 	table_width MAP_LENGTH, MapGroup_SilentHills
-	map SilentHills, TILESET_JOHTO, TOWN, LANDMARK_SILENT_HILLS, MUSIC_NEW_BARK_TOWN, TRUE, PALETTE_AUTO, FISHGROUP_SHORE
+	map SilentHills, TILESET_NIHON_01, TOWN, LANDMARK_SILENT_HILLS, MUSIC_NEW_BARK_TOWN, TRUE, PALETTE_AUTO, FISHGROUP_SHORE
 	assert_table_length NUM_SILENT_HILLS_MAPS
diff --git a/data/tilesets.asm b/data/tilesets.asm
index 024c98b..903b17f 100644
--- a/data/tilesets.asm
+++ b/data/tilesets.asm
@@ -48,4 +48,5 @@ Tilesets::
 	tileset TilesetKabutoWordRoom
 	tileset TilesetOmanyteWordRoom
 	tileset TilesetAerodactylWordRoom
+	tileset TilesetNihon1
 	assert_table_length NUM_TILESETS + 1
diff --git a/data/tilesets/nihon01_attributes.bin b/data/tilesets/nihon01_attributes.bin
new file mode 100644
index 0000000000000000000000000000000000000000..7ef08f0c71d21385fba0b78018fc09fc85b97867
GIT binary patch
literal 2048
zcmdUw+mgc|2!^#QnZ3#TzwUDIQ^Itc_OeVBe$G;pwDy`F?@)hq{XO;Ug?<Xjhtzv(
zdF}4ehGrwA;M$J#F~qsbE{vf{0|BucJ|>y$WPbRod>q4lM3rVABLc!X?_sCzEVuGo
zl%<&EoJGor<DAi@2$;H?N6n#RQtX@O{O`#71n0SB5fFXA(Zg5F8MLrxFt6m9P*_gk
zQV~ZT*QZN|z51h<nVS&ul<Rm4$<OR=1B%1>t7J{tracw&E!1d@imB;D*L>*fQ_dVJ
zCl7kX%~ov?`+uCc#8uQp5Qd4}nC!)DJuDJEy*&td6=*JxybAOOX~pYYbG*$t$3B7X
zVt?XVs>yI3%h`-i{TJsL?u+<#IsZ!Z#X=15i+8&)`VLF~vmXX*AU`vll=m`z@Qd@l
V4=V-naNa|Fhrs(gbp3wRx__-r8KD3G

literal 0
HcmV?d00001

diff --git a/data/tilesets/nihon01_collision.asm b/data/tilesets/nihon01_collision.asm
new file mode 100644
index 0000000..a67f8fe
--- /dev/null
+++ b/data/tilesets/nihon01_collision.asm
@@ -0,0 +1,128 @@
+	tilecoll 01, 01, 01, 01 ; 00
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02
+	tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 03
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04
+	tilecoll WALL, WALL, WALL, WALL ; 05
+	tilecoll LADDER, LADDER, LADDER, LADDER ; 06
+	tilecoll WHIRLPOOL, BUOY, WATER, BUOY ; 07
+	tilecoll WALL, WALL, WALL, WALL ; 08
+	tilecoll WALL, WALL, WALL, WALL ; 09
+	tilecoll WALL, WALL, WALL, WALL ; 0a
+	tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 0b
+	tilecoll FLOOR, FLOOR, WALL, WARP_CARPET_DOWN ; 0c
+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WALL ; 0d
+	tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 0e
+	tilecoll WALL, WALL, WALL, WALL ; 0f
+	tilecoll WALL, WALL, WALL, WALL ; 10
+	tilecoll WALL, WALL, WALL, WALL ; 11
+	tilecoll WALL, WALL, WALL, WALL ; 12
+	tilecoll WALL, WALL, WALL, WALL ; 13
+	tilecoll WALL, WALL, WALL, DOOR ; 14
+	tilecoll WALL, WALL, WALL, WALL ; 15
+	tilecoll WALL, WALL, WALL, DOOR ; 16
+	tilecoll WALL, WALL, WALL, WALL ; 17
+	tilecoll WALL, WALL, WALL, WALL ; 18
+	tilecoll WALL, WALL, WALL, WALL ; 19
+	tilecoll WALL, DOOR, FLOOR, FLOOR ; 1a
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 1b
+	tilecoll WALL, WALL, WALL, WALL ; 1c
+	tilecoll WALL, WALL, DOOR, DOOR ; 1d
+	tilecoll WALL, WALL, WALL, WALL ; 1e
+	tilecoll WALL, WALL, WALL, WALL ; 1f
+	tilecoll WALL, WALL, WALL, WALL ; 20
+	tilecoll WALL, WALL, WALL, WALL ; 21
+	tilecoll WALL, WALL, WALL, WALL ; 22
+	tilecoll WALL, WALL, WALL, WALL ; 23
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 24
+	tilecoll WALL, WALL, WALL, WALL ; 25
+	tilecoll WALL, WALL, WALL, WALL ; 26
+	tilecoll WALL, WALL, DOOR, WALL ; 27
+	tilecoll WALL, WALL, WALL, DOOR ; 28
+	tilecoll WALL, WALL, WALL, WALL ; 29
+	tilecoll HEADBUTT_TREE, HEADBUTT_TREE, WALL, WALL ; 2a
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 2b
+	tilecoll HEADBUTT_TREE, HEADBUTT_TREE, WALL, WALL ; 2c
+	tilecoll HEADBUTT_TREE, HEADBUTT_TREE, WALL, WALL ; 2d
+	tilecoll WALL, WALL, WALL, DOOR ; 2e
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 2f
+	tilecoll BUOY, BUOY, BUOY, WATER ; 30
+	tilecoll BUOY, BUOY, WATER, WATER ; 31
+	tilecoll BUOY, BUOY, WATER, BUOY ; 32
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 33
+	tilecoll BUOY, WATER, BUOY, WATER ; 34
+	tilecoll WATER, WATER, WATER, WATER ; 35
+	tilecoll WATER, BUOY, WATER, BUOY ; 36
+	tilecoll WALL, WALL, WALL, DOOR ; 37
+	tilecoll BUOY, WATER, BUOY, BUOY ; 38
+	tilecoll WATER, WATER, BUOY, BUOY ; 39
+	tilecoll WATER, BUOY, BUOY, BUOY ; 3a
+	tilecoll WALL, WALL, WALL, WALL ; 3b
+	tilecoll HEADBUTT_TREE, FLOOR, FLOOR, FLOOR ; 3c
+	tilecoll FLOOR, HEADBUTT_TREE, FLOOR, FLOOR ; 3d
+	tilecoll FLOOR, FLOOR, HEADBUTT_TREE, FLOOR ; 3e
+	tilecoll FLOOR, FLOOR, FLOOR, HEADBUTT_TREE ; 3f
+	tilecoll WALL, WALL, WALL, FLOOR ; 40
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 41
+	tilecoll WALL, WALL, FLOOR, WALL ; 42
+	tilecoll WATER, WATER, WATER, WATER ; 43
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 44
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 45
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 46
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 47
+	tilecoll WALL, FLOOR, WALL, WALL ; 48
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 49
+	tilecoll FLOOR, WALL, WALL, WALL ; 4a
+	tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 4b
+	tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4c
+	tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 4d
+	tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4e
+	tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 4f
+	tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 50
+	tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 51
+	tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 52
+	tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 53
+	tilecoll WATER, WATER, WATER, WATER ; 54
+	tilecoll WATER, WATER, WATER, WATER ; 55
+	tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 56
+	tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 57
+	tilecoll WATER, WATER, WATER, WATER ; 58
+	tilecoll WATER, WATER, WATER, WATER ; 59
+	tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 5a
+	tilecoll HEADBUTT_TREE, CUT_TREE, FLOOR, FLOOR ; 5b
+	tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, FLOOR ; 5c
+	tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, FLOOR ; 5d
+	tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, HEADBUTT_TREE ; 5e
+	tilecoll FLOOR, HEADBUTT_TREE, FLOOR, CUT_TREE ; 5f
+	tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, FLOOR ; 60
+	tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 61
+	tilecoll FLOOR, HEADBUTT_TREE, FLOOR, HEADBUTT_TREE ; 62
+	tilecoll FLOOR, FLOOR, CUT_TREE, HEADBUTT_TREE ; 63
+	tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 64
+	tilecoll FLOOR, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 65
+	tilecoll FLOOR, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 66
+	tilecoll CUT_TREE, FLOOR, HEADBUTT_TREE, FLOOR ; 67
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 68
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 69
+	tilecoll WALL, UP_WALL, WALL, FLOOR ; 6a
+	tilecoll UP_WALL, WALL, FLOOR, WALL ; 6b
+	tilecoll WALL, FLOOR, WALL, WALL ; 6c
+	tilecoll FLOOR, WALL, WALL, WALL ; 6d
+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 6e
+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 6f
+	tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 70
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 71
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 72
+	tilecoll FLOOR, FLOOR, CAVE, WALL ; 73
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 74
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 75
+	tilecoll WATER, WATER, WATER, WATER ; 76
+	tilecoll WALL, WALL, DOOR, WALL ; 77
+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 78
+	tilecoll WATER, WATER, WATER, WATER ; 79
+	tilecoll WATER, WATER, WATER, WATER ; 7a
+	tilecoll WALL, WALL, WALL, WALL ; 7b
+	tilecoll WALL, WALL, WALL, WALL ; 7c
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 7d
+	tilecoll WALL, DOOR, FLOOR, FLOOR ; 7e
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 7f
diff --git a/data/tilesets/nihon01_metatiles.bin b/data/tilesets/nihon01_metatiles.bin
new file mode 100644
index 0000000000000000000000000000000000000000..dec768a173f7b142ca4530c93521bee62e2b12d0
GIT binary patch
literal 2048
zcmah~4O`kk4A#1qZQb0M6lz<+qVnw~vtuePl!=OuWmDJ`eRTW(|6*^hrajo)0wKvI
zZ<1b)-qO-MX$zz-(6a>+?iF<fU!nSeA4KE$bN_JvkXfLQ`?J}X<Jl~ii@DwDbOxi*
zi1=zUnZWd*4vArYzr4DdY;AAv5bt~5r!dqsnYrD&yD+@HB~MIY7_ZDnhauW=GL?!W
zBy<akRjFi1E-Q*6`(ftaX0zFsx~^NcZIfS)C;j@ywPSy^wye|}t~<L$_$!1vgeP3g
zv0vmzU2{F-6bi_{na#dlU0oG9T-QdqcQD_G9IoqFc8ufadj7%|IJT{(>sn3JfLz{H
z6#M-L+wS#&s@Cca>Zj@0cGDrLD7$&&&mzAd)X=#;_mItQiuwo;Jq)JPDb1xk$QhSV
zV2ZgI`QZ-6^8<afWaf32jJI+|zF?Xr@KdClRBJh--Y`wh+qJ5-ZlT^_oRN0|(_9aV
zrDCbq@AU~sR0dT*eD2uahL38o4b=k=lln%rRxs-gKBs%_aycASDzk+6M8*rbM`Aa7
zMP2;xKBgx*j$m9W=OYddkGc-_v5N`O^QPW^*X2I^px3AWMY=z#+Us*yB#WiRmA|jX
zakQT;>?aR#ZhrxMv|CUGpM%n8%jFoya<7el+<;G~rZG;EP*s)ppA$b(m*y-&9@~uP
zE;6WU6sc+#rDTQ~$lOJ&%rFC)W$Z;1MKTuVSjLiH#*+Wo^Sm8w2s6wf%q?c*O9=6V
zPl#;Bv1A;}1Pq0`E0)%bUjJl+lkj=xsk6Q4PtOHMt{JL&vcVQhdVkY<o8_OlIP;oO
zES+rh`i%QuUG~RS)2!XD@5}7_K`_V7R;ww+v|779{P>CE5-f&8^Wk-jCV)9cupsh8
z$di(Yjar~|?P-l>MZ^)OXHj&06Ge1>E+Wg4<|OK}jq~7PmI>iH5cK)LwhxaKh2u2s
z>o-mN`D>g+Cdx&kLBajl!QCi`-lHAdAE#%!&i4@B--o(BI_G<6@&3RSBkm=x`x~uf
B7IXjr

literal 0
HcmV?d00001

diff --git a/engine/tilesets/tileset_anims.asm b/engine/tilesets/tileset_anims.asm
index ca2a86a..97b3e83 100644
--- a/engine/tilesets/tileset_anims.asm
+++ b/engine/tilesets/tileset_anims.asm
@@ -250,6 +250,19 @@ UnusedTilesetAnim5: ; unreferenced
 	dw NULL,  WaitTileAnimation
 	dw NULL,  DoneTileAnimation
 
+TilesetNihon1Anim:
+	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:
diff --git a/gfx/tilesets.asm b/gfx/tilesets.asm
index 4d7e47f..4ae47a6 100644
--- a/gfx/tilesets.asm
+++ b/gfx/tilesets.asm
@@ -336,6 +336,15 @@ INCBIN "data/tilesets/omanyte_word_room_metatiles.bin"
 TilesetAerodactylWordRoomMeta::
 INCBIN "data/tilesets/aerodactyl_word_room_metatiles.bin"
 
+TilesetNihon1GFX::
+INCBIN "gfx/tilesets/nihon01.2bpp.lz"
+
+TilesetNihon1Meta::
+INCBIN "data/tilesets/nihon01_metatiles.bin"
+
+TilesetNihon1Coll::
+INCLUDE "data/tilesets/nihon01_collision.asm"
+
 
 SECTION "Tileset Data 9", ROMX
 
@@ -451,3 +460,6 @@ INCBIN "data/tilesets/omanyte_word_room_attributes.bin"
 
 TilesetAerodactylWordRoomAttr::
 INCBIN "data/tilesets/aerodactyl_word_room_attributes.bin"
+
+TilesetNihon1Attr::
+INCBIN "data/tilesets/nihon01_attributes.bin"
\ No newline at end of file
diff --git a/gfx/tilesets/nihon01.png b/gfx/tilesets/nihon01.png
new file mode 100644
index 0000000000000000000000000000000000000000..552dcc8c1a6ae4dabcb875c647551162cab16fa8
GIT binary patch
literal 3030
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
U&(_j+esO^FS(h`_cF5%a0P1KJLI3~&

literal 0
HcmV?d00001

diff --git a/maps/SilentHills.ablk b/maps/SilentHills.ablk
index 3a57236..2145651 100644
--- a/maps/SilentHills.ablk
+++ b/maps/SilentHills.ablk
@@ -1,2 +1,2 @@
-IJ

HF

ABF

IJaJ


E



-







x

x














IIIIIJ
TvvvvU

\ No newline at end of file
+IJ

HF|}

+BF~E
/JIJ







+



 !A|}
G~E



$AAAAAATvvvvUX5555Y
\ No newline at end of file
diff --git a/maps/SilentHills.asm b/maps/SilentHills.asm
index c7b8778..da05713 100644
--- a/maps/SilentHills.asm
+++ b/maps/SilentHills.asm
@@ -15,7 +15,7 @@ SilentHills_MapEvents:
 	db 0, 0 ; filler
 
 	def_warp_events
-	warp_event 11,  5, PLAYERS_HOUSE_1F, 1
+	warp_event 13,  4, PLAYERS_HOUSE_1F, 1
 
 	def_coord_events