maps: match/share sharedFunc_800D5FCC_0_s00

emoose · Giragast · emoose · commit 35bb01df39df · 2025-09-22T00:55:28.000+01:00
Co-authored-by: Giragast &lt;Giragast@users.noreply.github.com&gt;
diff --git a/configs/maps/sym.map0_s00.txt b/configs/maps/sym.map0_s00.txt
@@ -61,6 +61,7 @@ sharedFunc_800D3308_0_s00     = 0x800D3308; // type:func
 sharedFunc_800D3B44_0_s00     = 0x800D3B44; // type:func
 sharedFunc_800D5098_0_s00     = 0x800D5098; // type:func
 sharedFunc_800D5B48_0_s00     = 0x800D5B48; // type:func
+sharedFunc_800D5FCC_0_s00     = 0x800D5FCC; // type:func
 sharedFunc_800D63D0_0_s00     = 0x800D63D0; // type:func
 sharedFunc_800D6554_0_s00     = 0x800D6554; // type:func
 sharedFunc_800D670C_0_s00     = 0x800D670C; // type:func
diff --git a/configs/maps/sym.map0_s01.txt b/configs/maps/sym.map0_s01.txt
@@ -144,6 +144,7 @@ MapEvent_KitchenKnifeItemTake     = 0x800DC830; // type:func
 MapEvent_EmptyFunction            = 0x800DC85C;
 MapEvent_CommonItemTake           = 0x800DC864; // type:func
 MapEvent_AirScreamerDeath         = 0x800DC8C8; // type:func
+Map_WorldObjectsInit              = 0x800DC9C8; // type:func
 Map_WorldObjectsUpdate            = 0x800DCCF4; // type:func
 CutsceneObjects_Add               = 0x800DD2EC; // type:func
 
@@ -231,4 +232,3 @@ g_EventThing_Flashlight           = 0x800E24D0;
 g_EventThing_Map                  = 0x800E2500;
 g_EventThing_PocketRadio          = 0x800E2530;
 g_CommonWorldObjects              = 0x800E2570; // size:0xA8
-Map_WorldObjectsInit = 0x800DC9C8; // type:func
diff --git a/configs/maps/sym.map1_s00.txt b/configs/maps/sym.map1_s00.txt
@@ -63,6 +63,7 @@ sharedFunc_800D3308_0_s00 = 0x800D28F8; // type:func
 sharedFunc_800D3B44_0_s00 = 0x800D3134; // type:func
 sharedFunc_800D5098_0_s00 = 0x800D4828; // type:func
 sharedFunc_800D5B48_0_s00 = 0x800D52D8; // type:func
+sharedFunc_800D5FCC_0_s00 = 0x800D575C; // type:func
 sharedFunc_800D63D0_0_s00 = 0x800D5B60; // type:func
 sharedFunc_800D670C_0_s00 = 0x800D5E9C; // type:func
 sharedFunc_800D67FC_0_s00 = 0x800D5F8C; // type:func
diff --git a/configs/maps/sym.map1_s01.txt b/configs/maps/sym.map1_s01.txt
@@ -53,6 +53,7 @@ sharedFunc_800D3308_0_s00 = 0x800D1EF0; // type:func
 sharedFunc_800D3B44_0_s00 = 0x800D272C; // type:func
 sharedFunc_800D5098_0_s00 = 0x800D3E20; // type:func
 sharedFunc_800D5B48_0_s00 = 0x800D48D0; // type:func
+sharedFunc_800D5FCC_0_s00 = 0x800D4D54; // type:func
 sharedFunc_800D63D0_0_s00 = 0x800D5158; // type:func
 sharedFunc_800D670C_0_s00 = 0x800D5494; // type:func
 sharedFunc_800D67FC_0_s00 = 0x800D5584; // type:func
