func_80097E28 & func_80061D70 & func_800A0724 & func_8008E45C & func_…

…8008D474 & func_800A519C & func_8009CE8C (#68)
MediEvilDecompilation · Apr 18, 2024 · 80b85f1 · 80b85f1
1 parent e1754d6
commit 80b85f1
Show file tree

Hide file tree

Showing 2 changed files with 66 additions and 7 deletions.
diff --git a/include/game.h b/include/game.h
@@ -57,6 +57,8 @@ extern void func_800A3BE0();
 extern void func_800A42B4(s32);
 extern void func_800A0CB4();
 extern void func_800B3430();
+extern s32 D_800EDBF8;
+extern s32 func_8009D484(s16, s16);
 
 typedef struct {
     /* 0x00 */ char pad_0[0x18];
@@ -87,3 +89,39 @@ typedef struct {
     /* 0x00 */ char pad_0[0x8];
     /* 0x08 */ s32 unk8;
 } unkStruct_80099B84;
+
+typedef struct {
+    /* 0x00 */ s32* unk0;
+    /* 0x04 */ s32 unk4;
+} unkStruct_80061D70;
+
+typedef struct {
+    /* 0x00 */ char pad_0[0x120];
+    /* 0x120 */ s8 unk120;
+    /* 0x121 */ s8 unk121;
+    /* 0x122 */ s8 unk122;
+} unkStruct_800A0724;
+
+typedef struct unkStruct_8008E45C {
+/* 0x00 */ char pad_0[0xE];
+/* 0x0E */ s16 unkE;
+/* 0x10 */ char pad_10[0x9];
+/* 0x19 */ u8 unk19;
+} unkStruct_8008E45C;
+
+typedef struct {
+    /* 0x00 */ char pad_0[0x8E];
+    /* 0x8E */ s16 unk8E;
+} unkStruct_800A519C;
+
+typedef struct {
+    /* 0x00 */ char pad_0[0x03];
+    /* 0x03 */ s8 unk3;
+    /* 0x04 */ s32 unk4;
+    /* 0x08 */ s32 unk8;
+} unkStruct_8009CE8C;
+
+typedef struct {
+               s16 unk0;
+               s16 unk2;
+} unkStruct_8009CE8C_2;
diff --git a/src/game/800.c b/src/game/800.c
@@ -1122,7 +1122,11 @@ INCLUDE_ASM("asm/game/nonmatchings/800", func_80061B00);
 
 INCLUDE_ASM("asm/game/nonmatchings/800", func_80061D54);
 
-INCLUDE_ASM("asm/game/nonmatchings/800", func_80061D70);
+s32 func_80061D70(unkStruct_80061D70* arg0) {
+    arg0->unk0 = &D_800EDBF8;
+    arg0->unk4 = 0;
+    return 0xF;
+}
 
 INCLUDE_ASM("asm/game/nonmatchings/800", func_80061D88);
 
@@ -2144,7 +2148,9 @@ INCLUDE_ASM("asm/game/nonmatchings/800", func_8008C830);
 
 INCLUDE_ASM("asm/game/nonmatchings/800", func_8008CFE0);
 
-INCLUDE_ASM("asm/game/nonmatchings/800", func_8008D474);
+void func_8008D474(unkStruct_8008E45C* arg0) {
+    arg0->unkE = (s16)arg0->unk19;
+}
 
 INCLUDE_ASM("asm/game/nonmatchings/800", func_8008D480);
 
@@ -2156,7 +2162,9 @@ INCLUDE_ASM("asm/game/nonmatchings/800", func_8008D5B8);
 
 INCLUDE_ASM("asm/game/nonmatchings/800", func_8008DE58);
 
-INCLUDE_ASM("asm/game/nonmatchings/800", func_8008E45C);
+void func_8008E45C(unkStruct_8008E45C* arg0) {
+    arg0->unkE = arg0->unk19;
+}
 
 INCLUDE_ASM("asm/game/nonmatchings/800", func_8008E468);
 
@@ -2348,7 +2356,9 @@ INCLUDE_ASM("asm/game/nonmatchings/800", func_80097620);
 
 INCLUDE_ASM("asm/game/nonmatchings/800", func_80097A9C);
 
-INCLUDE_ASM("asm/game/nonmatchings/800", func_80097E28);
+boolean func_80097E28(void) {
+    return false;
+}
 
 INCLUDE_ASM("asm/game/nonmatchings/800", func_80097E30);
 
@@ -2520,7 +2530,11 @@ INCLUDE_ASM("asm/game/nonmatchings/800", func_8009C914);
 
 INCLUDE_ASM("asm/game/nonmatchings/800", func_8009CE0C);
 
-INCLUDE_ASM("asm/game/nonmatchings/800", func_8009CE8C);
+void func_8009CE8C(unkStruct_8009CE8C* arg0, unkStruct_8009CE8C_2* arg1) {
+    arg0->unk3 = 2;
+    arg0->unk4 = func_8009D484(arg1->unk0, arg1->unk2);
+    arg0->unk8 = 0;
+}
 
 INCLUDE_ASM("asm/game/nonmatchings/800", func_8009CECC);
 
@@ -2622,7 +2636,12 @@ INCLUDE_ASM("asm/game/nonmatchings/800", func_800A05A8);
 
 INCLUDE_ASM("asm/game/nonmatchings/800", func_800A05FC);
 
-INCLUDE_ASM("asm/game/nonmatchings/800", func_800A0724);
+boolean func_800A0724(unkStruct_800A0724* arg0, s8 arg1, s8 arg2, s8 arg3) {
+    arg0->unk120 = arg1;
+    arg0->unk121 = arg2;
+    arg0->unk122 = arg3;
+    return true;
+}
 
 INCLUDE_ASM("asm/game/nonmatchings/800", func_800A0738);
 
@@ -2763,7 +2782,9 @@ INCLUDE_ASM("asm/game/nonmatchings/800", func_800A4F4C);
 
 INCLUDE_ASM("asm/game/nonmatchings/800", func_800A505C);
 
-INCLUDE_ASM("asm/game/nonmatchings/800", func_800A519C);
+void func_800A519C(unkStruct_800A519C* arg0) {
+    arg0->unk8E = 2;
+}
 
 INCLUDE_ASM("asm/game/nonmatchings/800", func_800A51A8);