mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-14 03:44:34 +00:00
Code Issues Projects Releases Wiki Activity

Introducing Macros for BGM (Background Music) (#979)

Browse source 
* 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
This commit is contained in:
engineer124 2021-11-02 04:54:19 +11:00 • committed by GitHub
parent fa7007d73b
commit 970513253b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
59 changed files with 369 additions and 171 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/code/code_800F9280.c
View file

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