merge master

tools/disasm/functions.txt

@@ -811,7 +811,7 @@
     0x800B9084:("func_800B9084",),
     0x800B9098:("func_800B9098",),
     0x800B90AC:("func_800B90AC",),
-    0x800B90F4:("func_800B90F4",),
+    0x800B90F4:("Actor_DeactivateLens",),
     0x800B9120:("func_800B9120",),
     0x800B9170:("Actor_InitContext",),
     0x800B9334:("Actor_SpawnSetupActors",),
@@ -821,8 +821,8 @@
     0x800B9D1C:("func_800B9D1C",),
     0x800B9E3C:("Actor_DrawAllSetup",),
     0x800B9E4C:("Actor_RecordUndrawnActor",),
-    0x800B9E84:("func_800B9E84",),
-    0x800B9EF4:("func_800B9EF4",),
+    0x800B9E84:("Actor_DrawLensOverlay",),
+    0x800B9EF4:("Actor_DrawLensActors",),
     0x800BA2D8:("func_800BA2D8",),
     0x800BA2FC:("func_800BA2FC",),
     0x800BA42C:("Actor_DrawAll",),
@@ -2134,13 +2134,13 @@
     0x801159C0:("Health_GiveHearts",),
     0x801159EC:("Rupees_ChangeBy",),
     0x80115A14:("Inventory_ChangeAmmo",),
-    0x80115D14:("Parameter_AddMagic",),
-    0x80115D5C:("func_80115D5C",),
-    0x80115DB4:("func_80115DB4",),
-    0x80116088:("func_80116088",),
-    0x80116114:("func_80116114",),
-    0x80116348:("func_80116348",),
-    0x80116918:("func_80116918",),
+    0x80115D14:("Magic_Add",),
+    0x80115D5C:("Magic_Reset",),
+    0x80115DB4:("Magic_Consume",),
+    0x80116088:("Magic_UpdateAddRequest",),
+    0x80116114:("Magic_FlashMeterBorder",),
+    0x80116348:("Magic_Update",),
+    0x80116918:("Magic_DrawMeter",),
     0x80116FD8:("func_80116FD8",),
     0x801170B8:("func_801170B8",),
     0x80117100:("func_80117100",),
@@ -3116,10 +3116,10 @@
     0x80172ED0:("AudioMgr_ThreadEntry",),
     0x80173048:("AudioMgr_Unlock",),
     0x80173074:("AudioMgr_Init",),
-    0x80173130:("TitleSetup_GameStateResetContext",),
-    0x801732DC:("TitleSetup_InitImpl",),
-    0x8017332C:("TitleSetup_Destroy",),
-    0x80173338:("TitleSetup_Init",),
+    0x80173130:("Setup_SetRegs",),
+    0x801732DC:("Setup_InitImpl",),
+    0x8017332C:("Setup_Destroy",),
+    0x80173338:("Setup_Init",),
     0x80173360:("Game_UpdateFramerateVariables",),
     0x801733A8:("Game_SetFramerateDivisor",),
     0x801733DC:("GameState_SetFBFilter",),
@@ -3134,8 +3134,8 @@
     0x80173880:("GameState_Realloc",),
     0x80173950:("GameState_Init",),
     0x80173A50:("GameState_Destroy",),
-    0x80173B00:("GameState_GetNextStateInit",),
-    0x80173B0C:("GameState_GetNextStateSize",),
+    0x80173B00:("GameState_GetInit",),
+    0x80173B0C:("GameState_GetSize",),
     0x80173B18:("GameState_IsRunning",),
     0x80173B24:("GameState_GetArenaSize",),
     0x80173B48:("func_80173B48",),
@@ -3546,8 +3546,8 @@
     0x8018A808:("func_8018A808",),
     0x8018ACC4:("func_8018ACC4",),
     0x8018AE34:("func_8018AE34",),
-    0x8018B0F0:("func_8018B0F0",),
-    0x8018B10C:("func_8018B10C",),
+    0x8018B0F0:("AudioHeap_CalculateAdsrDecay",),
+    0x8018B10C:("AudioHeap_InitAdsrDecayTable",),
     0x8018B250:("AudioHeap_ResetLoadStatus",),
     0x8018B318:("AudioHeap_DiscardFont",),
     0x8018B3FC:("AudioHeap_ReleaseNotesForFont",),
@@ -3560,16 +3560,16 @@
     0x8018B640:("AudioHeap_AllocZeroed",),
     0x8018B69C:("AudioHeap_TestAlloc",),
     0x8018B6E8:("AudioHeap_Alloc",),
-    0x8018B740:("AudioHeap_AllocPoolInit",),
-    0x8018B768:("AudioHeap_ClearPersistentCache",),
-    0x8018B77C:("AudioHeap_ClearTemporaryCache",),
+    0x8018B740:("AudioHeap_InitPool",),
+    0x8018B768:("AudioHeap_InitPersistentCache",),
+    0x8018B77C:("AudioHeap_InitTemporaryCache",),
     0x8018B7AC:("AudioHeap_ResetPool",),
-    0x8018B7BC:("AudioHeap_PopCache",),
+    0x8018B7BC:("AudioHeap_PopPersistentCache",),
     0x8018B8FC:("AudioHeap_InitMainPool",),
     0x8018B95C:("AudioHeap_InitSessionPool",),
     0x8018B9E0:("AudioHeap_InitCachePool",),
-    0x8018BA64:("AudioHeap_InitPersistentCache",),
-    0x8018BB28:("AudioHeap_InitTemporaryCache",),
+    0x8018BA64:("AudioHeap_InitPersistentPoolsAndCaches",),
+    0x8018BB28:("AudioHeap_InitTemporaryPoolsAndCaches",),
     0x8018BBEC:("AudioHeap_AllocCached",),
     0x8018C380:("AudioHeap_SearchCaches",),
     0x8018C3D8:("AudioHeap_SearchRegularCaches",),
@@ -3645,7 +3645,7 @@
     0x80190B08:("AudioLoad_ProcessLoads",),
     0x80190B38:("AudioLoad_SetDmaHandler",),
     0x80190B44:("AudioLoad_SetUnusedHandler",),
-    0x80190B50:("AudioLoad_InitSoundFontMeta",),
+    0x80190B50:("AudioLoad_InitSoundFont",),
     0x80190BB0:("AudioLoad_Init",),
     0x80190F50:("AudioLoad_InitSlowLoads",),
     0x80190F64:("AudioLoad_SlowLoadSample",),
@@ -3731,10 +3731,10 @@
     0x80194E60:("AudioPlayback_NoteInit",),
     0x80194F20:("AudioPlayback_NoteDisable",),
     0x80194F84:("AudioPlayback_ProcessNotes",),
-    0x801954CC:("AudioPlayback_InstrumentGetSound",),
+    0x801954CC:("AudioPlayback_GetInstrumentTunedSample",),
     0x80195508:("AudioPlayback_GetInstrumentInner",),
     0x801955DC:("AudioPlayback_GetDrum",),
