ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 03:34:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes Beat Up + Chloroblast (#3264)

Browse Source
This commit is contained in:
Alex 2023-08-30 21:58:53 +02:00 committed by GitHub
parent c55fee147b
commit 64ffc5a85d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/battle_script_commands.c
View File

@ -14111,12 +14111,13 @@ static void Cmd_trysetfutureattack(void)
static void Cmd_trydobeatup(void) static void Cmd_trydobeatup(void)
{ {
CMD_ARGS(const u8 *endInstr, const u8 *failInstr);
#if B_BEAT_UP >= GEN_5 #if B_BEAT_UP >= GEN_5
CMD_ARGS();
gBattleStruct->beatUpSlot++; gBattleStruct->beatUpSlot++;
gBattlescriptCurrInstr = cmd->nextInstr; gBattlescriptCurrInstr = cmd->nextInstr;
#else #else
CMD_ARGS(const u8 *endInstr, const u8 *failInstr);
struct Pokemon *party = GetBattlerParty(gBattlerAttacker); struct Pokemon *party = GetBattlerParty(gBattlerAttacker);
if (gBattleMons[gBattlerTarget].hp == 0) if (gBattleMons[gBattlerTarget].hp == 0)

2
src/data/battle_moves.h
View File

@ -12615,7 +12615,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] =
#else #else
.power = 120, .power = 120,
#endif #endif
.effect = EFFECT_RECOIL_50, .effect = EFFECT_STEEL_BEAM,
.type = TYPE_GRASS, .type = TYPE_GRASS,
.accuracy = 95, .accuracy = 95,
.pp = 5, .pp = 5,