diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2016-09-10 11:00:02 -0700 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2016-09-10 11:00:02 -0700 |
| commit | 3cb79cf078e82206796e1b834393ab771593de72 (patch) | |
| tree | 3e27550ab45ce782db8f2e182819015ba3aef733 /include/gba | |
| parent | f5d9daeca38728f67db92a175c37e5a3bc18cee3 (diff) | |
| parent | 19bffecc4deb401aa51add3b95163b72686f40ee (diff) | |
Merge 'master' with 'origin/master'
Diffstat (limited to 'include/gba')
| -rw-r--r-- | include/gba/defines.h | 2 | ||||
| -rw-r--r-- | include/gba/m4a_internal.h | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/include/gba/defines.h b/include/gba/defines.h index ea363109f..f3fa53496 100644 --- a/include/gba/defines.h +++ b/include/gba/defines.h @@ -75,4 +75,6 @@ #define RGB_BLACK RGB(0, 0, 0) #define RGB_WHITE RGB(31, 31, 31) +#define WIN_RANGE(a, b) (((a) << 8) | (b)) + #endif // GUARD_GBA_DEFINES diff --git a/include/gba/m4a_internal.h b/include/gba/m4a_internal.h index c09cde31f..6e202e7b8 100644 --- a/include/gba/m4a_internal.h +++ b/include/gba/m4a_internal.h @@ -45,8 +45,8 @@ struct WaveData #define TONEDATA_TYPE_CGB 0x07 #define TONEDATA_TYPE_FIX 0x08 -#define TONEDATA_TYPE_SPL 0x40 -#define TONEDATA_TYPE_RHY 0x80 +#define TONEDATA_TYPE_SPL 0x40 // key split +#define TONEDATA_TYPE_RHY 0x80 // rhythm #define TONEDATA_P_S_PAN 0xc0 #define TONEDATA_P_S_PAM TONEDATA_P_S_PAN @@ -241,9 +241,9 @@ struct MusicPlayerTrack u8 wai; u8 patP; u8 repN; - u8 gat; + u8 gateTime; u8 key; - u8 vel; + u8 velocity; u8 run; u8 keyM; u8 pitM; @@ -365,7 +365,7 @@ extern const u8 gNoiseTable[]; extern const struct PokemonCrySong gPokemonCrySongTemplate; -extern const struct ToneData gUnknown_0842FC88; +extern const struct ToneData voicegroup_842FC88; extern char gNumMusicPlayers[]; extern char gMaxLines[]; |