Fix CreateNPCTrainerPartyForTrainer test failing on modern (#3367)

rh-hideout · Oct 2, 2023 · a9528e7 · a9528e7
1 parent 3c32011
commit a9528e7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git 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
@@ -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);