zEntPlayer work

src/SB/Core/x/xEnt.h

@@ -149,7 +149,7 @@ struct xEnt : xBase
     U8 penby; // XENT_COLLTYPE_* bitmask
 
     // Offset: 0x24
-    xModelInstance* model;
+    xModelInstance* model; // 0x704 in globals
     xModelInstance* collModel;
     xModelInstance* camcollModel;
     xLightKit* lightKit;
@@ -162,7 +162,7 @@ struct xEnt : xBase
 
     // Offset: 0x44
     xEntRenderCallback render;
-    xEntFrame* frame;
+    xEntFrame* frame; // 0x728 in globals
     xEntCollis* collis; //0x4c
 
     // Offset: 0x50
@@ -199,9 +199,9 @@ struct xEnt : xBase
 #define XENT_PFLAGS_HAS_FRICTION ((U8)(1 << 4))
 
 // More ent flags (xEnt::moreFlags)
-#define XENT_MORE_FLAGS_0x8 ((U8)1<<3)
-#define XENT_MORE_FLAGS_HITTABLE ((U8)1<<4)
-#define XENT_MORE_FLAGS_ANIM_COLL ((U8)1<<5)
+#define XENT_MORE_FLAGS_0x8 ((U8)1 << 3)
+#define XENT_MORE_FLAGS_HITTABLE ((U8)1 << 4)
+#define XENT_MORE_FLAGS_ANIM_COLL ((U8)1 << 5)
 
 // Collision types (xEnt::collType)
 #define XENT_COLLTYPE_NONE (U8)0

src/SB/Core/x/xEntBoulder.cpp

@@ -99,7 +99,6 @@ void xEntBoulder_Init(void* ent, void* asset)
     xEntBoulder_Init((xEntBoulder*)ent, (xEntAsset*)asset);
 }
 
-S32 xEntBoulderEventCB(xBase*, xBase*, U32, const F32*, xBase*);
 void xEntBoulder_BUpdate(xEnt*, xVec3*);
 void xEntBoulder_Update(xEntBoulder*, xScene*, F32);
 

src/SB/Core/x/xEntBoulder.h

@@ -83,5 +83,6 @@ void xEntBoulder_Kill(xEntBoulder* ent);
 void xBoulderGenerator_Init(xBase& data, xDynAsset& asset, size_t);
 void xBoulderGenerator_Init(xBoulderGenerator* bg, xBoulderGeneratorAsset* asset);
 void xBoulderGenerator_Init(xBase& data, xDynAsset& asset);
+S32 xEntBoulderEventCB(xBase*, xBase*, U32, const F32*, xBase*);
 
 #endif

src/SB/Core/x/xFX.h

@@ -168,6 +168,8 @@ extern xFXShine sShineList[2];
 extern xFXRing ringlist[RING_COUNT];
 
 void xFXInit();
+U32 xFXShineStart(const xVec3*, F32, F32, F32, F32, U32, const iColor_tag*, const iColor_tag*, F32,
+                  S32);
 void xFXStartup();
 void xFXShutdown();
 void xFXInit();
@@ -201,7 +203,8 @@ void xFXStreakInit();
 void xFXStreakUpdate(F32 dt);
 void xFXStreakUpdate(U32 streakID, const xVec3*, const xVec3*);
 void xFXStreakRender();
-U32 xFXStreakStart(F32 frequency, F32 alphaFadeRate, F32 alphaStart, U32 textureID, const iColor_tag* edge_a, const iColor_tag* edge_b, S32 taper);
+U32 xFXStreakStart(F32 frequency, F32 alphaFadeRate, F32 alphaStart, U32 textureID,
+                   const iColor_tag* edge_a, const iColor_tag* edge_b, S32 taper);
 void xFXStreakStop(U32);
 void xFXShineInit();
 void xFXShineUpdate(F32 dt);

src/SB/Core/x/xModel.h

@@ -54,7 +54,7 @@ struct xModelInstance
     RwMatrix* Mat; // 0x4C
 
     // Offset: 0x50
-    xVec3 Scale; // 0x704 in globals
+    xVec3 Scale;
     U32 modelID;
     U32 shadowID;
     RpAtomic* shadowmapAtomic;