Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes Regenerator healing past maxHP (#5861)

Browse Source
This commit is contained in:
PhallenTree 2024-12-22 22:39:07 +00:00 committed by GitHub
parent 6a2a3b2540
commit f1458dea45
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 53 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/battle_script_commands.c
View File

@ -15121,10 +15121,10 @@ static void Cmd_switchoutabilities(void)
break;
case ABILITY_REGENERATOR:
{
u32 regenerate = GetNonDynamaxMaxHP(gBattlerAttacker) / 3;
u32 regenerate = GetNonDynamaxMaxHP(battler) / 3;
regenerate += gBattleMons[battler].hp;
if (gBattleStruct->moveDamage[gBattlerAttacker] > gBattleMons[battler].maxHP)
gBattleStruct->moveDamage[gBattlerAttacker] = gBattleMons[battler].maxHP;
if (regenerate > gBattleMons[battler].maxHP)
regenerate = gBattleMons[battler].maxHP;
BtlController_EmitSetMonData(battler, BUFFER_A, REQUEST_HP_BATTLE,
1u << *(gBattleStruct->battlerPartyIndexes + battler),
sizeof(regenerate),

50
test/battle/ability/regenerator.c Normal file
View File

@ -0,0 +1,50 @@
#include "global.h"
#include "test/battle.h"
SINGLE_BATTLE_TEST("Regenerator heals 1/3 of max HP upon switching out")
{
u32 currHP;
PARAMETRIZE { currHP = 1; }
PARAMETRIZE { currHP = 2; }
PARAMETRIZE { currHP = 3; }
GIVEN {
PLAYER(SPECIES_SLOWBRO) { Ability(ABILITY_REGENERATOR); HP(currHP); }
PLAYER(SPECIES_WOBBUFFET);
OPPONENT(SPECIES_WOBBUFFET);
} WHEN {
TURN { SWITCH(player, 1); }
TURN { SWITCH(player, 0); }
} SCENE {
SWITCH_OUT_MESSAGE("Slowbro");
SEND_IN_MESSAGE("Wobbuffet");
SWITCH_OUT_MESSAGE("Wobbuffet");
SEND_IN_MESSAGE("Slowbro");
} THEN {
EXPECT_EQ(player->hp, player->maxHP / 3 + currHP);
}
}
SINGLE_BATTLE_TEST("Regenerator heals 1/3 of max HP upon switching out but doesn't surpass max HP")
{
u32 currHP;
PARAMETRIZE { currHP = 5; }
PARAMETRIZE { currHP = 4; }
PARAMETRIZE { currHP = 3; }
PARAMETRIZE { currHP = 2; }
PARAMETRIZE { currHP = 1; }
GIVEN {
PLAYER(SPECIES_SLOWBRO) { Ability(ABILITY_REGENERATOR); HP(currHP); MaxHP(5); }
PLAYER(SPECIES_WOBBUFFET);
OPPONENT(SPECIES_WOBBUFFET);
} WHEN {
TURN { SWITCH(player, 1); }
TURN { SWITCH(player, 0); }
} SCENE {
SWITCH_OUT_MESSAGE("Slowbro");
SEND_IN_MESSAGE("Wobbuffet");
SWITCH_OUT_MESSAGE("Wobbuffet");
SEND_IN_MESSAGE("Slowbro");
} THEN {
EXPECT_LE(player->hp, player->maxHP);
}
}