Merge pull request #276 from GriffinRichards/doc-sixisland

Document Six and Seven Island scripts

data/event_scripts.s

@@ -796,6 +796,7 @@ gStdScriptsEnd::
 	.include "data/maps/SixIsland_House/text.inc"
 	.include "data/maps/SixIsland_Mart/text.inc"
 	.include "data/maps/FiveIsland_ResortGorgeous_House/text.inc"
+	.include "data/maps/TwoIsland_CapeBrink_House/text.inc"
 	.include "data/maps/SixIsland_WaterPath_House1/text.inc"
 	.include "data/maps/SixIsland_WaterPath_House2/text.inc"
 	.include "data/maps/SevenIsland_SevaultCanyon_House/text.inc"

data/maps/SevenIsland/map.json

@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_EventScript_167EC6",
+      "script": "SevenIsland_EventScript_OldWoman",
       "flag": "0"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_EventScript_167ECF",
+      "script": "SevenIsland_EventScript_Scientist",
       "flag": "0"
     }
   ],
@@ -103,7 +103,7 @@
       "x": 17,
       "y": 9,
       "elevation": 0,
-      "script": "SevenIsland_EventScript_167EBD"
+      "script": "SevenIsland_EventScript_IslandSign"
     }
   ]
 }

data/maps/SevenIsland/scripts.inc

@@ -6,14 +6,14 @@ SevenIsland_OnTransition:: @ 8167EB9
 	setworldmapflag FLAG_WORLD_MAP_SEVEN_ISLAND
 	end
 
-SevenIsland_EventScript_167EBD:: @ 8167EBD
+SevenIsland_EventScript_IslandSign:: @ 8167EBD
-	msgbox gUnknown_8183046, MSGBOX_SIGN
+	msgbox SevenIsland_Text_IslandSign, MSGBOX_SIGN
 	end
 
-SevenIsland_EventScript_167EC6:: @ 8167EC6
+SevenIsland_EventScript_OldWoman:: @ 8167EC6
-	msgbox gUnknown_818306C, MSGBOX_NPC
+	msgbox SevenIsland_Text_IslandsMadeInSevenDays, MSGBOX_NPC
 	end
 
-SevenIsland_EventScript_167ECF:: @ 8167ECF
+SevenIsland_EventScript_Scientist:: @ 8167ECF
-	msgbox gUnknown_8183143, MSGBOX_NPC
+	msgbox SevenIsland_Text_IslandVirtuallyUntouched, MSGBOX_NPC
 	end

data/maps/SevenIsland/text.inc

@@ -17,11 +17,11 @@ Text_SwordsDanceTaught:: @ 818300D
     .string "If only we could keep getting\n"
     .string "stronger and stronger, eh?$"
 
-gUnknown_8183046:: @ 8183046
+SevenIsland_Text_IslandSign:: @ 8183046
     .string "SEVEN ISLAND\n"
     .string "Quest Island of Infinity$"
 
-gUnknown_818306C:: @ 818306C
+SevenIsland_Text_IslandsMadeInSevenDays:: @ 818306C
     .string "These islands are called the SEVII\n"
     .string "ISLANDS because there are seven.\p"
     .string "…Or at least that's what the young\n"
@@ -30,7 +30,7 @@ gUnknown_818306C:: @ 818306C
     .string "named because they are said to\l"
     .string "have been made in seven days.$"
 
-gUnknown_8183143:: @ 8183143
+SevenIsland_Text_IslandVirtuallyUntouched:: @ 8183143
     .string "This island has been left virtually\n"
     .string "untouched in its natural state.\p"
     .string "It could be a little difficult to\n"

data/maps/SevenIsland_Harbor/map.json

@@ -38,7 +38,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_Harbor_EventScript_170BE5",
+      "script": "SevenIsland_Harbor_EventScript_Sailor",
       "flag": "0"
     }
   ],

data/maps/SevenIsland_Harbor/scripts.inc

@@ -1,7 +1,7 @@
 SevenIsland_Harbor_MapScripts:: @ 8170BE4
 	.byte 0
 
-SevenIsland_Harbor_EventScript_170BE5:: @ 8170BE5
+SevenIsland_Harbor_EventScript_Sailor:: @ 8170BE5
 	lock
 	faceplayer
 	message Text_WhereDoYouWantToSail

data/maps/SevenIsland_House_Room1/map.json

@@ -25,7 +25,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_House_Room1_EventScript_170958",
+      "script": "SevenIsland_House_Room1_EventScript_OldWoman",
       "flag": "0"
     }
   ],
@@ -52,7 +52,7 @@
       "x": 4,
       "y": 1,
       "elevation": 0,
-      "script": "SevenIsland_House_Room1_EventScript_170A75"
+      "script": "SevenIsland_House_Room1_EventScript_Box"
     }
   ]
 }

data/maps/SevenIsland_House_Room1/scripts.inc

@@ -1,3 +1,7 @@
+.equ LOCALID_OLD_WOMAN, 1
+
+.equ TRAINER_VISITING, VAR_TEMP_1
+
 SevenIsland_House_Room1_MapScripts:: @ 817088A
 	map_script MAP_SCRIPT_ON_TRANSITION, SevenIsland_House_Room1_OnTransition
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, SevenIsland_House_Room1_OnFrame
@@ -6,178 +10,178 @@ SevenIsland_House_Room1_MapScripts:: @ 817088A
 SevenIsland_House_Room1_OnTransition:: @ 8170895
 	special ValidateEReaderTrainer
 	compare VAR_RESULT, 0
-	call_if_eq EventScript_1708AF
+	call_if_eq SevenIsland_House_Room1_EventScript_SetTrainerVisitingLayout
 	compare VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 0
-	call_if_ne EventScript_1708C3
+	call_if_ne SevenIsland_House_Room1_EventScript_MoveOldWomanToDoor
 	end
 
-EventScript_1708AF:: @ 81708AF
+SevenIsland_House_Room1_EventScript_SetTrainerVisitingLayout:: @ 81708AF
-	setvar VAR_TEMP_1, 1
+	setvar TRAINER_VISITING, TRUE
-	setobjectxyperm 1, 4, 2
+	setobjectxyperm LOCALID_OLD_WOMAN, 4, 2
-	setobjectmovementtype 1, 8
+	setobjectmovementtype LOCALID_OLD_WOMAN, MOVEMENT_TYPE_FACE_DOWN
 	setmaplayoutindex LAYOUT_SEVEN_ISLAND_HOUSE_ROOM1_DOOR_OPEN
 	return
 
-EventScript_1708C3:: @ 81708C3
+SevenIsland_House_Room1_EventScript_MoveOldWomanToDoor:: @ 81708C3
-	setobjectxyperm 1, 3, 2
+	setobjectxyperm LOCALID_OLD_WOMAN, 3, 2
-	setobjectmovementtype 1, 10
+	setobjectmovementtype LOCALID_OLD_WOMAN, MOVEMENT_TYPE_FACE_RIGHT
 	return
 
 SevenIsland_House_Room1_OnFrame:: @ 81708CF
-	map_script_2 VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 1, EventScript_1708E9
+	map_script_2 VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 1, SevenIsland_House_Room1_EventScript_OldWomanCommentOnBattle
-	map_script_2 VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 2, EventScript_1708E9
+	map_script_2 VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 2, SevenIsland_House_Room1_EventScript_OldWomanCommentOnBattle
-	map_script_2 VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 3, EventScript_1708E9
+	map_script_2 VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 3, SevenIsland_House_Room1_EventScript_OldWomanCommentOnBattle
 	.2byte 0
 
-EventScript_1708E9:: @ 1708E9
+SevenIsland_House_Room1_EventScript_OldWomanCommentOnBattle:: @ 1708E9
 	lockall
 	textcolor 1
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_170953
+	applymovement OBJ_EVENT_ID_PLAYER, SevenIsland_House_Room1_Movement_PlayerReEnterRoom
 	waitmovement 0
-	applymovement 1, Movement_170955
+	applymovement LOCALID_OLD_WOMAN, SevenIsland_House_Room1_Movement_OldWomanWalkBehindPlayer
 	waitmovement 0
-	moveobjectoffscreen 1
+	moveobjectoffscreen LOCALID_OLD_WOMAN
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	compare VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 1
-	call_if_eq EventScript_170938
+	call_if_eq SevenIsland_House_Room1_EventScript_BattleWonComment
 	compare VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 2
-	call_if_eq EventScript_170941
+	call_if_eq SevenIsland_House_Room1_EventScript_BattleLostComment
 	compare VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 3
-	call_if_eq EventScript_17094A
+	call_if_eq SevenIsland_House_Room1_EventScript_BattleTiedComment
 	special LoadPlayerParty
 	setvar VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 0
 	releaseall
 	end
 
-EventScript_170938:: @ 8170938
+SevenIsland_House_Room1_EventScript_BattleWonComment:: @ 8170938
-	msgbox gUnknown_81A088C
+	msgbox SevenIsland_House_Room1_Text_AstoundingBattle
 	return
 
-EventScript_170941:: @ 8170941
+SevenIsland_House_Room1_EventScript_BattleLostComment:: @ 8170941
-	msgbox gUnknown_81A0971
+	msgbox SevenIsland_House_Room1_Text_FeelYourDisappointment
 	return
 
-EventScript_17094A:: @ 817094A
+SevenIsland_House_Room1_EventScript_BattleTiedComment:: @ 817094A
-	msgbox gUnknown_81A0807
+	msgbox SevenIsland_House_Room1_Text_DrawWasIt
 	return
 
-Movement_170953:: @ 8170953
+SevenIsland_House_Room1_Movement_PlayerReEnterRoom:: @ 8170953
 	walk_down
 	step_end
 
-Movement_170955:: @ 8170955
+SevenIsland_House_Room1_Movement_OldWomanWalkBehindPlayer:: @ 8170955
 	walk_right
 	walk_in_place_fastest_down
 	step_end
 
-SevenIsland_House_Room1_EventScript_170958:: @ 8170958
+SevenIsland_House_Room1_EventScript_OldWoman:: @ 8170958
 	lock
 	faceplayer
 	special ValidateEReaderTrainer
 	compare VAR_RESULT, 1
-	call_if_eq EventScript_17097D
+	call_if_eq SevenIsland_House_Room1_EventScript_InvalidVisitingTrainer
-	compare VAR_TEMP_1, 1
+	compare TRAINER_VISITING, TRUE
-	goto_if_eq EventScript_170987
+	goto_if_eq SevenIsland_House_Room1_EventScript_TrainerVisiting
-	msgbox gUnknown_81A049B
+	msgbox SevenIsland_House_Room1_Text_OnlyEnjoymentWatchingBattles
 	release
 	end
 
-EventScript_17097D:: @ 817097D
+SevenIsland_House_Room1_EventScript_InvalidVisitingTrainer:: @ 817097D
-	msgbox gUnknown_81A049B
+	msgbox SevenIsland_House_Room1_Text_OnlyEnjoymentWatchingBattles
 	release
 	end
 
-EventScript_170987:: @ 8170987
+SevenIsland_House_Room1_EventScript_TrainerVisiting:: @ 8170987
 	special SavePlayerParty
-	special Special_BufferEReaderTrainerName5
+	special BufferEReaderTrainerName
-	msgbox gUnknown_81A0598, MSGBOX_YESNO
+	msgbox SevenIsland_House_Room1_Text_ChallengeVisitingTrainer, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq EventScript_170A11
+	goto_if_eq SevenIsland_House_Room1_EventScript_DeclineBattle
-	call EventScript_170A1E
+	call SevenIsland_House_Room1_EventScript_ChooseParty
 	compare VAR_RESULT, 0
-	goto_if_eq EventScript_170A11
+	goto_if_eq SevenIsland_House_Room1_EventScript_DeclineBattle
-	msgbox gUnknown_81A0788, MSGBOX_YESNO
+	msgbox SevenIsland_House_Room1_Text_SaveProgressBeforeBattle, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq EventScript_170A11
+	goto_if_eq SevenIsland_House_Room1_EventScript_DeclineBattle
 	special LoadPlayerParty
 	call EventScript_AskSaveGame
 	compare VAR_RESULT, 0
-	goto_if_eq EventScript_170A11
+	goto_if_eq SevenIsland_House_Room1_EventScript_DeclineBattle
 	special SavePlayerParty
 	special ReducePlayerPartyToThree
-	msgbox gUnknown_81A07C4
+	msgbox SevenIsland_House_Room1_Text_DontHoldAnythingBack
 	closemessage
 	compare VAR_FACING, DIR_NORTH
-	call_if_eq EventScript_170A2D
+	call_if_eq SevenIsland_House_Room1_EventScript_EnterBattleRoomNorth
 	compare VAR_FACING, DIR_EAST
-	call_if_eq EventScript_170A3F
+	call_if_eq SevenIsland_House_Room1_EventScript_EnterBattleRoomEast
 	compare VAR_FACING, DIR_WEST
-	call_if_eq EventScript_170A51
+	call_if_eq SevenIsland_House_Room1_EventScript_EnterBattleRoomWest
 	warp MAP_SEVEN_ISLAND_HOUSE_ROOM2, 255, 3, 1
 	waitstate
 	release
 	end
 
-EventScript_170A11:: @ 8170A11
+SevenIsland_House_Room1_EventScript_DeclineBattle:: @ 8170A11
 	special LoadPlayerParty
-	msgbox gUnknown_81A064E
+	msgbox SevenIsland_House_Room1_Text_OhYouWontBattle
 	release
 	end
 
-EventScript_170A1E:: @ 8170A1E
+SevenIsland_House_Room1_EventScript_ChooseParty:: @ 8170A1E
-	msgbox gUnknown_81A06AB
+	msgbox SevenIsland_House_Room1_Text_LimitThreeMonsPerSide
 	fadescreen FADE_TO_BLACK
 	special ChooseHalfPartyForBattle
 	waitstate
 	return
 
-EventScript_170A2D:: @ 8170A2D
+SevenIsland_House_Room1_EventScript_EnterBattleRoomNorth:: @ 8170A2D
-	applymovement VAR_LAST_TALKED, Movement_170A6F
+	applymovement VAR_LAST_TALKED, SevenIsland_House_Room1_Movement_OldWomanMoveAsideLeft
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_170A63
+	applymovement OBJ_EVENT_ID_PLAYER, SevenIsland_House_Room1_Movement_PlayerEnterBattleRoomNorth
 	waitmovement 0
 	return
 
-EventScript_170A3F:: @ 8170A3F
+SevenIsland_House_Room1_EventScript_EnterBattleRoomEast:: @ 8170A3F
-	applymovement VAR_LAST_TALKED, Movement_170A72
+	applymovement VAR_LAST_TALKED, SevenIsland_House_Room1_Movement_OldWomanMoveAsideRight
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_170A67
+	applymovement OBJ_EVENT_ID_PLAYER, SevenIsland_House_Room1_Movement_PlayerEnterBattleRoomEast
 	waitmovement 0
 	return
 
-EventScript_170A51:: @ 8170A51
+SevenIsland_House_Room1_EventScript_EnterBattleRoomWest:: @ 8170A51
-	applymovement VAR_LAST_TALKED, Movement_170A6F
+	applymovement VAR_LAST_TALKED, SevenIsland_House_Room1_Movement_OldWomanMoveAsideLeft
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_170A6B
+	applymovement OBJ_EVENT_ID_PLAYER, SevenIsland_House_Room1_Movement_PlayerEnterBattleRoomWest
 	waitmovement 0
 	return
 
-Movement_170A63:: @ 8170A63
+SevenIsland_House_Room1_Movement_PlayerEnterBattleRoomNorth:: @ 8170A63
 	delay_16
 	walk_up
 	walk_up
 	step_end
 
-Movement_170A67:: @ 8170A67
+SevenIsland_House_Room1_Movement_PlayerEnterBattleRoomEast:: @ 8170A67
 	delay_16
 	walk_right
 	walk_up
 	step_end
 
-Movement_170A6B:: @ 8170A6B
+SevenIsland_House_Room1_Movement_PlayerEnterBattleRoomWest:: @ 8170A6B
 	delay_16
 	walk_left
 	walk_up
 	step_end
 
-Movement_170A6F:: @ 8170A6F
+SevenIsland_House_Room1_Movement_OldWomanMoveAsideLeft:: @ 8170A6F
 	walk_left
 	walk_in_place_fastest_right
 	step_end
 
-Movement_170A72:: @ 8170A72
+SevenIsland_House_Room1_Movement_OldWomanMoveAsideRight:: @ 8170A72
 	walk_right
 	walk_in_place_fastest_left
 	step_end
 
-SevenIsland_House_Room1_EventScript_170A75:: @ 8170A75
+SevenIsland_House_Room1_EventScript_Box:: @ 8170A75
-	msgbox gUnknown_81A0567, MSGBOX_SIGN
+	msgbox SevenIsland_House_Room1_Text_SlightBreezeAroundBox, MSGBOX_SIGN
 	end

data/maps/SevenIsland_House_Room1/text.inc

@@ -1,4 +1,4 @@
-gUnknown_81A049B:: @ 81A049B
+SevenIsland_House_Room1_Text_OnlyEnjoymentWatchingBattles:: @ 81A049B
     .string "I may not look like much now,\n"
     .string "but when I was younger…\p"
     .string "I flew everywhere, challenging\n"
@@ -7,11 +7,11 @@ gUnknown_81A049B:: @ 81A049B
     .string "is reminiscing about the past while\l"
     .string "watching battles.$"
 
-gUnknown_81A0567:: @ 81A0567
+SevenIsland_House_Room1_Text_SlightBreezeAroundBox:: @ 81A0567
     .string "There is a slight breeze blowing\n"
     .string "around the box.$"
 
-gUnknown_81A0598:: @ 81A0598
+SevenIsland_House_Room1_Text_ChallengeVisitingTrainer:: @ 81A0598
     .string "Ah!\n"
     .string "Welcome, my friend!\p"
     .string "Let me tell you something. There's\n"
@@ -21,7 +21,7 @@ gUnknown_81A0598:: @ 81A0598
     .string "Tell me, you did come to challenge\n"
     .string "{STR_VAR_1}, am I right?$"
 
-gUnknown_81A064E:: @ 81A064E
+SevenIsland_House_Room1_Text_OhYouWontBattle:: @ 81A064E
     .string "Oh…\n"
     .string "You won't battle…\p"
     .string "I see, I see.\n"
@@ -29,7 +29,7 @@ gUnknown_81A064E:: @ 81A064E
     .string "Well, perhaps if you change your\n"
     .string "mind, do come back.$"
 
-gUnknown_81A06AB:: @ 81A06AB
+SevenIsland_House_Room1_Text_LimitThreeMonsPerSide:: @ 81A06AB
     .string "Ah!\n"
     .string "You will battle for me?\p"
     .string "It was worth my time moving the\n"
@@ -41,31 +41,33 @@ gUnknown_81A06AB:: @ 81A06AB
     .string "Can I get you to limit it to\n"
     .string "battles of three POKéMON per side?$"
 
-gUnknown_81A0788:: @ 81A0788
+SevenIsland_House_Room1_Text_SaveProgressBeforeBattle:: @ 81A0788
     .string "Fine! Before your battle, would\n"
     .string "you like to save your game?$"
 
-gUnknown_81A07C4:: @ 81A07C4
+SevenIsland_House_Room1_Text_DontHoldAnythingBack:: @ 81A07C4
     .string "All right.\n"
     .string "Don't hold anything back!$"
 
-Text_1A07E9:: @ 81A07E9
+@ Unused
+SevenIsland_House_Room1_Text_StrVar1_1:: @ 81A07E9
     .string "{STR_VAR_1}$"
 
-gUnknown_81A07EC:: @ 81A07EC
+SevenIsland_House_Room2_Text_MatchEndedUpDraw:: @ 81A07EC
     .string "The match ended up a draw.$"
 
-gUnknown_81A0807:: @ 81A0807
+SevenIsland_House_Room1_Text_DrawWasIt:: @ 81A0807
     .string "A draw, was it?\p"
     .string "However, let me say that it was\n"
     .string "a worthy spectacle.\p"
     .string "I'd say it was a wonderful battle\n"
     .string "with a real sense of depth!$"
 
-Text_1A0889:: @ 81A0889
+@ Unused
+SevenIsland_House_Room1_Text_StrVar1_2:: @ 81A0889
     .string "{STR_VAR_1}$"
 
-gUnknown_81A088C:: @ 81A088C
+SevenIsland_House_Room1_Text_AstoundingBattle:: @ 81A088C
     .string "Bravo!\p"
     .string "Bravo, indeed!\n"
     .string "What an astounding battle!\p"
@@ -77,10 +79,11 @@ gUnknown_81A088C:: @ 81A088C
     .string "Yes!\n"
     .string "It was sheer magnificence!$"
 
-Text_1A096E:: @ 81A096E
+@ Unused
+SevenIsland_House_Room1_Text_StrVar1_3:: @ 81A096E
     .string "{STR_VAR_1}$"
 
-gUnknown_81A0971:: @ 81A0971
+SevenIsland_House_Room1_Text_FeelYourDisappointment:: @ 81A0971
     .string "Too bad!\n"
     .string "I feel your disappointment.\p"
     .string "However, that disappointment is\n"

data/maps/SevenIsland_House_Room2/scripts.inc

@@ -8,14 +8,14 @@ SevenIsland_House_Room2_OnTransition:: @ 8170A89
 	end
 
 SevenIsland_House_Room2_OnFrame:: @ 8170A8D
-	map_script_2 VAR_TEMP_1, 0, EventScript_170A97
+	map_script_2 VAR_TEMP_1, 0, SevenIsland_House_Room2_EventScript_BattleVisitingTrainer
 	.2byte 0
 
-EventScript_170A97:: @ 8170A97
+SevenIsland_House_Room2_EventScript_BattleVisitingTrainer:: @ 8170A97
 	lockall
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_170B22
+	applymovement OBJ_EVENT_ID_PLAYER, SevenIsland_House_Room2_Movement_PlayerEnterRoom
 	waitmovement 0
-	special PrintEReaderTrainerGreeting
+	special BufferEReaderTrainerGreeting
 	msgbox gStringVar4
 	closemessage
 	setvar VAR_0x8004, 2
@@ -23,14 +23,14 @@ EventScript_170A97:: @ 8170A97
 	special StartSpecialBattle
 	waitstate
 	compare VAR_RESULT, 3
-	call_if_eq EventScript_170AFE
+	call_if_eq SevenIsland_House_Room2_EventScript_BattleTie
 	compare VAR_RESULT, 1
-	call_if_eq EventScript_170B0C
+	call_if_eq SevenIsland_House_Room2_EventScript_BattleWon
 	compare VAR_RESULT, 2
-	call_if_eq EventScript_170B17
+	call_if_eq SevenIsland_House_Room2_EventScript_BattleLost
 	closemessage
 	special HealPlayerParty
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_170B28
+	applymovement OBJ_EVENT_ID_PLAYER, SevenIsland_House_Room2_Movement_PlayerExitRoom
 	waitmovement 0
 	special LoadPlayerParty
 	setvar VAR_TEMP_1, 1
@@ -39,26 +39,26 @@ EventScript_170A97:: @ 8170A97
 	releaseall
 	end
 
-EventScript_170AFE:: @ 8170AFE
+SevenIsland_House_Room2_EventScript_BattleTie:: @ 8170AFE
 	setvar VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 3
-	msgbox gUnknown_81A07EC
+	msgbox SevenIsland_House_Room2_Text_MatchEndedUpDraw
 	return
 
-EventScript_170B0C:: @ 8170B0C
+SevenIsland_House_Room2_EventScript_BattleWon:: @ 8170B0C
 	setvar VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 1
 	special Special_ShowStringVar4AsFieldMessage
 	waitmessage
 	waitbuttonpress
 	return
 
-EventScript_170B17:: @ 8170B17
+SevenIsland_House_Room2_EventScript_BattleLost:: @ 8170B17
 	setvar VAR_MAP_SCENE_SEVEN_ISLAND_HOUSE_ROOM1, 2
 	special Special_ShowStringVar4AsFieldMessage
 	waitmessage
 	waitbuttonpress
 	return
 
-Movement_170B22:: @ 8170B22
+SevenIsland_House_Room2_Movement_PlayerEnterRoom:: @ 8170B22
 	walk_down
 	walk_down
 	walk_down
@@ -66,7 +66,7 @@ Movement_170B22:: @ 8170B22
 	walk_right
 	step_end
 
-Movement_170B28:: @ 8170B28
+SevenIsland_House_Room2_Movement_PlayerExitRoom:: @ 8170B28
 	walk_left
 	walk_left
 	walk_up

data/maps/SevenIsland_Mart/map.json

@@ -25,7 +25,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_Mart_EventScript_170B31",
+      "script": "SevenIsland_Mart_EventScript_Clerk",
       "flag": "0"
     },
     {
@@ -38,7 +38,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_Mart_EventScript_170B6E",
+      "script": "SevenIsland_Mart_EventScript_Lass",
       "flag": "0"
     },
     {
@@ -51,7 +51,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_Mart_EventScript_170B80",
+      "script": "SevenIsland_Mart_EventScript_Fisher",
       "flag": "0"
     },
     {
@@ -64,7 +64,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_Mart_EventScript_170B77",
+      "script": "SevenIsland_Mart_EventScript_Hiker",
       "flag": "0"
     }
   ],

data/maps/SevenIsland_Mart/scripts.inc

@@ -1,19 +1,19 @@
 SevenIsland_Mart_MapScripts:: @ 8170B30
 	.byte 0
 
-SevenIsland_Mart_EventScript_170B31:: @ 8170B31
+SevenIsland_Mart_EventScript_Clerk:: @ 8170B31
 	goto_if_questlog EventScript_ReleaseEnd
 	lock
 	faceplayer
 	message Text_MayIHelpYou
 	waitmessage
-	pokemart Items_170B58
+	pokemart SevenIsland_Mart_Items
 	msgbox Text_PleaseComeAgain
 	release
 	end
 
 	.align 2
-Items_170B58:: @ 8170B58
+SevenIsland_Mart_Items:: @ 8170B58
 	.2byte ITEM_ULTRA_BALL
 	.2byte ITEM_GREAT_BALL
 	.2byte ITEM_FULL_RESTORE
@@ -27,14 +27,14 @@ Items_170B58:: @ 8170B58
 	release
 	end
 
-SevenIsland_Mart_EventScript_170B6E:: @ 8170B6E
+SevenIsland_Mart_EventScript_Lass:: @ 8170B6E
-	msgbox gUnknown_81A0A4F, MSGBOX_NPC
+	msgbox SevenIsland_Mart_Text_MonHavePersonalitiesOfTheirOwn, MSGBOX_NPC
 	end
 