-    0x801956C0:("AudioPlayback_GetSfx",),
+    0x801956C0:("AudioPlayback_GetSoundEffect",),
     0x801957B4:("AudioPlayback_SetFontInstrument",),
     0x801958F8:("AudioPlayback_SeqLayerDecayRelease",),
     0x80195C40:("AudioPlayback_SeqLayerNoteDecay",),
@@ -4083,13 +4083,13 @@
     0x801AA624:("GameOver_FadeLights",),
     0x801AA68C:("GameOver_Update",),
     0x801AAAA0:("func_801AAAA0",),
-    0x80800000:("Title_UpdateCounters",),
-    0x8080009C:("Title_RenderView",),
-    0x80800134:("Title_Draw",),
-    0x8080066C:("Title_Main",),
-    0x8080071C:("Title_Destroy",),
-    0x8080074C:("Title_Init",),
-    0x80800910:("MapSelect_LoadTitle",),
+    0x80800000:("ConsoleLogo_UpdateCounters",),
+    0x8080009C:("ConsoleLogo_RenderView",),
+    0x80800134:("ConsoleLogo_Draw",),
+    0x8080066C:("ConsoleLogo_Main",),
+    0x8080071C:("ConsoleLogo_Destroy",),
+    0x8080074C:("ConsoleLogo_Init",),
+    0x80800910:("MapSelect_LoadConsoleLogo",),
     0x80800930:("MapSelect_LoadGame",),
     0x80800A44:("MapSelect_UpdateMenu",),
     0x808013B8:("MapSelect_PrintMenu",),
@@ -4102,11 +4102,11 @@
     0x80801AFC:("MapSelect_Main",),
     0x80801B28:("MapSelect_Destroy",),
     0x80801B4C:("MapSelect_Init",),
-    0x80803DF0:("Opening_SetupForTitleCutscene",),
+    0x80803DF0:("TitleSetup_SetupTitleScreen",),
     0x80803EA0:("func_80803EA0",),
-    0x80803EC0:("Opening_Main",),
-    0x80803F0C:("Opening_Destroy",),
-    0x80803F30:("Opening_Init",),
+    0x80803EC0:("TitleSetup_Main",),
+    0x80803F0C:("TitleSetup_Destroy",),
+    0x80803F30:("TitleSetup_Init",),
     0x80804010:("func_80804010",),
     0x808041A0:("func_808041A0",),
     0x80804654:("func_80804654",),
@@ -4152,11 +4152,11 @@
     0x8080A708:("func_8080A708",),
     0x8080BBFC:("func_8080BBFC",),
     0x8080BC20:("func_8080BC20",),
-    0x8080BC44:("FileChoose_nop8080bc44",),
-    0x8080BC4C:("FileChoose_nop8080BC4C",),
+    0x8080BC44:("FileSelect_nop8080bc44",),
+    0x8080BC4C:("FileSelect_nop8080BC4C",),
     0x8080BC58:("func_8080BC58",),
     0x8080BDAC:("func_8080BDAC",),
-    0x8080BDDC:("FileChoose_RenderView",),
+    0x8080BDDC:("FileSelect_RenderView",),
     0x8080BE60:("func_8080BE60",),
     0x8080C040:("func_8080C040",),
     0x8080C228:("func_8080C228",),
@@ -4185,18 +4185,18 @@
     0x80812D94:("func_80812D94",),
     0x80812E94:("func_80812E94",),
     0x80812ED0:("func_80812ED0",),
-    0x8081313C:("FileChoose_UpdateAndDrawSkybox",),
-    0x80813268:("FileChoose_Main",),
+    0x8081313C:("FileSelect_UpdateAndDrawSkybox",),
+    0x80813268:("FileSelect_Main",),
     0x80813908:("func_80813908",),
-    0x80813C74:("FileChoose_Destroy",),
-    0x80813C98:("FileChoose_Init",),
-    0x80814EB0:("Daytelop_Update",),
-    0x80814FE8:("Daytelop_Draw",),
-    0x808156B4:("Daytelop_Main",),
-    0x8081574C:("Daytelop_Destroy",),
-    0x80815770:("Daytelop_nop80815770",),
-    0x8081577C:("Daytelop_LoadGraphics",),
-    0x80815820:("Daytelop_Init",),
+    0x80813C74:("FileSelect_Destroy",),
+    0x80813C98:("FileSelect_Init",),
+    0x80814EB0:("DayTelop_Update",),
+    0x80814FE8:("DayTelop_Draw",),
+    0x808156B4:("DayTelop_Main",),
+    0x8081574C:("DayTelop_Destroy",),
+    0x80815770:("DayTelop_Noop",),
+    0x8081577C:("DayTelop_LoadGraphics",),
+    0x80815820:("DayTelop_Init",),
     0x808160A0:("func_808160A0",),
     0x80817B5C:("func_80817B5C",),
     0x80818904:("func_80818904",),
@@ -4217,7 +4217,7 @@
     0x8081FF80:("func_8081FF80",),
     0x808204AC:("func_808204AC",),
     0x80820FA4:("func_80820FA4",),
-    0x80821730:("func_80821730",),
+    0x80821730:("KaleidoScope_UpdatePrompt",),
     0x80821900:("func_80821900",),
     0x8082192C:("func_8082192C",),
     0x80821958:("func_80821958",),
@@ -5621,25 +5621,25 @@
     0x8089F2C4:("func_8089F2C4",),
     0x8089F380:("EnViewer_Update",),
     0x8089F3C8:("EnViewer_Draw",),
-    0x8089F4E0:("func_8089F4E0",),
+    0x8089F4E0:("EnBubble_SetDimensions",),
     0x8089F59C:("func_8089F59C",),
     0x8089F5D0:("func_8089F5D0",),
-    0x8089F5F4:("func_8089F5F4",),
-    0x8089F660:("func_8089F660",),
+    0x8089F5F4:("EnBubble_DamagePlayer",),
+    0x8089F660:("EnBubble_Explosion",),
     0x8089F8BC:("func_8089F8BC",),
     0x8089F908:("func_8089F908",),
-    0x8089F95C:("func_8089F95C",),
-    0x8089F9E4:("func_8089F9E4",),
-    0x8089FA54:("func_8089FA54",),
+    0x8089F95C:("EnBubble_Vec3fNormalizedReflect",),
+    0x8089F9E4:("EnBubble_Vec3fNormalize",),
+    0x8089FA54:("EnBubble_Fly",),
     0x8089FF30:("func_8089FF30",),
-    0x8089FFCC:("func_8089FFCC",),
+    0x8089FFCC:("EnBubble_IsPopped",),
     0x808A005C:("func_808A005C",),
     0x808A0170:("EnBubble_Init",),
     0x808A0270:("EnBubble_Destroy",),
