1 files changed, 51 insertions, 51 deletions
diff --git a/data/maps/SaffronCity/scripts.inc b/data/maps/SaffronCity/scripts.inc
index 53d697ff0..4b74cd43d 100644
--- a/data/maps/SaffronCity/scripts.inc
+++ b/data/maps/SaffronCity/scripts.inc
@@ -4,121 +4,121 @@ SaffronCity_MapScripts:: @ 816735F
 
 SaffronCity_OnTransition:: @ 8167365
 	setworldmapflag FLAG_WORLD_MAP_SAFFRON_CITY
-	call_if_unset FLAG_RESCUED_MR_FUJI, EventScript_167372
+	call_if_unset FLAG_RESCUED_MR_FUJI, SaffronCity_EventScript_MoveDoorGuardGrunt
 	end
 
-EventScript_167372:: @ 8167372
+SaffronCity_EventScript_MoveDoorGuardGrunt:: @ 8167372
 	setobjectxyperm 6, 33, 31
 	return
 
-SaffronCity_EventScript_16737A:: @ 816737A
-	msgbox gUnknown_8181003, MSGBOX_NPC
+SaffronCity_EventScript_RocketGrunt1:: @ 816737A
+	msgbox SaffronCity_Text_WhatDoYouWantGetLost, MSGBOX_NPC
 	end
 
-SaffronCity_EventScript_167383:: @ 8167383
-	msgbox gUnknown_818101F, MSGBOX_NPC
+SaffronCity_EventScript_RocketGrunt2:: @ 8167383
+	msgbox SaffronCity_Text_BossTakeTownForTeamRocket, MSGBOX_NPC
 	end
 
-SaffronCity_EventScript_16738C:: @ 816738C
-	msgbox gUnknown_818105A, MSGBOX_NPC
+SaffronCity_EventScript_RocketGrunt3:: @ 816738C
+	msgbox SaffronCity_Text_DontGetDefiantOrIllHurtYou, MSGBOX_NPC
 	end
 
-SaffronCity_EventScript_167395:: @ 8167395
-	msgbox gUnknown_8181087, MSGBOX_NPC
+SaffronCity_EventScript_RocketGrunt4:: @ 8167395
+	msgbox SaffronCity_Text_SaffronBelongsToTeamRocket, MSGBOX_NPC
 	end
 
-SaffronCity_EventScript_16739E:: @ 816739E
-	msgbox gUnknown_81810A7, MSGBOX_NPC
+SaffronCity_EventScript_RocketGrunt5:: @ 816739E
+	msgbox SaffronCity_Text_CriminalLifeMakesMeFeelAlive, MSGBOX_NPC
 	end
 
-SaffronCity_EventScript_1673A7:: @ 81673A7
-	msgbox gUnknown_81810D5, MSGBOX_NPC
+SaffronCity_EventScript_RocketGrunt6:: @ 81673A7
+	msgbox SaffronCity_Text_WatchWhereYoureWalking, MSGBOX_NPC
 	end
 
-SaffronCity_EventScript_1673B0:: @ 81673B0
-	msgbox gUnknown_81810F5, MSGBOX_NPC
+SaffronCity_EventScript_RocketGrunt7:: @ 81673B0
+	msgbox SaffronCity_Text_WeCanExploitMonsAroundWorld, MSGBOX_NPC
 	end
 
-SaffronCity_EventScript_1673B9:: @ 81673B9
+SaffronCity_EventScript_DoorGuardGrunt:: @ 81673B9
 	lock
-	goto_if_set FLAG_RESCUED_MR_FUJI, EventScript_1673D7
+	goto_if_set FLAG_RESCUED_MR_FUJI, SaffronCity_EventScript_DoorGuardAsleep
 	applymovement 6, Movement_FacePlayer
 	waitmovement 0
-	msgbox gUnknown_81812CA
+	msgbox SaffronCity_Text_ImASecurityGuard
 	release
 	end
 
-EventScript_1673D7:: @ 81673D7
+SaffronCity_EventScript_DoorGuardAsleep:: @ 81673D7
 	textcolor 3
-	msgbox gUnknown_8181302
+	msgbox SaffronCity_Text_HesTakingASnooze
 	release
 	end
 
-SaffronCity_EventScript_1673E3:: @ 81673E3
-	msgbox gUnknown_8181159, MSGBOX_NPC
+SaffronCity_EventScript_WorkerM:: @ 81673E3
+	msgbox SaffronCity_Text_YouBeatTeamRocket, MSGBOX_NPC
 	end
 
