From dcf291abe42fde4c3315272647c9b67dec246245 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Tue, 1 Nov 2016 20:10:09 -0700 Subject: [PATCH 1/2] name pokemon cry voicegroup --- data/sound_data.s | 2 +- include/gba/m4a_internal.h | 2 +- src/m4a_tables.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/data/sound_data.s b/data/sound_data.s index a6f3fde26..61b6abc04 100644 --- a/data/sound_data.s +++ b/data/sound_data.s @@ -1,6 +1,6 @@ .section .rodata -voicegroup_8675D04:: @ 8675D04 +voicegroup_pokemon_cry:: @ 8675D04 .incbin "baserom.gba", 0x675D04, 0x27FF0 gUnknown_0869DCF4:: @ 869DCF4 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[]; diff --git a/src/m4a_tables.c b/src/m4a_tables.c index e064b6ccf..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_8675D04, + (struct ToneData *)&voicegroup_pokemon_cry, NULL, NULL, 0, From a1e41e65a97e34dd57ad7baa397ce45b0e98693d Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Tue, 1 Nov 2016 20:10:33 -0700 Subject: [PATCH 2/2] formatting --- sym_common.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sym_common.txt b/sym_common.txt index 0c23abe97..4a8aebd0b 100644 --- a/sym_common.txt +++ b/sym_common.txt @@ -502,7 +502,7 @@ gUnknown_03006370: @ 3006370 .include "m4a_2.o" - .include "agb_flash.o" + .include "agb_flash.o" gUnknown_03007868: @ 3007868 .space 0x8