From b67b37a4df77695931f871ef86104f0674a29042 Mon Sep 17 00:00:00 2001 From: Misty Date: Fri, 16 Feb 2024 17:19:50 -0500 Subject: [PATCH 1/2] 0 to a 5 Disarming Voice has 10PP instead of 15PP, simple mistake, simple fix! --- data/moves/moves.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/moves/moves.asm b/data/moves/moves.asm index f2217b27..b6221ff6 100644 --- a/data/moves/moves.asm +++ b/data/moves/moves.asm @@ -193,7 +193,7 @@ Moves: move FAKE_TEARS, SPECIAL_DOWN2_EFFECT, 0, DARK, 100, 20 move FALSE_SURRENDER, SWIFT_EFFECT, 80, DARK, 100, 10 ; figure out the actual name another time move KOWTOW_CLEAVE, SWIFT_EFFECT, 85, DARK, 100, 10 - move DISARMING_VOICE, SWIFT_EFFECT, 40, FAIRY, 100, 10 + move DISARMING_VOICE, SWIFT_EFFECT, 40, FAIRY, 100, 15 move NASTY_PLOT, SPECIAL_UP2_EFFECT, 0, DARK, 100, 10 move UPPERCUT, FLINCH_SIDE_EFFECT2, 55, FIGHTING, 80, 15 move POWDER_SNOW, FREEZE_SIDE_EFFECT, 40, ICE, 100, 25 From 65c8f70856670bb5e832850ae064a19653da835a Mon Sep 17 00:00:00 2001 From: jojobear13 Date: Sat, 17 Feb 2024 16:34:08 -0600 Subject: [PATCH 2/2] fix PC in oak's lab glitching out --- scripts/OaksLab.asm | 19 +++++++++++++++++++ text/FightingDojo.asm | 1 + 2 files changed, 20 insertions(+) diff --git a/scripts/OaksLab.asm b/scripts/OaksLab.asm index 22529687..15469cf3 100644 --- a/scripts/OaksLab.asm +++ b/scripts/OaksLab.asm @@ -856,6 +856,25 @@ OaksLab_TextPointers2: dw OaksLabText9 dw OaksLabText10 dw OaksLabText11 + dw OakLabEmailText ;placeholder + dw OakLabEmailText ;placeholder + dw OakLabEmailText ;placeholder + dw OakLabEmailText ;placeholder + dw OakLabEmailText ;placeholder + dw OakLabEmailText ;placeholder + dw OakLabEmailText ;placeholder + dw OakLabEmailText ;placeholder + dw OakLabEmailText ;placeholder + dw OakLabEmailText ;placeholder + dw OakLabEmailText ;placeholder + dw OakLabEmailText ;placeholder + dw OakLabEmailText ;placeholder + dw OakLabEmailText ;placeholder + dw OakLabEmailText ;placeholder + dw OakLabEmailText ;placeholder + dw OakLabEmailText ;placeholder + dw OakLabEmailText ;placeholder + dw OakLabEmailText OaksLabText1: text_asm diff --git a/text/FightingDojo.asm b/text/FightingDojo.asm index d9c56be9..3589f11e 100644 --- a/text/FightingDojo.asm +++ b/text/FightingDojo.asm @@ -153,3 +153,4 @@ _KoichiRematchDefeatedText:: text "I have" line "been defeated" cont "once more..." + done