Merge pull request #881 from GriffinRichards/doc-caves

Document cave scripts

data/event_scripts.s

@@ -901,7 +901,7 @@ EventScript_HideMrBriney:: @ 82721F8
 	setvar VAR_BRINEY_LOCATION, 0
 	return
 
-RusturfTunnel_EventScript_272216:: @ 8272216
+RusturfTunnel_EventScript_SetRusturfTunnelOpen:: @ 8272216
 	removeobject 1
 	removeobject 10
 	clearflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_MAN

data/maps/FallarborTown_BattleTentLobby/map.json

@@ -77,7 +77,7 @@
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "FallarborTown_BattleTentLobby_EventScript_200228",
-      "flag": "FLAG_HIDE_FALLORBOR_TOWN_BATTLE_TENT_SCOTT"
+      "flag": "FLAG_HIDE_FALLARBOR_TOWN_BATTLE_TENT_SCOTT"
     }
   ],
   "warp_events": [

data/maps/FieryPath/scripts.inc

@@ -3,12 +3,12 @@ FieryPath_MapScripts:: @ 8230F24
 	.byte 0
 
 FieryPath_OnTransition: @ 8230F2A
-	call_if_unset FLAG_LANDMARK_FIERY_PATH, FieryPath_EventScript_230F37
+	call_if_unset FLAG_LANDMARK_FIERY_PATH, FieryPath_EventScript_MoveScottToFallarbor
 	setflag FLAG_LANDMARK_FIERY_PATH
 	end
 
-FieryPath_EventScript_230F37:: @ 8230F37
+FieryPath_EventScript_MoveScottToFallarbor:: @ 8230F37
 	setflag FLAG_HIDE_VERDANTURF_TOWN_SCOTT
-	clearflag FLAG_HIDE_FALLORBOR_TOWN_BATTLE_TENT_SCOTT
+	clearflag FLAG_HIDE_FALLARBOR_TOWN_BATTLE_TENT_SCOTT
 	return
 

data/maps/GraniteCave_1F/map.json

@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "GraniteCave_1F_EventScript_22DA5E",
+      "script": "GraniteCave_1F_EventScript_Hiker",
       "flag": "0"
     },
     {

data/maps/GraniteCave_1F/scripts.inc

@@ -1,23 +1,23 @@
 GraniteCave_1F_MapScripts:: @ 822DA5D
 	.byte 0
 
-GraniteCave_1F_EventScript_22DA5E:: @ 822DA5E
+GraniteCave_1F_EventScript_Hiker:: @ 822DA5E
 	lock
 	faceplayer
-	goto_if_set FLAG_RECEIVED_HM05, GraniteCave_1F_EventScript_22DA8A
-	msgbox GraniteCave_1F_Text_22DA94, MSGBOX_DEFAULT
+	goto_if_set FLAG_RECEIVED_HM05, GraniteCave_1F_EventScript_ReceivedFlash
+	msgbox GraniteCave_1F_Text_GetsDarkAheadHereYouGo, MSGBOX_DEFAULT
 	giveitem_std ITEM_HM05
 	setflag FLAG_RECEIVED_HM05
-	msgbox GraniteCave_1F_Text_22DBB7, MSGBOX_DEFAULT
+	msgbox GraniteCave_1F_Text_ExplainFlash, MSGBOX_DEFAULT
 	release
 	end
 
-GraniteCave_1F_EventScript_22DA8A:: @ 822DA8A
-	msgbox GraniteCave_1F_Text_22DBB7, MSGBOX_DEFAULT
+GraniteCave_1F_EventScript_ReceivedFlash:: @ 822DA8A
+	msgbox GraniteCave_1F_Text_ExplainFlash, MSGBOX_DEFAULT
 	release
 	end
 
-GraniteCave_1F_Text_22DA94: @ 822DA94
+GraniteCave_1F_Text_GetsDarkAheadHereYouGo: @ 822DA94
 	.string "Hey, you.\n"
 	.string "It gets awfully dark ahead.\l"
 	.string "It'll be tough trying to explore.\p"
@@ -29,7 +29,7 @@ GraniteCave_1F_Text_22DA94: @ 822DA94
 	.string "that we meet is our motto.\p"
 	.string "Here you go, I'll pass this on to you.$"
 
-GraniteCave_1F_Text_22DBB7: @ 822DBB7
+GraniteCave_1F_Text_ExplainFlash: @ 822DBB7
 	.string "Teach that hidden move FLASH to\n"
 	.string "a POKéMON and use it.\p"
 	.string "It lights up even the inky darkness\n"

data/maps/GraniteCave_StevensRoom/map.json

@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "GraniteCave_StevensRoom_EventScript_22DC7B",
+      "script": "GraniteCave_StevensRoom_EventScript_Steven",
       "flag": "FLAG_HIDE_GRANITE_CAVE_STEVEN"
     }
   ],

data/maps/GraniteCave_StevensRoom/scripts.inc

@@ -1,63 +1,63 @@
 GraniteCave_StevensRoom_MapScripts:: @ 822DC7A
 	.byte 0
 
-GraniteCave_StevensRoom_EventScript_22DC7B:: @ 822DC7B
+GraniteCave_StevensRoom_EventScript_Steven:: @ 822DC7B
 	lock
 	faceplayer
-	msgbox GraniteCave_StevensRoom_Text_22DD5A, MSGBOX_DEFAULT
+	msgbox GraniteCave_StevensRoom_Text_ImStevenLetterForMe, MSGBOX_DEFAULT
 	setvar VAR_0x8004, ITEM_LETTER
 	call Common_EventScript_PlayerHandedOverTheItem
 	setflag FLAG_DELIVERED_STEVEN_LETTER
-	msgbox GraniteCave_StevensRoom_Text_22DDBD, MSGBOX_DEFAULT
+	msgbox GraniteCave_StevensRoom_Text_ThankYouTakeThis, MSGBOX_DEFAULT
 	giveitem_std ITEM_TM47
-	compare VAR_RESULT, 0
-	call_if_eq GraniteCave_StevensRoom_EventScript_22DD3C
-	msgbox GraniteCave_StevensRoom_Text_22DE6B, MSGBOX_DEFAULT
+	compare VAR_RESULT, FALSE
+	call_if_eq GraniteCave_StevensRoom_EventScript_BagFull
+	msgbox GraniteCave_StevensRoom_Text_CouldBecomeChampionLetsRegister, MSGBOX_DEFAULT
 	closemessage
 	delay 30
 	playfanfare MUS_ME_TORE_EYE
-	msgbox GraniteCave_StevensRoom_Text_22DF6A, MSGBOX_DEFAULT
+	msgbox GraniteCave_StevensRoom_Text_RegisteredSteven, MSGBOX_DEFAULT
 	waitfanfare
 	closemessage
 	delay 30
 	setflag FLAG_REGISTERED_STEVEN_POKENAV
-	msgbox GraniteCave_StevensRoom_Text_22DF8C, MSGBOX_DEFAULT
+	msgbox GraniteCave_StevensRoom_Text_IveGotToHurryAlong, MSGBOX_DEFAULT
 	closemessage
 	compare VAR_FACING, DIR_NORTH
-	call_if_eq GraniteCave_StevensRoom_EventScript_22DD0D
+	call_if_eq GraniteCave_StevensRoom_EventScript_StevenExitNorth
 	compare VAR_FACING, DIR_SOUTH
-	call_if_eq GraniteCave_StevensRoom_EventScript_22DD2A
+	call_if_eq GraniteCave_StevensRoom_EventScript_StevenExitSouth
 	compare VAR_FACING, DIR_WEST
-	call_if_eq GraniteCave_StevensRoom_EventScript_22DD18
+	call_if_eq GraniteCave_StevensRoom_EventScript_StevenExitWestEast
 	compare VAR_FACING, DIR_EAST
-	call_if_eq GraniteCave_StevensRoom_EventScript_22DD18
+	call_if_eq GraniteCave_StevensRoom_EventScript_StevenExitWestEast
 	playse SE_KAIDAN
 	removeobject 1
 	release
 	end
 
-GraniteCave_StevensRoom_EventScript_22DD0D:: @ 822DD0D
-	applymovement 1, GraniteCave_StevensRoom_Movement_22DD45
+GraniteCave_StevensRoom_EventScript_StevenExitNorth:: @ 822DD0D
+	applymovement 1, GraniteCave_StevensRoom_Movement_StevenExit
 	waitmovement 0
 	return
 
-GraniteCave_StevensRoom_EventScript_22DD18:: @ 822DD18
-	applymovement EVENT_OBJ_ID_PLAYER, GraniteCave_StevensRoom_Movement_22DD4C
-	applymovement 1, GraniteCave_StevensRoom_Movement_22DD45
+GraniteCave_StevensRoom_EventScript_StevenExitWestEast:: @ 822DD18
+	applymovement EVENT_OBJ_ID_PLAYER, GraniteCave_StevensRoom_Movement_PlayerTurnTowardExit
+	applymovement 1, GraniteCave_StevensRoom_Movement_StevenExit
 	waitmovement 0
 	return
 
-GraniteCave_StevensRoom_EventScript_22DD2A:: @ 822DD2A
-	applymovement EVENT_OBJ_ID_PLAYER, GraniteCave_StevensRoom_Movement_22DD4C
-	applymovement 1, GraniteCave_StevensRoom_Movement_22DD51
+GraniteCave_StevensRoom_EventScript_StevenExitSouth:: @ 822DD2A
+	applymovement EVENT_OBJ_ID_PLAYER, GraniteCave_StevensRoom_Movement_PlayerTurnTowardExit
+	applymovement 1, GraniteCave_StevensRoom_Movement_StevenExitSouth
 	waitmovement 0
 	return
 
-GraniteCave_StevensRoom_EventScript_22DD3C:: @ 822DD3C
-	msgbox GraniteCave_StevensRoom_Text_22DFAA, MSGBOX_DEFAULT
+GraniteCave_StevensRoom_EventScript_BagFull:: @ 822DD3C
+	msgbox GraniteCave_StevensRoom_Text_OhBagIsFull, MSGBOX_DEFAULT
 	return
 
-GraniteCave_StevensRoom_Movement_22DD45: @ 822DD45
+GraniteCave_StevensRoom_Movement_StevenExit: @ 822DD45
 	walk_up
 	walk_up
 	walk_up
@@ -66,14 +66,14 @@ GraniteCave_StevensRoom_Movement_22DD45: @ 822DD45
 	delay_8
 	step_end
 
-GraniteCave_StevensRoom_Movement_22DD4C: @ 822DD4C
+GraniteCave_StevensRoom_Movement_PlayerTurnTowardExit: @ 822DD4C
 	delay_16
 	delay_16
 	delay_16
 	walk_in_place_fastest_up
 	step_end
 
-GraniteCave_StevensRoom_Movement_22DD51: @ 822DD51
+GraniteCave_StevensRoom_Movement_StevenExitSouth: @ 822DD51
 	walk_left
 	walk_up
 	walk_up
@@ -84,14 +84,14 @@ GraniteCave_StevensRoom_Movement_22DD51: @ 822DD51
 	delay_8
 	step_end
 
-GraniteCave_StevensRoom_Text_22DD5A: @ 822DD5A
+GraniteCave_StevensRoom_Text_ImStevenLetterForMe: @ 822DD5A
 	.string "My name is STEVEN.\p"
 	.string "I'm interested in rare stones,\n"
 	.string "so I travel here and there.\p"
 	.string "Oh?\n"
 	.string "A LETTER for me?$"
 
-GraniteCave_StevensRoom_Text_22DDBD: @ 822DDBD
+GraniteCave_StevensRoom_Text_ThankYouTakeThis: @ 822DDBD
 	.string "STEVEN: Okay, thank you.\p"
 	.string "You went through all this trouble to\n"
 	.string "deliver that. I need to thank you.\p"
@@ -100,7 +100,7 @@ GraniteCave_StevensRoom_Text_22DDBD: @ 822DDBD
 	.string "It contains my favorite move,\n"
 	.string "STEEL WING.$"
 
-GraniteCave_StevensRoom_Text_22DE6B: @ 822DE6B
+GraniteCave_StevensRoom_Text_CouldBecomeChampionLetsRegister: @ 822DE6B
 	.string "STEVEN: Your POKéMON appear quite\n"
 	.string "capable.\p"
 	.string "If you keep training, you could even\n"
@@ -111,14 +111,14 @@ GraniteCave_StevensRoom_Text_22DE6B: @ 822DE6B
 	.string "our POKéNAVS.\p"
 	.string "… … … … … …$"
 
-GraniteCave_StevensRoom_Text_22DF6A: @ 822DF6A
+GraniteCave_StevensRoom_Text_RegisteredSteven: @ 822DF6A
 	.string "Registered STEVEN\n"
 	.string "in the POKéNAV.$"
 
-GraniteCave_StevensRoom_Text_22DF8C: @ 822DF8C
+GraniteCave_StevensRoom_Text_IveGotToHurryAlong: @ 822DF8C
 	.string "Now, I've got to hurry along.$"
 
-GraniteCave_StevensRoom_Text_22DFAA: @ 822DFAA
+GraniteCave_StevensRoom_Text_OhBagIsFull: @ 822DFAA
 	.string "Oh, your BAG is full…\n"
 	.string "That's too bad, then.$"
 

data/maps/MeteorFalls_1F_1R/map.json

@@ -141,7 +141,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MeteorFalls_1F_1R_EventScript_22BF25",
+      "script": "MeteorFalls_1F_1R_EventScript_ProfCozmo",
       "flag": "FLAG_HIDE_METEOR_FALLS_1F_1R_COZMO"
     }
   ],
@@ -197,7 +197,7 @@
       "elevation": 4,
       "var": "VAR_METEOR_FALLS_STATE",
       "var_value": "0",
-      "script": "MeteorFalls_1F_1R_EventScript_22BD5F"
+      "script": "MeteorFalls_1F_1R_EventScript_MagmaStealsMeteoriteScene"
     }
   ],
   "bg_events": [

data/maps/MeteorFalls_1F_1R/scripts.inc

@@ -1,19 +1,19 @@
 MeteorFalls_1F_1R_MapScripts:: @ 822BD2A
-	map_script MAP_SCRIPT_ON_LOAD, MeteorFalls_1F_1R_MapScript1_22BD30
+	map_script MAP_SCRIPT_ON_LOAD, MeteorFalls_1F_1R_OnLoad
 	.byte 0
 
-MeteorFalls_1F_1R_MapScript1_22BD30: @ 822BD30
-	call_if_set FLAG_SYS_GAME_CLEAR, MeteorFalls_1F_1R_EventScript_22BD3A
+MeteorFalls_1F_1R_OnLoad: @ 822BD30
+	call_if_set FLAG_SYS_GAME_CLEAR, MeteorFalls_1F_1R_EventScript_OpenStevensCave
 	end
 
-MeteorFalls_1F_1R_EventScript_22BD3A:: @ 822BD3A
+MeteorFalls_1F_1R_EventScript_OpenStevensCave:: @ 822BD3A
 	setmetatile 4, 1, METATILE_MeteorFalls_CaveEntrance_Top, 1
 	setmetatile 3, 2, METATILE_MeteorFalls_CaveEntrance_Left, 1
 	setmetatile 4, 2, METATILE_MeteorFalls_CaveEntrance_Bottom, 0
 	setmetatile 5, 2, METATILE_MeteorFalls_CaveEntrance_Right, 1
 	return
 
-MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F
+MeteorFalls_1F_1R_EventScript_MagmaStealsMeteoriteScene:: @ 822BD5F
 	lockall
 	playbgm MUS_MGM0, 0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceDown
@@ -21,7 +21,7 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F
 	delay 30
 	applymovement 5, Common_Movement_WalkInPlaceDown
 	waitmovement 0
-	msgbox MeteorFalls_1F_1R_Text_22BF47, MSGBOX_DEFAULT
+	msgbox MeteorFalls_1F_1R_Text_WithThisMeteorite, MSGBOX_DEFAULT
 	closemessage
 	applymovement 5, Common_Movement_WalkInPlaceFastestUp
 	applymovement 6, Common_Movement_WalkInPlaceFastestUp
@@ -31,11 +31,11 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F
 	waitmovement 0
 	applymovement 5, Common_Movement_Delay48
 	waitmovement 0
-	msgbox MeteorFalls_1F_1R_Text_22BF84, MSGBOX_DEFAULT
+	msgbox MeteorFalls_1F_1R_Text_DontExpectMercyFromMagma, MSGBOX_DEFAULT
 	closemessage
-	applymovement 5, MeteorFalls_1F_1R_Movement_22BEC0
+	applymovement 5, MeteorFalls_1F_1R_Movement_MagmaGruntApproachPlayer
 	waitmovement 0
-	msgbox MeteorFalls_1F_1R_Text_22BFE4, MSGBOX_DEFAULT
+	msgbox MeteorFalls_1F_1R_Text_HoldItRightThereMagma, MSGBOX_DEFAULT
 	closemessage
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	applymovement 5, Common_Movement_WalkInPlaceFastestLeft
@@ -45,39 +45,39 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F
 	addobject 8
 	addobject 9
 	playbgm MUS_AQA_0, 0
-	applymovement 7, MeteorFalls_1F_1R_Movement_22BED9
-	applymovement 8, MeteorFalls_1F_1R_Movement_22BEE0
-	applymovement 9, MeteorFalls_1F_1R_Movement_22BEE8
+	applymovement 7, MeteorFalls_1F_1R_Movement_ArchieArrive
+	applymovement 8, MeteorFalls_1F_1R_Movement_AquaGrunt1Arrive
+	applymovement 9, MeteorFalls_1F_1R_Movement_AquaGrunt2Arrive
 	waitmovement 0
 	applymovement 5, Common_Movement_WalkInPlaceFastestLeft
 	applymovement 6, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
-	msgbox MeteorFalls_1F_1R_Text_22C04E, MSGBOX_DEFAULT
+	msgbox MeteorFalls_1F_1R_Text_BeSeeingYouTeamAqua, MSGBOX_DEFAULT
 	closemessage
-	applymovement EVENT_OBJ_ID_PLAYER, MeteorFalls_1F_1R_Movement_22BF1D
-	applymovement 5, MeteorFalls_1F_1R_Movement_22BEC4
-	applymovement 6, MeteorFalls_1F_1R_Movement_22BECE
+	applymovement EVENT_OBJ_ID_PLAYER, MeteorFalls_1F_1R_Movement_PushPlayerOutOfWay
+	applymovement 5, MeteorFalls_1F_1R_Movement_MagmaGrunt1Exit
+	applymovement 6, MeteorFalls_1F_1R_Movement_MagmaGrunt2Exit
 	waitmovement 0
 	removeobject 5
 	removeobject 6
-	applymovement 7, MeteorFalls_1F_1R_Movement_22BEF8
+	applymovement 7, MeteorFalls_1F_1R_Movement_ArchieApproachPlayer
 	waitmovement 0
-	msgbox MeteorFalls_1F_1R_Text_22C11C, MSGBOX_DEFAULT
+	msgbox MeteorFalls_1F_1R_Text_ArchieSeenYouBefore, MSGBOX_DEFAULT
 	closemessage
-	applymovement 8, MeteorFalls_1F_1R_Movement_22BF08
-	applymovement 9, MeteorFalls_1F_1R_Movement_22BF18
+	applymovement 8, MeteorFalls_1F_1R_Movement_AquaGrunt1ApproachArchie
+	applymovement 9, MeteorFalls_1F_1R_Movement_AquaGrunt2ApproachArchie
 	waitmovement 0
-	msgbox MeteorFalls_1F_1R_Text_22C268, MSGBOX_DEFAULT
+	msgbox MeteorFalls_1F_1R_Text_BossWeShouldChaseMagma, MSGBOX_DEFAULT
 	applymovement 7, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
-	msgbox MeteorFalls_1F_1R_Text_22C292, MSGBOX_DEFAULT
+	msgbox MeteorFalls_1F_1R_Text_ArchieYesNoTellingWhatMagmaWillDo, MSGBOX_DEFAULT
 	applymovement 7, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
-	msgbox MeteorFalls_1F_1R_Text_22C2FC, MSGBOX_DEFAULT
+	msgbox MeteorFalls_1F_1R_Text_ArchieFarewell, MSGBOX_DEFAULT
 	closemessage
-	applymovement 7, MeteorFalls_1F_1R_Movement_22BEF0
-	applymovement 8, MeteorFalls_1F_1R_Movement_22BEFE
-	applymovement 9, MeteorFalls_1F_1R_Movement_22BF0D
+	applymovement 7, MeteorFalls_1F_1R_Movement_ArchieExit
+	applymovement 8, MeteorFalls_1F_1R_Movement_AquaGrunt1Exit
+	applymovement 9, MeteorFalls_1F_1R_Movement_AquaGrunt2Exit
 	waitmovement 0
 	fadedefaultbgm
 	removeobject 7
@@ -85,18 +85,18 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F
 	removeobject 9
 	setflag FLAG_HIDE_ROUTE_112_TEAM_MAGMA
 	setflag FLAG_MET_ARCHIE_METEOR_FALLS
-	setflag FLAG_HIDE_FALLORBOR_TOWN_BATTLE_TENT_SCOTT
+	setflag FLAG_HIDE_FALLARBOR_TOWN_BATTLE_TENT_SCOTT
 	setvar VAR_METEOR_FALLS_STATE, 1
 	releaseall
 	end
 
-MeteorFalls_1F_1R_Movement_22BEC0: @ 822BEC0
+MeteorFalls_1F_1R_Movement_MagmaGruntApproachPlayer: @ 822BEC0
 	walk_right
 	walk_right
 	walk_in_place_fastest_up
 	step_end
 
-MeteorFalls_1F_1R_Movement_22BEC4: @ 822BEC4
+MeteorFalls_1F_1R_Movement_MagmaGrunt1Exit: @ 822BEC4
 	walk_fast_up
 	walk_fast_up
 	walk_fast_right
@@ -108,7 +108,7 @@ MeteorFalls_1F_1R_Movement_22BEC4: @ 822BEC4
 	walk_fast_right
 	step_end
 
-MeteorFalls_1F_1R_Movement_22BECE: @ 822BECE
+MeteorFalls_1F_1R_Movement_MagmaGrunt2Exit: @ 822BECE
 	walk_fast_up
 	walk_fast_up
 	walk_fast_up
@@ -121,7 +121,7 @@ MeteorFalls_1F_1R_Movement_22BECE: @ 822BECE
 	walk_fast_right
 	step_end
 
-MeteorFalls_1F_1R_Movement_22BED9: @ 822BED9
+MeteorFalls_1F_1R_Movement_ArchieArrive: @ 822BED9
 	walk_right
 	walk_right
 	walk_right
@@ -130,7 +130,7 @@ MeteorFalls_1F_1R_Movement_22BED9: @ 822BED9
 	walk_right
 	step_end
 
-MeteorFalls_1F_1R_Movement_22BEE0: @ 822BEE0
+MeteorFalls_1F_1R_Movement_AquaGrunt1Arrive: @ 822BEE0
 	delay_16
 	delay_16
 	walk_right
@@ -140,7 +140,7 @@ MeteorFalls_1F_1R_Movement_22BEE0: @ 822BEE0
 	walk_right
 	step_end
 
-MeteorFalls_1F_1R_Movement_22BEE8: @ 822BEE8
+MeteorFalls_1F_1R_Movement_AquaGrunt2Arrive: @ 822BEE8
 	delay_16
 	delay_16
 	walk_right
@@ -150,7 +150,7 @@ MeteorFalls_1F_1R_Movement_22BEE8: @ 822BEE8
 	walk_right
 	step_end
 
-MeteorFalls_1F_1R_Movement_22BEF0: @ 822BEF0
+MeteorFalls_1F_1R_Movement_ArchieExit: @ 822BEF0
 	walk_right
 	walk_right
 	walk_right
@@ -160,7 +160,7 @@ MeteorFalls_1F_1R_Movement_22BEF0: @ 822BEF0
 	walk_right
 	step_end
 
-MeteorFalls_1F_1R_Movement_22BEF8: @ 822BEF8
+MeteorFalls_1F_1R_Movement_ArchieApproachPlayer: @ 822BEF8
 	walk_right
 	walk_right
 	walk_up
@@ -168,7 +168,7 @@ MeteorFalls_1F_1R_Movement_22BEF8: @ 822BEF8
 	walk_in_place_fastest_left
 	step_end
 
-MeteorFalls_1F_1R_Movement_22BEFE: @ 822BEFE
+MeteorFalls_1F_1R_Movement_AquaGrunt1Exit: @ 822BEFE
 	walk_up
 	walk_up
 	walk_right
@@ -180,14 +180,14 @@ MeteorFalls_1F_1R_Movement_22BEFE: @ 822BEFE
 	walk_right
 	step_end
 
-MeteorFalls_1F_1R_Movement_22BF08: @ 822BF08
+MeteorFalls_1F_1R_Movement_AquaGrunt1ApproachArchie: @ 822BF08
 	walk_right
 	walk_right
 	walk_right
 	walk_in_place_fastest_up
 	step_end
 
-MeteorFalls_1F_1R_Movement_22BF0D: @ 822BF0D
+MeteorFalls_1F_1R_Movement_AquaGrunt2Exit: @ 822BF0D
 	walk_up
 	walk_up
 	walk_up
@@ -200,14 +200,14 @@ MeteorFalls_1F_1R_Movement_22BF0D: @ 822BF0D
 	walk_right
 	step_end
 
-MeteorFalls_1F_1R_Movement_22BF18: @ 822BF18
+MeteorFalls_1F_1R_Movement_AquaGrunt2ApproachArchie: @ 822BF18
 	walk_right
 	walk_right
 	walk_right
 	walk_in_place_fastest_up
 	step_end
 
-MeteorFalls_1F_1R_Movement_22BF1D: @ 822BF1D
+MeteorFalls_1F_1R_Movement_PushPlayerOutOfWay: @ 822BF1D
 	walk_in_place_fastest_down
 	delay_4
 	walk_in_place_fastest_right
@@ -217,37 +217,37 @@ MeteorFalls_1F_1R_Movement_22BF1D: @ 822BF1D
 	face_right
 	step_end
 
-MeteorFalls_1F_1R_EventScript_22BF25:: @ 822BF25
+MeteorFalls_1F_1R_EventScript_ProfCozmo:: @ 822BF25
 	lock
 	faceplayer
-	goto_if_set FLAG_MET_PROF_COSMO, MeteorFalls_1F_1R_EventScript_22BF3D
-	setflag FLAG_MET_PROF_COSMO
-	msgbox MeteorFalls_1F_1R_Text_22C342, MSGBOX_DEFAULT
+	goto_if_set FLAG_MET_PROF_COZMO, MeteorFalls_1F_1R_EventScript_MetCozmo
+	setflag FLAG_MET_PROF_COZMO
+	msgbox MeteorFalls_1F_1R_Text_MeetProfCozmo, MSGBOX_DEFAULT
 	release
 	end
 
-MeteorFalls_1F_1R_EventScript_22BF3D:: @ 822BF3D
-	msgbox MeteorFalls_1F_1R_Text_22C47D, MSGBOX_DEFAULT
+MeteorFalls_1F_1R_EventScript_MetCozmo:: @ 822BF3D
+	msgbox MeteorFalls_1F_1R_Text_WhatsTeamMagmaDoingAtMtChimney, MSGBOX_DEFAULT
 	release
 	end
 
-MeteorFalls_1F_1R_Text_22BF47: @ 822BF47
+MeteorFalls_1F_1R_Text_WithThisMeteorite: @ 822BF47
 	.string "Hehehe!\p"
 	.string "With this METEORITE, that thing in\n"
 	.string "MT. CHIMNEY will…$"
 
-MeteorFalls_1F_1R_Text_22BF84: @ 822BF84
+MeteorFalls_1F_1R_Text_DontExpectMercyFromMagma: @ 822BF84
 	.string "Heh?\p"
 	.string "I don't know who you are, but if you get\n"
 	.string "in the way of TEAM MAGMA, don't\l"
 	.string "expect any mercy!$"
 
-MeteorFalls_1F_1R_Text_22BFE4: @ 822BFE4
+MeteorFalls_1F_1R_Text_HoldItRightThereMagma: @ 822BFE4
 	.string "Hold it right there, TEAM MAGMA!\p"
 	.string "You're badly mistaken if you think you\n"
 	.string "can have your way with the world!$"
 
-MeteorFalls_1F_1R_Text_22C04E: @ 822C04E
+MeteorFalls_1F_1R_Text_BeSeeingYouTeamAqua: @ 822C04E
 	.string "Hehehe!\n"
 	.string "Even TEAM AQUA joins us!\p"
 	.string "But it's too much trouble to deal with\n"
@@ -258,7 +258,7 @@ MeteorFalls_1F_1R_Text_22C04E: @ 822C04E
 	.string "Hehehe! Be seeing you, you TEAM\n"
 	.string "AQUA dingbats!$"
 
-MeteorFalls_1F_1R_Text_22C11C: @ 822C11C
+MeteorFalls_1F_1R_Text_ArchieSeenYouBefore: @ 822C11C
 	.string "ARCHIE: Didn't I see you before?\n"
 	.string "At SLATEPORT's MUSEUM?\p"
 	.string "Ah, so your name is {PLAYER}.\p"
@@ -273,22 +273,22 @@ MeteorFalls_1F_1R_Text_22C11C: @ 822C11C
 	.string "They are the rivals to us,\n"
 	.string "the sea-loving TEAM AQUA!$"
 
-MeteorFalls_1F_1R_Text_22C268: @ 822C268
+MeteorFalls_1F_1R_Text_BossWeShouldChaseMagma: @ 822C268
 	.string "BOSS, we should give chase to\n"
 	.string "TEAM MAGMA…$"
 
-MeteorFalls_1F_1R_Text_22C292: @ 822C292
+MeteorFalls_1F_1R_Text_ArchieYesNoTellingWhatMagmaWillDo: @ 822C292
 	.string "ARCHIE: Yes, yes, we must!\n"
 	.string "We've got to hurry.\p"
 	.string "There's no telling what TEAM MAGMA\n"
 	.string "will do at MT. CHIMNEY!$"
 
-MeteorFalls_1F_1R_Text_22C2FC: @ 822C2FC
+MeteorFalls_1F_1R_Text_ArchieFarewell: @ 822C2FC
 	.string "ARCHIE: {PLAYER}, you should keep\n"
 	.string "an eye out for TEAM MAGMA, too.\p"
 	.string "Farewell!$"
 
-MeteorFalls_1F_1R_Text_22C342: @ 822C342
+MeteorFalls_1F_1R_Text_MeetProfCozmo: @ 822C342
 	.string "I… I'm COZMO…\n"
 	.string "I'm a PROFESSOR…\p"
 	.string "TEAM MAGMA asked me to guide them\n"
@@ -303,7 +303,7 @@ MeteorFalls_1F_1R_Text_22C342: @ 822C342
 	.string "What are they going to do with that\n"
 	.string "METEORITE at MT. CHIMNEY?$"
 
-MeteorFalls_1F_1R_Text_22C47D: @ 822C47D
+MeteorFalls_1F_1R_Text_WhatsTeamMagmaDoingAtMtChimney: @ 822C47D
 	.string "PROF. COZMO: But that TEAM MAGMA…\p"
 	.string "What are they going to do with that\n"
 	.string "METEORITE at MT. CHIMNEY?$"

data/maps/MeteorFalls_1F_2R/map.json

@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "MeteorFalls_1F_2R_EventScript_22C4DE",
+      "script": "MeteorFalls_1F_2R_EventScript_Nicolas",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "MeteorFalls_1F_2R_EventScript_22C540",
+      "script": "MeteorFalls_1F_2R_EventScript_John",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "MeteorFalls_1F_2R_EventScript_22C5A4",
+      "script": "MeteorFalls_1F_2R_EventScript_Jay",
       "flag": "0"
     }
   ],