-SevenIsland_Mart_EventScript_170B77:: @ 8170B77
+SevenIsland_Mart_EventScript_Hiker:: @ 8170B77
-	msgbox gUnknown_81A0ACC, MSGBOX_NPC
+	msgbox SevenIsland_Mart_Text_PreparationsCompleteForRuins, MSGBOX_NPC
 	end
 
-SevenIsland_Mart_EventScript_170B80:: @ 8170B80
+SevenIsland_Mart_EventScript_Fisher:: @ 8170B80
-	msgbox gUnknown_81A0B09, MSGBOX_NPC
+	msgbox SevenIsland_Mart_Text_NeedToFishOnSevenIsland, MSGBOX_NPC
 	end

data/maps/SevenIsland_Mart/text.inc

@@ -1,14 +1,14 @@
-gUnknown_81A0A4F:: @ 81A0A4F
+SevenIsland_Mart_Text_MonHavePersonalitiesOfTheirOwn:: @ 81A0A4F
     .string "POKéMON have personalities of their\n"
     .string "own, just like people.\p"
     .string "My PIKACHU has a HASTY nature,\n"
     .string "so it grew to be a speedy POKéMON.$"
 
-gUnknown_81A0ACC:: @ 81A0ACC
+SevenIsland_Mart_Text_PreparationsCompleteForRuins:: @ 81A0ACC
     .string "Okay, preparations are complete\n"
     .string "for me to explore the RUINS.$"
 
-gUnknown_81A0B09:: @ 81A0B09
+SevenIsland_Mart_Text_NeedToFishOnSevenIsland:: @ 81A0B09
     .string "I need to fish on SEVEN ISLAND.\p"
     .string "That will complete my fishing tour\n"
     .string "of the SEVII ISLANDS.\p"

data/maps/SevenIsland_PokemonCenter_1F/map.json

@@ -25,7 +25,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_PokemonCenter_1F_EventScript_170B98",
+      "script": "SevenIsland_PokemonCenter_1F_EventScript_Nurse",
       "flag": "0"
     },
     {
@@ -38,7 +38,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_PokemonCenter_1F_EventScript_170BA1",
+      "script": "SevenIsland_PokemonCenter_1F_EventScript_OldMan",
       "flag": "0"
     },
     {
@@ -51,7 +51,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_PokemonCenter_1F_EventScript_170BAA",
+      "script": "SevenIsland_PokemonCenter_1F_EventScript_Sailor",
       "flag": "0"
     },
     {
@@ -64,7 +64,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_PokemonCenter_1F_EventScript_170BB3",
+      "script": "SevenIsland_PokemonCenter_1F_EventScript_Beauty",
       "flag": "0"
     },
     {
@@ -77,7 +77,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_PokemonCenter_1F_EventScript_1ACFD4",
+      "script": "SevenIsland_PokemonCenter_1F_EventScript_PokemonJournal",
       "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS"
     },
     {
@@ -90,7 +90,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_PokemonCenter_1F_EventScript_1ACFD4",
+      "script": "SevenIsland_PokemonCenter_1F_EventScript_PokemonJournal",
       "flag": "FLAG_HIDE_POSTGAME_GOSSIPERS"
     }
   ],

data/maps/SevenIsland_PokemonCenter_1F/scripts.inc

@@ -7,21 +7,21 @@ SevenIsland_PokemonCenter_1F_OnTransition:: @ 8170B94
 	setrespawn SPAWN_SEVEN_ISLAND
 	end
 
-SevenIsland_PokemonCenter_1F_EventScript_170B98:: @ 8170B98
+SevenIsland_PokemonCenter_1F_EventScript_Nurse:: @ 8170B98
 	lock
 	faceplayer
 	call EventScript_PkmnCenterNurse
 	release
 	end
 
-SevenIsland_PokemonCenter_1F_EventScript_170BA1:: @ 8170BA1
+SevenIsland_PokemonCenter_1F_EventScript_OldMan:: @ 8170BA1
-	msgbox gUnknown_81A0B98, MSGBOX_NPC
+	msgbox SevenIsland_PokemonCenter_1F_Text_EventsDependingOnConnections, MSGBOX_NPC
 	end
 
-SevenIsland_PokemonCenter_1F_EventScript_170BAA:: @ 8170BAA
+SevenIsland_PokemonCenter_1F_EventScript_Sailor:: @ 8170BAA
-	msgbox gUnknown_81A0C1F, MSGBOX_NPC
+	msgbox SevenIsland_PokemonCenter_1F_Text_DidYouRideSeagallopHere, MSGBOX_NPC
 	end
 
-SevenIsland_PokemonCenter_1F_EventScript_170BB3:: @ 8170BB3
+SevenIsland_PokemonCenter_1F_EventScript_Beauty:: @ 8170BB3
-	msgbox gUnknown_81A0CA5, MSGBOX_NPC
+	msgbox SevenIsland_PokemonCenter_1F_Text_CheckOutTrainerTower, MSGBOX_NPC
 	end

data/maps/SevenIsland_PokemonCenter_1F/text.inc

@@ -1,11 +1,11 @@
-gUnknown_81A0B98:: @ 81A0B98
+SevenIsland_PokemonCenter_1F_Text_EventsDependingOnConnections:: @ 81A0B98
     .string "On this island, different events\n"
     .string "occur depending on connections.\p"
     .string "What are those connections?\p"
     .string "They are for you to discover on\n"
     .string "your own.$"
 
-gUnknown_81A0C1F:: @ 81A0C1F
+SevenIsland_PokemonCenter_1F_Text_DidYouRideSeagallopHere:: @ 81A0C1F
     .string "Did you ride a SEAGALLOP ferry\n"
     .string "to get here?\p"
     .string "There are at least ten of those\n"
@@ -13,7 +13,7 @@ gUnknown_81A0C1F:: @ 81A0C1F
     .string "I don't know where they all go,\n"
     .string "though.$"
 
-gUnknown_81A0CA5:: @ 81A0CA5
+SevenIsland_PokemonCenter_1F_Text_CheckOutTrainerTower:: @ 81A0CA5
     .string "If you're confident, you should\n"
     .string "check out TRAINER TOWER.$"
 

data/maps/SevenIsland_SevaultCanyon/map.json

@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "SevenIsland_SevaultCanyon_EventScript_1ACA4D",
+      "script": "SevenIsland_SevaultCanyon_EventScript_Cyndy",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "SevenIsland_SevaultCanyon_EventScript_1ACA8B",
+      "script": "SevenIsland_SevaultCanyon_EventScript_Evan",
       "flag": "0"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "SevenIsland_SevaultCanyon_EventScript_1ACAC9",
+      "script": "SevenIsland_SevaultCanyon_EventScript_Jackson",
       "flag": "0"
     },
     {
@@ -75,7 +75,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "SevenIsland_SevaultCanyon_EventScript_1ACB07",
+      "script": "SevenIsland_SevaultCanyon_EventScript_Katelyn",
       "flag": "0"
     },
     {
@@ -88,7 +88,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "SevenIsland_SevaultCanyon_EventScript_1ACB45",
+      "script": "SevenIsland_SevaultCanyon_EventScript_Leroy",
       "flag": "0"
     },
     {
@@ -101,7 +101,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "SevenIsland_SevaultCanyon_EventScript_1ACB83",
+      "script": "SevenIsland_SevaultCanyon_EventScript_Michelle",
       "flag": "0"
     },
     {
@@ -114,7 +114,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "SevenIsland_SevaultCanyon_EventScript_1ACBC1",
+      "script": "SevenIsland_SevaultCanyon_EventScript_Lex",
       "flag": "0"
     },
     {
@@ -127,7 +127,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "SevenIsland_SevaultCanyon_EventScript_1ACC07",
+      "script": "SevenIsland_SevaultCanyon_EventScript_Nya",
       "flag": "0"
     },
     {
@@ -283,7 +283,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_SevaultCanyon_EventScript_1ACF95",
+      "script": "SevenIsland_SevaultCanyon_EventScript_BlackBelt",
       "flag": "0"
     }
   ],
@@ -320,7 +320,7 @@
       "x": 16,
       "y": 71,
       "elevation": 0,
-      "script": "SevenIsland_SevaultCanyon_EventScript_168BFE"
+      "script": "SevenIsland_SevaultCanyon_EventScript_RouteSign"
     }
   ]
 }

data/maps/SevenIsland_SevaultCanyon/scripts.inc

@@ -1,6 +1,6 @@
 SevenIsland_SevaultCanyon_MapScripts:: @ 8168BFD
 	.byte 0
 
-SevenIsland_SevaultCanyon_EventScript_168BFE:: @ 8168BFE
+SevenIsland_SevaultCanyon_EventScript_RouteSign:: @ 8168BFE
-	msgbox gUnknown_818CF2B, MSGBOX_SIGN
+	msgbox SevenIsland_SevaultCanyon_Text_RouteSign, MSGBOX_SIGN
 	end

data/maps/SevenIsland_SevaultCanyon/text.inc

@@ -1,126 +1,126 @@
-Text_18C887:: @ 818C887
+SevenIsland_SevaultCanyon_Text_CyndyIntro:: @ 818C887
     .string "My conditioning's in top form!$"
 
-Text_18C8A6:: @ 818C8A6
+SevenIsland_SevaultCanyon_Text_CyndyDefeat:: @ 818C8A6
     .string "Huh?\n"
     .string "Something's not right…$"
 
-Text_18C8C2:: @ 818C8C2
+SevenIsland_SevaultCanyon_Text_CyndyPostBattle:: @ 818C8C2
     .string "The way I am now, I may have to\n"
     .string "hold off on TRAINER TOWER…$"
 
-Text_18C8FD:: @ 818C8FD
+SevenIsland_SevaultCanyon_Text_EvanIntro:: @ 818C8FD
     .string "It doesn't matter if you happen to\n"
     .string "have the strongest POKéMON…\p"
     .string "It doesn't mean a thing if you don't\n"
     .string "know how to use them properly!$"
 
-Text_18C980:: @ 818C980
+SevenIsland_SevaultCanyon_Text_EvanDefeat:: @ 818C980
     .string "You're a master at this.$"
 
-Text_18C999:: @ 818C999
+SevenIsland_SevaultCanyon_Text_EvanPostBattle:: @ 818C999
     .string "You see them every so often,\n"
     .string "TRAINERS with awesome POKéMON\l"
     .string "who have no idea what to do.\p"
     .string "Before training POKéMON, TRAINERS\n"
     .string "themselves need to grow up.$"
 
-Text_18CA2F:: @ 818CA2F
+SevenIsland_SevaultCanyon_Text_JacksonIntro:: @ 818CA2F
     .string "I work to protect the environment.\n"
     .string "In turn, nature protects me!$"
 
-Text_18CA6F:: @ 818CA6F
+SevenIsland_SevaultCanyon_Text_JacksonDefeat:: @ 818CA6F
     .string "Whoa! You're tough!\n"
     .string "How about protecting me?$"
 
-Text_18CA9C:: @ 818CA9C
+SevenIsland_SevaultCanyon_Text_JacksonPostBattle:: @ 818CA9C
     .string "From far out among the stars, our\n"
     .string "planet is just a drop of water.\p"
     .string "But we want to protect that drop\n"
     .string "of water for everyone.$"
 
-Text_18CB16:: @ 818CB16
+SevenIsland_SevaultCanyon_Text_KatelynIntro:: @ 818CB16
     .string "Those shoes you have are pretty\n"
     .string "snazzy.$"
 
-Text_18CB3E:: @ 818CB3E
+SevenIsland_SevaultCanyon_Text_KatelynDefeat:: @ 818CB3E
     .string "You're hot stuff in spite of your\n"
     .string "cute looks.$"
 
-Text_18CB6C:: @ 818CB6C
+SevenIsland_SevaultCanyon_Text_KatelynPostBattle:: @ 818CB6C
     .string "Your mom bought those snazzy\n"
     .string "RUNNING SHOES for you?\p"
     .string "She must adore you.$"
 
-Text_18CBB4:: @ 818CBB4
+SevenIsland_SevaultCanyon_Text_LeroyIntro:: @ 818CBB4
     .string "You look strong.\n"
     .string "Let me battle you, please!$"
 
-Text_18CBE0:: @ 818CBE0
+SevenIsland_SevaultCanyon_Text_LeroyDefeat:: @ 818CBE0
     .string "I knew it!\n"
     .string "You're as tough as I thought!$"
 
-Text_18CC09:: @ 818CC09
+SevenIsland_SevaultCanyon_Text_LeroyPostBattle:: @ 818CC09
     .string "The way you battle has given me\n"
     .string "a lot of useful data.\p"
     .string "Thanks so much!$"
 
-Text_18CC4F:: @ 818CC4F
+SevenIsland_SevaultCanyon_Text_MichelleIntro:: @ 818CC4F
     .string "I was given the best possible\n"
     .string "education to become this strong.\p"
     .string "I don't want to lose to anyone!$"
 
-Text_18CCAE:: @ 818CCAE
+SevenIsland_SevaultCanyon_Text_MichelleDefeat:: @ 818CCAE
     .string "Thank you. I feel like I've been\n"
     .string "set free by losing to you.$"
 
-Text_18CCEA:: @ 818CCEA
+SevenIsland_SevaultCanyon_Text_MichellePostBattle:: @ 818CCEA
     .string "For some reason, I get furious\n"
     .string "over the slightest thing.\p"
     .string "I'll calm myself by breathing\n"
     .string "deeply.$"
 
-Text_18CD49:: @ 818CD49
+SevenIsland_SevaultCanyon_Text_LexIntro:: @ 818CD49
     .string "LEX: My darling NYA, together\n"
     .string "we could win!$"
 
-Text_18CD75:: @ 818CD75
+SevenIsland_SevaultCanyon_Text_LexDefeat:: @ 818CD75
     .string "LEX: I seem to have been too\n"
     .string "careless…$"
 
-Text_18CD9C:: @ 818CD9C
+SevenIsland_SevaultCanyon_Text_LexPostBattle:: @ 818CD9C
     .string "LEX: I think it was a good\n"
     .string "experience for NYA.\p"
     .string "You have my gratitude.$"
 
-Text_18CDE2:: @ 818CDE2
+SevenIsland_SevaultCanyon_Text_LexNotEnoughMons:: @ 818CDE2
     .string "LEX: May I ask you to battle the\n"
     .string "both of us at the same time?$"
 
-Text_18CE20:: @ 818CE20
+SevenIsland_SevaultCanyon_Text_NyaIntro:: @ 818CE20
     .string "NYA: I'll do my best so I won't\n"
     .string "drag down my mentor, LEX!$"
 
-Text_18CE5A:: @ 818CE5A
+SevenIsland_SevaultCanyon_Text_NyaDefeat:: @ 818CE5A
     .string "NYA: Oh, no…\n"
     .string "I'm so sorry, I…$"
 
-Text_18CE78:: @ 818CE78
+SevenIsland_SevaultCanyon_Text_NyaPostBattle:: @ 818CE78
     .string "NYA: I think I'm going to need\n"
     .string "much more seasoning and tutoring\l"
     .string "under LEX…\p"
     .string "…So, LEX, please, may I stay with\n"
     .string "you like this?$"
 
-Text_18CEF4:: @ 818CEF4
+SevenIsland_SevaultCanyon_Text_NyaNotEnoughMons:: @ 818CEF4
     .string "NYA: I'm sorry, but may we battle\n"
     .string "in two-on-two style?$"
 
-gUnknown_818CF2B:: @ 818CF2B
+SevenIsland_SevaultCanyon_Text_RouteSign:: @ 818CF2B
     .string "SEVAULT CANYON\n"
     .string "TANOBY RUINS AHEAD$"
 
-Text_18CF4D:: @ 818CF4D
+SevenIsland_SevaultCanyon_Text_BrunoTrainedWithBrawly:: @ 818CF4D
     .string "Training by oneself is certainly\n"
     .string "not a bad thing.\p"
     .string "But it's also not bad to aim for\n"

data/maps/SevenIsland_SevaultCanyon_Entrance/map.json

@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 5,
-      "script": "SevenIsland_SevaultCanyon_Entrance_EventScript_1AC8C9",
+      "script": "SevenIsland_SevaultCanyon_Entrance_EventScript_Miah",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "SevenIsland_SevaultCanyon_Entrance_EventScript_1AC907",
+      "script": "SevenIsland_SevaultCanyon_Entrance_EventScript_Eve",
       "flag": "0"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "SevenIsland_SevaultCanyon_Entrance_EventScript_1AC94D",
+      "script": "SevenIsland_SevaultCanyon_Entrance_EventScript_Jon",
       "flag": "0"
     },
     {
@@ -75,7 +75,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "SevenIsland_SevaultCanyon_Entrance_EventScript_1AC9D1",
+      "script": "SevenIsland_SevaultCanyon_Entrance_EventScript_Nicolas",
       "flag": "0"
     },
     {
@@ -88,7 +88,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "SevenIsland_SevaultCanyon_Entrance_EventScript_1ACA0F",
+      "script": "SevenIsland_SevaultCanyon_Entrance_EventScript_Madeline",
       "flag": "0"
     },
     {
@@ -101,7 +101,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "SevenIsland_SevaultCanyon_Entrance_EventScript_1AC993",
+      "script": "SevenIsland_SevaultCanyon_Entrance_EventScript_Mason",
       "flag": "0"
     },
     {
@@ -137,7 +137,7 @@
       "x": 14,
       "y": 26,
       "elevation": 0,
-      "script": "SevenIsland_SevaultCanyon_Entrance_EventScript_168BF4"
+      "script": "SevenIsland_SevaultCanyon_Entrance_EventScript_RouteSign"
     }
   ]
 }

data/maps/SevenIsland_SevaultCanyon_Entrance/scripts.inc

@@ -1,6 +1,6 @@
 SevenIsland_SevaultCanyon_Entrance_MapScripts:: @ 8168BF3
 	.byte 0
 
-SevenIsland_SevaultCanyon_Entrance_EventScript_168BF4:: @ 8168BF4
+SevenIsland_SevaultCanyon_Entrance_EventScript_RouteSign:: @ 8168BF4
-	msgbox gUnknown_818C82D, MSGBOX_SIGN
+	msgbox SevenIsland_SevaultCanyon_Entrance_Text_RouteSign, MSGBOX_SIGN
 	end

data/maps/SevenIsland_SevaultCanyon_Entrance/text.inc

@@ -1,100 +1,92 @@
-Text_18C384:: @ 818C384
+SevenIsland_SevaultCanyon_Entrance_Text_MiahIntro:: @ 818C3BC
-    .string "トレーナータワーには\n"
-    .string "いまは　はいれない　みたい‥$"
-
-Text_18C39E:: @ 818C39E
-    .string "トレーナータワーが　あいてる！\n"
-    .string "さっそく　はいってみよう！$"
-
-Text_18C3BC:: @ 818C3BC
     .string "Kyahaha!\n"
     .string "I'll flick you away effortlessly!$"
 
-Text_18C3E7:: @ 818C3E7
+SevenIsland_SevaultCanyon_Entrance_Text_MiahDefeat:: @ 818C3E7
     .string "Tch!\n"
     .string "Too strong for me!$"
 
-Text_18C3FF:: @ 818C3FF
+SevenIsland_SevaultCanyon_Entrance_Text_MiahPostBattle:: @ 818C3FF
     .string "What's that?\n"
     .string "I don't act the way I look?\p"
     .string "Heh, that's a part of my strategy!$"
 
-Text_18C44B:: @ 818C44B
+SevenIsland_SevaultCanyon_Entrance_Text_MasonIntro:: @ 818C44B
     .string "Howdy!\n"
     .string "Are you a member of my fan club?$"
 
-Text_18C473:: @ 818C473
+SevenIsland_SevaultCanyon_Entrance_Text_MasonDefeat:: @ 818C473
     .string "Oh, so you're not a fan…\p"
     .string "Well, I can change that.\n"
     .string "Let me sing for you!$"
 
-Text_18C4BA:: @ 818C4BA
+SevenIsland_SevaultCanyon_Entrance_Text_MasonPostBattle:: @ 818C4BA
     .string "Lalalah…\n"
     .string "My POKéMON, I send them out,\l"
     .string "all the girls scream and shout!$"
 
-Text_18C500:: @ 818C500
+SevenIsland_SevaultCanyon_Entrance_Text_NicolasIntro:: @ 818C500
     .string "This island is too spread out…\n"
     .string "It's not easy patrolling the place.$"
 
-Text_18C543:: @ 818C543
+SevenIsland_SevaultCanyon_Entrance_Text_NicolasDefeat:: @ 818C543
     .string "Uh-huh…$"
 
-Text_18C54B:: @ 818C54B
+SevenIsland_SevaultCanyon_Entrance_Text_NicolasPostBattle:: @ 818C54B
     .string "TRAINERS like you from cities,\n"
     .string "they sure are tough.\p"
     .string "You'll be headed for the TOWER,\n"
     .string "won't you?$"
 
-Text_18C5AA:: @ 818C5AA
+SevenIsland_SevaultCanyon_Entrance_Text_MadelineIntro:: @ 818C5AA
     .string "I punish people who abuse\n"
     .string "POKéMON!$"
 
-Text_18C5CD:: @ 818C5CD
+SevenIsland_SevaultCanyon_Entrance_Text_MadelineDefeat:: @ 818C5CD
     .string "You don't seem to be a problem\n"
     .string "TRAINER.$"
 
-Text_18C5F5:: @ 818C5F5
+SevenIsland_SevaultCanyon_Entrance_Text_MadelinePostBattle:: @ 818C5F5
     .string "If you treat your POKéMON with\n"
     .string "kindness, they'll understand.$"
 
-Text_18C632:: @ 818C632
+SevenIsland_SevaultCanyon_Entrance_Text_EveIntro:: @ 818C632
     .string "EVE: I'll team up with JON and\n"
     .string "battle together.$"
 
-Text_18C662:: @ 818C662
+SevenIsland_SevaultCanyon_Entrance_Text_EveDefeat:: @ 818C662
     .string "EVE: Me and JON, we lost.\n"
     .string "Ehehe.$"
 
-Text_18C683:: @ 818C683
+SevenIsland_SevaultCanyon_Entrance_Text_EvePostBattle:: @ 818C683
     .string "EVE: I'm going to work harder with\n"
     .string "JON.$"
 
-Text_18C6AB:: @ 818C6AB
+SevenIsland_SevaultCanyon_Entrance_Text_EveNotEnoughMons:: @ 818C6AB
     .string "EVE: I want to team up with JON\n"
     .string "when I battle you.\p"
     .string "Come back with two POKéMON, okay?$"
 
-Text_18C700:: @ 818C700
+SevenIsland_SevaultCanyon_Entrance_Text_JonIntro:: @ 818C700
     .string "JON: When I'm with EVE, it feels\n"
     .string "like we could never lose.$"
 
-Text_18C73B:: @ 818C73B
+SevenIsland_SevaultCanyon_Entrance_Text_JonDefeat:: @ 818C73B
     .string "JON: When I'm with EVE,\n"
     .string "it doesn't feel like I've lost!$"
 
-Text_18C773:: @ 818C773
+SevenIsland_SevaultCanyon_Entrance_Text_JonPostBattle:: @ 818C773
     .string "JON: When I'm with EVE, I feel\n"
     .string "giddy whether I win or lose.\p"
     .string "It's magical!$"
 
-Text_18C7BD:: @ 818C7BD
+SevenIsland_SevaultCanyon_Entrance_Text_JonNotEnoughMons:: @ 818C7BD
     .string "JON: If it's with EVE, I'll be\n"
     .string "happy to battle with you.\p"
     .string "So, I'd like to make it a\n"
     .string "two-on-two battle, if I may.$"
 
-gUnknown_818C82D:: @ 818C82D
+SevenIsland_SevaultCanyon_Entrance_Text_RouteSign:: @ 818C82D
     .string "SEVAULT CANYON ENTRANCE\p"
     .string "TRAINERS are asked to refrain from\n"
     .string "damaging plants in the CANYON.$"

data/maps/SevenIsland_SevaultCanyon_House/map.json

