dionmoustos/PokemonEmeraldSafariFrontier
1
0 Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

berry blender fix merge conflicts

Browse Source
This commit is contained in:
DizzyEggg committed 2017-11-26 19:21:51 +01:00
2 parents ad3a97e178 1e4f12e6fa
commit b0657350a4
27 files changed
+1034 -2406
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

include/tv.h
+1
View File
@@ -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