diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-12-10 20:43:27 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-10 20:43:27 -0500 |
| commit | 47b0d8a5970a75862279bde9d19a06c3d7f96eee (patch) | |
| tree | 462ebc6e6bce61be28d862cd89c8bec08ebfa61e /data/text | |
| parent | 77bf40d32b7bbab40db36030399586430ae57010 (diff) | |
| parent | 49f1a90534180445d293761e2bdac165b49319a2 (diff) | |
Merge branch 'master' into doc-matchcall
Diffstat (limited to 'data/text')
| -rw-r--r-- | data/text/abnormal_weather.inc (renamed from data/text/unusual_weather.inc) | 4 | ||||
| -rw-r--r-- | data/text/cable_club.inc | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/data/text/unusual_weather.inc b/data/text/abnormal_weather.inc index e6dc9b1d0..42e61e68d 100644 --- a/data/text/unusual_weather.inc +++ b/data/text/abnormal_weather.inc @@ -1,7 +1,7 @@ -gText_UnusualWeatherEnded_Rain:: @ 8273656 +gText_AbnormalWeatherEnded_Rain:: @ 8273656 .string "The massive downpour appears to\n" .string "have stopped…$" -gText_UnusualWeatherEnded_Sun:: @ 8273684 +gText_AbnormalWeatherEnded_Sun:: @ 8273684 .string "The intense sunshine appears to\n" .string "have subsided…$" diff --git a/data/text/cable_club.inc b/data/text/cable_club.inc index 7e98d9fc7..c1922d147 100644 --- a/data/text/cable_club.inc +++ b/data/text/cable_club.inc @@ -201,14 +201,16 @@ CableClub_Text_CanMixRecords:: @ 8278831 .string "The records of two to four players\n" .string "can be mixed together.$" -OldaleTown_PokemonCenter_2F_Text_27886B: @ 827886B +@ Unused +CableClub_Text_GuideToVariousServices: @ 827886B .string "A guide to the WIRELESS CLUB's\n" .string "various services.$" CableClub_Text_CancelSelectedItem:: @ 827889C .string "Cancels the selected MENU item.$" -OldaleTown_PokemonCenter_2F_Text_2788BC: @ 82788BC +@ Unused +CableClub_Text_WhichBattleMode: @ 82788BC .string "Which battle mode would you like?$" @ Unused @@ -340,7 +342,7 @@ CableClub_Text_WelcomeWhichDirectCornerRoom: @ 8279013 CableClub_Text_TradePokemon: @ 827909D .string "Would you like to trade POKéMON?$" -CableClub_Text_WhichBattleMode: @ 82790BE +CableClub_Text_PlayWhichBattleMode: @ 82790BE .string "Which Battle Mode would you like\n" .string "to play?$" |