diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2021-06-17 14:32:35 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-06-17 14:32:35 -0400 |
| commit | 42650e1507008d0ad3a710e0b8ec27d8ad97bd26 (patch) | |
| tree | 0f912926525a2d4da4c60eeff6a29b21b94ccb09 /src/pokemon_2.c | |
| parent | acb87f3f2feb5e87590148fd31c48abb8cfa42d2 (diff) | |
document ewram macros in BattleStartClearSetData
Diffstat (limited to 'src/pokemon_2.c')
| -rw-r--r-- | src/pokemon_2.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/pokemon_2.c b/src/pokemon_2.c index 17f0aa768..f19b0f0be 100644 --- a/src/pokemon_2.c +++ b/src/pokemon_2.c @@ -1077,27 +1077,27 @@ void CreateSecretBaseEnemyParty(struct SecretBaseRecord *secretBaseRecord) for (i = 0; i < 6; i++) { - if (eSecretBaseRecord->partySpecies[i]) + if (eSecretBaseRecord->party.species[i]) { CreateMon(&gEnemyParty[i], - eSecretBaseRecord->partySpecies[i], - eSecretBaseRecord->partyLevels[i], + eSecretBaseRecord->party.species[i], + eSecretBaseRecord->party.levels[i], 15, 1, - eSecretBaseRecord->partyPersonality[i], + eSecretBaseRecord->party.personality[i], 2, 0); // these two SetMonData calls require the (u8 *) cast since SetMonData is declared in this function. - SetMonData(&gEnemyParty[i], MON_DATA_HELD_ITEM, (u8 *)&eSecretBaseRecord->partyHeldItems[i]); + SetMonData(&gEnemyParty[i], MON_DATA_HELD_ITEM, (u8 *)&eSecretBaseRecord->party.heldItems[i]); for (j = 0; j < 6; j++) - SetMonData(&gEnemyParty[i], MON_DATA_HP_EV + j, &eSecretBaseRecord->partyEVs[i]); + SetMonData(&gEnemyParty[i], MON_DATA_HP_EV + j, &eSecretBaseRecord->party.EVs[i]); for (j = 0; j < 4; j++) { - SetMonData(&gEnemyParty[i], MON_DATA_MOVE1 + j, (u8 *)&eSecretBaseRecord->partyMoves[i * 4 + j]); - SetMonData(&gEnemyParty[i], MON_DATA_PP1 + j, &gBattleMoves[eSecretBaseRecord->partyMoves[i * 4 + j]].pp); + SetMonData(&gEnemyParty[i], MON_DATA_MOVE1 + j, (u8 *)&eSecretBaseRecord->party.moves[i * 4 + j]); + SetMonData(&gEnemyParty[i], MON_DATA_PP1 + j, &gBattleMoves[eSecretBaseRecord->party.moves[i * 4 + j]].pp); } } } |