ABLK files and Steven

data/tilesets/ice_path_collision.asm

@@ -62,3 +62,11 @@
 	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 3d
 	tilecoll FLOOR, FLOOR, WALL, WALL ; 3e
 	tilecoll ICE, ICE, ICE, LADDER ; 3f
+	tilecoll WATER, WATER, WATER, WATER ; 40
+	tilecoll WATER, WATER, WATER, WATER ; 41
+	tilecoll WATER, WATER, WATER, WATER ; 42
+	tilecoll WATER, WATER, WATER, WATER ; 43
+	tilecoll WATER, WATER, WATER, WATER ; 44
+	tilecoll WATER, WATER, WATER, WATER ; 45
+	tilecoll WATER, WATER, WATER, WATER ; 46
+	tilecoll WATER, WATER, WATER, WATER ; 47

data/tilesets/nihon_birdon_collision.asm

@@ -51,3 +51,20 @@
 	tilecoll WALL, WALL, DOOR, DOOR ; 32
 	tilecoll WALL, WALL, WALL, WALL ; 33
 	tilecoll DOOR, WALL, FLOOR, FLOOR ; 34
+	tilecoll WALL, WALL, WALL, WALL ; 35
+	tilecoll WALL, WALL, WALL, WALL ; 36
+	tilecoll WALL, WALL, WALL, WALL ; 37
+	tilecoll WALL, WALL, DOOR, WALL ; 38
+	tilecoll WALL, WALL, WALL, WALL ; 39
+	tilecoll WALL, WALL, WALL, WALL ; 3a
+	tilecoll WALL, WALL, WALL, WALL ; 3b
+	tilecoll WALL, WALL, WALL, WALL ; 3c
+	tilecoll WATER, WATER, WATER, WATER ; 3d
+	tilecoll WATER, WATER, WATER, WATER ; 3e
+	tilecoll WATER, WATER, WATER, WATER ; 3f
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40
+	tilecoll WATER, WATER, WATER, WATER ; 41
+	tilecoll WATER, WATER, WATER, WATER ; 42
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 43
+	tilecoll WALL, WALL, WALL, WALL ; 44
+	tilecoll WALL, WALL, WALL, FLOOR ; 45

data/tilesets/nihon_font_collision.asm

@@ -0,0 +1,80 @@
+	tilecoll WALL, WALL, WALL, WALL ; 00
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 02
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04
+	tilecoll WALL, WALL, WALL, FLOOR ; 05
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 06
+	tilecoll WALL, WALL, FLOOR, WALL ; 07
+	tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 08
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 09
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 0a
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 0b
+	tilecoll WALL, WALL, WALL, WALL ; 0c
+	tilecoll WALL, FLOOR, WALL, WALL ; 0d
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 0e
+	tilecoll FLOOR, WALL, WALL, WALL ; 0f
+	tilecoll WALL, WALL, WALL, WALL ; 10
+	tilecoll WATER, WATER, WATER, WATER ; 11
+	tilecoll WATER, WATER, WATER, WATER ; 12
+	tilecoll WATER, WATER, WATER, WATER ; 13
+	tilecoll WALL, WALL, WALL, WALL ; 14
+	tilecoll WATER, WATER, WATER, WATER ; 15
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 16
+	tilecoll WATER, WATER, WATER, WATER ; 17
+	tilecoll WALL, WALL, WALL, WALL ; 18
+	tilecoll WALL, WALL, WALL, WATER ; 19
+	tilecoll WALL, WALL, WATER, WATER ; 1a
+	tilecoll WALL, WALL, WATER, WALL ; 1b
+	tilecoll WALL, WALL, WALL, WALL ; 1c
+	tilecoll WALL, WATER, WALL, WATER ; 1d
+	tilecoll WATER, WATER, WATER, WATER ; 1e
+	tilecoll WATER, WALL, WATER, WALL ; 1f
+	tilecoll WALL, WALL, DOOR, WALL ; 20
+	tilecoll WALL, WATER, WALL, WALL ; 21
+	tilecoll WATER, WATER, WALL, WALL ; 22
+	tilecoll WATER, WALL, WALL, WALL ; 23
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 24
+	tilecoll WALL, UP_WALL, WALL, FLOOR ; 25
+	tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 26
+	tilecoll UP_WALL, WALL, FLOOR, WALL ; 27
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 28
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 29
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2a
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 2b
+	tilecoll CUT_TREE, HEADBUTT_TREE, FLOOR, HEADBUTT_TREE ; 2c
+	tilecoll WALL, FLOOR, WALL, WALL ; 2d
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 2e
+	tilecoll FLOOR, WALL, WALL, WALL ; 2f
+	tilecoll WATER, WATER, WALL, WALL ; 30
+	tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, FLOOR ; 31
+	tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, FLOOR ; 32
+	tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, HEADBUTT_TREE ; 33
+	tilecoll WATER, WATER, WATER, WATER ; 34
+	tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, FLOOR ; 35
+	tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, CUT_TREE ; 36
+	tilecoll FLOOR, HEADBUTT_TREE, FLOOR, HEADBUTT_TREE ; 37
+	tilecoll WATER, WATER, WATER, WATER ; 38
+	tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 39
+	tilecoll FLOOR, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 3a
+	tilecoll FLOOR, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 3b
+	tilecoll WALL, WALL, WALL, WALL ; 3c
+	tilecoll WALL, WALL, DOOR, WALL ; 3d
+	tilecoll WALL, WALL, WALL, DOOR ; 3e
+	tilecoll WALL, WALL, WALL, WALL ; 3f
+	tilecoll WALL, WALL, WALL, WALL ; 40
+	tilecoll WALL, WALL, WALL, WALL ; 41
+	tilecoll WALL, WALL, WALL, WALL ; 42
+	tilecoll WALL, WALL, WALL, WALL ; 43
+	tilecoll WALL, WALL, WALL, DOOR ; 44
+	tilecoll WALL, WALL, WALL, WALL ; 45
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 46
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 47
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 48
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 49
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 4a
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 4b
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 4c
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 4d
+	tilecoll WALL, WALL, WALL, WALL ; 4e
+	tilecoll WALL, WALL, WALL, WALL ; 4f

