From f4e55999a5282dc1d2b94e0ca14081de6aae93ba Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 20 Oct 2018 00:33:51 +0200 Subject: begin porting and decomping battle tower --- include/battle_tower.h | 6 +++++- include/global.h | 29 ++++++----------------------- 2 files changed, 11 insertions(+), 24 deletions(-) (limited to 'include') diff --git a/include/battle_tower.h b/include/battle_tower.h index 5879a73bb..6af87210b 100644 --- a/include/battle_tower.h +++ b/include/battle_tower.h @@ -1,6 +1,10 @@ #ifndef GUARD_BATTLE_TOWER_H #define GUARD_BATTLE_TOWER_H +#define BATTLE_TOWER_EREADER_TRAINER_ID 200 +#define BATTLE_TOWER_RECORD_MIXING_TRAINER_BASE_ID 300 +#define BATTLE_TOWER_RECORD_APPRENTICE_BASE_ID 400 + struct RSBattleTowerRecord { /*0x00*/ u8 battleTowerLevelType; // 0 = level 50, 1 = level 100 @@ -46,7 +50,7 @@ struct FacilityMon extern const struct BattleFrontierTrainer *gFacilityTrainers; extern const struct FacilityMon *gFacilityTrainerMons; -u16 sub_8164FCC(u8, u8); +u16 GetCurrentBattleTowerWinStreak(u8, u8); void sub_81659DC(struct RSBattleTowerRecord *a0, struct RSBattleTowerRecord *a1); bool32 sub_816587C(union BattleTowerRecord *, union BattleTowerRecord *); void CalcEmeraldBattleTowerChecksum(struct EmeraldBattleTowerRecord *); diff --git a/include/global.h b/include/global.h index b92f1097f..35e34e722 100644 --- a/include/global.h +++ b/include/global.h @@ -275,26 +275,6 @@ struct BerryCrush u32 unk; }; -struct UnknownSaveBlock2Struct -{ - u8 field_0; - u8 field_1; - u8 field_2[2]; - u8 field_4[8]; - u8 field_C[16]; - u16 field_1C[6]; - u16 field_28[6]; - u8 field_34[176]; - u8 field_E4; - u8 field_E5; - u8 field_E6; - u8 field_E7; - u8 field_E8; - u8 field_E9; - u8 field_EA; - u8 field_EB; -}; // sizeof = 0xEC - struct ApprenticeMon { u16 species; @@ -345,7 +325,7 @@ struct UnknownPokemonStruct struct EmeraldBattleTowerRecord { - /*0x00*/ u8 battleTowerLevelType; // 0 = level 50, 1 = level 100 + /*0x00*/ u8 lvlMode; // 0 = level 50, 1 = level 100 /*0x01*/ u8 trainerClass; /*0x02*/ u16 winStreak; /*0x04*/ u8 name[PLAYER_NAME_LENGTH + 1]; @@ -387,7 +367,7 @@ struct BattleDomeTrainer struct BattleFrontier { /*0x64C*/ struct EmeraldBattleTowerRecord battleTower; - /*0x738*/ struct UnknownSaveBlock2Struct field_738[5]; // No idea here, it's probably wrong, no clue. + /*0x738*/ struct EmeraldBattleTowerRecord records[5]; // No idea here, it's probably wrong, no clue. /*0xBD4*/ u16 field_BD4; /*0xBD6*/ u16 field_BD6; /*0xBD8*/ u8 field_BD8[11]; @@ -415,7 +395,10 @@ struct BattleFrontier /*0xCF0*/ u16 field_CF0[2]; /*0xCF4*/ u16 field_CF4[2]; /*0xCF8*/ u16 field_CF8[2]; - /*0xCFC*/ u16 field_CFC[5]; + /*0xCFC*/ u16 field_CFC[2]; + /*0xD06*/ u16 field_D00; + /*0xD06*/ u16 field_D02; + /*0xD06*/ u16 field_D04; /*0xD06*/ u8 field_D06; /*0xD07*/ u8 field_D07; /*0xD08*/ u8 field_D08_0:1; -- cgit v1.2.3 From 16026fe91d5628f138be434841ae764534946b2c Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 21 Oct 2018 00:06:42 +0200 Subject: More battle tower. --- include/battle_frontier_2.h | 1 + include/battle_tower.h | 24 +++++++++++++----------- include/global.h | 32 ++++++++++++++++++++------------ 3 files changed, 34 insertions(+), 23 deletions(-) (limited to 'include') diff --git a/include/battle_frontier_2.h b/include/battle_frontier_2.h index 573053f10..3bd605829 100644 --- a/include/battle_frontier_2.h +++ b/include/battle_frontier_2.h @@ -14,5 +14,6 @@ bool8 InBattlePike(void); void sub_81AA078(u16*, u8); void sub_81A4C30(void); bool8 sub_81A6BF4(void); +u8 sub_81A6CA8(u8, u8); #endif // GUARD_BATTLE_FRONTIER_2_H diff --git a/include/battle_tower.h b/include/battle_tower.h index 6af87210b..f79fbb8c4 100644 --- a/include/battle_tower.h +++ b/include/battle_tower.h @@ -1,9 +1,9 @@ #ifndef GUARD_BATTLE_TOWER_H #define GUARD_BATTLE_TOWER_H -#define BATTLE_TOWER_EREADER_TRAINER_ID 200 #define BATTLE_TOWER_RECORD_MIXING_TRAINER_BASE_ID 300 #define BATTLE_TOWER_RECORD_APPRENTICE_BASE_ID 400 +#define BATTLE_TOWER_EREADER_TRAINER_ID 500 struct RSBattleTowerRecord { @@ -12,9 +12,7 @@ struct RSBattleTowerRecord /*0x02*/ u16 winStreak; /*0x04*/ u8 name[PLAYER_NAME_LENGTH + 1]; /*0x0C*/ u8 trainerId[4]; - /*0x10*/ struct { - u16 easyChat[6]; - } greeting; + /*0x10*/ u16 greeting[6]; /*0x1C*/ struct UnknownPokemonStruct party[3]; /*0xA0*/ u32 checksum; /*0xA4*/ u16 unk_11c8; @@ -26,16 +24,15 @@ union BattleTowerRecord struct EmeraldBattleTowerRecord emerald; }; -#define FRONTIER_TRAINER_NAME_LENGTH 7 - struct BattleFrontierTrainer { - u32 facilityClass; - u8 trainerName[FRONTIER_TRAINER_NAME_LENGTH + 1]; + u8 facilityClass; + u8 filler1[3]; + u8 trainerName[PLAYER_NAME_LENGTH + 1]; u16 speechBefore[6]; u16 speechWin[6]; u16 speechLose[6]; - const u16 *btMonPool; + const u16 *bfMonPool; }; struct FacilityMon @@ -47,6 +44,11 @@ struct FacilityMon u8 nature; }; +extern const u8 gTowerMaleFacilityClasses[30]; +extern const u8 gTowerMaleTrainerGfxIds[30]; +extern const u8 gTowerFemaleFacilityClasses[20]; +extern const u8 gTowerFemaleTrainerGfxIds[20]; + extern const struct BattleFrontierTrainer *gFacilityTrainers; extern const struct FacilityMon *gFacilityTrainerMons; @@ -54,8 +56,8 @@ u16 GetCurrentBattleTowerWinStreak(u8, u8); void sub_81659DC(struct RSBattleTowerRecord *a0, struct RSBattleTowerRecord *a1); bool32 sub_816587C(union BattleTowerRecord *, union BattleTowerRecord *); void CalcEmeraldBattleTowerChecksum(struct EmeraldBattleTowerRecord *); -void sub_81628A0(union BattleTowerRecord *); -void sub_8162614(u16 trainerId, u8); +void PutNewBattleTowerRecord(union BattleTowerRecord *); +void SetBattleFacilityTrainerGfxId(u16 trainerId, u8 tempVarId); 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 35e34e722..ef5a944d0 100644 --- a/include/global.h +++ b/include/global.h @@ -326,19 +326,31 @@ struct UnknownPokemonStruct struct EmeraldBattleTowerRecord { /*0x00*/ u8 lvlMode; // 0 = level 50, 1 = level 100 - /*0x01*/ u8 trainerClass; + /*0x01*/ u8 facilityClass; /*0x02*/ u16 winStreak; /*0x04*/ u8 name[PLAYER_NAME_LENGTH + 1]; /*0x0C*/ u8 trainerId[4]; - /*0x10*/ struct { - u16 easyChat[6]; - } greeting; + /*0x10*/ u16 greeting[6]; /*0x1C*/ u8 filler_1c[0x18]; /*0x34*/ struct UnknownPokemonStruct party[4]; /*0xE4*/ u8 language; /*0xE8*/ u32 checksum; }; +struct BattleTowerEReaderTrainer +{ + /*0x00*/ u8 unk0; + /*0x01*/ u8 facilityClass; + /*0x02*/ u16 winStreak; + /*0x04*/ u8 name[PLAYER_NAME_LENGTH + 1]; + /*0x0C*/ u8 trainerId[4]; + /*0x10*/ u16 greeting[6]; + /*0x1C*/ u16 farewellPlayerLost[6]; + /*0x28*/ u16 farewellPlayerWon[6]; + /*0x34*/ struct UnknownPokemonStruct party[3]; + /*0xB8*/ u32 checksum; +}; + struct FrontierMonData { u16 moves[4]; @@ -367,17 +379,13 @@ struct BattleDomeTrainer struct BattleFrontier { /*0x64C*/ struct EmeraldBattleTowerRecord battleTower; - /*0x738*/ struct EmeraldBattleTowerRecord records[5]; // No idea here, it's probably wrong, no clue. + /*0x738*/ struct EmeraldBattleTowerRecord records[5]; // From record mixing. /*0xBD4*/ u16 field_BD4; /*0xBD6*/ u16 field_BD6; /*0xBD8*/ u8 field_BD8[11]; /*0xBE3*/ u8 field_BE3[8]; /*0xBEB*/ u8 field_BEB; - /*0xBEC*/ u8 filler_BEC[16]; - /*0xBFC*/ u16 ecwords_BFC[6]; - /*0xC08*/ u16 ecwords_C08[6]; - /*0xC14*/ u16 ecwords_C14[6]; - /*0xC20*/ u8 filler_C20[0x88]; + /*0xBEC*/ struct BattleTowerEReaderTrainer ereaderTrainer; /*0xCA8*/ u8 field_CA8; /*0xCA9*/ u8 lvlMode:2; // 0x1, 0x2 -> 0x3 /*0xCA9*/ u8 field_CA9_a:1; // 0x4 @@ -388,8 +396,8 @@ struct BattleFrontier /*0xCA9*/ u8 field_CA9_f:1; // 0x80 /*0xCAA*/ u16 field_CAA[3]; /*0xCB0*/ u16 field_CB0; - /*0xCB2*/ u16 field_CB2; - /*0xCB4*/ u16 field_CB4[20]; + /*0xCB2*/ u16 curChallengeBattleNum; // In case of battle pyramid, the floor. + /*0xCB4*/ u16 battledTrainerIds[20]; /*0xCDC*/ u32 field_CDC; /*0xCE0*/ u16 field_CE0[4][2]; /*0xCF0*/ u16 field_CF0[2]; -- cgit v1.2.3 From 0ab27e44b14a0dc4523b5bac7fef18312ab4fdde Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 21 Oct 2018 20:13:12 +0200 Subject: more tower, fail --- include/battle.h | 1 + include/battle_tower.h | 2 +- include/constants/battle_frontier.h | 13 +++++++++++++ include/constants/battle_script_commands.h | 7 ++++--- include/global.h | 17 +++++++++-------- 5 files changed, 28 insertions(+), 12 deletions(-) (limited to 'include') diff --git a/include/battle.h b/include/battle.h index 87aa2a45b..f34364ea6 100644 --- a/include/battle.h +++ b/include/battle.h @@ -561,6 +561,7 @@ struct BattleScripting u8 field_23; u8 windowsType; // 0 - normal, 1 - battle arena u8 multiplayerId; + u8 specialTrainerBattleType; }; // rom_80A5C6C diff --git a/include/battle_tower.h b/include/battle_tower.h index f79fbb8c4..a47007122 100644 --- a/include/battle_tower.h +++ b/include/battle_tower.h @@ -58,7 +58,7 @@ bool32 sub_816587C(union BattleTowerRecord *, union BattleTowerRecord *); void CalcEmeraldBattleTowerChecksum(struct EmeraldBattleTowerRecord *); void PutNewBattleTowerRecord(union BattleTowerRecord *); void SetBattleFacilityTrainerGfxId(u16 trainerId, u8 tempVarId); -void ConvertBattleFrontierTrainerSpeechToString(const u16 *words); +void FrontierSpeechToString(const u16 *words); void GetFrontierTrainerName(u8 *dest, u16 trainerIdx); void GetEreaderTrainerName(u8 *dest); diff --git a/include/constants/battle_frontier.h b/include/constants/battle_frontier.h index 1cd750a3d..ca110aeb7 100644 --- a/include/constants/battle_frontier.h +++ b/include/constants/battle_frontier.h @@ -21,4 +21,17 @@ #define FRONTIER_MODE_MULTIS 2 #define FRONTIER_MODE_LINK_MULTIS 3 +// Special trainer battles. +#define SPECIAL_BATTLE_TOWER 0 +#define SPECIAL_BATTLE_SECRET_BASE 1 +#define SPECIAL_BATTLE_EREADER 2 +#define SPECIAL_BATTLE_DOME 3 +#define SPECIAL_BATTLE_PALACE 4 +#define SPECIAL_BATTLE_ARENA 5 +#define SPECIAL_BATTLE_FACTORY 6 +#define SPECIAL_BATTLE_PIKE_SINGLE 7 +#define SPECIAL_BATTLE_STEVEN 8 +#define SPECIAL_BATTLE_PIKE_DOUBLE 9 +#define SPECIAL_BATTLE_PYRAMID 10 + #endif // GUARD_CONSTANTS_BATTLE_FRONTIER_H diff --git a/include/constants/battle_script_commands.h b/include/constants/battle_script_commands.h index bd9d8e67d..dc07fda6e 100644 --- a/include/constants/battle_script_commands.h +++ b/include/constants/battle_script_commands.h @@ -11,9 +11,9 @@ #define sB_ANIM_ARG2 gBattleScripting + 0x11 #define sTRIPLE_KICK_POWER gBattleScripting + 0x12 #define sMOVEEND_STATE gBattleScripting + 0x14 -#define sBANK_WITH_ABILITY gBattleScripting + 0x15 +#define sBATTLER_WITH_ABILITY gBattleScripting + 0x15 #define sMULTIHIT_EFFECT gBattleScripting + 0x16 -#define sBANK gBattleScripting + 0x17 +#define sBATTLER gBattleScripting + 0x17 #define sB_ANIM_TURN gBattleScripting + 0x18 #define sB_ANIM_TARGETS_HIT gBattleScripting + 0x19 #define sSTATCHANGER gBattleScripting + 0x1A @@ -26,8 +26,9 @@ #define sRESHOW_MAIN_STATE gBattleScripting + 0x21 #define sRESHOW_HELPER_STATE gBattleScripting + 0x22 #define sFIELD_23 gBattleScripting + 0x23 -#define sFIELD_24 gBattleScripting + 0x24 +#define sWINDOWS_TYPE gBattleScripting + 0x24 #define sMULTIPLAYER_ID gBattleScripting + 0x25 +#define sSPECIAL_TRAINER_BATTLE_TYPE gBattleScripting + 0x26 #define cEFFECT_CHOOSER gBattleCommunication + 3 #define cMULTISTRING_CHOOSER gBattleCommunication + 5 diff --git a/include/global.h b/include/global.h index ef5a944d0..6840d5fe2 100644 --- a/include/global.h +++ b/include/global.h @@ -331,7 +331,8 @@ struct EmeraldBattleTowerRecord /*0x04*/ u8 name[PLAYER_NAME_LENGTH + 1]; /*0x0C*/ u8 trainerId[4]; /*0x10*/ u16 greeting[6]; - /*0x1C*/ u8 filler_1c[0x18]; + /*0x1C*/ u16 unk1C[6]; + /*0x28*/ u16 unk28[6]; /*0x34*/ struct UnknownPokemonStruct party[4]; /*0xE4*/ u8 language; /*0xE8*/ u32 checksum; @@ -378,8 +379,8 @@ struct BattleDomeTrainer struct BattleFrontier { - /*0x64C*/ struct EmeraldBattleTowerRecord battleTower; - /*0x738*/ struct EmeraldBattleTowerRecord records[5]; // From record mixing. + /*0x64C*/ struct EmeraldBattleTowerRecord towerPlayer; + /*0x738*/ struct EmeraldBattleTowerRecord towerRecords[5]; // From record mixing. /*0xBD4*/ u16 field_BD4; /*0xBD6*/ u16 field_BD6; /*0xBD8*/ u8 field_BD8[11]; @@ -397,7 +398,10 @@ struct BattleFrontier /*0xCAA*/ u16 field_CAA[3]; /*0xCB0*/ u16 field_CB0; /*0xCB2*/ u16 curChallengeBattleNum; // In case of battle pyramid, the floor. - /*0xCB4*/ u16 battledTrainerIds[20]; + /*0xCB4*/ u16 battledTrainerIds[17]; + u16 field_CD6; + u16 field_CD8; + u16 field_CDA; /*0xCDC*/ u32 field_CDC; /*0xCE0*/ u16 field_CE0[4][2]; /*0xCF0*/ u16 field_CF0[2]; @@ -457,10 +461,7 @@ struct BattleFrontier /*0xEB8*/ u16 frontierBattlePoints; /*0xEBA*/ u8 field_EBA; /*0xEBB*/ u8 field_EBB; - /*0xEBC*/ u8 field_EBC; - /*0xEBD*/ u8 field_EBD; - /*0xEBE*/ u8 field_EBE; - /*0xEBF*/ u8 field_EBF; + /*0xEBC*/ u32 battlesCount; /*0xEC0*/ u16 field_EC0[16]; /*0xEE0*/ u8 field_EE0; /*0xEE1*/ u8 field_EE1[2][PLAYER_NAME_LENGTH + 1]; -- cgit v1.2.3 From b330bdba51b86959e702e904c4a5d8039e6395c7 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 22 Oct 2018 19:22:57 +0200 Subject: More and more battle tower --- include/battle_tower.h | 11 ++++++----- include/global.h | 15 ++++++--------- 2 files changed, 12 insertions(+), 14 deletions(-) (limited to 'include') 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]; -- cgit v1.2.3 From 549b669f2aa397c9d784de2ff9b91459ab26c060 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Wed, 24 Oct 2018 23:14:45 +0200 Subject: battle tower, match sth and dumb loop instead of goto --- include/battle_tower.h | 2 +- include/constants/battle_frontier.h | 4 ++++ include/global.h | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/battle_tower.h b/include/battle_tower.h index 4b68be923..39d75f8be 100644 --- a/include/battle_tower.h +++ b/include/battle_tower.h @@ -52,7 +52,7 @@ extern const struct BattleFrontierTrainer *gFacilityTrainers; extern const struct FacilityMon *gFacilityTrainerMons; u16 GetCurrentBattleTowerWinStreak(u8, u8); -void sub_81659DC(struct RSBattleTowerRecord *a0, struct RSBattleTowerRecord *a1); +bool32 EmeraldBattleTowerRecordToRuby(struct EmeraldBattleTowerRecord *src, struct RSBattleTowerRecord *dst); bool32 RubyBattleTowerRecordToEmerald(struct RSBattleTowerRecord *src, struct EmeraldBattleTowerRecord *dst); void CalcEmeraldBattleTowerChecksum(struct EmeraldBattleTowerRecord *); void PutNewBattleTowerRecord(struct EmeraldBattleTowerRecord *newRecordEm); diff --git a/include/constants/battle_frontier.h b/include/constants/battle_frontier.h index ca110aeb7..204a09f60 100644 --- a/include/constants/battle_frontier.h +++ b/include/constants/battle_frontier.h @@ -10,6 +10,10 @@ #define FRONTIER_FACILITY_PIKE 5 #define FRONTIER_FACILITY_PYRAMID 6 +#define TENT_VERDANTURF 2 +#define TENT_FALLARBOR 3 +#define TENT_SLATEPORT 4 + // Battle Frontier lvl modes. #define FRONTIER_LVL_50 0 #define FRONTIER_LVL_OPEN 1 diff --git a/include/global.h b/include/global.h index a7b50278c..0cff281e7 100644 --- a/include/global.h +++ b/include/global.h @@ -293,7 +293,7 @@ struct Apprentice u8 playerId[4]; u8 playerName[PLAYER_NAME_LENGTH]; u8 language; - u32 unk40; + u32 checksum; }; struct UnknownPokemonStruct -- cgit v1.2.3 From 1efdaebe2395c8c202b2086d485b7f348dc42783 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Thu, 25 Oct 2018 21:27:10 +0200 Subject: finish decompiling battle tower --- include/battle_tower.h | 45 +++++++++++++++++++++++++++++++-------------- 1 file changed, 31 insertions(+), 14 deletions(-) (limited to 'include') diff --git a/include/battle_tower.h b/include/battle_tower.h index 39d75f8be..137ce8a54 100644 --- a/include/battle_tower.h +++ b/include/battle_tower.h @@ -17,12 +17,6 @@ struct RSBattleTowerRecord /*0xA0*/ u32 checksum; }; -union BattleTowerRecord -{ - struct RSBattleTowerRecord ruby_sapphire; - struct EmeraldBattleTowerRecord emerald; -}; - struct BattleFrontierTrainer { u8 facilityClass; @@ -51,16 +45,39 @@ extern const u8 gTowerFemaleTrainerGfxIds[20]; extern const struct BattleFrontierTrainer *gFacilityTrainers; extern const struct FacilityMon *gFacilityTrainerMons; -u16 GetCurrentBattleTowerWinStreak(u8, u8); -bool32 EmeraldBattleTowerRecordToRuby(struct EmeraldBattleTowerRecord *src, struct RSBattleTowerRecord *dst); -bool32 RubyBattleTowerRecordToEmerald(struct RSBattleTowerRecord *src, struct EmeraldBattleTowerRecord *dst); -void CalcEmeraldBattleTowerChecksum(struct EmeraldBattleTowerRecord *); -void PutNewBattleTowerRecord(struct EmeraldBattleTowerRecord *newRecordEm); +void sub_8161F74(void); +u16 sub_8162548(u8 challengeNum, u8 battleNum); void SetBattleFacilityTrainerGfxId(u16 trainerId, u8 tempVarId); -void FrontierSpeechToString(const u16 *words); -void GetFrontierTrainerName(u8 *dest, u16 trainerIdx); -void GetEreaderTrainerName(u8 *dest); +void SetEReaderTrainerGfxId(void); +u8 GetBattleFacilityTrainerGfxId(u16 trainerId); +void PutNewBattleTowerRecord(struct EmeraldBattleTowerRecord *newRecordEm); +u8 GetFrontierTrainerFrontSpriteId(u16 trainerId); +u8 GetFrontierOpponentClass(u16 trainerId); +void GetFrontierTrainerName(u8 *dst, u16 trainerId); void FillFrontierTrainerParty(u8 monsCount); void FillFrontierTrainersParties(u8 monsCount); +u16 RandomizeFacilityTrainerMonId(u16 trainerId); +void FrontierSpeechToString(const u16 *words); +void DoSpecialTrainerBattle(void); +void CalcEmeraldBattleTowerChecksum(struct EmeraldBattleTowerRecord *record); +void CalcRubyBattleTowerChecksum(struct RSBattleTowerRecord *record); +u16 GetCurrentBattleTowerWinStreak(u8 lvlMode, u8 battleMode); +u8 GetEreaderTrainerFrontSpriteId(void); +u8 GetEreaderTrainerClassId(void); +void GetEreaderTrainerName(u8 *dst); +void ValidateEReaderTrainer(void); +void ClearEReaderTrainer(struct BattleTowerEReaderTrainer *ereaderTrainer); +void CopyEReaderTrainerGreeting(void); +void sub_81653CC(void); +bool32 RubyBattleTowerRecordToEmerald(struct RSBattleTowerRecord *src, struct EmeraldBattleTowerRecord *dst); +bool32 EmeraldBattleTowerRecordToRuby(struct EmeraldBattleTowerRecord *src, struct RSBattleTowerRecord *dst); +void CalcApprenticeChecksum(struct Apprentice *apprentice); +void GetBattleTowerTrainerLanguage(u8 *dst, u16 trainerId); +u8 SetFacilityPtrsGetLevel(void); +u8 GetFrontierEnemyMonLevel(u8 lvlMode); +s32 GetHighestLevelInPlayerParty(void); +u8 sub_81660B8(u8 facilityClass); +bool32 ValidateBattleTowerRecord(u8 recordId); // unused +void sub_8166188(void); #endif //GUARD_BATTLE_TOWER_H -- cgit v1.2.3 From dc273cc19d842e8831548a1342af857aae2886c9 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Fri, 26 Oct 2018 23:54:41 +0200 Subject: Battle tower - ewram variables --- include/battle_tower.h | 4 ---- include/constants/trainers.h | 15 +++++++++------ 2 files changed, 9 insertions(+), 10 deletions(-) (limited to 'include') diff --git a/include/battle_tower.h b/include/battle_tower.h index 137ce8a54..5fe8d1190 100644 --- a/include/battle_tower.h +++ b/include/battle_tower.h @@ -1,10 +1,6 @@ #ifndef GUARD_BATTLE_TOWER_H #define GUARD_BATTLE_TOWER_H -#define BATTLE_TOWER_RECORD_MIXING_TRAINER_BASE_ID 300 -#define BATTLE_TOWER_RECORD_APPRENTICE_BASE_ID 400 -#define BATTLE_TOWER_EREADER_TRAINER_ID 500 - struct RSBattleTowerRecord { /*0x00*/ u8 lvlMode; // 0 = level 50, 1 = level 100 diff --git a/include/constants/trainers.h b/include/constants/trainers.h index f79216d94..2ea9f7c62 100644 --- a/include/constants/trainers.h +++ b/include/constants/trainers.h @@ -4,12 +4,15 @@ #include "constants/opponents.h" // Special Trainer Ids. -#define TRAINER_FRONTIER_BRAIN 1022 -#define TRAINER_PLAYER 1023 -#define TRAINER_SECRET_BASE 1024 -#define TRAINER_LINK_OPPONENT 2048 -#define TRAINER_OPPONENT_C00 3072 -#define TRAINER_STEVEN_PARTNER 3075 +#define TRAINER_RECORD_MIXING_FRIEND 300 +#define TRAINER_RECORD_MIXING_APPRENTICE 400 +#define TRAINER_EREADER 500 +#define TRAINER_FRONTIER_BRAIN 1022 +#define TRAINER_PLAYER 1023 +#define TRAINER_SECRET_BASE 1024 +#define TRAINER_LINK_OPPONENT 2048 +#define TRAINER_OPPONENT_C00 3072 +#define TRAINER_STEVEN_PARTNER 3075 #define TRAINER_PIC_HIKER 0 #define TRAINER_PIC_AQUA_GRUNT_M 1 -- cgit v1.2.3