func_8002B83C & func_8002B83C & func_8007A0C0 & func_800A64C4 (#70)

MediEvilDecompilation · May 5, 2024 · 2f0d9ac · 2f0d9ac
1 parent 88b6406
commit 2f0d9ac
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 5 deletions.
diff --git a/include/game.h b/include/game.h
@@ -30,7 +30,7 @@ extern s32 D_800CDF5C[];
 extern s32 D_800EE020;
 extern u16 D_800EEE5E;
 extern s32 D_800EEE64;
-extern void func_8002348C(s32*, s32, s32);
+extern void func_8002348C(s32, s32, s32);
 extern s32 D_800EDFF8;
 extern s32 D_800EEE24;
 extern unkStruct_800F191C D_800F191C;
@@ -58,7 +58,11 @@ extern void func_800A42B4(s32);
 extern void func_800A0CB4();
 extern void func_800B3430();
 extern s32 D_800EDBF8;
+extern s32 D_800EE0B4;
+extern s32 D_800F17B8;
 extern s32 func_8009D484(s16, s16);
+extern s32 func_800A403C(s32, s32);
+extern void func_8008D56C(s32);
 
 typedef struct {
     /* 0x00 */ char pad_0[0x18];
@@ -125,3 +129,15 @@ typedef struct {
     /* 0x00 */ s16 unk0;
     /* 0x02 */ s16 unk2;
 } unkStruct_8009CE8C_2;
+
+typedef struct {
+    /* 0x00 */ char pad_0[0x1C0];
+    /* 0x1C0 */s32 unk1C0;
+} unkStruct_80080E0C;
+
+typedef struct{
+    /* 0x00 */ char pad_0[0x0C];
+    /* 0x0C */ s16 unkC;
+    /* 0x0E */ char pad_E[0x0E];
+    /* 0x1C */ s16 unk1C;
+} unkStruct_800A64C4;
diff --git a/src/game/800.c b/src/game/800.c
@@ -272,7 +272,13 @@ INCLUDE_ASM("asm/game/nonmatchings/800", func_8002B568);
 
 INCLUDE_ASM("asm/game/nonmatchings/800", func_8002B5CC);
 
-INCLUDE_ASM("asm/game/nonmatchings/800", func_8002B83C);
+void func_8002B83C(void) {
+    s32 temp_v0;
+
+    temp_v0 = func_800A403C(0x50, 0);
+    D_800EE0B4 = temp_v0;
+    func_8002348C(temp_v0, 0, 0x50);
+}
 
 INCLUDE_ASM("asm/game/nonmatchings/800", func_8002B878);
 
@@ -1776,7 +1782,10 @@ INCLUDE_ASM("asm/game/nonmatchings/800", func_80079F98);
 
 INCLUDE_ASM("asm/game/nonmatchings/800", func_8007A02C);
 
-INCLUDE_ASM("asm/game/nonmatchings/800", func_8007A0C0);
+void func_8007A0C0(void) {
+    func_800A42B4(D_800F17B8);
+    D_800F17B8 = 0;
+}
 
 INCLUDE_ASM("asm/game/nonmatchings/800", func_8007A0F0);
 
@@ -1938,7 +1947,16 @@ INCLUDE_ASM("asm/game/nonmatchings/800", func_80080B8C);
 
 INCLUDE_ASM("asm/game/nonmatchings/800", func_80080C00);
 
-INCLUDE_ASM("asm/game/nonmatchings/800", func_80080E0C);
+void func_80080E0C(unkStruct_80080E0C* arg0) {
+    s32 temp_a0;
+
+    temp_a0 = arg0->unk1C0;
+    if (temp_a0 != 0) {
+        func_8008D56C(temp_a0);
+        func_800A42B4(arg0->unk1C0);
+        arg0->unk1C0 = 0;
+    }
+}
 
 INCLUDE_ASM("asm/game/nonmatchings/800", func_80080E54);
 
@@ -2829,7 +2847,11 @@ INCLUDE_ASM("asm/game/nonmatchings/800", func_800A6458);
 
 INCLUDE_ASM("asm/game/nonmatchings/800", func_800A648C);
 
-INCLUDE_ASM("asm/game/nonmatchings/800", func_800A64C4);
+bool func_800A64C4(unkStruct_800A64C4* arg0) {
+    arg0->unkC = (u16)(arg0->unkC | 0x200);
+    arg0->unk1C = (u16)(arg0->unk1C + 1);
+    return true;
+}
 
 INCLUDE_ASM("asm/game/nonmatchings/800", func_800A64E4);