diff --git a/data/tilesets/lavendercrypt_collision.asm b/data/tilesets/lavendercrypt_collision.asm index 3b3ee54..73f39be 100644 --- a/data/tilesets/lavendercrypt_collision.asm +++ b/data/tilesets/lavendercrypt_collision.asm @@ -65,7 +65,7 @@ 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 PIT, WALL, WALL, WALL ; 43 tilecoll WALL, FLOOR, WALL, WALL ; 44 tilecoll FLOOR, WALL, WALL, WALL ; 45 tilecoll WALL, WALL, FLOOR, WALL ; 46 @@ -78,7 +78,7 @@ 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, FLOOR ; 50 tilecoll WALL, WALL, WALL, WALL ; 51 tilecoll WALL, WALL, FLOOR, PIT ; 52 tilecoll FLOOR, FLOOR, WALL, WALL ; 53 diff --git a/maps/LavenderCrypt.asm b/maps/LavenderCrypt.asm index c0335e0..338ab57 100644 --- a/maps/LavenderCrypt.asm +++ b/maps/LavenderCrypt.asm @@ -9,11 +9,12 @@ LavenderCrypt_MapEvents: db 0, 0 ; filler 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. + warp_event 2, 17, SOUL_HOUSE, 3 ; Entrance + warp_event 15, 3, LAVENDER_CRYPT_SET_1, 1 ; Right Room + warp_event 9, 1, LAVENDER_CRYPT_SET_2, 1 ; Middle Room + warp_event 3, 3, LAVENDER_CRYPT_SET_3, 1 ; Left Room + warp_event 9, 6, LAVENDER_CRYPT_DOKUROARS_ROOM, 3 ; Exit point for the room; goes through the pit. + warp_event 8, 3, LAVENDER_CRYPT_SET_2, 14; OWNED def_coord_events diff --git a/maps/LavenderCryptDokuroarsRoom.asm b/maps/LavenderCryptDokuroarsRoom.asm index def7d29..dd52427 100644 --- a/maps/LavenderCryptDokuroarsRoom.asm +++ b/maps/LavenderCryptDokuroarsRoom.asm @@ -9,9 +9,9 @@ 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 + warp_event 7, 15, LAVENDER_CRYPT_SET_3, 2 ; Entrance + warp_event 6, 15, LAVENDER_CRYPT_SET_3, 2 ; Entrance + warp_event 7, 2, LAVENDER_CRYPT, 5 ; Exit def_coord_events diff --git a/maps/LavenderCryptSet1.asm b/maps/LavenderCryptSet1.asm index 8d898a0..0d9b9aa 100644 --- a/maps/LavenderCryptSet1.asm +++ b/maps/LavenderCryptSet1.asm @@ -9,35 +9,37 @@ 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 + warp_event 3, 6, LAVENDER_CRYPT, 2 ; Entrance + ; Within-Map Warps + warp_event 4, 3, LAVENDER_CRYPT_SET_1, 3 + warp_event 6, 13, LAVENDER_CRYPT_SET_1, 2 + warp_event 7, 4, LAVENDER_CRYPT_SET_1, 5 + warp_event 22, 4, LAVENDER_CRYPT_SET_1, 4 + warp_event 20, 2, LAVENDER_CRYPT_SET_1, 7 + warp_event 1, 5, LAVENDER_CRYPT_SET_1, 6 + warp_event 17, 4, LAVENDER_CRYPT_SET_1, 10 + warp_event 17, 5, LAVENDER_CRYPT_SET_1, 11 + warp_event 1, 12, LAVENDER_CRYPT_SET_1, 8 + warp_event 1, 13, LAVENDER_CRYPT_SET_1, 9 + warp_event 19, 6, LAVENDER_CRYPT_SET_1, 13 + warp_event 17, 14, LAVENDER_CRYPT_SET_1, 12 + warp_event 3, 14, LAVENDER_CRYPT_SET_1, 15 + warp_event 16, 1, LAVENDER_CRYPT_SET_1, 14 + warp_event 4, 17, LAVENDER_CRYPT_SET_1, 17 + warp_event 22, 16, LAVENDER_CRYPT_SET_1, 16 + warp_event 20, 13, LAVENDER_CRYPT_SET_1, 19 + warp_event 8, 16, LAVENDER_CRYPT_SET_1, 18 + ;Outside of Map Warps + warp_event 8, 1, LAVENDER_CRYPT_SET_2, 15 + warp_event 5, 15, LAVENDER_CRYPT_SET_2, 16 + warp_event 5, 16, LAVENDER_CRYPT_SET_2, 17 + warp_event 19, 15, LAVENDER_CRYPT_SET_3, 7 + warp_event 21, 5, LAVENDER_CRYPT_SET_3, 8 + warp_event 21, 6, LAVENDER_CRYPT_SET_3, 9 + warp_event 18, 18, LAVENDER_CRYPT_SET_3, 18 + warp_event 16, 12, LAVENDER_CRYPT_SET_2, 26 + warp_event 16, 16, LAVENDER_CRYPT_SET_3, 19 + warp_event 16, 17, LAVENDER_CRYPT_SET_3, 20 def_coord_events diff --git a/maps/LavenderCryptSet2.ablk b/maps/LavenderCryptSet2.ablk index a057f69..4165a4d 100644 Binary files a/maps/LavenderCryptSet2.ablk and b/maps/LavenderCryptSet2.ablk differ diff --git a/maps/LavenderCryptSet2.asm b/maps/LavenderCryptSet2.asm index 2d0a113..cb6b113 100644 --- a/maps/LavenderCryptSet2.asm +++ b/maps/LavenderCryptSet2.asm @@ -9,35 +9,35 @@ 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 3, 2, LAVENDER_CRYPT, 3 ; Entrance + ; Within-Map Warps + warp_event 2, 9, LAVENDER_CRYPT_SET_2, 3 + warp_event 22, 5, LAVENDER_CRYPT_SET_2, 2 + warp_event 18, 3, LAVENDER_CRYPT_SET_2, 5 + warp_event 8, 6, LAVENDER_CRYPT_SET_2, 4 + warp_event 19, 5, LAVENDER_CRYPT_SET_2, 7 + warp_event 10, 16, LAVENDER_CRYPT_SET_2, 6 + warp_event 4, 17, LAVENDER_CRYPT_SET_2, 9 + warp_event 3, 9, LAVENDER_CRYPT_SET_2, 8 + warp_event 17, 17, LAVENDER_CRYPT_SET_2, 12 + warp_event 17, 18, LAVENDER_CRYPT_SET_2, 13 + warp_event 22, 9, LAVENDER_CRYPT_SET_2, 10 + warp_event 22, 10, LAVENDER_CRYPT_SET_2, 11 + ; Outside of Map Warps + warp_event 20, 16, LAVENDER_CRYPT, 5 ; Takes you back to the start. Tee hee. + warp_event 21, 1, LAVENDER_CRYPT_SET_1, 20 + warp_event 17, 9, LAVENDER_CRYPT_SET_1, 21 + warp_event 17, 10, LAVENDER_CRYPT_SET_1, 22 + warp_event 8, 10, LAVENDER_CRYPT_SET_3, 10 + warp_event 17, 2, LAVENDER_CRYPT_SET_3, 11 + warp_event 16, 4, LAVENDER_CRYPT_SET_3, 12 + warp_event 8, 16, LAVENDER_CRYPT_SET_3, 13 + warp_event 22, 18, LAVENDER_CRYPT_SET_3, 14 ; THIS pit is your target. + warp_event 20, 7, LAVENDER_CRYPT_SET_3, 15 + warp_event 12, 18, LAVENDER_CRYPT_SET_3, 16 + warp_event 1, 5, LAVENDER_CRYPT_SET_3, 17 + warp_event 14, 16, LAVENDER_CRYPT_SET_1, 27 - 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 diff --git a/maps/LavenderCryptSet3.asm b/maps/LavenderCryptSet3.asm index ddc8020..c55ffbb 100644 --- a/maps/LavenderCryptSet3.asm +++ b/maps/LavenderCryptSet3.asm @@ -9,27 +9,28 @@ LavenderCryptSet3_MapEvents: db 0, 0 ; filler def_warp_events - warp_event 3, 8, LAVENDER_CRYPT, 4 - warp_event 7, 13, LAVENDER_CRYPT_SET_1, 1 ; To Dokuroar - - warp_event 2, 4, LAVENDER_CRYPT_SET_1, 4 - 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 + warp_event 3, 8, LAVENDER_CRYPT, 4 ; Entrance + warp_event 7, 13, LAVENDER_CRYPT_DOKUROARS_ROOM, 1 ; To Dokuroar + ; Within-Map Warps + warp_event 8, 4, LAVENDER_CRYPT_SET_3, 4 + warp_event 22, 3, LAVENDER_CRYPT_SET_3, 3 + warp_event 18, 2, LAVENDER_CRYPT_SET_3, 6 + warp_event 5, 2, LAVENDER_CRYPT_SET_3, 5 + ; Outside of Map Warps + warp_event 22, 6, LAVENDER_CRYPT_SET_1, 23 + warp_event 19, 14, LAVENDER_CRYPT_SET_1, 24 + warp_event 19, 15, LAVENDER_CRYPT_SET_1, 25 + warp_event 20, 18, LAVENDER_CRYPT_SET_2, 18 + warp_event 7, 6, LAVENDER_CRYPT_SET_2, 19 + warp_event 18, 7, LAVENDER_CRYPT_SET_2, 20 + warp_event 22, 11, LAVENDER_CRYPT_SET_2, 21 + warp_event 7, 16, LAVENDER_CRYPT_SET_2, 22 + warp_event 2, 4, LAVENDER_CRYPT_SET_2, 23 + warp_event 19, 10, LAVENDER_CRYPT_SET_2, 24 + warp_event 21, 14, LAVENDER_CRYPT_SET_2, 25 + warp_event 22, 16, LAVENDER_CRYPT_SET_1, 26 + warp_event 20, 6, LAVENDER_CRYPT_SET_1, 28 + warp_event 20, 7, LAVENDER_CRYPT_SET_1, 29 def_coord_events