-    0x808A029C:("func_808A029C",),
-    0x808A0350:("func_808A0350",),
-    0x808A03A0:("func_808A03A0",),
-    0x808A03E8:("func_808A03E8",),
+    0x808A029C:("EnBubble_Wait",),
+    0x808A0350:("EnBubble_Pop",),
+    0x808A03A0:("EnBubble_Disappear",),
+    0x808A03E8:("EnBubble_Regrow",),
     0x808A0458:("EnBubble_Update",),
     0x808A04D4:("EnBubble_Draw",),
     0x808A08F0:("DoorShutter_SetupAction",),
@@ -7955,8 +7955,8 @@
     0x80968CB8:("func_80968CB8",),
     0x80968DD0:("func_80968DD0",),
     0x80968E38:("func_80968E38",),
-    0x80968F48:("func_80968F48",),
-    0x809691B8:("func_809691B8",),
+    0x80968F48:("EnJs_GetRemainingMasks",),
+    0x809691B8:("EnJs_TakeMask",),
     0x809692A8:("func_809692A8",),
     0x8096933C:("func_8096933C",),
     0x80969400:("func_80969400",),
@@ -8057,9 +8057,9 @@
     0x80972680:("OceffSpot_SetupAction",),
     0x8097268C:("OceffSpot_Init",),
     0x809727EC:("OceffSpot_Destroy",),
-    0x80972844:("func_80972844",),
-    0x809728F8:("func_809728F8",),
-    0x80972934:("func_80972934",),
+    0x80972844:("OceffSpot_End",),
+    0x809728F8:("OceffSpot_Wait",),
+    0x80972934:("OceffSpot_GrowCylinder",),
     0x80972998:("OceffSpot_Update",),
     0x80972C54:("OceffSpot_Draw",),
     0x80973550:("EnTorch_Init",),
@@ -8129,16 +8129,16 @@
     0x809765A0:("OceffWipe_Draw",),
     0x80977210:("EffectSsDust_Init",),
     0x80977394:("EffectSsDust_Draw",),
-    0x809776BC:("func_809776BC",),
-    0x809777B4:("func_809777B4",),
+    0x809776BC:("EffectSsDust_Update",),
+    0x809777B4:("EffectSsDust_UpdateFire",),
     0x80977A00:("EffectSsKirakira_Init",),
     0x80977B5C:("EffectSsKirakira_Draw",),
     0x80977DB4:("func_80977DB4",),
     0x80977E6C:("func_80977E6C",),
     0x80977F28:("func_80977F28",),
     0x80978070:("EffectSsBomb2_Init",),
-    0x80978138:("func_80978138",),
-    0x80978304:("func_80978304",),
+    0x80978138:("EffectSsBomb2_DrawFade",),
+    0x80978304:("EffectSsBomb2_DrawLayered",),
     0x80978628:("EffectSsBomb2_Update",),
     0x809788D0:("EffectSsBlast_Init",),
     0x809789FC:("EffectSsBlast_Draw",),
@@ -8147,7 +8147,7 @@
     0x80978D70:("EffectSsGSpk_Draw",),
     0x80978F40:("EffectSsGSpk_Update",),
     0x80979068:("EffectSsGSpk_UpdateNoAccel",),
-    0x809791B0:("func_809791B0",),
+    0x809791B0:("EffectSsDFire_CheckForObject",),
     0x80979228:("EffectSsDFire_Init",),
     0x8097930C:("EffectSsDFire_Draw",),
     0x809794D4:("EffectSsDFire_Update",),
@@ -11270,7 +11270,7 @@
     0x80A8BFE0:("EnTrt_GetMushroom",),
     0x80A8C168:("EnTrt_PayForMushroom",),
     0x80A8C1E8:("EnTrt_Goodbye",),
-    0x80A8C288:("EnTrt_SetupTryToGiveRedPotion",),
+    0x80A8C288:("EnTrt_StartRedPotionConversation",),
     0x80A8C488:("EnTrt_GiveRedPotionForKoume",),
     0x80A8C564:("EnTrt_GivenRedPotionForKoume",),
     0x80A8C64C:("EnTrt_EndConversation",),
@@ -11327,8 +11327,8 @@
     0x80A8F7AC:("EnTrt_Init",),
     0x80A8F7E8:("EnTrt_Destroy",),
     0x80A8F828:("EnTrt_Update",),
-    0x80A8F8C4:("EnTrt_UpdateHeadYawAndPitch",),
-    0x80A8FA00:("EnTrt_UpdateHeadPosAndRot",),
+    0x80A8F8C4:("EnTrt_TrackPlayer",),
+    0x80A8FA00:("EnTrt_UpdateLimb",),
     0x80A8FB34:("EnTrt_OverrideLimbDraw",),
     0x80A8FBB4:("EnTrt_PostLimbDraw",),
     0x80A8FC64:("EnTrt_TransformLimbDraw",),
@@ -11956,7 +11956,7 @@
     0x80AC5154:("TransitionTriforce_Update",),
     0x80AC5268:("TransitionTriforce_SetColor",),
     0x80AC5274:("TransitionTriforce_SetType",),
-    0x80AC5280:("func_80AC5280",),
+    0x80AC5280:("TransitionTriforce_SetState",),
     0x80AC528C:("TransitionTriforce_Draw",),
     0x80AC559C:("TransitionTriforce_IsDone",),
     0x80AC57B0:("TransitionWipe1_Start",),
@@ -12163,7 +12163,7 @@
     0x80AD3054:("BgCtowerGear_UpdateOrgan",),
     0x80AD3124:("BgCtowerGear_Draw",),
     0x80AD3164:("BgCtowerGear_DrawOrgan",),
-    0x80AD3380:("func_80AD3380",),
+    0x80AD3380:("EnTrt2_ChangeAnim",),
     0x80AD341C:("func_80AD341C",),
     0x80AD349C:("func_80AD349C",),
     0x80AD3530:("func_80AD3530",),
@@ -14230,15 +14230,15 @@
     0x80B64DFC:("func_80B64DFC",),
     0x80B654C0:("ObjKendoKanban_Init",),
     0x80B65840:("ObjKendoKanban_Destroy",),
-    0x80B65880:("func_80B65880",),
-    0x80B65894:("func_80B65894",),
-    0x80B658A4:("func_80B658A4",),
-    0x80B65CE0:("func_80B65CE0",),
-    0x80B65D54:("func_80B65D54",),
-    0x80B65D68:("func_80B65D68",),
-    0x80B65DA8:("func_80B65DA8",),
-    0x80B6618C:("func_80B6618C",),
-    0x80B66304:("func_80B66304",),
+    0x80B65880:("ObjKendoKanban_SetupDoNothing",),
+    0x80B65894:("ObjKendoKanban_DoNothing",),
+    0x80B658A4:("ObjKendoKanban_SetupTumble",),
+    0x80B65CE0:("ObjKendoKanban_Tumble",),
+    0x80B65D54:("ObjKendoKanban_SetupSettled",),
+    0x80B65D68:("ObjKendoKanban_Settled",),
+    0x80B65DA8:("ObjKendoKanban_HandlePhysics",),
+    0x80B6618C:("ObjKendoKanban_IsPlayerOnTop",),
+    0x80B66304:("ObjKendoKanban_UpdateCollision",),
     0x80B66418:("ObjKendoKanban_Update",),
     0x80B66454:("ObjKendoKanban_Draw",),
     0x80B66A20:("ObjHariko_Init",),