data/maps/MeteorFalls_1F_2R/scripts.inc

@@ -1,184 +1,184 @@
 MeteorFalls_1F_2R_MapScripts:: @ 822C4DD
 	.byte 0
 
-MeteorFalls_1F_2R_EventScript_22C4DE:: @ 822C4DE
-	trainerbattle_single TRAINER_NICOLAS_1, MeteorFalls_1F_2R_Text_22C608, MeteorFalls_1F_2R_Text_22C678, MeteorFalls_1F_2R_EventScript_22C50A
+MeteorFalls_1F_2R_EventScript_Nicolas:: @ 822C4DE
+	trainerbattle_single TRAINER_NICOLAS_1, MeteorFalls_1F_2R_Text_NicolasIntro, MeteorFalls_1F_2R_Text_NicolasDefeat, MeteorFalls_1F_2R_EventScript_RegisterNicolas
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq MeteorFalls_1F_2R_EventScript_22C529
-	msgbox MeteorFalls_1F_2R_Text_22C6A3, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq MeteorFalls_1F_2R_EventScript_RematchNicolas
+	msgbox MeteorFalls_1F_2R_Text_NicolasPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-MeteorFalls_1F_2R_EventScript_22C50A:: @ 822C50A
+MeteorFalls_1F_2R_EventScript_RegisterNicolas:: @ 822C50A
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox MeteorFalls_1F_2R_Text_22C6F6, MSGBOX_DEFAULT
+	msgbox MeteorFalls_1F_2R_Text_NicolasRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_NICOLAS_1
 	release
 	end
 
-MeteorFalls_1F_2R_EventScript_22C529:: @ 822C529
-	trainerbattle_rematch TRAINER_NICOLAS_1, MeteorFalls_1F_2R_Text_22C73F, MeteorFalls_1F_2R_Text_22C7AD
-	msgbox MeteorFalls_1F_2R_Text_22C7D8, MSGBOX_AUTOCLOSE
+MeteorFalls_1F_2R_EventScript_RematchNicolas:: @ 822C529
+	trainerbattle_rematch TRAINER_NICOLAS_1, MeteorFalls_1F_2R_Text_NicolasRematchIntro, MeteorFalls_1F_2R_Text_NicolasRematchDefeat
+	msgbox MeteorFalls_1F_2R_Text_NicolasPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-MeteorFalls_1F_2R_EventScript_22C540:: @ 822C540
-	trainerbattle_double TRAINER_JOHN_AND_JAY_1, MeteorFalls_1F_2R_Text_22C843, MeteorFalls_1F_2R_Text_22C89C, MeteorFalls_1F_2R_Text_22C92B, MeteorFalls_1F_2R_EventScript_22C570
+MeteorFalls_1F_2R_EventScript_John:: @ 822C540
+	trainerbattle_double TRAINER_JOHN_AND_JAY_1, MeteorFalls_1F_2R_Text_JohnIntro, MeteorFalls_1F_2R_Text_JohnDefeat, MeteorFalls_1F_2R_Text_JohnNotEnoughMons, MeteorFalls_1F_2R_EventScript_RegisterJohn
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq MeteorFalls_1F_2R_EventScript_22C589
-	msgbox MeteorFalls_1F_2R_Text_22C8C1, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq MeteorFalls_1F_2R_EventScript_RematchJohn
+	msgbox MeteorFalls_1F_2R_Text_JohnPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-MeteorFalls_1F_2R_EventScript_22C570:: @ 822C570
-	msgbox MeteorFalls_1F_2R_Text_22C99C, MSGBOX_DEFAULT
+MeteorFalls_1F_2R_EventScript_RegisterJohn:: @ 822C570
+	msgbox MeteorFalls_1F_2R_Text_JohnRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_JOHN_AND_JAY_1
 	release
 	end
 
-MeteorFalls_1F_2R_EventScript_22C589:: @ 822C589
-	trainerbattle_rematch_double TRAINER_JOHN_AND_JAY_1, MeteorFalls_1F_2R_Text_22CB47, MeteorFalls_1F_2R_Text_22CBA0, MeteorFalls_1F_2R_Text_22CC27
-	msgbox MeteorFalls_1F_2R_Text_22CBC5, MSGBOX_AUTOCLOSE
+MeteorFalls_1F_2R_EventScript_RematchJohn:: @ 822C589
+	trainerbattle_rematch_double TRAINER_JOHN_AND_JAY_1, MeteorFalls_1F_2R_Text_JohnRematchIntro, MeteorFalls_1F_2R_Text_JohnRematchDefeat, MeteorFalls_1F_2R_Text_JohnRematchNotEnoughMons
+	msgbox MeteorFalls_1F_2R_Text_JohnPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-MeteorFalls_1F_2R_EventScript_22C5A4:: @ 822C5A4
-	trainerbattle_double TRAINER_JOHN_AND_JAY_1, MeteorFalls_1F_2R_Text_22C9E6, MeteorFalls_1F_2R_Text_22CA44, MeteorFalls_1F_2R_Text_22CACD, MeteorFalls_1F_2R_EventScript_22C5D4
+MeteorFalls_1F_2R_EventScript_Jay:: @ 822C5A4
+	trainerbattle_double TRAINER_JOHN_AND_JAY_1, MeteorFalls_1F_2R_Text_JayIntro, MeteorFalls_1F_2R_Text_JayDefeat, MeteorFalls_1F_2R_Text_JayNotEnoughMons, MeteorFalls_1F_2R_EventScript_RegisterJay
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq MeteorFalls_1F_2R_EventScript_22C5ED
-	msgbox MeteorFalls_1F_2R_Text_22CA70, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq MeteorFalls_1F_2R_EventScript_RematchJay
+	msgbox MeteorFalls_1F_2R_Text_JayPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-MeteorFalls_1F_2R_EventScript_22C5D4:: @ 822C5D4
-	msgbox MeteorFalls_1F_2R_Text_22C99C, MSGBOX_DEFAULT
+MeteorFalls_1F_2R_EventScript_RegisterJay:: @ 822C5D4
+	msgbox MeteorFalls_1F_2R_Text_JohnRegister, MSGBOX_DEFAULT  @ John speaks for both during register
 	register_matchcall TRAINER_JOHN_AND_JAY_1
 	release
 	end
 
-MeteorFalls_1F_2R_EventScript_22C5ED:: @ 822C5ED
-	trainerbattle_rematch_double TRAINER_JOHN_AND_JAY_1, MeteorFalls_1F_2R_Text_22CC98, MeteorFalls_1F_2R_Text_22CD08, MeteorFalls_1F_2R_Text_22CDAB
-	msgbox MeteorFalls_1F_2R_Text_22CD34, MSGBOX_AUTOCLOSE
+MeteorFalls_1F_2R_EventScript_RematchJay:: @ 822C5ED
+	trainerbattle_rematch_double TRAINER_JOHN_AND_JAY_1, MeteorFalls_1F_2R_Text_JayRematchIntro, MeteorFalls_1F_2R_Text_JayRematchDefeat, MeteorFalls_1F_2R_Text_JayRematchNotEnoughMons
+	msgbox MeteorFalls_1F_2R_Text_JayPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-MeteorFalls_1F_2R_Text_22C608: @ 822C608
+MeteorFalls_1F_2R_Text_NicolasIntro: @ 822C608
 	.string "This is where we DRAGON users do our\n"
 	.string "training.\p"
 	.string "The CHAMPION even visits.\n"
 	.string "Now do you see how special it is here?$"
 
-MeteorFalls_1F_2R_Text_22C678: @ 822C678
+MeteorFalls_1F_2R_Text_NicolasDefeat: @ 822C678
 	.string "Urgh!\n"
 	.string "I didn't expect you to be so strong!$"
 
-MeteorFalls_1F_2R_Text_22C6A3: @ 822C6A3
+MeteorFalls_1F_2R_Text_NicolasPostBattle: @ 822C6A3
 	.string "The road ahead remains long and harsh.\p"
 	.string "When will my POKéMON and I become\n"
 	.string "the best?$"
 
-MeteorFalls_1F_2R_Text_22C6F6: @ 822C6F6
+MeteorFalls_1F_2R_Text_NicolasRegister: @ 822C6F6
 	.string "I want to know more about your power.\n"
 	.string "Let me register you in my POKéNAV.$"
 
-MeteorFalls_1F_2R_Text_22C73F: @ 822C73F
+MeteorFalls_1F_2R_Text_NicolasRematchIntro: @ 822C73F
 	.string "Since we met, we have trained hard\n"
 	.string "with our sights on number one.\p"
 	.string "Help us see how much stronger we've\n"
 	.string "become!$"
 
-MeteorFalls_1F_2R_Text_22C7AD: @ 822C7AD
+MeteorFalls_1F_2R_Text_NicolasRematchDefeat: @ 822C7AD
 	.string "Urgh!\n"
 	.string "I didn't expect you to be so strong!$"
 
-MeteorFalls_1F_2R_Text_22C7D8: @ 822C7D8
+MeteorFalls_1F_2R_Text_NicolasPostRematch: @ 822C7D8
 	.string "You've obviously kept up your\n"
 	.string "POKéMON training.\p"
 	.string "So long as you remain strong, I, too,\n"
 	.string "can become stronger!$"
 
-MeteorFalls_1F_2R_Text_22C843: @ 822C843
+MeteorFalls_1F_2R_Text_JohnIntro: @ 822C843
 	.string "JOHN: We've always battled POKéMON\n"
 	.string "together as a twosome.\l"
 	.string "We've confidence in ourselves.$"
 
-MeteorFalls_1F_2R_Text_22C89C: @ 822C89C
+MeteorFalls_1F_2R_Text_JohnDefeat: @ 822C89C
 	.string "JOHN: Oh, my.\n"
 	.string "We've lost, dear wife.$"
 
-MeteorFalls_1F_2R_Text_22C8C1: @ 822C8C1
+MeteorFalls_1F_2R_Text_JohnPostBattle: @ 822C8C1
 	.string "JOHN: We've been married for\n"
 	.string "fifty years.\p"
 	.string "Come to think of it, I've yet to beat\n"
 	.string "my dear wife in a battle.$"
 
-MeteorFalls_1F_2R_Text_22C92B: @ 822C92B
+MeteorFalls_1F_2R_Text_JohnNotEnoughMons: @ 822C92B
 	.string "JOHN: Well, well, what a young TRAINER!\p"
 	.string "Will you battle with us? If so, you'll\n"
 	.string "have to return with more POKéMON.$"
 
-MeteorFalls_1F_2R_Text_22C99C: @ 822C99C
+MeteorFalls_1F_2R_Text_JohnRegister: @ 822C99C
 	.string "JOHN: Young TRAINER, if the chance\n"
 	.string "arises, will you battle with us again?$"
 
-MeteorFalls_1F_2R_Text_22C9E6: @ 822C9E6
+MeteorFalls_1F_2R_Text_JayIntro: @ 822C9E6
 	.string "JAY: We've been married for\n"
 	.string "fifty years.\p"
 	.string "The bond we share as a couple could\n"
 	.string "never be broken.$"
 
-MeteorFalls_1F_2R_Text_22CA44: @ 822CA44
+MeteorFalls_1F_2R_Text_JayDefeat: @ 822CA44
 	.string "JAY: Oh, dear.\n"
 	.string "We've lost, my dear husband.$"
 
-MeteorFalls_1F_2R_Text_22CA70: @ 822CA70
+MeteorFalls_1F_2R_Text_JayPostBattle: @ 822CA70
 	.string "JAY: Fifty years of marriage…\p"
 	.string "If we ever argued, we always settled\n"
 	.string "it with a POKéMON battle…$"
 
-MeteorFalls_1F_2R_Text_22CACD: @ 822CACD
+MeteorFalls_1F_2R_Text_JayNotEnoughMons: @ 822CACD
 	.string "JAY: Well, well, aren't you a young\n"
 	.string "TRAINER?\p"
 	.string "If you'd care to battle with us, you'll\n"
 	.string "have to come back with more POKéMON.$"
 
-MeteorFalls_1F_2R_Text_22CB47: @ 822CB47
+MeteorFalls_1F_2R_Text_JohnRematchIntro: @ 822CB47
 	.string "JOHN: We've always battled POKéMON\n"
 	.string "together as a twosome.\l"
 	.string "We've confidence in ourselves.$"
 
-MeteorFalls_1F_2R_Text_22CBA0: @ 822CBA0
+MeteorFalls_1F_2R_Text_JohnRematchDefeat: @ 822CBA0
 	.string "JOHN: Oh, my.\n"
 	.string "We've lost, dear wife.$"
 
-MeteorFalls_1F_2R_Text_22CBC5: @ 822CBC5
+MeteorFalls_1F_2R_Text_JohnPostRematch: @ 822CBC5
 	.string "JOHN: Married for fifty years…\p"
 	.string "On reflection, the dear wife and I,\n"
 	.string "we battled day in and day out…$"
 
-MeteorFalls_1F_2R_Text_22CC27: @ 822CC27
+MeteorFalls_1F_2R_Text_JohnRematchNotEnoughMons: @ 822CC27
 	.string "JOHN: Well, well, what a young TRAINER!\p"
 	.string "Will you battle with us? If so, you'll\n"
 	.string "have to return with more POKéMON.$"
 
-MeteorFalls_1F_2R_Text_22CC98: @ 822CC98
+MeteorFalls_1F_2R_Text_JayRematchIntro: @ 822CC98
 	.string "JAY: We've been married for\n"
 	.string "fifty years.\p"
 	.string "We've supported each other all that\n"
 	.string "time. We've made ourselves strong.$"
 
-MeteorFalls_1F_2R_Text_22CD08: @ 822CD08
+MeteorFalls_1F_2R_Text_JayRematchDefeat: @ 822CD08
 	.string "JAY: Oh, dear.\n"
 	.string "We've lost, my dear husband.$"
 
-MeteorFalls_1F_2R_Text_22CD34: @ 822CD34
+MeteorFalls_1F_2R_Text_JayPostRematch: @ 822CD34
 	.string "JAY: Fifty years of marriage…\n"
 	.string "Many things have happened.\p"
 	.string "I hope that we will continue to make\n"
 	.string "happy memories together.$"
 
-MeteorFalls_1F_2R_Text_22CDAB: @ 822CDAB
+MeteorFalls_1F_2R_Text_JayRematchNotEnoughMons: @ 822CDAB
 	.string "JAY: Well, well, aren't you a young\n"
 	.string "TRAINER?\p"
 	.string "If you'd care to battle with us, you'll\n"

data/maps/MeteorFalls_StevensCave/map.json

@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MeteorFalls_StevensCave_EventScript_23B182",
+      "script": "MeteorFalls_StevensCave_EventScript_Steven",
       "flag": "0"
     }
   ],

data/maps/MeteorFalls_StevensCave/scripts.inc

@@ -1,9 +1,9 @@
 MeteorFalls_StevensCave_MapScripts:: @ 823B181
 	.byte 0
 
-MeteorFalls_StevensCave_EventScript_23B182:: @ 823B182
+MeteorFalls_StevensCave_EventScript_Steven:: @ 823B182
 	lock
-	goto_if_set FLAG_DEFEATED_METEOR_FALLS_STEVEN, MeteorFalls_StevensCave_EventScript_23B1CD
+	goto_if_set FLAG_DEFEATED_METEOR_FALLS_STEVEN, MeteorFalls_StevensCave_EventScript_Defeated
 	waitse
 	playse SE_PIN
 	applymovement 1, Common_Movement_ExclamationMark
@@ -12,21 +12,21 @@ MeteorFalls_StevensCave_EventScript_23B182:: @ 823B182
 	waitmovement 0
 	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox MeteorFalls_StevensCave_Text_23B1E1, MSGBOX_DEFAULT
-	trainerbattle_no_intro TRAINER_STEVEN, MeteorFalls_StevensCave_Text_23B32D
-	msgbox MeteorFalls_StevensCave_Text_23B358, MSGBOX_DEFAULT
+	msgbox MeteorFalls_StevensCave_Text_ShouldKnowHowGoodIAmExpectWorst, MSGBOX_DEFAULT
+	trainerbattle_no_intro TRAINER_STEVEN, MeteorFalls_StevensCave_Text_StevenDefeat
+	msgbox MeteorFalls_StevensCave_Text_MyPredictionCameTrue, MSGBOX_DEFAULT
 	setflag FLAG_DEFEATED_METEOR_FALLS_STEVEN
 	release
 	end
 
