falso
/
perfect_dark
mirror of https://github.com/n64decomp/perfect_dark.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename game_097ba0.c to bondgun.c, and related functions

This commit is contained in:
Ryan Dwyer 2021-06-13 17:19:11 +10:00
parent c58d3c43a0
commit 7d44ea11e1
47 changed files with 2225 additions and 2225 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/piracychecks.md
View File

@ -122,7 +122,7 @@ The decomp project wraps all decompiled piracy checks in `#if PIRACYCHECKS` stat
**Payload:** Copies 4KB from a random location in ROM to a random location in RAM.
### func0f09e144
### bgun0f09e144
**When Called:** Unknown.

2
ld/gamefiles.ntsc-beta.inc
View File

@ -96,7 +96,7 @@
build/ROMID/game/game_097a50.o (section); \
build/ROMID/game/game_097aa0.o (section); \
build/ROMID/game/inventory/items.o (section); \
build/ROMID/game/game_097ba0.o (section); \
build/ROMID/game/bondgun.o (section); \
build/ROMID/game/game_0abe70.o (section); \
build/ROMID/game/mpstats.o (section); \
build/ROMID/game/game_0b0fd0.o (section); \

2
ld/gamefiles.ntsc-final.inc
View File

@ -96,7 +96,7 @@
build/ROMID/game/game_097a50.o (section); \
build/ROMID/game/game_097aa0.o (section); \
build/ROMID/game/inventory/items.o (section); \
build/ROMID/game/game_097ba0.o (section); \
build/ROMID/game/bondgun.o (section); \
build/ROMID/game/game_0abe70.o (section); \
build/ROMID/game/mpstats.o (section); \
build/ROMID/game/game_0b0fd0.o (section); \

2
ld/gamefiles.pal-final.inc
View File

@ -96,7 +96,7 @@
build/ROMID/game/game_097a50.o (section); \
build/ROMID/game/game_097aa0.o (section); \
build/ROMID/game/inventory/items.o (section); \
build/ROMID/game/game_097ba0.o (section); \
build/ROMID/game/bondgun.o (section); \
build/ROMID/game/game_0abe70.o (section); \
build/ROMID/game/mpstats.o (section); \
build/ROMID/game/game_0b0fd0.o (section); \

26
src/game/activemenu/activemenu.c
View File

