Merge branch 'main' into dev

Author: LivewireCB

src/SB/Core/x/xBehaviour.h

@@ -147,13 +147,20 @@ struct xPsyche : RyzMemData
 
 struct xGoal : xListItem<xGoal>, xFactoryInst
 {
+
     xPsyche* psyche; // 0x18
     S32 goalID;
     en_GOALSTATE stat;
     S32 flg_able; // 0x24
     xGoalProcessCallback fun_process;
     xGoalPreCalcCallback fun_precalc;
     xGoalChkRuleCallback fun_chkRule;
+
+    xPsyche* psyche; //0x18
+    en_GOALSTATE stat;
+    S32 flg_able; //0x20
+    S32 (*fun_process)(xGoal*, void*, en_trantype*, F32, void*);
+
     void* cbdata;
 
     xGoal(S32 goalID)
@@ -192,6 +199,7 @@ struct xGoal : xListItem<xGoal>, xFactoryInst
 
     virtual S32 Enter(F32 dt, void* updCtxt)
     {
+
         return 0;
     }
 
@@ -216,6 +224,15 @@ struct xGoal : xListItem<xGoal>, xFactoryInst
 
     virtual S32 SysEvent(xBase* from, xBase* to, U32 toEvent, const F32* toParam,
                          xBase* toParamWidget, S32* handled)
+
+        S32 flg_npcgauto : 8;
+        S32 flg_npcgable : 16;
+        S32 bul_entered : 1;
+        S32 bul_resumed : 1;
+        S32 bul_unused : 6;
+    } flags;
+    struct
+
     {
         return 1;
     }

src/SB/Game/zParticleSystemWaterfall.cpp

@@ -1,3 +1,4 @@
+
 // #include "zParticleSystemWaterfall.h"
 
 // void zParticleGeneratorWaterfallSplash::deactivate()
@@ -107,3 +108,5 @@
 // {
 //     batch_group.create();
 // }
+
+

src/SB/Game/zParticleSystemWaterfall.h

@@ -1,3 +1,4 @@
+
 // #ifndef ZPARTICLESYSTEMWATERFALL_H
 // #define ZPARTICLESYSTEMWATERFALL_H
 
@@ -272,3 +273,4 @@
 // };
 
 // #endif
+

src/SB/Game/zWadNME.cpp

@@ -16,3 +16,4 @@
 // {
 //     return 0xc07b0007; // HACKED TOGETHER FOR TESTING PURPOSES
 // }
+