Merge pull request #113 from Kelebek1/various

Various
pret · Aug 24, 2024 · dfd542b · dfd542b
2 parents 2e7a8ed + a68f1bb
commit dfd542b
Show file tree

Hide file tree

Showing 25 changed files with 2,976 additions and 82 deletions.
diff --git a/include/functions.h b/include/functions.h
@@ -44,4 +44,6 @@ void func_8002B274(s32, s32);
 // exception_set.s
 void set_watch_lohi(s32);
 
+unsigned long long __ull_rem(unsigned long long a0, unsigned long long a1);
+
 #endif
diff --git a/include/math.h b/include/math.h
@@ -9,6 +9,15 @@
 #define SHT_MAX 32767.0f
 #define SHT_MINV (1.0f / SHT_MAX)
 
+extern long long __d_to_ll(double d);
+extern long long __f_to_ll(float f);
+extern unsigned long long __d_to_ull(double d);
+extern unsigned long long __f_to_ull(float f);
+extern double __ll_to_d(long long s);
+extern float __ll_to_f(long long s);
+extern double __ull_to_d(unsigned long long u);
+extern float __ull_to_f(unsigned long long u);
+
 typedef float MtxF_t[4][4];
 typedef union {
     MtxF_t mf;

diff --git a/include/variables.h b/include/variables.h
@@ -95,8 +95,6 @@ typedef struct unk_D_800A7440 {
 } unk_D_800A7440; // size >= 0x8
 extern unk_D_800A7440 D_800A7440;
 
-
-
 extern struct unk_D_800AC840 D_800AC840;
 extern struct unk_D_800AC840 D_800AC858;
 extern struct unk_D_86002F58_004_000* D_8006F09C;
@@ -146,5 +144,59 @@ extern s8 D_80077DE4;
 extern s32 D_80078E60;
 extern s32 D_80078E64;
 extern s32 D_80078E68;
+extern u8 D_8007840C;
+extern s32 D_80078E70;
+extern s32 D_80078ECC;
+extern u8 D_80078ED0;
+extern u8 D_80078390[];
+extern u32 D_80078404;
+extern s32 D_80078408;
+extern s32 D_80078E74;
+extern u8 D_80078E78;
+extern u8 D_80078E7C;
+extern u8 D_80078E80;
+extern s32 D_80078EC8;
+extern s32 D_800FC680;
+extern s32 D_800FC684;
+extern u32 D_800FC6DC;
+extern s32 D_80078ED4;
+extern s32 D_80078ED8;
+extern s32 D_80078EDC;
+
+typedef struct unk_D_800FC6E4 {
+	/* 0x00 */ char pad00[0x8];
+	/* 0x08 */ s32 unk_08;
+	/* 0x0C */ u32 unk_0C[2];
+} unk_D_800FC6E4; // size >= 0x10
+
+extern unk_D_800FC6E4* D_800FC6E0;
+extern unk_D_800FC6E4* D_800FC6E4;
+
+extern s32 D_800FC688;
+extern s32 D_800FC68C;
+extern s32 D_800FC6A4;
+extern s32 D_800FC6A8;
+
+typedef struct unk_D_800FC6F4 {
+    /* 0x00 */ char pad00[0x14];
+    /* 0x14 */ u32 unk_14;
+    /* 0x18 */ char pad18[0x4];
+    /* 0x1C */ u32 unk_1C;
+    /* 0x20 */ char pad20[0x4];
+    /* 0x24 */ u32 unk_24;
+} unk_D_800FC6F4; /// size >= 0x28
+extern unk_D_800FC6F4* D_800FC6F4;
+
+typedef struct unk_D_800FC6F8 {
+    /* 0x00 */ u32 unk_00[2];
+} unk_D_800FC6F8; // size = 0x8
+extern unk_D_800FC6F8* D_800FC6F8;
+
+typedef struct unk_D_800FC798 {
+    /* 0x00 */ u32 unk_00;
+    /* 0x04 */ u32 unk_04;
+    /* 0x08 */ u32 unk_08;
+} unk_D_800FC798; // size >= 0xC
+extern unk_D_800FC798* D_800FC798;
 
 #endif
diff --git a/linker_scripts/us/symbol_addrs.txt b/linker_scripts/us/symbol_addrs.txt
@@ -239,3 +239,5 @@ D_87A01178 = 0x87A01178;
 D_87A01180 = 0x87A01180;
 D_87A01190 = 0x87A01190;
 D_87A011A4 = 0x87A011A4;
+D_800A7428 = 0x800A7428;
+D_80079014 = 0x80079014;
diff --git a/src/2E110.c b/src/2E110.c
@@ -1,4 +1,3 @@
-#include "global.h"
 #include "2E110.h"
 
 #pragma GLOBAL_ASM("asm/us/nonmatchings/2E110/func_8002D510.s")

diff --git a/src/2E110.h b/src/2E110.h
@@ -3,7 +3,7 @@
 
 #include "global.h"
 
-char* func_8002D7C0(char*, s32, s32, s32);
+char* func_8002D7C0(char* arg0, s32 arg1, s32 arg2, s32 arg3);
 
 
 #endif // _2E110_H_
diff --git a/src/373A0.c b/src/373A0.c
@@ -1,4 +1,5 @@
-#include "global.h"
+#include "373A0.h"
+#include "4CBC0.h"
 
 #pragma GLOBAL_ASM("asm/us/nonmatchings/373A0/func_800367A0.s")
 

diff --git a/src/373A0.h b/src/373A0.h
@@ -0,0 +1,10 @@
+#ifndef _373A0_H_
+#define _373A0_H_
+
+#include "global.h"
+
+void func_800367A0(s32, u8, s32);
+void func_80037234(s32, s32);
+void func_80037360(u32, u32, s32);
+
+#endif // _373A0_H_
diff --git a/src/38BB0.h b/src/38BB0.h
@@ -4,8 +4,19 @@
 #include "global.h"
 
 void func_80038E98(s32, s32);
+s32 func_80038F30(s32, s32);
+s32 func_80039024(s32, s32, s32, s32, u32, s32);
 void func_800392A8(s32, s32);
+s32 func_80039354(s32);
 void func_800393DC(s32, s32);
+void func_80039534(s32, f32);
+void func_800395FC(s32, s32);
+void func_8003979C(s32, s32);
+void func_800397BC(s32);
 void func_8003986C(s32);
+void func_800398F0(s32);
+void func_80039940(void);
+s32 func_80039A7C(s32, s32, s32);
+void func_80039B88(s32, s32, s32, s32);
 
 #endif // _38BB0_H_