Merge branch 'master' into doc-matchcall

This commit is contained in:
GriffinR
2019-12-10 20:43:27 -05:00
committed by GitHub
299 changed files with 7336 additions and 5366 deletions

View File

@@ -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…$"

View File

@@ -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?$"