Document Rocket Warehouse script

4 files changed, 151 insertions, 139 deletions

diff --git a/data/maps/FiveIsland_RocketWarehouse/map.json b/data/maps/FiveIsland_RocketWarehouse/map.json
index def5fa6fd..58ca4c535 100644
--- a/data/maps/FiveIsland_RocketWarehouse/map.json
+++ b/data/maps/FiveIsland_RocketWarehouse/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163FE6",
+      "script": "FiveIsland_RocketWarehouse_EventScript_Grunt2",
       "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 1,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163FFD",
+      "script": "FiveIsland_RocketWarehouse_EventScript_Grunt3",
       "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "FiveIsland_RocketWarehouse_EventScript_164087",
+      "script": "FiveIsland_RocketWarehouse_EventScript_Admin1",
       "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "FiveIsland_RocketWarehouse_EventScript_164014",
+      "script": "FiveIsland_RocketWarehouse_EventScript_Admin2",
       "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS"
     },
     {
@@ -75,7 +75,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "FiveIsland_RocketWarehouse_EventScript_164070",
+      "script": "FiveIsland_RocketWarehouse_EventScript_Grunt1",
       "flag": "FLAG_HIDE_FIVE_ISLAND_ROCKETS"
     },
     {
@@ -88,7 +88,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F93",
+      "script": "FiveIsland_RocketWarehouse_EventScript_Gideon",
       "flag": "0"
     },
     {
@@ -161,7 +161,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_ROCKET_WAREHOUSE",
       "var_value": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F81"
+      "script": "FiveIsland_RocketWarehouse_EventScript_Admin2Trigger"
     },
     {
       "type": "trigger",
@@ -170,7 +170,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_ROCKET_WAREHOUSE",
       "var_value": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F81"
+      "script": "FiveIsland_RocketWarehouse_EventScript_Admin2Trigger"
     },
     {
       "type": "trigger",
@@ -179,7 +179,7 @@
       "elevation": 3,
       "var": "VAR_MAP_SCENE_ROCKET_WAREHOUSE",
       "var_value": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F81"
+      "script": "FiveIsland_RocketWarehouse_EventScript_Admin2Trigger"
     }
   ],
   "bg_events": [
@@ -188,14 +188,14 @@
       "x": 11,
       "y": 2,
       "elevation": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+      "script": "FiveIsland_RocketWarehouse_EventScript_Cage"
     },
     {
       "type": "bg_event_type_3",
       "x": 26,
       "y": 11,
       "elevation": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F78"
+      "script": "FiveIsland_RocketWarehouse_EventScript_Computer"
     },
     {
       "type": "hidden_item",
@@ -222,147 +222,147 @@
       "x": 12,
       "y": 2,
       "elevation": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+      "script": "FiveIsland_RocketWarehouse_EventScript_Cage"
     },
     {
       "type": "bg_event_type_0",
       "x": 10,
       "y": 2,
       "elevation": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+      "script": "FiveIsland_RocketWarehouse_EventScript_Cage"
     },
     {
       "type": "bg_event_type_0",
       "x": 9,
       "y": 2,
       "elevation": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+      "script": "FiveIsland_RocketWarehouse_EventScript_Cage"
     },
     {
       "type": "bg_event_type_0",
       "x": 8,
       "y": 2,
       "elevation": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+      "script": "FiveIsland_RocketWarehouse_EventScript_Cage"
     },
     {
       "type": "bg_event_type_0",
       "x": 7,
       "y": 2,
       "elevation": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+      "script": "FiveIsland_RocketWarehouse_EventScript_Cage"
     },
     {
       "type": "bg_event_type_0",
       "x": 11,
       "y": 5,
       "elevation": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+      "script": "FiveIsland_RocketWarehouse_EventScript_Cage"
     },
     {
       "type": "bg_event_type_0",
       "x": 10,
       "y": 5,
       "elevation": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+      "script": "FiveIsland_RocketWarehouse_EventScript_Cage"
     },
     {
       "type": "bg_event_type_0",
       "x": 11,
       "y": 4,
       "elevation": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+      "script": "FiveIsland_RocketWarehouse_EventScript_Cage"
     },
     {
       "type": "bg_event_type_0",
       "x": 10,
       "y": 4,
       "elevation": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+      "script": "FiveIsland_RocketWarehouse_EventScript_Cage"
     },
     {
       "type": "bg_event_type_0",
       "x": 8,
       "y": 4,
       "elevation": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+      "script": "FiveIsland_RocketWarehouse_EventScript_Cage"
     },
     {
       "type": "bg_event_type_0",
       "x": 7,
       "y": 4,
       "elevation": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+      "script": "FiveIsland_RocketWarehouse_EventScript_Cage"
     },
     {
       "type": "bg_event_type_0",
       "x": 8,
       "y": 5,
       "elevation": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+      "script": "FiveIsland_RocketWarehouse_EventScript_Cage"
     },
     {
       "type": "bg_event_type_0",
       "x": 7,
       "y": 5,
       "elevation": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+      "script": "FiveIsland_RocketWarehouse_EventScript_Cage"
     },
     {
       "type": "bg_event_type_0",
       "x": 5,
       "y": 3,
       "elevation": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+      "script": "FiveIsland_RocketWarehouse_EventScript_Cage"
     },
     {
       "type": "bg_event_type_0",
       "x": 4,
       "y": 3,
       "elevation": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+      "script": "FiveIsland_RocketWarehouse_EventScript_Cage"
     },
     {
       "type": "bg_event_type_0",
       "x": 5,
       "y": 4,
       "elevation": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+      "script": "FiveIsland_RocketWarehouse_EventScript_Cage"
     },
     {
       "type": "bg_event_type_0",
       "x": 4,
       "y": 4,
       "elevation": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+      "script": "FiveIsland_RocketWarehouse_EventScript_Cage"
     },
     {
       "type": "bg_event_type_0",
       "x": 3,
       "y": 4,
       "elevation": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+      "script": "FiveIsland_RocketWarehouse_EventScript_Cage"
     },
     {
       "type": "bg_event_type_0",
       "x": 2,
       "y": 4,
       "elevation": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+      "script": "FiveIsland_RocketWarehouse_EventScript_Cage"
     },
     {
       "type": "bg_event_type_0",
       "x": 2,
       "y": 5,
       "elevation": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+      "script": "FiveIsland_RocketWarehouse_EventScript_Cage"
     },
     {
       "type": "bg_event_type_0",
       "x": 3,
       "y": 5,
       "elevation": 0,
-      "script": "FiveIsland_RocketWarehouse_EventScript_163F5A"
+      "script": "FiveIsland_RocketWarehouse_EventScript_Cage"
     }
   ]
 }
