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

4
src/overlays/actors/ovl_En_Si/z_en_si.c
View file

@ -97,7 +97,7 @@ void func_80AFB768(EnSi* this, GlobalContext* globalCtx) {
Item_Give(globalCtx, ITEM_SKULL_TOKEN);
player->actor.freezeTimer = 10;
func_8010B680(globalCtx, 0xB4, 0);
func_800F5C64(0x39);
func_800F5C64(NA_BGM_SMALL_ITEM_GET);
this->actionFunc = func_80AFB950;
} else {
Collider_UpdateCylinder(&this->actor, &this->collider);
@ -119,7 +119,7 @@ void func_80AFB89C(EnSi* this, GlobalContext* globalCtx) {
Item_Give(globalCtx, ITEM_SKULL_TOKEN);
player->actor.freezeTimer = 10;
func_8010B680(globalCtx, 0xB4, 0);
func_800F5C64(0x39);
func_800F5C64(NA_BGM_SMALL_ITEM_GET);
this->actionFunc = func_80AFB950;
}
}