diff options
| author | engineer124 <47598039+engineer124@users.noreply.github.com> | 2021-11-02 04:54:19 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-01 13:54:19 -0400 |
| commit | 970513253b315c1c3243de0fb9bec045242c24ed (patch) | |
| tree | e55c31680271c5e7fcb72f266190f5c0e565ed7d /src/code/code_800F9280.c | |
| parent | fa7007d73b72c852440e037ce4a48ff58f812f2a (diff) | |
Introducing Macros for BGM (Background Music) (#979)
* Import bgm Ids
* Small correction
* Fix kaleido
* Add defines for 0, 1, 0xFFFF. Fill in missing macros
* Improve names, move to bgm.h, add in macros to kankyo.c
* format
* Swap order of bgm macros and flags
Diffstat (limited to 'src/code/code_800F9280.c')
| -rw-r--r-- | src/code/code_800F9280.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/code/code_800F9280.c b/src/code/code_800F9280.c index 15f63c255..ca3884b53 100644 --- a/src/code/code_800F9280.c +++ b/src/code/code_800F9280.c @@ -65,7 +65,7 @@ void func_800F9280(u8 seqIdx, u8 seqId, u8 arg2, u16 fadeTimer) { void func_800F9474(u8 arg0, u16 arg1) { Audio_QueueCmdS32(0x83000000 | ((u8)arg0 << 16), (arg1 * (u16)gAudioContext.audioBufferParameters.updatesPerFrame) / 4); - D_8016E750[arg0].unk_254 = 0xFFFF; + D_8016E750[arg0].unk_254 = NA_BGM_DISABLED; } typedef enum { @@ -370,7 +370,7 @@ void Audio_ProcessSeqCmds(void) { u16 func_800FA0B4(u8 playerIdx) { if (!gAudioContext.seqPlayers[playerIdx].enabled) { - return 0xFFFF; + return NA_BGM_DISABLED; } return D_8016E750[playerIdx].unk_254; } @@ -672,8 +672,8 @@ void func_800FADF8(void) { for (i = 0; i < 4; i++) { D_8016E348[i] = 0; - D_8016E750[i].unk_254 = 0xFFFF; - D_8016E750[i].unk_256 = 0xFFFF; + D_8016E750[i].unk_254 = NA_BGM_DISABLED; + D_8016E750[i].unk_256 = NA_BGM_DISABLED; D_8016E750[i].unk_28 = 0; D_8016E750[i].unk_18 = 0; D_8016E750[i].unk_14 = 0; |