diff --git a/data/maps/FiveIsland_RocketWarehouse/scripts.inc b/data/maps/FiveIsland_RocketWarehouse/scripts.inc
index 8382d4a72..dfcb6e43f 100644
--- a/data/maps/FiveIsland_RocketWarehouse/scripts.inc
+++ b/data/maps/FiveIsland_RocketWarehouse/scripts.inc
@@ -1,3 +1,12 @@
+.equ LOCALID_GRUNT1, 5
+.equ LOCALID_GRUNT2, 1
+.equ LOCALID_GRUNT3, 2
+.equ LOCALID_ADMIN1, 3
+.equ LOCALID_ADMIN2, 4
+
+.equ PLAYER_X_POS, VAR_0x8004
+.equ PLAYER_Y_POS, VAR_0x8005
+
 FiveIsland_RocketWarehouse_MapScripts:: @ 8163F2E
 	map_script MAP_SCRIPT_ON_LOAD, FiveIsland_RocketWarehouse_OnLoad
 	map_script MAP_SCRIPT_ON_TRANSITION, FiveIsland_RocketWarehouse_OnTransition
@@ -8,82 +17,82 @@ FiveIsland_RocketWarehouse_OnTransition:: @ 8163F39
 	end
 
 FiveIsland_RocketWarehouse_OnLoad:: @ 8163F3D