-SaffronCity_EventScript_1673EC:: @ 81673EC
-	msgbox gUnknown_8181189, MSGBOX_NPC
+SaffronCity_EventScript_Youngster:: @ 81673EC
+	msgbox SaffronCity_Text_SafeToGoOutAgain, MSGBOX_NPC
 	end
 
-SaffronCity_EventScript_1673F5:: @ 81673F5
-	msgbox gUnknown_81811BF, MSGBOX_NPC
+SaffronCity_EventScript_Lass:: @ 81673F5
+	msgbox SaffronCity_Text_PeopleComingBackToSaffron, MSGBOX_NPC
 	end
 
-SaffronCity_EventScript_1673FE:: @ 81673FE
-	msgbox gUnknown_8181225, MSGBOX_NPC
+SaffronCity_EventScript_Boy:: @ 81673FE
+	msgbox SaffronCity_Text_FlewHereOnPidgeot, MSGBOX_NPC
 	end
 
-SaffronCity_EventScript_167407:: @ 8167407
+SaffronCity_EventScript_Pidgeot:: @ 8167407
 	lock
 	faceplayer
 	waitse
 	playmoncry SPECIES_PIDGEOT, 0
-	msgbox gUnknown_8181286
+	msgbox SaffronCity_Text_Pidgeot
 	waitmoncry
 	release
 	end
 
-SaffronCity_EventScript_16741A:: @ 816741A
-	msgbox gUnknown_8181299, MSGBOX_NPC
+SaffronCity_EventScript_Man:: @ 816741A
+	msgbox SaffronCity_Text_SawRocketBossEscaping, MSGBOX_NPC
 	end
 
-SaffronCity_EventScript_167423:: @ 8167423
-	msgbox gUnknown_8181326, MSGBOX_SIGN
+SaffronCity_EventScript_CitySign:: @ 8167423
+	msgbox SaffronCity_Text_CitySign, MSGBOX_SIGN
 	end
 
-SaffronCity_EventScript_16742C:: @ 816742C
-	msgbox gUnknown_8181354, MSGBOX_SIGN
+SaffronCity_EventScript_DojoSign:: @ 816742C
+	msgbox SaffronCity_Text_FightingDojo, MSGBOX_SIGN
 	end
 
-SaffronCity_EventScript_167435:: @ 8167435
+SaffronCity_EventScript_GymSign:: @ 8167435
 	lockall
 	famechecker FAMECHECKER_SABRINA, 0
-	msgbox gUnknown_8181362
+	msgbox SaffronCity_Text_GymSign
 	releaseall
 	end
 
-SaffronCity_EventScript_16744D:: @ 816744D
-	msgbox gUnknown_81813AA, MSGBOX_SIGN
+SaffronCity_EventScript_TrainerTips1:: @ 816744D
+	msgbox SaffronCity_Text_FullHealCuresStatus, MSGBOX_SIGN
 	end
 
-SaffronCity_EventScript_167456:: @ 8167456
-	msgbox gUnknown_8181452, MSGBOX_SIGN
+SaffronCity_EventScript_TrainerTips2:: @ 8167456
+	msgbox SaffronCity_Text_GreatBallImprovedCatchRate, MSGBOX_SIGN
 	end
 
-SaffronCity_EventScript_16745F:: @ 816745F
-	msgbox gUnknown_81814B9, MSGBOX_SIGN
+SaffronCity_EventScript_SilphCoSign:: @ 816745F
+	msgbox SaffronCity_Text_SilphCoSign, MSGBOX_SIGN
 	end
 
-SaffronCity_EventScript_167468:: @ 8167468
-	msgbox gUnknown_81814D3, MSGBOX_SIGN
+SaffronCity_EventScript_MrPsychicsHouseSign:: @ 8167468
+	msgbox SaffronCity_Text_MrPsychicsHouse, MSGBOX_SIGN
 	end
 
-SaffronCity_EventScript_167471:: @ 8167471
-	msgbox gUnknown_81814E7, MSGBOX_SIGN
+SaffronCity_EventScript_SilphProductSign:: @ 8167471
+	msgbox SaffronCity_Text_SilphsLatestProduct, MSGBOX_SIGN
 	end
 
-SaffronCity_EventScript_16747A:: @ 816747A
-	msgbox gUnknown_8181519, MSGBOX_SIGN
+SaffronCity_EventScript_TrainerFanClubSign:: @ 816747A
+	msgbox SaffronCity_Text_TrainerFanClubSign, MSGBOX_SIGN
 	end