@@ -16430,8 +16430,8 @@
     0x80BFC9E4:("EnRz_Update",),
     0x80BFCAD0:("func_80BFCAD0",),
     0x80BFCB3C:("EnRz_Draw",),
-    0x80BFCFA0:("func_80BFCFA0",),
-    0x80BFCFB8:("func_80BFCFB8",),
+    0x80BFCFA0:("EnScopecoin_Spin",),
+    0x80BFCFB8:("EnScopecoin_CheckCollectible",),
     0x80BFD010:("EnScopecoin_Init",),
     0x80BFD148:("EnScopecoin_Destroy",),
     0x80BFD158:("EnScopecoin_Update",),

tools/disasm/variables.txt

@@ -377,12 +377,12 @@
     0x801ADEC0:("En_Item00_InitVars","ActorInit","",0x20),
     0x801ADEE0:("enItem00CylinderInit","ColliderCylinderInit","",0x2c),
     0x801ADF0C:("enItem00InitVars","ActorInitVar","[1]",0x4),
-    0x801ADF10:("D_801ADF10","ColorRGBA8","",0x4),
-    0x801ADF14:("D_801ADF14","ColorRGBA8","",0x4),
-    0x801ADF18:("D_801ADF18","Vec3f","",0xc),
-    0x801ADF24:("D_801ADF24","Vec3f","",0xc),
-    0x801ADF30:("D_801ADF30","UNK_PTR","[5]",0x14),
-    0x801ADF44:("D_801ADF44","UNK_PTR","[12]",0x30),
+    0x801ADF10:("sEffectPrimColor","ColorRGBA8","",0x4),
+    0x801ADF14:("sEffectEnvColor","ColorRGBA8","",0x4),
+    0x801ADF18:("sEffectVelocity","Vec3f","",0xc),
+    0x801ADF24:("sEffectAccel","Vec3f","",0xc),
+    0x801ADF30:("sRupeeTextures","UNK_PTR","[5]",0x14),
+    0x801ADF44:("sItemDropTextures","UNK_PTR","[12]",0x30),
     0x801ADF74:("sDropTable","u8","[272]",0x110),
     0x801AE084:("sDropTableAmounts","u8","[272]",0x110),
     0x801AE194:("D_801AE194","s32","[32]",0x80),
@@ -1069,11 +1069,11 @@
     0x801BF890:("sMinigameScoreDigits","UNK_TYPE2","",0x2),
     0x801BF898:("sCUpInvisible","UNK_TYPE2","",0x2),
     0x801BF89C:("sCUpTimer","UNK_TYPE2","",0x2),
-    0x801BF8A0:("sMagicBarOutlinePrimRed","UNK_TYPE2","",0x2),
-    0x801BF8A4:("sMagicBarOutlinePrimGreen","UNK_TYPE2","",0x2),
-    0x801BF8A8:("sMagicBarOutlinePrimBlue","UNK_TYPE2","",0x2),
-    0x801BF8AC:("D_801BF8AC","UNK_TYPE2","",0x2),
-    0x801BF8B0:("D_801BF8B0","UNK_TYPE2","",0x2),
+    0x801BF8A0:("sMagicMeterOutlinePrimRed","UNK_TYPE2","",0x2),
+    0x801BF8A4:("sMagicMeterOutlinePrimGreen","UNK_TYPE2","",0x2),
+    0x801BF8A8:("sMagicMeterOutlinePrimBlue","UNK_TYPE2","",0x2),
+    0x801BF8AC:("sMagicBorderRatio","UNK_TYPE2","",0x2),
+    0x801BF8B0:("sMagicBorderStep","UNK_TYPE2","",0x2),
     0x801BF8DC:("D_801BF8DC","UNK_TYPE2","",0x2),
     0x801BF8E0:("D_801BF8E0","UNK_TYPE2","",0x2),
     0x801BF8E4:("D_801BF8E4","UNK_TYPE2","",0x2),
@@ -3434,7 +3434,7 @@
     0x801DE868:("D_801DE868","f32","",0x4),
     0x801DE86C:("jtbl_801DE86C","UNK_PTR","",0x4),
     0x801DE884:("D_801DE884","f32","",0x4),
-    0x801DE890:("D_801DE890","UNK_TYPE1","",0x1),
+    0x801DE890:("gCircleTex","UNK_TYPE1","",0x1),
     0x801DF090:("D_801DF090","f32","",0x4),
     0x801DF094:("D_801DF094","f32","",0x4),
     0x801DF0A0:("D_801DF0A0","f32","",0x4),
@@ -3814,7 +3814,7 @@
     0x801E10B0:("jtbl_801E10B0","UNK_PTR","",0x4),
     0x801E10C4:("jtbl_801E10C4","UNK_PTR","",0x4),
     0x801E1100:("gAudioTatumInit","s16","[2]",0x4),
-    0x801E1104:("gAudioContextInitSizes","AudioContextInitSizes","",0xC),
+    0x801E1104:("gAudioHeapInitSizes","AudioHeapInitSizes","",0xC),
     0x801E1110:("sGameOverTimer","UNK_TYPE2","",0x2),
     0x801E1120:("jtbl_801E1120","UNK_PTR","",0x4),
     0x801E1180:("gSoundFontTable","UNK_TYPE2","",0x2),
@@ -4734,9 +4734,9 @@
     0x8082B6D4:("D_8082B6D4","UNK_TYPE1","",0x1),
     0x8082B6DC:("D_8082B6DC","UNK_TYPE1","",0x1),
     0x8082B6E4:("D_8082B6E4","UNK_TYPE2","",0x2),
-    0x8082B6F0:("D_8082B6F0","UNK_TYPE1","",0x1),
-    0x8082B6F4:("D_8082B6F4","UNK_TYPE2","",0x2),
-    0x8082B6F8:("D_8082B6F8","UNK_TYPE2","",0x2),
+    0x8082B6F0:("sPromptAlphaTargets","UNK_TYPE1","",0x1),
+    0x8082B6F4:("sPromptAlphaTargetIndex","UNK_TYPE2","",0x2),
+    0x8082B6F8:("sPromptAlphaTimer","UNK_TYPE2","",0x2),
     0x8082B700:("D_8082B700","UNK_TYPE1","",0x1),
     0x8082B73C:("D_8082B73C","UNK_TYPE1","",0x1),
     0x8082B778:("D_8082B778","UNK_TYPE1","",0x1),
