Leahnaya/pokeemerald-expansion
1
0
Fork 0
mirror of https://github.com/rh-hideout/pokeemerald-expansion.git synced 2026-04-26 02:14:22 -05:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Fix Leppa Berry PP restore target under forced-consumption effects (#9108)
Some checks are pending
CI / build (push) Waiting to run
Details
CI / docs_validate (push) Waiting to run
Details
CI / allcontributors (push) Waiting to run
Details
Docs / deploy (push) Waiting to run
Details

Browse Source
This commit is contained in:
GGbond 2026-02-03 03:49:49 +08:00 committed by GitHub
parent 03c63f5e4a
commit 4bf88de669
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 81 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
src/battle_hold_effects.c
View File

@ -891,43 +891,66 @@ static u32 ItemRestorePp(u32 battler, u32 itemId, ActivationTiming timing)
{
enum ItemEffect effect = ITEM_NO_EFFECT;
struct Pokemon *mon = GetBattlerMon(battler);
u32 i, changedPP = 0;
u32 changedPP = 0;
u32 restoreMove = MAX_MON_MOVES;
u32 missingMove = MAX_MON_MOVES;
u32 ppBonuses = GetMonData(mon, MON_DATA_PP_BONUSES);
bool32 override = gBattleScripting.overrideBerryRequirements;
enum Ability ability = GetBattlerAbility(battler);
for (i = 0; i < MAX_MON_MOVES; i++)
for (u32 i = 0; i < MAX_MON_MOVES; i++)
{
u32 move = GetMonData(mon, MON_DATA_MOVE1 + i);
u32 currentPP = GetMonData(mon, MON_DATA_PP1 + i);
u32 ppBonuses = GetMonData(mon, MON_DATA_PP_BONUSES);
u32 maxPP = CalculatePPWithBonus(move, ppBonuses, i);
if (move && (currentPP == 0 || (gBattleScripting.overrideBerryRequirements && currentPP != maxPP)))
if (move == MOVE_NONE)
continue;
if (currentPP == 0)
{
u32 ppRestored = GetItemHoldEffectParam(itemId);
if (ability == ABILITY_RIPEN)
{
ppRestored *= 2;
gBattlerAbility = battler;
}
if (currentPP + ppRestored > maxPP)
changedPP = maxPP;
else
changedPP = currentPP + ppRestored;
PREPARE_MOVE_BUFFER(gBattleTextBuff1, move);
if (timing == IsOnSwitchInFirstTurnActivation)
BattleScriptExecute(BattleScript_BerryPPHealEnd2);
else
BattleScriptCall(BattleScript_BerryPPHealRet);
gBattleScripting.battler = battler;
BtlController_EmitSetMonData(battler, B_COMM_TO_CONTROLLER, i + REQUEST_PPMOVE1_BATTLE, 0, 1, &changedPP);
MarkBattlerForControllerExec(battler);
if (MOVE_IS_PERMANENT(battler, i))
gBattleMons[battler].pp[i] = changedPP;
effect = ITEM_PP_CHANGE;
restoreMove = i;
break;
}
if (override && missingMove == MAX_MON_MOVES)
{
u32 maxPP = CalculatePPWithBonus(move, ppBonuses, i);
if (currentPP < maxPP)
missingMove = i;
}
}
if (restoreMove == MAX_MON_MOVES && override)
restoreMove = missingMove;
if (restoreMove != MAX_MON_MOVES)
{
u32 move = GetMonData(mon, MON_DATA_MOVE1 + restoreMove);
u32 currentPP = GetMonData(mon, MON_DATA_PP1 + restoreMove);
u32 maxPP = CalculatePPWithBonus(move, ppBonuses, restoreMove);
u32 ppRestored = GetItemHoldEffectParam(itemId);
if (ability == ABILITY_RIPEN)
{
ppRestored *= 2;
gBattlerAbility = battler;
}
changedPP = currentPP + ppRestored;
if (changedPP > maxPP)
changedPP = maxPP;
PREPARE_MOVE_BUFFER(gBattleTextBuff1, move);
if (timing == IsOnSwitchInFirstTurnActivation)
BattleScriptExecute(BattleScript_BerryPPHealEnd2);
else
BattleScriptCall(BattleScript_BerryPPHealRet);
gBattleScripting.battler = battler;
BtlController_EmitSetMonData(battler, B_COMM_TO_CONTROLLER, restoreMove + REQUEST_PPMOVE1_BATTLE, 0, 1, &changedPP);
MarkBattlerForControllerExec(battler);
if (MOVE_IS_PERMANENT(battler, restoreMove))
gBattleMons[battler].pp[restoreMove] = changedPP;
effect = ITEM_PP_CHANGE;
}
return effect;
}

28
test/battle/hold_effect/restore_pp.c
View File

@ -21,3 +21,31 @@ SINGLE_BATTLE_TEST("Restore PP berry activates immediately on switch in")
EXPECT(player->item == ITEM_NONE);
}
}
SINGLE_BATTLE_TEST("Forced Leppa Berry consumption restores a move at 0 PP before other missing PP")
{
GIVEN {
ASSUME(GetMoveEffect(MOVE_FLING) == EFFECT_FLING);
PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_LEPPA_BERRY); Moves(MOVE_FLING); }
OPPONENT(SPECIES_WYNAUT) { MovesWithPP({MOVE_SCRATCH, 6}, {MOVE_CELEBRATE, 0}, {MOVE_POUND, 35}); }
} WHEN {
TURN { MOVE(player, MOVE_FLING); MOVE(opponent, MOVE_POUND); }
} THEN {
EXPECT_EQ(opponent->pp[0], 6);
EXPECT_EQ(opponent->pp[1], 10);
}
}
SINGLE_BATTLE_TEST("Forced Leppa Berry consumption restores the first move found missing PP when none are at 0")
{
GIVEN {
ASSUME(GetMoveEffect(MOVE_FLING) == EFFECT_FLING);
PLAYER(SPECIES_WOBBUFFET) { Item(ITEM_LEPPA_BERRY); Moves(MOVE_FLING); }
OPPONENT(SPECIES_WYNAUT) { MovesWithPP({MOVE_SCRATCH, 6}, {MOVE_CELEBRATE, 6}, {MOVE_POUND, 35}); }
} WHEN {
TURN { MOVE(player, MOVE_FLING); MOVE(opponent, MOVE_POUND); }
} THEN {
EXPECT_EQ(opponent->pp[0], 16);
EXPECT_EQ(opponent->pp[1], 6);
}
}