@@ -25,7 +25,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_SevaultCanyon_House_EventScript_172183",
+      "script": "SevenIsland_SevaultCanyon_House_EventScript_BaldingMan",
       "flag": "0"
     },
     {
@@ -38,7 +38,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SevenIsland_SevaultCanyon_House_EventScript_172242",
+      "script": "SevenIsland_SevaultCanyon_House_EventScript_Chansey",
       "flag": "0"
     },
     {

data/maps/SevenIsland_SevaultCanyon_House/scripts.inc

@@ -1,57 +1,57 @@
 SevenIsland_SevaultCanyon_House_MapScripts:: @ 8172182
 	.byte 0
 
-SevenIsland_SevaultCanyon_House_EventScript_172183:: @ 8172183
+SevenIsland_SevaultCanyon_House_EventScript_BaldingMan:: @ 8172183
 	lock
-	goto_if_set FLAG_TEMP_2, EventScript_172211
+	goto_if_set FLAG_TEMP_2, SevenIsland_SevaultCanyon_House_EventScript_AlreadyDanced
 	playbgm MUS_P_SCHOOL, 0
-	applymovement 1, Movement_172231
+	applymovement 1, SevenIsland_SevaultCanyon_House_Movement_ChanseyDance
 	waitmovement 0
 	fadedefaultbgm
 	delay 30
 	applymovement 1, Movement_FacePlayer
 	waitmovement 0
-	msgbox gUnknown_81A4D72
+	msgbox SevenIsland_SevaultCanyon_House_Text_ChanseyDanceJoinIn
 	textcolor 3
-	msgbox gUnknown_81A4DAF, MSGBOX_YESNO
+	msgbox SevenIsland_SevaultCanyon_House_Text_WouldYouLikeToDance, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq EventScript_172225
+	goto_if_eq SevenIsland_SevaultCanyon_House_EventScript_DeclineDance
-	msgbox gUnknown_81A4DD8
+	msgbox SevenIsland_SevaultCanyon_House_Text_DancedChanseyDance
 	closemessage
 	call EventScript_1A6675
 	compare VAR_FACING, DIR_SOUTH
-	call_if_ne EventScript_172206
+	call_if_ne SevenIsland_SevaultCanyon_House_EventScript_PlayerFaceDown
 	delay 30
 	playbgm MUS_P_SCHOOL, 0
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_172231
+	applymovement OBJ_EVENT_ID_PLAYER, SevenIsland_SevaultCanyon_House_Movement_ChanseyDance
 	waitmovement 0
 	fadedefaultbgm
 	delay 30
 	call EventScript_OutOfCenterPartyHeal
-	msgbox gUnknown_81A4DF5
+	msgbox SevenIsland_SevaultCanyon_House_Text_YoureAllChipperNow
 	setflag FLAG_TEMP_2
 	release
 	end
 
-EventScript_172206:: @ 8172206
+SevenIsland_SevaultCanyon_House_EventScript_PlayerFaceDown:: @ 8172206
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	return
 
-EventScript_172211:: @ 8172211
+SevenIsland_SevaultCanyon_House_EventScript_AlreadyDanced:: @ 8172211
 	applymovement 1, Movement_FacePlayer
 	waitmovement 0
-	msgbox gUnknown_81A4D72
+	msgbox SevenIsland_SevaultCanyon_House_Text_ChanseyDanceJoinIn
 	release
 	end
 
-EventScript_172225:: @ 8172225
+SevenIsland_SevaultCanyon_House_EventScript_DeclineDance:: @ 8172225
 	textcolor 0
-	msgbox gUnknown_81A4DC8
+	msgbox SevenIsland_SevaultCanyon_House_Text_ComeOnDance
 	release
 	end
 
-Movement_172231:: @ 8172231
+SevenIsland_SevaultCanyon_House_Movement_ChanseyDance:: @ 8172231
 	walk_in_place_down
 	delay_16
 	walk_in_place_down
@@ -70,12 +70,12 @@ Movement_172231:: @ 8172231
 	delay_4
 	step_end
 
-SevenIsland_SevaultCanyon_House_EventScript_172242:: @ 8172242
+SevenIsland_SevaultCanyon_House_EventScript_Chansey:: @ 8172242
 	lock
 	faceplayer
 	waitse
 	playmoncry SPECIES_CHANSEY, 0
-	msgbox gUnknown_81A4E26
+	msgbox SevenIsland_SevaultCanyon_House_Text_Chansey
 	waitmoncry
 	release
 	end

data/maps/SevenIsland_SevaultCanyon_House/text.inc

@@ -1,22 +1,22 @@
-gUnknown_81A4D72:: @ 81A4D72
+SevenIsland_SevaultCanyon_House_Text_ChanseyDanceJoinIn:: @ 81A4D72
     .string "Dance, dance!\n"
     .string "CHANSEY Dance!\p"
     .string "You join in, too!\n"
     .string "Dance, dance!$"
 
-gUnknown_81A4DAF:: @ 81A4DAF
+SevenIsland_SevaultCanyon_House_Text_WouldYouLikeToDance:: @ 81A4DAF
     .string "Would you like to dance?$"
 
-gUnknown_81A4DC8:: @ 81A4DC8
+SevenIsland_SevaultCanyon_House_Text_ComeOnDance:: @ 81A4DC8
     .string "Come on, dance!$"
 
-gUnknown_81A4DD8:: @ 81A4DD8
+SevenIsland_SevaultCanyon_House_Text_DancedChanseyDance:: @ 81A4DD8
     .string "{PLAYER} danced the CHANSEY Dance!$"
 
-gUnknown_81A4DF5:: @ 81A4DF5
+SevenIsland_SevaultCanyon_House_Text_YoureAllChipperNow:: @ 81A4DF5
     .string "Ahahahaha!\p"
     .string "There, you're all chipper now!\n"
     .string "Lucky!$"
 
-gUnknown_81A4E26:: @ 81A4E26
+SevenIsland_SevaultCanyon_House_Text_Chansey:: @ 81A4E26
     .string "CHANSEY: Chansi! Chansi!$"

data/maps/SevenIsland_TrainerTower/map.json

@@ -31,7 +31,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "SevenIsland_TrainerTower_EventScript_1AC84D",
+      "script": "SevenIsland_TrainerTower_EventScript_Dario",
       "flag": "0"
     },
     {
@@ -44,7 +44,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "SevenIsland_TrainerTower_EventScript_1AC88B",
+      "script": "SevenIsland_TrainerTower_EventScript_Rodette",
       "flag": "0"
     }
   ],
@@ -94,14 +94,14 @@
       "x": 56,
       "y": 8,
       "elevation": 0,
-      "script": "SevenIsland_TrainerTower_EventScript_168BE1"
+      "script": "SevenIsland_TrainerTower_EventScript_TrainerTowerSign"
     },
     {
       "type": "bg_event_type_0",
       "x": 50,
       "y": 30,
       "elevation": 0,
-      "script": "SevenIsland_TrainerTower_EventScript_168BEA"
+      "script": "SevenIsland_TrainerTower_EventScript_TrainerTowerAheadSign"
     }
   ]
 }

data/maps/SevenIsland_TrainerTower/scripts.inc

@@ -6,10 +6,10 @@ SevenIsland_TrainerTower_OnTransition:: @ 8168BDB
 	setvar VAR_MAP_SCENE_TRAINER_TOWER, 0
 	end
 
-SevenIsland_TrainerTower_EventScript_168BE1:: @ 8168BE1
+SevenIsland_TrainerTower_EventScript_TrainerTowerSign:: @ 8168BE1
-	msgbox gUnknown_818C338, MSGBOX_SIGN
+	msgbox SevenIsland_TrainerTower_Text_TrainerTowerSign, MSGBOX_SIGN
 	end
 
-SevenIsland_TrainerTower_EventScript_168BEA:: @ 8168BEA
+SevenIsland_TrainerTower_EventScript_TrainerTowerAheadSign:: @ 8168BEA
-	msgbox gUnknown_818C370, MSGBOX_SIGN
+	msgbox SevenIsland_TrainerTower_Text_TrainerTowerAhead, MSGBOX_SIGN
 	end

data/maps/SevenIsland_TrainerTower/text.inc

@@ -1,97 +1,41 @@
-Text_18BE5D:: @ 818BE5D
+SevenIsland_TrainerTower_Text_DarioIntro:: @ 818C1ED
-    .string "There appear to be many secrets\n"
-    .string "still unsolved in this world.$"
-
-Text_18BE9B:: @ 818BE9B
-    .string "Hmm…$"
-
-Text_18BEA0:: @ 818BEA0
-    .string "I suggest to you that you, too,\n"
-    .string "give a thought to the secrets and\l"
-    .string "mysteries of our world once a day.$"
-
-Text_18BF05:: @ 818BF05
-    .string "I'm curious, what compelled you to\n"
-    .string "come here?$"
-
-Text_18BF33:: @ 818BF33
-    .string "It's been so long since I battled,\n"
-    .string "my instincts are off.$"
-
-Text_18BF6C:: @ 818BF6C
-    .string "There are several ruins on the\n"
-    .string "SEVII ISLANDS.\p"
-    .string "The majority of them date back\n"
-    .string "a long way.$"
-
-Text_18BFC5:: @ 818BFC5
-    .string "It's been said that there are\n"
-    .string "mysterious stones on this island.\p"
-    .string "I suspect it has something to do\n"
-    .string "with the ruins here.$"
-
-Text_18C03B:: @ 818C03B
-    .string "Oh, interesting.$"
-
-Text_18C04C:: @ 818C04C
-    .string "Those ruins over there…\p"
-    .string "I haven't had any luck in finding\n"
-    .string "how I can get inside.$"
-
-Text_18C09C:: @ 818C09C
-    .string "A battle with you, so high up!$"
-
-Text_18C0BB:: @ 818C0BB
-    .string "Oh, the heartbreak of losing so\n"
-    .string "easily to you!$"
-
-Text_18C0EA:: @ 818C0EA
-    .string "Experience the joy of climbing!$"
-
-Text_18C10A:: @ 818C10A
-    .string "I'm pretty familiar with the land\n"
-    .string "around these parts.$"
-
-Text_18C140:: @ 818C140
-    .string "You don't need to be so pushy.\n"
-    .string "I'll be happy to tell you.$"
-
-Text_18C17A:: @ 818C17A
-    .string "The door to the ruins…\n"
-    .string "It has these strange patterns\l"
-    .string "engraved on the outside.\p"
-    .string "I don't know what they mean,\n"
-    .string "though.$"
-
-Text_18C1ED:: @ 818C1ED
     .string "I sensed your approach.$"
 
-Text_18C205:: @ 818C205
+SevenIsland_TrainerTower_Text_DarioDefeat:: @ 818C205
     .string "Give up…$"
 
-Text_18C20E:: @ 818C20E
+SevenIsland_TrainerTower_Text_DarioPostBattle:: @ 818C20E
     .string "In your future, I sense that you\n"
     .string "will meet many others.\p"
     .string "I think you will be linked to each\n"
     .string "other by a strange power.$"
 
-Text_18C283:: @ 818C283
+SevenIsland_TrainerTower_Text_RodetteIntro:: @ 818C283
     .string "Somewhere on this island, peculiar\n"
     .string "POKéMON are sleeping.$"
 
-Text_18C2BC:: @ 818C2BC
+SevenIsland_TrainerTower_Text_RodetteDefeat:: @ 818C2BC
     .string "What an amazing TRAINER!$"
 
-Text_18C2D5:: @ 818C2D5
+SevenIsland_TrainerTower_Text_RodettePostBattle:: @ 818C2D5
     .string "Somewhere on this island, peculiar\n"
     .string "POKéMON are sleeping.\p"
     .string "Could it be that they're waiting\n"
     .string "for you?$"
 
-gUnknown_818C338:: @ 818C338
+SevenIsland_TrainerTower_Text_TrainerTowerSign:: @ 818C338
     .string "TRAINER TOWER ENTRANCE\n"
     .string "Rise to the Challenge, TRAINERS!$"
 
-gUnknown_818C370:: @ 818C370
+SevenIsland_TrainerTower_Text_TrainerTowerAhead:: @ 818C370
     .string "TRAINER TOWER AHEAD$"
 
+@ Unused text perhaps indicating Trainer Tower was planned to be unlocked by something
+SevenIsland_TrainerTower_Text_LooksLikeTrainerTowerIsClosed:: @ 818C384
+    .string "トレーナータワーには\n"
+    .string "いまは　はいれない　みたい‥$"
+
+SevenIsland_TrainerTower_Text_TrainerTowerIsOpenLetsGoIn:: @ 818C39E
+    .string "トレーナータワーが　あいてる！\n"
+    .string "さっそく　はいってみよう！$"
+

data/maps/SixIsland/map.json

@@ -31,7 +31,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SixIsland_EventScript_167EEB",
+      "script": "SixIsland_EventScript_Boy",
       "flag": "0"
     },
     {
@@ -44,7 +44,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SixIsland_EventScript_167EE2",
+      "script": "SixIsland_EventScript_Hiker",
       "flag": "0"
     }
   ],
@@ -85,7 +85,7 @@
       "x": 9,
       "y": 17,
       "elevation": 0,
-      "script": "SixIsland_EventScript_167EF4"
+      "script": "SixIsland_EventScript_IslandSign"
     },
     {
       "type": "hidden_item",

data/maps/SixIsland/scripts.inc

@@ -6,14 +6,14 @@ SixIsland_OnTransition:: @ 8167EDE
 	setworldmapflag FLAG_WORLD_MAP_SIX_ISLAND
 	end
 
-SixIsland_EventScript_167EE2:: @ 8167EE2
+SixIsland_EventScript_Hiker:: @ 8167EE2
-	msgbox gUnknown_81831EF, MSGBOX_NPC
+	msgbox SixIsland_Text_ThatWayToWaterPathRuinValley, MSGBOX_NPC
 	end
 
-SixIsland_EventScript_167EEB:: @ 8167EEB
+SixIsland_EventScript_Boy:: @ 8167EEB
-	msgbox gUnknown_8183255, MSGBOX_NPC
+	msgbox SixIsland_Text_SkyAtNightIsFantastic, MSGBOX_NPC
 	end
 
-SixIsland_EventScript_167EF4:: @ 8167EF4
+SixIsland_EventScript_IslandSign:: @ 8167EF4
-	msgbox gUnknown_81831C6, MSGBOX_SIGN
+	msgbox SixIsland_Text_IslandSign, MSGBOX_SIGN
 	end

data/maps/SixIsland/text.inc

@@ -1,14 +1,14 @@
-gUnknown_81831C6:: @ 81831C6
+SixIsland_Text_IslandSign:: @ 81831C6
     .string "SIX ISLAND\n"
     .string "Fortune Island of Aged Wisdom$"
 
-gUnknown_81831EF:: @ 81831EF
+SixIsland_Text_ThatWayToWaterPathRuinValley:: @ 81831EF
     .string "Keep going this way and you'll get\n"
     .string "to the WATER PATH.\p"
     .string "Stay on that and you'll get to\n"
     .string "the RUIN VALLEY.$"
 
-gUnknown_8183255:: @ 8183255
+SixIsland_Text_SkyAtNightIsFantastic:: @ 8183255
     .string "When you're this far away from the\n"
     .string "city, the sky at night is fantastic.$"
 

data/maps/SixIsland_GreenPath/map.json

@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "SixIsland_GreenPath_EventScript_1AC517",
+      "script": "SixIsland_GreenPath_EventScript_Jaclyn",
       "flag": "0"
     }
   ],
@@ -77,14 +77,14 @@
       "x": 40,
       "y": 10,
       "elevation": 0,
-      "script": "SixIsland_GreenPath_EventScript_168B37"
+      "script": "SixIsland_GreenPath_EventScript_LeftRouteSign"
     },
     {
       "type": "bg_event_type_0",
       "x": 69,
       "y": 10,
       "elevation": 0,
-      "script": "SixIsland_GreenPath_EventScript_168B2E"
+      "script": "SixIsland_GreenPath_EventScript_RightRouteSign"
     },
     {
       "type": "hidden_item",

data/maps/SixIsland_GreenPath/scripts.inc

@@ -1,10 +1,10 @@
 SixIsland_GreenPath_MapScripts:: @ 8168B2D
 	.byte 0
 
-SixIsland_GreenPath_EventScript_168B2E:: @ 8168B2E
+SixIsland_GreenPath_EventScript_RightRouteSign:: @ 8168B2E
-	msgbox gUnknown_818B84D, MSGBOX_SIGN
+	msgbox SixIsland_GreenPath_Text_LeftRouteSign, MSGBOX_SIGN
 	end
 
-SixIsland_GreenPath_EventScript_168B37:: @ 8168B37
+SixIsland_GreenPath_EventScript_LeftRouteSign:: @ 8168B37
-	msgbox gUnknown_818B86B, MSGBOX_SIGN
+	msgbox SixIsland_GreenPath_Text_RightRouteSign, MSGBOX_SIGN
 	end

data/maps/SixIsland_GreenPath/text.inc

@@ -1,94 +1,21 @@
-Text_18B400:: @ 818B400
+SixIsland_GreenPath_Text_JaclynIntro:: @ 818B7B0
-    .string "I'm having no luck at all.\n"
-    .string "A battle'd be a change of pace!$"
-
-Text_18B43B:: @ 818B43B
-    .string "Nope, no luck at all…$"
-
-Text_18B451:: @ 818B451
-    .string "I can't very well go home without\n"
-    .string "catching something, though.$"
-
-Text_18B48F:: @ 818B48F
-    .string "Gasp… Gasp…\p"
-    .string "I swam here from SIX ISLE PORT\n"
-    .string "in one go.$"
-
-Text_18B4C5:: @ 818B4C5
-    .string "Gasp…\n"
-    .string "Gasp…$"
-
-Text_18B4D1:: @ 818B4D1
-    .string "I'm only at the halfway point…\n"
-    .string "I'm beat…$"
-
-Text_18B4FA:: @ 818B4FA
-    .string "It's not so easy sending POKéMON\n"
-    .string "out while swimming, you know?$"
-
-Text_18B539:: @ 818B539
-    .string "I didn't lose to you at swimming.\n"
-    .string "This doesn't bother me.$"
-
-Text_18B573:: @ 818B573
-    .string "Are you headed for the island up\n"
-    .string "past here?\p"
-    .string "I didn't see anything interesting\n"
-    .string "there.$"
-
-Text_18B5C8:: @ 818B5C8
-    .string "AVA: Let's have a two-on-two\n"
-    .string "marine battle!$"
-
-Text_18B5F4:: @ 818B5F4
-    .string "AVA: Oh, you're amazing!\n"
-    .string "Even better, you're on your own!$"
-
-Text_18B62E:: @ 818B62E
-    .string "AVA: You know, I do prefer the\n"
-    .string "sea over any pool.$"
-
-Text_18B660:: @ 818B660
-    .string "AVA: You're challenging us to\n"
-    .string "a battle?\p"
-    .string "You'll need at least two POKéMON\n"
-    .string "if you want to do that.$"
-
-Text_18B6C1:: @ 818B6C1
-    .string "GEB: Big Sister, help!\n"
-    .string "Please battle with me!$"
-
-Text_18B6EF:: @ 818B6EF
-    .string "GEB: Wow, Big Sister, this person's\n"
-    .string "really good!$"
-
-Text_18B720:: @ 818B720
-    .string "GEB: I'm hanging onto my sister\n"
-    .string "because I can't touch the bottom.$"
-
-Text_18B762:: @ 818B762
-    .string "GEB: Please battle against me and\n"
-    .string "my sister!\p"
-    .string "…Oh, you don't have two POKéMON?$"
-
-Text_18B7B0:: @ 818B7B0
     .string "…Huh?\p"
     .string "I was envisioning my house, but\n"
     .string "this is where I TELEPORT?$"
 
-Text_18B7F0:: @ 818B7F0
+SixIsland_GreenPath_Text_JaclynDefeat:: @ 818B7F0
     .string "Big boo-boo!$"
 
-Text_18B7FD:: @ 818B7FD
+SixIsland_GreenPath_Text_JaclynPostBattle:: @ 818B7FD
     .string "I am so scatterbrained!\p"
     .string "I need to focus so I can TELEPORT\n"
     .string "properly to my house!$"
 
-gUnknown_818B84D:: @ 818B84D
+SixIsland_GreenPath_Text_LeftRouteSign:: @ 818B84D
     .string "GREEN PATH\n"
     .string "PATTERN BUSH AHEAD$"
 
-gUnknown_818B86B:: @ 818B86B
+SixIsland_GreenPath_Text_RightRouteSign:: @ 818B86B
     .string "GREEN PATH\n"
     .string "Think Green, Keep Nature Clean!$"
 

data/maps/SixIsland_Harbor/map.json

@@ -38,7 +38,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SixIsland_Harbor_EventScript_171E48",
+      "script": "SixIsland_Harbor_EventScript_Sailor",
       "flag": "0"
     }
   ],

data/maps/SixIsland_Harbor/scripts.inc

@@ -1,7 +1,7 @@
 SixIsland_Harbor_MapScripts:: @ 8171E47
 	.byte 0
 
-SixIsland_Harbor_EventScript_171E48:: @ 8171E48
+SixIsland_Harbor_EventScript_Sailor:: @ 8171E48
 	lock
 	faceplayer
 	message Text_WhereDoYouWantToSail

data/maps/SixIsland_House/map.json

@@ -25,7 +25,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SixIsland_House_EventScript_171E5C",
+      "script": "SixIsland_House_EventScript_OldMan",
       "flag": "0"
     }
   ],

data/maps/SixIsland_House/scripts.inc

@@ -1,6 +1,6 @@
 SixIsland_House_MapScripts:: @ 8171E5B
 	.byte 0
 
-SixIsland_House_EventScript_171E5C:: @ 8171E5C
+SixIsland_House_EventScript_OldMan:: @ 8171E5C
-	msgbox gUnknown_81A412E, MSGBOX_NPC
+	msgbox SixIsland_House_Text_GoodPlaceForNatureAndHistory, MSGBOX_NPC
 	end

data/maps/SixIsland_House/text.inc

@@ -1,4 +1,4 @@
-gUnknown_81A412E:: @ 81A412E
+SixIsland_House_Text_GoodPlaceForNatureAndHistory:: @ 81A412E
     .string "There's nothing that young people'd\n"
     .string "find exciting here on this island.\p"
     .string "But, this is a good place in terms\n"

data/maps/SixIsland_Mart/map.json

@@ -25,7 +25,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SixIsland_Mart_EventScript_171E66",
+      "script": "SixIsland_Mart_EventScript_Clerk",
       "flag": "0"
     },
     {
@@ -38,7 +38,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SixIsland_Mart_EventScript_1ACFEF",
+      "script": "SixIsland_Mart_EventScript_OldWoman",
       "flag": "0"
     },
     {
@@ -51,7 +51,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SixIsland_Mart_EventScript_171EA0",
+      "script": "SixIsland_Mart_EventScript_Picnicker",
       "flag": "0"
     }
   ],

data/maps/SixIsland_Mart/scripts.inc

@@ -1,19 +1,19 @@
 SixIsland_Mart_MapScripts:: @ 8171E65
 	.byte 0
 
-SixIsland_Mart_EventScript_171E66:: @ 8171E66
+SixIsland_Mart_EventScript_Clerk:: @ 8171E66
 	goto_if_questlog EventScript_ReleaseEnd
 	lock
 	faceplayer
 	message Text_MayIHelpYou
 	waitmessage
-	pokemart Items_171E8C
+	pokemart SixIsland_Mart_Items
 	msgbox Text_PleaseComeAgain
 	release
 	end
 
 	.align 2
-Items_171E8C:: @ 8171E8C
+SixIsland_Mart_Items:: @ 8171E8C
 	.2byte ITEM_ULTRA_BALL
 	.2byte ITEM_FULL_RESTORE
 	.2byte ITEM_MAX_POTION
@@ -26,6 +26,6 @@ Items_171E8C:: @ 8171E8C
 	release
 	end
 
-SixIsland_Mart_EventScript_171EA0:: @ 8171EA0
+SixIsland_Mart_EventScript_Picnicker:: @ 8171EA0
-	msgbox gUnknown_81A4271, MSGBOX_NPC
+	msgbox SixIsland_Mart_Text_ShouldBuyMailAndWriteLetter, MSGBOX_NPC
 	end

data/maps/SixIsland_Mart/text.inc

@@ -1,4 +1,4 @@
-Text_1A41CA:: @ 81A41CA
+SixIsland_Mart_Text_AgathaOldestEverEliteFourMember:: @ 81A41CA
     .string "Play with POKéMON lots and live\n"
     .string "a long life!\p"
     .string "Take AGATHA, for example.\p"
@@ -6,7 +6,7 @@ Text_1A41CA:: @ 81A41CA
     .string "oldest-ever ELITE FOUR member.\p"
     .string "She spurs me to do bigger things.$"
 
-gUnknown_81A4271:: @ 81A4271
+SixIsland_Mart_Text_ShouldBuyMailAndWriteLetter:: @ 81A4271
     .string "I should buy some MAIL and write\n"
     .string "him a letter…$"
 

data/maps/SixIsland_OutcastIsland/map.json

