From 28ad1c82e3e70345aa0cea83ec71be570b0edfbd Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 1 Oct 2023 21:43:19 +0200 Subject: [PATCH 1/2] fix CreateNPCTrainerPartyForTrainer test failing --- test/battle/trainer_control.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/battle/trainer_control.c b/test/battle/trainer_control.c index cdb06adc253..a0e94dbbece 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); From 13ed0bad457ed80a0875941c402da8b42be55bac Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 1 Oct 2023 21:50:44 +0200 Subject: [PATCH 2/2] correct spelling mistakes --- test/battle/move_effect/multi_hit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/battle/move_effect/multi_hit.c b/test/battle/move_effect/multi_hit.c index 1aded8dd34a..6a034c830f9 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);