diff options
| author | YamaArashi <shadow962@live.com> | 2016-11-01 18:06:35 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2016-11-01 18:06:35 -0700 |
| commit | 92fdbda943df9765407ed106acf599276dfc360e (patch) | |
| tree | 66d833f95e31d37b23d2719ced1d70275577df2f | |
| parent | 315af92a3cfb8524d3b560f42fc352387e1369ed (diff) | |
define more variables in m4a_2.c
| -rw-r--r-- | common_syms/m4a_2.txt | 5 | ||||
| -rw-r--r-- | src/m4a_2.c | 5 | ||||
| -rw-r--r-- | sym_common.txt | 17 |
3 files changed, 10 insertions, 17 deletions
diff --git a/common_syms/m4a_2.txt b/common_syms/m4a_2.txt index b40bb7fcf..a80d8a79d 100644 --- a/common_syms/m4a_2.txt +++ b/common_syms/m4a_2.txt @@ -5,3 +5,8 @@ gMPlayJumpTable gCgbChans gPokemonCryTracks gPokemonCrySong +gMPlay_BGM +gMPlay_SE1 +gMPlay_SE2 +gMPlayMemAccArea +gMPlay_SE3 diff --git a/src/m4a_2.c b/src/m4a_2.c index b046b3172..2d3c65848 100644 --- a/src/m4a_2.c +++ b/src/m4a_2.c @@ -11,6 +11,11 @@ void *gMPlayJumpTable[36]; struct CgbChannel gCgbChans[4]; struct MusicPlayerTrack gPokemonCryTracks[MAX_POKEMON_CRIES * 2]; struct PokemonCrySong gPokemonCrySong; +struct MusicPlayerInfo gMPlay_BGM; +struct MusicPlayerInfo gMPlay_SE1; +struct MusicPlayerInfo gMPlay_SE2; +struct MusicPlayerInfo gMPlay_SE3; +u8 gMPlayMemAccArea[0x10]; u32 MidiKeyToFreq(struct WaveData *wav, u8 key, u8 fineAdjust) { diff --git a/sym_common.txt b/sym_common.txt index b1a323e2a..b05688d89 100644 --- a/sym_common.txt +++ b/sym_common.txt @@ -413,21 +413,4 @@ gUnknown_03005FA0: @ 3005FA0 .space 0x30 .include "m4a_2.o" - - .align 4 -gMPlay_BGM: @ 3007380 - .space 0x40 - -gMPlay_SE1: @ 30073C0 - .space 0x40 - -gMPlay_SE2: @ 3007400 - .space 0x40 - -gMPlayMemAccArea: @ 3007440 - .space 0x10 - -gMPlay_SE3: @ 3007450 - .space 0x40 - .include "agb_flash.o" |