@@ -31,7 +31,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "SixIsland_OutcastIsland_EventScript_168B16",
+      "script": "SixIsland_OutcastIsland_EventScript_Rocket",
       "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS"
     },
     {
@@ -44,7 +44,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "SixIsland_OutcastIsland_EventScript_1AC3D1",
+      "script": "SixIsland_OutcastIsland_EventScript_Tylor",
       "flag": "0"
     },
     {
@@ -57,7 +57,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "SixIsland_OutcastIsland_EventScript_1AC40F",
+      "script": "SixIsland_OutcastIsland_EventScript_Mymo",
       "flag": "0"
     },
     {
@@ -70,7 +70,7 @@
       "movement_range_y": 4,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "SixIsland_OutcastIsland_EventScript_1AC44D",
+      "script": "SixIsland_OutcastIsland_EventScript_Nicole",
       "flag": "0"
     },
     {
@@ -83,7 +83,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "SixIsland_OutcastIsland_EventScript_1AC48B",
+      "script": "SixIsland_OutcastIsland_EventScript_Ava",
       "flag": "0"
     },
     {
@@ -96,7 +96,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "SixIsland_OutcastIsland_EventScript_1AC4D1",
+      "script": "SixIsland_OutcastIsland_EventScript_Geb",
       "flag": "0"
     },
     {

data/maps/SixIsland_OutcastIsland/scripts.inc

@@ -1,7 +1,7 @@
 SixIsland_OutcastIsland_MapScripts:: @ 8168B15
 	.byte 0
 
-SixIsland_OutcastIsland_EventScript_168B16:: @ 8168B16
+SixIsland_OutcastIsland_EventScript_Rocket:: @ 8168B16
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_46, Text_18B35A, Text_18B3C2
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_46, SixIsland_OutcastIsland_Text_RocketIntro, SixIsland_OutcastIsland_Text_RocketDefeat
-	msgbox gUnknown_818B3C8, MSGBOX_AUTOCLOSE
+	msgbox SixIsland_OutcastIsland_Text_RocketPostBattle, MSGBOX_AUTOCLOSE
 	end

data/maps/SixIsland_OutcastIsland/text.inc

@@ -1,13 +1,85 @@
-Text_18B35A:: @ 818B35A
+SixIsland_OutcastIsland_Text_RocketIntro:: @ 818B35A
     .string "There're no rare POKéMON around\n"
     .string "these parts! Not a one!\p"
     .string "That burns me up, man.\n"
     .string "I'll take it out on you!$"
 
-Text_18B3C2:: @ 818B3C2
+SixIsland_OutcastIsland_Text_RocketDefeat:: @ 818B3C2
     .string "…Huh?$"
 
-gUnknown_818B3C8:: @ 818B3C8
+SixIsland_OutcastIsland_Text_RocketPostBattle:: @ 818B3C8
     .string "So listen, you haven't seen any\n"
     .string "rare POKéMON, have you?$"
 
+SixIsland_OutcastIsland_Text_TylorIntro:: @ 818B400
+    .string "I'm having no luck at all.\n"
+    .string "A battle'd be a change of pace!$"
+
+SixIsland_OutcastIsland_Text_TylorDefeat:: @ 818B43B
+    .string "Nope, no luck at all…$"
+
+SixIsland_OutcastIsland_Text_TylorPostBattle:: @ 818B451
+    .string "I can't very well go home without\n"
+    .string "catching something, though.$"
+
+SixIsland_OutcastIsland_Text_MymoIntro:: @ 818B48F
+    .string "Gasp… Gasp…\p"
+    .string "I swam here from SIX ISLE PORT\n"
+    .string "in one go.$"
+
+SixIsland_OutcastIsland_Text_MymoDefeat:: @ 818B4C5
+    .string "Gasp…\n"
+    .string "Gasp…$"
+
+SixIsland_OutcastIsland_Text_MymoPostBattle:: @ 818B4D1
+    .string "I'm only at the halfway point…\n"
+    .string "I'm beat…$"
+
+SixIsland_OutcastIsland_Text_NicoleIntro:: @ 818B4FA
+    .string "It's not so easy sending POKéMON\n"
+    .string "out while swimming, you know?$"
+
+SixIsland_OutcastIsland_Text_NicoleDefeat:: @ 818B539
+    .string "I didn't lose to you at swimming.\n"
+    .string "This doesn't bother me.$"
+
+SixIsland_OutcastIsland_Text_NicolePostBattle:: @ 818B573
+    .string "Are you headed for the island up\n"
+    .string "past here?\p"
+    .string "I didn't see anything interesting\n"
+    .string "there.$"
+
+SixIsland_OutcastIsland_Text_AvaIntro:: @ 818B5C8
+    .string "AVA: Let's have a two-on-two\n"
+    .string "marine battle!$"
+
+SixIsland_OutcastIsland_Text_AvaDefeat:: @ 818B5F4
+    .string "AVA: Oh, you're amazing!\n"
+    .string "Even better, you're on your own!$"
+
+SixIsland_OutcastIsland_Text_AvaPostBattle:: @ 818B62E
+    .string "AVA: You know, I do prefer the\n"
+    .string "sea over any pool.$"
+
+SixIsland_OutcastIsland_Text_AvaNotEnoughMons:: @ 818B660
+    .string "AVA: You're challenging us to\n"
+    .string "a battle?\p"
+    .string "You'll need at least two POKéMON\n"
+    .string "if you want to do that.$"
+
+SixIsland_OutcastIsland_Text_GebIntro:: @ 818B6C1
+    .string "GEB: Big Sister, help!\n"
+    .string "Please battle with me!$"
+
+SixIsland_OutcastIsland_Text_GebDefeat:: @ 818B6EF
+    .string "GEB: Wow, Big Sister, this person's\n"
+    .string "really good!$"
+
+SixIsland_OutcastIsland_Text_GebPostBattle:: @ 818B720
+    .string "GEB: I'm hanging onto my sister\n"
+    .string "because I can't touch the bottom.$"
+
+SixIsland_OutcastIsland_Text_GebNotEnoughMons:: @ 818B762
+    .string "GEB: Please battle against me and\n"
+    .string "my sister!\p"
+    .string "…Oh, you don't have two POKéMON?$"

data/maps/SixIsland_PatternBush/map.json

@@ -25,7 +25,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "SixIsland_PatternBush_EventScript_164590",
+      "script": "SixIsland_PatternBush_EventScript_Bethany",
       "flag": "0"
     },
     {
@@ -38,7 +38,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "SixIsland_PatternBush_EventScript_1645A7",
+      "script": "SixIsland_PatternBush_EventScript_Allison",
       "flag": "0"
     },
     {
@@ -51,7 +51,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "SixIsland_PatternBush_EventScript_1645BE",
+      "script": "SixIsland_PatternBush_EventScript_Garret",
       "flag": "0"
     },
     {
@@ -64,7 +64,7 @@
       "movement_range_y": 2,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "SixIsland_PatternBush_EventScript_1645D5",
+      "script": "SixIsland_PatternBush_EventScript_Jonah",
       "flag": "0"
     },
     {
@@ -77,7 +77,7 @@
       "movement_range_y": 5,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "SixIsland_PatternBush_EventScript_1645EC",
+      "script": "SixIsland_PatternBush_EventScript_Vance",
       "flag": "0"
     },
     {
@@ -90,7 +90,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "SixIsland_PatternBush_EventScript_164603",
+      "script": "SixIsland_PatternBush_EventScript_Nash",
       "flag": "0"
     },
     {
@@ -103,7 +103,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "SixIsland_PatternBush_EventScript_16461A",
+      "script": "SixIsland_PatternBush_EventScript_Cordell",
       "flag": "0"
     },
     {
@@ -116,7 +116,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 5,
-      "script": "SixIsland_PatternBush_EventScript_164631",
+      "script": "SixIsland_PatternBush_EventScript_Dalia",
       "flag": "0"
     },
     {
@@ -129,7 +129,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "SixIsland_PatternBush_EventScript_164648",
+      "script": "SixIsland_PatternBush_EventScript_Joana",
       "flag": "0"
     },
     {
@@ -142,7 +142,7 @@
       "movement_range_y": 2,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "SixIsland_PatternBush_EventScript_16465F",
+      "script": "SixIsland_PatternBush_EventScript_Riley",
       "flag": "0"
     },
     {
@@ -155,7 +155,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "SixIsland_PatternBush_EventScript_164676",
+      "script": "SixIsland_PatternBush_EventScript_Marcy",
       "flag": "0"
     },
     {
@@ -168,7 +168,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "SixIsland_PatternBush_EventScript_16468D",
+      "script": "SixIsland_PatternBush_EventScript_Layton",
       "flag": "0"
     }
   ],

data/maps/SixIsland_PatternBush/scripts.inc

@@ -6,75 +6,75 @@ SixIsland_PatternBush_OnTransition:: @ 816455F
 	setworldmapflag FLAG_WORLD_MAP_SIX_ISLAND_PATTERN_BUSH
 	getplayerxy VAR_TEMP_1, VAR_TEMP_2
 	compare VAR_TEMP_1, 50
-	call_if_ge EventScript_16457E
+	call_if_ge SixIsland_PatternBush_EventScript_SetEscapeRightExit
 	compare VAR_TEMP_1, 49
-	call_if_le EventScript_164587
+	call_if_le SixIsland_PatternBush_EventScript_SetEscapeLeftExit
 	end
 
-EventScript_16457E:: @ 816457E
+SixIsland_PatternBush_EventScript_SetEscapeRightExit:: @ 816457E
 	setescapewarp MAP_SIX_ISLAND_GREEN_PATH, 255, 64, 10
 	return
 
-EventScript_164587:: @ 8164587
+SixIsland_PatternBush_EventScript_SetEscapeLeftExit:: @ 8164587
 	setescapewarp MAP_SIX_ISLAND_GREEN_PATH, 255, 45, 10
 	return
 
-SixIsland_PatternBush_EventScript_164590:: @ 8164590
+SixIsland_PatternBush_EventScript_Bethany:: @ 8164590
-	trainerbattle_single TRAINER_PKMN_BREEDER_BETHANY, Text_17BF3A, Text_17BF66
+	trainerbattle_single TRAINER_PKMN_BREEDER_BETHANY, SixIsland_PatternBush_Text_BethanyIntro, SixIsland_PatternBush_Text_BethanyDefeat
-	msgbox gUnknown_817BF97, MSGBOX_AUTOCLOSE
+	msgbox SixIsland_PatternBush_Text_BethanyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SixIsland_PatternBush_EventScript_1645A7:: @ 81645A7
+SixIsland_PatternBush_EventScript_Allison:: @ 81645A7
-	trainerbattle_single TRAINER_PKMN_BREEDER_ALLISON, Text_17BFEB, Text_17C028
+	trainerbattle_single TRAINER_PKMN_BREEDER_ALLISON, SixIsland_PatternBush_Text_AllisonIntro, SixIsland_PatternBush_Text_AllisonDefeat
-	msgbox gUnknown_817C056, MSGBOX_AUTOCLOSE
+	msgbox SixIsland_PatternBush_Text_AllisonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SixIsland_PatternBush_EventScript_1645BE:: @ 81645BE
+SixIsland_PatternBush_EventScript_Garret:: @ 81645BE
-	trainerbattle_single TRAINER_BUG_CATCHER_GARRET, Text_17C0BE, Text_17C0F2
+	trainerbattle_single TRAINER_BUG_CATCHER_GARRET, SixIsland_PatternBush_Text_GarretIntro, SixIsland_PatternBush_Text_GarretDefeat
-	msgbox gUnknown_817C113, MSGBOX_AUTOCLOSE
+	msgbox SixIsland_PatternBush_Text_GarretPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SixIsland_PatternBush_EventScript_1645D5:: @ 81645D5
+SixIsland_PatternBush_EventScript_Jonah:: @ 81645D5
-	trainerbattle_single TRAINER_BUG_CATCHER_JONAH, Text_17C155, Text_17C196
+	trainerbattle_single TRAINER_BUG_CATCHER_JONAH, SixIsland_PatternBush_Text_JonahIntro, SixIsland_PatternBush_Text_JonahDefeat
-	msgbox gUnknown_817C1D0, MSGBOX_AUTOCLOSE
+	msgbox SixIsland_PatternBush_Text_JonahPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SixIsland_PatternBush_EventScript_1645EC:: @ 81645EC
+SixIsland_PatternBush_EventScript_Vance:: @ 81645EC
-	trainerbattle_single TRAINER_BUG_CATCHER_VANCE, Text_17C246, Text_17C275
+	trainerbattle_single TRAINER_BUG_CATCHER_VANCE, SixIsland_PatternBush_Text_VanceIntro, SixIsland_PatternBush_Text_VanceDefeat
-	msgbox gUnknown_817C2A4, MSGBOX_AUTOCLOSE
+	msgbox SixIsland_PatternBush_Text_VancePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SixIsland_PatternBush_EventScript_164603:: @ 8164603
+SixIsland_PatternBush_EventScript_Nash:: @ 8164603
-	trainerbattle_single TRAINER_YOUNGSTER_NASH, Text_17C2D9, Text_17C30D
+	trainerbattle_single TRAINER_YOUNGSTER_NASH, SixIsland_PatternBush_Text_NashIntro, SixIsland_PatternBush_Text_NashDefeat
-	msgbox gUnknown_817C31C, MSGBOX_AUTOCLOSE
+	msgbox SixIsland_PatternBush_Text_NashPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SixIsland_PatternBush_EventScript_16461A:: @ 816461A
+SixIsland_PatternBush_EventScript_Cordell:: @ 816461A
-	trainerbattle_single TRAINER_YOUNGSTER_CORDELL, Text_17C373, Text_17C3A5
+	trainerbattle_single TRAINER_YOUNGSTER_CORDELL, SixIsland_PatternBush_Text_CordellIntro, SixIsland_PatternBush_Text_CordellDefeat
-	msgbox gUnknown_817C3CE, MSGBOX_AUTOCLOSE
+	msgbox SixIsland_PatternBush_Text_CordellPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SixIsland_PatternBush_EventScript_164631:: @ 8164631
+SixIsland_PatternBush_EventScript_Dalia:: @ 8164631
-	trainerbattle_single TRAINER_LASS_DALIA, Text_17C42B, Text_17C458
+	trainerbattle_single TRAINER_LASS_DALIA, SixIsland_PatternBush_Text_DaliaIntro, SixIsland_PatternBush_Text_DaliaDefeat
-	msgbox gUnknown_817C490, MSGBOX_AUTOCLOSE
+	msgbox SixIsland_PatternBush_Text_DaliaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SixIsland_PatternBush_EventScript_164648:: @ 8164648
+SixIsland_PatternBush_EventScript_Joana:: @ 8164648
-	trainerbattle_single TRAINER_LASS_JOANA, Text_17C4FE, Text_17C552
+	trainerbattle_single TRAINER_LASS_JOANA, SixIsland_PatternBush_Text_JoanaIntro, SixIsland_PatternBush_Text_JoanaDefeat
-	msgbox gUnknown_817C590, MSGBOX_AUTOCLOSE
+	msgbox SixIsland_PatternBush_Text_JoanaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SixIsland_PatternBush_EventScript_16465F:: @ 816465F
+SixIsland_PatternBush_EventScript_Riley:: @ 816465F
-	trainerbattle_single TRAINER_CAMPER_RILEY, Text_17C5DB, Text_17C609
+	trainerbattle_single TRAINER_CAMPER_RILEY, SixIsland_PatternBush_Text_RileyIntro, SixIsland_PatternBush_Text_RileyDefeat
-	msgbox gUnknown_817C615, MSGBOX_AUTOCLOSE
+	msgbox SixIsland_PatternBush_Text_RileyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SixIsland_PatternBush_EventScript_164676:: @ 8164676
+SixIsland_PatternBush_EventScript_Marcy:: @ 8164676
-	trainerbattle_single TRAINER_PICNICKER_MARCY, Text_17C63E, Text_17C660
+	trainerbattle_single TRAINER_PICNICKER_MARCY, SixIsland_PatternBush_Text_MarcyIntro, SixIsland_PatternBush_Text_MarcyDefeat
-	msgbox gUnknown_817C68E, MSGBOX_AUTOCLOSE
+	msgbox SixIsland_PatternBush_Text_MarcyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SixIsland_PatternBush_EventScript_16468D:: @ 816468D
+SixIsland_PatternBush_EventScript_Layton:: @ 816468D
-	trainerbattle_single TRAINER_RUIN_MANIAC_LAYTON, Text_17C6C9, Text_17C6FB
+	trainerbattle_single TRAINER_RUIN_MANIAC_LAYTON, SixIsland_PatternBush_Text_LaytonIntro, SixIsland_PatternBush_Text_LaytonDefeat
-	msgbox gUnknown_817C728, MSGBOX_AUTOCLOSE
+	msgbox SixIsland_PatternBush_Text_LaytonPostBattle, MSGBOX_AUTOCLOSE
 	end

data/maps/SixIsland_PatternBush/text.inc

@@ -1,154 +1,154 @@
-Text_17BF3A:: @ 817BF3A
+SixIsland_PatternBush_Text_BethanyIntro:: @ 817BF3A
     .string "I'm curious, how do you raise your\n"
     .string "POKéMON?$"
 
-Text_17BF66:: @ 817BF66
+SixIsland_PatternBush_Text_BethanyDefeat:: @ 817BF66
     .string "You raise your POKéMON with a\n"
     .string "whole lot of love!$"
 
-gUnknown_817BF97:: @ 817BF97
+SixIsland_PatternBush_Text_BethanyPostBattle:: @ 817BF97
     .string "In the same way your mother raised\n"
     .string "you full of love, you should raise\l"
     .string "your POKéMON.$"
 
-Text_17BFEB:: @ 817BFEB
+SixIsland_PatternBush_Text_AllisonIntro:: @ 817BFEB
     .string "I'm working to preserve the natural\n"
     .string "ecology of POKéMON here.$"
 
-Text_17C028:: @ 817C028
+SixIsland_PatternBush_Text_AllisonDefeat:: @ 817C028
     .string "Oh, for someone so young, you are\n"
     .string "tremendous!$"
 
-gUnknown_817C056:: @ 817C056
+SixIsland_PatternBush_Text_AllisonPostBattle:: @ 817C056
     .string "I'm not saying that you shouldn't\n"
     .string "catch POKéMON.\p"
     .string "I just want people to raise their\n"
     .string "POKéMON responsibly.$"
 
-Text_17C0BE:: @ 817C0BE
+SixIsland_PatternBush_Text_GarretIntro:: @ 817C0BE
     .string "I caught a BUG POKéMON that lives\n"
     .string "only around here!$"
 
-Text_17C0F2:: @ 817C0F2
+SixIsland_PatternBush_Text_GarretDefeat:: @ 817C0F2
     .string "Heheh…\n"
     .string "Isn't my POKéMON awesome?$"
 
-gUnknown_817C113:: @ 817C113
+SixIsland_PatternBush_Text_GarretPostBattle:: @ 817C113
     .string "There's a girl near the BUSH who\n"
     .string "measures HERACROSS for TRAINERS.$"
 
-Text_17C155:: @ 817C155
+SixIsland_PatternBush_Text_JonahIntro:: @ 817C155
     .string "You know, it just doesn't feel right\n"
     .string "if I don't use BUG POKéMON.$"
 
-Text_17C196:: @ 817C196
+SixIsland_PatternBush_Text_JonahDefeat:: @ 817C196
     .string "It's okay, losing is a fun part of\n"
     .string "POKéMON's appeal, too.$"
 
-gUnknown_817C1D0:: @ 817C1D0
+SixIsland_PatternBush_Text_JonahPostBattle:: @ 817C1D0
     .string "By the way, “appeal” is a weird\n"
     .string "word, if you think about it.\p"
     .string "Like, is it like an orange peel?\n"
     .string "Or like a ringing bell?$"
 
-Text_17C246:: @ 817C246
+SixIsland_PatternBush_Text_VanceIntro:: @ 817C246
     .string "Yeah, yeah, yeah!\n"
     .string "Look at all the BUG POKéMON!$"
 
-Text_17C275:: @ 817C275
+SixIsland_PatternBush_Text_VanceDefeat:: @ 817C275
     .string "I got beat while I was still busy\n"
     .string "celebrating!$"
 
-gUnknown_817C2A4:: @ 817C2A4
+SixIsland_PatternBush_Text_VancePostBattle:: @ 817C2A4
     .string "I'm going to bring my little brother\n"
     .string "here next time.$"
 
-Text_17C2D9:: @ 817C2D9
+SixIsland_PatternBush_Text_NashIntro:: @ 817C2D9
     .string "Look, look! There are funny\n"
     .string "patterns on the ground.$"
 
-Text_17C30D:: @ 817C30D
+SixIsland_PatternBush_Text_NashDefeat:: @ 817C30D
     .string "Super awesome!$"
 
-gUnknown_817C31C:: @ 817C31C
+SixIsland_PatternBush_Text_NashPostBattle:: @ 817C31C
     .string "The funny patterns on the ground…\p"
     .string "They look like the patterns on my\n"
     .string "grandpa's clothes.$"
 
-Text_17C373:: @ 817C373
+SixIsland_PatternBush_Text_CordellIntro:: @ 817C373
     .string "I bet you think I'm just some guy,\n"
     .string "don't you, eh?$"
 
-Text_17C3A5:: @ 817C3A5
+SixIsland_PatternBush_Text_CordellDefeat:: @ 817C3A5
     .string "I bet you think I'm weak,\n"
     .string "don't you, eh?$"
 
-gUnknown_817C3CE:: @ 817C3CE
+SixIsland_PatternBush_Text_CordellPostBattle:: @ 817C3CE
     .string "Ayup, you townies come around all\n"
     .string "so dandy with a hat that flashy…\p"
     .string "How about giving me that?$"
 
-Text_17C42B:: @ 817C42B
+SixIsland_PatternBush_Text_DaliaIntro:: @ 817C42B
     .string "Take a deep breath.\n"
     .string "Isn't the air delicious?$"
 
-Text_17C458:: @ 817C458
+SixIsland_PatternBush_Text_DaliaDefeat:: @ 817C458
     .string "If you'd like, I can teach you how\n"
     .string "to breathe properly.$"
 
-gUnknown_817C490:: @ 817C490
+SixIsland_PatternBush_Text_DaliaPostBattle:: @ 817C490
     .string "First, exhale.\n"
     .string "Blow everything out.\p"
     .string "When you can't exhale anymore,\n"
     .string "inhale the clean air!\p"
     .string "Isn't it refreshing?$"
 
-Text_17C4FE:: @ 817C4FE
+SixIsland_PatternBush_Text_JoanaIntro:: @ 817C4FE
     .string "I love BUG POKéMON.\n"
     .string "That's why I'm here all the time.\p"
     .string "Am I the only girl like that?$"
 
-Text_17C552:: @ 817C552
+SixIsland_PatternBush_Text_JoanaDefeat:: @ 817C552
     .string "I lost, but I'm still laughing.\n"
     .string "Am I the only girl like that?$"
 
-gUnknown_817C590:: @ 817C590
+SixIsland_PatternBush_Text_JoanaPostBattle:: @ 817C590
     .string "I'm going to keep on collecting\n"
     .string "BUG POKéMON.\p"
     .string "Am I the only girl like that?$"
 
-Text_17C5DB:: @ 817C5DB
+SixIsland_PatternBush_Text_RileyIntro:: @ 817C5DB
     .string "This is a good spot.\n"
     .string "I'll pitch my tent here.$"
 
-Text_17C609:: @ 817C609
+SixIsland_PatternBush_Text_RileyDefeat:: @ 817C609
     .string "Wimped out…$"
 
-gUnknown_817C615:: @ 817C615
+SixIsland_PatternBush_Text_RileyPostBattle:: @ 817C615
     .string "I'm going to observe the night sky\n"
     .string "here.$"
 
-Text_17C63E:: @ 817C63E
+SixIsland_PatternBush_Text_MarcyIntro:: @ 817C63E
     .string "Oh, yuck!\n"
     .string "I think a bug stung me!$"
 
-Text_17C660:: @ 817C660
+SixIsland_PatternBush_Text_MarcyDefeat:: @ 817C660
     .string "It wasn't a bug.\n"
     .string "I cut my shin on some grass.$"
 
-gUnknown_817C68E:: @ 817C68E
+SixIsland_PatternBush_Text_MarcyPostBattle:: @ 817C68E
     .string "A little cut like that…\n"
     .string "A little spit's enough to cure it!$"
 
-Text_17C6C9:: @ 817C6C9
+SixIsland_PatternBush_Text_LaytonIntro:: @ 817C6C9
     .string "Have you noticed something odd\n"
     .string "about these parts?$"
 
-Text_17C6FB:: @ 817C6FB
+SixIsland_PatternBush_Text_LaytonDefeat:: @ 817C6FB
     .string "Have you taken a good look around\n"
     .string "your feet?$"
 
-gUnknown_817C728:: @ 817C728
+SixIsland_PatternBush_Text_LaytonPostBattle:: @ 817C728
     .string "There are places here in PATTERN\n"
     .string "BUSH where grass won't grow.\p"
     .string "What could be the cause of such\n"

data/maps/SixIsland_PokemonCenter_1F/map.json

@@ -25,7 +25,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SixIsland_PokemonCenter_1F_EventScript_171E05",
+      "script": "SixIsland_PokemonCenter_1F_EventScript_Nurse",
       "flag": "0"
     },
     {
@@ -51,7 +51,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SixIsland_PokemonCenter_1F_EventScript_171E0E",
+      "script": "SixIsland_PokemonCenter_1F_EventScript_Hiker",
       "flag": "0"
     },
     {
@@ -64,7 +64,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SixIsland_PokemonCenter_1F_EventScript_171E17",
+      "script": "SixIsland_PokemonCenter_1F_EventScript_OldMan",
       "flag": "0"
     }
   ],

data/maps/SixIsland_PokemonCenter_1F/scripts.inc

@@ -1,3 +1,5 @@
+.equ LOCALID_RIVAL, 2
+
 SixIsland_PokemonCenter_1F_MapScripts:: @ 8171D6A
 	map_script MAP_SCRIPT_ON_TRANSITION, SixIsland_PokemonCenter_1F_OnTransition
 	map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
@@ -7,73 +9,73 @@ SixIsland_PokemonCenter_1F_MapScripts:: @ 8171D6A
 SixIsland_PokemonCenter_1F_OnTransition:: @ 8171D7A
 	setrespawn SPAWN_SIX_ISLAND
 	compare VAR_MAP_SCENE_SIX_ISLAND_POKEMON_CENTER_1F, 0
-	call_if_eq EventScript_171D89
+	call_if_eq SixIsland_PokemonCenter_1F_EventScript_ShowRival
 	end
 
-EventScript_171D89:: @ 8171D89
+SixIsland_PokemonCenter_1F_EventScript_ShowRival:: @ 8171D89
 	clearflag FLAG_HIDE_SIX_ISLAND_POKECENTER_RIVAL
 	return
 
 SixIsland_PokemonCenter_1F_OnFrame:: @ 8171D8D
-	map_script_2 VAR_MAP_SCENE_SIX_ISLAND_POKEMON_CENTER_1F, 0, EventScript_171D97
+	map_script_2 VAR_MAP_SCENE_SIX_ISLAND_POKEMON_CENTER_1F, 0, SixIsland_PokemonCenter_1F_EventScript_RivalScene
 	.2byte 0
 
-EventScript_171D97:: @ 8171D97
+SixIsland_PokemonCenter_1F_EventScript_RivalScene:: @ 8171D97
 	lockall
 	textcolor 0
-	applymovement 2, Movement_WalkInPlaceFastestDown
+	applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	playbgm MUS_RIVAL1, 0
-	applymovement 2, Movement_ExclamationMark
+	applymovement LOCALID_RIVAL, Movement_ExclamationMark
 	waitmovement 0
-	applymovement 2, Movement_Delay48
+	applymovement LOCALID_RIVAL, Movement_Delay48
 	waitmovement 0
 	delay 25
-	applymovement 2, Movement_171DF9
+	applymovement LOCALID_RIVAL, SixIsland_PokemonCenter_1F_Movement_RivalApproach
 	waitmovement 0
-	msgbox gUnknown_81A3F30
+	msgbox SixIsland_PokemonCenter_1F_Text_RivalImpossibleToGetAllMonsAroundHere
 	closemessage
-	applymovement OBJ_EVENT_ID_PLAYER, Movement_171E02
+	applymovement OBJ_EVENT_ID_PLAYER, SixIsland_PokemonCenter_1F_Movement_PlayerWatchRivalExit
-	applymovement 2, Movement_171DFE
+	applymovement LOCALID_RIVAL, SixIsland_PokemonCenter_1F_Movement_RivalExit
 	waitmovement 0
 	fadedefaultbgm
 	playse SE_KAIDAN
 	delay 35
-	removeobject 2
+	removeobject LOCALID_RIVAL
 	setvar VAR_MAP_SCENE_SIX_ISLAND_POKEMON_CENTER_1F, 1
 	setvar VAR_MAP_SCENE_FOUR_ISLAND, 1
 	releaseall
 	end
 
-Movement_171DF9:: @ 8171DF9
+SixIsland_PokemonCenter_1F_Movement_RivalApproach:: @ 8171DF9
 	walk_right
 	walk_right
 	walk_down
 	walk_down
 	step_end
 
-Movement_171DFE:: @ 8171DFE
+SixIsland_PokemonCenter_1F_Movement_RivalExit:: @ 8171DFE
 	delay_16
 	delay_4
 	walk_down
 	step_end
 
-Movement_171E02:: @ 8171E02
+SixIsland_PokemonCenter_1F_Movement_PlayerWatchRivalExit:: @ 8171E02
 	walk_left
 	walk_in_place_fastest_right
 	step_end
 
-SixIsland_PokemonCenter_1F_EventScript_171E05:: @ 8171E05
+SixIsland_PokemonCenter_1F_EventScript_Nurse:: @ 8171E05
 	lock
 	faceplayer
 	call EventScript_PkmnCenterNurse
 	release
 	end
 
-SixIsland_PokemonCenter_1F_EventScript_171E0E:: @ 8171E0E
+SixIsland_PokemonCenter_1F_EventScript_Hiker:: @ 8171E0E
-	msgbox gUnknown_81A3E02, MSGBOX_NPC
+	msgbox SixIsland_PokemonCenter_1F_Text_SomethingHiddenOnThisIsland, MSGBOX_NPC
 	end
 
