Decompile func0f09a310

src/include/constants.h

@@ -867,6 +867,19 @@
 #define GOPOSFLAG_DUCK         0x40
 #define GOPOSFLAG_80           0x80
 
+#define GUNCMD_END               0
+#define GUNCMD_SHOWPART          1
+#define GUNCMD_HIDEPART          2
+#define GUNCMD_WAITFORZRELEASED  3
+#define GUNCMD_WAITTIME          4
+#define GUNCMD_PLAYSOUND         5
+#define GUNCMD_INCLUDE           6
+#define GUNCMD_RANDOM            7
+#define GUNCMD_REPEATUNTILFULL   8
+#define GUNCMD_POPOUTSACKOFPILLS 9
+#define GUNCMD_PLAYANIMATION     10
+#define GUNCMD_SETSOUNDSPEED     11
+
 #define GUNMEMOWNER_0  0
 #define GUNMEMOWNER_1  1
 #define GUNMEMOWNER_2  2

src/include/game/game_097ba0.h

@@ -13,8 +13,8 @@ u32 func0f097f28(void);
 u32 func0f098030(void);
 u32 func0f09815c(void);
 u32 func0f0981e8(void);
-bool func0f098884(struct remoteminething *arg0, struct shorthand *hand);
-void func0f0988e0(struct remoteminething *arg0, bool arg1, struct hand *hand);
+bool func0f098884(struct guncmd *cmd, struct shorthand *hand);
+void func0f0988e0(struct guncmd *cmd, bool arg1, struct hand *hand);
 u32 func0f098a44(void);
 u32 func0f098bfc(void);
 void func0f098c0c(struct hand *hand);
