z_sound_source OK (#353)

* z_sound_source OK

* Fix Pos

* Lib_PlaySfxByPos

* Change function names

* format

* Update names to match OoT

* cleanup from the merge

* Fix name

tools/actorfixer.py

@@ -79,12 +79,15 @@ animdict = {
     "func_800B8214": "Actor_GetWorld",
     "func_800B8248": "Actor_GetWorldPosShapeRot",
     "func_800BE22C": "Actor_ApplyDamage",
-    "func_800F0568": "Audio_PlaySoundAtPosition",
+    "Audio_PlaySoundAtPosition": "SoundSource_PlaySfxAtFixedWorldPos",
+    "func_800F0590": "SoundSource_PlaySfxEachFrameAtFixedWorldPos",
     "func_8016970C": "Play_CameraSetAtEye",
     "func_800BBA88": "Enemy_StartFinishingBlow",
     "ShrinkWindow_Step": "ShrinkWindow_Update",
     "ShrinkWindow_Fini": "ShrinkWindow_Destroy",
     "func_801A89A8": "Audio_QueueSeqCmd",
+    "func_8019F1C0": "Audio_PlaySfxAtPos",
+    "func_801A72CC": "Audio_StopSfxByPos",
     "SkelAnime_LodDrawLimb(": "SkelAnime_DrawLimbLod(",
     "SkelAnime_LodDraw(": "SkelAnime_DrawLod(",
     "SkelAnime_LodDrawLimbSV(": "SkelAnime_DrawFlexLimbLod(",

tools/disasm/files.txt

@@ -378,7 +378,7 @@
             0x800EA060 : "z_demo",
             0x800EE320 : "z_draw",
             0x800EFE60 : "z_eff_footmark",
-            0x800F0390 : "code_800F0390",
+            0x800F0390 : "z_sound_source",
             0x800F05C0 : "z_elf_message",
             0x800F07C0 : "z_en_hy",
             0x800F1250 : "z_face_reaction",

tools/disasm/functions.txt

@@ -1610,11 +1610,11 @@
     0x800EFF04:("EffFootmark_Add",),
     0x800F00BC:("EffFootmark_Update",),
     0x800F01C8:("EffFootmark_Draw",),
-    0x800F0390:("func_800F0390",),
-    0x800F03C0:("func_800F03C0",),
-    0x800F048C:("func_800F048C",),
-    0x800F0568:("Audio_PlaySoundAtPosition",),
-    0x800F0590:("func_800F0590",),
+    0x800F0390:("SoundSource_InitAll",),
+    0x800F03C0:("SoundSource_UpdateAll",),
+    0x800F048C:("SoundSource_Add",),
+    0x800F0568:("SoundSource_PlaySfxAtFixedWorldPos",),
+    0x800F0590:("SoundSource_PlaySfxEachFrameAtFixedWorldPos",),
     0x800F05C0:("ElfMessage_GetFirstCycleHint",),
     0x800F07C0:("EnHy_ChangeAnim",),
     0x800F0888:("EnHy_FindNearestDoor",),
@@ -1847,7 +1847,7 @@
     0x8010007C:("Color_RGBA8_Copy",),
     0x801000A4:("func_801000A4",),
     0x801000CC:("func_801000CC",),
-    0x801000F4:("func_801000F4",),
+    0x801000F4:("Lib_PlaySfxAtPos",),
     0x8010011C:("Lib_Vec3f_TranslateAndRotateY",),
     0x801001B8:("Lib_LerpRGB",),
     0x80100448:("Math_Vec3f_StepTo",),
@@ -3870,7 +3870,7 @@
     0x8019F0C8:("play_sound",),
     0x8019F128:("func_8019F128",),
     0x8019F170:("func_8019F170",),
-    0x8019F1C0:("func_8019F1C0",),
+    0x8019F1C0:("Audio_PlaySfxAtPos",),
     0x8019F208:("func_8019F208",),
     0x8019F230:("func_8019F230",),
     0x8019F258:("func_8019F258",),
@@ -4042,7 +4042,7 @@
     0x801A7084:("func_801A7084",),
     0x801A7168:("func_801A7168",),
     0x801A7284:("func_801A7284",),
-    0x801A72CC:("func_801A72CC",),
+    0x801A72CC:("Audio_StopSfxByPos",),
     0x801A7328:("func_801A7328",),
     0x801A7484:("func_801A7484",),
     0x801A75E8:("func_801A75E8",),

tools/sizes/code_functions.csv

@@ -1124,11 +1124,11 @@ asm/non_matchings/code/z_eff_footmark/EffFootmark_Init.s,EffFootmark_Init,0x800E
 asm/non_matchings/code/z_eff_footmark/EffFootmark_Add.s,EffFootmark_Add,0x800EFF04,0x6E
 asm/non_matchings/code/z_eff_footmark/EffFootmark_Update.s,EffFootmark_Update,0x800F00BC,0x43
 asm/non_matchings/code/z_eff_footmark/EffFootmark_Draw.s,EffFootmark_Draw,0x800F01C8,0x72
-asm/non_matchings/code/code_800F0390/func_800F0390.s,func_800F0390,0x800F0390,0xC
-asm/non_matchings/code/code_800F0390/func_800F03C0.s,func_800F03C0,0x800F03C0,0x33
-asm/non_matchings/code/code_800F0390/func_800F048C.s,func_800F048C,0x800F048C,0x37
-asm/non_matchings/code/code_800F0390/Audio_PlaySoundAtPosition.s,Audio_PlaySoundAtPosition,0x800F0568,0xA
-asm/non_matchings/code/code_800F0390/func_800F0590.s,func_800F0590,0x800F0590,0xC
+asm/non_matchings/code/z_sound_source/SoundSource_InitAll.s,SoundSource_InitAll,0x800F0390,0xC
+asm/non_matchings/code/z_sound_source/SoundSource_UpdateAll.s,SoundSource_UpdateAll,0x800F03C0,0x33
+asm/non_matchings/code/z_sound_source/SoundSource_Add.s,SoundSource_Add,0x800F048C,0x37
+asm/non_matchings/code/z_sound_source/SoundSource_PlaySfxAtFixedWorldPos.s,SoundSource_PlaySfxAtFixedWorldPos,0x800F0568,0xA
+asm/non_matchings/code/z_sound_source/SoundSource_PlaySfxEachFrameAtFixedWorldPos.s,SoundSource_PlaySfxEachFrameAtFixedWorldPos,0x800F0590,0xC
 asm/non_matchings/code/z_elf_message/func_800F05C0.s,func_800F05C0,0x800F05C0,0x80
 asm/non_matchings/code/code_800F07C0/func_800F07C0.s,func_800F07C0,0x800F07C0,0x32
 asm/non_matchings/code/code_800F07C0/func_800F0888.s,func_800F0888,0x800F0888,0x2F
@@ -1361,7 +1361,7 @@ asm/non_matchings/code/z_lib/Math_ApproachS.s,Math_ApproachS,0x800FFFD8,0x29
 asm/non_matchings/code/z_lib/Color_RGBA8_Copy.s,Color_RGBA8_Copy,0x8010007C,0xA
 asm/non_matchings/code/z_lib/func_801000A4.s,func_801000A4,0x801000A4,0xA
 asm/non_matchings/code/z_lib/func_801000CC.s,func_801000CC,0x801000CC,0xA
-asm/non_matchings/code/z_lib/func_801000F4.s,func_801000F4,0x801000F4,0xA
+asm/non_matchings/code/z_lib/Lib_PlaySfxAtPos.s,Lib_PlaySfxAtPos,0x801000F4,0xA
 asm/non_matchings/code/z_lib/Lib_Vec3f_TranslateAndRotateY.s,Lib_Vec3f_TranslateAndRotateY,0x8010011C,0x27
 asm/non_matchings/code/z_lib/Lib_LerpRGB.s,Lib_LerpRGB,0x801001B8,0xA4
 asm/non_matchings/code/z_lib/Math_Vec3f_StepTo.s,Math_Vec3f_StepTo,0x80100448,0x2D
@@ -3388,7 +3388,7 @@ asm/non_matchings/code/code_8019AF00/func_8019F05C.s,func_8019F05C,0x8019F05C,0x
 asm/non_matchings/code/code_8019AF00/play_sound.s,play_sound,0x8019F0C8,0x18
 asm/non_matchings/code/code_8019AF00/func_8019F128.s,func_8019F128,0x8019F128,0x12
 asm/non_matchings/code/code_8019AF00/func_8019F170.s,func_8019F170,0x8019F170,0x14
-asm/non_matchings/code/code_8019AF00/func_8019F1C0.s,func_8019F1C0,0x8019F1C0,0x12
+asm/non_matchings/code/code_8019AF00/Audio_PlaySfxAtPos.s,Audio_PlaySfxAtPos,0x8019F1C0,0x12
 asm/non_matchings/code/code_8019AF00/func_8019F208.s,func_8019F208,0x8019F208,0xA
 asm/non_matchings/code/code_8019AF00/func_8019F230.s,func_8019F230,0x8019F230,0xA
 asm/non_matchings/code/code_8019AF00/func_8019F258.s,func_8019F258,0x8019F258,0x2A
@@ -3560,7 +3560,7 @@ asm/non_matchings/code/code_801A5BD0/func_801A6D0C.s,func_801A6D0C,0x801A6D0C,0x
 asm/non_matchings/code/code_801A5BD0/func_801A7084.s,func_801A7084,0x801A7084,0x39
 asm/non_matchings/code/code_801A5BD0/func_801A7168.s,func_801A7168,0x801A7168,0x47
 asm/non_matchings/code/code_801A5BD0/func_801A7284.s,func_801A7284,0x801A7284,0x12
-asm/non_matchings/code/code_801A5BD0/func_801A72CC.s,func_801A72CC,0x801A72CC,0x17
+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