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

Fix tests failing with B_FRIENDSHIP_BOOST being TRUE (#7194)

Browse Source 
Co-authored-by: hedara90 <90hedara@gmail.com>
This commit is contained in:
Eduardo Quezada 2025-06-25 08:01:31 -04:00 committed by GitHub
parent 675fb8f60e
commit 8d81f60313
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
test/pokemon.c
View File

@ -82,10 +82,14 @@ TEST("Shininess independent from PID and OTID")
TEST("Hyper Training increases stats without affecting IVs")
{
u32 data, hp, atk, def, speed, spatk, spdef;
u32 data, hp, atk, def, speed, spatk, spdef, friendship = 0;
struct Pokemon mon;
CreateMon(&mon, SPECIES_WOBBUFFET, 100, 3, TRUE, 0, OT_ID_PRESET, 0);
// Consider B_FRIENDSHIP_BOOST.
SetMonData(&mon, MON_DATA_FRIENDSHIP, &friendship);
CalculateMonStats(&mon);
hp = GetMonData(&mon, MON_DATA_HP);
atk = GetMonData(&mon, MON_DATA_ATK);
def = GetMonData(&mon, MON_DATA_DEF);
@ -142,8 +146,13 @@ TEST("Status1 round-trips through BoxPokemon")
TEST("canhypertrain/hypertrain affect MON_DATA_HYPER_TRAINED_* and recalculate stats")
{
u32 atk;
u32 atk, friendship = 0;
CreateMon(&gPlayerParty[0], SPECIES_WOBBUFFET, 100, 0, FALSE, 0, OT_ID_PRESET, 0);
// Consider B_FRIENDSHIP_BOOST.
SetMonData(&gPlayerParty[0], MON_DATA_FRIENDSHIP, &friendship);
CalculateMonStats(&gPlayerParty[0]);
atk = GetMonData(&gPlayerParty[0], MON_DATA_ATK);
RUN_OVERWORLD_SCRIPT(

7
test/test_runner_battle.c
View File

@ -1563,6 +1563,13 @@ void OpenPokemon(u32 sourceLine, u32 side, u32 species)
data = MOVE_NONE;
for (i = 0; i < MAX_MON_MOVES; i++)
SetMonData(DATA.currentMon, MON_DATA_MOVE1 + i, &data);
data = 0;
if (B_FRIENDSHIP_BOOST)
{
// This way, we avoid the boost affecting tests unless explicitly stated.
SetMonData(DATA.currentMon, MON_DATA_FRIENDSHIP, &data);
CalculateMonStats(DATA.currentMon);
}
}
// (sNaturePersonalities[i] % NUM_NATURES) == i