diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-11-09 16:08:36 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-09 16:08:36 -0500 |
| commit | 895a09a2639b9273030a7db44144c0643d1d738b (patch) | |
| tree | 77549487fab95126cdb1c7108d3b70c4b0c5030d /include/battle_tower.h | |
| parent | 4eb386f7c4f9e4f9cd579421f8e064ee20c3f64c (diff) | |
| parent | aba284d3bed0551b1bc12dbd17e2c63b2d5ce1e1 (diff) | |
Merge pull request #147 from PikalaxALT/battle_tower
Battle tower
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); |