From 9a88543f19166c667302c70e2fafc3841654f7ba Mon Sep 17 00:00:00 2001 From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com> Date: Fri, 19 May 2023 15:48:02 +0100 Subject: [PATCH] Tweaks Fixed the Rock issue (thanks frrfy) Changed the Slowbro text to reference a move it actually learns --- engine/battle/core.asm | 4 ++-- text/CeruleanCity.asm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/engine/battle/core.asm b/engine/battle/core.asm index d1d17950..7fc65e53 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -198,10 +198,10 @@ StartBattle: ; OG: multiply b by 2 (making the mon more likely to run) ;sla b ; KEP: multiply b by 1.5x and add to a, making it more likely to run, but not as much as vanilla. - ld b, a ; load b into a - need this so add will work, add is for a only. + ld a, b ; load b into a - need this so add will work, add is for a only. srl b ; divide b by 2 add a, b ; add b to a - ld a, b ; load a into b again to go to compareWithRandomValue + ld b, a ; load a into b again to go to compareWithRandomValue jr nc, .compareWithRandomValue ; cap b at 255 ld b, $ff diff --git a/text/CeruleanCity.asm b/text/CeruleanCity.asm index e5974f50..fcef3a9a 100644 --- a/text/CeruleanCity.asm +++ b/text/CeruleanCity.asm @@ -138,7 +138,7 @@ _CeruleanCityText6:: _CeruleanCityText_19730:: text "OK, SLOWBRO!" - line "Use SONICBOOM!" + line "Use WATER GUN!" cont "Come on SLOWBRO," cont "pay attention!" done