From a9528e7adec7f0b4719eda4e1b9b43a0d3791b82 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 2 Oct 2023 23:33:47 +0200 Subject: [PATCH] Fix CreateNPCTrainerPartyForTrainer test failing on modern (#3367) --- test/battle/move_effect/multi_hit.c | 4 ++-- test/battle/trainer_control.c | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/test/battle/move_effect/multi_hit.c b/test/battle/move_effect/multi_hit.c index 1aded8dd3..6a034c830 100644 --- a/test/battle/move_effect/multi_hit.c +++ b/test/battle/move_effect/multi_hit.c @@ -134,7 +134,7 @@ SINGLE_BATTLE_TEST("Multi hit Moves hit five times 50 Percent of the time with L } } -SINGLE_BATTLE_TEST("Scale Shot decreses defense and increases speed after final hit") +SINGLE_BATTLE_TEST("Scale Shot decreases defense and increases speed after final hit") { GIVEN { ASSUME(gBattleMoves[MOVE_SCALE_SHOT].effect == EFFECT_MULTI_HIT); @@ -156,7 +156,7 @@ SINGLE_BATTLE_TEST("Scale Shot decreses defense and increases speed after final } } -SINGLE_BATTLE_TEST("Endure does not prevent multiply hits and stat changes accure at the end of the turn") +SINGLE_BATTLE_TEST("Endure does not prevent multiple hits and stat changes occur at the end of the turn") { GIVEN { ASSUME(gBattleMoves[MOVE_SCALE_SHOT].effect == EFFECT_MULTI_HIT); diff --git a/test/battle/trainer_control.c b/test/battle/trainer_control.c index cdb06adc2..a0e94dbbe 100644 --- a/test/battle/trainer_control.c +++ b/test/battle/trainer_control.c @@ -106,8 +106,7 @@ TEST("CreateNPCTrainerPartyForTrainer generates customized Pokémon") GetMonData(&testParty[1], MON_DATA_NICKNAME, nickBuffer); EXPECT(StringCompare(nickBuffer, COMPOUND_STRING("Wobbuffet")) == 0); - EXPECT(GetGenderFromSpeciesAndPersonality(GetMonData(&testParty[0], MON_DATA_SPECIES, 0), testParty[0].box.personality) == MON_FEMALE); - + EXPECT(GetMonGender(&testParty[0]) == MON_FEMALE); EXPECT(GetNature(&testParty[0]) == NATURE_HASTY); Free(testParty);