Epsilon_02/pokeemerald-expansion
1
0
Fork 0
mirror of https://github.com/rh-hideout/pokeemerald-expansion synced 2025-10-05 23:42:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixes Beat Up incorrect slots usage (#7741)

Browse Source
This commit is contained in:
Alex
2025-09-17 11:40:40 +02:00
committed by GitHub
parent 74de29a921
commit f671b130a6
7 changed files with 38 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
asm/macros/battle_script.inc
View File

@@ -1050,7 +1050,7 @@
.4byte \failInstr
.endm
.macro trydobeatup endInstr, failInstr
.macro trydobeatup endInstr:req, failInstr:req
.byte 0xc4
.4byte \endInstr
.4byte \failInstr

10
data/battle_scripts_1.s
View File

@@ -4286,15 +4286,6 @@ BattleScript_DoEffectTeleport::
BattleScript_EffectBeatUp::
attackcanceler
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
.if B_BEAT_UP >= GEN_5
attackstring
ppreduce
critcalc
damagecalc
adjustdamage
trydobeatup
goto BattleScript_HitFromAtkAnimation
.else
attackstring
pause B_WAIT_TIME_SHORT
ppreduce
@@ -4324,7 +4315,6 @@ BattleScript_BeatUpAttack::
goto BattleScript_BeatUpLoop
BattleScript_BeatUpEnd::
end
.endif
BattleScript_EffectDefenseCurl::
attackcanceler

1
include/battle.h
View File

@@ -736,6 +736,7 @@ struct BattleStruct
u8 appearedInBattle; // Bitfield to track which Pokemon appeared in battle. Used for Burmy's form change
u8 skyDropTargets[MAX_BATTLERS_COUNT]; // For Sky Drop, to account for if multiple Pokemon use Sky Drop in a double battle.
// When using a move which hits multiple opponents which is then bounced by a target, we need to make sure, the move hits both opponents, the one with bounce, and the one without.
u16 beatUpSpecies[PARTY_SIZE];
u8 attackerBeforeBounce:2;
u8 beatUpSlot:3;
u8 pledgeMove:1;

7
src/battle_script_commands.c
View File

@@ -12470,12 +12470,6 @@ static void Cmd_trysetfutureattack(void)
static void Cmd_trydobeatup(void)
{
#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);
@@ -12520,7 +12514,6 @@ static void Cmd_trydobeatup(void)
gBattlescriptCurrInstr = cmd->failInstr;
}
}
#endif
}
static void Cmd_setsemiinvulnerablebit(void)

20
src/battle_util.c
View File

@@ -267,15 +267,8 @@ bool32 EndOrContinueWeather(void)
static u32 CalcBeatUpPower(void)
{
u32 basePower;
u32 species;
struct Pokemon *party = GetBattlerParty(gBattlerAttacker);
// Party slot is incremented by the battle script for Beat Up after this damage calculation
species = GetMonData(&party[gBattleStruct->beatUpSlot], MON_DATA_SPECIES);
basePower = (GetSpeciesBaseAttack(species) / 10) + 5;
return basePower;
u32 species = gBattleStruct->beatUpSpecies[gBattleStruct->beatUpSlot++];
return (GetSpeciesBaseAttack(species) / 10) + 5;
}
static bool32 ShouldTeraShellDistortTypeMatchups(u32 move, u32 battlerDef, u32 abilityDef)
@@ -2485,14 +2478,19 @@ static enum MoveCanceller CancellerMultihitMoves(void)
{
struct Pokemon* party = GetBattlerParty(gBattlerAttacker);
int i;
gBattleStruct->beatUpSlot = 0;
for (i = 0; i < PARTY_SIZE; i++)
{
if (GetMonData(&party[i], MON_DATA_HP)
&& GetMonData(&party[i], MON_DATA_SPECIES) != SPECIES_NONE
u32 species = GetMonData(&party[i], MON_DATA_SPECIES);
if (species != SPECIES_NONE
&& GetMonData(&party[i], MON_DATA_HP)
&& !GetMonData(&party[i], MON_DATA_IS_EGG)
&& !GetMonData(&party[i], MON_DATA_STATUS))
{
gBattleStruct->beatUpSpecies[gBattleStruct->beatUpSlot++] = species;
gMultiHitCounter++;
}
}
gBattleStruct->beatUpSlot = 0;

2
src/data/battle_move_effects.h
View File

@@ -791,7 +791,7 @@ const struct BattleMoveEffect gBattleMoveEffects[NUM_BATTLE_MOVE_EFFECTS] =
[EFFECT_BEAT_UP] =
{
.battleScript = BattleScript_EffectBeatUp,
.battleScript = (B_BEAT_UP >= GEN_5) ? BattleScript_EffectHit : BattleScript_EffectBeatUp,
.battleTvScore = 2,
},

27
test/battle/move_effect/beat_up.c
View File

@@ -2,7 +2,32 @@
#include "test/battle.h"
// General
TO_DO_BATTLE_TEST("Beat Up hits the target for each non-fainted, non-statused member in the party");
SINGLE_BATTLE_TEST("Beat Up hits the target for each non-fainted, non-statused member in the party")
{
GIVEN {
PLAYER(SPECIES_WOBBUFFET);
PLAYER(SPECIES_WYNAUT);
PLAYER(SPECIES_PICHU)
PLAYER(SPECIES_PIKACHU) { Status1(STATUS1_POISON); }
PLAYER(SPECIES_RAICHU)
OPPONENT(SPECIES_WOBBUFFET);
} WHEN {
TURN { MOVE(player, MOVE_BEAT_UP); }
} SCENE {
ANIMATION(ANIM_TYPE_MOVE, MOVE_BEAT_UP, player);
ANIMATION(ANIM_TYPE_MOVE, MOVE_BEAT_UP, player);
ANIMATION(ANIM_TYPE_MOVE, MOVE_BEAT_UP, player);
ANIMATION(ANIM_TYPE_MOVE, MOVE_BEAT_UP, player);
NOT ANIMATION(ANIM_TYPE_MOVE, MOVE_BEAT_UP, player);
MESSAGE("The Pokémon was hit 4 time(s)!");
} THEN {
EXPECT_EQ(gBattleStruct->beatUpSpecies[0], SPECIES_WOBBUFFET);
EXPECT_EQ(gBattleStruct->beatUpSpecies[1], SPECIES_WYNAUT);
EXPECT_EQ(gBattleStruct->beatUpSpecies[2], SPECIES_PICHU);
EXPECT_EQ(gBattleStruct->beatUpSpecies[3], SPECIES_RAICHU);
}
}
TO_DO_BATTLE_TEST("Beat Up doesn't consider Comatose as a status")
TO_DO_BATTLE_TEST("Beat Up's strikes have each an independent chance of a critical hit");