WIP: Reproduce game weak data with a PCH

include/Enemy/CoasterKiller.hpp

@@ -40,7 +40,7 @@ class TCoasterEnemy : public TWalkerEnemy {
 public:
 	TCoasterEnemy(const char* name)
 	    : TWalkerEnemy(name)
-	    , mPathIdx(0) { };
+	    , mPathDir(0) { };
 	virtual ~TCoasterEnemy() { }
 
 	virtual void calcRootMatrix();

include/MarioUtil/ShadowUtil.hpp

@@ -39,6 +39,9 @@ class TMBindShadowBody {
 	bool isBodyJoint(int);
 	void entryDrawShadow();
 	void calc();
+
+private:
+	/* 0x0 */ u8 unk0[0x1C];
 };
 
 class TAlphaShadowQuad;

include/SMS.pch

@@ -0,0 +1,12 @@
+#ifndef SMS_PCH
+#define SMS_PCH
+
+#include <math.h>
+#include <JSystem/J3D/J3DGraphBase/Blocks/J3DTexGenBlocks.hpp>
+#include <JSystem/J3D/J3DGraphBase/Blocks/J3DTevBlocks.hpp>
+#include <JSystem/J3D/J3DGraphBase/Blocks/J3DPEBlocks.hpp>
+#include <JSystem/J3D/J3DGraphBase/Blocks/J3DIndBlocks.hpp>
+#include <JSystem/J3D/J3DGraphBase/Blocks/J3DColorBlocks.hpp>
+#include <JSystem/J3D/J3DGraphAnimator/J3DJoint.hpp>
+
+#endif

src/Enemy/Kumokun.cpp

@@ -1029,7 +1029,7 @@ void TKumokunManager::load(JSUMemoryInputStream& stream)
 	unk38 = params;
 
 	params->mSLAttackRadius.set(60);
-	params->mSLAttackRadius.set(50);
+	params->mSLAttackHeight.set(50);
 	params->mSLDamageRadius.set(60);
 	params->mSLDamageHeight.set(70);
 	TSmallEnemyManager::load(stream);

src/Enemy/bgtentacle.cpp

@@ -1331,7 +1331,10 @@ void TBGTentacle::calcAttackGuideAnm()
 void TBGTentacle::resetAllNodes(const JGeometry::TVec3<f32>& param_1)
 {
 	JGeometry::TVec3<f32> local_78 = param_1;
-	JGeometry::TVec3<f32> zero(0.0f, 0.0f, 0.0f);
+	JGeometry::TVec3<f32> zero;
+	zero.z = 0.0f;
+	zero.y = 0.0f;
+	zero.x = 0.0f;
 
 	getFirstNode()->onUnk24();
 

src/Enemy/graph.cpp

@@ -7,13 +7,6 @@
 #include <stdlib.h>
 #include <types.h>
 
-static void dummy(Vec* v)
-{
-	static Vec v1  = { 1.0f, 1.0f, 1.0f };
-	static Vec v2  = { 1.0f, 1.0f, 1.0f };
-	static int a[] = { 0, 2, 1, 3 };
-}
-
 // rogue include
 #include <M3DUtil/InfectiousStrings.hpp>
 

src/MSound/MSModBgm.cpp

@@ -5,11 +5,6 @@
 #include <MSound/MSSetSound.hpp>
 #include <MSound/MSoundBGM.hpp>
 
-// TODO: this is from the PCH
-static Vec dummy1   = { 1.0f, 1.0f, 1.0f };
-static Vec dummy2   = { 1.0f, 1.0f, 1.0f };
-static u32 dummy3[] = { 0, 2, 1, 3 };
-
 JAISound* MSModBgm::modBgm(u8 param_1, u8 param_2)
 {
 	switch (param_1) {

src/Map/MapEventMare.cpp

@@ -47,7 +47,7 @@ void TMareWallRock::appear()
 	(void)0;
 
 	unk10C[0]->setUp();
-	unk104->alive();
+	unk104->awake();
 	JGeometry::TVec3<f32> t(0.0f, 0.0f, unkFC);
 	unk10C[0]->moveTrans(t);
 	f32 rotY = unk128;

src/MarioUtil/MathUtil.cpp

@@ -1,10 +1,6 @@
 #include <MarioUtil/MathUtil.hpp>
 #include <JSystem/JMath.hpp>
 
-static Vec dummy1   = { 1.0f, 1.0f, 1.0f };
-static Vec dummy2   = { 1.0f, 1.0f, 1.0f };
-static int dummy3[] = { 0, 2, 1, 3 };
-
 static u16 atntable[] = {
 	0,    10,   20,   31,   41,   51,   61,   71,   81,   92,   102,  112,
 	122,  132,  143,  153,  163,  173,  183,  194,  204,  214,  224,  234,

src/NPC/NpcInitData.cpp

@@ -2,9 +2,6 @@
 #include <types.h>
 
 // pch issues
-static f32 dummy0[3]       = { 1.0f, 1.0f, 1.0f };
-static f32 dummy1[3]       = { 1.0f, 1.0f, 1.0f };
-static u32 dummy2[4]       = { 0, 2, 1, 3 };
 static const char dummy3[] = "\0\0\0\0\0\0\0\0\0\0\0";
 static const char dummy4[] = "メモリが足りません\n";
 static const char dummy5[] = "__ROOT_JOINT__";

src/NPC/NpcSound.cpp

@@ -1,9 +1,6 @@
 #include <NPC/NpcBase.hpp>
 
 // pch issues with J3DJoint and co
-static Vec dummy0                    = { 1.0f, 1.0f, 1.0f };
-static Vec dummy1                    = { 1.0f, 1.0f, 1.0f };
-static u32 dummy2[]                  = { 0, 2, 1, 3 };
 static const char dummy3[]           = "\0\0\0\0\0\0\0\0\0\0\0";
 static const char dummy4[]           = "メモリが足りません\n";
 static const char* MtxCalcTypeName[] = {

src/System/CardManager.cpp

@@ -5,10 +5,6 @@
 #include <JSystem/JSupport/JSUMemoryOutputStream.hpp>
 #include <System/FlagManager.hpp>
 
-f32 dummy[]  = { 1.0f, 1.0f, 1.0f };
-f32 dummy2[] = { 1.0f, 1.0f, 1.0f };
-u32 dummy3[] = { 0, 2, 1, 3 };
-
 static u8 sDetach[2];
 const char CardFileName[0x20] = "super_mario_sunshine\0\0\0\0\0\0\0\0\0\0\0";
 

tools/project.py

@@ -664,11 +664,11 @@ def write_cargo_rule():
     mwcc_sjis_implicit: List[Optional[Path]] = [*mwcc_implicit, sjiswrap]
 
     # MWCC for precompiled headers
-    mwcc_pch_cmd = f"{wrapper_cmd}{mwcc} $cflags -MMD -c $in -o $basedir -precompile $basefilestem.mch"
+    mwcc_pch_cmd = f'{wrapper_cmd}{mwcc} $cflags -MMD -c $in -o "$basedir" -precompile $basefilestem.mch'
     mwcc_pch_implicit: List[Optional[Path]] = [*mwcc_implicit]
 
     # MWCC for precompiled headers with UTF-8 to Shift JIS wrapper
-    mwcc_pch_sjis_cmd = f"{wrapper_cmd}{sjiswrap} {mwcc} $cflags -MMD -c $in -o $basedir -precompile $basefilestem.mch"
+    mwcc_pch_sjis_cmd = f'{wrapper_cmd}{sjiswrap} {mwcc} $cflags -MMD -c $in -o "$basedir" -precompile $basefilestem.mch'
     mwcc_pch_sjis_implicit: List[Optional[Path]] = [*mwcc_implicit, sjiswrap]
 
     # MWCC with extab post-processing