-SixIsland_PokemonCenter_1F_EventScript_171E17:: @ 8171E17
+SixIsland_PokemonCenter_1F_EventScript_OldMan:: @ 8171E17
-	msgbox gUnknown_81A3E87, MSGBOX_NPC
+	msgbox SixIsland_PokemonCenter_1F_Text_SomeMonsEvolveByTradingWithHeldItem, MSGBOX_NPC
 	end

data/maps/SixIsland_PokemonCenter_1F/text.inc

@@ -1,11 +1,11 @@
-gUnknown_81A3E02:: @ 81A3E02
+SixIsland_PokemonCenter_1F_Text_SomethingHiddenOnThisIsland:: @ 81A3E02
     .string "For ten years, I've searched for\n"
     .string "RUINS.\p"
     .string "No, make that twenty years.\p"
     .string "I get this feeling that there's\n"
     .string "something hidden on this island.$"
 
-gUnknown_81A3E87:: @ 81A3E87
+SixIsland_PokemonCenter_1F_Text_SomeMonsEvolveByTradingWithHeldItem:: @ 81A3E87
     .string "You know of POKéMON that evolve\n"
     .string "only upon trading, yes?\p"
     .string "But did you know that there are\n"
@@ -13,7 +13,7 @@ gUnknown_81A3E87:: @ 81A3E87
     .string "Some POKéMON evolve only when\n"
     .string "traded while holding specific items.$"
 
-gUnknown_81A3F30:: @ 81A3F30
+SixIsland_PokemonCenter_1F_Text_RivalImpossibleToGetAllMonsAroundHere:: @ 81A3F30
     .string "{RIVAL}: Hey, {PLAYER}!\n"
     .string "How's your POKéDEX filling up?\p"
     .string "It looks like it's impossible to get\n"

data/maps/SixIsland_RuinValley/map.json

@@ -31,7 +31,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SixIsland_RuinValley_EventScript_168B6D",
+      "script": "SixIsland_RuinValley_EventScript_Scientist",
       "flag": "FLAG_HIDE_RUIN_VALLEY_SCIENTIST"
     },
     {
@@ -44,7 +44,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "SixIsland_RuinValley_EventScript_1AC717",
+      "script": "SixIsland_RuinValley_EventScript_Stanly",
       "flag": "0"
     },
     {
@@ -57,7 +57,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "SixIsland_RuinValley_EventScript_1AC755",
+      "script": "SixIsland_RuinValley_EventScript_Foster",
       "flag": "0"
     },
     {
@@ -70,7 +70,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "SixIsland_RuinValley_EventScript_1AC793",
+      "script": "SixIsland_RuinValley_EventScript_Larry",
       "flag": "0"
     },
     {
@@ -83,7 +83,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 2,
-      "script": "SixIsland_RuinValley_EventScript_1AC7D1",
+      "script": "SixIsland_RuinValley_EventScript_Daryl",
       "flag": "0"
     },
     {
@@ -96,7 +96,7 @@
       "movement_range_y": 3,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "SixIsland_RuinValley_EventScript_1AC80F",
+      "script": "SixIsland_RuinValley_EventScript_Hector",
       "flag": "0"
     },
     {
@@ -259,7 +259,7 @@
       "x": 24,
       "y": 24,
       "elevation": 3,
-      "script": "SixIsland_RuinValley_EventScript_168B94"
+      "script": "SixIsland_RuinValley_EventScript_DottedHoleDoor"
     }
   ]
 }

data/maps/SixIsland_RuinValley/scripts.inc

@@ -3,42 +3,42 @@ SixIsland_RuinValley_MapScripts:: @ 8168B53
 	.byte 0
 
 SixIsland_RuinValley_OnLoad:: @ 8168B59
-	call_if_set FLAG_USED_CUT_ON_RUIN_VALLEY_BRAILLE, EventScript_168B63
+	call_if_set FLAG_USED_CUT_ON_RUIN_VALLEY_BRAILLE, SixIsland_RuinValley_EventScript_OpenDottedHoleDoor
 	end
 
-EventScript_168B63:: @ 8168B63
+SixIsland_RuinValley_EventScript_OpenDottedHoleDoor:: @ 8168B63
-	setmetatile 24, 24, 856, 0
+	setmetatile 24, 24, METATILE_SeviiIslands67_DottedHoleDoor_Open, 0
 	return
 
-SixIsland_RuinValley_EventScript_168B6D:: @ 8168B6D
+SixIsland_RuinValley_EventScript_Scientist:: @ 8168B6D
 	lock
-	msgbox gUnknown_818BD47
+	msgbox SixIsland_RuinValley_Text_CantFigureOutHowToGetInside
 	applymovement 1, Movement_FacePlayer
 	waitmovement 0
-	msgbox gUnknown_818BD7A
+	msgbox SixIsland_RuinValley_Text_IFoundThisPlace
 	applymovement 1, Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-SixIsland_RuinValley_EventScript_168B94:: @ 8168B94
+SixIsland_RuinValley_EventScript_DottedHoleDoor:: @ 8168B94
 	lockall
-	goto_if_set FLAG_USED_CUT_ON_RUIN_VALLEY_BRAILLE, EventScript_168BC1
+	goto_if_set FLAG_USED_CUT_ON_RUIN_VALLEY_BRAILLE, SixIsland_RuinValley_EventScript_DottedHoleDoorOpen
-	msgbox gUnknown_818BDC0, MSGBOX_YESNO
+	msgbox SixIsland_RuinValley_Text_CheckDoorMoreThoroughly, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq EventScript_168BCB
+	goto_if_eq SixIsland_RuinValley_EventScript_IgnoreDottedHoleDoor
-	msgbox gUnknown_818BE11
+	msgbox SixIsland_RuinValley_Text_SeveralDotsOnTheDoor
 	braillemessage Braille_Text_Cut
 	waitbuttonpress
 	releaseall
 	end
 
-EventScript_168BC1:: @ 8168BC1
+SixIsland_RuinValley_EventScript_DottedHoleDoorOpen:: @ 8168BC1
-	msgbox gUnknown_818BE4B
+	msgbox SixIsland_RuinValley_Text_DoorIsOpen
 	releaseall
 	end
 
-EventScript_168BCB:: @ 8168BCB
+SixIsland_RuinValley_EventScript_IgnoreDottedHoleDoor:: @ 8168BCB
-	msgbox gUnknown_818BDF9
+	msgbox SixIsland_RuinValley_Text_LeftDoorAlone
 	releaseall
 	end

data/maps/SixIsland_RuinValley/text.inc

@@ -1,23 +1,87 @@
-gUnknown_818BD47:: @ 818BD47
+SixIsland_RuinValley_Text_CantFigureOutHowToGetInside:: @ 818BD47
     .string "I can't figure out how I'm supposed\n"
     .string "to get inside.$"
 
-gUnknown_818BD7A:: @ 818BD7A
+SixIsland_RuinValley_Text_IFoundThisPlace:: @ 818BD7A
     .string "Let me tell you, I found this\n"
     .string "place.\p"
     .string "Don't look so envious, will you?$"
 
-gUnknown_818BDC0:: @ 818BDC0
+SixIsland_RuinValley_Text_CheckDoorMoreThoroughly:: @ 818BDC0
     .string "The door doesn't budge at all.\n"
     .string "Check it more thoroughly?$"
 
-gUnknown_818BDF9:: @ 818BDF9
+SixIsland_RuinValley_Text_LeftDoorAlone:: @ 818BDF9
     .string "{PLAYER} left the door alone.$"
 
-gUnknown_818BE11:: @ 818BE11
+SixIsland_RuinValley_Text_SeveralDotsOnTheDoor:: @ 818BE11
     .string "On closer inspection, there are\n"
     .string "several dots on the door…$"
 
-gUnknown_818BE4B:: @ 818BE4B
+SixIsland_RuinValley_Text_DoorIsOpen:: @ 818BE4B
     .string "The door is open.$"
 
+SixIsland_RuinValley_Text_StanlyIntro:: @ 818BE5D
+    .string "There appear to be many secrets\n"
+    .string "still unsolved in this world.$"
+
+SixIsland_RuinValley_Text_StanlyDefeat:: @ 818BE9B
+    .string "Hmm…$"
+
+SixIsland_RuinValley_Text_StanlyPostBattle:: @ 818BEA0
+    .string "I suggest to you that you, too,\n"
+    .string "give a thought to the secrets and\l"
+    .string "mysteries of our world once a day.$"
+
+SixIsland_RuinValley_Text_FosterIntro:: @ 818BF05
+    .string "I'm curious, what compelled you to\n"
+    .string "come here?$"
+
+SixIsland_RuinValley_Text_FosterDefeat:: @ 818BF33
+    .string "It's been so long since I battled,\n"
+    .string "my instincts are off.$"
+
+SixIsland_RuinValley_Text_FosterPostBattle:: @ 818BF6C
+    .string "There are several ruins on the\n"
+    .string "SEVII ISLANDS.\p"
+    .string "The majority of them date back\n"
+    .string "a long way.$"
+
+SixIsland_RuinValley_Text_LarryIntro:: @ 818BFC5
+    .string "It's been said that there are\n"
+    .string "mysterious stones on this island.\p"
+    .string "I suspect it has something to do\n"
+    .string "with the ruins here.$"
+
+SixIsland_RuinValley_Text_LarryDefeat:: @ 818C03B
+    .string "Oh, interesting.$"
+
+SixIsland_RuinValley_Text_LarryPostBattle:: @ 818C04C
+    .string "Those ruins over there…\p"
+    .string "I haven't had any luck in finding\n"
+    .string "how I can get inside.$"
+
+SixIsland_RuinValley_Text_DarylIntro:: @ 818C09C
+    .string "A battle with you, so high up!$"
+
+SixIsland_RuinValley_Text_DarylDefeat:: @ 818C0BB
+    .string "Oh, the heartbreak of losing so\n"
+    .string "easily to you!$"
+
+SixIsland_RuinValley_Text_DarylPostBattle:: @ 818C0EA
+    .string "Experience the joy of climbing!$"
+
+SixIsland_RuinValley_Text_HectorIntro:: @ 818C10A
+    .string "I'm pretty familiar with the land\n"
+    .string "around these parts.$"
+
+SixIsland_RuinValley_Text_HectorDefeat:: @ 818C140
+    .string "You don't need to be so pushy.\n"
+    .string "I'll be happy to tell you.$"
+
+SixIsland_RuinValley_Text_HectorPostBattle:: @ 818C17A
+    .string "The door to the ruins…\n"
+    .string "It has these strange patterns\l"
+    .string "engraved on the outside.\p"
+    .string "I don't know what they mean,\n"
+    .string "though.$"

data/maps/SixIsland_WaterPath/map.json

@@ -41,7 +41,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "SixIsland_WaterPath_EventScript_1AC555",
+      "script": "SixIsland_WaterPath_EventScript_Rose",
       "flag": "0"
     },
     {
@@ -54,7 +54,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "SixIsland_WaterPath_EventScript_1AC593",
+      "script": "SixIsland_WaterPath_EventScript_Edward",
       "flag": "0"
     },
     {
@@ -67,7 +67,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "SixIsland_WaterPath_EventScript_1AC5D1",
+      "script": "SixIsland_WaterPath_EventScript_Samir",
       "flag": "0"
     },
     {
@@ -80,7 +80,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "SixIsland_WaterPath_EventScript_1AC60F",
+      "script": "SixIsland_WaterPath_EventScript_Denise",
       "flag": "0"
     },
     {
@@ -93,7 +93,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "SixIsland_WaterPath_EventScript_1AC64D",
+      "script": "SixIsland_WaterPath_EventScript_Miu",
       "flag": "0"
     },
     {
@@ -106,7 +106,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "SixIsland_WaterPath_EventScript_1AC693",
+      "script": "SixIsland_WaterPath_EventScript_Mia",
       "flag": "0"
     },
     {
@@ -119,7 +119,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 4,
-      "script": "SixIsland_WaterPath_EventScript_1AC6D9",
+      "script": "SixIsland_WaterPath_EventScript_Earl",
       "flag": "0"
     },
     {
@@ -172,7 +172,7 @@
       "x": 8,
       "y": 14,
       "elevation": 0,
-      "script": "SixIsland_WaterPath_EventScript_168B41"
+      "script": "SixIsland_WaterPath_EventScript_HornWantedSign"
     },
     {
       "type": "hidden_item",
@@ -209,7 +209,7 @@
       "x": 12,
       "y": 54,
       "elevation": 0,
-      "script": "SixIsland_WaterPath_EventScript_168B4A"
+      "script": "SixIsland_WaterPath_EventScript_RouteSign"
     }
   ]
 }

data/maps/SixIsland_WaterPath/scripts.inc

@@ -1,10 +1,10 @@
 SixIsland_WaterPath_MapScripts:: @ 8168B40
 	.byte 0
 
-SixIsland_WaterPath_EventScript_168B41:: @ 8168B41
+SixIsland_WaterPath_EventScript_HornWantedSign:: @ 8168B41
-	msgbox gUnknown_818BD0C, MSGBOX_SIGN
+	msgbox SixIsland_WaterPath_Text_WantedUltimateHorn, MSGBOX_SIGN
 	end
 
-SixIsland_WaterPath_EventScript_168B4A:: @ 8168B4A
+SixIsland_WaterPath_EventScript_RouteSign:: @ 8168B4A
-	msgbox gUnknown_818BD27, MSGBOX_SIGN
+	msgbox SixIsland_WaterPath_Text_RouteSign, MSGBOX_SIGN
 	end

data/maps/SixIsland_WaterPath/text.inc

@@ -1,102 +1,102 @@
-Text_18B896:: @ 818B896
+SixIsland_WaterPath_Text_RoseIntro:: @ 818B896
     .string "I let a pleasant breeze lead me\n"
     .string "all the way here.$"
 
-Text_18B8C8:: @ 818B8C8
+SixIsland_WaterPath_Text_RoseDefeat:: @ 818B8C8
     .string "Giggle… You're so cute when you're\n"
     .string "determined.$"
 
-Text_18B8F7:: @ 818B8F7
+SixIsland_WaterPath_Text_RosePostBattle:: @ 818B8F7
     .string "I want to go to the woods over\n"
     .string "there, but…\p"
     .string "There are lots of BUG POKéMON.\n"
     .string "They scare me a little.$"
 
-Text_18B959:: @ 818B959
+SixIsland_WaterPath_Text_EdwardIntro:: @ 818B959
     .string "I'm practicing in secret so no one\n"
     .string "can see me.$"
 
-Text_18B988:: @ 818B988
+SixIsland_WaterPath_Text_EdwardDefeat:: @ 818B988
     .string "Nobody saw me losing, right?$"
 
-Text_18B9A5:: @ 818B9A5
+SixIsland_WaterPath_Text_EdwardPostBattle:: @ 818B9A5
     .string "As a performer, I don't want people\n"
     .string "to know about the effort I put in.$"
 
-Text_18B9EC:: @ 818B9EC
+SixIsland_WaterPath_Text_SamirIntro:: @ 818B9EC
     .string "What, you're suggesting that you're\n"
     .string "sick of seeing SWIMMERS like me?\p"
     .string "Aww, don't be hatin'!$"
 
-Text_18BA47:: @ 818BA47
+SixIsland_WaterPath_Text_SamirDefeat:: @ 818BA47
     .string "Oh, no, no, no.$"
 
-Text_18BA57:: @ 818BA57
+SixIsland_WaterPath_Text_SamirPostBattle:: @ 818BA57
     .string "I couldn't lift the stigma of being\n"
     .string "a SWIMMER…$"
 
-Text_18BA86:: @ 818BA86
+SixIsland_WaterPath_Text_DeniseIntro:: @ 818BA86
     .string "My boyfriend's always busy, so I\n"
     .string "come swimming by myself.$"
 
-Text_18BAC0:: @ 818BAC0
+SixIsland_WaterPath_Text_DeniseDefeat:: @ 818BAC0
     .string "Awww, I knew this would happen!$"
 
-Text_18BAE0:: @ 818BAE0
+SixIsland_WaterPath_Text_DenisePostBattle:: @ 818BAE0
     .string "When I can't be with my boyfriend,\n"
     .string "I spend time with the POKéMON he\l"
     .string "gave me.$"
 
-Text_18BB2D:: @ 818BB2D
+SixIsland_WaterPath_Text_EarlIntro:: @ 818BB2D
     .string "Tell me, where are the mountains\n"
     .string "around these parts?$"
 
-Text_18BB62:: @ 818BB62
+SixIsland_WaterPath_Text_EarlDefeat:: @ 818BB62
     .string "I lost my way while I was busy\n"
     .string "battling!$"
 
-Text_18BB8B:: @ 818BB8B
+SixIsland_WaterPath_Text_EarlPostBattle:: @ 818BB8B
     .string "Aren't there any mountains around\n"
     .string "these parts?$"
 
-Text_18BBBA:: @ 818BBBA
+SixIsland_WaterPath_Text_MiuIntro:: @ 818BBBA
     .string "MIU: Hello, POKéMON!\n"
     .string "It's time to play!$"
 
-Text_18BBE2:: @ 818BBE2
+SixIsland_WaterPath_Text_MiuDefeat:: @ 818BBE2
     .string "MIU: Oh, no!\n"
     .string "Mommy!$"
 
-Text_18BBF6:: @ 818BBF6
+SixIsland_WaterPath_Text_MiuPostBattle:: @ 818BBF6
     .string "MIU: It makes me all sad inside\n"
     .string "when we lose…$"
 
-Text_18BC24:: @ 818BC24
+SixIsland_WaterPath_Text_MiuNotEnoughMons:: @ 818BC24
     .string "MIU: MIA and I are TWINS.\n"
     .string "We want to battle together.$"
 
-Text_18BC5A:: @ 818BC5A
+SixIsland_WaterPath_Text_MiaIntro:: @ 818BC5A
     .string "MIA: Hello, POKéMON!\n"
     .string "It's time to battle!$"
 
-Text_18BC84:: @ 818BC84
+SixIsland_WaterPath_Text_MiaDefeat:: @ 818BC84
     .string "MIA: You're mean!\n"
     .string "You're bad for winning!$"
 
-Text_18BCAE:: @ 818BCAE
+SixIsland_WaterPath_Text_MiaPostBattle:: @ 818BCAE
     .string "MIA: Ohh…\n"
     .string "I'm sorry, my POKéMON…$"
 
-Text_18BCCF:: @ 818BCCF
+SixIsland_WaterPath_Text_MiaNotEnoughMons:: @ 818BCCF
     .string "MIA: Oh, you only have one\n"
     .string "POKéMON?\p"
     .string "Don't you feel lonesome?$"
 
-gUnknown_818BD0C:: @ 818BD0C
+SixIsland_WaterPath_Text_WantedUltimateHorn:: @ 818BD0C
     .string "Wanted!\n"
     .string "The Ultimate Horn!$"
 
-gUnknown_818BD27:: @ 818BD27
+SixIsland_WaterPath_Text_RouteSign:: @ 818BD27
     .string "WATER PATH\n"
     .string "Leads to RUIN VALLEY$"
 

data/maps/SixIsland_WaterPath_House1/map.json

@@ -25,7 +25,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SixIsland_WaterPath_House1_EventScript_17206D",
+      "script": "SixIsland_WaterPath_House1_EventScript_Beauty",
       "flag": "0"
     }
   ],
@@ -45,7 +45,7 @@
       "x": 9,
       "y": 1,
       "elevation": 0,
-      "script": "SixIsland_WaterPath_House1_EventScript_172157"
+      "script": "SixIsland_WaterPath_House1_EventScript_SizeRecord"
     }
   ]
 }

data/maps/SixIsland_WaterPath_House1/scripts.inc

@@ -1,84 +1,84 @@
 SixIsland_WaterPath_House1_MapScripts:: @ 817206C
 	.byte 0
 
-SixIsland_WaterPath_House1_EventScript_17206D:: @ 817206D
+SixIsland_WaterPath_House1_EventScript_Beauty:: @ 817206D
 	lock
 	faceplayer
 	goto_if_questlog EventScript_ReleaseEnd
 	special sub_8112364
 	setvar VAR_0x8004, SPECIES_HERACROSS
 	specialvar VAR_RESULT, Special_PlayerPartyContainsSpecies
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
-	goto_if_eq EventScript_1720E5
+	goto_if_eq SixIsland_WaterPath_House1_EventScript_NoHeracrossInParty
 	special GetHeracrossSizeRecordInfo
-	msgbox gUnknown_81A4A3F
+	msgbox SixIsland_WaterPath_House1_Text_MayIMeasureHeracross
 	special Special_ChooseMonFromParty
 	waitstate
 	copyvar VAR_RESULT, VAR_0x8004
-	compare VAR_RESULT, 6
+	compare VAR_RESULT, PARTY_SIZE
-	goto_if_ge EventScript_1720EF
+	goto_if_ge SixIsland_WaterPath_House1_EventScript_DontShowMon
 	special CompareHeracrossSize
 	compare VAR_RESULT, 1
-	goto_if_eq EventScript_1720F1
+	goto_if_eq SixIsland_WaterPath_House1_EventScript_ShownNonHeracross
 	compare VAR_RESULT, 2
-	goto_if_eq EventScript_1720FB
+	goto_if_eq SixIsland_WaterPath_House1_EventScript_ShownSmallHeracross
 	compare VAR_RESULT, 3
-	goto_if_eq EventScript_172121
+	goto_if_eq SixIsland_WaterPath_House1_EventScript_ShownBigHeracross
 	compare VAR_RESULT, 4
-	goto_if_eq EventScript_17210E
+	goto_if_eq SixIsland_WaterPath_House1_EventScript_ShownTiedHeracross
 	release
 	end
 
-EventScript_1720E5:: @ 81720E5
+SixIsland_WaterPath_House1_EventScript_NoHeracrossInParty:: @ 81720E5
-	msgbox gUnknown_81A49E9
+	msgbox SixIsland_WaterPath_House1_Text_LoveItNeedItHeracross
 	release
 	end
 
-EventScript_1720EF:: @ 81720EF
+SixIsland_WaterPath_House1_EventScript_DontShowMon:: @ 81720EF
 	release
 	end
 
-EventScript_1720F1:: @ 81720F1
+SixIsland_WaterPath_House1_EventScript_ShownNonHeracross:: @ 81720F1
-	msgbox gUnknown_81A4BEF
+	msgbox SixIsland_WaterPath_House1_Text_ThisWontDo
 	release
 	end
 
-EventScript_1720FB:: @ 81720FB
+SixIsland_WaterPath_House1_EventScript_ShownSmallHeracross:: @ 81720FB
-	goto_if_unset FLAG_GOT_NEST_BALL_FROM_WATER_PATH_HOUSE_1, EventScript_172121
+	goto_if_unset FLAG_GOT_NEST_BALL_FROM_WATER_PATH_HOUSE_1, SixIsland_WaterPath_House1_EventScript_ShownBigHeracross
-	msgbox gUnknown_81A4B7A
+	msgbox SixIsland_WaterPath_House1_Text_ItsXInchesYInchesWasBiggest
 	release
 	end
 
-EventScript_17210E:: @ 817210E
+SixIsland_WaterPath_House1_EventScript_ShownTiedHeracross:: @ 817210E
-	goto_if_unset FLAG_GOT_NEST_BALL_FROM_WATER_PATH_HOUSE_1, EventScript_172121
+	goto_if_unset FLAG_GOT_NEST_BALL_FROM_WATER_PATH_HOUSE_1, SixIsland_WaterPath_House1_EventScript_ShownBigHeracross
-	msgbox gUnknown_81A4B39
+	msgbox SixIsland_WaterPath_House1_Text_ItsXInchesSameAsBefore
 	release
 	end
 
-EventScript_172121:: @ 8172121
+SixIsland_WaterPath_House1_EventScript_ShownBigHeracross:: @ 8172121
 	setflag FLAG_GOT_NEST_BALL_FROM_WATER_PATH_HOUSE_1
-	msgbox gUnknown_81A4A88
+	msgbox SixIsland_WaterPath_House1_Text_ItsXInchesDeserveReward
 	giveitem ITEM_NEST_BALL
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
-	goto_if_eq EventScript_17214D
+	goto_if_eq SixIsland_WaterPath_House1_EventScript_NoRoomForNestBall
-	msgbox gUnknown_81A4AD9
+	msgbox SixIsland_WaterPath_House1_Text_WantToSeeBiggerOne
 	release
 	end
 
-EventScript_17214D:: @ 817214D
+SixIsland_WaterPath_House1_EventScript_NoRoomForNestBall:: @ 817214D
-	msgbox gUnknown_81A4C47
+	msgbox SixIsland_WaterPath_House1_Text_YourBagIsFull
 	release
 	end
 
-SixIsland_WaterPath_House1_EventScript_172157:: @ 8172157
+SixIsland_WaterPath_House1_EventScript_SizeRecord:: @ 8172157
 	lockall
-	goto_if_set FLAG_GOT_NEST_BALL_FROM_WATER_PATH_HOUSE_1, EventScript_17216B
+	goto_if_set FLAG_GOT_NEST_BALL_FROM_WATER_PATH_HOUSE_1, SixIsland_WaterPath_House1_EventScript_SizeRecordNonEmpty
-	msgbox gUnknown_81A4CB9
+	msgbox SixIsland_WaterPath_House1_Text_BlankChartOfSomeSort
 	releaseall
 	end
 
-EventScript_17216B:: @ 817216B
+SixIsland_WaterPath_House1_EventScript_SizeRecordNonEmpty:: @ 817216B
 	special GetHeracrossSizeRecordInfo
-	msgbox gUnknown_81A4C6E
+	msgbox SixIsland_WaterPath_House1_Text_BiggestHeracrossIsXInches
 	releaseall
 	end

data/maps/SixIsland_WaterPath_House1/text.inc

