Merge branch 'master' into battle

2019-10-12 11:55:37 +08:00
parent c46e6fa3d9 ce18093251
commit ff795fa834
357 changed files with 28905 additions and 1399 deletions
@@ -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,