-	call_if_defeated TRAINER_TEAM_ROCKET_ADMIN, EventScript_163F47
+	call_if_defeated TRAINER_TEAM_ROCKET_ADMIN, FiveIsland_RocketWarehouse_EventScript_SetArrowsForReEntry
 	end
 
-EventScript_163F47:: @ 8163F47
-	setmetatile 26, 20, 672, 0
-	setmetatile 27, 20, 672, 0
+FiveIsland_RocketWarehouse_EventScript_SetArrowsForReEntry:: @ 8163F47
+	setmetatile 26, 20, METATILE_Hideout_Arrow_Up, 0
+	setmetatile 27, 20, METATILE_Hideout_Arrow_Up, 0
 	return
 
-FiveIsland_RocketWarehouse_EventScript_163F5A:: @ 8163F5A
+FiveIsland_RocketWarehouse_EventScript_Cage:: @ 8163F5A
 	lockall
-	goto_if_set FLAG_DEFEATED_ROCKETS_IN_WAREHOUSE, EventScript_163F6E
-	msgbox gUnknown_817B4E3
+	goto_if_set FLAG_DEFEATED_ROCKETS_IN_WAREHOUSE, FiveIsland_RocketWarehouse_EventScript_CageUnlocked
+	msgbox FiveIsland_RocketWarehouse_Text_ManyMonsLockedInPen
 	releaseall
 	end
 
-EventScript_163F6E:: @ 8163F6E
-	msgbox gUnknown_817B512
+FiveIsland_RocketWarehouse_EventScript_CageUnlocked:: @ 8163F6E
+	msgbox FiveIsland_RocketWarehouse_Text_PenUnlockedMonsFled
 	releaseall
 	end
 
-FiveIsland_RocketWarehouse_EventScript_163F78:: @ 8163F78
-	msgbox gUnknown_817BB15, MSGBOX_SIGN
+FiveIsland_RocketWarehouse_EventScript_Computer:: @ 8163F78
+	msgbox FiveIsland_RocketWarehouse_Text_ReportWithGraphsAndText, MSGBOX_SIGN
 	end
 
-FiveIsland_RocketWarehouse_EventScript_163F81:: @ 8163F81
+FiveIsland_RocketWarehouse_EventScript_Admin2Trigger:: @ 8163F81
 	lockall
-	applymovement 4, Movement_WalkInPlaceFastestLeft
+	applymovement LOCALID_ADMIN2, Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	setvar VAR_MAP_SCENE_ROCKET_WAREHOUSE, 1
 	releaseall
 	end
 
-FiveIsland_RocketWarehouse_EventScript_163F93:: @ 8163F93
-	trainerbattle_single TRAINER_SCIENTIST_GIDEON, Text_17BBAF, Text_17BC55, EventScript_163FCD
-	goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_163FB7
-	msgbox gUnknown_817BCA3, MSGBOX_AUTOCLOSE
+FiveIsland_RocketWarehouse_EventScript_Gideon:: @ 8163F93
+	trainerbattle_single TRAINER_SCIENTIST_GIDEON, FiveIsland_RocketWarehouse_Text_GideonIntro, FiveIsland_RocketWarehouse_Text_GideonDefeat, FiveIsland_RocketWarehouse_EventScript_DefeatedGideon
+	goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, FiveIsland_RocketWarehouse_EventScript_MentionGiovannisKid
+	msgbox FiveIsland_RocketWarehouse_Text_GetLostLeaveMeBe, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_163FB7:: @ 8163FB7
+FiveIsland_RocketWarehouse_EventScript_MentionGiovannisKid:: @ 8163FB7
 	famechecker FAMECHECKER_GIOVANNI, 5