diff --git a/configs/maps/sym.map1_s02.txt b/configs/maps/sym.map1_s02.txt
@@ -55,6 +55,7 @@ sharedFunc_800D3308_0_s00 = 0x800D2D48; // type:func
 sharedFunc_800D3B44_0_s00 = 0x800D3584; // type:func
 sharedFunc_800D5098_0_s00 = 0x800D4C78; // type:func
 sharedFunc_800D5B48_0_s00 = 0x800D5728; // type:func
+sharedFunc_800D5FCC_0_s00 = 0x800D5BAC; // type:func
 sharedFunc_800D63D0_0_s00 = 0x800D5FB0; // type:func
 sharedFunc_800D6554_0_s00 = 0x800D6134; // type:func
 sharedFunc_800D670C_0_s00 = 0x800D62EC; // type:func
diff --git a/configs/maps/sym.map1_s03.txt b/configs/maps/sym.map1_s03.txt
@@ -56,6 +56,7 @@ sharedFunc_800D3308_0_s00   = 0x800D31C0; // type:func
 sharedFunc_800D3B44_0_s00   = 0x800D39FC; // type:func
 sharedFunc_800D5098_0_s00   = 0x800D50F0; // type:func
 sharedFunc_800D5B48_0_s00   = 0x800D5BA0; // type:func
+sharedFunc_800D5FCC_0_s00   = 0x800D6024; // type:func
 sharedFunc_800D63D0_0_s00   = 0x800D6428; // type:func
 sharedFunc_800D6554_0_s00   = 0x800D65AC; // type:func
 sharedFunc_800D670C_0_s00   = 0x800D6764; // type:func
diff --git a/configs/maps/sym.map5_s02.txt b/configs/maps/sym.map5_s02.txt
@@ -46,6 +46,7 @@ sharedFunc_800D3308_0_s00   = 0x800CE008; // type:func
 sharedFunc_800D3B44_0_s00   = 0x800CE844; // type:func
 sharedFunc_800D5098_0_s00   = 0x800CFF38; // type:func
 sharedFunc_800D5B48_0_s00   = 0x800D09E8; // type:func
+sharedFunc_800D5FCC_0_s00   = 0x800D0E6C; // type:func
 sharedFunc_800D6554_0_s00   = 0x800D1444; // type:func
 sharedFunc_800D670C_0_s00   = 0x800D15FC; // type:func
 sharedFunc_800D67FC_0_s00   = 0x800D16EC; // type:func
diff --git a/configs/maps/sym.map6_s03.txt b/configs/maps/sym.map6_s03.txt
@@ -56,6 +56,7 @@ sharedFunc_800D3308_0_s00   = 0x800CF414; // type:func
 sharedFunc_800D3B44_0_s00   = 0x800CFC50; // type:func
 sharedFunc_800D5098_0_s00   = 0x800D1344; // type:func
 sharedFunc_800D5B48_0_s00   = 0x800D1DF4; // type:func
+sharedFunc_800D5FCC_0_s00   = 0x800D2278; // type:func
 sharedFunc_800D63D0_0_s00   = 0x800D267C; // type:func
 sharedFunc_800D6554_0_s00   = 0x800D2800; // type:func
 sharedFunc_800D670C_0_s00   = 0x800D29B8; // type:func
diff --git a/configs/maps/sym.map6_s04.txt b/configs/maps/sym.map6_s04.txt
@@ -53,6 +53,7 @@ sharedFunc_800D3308_0_s00    = 0x800D3960; // type:func
 sharedFunc_800D3B44_0_s00    = 0x800D419C; // type:func
 sharedFunc_800D5098_0_s00    = 0x800D5890; // type:func
 sharedFunc_800D5B48_0_s00    = 0x800D6340; // type:func
+sharedFunc_800D5FCC_0_s00    = 0x800D67C4; // type:func
 sharedFunc_800D63D0_0_s00    = 0x800D6BC8; // type:func
 sharedFunc_800D6554_0_s00    = 0x800D6D4C; // type:func
 sharedFunc_800D670C_0_s00    = 0x800D6F04; // type:func
