diff options
author | Diegoisawesome <diego@domoreaweso.me> | 2016-11-01 22:42:34 -0500 |
---|---|---|
committer | Diegoisawesome <diego@domoreaweso.me> | 2016-11-01 22:42:34 -0500 |
commit | b0a46f2c4ba31fcc121d0e379ef42275003228e1 (patch) | |
tree | 38ab8eeb257067771e40ccbfb314a490174bede6 /include | |
parent | 6838022ab38d09f6107f63e19c3cd9c095ccea5c (diff) | |
parent | a1e41e65a97e34dd57ad7baa397ce45b0e98693d (diff) |
Merge remote-tracking branch 'refs/remotes/pret/master'
Diffstat (limited to 'include')
-rw-r--r-- | include/gba/m4a_internal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/gba/m4a_internal.h b/include/gba/m4a_internal.h index c6cff3b6f..f5d44de99 100644 --- a/include/gba/m4a_internal.h +++ b/include/gba/m4a_internal.h @@ -365,7 +365,7 @@ extern const u8 gNoiseTable[]; extern const struct PokemonCrySong gPokemonCrySongTemplate; -extern const struct ToneData voicegroup_8675D04; +extern const struct ToneData voicegroup_pokemon_cry; extern char gNumMusicPlayers[]; extern char gMaxLines[]; |