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/engine/menus/naming_screen.asm b/engine/menus/naming_screen.asm
index 6aff24b7..cf742282 100644
--- a/engine/menus/naming_screen.asm
+++ b/engine/menus/naming_screen.asm
@@ -34,7 +34,6 @@ AskName:
 	and a
 	jr nz, .inBattle
 	call ReloadMapSpriteTilePatterns
-	call ReloadMapData
 .inBattle
 	call LoadScreenTilesFromBuffer1
 	pop hl
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+vvvvvv
vvvvvv
vvvvv	vvvvr-t
fvvvv_
-

 "


	___$
\ No newline at end of file
+
_,+,+|#'r+vvvvvv
vvvvvv
vvvvv	vvvvr-t
fvvv_
+

 "

(___$
\ 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
diff --git a/scripts/FightingDojo.asm b/scripts/FightingDojo.asm
index b0b6e6b5..34970dbb 100644
--- a/scripts/FightingDojo.asm
+++ b/scripts/FightingDojo.asm
@@ -68,7 +68,7 @@ FightingDojoScript3:
 .asm_5cde4
 	ld a, $f0
 	ld [wJoyIgnore], a
-	SetEventRange EVENT_BEAT_KARATE_MASTER, EVENT_BEAT_FIGHTING_DOJO_TRAINER_3
+	SetEventRange EVENT_DEFEATED_FIGHTING_DOJO, EVENT_BEAT_FIGHTING_DOJO_TRAINER_3
 	ld a, $9
 	ldh [hSpriteIndexOrTextID], a
 	call DisplayTextID
@@ -175,7 +175,6 @@ FightingDojoText1: ; gym scaling can be removed to make space
 .continue2
 	ld hl, FightingDojoText8
 	call PrintText
-	SetEvent EVENT_DEFEATED_FIGHTING_DOJO
 .asm_9dba4
 	jp TextScriptEnd
 
diff --git a/text/Route24.asm b/text/Route24.asm
index 8ed4c942..37bd481e 100644
--- a/text/Route24.asm
+++ b/text/Route24.asm
@@ -99,6 +99,6 @@ _Route24DamienText4::
 	done
 
 _DamienFullParty::
-	text "Huh? Your PARTY"
+	text "Huh? Your BOX"
 	line "is full?"
 	done