Decompile Title overlay (#20)

* Decompile Title overlay

* math structs as cpp when applicable

* fixes and improvements

* regressions fix 1

* regressions fix 2

include/nitro/button.h

@@ -0,0 +1,14 @@
+#pragma once
+
+#define BTN_A (1 << 0) // 0x0001
+#define BTN_B (1 << 1) // 0x0002
+#define BTN_SELECT (1 << 2) // 0x0004
+#define BTN_START (1 << 3) // 0x0008
+#define BTN_DRIGHT (1 << 4) // 0x0010
+#define BTN_DLEFT (1 << 5) // 0x0020
+#define BTN_DUP (1 << 6) // 0x0040
+#define BTN_DDOWN (1 << 7) // 0x0080
+#define BTN_R (1 << 8) // 0x0100
+#define BTN_L (1 << 9) // 0x0200
+
+#define CHECK_BUTTON_COMBO(value, btn) ((value) & (btn))

include/nitro/math.h

@@ -10,6 +10,7 @@ extern "C" {
 
 #define ABS(x) ((x) < 0 ? -(x) : (x))
 #define CLAMP(x, min, max) ((x) > (max) ? (max) : (x) < (min) ? (min) : (x))
+#define CLAMP2(x, min, max) ((x) > (max) ? (max) : (x) >= (min) ? (x) : (min))
 
 // Q20.12 fixed point number
 typedef s32 q20;
@@ -28,41 +29,154 @@ typedef s16 q4;
 #define SIN(n) (gSinCosTable[2 * ((n) >> 4)])
 #define COS(n) (gSinCosTable[2 * ((n) >> 4) + 1])
 
-u32 func_01ff9f3c(s32 a, s32 b);
-s32 Atan2(s32 x, s32 y);
+#ifdef __cplusplus
+}
+#endif
 
-u32 CoDivide64By32(u32 a, u32 b);
-u32 func_01ff98f0(u32 a, u32 b);
-u32 CoReciprocal(u32 x);
-u64 func_01ff992c(u32 x);
-u32 CoSqrt(u32 x);
-u32 CoInvSqrt(u32 x);
-u32 AwaitDivisionResult();
-u32 GetDivisionResult();
-void StartReciprocal(u32 x);
-void StartSqrt(u32 x);
-void func_01ff9ac4(u32 x);
-u32 AwaitSqrtResult();
-void StartDivision64By32(u32 a, u32 b);
-u32 CoDivide32(u32 a, u32 b);
-u32 CoRemainder(u32 a, u32 b);
+#ifdef __cplusplus
+struct Vec2b {
+    /* 0 */ u8 x;
+    /* 1 */ u8 y;
+    /* 2 */
 
-bool Approach(unk32 *src, unk32 dest, unk32 step);
-bool Approach_thunk(unk32 *src, unk32 dest, unk32 step);
-extern q4 gSinCosTable[];
+    Vec2b() {}
+    Vec2b(u8 X, u8 Y) {
+        x = X;
+        y = Y;
+    }
+};
 
+struct Vec2s {
+    /* 0 */ s16 x;
+    /* 1 */ s16 y;
+    /* 2 */
+
+    Vec2s() {}
+    Vec2s(s16 X, s16 Y) {
+        x = X;
+        y = Y;
+    }
+};
+
+struct Vec2us {
+    /* 0 */ u16 x;
+    /* 2 */ u16 y;
+    /* 4 */
+
+    Vec2us() {}
+    Vec2us(u16 X, u16 Y) {
+        x = X;
+        y = Y;
+    }
+};
+
+struct Vec2p {
+    /* 0 */ q20 x;
+    /* 4 */ q20 y;
+    /* 8 */
+
+    Vec2p() {}
+    Vec2p(q20 X, q20 Y) {
+        x = X;
+        y = Y;
+    }
+};
+
+struct Vec3p {
+    /* 0 */ q20 x;
+    /* 4 */ q20 y;
+    /* 8 */ q20 z;
+    /* c */
+
+    Vec3p() {}
+    Vec3p(q20 X, q20 Y, q20 Z) {
+        x = X;
+        y = Y;
+        z = Z;
+    }
+};
+
+struct Vec4p {
+    /* 00 */ q20 x;
+    /* 04 */ q20 y;
+    /* 08 */ q20 z;
+    /* 0c */ q20 w;
+    /* 10 */
+
+    Vec4p() {}
+    Vec4p(q20 X, q20 Y, q20 Z, q20 W) {
+        x = X;
+        y = Y;
+        z = Z;
+        w = W;
+    }
+};
+
+struct Mat2p {
+    /* 00 */ Vec2p xColumn;
+    /* 08 */ Vec2p yColumn;
+    /* 10 */
+
+    Mat2p() {}
+    Mat2p(Vec2p X, Vec2p Y) {
+        xColumn = X;
+        yColumn = Y;
+    }
+};
+
+struct Mat3p {
+    /* 00 */ Vec3p xColumn;
+    /* 0c */ Vec3p yColumn;
+    /* 18 */ Vec3p zColumn;
+    /* 24 */
+
+    Mat3p() {}
+    Mat3p(Vec3p X, Vec3p Y, Vec3p Z) {
+        xColumn = X;
+        yColumn = Y;
+        zColumn = Z;
+    }
+};
+
+struct Mat4x3p {
+    /* 00 */ Vec3p xColumn;
+    /* 0c */ Vec3p yColumn;
+    /* 18 */ Vec3p zColumn;
+    /* 24 */ Vec3p wColumn;
+    /* 30 */
+
+    Mat4x3p() {}
+    Mat4x3p(Vec3p X, Vec3p Y, Vec3p Z, Vec3p W) {
+        xColumn = X;
+        yColumn = Y;
+        zColumn = Z;
+        wColumn = W;
+    }
+};
+
+struct Mat4p {
+    /* 00 */ Vec4p xColumn;
+    /* 10 */ Vec4p yColumn;
+    /* 20 */ Vec4p zColumn;
+    /* 30 */ Vec4p wColumn;
+    /* 40 */
+
+    Mat4p() {}
+    Mat4p(Vec4p X, Vec4p Y, Vec4p Z, Vec4p W) {
+        xColumn = X;
+        yColumn = Y;
+        zColumn = Z;
+        wColumn = W;
+    }
+};
+#else
+extern "C" {
 typedef struct Vec2b {
     /* 0 */ u8 x;
     /* 1 */ u8 y;
     /* 2 */
 } Vec2b;
 
-typedef struct Vec2s {
-    /* 0 */ s16 x;
-    /* 1 */ s16 y;
-    /* 2 */
-} Vec2s;
-
 typedef struct Vec2us {
     /* 0 */ u16 x;
     /* 2 */ u16 y;
@@ -118,6 +232,41 @@ typedef struct Mat4p {
     /* 30 */ Vec4p wColumn;
     /* 40 */
 } Mat4p;
+}
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct VEC2S {
+    /* 0 */ s16 x;
+    /* 1 */ s16 y;
+    /* 2 */
+} VEC2S;
+
+u32 func_01ff9f3c(s32 a, s32 b);
+s32 Atan2(s32 x, s32 y);
+
+u32 CoDivide64By32(u32 a, u32 b);
+u32 func_01ff98f0(u32 a, u32 b);
+u32 CoReciprocal(u32 x);
+u64 func_01ff992c(u32 x);
+u32 CoSqrt(u32 x);
+u32 CoInvSqrt(u32 x);
+u32 AwaitDivisionResult();
+u32 GetDivisionResult();
+void StartReciprocal(u32 x);
+void StartSqrt(u32 x);
+void func_01ff9ac4(u32 x);
+u32 AwaitSqrtResult();
+void StartDivision64By32(u32 a, u32 b);
+u32 CoDivide32(u32 a, u32 b);
+u32 CoRemainder(u32 a, u32 b);
+
+bool Approach(unk32 *src, unk32 dest, unk32 step);
+bool Approach_thunk(unk32 *src, unk32 dest, unk32 step);
+extern q4 gSinCosTable[];
 
 extern const Vec3p gVec3p_ZERO;