@@ -1,104 +1,50 @@
-Text_UltimateMoveThatMon:: @ 81A46C6
+SixIsland_WaterPath_House1_Text_LoveItNeedItHeracross:: @ 81A49E9
-    .string "I perfected the ultimate move of\n"
-    .string "its type…\p"
-    .string "But will no one take it for\n"
-    .string "future use?\p"
-    .string "…Hm? Hmmm!\p"
-    .string "Y-you…\n"
-    .string "Th-that {STR_VAR_1}…$"
-
-Text_JustMistaken:: @ 81A4737
-    .string "…No…\n"
-    .string "I was just mistaken.$"
-
-Text_AllowMeToTeachMonUltimateMove:: @ 81A4751
-    .string "Oh! This is the one!\n"
-    .string "This is the POKéMON!\p"
-    .string "This {STR_VAR_1} is worthy of\n"
-    .string "learning my ultimate move!\p"
-    .string "Will you allow it?\p"
-    .string "Will you allow your {STR_VAR_1} to\n"
-    .string "learn my {STR_VAR_2}?$"
-
-Text_YouRejectIt:: @ 81A47E5
-    .string "Gaah! You reject it?\n"
-    .string "No, I won't be dissuaded!$"
-
-Text_LetMeConferUltimateMove:: @ 81A4814
-    .string "You will allow it?\p"
-    .string "Then, let me confer my ultimate\n"
-    .string "{STR_VAR_2} on your {STR_VAR_1}.\p"
-    .string "Ggggrah-awooo!$"
-
-Text_TaughtMove:: @ 81A4865
-    .string "Gasp, gasp, gasp…\p"
-    .string "I didn't think I could teach that\n"
-    .string "move while I still lived…$"
-
-Text_MakeBestUseOfMove:: @ 81A48B3
-    .string "I implore you to make the best\n"
-    .string "use of that move and gain power!$"
-
-Text_PassedOnEverythingIKnow:: @ 81A48F3
-    .string "Gasp, gasp, gasp…\p"
-    .string "I have no regrets now.\n"
-    .string "I've passed on everything I know.\p"
-    .string "Now I can live out my life knowing\n"
-    .string "my work is done.$"
-
-Text_FeelRejuvenated:: @ 81A4972
-    .string "After I passed on my knowledge to\n"
-    .string "you, I felt so much relief.\p"
-    .string "In fact, I feel rejuvenated,\n"
-    .string "as if I were younger again!$"
-
-gUnknown_81A49E9:: @ 81A49E9
     .string "Hera, hera, HERACROSS!\n"
     .string "Big and shiny, it's the bug boss!\l"
     .string "Love it, need it, HERACROSS!$"
 
-gUnknown_81A4A3F:: @ 81A4A3F
+SixIsland_WaterPath_House1_Text_MayIMeasureHeracross:: @ 81A4A3F
     .string "Eeeeek!\n"
     .string "That's a HERACROSS!\p"
     .string "Please, please, may I measure how\n"
     .string "big it is?$"
 
-gUnknown_81A4A88:: @ 81A4A88
+SixIsland_WaterPath_House1_Text_ItsXInchesDeserveReward:: @ 81A4A88
     .string "Eeeek, it's {STR_VAR_2} inches!\n"
     .string "I've never seen anything like this!\l"
     .string "You deserve a reward!$"
 
-gUnknown_81A4AD9:: @ 81A4AD9
+SixIsland_WaterPath_House1_Text_WantToSeeBiggerOne:: @ 81A4AD9
     .string "I want to see a much, much bigger\n"
     .string "HERACROSS than that one.\p"
     .string "Oh, how I adore them, big\n"
     .string "HERACROSS!$"
 
-gUnknown_81A4B39:: @ 81A4B39
+SixIsland_WaterPath_House1_Text_ItsXInchesSameAsBefore:: @ 81A4B39
     .string "Huh? This {STR_VAR_2}-inch measurement…\n"
     .string "Oh, boo! It's the same as before.$"
 
-gUnknown_81A4B7A:: @ 81A4B7A
+SixIsland_WaterPath_House1_Text_ItsXInchesYInchesWasBiggest:: @ 81A4B7A
     .string "Oh, it's just {STR_VAR_2} inches.\n"
     .string "The HERACROSS before was bigger.\p"
     .string "It was {STR_VAR_3} inches, the biggest\n"
     .string "HERACROSS you've brought me.$"
 
-gUnknown_81A4BEF:: @ 81A4BEF
+SixIsland_WaterPath_House1_Text_ThisWontDo:: @ 81A4BEF
     .string "Oh, no! This won't do!\p"
     .string "HERACROSS looks much more macho\n"
     .string "and cool, and has a lovely horn!$"
 
-gUnknown_81A4C47:: @ 81A4C47
+SixIsland_WaterPath_House1_Text_YourBagIsFull:: @ 81A4C47
     .string "Your BAG is full.\n"
     .string "My reward won't fit.$"
 
-gUnknown_81A4C6E:: @ 81A4C6E
+SixIsland_WaterPath_House1_Text_BiggestHeracrossIsXInches:: @ 81A4C6E
     .string "The biggest HERACROSS that I have\n"
     .string "ever seen measured so far is:\p"
     .string "{STR_VAR_3} inches!$"
 
-gUnknown_81A4CB9:: @ 81A4CB9
+SixIsland_WaterPath_House1_Text_BlankChartOfSomeSort:: @ 81A4CB9
     .string "It's a blank chart of some sort.\p"
     .string "It has spaces for writing in\n"
     .string "records of some kind.$"

data/maps/SixIsland_WaterPath_House2/map.json

@@ -25,7 +25,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SixIsland_WaterPath_House2_EventScript_172179",
+      "script": "SixIsland_WaterPath_House2_EventScript_Man",
       "flag": "0"
     }
   ],

data/maps/SixIsland_WaterPath_House2/scripts.inc

@@ -1,6 +1,6 @@
 SixIsland_WaterPath_House2_MapScripts:: @ 8172178
 	.byte 0
 
-SixIsland_WaterPath_House2_EventScript_172179:: @ 8172179
+SixIsland_WaterPath_House2_EventScript_Man:: @ 8172179
-	msgbox gUnknown_81A4D0D, MSGBOX_NPC
+	msgbox SixIsland_WaterPath_House2_Text_MyNeighborMeasuredMe, MSGBOX_NPC
 	end

data/maps/SixIsland_WaterPath_House2/text.inc

@@ -1,4 +1,4 @@
-gUnknown_81A4D0D:: @ 81A4D0D
+SixIsland_WaterPath_House2_Text_MyNeighborMeasuredMe:: @ 81A4D0D
     .string "My height is 67.0 inches on the\n"
     .string "button.\p"
     .string "I know it is this precisely because\n"

data/maps/TwoIsland_CapeBrink_House/text.inc

@@ -0,0 +1,53 @@
+Text_UltimateMoveThatMon:: @ 81A46C6
+    .string "I perfected the ultimate move of\n"
+    .string "its type…\p"
+    .string "But will no one take it for\n"
+    .string "future use?\p"
+    .string "…Hm? Hmmm!\p"
+    .string "Y-you…\n"
+    .string "Th-that {STR_VAR_1}…$"
+
+Text_JustMistaken:: @ 81A4737
+    .string "…No…\n"
+    .string "I was just mistaken.$"
+
+Text_AllowMeToTeachMonUltimateMove:: @ 81A4751
+    .string "Oh! This is the one!\n"
+    .string "This is the POKéMON!\p"
+    .string "This {STR_VAR_1} is worthy of\n"
+    .string "learning my ultimate move!\p"
+    .string "Will you allow it?\p"
+    .string "Will you allow your {STR_VAR_1} to\n"
+    .string "learn my {STR_VAR_2}?$"
+
+Text_YouRejectIt:: @ 81A47E5
+    .string "Gaah! You reject it?\n"
+    .string "No, I won't be dissuaded!$"
+
+Text_LetMeConferUltimateMove:: @ 81A4814
+    .string "You will allow it?\p"
+    .string "Then, let me confer my ultimate\n"
+    .string "{STR_VAR_2} on your {STR_VAR_1}.\p"
+    .string "Ggggrah-awooo!$"
+
+Text_TaughtMove:: @ 81A4865
+    .string "Gasp, gasp, gasp…\p"
+    .string "I didn't think I could teach that\n"
+    .string "move while I still lived…$"
+
+Text_MakeBestUseOfMove:: @ 81A48B3
+    .string "I implore you to make the best\n"
+    .string "use of that move and gain power!$"
+
+Text_PassedOnEverythingIKnow:: @ 81A48F3
+    .string "Gasp, gasp, gasp…\p"
+    .string "I have no regrets now.\n"
+    .string "I've passed on everything I know.\p"
+    .string "Now I can live out my life knowing\n"
+    .string "my work is done.$"
+
+Text_FeelRejuvenated:: @ 81A4972
+    .string "After I passed on my knowledge to\n"
+    .string "you, I felt so much relief.\p"
+    .string "In fact, I feel rejuvenated,\n"
+    .string "as if I were younger again!$"

data/maps/VermilionCity_House3/map.json

@@ -25,7 +25,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "VermilionCity_House3_EventScript_16BAAA",
+      "script": "VermilionCity_House3_EventScript_Boy",
       "flag": "0"
     },
     {
@@ -38,7 +38,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "VermilionCity_House3_EventScript_16BABC",
+      "script": "VermilionCity_House3_EventScript_Pidgey",
       "flag": "0"
     },
     {
@@ -64,7 +64,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "VermilionCity_House3_EventScript_16BAB3",
+      "script": "VermilionCity_House3_EventScript_Lass",
       "flag": "0"
     }
   ],
@@ -98,7 +98,7 @@
       "x": 6,
       "y": 4,
       "elevation": 3,
-      "script": "VermilionCity_House3_EventScript_16BACF"
+      "script": "VermilionCity_House3_EventScript_Letter"
     }
   ]
 }

data/maps/VermilionCity_House3/scripts.inc

@@ -1,24 +1,24 @@
 VermilionCity_House3_MapScripts:: @ 816BAA9
 	.byte 0
 
-VermilionCity_House3_EventScript_16BAAA:: @ 816BAAA
+VermilionCity_House3_EventScript_Boy:: @ 816BAAA
-	msgbox gUnknown_81953AF, MSGBOX_NPC
+	msgbox VermilionCity_House3_Text_PidgeyFlyLetterToSaffron, MSGBOX_NPC
 	end
 
-VermilionCity_House3_EventScript_16BAB3:: @ 816BAB3
+VermilionCity_House3_EventScript_Lass:: @ 816BAB3
-	msgbox gUnknown_8195471, MSGBOX_NPC
+	msgbox VermilionCity_House3_Text_SendMyPidgeyToUnionRoom, MSGBOX_NPC
 	end
 
-VermilionCity_House3_EventScript_16BABC:: @ 816BABC
+VermilionCity_House3_EventScript_Pidgey:: @ 816BABC
 	lock
 	faceplayer
 	waitse
 	playmoncry SPECIES_PIDGEY, 0
-	msgbox gUnknown_81953EE
+	msgbox VermilionCity_House3_Text_Pidgey
 	waitmoncry
 	release
 	end
 
-VermilionCity_House3_EventScript_16BACF:: @ 816BACF
+VermilionCity_House3_EventScript_Letter:: @ 816BACF
-	msgbox gUnknown_8195400, MSGBOX_SIGN
+	msgbox VermilionCity_House3_Text_DearPippiLetter, MSGBOX_SIGN
 	end

data/maps/VermilionCity_House3/text.inc

@@ -1,18 +1,18 @@
-gUnknown_81953AF:: @ 81953AF
+VermilionCity_House3_Text_PidgeyFlyLetterToSaffron:: @ 81953AF
     .string "I'm getting my PIDGEY to fly a\n"
     .string "letter to SAFFRON in the north.$"
 
-gUnknown_81953EE:: @ 81953EE
+VermilionCity_House3_Text_Pidgey:: @ 81953EE
     .string "PIDGEY: Kurukkoo!$"
 
-gUnknown_8195400:: @ 8195400
+VermilionCity_House3_Text_DearPippiLetter:: @ 8195400
     .string "Dear PIPPI,\n"
     .string "I hope to see you soon.\p"
     .string "I heard SAFFRON has problems with\n"
     .string "TEAM ROCKET.\p"
     .string "VERMILION appears to be safe.$"
 
-gUnknown_8195471:: @ 8195471
+VermilionCity_House3_Text_SendMyPidgeyToUnionRoom:: @ 8195471
     .string "I want to exchange MAIL with all\n"
     .string "sorts of people.\p"
     .string "I send my PIDGEY to a UNION ROOM\n"

data/scripts/fame_checker.inc

@@ -169,11 +169,11 @@ SaffronCity_PokemonTrainerFanClub_EventScript_PokemonJournalBruno:: @ 81ACF7A
 	release
 	end
 
-SevenIsland_SevaultCanyon_EventScript_1ACF95:: @ 81ACF95
+SevenIsland_SevaultCanyon_EventScript_BlackBelt:: @ 81ACF95
 	lock
 	faceplayer
 	famechecker FAMECHECKER_BRUNO, 5
-	msgbox Text_18CF4D
+	msgbox SevenIsland_SevaultCanyon_Text_BrunoTrainedWithBrawly
 	release
 	end
 
@@ -186,20 +186,20 @@ IndigoPlateau_PokemonCenter_1F_EventScript_BlackBelt:: @ 81ACFAE
 	release
 	end
 
-SevenIsland_PokemonCenter_1F_EventScript_1ACFD4:: @ 81ACFD4
+SevenIsland_PokemonCenter_1F_EventScript_PokemonJournal:: @ 81ACFD4
 	lock
 	faceplayer
 	famechecker FAMECHECKER_AGATHA, 3
 	textcolor 3
-	msgbox gUnknown_81B19A8
+	msgbox PokemonJournal_Text_SpecialFeatureAgatha
 	release
 	end
 
-SixIsland_Mart_EventScript_1ACFEF:: @ 81ACFEF
+SixIsland_Mart_EventScript_OldWoman:: @ 81ACFEF
 	lock
 	faceplayer
 	famechecker FAMECHECKER_AGATHA, 5
-	msgbox Text_1A41CA
+	msgbox SixIsland_Mart_Text_AgathaOldestEverEliteFourMember
 	release
 	end
 

data/scripts/trainers.inc

@@ -2546,457 +2546,457 @@ FiveIsland_MemorialPillar_EventScript_HaroldRematch:: @ 81AC3BA
 	msgbox FiveIsland_MemorialPillar_Text_HaroldPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SixIsland_OutcastIsland_EventScript_1AC3D1:: @ 81AC3D1