@ -2,7 +2,7 @@
#include "constants.h"
#include "game/chr/chraction.h"
#include "game/game_006900.h"
#include "game/game_097ba0.h"
#include "game/bondgun.h"
#include "game/game_0b0fd0.h"
#include "game/game_0b3350.h"
#include "game/game_0d4690.h"
@ -657,20 +657,20 @@ void amApply(s32 slot)
invSetCurrentIndex(invindex);
if (invHasDoubleWeaponIncAllGuns(weaponnum, weaponnum)) {
if (handGetWeaponNum(HAND_RIGHT) != weaponnum) {
currentPlayerEquipWeaponWrapper(HAND_RIGHT, weaponnum);
if (bgunGetWeaponNum(HAND_RIGHT) != weaponnum) {
bgunEquipWeapon2(HAND_RIGHT, weaponnum);
}
if (handGetWeaponNum(HAND_LEFT) != weaponnum) {
currentPlayerEquipWeaponWrapper(HAND_LEFT, weaponnum);
if (bgunGetWeaponNum(HAND_LEFT) != weaponnum) {
bgunEquipWeapon2(HAND_LEFT, weaponnum);
}
} else {
if (handGetWeaponNum(HAND_RIGHT) != weaponnum) {
currentPlayerEquipWeaponWrapper(HAND_RIGHT, weaponnum);
if (bgunGetWeaponNum(HAND_RIGHT) != weaponnum) {
bgunEquipWeapon2(HAND_RIGHT, weaponnum);
}
if (handGetWeaponNum(HAND_LEFT) != WEAPON_NONE) {
currentPlayerEquipWeaponWrapper(HAND_LEFT, WEAPON_NONE);
if (bgunGetWeaponNum(HAND_LEFT) != WEAPON_NONE) {
bgunEquipWeapon2(HAND_LEFT, WEAPON_NONE);
}
}
}
@ -744,7 +744,7 @@ void amGetSlotDetails(s32 slot, u32 *flags, char *label)
} else {
if (invGetWeaponNumByIndex(g_AmMenus[g_AmIndex].invindexes[slot]) == WEAPON_CLOAKINGDEVICE) {
// Special case: "Cloak %d"
qty = currentPlayerGetAmmoCountWithCheck(AMMOTYPE_CLOAK);
qty = bgunGetAmmoCountWithCheck(AMMOTYPE_CLOAK);
secs = qty / PALDOWN(60);
modulo = (qty - (secs * PALDOWN(60))) * 100 / PALDOWN(60);
sprintf(label, langGet(L_OPTIONS_491), secs + (modulo > 0 ? 1 : 0)); // "cloak %d"
@ -761,7 +761,7 @@ void amGetSlotDetails(s32 slot, u32 *flags, char *label)
weaponnum = invGetWeaponNumByIndex(g_AmMenus[g_AmIndex].invindexes[slot]);
if (!currentPlayerHasAmmoForWeapon(weaponnum)) {
if (!bgunHasAmmoForWeapon(weaponnum)) {
*flags |= AMSLOTFLAG_NOAMMO;
}
break;
@ -1470,7 +1470,7 @@ Gfx *amRenderAibotInfo(Gfx *gdl, s32 buddynum)
if (weaponnum < WEAPON_FALCON2 || weaponnum > WEAPON_HORIZONSCANNER) {
weaponname = langGet(L_MISC_173); // "No Weapon"
} else {
weaponname = weaponGetShortName(weaponnum);
weaponname = bgunGetShortName(weaponnum);
}
textMeasure(&textheight, &textwidth, aibotname, g_AmFont1, g_AmFont2, 0);
@ -1673,7 +1673,7 @@ glabel var7f1acfe0nb
/* f0fbc80: 10000004 */ beqz $zero,.NB0f0fbc94
/* f0fbc84: afa20078 */ sw $v0,0x78($sp)
.NB0f0fbc88:
/* f0fbc88: 0fc27fd3 */ jal weaponGetShortName
/* f0fbc88: 0fc27fd3 */ jal bgunGetShortName
/* f0fbc8c: 00000000 */ sll $zero,$zero,0x0
/* f0fbc90: afa20078 */ sw $v0,0x78($sp)
.NB0f0fbc94:

6
src/game/activemenu/tick.c
View File

@ -2,7 +2,7 @@
#include "constants.h"
#include "game/activemenu/activemenu.h"
#include "game/game_01b0a0.h"
#include "game/game_097ba0.h"
#include "game/bondgun.h"
#include "game/game_0b0fd0.h"
#include "game/inventory/inventory.h"
#include "game/game_127910.h"
@ -23,7 +23,7 @@ void amTick(void)
g_AmIndex = g_Vars.currentplayernum;
if (g_AmMenus[g_AmIndex].togglefunc) {
if (currentPlayerConsiderToggleGunFunction(60, false, 1) > 0) {
if (bgunConsiderToggleGunFunction(60, false, 1) > 0) {
g_AmMenus[g_AmIndex].togglefunc = false;
}
} else {
@ -496,7 +496,7 @@ glabel var7f1a224cnb
/* f01af8c: 00002825 */ or $a1,$zero,$zero
/* f01af90: 51e0000f */ beqzl $t7,.NB0f01afd0
/* f01af94: 8ce80318 */ lw $t0,0x318($a3)
/* f01af98: 0fc299bf */ jal currentPlayerConsiderToggleGunFunction
/* f01af98: 0fc299bf */ jal bgunConsiderToggleGunFunction
/* f01af9c: 24060001 */ addiu $a2,$zero,0x1
/* f01afa0: 18400009 */ blez $v0,.NB0f01afc8
/* f01afa4: 3c07800a */ lui $a3,0x800a

4
src/game/bg.c
View File

@ -8,7 +8,7 @@
#include "game/chr/chr.h"
#include "game/prop.h"
#include "game/ceil.h"
#include "game/game_097ba0.h"
#include "game/bondgun.h"
#include "game/game_0b3350.h"
#include "game/game_0b4950.h"
#include "game/game_0b69d0.h"
@ -15976,7 +15976,7 @@ glabel func0f162d9c
/* f162e40: c6c417a0 */ lwc1 $f4,0x17a0($s6)
/* f162e44: 4600218d */ trunc.w.s $f6,$f4
/* f162e48: 440c3000 */ mfc1 $t4,$f6
/* f162e4c: 0fc2866a */ jal handGetWeaponNum
/* f162e4c: 0fc2866a */ jal bgunGetWeaponNum
/* f162e50: a7ac0082 */ sh $t4,0x82($sp)
/* f162e54: 24010016 */ addiu $at,$zero,0x16
/* f162e58: 5441000d */ bnel $v0,$at,.L0f162e90

6
src/game/bondbike.c
View File

@ -8,7 +8,7 @@
#include "game/game_092610.h"
#include "game/game_095320.h"
#include "game/game_096ca0.h"
#include "game/game_097ba0.h"
#include "game/bondgun.h"
#include "game/game_0b3350.h"
#include "game/game_0b69d0.h"
#include "game/bondhead.h"
@ -1755,8 +1755,8 @@ void bbikeTick(void)
sp70 = -1.0f;
}
func0f09d8dc(breathing, 0, sp70, 0.0f, g_Vars.currentplayer->speedsideways);
handSetAdjustPos(g_Vars.currentplayer->vv_verta360 * 0.017450513318181f);
bgun0f09d8dc(breathing, 0, sp70, 0.0f, g_Vars.currentplayer->speedsideways);
bgunSetAdjustPos(g_Vars.currentplayer->vv_verta360 * 0.017450513318181f);
currentPlayerUpdatePerimInfo();
bmove0f0cb8c4(g_Vars.currentplayer);
objectiveCheckRoomEntered(g_Vars.currentplayer->prop->rooms[0]);

4
src/game/bondeyespy.c
View File

@ -5,7 +5,7 @@
#include "game/chr/chr.h"
#include "game/prop.h"
#include "game/game_092610.h"
#include "game/game_097ba0.h"
#include "game/bondgun.h"
#include "game/game_0b69d0.h"
#include "game/hudmsg.h"
#include "game/inventory/inventory.h"
@ -644,7 +644,7 @@ bool eyespyTryLaunch(void)
propSetCollisionsEnabled(g_Vars.currentplayer->eyespy->prop, false);
// "Not enough room to launch "
sprintf(text, "%s%s", langGet(L_MISC_218), weaponGetName(WEAPON_EYESPY));
sprintf(text, "%s%s", langGet(L_MISC_218), bgunGetName(WEAPON_EYESPY));
hudmsgCreate(text, HUDMSGTYPE_DEFAULT);
launched = false;
} else {

10
src/game/bondgrab.c
View File

@ -7,7 +7,7 @@
#include "game/debug.h"
#include "game/prop.h"
#include "game/game_095320.h"
#include "game/game_097ba0.h"
#include "game/bondgun.h"
#include "game/game_0b69d0.h"
#include "game/bondhead.h"
#include "game/propobj.h"
@ -3211,7 +3211,7 @@ glabel var7f1ada2c
/* f0cee7c: 46060302 */ mul.s $f12,$f0,$f6
/* f0cee80: 00000000 */ nop
.L0f0cee84:
/* f0cee84: 0fc27637 */ jal func0f09d8dc
/* f0cee84: 0fc27637 */ jal bgun0f09d8dc
/* f0cee88: e7b40010 */ swc1 $f20,0x10($sp)
/* f0cee8c: 3c08800a */ lui $t0,%hi(g_Vars)
/* f0cee90: 25089fc0 */ addiu $t0,$t0,%lo(g_Vars)
@ -3220,7 +3220,7 @@ glabel var7f1ada2c
/* f0cee9c: c424da2c */ lwc1 $f4,%lo(var7f1ada2c)($at)
/* f0ceea0: c7280158 */ lwc1 $f8,0x158($t9)
/* f0ceea4: 46044302 */ mul.s $f12,$f8,$f4
/* f0ceea8: 0fc288a4 */ jal handSetAdjustPos
/* f0ceea8: 0fc288a4 */ jal bgunSetAdjustPos
/* f0ceeac: 00000000 */ nop
/* f0ceeb0: 8fbf0024 */ lw $ra,0x24($sp)
.L0f0ceeb4:
@ -3593,7 +3593,7 @@ glabel var7f1ada2c
/* f0cc67c: 46060302 */ mul.s $f12,$f0,$f6
/* f0cc680: 00000000 */ sll $zero,$zero,0x0
.NB0f0cc684:
/* f0cc684: 0fc26dfe */ jal func0f09d8dc
/* f0cc684: 0fc26dfe */ jal bgun0f09d8dc
/* f0cc688: e7b40010 */ swc1 $f20,0x10($sp)
/* f0cc68c: 3c08800a */ lui $t0,0x800a
/* f0cc690: 2508e6c0 */ addiu $t0,$t0,-6464
@ -3602,7 +3602,7 @@ glabel var7f1ada2c
/* f0cc69c: c4247d68 */ lwc1 $f4,0x7d68($at)
/* f0cc6a0: c7280158 */ lwc1 $f8,0x158($t9)
/* f0cc6a4: 46044302 */ mul.s $f12,$f8,$f4
/* f0cc6a8: 0fc28003 */ jal handSetAdjustPos
/* f0cc6a8: 0fc28003 */ jal bgunSetAdjustPos
/* f0cc6ac: 00000000 */ sll $zero,$zero,0x0
/* f0cc6b0: 8fbf0024 */ lw $ra,0x24($sp)
.NB0f0cc6b4:

2606
src/game/game_097ba0.c → src/game/bondgun.c
View File

File diff suppressed because it is too large Load Diff

300
src/game/bondmove.c
View File

File diff suppressed because it is too large Load Diff

14
src/game/bondwalk.c
View File

@ -10,7 +10,7 @@
#include "game/prop.h"
#include "game/game_092610.h"
#include "game/game_095320.h"
#include "game/game_097ba0.h"
#include "game/bondgun.h"
#include "game/game_0b69d0.h"
#include "game/inventory/inventory.h"
#include "game/bondhead.h"
@ -4519,7 +4519,7 @@ glabel var7f1ad854
/* f0c7dac: 46040302 */ mul.s $f12,$f0,$f4
/* f0c7db0: 00000000 */ nop
.PF0f0c7db4:
/* f0c7db4: 0fc276e4 */ jal func0f09d8dc
/* f0c7db4: 0fc276e4 */ jal bgun0f09d8dc
/* f0c7db8: e7b40010 */ swc1 $f20,0x10($sp)
/* f0c7dbc: 3c08800a */ lui $t0,0x800a
/* f0c7dc0: 2508a510 */ addiu $t0,$t0,-23280
@ -4528,7 +4528,7 @@ glabel var7f1ad854
/* f0c7dcc: c428eb24 */ lwc1 $f8,-0x14dc($at)
/* f0c7dd0: c5a60158 */ lwc1 $f6,0x158($t5)
/* f0c7dd4: 46083302 */ mul.s $f12,$f6,$f8
/* f0c7dd8: 0fc28971 */ jal handSetAdjustPos
/* f0c7dd8: 0fc28971 */ jal bgunSetAdjustPos
/* f0c7ddc: 00000000 */ nop
/* f0c7de0: 8fbf0024 */ lw $ra,0x24($sp)
/* f0c7de4: d7b40018 */ ldc1 $f20,0x18($sp)
@ -5570,7 +5570,7 @@ glabel var7f1ad854
/* f0c7814: 46080302 */ mul.s $f12,$f0,$f8
/* f0c7818: 00000000 */ nop
.L0f0c781c:
/* f0c781c: 0fc27637 */ jal func0f09d8dc
/* f0c781c: 0fc27637 */ jal bgun0f09d8dc
/* f0c7820: e7b40010 */ swc1 $f20,0x10($sp)
/* f0c7824: 3c08800a */ lui $t0,%hi(g_Vars)
/* f0c7828: 25089fc0 */ addiu $t0,$t0,%lo(g_Vars)
@ -5579,7 +5579,7 @@ glabel var7f1ad854
/* f0c7834: c42ad854 */ lwc1 $f10,%lo(var7f1ad854)($at)
/* f0c7838: c5a40158 */ lwc1 $f4,0x158($t5)
/* f0c783c: 460a2302 */ mul.s $f12,$f4,$f10
/* f0c7840: 0fc288a4 */ jal handSetAdjustPos
/* f0c7840: 0fc288a4 */ jal bgunSetAdjustPos
/* f0c7844: 00000000 */ nop
/* f0c7848: 8fbf0024 */ lw $ra,0x24($sp)
/* f0c784c: d7b40018 */ ldc1 $f20,0x18($sp)
@ -6573,7 +6573,7 @@ glabel var7f1ad854
/* f0c50e0: 460a0302 */ mul.s $f12,$f0,$f10
/* f0c50e4: 00000000 */ sll $zero,$zero,0x0
.NB0f0c50e8:
/* f0c50e8: 0fc26dfe */ jal func0f09d8dc
/* f0c50e8: 0fc26dfe */ jal bgun0f09d8dc
/* f0c50ec: e7b40010 */ swc1 $f20,0x10($sp)
/* f0c50f0: 3c08800a */ lui $t0,0x800a
/* f0c50f4: 2508e6c0 */ addiu $t0,$t0,-6464
@ -6582,7 +6582,7 @@ glabel var7f1ad854
/* f0c5100: c4247b94 */ lwc1 $f4,0x7b94($at)
/* f0c5104: c5880158 */ lwc1 $f8,0x158($t4)
/* f0c5108: 46044302 */ mul.s $f12,$f8,$f4
/* f0c510c: 0fc28003 */ jal handSetAdjustPos
/* f0c510c: 0fc28003 */ jal bgunSetAdjustPos
/* f0c5110: 00000000 */ sll $zero,$zero,0x0
/* f0c5114: 8fbf0024 */ lw $ra,0x24($sp)
/* f0c5118: d7b40018 */ ldc1 $f20,0x18($sp)

18
src/game/chr/chr.c
View File

@ -10,7 +10,7 @@
#include "game/game_092610.h"
#include "game/game_095320.h"
#include "game/game_096360.h"
#include "game/game_097ba0.h"
#include "game/bondgun.h"
#include "game/game_0abe70.h"
#include "game/game_0b0fd0.h"
#include "game/game_0b28d0.h"
@ -4584,8 +4584,8 @@ void func0f020d44(struct prop *prop, bool removechr)
struct prop *child;
u32 stack[2];
freeFireslotWrapper(chr->fireslot[0]);
freeFireslotWrapper(chr->fireslot[1]);
bgunFreeFireslotWrapper(chr->fireslot[0]);
bgunFreeFireslotWrapper(chr->fireslot[1]);
if (chr->proppreset1 >= 0) {
struct prop *proppreset = &g_Vars.props[chr->proppreset1];
@ -6749,7 +6749,7 @@ void chrUpdateCloak(struct chrdata *chr)
if (g_Vars.currentplayer->devicesactive & DEVICE_CLOAKDEVICE) {
// Cloak is active - but may or may not be in effect due to recent shooting
s32 qty = currentPlayerGetAmmoCountWithCheck(AMMOTYPE_CLOAK);
s32 qty = bgunGetAmmoCountWithCheck(AMMOTYPE_CLOAK);
if (qty > 0) {
if (chr->hidden & CHRHFLAG_CLOAKED) {
@ -6760,7 +6760,7 @@ void chrUpdateCloak(struct chrdata *chr)
qty = 0;
}
currentPlayerSetAmmoQuantity(AMMOTYPE_CLOAK, qty);
bgunSetAmmoQuantity(AMMOTYPE_CLOAK, qty);
}
} else {
// Out of cloak ammo - turn off cloak
@ -14324,11 +14324,11 @@ glabel func0f027e1c
/* f027efc: 27a50098 */ addiu $a1,$sp,0x98
/* f027f00: 0c0056da */ jal func00015b68
/* f027f04: 27a600a4 */ addiu $a2,$sp,0xa4
/* f027f08: 0fc2a519 */ jal handSetHitPos
/* f027f08: 0fc2a519 */ jal bgunSetHitPos
/* f027f0c: 27a400a4 */ addiu $a0,$sp,0xa4
/* f027f10: 8fa40048 */ lw $a0,0x48($sp)
/* f027f14: 8e250004 */ lw $a1,0x4($s1)
/* f027f18: 0fc29f66 */ jal gsetPlayPropHitSound
/* f027f18: 0fc29f66 */ jal bgunPlayPropHitSound
/* f027f1c: 2406ffff */ addiu $a2,$zero,-1
/* f027f20: 8fa200f8 */ lw $v0,0xf8($sp)
/* f027f24: 3c0b800a */ lui $t3,%hi(g_Vars+0x284)
@ -14767,11 +14767,11 @@ glabel func0f027e1c
/* f027918: 27a50098 */ addiu $a1,$sp,0x98
/* f02791c: 0c005a96 */ jal func00015b68
/* f027920: 27a600a4 */ addiu $a2,$sp,0xa4
/* f027924: 0fc29c81 */ jal handSetHitPos
/* f027924: 0fc29c81 */ jal bgunSetHitPos
/* f027928: 27a400a4 */ addiu $a0,$sp,0xa4
/* f02792c: 8fa40048 */ lw $a0,0x48($sp)
/* f027930: 8e250004 */ lw $a1,0x4($s1)
/* f027934: 0fc296b1 */ jal gsetPlayPropHitSound
/* f027934: 0fc296b1 */ jal bgunPlayPropHitSound
/* f027938: 2406ffff */ addiu $a2,$zero,-1
/* f02793c: 8fa200f8 */ lw $v0,0xf8($sp)
/* f027940: 3c0a800a */ lui $t2,0x800a

52
src/game/chr/chraction.c
View File

@ -13,7 +13,7 @@
#include "game/game_095320.h"
#include "game/atan2f.h"
#include "game/game_0969d0.h"
#include "game/game_097ba0.h"
#include "game/bondgun.h"
#include "game/game_0abe70.h"
#include "game/game_0b0fd0.h"
#include "game/game_0b28d0.h"
@ -4786,7 +4786,7 @@ void chrDamage(struct chrdata *chr, f32 damage, struct coord *vector, struct gse
// Handle player losing gun
if (gsetHasFunctionFlags(gset, FUNCFLAG_DROPWEAPON)) {
currentPlayerLoseGun(aprop);
bgunLoseGun(aprop);
}
// Handle player dizziness
@ -8624,7 +8624,7 @@ void chrPunchInflictDamage(struct chrdata *chr, s32 damage, s32 range, u8 revers
guNormalize(&vector.x, &vector.y, &vector.z);
gsetPlayPropHitSound(&gset, targetprop, -1);
bgunPlayPropHitSound(&gset, targetprop, -1);
if (targetprop->type == PROPTYPE_PLAYER || targetprop->type == PROPTYPE_CHR) {
chrDamageByImpact(targetprop->chr, gsetGetDamage(&gset) * damage, &vector, &gset, chr->prop, 200);
@ -10236,7 +10236,7 @@ glabel func0f03e29c
/* f03e2fc: 04610009 */ bgez $v1,.L0f03e324
/* f03e300: 00000000 */ nop
/* f03e304: afa4004c */ sw $a0,0x4c($sp)
/* f03e308: 0fc29c3e */ jal func0f0a70f8
/* f03e308: 0fc29c3e */ jal bgun0f0a70f8
/* f03e30c: a7a90054 */ sh $t1,0x54($sp)
/* f03e310: 8fa4004c */ lw $a0,0x4c($sp)
/* f03e314: 97a90054 */ lhu $t1,0x54($sp)
@ -10358,7 +10358,7 @@ glabel func0f03e29c
/* f03daf8: 04610008 */ bgez $v1,.NB0f03db1c
/* f03dafc: 00000000 */ sll $zero,$zero,0x0
/* f03db00: afa40054 */ sw $a0,0x54($sp)
/* f03db04: 0fc2938f */ jal func0f0a70f8
/* f03db04: 0fc2938f */ jal bgun0f0a70f8
/* f03db08: a7a9005c */ sh $t1,0x5c($sp)
/* f03db0c: 8fa40054 */ lw $a0,0x54($sp)
/* f03db10: 97a9005c */ lhu $t1,0x5c($sp)
@ -11828,8 +11828,8 @@ void chrStopFiring(struct chrdata *chr)
chrResetAimEndProperties(chr);
chr->fireslot[0] = freeFireslot(chr->fireslot[0]);
chr->fireslot[1] = freeFireslot(chr->fireslot[1]);
chr->fireslot[0] = bgunFreeFireslot(chr->fireslot[0]);
chr->fireslot[1] = bgunFreeFireslot(chr->fireslot[1]);
}
}
@ -12839,7 +12839,7 @@ glabel var7f1a9184
/* f040b90: 00065080 */ sll $t2,$a2,0x2
/* f040b94: 000a37c2 */ srl $a2,$t2,0x1f
/* f040b98: afa80014 */ sw $t0,0x14($sp)
/* f040b9c: 0fc284b4 */ jal func0f0a0fac
/* f040b9c: 0fc284b4 */ jal bgun0f0a0fac
/* f040ba0: afa90010 */ sw $t1,0x10($sp)
.PF0f040ba4:
/* f040ba4: 8fab0278 */ lw $t3,0x278($sp)
@ -13303,7 +13303,7 @@ glabel var7f1a9184
/* f04124c: afab0010 */ sw $t3,0x10($sp)
/* f041250: afaa0014 */ sw $t2,0x14($sp)
/* f041254: afa5001c */ sw $a1,0x1c($sp)
/* f041258: 0fc27bac */ jal func0f09ebcc
/* f041258: 0fc27bac */ jal bgun0f09ebcc
/* f04125c: afaf0018 */ sw $t7,0x18($sp)
/* f041260: 8fa301b8 */ lw $v1,0x1b8($sp)
/* f041264: 8fad00d4 */ lw $t5,0xd4($sp)
@ -13584,7 +13584,7 @@ glabel var7f1a9184
.PF0f041678:
/* f041678: 27a40260 */ addiu $a0,$sp,0x260
/* f04167c: 8fa5025c */ lw $a1,0x25c($sp)
/* f041680: 0fc2a079 */ jal gsetPlayPropHitSound
/* f041680: 0fc2a079 */ jal bgunPlayPropHitSound
/* f041684: 2406ffff */ li $a2,-1
/* f041688: 8fa40088 */ lw $a0,0x88($sp)
/* f04168c: 8c8b0020 */ lw $t3,0x20($a0)
@ -13688,7 +13688,7 @@ glabel var7f1a9184
/* f0417f4: 27a40260 */ addiu $a0,$sp,0x260
/* f0417f8: 8cad0004 */ lw $t5,0x4($a1)
/* f0417fc: 2406ffff */ li $a2,-1
/* f041800: 0fc2a079 */ jal gsetPlayPropHitSound
/* f041800: 0fc2a079 */ jal bgunPlayPropHitSound
/* f041804: afad0070 */ sw $t5,0x70($sp)
/* f041808: 8fa40070 */ lw $a0,0x70($sp)
/* f04180c: 8c990020 */ lw $t9,0x20($a0)
@ -13768,7 +13768,7 @@ glabel var7f1a9184
.PF0f041920:
/* f041920: 27a40260 */ addiu $a0,$sp,0x260
/* f041924: 8fa501cc */ lw $a1,0x1cc($sp)
/* f041928: 0fc2a079 */ jal gsetPlayPropHitSound
/* f041928: 0fc2a079 */ jal bgunPlayPropHitSound
/* f04192c: 2406ffff */ li $a2,-1
/* f041930: 27a40244 */ addiu $a0,$sp,0x244
/* f041934: 27a50234 */ addiu $a1,$sp,0x234
@ -13837,7 +13837,7 @@ glabel var7f1a9184
/* f041a20: 27a40260 */ addiu $a0,$sp,0x260
/* f041a24: 27a50228 */ addiu $a1,$sp,0x228
/* f041a28: 2406ffff */ li $a2,-1
/* f041a2c: 0fc2a245 */ jal func0f0a84c8
/* f041a2c: 0fc2a245 */ jal bgun0f0a84c8
/* f041a30: 27a70214 */ addiu $a3,$sp,0x214
/* f041a34: 0fc4fc06 */ jal chrIsUsingPaintball
/* f041a38: 8fa40278 */ lw $a0,0x278($sp)
@ -14437,7 +14437,7 @@ glabel var7f1a9184
/* f040a0c: 00065080 */ sll $t2,$a2,0x2
/* f040a10: 000a37c2 */ srl $a2,$t2,0x1f
/* f040a14: afa80014 */ sw $t0,0x14($sp)
/* f040a18: 0fc283eb */ jal func0f0a0fac
/* f040a18: 0fc283eb */ jal bgun0f0a0fac
/* f040a1c: afa90010 */ sw $t1,0x10($sp)
.L0f040a20:
/* f040a20: 8fab0278 */ lw $t3,0x278($sp)
@ -14893,7 +14893,7 @@ glabel var7f1a9184
/* f0410a8: afae0010 */ sw $t6,0x10($sp)
/* f0410ac: afab0014 */ sw $t3,0x14($sp)
/* f0410b0: afa5001c */ sw $a1,0x1c($sp)
/* f0410b4: 0fc27af3 */ jal func0f09ebcc
/* f0410b4: 0fc27af3 */ jal bgun0f09ebcc
/* f0410b8: afaa0018 */ sw $t2,0x18($sp)
/* f0410bc: 8fa301b8 */ lw $v1,0x1b8($sp)
/* f0410c0: 8fac00d4 */ lw $t4,0xd4($sp)
@ -15174,7 +15174,7 @@ glabel var7f1a9184
.L0f0414d4:
/* f0414d4: 27a40260 */ addiu $a0,$sp,0x260
/* f0414d8: 8fa5025c */ lw $a1,0x25c($sp)
/* f0414dc: 0fc29f66 */ jal gsetPlayPropHitSound
/* f0414dc: 0fc29f66 */ jal bgunPlayPropHitSound
/* f0414e0: 2406ffff */ addiu $a2,$zero,-1
/* f0414e4: 8fa40088 */ lw $a0,0x88($sp)
/* f0414e8: 8c8e0020 */ lw $t6,0x20($a0)
@ -15278,7 +15278,7 @@ glabel var7f1a9184
/* f041650: 27a40260 */ addiu $a0,$sp,0x260
/* f041654: 8cac0004 */ lw $t4,0x4($a1)
/* f041658: 2406ffff */ addiu $a2,$zero,-1
/* f04165c: 0fc29f66 */ jal gsetPlayPropHitSound
/* f04165c: 0fc29f66 */ jal bgunPlayPropHitSound
/* f041660: afac0070 */ sw $t4,0x70($sp)
/* f041664: 8fa40070 */ lw $a0,0x70($sp)
/* f041668: 8c8d0020 */ lw $t5,0x20($a0)
@ -15358,7 +15358,7 @@ glabel var7f1a9184
.L0f04177c:
/* f04177c: 27a40260 */ addiu $a0,$sp,0x260
/* f041780: 8fa501cc */ lw $a1,0x1cc($sp)
/* f041784: 0fc29f66 */ jal gsetPlayPropHitSound
/* f041784: 0fc29f66 */ jal bgunPlayPropHitSound
/* f041788: 2406ffff */ addiu $a2,$zero,-1
/* f04178c: 27a40244 */ addiu $a0,$sp,0x244
/* f041790: 27a50234 */ addiu $a1,$sp,0x234
@ -15427,7 +15427,7 @@ glabel var7f1a9184
/* f04187c: 27a40260 */ addiu $a0,$sp,0x260
/* f041880: 27a50228 */ addiu $a1,$sp,0x228
/* f041884: 2406ffff */ addiu $a2,$zero,-1
/* f041888: 0fc2a132 */ jal func0f0a84c8
/* f041888: 0fc2a132 */ jal bgun0f0a84c8
/* f04188c: 27a70214 */ addiu $a3,$sp,0x214
/* f041890: 0fc4f92a */ jal chrIsUsingPaintball
/* f041894: 8fa40278 */ lw $a0,0x278($sp)
@ -16027,7 +16027,7 @@ glabel var7f1a9184
/* f0401ec: 00065080 */ sll $t2,$a2,0x2
/* f0401f0: 000a37c2 */ srl $a2,$t2,0x1f
/* f0401f4: afa80014 */ sw $t0,0x14($sp)
/* f0401f8: 0fc27b58 */ jal func0f0a0fac
/* f0401f8: 0fc27b58 */ jal bgun0f0a0fac
/* f0401fc: afa90010 */ sw $t1,0x10($sp)
.NB0f040200:
/* f040200: 8fab0278 */ lw $t3,0x278($sp)
@ -16483,7 +16483,7 @@ glabel var7f1a9184
/* f040888: afae0010 */ sw $t6,0x10($sp)
/* f04088c: afab0014 */ sw $t3,0x14($sp)
/* f040890: afa5001c */ sw $a1,0x1c($sp)
/* f040894: 0fc27298 */ jal func0f09ebcc
/* f040894: 0fc27298 */ jal bgun0f09ebcc
/* f040898: afaa0018 */ sw $t2,0x18($sp)
/* f04089c: 8fa301b8 */ lw $v1,0x1b8($sp)
/* f0408a0: 8fac00d4 */ lw $t4,0xd4($sp)
@ -16758,7 +16758,7 @@ glabel var7f1a9184
.NB0f040c9c:
/* f040c9c: 27a40260 */ addiu $a0,$sp,0x260
/* f040ca0: 8fa5025c */ lw $a1,0x25c($sp)
/* f040ca4: 0fc296b1 */ jal gsetPlayPropHitSound
/* f040ca4: 0fc296b1 */ jal bgunPlayPropHitSound
/* f040ca8: 2406ffff */ addiu $a2,$zero,-1
/* f040cac: 8fa40088 */ lw $a0,0x88($sp)
/* f040cb0: 8c8c0020 */ lw $t4,0x20($a0)
@ -16862,7 +16862,7 @@ glabel var7f1a9184
/* f040e18: 27a40260 */ addiu $a0,$sp,0x260
/* f040e1c: 8cb90004 */ lw $t9,0x4($a1)
/* f040e20: 2406ffff */ addiu $a2,$zero,-1
/* f040e24: 0fc296b1 */ jal gsetPlayPropHitSound
/* f040e24: 0fc296b1 */ jal bgunPlayPropHitSound
/* f040e28: afb90070 */ sw $t9,0x70($sp)
/* f040e2c: 8fa40070 */ lw $a0,0x70($sp)
/* f040e30: 8c8b0020 */ lw $t3,0x20($a0)
@ -16942,7 +16942,7 @@ glabel var7f1a9184
.NB0f040f44:
/* f040f44: 27a40260 */ addiu $a0,$sp,0x260
/* f040f48: 8fa501cc */ lw $a1,0x1cc($sp)
/* f040f4c: 0fc296b1 */ jal gsetPlayPropHitSound
/* f040f4c: 0fc296b1 */ jal bgunPlayPropHitSound
/* f040f50: 2406ffff */ addiu $a2,$zero,-1
/* f040f54: 27a40244 */ addiu $a0,$sp,0x244
/* f040f58: 27a50234 */ addiu $a1,$sp,0x234
@ -17011,7 +17011,7 @@ glabel var7f1a9184
/* f041044: 27a40260 */ addiu $a0,$sp,0x260
/* f041048: 27a50228 */ addiu $a1,$sp,0x228
/* f04104c: 2406ffff */ addiu $a2,$zero,-1
/* f041050: 0fc298a8 */ jal func0f0a84c8
/* f041050: 0fc298a8 */ jal bgun0f0a84c8
/* f041054: 27a70214 */ addiu $a3,$sp,0x214
/* f041058: 0fc4e3ea */ jal chrIsUsingPaintball
/* f04105c: 8fa40278 */ lw $a0,0x278($sp)
@ -25514,7 +25514,7 @@ bool chrCanSeeTargetWithExtraCheck(struct chrdata *chr)
struct coord sp44;
f32 somefloat = func0001af80(model) * 0.8f;
func0f0a0c08(&sp68, &sp56);
bgun0f0a0c08(&sp68, &sp56);
modelGetRootPosition(model, &sp44);
func00015b64(currentPlayerGetMatrix1740(), &sp44);

34
src/game/chr/chraicommands.c
View File

@ -16,7 +16,7 @@
#include "game/game_092610.h"
#include "game/game_095320.h"
#include "game/atan2f.h"
#include "game/game_097ba0.h"
#include "game/bondgun.h"
#include "game/game_0b0fd0.h"
#include "game/game_0b28d0.h"
#include "game/game_0b69d0.h"
@ -2127,7 +2127,7 @@ bool aiIfChrHasWeaponEquipped(void)
u32 playernum = propGetPlayerNum(chr->prop);
setCurrentPlayerNum(playernum);
if (handGetWeaponNum(HAND_RIGHT) == cmd[3]) {
if (bgunGetWeaponNum(HAND_RIGHT) == cmd[3]) {
passes = true;
}
@ -2325,9 +2325,9 @@ bool aiChrDropWeapon(void)
u32 playernum = propGetPlayerNum(chr->prop);
u32 weaponnum;
setCurrentPlayerNum(playernum);
weaponnum = handGetWeaponNum(HAND_RIGHT);
weaponnum = bgunGetWeaponNum(HAND_RIGHT);
invRemoveItemByNum(weaponnum);
func0f0a1c2c();
bgun0f0a1c2c();
setCurrentPlayerNum(prevplayernum);
} else if (chr && chr->prop) {
if (chr->weapons_held[0]) {
@ -5563,8 +5563,8 @@ bool aiRevokeControl(void)
u32 prevplayernum = g_Vars.currentplayernum;
u32 playernum = propGetPlayerNum(chr->prop);
setCurrentPlayerNum(playernum);
currentPlayerSetGunSightVisible(GUNSIGHTREASON_NOCONTROL, false);
currentPlayerSetGunAmmoVisible(GUNAMMOREASON_NOCONTROL, false);
bgunSetSightVisible(GUNSIGHTREASON_NOCONTROL, false);
bgunSetGunAmmoVisible(GUNAMMOREASON_NOCONTROL, false);
if ((cmd[3] & 2) == 0) {
currentPlayerSetHudmsgsOff(HUDMSGREASON_NOCONTROL);
@ -5594,8 +5594,8 @@ bool aiGrantControl(void)
if (chr && chr->prop && chr->prop->type == PROPTYPE_PLAYER) {
u32 prevplayernum = g_Vars.currentplayernum;
setCurrentPlayerNum(propGetPlayerNum(chr->prop));
currentPlayerSetGunSightVisible(GUNSIGHTREASON_NOCONTROL, true);
currentPlayerSetGunAmmoVisible(GUNAMMOREASON_NOCONTROL, true);
bgunSetSightVisible(GUNSIGHTREASON_NOCONTROL, true);
bgunSetGunAmmoVisible(GUNAMMOREASON_NOCONTROL, true);
currentPlayerSetHudmsgsOn(HUDMSGREASON_NOCONTROL);
countdownTimerSetVisible(COUNTDOWNTIMERREASON_NOCONTROL, true);
g_PlayersWithControl[g_Vars.currentplayernum] = true;
@ -5869,7 +5869,7 @@ bool aiIfChrAmmoQuantityLessThan(void)
u32 playernum = propGetPlayerNum(chr->prop);
setCurrentPlayerNum(playernum);
if (currentPlayerGetAmmoCount((s8)cmd[3]) < (s8)cmd[4]) {
if (bgunGetAmmoCount((s8)cmd[3]) < (s8)cmd[4]) {
passes = true;
}
@ -5897,8 +5897,8 @@ bool aiChrDrawWeapon(void)
u32 prevplayernum = g_Vars.currentplayernum;
u32 playernum = propGetPlayerNum(chr->prop);
setCurrentPlayerNum(playernum);
currentPlayerEquipWeaponWrapper(0, (s8)cmd[3]);
currentPlayerEquipWeaponWrapper(1, 0);
bgunEquipWeapon2(0, (s8)cmd[3]);
bgunEquipWeapon2(1, 0);
setCurrentPlayerNum(prevplayernum);
}
@ -5919,7 +5919,7 @@ bool aiChrDrawWeaponInCutscene(void)
u32 prevplayernum = g_Vars.currentplayernum;
u32 playernum = propGetPlayerNum(chr->prop);
setCurrentPlayerNum(playernum);
currentPlayerEquipWeapon((s8)cmd[3]);
bgunEquipWeapon((s8)cmd[3]);
setCurrentPlayerNum(prevplayernum);
}
@ -6701,7 +6701,7 @@ glabel var7f1a9d4c
/* f05935c: 24090004 */ addiu $t1,$zero,0x4
/* f059360: a3a9002b */ sb $t1,0x2b($sp)
.L0f059364:
/* f059364: 0fc2866a */ jal handGetWeaponNum
/* f059364: 0fc2866a */ jal bgunGetWeaponNum
/* f059368: 00002025 */ or $a0,$zero,$zero
/* f05936c: 244afffe */ addiu $t2,$v0,-2
/* f059370: 2d41001a */ sltiu $at,$t2,0x1a
@ -6838,7 +6838,7 @@ glabel var7f1a9d4c
// score -= 2;
// }
//
// switch (handGetWeaponNum(HAND_RIGHT)) {
// switch (bgunGetWeaponNum(HAND_RIGHT)) {
// case WEAPON_CMP150:
// case WEAPON_CYCLONE:
// case WEAPON_CALLISTO:
@ -7000,7 +7000,7 @@ bool aiIfPlayerUsingCmpOrAr34(void)
u32 hand = HAND_RIGHT;
u8 *cmd = g_Vars.ailist + g_Vars.aioffset;
switch (handGetWeaponNum(hand)) {
switch (bgunGetWeaponNum(hand)) {
case WEAPON_CMP150:
case WEAPON_AR34:
g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[2]);
@ -11645,7 +11645,7 @@ bool aiClearInventory(void)
g_Vars.currentplayer->devicesactive = 0;
#endif
invGiveSingleWeapon(WEAPON_UNARMED);
currentPlayerEquipWeapon(WEAPON_UNARMED);
bgunEquipWeapon(WEAPON_UNARMED);
}
}
@ -12246,7 +12246,7 @@ bool aiSetChrHudpieceVisible(void)
bool aiSetPassiveMode(void)
{
u8 *cmd = g_Vars.ailist + g_Vars.aioffset;
playersSetPassiveMode(cmd[2]);
bgunSetPassiveMode(cmd[2]);
g_Vars.aioffset += 3;
return false;

18
src/game/endscreen.c
View File

@ -5,7 +5,7 @@
#include "game/title.h"
#include "game/game_01b0a0.h"
#include "game/game_095320.h"
#include "game/game_097ba0.h"
#include "game/bondgun.h"
#include "game/game_0b0fd0.h"
#include "game/game_0b69d0.h"
#include "game/game_0d4690.h"
@ -411,17 +411,17 @@ glabel func0f10d730
void func0f10d770(void)
{
func0f0f8bb4(&g_Menus[0].unk840, func0f09ddfc() - func0f0e4fe0(), 0);
g_Menus[0].mpconfigbuffer = func0f09ddec() + func0f0e4fe0();
func0f0f8bb4(&g_Menus[0].unk840, bgun0f09ddfc() - func0f0e4fe0(), 0);
g_Menus[0].mpconfigbuffer = bgun0f09ddec() + func0f0e4fe0();
func0f0f8bb4(&g_Menus[1].unk840, func0f09ddfc() - func0f0e4fe0(), 0);
g_Menus[1].mpconfigbuffer = func0f09ddec() + func0f0e4fe0();
func0f0f8bb4(&g_Menus[1].unk840, bgun0f09ddfc() - func0f0e4fe0(), 0);
g_Menus[1].mpconfigbuffer = bgun0f09ddec() + func0f0e4fe0();
func0f0f8bb4(&g_Menus[2].unk840, func0f09ddfc() - func0f0e4fe0(), 0);
g_Menus[2].mpconfigbuffer = func0f09ddec() + func0f0e4fe0();
func0f0f8bb4(&g_Menus[2].unk840, bgun0f09ddfc() - func0f0e4fe0(), 0);
g_Menus[2].mpconfigbuffer = bgun0f09ddec() + func0f0e4fe0();
func0f0f8bb4(&g_Menus[3].unk840, func0f09ddfc() - func0f0e4fe0(), 0);
g_Menus[3].mpconfigbuffer = func0f09ddec() + func0f0e4fe0();
func0f0f8bb4(&g_Menus[3].unk840, bgun0f09ddfc() - func0f0e4fe0(), 0);
g_Menus[3].mpconfigbuffer = bgun0f09ddec() + func0f0e4fe0();
}
#if VERSION >= VERSION_NTSC_1_0

18
src/game/game_010b20.c
View File

@ -1,7 +1,7 @@
#include <ultra64.h>
#include "constants.h"
#include "game/inventory/items.h"
#include "game/game_097ba0.h"
#include "game/bondgun.h"
#include "game/game_1655c0.h"
#include "bss.h"
#include "lib/memory.h"
@ -144,7 +144,7 @@ void func0f010bb0(void)
if (IS4MB() && PLAYERCOUNT() == 2) {
i = ALIGN16(var800700ac);
} else {
i = ALIGN16(func0f09ddfc());
i = ALIGN16(bgun0f09ddfc());
}
g_Vars.currentplayer->gunctrl.unk158c = malloc(i, MEMPOOL_STAGE);
@ -230,12 +230,12 @@ void func0f010bb0(void)
g_Vars.currentplayer->cyclesum = 0;
g_Vars.currentplayer->gunampsum = 0;
func0f09d140(HAND_RIGHT);
func0f09d140(HAND_RIGHT);
func0f09d140(HAND_RIGHT);
func0f09d140(HAND_LEFT);
func0f09d140(HAND_LEFT);
func0f09d140(HAND_LEFT);
bgun0f09d140(HAND_RIGHT);
bgun0f09d140(HAND_RIGHT);
bgun0f09d140(HAND_RIGHT);
bgun0f09d140(HAND_LEFT);
bgun0f09d140(HAND_LEFT);
bgun0f09d140(HAND_LEFT);
g_Vars.currentplayer->gunammooff = 0;
g_Vars.currentplayer->gunsightoff = GUNSIGHTREASON_AIMING;
@ -262,5 +262,5 @@ void func0f010bb0(void)
g_Weapons[WEAPON_EYESPY]->flags |= (WEAPONFLAG_DETERMINER_S_AN | WEAPONFLAG_DETERMINER_F_AN);
}
func0f09ceac();
bgun0f09ceac();
}

154
src/game/game_011110.c
View File

@ -9,7 +9,7 @@
#include "game/game_02cde0.h"
#include "game/prop.h"
#include "game/game_091e10.h"
#include "game/game_097ba0.h"
#include "game/bondgun.h"
#include "game/game_0b69d0.h"
#include "game/inventory/inventory.h"
#include "game/game_1655c0.h"
@ -655,7 +655,7 @@ glabel var7f1a827c
/* f011b70: 118d0004 */ beq $t4,$t5,.PF0f011b84
/* f011b74: 00000000 */ nop
/* f011b78: 8e040004 */ lw $a0,0x4($s0)
/* f011b7c: 0fc2a69d */ jal currentPlayerSetAmmoQuantity
/* f011b7c: 0fc2a69d */ jal bgunSetAmmoQuantity
/* f011b80: 8e050008 */ lw $a1,0x8($s0)
.PF0f011b84:
/* f011b84: 10000049 */ b .PF0f011cac
@ -752,7 +752,7 @@ glabel var7f1a827c
/* f011cd4: 0fc44a1a */ jal invGiveSingleWeapon
/* f011cd8: 24040009 */ li $a0,0x9
/* f011cdc: 2404000a */ li $a0,0xa
/* f011ce0: 0fc2a69d */ jal currentPlayerSetAmmoQuantity
/* f011ce0: 0fc2a69d */ jal bgunSetAmmoQuantity
/* f011ce4: 24050050 */ li $a1,0x50
.PF0f011ce8:
/* f011ce8: 0fc41dd5 */ jal cheatIsActive
@ -762,7 +762,7 @@ glabel var7f1a827c
/* f011cf8: 0fc44a1a */ jal invGiveSingleWeapon
/* f011cfc: 24040016 */ li $a0,0x16
/* f011d00: 24040006 */ li $a0,0x6
/* f011d04: 0fc2a69d */ jal currentPlayerSetAmmoQuantity
/* f011d04: 0fc2a69d */ jal bgunSetAmmoQuantity
/* f011d08: 24050050 */ li $a1,0x50
.PF0f011d0c:
/* f011d0c: 0fc41dd5 */ jal cheatIsActive
@ -772,7 +772,7 @@ glabel var7f1a827c
/* f011d1c: 0fc44a1a */ jal invGiveSingleWeapon
/* f011d20: 24040031 */ li $a0,0x31
/* f011d24: 24040014 */ li $a0,0x14
/* f011d28: 0fc2a69d */ jal currentPlayerSetAmmoQuantity
/* f011d28: 0fc2a69d */ jal bgunSetAmmoQuantity
/* f011d2c: 24051770 */ li $a1,0x1770
.PF0f011d30:
/* f011d30: 0fc41dd5 */ jal cheatIsActive
@ -796,7 +796,7 @@ glabel var7f1a827c
/* f011d70: 0fc44a1a */ jal invGiveSingleWeapon
/* f011d74: 24040018 */ li $a0,0x18
/* f011d78: 24040008 */ li $a0,0x8
/* f011d7c: 0fc2a69d */ jal currentPlayerSetAmmoQuantity
/* f011d7c: 0fc2a69d */ jal bgunSetAmmoQuantity
/* f011d80: 2405000a */ li $a1,0xa
.PF0f011d84:
/* f011d84: 0fc41dd5 */ jal cheatIsActive
@ -806,7 +806,7 @@ glabel var7f1a827c
/* f011d94: 0fc44a1a */ jal invGiveSingleWeapon
/* f011d98: 24040015 */ li $a0,0x15
/* f011d9c: 24040004 */ li $a0,0x4
/* f011da0: 0fc2a69d */ jal currentPlayerSetAmmoQuantity
/* f011da0: 0fc2a69d */ jal bgunSetAmmoQuantity
/* f011da4: 240500c8 */ li $a1,0xc8
.PF0f011da8:
/* f011da8: 0fc41dd5 */ jal cheatIsActive
@ -823,10 +823,10 @@ glabel var7f1a827c
/* f011dd0: 0fc44a1a */ jal invGiveSingleWeapon
/* f011dd4: 24040012 */ li $a0,0x12
/* f011dd8: 24040004 */ li $a0,0x4
/* f011ddc: 0fc2a69d */ jal currentPlayerSetAmmoQuantity
/* f011ddc: 0fc2a69d */ jal bgunSetAmmoQuantity
/* f011de0: 240500c8 */ li $a1,0xc8
/* f011de4: 2404000b */ li $a0,0xb
/* f011de8: 0fc2a69d */ jal currentPlayerSetAmmoQuantity
/* f011de8: 0fc2a69d */ jal bgunSetAmmoQuantity
/* f011dec: 24050014 */ li $a1,0x14
.PF0f011df0:
/* f011df0: 0fc41dd5 */ jal cheatIsActive
@ -836,7 +836,7 @@ glabel var7f1a827c
/* f011e00: 0fc44a1a */ jal invGiveSingleWeapon
/* f011e04: 2404000e */ li $a0,0xe
/* f011e08: 24040002 */ li $a0,0x2
/* f011e0c: 0fc2a69d */ jal currentPlayerSetAmmoQuantity
/* f011e0c: 0fc2a69d */ jal bgunSetAmmoQuantity
/* f011e10: 240500c8 */ li $a1,0xc8
.PF0f011e14:
/* f011e14: 0fc41dd5 */ jal cheatIsActive
@ -846,7 +846,7 @@ glabel var7f1a827c
/* f011e24: 0fc44a1a */ jal invGiveSingleWeapon
/* f011e28: 24040007 */ li $a0,0x7
/* f011e2c: 24040001 */ li $a0,0x1
/* f011e30: 0fc2a69d */ jal currentPlayerSetAmmoQuantity
/* f011e30: 0fc2a69d */ jal bgunSetAmmoQuantity
/* f011e34: 240500c8 */ li $a1,0xc8
.PF0f011e38:
/* f011e38: 0fc41dd5 */ jal cheatIsActive
@ -858,7 +858,7 @@ glabel var7f1a827c
/* f011e50: 10400009 */ beqz $v0,.PF0f011e78
/* f011e54: 24040016 */ li $a0,0x16
.PF0f011e58:
/* f011e58: 0fc2a69d */ jal currentPlayerSetAmmoQuantity
/* f011e58: 0fc2a69d */ jal bgunSetAmmoQuantity
/* f011e5c: 24050004 */ li $a1,0x4
/* f011e60: 0fc41dd5 */ jal cheatIsActive
/* f011e64: 24040021 */ li $a0,0x21
@ -874,7 +874,7 @@ glabel var7f1a827c
/* f011e88: 0fc44a1a */ jal invGiveSingleWeapon
/* f011e8c: 24040024 */ li $a0,0x24
/* f011e90: 24040001 */ li $a0,0x1
/* f011e94: 0fc2a69d */ jal currentPlayerSetAmmoQuantity
/* f011e94: 0fc2a69d */ jal bgunSetAmmoQuantity
/* f011e98: 240500c8 */ li $a1,0xc8
.PF0f011e9c:
/* f011e9c: 0fc41dd5 */ jal cheatIsActive
@ -884,7 +884,7 @@ glabel var7f1a827c
/* f011eac: 0fc44a1a */ jal invGiveSingleWeapon
/* f011eb0: 24040025 */ li $a0,0x25
/* f011eb4: 24040004 */ li $a0,0x4
/* f011eb8: 0fc2a69d */ jal currentPlayerSetAmmoQuantity
/* f011eb8: 0fc2a69d */ jal bgunSetAmmoQuantity
/* f011ebc: 240500c8 */ li $a1,0xc8
.PF0f011ec0:
/* f011ec0: 0fc41dd5 */ jal cheatIsActive
@ -894,7 +894,7 @@ glabel var7f1a827c
/* f011ed0: 0fc44a1a */ jal invGiveSingleWeapon
/* f011ed4: 24040026 */ li $a0,0x26
/* f011ed8: 24040002 */ li $a0,0x2
/* f011edc: 0fc2a69d */ jal currentPlayerSetAmmoQuantity
/* f011edc: 0fc2a69d */ jal bgunSetAmmoQuantity
/* f011ee0: 240500c8 */ li $a1,0xc8
.PF0f011ee4:
/* f011ee4: 0fc41dd5 */ jal cheatIsActive
@ -904,7 +904,7 @@ glabel var7f1a827c
/* f011ef4: 0fc44a1a */ jal invGiveSingleWeapon
/* f011ef8: 24040027 */ li $a0,0x27
/* f011efc: 24040004 */ li $a0,0x4
/* f011f00: 0fc2a69d */ jal currentPlayerSetAmmoQuantity
/* f011f00: 0fc2a69d */ jal bgunSetAmmoQuantity
/* f011f04: 240500c8 */ li $a1,0xc8
.PF0f011f08:
/* f011f08: 0fc41dd5 */ jal cheatIsActive
@ -914,7 +914,7 @@ glabel var7f1a827c
/* f011f18: 0fc44a1a */ jal invGiveSingleWeapon
/* f011f1c: 24040028 */ li $a0,0x28
/* f011f20: 24040002 */ li $a0,0x2
/* f011f24: 0fc2a69d */ jal currentPlayerSetAmmoQuantity
/* f011f24: 0fc2a69d */ jal bgunSetAmmoQuantity
/* f011f28: 240500c8 */ li $a1,0xc8
.PF0f011f2c:
/* f011f2c: 0fc41dd5 */ jal cheatIsActive
@ -924,7 +924,7 @@ glabel var7f1a827c
/* f011f3c: 0fc44a1a */ jal invGiveSingleWeapon
/* f011f40: 24040029 */ li $a0,0x29
/* f011f44: 24040002 */ li $a0,0x2
/* f011f48: 0fc2a69d */ jal currentPlayerSetAmmoQuantity
/* f011f48: 0fc2a69d */ jal bgunSetAmmoQuantity
/* f011f4c: 240500c8 */ li $a1,0xc8
.PF0f011f50:
/* f011f50: 0fc41dd5 */ jal cheatIsActive
@ -934,7 +934,7 @@ glabel var7f1a827c
/* f011f60: 0fc44a1a */ jal invGiveSingleWeapon
/* f011f64: 2404002a */ li $a0,0x2a
/* f011f68: 24040004 */ li $a0,0x4
/* f011f6c: 0fc2a69d */ jal currentPlayerSetAmmoQuantity
/* f011f6c: 0fc2a69d */ jal bgunSetAmmoQuantity
/* f011f70: 240500c8 */ li $a1,0xc8
.PF0f011f74:
/* f011f74: 0fc41dd5 */ jal cheatIsActive
@ -944,7 +944,7 @@ glabel var7f1a827c
/* f011f84: 0fc44a1a */ jal invGiveSingleWeapon
/* f011f88: 2404002b */ li $a0,0x2b
/* f011f8c: 24040002 */ li $a0,0x2
/* f011f90: 0fc2a69d */ jal currentPlayerSetAmmoQuantity
/* f011f90: 0fc2a69d */ jal bgunSetAmmoQuantity
/* f011f94: 240500c8 */ li $a1,0xc8
/* f011f98: 8fa90080 */ lw $t1,0x80($sp)
.PF0f011f9c:
@ -1476,7 +1476,7 @@ glabel var7f1a827c
/* f011b4c: 118d0004 */ beq $t4,$t5,.L0f011b60
/* f011b50: 00000000 */ nop
/* f011b54: 8e040004 */ lw $a0,0x4($s0)
/* f011b58: 0fc2a58a */ jal currentPlayerSetAmmoQuantity
/* f011b58: 0fc2a58a */ jal bgunSetAmmoQuantity
/* f011b5c: 8e050008 */ lw $a1,0x8($s0)
.L0f011b60:
/* f011b60: 10000049 */ b .L0f011c88
@ -1573,7 +1573,7 @@ glabel var7f1a827c
/* f011cb0: 0fc44762 */ jal invGiveSingleWeapon
/* f011cb4: 24040009 */ addiu $a0,$zero,0x9
/* f011cb8: 2404000a */ addiu $a0,$zero,0xa
/* f011cbc: 0fc2a58a */ jal currentPlayerSetAmmoQuantity
/* f011cbc: 0fc2a58a */ jal bgunSetAmmoQuantity
/* f011cc0: 24050050 */ addiu $a1,$zero,0x50
.L0f011cc4:
/* f011cc4: 0fc41b99 */ jal cheatIsActive
@ -1583,7 +1583,7 @@ glabel var7f1a827c
/* f011cd4: 0fc44762 */ jal invGiveSingleWeapon
/* f011cd8: 24040016 */ addiu $a0,$zero,0x16
/* f011cdc: 24040006 */ addiu $a0,$zero,0x6
/* f011ce0: 0fc2a58a */ jal currentPlayerSetAmmoQuantity
/* f011ce0: 0fc2a58a */ jal bgunSetAmmoQuantity
/* f011ce4: 24050050 */ addiu $a1,$zero,0x50
.L0f011ce8:
/* f011ce8: 0fc41b99 */ jal cheatIsActive
@ -1593,7 +1593,7 @@ glabel var7f1a827c
/* f011cf8: 0fc44762 */ jal invGiveSingleWeapon
/* f011cfc: 24040031 */ addiu $a0,$zero,0x31
/* f011d00: 24040014 */ addiu $a0,$zero,0x14
/* f011d04: 0fc2a58a */ jal currentPlayerSetAmmoQuantity
/* f011d04: 0fc2a58a */ jal bgunSetAmmoQuantity
/* f011d08: 24051c20 */ addiu $a1,$zero,0x1c20
.L0f011d0c:
/* f011d0c: 0fc41b99 */ jal cheatIsActive
@ -1617,7 +1617,7 @@ glabel var7f1a827c
/* f011d4c: 0fc44762 */ jal invGiveSingleWeapon
/* f011d50: 24040018 */ addiu $a0,$zero,0x18
/* f011d54: 24040008 */ addiu $a0,$zero,0x8
/* f011d58: 0fc2a58a */ jal currentPlayerSetAmmoQuantity
/* f011d58: 0fc2a58a */ jal bgunSetAmmoQuantity
/* f011d5c: 2405000a */ addiu $a1,$zero,0xa
.L0f011d60:
/* f011d60: 0fc41b99 */ jal cheatIsActive
@ -1627,7 +1627,7 @@ glabel var7f1a827c
/* f011d70: 0fc44762 */ jal invGiveSingleWeapon
/* f011d74: 24040015 */ addiu $a0,$zero,0x15
/* f011d78: 24040004 */ addiu $a0,$zero,0x4
/* f011d7c: 0fc2a58a */ jal currentPlayerSetAmmoQuantity
/* f011d7c: 0fc2a58a */ jal bgunSetAmmoQuantity
/* f011d80: 240500c8 */ addiu $a1,$zero,0xc8
.L0f011d84:
/* f011d84: 0fc41b99 */ jal cheatIsActive
@ -1644,10 +1644,10 @@ glabel var7f1a827c
/* f011dac: 0fc44762 */ jal invGiveSingleWeapon
/* f011db0: 24040012 */ addiu $a0,$zero,0x12
/* f011db4: 24040004 */ addiu $a0,$zero,0x4
/* f011db8: 0fc2a58a */ jal currentPlayerSetAmmoQuantity
/* f011db8: 0fc2a58a */ jal bgunSetAmmoQuantity
/* f011dbc: 240500c8 */ addiu $a1,$zero,0xc8
/* f011dc0: 2404000b */ addiu $a0,$zero,0xb
/* f011dc4: 0fc2a58a */ jal currentPlayerSetAmmoQuantity
/* f011dc4: 0fc2a58a */ jal bgunSetAmmoQuantity
/* f011dc8: 24050014 */ addiu $a1,$zero,0x14
.L0f011dcc:
/* f011dcc: 0fc41b99 */ jal cheatIsActive
@ -1657,7 +1657,7 @@ glabel var7f1a827c
/* f011ddc: 0fc44762 */ jal invGiveSingleWeapon
/* f011de0: 2404000e */ addiu $a0,$zero,0xe
/* f011de4: 24040002 */ addiu $a0,$zero,0x2
/* f011de8: 0fc2a58a */ jal currentPlayerSetAmmoQuantity
/* f011de8: 0fc2a58a */ jal bgunSetAmmoQuantity
/* f011dec: 240500c8 */ addiu $a1,$zero,0xc8
.L0f011df0:
/* f011df0: 0fc41b99 */ jal cheatIsActive
@ -1667,7 +1667,7 @@ glabel var7f1a827c
/* f011e00: 0fc44762 */ jal invGiveSingleWeapon
/* f011e04: 24040007 */ addiu $a0,$zero,0x7
/* f011e08: 24040001 */ addiu $a0,$zero,0x1
/* f011e0c: 0fc2a58a */ jal currentPlayerSetAmmoQuantity
/* f011e0c: 0fc2a58a */ jal bgunSetAmmoQuantity
/* f011e10: 240500c8 */ addiu $a1,$zero,0xc8
.L0f011e14:
/* f011e14: 0fc41b99 */ jal cheatIsActive
@ -1679,7 +1679,7 @@ glabel var7f1a827c
/* f011e2c: 10400009 */ beqz $v0,.L0f011e54
/* f011e30: 24040016 */ addiu $a0,$zero,0x16
.L0f011e34:
/* f011e34: 0fc2a58a */ jal currentPlayerSetAmmoQuantity
/* f011e34: 0fc2a58a */ jal bgunSetAmmoQuantity
/* f011e38: 24050004 */ addiu $a1,$zero,0x4
/* f011e3c: 0fc41b99 */ jal cheatIsActive
/* f011e40: 24040021 */ addiu $a0,$zero,0x21
@ -1695,7 +1695,7 @@ glabel var7f1a827c
/* f011e64: 0fc44762 */ jal invGiveSingleWeapon
/* f011e68: 24040024 */ addiu $a0,$zero,0x24
/* f011e6c: 24040001 */ addiu $a0,$zero,0x1
/* f011e70: 0fc2a58a */ jal currentPlayerSetAmmoQuantity
/* f011e70: 0fc2a58a */ jal bgunSetAmmoQuantity
/* f011e74: 240500c8 */ addiu $a1,$zero,0xc8
.L0f011e78:
/* f011e78: 0fc41b99 */ jal cheatIsActive
@ -1705,7 +1705,7 @@ glabel var7f1a827c
/* f011e88: 0fc44762 */ jal invGiveSingleWeapon
/* f011e8c: 24040025 */ addiu $a0,$zero,0x25
/* f011e90: 24040004 */ addiu $a0,$zero,0x4
/* f011e94: 0fc2a58a */ jal currentPlayerSetAmmoQuantity
/* f011e94: 0fc2a58a */ jal bgunSetAmmoQuantity
/* f011e98: 240500c8 */ addiu $a1,$zero,0xc8
.L0f011e9c:
/* f011e9c: 0fc41b99 */ jal cheatIsActive
@ -1715,7 +1715,7 @@ glabel var7f1a827c
/* f011eac: 0fc44762 */ jal invGiveSingleWeapon
/* f011eb0: 24040026 */ addiu $a0,$zero,0x26
/* f011eb4: 24040002 */ addiu $a0,$zero,0x2
/* f011eb8: 0fc2a58a */ jal currentPlayerSetAmmoQuantity
/* f011eb8: 0fc2a58a */ jal bgunSetAmmoQuantity
/* f011ebc: 240500c8 */ addiu $a1,$zero,0xc8
.L0f011ec0:
/* f011ec0: 0fc41b99 */ jal cheatIsActive
@ -1725,7 +1725,7 @@ glabel var7f1a827c
/* f011ed0: 0fc44762 */ jal invGiveSingleWeapon
/* f011ed4: 24040027 */ addiu $a0,$zero,0x27
/* f011ed8: 24040004 */ addiu $a0,$zero,0x4
/* f011edc: 0fc2a58a */ jal currentPlayerSetAmmoQuantity
/* f011edc: 0fc2a58a */ jal bgunSetAmmoQuantity
/* f011ee0: 240500c8 */ addiu $a1,$zero,0xc8
.L0f011ee4:
/* f011ee4: 0fc41b99 */ jal cheatIsActive
@ -1735,7 +1735,7 @@ glabel var7f1a827c
/* f011ef4: 0fc44762 */ jal invGiveSingleWeapon
/* f011ef8: 24040028 */ addiu $a0,$zero,0x28
/* f011efc: 24040002 */ addiu $a0,$zero,0x2
/* f011f00: 0fc2a58a */ jal currentPlayerSetAmmoQuantity
/* f011f00: 0fc2a58a */ jal bgunSetAmmoQuantity
/* f011f04: 240500c8 */ addiu $a1,$zero,0xc8
.L0f011f08:
/* f011f08: 0fc41b99 */ jal cheatIsActive
@ -1745,7 +1745,7 @@ glabel var7f1a827c
/* f011f18: 0fc44762 */ jal invGiveSingleWeapon
/* f011f1c: 24040029 */ addiu $a0,$zero,0x29
/* f011f20: 24040002 */ addiu $a0,$zero,0x2
/* f011f24: 0fc2a58a */ jal currentPlayerSetAmmoQuantity
/* f011f24: 0fc2a58a */ jal bgunSetAmmoQuantity
/* f011f28: 240500c8 */ addiu $a1,$zero,0xc8
.L0f011f2c:
/* f011f2c: 0fc41b99 */ jal cheatIsActive
@ -1755,7 +1755,7 @@ glabel var7f1a827c
/* f011f3c: 0fc44762 */ jal invGiveSingleWeapon
/* f011f40: 2404002a */ addiu $a0,$zero,0x2a
/* f011f44: 24040004 */ addiu $a0,$zero,0x4
/* f011f48: 0fc2a58a */ jal currentPlayerSetAmmoQuantity
/* f011f48: 0fc2a58a */ jal bgunSetAmmoQuantity
/* f011f4c: 240500c8 */ addiu $a1,$zero,0xc8
.L0f011f50:
/* f011f50: 0fc41b99 */ jal cheatIsActive
@ -1765,7 +1765,7 @@ glabel var7f1a827c
/* f011f60: 0fc44762 */ jal invGiveSingleWeapon
/* f011f64: 2404002b */ addiu $a0,$zero,0x2b
/* f011f68: 24040002 */ addiu $a0,$zero,0x2
/* f011f6c: 0fc2a58a */ jal currentPlayerSetAmmoQuantity
/* f011f6c: 0fc2a58a */ jal bgunSetAmmoQuantity
/* f011f70: 240500c8 */ addiu $a1,$zero,0xc8
/* f011f74: 8fa90080 */ lw $t1,0x80($sp)
.L0f011f78:
@ -2297,7 +2297,7 @@ glabel var7f1a827c
/* f01188c: 118d0004 */ beq $t4,$t5,.NB0f0118a0
/* f011890: 00000000 */ sll $zero,$zero,0x0
/* f011894: 8e040004 */ lw $a0,0x4($s0)
/* f011898: 0fc29cf2 */ jal currentPlayerSetAmmoQuantity
/* f011898: 0fc29cf2 */ jal bgunSetAmmoQuantity
/* f01189c: 8e050008 */ lw $a1,0x8($s0)
.NB0f0118a0:
/* f0118a0: 10000049 */ beqz $zero,.NB0f0119c8
@ -2394,7 +2394,7 @@ glabel var7f1a827c
/* f0119f0: 0fc4307a */ jal invGiveSingleWeapon
/* f0119f4: 24040009 */ addiu $a0,$zero,0x9
/* f0119f8: 2404000a */ addiu $a0,$zero,0xa
/* f0119fc: 0fc29cf2 */ jal currentPlayerSetAmmoQuantity
/* f0119fc: 0fc29cf2 */ jal bgunSetAmmoQuantity
/* f011a00: 24050050 */ addiu $a1,$zero,0x50
.NB0f011a04:
/* f011a04: 0fc40ab9 */ jal cheatIsActive
@ -2404,7 +2404,7 @@ glabel var7f1a827c
/* f011a14: 0fc4307a */ jal invGiveSingleWeapon
/* f011a18: 24040016 */ addiu $a0,$zero,0x16
/* f011a1c: 24040006 */ addiu $a0,$zero,0x6
/* f011a20: 0fc29cf2 */ jal currentPlayerSetAmmoQuantity
/* f011a20: 0fc29cf2 */ jal bgunSetAmmoQuantity
/* f011a24: 24050050 */ addiu $a1,$zero,0x50
.NB0f011a28:
/* f011a28: 0fc40ab9 */ jal cheatIsActive
@ -2414,7 +2414,7 @@ glabel var7f1a827c
/* f011a38: 0fc4307a */ jal invGiveSingleWeapon
/* f011a3c: 24040031 */ addiu $a0,$zero,0x31
/* f011a40: 24040014 */ addiu $a0,$zero,0x14
/* f011a44: 0fc29cf2 */ jal currentPlayerSetAmmoQuantity
/* f011a44: 0fc29cf2 */ jal bgunSetAmmoQuantity
/* f011a48: 24051c20 */ addiu $a1,$zero,0x1c20
.NB0f011a4c:
/* f011a4c: 0fc40ab9 */ jal cheatIsActive
@ -2438,7 +2438,7 @@ glabel var7f1a827c
/* f011a8c: 0fc4307a */ jal invGiveSingleWeapon
/* f011a90: 24040018 */ addiu $a0,$zero,0x18
/* f011a94: 24040008 */ addiu $a0,$zero,0x8
/* f011a98: 0fc29cf2 */ jal currentPlayerSetAmmoQuantity
/* f011a98: 0fc29cf2 */ jal bgunSetAmmoQuantity
/* f011a9c: 2405000a */ addiu $a1,$zero,0xa
.NB0f011aa0:
/* f011aa0: 0fc40ab9 */ jal cheatIsActive
@ -2448,7 +2448,7 @@ glabel var7f1a827c
/* f011ab0: 0fc4307a */ jal invGiveSingleWeapon
/* f011ab4: 24040015 */ addiu $a0,$zero,0x15
/* f011ab8: 24040004 */ addiu $a0,$zero,0x4
/* f011abc: 0fc29cf2 */ jal currentPlayerSetAmmoQuantity
/* f011abc: 0fc29cf2 */ jal bgunSetAmmoQuantity
/* f011ac0: 240500c8 */ addiu $a1,$zero,0xc8
.NB0f011ac4:
/* f011ac4: 0fc40ab9 */ jal cheatIsActive
@ -2465,10 +2465,10 @@ glabel var7f1a827c
/* f011aec: 0fc4307a */ jal invGiveSingleWeapon
/* f011af0: 24040012 */ addiu $a0,$zero,0x12
/* f011af4: 24040004 */ addiu $a0,$zero,0x4
/* f011af8: 0fc29cf2 */ jal currentPlayerSetAmmoQuantity
/* f011af8: 0fc29cf2 */ jal bgunSetAmmoQuantity
/* f011afc: 240500c8 */ addiu $a1,$zero,0xc8
/* f011b00: 2404000b */ addiu $a0,$zero,0xb
/* f011b04: 0fc29cf2 */ jal currentPlayerSetAmmoQuantity
/* f011b04: 0fc29cf2 */ jal bgunSetAmmoQuantity
/* f011b08: 24050014 */ addiu $a1,$zero,0x14
.NB0f011b0c:
/* f011b0c: 0fc40ab9 */ jal cheatIsActive
@ -2478,7 +2478,7 @@ glabel var7f1a827c
/* f011b1c: 0fc4307a */ jal invGiveSingleWeapon
/* f011b20: 2404000e */ addiu $a0,$zero,0xe
/* f011b24: 24040002 */ addiu $a0,$zero,0x2
/* f011b28: 0fc29cf2 */ jal currentPlayerSetAmmoQuantity
/* f011b28: 0fc29cf2 */ jal bgunSetAmmoQuantity
/* f011b2c: 240500c8 */ addiu $a1,$zero,0xc8
.NB0f011b30:
/* f011b30: 0fc40ab9 */ jal cheatIsActive
@ -2488,7 +2488,7 @@ glabel var7f1a827c
/* f011b40: 0fc4307a */ jal invGiveSingleWeapon
/* f011b44: 24040007 */ addiu $a0,$zero,0x7
/* f011b48: 24040001 */ addiu $a0,$zero,0x1
/* f011b4c: 0fc29cf2 */ jal currentPlayerSetAmmoQuantity
/* f011b4c: 0fc29cf2 */ jal bgunSetAmmoQuantity
/* f011b50: 240500c8 */ addiu $a1,$zero,0xc8
.NB0f011b54:
/* f011b54: 0fc40ab9 */ jal cheatIsActive
@ -2498,7 +2498,7 @@ glabel var7f1a827c
/* f011b64: 0fc4307a */ jal invGiveSingleWeapon
/* f011b68: 2404002c */ addiu $a0,$zero,0x2c
/* f011b6c: 24040016 */ addiu $a0,$zero,0x16
/* f011b70: 0fc29cf2 */ jal currentPlayerSetAmmoQuantity
/* f011b70: 0fc29cf2 */ jal bgunSetAmmoQuantity
/* f011b74: 24050004 */ addiu $a1,$zero,0x4
.NB0f011b78:
/* f011b78: 0fc40ab9 */ jal cheatIsActive
@ -2508,7 +2508,7 @@ glabel var7f1a827c
/* f011b88: 0fc4307a */ jal invGiveSingleWeapon
/* f011b8c: 24040024 */ addiu $a0,$zero,0x24
/* f011b90: 24040001 */ addiu $a0,$zero,0x1
/* f011b94: 0fc29cf2 */ jal currentPlayerSetAmmoQuantity
/* f011b94: 0fc29cf2 */ jal bgunSetAmmoQuantity
/* f011b98: 240500c8 */ addiu $a1,$zero,0xc8
.NB0f011b9c:
/* f011b9c: 0fc40ab9 */ jal cheatIsActive
@ -2518,7 +2518,7 @@ glabel var7f1a827c
/* f011bac: 0fc4307a */ jal invGiveSingleWeapon
/* f011bb0: 24040025 */ addiu $a0,$zero,0x25
/* f011bb4: 24040004 */ addiu $a0,$zero,0x4
/* f011bb8: 0fc29cf2 */ jal currentPlayerSetAmmoQuantity
/* f011bb8: 0fc29cf2 */ jal bgunSetAmmoQuantity
/* f011bbc: 240500c8 */ addiu $a1,$zero,0xc8
.NB0f011bc0:
/* f011bc0: 0fc40ab9 */ jal cheatIsActive
@ -2528,7 +2528,7 @@ glabel var7f1a827c
/* f011bd0: 0fc4307a */ jal invGiveSingleWeapon
/* f011bd4: 24040026 */ addiu $a0,$zero,0x26
/* f011bd8: 24040002 */ addiu $a0,$zero,0x2
/* f011bdc: 0fc29cf2 */ jal currentPlayerSetAmmoQuantity
/* f011bdc: 0fc29cf2 */ jal bgunSetAmmoQuantity
/* f011be0: 240500c8 */ addiu $a1,$zero,0xc8
.NB0f011be4:
/* f011be4: 0fc40ab9 */ jal cheatIsActive
@ -2538,7 +2538,7 @@ glabel var7f1a827c
/* f011bf4: 0fc4307a */ jal invGiveSingleWeapon
/* f011bf8: 24040027 */ addiu $a0,$zero,0x27
/* f011bfc: 24040004 */ addiu $a0,$zero,0x4
/* f011c00: 0fc29cf2 */ jal currentPlayerSetAmmoQuantity
/* f011c00: 0fc29cf2 */ jal bgunSetAmmoQuantity
/* f011c04: 240500c8 */ addiu $a1,$zero,0xc8
.NB0f011c08:
/* f011c08: 0fc40ab9 */ jal cheatIsActive
@ -2548,7 +2548,7 @@ glabel var7f1a827c
/* f011c18: 0fc4307a */ jal invGiveSingleWeapon
/* f011c1c: 24040028 */ addiu $a0,$zero,0x28
/* f011c20: 24040002 */ addiu $a0,$zero,0x2
/* f011c24: 0fc29cf2 */ jal currentPlayerSetAmmoQuantity
/* f011c24: 0fc29cf2 */ jal bgunSetAmmoQuantity
/* f011c28: 240500c8 */ addiu $a1,$zero,0xc8
.NB0f011c2c:
/* f011c2c: 0fc40ab9 */ jal cheatIsActive
@ -2558,7 +2558,7 @@ glabel var7f1a827c
/* f011c3c: 0fc4307a */ jal invGiveSingleWeapon
/* f011c40: 24040029 */ addiu $a0,$zero,0x29
/* f011c44: 24040002 */ addiu $a0,$zero,0x2
/* f011c48: 0fc29cf2 */ jal currentPlayerSetAmmoQuantity
/* f011c48: 0fc29cf2 */ jal bgunSetAmmoQuantity
/* f011c4c: 240500c8 */ addiu $a1,$zero,0xc8
.NB0f011c50:
/* f011c50: 0fc40ab9 */ jal cheatIsActive
@ -2568,7 +2568,7 @@ glabel var7f1a827c
/* f011c60: 0fc4307a */ jal invGiveSingleWeapon
/* f011c64: 2404002a */ addiu $a0,$zero,0x2a
/* f011c68: 24040004 */ addiu $a0,$zero,0x4
/* f011c6c: 0fc29cf2 */ jal currentPlayerSetAmmoQuantity
/* f011c6c: 0fc29cf2 */ jal bgunSetAmmoQuantity
/* f011c70: 240500c8 */ addiu $a1,$zero,0xc8
.NB0f011c74:
/* f011c74: 0fc40ab9 */ jal cheatIsActive
@ -2578,7 +2578,7 @@ glabel var7f1a827c
/* f011c84: 0fc4307a */ jal invGiveSingleWeapon
/* f011c88: 2404002b */ addiu $a0,$zero,0x2b
/* f011c8c: 24040002 */ addiu $a0,$zero,0x2
/* f011c90: 0fc29cf2 */ jal currentPlayerSetAmmoQuantity
/* f011c90: 0fc29cf2 */ jal bgunSetAmmoQuantity
/* f011c94: 240500c8 */ addiu $a1,$zero,0xc8
/* f011c98: 8fa90080 */ lw $t1,0x80($sp)
.NB0f011c9c:
@ -3012,7 +3012,7 @@ glabel var7f1a827c
// break;
// case INTROCMD_AMMO:
// if (cmd[3] == 0 && g_Vars.currentplayer != g_Vars.anti) {
// currentPlayerSetAmmoQuantity(cmd[1], cmd[2]);
// bgunSetAmmoQuantity(cmd[1], cmd[2]);
// }
// cmd += 4;
// break;
@ -3057,17 +3057,17 @@ glabel var7f1a827c
//
// if (cheatIsActive(CHEAT_TRENTSMAGNUM)) {
// invGiveSingleWeapon(WEAPON_DY357LX);
// currentPlayerSetAmmoQuantity(AMMOTYPE_MAGNUM, 80);
// bgunSetAmmoQuantity(AMMOTYPE_MAGNUM, 80);
// }
//
// if (cheatIsActive(CHEAT_FARSIGHT)) {
// invGiveSingleWeapon(WEAPON_FARSIGHT);
// currentPlayerSetAmmoQuantity(AMMOTYPE_FARSIGHT, 80);
// bgunSetAmmoQuantity(AMMOTYPE_FARSIGHT, 80);
// }
//
// if (cheatIsActive(CHEAT_CLOAKINGDEVICE)) {
// invGiveSingleWeapon(WEAPON_CLOAKINGDEVICE);
// currentPlayerSetAmmoQuantity(AMMOTYPE_CLOAK, 7200);
// bgunSetAmmoQuantity(AMMOTYPE_CLOAK, 7200);
// }
//
// if (cheatIsActive(CHEAT_PERFECTDARKNESS)) {
@ -3080,12 +3080,12 @@ glabel var7f1a827c
//
// if (cheatIsActive(CHEAT_ROCKETLAUNCHER)) {
// invGiveSingleWeapon(WEAPON_ROCKETLAUNCHER);
// currentPlayerSetAmmoQuantity(AMMOTYPE_ROCKET, 10);
// bgunSetAmmoQuantity(AMMOTYPE_ROCKET, 10);
// }
//
// if (cheatIsActive(CHEAT_SNIPERRIFLE)) {
// invGiveSingleWeapon(WEAPON_SNIPERRIFLE);
// currentPlayerSetAmmoQuantity(AMMOTYPE_RIFLE, 200);
// bgunSetAmmoQuantity(AMMOTYPE_RIFLE, 200);
// }
//
// if (cheatIsActive(CHEAT_XRAYSCANNER)) {
@ -3094,22 +3094,22 @@ glabel var7f1a827c
//
// if (cheatIsActive(CHEAT_SUPERDRAGON)) {
// invGiveSingleWeapon(WEAPON_SUPERDRAGON);
// currentPlayerSetAmmoQuantity(AMMOTYPE_RIFLE, 200);
// currentPlayerSetAmmoQuantity(AMMOTYPE_DEVASTATOR, 20);
// bgunSetAmmoQuantity(AMMOTYPE_RIFLE, 200);
// bgunSetAmmoQuantity(AMMOTYPE_DEVASTATOR, 20);
// }
//
// if (cheatIsActive(CHEAT_LAPTOPGUN)) {
// invGiveSingleWeapon(WEAPON_LAPTOPGUN);
// currentPlayerSetAmmoQuantity(AMMOTYPE_SMG, 200);
// bgunSetAmmoQuantity(AMMOTYPE_SMG, 200);
// }
//
// if (cheatIsActive(CHEAT_PHOENIX)) {
// invGiveSingleWeapon(WEAPON_PHOENIX);
// currentPlayerSetAmmoQuantity(AMMOTYPE_PISTOL, 200);
// bgunSetAmmoQuantity(AMMOTYPE_PISTOL, 200);
// }
//
// if (cheatIsActive(CHEAT_PSYCHOSISGUN) || cheatIsActive(CHEAT_ALLGUNS)) {
// currentPlayerSetAmmoQuantity(AMMOTYPE_PSYCHOSIS, 4);
// bgunSetAmmoQuantity(AMMOTYPE_PSYCHOSIS, 4);
//
// if (cheatIsActive(CHEAT_PSYCHOSISGUN)) {
// invGiveSingleWeapon(WEAPON_PSYCHOSISGUN);
@ -3118,42 +3118,42 @@ glabel var7f1a827c
//
// if (cheatIsActive(CHEAT_PP9I)) {
// invGiveSingleWeapon(WEAPON_PP9I);
// currentPlayerSetAmmoQuantity(AMMOTYPE_PISTOL, 200);
// bgunSetAmmoQuantity(AMMOTYPE_PISTOL, 200);
// }
//
// if (cheatIsActive(CHEAT_CC13)) {
// invGiveSingleWeapon(WEAPON_CC13);
// currentPlayerSetAmmoQuantity(AMMOTYPE_RIFLE, 200);
// bgunSetAmmoQuantity(AMMOTYPE_RIFLE, 200);
// }
//
// if (cheatIsActive(CHEAT_KL01313)) {
// invGiveSingleWeapon(WEAPON_KL01313);
// currentPlayerSetAmmoQuantity(AMMOTYPE_SMG, 200);
// bgunSetAmmoQuantity(AMMOTYPE_SMG, 200);
// }
//
// if (cheatIsActive(CHEAT_KF7SPECIAL)) {
// invGiveSingleWeapon(WEAPON_KF7SPECIAL);
// currentPlayerSetAmmoQuantity(AMMOTYPE_RIFLE, 200);
// bgunSetAmmoQuantity(AMMOTYPE_RIFLE, 200);
// }
//
// if (cheatIsActive(CHEAT_ZZT)) {
// invGiveSingleWeapon(WEAPON_ZZT);
// currentPlayerSetAmmoQuantity(AMMOTYPE_SMG, 200);
// bgunSetAmmoQuantity(AMMOTYPE_SMG, 200);
// }
//
// if (cheatIsActive(CHEAT_DMC)) {
// invGiveSingleWeapon(WEAPON_DMC);
// currentPlayerSetAmmoQuantity(AMMOTYPE_SMG, 200);
// bgunSetAmmoQuantity(AMMOTYPE_SMG, 200);
// }
//
// if (cheatIsActive(CHEAT_AR53)) {
// invGiveSingleWeapon(WEAPON_AR53);
// currentPlayerSetAmmoQuantity(AMMOTYPE_RIFLE, 200);
// bgunSetAmmoQuantity(AMMOTYPE_RIFLE, 200);
// }
//
// if (cheatIsActive(CHEAT_RCP45)) {
// invGiveSingleWeapon(WEAPON_RCP45);
// currentPlayerSetAmmoQuantity(AMMOTYPE_SMG, 200);
// bgunSetAmmoQuantity(AMMOTYPE_SMG, 200);
// }
//
// if (!hasdefaultweapon) {

2
src/game/game_01b0a0.c
View File

@ -1,7 +1,7 @@
#include <ultra64.h>
#include "constants.h"
#include "game/game_01b0a0.h"
#include "game/game_097ba0.h"
#include "game/bondgun.h"
#include "game/game_0b0fd0.h"
#include "game/inventory/inventory.h"
#include "game/game_127910.h"

10
src/game/game_01bea0.c
View File

@ -4,7 +4,7 @@
#include "game/title.h"
#include "game/game_01b0a0.h"
#include "game/game_01bea0.h"
#include "game/game_097ba0.h"
#include "game/bondgun.h"
#include "game/game_0b69d0.h"
#include "game/game_0e0770.h"
#include "game/game_0f09f0.h"
@ -1585,7 +1585,7 @@ glabel var7f1a863c
/* f01d4f0: 8defede4 */ lw $t7,-0x121c($t7)
/* f01d4f4: 51e00006 */ beqzl $t7,.PF0f01d510
/* f01d4f8: 8e6d006c */ lw $t5,0x6c($s3)
/* f01d4fc: 0fc27881 */ jal func0f09df50
/* f01d4fc: 0fc27881 */ jal bgun0f09df50
/* f01d500: 00000000 */ nop
/* f01d504: 3c01800a */ lui $at,0x800a
/* f01d508: ac20ede4 */ sw $zero,-0x121c($at)
@ -3362,7 +3362,7 @@ glabel var7f1a863c
/* f01d420: 8f39e844 */ lw $t9,%lo(g_Menus+0x844)($t9)
/* f01d424: 53200006 */ beqzl $t9,.L0f01d440
/* f01d428: 8e6f006c */ lw $t7,0x6c($s3)
/* f01d42c: 0fc277d4 */ jal func0f09df50
/* f01d42c: 0fc277d4 */ jal bgun0f09df50
/* f01d430: 00000000 */ nop
/* f01d434: 3c01800a */ lui $at,%hi(g_Menus+0x844)
/* f01d438: ac20e844 */ sw $zero,%lo(g_Menus+0x844)($at)
@ -5130,7 +5130,7 @@ glabel var7f1a863c
/* f01d100: 8f392f60 */ lw $t9,0x2f60($t9)
/* f01d104: 53200006 */ beqzl $t9,.NB0f01d120
/* f01d108: 8e6f006c */ lw $t7,0x6c($s3)
/* f01d10c: 0fc26f9b */ jal func0f09df50
/* f01d10c: 0fc26f9b */ jal bgun0f09df50
/* f01d110: 00000000 */ sll $zero,$zero,0x0
/* f01d114: 3c01800a */ lui $at,0x800a
/* f01d118: ac202f60 */ sw $zero,0x2f60($at)
@ -6052,7 +6052,7 @@ glabel var7f1a863c
// g_MenuData.unk5d5_01 = true;
//
// if (g_Menus[0].unk844) {
// func0f09df50();
// bgun0f09df50();
// g_Menus[0].unk844 = 0;
// }
// }

14
src/game/game_0abe70.c
View File

@ -1,7 +1,7 @@
#include <ultra64.h>
#include "constants.h"
#include "game/game_0969d0.h"
#include "game/game_097ba0.h"
#include "game/bondgun.h"
#include "game/game_0abe70.h"
#include "game/game_0b0fd0.h"
#include "game/game_0b3350.h"
@ -319,7 +319,7 @@ glabel func0f0ac138
/* f0ac1c4: 450300b9 */ bc1tl .L0f0ac4ac
/* f0ac1c8: 8fbf0014 */ lw $ra,0x14($sp)
/* f0ac1cc: afa30028 */ sw $v1,0x28($sp)
/* f0ac1d0: 0fc2866a */ jal handGetWeaponNum
/* f0ac1d0: 0fc2866a */ jal bgunGetWeaponNum
/* f0ac1d4: afa5002c */ sw $a1,0x2c($sp)
/* f0ac1d8: 8fa30028 */ lw $v1,0x28($sp)
/* f0ac1dc: 2401001d */ addiu $at,$zero,0x1d
@ -403,7 +403,7 @@ glabel func0f0ac138
/* f0ac2f8: 2401ffff */ addiu $at,$zero,-1
/* f0ac2fc: 54810008 */ bnel $a0,$at,.L0f0ac320
/* f0ac300: 2401ffff */ addiu $at,$zero,-1
/* f0ac304: 0fc29c3e */ jal func0f0a70f8
/* f0ac304: 0fc29c3e */ jal bgun0f0a70f8
/* f0ac308: afa30028 */ sw $v1,0x28($sp)
/* f0ac30c: 8fa50020 */ lw $a1,0x20($sp)
/* f0ac310: 8fa30028 */ lw $v1,0x28($sp)
@ -2303,7 +2303,7 @@ glabel var7f1acd60
/* f0ade18: afa50144 */ sw $a1,0x144($sp)
/* f0ade1c: afa60148 */ sw $a2,0x148($sp)
/* f0ade20: 00008025 */ or $s0,$zero,$zero
/* f0ade24: 0fc2866a */ jal handGetWeaponNum
/* f0ade24: 0fc2866a */ jal bgunGetWeaponNum
/* f0ade28: afae0134 */ sw $t6,0x134($sp)
/* f0ade2c: 8fb90140 */ lw $t9,0x140($sp)
/* f0ade30: 8fb80134 */ lw $t8,0x134($sp)
@ -2388,7 +2388,7 @@ glabel var7f1acd60
/* f0adf50: 8fa40148 */ lw $a0,0x148($sp)
/* f0adf54: 0c005746 */ jal func00015d18
/* f0adf58: 27a500ec */ addiu $a1,$sp,0xec
/* f0adf5c: 0fc27aef */ jal func0f09ebbc
/* f0adf5c: 0fc27aef */ jal bgun0f09ebbc
/* f0adf60: 00000000 */ nop
/* f0adf64: 10400004 */ beqz $v0,.L0f0adf78
/* f0adf68: 00402025 */ or $a0,$v0,$zero
@ -3134,7 +3134,7 @@ glabel var7f1acd60
/* f0ade18: afa50144 */ sw $a1,0x144($sp)
/* f0ade1c: afa60148 */ sw $a2,0x148($sp)
/* f0ade20: 00008025 */ or $s0,$zero,$zero
/* f0ade24: 0fc2866a */ jal handGetWeaponNum
/* f0ade24: 0fc2866a */ jal bgunGetWeaponNum
/* f0ade28: afae0134 */ sw $t6,0x134($sp)
/* f0ade2c: 8fb90140 */ lw $t9,0x140($sp)
/* f0ade30: 8fb80134 */ lw $t8,0x134($sp)
@ -3219,7 +3219,7 @@ glabel var7f1acd60
/* f0adf50: 8fa40148 */ lw $a0,0x148($sp)
/* f0adf54: 0c005746 */ jal func00015d18
/* f0adf58: 27a500ec */ addiu $a1,$sp,0xec
/* f0adf5c: 0fc27aef */ jal func0f09ebbc
/* f0adf5c: 0fc27aef */ jal bgun0f09ebbc
/* f0adf60: 00000000 */ nop
/* f0adf64: 10400004 */ beqz $v0,.L0f0adf78
/* f0adf68: 00402025 */ or $a0,$v0,$zero

24
src/game/game_0b0fd0.c
View File

@ -2,7 +2,7 @@
#include "constants.h"
#include "game/cheats.h"
#include "game/inventory/items.h"
#include "game/game_097ba0.h"
#include "game/bondgun.h"
#include "game/game_0b0fd0.h"
#include "game/game_0b69d0.h"
#include "game/hudmsg.h"
@ -127,7 +127,7 @@ struct inventory_ammo *weaponGetAmmoByFunction(u32 weaponnum, u32 funcnum)
void currentPlayerGetWeaponSway(struct coord *sway)
{
struct weapon *weapon = weaponFindById(handGetWeaponNum(HAND_RIGHT));
struct weapon *weapon = weaponFindById(bgunGetWeaponNum(HAND_RIGHT));
if (weapon) {
sway->x = weapon->leftright;
@ -138,7 +138,7 @@ void currentPlayerGetWeaponSway(struct coord *sway)
void currentPlayerSetWeaponSway(struct coord *sway)
{
struct weapon *weapon = weaponFindById(handGetWeaponNum(HAND_RIGHT));
struct weapon *weapon = weaponFindById(bgunGetWeaponNum(HAND_RIGHT));
if (weapon) {
weapon->leftright = sway->x;
@ -158,7 +158,7 @@ f32 func0f0b131c(s32 hand)
struct weapon *weapon;
if (hand == 0) {
weapon = weaponFindById(getCurrentPlayerWeaponIdWrapper(0));
weapon = weaponFindById(bgunGetWeaponNum2(0));
x = weapon->leftright;
if (PLAYERCOUNT() == 2 && optionsGetScreenSplit() == SCREENSPLIT_VERTICAL) {
@ -169,7 +169,7 @@ f32 func0f0b131c(s32 hand)
}
}
} else {
weapon = weaponFindById(getCurrentPlayerWeaponIdWrapper(1));
weapon = weaponFindById(bgunGetWeaponNum2(1));
x = -weapon->leftright;
if (PLAYERCOUNT() == 2 && optionsGetScreenSplit() == SCREENSPLIT_VERTICAL) {
@ -189,7 +189,7 @@ f32 currentPlayerGetGunZoomFov(void)
s32 index = -1;
struct weapon *weapon;
switch (getCurrentPlayerWeaponIdWrapper(0)) {
switch (bgunGetWeaponNum2(0)) {
case WEAPON_SNIPERRIFLE: index = 0; break;
case WEAPON_FARSIGHT: index = 1; break;
case WEAPON_HORIZONSCANNER: index = 2; break;
@ -199,7 +199,7 @@ f32 currentPlayerGetGunZoomFov(void)
return g_Vars.currentplayer->gunzoomfovs[index];
}
weapon = weaponFindById(getCurrentPlayerWeaponIdWrapper(0));
weapon = weaponFindById(bgunGetWeaponNum2(0));
if (weapon) {
f32 fov = weapon->eptr->zoomfov;
@ -213,7 +213,7 @@ void currentPlayerZoomOut(f32 fovpersec)
{
s32 index = -1;
switch (getCurrentPlayerWeaponIdWrapper(0)) {
switch (bgunGetWeaponNum2(0)) {
case WEAPON_SNIPERRIFLE: index = 0; break;
case WEAPON_FARSIGHT: index = 1; break;
case WEAPON_HORIZONSCANNER: index = 2; break;
@ -226,7 +226,7 @@ void currentPlayerZoomOut(f32 fovpersec)
f32 amount = fovpersec * 0.25f * g_Vars.lvupdate240f;
#endif
if (getCurrentPlayerWeaponIdWrapper(0) == WEAPON_FARSIGHT) {
if (bgunGetWeaponNum2(0) == WEAPON_FARSIGHT) {
amount *= 0.5f;
}
@ -242,7 +242,7 @@ void currentPlayerZoomIn(f32 fovpersec)
{
s32 index = -1;
switch (getCurrentPlayerWeaponIdWrapper(0)) {
switch (bgunGetWeaponNum2(0)) {
case WEAPON_SNIPERRIFLE: index = 0; break;
case WEAPON_FARSIGHT: index = 1; break;
case WEAPON_HORIZONSCANNER: index = 2; break;
@ -255,7 +255,7 @@ void currentPlayerZoomIn(f32 fovpersec)
f32 amount = fovpersec * 0.25f * g_Vars.lvupdate240f;
#endif
if (getCurrentPlayerWeaponIdWrapper(0) == WEAPON_FARSIGHT) {
if (bgunGetWeaponNum2(0) == WEAPON_FARSIGHT) {
amount *= 0.5f;
}
@ -595,7 +595,7 @@ f32 gsetGetDamage(struct gset *gset)
damage = (gset->unk063a / 3.0f + 1.0f) * damage;
}
if (handIsFiring(HAND_LEFT) && handIsFiring(HAND_RIGHT)) {
if (bgunIsFiring(HAND_LEFT) && bgunIsFiring(HAND_RIGHT)) {
damage += damage;
}

2
src/game/game_0b63b0.c
View File

@ -14,7 +14,7 @@
#include "game/game_095320.h"
#include "game/atan2f.h"
#include "game/game_096ca0.h"
#include "game/game_097ba0.h"
#include "game/bondgun.h"
#include "game/game_0abe70.h"
#include "game/game_0b0fd0.h"
#include "game/game_0b2150.h"

124
src/game/game_0b69d0.c
View File

@ -15,7 +15,7 @@
#include "game/game_095320.h"
#include "game/atan2f.h"
#include "game/game_096ca0.h"
#include "game/game_097ba0.h"
#include "game/bondgun.h"
#include "game/game_0abe70.h"
#include "game/game_0b0fd0.h"
#include "game/game_0b2150.h"
@ -765,7 +765,7 @@ glabel var7f1ad568
/* f0b755c: 02002025 */ or $a0,$s0,$zero
/* f0b7560: 1040000a */ beqz $v0,.L0f0b758c
/* f0b7564: 02002025 */ or $a0,$s0,$zero
/* f0b7568: 0fc2a685 */ jal weaponGetAmmoType
/* f0b7568: 0fc2a685 */ jal bgunGetAmmoTypeForWeapon
/* f0b756c: 00002825 */ or $a1,$zero,$zero
/* f0b7570: 04400006 */ bltz $v0,.L0f0b758c
/* f0b7574: 28410021 */ slti $at,$v0,0x21
@ -857,7 +857,7 @@ glabel var7f1ad568
/* f0b76a4: 15a00004 */ bnez $t5,.L0f0b76b8
/* f0b76a8: 00000000 */ nop
/* f0b76ac: 8e240004 */ lw $a0,0x4($s1)
/* f0b76b0: 0fc2a58a */ jal currentPlayerSetAmmoQuantity
/* f0b76b0: 0fc2a58a */ jal bgunSetAmmoQuantity
/* f0b76b4: 8e250008 */ lw $a1,0x8($s1)
.L0f0b76b8:
/* f0b76b8: 1000000a */ b .L0f0b76e4
@ -1023,7 +1023,7 @@ glabel var7f1ad568
//
// for (i = 1; i != ARRAYCOUNT(g_Weapons); i++) {
// if (invHasSingleWeaponOrProp(i)) {
// s32 ammotype = weaponGetAmmoType(i, 0);
// s32 ammotype = bgunGetAmmoTypeForWeapon(i, 0);
//
// if (ammotype >= 0 && ammotype <= AMMOTYPE_ECM_MINE) {
// aiStack188[ammotype + 1] = 1;
@ -1072,7 +1072,7 @@ glabel var7f1ad568
// break;
// case INTROCMD_AMMO:
// if (cmd[3] == 0) {
// currentPlayerSetAmmoQuantity(cmd[1], cmd[2]);
// bgunSetAmmoQuantity(cmd[1], cmd[2]);
// }
// cmd += 4;
// break;
@ -1284,12 +1284,12 @@ bool currentPlayerAssumeChrForAnti(struct chrdata *hostchr, bool force)
#if VERSION >= VERSION_NTSC_1_0
invGiveSingleWeapon(weapon1->weaponnum);
invGiveDoubleWeapon(weapon1->weaponnum, weapon1->weaponnum);
currentPlayerEquipWeaponWrapper(HAND_RIGHT, weapon1->weaponnum);
currentPlayerEquipWeaponWrapper(HAND_LEFT, weapon1->weaponnum);
bgunEquipWeapon2(HAND_RIGHT, weapon1->weaponnum);
bgunEquipWeapon2(HAND_LEFT, weapon1->weaponnum);
#else
invGiveDoubleWeapon(weapon1->weaponnum, weapon2->weaponnum);
currentPlayerEquipWeaponWrapper(HAND_RIGHT, weapon1->weaponnum);
currentPlayerEquipWeaponWrapper(HAND_LEFT, weapon2->weaponnum);
bgunEquipWeapon2(HAND_RIGHT, weapon1->weaponnum);
bgunEquipWeapon2(HAND_LEFT, weapon2->weaponnum);
#endif
} else if (hostchr->weapons_held[0]) {
// Right hand only
@ -1297,10 +1297,10 @@ bool currentPlayerAssumeChrForAnti(struct chrdata *hostchr, bool force)
if (weapon->weaponnum == WEAPON_SUPERDRAGON) {
invGiveSingleWeapon(WEAPON_DRAGON);
currentPlayerEquipWeaponWrapper(HAND_RIGHT, WEAPON_DRAGON);
bgunEquipWeapon2(HAND_RIGHT, WEAPON_DRAGON);
} else {
invGiveSingleWeapon(weapon->weaponnum);
currentPlayerEquipWeaponWrapper(HAND_RIGHT, weapon->weaponnum);
bgunEquipWeapon2(HAND_RIGHT, weapon->weaponnum);
}
} else if (hostchr->weapons_held[1]) {
// Left hand only
@ -1308,21 +1308,21 @@ bool currentPlayerAssumeChrForAnti(struct chrdata *hostchr, bool force)
if (weapon->weaponnum == WEAPON_SUPERDRAGON) {
invGiveSingleWeapon(WEAPON_DRAGON);
currentPlayerEquipWeaponWrapper(HAND_RIGHT, WEAPON_DRAGON);
bgunEquipWeapon2(HAND_RIGHT, WEAPON_DRAGON);
} else {
invGiveSingleWeapon(weapon->weaponnum);
currentPlayerEquipWeaponWrapper(HAND_RIGHT, weapon->weaponnum);
bgunEquipWeapon2(HAND_RIGHT, weapon->weaponnum);
}
} else {
// Unarmed
invGiveSingleWeapon(WEAPON_UNARMED);
currentPlayerEquipWeaponWrapper(HAND_RIGHT, WEAPON_UNARMED);
bgunEquipWeapon2(HAND_RIGHT, WEAPON_UNARMED);
}
g_Vars.currentplayer->invdowntime = PALDOWN(-40);
g_Vars.currentplayer->usedowntime = PALDOWN(-40);
currentPlayerGiveUnlimitedAmmo(true);
bgunGiveMaxAmmo(true);
g_Vars.currentplayer->bondhealth = (chrGetMaxDamage(hostchr) - hostchr->damage) * 0.125f;
@ -1424,13 +1424,13 @@ void currentPlayerSpawn(void)
force = false;
invGiveSingleWeapon(WEAPON_SUICIDEPILL);
currentPlayerEquipWeaponWrapper(HAND_LEFT, WEAPON_NONE);
currentPlayerEquipWeaponWrapper(HAND_RIGHT, WEAPON_UNARMED);
bgunEquipWeapon2(HAND_LEFT, WEAPON_NONE);
bgunEquipWeapon2(HAND_RIGHT, WEAPON_UNARMED);
if (g_Vars.lvframenum > 0) {
s32 prevplayernum = g_Vars.currentplayernum;
setCurrentPlayerNum(g_Vars.bondplayernum);
func0f0a0c08(&sp84, &sp9c);
bgun0f0a0c08(&sp84, &sp9c);
func00015b14(currentPlayerGetUnk174c(), &sp9c, &sp90);
func00015b68(currentPlayerGetUnk174c(), &sp84, &sp78);
setCurrentPlayerNum(prevplayernum);
@ -1543,8 +1543,8 @@ void currentPlayerSpawn(void)
g_Vars.currentplayer->prop->chr->blurnumtimesdied = 0;
}
} else {
currentPlayerEquipWeaponWrapper(HAND_LEFT, g_DefaultWeapons[HAND_LEFT]);
currentPlayerEquipWeaponWrapper(HAND_RIGHT, g_DefaultWeapons[HAND_RIGHT]);
bgunEquipWeapon2(HAND_LEFT, g_DefaultWeapons[HAND_LEFT]);
bgunEquipWeapon2(HAND_RIGHT, g_DefaultWeapons[HAND_RIGHT]);
#if VERSION >= VERSION_NTSC_1_0
if (g_Vars.currentplayer->model00d4 == NULL
@ -1755,7 +1755,7 @@ glabel var7f1ad5b4
/* f0b8c28: 8f090004 */ lw $t1,0x4($t8)
/* f0b8c2c: 00002025 */ or $a0,$zero,$zero
/* f0b8c30: ade10000 */ sw $at,0x0($t7)
/* f0b8c34: 0fc2867c */ jal getCurrentPlayerWeaponIdWrapper
/* f0b8c34: 0fc2867c */ jal bgunGetWeaponNum2
/* f0b8c38: ade90004 */ sw $t1,0x4($t7)
/* f0b8c3c: 8e0d0284 */ lw $t5,0x284($s0)
/* f0b8c40: 240a0056 */ addiu $t2,$zero,0x56
@ -1838,13 +1838,13 @@ glabel var7f1ad5b4
/* f0b8d58: 8cb80000 */ lw $t8,0x0($a1)
/* f0b8d5c: 5700000d */ bnezl $t8,.L0f0b8d94
/* f0b8d60: 8e030284 */ lw $v1,0x284($s0)
/* f0b8d64: 0fc27801 */ jal func0f09e004
/* f0b8d64: 0fc27801 */ jal bgun0f09e004
/* f0b8d68: 24040002 */ addiu $a0,$zero,0x2
/* f0b8d6c: 3c05800a */ lui $a1,%hi(var8009dfc0)
/* f0b8d70: 24a5dfc0 */ addiu $a1,$a1,%lo(var8009dfc0)
/* f0b8d74: 10400006 */ beqz $v0,.L0f0b8d90
/* f0b8d78: 24060001 */ addiu $a2,$zero,0x1
/* f0b8d7c: 0fc2777b */ jal func0f09ddec
/* f0b8d7c: 0fc2777b */ jal bgun0f09ddec
/* f0b8d80: 00000000 */ nop
/* f0b8d84: 8e0f0284 */ lw $t7,0x284($s0)
/* f0b8d88: 10000008 */ b .L0f0b8dac
@ -1862,7 +1862,7 @@ glabel var7f1ad5b4
/* f0b8dac: 240b0008 */ addiu $t3,$zero,0x8
.L0f0b8db0:
/* f0b8db0: 3c018008 */ lui $at,%hi(var8007fc0c)
/* f0b8db4: 0fc2777b */ jal func0f09ddec
/* f0b8db4: 0fc2777b */ jal bgun0f09ddec
/* f0b8db8: a42bfc0c */ sh $t3,%lo(var8007fc0c)($at)
/* f0b8dbc: 8e0c0284 */ lw $t4,0x284($s0)
/* f0b8dc0: 24030040 */ addiu $v1,$zero,0x40
@ -1931,13 +1931,13 @@ glabel var7f1ad5b4
.L0f0b8eb8:
/* f0b8eb8: 8fab00e4 */ lw $t3,0xe4($sp)
/* f0b8ebc: 256e4000 */ addiu $t6,$t3,0x4000
/* f0b8ec0: 0fc2777f */ jal func0f09ddfc
/* f0b8ec0: 0fc2777f */ jal bgun0f09ddfc
/* f0b8ec4: afae00e4 */ sw $t6,0xe4($sp)
/* f0b8ec8: 8e080284 */ lw $t0,0x284($s0)
/* f0b8ecc: 8fa900e4 */ lw $t1,0xe4($sp)
/* f0b8ed0: 8d191bd4 */ lw $t9,0x1bd4($t0)
/* f0b8ed4: 03297821 */ addu $t7,$t9,$t1
/* f0b8ed8: 0fc2777f */ jal func0f09ddfc
/* f0b8ed8: 0fc2777f */ jal bgun0f09ddfc
/* f0b8edc: afaf00e8 */ sw $t7,0xe8($sp)
/* f0b8ee0: 8faa00e4 */ lw $t2,0xe4($sp)
/* f0b8ee4: 27a40100 */ addiu $a0,$sp,0x100
@ -2024,9 +2024,9 @@ glabel var7f1ad5b4
/* f0b9020: 27a40100 */ addiu $a0,$sp,0x100
/* f0b9024: 0fc5cbd5 */ jal func0f172f54
/* f0b9028: a7380002 */ sh $t8,0x2($t9)
/* f0b902c: 0fc2777b */ jal func0f09ddec
/* f0b902c: 0fc2777b */ jal bgun0f09ddec
/* f0b9030: 00000000 */ nop
/* f0b9034: 0fc2777f */ jal func0f09ddfc
/* f0b9034: 0fc2777f */ jal bgun0f09ddfc
/* f0b9038: 00000000 */ nop
/* f0b903c: 0fc5cbd5 */ jal func0f172f54
/* f0b9040: 27a40100 */ addiu $a0,$sp,0x100
@ -2326,7 +2326,7 @@ glabel var7f1ad5b4
/* f0b9498: 0fc22e3a */ jal weaponCreateForChr
/* f0b949c: afa90014 */ sw $t1,0x14($sp)
.L0f0b94a0:
/* f0b94a0: 0fc29c3e */ jal func0f0a70f8
/* f0b94a0: 0fc29c3e */ jal bgun0f0a70f8
/* f0b94a4: 00000000 */ nop
/* f0b94a8: 8fa40110 */ lw $a0,0x110($sp)
/* f0b94ac: 24050000 */ addiu $a1,$zero,0x0
@ -2413,7 +2413,7 @@ glabel var7f1ad5b4
/* f0b6940: 8f090004 */ lw $t1,0x4($t8)
/* f0b6944: 00002025 */ or $a0,$zero,$zero
/* f0b6948: ade10000 */ sw $at,0x0($t7)
/* f0b694c: 0fc27de9 */ jal getCurrentPlayerWeaponIdWrapper
/* f0b694c: 0fc27de9 */ jal bgunGetWeaponNum2
/* f0b6950: ade90004 */ sw $t1,0x4($t7)
/* f0b6954: 8e0d0284 */ lw $t5,0x284($s0)
/* f0b6958: 240a0056 */ addiu $t2,$zero,0x56
@ -2496,13 +2496,13 @@ glabel var7f1ad5b4
/* f0b6a70: 8cb80000 */ lw $t8,0x0($a1)
/* f0b6a74: 5700000d */ bnezl $t8,.NB0f0b6aac
/* f0b6a78: 8e030284 */ lw $v1,0x284($s0)
/* f0b6a7c: 0fc26fc8 */ jal func0f09e004
/* f0b6a7c: 0fc26fc8 */ jal bgun0f09e004
/* f0b6a80: 24040002 */ addiu $a0,$zero,0x2
/* f0b6a84: 3c05800a */ lui $a1,0x800a
/* f0b6a88: 24a52780 */ addiu $a1,$a1,0x2780
/* f0b6a8c: 10400006 */ beqz $v0,.NB0f0b6aa8
/* f0b6a90: 24060001 */ addiu $a2,$zero,0x1
/* f0b6a94: 0fc26f42 */ jal func0f09ddec
/* f0b6a94: 0fc26f42 */ jal bgun0f09ddec
/* f0b6a98: 00000000 */ sll $zero,$zero,0x0
/* f0b6a9c: 8e0f0284 */ lw $t7,0x284($s0)
/* f0b6aa0: 10000008 */ beqz $zero,.NB0f0b6ac4
@ -2520,7 +2520,7 @@ glabel var7f1ad5b4
/* f0b6ac4: 240b0008 */ addiu $t3,$zero,0x8
.NB0f0b6ac8:
/* f0b6ac8: 3c018008 */ lui $at,0x8008
/* f0b6acc: 0fc26f42 */ jal func0f09ddec
/* f0b6acc: 0fc26f42 */ jal bgun0f09ddec
/* f0b6ad0: a42b2470 */ sh $t3,0x2470($at)
/* f0b6ad4: 8e0c0284 */ lw $t4,0x284($s0)
/* f0b6ad8: 24030040 */ addiu $v1,$zero,0x40
@ -2589,13 +2589,13 @@ glabel var7f1ad5b4
.NB0f0b6bd0:
/* f0b6bd0: 8fab00e4 */ lw $t3,0xe4($sp)
/* f0b6bd4: 256e4000 */ addiu $t6,$t3,0x4000
/* f0b6bd8: 0fc26f46 */ jal func0f09ddfc
/* f0b6bd8: 0fc26f46 */ jal bgun0f09ddfc
/* f0b6bdc: afae00e4 */ sw $t6,0xe4($sp)
/* f0b6be0: 8e080284 */ lw $t0,0x284($s0)
/* f0b6be4: 8fa900e4 */ lw $t1,0xe4($sp)
/* f0b6be8: 8d191bd4 */ lw $t9,0x1bd4($t0)
/* f0b6bec: 03297821 */ addu $t7,$t9,$t1
/* f0b6bf0: 0fc26f46 */ jal func0f09ddfc
/* f0b6bf0: 0fc26f46 */ jal bgun0f09ddfc
/* f0b6bf4: afaf00e8 */ sw $t7,0xe8($sp)
/* f0b6bf8: 8faa00e4 */ lw $t2,0xe4($sp)
/* f0b6bfc: 27a40100 */ addiu $a0,$sp,0x100
@ -2682,9 +2682,9 @@ glabel var7f1ad5b4
/* f0b6d38: 27a40100 */ addiu $a0,$sp,0x100
/* f0b6d3c: 0fc5b6fb */ jal func0f172f54
/* f0b6d40: a7380002 */ sh $t8,0x2($t9)
/* f0b6d44: 0fc26f42 */ jal func0f09ddec
/* f0b6d44: 0fc26f42 */ jal bgun0f09ddec
/* f0b6d48: 00000000 */ sll $zero,$zero,0x0
/* f0b6d4c: 0fc26f46 */ jal func0f09ddfc
/* f0b6d4c: 0fc26f46 */ jal bgun0f09ddfc
/* f0b6d50: 00000000 */ sll $zero,$zero,0x0
/* f0b6d54: 0fc5b6fb */ jal func0f172f54
/* f0b6d58: 27a40100 */ addiu $a0,$sp,0x100
@ -2968,7 +2968,7 @@ glabel var7f1ad5b4
/* f0b7174: 0fc22844 */ jal weaponCreateForChr
/* f0b7178: afb80014 */ sw $t8,0x14($sp)
.NB0f0b717c:
/* f0b717c: 0fc2938f */ jal func0f0a70f8
/* f0b717c: 0fc2938f */ jal bgun0f0a70f8
/* f0b7180: 00000000 */ sll $zero,$zero,0x0
/* f0b7184: 8fa40110 */ lw $a0,0x110($sp)
/* f0b7188: 24050000 */ addiu $a1,$zero,0x0
@ -3020,7 +3020,7 @@ void func0f0b9538(void)
func0f020d44(g_Vars.currentplayer->prop, false);
g_Vars.currentplayer->model00d4 = NULL;
bmove0f0cb8c4(g_Vars.currentplayer);
func0f09df50();
bgun0f09df50();
g_Vars.currentplayer->unk1bd4 = 0;
}
}
@ -3299,8 +3299,8 @@ void func0f0b9a20(void)
}
func0f165eec(mainGetStageNum(), 0);
currentPlayerEquipWeaponWrapper(HAND_LEFT, g_DefaultWeapons[HAND_LEFT]);
currentPlayerEquipWeaponWrapper(HAND_RIGHT, g_DefaultWeapons[HAND_RIGHT]);
bgunEquipWeapon2(HAND_LEFT, g_DefaultWeapons[HAND_LEFT]);
bgunEquipWeapon2(HAND_RIGHT, g_DefaultWeapons[HAND_RIGHT]);
var8007074c = 0;
}
@ -4312,7 +4312,7 @@ void currentPlayerTickDamageAndHealth(void)
if (g_Vars.currentplayer->damageshowtime >= 0.0f) {
if (g_Vars.currentplayer->damageshowtime == 0) {
// This is the first frame of damage
currentPlayerSetGunSightVisible(GUNSIGHTREASON_DAMAGE, false);
bgunSetSightVisible(GUNSIGHTREASON_DAMAGE, false);
g_Vars.currentplayer->damagetype = (s32)(currentPlayerGetHealthFrac() * 8.0f);
if (g_Vars.currentplayer->damagetype > DAMAGETYPE_7) {
@ -4363,7 +4363,7 @@ void currentPlayerTickDamageAndHealth(void)
currentPlayerSetFadeColour(0xff, 0xff, 0xff, 0);
if (!g_Vars.currentplayer->isdead) {
currentPlayerSetGunSightVisible(GUNSIGHTREASON_DAMAGE, true);
bgunSetSightVisible(GUNSIGHTREASON_DAMAGE, true);
}
}
}
@ -5570,10 +5570,10 @@ glabel var7f1ad6ac
/* f0be1e4: 0fc54d39 */ jal optionsGetAmmoOnScreen
/* f0be1e8: 8da40070 */ lw $a0,0x70($t5)
/* f0be1ec: 02a02025 */ move $a0,$s5
/* f0be1f0: 0fc2a68e */ jal currentPlayerSetGunAmmoVisible
/* f0be1f0: 0fc2a68e */ jal bgunSetGunAmmoVisible
/* f0be1f4: 00402825 */ move $a1,$v0
/* f0be1f8: 02a02025 */ move $a0,$s5
/* f0be1fc: 0fc2b04c */ jal currentPlayerSetGunSightVisible
/* f0be1fc: 0fc2b04c */ jal bgunSetSightVisible
/* f0be200: 24050001 */ li $a1,0x1
/* f0be204: 8e6302ac */ lw $v1,0x2ac($s3)
/* f0be208: 10600002 */ beqz $v1,.PF0f0be214
@ -7629,7 +7629,7 @@ glabel var7f1ad6ac
/* f0c0004: 8e02032c */ lw $v0,0x32c($s0)
/* f0c0008: 14400005 */ bnez $v0,.PF0f0c0020
/* f0c000c: 00000000 */ nop
/* f0c0010: 0fc28b3f */ jal func0f0a29c8
/* f0c0010: 0fc28b3f */ jal bgun0f0a29c8
/* f0c0014: 00000000 */ nop
/* f0c0018: 8e700284 */ lw $s0,0x284($s3)
/* f0c001c: 8e02032c */ lw $v0,0x32c($s0)
@ -7971,10 +7971,10 @@ glabel var7f1ad6ac
/* f0bdc78: 0fc54a0d */ jal optionsGetAmmoOnScreen
/* f0bdc7c: 8dc40070 */ lw $a0,0x70($t6)
/* f0bdc80: 02a02025 */ or $a0,$s5,$zero
/* f0bdc84: 0fc2a57b */ jal currentPlayerSetGunAmmoVisible
/* f0bdc84: 0fc2a57b */ jal bgunSetGunAmmoVisible
/* f0bdc88: 00402825 */ or $a1,$v0,$zero
/* f0bdc8c: 02a02025 */ or $a0,$s5,$zero
/* f0bdc90: 0fc2af1d */ jal currentPlayerSetGunSightVisible
/* f0bdc90: 0fc2af1d */ jal bgunSetSightVisible
/* f0bdc94: 24050001 */ addiu $a1,$zero,0x1
/* f0bdc98: 8e6302ac */ lw $v1,0x2ac($s3)
/* f0bdc9c: 10600002 */ beqz $v1,.L0f0bdca8
@ -10030,7 +10030,7 @@ glabel var7f1ad6ac
/* f0bfa98: 8e02032c */ lw $v0,0x32c($s0)
/* f0bfa9c: 14400005 */ bnez $v0,.L0f0bfab4
/* f0bfaa0: 00000000 */ nop
/* f0bfaa4: 0fc28a72 */ jal func0f0a29c8
/* f0bfaa4: 0fc28a72 */ jal bgun0f0a29c8
/* f0bfaa8: 00000000 */ nop
/* f0bfaac: 8e700284 */ lw $s0,0x284($s3)
/* f0bfab0: 8e02032c */ lw $v0,0x32c($s0)
@ -10372,10 +10372,10 @@ glabel var7f1ad6ac
/* f0bb8e0: 0fc533c9 */ jal optionsGetAmmoOnScreen
/* f0bb8e4: 8dc40070 */ lw $a0,0x70($t6)
/* f0bb8e8: 02a02025 */ or $a0,$s5,$zero
/* f0bb8ec: 0fc29ce3 */ jal currentPlayerSetGunAmmoVisible
/* f0bb8ec: 0fc29ce3 */ jal bgunSetGunAmmoVisible
/* f0bb8f0: 00402825 */ or $a1,$v0,$zero
/* f0bb8f4: 02a02025 */ or $a0,$s5,$zero
/* f0bb8f8: 0fc2a675 */ jal currentPlayerSetGunSightVisible
/* f0bb8f8: 0fc2a675 */ jal bgunSetSightVisible
/* f0bb8fc: 24050001 */ addiu $a1,$zero,0x1
/* f0bb900: 8e6302ac */ lw $v1,0x2ac($s3)
/* f0bb904: 10600002 */ beqz $v1,.NB0f0bb910
@ -12393,7 +12393,7 @@ glabel var7f1ad6ac
/* f0bd684: 8d02032c */ lw $v0,0x32c($t0)
/* f0bd688: 14400005 */ bnez $v0,.NB0f0bd6a0
/* f0bd68c: 00000000 */ sll $zero,$zero,0x0
/* f0bd690: 0fc281d1 */ jal func0f0a29c8
/* f0bd690: 0fc281d1 */ jal bgun0f0a29c8
/* f0bd694: 00000000 */ sll $zero,$zero,0x0
/* f0bd698: 8e680284 */ lw $t0,0x284($s3)
/* f0bd69c: 8d02032c */ lw $v0,0x32c($t0)
@ -12532,8 +12532,8 @@ glabel var7f1ad6ac
// bmoveSetAutoAimY(optionsGetAutoAim(g_Vars.currentplayerstats->mpindex));
// bmoveSetAutoAimX(optionsGetAutoAim(g_Vars.currentplayerstats->mpindex));
// bmoveSetAutoMoveCentreEnabled(optionsGetLookAhead(g_Vars.currentplayerstats->mpindex));
// currentPlayerSetGunAmmoVisible(GUNAMMOREASON_OPTION, optionsGetAmmoOnScreen(g_Vars.currentplayerstats->mpindex));
// currentPlayerSetGunSightVisible(GUNSIGHTREASON_1, true);
// bgunSetGunAmmoVisible(GUNAMMOREASON_OPTION, optionsGetAmmoOnScreen(g_Vars.currentplayerstats->mpindex));
// bgunSetSightVisible(GUNSIGHTREASON_1, true);
//
// // dc9c
// if ((g_Vars.tickmode == TICKMODE_0 || g_Vars.tickmode == TICKMODE_NORMAL)
@ -13414,7 +13414,7 @@ glabel var7f1ad6ac
//
// if (g_Vars.currentplayer->isdead) {
// if (g_Vars.currentplayer->redbloodfinished == false) {
// func0f0a29c8();
// bgun0f0a29c8();
// }
//
// if (g_Vars.currentplayer->redbloodfinished
@ -14062,7 +14062,7 @@ Gfx *currentPlayerUpdateShootRot(Gfx *gdl)
func0f0bfc7c(&g_Vars.currentplayer->cam_pos,
&g_Vars.currentplayer->cam_look,
&g_Vars.currentplayer->cam_up);
func0f0a0c08(&sp30, &sp3c);
bgun0f0a0c08(&sp30, &sp3c);
y = sp3c.y;
value = sqrtf(sp3c.z * sp3c.z + sp3c.x * sp3c.x);
@ -14222,9 +14222,9 @@ Gfx *currentPlayerRenderHud(Gfx *gdl)
}
if (g_Vars.currentplayer->cameramode != CAMERAMODE_EYESPY) {
func0f0a6c30();
bgun0f0a6c30();
gdl = func0f0aeed8(gdl);
func0f0a7138(&gdl);
bgun0f0a7138(&gdl);
gdl = lasersightRenderDot(gdl);
if (g_Vars.currentplayer->visionmode != VISIONMODE_XRAY) {
@ -14488,14 +14488,14 @@ Gfx *currentPlayerRenderHud(Gfx *gdl)
}
if (g_Vars.currentplayer->cameramode != CAMERAMODE_EYESPY) {
gdl = func0f0abcb0(gdl);
gdl = bgun0f0abcb0(gdl);
if (handGetWeaponNum(HAND_RIGHT) == WEAPON_HORIZONSCANNER) {
if (bgunGetWeaponNum(HAND_RIGHT) == WEAPON_HORIZONSCANNER) {
gdl = bviewRenderHorizonScanner(gdl);
}
if (optionsGetAmmoOnScreen(g_Vars.currentplayerstats->mpindex)) {
gdl = handRenderHud(gdl);
gdl = bgunRenderHud(gdl);
}
#if VERSION >= VERSION_NTSC_1_0
@ -14609,7 +14609,7 @@ void currentPlayerDieByShooter(u32 shooter, bool force)
}
bmoveSetMode(MOVEMODE_WALK);
func0f0a29c8();
bgun0f0a29c8();
if (getMissionTime() - g_Vars.currentplayer->lifestarttime60 < g_Vars.currentplayerstats->shortestlife) {
g_Vars.currentplayerstats->shortestlife = getMissionTime() - g_Vars.currentplayer->lifestarttime60;

6
src/game/game_0e0770.c
View File

@ -1,7 +1,7 @@
#include <ultra64.h>
#include "constants.h"
#include "game/game_006900.h"
#include "game/game_097ba0.h"
#include "game/bondgun.h"
#include "game/game_0b3350.h"
#include "game/game_0d4690.h"
#include "game/game_0e0770.h"
@ -5442,7 +5442,7 @@ glabel func0f0e5000
/* f0e5070: 8e380000 */ lw $t8,0x0($s1)
/* f0e5074: 5700005d */ bnezl $t8,.L0f0e51ec
/* f0e5078: 3c012f80 */ lui $at,0x2f80
/* f0e507c: 0fc2777b */ jal func0f09ddec
/* f0e507c: 0fc2777b */ jal bgun0f09ddec
/* f0e5080: 00000000 */ nop
/* f0e5084: 14400003 */ bnez $v0,.L0f0e5094
/* f0e5088: ae220000 */ sw $v0,0x0($s1)
@ -6309,7 +6309,7 @@ glabel func0f0e5000
/* f0e5070: 8e380000 */ lw $t8,0x0($s1)
/* f0e5074: 5700005d */ bnezl $t8,.L0f0e51ec
/* f0e5078: 3c012f80 */ lui $at,0x2f80
/* f0e507c: 0fc2777b */ jal func0f09ddec
/* f0e507c: 0fc2777b */ jal bgun0f09ddec
/* f0e5080: 00000000 */ nop
/* f0e5084: 14400003 */ bnez $v0,.L0f0e5094
/* f0e5088: ae220000 */ sw $v0,0x0($s1)

20
src/game/game_0f09f0.c
View File

@ -6,7 +6,7 @@
#include "game/game_02cde0.h"
#include "game/game_095320.h"
#include "game/game_096ca0.h"
#include "game/game_097ba0.h"
#include "game/bondgun.h"
#include "game/game_0b3350.h"
#include "game/game_0b4950.h"
#include "game/game_0b69d0.h"
@ -5227,13 +5227,13 @@ glabel var7f1b3c40pf
.PF0f0f4068:
/* f0f4068: 5720000e */ bnezl $t9,.PF0f0f40a4
/* f0f406c: 8e090004 */ lw $t1,0x4($s0)
/* f0f4070: 0fc278ae */ jal func0f09e004
/* f0f4070: 0fc278ae */ jal bgun0f09e004
/* f0f4074: 24040001 */ li $a0,0x1
/* f0f4078: 10400007 */ beqz $v0,.PF0f0f4098
/* f0f407c: 00000000 */ nop
/* f0f4080: 0fc27828 */ jal func0f09ddec
/* f0f4080: 0fc27828 */ jal bgun0f09ddec
/* f0f4084: 00000000 */ nop
/* f0f4088: 0fc2782c */ jal func0f09ddfc
/* f0f4088: 0fc2782c */ jal bgun0f09ddfc
/* f0f408c: ae020004 */ sw $v0,0x4($s0)
/* f0f4090: 10000003 */ b .PF0f0f40a0
/* f0f4094: ae020008 */ sw $v0,0x8($s0)
@ -6829,13 +6829,13 @@ glabel var7f1b2948
.L0f0f3914:
/* f0f3914: 5720000e */ bnezl $t9,.L0f0f3950
/* f0f3918: 8e0a0004 */ lw $t2,0x4($s0)
/* f0f391c: 0fc27801 */ jal func0f09e004
/* f0f391c: 0fc27801 */ jal bgun0f09e004
/* f0f3920: 24040001 */ addiu $a0,$zero,0x1
/* f0f3924: 10400007 */ beqz $v0,.L0f0f3944
/* f0f3928: 00000000 */ nop
/* f0f392c: 0fc2777b */ jal func0f09ddec
/* f0f392c: 0fc2777b */ jal bgun0f09ddec
/* f0f3930: 00000000 */ nop
/* f0f3934: 0fc2777f */ jal func0f09ddfc
/* f0f3934: 0fc2777f */ jal bgun0f09ddfc
/* f0f3938: ae020004 */ sw $v0,0x4($s0)
/* f0f393c: 10000003 */ b .L0f0f394c
/* f0f3940: ae020008 */ sw $v0,0x8($s0)
@ -8438,13 +8438,13 @@ glabel var7f1b2948
.NB0f0f0458:
/* f0f0458: 5720000e */ bnezl $t9,.NB0f0f0494
/* f0f045c: 8e2a0004 */ lw $t2,0x4($s1)
/* f0f0460: 0fc26fc8 */ jal func0f09e004
/* f0f0460: 0fc26fc8 */ jal bgun0f09e004
/* f0f0464: 24040001 */ addiu $a0,$zero,0x1
/* f0f0468: 10400007 */ beqz $v0,.NB0f0f0488
/* f0f046c: 00000000 */ sll $zero,$zero,0x0
/* f0f0470: 0fc26f42 */ jal func0f09ddec
/* f0f0470: 0fc26f42 */ jal bgun0f09ddec
/* f0f0474: 00000000 */ sll $zero,$zero,0x0
/* f0f0478: 0fc26f46 */ jal func0f09ddfc
/* f0f0478: 0fc26f46 */ jal bgun0f09ddfc
/* f0f047c: ae220004 */ sw $v0,0x4($s1)
/* f0f0480: 10000003 */ beqz $zero,.NB0f0f0490
/* f0f0484: ae220008 */ sw $v0,0x8($s1)

12
src/game/game_102240.c
View File

@ -6,7 +6,7 @@
#include "game/game_01b0a0.h"
#include "game/game_01bea0.h"
#include "game/game_095320.h"
#include "game/game_097ba0.h"
#include "game/bondgun.h"
#include "game/game_0b0fd0.h"
#include "game/game_0b3350.h"
#include "game/game_0b69d0.h"
@ -5093,7 +5093,7 @@ glabel var7f1b2e44
/* f106088: 3c018007 */ lui $at,%hi(var80073544)
/* f10608c: 0fc6749a */ jal frGetWeaponBySlot
/* f106090: a0243544 */ sb $a0,%lo(var80073544)($at)
/* f106094: 0fc28857 */ jal weaponGetName
/* f106094: 0fc28857 */ jal bgunGetName
/* f106098: 00402025 */ or $a0,$v0,$zero
/* f10609c: 10000033 */ b .L0f10616c
/* f1060a0: 8fbf0014 */ lw $ra,0x14($sp)
@ -5255,18 +5255,18 @@ glabel var7f1b2e84
/* f106260: 10400009 */ beqz $v0,.L0f106288
/* f106264: 00002025 */ or $a0,$zero,$zero
/* f106268: 00002025 */ or $a0,$zero,$zero
/* f10626c: 0fc28824 */ jal currentPlayerEquipWeaponWrapper
/* f10626c: 0fc28824 */ jal bgunEquipWeapon2
/* f106270: 8fa5001c */ lw $a1,0x1c($sp)
/* f106274: 24040001 */ addiu $a0,$zero,0x1
/* f106278: 0fc28824 */ jal currentPlayerEquipWeaponWrapper
/* f106278: 0fc28824 */ jal bgunEquipWeapon2
/* f10627c: 8fa5001c */ lw $a1,0x1c($sp)
/* f106280: 10000007 */ b .L0f1062a0
/* f106284: 8fad0028 */ lw $t5,0x28($sp)
.L0f106288:
/* f106288: 0fc28824 */ jal currentPlayerEquipWeaponWrapper
/* f106288: 0fc28824 */ jal bgunEquipWeapon2
/* f10628c: 8fa5001c */ lw $a1,0x1c($sp)
/* f106290: 24040001 */ addiu $a0,$zero,0x1
/* f106294: 0fc28824 */ jal currentPlayerEquipWeaponWrapper
/* f106294: 0fc28824 */ jal bgunEquipWeapon2
/* f106298: 00002825 */ or $a1,$zero,$zero
/* f10629c: 8fad0028 */ lw $t5,0x28($sp)
.L0f1062a0:

4
src/game/game_127910.c
View File

@ -1,7 +1,7 @@
#include <ultra64.h>
#include "constants.h"
#include "game/cheats.h"
#include "game/game_097ba0.h"
#include "game/bondgun.h"
#include "game/game_0b69d0.h"
#include "game/game_127910.h"
#include "game/propobj.h"
@ -1013,7 +1013,7 @@ void func0f128d20(s32 hand)
struct chrdata *chr = g_Vars.currentplayer->prop->chr;
if (chr->weapons_held[hand] == NULL) {
s32 weaponnum = handGetWeaponNum(hand);
s32 weaponnum = bgunGetWeaponNum(hand);
s32 modelnum = weaponGetModel(weaponnum);
if (hand == HAND_LEFT && weaponnum == WEAPON_REMOTEMINE) {

46
src/game/game_190260.c
View File

@ -6,7 +6,7 @@
#include "game/prop.h"
#include "game/game_092610.h"
#include "game/atan2f.h"
#include "game/game_097ba0.h"
#include "game/bondgun.h"
#include "game/game_0b0fd0.h"
#include "game/game_0b69d0.h"
#include "game/game_127910.h"
@ -116,9 +116,9 @@ glabel mpChrReset
/* f1913cc: a4860292 */ sh $a2,0x292($a0)
/* f1913d0: a2200184 */ sb $zero,0x184($s1)
/* f1913d4: a2200185 */ sb $zero,0x185($s1)
/* f1913d8: 0fc29d45 */ jal freeFireslot
/* f1913d8: 0fc29d45 */ jal bgunFreeFireslot
/* f1913dc: 8224017c */ lb $a0,0x17c($s1)
/* f1913e0: 0fc29d45 */ jal freeFireslot
/* f1913e0: 0fc29d45 */ jal bgunFreeFireslot
/* f1913e4: 8224017d */ lb $a0,0x17d($s1)
/* f1913e8: 922b032d */ lbu $t3,0x32d($s1)
/* f1913ec: 3c014339 */ lui $at,0x4339
@ -344,9 +344,9 @@ glabel mpChrReset
/* f19030c: a4860292 */ sh $a2,0x292($a0)
/* f190310: a2200184 */ sb $zero,0x184($s1)
/* f190314: a2200185 */ sb $zero,0x185($s1)
/* f190318: 0fc29c32 */ jal freeFireslot
/* f190318: 0fc29c32 */ jal bgunFreeFireslot
/* f19031c: 8224017c */ lb $a0,0x17c($s1)
/* f190320: 0fc29c32 */ jal freeFireslot
/* f190320: 0fc29c32 */ jal bgunFreeFireslot
/* f190324: 8224017d */ lb $a0,0x17d($s1)
/* f190328: 922b032d */ lbu $t3,0x32d($s1)
/* f19032c: 3c014339 */ lui $at,0x4339
@ -784,8 +784,8 @@ glabel mpChrReset
// chrSetShield(chr, 0);
// chr->cmnum = 0;
// chr->cmnum2 = 0;
// freeFireslot(chr->fireslot[0]);
// freeFireslot(chr->fireslot[1]);
// bgunFreeFireslot(chr->fireslot[0]);
// bgunFreeFireslot(chr->fireslot[1]);
// chr->unk32c_12 = 0;
// chr->fireslot[0] = -1;
// chr->fireslot[1] = -1;
@ -1639,7 +1639,7 @@ glabel var7f1b8ea8
/* f190df4: 9124005c */ lbu $a0,0x5c($t1)
/* f190df8: 0fc6666c */ jal weaponGetAmmoTypeByFunction
/* f190dfc: 9125005f */ lbu $a1,0x5f($t1)
/* f190e00: 0fc2a63d */ jal ammotypeGetMaxCapacity
/* f190e00: 0fc2a63d */ jal bgunGetCapacityByAmmotype
/* f190e04: 00402025 */ or $a0,$v0,$zero
/* f190e08: 0202082a */ slt $at,$s0,$v0
/* f190e0c: 54200004 */ bnezl $at,.L0f190e20
@ -1673,7 +1673,7 @@ glabel var7f1b8ea8
/* f190e70: 0fc6672e */ jal aibotGetAmmoQuantityByType
/* f190e74: 8dc402d4 */ lw $a0,0x2d4($t6)
/* f190e78: 8e04005c */ lw $a0,0x5c($s0)
/* f190e7c: 0fc2a63d */ jal ammotypeGetMaxCapacity
/* f190e7c: 0fc2a63d */ jal bgunGetCapacityByAmmotype
/* f190e80: afa20034 */ sw $v0,0x34($sp)
/* f190e84: 8fa50034 */ lw $a1,0x34($sp)
/* f190e88: 00a2082a */ slt $at,$a1,$v0
@ -1715,7 +1715,7 @@ glabel var7f1b8ea8
/* f190f0c: 0fc6672e */ jal aibotGetAmmoQuantityByType
/* f190f10: afa30028 */ sw $v1,0x28($sp)
/* f190f14: 02002025 */ or $a0,$s0,$zero
/* f190f18: 0fc2a63d */ jal ammotypeGetMaxCapacity
/* f190f18: 0fc2a63d */ jal bgunGetCapacityByAmmotype
/* f190f1c: afa20034 */ sw $v0,0x34($sp)
/* f190f20: 8fa50034 */ lw $a1,0x34($sp)
/* f190f24: 8fa30028 */ lw $v1,0x28($sp)
@ -2040,7 +2040,7 @@ glabel var7f1b8ea8
/* f18aee0: 9104005c */ lbu $a0,0x5c($t0)
/* f18aee4: 0fc64e64 */ jal weaponGetAmmoTypeByFunction
/* f18aee8: 9105005f */ lbu $a1,0x5f($t0)
/* f18aeec: 0fc29da5 */ jal ammotypeGetMaxCapacity
/* f18aeec: 0fc29da5 */ jal bgunGetCapacityByAmmotype
/* f18aef0: 00402025 */ or $a0,$v0,$zero
/* f18aef4: 0202082a */ slt $at,$s0,$v0
/* f18aef8: 54200004 */ bnezl $at,.NB0f18af0c
@ -2074,7 +2074,7 @@ glabel var7f1b8ea8
/* f18af5c: 0fc64f26 */ jal aibotGetAmmoQuantityByType
/* f18af60: 8da402d4 */ lw $a0,0x2d4($t5)
/* f18af64: 8e04005c */ lw $a0,0x5c($s0)
/* f18af68: 0fc29da5 */ jal ammotypeGetMaxCapacity
/* f18af68: 0fc29da5 */ jal bgunGetCapacityByAmmotype
/* f18af6c: afa20034 */ sw $v0,0x34($sp)
/* f18af70: 8fa50034 */ lw $a1,0x34($sp)
/* f18af74: 00a2082a */ slt $at,$a1,$v0
@ -2116,7 +2116,7 @@ glabel var7f1b8ea8
/* f18aff8: 0fc64f26 */ jal aibotGetAmmoQuantityByType
/* f18affc: afa30028 */ sw $v1,0x28($sp)
/* f18b000: 02002025 */ or $a0,$s0,$zero
/* f18b004: 0fc29da5 */ jal ammotypeGetMaxCapacity
/* f18b004: 0fc29da5 */ jal bgunGetCapacityByAmmotype
/* f18b008: afa20034 */ sw $v0,0x34($sp)
/* f18b00c: 8fa50034 */ lw $a1,0x34($sp)
/* f18b010: 8fa30028 */ lw $v1,0x28($sp)
@ -2380,7 +2380,7 @@ glabel var7f1b8ea8
// // ignore the pickup if at max ammo already
// if (itemtype == INVITEMTYPE_DUAL || (itemtype == INVITEMTYPE_WEAP && singleonly)) {
// qty = aibotGetAmmoQuantityByWeapon(chr->aibot, weaponobj->weaponnum, weaponobj->gunfunc, false);
// cap = ammotypeGetMaxCapacity(weaponGetAmmoTypeByFunction(weaponobj->weaponnum, weaponobj->gunfunc));
// cap = bgunGetCapacityByAmmotype(weaponGetAmmoTypeByFunction(weaponobj->weaponnum, weaponobj->gunfunc));
//
// if (qty >= cap) {
// return false;
@ -2397,7 +2397,7 @@ glabel var7f1b8ea8
// crate = (struct ammocrateobj *)prop->obj;
//
// // Ignore ammo crate if at max ammo already
// if (aibotGetAmmoQuantityByType(chr->aibot, crate->ammotype, false) >= ammotypeGetMaxCapacity(crate->ammotype)) {
// if (aibotGetAmmoQuantityByType(chr->aibot, crate->ammotype, false) >= bgunGetCapacityByAmmotype(crate->ammotype)) {
// return false;
// }
// } else /*e9c*/ if (obj->type == OBJTYPE_MULTIAMMOCRATE) {
@ -2413,7 +2413,7 @@ glabel var7f1b8ea8
// weaponnum = ammotypeGetWeapon(i + 1);
//
// if (crate2->slots[i].quantity > 0) {
// if (aibotGetAmmoQuantityByType(chr->aibot, i + 1, false) < ammotypeGetMaxCapacity(i + 1)) {
// if (aibotGetAmmoQuantityByType(chr->aibot, i + 1, false) < bgunGetCapacityByAmmotype(i + 1)) {
// ignore1 = false;
//
// if (weaponnum && !aibotGetInvItemType(chr, weaponnum)) {
@ -6155,13 +6155,13 @@ glabel var7f1b8f50
/* f1941f4: 8e640000 */ lw $a0,0x0($s3)
/* f1941f8: 0fc6666c */ jal weaponGetAmmoTypeByFunction
/* f1941fc: 00002825 */ or $a1,$zero,$zero
/* f194200: 0fc2a63d */ jal ammotypeGetMaxCapacity
/* f194200: 0fc2a63d */ jal bgunGetCapacityByAmmotype
/* f194204: 00402025 */ or $a0,$v0,$zero
/* f194208: 0040b825 */ or $s7,$v0,$zero
/* f19420c: 8e640000 */ lw $a0,0x0($s3)
/* f194210: 0fc6666c */ jal weaponGetAmmoTypeByFunction
/* f194214: 24050001 */ addiu $a1,$zero,0x1
/* f194218: 0fc2a63d */ jal ammotypeGetMaxCapacity
/* f194218: 0fc2a63d */ jal bgunGetCapacityByAmmotype
/* f19421c: 00402025 */ or $a0,$v0,$zero
/* f194220: 8e650000 */ lw $a1,0x0($s3)
/* f194224: 3c038008 */ lui $v1,%hi(g_AibotWeaponPreferences+0x4)
@ -6431,7 +6431,7 @@ glabel var7f1b8f50
/* f1945d0: 0fc6672e */ jal aibotGetAmmoQuantityByType
/* f1945d4: 00003025 */ or $a2,$zero,$zero
/* f1945d8: 00409025 */ or $s2,$v0,$zero
/* f1945dc: 0fc2a63d */ jal ammotypeGetMaxCapacity
/* f1945dc: 0fc2a63d */ jal bgunGetCapacityByAmmotype
/* f1945e0: 02002025 */ or $a0,$s0,$zero
/* f1945e4: 0242082a */ slt $at,$s2,$v0
/* f1945e8: 10200008 */ beqz $at,.L0f19460c
@ -9030,7 +9030,7 @@ glabel var7f1b8fc8
/* f197dc8: 2404001c */ li $a0,0x1c
/* f197dcc: 1541000d */ bne $t2,$at,.PF0f197e04
/* f197dd0: 02e02825 */ move $a1,$s7
/* f197dd4: 0fc26dd4 */ jal weaponGetMinClipQty
/* f197dd4: 0fc26dd4 */ jal bgunGetMinClipQty
/* f197dd8: afa30054 */ sw $v1,0x54($sp)
/* f197ddc: 8e2d0024 */ lw $t5,0x24($s1)
/* f197de0: 8fa30054 */ lw $v1,0x54($sp)
@ -9203,7 +9203,7 @@ glabel var7f1b8fc8
/* f198048: 24180032 */ li $t8,0x32
/* f19804c: a658003c */ sh $t8,0x3c($s2)
/* f198050: 2404001c */ li $a0,0x1c
/* f198054: 0fc26dd4 */ jal weaponGetMinClipQty
/* f198054: 0fc26dd4 */ jal bgunGetMinClipQty
/* f198058: 02e02825 */ move $a1,$s7
/* f19805c: 8e490024 */ lw $t1,0x24($s2)
/* f198060: 01225023 */ subu $t2,$t1,$v0
@ -12038,7 +12038,7 @@ glabel var7f1b8fc8
/* f196cf8: 2404001c */ addiu $a0,$zero,0x1c
/* f196cfc: 1721000d */ bne $t9,$at,.L0f196d34
/* f196d00: 02e02825 */ or $a1,$s7,$zero
/* f196d04: 0fc26d36 */ jal weaponGetMinClipQty
/* f196d04: 0fc26d36 */ jal bgunGetMinClipQty
/* f196d08: afa30054 */ sw $v1,0x54($sp)
/* f196d0c: 8e290024 */ lw $t1,0x24($s1)
/* f196d10: 8fa30054 */ lw $v1,0x54($sp)
@ -12211,7 +12211,7 @@ glabel var7f1b8fc8
/* f196f78: 240e003c */ addiu $t6,$zero,0x3c
/* f196f7c: a64e003c */ sh $t6,0x3c($s2)
/* f196f80: 2404001c */ addiu $a0,$zero,0x1c
/* f196f84: 0fc26d36 */ jal weaponGetMinClipQty
/* f196f84: 0fc26d36 */ jal bgunGetMinClipQty
/* f196f88: 02e02825 */ or $a1,$s7,$zero
/* f196f8c: 8e4f0024 */ lw $t7,0x24($s2)
/* f196f90: 01e2c823 */ subu $t9,$t7,$v0

16
src/game/game_1999b0.c
View File

@ -4,7 +4,7 @@
#include "game/debug.h"
#include "game/chr/chr.h"
#include "game/game_092610.h"
#include "game/game_097ba0.h"
#include "game/bondgun.h"
#include "game/game_0b0fd0.h"
#include "game/game_127910.h"
#include "game/game_1999b0.h"
@ -88,7 +88,7 @@ s32 aibotGetAmmoQuantityByWeapon(struct aibot *aibot, s32 weaponnum, s32 funcnum
if (aibot) {
if (aibot->unk064 & 1) {
ammotype = weaponGetAmmoTypeByFunction(weaponnum, funcnum);
qty = ammotypeGetMaxCapacity(ammotype);
qty = bgunGetCapacityByAmmotype(ammotype);
} else {
ammotype = weaponGetAmmoTypeByFunction(weaponnum, funcnum);
qty = aibot->ammoheld[ammotype];
@ -113,7 +113,7 @@ s32 aibotGetAmmoQuantityByType(struct aibot *aibot, s32 ammotype, bool include_e
if (aibot) {
if (aibot->unk064 & 1) {
qty = ammotypeGetMaxCapacity(ammotype);
qty = bgunGetCapacityByAmmotype(ammotype);
} else {
qty = aibot->ammoheld[ammotype];
}
@ -176,7 +176,7 @@ void aibotGiveAmmoByWeapon(struct aibot *aibot, s32 weaponnum, s32 funcnum, s32
if (heldquantity);
max = ammotypeGetMaxCapacity(weaponGetAmmoTypeByFunction(weaponnum, funcnum));
max = bgunGetCapacityByAmmotype(weaponGetAmmoTypeByFunction(weaponnum, funcnum));
if (*heldquantity > max) {
*heldquantity = max;
@ -201,7 +201,7 @@ void aibotGiveAmmoByType(struct aibot *aibot, u32 ammotype, s32 quantity)
if (heldquantity);
max = ammotypeGetMaxCapacity(ammotype);
max = bgunGetCapacityByAmmotype(ammotype);
if (*heldquantity > max) {
*heldquantity = max;
@ -267,7 +267,7 @@ bool aibotDoFarsightThing(struct chrdata *chr, u32 arg1, struct coord *vector, s
if (oppchr != chr
&& value > rand
&& func0f06b39c(arg3, vector, &oppprop->pos, func0f0278a4(oppchr))) {
gsetPlayPropHitSound(&gset, oppprop, -1);
bgunPlayPropHitSound(&gset, oppprop, -1);
if (oppchr->model && chrGetShield(oppchr) > 0) {
chrCalculateShieldHit(oppchr, &oppprop->pos, vector, &node, &hitpart, &model, &side);
@ -403,7 +403,7 @@ void func0f19a37c(struct chrdata *chr)
func00016374(sp80, &sp84);
func00015be0(&sp84, &sp164);
func0f09ee18(chr, &gset, &prop->pos, prop->rooms, &sp164, &sp228);
bgun0f09ee18(chr, &gset, &prop->pos, prop->rooms, &sp164, &sp228);
if (gset.weaponnum == WEAPON_REMOTEMINE) {
chr->aibot->unk064 |= 0x1000;
@ -510,7 +510,7 @@ void aibotCreateSlayerRocket(struct chrdata *chr)
func00015be0(&sp132, &sp196);
func000159b0(&sp260);
func0f09ebcc(&rocket->base, &chr->prop->pos, chr->prop->rooms, &sp196, sp100, &sp260, chr->prop, &chr->prop->pos);
bgun0f09ebcc(&rocket->base, &chr->prop->pos, chr->prop->rooms, &sp196, sp100, &sp260, chr->prop, &chr->prop->pos);
if (rocket->base.hidden & OBJHFLAG_AIRBORNE) {
struct prop *target = chrGetTargetProp(chr);

2
src/game/game_1a7560.c
View File

@ -2,7 +2,7 @@
#include "constants.h"
#include "game/chr/chraction.h"
#include "game/ceil.h"
#include "game/game_097ba0.h"
#include "game/bondgun.h"
#include "game/game_0b0fd0.h"
#include "game/game_0b3350.h"
#include "game/game_0e0770.h"

30
src/game/inventory/inventory.c
View File

@ -1,7 +1,7 @@
#include <ultra64.h>
#include "constants.h"
#include "game/cheats.h"
#include "game/game_097ba0.h"
#include "game/bondgun.h"
#include "game/game_0b0fd0.h"
#include "game/inventory/inventory.h"
#include "game/training/training.h"
@ -181,7 +181,7 @@ void invSetAllGuns(bool enable)
g_Vars.currentplayer->equipallguns = enable;
invCalculateCurrentIndex();
weaponnum = invGetWeaponNumByIndex(g_Vars.currentplayer->equipcuritem);
currentPlayerEquipWeapon(weaponnum);
bgunEquipWeapon(weaponnum);
}
bool invHasAllGuns(void)
@ -628,7 +628,7 @@ glabel func0f1122ec
.L0f1123d4:
/* f1123d4: 12600005 */ beqz $s3,.L0f1123ec
/* f1123d8: 00000000 */ nop
/* f1123dc: 0fc28684 */ jal func0f0a1a10
/* f1123dc: 0fc28684 */ jal bgun0f0a1a10
/* f1123e0: 02002025 */ or $a0,$s0,$zero
/* f1123e4: 10400008 */ beqz $v0,.L0f112408
/* f1123e8: 00000000 */ nop
@ -663,7 +663,7 @@ glabel func0f1122ec
/* f11244c: 00000000 */ nop
/* f112450: 52600007 */ beqzl $s3,.L0f112470
/* f112454: 00809025 */ or $s2,$a0,$zero
/* f112458: 0fc28684 */ jal func0f0a1a10
/* f112458: 0fc28684 */ jal bgun0f0a1a10
/* f11245c: 00000000 */ nop
/* f112460: 1040001e */ beqz $v0,.L0f1124dc
/* f112464: 00000000 */ nop
@ -688,11 +688,11 @@ glabel func0f1122ec
.L0f1124a8:
/* f1124a8: 5260000a */ beqzl $s3,.L0f1124d4
/* f1124ac: 8e120004 */ lw $s2,0x4($s0)
/* f1124b0: 0fc28684 */ jal func0f0a1a10
/* f1124b0: 0fc28684 */ jal bgun0f0a1a10
/* f1124b4: 00000000 */ nop
/* f1124b8: 54400006 */ bnezl $v0,.L0f1124d4
/* f1124bc: 8e120004 */ lw $s2,0x4($s0)
/* f1124c0: 0fc28684 */ jal func0f0a1a10
/* f1124c0: 0fc28684 */ jal bgun0f0a1a10
/* f1124c4: 8e040008 */ lw $a0,0x8($s0)
/* f1124c8: 10400004 */ beqz $v0,.L0f1124dc
/* f1124cc: 00000000 */ nop
@ -794,7 +794,7 @@ glabel func0f11253c
.L0f112610:
/* f112610: 12400005 */ beqz $s2,.L0f112628
/* f112614: 00000000 */ nop
/* f112618: 0fc28684 */ jal func0f0a1a10
/* f112618: 0fc28684 */ jal bgun0f0a1a10
/* f11261c: 02002025 */ or $a0,$s0,$zero
/* f112620: 5040ffe2 */ beqzl $v0,.L0f1125ac
/* f112624: 2619002c */ addiu $t9,$s0,0x2c
@ -837,7 +837,7 @@ glabel func0f11253c
.L0f1126a8:
/* f1126a8: 52400007 */ beqzl $s2,.L0f1126c8
/* f1126ac: 00808825 */ or $s1,$a0,$zero
/* f1126b0: 0fc28684 */ jal func0f0a1a10
/* f1126b0: 0fc28684 */ jal bgun0f0a1a10
/* f1126b4: 00000000 */ nop
/* f1126b8: 1040001f */ beqz $v0,.L0f112738
/* f1126bc: 00000000 */ nop
@ -863,11 +863,11 @@ glabel func0f11253c
.L0f112704:
/* f112704: 5240000a */ beqzl $s2,.L0f112730
/* f112708: 8e110004 */ lw $s1,0x4($s0)
/* f11270c: 0fc28684 */ jal func0f0a1a10
/* f11270c: 0fc28684 */ jal bgun0f0a1a10
/* f112710: 00000000 */ nop
/* f112714: 54400006 */ bnezl $v0,.L0f112730
/* f112718: 8e110004 */ lw $s1,0x4($s0)
/* f11271c: 0fc28684 */ jal func0f0a1a10
/* f11271c: 0fc28684 */ jal bgun0f0a1a10
/* f112720: 8e040008 */ lw $a0,0x8($s0)
/* f112724: 10400004 */ beqz $v0,.L0f112738
/* f112728: 00000000 */ nop
@ -1186,12 +1186,12 @@ u16 invGetNameIdByIndex(s32 index)
if (g_Vars.currentplayer->equipallguns) {
if (index < WEAPON_PSYCHOSISGUN - currentStageForbidsSlayer()) {
index++;
return weaponGetNameId(invAddOneIfCantHaveSlayer(index));
return bgunGetNameId(invAddOneIfCantHaveSlayer(index));
}
}
}
return weaponGetNameId(weaponnum);
return bgunGetNameId(weaponnum);
}
char *invGetNameByIndex(s32 index)
@ -1228,11 +1228,11 @@ char *invGetShortNameByIndex(s32 index)
} else if (g_Vars.currentplayer->equipallguns) {
if (index < WEAPON_PSYCHOSISGUN - currentStageForbidsSlayer()) {
index++;
return weaponGetShortName(invAddOneIfCantHaveSlayer(index));
return bgunGetShortName(invAddOneIfCantHaveSlayer(index));
}
}
return weaponGetShortName(weaponnum);
return bgunGetShortName(weaponnum);
}
void invInsertTextOverride(struct textoverride *override)
@ -1253,7 +1253,7 @@ void invSetCurrentIndex(u32 item)
void invCalculateCurrentIndex(void)
{
s32 curweaponnum = handGetWeaponNum(HAND_RIGHT);
s32 curweaponnum = bgunGetWeaponNum(HAND_RIGHT);
s32 i;
g_Vars.currentplayer->equipcuritem = 0;

38
src/game/lv.c
View File

@ -50,7 +50,7 @@
#include "game/chr/chr.h"
#include "game/prop.h"
#include "game/game_095320.h"
#include "game/game_097ba0.h"
#include "game/bondgun.h"
#include "game/game_0abe70.h"
#include "game/game_0b0fd0.h"
#include "game/game_0b28d0.h"
@ -2406,7 +2406,7 @@ glabel var7f1b8e7cpf
/* f16ac54: 8dade560 */ lw $t5,-0x1aa0($t5)
/* f16ac58: 55a0000b */ bnezl $t5,.PF0f16ac88
/* f16ac5c: 8e4c0320 */ lw $t4,0x320($s2)
/* f16ac60: 0fc27b66 */ jal func0f09eae4
/* f16ac60: 0fc27b66 */ jal bgun0f09eae4
/* f16ac64: 00000000 */ nop
/* f16ac68: 8e500284 */ lw $s0,0x284($s2)
/* f16ac6c: 00027840 */ sll $t7,$v0,0x1
@ -2516,7 +2516,7 @@ glabel var7f1b8e7cpf
/* f16ade8: 8e4c029c */ lw $t4,0x29c($s2)
/* f16adec: 0583000c */ bgezl $t4,.PF0f16ae20
/* f16adf0: 00002025 */ move $a0,$zero
/* f16adf4: 0fc28737 */ jal handGetWeaponNum
/* f16adf4: 0fc28737 */ jal bgunGetWeaponNum
/* f16adf8: 00002025 */ move $a0,$zero
/* f16adfc: 00402025 */ move $a0,$v0
/* f16ae00: 0fc2c720 */ jal weaponHasFlag
@ -2627,7 +2627,7 @@ glabel var7f1b8e7cpf
/* f16af70: 10000033 */ b .PF0f16b040
/* f16af74: 8e500284 */ lw $s0,0x284($s2)
.PF0f16af78:
/* f16af78: 0fc28737 */ jal handGetWeaponNum
/* f16af78: 0fc28737 */ jal bgunGetWeaponNum
/* f16af7c: 00002025 */ move $a0,$zero
/* f16af80: 00402025 */ move $a0,$v0
/* f16af84: 0fc2c720 */ jal weaponHasFlag
@ -2809,9 +2809,9 @@ glabel var7f1b8e7cpf
/* f16b218: 00002025 */ move $a0,$zero
/* f16b21c: 10400012 */ beqz $v0,.PF0f16b268
/* f16b220: 00000000 */ nop
/* f16b224: 0fc28953 */ jal currentPlayerReloadHandIfPossible
/* f16b224: 0fc28953 */ jal bgunReloadIfPossible
/* f16b228: 00002025 */ move $a0,$zero
/* f16b22c: 0fc28953 */ jal currentPlayerReloadHandIfPossible
/* f16b22c: 0fc28953 */ jal bgunReloadIfPossible
/* f16b230: 03c02025 */ move $a0,$s8
/* f16b234: 1000000c */ b .PF0f16b268
/* f16b238: 00000000 */ nop
@ -3859,7 +3859,7 @@ Gfx *lvRender(Gfx *gdl)
&& g_Vars.currentplayer->cameramode != CAMERAMODE_THIRDPERSON
&& g_Vars.currentplayer->cameramode != CAMERAMODE_EYESPY
&& var8009dfc0 == 0) {
g_Vars.currentplayer->gunctrl.unk1583_06 = func0f09eae4();
g_Vars.currentplayer->gunctrl.unk1583_06 = bgun0f09eae4();
}
if (g_Vars.lockscreen) {
@ -3892,7 +3892,7 @@ Gfx *lvRender(Gfx *gdl)
if (PLAYERCOUNT() == 1
|| g_Vars.coopplayernum >= 0
|| g_Vars.antiplayernum >= 0
|| (weaponHasFlag(handGetWeaponNum(HAND_RIGHT), WEAPONFLAG_AIMTRACK) && bmoveIsInSightAimMode())) {
|| (weaponHasFlag(bgunGetWeaponNum(HAND_RIGHT), WEAPONFLAG_AIMTRACK) && bmoveIsInSightAimMode())) {
g_Vars.currentplayer->lookingatprop.prop = func0f061d54(HAND_RIGHT, 0, 0);
if (g_Vars.currentplayer->lookingatprop.prop) {
@ -3931,7 +3931,7 @@ Gfx *lvRender(Gfx *gdl)
if (gsetHasFunctionFlags(&g_Vars.currentplayer->hands[0].gset, FUNCFLAG_THREATDETECTOR)) {
lvFindThreats();
} else if (weaponHasFlag(handGetWeaponNum(HAND_RIGHT), WEAPONFLAG_AIMTRACK)) {
} else if (weaponHasFlag(bgunGetWeaponNum(HAND_RIGHT), WEAPONFLAG_AIMTRACK)) {
s32 j;
if (frIsInTraining()
@ -3988,8 +3988,8 @@ Gfx *lvRender(Gfx *gdl)
// Handle opening doors and reloading
if (g_Vars.currentplayer->bondactivateorreload) {
if (currentPlayerInteract(false)) {
currentPlayerReloadHandIfPossible(HAND_RIGHT);
currentPlayerReloadHandIfPossible(HAND_LEFT);
bgunReloadIfPossible(HAND_RIGHT);
bgunReloadIfPossible(HAND_LEFT);
}
} else if (g_Vars.currentplayer->eyespy
&& g_Vars.currentplayer->eyespy->active
@ -4992,7 +4992,7 @@ glabel var7f1b1fd4nb
/* f16495c: 8d8c2780 */ lw $t4,0x2780($t4)
/* f164960: 5580000b */ bnezl $t4,.NB0f164990
/* f164964: 8e4d0320 */ lw $t5,0x320($s2)
/* f164968: 0fc2725e */ jal func0f09eae4
/* f164968: 0fc2725e */ jal bgun0f09eae4
/* f16496c: 00000000 */ sll $zero,$zero,0x0
/* f164970: 8e500284 */ lw $s0,0x284($s2)
/* f164974: 00027840 */ sll $t7,$v0,0x1
@ -5103,7 +5103,7 @@ glabel var7f1b1fd4nb
/* f164af4: 8e4d029c */ lw $t5,0x29c($s2)
/* f164af8: 05a3000c */ bgezl $t5,.NB0f164b2c
/* f164afc: 00002025 */ or $a0,$zero,$zero
/* f164b00: 0fc27dd7 */ jal handGetWeaponNum
/* f164b00: 0fc27dd7 */ jal bgunGetWeaponNum
/* f164b04: 00002025 */ or $a0,$zero,$zero
/* f164b08: 00402025 */ or $a0,$v0,$zero
/* f164b0c: 0fc2bd48 */ jal weaponHasFlag
@ -5215,7 +5215,7 @@ glabel var7f1b1fd4nb
/* f164c80: 10000034 */ beqz $zero,.NB0f164d54
/* f164c84: 8e500284 */ lw $s0,0x284($s2)
.NB0f164c88:
/* f164c88: 0fc27dd7 */ jal handGetWeaponNum
/* f164c88: 0fc27dd7 */ jal bgunGetWeaponNum
/* f164c8c: 00002025 */ or $a0,$zero,$zero
/* f164c90: 00402025 */ or $a0,$v0,$zero
/* f164c94: 0fc2bd48 */ jal weaponHasFlag
@ -5399,9 +5399,9 @@ glabel var7f1b1fd4nb
/* f164f30: 00002025 */ or $a0,$zero,$zero
/* f164f34: 10400012 */ beqz $v0,.NB0f164f80
/* f164f38: 00000000 */ sll $zero,$zero,0x0
/* f164f3c: 0fc27fe5 */ jal currentPlayerReloadHandIfPossible
/* f164f3c: 0fc27fe5 */ jal bgunReloadIfPossible
/* f164f40: 00002025 */ or $a0,$zero,$zero
/* f164f44: 0fc27fe5 */ jal currentPlayerReloadHandIfPossible
/* f164f44: 0fc27fe5 */ jal bgunReloadIfPossible
/* f164f48: 24040001 */ addiu $a0,$zero,0x1
/* f164f4c: 1000000c */ beqz $zero,.NB0f164f80
/* f164f50: 00000000 */ sll $zero,$zero,0x0
@ -7406,7 +7406,7 @@ glabel var7f1b8ed0pf
/* f16cdd8: c4248ed0 */ lwc1 $f4,-0x7130($at)
/* f16cddc: c6920044 */ lwc1 $f18,0x44($s4)
/* f16cde0: 46049182 */ mul.s $f6,$f18,$f4
/* f16cde4: 0fc2b039 */ jal speedpillTick
/* f16cde4: 0fc2b039 */ jal bgunTickBoost
/* f16cde8: e686004c */ swc1 $f6,0x4c($s4)
/* f16cdec: 0fc37e77 */ jal hudmsgsTick
/* f16cdf0: 00000000 */ nop
@ -8316,7 +8316,7 @@ void lvTick(void)
g_Vars.lvupdate240frealprev = g_Vars.lvupdate240freal;
g_Vars.lvupdate240freal = PALUPF(g_Vars.lvupdate240f);
speedpillTick();
bgunTickBoost();
hudmsgsTick();
if ((joyGetButtonsPressedThisFrame(0, 0xffff) != 0
@ -9043,7 +9043,7 @@ glabel lvTick
/* f166dd8: e6900050 */ swc1 $f16,0x50($s4)
/* f166ddc: e68a0044 */ swc1 $f10,0x44($s4)
/* f166de0: c6920044 */ lwc1 $f18,0x44($s4)
/* f166de4: 0fc2a662 */ jal speedpillTick
/* f166de4: 0fc2a662 */ jal bgunTickBoost
/* f166de8: e692004c */ swc1 $f18,0x4c($s4)
/* f166dec: 0fc37207 */ jal hudmsgsTick
/* f166df0: 00000000 */ sll $zero,$zero,0x0

4
src/game/mplayer/mplayer.c
View File

@ -3,7 +3,7 @@
#include "game/camdraw.h"
#include "game/title.h"
#include "game/game_01b0a0.h"
#include "game/game_097ba0.h"
#include "game/bondgun.h"
#include "game/game_0b0fd0.h"
#include "game/game_0b69d0.h"
#include "game/game_0d4690.h"
@ -1380,7 +1380,7 @@ char *mpGetWeaponLabel(s32 weaponnum)
return langGet(L_MPWEAPONS_060); // "Disabled"
}
return weaponGetName(g_MpWeapons[i].weaponnum);
return bgunGetName(g_MpWeapons[i].weaponnum);
}
weaponnum--;

42
src/game/mplayer/scenarios.c
View File

@ -7,7 +7,7 @@
#include "game/prop.h"
#include "game/game_092610.h"
#include "game/atan2f.h"
#include "game/game_097ba0.h"
#include "game/bondgun.h"
#include "game/game_0b69d0.h"
#include "game/game_0d4690.h"
#include "game/hudmsg.h"
@ -5321,7 +5321,7 @@ glabel var7f1b8960
/* f1833d0: 0002202b */ sltu $a0,$zero,$v0
/* f1833d4: 10800005 */ beqz $a0,.L0f1833ec
/* f1833d8: 00000000 */ nop
/* f1833dc: 0fc2866a */ jal handGetWeaponNum
/* f1833dc: 0fc2866a */ jal bgunGetWeaponNum
/* f1833e0: 00002025 */ or $a0,$zero,$zero
/* f1833e4: 38440036 */ xori $a0,$v0,0x36
/* f1833e8: 2c840001 */ sltiu $a0,$a0,0x1
@ -5488,7 +5488,7 @@ glabel var7f1b8960
/* f183648: 8c5000bc */ lw $s0,0xbc($v0)
/* f18364c: c4460144 */ lwc1 $f6,0x144($v0)
/* f183650: 26100008 */ addiu $s0,$s0,0x8
/* f183654: 0fc2866a */ jal handGetWeaponNum
/* f183654: 0fc2866a */ jal bgunGetWeaponNum
/* f183658: e7a60098 */ swc1 $f6,0x98($sp)
/* f18365c: 38430036 */ xori $v1,$v0,0x36
/* f183660: 2c630001 */ sltiu $v1,$v1,0x1
@ -5752,7 +5752,7 @@ glabel var7f1b8960
/* f1833d0: 0002202b */ sltu $a0,$zero,$v0
/* f1833d4: 10800005 */ beqz $a0,.L0f1833ec
/* f1833d8: 00000000 */ nop
/* f1833dc: 0fc2866a */ jal handGetWeaponNum
/* f1833dc: 0fc2866a */ jal bgunGetWeaponNum
/* f1833e0: 00002025 */ or $a0,$zero,$zero
/* f1833e4: 38440036 */ xori $a0,$v0,0x36
/* f1833e8: 2c840001 */ sltiu $a0,$a0,0x1
@ -5919,7 +5919,7 @@ glabel var7f1b8960
/* f183648: 8c5000bc */ lw $s0,0xbc($v0)
/* f18364c: c4460144 */ lwc1 $f6,0x144($v0)
/* f183650: 26100008 */ addiu $s0,$s0,0x8
/* f183654: 0fc2866a */ jal handGetWeaponNum
/* f183654: 0fc2866a */ jal bgunGetWeaponNum
/* f183658: e7a60098 */ swc1 $f6,0x98($sp)
/* f18365c: 38430036 */ xori $v1,$v0,0x36
/* f183660: 2c630001 */ sltiu $v1,$v1,0x1
@ -10279,7 +10279,7 @@ glabel chrGiveBriefcase
/* f1879c0: 0fc5bdaa */ jal langGet
/* f1879c4: 24045401 */ li $a0,0x5401
/* f1879c8: 24040057 */ li $a0,0x57
/* f1879cc: 0fc28941 */ jal weaponGetShortName
/* f1879cc: 0fc28941 */ jal bgunGetShortName
/* f1879d0: afa20048 */ sw $v0,0x48($sp)
/* f1879d4: 8fa50048 */ lw $a1,0x48($sp)
/* f1879d8: 27a400d4 */ addiu $a0,$sp,0xd4
@ -10964,7 +10964,7 @@ glabel chrGiveBriefcase
/* f1869bc: 0fc5b9f1 */ jal langGet
/* f1869c0: 24045400 */ addiu $a0,$zero,0x5400
/* f1869c4: 24040057 */ addiu $a0,$zero,0x57
/* f1869c8: 0fc28874 */ jal weaponGetShortName
/* f1869c8: 0fc28874 */ jal bgunGetShortName
/* f1869cc: afa20048 */ sw $v0,0x48($sp)
/* f1869d0: 8fa50048 */ lw $a1,0x48($sp)
/* f1869d4: 27a400d4 */ addiu $a0,$sp,0xd4
@ -11203,7 +11203,7 @@ glabel chrGiveBriefcase
/* f186d14: 0fc5b9f1 */ jal langGet
/* f186d18: 24045404 */ addiu $a0,$zero,0x5404
/* f186d1c: 24040057 */ addiu $a0,$zero,0x57
/* f186d20: 0fc28874 */ jal weaponGetShortName
/* f186d20: 0fc28874 */ jal bgunGetShortName
/* f186d24: afa20048 */ sw $v0,0x48($sp)
/* f186d28: 00106880 */ sll $t5,$s0,0x2
/* f186d2c: 01b06823 */ subu $t5,$t5,$s0
@ -11219,7 +11219,7 @@ glabel chrGiveBriefcase
/* f186d54: 0fc5b9f1 */ jal langGet
/* f186d58: 24045405 */ addiu $a0,$zero,0x5405
/* f186d5c: 24040057 */ addiu $a0,$zero,0x57
/* f186d60: 0fc28874 */ jal weaponGetShortName
/* f186d60: 0fc28874 */ jal bgunGetShortName
/* f186d64: afa20048 */ sw $v0,0x48($sp)
/* f186d68: 8fa50048 */ lw $a1,0x48($sp)
/* f186d6c: 27a40094 */ addiu $a0,$sp,0x94
@ -11229,7 +11229,7 @@ glabel chrGiveBriefcase
/* f186d7c: 0fc5b9f1 */ jal langGet
/* f186d80: 24045406 */ addiu $a0,$zero,0x5406
/* f186d84: 24040057 */ addiu $a0,$zero,0x57
/* f186d88: 0fc28874 */ jal weaponGetShortName
/* f186d88: 0fc28874 */ jal bgunGetShortName
/* f186d8c: afa20048 */ sw $v0,0x48($sp)
/* f186d90: 8fa50048 */ lw $a1,0x48($sp)
/* f186d94: 27a40054 */ addiu $a0,$sp,0x54
@ -11393,7 +11393,7 @@ glabel chrGiveBriefcase
/* f186fbc: 0fc5b9f1 */ jal langGet
/* f186fc0: ac39c168 */ sw $t9,%lo(g_ScenarioData+0x58)($at)
/* f186fc4: 24040057 */ addiu $a0,$zero,0x57
/* f186fc8: 0fc28874 */ jal weaponGetShortName
/* f186fc8: 0fc28874 */ jal bgunGetShortName
/* f186fcc: afa20048 */ sw $v0,0x48($sp)
/* f186fd0: 8fb80120 */ lw $t8,0x120($sp)
/* f186fd4: 3c10800b */ lui $s0,%hi(g_MpSetup+0x28)
@ -11411,7 +11411,7 @@ glabel chrGiveBriefcase
/* f187004: 0fc5b9f1 */ jal langGet
/* f187008: 24045402 */ addiu $a0,$zero,0x5402
/* f18700c: 24040057 */ addiu $a0,$zero,0x57
/* f187010: 0fc28874 */ jal weaponGetShortName
/* f187010: 0fc28874 */ jal bgunGetShortName
/* f187014: afa20048 */ sw $v0,0x48($sp)
/* f187018: 8fa50048 */ lw $a1,0x48($sp)
/* f18701c: 27a40094 */ addiu $a0,$sp,0x94
@ -11421,7 +11421,7 @@ glabel chrGiveBriefcase
/* f18702c: 0fc5b9f1 */ jal langGet
/* f187030: 24045403 */ addiu $a0,$zero,0x5403
/* f187034: 24040057 */ addiu $a0,$zero,0x57
/* f187038: 0fc28874 */ jal weaponGetShortName
/* f187038: 0fc28874 */ jal bgunGetShortName
/* f18703c: afa20048 */ sw $v0,0x48($sp)
/* f187040: 8fae0120 */ lw $t6,0x120($sp)
/* f187044: 8fa50048 */ lw $a1,0x48($sp)
@ -11673,7 +11673,7 @@ glabel chrGiveBriefcase
/* f180e24: 0fc5a4dd */ jal langGet
/* f180e28: 24045400 */ addiu $a0,$zero,0x5400
/* f180e2c: 24040056 */ addiu $a0,$zero,0x56
/* f180e30: 0fc27fd3 */ jal weaponGetShortName
/* f180e30: 0fc27fd3 */ jal bgunGetShortName
/* f180e34: afa20048 */ sw $v0,0x48($sp)
/* f180e38: 8fa50048 */ lw $a1,0x48($sp)
/* f180e3c: 27a400d4 */ addiu $a0,$sp,0xd4
@ -11906,7 +11906,7 @@ glabel chrGiveBriefcase
/* f181164: 0fc5a4dd */ jal langGet
/* f181168: 24045404 */ addiu $a0,$zero,0x5404
/* f18116c: 24040056 */ addiu $a0,$zero,0x56
/* f181170: 0fc27fd3 */ jal weaponGetShortName
/* f181170: 0fc27fd3 */ jal bgunGetShortName
/* f181174: afa20048 */ sw $v0,0x48($sp)
/* f181178: 00106080 */ sll $t4,$s0,0x2
/* f18117c: 01906023 */ subu $t4,$t4,$s0
@ -11922,7 +11922,7 @@ glabel chrGiveBriefcase
/* f1811a4: 0fc5a4dd */ jal langGet
/* f1811a8: 24045405 */ addiu $a0,$zero,0x5405
/* f1811ac: 24040056 */ addiu $a0,$zero,0x56
/* f1811b0: 0fc27fd3 */ jal weaponGetShortName
/* f1811b0: 0fc27fd3 */ jal bgunGetShortName
/* f1811b4: afa20048 */ sw $v0,0x48($sp)
/* f1811b8: 8fa50048 */ lw $a1,0x48($sp)
/* f1811bc: 27a40094 */ addiu $a0,$sp,0x94
@ -11932,7 +11932,7 @@ glabel chrGiveBriefcase
/* f1811cc: 0fc5a4dd */ jal langGet
/* f1811d0: 24045406 */ addiu $a0,$zero,0x5406
/* f1811d4: 24040056 */ addiu $a0,$zero,0x56
/* f1811d8: 0fc27fd3 */ jal weaponGetShortName
/* f1811d8: 0fc27fd3 */ jal bgunGetShortName
/* f1811dc: afa20048 */ sw $v0,0x48($sp)
/* f1811e0: 8fa50048 */ lw $a1,0x48($sp)
/* f1811e4: 27a40054 */ addiu $a0,$sp,0x54
@ -12096,7 +12096,7 @@ glabel chrGiveBriefcase
/* f18140c: 0fc5a4dd */ jal langGet
/* f181410: ac390a18 */ sw $t9,0xa18($at)
/* f181414: 24040056 */ addiu $a0,$zero,0x56
/* f181418: 0fc27fd3 */ jal weaponGetShortName
/* f181418: 0fc27fd3 */ jal bgunGetShortName
/* f18141c: afa20048 */ sw $v0,0x48($sp)
/* f181420: 8fb80120 */ lw $t8,0x120($sp)
/* f181424: 3c10800b */ lui $s0,0x800b
@ -12114,7 +12114,7 @@ glabel chrGiveBriefcase
/* f181454: 0fc5a4dd */ jal langGet
/* f181458: 24045402 */ addiu $a0,$zero,0x5402
/* f18145c: 24040056 */ addiu $a0,$zero,0x56
/* f181460: 0fc27fd3 */ jal weaponGetShortName
/* f181460: 0fc27fd3 */ jal bgunGetShortName
/* f181464: afa20048 */ sw $v0,0x48($sp)
/* f181468: 8fa50048 */ lw $a1,0x48($sp)
/* f18146c: 27a40094 */ addiu $a0,$sp,0x94
@ -12124,7 +12124,7 @@ glabel chrGiveBriefcase
/* f18147c: 0fc5a4dd */ jal langGet
/* f181480: 24045403 */ addiu $a0,$zero,0x5403
/* f181484: 24040056 */ addiu $a0,$zero,0x56
/* f181488: 0fc27fd3 */ jal weaponGetShortName
/* f181488: 0fc27fd3 */ jal bgunGetShortName
/* f18148c: afa20048 */ sw $v0,0x48($sp)
/* f181490: 8fad0120 */ lw $t5,0x120($sp)
/* f181494: 8fa50048 */ lw $a1,0x48($sp)
@ -12427,7 +12427,7 @@ s32 chrGiveUplink(struct chrdata *chr, struct prop *prop)
sprintf(message, langGet(L_MPWEAPONS_000), mpchr->name);
#else
// "%shas the\n%s"
sprintf(message, langGet(L_MPWEAPONS_000), mpchr->name, weaponGetShortName(WEAPON_DATAUPLINK));
sprintf(message, langGet(L_MPWEAPONS_000), mpchr->name, bgunGetShortName(WEAPON_DATAUPLINK));
#endif
playernum = g_Vars.currentplayernum;

2
src/game/mpstats.c
View File

@ -2,7 +2,7 @@
#include "constants.h"
#include "game/cheats.h"
#include "game/inventory/items.h"
#include "game/game_097ba0.h"
#include "game/bondgun.h"
#include "game/game_0b0fd0.h"
#include "game/game_0b69d0.h"
#include "game/hudmsg.h"

62
src/game/prop.c
View File

@ -10,7 +10,7 @@
#include "game/game_095320.h"
#include "game/floor.h"
#include "game/ceil.h"
#include "game/game_097ba0.h"
#include "game/bondgun.h"
#include "game/game_0b0fd0.h"
#include "game/game_0b3350.h"
#include "game/game_0b4950.h"
@ -588,7 +588,7 @@ struct prop *shotCalculateHits(s32 handnum, bool arg1, struct coord *arg2, struc
s16 sp6c[8];
struct prop *hitprop;
func0f0a9494(arg6);
bgun0f0a9494(arg6);
shotdata.gunpos.x = gunpos->x;
shotdata.gunpos.y = gunpos->y;
@ -734,9 +734,9 @@ struct prop *shotCalculateHits(s32 handnum, bool arg1, struct coord *arg2, struc
if (&spa0);
if (hitindex != -1) {
func0f0a94d0(arg6, &shotdata.hits[hitindex].pos, &shotdata.hits[hitindex].dir);
bgun0f0a94d0(arg6, &shotdata.hits[hitindex].pos, &shotdata.hits[hitindex].dir);
} else if (hitbg) {
func0f0a94d0(arg6, &sp694.unk00, &sp694.unk0c);
bgun0f0a94d0(arg6, &sp694.unk00, &sp694.unk0c);
}
if (arg1) {
@ -806,7 +806,7 @@ struct prop *shotCalculateHits(s32 handnum, bool arg1, struct coord *arg2, struc
}
}
handSetHitPos(&sp694.unk00);
bgunSetHitPos(&sp694.unk00);
if (surfacetype->num04 > 0 && (!func || (func->type & 0xff) != INVENTORYFUNCTYPE_CLOSE)) {
if (shotdata.gset.weaponnum != WEAPON_UNARMED
@ -825,7 +825,7 @@ struct prop *shotCalculateHits(s32 handnum, bool arg1, struct coord *arg2, struc
}
}
func0f0a84c8(&shotdata.gset, &sp694.unk00, sp694.unk2a, sp6c);
bgun0f0a84c8(&shotdata.gset, &sp694.unk00, sp694.unk2a, sp6c);
if (explosiveshells) {
explosionCreateSimple(NULL, &sp694.unk00, sp6c, EXPLOSIONTYPE_22, g_Vars.currentplayernum);
@ -882,7 +882,7 @@ struct prop *shotCalculateHits(s32 handnum, bool arg1, struct coord *arg2, struc
}
}
} else {
handSetHitPos(&hitpos);
bgunSetHitPos(&hitpos);
}
} else if (shortrange) {
s32 hitindex;
@ -960,9 +960,9 @@ struct prop *func0f061d54(s32 handnum, u32 arg1, u32 arg2)
struct coord sp4c;
struct coord sp40;
handCalculateShotSpread(&sp58, &sp64, handnum, arg2);
bgunCalculateShotSpread(&sp58, &sp64, handnum, arg2);
if (arg2 == 2 && handGetWeaponNum(HAND_RIGHT) == WEAPON_REAPER) {
if (arg2 == 2 && bgunGetWeaponNum(HAND_RIGHT) == WEAPON_REAPER) {
sp58.y -= 15 * (random() * (1.0f / U32_MAX));
}
@ -979,7 +979,7 @@ void handCreateBulletRaycast(s32 handnum, bool arg1, bool dorandom, s32 arg3, bo
struct coord sp44;
struct coord sp38;
handCalculateShotSpread(&sp38, &sp44, handnum, dorandom);
bgunCalculateShotSpread(&sp38, &sp44, handnum, dorandom);
if (arg3 > 0) {
func00015b68(currentPlayerGetUnk174c(), &sp38, &shootpos);
@ -988,7 +988,7 @@ void handCreateBulletRaycast(s32 handnum, bool arg1, bool dorandom, s32 arg3, bo
shotCalculateHits(handnum, arg1, &sp38, &sp44, &shootpos, &shootdir, 0, 4294836224, arg4);
if (arg3 < 2) {
handSetLastShootInfo(&shootpos, &shootdir, handnum);
bgunSetLastShootInfo(&shootpos, &shootdir, handnum);
}
}
}
@ -1153,7 +1153,7 @@ void handInflictCloseRangeDamage(s32 handnum, struct gset *gset, bool arg2)
rangelimit = closefunc->range;
}
currentPlayerGetCrossPos(&x, &y);
bgunGetCrossPos(&x, &y);
spfc[0] = (x - currentPlayerGetScreenLeft()) / (currentPlayerGetScreenWidth() * 0.5f) - 1.0f;
spfc[1] = (y - currentPlayerGetScreenTop()) / (currentPlayerGetScreenHeight() * 0.5f) - 1.0f;
@ -1182,12 +1182,12 @@ void handInflictCloseRangeDamage(s32 handnum, struct gset *gset, bool arg2)
struct coord spcc;
struct modelnode *node = NULL;
handCalculateShotSpread(&spd8, &spcc, handnum, true);
bgunCalculateShotSpread(&spd8, &spcc, handnum, true);
if (func000225d4(model, &spd8, &spcc, &node) > 0) {
f32 damage = gsetGetDamage(gset) * 2.5f;
skipthething = true;
func0f0a8404(&playerprop->pos, playerprop->rooms, -1);
bgun0f0a8404(&playerprop->pos, playerprop->rooms, -1);
objTakeGunfire(obj, damage, &prop->pos, gset->weaponnum, g_Vars.currentplayernum);
func0f070698(prop, false);
}
@ -1202,10 +1202,10 @@ void handInflictCloseRangeDamage(s32 handnum, struct gset *gset, bool arg2)
s32 hitpart = HITPART_TORSO;
if (!chrIsAvoiding(chr)) {
handCalculateShotSpread(&spb8, &vector, handnum, true);
bgunCalculateShotSpread(&spb8, &vector, handnum, true);
skipthething = true;
func00015b10(currentPlayerGetUnk174c(), &vector);
gsetPlayPropHitSound(gset, prop, -1);
bgunPlayPropHitSound(gset, prop, -1);
if (chr->model && chrGetShield(chr) > 0) {
chrCalculateShieldHit(chr, &playerprop->pos, &vector, &node, &hitpart, &model, &side);
@ -1241,7 +1241,7 @@ void handTickAttack(s32 handnum)
if (g_Vars.currentplayer->hands[handnum].unk0d0f_02) {
s32 doit = true;
if (handGetWeaponNum(handnum) == WEAPON_REAPER
if (bgunGetWeaponNum(handnum) == WEAPON_REAPER
&& (g_Vars.currentplayer->hands[handnum].burstbullets % 3) != 1) {
doit = false;
}
@ -1253,9 +1253,9 @@ void handTickAttack(s32 handnum)
g_Vars.currentplayer->hands[handnum].unk0d0f_02 = false;
}
if (handIsFiring(handnum)) {
s32 type = handGetAttackType(handnum);
s32 weaponnum = handGetWeaponNum(handnum);
if (bgunIsFiring(handnum)) {
s32 type = bgunGetAttackType(handnum);
s32 weaponnum = bgunGetWeaponNum(handnum);
u8 stack1;
u8 stack2;
u8 stack3;
@ -1271,7 +1271,7 @@ void handTickAttack(s32 handnum)
case HANDATTACKTYPE_SHOOT:
// Always execute if right hand, but if left hand then execute if
// right hand is not (ie. prevent firing both guns on the same tick)
if (handnum == HAND_RIGHT || !handIsFiring(HAND_RIGHT)) {
if (handnum == HAND_RIGHT || !bgunIsFiring(HAND_RIGHT)) {
chrUncloakTemporarily(g_Vars.currentplayer->prop->chr);
mpstatsIncrementPlayerShotCount2((struct gset *)&tmpweaponnum, 0);
@ -1283,7 +1283,7 @@ void handTickAttack(s32 handnum)
handCreateBulletRaycast(handnum, true, true, 1, true);
handCreateBulletRaycast(handnum, true, true, 1, true);
} else {
handCreateBulletRaycast(handnum, true, true, handGetUnk0c30(handnum), g_Vars.mplayerisrunning);
handCreateBulletRaycast(handnum, true, true, bgunGetUnk0c30(handnum), g_Vars.mplayerisrunning);
}
mpstats0f0b0520();
@ -1303,13 +1303,13 @@ void handTickAttack(s32 handnum)
propFindForUplink();
break;
case HANDATTACKTYPE_BOOST:
cboostBoost();
bgunApplyBoost();
break;
case HANDATTACKTYPE_REVERTBOOST:
cboostRevert();
bgunRevertBoost();
break;
case HANDATTACKTYPE_SHOOTPROJECTILE:
handCreateFiredProjectile(handnum);
bgunCreateFiredProjectile(handnum);
break;
case HANDATTACKTYPE_CROUCH:
if (g_Vars.currentplayer->crouchpos == CROUCHPOS_SQUAT) {
@ -1319,7 +1319,7 @@ void handTickAttack(s32 handnum)
}
break;
case HANDATTACKTYPE_THROWPROJECTILE:
handCreateThrownProjectile(handnum, (struct gset *)&tmpweaponnum);
bgunCreateThrownProjectile(handnum, (struct gset *)&tmpweaponnum);
break;
case HANDATTACKTYPE_RCP120CLOAK:
cloaked = (g_Vars.currentplayer->devicesactive & DEVICE_CLOAKRCP120) != 0;
@ -5283,7 +5283,7 @@ f32 func0f06438c(struct prop *prop, struct coord *arg1, f32 *arg2, f32 *arg3, f3
struct prop *playerprop;
s32 lVar3;
if (func && func0f0a27c8()) {
if (func && bgun0f0a27c8()) {
sp50 = true;
}
@ -5323,7 +5323,7 @@ f32 func0f06438c(struct prop *prop, struct coord *arg1, f32 *arg2, f32 *arg3, f3
if (sp74[1] >= top && bottom >= sp7c[1]) {
sp4c = false;
currentPlayerGetCrossPos(&sp70, &sp6c);
bgunGetCrossPos(&sp70, &sp6c);
sp8c[0] = floorf(sp8c[0]);
sp84[0] = ceilf(sp84[0]);
@ -5400,7 +5400,7 @@ void farsightChooseTarget(void)
struct prop *besttarget = NULL;
f32 bestthing = 1;
f32 bestdist = -1;
s32 weaponnum = handGetWeaponNum(HAND_RIGHT);
s32 weaponnum = bgunGetWeaponNum(HAND_RIGHT);
s32 i;
if (weaponnum == WEAPON_FARSIGHT) {
@ -5454,7 +5454,7 @@ void autoaimTick(void)
struct prop *bestprop = NULL;
f32 aimpos[2] = {0, 0};
bool isclose = false;
bool cangangsta = weaponHasFlag(handGetWeaponNum(HAND_RIGHT), WEAPONFLAG_GANGSTA);
bool cangangsta = weaponHasFlag(bgunGetWeaponNum(HAND_RIGHT), WEAPONFLAG_GANGSTA);
bool iscmpsec = false;
struct weaponfunc *func = currentPlayerGetWeaponFunction(HAND_RIGHT);
s32 i;
@ -5471,7 +5471,7 @@ void autoaimTick(void)
farsightChooseTarget();
}
if (handGetWeaponNum(HAND_RIGHT) == WEAPON_CMP150
if (bgunGetWeaponNum(HAND_RIGHT) == WEAPON_CMP150
&& g_Vars.currentplayer->hands[HAND_RIGHT].gset.weaponfunc == FUNC_SECONDARY) {
iscmpsec = true;
}

184
src/game/propobj.c
View File

@ -20,7 +20,7 @@
#include "game/game_096ca0.h"
#include "game/floor.h"
#include "game/ceil.h"
#include "game/game_097ba0.h"
#include "game/bondgun.h"
#include "game/game_0abe70.h"
#include "game/game_0b0fd0.h"
#include "game/game_0b28d0.h"
@ -11815,7 +11815,7 @@ glabel func0f06f0a0
/* f06f240: 00000000 */ nop
/* f06f244: 14e20012 */ bne $a3,$v0,.L0f06f290
/* f06f248: 2604005c */ addiu $a0,$s0,0x5c
/* f06f24c: 0fc29f66 */ jal gsetPlayPropHitSound
/* f06f24c: 0fc29f66 */ jal bgunPlayPropHitSound
/* f06f250: 2406ffff */ addiu $a2,$zero,-1
/* f06f254: 9219005c */ lbu $t9,0x5c($s0)
/* f06f258: 2401001a */ addiu $at,$zero,0x1a
@ -11862,7 +11862,7 @@ glabel func0f06f0a0
/* f06f2ec: 8fa70028 */ lw $a3,0x28($sp)
/* f06f2f0: 8fa5002c */ lw $a1,0x2c($sp)
/* f06f2f4: 2406ffff */ addiu $a2,$zero,-1
/* f06f2f8: 0fc2a132 */ jal func0f0a84c8
/* f06f2f8: 0fc2a132 */ jal bgun0f0a84c8
/* f06f2fc: 24e70028 */ addiu $a3,$a3,40
.L0f06f300:
/* f06f300: 8fbf001c */ lw $ra,0x1c($sp)
@ -22963,7 +22963,7 @@ glabel var7f1ab6dcpf
/* f075910: 2406ffff */ li $a2,-1
/* f075914: afa301e4 */ sw $v1,0x1e4($sp)
/* f075918: afa40070 */ sw $a0,0x70($sp)
/* f07591c: 0fc2a214 */ jal func0f0a8404
/* f07591c: 0fc2a214 */ jal bgun0f0a8404
/* f075920: afa801ec */ sw $t0,0x1ec($sp)
/* f075924: 8fa401e4 */ lw $a0,0x1e4($sp)
/* f075928: 8fa801ec */ lw $t0,0x1ec($sp)
@ -26501,7 +26501,7 @@ glabel var7f1aa438
/* f07568c: 2406ffff */ addiu $a2,$zero,-1
/* f075690: afa301e4 */ sw $v1,0x1e4($sp)
/* f075694: afa40070 */ sw $a0,0x70($sp)
/* f075698: 0fc2a101 */ jal func0f0a8404
/* f075698: 0fc2a101 */ jal bgun0f0a8404
/* f07569c: afa801ec */ sw $t0,0x1ec($sp)
/* f0756a0: 8fa401e4 */ lw $a0,0x1e4($sp)
/* f0756a4: 8fa801ec */ lw $t0,0x1ec($sp)
@ -30003,7 +30003,7 @@ glabel var7f1aa438
.NB0f0743bc:
/* f0743bc: afa301ec */ sw $v1,0x1ec($sp)
/* f0743c0: afa40074 */ sw $a0,0x74($sp)
/* f0743c4: 0fc29877 */ jal func0f0a8404
/* f0743c4: 0fc29877 */ jal bgun0f0a8404
/* f0743c8: afa701e8 */ sw $a3,0x1e8($sp)
/* f0743cc: 8fa401e8 */ lw $a0,0x1e8($sp)
/* f0743d0: 8fa301ec */ lw $v1,0x1ec($sp)
@ -36590,7 +36590,7 @@ glabel var7f1aa5a8
/* f07a3fc: 51e00114 */ beqzl $t7,.L0f07a850
/* f07a400: 8fa40198 */ lw $a0,0x198($sp)
.L0f07a404:
/* f07a404: 0fc29f66 */ jal gsetPlayPropHitSound
/* f07a404: 0fc29f66 */ jal bgunPlayPropHitSound
/* f07a408: 2406ffff */ addiu $a2,$zero,-1
/* f07a40c: 8fa400ac */ lw $a0,0xac($sp)
/* f07a410: 8c980020 */ lw $t8,0x20($a0)
@ -36718,7 +36718,7 @@ glabel var7f1aa5a8
/* f07a5dc: 27a400a0 */ addiu $a0,$sp,0xa0
.L0f07a5e0:
/* f07a5e0: 8fa500a8 */ lw $a1,0xa8($sp)
/* f07a5e4: 0fc29f66 */ jal gsetPlayPropHitSound
/* f07a5e4: 0fc29f66 */ jal bgunPlayPropHitSound
/* f07a5e8: 240600f2 */ addiu $a2,$zero,0xf2
/* f07a5ec: 10000098 */ b .L0f07a850
/* f07a5f0: 8fa40198 */ lw $a0,0x198($sp)
@ -36859,7 +36859,7 @@ glabel var7f1aa5a8
.L0f07a7f4:
/* f07a7f4: 27a40118 */ addiu $a0,$sp,0x118
/* f07a7f8: 8fa50124 */ lw $a1,0x124($sp)
/* f07a7fc: 0fc29f66 */ jal gsetPlayPropHitSound
/* f07a7fc: 0fc29f66 */ jal bgunPlayPropHitSound
/* f07a800: 2406ffff */ addiu $a2,$zero,-1
/* f07a804: 3c013f00 */ lui $at,0x3f00
/* f07a808: 44815000 */ mtc1 $at,$f10
@ -36943,7 +36943,7 @@ glabel var7f1aa5a8
.L0f07a920:
/* f07a920: 27a5013c */ addiu $a1,$sp,0x13c
/* f07a924: 2406ffff */ addiu $a2,$zero,-1
/* f07a928: 0fc2a132 */ jal func0f0a84c8
/* f07a928: 0fc2a132 */ jal bgun0f0a84c8
/* f07a92c: 27a7012c */ addiu $a3,$sp,0x12c
.L0f07a930:
/* f07a930: 8fac0128 */ lw $t4,0x128($sp)
@ -37552,7 +37552,7 @@ glabel var7f1aa5a8
/* f07a3fc: 51e00114 */ beqzl $t7,.L0f07a850
/* f07a400: 8fa40198 */ lw $a0,0x198($sp)
.L0f07a404:
/* f07a404: 0fc29f66 */ jal gsetPlayPropHitSound
/* f07a404: 0fc29f66 */ jal bgunPlayPropHitSound
/* f07a408: 2406ffff */ addiu $a2,$zero,-1
/* f07a40c: 8fa400ac */ lw $a0,0xac($sp)
/* f07a410: 8c980020 */ lw $t8,0x20($a0)
@ -37680,7 +37680,7 @@ glabel var7f1aa5a8
/* f07a5dc: 27a400a0 */ addiu $a0,$sp,0xa0
.L0f07a5e0:
/* f07a5e0: 8fa500a8 */ lw $a1,0xa8($sp)
/* f07a5e4: 0fc29f66 */ jal gsetPlayPropHitSound
/* f07a5e4: 0fc29f66 */ jal bgunPlayPropHitSound
/* f07a5e8: 240600f2 */ addiu $a2,$zero,0xf2
/* f07a5ec: 10000098 */ b .L0f07a850
/* f07a5f0: 8fa40198 */ lw $a0,0x198($sp)
@ -37821,7 +37821,7 @@ glabel var7f1aa5a8
.L0f07a7f4:
/* f07a7f4: 27a40118 */ addiu $a0,$sp,0x118
/* f07a7f8: 8fa50124 */ lw $a1,0x124($sp)
/* f07a7fc: 0fc29f66 */ jal gsetPlayPropHitSound
/* f07a7fc: 0fc29f66 */ jal bgunPlayPropHitSound
/* f07a800: 2406ffff */ addiu $a2,$zero,-1
/* f07a804: 3c013f00 */ lui $at,0x3f00
/* f07a808: 44815000 */ mtc1 $at,$f10
@ -37905,7 +37905,7 @@ glabel var7f1aa5a8
.L0f07a920:
/* f07a920: 27a5013c */ addiu $a1,$sp,0x13c
/* f07a924: 2406ffff */ addiu $a2,$zero,-1
/* f07a928: 0fc2a132 */ jal func0f0a84c8
/* f07a928: 0fc2a132 */ jal bgun0f0a84c8
/* f07a92c: 27a7012c */ addiu $a3,$sp,0x12c
.L0f07a930:
/* f07a930: 8fac0128 */ lw $t4,0x128($sp)
@ -56163,7 +56163,7 @@ glabel func0f0841dc
/* f084384: 27a40040 */ addiu $a0,$sp,0x40
/* f084388: 27a50034 */ addiu $a1,$sp,0x34
/* f08438c: 00003025 */ or $a2,$zero,$zero
/* f084390: 0fc2832c */ jal handCalculateShotSpread
/* f084390: 0fc2832c */ jal bgunCalculateShotSpread
/* f084394: 00003825 */ or $a3,$zero,$zero
/* f084398: 02002025 */ or $a0,$s0,$zero
/* f08439c: 0fc209b3 */ jal func0f0826cc
@ -56425,7 +56425,7 @@ glabel func0f0841dc
/* f084384: 27a40040 */ addiu $a0,$sp,0x40
/* f084388: 27a50034 */ addiu $a1,$sp,0x34
/* f08438c: 00003025 */ or $a2,$zero,$zero
/* f084390: 0fc2832c */ jal handCalculateShotSpread
/* f084390: 0fc2832c */ jal bgunCalculateShotSpread
/* f084394: 00003825 */ or $a3,$zero,$zero
/* f084398: 02002025 */ or $a0,$s0,$zero
/* f08439c: 0fc209b3 */ jal func0f0826cc
@ -57801,7 +57801,7 @@ glabel func0f085eac
/* f085fd4: 806e004c */ lb $t6,0x4c($v1)
/* f085fd8: 51c00005 */ beqzl $t6,.L0f085ff0
/* f085fdc: 8faf011c */ lw $t7,0x11c($sp)
/* f085fe0: 0fc2a519 */ jal handSetHitPos
/* f085fe0: 0fc2a519 */ jal bgunSetHitPos
/* f085fe4: 27a40110 */ addiu $a0,$sp,0x110
/* f085fe8: 8fa30124 */ lw $v1,0x124($sp)
/* f085fec: 8faf011c */ lw $t7,0x11c($sp)
@ -57981,7 +57981,7 @@ glabel func0f085eac
/* f086260: 8d070004 */ lw $a3,0x4($t0)
/* f086264: 8506003a */ lh $a2,0x3a($t0)
/* f086268: 24e40008 */ addiu $a0,$a3,0x8
/* f08626c: 0fc2a101 */ jal func0f0a8404
/* f08626c: 0fc2a101 */ jal bgun0f0a8404
/* f086270: 24e50028 */ addiu $a1,$a3,0x28
/* f086274: 10000007 */ b .L0f086294
/* f086278: 8fa80124 */ lw $t0,0x124($sp)
@ -57989,7 +57989,7 @@ glabel func0f085eac
/* f08627c: 15600005 */ bnez $t3,.L0f086294
/* f086280: 8fa40048 */ lw $a0,0x48($sp)
/* f086284: 8d050004 */ lw $a1,0x4($t0)
/* f086288: 0fc29f66 */ jal gsetPlayPropHitSound
/* f086288: 0fc29f66 */ jal bgunPlayPropHitSound
/* f08628c: 8506003a */ lh $a2,0x3a($t0)
/* f086290: 8fa80124 */ lw $t0,0x124($sp)
.L0f086294:
@ -58532,7 +58532,7 @@ glabel func0f085eac
/* f084838: 804e004c */ lb $t6,0x4c($v0)
/* f08483c: 51c00005 */ beqzl $t6,.NB0f084854
/* f084840: 8faf011c */ lw $t7,0x11c($sp)
/* f084844: 0fc29c81 */ jal handSetHitPos
/* f084844: 0fc29c81 */ jal bgunSetHitPos
/* f084848: 27a40110 */ addiu $a0,$sp,0x110
/* f08484c: 8fa20124 */ lw $v0,0x124($sp)
/* f084850: 8faf011c */ lw $t7,0x11c($sp)
@ -58710,7 +58710,7 @@ glabel func0f085eac
/* f084abc: 8d070004 */ lw $a3,0x4($t0)
/* f084ac0: 8506003a */ lh $a2,0x3a($t0)
/* f084ac4: 24e40008 */ addiu $a0,$a3,0x8
/* f084ac8: 0fc29877 */ jal func0f0a8404
/* f084ac8: 0fc29877 */ jal bgun0f0a8404
/* f084acc: 24e50028 */ addiu $a1,$a3,0x28
/* f084ad0: 10000007 */ beqz $zero,.NB0f084af0
/* f084ad4: 8fa80124 */ lw $t0,0x124($sp)
@ -58718,7 +58718,7 @@ glabel func0f085eac
/* f084ad8: 15800005 */ bnez $t4,.NB0f084af0
/* f084adc: 8fa40048 */ lw $a0,0x48($sp)
/* f084ae0: 8d050004 */ lw $a1,0x4($t0)
/* f084ae4: 0fc296b1 */ jal gsetPlayPropHitSound
/* f084ae4: 0fc296b1 */ jal bgunPlayPropHitSound
/* f084ae8: 8506003a */ lh $a2,0x3a($t0)
/* f084aec: 8fa80124 */ lw $t0,0x124($sp)
.NB0f084af0:
@ -59419,8 +59419,8 @@ bool propobjInteract(struct prop *prop)
func0f087d10(WEAPON_LAPTOPGUN);
if (laptop->ammoquantity > 0 && laptop->ammoquantity != 255) {
s32 newqty = currentPlayerGetAmmoQuantityForWeapon(WEAPON_LAPTOPGUN, FUNC_PRIMARY) + laptop->ammoquantity;
currentPlayerSetAmmoQtyForWeapon(WEAPON_LAPTOPGUN, FUNC_PRIMARY, newqty);
s32 newqty = bgunGetAmmoQtyForWeapon(WEAPON_LAPTOPGUN, FUNC_PRIMARY) + laptop->ammoquantity;
bgunSetAmmoQtyForWeapon(WEAPON_LAPTOPGUN, FUNC_PRIMARY, newqty);
}
}
} else {
@ -60493,20 +60493,20 @@ glabel func0f088028
/* f08803c: afa60030 */ sw $a2,0x30($sp)
/* f088040: 18a00051 */ blez $a1,.L0f088188
/* f088044: afa70034 */ sw $a3,0x34($sp)
/* f088048: 0fc2a5dc */ jal currentPlayerGetAmmoCountWithCheck
/* f088048: 0fc2a5dc */ jal bgunGetAmmoCountWithCheck
/* f08804c: 00000000 */ nop
/* f088050: afa20020 */ sw $v0,0x20($sp)
/* f088054: 0fc2a63d */ jal ammotypeGetMaxCapacity
/* f088054: 0fc2a63d */ jal bgunGetCapacityByAmmotype
/* f088058: 02002025 */ or $a0,$s0,$zero
/* f08805c: 8faf0020 */ lw $t7,0x20($sp)
/* f088060: 01e2082a */ slt $at,$t7,$v0
/* f088064: 5020000e */ beqzl $at,.L0f0880a0
/* f088068: 8fa80030 */ lw $t0,0x30($sp)
/* f08806c: 0fc2a5dc */ jal currentPlayerGetAmmoCountWithCheck
/* f08806c: 0fc2a5dc */ jal bgunGetAmmoCountWithCheck
/* f088070: 02002025 */ or $a0,$s0,$zero
/* f088074: 8fb8002c */ lw $t8,0x2c($sp)
/* f088078: 02002025 */ or $a0,$s0,$zero
/* f08807c: 0fc2a58a */ jal currentPlayerSetAmmoQuantity
/* f08807c: 0fc2a58a */ jal bgunSetAmmoQuantity
/* f088080: 00582821 */ addu $a1,$v0,$t8
/* f088084: 8fb90034 */ lw $t9,0x34($sp)
/* f088088: 02002025 */ or $a0,$s0,$zero
@ -60628,7 +60628,7 @@ s32 weaponGetPickupAmmoQty(struct weaponobj *weapon)
return 20;
}
ammotype = weaponGetAmmoType(weapon->weaponnum, 0);
ammotype = bgunGetAmmoTypeForWeapon(weapon->weaponnum, 0);
if (weapon->weaponnum == WEAPON_COMBATKNIFE || weapon->weaponnum == WEAPON_BOLT) {
return 1;
@ -60837,10 +60837,10 @@ void weaponGetPickupText(char *buffer, s32 weaponnum, bool dual)
}
if (full) {
strcat(buffer, weaponGetName(weaponnum));
strcat(buffer, bgunGetName(weaponnum));
plural = weaponHasFlag(weaponnum, WEAPONFLAG_DETERMINER_F_SOME);
} else {
strcat(buffer, weaponGetShortName(weaponnum));
strcat(buffer, bgunGetShortName(weaponnum));
plural = weaponHasFlag(weaponnum, WEAPONFLAG_DETERMINER_S_SOME);
}
@ -61268,24 +61268,24 @@ glabel var7f1aae70
/* f088c54: 24010002 */ addiu $at,$zero,0x2
/* f088c58: 55a10010 */ bnel $t5,$at,.L0f088c9c
/* f088c5c: 8fb90074 */ lw $t9,0x74($sp)
/* f088c60: 0fc2866a */ jal handGetWeaponNum
/* f088c60: 0fc2866a */ jal bgunGetWeaponNum
/* f088c64: 00002025 */ or $a0,$zero,$zero
/* f088c68: 8fae0074 */ lw $t6,0x74($sp)
/* f088c6c: 91cf005c */ lbu $t7,0x5c($t6)
/* f088c70: 544f000a */ bnel $v0,$t7,.L0f088c9c
/* f088c74: 8fb90074 */ lw $t9,0x74($sp)
/* f088c78: 0fc2866a */ jal handGetWeaponNum
/* f088c78: 0fc2866a */ jal bgunGetWeaponNum
/* f088c7c: 24040001 */ addiu $a0,$zero,0x1
/* f088c80: 8fb80074 */ lw $t8,0x74($sp)
/* f088c84: 9305005c */ lbu $a1,0x5c($t8)
/* f088c88: 50450004 */ beql $v0,$a1,.L0f088c9c
/* f088c8c: 8fb90074 */ lw $t9,0x74($sp)
/* f088c90: 0fc28824 */ jal currentPlayerEquipWeaponWrapper
/* f088c90: 0fc28824 */ jal bgunEquipWeapon2
/* f088c94: 24040001 */ addiu $a0,$zero,0x1
/* f088c98: 8fb90074 */ lw $t9,0x74($sp)
.L0f088c9c:
/* f088c9c: 00002825 */ or $a1,$zero,$zero
/* f088ca0: 0fc2a685 */ jal weaponGetAmmoType
/* f088ca0: 0fc2a685 */ jal bgunGetAmmoTypeForWeapon
/* f088ca4: 9324005c */ lbu $a0,0x5c($t9)
/* f088ca8: 1040001d */ beqz $v0,.L0f088d20
/* f088cac: afa2006c */ sw $v0,0x6c($sp)
@ -61293,13 +61293,13 @@ glabel var7f1aae70
/* f088cb4: 8fa40074 */ lw $a0,0x74($sp)
/* f088cb8: 18400019 */ blez $v0,.L0f088d20
/* f088cbc: afa20058 */ sw $v0,0x58($sp)
/* f088cc0: 0fc2a5dc */ jal currentPlayerGetAmmoCountWithCheck
/* f088cc0: 0fc2a5dc */ jal bgunGetAmmoCountWithCheck
/* f088cc4: 8fa4006c */ lw $a0,0x6c($sp)
/* f088cc8: 8fa4006c */ lw $a0,0x6c($sp)
/* f088ccc: 0fc2a5dc */ jal currentPlayerGetAmmoCountWithCheck
/* f088ccc: 0fc2a5dc */ jal bgunGetAmmoCountWithCheck
/* f088cd0: afa20054 */ sw $v0,0x54($sp)
/* f088cd4: 8fa4006c */ lw $a0,0x6c($sp)
/* f088cd8: 0fc2a63d */ jal ammotypeGetMaxCapacity
/* f088cd8: 0fc2a63d */ jal bgunGetCapacityByAmmotype
/* f088cdc: afa2003c */ sw $v0,0x3c($sp)
/* f088ce0: 8fa6003c */ lw $a2,0x3c($sp)
/* f088ce4: 8fa50054 */ lw $a1,0x54($sp)
@ -61307,7 +61307,7 @@ glabel var7f1aae70
/* f088cec: 00c2082a */ slt $at,$a2,$v0
/* f088cf0: 1020000b */ beqz $at,.L0f088d20
/* f088cf4: 00a92821 */ addu $a1,$a1,$t1
/* f088cf8: 0fc2a58a */ jal currentPlayerSetAmmoQuantity
/* f088cf8: 0fc2a58a */ jal bgunSetAmmoQuantity
/* f088cfc: 8fa4006c */ lw $a0,0x6c($sp)
/* f088d00: 8faa0070 */ lw $t2,0x70($sp)
/* f088d04: 8fab00a4 */ lw $t3,0xa4($sp)
@ -61327,19 +61327,19 @@ glabel var7f1aae70
/* f088d34: 0fc22095 */ jal weaponGetPickupAmmoQty
/* f088d38: 01802025 */ or $a0,$t4,$zero
/* f088d3c: afa20050 */ sw $v0,0x50($sp)
/* f088d40: 0fc2a5dc */ jal currentPlayerGetAmmoCountWithCheck
/* f088d40: 0fc2a5dc */ jal bgunGetAmmoCountWithCheck
/* f088d44: 2404000b */ addiu $a0,$zero,0xb
/* f088d48: 2404000b */ addiu $a0,$zero,0xb
/* f088d4c: 0fc2a63d */ jal ammotypeGetMaxCapacity
/* f088d4c: 0fc2a63d */ jal bgunGetCapacityByAmmotype
/* f088d50: afa2003c */ sw $v0,0x3c($sp)
/* f088d54: 8fa6003c */ lw $a2,0x3c($sp)
/* f088d58: 00c2082a */ slt $at,$a2,$v0
/* f088d5c: 5020000f */ beqzl $at,.L0f088d9c
/* f088d60: 8fb80074 */ lw $t8,0x74($sp)
/* f088d64: 0fc2a5dc */ jal currentPlayerGetAmmoCountWithCheck
/* f088d64: 0fc2a5dc */ jal bgunGetAmmoCountWithCheck
/* f088d68: 2404000b */ addiu $a0,$zero,0xb
/* f088d6c: 2404000b */ addiu $a0,$zero,0xb
/* f088d70: 0fc2a58a */ jal currentPlayerSetAmmoQuantity
/* f088d70: 0fc2a58a */ jal bgunSetAmmoQuantity
/* f088d74: 24450005 */ addiu $a1,$v0,0x5
/* f088d78: 8fae0070 */ lw $t6,0x70($sp)
/* f088d7c: 8faf00a4 */ lw $t7,0xa4($sp)
@ -61915,24 +61915,24 @@ glabel var7f1aae70
/* f088c54: 24010002 */ addiu $at,$zero,0x2
/* f088c58: 55a10010 */ bnel $t5,$at,.L0f088c9c
/* f088c5c: 8fb90074 */ lw $t9,0x74($sp)
/* f088c60: 0fc2866a */ jal handGetWeaponNum
/* f088c60: 0fc2866a */ jal bgunGetWeaponNum
/* f088c64: 00002025 */ or $a0,$zero,$zero
/* f088c68: 8fae0074 */ lw $t6,0x74($sp)
/* f088c6c: 91cf005c */ lbu $t7,0x5c($t6)
/* f088c70: 544f000a */ bnel $v0,$t7,.L0f088c9c
/* f088c74: 8fb90074 */ lw $t9,0x74($sp)
/* f088c78: 0fc2866a */ jal handGetWeaponNum
/* f088c78: 0fc2866a */ jal bgunGetWeaponNum
/* f088c7c: 24040001 */ addiu $a0,$zero,0x1
/* f088c80: 8fb80074 */ lw $t8,0x74($sp)
/* f088c84: 9305005c */ lbu $a1,0x5c($t8)
/* f088c88: 50450004 */ beql $v0,$a1,.L0f088c9c
/* f088c8c: 8fb90074 */ lw $t9,0x74($sp)
/* f088c90: 0fc28824 */ jal currentPlayerEquipWeaponWrapper
/* f088c90: 0fc28824 */ jal bgunEquipWeapon2
/* f088c94: 24040001 */ addiu $a0,$zero,0x1
/* f088c98: 8fb90074 */ lw $t9,0x74($sp)
.L0f088c9c:
/* f088c9c: 00002825 */ or $a1,$zero,$zero
/* f088ca0: 0fc2a685 */ jal weaponGetAmmoType
/* f088ca0: 0fc2a685 */ jal bgunGetAmmoTypeForWeapon
/* f088ca4: 9324005c */ lbu $a0,0x5c($t9)
/* f088ca8: 1040001d */ beqz $v0,.L0f088d20
/* f088cac: afa2006c */ sw $v0,0x6c($sp)
@ -61940,13 +61940,13 @@ glabel var7f1aae70
/* f088cb4: 8fa40074 */ lw $a0,0x74($sp)
/* f088cb8: 18400019 */ blez $v0,.L0f088d20
/* f088cbc: afa20058 */ sw $v0,0x58($sp)
/* f088cc0: 0fc2a5dc */ jal currentPlayerGetAmmoCountWithCheck
/* f088cc0: 0fc2a5dc */ jal bgunGetAmmoCountWithCheck
/* f088cc4: 8fa4006c */ lw $a0,0x6c($sp)
/* f088cc8: 8fa4006c */ lw $a0,0x6c($sp)
/* f088ccc: 0fc2a5dc */ jal currentPlayerGetAmmoCountWithCheck
/* f088ccc: 0fc2a5dc */ jal bgunGetAmmoCountWithCheck
/* f088cd0: afa20054 */ sw $v0,0x54($sp)
/* f088cd4: 8fa4006c */ lw $a0,0x6c($sp)
/* f088cd8: 0fc2a63d */ jal ammotypeGetMaxCapacity
/* f088cd8: 0fc2a63d */ jal bgunGetCapacityByAmmotype
/* f088cdc: afa2003c */ sw $v0,0x3c($sp)
/* f088ce0: 8fa6003c */ lw $a2,0x3c($sp)
/* f088ce4: 8fa50054 */ lw $a1,0x54($sp)
@ -61954,7 +61954,7 @@ glabel var7f1aae70
/* f088cec: 00c2082a */ slt $at,$a2,$v0
/* f088cf0: 1020000b */ beqz $at,.L0f088d20
/* f088cf4: 00a92821 */ addu $a1,$a1,$t1
/* f088cf8: 0fc2a58a */ jal currentPlayerSetAmmoQuantity
/* f088cf8: 0fc2a58a */ jal bgunSetAmmoQuantity
/* f088cfc: 8fa4006c */ lw $a0,0x6c($sp)
/* f088d00: 8faa0070 */ lw $t2,0x70($sp)
/* f088d04: 8fab00a4 */ lw $t3,0xa4($sp)
@ -61974,19 +61974,19 @@ glabel var7f1aae70
/* f088d34: 0fc22095 */ jal weaponGetPickupAmmoQty
/* f088d38: 01802025 */ or $a0,$t4,$zero
/* f088d3c: afa20050 */ sw $v0,0x50($sp)
/* f088d40: 0fc2a5dc */ jal currentPlayerGetAmmoCountWithCheck
/* f088d40: 0fc2a5dc */ jal bgunGetAmmoCountWithCheck
/* f088d44: 2404000b */ addiu $a0,$zero,0xb
/* f088d48: 2404000b */ addiu $a0,$zero,0xb
/* f088d4c: 0fc2a63d */ jal ammotypeGetMaxCapacity
/* f088d4c: 0fc2a63d */ jal bgunGetCapacityByAmmotype
/* f088d50: afa2003c */ sw $v0,0x3c($sp)
/* f088d54: 8fa6003c */ lw $a2,0x3c($sp)
/* f088d58: 00c2082a */ slt $at,$a2,$v0
/* f088d5c: 5020000f */ beqzl $at,.L0f088d9c
/* f088d60: 8fb80074 */ lw $t8,0x74($sp)
/* f088d64: 0fc2a5dc */ jal currentPlayerGetAmmoCountWithCheck
/* f088d64: 0fc2a5dc */ jal bgunGetAmmoCountWithCheck
/* f088d68: 2404000b */ addiu $a0,$zero,0xb
/* f088d6c: 2404000b */ addiu $a0,$zero,0xb
/* f088d70: 0fc2a58a */ jal currentPlayerSetAmmoQuantity
/* f088d70: 0fc2a58a */ jal bgunSetAmmoQuantity
/* f088d74: 24450005 */ addiu $a1,$v0,0x5
/* f088d78: 8fae0070 */ lw $t6,0x70($sp)
/* f088d7c: 8faf00a4 */ lw $t7,0xa4($sp)
@ -62336,22 +62336,22 @@ glabel var7f1aae70
//
// // c50
// if (count == 2
// && handGetWeaponNum(HAND_RIGHT) == weapon->weaponnum
// && handGetWeaponNum(HAND_LEFT) != weapon->weaponnum) {
// currentPlayerEquipWeaponWrapper(HAND_LEFT, weapon->weaponnum);
// && bgunGetWeaponNum(HAND_RIGHT) == weapon->weaponnum
// && bgunGetWeaponNum(HAND_LEFT) != weapon->weaponnum) {
// bgunEquipWeapon2(HAND_LEFT, weapon->weaponnum);
// }
//
// // c9c
// ammotype = weaponGetAmmoType(weapon->weaponnum, 0);
// ammotype = bgunGetAmmoTypeForWeapon(weapon->weaponnum, 0);
//
// if (ammotype) {
// s32 pickupqty = weaponGetPickupAmmoQty(weapon);
//
// if (pickupqty > 0) {
// s32 heldqty = currentPlayerGetAmmoCountWithCheck(ammotype);
// s32 heldqty = bgunGetAmmoCountWithCheck(ammotype);
//
// if (currentPlayerGetAmmoCountWithCheck(ammotype) < ammotypeGetMaxCapacity(ammotype)) {
// currentPlayerSetAmmoQuantity(ammotype, heldqty + pickupqty);
// if (bgunGetAmmoCountWithCheck(ammotype) < bgunGetCapacityByAmmotype(ammotype)) {
// bgunSetAmmoQuantity(ammotype, heldqty + pickupqty);
//
// if (sp112 == false && showhudmsg) {
// currentPlayerQueuePickupAmmoHudmsg(ammotype, pickupqty);
@ -62364,10 +62364,10 @@ glabel var7f1aae70
// if (weapon->weaponnum == WEAPON_SUPERDRAGON) {
// s32 pickupqty = weaponGetPickupAmmoQty(weapon);
//
// if (currentPlayerGetAmmoCountWithCheck(AMMOTYPE_DEVASTATOR) < ammotypeGetMaxCapacity(AMMOTYPE_DEVASTATOR)) {
// s32 heldqty = currentPlayerGetAmmoCountWithCheck(AMMOTYPE_DEVASTATOR);
// if (bgunGetAmmoCountWithCheck(AMMOTYPE_DEVASTATOR) < bgunGetCapacityByAmmotype(AMMOTYPE_DEVASTATOR)) {
// s32 heldqty = bgunGetAmmoCountWithCheck(AMMOTYPE_DEVASTATOR);
//
// currentPlayerSetAmmoQuantity(AMMOTYPE_DEVASTATOR, heldqty + 5);
// bgunSetAmmoQuantity(AMMOTYPE_DEVASTATOR, heldqty + 5);
//
// if (sp112 == false && showhudmsg) {
// currentPlayerQueuePickupAmmoHudmsg(AMMOTYPE_DEVASTATOR, pickupqty);
@ -62565,15 +62565,15 @@ s32 objTestForPickup(struct prop *prop)
}
}
if (invHasSingleWeaponExcAllGuns(weapon->weaponnum) && weaponGetAmmoType(weapon->weaponnum, FUNC_PRIMARY)) {
if (invHasSingleWeaponExcAllGuns(weapon->weaponnum) && bgunGetAmmoTypeForWeapon(weapon->weaponnum, FUNC_PRIMARY)) {
if (cheatIsActive(CHEAT_UNLIMITEDAMMO) || cheatIsActive(CHEAT_UNLIMITEDAMMONORELOADS)) {
maybe = false;
} else {
maybe = currentPlayerGetAmmoQuantityForWeapon(weapon->weaponnum, FUNC_PRIMARY) >= weaponGetAmmoCapacity(weapon->weaponnum, FUNC_PRIMARY);
maybe = bgunGetAmmoQtyForWeapon(weapon->weaponnum, FUNC_PRIMARY) >= bgunGetAmmoCapacityForWeapon(weapon->weaponnum, FUNC_PRIMARY);
}
if (weapon->weaponnum == WEAPON_SUPERDRAGON) {
if (currentPlayerGetAmmoQuantityForWeapon(weapon->weaponnum, FUNC_SECONDARY) < weaponGetAmmoCapacity(weapon->weaponnum, FUNC_SECONDARY)) {
if (bgunGetAmmoQtyForWeapon(weapon->weaponnum, FUNC_SECONDARY) < bgunGetAmmoCapacityForWeapon(weapon->weaponnum, FUNC_SECONDARY)) {
maybe = false;
}
}
@ -62613,7 +62613,7 @@ s32 objTestForPickup(struct prop *prop)
} else if (obj->type == OBJTYPE_AMMOCRATE) {
struct ammocrateobj *crate = (struct ammocrateobj *) prop->obj;
if (currentPlayerGetAmmoCountWithCheck(crate->ammotype) >= ammotypeGetMaxCapacity(crate->ammotype)) {
if (bgunGetAmmoCountWithCheck(crate->ammotype) >= bgunGetCapacityByAmmotype(crate->ammotype)) {
if ((crate->ammotype != AMMOTYPE_GRENADE || invHasSingleWeaponExcAllGuns(WEAPON_GRENADE))
&& (crate->ammotype != AMMOTYPE_CLOAK || invHasSingleWeaponExcAllGuns(WEAPON_CLOAKINGDEVICE))
&& (crate->ammotype != AMMOTYPE_BOOST || invHasSingleWeaponExcAllGuns(WEAPON_COMBATBOOST))
@ -62638,7 +62638,7 @@ s32 objTestForPickup(struct prop *prop)
s32 ammotype = i + 1;
if (crate->slots[i].quantity > 0) {
if (currentPlayerGetAmmoCountWithCheck(ammotype) < ammotypeGetMaxCapacity(ammotype)) {
if (bgunGetAmmoCountWithCheck(ammotype) < bgunGetCapacityByAmmotype(ammotype)) {
ignore = false;
break;
}
@ -64051,7 +64051,7 @@ void playerActivateRemoteMineDetonator(s32 playernum)
sndStart(var80095200, SFX_DETONATE, 0, -1, -1, -1, -1, -1);
playerDetonateRemoteMines(playernum);
bgunDetonateRemoteMines(playernum);
}
struct weaponobj *func0f08aa70(s32 weaponnum, struct prop *prop)
@ -64411,7 +64411,7 @@ struct autogunobj *laptopDeploy(s32 modelnum, struct gset *gset, struct chrdata
s32 prevplayernum = g_Vars.currentplayernum;
setCurrentPlayerNum(propGetPlayerNum(chr->prop));
qty = currentPlayerGetAmmoQuantityForWeapon(WEAPON_LAPTOPGUN, FUNC_PRIMARY);
qty = bgunGetAmmoQtyForWeapon(WEAPON_LAPTOPGUN, FUNC_PRIMARY);
if (qty >= 200) {
laptop->ammoquantity = 200;
@ -64425,7 +64425,7 @@ struct autogunobj *laptopDeploy(s32 modelnum, struct gset *gset, struct chrdata
qty -= laptop->ammoquantity;
}
currentPlayerSetAmmoQtyForWeapon(WEAPON_LAPTOPGUN, FUNC_PRIMARY, qty);
bgunSetAmmoQtyForWeapon(WEAPON_LAPTOPGUN, FUNC_PRIMARY, qty);
setCurrentPlayerNum(prevplayernum);
} else {
laptop->ammoquantity = 255;
@ -68871,14 +68871,14 @@ Gfx *countdownTimerRender(Gfx *gdl)
ms = (s32)floorf(value60 * 1.6666666269302f) - mins * 6000 - secs * 100;
gdl = func0f153628(gdl);
gdl = handRenderHudInteger(gdl, (mins % 100) / 10, viewright - 18, HUDHALIGN_MIDDLE, y, HUDVALIGN_MIDDLE, 0x00ff00a0);
gdl = handRenderHudInteger(gdl, mins % 10, viewright - 14, HUDHALIGN_MIDDLE, y, HUDVALIGN_MIDDLE, 0x00ff00a0);
gdl = handRenderHudString(gdl, fmt, viewright - 8, HUDHALIGN_MIDDLE, y, HUDVALIGN_MIDDLE, 0x00ff00a0);
gdl = handRenderHudInteger(gdl, (secs % 60) / 10, viewright - 2, HUDHALIGN_MIDDLE, y, HUDVALIGN_MIDDLE, 0x00ff00a0);
gdl = handRenderHudInteger(gdl, secs % 10, viewright + 2, HUDHALIGN_MIDDLE, y, HUDVALIGN_MIDDLE, 0x00ff00a0);
gdl = handRenderHudString(gdl, fmt, viewright + 8, HUDHALIGN_MIDDLE, y, HUDVALIGN_MIDDLE, 0x00ff00a0);
gdl = handRenderHudInteger(gdl, (ms % 100) / 10, viewright + 14, HUDHALIGN_MIDDLE, y, HUDVALIGN_MIDDLE, 0x00ff00a0);
gdl = handRenderHudInteger(gdl, ms % 10, viewright + 18, HUDHALIGN_MIDDLE, y, HUDVALIGN_MIDDLE, 0x00ff00a0);
gdl = bgunRenderHudInteger(gdl, (mins % 100) / 10, viewright - 18, HUDHALIGN_MIDDLE, y, HUDVALIGN_MIDDLE, 0x00ff00a0);
gdl = bgunRenderHudInteger(gdl, mins % 10, viewright - 14, HUDHALIGN_MIDDLE, y, HUDVALIGN_MIDDLE, 0x00ff00a0);
gdl = bgunRenderHudString(gdl, fmt, viewright - 8, HUDHALIGN_MIDDLE, y, HUDVALIGN_MIDDLE, 0x00ff00a0);
gdl = bgunRenderHudInteger(gdl, (secs % 60) / 10, viewright - 2, HUDHALIGN_MIDDLE, y, HUDVALIGN_MIDDLE, 0x00ff00a0);
gdl = bgunRenderHudInteger(gdl, secs % 10, viewright + 2, HUDHALIGN_MIDDLE, y, HUDVALIGN_MIDDLE, 0x00ff00a0);
gdl = bgunRenderHudString(gdl, fmt, viewright + 8, HUDHALIGN_MIDDLE, y, HUDVALIGN_MIDDLE, 0x00ff00a0);
gdl = bgunRenderHudInteger(gdl, (ms % 100) / 10, viewright + 14, HUDHALIGN_MIDDLE, y, HUDVALIGN_MIDDLE, 0x00ff00a0);
gdl = bgunRenderHudInteger(gdl, ms % 10, viewright + 18, HUDHALIGN_MIDDLE, y, HUDVALIGN_MIDDLE, 0x00ff00a0);
gdl = func0f153780(gdl);
}
@ -69033,7 +69033,7 @@ void func0f0910ac(void)
}
#if VERSION >= VERSION_NTSC_1_0
if (!weaponIsMissionCritical(i)) {
if (!bgunIsMissionCritical(i)) {
func0f091250(i);
}
#else
@ -69371,7 +69371,7 @@ glabel var7f1ab214
/* f091738: e7b20130 */ swc1 $f18,0x130($sp)
/* f09173c: 46005182 */ mul.s $f6,$f10,$f0
/* f091740: e7a80134 */ swc1 $f8,0x134($sp)
/* f091744: 0fc27af3 */ jal func0f09ebcc
/* f091744: 0fc27af3 */ jal bgun0f09ebcc
/* f091748: e7a60138 */ swc1 $f6,0x138($sp)
/* f09174c: 8fa3017c */ lw $v1,0x17c($sp)
/* f091750: 8c790040 */ lw $t9,0x40($v1)
@ -69583,7 +69583,7 @@ glabel var7f1ab214
.L0f091a70:
/* f091a70: 27a40094 */ addiu $a0,$sp,0x94
/* f091a74: 8fa50214 */ lw $a1,0x214($sp)
/* f091a78: 0fc29f66 */ jal gsetPlayPropHitSound
/* f091a78: 0fc29f66 */ jal bgunPlayPropHitSound
/* f091a7c: 2406ffff */ addiu $a2,$zero,-1
/* f091a80: 0fc2c74a */ jal gsetGetDamage
/* f091a84: 27a40094 */ addiu $a0,$sp,0x94
@ -69632,7 +69632,7 @@ glabel var7f1ab214
/* f091b24: afa9006c */ sw $t1,0x6c($sp)
/* f091b28: 27a40094 */ addiu $a0,$sp,0x94
/* f091b2c: 01002825 */ or $a1,$t0,$zero
/* f091b30: 0fc29f66 */ jal gsetPlayPropHitSound
/* f091b30: 0fc29f66 */ jal bgunPlayPropHitSound
/* f091b34: 2406ffff */ addiu $a2,$zero,-1
.L0f091b38:
/* f091b38: 8fab006c */ lw $t3,0x6c($sp)
@ -69702,7 +69702,7 @@ glabel var7f1ab214
/* f091c28: afb80068 */ sw $t8,0x68($sp)
/* f091c2c: 27a40094 */ addiu $a0,$sp,0x94
/* f091c30: 01e02825 */ or $a1,$t7,$zero
/* f091c34: 0fc29f66 */ jal gsetPlayPropHitSound
/* f091c34: 0fc29f66 */ jal bgunPlayPropHitSound
/* f091c38: 2406ffff */ addiu $a2,$zero,-1
.L0f091c3c:
/* f091c3c: 8fa40208 */ lw $a0,0x208($sp)
@ -69753,7 +69753,7 @@ glabel var7f1ab214
/* f091cec: 11a10004 */ beq $t5,$at,.L0f091d00
/* f091cf0: 27a501f0 */ addiu $a1,$sp,0x1f0
/* f091cf4: 2406ffff */ addiu $a2,$zero,-1
/* f091cf8: 0fc2a132 */ jal func0f0a84c8
/* f091cf8: 0fc2a132 */ jal bgun0f0a84c8
/* f091cfc: 27a701c8 */ addiu $a3,$sp,0x1c8
.L0f091d00:
/* f091d00: 87a401c8 */ lh $a0,0x1c8($sp)
@ -70100,7 +70100,7 @@ glabel var7f1ab214
/* f091738: e7b20130 */ swc1 $f18,0x130($sp)
/* f09173c: 46005182 */ mul.s $f6,$f10,$f0
/* f091740: e7a80134 */ swc1 $f8,0x134($sp)
/* f091744: 0fc27af3 */ jal func0f09ebcc
/* f091744: 0fc27af3 */ jal bgun0f09ebcc
/* f091748: e7a60138 */ swc1 $f6,0x138($sp)
/* f09174c: 8fa3017c */ lw $v1,0x17c($sp)
/* f091750: 8c790040 */ lw $t9,0x40($v1)
@ -70312,7 +70312,7 @@ glabel var7f1ab214
.L0f091a70:
/* f091a70: 27a40094 */ addiu $a0,$sp,0x94
/* f091a74: 8fa50214 */ lw $a1,0x214($sp)
/* f091a78: 0fc29f66 */ jal gsetPlayPropHitSound
/* f091a78: 0fc29f66 */ jal bgunPlayPropHitSound
/* f091a7c: 2406ffff */ addiu $a2,$zero,-1
/* f091a80: 0fc2c74a */ jal gsetGetDamage
/* f091a84: 27a40094 */ addiu $a0,$sp,0x94
@ -70361,7 +70361,7 @@ glabel var7f1ab214
/* f091b24: afa9006c */ sw $t1,0x6c($sp)
/* f091b28: 27a40094 */ addiu $a0,$sp,0x94
/* f091b2c: 01002825 */ or $a1,$t0,$zero
/* f091b30: 0fc29f66 */ jal gsetPlayPropHitSound
/* f091b30: 0fc29f66 */ jal bgunPlayPropHitSound
/* f091b34: 2406ffff */ addiu $a2,$zero,-1
.L0f091b38:
/* f091b38: 8fab006c */ lw $t3,0x6c($sp)
@ -70431,7 +70431,7 @@ glabel var7f1ab214
/* f091c28: afb80068 */ sw $t8,0x68($sp)
/* f091c2c: 27a40094 */ addiu $a0,$sp,0x94
/* f091c30: 01e02825 */ or $a1,$t7,$zero
/* f091c34: 0fc29f66 */ jal gsetPlayPropHitSound
/* f091c34: 0fc29f66 */ jal bgunPlayPropHitSound
/* f091c38: 2406ffff */ addiu $a2,$zero,-1
.L0f091c3c:
/* f091c3c: 8fa40208 */ lw $a0,0x208($sp)
@ -70482,7 +70482,7 @@ glabel var7f1ab214
/* f091cec: 11a10004 */ beq $t5,$at,.L0f091d00
/* f091cf0: 27a501f0 */ addiu $a1,$sp,0x1f0
/* f091cf4: 2406ffff */ addiu $a2,$zero,-1
/* f091cf8: 0fc2a132 */ jal func0f0a84c8
/* f091cf8: 0fc2a132 */ jal bgun0f0a84c8
/* f091cfc: 27a701c8 */ addiu $a3,$sp,0x1c8
.L0f091d00:
/* f091d00: 87a401c8 */ lh $a0,0x1c8($sp)

4
src/game/sight.c
View File

@ -1,7 +1,7 @@
#include <ultra64.h>
#include "constants.h"
#include "game/chr/chraction.h"
#include "game/game_097ba0.h"
#include "game/bondgun.h"
#include "game/game_0b0fd0.h"
#include "game/game_0b2150.h"
#include "game/game_0b3350.h"
@ -98,7 +98,7 @@ bool sightCanTargetProp(struct prop *prop, s32 max)
return true;
}
if (handGetWeaponNum(HAND_RIGHT) == WEAPON_ROCKETLAUNCHER) {
if (bgunGetWeaponNum(HAND_RIGHT) == WEAPON_ROCKETLAUNCHER) {
return true;
}

4
src/game/title.c
View File

@ -2,7 +2,7 @@
#include "constants.h"
#include "game/title.h"
#include "game/game_01afc0.h"
#include "game/game_097ba0.h"
#include "game/bondgun.h"
#include "game/game_0b28d0.h"
#include "game/game_0b3350.h"
#include "game/inventory/inventory.h"
@ -228,7 +228,7 @@ char *mpPlayerGetWeaponOfChoiceName(u32 playernum, u32 slot)
weapon = slot == 1 ? weapon2 : weapon1;
name = weaponGetName(weapon);
name = bgunGetName(weapon);
setCurrentPlayerNum(prevplayernum);
return name;

16
src/game/training/menus.c
View File

@ -2,7 +2,7 @@
#include "constants.h"
#include "game/chr/chraction.h"
#include "game/ceil.h"
#include "game/game_097ba0.h"
#include "game/bondgun.h"
#include "game/game_0b0fd0.h"
#include "game/game_0b3350.h"
#include "game/game_0e0770.h"
@ -50,8 +50,8 @@ s32 frDetailsOkMenuHandler(s32 operation, struct menuitem *item, union handlerda
invSetCurrentIndex(1);
if (handGetWeaponNum(HAND_RIGHT) != weapon) {
currentPlayerEquipWeaponWrapper(HAND_RIGHT, weapon);
if (bgunGetWeaponNum(HAND_RIGHT) != weapon) {
bgunEquipWeapon2(HAND_RIGHT, weapon);
}
g_FrWeaponNum = weapon;
@ -216,7 +216,7 @@ glabel var7f1b9940
/* f1a35e0: 0fc54d8a */ jal func0f153628
/* f1a35e4: afb80080 */ sw $t8,0x80($sp)
/* f1a35e8: afa2009c */ sw $v0,0x9c($sp)
/* f1a35ec: 0fc28857 */ jal weaponGetName
/* f1a35ec: 0fc28857 */ jal bgunGetName
/* f1a35f0: 8fa40090 */ lw $a0,0x90($sp)
/* f1a35f4: 0c002f02 */ jal viGetWidth
/* f1a35f8: afa20044 */ sw $v0,0x44($sp)
@ -631,7 +631,7 @@ glabel var7f1b3f60nb
/* f19d664: 0fc5374a */ jal func0f153628
/* f19d668: afaf0080 */ sw $t7,0x80($sp)
/* f19d66c: afa2009c */ sw $v0,0x9c($sp)
/* f19d670: 0fc27fb6 */ jal weaponGetName
/* f19d670: 0fc27fb6 */ jal bgunGetName
/* f19d674: 8fa40090 */ lw $a0,0x90($sp)
/* f19d678: 0c002f77 */ jal viGetWidth
/* f19d67c: afa20044 */ sw $v0,0x44($sp)
@ -1069,7 +1069,7 @@ char *frMenuTextGoalScoreValueUnconditional(struct menuitem *item)
char *frMenuTextWeaponName(struct menuitem *item)
{
return weaponGetName(frGetWeaponBySlot(frGetSlot()));
return bgunGetName(frGetWeaponBySlot(frGetSlot()));
}
char *frMenuTextTargetsDestroyedValue(struct menuitem *item)
@ -4888,7 +4888,7 @@ s32 dtDeviceListMenuHandler(s32 operation, struct menuitem *item, union handlerd
data->list.value = dtGetNumAvailable();
break;
case MENUOP_GETOPTIONTEXT:
return (s32) weaponGetName(dtGetWeaponByDeviceIndex(dtGetIndexBySlot(data->list.value)));
return (s32) bgunGetName(dtGetWeaponByDeviceIndex(dtGetIndexBySlot(data->list.value)));
case MENUOP_SET:
g_DtSlot = data->list.value;
menuPushDialog(&g_DtDetailsMenuDialog);
@ -4913,7 +4913,7 @@ char *dtMenuTextName(struct menuitem *item)
{
u32 weaponnum = dtGetWeaponByDeviceIndex(dtGetIndexBySlot(g_DtSlot));
return weaponGetName(weaponnum);
return bgunGetName(weaponnum);
}
s32 menuhandlerDtOkOrResume(s32 operation, struct menuitem *item, union handlerdata *data)

134
src/game/training/training.c
View File

@ -6,7 +6,7 @@
#include "game/game_092610.h"
#include "game/game_095320.h"
#include "game/atan2f.h"
#include "game/game_097ba0.h"
#include "game/bondgun.h"
#include "game/game_0b0fd0.h"
#include "game/game_0b69d0.h"
#include "game/hudmsg.h"
@ -809,9 +809,9 @@ glabel var7f1b93ec
/* f19dbb8: 0fc6749a */ jal frGetWeaponBySlot
/* f19dbbc: 96040456 */ lhu $a0,0x456($s0)
/* f19dbc0: 00402025 */ or $a0,$v0,$zero
/* f19dbc4: 0fc2a685 */ jal weaponGetAmmoType
/* f19dbc4: 0fc2a685 */ jal bgunGetAmmoTypeForWeapon
/* f19dbc8: 00002825 */ or $a1,$zero,$zero
/* f19dbcc: 0fc2a63d */ jal ammotypeGetMaxCapacity
/* f19dbcc: 0fc2a63d */ jal bgunGetCapacityByAmmotype
/* f19dbd0: 00402025 */ or $a0,$v0,$zero
/* f19dbd4: 920f0448 */ lbu $t7,0x448($s0)
/* f19dbd8: 26310004 */ addiu $s1,$s1,0x4
@ -833,7 +833,7 @@ glabel var7f1b93ec
.L0f19dc14:
/* f19dc14: 10000073 */ b .L0f19dde4
/* f19dc18: 92220000 */ lbu $v0,0x0($s1)
/* f19dc1c: 0fc2a63d */ jal ammotypeGetMaxCapacity
/* f19dc1c: 0fc2a63d */ jal bgunGetCapacityByAmmotype
/* f19dc20: 2404000b */ addiu $a0,$zero,0xb
/* f19dc24: 92080448 */ lbu $t0,0x448($s0)
/* f19dc28: 26310004 */ addiu $s1,$s1,0x4
@ -1045,7 +1045,7 @@ glabel var7f1b93ec
// offset += 4;
// break;
// case FRCMD_SETAMMOLIMIT: // f19dbb8
// capacity = ammotypeGetMaxCapacity(weaponGetAmmoType(frGetWeaponBySlot(g_FrData.slot), 0));
// capacity = bgunGetCapacityByAmmotype(bgunGetAmmoTypeForWeapon(frGetWeaponBySlot(g_FrData.slot), 0));
// g_FrData.ammolimit = script[offset + 1 + g_FrData.difficulty];
//
// if (g_FrData.ammolimit != 255) {
@ -1059,7 +1059,7 @@ glabel var7f1b93ec
// offset += 4;
// break;
// case FRCMD_SETGRENADELIMIT: // f19dc1c
// capacity = ammotypeGetMaxCapacity(AMMOTYPE_DEVASTATOR);
// capacity = bgunGetCapacityByAmmotype(AMMOTYPE_DEVASTATOR);
// g_FrData.sdgrenadelimit = script[offset + 1 + g_FrData.difficulty];
//
// if (g_FrData.sdgrenadelimit != 255) {
@ -2502,24 +2502,24 @@ glabel frLoadData
u32 frInitAmmo(s32 weaponnum)
{
u32 scriptindex;
u32 ammotype = weaponGetAmmoType(weaponnum, 0);
u32 capacity = ammotypeGetMaxCapacity(ammotype);
u32 ammotype = bgunGetAmmoTypeForWeapon(weaponnum, 0);
u32 capacity = bgunGetCapacityByAmmotype(ammotype);
frInitDefaults();
scriptindex = frGetWeaponScriptIndex(weaponnum);
frExecuteWeaponScript(scriptindex);
if (g_FrData.ammolimit == 255) {
currentPlayerSetAmmoQuantity(ammotype, capacity);
bgunSetAmmoQuantity(ammotype, capacity);
} else {
currentPlayerSetAmmoQuantity(ammotype, g_FrData.ammolimit);
bgunSetAmmoQuantity(ammotype, g_FrData.ammolimit);
}
if (weaponnum == WEAPON_SUPERDRAGON) {
if (g_FrData.sdgrenadelimit == 255) {
currentPlayerSetAmmoQuantity(AMMOTYPE_DEVASTATOR, capacity);
bgunSetAmmoQuantity(AMMOTYPE_DEVASTATOR, capacity);
} else {
currentPlayerSetAmmoQuantity(AMMOTYPE_DEVASTATOR, g_FrData.sdgrenadelimit);
bgunSetAmmoQuantity(AMMOTYPE_DEVASTATOR, g_FrData.sdgrenadelimit);
}
}
@ -2546,7 +2546,7 @@ void frBeginSession(s32 weapon)
g_FrIsValidWeapon = frInitAmmo(weapon) == 0 ? false : true;
frInitTargets();
playersSetPassiveMode(false);
bgunSetPassiveMode(false);
}
char *frGetWeaponDescription(void)
@ -2652,7 +2652,7 @@ void frEndSession(bool hidetargets)
g_Vars.currentplayer->visionmode = VISIONMODE_NORMAL;
}
playersSetPassiveMode(true);
bgunSetPassiveMode(true);
g_FrIsValidWeapon = 0;
@ -2885,8 +2885,8 @@ bool frIsAmmoWasted(void)
{
s32 weaponnum = frGetWeaponBySlot(g_FrData.slot);
s32 i;
s32 priammotype = weaponGetAmmoType(weaponnum, 0);
s32 secammotype = weaponGetAmmoType(weaponnum, 1);
s32 priammotype = bgunGetAmmoTypeForWeapon(weaponnum, 0);
s32 secammotype = bgunGetAmmoTypeForWeapon(weaponnum, 1);
struct hand *hand0 = &g_Vars.currentplayer->hands[0];
struct hand *hand1 = &g_Vars.currentplayer->hands[1];
s32 ammoloaded[2];
@ -2909,8 +2909,8 @@ bool frIsAmmoWasted(void)
// Check if player has ammo
ammoloaded[0] = hand0->loadedammo[0] + hand1->loadedammo[0];
ammoloaded[1] = hand0->loadedammo[1] + hand1->loadedammo[1];
ammototal[0] = currentPlayerGetAmmoCountWithCheck(priammotype) + ammoloaded[0];
ammototal[1] = currentPlayerGetAmmoCountWithCheck(secammotype) + ammoloaded[1];
ammototal[0] = bgunGetAmmoCountWithCheck(priammotype) + ammoloaded[0];
ammototal[1] = bgunGetAmmoCountWithCheck(secammotype) + ammoloaded[1];
if (ammototal[0] <= 0 && ammototal[1] <= 0) {
// Don't do any further checks if this is the first frame where we've
@ -2984,10 +2984,10 @@ bool frIsAmmoWasted(void)
if (g_FrData.proxyendtimer == 0) {
// Initial state - set the timer to 5 seconds if player is now out of mines
ammotype = weaponGetAmmoType(weaponnum, 0);
ammotype = bgunGetAmmoTypeForWeapon(weaponnum, 0);
hand = &g_Vars.currentplayer->hands[HAND_RIGHT];
if (currentPlayerGetAmmoCountWithCheck(ammotype) + hand->loadedammo[0] == 0) {
if (bgunGetAmmoCountWithCheck(ammotype) + hand->loadedammo[0] == 0) {
g_FrData.proxyendtimer = PALDOWN(300);
}
@ -3079,7 +3079,7 @@ glabel var7f1b94e4
/* f1a0b1c: 00000000 */ nop
/* f1a0b20: 0fc678da */ jal frGetWeaponBySlot
/* f1a0b24: 96a40456 */ lhu $a0,0x456($s5)
/* f1a0b28: 0fc28728 */ jal currentPlayerEquipWeapon
/* f1a0b28: 0fc28728 */ jal bgunEquipWeapon
/* f1a0b2c: 00402025 */ move $a0,$v0
.PF0f1a0b30:
/* f1a0b30: 3c15800b */ lui $s5,0x800b
@ -3304,10 +3304,10 @@ glabel var7f1b94e4
/* f1a0e54: 96a40456 */ lhu $a0,0x456($s5)
/* f1a0e58: 00409025 */ move $s2,$v0
/* f1a0e5c: 00402025 */ move $a0,$v0
/* f1a0e60: 0fc2a798 */ jal weaponGetAmmoType
/* f1a0e60: 0fc2a798 */ jal bgunGetAmmoTypeForWeapon
/* f1a0e64: 00002825 */ move $a1,$zero
/* f1a0e68: 00408825 */ move $s1,$v0
/* f1a0e6c: 0fc2a750 */ jal ammotypeGetMaxCapacity
/* f1a0e6c: 0fc2a750 */ jal bgunGetCapacityByAmmotype
/* f1a0e70: 00402025 */ move $a0,$v0
/* f1a0e74: 00408025 */ move $s0,$v0
/* f1a0e78: 02402025 */ move $a0,$s2
@ -3323,7 +3323,7 @@ glabel var7f1b94e4
/* f1a0e9c: 2401ffff */ li $at,-1
/* f1a0ea0: 18400011 */ blez $v0,.PF0f1a0ee8
/* f1a0ea4: 00000000 */ nop
/* f1a0ea8: 0fc2a6ef */ jal currentPlayerGetAmmoCountWithCheck
/* f1a0ea8: 0fc2a6ef */ jal bgunGetAmmoCountWithCheck
/* f1a0eac: 02202025 */ move $a0,$s1
/* f1a0eb0: 92a3045a */ lbu $v1,0x45a($s5)
/* f1a0eb4: 86ae0476 */ lh $t6,0x476($s5)
@ -3336,28 +3336,28 @@ glabel var7f1b94e4
/* f1a0ed0: 00000000 */ nop
/* f1a0ed4: a6a00476 */ sh $zero,0x476($s5)
.PF0f1a0ed8:
/* f1a0ed8: 0fc2a69d */ jal currentPlayerSetAmmoQuantity
/* f1a0ed8: 0fc2a69d */ jal bgunSetAmmoQuantity
/* f1a0edc: 02202025 */ move $a0,$s1
/* f1a0ee0: 10000006 */ b .PF0f1a0efc
/* f1a0ee4: 24010012 */ li $at,0x12
.PF0f1a0ee8:
/* f1a0ee8: 14410003 */ bne $v0,$at,.PF0f1a0ef8
/* f1a0eec: 02202025 */ move $a0,$s1
/* f1a0ef0: 0fc2a69d */ jal currentPlayerSetAmmoQuantity
/* f1a0ef0: 0fc2a69d */ jal bgunSetAmmoQuantity
/* f1a0ef4: 02002825 */ move $a1,$s0
.PF0f1a0ef8:
/* f1a0ef8: 24010012 */ li $at,0x12
.PF0f1a0efc:
/* f1a0efc: 5641001d */ bnel $s2,$at,.PF0f1a0f74
/* f1a0f00: a2a0045a */ sb $zero,0x45a($s5)
/* f1a0f04: 0fc2a750 */ jal ammotypeGetMaxCapacity
/* f1a0f04: 0fc2a750 */ jal bgunGetCapacityByAmmotype
/* f1a0f08: 2404000b */ li $a0,0xb
/* f1a0f0c: 86a30478 */ lh $v1,0x478($s5)
/* f1a0f10: 00408025 */ move $s0,$v0
/* f1a0f14: 2401ffff */ li $at,-1
/* f1a0f18: 18600011 */ blez $v1,.PF0f1a0f60
/* f1a0f1c: 00000000 */ nop
/* f1a0f20: 0fc2a6ef */ jal currentPlayerGetAmmoCountWithCheck
/* f1a0f20: 0fc2a6ef */ jal bgunGetAmmoCountWithCheck
/* f1a0f24: 2404000b */ li $a0,0xb
/* f1a0f28: 92a3045a */ lbu $v1,0x45a($s5)
/* f1a0f2c: 86b90478 */ lh $t9,0x478($s5)
@ -3370,14 +3370,14 @@ glabel var7f1b94e4
/* f1a0f48: 00000000 */ nop
/* f1a0f4c: a6a00478 */ sh $zero,0x478($s5)
.PF0f1a0f50:
/* f1a0f50: 0fc2a69d */ jal currentPlayerSetAmmoQuantity
/* f1a0f50: 0fc2a69d */ jal bgunSetAmmoQuantity
/* f1a0f54: 2404000b */ li $a0,0xb
/* f1a0f58: 10000006 */ b .PF0f1a0f74
/* f1a0f5c: a2a0045a */ sb $zero,0x45a($s5)
.PF0f1a0f60:
/* f1a0f60: 14610003 */ bne $v1,$at,.PF0f1a0f70
/* f1a0f64: 2404000b */ li $a0,0xb
/* f1a0f68: 0fc2a69d */ jal currentPlayerSetAmmoQuantity
/* f1a0f68: 0fc2a69d */ jal bgunSetAmmoQuantity
/* f1a0f6c: 02002825 */ move $a1,$s0
.PF0f1a0f70:
/* f1a0f70: a2a0045a */ sb $zero,0x45a($s5)
@ -4179,7 +4179,7 @@ glabel var7f1b94e4
/* f19fa08: 00000000 */ nop
/* f19fa0c: 0fc6749a */ jal frGetWeaponBySlot
/* f19fa10: 96a40456 */ lhu $a0,0x456($s5)
/* f19fa14: 0fc2865b */ jal currentPlayerEquipWeapon
/* f19fa14: 0fc2865b */ jal bgunEquipWeapon
/* f19fa18: 00402025 */ or $a0,$v0,$zero
.L0f19fa1c:
/* f19fa1c: 3c15800b */ lui $s5,%hi(g_FrData)
@ -4404,10 +4404,10 @@ glabel var7f1b94e4
/* f19fd40: 96a40456 */ lhu $a0,0x456($s5)
/* f19fd44: 00409025 */ or $s2,$v0,$zero
/* f19fd48: 00402025 */ or $a0,$v0,$zero
/* f19fd4c: 0fc2a685 */ jal weaponGetAmmoType
/* f19fd4c: 0fc2a685 */ jal bgunGetAmmoTypeForWeapon
/* f19fd50: 00002825 */ or $a1,$zero,$zero
/* f19fd54: 00408825 */ or $s1,$v0,$zero
/* f19fd58: 0fc2a63d */ jal ammotypeGetMaxCapacity
/* f19fd58: 0fc2a63d */ jal bgunGetCapacityByAmmotype
/* f19fd5c: 00402025 */ or $a0,$v0,$zero
/* f19fd60: 00408025 */ or $s0,$v0,$zero
/* f19fd64: 02402025 */ or $a0,$s2,$zero
@ -4423,7 +4423,7 @@ glabel var7f1b94e4
/* f19fd88: 2401ffff */ addiu $at,$zero,-1
/* f19fd8c: 18400011 */ blez $v0,.L0f19fdd4
/* f19fd90: 00000000 */ nop
/* f19fd94: 0fc2a5dc */ jal currentPlayerGetAmmoCountWithCheck
/* f19fd94: 0fc2a5dc */ jal bgunGetAmmoCountWithCheck
/* f19fd98: 02202025 */ or $a0,$s1,$zero
/* f19fd9c: 92a3045a */ lbu $v1,0x45a($s5)
/* f19fda0: 86ae0476 */ lh $t6,0x476($s5)
@ -4436,28 +4436,28 @@ glabel var7f1b94e4
/* f19fdbc: 00000000 */ nop
/* f19fdc0: a6a00476 */ sh $zero,0x476($s5)
.L0f19fdc4:
/* f19fdc4: 0fc2a58a */ jal currentPlayerSetAmmoQuantity
/* f19fdc4: 0fc2a58a */ jal bgunSetAmmoQuantity
/* f19fdc8: 02202025 */ or $a0,$s1,$zero
/* f19fdcc: 10000006 */ b .L0f19fde8
/* f19fdd0: 24010012 */ addiu $at,$zero,0x12
.L0f19fdd4:
/* f19fdd4: 14410003 */ bne $v0,$at,.L0f19fde4
/* f19fdd8: 02202025 */ or $a0,$s1,$zero
/* f19fddc: 0fc2a58a */ jal currentPlayerSetAmmoQuantity
/* f19fddc: 0fc2a58a */ jal bgunSetAmmoQuantity
/* f19fde0: 02002825 */ or $a1,$s0,$zero
.L0f19fde4:
/* f19fde4: 24010012 */ addiu $at,$zero,0x12
.L0f19fde8:
/* f19fde8: 5641001d */ bnel $s2,$at,.L0f19fe60
/* f19fdec: a2a0045a */ sb $zero,0x45a($s5)
/* f19fdf0: 0fc2a63d */ jal ammotypeGetMaxCapacity
/* f19fdf0: 0fc2a63d */ jal bgunGetCapacityByAmmotype
/* f19fdf4: 2404000b */ addiu $a0,$zero,0xb
/* f19fdf8: 86a30478 */ lh $v1,0x478($s5)
/* f19fdfc: 00408025 */ or $s0,$v0,$zero
/* f19fe00: 2401ffff */ addiu $at,$zero,-1
/* f19fe04: 18600011 */ blez $v1,.L0f19fe4c
/* f19fe08: 00000000 */ nop
/* f19fe0c: 0fc2a5dc */ jal currentPlayerGetAmmoCountWithCheck
/* f19fe0c: 0fc2a5dc */ jal bgunGetAmmoCountWithCheck
/* f19fe10: 2404000b */ addiu $a0,$zero,0xb
/* f19fe14: 92a3045a */ lbu $v1,0x45a($s5)
/* f19fe18: 86b90478 */ lh $t9,0x478($s5)
@ -4470,14 +4470,14 @@ glabel var7f1b94e4
/* f19fe34: 00000000 */ nop
/* f19fe38: a6a00478 */ sh $zero,0x478($s5)
.L0f19fe3c:
/* f19fe3c: 0fc2a58a */ jal currentPlayerSetAmmoQuantity
/* f19fe3c: 0fc2a58a */ jal bgunSetAmmoQuantity
/* f19fe40: 2404000b */ addiu $a0,$zero,0xb
/* f19fe44: 10000006 */ b .L0f19fe60
/* f19fe48: a2a0045a */ sb $zero,0x45a($s5)
.L0f19fe4c:
/* f19fe4c: 14610003 */ bne $v1,$at,.L0f19fe5c
/* f19fe50: 2404000b */ addiu $a0,$zero,0xb
/* f19fe54: 0fc2a58a */ jal currentPlayerSetAmmoQuantity
/* f19fe54: 0fc2a58a */ jal bgunSetAmmoQuantity
/* f19fe58: 02002825 */ or $a1,$s0,$zero
.L0f19fe5c:
/* f19fe5c: a2a0045a */ sb $zero,0x45a($s5)
@ -5292,7 +5292,7 @@ glabel var7f1b94e4
/* f199a10: 00000000 */ sll $zero,$zero,0x0
/* f199a14: 0fc65cc2 */ jal frGetWeaponBySlot
/* f199a18: 96a40456 */ lhu $a0,0x456($s5)
/* f199a1c: 0fc27dc8 */ jal currentPlayerEquipWeapon
/* f199a1c: 0fc27dc8 */ jal bgunEquipWeapon
/* f199a20: 00402025 */ or $a0,$v0,$zero
.NB0f199a24:
/* f199a24: 3c16800a */ lui $s6,0x800a
@ -5517,10 +5517,10 @@ glabel var7f1b94e4
/* f199d48: 96a40456 */ lhu $a0,0x456($s5)
/* f199d4c: 00409025 */ or $s2,$v0,$zero
/* f199d50: 00402025 */ or $a0,$v0,$zero
/* f199d54: 0fc29ded */ jal weaponGetAmmoType
/* f199d54: 0fc29ded */ jal bgunGetAmmoTypeForWeapon
/* f199d58: 00002825 */ or $a1,$zero,$zero
/* f199d5c: 00408825 */ or $s1,$v0,$zero
/* f199d60: 0fc29da5 */ jal ammotypeGetMaxCapacity
/* f199d60: 0fc29da5 */ jal bgunGetCapacityByAmmotype
/* f199d64: 00402025 */ or $a0,$v0,$zero
/* f199d68: 00408025 */ or $s0,$v0,$zero
/* f199d6c: 02402025 */ or $a0,$s2,$zero
@ -5536,7 +5536,7 @@ glabel var7f1b94e4
/* f199d90: 2401ffff */ addiu $at,$zero,-1
/* f199d94: 18400011 */ blez $v0,.NB0f199ddc
/* f199d98: 00000000 */ sll $zero,$zero,0x0
/* f199d9c: 0fc29d44 */ jal currentPlayerGetAmmoCountWithCheck
/* f199d9c: 0fc29d44 */ jal bgunGetAmmoCountWithCheck
/* f199da0: 02202025 */ or $a0,$s1,$zero
/* f199da4: 92a3045a */ lbu $v1,0x45a($s5)
/* f199da8: 86af0476 */ lh $t7,0x476($s5)
@ -5549,28 +5549,28 @@ glabel var7f1b94e4
/* f199dc4: 00000000 */ sll $zero,$zero,0x0
/* f199dc8: a6a00476 */ sh $zero,0x476($s5)
.NB0f199dcc:
/* f199dcc: 0fc29cf2 */ jal currentPlayerSetAmmoQuantity
/* f199dcc: 0fc29cf2 */ jal bgunSetAmmoQuantity
/* f199dd0: 02202025 */ or $a0,$s1,$zero
/* f199dd4: 10000006 */ beqz $zero,.NB0f199df0
/* f199dd8: 24010012 */ addiu $at,$zero,0x12
.NB0f199ddc:
/* f199ddc: 14410003 */ bne $v0,$at,.NB0f199dec
/* f199de0: 02202025 */ or $a0,$s1,$zero
/* f199de4: 0fc29cf2 */ jal currentPlayerSetAmmoQuantity
/* f199de4: 0fc29cf2 */ jal bgunSetAmmoQuantity
/* f199de8: 02002825 */ or $a1,$s0,$zero
.NB0f199dec:
/* f199dec: 24010012 */ addiu $at,$zero,0x12
.NB0f199df0:
/* f199df0: 5641001d */ bnel $s2,$at,.NB0f199e68
/* f199df4: a2a0045a */ sb $zero,0x45a($s5)
/* f199df8: 0fc29da5 */ jal ammotypeGetMaxCapacity
/* f199df8: 0fc29da5 */ jal bgunGetCapacityByAmmotype
/* f199dfc: 2404000b */ addiu $a0,$zero,0xb
/* f199e00: 86a30478 */ lh $v1,0x478($s5)
/* f199e04: 00408025 */ or $s0,$v0,$zero
/* f199e08: 2401ffff */ addiu $at,$zero,-1
/* f199e0c: 18600011 */ blez $v1,.NB0f199e54
/* f199e10: 00000000 */ sll $zero,$zero,0x0
/* f199e14: 0fc29d44 */ jal currentPlayerGetAmmoCountWithCheck
/* f199e14: 0fc29d44 */ jal bgunGetAmmoCountWithCheck
/* f199e18: 2404000b */ addiu $a0,$zero,0xb
/* f199e1c: 92a3045a */ lbu $v1,0x45a($s5)
/* f199e20: 86a90478 */ lh $t1,0x478($s5)
@ -5583,14 +5583,14 @@ glabel var7f1b94e4
/* f199e3c: 00000000 */ sll $zero,$zero,0x0
/* f199e40: a6a00478 */ sh $zero,0x478($s5)
.NB0f199e44:
/* f199e44: 0fc29cf2 */ jal currentPlayerSetAmmoQuantity
/* f199e44: 0fc29cf2 */ jal bgunSetAmmoQuantity
/* f199e48: 2404000b */ addiu $a0,$zero,0xb
/* f199e4c: 10000006 */ beqz $zero,.NB0f199e68
/* f199e50: a2a0045a */ sb $zero,0x45a($s5)
.NB0f199e54:
/* f199e54: 14610003 */ bne $v1,$at,.NB0f199e64
/* f199e58: 2404000b */ addiu $a0,$zero,0xb
/* f199e5c: 0fc29cf2 */ jal currentPlayerSetAmmoQuantity
/* f199e5c: 0fc29cf2 */ jal bgunSetAmmoQuantity
/* f199e60: 02002825 */ or $a1,$s0,$zero
.NB0f199e64:
/* f199e64: a2a0045a */ sb $zero,0x45a($s5)
@ -6387,7 +6387,7 @@ glabel var7f1b94e4
// && g_Vars.currentplayer->unk1583_04 == 0
// && invHasSingleWeaponIncAllGuns(frGetWeaponBySlot(g_FrData.slot))) {
// // a0c
// currentPlayerEquipWeapon(frGetWeaponBySlot(g_FrData.slot));
// bgunEquipWeapon(frGetWeaponBySlot(g_FrData.slot));
// }
//
// // a1c
@ -6485,14 +6485,14 @@ glabel var7f1b94e4
// // weapon allows, or if it defined unlimited ammo
// if (g_FrData.numshotssincetopup != 0) {
// weaponnum = frGetWeaponBySlot(g_FrData.slot);
// ammotype = weaponGetAmmoType(weaponnum, 0);
// capacity = ammotypeGetMaxCapacity(ammotype);
// ammotype = bgunGetAmmoTypeForWeapon(weaponnum, 0);
// capacity = bgunGetCapacityByAmmotype(ammotype);
// ammo = weaponGetAmmoByFunction(weaponnum, 0);
// capacity -= (ammo ? ammo->clipsize : 0);
//
// // d8c
// if (g_FrData.ammoextra > 0) {
// tmp = currentPlayerGetAmmoCountWithCheck(ammotype);
// tmp = bgunGetAmmoCountWithCheck(ammotype);
// g_FrData.ammoextra -= g_FrData.numshotssincetopup;
//
// if (g_FrData.ammoextra < 0) {
@ -6500,18 +6500,18 @@ glabel var7f1b94e4
// }
//
// capacity = tmp + g_FrData.numshotssincetopup;
// currentPlayerSetAmmoQuantity(ammotype, capacity);
// bgunSetAmmoQuantity(ammotype, capacity);
// } else /*dd4*/ if (g_FrData.ammoextra == -1) {
// currentPlayerSetAmmoQuantity(ammotype, capacity);
// bgunSetAmmoQuantity(ammotype, capacity);
// }
//
// // de8
// if (weaponnum == WEAPON_SUPERDRAGON) {
// capacity = ammotypeGetMaxCapacity(AMMOTYPE_DEVASTATOR);
// capacity = bgunGetCapacityByAmmotype(AMMOTYPE_DEVASTATOR);
//
// // e04
// if (g_FrData.sdgrenadeextra > 0) {
// tmp = currentPlayerGetAmmoCountWithCheck(AMMOTYPE_DEVASTATOR);
// tmp = bgunGetAmmoCountWithCheck(AMMOTYPE_DEVASTATOR);
// g_FrData.sdgrenadeextra -= g_FrData.numshotssincetopup;
//
// if (g_FrData.sdgrenadeextra < 0) {
@ -6519,9 +6519,9 @@ glabel var7f1b94e4
// }
//
// capacity = tmp + g_FrData.numshotssincetopup;
// currentPlayerSetAmmoQuantity(AMMOTYPE_DEVASTATOR, capacity);
// bgunSetAmmoQuantity(AMMOTYPE_DEVASTATOR, capacity);
// } else /*e4c*/ if (g_FrData.sdgrenadeextra == -1) {
// currentPlayerSetAmmoQuantity(AMMOTYPE_DEVASTATOR, capacity);
// bgunSetAmmoQuantity(AMMOTYPE_DEVASTATOR, capacity);
// }
// }
//
@ -6923,7 +6923,7 @@ bool frChooseFarsightTarget(void)
bool found = false;
s32 i;
if (handGetWeaponNum(HAND_RIGHT) == WEAPON_FARSIGHT) {
if (bgunGetWeaponNum(HAND_RIGHT) == WEAPON_FARSIGHT) {
for (i = 0; i < ARRAYCOUNT(g_FrData.targets); i++) {
if (g_FrData.targets[i].inuse
&& g_FrData.targets[i].destroyed == false
@ -7448,7 +7448,7 @@ struct trainingdata *dtGetData(void)
void dtRestorePlayer(void)
{
playersSetPassiveMode(true);
bgunSetPassiveMode(true);
if (g_DtData.obj) {
objRemove(g_DtData.obj, true);
@ -7457,7 +7457,7 @@ void dtRestorePlayer(void)
g_DtData.obj = NULL;
if (dtGetWeaponByDeviceIndex(dtGetIndexBySlot(g_DtSlot)) == WEAPON_ECMMINE) {
currentPlayerSetAmmoQuantity(AMMOTYPE_ECM_MINE, 0);
bgunSetAmmoQuantity(AMMOTYPE_ECM_MINE, 0);
}
if (g_Vars.currentplayer->eyespy) {
@ -7547,7 +7547,7 @@ void dtBegin(void)
chrUnsetStageFlag(NULL, STAGEFLAG_CI_TRIGGER_DEVICE_FAILURE);
chrSetStageFlag(NULL, ciGetStageFlagByDeviceIndex(dtGetIndexBySlot(g_DtSlot)));
g_Vars.currentplayer->training = true;
playersSetPassiveMode(false);
bgunSetPassiveMode(false);
chrSetStageFlag(NULL, STAGEFLAG_CI_IN_TRAINING);
}
@ -7555,7 +7555,7 @@ void dtEnd(void)
{
g_DtData.intraining = false;
dtRestorePlayer();
currentPlayerSetAmmoQuantity(AMMOTYPE_CLOAK, 0);
bgunSetAmmoQuantity(AMMOTYPE_CLOAK, 0);
chrSetStageFlag(NULL, STAGEFLAG_CI_DEVICE_ABORTING);
chrUnsetStageFlag(NULL, STAGEFLAG_CI_TRIGGER_DEVICE_FAILURE);
chrUnsetStageFlag(NULL, ciGetStageFlagByDeviceIndex(dtGetIndexBySlot(g_DtSlot)));
@ -7838,7 +7838,7 @@ void htBegin(void)
waypointDisableSegment(&waypoints[0x20], &waypoints[0x31]);
g_Vars.currentplayer->training = true;
playersSetPassiveMode(false);
bgunSetPassiveMode(false);
chrSetStageFlag(NULL, STAGEFLAG_CI_IN_TRAINING);
}
@ -7877,7 +7877,7 @@ void htEnd(void)
propnum++;
}
playersSetPassiveMode(true);
bgunSetPassiveMode(true);
chrUnsetStageFlag(NULL, STAGEFLAG_CI_IN_TRAINING);
currentPlayerDisplayHealth();
g_Vars.currentplayer->bondhealth = 1;

183
src/include/game/bondgun.h Normal file
View File

@ -0,0 +1,183 @@
#ifndef _IN_GAME_BONDGUN_H
#define _IN_GAME_BONDGUN_H
#include <ultra64.h>
#include "data.h"
#include "types.h"
void bgun0f097ba0(s32 handnum, s32 weaponnum);
s32 bgunGetUnequippedReloadIndex(s32 weaponnum);
void bgunTickUnequippedReload(void);
bool bgun0f097df0(struct inventory_typef *arg0, struct hand *hand);
void bgun0f097e74(s16 partnum, s32 arg1, struct hand *hand, struct modelfiledata *arg3);
void bgun0f097f28(struct hand *hand, struct modelfiledata *arg1, struct inventory_typef *arg2);
void bgun0f098030(struct hand *hand, struct modelfiledata *arg1);
f32 bgun0f09815c(struct hand *hand);
u32 bgun0f0981e8(void);
bool bgun0f098884(struct guncmd *cmd, struct gset *gset);
void bgun0f0988e0(struct guncmd *cmd, s32 handnum, struct hand *hand);
bool bgun0f098a44(struct hand *hand, s32 time);
bool bgunIsAnimBusy(struct hand *hand);
void bgunResetAnim(struct hand *hand);
void bgunGetWeaponInfo(struct handweaponinfo *info, s32 handnum);
s32 bgun0f098ca0(s32 arg0, struct handweaponinfo *info, struct hand *hand);
void bgun0f098df8(s32 weaponfunc, struct handweaponinfo *info, struct hand *hand, s32 arg3, s32 arg4);
void bgun0f098f8c(struct handweaponinfo *info, struct hand *hand);
bool bgun0f099008(s32 handnum);
bool bgun0f0990b0(struct weaponfunc *basefunc, struct weapon *weapon);
bool bgun0f099188(struct hand *hand, s32 gunfunc);
s32 bgunTickIncIdle(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate);
void bgun0f099780(struct hand *hand, f32 angle);
s32 bgunTickIncAutoSwitch(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate);
bool bgunIsReloading(struct hand *hand);
s32 bgunTickIncReload(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate);
s32 bgunTickIncChangeFunc(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate);
s32 bgun0f09a3f8(struct hand *hand, struct weaponfunc *func);
void bgun0f09a6f8(struct handweaponinfo *info, s32 handnum, struct hand *hand, struct weaponfunc *func);
bool bgun0f09aba4(struct hand *hand, struct handweaponinfo *info, s32 handnum, struct weaponfunc_shoot *func);
bool bgunTickIncAttackingShoot(struct handweaponinfo *info, s32 handnum, struct hand *hand);
bool bgunTickIncAttackingThrow(s32 handnum, struct hand *hand);
s32 bgunGetMinClipQty(s32 weaponnum, s32 funcnum);
bool bgunTickIncAttackingClose(s32 handnum, struct hand *hand);
bool bgunTickIncAttackingSpecial(struct hand *hand);
s32 bgunTickIncAttackEmpty(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate);
s32 bgunTickIncAttack(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate);
bool bgunIsReadyToSwitch(s32 handnum);
bool bgun0f09bec8(s32 handnum);
bool bgun0f09bf44(s32 handnum);
s32 bgunTickIncChangeGun(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate);
s32 bgunTickIncState2(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate);
s32 bgunTickInc(struct handweaponinfo *info, s32 handnum, s32 lvupdate);
bool bgunSetState(s32 handnum, s32 state);
void bgunTick(s32 handnum);
void bgun0f09ce8c(void);
void bgun0f09ceac(void);
f32 bgunGetNoiseRadius(s32 handnum);
void bgunDecreaseNoiseRadius(void);
void bgun0f09d140(s32 hand);
u32 bgun0f09d550(void);
void bgun0f09d8dc(f32 breathing, f32 arg1, f32 arg2, f32 arg3, f32 arg4);
bool bgun0f09dd7c(void);
u32 bgun0f09ddcc(void);
u8 *bgun0f09ddec(void);
u32 bgun0f09ddfc(void);
void bgun0f09df50(void);
void bgun0f09df64(s32 weaponnum);
void bgun0f09df9c(void);
bool bgun0f09e004(s32 newowner);
u32 bgun0f09e144(void);
void bgun0f09e4e0(void);
void bgun0f09ea90(void);
bool bgun0f09eae4(void);
s32 bgun0f09ebbc(void);
void bgun0f09ebcc(struct defaultobj *obj, struct coord *coord, s16 *rooms, Mtxf *matrix1, f32 *arg4, Mtxf *matrix2, struct prop *prop, struct coord *pos);
void bgun0f09ed2c(struct defaultobj *obj, struct coord *coord, Mtxf *arg2, f32 *arg3, Mtxf *arg4);
struct defaultobj *bgun0f09ee18(struct chrdata *chr, struct gset *gset, struct coord *pos, s16 *rooms, Mtxf *arg4, struct coord *arg5);
void bgunCreateThrownProjectile(s32 handnum, struct gset *gset);
void bgun0f09f848(s32 handnum);
void bgun0f09f974(s32 handnum, struct weaponfunc_shootprojectile *func);
void bgun0f09fa20(s32 handnum);
void bgunCreateFiredProjectile(s32 handnum);
void bgun0f0a0394(f32 autoaimx, f32 autoaimy, f32 damp, f32 arg3);
void bgunSwivelTowards(f32 screenx, f32 screeny, f32 damp);
void bgun0f0a0b98(f32 arg0, f32 arg1);
void bgunGetCrossPos(f32 *x, f32 *y);
void bgun0f0a0c08(struct coord *arg0, struct coord *arg1);
void bgun0f0a0c44(s32 handnum, struct coord *arg1, struct coord *arg2);
void bgunCalculateShotSpread(struct coord *arg0, struct coord *arg1, s32 handnum, bool dorandom);
u32 bgun0f0a0fac(void);
void bgunSetLastShootInfo(struct coord *pos, struct coord *dir, s32 handnum);
u32 bgunGetUnk0c30(s32 handnum);
void bgun0f0a134c(s32 handnum);
void bgun0f0a1528(void);
void bgunEquipWeapon(s32 weaponnum);
s32 bgunGetWeaponNum(s32 handnum);
bool bgun0f0a1a10(s32 weaponnum);
s32 bgun0f0a1a68(s32 arg0);
void bgun0f0a1ab0(void);
void bgun0f0a1b50(void);
void bgun0f0a1c2c(void);
bool bgunHasAmmoForWeapon(s32 weaponnum);
void bgunAutoSwitchWeapon(void);
void bgunEquipWeapon2(bool arg0, s32 weaponnum);
s32 bgunIsFiring(s32 handnum);
s32 bgunGetAttackType(s32 handnum);
char *bgunGetName(s32 weaponnum);
u16 bgunGetNameId(s32 weaponnum);
char *bgunGetShortName(s32 arg0);
void bgunReloadIfPossible(s32 handnum);
void bgunSetAdjustPos(f32 angle);
void bgunResetSlideInc(s32 handnum);
u32 bgun0f0a233c(void);
f32 bgun0f0a2498(f32 arg0, f32 arg1, f32 arg2, f32 arg3);
void bgun0f0a24f0(struct coord *arg0, s32 handnum);
bool bgun0f0a27c8(void);
void bgun0f0a29c8(void);
bool bgunIsMissionCritical(s32 weaponnum);
void bgunLoseGun(struct prop *attacker);
u32 bgun0f0a2da8(void);
u32 bgun0f0a2e94(void);
void bgunDetonateRemoteMines(s32 playernum);
u32 bgun0f0a3160(void);
u32 bgun0f0a3490(void);
u32 bgun0f0a37b4(void);
u32 bgun0f0a3aa4(void);
u32 bgun0f0a3eac(void);
u32 bgun0f0a4094(void);
u32 bgun0f0a419c(void);
void bgun0f0a4334(struct hand *hand);
u32 bgun0f0a4438(void);
void bgun0f0a4570(struct hand *hand, s32 handnum, struct weaponfunc_shootprojectile *func);
void bgun0f0a45d0(struct hand *hand, struct modelfiledata *filedata, bool arg2);
u32 bgun0f0a46a4(void);
u32 bgun0f0a4e44(void);
u32 bgun0f0a5300(void);
void bgun0f0a5550(s32 handnum);
void bgunTickMaulerCharge(void);
void bgun0f0a6c30(void);
s32 bgun0f0a70f8(void);
void bgun0f0a7138(Gfx **gdl);
struct audiohandle **bgun0f0a7d5c(void);
void bgunPlayPropHitSound(struct gset *gset, struct prop *prop, s32 arg2);
void bgun0f0a8404(struct coord *pos, s16 *rooms, s32 arg2);
void bgun0f0a84c8(struct gset *gset, struct coord *arg1, s16 arg2, s16 *arg3);
void bgunSetTriggerOn(s32 handnum, bool on);
s32 bgunConsiderToggleGunFunction(s32 usedowntime, bool firing, s32 arg2);
void bgun0f0a8c50(void);
bool bgunIsUsingSecondaryFunction(void);
void bgunsTick(bool triggeron);
void bgunSetPassiveMode(bool enable);
void bgunSetAimType(u32 aimtype);
void bgunSetAimPos(struct coord *coord);
void bgunSetHitPos(struct coord *coord);
void bgun0f0a9494(u32 operation);
void bgun0f0a94d0(u32 operation, struct coord *pos, struct coord *rot);
void bgunSetGunAmmoVisible(u32 reason, bool enable);
void bgunSetAmmoQuantity(s32 ammotype, s32 quantity);
s32 bgunGetAmmoCountWithCheck(s32 type);
s32 bgunGetAmmoCount(s32 ammotype);
s32 bgunGetCapacityByAmmotype(u32 ammotype);
bool bgunAmmotypeAllowsUnlimitedAmmo(u32 ammotype);
void bgunGiveMaxAmmo(bool force);
u32 bgunGetAmmoTypeForWeapon(u32 weaponnum, u32 func);
s32 bgunGetAmmoQtyForWeapon(u32 weaponnum, u32 func);
void bgunSetAmmoQtyForWeapon(u32 weaponnum, u32 func, u32 quantity);
s32 bgunGetAmmoCapacityForWeapon(s32 weaponnum, s32 func);
Gfx *bgunRenderHudString(Gfx *gdl, char *text, s32 x, bool halign, s32 y, s32 valign, u32 colour);
Gfx *bgunRenderHudInteger(Gfx *gdl, s32 value, s32 x, bool halign, s32 y, s32 valign, u32 colour);
void bgunResetAbmag(struct abmag *abmag);
void bgun0f0a9da8(struct abmag *abmag, s32 remaining, s32 capacity, s32 height);
Gfx *bgunRenderHudGauge(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, struct abmag *abmag, s32 remaining, s32 capacity, u32 vacantcolour, u32 occupiedcolour, bool flip);
Gfx *bgunRenderHud(Gfx *gdl);
void bgunAddBoostc(s32 arg0);
void bgunSubtractBoost(s32 arg0);
void bgunApplyBoost(void);
void bgunRevertBoost(void);
void bgunTickBoost(void);
void bgunSetSightVisible(u32 bits, bool visible);
Gfx *bgun0f0abcb0(Gfx *gdl);
void bgun0f0abd30(s32 handnum);
s32 bgunGetWeaponNum2(s32 handnum);
s8 bgunFreeFireslotWrapper(s32 fireslot);
s8 bgunFreeFireslot(s32 fireslot);
#endif

183
src/include/game/game_097ba0.h
View File

@ -1,183 +0,0 @@
#ifndef _IN_GAME_GAME_097BA0_H
#define _IN_GAME_GAME_097BA0_H
#include <ultra64.h>
#include "data.h"
#include "types.h"
void func0f097ba0(s32 handnum, s32 weaponnum);
s32 weaponGetUnequippedReloadIndex(s32 weaponnum);
void handsTickUnequippedReload(void);
bool func0f097df0(struct inventory_typef *arg0, struct hand *hand);
void func0f097e74(s16 partnum, s32 arg1, struct hand *hand, struct modelfiledata *arg3);
void func0f097f28(struct hand *hand, struct modelfiledata *arg1, struct inventory_typef *arg2);
void func0f098030(struct hand *hand, struct modelfiledata *arg1);
f32 func0f09815c(struct hand *hand);
u32 func0f0981e8(void);
bool func0f098884(struct guncmd *cmd, struct gset *gset);
void func0f0988e0(struct guncmd *cmd, s32 handnum, struct hand *hand);
bool func0f098a44(struct hand *hand, s32 time);
bool handIsAnimBusy(struct hand *hand);
void handResetAnim(struct hand *hand);
void handGetWeaponInfo(struct handweaponinfo *info, s32 handnum);
s32 func0f098ca0(s32 arg0, struct handweaponinfo *info, struct hand *hand);
void func0f098df8(s32 weaponfunc, struct handweaponinfo *info, struct hand *hand, s32 arg3, s32 arg4);
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);
s32 handTickIncIdle(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate);
void func0f099780(struct hand *hand, f32 angle);
s32 handTickIncAutoSwitch(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate);
bool handIsReloading(struct hand *hand);
s32 handTickIncReload(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate);
s32 handTickIncChangeFunc(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate);
s32 func0f09a3f8(struct hand *hand, struct weaponfunc *func);
void func0f09a6f8(struct handweaponinfo *info, s32 handnum, struct hand *hand, struct weaponfunc *func);
bool func0f09aba4(struct hand *hand, struct handweaponinfo *info, s32 handnum, struct weaponfunc_shoot *func);
bool handTickIncAttackingShoot(struct handweaponinfo *info, s32 handnum, struct hand *hand);
bool handTickIncAttackingThrow(s32 handnum, struct hand *hand);
s32 weaponGetMinClipQty(s32 weaponnum, s32 funcnum);
bool handTickIncAttackingClose(s32 handnum, struct hand *hand);
bool handTickIncAttackingSpecial(struct hand *hand);
s32 handTickIncAttackEmpty(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate);
s32 handTickIncAttack(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate);
bool handIsReadyToSwitch(s32 handnum);
bool func0f09bec8(s32 handnum);
bool func0f09bf44(s32 handnum);
s32 handTickIncChangeGun(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate);
s32 handTickIncState2(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate);
s32 handTickInc(struct handweaponinfo *info, s32 handnum, s32 lvupdate);
bool handSetState(s32 handnum, s32 state);
void handTick(s32 handnum);
void func0f09ce8c(void);
void func0f09ceac(void);
f32 handGetNoiseRadius(s32 handnum);
void currentPlayerDecreaseNoiseRadius(void);
void func0f09d140(s32 hand);
u32 func0f09d550(void);
void func0f09d8dc(f32 breathing, f32 arg1, f32 arg2, f32 arg3, f32 arg4);
bool func0f09dd7c(void);
u32 func0f09ddcc(void);
u8 *func0f09ddec(void);
u32 func0f09ddfc(void);
void func0f09df50(void);
void func0f09df64(s32 weaponnum);
void func0f09df9c(void);
bool func0f09e004(s32 newowner);
u32 func0f09e144(void);
void func0f09e4e0(void);
void func0f09ea90(void);
bool func0f09eae4(void);
s32 func0f09ebbc(void);
void func0f09ebcc(struct defaultobj *obj, struct coord *coord, s16 *rooms, Mtxf *matrix1, f32 *arg4, Mtxf *matrix2, struct prop *prop, struct coord *pos);
void func0f09ed2c(struct defaultobj *obj, struct coord *coord, Mtxf *arg2, f32 *arg3, Mtxf *arg4);
struct defaultobj *func0f09ee18(struct chrdata *chr, struct gset *gset, struct coord *pos, s16 *rooms, Mtxf *arg4, struct coord *arg5);
void handCreateThrownProjectile(s32 handnum, struct gset *gset);
void func0f09f848(s32 handnum);
void func0f09f974(s32 handnum, struct weaponfunc_shootprojectile *func);
void func0f09fa20(s32 handnum);
void handCreateFiredProjectile(s32 handnum);
void func0f0a0394(f32 autoaimx, f32 autoaimy, f32 damp, f32 arg3);
void currentPlayerSwivelGunTowards(f32 screenx, f32 screeny, f32 damp);
void func0f0a0b98(f32 arg0, f32 arg1);
void currentPlayerGetCrossPos(f32 *x, f32 *y);
void func0f0a0c08(struct coord *arg0, struct coord *arg1);
void func0f0a0c44(s32 handnum, struct coord *arg1, struct coord *arg2);
void handCalculateShotSpread(struct coord *arg0, struct coord *arg1, s32 handnum, bool dorandom);
u32 func0f0a0fac(void);
void handSetLastShootInfo(struct coord *pos, struct coord *dir, s32 handnum);
u32 handGetUnk0c30(s32 handnum);
void func0f0a134c(s32 handnum);
void func0f0a1528(void);
void currentPlayerEquipWeapon(s32 weaponnum);
s32 handGetWeaponNum(s32 handnum);
bool func0f0a1a10(s32 weaponnum);
s32 func0f0a1a68(s32 arg0);
void func0f0a1ab0(void);
void func0f0a1b50(void);
void func0f0a1c2c(void);
bool currentPlayerHasAmmoForWeapon(s32 weaponnum);
void currentPlayerAutoSwitchWeapon(void);
void currentPlayerEquipWeaponWrapper(bool arg0, s32 weaponnum);
s32 handIsFiring(s32 handnum);
s32 handGetAttackType(s32 handnum);
char *weaponGetName(s32 weaponnum);
u16 weaponGetNameId(s32 weaponnum);
char *weaponGetShortName(s32 arg0);
void currentPlayerReloadHandIfPossible(s32 handnum);
void handSetAdjustPos(f32 angle);
void handResetSlideInc(s32 handnum);
u32 func0f0a233c(void);
f32 func0f0a2498(f32 arg0, f32 arg1, f32 arg2, f32 arg3);
void func0f0a24f0(struct coord *arg0, s32 handnum);
bool func0f0a27c8(void);
void func0f0a29c8(void);
bool weaponIsMissionCritical(s32 weaponnum);
void currentPlayerLoseGun(struct prop *attacker);
u32 func0f0a2da8(void);
u32 func0f0a2e94(void);
void playerDetonateRemoteMines(s32 playernum);
u32 func0f0a3160(void);
u32 func0f0a3490(void);
u32 func0f0a37b4(void);
u32 func0f0a3aa4(void);
u32 func0f0a3eac(void);
u32 func0f0a4094(void);
u32 func0f0a419c(void);
void func0f0a4334(struct hand *hand);
u32 func0f0a4438(void);
void func0f0a4570(struct hand *hand, s32 handnum, struct weaponfunc_shootprojectile *func);
void func0f0a45d0(struct hand *hand, struct modelfiledata *filedata, bool arg2);
u32 func0f0a46a4(void);
u32 func0f0a4e44(void);
u32 func0f0a5300(void);
void func0f0a5550(s32 handnum);
void handsTickMaulerCharge(void);
void func0f0a6c30(void);
s32 func0f0a70f8(void);
void func0f0a7138(Gfx **gdl);
struct audiohandle **func0f0a7d5c(void);
void gsetPlayPropHitSound(struct gset *gset, struct prop *prop, s32 arg2);
void func0f0a8404(struct coord *pos, s16 *rooms, s32 arg2);
void func0f0a84c8(struct gset *gset, struct coord *arg1, s16 arg2, s16 *arg3);
void handSetTriggerOn(s32 handnum, bool on);
s32 currentPlayerConsiderToggleGunFunction(s32 usedowntime, bool firing, s32 arg2);
void func0f0a8c50(void);
bool currentPlayerIsUsingSecondaryFunction(void);
void handsTick(bool triggeron);
void playersSetPassiveMode(bool enable);
void currentPlayerSetAimType(u32 aimtype);
void handSetAimPos(struct coord *coord);
void handSetHitPos(struct coord *coord);
void func0f0a9494(u32 operation);
void func0f0a94d0(u32 operation, struct coord *pos, struct coord *rot);
void currentPlayerSetGunAmmoVisible(u32 reason, bool enable);
void currentPlayerSetAmmoQuantity(s32 ammotype, s32 quantity);
s32 currentPlayerGetAmmoCountWithCheck(s32 type);
s32 currentPlayerGetAmmoCount(s32 ammotype);
s32 ammotypeGetMaxCapacity(u32 ammotype);
bool ammotypeAllowsUnlimitedAmmo(u32 ammotype);
void currentPlayerGiveUnlimitedAmmo(bool force);
u32 weaponGetAmmoType(u32 weaponnum, u32 func);
s32 currentPlayerGetAmmoQuantityForWeapon(u32 weaponnum, u32 func);
void currentPlayerSetAmmoQtyForWeapon(u32 weaponnum, u32 func, u32 quantity);
s32 weaponGetAmmoCapacity(s32 weaponnum, s32 func);
Gfx *handRenderHudString(Gfx *gdl, char *text, s32 x, bool halign, s32 y, s32 valign, u32 colour);
Gfx *handRenderHudInteger(Gfx *gdl, s32 value, s32 x, bool halign, s32 y, s32 valign, u32 colour);
void abmagReset(struct abmag *abmag);
void func0f0a9da8(struct abmag *abmag, s32 remaining, s32 capacity, s32 height);
Gfx *handRenderHudGauge(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, struct abmag *abmag, s32 remaining, s32 capacity, u32 vacantcolour, u32 occupiedcolour, bool flip);
Gfx *handRenderHud(Gfx *gdl);
void cboostAdd(s32 arg0);
void cboostSubtract(s32 arg0);
void cboostBoost(void);
void cboostRevert(void);
void speedpillTick(void);
void currentPlayerSetGunSightVisible(u32 bits, bool visible);
Gfx *func0f0abcb0(Gfx *gdl);
void func0f0abd30(s32 handnum);
s32 getCurrentPlayerWeaponIdWrapper(s32 handnum);
s8 freeFireslotWrapper(s32 fireslot);
s8 freeFireslot(s32 fireslot);
#endif

2
src/include/types.h
View File

@ -2979,7 +2979,7 @@ struct inventory_class {
};
struct inventory_typef {
// See related functions: func0f097f28 and func0f097df0
// See related functions: bgun0f097f28 and bgun0f097df0
// unk00 - Some kind of condition field
// 0 = terminator

2
tools/patchpiracysums
View File

@ -193,7 +193,7 @@ class Tool:
self.patch(algo06, 'lvInit', 'lvGetSlowMotionType')
self.patch(algo07, 'propAllocateEyespy', 'lvInit')
self.patch(algo08, 'chrConsiderGrenadeThrow', 'bgInit')
self.patch(algo09, 'func0f09e144', 'tagsAllocatePtrs')
self.patch(algo09, 'bgun0f09e144', 'tagsAllocatePtrs')
self.patch(algo10, 'explosionAlertChrs', 'glassDestroy')
self.patch(algo11, 'func0f0069dc', 'func00015fd0')
self.patch(algo12, 'func0f15c920', 'func0f0069dc')