Decompile invChooseCycleBackWeapon

src/include/constants.h

@@ -2635,26 +2635,27 @@
 #define MPWEAPON_SHIELD           0x25
 #define MPWEAPON_DISABLED         0x26
 
-#define NUM_AICOMMANDS       481
-#define NUM_BODIES           151
-#define NUM_CHALLENGES       30
-#define NUM_CHEATS           42
-#define NUM_EXPLOSIONTYPES   26
-#define NUM_FILES            2014
-#define NUM_FIRESLOTS        20
-#define NUM_MPBEAUHEADS      5
-#define NUM_MPBOTCOMMANDS    14
-#define NUM_MPBODIES         61
-#define NUM_MPHEADS          75
-#define NUM_MPPRESETS        14
-#define NUM_MPTRACKS         42
-#define NUM_RACES            5
-#define NUM_SMOKETYPES       23
-#define NUM_SOLONORMALSTAGES 17
-#define NUM_SOLOSTAGES       21
-#define NUM_STAGES           90
-#define NUM_TEXTURES         3504
-#define NUM_WEAPONS          94
+#define NUM_AICOMMANDS        481
+#define NUM_BODIES            151
+#define NUM_CHALLENGES        30
+#define NUM_CHEATS            42
+#define NUM_CYCLEABLE_WEAPONS 45
+#define NUM_EXPLOSIONTYPES    26
+#define NUM_FILES             2014
+#define NUM_FIRESLOTS         20
+#define NUM_MPBEAUHEADS       5
+#define NUM_MPBOTCOMMANDS     14
+#define NUM_MPBODIES          61
+#define NUM_MPHEADS           75
+#define NUM_MPPRESETS         14
+#define NUM_MPTRACKS          42
+#define NUM_RACES             5
+#define NUM_SMOKETYPES        23
+#define NUM_SOLONORMALSTAGES  17
+#define NUM_SOLOSTAGES        21
+#define NUM_STAGES            90
+#define NUM_TEXTURES          3504
+#define NUM_WEAPONS           94
 
 #define OBJECTIVE_INCOMPLETE 0
 #define OBJECTIVE_COMPLETE   1

src/include/game/bondgun.h

@@ -94,8 +94,8 @@ s32 bgunGetWeaponNum(s32 handnum);
 bool bgun0f0a1a10(s32 weaponnum);
 s32 bgun0f0a1a68(s32 arg0);
 void bgun0f0a1ab0(void);
-void bgun0f0a1b50(void);
-void bgun0f0a1c2c(void);
+void bgunCycleForward(void);
+void bgunCycleBack(void);
 bool bgunHasAmmoForWeapon(s32 weaponnum);
 void bgunAutoSwitchWeapon(void);
 void bgunEquipWeapon2(bool arg0, s32 weaponnum);

src/include/game/inventory/inventory.h

@@ -26,8 +26,8 @@ void invRemoveItemByNum(s32 weaponnum);
 bool invGiveProp(struct prop *prop);
 void invRemoveProp(struct prop *prop);
 s32 invGiveWeaponsByProp(struct prop *prop);
-void func0f1122ec(s32 *weaponnum1, s32 *weaponnum2, s32 arg2);
-void func0f11253c(s32 *weaponnum1, s32 *weaponnum2, s32 arg2);
+void invChooseCycleForwardWeapon(s32 *weaponnum1, s32 *weaponnum2, bool arg2);
+void invChooseCycleBackWeapon(s32 *weaponnum1, s32 *weaponnum2, s32 arg2);
 bool invHasKeyFlags(u32 wantkeyflags);
 bool invHasBriefcase(void);
 bool invHasDataUplink(void);

src/include/types.h

@@ -2433,7 +2433,7 @@ struct gunctrl {
 	/*0x1580*/ s8 weaponnum;
 	/*0x1581*/ s8 prevweaponnum; // previously drawn weapon, switched to when throwing Dragon/Laptop or when ammo depleted
 	/*0x1582*/ s8 switchtoweaponnum; // weaponnum to change to
-	/*0x1583*/ u8 unk1583_00 : 1;
+	/*0x1583*/ u8 dualwielding : 1;
 	/*0x1583*/ u8 unk1583_01 : 1;
 	/*0x1583*/ u8 invertgunfunc : 1;
 	/*0x1583*/ u8 gangsta : 1;