diff --git a/configs/maps/sym.map7_s02.txt b/configs/maps/sym.map7_s02.txt
@@ -46,6 +46,7 @@ sharedFunc_800D3308_0_s00      = 0x800D0AF8; // type:func
 sharedFunc_800D3B44_0_s00      = 0x800D1334; // type:func
 sharedFunc_800D5098_0_s00      = 0x800D2A28; // type:func
 sharedFunc_800D5B48_0_s00      = 0x800D34D8; // type:func
+sharedFunc_800D5FCC_0_s00      = 0x800D395C; // type:func
 sharedFunc_800D6554_0_s00      = 0x800D3F34; // type:func
 sharedFunc_800D670C_0_s00      = 0x800D40EC; // type:func
 sharedFunc_800D67FC_0_s00      = 0x800D41DC; // type:func
diff --git a/include/maps/map7/map7_s01.h b/include/maps/map7/map7_s01.h
@@ -0,0 +1,10 @@
+#ifndef _MAPS_MAP7_S01_H
+#define _MAPS_MAP7_S01_H
+
+extern s8 D_800A9945;
+
+void func_800D83EC(void);
+
+void func_800DEDA4(void);
+
+#endif
diff --git a/include/maps/shared.h b/include/maps/shared.h
@@ -2388,6 +2388,8 @@ void sharedFunc_800D5098_0_s00(s_SubCharacter* chara);
 
 void sharedFunc_800D5B48_0_s00(s_SubCharacter* chara);
 
+void sharedFunc_800D5FCC_0_s00(s_SubCharacter* chara);
+
 void sharedFunc_800D63D0_0_s00(s_SubCharacter* chara, s32 moveSpeed);
 
 void sharedFunc_800D6554_0_s00(s_SubCharacter* chara);