+SixIsland_OutcastIsland_EventScript_Tylor:: @ 81AC3D1
-	trainerbattle_single TRAINER_FISHERMAN_TYLOR, Text_18B400, Text_18B43B
+	trainerbattle_single TRAINER_FISHERMAN_TYLOR, SixIsland_OutcastIsland_Text_TylorIntro, SixIsland_OutcastIsland_Text_TylorDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AC3F8
+	goto_if_eq SixIsland_OutcastIsland_EventScript_TylorRematch
-	msgbox Text_18B451, MSGBOX_AUTOCLOSE
+	msgbox SixIsland_OutcastIsland_Text_TylorPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AC3F8:: @ 81AC3F8
+SixIsland_OutcastIsland_EventScript_TylorRematch:: @ 81AC3F8
-	trainerbattle_rematch TRAINER_FISHERMAN_TYLOR, Text_1C3ED0, Text_18B43B
+	trainerbattle_rematch TRAINER_FISHERMAN_TYLOR, SixIsland_OutcastIsland_Text_TylorRematchIntro, SixIsland_OutcastIsland_Text_TylorDefeat
-	msgbox Text_18B451, MSGBOX_AUTOCLOSE
+	msgbox SixIsland_OutcastIsland_Text_TylorPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SixIsland_OutcastIsland_EventScript_1AC40F:: @ 81AC40F
+SixIsland_OutcastIsland_EventScript_Mymo:: @ 81AC40F
-	trainerbattle_single TRAINER_SWIMMER_MALE_MYMO, Text_18B48F, Text_18B4C5
+	trainerbattle_single TRAINER_SWIMMER_MALE_MYMO, SixIsland_OutcastIsland_Text_MymoIntro, SixIsland_OutcastIsland_Text_MymoDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AC436
+	goto_if_eq SixIsland_OutcastIsland_EventScript_MymoRematch
-	msgbox Text_18B4D1, MSGBOX_AUTOCLOSE
+	msgbox SixIsland_OutcastIsland_Text_MymoPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AC436:: @ 81AC436
+SixIsland_OutcastIsland_EventScript_MymoRematch:: @ 81AC436
-	trainerbattle_rematch TRAINER_SWIMMER_MALE_MYMO, Text_1C3F11, Text_18B4C5
+	trainerbattle_rematch TRAINER_SWIMMER_MALE_MYMO, SixIsland_OutcastIsland_Text_MymoRematchIntro, SixIsland_OutcastIsland_Text_MymoDefeat
-	msgbox Text_18B4D1, MSGBOX_AUTOCLOSE
+	msgbox SixIsland_OutcastIsland_Text_MymoPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SixIsland_OutcastIsland_EventScript_1AC44D:: @ 81AC44D
+SixIsland_OutcastIsland_EventScript_Nicole:: @ 81AC44D
-	trainerbattle_single TRAINER_SWIMMER_FEMALE_NICOLE, Text_18B4FA, Text_18B539
+	trainerbattle_single TRAINER_SWIMMER_FEMALE_NICOLE, SixIsland_OutcastIsland_Text_NicoleIntro, SixIsland_OutcastIsland_Text_NicoleDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AC474
+	goto_if_eq SixIsland_OutcastIsland_EventScript_NicoleRematch
-	msgbox Text_18B573, MSGBOX_AUTOCLOSE
+	msgbox SixIsland_OutcastIsland_Text_NicolePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AC474:: @ 81AC474
+SixIsland_OutcastIsland_EventScript_NicoleRematch:: @ 81AC474
-	trainerbattle_rematch TRAINER_SWIMMER_FEMALE_NICOLE, Text_1C3F51, Text_18B539
+	trainerbattle_rematch TRAINER_SWIMMER_FEMALE_NICOLE, SixIsland_OutcastIsland_Text_NicoleRematchIntro, SixIsland_OutcastIsland_Text_NicoleDefeat
-	msgbox Text_18B573, MSGBOX_AUTOCLOSE
+	msgbox SixIsland_OutcastIsland_Text_NicolePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SixIsland_OutcastIsland_EventScript_1AC48B:: @ 81AC48B
+SixIsland_OutcastIsland_EventScript_Ava:: @ 81AC48B
-	trainerbattle_double TRAINER_SIS_AND_BRO_AVA_GEB, Text_18B5C8, Text_18B5F4, Text_18B660
+	trainerbattle_double TRAINER_SIS_AND_BRO_AVA_GEB, SixIsland_OutcastIsland_Text_AvaIntro, SixIsland_OutcastIsland_Text_AvaDefeat, SixIsland_OutcastIsland_Text_AvaNotEnoughMons
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AC4B6
+	goto_if_eq SixIsland_OutcastIsland_EventScript_AvaRematch
-	msgbox Text_18B62E, MSGBOX_AUTOCLOSE
+	msgbox SixIsland_OutcastIsland_Text_AvaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AC4B6:: @ 81AC4B6
+SixIsland_OutcastIsland_EventScript_AvaRematch:: @ 81AC4B6
-	trainerbattle_rematch_double TRAINER_SIS_AND_BRO_AVA_GEB, Text_1C3F7B, Text_18B5F4, Text_18B660
+	trainerbattle_rematch_double TRAINER_SIS_AND_BRO_AVA_GEB, SixIsland_OutcastIsland_Text_AvaRematchIntro, SixIsland_OutcastIsland_Text_AvaDefeat, SixIsland_OutcastIsland_Text_AvaNotEnoughMons
-	msgbox Text_18B62E, MSGBOX_AUTOCLOSE
+	msgbox SixIsland_OutcastIsland_Text_AvaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SixIsland_OutcastIsland_EventScript_1AC4D1:: @ 81AC4D1
+SixIsland_OutcastIsland_EventScript_Geb:: @ 81AC4D1
-	trainerbattle_double TRAINER_SIS_AND_BRO_AVA_GEB, Text_18B6C1, Text_18B6EF, Text_18B762
+	trainerbattle_double TRAINER_SIS_AND_BRO_AVA_GEB, SixIsland_OutcastIsland_Text_GebIntro, SixIsland_OutcastIsland_Text_GebDefeat, SixIsland_OutcastIsland_Text_GebNotEnoughMons
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AC4FC
+	goto_if_eq SixIsland_OutcastIsland_EventScript_GebRematch
-	msgbox Text_18B720, MSGBOX_AUTOCLOSE
+	msgbox SixIsland_OutcastIsland_Text_GebPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AC4FC:: @ 81AC4FC
+SixIsland_OutcastIsland_EventScript_GebRematch:: @ 81AC4FC
-	trainerbattle_rematch_double TRAINER_SIS_AND_BRO_AVA_GEB, Text_1C3FB3, Text_18B6EF, Text_18B762
+	trainerbattle_rematch_double TRAINER_SIS_AND_BRO_AVA_GEB, SixIsland_OutcastIsland_Text_GebRematchIntro, SixIsland_OutcastIsland_Text_GebDefeat, SixIsland_OutcastIsland_Text_GebNotEnoughMons
-	msgbox Text_18B720, MSGBOX_AUTOCLOSE
+	msgbox SixIsland_OutcastIsland_Text_GebPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SixIsland_GreenPath_EventScript_1AC517:: @ 81AC517
+SixIsland_GreenPath_EventScript_Jaclyn:: @ 81AC517
-	trainerbattle_single TRAINER_PSYCHIC_JACLYN, Text_18B7B0, Text_18B7F0
+	trainerbattle_single TRAINER_PSYCHIC_JACLYN, SixIsland_GreenPath_Text_JaclynIntro, SixIsland_GreenPath_Text_JaclynDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AC53E
+	goto_if_eq SixIsland_GreenPath_EventScript_JaclynRematch
-	msgbox Text_18B7FD, MSGBOX_AUTOCLOSE
+	msgbox SixIsland_GreenPath_Text_JaclynPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AC53E:: @ 81AC53E
+SixIsland_GreenPath_EventScript_JaclynRematch:: @ 81AC53E
-	trainerbattle_rematch TRAINER_PSYCHIC_JACLYN, Text_1C3FE9, Text_18B7F0
+	trainerbattle_rematch TRAINER_PSYCHIC_JACLYN, SixIsland_GreenPath_Text_JaclynRematchIntro, SixIsland_GreenPath_Text_JaclynDefeat
-	msgbox Text_18B7FD, MSGBOX_AUTOCLOSE
+	msgbox SixIsland_GreenPath_Text_JaclynPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SixIsland_WaterPath_EventScript_1AC555:: @ 81AC555
+SixIsland_WaterPath_EventScript_Rose:: @ 81AC555
-	trainerbattle_single TRAINER_AROMA_LADY_ROSE, Text_18B896, Text_18B8C8
+	trainerbattle_single TRAINER_AROMA_LADY_ROSE, SixIsland_WaterPath_Text_RoseIntro, SixIsland_WaterPath_Text_RoseDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AC57C
+	goto_if_eq SixIsland_WaterPath_EventScript_RoseRematch
-	msgbox Text_18B8F7, MSGBOX_AUTOCLOSE
+	msgbox SixIsland_WaterPath_Text_RosePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AC57C:: @ 81AC57C
+SixIsland_WaterPath_EventScript_RoseRematch:: @ 81AC57C
-	trainerbattle_rematch TRAINER_AROMA_LADY_ROSE, Text_1C4028, Text_18B8C8
+	trainerbattle_rematch TRAINER_AROMA_LADY_ROSE, SixIsland_WaterPath_Text_RoseRematchIntro, SixIsland_WaterPath_Text_RoseDefeat
-	msgbox Text_18B8F7, MSGBOX_AUTOCLOSE
+	msgbox SixIsland_WaterPath_Text_RosePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SixIsland_WaterPath_EventScript_1AC593:: @ 81AC593
+SixIsland_WaterPath_EventScript_Edward:: @ 81AC593
-	trainerbattle_single TRAINER_JUGGLER_EDWARD, Text_18B959, Text_18B988
+	trainerbattle_single TRAINER_JUGGLER_EDWARD, SixIsland_WaterPath_Text_EdwardIntro, SixIsland_WaterPath_Text_EdwardDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AC5BA
+	goto_if_eq SixIsland_WaterPath_EventScript_EdwardRematch
-	msgbox Text_18B9A5, MSGBOX_AUTOCLOSE
+	msgbox SixIsland_WaterPath_Text_EdwardPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AC5BA:: @ 81AC5BA
+SixIsland_WaterPath_EventScript_EdwardRematch:: @ 81AC5BA
-	trainerbattle_rematch TRAINER_JUGGLER_EDWARD, Text_1C4057, Text_18B988
+	trainerbattle_rematch TRAINER_JUGGLER_EDWARD, SixIsland_WaterPath_Text_EdwardRematchIntro, SixIsland_WaterPath_Text_EdwardDefeat
-	msgbox Text_18B9A5, MSGBOX_AUTOCLOSE
+	msgbox SixIsland_WaterPath_Text_EdwardPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SixIsland_WaterPath_EventScript_1AC5D1:: @ 81AC5D1
+SixIsland_WaterPath_EventScript_Samir:: @ 81AC5D1
-	trainerbattle_single TRAINER_SWIMMER_MALE_SAMIR, Text_18B9EC, Text_18BA47
+	trainerbattle_single TRAINER_SWIMMER_MALE_SAMIR, SixIsland_WaterPath_Text_SamirIntro, SixIsland_WaterPath_Text_SamirDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AC5F8
+	goto_if_eq SixIsland_WaterPath_EventScript_SamirRematch
-	msgbox Text_18BA57, MSGBOX_AUTOCLOSE
+	msgbox SixIsland_WaterPath_Text_SamirPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AC5F8:: @ 81AC5F8
+SixIsland_WaterPath_EventScript_SamirRematch:: @ 81AC5F8
-	trainerbattle_rematch TRAINER_SWIMMER_MALE_SAMIR, Text_1C407F, Text_18BA47
+	trainerbattle_rematch TRAINER_SWIMMER_MALE_SAMIR, SixIsland_WaterPath_Text_SamirRematchIntro, SixIsland_WaterPath_Text_SamirDefeat
-	msgbox Text_18BA57, MSGBOX_AUTOCLOSE
+	msgbox SixIsland_WaterPath_Text_SamirPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SixIsland_WaterPath_EventScript_1AC60F:: @ 81AC60F
+SixIsland_WaterPath_EventScript_Denise:: @ 81AC60F
-	trainerbattle_single TRAINER_SWIMMER_FEMALE_DENISE, Text_18BA86, Text_18BAC0
+	trainerbattle_single TRAINER_SWIMMER_FEMALE_DENISE, SixIsland_WaterPath_Text_DeniseIntro, SixIsland_WaterPath_Text_DeniseDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AC636
+	goto_if_eq SixIsland_WaterPath_EventScript_DeniseRematch
-	msgbox Text_18BAE0, MSGBOX_AUTOCLOSE
+	msgbox SixIsland_WaterPath_Text_DenisePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AC636:: @ 81AC636
+SixIsland_WaterPath_EventScript_DeniseRematch:: @ 81AC636
-	trainerbattle_rematch TRAINER_SWIMMER_FEMALE_DENISE, Text_1C40D9, Text_18BAC0
+	trainerbattle_rematch TRAINER_SWIMMER_FEMALE_DENISE, SixIsland_WaterPath_Text_DeniseRematchIntro, SixIsland_WaterPath_Text_DeniseDefeat
-	msgbox Text_18BAE0, MSGBOX_AUTOCLOSE
+	msgbox SixIsland_WaterPath_Text_DenisePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SixIsland_WaterPath_EventScript_1AC64D:: @ 81AC64D
+SixIsland_WaterPath_EventScript_Miu:: @ 81AC64D
-	trainerbattle_double TRAINER_TWINS_MIU_MIA, Text_18BBBA, Text_18BBE2, Text_18BC24
+	trainerbattle_double TRAINER_TWINS_MIU_MIA, SixIsland_WaterPath_Text_MiuIntro, SixIsland_WaterPath_Text_MiuDefeat, SixIsland_WaterPath_Text_MiuNotEnoughMons
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AC678
+	goto_if_eq SixIsland_WaterPath_EventScript_MiuRematch
-	msgbox Text_18BBF6, MSGBOX_AUTOCLOSE
+	msgbox SixIsland_WaterPath_Text_MiuPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AC678:: @ 81AC678
+SixIsland_WaterPath_EventScript_MiuRematch:: @ 81AC678
-	trainerbattle_rematch_double TRAINER_TWINS_MIU_MIA, Text_1C4138, Text_18BBE2, Text_18BC24
+	trainerbattle_rematch_double TRAINER_TWINS_MIU_MIA, SixIsland_WaterPath_Text_MiuRematchIntro, SixIsland_WaterPath_Text_MiuDefeat, SixIsland_WaterPath_Text_MiuNotEnoughMons
-	msgbox Text_18BBF6, MSGBOX_AUTOCLOSE
+	msgbox SixIsland_WaterPath_Text_MiuPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SixIsland_WaterPath_EventScript_1AC693:: @ 81AC693
+SixIsland_WaterPath_EventScript_Mia:: @ 81AC693
-	trainerbattle_double TRAINER_TWINS_MIU_MIA, Text_18BC5A, Text_18BC84, Text_18BCCF
+	trainerbattle_double TRAINER_TWINS_MIU_MIA, SixIsland_WaterPath_Text_MiaIntro, SixIsland_WaterPath_Text_MiaDefeat, SixIsland_WaterPath_Text_MiaNotEnoughMons
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AC6BE
+	goto_if_eq SixIsland_WaterPath_EventScript_MiaRematch
-	msgbox Text_18BCAE, MSGBOX_AUTOCLOSE
+	msgbox SixIsland_WaterPath_Text_MiaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AC6BE:: @ 81AC6BE
+SixIsland_WaterPath_EventScript_MiaRematch:: @ 81AC6BE
-	trainerbattle_rematch_double TRAINER_TWINS_MIU_MIA, Text_1C4166, Text_18BC84, Text_18BCCF
+	trainerbattle_rematch_double TRAINER_TWINS_MIU_MIA, SixIsland_WaterPath_Text_MiaRematchIntro, SixIsland_WaterPath_Text_MiaDefeat, SixIsland_WaterPath_Text_MiaNotEnoughMons
-	msgbox Text_18BCAE, MSGBOX_AUTOCLOSE
+	msgbox SixIsland_WaterPath_Text_MiaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SixIsland_WaterPath_EventScript_1AC6D9:: @ 81AC6D9
+SixIsland_WaterPath_EventScript_Earl:: @ 81AC6D9
-	trainerbattle_single TRAINER_HIKER_EARL, Text_18BB2D, Text_18BB62
+	trainerbattle_single TRAINER_HIKER_EARL, SixIsland_WaterPath_Text_EarlIntro, SixIsland_WaterPath_Text_EarlDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AC700
+	goto_if_eq SixIsland_WaterPath_EventScript_EarlRematch
-	msgbox Text_18BB8B, MSGBOX_AUTOCLOSE
+	msgbox SixIsland_WaterPath_Text_EarlPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AC700:: @ 81AC700
+SixIsland_WaterPath_EventScript_EarlRematch:: @ 81AC700
-	trainerbattle_rematch TRAINER_HIKER_EARL, Text_1C40FA, Text_18BB62
+	trainerbattle_rematch TRAINER_HIKER_EARL, SixIsland_WaterPath_Text_EarlRematchIntro, SixIsland_WaterPath_Text_EarlDefeat
-	msgbox Text_18BB8B, MSGBOX_AUTOCLOSE
+	msgbox SixIsland_WaterPath_Text_EarlPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SixIsland_RuinValley_EventScript_1AC717:: @ 81AC717
+SixIsland_RuinValley_EventScript_Stanly:: @ 81AC717
-	trainerbattle_single TRAINER_RUIN_MANIAC_STANLY, Text_18BE5D, Text_18BE9B
+	trainerbattle_single TRAINER_RUIN_MANIAC_STANLY, SixIsland_RuinValley_Text_StanlyIntro, SixIsland_RuinValley_Text_StanlyDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AC73E
+	goto_if_eq SixIsland_RuinValley_EventScript_StanlyRematch
-	msgbox Text_18BEA0, MSGBOX_AUTOCLOSE
+	msgbox SixIsland_RuinValley_Text_StanlyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AC73E:: @ 81AC73E
+SixIsland_RuinValley_EventScript_StanlyRematch:: @ 81AC73E
-	trainerbattle_rematch TRAINER_RUIN_MANIAC_STANLY, Text_1C4196, Text_18BE9B
+	trainerbattle_rematch TRAINER_RUIN_MANIAC_STANLY, SixIsland_RuinValley_Text_StanlyRematchIntro, SixIsland_RuinValley_Text_StanlyDefeat
-	msgbox Text_18BEA0, MSGBOX_AUTOCLOSE
+	msgbox SixIsland_RuinValley_Text_StanlyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SixIsland_RuinValley_EventScript_1AC755:: @ 81AC755
+SixIsland_RuinValley_EventScript_Foster:: @ 81AC755
-	trainerbattle_single TRAINER_RUIN_MANIAC_FOSTER, Text_18BF05, Text_18BF33
+	trainerbattle_single TRAINER_RUIN_MANIAC_FOSTER, SixIsland_RuinValley_Text_FosterIntro, SixIsland_RuinValley_Text_FosterDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AC77C
+	goto_if_eq SixIsland_RuinValley_EventScript_FosterRematch
-	msgbox Text_18BF6C, MSGBOX_AUTOCLOSE
+	msgbox SixIsland_RuinValley_Text_FosterPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AC77C:: @ 81AC77C
+SixIsland_RuinValley_EventScript_FosterRematch:: @ 81AC77C
-	trainerbattle_rematch TRAINER_RUIN_MANIAC_FOSTER, Text_1C41D4, Text_18BF33
+	trainerbattle_rematch TRAINER_RUIN_MANIAC_FOSTER, SixIsland_RuinValley_Text_FosterRematchIntro, SixIsland_RuinValley_Text_FosterDefeat
-	msgbox Text_18BF6C, MSGBOX_AUTOCLOSE
+	msgbox SixIsland_RuinValley_Text_FosterPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SixIsland_RuinValley_EventScript_1AC793:: @ 81AC793
+SixIsland_RuinValley_EventScript_Larry:: @ 81AC793
-	trainerbattle_single TRAINER_RUIN_MANIAC_LARRY, Text_18BFC5, Text_18C03B
+	trainerbattle_single TRAINER_RUIN_MANIAC_LARRY, SixIsland_RuinValley_Text_LarryIntro, SixIsland_RuinValley_Text_LarryDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AC7BA
+	goto_if_eq SixIsland_RuinValley_EventScript_LarryRematch
-	msgbox Text_18C04C, MSGBOX_AUTOCLOSE
+	msgbox SixIsland_RuinValley_Text_LarryPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AC7BA:: @ 81AC7BA
+SixIsland_RuinValley_EventScript_LarryRematch:: @ 81AC7BA
-	trainerbattle_rematch TRAINER_RUIN_MANIAC_LARRY, Text_1C4210, Text_18C03B
+	trainerbattle_rematch TRAINER_RUIN_MANIAC_LARRY, SixIsland_RuinValley_Text_LarryRematchIntro, SixIsland_RuinValley_Text_LarryDefeat
-	msgbox Text_18C04C, MSGBOX_AUTOCLOSE
+	msgbox SixIsland_RuinValley_Text_LarryPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SixIsland_RuinValley_EventScript_1AC7D1:: @ 81AC7D1
+SixIsland_RuinValley_EventScript_Daryl:: @ 81AC7D1
-	trainerbattle_single TRAINER_HIKER_DARYL, Text_18C09C, Text_18C0BB
+	trainerbattle_single TRAINER_HIKER_DARYL, SixIsland_RuinValley_Text_DarylIntro, SixIsland_RuinValley_Text_DarylDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AC7F8
+	goto_if_eq SixIsland_RuinValley_EventScript_DarylRematch
-	msgbox Text_18C0EA, MSGBOX_AUTOCLOSE
+	msgbox SixIsland_RuinValley_Text_DarylPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AC7F8:: @ 81AC7F8
+SixIsland_RuinValley_EventScript_DarylRematch:: @ 81AC7F8
-	trainerbattle_rematch TRAINER_HIKER_DARYL, Text_1C4280, Text_18C0BB
+	trainerbattle_rematch TRAINER_HIKER_DARYL, SixIsland_RuinValley_Text_DarylRematchIntro, SixIsland_RuinValley_Text_DarylDefeat
-	msgbox Text_18C0EA, MSGBOX_AUTOCLOSE
+	msgbox SixIsland_RuinValley_Text_DarylPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SixIsland_RuinValley_EventScript_1AC80F:: @ 81AC80F
+SixIsland_RuinValley_EventScript_Hector:: @ 81AC80F
-	trainerbattle_single TRAINER_POKEMANIAC_HECTOR, Text_18C10A, Text_18C140
+	trainerbattle_single TRAINER_POKEMANIAC_HECTOR, SixIsland_RuinValley_Text_HectorIntro, SixIsland_RuinValley_Text_HectorDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AC836
+	goto_if_eq SixIsland_RuinValley_EventScript_HectorRematch
-	msgbox Text_18C17A, MSGBOX_AUTOCLOSE
+	msgbox SixIsland_RuinValley_Text_HectorPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AC836:: @ 81AC836
+SixIsland_RuinValley_EventScript_HectorRematch:: @ 81AC836
-	trainerbattle_rematch TRAINER_POKEMANIAC_HECTOR, Text_1C42A0, Text_18C140
+	trainerbattle_rematch TRAINER_POKEMANIAC_HECTOR, SixIsland_RuinValley_Text_HectorRematchIntro, SixIsland_RuinValley_Text_HectorDefeat
-	msgbox Text_18C17A, MSGBOX_AUTOCLOSE
+	msgbox SixIsland_RuinValley_Text_HectorPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SevenIsland_TrainerTower_EventScript_1AC84D:: @ 81AC84D
+SevenIsland_TrainerTower_EventScript_Dario:: @ 81AC84D
-	trainerbattle_single TRAINER_PSYCHIC_DARIO, Text_18C1ED, Text_18C205
+	trainerbattle_single TRAINER_PSYCHIC_DARIO, SevenIsland_TrainerTower_Text_DarioIntro, SevenIsland_TrainerTower_Text_DarioDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AC874
+	goto_if_eq SevenIsland_TrainerTower_EventScript_DarioRematch
-	msgbox Text_18C20E, MSGBOX_AUTOCLOSE
+	msgbox SevenIsland_TrainerTower_Text_DarioPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AC874:: @ 81AC874
+SevenIsland_TrainerTower_EventScript_DarioRematch:: @ 81AC874
-	trainerbattle_rematch TRAINER_PSYCHIC_DARIO, Text_1C42D6, Text_18C205
+	trainerbattle_rematch TRAINER_PSYCHIC_DARIO, SevenIsland_TrainerTower_Text_DarioRematchIntro, SevenIsland_TrainerTower_Text_DarioDefeat
-	msgbox Text_18C20E, MSGBOX_AUTOCLOSE
+	msgbox SevenIsland_TrainerTower_Text_DarioPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SevenIsland_TrainerTower_EventScript_1AC88B:: @ 81AC88B
+SevenIsland_TrainerTower_EventScript_Rodette:: @ 81AC88B
-	trainerbattle_single TRAINER_PSYCHIC_RODETTE, Text_18C283, Text_18C2BC
+	trainerbattle_single TRAINER_PSYCHIC_RODETTE, SevenIsland_TrainerTower_Text_RodetteIntro, SevenIsland_TrainerTower_Text_RodetteDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AC8B2
+	goto_if_eq SevenIsland_TrainerTower_EventScript_RodetteRematch
-	msgbox Text_18C2D5, MSGBOX_AUTOCLOSE
+	msgbox SevenIsland_TrainerTower_Text_RodettePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AC8B2:: @ 81AC8B2
+SevenIsland_TrainerTower_EventScript_RodetteRematch:: @ 81AC8B2
-	trainerbattle_rematch TRAINER_PSYCHIC_RODETTE, Text_1C42EE, Text_18C2BC
+	trainerbattle_rematch TRAINER_PSYCHIC_RODETTE, SevenIsland_TrainerTower_Text_RodetteRematchIntro, SevenIsland_TrainerTower_Text_RodetteDefeat
-	msgbox Text_18C2D5, MSGBOX_AUTOCLOSE
+	msgbox SevenIsland_TrainerTower_Text_RodettePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SevenIsland_SevaultCanyon_Entrance_EventScript_1AC8C9:: @ 81AC8C9
+SevenIsland_SevaultCanyon_Entrance_EventScript_Miah:: @ 81AC8C9
-	trainerbattle_single TRAINER_AROMA_LADY_MIAH, Text_18C3BC, Text_18C3E7
+	trainerbattle_single TRAINER_AROMA_LADY_MIAH, SevenIsland_SevaultCanyon_Entrance_Text_MiahIntro, SevenIsland_SevaultCanyon_Entrance_Text_MiahDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AC8F0
+	goto_if_eq SevenIsland_SevaultCanyon_Entrance_EventScript_MiahRematch
-	msgbox Text_18C3FF, MSGBOX_AUTOCLOSE
+	msgbox SevenIsland_SevaultCanyon_Entrance_Text_MiahPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AC8F0:: @ 81AC8F0
+SevenIsland_SevaultCanyon_Entrance_EventScript_MiahRematch:: @ 81AC8F0
-	trainerbattle_rematch TRAINER_AROMA_LADY_MIAH, Text_1C4327, Text_18C3E7
+	trainerbattle_rematch TRAINER_AROMA_LADY_MIAH, SevenIsland_SevaultCanyon_Entrance_Text_MiahRematchIntro, SevenIsland_SevaultCanyon_Entrance_Text_MiahDefeat
-	msgbox Text_18C3FF, MSGBOX_AUTOCLOSE
+	msgbox SevenIsland_SevaultCanyon_Entrance_Text_MiahPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SevenIsland_SevaultCanyon_Entrance_EventScript_1AC907:: @ 81AC907
+SevenIsland_SevaultCanyon_Entrance_EventScript_Eve:: @ 81AC907
-	trainerbattle_double TRAINER_YOUNG_COUPLE_EVE_JON, Text_18C632, Text_18C662, Text_18C6AB
+	trainerbattle_double TRAINER_YOUNG_COUPLE_EVE_JON, SevenIsland_SevaultCanyon_Entrance_Text_EveIntro, SevenIsland_SevaultCanyon_Entrance_Text_EveDefeat, SevenIsland_SevaultCanyon_Entrance_Text_EveNotEnoughMons
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AC932
+	goto_if_eq SevenIsland_SevaultCanyon_Entrance_EventScript_EveRematch
-	msgbox Text_18C683, MSGBOX_AUTOCLOSE
+	msgbox SevenIsland_SevaultCanyon_Entrance_Text_EvePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AC932:: @ 81AC932
+SevenIsland_SevaultCanyon_Entrance_EventScript_EveRematch:: @ 81AC932
-	trainerbattle_rematch_double TRAINER_YOUNG_COUPLE_EVE_JON, Text_1C4416, Text_18C662, Text_18C6AB
+	trainerbattle_rematch_double TRAINER_YOUNG_COUPLE_EVE_JON, SevenIsland_SevaultCanyon_Entrance_Text_EveRematchIntro, SevenIsland_SevaultCanyon_Entrance_Text_EveDefeat, SevenIsland_SevaultCanyon_Entrance_Text_EveNotEnoughMons
-	msgbox Text_18C683, MSGBOX_AUTOCLOSE
+	msgbox SevenIsland_SevaultCanyon_Entrance_Text_EvePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SevenIsland_SevaultCanyon_Entrance_EventScript_1AC94D:: @ 81AC94D
+SevenIsland_SevaultCanyon_Entrance_EventScript_Jon:: @ 81AC94D
-	trainerbattle_double TRAINER_YOUNG_COUPLE_EVE_JON, Text_18C700, Text_18C73B, Text_18C7BD
+	trainerbattle_double TRAINER_YOUNG_COUPLE_EVE_JON, SevenIsland_SevaultCanyon_Entrance_Text_JonIntro, SevenIsland_SevaultCanyon_Entrance_Text_JonDefeat, SevenIsland_SevaultCanyon_Entrance_Text_JonNotEnoughMons
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AC978
+	goto_if_eq SevenIsland_SevaultCanyon_Entrance_EventScript_JonRematch
-	msgbox Text_18C773, MSGBOX_AUTOCLOSE
+	msgbox SevenIsland_SevaultCanyon_Entrance_Text_JonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AC978:: @ 81AC978
+SevenIsland_SevaultCanyon_Entrance_EventScript_JonRematch:: @ 81AC978
-	trainerbattle_rematch_double TRAINER_YOUNG_COUPLE_EVE_JON, Text_1C444C, Text_18C73B, Text_18C7BD
+	trainerbattle_rematch_double TRAINER_YOUNG_COUPLE_EVE_JON, SevenIsland_SevaultCanyon_Entrance_Text_JonRematchIntro, SevenIsland_SevaultCanyon_Entrance_Text_JonDefeat, SevenIsland_SevaultCanyon_Entrance_Text_JonNotEnoughMons
-	msgbox Text_18C773, MSGBOX_AUTOCLOSE
+	msgbox SevenIsland_SevaultCanyon_Entrance_Text_JonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SevenIsland_SevaultCanyon_Entrance_EventScript_1AC993:: @ 81AC993
+SevenIsland_SevaultCanyon_Entrance_EventScript_Mason:: @ 81AC993
-	trainerbattle_single TRAINER_JUGGLER_MASON, Text_18C44B, Text_18C473
+	trainerbattle_single TRAINER_JUGGLER_MASON, SevenIsland_SevaultCanyon_Entrance_Text_MasonIntro, SevenIsland_SevaultCanyon_Entrance_Text_MasonDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AC9BA
+	goto_if_eq SevenIsland_SevaultCanyon_Entrance_EventScript_MasonRematch
-	msgbox Text_18C4BA, MSGBOX_AUTOCLOSE
+	msgbox SevenIsland_SevaultCanyon_Entrance_Text_MasonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AC9BA:: @ 81AC9BA
+SevenIsland_SevaultCanyon_Entrance_EventScript_MasonRematch:: @ 81AC9BA
-	trainerbattle_rematch TRAINER_JUGGLER_MASON, Text_1C4374, Text_18C473
+	trainerbattle_rematch TRAINER_JUGGLER_MASON, SevenIsland_SevaultCanyon_Entrance_Text_MasonRematchIntro, SevenIsland_SevaultCanyon_Entrance_Text_MasonDefeat
-	msgbox Text_18C4BA, MSGBOX_AUTOCLOSE
+	msgbox SevenIsland_SevaultCanyon_Entrance_Text_MasonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SevenIsland_SevaultCanyon_Entrance_EventScript_1AC9D1:: @ 81AC9D1
+SevenIsland_SevaultCanyon_Entrance_EventScript_Nicolas:: @ 81AC9D1
-	trainerbattle_single TRAINER_PKMN_RANGER_NICOLAS, Text_18C500, Text_18C543
+	trainerbattle_single TRAINER_PKMN_RANGER_NICOLAS, SevenIsland_SevaultCanyon_Entrance_Text_NicolasIntro, SevenIsland_SevaultCanyon_Entrance_Text_NicolasDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1AC9F8
+	goto_if_eq SevenIsland_SevaultCanyon_Entrance_EventScript_NicolasRematch
-	msgbox Text_18C54B, MSGBOX_AUTOCLOSE
+	msgbox SevenIsland_SevaultCanyon_Entrance_Text_NicolasPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1AC9F8:: @ 81AC9F8
+SevenIsland_SevaultCanyon_Entrance_EventScript_NicolasRematch:: @ 81AC9F8
-	trainerbattle_rematch TRAINER_PKMN_RANGER_NICOLAS, Text_1C43AD, Text_18C543
+	trainerbattle_rematch TRAINER_PKMN_RANGER_NICOLAS, SevenIsland_SevaultCanyon_Entrance_Text_NicolasRematchIntro, SevenIsland_SevaultCanyon_Entrance_Text_NicolasDefeat
-	msgbox Text_18C54B, MSGBOX_AUTOCLOSE
+	msgbox SevenIsland_SevaultCanyon_Entrance_Text_NicolasPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SevenIsland_SevaultCanyon_Entrance_EventScript_1ACA0F:: @ 81ACA0F
+SevenIsland_SevaultCanyon_Entrance_EventScript_Madeline:: @ 81ACA0F
-	trainerbattle_single TRAINER_PKMN_RANGER_MADELINE, Text_18C5AA, Text_18C5CD
+	trainerbattle_single TRAINER_PKMN_RANGER_MADELINE, SevenIsland_SevaultCanyon_Entrance_Text_MadelineIntro, SevenIsland_SevaultCanyon_Entrance_Text_MadelineDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1ACA36
+	goto_if_eq SevenIsland_SevaultCanyon_Entrance_EventScript_MadelineRematch
-	msgbox Text_18C5F5, MSGBOX_AUTOCLOSE
+	msgbox SevenIsland_SevaultCanyon_Entrance_Text_MadelinePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1ACA36:: @ 81ACA36
+SevenIsland_SevaultCanyon_Entrance_EventScript_MadelineRematch:: @ 81ACA36
-	trainerbattle_rematch TRAINER_PKMN_RANGER_MADELINE, Text_1C43EC, Text_18C5CD
+	trainerbattle_rematch TRAINER_PKMN_RANGER_MADELINE, SevenIsland_SevaultCanyon_Entrance_Text_MadelineRematchIntro, SevenIsland_SevaultCanyon_Entrance_Text_MadelineDefeat
-	msgbox Text_18C5F5, MSGBOX_AUTOCLOSE
+	msgbox SevenIsland_SevaultCanyon_Entrance_Text_MadelinePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SevenIsland_SevaultCanyon_EventScript_1ACA4D:: @ 81ACA4D
+SevenIsland_SevaultCanyon_EventScript_Cyndy:: @ 81ACA4D
-	trainerbattle_single TRAINER_CRUSH_GIRL_CYNDY, Text_18C887, Text_18C8A6
+	trainerbattle_single TRAINER_CRUSH_GIRL_CYNDY, SevenIsland_SevaultCanyon_Text_CyndyIntro, SevenIsland_SevaultCanyon_Text_CyndyDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1ACA74
+	goto_if_eq SevenIsland_SevaultCanyon_EventScript_CyndyRematch
-	msgbox Text_18C8C2, MSGBOX_AUTOCLOSE
+	msgbox SevenIsland_SevaultCanyon_Text_CyndyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1ACA74:: @ 81ACA74
+SevenIsland_SevaultCanyon_EventScript_CyndyRematch:: @ 81ACA74
-	trainerbattle_rematch TRAINER_CRUSH_GIRL_CYNDY, Text_1C4491, Text_18C8A6
+	trainerbattle_rematch TRAINER_CRUSH_GIRL_CYNDY, SevenIsland_SevaultCanyon_Text_CyndyRematchIntro, SevenIsland_SevaultCanyon_Text_CyndyDefeat
-	msgbox Text_18C8C2, MSGBOX_AUTOCLOSE
+	msgbox SevenIsland_SevaultCanyon_Text_CyndyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SevenIsland_SevaultCanyon_EventScript_1ACA8B:: @ 81ACA8B
+SevenIsland_SevaultCanyon_EventScript_Evan:: @ 81ACA8B
-	trainerbattle_single TRAINER_TAMER_EVAN, Text_18C8FD, Text_18C980
+	trainerbattle_single TRAINER_TAMER_EVAN, SevenIsland_SevaultCanyon_Text_EvanIntro, SevenIsland_SevaultCanyon_Text_EvanDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1ACAB2
+	goto_if_eq SevenIsland_SevaultCanyon_EventScript_EvanRematch
-	msgbox Text_18C999, MSGBOX_AUTOCLOSE
+	msgbox SevenIsland_SevaultCanyon_Text_EvanPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1ACAB2:: @ 81ACAB2
+SevenIsland_SevaultCanyon_EventScript_EvanRematch:: @ 81ACAB2
-	trainerbattle_rematch TRAINER_TAMER_EVAN, Text_1C44CB, Text_18C980
+	trainerbattle_rematch TRAINER_TAMER_EVAN, SevenIsland_SevaultCanyon_Text_EvanRematchIntro, SevenIsland_SevaultCanyon_Text_EvanDefeat
-	msgbox Text_18C999, MSGBOX_AUTOCLOSE
+	msgbox SevenIsland_SevaultCanyon_Text_EvanPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SevenIsland_SevaultCanyon_EventScript_1ACAC9:: @ 81ACAC9
+SevenIsland_SevaultCanyon_EventScript_Jackson:: @ 81ACAC9
-	trainerbattle_single TRAINER_PKMN_RANGER_JACKSON, Text_18CA2F, Text_18CA6F
+	trainerbattle_single TRAINER_PKMN_RANGER_JACKSON, SevenIsland_SevaultCanyon_Text_JacksonIntro, SevenIsland_SevaultCanyon_Text_JacksonDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1ACAF0
+	goto_if_eq SevenIsland_SevaultCanyon_EventScript_JacksonRematch
-	msgbox Text_18CA9C, MSGBOX_AUTOCLOSE
+	msgbox SevenIsland_SevaultCanyon_Text_JacksonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1ACAF0:: @ 81ACAF0
+SevenIsland_SevaultCanyon_EventScript_JacksonRematch:: @ 81ACAF0
-	trainerbattle_rematch TRAINER_PKMN_RANGER_JACKSON, Text_1C454E, Text_18CA6F
+	trainerbattle_rematch TRAINER_PKMN_RANGER_JACKSON, SevenIsland_SevaultCanyon_Text_JacksonRematchIntro, SevenIsland_SevaultCanyon_Text_JacksonDefeat
-	msgbox Text_18CA9C, MSGBOX_AUTOCLOSE
+	msgbox SevenIsland_SevaultCanyon_Text_JacksonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SevenIsland_SevaultCanyon_EventScript_1ACB07:: @ 81ACB07
+SevenIsland_SevaultCanyon_EventScript_Katelyn:: @ 81ACB07
-	trainerbattle_single TRAINER_PKMN_RANGER_KATELYN, Text_18CB16, Text_18CB3E
+	trainerbattle_single TRAINER_PKMN_RANGER_KATELYN, SevenIsland_SevaultCanyon_Text_KatelynIntro, SevenIsland_SevaultCanyon_Text_KatelynDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1ACB2E
+	goto_if_eq SevenIsland_SevaultCanyon_EventScript_KatelynRematch
-	msgbox Text_18CB6C, MSGBOX_AUTOCLOSE
+	msgbox SevenIsland_SevaultCanyon_Text_KatelynPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1ACB2E:: @ 81ACB2E
+SevenIsland_SevaultCanyon_EventScript_KatelynRematch:: @ 81ACB2E
-	trainerbattle_rematch TRAINER_PKMN_RANGER_KATELYN, Text_1C458E, Text_18CB3E
+	trainerbattle_rematch TRAINER_PKMN_RANGER_KATELYN, SevenIsland_SevaultCanyon_Text_KatelynRematchIntro, SevenIsland_SevaultCanyon_Text_KatelynDefeat
-	msgbox Text_18CB6C, MSGBOX_AUTOCLOSE
+	msgbox SevenIsland_SevaultCanyon_Text_KatelynPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SevenIsland_SevaultCanyon_EventScript_1ACB45:: @ 81ACB45
+SevenIsland_SevaultCanyon_EventScript_Leroy:: @ 81ACB45
-	trainerbattle_single TRAINER_COOLTRAINER_LEROY, Text_18CBB4, Text_18CBE0
+	trainerbattle_single TRAINER_COOLTRAINER_LEROY, SevenIsland_SevaultCanyon_Text_LeroyIntro, SevenIsland_SevaultCanyon_Text_LeroyDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1ACB6C
+	goto_if_eq SevenIsland_SevaultCanyon_EventScript_LeroyRematch
-	msgbox Text_18CC09, MSGBOX_AUTOCLOSE
+	msgbox SevenIsland_SevaultCanyon_Text_LeroyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1ACB6C:: @ 81ACB6C
+SevenIsland_SevaultCanyon_EventScript_LeroyRematch:: @ 81ACB6C
-	trainerbattle_rematch TRAINER_COOLTRAINER_LEROY, Text_1C45C2, Text_18CBE0
+	trainerbattle_rematch TRAINER_COOLTRAINER_LEROY, SevenIsland_SevaultCanyon_Text_LeroyRematchIntro, SevenIsland_SevaultCanyon_Text_LeroyDefeat
-	msgbox Text_18CC09, MSGBOX_AUTOCLOSE
+	msgbox SevenIsland_SevaultCanyon_Text_LeroyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SevenIsland_SevaultCanyon_EventScript_1ACB83:: @ 81ACB83
+SevenIsland_SevaultCanyon_EventScript_Michelle:: @ 81ACB83
-	trainerbattle_single TRAINER_COOLTRAINER_MICHELLE, Text_18CC4F, Text_18CCAE
+	trainerbattle_single TRAINER_COOLTRAINER_MICHELLE, SevenIsland_SevaultCanyon_Text_MichelleIntro, SevenIsland_SevaultCanyon_Text_MichelleDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1ACBAA
+	goto_if_eq SevenIsland_SevaultCanyon_EventScript_MichelleRematch
-	msgbox Text_18CCEA, MSGBOX_AUTOCLOSE
+	msgbox SevenIsland_SevaultCanyon_Text_MichellePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1ACBAA:: @ 81ACBAA
+SevenIsland_SevaultCanyon_EventScript_MichelleRematch:: @ 81ACBAA
-	trainerbattle_rematch TRAINER_COOLTRAINER_MICHELLE, Text_1C45FB, Text_18CCAE
+	trainerbattle_rematch TRAINER_COOLTRAINER_MICHELLE, SevenIsland_SevaultCanyon_Text_MichelleRematchIntro, SevenIsland_SevaultCanyon_Text_MichelleDefeat
-	msgbox Text_18CCEA, MSGBOX_AUTOCLOSE
+	msgbox SevenIsland_SevaultCanyon_Text_MichellePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SevenIsland_SevaultCanyon_EventScript_1ACBC1:: @ 81ACBC1
+SevenIsland_SevaultCanyon_EventScript_Lex:: @ 81ACBC1
-	trainerbattle_double TRAINER_COOL_COUPLE_LEX_NYA, Text_18CD49, Text_18CD75, Text_18CDE2
+	trainerbattle_double TRAINER_COOL_COUPLE_LEX_NYA, SevenIsland_SevaultCanyon_Text_LexIntro, SevenIsland_SevaultCanyon_Text_LexDefeat, SevenIsland_SevaultCanyon_Text_LexNotEnoughMons
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1ACBEC
+	goto_if_eq SevenIsland_SevaultCanyon_EventScript_LexRematch
-	msgbox Text_18CD9C, MSGBOX_AUTOCLOSE
+	msgbox SevenIsland_SevaultCanyon_Text_LexPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1ACBEC:: @ 81ACBEC
+SevenIsland_SevaultCanyon_EventScript_LexRematch:: @ 81ACBEC
-	trainerbattle_rematch_double TRAINER_COOL_COUPLE_LEX_NYA, Text_1C4662, Text_18CD75, Text_18CDE2
+	trainerbattle_rematch_double TRAINER_COOL_COUPLE_LEX_NYA, SevenIsland_SevaultCanyon_Text_LexRematchIntro, SevenIsland_SevaultCanyon_Text_LexDefeat, SevenIsland_SevaultCanyon_Text_LexNotEnoughMons
-	msgbox Text_18CD9C, MSGBOX_AUTOCLOSE
+	msgbox SevenIsland_SevaultCanyon_Text_LexPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SevenIsland_SevaultCanyon_EventScript_1ACC07:: @ 81ACC07
+SevenIsland_SevaultCanyon_EventScript_Nya:: @ 81ACC07
-	trainerbattle_double TRAINER_COOL_COUPLE_LEX_NYA, Text_18CE20, Text_18CE5A, Text_18CEF4
+	trainerbattle_double TRAINER_COOL_COUPLE_LEX_NYA, SevenIsland_SevaultCanyon_Text_NyaIntro, SevenIsland_SevaultCanyon_Text_NyaDefeat, SevenIsland_SevaultCanyon_Text_NyaNotEnoughMons
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq EventScript_1ACC32
+	goto_if_eq SevenIsland_SevaultCanyon_EventScript_NyaRematch
-	msgbox Text_18CE78, MSGBOX_AUTOCLOSE
+	msgbox SevenIsland_SevaultCanyon_Text_NyaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1ACC32:: @ 81ACC32
+SevenIsland_SevaultCanyon_EventScript_NyaRematch:: @ 81ACC32
-	trainerbattle_rematch_double TRAINER_COOL_COUPLE_LEX_NYA, Text_1C4699, Text_18CE5A, Text_18CEF4
+	trainerbattle_rematch_double TRAINER_COOL_COUPLE_LEX_NYA, SevenIsland_SevaultCanyon_Text_NyaRematchIntro, SevenIsland_SevaultCanyon_Text_NyaDefeat, SevenIsland_SevaultCanyon_Text_NyaNotEnoughMons
-	msgbox Text_18CE78, MSGBOX_AUTOCLOSE
+	msgbox SevenIsland_SevaultCanyon_Text_NyaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
 SevenIsland_TanobyRuins_EventScript_Brandon:: @ 81ACC4D
 	trainerbattle_single TRAINER_RUIN_MANIAC_BRANDON, SevenIsland_TanobyRuins_Text_BrandonIntro, SevenIsland_TanobyRuins_Text_BrandonDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq SevenIsland_TanobyRuins_EventScript_RematchBrandon
