En_Door (#571)

* progress

* it matches mostly

* symbols

* done for now

* fix warnings and stuff

* formatter

* NON_EQUIVALENT

* pr fixes

* formatter and actorfixer

* fix pm

* more fixes

* PR fixes

* it actually builds again

* matching function

Co-authored-by: Louis <louist103@pop-os.localdomain>

tools/actorfixer.py

@@ -247,6 +247,8 @@ animdict = {
     "BgCheck_CreateVertexFromVec3f": "BgCheck_Vec3fToVec3s",
     "BgCheck_PolygonGetMinY": "CollisionPoly_GetMinY",
     "BgCheck_PolygonGetNormal": "CollisionPoly_GetNormalF",
+    "BcCheck3_BgActorInit": "DynaPolyActor_Init",
+    "BgCheck3_LoadMesh": "DynaPolyActor_LoadMesh",
     "func_800C01B8": "CollisionPoly_GetPointDistanceFromPlane",
     "BgCheck_CreateTriNormFromPolygon": "CollisionPoly_GetVertices",
     "func_800C02C0": "CollisionPoly_GetVerticesByBgId",
@@ -411,6 +413,7 @@ animdict = {
     "func_800A81F0": "EffectBlure_AddVertex",
     "func_800A8514": "EffectBlure_AddSpace",
     "Effect_GetParams": "Effect_GetByIndex",
+
     "func_801343C0": "SkelAnime_DrawTransformFlexOpa",
     "func_80134148": "SkelAnime_DrawTransformFlexLimbOpa",
     "func_8013AB00": "SubS_DrawTransformFlex",
@@ -446,6 +449,7 @@ animdict = {
     "skelAnime.prevFrameRot": "skelAnime.prevRot",
     "skelAnime.prevFramePos": "skelAnime.prevTransl",
     "skelAnime.unk3E": "skelAnime.baseTransl",
+
     "actor.minVelocityY": "actor.terminalVelocity",
     "actor.yDistToWater": "actor.depthInWater",
     "actor.yDistToPlayer": "actor.playerHeightRel",
@@ -464,12 +468,13 @@ animdict = {
     "globalCtx->msgCtx.unk1202C": "globalCtx->msgCtx.ocarinaAction",
     "globalCtx->msgCtx.unk11F22": "globalCtx->msgCtx.msgMode",
 
-    # Variables
-    "D_0407D590": "gGameplayKeepDrawFlameDL",
-    "D_801D15B0": "gZeroVec3f",
-    "D_801D15BC": "gZeroVec3s",
-    "D_801D1DE0": "gIdentityMtx",
-    "D_801D1E20": "gIdentityMtxF",
+    "D_801D15B0" : "gZeroVec3f",
+    "D_801D15BC" : "gZeroVec3s",
+    "D_801D1DE0" : "gIdentityMtx",
+    "D_801D1E20" : "gIdentityMtxF",
+    "D_04020658" : "gameplay_keep_Anim_020658",
+    "D_04022B28" : "gDoorSkel",
+    "D_04023100" : "gDoorCol",
 
     # Structs
     "ActorAnimationEntry": "AnimationInfo",
@@ -513,20 +518,20 @@ def replace_anim_all(repo):
         for filename in files:
             if(filename.endswith('.s')):
                 file = subdir + os.sep + filename
-                replace_anim(file)                
+                replace_anim(file)
 
     for subdir, dirs, files in os.walk(repo + os.sep + 'data'):
         for filename in files:
             if(filename.endswith('.s')):
                 file = subdir + os.sep + filename
                 replace_anim(file)
-                
+
     for subdir, dirs, files in os.walk(repo + os.sep + 'docs'):
         for filename in files:
             if(filename.endswith('.md')):
                 file = subdir + os.sep + filename
                 replace_anim(file)
-              
+
     for subdir, dirs, files in os.walk(repo + os.sep + 'tools' + os.sep + 'sizes'):
         for filename in files:
             if(filename.endswith('.csv')):

tools/disasm/functions.txt

@@ -4960,7 +4960,7 @@
     0x808670F0:("func_808670F0",),
     0x80867144:("func_80867144",),
     0x8086732C:("EnDoor_Update",),
-    0x80867350:("func_80867350",),
+    0x80867350:("EnDoor_OverrideLimbDraw",),
     0x808674B0:("EnDoor_Draw",),
     0x80867BD0:("func_80867BD0",),
     0x80867BDC:("func_80867BDC",),

tools/disasm/variables.txt

@@ -5618,13 +5618,11 @@
     0x80867784:("D_80867784","UNK_TYPE1","",0x1),
     0x8086778C:("D_8086778C","UNK_PTR","",0x4),
     0x8086780C:("En_Door_InitVars","UNK_TYPE1","",0x1),
-    0x8086782C:("D_8086782C","UNK_TYPE2","",0x2),
-    0x80867886:("D_80867886","UNK_TYPE1","",0x1),
-    0x8086788A:("D_8086788A","UNK_TYPE2","",0x2),
-    0x80867954:("D_80867954","UNK_TYPE1","",0x1),
-    0x80867964:("D_80867964","UNK_TYPE1","",0x1),
-    0x8086798C:("D_8086798C","UNK_TYPE1","",0x1),
-    0x80867998:("D_80867998","UNK_TYPE1","",0x1),
+    0x8086782C:("sObjInfo","UNK_TYPE2","",0x126),
+    0x80867954:("sInitChain","UNK_TYPE1","",0x1),
+    0x80867964:("sAnimations","AnimationHeader","[10]",0x28),
+    0x8086798C:("sAnimOpenFrames","u8","[10]",0x10),
+    0x80867998:("sAnimCloseFrames","u8","[10]",0x10),
     0x808679A4:("D_808679A4","UNK_TYPE1","",0x1),
     0x80867A20:("D_80867A20","f32","",0x4),
     0x80867BC0:("D_80867BC0","UNK_TYPE1","",0x1),