dol2asm OK

include/JSystem/JMath/JMATrigonometric.h

@@ -0,0 +1,7 @@
+#ifndef JMATRIGONOMETRIC_H
+#define JMATRIGONOMETRIC_H
+
+#include "dolphin/types.h"
+
+
+#endif /* JMATRIGONOMETRIC_H */

include/JSystem/JMath/JMath.h

@@ -1,21 +1,7 @@
-#ifndef JSYSTEM_JMATH_H_
-#define JSYSTEM_JMATH_H_
+#ifndef JMATH_H
+#define JMATH_H
 
 #include "dolphin/types.h"
 
-struct sinCosTableEntry {
-    f32 sin;
-    f32 cos;
-};
 
-extern sinCosTableEntry lbl_80439A20[0x2000];  // JMath::JMath::sincosTable_
-
-inline f32 cM_scos(s16 s) {
-    return lbl_80439A20[static_cast<u16>(s) >> 3].cos;
-}
-
-inline f32 cM_ssin(s16 s) {
-    return lbl_80439A20[static_cast<u16>(s) >> 3].sin;
-}
-
-#endif
+#endif /* JMATH_H */

include/JSystem/JMath/random.h

@@ -1,40 +1,7 @@
-#ifndef JSYSTEM_JMATH_RANDOM_H_
-#define JSYSTEM_JMATH_RANDOM_H_
+#ifndef RANDOM_H
+#define RANDOM_H
 
 #include "dolphin/types.h"
 
-namespace JMath {
-struct TRandom_fast_ {
-    u32 value;
 
-    TRandom_fast_(u32 value);
-    u32 get(void) {
-        value = (value * 0x19660d) + 0x3c6ef35f;
-        return value;
-    }
-
-    u32 get_bit32(void) { return this->get(); }
-
-    // due to the float constant, having this function inlined adds that float to data,
-    // making it not match
-    float get_ufloat_1(void) {
-        // !@bug UB: in C++ it's not legal to read from an union member other
-        // than the last one that was written to.
-        union {
-            f32 f;
-            u32 s;
-        } out;
-        out.s = (this->get() >> 9) | 0x3f800000;
-        return out.f - 1;
-    }
-
-    void setSeed(u32 seed) { value = seed; }
-};
-}  // namespace JMath
-
-// needed for Z2Calc.cpp
-extern "C" {
-void __ct__Q25JMath13TRandom_fast_FUl(JMath::TRandom_fast_*, u32);
-};
-
-#endif
+#endif /* RANDOM_H */

include/JSystem/JMath/vector.h

@@ -1,8 +0,0 @@
-#ifndef JSYSTEM_JMATH_VECTOR_H_
-#define JSYSTEM_JMATH_VECTOR_H_
-
-extern "C" {
-void JMAFastVECNormalize__FPC3VecP3Vec(void);
-}
-
-#endif  // JSYSTEM_JMATH_VECTOR_H_