Gym Leader Rematches!

This commit adds a large fundamental change to KEP, that being Gym Rematches.

This is achieved alongside a rework to the script that makes those post-game-gating NPCs shift around. If you add a new one, just add its constant to the lists you'll see in the Hall of Fame script.

It also fixes a few bugs:
- Fixed a bug where Cinnabar Gym loaded a fleet of Blaines. This occurred due to the way he is coded at base, and a misunderstanding I had when implementing his scaling. This is now fixed by standardising his gym script instead, while letting the gym trainers still use the old one.
- Fixed a bug where the Up-Grade NPC would not appear after beating Silph Co. 11F. However, Giovanni currently seems to have trouble with his text. This floor needs some re-coding anyway, given we need to add Jessie and James to it.

And some misc. changes:
- Changed the first Moon Stone in Mt. Moon to a Poison Stone for the Nidoking speedrunners
- Debug Mode now has a line of code to set up the post-game easily
- Changed Surge's initial battle text to Yellow's
- Added Sabrina's more accurate LGPE initial battle text, referring to the spoon she bent by accident
This commit is contained in:
Llinos Evans 2023-06-09 11:17:31 +01:00
parent 5f8250f0d1
commit 749abc67b7
24 changed files with 575 additions and 67 deletions

View file

@ -215,3 +215,34 @@ _CeladonGymAfterBattleText8::
para "Wait 'til next"
line "time!"
done
_ErikaRematchPreBattleText::
text "If it isn't the"
line "one filling out"
cont "the #DEX."
para "I do hope things"
line "have been going"
cont "well since our"
cont "last encounter."
para "...I see."
para "You certainly"
line "have been busy."
para "I'm not fond of"
line "those kinds of"
cont "public things..."
para "But battles are"
line "different. That's"
cont "what you came"
cont "for, isn't it?"
done
_ErikaRematchDefeatedText::
text "Oh! It"
line "appears it is"
cont "my loss..."
prompt

View file

@ -124,3 +124,30 @@ _CeruleanGymGuidePostBattleText::
line "we make a pretty"
cont "darn good team!"
done
_MistyRematchPreBattleText::
text "I heard an"
line "interesting"
cont "rumor!"
para "Not only did you"
line "beat those TEAM"
cont "ROCKET guys, but"
cont "you also became"
cont "the CHAMPION!"
para "I can't take it"
line "anymore! I just"
cont "have to battle"
cont "you again!"
para "You got that?"
para "No refusing!"
done
_MistyRematchDefeatedText::
text "Hmph!"
line "How annoying!"
prompt

View file

@ -208,5 +208,40 @@ _CinnabarGymGuidePreBattleText::
_CinnabarGymGuidePostBattleText::
text "<PLAYER>! You beat"
line "that fire brand!"
line "that firebrand!"
done
_BlaineRematchPreBattleText::
text "Hah! Well done"
line "returning here!"
para "You're the one"
line "who retrieved the"
cont "key from #MON"
cont "MANSION!"
para "Did you see"
line "anything while"
cont "you were in"
cont "there?"
para "That place holds"
line "remnants of my"
cont "old friend's re-"
cont "search!"
para "Hmm..."
para "Well, it's not"
line "as though I know"
cont "the full story."
para "Since you're here"
line "though, let's"
cont "battle!"
done
_BlaineRematchDefeatedText::
text "Hah!"
line "I'm all fired up!"
prompt

View file

@ -24,3 +24,26 @@ _ReceivedSoulBadgeText::
para "Here! Take the"
line "SOULBADGE!"
prompt
_KogaRematchPreBattleText::
text "Fwahahaha!"
para "If it isn't the"
line "child."
para "It seems we are"
line "fated to meet"
cont "once again."
para "You have come"
line "at a truly"
cont "opportune time."
para "I wanted to test"
line "my newly refined"
cont "ninja skills..."
para "In a battle that"
line "will end in your"
cont "utter defeat!"
done

View file

