diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle_tower.h | 11 | ||||
| -rw-r--r-- | include/global.h | 15 |
2 files changed, 12 insertions, 14 deletions
diff --git a/include/battle_tower.h b/include/battle_tower.h index a47007122..4b68be923 100644 --- a/include/battle_tower.h +++ b/include/battle_tower.h @@ -7,15 +7,14 @@ struct RSBattleTowerRecord { - /*0x00*/ u8 battleTowerLevelType; // 0 = level 50, 1 = level 100 - /*0x01*/ u8 trainerClass; + /*0x00*/ u8 lvlMode; // 0 = level 50, 1 = level 100 + /*0x01*/ u8 facilityClass; /*0x02*/ u16 winStreak; /*0x04*/ u8 name[PLAYER_NAME_LENGTH + 1]; /*0x0C*/ u8 trainerId[4]; /*0x10*/ u16 greeting[6]; /*0x1C*/ struct UnknownPokemonStruct party[3]; /*0xA0*/ u32 checksum; - /*0xA4*/ u16 unk_11c8; }; union BattleTowerRecord @@ -54,12 +53,14 @@ extern const struct FacilityMon *gFacilityTrainerMons; u16 GetCurrentBattleTowerWinStreak(u8, u8); void sub_81659DC(struct RSBattleTowerRecord *a0, struct RSBattleTowerRecord *a1); -bool32 sub_816587C(union BattleTowerRecord *, union BattleTowerRecord *); +bool32 RubyBattleTowerRecordToEmerald(struct RSBattleTowerRecord *src, struct EmeraldBattleTowerRecord *dst); void CalcEmeraldBattleTowerChecksum(struct EmeraldBattleTowerRecord *); -void PutNewBattleTowerRecord(union BattleTowerRecord *); +void PutNewBattleTowerRecord(struct EmeraldBattleTowerRecord *newRecordEm); void SetBattleFacilityTrainerGfxId(u16 trainerId, u8 tempVarId); void FrontierSpeechToString(const u16 *words); void GetFrontierTrainerName(u8 *dest, u16 trainerIdx); void GetEreaderTrainerName(u8 *dest); +void FillFrontierTrainerParty(u8 monsCount); +void FillFrontierTrainersParties(u8 monsCount); #endif //GUARD_BATTLE_TOWER_H diff --git a/include/global.h b/include/global.h index 6840d5fe2..a7b50278c 100644 --- a/include/global.h +++ b/include/global.h @@ -288,7 +288,7 @@ struct Apprentice u8 lvlMode:2; // + 1 u8 field_1; u8 number; - struct ApprenticeMon monData[3]; + struct ApprenticeMon party[3]; u16 easyChatWords[6]; u8 playerId[4]; u8 playerName[PLAYER_NAME_LENGTH]; @@ -383,8 +383,8 @@ struct BattleFrontier /*0x738*/ struct EmeraldBattleTowerRecord towerRecords[5]; // From record mixing. /*0xBD4*/ u16 field_BD4; /*0xBD6*/ u16 field_BD6; - /*0xBD8*/ u8 field_BD8[11]; - /*0xBE3*/ u8 field_BE3[8]; + /*0xBD8*/ u8 field_BD8[PLAYER_NAME_LENGTH + 1]; + /*0xBE3*/ u8 field_BE0[POKEMON_NAME_LENGTH + 1]; /*0xBEB*/ u8 field_BEB; /*0xBEC*/ struct BattleTowerEReaderTrainer ereaderTrainer; /*0xCA8*/ u8 field_CA8; @@ -395,15 +395,12 @@ struct BattleFrontier /*0xCA9*/ u8 field_CA9_d:1; // 0x20 /*0xCA9*/ u8 field_CA9_e:1; // 0x40 /*0xCA9*/ u8 field_CA9_f:1; // 0x80 - /*0xCAA*/ u16 field_CAA[3]; + /*0xCAA*/ u16 selectedPartyMons[3]; /*0xCB0*/ u16 field_CB0; /*0xCB2*/ u16 curChallengeBattleNum; // In case of battle pyramid, the floor. - /*0xCB4*/ u16 battledTrainerIds[17]; - u16 field_CD6; - u16 field_CD8; - u16 field_CDA; + /*0xCB4*/ u16 field_CB4[20]; /*0xCDC*/ u32 field_CDC; - /*0xCE0*/ u16 field_CE0[4][2]; + /*0xCE0*/ u16 winStreaks[4][2]; /*0xCF0*/ u16 field_CF0[2]; /*0xCF4*/ u16 field_CF4[2]; /*0xCF8*/ u16 field_CF8[2]; |