mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-03 06:24:30 +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

2
src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c
View file

@ -110,7 +110,7 @@ void func_808BAF40(BgTokiSwd* this, GlobalContext* globalCtx) {
globalCtx->csCtx.segment = D_808BB7A0;
}
Audio_QueueSeqCmd(NA_BGM_STOP);
Audio_QueueSeqCmd(0x53);
Audio_QueueSeqCmd(NA_BGM_MASTER_SWORD);
gSaveContext.cutsceneTrigger = 1;
this->actor.parent = NULL;
BgTokiSwd_SetupAction(this, func_808BB0AC);

4
src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c
View file

@ -409,7 +409,7 @@ void BossDodongo_IntroCutscene(BossDodongo* this, GlobalContext* globalCtx) {
SEGMENTED_TO_VIRTUAL(&object_kingdodongo_Blob_017410), 0xA0, 0xB4, 0x80,
0x28);
}
Audio_QueueSeqCmd(0x6B);
Audio_QueueSeqCmd(NA_BGM_FIRE_BOSS);
}
if (this->unk_198 == 0) {
@ -1598,7 +1598,7 @@ void BossDodongo_DeathCutscene(BossDodongo* this, GlobalContext* globalCtx) {
}
if (this->unk_1DA == 820) {
Audio_QueueSeqCmd(0x21);
Audio_QueueSeqCmd(NA_BGM_BOSS_CLEAR);
Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_ITEM_B_HEART,
Math_SinS(this->actor.shape.rot.y) * -50.0f + this->actor.world.pos.x,
this->actor.world.pos.y,

6
src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c
View file

@ -190,7 +190,7 @@ void BossFd_Init(Actor* thisx, GlobalContext* globalCtx) {
0);
this->introState = BFD_CS_WAIT;
if (this->introState == BFD_CS_NONE) {
Audio_QueueSeqCmd(0x6B);
Audio_QueueSeqCmd(NA_BGM_FIRE_BOSS);
}
this->actor.world.pos.x = this->actor.world.pos.z = 0.0f;
@ -490,7 +490,7 @@ void BossFd_Fly(BossFd* this, GlobalContext* globalCtx) {
this->camData.yMod = Math_CosS(this->work[BFD_MOVE_TIMER] * 0x8000) * this->camData.shake;
}
if (this->timers[3] == 160) {
Audio_QueueSeqCmd(0x6B);
Audio_QueueSeqCmd(NA_BGM_FIRE_BOSS);
}
if ((this->timers[3] == 130) && !(gSaveContext.eventChkInf[7] & 8)) {
TitleCard_InitBossName(globalCtx, &globalCtx->actorCtx.titleCtx,
@ -745,7 +745,7 @@ void BossFd_Fly(BossFd* this, GlobalContext* globalCtx) {
if (this->skinSegments != 0) {
this->skinSegments--;
if (this->skinSegments == 0) {
Audio_QueueSeqCmd(0x21);
Audio_QueueSeqCmd(NA_BGM_BOSS_CLEAR);
}
} else {
this->work[BFD_ACTION_STATE] = BOSSFD_BONES_FALL;

4
src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c
View file

@ -444,7 +444,7 @@ void func_808FD5F4(BossGanon2* this, GlobalContext* globalCtx) {
this->actor.world.pos.x = -200.0f;
this->actor.world.pos.y = this->actor.world.pos.y - 30.0f;
this->actor.world.pos.z = -200.0f;
Audio_QueueSeqCmd(0x23);
Audio_QueueSeqCmd(NA_BGM_OPENING_GANON);
} else {
break;
}
@ -587,7 +587,7 @@ void func_808FD5F4(BossGanon2* this, GlobalContext* globalCtx) {
case 18:
this->unk_339 = 6;
if (this->unk_398 == 30) {
Audio_QueueSeqCmd(0x65);
Audio_QueueSeqCmd(NA_BGM_GANON_BATTLE_2);
}
Math_ApproachF(&this->unk_30C, 7.0f, 1.0f, 0.1f);
Math_ApproachF(&this->unk_3A4.x, (this->actor.world.pos.x + 500.0f) - 350.0f, 0.1f, 1.0f);

2
src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c
View file

@ -1101,7 +1101,7 @@ void BossGanondrof_Death(BossGanondrof* this, GlobalContext* globalCtx) {
holdCamera = true;
bodyDecayLevel = 10;
if (this->timers[0] == 150) {
Audio_QueueSeqCmd(0x21);
Audio_QueueSeqCmd(NA_BGM_BOSS_CLEAR);
Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_DOOR_WARP1, GND_BOSSROOM_CENTER_X,
GND_BOSSROOM_CENTER_Y, GND_BOSSROOM_CENTER_Z, 0, 0, 0, WARP_DUNGEON_ADULT);
}

4
src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c
View file

@ -925,7 +925,7 @@ void BossGoma_Encounter(BossGoma* this, GlobalContext* globalCtx) {
SEGMENTED_TO_VIRTUAL(gGohmaTitleCardTex), 0xA0, 0xB4, 0x80, 0x28);
}
Audio_QueueSeqCmd(0x1B);
Audio_QueueSeqCmd(NA_BGM_BOSS);
gSaveContext.eventChkInf[7] |= 1;
}
@ -1110,7 +1110,7 @@ void BossGoma_Defeated(BossGoma* this, GlobalContext* globalCtx) {
Math_SmoothStepToF(&this->subCameraAt.z, this->firstTailLimbWorldPos.z, 0.2f, 50.0f, 0.1f);
if (this->timer == 80) {
Audio_QueueSeqCmd(0x21);
Audio_QueueSeqCmd(NA_BGM_BOSS_CLEAR);
}
if (this->timer == 0) {

6
src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c
View file

@ -360,7 +360,7 @@ void BossMo_Init(Actor* thisx, GlobalContext* globalCtx2) {
return;
}
if (gSaveContext.eventChkInf[7] & 0x10) {
Audio_QueueSeqCmd(0x1B);
Audio_QueueSeqCmd(NA_BGM_BOSS);
this->tentMaxAngle = 5.0f;
this->timers[0] = 50;
} else {
@ -1104,7 +1104,7 @@ void BossMo_Tentacle(BossMo* this, GlobalContext* globalCtx) {
WARP_DUNGEON_ADULT);
Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_ITEM_B_HEART, this->actor.world.pos.x + 200.0f,
-280.0f, this->actor.world.pos.z, 0, 0, 0, 0);
Audio_QueueSeqCmd(0x21);
Audio_QueueSeqCmd(NA_BGM_BOSS_CLEAR);
Flags_SetClear(globalCtx, globalCtx->roomCtx.curRoom.num);
}
}
@ -1419,7 +1419,7 @@ void BossMo_IntroCs(BossMo* this, GlobalContext* globalCtx) {
this->cameraAccel = 0.01f;
}
if (this->timers[2] == 150) {
Audio_QueueSeqCmd(0x1B);
Audio_QueueSeqCmd(NA_BGM_BOSS);
}
if (this->timers[2] == 130) {
TitleCard_InitBossName(globalCtx, &globalCtx->actorCtx.titleCtx,

4
src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c
View file

@ -599,7 +599,7 @@ void BossSst_HeadIntro(BossSst* this, GlobalContext* globalCtx) {
TitleCard_InitBossName(globalCtx, &globalCtx->actorCtx.titleCtx,
SEGMENTED_TO_VIRTUAL(&gBongoTitleCardTex), 160, 180, 128, 40);
}
Audio_QueueSeqCmd(0x1B);
Audio_QueueSeqCmd(NA_BGM_BOSS);
Animation_MorphToPlayOnce(&this->skelAnime, &gBongoHeadEyeCloseAnim, -5.0f);
BossSst_HeadSfx(this, NA_SE_EN_SHADEST_DISAPPEAR);
}
@ -1157,7 +1157,7 @@ void BossSst_HeadMelt(BossSst* this, GlobalContext* globalCtx) {
void BossSst_HeadSetupFinish(BossSst* this) {
this->actor.draw = BossSst_DrawEffect;
this->timer = 40;
Audio_QueueSeqCmd(0x21);
Audio_QueueSeqCmd(NA_BGM_BOSS_CLEAR);
BossSst_SetCameraTargets(1.0 / 40, 6);
this->actionFunc = BossSst_HeadFinish;
}

12
src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c
View file

@ -520,7 +520,7 @@ void BossTw_Init(Actor* thisx, GlobalContext* globalCtx2) {
this->actor.world.pos.x = -600.0f;
this->actor.world.pos.y = 400.0f;
this->actor.world.pos.z = 0.0f;
Audio_QueueSeqCmd(0x1B);
Audio_QueueSeqCmd(NA_BGM_BOSS);
} else {
BossTw_SetupCSWait(this, globalCtx);
}
@ -1642,7 +1642,7 @@ void BossTw_TwinrovaMergeCS(BossTw* this, GlobalContext* globalCtx) {
this->timers[0] = 50;
func_8002DF54(globalCtx, &this->actor, 2);
Audio_PlayActorSound2(&this->actor, NA_SE_EN_TWINROBA_TRANSFORM);
Audio_QueueSeqCmd(0x1B);
Audio_QueueSeqCmd(NA_BGM_BOSS);
}
}
@ -1783,7 +1783,7 @@ void BossTw_TwinrovaIntroCS(BossTw* this, GlobalContext* globalCtx) {
if (this->csSfxTimer == 180) {
func_80078914(&D_8094A7D0, NA_SE_EN_TWINROBA_LAUGH);
func_80078914(&D_8094A7D0, NA_SE_EN_TWINROBA_LAUGH2);
Audio_QueueSeqCmd(0x61);
Audio_QueueSeqCmd(NA_BGM_KOTAKE_KOUME);
}
this->csSfxTimer++;
@ -2220,7 +2220,7 @@ void BossTw_TwinrovaIntroCS(BossTw* this, GlobalContext* globalCtx) {
TitleCard_InitBossName(globalCtx, &globalCtx->actorCtx.titleCtx,
SEGMENTED_TO_VIRTUAL(object_tw_Blob_02E170), 0xA0, 0xB4, 0x80, 0x28);
gSaveContext.eventChkInf[7] |= 0x20;
Audio_QueueSeqCmd(0x1B);
Audio_QueueSeqCmd(NA_BGM_BOSS);
}
if (this->work[CS_TIMER_1] >= 160) {
@ -2767,7 +2767,7 @@ void BossTw_TwinrovaDeathCS(BossTw* this, GlobalContext* globalCtx) {
sKoumePtr->visible = 1;
sKotakePtr->visible = 1;
func_80078884(NA_SE_EN_TWINROBA_TRANSFORM);
Audio_QueueSeqCmd(0x61);
Audio_QueueSeqCmd(NA_BGM_KOTAKE_KOUME);
this->csState2 = 3;
this->work[CS_TIMER_2] = 0;
this->subCamYaw = this->subCamYawStep = this->actor.speedXZ = this->subCamDistStep = 0.0f;
@ -2815,7 +2815,7 @@ void BossTw_TwinrovaDeathCS(BossTw* this, GlobalContext* globalCtx) {
this->subCamId = 0;
func_80064534(globalCtx, &globalCtx->csCtx);
func_8002DF54(globalCtx, &this->actor, 7);
Audio_QueueSeqCmd(0x21);
Audio_QueueSeqCmd(NA_BGM_BOSS_CLEAR);
Actor_SpawnAsChild(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_DOOR_WARP1, 600.0f, 230.0f,
0.0f, 0, 0, 0, WARP_DUNGEON_ADULT);
Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_ITEM_B_HEART, -600.0f, 230.f, 0.0f, 0, 0, 0, 0);

4
src/overlays/actors/ovl_Boss_Va/z_boss_va.c
View file

@ -959,7 +959,7 @@ void BossVa_BodyIntro(BossVa* this, GlobalContext* globalCtx) {
globalCtx->envCtx.unk_BF = 1;
func_8002DF54(globalCtx, &this->actor, 8);
} else if (this->timer >= 35000) {
Audio_QueueSeqCmd(0x1B);
Audio_QueueSeqCmd(NA_BGM_BOSS);
}
this->timer += this->unk_1F2;
@ -1600,7 +1600,7 @@ void BossVa_BodyDeath(BossVa* this, GlobalContext* globalCtx) {
break;
case DEATH_CORE_BURST:
if (this->timer == 13) {
Audio_QueueSeqCmd(0x21);
Audio_QueueSeqCmd(NA_BGM_BOSS_CLEAR);
}
this->timer--;

2
src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c
View file

@ -382,7 +382,7 @@ void DoorWarp1_ChooseInitialAction(DoorWarp1* this, GlobalContext* globalCtx) {
void DoorWarp1_AwaitClearFlag(DoorWarp1* this, GlobalContext* globalCtx) {
if (Flags_GetTempClear(globalCtx, this->actor.room)) {
this->warpTimer = 200;
Audio_QueueSeqCmd(0x21);
Audio_QueueSeqCmd(NA_BGM_BOSS_CLEAR);
DoorWarp1_SetupAction(this, func_809995D4);
}
}

4
src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c
View file

@ -407,7 +407,7 @@ void func_809BD84C(EnBigokuta* this, GlobalContext* globalCtx) {
Audio_PlayActorSound2(&this->actor, NA_SE_EN_DAIOCTA_VOICE);
}
if (this->unk_196 == 1) {
func_800F5ACC(0x38);
func_800F5ACC(NA_BGM_MINI_BOSS);
}
if (this->actor.params == 1) {
func_809BD370(this);
@ -470,7 +470,7 @@ void func_809BDB90(EnBigokuta* this, GlobalContext* globalCtx) {
}
if (this->unk_196 == 0) {
if (this->actor.params == 3) {
func_800F5ACC(0x38);
func_800F5ACC(NA_BGM_MINI_BOSS);
}
func_809BD3F8(this);
}

2
src/overlays/actors/ovl_En_Box/z_en_box.c
View file

@ -415,7 +415,7 @@ void EnBox_WaitOpen(EnBox* this, GlobalContext* globalCtx) {
this->dyna.actor.world.pos.x, this->dyna.actor.world.pos.y,
this->dyna.actor.world.pos.z, this->dyna.actor.shape.rot.x,
this->dyna.actor.shape.rot.y, this->dyna.actor.shape.rot.z, 0xFFFF);
func_800F5C64(0x92B);
func_800F5C64(NA_BGM_OPEN_TRE_BOX | 0x900);
}
}
osSyncPrintf("Actor_Environment_Tbox_On() %d\n", this->dyna.actor.params & 0x1F);

2
src/overlays/actors/ovl_En_Daiku/z_en_daiku.c
View file

@ -403,7 +403,7 @@ void EnDaiku_InitEscape(EnDaiku* this, GlobalContext* globalCtx) {
Vec3s* pointPos;
s32 exitLoop;
func_800F5C64(0x51);
func_800F5C64(NA_BGM_APPEAR);
EnDaiku_Change(this, ENDAIKU_ANIM_RUN, &this->currentAnimIndex);
this->stateFlags &= ~(ENDAIKU_STATEFLAG_1 | ENDAIKU_STATEFLAG_2);

2
src/overlays/actors/ovl_En_Dh/z_en_dh.c
View file

@ -201,7 +201,7 @@ void EnDh_SetupWait(EnDh* this) {
void EnDh_Wait(EnDh* this, GlobalContext* globalCtx) {
if ((s32)this->skelAnime.curFrame == 5) {
func_800F5ACC(0x38);
func_800F5ACC(NA_BGM_MINI_BOSS);
}
if (Actor_GetCollidedExplosive(globalCtx, &this->collider1.base)) {
this->actor.params = ENDH_START_ATTACK_BOMB;

4
src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c
View file

@ -160,7 +160,7 @@ s32 EnDivingGame_HasMinigameFinished(EnDivingGame* this, GlobalContext* globalCt
func_8010B680(globalCtx, this->actor.textId, NULL);
this->unk_292 = 5;
func_800F5B58();
func_800F5C64(0x39);
func_800F5C64(NA_BGM_SMALL_ITEM_GET);
func_8002DF54(globalCtx, NULL, 8);
if (!(gSaveContext.eventChkInf[3] & 0x100)) {
this->actionFunc = func_809EE96C;
@ -416,7 +416,7 @@ void func_809EE800(EnDivingGame* this, GlobalContext* globalCtx) {
} else {
func_80088B34(BREG(2) + 50);
}
func_800F5ACC(0x6C);
func_800F5ACC(NA_BGM_MINI_GAME_2);
func_8002DF54(globalCtx, NULL, 7);
this->actor.textId = 0x405B;
this->unk_292 = 5;

8
src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c
View file

@ -161,7 +161,7 @@ void EnDntDemo_Judge(EnDntDemo* this, GlobalContext* globalCtx) {
if (!(gSaveContext.itemGetInf[1] & 0x4000)) {
reaction = DNT_SIGNAL_CELEBRATE;
this->prize = DNT_PRIZE_STICK;
Audio_QueueSeqCmd(0x3E);
Audio_QueueSeqCmd(NA_BGM_SARIA_THEME);
break;
}
case PLAYER_MASK_TRUTH:
@ -208,17 +208,17 @@ void EnDntDemo_Judge(EnDntDemo* this, GlobalContext* globalCtx) {
this->action = sResultValues[resultIdx][1];
switch (this->action) {
case DNT_ACTION_LOW_RUPEES:
Audio_QueueSeqCmd(0x2D);
Audio_QueueSeqCmd(NA_BGM_COURTYARD);
break;
case DNT_ACTION_ATTACK:
if (this->subCamera != SUBCAM_FREE) {
this->subCamera = SUBCAM_FREE;
OnePointCutscene_Init(globalCtx, 2350, -99, &this->scrubs[3]->actor, MAIN_CAM);
}
Audio_QueueSeqCmd(0x81A);
Audio_QueueSeqCmd(NA_BGM_ENEMY | 0x800);
break;
case DNT_ACTION_DANCE:
Audio_QueueSeqCmd(0x55);
Audio_QueueSeqCmd(NA_BGM_SHOP);
break;
}
osSyncPrintf("\n\n");

2
src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c
View file

@ -361,7 +361,7 @@ void EnDntJiji_Return(EnDntJiji* this, GlobalContext* globalCtx) {
if ((this->stage->actor.update != NULL) && (this->stage->leaderSignal == DNT_SIGNAL_NONE)) {
this->stage->leaderSignal = DNT_SIGNAL_HIDE;
this->stage->action = DNT_ACTION_ATTACK;
Audio_QueueSeqCmd(0x81A);
Audio_QueueSeqCmd(NA_BGM_ENEMY | 0x800);
}
}
this->actor.speedXZ = 0.0f;

2
src/overlays/actors/ovl_En_Du/z_en_du.c
View file

@ -343,7 +343,7 @@ void func_809FE638(EnDu* this, GlobalContext* globalCtx) {
if (!(player->stateFlags1 & 0x20000000)) {
OnePointCutscene_Init(globalCtx, 3330, -99, &this->actor, MAIN_CAM);
player->actor.shape.rot.y = player->actor.world.rot.y = this->actor.world.rot.y + 0x7FFF;
func_800F5C64(0x51);
func_800F5C64(NA_BGM_APPEAR);
EnDu_SetupAction(this, func_809FE6CC);
this->unk_1E2 = 0x32;
}

2
src/overlays/actors/ovl_En_Fd/z_en_fd.c
View file

@ -646,7 +646,7 @@ void EnFd_Update(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
if (this->firstUpdateFlag) {
func_800F5ACC(0x38);
func_800F5ACC(NA_BGM_MINI_BOSS);
this->firstUpdateFlag = false;
}

2
src/overlays/actors/ovl_En_GeldB/z_en_geldb.c
View file

@ -356,7 +356,7 @@ void EnGeldB_Wait(EnGeldB* this, GlobalContext* globalCtx) {
} else {
this->invisible = false;
this->actor.shape.shadowScale = 90.0f;
func_800F5ACC(0x38);
func_800F5ACC(NA_BGM_MINI_BOSS);
}
if (this->actor.bgCheckFlags & 2) {
Audio_PlayActorSound2(&this->actor, NA_SE_EN_RIZA_DOWN);

2
src/overlays/actors/ovl_En_Go2/z_en_go2.c
View file

@ -1884,7 +1884,7 @@ void EnGo2_GoronFireGenericAction(EnGo2* this, GlobalContext* globalCtx) {
player->actor.world.pos.z =
(f32)((Math_CosS(this->actor.world.rot.y) * -30.0f) + this->actor.world.pos.z);
func_8002DF54(globalCtx, &this->actor, 8);
func_800F5C64(0x51);
func_800F5C64(NA_BGM_APPEAR);
}
break;
case 2: // Walking away

4
src/overlays/actors/ovl_En_Horse/z_en_horse.c
View file

@ -2502,7 +2502,7 @@ void EnHorse_UpdateHorsebackArchery(EnHorse* this, GlobalContext* globalCtx) {
this->hbaTimer++;
}
sp20 = func_800F5A58(65);
sp20 = func_800F5A58(NA_BGM_HORSE_GOAL);
EnHorse_UpdateHbaRaceInfo(this, globalCtx, &sHbaInfo);
if (this->hbaFlags & 1 || this->hbaTimer >= 46) {
if (sp20 != 1 && gSaveContext.minigameState != 3) {
@ -2530,7 +2530,7 @@ void EnHorse_UpdateHorsebackArchery(EnHorse* this, GlobalContext* globalCtx) {
if ((globalCtx->interfaceCtx.hbaAmmo == 0) || (this->hbaFlags & 2)) {
if (this->hbaFlags & 4) {
this->hbaFlags &= ~4;
Audio_QueueSeqCmd(65);
Audio_QueueSeqCmd(NA_BGM_HORSE_GOAL);
}
}

14
src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c
View file

@ -115,11 +115,11 @@ void EnHorseGameCheck_FinishIngoRace(EnHorseGameCheckIngoRace* this, GlobalConte
gSaveContext.eventInf[0] = (gSaveContext.eventInf[0] & ~0xF) | 6;
gSaveContext.eventInf[0] = (gSaveContext.eventInf[0] & ~0x8000) | 0x8000;
globalCtx->fadeTransition = 3;
func_800775F0(0x42);
func_800775F0(NA_BGM_INGO);
} else {
gSaveContext.eventInf[0] = (gSaveContext.eventInf[0] & ~0xF) | 4;
gSaveContext.eventInf[0] = (gSaveContext.eventInf[0] & ~0x8000) | 0x8000;
func_800775F0(0x42);
func_800775F0(NA_BGM_INGO);
globalCtx->fadeTransition = 0x2E;
}
} else {
@ -183,7 +183,7 @@ s32 EnHorseGameCheck_UpdateIngoRace(EnHorseGameCheckBase* base, GlobalContext* g
if (this->playerFinish > 0) {
this->result = INGORACE_PLAYER_WIN;
this->finishTimer = 55;
Audio_QueueSeqCmd(0x41);
Audio_QueueSeqCmd(NA_BGM_HORSE_GOAL);
Audio_PlaySoundGeneral(NA_SE_SY_START_SHOT, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
}
for (i = 0; i < 3; i++) {
@ -198,7 +198,7 @@ s32 EnHorseGameCheck_UpdateIngoRace(EnHorseGameCheckBase* base, GlobalContext* g
this->result = INGORACE_INGO_WIN;
this->finishTimer = 70;
ingoHorse->stateFlags |= ENHORSE_INGO_WON;
Audio_QueueSeqCmd(0x41);
Audio_QueueSeqCmd(NA_BGM_HORSE_GOAL);
Audio_PlaySoundGeneral(NA_SE_SY_START_SHOT, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
}
for (i = 0; i < 3; i++) {
@ -206,12 +206,12 @@ s32 EnHorseGameCheck_UpdateIngoRace(EnHorseGameCheckBase* base, GlobalContext* g
}
}
if (((player2->rideActor != NULL) && AT_RANCH_EXIT(player2->rideActor)) || AT_RANCH_EXIT(&player2->actor)) {
Audio_QueueSeqCmd(0x41);
Audio_QueueSeqCmd(NA_BGM_HORSE_GOAL);
this->result = INGORACE_INGO_WIN;
this->finishTimer = 20;
}
if ((gSaveContext.timer1Value >= 180) && (this->startFlags & 2)) {
Audio_QueueSeqCmd(0x41);
Audio_QueueSeqCmd(NA_BGM_HORSE_GOAL);
this->result = INGORACE_TIME_UP;
this->finishTimer = 20;
}
@ -376,7 +376,7 @@ s32 EnHorseGameCheck_UpdateMalonRace(EnHorseGameCheckBase* base, GlobalContext*
this->finishTimer = 30;
} else if (this->fenceCheck[15] == 1) {
this->lapCount = 2;
Audio_QueueSeqCmd(0x41);
Audio_QueueSeqCmd(NA_BGM_HORSE_GOAL);
Audio_PlaySoundGeneral(NA_SE_SY_START_SHOT, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
this->result = MALONRACE_SUCCESS;
this->finishTimer = 70;

2
src/overlays/actors/ovl_En_Hy/z_en_hy.c
View file

@ -428,7 +428,7 @@ s16 func_80A70058(GlobalContext* globalCtx, Actor* thisx) {
case 0x70F3:
if (this->skelAnime.animation != &gObjOsAnim_33B4) {
func_80034EC0(&this->skelAnime, D_80A72050, 23);
func_800F5C64(0x922);
func_800F5C64(NA_BGM_ITEM_GET | 0x900);
}
break;
}

4
src/overlays/actors/ovl_En_Ik/z_en_ik.c
View file

@ -294,7 +294,7 @@ void func_80A747C0(EnIk* this, GlobalContext* globalCtx) {
sp24.y += 30.0f;
func_8003424C(globalCtx, &sp24);
this->skelAnime.playSpeed = 1.0f;
func_800F5ACC(0x38);
func_800F5ACC(NA_BGM_MINI_BOSS);
}
if (this->skelAnime.curFrame == 5.0f) {
Audio_PlayActorSound2(&this->actor, NA_SE_EN_IRONNACK_WAKEUP);
@ -960,7 +960,7 @@ void func_80A76798(Actor* thisx, GlobalContext* globalCtx) {
}
void EnIk_StartMusic(void) {
func_800F5ACC(0x38);
func_800F5ACC(NA_BGM_MINI_BOSS);
}
void func_80A76C14(EnIk* this) {

2
src/overlays/actors/ovl_En_In/z_en_in.c
View file

@ -636,7 +636,7 @@ void func_80A7A4C8(EnIn* this, GlobalContext* globalCtx) {
gSaveContext.eventInf[0] = (gSaveContext.eventInf[0] & ~0x000F) | 0x0001;
gSaveContext.eventInf[0] = (gSaveContext.eventInf[0] & ~0x8000) | 0x8000;
gSaveContext.infTable[10] &= ~4;
func_800775F0(0x40);
func_800775F0(NA_BGM_HORSE);
globalCtx->msgCtx.unk_E3E7 = 0;
globalCtx->msgCtx.msgMode = 0x36;
this->unk_308.unk_00 = 0;

2
src/overlays/actors/ovl_En_Ma1/z_en_ma1.c
View file

@ -447,7 +447,7 @@ void EnMa1_Draw(Actor* thisx, GlobalContext* globalCtx) {
camera = GET_ACTIVE_CAM(globalCtx);
distFromCamera = Math_Vec3f_DistXZ(&this->actor.world.pos, &camera->eye);
func_800F6268(distFromCamera, 0x2F);
func_800F6268(distFromCamera, NA_BGM_LONLON);
func_80093D18(globalCtx->state.gfxCtx);
gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(sMouthTextures[this->mouthIndex]));

2
src/overlays/actors/ovl_En_Ma2/z_en_ma2.c
View file

@ -379,7 +379,7 @@ void EnMa2_Draw(Actor* thisx, GlobalContext* globalCtx) {
camera = GET_ACTIVE_CAM(globalCtx);
someFloat = Math_Vec3f_DistXZ(&this->actor.world.pos, &camera->eye);
func_800F6268(someFloat, 0x2F);
func_800F6268(someFloat, NA_BGM_LONLON);
func_80093D18(globalCtx->state.gfxCtx);
gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(D_80AA28B4[this->unk_210]));

2
src/overlays/actors/ovl_En_Ma3/z_en_ma3.c
View file

@ -361,7 +361,7 @@ void EnMa3_Draw(Actor* thisx, GlobalContext* globalCtx) {
camera = GET_ACTIVE_CAM(globalCtx);
someFloat = Math_Vec3f_DistXZ(&this->actor.world.pos, &camera->eye);
func_800F6268(someFloat, 0x2F);
func_800F6268(someFloat, NA_BGM_LONLON);
func_80093D18(globalCtx->state.gfxCtx);
gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(D_80AA38A4[this->unk_210]));

2
src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c
View file

@ -94,7 +94,7 @@ void EnOkarinaEffect_ManageStorm(EnOkarinaEffect* this, GlobalContext* globalCtx
globalCtx->envCtx.unk_F2[0] = 0;
if (globalCtx->csCtx.state == CS_STATE_IDLE) {
func_80077684(globalCtx);
} else if (func_800FA0B4(0) == 1) {
} else if (func_800FA0B4(0) == NA_BGM_NATURE_BACKGROUND) {
func_800F6D58(0xF, 1, 0);
func_800F6D58(0xE, 1, 0);
}

24
src/overlays/actors/ovl_En_Owl/z_en_owl.c
View file

@ -384,7 +384,7 @@ void EnOwl_WaitOutsideKokiri(EnOwl* this, GlobalContext* globalCtx) {
if (EnOwl_CheckInitTalk(this, globalCtx, 0x2064, 360.0f, 0)) {
// Sets BGM
func_800F5C64(0x5A);
func_800F5C64(NA_BGM_OWL);
this->actionFunc = EnOwl_ConfirmKokiriMessage;
// spoke to owl by lost woods
@ -431,7 +431,7 @@ void EnOwl_WaitHyruleCastle(EnOwl* this, GlobalContext* globalCtx) {
EnOwl_LookAtLink(this, globalCtx);
if (EnOwl_CheckInitTalk(this, globalCtx, 0x2068, 540.0f, 0)) {
func_800F5C64(0x5A);
func_800F5C64(NA_BGM_OWL);
this->actionFunc = func_80ACAAC0;
}
}
@ -472,7 +472,7 @@ void EnOwl_WaitKakariko(EnOwl* this, GlobalContext* globalCtx) {
EnOwl_LookAtLink(this, globalCtx);
if (EnOwl_CheckInitTalk(this, globalCtx, 0x206C, 480.0f, 0)) {
func_800F5C64(0x5A);
func_800F5C64(NA_BGM_OWL);
this->actionFunc = func_80ACAC6C;
}
}
@ -508,7 +508,7 @@ void EnOwl_WaitGerudo(EnOwl* this, GlobalContext* globalCtx) {
EnOwl_LookAtLink(this, globalCtx);
if (EnOwl_CheckInitTalk(this, globalCtx, 0x206F, 360.0f, 0)) {
func_800F5C64(0x5A);
func_800F5C64(NA_BGM_OWL);
this->actionFunc = func_80ACADF0;
}
}
@ -544,7 +544,7 @@ void EnOwl_WaitLakeHylia(EnOwl* this, GlobalContext* globalCtx) {
EnOwl_LookAtLink(this, globalCtx);
if (EnOwl_CheckInitTalk(this, globalCtx, 0x2071, 360.0f, 0)) {
func_800F5C64(0x5A);
func_800F5C64(NA_BGM_OWL);
this->actionFunc = func_80ACAF74;
}
}
@ -575,7 +575,7 @@ void EnOwl_WaitZoraRiver(EnOwl* this, GlobalContext* globalCtx) {
}
if (EnOwl_CheckInitTalk(this, globalCtx, textId, 360.0f, 0)) {
func_800F5C64(0x5A);
func_800F5C64(NA_BGM_OWL);
this->actionFunc = func_80ACB03C;
}
}
@ -595,7 +595,7 @@ void EnOwl_WaitHyliaShortcut(EnOwl* this, GlobalContext* globalCtx) {
EnOwl_LookAtLink(this, globalCtx);
if (func_80ACA558(this, globalCtx, textId)) {
gSaveContext.infTable[25] |= 0x20;
func_800F5C64(0x5A);
func_800F5C64(NA_BGM_OWL);
this->actionFunc = func_80ACB148;
}
}
@ -620,13 +620,13 @@ void EnOwl_WaitDeathMountainShortcut(EnOwl* this, GlobalContext* globalCtx) {
if (!gSaveContext.magicAcquired) {
if (func_80ACA558(this, globalCtx, 0x3062)) {
func_800F5C64(0x5A);
func_800F5C64(NA_BGM_OWL);
this->actionFunc = func_80ACB274;
return;
}
} else {
if (func_80ACA558(this, globalCtx, 0x3063)) {
func_800F5C64(0x5A);
func_800F5C64(NA_BGM_OWL);
this->actionFunc = func_80ACB22C;
}
}
@ -650,7 +650,7 @@ void func_80ACB3E0(EnOwl* this, GlobalContext* globalCtx) {
EnOwl_LookAtLink(this, globalCtx);
if (EnOwl_CheckInitTalk(this, globalCtx, 0x6079, 360.0f, 2)) {
func_800F5C64(0x5A);
func_800F5C64(NA_BGM_OWL);
this->actionFunc = func_80ACB344;
}
}
@ -685,7 +685,7 @@ void EnOwl_WaitLWPreSaria(EnOwl* this, GlobalContext* globalCtx) {
EnOwl_LookAtLink(this, globalCtx);
if (EnOwl_CheckInitTalk(this, globalCtx, 0x10C0, 190.0f, 0)) {
func_800F5C64(0x5A);
func_800F5C64(NA_BGM_OWL);
this->actionFunc = func_80ACB4FC;
}
}
@ -721,7 +721,7 @@ void EnOwl_WaitLWPostSaria(EnOwl* this, GlobalContext* globalCtx) {
EnOwl_LookAtLink(this, globalCtx);
if (EnOwl_CheckInitTalk(this, globalCtx, 0x10C4, 360.0f, 0)) {
func_800F5C64(0x5A);
func_800F5C64(NA_BGM_OWL);
this->actionFunc = func_80ACB680;
}
}

2
src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c
View file

@ -898,7 +898,7 @@ void func_80ADB51C(EnPoSisters* this, GlobalContext* globalCtx) {
if (this->unk_19A == 0) {
this->actor.world.rot.y = this->actor.shape.rot.y += 0x4000 * (s32)(Rand_ZeroOne() * 4.0f);
if (this->unk_195 == 0) {
func_800F5ACC(0x38);
func_800F5ACC(NA_BGM_MINI_BOSS);
}
func_80AD9F1C(this);
} else {

4
src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.c
View file

@ -242,9 +242,9 @@ void EnRiverSound_Draw(Actor* thisx, GlobalContext* globalCtx) {
} else if (this->actor.params == RS_SARIAS_SONG) {
func_800F4E30(&this->actor.projectedPos, this->actor.xzDistToPlayer);
} else if (this->actor.params == RS_UNK_13) {
Audio_PlaySariaBgm(&this->actor.home.pos, 62, 1000);
Audio_PlaySariaBgm(&this->actor.home.pos, NA_BGM_SARIA_THEME, 1000);
} else if (this->actor.params == RS_UNK_19) {
Audio_PlaySariaBgm(&this->actor.home.pos, 40, 800);
Audio_PlaySariaBgm(&this->actor.home.pos, NA_BGM_GREAT_FAIRY, 800);
} else if ((this->actor.params == RS_SANDSTORM) || (this->actor.params == RS_CHAMBER_OF_SAGES_1) ||
(this->actor.params == RS_CHAMBER_OF_SAGES_2) || (this->actor.params == RS_RUMBLING)) {
func_800788CC(soundEffects[this->actor.params]);

2
src/overlays/actors/ovl_En_Ru2/z_en_ru2.c
View file

@ -610,7 +610,7 @@ void func_80AF3744(EnRu2* this, GlobalContext* globalCtx) {
}
void func_80AF37AC() {
func_800F5C64(0x51);
func_800F5C64(NA_BGM_APPEAR);
}
void func_80AF37CC(EnRu2* this) {

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

93
src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c
View file

@ -57,11 +57,94 @@ const ActorInit En_Syateki_Man_InitVars = {
};
static u16 sBgmList[] = {
0x00, 0x01, 0x02, 0x18, 0x19, 0x02, 0x19, 0x1A, 0x1A, 0x81A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x20, 0x21, 0x922,
0x23, 0x924, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2A, 0x92B, 0x2C, 0x2D, 0x2E, 0x2F, 0x30, 0x32, 0x33, 0x34, 0x35,
0x36, 0x37, 0x38, 0x39, 0x3A, 0x3B, 0x3C, 0x3D, 0x3E, 0x3F, 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47,
0x48, 0x49, 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F, 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59,
0x5A, 0x5B, 0x5C, 0x5D, 0x6D, 0x5E, 0x5E, 0x5F, 0x60, 0x61, 0x6D, 0x62, 0x63, 0x64, 0x65, 0x66,
NA_BGM_GENERAL_SFX,
NA_BGM_NATURE_BACKGROUND,
NA_BGM_FIELD_LOGIC,
NA_BGM_DUNGEON,
NA_BGM_KAKARIKO_ADULT,
NA_BGM_FIELD_LOGIC,
NA_BGM_KAKARIKO_ADULT,
NA_BGM_ENEMY,
NA_BGM_ENEMY,
NA_BGM_ENEMY | 0x800,
NA_BGM_BOSS,
NA_BGM_INSIDE_DEKU_TREE,
NA_BGM_MARKET,
NA_BGM_TITLE,
NA_BGM_LINK_HOUSE,
NA_BGM_GAME_OVER,
NA_BGM_BOSS_CLEAR,
NA_BGM_ITEM_GET | 0x900,
NA_BGM_OPENING_GANON,
NA_BGM_HEART_GET | 0x900,
NA_BGM_OCA_LIGHT,
NA_BGM_JABU_JABU,
NA_BGM_KAKARIKO_KID,
NA_BGM_GREAT_FAIRY,
NA_BGM_ZELDA_THEME,
NA_BGM_FIRE_TEMPLE,
NA_BGM_OPEN_TRE_BOX | 0x900,
NA_BGM_FOREST_TEMPLE,
NA_BGM_COURTYARD,
NA_BGM_GANON_TOWER,
NA_BGM_LONLON,
NA_BGM_GORON_CITY,
NA_BGM_SPIRITUAL_STONE,
NA_BGM_OCA_BOLERO,
NA_BGM_OCA_MINUET,
NA_BGM_OCA_SERENADE,
NA_BGM_OCA_REQUIEM,
NA_BGM_OCA_NOCTURNE,
NA_BGM_MINI_BOSS,
NA_BGM_SMALL_ITEM_GET,
NA_BGM_TEMPLE_OF_TIME,
NA_BGM_EVENT_CLEAR,
NA_BGM_KOKIRI,
NA_BGM_OCA_FAIRY_GET,
NA_BGM_SARIA_THEME,
NA_BGM_SPIRIT_TEMPLE,
NA_BGM_HORSE,
NA_BGM_HORSE_GOAL,
NA_BGM_INGO,
NA_BGM_MEDALLION_GET,
NA_BGM_OCA_SARIA,
NA_BGM_OCA_EPONA,
NA_BGM_OCA_ZELDA,
NA_BGM_OCA_SUNS,
NA_BGM_OCA_TIME,
NA_BGM_OCA_STORM,
NA_BGM_NAVI_OPENING,
NA_BGM_DEKU_TREE_CS,
NA_BGM_WINDMILL,
NA_BGM_HYRULE_CS,
NA_BGM_MINI_GAME,
NA_BGM_SHEIK,
NA_BGM_ZORA_DOMAIN,
NA_BGM_APPEAR,
NA_BGM_ADULT_LINK,
NA_BGM_MASTER_SWORD,
NA_BGM_INTRO_GANON,
NA_BGM_SHOP,
NA_BGM_CHAMBER_OF_SAGES,
NA_BGM_FILE_SELECT,
NA_BGM_ICE_CAVERN,
NA_BGM_DOOR_OF_TIME,
NA_BGM_OWL,
NA_BGM_SHADOW_TEMPLE,
NA_BGM_WATAER_TEMPLE,
NA_BGM_BRIDGE_TO_GANONS,
NA_BGM_VARIOUS_SFX,
NA_BGM_OCARINA_OF_TIME,
NA_BGM_OCARINA_OF_TIME,
NA_BGM_GERUDO_VALLEY,
NA_BGM_POTION_SHOP,
NA_BGM_KOTAKE_KOUME,
NA_BGM_VARIOUS_SFX,
NA_BGM_ESCAPE,
NA_BGM_UNDERGROUND,
NA_BGM_GANON_BATTLE_1,
NA_BGM_GANON_BATTLE_2,
NA_BGM_END_DEMO,
};
static s16 sTextIds[] = { 0x2B, 0x2E, 0xC8, 0x2D };

4
src/overlays/actors/ovl_En_Ta/z_en_ta.c
View file

@ -724,7 +724,7 @@ void func_80B154FC(EnTa* this, GlobalContext* globalCtx) {
gSaveContext.eventInf[0] |= 0x100;
Audio_QueueSeqCmd(NA_BGM_STOP);
this->unk_2E0 &= ~0x200;
func_800F5C64(0x39);
func_800F5C64(NA_BGM_SMALL_ITEM_GET);
return;
case 2:
this->actor.textId = 0x2083;
@ -819,7 +819,7 @@ void func_80B15AD4(EnTa* this, GlobalContext* globalCtx) {
Animation_GetLastFrame(&object_ta_Anim_00BF38), ANIMMODE_ONCE, 0.0f);
this->unk_2CC = 50;
func_80088B34(0x1E);
func_800F5ACC(0x6C);
func_800F5ACC(NA_BGM_MINI_GAME_2);
this->unk_2E0 |= 0x200;
func_80106CCC(globalCtx);
func_8002DF54(globalCtx, &this->actor, 1);

2
src/overlays/actors/ovl_En_Test/z_en_test.c
View file

@ -443,7 +443,7 @@ void EnTest_WaitGround(EnTest* this, GlobalContext* globalCtx) {
this->actor.shape.rot.y = this->actor.yawTowardsPlayer;
if (this->actor.params != STALFOS_TYPE_2) {
func_800F5ACC(0x38);
func_800F5ACC(NA_BGM_MINI_BOSS);
}
} else {
if (this->timer != 0) {

4
src/overlays/actors/ovl_En_Torch2/z_en_torch2.c
View file

@ -271,7 +271,7 @@ void EnTorch2_Update(Actor* thisx, GlobalContext* globalCtx2) {
if (stickY) {}
sInput.cur.stick_y = stickY;
}
func_800F5ACC(0x38);
func_800F5ACC(NA_BGM_MINI_BOSS);
sActionState = ENTORCH2_ATTACK;
}
break;
@ -610,7 +610,7 @@ void EnTorch2_Update(Actor* thisx, GlobalContext* globalCtx2) {
Item_DropCollectibleRandom(globalCtx, &this->actor, &thisx->world.pos, 0xC0);
this->stateFlags3 &= ~4;
} else {
func_800F5ACC(0x38);
func_800F5ACC(NA_BGM_MINI_BOSS);
if (this->actor.colChkInfo.damageEffect == 1) {
if (sAlpha == 255) {
Actor_SetColorFilter(&this->actor, 0, 0xFF, 0, 0x50);

2
src/overlays/actors/ovl_En_Viewer/z_en_viewer.c
View file

@ -241,7 +241,7 @@ void EnViewer_UpdateImpl(EnViewer* this, GlobalContext* globalCtx) {
}
}
if (globalCtx->csCtx.frames == 1020) {
Audio_QueueSeqCmd(0x1000023);
Audio_QueueSeqCmd(0x1000000 | NA_BGM_OPENING_GANON);
}
if (globalCtx->csCtx.frames == 960) {
Audio_PlaySoundGeneral(NA_SE_EV_HORSE_GROAN, &this->actor.projectedPos, 4, &D_801333E0, &D_801333E0,

2
src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c
View file

@ -174,7 +174,7 @@ void func_80B42F74(EnYabusameMark* this, GlobalContext* globalCtx) {
osSyncPrintf("\n\n");
if (scoreIndex == 2) {
func_800F5C64(0x922);
func_800F5C64(NA_BGM_ITEM_GET | 0x900);
}
if (scoreIndex == 1) {
Audio_StopSfx(NA_SE_SY_TRE_BOX_APPEAR);

2
src/overlays/actors/ovl_En_Zl1/z_en_zl1.c
View file

@ -390,7 +390,7 @@ void func_80B4B010(EnZl1* this, GlobalContext* globalCtx) {
player->actor.speedXZ = 0.0f;
this->unk_1E2 = 0;
this->actionFunc = func_80B4B240;
func_800F5C64(0x51);
func_800F5C64(NA_BGM_APPEAR);
} else {
if (1) {} // necessary to match
rotDiff = ABS(this->actor.yawTowardsPlayer - this->actor.shape.rot.y);

2
src/overlays/actors/ovl_En_Zl3/z_en_zl3.c
View file

@ -88,7 +88,7 @@ void EnZl3_Destroy(Actor* thisx, GlobalContext* globalCtx) {
}
void func_80B53468(void) {
Audio_QueueSeqCmd(0x62);
Audio_QueueSeqCmd(NA_BGM_ESCAPE);
}
BossGanon2* func_80B53488(EnZl3* this, GlobalContext* globalCtx) {

2
src/overlays/actors/ovl_En_Zl4/z_en_zl4.c
View file

@ -1135,7 +1135,7 @@ void EnZl4_Cutscene(EnZl4* this, GlobalContext* globalCtx) {
this->blinkTimer = 0;
this->eyeExpression = ZL4_EYES_NEUTRAL;
this->mouthExpression = ZL4_MOUTH_SURPRISED;
func_800F5C64(0x51);
func_800F5C64(NA_BGM_APPEAR);
EnZl4_SetCsCameraAngle(globalCtx, 0);
Interface_ChangeAlpha(2);
ShrinkWindow_SetVal(0x20);

6
src/overlays/actors/ovl_En_fHG/z_en_fhg.c
View file

@ -146,7 +146,7 @@ void EnfHG_Intro(EnfHG* this, GlobalContext* globalCtx) {
}
if (this->timers[0] == 51) {
Audio_PlayActorSound2(this->actor.child, NA_SE_EV_SPEAR_FENCE);
Audio_QueueSeqCmd(0x1B);
Audio_QueueSeqCmd(NA_BGM_BOSS);
}
if (this->timers[0] == 0) {
EnfHG_SetupApproach(this, globalCtx, Rand_ZeroOne() * 5.99f);
@ -198,7 +198,7 @@ void EnfHG_Intro(EnfHG* this, GlobalContext* globalCtx) {
func_8002DF54(globalCtx, &this->actor, 9);
}
if (this->timers[0] == 1) {
Audio_QueueSeqCmd(0x23);
Audio_QueueSeqCmd(NA_BGM_OPENING_GANON);
}
Math_ApproachF(&this->cameraEye.x, GND_BOSSROOM_CENTER_X + 40.0f, 0.05f, this->cameraSpeedMod * 20.0f);
Math_ApproachF(&this->cameraEye.y, GND_BOSSROOM_CENTER_Y + 37.0f, 0.05f, this->cameraSpeedMod * 20.0f);
@ -299,7 +299,7 @@ void EnfHG_Intro(EnfHG* this, GlobalContext* globalCtx) {
func_80078914(&audioVec, NA_SE_EN_FANTOM_ST_LAUGH);
}
if (this->timers[0] == 20) {
Audio_QueueSeqCmd(0x1B);
Audio_QueueSeqCmd(NA_BGM_BOSS);
}
if (this->timers[0] == 2) {
this->cameraSpeedMod = 0.0f;

14
src/overlays/actors/ovl_Fishing/z_fishing.c
View file

@ -3586,7 +3586,7 @@ void Fishing_UpdateFish(Actor* thisx, GlobalContext* globalCtx2) {
this->unk_198 = 1.7f;
this->unk_19C = 7000.0f;
D_80B7E124 = 1;
Audio_QueueSeqCmd(0x81A);
Audio_QueueSeqCmd(NA_BGM_ENEMY | 0x800);
D_80B7E0A6 = 0;
if (this->unk_150 == 1) {
@ -3859,7 +3859,7 @@ void Fishing_UpdateFish(Actor* thisx, GlobalContext* globalCtx2) {
}
if (this->unk_17A[0] == 90) {
Audio_QueueSeqCmd(0x924);
Audio_QueueSeqCmd(NA_BGM_HEART_GET | 0x900);
D_80B7A67C = 40;
if (this->unk_150 == 0) {
@ -5429,7 +5429,7 @@ void Fishing_UpdateOwner(Actor* thisx, GlobalContext* globalCtx2) {
case 22:
if (D_80B7A6D0 == 30) {
Audio_QueueSeqCmd(0x922);
Audio_QueueSeqCmd(NA_BGM_ITEM_GET | 0x900);
}
D_80B7A6D4 = 1;
@ -5740,15 +5740,15 @@ void Fishing_DrawOwner(Actor* thisx, GlobalContext* globalCtx) {
if (D_80B7E0A6 == 0) {
if (sLinkAge != 1) {
Audio_QueueSeqCmd(0x19);
Audio_QueueSeqCmd(NA_BGM_KAKARIKO_ADULT);
} else {
Audio_QueueSeqCmd(0x27);
Audio_QueueSeqCmd(NA_BGM_KAKARIKO_KID);
}
if (sLinkAge != 1) {
Audio_QueueSeqCmd(0x19);
Audio_QueueSeqCmd(NA_BGM_KAKARIKO_ADULT);
} else {
Audio_QueueSeqCmd(0x27);
Audio_QueueSeqCmd(NA_BGM_KAKARIKO_KID);
}
}
}

16
src/overlays/actors/ovl_player_actor/z_player.c
View file

@ -2823,8 +2823,8 @@ void func_80836448(GlobalContext* globalCtx, Player* this, LinkAnimationHeader*
} else {
globalCtx->gameOverCtx.state = GAMEOVER_DEATH_START;
func_800F6AB0(0);
func_800F5C64(0x20);
gSaveContext.seqIndex = 0xFF;
func_800F5C64(NA_BGM_GAME_OVER);
gSaveContext.seqIndex = (u8)NA_BGM_DISABLED;
gSaveContext.nightSeqIndex = 0xFF;
}
@ -3986,7 +3986,7 @@ s32 func_80839034(GlobalContext* globalCtx, Player* this, CollisionPoly* poly, u
if (temp == 11) {
func_800788CC(NA_SE_OC_SECRET_HOLE_OUT);
func_800F6964(5);
gSaveContext.seqIndex = 0xFF;
gSaveContext.seqIndex = (u8)NA_BGM_DISABLED;
gSaveContext.nightSeqIndex = 0xFF;
} else {
linearVel = this->linearVelocity;
@ -11803,9 +11803,9 @@ s32 func_8084DFF4(GlobalContext* globalCtx, Player* this) {
if ((this->getItemId == GI_HEART_CONTAINER_2) || (this->getItemId == GI_HEART_CONTAINER) ||
((this->getItemId == GI_HEART_PIECE) &&
((gSaveContext.inventory.questItems & 0xF0000000) == 0x40000000))) {
temp1 = 0x924;
temp1 = NA_BGM_HEART_GET | 0x900;
} else {
temp1 = temp2 = (this->getItemId == GI_HEART_PIECE) ? 0x39 : 0x922;
temp1 = temp2 = (this->getItemId == GI_HEART_PIECE) ? NA_BGM_SMALL_ITEM_GET : NA_BGM_ITEM_GET | 0x900;
}
func_800F5C64(temp1);
}
@ -11920,7 +11920,7 @@ void func_8084E3C4(Player* this, GlobalContext* globalCtx) {
Environment_WarpSongLeave(globalCtx);
}
gSaveContext.seqIndex = 0xFF;
gSaveContext.seqIndex = (u8)NA_BGM_DISABLED;
gSaveContext.nightSeqIndex = 0xFF;
}
}
@ -12129,7 +12129,7 @@ void func_8084ECA4(Player* this, GlobalContext* globalCtx) {
if (this->unk_84F != 0) {
if (this->unk_850 == 0) {
func_8010B680(globalCtx, D_80854A04[this->unk_84F - 1].textId, &this->actor);
func_800F5C64(0x922);
func_800F5C64(NA_BGM_ITEM_GET | 0x900);
this->unk_850 = 1;
} else if (func_8010BDBC(&globalCtx->msgCtx) == 2) {
this->unk_84F = 0;
@ -12437,7 +12437,7 @@ void func_8084F88C(Player* this, GlobalContext* globalCtx) {
} else {
globalCtx->fadeTransition = 2;
gSaveContext.nextTransition = 2;
gSaveContext.seqIndex = 0xFF;
gSaveContext.seqIndex = (u8)NA_BGM_DISABLED;
gSaveContext.nightSeqIndex = 0xFF;
}

2
src/overlays/gamestates/ovl_select/z_select.c
View file

@ -35,7 +35,7 @@ void Select_LoadGame(SelectContext* this, s32 entranceIndex) {
gSaveContext.entranceIndex = entranceIndex;
gSaveContext.respawnFlag = 0;
gSaveContext.respawn[RESPAWN_MODE_DOWN].entranceIndex = -1;
gSaveContext.seqIndex = 0xFF;
gSaveContext.seqIndex = (u8)NA_BGM_DISABLED;
gSaveContext.nightSeqIndex = 0xFF;
gSaveContext.showTitleCard = true;
gWeatherMode = 0;

2
src/overlays/gamestates/ovl_title/z_title.c
View file

@ -136,7 +136,7 @@ void Title_Main(GameState* thisx) {
}
if (this->exit) {
gSaveContext.seqIndex = 0xFF;
gSaveContext.seqIndex = (u8)NA_BGM_DISABLED;
gSaveContext.nightSeqIndex = 0xFF;
gSaveContext.gameMode = 1;
this->state.running = false;