-	msgbox gUnknown_817BCD7, MSGBOX_AUTOCLOSE
+	msgbox FiveIsland_RocketWarehouse_Text_GiovannisKidHasRedHair, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_163FCD:: @ 8163FCD
-	msgbox gUnknown_817BC6C
+FiveIsland_RocketWarehouse_EventScript_DefeatedGideon:: @ 8163FCD
+	msgbox FiveIsland_RocketWarehouse_Text_GideonPostBattle
 	setflag FLAG_RECOVERED_SAPPHIRE
 	giveitem ITEM_SAPPHIRE
 	release
 	end
 
-FiveIsland_RocketWarehouse_EventScript_163FE6:: @ 8163FE6
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_47, Text_17B54D, Text_17B585
-	msgbox gUnknown_817B5A6, MSGBOX_AUTOCLOSE
+FiveIsland_RocketWarehouse_EventScript_Grunt2:: @ 8163FE6
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_47, FiveIsland_RocketWarehouse_Text_Grunt2Intro, FiveIsland_RocketWarehouse_Text_Grunt2Defeat
+	msgbox FiveIsland_RocketWarehouse_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-FiveIsland_RocketWarehouse_EventScript_163FFD:: @ 8163FFD
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_48, Text_17B677, Text_17B6D9
-	msgbox gUnknown_817B6EF, MSGBOX_AUTOCLOSE
+FiveIsland_RocketWarehouse_EventScript_Grunt3:: @ 8163FFD
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_48, FiveIsland_RocketWarehouse_Text_Grunt3Intro, FiveIsland_RocketWarehouse_Text_Grunt3Defeat
+	msgbox FiveIsland_RocketWarehouse_Text_Grunt3PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-FiveIsland_RocketWarehouse_EventScript_164014:: @ 8164014
-	trainerbattle_single TRAINER_TEAM_ROCKET_ADMIN_2, Text_17B8DA, Text_17B9FB, EventScript_16402F
-	msgbox gUnknown_817BA64, MSGBOX_AUTOCLOSE
+FiveIsland_RocketWarehouse_EventScript_Admin2:: @ 8164014
+	trainerbattle_single TRAINER_TEAM_ROCKET_ADMIN_2, FiveIsland_RocketWarehouse_Text_Admin2Intro, FiveIsland_RocketWarehouse_Text_Admin2Defeat, FiveIsland_RocketWarehouse_EventScript_DefeatedAdmin2
+	msgbox FiveIsland_RocketWarehouse_Text_Admin2PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_16402F:: @ 816402F
-	getplayerxy VAR_0x8004, VAR_0x8005
-	compare VAR_0x8004, 24
-	call_if_le EventScript_164065
-	msgbox gUnknown_817BA64
+FiveIsland_RocketWarehouse_EventScript_DefeatedAdmin2:: @ 816402F
+	getplayerxy PLAYER_X_POS, PLAYER_Y_POS
+	compare PLAYER_X_POS, 24
+	call_if_le FiveIsland_RocketWarehouse_EventScript_PlayerFaceAdmin2
+	msgbox FiveIsland_RocketWarehouse_Text_Admin2PostBattle
 	closemessage
 	fadescreen FADE_TO_BLACK
-	removeobject 1
-	removeobject 2
-	removeobject 4
-	removeobject 3
+	removeobject LOCALID_GRUNT2
+	removeobject LOCALID_GRUNT3
+	removeobject LOCALID_ADMIN2
+	removeobject LOCALID_ADMIN1
 	setflag FLAG_HIDE_FIVE_ISLAND_ROCKETS
 	fadescreen FADE_FROM_BLACK
 	setvar VAR_MAP_SCENE_ROCKET_WAREHOUSE, 1
@@ -91,91 +100,91 @@ EventScript_16402F:: @ 816402F
 	release
 	end
 
-EventScript_164065:: @ 8164065
+FiveIsland_RocketWarehouse_EventScript_PlayerFaceAdmin2:: @ 8164065
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	return
 