@@ -11090,10 +11090,10 @@
     0x80A297D0:("D_80A297D0","f32","",0x4),
     0x80A2B870:("D_80A2B870","UNK_TYPE1","",0x1),
     0x80A2B88C:("Bg_Dblue_Movebg_InitVars","UNK_TYPE1","",0x1),
-    0x80A2B8AC:("D_80A2B8AC","UNK_TYPE1","",0x1),
-    0x80A2B8DC:("D_80A2B8DC","UNK_TYPE1","",0x1),
-    0x80A2B90C:("D_80A2B90C","UNK_TYPE1","",0x1),
-    0x80A2B93C:("D_80A2B93C","UNK_TYPE1","",0x1),
+    0x80A2B8AC:("sOpaDLists","UNK_TYPE1","",0x1),
+    0x80A2B8DC:("sXluDLists","UNK_TYPE1","",0x1),
+    0x80A2B90C:("sColHeaders","UNK_TYPE1","",0x1),
+    0x80A2B93C:("sTexAnims","UNK_TYPE1","",0x1),
     0x80A2B96C:("D_80A2B96C","UNK_TYPE1","",0x1),
     0x80A2B974:("D_80A2B974","UNK_TYPE2","",0x2),
     0x80A2B978:("D_80A2B978","UNK_TYPE1","",0x1),
@@ -12339,7 +12339,7 @@
     0x80A8B188:("D_80A8B188","UNK_TYPE1","",0x1),
     0x80A8B250:("D_80A8B250","UNK_TYPE4","",0x4),
     0x80A8B25C:("D_80A8B25C","Color_RGBA8","[6]",0x18),
-    0x80A8B280:("D_80A8B280","UNK_TYPE1","",0x1),
+    0x80A8B280:("sDustTextures","UNK_TYPE1","",0x1),
     0x80A8B2A0:("D_80A8B2A0","UNK_TYPE1","",0x1),
     0x80A8B2CC:("D_80A8B2CC","UNK_TYPE1","",0x1),
     0x80A8B2D8:("sAnimationInfo","UNK_TYPE1","",0x1),
@@ -12442,8 +12442,8 @@
     0x80A9930C:("D_80A9930C","UNK_TYPE1","",0x1),
     0x80A993AC:("D_80A993AC","UNK_TYPE1","",0x1),
     0x80A993D0:("D_80A993D0","UNK_TYPE1","",0x1),
-    0x80A993F4:("D_80A993F4","UNK_TYPE1","",0x1),
-    0x80A99404:("D_80A99404","UNK_TYPE1","",0x1),
+    0x80A993F4:("sYoungerBrotherEyeTextures","UNK_TYPE1","",0x1),
+    0x80A99404:("sYoungerBrotherBeltTextures","UNK_TYPE1","",0x1),
     0x80A99410:("D_80A99410","UNK_TYPE1","",0x1),
     0x80A9941C:("D_80A9941C","UNK_TYPE1","",0x1),
     0x80A99428:("D_80A99428","UNK_TYPE1","",0x1),
@@ -12926,8 +12926,8 @@
     0x80AC4F60:("D_80AC4F60","f32","",0x4),
     0x80AC4F64:("D_80AC4F64","f32","",0x4),
     0x80AC5060:("D_80AC5060","UNK_TYPE1","",0x1),
-    0x80AC5630:("D_80AC5630","UNK_TYPE1","",0x1),
-    0x80AC5660:("D_80AC5660","UNK_TYPE1","",0x1),
+    0x80AC5630:("sTriforceWipeDL","UNK_TYPE1","",0x1),
+    0x80AC5660:("sTriforceWipeVtx","UNK_TYPE1","",0x1),
     0x80AC5700:("TransitionTriforce_InitVars","UNK_PTR","",0x4),
     0x80AC5730:("D_80AC5730","f32","",0x4),
     0x80AC5734:("D_80AC5734","f32","",0x4),
@@ -13328,8 +13328,8 @@
     0x80AF0050:("D_80AF0050","UNK_TYPE1","",0x1),
     0x80AF00F0:("Bg_Market_Step_InitVars","UNK_TYPE1","",0x1),
     0x80AF0110:("D_80AF0110","UNK_TYPE1","",0x1),
-    0x80AF0120:("D_80AF0120","UNK_TYPE1","",0x1),
-    0x80AF0128:("D_80AF0128","UNK_TYPE1","",0x1),
+    0x80AF0120:("sMarketDLs","UNK_TYPE1","",0x1),
+    0x80AF0128:("sBankAdvertisementsAndFakeDoorDLs","UNK_TYPE1","",0x1),
     0x80AF0720:("Obj_Lupygamelift_InitVars","UNK_TYPE1","",0x1),
     0x80AF0740:("D_80AF0740","UNK_TYPE1","",0x1),
     0x80AF0750:("D_80AF0750","f32","",0x4),
@@ -15082,7 +15082,7 @@
     0x80B82228:("D_80B82228","f32","",0x4),
     0x80B8222C:("D_80B8222C","f32","",0x4),
     0x80B83A00:("Bg_Dblue_Balance_InitVars","UNK_TYPE1","",0x1),
-    0x80B83A20:("D_80B83A20","UNK_TYPE4","",0x4),
+    0x80B83A20:("sTypeInfo","UNK_TYPE4","",0x4),
     0x80B83A74:("D_80B83A74","UNK_TYPE1","",0x1),
     0x80B83A90:("D_80B83A90","UNK_TYPE1","",0x1),
     0x80B83A92:("D_80B83A92","UNK_TYPE1","",0x1),
@@ -15288,9 +15288,9 @@
     0x80B96178:("D_80B96178","UNK_TYPE1","",0x1),
     0x80B963C0:("Obj_Jg_Gakki_InitVars","UNK_TYPE1","",0x1),
     0x80B96540:("Bg_Inibs_Movebg_InitVars","UNK_TYPE1","",0x1),
-    0x80B96560:("D_80B96560","UNK_TYPE1","",0x1),
-    0x80B96568:("D_80B96568","UNK_TYPE1","",0x1),
-    0x80B96570:("D_80B96570","UNK_TYPE1","",0x1),
+    0x80B96560:("sOpaDLists","UNK_TYPE1","",0x1),
+    0x80B96568:("sXluDLists","UNK_TYPE1","",0x1),
+    0x80B96570:("sSandTexAnims","UNK_TYPE1","",0x1),
     0x80B96578:("D_80B96578","UNK_TYPE1","",0x1),
     0x80B998C0:("En_Zot_InitVars","UNK_TYPE1","",0x1),
     0x80B998E0:("D_80B998E0","UNK_TYPE1","",0x1),
@@ -16250,7 +16250,7 @@
     0x80BFCD78:("D_80BFCD78","f32","",0x4),
     0x80BFCD7C:("D_80BFCD7C","f32","",0x4),
     0x80BFD260:("En_Scopecoin_InitVars","UNK_TYPE1","",0x1),
