From 8893f847a0d83fc3c535838530916e3b909178f6 Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Fri, 29 Dec 2023 23:21:42 +0000 Subject: [PATCH] HAHAHA FUCK YOU YUJIROU WE WIN PRAISE BE TO RAINBOW METAL PIGEON, OH MY GOD --- README.md | 1 - scripts/ViridianPreGym.asm | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 47381e15..a4ed6170 100644 --- a/README.md +++ b/README.md @@ -259,7 +259,6 @@ and more! 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. - 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. diff --git a/scripts/ViridianPreGym.asm b/scripts/ViridianPreGym.asm index 054039a5..106c52e9 100644 --- a/scripts/ViridianPreGym.asm +++ b/scripts/ViridianPreGym.asm @@ -23,7 +23,7 @@ ViridianPreGym_ScriptPointers: ViridianGymYujirouPostBattle: ld a, [wIsInBattle] cp $ff - jp z, ViridianGymResetScripts + jp z, ViridianPreGymResetScripts ld a, $f0 ld [wJoyIgnore], a ViridianPreGymScriptReceiveBottleCap: @@ -76,7 +76,7 @@ YujirouText: jr nz, .rematchMode CheckEventReuseA EVENT_GOT_YUJIROU_BOTTLE_CAP jr nz, .yujirouBeaten - call z, PewterGymScriptReceiveTM34 + call z, ViridianPreGymScriptReceiveBottleCap call DisableWaitingAfterTextDisplay jp .done ; needed due to the rematch script length. .rematchMode ; Rematch functionality. Just loads pre-battle text and his trainer.