@ -192,3 +192,9 @@ _FuchsiaGymGuidePostBattleText::
line "ninja can terrify"
cont "even now!"
done
_KogaRematchDefeatedText::
text "I must"
line "hone my skills."
prompt

View file

@ -16,3 +16,23 @@ _BrockPreBattleText::
cont "Fine then! Show"
cont "me your best!"
done
_BrockRematchPreBattleText::
text "You sure look"
line "different to"
cont "when we first"
cont "met!"
para "The truth is..."
para "We LEADERs have"
line "a right to"
cont "challenge the"
cont "champ!"
para "Allow me to show"
line "you the true"
cont "rock-hard power"
cont "of my #MON!"
done

View file

@ -144,3 +144,27 @@ _PewterGymGuidePostBattleText::
line "You're #MON"
cont "champ material!"
done
_BrockRematchDefeatedText::
text "I knew"
line "you were strong,"
cont "but this..."
prompt
_BrockRematchPostText::
text "I've chosen to"
line "postpone my"
cont "dream of being"
cont "a #MON"
cont "breeder for a"
cont "little longer."
para "Right now, I'm"
line "more interested"
cont "training to one"
cont "day defeat you!"
para "Battle me again"
line "sometime!"
done

View file

@ -5,10 +5,14 @@ _SabrinaPreBattleText::
para "I have had psychic"
line "powers since I"
cont "was a child."
para "I first learned"
line "to bend spoons"
cont "with my mind."
; LGPE modification. I believe it's a more accurate translation as well.
para "It started when I"
line "carelessly threw"
cont "a spoon aside"
cont "and it bent"
cont "itself into an"
cont "unnatural shape."
para "I dislike fight-"
line "ing, but if you"
@ -224,3 +228,38 @@ _SaffronGymAfterBattleText7::
line "used telepathy to"
cont "read your mind!"
done
_SabrinaRematchPreBattleText::
text "It is true that"
line "PSI is a potent"
cont "ability."
para "However, after I"
line "lost to you that"
cont "day..."
para "I realised there"
line "are things that"
cont "cannot be over-"
cont "come with that"
cont "power alone."
para "I won't rely on"
line "my psychic"
cont "powers this"
cont "time."
para "My true strength."
line "My true self."
para "Allow me to test"
line "them against"
cont "you!"
done
_SabrinaRematchDefeatedText::
text "I doubt"
line "I'll encounter"
cont "a TRAINER like"
cont "you ever again."
prompt

View file

@ -1,21 +1,43 @@
_LTSurgePreBattleText::
text "Hey, kid! What do"
line "you think you're"
cont "doing here?"
_LTSurgePreBattleText:: ; Yellow text, which works better with his rematch text.
text "Ten-hut! Welcome"
line "to VERMILION GYM!"
para "You won't live"
line "long in combat!"
cont "That's for sure!"
para "Will you look at"
line "that, a pint-size"
cont "challenger!"
para "I tell you kid,"
line "electric #MON"
cont "saved me during"
cont "the war!"
para "Hahaha! You've got"
line "big and brassy"
cont "nerves to take me"
cont "on with your puny"
cont "power!"
para "They zapped my"
line "enemies into"
cont "paralysis!"
para "A #MON battle"
line "is war! I'll show"
cont "you, civilian!"
para "The same as I'll"
line "do to you!"
para "I'll shock you"
line "into surrender!"
done
; I usually use LGPE text, but honestly, Surge's just sucks, so I doctored it a bit.
_SurgeRematchPreBattleText::
text "Hey there, kid!"
line "Pretty shocking"
cont "you made it"
cont "through the"
cont "#MON LEAGUE!"
para "I can't think"
line "of a stronger"
cont "TRAINER I've"
cont "battled since"
cont "first arriving"
cont "in KANTO..."
para "Let's have a"
line "rematch, eh?"
para "I'll zap you"
line "into paralysis!"
done

View file

@ -143,3 +143,8 @@ _VermilionGymGuidePostBattleText::
text "Whew! That match"
line "was electric!"
done
_SurgeRematchDefeatedText::
text "Absolutely"
line "shocking!"
prompt