+	goto_if_eq SevenIsland_TanobyRuins_EventScript_BrandonRematch
 	msgbox SevenIsland_TanobyRuins_Text_BrandonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SevenIsland_TanobyRuins_EventScript_RematchBrandon:: @ 81ACC74
+SevenIsland_TanobyRuins_EventScript_BrandonRematch:: @ 81ACC74
 	trainerbattle_rematch TRAINER_RUIN_MANIAC_BRANDON, SevenIsland_TanobyRuins_Text_BrandonRematchIntro, SevenIsland_TanobyRuins_Text_BrandonDefeat
 	msgbox SevenIsland_TanobyRuins_Text_BrandonPostBattle, MSGBOX_AUTOCLOSE
 	end
@@ -3005,11 +3005,11 @@ SevenIsland_TanobyRuins_EventScript_Benjamin:: @ 81ACC8B
 	trainerbattle_single TRAINER_RUIN_MANIAC_BENJAMIN, SevenIsland_TanobyRuins_Text_BenjaminIntro, SevenIsland_TanobyRuins_Text_BenjaminDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq SevenIsland_TanobyRuins_EventScript_RematchBenjamin
+	goto_if_eq SevenIsland_TanobyRuins_EventScript_BenjaminRematch
 	msgbox SevenIsland_TanobyRuins_Text_BenjaminPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SevenIsland_TanobyRuins_EventScript_RematchBenjamin:: @ 81ACCB2
+SevenIsland_TanobyRuins_EventScript_BenjaminRematch:: @ 81ACCB2
 	trainerbattle_rematch TRAINER_RUIN_MANIAC_BENJAMIN, SevenIsland_TanobyRuins_Text_BenjaminRematchIntro, SevenIsland_TanobyRuins_Text_BenjaminDefeat
 	msgbox SevenIsland_TanobyRuins_Text_BenjaminPostBattle, MSGBOX_AUTOCLOSE
 	end
@@ -3018,11 +3018,11 @@ SevenIsland_TanobyRuins_EventScript_Edna:: @ 81ACCC9
 	trainerbattle_single TRAINER_PAINTER_EDNA, SevenIsland_TanobyRuins_Text_EdnaIntro, SevenIsland_TanobyRuins_Text_EdnaDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq SevenIsland_TanobyRuins_EventScript_RematchEdna
+	goto_if_eq SevenIsland_TanobyRuins_EventScript_EdnaRematch
 	msgbox SevenIsland_TanobyRuins_Text_EdnaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SevenIsland_TanobyRuins_EventScript_RematchEdna:: @ 81ACCF0
+SevenIsland_TanobyRuins_EventScript_EdnaRematch:: @ 81ACCF0
 	trainerbattle_rematch TRAINER_PAINTER_EDNA, SevenIsland_TanobyRuins_Text_EdnaRematchIntro, SevenIsland_TanobyRuins_Text_EdnaDefeat
 	msgbox SevenIsland_TanobyRuins_Text_EdnaPostBattle, MSGBOX_AUTOCLOSE
 	end
@@ -3031,11 +3031,11 @@ SevenIsland_TanobyRuins_EventScript_Clifford:: @ 81ACD07
 	trainerbattle_single TRAINER_GENTLEMAN_CLIFFORD, SevenIsland_TanobyRuins_Text_CliffordIntro, SevenIsland_TanobyRuins_Text_CliffordDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
-	goto_if_eq SevenIsland_TanobyRuins_EventScript_RematchClifford
+	goto_if_eq SevenIsland_TanobyRuins_EventScript_CliffordRematch
 	msgbox SevenIsland_TanobyRuins_Text_CliffordPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SevenIsland_TanobyRuins_EventScript_RematchClifford:: @ 81ACD2E
+SevenIsland_TanobyRuins_EventScript_CliffordRematch:: @ 81ACD2E
 	trainerbattle_rematch TRAINER_GENTLEMAN_CLIFFORD, SevenIsland_TanobyRuins_Text_CliffordRematchIntro, SevenIsland_TanobyRuins_Text_CliffordDefeat
 	msgbox SevenIsland_TanobyRuins_Text_CliffordPostBattle, MSGBOX_AUTOCLOSE
 	end

data/specials.inc

@@ -243,7 +243,7 @@ gSpecials:: @ 815FD60
 	def_special ChooseNextBattleTowerTrainer
 	def_special CheckPartyBattleTowerBanlist
 	def_special PrintBattleTowerTrainerGreeting
-	def_special PrintEReaderTrainerGreeting
+	def_special BufferEReaderTrainerGreeting
 	def_special StartSpecialBattle
 	def_special SetBattleTowerProperty
 	def_special BattleTowerUtil
@@ -293,7 +293,7 @@ gSpecials:: @ 815FD60
 	def_special nullsub_75
 	def_special nullsub_75
 	def_special nullsub_75
-	def_special Special_BufferEReaderTrainerName5
+	def_special BufferEReaderTrainerName
 	def_special Special_GetRandomSlotMachine
 	def_special GetPlayerFacingDirection
 	def_special nullsub_75

data/text/fame_checker.inc

@@ -1445,7 +1445,7 @@ PokemonJournal_Text_SpecialFeatureBruno:: @ 81B1913
 	.string "FOUR out of his burning ambition to\l"
 	.string "battle the best TRAINERS.$"
 
-gUnknown_81B19A8:: @ 81B19A8
+PokemonJournal_Text_SpecialFeatureAgatha:: @ 81B19A8
 	.string "POKéMON JOURNAL\p"
 	.string "Special Feature:\n"
 	.string "ELITE FOUR's AGATHA!\p"

data/text/trainers.inc

@@ -844,148 +844,148 @@ FiveIsland_MemorialPillar_Text_HaroldRematchIntro:: @ 81C3E6A
 	.string "I love birds for their down.\n"
 	.string "I didn't think I'd see you again!$"
 
-Text_1C3ED0:: @ 81C3ED0
+SixIsland_OutcastIsland_Text_TylorRematchIntro:: @ 81C3ED0
 	.string "I'm still having no luck at all.\n"
 	.string "A battle'd be a change of pace!$"
 
-Text_1C3F11:: @ 81C3F11
+SixIsland_OutcastIsland_Text_MymoRematchIntro:: @ 81C3F11
 	.string "Gasp… Gasp…\p"
 	.string "I swam here from SIX ISLAND's port\n"
 	.string "in one go again.$"
 
-Text_1C3F51:: @ 81C3F51
+SixIsland_OutcastIsland_Text_NicoleRematchIntro:: @ 81C3F51
 	.string "You always come along while I'm\n"
 	.string "swimming.$"
 
-Text_1C3F7B:: @ 81C3F7B
+SixIsland_OutcastIsland_Text_AvaRematchIntro:: @ 81C3F7B
 	.string "AVA: Let's have another\n"
 	.string "two-on-two marine battle today!$"
 
-Text_1C3FB3:: @ 81C3FB3
+SixIsland_OutcastIsland_Text_GebRematchIntro:: @ 81C3FB3
 	.string "GEB: My big sister and I are way\n"
 	.string "tougher than before!$"
 
-Text_1C3FE9:: @ 81C3FE9
+SixIsland_GreenPath_Text_JaclynRematchIntro:: @ 81C3FE9
 	.string "…Huh?\p"
 	.string "I envision my house, but TELEPORT\n"
 	.string "always brings me here!$"
 
-Text_1C4028:: @ 81C4028
+SixIsland_WaterPath_Text_RoseRematchIntro:: @ 81C4028
 	.string "Oh, hello.\n"
 	.string "A pleasant breeze is blowing again.$"
 
-Text_1C4057:: @ 81C4057
+SixIsland_WaterPath_Text_EdwardRematchIntro:: @ 81C4057
 	.string "Hehehe, I'm practicing in secret\n"
 	.string "again.$"
 
-Text_1C407F:: @ 81C407F
+SixIsland_WaterPath_Text_SamirRematchIntro:: @ 81C407F
 	.string "What, you're sick of seeing\n"
 	.string "SWIMMERS like me?\p"
 	.string "Aww, don't be hatin'!\n"
 	.string "Battle with me again.$"
 
-Text_1C40D9:: @ 81C40D9
+SixIsland_WaterPath_Text_DeniseRematchIntro:: @ 81C40D9
 	.string "Sigh…\n"
 	.string "My boyfriend's busy again…$"
 
-Text_1C40FA:: @ 81C40FA
+SixIsland_WaterPath_Text_EarlRematchIntro:: @ 81C40FA
 	.string "Come on, tell me, where are the\n"
 	.string "mountains around these parts?$"
 
-Text_1C4138:: @ 81C4138
+SixIsland_WaterPath_Text_MiuRematchIntro:: @ 81C4138
 	.string "MIU: Hello, POKéMON!\n"
 	.string "It's time to play again!$"
 
-Text_1C4166:: @ 81C4166
+SixIsland_WaterPath_Text_MiaRematchIntro:: @ 81C4166
 	.string "MIA: Hello, POKéMON!\n"
 	.string "It's time to battle again!$"
 
-Text_1C4196:: @ 81C4196
+SixIsland_RuinValley_Text_StanlyRematchIntro:: @ 81C4196
 	.string "There appear to be many secrets\n"
 	.string "still unsolved in this world.$"
 
-Text_1C41D4:: @ 81C41D4
+SixIsland_RuinValley_Text_FosterRematchIntro:: @ 81C41D4
 	.string "Hi, didn't we meet before?\n"
 	.string "What compelled you to come back?$"
 
-Text_1C4210:: @ 81C4210
+SixIsland_RuinValley_Text_LarryRematchIntro:: @ 81C4210
 	.string "It's been said that there are\n"
 	.string "mysterious stones on this island.\p"
 	.string "Have you discovered anything since\n"
 	.string "we last met?$"
 
-Text_1C4280:: @ 81C4280
+SixIsland_RuinValley_Text_DarylRematchIntro:: @ 81C4280
 	.string "A rematch with you, so high up!$"
 
-Text_1C42A0:: @ 81C42A0
+SixIsland_RuinValley_Text_HectorRematchIntro:: @ 81C42A0
 	.string "I'm pretty familiar with the land\n"
 	.string "around these parts.$"
 
-Text_1C42D6:: @ 81C42D6
+SevenIsland_TrainerTower_Text_DarioRematchIntro:: @ 81C42D6
 	.string "I sensed your approach.$"
 
-Text_1C42EE:: @ 81C42EE
+SevenIsland_TrainerTower_Text_RodetteRematchIntro:: @ 81C42EE
 	.string "Somewhere on this island, peculiar\n"
 	.string "POKéMON are sleeping.$"
 
-Text_1C4327:: @ 81C4327
+SevenIsland_SevaultCanyon_Entrance_Text_MiahRematchIntro:: @ 81C4327
 	.string "Kyahaha!\p"
 	.string "Coming back won't change a thing.\n"
 	.string "I'll flick you away effortlessly!$"
 
-Text_1C4374:: @ 81C4374
+SevenIsland_SevaultCanyon_Entrance_Text_MasonRematchIntro:: @ 81C4374
 	.string "Howdy! You're a member of my\n"
 	.string "fan club, isn't that right?$"
 
-Text_1C43AD:: @ 81C43AD
+SevenIsland_SevaultCanyon_Entrance_Text_NicolasRematchIntro:: @ 81C43AD
 	.string "This island is too spread out…\n"
 	.string "Patrolling the place is a drag…$"
 
-Text_1C43EC:: @ 81C43EC
+SevenIsland_SevaultCanyon_Entrance_Text_MadelineRematchIntro:: @ 81C43EC
 	.string "I don't forgive people who abuse\n"
 	.string "POKéMON!$"
 
-Text_1C4416:: @ 81C4416
+SevenIsland_SevaultCanyon_Entrance_Text_EveRematchIntro:: @ 81C4416
 	.string "EVE: I'll team up with JON and\n"
 	.string "battle together again.$"
 
-Text_1C444C:: @ 81C444C
+SevenIsland_SevaultCanyon_Entrance_Text_JonRematchIntro:: @ 81C444C
 	.string "JON: When I'm with EVE, it feels\n"
 	.string "like we could never lose, not ever.$"
 
-Text_1C4491:: @ 81C4491
+SevenIsland_SevaultCanyon_Text_CyndyRematchIntro:: @ 81C4491
 	.string "Let's have another battle.\n"
 	.string "My conditioning's in top form!$"
 
-Text_1C44CB:: @ 81C44CB
+SevenIsland_SevaultCanyon_Text_EvanRematchIntro:: @ 81C44CB
 	.string "It doesn't matter if you happen to\n"
 	.string "have the strongest POKéMON…\p"
 	.string "It doesn't mean a thing if you don't\n"
 	.string "know how to use them properly!$"
 
-Text_1C454E:: @ 81C454E
+SevenIsland_SevaultCanyon_Text_JacksonRematchIntro:: @ 81C454E
 	.string "I work to protect the environment.\n"
 	.string "In turn, nature protects me!$"
 
-Text_1C458E:: @ 81C458E
+SevenIsland_SevaultCanyon_Text_KatelynRematchIntro:: @ 81C458E
 	.string "Every time we meet, you have those\n"
 	.string "snazzy shoes on.$"
 
-Text_1C45C2:: @ 81C45C2
+SevenIsland_SevaultCanyon_Text_LeroyRematchIntro:: @ 81C45C2
 	.string "You must have gotten tougher.\n"
 	.string "Let me battle you, please!$"
 
-Text_1C45FB:: @ 81C45FB
+SevenIsland_SevaultCanyon_Text_MichelleRematchIntro:: @ 81C45FB
 	.string "I was given the best possible\n"
 	.string "education to become this strong.\p"
 	.string "I won't lose this time.\n"
 	.string "Absolutely not!$"
 
-Text_1C4662:: @ 81C4662
+SevenIsland_SevaultCanyon_Text_LexRematchIntro:: @ 81C4662
 	.string "LEX: My darling NYA, together\n"
 	.string "we will win for certain!$"
 
-Text_1C4699:: @ 81C4699
+SevenIsland_SevaultCanyon_Text_NyaRematchIntro:: @ 81C4699
 	.string "NYA: I won't drag down my mentor\n"
 	.string "LEX! We're going to win!$"
 

include/constants/metatile_labels.h

@@ -194,4 +194,8 @@
 #define METATILE_SeviiIslands45_RocketWarehouseDoor_Locked    0x30B
 #define METATILE_SeviiIslands45_RocketWarehouseDoor_Unlocked  0x2AF
 
+// gTileset_SeviiIslands67
+#define METATILE_SeviiIslands67_DottedHoleDoor_Closed    0x357
+#define METATILE_SeviiIslands67_DottedHoleDoor_Open      0x358
+
 #endif // GUARD_METATILE_LABELS_H

src/battle_tower.c

@@ -825,7 +825,7 @@ void CheckPartyBattleTowerBanlist(void)
     }
 }
 
-static void PrintBattleTowerTrainerMessage(const u16 *greeting)
+static void BufferBattleTowerTrainerMessage(const u16 *greeting)
 {
     s32 i;
     if (EC_DoesEasyChatStringFitOnLine(greeting, 3, 2, 18))
@@ -847,11 +847,11 @@ static void PrintBattleTowerTrainerMessage(const u16 *greeting)
 void PrintBattleTowerTrainerGreeting(void)
 {
     if (gSaveBlock2Ptr->battleTower.battleTowerTrainerId == BATTLE_TOWER_EREADER_TRAINER_ID)
-        PrintBattleTowerTrainerMessage(gSaveBlock2Ptr->battleTower.ereaderTrainer.greeting);
+        BufferBattleTowerTrainerMessage(gSaveBlock2Ptr->battleTower.ereaderTrainer.greeting);
     else if (gSaveBlock2Ptr->battleTower.battleTowerTrainerId < BATTLE_TOWER_RECORD_MIXING_TRAINER_BASE_ID)
-        PrintBattleTowerTrainerMessage(gBattleTowerTrainers[gSaveBlock2Ptr->battleTower.battleTowerTrainerId].greeting);
+        BufferBattleTowerTrainerMessage(gBattleTowerTrainers[gSaveBlock2Ptr->battleTower.battleTowerTrainerId].greeting);
     else
-        PrintBattleTowerTrainerMessage(gSaveBlock2Ptr->battleTower.records[gSaveBlock2Ptr->battleTower.battleTowerTrainerId - BATTLE_TOWER_RECORD_MIXING_TRAINER_BASE_ID].greeting);
+        BufferBattleTowerTrainerMessage(gSaveBlock2Ptr->battleTower.records[gSaveBlock2Ptr->battleTower.battleTowerTrainerId - BATTLE_TOWER_RECORD_MIXING_TRAINER_BASE_ID].greeting);
 }
 
 static void CB2_FinishEReaderBattle(void)
@@ -1395,9 +1395,9 @@ void ClearEReaderTrainer(struct BattleTowerEReaderTrainer *ereaderTrainer)
         ((u32 *)ereaderTrainer)[i] = 0;
 }
 
-void PrintEReaderTrainerGreeting(void)
+void BufferEReaderTrainerGreeting(void)
 {
-    PrintBattleTowerTrainerMessage(gSaveBlock2Ptr->battleTower.ereaderTrainer.greeting);
+    BufferBattleTowerTrainerMessage(gSaveBlock2Ptr->battleTower.ereaderTrainer.greeting);
 }
 
 static void PrintEReaderTrainerFarewellMessage(void)
@@ -1405,9 +1405,9 @@ static void PrintEReaderTrainerFarewellMessage(void)
     if (gBattleOutcome == B_OUTCOME_DREW)
         gStringVar4[0] = EOS;
     else if (gBattleOutcome == B_OUTCOME_WON)
-        PrintBattleTowerTrainerMessage(gSaveBlock2Ptr->battleTower.ereaderTrainer.farewellPlayerWon);
+        BufferBattleTowerTrainerMessage(gSaveBlock2Ptr->battleTower.ereaderTrainer.farewellPlayerWon);
     else
-        PrintBattleTowerTrainerMessage(gSaveBlock2Ptr->battleTower.ereaderTrainer.farewellPlayerLost);
+        BufferBattleTowerTrainerMessage(gSaveBlock2Ptr->battleTower.ereaderTrainer.farewellPlayerLost);
 }
 
 void Dummy_TryEnableBravoTrainerBattleTower(void)

src/field_specials.c

@@ -326,7 +326,7 @@ void RemoveCameraObject(void)
     RemoveObjectEventByLocalIdAndMap(127, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup);
 }
 
-void Special_BufferEReaderTrainerName5(void)
+void BufferEReaderTrainerName(void)
 {
     CopyEReaderTrainerName5(gStringVar1);
 }