diff --git a/src/game/bondgun.c b/src/game/bondgun.c
index ad2f36d92..c3e7b9931 100644
--- a/src/game/bondgun.c
+++ b/src/game/bondgun.c
@@ -8088,11 +8088,11 @@ bool bgunIsReadyToSwitch(s32 handnum)
 			}
 		}
 
-		if (player->hands[handnum].inuse && player->gunctrl.unk1583_00 == false) {
+		if (player->hands[handnum].inuse && !player->gunctrl.dualwielding) {
 			return true;
 		}
 
-		if (!player->hands[handnum].inuse && player->gunctrl.unk1583_00) {
+		if (!player->hands[handnum].inuse && player->gunctrl.dualwielding) {
 			return true;
 		}
 	}
@@ -8127,7 +8127,7 @@ bool bgun0f09bf44(s32 handnum)
 		result = false;
 	}
 
-	if (handnum == HAND_LEFT && player->gunctrl.unk1583_00 != player->hands[handnum].inuse) {
+	if (handnum == HAND_LEFT && player->gunctrl.dualwielding != player->hands[handnum].inuse) {
 		result = false;
 	}
 
@@ -15721,9 +15721,8 @@ void bgun0f0a1528(void)
 				ctrl->switchtoweaponnum = WEAPON_UNARMED;
 			}
 
-			if (ctrl->unk1583_00
-					&& !invHasDoubleWeaponIncAllGuns(ctrl->switchtoweaponnum, ctrl->switchtoweaponnum)) {
-				ctrl->unk1583_00 = false;
+			if (ctrl->dualwielding && !invHasDoubleWeaponIncAllGuns(ctrl->switchtoweaponnum, ctrl->switchtoweaponnum)) {
+				ctrl->dualwielding = false;
 			}
 
 			func0f0d7364();
@@ -15767,10 +15766,10 @@ void bgun0f0a1528(void)
 			}
 
 			if (ctrl->weaponnum == WEAPON_REMOTEMINE) {
-				ctrl->unk1583_00 = true;
+				ctrl->dualwielding = true;
 			}
 
-			if (!ctrl->unk1583_00) {
+			if (!ctrl->dualwielding) {
 				lefthand->inuse = false;
 			}
 
@@ -15837,7 +15836,7 @@ void bgun0f0a1528(void)
 				}
 
 				invRemoveItemByNum(ctrl->weaponnum);
-				bgun0f0a1c2c();
+				bgunCycleBack();
 			}
 
 			ctrl->curfnstr = 0;
@@ -15845,11 +15844,11 @@ void bgun0f0a1528(void)
 			ctrl->unk1583_04 = false;
 		}
 	} else {
-		if (((player->hands[HAND_LEFT].inuse && !player->gunctrl.unk1583_00)
-					|| (!player->hands[HAND_LEFT].inuse && player->gunctrl.unk1583_00))
+		if (((player->hands[HAND_LEFT].inuse && !player->gunctrl.dualwielding)
+					|| (!player->hands[HAND_LEFT].inuse && player->gunctrl.dualwielding))
 				&& bgun0f09bec8(HAND_LEFT)) {
 			bgun0f0a134c(HAND_LEFT);
-			player->hands[HAND_LEFT].inuse = player->gunctrl.unk1583_00;
+			player->hands[HAND_LEFT].inuse = player->gunctrl.dualwielding;
 		}
 	}
 }
@@ -15900,7 +15899,7 @@ s32 bgun0f0a1a68(s32 arg0)
 		weaponnum = g_Vars.currentplayer->gunctrl.weaponnum;
 	}
 
-	if (!g_Vars.currentplayer->gunctrl.unk1583_00 && arg0 == 1) {
+	if (!g_Vars.currentplayer->gunctrl.dualwielding && arg0 == 1) {
 		weaponnum = WEAPON_NONE;
 	}
 
@@ -15930,7 +15929,7 @@ void bgun0f0a1ab0(void)
 	}
 }
 
-void bgun0f0a1b50(void)
+void bgunCycleForward(void)
 {
 	s32 weaponnum1;
 	s32 weaponnum2;
@@ -15944,20 +15943,20 @@ void bgun0f0a1b50(void)
 			weaponnum1 = player->gunctrl.prevweaponnum;
 			weaponnum2 = player->gunctrl.prevweaponnum * player->gunctrl.unk1583_01;
 		} else {
-			func0f1122ec(&weaponnum1, &weaponnum2, 0);
+			invChooseCycleForwardWeapon(&weaponnum1, &weaponnum2, false);
 		}
 
 		if (weaponnum2 != weaponnum1) {
-			player->gunctrl.unk1583_00 = false;
+			player->gunctrl.dualwielding = false;
 		} else {
-			player->gunctrl.unk1583_00 = true;
+			player->gunctrl.dualwielding = true;
 		}
 
 		bgunEquipWeapon(weaponnum1);
 	}
 }
 
