1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-03 06:24:30 +00:00

Misc Sequence Docs (#1400)

* misc bgm and fanfare docs

* more docs

* function.h cleanup

* fix horse

* typo

* add comment to song of storms cutscene in windmill

* PR review

* woopsie

* seqId macros

* revert macro
This commit is contained in:
engineer124 2022-10-16 12:12:36 -04:00 committed by GitHub
parent 7996df1913
commit e4664b4750
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 91 additions and 88 deletions

View file

@ -60,7 +60,7 @@ void BgRelayObjects_Init(Actor* thisx, PlayState* play) {
} else {
thisx->world.rot.y = 0x80;
}
func_800F5718();
Audio_PlayWindmillBgm();
thisx->room = -1;
thisx->flags |= ACTOR_FLAG_5;
if (D_808A9508 & 2) {

View file

@ -507,7 +507,7 @@ void EnDivingGame_Update(Actor* thisx, PlayState* play2) {
if (1) {}
if (gSaveContext.timer1Value == 10) {
func_800F5918();
Audio_SetFastTempoForTimedMinigame();
}
if (this->eyeTimer == 0) {
this->eyeTimer = 2;

View file

@ -1833,7 +1833,7 @@ void EnGo2_BiggoronEyedrops(EnGo2* this, PlayState* play) {
this->eyeMouthTexState = 2;
this->unk_20C = 0;
this->goronState++;
func_800F483C(0x28, 5);
Audio_SetMainBgmVolume(0x28, 5);
OnePointCutscene_Init(play, 4190, -99, &this->actor, CAM_ID_MAIN);
break;
case 1:
@ -1848,7 +1848,7 @@ void EnGo2_BiggoronEyedrops(EnGo2* this, PlayState* play) {
Message_ContinueTextbox(play, 0x305A);
this->eyeMouthTexState = 3;
this->goronState++;
func_800F483C(0x7F, 5);
Audio_SetMainBgmVolume(0x7F, 5);
}
break;
case 2:

View file

@ -2512,7 +2512,7 @@ void EnHorse_UpdateHbaAnim(EnHorse* this) {
void EnHorse_UpdateHorsebackArchery(EnHorse* this, PlayState* play) {
f32 playSpeed;
s32 sp20;
s32 isFanfarePlaying;
if (this->animationIdx == ENHORSE_ANIM_WALK) {
EnHorse_PlayWalkingSfx(this);
@ -2521,10 +2521,10 @@ void EnHorse_UpdateHorsebackArchery(EnHorse* this, PlayState* play) {
this->hbaTimer++;
}
sp20 = func_800F5A58(NA_BGM_HORSE_GOAL);
isFanfarePlaying = Audio_IsSequencePlaying(NA_BGM_HORSE_GOAL);
EnHorse_UpdateHbaRaceInfo(this, play, &sHbaInfo);
if (this->hbaFlags & 1 || this->hbaTimer >= 46) {
if (sp20 != 1 && gSaveContext.minigameState != 3) {
if ((this->hbaFlags & 1) || (this->hbaTimer >= 46)) {
if ((isFanfarePlaying != true) && (gSaveContext.minigameState != 3)) {
gSaveContext.cutsceneIndex = 0;
play->nextEntranceIndex = ENTR_SPOT12_16;
play->transitionTrigger = TRANS_TRIGGER_START;

View file

@ -243,7 +243,9 @@ void func_80ABF4C8(EnOkarinaTag* this, PlayState* play) {
case 2:
play->csCtx.segment = D_80ABF9D0;
gSaveContext.cutsceneTrigger = 1;
func_800F574C(1.18921f, 90);
// Increase pitch by 3 semitones i.e. 2^(3/12), scale tempo by same ratio
// Applies to the windmill bgm once the song of storms fanfare is complete
Audio_SetMainBgmTempoFreqAfterFanfare(1.18921f, 90);
break;
case 4:
play->csCtx.segment = D_80ABFB40;

View file

@ -797,7 +797,7 @@ void EnTa_RunCuccoGame(EnTa* this, PlayState* play) {
}
if (gSaveContext.timer1Value == 10) {
func_800F5918();
Audio_SetFastTempoForTimedMinigame();
}
if (gSaveContext.timer1Value == 0 && !Play_InCsMode(play)) {

View file

@ -3237,14 +3237,14 @@ void func_80836448(PlayState* play, Player* this, LinkAnimationHeader* anim) {
func_80832698(this, NA_SE_VO_LI_DOWN);
if (this->actor.category == ACTORCAT_PLAYER) {
func_800F47BC();
Audio_SetBgmVolumeOffDuringFanfare();
if (Inventory_ConsumeFairy(play)) {
play->gameOverCtx.state = GAMEOVER_REVIVE_START;
this->unk_84F = 1;
} else {
play->gameOverCtx.state = GAMEOVER_DEATH_START;
func_800F6AB0(0);
Audio_StopBgmAndFanfare(0);
Audio_PlayFanfare(NA_BGM_GAME_OVER);
gSaveContext.seqId = (u8)NA_BGM_DISABLED;
gSaveContext.natureAmbienceId = NATURE_ID_DISABLED;
@ -8384,7 +8384,7 @@ void func_80843AE8(PlayState* play, Player* this) {
}
this->unk_A87 = 20;
func_80837AFC(this, -20);
func_800F47FC();
Audio_SetBgmVolumeOnDuringFanfare();
}
} else if (this->unk_84F != 0) {
this->unk_850 = 60;