Merge branch 'master' into event_object_movement

1 files changed, 47 insertions, 47 deletions

diff --git a/data/scripts/fame_checker.inc b/data/scripts/fame_checker.inc
index 36383bfb8..76b5d5c81 100644
--- a/data/scripts/fame_checker.inc
+++ b/data/scripts/fame_checker.inc
@@ -8,7 +8,7 @@ ViridianCity_House2_EventScript_PokemonJournal:: @ 81ACD65
 	release
 	end
 
-EventScript_1ACD8D:: @ 81ACD8D
+EventScript_PokemonJournalUnused1:: @ 81ACD8D
 	lock
 	faceplayer
 	famechecker FAMECHECKER_DAISY, 1
@@ -18,7 +18,7 @@ EventScript_1ACD8D:: @ 81ACD8D
 	release
 	end
 
-EventScript_1ACDB5:: @ 81ACDB5
+EventScript_PokemonJournalUnused2:: @ 81ACDB5
 	lock
 	faceplayer
 	famechecker FAMECHECKER_DAISY, 4
@@ -27,27 +27,27 @@ EventScript_1ACDB5:: @ 81ACDB5
 	release
 	end
 
-FourIsland_PokemonCenter_1F_EventScript_1ACDD0:: @ 81ACDD0
+FourIsland_PokemonCenter_1F_EventScript_PokemonJournal:: @ 81ACDD0
 	lockall
 	famechecker FAMECHECKER_DAISY, 5
 	textcolor 3
-	msgbox gUnknown_81B1B3D
+	msgbox PokemonJournal_Text_SpecialFeatureDaisyOak
 	releaseall
 	end
 
-Route4_EventScript_1ACDEA:: @ 81ACDEA
+Route4_EventScript_Boy:: @ 81ACDEA
 	lock
 	faceplayer
 	famechecker FAMECHECKER_BROCK, 3
-	msgbox Text_183D26
+	msgbox Route4_Text_PeopleLikeAndRespectBrock
 	release
 	end
 
-MtMoon_1F_EventScript_1ACE03:: @ 81ACE03
+MtMoon_1F_EventScript_BaldingMan:: @ 81ACE03
 	lock
 	faceplayer
 	famechecker FAMECHECKER_BROCK, 4
-	msgbox Text_172B00
+	msgbox MtMoon_1F_Text_BrockHelpsExcavateFossils
 	release
 	end
 
@@ -59,19 +59,19 @@ PewterCity_Museum_1F_EventScript_PokemonJournalBrock:: @ 81ACE1C
 	releaseall
 	end
 
-Route20_EventScript_1ACE36:: @ 81ACE36
+Route20_EventScript_Camper:: @ 81ACE36
 	lock
 	faceplayer
 	famechecker FAMECHECKER_MISTY, 3
-	msgbox Text_1882E1
+	msgbox Route20_Text_MistyTrainsHere
 	release
 	end
 
-Route25_EventScript_1ACE4F:: @ 81ACE4F
+Route25_EventScript_Beauty:: @ 81ACE4F
 	lock
 	faceplayer
 	famechecker FAMECHECKER_MISTY, 4
-	msgbox Text_189569
+	msgbox Route25_Text_MistyHighHopesAboutThisPlace
 	release
 	end
 
@@ -92,12 +92,12 @@ VermilionCity_PokemonCenter_1F_EventScript_PokemonJournalLtSurge:: @ 81ACE83
 	releaseall
 	end
 
-CeladonCity_Condominiums_2F_EventScript_1ACE9D:: @ 81ACE9D
+CeladonCity_Condominiums_2F_EventScript_PokemonJournalErika:: @ 81ACE9D
 	lock
 	faceplayer
 	famechecker FAMECHECKER_ERIKA, 5
 	textcolor 3
-	msgbox gUnknown_81B161B
+	msgbox PokemonJournal_Text_SpecialFeatureErika
 	release
 	end
 
@@ -118,12 +118,12 @@ SafariZone_North_RestHouse_EventScript_BaldingMan:: @ 81ACED3
 	release
 	end
 
-SaffronCity_PokemonCenter_1F_EventScript_1ACEEC:: @ 81ACEEC
+SaffronCity_PokemonCenter_1F_EventScript_PokemonJournalSabrina:: @ 81ACEEC
 	lock
 	faceplayer
 	famechecker FAMECHECKER_SABRINA, 4
 	textcolor 3
-	msgbox gUnknown_81B1753
+	msgbox PokemonJournal_Text_SpecialFeatureSabrina
 	release
 	end
 
@@ -135,75 +135,75 @@ CinnabarIsland_Gym_EventScript_BlaineFujiPhoto:: @ 81ACF07
 	releaseall
 	end
 
-FiveIsland_ResortGorgeous_House_EventScript_1ACF2C:: @ 81ACF2C
+FiveIsland_ResortGorgeous_House_EventScript_PokemonJournal:: @ 81ACF2C
 	lockall
 	famechecker FAMECHECKER_BLAINE, 5
 	textcolor 3
-	msgbox gUnknown_81B17E9
+	msgbox PokemonJournal_Text_SpecialFeatureBlaine
 	releaseall
 	end
 
