Merge branch 'master' into tokeidai

tools/actorfixer.py

@@ -301,6 +301,10 @@ animdict = {
     "func_8017F9C0": "Math3D_XZInSphere",
     "func_8017FA34": "Math3D_XYInSphere",
     "func_8017FAA8": "Math3D_YZInSphere",
+    "func_800A81F0": "EffectBlure_AddVertex",
+    "func_800A8514": "EffectBlure_AddSpace",
+    "Effect_GetParams": "Effect_GetByIndex",
+    "D_0407D590": "gGameplayKeepDrawFlameDL"
 
 
     "skelanime.unk03": "skelanime.taper",
@@ -341,6 +345,11 @@ animdict = {
 
     "globalCtx->mf_187FC" : "globalCtx->billboardMtxF",
     "globalCtx->projectionMatrix" : "globalCtx->viewProjectionMtxF",
+
+    "D_801D15B0" : "gZeroVec3f",
+    "D_801D15BC" : "gZeroVec3s",
+    "D_801D1DE0" : "gIdentityMtx",
+    "D_801D1E20" : "gIdentityMtxF",
 }
 
 def replace_anim(file):

tools/disasm/dma_filenames.txt

@@ -37,7 +37,7 @@
     'ovl_file_choose',
     'ovl_daytelop',
     'ovl_kaleido_scope',
-    'ovl_Player_Actor',
+    'ovl_player_actor',
     'ovl_En_Test',
     'ovl_En_GirlA',
     'ovl_En_Part',

tools/disasm/files.txt

@@ -483,7 +483,7 @@
             0x8018B0F0 : "audio_heap",
             0x8018EB60 : "audio_load",
             0x80192BE0 : "code_80192BE0",
-            0x80194710 : "code_80194710",
+            0x80194710 : "audio_dcache",
             0x80194790 : "code_80194790",
             0x80194930 : "audio_playback",
             0x80196A00 : "audio_effects",
@@ -678,6 +678,7 @@
             # .bss section
             0x801E3FA0 : "code_801E3FA0",
             0x801E3FB0 : "z_effect",
+            0x801ED890 : "flg_set",
             0x801ED8A0 : "z_actor",
             0x801ED930 : "z_actor_dlftbls",
             0x801ED950 : "z_bgcheck",
@@ -740,7 +741,7 @@
     ['ovl_file_choose', 'baserom/', 'overlay', [], { 0x80804010 : "ovl_file_choose" }],
     ['ovl_daytelop', 'baserom/', 'overlay', [], { 0x80814EB0 : "ovl_daytelop" }],
     ['ovl_kaleido_scope', 'baserom/', 'overlay', [], { 0x808160A0 : "ovl_kaleido_scope" }],
-    ['ovl_Player_Actor', 'baserom/', 'overlay', [], { 0x8082DA90 : "ovl_Player_Actor" }],
+    ['ovl_player_actor', 'baserom/', 'overlay', [], { 0x8082DA90 : "ovl_player_actor" }],
     ['ovl_En_Test', 'baserom/', 'overlay', [], { 0x80862B70 : "ovl_En_Test" }],
     ['ovl_En_GirlA', 'baserom/', 'overlay', [], { 0x80863870 : "ovl_En_GirlA" }],
     ['ovl_En_Part', 'baserom/', 'overlay', [], { 0x80865370 : "ovl_En_Part" }],

tools/disasm/functions.txt

@@ -511,28 +511,28 @@
     0x800A8150:("func_800A8150",),
     0x800A817C:("func_800A817C",),
     0x800A81A4:("func_800A81A4",),
-    0x800A81F0:("func_800A81F0",),
-    0x800A8514:("func_800A8514",),
-    0x800A8558:("EffectBlure_Initcommon",),
+    0x800A81F0:("EffectBlure_AddVertex",),
+    0x800A8514:("EffectBlure_AddSpace",),
+    0x800A8558:("EffectBlure_InitElements",),
     0x800A8610:("EffectBlure_Init1",),
     0x800A8720:("EffectBlure_Init2",),
     0x800A8854:("EffectBlure_Destroy",),
     0x800A8860:("EffectBlure_Update",),
-    0x800A8C78:("func_800A8C78",),
-    0x800A8DE8:("func_800A8DE8",),
-    0x800A92FC:("func_800A92FC",),
-    0x800A9330:("func_800A9330",),
-    0x800A9804:("func_800A9804",),
-    0x800AA190:("func_800AA190",),
-    0x800AA460:("func_800AA460",),
-    0x800AA498:("func_800AA498",),
-    0x800AA700:("func_800AA700",),
-    0x800AABE0:("func_800AABE0",),
+    0x800A8C78:("EffectBlure_UpdateFlags",),
+    0x800A8DE8:("EffectBlure_GetComputedValues",),
+    0x800A92FC:("EffectBlure_SetupSmooth",),
+    0x800A9330:("EffectBlure_DrawElemNoInterpolation",),
+    0x800A9804:("EffectBlure_DrawElemHermiteInterpolation",),
+    0x800AA190:("EffectBlure_DrawSmooth",),
+    0x800AA460:("EffectBlure_SetupSimple",),
+    0x800AA498:("EffectBlure_SetupSimpleAlt",),
+    0x800AA700:("EffectBlure_DrawSimpleVertices",),
+    0x800AABE0:("EffectBlure_DrawSimple",),
     0x800AB0EC:("EffectBlure_Draw",),
     0x800AB5D0:("EffectShieldParticle_Init",),
     0x800AB808:("EffectShieldParticle_Destroy",),
     0x800AB894:("EffectShieldParticle_Update",),
-    0x800AB9F8:("EffectShieldParticle_CalculateColors",),
+    0x800AB9F8:("EffectShieldParticle_GetColors",),
     0x800AC718:("EffectShieldParticle_Draw",),
     0x800ACBF0:("EffectSpark_Init",),
     0x800ACFCC:("EffectSpark_Destroy",),
@@ -546,15 +546,15 @@
     0x800AE8EC:("func_800AE8EC",),
     0x800AE930:("func_800AE930",),
     0x800AEF44:("func_800AEF44",),
-    0x800AEF70:("EffectTireMark_InitParticle",),
+    0x800AEF70:("EffectTireMark_InitElement",),
     0x800AEFA0:("EffectTireMark_Init",),
     0x800AF044:("EffectTireMark_Destroy",),
     0x800AF050:("EffectTireMark_Update",),
-    0x800AF284:("EffectTireMark_InitVertices",),
+    0x800AF284:("EffectTireMark_SetVertices",),
     0x800AF310:("EffectTireMark_Draw",),
-    0x800AF710:("Effect_GetContext",),
-    0x800AF720:("Effect_GetParams",),
-    0x800AF87C:("Effect_InitCommon",),
+    0x800AF710:("Effect_GetGlobalCtx",),
+    0x800AF720:("Effect_GetByIndex",),
+    0x800AF87C:("Effect_InitStatus",),
     0x800AF890:("Effect_Init",),
     0x800AF960:("Effect_Add",),
     0x800AFB24:("Effect_DrawAll",),
@@ -1700,8 +1700,8 @@
     0x800F470C:("Jpeg_Decode",),
     0x800F4A10:("func_800F4A10",),
     0x800F4C0C:("func_800F4C0C",),
-    0x800F4E20:("func_800F4E20",),
-    0x800F4F28:("func_800F4F28",),
+    0x800F4E20:("KaleidoSetup_Init",),
+    0x800F4F28:("KaleidoSetup_Destroy",),
     0x800F4F40:("Font_LoadChar",),
     0x800F4F54:("Font_LoadCharNES",),
     0x800F4FC0:("Font_LoadMessageBoxEndIcon",),
@@ -2925,17 +2925,17 @@
     0x801631DC:("func_801631DC",),
     0x80163334:("func_80163334",),
     0x80163660:("func_80163660",),
-    0x80163700:("func_80163700",),
-    0x80163758:("func_80163758",),
-    0x801637B4:("func_801637B4",),
-    0x80163804:("func_80163804",),
-    0x8016388C:("func_8016388C",),
-    0x801638D8:("func_801638D8",),
-    0x801639A0:("func_801639A0",),
-    0x801639EC:("func_801639EC",),
-    0x80163A38:("func_80163A38",),
-    0x80163A58:("func_80163A58",),
-    0x80163C0C:("func_80163C0C",),
+    0x80163700:("KaleidoManager_FaultAddrConvFunc",),
+    0x80163758:("KaleidoManager_LoadOvl",),
+    0x801637B4:("KaleidoManager_ClearOvl",),
+    0x80163804:("KaleidoManager_Init",),
+    0x8016388C:("KaleidoManager_Destroy",),
+    0x801638D8:("KaleidoManager_GetRamAddr",),
+    0x801639A0:("KaleidoScopeCall_LoadPlayer",),
+    0x801639EC:("KaleidoScopeCall_Init",),
+    0x80163A38:("KaleidoScopeCall_Destroy",),
+    0x80163A58:("KaleidoScopeCall_Update",),
+    0x80163C0C:("KaleidoScopeCall_Draw",),
     0x80163C90:("func_80163C90",),
     0x80163D80:("func_80163D80",),
     0x80163DC0:("func_80163DC0",),
@@ -3720,8 +3720,8 @@
     0x80194568:("func_80194568",),
     0x80194668:("func_80194668",),
     0x801946E4:("func_801946E4",),
-    0x80194710:("func_80194710",),
-    0x80194750:("func_80194750",),
+    0x80194710:("Audio_InvalDCache",),
+    0x80194750:("Audio_WritebackDCache",),
     0x80194790:("func_80194790",),
     0x80194804:("func_80194804",),
     0x80194840:("func_80194840",),
@@ -4240,10 +4240,10 @@
     0x808274DC:("func_808274DC",),
     0x80827A8C:("func_80827A8C",),
     0x80827E08:("func_80827E08",),
-    0x808283D8:("func_808283D8",),
+    0x808283D8:("KaleidoScope_Draw",),
     0x808286D8:("func_808286D8",),
     0x80828788:("func_80828788",),
-    0x8082895C:("func_8082895C",),
+    0x8082895C:("KaleidoScope_Update",),
     0x8082DA90:("func_8082DA90",),
     0x8082DABC:("func_8082DABC",),
     0x8082DAD4:("func_8082DAD4",),
@@ -4991,8 +4991,8 @@
     0x80869D90:("EnPametfrog_Init",),
     0x80869F90:("EnPametfrog_Destroy",),
     0x80869FBC:("EnPametfrog_Vec3fNormalize",),
-    0x8086A024:("EnPametfrog_ChangeColliderFreeze",),
-    0x8086A068:("EnPametfrog_ChangeColliderThaw",),
+    0x8086A024:("EnPametfrog_Freeze",),
+    0x8086A068:("EnPametfrog_Thaw",),
     0x8086A0F4:("EnPametfrog_JumpWaterEffects",),
     0x8086A1A0:("EnPametfrog_IdleWaterEffects",),
     0x8086A238:("func_8086A238",),
@@ -5419,7 +5419,7 @@
     0x8088FE64:("func_8088FE64",),
     0x8089010C:("func_8089010C",),
     0x80890438:("EnElf_Update",),
-    0x80890494:("func_80890494",),
+    0x80890494:("EnElf_OverrideLimbDraw",),
     0x808905B8:("EnElf_Draw",),
     0x808908D0:("func_808908D0",),
     0x80891060:("EnNiw_Init",),
@@ -6671,7 +6671,7 @@
     0x808EC990:("func_808EC990",),
     0x808ECD14:("func_808ECD14",),
     0x808ED07C:("func_808ED07C",),
-    0x808ED138:("EnBigslime_Draw",),
+    0x808ED138:("EnBigslime_DrawGekko",),
     0x808ED3F4:("func_808ED3F4",),
     0x808F1200:("EnKarebaba_Init",),
     0x808F1334:("EnKarebaba_Destroy",),
@@ -9031,9 +9031,9 @@
     0x809C3190:("EnAob01_Init",),
     0x809C3350:("EnAob01_Destroy",),
     0x809C339C:("EnAob01_Update",),
-    0x809C33D8:("func_809C33D8",),
-    0x809C35B4:("func_809C35B4",),
-    0x809C35F4:("func_809C35F4",),
+    0x809C33D8:("EnAob01_OverrideLimbDraw",),
+    0x809C35B4:("EnAob01_PostLimbDraw",),
+    0x809C35F4:("EnAob01_UnkDraw",),
     0x809C3608:("EnAob01_Draw",),
     0x809C3D80:("EnBoj01_Init",),
     0x809C3D90:("EnBoj01_Destroy",),
@@ -14161,7 +14161,7 @@
     0x80B610B8:("ObjDora_Draw",),
     0x80B615E0:("EnBigpo_Init",),
     0x80B6186C:("EnBigpo_Destroy",),
-    0x80B61914:("func_80B61914",),
+    0x80B61914:("EnBigpo_RotateSpawnCutsceneFires",),
     0x80B619B4:("func_80B619B4",),
     0x80B619FC:("func_80B619FC",),
     0x80B61AC8:("EnBigPo_InitWellBigPo",),
@@ -14404,8 +14404,8 @@
     0x80B72880:("func_80B72880",),
     0x80B72970:("func_80B72970",),
     0x80B72DBC:("EnRailSkb_Update",),
-    0x80B72E88:("func_80B72E88",),
-    0x80B7302C:("func_80B7302C",),
+    0x80B72E88:("EnRailSkb_OverrideLimbDraw",),
+    0x80B7302C:("EnRailSkb_PostLimbDraw",),
     0x80B731EC:("EnRailSkb_Draw",),
     0x80B73A90:("func_80B73A90",),
     0x80B73AE4:("func_80B73AE4",),
@@ -16272,9 +16272,9 @@
     0x80BEFD98:("EnAkindonuts_Init",),
     0x80BEFF08:("EnAkindonuts_Destroy",),
     0x80BEFF34:("EnAkindonuts_Update",),
-    0x80BEFFB4:("func_80BEFFB4",),
-    0x80BF0178:("func_80BF0178",),
-    0x80BF0190:("func_80BF0190",),
+    0x80BEFFB4:("EnAkindonuts_OverrideLimbDraw",),
+    0x80BF0178:("EnAkindonuts_PostLimbDraw",),
+    0x80BF0190:("EnAkindonuts_UnkActorDraw",),
     0x80BF0258:("EnAkindonuts_Draw",),
     0x80BF0D90:("EffStk_Init",),
     0x80BF0DD0:("EffStk_Destroy",),
@@ -16515,7 +16515,7 @@
     0x80C02CA4:("func_80C02CA4",),
     0x80C02DAC:("func_80C02DAC",),
     0x80C02DC4:("EnBomjimb_Update",),
-    0x80C02FA8:("func_80C02FA8",),
+    0x80C02FA8:("EnBomjimb_OverrideLimbDraw",),
     0x80C03034:("EnBomjimb_Draw",),
     0x80C03530:("EnBombers_Init",),
     0x80C037F8:("EnBombers_Destroy",),

tools/disasm/variables.txt

@@ -397,7 +397,7 @@
     0x801AE2CC:("D_801AE2CC","UNK_TYPE4","",0x4),
     0x801AE2DC:("D_801AE2DC","UNK_TYPE4","",0x4),
     0x801AE2F0:("sEffectShieldParticleVertices","F3DVertex","[4]",0x40),
-    0x801AE330:("sEffInfoTable","EffInfo","[5]",0x64),
+    0x801AE330:("sEffectInfoTable","EffectInfo","[5]",0x64),
     0x801AE3A0:("EffectSS2Info","EffectSsInfo","",0xc),
     0x801AE3B0:("D_801AE3B0","Color_RGBA8","",0x4),
     0x801AE3B4:("D_801AE3B4","Color_RGBA8","",0x4),
@@ -882,8 +882,8 @@
     0x801BA484:("defaultColChkInfo","CollisionCheckInfo","",0x1c),
     0x801BA4A0:("sApplyDamageFuncs","ColChkApplyFunc","",0x14),
     0x801BA4B4:("sOCLineCheckFuncs","ColChkLineFunc","",0x14),
-    0x801BA4C8:("shieldParticleInitMetal","EffShieldParticleInit","",0x40),
-    0x801BA508:("shieldParticleInitWood","EffShieldParticleInit","",0x40),
+    0x801BA4C8:("shieldParticleInitMetal","EffectShieldParticleInit","",0x40),
+    0x801BA508:("shieldParticleInitWood","EffectShieldParticleInit","",0x40),
     0x801BA550:("D_801BA550","UNK_TYPE1","",0x1),
     0x801BA750:("D_801BA750","UNK_TYPE1","",0x1),
     0x801BA790:("sDebugDisplay1DL","UNK_TYPE1","",0x1),
@@ -2169,9 +2169,9 @@
     0x801D08E8:("D_801D08E8","UNK_TYPE1","",0x1),
     0x801D0900:("D_801D0900","UNK_TYPE1","",0x1),
     0x801D0B50:("Player_InitVars","ActorInit","",0x20),
-    0x801D0B70:("D_801D0B70","UNK_TYPE1","",0x38),
-    0x801D0BA8:("D_801D0BA8","UNK_TYPE4","",0x4),
-    0x801D0BAC:("D_801D0BAC","UNK_TYPE4","",0x4),
+    0x801D0B70:("gKaleidoMgrOverlayTable","KaleidoMgrOverlay","",0x38),
+    0x801D0BA8:("sKaleidoAreaPtr","void*","",0x4),
+    0x801D0BAC:("gKaleidoMgrCurOvl","KaleidoMgrOverlay*","",0x4),
     0x801D0BB0:("D_801D0BB0","UNK_TYPE4","",0x4),
     0x801D0C80:("D_801D0C80","UNK_TYPE1","",0x1),
     0x801D0CB0:("D_801D0CB0","UNK_TYPE1","",0x1),
@@ -2245,11 +2245,11 @@
     0x801D1538:("D_801D1538","UNK_TYPE4","",0x4),
     0x801D1540:("D_801D1540","UNK_PTR","",0x4),
     0x801D1570:("D_801D1570","f32","[13]",0x34),
-    0x801D15B0:("D_801D15B0","Vec3f","",0xC),
-    0x801D15BC:("D_801D15BC","UNK_TYPE4","",0x4),
+    0x801D15B0:("gZeroVec3f","Vec3f","",0xC),
+    0x801D15BC:("gZeroVec3s","Vec3s","",0x6),
     0x801D15D0:("sATan2Tbl","s16","[1025]",0x802),
-    0x801D1DE0:("D_801D1DE0","Mtx","",0x40),
-    0x801D1E20:("D_801D1E20","MtxF","",0x40),
+    0x801D1DE0:("gIdentityMtx","Mtx","",0x40),
+    0x801D1E20:("gIdentityMtxF","MtxF","",0x40),
     0x801D1E60:("initialgspUcodeText","UNK_PTR","",0x4),
     0x801D1E64:("initialgspUcodeData","UNK_PTR","",0x4),
     0x801D1E70:("D_801D1E70","UNK_TYPE1","",0x1),
@@ -3887,7 +3887,7 @@
     0x801E3BB0:("D_801E3BB0","UNK_TYPE1","",0x1),
     0x801E3F40:("gJpegUCodeData","UNK_TYPE1","",0x1),
     0x801E3FA0:("D_801E3FA0","UNK_TYPE1","",0x1),
-    0x801E3FB0:("sEffTable","EffTables","",0x98E0),
+    0x801E3FB0:("sEffectContext","EffectContext","",0x98E0),
     0x801ED890:("D_801ED890","UNK_TYPE1","",0x1),
     0x801ED894:("D_801ED894","UNK_TYPE1","",0x1),
     0x801ED8A0:("D_801ED8A0","UNK_TYPE1","",0x1),
@@ -3972,12 +3972,12 @@
     0x801EE1D0:("D_801EE1D0","Vec3f","",0xc),
     0x801EE1E0:("D_801EE1E0","Vec3f","",0xc),
     0x801EE1F0:("D_801EE1F0","Vec3f","",0xc),
-    0x801EE200:("D_801EE200","EffSparkParams","",0x4c4),
+    0x801EE200:("D_801EE200","EffectSparkInit","",0x4c4),
     0x801EE6C8:("D_801EE6C8","TriNorm","",0x34),
     0x801EE700:("D_801EE700","TriNorm","",0x34),
-    0x801EE738:("D_801EE738","EffSparkParams","",0x4c4),
-    0x801EEC00:("D_801EEC00","EffSparkParams","",0x4c4),
-    0x801EF0C8:("D_801EF0C8","EffSparkParams","",0x4c4),
+    0x801EE738:("D_801EE738","EffectSparkInit","",0x4c4),
+    0x801EEC00:("D_801EEC00","EffectSparkInit","",0x4c4),
+    0x801EF0C8:("D_801EF0C8","EffectSparkInit","",0x4c4),
     0x801EF590:("D_801EF590","UNK_TYPE1","",0x1),
     0x801EF5C8:("D_801EF5C8","UNK_TYPE1","",0x1),
     0x801EF600:("D_801EF600","TriNorm","",0x34),
@@ -4117,9 +4117,9 @@
     0x801F6B44:("gShrinkWindowContextPtr","ShrinkWindowContext*","",0x4),
     0x801F6B50:("D_801F6B50","UNK_TYPE4","",0x4),
     0x801F6B58:("D_801F6B58","UNK_TYPE1","",0x1),
-    0x801F6BF0:("D_801F6BF0","UNK_TYPE1","",0x1),
-    0x801F6C00:("D_801F6C00","UNK_TYPE1","",0x1),
-    0x801F6C04:("D_801F6C04","UNK_TYPE1","",0x1),
+    0x801F6BF0:("sKaleidoAreaFaultClient","FaultAddrConvClient","",0xC),
+    0x801F6C00:("sKaleidoScopeUpdateFunc","void*","",0x4),
+    0x801F6C04:("sKaleidoScopeDrawFunc","void*","",0x4),
     0x801F6C10:("D_801F6C10","UNK_TYPE1","",0x1),
     0x801F6C18:("D_801F6C18","Input","",0x18),
     0x801F6C30:("D_801F6C30","UNK_TYPE1","",0x1),
@@ -5321,8 +5321,8 @@
     0x8085D2C0:("D_8085D2C0","ActorInitVar","",0x4),
     0x8085D2C4:("D_8085D2C4","UNK_TYPE4","",0x4),
     0x8085D2CC:("D_8085D2CC","UNK_PTR","",0x4),
-    0x8085D30C:("D_8085D30C","EffBlureInit2","",0x24),
-    0x8085D330:("D_8085D330","EffTireMarkInit","",0x8),
+    0x8085D30C:("D_8085D30C","EffectBlureInit2","",0x24),
+    0x8085D330:("D_8085D330","EffectTireMarkInit","",0x8),
     0x8085D338:("D_8085D338","UNK_TYPE4","",0x4),
     0x8085D33C:("D_8085D33C","UNK_TYPE4","",0x4),
     0x8085D340:("D_8085D340","UNK_TYPE1","",0x1),
@@ -5972,7 +5972,7 @@
     0x808792D4:("D_808792D4","UNK_TYPE1","",0x1),
     0x808792F4:("D_808792F4","UNK_TYPE1","",0x1),
     0x808792FC:("D_808792FC","UNK_TYPE1","",0x1),
-    0x80879308:("D_80879308","EffBlureInit2","",0x24),
+    0x80879308:("D_80879308","EffectBlureInit2","",0x24),
     0x8087932C:("D_8087932C","UNK_TYPE1","",0x1),
     0x80879330:("D_80879330","UNK_TYPE1","",0x1),
     0x80879334:("D_80879334","UNK_TYPE1","",0x1),
@@ -6197,10 +6197,10 @@
     0x8088C1C0:("En_Arrow_InitVars","UNK_TYPE1","",0x1),
     0x8088C1E0:("D_8088C1E0","UNK_TYPE1","",0x1),
     0x8088C230:("D_8088C230","UNK_TYPE1","",0x1),
-    0x8088C234:("D_8088C234","EffBlureInit2","",0x24),
-    0x8088C258:("D_8088C258","EffBlureInit2","",0x24),
-    0x8088C27C:("D_8088C27C","EffBlureInit2","",0x24),
-    0x8088C2A0:("D_8088C2A0","EffBlureInit2","",0x24),
+    0x8088C234:("D_8088C234","EffectBlureInit2","",0x24),
+    0x8088C258:("D_8088C258","EffectBlureInit2","",0x24),
+    0x8088C27C:("D_8088C27C","EffectBlureInit2","",0x24),
+    0x8088C2A0:("D_8088C2A0","EffectBlureInit2","",0x24),
     0x8088C2C4:("D_8088C2C4","UNK_TYPE4","",0x4),
     0x8088C2CC:("D_8088C2CC","UNK_TYPE1","",0x1),
     0x8088C2D8:("D_8088C2D8","UNK_TYPE1","",0x1),
@@ -6409,7 +6409,7 @@
     0x8089E350:("D_8089E350","UNK_TYPE4","",0x4),
     0x8089E354:("D_8089E354","UNK_TYPE1","",0x1),
     0x8089E364:("D_8089E364","UNK_TYPE4","",0x4),
-    0x8089E368:("D_8089E368","EffBlureInit2","",0x24),
+    0x8089E368:("D_8089E368","EffectBlureInit2","",0x24),
     0x8089E38C:("D_8089E38C","UNK_TYPE1","",0x1),
     0x8089E398:("D_8089E398","UNK_TYPE1","",0x1),
     0x8089E3A4:("D_8089E3A4","UNK_TYPE1","",0x1),
@@ -6735,10 +6735,8 @@
     0x808BBB20:("Door_Warp1_InitVars","UNK_TYPE1","",0x1),
     0x808BBB40:("D_808BBB40","UNK_TYPE1","",0x1),
     0x808BBB50:("D_808BBB50","UNK_TYPE4","",0x4),
-    0x808BBB5C:("D_808BBB5C","f32","",0x4),
-    0x808BBB64:("D_808BBB64","f32","",0x4),
-    0x808BBB68:("D_808BBB68","UNK_TYPE1","",0x1),
-    0x808BBB6C:("D_808BBB6C","f32","",0x4),
+    0x808BBB5C:("D_808BBB5C","Vec3f","",0xC),
+    0x808BBB68:("D_808BBB68","Vec3f","",0xC),
     0x808BBB80:("jtbl_808BBB80","UNK_PTR","",0x4),
     0x808BBB98:("jtbl_808BBB98","UNK_PTR","",0x4),
     0x808BBBB4:("D_808BBBB4","f32","",0x4),
@@ -6898,7 +6896,7 @@
     0x808C99C0:("D_808C99C0","UNK_TYPE1","",0x1),
     0x808C9A10:("D_808C9A10","UNK_TYPE1","",0x1),
     0x808C9A30:("D_808C9A30","UNK_TYPE1","",0x1),
-    0x808C9A3C:("D_808C9A3C","EffBlureInit2","",0x24),
+    0x808C9A3C:("D_808C9A3C","EffectBlureInit2","",0x24),
     0x808C9A60:("D_808C9A60","UNK_TYPE1","",0x1),
     0x808C9A70:("D_808C9A70","UNK_TYPE1","",0x1),
     0x808C9A7C:("D_808C9A7C","UNK_TYPE1","",0x1),
@@ -7473,7 +7471,7 @@
     0x808F88C0:("En_Bom_Chu_InitVars","UNK_TYPE1","",0x1),
     0x808F88E0:("D_808F88E0","UNK_TYPE1","",0x1),
     0x808F8908:("D_808F8908","UNK_TYPE2","",0x2),
-    0x808F8914:("D_808F8914","EffBlureInit2","",0x24),
+    0x808F8914:("D_808F8914","EffectBlureInit2","",0x24),
     0x808F8938:("D_808F8938","UNK_TYPE1","",0x1),
     0x808F8944:("D_808F8944","UNK_TYPE1","",0x1),
     0x808F8950:("D_808F8950","UNK_TYPE1","",0x1),
@@ -8282,7 +8280,7 @@
     0x8092C140:("D_8092C140","UNK_TYPE1","",0x1),
     0x8092C160:("D_8092C160","UNK_TYPE1","",0x1),
     0x8092C168:("D_8092C168","UNK_TYPE1","",0x1),
-    0x8092C174:("D_8092C174","EffBlureInit2","",0x24),
+    0x8092C174:("D_8092C174","EffectBlureInit2","",0x24),
     0x8092C198:("D_8092C198","UNK_TYPE4","",0x4),
     0x8092C19C:("D_8092C19C","UNK_TYPE1","",0x1),
     0x8092C1A8:("D_8092C1A8","UNK_TYPE1","",0x1),
@@ -8594,7 +8592,7 @@
     0x80942E60:("D_80942E60","UNK_TYPE1","",0x1),
     0x80942E6C:("D_80942E6C","UNK_TYPE1","",0x1),
     0x80942E78:("D_80942E78","UNK_TYPE1","",0x1),
-    0x80942E8C:("D_80942E8C","EffTireMarkInit","",0x8),
+    0x80942E8C:("D_80942E8C","EffectTireMarkInit","",0x8),
     0x80942E94:("D_80942E94","UNK_TYPE1","",0x1),
     0x80942E9C:("D_80942E9C","UNK_TYPE1","",0x1),
     0x80942EAC:("D_80942EAC","UNK_TYPE1","",0x1),
@@ -10700,8 +10698,8 @@
     0x80A07F0C:("D_80A07F0C","UNK_TYPE1","",0x1),
     0x80A07F3C:("D_80A07F3C","UNK_TYPE1","",0x1),
     0x80A07F54:("D_80A07F54","UNK_TYPE2","",0x2),
-    0x80A07F5C:("D_80A07F5C","EffTireMarkInit","",0x8),
-    0x80A07F64:("D_80A07F64","EffTireMarkInit","",0x8),
+    0x80A07F5C:("D_80A07F5C","EffectTireMarkInit","",0x8),
+    0x80A07F64:("D_80A07F64","EffectTireMarkInit","",0x8),
     0x80A07F6C:("D_80A07F6C","UNK_TYPE4","",0x4),
     0x80A07FA8:("D_80A07FA8","UNK_TYPE4","",0x4),
     0x80A07FB4:("D_80A07FB4","UNK_TYPE4","",0x4),
@@ -11024,7 +11022,7 @@
     0x80A166B0:("D_80A166B0","UNK_TYPE1","",0x1),
     0x80A166BC:("D_80A166BC","UNK_TYPE1","",0x1),
     0x80A166D4:("D_80A166D4","UNK_TYPE1","",0x1),
-    0x80A166DC:("D_80A166DC","EffTireMarkInit","",0x8),
+    0x80A166DC:("D_80A166DC","EffectTireMarkInit","",0x8),
     0x80A166E4:("D_80A166E4","UNK_TYPE4","",0x4),
     0x80A16704:("D_80A16704","UNK_TYPE1","",0x1),
     0x80A1670C:("D_80A1670C","UNK_TYPE1","",0x1),
@@ -11685,8 +11683,8 @@
     0x80A4169C:("D_80A4169C","UNK_PTR","",0x4),
     0x80A416C0:("D_80A416C0","UNK_PTR","",0x4),
     0x80A416E0:("D_80A416E0","UNK_TYPE1","",0x1),
-    0x80A417BC:("D_80A417BC","EffBlureInit2","",0x24),
-    0x80A417E0:("D_80A417E0","EffTireMarkInit","",0x8),
+    0x80A417BC:("D_80A417BC","EffectBlureInit2","",0x24),
+    0x80A417E0:("D_80A417E0","EffectTireMarkInit","",0x8),
     0x80A417E8:("D_80A417E8","UNK_TYPE1","",0x1),
     0x80A417EC:("D_80A417EC","UNK_PTR","",0x4),
     0x80A41828:("D_80A41828","UNK_TYPE1","",0x1),
@@ -11992,7 +11990,7 @@
     0x80A5844C:("D_80A5844C","UNK_TYPE1","",0x1),
     0x80A58454:("D_80A58454","UNK_TYPE4","",0x4),
     0x80A58464:("D_80A58464","UNK_TYPE1","",0x1),
-    0x80A58470:("D_80A58470","EffBlureInit2","",0x24),
+    0x80A58470:("D_80A58470","EffectBlureInit2","",0x24),
     0x80A58494:("D_80A58494","UNK_TYPE4","",0x4),
     0x80A58498:("D_80A58498","UNK_TYPE1","",0x1),
     0x80A584A4:("D_80A584A4","UNK_TYPE1","",0x1),
@@ -14585,7 +14583,7 @@
     0x80B40780:("D_80B40780","UNK_TYPE1","",0x1),
     0x80B43250:("En_Kgy_InitVars","UNK_TYPE1","",0x1),
     0x80B43270:("D_80B43270","UNK_TYPE1","",0x1),
-    0x80B43298:("D_80B43298","EffShieldParticleInit","",0x40),
+    0x80B43298:("D_80B43298","EffectShieldParticleInit","",0x40),
     0x80B432C6:("D_80B432C6","UNK_TYPE1","",0x1),
     0x80B432C8:("D_80B432C8","UNK_TYPE1","",0x1),
     0x80B432CA:("D_80B432CA","UNK_TYPE1","",0x1),
@@ -15797,7 +15795,7 @@
     0x80BB3ED4:("D_80BB3ED4","UNK_TYPE1","",0x1),
     0x80BB3EF4:("D_80BB3EF4","UNK_TYPE1","",0x1),
     0x80BB4044:("D_80BB4044","UNK_TYPE1","",0x1),
-    0x80BB405C:("D_80BB405C","EffTireMarkInit","",0x8),
+    0x80BB405C:("D_80BB405C","EffectTireMarkInit","",0x8),
     0x80BB4064:("D_80BB4064","UNK_TYPE4","",0x4),
     0x80BB4070:("D_80BB4070","UNK_TYPE4","",0x4),
     0x80BB407C:("D_80BB407C","UNK_TYPE1","",0x1),
@@ -16449,7 +16447,7 @@
     0x80BF5954:("D_80BF5954","UNK_TYPE1","",0x1),
     0x80BF5960:("D_80BF5960","UNK_TYPE1","",0x1),
     0x80BF596C:("D_80BF596C","UNK_TYPE1","",0x1),
-    0x80BF59F0:("D_80BF59F0","EffTireMarkInit","",0x8),
+    0x80BF59F0:("D_80BF59F0","EffectTireMarkInit","",0x8),
     0x80BF59F8:("D_80BF59F8","UNK_TYPE1","",0x1),
     0x80BF5A10:("D_80BF5A10","f32","",0x4),
     0x80BF5A14:("D_80BF5A14","f32","",0x4),

tools/extract_baserom.py

@@ -44,7 +44,7 @@ FILE_NAMES = [
     'ovl_file_choose',
     'ovl_daytelop',
     'ovl_kaleido_scope',
-    'ovl_Player_Actor',
+    'ovl_player_actor',
     'ovl_En_Test',
     'ovl_En_GirlA',
     'ovl_En_Part',

tools/filelists/mm.us.rev1/all.csv

@@ -36,7 +36,7 @@
 35,ovl_file_choose
 36,ovl_daytelop
 37,ovl_kaleido_scope
-38,ovl_Player_Actor
+38,ovl_player_actor
 39,ovl_En_Test
 40,ovl_En_GirlA
 41,ovl_En_Part

tools/filelists/mm.us.rev1/overlay.csv

@@ -4,7 +4,7 @@
 35,ovl_file_choose
 36,ovl_daytelop
 37,ovl_kaleido_scope
-38,ovl_Player_Actor
+38,ovl_player_actor
 39,ovl_En_Test
 40,ovl_En_GirlA
 41,ovl_En_Part

tools/overlayhelpers/actor_symbols.py

@@ -3,7 +3,7 @@
 import argparse, os, struct
 
 actor_names = [
-    "ovl_Player_Actor",
+    "ovl_player_actor",
     "ovl_En_Test",
     "ovl_En_GirlA",
     "ovl_En_Part",
@@ -719,7 +719,7 @@ def read_actor_ovl_tbl():
             actortbl.append((actor_names[i], entry[0], entry[1], entry[2], entry[3]))
             entry = as_word_list(codefile.read(0x20))
             i += 1
-        actortbl[0] = ['ovl_Player_Actor', 0xCA7F00, 0xCDCF60, 0x8082DA90, 0x80862B70 ]
+        actortbl[0] = ['ovl_player_actor', 0xCA7F00, 0xCDCF60, 0x8082DA90, 0x80862B70 ]
     return actortbl
 
 actor_tbl = read_actor_ovl_tbl()

tools/sizes/code_functions.csv

@@ -25,28 +25,28 @@ asm/non_matchings/code/z_en_item00/Item_DropCollectibleRandom.s,Item_DropCollect
 asm/non_matchings/code/z_en_item00/func_800A8150.s,func_800A8150,0x800A8150,0xB
 asm/non_matchings/code/z_en_item00/func_800A817C.s,func_800A817C,0x800A817C,0xA
 asm/non_matchings/code/z_en_item00/func_800A81A4.s,func_800A81A4,0x800A81A4,0x13
-asm/non_matchings/code/z_eff_blure/func_800A81F0.s,func_800A81F0,0x800A81F0,0xC9
-asm/non_matchings/code/z_eff_blure/func_800A8514.s,func_800A8514,0x800A8514,0x11
-asm/non_matchings/code/z_eff_blure/EffectBlure_Initcommon.s,EffectBlure_Initcommon,0x800A8558,0x2E
+asm/non_matchings/code/z_eff_blure/EffectBlure_AddVertex.s,EffectBlure_AddVertex,0x800A81F0,0xC9
+asm/non_matchings/code/z_eff_blure/EffectBlure_AddSpace.s,EffectBlure_AddSpace,0x800A8514,0x11
+asm/non_matchings/code/z_eff_blure/EffectBlure_InitElements.s,EffectBlure_InitElements,0x800A8558,0x2E
 asm/non_matchings/code/z_eff_blure/EffectBlure_Init1.s,EffectBlure_Init1,0x800A8610,0x44
 asm/non_matchings/code/z_eff_blure/EffectBlure_Init2.s,EffectBlure_Init2,0x800A8720,0x4D
 asm/non_matchings/code/z_eff_blure/EffectBlure_Destroy.s,EffectBlure_Destroy,0x800A8854,0x3
 asm/non_matchings/code/z_eff_blure/EffectBlure_Update.s,EffectBlure_Update,0x800A8860,0x106
-asm/non_matchings/code/z_eff_blure/func_800A8C78.s,func_800A8C78,0x800A8C78,0x5C
-asm/non_matchings/code/z_eff_blure/func_800A8DE8.s,func_800A8DE8,0x800A8DE8,0x145
-asm/non_matchings/code/z_eff_blure/func_800A92FC.s,func_800A92FC,0x800A92FC,0xD
-asm/non_matchings/code/z_eff_blure/func_800A9330.s,func_800A9330,0x800A9330,0x135
-asm/non_matchings/code/z_eff_blure/func_800A9804.s,func_800A9804,0x800A9804,0x263
-asm/non_matchings/code/z_eff_blure/func_800AA190.s,func_800AA190,0x800AA190,0xB4
-asm/non_matchings/code/z_eff_blure/func_800AA460.s,func_800AA460,0x800AA460,0xE
-asm/non_matchings/code/z_eff_blure/func_800AA498.s,func_800AA498,0x800AA498,0x9A
-asm/non_matchings/code/z_eff_blure/func_800AA700.s,func_800AA700,0x800AA700,0x138
-asm/non_matchings/code/z_eff_blure/func_800AABE0.s,func_800AABE0,0x800AABE0,0x143
+asm/non_matchings/code/z_eff_blure/EffectBlure_UpdateFlags.s,EffectBlure_UpdateFlags,0x800A8C78,0x5C
+asm/non_matchings/code/z_eff_blure/EffectBlure_GetComputedValues.s,EffectBlure_GetComputedValues,0x800A8DE8,0x145
+asm/non_matchings/code/z_eff_blure/EffectBlure_SetupSmooth.s,EffectBlure_SetupSmooth,0x800A92FC,0xD
+asm/non_matchings/code/z_eff_blure/EffectBlure_DrawElemNoInterpolation.s,EffectBlure_DrawElemNoInterpolation,0x800A9330,0x135
+asm/non_matchings/code/z_eff_blure/EffectBlure_DrawElemHermiteInterpolation.s,EffectBlure_DrawElemHermiteInterpolation,0x800A9804,0x263
+asm/non_matchings/code/z_eff_blure/EffectBlure_DrawSmooth.s,EffectBlure_DrawSmooth,0x800AA190,0xB4
+asm/non_matchings/code/z_eff_blure/EffectBlure_SetupSimple.s,EffectBlure_SetupSimple,0x800AA460,0xE
+asm/non_matchings/code/z_eff_blure/EffectBlure_SetupSimpleAlt.s,EffectBlure_SetupSimpleAlt,0x800AA498,0x9A
+asm/non_matchings/code/z_eff_blure/EffectBlure_DrawSimpleVertices.s,EffectBlure_DrawSimpleVertices,0x800AA700,0x138
+asm/non_matchings/code/z_eff_blure/EffectBlure_DrawSimple.s,EffectBlure_DrawSimple,0x800AABE0,0x143
 asm/non_matchings/code/z_eff_blure/EffectBlure_Draw.s,EffectBlure_Draw,0x800AB0EC,0x139
 asm/non_matchings/code/z_eff_shield_particle/EffectShieldParticle_Init.s,EffectShieldParticle_Init,0x800AB5D0,0x8E
 asm/non_matchings/code/z_eff_shield_particle/EffectShieldParticle_Destroy.s,EffectShieldParticle_Destroy,0x800AB808,0x23
 asm/non_matchings/code/z_eff_shield_particle/EffectShieldParticle_Update.s,EffectShieldParticle_Update,0x800AB894,0x59
-asm/non_matchings/code/z_eff_shield_particle/EffectShieldParticle_CalculateColors.s,EffectShieldParticle_CalculateColors,0x800AB9F8,0x348
+asm/non_matchings/code/z_eff_shield_particle/EffectShieldParticle_GetColors.s,EffectShieldParticle_GetColors,0x800AB9F8,0x348
 asm/non_matchings/code/z_eff_shield_particle/EffectShieldParticle_Draw.s,EffectShieldParticle_Draw,0x800AC718,0x136
 asm/non_matchings/code/z_eff_spark/EffectSpark_Init.s,EffectSpark_Init,0x800ACBF0,0xF7
 asm/non_matchings/code/z_eff_spark/EffectSpark_Destroy.s,EffectSpark_Destroy,0x800ACFCC,0x3
@@ -60,15 +60,15 @@ asm/non_matchings/code/z_eff_ss_dead/func_800AE778.s,func_800AE778,0x800AE778,0x
 asm/non_matchings/code/z_eff_ss_dead/func_800AE8EC.s,func_800AE8EC,0x800AE8EC,0x11
 asm/non_matchings/code/z_eff_tire_mark/func_800AE930.s,func_800AE930,0x800AE930,0x185
 asm/non_matchings/code/z_eff_tire_mark/func_800AEF44.s,func_800AEF44,0x800AEF44,0xB
-asm/non_matchings/code/z_eff_tire_mark/EffectTireMark_InitParticle.s,EffectTireMark_InitParticle,0x800AEF70,0xC
+asm/non_matchings/code/z_eff_tire_mark/EffectTireMark_InitElement.s,EffectTireMark_InitElement,0x800AEF70,0xC
 asm/non_matchings/code/z_eff_tire_mark/EffectTireMark_Init.s,EffectTireMark_Init,0x800AEFA0,0x29
 asm/non_matchings/code/z_eff_tire_mark/EffectTireMark_Destroy.s,EffectTireMark_Destroy,0x800AF044,0x3
 asm/non_matchings/code/z_eff_tire_mark/EffectTireMark_Update.s,EffectTireMark_Update,0x800AF050,0x8D
-asm/non_matchings/code/z_eff_tire_mark/EffectTireMark_InitVertices.s,EffectTireMark_InitVertices,0x800AF284,0x23
+asm/non_matchings/code/z_eff_tire_mark/EffectTireMark_SetVertices.s,EffectTireMark_SetVertices,0x800AF284,0x23
 asm/non_matchings/code/z_eff_tire_mark/EffectTireMark_Draw.s,EffectTireMark_Draw,0x800AF310,0x100
-asm/non_matchings/code/z_effect/Effect_GetContext.s,Effect_GetContext,0x800AF710,0x4
-asm/non_matchings/code/z_effect/Effect_GetParams.s,Effect_GetParams,0x800AF720,0x57
-asm/non_matchings/code/z_effect/Effect_InitCommon.s,Effect_InitCommon,0x800AF87C,0x5
+asm/non_matchings/code/z_effect/Effect_GetGlobalCtx.s,Effect_GetGlobalCtx,0x800AF710,0x4
+asm/non_matchings/code/z_effect/Effect_GetByIndex.s,Effect_GetByIndex,0x800AF720,0x57
+asm/non_matchings/code/z_effect/Effect_InitStatus.s,Effect_InitStatus,0x800AF87C,0x5
 asm/non_matchings/code/z_effect/Effect_Init.s,Effect_Init,0x800AF890,0x34
 asm/non_matchings/code/z_effect/Effect_Add.s,Effect_Add,0x800AF960,0x71
 asm/non_matchings/code/z_effect/Effect_DrawAll.s,Effect_DrawAll,0x800AFB24,0x4F
@@ -3238,8 +3238,8 @@ asm/non_matchings/code/code_80192BE0/func_80194548.s,func_80194548,0x80194548,0x
 asm/non_matchings/code/code_80192BE0/func_80194568.s,func_80194568,0x80194568,0x40
 asm/non_matchings/code/code_80192BE0/func_80194668.s,func_80194668,0x80194668,0x1F
 asm/non_matchings/code/code_80192BE0/func_801946E4.s,func_801946E4,0x801946E4,0xB
-asm/non_matchings/code/code_80194710/func_80194710.s,func_80194710,0x80194710,0x10
-asm/non_matchings/code/code_80194710/func_80194750.s,func_80194750,0x80194750,0x10
+asm/non_matchings/code/code_80194710/Audio_InvalDCache.s,Audio_InvalDCache,0x80194710,0x10
+asm/non_matchings/code/code_80194710/Audio_WritebackDCache.s,Audio_WritebackDCache,0x80194750,0x10
 asm/non_matchings/code/code_80194710/func_80194790.s,func_80194790,0x80194790,0x1D
 asm/non_matchings/code/code_80194710/func_80194804.s,func_80194804,0x80194804,0xF
 asm/non_matchings/code/code_80194710/func_80194840.s,func_80194840,0x80194840,0x1C