diff --git a/include/maps/shared/sharedFunc_800D5FCC_0_s00.h b/include/maps/shared/sharedFunc_800D5FCC_0_s00.h
@@ -0,0 +1,158 @@
+void sharedFunc_800D5FCC_0_s00(s_SubCharacter* chara)
+{
+    s32    var_a1;
+    q19_12 var_s0;
+    s32    var_s2;
+    s32    moveSpeed;
+
+    const float FRICTION_PER_FRAME = 1.5;
+
+    if (chara->health_B0 < sharedData_800E3A24_0_s00)
+    {
+        chara->flags_3E |= (1 << 1);
+    }
+
+    chara->properties_E4.larvalStalker.properties_E8[0].val16[0] |= (1 << 6);
+
+    if (!(chara->properties_E4.larvalStalker.properties_E8[0].val16[0] & (1 << 13)))
+    {
+        if (chara->moveSpeed_38 > 0)
+        {
+            moveSpeed = chara->moveSpeed_38 - FP_MULTIPLY_FLOAT_PRECISE(g_DeltaTime0, FRICTION_PER_FRAME, Q12_SHIFT);
+            if (moveSpeed < 0)
+            {
+                moveSpeed = 0;
+            }
+        }
+        else
+        {
+            moveSpeed = chara->moveSpeed_38 + FP_MULTIPLY_FLOAT_PRECISE(g_DeltaTime0, FRICTION_PER_FRAME, Q12_SHIFT);
+            if (moveSpeed > 0)
+            {
+                moveSpeed = 0;
+            }
+        }
+        chara->moveSpeed_38 = moveSpeed;
+    }
+
+    var_a1 = 0;
+    var_s2 = 0;
+    var_s0 = 0;
+
+    #define ANIM_TIME_INT FP_FROM(chara->model_0.anim_4.time_4, 0xC)
+
+    if (chara->model_0.anim_4.status_0 == ANIM_STATUS(24, false))
+    {
+        var_s0 = Q12(0.15f);
+        var_a1 = 1;
+        var_s2 = FP_ANGLE(180.0f);
+    }
+    else if (ANIM_TIME_INT >= 395 && ANIM_TIME_INT <= 402)
+    {
+        var_s0 = Q12(1.0f);
+        var_a1 = 8 - chara->properties_E4.larvalStalker.properties_E8[5].val16[1];
+        var_s2 = FP_ANGLE(180.0f);
+    }
+    else if (ANIM_TIME_INT >= 407 && ANIM_TIME_INT <= 412)
+    {
+        var_s0 = Q12(0.5f);
+        var_a1 = 5;
+        var_s2 = FP_ANGLE(0.0f);
+    }
+    else if (ANIM_TIME_INT >= 0 && ANIM_TIME_INT <= 3)
+    {
+        var_s0 = Q12(0.1f);
+        var_a1 = 4;
+        var_s2 = FP_ANGLE(180.0f);
+    }
+    else if (ANIM_TIME_INT >= 9 && ANIM_TIME_INT <= 17)
+    {
+        var_s0 = Q12(0.3f);
+        var_a1 = 9;
+        var_s2 = FP_ANGLE(180.0f);
+    }
+    else if (ANIM_TIME_INT >= 4 && ANIM_TIME_INT <= 6)
+    {
+        var_s0 = Q12(0.4f);
+        var_a1 = 3;
+        var_s2 = FP_ANGLE(180.0f);
+    }
+    else if (ANIM_TIME_INT >= 20 && ANIM_TIME_INT <= 23)
+    {
+        var_s0 = Q12(0.1f);
+        var_a1 = 5;
+        var_s2 = FP_ANGLE(0.0f);
+    }
+    else if (ANIM_TIME_INT >= 27 && ANIM_TIME_INT <= 32)
+    {
+        var_s0 = Q12(0.3f);
+        var_a1 = 6;
+        var_s2 = FP_ANGLE(0.0f);
+    }
+    else if (chara->model_0.anim_4.status_0 == ANIM_STATUS(45, true) && (ANIM_TIME_INT >= 159 && ANIM_TIME_INT <= 167))
+    {
+        var_s0 = Q12(0.3f);
+        var_a1 = 8;
+        var_s2 = FP_ANGLE(180.0f);
+    }
+    else if (chara->model_0.anim_4.status_0 == ANIM_STATUS(10, true) && (ANIM_TIME_INT >= 96 && ANIM_TIME_INT <= 100))
+    {
+        var_s0 = Q12(0.2f);
+        var_a1 = 5;
+        var_s2 = FP_ANGLE(180.0f);
+    }
+
+    if (var_s0 != 0)
+    {
+        var_s0 = (s32)(var_s0 * (u32)FP_MULTIPLY_PRECISE(STALKER_ANIM_INFOS[chara->model_0.anim_4.status_0].duration_8.constant, g_DeltaTime0, 12)) / FP_TO(var_a1, 12);
+
+        chara->properties_E4.larvalStalker.properties_E8[1].val16[0] = FP_FROM(var_s0 * Math_Sin(chara->rotation_24.vy + var_s2), 12);
+        chara->properties_E4.larvalStalker.properties_E8[1].val16[1] = FP_FROM(var_s0 * Math_Cos(chara->rotation_24.vy + var_s2), 12);
+    }
+
+    if (chara->model_0.anim_4.status_0 == ANIM_STATUS(26, true) ||
+        chara->model_0.anim_4.status_0 == ANIM_STATUS(17, true) ||
+        chara->model_0.anim_4.status_0 == ANIM_STATUS(18, true))
+    {
+        if (chara->health_B0 == 0 && chara->moveSpeed_38 == 0)
+        {
+            if (chara->model_0.anim_4.status_0 == ANIM_STATUS(26, true))
+            {
+                chara->model_0.anim_4.status_0 = ANIM_STATUS(21, false);
+            }
+            if (chara->model_0.anim_4.status_0 == ANIM_STATUS(17, true))
+            {
+                chara->model_0.anim_4.status_0 = ANIM_STATUS(19, false);
+            }
+            if (chara->model_0.anim_4.status_0 == ANIM_STATUS(18, true))
+            {
+                chara->model_0.anim_4.status_0 = ANIM_STATUS(20, false);
+            }
+            chara->model_0.state_2 = 10;
+            func_80037DC4(chara);
+        }
+
+        if (chara->health_B0 > sharedData_800E3A24_0_s00 &&
+            (Rng_Rand16() % 8) == 0 &&
+            (chara->properties_E4.larvalStalker.properties_E8[0].val16[0] & (1 << 13)) == 0)
+        {
+            if (chara->model_0.anim_4.status_0 == ANIM_STATUS(26, true))
+            {
+                chara->model_0.anim_4.status_0 = ANIM_STATUS(11, false);
+            }
+            if (chara->model_0.anim_4.status_0 == ANIM_STATUS(17, true))
+            {
+                chara->model_0.anim_4.status_0 = ANIM_STATUS(12, false);
+            }
+            if (chara->model_0.anim_4.status_0 == ANIM_STATUS(18, true))
+            {
+                chara->model_0.anim_4.status_0 = ANIM_STATUS(13, false);
+            }
+            
+            chara->model_0.state_2 = 8;
+
+            chara->properties_E4.larvalStalker.properties_E8[0].val16[0] |= (1 << 7);
+            chara->properties_E4.larvalStalker.properties_E8[0].val16[0] &= ~(1 << 6);
+        }
+    }
+}
diff --git a/src/maps/map0_s00/map0_s00.c b/src/maps/map0_s00/map0_s00.c
@@ -256,7 +256,7 @@ INCLUDE_ASM("asm/maps/map0_s00/nonmatchings/map0_s00", func_800D54A8);
 
 INCLUDE_ASM("asm/maps/map0_s00/nonmatchings/map0_s00", func_800D5C64);
 
