diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-10-29 02:22:10 -0400 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-10-29 02:22:10 -0400 |
| commit | e08f3e4398d6c1dc21437e7b6462521ecfd299a6 (patch) | |
| tree | 091f01d939dded6f33efb3c72f575c40e7c1384f | |
| parent | 979a533892e335e11cef9cc353c1e1c87634f8b9 (diff) | |
change SetMonData and SetBoxMonData prototypes
| -rw-r--r-- | include/pokemon.h | 6 | ||||
| -rw-r--r-- | src/pokemon/pokemon_2.c | 11 |
2 files changed, 9 insertions, 8 deletions
diff --git a/include/pokemon.h b/include/pokemon.h index 1ab326b6a..d653067e4 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -541,11 +541,13 @@ union PokemonSubstruct *GetSubstruct(struct BoxPokemon *boxMon, u32 personality, // but they are not used since some code erroneously omits the third arg. // u32 GetMonData(struct Pokemon *mon, s32 field, u8 *data); // u32 GetBoxMonData(struct BoxPokemon *boxMon, s32 field, u8 *data); +// void SetMonData(struct Pokemon *mon, s32 field, const void *dataArg); +// void SetBoxMonData(struct BoxPokemon *boxMon, s32 field, const void *dataArg); u32 GetMonData(); u32 GetBoxMonData(); +void SetMonData(); +void SetBoxMonData(); -void SetMonData(struct Pokemon *mon, s32 field, const void *dataArg); -void SetBoxMonData(struct BoxPokemon *boxMon, s32 field, const void *dataArg); void CopyMon(void *dest, void *src, size_t size); u8 GiveMonToPlayer(struct Pokemon *mon); u8 SendMonToPC(struct Pokemon *mon); diff --git a/src/pokemon/pokemon_2.c b/src/pokemon/pokemon_2.c index 72d41c7a6..d3bdf3a13 100644 --- a/src/pokemon/pokemon_2.c +++ b/src/pokemon/pokemon_2.c @@ -631,9 +631,8 @@ u32 GetBoxMonData(struct BoxPokemon *boxMon, s32 field, u8 *data) #define SET16(lhs) (lhs) = data[0] + (data[1] << 8) #define SET32(lhs) (lhs) = data[0] + (data[1] << 8) + (data[2] << 16) + (data[3] << 24) -void SetMonData(struct Pokemon *mon, s32 field, const void *dataArg) +void SetMonData(struct Pokemon *mon, s32 field, const u8 *data) { - u8 *data = (u8 *)dataArg; switch (field) { case MON_DATA_STATUS: @@ -674,9 +673,8 @@ void SetMonData(struct Pokemon *mon, s32 field, const void *dataArg) } } -void SetBoxMonData(struct BoxPokemon *boxMon, s32 field, const void *dataArg) +void SetBoxMonData(struct BoxPokemon *boxMon, s32 field, const u8 *data) { - u8 *data = (u8 *)dataArg; struct PokemonSubstruct0 *substruct0 = NULL; struct PokemonSubstruct1 *substruct1 = NULL; struct PokemonSubstruct2 *substruct2 = NULL; @@ -1079,14 +1077,15 @@ void CreateSecretBaseEnemyParty(struct SecretBaseRecord *secretBaseRecord) 2, 0); - SetMonData(&gEnemyParty[i], MON_DATA_HELD_ITEM, &gSecretBaseRecord.partyHeldItems[i]); + // these two SetMonData calls require the (u8 *) cast since SetMonData is declared in this function. + SetMonData(&gEnemyParty[i], MON_DATA_HELD_ITEM, (u8 *)&gSecretBaseRecord.partyHeldItems[i]); for (j = 0; j < 6; j++) SetMonData(&gEnemyParty[i], MON_DATA_HP_EV + j, &gSecretBaseRecord.partyEVs[i]); for (j = 0; j < 4; j++) { - SetMonData(&gEnemyParty[i], MON_DATA_MOVE1 + j, &gSecretBaseRecord.partyMoves[i * 4 + j]); + SetMonData(&gEnemyParty[i], MON_DATA_MOVE1 + j, (u8 *)&gSecretBaseRecord.partyMoves[i * 4 + j]); SetMonData(&gEnemyParty[i], MON_DATA_PP1 + j, &gBattleMoves[gSecretBaseRecord.partyMoves[i * 4 + j]].pp); } } |