Merge remote-tracking branch 'upstream' into tustin2121-patch-5

1 files changed, 40 insertions, 40 deletions

diff --git a/data/maps/IslandCave/scripts.inc b/data/maps/IslandCave/scripts.inc
index 911e882f2..8587e62c2 100644
--- a/data/maps/IslandCave/scripts.inc
+++ b/data/maps/IslandCave/scripts.inc
@@ -1,25 +1,25 @@
 IslandCave_MapScripts:: @ 8238E2A
-	map_script MAP_SCRIPT_ON_RESUME, IslandCave_MapScript1_238E3A
-	map_script MAP_SCRIPT_ON_LOAD, IslandCave_MapScript1_238E58
+	map_script MAP_SCRIPT_ON_RESUME, IslandCave_OnResume
+	map_script MAP_SCRIPT_ON_LOAD, IslandCave_OnLoad
 	map_script MAP_SCRIPT_ON_TRANSITION, IslandCave_OnTransition
 	.byte 0
 
-IslandCave_MapScript1_238E3A: @ 8238E3A
-	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, IslandCave_EventScript_238E44
+IslandCave_OnResume: @ 8238E3A
+	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, IslandCave_EventScript_TryRemoveRegice
 	end
 
-IslandCave_EventScript_238E44:: @ 8238E44
+IslandCave_EventScript_TryRemoveRegice:: @ 8238E44
 	specialvar VAR_RESULT, GetBattleOutcome
-	compare VAR_RESULT, 7
+	compare VAR_RESULT, B_OUTCOME_CAUGHT
 	goto_if_ne Common_EventScript_NopReturn
 	removeobject VAR_LAST_TALKED
 	return
 
-IslandCave_MapScript1_238E58: @ 8238E58
-	call_if_unset FLAG_SYS_BRAILLE_REGICE_COMPLETED, IslandCave_EventScript_238E62
+IslandCave_OnLoad: @ 8238E58
+	call_if_unset FLAG_SYS_BRAILLE_REGICE_COMPLETED, IslandCave_EventScript_HideRegiEntrance
 	end
 
-IslandCave_EventScript_238E62:: @ 8238E62
+IslandCave_EventScript_HideRegiEntrance:: @ 8238E62
 	setmetatile 7, 19, METATILE_Cave_EntranceCover, 1
 	setmetatile 8, 19, METATILE_Cave_EntranceCover, 1
 	setmetatile 9, 19, METATILE_Cave_EntranceCover, 1
@@ -30,15 +30,15 @@ IslandCave_EventScript_238E62:: @ 8238E62
 
 IslandCave_OnTransition: @ 8238E99
 	setflag FLAG_LANDMARK_ISLAND_CAVE
-	call IslandCave_EventScript_238F45
-	call_if_unset FLAG_DEFEATED_REGICE, IslandCave_EventScript_238EAB
+	call IslandCave_EventScript_ClearSteps
+	call_if_unset FLAG_DEFEATED_REGICE, IslandCave_EventScript_ShowRegice
 	end
 
-IslandCave_EventScript_238EAB:: @ 8238EAB
+IslandCave_EventScript_ShowRegice:: @ 8238EAB
 	clearflag FLAG_HIDE_REGICE
 	return
 
-IslandCave_EventScript_238EAF:: @ 8238EAF
+IslandCave_EventScript_OpenRegiEntrance:: @ 8238EAF
 	setmetatile 7, 19, METATILE_Cave_SealedChamberEntrance_TopLeft, 1
 	setmetatile 8, 19, METATILE_Cave_SealedChamberEntrance_TopMid, 1
 	setmetatile 9, 19, METATILE_Cave_SealedChamberEntrance_TopRight, 1
@@ -50,45 +50,45 @@ IslandCave_EventScript_238EAF:: @ 8238EAF
 	setflag FLAG_SYS_BRAILLE_REGICE_COMPLETED
 	end
 
-IslandCave_EventScript_238EEF:: @ 8238EEF
+IslandCave_EventScript_CaveEntranceMiddle:: @ 8238EEF
 	lockall
