Merge branch 'master' into record_mixing

2018-02-11 20:12:40 -05:00
parent bc063b45d0 14a76793e5
commit 590c4b500b
6672 changed files with 937954 additions and 212286 deletions
@@ -15,5 +15,8 @@ void sub_80F14F8(TVShow *shows);
 size_t sub_80EF370(int value);
 void sub_80F1208(TVShow *dest);
 void sub_80F0BB8(void);
+bool8 Put3CheersForPokeblocksOnTheAir(const u8 *partnersName, u8 flavor, u8 unused, u8 sheen, u8 language);
+void SetPokemonAnglerSpecies(u16 species);
+void UpdateTVShowsPerDay(u16 days);

 #endif //GUARD_TV_H