diff options
| author | engineer124 <47598039+engineer124@users.noreply.github.com> | 2023-10-27 00:09:08 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-26 10:09:08 -0300 |
| commit | 6aaeb80f992865e1a68eed611b926f8b41ad3ed6 (patch) | |
| tree | f53f6f490dfc4e85a7d86411865387f570dc8d97 /src/code | |
| parent | c3b19739c6e9d8da8a6d24afa818cfdad8c0ff42 (diff) | |
Decompile Remaining code_8019AF00.c Functions (1 non-matching) (#1442)
* remaining code_8019AF00 functions
* oops
* decimal duration
* PR Review
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/z_kaleido_setup.c | 2 | ||||
| -rw-r--r-- | src/code/z_message.c | 4 | ||||
| -rw-r--r-- | src/code/z_play.c | 12 | ||||
| -rw-r--r-- | src/code/z_room.c | 2 | ||||
| -rw-r--r-- | src/code/z_sram_NES.c | 4 |
5 files changed, 12 insertions, 12 deletions
diff --git a/src/code/z_kaleido_setup.c b/src/code/z_kaleido_setup.c index 1b3aa49d7..277fc5360 100644 --- a/src/code/z_kaleido_setup.c +++ b/src/code/z_kaleido_setup.c @@ -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) { diff --git a/src/code/z_message.c b/src/code/z_message.c index 4d717d8df..4bc104fec 100644 --- a/src/code/z_message.c +++ b/src/code/z_message.c @@ -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); } } diff --git a/src/code/z_play.c b/src/code/z_play.c index 17449e042..6d3dac1fe 100644 --- a/src/code/z_play.c +++ b/src/code/z_play.c @@ -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); diff --git a/src/code/z_room.c b/src/code/z_room.c index 428dd5c13..ff9476825 100644 --- a/src/code/z_room.c +++ b/src/code/z_room.c @@ -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); } diff --git a/src/code/z_sram_NES.c b/src/code/z_sram_NES.c index 01a493cc0..83e271edc 100644 --- a/src/code/z_sram_NES.c +++ b/src/code/z_sram_NES.c @@ -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) { |
