diff options
| -rw-r--r-- | include/gba/m4a_internal.h | 2 | ||||
| -rw-r--r-- | sound/songs/bgm_field13.s | 2 | ||||
| -rw-r--r-- | sound/songs/bgm_nibi.s | 2 | ||||
| -rw-r--r-- | sound/songs/bgm_pcc.s | 2 | ||||
| -rw-r--r-- | sound/songs/bgm_suikun.s | 2 | ||||
| -rw-r--r-- | sound/songs/se_stop.s | 2 | ||||
| -rw-r--r-- | sound/voice_groups.inc | 2 | ||||
| -rw-r--r-- | src/m4a_tables.c | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/include/gba/m4a_internal.h b/include/gba/m4a_internal.h index 84b448243..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_842FC88; +extern const struct ToneData voicegroup_pokemon_cry; extern char gNumMusicPlayers[]; extern char gMaxLines[]; diff --git a/sound/songs/bgm_field13.s b/sound/songs/bgm_field13.s index 6afab36e3..2b6b8383a 100644 --- a/sound/songs/bgm_field13.s +++ b/sound/songs/bgm_field13.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_field13_grp, voicegroup_842FC88 + .equ bgm_field13_grp, voicegroup_pokemon_cry .equ bgm_field13_pri, 0 .equ bgm_field13_rev, reverb_set+50 .equ bgm_field13_mvl, 127 diff --git a/sound/songs/bgm_nibi.s b/sound/songs/bgm_nibi.s index af7b666fe..9520d02a6 100644 --- a/sound/songs/bgm_nibi.s +++ b/sound/songs/bgm_nibi.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_nibi_grp, voicegroup_842FC88 + .equ bgm_nibi_grp, voicegroup_pokemon_cry .equ bgm_nibi_pri, 0 .equ bgm_nibi_rev, reverb_set+50 .equ bgm_nibi_mvl, 127 diff --git a/sound/songs/bgm_pcc.s b/sound/songs/bgm_pcc.s index c9c8a96fd..a6e76660f 100644 --- a/sound/songs/bgm_pcc.s +++ b/sound/songs/bgm_pcc.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_pcc_grp, voicegroup_842FC88 + .equ bgm_pcc_grp, voicegroup_pokemon_cry .equ bgm_pcc_pri, 0 .equ bgm_pcc_rev, reverb_set+50 .equ bgm_pcc_mvl, 127 diff --git a/sound/songs/bgm_suikun.s b/sound/songs/bgm_suikun.s index 25e5b550f..738e574f1 100644 --- a/sound/songs/bgm_suikun.s +++ b/sound/songs/bgm_suikun.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ bgm_suikun_grp, voicegroup_842FC88 + .equ bgm_suikun_grp, voicegroup_pokemon_cry .equ bgm_suikun_pri, 0 .equ bgm_suikun_rev, reverb_set+50 .equ bgm_suikun_mvl, 127 diff --git a/sound/songs/se_stop.s b/sound/songs/se_stop.s index c2bae91cd..6e540d2b9 100644 --- a/sound/songs/se_stop.s +++ b/sound/songs/se_stop.s @@ -1,6 +1,6 @@ .include "MPlayDef.s" - .equ se_stop_grp, voicegroup_842FC88 + .equ se_stop_grp, voicegroup_pokemon_cry .equ se_stop_pri, 0 .equ se_stop_rev, reverb_set+40 .equ se_stop_mvl, 127 diff --git a/sound/voice_groups.inc b/sound/voice_groups.inc index f250a394c..3ce443a5c 100644 --- a/sound/voice_groups.inc +++ b/sound/voice_groups.inc @@ -1,5 +1,5 @@ .align 2 -voicegroup_842FC88:: @ 842FC8 +voicegroup_pokemon_cry:: @ 842FC8 voice_keysplit_all voicegroup_842FEF8 @ 842FC88 voice_keysplit voicegroup_8430204, KeySplitTable_8455224 @ 842FC94 voice_square_1 0, 2, 0, 0, 15, 0 @ 842FCA0 diff --git a/src/m4a_tables.c b/src/m4a_tables.c index c673f265c..91f00a31d 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_842FC88, + (struct ToneData *)&voicegroup_pokemon_cry, NULL, NULL, 0, |