-    0x80BFD280:("D_80BFD280","UNK_TYPE1","",0x1),
+    0x80BFD280:("sRupeeTextures","UNK_TYPE1","",0x1),
     0x80BFDEA0:("D_80BFDEA0","UNK_TYPE1","",0x1),
     0x80BFDEB4:("D_80BFDEB4","UNK_TYPE1","",0x1),
     0x80BFDF28:("En_Bjt_InitVars","UNK_TYPE1","",0x1),

tools/namefixer.py

@@ -283,6 +283,7 @@ wordReplace = {
     "Actor_IsFacingPlayerAndWithinRange": "Actor_IsFacingAndNearPlayer",
     "func_800BC8B8": "Actor_DrawDoorLock",
     "func_800B86C8": "Actor_ChangeFocus",
+    "func_800B90F4": "Actor_DeactivateLens",
     "zelda_malloc": "ZeldaArena_Malloc",
     "zelda_mallocR": "ZeldaArena_MallocR",
     "zelda_realloc": "ZeldaArena_Realloc",
@@ -498,6 +499,9 @@ wordReplace = {
     "func_801159c0": "Health_GiveHearts",
     "func_801159EC": "Rupees_ChangeBy",
     "func_80115A14": "Inventory_ChangeAmmo",
+    "Parameter_AddMagic": "Magic_Add",
+    "func_80115D5C": "Magic_Reset",
+    "func_80115DB4": "Magic_Consume",
     "func_8013EC44": "Rumble_Override",
     "func_8013ECE0": "Rumble_Request",
     "func_8017D2FC": "Math3D_LineSegVsPlane",
@@ -648,8 +652,8 @@ wordReplace = {
     "gSaveContext.naviTimer": "gSaveContext.save.playerData.tatlTimer",
     "gSaveContext.tatlTimer": "gSaveContext.save.playerData.tatlTimer",
     "gSaveContext.rupees": "gSaveContext.save.playerData.rupees",
-    "gSaveContext.magicAcquired": "gSaveContext.save.playerData.magicAcquired",
-    "gSaveContext.doubleMagic": "gSaveContext.save.playerData.doubleMagic",
+    "gSaveContext.magicAcquired": "gSaveContext.save.playerData.isMagicAcquired",
+    "gSaveContext.doubleMagic": "gSaveContext.save.playerData.isDoubleMagicAcquired",
     "gSaveContext.doubleDefense": "gSaveContext.save.playerData.doubleDefense",
     "gSaveContext.playerName": "gSaveContext.save.playerData.playerName",
     "gSaveContext.inventory": "gSaveContext.save.inventory",
@@ -671,6 +675,11 @@ wordReplace = {
     "gSaveContext.unk_1016": "gSaveContext.jinxTimer",
     "gSaveContext.unk_3F58": "gSaveContext.sunsSongState",
     "gSaveContext.unk_48C8": "gSaveContext.dungeonIndex",
+    "gSaveContext.save.playerData.magicAcquired": "gSaveContext.save.playerData.isMagicAcquired",
+    "gSaveContext.save.playerDatadoubleMagic": "gSaveContext.save.playerData.isDoubleMagicAcquired",
+    "gSaveContext.unk_3F28": "gSaveContext.magicState",
+    "gSaveContext.unk_3F30": "gSaveContext.magicFillTarget",
+    "gSaveContext.unk_3F2C": "gSaveContext.magicFlag",
     "gSaveContext.save.entranceIndex": "gSaveContext.save.entrance",
 
     "player->unk_A87": "player->exchangeItemId",
@@ -698,12 +707,17 @@ wordReplace = {
     "globalCtx->envCtx.unk_DC": "play->envCtx.lightBlend",
     "globalCtx->interfaceCtx.unk_21E": "play->interfaceCtx.bButtonDoAction",
 
+    # "play->actorCtx.flags": "play->actorCtx.sceneFlags",
+    # "play->actorCtx.unk5": "play->actorCtx.flags",
     "play->msgCtx.unk11F04": "play->msgCtx.currentTextId",
     "play->msgCtx.unk11F10": "play->msgCtx.msgLength",
     "play->msgCtx.unk11F22": "play->msgCtx.msgMode",
     "play->msgCtx.unk12023": "play->msgCtx.stateTimer",
     "play->msgCtx.unk1202A": "play->msgCtx.ocarinaMode",
     "play->msgCtx.unk1202C": "play->msgCtx.ocarinaAction",
+    "play->msgCtx.unk11F04": "play->msgCtx.currentTextId",
+    "play->actorCtx.unk3": "play->actorCtx.lensActive",
+    "play->actorCtx.unk4": "play->actorCtx.lensMaskSize",
     "play->nextEntranceIndex": "play->nextEntrance",
 
     "play->sceneLoadFlag": "play->transitionTrigger",

tools/sizes/code_functions.csv

@@ -325,7 +325,7 @@ asm/non_matchings/code/z_actor/func_800B9038.s,func_800B9038,0x800B9038,0x13
 asm/non_matchings/code/z_actor/func_800B9084.s,func_800B9084,0x800B9084,0x5
 asm/non_matchings/code/z_actor/func_800B9098.s,func_800B9098,0x800B9098,0x5
 asm/non_matchings/code/z_actor/func_800B90AC.s,func_800B90AC,0x800B90AC,0x12
-asm/non_matchings/code/z_actor/func_800B90F4.s,func_800B90F4,0x800B90F4,0xB
+asm/non_matchings/code/z_actor/Actor_DeactivateLens.s,Actor_DeactivateLens,0x800B90F4,0xB
 asm/non_matchings/code/z_actor/func_800B9120.s,func_800B9120,0x800B9120,0x14
 asm/non_matchings/code/z_actor/Actor_InitContext.s,Actor_InitContext,0x800B9170,0x71
 asm/non_matchings/code/z_actor/Actor_SpawnSetupActors.s,Actor_SpawnSetupActors,0x800B9334,0x56
@@ -335,8 +335,8 @@ asm/non_matchings/code/z_actor/Actor_Draw.s,Actor_Draw,0x800B9A04,0xC6
 asm/non_matchings/code/z_actor/func_800B9D1C.s,func_800B9D1C,0x800B9D1C,0x48
 asm/non_matchings/code/z_actor/Actor_DrawAllSetup.s,Actor_DrawAllSetup,0x800B9E3C,0x4
 asm/non_matchings/code/z_actor/Actor_RecordUndrawnActor.s,Actor_RecordUndrawnActor,0x800B9E4C,0xE
-asm/non_matchings/code/z_actor/func_800B9E84.s,func_800B9E84,0x800B9E84,0x1C
-asm/non_matchings/code/z_actor/func_800B9EF4.s,func_800B9EF4,0x800B9EF4,0xF9
+asm/non_matchings/code/z_actor/Actor_DrawLensOverlay.s,Actor_DrawLensOverlay,0x800B9E84,0x1C
+asm/non_matchings/code/z_actor/Actor_DrawLensActors.s,Actor_DrawLensActors,0x800B9EF4,0xF9
 asm/non_matchings/code/z_actor/func_800BA2D8.s,func_800BA2D8,0x800BA2D8,0x9
 asm/non_matchings/code/z_actor/func_800BA2FC.s,func_800BA2FC,0x800BA2FC,0x4C
 asm/non_matchings/code/z_actor/Actor_DrawAll.s,Actor_DrawAll,0x800BA42C,0xB4
@@ -1648,13 +1648,13 @@ asm/non_matchings/code/z_parameter/Health_ChangeBy.s,Health_ChangeBy,0x80115908,
 asm/non_matchings/code/z_parameter/Health_GiveHearts.s,Health_GiveHearts,0x801159C0,0xB
 asm/non_matchings/code/z_parameter/Rupees_ChangeBy.s,Rupees_ChangeBy,0x801159EC,0xA
 asm/non_matchings/code/z_parameter/Inventory_ChangeAmmo.s,Inventory_ChangeAmmo,0x80115A14,0xC0
-asm/non_matchings/code/z_parameter/Parameter_AddMagic.s,Parameter_AddMagic,0x80115D14,0x12
-asm/non_matchings/code/z_parameter/func_80115D5C.s,func_80115D5C,0x80115D5C,0x16
-asm/non_matchings/code/z_parameter/func_80115DB4.s,func_80115DB4,0x80115DB4,0xB5
-asm/non_matchings/code/z_parameter/func_80116088.s,func_80116088,0x80116088,0x23
-asm/non_matchings/code/z_parameter/func_80116114.s,func_80116114,0x80116114,0x8D
-asm/non_matchings/code/z_parameter/func_80116348.s,func_80116348,0x80116348,0x174
-asm/non_matchings/code/z_parameter/func_80116918.s,func_80116918,0x80116918,0x1B0
+asm/non_matchings/code/z_parameter/Magic_Add.s,Magic_Add,0x80115D14,0x12
+asm/non_matchings/code/z_parameter/Magic_Reset.s,Magic_Reset,0x80115D5C,0x16
+asm/non_matchings/code/z_parameter/Magic_Consume.s,Magic_Consume,0x80115DB4,0xB5
+asm/non_matchings/code/z_parameter/Magic_UpdateAddRequest.s,Magic_UpdateAddRequest,0x80116088,0x23
+asm/non_matchings/code/z_parameter/Magic_FlashMeterBorder.s,Magic_FlashMeterBorder,0x80116114,0x8D
+asm/non_matchings/code/z_parameter/Magic_Update.s,Magic_Update,0x80116348,0x174
+asm/non_matchings/code/z_parameter/Magic_DrawMeter.s,Magic_DrawMeter,0x80116918,0x1B0
 asm/non_matchings/code/z_parameter/func_80116FD8.s,func_80116FD8,0x80116FD8,0x38
 asm/non_matchings/code/z_parameter/func_801170B8.s,func_801170B8,0x801170B8,0x12
 asm/non_matchings/code/z_parameter/func_80117100.s,func_80117100,0x80117100,0x248
@@ -2630,10 +2630,10 @@ asm/non_matchings/code/audioMgr/AudioMgr_HandlePRENMI.s,AudioMgr_HandlePRENMI,0x
 asm/non_matchings/code/audioMgr/AudioMgr_ThreadEntry.s,AudioMgr_ThreadEntry,0x80172ED0,0x5E
 asm/non_matchings/code/audioMgr/AudioMgr_Unlock.s,AudioMgr_Unlock,0x80173048,0xB
 asm/non_matchings/code/audioMgr/AudioMgr_Init.s,AudioMgr_Init,0x80173074,0x2F
-asm/non_matchings/code/title_setup/TitleSetup_GameStateResetContext.s,TitleSetup_GameStateResetContext,0x80173130,0x6B
-asm/non_matchings/code/title_setup/TitleSetup_InitImpl.s,TitleSetup_InitImpl,0x801732DC,0x14
-asm/non_matchings/code/title_setup/TitleSetup_Destroy.s,TitleSetup_Destroy,0x8017332C,0x3
-asm/non_matchings/code/title_setup/TitleSetup_Init.s,TitleSetup_Init,0x80173338,0xA
+asm/non_matchings/code/title_setup/Setup_SetRegs.s,Setup_SetRegs,0x80173130,0x6B
+asm/non_matchings/code/title_setup/Setup_InitImpl.s,Setup_InitImpl,0x801732DC,0x14
+asm/non_matchings/code/title_setup/Setup_Destroy.s,Setup_Destroy,0x8017332C,0x3
+asm/non_matchings/code/title_setup/Setup_Init.s,Setup_Init,0x80173338,0xA
 asm/non_matchings/code/game/Game_UpdateFramerateVariables.s,Game_UpdateFramerateVariables,0x80173360,0x12
 asm/non_matchings/code/game/Game_SetFramerateDivisor.s,Game_SetFramerateDivisor,0x801733A8,0xD
 asm/non_matchings/code/game/GameState_SetFBFilter.s,GameState_SetFBFilter,0x801733DC,0x56
@@ -2648,8 +2648,8 @@ asm/non_matchings/code/game/Game_InitHeap.s,Game_InitHeap,0x80173810,0x1C
 asm/non_matchings/code/game/Game_ResizeHeap.s,Game_ResizeHeap,0x80173880,0x34
 asm/non_matchings/code/game/GameState_Init.s,GameState_Init,0x80173950,0x40
 asm/non_matchings/code/game/GameState_Destroy.s,GameState_Destroy,0x80173A50,0x2C
-asm/non_matchings/code/game/GameState_GetNextStateInit.s,GameState_GetNextStateInit,0x80173B00,0x3
-asm/non_matchings/code/game/GameState_GetNextStateSize.s,GameState_GetNextStateSize,0x80173B0C,0x3
+asm/non_matchings/code/game/GameState_GetInit.s,GameState_GetInit,0x80173B00,0x3
+asm/non_matchings/code/game/GameState_GetSize.s,GameState_GetSize,0x80173B0C,0x3
 asm/non_matchings/code/game/GameState_IsRunning.s,GameState_IsRunning,0x80173B18,0x3
 asm/non_matchings/code/game/Game_GetHeapFreeSize.s,Game_GetHeapFreeSize,0x80173B24,0x9
 asm/non_matchings/code/game/func_80173B48.s,func_80173B48,0x80173B48,0x2A
@@ -3076,16 +3076,16 @@ asm/non_matchings/code/audio_heap/AudioHeap_AllocDmaMemoryZeroed.s,AudioHeap_All
 asm/non_matchings/code/audio_heap/AudioHeap_AllocZeroed.s,AudioHeap_AllocZeroed,0x8018B640,0x17
 asm/non_matchings/code/audio_heap/AudioHeap_TestAlloc.s,AudioHeap_TestAlloc,0x8018B69C,0x13
 asm/non_matchings/code/audio_heap/Audio_Alloc.s,Audio_Alloc,0x8018B6E8,0x16
-asm/non_matchings/code/audio_heap/AudioHeap_AllocPoolInit.s,AudioHeap_AllocPoolInit,0x8018B740,0xA
-asm/non_matchings/code/audio_heap/AudioHeap_ClearPersistentCache.s,AudioHeap_ClearPersistentCache,0x8018B768,0x5
-asm/non_matchings/code/audio_heap/AudioHeap_ClearTemporaryCache.s,AudioHeap_ClearTemporaryCache,0x8018B77C,0xC
+asm/non_matchings/code/audio_heap/AudioHeap_InitPool.s,AudioHeap_InitPool,0x8018B740,0xA
+asm/non_matchings/code/audio_heap/AudioHeap_InitPersistentCache.s,AudioHeap_InitPersistentCache,0x8018B768,0x5
+asm/non_matchings/code/audio_heap/AudioHeap_InitTemporaryCache.s,AudioHeap_InitTemporaryCache,0x8018B77C,0xC
 asm/non_matchings/code/audio_heap/AudioHeap_ResetPool.s,AudioHeap_ResetPool,0x8018B7AC,0x4
-asm/non_matchings/code/audio_heap/AudioHeap_PopCache.s,AudioHeap_PopCache,0x8018B7BC,0x50
+asm/non_matchings/code/audio_heap/AudioHeap_PopPersistentCache.s,AudioHeap_PopPersistentCache,0x8018B7BC,0x50
 asm/non_matchings/code/audio_heap/AudioHeap_InitMainPool.s,AudioHeap_InitMainPool,0x8018B8FC,0x18
 asm/non_matchings/code/audio_heap/AudioHeap_InitSessionPool.s,AudioHeap_InitSessionPool,0x8018B95C,0x21
 asm/non_matchings/code/audio_heap/AudioHeap_InitCachePool.s,AudioHeap_InitCachePool,0x8018B9E0,0x21
-asm/non_matchings/code/audio_heap/AudioHeap_InitPersistentCache.s,AudioHeap_InitPersistentCache,0x8018BA64,0x31
-asm/non_matchings/code/audio_heap/AudioHeap_InitTemporaryCache.s,AudioHeap_InitTemporaryCache,0x8018BB28,0x31
+asm/non_matchings/code/audio_heap/AudioHeap_InitPersistentPoolsAndCaches.s,AudioHeap_InitPersistentPoolsAndCaches,0x8018BA64,0x31
+asm/non_matchings/code/audio_heap/AudioHeap_InitTemporaryPoolsAndCaches.s,AudioHeap_InitTemporaryPoolsAndCaches,0x8018BB28,0x31
 asm/non_matchings/code/audio_heap/AudioHeap_AllocCached.s,AudioHeap_AllocCached,0x8018BBEC,0x1E5
 asm/non_matchings/code/audio_heap/AudioHeap_SearchCaches.s,AudioHeap_SearchCaches,0x8018C380,0x16
 asm/non_matchings/code/audio_heap/AudioHeap_SearchRegularCaches.s,AudioHeap_SearchRegularCaches,0x8018C3D8,0x43
@@ -3161,7 +3161,7 @@ asm/non_matchings/code/audio_load/AudioLoad_AsyncLoadInner.s,AudioLoad_AsyncLoad
 asm/non_matchings/code/audio_load/AudioLoad_ProcessLoads.s,AudioLoad_ProcessLoads,0x80190B08,0xC
 asm/non_matchings/code/audio_load/AudioLoad_SetDmaHandler.s,AudioLoad_SetDmaHandler,0x80190B38,0x3
 asm/non_matchings/code/audio_load/AudioLoad_SetUnusedHandler.s,AudioLoad_SetUnusedHandler,0x80190B44,0x3
-asm/non_matchings/code/audio_load/AudioLoad_InitSoundFontMeta.s,AudioLoad_InitSoundFontMeta,0x80190B50,0x18
+asm/non_matchings/code/audio_load/AudioLoad_InitSoundFont.s,AudioLoad_InitSoundFont,0x80190B50,0x18
 asm/non_matchings/code/audio_load/AudioLoad_Init.s,AudioLoad_Init,0x80190BB0,0xE8
 asm/non_matchings/code/audio_load/AudioLoad_InitSlowLoads.s,AudioLoad_InitSlowLoads,0x80190F50,0x5
 asm/non_matchings/code/audio_load/AudioLoad_SlowLoadSample.s,AudioLoad_SlowLoadSample,0x80190F64,0x74
@@ -3247,10 +3247,10 @@ asm/non_matchings/code/audio_playback/AudioPlayback_NoteSetResamplingRate.s,Audi
 asm/non_matchings/code/audio_playback/AudioPlayback_NoteInit.s,AudioPlayback_NoteInit,0x80194E60,0x30
 asm/non_matchings/code/audio_playback/AudioPlayback_NoteDisable.s,AudioPlayback_NoteDisable,0x80194F20,0x19
 asm/non_matchings/code/audio_playback/AudioPlayback_ProcessNotes.s,AudioPlayback_ProcessNotes,0x80194F84,0x152
-asm/non_matchings/code/audio_playback/AudioPlayback_InstrumentGetSound.s,AudioPlayback_InstrumentGetSound,0x801954CC,0xF
+asm/non_matchings/code/audio_playback/AudioPlayback_GetInstrumentTunedSample.s,AudioPlayback_GetInstrumentTunedSample,0x801954CC,0xF
 asm/non_matchings/code/audio_playback/AudioPlayback_GetInstrumentInner.s,AudioPlayback_GetInstrumentInner,0x80195508,0x35
 asm/non_matchings/code/audio_playback/AudioPlayback_GetDrum.s,AudioPlayback_GetDrum,0x801955DC,0x39
-asm/non_matchings/code/audio_playback/AudioPlayback_GetSfx.s,AudioPlayback_GetSfx,0x801956C0,0x3D
+asm/non_matchings/code/audio_playback/AudioPlayback_GetSoundEffect.s,AudioPlayback_GetSoundEffect,0x801956C0,0x3D
 asm/non_matchings/code/audio_playback/AudioPlayback_SetFontInstrument.s,AudioPlayback_SetFontInstrument,0x801957B4,0x51
 asm/non_matchings/code/audio_playback/AudioPlayback_SeqLayerDecayRelease.s,AudioPlayback_SeqLayerDecayRelease,0x801958F8,0xD2
 asm/non_matchings/code/audio_playback/AudioPlayback_SeqLayerNoteDecay.s,AudioPlayback_SeqLayerNoteDecay,0x80195C40,0x8