-MeteorFalls_StevensCave_EventScript_23B1CD:: @ 823B1CD
+MeteorFalls_StevensCave_EventScript_Defeated:: @ 823B1CD
 	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox MeteorFalls_StevensCave_Text_23B358, MSGBOX_DEFAULT
+	msgbox MeteorFalls_StevensCave_Text_MyPredictionCameTrue, MSGBOX_DEFAULT
 	release
 	end
 
-MeteorFalls_StevensCave_Text_23B1E1: @ 823B1E1
+MeteorFalls_StevensCave_Text_ShouldKnowHowGoodIAmExpectWorst: @ 823B1E1
 	.string "STEVEN: Oh, wow, {PLAYER}{KUN}.\n"
 	.string "I'm amazed you knew where to find me.\p"
 	.string "Do you, uh…maybe think of me as\n"
@@ -39,11 +39,11 @@ MeteorFalls_StevensCave_Text_23B1E1: @ 823B1E1
 	.string "Okay, {PLAYER}{KUN}, if you're going to mount\n"
 	.string "a serious challenge, expect the worst!$"
 
-MeteorFalls_StevensCave_Text_23B32D: @ 823B32D
+MeteorFalls_StevensCave_Text_StevenDefeat: @ 823B32D
 	.string "You…\n"
 	.string "I had no idea you'd become so strong…$"
 
-MeteorFalls_StevensCave_Text_23B358: @ 823B358
+MeteorFalls_StevensCave_Text_MyPredictionCameTrue: @ 823B358
 	.string "STEVEN: Come to think of it, ever since\n"
 	.string "our paths first crossed in GRANITE\l"
 	.string "CAVE in DEWFORD, I had this feeling.\p"

data/maps/MirageTower_4F/map.json

@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MirageTower_4F_EventScript_23AD48",
+      "script": "MirageTower_4F_EventScript_RootFossil",
       "flag": "FLAG_HIDE_MIRAGE_TOWER_ROOT_FOSSIL"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MirageTower_4F_EventScript_23AD89",
+      "script": "MirageTower_4F_EventScript_ClawFossil",
       "flag": "FLAG_HIDE_MIRAGE_TOWER_CLAW_FOSSIL"
     },
     {

data/maps/MirageTower_4F/scripts.inc

@@ -1,12 +1,12 @@
 MirageTower_4F_MapScripts:: @ 823AD47
 	.byte 0
 
-MirageTower_4F_EventScript_23AD48:: @ 823AD48
+MirageTower_4F_EventScript_RootFossil:: @ 823AD48
 	lock
 	faceplayer
-	msgbox MirageTower_4F_Text_23ADF9, MSGBOX_YESNO
+	msgbox MirageTower_4F_Text_TakeRootFossil, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq MirageTower_4F_EventScript_23AD7F
+	goto_if_eq MirageTower_4F_EventScript_LeaveRootFossil
 	giveitem_std ITEM_ROOT_FOSSIL
 	closemessage
 	setflag FLAG_HIDE_MIRAGE_TOWER_ROOT_FOSSIL
@@ -14,20 +14,20 @@ MirageTower_4F_EventScript_23AD48:: @ 823AD48
 	removeobject 1
 	delay 30
 	setflag FLAG_CHOSE_ROOT_FOSSIL
-	goto MirageTower_4F_EventScript_23ADCA
+	goto MirageTower_4F_EventScript_CollapseMirageTower
 	end
 
-MirageTower_4F_EventScript_23AD7F:: @ 823AD7F
-	msgbox MirageTower_4F_Text_23AE79, MSGBOX_DEFAULT
+MirageTower_4F_EventScript_LeaveRootFossil:: @ 823AD7F
+	msgbox MirageTower_4F_Text_LeftRootFossilAlone, MSGBOX_DEFAULT
 	release
 	end
 
-MirageTower_4F_EventScript_23AD89:: @ 823AD89
+MirageTower_4F_EventScript_ClawFossil:: @ 823AD89
 	lock
 	faceplayer
-	msgbox MirageTower_4F_Text_23AE98, MSGBOX_YESNO
+	msgbox MirageTower_4F_Text_TakeClawFossil, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq MirageTower_4F_EventScript_23ADC0
+	goto_if_eq MirageTower_4F_EventScript_LeaveClawFossil
 	giveitem_std ITEM_CLAW_FOSSIL
 	closemessage
 	setflag FLAG_HIDE_MIRAGE_TOWER_CLAW_FOSSIL
@@ -35,15 +35,15 @@ MirageTower_4F_EventScript_23AD89:: @ 823AD89
 	removeobject 2
 	delay 30
 	setflag FLAG_CHOSE_CLAW_FOSSIL
-	goto MirageTower_4F_EventScript_23ADCA
+	goto MirageTower_4F_EventScript_CollapseMirageTower
 	end
 
-MirageTower_4F_EventScript_23ADC0:: @ 823ADC0
-	msgbox MirageTower_4F_Text_23AF18, MSGBOX_DEFAULT
+MirageTower_4F_EventScript_LeaveClawFossil:: @ 823ADC0
+	msgbox MirageTower_4F_Text_LeaveClawFossilAlone, MSGBOX_DEFAULT
 	release
 	end
 
-MirageTower_4F_EventScript_23ADCA:: @ 823ADCA
+MirageTower_4F_EventScript_CollapseMirageTower:: @ 823ADCA
 	setvar VAR_0x8004, 1   @ vertical pan
 	setvar VAR_0x8005, 1   @ horizontal pan
 	setvar VAR_0x8006, 32  @ num shakes
@@ -59,21 +59,21 @@ MirageTower_4F_EventScript_23ADCA:: @ 823ADCA
 	release
 	end
 
-MirageTower_4F_Text_23ADF9: @ 823ADF9
+MirageTower_4F_Text_TakeRootFossil: @ 823ADF9
 	.string "You found the ROOT FOSSIL.\p"
 	.string "If this FOSSIL is taken, the ground\n"
 	.string "around it will likely crumble away…\p"
 	.string "Take the ROOT FOSSIL anyway?$"
 
-MirageTower_4F_Text_23AE79: @ 823AE79
+MirageTower_4F_Text_LeftRootFossilAlone: @ 823AE79
 	.string "{PLAYER} left the ROOT FOSSIL alone.$"
 
-MirageTower_4F_Text_23AE98: @ 823AE98
+MirageTower_4F_Text_TakeClawFossil: @ 823AE98
 	.string "You found the CLAW FOSSIL.\p"
 	.string "If this FOSSIL is taken, the ground\n"
 	.string "around it will likely crumble away…\p"
 	.string "Take the CLAW FOSSIL anyway?$"
 
-MirageTower_4F_Text_23AF18: @ 823AF18
+MirageTower_4F_Text_LeaveClawFossilAlone: @ 823AF18
 	.string "{PLAYER} left the CLAW FOSSIL alone.$"
 

data/maps/RusturfTunnel/map.json

@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RusturfTunnel_EventScript_22CE76",
+      "script": "RusturfTunnel_EventScript_WandasBoyfriend",
       "flag": "FLAG_HIDE_RUSTURF_TUNNEL_LOVER_MAN"
     },
     {
@@ -77,7 +77,7 @@
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "0x0",
-      "flag": "FLAG_HIDE_RUSTURF_TUNNEL_OLD_MAN"
+      "flag": "FLAG_HIDE_RUSTURF_TUNNEL_BRINEY"
     },
     {
       "graphics_id": "EVENT_OBJ_GFX_AQUA_MEMBER_M",
@@ -89,7 +89,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RusturfTunnel_EventScript_22D0C2",
+      "script": "RusturfTunnel_EventScript_Grunt",
       "flag": "FLAG_HIDE_RUSTURF_TUNNEL_AQUA_GRUNT"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RusturfTunnel_EventScript_22D0AF",
+      "script": "RusturfTunnel_EventScript_Peeko",
       "flag": "FLAG_HIDE_RUSTURF_TUNNEL_PEEKO"
     },
     {
@@ -128,7 +128,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "RusturfTunnel_EventScript_22D1B1",
+      "script": "RusturfTunnel_EventScript_Mike",
       "flag": "0"
     },
     {
@@ -141,7 +141,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "RusturfTunnel_EventScript_22CE5F",
+      "script": "RusturfTunnel_EventScript_Wanda",
       "flag": "FLAG_HIDE_RUSTURF_TUNNEL_LOVER_WOMAN"
     }
   ],
@@ -176,7 +176,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "RusturfTunnel_EventScript_22D071"
+      "script": "RusturfTunnel_EventScript_TunnelBlockagePos1"
     },
     {
       "type": "trigger",
@@ -185,7 +185,7 @@
       "elevation": 3,
       "var": "VAR_RUSTURF_TUNNEL_STATE",
       "var_value": "2",
-      "script": "RusturfTunnel_EventScript_22D083"
+      "script": "RusturfTunnel_EventScript_AquaGruntBackUp"
     },
     {
       "type": "trigger",
@@ -194,7 +194,7 @@
       "elevation": 3,
       "var": "VAR_RUSTURF_TUNNEL_STATE",
       "var_value": "2",
-      "script": "RusturfTunnel_EventScript_22D083"
+      "script": "RusturfTunnel_EventScript_AquaGruntBackUp"
     },
     {
       "type": "trigger",
@@ -203,7 +203,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "RusturfTunnel_EventScript_22D077"
+      "script": "RusturfTunnel_EventScript_TunnelBlockagePos2"
     },
     {
       "type": "trigger",
@@ -212,7 +212,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "RusturfTunnel_EventScript_22D07D"
+      "script": "RusturfTunnel_EventScript_TunnelBlockagePos3"
     }
   ],
   "bg_events": []

data/maps/RusturfTunnel/scripts.inc

@@ -1,146 +1,146 @@
 RusturfTunnel_MapScripts:: @ 822CE27
 	map_script MAP_SCRIPT_ON_TRANSITION, RusturfTunnel_OnTransition
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, RusturfTunnel_MapScript2_22CE32
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, RusturfTunnel_OnFrame
 	.byte 0
 
-RusturfTunnel_MapScript2_22CE32: @ 822CE32
-	map_script_2 VAR_RUSTURF_TUNNEL_STATE, 4, RusturfTunnel_EventScript_22CEAE
-	map_script_2 VAR_RUSTURF_TUNNEL_STATE, 5, RusturfTunnel_EventScript_22CEAE
+RusturfTunnel_OnFrame: @ 822CE32
+	map_script_2 VAR_RUSTURF_TUNNEL_STATE, 4, RusturfTunnel_EventScript_ClearTunnelScene
+	map_script_2 VAR_RUSTURF_TUNNEL_STATE, 5, RusturfTunnel_EventScript_ClearTunnelScene
 	.2byte 0
 
 RusturfTunnel_OnTransition: @ 822CE44
 	compare VAR_RUSTURF_TUNNEL_STATE, 2
-	call_if_eq RusturfTunnel_EventScript_22CE50
+	call_if_eq RusturfTunnel_EventScript_SetAquaGruntAndPeekoPos
 	end
 
-RusturfTunnel_EventScript_22CE50:: @ 822CE50
+RusturfTunnel_EventScript_SetAquaGruntAndPeekoPos:: @ 822CE50
 	setobjectxyperm 7, 13, 4
 	setobjectxyperm 6, 13, 5
 	return
 
-RusturfTunnel_EventScript_22CE5F:: @ 822CE5F
+RusturfTunnel_EventScript_Wanda:: @ 822CE5F
 	lock
 	faceplayer
-	msgbox RusturfTunnel_Text_22D7A3, MSGBOX_DEFAULT
+	msgbox RusturfTunnel_Text_BoyfriendOnOtherSideOfRock, MSGBOX_DEFAULT
 	closemessage
 	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-RusturfTunnel_EventScript_22CE76:: @ 822CE76
+RusturfTunnel_EventScript_WandasBoyfriend:: @ 822CE76
 	lock
 	faceplayer
-	goto_if_set FLAG_TEMP_1, RusturfTunnel_EventScript_22CE99
+	goto_if_set FLAG_TEMP_1, RusturfTunnel_EventScript_AlreadySpokenTo
 	setflag FLAG_TEMP_1
-	msgbox RusturfTunnel_Text_22D510, MSGBOX_DEFAULT
+	msgbox RusturfTunnel_Text_WhyCantTheyKeepDigging, MSGBOX_DEFAULT
 	closemessage
 	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-RusturfTunnel_EventScript_22CE99:: @ 822CE99
-	msgbox RusturfTunnel_Text_22D5F3, MSGBOX_DEFAULT
+RusturfTunnel_EventScript_AlreadySpokenTo:: @ 822CE99
+	msgbox RusturfTunnel_Text_ToGetToVerdanturf, MSGBOX_DEFAULT
 	closemessage
 	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-RusturfTunnel_EventScript_22CEAE:: @ 822CEAE
+RusturfTunnel_EventScript_ClearTunnelScene:: @ 822CEAE
 	lockall
 	compare VAR_TEMP_1, 1
-	call_if_eq RusturfTunnel_EventScript_22CFA7
+	call_if_eq RusturfTunnel_EventScript_FaceWandasBoyfriend1
 	compare VAR_TEMP_1, 2
-	call_if_eq RusturfTunnel_EventScript_22CFBC
+	call_if_eq RusturfTunnel_EventScript_FaceWandasBoyfriend2
 	compare VAR_TEMP_1, 3
-	call_if_eq RusturfTunnel_EventScript_22CFC7
-	call RusturfTunnel_EventScript_22CFFF
-	msgbox RusturfTunnel_Text_22D65C, MSGBOX_DEFAULT
+	call_if_eq RusturfTunnel_EventScript_FaceWandasBoyfriend3
+	call RusturfTunnel_EventScript_WandasBoyfriendNotice
+	msgbox RusturfTunnel_Text_YouShatteredBoulderTakeHM, MSGBOX_DEFAULT
 	compare VAR_TEMP_1, 2
-	call_if_eq RusturfTunnel_EventScript_22CFC8
+	call_if_eq RusturfTunnel_EventScript_WandasBoyfriendApproachPlayer
 	compare VAR_TEMP_1, 3
-	call_if_eq RusturfTunnel_EventScript_22CFC8
+	call_if_eq RusturfTunnel_EventScript_WandasBoyfriendApproachPlayer
 	giveitem_std ITEM_HM04
 	setflag FLAG_RECEIVED_HM04
-	msgbox RusturfTunnel_Text_22D6D2, MSGBOX_DEFAULT
+	msgbox RusturfTunnel_Text_ExplainStrength, MSGBOX_DEFAULT
 	closemessage
 	compare VAR_TEMP_1, 1
-	call_if_eq RusturfTunnel_EventScript_22CF5D
+	call_if_eq RusturfTunnel_EventScript_BoyfriendApproachWanda1
 	compare VAR_TEMP_1, 2
-	call_if_eq RusturfTunnel_EventScript_22CF6F
+	call_if_eq RusturfTunnel_EventScript_BoyfriendApproachWanda2
 	compare VAR_TEMP_1, 3
-	call_if_eq RusturfTunnel_EventScript_22CF8B
-	msgbox RusturfTunnel_Text_22D745, MSGBOX_DEFAULT
+	call_if_eq RusturfTunnel_EventScript_BoyfriendApproachWanda3
+	msgbox RusturfTunnel_Text_WandaReunion, MSGBOX_DEFAULT
 	closemessage
 	compare VAR_TEMP_1, 1
-	call_if_eq RusturfTunnel_EventScript_22CFD4
+	call_if_eq RusturfTunnel_EventScript_WandaAndBoyfriendExit1
 	compare VAR_TEMP_1, 2
-	call_if_eq RusturfTunnel_EventScript_22CFE6
+	call_if_eq RusturfTunnel_EventScript_WandaAndBoyfriendExit
 	compare VAR_TEMP_1, 3
-	call_if_eq RusturfTunnel_EventScript_22CFE6
-	call RusturfTunnel_EventScript_272216
+	call_if_eq RusturfTunnel_EventScript_WandaAndBoyfriendExit
+	call RusturfTunnel_EventScript_SetRusturfTunnelOpen
 	releaseall
 	end
 
-RusturfTunnel_EventScript_22CF5D:: @ 822CF5D
-	applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_22D042
-	applymovement 1, RusturfTunnel_Movement_22D067
+RusturfTunnel_EventScript_BoyfriendApproachWanda1:: @ 822CF5D
+	applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_PlayerWatchBoyfriend1
+	applymovement 1, RusturfTunnel_Movement_BoyfriendApproachWanda1
 	waitmovement 0
 	return
 
-RusturfTunnel_EventScript_22CF6F:: @ 822CF6F
-	applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_22D045
-	applymovement 1, RusturfTunnel_Movement_22D06C
+RusturfTunnel_EventScript_BoyfriendApproachWanda2:: @ 822CF6F
+	applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_PlayerWatchBoyfriend
+	applymovement 1, RusturfTunnel_Movement_BoyfriendApproachWanda
 	waitmovement 0
 	applymovement 10, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	return
 
-RusturfTunnel_EventScript_22CF8B:: @ 822CF8B
-	applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_22D045
-	applymovement 1, RusturfTunnel_Movement_22D06C
+RusturfTunnel_EventScript_BoyfriendApproachWanda3:: @ 822CF8B
+	applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_PlayerWatchBoyfriend
+	applymovement 1, RusturfTunnel_Movement_BoyfriendApproachWanda
 	waitmovement 0
 	applymovement 10, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	return
 
-RusturfTunnel_EventScript_22CFA7:: @ 822CFA7
+RusturfTunnel_EventScript_FaceWandasBoyfriend1:: @ 822CFA7
 	applymovement 1, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	return
 
-RusturfTunnel_EventScript_22CFBC:: @ 822CFBC
-	applymovement 1, RusturfTunnel_Movement_22D048
+RusturfTunnel_EventScript_FaceWandasBoyfriend2:: @ 822CFBC
+	applymovement 1, RusturfTunnel_Movement_BoyfriendFaceRight
 	waitmovement 0
 	return
 
-RusturfTunnel_EventScript_22CFC7:: @ 822CFC7
+RusturfTunnel_EventScript_FaceWandasBoyfriend3:: @ 822CFC7
 	return
 
-RusturfTunnel_EventScript_22CFC8:: @ 822CFC8
+RusturfTunnel_EventScript_WandasBoyfriendApproachPlayer:: @ 822CFC8
 	closemessage
-	applymovement 1, RusturfTunnel_Movement_22D065
+	applymovement 1, RusturfTunnel_Movement_WandasBoyfriendApproachPlayer
 	waitmovement 0
 	return
 
-RusturfTunnel_EventScript_22CFD4:: @ 822CFD4
-	applymovement 10, RusturfTunnel_Movement_22D017
-	applymovement 1, RusturfTunnel_Movement_22D04B
+RusturfTunnel_EventScript_WandaAndBoyfriendExit1:: @ 822CFD4
+	applymovement 10, RusturfTunnel_Movement_WandaExit1
+	applymovement 1, RusturfTunnel_Movement_WandasBoyfriendExit1
 	waitmovement 0
 	return
 
-RusturfTunnel_EventScript_22CFE6:: @ 822CFE6
-	applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_22D02F
-	applymovement 10, RusturfTunnel_Movement_22D023
-	applymovement 1, RusturfTunnel_Movement_22D058
+RusturfTunnel_EventScript_WandaAndBoyfriendExit:: @ 822CFE6
+	applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_PlayerWatchWandaExit
+	applymovement 10, RusturfTunnel_Movement_WandaExit
+	applymovement 1, RusturfTunnel_Movement_WandasBoyfriendExit
 	waitmovement 0
 	return
 
-RusturfTunnel_EventScript_22CFFF:: @ 822CFFF
+RusturfTunnel_EventScript_WandasBoyfriendNotice:: @ 822CFFF
 	playse SE_PIN
 	applymovement 1, Common_Movement_ExclamationMark
 	waitmovement 0
@@ -148,7 +148,7 @@ RusturfTunnel_EventScript_22CFFF:: @ 822CFFF
 	waitmovement 0
 	return
 
-RusturfTunnel_Movement_22D017: @ 822D017
+RusturfTunnel_Movement_WandaExit1: @ 822D017
 	walk_right
 	walk_right
 	walk_right
@@ -162,7 +162,7 @@ RusturfTunnel_Movement_22D017: @ 822D017
 	walk_down
 	step_end
 
-RusturfTunnel_Movement_22D023: @ 822D023
+RusturfTunnel_Movement_WandaExit: @ 822D023
 	walk_right
 	walk_right
 	walk_right
@@ -176,7 +176,7 @@ RusturfTunnel_Movement_22D023: @ 822D023
 	walk_down
 	step_end
 
-RusturfTunnel_Movement_22D02F: @ 822D02F
+RusturfTunnel_Movement_PlayerWatchWandaExit: @ 822D02F
 	delay_8
 	walk_in_place_fastest_up
 	delay_16
@@ -184,11 +184,13 @@ RusturfTunnel_Movement_22D02F: @ 822D02F
 	walk_in_place_fastest_right
 	step_end
 
+@ Unused
 RusturfTunnel_Movement_22D035: @ 822D035
 	walk_left
 	walk_in_place_fastest_right
 	step_end
 
+@ Unused
 RusturfTunnel_Movement_22D038: @ 822D038
 	walk_down
 	walk_in_place_fastest_up
@@ -196,6 +198,7 @@ RusturfTunnel_Movement_22D038: @ 822D038
 	walk_in_place_fastest_right
 	step_end
 
+@ Unused
 RusturfTunnel_Movement_22D03D: @ 822D03D
 	walk_up
 	walk_in_place_fastest_down
@@ -203,22 +206,22 @@ RusturfTunnel_Movement_22D03D: @ 822D03D
 	walk_in_place_fastest_right
 	step_end
 
-RusturfTunnel_Movement_22D042: @ 822D042
+RusturfTunnel_Movement_PlayerWatchBoyfriend1: @ 822D042
 	walk_left
 	walk_in_place_fastest_right
 	step_end
 
-RusturfTunnel_Movement_22D045: @ 822D045
+RusturfTunnel_Movement_PlayerWatchBoyfriend: @ 822D045
 	walk_right
 	walk_in_place_fastest_left
 	step_end
 
-RusturfTunnel_Movement_22D048: @ 822D048
+RusturfTunnel_Movement_BoyfriendFaceRight: @ 822D048
 	walk_up
 	walk_in_place_fastest_right
 	step_end
 
-RusturfTunnel_Movement_22D04B: @ 822D04B
+RusturfTunnel_Movement_WandasBoyfriendExit1: @ 822D04B
 	walk_right
 	walk_right
 	walk_right
@@ -233,7 +236,7 @@ RusturfTunnel_Movement_22D04B: @ 822D04B
 	walk_down
 	step_end
 
-RusturfTunnel_Movement_22D058: @ 822D058
+RusturfTunnel_Movement_WandasBoyfriendExit: @ 822D058
 	walk_up
 	walk_right
 	walk_right
@@ -248,42 +251,42 @@ RusturfTunnel_Movement_22D058: @ 822D058
 	walk_down
 	step_end
 
-RusturfTunnel_Movement_22D065: @ 822D065
+RusturfTunnel_Movement_WandasBoyfriendApproachPlayer: @ 822D065
 	walk_right
 	step_end
 
-RusturfTunnel_Movement_22D067: @ 822D067
+RusturfTunnel_Movement_BoyfriendApproachWanda1: @ 822D067
 	walk_in_place_fast_up
 	walk_in_place_fast_up
 	walk_fast_up
 	walk_fast_right
 	step_end
 
-RusturfTunnel_Movement_22D06C: @ 822D06C
+RusturfTunnel_Movement_BoyfriendApproachWanda: @ 822D06C
 	walk_in_place_fast_right
 	walk_in_place_fast_right
 	walk_fast_right
 	walk_in_place_fastest_up
 	step_end
 
-RusturfTunnel_EventScript_22D071:: @ 822D071
+RusturfTunnel_EventScript_TunnelBlockagePos1:: @ 822D071
 	setvar VAR_TEMP_1, 1
 	end
 
