From b7a9f6569a9c0defe1f4ebaecedb85dbaf8cc135 Mon Sep 17 00:00:00 2001 From: Zeta_Null Date: Sat, 28 Dec 2024 16:30:57 -0500 Subject: [PATCH] ABLK files and Steven --- data/tilesets/ice_path_attributes.bin | Bin 1024 -> 1152 bytes data/tilesets/ice_path_collision.asm | 8 ++ data/tilesets/ice_path_metatiles.bin | Bin 1024 -> 1152 bytes data/tilesets/lushcave_attributes.bin | Bin 1408 -> 1408 bytes data/tilesets/nihon_birdon_attributes.bin | Bin 848 -> 1120 bytes data/tilesets/nihon_birdon_collision.asm | 17 ++++ data/tilesets/nihon_birdon_metatiles.bin | Bin 848 -> 1120 bytes data/tilesets/nihon_font_attributes.bin | Bin 0 -> 1280 bytes data/tilesets/nihon_font_collision.asm | 80 ++++++++++++++++++ data/tilesets/nihon_font_metatiles.bin | Bin 0 -> 1280 bytes data/tilesets/nihon_old_attributes.bin | Bin 1376 -> 1392 bytes data/tilesets/nihon_old_collision.asm | 3 +- data/tilesets/nihon_old_metatiles.bin | Bin 1376 -> 1392 bytes data/tilesets/nihon_snowy_attributes.bin | Bin 1024 -> 1056 bytes data/tilesets/nihon_snowy_collision.asm | 2 + data/tilesets/nihon_snowy_metatiles.bin | Bin 1024 -> 1056 bytes gfx/tilesets.asm | 18 ++-- gfx/trainers/steven.png | Bin 0 -> 441 bytes maps/NihonSafariZoneCenter.ablk | 1 + maps/NihonSafariZoneConnectionCaveA.ablk | 3 + maps/NihonSafariZoneEntryzone.ablk | 1 + maps/NihonSafariZoneFallCave.ablk | 8 ++ maps/NihonSafariZoneFallCenterConnection.ablk | Bin 0 -> 270 bytes maps/NihonSafariZoneFallZone2.ablk | Bin 0 -> 180 bytes maps/NihonSafariZoneSpringCave.ablk | 3 + ...NihonSafariZoneSpringCenterConnection.ablk | 1 + ...NihonSafariZoneSummerCenterConnection.ablk | 1 + maps/NihonSafariZoneSummerDesert.ablk | 1 + maps/NihonSafariZoneWinterCave.ablk | 12 +++ ...NihonSafariZoneWinterCenterConnection.ablk | 1 + maps/NihonSafariZoneWinterValley.ablk | 1 + maps/QuietCave_Old.ablk | 1 + maps/Route53.ablk | 2 + 33 files changed, 154 insertions(+), 10 deletions(-) create mode 100644 gfx/trainers/steven.png create mode 100644 maps/NihonSafariZoneCenter.ablk create mode 100644 maps/NihonSafariZoneConnectionCaveA.ablk create mode 100644 maps/NihonSafariZoneEntryzone.ablk create mode 100644 maps/NihonSafariZoneFallCave.ablk create mode 100644 maps/NihonSafariZoneFallCenterConnection.ablk create mode 100644 maps/NihonSafariZoneFallZone2.ablk create mode 100644 maps/NihonSafariZoneSpringCave.ablk create mode 100644 maps/NihonSafariZoneSpringCenterConnection.ablk create mode 100644 maps/NihonSafariZoneSummerCenterConnection.ablk create mode 100644 maps/NihonSafariZoneSummerDesert.ablk create mode 100644 maps/NihonSafariZoneWinterCave.ablk create mode 100644 maps/NihonSafariZoneWinterCenterConnection.ablk create mode 100644 maps/NihonSafariZoneWinterValley.ablk create mode 100644 maps/QuietCave_Old.ablk create mode 100644 maps/Route53.ablk diff --git a/data/tilesets/ice_path_attributes.bin b/data/tilesets/ice_path_attributes.bin index 5346b574658486b815d355acfb6b1e19e5eaa9c1..f0b56a16227ea895b6424d098c449870345a9c24 100644 GIT binary patch delta 136 TcmZqRXy9DHQqMN9fRPOV>H-Be delta 6 NcmZqRY~WbH0ssb&0k!}D diff --git a/data/tilesets/ice_path_collision.asm b/data/tilesets/ice_path_collision.asm index 3621269..47837e8 100644 --- a/data/tilesets/ice_path_collision.asm +++ b/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 diff --git a/data/tilesets/ice_path_metatiles.bin b/data/tilesets/ice_path_metatiles.bin index 3c8498957c1f8c9f870878b620e9865bfc1f8ccf..cadd79fb09be5f58330f065c1e328482b623d856 100644 GIT binary patch delta 136 zcmZqRXy9DHQm>$(pa{fpprWLtBn;%iFp#SRmjp6^TvZ??2*b=k223qB8Yqnp;Cg`) GjDi3W{1Hq5 delta 6 NcmZqRY~WbH0ssb&0k!}D diff --git a/data/tilesets/lushcave_attributes.bin b/data/tilesets/lushcave_attributes.bin index 9365301596eeb40aeed737338396dc4027306a33..425ec84da19dbbad7c3c74b6db05fa6f262e8b16 100644 GIT binary patch delta 21 acmZqRZs6V!z{<(Q#Ka0jtW1+5S=9k6p95F` delta 14 VcmZqRZs6V!z&cT0baE=IGyou|1Ni^| diff --git a/data/tilesets/nihon_birdon_attributes.bin b/data/tilesets/nihon_birdon_attributes.bin index d8a85fdcabbc8e367e947908f37373ecd7116e60..eff6609ff912cea97e68cefe2b48b1694b2c4262 100644 GIT binary patch delta 180 zcmcb>_JCtU0Q2NVM)}DT7zJ=(wt8k}W>y$xWrZ`LLO==un9u+g#VA4`<%~cGA()tW S(Euwe3kwg>P9R`n0$~8CHxD!b delta 7 OcmaFBae-|^05bp$G6KQ? diff --git a/data/tilesets/nihon_birdon_collision.asm b/data/tilesets/nihon_birdon_collision.asm index a31c7bc..a7bd552 100644 --- a/data/tilesets/nihon_birdon_collision.asm +++ b/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 diff --git a/data/tilesets/nihon_birdon_metatiles.bin b/data/tilesets/nihon_birdon_metatiles.bin index f40b8504236a1e10e51611c56ca633d39ab575fe..7b1231620d963ce914e13219c8257781213b2152 100644 GIT binary patch delta 282 zcmcb>_JCtU0CT;vva&G{nE;Uq5McmQRaI3JAYlR|fRdzz4JCQ;EQCeA6$pk4)RfQX2QDinhZ05X-4Fp!A=tY`qH4@Lu3BI{KKDQ5;k j2*JwAproWE0L2Q5LW+t~(u#_VOiWA$hODd(j;yQz6apt$ delta 7 OcmaFBae-|^05bp$G6KQ? diff --git a/data/tilesets/nihon_font_attributes.bin b/data/tilesets/nihon_font_attributes.bin index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..41bb4fffa3e13ec29b2fe04ff8b667081c90feb5 100644 GIT binary patch literal 1280 zcmbtU0S?3<2%9=D`~QoNhSeaN*koN)pcI`fd!8BB0VSa(9OMg~P*?P?*yB^Js*ZWk zM=&n0_MWj{v6f;(8=+`oPTU)IcE>z=m1 z>!o)H@z?xv$``M1?e^z5N$iv_4!2BhSsRunNsYozi{%s>7Rvz2YRKH2wmVK?J*9f&eb4JV&hpH; zadQXov&W}i*y;Ad=a+uNt^R*5=YjI4RgY&`HjCmoDm;V570a?Yl*UVIatYhVV_#A- z$72O8J}pNq`Sr(ebn~!UOF0}#xmq(9y&Hp{VV>$p#+)$&4LRUCY235My;DC?AK7RW z)oP@fo6~m3z+G(qv$LH&DzA~sd4wdZ*r^%K>! z(^aUa*Kq5d?w7gz={R{{sIV! delta 22 ecmeys^?++b71Lw~7JMS%$lSXo(ESb+e>hwxZc0Zsh^fdBvi delta 6 NcmZ3$(ZI2Q1po(10o4Ei diff --git a/data/tilesets/nihon_snowy_collision.asm b/data/tilesets/nihon_snowy_collision.asm index b5a4901..64edd7d 100644 --- a/data/tilesets/nihon_snowy_collision.asm +++ b/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 diff --git a/data/tilesets/nihon_snowy_metatiles.bin b/data/tilesets/nihon_snowy_metatiles.bin index f03362b791f54576fe34a76eeda7f03614254e8a..f4b31d27a4db3009b9f0387effafb377e6f9d543 100644 GIT binary patch delta 39 rcmZqRSirG>MZwJ7-9601!$V41QIU~}i3!NH1ac$QHKb)UwU`(IvI7Ul delta 6 NcmZ3$(ZI2Q1po(10o4Ei diff --git a/gfx/tilesets.asm b/gfx/tilesets.asm index db8aecc..34e4a56 100644 --- a/gfx/tilesets.asm +++ b/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 diff --git a/gfx/trainers/steven.png b/gfx/trainers/steven.png new file mode 100644 index 0000000000000000000000000000000000000000..62d2a289ed4a69f654298c7a7cf7ad9713ef3745 GIT binary patch literal 441 zcmV;q0Y?6bP)oacpZR))^+efRo3jp>U^r-bIt1LhMgi>l^1=s%(2*vq87O_~Cs}39_-NWP z8MN)udDc=l7N++h1x(JW`<1teTMIL^A~=cS*bl!as{sqf?iW_mp1kg9U4Tw>kp5sK zA}7G&+vg}U#^$y>yaq-EJZ{wk#}!#s#R*s-YXYOlYpWnT*$oUFarR{Z${$~>#R{w|G%R6~OV>BNi=~TYV_)XQzn}#i=9zG7S-`XMI z610DT7e%f*Hz5~{TXkeGo_>S|e#W~W0pZmV-=jl=ea>m4(^AC=YWn~v-~>9XB29e6 jmXGx(_Ql_UKQ#RT{q_gfMQ>nT00000NkvXXu0mjfm1n<8 literal 0 HcmV?d00001 diff --git a/maps/NihonSafariZoneCenter.ablk b/maps/NihonSafariZoneCenter.ablk new file mode 100644 index 0000000..b21b9df --- /dev/null +++ b/maps/NihonSafariZoneCenter.ablk @@ -0,0 +1 @@ +999)=9998;+4;: ? #$ 8;+4;:+%&4 \ No newline at end of file diff --git a/maps/NihonSafariZoneConnectionCaveA.ablk b/maps/NihonSafariZoneConnectionCaveA.ablk new file mode 100644 index 0000000..f86131b --- /dev/null +++ b/maps/NihonSafariZoneConnectionCaveA.ablk @@ -0,0 +1,3 @@ + + + MOL   QS D)))*# (  # C973  !" E -U #UV1- WU P 1-TV WT \ No newline at end of file diff --git a/maps/NihonSafariZoneEntryzone.ablk b/maps/NihonSafariZoneEntryzone.ablk new file mode 100644 index 0000000..1ae94c4 --- /dev/null +++ b/maps/NihonSafariZoneEntryzone.ablk @@ -0,0 +1 @@ +HJNNNMNMJHLJNMKIHLJHLIMHOJKIHIBCGDF<><>@A()))))),------0111111 \ No newline at end of file diff --git a/maps/NihonSafariZoneFallCave.ablk b/maps/NihonSafariZoneFallCave.ablk new file mode 100644 index 0000000..e347f63 --- /dev/null +++ b/maps/NihonSafariZoneFallCave.ablk @@ -0,0 +1,8 @@ +  +(+)+ +(+M +>'=  +&2= +&%! +*N+ +$ N$N#M N#M \ No newline at end of file diff --git a/maps/NihonSafariZoneFallCenterConnection.ablk b/maps/NihonSafariZoneFallCenterConnection.ablk new file mode 100644 index 0000000000000000000000000000000000000000..4a87376226b03d736c547174f7c2920fd45b9cd5 GIT binary patch literal 270 zcmYk0TN1)B2t^qtsp;qj?0WdR}UIF=b^B?WC*LZd~NX%Vy+VTwl#xoCEX n#;|1`e$;IWsHT8lsNc7ZQnqK}`Pg@NO&gFu{38C|Gc~U-+}Iva literal 0 HcmV?d00001 diff --git a/maps/NihonSafariZoneFallZone2.ablk b/maps/NihonSafariZoneFallZone2.ablk new file mode 100644 index 0000000000000000000000000000000000000000..4fe81c2242ed70ce1720c82cca04340199fe8a85 GIT binary patch literal 180 zcmW-bOAf<83__8WuX>Q?Agql$ZF>Ks1P?3pVDJD|W`MN0?_X8fh$hlxjS7;&+|1DE zQ!!"MNNO  + E QRRS ? DKJ QRS#.1 DW#&&  .TV#F-W #& UT \ No newline at end of file diff --git a/maps/NihonSafariZoneSpringCenterConnection.ablk b/maps/NihonSafariZoneSpringCenterConnection.ablk new file mode 100644 index 0000000..4e6dbc5 --- /dev/null +++ b/maps/NihonSafariZoneSpringCenterConnection.ablk @@ -0,0 +1 @@ +kk)))₯₯₯ll***₯₯TnU₯₯lj'v*toƒX5Yƒ₯jvl*Œs€TŠYƒlj'ƒXYƒƒ₯?jv*"99ƒ₯9ƒ9j'ƒ₯₯₯"ƒTnUƒXY \ No newline at end of file diff --git a/maps/NihonSafariZoneSummerCenterConnection.ablk b/maps/NihonSafariZoneSummerCenterConnection.ablk new file mode 100644 index 0000000..9364e7f --- /dev/null +++ b/maps/NihonSafariZoneSummerCenterConnection.ablk @@ -0,0 +1 @@ +(QQ([QQQQQQSQ(QQQSSS QSQQXQQQQSXZSQ:FFFFFFF;X SSDVQMUUUUG;.:FKEQSMUUUUE---TUGFFKVQSME1112MUUUVWQDE1112S(MUGFFFKEX1RB6SSDUUUUUUEX12QQQDUUUUUVQX56((MVQQSZQQSSXZYYYY  \ No newline at end of file diff --git a/maps/NihonSafariZoneSummerDesert.ablk b/maps/NihonSafariZoneSummerDesert.ablk new file mode 100644 index 0000000..b8c96c1 --- /dev/null +++ b/maps/NihonSafariZoneSummerDesert.ablk @@ -0,0 +1 @@ +D0;<<<<<<<<<E4C @56666:<<<<@=> @  58:<<CA?B   ;<<@C@   ;<<@ C@  ;<<  566      \ No newline at end of file diff --git a/maps/NihonSafariZoneWinterCave.ablk b/maps/NihonSafariZoneWinterCave.ablk new file mode 100644 index 0000000..c8ecabe --- /dev/null +++ b/maps/NihonSafariZoneWinterCave.ablk @@ -0,0 +1,12 @@ + > >  +#>: + +!" + +AC +E@C + +,!DG +,EG +) +)"** \ No newline at end of file diff --git a/maps/NihonSafariZoneWinterCenterConnection.ablk b/maps/NihonSafariZoneWinterCenterConnection.ablk new file mode 100644 index 0000000..d7d3208 --- /dev/null +++ b/maps/NihonSafariZoneWinterCenterConnection.ablk @@ -0,0 +1 @@ +"7$5!#7"5!5!%%%"!5!%%%%% !%%%%>//>//%+:,///>>%8;9////>%89//&*()'//+,"&$##/89"!#%//>!%>/////>%%%%>>>%%%%%%//%%)*'%//%%%#%%**'%%%#%%>/#&**$'%//#/"&*%#%/$#>"'#564!>"%%###>//!##//%%%!#/>%%!//>>%%%//<=/%/%%%%%01%%%%%%%%23%%%% \ No newline at end of file diff --git a/maps/NihonSafariZoneWinterValley.ablk b/maps/NihonSafariZoneWinterValley.ablk new file mode 100644 index 0000000..bf401d4 --- /dev/null +++ b/maps/NihonSafariZoneWinterValley.ablk @@ -0,0 +1 @@ +$$$$57$$$$$$$#5 7"$$$$$$$##?/@A"75!#?-7"#5!///>??""##???///?///?""##??/?>>>>""##>?+:,??>/?""##>?8;9/?????""##//89///??//""##//>>/?""##/?/>//?""##///?/?+::,""##?>>///?8;;9""##??>>>???/89""##????????/??""##5667""###+:::::::,""" \ No newline at end of file diff --git a/maps/QuietCave_Old.ablk b/maps/QuietCave_Old.ablk new file mode 100644 index 0000000..72ee82b --- /dev/null +++ b/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?2 7 Z4268?2817 268?282a6"268228a26"1 7  7 Z?2866$$->8;4226$$$h;8222264822822226226 \ No newline at end of file diff --git a/maps/Route53.ablk b/maps/Route53.ablk new file mode 100644 index 0000000..524b598 --- /dev/null +++ b/maps/Route53.ablk @@ -0,0 +1,2 @@ + )************+ -.....@A...../0"""""""""""""""" $(6,