Correct outdated obedienc claims by NPCs

This commit is contained in:
SineOfLuck 2026-03-26 12:53:42 -06:00
parent c54a76c18a
commit 1bde7b5102
5 changed files with 43 additions and 35 deletions

View File

@ -28,8 +28,10 @@ CeladonCity_Gym_Text_ErikaPostBattle::
.string "they were unattractive.$"
CeladonCity_Gym_Text_ExplainRainbowBadgeTakeThis::
.string "The RAINBOWBADGE will make\n"
.string "POKéMON up to Lv. 50 obey.\p"
.string "The RAINBOWBADGE raises your\n"
.string "training authority by 5.\p"
.string "It eases your POKéMON's trust\n"
.string "as their levels grow higher.\p"
.string "It also allows POKéMON to use\n"
.string "STRENGTH in and out of battle.\p"
.string "Please also take this with you.$"

View File

@ -12,10 +12,11 @@ CeruleanCity_Gym_Text_ExplainTM03::
.string "Use it on an aquatic POKéMON!$"
CeruleanCity_Gym_Text_ExplainCascadeBadge::
.string "The CASCADEBADGE makes all\n"
.string "POKéMON up to Lv. 30 obey.\p"
.string "That includes even outsiders you\n"
.string "got in trades.\p"
.string "The CASCADEBADGE raises your\n"
.string "training authority by 5.\p"
.string "This helps all your POKéMON,\n"
.string "even outsiders from trades,\l"
.string "follow your commands better.\p"
.string "There's more. You can now use CUT\n"
.string "anytime, even out of battle.\p"
.string "You can CUT down small trees to\n"

View File

@ -20,12 +20,12 @@ CeruleanCity_House1_Text_AttackStatFlash::
.string "FLASH outside of battle.$"
CeruleanCity_House1_Text_ObeyLv30Cut::
.string "POKéMON up to Lv. 30 will obey\n"
.string "you.\p"
.string "That includes even outsiders you\n"
.string "obtain in trades.\p"
.string "POKéMON of higher levels will\n"
.string "be unruly in battle, however.\p"
.string "It boosts your training authority\n"
.string "by 5.\p"
.string "Even outsiders from trades become\n"
.string "more willing to obey you.\p"
.string "High-level POKéMON may still\n"
.string "resist without strong TYPE LEVELS.\p"
.string "It also lets you use the move\n"
.string "CUT outside of battle.$"
@ -36,12 +36,12 @@ CeruleanCity_House1_Text_SpeedStatFly::
.string "FLY outside of battle.$"
CeruleanCity_House1_Text_ObeyLv50Strength::
.string "POKéMON up to Lv. 50 will obey\n"
.string "you.\p"
.string "That includes even outsiders you\n"
.string "obtain in trades.\p"
.string "POKéMON of higher levels will\n"
.string "be unruly in battle, however.\p"
.string "It boosts your training authority\n"
.string "by 5.\p"
.string "Even outsiders from trades become\n"
.string "more willing to obey you.\p"
.string "High-level POKéMON may still\n"
.string "resist without strong TYPE LEVELS.\p"
.string "It also lets you use the move\n"
.string "STRENGTH outside of battle.$"
@ -52,12 +52,12 @@ CeruleanCity_House1_Text_DefenseStatSurf::
.string "SURF outside of battle.$"
CeruleanCity_House1_Text_ObeyLv70RockSmash::
.string "POKéMON up to Lv. 70 will obey\n"
.string "you.\p"
.string "That includes even outsiders you\n"
.string "obtain in trades.\p"
.string "POKéMON of higher levels will\n"
.string "be unruly in battle, however.\p"
.string "It boosts your training authority\n"
.string "by 5.\p"
.string "Even outsiders from trades become\n"
.string "more willing to obey you.\p"
.string "High-level POKéMON may still\n"
.string "resist without strong TYPE LEVELS.\p"
.string "It also lets you use the move\n"
.string "ROCK SMASH outside of battle.$"
@ -68,5 +68,8 @@ CeruleanCity_House1_Text_SpStatsWaterfall::
.string "WATERFALL outside of battle.$"
CeruleanCity_House1_Text_AllMonsWillObeyYou::
.string "All POKéMON will obey you!$"
.string "Your own POKéMON of any level\n"
.string "will obey you!\p"
.string "Traded POKéMON still depend on\n"
.string "your TYPE LEVELS to trust you.$"

View File

@ -22,12 +22,12 @@ SaffronCity_Gym_Text_SabrinaPostBattle::
.string "People just don't realize it.$"
SaffronCity_Gym_Text_ExplainMarshBadgeTakeThis::
.string "The MARSHBADGE makes POKéMON up\n"
.string "to Lv. 70 obey you.\p"
.string "Stronger POKéMON will become wild,\n"
.string "ignoring your orders in battle.\p"
.string "Just don't raise your POKéMON too\n"
.string "much to avoid that problem.\p"
.string "The MARSHBADGE raises your\n"
.string "training authority by 5.\p"
.string "Even so, powerful POKéMON\n"
.string "demand high TYPE LEVELS.\p"
.string "Build your expertise in every\n"
.string "type to keep your edge.\p"
.string "Wait, please take this TM with you.$"
SaffronCity_Gym_Text_ReceivedTM04FromSabrina::

View File

@ -28,10 +28,12 @@ ViridianCity_Gym_Text_GiovanniPostBattle::
.string "Farewell!$"
ViridianCity_Gym_Text_ExplainEarthBadgeTakeThis::
.string "The EARTHBADGE makes POKéMON of\n"
.string "any level obey without question.\p"
.string "It is evidence of your mastery as\n"
.string "a POKéMON TRAINER.\p"
.string "The EARTHBADGE seals your hold\n"
.string "over all of KANTO.\p"
.string "Your own POKéMON of any level\n"
.string "will answer your commands.\p"
.string "Traded POKéMON at great levels\n"
.string "still demand strong TYPE LEVELS.\p"
.string "With it, you can challenge the\n"
.string "POKéMON LEAGUE.\p"
.string "Also, take this TM.\p"