-FiveIsland_RocketWarehouse_EventScript_164070:: @ 8164070
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_42, Text_17B5D6, Text_17B62F
-	msgbox gUnknown_817B642, MSGBOX_AUTOCLOSE
+FiveIsland_RocketWarehouse_EventScript_Grunt1:: @ 8164070
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_42, FiveIsland_RocketWarehouse_Text_Grunt1Intro, FiveIsland_RocketWarehouse_Text_Grunt1Defeat
+	msgbox FiveIsland_RocketWarehouse_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-FiveIsland_RocketWarehouse_EventScript_164087:: @ 8164087
-	trainerbattle_single TRAINER_TEAM_ROCKET_ADMIN, Text_17B72D, Text_17B79C, EventScript_1640A2
-	msgbox gUnknown_817B7FA, MSGBOX_AUTOCLOSE
+FiveIsland_RocketWarehouse_EventScript_Admin1:: @ 8164087
+	trainerbattle_single TRAINER_TEAM_ROCKET_ADMIN, FiveIsland_RocketWarehouse_Text_Admin1Intro, FiveIsland_RocketWarehouse_Text_Admin1Defeat, FiveIsland_RocketWarehouse_EventScript_DefeatedAdmin1
+	msgbox FiveIsland_RocketWarehouse_Text_MadeItSoYouCanComeBackThrough, MSGBOX_AUTOCLOSE
 	end
 
-EventScript_1640A2:: @ 81640A2
-	getplayerxy VAR_0x8004, VAR_0x8005
+FiveIsland_RocketWarehouse_EventScript_DefeatedAdmin1:: @ 81640A2
+	getplayerxy PLAYER_X_POS, PLAYER_Y_POS
 	specialvar VAR_RESULT, GetPlayerFacingDirection
 	compare VAR_RESULT, DIR_NORTH
-	call_if_eq EventScript_16412E
-	msgbox gUnknown_817B7AE
+	call_if_eq FiveIsland_RocketWarehouse_EventScript_PlayerFaceAdmin1
+	msgbox FiveIsland_RocketWarehouse_Text_Admin1PostBattle
 	closemessage
-	compare VAR_0x8004, 24
-	call_if_le EventScript_164144
-	compare VAR_0x8004, 25
-	call_if_eq EventScript_16414F
-	compare VAR_0x8004, 26
-	call_if_eq EventScript_16415A
-	compare VAR_0x8004, 27
-	call_if_eq EventScript_16415A
+	compare PLAYER_X_POS, 24
+	call_if_le FiveIsland_RocketWarehouse_EventScript_AdminWalkToSwitchFar
+	compare PLAYER_X_POS, 25
+	call_if_eq FiveIsland_RocketWarehouse_EventScript_AdminWalkToSwitch
+	compare PLAYER_X_POS, 26
+	call_if_eq FiveIsland_RocketWarehouse_EventScript_AdminFaceSwitch
+	compare PLAYER_X_POS, 27
+	call_if_eq FiveIsland_RocketWarehouse_EventScript_AdminFaceSwitch
 	playse SE_PIN
-	call EventScript_163F47
+	call FiveIsland_RocketWarehouse_EventScript_SetArrowsForReEntry
 	special DrawWholeMapView
 	waitse
-	compare VAR_0x8004, 24
-	call_if_le EventScript_164165
-	compare VAR_0x8004, 25
-	call_if_eq EventScript_164165
-	compare VAR_0x8004, 26
-	call_if_eq EventScript_164165
-	compare VAR_0x8004, 27
-	call_if_eq EventScript_164170
-	msgbox gUnknown_817B7FA
+	compare PLAYER_X_POS, 24
+	call_if_le FiveIsland_RocketWarehouse_EventScript_AdminFacePlayerLeft
+	compare PLAYER_X_POS, 25
+	call_if_eq FiveIsland_RocketWarehouse_EventScript_AdminFacePlayerLeft
+	compare PLAYER_X_POS, 26
+	call_if_eq FiveIsland_RocketWarehouse_EventScript_AdminFacePlayerLeft
+	compare PLAYER_X_POS, 27
+	call_if_eq FiveIsland_RocketWarehouse_EventScript_AdminFacePlayerDown
+	msgbox FiveIsland_RocketWarehouse_Text_MadeItSoYouCanComeBackThrough
 	release
 	end
 
