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

Fixes givemon moves not defaulting to none (#4377)

Browse Source
This commit is contained in:
Alex 2024-04-11 21:34:11 +02:00 committed by GitHub
parent 5d9f78bcb5
commit ee3a577240
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/script_pokemon_util.c
View File

@ -347,7 +347,9 @@ u32 ScriptGiveMonParameterized(u16 species, u8 level, u16 item, u8 ball, u8 natu
// moves // moves
for (i = 0; i < MAX_MON_MOVES; i++) for (i = 0; i < MAX_MON_MOVES; i++)
{ {
if (moves[i] == MOVE_NONE || moves[i] >= MOVES_COUNT) if (moves[0] == MOVE_NONE)
break;
if (moves[i] >= MOVES_COUNT)
continue; continue;
SetMonMoveSlot(&mon, moves[i], i); SetMonMoveSlot(&mon, moves[i], i);
} }
@ -400,7 +402,7 @@ u32 ScriptGiveMonParameterized(u16 species, u8 level, u16 item, u8 ball, u8 natu
} }
// set pokédex flags // set pokédex flags
nationalDexNum = SpeciesToNationalPokedexNum(species); nationalDexNum = SpeciesToNationalPokedexNum(species);
switch (sentToPc) switch (sentToPc)
{ {
case MON_GIVEN_TO_PARTY: case MON_GIVEN_TO_PARTY:
@ -514,7 +516,7 @@ void Script_SetStatus1(struct ScriptContext *ctx)
} }
} }
else else
{ {
SetMonData(&gPlayerParty[slot], MON_DATA_STATUS, &status1); SetMonData(&gPlayerParty[slot], MON_DATA_STATUS, &status1);
} }
} }

16
test/pokemon.c
View File

@ -193,6 +193,22 @@ TEST("givemon [simple]")
EXPECT_EQ(GetMonData(&gPlayerParty[0], MON_DATA_LEVEL), 100); EXPECT_EQ(GetMonData(&gPlayerParty[0], MON_DATA_LEVEL), 100);
} }
TEST("givemon [moves]")
{
ZeroPlayerPartyMons();
RUN_OVERWORLD_SCRIPT(
givemon SPECIES_WOBBUFFET, 100, move1=MOVE_TACKLE, move2=MOVE_SPLASH, move3=MOVE_NONE, move4=MOVE_NONE;
);
EXPECT_EQ(GetMonData(&gPlayerParty[0], MON_DATA_SPECIES), SPECIES_WOBBUFFET);
EXPECT_EQ(GetMonData(&gPlayerParty[0], MON_DATA_LEVEL), 100);
EXPECT_EQ(GetMonData(&gPlayerParty[0], MON_DATA_MOVE1), MOVE_TACKLE);
EXPECT_EQ(GetMonData(&gPlayerParty[0], MON_DATA_MOVE2), MOVE_SPLASH);
EXPECT_EQ(GetMonData(&gPlayerParty[0], MON_DATA_MOVE3), MOVE_NONE);
EXPECT_EQ(GetMonData(&gPlayerParty[0], MON_DATA_MOVE4), MOVE_NONE);
}
TEST("givemon [all]") TEST("givemon [all]")
{ {
ZeroPlayerPartyMons(); ZeroPlayerPartyMons();