Merge branch 'master' into sync-ai

3 files changed, 14 insertions, 14 deletions

diff --git a/data/maps/FuchsiaCity_PokemonCenter_1F/map.json b/data/maps/FuchsiaCity_PokemonCenter_1F/map.json
index d2e1eee01..9cc66692f 100644
--- a/data/maps/FuchsiaCity_PokemonCenter_1F/map.json
+++ b/data/maps/FuchsiaCity_PokemonCenter_1F/map.json
@@ -23,7 +23,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "FuchsiaCity_PokemonCenter_1F_EventScript_16D700",
+      "script": "FuchsiaCity_PokemonCenter_1F_EventScript_Nurse",
       "flag": "0"
     },
     {
@@ -36,7 +36,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "FuchsiaCity_PokemonCenter_1F_EventScript_16D709",
+      "script": "FuchsiaCity_PokemonCenter_1F_EventScript_Man",
       "flag": "0"
     },
     {
@@ -49,7 +49,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "FuchsiaCity_PokemonCenter_1F_EventScript_16D712",
+      "script": "FuchsiaCity_PokemonCenter_1F_EventScript_CooltrainerF",
       "flag": "0"
     },
     {
@@ -62,7 +62,7 @@
       "movement_range_y": 1,
       "trainer_type": 0,
       "trainer_sight_or_berry_tree_id": 0,
-      "script": "FuchsiaCity_PokemonCenter_1F_EventScript_16D71B",
+      "script": "FuchsiaCity_PokemonCenter_1F_EventScript_Youngster",
       "flag": "0"
     }
   ],
diff --git a/data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc b/data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc
index 428305d1c..abcd80e57 100644
--- a/data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/FuchsiaCity_PokemonCenter_1F/scripts.inc
@@ -7,21 +7,21 @@ FuchsiaCity_PokemonCenter_1F_OnTransition:: @ 816D6FC
 	setrespawn SPAWN_FUCHSIA_CITY
 	end
 
-FuchsiaCity_PokemonCenter_1F_EventScript_16D700:: @ 816D700
+FuchsiaCity_PokemonCenter_1F_EventScript_Nurse:: @ 816D700
 	lock
 	faceplayer
 	call EventScript_PkmnCenterNurse
 	release
 	end
 
-FuchsiaCity_PokemonCenter_1F_EventScript_16D709:: @ 816D709
-	msgbox gUnknown_8198CB7, MSGBOX_NPC
+FuchsiaCity_PokemonCenter_1F_EventScript_Man:: @ 816D709
+	msgbox FuchsiaCity_PokemonCenter_1F_Text_CantBecomeGoodTrainerWithOneMon, MSGBOX_NPC
 	end
 
-FuchsiaCity_PokemonCenter_1F_EventScript_16D712:: @ 816D712
-	msgbox gUnknown_8198D2E, MSGBOX_NPC
+FuchsiaCity_PokemonCenter_1F_EventScript_CooltrainerF:: @ 816D712
+	msgbox FuchsiaCity_PokemonCenter_1F_Text_PokemonLeagueWestOfViridian, MSGBOX_NPC
 	end
 
-FuchsiaCity_PokemonCenter_1F_EventScript_16D71B:: @ 816D71B
-	msgbox gUnknown_8198D9B, MSGBOX_NPC
+FuchsiaCity_PokemonCenter_1F_EventScript_Youngster:: @ 816D71B
+	msgbox FuchsiaCity_PokemonCenter_1F_Text_VisitSafariZoneForPokedex, MSGBOX_NPC
 	end
diff --git a/data/maps/FuchsiaCity_PokemonCenter_1F/text.inc b/data/maps/FuchsiaCity_PokemonCenter_1F/text.inc
index 7d3a627be..4d5deb734 100644
--- a/data/maps/FuchsiaCity_PokemonCenter_1F/text.inc
+++ b/data/maps/FuchsiaCity_PokemonCenter_1F/text.inc
@@ -1,16 +1,16 @@
-gUnknown_8198CB7:: @ 8198CB7
+FuchsiaCity_PokemonCenter_1F_Text_CantBecomeGoodTrainerWithOneMon:: @ 8198CB7
     .string "You can't become a good TRAINER\n"
     .string "with just one strong POKéMON.\p"
     .string "But raising many POKéMON evenly\n"
     .string "is no easy task, either.$"
 
-gUnknown_8198D2E:: @ 8198D2E
+FuchsiaCity_PokemonCenter_1F_Text_PokemonLeagueWestOfViridian:: @ 8198D2E
     .string "There's a narrow trail west of\n"
     .string "VIRIDIAN CITY.\p"
     .string "It goes to the POKéMON LEAGUE HQ.\n"
     .string "The HQ governs all TRAINERS.$"
 
-gUnknown_8198D9B:: @ 8198D9B
+FuchsiaCity_PokemonCenter_1F_Text_VisitSafariZoneForPokedex:: @ 8198D9B
     .string "If you're working on a POKéDEX,\n"
     .string "visit the SAFARI ZONE.\p"
     .string "All sorts of rare POKéMON breed\n"