diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-11-09 13:59:24 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-11-09 13:59:24 -0500 |
| commit | 55bede6ca279483a0e4b9b51ebe152d4be135b93 (patch) | |
| tree | c71d15d950a17f44276254643b155229f2b8ece5 /include | |
| parent | 9773fcf278cd9e830440c993a3e79899c2f89b67 (diff) | |
Finish decomp of battle_tower
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle_tower.h | 4 | ||||
| -rw-r--r-- | include/party_menu.h | 1 | ||||
| -rw-r--r-- | include/script_pokemon_util_80A0058.h | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/include/battle_tower.h b/include/battle_tower.h index b7b106107..9bb93f1c2 100644 --- a/include/battle_tower.h +++ b/include/battle_tower.h @@ -12,7 +12,7 @@ struct BattleTowerTrainer u8 trainerClass; u8 name[3]; u8 teamFlags; - u16 speech[6]; + u16 greeting[6]; }; struct BattleTowerPokemonTemplate @@ -26,7 +26,7 @@ struct BattleTowerPokemonTemplate }; u16 sub_8164FCC(u8, u8); -void sub_80E7524(struct BattleTowerEReaderTrainer *); +void ClearEReaderTrainer(struct BattleTowerEReaderTrainer *); void ValidateEReaderTrainer(void); u8 GetBattleTowerTrainerFrontSpriteId(void); u8 GetEreaderTrainerFrontSpriteId(void); diff --git a/include/party_menu.h b/include/party_menu.h index c07371a5d..6c81a248c 100644 --- a/include/party_menu.h +++ b/include/party_menu.h @@ -45,6 +45,7 @@ extern u8 gUnknown_203B0C0; extern u8 gUnknown_203B0C1; extern u8 gUnknown_203B0DC[3]; extern void (*gUnknown_3005E98)(u8 taskId, TaskFunc func); +extern u8 gSelectedOrderFromParty[3]; bool8 FieldCallback_PrepareFadeInFromMenu(void); bool8 MonKnowsMove(struct Pokemon *, u16); diff --git a/include/script_pokemon_util_80A0058.h b/include/script_pokemon_util_80A0058.h index 768e838dd..b63a7b0ef 100644 --- a/include/script_pokemon_util_80A0058.h +++ b/include/script_pokemon_util_80A0058.h @@ -5,5 +5,6 @@ bool8 ScriptGiveMon(u16 species, u8 level, u16 item, u32 unk1, u32 unk2, u8 unk3 bool8 ScriptGiveEgg(u16 species); void ScriptSetMonMoveSlot(u8 partyIdx, u16 move, u8 slot); void sp000_heal_pokemon(void); +void ReducePlayerPartyToThree(void); #endif //GUARD_SCRIPT_POKEMON_UTIL_80A0058_H |