berry blender fix merge conflicts

2017-11-26 19:21:51 +01:00
parent ad3a97e178 1e4f12e6fa
commit b0657350a4
27 changed files with 1034 additions and 2406 deletions
@@ -14,5 +14,6 @@ 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);

 #endif //GUARD_TV_H