-EventScript_16412E:: @ 816412E
-	compare VAR_0x8004, 27
+FiveIsland_RocketWarehouse_EventScript_PlayerFaceAdmin1:: @ 816412E
+	compare PLAYER_X_POS, 27
 	goto_if_eq EventScript_Return
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	return
 
-EventScript_164144:: @ 8164144
-	applymovement 3, Movement_16417B
+FiveIsland_RocketWarehouse_EventScript_AdminWalkToSwitchFar:: @ 8164144
+	applymovement LOCALID_ADMIN1, FiveIsland_RocketWarehouse_Movement_AdminWalkToSwitchFar
 	waitmovement 0
 	return
 
-EventScript_16414F:: @ 816414F
-	applymovement 3, Movement_16417F
+FiveIsland_RocketWarehouse_EventScript_AdminWalkToSwitch:: @ 816414F
+	applymovement LOCALID_ADMIN1, FiveIsland_RocketWarehouse_Movement_AdminWalkToSwitch
 	waitmovement 0
 	return
 
-EventScript_16415A:: @ 816415A
-	applymovement 3, Movement_WalkInPlaceFastestUp
+FiveIsland_RocketWarehouse_EventScript_AdminFaceSwitch:: @ 816415A
+	applymovement LOCALID_ADMIN1, Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	return
 
-EventScript_164165:: @ 8164165
-	applymovement 3, Movement_WalkInPlaceFastestLeft
+FiveIsland_RocketWarehouse_EventScript_AdminFacePlayerLeft:: @ 8164165
+	applymovement LOCALID_ADMIN1, Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	return
 
-EventScript_164170:: @ 8164170
-	applymovement 3, Movement_WalkInPlaceFastestDown
+FiveIsland_RocketWarehouse_EventScript_AdminFacePlayerDown:: @ 8164170
+	applymovement LOCALID_ADMIN1, Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	return
 
-Movement_16417B:: @ 816417B
+FiveIsland_RocketWarehouse_Movement_AdminWalkToSwitchFar:: @ 816417B
 	walk_right
 	walk_right
 	walk_in_place_fastest_up
 	step_end
 
-Movement_16417F:: @ 816417F
+FiveIsland_RocketWarehouse_Movement_AdminWalkToSwitch:: @ 816417F
 	walk_right
 	walk_in_place_fastest_up
 	step_end
diff --git a/data/maps/FiveIsland_RocketWarehouse/text.inc b/data/maps/FiveIsland_RocketWarehouse/text.inc
index b77ebd7c8..de74a7e67 100644
--- a/data/maps/FiveIsland_RocketWarehouse/text.inc
+++ b/data/maps/FiveIsland_RocketWarehouse/text.inc
@@ -1,65 +1,65 @@
-gUnknown_817B4E3:: @ 817B4E3
+FiveIsland_RocketWarehouse_Text_ManyMonsLockedInPen:: @ 817B4E3
     .string "There are many POKéMON locked\n"
     .string "away in the pen…$"
 
-gUnknown_817B512:: @ 817B512
+FiveIsland_RocketWarehouse_Text_PenUnlockedMonsFled:: @ 817B512
     .string "The pen door is unlocked.\n"
     .string "The POKéMON appear to have fled.$"
 
-Text_17B54D:: @ 817B54D
+FiveIsland_RocketWarehouse_Text_Grunt2Intro:: @ 817B54D
     .string "Did you come here knowing it's\n"
     .string "TEAM ROCKET's WAREHOUSE?$"
 
