Merge branch 'master' into battle

This commit is contained in:
jiangzhengwenjz committed 2019-10-12 11:55:37 +08:00
commit ff795fa834
357 files changed
+28905 -1399

No files matched your search

+1 -1
View File
@@ -261,7 +261,7 @@ const struct PokemonCrySong gPokemonCrySongTemplate =
0, // block count
255, // priority
0, // reverb
(struct ToneData *)&voicegroup_pokemon_cry,
(struct ToneData *)&voicegroup000,
NULL,
NULL,
0,