-INCLUDE_ASM("asm/maps/map0_s00/nonmatchings/map0_s00", func_800D5FCC);
+#include "maps/shared/sharedFunc_800D5FCC_0_s00.h" // 0x800D5FCC
 
 #include "maps/shared/sharedFunc_800D63D0_0_s00.h" // 0x800D63D0
 
diff --git a/src/maps/map1_s00/map1_s00.c b/src/maps/map1_s00/map1_s00.c
@@ -134,7 +134,7 @@ INCLUDE_ASM("asm/maps/map1_s00/nonmatchings/map1_s00", func_800D4C38);
 
 INCLUDE_ASM("asm/maps/map1_s00/nonmatchings/map1_s00", func_800D53F4);
 
-INCLUDE_ASM("asm/maps/map1_s00/nonmatchings/map1_s00", func_800D575C);
+#include "maps/shared/sharedFunc_800D5FCC_0_s00.h" // 0x800D575C
 
 #include "maps/shared/sharedFunc_800D63D0_0_s00.h" // 0x800D5B60
 
diff --git a/src/maps/map1_s01/map1_s01.c b/src/maps/map1_s01/map1_s01.c
@@ -122,7 +122,7 @@ INCLUDE_ASM("asm/maps/map1_s01/nonmatchings/map1_s01", func_800D4230);
 
 INCLUDE_ASM("asm/maps/map1_s01/nonmatchings/map1_s01", func_800D49EC);
 
-INCLUDE_ASM("asm/maps/map1_s01/nonmatchings/map1_s01", func_800D4D54);
+#include "maps/shared/sharedFunc_800D5FCC_0_s00.h" // 0x800D4D54
 
 #include "maps/shared/sharedFunc_800D63D0_0_s00.h" // 0x800D5158
 
diff --git a/src/maps/map1_s02/map1_s02.c b/src/maps/map1_s02/map1_s02.c
@@ -128,7 +128,7 @@ INCLUDE_ASM("asm/maps/map1_s02/nonmatchings/map1_s02", func_800D5088);
 
 INCLUDE_ASM("asm/maps/map1_s02/nonmatchings/map1_s02", func_800D5844);
 
