diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-06-11 10:11:23 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-06-11 10:11:23 -0400 |
| commit | 75a89830a95a47cea2cc6a0732ca0da454c74ab7 (patch) | |
| tree | 0c0149b15f5467a5f0bd316e11fc6d2a356b8062 /include | |
| parent | 9b58695341f0bb4291fcd4decd2292a1ebd0bcd7 (diff) | |
Cleanup and documentation of teachy_tv
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle.h | 2 | ||||
| -rw-r--r-- | include/strings.h | 40 | ||||
| -rw-r--r-- | include/teachy_tv.h | 4 |
3 files changed, 23 insertions, 23 deletions
diff --git a/include/battle.h b/include/battle.h index c86bc9232..2e6d251c3 100644 --- a/include/battle.h +++ b/include/battle.h @@ -983,6 +983,6 @@ extern u8 gBattlersCount; extern u16 gBattlerPartyIndexes[MAX_BATTLERS_COUNT]; extern s32 gBattleMoveDamage; -extern u8 gUnknown_2023E8A; +extern u8 gBattleOutcome; #endif // GUARD_BATTLE_H diff --git a/include/strings.h b/include/strings.h index 51aeb376a..edc5136f8 100644 --- a/include/strings.h +++ b/include/strings.h @@ -115,25 +115,25 @@ extern const u8 gPokeDudeText_TMTypes[]; extern const u8 gPokeDudeText_ReadTMDescription[]; // teachy_tv -extern const u8 gUnknown_841B7A4[]; -extern const u8 gUnknown_841B7BC[]; -extern const u8 gUnknown_841B7D6[]; -extern const u8 gUnknown_841B7EE[]; -extern const u8 gUnknown_841B807[]; -extern const u8 gUnknown_841B81B[]; -extern const u8 gUnknown_841B836[]; -extern const u8 gUnknown_841B83D[]; -extern const u8 gUnknown_841B8BF[]; -extern const u8 gUnknown_841BB40[]; -extern const u8 gUnknown_841BE76[]; -extern const u8 gUnknown_841C23B[]; -extern const u8 gUnknown_841C459[]; -extern const u8 gUnknown_841C82A[]; -extern const u8 gUnknown_841BA41[]; -extern const u8 gUnknown_841BD10[]; -extern const u8 gUnknown_841C0AF[]; -extern const u8 gUnknown_841C384[]; -extern const u8 gUnknown_841C7B4[]; -extern const u8 gUnknown_841C994[]; +extern const u8 gTeachyTvString_TeachBattle[]; +extern const u8 gTeachyTvString_StatusProblems[]; +extern const u8 gTeachyTvString_TypeMatchups[]; +extern const u8 gTeachyTvString_CatchPkmn[]; +extern const u8 gTeachyTvString_AboutTMs[]; +extern const u8 gTeachyTvString_RegisterItem[]; +extern const u8 gTeachyTvString_Cancel[]; +extern const u8 gTeachyTvText_PokeDudeSaysHello[]; +extern const u8 gTeachyTvText_BattleScript1[]; +extern const u8 gTeachyTvText_StatusScript1[]; +extern const u8 gTeachyTvText_MatchupsScript1[]; +extern const u8 gTeachyTvText_CatchingScript1[]; +extern const u8 gTeachyTvText_TMsScript1[]; +extern const u8 gTeachyTvText_RegisterScript1[]; +extern const u8 gTeachyTvText_BattleScript2[]; +extern const u8 gTeachyTvText_StatusScript2[]; +extern const u8 gTeachyTvText_MatchupsScript2[]; +extern const u8 gTeachyTvText_CatchingScript2[]; +extern const u8 gTeachyTvText_TMsScript2[]; +extern const u8 gTeachyTvText_RegisterScript2[]; #endif //GUARD_STRINGS_H diff --git a/include/teachy_tv.h b/include/teachy_tv.h index f3b9eb565..36bac6a67 100644 --- a/include/teachy_tv.h +++ b/include/teachy_tv.h @@ -1,8 +1,8 @@ #ifndef GUARD_TEACHY_TV_H #define GUARD_TEACHY_TV_H -void sub_815ABC4(u8 mode, void (*cb)()); +void InitTeachyTvController(u8 mode, void (*cb)()); void CB2_ReturnToTeachyTV(void); -void sub_815AC20(void); +void SetTeachyTvControllerModeToResume(void); #endif //GUARD_TEACHY_TV_H |