map7: match AnimUpdate funcs

Author: emoose

configs/maps/sym.map7_s02.txt

@@ -158,6 +158,7 @@ Ai_Kaufmann_Init                    = 0x800D8AA8; // type:func
 //--- PA: 0x00F578   VA: 0x800D8AF0   subsegment: c, Chara_GhostDoctor
 //--------------------------------------------------------------------
 Ai_GhostDoctor_Update               = 0x800D8AF0; // type:func
+Ai_GhostDoctor_AnimUpdate           = 0x800D8B64; // type:func
 Character_CoordTransformUpdate      = 0x800D8BAC; // type:func
 Ai_GhostDoctor_Init                 = 0x800D8BE0; // type:func
 

configs/maps/sym.map7_s03.txt

@@ -122,12 +122,14 @@ Ai_Alessa_Init                      = 0x800D3660; // type:func
 //--- PA: 0x00A10C   VA: 0x800D3684   subsegment: c, Chara_BloodyIncubator
 //------------------------------------------------------------------------
 Ai_BloodyIncubator_Update           = 0x800D3684; // type:func
+Ai_BloodyIncubator_AnimUpdate = 0x800D36F8; // type:func
 Ai_BloodyIncubator_Init             = 0x800D3BA4; // type:func
 
 //------------------------------------------------------------------
 //--- PA: 0x00A64C   VA: 0x800D3BC4   subsegment: c, Chara_Incubator
 //------------------------------------------------------------------
 Ai_Incubator_Update                 = 0x800D3BC4; // type:func
+Ai_Incubator_AnimUpdate = 0x800D3C38; // type:func
 Ai_Incubator_Init                   = 0x800D3F38; // type:func
 
 //-----------------------------------------------------------------

include/maps/map7/map7_s02.h

@@ -91,7 +91,7 @@ extern q3_12 D_800EBB94;
 
 void Ai_GhostDoctor_Update(s_SubCharacter* chara, s_AnmHeader* anmHdr, GsCOORDINATE2* coords);
 
