atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'refs/remotes/pret/master'

Browse source
This commit is contained in:
Diegoisawesome 2016-11-01 22:42:34 -05:00
commit b0a46f2c4b
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/sound_data.s
View file

@ -1,6 +1,6 @@
.section .rodata
voicegroup_8675D04:: @ 8675D04
voicegroup_pokemon_cry:: @ 8675D04
.incbin "baserom.gba", 0x675D04, 0x27FF0
gUnknown_0869DCF4:: @ 869DCF4

2
include/gba/m4a_internal.h
View file

@ -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[];

2
src/m4a_tables.c
View file

@ -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,

2
sym_common.txt
View file

@ -502,7 +502,7 @@ gUnknown_03006370: @ 3006370
.include "m4a_2.o"
.include "agb_flash.o"
.include "agb_flash.o"
gUnknown_03007868: @ 3007868
.space 0x8