diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2016-08-27 21:43:34 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2016-08-27 21:43:34 -0400 |
| commit | 67a057d573b9c9e716f5afae5c6049f86836adbe (patch) | |
| tree | 8cad114d5fa558000dcc38b412d917ffd4cf2f93 /include | |
| parent | ed4907a014e1cf3ee3d085f8660d483a85cc577d (diff) | |
| parent | 382f99c35ee2e8b81847a18797815a2336971e30 (diff) | |
Merge branch 'master' of github.com:twitchplayspokemon/pokeruby
Diffstat (limited to 'include')
| -rw-r--r-- | include/gba/m4a_internal.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/gba/m4a_internal.h b/include/gba/m4a_internal.h index c09cde31f..8539af2e0 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; |