Improved Cinnabar Volcano + Mansion B2F!

- Cinnabar Volcano now requires Strength to complete, and contains several trainers, including 3 Firefighters.

- The entrance to Mansion B2F has been changed to a warp pad instead of a staircase.

- Removed the boulders in B2F to fix a bug and to prevent softlocks.

- Minor text fixes.

scripts/CinnabarVolcano.asm

@@ -14,6 +14,12 @@ CinnabarVolcano_ScriptPointers:
 
 CinnabarVolcano_TextPointers:
 	dw MoltresText
+	dw BoulderText
+	dw BoulderText
+	dw BoulderText
+	dw BoulderText
+	dw BoulderText
+	dw BoulderText
 
 CinnabarVolcanoTrainerHeaders:
 	def_trainers

scripts/CinnabarVolcanoFloors.asm

@@ -1,6 +1,113 @@
 CinnabarVolcanoFloors_Script:
-	jp EnableAutoTextBoxDrawing
+	call EnableAutoTextBoxDrawing
+	ld hl, CinnabarVolcanoFloorsTrainerHeaders
+	ld de, CinnabarVolcanoFloors_ScriptPointers
+	ld a, [wCinnabarVolcanoFloorsCurScript]
+	call ExecuteCurMapScriptInTable
+	ld [wCinnabarVolcanoFloorsCurScript], a
+	ret
+	
+CinnabarVolcanoFloors_ScriptPointers:
+	dw CheckFightingMapTrainers
+	dw DisplayEnemyTrainerTextAndStartBattle
+	dw EndTrainerBattle
 
 CinnabarVolcanoFloors_TextPointers:
+	dw CinnabarVolcanoFloorsText1
+	dw CinnabarVolcanoFloorsText2
+	dw CinnabarVolcanoFloorsText3
+	dw CinnabarVolcanoFloorsText4
+	dw PickUpItemText
+	dw BoulderText
+	dw BoulderText
+	dw BoulderText
+	dw BoulderText
+	dw BoulderText
+	dw BoulderText
+	dw BoulderText
+	
+CinnabarVolcanoFloorsTrainerHeaders:
+	def_trainers
+CinnabarVolcanoFloorsTrainerHeader0:
+	trainer EVENT_BEAT_CINNABAR_VOLCANO_TRAINER_1, 2, CinnabarVolcanoFloorsBattleText1, CinnabarVolcanoFloorsEndBattleText1, CinnabarVolcanoFloorsAfterBattleText1
+CinnabarVolcanoFloorsTrainerHeader1:
+	trainer EVENT_BEAT_CINNABAR_VOLCANO_TRAINER_2, 5, CinnabarVolcanoFloorsBattleText2, CinnabarVolcanoFloorsEndBattleText2, CinnabarVolcanoFloorsAfterBattleText2
+CinnabarVolcanoFloorsTrainerHeader2:
+	trainer EVENT_BEAT_CINNABAR_VOLCANO_TRAINER_3, 2, CinnabarVolcanoFloorsBattleText3, CinnabarVolcanoFloorsEndBattleText3, CinnabarVolcanoFloorsAfterBattleText3
+CinnabarVolcanoFloorsTrainerHeader3:
+	trainer EVENT_BEAT_CINNABAR_VOLCANO_TRAINER_4, 3, CinnabarVolcanoFloorsBattleText4, CinnabarVolcanoFloorsEndBattleText4, CinnabarVolcanoFloorsAfterBattleText4
+	db -1 ; end
+	
+CinnabarVolcanoFloorsText1:
+	text_asm
+	ld hl, CinnabarVolcanoFloorsTrainerHeader0
+	call TalkToTrainer
+	jp TextScriptEnd
+
+CinnabarVolcanoFloorsBattleText1:
+	text_far _CinnabarVolcanoFloorsBattleText1
+	text_end
+
+CinnabarVolcanoFloorsEndBattleText1:
+	text_far _CinnabarVolcanoFloorsEndBattleText1
+	text_end
+
+CinnabarVolcanoFloorsAfterBattleText1:
+	text_far _CinnabarVolcanoFloorsAfterBattleText1
+	text_end
+
+CinnabarVolcanoFloorsText2:
+	text_asm
+	ld hl, CinnabarVolcanoFloorsTrainerHeader1
+	call TalkToTrainer
+	jp TextScriptEnd
+
+CinnabarVolcanoFloorsBattleText2:
+	text_far _CinnabarVolcanoFloorsBattleText2
+	text_end
+
+CinnabarVolcanoFloorsEndBattleText2:
+	text_far _CinnabarVolcanoFloorsEndBattleText2
+	text_end
+
+CinnabarVolcanoFloorsAfterBattleText2:
+	text_far _CinnabarVolcanoFloorsAfterBattleText2
+	text_end
+	
+CinnabarVolcanoFloorsText3:
+	text_asm
+	ld hl, CinnabarVolcanoFloorsTrainerHeader2
+	call TalkToTrainer
+	jp TextScriptEnd
+
+CinnabarVolcanoFloorsBattleText3:
+	text_far _CinnabarVolcanoFloorsBattleText3
+	text_end
+
+CinnabarVolcanoFloorsEndBattleText3:
+	text_far _CinnabarVolcanoFloorsEndBattleText3
+	text_end
+
+CinnabarVolcanoFloorsAfterBattleText3:
+	text_far _CinnabarVolcanoFloorsAfterBattleText3
+	text_end
+
+CinnabarVolcanoFloorsText4:
+	text_asm
+	ld hl, CinnabarVolcanoFloorsTrainerHeader3
+	call TalkToTrainer
+	jp TextScriptEnd
+
+CinnabarVolcanoFloorsBattleText4:
+	text_far _CinnabarVolcanoFloorsBattleText4
+	text_end
+
+CinnabarVolcanoFloorsEndBattleText4:
+	text_far _CinnabarVolcanoFloorsEndBattleText4
+	text_end
+
+CinnabarVolcanoFloorsAfterBattleText4:
+	text_far _CinnabarVolcanoFloorsAfterBattleText4
+	text_end
 
 	text_end ; unused

scripts/PokemonMansionB2F.asm

@@ -10,15 +10,6 @@ PokemonMansionB2F_TextPointers:
 	dw B2FBook2
 	dw PickUpItemText
 	dw PickUpItemText
-	dw BoulderText
-	dw BoulderText
-	dw BoulderText
-	dw BoulderText
-	dw BoulderText
-	dw BoulderText
-	dw BoulderText
-	dw BoulderText
-	dw BoulderText
 	dw B2FPicture
 	dw B2FTrioPods
 	dw B2FTrioPods