diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 253913d..e18e986 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -391,6 +391,10 @@ ENDM map_const ROUTE_8_SAFFRON_GATE, 5, 4 ; 13 map_const ROUTE_12_SUPER_ROD_HOUSE, 4, 4 ; 14 map_const LAVENDER_CRYPT, 9, 10 ; 15 + map_const LAVENDER_CRYPT_SET_1, 12, 10 ; 16 + map_const LAVENDER_CRYPT_SET_2, 12, 10 ; 17 + map_const LAVENDER_CRYPT_SET_3, 12, 10 ; 18 + map_const LAVENDER_CRYPT_DOKUROARS_ROOM, 7, 8 ; 19 endgroup newgroup SILVER ; 19 diff --git a/data/maps/attributes.asm b/data/maps/attributes.asm index 931fcbf..ffc6818 100644 --- a/data/maps/attributes.asm +++ b/data/maps/attributes.asm @@ -732,6 +732,10 @@ ENDM map_attributes JohtoSafariZoneGate, JOHTO_SAFARI_ZONE_GATE, $00, 0 ; Bank 1 map_attributes JohtoSafariZone, JOHTO_SAFARI_ZONE, $00, 0 ; Bank 1 map_attributes LavenderCrypt, LAVENDER_CRYPT, $00, 0 ; Bank 1 + map_attributes LavenderCryptSet1, LAVENDER_CRYPT_SET_1, $00, 0 ; Bank 1 + map_attributes LavenderCryptSet2, LAVENDER_CRYPT_SET_2, $00, 0 ; Bank 1 + map_attributes LavenderCryptSet3, LAVENDER_CRYPT_SET_3, $00, 0 ; Bank 1 + map_attributes LavenderCryptDokuroarsRoom, LAVENDER_CRYPT_DOKUROARS_ROOM, $00, 0 ; Bank 1 map_attributes UnderwaterTunnel, UNDERWATER_TUNNEL, $00, 0 ; Bank 1 map_attributes BillsGarden, BILLS_GARDEN, $00, 0 ; Bank 1 map_attributes CeladonUniversityOutside, CELADON_UNIVERSITY_OUTSIDE, $00, 0 ; Bank 1 diff --git a/data/maps/blocks.asm b/data/maps/blocks.asm index 6b32af0..f6505f9 100644 --- a/data/maps/blocks.asm +++ b/data/maps/blocks.asm @@ -279,6 +279,18 @@ JohtoSafariZone_Blocks: LavenderCrypt_Blocks: INCBIN "maps/LavenderCrypt.ablk" +LavenderCryptSet1_Blocks: + INCBIN "maps/LavenderCryptSet1.ablk" + +LavenderCryptSet2_Blocks: + INCBIN "maps/LavenderCryptSet2.ablk" + +LavenderCryptSet3_Blocks: + INCBIN "maps/LavenderCryptSet3.ablk" + +LavenderCryptDokuroarsRoom_Blocks: + INCBIN "maps/LavenderCryptDokuroarsRoom.ablk" + UnderwaterTunnel_Blocks: INCBIN "maps/UnderwaterTunnel.ablk" diff --git a/data/maps/maps.asm b/data/maps/maps.asm index 092ab19..ceea80a 100644 --- a/data/maps/maps.asm +++ b/data/maps/maps.asm @@ -431,6 +431,10 @@ MapGroup_Lavender: map Route8SaffronGate, TILESET_GATE, GATE, LANDMARK_ROUTE_8, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE map Route12SuperRodHouse, TILESET_HOUSE, INDOOR, LANDMARK_ROUTE_12, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map LavenderCrypt, TILESET_LAVENDER_CRYPT, CAVE, LANDMARK_LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, TRUE, PALETTE_NITE, FISHGROUP_NONE + map LavenderCryptSet1, TILESET_LAVENDER_CRYPT, CAVE, LANDMARK_LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, TRUE, PALETTE_NITE, FISHGROUP_NONE + map LavenderCryptSet2, TILESET_LAVENDER_CRYPT, CAVE, LANDMARK_LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, TRUE, PALETTE_NITE, FISHGROUP_NONE + map LavenderCryptSet3, TILESET_LAVENDER_CRYPT, CAVE, LANDMARK_LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, TRUE, PALETTE_NITE, FISHGROUP_NONE + map LavenderCryptDokuroarsRoom, TILESET_LAVENDER_CRYPT, CAVE, LANDMARK_LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, TRUE, PALETTE_NITE, FISHGROUP_NONE assert_table_length NUM_LAVENDER_MAPS MapGroup_Silver: diff --git a/data/maps/scripts.asm b/data/maps/scripts.asm index bc6fbde..7e5230b 100644 --- a/data/maps/scripts.asm +++ b/data/maps/scripts.asm @@ -596,6 +596,10 @@ INCLUDE "maps/PokemonPagoda2F.asm" INCLUDE "maps/PokemonPagoda3F.asm" INCLUDE "maps/PokemonPagoda4F.asm" INCLUDE "maps/PokemonPagoda5F.asm" +INCLUDE "maps/LavenderCryptSet1.asm" +INCLUDE "maps/LavenderCryptSet2.asm" +INCLUDE "maps/LavenderCryptSet3.asm" +INCLUDE "maps/LavenderCryptDokuroarsRoom.asm" SECTION "Map Scripts 31", ROMX ; spillover INCLUDE "maps/TanobyRuins.asm" diff --git a/data/tilesets/lavendercrypt_attributes.bin b/data/tilesets/lavendercrypt_attributes.bin index 779572e..1ad86c7 100644 Binary files a/data/tilesets/lavendercrypt_attributes.bin and b/data/tilesets/lavendercrypt_attributes.bin differ diff --git a/data/tilesets/lavendercrypt_collision.asm b/data/tilesets/lavendercrypt_collision.asm index 7cc9135..3b3ee54 100644 --- a/data/tilesets/lavendercrypt_collision.asm +++ b/data/tilesets/lavendercrypt_collision.asm @@ -16,96 +16,96 @@ tilecoll FLOOR, WALL, FLOOR, WALL ; 0f tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 10 tilecoll WALL, WALL, DOOR, DOOR ; 11 - tilecoll FLOOR, WALL, LADDER, WALL ; 12 + tilecoll WALL, WALL, WALL, WALL ; 12 tilecoll WALL, WALL, FLOOR, FLOOR ; 13 tilecoll WALL, WALL, WALL, FLOOR ; 14 tilecoll WALL, WALL, FLOOR, WALL ; 15 - tilecoll FLOOR, WALL, LADDER, WALL ; 16 + tilecoll FLOOR, PIT, FLOOR, PIT ; 16 tilecoll WALL, WALL, WALL, WALL ; 17 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 18 tilecoll WALL, WALL, WALL, FLOOR ; 19 - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 1a - tilecoll WALL, FLOOR, LADDER, FLOOR ; 1b + tilecoll FLOOR, PIT, FLOOR, FLOOR ; 1a + tilecoll PIT, FLOOR, FLOOR, FLOOR ; 1b tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1c tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1d tilecoll FLOOR, FLOOR, WALL, WALL ; 1e - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 1f - tilecoll FLOOR, WALL, FLOOR, WALL ; 20 + tilecoll FLOOR, FLOOR, WALL, WALL ; 1f + tilecoll FLOOR, FLOOR, PIT, FLOOR ; 20 tilecoll FLOOR, FLOOR, LADDER, FLOOR ; 21 - tilecoll WALL, WALL, FLOOR, FLOOR ; 22 - tilecoll WALL, WALL, FLOOR, WALL ; 23 + tilecoll FLOOR, FLOOR, PIT, FLOOR ; 22 + tilecoll FLOOR, WALL, WALL, WALL ; 23 tilecoll WALL, WALL, FLOOR, FLOOR ; 24 - tilecoll FLOOR, WALL, FLOOR, WALL ; 25 - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 26 - tilecoll WALL, FLOOR, WALL, WARP_CARPET_DOWN ; 27 - tilecoll FLOOR, WALL, WARP_CARPET_DOWN, WALL ; 28 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 29 - tilecoll WALL, WALL, WALL, WALL ; 2a - tilecoll FLOOR, WALL, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 2b - tilecoll WALL, WALL, WALL, WALL ; 2c - tilecoll FLOOR, FLOOR, WALL, WALL ; 2d - tilecoll WALL, WALL, WALL, WALL ; 2e - tilecoll WALL, WALL, WALL, WALL ; 2f + tilecoll WALL, WALL, FLOOR, WALL ; 25 + tilecoll WALL, WALL, WALL, FLOOR ; 26 + tilecoll WALL, FLOOR, WALL, FLOOR ; 27 + tilecoll WALL, FLOOR, WALL, WALL ; 28 + tilecoll WALL, WALL, WALL, WALL ; 29 + tilecoll FLOOR, PIT, FLOOR, FLOOR ; 2a + tilecoll PIT, FLOOR, PIT, FLOOR ; 2b + tilecoll FLOOR, WARP_CARPET_DOWN, WALL, WALL ; 2c + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 2d + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 2e + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 2f tilecoll WALL, WALL, WALL, WALL ; 30 - tilecoll WALL, LADDER, WALL, WALL ; 31 - tilecoll LADDER, FLOOR, LADDER, FLOOR ; 32 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 31 + tilecoll FLOOR, FLOOR, WALL, WALL ; 32 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 33 - tilecoll WALL, WALL, FLOOR, FLOOR ; 34 - tilecoll WALL, WALL, WALL, WALL ; 35 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 36 - tilecoll FLOOR, FLOOR, WALL, WALL ; 37 - tilecoll FLOOR, FLOOR, WALL, WALL ; 38 - tilecoll WALL, FLOOR, WALL, FLOOR ; 39 - tilecoll WALL, WALL, WALL, FLOOR ; 3a - tilecoll WALL, WALL, FLOOR, FLOOR ; 3b - tilecoll WALL, WALL, WALL, WALL ; 3c - tilecoll WALL, WALL, WALL, WALL ; 3d - tilecoll WALL, WALL, WALL, WALL ; 3e + tilecoll WALL, WALL, WALL, WALL ; 34 + tilecoll WALL, WALL, PIT, FLOOR ; 35 + tilecoll WALL, WALL, FLOOR, WALL ; 36 + tilecoll PIT, WALL, FLOOR, FLOOR ; 37 + tilecoll FLOOR, PIT, WALL, WALL ; 38 + tilecoll WALL, WALL, WALL, WALL ; 39 + tilecoll WALL, WALL, WALL, WALL ; 3a + tilecoll WALL, WALL, FLOOR, WALL ; 3b + tilecoll FLOOR, FLOOR, WALL, WALL ; 3c + tilecoll WALL, WALL, FLOOR, FLOOR ; 3d + tilecoll FLOOR, FLOOR, WALL, WALL ; 3e tilecoll WALL, WALL, FLOOR, FLOOR ; 3f - tilecoll WALL, WALL, WALL, FLOOR ; 40 - tilecoll WALL, WALL, FLOOR, FLOOR ; 41 - tilecoll WALL, WALL, FLOOR, WALL ; 42 - tilecoll WALL, WALL, WALL, WALL ; 43 - tilecoll WALL, FLOOR, WALL, FLOOR ; 44 - tilecoll WALL, FLOOR, WALL, FLOOR ; 45 - tilecoll FLOOR, WALL, FLOOR, WALL ; 46 - tilecoll WALL, WALL, FLOOR, FLOOR ; 47 - tilecoll WALL, FLOOR, WALL, WALL ; 48 - tilecoll FLOOR, FLOOR, WALL, WALL ; 49 - tilecoll FLOOR, WALL, WALL, WALL ; 4a - tilecoll FLOOR, WALL, FLOOR, WALL ; 4b - tilecoll WALL, WALL, FLOOR, FLOOR ; 4c - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 4d - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 4e - tilecoll FLOOR, FLOOR, WALL, WALL ; 4f - tilecoll FLOOR, WALL, FLOOR, WALL ; 50 - tilecoll WALL, FLOOR, WALL, FLOOR ; 51 - tilecoll WALL, WALL, WALL, WALL ; 52 - tilecoll WALL, WALL, WALL, WALL ; 53 - tilecoll WALL, WALL, WALL, WALL ; 54 - tilecoll WALL, FLOOR, WALL, WALL ; 55 - tilecoll WALL, WALL, WALL, WALL ; 56 - tilecoll WALL, FLOOR, WALL, WALL ; 57 - tilecoll FLOOR, WALL, WALL, WALL ; 58 - tilecoll WALL, WALL, WALL, WALL ; 59 - tilecoll WALL, WALL, WALL, WALL ; 5a - tilecoll WALL, WALL, WALL, WALL ; 5b - tilecoll WALL, WALL, FLOOR, WALL ; 5c - tilecoll WALL, WALL, WALL, FLOOR ; 5d - tilecoll WALL, WALL, WALL, FLOOR ; 5e + tilecoll WALL, WALL, FLOOR, FLOOR ; 40 + tilecoll WALL, WALL, FLOOR, WALL ; 41 + tilecoll WALL, WALL, PIT, FLOOR ; 42 + tilecoll FLOOR, WALL, WALL, PIT ; 43 + tilecoll WALL, FLOOR, WALL, WALL ; 44 + tilecoll FLOOR, WALL, WALL, WALL ; 45 + tilecoll WALL, WALL, FLOOR, WALL ; 46 + tilecoll WALL, WALL, WALL, FLOOR ; 47 + tilecoll FLOOR, WALL, FLOOR, WALL ; 48 + tilecoll WALL, FLOOR, WALL, FLOOR ; 49 + tilecoll WALL, FLOOR, WALL, WALL ; 4a + tilecoll WALL, WALL, WALL, WALL ; 4b + tilecoll FLOOR, WALL, WALL, WALL ; 4c + tilecoll FLOOR, PIT, FLOOR, FLOOR ; 4d + tilecoll FLOOR, PIT, WALL, WALL ; 4e + tilecoll FLOOR, FLOOR, FLOOR, PIT ; 4f + tilecoll WALL, FLOOR, WALL, WALL ; 50 + tilecoll WALL, WALL, WALL, WALL ; 51 + tilecoll WALL, WALL, FLOOR, PIT ; 52 + tilecoll FLOOR, FLOOR, WALL, WALL ; 53 + tilecoll WALL, FLOOR, WALL, FLOOR ; 54 + tilecoll WALL, WALL, WALL, WALL ; 55 + tilecoll FLOOR, WALL, FLOOR, WALL ; 56 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 57 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 58 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 59 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 5a + tilecoll PIT, WALL, WALL, WALL ; 5b + tilecoll WALL, FLOOR, FLOOR, WALL ; 5c + tilecoll FLOOR, PIT, WALL, PIT ; 5d + tilecoll PIT, FLOOR, WALL, WALL ; 5e tilecoll WALL, WALL, FLOOR, WALL ; 5f - tilecoll WALL, WALL, WALL, WALL ; 60 - tilecoll WALL, WALL, WALL, WALL ; 61 - tilecoll FLOOR, WALL, WALL, WALL ; 62 - tilecoll WALL, WALL, FLOOR, WALL ; 63 - tilecoll WALL, WALL, WALL, FLOOR ; 64 - tilecoll FLOOR, WALL, WALL, FLOOR ; 65 - tilecoll WALL, FLOOR, FLOOR, WALL ; 66 - tilecoll WALL, FLOOR, WALL, WALL ; 67 - tilecoll FLOOR, WALL, WALL, WALL ; 68 - tilecoll WALL, WALL, WALL, FLOOR ; 69 - tilecoll WALL, WALL, FLOOR, WALL ; 6a - tilecoll WALL, WALL, FLOOR, WALL ; 6b + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 60 + tilecoll FLOOR, PIT, WALL, WALL ; 61 + tilecoll PIT, FLOOR, WALL, WALL ; 62 + tilecoll WALL, FLOOR, WALL, WALL ; 63 + tilecoll WALL, WALL, WALL, WALL ; 64 + tilecoll WALL, WALL, FLOOR, WALL ; 65 + tilecoll WALL, WALL, WALL, WALL ; 66 + tilecoll WALL, WALL, FLOOR, WALL ; 67 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 68 + tilecoll WALL, WALL, WALL, WALL ; 69 + tilecoll WALL, WALL, WALL, WALL ; 6a + tilecoll WALL, WALL, WALL, WALL ; 6b tilecoll WALL, WALL, WALL, WALL ; 6c tilecoll WALL, WALL, WALL, WALL ; 6d tilecoll WALL, WALL, WALL, WALL ; 6e diff --git a/data/tilesets/lavendercrypt_metatiles.bin b/data/tilesets/lavendercrypt_metatiles.bin index a225086..1619c25 100644 Binary files a/data/tilesets/lavendercrypt_metatiles.bin and b/data/tilesets/lavendercrypt_metatiles.bin differ diff --git a/gfx/tilesets/lavendercrypt.png b/gfx/tilesets/lavendercrypt.png index 2df3a42..0f051ef 100644 Binary files a/gfx/tilesets/lavendercrypt.png and b/gfx/tilesets/lavendercrypt.png differ diff --git a/maps/DebugRoom.asm b/maps/DebugRoom.asm index da345fb..48a57db 100644 --- a/maps/DebugRoom.asm +++ b/maps/DebugRoom.asm @@ -238,7 +238,7 @@ DebugRoom_MapEvents: warp_event 4, 9, PALLET_TOWN, 1 ; left lab/league warp warp_event 5, 9, PALLET_TOWN, 1 ; right lab/league warp warp_event 35, 17, OLD_CITY, 1 ; east warp - warp_event 5, 35, BLUE_FOREST, 1 ; southwest warp + warp_event 5, 35, LAVENDER_TOWN, 1 ; southwest warp warp_event 19, 34, BLUE_FOREST, 1 ; southern warp warp_event 33, 33, BLUE_FOREST, 1 ; southeast warp warp_event 5, 3, AZALEA_TOWN, 1 diff --git a/maps/LavenderCrypt.ablk b/maps/LavenderCrypt.ablk index 19fee82..078edbe 100644 Binary files a/maps/LavenderCrypt.ablk and b/maps/LavenderCrypt.ablk differ diff --git a/maps/LavenderCrypt.asm b/maps/LavenderCrypt.asm index c097cc8..c0335e0 100644 --- a/maps/LavenderCrypt.asm +++ b/maps/LavenderCrypt.asm @@ -10,6 +10,10 @@ LavenderCrypt_MapEvents: def_warp_events warp_event 2, 17, SOUL_HOUSE, 3 + warp_event 15, 3, LAVENDER_CRYPT_SET_1, 1 + warp_event 9, 1, LAVENDER_CRYPT_SET_2, 1 + warp_event 3, 3, LAVENDER_CRYPT_SET_3, 1 + warp_event 3, 3, LAVENDER_CRYPT_DOKUROARS_ROOM, 1 ; Exit point for the room; goes through the pit. def_coord_events diff --git a/maps/LavenderCryptDokuroarsRoom.ablk b/maps/LavenderCryptDokuroarsRoom.ablk new file mode 100644 index 0000000..d21b6e3 --- /dev/null +++ b/maps/LavenderCryptDokuroarsRoom.ablk @@ -0,0 +1 @@ +kklkkk-22.m3_mm0H`I0mmmmmmmmmmmmmmmmmmm \ No newline at end of file diff --git a/maps/LavenderCryptDokuroarsRoom.asm b/maps/LavenderCryptDokuroarsRoom.asm new file mode 100644 index 0000000..def7d29 --- /dev/null +++ b/maps/LavenderCryptDokuroarsRoom.asm @@ -0,0 +1,20 @@ + object_const_def + +LavenderCryptDokuroarsRoom_MapScripts: + def_scene_scripts + + def_callbacks + +LavenderCryptDokuroarsRoom_MapEvents: + db 0, 0 ; filler + + def_warp_events + warp_event 7, 15, LAVENDER_CRYPT_SET_3, 2 + warp_event 6, 15, LAVENDER_CRYPT_SET_3, 2 + warp_event 7, 2, LAVENDER_CRYPT, 4 + + def_coord_events + + def_bg_events + + def_object_events \ No newline at end of file diff --git a/maps/LavenderCryptSet1.ablk b/maps/LavenderCryptSet1.ablk new file mode 100644 index 0000000..206dfd9 Binary files /dev/null and b/maps/LavenderCryptSet1.ablk differ diff --git a/maps/LavenderCryptSet1.asm b/maps/LavenderCryptSet1.asm new file mode 100644 index 0000000..8d898a0 --- /dev/null +++ b/maps/LavenderCryptSet1.asm @@ -0,0 +1,46 @@ + object_const_def + +LavenderCryptSet1_MapScripts: + def_scene_scripts + + def_callbacks + +LavenderCryptSet1_MapEvents: + db 0, 0 ; filler + + def_warp_events + warp_event 3, 6, LAVENDER_CRYPT, 2 + warp_event 3, 14, LAVENDER_CRYPT_SET_1, 1 + warp_event 19, 6, LAVENDER_CRYPT_SET_1, 1 + warp_event 17, 5, LAVENDER_CRYPT_SET_1, 1 + warp_event 17, 4, LAVENDER_CRYPT_SET_1, 1 + warp_event 20, 2, LAVENDER_CRYPT_SET_1, 1 + warp_event 7, 4, LAVENDER_CRYPT_SET_1, 1 + warp_event 4, 3, LAVENDER_CRYPT_SET_2, 24 ; top-left corridor entry + warp_event 16, 16, LAVENDER_CRYPT_SET_1, 1 + warp_event 20, 13, LAVENDER_CRYPT_SET_1, 1 + warp_event 16, 12, LAVENDER_CRYPT_SET_1, 1 + warp_event 4, 17, LAVENDER_CRYPT_SET_1, 1 + warp_event 16, 17, LAVENDER_CRYPT_SET_1, 1 + + warp_event 8, 1, LAVENDER_CRYPT_SET_1, 1 ; top-left entry warp 1 + warp_event 1, 5, LAVENDER_CRYPT_SET_1, 1 ; top-left entry warp 2 + warp_event 1, 5, LAVENDER_CRYPT_SET_1, 1 ; top-left entry warp 3 + + warp_event 16, 1, LAVENDER_CRYPT_SET_1, 1 ; top-right entry 1 + warp_event 22, 4, LAVENDER_CRYPT_SET_1, 1 ; top-right entry 2 + warp_event 17, 6, LAVENDER_CRYPT_SET_1, 1 ; top-right entry 3 + + warp_event 1, 12, LAVENDER_CRYPT_SET_1, 1 ; bottom-left entry 1 + warp_event 6, 13, LAVENDER_CRYPT_SET_1, 1 ; bottom-left entry 2 + warp_event 2, 17, LAVENDER_CRYPT_SET_1, 1 ; bottom-left entry 3 + warp_event 8, 16, LAVENDER_CRYPT_SET_1, 1 ; bottom-left entry 4 + + warp_event 17, 14, LAVENDER_CRYPT_SET_1, 1 ; bottom-right entry 1 + warp_event 22, 16, LAVENDER_CRYPT_SET_1, 1 ; bottom-right entry 3 + + def_coord_events + + def_bg_events + + def_object_events diff --git a/maps/LavenderCryptSet2.ablk b/maps/LavenderCryptSet2.ablk new file mode 100644 index 0000000..a057f69 Binary files /dev/null and b/maps/LavenderCryptSet2.ablk differ diff --git a/maps/LavenderCryptSet2.asm b/maps/LavenderCryptSet2.asm new file mode 100644 index 0000000..2d0a113 --- /dev/null +++ b/maps/LavenderCryptSet2.asm @@ -0,0 +1,46 @@ + object_const_def + +LavenderCryptSet2_MapScripts: + def_scene_scripts + + def_callbacks + +LavenderCryptSet2_MapEvents: + db 0, 0 ; filler + + def_warp_events + warp_event 3, 2, LAVENDER_CRYPT, 3 + warp_event 8, 16, LAVENDER_CRYPT_SET_1, 1 + warp_event 16, 4, LAVENDER_CRYPT_SET_1, 1 + warp_event 18, 3, LAVENDER_CRYPT_SET_1, 1 + warp_event 17, 2, LAVENDER_CRYPT_SET_1, 1 + warp_event 21, 1, LAVENDER_CRYPT_SET_1, 1 + warp_event 8, 10, LAVENDER_CRYPT_SET_1, 1 + warp_event 2, 9, LAVENDER_CRYPT_SET_1, 1 + warp_event 22, 18, LAVENDER_CRYPT_SET_1, 1 + warp_event 20, 16, LAVENDER_CRYPT_SET_1, 1 + warp_event 4, 17, LAVENDER_CRYPT_SET_1, 1 + warp_event 17, 17, LAVENDER_CRYPT_SET_1, 1 ; linked at bottom + warp_event 17, 18, LAVENDER_CRYPT_SET_1, 1 ; linked at bottom + warp_event 17, 9, LAVENDER_CRYPT_SET_1, 1 ; linked in top-right + warp_event 17, 10, LAVENDER_CRYPT_SET_1, 1 ; linked in top-right + warp_event 19, 5, LAVENDER_CRYPT_SET_1, 1 + + warp_event 1, 16, LAVENDER_CRYPT_SET_1, 1 ; bottom entry 1 + warp_event 10, 16, LAVENDER_CRYPT_SET_1, 1 ; bottom entry 2 + warp_event 18, 16, LAVENDER_CRYPT_SET_1, 1 ; bottom entry 3 + warp_event 22, 16, LAVENDER_CRYPT_SET_1, 1 ; bottom entry 4 + + warp_event 16, 2, LAVENDER_CRYPT_SET_1, 1 ; top-right entry warp 1 + warp_event 22, 5, LAVENDER_CRYPT_SET_1, 1 ; top-right entry warp 2 + warp_event 22, 10, LAVENDER_CRYPT_SET_1, 1 ; top-right entry warp 3 + + warp_event 1, 2, LAVENDER_CRYPT_SET_1, 1 ; top-left entry 1 + warp_event 8, 6, LAVENDER_CRYPT_SET_1, 1 ; top-left entry warp 2 + warp_event 3, 9, LAVENDER_CRYPT_SET_1, 1 ; top-left entry warp 3 + + def_coord_events + + def_bg_events + + def_object_events diff --git a/maps/LavenderCryptSet3.ablk b/maps/LavenderCryptSet3.ablk new file mode 100644 index 0000000..518fb02 Binary files /dev/null and b/maps/LavenderCryptSet3.ablk differ diff --git a/maps/LavenderCryptSet3.asm b/maps/LavenderCryptSet3.asm new file mode 100644 index 0000000..56c3088 --- /dev/null +++ b/maps/LavenderCryptSet3.asm @@ -0,0 +1,37 @@ + object_const_def + +LavenderCryptSet3_MapScripts: + def_scene_scripts + + def_callbacks + +LavenderCryptSet3_MapEvents: + db 0, 0 ; filler + + def_warp_events + warp_event 2, 4, LAVENDER_CRYPT, 4 + warp_event 7, 13, LAVENDER_CRYPT_SET_1, 1 ; To Dokuroar + + warp_event 21, 14, LAVENDER_CRYPT_SET_1, 1 + warp_event 22, 6, LAVENDER_CRYPT_SET_1, 1 + warp_event 18, 2, LAVENDER_CRYPT_SET_1, 1 + warp_event 8, 4, LAVENDER_CRYPT_SET_1, 1 + warp_event 22, 16, LAVENDER_CRYPT_SET_1, 1 + warp_event 19, 10, LAVENDER_CRYPT_SET_1, 1 + warp_event 19, 14, LAVENDER_CRYPT_SET_1, 1 + warp_event 19, 15, LAVENDER_CRYPT_SET_1, 1 + + warp_event 1, 8, LAVENDER_CRYPT_SET_1, 1 ; top-right entry 1 + warp_event 7, 6, LAVENDER_CRYPT_SET_1, 1 ; top-right entry 2 + warp_event 2, 2, LAVENDER_CRYPT_SET_1, 1 ; top-right entry 3 + + warp_event 22, 3, LAVENDER_CRYPT_SET_1, 1 ; right entry 1 + warp_event 22, 18, LAVENDER_CRYPT_SET_1, 1 ; right entry 2 + + warp_event 7, 17, LAVENDER_CRYPT_SET_1, 1 ; Dokuroar bottom-left room entry point + + def_coord_events + + def_bg_events + + def_object_events