-RusturfTunnel_EventScript_22D077:: @ 822D077
+RusturfTunnel_EventScript_TunnelBlockagePos2:: @ 822D077
 	setvar VAR_TEMP_1, 2
 	end
 
-RusturfTunnel_EventScript_22D07D:: @ 822D07D
+RusturfTunnel_EventScript_TunnelBlockagePos3:: @ 822D07D
 	setvar VAR_TEMP_1, 3
 	end
 
-RusturfTunnel_EventScript_22D083:: @ 822D083
+RusturfTunnel_EventScript_AquaGruntBackUp:: @ 822D083
 	lockall
-	msgbox RusturfTunnel_Text_22D1C8, MSGBOX_DEFAULT
+	msgbox RusturfTunnel_Text_ComeAndGetSome, MSGBOX_DEFAULT
 	closemessage
-	applymovement 6, RusturfTunnel_Movement_22D0AB
-	applymovement 7, RusturfTunnel_Movement_22D0AB
+	applymovement 6, RusturfTunnel_Movement_GruntAndPeekoBackUp
+	applymovement 7, RusturfTunnel_Movement_GruntAndPeekoBackUp
 	waitmovement 0
 	copyobjectxytoperm 6
 	copyobjectxytoperm 7
@@ -291,55 +294,55 @@ RusturfTunnel_EventScript_22D083:: @ 822D083
 	releaseall
 	end
 
-RusturfTunnel_Movement_22D0AB: @ 822D0AB
+RusturfTunnel_Movement_GruntAndPeekoBackUp: @ 822D0AB
 	lock_facing_direction
 	walk_right
 	unlock_facing_direction
 	step_end
 
-RusturfTunnel_EventScript_22D0AF:: @ 822D0AF
+RusturfTunnel_EventScript_Peeko:: @ 822D0AF
 	lock
 	faceplayer
 	waitse
 	playmoncry SPECIES_WINGULL, 0
-	msgbox RusturfTunnel_Text_22D1F7, MSGBOX_DEFAULT
+	msgbox RusturfTunnel_Text_Peeko, MSGBOX_DEFAULT
 	waitmoncry
 	release
 	end
 
-RusturfTunnel_EventScript_22D0C2:: @ 822D0C2
+RusturfTunnel_EventScript_Grunt:: @ 822D0C2
 	lock
 	faceplayer
 	playbgm MUS_AQA_0, 0
-	msgbox RusturfTunnel_Text_22D20A, MSGBOX_DEFAULT
-	trainerbattle_no_intro TRAINER_GRUNT_RUSTURF_TUNNEL, RusturfTunnel_Text_22D2B0
-	msgbox RusturfTunnel_Text_22D2E1, MSGBOX_DEFAULT
+	msgbox RusturfTunnel_Text_GruntIntro, MSGBOX_DEFAULT
+	trainerbattle_no_intro TRAINER_GRUNT_RUSTURF_TUNNEL, RusturfTunnel_Text_GruntDefeat
+	msgbox RusturfTunnel_Text_GruntTakePackage, MSGBOX_DEFAULT
 	giveitem_std ITEM_DEVON_GOODS
 	closemessage
-	applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_22D178
-	applymovement 6, RusturfTunnel_Movement_22D181
+	applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_PushPlayerAsideForGrunt
+	applymovement 6, RusturfTunnel_Movement_GruntEscape
 	waitmovement 0
 	removeobject 6
 	delay 50
 	addobject 5
-	applymovement 5, RusturfTunnel_Movement_22D18B
+	applymovement 5, RusturfTunnel_Movement_BrineyApproachPeeko1
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_22D17E
-	applymovement 5, RusturfTunnel_Movement_22D1A4
+	applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_PlayerMoveAsideForBriney
+	applymovement 5, RusturfTunnel_Movement_BrineyApproachPeeko2
 	waitmovement 0
-	msgbox RusturfTunnel_Text_22D395, MSGBOX_DEFAULT
+	msgbox RusturfTunnel_Text_PeekoGladToSeeYouSafe, MSGBOX_DEFAULT
 	applymovement 5, Common_Movement_FacePlayer
 	waitmovement 0
-	message RusturfTunnel_Text_22D3BA
+	message RusturfTunnel_Text_ThankYouLetsGoHomePeeko
 	waitmessage
 	waitse
 	playmoncry SPECIES_WINGULL, 0
 	waitbuttonpress
 	waitmoncry
 	closemessage
-	applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_22D19F
-	applymovement 5, RusturfTunnel_Movement_22D193
-	applymovement 7, RusturfTunnel_Movement_22D1A7
+	applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_PlayerWatchBrineyExit
+	applymovement 5, RusturfTunnel_Movement_BrineyExit
+	applymovement 7, RusturfTunnel_Movement_PeekoExit
 	waitmovement 0
 	removeobject 5
 	removeobject 7
@@ -351,7 +354,7 @@ RusturfTunnel_EventScript_22D0C2:: @ 822D0C2
 	release
 	end
 
-RusturfTunnel_Movement_22D178: @ 822D178
+RusturfTunnel_Movement_PushPlayerAsideForGrunt: @ 822D178
 	face_down
 	lock_facing_direction
 	walk_up
@@ -359,12 +362,12 @@ RusturfTunnel_Movement_22D178: @ 822D178
 	walk_in_place_fastest_left
 	step_end
 
-RusturfTunnel_Movement_22D17E: @ 822D17E
+RusturfTunnel_Movement_PlayerMoveAsideForBriney: @ 822D17E
 	walk_down
 	walk_in_place_fastest_up
 	step_end
 
-RusturfTunnel_Movement_22D181: @ 822D181
+RusturfTunnel_Movement_GruntEscape: @ 822D181
 	walk_fast_left
 	walk_fast_left
 	walk_fast_left
@@ -376,7 +379,7 @@ RusturfTunnel_Movement_22D181: @ 822D181
 	walk_fast_left
 	step_end
 
-RusturfTunnel_Movement_22D18B: @ 822D18B
+RusturfTunnel_Movement_BrineyApproachPeeko1: @ 822D18B
 	walk_right
 	walk_right
 	walk_right
@@ -386,7 +389,7 @@ RusturfTunnel_Movement_22D18B: @ 822D18B
 	walk_right
 	step_end
 
-RusturfTunnel_Movement_22D193: @ 822D193
+RusturfTunnel_Movement_BrineyExit: @ 822D193
 	walk_left
 	walk_left
 	walk_left
@@ -400,19 +403,19 @@ RusturfTunnel_Movement_22D193: @ 822D193
 	walk_left
 	step_end
 
-RusturfTunnel_Movement_22D19F: @ 822D19F
+RusturfTunnel_Movement_PlayerWatchBrineyExit: @ 822D19F
 	delay_16
 	delay_8
 	delay_4
 	walk_in_place_fastest_left
 	step_end
 
-RusturfTunnel_Movement_22D1A4: @ 822D1A4
+RusturfTunnel_Movement_BrineyApproachPeeko2: @ 822D1A4
 	delay_16
 	walk_right
 	step_end
 
-RusturfTunnel_Movement_22D1A7: @ 822D1A7
+RusturfTunnel_Movement_PeekoExit: @ 822D1A7
 	walk_left
 	walk_left
 	walk_left
@@ -424,19 +427,19 @@ RusturfTunnel_Movement_22D1A7: @ 822D1A7
 	walk_left
 	step_end
 
-RusturfTunnel_EventScript_22D1B1:: @ 822D1B1
-	trainerbattle_single TRAINER_MIKE_2, RusturfTunnel_Text_22D84D, RusturfTunnel_Text_22D8DB
-	msgbox RusturfTunnel_Text_22D8F9, MSGBOX_AUTOCLOSE
+RusturfTunnel_EventScript_Mike:: @ 822D1B1
+	trainerbattle_single TRAINER_MIKE_2, RusturfTunnel_Text_MikeIntro, RusturfTunnel_Text_MikeDefeat
+	msgbox RusturfTunnel_Text_MikePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-RusturfTunnel_Text_22D1C8: @ 822D1C8
+RusturfTunnel_Text_ComeAndGetSome: @ 822D1C8
 	.string "What, are you coming?\n"
 	.string "Come and get some, then!$"
 
-RusturfTunnel_Text_22D1F7: @ 822D1F7
+RusturfTunnel_Text_Peeko: @ 822D1F7
 	.string "PEEKO: Pii pihyoh!$"
 
-RusturfTunnel_Text_22D20A: @ 822D20A
+RusturfTunnel_Text_GruntIntro: @ 822D20A
 	.string "Grah, keelhaul it all!\p"
 	.string "That hostage POKéMON turned out to\n"
 	.string "be worthless!\p"
@@ -445,11 +448,11 @@ RusturfTunnel_Text_22D20A: @ 822D20A
 	.string "Hey! You!\n"
 	.string "So you want to battle me?$"
 
-RusturfTunnel_Text_22D2B0: @ 822D2B0
+RusturfTunnel_Text_GruntDefeat: @ 822D2B0
 	.string "Urrrggh! My career in crime comes to\n"
 	.string "a dead end!$"
 
-RusturfTunnel_Text_22D2E1: @ 822D2E1
+RusturfTunnel_Text_GruntTakePackage: @ 822D2E1
 	.string "This is plain not right…\p"
 	.string "The BOSS told me this would be a\n"
 	.string "slick-and-easy job to pull.\p"
@@ -458,11 +461,11 @@ RusturfTunnel_Text_22D2E1: @ 822D2E1
 	.string "Tch!\n"
 	.string "You want it back that badly, take it!$"
 
-RusturfTunnel_Text_22D395: @ 822D395
+RusturfTunnel_Text_PeekoGladToSeeYouSafe: @ 822D395
 	.string "PEEKO!\n"
 	.string "Am I glad to see you're safe!$"
 
-RusturfTunnel_Text_22D3BA: @ 822D3BA
+RusturfTunnel_Text_ThankYouLetsGoHomePeeko: @ 822D3BA
 	.string "PEEKO owes her life to you!\p"
 	.string "They call me MR. BRINEY.\n"
 	.string "And, you are?\p"
@@ -478,7 +481,7 @@ RusturfTunnel_Text_22D3BA: @ 822D3BA
 	.string "home.\p"
 	.string "PEEKO: Pihyoh!$"
 
-RusturfTunnel_Text_22D510: @ 822D510
+RusturfTunnel_Text_WhyCantTheyKeepDigging: @ 822D510
 	.string "… …\p"
 	.string "Why can't they keep digging?\n"
 	.string "Is the bedrock too hard?\p"
@@ -490,30 +493,30 @@ RusturfTunnel_Text_22D510: @ 822D510
 	.string "But this…\n"
 	.string "What am I to do?$"
 
-RusturfTunnel_Text_22D5F3: @ 822D5F3
+RusturfTunnel_Text_ToGetToVerdanturf: @ 822D5F3
 	.string "To get from RUSTBORO to VERDANTURF,\n"
 	.string "you need to go to DEWFORD, then pass\l"
 	.string "through SLATEPORT and MAUVILLE…$"
 
-RusturfTunnel_Text_22D65C: @ 822D65C
+RusturfTunnel_Text_YouShatteredBoulderTakeHM: @ 822D65C
 	.string "Wow! You shattered that boulder\n"
 	.string "blocking the way.\p"
 	.string "To show you how much I appreciate it,\n"
 	.string "I'd like you to have this HM.$"
 
-RusturfTunnel_Text_22D6D2: @ 822D6D2
+RusturfTunnel_Text_ExplainStrength: @ 822D6D2
 	.string "That HM contains STRENGTH.\p"
 	.string "If a muscular POKéMON were to learn\n"
 	.string "that, it would be able to move even\l"
 	.string "large boulders.$"
 
-RusturfTunnel_Text_22D745: @ 822D745
+RusturfTunnel_Text_WandaReunion: @ 822D745
 	.string "WANDA!\n"
 	.string "Now I can see you anytime!\p"
 	.string "WANDA: That's…wonderful.\p"
 	.string "Please, take some rest at my home.$"
 
-RusturfTunnel_Text_22D7A3: @ 822D7A3
+RusturfTunnel_Text_BoyfriendOnOtherSideOfRock: @ 822D7A3
 	.string "On the other side of this rock…\n"
 	.string "My boyfriend is there.\p"
 	.string "He… He's not just digging the tunnel\n"
@@ -521,17 +524,17 @@ RusturfTunnel_Text_22D7A3: @ 822D7A3
 	.string "He works his hands raw and rough\n"
 	.string "for the benefit of everyone.$"
 
-RusturfTunnel_Text_22D84D: @ 822D84D
+RusturfTunnel_Text_MikeIntro: @ 822D84D
 	.string "What do you call a wild man up in the\n"
 	.string "mountains? A mountain man, right?\p"
 	.string "So why don't they call a POKéMON in\n"
 	.string "the mountains a mountain POKéMON?$"
 
-RusturfTunnel_Text_22D8DB: @ 822D8DB
+RusturfTunnel_Text_MikeDefeat: @ 822D8DB
 	.string "My POKéMON…\n"
 	.string "Ran out of power…$"
 
-RusturfTunnel_Text_22D8F9: @ 822D8F9
+RusturfTunnel_Text_MikePostBattle: @ 822D8F9
 	.string "They halted development here to\n"
 	.string "protect POKéMON, right?\l"
 	.string "There's a feel-good story!$"

data/maps/SealedChamber_InnerRoom/map.json

@@ -31,7 +31,7 @@
       "y": 4,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SealedChamber_InnerRoom_EventScript_2391F8"
+      "script": "SealedChamber_InnerRoom_EventScript_BrailleBackWall"
     },
     {
       "type": "sign",
@@ -39,7 +39,7 @@
       "y": 8,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SealedChamber_InnerRoom_EventScript_239255"
+      "script": "SealedChamber_InnerRoom_EventScript_BrailleStoryPart1"
     },
     {
       "type": "sign",
@@ -47,7 +47,7 @@
       "y": 8,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SealedChamber_InnerRoom_EventScript_23925F"
+      "script": "SealedChamber_InnerRoom_EventScript_BrailleStoryPart2"
     },
     {
       "type": "sign",
@@ -55,7 +55,7 @@
       "y": 13,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SealedChamber_InnerRoom_EventScript_239269"
+      "script": "SealedChamber_InnerRoom_EventScript_BrailleStoryPart3"
     },
     {
       "type": "sign",
@@ -63,7 +63,7 @@
       "y": 13,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SealedChamber_InnerRoom_EventScript_239273"
+      "script": "SealedChamber_InnerRoom_EventScript_BrailleStoryPart4"
     },
     {
       "type": "sign",
@@ -71,7 +71,7 @@
       "y": 18,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SealedChamber_InnerRoom_EventScript_23927D"
+      "script": "SealedChamber_InnerRoom_EventScript_BrailleStoryPart5"
     },
     {
       "type": "sign",
@@ -79,7 +79,7 @@
       "y": 18,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SealedChamber_InnerRoom_EventScript_239287"
+      "script": "SealedChamber_InnerRoom_EventScript_BrailleStoryPart6"
     },
     {
       "type": "sign",
@@ -87,7 +87,7 @@
       "y": 4,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SealedChamber_InnerRoom_EventScript_2391F8"
+      "script": "SealedChamber_InnerRoom_EventScript_BrailleBackWall"
     },
     {
       "type": "sign",
@@ -95,7 +95,7 @@
       "y": 4,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SealedChamber_InnerRoom_EventScript_2391F8"
+      "script": "SealedChamber_InnerRoom_EventScript_BrailleBackWall"
     }
   ]
 }

data/maps/SealedChamber_InnerRoom/scripts.inc

@@ -1,15 +1,15 @@
 SealedChamber_InnerRoom_MapScripts:: @ 82391F7
 	.byte 0
 
-SealedChamber_InnerRoom_EventScript_2391F8:: @ 82391F8
+SealedChamber_InnerRoom_EventScript_BrailleBackWall:: @ 82391F8
 	lockall
-	braillemessage SealedChamber_InnerRoom_Braille_2A6B99
+	braillemessage SealedChamber_InnerRoom_Braille_FirstWailordLastRelicanth
 	waitbuttonpress
 	closebraillemessage
-	goto_if_set FLAG_REGI_DOORS_OPENED, SealedChamber_InnerRoom_EventScript_239253
+	goto_if_set FLAG_REGI_DOORS_OPENED, SealedChamber_InnerRoom_EventScript_NoEffect
 	specialvar VAR_RESULT, CheckRelicanthWailord
-	compare VAR_RESULT, 0
-	goto_if_eq SealedChamber_InnerRoom_EventScript_239253
+	compare VAR_RESULT, FALSE
+	goto_if_eq SealedChamber_InnerRoom_EventScript_NoEffect
 	fadeoutbgm 0
 	playse SE_TRACK_MOVE
 	special DoSealedChamberShakingEffect1
@@ -34,53 +34,53 @@ SealedChamber_InnerRoom_EventScript_2391F8:: @ 82391F8
 	releaseall
 	end
 
-SealedChamber_InnerRoom_EventScript_239253:: @ 8239253
+SealedChamber_InnerRoom_EventScript_NoEffect:: @ 8239253
 	releaseall
 	end
 
-SealedChamber_InnerRoom_EventScript_239255:: @ 8239255
+SealedChamber_InnerRoom_EventScript_BrailleStoryPart1:: @ 8239255
 	lockall
-	braillemessage SealedChamber_InnerRoom_Braille_2A6BCA
+	braillemessage SealedChamber_InnerRoom_Braille_InThisCaveWeHaveLived
 	waitbuttonpress
 	closebraillemessage
 	releaseall
 	end
 
-SealedChamber_InnerRoom_EventScript_23925F:: @ 823925F
+SealedChamber_InnerRoom_EventScript_BrailleStoryPart2:: @ 823925F
 	lockall
-	braillemessage SealedChamber_InnerRoom_Braille_2A6BEC
+	braillemessage SealedChamber_InnerRoom_Braille_WeOweAllToThePokemon
 	waitbuttonpress
 	closebraillemessage
 	releaseall
 	end
 
-SealedChamber_InnerRoom_EventScript_239269:: @ 8239269
+SealedChamber_InnerRoom_EventScript_BrailleStoryPart3:: @ 8239269
 	lockall
-	braillemessage SealedChamber_InnerRoom_Braille_2A6C0D
+	braillemessage SealedChamber_InnerRoom_Braille_ButWeSealedThePokemonAway
 	waitbuttonpress
 	closebraillemessage
 	releaseall
 	end
 
-SealedChamber_InnerRoom_EventScript_239273:: @ 8239273
+SealedChamber_InnerRoom_EventScript_BrailleStoryPart4:: @ 8239273
 	lockall
-	braillemessage SealedChamber_InnerRoom_Braille_2A6C34
+	braillemessage SealedChamber_InnerRoom_Braille_WeFearedIt
 	waitbuttonpress
 	closebraillemessage
 	releaseall
 	end
 
-SealedChamber_InnerRoom_EventScript_23927D:: @ 823927D
+SealedChamber_InnerRoom_EventScript_BrailleStoryPart5:: @ 823927D
 	lockall
-	braillemessage SealedChamber_InnerRoom_Braille_2A6C48
+	braillemessage SealedChamber_InnerRoom_Braille_ThoseWithCourageHope
 	waitbuttonpress
 	closebraillemessage
 	releaseall
 	end
 
-SealedChamber_InnerRoom_EventScript_239287:: @ 8239287
+SealedChamber_InnerRoom_EventScript_BrailleStoryPart6:: @ 8239287
 	lockall
-	braillemessage SealedChamber_InnerRoom_Braille_2A6C73
+	braillemessage SealedChamber_InnerRoom_Braille_OpenDoorEternalPokemonWaits
 	waitbuttonpress
 	closebraillemessage
 	releaseall

data/maps/SealedChamber_OuterRoom/map.json

@@ -31,7 +31,7 @@
       "y": 6,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SealedChamber_OuterRoom_EventScript_23916C"
+      "script": "SealedChamber_OuterRoom_EventScript_BrailleABC"
     },
     {
       "type": "sign",
@@ -39,7 +39,7 @@
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SealedChamber_OuterRoom_EventScript_239176"
+      "script": "SealedChamber_OuterRoom_EventScript_BrailleGHI"
     },
     {
       "type": "sign",
@@ -47,7 +47,7 @@
       "y": 12,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SealedChamber_OuterRoom_EventScript_239180"
+      "script": "SealedChamber_OuterRoom_EventScript_BrailleMNO"
     },
     {
       "type": "sign",
@@ -55,7 +55,7 @@
       "y": 15,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SealedChamber_OuterRoom_EventScript_23918A"
+      "script": "SealedChamber_OuterRoom_EventScript_BrailleTUV"
     },
     {
       "type": "sign",
@@ -63,7 +63,7 @@
       "y": 6,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SealedChamber_OuterRoom_EventScript_239194"
+      "script": "SealedChamber_OuterRoom_EventScript_BrailleDEF"
     },
     {
       "type": "sign",
@@ -71,7 +71,7 @@
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SealedChamber_OuterRoom_EventScript_23919E"
+      "script": "SealedChamber_OuterRoom_EventScript_BrailleJKL"
     },
     {
       "type": "sign",
@@ -79,7 +79,7 @@
       "y": 12,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SealedChamber_OuterRoom_EventScript_2391A8"
+      "script": "SealedChamber_OuterRoom_EventScript_BraillePQRS"
     },
     {
       "type": "sign",
@@ -87,7 +87,7 @@
       "y": 15,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SealedChamber_OuterRoom_EventScript_2391BC"
+      "script": "SealedChamber_OuterRoom_EventScript_BrailleWXYZ"
     },
     {
       "type": "sign",
@@ -95,7 +95,7 @@
       "y": 6,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SealedChamber_OuterRoom_EventScript_2391B2"
+      "script": "SealedChamber_OuterRoom_EventScript_BraillePeriod"
     },
     {
       "type": "sign",
@@ -103,7 +103,7 @@
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SealedChamber_OuterRoom_EventScript_2391C6"
+      "script": "SealedChamber_OuterRoom_EventScript_BrailleComma"
     },
     {
       "type": "sign",
@@ -111,7 +111,7 @@
       "y": 2,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SealedChamber_OuterRoom_EventScript_2391D0"
+      "script": "SealedChamber_OuterRoom_EventScript_InnerRoomEntranceWall"
     },
     {
       "type": "sign",
@@ -119,7 +119,7 @@
       "y": 6,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SealedChamber_OuterRoom_EventScript_23916C"
+      "script": "SealedChamber_OuterRoom_EventScript_BrailleABC"
     },
     {
       "type": "sign",
@@ -127,7 +127,7 @@
       "y": 6,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SealedChamber_OuterRoom_EventScript_23916C"
+      "script": "SealedChamber_OuterRoom_EventScript_BrailleABC"
     },
     {
       "type": "sign",
@@ -135,7 +135,7 @@
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SealedChamber_OuterRoom_EventScript_239176"
+      "script": "SealedChamber_OuterRoom_EventScript_BrailleGHI"
     },
     {
       "type": "sign",
@@ -143,7 +143,7 @@
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SealedChamber_OuterRoom_EventScript_239176"
+      "script": "SealedChamber_OuterRoom_EventScript_BrailleGHI"
     },
     {
       "type": "sign",
@@ -151,7 +151,7 @@
       "y": 12,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SealedChamber_OuterRoom_EventScript_239180"
+      "script": "SealedChamber_OuterRoom_EventScript_BrailleMNO"
     },
     {
       "type": "sign",
@@ -159,7 +159,7 @@
       "y": 12,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SealedChamber_OuterRoom_EventScript_239180"
+      "script": "SealedChamber_OuterRoom_EventScript_BrailleMNO"
     },
     {
       "type": "sign",
@@ -167,7 +167,7 @@
       "y": 15,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SealedChamber_OuterRoom_EventScript_23918A"
+      "script": "SealedChamber_OuterRoom_EventScript_BrailleTUV"
     },
     {
       "type": "sign",
@@ -175,7 +175,7 @@
       "y": 15,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SealedChamber_OuterRoom_EventScript_23918A"
+      "script": "SealedChamber_OuterRoom_EventScript_BrailleTUV"
     },
     {
       "type": "sign",
@@ -183,7 +183,7 @@
       "y": 6,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SealedChamber_OuterRoom_EventScript_239194"
+      "script": "SealedChamber_OuterRoom_EventScript_BrailleDEF"
     },
     {
       "type": "sign",
@@ -191,7 +191,7 @@
       "y": 6,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SealedChamber_OuterRoom_EventScript_239194"
+      "script": "SealedChamber_OuterRoom_EventScript_BrailleDEF"
     },
     {
       "type": "sign",
@@ -199,7 +199,7 @@
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SealedChamber_OuterRoom_EventScript_23919E"
+      "script": "SealedChamber_OuterRoom_EventScript_BrailleJKL"
     },
     {
       "type": "sign",
@@ -207,7 +207,7 @@
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SealedChamber_OuterRoom_EventScript_23919E"
+      "script": "SealedChamber_OuterRoom_EventScript_BrailleJKL"
     },
     {
       "type": "sign",
@@ -215,7 +215,7 @@
       "y": 12,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SealedChamber_OuterRoom_EventScript_2391A8"
+      "script": "SealedChamber_OuterRoom_EventScript_BraillePQRS"
     },
     {
       "type": "sign",
@@ -223,7 +223,7 @@
       "y": 12,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SealedChamber_OuterRoom_EventScript_2391A8"
+      "script": "SealedChamber_OuterRoom_EventScript_BraillePQRS"
     },
     {
       "type": "sign",
@@ -231,7 +231,7 @@
       "y": 15,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SealedChamber_OuterRoom_EventScript_2391BC"
+      "script": "SealedChamber_OuterRoom_EventScript_BrailleWXYZ"
     },
     {
       "type": "sign",
@@ -239,7 +239,7 @@
       "y": 15,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SealedChamber_OuterRoom_EventScript_2391BC"
+      "script": "SealedChamber_OuterRoom_EventScript_BrailleWXYZ"
     },
     {
       "type": "sign",
@@ -247,7 +247,7 @@
       "y": 2,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SealedChamber_OuterRoom_EventScript_2391ED"
+      "script": "SealedChamber_OuterRoom_EventScript_BrailleDigHere"
     },
     {
       "type": "sign",
@@ -255,7 +255,7 @@
       "y": 2,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SealedChamber_OuterRoom_EventScript_2391ED"
+      "script": "SealedChamber_OuterRoom_EventScript_BrailleDigHere"
     }
   ]
 }

