diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-24 20:50:53 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-24 20:50:53 -0500 |
| commit | 97d2555fad45c046862b97cf84c443b6935928a6 (patch) | |
| tree | 1db9378c01c951cb4a66a105a1a90701213397f8 /data/text | |
| parent | c0be66fc2e0ace7a9004fcbebe3a7595c30cda87 (diff) | |
| parent | a09e66b53f61027d8805e5d6bb4df3d679693485 (diff) | |
Merge branch 'master' into doc-viridian
Diffstat (limited to 'data/text')
| -rw-r--r-- | data/text/fame_checker.inc | 2 | ||||
| -rw-r--r-- | data/text/seagallop.inc | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/data/text/fame_checker.inc b/data/text/fame_checker.inc index 7a651e229..0705caffe 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}!$" |