mirror of
https://github.com/izzy2lost/2ship2harkinian-Android.git
synced 2026-06-19 01:20:08 -07:00
Decompile Remaining code_8019AF00.c Functions (1 non-matching) (#1442)
* remaining code_8019AF00 functions * oops * decimal duration * PR Review
This commit is contained in:
engineer124
+45
-46
@@ -1256,6 +1256,14 @@ void AudioScript_InitSequencePlayers(void);
|
||||
void func_8019AE40(s32 param_1, s32 param_2, u32 param_3, s32 param_4);
|
||||
void func_8019AEC0(UNK_PTR param_1, UNK_PTR param_2);
|
||||
|
||||
void Audio_Init(void);
|
||||
void Audio_InitSound(void);
|
||||
void Audio_Update(void);
|
||||
void Audio_ResetForAudioHeapStep3(void);
|
||||
void Audio_ResetForAudioHeapStep2(void);
|
||||
void Audio_ResetForAudioHeapStep1(s32 specId);
|
||||
void Audio_PreNMI(void);
|
||||
|
||||
void AudioOcarina_SetSongStartingPos(void);
|
||||
void AudioOcarina_StartAtSongStartingPos(u32 ocarinaFlags);
|
||||
void AudioOcarina_StartForSongCheck(u32 ocarinaFlags, u8 ocarinaStaffPlayingPosStart);
|
||||
@@ -1273,68 +1281,59 @@ OcarinaStaff* AudioOcarina_GetPlaybackStaff(void);
|
||||
void AudioOcarina_TerminaWallGenerateNotes(void);
|
||||
void AudioOcarina_PlayLongScarecrowSong(void);
|
||||
|
||||
void Audio_Update(void);
|
||||
void AudioSfx_SetProperties(u8 bankId, u8 entryIndex, u8 channelIndex);
|
||||
void AudioSfx_LowerSfxSettingsReverb(Vec3f* pos, s8 isReverbLowered);
|
||||
void Audio_SetBgmVolumeOff(void);
|
||||
void Audio_SetBgmVolumeOn(void);
|
||||
void func_801A0204(s8 seqId);
|
||||
void Audio_SetMainBgmVolume(u8 targetVolume, u8 volumeFadeTimer);
|
||||
void AudioSfx_SetChannelIO(Vec3f* pos, u16 sfxId, u8 ioData);
|
||||
|
||||
void Audio_PlayObjSoundBgm(Vec3f* pos, s8 seqId);
|
||||
void Audio_PlayObjSoundFanfare(Vec3f* pos, s8 seqId);
|
||||
void Audio_PlaySubBgmAtPos(Vec3f* pos, u8 seqId, f32 maxDist);
|
||||
void Audio_PlaySubBgmAtPosWithFilter(Vec3f* pos, u8 seqId, f32 arg2);
|
||||
void Audio_PlaySubBgmAtPosWithFilter(Vec3f* pos, u8 seqId, f32 maxDist);
|
||||
void Audio_PlaySequenceAtDefaultPos(u8 seqPlayerIndex, u16 seqId);
|
||||
void Audio_StopSequenceAtDefaultPos(void);
|
||||
void Audio_PlaySequenceAtPos(u8 seqPlayerIndex, Vec3f* pos, u16 seqId, f32 maxDist);
|
||||
void func_801A246C(u8 param_1, u8 param_2);
|
||||
void Audio_PlayMorningSceneSequence(u16 seqId, u8 dayMinusOne);
|
||||
void Audio_PlaySceneSequence(u16 seqId, u8 dayMinusOne);
|
||||
void Audio_SetSeqTempoAndFreq(u8 seqPlayerIndex, f32 freqTempoScale, u8 duration);
|
||||
void Audio_PlaySubBgm(u16 seqId);
|
||||
void Audio_StopSubBgm(void);
|
||||
void Audio_PlaySequenceInCutscene(u16 seqId);
|
||||
void Audio_StopSequenceInCutscene(u16 seqId);
|
||||
s32 Audio_IsSequencePlaying(u8 seqId);
|
||||
void Audio_PlayBgm_StorePrevBgm(u16 seqId);
|
||||
void Audio_RestorePrevBgm(void);
|
||||
void func_801A3000(u16 seqId, u8 ioData);
|
||||
// void func_801A3038(void);
|
||||
void Audio_PlayFanfareWithPlayerIOPort7(u16 seqId, u8 ioData);
|
||||
void Audio_PlayFanfare(u16 seqId);
|
||||
// void func_801A312C(void);
|
||||
void func_801A31EC(u16 seqId, s8 arg1, u8 arg2);
|
||||
void Audio_PlayFanfareWithPlayerIOCustomPort(u16 seqId, s8 ioPort, u8 ioData);
|
||||
void Audio_PlaySequenceWithSeqPlayerIO(s8 seqPlayerIndex, u16 seqId, u8 fadeInDuration, s8 ioPort, u8 ioData);
|
||||
void Audio_SetSequenceMode(u8 seqMode);
|
||||
void Audio_UpdateEnemyBgmVolume(f32 dist);
|
||||
u8 func_801A3950(s32 playerIndex, s32 isChannelIOSet);
|
||||
u8 func_801A39F8(void);
|
||||
void func_801A3A7C(s32 arg0);
|
||||
// void func_801A3AC0(void);
|
||||
void func_801A3B48(UNK_TYPE arg0);
|
||||
// void func_801A3B90(void);
|
||||
void func_801A3CD8(s8 param_1);
|
||||
void func_801A3CF4(s8 arg0);
|
||||
void func_801A3D98(s8 audioSetting);
|
||||
void func_801A3E38(u8 arg0);
|
||||
void func_801A3EC0(u8 arg0);
|
||||
void Audio_SetCutsceneFlag(s8 flag);
|
||||
void Audio_SetSpec(u32 specId);
|
||||
void func_801A4058(UNK_TYPE arg0);
|
||||
void func_801A41C8(s32 arg0);
|
||||
void func_801A41F8(UNK_TYPE arg0);
|
||||
// void func_801A42C8(void);
|
||||
// void func_801A4324(void);
|
||||
// void func_801A4348(void);
|
||||
void Audio_PreNMI(void);
|
||||
s32 func_801A46F8(void);
|
||||
void Audio_SetAmbienceChannelIO(u8 channelIndexRange, u8 ioPort, u8 ioData);
|
||||
void Audio_PlayAmbience(u8 ambienceId);
|
||||
void Audio_Init(void);
|
||||
void Audio_InitSound(void);
|
||||
void Audio_ResetForAudioHeapStep3(void);
|
||||
void Audio_ResetForAudioHeapStep2(void);
|
||||
void Audio_ResetForAudioHeapStep1(s32 specId);
|
||||
|
||||
void Audio_StopSequenceAtDefaultPos(void);
|
||||
void Audio_StopSubBgm(void);
|
||||
void Audio_StopSequenceInCutscene(u16 seqId);
|
||||
void Audio_StopFanfare(u16 duration);
|
||||
|
||||
void Audio_SetBgmVolumeOff(void);
|
||||
void Audio_SetBgmVolumeOn(void);
|
||||
void Audio_SetMainBgmVolume(u8 targetVolume, u8 volumeFadeTimer);
|
||||
void Audio_SetSequenceMode(u8 seqMode);
|
||||
void Audio_SetPauseState(u8 isPauseMenuOpen);
|
||||
void Audio_SetEnvReverb(s8 reverb);
|
||||
void Audio_SetCodeReverb(s8 reverb);
|
||||
void Audio_SetFileSelectSettings(s8 audioSetting);
|
||||
void Audio_SetBaseFilter(u8 filter);
|
||||
void Audio_SetExtraFilter(u8 filter);
|
||||
void Audio_SetCutsceneFlag(s8 flag);
|
||||
void Audio_SetSpec(u8 specId);
|
||||
void Audio_SetAmbienceChannelIO(u8 channelIndexRange, u8 ioPort, u8 ioData);
|
||||
void Audio_SetSeqTempoAndFreq(u8 seqPlayerIndex, f32 freqTempoScale, u8 duration);
|
||||
|
||||
void Audio_MuteSeqPlayerBgmSub(u8 isMuted);
|
||||
void Audio_MuteAllSeqExceptSystemAndOcarina(u16 duration);
|
||||
void Audio_MuteSfxAndAmbienceSeqExceptSysAndOca(u16 duration);
|
||||
|
||||
void func_801A0204(s8 seqId);
|
||||
void func_801A246C(u8 seqPlayerIndex, u8 type);
|
||||
s32 Audio_IsSequencePlaying(u8 seqId);
|
||||
void Audio_RestorePrevBgm(void);
|
||||
void Audio_UpdateEnemyBgmVolume(f32 dist);
|
||||
u8 func_801A3950(u8 seqPlayerIndex, u8 resetChannelIO);
|
||||
u8 func_801A39F8(void);
|
||||
s32 func_801A46F8(void);
|
||||
|
||||
void func_801A4EB0(void);
|
||||
// void func_801A4EB8(void);
|
||||
|
||||
+2
-2
@@ -1805,8 +1805,8 @@ extern s32 D_801FD120;
|
||||
// extern UNK_TYPE1 D_801FD29C;
|
||||
// extern UNK_TYPE1 D_801FD2A0;
|
||||
// extern UNK_TYPE1 D_801FD2A8;
|
||||
// extern UNK_TYPE1 D_801FD3A8;
|
||||
// extern UNK_TYPE1 D_801FD3A9;
|
||||
// extern UNK_TYPE1 sRomaniSingingTimer;
|
||||
// extern UNK_TYPE1 sRomaniSingingDisabled;
|
||||
// extern UNK_TYPE1 D_801FD3AA;
|
||||
// extern UNK_TYPE1 D_801FD3AB;
|
||||
// extern UNK_TYPE1 D_801FD3AC;
|
||||
|
||||
+482
-41
File diff suppressed because it is too large
Load Diff
@@ -106,7 +106,7 @@ void KaleidoSetup_Update(PlayState* play) {
|
||||
func_800F4A10(play);
|
||||
// Set next page mode to scroll left
|
||||
pauseCtx->nextPageMode = pauseCtx->pageIndex * 2 + 1;
|
||||
func_801A3A7C(1);
|
||||
Audio_SetPauseState(true);
|
||||
}
|
||||
|
||||
if (pauseCtx->state == PAUSE_STATE_OPENING_0) {
|
||||
|
||||
@@ -4556,8 +4556,8 @@ void Message_DrawMain(PlayState* play, Gfx** gfxP) {
|
||||
AudioOcarina_SetInstrument(sPlayerFormOcarinaInstruments[CUR_FORM]);
|
||||
AudioOcarina_SetPlaybackSong((u8)msgCtx->songPlayed + 1, 1);
|
||||
if (msgCtx->songPlayed != OCARINA_SONG_SCARECROW_SPAWN) {
|
||||
func_801A3000((u16)sOcarinaSongFanfares[msgCtx->songPlayed],
|
||||
(u8)sOcarinaSongFanfareIoData[CUR_FORM]);
|
||||
Audio_PlayFanfareWithPlayerIOPort7((u16)sOcarinaSongFanfares[msgCtx->songPlayed],
|
||||
(u8)sOcarinaSongFanfareIoData[CUR_FORM]);
|
||||
AudioSfx_MuteBanks(0x20);
|
||||
}
|
||||
}
|
||||
|
||||
+6
-6
@@ -525,7 +525,7 @@ void Play_UpdateWaterCamera(PlayState* this, Camera* camera) {
|
||||
Distortion_SetDuration(80);
|
||||
}
|
||||
|
||||
func_801A3EC0(0x20);
|
||||
Audio_SetExtraFilter(0x20);
|
||||
Environment_EnableUnderwaterLights(this, lightIndex);
|
||||
|
||||
if ((sQuakeIndex == -1) || (Quake_GetTimeLeft(sQuakeIndex) == 10)) {
|
||||
@@ -556,7 +556,7 @@ void Play_UpdateWaterCamera(PlayState* this, Camera* camera) {
|
||||
Quake_RemoveRequest(sQuakeIndex);
|
||||
}
|
||||
Environment_DisableUnderwaterLights(this);
|
||||
func_801A3EC0(0);
|
||||
Audio_SetExtraFilter(0);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -589,20 +589,20 @@ void Play_UpdateTransition(PlayState* this) {
|
||||
!CHECK_WEEKEVENTREG(WEEKEVENTREG_CLEARED_STONE_TOWER_TEMPLE))) &&
|
||||
(!Environment_IsFinalHours(this) || (Entrance_GetSceneId(this->nextEntrance + sceneLayer) < 0) ||
|
||||
(AudioSeq_GetActiveSeqId(SEQ_PLAYER_BGM_MAIN) != NA_BGM_FINAL_HOURS))) {
|
||||
func_801A4058(20);
|
||||
Audio_MuteAllSeqExceptSystemAndOcarina(20);
|
||||
gSaveContext.seqId = (u8)NA_BGM_DISABLED;
|
||||
gSaveContext.ambienceId = AMBIENCE_ID_DISABLED;
|
||||
}
|
||||
|
||||
if (Environment_IsForcedSequenceDisabled()) {
|
||||
func_801A4058(20);
|
||||
Audio_MuteAllSeqExceptSystemAndOcarina(20);
|
||||
gSaveContext.seqId = (u8)NA_BGM_DISABLED;
|
||||
gSaveContext.ambienceId = AMBIENCE_ID_DISABLED;
|
||||
}
|
||||
|
||||
if (Environment_IsFinalHours(this) && (Entrance_GetSceneId(this->nextEntrance + sceneLayer) >= 0) &&
|
||||
(AudioSeq_GetActiveSeqId(SEQ_PLAYER_BGM_MAIN) == NA_BGM_FINAL_HOURS)) {
|
||||
func_801A41C8(20);
|
||||
Audio_MuteSfxAndAmbienceSeqExceptSysAndOca(20);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2175,7 +2175,7 @@ void Play_Init(GameState* thisx) {
|
||||
KaleidoManager_Init(this);
|
||||
ShrinkWindow_Init();
|
||||
View_Init(&this->view, gfxCtx);
|
||||
func_801A3EC0(0);
|
||||
Audio_SetExtraFilter(0);
|
||||
Quake_Init();
|
||||
Distortion_Init(this);
|
||||
|
||||
|
||||
+1
-1
@@ -620,5 +620,5 @@ void func_8012EBF8(PlayState* play, RoomContext* roomCtx) {
|
||||
Map_InitRoomData(play, roomCtx->curRoom.num);
|
||||
Minimap_SavePlayerRoomInitInfo(play);
|
||||
}
|
||||
func_801A3CD8(play->roomCtx.curRoom.echo);
|
||||
Audio_SetEnvReverb(play->roomCtx.curRoom.echo);
|
||||
}
|
||||
|
||||
@@ -1663,7 +1663,7 @@ void func_801457CC(GameState* gameState, SramContext* sramCtx) {
|
||||
gSaveContext.options.zTargetSetting = 0;
|
||||
}
|
||||
}
|
||||
func_801A3D98(gSaveContext.options.audioSetting);
|
||||
Audio_SetFileSelectSettings(gSaveContext.options.audioSetting);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1861,7 +1861,7 @@ void Sram_WriteSaveOptionsToBuffer(SramContext* sramCtx) {
|
||||
void Sram_InitSram(GameState* gameState, SramContext* sramCtx) {
|
||||
if (gSaveContext.save.entrance) {} // Required to match
|
||||
|
||||
func_801A3D98(gSaveContext.options.audioSetting);
|
||||
Audio_SetFileSelectSettings(gSaveContext.options.audioSetting);
|
||||
}
|
||||
|
||||
void Sram_Alloc(GameState* gameState, SramContext* sramCtx) {
|
||||
|
||||
@@ -250,7 +250,7 @@ void func_80BC7068(EnGuruguru* this, PlayState* play) {
|
||||
}
|
||||
if (this->textIdIndex == 12) {
|
||||
SET_WEEKEVENTREG(WEEKEVENTREG_38_40);
|
||||
func_801A3B48(0);
|
||||
Audio_MuteSeqPlayerBgmSub(false);
|
||||
Message_BombersNotebookQueueEvent(play, BOMBERS_NOTEBOOK_EVENT_RECEIVED_BREMEN_MASK);
|
||||
Message_BombersNotebookQueueEvent(play, BOMBERS_NOTEBOOK_EVENT_MET_GURU_GURU);
|
||||
func_80BC6E10(this);
|
||||
@@ -275,15 +275,15 @@ void func_80BC7068(EnGuruguru* this, PlayState* play) {
|
||||
if ((this->unk268 != 0) && (this->textIdIndex >= 7)) {
|
||||
this->skelAnime.playSpeed = 2.0f;
|
||||
Audio_SetSeqTempoAndFreq(3, 1.18921f, 2);
|
||||
func_801A3B48(0);
|
||||
Audio_MuteSeqPlayerBgmSub(false);
|
||||
} else {
|
||||
if (this->skelAnime.playSpeed == 2.0f) {
|
||||
Audio_SetSeqTempoAndFreq(3, 1.0f, 2);
|
||||
}
|
||||
if (this->unk268 == 0) {
|
||||
func_801A3B48(1);
|
||||
Audio_MuteSeqPlayerBgmSub(true);
|
||||
} else {
|
||||
func_801A3B48(0);
|
||||
Audio_MuteSeqPlayerBgmSub(false);
|
||||
}
|
||||
this->skelAnime.playSpeed = 1.0f;
|
||||
}
|
||||
@@ -291,14 +291,14 @@ void func_80BC7068(EnGuruguru* this, PlayState* play) {
|
||||
Message_ContinueTextbox(play, textIDs[this->textIdIndex]);
|
||||
return;
|
||||
}
|
||||
func_801A3B48(0);
|
||||
Audio_MuteSeqPlayerBgmSub(false);
|
||||
Message_BombersNotebookQueueEvent(play, BOMBERS_NOTEBOOK_EVENT_MET_GURU_GURU);
|
||||
func_80BC6E10(this);
|
||||
}
|
||||
}
|
||||
|
||||
void func_80BC73F4(EnGuruguru* this) {
|
||||
func_801A3B48(0);
|
||||
Audio_MuteSeqPlayerBgmSub(false);
|
||||
this->unk268 = 1;
|
||||
this->headZRotTarget = 0;
|
||||
this->unk272 = 2;
|
||||
@@ -311,7 +311,7 @@ void func_80BC7440(EnGuruguru* this, PlayState* play) {
|
||||
this->actor.parent = NULL;
|
||||
this->textIdIndex++;
|
||||
this->actor.textId = textIDs[this->textIdIndex];
|
||||
func_801A3B48(1);
|
||||
Audio_MuteSeqPlayerBgmSub(true);
|
||||
Actor_OfferTalkExchange(&this->actor, play, 400.0f, 400.0f, PLAYER_IA_MINUS1);
|
||||
this->unk268 = 0;
|
||||
SET_WEEKEVENTREG(WEEKEVENTREG_38_40);
|
||||
|
||||
@@ -604,7 +604,7 @@ s32 func_80BA47E0(EnToto* this, PlayState* play) {
|
||||
|
||||
s32 func_80BA49A4(EnToto* this, PlayState* play) {
|
||||
func_800B7298(play, NULL, PLAYER_CSACTION_68);
|
||||
func_801A31EC(NA_BGM_BALLAD_OF_THE_WIND_FISH, 4, this->unk2B3 ^ 0xF);
|
||||
Audio_PlayFanfareWithPlayerIOCustomPort(NA_BGM_BALLAD_OF_THE_WIND_FISH, 4, this->unk2B3 ^ 0xF);
|
||||
this->unk2B1 = 4;
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -247,7 +247,7 @@ void EnWarpTag_GrottoReturn(EnWarptag* this, PlayState* play) {
|
||||
Scene_SetExitFade(play);
|
||||
play->transitionTrigger = TRANS_TRIGGER_START;
|
||||
Audio_PlaySfx_2(NA_SE_OC_SECRET_HOLE_OUT);
|
||||
func_801A4058(5);
|
||||
Audio_MuteAllSeqExceptSystemAndOcarina(5);
|
||||
gSaveContext.seqId = (u8)NA_BGM_DISABLED;
|
||||
gSaveContext.ambienceId = AMBIENCE_ID_DISABLED;
|
||||
}
|
||||
|
||||
@@ -4504,7 +4504,7 @@ void func_80831F34(PlayState* play, Player* this, PlayerAnimationHeader* anim) {
|
||||
this->actionVar1 = 1;
|
||||
} else {
|
||||
play->gameOverCtx.state = GAMEOVER_DEATH_START;
|
||||
func_801A41F8(0);
|
||||
Audio_StopFanfare(0);
|
||||
Audio_PlayFanfare(NA_BGM_GAME_OVER);
|
||||
gSaveContext.seqId = (u8)NA_BGM_DISABLED;
|
||||
gSaveContext.ambienceId = AMBIENCE_ID_DISABLED;
|
||||
@@ -6128,7 +6128,7 @@ s32 Player_HandleExitsAndVoids(PlayState* play, Player* this, CollisionPoly* pol
|
||||
|
||||
if ((this->stateFlags1 & PLAYER_STATE1_8000000) && (this->floorProperty == FLOOR_PROPERTY_5)) {
|
||||
Audio_PlaySfx_2(NA_SE_OC_TUNAMI);
|
||||
func_801A4058(5);
|
||||
Audio_MuteAllSeqExceptSystemAndOcarina(5);
|
||||
gSaveContext.seqId = (u8)NA_BGM_DISABLED;
|
||||
gSaveContext.ambienceId = AMBIENCE_ID_DISABLED;
|
||||
} else if (!(this->actor.bgCheckFlags & BGCHECKFLAG_GROUND) &&
|
||||
@@ -6150,7 +6150,7 @@ s32 Player_HandleExitsAndVoids(PlayState* play, Player* this, CollisionPoly* pol
|
||||
((sp34 < 100) || (this->actor.bgCheckFlags & BGCHECKFLAG_GROUND))) {
|
||||
if (floorType == FLOOR_TYPE_11) {
|
||||
Audio_PlaySfx_2(NA_SE_OC_SECRET_HOLE_OUT);
|
||||
func_801A4058(5);
|
||||
Audio_MuteAllSeqExceptSystemAndOcarina(5);
|
||||
gSaveContext.seqId = (u8)NA_BGM_DISABLED;
|
||||
gSaveContext.ambienceId = AMBIENCE_ID_DISABLED;
|
||||
} else {
|
||||
@@ -8565,9 +8565,9 @@ void func_8083BB4C(PlayState* play, Player* this) {
|
||||
if ((this->transformation == PLAYER_FORM_ZORA) && (this->actor.bgCheckFlags & BGCHECKFLAG_GROUND)) {
|
||||
this->currentBoots = PLAYER_BOOTS_ZORA_LAND;
|
||||
}
|
||||
func_801A3E38(0);
|
||||
Audio_SetBaseFilter(0);
|
||||
} else {
|
||||
func_801A3E38(0x20);
|
||||
Audio_SetBaseFilter(0x20);
|
||||
if ((this->transformation == PLAYER_FORM_ZORA) || (sp1C < 10.0f)) {
|
||||
this->underwaterTimer = 0;
|
||||
} else if (this->underwaterTimer < 300) {
|
||||
@@ -11241,7 +11241,7 @@ void Player_ProcessSceneCollision(PlayState* play, Player* this) {
|
||||
this->floorProperty = SurfaceType_GetFloorProperty(&play->colCtx, floorPoly, this->actor.floorBgId);
|
||||
|
||||
if (this == GET_PLAYER(play)) {
|
||||
func_801A3CF4(SurfaceType_GetEcho(&play->colCtx, floorPoly, this->actor.floorBgId));
|
||||
Audio_SetCodeReverb(SurfaceType_GetEcho(&play->colCtx, floorPoly, this->actor.floorBgId));
|
||||
|
||||
if (this->actor.floorBgId == BGCHECK_SCENE) {
|
||||
Environment_ChangeLightSetting(
|
||||
|
||||
@@ -2050,7 +2050,7 @@ void FileSelect_ConfirmFile(GameState* thisx) {
|
||||
Rumble_Request(300.0f, 180, 20, 100);
|
||||
Audio_PlaySfx(NA_SE_SY_FSEL_DECIDE_L);
|
||||
this->selectMode = SM_FADE_OUT;
|
||||
func_801A4058(0xF);
|
||||
Audio_MuteAllSeqExceptSystemAndOcarina(15);
|
||||
} else { // FS_BTN_CONFIRM_QUIT
|
||||
Audio_PlaySfx(NA_SE_SY_FSEL_CLOSE);
|
||||
this->selectMode++; // SM_FADE_OUT_FILE_INFO
|
||||
|
||||
@@ -766,7 +766,7 @@ void FileSelect_UpdateOptionsMenu(GameState* thisx) {
|
||||
Sram_StartWriteToFlashDefault(sramCtx);
|
||||
this->configMode = CM_OPTIONS_WAIT_FOR_FLASH_SAVE;
|
||||
}
|
||||
func_801A3D98(gSaveContext.options.audioSetting);
|
||||
Audio_SetFileSelectSettings(gSaveContext.options.audioSetting);
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@@ -3167,7 +3167,7 @@ void KaleidoScope_Update(PlayState* play) {
|
||||
BgCheck_InitCollisionHeaders(&play->colCtx, play);
|
||||
STOP_GAMESTATE(&play->state);
|
||||
SET_NEXT_GAMESTATE(&play->state, TitleSetup_Init, sizeof(TitleSetupState));
|
||||
func_801A4058(0x14);
|
||||
Audio_MuteAllSeqExceptSystemAndOcarina(20);
|
||||
gSaveContext.seqId = (u8)NA_BGM_DISABLED;
|
||||
gSaveContext.ambienceId = AMBIENCE_ID_DISABLED;
|
||||
}
|
||||
@@ -3610,7 +3610,10 @@ void KaleidoScope_Update(PlayState* play) {
|
||||
}
|
||||
gSaveContext.hudVisibility = HUD_VISIBILITY_IDLE;
|
||||
Interface_SetHudVisibility(sUnpausedHudVisibility);
|
||||
func_801A3A7C(0);
|
||||
Audio_SetPauseState(false);
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
+21
-21
@@ -3956,39 +3956,39 @@
|
||||
0x801A2ED8:("Audio_RestorePrevBgm",),
|
||||
0x801A2F88:("Audio_PlayAmbience_StorePrevBgm",),
|
||||
0x801A2FC4:("Audio_ForceRestorePreviousBgm",),
|
||||
0x801A3000:("func_801A3000",),
|
||||
0x801A3038:("func_801A3038",),
|
||||
0x801A3000:("Audio_PlayFanfareWithPlayerIOPort7",),
|
||||
0x801A3038:("Audio_MuteBgmPlayersForFanfare",),
|
||||
0x801A3098:("Audio_PlayFanfare",),
|
||||
0x801A312C:("func_801A312C",),
|
||||
0x801A31EC:("func_801A31EC",),
|
||||
0x801A312C:("Audio_UpdateFanfare",),
|
||||
0x801A31EC:("Audio_PlayFanfareWithPlayerIOCustomPort",),
|
||||
0x801A3238:("Audio_PlaySequenceWithSeqPlayerIO",),
|
||||
0x801A32CC:("Audio_SetSequenceMode",),
|
||||
0x801A3590:("Audio_UpdateEnemyBgmVolume",),
|
||||
0x801A36F0:("func_801A36F0",),
|
||||
0x801A36F0:("Audio_UpdateRomaniSinging",),
|
||||
0x801A3950:("func_801A3950",),
|
||||
0x801A39F8:("func_801A39F8",),
|
||||
0x801A3A7C:("func_801A3A7C",),
|
||||
0x801A3AC0:("func_801A3AC0",),
|
||||
0x801A3A7C:("Audio_SetPauseState",),
|
||||
0x801A3AC0:("Audio_UpdatePauseState",),
|
||||
0x801A3AEC:("Audio_PlaySfx_PauseMenuOpenOrClose",),
|
||||
0x801A3B48:("func_801A3B48",),
|
||||
0x801A3B90:("func_801A3B90",),
|
||||
0x801A3CD8:("func_801A3CD8",),
|
||||
0x801A3CF4:("func_801A3CF4",),
|
||||
0x801A3B48:("Audio_MuteSeqPlayerBgmSub",),
|
||||
0x801A3B90:("Audio_ToggleRomaniSinging",),
|
||||
0x801A3CD8:("Audio_SetEnvReverb",),
|
||||
0x801A3CF4:("Audio_SetCodeReverb",),
|
||||
0x801A3D54:("Audio_PlaySfx_SurroundSoundTest",),
|
||||
0x801A3D98:("func_801A3D98",),
|
||||
0x801A3E38:("func_801A3E38",),
|
||||
0x801A3EC0:("func_801A3EC0",),
|
||||
0x801A3D98:("Audio_SetFileSelectSettings",),
|
||||
0x801A3E38:("Audio_SetBaseFilter",),
|
||||
0x801A3EC0:("Audio_SetExtraFilter",),
|
||||
0x801A3F54:("Audio_SetCutsceneFlag",),
|
||||
0x801A3F6C:("Audio_PlaySfx_IfNotInCutsceneImpl",),
|
||||
0x801A3FB4:("Audio_PlaySfx_IfNotInCutscene",),
|
||||
0x801A3FFC:("Audio_MuteSfxAndAmbienceSeqExceptOcarinaAndSystem",),
|
||||
0x801A3FFC:("Audio_MuteSfxAndAmbienceSeqExceptSystemAndOcarina",),
|
||||
0x801A400C:("Audio_SetSpec",),
|
||||
0x801A4058:("func_801A4058",),
|
||||
0x801A41C8:("func_801A41C8",),
|
||||
0x801A41F8:("func_801A41F8",),
|
||||
0x801A4058:("Audio_MuteAllSeqExceptSystemAndOcarina",),
|
||||
0x801A41C8:("Audio_MuteSfxAndAmbienceSeqExceptSysAndOca",),
|
||||
0x801A41F8:("Audio_StopFanfare",),
|
||||
0x801A429C:("Audio_StartSfxPlayer",),
|
||||
0x801A42C8:("func_801A42C8",),
|
||||
0x801A4324:("func_801A4324",),
|
||||
0x801A42C8:("Audio_DisableAllSeq",),
|
||||
0x801A4324:("Audio_GetEnabledNotesCount",),
|
||||
0x801A4348:("func_801A4348",),
|
||||
0x801A4380:("Audio_SetSfxVolumeExceptSystemAndOcarinaBanks",),
|
||||
0x801A4428:("Audio_SetSfxReverbIndexExceptOcarinaBank",),
|
||||
@@ -8570,7 +8570,7 @@
|
||||
0x8099A920:("ObjSound_Init",),
|
||||
0x8099A96C:("ObjSound_Destroy",),
|
||||
0x8099A9A4:("ObjSound_Update",),
|
||||
0x8099AA84:("func_8099AA84",),
|
||||
0x8099AA84:("ObjSound_Draw",),
|
||||
0x8099AB30:("EnCrow_Init",),
|
||||
0x8099AC2C:("EnCrow_Destroy",),
|
||||
0x8099AC58:("EnCrow_SetupFlyIdle",),
|
||||
|
||||
@@ -4175,8 +4175,8 @@
|
||||
0x801FD29C:("sSfxVolumeRate","UNK_TYPE1","",0x1),
|
||||
0x801FD2A0:("sRequestedSceneSeqId","UNK_TYPE1","",0x1),
|
||||
0x801FD2A8:("sSfxChannelState","UNK_TYPE1","",0x1),
|
||||
0x801FD3A8:("D_801FD3A8","UNK_TYPE1","",0x1),
|
||||
0x801FD3A9:("D_801FD3A9","UNK_TYPE1","",0x1),
|
||||
0x801FD3A8:("sRomaniSingingTimer","UNK_TYPE1","",0x1),
|
||||
0x801FD3A9:("sRomaniSingingDisabled","UNK_TYPE1","",0x1),
|
||||
0x801FD3AA:("sRiverSoundBgmTimer","UNK_TYPE1","",0x1),
|
||||
0x801FD3AB:("sFanfareState","UNK_TYPE1","",0x1),
|
||||
0x801FD3AC:("sFanfareSeqId","UNK_TYPE1","",0x1),
|
||||
|
||||
@@ -3473,39 +3473,39 @@ asm/non_matchings/code/code_8019AF00/Audio_PlayBgm_StorePrevBgm.s,Audio_PlayBgm_
|
||||
asm/non_matchings/code/code_8019AF00/Audio_RestorePrevBgm.s,Audio_RestorePrevBgm,0x801A2ED8,0x2C
|
||||
asm/non_matchings/code/code_8019AF00/Audio_PlayAmbience_StorePrevBgm.s,Audio_PlayAmbience_StorePrevBgm,0x801A2F88,0xF
|
||||
asm/non_matchings/code/code_8019AF00/Audio_ForceRestorePreviousBgm.s,Audio_ForceRestorePreviousBgm,0x801A2FC4,0xF
|
||||
asm/non_matchings/code/code_8019AF00/func_801A3000.s,func_801A3000,0x801A3000,0xE
|
||||
asm/non_matchings/code/code_8019AF00/func_801A3038.s,func_801A3038,0x801A3038,0x18
|
||||
asm/non_matchings/code/code_8019AF00/Audio_PlayFanfareWithPlayerIOPort7.s,Audio_PlayFanfareWithPlayerIOPort7,0x801A3000,0xE
|
||||
asm/non_matchings/code/code_8019AF00/Audio_MuteBgmPlayersForFanfare.s,Audio_MuteBgmPlayersForFanfare,0x801A3038,0x18
|
||||
asm/non_matchings/code/code_8019AF00/Audio_PlayFanfare.s,Audio_PlayFanfare,0x801A3098,0x25
|
||||
asm/non_matchings/code/code_8019AF00/func_801A312C.s,func_801A312C,0x801A312C,0x30
|
||||
asm/non_matchings/code/code_8019AF00/func_801A31EC.s,func_801A31EC,0x801A31EC,0x13
|
||||
asm/non_matchings/code/code_8019AF00/Audio_UpdateFanfare.s,Audio_UpdateFanfare,0x801A312C,0x30
|
||||
asm/non_matchings/code/code_8019AF00/Audio_PlayFanfareWithPlayerIOCustomPort.s,Audio_PlayFanfareWithPlayerIOCustomPort,0x801A31EC,0x13
|
||||
asm/non_matchings/code/code_8019AF00/Audio_PlaySequenceWithSeqPlayerIO.s,Audio_PlaySequenceWithSeqPlayerIO,0x801A3238,0x25
|
||||
asm/non_matchings/code/code_8019AF00/Audio_SetSequenceMode.s,Audio_SetSequenceMode,0x801A32CC,0xB1
|
||||
asm/non_matchings/code/code_8019AF00/Audio_UpdateEnemyBgmVolume.s,Audio_UpdateEnemyBgmVolume,0x801A3590,0x58
|
||||
asm/non_matchings/code/code_8019AF00/func_801A36F0.s,func_801A36F0,0x801A36F0,0x98
|
||||
asm/non_matchings/code/code_8019AF00/Audio_UpdateRomaniSinging.s,Audio_UpdateRomaniSinging,0x801A36F0,0x98
|
||||
asm/non_matchings/code/code_8019AF00/func_801A3950.s,func_801A3950,0x801A3950,0x2A
|
||||
asm/non_matchings/code/code_8019AF00/func_801A39F8.s,func_801A39F8,0x801A39F8,0x21
|
||||
asm/non_matchings/code/code_8019AF00/func_801A3A7C.s,func_801A3A7C,0x801A3A7C,0x11
|
||||
asm/non_matchings/code/code_8019AF00/func_801A3AC0.s,func_801A3AC0,0x801A3AC0,0xB
|
||||
asm/non_matchings/code/code_8019AF00/Audio_SetPauseState.s,Audio_SetPauseState,0x801A3A7C,0x11
|
||||
asm/non_matchings/code/code_8019AF00/Audio_UpdatePauseState.s,Audio_UpdatePauseState,0x801A3AC0,0xB
|
||||
asm/non_matchings/code/code_8019AF00/Audio_PlaySfx_PauseMenuOpenOrClose.s,Audio_PlaySfx_PauseMenuOpenOrClose,0x801A3AEC,0x17
|
||||
asm/non_matchings/code/code_8019AF00/func_801A3B48.s,func_801A3B48,0x801A3B48,0x12
|
||||
asm/non_matchings/code/code_8019AF00/func_801A3B90.s,func_801A3B90,0x801A3B90,0x52
|
||||
asm/non_matchings/code/code_8019AF00/func_801A3CD8.s,func_801A3CD8,0x801A3CD8,0x7
|
||||
asm/non_matchings/code/code_8019AF00/func_801A3CF4.s,func_801A3CF4,0x801A3CF4,0x18
|
||||
asm/non_matchings/code/code_8019AF00/Audio_MuteSeqPlayerBgmSub.s,Audio_MuteSeqPlayerBgmSub,0x801A3B48,0x12
|
||||
asm/non_matchings/code/code_8019AF00/Audio_ToggleRomaniSinging.s,Audio_ToggleRomaniSinging,0x801A3B90,0x52
|
||||
asm/non_matchings/code/code_8019AF00/Audio_SetEnvReverb.s,Audio_SetEnvReverb,0x801A3CD8,0x7
|
||||
asm/non_matchings/code/code_8019AF00/Audio_SetCodeReverb.s,Audio_SetCodeReverb,0x801A3CF4,0x18
|
||||
asm/non_matchings/code/code_8019AF00/Audio_PlaySfx_SurroundSoundTest.s,Audio_PlaySfx_SurroundSoundTest,0x801A3D54,0x11
|
||||
asm/non_matchings/code/code_8019AF00/func_801A3D98.s,func_801A3D98,0x801A3D98,0x28
|
||||
asm/non_matchings/code/code_8019AF00/func_801A3E38.s,func_801A3E38,0x801A3E38,0x22
|
||||
asm/non_matchings/code/code_8019AF00/func_801A3EC0.s,func_801A3EC0,0x801A3EC0,0x25
|
||||
asm/non_matchings/code/code_8019AF00/Audio_SetFileSelectSettings.s,Audio_SetFileSelectSettings,0x801A3D98,0x28
|
||||
asm/non_matchings/code/code_8019AF00/Audio_SetBaseFilter.s,Audio_SetBaseFilter,0x801A3E38,0x22
|
||||
asm/non_matchings/code/code_8019AF00/Audio_SetExtraFilter.s,Audio_SetExtraFilter,0x801A3EC0,0x25
|
||||
asm/non_matchings/code/code_8019AF00/Audio_SetCutsceneFlag.s,Audio_SetCutsceneFlag,0x801A3F54,0x6
|
||||
asm/non_matchings/code/code_8019AF00/Audio_PlaySfx_IfNotInCutsceneImpl.s,Audio_PlaySfx_IfNotInCutsceneImpl,0x801A3F6C,0x12
|
||||
asm/non_matchings/code/code_8019AF00/Audio_PlaySfx_IfNotInCutscene.s,Audio_PlaySfx_IfNotInCutscene,0x801A3FB4,0x12
|
||||
asm/non_matchings/code/code_8019AF00/Audio_MuteSfxAndAmbienceSeqExceptOcarinaAndSystem.s,Audio_MuteSfxAndAmbienceSeqExceptOcarinaAndSystem,0x801A3FFC,0x4
|
||||
asm/non_matchings/code/code_8019AF00/Audio_MuteSfxAndAmbienceSeqExceptSystemAndOcarina.s,Audio_MuteSfxAndAmbienceSeqExceptSystemAndOcarina,0x801A3FFC,0x4
|
||||
asm/non_matchings/code/code_8019AF00/Audio_SetSpec.s,Audio_SetSpec,0x801A400C,0x13
|
||||
asm/non_matchings/code/code_8019AF00/func_801A4058.s,func_801A4058,0x801A4058,0x5C
|
||||
asm/non_matchings/code/code_8019AF00/func_801A41C8.s,func_801A41C8,0x801A41C8,0xC
|
||||
asm/non_matchings/code/code_8019AF00/func_801A41F8.s,func_801A41F8,0x801A41F8,0x29
|
||||
asm/non_matchings/code/code_8019AF00/Audio_MuteAllSeqExceptSystemAndOcarina.s,Audio_MuteAllSeqExceptSystemAndOcarina,0x801A4058,0x5C
|
||||
asm/non_matchings/code/code_8019AF00/Audio_MuteSfxAndAmbienceSeqExceptSysAndOca.s,Audio_MuteSfxAndAmbienceSeqExceptSysAndOca,0x801A41C8,0xC
|
||||
asm/non_matchings/code/code_8019AF00/Audio_StopFanfare.s,Audio_StopFanfare,0x801A41F8,0x29
|
||||
asm/non_matchings/code/code_8019AF00/Audio_StartSfxPlayer.s,Audio_StartSfxPlayer,0x801A429C,0xB
|
||||
asm/non_matchings/code/code_8019AF00/func_801A42C8.s,func_801A42C8,0x801A42C8,0x17
|
||||
asm/non_matchings/code/code_8019AF00/func_801A4324.s,func_801A4324,0x801A4324,0x9
|
||||
asm/non_matchings/code/code_8019AF00/Audio_DisableAllSeq.s,Audio_DisableAllSeq,0x801A42C8,0x17
|
||||
asm/non_matchings/code/code_8019AF00/Audio_GetEnabledNotesCount.s,Audio_GetEnabledNotesCount,0x801A4324,0x9
|
||||
asm/non_matchings/code/code_8019AF00/func_801A4348.s,func_801A4348,0x801A4348,0xE
|
||||
asm/non_matchings/code/code_8019AF00/Audio_SetSfxVolumeExceptSystemAndOcarinaBanks.s,Audio_SetSfxVolumeExceptSystemAndOcarinaBanks,0x801A4380,0x2A
|
||||
asm/non_matchings/code/code_8019AF00/Audio_SetSfxReverbIndexExceptOcarinaBank.s,Audio_SetSfxReverbIndexExceptOcarinaBank,0x801A4428,0x1F
|
||||
|
||||
|
Reference in New Issue
Block a user