-INCLUDE_ASM("asm/maps/map1_s02/nonmatchings/map1_s02", func_800D5BAC);
+#include "maps/shared/sharedFunc_800D5FCC_0_s00.h" // 0x800D5BAC
 
 #include "maps/shared/sharedFunc_800D63D0_0_s00.h" // 0x800D5FB0
 
diff --git a/src/maps/map1_s03/map1_s03.c b/src/maps/map1_s03/map1_s03.c
@@ -144,7 +144,7 @@ INCLUDE_ASM("asm/maps/map1_s03/nonmatchings/map1_s03", func_800D5500);
 
 INCLUDE_ASM("asm/maps/map1_s03/nonmatchings/map1_s03", func_800D5CBC);
 
-INCLUDE_ASM("asm/maps/map1_s03/nonmatchings/map1_s03", func_800D6024);
+#include "maps/shared/sharedFunc_800D5FCC_0_s00.h" // 0x800D6024
 
 #include "maps/shared/sharedFunc_800D63D0_0_s00.h" // 0x800D6428
 
diff --git a/src/maps/map5_s02/map5_s02.c b/src/maps/map5_s02/map5_s02.c
@@ -101,7 +101,7 @@ INCLUDE_ASM("asm/maps/map5_s02/nonmatchings/map5_s02", func_800D0348);
 
 INCLUDE_ASM("asm/maps/map5_s02/nonmatchings/map5_s02", func_800D0B04);
 
-INCLUDE_ASM("asm/maps/map5_s02/nonmatchings/map5_s02", func_800D0E6C);
+#include "maps/shared/sharedFunc_800D5FCC_0_s00.h" // 0x800D0E6C
 
 INCLUDE_ASM("asm/maps/map5_s02/nonmatchings/map5_s02", func_800D1270);
 
diff --git a/src/maps/map6_s03/map6_s03.c b/src/maps/map6_s03/map6_s03.c
@@ -124,7 +124,7 @@ INCLUDE_ASM("asm/maps/map6_s03/nonmatchings/map6_s03", func_800D1754);
 
 INCLUDE_ASM("asm/maps/map6_s03/nonmatchings/map6_s03", func_800D1F10);
 
-INCLUDE_ASM("asm/maps/map6_s03/nonmatchings/map6_s03", func_800D2278);
+#include "maps/shared/sharedFunc_800D5FCC_0_s00.h" // 0x800D2278
 
 #include "maps/shared/sharedFunc_800D63D0_0_s00.h" // 0x800D267C
 
diff --git a/src/maps/map6_s04/map6_s04.c b/src/maps/map6_s04/map6_s04.c
@@ -124,7 +124,7 @@ INCLUDE_ASM("asm/maps/map6_s04/nonmatchings/map6_s04", func_800D5CA0);
 
 INCLUDE_ASM("asm/maps/map6_s04/nonmatchings/map6_s04", func_800D645C);
 
-INCLUDE_ASM("asm/maps/map6_s04/nonmatchings/map6_s04", func_800D67C4);
+#include "maps/shared/sharedFunc_800D5FCC_0_s00.h" // 0x800D67C4
 
 #include "maps/shared/sharedFunc_800D63D0_0_s00.h" // 0x800D6BC8
 
diff --git a/src/maps/map7_s02/map7_s02.c b/src/maps/map7_s02/map7_s02.c
@@ -100,7 +100,7 @@ INCLUDE_ASM("asm/maps/map7_s02/nonmatchings/map7_s02", func_800D2E38);
 
 INCLUDE_ASM("asm/maps/map7_s02/nonmatchings/map7_s02", func_800D35F4);
 
-INCLUDE_ASM("asm/maps/map7_s02/nonmatchings/map7_s02", func_800D395C);
+#include "maps/shared/sharedFunc_800D5FCC_0_s00.h" // 0x800D395C
 
 INCLUDE_ASM("asm/maps/map7_s02/nonmatchings/map7_s02", func_800D3D60);
 
diff --git a/tools/configs_formatter.py b/tools/configs_formatter.py
