func_80058688 & func_80058688 & func_8006EF44 (#72)

MediEvilDecompilation · May 24, 2024 · 03e9a73 · 03e9a73
1 parent 9f88455
commit 03e9a73
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
diff --git a/include/game.h b/include/game.h
@@ -66,6 +66,8 @@ extern void func_8008D56C(s32);
 extern void func_800A519C();
 extern void func_8006CF74(s32, s32);
 extern void func_8006DA8C(s32);
+extern void func_80062204(s32, u32);
+extern u8 D_800EEE48;
 
 typedef struct {
     /* 0x00 */ char pad_0[0x18];
@@ -160,3 +162,13 @@ typedef struct{
     /* 0x06 */ s16 unk6;
     /* 0x08 */ s32 unk8;
 }unkStruct_80068788;
+
+typedef struct{
+    /* 0x00 */ char pad_0[0x28];
+    /* 0x28 */ s32 unk28;
+} unkStruct_80058688;
+
+typedef struct unkStruct_800A2BEC {
+/* 0x00*/ char pad_0[0x8];
+/* 0x08*/ u16 unk8;
+} unkStruct_800A2BEC;
diff --git a/src/game/800.c b/src/game/800.c
@@ -976,7 +976,10 @@ INCLUDE_ASM("asm/game/nonmatchings/800", DestroyFragments);
 
 INCLUDE_ASM("asm/game/nonmatchings/800", func_80058614);
 
-INCLUDE_ASM("asm/game/nonmatchings/800", func_80058688);
+void func_80058688(unkStruct_80058688* arg0) {
+    func_800A42B4(arg0->unk28);
+    func_800A42B4(arg0);
+}
 
 INCLUDE_ASM("asm/game/nonmatchings/800", func_800586BC);
 
@@ -1551,7 +1554,9 @@ INCLUDE_ASM("asm/game/nonmatchings/800", func_8006EE44);
 
 INCLUDE_ASM("asm/game/nonmatchings/800", func_8006EEB4);
 
-INCLUDE_ASM("asm/game/nonmatchings/800", func_8006EF44);
+void func_8006EF44(s32 arg0) {
+    func_80062204(arg0 + 0x18, (u8)D_800EEE48 >> 7);
+}
 
 INCLUDE_ASM("asm/game/nonmatchings/800", func_8006EF70);
 
@@ -2722,7 +2727,10 @@ INCLUDE_ASM("asm/game/nonmatchings/800", func_800A2A84);
 
 INCLUDE_ASM("asm/game/nonmatchings/800", func_800A2BD4);
 
-INCLUDE_ASM("asm/game/nonmatchings/800", func_800A2BEC);
+u16 func_800A2BEC(unkStruct_800A2BEC* arg0, u16 arg1) {
+    arg0->unk8 &= ~arg1;
+    return arg0->unk8;
+}
 
 INCLUDE_ASM("asm/game/nonmatchings/800", func_800A2C04);