data/tilesets/nihon_old_collision.asm

@@ -38,7 +38,7 @@
 	tilecoll WALL, WALL, FLOOR, FLOOR ; 25
 	tilecoll WALL, WALL, FLOOR, FLOOR ; 26
 	tilecoll WALL, WALL, WALL, WALL ; 27
-	tilecoll WALL, WALL, WALL, WALL ; 28
+	tilecoll WALL, WALL, DOOR, WALL ; 28
 	tilecoll WALL, DOOR, FLOOR, FLOOR ; 29
 	tilecoll WALL, WALL, WALL, WALL ; 2a
 	tilecoll WALL, WALL, WALL, WALL ; 2b
@@ -84,3 +84,4 @@
 	tilecoll WATER, WATER, WATER, WATER ; 53
 	tilecoll WALL, WALL, WALL, WALL ; 54
 	tilecoll WALL, WALL, WALL, WALL ; 55
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 56

data/tilesets/nihon_snowy_collision.asm

@@ -62,3 +62,5 @@
 	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 3d
 	tilecoll LONG_GRASS, LONG_GRASS, LONG_GRASS, LONG_GRASS ; 3e
 	tilecoll WALL, WALL, WALL, WALL ; 3f
+	tilecoll WALL, WALL, WALL, WALL ; 40
+	tilecoll WALL, WALL, DOOR, WALL ; 41

gfx/tilesets.asm

@@ -36,15 +36,6 @@ INCBIN "data/tilesets/ice_path_metatiles.bin"
 TilesetIcePathColl::
 INCLUDE "data/tilesets/ice_path_collision.asm"
 
-TilesetPlayersRoomGFX::
-INCBIN "gfx/tilesets/players_room.2bpp.lz"
-
-TilesetPlayersRoomMeta::
-INCBIN "data/tilesets/players_room_metatiles.bin"
-
-TilesetPlayersRoomColl::
-INCLUDE "data/tilesets/players_room_collision.asm"
-
 
 SECTION "Tileset Data 2", ROMX
 
@@ -639,6 +630,15 @@ INCLUDE "data/tilesets/lushcave_collision.asm"
 TilesetLushCaveAttr::
 INCBIN "data/tilesets/lushcave_attributes.bin"
 
+TilesetPlayersRoomGFX::
+INCBIN "gfx/tilesets/players_room.2bpp.lz"
+
+TilesetPlayersRoomMeta::
+INCBIN "data/tilesets/players_room_metatiles.bin"
+
+TilesetPlayersRoomColl::
+INCLUDE "data/tilesets/players_room_collision.asm"
+
 ; there should be space here, lavender crypt's set is just big
 
 SECTION "Tileset Data 16", ROMX

