From 64ffc5a85dd2e6ca0d5ab1a3529d5ef0daee24d1 Mon Sep 17 00:00:00 2001 From: Alex <93446519+AlexOn1ine@users.noreply.github.com> Date: Wed, 30 Aug 2023 21:58:53 +0200 Subject: [PATCH] Fixes Beat Up + Chloroblast (#3264) --- src/battle_script_commands.c | 5 +++-- src/data/battle_moves.h | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index af222e6ba..c6f6f1bf5 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -14111,12 +14111,13 @@ static void Cmd_trysetfutureattack(void) static void Cmd_trydobeatup(void) { - CMD_ARGS(const u8 *endInstr, const u8 *failInstr); - #if B_BEAT_UP >= GEN_5 + CMD_ARGS(); + gBattleStruct->beatUpSlot++; gBattlescriptCurrInstr = cmd->nextInstr; #else + CMD_ARGS(const u8 *endInstr, const u8 *failInstr); struct Pokemon *party = GetBattlerParty(gBattlerAttacker); if (gBattleMons[gBattlerTarget].hp == 0) diff --git a/src/data/battle_moves.h b/src/data/battle_moves.h index ebd64ae10..940dec57d 100644 --- a/src/data/battle_moves.h +++ b/src/data/battle_moves.h @@ -12615,7 +12615,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] = #else .power = 120, #endif - .effect = EFFECT_RECOIL_50, + .effect = EFFECT_STEEL_BEAM, .type = TYPE_GRASS, .accuracy = 95, .pp = 5,