mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-20 14:01:15 +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

12
src/code/z_kankyo.c
View file

@ -1928,12 +1928,12 @@ void func_800758AC(GlobalContext* globalCtx) {
// both lost woods exits on the bridge from kokiri to hyrule field
if (((void)0, gSaveContext.entranceIndex) == 0x4DE || ((void)0, gSaveContext.entranceIndex) == 0x5E0) {
func_800F6FB4(4);
} else if (((void)0, gSaveContext.unk_140E) != 0) {
} else if (((void)0, gSaveContext.unk_140E) != NA_BGM_GENERAL_SFX) {
if (!func_80077600()) {
Audio_QueueSeqCmd((s32)((void)0, gSaveContext.unk_140E));
}
gSaveContext.unk_140E = 0;
} else if (globalCtx->soundCtx.seqIndex == 0x7F) {
gSaveContext.unk_140E = NA_BGM_GENERAL_SFX;
} else if (globalCtx->soundCtx.seqIndex == NA_BGM_NO_MUSIC) {
if (globalCtx->soundCtx.nightSeqIndex == 0x13) {
return;
}
@ -2402,7 +2402,7 @@ void func_800775F0(u16 arg0) {
s32 func_80077600(void) {
s32 ret = false;
if (gSaveContext.unk_140E == 0xFFFF) {
if (gSaveContext.unk_140E == NA_BGM_DISABLED) {
ret = true;
}
@ -2424,8 +2424,8 @@ void func_80077684(GlobalContext* globalCtx) {
func_800F6D58(14, 1, 0);
func_800F6D58(15, 1, 0);
if (func_800FA0B4(0) == 1) {
gSaveContext.seqIndex = 0x80;
if (func_800FA0B4(0) == NA_BGM_NATURE_BACKGROUND) {
gSaveContext.seqIndex = NA_BGM_NATURE_SFX_RAIN;
func_800758AC(globalCtx);
}
}