diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle_tower.h | 6 | ||||
| -rw-r--r-- | include/global.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/battle_tower.h b/include/battle_tower.h index e1655f2c6..87581074e 100644 --- a/include/battle_tower.h +++ b/include/battle_tower.h @@ -24,7 +24,7 @@ union BattleTowerRecord struct BattleFrontierTrainer { - u32 trainerClass; + u32 facilityClass; u8 trainerName[8]; u16 speechBefore[6]; u16 speechWin[6]; @@ -32,7 +32,7 @@ struct BattleFrontierTrainer u16 *btMonPool; }; -extern struct BattleFrontierTrainer *gUnknown_0203BC88; +extern const struct BattleFrontierTrainer *gFacilityTrainers; u16 sub_8164FCC(u8, u8); void sub_81659DC(struct RSBattleTowerRecord *a0, struct RSBattleTowerRecord *a1); @@ -40,7 +40,7 @@ bool32 sub_816587C(union BattleTowerRecord *, union BattleTowerRecord *); void CalcEmeraldBattleTowerChecksum(struct EmeraldBattleTowerRecord *); void sub_81628A0(union BattleTowerRecord *); void sub_8162614(u16 trainerId, u8); -void ConvertBattleFrontierTrainerSpeechToString(u16 *words); +void ConvertBattleFrontierTrainerSpeechToString(const u16 *words); void GetFrontierTrainerName(u8 *dest, u16 trainerIdx); void GetEreaderTrainerName(u8 *dest); diff --git a/include/global.h b/include/global.h index a4db847a4..d3abb8269 100644 --- a/include/global.h +++ b/include/global.h @@ -340,8 +340,8 @@ struct FrontierMonData struct BattleDomeTrainer { u16 trainerId:10; - u16 unk1:1; - u16 unk2:2; + u16 isEliminated:1; + u16 eliminatedAt:2; u16 unk3:3; }; |