@@ -43,7 +43,7 @@ s32 func0f09b8e0(struct handweaponinfo *info, s32 handnum, struct hand *hand, s3
 s32 func0f09bc2c(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate);
 u32 func0f09bd58(void);
 bool func0f09bec8(s32 handnum);
-s32 func0f09bf44(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate);
+u32 func0f09bf44(void);
 s32 func0f09c01c(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate);
 s32 func0f09cb44(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate);
 s32 func0f09cb5c(struct handweaponinfo *info, s32 handnum, s32 lvupdate);

src/include/game/game_0b0fd0.h

@@ -35,7 +35,7 @@ bool handHasFunctionFlags(struct shorthand *hand, u32 flags);
 s8 weaponGetMaxFireRatePerTick(u32 weaponnum, u32 funcindex);
 u32 currentPlayerGetSight(void);
 void func0f0b201c(struct shorthand *hand, f32 *arg1);
-u32 *handGetPriToSecAnim(struct shorthand *hand);
-u32 *handGetSecToPriAnim(struct shorthand *hand);
+struct guncmd *handGetPriToSecAnim(struct shorthand *hand);
+struct guncmd *handGetSecToPriAnim(struct shorthand *hand);
 
 #endif

src/include/gunscript.h

@@ -1,48 +1,36 @@
 #define gunscript_end \
-	0, \
-	0,
+	{ GUNCMD_END },
 
 #define gunscript_showpart(keyframe, part) \
-	0x01000000 | keyframe, \
-	part,
+	{ GUNCMD_SHOWPART, 0, keyframe, part },
 
 #define gunscript_hidepart(keyframe, part) \
-	0x02000000 | keyframe, \
-	part,
+	{ GUNCMD_HIDEPART, 0, keyframe, part },
 
 #define gunscript_waitforzreleased(keyframe) \
-	0x03000000 | keyframe, \
-	0,
+	{ GUNCMD_WAITFORZRELEASED, 0, keyframe },
 
 #define gunscript_waittime(keyframe, time) \
-	0x04000000 | keyframe, \
-	time,
+	{ GUNCMD_WAITTIME, 0, keyframe, time },
 
 #define gunscript_playsound(keyframe, sound) \
-	0x05000000 | keyframe, \
-	sound,
+	{ GUNCMD_PLAYSOUND, 0, keyframe, sound },
 
 #define gunscript_include(unk1, address) \
-	0x06000000 | (unk1 << 16), \
-	(u32)address,
+	{ GUNCMD_INCLUDE, unk1, 0, (u32)address },
 
 #define gunscript_random(probability, address) \
-	0x07000000 | probability, \
-	(u32)address,
+	{ GUNCMD_RANDOM, 0, probability, (u32)address },
 
 #define gunscript_repeatuntilfull(triggerkey, dontloop, gototrigger) \
-	0x08000000 | triggerkey, \
-	(dontloop << 16) | gototrigger,
+	{ GUNCMD_REPEATUNTILFULL, 0, triggerkey, (dontloop << 16) | gototrigger },
 
 #define gunscript_popoutsackofpills(unk1) \
-	0x09000000 | unk1, \
-	0,
+	{ GUNCMD_POPOUTSACKOFPILLS, 0, unk1 },
 
 #define gunscript_playanimation(animation, direction, speed) \
-	0x0a000000 | animation, \
-	(direction << 16) | speed,
+	{ GUNCMD_PLAYANIMATION, 0, animation, (direction << 16) | speed },
 
 #define gunscript_setsoundspeed(keyframe, speed) \
-	0x0b000000 | keyframe, \
-	speed,
+	{ GUNCMD_SETSOUNDSPEED, 0, keyframe, speed },
 

src/include/types.h

@@ -2046,7 +2046,7 @@ struct hand {
 	/*0x0cdc*/ u32 unk0cdc;
 	/*0x0ce0*/ u32 unk0ce0;
 	/*0x0ce4*/ u32 attacktype;
-	/*0x0ce8*/ struct remoteminething *unk0ce8;
+	/*0x0ce8*/ struct guncmd *unk0ce8;
 	/*0x0cec*/ ubool unk0cec;
 	/*0x0cf0*/ struct coord unk0cf0;
 	/*0x0cfc*/ struct coord unk0cfc;
@@ -2087,7 +2087,7 @@ struct hand {
 	/*0x0d70*/ u32 unk0d70;
 	/*0x0d74*/ u16 unk0d74[4];
 	/*0x0d7c*/ u32 unk0d7c;
-	/*0x0d80*/ struct remoteminething *unk0d80;
+	/*0x0d80*/ struct guncmd *unk0d80;
 	/*0x0d84*/ struct audiohandle *audiohandle;
 	/*0x0d88*/ u32 ispare4;
 	/*0x0d8c*/ u32 ispare5;
@@ -2107,7 +2107,7 @@ struct hand {
 	/*0x0dc4*/ struct abmag abmag;
 	/*0x0dcc*/ u32 unk0dcc;
 	/*0x0dd0*/ u32 unk0dd0;
-	/*0x0dd4*/ u32 unk0dd4;
+	/*0x0dd4*/ s32 unk0dd4;
 	/*0x0dd8*/ u32 unk0dd8;
 };
 
@@ -2772,7 +2772,7 @@ struct weaponfunc {
 	/*0x06*/ u8 unk06;
 	/*0x07*/ s8 ammoindex; // -1 = no ammo, 0 or 1 = index into weapon->ammos[]
 	/*0x08*/ struct inventory_menupos *menupos;
-	/*0x0c*/ u32 *fire_animation;
+	/*0x0c*/ struct guncmd *fire_animation;
 	/*0x10*/ u32 flags;
 };
 
@@ -2893,7 +2893,7 @@ struct inventory_ammo {
 	u32 type;
 	u32 casingeject;
 	s16 clipsize;
-	u32 *reload_animation;
+	struct guncmd *reload_animation;
 	u32 style;
 };
 
@@ -2905,10 +2905,10 @@ struct modelpartvisibility {
 struct weapon {
 	/*0x00*/ u16 hi_model;
 	/*0x02*/ u16 lo_model;
-	/*0x04*/ u32 *equip_animation;
-	/*0x08*/ u32 *unequip_animation;
-	/*0x0c*/ u32 *pritosec_animation;
-	/*0x10*/ u32 *sectopri_animation;
+	/*0x04*/ struct guncmd *equip_animation;
+	/*0x08*/ struct guncmd *unequip_animation;
+	/*0x0c*/ struct guncmd *pritosec_animation;
+	/*0x10*/ struct guncmd *sectopri_animation;
 	/*0x14*/ void *functions[2];
 	/*0x1c*/ struct inventory_ammo *ammos[2];
 	/*0x24*/ struct inventory_typee *eptr;
@@ -6509,15 +6509,11 @@ struct var800a3180 {
 	/*0x64*/ u32 unk64;
 };
 
-struct remoteminething {
-	u8 unk00;
+struct guncmd {
+	u8 type;
 	u8 unk01;
 	u16 unk02;
-
-	union {
-		u32 unk04;
-		struct remoteminething *next;
-	};
+	u32 unk04;
 };
 
 struct pakthing {