-Text_17B585:: @ 817B585
+FiveIsland_RocketWarehouse_Text_Grunt2Defeat:: @ 817B585
     .string "What do you think you're doing?!$"
 
-gUnknown_817B5A6:: @ 817B5A6
+FiveIsland_RocketWarehouse_Text_Grunt2PostBattle:: @ 817B5A6
     .string "TEAM ROCKET broke up?\n"
     .string "What planet are you from?$"
 
-Text_17B5D6:: @ 817B5D6
+FiveIsland_RocketWarehouse_Text_Grunt1Intro:: @ 817B5D6
     .string "Oh, now your POKéMON look strong.\n"
     .string "You're willing to sell them?\p"
     .string "Oh?\n"
     .string "You wanted to battle?$"
 
-Text_17B62F:: @ 817B62F
+FiveIsland_RocketWarehouse_Text_Grunt1Defeat:: @ 817B62F
     .string "Oh, but…\n"
     .string "Too much!$"
 
-gUnknown_817B642:: @ 817B642
+FiveIsland_RocketWarehouse_Text_Grunt1PostBattle:: @ 817B642
     .string "We can give you a great price.\n"
     .string "Sell us your POKéMON!$"
 
-Text_17B677:: @ 817B677
+FiveIsland_RocketWarehouse_Text_Grunt3Intro:: @ 817B677
     .string "I got word about you from the\n"
     .string "others.\p"
     .string "But there's no way a kid like you'd\n"
     .string "know our BOSS GIOVANNI!$"
 
-Text_17B6D9:: @ 817B6D9
+FiveIsland_RocketWarehouse_Text_Grunt3Defeat:: @ 817B6D9
     .string "Don't…you…dare…laugh…$"
 
-gUnknown_817B6EF:: @ 817B6EF
+FiveIsland_RocketWarehouse_Text_Grunt3PostBattle:: @ 817B6EF
     .string "Don't mess in the doings of adults,\n"
     .string "you jumped-up pip-squeak!$"
 
-Text_17B72D:: @ 817B72D
+FiveIsland_RocketWarehouse_Text_Admin1Intro:: @ 817B72D
     .string "I don't know or care if what I'm\n"
     .string "doing is right or wrong…\p"
     .string "I just put my faith in GIOVANNI\n"
     .string "and do as I am told.$"
 
-Text_17B79C:: @ 817B79C
+FiveIsland_RocketWarehouse_Text_Admin1Defeat:: @ 817B79C
     .string "I…\n"
     .string "I'm shattered…$"
 
-gUnknown_817B7AE:: @ 817B7AE
+FiveIsland_RocketWarehouse_Text_Admin1PostBattle:: @ 817B7AE
     .string "You're doing things according to\n"
     .string "your beliefs and morals.\p"
     .string "I understand now…$"
 
-gUnknown_817B7FA:: @ 817B7FA
+FiveIsland_RocketWarehouse_Text_MadeItSoYouCanComeBackThrough:: @ 817B7FA
     .string "I've made it so you can come back\n"
     .string "in through there.\p"
     .string "Why don't you go get rested and\n"
@@ -69,7 +69,7 @@ gUnknown_817B7FA:: @ 817B7FA
     .string "You'd better steel yourself for one\n"
     .string "harsh challenge.$"
 
-Text_17B8DA:: @ 817B8DA
+FiveIsland_RocketWarehouse_Text_Admin2Intro:: @ 817B8DA
     .string "That's quite enough of you \n"
     .string "playing the hero, kid.\p"
     .string "Spreading lies about how TEAM\n"
@@ -81,7 +81,7 @@ Text_17B8DA:: @ 817B8DA
     .string "And now, I'll show you how scary\n"
     .string "an angry adult can be!$"
 
-Text_17B9FB:: @ 817B9FB
+FiveIsland_RocketWarehouse_Text_Admin2Defeat:: @ 817B9FB
     .string "Urgh…\n"
     .string "You were too strong…\p"
     .string "…\n"