-	call_if_set FLAG_TEMP_3, IslandCave_EventScript_238F45
-	goto_if_set FLAG_SYS_BRAILLE_REGICE_COMPLETED, IslandCave_EventScript_238F13
-	braillemessage IslandCave_Braille_2A6CD4
+	call_if_set FLAG_TEMP_3, IslandCave_EventScript_ClearSteps
+	goto_if_set FLAG_SYS_BRAILLE_REGICE_COMPLETED, IslandCave_EventScript_BigHoleInWall
+	braillemessage IslandCave_Braille_RunLapAroundWall
 	setflag FLAG_TEMP_2
 	special ShouldDoBrailleRegicePuzzle
-	goto IslandCave_EventScript_238F41
+	goto IslandCave_EventScript_CloseBrailleMsg
 	end
 
-IslandCave_EventScript_238F13:: @ 8238F13
-	msgbox gUnknown_0827304E, MSGBOX_DEFAULT
+IslandCave_EventScript_BigHoleInWall:: @ 8238F13
+	msgbox gText_BigHoleInTheWall, MSGBOX_DEFAULT
 	releaseall
 	end
 
-IslandCave_EventScript_238F1D:: @ 8238F1D
+IslandCave_EventScript_CaveEntranceSide:: @ 8238F1D
 	lockall
-	call_if_set FLAG_TEMP_3, IslandCave_EventScript_238F45
-	braillemessage IslandCave_Braille_2A6CD4
-	goto_if_set FLAG_SYS_BRAILLE_REGICE_COMPLETED, IslandCave_EventScript_238F41
+	call_if_set FLAG_TEMP_3, IslandCave_EventScript_ClearSteps
+	braillemessage IslandCave_Braille_RunLapAroundWall
+	goto_if_set FLAG_SYS_BRAILLE_REGICE_COMPLETED, IslandCave_EventScript_CloseBrailleMsg
 	setflag FLAG_TEMP_2
 	special ShouldDoBrailleRegicePuzzle
-	goto IslandCave_EventScript_238F41
+	goto IslandCave_EventScript_CloseBrailleMsg
 	end
 
-IslandCave_EventScript_238F41:: @ 8238F41
+IslandCave_EventScript_CloseBrailleMsg:: @ 8238F41
 	waitbuttonpress
-	hidebox2
+	closebraillemessage
 	releaseall
 	end
 
-IslandCave_EventScript_238F45:: @ 8238F45
+IslandCave_EventScript_ClearSteps:: @ 8238F45
 	setvar VAR_REGICE_STEPS_1, 0
 	setvar VAR_REGICE_STEPS_2, 0
 	setvar VAR_REGICE_STEPS_3, 0
 	clearflag FLAG_TEMP_3
 	return
 
-IslandCave_EventScript_238F58:: @ 8238F58
+IslandCave_EventScript_Regice:: @ 8238F58
 	lock
 	faceplayer
 	waitse
@@ -101,22 +101,22 @@ IslandCave_EventScript_238F58:: @ 8238F58
 	waitstate
 	clearflag FLAG_SYS_CTRL_OBJ_DELETE
 	specialvar VAR_RESULT, GetBattleOutcome
-	compare VAR_RESULT, 1
-	goto_if_eq IslandCave_EventScript_238F9F
-	compare VAR_RESULT, 4
-	goto_if_eq IslandCave_EventScript_238FA8
-	compare VAR_RESULT, 5
-	goto_if_eq IslandCave_EventScript_238FA8
+	compare VAR_RESULT, B_OUTCOME_WON
+	goto_if_eq IslandCave_EventScript_DefeatedRegice
+	compare VAR_RESULT, B_OUTCOME_RAN
+	goto_if_eq IslandCave_EventScript_RanFromRegice
+	compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
+	goto_if_eq IslandCave_EventScript_RanFromRegice
 	setflag FLAG_DEFEATED_REGICE
 	release
 	end
 
-IslandCave_EventScript_238F9F:: @ 8238F9F
+IslandCave_EventScript_DefeatedRegice:: @ 8238F9F
 	setflag FLAG_DEFEATED_REGICE
-	goto IslandCave_EventScript_27376D
+	goto Common_EventScript_RemoveStaticPokemon
 	end
 
-IslandCave_EventScript_238FA8:: @ 8238FA8
-	setvar VAR_0x8004, 402
-	goto IslandCave_EventScript_273776
+IslandCave_EventScript_RanFromRegice:: @ 8238FA8
+	setvar VAR_0x8004, SPECIES_REGICE
+	goto Common_EventScript_LegendaryFlewAway
 	end