data/maps/SealedChamber_OuterRoom/scripts.inc

@@ -1,10 +1,10 @@
 SealedChamber_OuterRoom_MapScripts:: @ 8239106
-	map_script MAP_SCRIPT_ON_RESUME, SealedChamber_OuterRoom_MapScript1_239116
+	map_script MAP_SCRIPT_ON_RESUME, SealedChamber_OuterRoom_OnResume
 	map_script MAP_SCRIPT_ON_TRANSITION, SealedChamber_OuterRoom_OnTransition
-	map_script MAP_SCRIPT_ON_LOAD, SealedChamber_OuterRoom_MapScript1_23912B
+	map_script MAP_SCRIPT_ON_LOAD, SealedChamber_OuterRoom_OnLoad
 	.byte 0
 
-SealedChamber_OuterRoom_MapScript1_239116: @ 8239116
+SealedChamber_OuterRoom_OnResume: @ 8239116
 	setdivewarp MAP_UNDERWATER_SEALED_CHAMBER, 255, 12, 44
 	setescapewarp MAP_UNDERWATER_SEALED_CHAMBER, 255, 12, 44
 	end
@@ -13,11 +13,11 @@ SealedChamber_OuterRoom_OnTransition: @ 8239127
 	setflag FLAG_LANDMARK_SEALED_CHAMBER
 	end
 
-SealedChamber_OuterRoom_MapScript1_23912B: @ 823912B
-	call_if_unset FLAG_SYS_BRAILLE_DIG, SealedChamber_OuterRoom_EventScript_239135
+SealedChamber_OuterRoom_OnLoad: @ 823912B
+	call_if_unset FLAG_SYS_BRAILLE_DIG, SealedChamber_OuterRoom_EventScript_CloseInnerRoomEntrance
 	end
 
-SealedChamber_OuterRoom_EventScript_239135:: @ 8239135
+SealedChamber_OuterRoom_EventScript_CloseInnerRoomEntrance:: @ 8239135
 	setmetatile 9, 1, METATILE_Cave_EntranceCover, 1
 	setmetatile 10, 1, METATILE_Cave_EntranceCover, 1
 	setmetatile 11, 1, METATILE_Cave_EntranceCover, 1
@@ -26,103 +26,103 @@ SealedChamber_OuterRoom_EventScript_239135:: @ 8239135
 	setmetatile 11, 2, METATILE_Cave_SealedChamberBraille_Mid, 1
 	return
 
-SealedChamber_OuterRoom_EventScript_23916C:: @ 823916C
+SealedChamber_OuterRoom_EventScript_BrailleABC:: @ 823916C
 	lockall
-	braillemessage SealedChamber_OuterRoom_Braille_2A6B27
+	braillemessage SealedChamber_OuterRoom_Braille_ABC
 	waitbuttonpress
 	closebraillemessage
 	releaseall
 	end
 
-SealedChamber_OuterRoom_EventScript_239176:: @ 8239176
+SealedChamber_OuterRoom_EventScript_BrailleGHI:: @ 8239176
 	lockall
-	braillemessage SealedChamber_OuterRoom_Braille_2A6B31
+	braillemessage SealedChamber_OuterRoom_Braille_GHI
 	waitbuttonpress
 	closebraillemessage
 	releaseall
 	end
 
-SealedChamber_OuterRoom_EventScript_239180:: @ 8239180
+SealedChamber_OuterRoom_EventScript_BrailleMNO:: @ 8239180
 	lockall
-	braillemessage SealedChamber_OuterRoom_Braille_2A6B3B
+	braillemessage SealedChamber_OuterRoom_Braille_MNO
 	waitbuttonpress
 	closebraillemessage
 	releaseall
 	end
 
-SealedChamber_OuterRoom_EventScript_23918A:: @ 823918A
+SealedChamber_OuterRoom_EventScript_BrailleTUV:: @ 823918A
 	lockall
-	braillemessage SealedChamber_OuterRoom_Braille_2A6B45
+	braillemessage SealedChamber_OuterRoom_Braille_TUV
 	waitbuttonpress
 	closebraillemessage
 	releaseall
 	end
 
-SealedChamber_OuterRoom_EventScript_239194:: @ 8239194
+SealedChamber_OuterRoom_EventScript_BrailleDEF:: @ 8239194
 	lockall
-	braillemessage SealedChamber_OuterRoom_Braille_2A6B4F
+	braillemessage SealedChamber_OuterRoom_Braille_DEF
 	waitbuttonpress
 	closebraillemessage
 	releaseall
 	end
 
-SealedChamber_OuterRoom_EventScript_23919E:: @ 823919E
+SealedChamber_OuterRoom_EventScript_BrailleJKL:: @ 823919E
 	lockall
-	braillemessage SealedChamber_OuterRoom_Braille_2A6B59
+	braillemessage SealedChamber_OuterRoom_Braille_JKL
 	waitbuttonpress
 	closebraillemessage
 	releaseall
 	end
 
-SealedChamber_OuterRoom_EventScript_2391A8:: @ 82391A8
+SealedChamber_OuterRoom_EventScript_BraillePQRS:: @ 82391A8
 	lockall
-	braillemessage SealedChamber_OuterRoom_Braille_2A6B63
+	braillemessage SealedChamber_OuterRoom_Braille_PQRS
 	waitbuttonpress
 	closebraillemessage
 	releaseall
 	end
 
-SealedChamber_OuterRoom_EventScript_2391B2:: @ 82391B2
+SealedChamber_OuterRoom_EventScript_BraillePeriod:: @ 82391B2
 	lockall
-	braillemessage SealedChamber_OuterRoom_Braille_2A6B6E
+	braillemessage SealedChamber_OuterRoom_Braille_Period
 	waitbuttonpress
 	closebraillemessage
 	releaseall
 	end
 
-SealedChamber_OuterRoom_EventScript_2391BC:: @ 82391BC
+SealedChamber_OuterRoom_EventScript_BrailleWXYZ:: @ 82391BC
 	lockall
-	braillemessage SealedChamber_OuterRoom_Braille_2A6B76
+	braillemessage SealedChamber_OuterRoom_Braille_WXYZ
 	waitbuttonpress
 	closebraillemessage
 	releaseall
 	end
 
-SealedChamber_OuterRoom_EventScript_2391C6:: @ 82391C6
+SealedChamber_OuterRoom_EventScript_BrailleComma:: @ 82391C6
 	lockall
-	braillemessage SealedChamber_OuterRoom_Braille_2A6B81
+	braillemessage SealedChamber_OuterRoom_Braille_Comma
 	waitbuttonpress
 	closebraillemessage
 	releaseall
 	end
 
-SealedChamber_OuterRoom_EventScript_2391D0:: @ 82391D0
+SealedChamber_OuterRoom_EventScript_InnerRoomEntranceWall:: @ 82391D0
 	lockall
-	goto_if_set FLAG_SYS_BRAILLE_DIG, SealedChamber_OuterRoom_EventScript_2391E3
-	braillemessage SealedChamber_OuterRoom_Braille_2A6B89
+	goto_if_set FLAG_SYS_BRAILLE_DIG, SealedChamber_OuterRoom_EventScript_HoleInWall
+	braillemessage SealedChamber_OuterRoom_Braille_DigHere
 	waitbuttonpress
 	closebraillemessage
 	releaseall
 	end
 
-SealedChamber_OuterRoom_EventScript_2391E3:: @ 82391E3
+SealedChamber_OuterRoom_EventScript_HoleInWall:: @ 82391E3
 	msgbox gText_BigHoleInTheWall, MSGBOX_DEFAULT
 	releaseall
 	end
 
-SealedChamber_OuterRoom_EventScript_2391ED:: @ 82391ED
+SealedChamber_OuterRoom_EventScript_BrailleDigHere:: @ 82391ED
 	lockall
-	braillemessage SealedChamber_OuterRoom_Braille_2A6B89
+	braillemessage SealedChamber_OuterRoom_Braille_DigHere
 	waitbuttonpress
 	closebraillemessage
 	releaseall

data/maps/ShoalCave_LowTideEntranceRoom/map.json

@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "ShoalCave_LowTideEntranceRoom_EventScript_236DD9",
+      "script": "ShoalCave_LowTideEntranceRoom_EventScript_ShellBellExpert",
       "flag": "0"
     }
   ],

data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc

@@ -4,90 +4,91 @@ ShoalCave_LowTideEntranceRoom_MapScripts:: @ 8236DBA
 
 ShoalCave_LowTideEntranceRoom_OnTransition: @ 8236DC0
 	special UpdateShoalTideFlag
-	goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideEntranceRoom_EventScript_236DD1
-	goto ShoalCave_LowTideEntranceRoom_EventScript_236DD5
+	goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideEntranceRoom_EventScript_SetHighTide
+	goto ShoalCave_LowTideEntranceRoom_EventScript_SetLowTide
 
-ShoalCave_LowTideEntranceRoom_EventScript_236DD1:: @ 8236DD1
+ShoalCave_LowTideEntranceRoom_EventScript_SetHighTide:: @ 8236DD1
 	setmaplayoutindex LAYOUT_SHOAL_CAVE_HIGH_TIDE_ENTRANCE_ROOM
 	end
 
-ShoalCave_LowTideEntranceRoom_EventScript_236DD5:: @ 8236DD5
+ShoalCave_LowTideEntranceRoom_EventScript_SetLowTide:: @ 8236DD5
 	setmaplayoutindex LAYOUT_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM
 	end
 
-ShoalCave_LowTideEntranceRoom_EventScript_236DD9:: @ 8236DD9
+ShoalCave_LowTideEntranceRoom_EventScript_ShellBellExpert:: @ 8236DD9
 	lock
 	faceplayer
 	dotimebasedevents
-	call_if_set FLAG_SYS_SHOAL_ITEM, ShoalCave_LowTideEntranceRoom_EventScript_236ED9
+	call_if_set FLAG_SYS_SHOAL_ITEM, ShoalCave_LowTideEntranceRoom_EventScript_ResetShoalItems
 	checkitem ITEM_SHOAL_SALT, 4
-	compare VAR_RESULT, 0
-	goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_236E9B
+	compare VAR_RESULT, FALSE
+	goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_NotEnoughShoalSaltOrShells
 	checkitem ITEM_SHOAL_SHELL, 4
-	compare VAR_RESULT, 0
-	goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_236E9B
-	msgbox ShoalCave_LowTideEntranceRoom_Text_2A7F37, MSGBOX_YESNO
+	compare VAR_RESULT, FALSE
+	goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_NotEnoughShoalSaltOrShells
+	msgbox ShoalCave_LowTideEntranceRoom_Text_WouldYouLikeShellBell, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_236ECF
+	goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_DeclineShellBell
 	checkitemspace ITEM_SHELL_BELL, 1
-	compare VAR_RESULT, 0
-	call_if_eq ShoalCave_LowTideEntranceRoom_EventScript_236E69
+	compare VAR_RESULT, FALSE
+	call_if_eq ShoalCave_LowTideEntranceRoom_EventScript_CheckSpaceWillBeFreed
 	compare VAR_RESULT, 2
-	goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_236E91
-	msgbox ShoalCave_LowTideEntranceRoom_Text_2A7FAC, MSGBOX_DEFAULT
+	goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_NoRoomForShellBell
+	msgbox ShoalCave_LowTideEntranceRoom_Text_MakeShellBellRightAway, MSGBOX_DEFAULT
 	takeitem ITEM_SHOAL_SALT, 4
 	takeitem ITEM_SHOAL_SHELL, 4
 	giveitem_std ITEM_SHELL_BELL
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
-	msgbox ShoalCave_LowTideEntranceRoom_Text_2A8012, MSGBOX_DEFAULT
+	msgbox ShoalCave_LowTideEntranceRoom_Text_ExplainShellBell, MSGBOX_DEFAULT
 	setflag FLAG_TEMP_2
 	release
 	end
 
-ShoalCave_LowTideEntranceRoom_EventScript_236E69:: @ 8236E69
+@ If the bag is full, check if a slot will be freed when 4 Shoal Salt or Shells are given
+ShoalCave_LowTideEntranceRoom_EventScript_CheckSpaceWillBeFreed:: @ 8236E69
 	checkitem ITEM_SHOAL_SALT, 5
-	compare VAR_RESULT, 1
-	goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_236E7A
+	compare VAR_RESULT, TRUE
+	goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_CheckSpaceWillBeFreedShells
 	return
 
-ShoalCave_LowTideEntranceRoom_EventScript_236E7A:: @ 8236E7A
+ShoalCave_LowTideEntranceRoom_EventScript_CheckSpaceWillBeFreedShells:: @ 8236E7A
 	checkitem ITEM_SHOAL_SHELL, 5
-	compare VAR_RESULT, 1
-	goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_236E8B
+	compare VAR_RESULT, TRUE
+	goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_NoSpaceWillBeFreed
 	return
 
-ShoalCave_LowTideEntranceRoom_EventScript_236E8B:: @ 8236E8B
+ShoalCave_LowTideEntranceRoom_EventScript_NoSpaceWillBeFreed:: @ 8236E8B
 	setvar VAR_RESULT, 2
 	return
 
-ShoalCave_LowTideEntranceRoom_EventScript_236E91:: @ 8236E91
-	msgbox ShoalCave_LowTideEntranceRoom_Text_2A80F5, MSGBOX_DEFAULT
+ShoalCave_LowTideEntranceRoom_EventScript_NoRoomForShellBell:: @ 8236E91
+	msgbox ShoalCave_LowTideEntranceRoom_Text_NoSpaceInYourBag, MSGBOX_DEFAULT
 	release
 	end
 
-ShoalCave_LowTideEntranceRoom_EventScript_236E9B:: @ 8236E9B
+ShoalCave_LowTideEntranceRoom_EventScript_NotEnoughShoalSaltOrShells:: @ 8236E9B
 	checkitem ITEM_SHOAL_SALT, 1
-	compare VAR_RESULT, 1
-	goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_236EC5
+	compare VAR_RESULT, TRUE
+	goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_HasSomeShoalSaltOrShell
 	checkitem ITEM_SHOAL_SHELL, 1
-	compare VAR_RESULT, 1
-	goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_236EC5
-	msgbox ShoalCave_LowTideEntranceRoom_Text_2A7E0E, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_HasSomeShoalSaltOrShell
+	msgbox ShoalCave_LowTideEntranceRoom_Text_AreYouPlanningOnGoingInThere, MSGBOX_DEFAULT
 	release
 	end
 
-ShoalCave_LowTideEntranceRoom_EventScript_236EC5:: @ 8236EC5
-	msgbox ShoalCave_LowTideEntranceRoom_Text_2A7EB3, MSGBOX_DEFAULT
+ShoalCave_LowTideEntranceRoom_EventScript_HasSomeShoalSaltOrShell:: @ 8236EC5
+	msgbox ShoalCave_LowTideEntranceRoom_Text_BringMe4ShoalSaltAndShells, MSGBOX_DEFAULT
 	release
 	end
 
-ShoalCave_LowTideEntranceRoom_EventScript_236ECF:: @ 8236ECF
-	msgbox ShoalCave_LowTideEntranceRoom_Text_2A80C6, MSGBOX_DEFAULT
+ShoalCave_LowTideEntranceRoom_EventScript_DeclineShellBell:: @ 8236ECF
+	msgbox ShoalCave_LowTideEntranceRoom_Text_WantedToMakeShellBell, MSGBOX_DEFAULT
 	release
 	end
 
-ShoalCave_LowTideEntranceRoom_EventScript_236ED9:: @ 8236ED9
+ShoalCave_LowTideEntranceRoom_EventScript_ResetShoalItems:: @ 8236ED9
 	clearflag FLAG_RECEIVED_SHOAL_SALT_1
 	clearflag FLAG_RECEIVED_SHOAL_SALT_2
 	clearflag FLAG_RECEIVED_SHOAL_SALT_3

data/maps/ShoalCave_LowTideInnerRoom/map.json

@@ -94,7 +94,7 @@
       "y": 8,
       "elevation": 5,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "ShoalCave_LowTideInnerRoom_EventScript_23708C"
+      "script": "ShoalCave_LowTideInnerRoom_EventScript_ShoalSalt1"
     },
     {
       "type": "sign",
@@ -102,7 +102,7 @@
       "y": 26,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "ShoalCave_LowTideInnerRoom_EventScript_2370C8"
+      "script": "ShoalCave_LowTideInnerRoom_EventScript_ShoalSalt2"
     },
     {
       "type": "sign",
@@ -110,7 +110,7 @@
       "y": 20,
       "elevation": 5,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "ShoalCave_LowTideInnerRoom_EventScript_236FBA"
+      "script": "ShoalCave_LowTideInnerRoom_EventScript_ShoalShell1"
     },
     {
       "type": "sign",
@@ -118,7 +118,7 @@
       "y": 10,
       "elevation": 5,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "ShoalCave_LowTideInnerRoom_EventScript_236FF6"
+      "script": "ShoalCave_LowTideInnerRoom_EventScript_ShoalShell2"
     },
     {
       "type": "sign",
@@ -126,7 +126,7 @@
       "y": 9,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "ShoalCave_LowTideInnerRoom_EventScript_237028"
+      "script": "ShoalCave_LowTideInnerRoom_EventScript_ShoalShell3"
     },
     {
       "type": "sign",
@@ -134,7 +134,7 @@
       "y": 13,
       "elevation": 5,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "ShoalCave_LowTideInnerRoom_EventScript_23705A"
+      "script": "ShoalCave_LowTideInnerRoom_EventScript_ShoalShell4"
     }
   ]
 }

data/maps/ShoalCave_LowTideInnerRoom/scripts.inc

@@ -1,69 +1,69 @@
 ShoalCave_LowTideInnerRoom_MapScripts:: @ 8236EF5
-	map_script MAP_SCRIPT_ON_LOAD, ShoalCave_LowTideInnerRoom_MapScript1_236F16
+	map_script MAP_SCRIPT_ON_LOAD, ShoalCave_LowTideInnerRoom_OnLoad
 	map_script MAP_SCRIPT_ON_TRANSITION, ShoalCave_LowTideInnerRoom_OnTransition
 	.byte 0
 
 ShoalCave_LowTideInnerRoom_OnTransition: @ 8236F00
-	goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideInnerRoom_EventScript_236F0E
-	goto ShoalCave_LowTideInnerRoom_EventScript_236F12
+	goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideInnerRoom_EventScript_SetHighTide
+	goto ShoalCave_LowTideInnerRoom_EventScript_SetLowTide
 
-ShoalCave_LowTideInnerRoom_EventScript_236F0E:: @ 8236F0E
+ShoalCave_LowTideInnerRoom_EventScript_SetHighTide:: @ 8236F0E
 	setmaplayoutindex LAYOUT_SHOAL_CAVE_HIGH_TIDE_INNER_ROOM
 	end
 
-ShoalCave_LowTideInnerRoom_EventScript_236F12:: @ 8236F12
+ShoalCave_LowTideInnerRoom_EventScript_SetLowTide:: @ 8236F12
 	setmaplayoutindex LAYOUT_SHOAL_CAVE_LOW_TIDE_INNER_ROOM
 	end
 
-ShoalCave_LowTideInnerRoom_MapScript1_236F16: @ 8236F16
-	call ShoalCave_LowTideInnerRoom_EventScript_236F1C
+ShoalCave_LowTideInnerRoom_OnLoad: @ 8236F16
+	call ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles
 	end
 
-ShoalCave_LowTideInnerRoom_EventScript_236F1C:: @ 8236F1C
-	goto_if_set FLAG_RECEIVED_SHOAL_SALT_1, ShoalCave_LowTideInnerRoom_EventScript_236F3D
-	goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideInnerRoom_EventScript_236F3D
+ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles:: @ 8236F1C
+	goto_if_set FLAG_RECEIVED_SHOAL_SALT_1, ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles2
+	goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles2
 	setmetatile 31, 8, METATILE_Cave_ShoalCave_DirtPile_Large, 1
-	goto ShoalCave_LowTideInnerRoom_EventScript_236F3D
+	goto ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles2
 	end
 
-ShoalCave_LowTideInnerRoom_EventScript_236F3D:: @ 8236F3D
-	goto_if_set FLAG_RECEIVED_SHOAL_SALT_2, ShoalCave_LowTideInnerRoom_EventScript_236F5E
-	goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideInnerRoom_EventScript_236F5E
+ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles2:: @ 8236F3D
+	goto_if_set FLAG_RECEIVED_SHOAL_SALT_2, ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles3
+	goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles3
 	setmetatile 14, 26, METATILE_Cave_ShoalCave_DirtPile_Large, 1
-	goto ShoalCave_LowTideInnerRoom_EventScript_236F5E
+	goto ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles3
 	end
 
-ShoalCave_LowTideInnerRoom_EventScript_236F5E:: @ 8236F5E
-	goto_if_set FLAG_RECEIVED_SHOAL_SHELL_1, ShoalCave_LowTideInnerRoom_EventScript_236F76
+ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles3:: @ 8236F5E
+	goto_if_set FLAG_RECEIVED_SHOAL_SHELL_1, ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles4
 	setmetatile 41, 20, METATILE_Cave_ShoalCave_BlueStone_Large, 1
-	goto ShoalCave_LowTideInnerRoom_EventScript_236F76
+	goto ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles4
 	end
 
-ShoalCave_LowTideInnerRoom_EventScript_236F76:: @ 8236F76
-	goto_if_set FLAG_RECEIVED_SHOAL_SHELL_2, ShoalCave_LowTideInnerRoom_EventScript_236F8E
+ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles4:: @ 8236F76
+	goto_if_set FLAG_RECEIVED_SHOAL_SHELL_2, ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles5
 	setmetatile 41, 10, METATILE_Cave_ShoalCave_BlueStone_Large, 1
-	goto ShoalCave_LowTideInnerRoom_EventScript_236F8E
+	goto ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles5
 	end
 