-void bgun0f0a1c2c(void)
+void bgunCycleBack(void)
 {
 	s32 weaponnum1;
 	s32 weaponnum2;
@@ -15975,13 +15974,13 @@ void bgun0f0a1c2c(void)
 			weaponnum1 = player->gunctrl.prevweaponnum;
 			weaponnum2 = player->gunctrl.prevweaponnum * player->gunctrl.unk1583_01;
 		} else {
-			func0f11253c(&weaponnum1, &weaponnum2, 0);
+			invChooseCycleBackWeapon(&weaponnum1, &weaponnum2, false);
 		}
 
 		if (weaponnum2 == WEAPON_NONE) {
-			player->gunctrl.unk1583_00 = false;
+			player->gunctrl.dualwielding = false;
 		} else {
-			player->gunctrl.unk1583_00 = true;
+			player->gunctrl.dualwielding = true;
 		}
 
 		bgunEquipWeapon(weaponnum1);
@@ -16354,9 +16353,9 @@ glabel bgunAutoSwitchWeapon
 //	// Switch to newweaponnum
 //	if (newweaponnum >= 0 && newweaponnum != curweaponnum) {
 //		if (invHasDoubleWeaponIncAllGuns(newweaponnum, newweaponnum)) {
-//			g_Vars.currentplayer->gunctrl.unk1583_00 = true;
+//			g_Vars.currentplayer->gunctrl.dualwielding = true;
 //		} else {
-//			g_Vars.currentplayer->gunctrl.unk1583_00 = false;
+//			g_Vars.currentplayer->gunctrl.dualwielding = false;
 //		}
 //
 //		bgunEquipWeapon(newweaponnum);
