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 /arm9 | |
| parent | 1606a77609fea869c5f9bd193acc935924184e15 (diff) | |
| parent | a6a28d52879cac2088a91cfa269d42bea775dde9 (diff) | |
Merge branch 'pikalax_work' of github.com:PikalaxALT/pokediamond into pikalax_work
Diffstat (limited to 'arm9')
| -rw-r--r-- | arm9/asm/unk_020023C0.s | 2 | ||||
| -rw-r--r-- | arm9/src/trainer_data.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arm9/asm/unk_020023C0.s b/arm9/asm/unk_020023C0.s index a84fda87..604c7211 100644 --- a/arm9/asm/unk_020023C0.s +++ b/arm9/asm/unk_020023C0.s @@ -180,7 +180,7 @@ _020024DA: beq _0200251A b _02002700 _020024E4: - add r0, r0, #0x1 + add r0, r0, #0x1 ; =0x0000FFFF EOS cmp r5, r0 beq _020024EC b _02002700 diff --git a/arm9/src/trainer_data.c b/arm9/src/trainer_data.c index 7c52a78f..7af4b2ce 100644 --- a/arm9/src/trainer_data.c +++ b/arm9/src/trainer_data.c @@ -13,7 +13,7 @@ extern void * FUN_02024EC0(struct SaveBlock2 *); extern u16 * FUN_02024EE8(void *); // Loads all battle opponents, including multi-battle partner if exists. -void EnemyTrainerSet_Init(struct EnemyTrainerSet * enemies, struct SaveBlock2 * sav2, u32 heap_id) +void EnemyTrainerSet_Init(struct BattleSetupStruct * enemies, struct SaveBlock2 * sav2, u32 heap_id) { struct TrainerDataLoaded trdata; struct MsgData * msgData; @@ -261,7 +261,7 @@ int TrainerClass_GetGenderOrTrainerCount(int a0) return sTrainerClassGenderCountTbl[a0]; } -void CreateNPCTrainerParty(struct EnemyTrainerSet * enemies, s32 party_id, u32 heap_id) +void CreateNPCTrainerParty(struct BattleSetupStruct * enemies, s32 party_id, u32 heap_id) { union TrainerMon * data; s32 i; |