HAHAHA FUCK YOU YUJIROU

WE WIN

PRAISE BE TO RAINBOW METAL PIGEON, OH MY GOD
This commit is contained in:
Martha Schilling 2023-12-29 23:21:42 +00:00
parent 1eed8f03d5
commit 8893f847a0
2 changed files with 2 additions and 3 deletions

View file

@ -259,7 +259,6 @@ and more!
Known Bugs Known Bugs
==== ====
- Losing to Yujirou's initial team crashes the game.
- If you defeat the Elite Four before the Fighing Dojo Karate Master, the Hitmon gift is permanently locked off. - If you defeat the Elite Four before the Fighing Dojo Karate Master, the Hitmon gift is permanently locked off.
- Occasionally, menu text sets itself to scroll. (hasn't happened for a while, either uncommon or fixed) - Occasionally, menu text sets itself to scroll. (hasn't happened for a while, either uncommon or fixed)
- The Tradeback Tutor doesn't work properly with Rhydon for reasons likely related to its index number of 1. - The Tradeback Tutor doesn't work properly with Rhydon for reasons likely related to its index number of 1.

View file

@ -23,7 +23,7 @@ ViridianPreGym_ScriptPointers:
ViridianGymYujirouPostBattle: ViridianGymYujirouPostBattle:
ld a, [wIsInBattle] ld a, [wIsInBattle]
cp $ff cp $ff
jp z, ViridianGymResetScripts jp z, ViridianPreGymResetScripts
ld a, $f0 ld a, $f0
ld [wJoyIgnore], a ld [wJoyIgnore], a
ViridianPreGymScriptReceiveBottleCap: ViridianPreGymScriptReceiveBottleCap:
@ -76,7 +76,7 @@ YujirouText:
jr nz, .rematchMode jr nz, .rematchMode
CheckEventReuseA EVENT_GOT_YUJIROU_BOTTLE_CAP CheckEventReuseA EVENT_GOT_YUJIROU_BOTTLE_CAP
jr nz, .yujirouBeaten jr nz, .yujirouBeaten
call z, PewterGymScriptReceiveTM34 call z, ViridianPreGymScriptReceiveBottleCap
call DisableWaitingAfterTextDisplay call DisableWaitingAfterTextDisplay
jp .done ; needed due to the rematch script length. jp .done ; needed due to the rematch script length.
.rematchMode ; Rematch functionality. Just loads pre-battle text and his trainer. .rematchMode ; Rematch functionality. Just loads pre-battle text and his trainer.