summaryrefslogtreecommitdiff
path: root/data/text
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@gmail.com>2020-01-24 21:42:03 -0500
committerPikalaxALT <PikalaxALT@gmail.com>2020-01-24 21:42:03 -0500
commit2531afb6abe342df58175f7d5bdafca63a600888 (patch)
tree2e26e160b819b9db6034c1e31fe0726ac84e8e74 /data/text
parentd22dd0f08b6e08b75b6db8391022b9662e6879ce (diff)
parenta09e66b53f61027d8805e5d6bb4df3d679693485 (diff)
Merge branch 'master' of github.com:pret/pokefirered into union_room_chat
Diffstat (limited to 'data/text')
-rw-r--r--data/text/fame_checker.inc2
-rw-r--r--data/text/seagallop.inc7
2 files changed, 8 insertions, 1 deletions
diff --git a/data/text/fame_checker.inc b/data/text/fame_checker.inc
index ded2719f6..8be9aec80 100644
--- a/data/text/fame_checker.inc
+++ b/data/text/fame_checker.inc
@@ -1387,7 +1387,7 @@ PokemonJournal_Text_SpecialFeatureMisty:: @ 81B14E8
.string "MISTY is said to worship LORELEI\n"
.string "of the ELITE FOUR.$"
-gUnknown_81B1558:: @ 81B1558
+PokemonJournal_Text_SpecialFeatureLtSurge:: @ 81B1558
.string "POKéMON JOURNAL\p"
.string "Special Feature: VERMILION GYM\n"
.string "LEADER LT. SURGE!\p"
diff --git a/data/text/seagallop.inc b/data/text/seagallop.inc
new file mode 100644
index 000000000..3d4d0d958
--- /dev/null
+++ b/data/text/seagallop.inc
@@ -0,0 +1,7 @@
+Text_WhereDoYouWantToGo:: @ 81A6407
+ .string "おつかれさん!\n"
+ .string "どこに いきたいんだ?$"
+
+Text_AllAboardSeagallopNum:: @ 81A641B
+ .string "All right!\n"
+ .string "All aboard SEAGALLOP HI-SPEED {STR_VAR_1}!$"