-ShoalCave_LowTideInnerRoom_EventScript_236F8E:: @ 8236F8E
-	goto_if_set FLAG_RECEIVED_SHOAL_SHELL_3, ShoalCave_LowTideInnerRoom_EventScript_236FA6
+ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles5:: @ 8236F8E
+	goto_if_set FLAG_RECEIVED_SHOAL_SHELL_3, ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles6
 	setmetatile 6, 9, METATILE_Cave_ShoalCave_BlueStone_Large, 1
-	goto ShoalCave_LowTideInnerRoom_EventScript_236FA6
+	goto ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles6
 	end
 
-ShoalCave_LowTideInnerRoom_EventScript_236FA6:: @ 8236FA6
-	goto_if_set FLAG_RECEIVED_SHOAL_SHELL_4, ShoalCave_LowTideInnerRoom_EventScript_236FB9
+ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles6:: @ 8236FA6
+	goto_if_set FLAG_RECEIVED_SHOAL_SHELL_4, ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatilesEnd
 	setmetatile 16, 13, METATILE_Cave_ShoalCave_BlueStone_Large, 1
 	return
 
-ShoalCave_LowTideInnerRoom_EventScript_236FB9:: @ 8236FB9
+ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatilesEnd:: @ 8236FB9
 	return
 
-ShoalCave_LowTideInnerRoom_EventScript_236FBA:: @ 8236FBA
+ShoalCave_LowTideInnerRoom_EventScript_ShoalShell1:: @ 8236FBA
 	lockall
-	goto_if_set FLAG_RECEIVED_SHOAL_SHELL_1, ShoalCave_LowTideInnerRoom_EventScript_236FEC
+	goto_if_set FLAG_RECEIVED_SHOAL_SHELL_1, ShoalCave_LowTideInnerRoom_EventScript_ReceivedShoalShell
 	giveitem_std ITEM_SHOAL_SHELL
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setmetatile 41, 20, METATILE_Cave_ShoalCave_BlueStone_Small, 0
 	special DrawWholeMapView
@@ -71,16 +71,16 @@ ShoalCave_LowTideInnerRoom_EventScript_236FBA:: @ 8236FBA
 	releaseall
 	end
 
-ShoalCave_LowTideInnerRoom_EventScript_236FEC:: @ 8236FEC
-	msgbox ShoalCave_LowTideInnerRoom_Text_2A81A8, MSGBOX_DEFAULT
+ShoalCave_LowTideInnerRoom_EventScript_ReceivedShoalShell:: @ 8236FEC
+	msgbox ShoalCave_Text_WasShoallShellNowNothing, MSGBOX_DEFAULT
 	releaseall
 	end
 
-ShoalCave_LowTideInnerRoom_EventScript_236FF6:: @ 8236FF6
+ShoalCave_LowTideInnerRoom_EventScript_ShoalShell2:: @ 8236FF6
 	lockall
-	goto_if_set FLAG_RECEIVED_SHOAL_SHELL_2, ShoalCave_LowTideInnerRoom_EventScript_236FEC
+	goto_if_set FLAG_RECEIVED_SHOAL_SHELL_2, ShoalCave_LowTideInnerRoom_EventScript_ReceivedShoalShell
 	giveitem_std ITEM_SHOAL_SHELL
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setmetatile 41, 10, METATILE_Cave_ShoalCave_BlueStone_Small, 0
 	special DrawWholeMapView
@@ -88,11 +88,11 @@ ShoalCave_LowTideInnerRoom_EventScript_236FF6:: @ 8236FF6
 	releaseall
 	end
 
-ShoalCave_LowTideInnerRoom_EventScript_237028:: @ 8237028
+ShoalCave_LowTideInnerRoom_EventScript_ShoalShell3:: @ 8237028
 	lockall
-	goto_if_set FLAG_RECEIVED_SHOAL_SHELL_3, ShoalCave_LowTideInnerRoom_EventScript_236FEC
+	goto_if_set FLAG_RECEIVED_SHOAL_SHELL_3, ShoalCave_LowTideInnerRoom_EventScript_ReceivedShoalShell
 	giveitem_std ITEM_SHOAL_SHELL
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setmetatile 6, 9, METATILE_Cave_ShoalCave_BlueStone_Small, 0
 	special DrawWholeMapView
@@ -100,11 +100,11 @@ ShoalCave_LowTideInnerRoom_EventScript_237028:: @ 8237028
 	releaseall
 	end
 
-ShoalCave_LowTideInnerRoom_EventScript_23705A:: @ 823705A
+ShoalCave_LowTideInnerRoom_EventScript_ShoalShell4:: @ 823705A
 	lockall
-	goto_if_set FLAG_RECEIVED_SHOAL_SHELL_4, ShoalCave_LowTideInnerRoom_EventScript_236FEC
+	goto_if_set FLAG_RECEIVED_SHOAL_SHELL_4, ShoalCave_LowTideInnerRoom_EventScript_ReceivedShoalShell
 	giveitem_std ITEM_SHOAL_SHELL
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setmetatile 16, 13, METATILE_Cave_ShoalCave_BlueStone_Small, 0
 	special DrawWholeMapView
@@ -112,11 +112,11 @@ ShoalCave_LowTideInnerRoom_EventScript_23705A:: @ 823705A
 	releaseall
 	end
 
-ShoalCave_LowTideInnerRoom_EventScript_23708C:: @ 823708C
+ShoalCave_LowTideInnerRoom_EventScript_ShoalSalt1:: @ 823708C
 	lockall
-	goto_if_set FLAG_RECEIVED_SHOAL_SALT_1, ShoalCave_LowTideInnerRoom_EventScript_2370BE
+	goto_if_set FLAG_RECEIVED_SHOAL_SALT_1, ShoalCave_LowTideInnerRoom_EventScript_ReceivedShoalSalt
 	giveitem_std ITEM_SHOAL_SALT
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setmetatile 31, 8, METATILE_Cave_ShoalCave_DirtPile_Small, 0
 	special DrawWholeMapView
@@ -124,16 +124,16 @@ ShoalCave_LowTideInnerRoom_EventScript_23708C:: @ 823708C
 	releaseall
 	end
 
-ShoalCave_LowTideInnerRoom_EventScript_2370BE:: @ 82370BE
-	msgbox ShoalCave_LowTideInnerRoom_Text_2A8169, MSGBOX_DEFAULT
+ShoalCave_LowTideInnerRoom_EventScript_ReceivedShoalSalt:: @ 82370BE
+	msgbox ShoalCave_Text_WasShoalSaltNowNothing, MSGBOX_DEFAULT
 	releaseall
 	end
 
-ShoalCave_LowTideInnerRoom_EventScript_2370C8:: @ 82370C8
+ShoalCave_LowTideInnerRoom_EventScript_ShoalSalt2:: @ 82370C8
 	lockall
-	goto_if_set FLAG_RECEIVED_SHOAL_SALT_2, ShoalCave_LowTideInnerRoom_EventScript_2370BE
+	goto_if_set FLAG_RECEIVED_SHOAL_SALT_2, ShoalCave_LowTideInnerRoom_EventScript_ReceivedShoalSalt
 	giveitem_std ITEM_SHOAL_SALT
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setmetatile 14, 26, METATILE_Cave_ShoalCave_DirtPile_Small, 0
 	special DrawWholeMapView

data/maps/ShoalCave_LowTideLowerRoom/map.json

@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "ShoalCave_LowTideLowerRoom_EventScript_2371B2",
+      "script": "ShoalCave_LowTideLowerRoom_EventScript_BlackBelt",
       "flag": "0"
     }
   ],
@@ -79,7 +79,7 @@
       "y": 2,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "ShoalCave_LowTideLowerRoom_EventScript_237176"
+      "script": "ShoalCave_LowTideLowerRoom_EventScript_ShoalSalt4"
     }
   ]
 }

data/maps/ShoalCave_LowTideLowerRoom/scripts.inc

@@ -1,60 +1,60 @@
 ShoalCave_LowTideLowerRoom_MapScripts:: @ 8237156
-	map_script MAP_SCRIPT_ON_LOAD, ShoalCave_LowTideLowerRoom_MapScript1_23715C
+	map_script MAP_SCRIPT_ON_LOAD, ShoalCave_LowTideLowerRoom_OnLoad
 	.byte 0
 
-ShoalCave_LowTideLowerRoom_MapScript1_23715C: @ 823715C
-	call ShoalCave_LowTideLowerRoom_EventScript_237162
+ShoalCave_LowTideLowerRoom_OnLoad: @ 823715C
+	call ShoalCave_LowTideLowerRoom_EventScript_SetShoalItemMetatiles
 	end
 
-ShoalCave_LowTideLowerRoom_EventScript_237162:: @ 8237162
-	goto_if_set FLAG_RECEIVED_SHOAL_SALT_4, ShoalCave_LowTideLowerRoom_EventScript_237175
-	setmetatile 18, 2, 856, 1
+ShoalCave_LowTideLowerRoom_EventScript_SetShoalItemMetatiles:: @ 8237162
+	goto_if_set FLAG_RECEIVED_SHOAL_SALT_4, ShoalCave_LowTideLowerRoom_EventScript_SetShoalItemMetatilesEnd
+	setmetatile 18, 2, METATILE_Cave_ShoalCave_DirtPile_Large, 1
 	return
 
-ShoalCave_LowTideLowerRoom_EventScript_237175:: @ 8237175
+ShoalCave_LowTideLowerRoom_EventScript_SetShoalItemMetatilesEnd:: @ 8237175
 	return
 
-ShoalCave_LowTideLowerRoom_EventScript_237176:: @ 8237176
+ShoalCave_LowTideLowerRoom_EventScript_ShoalSalt4:: @ 8237176
 	lockall
-	goto_if_set FLAG_RECEIVED_SHOAL_SALT_4, ShoalCave_LowTideLowerRoom_EventScript_2371A8
+	goto_if_set FLAG_RECEIVED_SHOAL_SALT_4, ShoalCave_LowTideLowerRoom_EventScript_ReceivedShoalSalt
 	giveitem_std ITEM_SHOAL_SALT
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
-	setmetatile 18, 2, 858, 0
+	setmetatile 18, 2, METATILE_Cave_ShoalCave_DirtPile_Small, 0
 	special DrawWholeMapView
 	setflag FLAG_RECEIVED_SHOAL_SALT_4
 	releaseall
 	end
 
-ShoalCave_LowTideLowerRoom_EventScript_2371A8:: @ 82371A8
-	msgbox ShoalCave_LowTideLowerRoom_Text_2A8169, MSGBOX_DEFAULT
+ShoalCave_LowTideLowerRoom_EventScript_ReceivedShoalSalt:: @ 82371A8
+	msgbox ShoalCave_Text_WasShoalSaltNowNothing, MSGBOX_DEFAULT
 	releaseall
 	end
 
-ShoalCave_LowTideLowerRoom_EventScript_2371B2:: @ 82371B2
+ShoalCave_LowTideLowerRoom_EventScript_BlackBelt:: @ 82371B2
 	lock
 	faceplayer
-	goto_if_set FLAG_RECEIVED_FOCUS_BAND, ShoalCave_LowTideLowerRoom_EventScript_2371E1
-	msgbox ShoalCave_LowTideLowerRoom_Text_2371EB, MSGBOX_DEFAULT
+	goto_if_set FLAG_RECEIVED_FOCUS_BAND, ShoalCave_LowTideLowerRoom_EventScript_ReceivedFocusBand
+	msgbox ShoalCave_LowTideLowerRoom_Text_CanOvercomeColdWithFocus, MSGBOX_DEFAULT
 	giveitem_std ITEM_FOCUS_BAND
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_FOCUS_BAND
 	release
 	end
 
-ShoalCave_LowTideLowerRoom_EventScript_2371E1:: @ 82371E1
-	msgbox ShoalCave_LowTideLowerRoom_Text_23728D, MSGBOX_DEFAULT
+ShoalCave_LowTideLowerRoom_EventScript_ReceivedFocusBand:: @ 82371E1
+	msgbox ShoalCave_LowTideLowerRoom_Text_EverythingStartsWithFocus, MSGBOX_DEFAULT
 	release
 	end
 
-ShoalCave_LowTideLowerRoom_Text_2371EB: @ 82371EB
+ShoalCave_LowTideLowerRoom_Text_CanOvercomeColdWithFocus: @ 82371EB
 	.string "The penetrating cold around these\n"
 	.string "parts is an impediment to training.\p"
 	.string "But with focus, one can overcome!\p"
 	.string "With this FOCUS BAND, buckle down and\n"
 	.string "withstand the cold!$"
 
-ShoalCave_LowTideLowerRoom_Text_23728D: @ 823728D
+ShoalCave_LowTideLowerRoom_Text_EverythingStartsWithFocus: @ 823728D
 	.string "Everything starts with focus!$"
 

data/maps/ShoalCave_LowTideStairsRoom/map.json

@@ -52,7 +52,7 @@
       "y": 11,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "ShoalCave_LowTideStairsRoom_EventScript_23711A"
+      "script": "ShoalCave_LowTideStairsRoom_EventScript_ShoalSalt3"
     }
   ]
 }

data/maps/ShoalCave_LowTideStairsRoom/scripts.inc

@@ -1,33 +1,33 @@
 ShoalCave_LowTideStairsRoom_MapScripts:: @ 82370FA
-	map_script MAP_SCRIPT_ON_LOAD, ShoalCave_LowTideStairsRoom_MapScript1_237100
+	map_script MAP_SCRIPT_ON_LOAD, ShoalCave_LowTideStairsRoom_OnLoad
 	.byte 0
 
-ShoalCave_LowTideStairsRoom_MapScript1_237100: @ 8237100
-	call ShoalCave_LowTideStairsRoom_EventScript_237106
+ShoalCave_LowTideStairsRoom_OnLoad: @ 8237100
+	call ShoalCave_LowTideStairsRoom_EventScript_SetShoalItemMetatiles
 	end
 
-ShoalCave_LowTideStairsRoom_EventScript_237106:: @ 8237106
-	goto_if_set FLAG_RECEIVED_SHOAL_SALT_3, ShoalCave_LowTideStairsRoom_EventScript_237119
-	setmetatile 11, 11, 856, 1
+ShoalCave_LowTideStairsRoom_EventScript_SetShoalItemMetatiles:: @ 8237106
+	goto_if_set FLAG_RECEIVED_SHOAL_SALT_3, ShoalCave_LowTideStairsRoom_EventScript_SetShoalItemMetatilesEnd
+	setmetatile 11, 11, METATILE_Cave_ShoalCave_DirtPile_Large, 1
 	return
 
-ShoalCave_LowTideStairsRoom_EventScript_237119:: @ 8237119
+ShoalCave_LowTideStairsRoom_EventScript_SetShoalItemMetatilesEnd:: @ 8237119
 	return
 
-ShoalCave_LowTideStairsRoom_EventScript_23711A:: @ 823711A
+ShoalCave_LowTideStairsRoom_EventScript_ShoalSalt3:: @ 823711A
 	lockall
-	goto_if_set FLAG_RECEIVED_SHOAL_SALT_3, ShoalCave_LowTideStairsRoom_EventScript_23714C
+	goto_if_set FLAG_RECEIVED_SHOAL_SALT_3, ShoalCave_LowTideStairsRoom_EventScript_ReceivedShoalSalt
 	giveitem_std ITEM_SHOAL_SALT
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
-	setmetatile 11, 11, 858, 0
+	setmetatile 11, 11, METATILE_Cave_ShoalCave_DirtPile_Small, 0
 	special DrawWholeMapView
 	setflag FLAG_RECEIVED_SHOAL_SALT_3
 	releaseall
 	end
 
-ShoalCave_LowTideStairsRoom_EventScript_23714C:: @ 823714C
-	msgbox ShoalCave_LowTideStairsRoom_Text_2A8169, MSGBOX_DEFAULT
+ShoalCave_LowTideStairsRoom_EventScript_ReceivedShoalSalt:: @ 823714C
+	msgbox ShoalCave_Text_WasShoalSaltNowNothing, MSGBOX_DEFAULT
 	releaseall
 	end
 

data/maps/Underwater_MarineCave/scripts.inc

@@ -1,5 +1,5 @@
 Underwater_MarineCave_MapScripts:: @ 823AFB8
-	map_script MAP_SCRIPT_ON_RESUME, Underwater_MarineCave_MapScript1_OnResume
+	map_script MAP_SCRIPT_ON_RESUME, Underwater_MarineCave_OnResume
 	map_script MAP_SCRIPT_ON_TRANSITION, Underwater_MarineCave_OnTransition
 	.byte 0
 
@@ -7,7 +7,7 @@ Underwater_MarineCave_OnTransition: @ 823AFC3
 	setflag FLAG_ARRIVED_AT_MARINE_CAVE_EMERGE_SPOT
 	end
 
-Underwater_MarineCave_MapScript1_OnResume: @ 823AFC7
+Underwater_MarineCave_OnResume: @ 823AFC7
 	setdivewarp MAP_MARINE_CAVE_ENTRANCE, 255, 10, 17
 	end
 

data/maps/Underwater_SeafloorCavern/scripts.inc

@@ -1,23 +1,23 @@
 Underwater_SeafloorCavern_MapScripts:: @ 823433B
-	map_script MAP_SCRIPT_ON_RESUME, Underwater_SeafloorCavern_MapScript1_2343D3
+	map_script MAP_SCRIPT_ON_RESUME, Underwater_SeafloorCavern_OnResume
 	map_script MAP_SCRIPT_ON_TRANSITION, Underwater_SeafloorCavern_OnTransition
-	map_script MAP_SCRIPT_ON_LOAD, Underwater_SeafloorCavern_MapScript1_23435C
+	map_script MAP_SCRIPT_ON_LOAD, Underwater_SeafloorCavern_OnLoad
 	.byte 0
 
 Underwater_SeafloorCavern_OnTransition: @ 823434B
 	setflag FLAG_LANDMARK_SEAFLOOR_CAVERN
-	goto_if_set FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, Underwater_SeafloorCavern_EventScript_234358
+	goto_if_set FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, Underwater_SeafloorCavern_EventScript_HideSubmarine
 	end
 
-Underwater_SeafloorCavern_EventScript_234358:: @ 8234358
+Underwater_SeafloorCavern_EventScript_HideSubmarine:: @ 8234358
 	setflag FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE
 	end
 
-Underwater_SeafloorCavern_MapScript1_23435C: @ 823435C
-	call_if_set FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, Underwater_SeafloorCavern_EventScript_234366
+Underwater_SeafloorCavern_OnLoad: @ 823435C
+	call_if_set FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, Underwater_SeafloorCavern_EventScript_SetSubmarineGoneMetatiles
 	end
 
-Underwater_SeafloorCavern_EventScript_234366:: @ 8234366
+Underwater_SeafloorCavern_EventScript_SetSubmarineGoneMetatiles:: @ 8234366
 	setmetatile 5, 3, METATILE_Underwater_RockWall, 1
 	setmetatile 6, 3, METATILE_Underwater_RockWall, 1
 	setmetatile 7, 3, METATILE_Underwater_RockWall, 1
@@ -32,7 +32,7 @@ Underwater_SeafloorCavern_EventScript_234366:: @ 8234366
 	setmetatile 8, 5, METATILE_Underwater_FloorShadow, 0
 	return
 
-Underwater_SeafloorCavern_MapScript1_2343D3: @ 82343D3
+Underwater_SeafloorCavern_OnResume: @ 82343D3
 	setdivewarp MAP_SEAFLOOR_CAVERN_ENTRANCE, 255, 10, 17
 	end
 

data/maps/Underwater_SealedChamber/map.json

@@ -31,7 +31,7 @@
       "y": 43,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Underwater_SealedChamber_EventScript_2390FC"
+      "script": "Underwater_SealedChamber_EventScript_Braille"
     }
   ]
 }

data/maps/Underwater_SealedChamber/scripts.inc

@@ -1,26 +1,26 @@
 Underwater_SealedChamber_MapScripts:: @ 82390C4
-	map_script MAP_SCRIPT_ON_DIVE_WARP, Underwater_SealedChamber_MapScript1_2390CA
+	map_script MAP_SCRIPT_ON_DIVE_WARP, Underwater_SealedChamber_OnDive
 	.byte 0
 
-Underwater_SealedChamber_MapScript1_2390CA: @ 82390CA
+Underwater_SealedChamber_OnDive: @ 82390CA
 	getplayerxy VAR_0x8004, VAR_0x8005
 	compare VAR_0x8004, 12
-	goto_if_ne Underwater_SealedChamber_EventScript_2390EA
+	goto_if_ne Underwater_SealedChamber_EventScript_SurfaceRoute134
 	compare VAR_0x8005, 44
-	goto_if_ne Underwater_SealedChamber_EventScript_2390EA
-	goto Underwater_SealedChamber_EventScript_2390F3
+	goto_if_ne Underwater_SealedChamber_EventScript_SurfaceRoute134
+	goto Underwater_SealedChamber_EventScript_SurfaceSealedChamber
 
-Underwater_SealedChamber_EventScript_2390EA:: @ 82390EA
+Underwater_SealedChamber_EventScript_SurfaceRoute134:: @ 82390EA
 	setdivewarp MAP_ROUTE134, 255, 60, 31
 	end
 
-Underwater_SealedChamber_EventScript_2390F3:: @ 82390F3
+Underwater_SealedChamber_EventScript_SurfaceSealedChamber:: @ 82390F3
 	setdivewarp MAP_SEALED_CHAMBER_OUTER_ROOM, 255, 10, 19
 	end
 
-Underwater_SealedChamber_EventScript_2390FC:: @ 82390FC
+Underwater_SealedChamber_EventScript_Braille:: @ 82390FC
 	lockall
-	braillemessage Underwater_SealedChamber_Braille_2A6B15
+	braillemessage Underwater_SealedChamber_Braille_GoUpHere
 	waitbuttonpress
 	closebraillemessage
 	releaseall

data/maps/VictoryRoad_1F/map.json

@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "VictoryRoad_1F_EventScript_235E73",
+      "script": "VictoryRoad_1F_EventScript_Edgar",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "VictoryRoad_1F_EventScript_235EA1",
+      "script": "VictoryRoad_1F_EventScript_Hope",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "VictoryRoad_1F_EventScript_235E8A",
+      "script": "VictoryRoad_1F_EventScript_Albert",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "VictoryRoad_1F_EventScript_235E2C",
+      "script": "VictoryRoad_1F_EventScript_EntranceWally",
       "flag": "FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "VictoryRoad_1F_EventScript_235E35",
+      "script": "VictoryRoad_1F_EventScript_ExitWally",
       "flag": "FLAG_HIDE_VICTORY_ROAD_EXIT_WALLY"
     },
     {
@@ -115,7 +115,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "VictoryRoad_1F_EventScript_235ECF",
+      "script": "VictoryRoad_1F_EventScript_Katelynn",
       "flag": "0"
     },
     {
@@ -128,7 +128,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "VictoryRoad_1F_EventScript_235EB8",
+      "script": "VictoryRoad_1F_EventScript_Quincy",
       "flag": "0"
     }
   ],
@@ -177,7 +177,7 @@
       "elevation": 4,
       "var": "VAR_VICTORY_ROAD_1F_STATE",
       "var_value": "0",
