diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle_tower.h | 12 | ||||
| -rw-r--r-- | include/global.h | 10 |
2 files changed, 11 insertions, 11 deletions
diff --git a/include/battle_tower.h b/include/battle_tower.h index 4b5e66eac..a54ae6bc7 100644 --- a/include/battle_tower.h +++ b/include/battle_tower.h @@ -81,19 +81,19 @@ enum struct BattleTowerPokemon { /*0x00*/u16 species; - /*0x02*/u8 item; // entry in gBattleTowerHeldItems + /*0x02*/u8 heldItem; // entry in sBattleTowerHeldItems /*0x03*/u8 teamFlags; /*0x04*/u16 moves[4]; /*0x0C*/u8 evSpread; /*0x0D*/u8 nature; }; -void sub_813461C(u8 levelType); +u16 GetCurrentBattleTowerWinStreak(u8); void sub_8134AC0(struct BattleTowerRecord *); u16 sub_8135D3C(u8); -void sub_8135FF4(u8*); -u8 sub_8135FBC(void); -u8 sub_8135FD8(void); -void sub_813601C(void); +void SetEReaderTrainerName(u8*); +u8 GetEReaderTrainerPicIndex(void); +u8 GetEReaderTrainerClassNameIndex(void); +void ValidateEReaderTrainer(void); #endif // GUARD_BATTLE_TOWER_H diff --git a/include/global.h b/include/global.h index 8461624cb..fcdd4109c 100644 --- a/include/global.h +++ b/include/global.h @@ -764,9 +764,9 @@ struct BattleTowerTrainer struct BattleTowerRecord // record mixing { - /*0x00*/u8 var_0; + /*0x00*/u8 battleTowerLevelType; // 0 = level 50, 1 = level 100 /*0x01*/u8 trainerClass; - /*0x02*/u16 var_2; + /*0x02*/u16 winStreak; /*0x04*/u8 name[8]; /*0x0C*/u8 trainerId[4]; /*0x10*/struct { @@ -780,7 +780,7 @@ struct BattleTowerEReaderTrainer { /*0x00*/u8 unk0; /*0x01*/u8 trainerClass; - /*0x02*/u16 var_2; // TODO: this gets set in MEScrCmd_addtrainer + /*0x02*/u16 winStreak; /*0x04*/u8 name[8]; /*0x0C*/u8 trainerId[4]; /*0x10*/struct { @@ -809,8 +809,8 @@ struct BattleTowerData /*0x04AC, 0x0554*/ u8 unk_554:1; /*0x04AD, 0x0555*/ u8 battleOutcome; /*0x04AE, 0x0556*/ u8 var_4AE[2]; - /*0x04B0, 0x0558*/ u16 curChallengeWins[2]; // number of wins in the current challenge. (challenges consist of 7 battles) - /*0x04B4, 0x055C*/ u16 curStreakChallengesCompleted[2]; // number of challenges completed in the current streak. + /*0x04B0, 0x0558*/ u16 curChallengeBattleNum[2]; // 1-based index of battle in the current challenge. (challenges consist of 7 battles) + /*0x04B4, 0x055C*/ u16 curStreakChallengesNum[2]; // 1-based index of the current challenge in the current streak. /*0x04B8, 0x0560*/ u16 recordWinStreaks[2]; /*0x04BC, 0x0564*/ u8 battleTowerTrainerId; // index for gBattleTowerTrainers table /*0x04BD, 0x0565*/ u8 selectedPartyMons[0x3]; // indices of the 3 selected player party mons. |