Merge branch 'master' into battle

This commit is contained in:
jiangzhengwenjz
2019-10-12 11:55:37 +08:00
357 changed files with 28905 additions and 1399 deletions
+1 -1
View File
@@ -368,7 +368,7 @@ extern const u8 gNoiseTable[];
extern const struct PokemonCrySong gPokemonCrySongTemplate;
extern const struct ToneData voicegroup_pokemon_cry;
extern const struct ToneData voicegroup000;
extern char gNumMusicPlayers[];
extern char gMaxLines[];