-      "script": "VictoryRoad_1F_EventScript_235DAF"
+      "script": "VictoryRoad_1F_EventScript_WallyBattleTrigger1"
     },
     {
       "type": "trigger",
@@ -186,7 +186,7 @@
       "elevation": 4,
       "var": "VAR_VICTORY_ROAD_1F_STATE",
       "var_value": "0",
-      "script": "VictoryRoad_1F_EventScript_235DC8"
+      "script": "VictoryRoad_1F_EventScript_WallyBattleTrigger2"
     }
   ],
   "bg_events": [

data/maps/VictoryRoad_1F/scripts.inc

@@ -4,45 +4,45 @@ VictoryRoad_1F_MapScripts:: @ 8235D7A
 
 VictoryRoad_1F_OnTransition: @ 8235D80
 	compare VAR_VICTORY_ROAD_1F_STATE, 1
-	call_if_eq VictoryRoad_1F_EventScript_235D97
+	call_if_eq VictoryRoad_1F_EventScript_SetEntranceWallyPos1
 	compare VAR_VICTORY_ROAD_1F_STATE, 2
-	call_if_eq VictoryRoad_1F_EventScript_235DA3
+	call_if_eq VictoryRoad_1F_EventScript_SetEntranceWallyPos2
 	end
 
-VictoryRoad_1F_EventScript_235D97:: @ 8235D97
+VictoryRoad_1F_EventScript_SetEntranceWallyPos1:: @ 8235D97
 	setobjectxyperm 4, 2, 24
 	setobjectmovementtype 4, MOVEMENT_TYPE_FACE_DOWN
 	return
 
-VictoryRoad_1F_EventScript_235DA3:: @ 8235DA3
+VictoryRoad_1F_EventScript_SetEntranceWallyPos2:: @ 8235DA3
 	setobjectxyperm 4, 3, 24
 	setobjectmovementtype 4, MOVEMENT_TYPE_FACE_DOWN
 	return
 
-VictoryRoad_1F_EventScript_235DAF:: @ 8235DAF
+VictoryRoad_1F_EventScript_WallyBattleTrigger1:: @ 8235DAF
 	lockall
 	setvar VAR_0x8008, 1
 	addobject 4
-	applymovement 4, VictoryRoad_1F_Movement_235E15
+	applymovement 4, VictoryRoad_1F_Movement_WallyApproachPlayer1
 	waitmovement 0
-	goto VictoryRoad_1F_EventScript_235DE1
+	goto VictoryRoad_1F_EventScript_WallyEntranceBattle
 	end
 
-VictoryRoad_1F_EventScript_235DC8:: @ 8235DC8
+VictoryRoad_1F_EventScript_WallyBattleTrigger2:: @ 8235DC8
 	lockall
 	setvar VAR_0x8008, 2
 	addobject 4
-	applymovement 4, VictoryRoad_1F_Movement_235E21
+	applymovement 4, VictoryRoad_1F_Movement_WallyApproachPlayer2
 	waitmovement 0
-	goto VictoryRoad_1F_EventScript_235DE1
+	goto VictoryRoad_1F_EventScript_WallyEntranceBattle
 	end
 
-VictoryRoad_1F_EventScript_235DE1:: @ 8235DE1
+VictoryRoad_1F_EventScript_WallyEntranceBattle:: @ 8235DE1
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
-	msgbox VictoryRoad_1F_Text_235EE6, MSGBOX_DEFAULT
-	trainerbattle_no_intro TRAINER_WALLY_1, VictoryRoad_1F_Text_235FFC
-	msgbox VictoryRoad_1F_Text_236020, MSGBOX_DEFAULT
+	msgbox VictoryRoad_1F_Text_WallyNotGoingToLoseAnymore, MSGBOX_DEFAULT
+	trainerbattle_no_intro TRAINER_WALLY_1, VictoryRoad_1F_Text_WallyEntranceDefeat
+	msgbox VictoryRoad_1F_Text_WallyPostEntranceBattle, MSGBOX_DEFAULT
 	clearflag FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY
 	copyobjectxytoperm 4
 	setflag FLAG_DEFEATED_WALLY_VICTORY_ROAD
@@ -50,7 +50,7 @@ VictoryRoad_1F_EventScript_235DE1:: @ 8235DE1
 	releaseall
 	end
 
-VictoryRoad_1F_Movement_235E15: @ 8235E15
+VictoryRoad_1F_Movement_WallyApproachPlayer1: @ 8235E15
 	walk_left
 	walk_left
 	walk_left
@@ -64,7 +64,7 @@ VictoryRoad_1F_Movement_235E15: @ 8235E15
 	walk_up
 	step_end
 
-VictoryRoad_1F_Movement_235E21: @ 8235E21
+VictoryRoad_1F_Movement_WallyApproachPlayer2: @ 8235E21
 	walk_left
 	walk_left
 	walk_left
@@ -77,49 +77,51 @@ VictoryRoad_1F_Movement_235E21: @ 8235E21
 	walk_up
 	step_end
 
-VictoryRoad_1F_EventScript_235E2C:: @ 8235E2C
-	msgbox VictoryRoad_1F_Text_236020, MSGBOX_NPC
+@ This Wally appears near the entrance once his battle is triggered and remains there until the Hall of Fame is entered
+VictoryRoad_1F_EventScript_EntranceWally:: @ 8235E2C
+	msgbox VictoryRoad_1F_Text_WallyPostEntranceBattle, MSGBOX_NPC
 	end
 
-VictoryRoad_1F_EventScript_235E35:: @ 8235E35
-	trainerbattle_single TRAINER_WALLY_3, VictoryRoad_1F_Text_236073, VictoryRoad_1F_Text_2360DA
+@ This Wally appears and remains at the exit after the Hall of Fame is entered 
+VictoryRoad_1F_EventScript_ExitWally:: @ 8235E35
+	trainerbattle_single TRAINER_WALLY_3, VictoryRoad_1F_Text_WallyIntro, VictoryRoad_1F_Text_WallyDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
-	goto_if_eq VictoryRoad_1F_EventScript_235E5C
-	msgbox VictoryRoad_1F_Text_2360FE, MSGBOX_AUTOCLOSE
+	compare VAR_RESULT, TRUE
+	goto_if_eq VictoryRoad_1F_EventScript_RematchWally
+	msgbox VictoryRoad_1F_Text_WallyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-VictoryRoad_1F_EventScript_235E5C:: @ 8235E5C
-	trainerbattle_rematch TRAINER_WALLY_3, VictoryRoad_1F_Text_236073, VictoryRoad_1F_Text_2360DA
-	msgbox VictoryRoad_1F_Text_2360FE, MSGBOX_AUTOCLOSE
+VictoryRoad_1F_EventScript_RematchWally:: @ 8235E5C
+	trainerbattle_rematch TRAINER_WALLY_3, VictoryRoad_1F_Text_WallyIntro, VictoryRoad_1F_Text_WallyDefeat
+	msgbox VictoryRoad_1F_Text_WallyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-VictoryRoad_1F_EventScript_235E73:: @ 8235E73
-	trainerbattle_single TRAINER_EDGAR, VictoryRoad_1F_Text_236184, VictoryRoad_1F_Text_2361CB
-	msgbox VictoryRoad_1F_Text_2361E5, MSGBOX_AUTOCLOSE
+VictoryRoad_1F_EventScript_Edgar:: @ 8235E73
+	trainerbattle_single TRAINER_EDGAR, VictoryRoad_1F_Text_EdgarIntro, VictoryRoad_1F_Text_EdgarDefeat
+	msgbox VictoryRoad_1F_Text_EdgarPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-VictoryRoad_1F_EventScript_235E8A:: @ 8235E8A
-	trainerbattle_single TRAINER_ALBERT, VictoryRoad_1F_Text_236248, VictoryRoad_1F_Text_236290
-	msgbox VictoryRoad_1F_Text_2362A4, MSGBOX_AUTOCLOSE
+VictoryRoad_1F_EventScript_Albert:: @ 8235E8A
+	trainerbattle_single TRAINER_ALBERT, VictoryRoad_1F_Text_AlbertIntro, VictoryRoad_1F_Text_AlbertDefeat
+	msgbox VictoryRoad_1F_Text_AlbertPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-VictoryRoad_1F_EventScript_235EA1:: @ 8235EA1
-	trainerbattle_single TRAINER_HOPE, VictoryRoad_1F_Text_2362EE, VictoryRoad_1F_Text_236336
-	msgbox VictoryRoad_1F_Text_236356, MSGBOX_AUTOCLOSE
+VictoryRoad_1F_EventScript_Hope:: @ 8235EA1
+	trainerbattle_single TRAINER_HOPE, VictoryRoad_1F_Text_HopeIntro, VictoryRoad_1F_Text_HopeDefeat
+	msgbox VictoryRoad_1F_Text_HopePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-VictoryRoad_1F_EventScript_235EB8:: @ 8235EB8
-	trainerbattle_single TRAINER_QUINCY, VictoryRoad_1F_Text_236390, VictoryRoad_1F_Text_2363C4
-	msgbox VictoryRoad_1F_Text_2363D5, MSGBOX_AUTOCLOSE
+VictoryRoad_1F_EventScript_Quincy:: @ 8235EB8
+	trainerbattle_single TRAINER_QUINCY, VictoryRoad_1F_Text_QuincyIntro, VictoryRoad_1F_Text_QuincyDefeat
+	msgbox VictoryRoad_1F_Text_QuincyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-VictoryRoad_1F_EventScript_235ECF:: @ 8235ECF
-	trainerbattle_single TRAINER_KATELYNN, VictoryRoad_1F_Text_236468, VictoryRoad_1F_Text_2364A7
-	msgbox VictoryRoad_1F_Text_2364BB, MSGBOX_AUTOCLOSE
+VictoryRoad_1F_EventScript_Katelynn:: @ 8235ECF
+	trainerbattle_single TRAINER_KATELYNN, VictoryRoad_1F_Text_KatelynnIntro, VictoryRoad_1F_Text_KatelynnDefeat
+	msgbox VictoryRoad_1F_Text_KatelynnPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-VictoryRoad_1F_Text_235EE6: @ 8235EE6
+VictoryRoad_1F_Text_WallyNotGoingToLoseAnymore: @ 8235EE6
 	.string "WALLY: Hi! {PLAYER}!\p"
 	.string "I bet you're surprised to see me here!\p"
 	.string "I made it all the way here, and it's\n"
@@ -131,89 +133,89 @@ VictoryRoad_1F_Text_235EE6: @ 8235EE6
 	.string "gave me courage and strength!\p"
 	.string "Okay… Here I come!$"
 
-VictoryRoad_1F_Text_235FFC: @ 8235FFC
+VictoryRoad_1F_Text_WallyEntranceDefeat: @ 8235FFC
 	.string "Wow!\n"
 	.string "{PLAYER}, you are strong, after all!$"
 
-VictoryRoad_1F_Text_236020: @ 8236020
+VictoryRoad_1F_Text_WallyPostEntranceBattle: @ 8236020
 	.string "WALLY: I couldn't beat you today,\n"
 	.string "{PLAYER}, but one of these days, I'll\l"
 	.string "catch up to you!$"
 
-VictoryRoad_1F_Text_236073: @ 8236073
+VictoryRoad_1F_Text_WallyIntro: @ 8236073
 	.string "WALLY: Hi! {PLAYER}!\p"
 	.string "I've gotten stronger since that last\n"
 	.string "time! I wanted to show you, {PLAYER}!\p"
 	.string "Okay… Here I come!$"
 
-VictoryRoad_1F_Text_2360DA: @ 82360DA
+VictoryRoad_1F_Text_WallyDefeat: @ 82360DA
 	.string "Wow!\n"
 	.string "{PLAYER}, you are strong, after all!$"
 
-VictoryRoad_1F_Text_2360FE: @ 82360FE
+VictoryRoad_1F_Text_WallyPostBattle: @ 82360FE
 	.string "WALLY: I couldn't beat you this time,\n"
 	.string "too… But one of these days, {PLAYER},\l"
 	.string "I'm going to catch up to you…\p"
 	.string "And challenge the POKéMON LEAGUE!$"
 
-VictoryRoad_1F_Text_236184: @ 8236184
+VictoryRoad_1F_Text_EdgarIntro: @ 8236184
 	.string "I've made it this far a couple times,\n"
 	.string "but the last stretch is so long…$"
 
-VictoryRoad_1F_Text_2361CB: @ 82361CB
+VictoryRoad_1F_Text_EdgarDefeat: @ 82361CB
 	.string "My dream ends here again…$"
 
-VictoryRoad_1F_Text_2361E5: @ 82361E5
+VictoryRoad_1F_Text_EdgarPostBattle: @ 82361E5
 	.string "You've made it this far. Keep the\n"
 	.string "momentum going and become the\l"
 	.string "CHAMPION! If anyone can, it's you!$"
 
-VictoryRoad_1F_Text_236248: @ 8236248
+VictoryRoad_1F_Text_AlbertIntro: @ 8236248
 	.string "I didn't come all this way to lose now.\n"
 	.string "That possibility doesn't exist!$"
 
-VictoryRoad_1F_Text_236290: @ 8236290
+VictoryRoad_1F_Text_AlbertDefeat: @ 8236290
 	.string "Impossible…\n"
 	.string "I lost?$"
 
-VictoryRoad_1F_Text_2362A4: @ 82362A4
+VictoryRoad_1F_Text_AlbertPostBattle: @ 82362A4
 	.string "I lost here…\p"
 	.string "That means I lack the qualifications\n"
 	.string "to become the CHAMPION…$"
 
-VictoryRoad_1F_Text_2362EE: @ 82362EE
+VictoryRoad_1F_Text_HopeIntro: @ 82362EE
 	.string "This seemingly infinite and harsh road\n"
 	.string "lives up to its name of VICTORY.$"
 
-VictoryRoad_1F_Text_236336: @ 8236336
+VictoryRoad_1F_Text_HopeDefeat: @ 8236336
 	.string "Your battle style is fantastic…$"
 
-VictoryRoad_1F_Text_236356: @ 8236356
+VictoryRoad_1F_Text_HopePostBattle: @ 8236356
 	.string "You seem to have the potential for\n"
 	.string "becoming the CHAMPION.$"
 
-VictoryRoad_1F_Text_236390: @ 8236390
+VictoryRoad_1F_Text_QuincyIntro: @ 8236390
 	.string "What is the VICTORY ROAD?\n"
 	.string "I'll tell you if you win!$"
 
-VictoryRoad_1F_Text_2363C4: @ 82363C4
+VictoryRoad_1F_Text_QuincyDefeat: @ 82363C4
 	.string "Okay!\n"
 	.string "Well done!$"
 
-VictoryRoad_1F_Text_2363D5: @ 82363D5
+VictoryRoad_1F_Text_QuincyPostBattle: @ 82363D5
 	.string "Getting through here safely--that's\n"
 	.string "the final test for any TRAINER aiming\l"
 	.string "to become the POKéMON CHAMPION.\p"
 	.string "That's why it's called the VICTORY\n"
 	.string "ROAD.$"
 
-VictoryRoad_1F_Text_236468: @ 8236468
+VictoryRoad_1F_Text_KatelynnIntro: @ 8236468
 	.string "I have nothing to say to anyone\n"
 	.string "that's come this far. Come on!$"
 
-VictoryRoad_1F_Text_2364A7: @ 82364A7
+VictoryRoad_1F_Text_KatelynnDefeat: @ 82364A7
 	.string "This is a disgrace…$"
 
-VictoryRoad_1F_Text_2364BB: @ 82364BB
+VictoryRoad_1F_Text_KatelynnPostBattle: @ 82364BB
 	.string "Humph, go right on ahead.\n"
 	.string "See if I care.$"

data/maps/VictoryRoad_B1F/map.json

@@ -193,7 +193,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "VictoryRoad_B1F_EventScript_2364E5",
+      "script": "VictoryRoad_B1F_EventScript_Samuel",
       "flag": "0"
     },
     {
@@ -206,7 +206,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "VictoryRoad_B1F_EventScript_2364FC",
+      "script": "VictoryRoad_B1F_EventScript_Shannon",
       "flag": "0"
     },
     {
@@ -219,7 +219,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "VictoryRoad_B1F_EventScript_236513",
+      "script": "VictoryRoad_B1F_EventScript_Michelle",
       "flag": "0"
     },
     {
@@ -271,7 +271,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "VictoryRoad_B1F_EventScript_23652A",
+      "script": "VictoryRoad_B1F_EventScript_Mitchell",
       "flag": "0"
     },
     {
@@ -284,7 +284,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "VictoryRoad_B1F_EventScript_236541",
+      "script": "VictoryRoad_B1F_EventScript_Halle",
       "flag": "0"
     }
   ],

data/maps/VictoryRoad_B1F/scripts.inc

@@ -1,88 +1,88 @@
 VictoryRoad_B1F_MapScripts:: @ 82364E4
 	.byte 0
 
-VictoryRoad_B1F_EventScript_2364E5:: @ 82364E5
-	trainerbattle_single TRAINER_SAMUEL, VictoryRoad_B1F_Text_236558, VictoryRoad_B1F_Text_2365AD
-	msgbox VictoryRoad_B1F_Text_2365C4, MSGBOX_AUTOCLOSE
+VictoryRoad_B1F_EventScript_Samuel:: @ 82364E5
+	trainerbattle_single TRAINER_SAMUEL, VictoryRoad_B1F_Text_SamuelIntro, VictoryRoad_B1F_Text_SamuelDefeat
+	msgbox VictoryRoad_B1F_Text_SamuelPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-VictoryRoad_B1F_EventScript_2364FC:: @ 82364FC
-	trainerbattle_single TRAINER_SHANNON, VictoryRoad_B1F_Text_2365FD, VictoryRoad_B1F_Text_23664D
-	msgbox VictoryRoad_B1F_Text_236678, MSGBOX_AUTOCLOSE
+VictoryRoad_B1F_EventScript_Shannon:: @ 82364FC
+	trainerbattle_single TRAINER_SHANNON, VictoryRoad_B1F_Text_ShannonIntro, VictoryRoad_B1F_Text_ShannonDefeat
+	msgbox VictoryRoad_B1F_Text_ShannonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-VictoryRoad_B1F_EventScript_236513:: @ 8236513
-	trainerbattle_single TRAINER_MICHELLE, VictoryRoad_B1F_Text_2366C2, VictoryRoad_B1F_Text_23670B
-	msgbox VictoryRoad_B1F_Text_23671B, MSGBOX_AUTOCLOSE
+VictoryRoad_B1F_EventScript_Michelle:: @ 8236513
+	trainerbattle_single TRAINER_MICHELLE, VictoryRoad_B1F_Text_MichelleIntro, VictoryRoad_B1F_Text_MichelleDefeat
+	msgbox VictoryRoad_B1F_Text_MichellePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-VictoryRoad_B1F_EventScript_23652A:: @ 823652A
-	trainerbattle_single TRAINER_MITCHELL, VictoryRoad_B1F_Text_236757, VictoryRoad_B1F_Text_236780
-	msgbox VictoryRoad_B1F_Text_2367A7, MSGBOX_AUTOCLOSE
+VictoryRoad_B1F_EventScript_Mitchell:: @ 823652A
+	trainerbattle_single TRAINER_MITCHELL, VictoryRoad_B1F_Text_MitchellIntro, VictoryRoad_B1F_Text_MitchellDefeat
+	msgbox VictoryRoad_B1F_Text_MitchellPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-VictoryRoad_B1F_EventScript_236541:: @ 8236541
-	trainerbattle_single TRAINER_HALLE, VictoryRoad_B1F_Text_2367FD, VictoryRoad_B1F_Text_23683B
-	msgbox VictoryRoad_B1F_Text_23684C, MSGBOX_AUTOCLOSE
+VictoryRoad_B1F_EventScript_Halle:: @ 8236541
+	trainerbattle_single TRAINER_HALLE, VictoryRoad_B1F_Text_HalleIntro, VictoryRoad_B1F_Text_HalleDefeat
+	msgbox VictoryRoad_B1F_Text_HallePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-VictoryRoad_B1F_Text_236558: @ 8236558
+VictoryRoad_B1F_Text_SamuelIntro: @ 8236558
 	.string "The thought that I'm getting closer to\n"
 	.string "the POKéMON LEAGUE…\p"
 	.string "I'm getting stage fright…$"
 
-VictoryRoad_B1F_Text_2365AD: @ 82365AD
+VictoryRoad_B1F_Text_SamuelDefeat: @ 82365AD
 	.string "I couldn't do a thing…$"
 
-VictoryRoad_B1F_Text_2365C4: @ 82365C4
+VictoryRoad_B1F_Text_SamuelPostBattle: @ 82365C4
 	.string "The POKéMON LEAGUE became distant\n"
 	.string "again… What a letdown…$"
 
-VictoryRoad_B1F_Text_2365FD: @ 82365FD
+VictoryRoad_B1F_Text_ShannonIntro: @ 82365FD
 	.string "To win your way through the POKéMON\n"
 	.string "LEAGUE, you need the trust of your\l"
 	.string "POKéMON.$"
 
-VictoryRoad_B1F_Text_23664D: @ 823664D
+VictoryRoad_B1F_Text_ShannonDefeat: @ 823664D
 	.string "Your relationship is based on\n"
 	.string "solid trust.$"
 
-VictoryRoad_B1F_Text_236678: @ 8236678
+VictoryRoad_B1F_Text_ShannonPostBattle: @ 8236678
 	.string "By being together all the time, trust\n"
 	.string "grows between POKéMON and TRAINERS.$"
 
-VictoryRoad_B1F_Text_2366C2: @ 82366C2
+VictoryRoad_B1F_Text_MichelleIntro: @ 82366C2
 	.string "This isn't the goal. It's only a place\n"
 	.string "on the way to the POKéMON LEAGUE.$"
 
-VictoryRoad_B1F_Text_23670B: @ 823670B
+VictoryRoad_B1F_Text_MichelleDefeat: @ 823670B
 	.string "That's the way!$"
 
-VictoryRoad_B1F_Text_23671B: @ 823671B
+VictoryRoad_B1F_Text_MichellePostBattle: @ 823671B
 	.string "You'll do fine, for sure!\n"
 	.string "Your POKéMON are all eager to go!$"
 
-VictoryRoad_B1F_Text_236757: @ 8236757
+VictoryRoad_B1F_Text_MitchellIntro: @ 8236757
 	.string "My POKéMON are cosmically\n"
 	.string "awe inspiring!$"
 
-VictoryRoad_B1F_Text_236780: @ 8236780
+VictoryRoad_B1F_Text_MitchellDefeat: @ 8236780
 	.string "I've never met anyone like you before.$"
 
-VictoryRoad_B1F_Text_2367A7: @ 82367A7
+VictoryRoad_B1F_Text_MitchellPostBattle: @ 82367A7
 	.string "Even outside of battle, I sense\n"
 	.string "incredible power emanating from you\l"
 	.string "and your POKéMON.$"
 
-VictoryRoad_B1F_Text_2367FD: @ 82367FD
+VictoryRoad_B1F_Text_HalleIntro: @ 82367FD
 	.string "Okay, no need to get your back up!\n"
 	.string "Relax, let's take it easy!$"
 
-VictoryRoad_B1F_Text_23683B: @ 823683B
+VictoryRoad_B1F_Text_HalleDefeat: @ 823683B
 	.string "Whoa!\n"
 	.string "Wonderful!$"
 
-VictoryRoad_B1F_Text_23684C: @ 823684C
+VictoryRoad_B1F_Text_HallePostBattle: @ 823684C
 	.string "Sure, this is VICTORY ROAD.\p"
 	.string "But it's not all that different from\n"
 	.string "the path you've taken so far.\p"

data/maps/VictoryRoad_B2F/map.json

@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "VictoryRoad_B2F_EventScript_2368D5",
+      "script": "VictoryRoad_B2F_EventScript_Vito",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "VictoryRoad_B2F_EventScript_2368EC",
+      "script": "VictoryRoad_B2F_EventScript_Owen",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "VictoryRoad_B2F_EventScript_236903",
+      "script": "VictoryRoad_B2F_EventScript_Caroline",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "VictoryRoad_B2F_EventScript_23691A",
+      "script": "VictoryRoad_B2F_EventScript_Julie",
       "flag": "0"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "VictoryRoad_B2F_EventScript_236948",
+      "script": "VictoryRoad_B2F_EventScript_Dianne",
       "flag": "0"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "VictoryRoad_B2F_EventScript_236931",
+      "script": "VictoryRoad_B2F_EventScript_Felix",
       "flag": "0"
     }
   ],

data/maps/VictoryRoad_B2F/scripts.inc

@@ -1,108 +1,108 @@
 VictoryRoad_B2F_MapScripts:: @ 82368D4
 	.byte 0
 
