Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix CreateNPCTrainerPartyForTrainer test failing on modern #3367

Merged
merged 2 commits into from
Oct 2, 2023
Merged

Fix CreateNPCTrainerPartyForTrainer test failing on modern #3367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
28ad1c8
fix CreateNPCTrainerPartyForTrainer test failing
DizzyEggg Oct 1, 2023
13ed0ba
correct spelling mistakes
DizzyEggg Oct 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions test/battle/move_effect/multi_hit.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand Down
3 changes: 1 addition & 2 deletions test/battle/trainer_control.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Loading