Decompile handTickIncChangeGun

src/game/bondmove.c

@@ -11773,8 +11773,8 @@ glabel var7f1ad8e4
 //	bmoveUpdateSpeedTheta();
 //
 //	if (movedata.detonating) {
-//		g_Vars.currentplayer->hands[HAND_RIGHT].mode = 0;
-//		g_Vars.currentplayer->hands[HAND_RIGHT].modenext = 0;
+//		g_Vars.currentplayer->hands[HAND_RIGHT].mode = HANDMODE_NONE;
+//		g_Vars.currentplayer->hands[HAND_RIGHT].modenext = HANDMODE_NONE;
 //		playerActivateRemoteMineDetonator(g_Vars.currentplayernum);
 //	}
 //

src/include/constants.h

@@ -969,6 +969,15 @@
 #define HANDATTACKTYPE_CLOSERANGENOUNCLOAK 10
 #define HANDATTACKTYPE_UPLINK              12
 
+#define HANDMODE_NONE  0
+#define HANDMODE_1  1
+#define HANDMODE_6  6
+#define HANDMODE_7  7
+#define HANDMODE_8  8
+#define HANDMODE_RELOAD  9
+#define HANDMODE_11 11
+#define HANDMODE_13 13
+
 #define HANDSTATE_IDLE        0
 #define HANDSTATE_RELOAD      1
 #define HANDSTATE_2           2
@@ -979,17 +988,12 @@
 #define HANDSTATE_CHANGEFUNC  7
 #define HANDSTATE_AUTOSWITCH  8
 
+#define HANDSTATEFLAG_00000001 0x00000001
 #define HANDSTATEFLAG_00000010 0x00000010
 #define HANDSTATEFLAG_00000020 0x00000020
 #define HANDSTATEFLAG_00000040 0x00000040
 #define HANDSTATEFLAG_00000080 0x00000080
 
-#define HANDSTATEMINOR_IDLE  0
-#define HANDSTATEMINOR_START 1
-#define HANDSTATEMINOR_ANIM  2
-#define HANDSTATEMINOR_3     3
-#define HANDSTATEMINOR_WAIT  55
-
 #define HANGARBIO_INSTITUTE      0
 #define HANGARBIO_DDTOWER        1
 #define HANGARBIO_LABBASEMENT    2

src/include/game/game_097ba0.h

@@ -21,7 +21,7 @@ void handResetAnim(struct hand *hand);
 void handGetWeaponInfo(struct handweaponinfo *info, s32 handnum);
 s32 func0f098ca0(s32 arg0, struct handweaponinfo *info, struct hand *hand);
 u32 func0f098df8(void);
-u32 func0f098f8c(void);
+void func0f098f8c(struct handweaponinfo *info, struct hand *hand);
 bool func0f099008(s32 handnum);
 bool func0f0990b0(struct weaponfunc *basefunc, struct weapon *weapon);
 bool func0f099188(struct hand *hand, s32 gunfunc);

src/include/sfx.h

@@ -1,7 +1,7 @@
 enum sfx {
 	SFX_0000,
 	SFX_LAUNCH_ROCKET,
-	SFX_0002,
+	SFX_EQUIP_HORIZONSCANNER,
 	SFX_0003,
 	SFX_0004,
 	SFX_0005,

src/include/types.h

@@ -2085,14 +2085,14 @@ struct hand {
 	/*0x0648*/ bool triggerprev;
 	/*0x064c*/ bool triggerreleased;
 	/*0x0650*/ s32 count;
-	/*0x0654*/ u32 count60;
+	/*0x0654*/ s32 count60;
 	/*0x0658*/ u32 mode;
 	/*0x065c*/ u32 modenext; // 0 = idle, 9 = reloading
 	/*0x0660*/ u32 numfires;
 	/*0x0664*/ u32 numshotguncarts;
 	/*0x0668*/ u32 refiretime;
 	/*0x066c*/ u32 typechange;
-	/*0x0670*/ u32 pausetime60;
+	/*0x0670*/ s32 pausetime60;
 	/*0x0674*/ u32 pausechange;
 	/*0x0678*/ u32 nextprevchange; // "
 	/*0x067c*/ struct coord posstart;