Merge branch 'master' of https://github.com/pret/pokeemerald into decomp_scrcmd

2017-10-13 20:29:11 -05:00
parent 2852f4f1b8 f6af9e7013
commit 924c0c6b5a
106 changed files with 14610 additions and 25063 deletions
--- a/include/tv.h
+++ b/include/tv.h
@@ -1,7 +1,15 @@
 #ifndef GUARD_TV_H
 #define GUARD_TV_H

-bool8 GetPriceReduction(u8);
-size_t sub_80EF370(int);
+extern u8 *const gTVStringVarPtrs[3];

-#endif // GUARD_TV_H
+void ClearTVShowData(void);
+void PutPokemonTodayCaughtOnAir(void);
+u32 GetPlayerIDAsU32(void);
+bool8 GetPriceReduction(u8 newsKind);
+u8 GetRibbonCount(struct Pokemon *pokemon);
+void sub_80EE184(void);
+void sub_80F14F8(TVShow *shows);
+size_t sub_80EF370(int value);
+
+#endif //GUARD_TV_H