Decompile func0f060438

src/include/game/game_0601b0.h

@@ -7,7 +7,7 @@ u32 func0f0601b0(void);
 void propHide(struct prop *prop);
 u32 func0f060300(struct prop *prop);
 struct prop *func0f060358(void);
-u32 func0f060438(void);
+void func0f060438(struct prop *prop);
 void func0f0604bc(struct prop *prop);
 u32 func0f060538(void);
 void func0f0605c4(struct prop *prop);

src/include/gvars/gvars.h

@@ -93,27 +93,14 @@ struct g_vars {
 	/*000338*/ struct prop *props;
 	/*00033c*/ struct prop *unk00033c;
 	/*000340*/ struct prop *unk000340;
-	/*000344*/ u32 unk000344;
-	/*000348*/ u32 unk000348;
+	/*000344*/ struct prop *unk000344;
+	/*000348*/ struct prop *unk000348;
 	/*00034c*/ u32 unk00034c;
 	/*000350*/ u32 unk000350;
 	/*000354*/ struct prop *unk000354;
 	/*000358*/ u32 unk000358;
 	/*00035c*/ u32 unk00035c;
-	/*000360*/ u32 unk000360;
-	/*000364*/ u32 unk000364;
-	/*000368*/ u32 unk000368;
-	/*00036c*/ u32 unk00036c;
-	/*000370*/ u32 unk000370;
-	/*000374*/ u32 unk000374;
-	/*000378*/ u32 unk000378;
-	/*00037c*/ u32 unk00037c;
-	/*000380*/ u32 unk000380;
-	/*000384*/ u32 unk000384;
-	/*000388*/ u32 unk000388;
-	/*00038c*/ u32 unk00038c;
-	/*000390*/ u32 unk000390;
-	/*000394*/ u32 unk000394;
+	/*000360*/ struct gvars360 unk000360[2]; // may also start at 35c or 358 with props moved forward
 	/*000398*/ u32 unk000398;
 	/*00039c*/ u32 unk00039c;
 	/*0003a0*/ u32 unk0003a0;

src/include/types.h

@@ -47,7 +47,7 @@ struct prop {
 	s16 unk38;
 	s16 unk3a;
 	u8 unk3c;
-	u8 unk3d;
+	u8 index;
 	u8 unk3e;
 	u8 unk3f_00 : 1;
 	u8 unk3f_01 : 1;
@@ -3892,4 +3892,15 @@ struct savefile_solo {
 	/*0xac*/ u8 firingrangescores[4];
 };
 
+struct gvars360 {
+	u16 nonchrpropcount;
+	u16 chrpropcount;
+	u32 unk04;
+	u32 unk08;
+	u32 unk0c;
+	u32 unk10;
+	u32 unk14;
+	u32 unk18;
+};
+
 #endif