WIP

ribbanya · Oct 2, 2024 · d3ff81f · d3ff81f
1 parent a301b59
commit d3ff81f
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 6 deletions.
diff --git a/src/melee/gm/forward.h b/src/melee/gm/forward.h
@@ -3,11 +3,12 @@
 
 typedef struct datetime datetime;
 typedef struct GameRules GameRules;
+typedef struct gm_8016A92C_arg0_t gm_8016A92C_arg0_t;
 typedef struct gm_8017DB6C_arg0_t gm_8017DB6C_arg0_t;
 typedef struct gmMainLib_8015ED8C_arg0_t gmMainLib_8015ED8C_arg0_t;
+typedef struct lbl_8046B6A0_t lbl_8046B6A0_t;
 typedef struct Placeholder_8016AE38_flags Placeholder_8016AE38_flags;
 typedef struct Placeholder_8016AE38_flags_2 Placeholder_8016AE38_flags_2;
-typedef struct lbl_8046B6A0_t lbl_8046B6A0_t;
 typedef struct Placeholder_8016AE50_ret_val Placeholder_8016AE50_ret_val;
 
 #endif
diff --git a/src/melee/gm/gm_1601.c b/src/melee/gm/gm_1601.c
@@ -594,10 +594,10 @@ void gm_8016A424(s8 arg0)
 
 /// #fn_8016A4C8
 
-void gm_8016A92C(void* arg0)
+void gm_8016A92C(gm_8016A92C_arg0_t* arg0)
 {
-    M2C_FIELD(&lbl_8046B668, s8*, 0x1C) = -2;
-    M2C_FIELD(arg0, M2C_UNK**, 0x58) = &lbl_8046B668;
+    lbl_8046B668.unk_1C = -2;
+    arg0->x58 = &lbl_8046B668;
 }
 
 /// #gm_8016A944

diff --git a/src/melee/gm/gm_1601.h b/src/melee/gm/gm_1601.h
@@ -220,7 +220,7 @@
 /* 16A46C */ UNK_RET fn_8016A46C(UNK_PARAMS);
 /* 16A488 */ UNK_RET fn_8016A488(UNK_PARAMS);
 /* 16A4C8 */ UNK_RET fn_8016A4C8(UNK_PARAMS);
-/* 16A92C */ UNK_RET gm_8016A92C(UNK_PARAMS);
+/* 16A92C */ void gm_8016A92C(struct gm_8016A92C_arg0_t*);
 /* 16A944 */ UNK_RET gm_8016A944(UNK_PARAMS);
 /* 16A97C */ void* gm_8016A97C(void);
 /* 16A98C */ UNK_T gm_8016A98C(void);

diff --git a/src/melee/gm/gm_1601.static.h b/src/melee/gm/gm_1601.static.h
@@ -60,6 +60,13 @@ struct lbl_803D9D20_t {
     /* +EC */ Vec3 interest;
 };
 
+struct lbl_8046B668_t {
+    /* 0x00 */ char pad_0[0x1C];
+    /* 0x1C */ s8 unk_1C;         /* inferred */
+    /* 0x1D */ char pad_1D[0x1B]; /* maybe part of unk_1C[0x1C]? */
+}; /* size = 0x38 */
+STATIC_ASSERT(sizeof(struct lbl_8046B668_t) == 0x38);
+
 /* 160840 */ static u8 fn_80160840(u8 arg0);
 /* 166A8C */ static f32 fn_80166A8C(Vec3*, Vec3*);
 /* 166CBC */ static u8 fn_80166CBC(struct fn_80166CBC_arg0_t* arg0,
@@ -80,7 +87,8 @@ struct lbl_803D9D20_t {
 /* 3B78A4 */ static u8 lbl_803B78A4[0x24];
 /* 3B7930 */ static Vec2 const lbl_803B7930[0x114 / sizeof(Vec2)];
 /* 3D9D20 */ static struct lbl_803D9D20_t lbl_803D9D20;
-/* 46B668 */ static struct lbl_8046B668_t lbl_8046B668[14];
+/* 46B488 */ static struct lbl_8046B488_t lbl_8046B488;
+/* 46B668 */ static struct lbl_8046B668_t lbl_8046B668;
 /* 46B6A0 */ static lbl_8046B6A0_t lbl_8046B6A0;
 /* 46DBD8 */ static UNK_T lbl_8046DBD8[4];
 /* 46DBE8 */ static struct lbl_8046DBE8_t lbl_8046DBE8;

diff --git a/src/melee/gm/types.h b/src/melee/gm/types.h
@@ -302,4 +302,9 @@ struct gmMainLib_8046B0F0_t {
     int x4, x8, xC, x10, x14;
 };
 
+struct gm_8016A92C_arg0_t {
+    char pad_0[0x58];
+    struct lbl_8046B668_t* x58;
+};
+
 #endif