AudioOcarina (1 NonMatching) (#911)

* AudioOcarina OK

* rm some comments

* PR Suggestions

* Add define

* cleanup

include/functions.h

@@ -3195,51 +3195,24 @@ void AudioSeq_InitSequencePlayerChannels(s32 playerIndex);
 void AudioSeq_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 func_8019AF00(void);
-// void func_8019AF58(void);
-// void func_8019AFE8(void);
-// void func_8019B02C(void);
-// void AudioOcarina_MapSongFromNotesToButtons(void);
-// void func_8019B144(void);
-// void func_8019B378(void);
-// void func_8019B38C(void);
-// void func_8019B3D0(void);
-// void func_8019B4B8(void);
-void AudioOcarina_StartDefault(u32 arg0);
-// void func_8019B568(void);
-// void func_8019B5AC(void);
-// void func_8019B5EC(void);
-// void func_8019B618(void);
-// void func_8019B654(void);
-// void func_8019B6B4(void);
-// void func_8019BC44(void);
-// void func_8019BE98(void);
-// void func_8019C1D0(void);
-// void func_8019C268(void);
-// void func_8019C2E4(void);
-u32 AudioOcarina_SetInstrumentId(u8 arg0);
-// void func_8019C398(void);
-// void func_8019C5A0(void);
-// void func_8019C8D8(void);
-// void func_8019CD08(void);
-// void func_8019CE34(void);
-// void func_8019CE6C(void);
-// void func_8019CEBC(void);
-// void func_8019CF6C(void);
-// void func_8019CF78(void);
+
+void AudioOcarina_SetSongStartingPos(void);
+void AudioOcarina_StartAtSongStartingPos(u32 ocarinaFlags);
+void AudioOcarina_StartForSongCheck(u32 ocarinaFlags, u8 ocarinaStaffPlayingPosStart);
+void AudioOcarina_StartWithSongNoteLengths(u32 ocarinaFlags);
+void AudioOcarina_StartDefault(u32 ocarinaFlags);
+u8 func_8019B5AC(void);
+void AudioOcarina_ResetAndReadInput(void);
+void AudioOcarina_SetOcarinaDisableTimer(u8 resetUnused, u8 resetDelay);
+u32 AudioOcarina_SetInstrument(u8 ocarinaInstrumentId);
+void AudioOcarina_SetPlaybackSong(s8 songIndexPlusOne, u8 playbackState);
+void AudioOcarina_SetRecordingState(u8 recordingState);
+OcarinaStaff* AudioOcarina_GetRecordingStaff(void);
+OcarinaStaff* AudioOcarina_GetPlayingStaff(void);
 OcarinaStaff* AudioOcarina_GetPlaybackStaff(void);
-// void func_8019CFA8(void);
-// void AudioOcarina_TerminaWallValidateNotes(void);
 void AudioOcarina_TerminaWallGenerateNotes(void);
-// void AudioOcarina_MemoryGameSetNumNotes(void);
-// void AudioOcarina_MemoryGameGenerateNotes(void);
-// void func_8019D600(void);
-void func_8019D758(void);
-// void func_8019D864(void);
-// void func_8019D8B4(void);
-// void func_8019D8E4(void);
-// void func_8019DF28(void);
-// void func_8019DF64(void);
+void AudioOcarina_PlayLongScarecrowAfterCredits(void);
+
 void func_8019E014(void);
 // void func_8019E110(void);
 // void func_8019E14C(void);
@@ -3365,7 +3338,7 @@ void func_801A4058(UNK_TYPE arg0);
 // void func_801A42C8(void);
 // void func_801A4324(void);
 // void func_801A4348(void);
-// void func_801A4380(void);
+void Audio_SetSfxVolumeExceptSystemAndOcarinaBanks(u8 arg0);
 void func_801A4428(u8 reverbIndex);
 void Audio_PreNMI(void);
 // void func_801A44C4(void);
@@ -3402,9 +3375,9 @@ UNK_TYPE func_801A51F0(UNK_TYPE arg0);
 // void func_801A5808(void);
 // void func_801A5A10(void);
 // void func_801A5A1C(void);
-void func_801A5BD0(s32 param_1);
-// void func_801A5C28(void);
-// void func_801A5C8C(void);
+void Audio_SetSfxBanksMute(u16 muteMask);
+void Audio_SetFlagForBgmVolumeLow(u8 channelIndex);
+void Audio_ClearFlagForBgmVolumeLow(u8 channelIndex);
 void Audio_PlaySfxGeneral(u16 sfxId, Vec3f* param_2, u8 param_3, f32* param_4, f32* param_5, s8* param_6);
 // void func_801A5DDC(void);
 // void func_801A5F7C(void);
@@ -3417,7 +3390,7 @@ void func_801A7084(u8 bankId);
 void Audio_StopSfxByPos(Vec3f* pos);
 void func_801A7328(Vec3f* pos, u16 sfxId);
 // void func_801A7484(void);
-void func_801A75E8(u16 sfxId);
+void Audio_StopSfxById(u16 sfxId);
 // void func_801A7720(void);
 void func_801A7794(u32 param_1, u32 param_2, u32 param_3);
 // void func_801A7828(void);

include/variables.h

@@ -1553,7 +1553,7 @@ extern s16 gHighPassFilterData[];
 extern s16 gBandStopFilterData[];
 extern s16 gBandPassFilterData[];
 extern s16* gWaveSamples[9];
-extern f32 gBendPitchOneOctaveFrequencies[256];
+extern f32 gBendPitchOneOctaveFrequencies[];
 extern f32 gBendPitchTwoSemitonesFrequencies[];
 extern f32 gPitchFrequencies[];
 extern u8 gDefaultShortNoteVelocityTable[];
@@ -1649,8 +1649,8 @@ extern f32 gSfxVolume;
 // extern UNK_TYPE1 D_801D6FD8;
 // extern UNK_TYPE1 D_801D6FDC;
 // extern UNK_TYPE1 D_801D6FE0;
-// extern UNK_TYPE1 D_801D6FE4;
-// extern UNK_TYPE1 D_801D6FE8;
+// extern UNK_TYPE1 sPlaybackStaffStopPos;
+// extern UNK_TYPE1 sPlaybackStaffStartPos;
 // extern UNK_TYPE4 D_801D6FEC;
 // extern UNK_TYPE4 D_801D6FF0;
 // extern UNK_TYPE2 D_801D6FF4;
@@ -1731,14 +1731,14 @@ extern UNK_PTR D_801DB478[7];
 // extern UNK_TYPE1 D_801DB494;
 // extern UNK_TYPE1 D_801DB49C;
 // extern UNK_TYPE2 D_801DB4A0;
-extern Vec3f D_801DB4A4;
+extern Vec3f gSfxDefaultPos;
 extern f32 D_801DB4B0;
-extern s8 D_801DB4B8;
+extern s8 gSfxDefaultReverb;
 // extern UNK_TYPE1 D_801DB4C0;
 // extern UNK_TYPE1 D_801DB4C4;
 // extern UNK_TYPE1 D_801DB4C8;
 // extern UNK_TYPE1 D_801DB4CC;
-// extern UNK_TYPE1 D_801DB4D4;
+extern u8 gAudioSpecId;
 // extern UNK_TYPE1 D_801DB4D8;
 // extern UNK_TYPE4 D_801DB4DC;
 // extern UNK_TYPE1 D_801DB4E0;

include/z64ocarina.h

@@ -26,10 +26,10 @@ typedef enum {
     /* 19 */ OCARINA_SONG_EVAN_PART1,
     /* 20 */ OCARINA_SONG_EVAN_PART2,
     /* 21 */ OCARINA_SONG_ZELDAS_LULLABY,
-    /* 22 */ OCARINA_SONG_SCARECROW,
+    /* 22 */ OCARINA_SONG_SCARECROW_SPAWN,
     /* 23 */ OCARINA_SONG_TERMINA_WALL,
     /* 24 */ OCARINA_SONG_MAX,
-    /* 24 */ OCARINA_SONG_SCARECROW_LONG = OCARINA_SONG_MAX
+    /* 24 */ OCARINA_SONG_SCARECROW_LONG = OCARINA_SONG_MAX // anything larger than 24 is considered the long scarecrow's song
 } OcarinaSongId;
 
 typedef enum {
@@ -38,6 +38,7 @@ typedef enum {
     /*  2 */ OCARINA_BTN_C_RIGHT,
     /*  3 */ OCARINA_BTN_C_LEFT,
     /*  4 */ OCARINA_BTN_C_UP,
+    /*  5 */ OCARINA_BTN_C_RIGHT_OR_C_LEFT,
     /* -1 */ OCARINA_BTN_INVALID = 0xFF
 } OcarinaButtonIndex;
 
@@ -92,15 +93,19 @@ typedef enum {
 } OcarinaRecordingState;
 
 /**
- * BFlat4Flag Note:
+ * bFlat4Flag Note:
  * Flag for resolving whether (pitch = OCARINA_PITCH_BFLAT4) 
  * gets mapped to either C_RIGHT and C_LEFT
  * 
  * This is required as C_RIGHT and C_LEFT are the only notes
- * that map to two semitones apart (NOTE_A4 and NOTE_B4)
+ * that map to two semitones apart (OCARINA_PITCH_A4 and OCARINA_PITCH_B4)
  *      0x40 - BTN_Z is pressed to lower note by a semitone
  *      0x80 - BTN_R is pressed to raise note by a semitone
  */ 
+#define OCARINA_BUTTON_MASK_PITCH 0x3F
+#define OCARINA_BUTTON_MASK_FLAG 0xC0
+#define OCARINA_BUTTON_FLAG_BFLAT_LOWER 0x40
+#define OCARINA_BUTTON_FLAG_BFLAT_RAISE 0x80
 
 typedef struct {
     /* 0x0 */ u8 pitch; // number of semitones above middle C
@@ -108,7 +113,7 @@ typedef struct {
     /* 0x4 */ u8 volume;
     /* 0x5 */ u8 vibrato;
     /* 0x6 */ s8 bend; // frequency multiplicative offset from the pitch defined by pitch
-    /* 0x7 */ u8 BFlat4Flag; // See note above
+    /* 0x7 */ u8 bFlat4Flag; // See note above
 } OcarinaNote;  // size = 0x8
 
 typedef struct {

include/z64save.h

@@ -167,7 +167,7 @@ typedef struct Save {
     /* 0x0F60 */ u32 mapsVisible;                       // "cloud_clear"
     /* 0x0F64 */ u8 unk_F64;                            // "oca_rec_flag"                   has scarecrows song
     /* 0x0F65 */ u8 unk_F65;                            // "oca_rec_flag8"                  scarecrows song set?
-    /* 0x0F66 */ u8 scarecrowsSong[128];
+    /* 0x0F66 */ u8 scarecrowSpawnSong[128];
     /* 0x0FE6 */ s8 bombersCaughtNum;                   // "aikotoba_index"
     /* 0x0FE7 */ s8 bombersCaughtOrder[5];              // "aikotoba_table"
     /* 0x0FEC */ s8 lotteryCodes[3][3];                 // "numbers_table", Preset lottery codes

src/code/audio/code_801A5BD0.c

@@ -1,10 +1,10 @@
 #include "global.h"
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A5BD0/func_801A5BD0.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A5BD0/Audio_SetSfxBanksMute.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A5BD0/func_801A5C28.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A5BD0/Audio_SetFlagForBgmVolumeLow.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A5BD0/func_801A5C8C.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A5BD0/Audio_ClearFlagForBgmVolumeLow.s")
 
 #pragma GLOBAL_ASM("asm/non_matchings/code/code_801A5BD0/Audio_PlaySfxGeneral.s")
 
@@ -30,7 +30,7 @@
 
 #pragma GLOBAL_ASM("asm/non_matchings/code/code_801A5BD0/func_801A7484.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A5BD0/func_801A75E8.s")
+#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A5BD0/Audio_StopSfxById.s")
 
 #pragma GLOBAL_ASM("asm/non_matchings/code/code_801A5BD0/func_801A7720.s")
 

src/code/z_actor.c

@@ -2128,7 +2128,7 @@ void func_800B8E58(Player* player, u16 sfxId) {
     if (player->currentMask == PLAYER_MASK_GIANT) {
         func_8019F170(&player->actor.projectedPos, sfxId);
     } else {
-        Audio_PlaySfxGeneral(sfxId, &player->actor.projectedPos, 4, &D_801DB4B0, &D_801DB4B0, &D_801DB4B8);
+        Audio_PlaySfxGeneral(sfxId, &player->actor.projectedPos, 4, &D_801DB4B0, &D_801DB4B0, &gSfxDefaultReverb);
     }
 }
 
@@ -2568,13 +2568,13 @@ void func_800B9D1C(Actor* actor) {
 
     if (sfxId != 0) {
         if (actor->audioFlags & 2) {
-            Audio_PlaySfxGeneral(sfxId, &actor->projectedPos, 4, &D_801DB4B0, &D_801DB4B0, &D_801DB4B8);
+            Audio_PlaySfxGeneral(sfxId, &actor->projectedPos, 4, &D_801DB4B0, &D_801DB4B0, &gSfxDefaultReverb);
         } else if (actor->audioFlags & 4) {
             play_sound(sfxId);
         } else if (actor->audioFlags & 8) {
             func_8019F128(sfxId);
         } else if (actor->audioFlags & 0x10) {
-            func_801A0810(&D_801DB4A4, NA_SE_SY_TIMER - SFX_FLAG, (sfxId - 1));
+            func_801A0810(&gSfxDefaultPos, NA_SE_SY_TIMER - SFX_FLAG, (sfxId - 1));
         } else if (actor->audioFlags & 1) {
             Audio_PlaySfxAtPos(&actor->projectedPos, sfxId);
         }

src/code/z_demo.c

@@ -256,8 +256,7 @@ void Cutscene_Command_Misc(PlayState* play2, CutsceneContext* csCtx, CsCmdBase*
             }
             break;
         case 0x13:
-            // AudioOcarina_PlayLongScarecrowAfterCredits
-            func_8019D758();
+            AudioOcarina_PlayLongScarecrowAfterCredits();
             csCtx->frames = cmd->startFrame - 1;
             break;
         case 0x14:

src/code/z_sram_NES.c

@@ -1000,10 +1000,10 @@ void Sram_OpenSave(FileChooseContext* fileChooseCtx, SramContext* sramCtx) {
         }
 
         if (gSaveContext.save.unk_F65) {
-            Lib_MemCpy(gScarecrowSpawnSongPtr, gSaveContext.save.scarecrowsSong,
-                       sizeof(gSaveContext.save.scarecrowsSong));
+            Lib_MemCpy(gScarecrowSpawnSongPtr, gSaveContext.save.scarecrowSpawnSong,
+                       sizeof(gSaveContext.save.scarecrowSpawnSong));
 
-            for (i = 0; i != ARRAY_COUNT(gSaveContext.save.scarecrowsSong); i++) {}
+            for (i = 0; i != ARRAY_COUNT(gSaveContext.save.scarecrowSpawnSong); i++) {}
         }
 
         fileNum = gSaveContext.fileNum;

src/overlays/actors/ovl_Bg_Spdweb/z_bg_spdweb.c

@@ -338,7 +338,7 @@ void func_809CE4C8(BgSpdweb* this, PlayState* play) {
         if (this->unk_164 > 3.0f) {
             Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_WEB_VIBRATION);
         } else {
-            func_801A75E8(NA_SE_EV_WEB_VIBRATION);
+            Audio_StopSfxById(NA_SE_EV_WEB_VIBRATION);
         }
     }
 

src/overlays/actors/ovl_Boss_03/z_boss_03.c

@@ -808,7 +808,7 @@ void Boss03_CatchPlayer(Boss03* this, PlayState* play) {
             if ((&this->actor != player->actor.parent) && (play->grabPlayer(play, player) != 0)) {
                 player->actor.parent = &this->actor;
                 Audio_PlaySfxGeneral(NA_SE_VO_LI_DAMAGE_S, &player->actor.projectedPos, 4, &D_801DB4B0, &D_801DB4B0,
-                                     &D_801DB4B8);
+                                     &gSfxDefaultReverb);
                 Boss03_SetupChewPlayer(this, play);
             }
         } else {

src/overlays/actors/ovl_Dm_Stk/z_dm_stk.c

@@ -730,7 +730,7 @@ void DmStk_PlaySfxForEndingCutsceneSecondPart(DmStk* this, PlayState* play) {
             break;
 
         case 2000:
-            func_801A5BD0(0x7F);
+            Audio_SetSfxBanksMute(0x7F);
             break;
     }
 

src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c

@@ -446,7 +446,8 @@ void func_808B977C(DoorWarp1* this, PlayState* play) {
     if (func_808B866C(this, play) && !Play_InCsMode(play)) {
         Player* player = GET_PLAYER(play);
 
-        Audio_PlaySfxGeneral(NA_SE_EV_LINK_WARP, &player->actor.projectedPos, 4, &D_801DB4B0, &D_801DB4B0, &D_801DB4B8);
+        Audio_PlaySfxGeneral(NA_SE_EV_LINK_WARP, &player->actor.projectedPos, 4, &D_801DB4B0, &D_801DB4B0,
+                             &gSfxDefaultReverb);
         func_800B7298(play, &this->dyna.actor, 9);
         player->unk_3A0.x = this->dyna.actor.world.pos.x;
         player->unk_3A0.z = this->dyna.actor.world.pos.z;
@@ -619,7 +620,8 @@ void func_808B9FD0(DoorWarp1* this, PlayState* play) {
         ActorCutscene_SetIntentToPlay(play->playerActorCsIds[9]);
     } else {
         ActorCutscene_Start(play->playerActorCsIds[9], NULL);
-        Audio_PlaySfxGeneral(NA_SE_EV_LINK_WARP, &player->actor.projectedPos, 4, &D_801DB4B0, &D_801DB4B0, &D_801DB4B8);
+        Audio_PlaySfxGeneral(NA_SE_EV_LINK_WARP, &player->actor.projectedPos, 4, &D_801DB4B0, &D_801DB4B0,
+                             &gSfxDefaultReverb);
         Animation_ChangeImpl(&this->skelAnime, &object_warp1_Anim_001374, 1.0f,
                              Animation_GetLastFrame(&object_warp1_Anim_001374.common),
                              Animation_GetLastFrame(&object_warp1_Anim_001374.common), 2, 40.0f, 1);

src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.c

@@ -293,7 +293,7 @@ void EnBji01_DialogueHandler(EnBji01* this, PlayState* play) {
 }
 
 void func_809CD634(EnBji01* this, PlayState* play) {
-    func_801A5BD0(0x6F);
+    Audio_SetSfxBanksMute(0x6F);
     Audio_QueueSeqCmd(0xE0000101);
     play->nextEntranceIndex = 0x54A0; /* Termina Field from telescope */
     gSaveContext.respawn[RESPAWN_MODE_DOWN].entranceIndex = play->nextEntranceIndex;
@@ -350,7 +350,7 @@ void EnBji01_Init(Actor* thisx, PlayState* play) {
             break;
         case 0x4C20: /* Observatory from Termina Field telescope */
             this->actor.flags |= ACTOR_FLAG_10000;
-            func_801A5BD0(0);
+            Audio_SetSfxBanksMute(0);
             Audio_QueueSeqCmd(0xE0000100);
             this->actor.params = SHIKASHI_TYPE_LOOKED_THROUGH_TELESCOPE;
             func_809CCE98(this, play);

src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c

@@ -570,7 +570,7 @@ void EnClearTag_UpdateCamera(EnClearTag* this, PlayState* play) {
             this->subCamAt.z = mainCam->at.z;
             Message_StartTextbox(play, 0xF, NULL);
             this->cameraState = 2;
-            func_8019FDC8(&D_801DB4A4, NA_SE_VO_NA_LISTEN, 0x20);
+            func_8019FDC8(&gSfxDefaultPos, NA_SE_VO_NA_LISTEN, 0x20);
         case 2:
             if (player->actor.world.pos.z > 0.0f) {
                 player->actor.world.pos.z = 290.0f;

src/overlays/actors/ovl_En_Elf/z_en_elf.c

@@ -1468,7 +1468,7 @@ void func_8089010C(Actor* thisx, PlayState* play) {
     }
 
     if (Actor_ProcessTalkRequest(thisx, &play->state)) {
-        func_8019FDC8(&D_801DB4A4, NA_SE_VO_NA_LISTEN, 0x20);
+        func_8019FDC8(&gSfxDefaultPos, NA_SE_VO_NA_LISTEN, 0x20);
         thisx->focus.pos = thisx->world.pos;
 
         if (thisx->textId == ElfMessage_GetFirstCycleHint(play)) {

src/overlays/actors/ovl_En_Gakufu/z_en_gakufu.c

@@ -106,12 +106,12 @@ void EnGakufu_ProcessNotes(EnGakufu* this) {
     s32 songIndex;
 
     AudioOcarina_TerminaWallGenerateNotes();
-    AudioOcarina_SetInstrumentId(OCARINA_INSTRUMENT_DEFAULT);
+    AudioOcarina_SetInstrument(OCARINA_INSTRUMENT_DEFAULT);
     AudioOcarina_StartDefault((1 << this->songIndex) | 0x80000000);
     playbackStaff = AudioOcarina_GetPlaybackStaff();
     playbackStaff->pos = 0;
     playbackStaff->state = 0xFF;
-    AudioOcarina_SetInstrumentId(OCARINA_INSTRUMENT_OFF);
+    AudioOcarina_SetInstrument(OCARINA_INSTRUMENT_OFF);
 
     songIndex = this->songIndex;
     ocarinaSongButtons = &gOcarinaSongButtons[songIndex];

src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c

@@ -774,10 +774,10 @@ void EnKakasi_PostSongLearnDialogue(EnKakasi* this, PlayState* play) {
         } else {
             this->talkState = TEXT_STATE_5;
             if (play->msgCtx.choiceIndex == 1) {
-                func_8019F208(); // play 0x4808 sfx (decide) and calls func_801A75E8
+                func_8019F208(); // play 0x4808 sfx (decide) and calls Audio_StopSfxById
                 this->actor.textId = 0x164A;
             } else {
-                func_8019F230(); // play 0x480A sfx (cancel) and calls func_801A75E8
+                func_8019F230(); // play 0x480A sfx (cancel) and calls Audio_StopSfxById
                 this->actor.textId = 0x1661;
             }
         }

src/overlays/actors/ovl_En_Mm3/z_en_mm3.c

@@ -366,7 +366,7 @@ void func_80A6F9DC(EnMm3* this, PlayState* play) {
 }
 
 void func_80A6FBA0(EnMm3* this) {
-    func_801A5BD0(0x6F);
+    Audio_SetSfxBanksMute(0x6F);
     func_801A0238(0, 5);
     gSaveContext.save.weekEventReg[63] |= 1;
     gSaveContext.save.weekEventReg[63] &= (u8)~2;
@@ -391,7 +391,7 @@ void func_80A6FBFC(EnMm3* this, PlayState* play) {
     }
 
     if (Actor_ProcessTalkRequest(&this->actor, &play->state)) {
-        func_801A5BD0(0);
+        Audio_SetSfxBanksMute(0);
         func_801A0238(0x7F, 5);
         Message_StartTextbox(play, 0x2791, &this->actor);
         this->unk_2B4 = 0x2791;

src/overlays/actors/ovl_En_Nwc/z_en_nwc.c

@@ -236,7 +236,7 @@ void EnNwc_CheckFound(EnNwc* this, PlayState* play) {
         }
 
         EnNwc_ChangeState(this, NWC_STATE_FOLLOWING);
-        func_801A0868(&D_801DB4A4, NA_SE_SY_CHICK_JOIN_CHIME, currentChickCount);
+        func_801A0868(&gSfxDefaultPos, NA_SE_SY_CHICK_JOIN_CHIME, currentChickCount);
     }
 }
 

src/overlays/actors/ovl_En_Test6/z_en_test6.c

@@ -593,9 +593,9 @@ void func_80A91760(EnTest6* this, PlayState* play) {
                (CHECK_BTN_ALL(input->press.button, BTN_A) || CHECK_BTN_ALL(input->press.button, BTN_B))) {
         this->unk_286 = 1;
         if (ENTEST6_GET(&this->actor) == ENTEST6_25) {
-            func_801A75E8(NA_SE_SY_TIME_CONTROL_SLOW);
+            Audio_StopSfxById(NA_SE_SY_TIME_CONTROL_SLOW);
         } else if (ENTEST6_GET(&this->actor) == ENTEST6_24) {
-            func_801A75E8(NA_SE_SY_TIME_CONTROL_NORMAL);
+            Audio_StopSfxById(NA_SE_SY_TIME_CONTROL_NORMAL);
         }
     }
 

src/overlays/actors/ovl_En_Tru/z_en_tru.c

@@ -994,7 +994,7 @@ s32 func_80A87DC0(Actor* thisx, PlayState* play) {
             break;
 
         case 2:
-            func_801A75E8(NA_SE_EN_KOUME_MAGIC);
+            Audio_StopSfxById(NA_SE_EN_KOUME_MAGIC);
             Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_KOUME_AWAY);
             Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_KOUME_LAUGH);
             func_80A86924(this, 13);

src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c

@@ -247,7 +247,7 @@ void EnWallmas_WaitToDrop(EnWallmas* this, PlayState* play) {
         (player->actor.freezeTimer > 0) || !(player->actor.bgCheckFlags & 1) ||
         ((WALLMASTER_GET_TYPE(&this->actor) == WALLMASTER_TYPE_PROXIMITY) &&
          (Math_Vec3f_DistXZ(&this->actor.home.pos, playerPos) > (120.f + this->detectionRadius)))) {
-        func_801A75E8(NA_SE_EN_FALL_AIM);
+        Audio_StopSfxById(NA_SE_EN_FALL_AIM);
         this->timer = 130;
     }
 

src/overlays/actors/ovl_En_Zot/z_en_zot.c

@@ -1103,14 +1103,14 @@ void func_80B98AD0(EnZot* this, PlayState* play) {
                 func_801477B4(play);
                 this->actionFunc = func_80B98CA8;
                 gSaveContext.save.weekEventReg[41] &= (u8)~0x20;
-                AudioOcarina_SetInstrumentId(OCARINA_INSTRUMENT_OFF);
+                AudioOcarina_SetInstrument(OCARINA_INSTRUMENT_OFF);
                 break;
 
             case 0x12BA:
                 func_801477B4(play);
                 this->actionFunc = func_80B98CA8;
                 gSaveContext.save.weekEventReg[41] |= 0x20;
-                AudioOcarina_SetInstrumentId(OCARINA_INSTRUMENT_OFF);
+                AudioOcarina_SetInstrument(OCARINA_INSTRUMENT_OFF);
                 break;
 
             default:

src/overlays/actors/ovl_Obj_Nozoki/z_obj_nozoki.c

@@ -362,7 +362,7 @@ void func_80BA2C94(ObjNozoki* this, PlayState* play) {
 
     play->roomCtx.unk7A[0] = this->dyna.actor.velocity.x;
 
-    func_8019FAD8(&D_801DB4A4, NA_SE_EV_SECOM_CONVEYOR - SFX_FLAG, this->dyna.actor.speedXZ);
+    func_8019FAD8(&gSfxDefaultPos, NA_SE_EV_SECOM_CONVEYOR - SFX_FLAG, this->dyna.actor.speedXZ);
 }
 
 void func_80BA3044(ObjNozoki* this, PlayState* play) {

src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c

@@ -255,7 +255,7 @@ void ObjSyokudai_Update(Actor* thisx, PlayState* play2) {
                         }
                     }
                     Audio_PlaySfxGeneral(NA_SE_EV_FLAME_IGNITION, &thisx->projectedPos, 4, &D_801DB4B0, &D_801DB4B0,
-                                         &D_801DB4B8);
+                                         &gSfxDefaultReverb);
                 }
             }
         }

tools/disasm/functions.txt

@@ -3805,52 +3805,52 @@
     0x8019ADBC:("AudioSeq_InitSequencePlayers",),
     0x8019AE40:("func_8019AE40",),
     0x8019AEC0:("func_8019AEC0",),
-    0x8019AF00:("func_8019AF00",),
-    0x8019AF58:("func_8019AF58",),
-    0x8019AFE8:("func_8019AFE8",),
-    0x8019B02C:("func_8019B02C",),
-    0x8019B074:("AudioOcarina_MapSongFromNotesToButtons",),
-    0x8019B144:("func_8019B144",),
-    0x8019B378:("func_8019B378",),
-    0x8019B38C:("func_8019B38C",),
-    0x8019B3D0:("func_8019B3D0",),
-    0x8019B4B8:("func_8019B4B8",),
+    0x8019AF00:("AudioOcarina_ReadControllerInput",),
+    0x8019AF58:("AudioOcarina_BendPitchTwoSemitones",),
+    0x8019AFE8:("AudioOcarina_GetPlayingState",),
+    0x8019B02C:("AudioOcarina_MapPitchToButton",),
+    0x8019B074:("AudioOcarina_MapSongFromPitchToButton",),
+    0x8019B144:("AudioOcarina_Start",),
+    0x8019B378:("AudioOcarina_SetSongStartingPos",),
+    0x8019B38C:("AudioOcarina_StartAtSongStartingPos",),
+    0x8019B3D0:("AudioOcarina_StartForSongCheck",),
+    0x8019B4B8:("AudioOcarina_StartWithSongNoteLengths",),
     0x8019B544:("AudioOcarina_StartDefault",),
     0x8019B568:("func_8019B568",),
     0x8019B5AC:("func_8019B5AC",),
     0x8019B5EC:("func_8019B5EC",),
-    0x8019B618:("func_8019B618",),
-    0x8019B654:("func_8019B654",),
-    0x8019B6B4:("func_8019B6B4",),
-    0x8019BC44:("func_8019BC44",),
-    0x8019BE98:("func_8019BE98",),
-    0x8019C1C0:("func_8019C1C0",),
-    0x8019C1D0:("func_8019C1D0",),
-    0x8019C268:("func_8019C268",),
-    0x8019C2E4:("func_8019C2E4",),
-    0x8019C300:("AudioOcarina_SetInstrumentId",),
-    0x8019C398:("func_8019C398",),
-    0x8019C5A0:("func_8019C5A0",),
-    0x8019C8D8:("func_8019C8D8",),
-    0x8019CD08:("func_8019CD08",),
-    0x8019CE34:("func_8019CE34",),
-    0x8019CE6C:("func_8019CE6C",),
-    0x8019CEBC:("func_8019CEBC",),
-    0x8019CF6C:("func_8019CF6C",),
-    0x8019CF78:("func_8019CF78",),
+    0x8019B618:("AudioOcarina_CheckIfStartedSong",),
+    0x8019B654:("AudioOcarina_UpdateCurOcarinaSong",),
+    0x8019B6B4:("AudioOcarina_CheckSongsWithMusicStaff",),
+    0x8019BC44:("AudioOcarina_CheckSongsWithoutMusicStaff",),
+    0x8019BE98:("AudioOcarina_PlayControllerInput",),
+    0x8019C1C0:("AudioOcarina_EnableInput",),
+    0x8019C1D0:("AudioOcarina_ResetAndMute",),
+    0x8019C268:("AudioOcarina_ResetAndReadInput",),
+    0x8019C2E4:("AudioOcarina_SetOcarinaDisableTimer",),
+    0x8019C300:("AudioOcarina_SetInstrument",),
+    0x8019C398:("AudioOcarina_SetPlaybackSong",),
+    0x8019C5A0:("AudioOcarina_PlaybackSong",),
+    0x8019C8D8:("AudioOcarina_SetRecordingSong",),
+    0x8019CD08:("AudioOcarina_SetRecordingState",),
+    0x8019CE34:("AudioOcarina_UpdateRecordingStaff",),
+    0x8019CE6C:("AudioOcarina_UpdatePlayingStaff",),
+    0x8019CEBC:("AudioOcarina_UpdatePlaybackStaff",),
+    0x8019CF6C:("AudioOcarina_GetRecordingStaff",),
+    0x8019CF78:("AudioOcarina_GetPlayingStaff",),
     0x8019CF9C:("AudioOcarina_GetPlaybackStaff",),
-    0x8019CFA8:("func_8019CFA8",),
+    0x8019CFA8:("AudioOcarina_RecordSong",),
     0x8019D134:("AudioOcarina_TerminaWallValidateNotes",),
     0x8019D26C:("AudioOcarina_TerminaWallGenerateNotes",),
-    0x8019D488:("AudioOcarina_MemoryGameSetNumNotes",),
-    0x8019D4F8:("AudioOcarina_MemoryGameGenerateNotes",),
-    0x8019D600:("func_8019D600",),
-    0x8019D758:("func_8019D758",),
-    0x8019D864:("func_8019D864",),
-    0x8019D8B4:("func_8019D8B4",),
-    0x8019D8E4:("func_8019D8E4",),
-    0x8019DF28:("func_8019DF28",),
-    0x8019DF64:("func_8019DF64",),
+    0x8019D488:("AudioOcarina_MemoryGameInit",),
+    0x8019D4F8:("AudioOcarina_MemoryGameNextNote",),
+    0x8019D600:("AudioOcarina_Update",),
+    0x8019D758:("AudioOcarina_PlayLongScarecrowAfterCredits",),
+    0x8019D864:("AudioOcarina_SetCustomSequence",),
+    0x8019D8B4:("AudioOcarina_PlayCustomSequence",),
+    0x8019D8E4:("AudioOcarina_CreateCustomSequence",),
+    0x8019DF28:("AudioOcarina_ResetInstrument",),
+    0x8019DF64:("AudioOcarina_ResetStaffs",),
     0x8019DFF8:("func_8019DFF8",),
     0x8019E000:("func_8019E000",),
     0x8019E00C:("func_8019E00C",),
@@ -3990,7 +3990,7 @@
     0x801A42C8:("func_801A42C8",),
     0x801A4324:("func_801A4324",),
     0x801A4348:("func_801A4348",),
-    0x801A4380:("func_801A4380",),
+    0x801A4380:("Audio_SetSfxVolumeExceptSystemAndOcarinaBanks",),
     0x801A4428:("func_801A4428",),
     0x801A44A4:("Audio_PreNMI",),
     0x801A44C4:("func_801A44C4",),
@@ -4030,9 +4030,9 @@
     0x801A5808:("func_801A5808",),
     0x801A5A10:("func_801A5A10",),
     0x801A5A1C:("func_801A5A1C",),
-    0x801A5BD0:("func_801A5BD0",),
-    0x801A5C28:("func_801A5C28",),
-    0x801A5C8C:("func_801A5C8C",),
+    0x801A5BD0:("Audio_SetSfxBanksMute",),
+    0x801A5C28:("Audio_SetFlagForBgmVolumeLow",),
+    0x801A5C8C:("Audio_ClearFlagForBgmVolumeLow",),
     0x801A5CFC:("Audio_PlaySfxGeneral",),
     0x801A5DDC:("func_801A5DDC",),
     0x801A5F7C:("func_801A5F7C",),
@@ -4045,7 +4045,7 @@
     0x801A72CC:("Audio_StopSfxByPos",),
     0x801A7328:("func_801A7328",),
     0x801A7484:("func_801A7484",),
-    0x801A75E8:("func_801A75E8",),
+    0x801A75E8:("Audio_StopSfxById",),
     0x801A7720:("func_801A7720",),
     0x801A7794:("func_801A7794",),
     0x801A7828:("func_801A7828",),

tools/disasm/variables.txt

@@ -2310,28 +2310,28 @@
     0x801D6FD8:("sCurOcarinaVolume","UNK_TYPE1","",0x1),
     0x801D6FDC:("sCurOcarinaVibrato","UNK_TYPE1","",0x1),
     0x801D6FE0:("sPlaybackState","UNK_TYPE1","",0x1),
-    0x801D6FE4:("D_801D6FE4","UNK_TYPE1","",0x1),
-    0x801D6FE8:("D_801D6FE8","UNK_TYPE1","",0x1),
+    0x801D6FE4:("sPlaybackStaffStopPos","UNK_TYPE1","",0x1),
+    0x801D6FE8:("sPlaybackStaffStartPos","UNK_TYPE1","",0x1),
     0x801D6FEC:("sOcarinaFlags","UNK_TYPE4","",0x4),
     0x801D6FF0:("sPlaybackNoteTimer","UNK_TYPE4","",0x4),
     0x801D6FF4:("sPlaybackNotePos","UNK_TYPE2","",0x2),
     0x801D6FF8:("sPlaybackStaffPos","UNK_TYPE2","",0x2),
-    0x801D6FFC:("sPrevOcarinaSongFlags","UNK_TYPE4","",0x4),
-    0x801D7000:("sPlaybackNoteValue","UNK_TYPE1","",0x1),
+    0x801D6FFC:("sPrevOcarinaWithMusicStaffFlags","UNK_TYPE4","",0x4),
+    0x801D7000:("sPlaybackPitch","UNK_TYPE1","",0x1),
     0x801D7004:("sNotePlaybackVolume","UNK_TYPE1","",0x1),
     0x801D7008:("sNotePlaybackVibrato","UNK_TYPE1","",0x1),
     0x801D700C:("sNotePlaybackBend","UNK_TYPE1","",0x1),
-    0x801D7010:("sNormalizedNotePlaybackTone","f32","",0x4),
-    0x801D7014:("sNormalizedNotePlaybackVolume","f32","",0x4),
+    0x801D7010:("sRelativeNotePlaybackBend","f32","",0x4),
+    0x801D7014:("sRelativeNotePlaybackVolume","f32","",0x4),
     0x801D7018:("sOcarinaPlaybackTaskStart","UNK_TYPE4","",0x4),
     0x801D701C:("sOcarinaWallCounter","UNK_TYPE4","",0x4),
-    0x801D7020:("sCurOcarinaSong","u8","[8]",0x8),
-    0x801D7028:("sOcarinaSongAppendPos","UNK_TYPE1","",0x1),
+    0x801D7020:("sCurOcarinaSongWithoutMusicStaff","u8","[8]",0x8),
+    0x801D7028:("sOcarinaWithoutMusicStaffPos","UNK_TYPE1","",0x1),
     0x801D702C:("sOcarinaSongStartingPos","UNK_TYPE1","",0x1),
     0x801D7030:("sButtonToPitchMap","UNK_TYPE1","",0x1),
     0x801D7038:("sOcarinaMemoryGameAppendPos","UNK_TYPE1","",0x1),
-    0x801D703C:("sOcaMemoryGameEndPos","UNK_TYPE1","",0x1),
-    0x801D7040:("sOcaMemoryGameNumNotes","UNK_TYPE1","",0x1),
+    0x801D703C:("sOcarinaMemoryGameEndPos","UNK_TYPE1","",0x1),
+    0x801D7040:("sOcarinaMemoryGameNumNotes","UNK_TYPE1","",0x1),
     0x801D7044:("sOcarinaSongNotes","OcarinaNote","[24][20]",0xF00),
     0x801D7F44:("sOoTOcarinaSongNotes","OcarinaNote","[9][20]",0x5A0),
     0x801D84E4:("sOoTOcarinaSongsNumNotes","UNK_TYPE1","",0x1),
@@ -2350,7 +2350,7 @@
     0x801D852C:("sMusicStaffNumNotesPerTest","UNK_TYPE1","",0x1),
     0x801D8530:("D_801D8530","UNK_TYPE1","",0x1),
     0x801D8534:("D_801D8534","UNK_TYPE4","",0x4),
-    0x801D8538:("sIsOcarinaNoteChanged","UNK_TYPE1","",0x1),
+    0x801D8538:("sOcarinaDropInputTimer","UNK_TYPE1","",0x1),
     0x801D853C:("sScarecrowsLongSongNotes","OcarinaNote","[108]",0x360),
     0x801D889C:("gScarecrowLongSongPtr","UNK_PTR","",0x4),
     0x801D88A0:("gScarecrowSpawnSongPtr","UNK_PTR","",0x4),
@@ -2387,14 +2387,14 @@
     0x801DB494:("D_801DB494","UNK_TYPE1","",0x1),
     0x801DB49C:("D_801DB49C","UNK_TYPE1","",0x1),
     0x801DB4A0:("D_801DB4A0","UNK_TYPE2","",0x2),
-    0x801DB4A4:("D_801DB4A4","UNK_TYPE4","",0x4),
+    0x801DB4A4:("gSfxDefaultPos","UNK_TYPE4","",0x4),
     0x801DB4B0:("D_801DB4B0","UNK_TYPE1","",0x1),
-    0x801DB4B8:("D_801DB4B8","UNK_TYPE1","",0x1),
+    0x801DB4B8:("gSfxDefaultReverb","UNK_TYPE1","",0x1),
     0x801DB4C0:("D_801DB4C0","UNK_TYPE1","",0x1),
     0x801DB4C4:("D_801DB4C4","UNK_TYPE1","",0x1),
     0x801DB4C8:("D_801DB4C8","UNK_TYPE1","",0x1),
     0x801DB4CC:("D_801DB4CC","UNK_TYPE1","",0x1),
-    0x801DB4D4:("D_801DB4D4","UNK_TYPE1","",0x1),
+    0x801DB4D4:("gAudioSpecId","UNK_TYPE1","",0x1),
     0x801DB4D8:("D_801DB4D8","UNK_TYPE1","",0x1),
     0x801DB4DC:("D_801DB4DC","UNK_TYPE4","",0x4),
     0x801DB4E0:("D_801DB4E0","UNK_TYPE1","",0x1),
@@ -4292,18 +4292,18 @@
     0x801FD43A:("sPlayingStaff","OcarinaStaff","",0x3),
     0x801FD43E:("sPlaybackStaff","OcarinaStaff","",0x3),
     0x801FD442:("sRecordingStaff","OcarinaStaff","",0x3),
-    0x801FD448:("sOcarinaUpdateTaskCurrent","UNK_TYPE1","",0x1),
+    0x801FD448:("sOcarinaUpdateTaskStart","UNK_TYPE1","",0x1),
     0x801FD44C:("sOcarinaInputStickRel","OcarinaControlStick","",0x2),
     0x801FD450:("sOcarinaInputButtonCur","UNK_TYPE1","",0x1),
     0x801FD454:("sOcarinaInputButtonStart","UNK_TYPE1","",0x1),
     0x801FD458:("sOcarinaInputButtonPrev","UNK_TYPE1","",0x1),
-    0x801FD45C:("sOcaInputBtnPress","UNK_TYPE1","",0x1),
-    0x801FD460:("sOcarinaResetDelay","UNK_TYPE1","",0x1),
-    0x801FD461:("sOcarinaResetUnused","UNK_TYPE1","",0x1),
+    0x801FD45C:("sOcarinaInputButtonPress","UNK_TYPE1","",0x1),
+    0x801FD460:("sOcarinaDisableTimer","UNK_TYPE1","",0x1),
+    0x801FD461:("sOcarinaUnused","UNK_TYPE1","",0x1),
     0x801FD462:("sOcarinaHasStartedSong","UNK_TYPE1","",0x1),
     0x801FD463:("sFirstOcarinaSongIndex","UNK_TYPE1","",0x1),
     0x801FD464:("sLastOcarinaSongIndex","UNK_TYPE1","",0x1),
-    0x801FD468:("sOcarinaAvailSongs","UNK_TYPE1","",0x1),
+    0x801FD468:("sOcarinaAvailableSongFlags","UNK_TYPE1","",0x1),
     0x801FD46C:("sOcarinaStaffPlayingPos","UNK_TYPE1","",0x1),
     0x801FD470:("sMusicStaffPos","UNK_TYPE1","",0x1),
     0x801FD4A0:("sMusicStaffCurHeldLength","UNK_TYPE1","",0x1),
@@ -4311,7 +4311,7 @@
     0x801FD500:("sMusicStaffExpectedPitch","UNK_TYPE1","",0x1),
     0x801FD518:("D_801FD518","UNK_TYPE1","",0x1),
     0x801FD530:("D_801FD530","u32","[24]",0x60),
-    0x801FD590:("sRecordingSongNote","UNK_TYPE1","",0x1),
+    0x801FD590:("sScarecrowsLongSongSecondNote","UNK_TYPE1","",0x1),
     0x801FD598:("sCustomSequencePc","UNK_TYPE1","",0x1),
     0x801FD5A0:("D_801FD5A0","UNK_TYPE1","",0x1),
     0x801FD5A4:("D_801FD5A4","UNK_TYPE1","",0x1),

tools/sizes/code_functions.csv

@@ -3321,52 +3321,52 @@ asm/non_matchings/code/audio_seqplayer/AudioSeq_InitSequencePlayer.s,AudioSeq_In
 asm/non_matchings/code/audio_seqplayer/AudioSeq_InitSequencePlayers.s,AudioSeq_InitSequencePlayers,0x8019ADBC,0x21
 asm/non_matchings/code/code_8019AE40/func_8019AE40.s,func_8019AE40,0x8019AE40,0x1C
 asm/non_matchings/code/code_8019AEC0/func_8019AEC0.s,func_8019AEC0,0x8019AEC0,0x10
-asm/non_matchings/code/code_8019AF00/func_8019AF00.s,func_8019AF00,0x8019AF00,0x16
-asm/non_matchings/code/code_8019AF00/func_8019AF58.s,func_8019AF58,0x8019AF58,0x24
-asm/non_matchings/code/code_8019AF00/func_8019AFE8.s,func_8019AFE8,0x8019AFE8,0x11
-asm/non_matchings/code/code_8019AF00/func_8019B02C.s,func_8019B02C,0x8019B02C,0x12
-asm/non_matchings/code/code_8019AF00/AudioOcarina_MapSongFromNotesToButtons.s,AudioOcarina_MapSongFromNotesToButtons,0x8019B074,0x34
-asm/non_matchings/code/code_8019AF00/func_8019B144.s,func_8019B144,0x8019B144,0x8D
-asm/non_matchings/code/code_8019AF00/func_8019B378.s,func_8019B378,0x8019B378,0x5
-asm/non_matchings/code/code_8019AF00/func_8019B38C.s,func_8019B38C,0x8019B38C,0x11
-asm/non_matchings/code/code_8019AF00/func_8019B3D0.s,func_8019B3D0,0x8019B3D0,0x3A
-asm/non_matchings/code/code_8019AF00/func_8019B4B8.s,func_8019B4B8,0x8019B4B8,0x23
+asm/non_matchings/code/code_8019AF00/AudioOcarina_ReadControllerInput.s,AudioOcarina_ReadControllerInput,0x8019AF00,0x16
+asm/non_matchings/code/code_8019AF00/AudioOcarina_BendPitchTwoSemitones.s,AudioOcarina_BendPitchTwoSemitones,0x8019AF58,0x24
+asm/non_matchings/code/code_8019AF00/AudioOcarina_GetPlayingState.s,AudioOcarina_GetPlayingState,0x8019AFE8,0x11
+asm/non_matchings/code/code_8019AF00/AudioOcarina_MapPitchToButton.s,AudioOcarina_MapPitchToButton,0x8019B02C,0x12
+asm/non_matchings/code/code_8019AF00/AudioOcarina_MapSongFromPitchToButton.s,AudioOcarina_MapSongFromPitchToButton,0x8019B074,0x34
+asm/non_matchings/code/code_8019AF00/AudioOcarina_Start.s,AudioOcarina_Start,0x8019B144,0x8D
+asm/non_matchings/code/code_8019AF00/AudioOcarina_SetSongStartingPos.s,AudioOcarina_SetSongStartingPos,0x8019B378,0x5
+asm/non_matchings/code/code_8019AF00/AudioOcarina_StartAtSongStartingPos.s,AudioOcarina_StartAtSongStartingPos,0x8019B38C,0x11
+asm/non_matchings/code/code_8019AF00/AudioOcarina_StartForSongCheck.s,AudioOcarina_StartForSongCheck,0x8019B3D0,0x3A
+asm/non_matchings/code/code_8019AF00/AudioOcarina_StartWithSongNoteLengths.s,AudioOcarina_StartWithSongNoteLengths,0x8019B4B8,0x23
 asm/non_matchings/code/code_8019AF00/AudioOcarina_StartDefault.s,AudioOcarina_StartDefault,0x8019B544,0x9
 asm/non_matchings/code/code_8019AF00/func_8019B568.s,func_8019B568,0x8019B568,0x11
 asm/non_matchings/code/code_8019AF00/func_8019B5AC.s,func_8019B5AC,0x8019B5AC,0x10
 asm/non_matchings/code/code_8019AF00/func_8019B5EC.s,func_8019B5EC,0x8019B5EC,0xB
-asm/non_matchings/code/code_8019AF00/func_8019B618.s,func_8019B618,0x8019B618,0xF
-asm/non_matchings/code/code_8019AF00/func_8019B654.s,func_8019B654,0x8019B654,0x18
-asm/non_matchings/code/code_8019AF00/func_8019B6B4.s,func_8019B6B4,0x8019B6B4,0x164
-asm/non_matchings/code/code_8019AF00/func_8019BC44.s,func_8019BC44,0x8019BC44,0x95
-asm/non_matchings/code/code_8019AF00/func_8019BE98.s,func_8019BE98,0x8019BE98,0xCA
-asm/non_matchings/code/code_8019AF00/func_8019C1C0.s,func_8019C1C0,0x8019C1C0,0x4
-asm/non_matchings/code/code_8019AF00/func_8019C1D0.s,func_8019C1D0,0x8019C1D0,0x26
-asm/non_matchings/code/code_8019AF00/func_8019C268.s,func_8019C268,0x8019C268,0x1F
-asm/non_matchings/code/code_8019AF00/func_8019C2E4.s,func_8019C2E4,0x8019C2E4,0x7
-asm/non_matchings/code/code_8019AF00/AudioOcarina_SetInstrumentId.s,AudioOcarina_SetInstrumentId,0x8019C300,0x26
-asm/non_matchings/code/code_8019AF00/func_8019C398.s,func_8019C398,0x8019C398,0x82
-asm/non_matchings/code/code_8019AF00/func_8019C5A0.s,func_8019C5A0,0x8019C5A0,0xCE
-asm/non_matchings/code/code_8019AF00/func_8019C8D8.s,func_8019C8D8,0x8019C8D8,0x10C
-asm/non_matchings/code/code_8019AF00/func_8019CD08.s,func_8019CD08,0x8019CD08,0x4B
-asm/non_matchings/code/code_8019AF00/func_8019CE34.s,func_8019CE34,0x8019CE34,0xE
-asm/non_matchings/code/code_8019AF00/func_8019CE6C.s,func_8019CE6C,0x8019CE6C,0x14
-asm/non_matchings/code/code_8019AF00/func_8019CEBC.s,func_8019CEBC,0x8019CEBC,0x2C
-asm/non_matchings/code/code_8019AF00/func_8019CF6C.s,func_8019CF6C,0x8019CF6C,0x3
-asm/non_matchings/code/code_8019AF00/func_8019CF78.s,func_8019CF78,0x8019CF78,0x9
+asm/non_matchings/code/code_8019AF00/AudioOcarina_CheckIfStartedSong.s,AudioOcarina_CheckIfStartedSong,0x8019B618,0xF
+asm/non_matchings/code/code_8019AF00/AudioOcarina_UpdateCurOcarinaSong.s,AudioOcarina_UpdateCurOcarinaSong,0x8019B654,0x18
+asm/non_matchings/code/code_8019AF00/AudioOcarina_CheckSongsWithMusicStaff.s,AudioOcarina_CheckSongsWithMusicStaff,0x8019B6B4,0x164
+asm/non_matchings/code/code_8019AF00/AudioOcarina_CheckSongsWithoutMusicStaff.s,AudioOcarina_CheckSongsWithoutMusicStaff,0x8019BC44,0x95
+asm/non_matchings/code/code_8019AF00/AudioOcarina_PlayControllerInput.s,AudioOcarina_PlayControllerInput,0x8019BE98,0xCA
+asm/non_matchings/code/code_8019AF00/AudioOcarina_EnableInput.s,AudioOcarina_EnableInput,0x8019C1C0,0x4
+asm/non_matchings/code/code_8019AF00/AudioOcarina_ResetAndMute.s,AudioOcarina_ResetAndMute,0x8019C1D0,0x26
+asm/non_matchings/code/code_8019AF00/AudioOcarina_ResetAndReadInput.s,AudioOcarina_ResetAndReadInput,0x8019C268,0x1F
+asm/non_matchings/code/code_8019AF00/AudioOcarina_SetOcarinaDisableTimer.s,AudioOcarina_SetOcarinaDisableTimer,0x8019C2E4,0x7
+asm/non_matchings/code/code_8019AF00/AudioOcarina_SetInstrument.s,AudioOcarina_SetInstrument,0x8019C300,0x26
+asm/non_matchings/code/code_8019AF00/AudioOcarina_SetPlaybackSong.s,AudioOcarina_SetPlaybackSong,0x8019C398,0x82
+asm/non_matchings/code/code_8019AF00/AudioOcarina_PlaybackSong.s,AudioOcarina_PlaybackSong,0x8019C5A0,0xCE
+asm/non_matchings/code/code_8019AF00/AudioOcarina_SetRecordingSong.s,AudioOcarina_SetRecordingSong,0x8019C8D8,0x10C
+asm/non_matchings/code/code_8019AF00/AudioOcarina_SetRecordingState.s,AudioOcarina_SetRecordingState,0x8019CD08,0x4B
+asm/non_matchings/code/code_8019AF00/AudioOcarina_UpdateRecordingStaff.s,AudioOcarina_UpdateRecordingStaff,0x8019CE34,0xE
+asm/non_matchings/code/code_8019AF00/AudioOcarina_UpdatePlayingStaff.s,AudioOcarina_UpdatePlayingStaff,0x8019CE6C,0x14
+asm/non_matchings/code/code_8019AF00/AudioOcarina_UpdatePlaybackStaff.s,AudioOcarina_UpdatePlaybackStaff,0x8019CEBC,0x2C
+asm/non_matchings/code/code_8019AF00/AudioOcarina_GetRecordingStaff.s,AudioOcarina_GetRecordingStaff,0x8019CF6C,0x3
+asm/non_matchings/code/code_8019AF00/AudioOcarina_GetPlayingStaff.s,AudioOcarina_GetPlayingStaff,0x8019CF78,0x9
 asm/non_matchings/code/code_8019AF00/AudioOcarina_GetPlaybackStaff.s,AudioOcarina_GetPlaybackStaff,0x8019CF9C,0x3
-asm/non_matchings/code/code_8019AF00/func_8019CFA8.s,func_8019CFA8,0x8019CFA8,0x63
+asm/non_matchings/code/code_8019AF00/AudioOcarina_RecordSong.s,AudioOcarina_RecordSong,0x8019CFA8,0x63
 asm/non_matchings/code/code_8019AF00/AudioOcarina_TerminaWallValidateNotes.s,AudioOcarina_TerminaWallValidateNotes,0x8019D134,0x4E
 asm/non_matchings/code/code_8019AF00/AudioOcarina_TerminaWallGenerateNotes.s,AudioOcarina_TerminaWallGenerateNotes,0x8019D26C,0x87
-asm/non_matchings/code/code_8019AF00/AudioOcarina_MemoryGameSetNumNotes.s,AudioOcarina_MemoryGameSetNumNotes,0x8019D488,0x1C
-asm/non_matchings/code/code_8019AF00/AudioOcarina_MemoryGameGenerateNotes.s,AudioOcarina_MemoryGameGenerateNotes,0x8019D4F8,0x42
-asm/non_matchings/code/code_8019AF00/func_8019D600.s,func_8019D600,0x8019D600,0x56
-asm/non_matchings/code/code_8019AF00/func_8019D758.s,func_8019D758,0x8019D758,0x43
-asm/non_matchings/code/code_8019AF00/func_8019D864.s,func_8019D864,0x8019D864,0x14
-asm/non_matchings/code/code_8019AF00/func_8019D8B4.s,func_8019D8B4,0x8019D8B4,0xC
-asm/non_matchings/code/code_8019AF00/func_8019D8E4.s,func_8019D8E4,0x8019D8E4,0x191
-asm/non_matchings/code/code_8019AF00/func_8019DF28.s,func_8019DF28,0x8019DF28,0xF
-asm/non_matchings/code/code_8019AF00/func_8019DF64.s,func_8019DF64,0x8019DF64,0x25
+asm/non_matchings/code/code_8019AF00/AudioOcarina_MemoryGameInit.s,AudioOcarina_MemoryGameInit,0x8019D488,0x1C
+asm/non_matchings/code/code_8019AF00/AudioOcarina_MemoryGameNextNote.s,AudioOcarina_MemoryGameNextNote,0x8019D4F8,0x42
+asm/non_matchings/code/code_8019AF00/AudioOcarina_Update.s,AudioOcarina_Update,0x8019D600,0x56
+asm/non_matchings/code/code_8019AF00/AudioOcarina_PlayLongScarecrowAfterCredits.s,AudioOcarina_PlayLongScarecrowAfterCredits,0x8019D758,0x43
+asm/non_matchings/code/code_8019AF00/AudioOcarina_SetCustomSequence.s,AudioOcarina_SetCustomSequence,0x8019D864,0x14
+asm/non_matchings/code/code_8019AF00/AudioOcarina_PlayCustomSequence.s,AudioOcarina_PlayCustomSequence,0x8019D8B4,0xC
+asm/non_matchings/code/code_8019AF00/AudioOcarina_CreateCustomSequence.s,AudioOcarina_CreateCustomSequence,0x8019D8E4,0x191
+asm/non_matchings/code/code_8019AF00/AudioOcarina_ResetInstrument.s,AudioOcarina_ResetInstrument,0x8019DF28,0xF
+asm/non_matchings/code/code_8019AF00/AudioOcarina_ResetStaffs.s,AudioOcarina_ResetStaffs,0x8019DF64,0x25
 asm/non_matchings/code/code_8019AF00/func_8019DFF8.s,func_8019DFF8,0x8019DFF8,0x2
 asm/non_matchings/code/code_8019AF00/func_8019E000.s,func_8019E000,0x8019E000,0x3
 asm/non_matchings/code/code_8019AF00/func_8019E00C.s,func_8019E00C,0x8019E00C,0x2
@@ -3506,7 +3506,7 @@ asm/non_matchings/code/code_8019AF00/func_801A429C.s,func_801A429C,0x801A429C,0x
 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/func_801A4348.s,func_801A4348,0x801A4348,0xE
-asm/non_matchings/code/code_8019AF00/func_801A4380.s,func_801A4380,0x801A4380,0x2A
+asm/non_matchings/code/code_8019AF00/Audio_SetSfxVolumeExceptSystemAndOcarinaBanks.s,Audio_SetSfxVolumeExceptSystemAndOcarinaBanks,0x801A4380,0x2A
 asm/non_matchings/code/code_8019AF00/func_801A4428.s,func_801A4428,0x801A4428,0x1F
 asm/non_matchings/code/code_8019AF00/Audio_PreNMI.s,Audio_PreNMI,0x801A44A4,0x8
 asm/non_matchings/code/code_8019AF00/func_801A44C4.s,func_801A44C4,0x801A44C4,0x4
@@ -3546,9 +3546,9 @@ asm/non_matchings/code/code_801A51F0/func_801A5680.s,func_801A5680,0x801A5680,0x
 asm/non_matchings/code/code_801A51F0/func_801A5808.s,func_801A5808,0x801A5808,0x82
 asm/non_matchings/code/code_801A51F0/func_801A5A10.s,func_801A5A10,0x801A5A10,0x3
 asm/non_matchings/code/code_801A51F0/func_801A5A1C.s,func_801A5A1C,0x801A5A1C,0x69
-asm/non_matchings/code/code_801A5BD0/func_801A5BD0.s,func_801A5BD0,0x801A5BD0,0x16
-asm/non_matchings/code/code_801A5BD0/func_801A5C28.s,func_801A5C28,0x801A5C28,0x19
-asm/non_matchings/code/code_801A5BD0/func_801A5C8C.s,func_801A5C8C,0x801A5C8C,0x1C
+asm/non_matchings/code/code_801A5BD0/Audio_SetSfxBanksMute.s,Audio_SetSfxBanksMute,0x801A5BD0,0x16
+asm/non_matchings/code/code_801A5BD0/Audio_SetFlagForBgmVolumeLow.s,Audio_SetFlagForBgmVolumeLow,0x801A5C28,0x19
+asm/non_matchings/code/code_801A5BD0/Audio_ClearFlagForBgmVolumeLow.s,Audio_ClearFlagForBgmVolumeLow,0x801A5C8C,0x1C
 asm/non_matchings/code/code_801A5BD0/Audio_PlaySfxGeneral.s,Audio_PlaySfxGeneral,0x801A5CFC,0x38
 asm/non_matchings/code/code_801A5BD0/func_801A5DDC.s,func_801A5DDC,0x801A5DDC,0x68
 asm/non_matchings/code/code_801A5BD0/func_801A5F7C.s,func_801A5F7C,0x801A5F7C,0x12D
@@ -3561,7 +3561,7 @@ asm/non_matchings/code/code_801A5BD0/func_801A7284.s,func_801A7284,0x801A7284,0x
 asm/non_matchings/code/code_801A5BD0/Audio_StopSfxByPos.s,Audio_StopSfxByPos,0x801A72CC,0x17
 asm/non_matchings/code/code_801A5BD0/func_801A7328.s,func_801A7328,0x801A7328,0x57
 asm/non_matchings/code/code_801A5BD0/func_801A7484.s,func_801A7484,0x801A7484,0x59
-asm/non_matchings/code/code_801A5BD0/func_801A75E8.s,func_801A75E8,0x801A75E8,0x4E
+asm/non_matchings/code/code_801A5BD0/Audio_StopSfxById.s,Audio_StopSfxById,0x801A75E8,0x4E
 asm/non_matchings/code/code_801A5BD0/func_801A7720.s,func_801A7720,0x801A7720,0x1D
 asm/non_matchings/code/code_801A5BD0/func_801A7794.s,func_801A7794,0x801A7794,0x25
 asm/non_matchings/code/code_801A5BD0/func_801A7828.s,func_801A7828,0x801A7828,0x15