diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-09-02 09:13:51 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-09-02 09:13:51 -0400 |
| commit | e2dbbd17ad639eb56e3d769ab6b935af9a35ffab (patch) | |
| tree | 28c247243352a921559689bc70c708efde763116 /include/trainer_data.h | |
| parent | 1606a77609fea869c5f9bd193acc935924184e15 (diff) | |
| parent | a6a28d52879cac2088a91cfa269d42bea775dde9 (diff) | |
Merge branch 'pikalax_work' of github.com:PikalaxALT/pokediamond into pikalax_work
Diffstat (limited to 'include/trainer_data.h')
| -rw-r--r-- | include/trainer_data.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/trainer_data.h b/include/trainer_data.h index 0951a5dd..8a63e290 100644 --- a/include/trainer_data.h +++ b/include/trainer_data.h @@ -69,7 +69,7 @@ struct TrainerDataLoaded u8 padding[16]; }; -struct EnemyTrainerSet +struct BattleSetupStruct { u32 flags; struct PlayerParty * parties[4]; @@ -78,13 +78,13 @@ struct EnemyTrainerSet struct TrainerDataLoaded datas[4]; }; -void EnemyTrainerSet_Init(struct EnemyTrainerSet * sp0, struct SaveBlock2 * r4, u32 sp4); +void EnemyTrainerSet_Init(struct BattleSetupStruct * sp0, struct SaveBlock2 * r4, u32 sp4); s32 TrainerData_GetAttr(u32 tr_idx, u32 attr_no); BOOL TrainerMessageWithIdPairExists(u32 pos, u32 idx, u32 heap_id); void GetTrainerMessageByIdPair(u32 pos, u32 idx, struct String * str, u32 heap_id); void TrainerData_ReadTrData(u32 idx, struct TrainerData * dest); void TrainerData_ReadTrPoke(u32 idx, union TrainerMon * dest); int TrainerClass_GetGenderOrTrainerCount(int a0); -void CreateNPCTrainerParty(struct EnemyTrainerSet * enemies, s32 party_id, u32 heap_id); +void CreateNPCTrainerParty(struct BattleSetupStruct * enemies, s32 party_id, u32 heap_id); #endif //POKEDIAMOND_TRAINER_DATA_H |