@@ -16371,9 +16370,9 @@ void bgunEquipWeapon2(bool arg0, s32 weaponnum)
 {
 	if (arg0 == 1) {
 		if (weaponnum == WEAPON_NONE) {
-			g_Vars.currentplayer->gunctrl.unk1583_00 = false;
+			g_Vars.currentplayer->gunctrl.dualwielding = false;
 		} else {
-			g_Vars.currentplayer->gunctrl.unk1583_00 = true;
+			g_Vars.currentplayer->gunctrl.dualwielding = true;
 		}
 	} else {
 		if (weaponnum > WEAPON_SUICIDEPILL) {
@@ -30154,7 +30153,7 @@ void bgunsTick(bool triggeron)
 			bgunEquipWeapon(WEAPON_UNARMED);
 		}
 
-		g_Vars.currentplayer->gunctrl.unk1583_00 = 0;
+		g_Vars.currentplayer->gunctrl.dualwielding = false;
 		g_Vars.currentplayer->devicesactive = 0;
 
 		chr->cloakpause = 0;
diff --git a/src/game/bondmove.c b/src/game/bondmove.c
index cff0ca069..23360fb0e 100644
--- a/src/game/bondmove.c
+++ b/src/game/bondmove.c
@@ -1731,11 +1731,11 @@ void bmoveProcessInput(bool allowc1x, bool allowc1y, bool allowc1buttons, bool i
 
 	if (cancycleweapons) {
 		while (movedata.weaponbackoffset-- > 0) {
-			bgun0f0a1c2c();
+			bgunCycleBack();
 		}
 
 		while (movedata.weaponforwardoffset-- > 0) {
-			bgun0f0a1b50();
+			bgunCycleForward();
 		}
 	}
 
diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c
index fd1c3fd66..2814dffc4 100644
--- a/src/game/chr/chraicommands.c
+++ b/src/game/chr/chraicommands.c
@@ -2327,7 +2327,7 @@ bool aiChrDropWeapon(void)
 		setCurrentPlayerNum(playernum);
 		weaponnum = bgunGetWeaponNum(HAND_RIGHT);
 		invRemoveItemByNum(weaponnum);
-		bgun0f0a1c2c();
+		bgunCycleBack();
 		setCurrentPlayerNum(prevplayernum);
 	} else if (chr && chr->prop) {
 		if (chr->weapons_held[0]) {
diff --git a/src/game/game_010b20.c b/src/game/game_010b20.c
index 46ea9c4e8..517e8938c 100644
--- a/src/game/game_010b20.c
+++ b/src/game/game_010b20.c
@@ -159,7 +159,7 @@ void func0f010bb0(void)
 	g_Vars.currentplayer->gunctrl.gunlocktimer = 0;
 
 	g_Vars.currentplayer->gunctrl.unk1583_06 = true;
-	g_Vars.currentplayer->gunctrl.unk1583_00 = false;
+	g_Vars.currentplayer->gunctrl.dualwielding = false;
 	g_Vars.currentplayer->gunctrl.unk1583_04 = false;
 
 	g_Vars.currentplayer->gunctrl.switchtoweaponnum = -1;
diff --git a/src/game/inventory/inventory.c b/src/game/inventory/inventory.c
index b595bb4db..9d00b349a 100644
--- a/src/game/inventory/inventory.c
+++ b/src/game/inventory/inventory.c
@@ -561,7 +561,7 @@ s32 invGiveWeaponsByProp(struct prop *prop)
 }
 
 GLOBAL_ASM(
-glabel func0f1122ec
+glabel invChooseCycleForwardWeapon
 /*  f1122ec:	27bdffd0 */ 	addiu	$sp,$sp,-48
 /*  f1122f0:	3c02800a */ 	lui	$v0,%hi(g_Vars+0x284)
 /*  f1122f4:	8c42a244 */ 	lw	$v0,%lo(g_Vars+0x284)($v0)
@@ -730,178 +730,76 @@ glabel func0f1122ec
 /*  f112538:	27bd0030 */ 	addiu	$sp,$sp,0x30
 );
 
-GLOBAL_ASM(
-glabel func0f11253c
-/*  f11253c:	27bdffd8 */ 	addiu	$sp,$sp,-40
-/*  f112540:	3c03800a */ 	lui	$v1,%hi(g_Vars+0x284)
-/*  f112544:	8c63a244 */ 	lw	$v1,%lo(g_Vars+0x284)($v1)
-/*  f112548:	afbf0024 */ 	sw	$ra,0x24($sp)
-/*  f11254c:	afb30020 */ 	sw	$s3,0x20($sp)
-/*  f112550:	afb2001c */ 	sw	$s2,0x1c($sp)
-/*  f112554:	afb10018 */ 	sw	$s1,0x18($sp)
-/*  f112558:	afb00014 */ 	sw	$s0,0x14($sp)
-/*  f11255c:	afa40028 */ 	sw	$a0,0x28($sp)
-/*  f112560:	afa5002c */ 	sw	$a1,0x2c($sp)
-/*  f112564:	8c781870 */ 	lw	$t8,0x1870($v1)
-/*  f112568:	8c820000 */ 	lw	$v0,0x0($a0)
-/*  f11256c:	00c09025 */ 	or	$s2,$a2,$zero
-/*  f112570:	8cb30000 */ 	lw	$s3,0x0($a1)
-/*  f112574:	1300003a */ 	beqz	$t8,.L0f112660
-/*  f112578:	00408825 */ 	or	$s1,$v0,$zero
-/*  f11257c:	00408025 */ 	or	$s0,$v0,$zero
-/*  f112580:	00402025 */ 	or	$a0,$v0,$zero
-/*  f112584:	0fc2c5f0 */ 	jal	weaponHasFlag
-/*  f112588:	24051000 */ 	addiu	$a1,$zero,0x1000
-/*  f11258c:	50400006 */ 	beqzl	$v0,.L0f1125a8
-/*  f112590:	2411002d */ 	addiu	$s1,$zero,0x2d
-/*  f112594:	16330003 */ 	bne	$s1,$s3,.L0f1125a4
-/*  f112598:	02008825 */ 	or	$s1,$s0,$zero
-/*  f11259c:	10000071 */ 	b	.L0f112764
-/*  f1125a0:	00009825 */ 	or	$s3,$zero,$zero
-.L0f1125a4:
-/*  f1125a4:	2411002d */ 	addiu	$s1,$zero,0x2d
-.L0f1125a8:
-/*  f1125a8:	2619002c */ 	addiu	$t9,$s0,0x2c
-.L0f1125ac:
-/*  f1125ac:	0331001a */ 	div	$zero,$t9,$s1
-/*  f1125b0:	00008010 */ 	mfhi	$s0
-/*  f1125b4:	2608002c */ 	addiu	$t0,$s0,0x2c
-/*  f1125b8:	16200002 */ 	bnez	$s1,.L0f1125c4
-/*  f1125bc:	00000000 */ 	nop
-/*  f1125c0:	0007000d */ 	break	0x7
-.L0f1125c4:
-/*  f1125c4:	2401ffff */ 	addiu	$at,$zero,-1
-/*  f1125c8:	16210004 */ 	bne	$s1,$at,.L0f1125dc
-/*  f1125cc:	3c018000 */ 	lui	$at,0x8000
-/*  f1125d0:	17210002 */ 	bne	$t9,$at,.L0f1125dc
-/*  f1125d4:	00000000 */ 	nop
-/*  f1125d8:	0006000d */ 	break	0x6
-.L0f1125dc:
-/*  f1125dc:	1600000c */ 	bnez	$s0,.L0f112610
-/*  f1125e0:	00000000 */ 	nop
-/*  f1125e4:	0111001a */ 	div	$zero,$t0,$s1
-/*  f1125e8:	00008010 */ 	mfhi	$s0
-/*  f1125ec:	16200002 */ 	bnez	$s1,.L0f1125f8
-/*  f1125f0:	00000000 */ 	nop
-/*  f1125f4:	0007000d */ 	break	0x7
-.L0f1125f8:
-/*  f1125f8:	2401ffff */ 	addiu	$at,$zero,-1
-/*  f1125fc:	16210004 */ 	bne	$s1,$at,.L0f112610
-/*  f112600:	3c018000 */ 	lui	$at,0x8000
-/*  f112604:	15010002 */ 	bne	$t0,$at,.L0f112610
-/*  f112608:	00000000 */ 	nop
-/*  f11260c:	0006000d */ 	break	0x6
-.L0f112610:
-/*  f112610:	12400005 */ 	beqz	$s2,.L0f112628
-/*  f112614:	00000000 */ 	nop
-/*  f112618:	0fc28684 */ 	jal	bgun0f0a1a10
-/*  f11261c:	02002025 */ 	or	$a0,$s0,$zero
-/*  f112620:	5040ffe2 */ 	beqzl	$v0,.L0f1125ac
-/*  f112624:	2619002c */ 	addiu	$t9,$s0,0x2c
-.L0f112628:
-/*  f112628:	0fc4470c */ 	jal	invCanHaveAllGunsWeapon
-/*  f11262c:	02002025 */ 	or	$a0,$s0,$zero
-/*  f112630:	5040ffde */ 	beqzl	$v0,.L0f1125ac
-/*  f112634:	2619002c */ 	addiu	$t9,$s0,0x2c
-/*  f112638:	02002025 */ 	or	$a0,$s0,$zero
-/*  f11263c:	0fc2c5f0 */ 	jal	weaponHasFlag
-/*  f112640:	24051000 */ 	addiu	$a1,$zero,0x1000
-/*  f112644:	10400004 */ 	beqz	$v0,.L0f112658
-/*  f112648:	02008825 */ 	or	$s1,$s0,$zero
-/*  f11264c:	02008825 */ 	or	$s1,$s0,$zero
-/*  f112650:	10000044 */ 	b	.L0f112764
-/*  f112654:	02009825 */ 	or	$s3,$s0,$zero
-.L0f112658:
-/*  f112658:	10000042 */ 	b	.L0f112764
-/*  f11265c:	00009825 */ 	or	$s3,$zero,$zero
-.L0f112660:
-/*  f112660:	8c621864 */ 	lw	$v0,0x1864($v1)
-/*  f112664:	50400040 */ 	beqzl	$v0,.L0f112768
-/*  f112668:	8fac0028 */ 	lw	$t4,0x28($sp)
-/*  f11266c:	8c500010 */ 	lw	$s0,0x10($v0)
-.L0f112670:
-/*  f112670:	8e020000 */ 	lw	$v0,0x0($s0)
-/*  f112674:	24010001 */ 	addiu	$at,$zero,0x1
-/*  f112678:	54410016 */ 	bnel	$v0,$at,.L0f1126d4
-/*  f11267c:	24010003 */ 	addiu	$at,$zero,0x3
-/*  f112680:	86040004 */ 	lh	$a0,0x4($s0)
-/*  f112684:	2881002d */ 	slti	$at,$a0,0x2d
-/*  f112688:	1020002b */ 	beqz	$at,.L0f112738
-/*  f11268c:	0091082a */ 	slt	$at,$a0,$s1
-/*  f112690:	14200005 */ 	bnez	$at,.L0f1126a8
-/*  f112694:	00000000 */ 	nop
-/*  f112698:	16240027 */ 	bne	$s1,$a0,.L0f112738
-/*  f11269c:	00000000 */ 	nop
-/*  f1126a0:	1a600025 */ 	blez	$s3,.L0f112738
-/*  f1126a4:	00000000 */ 	nop
-.L0f1126a8:
-/*  f1126a8:	52400007 */ 	beqzl	$s2,.L0f1126c8
-/*  f1126ac:	00808825 */ 	or	$s1,$a0,$zero
-/*  f1126b0:	0fc28684 */ 	jal	bgun0f0a1a10
-/*  f1126b4:	00000000 */ 	nop
-/*  f1126b8:	1040001f */ 	beqz	$v0,.L0f112738
-/*  f1126bc:	00000000 */ 	nop
-/*  f1126c0:	86040004 */ 	lh	$a0,0x4($s0)
-/*  f1126c4:	00808825 */ 	or	$s1,$a0,$zero
-.L0f1126c8:
-/*  f1126c8:	10000026 */ 	b	.L0f112764
-/*  f1126cc:	00009825 */ 	or	$s3,$zero,$zero
-/*  f1126d0:	24010003 */ 	addiu	$at,$zero,0x3
-.L0f1126d4:
-/*  f1126d4:	14410018 */ 	bne	$v0,$at,.L0f112738
-/*  f1126d8:	00000000 */ 	nop
-/*  f1126dc:	8e040004 */ 	lw	$a0,0x4($s0)
-/*  f1126e0:	0091082a */ 	slt	$at,$a0,$s1
-/*  f1126e4:	14200007 */ 	bnez	$at,.L0f112704
-/*  f1126e8:	00000000 */ 	nop
-/*  f1126ec:	16240012 */ 	bne	$s1,$a0,.L0f112738
-/*  f1126f0:	00000000 */ 	nop
-/*  f1126f4:	8e090008 */ 	lw	$t1,0x8($s0)
-/*  f1126f8:	0133082a */ 	slt	$at,$t1,$s3
-/*  f1126fc:	1020000e */ 	beqz	$at,.L0f112738
-/*  f112700:	00000000 */ 	nop
-.L0f112704:
-/*  f112704:	5240000a */ 	beqzl	$s2,.L0f112730
-/*  f112708:	8e110004 */ 	lw	$s1,0x4($s0)
-/*  f11270c:	0fc28684 */ 	jal	bgun0f0a1a10
-/*  f112710:	00000000 */ 	nop
-/*  f112714:	54400006 */ 	bnezl	$v0,.L0f112730
-/*  f112718:	8e110004 */ 	lw	$s1,0x4($s0)
-/*  f11271c:	0fc28684 */ 	jal	bgun0f0a1a10
-/*  f112720:	8e040008 */ 	lw	$a0,0x8($s0)
-/*  f112724:	10400004 */ 	beqz	$v0,.L0f112738
-/*  f112728:	00000000 */ 	nop
-/*  f11272c:	8e110004 */ 	lw	$s1,0x4($s0)
-.L0f112730:
-/*  f112730:	1000000c */ 	b	.L0f112764
-/*  f112734:	8e130008 */ 	lw	$s3,0x8($s0)
-.L0f112738:
-/*  f112738:	3c0a800a */ 	lui	$t2,%hi(g_Vars+0x284)
-/*  f11273c:	8d4aa244 */ 	lw	$t2,%lo(g_Vars+0x284)($t2)
-/*  f112740:	8d4b1864 */ 	lw	$t3,0x1864($t2)
-/*  f112744:	160b0005 */ 	bne	$s0,$t3,.L0f11275c
-/*  f112748:	00000000 */ 	nop
-/*  f11274c:	56400006 */ 	bnezl	$s2,.L0f112768
-/*  f112750:	8fac0028 */ 	lw	$t4,0x28($sp)
-/*  f112754:	241103e8 */ 	addiu	$s1,$zero,0x3e8
-/*  f112758:	241303e8 */ 	addiu	$s3,$zero,0x3e8
-.L0f11275c:
-/*  f11275c:	1000ffc4 */ 	b	.L0f112670
-/*  f112760:	8e100010 */ 	lw	$s0,0x10($s0)
-.L0f112764:
-/*  f112764:	8fac0028 */ 	lw	$t4,0x28($sp)
-.L0f112768:
-/*  f112768:	ad910000 */ 	sw	$s1,0x0($t4)
-/*  f11276c:	8fad002c */ 	lw	$t5,0x2c($sp)
-/*  f112770:	adb30000 */ 	sw	$s3,0x0($t5)
-/*  f112774:	8fbf0024 */ 	lw	$ra,0x24($sp)
-/*  f112778:	8fb30020 */ 	lw	$s3,0x20($sp)
-/*  f11277c:	8fb2001c */ 	lw	$s2,0x1c($sp)
-/*  f112780:	8fb10018 */ 	lw	$s1,0x18($sp)
-/*  f112784:	8fb00014 */ 	lw	$s0,0x14($sp)
-/*  f112788:	03e00008 */ 	jr	$ra
-/*  f11278c:	27bd0028 */ 	addiu	$sp,$sp,0x28
-);
+void invChooseCycleBackWeapon(s32 *ptr1, s32 *ptr2, bool arg2)
+{
+	s32 weapon1 = *ptr1;
+	s32 weapon2 = *ptr2;
+
+	if (g_Vars.currentplayer->equipallguns) {
+		s32 candidate = *ptr1;
+
+		if (weaponHasFlag(weapon1, WEAPONFLAG_DUALWIELD) && weapon1 == weapon2) {
+			// Switching from dual to single
+			weapon1 = candidate;
+			weapon2 = WEAPON_NONE;
+		} else {
+			// Find prev weapon
+			do {
+				candidate = (candidate + NUM_CYCLEABLE_WEAPONS - 1) % NUM_CYCLEABLE_WEAPONS;
+
+				if (candidate == WEAPON_NONE) {
+					candidate = (candidate + NUM_CYCLEABLE_WEAPONS - 1) % NUM_CYCLEABLE_WEAPONS;
+				}
+			} while ((arg2 && !bgun0f0a1a10(candidate)) || !invCanHaveAllGunsWeapon(candidate));
+
+			if (weaponHasFlag(candidate, WEAPONFLAG_DUALWIELD)) {
+				weapon1 = candidate;
+				weapon2 = candidate;
+			} else {
+				weapon1 = candidate;
+				weapon2 = WEAPON_NONE;
+			}
+		}
+	} else if (g_Vars.currentplayer->weapons != NULL) {
+		struct invitem *item = g_Vars.currentplayer->weapons->prev;
+
+		while (true) {
+			if (item->type == INVITEMTYPE_WEAP) {
+				if (item->type_weap.weapon1 < NUM_CYCLEABLE_WEAPONS
+						&& (item->type_weap.weapon1 < weapon1 || (weapon1 == item->type_weap.weapon1 && weapon2 > 0))) {
+					if (!arg2 || bgun0f0a1a10(item->type_weap.weapon1)) {
+						weapon1 = item->type_weap.weapon1;
+						weapon2 = WEAPON_NONE;
+						break;
+					}
+				}
+			} else if (item->type == INVITEMTYPE_DUAL) {
+				if (item->type_dual.weapon1 < weapon1
+						|| (weapon1 == item->type_dual.weapon1 && item->type_dual.weapon2 < weapon2)) {
+					if (!arg2 || bgun0f0a1a10(item->type_dual.weapon1) || bgun0f0a1a10(item->type_dual.weapon2)) {
+						weapon1 = item->type_dual.weapon1;
+						weapon2 = item->type_dual.weapon2;
+						break;
+					}
+				}
+			}
+
+			if (item == g_Vars.currentplayer->weapons) {
+				if (arg2) {
+					break;
+				}
+
+				weapon1 = 1000;
+				weapon2 = 1000;
+			}
+
+			item = item->prev;
+		}
+	}
+
+	*ptr1 = weapon1;
+	*ptr2 = weapon2;
+}
 
 bool invHasKeyFlags(u32 wantkeyflags)
 {
diff --git a/src/include/constants.h b/src/include/constants.h
index fe0d5ff1f..09e59c58f 100644
--- a/src/include/constants.h
+++ b/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
diff --git a/src/include/game/bondgun.h b/src/include/game/bondgun.h
index 351c6ad65..885083cc9 100644
--- a/src/include/game/bondgun.h
+++ b/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);
diff --git a/src/include/game/inventory/inventory.h b/src/include/game/inventory/inventory.h
index dc7adf06b..05bb09f88 100644
--- a/src/include/game/inventory/inventory.h
+++ b/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);
diff --git a/src/include/types.h b/src/include/types.h
index 61e53ca20..b6e66590b 100644
--- a/src/include/types.h
+++ b/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;