diff --git a/data/tilesets/ice_path_attributes.bin b/data/tilesets/ice_path_attributes.bin index 5346b57..f0b56a1 100644 Binary files a/data/tilesets/ice_path_attributes.bin and b/data/tilesets/ice_path_attributes.bin differ 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 3c84989..cadd79f 100644 Binary files a/data/tilesets/ice_path_metatiles.bin and b/data/tilesets/ice_path_metatiles.bin differ diff --git a/data/tilesets/lushcave_attributes.bin b/data/tilesets/lushcave_attributes.bin index 9365301..425ec84 100644 Binary files a/data/tilesets/lushcave_attributes.bin and b/data/tilesets/lushcave_attributes.bin differ diff --git a/data/tilesets/nihon_birdon_attributes.bin b/data/tilesets/nihon_birdon_attributes.bin index d8a85fd..eff6609 100644 Binary files a/data/tilesets/nihon_birdon_attributes.bin and b/data/tilesets/nihon_birdon_attributes.bin differ 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 f40b850..7b12316 100644 Binary files a/data/tilesets/nihon_birdon_metatiles.bin and b/data/tilesets/nihon_birdon_metatiles.bin differ diff --git a/data/tilesets/nihon_font_attributes.bin b/data/tilesets/nihon_font_attributes.bin index e69de29..41bb4ff 100644 Binary files a/data/tilesets/nihon_font_attributes.bin and b/data/tilesets/nihon_font_attributes.bin differ diff --git a/data/tilesets/nihon_font_collision.asm b/data/tilesets/nihon_font_collision.asm index e69de29..4e9c293 100644 --- a/data/tilesets/nihon_font_collision.asm +++ b/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 diff --git a/data/tilesets/nihon_font_metatiles.bin b/data/tilesets/nihon_font_metatiles.bin index e69de29..a4ec5a5 100644 Binary files a/data/tilesets/nihon_font_metatiles.bin and b/data/tilesets/nihon_font_metatiles.bin differ diff --git a/data/tilesets/nihon_old_attributes.bin b/data/tilesets/nihon_old_attributes.bin index b3fd7b9..42e1c6c 100644 Binary files a/data/tilesets/nihon_old_attributes.bin and b/data/tilesets/nihon_old_attributes.bin differ diff --git a/data/tilesets/nihon_old_collision.asm b/data/tilesets/nihon_old_collision.asm index 7e4d267..58aadf7 100644 --- a/data/tilesets/nihon_old_collision.asm +++ b/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 diff --git a/data/tilesets/nihon_old_metatiles.bin b/data/tilesets/nihon_old_metatiles.bin index 76968f0..e0e50cf 100644 Binary files a/data/tilesets/nihon_old_metatiles.bin and b/data/tilesets/nihon_old_metatiles.bin differ diff --git a/data/tilesets/nihon_snowy_attributes.bin b/data/tilesets/nihon_snowy_attributes.bin index 83f9f35..2c34b48 100644 Binary files a/data/tilesets/nihon_snowy_attributes.bin 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 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 f03362b..f4b31d2 100644 Binary files a/data/tilesets/nihon_snowy_metatiles.bin and b/data/tilesets/nihon_snowy_metatiles.bin differ 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 0000000..62d2a28 Binary files /dev/null and b/gfx/trainers/steven.png differ 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 0000000..4a87376 Binary files /dev/null and b/maps/NihonSafariZoneFallCenterConnection.ablk differ diff --git a/maps/NihonSafariZoneFallZone2.ablk b/maps/NihonSafariZoneFallZone2.ablk new file mode 100644 index 0000000..4fe81c2 Binary files /dev/null and b/maps/NihonSafariZoneFallZone2.ablk differ diff --git a/maps/NihonSafariZoneSpringCave.ablk b/maps/NihonSafariZoneSpringCave.ablk new file mode 100644 index 0000000..a15585b --- /dev/null +++ b/maps/NihonSafariZoneSpringCave.ablk @@ -0,0 +1,3 @@ + +())))/J >!!"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,