map1_s06: func_800D4FE4

Author: emoose

include/maps/map1/map1_s06.h

@@ -59,6 +59,8 @@ void func_800D30F0(s_SubCharacter* chara);
 
 void func_800D4FC0(s32 arg0, s32 arg1);
 
+bool func_800D4FE4(s_SubCharacter* chara, s32 moveSpeed);
+
 void func_800D5400(void);
 
 void func_800D5B98(void);
@@ -78,6 +80,4 @@ void func_800D6578(void);
 
 void func_800D6C88(void);
 
-s32 func_800D4FE4(s_SubCharacter* chara, s32 moveSpeed);
-
 #endif

src/maps/map1_s06/map1_s06.c

@@ -276,7 +276,16 @@ void func_800D4FC0(s32 arg0, s32 arg1) // 0x800D4FC0
     sharedData_800D8616_1_s05 += arg1;
 }
 
-INCLUDE_ASM("asm/maps/map1_s06/nonmatchings/map1_s06", func_800D4FE4);
+bool func_800D4FE4(s_SubCharacter* chara, s32 moveSpeed) // 0x800D4FE4
+{
+    // TODO: Using wrong `properties_E4` union member?
+    s32 runTimer;
+
+    runTimer = chara->properties_E4.player.runTimer_F8;
+    
+    return ((runTimer < 0  || runTimer > Q12(198.0f)) && (chara->model_0.anim_4.time_4 < Q12(175.0f))) ||
+           ((runTimer >= 0 && runTimer < Q12(175.0f)) && (chara->model_0.anim_4.time_4 > Q12(198.0f)));
+}
 
 INCLUDE_ASM("asm/maps/map1_s06/nonmatchings/map1_s06", func_800D5048);