summaryrefslogtreecommitdiff
path: root/data/scripts
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2020-02-16 12:07:24 -0500
committerGitHub <noreply@github.com>2020-02-16 12:07:24 -0500
commit01de877fc86e8fe369314b7bda490b610342af6f (patch)
tree996f86f889d7977b7210b15ebba6fef61748cc40 /data/scripts
parentb4fce4020d218e9c246fda91339e660a46182393 (diff)
parentb6899a0de1d64b97bcbaa4239b1d87ced98d005a (diff)
Merge branch 'master' into doc-tilesets
Diffstat (limited to 'data/scripts')
-rw-r--r--data/scripts/fame_checker.inc12
1 files changed, 6 insertions, 6 deletions
diff --git a/data/scripts/fame_checker.inc b/data/scripts/fame_checker.inc
index 3f9594dcb..81e732d12 100644
--- a/data/scripts/fame_checker.inc
+++ b/data/scripts/fame_checker.inc
@@ -43,11 +43,11 @@ Route4_EventScript_1ACDEA:: @ 81ACDEA
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
@@ -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