no more hook files, add test files

Author: mateusfavarin

include/ctr/nd.h

@@ -4,11 +4,19 @@
 #include <ctr/macros.h>
 #include <ctr/math.h>
 
-void ND_Music_SetIntro();
 void ND_LOAD_XnfFile(char* filename, u32 address, char* dummy);
 s32 ND_SquareRoot0_stub(s32 n);
-s32 ND_MATH_VectorLength(const SVec3* vector);
 int ND_printf(const char* format, ...);
 void ND_LOAD_InitCD();
 
+/* MATH */
+s32 ND_MATH_Sin(u32 angle);
+s32 ND_MATH_Cos(u32 angle);
+s32 ND_MATH_Sqrt(u32 n, u32 shift);
+void ND_MATH_GetInverseMatrixTransformation(Matrix* out, const Matrix* matrix);
+s32 ND_MATH_VectorLength(const SVec3* vector);
+void ND_MATH_VectorNormalize(SVec3* vector);
+void ND_MATH_CombineMatrixTransformation(Matrix* out, const Matrix* m, const Matrix* n);
+void ND_MATH_MatrixMultiplication(Matrix* out, const Matrix* m, const Matrix* n);
+
 #endif

include/ctr/test.h

@@ -0,0 +1,16 @@
+#ifndef TEST_H
+#define TEST_H
+
+#include <ctr/macros.h>
+
+void LoadTestPatches();
+
+#define TEST_MATH_IMPL
+
+#ifdef TEST_MATH_IMPL
+    void TEST_MATH_Sin(u32 angle, s32 res);
+#else
+    #define TEST_MATH_Sin(angle, res)
+#endif
+
+#endif

rewrite/buildList.txt

@@ -4,13 +4,4 @@ common, header, 0x8000B0B8, 0x0, src/hooks/dll/load_decomp.c
 
 // decomp files
 common, DLL, 0x80200000, 0x0, src/math.c src/prim.c, DECOMP.BIN
-
-// decomp hooks
-common, exe, ND_MATH_Sin, 0x0, src/hooks/math/Sin.s
-common, exe, ND_MATH_Cos, 0x0, src/hooks/math/Cos.s
-common, exe, ND_MATH_FastSqrt, 0x0, src/hooks/math/Sqrt.s
-common, exe, ND_MATH_GetInverseMatrixTransformation, 0x0, src/hooks/math/GetInverseMatrixTransformation.s
-common, exe, ND_MATH_VectorLength, 0x0, src/hooks/math/VectorLength.s
-common, exe, ND_MATH_VectorNormalize, 0x0, src/hooks/math/VectorNormalize.s
-common, exe, ND_MATH_MatrixMul, 0x0, src/hooks/math/CombineMatrixTransformation.s
-common, exe, ND_MatrixRotate, 0x0, src/hooks/math/MatrixMultiplication.s
+common, DLL, 0x80600000, 0x0, src/tests/test.c, TESTS.BIN

rewrite/src/hooks/dll/load_decomp.c

@@ -1,9 +1,14 @@
+#include <ctr/macros.h>
 #include <ctr/nd.h>
+#include <ctr/test.h>
 
 void LoadDecomp()
 {
-    const u32 address = 0x80200000;
+    const u32 testAddr = 0x80600000;
+    const u32 decompAddr = 0x80200000;
     char dummy;
     ND_LOAD_InitCD();
-    ND_LOAD_XnfFile("\\DECOMP.BIN;1", address, &dummy);
+    ND_LOAD_XnfFile("\\TESTS.BIN;1", testAddr, &dummy);
+    LoadTestPatches();
+    ND_LOAD_XnfFile("\\DECOMP.BIN;1", decompAddr, &dummy);
 }