merge with master

2018-08-12 12:11:35 +02:00
parent e787d5b602 40cf61307b
commit 957dcd01b3
148 changed files with 6964 additions and 11586 deletions
--- a/include/tv.h
+++ b/include/tv.h
@@ -49,5 +49,6 @@ void TV_PutSecretBaseVisitOnTheAir(void);
 void PutBattleUpdateOnTheAir(u8 opponentLinkPlayerId, u16 move, u16 speciesPlayer, u16 speciesOpponent);
 void BravoTrainerPokemonProfile_BeforeInterview1(u16 move);
 void UpdateTVScreensOnMap(int, int);
+void TV_PrintIntToStringVar(u8 varIdx, int value);

 #endif //GUARD_TV_H