-FourIsland_Mart_EventScript_1ACF46:: @ 81ACF46
+FourIsland_Mart_EventScript_OldMan:: @ 81ACF46
 	lock
 	faceplayer
 	famechecker FAMECHECKER_LORELEI, 2
-	msgbox Text_1A3A60
+	msgbox FourIsland_Mart_Text_LoreleiGrewUpOnThisIsland
 	release
 	end
 
-FiveIsland_PokemonCenter_1F_EventScript_1ACF5F:: @ 81ACF5F
+FiveIsland_PokemonCenter_1F_EventScript_PokemonJournal:: @ 81ACF5F
 	lock
 	faceplayer
 	famechecker FAMECHECKER_LORELEI, 3
 	textcolor 3
-	msgbox gUnknown_81B187F
+	msgbox PokemonJournal_Text_SpecialFeatureLorelei
 	release
 	end
 
-SaffronCity_PokemonTrainerFanClub_EventScript_1ACF7A:: @ 81ACF7A
+SaffronCity_PokemonTrainerFanClub_EventScript_PokemonJournalBruno:: @ 81ACF7A
 	lock
 	faceplayer
 	famechecker FAMECHECKER_BRUNO, 2
 	textcolor 3
-	msgbox gUnknown_81B1913
+	msgbox PokemonJournal_Text_SpecialFeatureBruno
 	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
 
-IndigoPlateau_PokemonCenter_1F_EventScript_1ACFAE:: @ 81ACFAE
+IndigoPlateau_PokemonCenter_1F_EventScript_BlackBelt:: @ 81ACFAE
 	lock
 	faceplayer
 	famechecker FAMECHECKER_AGATHA, 1
 	famechecker FAMECHECKER_AGATHA, 2
-	msgbox Text_19A9E7
+	msgbox IndigoPlateau_PokemonCenter_1F_Text_AgathaWhuppedUs
 	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
 
-EventScript_1AD008:: @ 81AD008
+EventScript_LanceUnused:: @ 81AD008
 	lock
 	faceplayer
 	famechecker FAMECHECKER_LANCE, 0
@@ -211,44 +211,44 @@ EventScript_1AD008:: @ 81AD008
 	release
 	end
 
-EventScript_1AD021:: @ 81AD021
+SaffronCity_EventScript_BattleGirlUnused:: @ 81AD021
 	lock
 	faceplayer
 	famechecker FAMECHECKER_LANCE, 1
-	msgbox Text_181569
+	msgbox SaffronCity_Text_HowCanClubNotRecognizeLance
 	release
 	end
 
-SaffronCity_EventScript_1AD03A:: @ 81AD03A
+SaffronCity_EventScript_BattleGirl:: @ 81AD03A
 	lock
 	faceplayer
 	famechecker FAMECHECKER_LANCE, 2
-	msgbox Text_181569
+	msgbox SaffronCity_Text_HowCanClubNotRecognizeLance
 	release
 	end
 
-CeladonCity_DepartmentStore_2F_EventScript_1AD053:: @ 81AD053
+CeladonCity_DepartmentStore_2F_EventScript_Woman:: @ 81AD053
 	lock
 	faceplayer
 	famechecker FAMECHECKER_LANCE, 3
-	msgbox Text_19566B
+	msgbox CeladonCity_DepartmentStore_2F_Text_LanceComesToBuyCapes
 	release
 	end
 
-IndigoPlateau_PokemonCenter_1F_EventScript_1AD06C:: @ 81AD06C
+IndigoPlateau_PokemonCenter_1F_EventScript_PokemonJournal:: @ 81AD06C
 	lock
 	faceplayer
 	famechecker FAMECHECKER_LANCE, 4
 	textcolor 3
-	msgbox gUnknown_81B1A31
+	msgbox PokemonJournal_Text_SpecialFeatureLance
 	release
 	end
 
-IndigoPlateau_PokemonCenter_1F_EventScript_1AD087:: @ 81AD087
+IndigoPlateau_PokemonCenter_1F_EventScript_CooltrainerM:: @ 81AD087
 	lock
 	faceplayer
 	famechecker FAMECHECKER_LANCE, 5
-	msgbox Text_19AB16
+	msgbox IndigoPlateau_PokemonCenter_1F_Text_LancesCousinGymLeaderFarAway
 	release
 	end
 
@@ -269,18 +269,18 @@ CinnabarIsland_PokemonCenter_1F_EventScript_PokemonJournalMrFuji:: @ 81AD0B9
 	release
 	end
 
-SilphCo_5F_EventScript_1AD0D4:: @ 81AD0D4
+SilphCo_5F_EventScript_Scientist:: @ 81AD0D4
 	lock
 	faceplayer
 	famechecker FAMECHECKER_GIOVANNI, 1
-	msgbox Text_175E99
+	msgbox SilphCo_5F_Text_RocketBossLookingForStrongMons
 	release
 	end
 
-SilphCo_8F_EventScript_1AD0ED:: @ 81AD0ED
+SilphCo_8F_EventScript_Scientist:: @ 81AD0ED
 	lock
 	faceplayer
 	famechecker FAMECHECKER_GIOVANNI, 2
-	msgbox Text_176ACB
+	msgbox SilphCo_8F_Text_ToRocketBossMonsAreTools
 	release
 	end