Merge branch 'master' into doc-routes2

3 files changed, 26 insertions, 26 deletions

diff --git a/data/maps/SilphCo_3F/map.json b/data/maps/SilphCo_3F/map.json
index 8a81b5118..42a1e6b72 100644
--- a/data/maps/SilphCo_3F/map.json
+++ b/data/maps/SilphCo_3F/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 3,
-      "script": "SilphCo_3F_EventScript_16171F",
+      "script": "SilphCo_3F_EventScript_Grunt",
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SilphCo_3F_EventScript_1616DE",
+      "script": "SilphCo_3F_EventScript_WorkerM",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 1,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "SilphCo_3F_EventScript_161708",
+      "script": "SilphCo_3F_EventScript_Jose",
       "flag": "FLAG_HIDE_SILPH_ROCKETS"
     },
     {
@@ -211,7 +211,7 @@
       "x": 29,
       "y": 1,
       "elevation": 0,
-      "script": "SilphCo_3F_EventScript_1616FF"
+      "script": "SilphCo_3F_EventScript_FloorSign"
     }
   ]
 }
diff --git a/data/maps/SilphCo_3F/scripts.inc b/data/maps/SilphCo_3F/scripts.inc
index a5e62b667..2fab54a56 100644
--- a/data/maps/SilphCo_3F/scripts.inc
+++ b/data/maps/SilphCo_3F/scripts.inc
@@ -7,30 +7,30 @@ SilphCo_3F_OnLoad:: @ 81616CB
 	call_if_unset FLAG_SILPH_3F_DOOR_2, EventScript_Close3FDoor2
 	end
 
-SilphCo_3F_EventScript_1616DE:: @ 81616DE
+SilphCo_3F_EventScript_WorkerM:: @ 81616DE
 	lock
 	faceplayer
 	compare VAR_MAP_SCENE_SILPH_CO_11F, 1
-	goto_if_ge EventScript_1616F5
-	msgbox gUnknown_81758AD
+	goto_if_ge SilphCo_3F_EventScript_WorkerMRocketsGone
+	msgbox SilphCo_3F_Text_WhatAmIToDo
 	release
 	end
 
-EventScript_1616F5:: @ 81616F5
-	msgbox gUnknown_81758D3
+SilphCo_3F_EventScript_WorkerMRocketsGone:: @ 81616F5
+	msgbox SilphCo_3F_Text_YouAndYourMonsSavedUs
 	release
 	end
 
-SilphCo_3F_EventScript_1616FF:: @ 81616FF
-	msgbox gUnknown_81759DC, MSGBOX_SIGN
+SilphCo_3F_EventScript_FloorSign:: @ 81616FF
+	msgbox SilphCo_3F_Text_FloorSign, MSGBOX_SIGN
 	end
 
-SilphCo_3F_EventScript_161708:: @ 8161708
-	trainerbattle_single TRAINER_SCIENTIST_JOSE, Text_175948, Text_17597D
-	msgbox gUnknown_8175990, MSGBOX_AUTOCLOSE
+SilphCo_3F_EventScript_Jose:: @ 8161708
+	trainerbattle_single TRAINER_SCIENTIST_JOSE, SilphCo_3F_Text_JoseIntro, SilphCo_3F_Text_JoseDefeat
+	msgbox SilphCo_3F_Text_JosePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SilphCo_3F_EventScript_16171F:: @ 816171F
-	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_25, Text_1758F6, Text_175911
-	msgbox gUnknown_817591C, MSGBOX_AUTOCLOSE
+SilphCo_3F_EventScript_Grunt:: @ 816171F
+	trainerbattle_single TRAINER_TEAM_ROCKET_GRUNT_25, SilphCo_3F_Text_GruntIntro, SilphCo_3F_Text_GruntDefeat
+	msgbox SilphCo_3F_Text_GruntPostBattle, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/SilphCo_3F/text.inc b/data/maps/SilphCo_3F/text.inc
index 6b8a8d4d1..128865c1b 100644
--- a/data/maps/SilphCo_3F/text.inc
+++ b/data/maps/SilphCo_3F/text.inc
@@ -1,34 +1,34 @@
-gUnknown_81758AD:: @ 81758AD
+SilphCo_3F_Text_WhatAmIToDo:: @ 81758AD
     .string "I work for SILPH CO.\n"
     .string "What am I to do?$"
 
-gUnknown_81758D3:: @ 81758D3
+SilphCo_3F_Text_YouAndYourMonsSavedUs:: @ 81758D3
     .string "{PLAYER}!\n"
     .string "You and your POKéMON saved us!$"
 
-Text_1758F6:: @ 81758F6
+SilphCo_3F_Text_GruntIntro:: @ 81758F6
     .string "Quit messing with us, kid!$"
 
-Text_175911:: @ 8175911
+SilphCo_3F_Text_GruntDefeat:: @ 8175911
     .string "I give up!$"
 
-gUnknown_817591C:: @ 817591C
+SilphCo_3F_Text_GruntPostBattle:: @ 817591C
     .string "A hint? You can open doors with\n"
     .string "a CARD KEY!$"
 
-Text_175948:: @ 8175948
+SilphCo_3F_Text_JoseIntro:: @ 8175948
     .string "I support TEAM ROCKET more than\n"
     .string "I support SILPH CO.!$"
 
-Text_17597D:: @ 817597D
+SilphCo_3F_Text_JoseDefeat:: @ 817597D
     .string "You really got me!$"
 
-gUnknown_8175990:: @ 8175990
+SilphCo_3F_Text_JosePostBattle:: @ 8175990
     .string "Humph…\p"
     .string "TEAM ROCKET said that if I helped\n"
     .string "them, they'd let me study POKéMON.$"
 
-gUnknown_81759DC:: @ 81759DC
+SilphCo_3F_Text_FloorSign:: @ 81759DC
     .string "SILPH CO. HEAD OFFICE\n"
     .string "3F$"