maps/NihonSafariZoneCenter.ablk

@@ -0,0 +1 @@
+999)=9998;
+

4
;:?











#



$









	

8;
+

4
;:+%&4

maps/NihonSafariZoneConnectionCaveA.ablk

@@ -0,0 +1,3 @@
+


			
+






		
+		MOL
						QS	D)))*#(#C973 !"E-U#UV1-
WU
P
1-
T

V
W








T

maps/NihonSafariZoneEntryzone.ablk

@@ -0,0 +1 @@
+HJNNNMNMJHLJNMKIHLJHLIMHOJKIHIBCGDF<><>@A()))))),------0111111

maps/NihonSafariZoneFallCave.ablk

@@ -0,0 +1,8 @@
+






	
+(+)+	
+(+M	
+>'=

+&2=
+&%!
+*N+
+$	N$N#M			N#M

maps/NihonSafariZoneSpringCave.ablk

@@ -0,0 +1,3 @@
+


										
+






())))/J






>!!"MNNO		
+



EQRRS ?




DKJQRS#.
1



DW#&&.




TV#F-W







#&UT









maps/NihonSafariZoneSpringCenterConnection.ablk

@@ -0,0 +1 @@
+kk)))¥¥¥ll***¥¥TnU¥¥lj'v*toƒX5Yƒ¥j<C2A5>vl*Œs¤TŠYƒlj'ƒXYƒƒ¥?jv*"99ƒ¥9ƒ9j'ƒ¥¥¥"ƒTnUƒXY

maps/NihonSafariZoneSummerCenterConnection.ablk

@@ -0,0 +1 @@
+(QQ([QQQ

QQQSQ(QQQSSS	

QSQQXQQQQSXZSQ:FFFFFFF;X	SSDVQMUUUUG;.:FKEQSMUUUUE---TUGFFKVQSME1112MUUUV
WQDE1112S(MUGFFFKEX1RB6SSDUUUUUUEX12
QQQDUUUUUVQX56((
MVQQSZ

QQSSXZYYYY	

maps/NihonSafariZoneSummerDesert.ablk

@@ -0,0 +1 @@
+D0;<<<<<<<<<E4C@56666:<<<<@=
>@58:<<CA?B;<<@C@;<<@C@;<<566

maps/NihonSafariZoneWinterCave.ablk

@@ -0,0 +1,12 @@
+
>

>



+#>:
+
+!"
+
+AC
+E@C
+
+,!DG
+,EG
+)
+)"** 

maps/NihonSafariZoneWinterCenterConnection.ablk

@@ -0,0 +1 @@
+"7$5!#7"5!5!%%%"!5!%%%%% !%%%%>//>//%+:,///>>%8;9////>%89//&*()'//+,"&$##/89"!#%//>!%>/////>%%%%>>>%%%%%%//%%)*'%//%%%#%%**'%%%#%%>/#&**$'%//#/"&*%#%/$#>"'#564!>"%%###>//!##//%%%!#/>%%!//>>%%%//<=/%/%%%%%01%%%%%%%%23%%%%

maps/NihonSafariZoneWinterValley.ablk

@@ -0,0 +1 @@
+$$$$57$$$$$$$#5 7"$$$$$$$##?/@A"75!#?-7"#5!///>??""##???///?///?""##??/?>>>>""##>?+:,??>/?""##>?8;9/?????""##//89///??//""##//>>/?""##/?/>//?""##///?/?+::,""##?>>///?8;;9""##??>>>???/89""##????????/??""##5667""###+:::::::,"""

maps/QuietCave_Old.ablk

@@ -0,0 +1 @@
+i82822222221						$$$$g82;C62221		;8222?"266[==_28a2?"2c==<6[=_8a2222222266822aa8[====<21	76822aa;8226668?28822669268?2[===_7		72622268?282222aa262948?27		Z4268?2817	268?282a6"268228a26"1		77		Z?2866$$->8;4226$$$h;8222264822822226226

maps/Route53.ablk

@@ -0,0 +1,2 @@
+)************+-.....@A...../0""""""""""""""""$(6,<?DEFHG(M4,(L(
+
JIK(M"" 



0""""""""""""""$













8$6,((



0""""""""""%&&&&&&&&&&&&&&&'!""""""""""#)***************+