dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into doc-scriptclean

Browse Source
This commit is contained in:
GriffinR
2019-11-13 19:25:41 -05:00
committed by GitHub
parent 7455bd9b9a ef8370566f
commit ff7e11c0b0
113 changed files with 3816 additions and 3895 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
data/text/berries.inc
View File

@@ -72,18 +72,18 @@ Route120_Text_2A7217: @ 82A7217
.string "I'll get more BERRIES from\n"
.string "the BERRY MASTER.$"
LilycoveCity_Text_2A7244: @ 82A7244
LilycoveCity_Text_BerrySuitsYou: @ 82A7244
.string "When it gets right down to it…\p"
.string "The same way suits suit me perfectly,\n"
.string "a crisp breeze suits the sea.\p"
.string "And you, a BERRY suits you to a “T”…\p"
.string "Why should that be so?$"
LilycoveCity_Text_2A72E3: @ 82A72E3
LilycoveCity_Text_BecauseYoureTrainer: @ 82A72E3
.string "When it gets right down to it…\p"
.string "It's because you're a TRAINER!$"
LilycoveCity_Text_2A7321: @ 82A7321
LilycoveCity_Text_PokeblocksSuitPokemon: @ 82A7321
.string "When it gets right down to it…\p"
.string "The way dignified simplicity suits me,\n"
.string "{POKEBLOCK}S perfectly suit POKéMON.$"

30
data/text/contest_hall.inc → data/text/blend_master.inc
View File

@@ -1,34 +1,34 @@
LilycoveCity_ContestLobby_Text_2C427C: @ 82C427C
BerryBlender_Text_BlendWithTheBlendMaster: @ 82C427C
.string "BLEND MASTER: Indeed I am!\n"
.string "The BLEND MASTER am I!\p"
.string "Blend with me, and you shall witness\n"
.string "the mastery I bring to blending!$"
LilycoveCity_ContestLobby_Text_2C42F4: @ 82C42F4
BerryBlender_Text_SeeMyMasteryInAction: @ 82C42F4
.string "BLEND MASTER: Hmmm! So, you wish to\n"
.string "see my mastery in action?$"
LilycoveCity_ContestLobby_Text_2C4332: @ 82C4332
BerryBlender_Text_TooBusyNowIsee: @ 82C4332
.string "Hmmm!\p"
.string "So, you are too busy now, I see!\p"
.string "But fear not!\n"
.string "I shall be here all day!\l"
.string "Hurry back from your errand!$"
LilycoveCity_ContestLobby_Text_2C439D: @ 82C439D
BerryBlender_Text_BlendMasterNoBerries: @ 82C439D
.string "Hmmm!\p"
.string "You haven't got a single BERRY!\p"
.string "I shall be here all day!\n"
.string "Hurry back with some BERRIES!$"
LilycoveCity_ContestLobby_Text_2C43FA: @ 82C43FA
BerryBlender_Text_BlendMasterKnowHowToMakePokeblocks: @ 82C43FA
.string "Of course!\n"
.string "Of course!\p"
.string "Incidentally…\n"
.string "You do know how to blend {POKEBLOCK}S\l"
.string "from BERRIES?$"
LilycoveCity_ContestLobby_Text_2C444C: @ 82C444C
BerryBlender_Text_BlendMasterExplainBerryBlending: @ 82C444C
.string "Hmmm!\p"
.string "Ah, but it is a simple process!\p"
.string "When the BLENDER's arrow comes to\n"
@@ -37,40 +37,40 @@ LilycoveCity_ContestLobby_Text_2C444C: @ 82C444C
.string "When you see how precisely I press\n"
.string "the A Button, you will understand.$"
LilycoveCity_ContestLobby_Text_2C451B: @ 82C451B
BerryBlender_Text_BlendMasterLetsBerryBlender: @ 82C451B
.string "Fine!\p"
.string "Let's get started, then!\p"
.string "All together with the BLEND MASTER,\n"
.string "let's BERRY BLENDER!$"
LilycoveCity_ContestLobby_Text_2C4573: @ 82C4573
BerryBlender_Text_BlendMasterNoPokeblockCase: @ 82C4573
.string "Hmmm!\p"
.string "You don't appear to have gotten\n"
.string "the {POKEBLOCK} CASE!\p"
.string "I shall be here all day!\n"
.string "Obtain the {POKEBLOCK} CASE and hurry back!$"
LilycoveCity_ContestLobby_Text_2C45E8: @ 82C45E8
BerryBlender_Text_BlendMasterPokeblockCaseFull: @ 82C45E8
.string "Hmmm!\p"
.string "Your {POKEBLOCK} CASE appears to be full!\p"
.string "I shall be here all day!\n"
.string "Use some {POKEBLOCK}S and hurry back!$"
LilycoveCity_ContestLobby_Text_2C464B: @ 82C464B
BerryBlender_Text_WhoaAwesome: @ 82C464B
.string "Whoa!\n"
.string "Awesome!$"
LilycoveCity_ContestLobby_Text_2C465A: @ 82C465A
BerryBlender_Text_WickedlyFast: @ 82C465A
.string "Wickedly fast!$"
LilycoveCity_ContestLobby_Text_2C4669: @ 82C4669
BerryBlender_Text_WhatAnExpert: @ 82C4669
.string "What an expert!$"
LilycoveCity_ContestLobby_Text_2C4679: @ 82C4679
BerryBlender_Text_MadeAmazingPokeblocksWithMaster: @ 82C4679
.string "When I blended with the MASTER,\n"
.string "we made amazing {POKEBLOCK}S!$"
LilycoveCity_ContestLobby_Text_2C46B1: @ 82C46B1
BerryBlender_Text_QualitiesOfBlendMaster: @ 82C46B1
.string "Eyes that track the arrow with\n"
.string "machinelike intensity…\p"
.string "A hand that taps the A Button\n"
@@ -78,7 +78,7 @@ LilycoveCity_ContestLobby_Text_2C46B1: @ 82C46B1
.string "Possessing these qualities makes\n"
.string "the BLEND MASTER truly great.$"
LilycoveCity_ContestLobby_Text_2C4763: @ 82C4763
BerryBlender_Text_MasterWorksOnSkillsInMountains: @ 82C4763
.string "The BLEND MASTER's supposed to work\n"
.string "on his skills deep in the mountains.\p"
.string "Sometimes, he comes to LILYCOVE\n"