Last bits for now

bfbbdecomp · Sep 20, 2024 · 1fd9ed0 · 1fd9ed0
1 parent 5fc7ed4
commit 1fd9ed0
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 0 deletions.
diff --git a/src/SB/Game/zNPCGoalRobo.cpp b/src/SB/Game/zNPCGoalRobo.cpp
@@ -672,6 +672,24 @@ S32 zNPCGoalAttackArfMelee::FXStreakPrep()
     }
 }
 
+S32 zNPCGoalAttackArf::SetAttackMode(S32 a, S32 b)
+{
+    flg_attack &= 0xfffffff8;
+    if (a != 0)
+    {
+        flg_attack |= 2;
+        if (b != 0)
+        {
+            flg_attack |= 4;
+        }
+    }
+    else
+    {
+        flg_attack |= 1;
+    }
+    flg_info |= 0x10;
+}
+
 S32 zNPCGoalAttackFodder::Exit(F32 dt, void* updCtxt)
 {
     if (this->haz_cattle)
@@ -1450,6 +1468,20 @@ S32 zNPCGoalAlertTubelet::Exit(F32 dt, void* updCtxt)
     return xGoal::Exit(dt, updCtxt);
 }
 
+S32 zNPCGoalKnock::Exit(F32 dt, void* updCtxt)
+{
+    zNPCCommon* npc = ((zNPCCommon*)(psyche->clt_owner));
+    npc->VelStop();
+    StreakDone();
+
+    if (!(flg_knock & 4))
+    {
+        npc->pflags &= 0xfb;
+    }
+
+    return xGoal::Exit(dt, updCtxt);
+}
+
 S32 zNPCGoalAlertHammer::Exit(F32 dt, void* updCtxt)
 {
     zNPCHammer* npc = ((zNPCHammer*)(psyche->clt_owner));

diff --git a/src/SB/Game/zNPCGoalStd.h b/src/SB/Game/zNPCGoalStd.h
@@ -360,6 +360,7 @@ class zNPCGoalAttackArf : public zNPCGoalPushAnim
 
     S32 LaunchBone(F32 dt, S32 param_2);
     S32 Exit(F32 dt, void* updCtxt);
+    S32 SetAttackMode(S32 a, S32 b);
     S32 flg_attack; // offset 0x54, size 0x4
 };
 
@@ -1221,6 +1222,7 @@ class zNPCGoalKnock : public zNPCGoalCommon
 
     void StreakDone();
     S32 StreakPrep();
+    S32 Exit(F32 dt, void* updCtxt);
     S32 flg_knock; // offset 0x4C, size 0x4
     xVec3 pos_bumper; // offset 0x50, size 0xC
     S32 floorBounce; // offset 0x5C, size 0x4