diff --git a/constants/map_constants.asm b/constants/map_constants.asm index f1b53b3..e3a0cc3 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -445,6 +445,7 @@ ENDM map_const BATTLE_TOWER_HALLWAY, 11, 2 ; 14 map_const ROUTE_40_BATTLE_TOWER_GATE, 5, 4 ; 15 map_const BATTLE_TOWER_OUTSIDE, 10, 14 ; 16 + map_const CLIFF_CAVE, 19, 16 ; 17 endgroup newgroup VIRIDIAN ; 23 diff --git a/data/maps/attributes.asm b/data/maps/attributes.asm index ee0acc6..a23e8e9 100644 --- a/data/maps/attributes.asm +++ b/data/maps/attributes.asm @@ -710,3 +710,4 @@ ENDM map_attributes CeruleanCaveB1F, CERULEAN_CAVE_B1F, $00, 0 map_attributes SilentHills, SILENT_HILLS, $00, 0 ; this is on its own for now. add connections to mt. silver later. map_attributes DebugRoom, DEBUG_ROOM, $05, 0 ; Debug Room :V + map_attributes CliffCave, CLIFF_CAVE, $00, 0 diff --git a/data/maps/blocks.asm b/data/maps/blocks.asm index a54c498..ec4aaac 100644 --- a/data/maps/blocks.asm +++ b/data/maps/blocks.asm @@ -1078,5 +1078,8 @@ SilentHills_Blocks: LakeOfRagePrycesHouse_Blocks: INCBIN "maps/LakeOfRagePrycesHouse.ablk" -DebugRoom_Blocks: - INCBIN "maps/DebugRoom.ablk" \ No newline at end of file +DebugRoom_Blocks: ; Pipis Room + INCBIN "maps/DebugRoom.ablk" + +CliffCave_Blocks: + INCBIN "maps/CliffCave.ablk" diff --git a/data/maps/maps.asm b/data/maps/maps.asm index 868da89..af16758 100644 --- a/data/maps/maps.asm +++ b/data/maps/maps.asm @@ -478,6 +478,7 @@ MapGroup_Cianwood: map BattleTowerHallway, TILESET_BATTLE_TOWER_INSIDE, INDOOR, LANDMARK_BATTLE_TOWER, MUSIC_BATTLE_TOWER_THEME, TRUE, PALETTE_DAY, FISHGROUP_SHORE map Route40BattleTowerGate, TILESET_GATE, GATE, LANDMARK_BATTLE_TOWER, MUSIC_ROUTE_36, FALSE, PALETTE_DAY, FISHGROUP_SHORE map BattleTowerOutside, TILESET_BATTLE_TOWER_OUTSIDE, ROUTE, LANDMARK_BATTLE_TOWER, MUSIC_BATTLE_TOWER_THEME, FALSE, PALETTE_AUTO, FISHGROUP_SHORE + map CliffCave, TILESET_CAVE, CAVE, LANDMARK_CIANWOOD_CITY, MUSIC_UNION_CAVE, TRUE, PALETTE_NITE, FISHGROUP_SHORE assert_table_length NUM_CIANWOOD_MAPS MapGroup_Viridian: diff --git a/data/maps/scripts.asm b/data/maps/scripts.asm index db03d15..e07d360 100644 --- a/data/maps/scripts.asm +++ b/data/maps/scripts.asm @@ -499,3 +499,4 @@ INCLUDE "maps/LakeOfRagePokecenter1F.asm" INCLUDE "maps/LakeOfRageMart.asm" INCLUDE "maps/LakeOfRagePrycesHouse.asm" INCLUDE "maps/DebugRoom.asm" +INCLUDE "maps/CliffCave.asm" diff --git a/data/tilesets/nihon01_attributes.bin b/data/tilesets/nihon01_attributes.bin index a849c6d..df997f9 100644 Binary files a/data/tilesets/nihon01_attributes.bin and b/data/tilesets/nihon01_attributes.bin differ diff --git a/data/tilesets/nihon01_collision.asm b/data/tilesets/nihon01_collision.asm index aaa7085..b6e1199 100644 --- a/data/tilesets/nihon01_collision.asm +++ b/data/tilesets/nihon01_collision.asm @@ -5,14 +5,14 @@ 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 ; 07 + tilecoll FLOOR, FLOOR, DOOR, WALL ; 08 + tilecoll FLOOR, FLOOR, 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, FLOOR, WALL, WALL ; 0b + tilecoll FLOOR, WALL, WALL, WALL ; 0c + tilecoll FLOOR, WALL, WALL, WALL ; 0d + tilecoll WALL, WALL, DOOR, WALL ; 0e tilecoll WALL, WALL, WALL, WALL ; 0f tilecoll WALL, WALL, WALL, WALL ; 10 tilecoll WALL, WALL, WALL, WALL ; 11 diff --git a/data/tilesets/nihon01_metatiles.bin b/data/tilesets/nihon01_metatiles.bin index fd6b09c..61d63fd 100644 Binary files a/data/tilesets/nihon01_metatiles.bin and b/data/tilesets/nihon01_metatiles.bin differ diff --git a/data/wild/johto_grass.asm b/data/wild/johto_grass.asm index 6bbbcf3..f014add 100644 --- a/data/wild/johto_grass.asm +++ b/data/wild/johto_grass.asm @@ -1744,4 +1744,32 @@ JohtoGrassWildMons: dbw 44, GOLBAT end_grass_wildmons + def_grass_wildmons CLIFF_CAVE + db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite + ; morn + dbw 30, ONIX + dbw 31, GOLBAT + dbw 30, MACHOKE + dbw 31, KINGLER + dbw 32, QUAGSIRE + dbw 32, QUAGSIRE + dbw 35, STEELIX + ; day + dbw 30, ONIX + dbw 31, GOLBAT + dbw 30, MACHOKE + dbw 31, KINGLER + dbw 32, QUAGSIRE + dbw 32, QUAGSIRE + dbw 35, STEELIX + ; nite + dbw 30, ONIX + dbw 31, GOLBAT + dbw 30, MACHOKE + dbw 31, KINGLER + dbw 32, MISDREAVUS + dbw 32, MISDREAVUS + dbw 35, STEELIX + end_grass_wildmons + db -1 ; end diff --git a/data/wild/treemon_maps.asm b/data/wild/treemon_maps.asm index 130e28f..6a0e905 100644 --- a/data/wild/treemon_maps.asm +++ b/data/wild/treemon_maps.asm @@ -52,4 +52,5 @@ RockMonMaps: treemon_map ICE_PATH_B3F, TREEMON_SET_ROCK_ICE treemon_map MOUNT_MOON_SQUARE, TREEMON_SET_ROCK_SQUARE treemon_map BURNED_TOWER_1F, TREEMON_SET_ROCK_TOWER + treemon_map CLIFF_CAVE, TREEMON_SET_ROCK_DARK_CAVE db -1 diff --git a/data/wild/treemons.asm b/data/wild/treemons.asm index 45081c9..cd5a4a0 100644 --- a/data/wild/treemons.asm +++ b/data/wild/treemons.asm @@ -130,29 +130,33 @@ TreeMonSet_Forest: dbbw 5, 10, KAKUNA db -1 +; Rock Smash begins here. TreeMonSet_Rock_Beach: - dbbw 90, 15, KRABBY - dbbw 10, 15, SHUCKLE + dbbw 70, 23, KRABBY + dbbw 20, 23, CORSOLA + dbbw 10, 25, SHUCKLE db -1 TreeMonSet_Rock_Dark_Cave: - dbbw 90, 15, GEODUDE - dbbw 10, 15, DUNSPARCE + dbbw 70, 8, GEODUDE + dbbw 20, 9, PHANPY + dbbw 10, 9, DUNSPARCE db -1 TreeMonSet_Rock_Tower: - dbbw 90, 15, GEODUDE - dbbw 10, 15, SLUGMA + dbbw 90, 14, GEODUDE + dbbw 10, 16, SLUGMA db -1 TreeMonSet_Rock_Ice: - dbbw 90, 15, GEODUDE - dbbw 10, 15, SWINUB + dbbw 90, 25, GEODUDE + dbbw 10, 25, SWINUB db -1 TreeMonSet_Rock_Square: - dbbw 90, 15, GEODUDE - dbbw 10, 15, SHUCKLE + dbbw 85, 35, GRAVELER + dbbw 10, 35, SHUCKLE + dbbw 5, 40, GOLEM db -1 TreeMonSet_Rock_Well: diff --git a/maps/CliffCave.ablk b/maps/CliffCave.ablk new file mode 100644 index 0000000..4f1c2bd Binary files /dev/null and b/maps/CliffCave.ablk differ diff --git a/maps/CliffCave.asm b/maps/CliffCave.asm new file mode 100644 index 0000000..13edc43 --- /dev/null +++ b/maps/CliffCave.asm @@ -0,0 +1,54 @@ + object_const_def + const CLIFFCAVE_MAN + const CLIFFCAVE_ROCK1 + const CLIFFCAVE_ROCK2 + const CLIFFCAVE_ROCK3 + const CLIFFCAVE_ROCK4 + const CLIFFCAVE_ROCK5 + const CLIFFCAVE_ROCK6 + +CliffCave_MapScripts: + def_scene_scripts + + def_callbacks + +CliffCaveMan: + faceplayer + opentext + writetext CliffCaveManText + waitbutton + closetext + end + +CliffCaveManText: + text "Comment to be" + line "written." + done + +CliffCaveRock: + jumpstd SmashRockScript + +CliffCave_MapEvents: + db 0, 0 ; filler + + def_warp_events + warp_event 5, 15, DEBUG_ROOM, 1 ; 1F Out + warp_event 7, 5, CLIFF_CAVE, 3 ; To 2F from 1F + warp_event 27, 7, CLIFF_CAVE, 2 ; To 1F from 2F + warp_event 23, 23, CLIFF_CAVE, 5 ; To 3F from 2F + warp_event 23, 7, CLIFF_CAVE, 4 ; To 2F from 3F + ;warp_event 5, 15, DEBUG_ROOM, 1 ; 2F Out + ;warp_event 5, 15, DEBUG_ROOM, 1 ; 3F Out + + def_coord_events + + def_bg_events + + def_object_events + object_event 25, 4, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CliffCaveMan, -1 + object_event 7, 15, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CliffCaveRock, -1 + object_event 7, 13, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CliffCaveRock, -1 + object_event 2, 13, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CliffCaveRock, -1 + object_event 9, 3, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CliffCaveRock, -1 + object_event 4, 3, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CliffCaveRock, -1 + object_event 4, 2, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CliffCaveRock, -1 diff --git a/maps/DebugRoom.ablk b/maps/DebugRoom.ablk index 6df1b12..9ca59e5 100644 --- a/maps/DebugRoom.ablk +++ b/maps/DebugRoom.ablk @@ -1,6 +1,6 @@  ! ! !WWE R  ! -ERETvUXYG~IJ +ERETvUXYG~IJ HEF|}BEJ~EJ@AAB DBIIIIJHIBTvUDJX5YHIJ|}~EEE \ No newline at end of file diff --git a/maps/DebugRoom.asm b/maps/DebugRoom.asm index c7f5d36..572c392 100644 --- a/maps/DebugRoom.asm +++ b/maps/DebugRoom.asm @@ -101,7 +101,8 @@ DebugRoom_MapEvents: warp_event 5, 35, VIRIDIAN_FOREST, 1 ; southwest warp warp_event 19, 34, VIRIDIAN_FOREST, 1 ; southern warp warp_event 33, 33, VIRIDIAN_FOREST, 1 ; southeast warp - warp_event 5, 3, AZALEA_TOWN, 1 + warp_event 5, 3, AZALEA_TOWN, 1 + warp_event 34, 11, CLIFF_CAVE, 1 def_coord_events diff --git a/maps/LakeOfRagePrycesHouse.asm b/maps/LakeOfRagePrycesHouse.asm index 2f18282..abd4126 100644 --- a/maps/LakeOfRagePrycesHouse.asm +++ b/maps/LakeOfRagePrycesHouse.asm @@ -12,7 +12,12 @@ LakeOfRagePrycesHouse_MapScripts: ; jumpstd MagazineBookshelfScript PrycesHousePryce: - jumptext PrycesHousePryceText + faceplayer + opentext + writetext PrycesHousePryceText + waitbutton + closetext + end PrycesHousePryceText: text "Thank you for" @@ -38,6 +43,7 @@ PrycesHousePryceText: done LakeOfRagePrycesHouseDelibirdScript: + faceplayer opentext writetext LakeOfRagePrycesHouseDelibirdText cry DELIBIRD @@ -50,6 +56,7 @@ LakeOfRagePrycesHouseDelibirdText: done LakeOfRagePrycesHouseSwinubScript: + faceplayer opentext writetext LakeOfRagePrycesHouseSwinubText cry SWINUB