diff options
| author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-11-14 12:57:49 +0800 |
|---|---|---|
| committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-11-19 10:26:40 +0800 |
| commit | 1d3ae2fe78823a6a0d4d9d93a988aa5ca1092801 (patch) | |
| tree | acb385b82e1b361e36e6075b13329563fe93f415 /include/battle_tower.h | |
| parent | 17b55f50dbcdf9797d0aecfba356bc8681dea8f5 (diff) | |
| parent | f6dfeba742c415d964b415bfefb859c3a3764930 (diff) | |
Merge branch 'master' into battle
Diffstat (limited to 'include/battle_tower.h')
| -rw-r--r-- | include/battle_tower.h | 4 |
1 files changed, 2 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); |