Merge branch 'master' into clock

2017-11-27 20:09:53 -05:00
parent 9840be1f00 18c6b8efc2
commit 88636dfc2a
95 changed files with 12492 additions and 11878 deletions
--- a/include/tv.h
+++ b/include/tv.h
@@ -13,6 +13,7 @@ void sub_80EE184(void);
 void sub_80EEA70(void);
 void sub_80F14F8(TVShow *shows);
 size_t sub_80EF370(int value);
+bool8 Put3CheersForPokeblocksOnTheAir(const u8 *partnersName, u8 flavor, u8 unused, u8 sheen, u8 language);
 void SetPokemonAnglerSpecies(u16 species);
 void sub_80ED888(u16 days);