-VictoryRoad_B2F_EventScript_2368D5:: @ 82368D5
-	trainerbattle_single TRAINER_VITO, VictoryRoad_B2F_Text_23695F, VictoryRoad_B2F_Text_2369B3
-	msgbox VictoryRoad_B2F_Text_2369DE, MSGBOX_AUTOCLOSE
+VictoryRoad_B2F_EventScript_Vito:: @ 82368D5
+	trainerbattle_single TRAINER_VITO, VictoryRoad_B2F_Text_VitoIntro, VictoryRoad_B2F_Text_VitoDefeat
+	msgbox VictoryRoad_B2F_Text_VitoPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-VictoryRoad_B2F_EventScript_2368EC:: @ 82368EC
-	trainerbattle_single TRAINER_OWEN, VictoryRoad_B2F_Text_236A4C, VictoryRoad_B2F_Text_236A92
-	msgbox VictoryRoad_B2F_Text_236AAE, MSGBOX_AUTOCLOSE
+VictoryRoad_B2F_EventScript_Owen:: @ 82368EC
+	trainerbattle_single TRAINER_OWEN, VictoryRoad_B2F_Text_OwenIntro, VictoryRoad_B2F_Text_OwenDefeat
+	msgbox VictoryRoad_B2F_Text_OwenPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-VictoryRoad_B2F_EventScript_236903:: @ 8236903
-	trainerbattle_single TRAINER_CAROLINE, VictoryRoad_B2F_Text_236AF0, VictoryRoad_B2F_Text_236B14
-	msgbox VictoryRoad_B2F_Text_236B2F, MSGBOX_AUTOCLOSE
+VictoryRoad_B2F_EventScript_Caroline:: @ 8236903
+	trainerbattle_single TRAINER_CAROLINE, VictoryRoad_B2F_Text_CarolineIntro, VictoryRoad_B2F_Text_CarolineDefeat
+	msgbox VictoryRoad_B2F_Text_CarolinePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-VictoryRoad_B2F_EventScript_23691A:: @ 823691A
-	trainerbattle_single TRAINER_JULIE, VictoryRoad_B2F_Text_236B88, VictoryRoad_B2F_Text_236C0A
-	msgbox VictoryRoad_B2F_Text_236C21, MSGBOX_AUTOCLOSE
+VictoryRoad_B2F_EventScript_Julie:: @ 823691A
+	trainerbattle_single TRAINER_JULIE, VictoryRoad_B2F_Text_JulieIntro, VictoryRoad_B2F_Text_JulieDefeat
+	msgbox VictoryRoad_B2F_Text_JuliePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-VictoryRoad_B2F_EventScript_236931:: @ 8236931
-	trainerbattle_single TRAINER_FELIX, VictoryRoad_B2F_Text_236C67, VictoryRoad_B2F_Text_236CAB
-	msgbox VictoryRoad_B2F_Text_236CBA, MSGBOX_AUTOCLOSE
+VictoryRoad_B2F_EventScript_Felix:: @ 8236931
+	trainerbattle_single TRAINER_FELIX, VictoryRoad_B2F_Text_FelixIntro, VictoryRoad_B2F_Text_FelixDefeat
+	msgbox VictoryRoad_B2F_Text_FelixPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-VictoryRoad_B2F_EventScript_236948:: @ 8236948
-	trainerbattle_single TRAINER_DIANNE, VictoryRoad_B2F_Text_236D27, VictoryRoad_B2F_Text_236D6E
-	msgbox VictoryRoad_B2F_Text_236D8C, MSGBOX_AUTOCLOSE
+VictoryRoad_B2F_EventScript_Dianne:: @ 8236948
+	trainerbattle_single TRAINER_DIANNE, VictoryRoad_B2F_Text_DianneIntro, VictoryRoad_B2F_Text_DianneDefeat
+	msgbox VictoryRoad_B2F_Text_DiannePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-VictoryRoad_B2F_Text_23695F: @ 823695F
+VictoryRoad_B2F_Text_VitoIntro: @ 823695F
 	.string "I trained together with my whole family,\n"
 	.string "every one of us!\l"
 	.string "I'm not losing to anyone!$"
 
-VictoryRoad_B2F_Text_2369B3: @ 82369B3
+VictoryRoad_B2F_Text_VitoDefeat: @ 82369B3
 	.string "Better than my family?!\n"
 	.string "Is that possible?!$"
 
-VictoryRoad_B2F_Text_2369DE: @ 82369DE
+VictoryRoad_B2F_Text_VitoPostBattle: @ 82369DE
 	.string "I was better than everyone in my\n"
 	.string "family. I've never lost before…\p"
 	.string "I've lost my confidence…\n"
 	.string "Maybe I'll go home…$"
 
-VictoryRoad_B2F_Text_236A4C: @ 8236A4C
+VictoryRoad_B2F_Text_OwenIntro: @ 8236A4C
 	.string "I'd heard that there was a tough\n"
 	.string "little kid around. Do they mean you?$"
 
-VictoryRoad_B2F_Text_236A92: @ 8236A92
+VictoryRoad_B2F_Text_OwenDefeat: @ 8236A92
 	.string "The little shrimp is tough!$"
 
-VictoryRoad_B2F_Text_236AAE: @ 8236AAE
+VictoryRoad_B2F_Text_OwenPostBattle: @ 8236AAE
 	.string "The rumors I heard, that tough little\n"
 	.string "kid is from PETALBURG CITY.$"
 
-VictoryRoad_B2F_Text_236AF0: @ 8236AF0
+VictoryRoad_B2F_Text_CarolineIntro: @ 8236AF0
 	.string "You must be getting a little tired.$"
 
-VictoryRoad_B2F_Text_236B14: @ 8236B14
+VictoryRoad_B2F_Text_CarolineDefeat: @ 8236B14
 	.string "No signs of tiring at all!$"
 
-VictoryRoad_B2F_Text_236B2F: @ 8236B2F
+VictoryRoad_B2F_Text_CarolinePostBattle: @ 8236B2F
 	.string "VICTORY ROAD and the POKéMON LEAGUE\n"
 	.string "are long and grueling challenges.\l"
 	.string "Beware of fatigue!$"
 
-VictoryRoad_B2F_Text_236B88: @ 8236B88
+VictoryRoad_B2F_Text_JulieIntro: @ 8236B88
 	.string "You shouldn't get complacent just\n"
 	.string "because you have a lot of GYM BADGES.\p"
 	.string "There's always going to be someone\n"
 	.string "who's better than you!$"
 
-VictoryRoad_B2F_Text_236C0A: @ 8236C0A
+VictoryRoad_B2F_Text_JulieDefeat: @ 8236C0A
 	.string "You're better than me!$"
 
-VictoryRoad_B2F_Text_236C21: @ 8236C21
+VictoryRoad_B2F_Text_JuliePostBattle: @ 8236C21
 	.string "Gaze on your collected BADGES and\n"
 	.string "remember the TRAINERS you've faced.$"
 
-VictoryRoad_B2F_Text_236C67: @ 8236C67
+VictoryRoad_B2F_Text_FelixIntro: @ 8236C67
 	.string "I've come this far, but the tension's\n"
 	.string "giving me awful stomach pain…$"
 
-VictoryRoad_B2F_Text_236CAB: @ 8236CAB
+VictoryRoad_B2F_Text_FelixDefeat: @ 8236CAB
 	.string "Ooh…\n"
 	.string "It hurts…$"
 
-VictoryRoad_B2F_Text_236CBA: @ 8236CBA
+VictoryRoad_B2F_Text_FelixPostBattle: @ 8236CBA
 	.string "I can't help getting all tense knowing\n"
 	.string "that I'm nearing the POKéMON LEAGUE.\p"
 	.string "It's all I can do to feign calm.$"
 
-VictoryRoad_B2F_Text_236D27: @ 8236D27
+VictoryRoad_B2F_Text_DianneIntro: @ 8236D27
 	.string "The elite among the elite gather in\n"
 	.string "this cave.\p"
 	.string "How are you finding it?$"
 
-VictoryRoad_B2F_Text_236D6E: @ 8236D6E
+VictoryRoad_B2F_Text_DianneDefeat: @ 8236D6E
 	.string "Not rattled in the least bit!$"
 
-VictoryRoad_B2F_Text_236D8C: @ 8236D8C
+VictoryRoad_B2F_Text_DiannePostBattle: @ 8236D8C
 	.string "You do have guts! I like that!\n"
 	.string "Keep it going!$"
 

data/scripts/new_game.inc

@@ -166,7 +166,7 @@ EventScript_ResetAllMapFlags:: @ 82715DE
 	setflag FLAG_HIDE_TRICK_HOUSE_ENTRANCE_MAN
 	setflag FLAG_HIDE_MT_CHIMNEY_TRAINERS
 	setflag FLAG_HIDE_MT_CHIMNEY_LAVA_COOKIE_LADY
-	setflag FLAG_HIDE_RUSTURF_TUNNEL_OLD_MAN
+	setflag FLAG_HIDE_RUSTURF_TUNNEL_BRINEY
 	setflag FLAG_HIDE_ROUTE_116_MR_BRINEY
 	setflag FLAG_HIDE_RUSTURF_TUNNEL_PEEKO
 	setflag FLAG_HIDE_RUSTURF_TUNNEL_AQUA_GRUNT
@@ -237,7 +237,7 @@ EventScript_ResetAllMapFlags:: @ 82715DE
 	setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS
 	setflag FLAG_HIDE_DEOXYS
 	setflag FLAG_HIDE_SAFARI_ZONE_SOUTH_EAST_EXPANSION
-	setflag FLAG_HIDE_FALLORBOR_TOWN_BATTLE_TENT_SCOTT
+	setflag FLAG_HIDE_FALLARBOR_TOWN_BATTLE_TENT_SCOTT
 	setflag FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT
 	setflag FLAG_HIDE_SKY_PILLAR_WALLACE
 	setflag FLAG_HIDE_RAYQUAZA_SKY_TOWER_SUMMIT

data/text/braille.inc

@@ -1,4 +1,4 @@
-Underwater_SealedChamber_Braille_2A6B15: @ 82A6B15
+Underwater_SealedChamber_Braille_GoUpHere: @ 82A6B15
 	.byte 4
 	.byte 6
 	.byte 26
@@ -7,7 +7,7 @@ Underwater_SealedChamber_Braille_2A6B15: @ 82A6B15
 	.byte 9
 	.braille "GO UP HERE.$"
 
-SealedChamber_OuterRoom_Braille_2A6B27: @ 82A6B27
+SealedChamber_OuterRoom_Braille_ABC: @ 82A6B27
 	.byte 7
 	.byte 6
 	.byte 21
@@ -16,7 +16,7 @@ SealedChamber_OuterRoom_Braille_2A6B27: @ 82A6B27
 	.byte 9
 	.braille "ABC$"
 
-SealedChamber_OuterRoom_Braille_2A6B31: @ 82A6B31
+SealedChamber_OuterRoom_Braille_GHI: @ 82A6B31
 	.byte 7
 	.byte 6
 	.byte 21
@@ -25,7 +25,7 @@ SealedChamber_OuterRoom_Braille_2A6B31: @ 82A6B31
 	.byte 9
 	.braille "GHI$"
 
-SealedChamber_OuterRoom_Braille_2A6B3B: @ 82A6B3B
+SealedChamber_OuterRoom_Braille_MNO: @ 82A6B3B
 	.byte 7
 	.byte 6
 	.byte 21
@@ -34,7 +34,7 @@ SealedChamber_OuterRoom_Braille_2A6B3B: @ 82A6B3B
 	.byte 9
 	.braille "MNO$"
 
-SealedChamber_OuterRoom_Braille_2A6B45: @ 82A6B45
+SealedChamber_OuterRoom_Braille_TUV: @ 82A6B45
 	.byte 7
 	.byte 6
 	.byte 21
@@ -43,7 +43,7 @@ SealedChamber_OuterRoom_Braille_2A6B45: @ 82A6B45
 	.byte 9
 	.braille "TUV$"
 
-SealedChamber_OuterRoom_Braille_2A6B4F: @ 82A6B4F
+SealedChamber_OuterRoom_Braille_DEF: @ 82A6B4F
 	.byte 7
 	.byte 6
 	.byte 21
@@ -52,7 +52,7 @@ SealedChamber_OuterRoom_Braille_2A6B4F: @ 82A6B4F
 	.byte 9
 	.braille "DEF$"
 
-SealedChamber_OuterRoom_Braille_2A6B59: @ 82A6B59
+SealedChamber_OuterRoom_Braille_JKL: @ 82A6B59
 	.byte 7
 	.byte 6
 	.byte 21
@@ -61,7 +61,7 @@ SealedChamber_OuterRoom_Braille_2A6B59: @ 82A6B59
 	.byte 9
 	.braille "JKL$"
 
-SealedChamber_OuterRoom_Braille_2A6B63: @ 82A6B63
+SealedChamber_OuterRoom_Braille_PQRS: @ 82A6B63
 	.byte 7
 	.byte 6
 	.byte 21
@@ -70,7 +70,7 @@ SealedChamber_OuterRoom_Braille_2A6B63: @ 82A6B63
 	.byte 9
 	.braille "PQRS$"
 
-SealedChamber_OuterRoom_Braille_2A6B6E: @ 82A6B6E
+SealedChamber_OuterRoom_Braille_Period: @ 82A6B6E
 	.byte 9
 	.byte 6
 	.byte 19
@@ -79,7 +79,7 @@ SealedChamber_OuterRoom_Braille_2A6B6E: @ 82A6B6E
 	.byte 9
 	.braille ".$"
 
-SealedChamber_OuterRoom_Braille_2A6B76: @ 82A6B76
+SealedChamber_OuterRoom_Braille_WXYZ: @ 82A6B76
 	.byte 7
 	.byte 6
 	.byte 21
@@ -88,7 +88,7 @@ SealedChamber_OuterRoom_Braille_2A6B76: @ 82A6B76
 	.byte 9
 	.braille "WXYZ$"
 
-SealedChamber_OuterRoom_Braille_2A6B81: @ 82A6B81
+SealedChamber_OuterRoom_Braille_Comma: @ 82A6B81
 	.byte 9
 	.byte 6
 	.byte 19
@@ -97,7 +97,7 @@ SealedChamber_OuterRoom_Braille_2A6B81: @ 82A6B81
 	.byte 9
 	.braille ",$"
 
-SealedChamber_OuterRoom_Braille_2A6B89: @ 82A6B89
+SealedChamber_OuterRoom_Braille_DigHere: @ 82A6B89
 	.byte 7
 	.byte 4
 	.byte 23
@@ -106,7 +106,7 @@ SealedChamber_OuterRoom_Braille_2A6B89: @ 82A6B89
 	.byte 7
 	.braille "DIG HERE.$"
 
-SealedChamber_InnerRoom_Braille_2A6B99: @ 82A6B99
+SealedChamber_InnerRoom_Braille_FirstWailordLastRelicanth: @ 82A6B99
 	.byte 0
 	.byte 0
 	.byte 29
@@ -118,7 +118,7 @@ SealedChamber_InnerRoom_Braille_2A6B99: @ 82A6B99
 	.braille "LAST COMES\n"
 	.braille "RELICANTH.$"
 
-SealedChamber_InnerRoom_Braille_2A6BCA: @ 82A6BCA
+SealedChamber_InnerRoom_Braille_InThisCaveWeHaveLived: @ 82A6BCA
 	.byte 2
 	.byte 0
 	.byte 26
@@ -130,7 +130,7 @@ SealedChamber_InnerRoom_Braille_2A6BCA: @ 82A6BCA
 	.braille "HAVE\n"
 	.braille "LIVED.$"
 
-SealedChamber_InnerRoom_Braille_2A6BEC: @ 82A6BEC
+SealedChamber_InnerRoom_Braille_WeOweAllToThePokemon: @ 82A6BEC
 	.byte 7
 	.byte 2
 	.byte 23
@@ -141,7 +141,7 @@ SealedChamber_InnerRoom_Braille_2A6BEC: @ 82A6BEC
 	.braille "TO THE\n"
 	.braille "POKEMON.$"
 
-SealedChamber_InnerRoom_Braille_2A6C0D: @ 82A6C0D
+SealedChamber_InnerRoom_Braille_ButWeSealedThePokemonAway: @ 82A6C0D
 	.byte 3
 	.byte 0
 	.byte 25
@@ -153,7 +153,7 @@ SealedChamber_InnerRoom_Braille_2A6C0D: @ 82A6C0D
 	.braille "POKEMON\n"
 	.braille "AWAY.$"
 
-SealedChamber_InnerRoom_Braille_2A6C34: @ 82A6C34
+SealedChamber_InnerRoom_Braille_WeFearedIt: @ 82A6C34
 	.byte 5
 	.byte 6
 	.byte 25
@@ -162,7 +162,7 @@ SealedChamber_InnerRoom_Braille_2A6C34: @ 82A6C34
 	.byte 9
 	.braille "WE FEARED IT.$"
 
-SealedChamber_InnerRoom_Braille_2A6C48: @ 82A6C48
+SealedChamber_InnerRoom_Braille_ThoseWithCourageHope: @ 82A6C48
 	.byte 6
 	.byte 0
 	.byte 24
@@ -174,7 +174,7 @@ SealedChamber_InnerRoom_Braille_2A6C48: @ 82A6C48
 	.braille "THOSE WITH\n"
 	.braille "HOPE.$"
 
-SealedChamber_InnerRoom_Braille_2A6C73: @ 82A6C73
+SealedChamber_InnerRoom_Braille_OpenDoorEternalPokemonWaits: @ 82A6C73
 	.byte 3
 	.byte 2
 	.byte 27

data/text/shoal_cave.inc

@@ -1,4 +1,4 @@
-ShoalCave_LowTideEntranceRoom_Text_2A7E0E: @ 82A7E0E
+ShoalCave_LowTideEntranceRoom_Text_AreYouPlanningOnGoingInThere: @ 82A7E0E
 	.string "Are you planning on going deep\n"
 	.string "in there?\p"
 	.string "How about bringing me back some\n"
@@ -6,27 +6,27 @@ ShoalCave_LowTideEntranceRoom_Text_2A7E0E: @ 82A7E0E
 	.string "I can make you something good if\n"
 	.string "you bring me the ingredients.$"
 
-ShoalCave_LowTideEntranceRoom_Text_2A7EB3: @ 82A7EB3
+ShoalCave_LowTideEntranceRoom_Text_BringMe4ShoalSaltAndShells: @ 82A7EB3
 	.string "If you bring me four each of the\n"
 	.string "SHOAL SALT and SHOAL SHELLS,\l"
 	.string "I can make you a SHELL BELL…\p"
 	.string "You can get those ingredients\n"
 	.string "every day.$"
 
-ShoalCave_LowTideEntranceRoom_Text_2A7F37: @ 82A7F37
+ShoalCave_LowTideEntranceRoom_Text_WouldYouLikeShellBell: @ 82A7F37
 	.string "Oh, hey! SHOAL SALT and SHOAL SHELLS!\n"
 	.string "And enough of them, too!\p"
 	.string "Would you like me to make you\n"
 	.string "a SHELL BELL with them?$"
 
-ShoalCave_LowTideEntranceRoom_Text_2A7FAC: @ 82A7FAC
+ShoalCave_LowTideEntranceRoom_Text_MakeShellBellRightAway: @ 82A7FAC
 	.string "All righty, then! I'll make you\n"
 	.string "a SHELL BELL right away.\p"
 	.string "… … … … … … … …\n"
 	.string "… … … … … … … …\p"
 	.string "There! Done!$"
 
-ShoalCave_LowTideEntranceRoom_Text_2A8012: @ 82A8012
+ShoalCave_LowTideEntranceRoom_Text_ExplainShellBell: @ 82A8012
 	.string "Have a POKéMON hold on to that.\n"
 	.string "It'll love it, that's for certain.\p"
 	.string "Why, the SHELL BELL's chime…\n"
@@ -34,22 +34,20 @@ ShoalCave_LowTideEntranceRoom_Text_2A8012: @ 82A8012
 	.string "You can get its ingredients every day,\n"
 	.string "so I can make you more.$"
 
-ShoalCave_LowTideEntranceRoom_Text_2A80C6: @ 82A80C6
+ShoalCave_LowTideEntranceRoom_Text_WantedToMakeShellBell: @ 82A80C6
 	.string "Oh… Is that so…\n"
 	.string "I wanted to make a SHELL BELL…$"
 
-ShoalCave_LowTideEntranceRoom_Text_2A80F5: @ 82A80F5
+ShoalCave_LowTideEntranceRoom_Text_NoSpaceInYourBag: @ 82A80F5
 	.string "You don't have space in your BAG\n"
 	.string "if I were to make it for you.\p"
 	.string "You should make room and come back\n"
 	.string "for a SHELL BELL.$"
 
-ShoalCave_LowTideInnerRoom_Text_2A8169: @ 82A8169
-ShoalCave_LowTideLowerRoom_Text_2A8169: @ 82A8169
-ShoalCave_LowTideStairsRoom_Text_2A8169: @ 82A8169
+ShoalCave_Text_WasShoalSaltNowNothing: @ 82A8169
 	.string "There was some SHOAL SALT here.\n"
 	.string "But, there's nothing here now.$"
 
-ShoalCave_LowTideInnerRoom_Text_2A81A8: @ 82A81A8
+ShoalCave_Text_WasShoallShellNowNothing: @ 82A81A8
 	.string "There was a SHOAL SHELL here.\n"
 	.string "But, there's nothing here now.$"

include/constants/flags.h

@@ -261,7 +261,7 @@
 #define FLAG_USED_ROOM_2_KEY                 0xF1
 #define FLAG_USED_ROOM_4_KEY                 0xF2
 #define FLAG_USED_ROOM_6_KEY                 0xF3
-#define FLAG_MET_PROF_COSMO                  0xF4
+#define FLAG_MET_PROF_COZMO                  0xF4
 #define FLAG_RECEIVED_WAILMER_DOLL           0xF5
 #define FLAG_RECEIVED_CHESTO_BERRY_ROUTE_104 0xF6
 #define FLAG_DEFEATED_SS_TIDAL_TRAINERS      0xF7
@@ -807,7 +807,7 @@
 #define FLAG_HIDE_BIRTH_ISLAND_DEOXYS_TRIANGLE                      0x2FC
 #define FLAG_HIDE_MAUVILLE_CITY_SCOTT                               0x2FD
 #define FLAG_HIDE_VERDANTURF_TOWN_SCOTT                             0x2FE
-#define FLAG_HIDE_FALLORBOR_TOWN_BATTLE_TENT_SCOTT                  0x2FF
+#define FLAG_HIDE_FALLARBOR_TOWN_BATTLE_TENT_SCOTT                  0x2FF
 #define FLAG_HIDE_ROUTE_111_VICTOR_WINSTRATE                        0x300
 #define FLAG_HIDE_ROUTE_111_VICTORIA_WINSTRATE                      0x301
 #define FLAG_HIDE_ROUTE_111_VIVI_WINSTRATE                          0x302
@@ -919,7 +919,7 @@
 #define FLAG_HIDE_ROUTE_111_DESERT_FOSSIL                           0x36C
 #define FLAG_HIDE_MT_CHIMNEY_TRAINERS                               0x36D
 #define FLAG_HIDE_RUSTURF_TUNNEL_AQUA_GRUNT                         0x36E
-#define FLAG_HIDE_RUSTURF_TUNNEL_OLD_MAN                            0x36F
+#define FLAG_HIDE_RUSTURF_TUNNEL_BRINEY                             0x36F
 #define FLAG_HIDE_RUSTURF_TUNNEL_PEEKO                              0x370
 #define FLAG_HIDE_BRINEYS_HOUSE_PEEKO                               0x371
 #define FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA                          0x372

src/field_specials.c

@@ -1427,7 +1427,9 @@ bool8 Special_AreLeadMonEVsMaxedOut(void)
 
 u8 TryUpdateRusturfTunnelState(void)
 {
-    if (!FlagGet(FLAG_RUSTURF_TUNNEL_OPENED) && gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(RUSTURF_TUNNEL) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(RUSTURF_TUNNEL))
+    if (!FlagGet(FLAG_RUSTURF_TUNNEL_OPENED) 
+        && gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(RUSTURF_TUNNEL) 
+        && gSaveBlock1Ptr->location.mapNum == MAP_NUM(RUSTURF_TUNNEL))
     {
         if (FlagGet(FLAG_HIDE_RUSTURF_TUNNEL_ROCK_1))
         {