From 939f034d5a6f72597c81dace48f845fb8bc05a1a Mon Sep 17 00:00:00 2001 From: jojobear13 Date: Sat, 13 Jan 2024 21:48:38 -0600 Subject: [PATCH] account for softlock in volcano when saving next to moltres --- data/maps/objects/CinnabarVolcano.asm | 1 + data/maps/objects/CinnabarVolcanoFloors.asm | 2 ++ maps/CinnabarVolcano.blk | 2 +- maps/CinnabarVolcanoFloors.blk | 4 ++-- scripts/CinnabarVolcanoFloors.asm | 1 + 5 files changed, 7 insertions(+), 3 deletions(-) diff --git a/data/maps/objects/CinnabarVolcano.asm b/data/maps/objects/CinnabarVolcano.asm index 15722895..81f0ec0a 100644 --- a/data/maps/objects/CinnabarVolcano.asm +++ b/data/maps/objects/CinnabarVolcano.asm @@ -3,6 +3,7 @@ CinnabarVolcano_Object: def_warp_events warp_event 15, 21, CINNABAR_VOLCANO_FLOORS, 9 + warp_event 16, 5, CINNABAR_VOLCANO_FLOORS, 10 def_bg_events diff --git a/data/maps/objects/CinnabarVolcanoFloors.asm b/data/maps/objects/CinnabarVolcanoFloors.asm index 6922daee..193cda90 100644 --- a/data/maps/objects/CinnabarVolcanoFloors.asm +++ b/data/maps/objects/CinnabarVolcanoFloors.asm @@ -11,6 +11,7 @@ CinnabarVolcanoFloors_Object: warp_event 5, 3, CINNABAR_VOLCANO_FLOORS, 8 warp_event 5, 25, CINNABAR_VOLCANO_FLOORS, 7 warp_event 12, 24, CINNABAR_VOLCANO, 1 + warp_event 31, 37, CINNABAR_VOLCANO, 2 def_bg_events @@ -27,5 +28,6 @@ CinnabarVolcanoFloors_Object: object_event 34, 11, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 10 ; person object_event 11, 35, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 11 ; person object_event 12, 30, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 12 ; person + object_event 29, 37, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 13 def_warps_to CINNABAR_VOLCANO_FLOORS diff --git a/maps/CinnabarVolcano.blk b/maps/CinnabarVolcano.blk index ee63a5f5..5c6a4b37 100644 --- a/maps/CinnabarVolcano.blk +++ b/maps/CinnabarVolcano.blk @@ -1 +1 @@ -..............}vvvvvvvvvvvv}Qvvvvvvvvv}vvvvvv3vvvvvvvvv45vvvvvvvv+67,vvvv8-%88vvNvvvvv vvvvR}vvvv vvv}N}vvv>vv}}}}Q}}}}}}QN \ No newline at end of file +..............}vvvvvvvvvvvv}Qvvvvvvvvv}vvvvvv3vvvvvvvvv45vvvvvvvv+67,vvvv8-%88vvNvvvvv vvvvR}vvvv vvv}N}vvv>vv}}}}Q}}}}}}QN \ No newline at end of file diff --git a/maps/CinnabarVolcanoFloors.blk b/maps/CinnabarVolcanoFloors.blk index 16375cf5..56367815 100644 --- a/maps/CinnabarVolcanoFloors.blk +++ b/maps/CinnabarVolcanoFloors.blk @@ -1,4 +1,4 @@ ,+,+|__b "+  vvvfvvvvvvv-vvvvfvvv-v |fyvr - _,+,+|#'  r+ vvvvvvvvvvvvvvvvv vvvvr-tfvvvv_ - " ___$ \ No newline at end of file + _,+,+|#'  r+ vvvvvvvvvvvvvvvvv vvvvr-tfvvv_ + "(___$ \ No newline at end of file diff --git a/scripts/CinnabarVolcanoFloors.asm b/scripts/CinnabarVolcanoFloors.asm index 1143a50d..0ef6a3d8 100644 --- a/scripts/CinnabarVolcanoFloors.asm +++ b/scripts/CinnabarVolcanoFloors.asm @@ -25,6 +25,7 @@ CinnabarVolcanoFloors_TextPointers: dw BoulderText dw BoulderText dw BoulderText + dw BoulderText CinnabarVolcanoFloorsTrainerHeaders: def_trainers