fragment37

pret · Sep 9, 2024 · 74039f3 · 74039f3
1 parent 299734f
commit 74039f3
Show file tree

Hide file tree

Showing 12 changed files with 881 additions and 49 deletions.
diff --git a/include/functions.h b/include/functions.h
@@ -37,6 +37,7 @@ void func_8000D970(OSPfs *);
 void set_watch_lohi(s32);
 
 u32 osGetCount(void);
+OSIntMask osSetIntMask(OSIntMask);;
 
 unsigned long long __ull_rshift(unsigned long long a0, unsigned long long a1);
 unsigned long long __ull_rem(unsigned long long a0, unsigned long long a1);

diff --git a/include/variables.h b/include/variables.h
@@ -63,7 +63,13 @@ extern u8 D_5000000[];
 extern u8 D_6000000[];
 extern u8 D_8D000000[];
 extern void* D_800AA688;
-
+extern u8 D_20144E0[];
+extern u8 D_3044260[];
+extern u8 D_20289E0[];
+extern u8 D_2028A20[];
+extern u8 D_2028A60[];
+extern u8 D_2028AA0[];
+extern u32 D_B0000D10;
 
 typedef struct unk_D_80068BA0 {
     /* 0x00 */ char pad00[0x2];

diff --git a/src/1CF30.c b/src/1CF30.c
@@ -118,7 +118,7 @@ void func_8001D560(s16 arg0, s16 arg1, s16 arg2, s16 arg3, u32* arg4, u32* arg5,
     func_8001C330(arg0, arg1, arg2, arg3, 0, 0, 0x400, 0x400, arg7);
 }
 
-void func_8001D924(u32 arg0) {
+void func_8001D924(u8* arg0) {
     s32 i;
     s32 j;
 

diff --git a/src/1CF30.h b/src/1CF30.h
@@ -15,7 +15,7 @@ void func_8001CF10(s16 arg0, s16 arg1, s16 arg2, s16 arg3, u32* arg4, s16 arg5,
 void func_8001D12C(s16 arg0, s16 arg1, s16 arg2, s16 arg3, u32* arg4, s16 arg5, s32 arg6);
 void func_8001D348(s16 arg0, s16 arg1, s16 arg2, s16 arg3, u32* arg4, s16 arg5, s32 arg6);
 void func_8001D560(s16 arg0, s16 arg1, s16 arg2, s16 arg3, u32* arg4, u32* arg5, s16 arg6, s32 arg7);
-void func_8001D924(u32 arg0);
+void func_8001D924(u8* arg0);
 void func_8001DBDC(u32 arg0, s16 arg1, s16 arg2, s16 arg3, s16 arg4);
 void func_8001E000(s16 arg0, s16 arg1, s16 arg2, f32 arg3, Vtx* arg4, u32 arg5);
 Vtx* func_8001E490(void);

diff --git a/src/26820.h b/src/26820.h
@@ -5,22 +5,18 @@
 
 typedef struct unk_func_8002A728 {
     /* 0x00 */ s16 unk_00;
-    /* 0x04 */ u32* unk_04;
+    /* 0x04 */ struct unk_func_8002A728* unk_04;
 } unk_func_8002A728; // size = 0x8
 
-typedef struct unk_func_80027F24 {
-    /* 0x00 */ s32 unk_00;
-    /* 0x04 */ unk_func_8002A728* unk_04;
-} unk_func_80027F24; // size = 0x8
-
 typedef struct unk_func_80027FA0 {
     /* 0x00 */ u16 unk_00;
     /* 0x02 */ char unk02[0x5];
-} unk_func_80027FA0; // size = 0x7
+    /* 0x07 */ u8 unk_07;
+} unk_func_80027FA0; // size = 0x8
 
 void func_80026684(s32, s32);
-void func_80027F24(unk_func_80027F24*);
-void func_80027F40(unk_func_80027F24*);
+void func_80027F24(unk_func_8002A728*);
+void func_80027F40(unk_func_8002A728*);
 void func_80027FA0(unk_func_80027FA0*, s32);
 void func_80028070(u16*);
 void func_800280D4(s32);

diff --git a/src/29BA0.c b/src/29BA0.c
@@ -518,7 +518,7 @@ void func_8002A6C0(void) {
 void func_8002A728(void) {
     s32 sp34;
     UnkInputStruct8000D738 sp2C;
-    unk_func_80027F24 sp24;
+    unk_func_8002A728 sp24;
 
     main_pool_push_state('EMU0');
 

diff --git a/src/4F410.c b/src/4F410.c
@@ -1,4 +1,4 @@
-#include "global.h"
+#include "4F410.h"
 
 #pragma GLOBAL_ASM("asm/us/nonmatchings/4F410/func_8004E810.s")
 

diff --git a/src/4F410.h b/src/4F410.h
@@ -0,0 +1,8 @@
+#ifndef _4F410_H_
+#define _4F410_H_
+
+#include "global.h"
+
+void func_8004E810(s32, s32);
+
+#endif // _4F410_H_
diff --git a/src/E890.h b/src/E890.h
@@ -3,7 +3,7 @@
 
 #include "global.h"
 
-void func_8000E840(s32*, u8, u8, u8, u8);
+void func_8000E840(Color_RGBA8*, u8, u8, u8, u8);
 void func_8000E88C(Vec3f*, f32, f32, f32);
 void func_8000EB70(Vec3s*, s16, s16, s16);
 void func_8000ED98(s32*);
-Original file line number
+Diff line change
@@ Expand Up @@
         func_8001C330(arg0, arg1, arg2, arg3, 0, 0, 0x400, 0x400, arg7);
     }
-    void func_8001D924(u32 arg0) {
+    void func_8001D924(u8* arg0) {
         s32 i;
         s32 j;
@@ Expand Down @@