diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-10-13 10:22:58 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-10-13 10:22:58 -0500 |
| commit | b24559d69b6fa0abf042a1b7cdbcab3d1ec91fd6 (patch) | |
| tree | 7b51d7b9cb9a370fe1dd9db8eeadc23089ba1328 /src/m4a_tables.c | |
| parent | fa9d1759bd7fa17ced37225bd31d46466da857c6 (diff) | |
| parent | a2a6700966cc802185577e44ba88a9154429c93b (diff) | |
Merge remote-tracking branch 'upstream/master' into shop
# Conflicts:
# asm/shop.s
Diffstat (limited to 'src/m4a_tables.c')
| -rw-r--r-- | src/m4a_tables.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/m4a_tables.c b/src/m4a_tables.c index 91f00a31d..9a4ea32e6 100644 --- a/src/m4a_tables.c +++ b/src/m4a_tables.c @@ -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, |