-void func_800D8B64(s_SubCharacter*, s_AnmHeader*, GsCOORDINATE2*);
+void Ai_GhostDoctor_AnimUpdate(s_SubCharacter* chara, s_AnmHeader* anmHdr, GsCOORDINATE2* coords);
 
 /** @brief Updates the transform of the `coord` matrix to the character's position, converting
  * from world space to geometry space.

include/maps/map7/map7_s03.h

@@ -67,13 +67,13 @@ extern s_AnimInfo INCUBUS_ANIM_INFOS[];
 extern s_AnimInfo UNKKOWN_23_ANIM_INFOS[];
 
 void Ai_BloodyIncubator_Update(s_SubCharacter* chara, s_AnmHeader* anmHdr, GsCOORDINATE2* coords);
-void func_800D36F8(s_SubCharacter*, s_AnmHeader*, GsCOORDINATE2*);
+void Ai_BloodyIncubator_AnimUpdate(s_SubCharacter* chara, s_AnmHeader* anmHdr, GsCOORDINATE2* coords);
 void func_800D3740(s_SubCharacter*, GsCOORDINATE2*);
 void func_800D38D8(s_SubCharacter*, GsCOORDINATE2*);
 void Ai_BloodyIncubator_Init(s_SubCharacter* chara);
 
 void Ai_Incubator_Update(s_SubCharacter* chara, s_AnmHeader* anmHdr, GsCOORDINATE2* coords);
-void func_800D3C38(s_SubCharacter*, s_AnmHeader*, GsCOORDINATE2*);
+void Ai_Incubator_AnimUpdate(s_SubCharacter* chara, s_AnmHeader* anmHdr, GsCOORDINATE2* coords);
 void func_800D3C80(s_SubCharacter* chara, GsCOORDINATE2* coord);
 void func_800D3E18(s_SubCharacter*, GsCOORDINATE2*);
 void Ai_Incubator_Init(s_SubCharacter* chara);

src/maps/map7_s02/Chara_GhostDoctor.c

@@ -16,10 +16,20 @@ void Ai_GhostDoctor_Update(s_SubCharacter* chara, s_AnmHeader* anmHdr, GsCOORDIN
 
     func_800D8C00(chara, coords);
     Character_CoordTransformUpdate(chara, coords);
-    func_800D8B64(chara, anmHdr, coords);
+    Ai_GhostDoctor_AnimUpdate(chara, anmHdr, coords);
 }
 
-INCLUDE_ASM("asm/maps/map7_s02/nonmatchings/Chara_GhostDoctor", func_800D8B64);
+void Ai_GhostDoctor_AnimUpdate(s_SubCharacter* chara, s_AnmHeader* anmHdr, GsCOORDINATE2* coords) // 0x800D8B64
+{
+    s_AnimInfo* animInfo;
+
+    // TODO: Wrong properties union.
+    if (chara->properties_E4.player.field_F0 == 0)
+    {
+        animInfo = &GHOST_DOCTOR_ANIM_INFOS[chara->model_0.anim_4.status_0];
+        animInfo->updateFunc_0(&chara->model_0, anmHdr, coords, animInfo);
+    }
+}
 
 void Character_CoordTransformUpdate(s_SubCharacter* chara, GsCOORDINATE2* coord) // 0x800D8BAC
 {

src/maps/map7_s03/Chara_BloodyIncubator.c

@@ -16,10 +16,20 @@ void Ai_BloodyIncubator_Update(s_SubCharacter* chara, s_AnmHeader* anmHdr, GsCOO
 
     func_800D38D8(chara, coords);
     func_800D3740(chara, coords);
-    func_800D36F8(chara, anmHdr, coords);
+    Ai_BloodyIncubator_AnimUpdate(chara, anmHdr, coords);
 }
 
-INCLUDE_ASM("asm/maps/map7_s03/nonmatchings/Chara_BloodyIncubator", func_800D36F8);
+void Ai_BloodyIncubator_AnimUpdate(s_SubCharacter* chara, s_AnmHeader* anmHdr, GsCOORDINATE2* coords) // 0x800D36F8
+{
+    s_AnimInfo* animInfo;
+
+    // TODO: Wrong properties union.
+    if (chara->properties_E4.player.field_F0 == 0)
+    {
+        animInfo = &BLOODY_INCUBATOR_ANIM_INFOS[chara->model_0.anim_4.status_0];
+        animInfo->updateFunc_0(&chara->model_0, anmHdr, coords, animInfo);
+    }
+}
 
 INCLUDE_ASM("asm/maps/map7_s03/nonmatchings/Chara_BloodyIncubator", func_800D3740);
 
@@ -28,4 +38,4 @@ INCLUDE_ASM("asm/maps/map7_s03/nonmatchings/Chara_BloodyIncubator", func_800D38D
 void Ai_BloodyIncubator_Init(s_SubCharacter* chara) // 0x800D3BA4
 {
     sharedFunc_800D923C_0_s00(chara);
-}
+}

src/maps/map7_s03/Chara_Incubator.c

@@ -16,10 +16,20 @@ void Ai_Incubator_Update(s_SubCharacter* chara, s_AnmHeader* anmHdr, GsCOORDINAT
 
     func_800D3E18(chara, coords);
     func_800D3C80(chara, coords);
-    func_800D3C38(chara, anmHdr, coords);
+    Ai_Incubator_AnimUpdate(chara, anmHdr, coords);
 }
 
-INCLUDE_ASM("asm/maps/map7_s03/nonmatchings/Chara_Incubator", func_800D3C38);
+void Ai_Incubator_AnimUpdate(s_SubCharacter* chara, s_AnmHeader* anmHdr, GsCOORDINATE2* coords) // 0x800D3C38
+{
+    s_AnimInfo* animInfo;
+
+    // TODO: Wrong properties union.
+    if (chara->properties_E4.player.field_F0 == 0)
+    {
+        animInfo = &INCUBATOR_ANIM_INFOS[chara->model_0.anim_4.status_0];
+        animInfo->updateFunc_0(&chara->model_0, anmHdr, coords, animInfo);
+    }
+}
 
 void func_800D3C80(s_SubCharacter* chara, GsCOORDINATE2* coord)
 {