@@ -89,7 +89,7 @@ Text_17B9FB:: @ 817B9FB
     .string "So it's true?\n"
     .string "TEAM ROCKET really has disbanded?$"
 
-gUnknown_817BA64:: @ 817BA64
+FiveIsland_RocketWarehouse_Text_Admin2PostBattle:: @ 817BA64
     .string "We will abandon this WAREHOUSE…\p"
     .string "But don't think this is over.\n"
     .string "I won't let this be the end.\p"
@@ -98,7 +98,7 @@ gUnknown_817BA64:: @ 817BA64
     .string "I will…\p"
     .string "Until then, farewell!$"
 
-gUnknown_817BB15:: @ 817BB15
+FiveIsland_RocketWarehouse_Text_ReportWithGraphsAndText:: @ 817BB15
     .string "A report with graphs and text is on\n"
     .string "the PC monitor.\p"
     .string "“The Influence of Magnetic Waves\n"
@@ -106,7 +106,7 @@ gUnknown_817BB15:: @ 817BB15
     .string "… … … … … …\p"
     .string "It's too difficult to understand…$"
 
-Text_17BBAF:: @ 817BBAF
+FiveIsland_RocketWarehouse_Text_GideonIntro:: @ 817BBAF
     .string "I almost managed to sell the\n"
     .string "SAPPHIRE for huge money…\p"
     .string "Then, you just had to come along\n"
@@ -114,19 +114,19 @@ Text_17BBAF:: @ 817BBAF
     .string "Fufu… Fufufufu…\n"
     .string "There's no forgiveness for you!$"
 
-Text_17BC55:: @ 817BC55
+FiveIsland_RocketWarehouse_Text_GideonDefeat:: @ 817BC55
     .string "Gah! Darn!\n"
     .string "Darn! Darn!$"
 
-gUnknown_817BC6C:: @ 817BC6C
+FiveIsland_RocketWarehouse_Text_GideonPostBattle:: @ 817BC6C
     .string "If I can't sell it, it's worthless!\n"
     .string "Go ahead, take it!$"
 
-gUnknown_817BCA3:: @ 817BCA3
+FiveIsland_RocketWarehouse_Text_GetLostLeaveMeBe:: @ 817BCA3
     .string "What do you want now?\n"
     .string "Go on, get lost, leave me be.$"
 
-gUnknown_817BCD7:: @ 817BCD7
+FiveIsland_RocketWarehouse_Text_GiovannisKidHasRedHair:: @ 817BCD7
     .string "What, you again?\p"
     .string "You… You're not GIOVANNI's kid,\n"
     .string "are you?\p"
diff --git a/include/constants/metatile_labels.h b/include/constants/metatile_labels.h
index 2d781d402..f76c535e6 100644
--- a/include/constants/metatile_labels.h
+++ b/include/constants/metatile_labels.h
@@ -69,6 +69,10 @@
 #define METATILE_PokemonMansion_Statue_RedEyes_Basement                  0x34F
 
 // Rocket Hideout, Rocket Warehouse, Silph Co, elevators
+#define METATILE_Hideout_Arrow_Up               0x2A0
+#define METATILE_Hideout_Arrow_Left             0x2A1
+#define METATILE_Hideout_Arrow_Down             0x2A8
+#define METATILE_Hideout_Arrow_RIght            0x2A9   
 #define METATILE_Hideout_Barrier_TopLeft_Floor  0x2CE
 #define METATILE_Hideout_Barrier_TopRight_Floor 0x2CF
 #define METATILE_Hideout_Barrier_BottomLeft     0x2D6
@@ -76,7 +80,6 @@
 #define METATILE_Hideout_Floor                  0x281
 #define METATILE_Hideout_Floor_ShadeFull        0x282
 
-
 // Cinnabar Gym
 #define METATILE_CinnabarGym_Floor                  0x281
 #define METATILE_CinnabarGym_Floor_ShadeDiagonal    0x282