diff options
| author | Evan <eroelke@gmail.com> | 2019-11-26 13:55:24 -0700 |
|---|---|---|
| committer | Evan <eroelke@gmail.com> | 2019-11-26 13:55:24 -0700 |
| commit | 31d8bfb04850a9a1c1639b40b7ff305a673b9c09 (patch) | |
| tree | bba0c7d4e6230c2eecbb167b458bad89b8f01e04 /include/trainer_tower.h | |
| parent | d1142b4290e8688a0d42bfc1b95b9d90b1721459 (diff) | |
| parent | 19ecb1631b5fce1147077026a8eff890c6ec315a (diff) | |
fix merge conflicts
Diffstat (limited to 'include/trainer_tower.h')
| -rw-r--r-- | include/trainer_tower.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/trainer_tower.h b/include/trainer_tower.h index 810642a69..9c1ac0631 100644 --- a/include/trainer_tower.h +++ b/include/trainer_tower.h @@ -6,5 +6,7 @@ void InitTrainerTowerBattleStruct(void); void FreeTrainerTowerBattleStruct(void); u8 GetTrainerTowerTrainerFrontSpriteId(void); void ResetTrainerTowerResults(void); +void sub_815DA28(u8 *text); +u8 sub_815DA10(void); #endif //GUARD_TRAINER_TOWER_H |