From 7d44ea11e1719c3060de2529012a0d7bb9e20143 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sun, 13 Jun 2021 17:19:11 +1000 Subject: [PATCH] Rename game_097ba0.c to bondgun.c, and related functions --- docs/piracychecks.md | 2 +- ld/gamefiles.ntsc-beta.inc | 2 +- ld/gamefiles.ntsc-final.inc | 2 +- ld/gamefiles.pal-final.inc | 2 +- src/game/activemenu/activemenu.c | 26 +- src/game/activemenu/tick.c | 6 +- src/game/bg.c | 4 +- src/game/bondbike.c | 6 +- src/game/bondeyespy.c | 4 +- src/game/bondgrab.c | 10 +- src/game/{game_097ba0.c => bondgun.c} | 2606 ++++++++++++------------- src/game/bondmove.c | 300 +-- src/game/bondwalk.c | 14 +- src/game/chr/chr.c | 18 +- src/game/chr/chraction.c | 52 +- src/game/chr/chraicommands.c | 34 +- src/game/endscreen.c | 18 +- src/game/game_010b20.c | 18 +- src/game/game_011110.c | 154 +- src/game/game_01b0a0.c | 2 +- src/game/game_01bea0.c | 10 +- src/game/game_0abe70.c | 14 +- src/game/game_0b0fd0.c | 24 +- src/game/game_0b63b0.c | 2 +- src/game/game_0b69d0.c | 124 +- src/game/game_0e0770.c | 6 +- src/game/game_0f09f0.c | 20 +- src/game/game_102240.c | 12 +- src/game/game_127910.c | 4 +- src/game/game_190260.c | 46 +- src/game/game_1999b0.c | 16 +- src/game/game_1a7560.c | 2 +- src/game/inventory/inventory.c | 30 +- src/game/lv.c | 38 +- src/game/mplayer/mplayer.c | 4 +- src/game/mplayer/scenarios.c | 42 +- src/game/mpstats.c | 2 +- src/game/prop.c | 62 +- src/game/propobj.c | 184 +- src/game/sight.c | 4 +- src/game/title.c | 4 +- src/game/training/menus.c | 16 +- src/game/training/training.c | 134 +- src/include/game/bondgun.h | 183 ++ src/include/game/game_097ba0.h | 183 -- src/include/types.h | 2 +- tools/patchpiracysums | 2 +- 47 files changed, 2225 insertions(+), 2225 deletions(-) rename src/game/{game_097ba0.c => bondgun.c} (96%) create mode 100644 src/include/game/bondgun.h delete mode 100644 src/include/game/game_097ba0.h diff --git a/docs/piracychecks.md b/docs/piracychecks.md index 77baf2e52..c37b8c4be 100644 --- a/docs/piracychecks.md +++ b/docs/piracychecks.md @@ -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. diff --git a/ld/gamefiles.ntsc-beta.inc b/ld/gamefiles.ntsc-beta.inc index fe7e30d48..42385b986 100644 --- a/ld/gamefiles.ntsc-beta.inc +++ b/ld/gamefiles.ntsc-beta.inc @@ -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); \ diff --git a/ld/gamefiles.ntsc-final.inc b/ld/gamefiles.ntsc-final.inc index 7852399ff..10b95406b 100644 --- a/ld/gamefiles.ntsc-final.inc +++ b/ld/gamefiles.ntsc-final.inc @@ -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); \ diff --git a/ld/gamefiles.pal-final.inc b/ld/gamefiles.pal-final.inc index 7852399ff..10b95406b 100644 --- a/ld/gamefiles.pal-final.inc +++ b/ld/gamefiles.pal-final.inc @@ -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); \ diff --git a/src/game/activemenu/activemenu.c b/src/game/activemenu/activemenu.c index e6c1062a3..cc82fb481 100644 --- a/src/game/activemenu/activemenu.c +++ b/src/game/activemenu/activemenu.c @@ -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: diff --git a/src/game/activemenu/tick.c b/src/game/activemenu/tick.c index 80980e0c5..3b7ad2790 100644 --- a/src/game/activemenu/tick.c +++ b/src/game/activemenu/tick.c @@ -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 diff --git a/src/game/bg.c b/src/game/bg.c index 402cfe46d..0aabd6b56 100644 --- a/src/game/bg.c +++ b/src/game/bg.c @@ -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 diff --git a/src/game/bondbike.c b/src/game/bondbike.c index 8e8fb4e53..ca3af9a55 100644 --- a/src/game/bondbike.c +++ b/src/game/bondbike.c @@ -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]); diff --git a/src/game/bondeyespy.c b/src/game/bondeyespy.c index 4bcc58206..ebae2a520 100644 --- a/src/game/bondeyespy.c +++ b/src/game/bondeyespy.c @@ -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 { diff --git a/src/game/bondgrab.c b/src/game/bondgrab.c index 8c55403a0..243bc2b5c 100644 --- a/src/game/bondgrab.c +++ b/src/game/bondgrab.c @@ -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: diff --git a/src/game/game_097ba0.c b/src/game/bondgun.c similarity index 96% rename from src/game/game_097ba0.c rename to src/game/bondgun.c index bfe356535..fd047d145 100644 --- a/src/game/game_097ba0.c +++ b/src/game/bondgun.c @@ -13,7 +13,7 @@ #include "game/game_096b20.h" #include "game/game_096ca0.h" #include "game/game_097aa0.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" @@ -126,7 +126,7 @@ u32 var80070118 = 0x78000000; u32 var8007011c = 0x00000000; #if VERSION >= VERSION_NTSC_1_0 -void func0f097ba0(s32 handnum, s32 weaponnum) +void bgun0f097ba0(s32 handnum, s32 weaponnum) { u32 stack; s32 contpadtouse1; @@ -178,7 +178,7 @@ void func0f097ba0(s32 handnum, s32 weaponnum) } #else GLOBAL_ASM( -glabel func0f097ba0 +glabel bgun0f097ba0 /* f095b30: 27bdffd0 */ addiu $sp,$sp,-48 /* f095b34: 3c08800a */ lui $t0,0x800a /* f095b38: 2508e6c0 */ addiu $t0,$t0,-6464 @@ -346,7 +346,7 @@ glabel func0f097ba0 ); #endif -s32 weaponGetUnequippedReloadIndex(s32 weaponnum) +s32 bgunGetUnequippedReloadIndex(s32 weaponnum) { if (weaponnum == WEAPON_CROSSBOW) { return 0; @@ -376,7 +376,7 @@ s32 weaponGetUnequippedReloadIndex(s32 weaponnum) * The gunroundsspent value is actually a countdown timer, * not the number of rounds as the name suggests. */ -void handsTickUnequippedReload(void) +void bgunTickUnequippedReload(void) { s32 i; s32 j; @@ -396,7 +396,7 @@ void handsTickUnequippedReload(void) } } -bool func0f097df0(struct inventory_typef *arg0, struct hand *hand) +bool bgun0f097df0(struct inventory_typef *arg0, struct hand *hand) { bool result = true; @@ -421,7 +421,7 @@ bool func0f097df0(struct inventory_typef *arg0, struct hand *hand) return result; } -void func0f097e74(s16 partnum, s32 arg1, struct hand *hand, struct modelfiledata *arg3) +void bgun0f097e74(s16 partnum, s32 arg1, struct hand *hand, struct modelfiledata *arg3) { struct modelnode *node; @@ -446,7 +446,7 @@ void func0f097e74(s16 partnum, s32 arg1, struct hand *hand, struct modelfiledata } } -void func0f097f28(struct hand *hand, struct modelfiledata *filedata, struct inventory_typef *arg2) +void bgun0f097f28(struct hand *hand, struct modelfiledata *filedata, struct inventory_typef *arg2) { struct inventory_typef *thing = arg2; bool done = false; @@ -456,21 +456,21 @@ void func0f097f28(struct hand *hand, struct modelfiledata *filedata, struct inve } while (!done) { - if (func0f097df0(thing, hand)) { + if (bgun0f097df0(thing, hand)) { if (thing->unk04 == 0) { - func0f097e74(thing->partnum, 1, hand, filedata); + bgun0f097e74(thing->partnum, 1, hand, filedata); } if (thing->unk04 == 1) { - func0f097e74(thing->partnum, 0, hand, filedata); + bgun0f097e74(thing->partnum, 0, hand, filedata); } if (thing->unk04 == 3) { - func0f097e74(thing->partnum, 1, hand, filedata); + bgun0f097e74(thing->partnum, 1, hand, filedata); } } else { if (thing->unk04 == 3) { - func0f097e74(thing->partnum, 0, hand, filedata); + bgun0f097e74(thing->partnum, 0, hand, filedata); } } @@ -482,29 +482,29 @@ void func0f097f28(struct hand *hand, struct modelfiledata *filedata, struct inve } } -void func0f098030(struct hand *hand, struct modelfiledata *arg1) +void bgun0f098030(struct hand *hand, struct modelfiledata *arg1) { struct weapon *weapon = weaponFindById(hand->gset.weaponnum); s32 i; s32 j; - func0f097f28(hand, arg1, weapon->fptr); - func0f097e74(MODELPART_0042, 0, hand, arg1); + bgun0f097f28(hand, arg1, weapon->fptr); + bgun0f097e74(MODELPART_0042, 0, hand, arg1); for (i = 0; i < 2; i++) { if (weapon->ammos[i] && (weapon->ammos[i]->flags & WEAPONFLAG_ONEHANDED)) { for (j = 0; j < hand->clipsizes[i]; j++) { if (j >= hand->loadedammo[i]) { - func0f097e74(j + 100, 0, hand, arg1); + bgun0f097e74(j + 100, 0, hand, arg1); } else { - func0f097e74(j + 100, 1, hand, arg1); + bgun0f097e74(j + 100, 1, hand, arg1); } } } } } -f32 func0f09815c(struct hand *hand) +f32 bgun0f09815c(struct hand *hand) { if (hand->animmode == HANDANIMMODE_BUSY && hand->unk0ce8 != NULL) { if (hand->unk0ce8->unk04 < 0) { @@ -519,7 +519,7 @@ f32 func0f09815c(struct hand *hand) #if VERSION >= VERSION_PAL_FINAL GLOBAL_ASM( -glabel func0f0981e8 +glabel bgun0f0981e8 .late_rodata glabel var7f1ad398pf .word 0x461c4000 @@ -550,7 +550,7 @@ glabel var7f1ad3acpf /* f09813c: 00809025 */ move $s2,$a0 /* f098140: 1701000f */ bne $t8,$at,.PF0f098180 /* f098144: a08f0690 */ sb $t7,0x690($a0) -/* f098148: 0fc2601f */ jal func0f09815c +/* f098148: 0fc2601f */ jal bgun0f09815c /* f09814c: 00000000 */ nop /* f098150: 46000506 */ mov.s $f20,$f0 /* f098154: 0c0073fa */ jal modelGetNumAnimFrames @@ -690,7 +690,7 @@ glabel var7f1ad3acpf /* f09834c: ae400684 */ sw $zero,0x684($s2) /* f098350: e6420688 */ swc1 $f2,0x688($s2) .PF0f098354: -/* f098354: 0fc2601f */ jal func0f09815c +/* f098354: 0fc2601f */ jal bgun0f09815c /* f098358: 02402025 */ move $a0,$s2 /* f09835c: 44809000 */ mtc1 $zero,$f18 /* f098360: c6500688 */ lwc1 $f16,0x688($s2) @@ -820,7 +820,7 @@ glabel var7f1ad3acpf /* f09851c: 00000000 */ nop /* f098520: 45020060 */ bc1fl .PF0f0986a4 /* f098524: 8fac014c */ lw $t4,0x14c($sp) -/* f098528: 0fc2601f */ jal func0f09815c +/* f098528: 0fc2601f */ jal bgun0f09815c /* f09852c: 02402025 */ move $a0,$s2 /* f098530: 962a0002 */ lhu $t2,0x2($s1) /* f098534: 3c014f80 */ lui $at,0x4f80 @@ -939,7 +939,7 @@ glabel var7f1ad3acpf /* f0986d4: afa3005c */ sw $v1,0x5c($sp) /* f0986d8: afa2007c */ sw $v0,0x7c($sp) /* f0986dc: 02403025 */ move $a2,$s2 -/* f0986e0: 0fc25f65 */ jal func0f097e74 +/* f0986e0: 0fc25f65 */ jal bgun0f097e74 /* f0986e4: 8fa70164 */ lw $a3,0x164($sp) /* f0986e8: 8fa2007c */ lw $v0,0x7c($sp) /* f0986ec: 8fa3005c */ lw $v1,0x5c($sp) @@ -959,7 +959,7 @@ glabel var7f1ad3acpf /* f09871c: 8e450684 */ lw $a1,0x684($s2) /* f098720: 0c007afa */ jal func0001ee18 /* f098724: 24060001 */ li $a2,0x1 -/* f098728: 0fc2601f */ jal func0f09815c +/* f098728: 0fc2601f */ jal bgun0f09815c /* f09872c: 02402025 */ move $a0,$s2 /* f098730: 8e4306b0 */ lw $v1,0x6b0($s2) /* f098734: 46000386 */ mov.s $f14,$f0 @@ -1092,7 +1092,7 @@ glabel var7f1ad3acpf ); #elif VERSION >= VERSION_NTSC_1_0 GLOBAL_ASM( -glabel func0f0981e8 +glabel bgun0f0981e8 .late_rodata glabel var7f1ac1a8 .word 0x461c4000 @@ -1116,7 +1116,7 @@ glabel var7f1ac1b0 /* f098218: 00809825 */ or $s3,$a0,$zero /* f09821c: 1701000f */ bne $t8,$at,.L0f09825c /* f098220: a08f0690 */ sb $t7,0x690($a0) -/* f098224: 0fc26057 */ jal func0f09815c +/* f098224: 0fc26057 */ jal bgun0f09815c /* f098228: 00000000 */ nop /* f09822c: e7a00060 */ swc1 $f0,0x60($sp) /* f098230: 0c007486 */ jal modelGetNumAnimFrames @@ -1244,7 +1244,7 @@ glabel var7f1ac1b0 /* f0983f8: 00000000 */ nop /* f0983fc: ae600684 */ sw $zero,0x684($s3) .L0f098400: -/* f098400: 0fc26057 */ jal func0f09815c +/* f098400: 0fc26057 */ jal bgun0f09815c /* f098404: 02602025 */ or $a0,$s3,$zero /* f098408: 4600018d */ trunc.w.s $f6,$f0 /* f09840c: 8e6b0684 */ lw $t3,0x684($s3) @@ -1351,7 +1351,7 @@ glabel var7f1ac1b0 /* f098570: 10200043 */ beqz $at,.L0f098680 /* f098574: 00000000 */ nop /* f098578: 02602025 */ or $a0,$s3,$zero -/* f09857c: 0fc26057 */ jal func0f09815c +/* f09857c: 0fc26057 */ jal bgun0f09815c /* f098580: afa90144 */ sw $t1,0x144($sp) /* f098584: 4600010d */ trunc.w.s $f4,$f0 /* f098588: 962f0002 */ lhu $t7,0x2($s1) @@ -1437,7 +1437,7 @@ glabel var7f1ac1b0 /* f0986ac: afa30054 */ sw $v1,0x54($sp) /* f0986b0: afa20074 */ sw $v0,0x74($sp) /* f0986b4: 02603025 */ or $a2,$s3,$zero -/* f0986b8: 0fc25f9d */ jal func0f097e74 +/* f0986b8: 0fc25f9d */ jal bgun0f097e74 /* f0986bc: 8fa7015c */ lw $a3,0x15c($sp) /* f0986c0: 8fa20074 */ lw $v0,0x74($sp) /* f0986c4: 8fa30054 */ lw $v1,0x54($sp) @@ -1452,7 +1452,7 @@ glabel var7f1ac1b0 /* f0986e0: 8e650684 */ lw $a1,0x684($s3) /* f0986e4: 0c007cc5 */ jal func0001f314 /* f0986e8: 24060001 */ addiu $a2,$zero,0x1 -/* f0986ec: 0fc26057 */ jal func0f09815c +/* f0986ec: 0fc26057 */ jal bgun0f09815c /* f0986f0: 02602025 */ or $a0,$s3,$zero /* f0986f4: 4600020d */ trunc.w.s $f8,$f0 /* f0986f8: 8e6306b0 */ lw $v1,0x6b0($s3) @@ -1566,7 +1566,7 @@ glabel var7f1ac1b0 ); #else GLOBAL_ASM( -glabel func0f0981e8 +glabel bgun0f0981e8 .late_rodata glabel var7f1ac1a8 .word 0x461c4000 @@ -1590,7 +1590,7 @@ glabel var7f1ac1b0 /* f096284: 00809825 */ or $s3,$a0,$zero /* f096288: 1701000f */ bne $t8,$at,.NB0f0962c8 /* f09628c: a08f0690 */ sb $t7,0x690($a0) -/* f096290: 0fc25872 */ jal func0f09815c +/* f096290: 0fc25872 */ jal bgun0f09815c /* f096294: 00000000 */ sll $zero,$zero,0x0 /* f096298: e7a00054 */ swc1 $f0,0x54($sp) /* f09629c: 0c0078a6 */ jal modelGetNumAnimFrames @@ -1718,7 +1718,7 @@ glabel var7f1ac1b0 /* f096464: 00000000 */ sll $zero,$zero,0x0 /* f096468: ae600684 */ sw $zero,0x684($s3) .NB0f09646c: -/* f09646c: 0fc25872 */ jal func0f09815c +/* f09646c: 0fc25872 */ jal bgun0f09815c /* f096470: 02602025 */ or $a0,$s3,$zero /* f096474: 4600018d */ trunc.w.s $f6,$f0 /* f096478: 8e6b0684 */ lw $t3,0x684($s3) @@ -1825,7 +1825,7 @@ glabel var7f1ac1b0 /* f0965dc: 10200043 */ beqz $at,.NB0f0966ec /* f0965e0: 00000000 */ sll $zero,$zero,0x0 /* f0965e4: 02602025 */ or $a0,$s3,$zero -/* f0965e8: 0fc25872 */ jal func0f09815c +/* f0965e8: 0fc25872 */ jal bgun0f09815c /* f0965ec: afa9013c */ sw $t1,0x13c($sp) /* f0965f0: 4600010d */ trunc.w.s $f4,$f0 /* f0965f4: 962f0002 */ lhu $t7,0x2($s1) @@ -1911,7 +1911,7 @@ glabel var7f1ac1b0 /* f096718: afa30048 */ sw $v1,0x48($sp) /* f09671c: afa2006c */ sw $v0,0x6c($sp) /* f096720: 02603025 */ or $a2,$s3,$zero -/* f096724: 0fc257b8 */ jal func0f097e74 +/* f096724: 0fc257b8 */ jal bgun0f097e74 /* f096728: 8fa70154 */ lw $a3,0x154($sp) /* f09672c: 8fa2006c */ lw $v0,0x6c($sp) /* f096730: 8fa30048 */ lw $v1,0x48($sp) @@ -1926,7 +1926,7 @@ glabel var7f1ac1b0 /* f09674c: 8e650684 */ lw $a1,0x684($s3) /* f096750: 0c0080eb */ jal func0001f314 /* f096754: 24060001 */ addiu $a2,$zero,0x1 -/* f096758: 0fc25872 */ jal func0f09815c +/* f096758: 0fc25872 */ jal bgun0f09815c /* f09675c: 02602025 */ or $a0,$s3,$zero /* f096760: 4600020d */ trunc.w.s $f8,$f0 /* f096764: 8e6306b0 */ lw $v1,0x6b0($s3) @@ -2027,7 +2027,7 @@ glabel var7f1ac1b0 ); #endif -bool func0f098884(struct guncmd *cmd, struct gset *gset) +bool bgun0f098884(struct guncmd *cmd, struct gset *gset) { s32 result = false; @@ -2046,7 +2046,7 @@ bool func0f098884(struct guncmd *cmd, struct gset *gset) return result; } -void func0f0988e0(struct guncmd *cmd, s32 handnum, struct hand *hand) +void bgun0f0988e0(struct guncmd *cmd, s32 handnum, struct hand *hand) { if (cmd->type != GUNCMD_PLAYANIMATION) { struct guncmd *loopcmd = cmd; @@ -2054,14 +2054,14 @@ void func0f0988e0(struct guncmd *cmd, s32 handnum, struct hand *hand) u32 rand = random() % 100; while (loopcmd->type != GUNCMD_END) { - if (func0f098884(loopcmd, &hand->gset) && !done) { + if (bgun0f098884(loopcmd, &hand->gset) && !done) { if (loopcmd->type == GUNCMD_INCLUDE) { done = true; - func0f0988e0((struct guncmd *)loopcmd->unk04, handnum, hand); + bgun0f0988e0((struct guncmd *)loopcmd->unk04, handnum, hand); } else if (loopcmd->type == GUNCMD_RANDOM) { if ((struct guncmd *)loopcmd->unk04 != hand->unk0d80 && loopcmd->unk02 > rand) { done = true; - func0f0988e0((struct guncmd *)loopcmd->unk04, handnum, hand); + bgun0f0988e0((struct guncmd *)loopcmd->unk04, handnum, hand); } } } @@ -2081,7 +2081,7 @@ void func0f0988e0(struct guncmd *cmd, s32 handnum, struct hand *hand) } } -bool func0f098a44(struct hand *hand, s32 time) +bool bgun0f098a44(struct hand *hand, s32 time) { struct guncmd *cmd = hand->unk0ce8; s32 waittimekeyframe = -1; @@ -2105,24 +2105,24 @@ bool func0f098a44(struct hand *hand, s32 time) if (waittimekeyframe >= 0) { #if VERSION >= VERSION_PAL_FINAL - if (hand->unk0cc8_01 && func0f09815c(hand) <= zreleasekeyframe) { + if (hand->unk0cc8_01 && bgun0f09815c(hand) <= zreleasekeyframe) { return false; } - return (func0f09815c(hand) + hand->animframeincfreal >= waittimekeyframe); + return (bgun0f09815c(hand) + hand->animframeincfreal >= waittimekeyframe); #else - if (hand->unk0cc8_01 && (s32)func0f09815c(hand) <= zreleasekeyframe) { + if (hand->unk0cc8_01 && (s32)bgun0f09815c(hand) <= zreleasekeyframe) { return false; } - return (func0f09815c(hand) + hand->animframeinc >= waittimekeyframe); + return (bgun0f09815c(hand) + hand->animframeinc >= waittimekeyframe); #endif } return true; } -s32 func0f098b80(struct hand *hand, s32 arg1) +s32 bgun0f098b80(struct hand *hand, s32 arg1) { struct guncmd *cmd = hand->unk0ce8; s32 keyframe = -1; @@ -2148,12 +2148,12 @@ s32 func0f098b80(struct hand *hand, s32 arg1) return keyframe; } -bool handIsAnimBusy(struct hand *hand) +bool bgunIsAnimBusy(struct hand *hand) { return hand->animmode != HANDANIMMODE_IDLE; } -void handResetAnim(struct hand *hand) +void bgunResetAnim(struct hand *hand) { hand->animload = -1; hand->animmode = HANDANIMMODE_IDLE; @@ -2165,9 +2165,9 @@ void handResetAnim(struct hand *hand) hand->unk0d0e_07 = false; } -void handGetWeaponInfo(struct handweaponinfo *info, s32 handnum) +void bgunGetWeaponInfo(struct handweaponinfo *info, s32 handnum) { - s32 weaponnum = getCurrentPlayerWeaponIdWrapper(handnum); + s32 weaponnum = bgunGetWeaponNum2(handnum); info->weaponnum = weaponnum; info->definition = g_Weapons[weaponnum]; @@ -2182,7 +2182,7 @@ void handGetWeaponInfo(struct handweaponinfo *info, s32 handnum) * 2 = has ammo in clip but none in reserve * 3 = gun doesn't use ammo or clip is full */ -s32 func0f098ca0(s32 funcnum, struct handweaponinfo *info, struct hand *hand) +s32 bgun0f098ca0(s32 funcnum, struct handweaponinfo *info, struct hand *hand) { s32 result = 3; struct weaponfunc *func = weaponGetFunction(&hand->gset, funcnum); @@ -2203,7 +2203,7 @@ s32 func0f098ca0(s32 funcnum, struct handweaponinfo *info, struct hand *hand) } if (info->weaponnum == WEAPON_TRANQUILIZER && funcnum == FUNC_SECONDARY) { - minqty = weaponGetMinClipQty(WEAPON_TRANQUILIZER, FUNC_SECONDARY); + minqty = bgunGetMinClipQty(WEAPON_TRANQUILIZER, FUNC_SECONDARY); } result = 1; @@ -2227,7 +2227,7 @@ s32 func0f098ca0(s32 funcnum, struct handweaponinfo *info, struct hand *hand) #if VERSION >= VERSION_PAL_FINAL GLOBAL_ASM( -glabel func0f098df8 +glabel bgun0f098df8 /* f098e78: 27bdffc8 */ addiu $sp,$sp,-56 /* f098e7c: afb00018 */ sw $s0,0x18($sp) /* f098e80: 00a08025 */ move $s0,$a1 @@ -2260,7 +2260,7 @@ glabel func0f098df8 /* f098eec: afa3002c */ sw $v1,0x2c($sp) /* f098ef0: afa70024 */ sw $a3,0x24($sp) /* f098ef4: afa60020 */ sw $a2,0x20($sp) -/* f098ef8: 0fc25f0b */ jal weaponGetUnequippedReloadIndex +/* f098ef8: 0fc25f0b */ jal bgunGetUnequippedReloadIndex /* f098efc: afa50030 */ sw $a1,0x30($sp) /* f098f00: 3c0b8009 */ lui $t3,0x8009 /* f098f04: 916b8d54 */ lbu $t3,-0x72ac($t3) @@ -2341,7 +2341,7 @@ glabel func0f098df8 ); #else GLOBAL_ASM( -glabel func0f098df8 +glabel bgun0f098df8 /* f098df8: 27bdffc8 */ addiu $sp,$sp,-56 /* f098dfc: afb00018 */ sw $s0,0x18($sp) /* f098e00: 00a08025 */ or $s0,$a1,$zero @@ -2374,7 +2374,7 @@ glabel func0f098df8 /* f098e6c: afa3002c */ sw $v1,0x2c($sp) /* f098e70: afa70024 */ sw $a3,0x24($sp) /* f098e74: afa60020 */ sw $a2,0x20($sp) -/* f098e78: 0fc25f43 */ jal weaponGetUnequippedReloadIndex +/* f098e78: 0fc25f43 */ jal bgunGetUnequippedReloadIndex /* f098e7c: afa50030 */ sw $a1,0x30($sp) /* f098e80: 3c0b8009 */ lui $t3,%hi(g_FrIsValidWeapon) /* f098e84: 916b8804 */ lbu $t3,%lo(g_FrIsValidWeapon)($t3) @@ -2452,35 +2452,35 @@ glabel func0f098df8 ); #endif -void func0f098f8c(struct handweaponinfo *info, struct hand *hand) +void bgun0f098f8c(struct handweaponinfo *info, struct hand *hand) { s32 i; for (i = 0; i < 2; i++) { if (weaponGetFunction(&hand->gset, i)) { - func0f098df8(i, info, hand, 0, 1); + bgun0f098df8(i, info, hand, 0, 1); } } } -bool func0f099008(s32 handnum) +bool bgun0f099008(s32 handnum) { struct handweaponinfo info; - handGetWeaponInfo(&info, handnum); + bgunGetWeaponInfo(&info, handnum); - if (func0f098ca0(0, &info, &g_Vars.currentplayer->hands[handnum]) > 0) { + if (bgun0f098ca0(0, &info, &g_Vars.currentplayer->hands[handnum]) > 0) { return true; } - if (func0f098ca0(1, &info, &g_Vars.currentplayer->hands[handnum]) > 0) { + if (bgun0f098ca0(1, &info, &g_Vars.currentplayer->hands[handnum]) > 0) { return true; } return false; } -bool func0f0990b0(struct weaponfunc *basefunc, struct weapon *weapon) +bool bgun0f0990b0(struct weaponfunc *basefunc, struct weapon *weapon) { if (!basefunc) { return true; @@ -2512,46 +2512,46 @@ bool func0f0990b0(struct weaponfunc *basefunc, struct weapon *weapon) if (basefunc->ammoindex >= 0 && weapon->ammos[basefunc->ammoindex] - && currentPlayerGetAmmoCount(weapon->ammos[basefunc->ammoindex]->type) <= 0) { + && bgunGetAmmoCount(weapon->ammos[basefunc->ammoindex]->type) <= 0) { return true; } return false; } -bool func0f099188(struct hand *hand, s32 gunfunc) +bool bgun0f099188(struct hand *hand, s32 gunfunc) { struct weaponfunc *func = weaponGetFunction(&hand->gset, gunfunc); struct weapon *weapon = weaponFindById(hand->gset.weaponnum); - if (currentPlayerIsUsingSecondaryFunction() == gunfunc) { + if (bgunIsUsingSecondaryFunction() == gunfunc) { return false; } - return func0f0990b0(func, weapon); + return bgun0f0990b0(func, weapon); } #if VERSION >= VERSION_PAL_FINAL GLOBAL_ASM( -glabel handTickIncIdle +glabel bgunTickIncIdle /* f099270: 27bdffc0 */ addiu $sp,$sp,-64 /* f099274: afbf001c */ sw $ra,0x1c($sp) /* f099278: afb00018 */ sw $s0,0x18($sp) /* f09927c: 00c08025 */ move $s0,$a2 /* f099280: afa40040 */ sw $a0,0x40($sp) /* f099284: afa50044 */ sw $a1,0x44($sp) -/* f099288: 0fc2a432 */ jal currentPlayerIsUsingSecondaryFunction +/* f099288: 0fc2a432 */ jal bgunIsUsingSecondaryFunction /* f09928c: afa7004c */ sw $a3,0x4c($sp) /* f099290: 44802000 */ mtc1 $zero,$f4 /* f099294: afa20038 */ sw $v0,0x38($sp) /* f099298: a20005dc */ sb $zero,0x5dc($s0) /* f09929c: ae000558 */ sw $zero,0x558($s0) /* f0992a0: e60405fc */ swc1 $f4,0x5fc($s0) -/* f0992a4: 0fc26ffc */ jal handIsReadyToSwitch +/* f0992a4: 0fc26ffc */ jal bgunIsReadyToSwitch /* f0992a8: 8fa40044 */ lw $a0,0x44($sp) /* f0992ac: 10400007 */ beqz $v0,.PF0f0992cc /* f0992b0: 8fa40044 */ lw $a0,0x44($sp) -/* f0992b4: 0fc273ec */ jal handSetState +/* f0992b4: 0fc273ec */ jal bgunSetState /* f0992b8: 24050005 */ li $a1,0x5 /* f0992bc: 50400004 */ beqzl $v0,.PF0f0992d0 /* f0992c0: 8fae0038 */ lw $t6,0x38($sp) @@ -2574,7 +2574,7 @@ glabel handTickIncIdle /* f0992f8: 11600106 */ beqz $t3,.PF0f099714 /* f0992fc: a20a0690 */ sb $t2,0x690($s0) /* f099300: 92040003 */ lbu $a0,0x3($s0) -/* f099304: 0fc26348 */ jal func0f098ca0 +/* f099304: 0fc26348 */ jal bgun0f098ca0 /* f099308: 8fa50040 */ lw $a1,0x40($sp) /* f09930c: 92030003 */ lbu $v1,0x3($s0) /* f099310: 8fac0038 */ lw $t4,0x38($sp) @@ -2594,7 +2594,7 @@ glabel handTickIncIdle /* f099348: 8fa50040 */ lw $a1,0x40($sp) /* f09934c: 02003025 */ move $a2,$s0 /* f099350: afa7002c */ sw $a3,0x2c($sp) -/* f099354: 0fc26348 */ jal func0f098ca0 +/* f099354: 0fc26348 */ jal bgun0f098ca0 /* f099358: afa20034 */ sw $v0,0x34($sp) /* f09935c: 8fa7002c */ lw $a3,0x2c($sp) /* f099360: 04410002 */ bgez $v0,.PF0f09936c @@ -2616,7 +2616,7 @@ glabel handTickIncIdle /* f09939c: a20b0003 */ sb $t3,0x3($s0) /* f0993a0: afa80034 */ sw $t0,0x34($sp) /* f0993a4: afa7002c */ sw $a3,0x2c($sp) -/* f0993a8: 0fc273ec */ jal handSetState +/* f0993a8: 0fc273ec */ jal bgunSetState /* f0993ac: 8fa40044 */ lw $a0,0x44($sp) /* f0993b0: 8fa7002c */ lw $a3,0x2c($sp) /* f0993b4: 10400006 */ beqz $v0,.PF0f0993d0 @@ -2635,7 +2635,7 @@ glabel handTickIncIdle /* f0993e0: 318dfffd */ andi $t5,$t4,0xfffd /* f0993e4: a20d0690 */ sb $t5,0x690($s0) /* f0993e8: afa80034 */ sw $t0,0x34($sp) -/* f0993ec: 0fc273ec */ jal handSetState +/* f0993ec: 0fc273ec */ jal bgunSetState /* f0993f0: 8fa40044 */ lw $a0,0x44($sp) /* f0993f4: 10400003 */ beqz $v0,.PF0f099404 /* f0993f8: 8fa80034 */ lw $t0,0x34($sp) @@ -2658,7 +2658,7 @@ glabel handTickIncIdle /* f099438: 13210007 */ beq $t9,$at,.PF0f099458 /* f09943c: 00000000 */ nop .PF0f099440: -/* f099440: 0fc273ec */ jal handSetState +/* f099440: 0fc273ec */ jal bgunSetState /* f099444: 24050008 */ li $a1,0x8 /* f099448: 10400003 */ beqz $v0,.PF0f099458 /* f09944c: 00000000 */ nop @@ -2700,13 +2700,13 @@ glabel handTickIncIdle /* f0994d0: 8fae0044 */ lw $t6,0x44($sp) /* f0994d4: 920c0003 */ lbu $t4,0x3($s0) /* f0994d8: 240d0001 */ li $t5,0x1 -/* f0994dc: 0fc26348 */ jal func0f098ca0 +/* f0994dc: 0fc26348 */ jal bgun0f098ca0 /* f0994e0: 01ac2023 */ subu $a0,$t5,$t4 /* f0994e4: 920e0003 */ lbu $t6,0x3($s0) /* f0994e8: 24190001 */ li $t9,0x1 /* f0994ec: afa20030 */ sw $v0,0x30($sp) /* f0994f0: 02002025 */ move $a0,$s0 -/* f0994f4: 0fc26485 */ jal func0f099188 +/* f0994f4: 0fc26485 */ jal bgun0f099188 /* f0994f8: 032e2823 */ subu $a1,$t9,$t6 /* f0994fc: 1040001a */ beqz $v0,.PF0f099568 /* f099500: 8fa30030 */ lw $v1,0x30($sp) @@ -2757,7 +2757,7 @@ glabel handTickIncIdle /* f0995a8: 24050007 */ li $a1,0x7 /* f0995ac: 358e0002 */ ori $t6,$t4,0x2 /* f0995b0: a20e0690 */ sb $t6,0x690($s0) -/* f0995b4: 0fc273ec */ jal handSetState +/* f0995b4: 0fc273ec */ jal bgunSetState /* f0995b8: 8fa40044 */ lw $a0,0x44($sp) /* f0995bc: 50400056 */ beqzl $v0,.PF0f099718 /* f0995c0: 8fae0044 */ lw $t6,0x44($sp) @@ -2778,7 +2778,7 @@ glabel handTickIncIdle /* f0995f8: 24050003 */ li $a1,0x3 /* f0995fc: 314bff7f */ andi $t3,$t2,0xff7f /* f099600: a20b0690 */ sb $t3,0x690($s0) -/* f099604: 0fc273ec */ jal handSetState +/* f099604: 0fc273ec */ jal bgunSetState /* f099608: 8fa40044 */ lw $a0,0x44($sp) /* f09960c: 50400042 */ beqzl $v0,.PF0f099718 /* f099610: 8fae0044 */ lw $t6,0x44($sp) @@ -2787,7 +2787,7 @@ glabel handTickIncIdle /* f09961c: ae00001c */ sw $zero,0x1c($s0) .PF0f099620: /* f099620: ae000018 */ sw $zero,0x18($s0) -/* f099624: 0fc273ec */ jal handSetState +/* f099624: 0fc273ec */ jal bgunSetState /* f099628: 8fa40044 */ lw $a0,0x44($sp) /* f09962c: 5040003a */ beqzl $v0,.PF0f099718 /* f099630: 8fae0044 */ lw $t6,0x44($sp) @@ -2823,7 +2823,7 @@ glabel handTickIncIdle /* f0996a0: ae000014 */ sw $zero,0x14($s0) /* f0996a4: a21906d7 */ sb $t9,0x6d7($s0) /* f0996a8: afa80034 */ sw $t0,0x34($sp) -/* f0996ac: 0fc273ec */ jal handSetState +/* f0996ac: 0fc273ec */ jal bgunSetState /* f0996b0: 8fa40044 */ lw $a0,0x44($sp) /* f0996b4: 10400003 */ beqz $v0,.PF0f0996c4 /* f0996b8: 8fa80034 */ lw $t0,0x34($sp) @@ -2845,7 +2845,7 @@ glabel handTickIncIdle /* f0996f0: 8fae0044 */ lw $t6,0x44($sp) /* f0996f4: 05000007 */ bltz $t0,.PF0f099714 /* f0996f8: 8fa40044 */ lw $a0,0x44($sp) -/* f0996fc: 0fc273ec */ jal handSetState +/* f0996fc: 0fc273ec */ jal bgunSetState /* f099700: 24050001 */ li $a1,0x1 /* f099704: 50400004 */ beqzl $v0,.PF0f099718 /* f099708: 8fae0044 */ lw $t6,0x44($sp) @@ -2866,7 +2866,7 @@ glabel handTickIncIdle /* f09973c: 00095f40 */ sll $t3,$t1,0x1d /* f099740: 05610005 */ bgez $t3,.PF0f099758 /* f099744: 000c6080 */ sll $t4,$t4,0x2 -/* f099748: 0fc2884a */ jal currentPlayerAutoSwitchWeapon +/* f099748: 0fc2884a */ jal bgunAutoSwitchWeapon /* f09974c: 00000000 */ nop /* f099750: 10000027 */ b .PF0f0997f0 /* f099754: 00001025 */ move $v0,$zero @@ -2900,7 +2900,7 @@ glabel handTickIncIdle /* f0997b8: 51a00005 */ beqzl $t5,.PF0f0997d0 /* f0997bc: 904c0690 */ lbu $t4,0x690($v0) .PF0f0997c0: -/* f0997c0: 0fc2884a */ jal currentPlayerAutoSwitchWeapon +/* f0997c0: 0fc2884a */ jal bgunAutoSwitchWeapon /* f0997c4: afa20024 */ sw $v0,0x24($sp) /* f0997c8: 8fa20024 */ lw $v0,0x24($sp) /* f0997cc: 904c0690 */ lbu $t4,0x690($v0) @@ -2922,14 +2922,14 @@ glabel handTickIncIdle ); #else GLOBAL_ASM( -glabel handTickIncIdle +glabel bgunTickIncIdle /* f0991e4: 27bdffc0 */ addiu $sp,$sp,-64 /* f0991e8: afbf001c */ sw $ra,0x1c($sp) /* f0991ec: afb00018 */ sw $s0,0x18($sp) /* f0991f0: 00c08025 */ or $s0,$a2,$zero /* f0991f4: afa40040 */ sw $a0,0x40($sp) /* f0991f8: afa50044 */ sw $a1,0x44($sp) -/* f0991fc: 0fc2a31f */ jal currentPlayerIsUsingSecondaryFunction +/* f0991fc: 0fc2a31f */ jal bgunIsUsingSecondaryFunction /* f099200: afa7004c */ sw $a3,0x4c($sp) /* f099204: afa20038 */ sw $v0,0x38($sp) /* f099208: 8e0e0684 */ lw $t6,0x684($s0) @@ -2938,11 +2938,11 @@ glabel handTickIncIdle /* f099214: ae000558 */ sw $zero,0x558($s0) /* f099218: ae0e0688 */ sw $t6,0x688($s0) /* f09921c: e60405fc */ swc1 $f4,0x5fc($s0) -/* f099220: 0fc26f56 */ jal handIsReadyToSwitch +/* f099220: 0fc26f56 */ jal bgunIsReadyToSwitch /* f099224: 8fa40044 */ lw $a0,0x44($sp) /* f099228: 10400007 */ beqz $v0,.L0f099248 /* f09922c: 8fa40044 */ lw $a0,0x44($sp) -/* f099230: 0fc27346 */ jal handSetState +/* f099230: 0fc27346 */ jal bgunSetState /* f099234: 24050005 */ addiu $a1,$zero,0x5 /* f099238: 50400004 */ beqzl $v0,.L0f09924c /* f09923c: 8faf0038 */ lw $t7,0x38($sp) @@ -2965,7 +2965,7 @@ glabel handTickIncIdle /* f099274: 11800106 */ beqz $t4,.L0f099690 /* f099278: a20b0690 */ sb $t3,0x690($s0) /* f09927c: 92040003 */ lbu $a0,0x3($s0) -/* f099280: 0fc26328 */ jal func0f098ca0 +/* f099280: 0fc26328 */ jal bgun0f098ca0 /* f099284: 8fa50040 */ lw $a1,0x40($sp) /* f099288: 92030003 */ lbu $v1,0x3($s0) /* f09928c: 8fad0038 */ lw $t5,0x38($sp) @@ -2985,7 +2985,7 @@ glabel handTickIncIdle /* f0992c4: 8fa50040 */ lw $a1,0x40($sp) /* f0992c8: 02003025 */ or $a2,$s0,$zero /* f0992cc: afa7002c */ sw $a3,0x2c($sp) -/* f0992d0: 0fc26328 */ jal func0f098ca0 +/* f0992d0: 0fc26328 */ jal bgun0f098ca0 /* f0992d4: afa20034 */ sw $v0,0x34($sp) /* f0992d8: 8fa7002c */ lw $a3,0x2c($sp) /* f0992dc: 04410002 */ bgez $v0,.L0f0992e8 @@ -3007,7 +3007,7 @@ glabel handTickIncIdle /* f099318: a20c0003 */ sb $t4,0x3($s0) /* f09931c: afa80034 */ sw $t0,0x34($sp) /* f099320: afa7002c */ sw $a3,0x2c($sp) -/* f099324: 0fc27346 */ jal handSetState +/* f099324: 0fc27346 */ jal bgunSetState /* f099328: 8fa40044 */ lw $a0,0x44($sp) /* f09932c: 8fa7002c */ lw $a3,0x2c($sp) /* f099330: 10400006 */ beqz $v0,.L0f09934c @@ -3026,7 +3026,7 @@ glabel handTickIncIdle /* f09935c: 31aefffd */ andi $t6,$t5,0xfffd /* f099360: a20e0690 */ sb $t6,0x690($s0) /* f099364: afa80034 */ sw $t0,0x34($sp) -/* f099368: 0fc27346 */ jal handSetState +/* f099368: 0fc27346 */ jal bgunSetState /* f09936c: 8fa40044 */ lw $a0,0x44($sp) /* f099370: 10400003 */ beqz $v0,.L0f099380 /* f099374: 8fa80034 */ lw $t0,0x34($sp) @@ -3049,7 +3049,7 @@ glabel handTickIncIdle /* f0993b4: 11210007 */ beq $t1,$at,.L0f0993d4 /* f0993b8: 00000000 */ nop .L0f0993bc: -/* f0993bc: 0fc27346 */ jal handSetState +/* f0993bc: 0fc27346 */ jal bgunSetState /* f0993c0: 24050008 */ addiu $a1,$zero,0x8 /* f0993c4: 10400003 */ beqz $v0,.L0f0993d4 /* f0993c8: 00000000 */ nop @@ -3091,13 +3091,13 @@ glabel handTickIncIdle /* f09944c: 8faf0044 */ lw $t7,0x44($sp) /* f099450: 920d0003 */ lbu $t5,0x3($s0) /* f099454: 240e0001 */ addiu $t6,$zero,0x1 -/* f099458: 0fc26328 */ jal func0f098ca0 +/* f099458: 0fc26328 */ jal bgun0f098ca0 /* f09945c: 01cd2023 */ subu $a0,$t6,$t5 /* f099460: 920f0003 */ lbu $t7,0x3($s0) /* f099464: 24090001 */ addiu $t1,$zero,0x1 /* f099468: afa20030 */ sw $v0,0x30($sp) /* f09946c: 02002025 */ or $a0,$s0,$zero -/* f099470: 0fc26462 */ jal func0f099188 +/* f099470: 0fc26462 */ jal bgun0f099188 /* f099474: 012f2823 */ subu $a1,$t1,$t7 /* f099478: 1040001a */ beqz $v0,.L0f0994e4 /* f09947c: 8fa30030 */ lw $v1,0x30($sp) @@ -3148,7 +3148,7 @@ glabel handTickIncIdle /* f099524: 24050007 */ addiu $a1,$zero,0x7 /* f099528: 35af0002 */ ori $t7,$t5,0x2 /* f09952c: a20f0690 */ sb $t7,0x690($s0) -/* f099530: 0fc27346 */ jal handSetState +/* f099530: 0fc27346 */ jal bgunSetState /* f099534: 8fa40044 */ lw $a0,0x44($sp) /* f099538: 50400056 */ beqzl $v0,.L0f099694 /* f09953c: 8faf0044 */ lw $t7,0x44($sp) @@ -3169,7 +3169,7 @@ glabel handTickIncIdle /* f099574: 24050003 */ addiu $a1,$zero,0x3 /* f099578: 316cff7f */ andi $t4,$t3,0xff7f /* f09957c: a20c0690 */ sb $t4,0x690($s0) -/* f099580: 0fc27346 */ jal handSetState +/* f099580: 0fc27346 */ jal bgunSetState /* f099584: 8fa40044 */ lw $a0,0x44($sp) /* f099588: 50400042 */ beqzl $v0,.L0f099694 /* f09958c: 8faf0044 */ lw $t7,0x44($sp) @@ -3178,7 +3178,7 @@ glabel handTickIncIdle /* f099598: ae00001c */ sw $zero,0x1c($s0) .L0f09959c: /* f09959c: ae000018 */ sw $zero,0x18($s0) -/* f0995a0: 0fc27346 */ jal handSetState +/* f0995a0: 0fc27346 */ jal bgunSetState /* f0995a4: 8fa40044 */ lw $a0,0x44($sp) /* f0995a8: 5040003a */ beqzl $v0,.L0f099694 /* f0995ac: 8faf0044 */ lw $t7,0x44($sp) @@ -3214,7 +3214,7 @@ glabel handTickIncIdle /* f09961c: ae000014 */ sw $zero,0x14($s0) /* f099620: a20906d7 */ sb $t1,0x6d7($s0) /* f099624: afa80034 */ sw $t0,0x34($sp) -/* f099628: 0fc27346 */ jal handSetState +/* f099628: 0fc27346 */ jal bgunSetState /* f09962c: 8fa40044 */ lw $a0,0x44($sp) /* f099630: 10400003 */ beqz $v0,.L0f099640 /* f099634: 8fa80034 */ lw $t0,0x34($sp) @@ -3236,7 +3236,7 @@ glabel handTickIncIdle /* f09966c: 8faf0044 */ lw $t7,0x44($sp) /* f099670: 05000007 */ bltz $t0,.L0f099690 /* f099674: 8fa40044 */ lw $a0,0x44($sp) -/* f099678: 0fc27346 */ jal handSetState +/* f099678: 0fc27346 */ jal bgunSetState /* f09967c: 24050001 */ addiu $a1,$zero,0x1 /* f099680: 50400004 */ beqzl $v0,.L0f099694 /* f099684: 8faf0044 */ lw $t7,0x44($sp) @@ -3257,7 +3257,7 @@ glabel handTickIncIdle /* f0996b8: 000a6740 */ sll $t4,$t2,0x1d /* f0996bc: 05810005 */ bgez $t4,.L0f0996d4 /* f0996c0: 000d6880 */ sll $t5,$t5,0x2 -/* f0996c4: 0fc2877d */ jal currentPlayerAutoSwitchWeapon +/* f0996c4: 0fc2877d */ jal bgunAutoSwitchWeapon /* f0996c8: 00000000 */ nop /* f0996cc: 10000027 */ b .L0f09976c /* f0996d0: 00001025 */ or $v0,$zero,$zero @@ -3291,7 +3291,7 @@ glabel handTickIncIdle /* f099734: 51c00005 */ beqzl $t6,.L0f09974c /* f099738: 904d0690 */ lbu $t5,0x690($v0) .L0f09973c: -/* f09973c: 0fc2877d */ jal currentPlayerAutoSwitchWeapon +/* f09973c: 0fc2877d */ jal bgunAutoSwitchWeapon /* f099740: afa20024 */ sw $v0,0x24($sp) /* f099744: 8fa20024 */ lw $v0,0x24($sp) /* f099748: 904d0690 */ lbu $t5,0x690($v0) @@ -3314,10 +3314,10 @@ glabel handTickIncIdle #endif // Mismatch: regalloc -//s32 handTickIncIdle(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate) +//s32 bgunTickIncIdle(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate) //{ // bool usesec; -// s32 gunfunc = currentPlayerIsUsingSecondaryFunction(); +// s32 gunfunc = bgunIsUsingSecondaryFunction(); // s32 sp34; // s32 sp30; // bool changefunc; @@ -3333,7 +3333,7 @@ glabel handTickIncIdle // hand->shotremainder = 0; // // // If ready to change gun due to manual switch, just do that -// if (handIsReadyToSwitch(handnum) && handSetState(handnum, HANDSTATE_CHANGEGUN)) { +// if (bgunIsReadyToSwitch(handnum) && bgunSetState(handnum, HANDSTATE_CHANGEGUN)) { // return lvupdate; // } // @@ -3344,13 +3344,13 @@ glabel handTickIncIdle // hand->unk0cc8_08 = false; // // if (hand->inuse) { -// sp34 = func0f098ca0(hand->gset.weaponfunc, info, hand); +// sp34 = bgun0f098ca0(hand->gset.weaponfunc, info, hand); // // // Handle changing gun function // if (gunfunc != hand->gset.weaponfunc && hand->modenext != HANDMODE_RELOAD) { // changefunc = true; // -// if (hand->unk0cc8_07 && func0f098ca0(1 - hand->gset.weaponfunc, info, hand) < 0) { +// if (hand->unk0cc8_07 && bgun0f098ca0(1 - hand->gset.weaponfunc, info, hand) < 0) { // changefunc = false; // } // @@ -3360,7 +3360,7 @@ glabel handTickIncIdle // hand->count = 0; // hand->gset.weaponfunc = gunfunc; // -// if (handSetState(handnum, HANDSTATE_RELOAD)) { +// if (bgunSetState(handnum, HANDSTATE_RELOAD)) { // return lvupdate; // } // } else { @@ -3373,7 +3373,7 @@ glabel handTickIncIdle // if (changefunc) { // hand->unk0cc8_07 = false; // -// if (handSetState(handnum, HANDSTATE_CHANGEFUNC)) { +// if (bgunSetState(handnum, HANDSTATE_CHANGEFUNC)) { // return lvupdate; // } // } @@ -3385,7 +3385,7 @@ glabel handTickIncIdle // // Consider switching to another weapon // if (weaponHasFlag(info->weaponnum, WEAPONFLAG_00000001) // && (info->weaponnum != WEAPON_REMOTEMINE || handnum != HAND_LEFT) -// && handSetState(handnum, HANDSTATE_AUTOSWITCH)) { +// && bgunSetState(handnum, HANDSTATE_AUTOSWITCH)) { // return lvupdate; // } // @@ -3395,9 +3395,9 @@ glabel handTickIncIdle // && (g_MpPlayers[g_Vars.currentplayerstats->mpindex].gunfuncs[(g_Vars.currentplayer->gunctrl.weaponnum - 1) >> 3] & (1 << (g_Vars.currentplayer->gunctrl.weaponnum - 1 & 7))); // // if (usesec == gunfunc) { -// sp30 = func0f098ca0(1 - hand->gset.weaponfunc, info, hand); +// sp30 = bgun0f098ca0(1 - hand->gset.weaponfunc, info, hand); // -// if (func0f099188(hand, 1 - hand->gset.weaponfunc) +// if (bgun0f099188(hand, 1 - hand->gset.weaponfunc) // && info->weaponnum != WEAPON_REAPER) { // if (info->gunctrl->wantammo) { // func = weaponGetFunction(&hand->gset, 1 - hand->gset.weaponfunc); @@ -3417,7 +3417,7 @@ glabel handTickIncIdle // || hand->gset.weaponfunc == FUNC_SECONDARY) { // hand->unk0cc8_07 = true; // -// if (handSetState(handnum, HANDSTATE_CHANGEFUNC)) { +// if (bgunSetState(handnum, HANDSTATE_CHANGEFUNC)) { // return lvupdate; // } // } @@ -3428,14 +3428,14 @@ glabel handTickIncIdle // if (hand->triggeron && info->weaponnum != WEAPON_NONE) { // hand->unk0cc8_01 = false; // -// if (handSetState(handnum, HANDSTATE_ATTACKEMPTY)) { +// if (bgunSetState(handnum, HANDSTATE_ATTACKEMPTY)) { // return lvupdate; // } // } else { // hand->count60 = 0; // hand->count = 0; // -// if (handSetState(handnum, HANDSTATE_RELOAD)) { +// if (bgunSetState(handnum, HANDSTATE_RELOAD)) { // return lvupdate; // } // } @@ -3452,7 +3452,7 @@ glabel handTickIncIdle // // hand->unk0d0f_03 = false; // -// if (handSetState(handnum, HANDSTATE_ATTACK)) { +// if (bgunSetState(handnum, HANDSTATE_ATTACK)) { // return lvupdate; // } // } @@ -3469,7 +3469,7 @@ glabel handTickIncIdle // hand->modenext = HANDMODE_NONE; // // if (next == HANDMODE_RELOAD && sp34 < 2 && sp34 >= 0) { -// if (handSetState(handnum, HANDSTATE_RELOAD)) { +// if (bgunSetState(handnum, HANDSTATE_RELOAD)) { // return lvupdate; // } // } @@ -3480,14 +3480,14 @@ glabel handTickIncIdle // // 698 // if (handnum == HAND_RIGHT) { // if (info->gunctrl->wantammo) { -// currentPlayerAutoSwitchWeapon(); +// bgunAutoSwitchWeapon(); // } else { // lhand = &g_Vars.currentplayer->hands[1] - handnum; // // if ((hand->unk0cc8_08 || !hand->inuse) // && (lhand->unk0cc8_08 || !lhand->inuse) // && (hand->triggeron || lhand->triggeron)) { -// currentPlayerAutoSwitchWeapon(); +// bgunAutoSwitchWeapon(); // } // // hand->unk0cc8_08 = lhand->unk0cc8_08 = false; @@ -3497,7 +3497,7 @@ glabel handTickIncIdle // return 0; //} -void func0f099780(struct hand *hand, f32 angle) +void bgun0f099780(struct hand *hand, f32 angle) { hand->useposrot = true; @@ -3508,13 +3508,13 @@ void func0f099780(struct hand *hand, f32 angle) hand->posrotmtx.m[3][2] = sinf(angle) * 15.0f; } -s32 handTickIncAutoSwitch(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate) +s32 bgunTickIncAutoSwitch(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate) { u32 stack; s32 someval; - s32 gunfunc = currentPlayerIsUsingSecondaryFunction(); + s32 gunfunc = bgunIsUsingSecondaryFunction(); - if (!hand->inuse && handSetState(handnum, HANDSTATE_IDLE)) { + if (!hand->inuse && bgunSetState(handnum, HANDSTATE_IDLE)) { return lvupdate; } @@ -3528,7 +3528,7 @@ s32 handTickIncAutoSwitch(struct handweaponinfo *info, s32 handnum, struct hand if (hand->stateframes >= delay) { hand->stateminor++; } else { - func0f099780(hand, hand->stateframes * 0.87252569198608f / delay); + bgun0f099780(hand, hand->stateframes * 0.87252569198608f / delay); } } @@ -3539,12 +3539,12 @@ s32 handTickIncAutoSwitch(struct handweaponinfo *info, s32 handnum, struct hand #endif hand->shotremainder = 0; - if (handIsReadyToSwitch(handnum) && handSetState(handnum, HANDSTATE_CHANGEGUN)) { + if (bgunIsReadyToSwitch(handnum) && bgunSetState(handnum, HANDSTATE_CHANGEGUN)) { if (g_Vars.mplayerisrunning && (IS8MB() || PLAYERCOUNT() != 1)) { currentPlayerSetWeaponReapable(handnum); } - func0f09fa20(handnum); + bgun0f09fa20(handnum); hand->mode = HANDMODE_6; hand->stateminor = 2; @@ -3553,7 +3553,7 @@ s32 handTickIncAutoSwitch(struct handweaponinfo *info, s32 handnum, struct hand } if (hand->inuse) { - someval = func0f098ca0(gunfunc, info, hand); + someval = bgun0f098ca0(gunfunc, info, hand); if (info->weaponnum == WEAPON_TIMEDMINE || info->weaponnum == WEAPON_PROXIMITYMINE) { hand->gset.weaponfunc = gunfunc; @@ -3561,7 +3561,7 @@ s32 handTickIncAutoSwitch(struct handweaponinfo *info, s32 handnum, struct hand if (info->weaponnum == WEAPON_REMOTEMINE && gunfunc != hand->gset.weaponfunc - && handSetState(handnum, HANDSTATE_CHANGEFUNC)) { + && bgunSetState(handnum, HANDSTATE_CHANGEFUNC)) { return lvupdate; } @@ -3570,18 +3570,18 @@ s32 handTickIncAutoSwitch(struct handweaponinfo *info, s32 handnum, struct hand struct handweaponinfo otherinfo; bool ready = true; - handGetWeaponInfo(&otherinfo, 1 - handnum); + bgunGetWeaponInfo(&otherinfo, 1 - handnum); if (otherhand->inuse) { - if (func0f098ca0(0, &otherinfo, otherhand) >= 0) { + if (bgun0f098ca0(0, &otherinfo, otherhand) >= 0) { ready = false; } - if (func0f098ca0(1, &otherinfo, otherhand) >= 0) { + if (bgun0f098ca0(1, &otherinfo, otherhand) >= 0) { ready = false; } - if (func0f099188(otherhand, otherhand->gset.weaponfunc)) { + if (bgun0f099188(otherhand, otherhand->gset.weaponfunc)) { ready = true; } } @@ -3591,7 +3591,7 @@ s32 handTickIncAutoSwitch(struct handweaponinfo *info, s32 handnum, struct hand } if (ready) { - currentPlayerAutoSwitchWeapon(); + bgunAutoSwitchWeapon(); } } @@ -3600,7 +3600,7 @@ s32 handTickIncAutoSwitch(struct handweaponinfo *info, s32 handnum, struct hand hand->count60 = 0; hand->count = 0; - if (handSetState(handnum, HANDSTATE_RELOAD)) { + if (bgunSetState(handnum, HANDSTATE_RELOAD)) { if (info->weaponnum == WEAPON_COMBATKNIFE) { hand->mode = HANDMODE_11; hand->pausetime60 = PALDOWN(17); @@ -3622,13 +3622,13 @@ s32 handTickIncAutoSwitch(struct handweaponinfo *info, s32 handnum, struct hand } } - func0f099780(hand, 0.87252569198608f); + bgun0f099780(hand, 0.87252569198608f); } return 0; } -bool handIsReloading(struct hand *hand) +bool bgunIsReloading(struct hand *hand) { if (hand->state == HANDSTATE_RELOAD) { return true; @@ -3639,186 +3639,186 @@ bool handIsReloading(struct hand *hand) #if PAL GLOBAL_ASM( -glabel handTickIncReload +glabel bgunTickIncReload .late_rodata glabel var7f1ac1b8 .word 0x3f5f5dd8 glabel var7f1ac1bc -.word handTickIncReload+0x570 # f09a1b8 +.word bgunTickIncReload+0x570 # f09a1b8 glabel var7f1ac1c0 -.word handTickIncReload+0x570 # f09a1b8 +.word bgunTickIncReload+0x570 # f09a1b8 glabel var7f1ac1c4 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac1c8 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac1cc -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac1d0 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac1d4 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac1d8 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac1dc -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac1e0 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac1e4 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac1e8 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac1ec -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac1f0 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac1f4 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac1f8 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac1fc -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac200 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac204 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac208 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac20c -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac210 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac214 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac218 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac21c -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac220 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac224 -.word handTickIncReload+0x570 # f09a1b8 +.word bgunTickIncReload+0x570 # f09a1b8 glabel var7f1ac228 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac22c -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac230 -.word handTickIncReload+0x570 # f09a1b8 +.word bgunTickIncReload+0x570 # f09a1b8 glabel var7f1ac234 -.word handTickIncReload+0x570 # f09a1b8 +.word bgunTickIncReload+0x570 # f09a1b8 glabel var7f1ac238 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac23c -.word handTickIncReload+0x570 # f09a1b8 +.word bgunTickIncReload+0x570 # f09a1b8 glabel var7f1ac240 -.word handTickIncReload+0x570 # f09a1b8 +.word bgunTickIncReload+0x570 # f09a1b8 glabel var7f1ac244 -.word handTickIncReload+0x570 # f09a1b8 +.word bgunTickIncReload+0x570 # f09a1b8 glabel var7f1ac248 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac24c -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac250 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac254 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac258 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac25c -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac260 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac264 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac268 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac26c -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac270 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac274 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac278 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac27c -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac280 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac284 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac288 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac28c -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac290 -.word handTickIncReload+0x570 # f09a1b8 +.word bgunTickIncReload+0x570 # f09a1b8 glabel var7f1ac294 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac298 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac29c -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac2a0 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac2a4 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac2a8 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac2ac -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac2b0 -.word handTickIncReload+0x570 # f09a1b8 +.word bgunTickIncReload+0x570 # f09a1b8 glabel var7f1ac2b4 -.word handTickIncReload+0x570 # f09a1b8 +.word bgunTickIncReload+0x570 # f09a1b8 glabel var7f1ac2b8 -.word handTickIncReload+0x570 # f09a1b8 +.word bgunTickIncReload+0x570 # f09a1b8 glabel var7f1ac2bc -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac2c0 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac2c4 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac2c8 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac2cc -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac2d0 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac2d4 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac2d8 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac2dc -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac2e0 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac2e4 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac2e8 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac2ec -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac2f0 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac2f4 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac2f8 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac2fc -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac300 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac304 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac308 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac30c -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac310 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac314 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac318 -.word handTickIncReload+0x570 # f09a1b8 +.word bgunTickIncReload+0x570 # f09a1b8 glabel var7f1ac31c .word 0x3f5f5dd8 .text @@ -3841,7 +3841,7 @@ glabel var7f1ac31c /* f099c88: 8e190618 */ lw $t9,0x618($s0) /* f099c8c: ae00068c */ sw $zero,0x68c($s0) /* f099c90: ae180680 */ sw $t8,0x680($s0) -/* f099c94: 0fc27346 */ jal handSetState +/* f099c94: 0fc27346 */ jal bgunSetState /* f099c98: 8fa4003c */ lw $a0,0x3c($sp) /* f099c9c: 50400004 */ beqzl $v0,.L0f099cb0 /* f099ca0: 8e190618 */ lw $t9,0x618($s0) @@ -3941,7 +3941,7 @@ glabel var7f1ac31c /* f099dfc: 8fa5003c */ lw $a1,0x3c($sp) /* f099e00: 1141001e */ beq $t2,$at,.L0f099e7c /* f099e04: 00000000 */ nop -/* f099e08: 0fc26238 */ jal func0f0988e0 +/* f099e08: 0fc26238 */ jal bgun0f0988e0 /* f099e0c: 02003025 */ or $a2,$s0,$zero /* f099e10: 920b06d6 */ lbu $t3,0x6d6($s0) /* f099e14: 8fa30038 */ lw $v1,0x38($sp) @@ -3976,7 +3976,7 @@ glabel var7f1ac31c /* f099e7c: 10000007 */ b .L0f099e9c /* f099e80: ae090608 */ sw $t1,0x608($s0) .L0f099e84: -/* f099e84: 0fc27346 */ jal handSetState +/* f099e84: 0fc27346 */ jal bgunSetState /* f099e88: 00002825 */ or $a1,$zero,$zero /* f099e8c: 10400003 */ beqz $v0,.L0f099e9c /* f099e90: 00000000 */ nop @@ -3997,7 +3997,7 @@ glabel var7f1ac31c /* f099ec4: 332d0004 */ andi $t5,$t9,0x4 /* f099ec8: 51a0002b */ beqzl $t5,.L0f099f78 /* f099ecc: 8e18060c */ lw $t8,0x60c($s0) -/* f099ed0: 0fc26291 */ jal func0f098a44 +/* f099ed0: 0fc26291 */ jal bgun0f098a44 /* f099ed4: 24050001 */ addiu $a1,$zero,0x1 /* f099ed8: 5040001f */ beqzl $v0,.L0f099f58 /* f099edc: ae00060c */ sw $zero,0x60c($s0) @@ -4008,14 +4008,14 @@ glabel var7f1ac31c /* f099ef0: 17000019 */ bnez $t8,.L0f099f58 /* f099ef4: 24070001 */ addiu $a3,$zero,0x1 /* f099ef8: 92040003 */ lbu $a0,0x3($s0) -/* f099efc: 0fc2637e */ jal func0f098df8 +/* f099efc: 0fc2637e */ jal bgun0f098df8 /* f099f00: afa00010 */ sw $zero,0x10($sp) /* f099f04: 8e0a060c */ lw $t2,0x60c($s0) /* f099f08: 92040003 */ lbu $a0,0x3($s0) /* f099f0c: 02003025 */ or $a2,$s0,$zero /* f099f10: 35480010 */ ori $t0,$t2,0x10 /* f099f14: ae08060c */ sw $t0,0x60c($s0) -/* f099f18: 0fc26328 */ jal func0f098ca0 +/* f099f18: 0fc26328 */ jal bgun0f098ca0 /* f099f1c: 8fa50038 */ lw $a1,0x38($sp) /* f099f20: 28410002 */ slti $at,$v0,0x2 /* f099f24: 54200005 */ bnezl $at,.L0f099f3c @@ -4047,14 +4047,14 @@ glabel var7f1ac31c /* f099f7c: 330a0010 */ andi $t2,$t8,0x10 /* f099f80: 5540000e */ bnezl $t2,.L0f099fbc /* f099f84: 8e0b068c */ lw $t3,0x68c($s0) -/* f099f88: 0fc26291 */ jal func0f098a44 +/* f099f88: 0fc26291 */ jal bgun0f098a44 /* f099f8c: 24050001 */ addiu $a1,$zero,0x1 /* f099f90: 10400009 */ beqz $v0,.L0f099fb8 /* f099f94: 8fa50038 */ lw $a1,0x38($sp) /* f099f98: 92040003 */ lbu $a0,0x3($s0) /* f099f9c: afa00010 */ sw $zero,0x10($sp) /* f099fa0: 02003025 */ or $a2,$s0,$zero -/* f099fa4: 0fc2637e */ jal func0f098df8 +/* f099fa4: 0fc2637e */ jal bgun0f098df8 /* f099fa8: 00003825 */ or $a3,$zero,$zero /* f099fac: 8e08060c */ lw $t0,0x60c($s0) /* f099fb0: 350e0010 */ ori $t6,$t0,0x10 @@ -4066,7 +4066,7 @@ glabel var7f1ac31c /* f099fc0: 8fa4003c */ lw $a0,0x3c($sp) /* f099fc4: 51610008 */ beql $t3,$at,.L0f099fe8 /* f099fc8: 8e030608 */ lw $v1,0x608($s0) -/* f099fcc: 0fc27346 */ jal handSetState +/* f099fcc: 0fc27346 */ jal bgunSetState /* f099fd0: 00002825 */ or $a1,$zero,$zero /* f099fd4: 50400004 */ beqzl $v0,.L0f099fe8 /* f099fd8: 8e030608 */ lw $v1,0x608($s0) @@ -4106,7 +4106,7 @@ glabel var7f1ac31c /* f09a050: 46083282 */ mul.s $f10,$f6,$f8 /* f09a054: 46105483 */ div.s $f18,$f10,$f16 /* f09a058: 44059000 */ mfc1 $a1,$f18 -/* f09a05c: 0fc265e0 */ jal func0f099780 +/* f09a05c: 0fc265e0 */ jal bgun0f099780 /* f09a060: 00000000 */ nop /* f09a064: 8e030608 */ lw $v1,0x608($s0) .L0f09a068: @@ -4134,7 +4134,7 @@ glabel var7f1ac31c /* f09a0b8: 8de4000c */ lw $a0,0xc($t7) /* f09a0bc: 50800007 */ beqzl $a0,.L0f09a0dc /* f09a0c0: 8e0a060c */ lw $t2,0x60c($s0) -/* f09a0c4: 0fc26238 */ jal func0f0988e0 +/* f09a0c4: 0fc26238 */ jal bgun0f0988e0 /* f09a0c8: 02003025 */ or $a2,$s0,$zero /* f09a0cc: 920d0690 */ lbu $t5,0x690($s0) /* f09a0d0: 35a90040 */ ori $t1,$t5,0x40 @@ -4147,7 +4147,7 @@ glabel var7f1ac31c /* f09a0e8: 15000004 */ bnez $t0,.L0f09a0fc /* f09a0ec: 00003825 */ or $a3,$zero,$zero /* f09a0f0: 92040003 */ lbu $a0,0x3($s0) -/* f09a0f4: 0fc2637e */ jal func0f098df8 +/* f09a0f4: 0fc2637e */ jal bgun0f098df8 /* f09a0f8: afa00010 */ sw $zero,0x10($sp) .L0f09a0fc: /* f09a0fc: 3c18800a */ lui $t8,%hi(g_Vars+0x34) @@ -4160,7 +4160,7 @@ glabel var7f1ac31c /* f09a118: 8dcb0000 */ lw $t3,0x0($t6) /* f09a11c: 51610027 */ beql $t3,$at,.L0f09a1bc /* f09a120: 8e0e001c */ lw $t6,0x1c($s0) -/* f09a124: 0fc2775f */ jal func0f09dd7c +/* f09a124: 0fc2775f */ jal bgun0f09dd7c /* f09a128: 00000000 */ nop /* f09a12c: 10400022 */ beqz $v0,.L0f09a1b8 /* f09a130: 3c0c8007 */ lui $t4,%hi(g_PlayerInvincible) @@ -4220,7 +4220,7 @@ glabel var7f1ac31c /* f09a1fc: 10000004 */ b .L0f09a210 /* f09a200: ae000018 */ sw $zero,0x18($s0) .L0f09a204: -/* f09a204: 0fc265e0 */ jal func0f099780 +/* f09a204: 0fc265e0 */ jal bgun0f099780 /* f09a208: 34a55dd8 */ ori $a1,$a1,0x5dd8 /* f09a20c: 8e030608 */ lw $v1,0x608($s0) .L0f09a210: @@ -4266,7 +4266,7 @@ glabel var7f1ac31c /* f09a298: ae00001c */ sw $zero,0x1c($s0) /* f09a29c: ae000018 */ sw $zero,0x18($s0) /* f09a2a0: 8fa4003c */ lw $a0,0x3c($sp) -/* f09a2a4: 0fc27346 */ jal handSetState +/* f09a2a4: 0fc27346 */ jal bgunSetState /* f09a2a8: 00002825 */ or $a1,$zero,$zero /* f09a2ac: 50400013 */ beqzl $v0,.L0f09a2fc /* f09a2b0: 00001025 */ or $v0,$zero,$zero @@ -4286,7 +4286,7 @@ glabel var7f1ac31c /* f09a2e4: 460a4402 */ mul.s $f16,$f8,$f10 /* f09a2e8: 46128103 */ div.s $f4,$f16,$f18 /* f09a2ec: 44052000 */ mfc1 $a1,$f4 -/* f09a2f0: 0fc265e0 */ jal func0f099780 +/* f09a2f0: 0fc265e0 */ jal bgun0f099780 /* f09a2f4: 00000000 */ nop .L0f09a2f8: /* f09a2f8: 00001025 */ or $v0,$zero,$zero @@ -4299,186 +4299,186 @@ glabel var7f1ac31c ); #elif VERSION >= VERSION_NTSC_1_0 GLOBAL_ASM( -glabel handTickIncReload +glabel bgunTickIncReload .late_rodata glabel var7f1ac1b8 .word 0x3f5f5dd8 glabel var7f1ac1bc -.word handTickIncReload+0x570 # f09a1b8 +.word bgunTickIncReload+0x570 # f09a1b8 glabel var7f1ac1c0 -.word handTickIncReload+0x570 # f09a1b8 +.word bgunTickIncReload+0x570 # f09a1b8 glabel var7f1ac1c4 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac1c8 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac1cc -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac1d0 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac1d4 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac1d8 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac1dc -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac1e0 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac1e4 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac1e8 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac1ec -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac1f0 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac1f4 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac1f8 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac1fc -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac200 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac204 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac208 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac20c -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac210 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac214 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac218 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac21c -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac220 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac224 -.word handTickIncReload+0x570 # f09a1b8 +.word bgunTickIncReload+0x570 # f09a1b8 glabel var7f1ac228 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac22c -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac230 -.word handTickIncReload+0x570 # f09a1b8 +.word bgunTickIncReload+0x570 # f09a1b8 glabel var7f1ac234 -.word handTickIncReload+0x570 # f09a1b8 +.word bgunTickIncReload+0x570 # f09a1b8 glabel var7f1ac238 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac23c -.word handTickIncReload+0x570 # f09a1b8 +.word bgunTickIncReload+0x570 # f09a1b8 glabel var7f1ac240 -.word handTickIncReload+0x570 # f09a1b8 +.word bgunTickIncReload+0x570 # f09a1b8 glabel var7f1ac244 -.word handTickIncReload+0x570 # f09a1b8 +.word bgunTickIncReload+0x570 # f09a1b8 glabel var7f1ac248 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac24c -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac250 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac254 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac258 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac25c -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac260 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac264 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac268 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac26c -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac270 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac274 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac278 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac27c -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac280 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac284 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac288 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac28c -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac290 -.word handTickIncReload+0x570 # f09a1b8 +.word bgunTickIncReload+0x570 # f09a1b8 glabel var7f1ac294 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac298 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac29c -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac2a0 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac2a4 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac2a8 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac2ac -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac2b0 -.word handTickIncReload+0x570 # f09a1b8 +.word bgunTickIncReload+0x570 # f09a1b8 glabel var7f1ac2b4 -.word handTickIncReload+0x570 # f09a1b8 +.word bgunTickIncReload+0x570 # f09a1b8 glabel var7f1ac2b8 -.word handTickIncReload+0x570 # f09a1b8 +.word bgunTickIncReload+0x570 # f09a1b8 glabel var7f1ac2bc -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac2c0 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac2c4 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac2c8 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac2cc -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac2d0 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac2d4 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac2d8 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac2dc -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac2e0 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac2e4 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac2e8 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac2ec -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac2f0 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac2f4 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac2f8 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac2fc -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac300 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac304 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac308 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac30c -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac310 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac314 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac318 -.word handTickIncReload+0x570 # f09a1b8 +.word bgunTickIncReload+0x570 # f09a1b8 glabel var7f1ac31c .word 0x3f5f5dd8 .text @@ -4501,7 +4501,7 @@ glabel var7f1ac31c /* f099c88: 8e190618 */ lw $t9,0x618($s0) /* f099c8c: ae00068c */ sw $zero,0x68c($s0) /* f099c90: ae180680 */ sw $t8,0x680($s0) -/* f099c94: 0fc27346 */ jal handSetState +/* f099c94: 0fc27346 */ jal bgunSetState /* f099c98: 8fa4003c */ lw $a0,0x3c($sp) /* f099c9c: 50400004 */ beqzl $v0,.L0f099cb0 /* f099ca0: 8e190618 */ lw $t9,0x618($s0) @@ -4601,7 +4601,7 @@ glabel var7f1ac31c /* f099dfc: 8fa5003c */ lw $a1,0x3c($sp) /* f099e00: 1141001e */ beq $t2,$at,.L0f099e7c /* f099e04: 00000000 */ nop -/* f099e08: 0fc26238 */ jal func0f0988e0 +/* f099e08: 0fc26238 */ jal bgun0f0988e0 /* f099e0c: 02003025 */ or $a2,$s0,$zero /* f099e10: 920b06d6 */ lbu $t3,0x6d6($s0) /* f099e14: 8fa30038 */ lw $v1,0x38($sp) @@ -4636,7 +4636,7 @@ glabel var7f1ac31c /* f099e7c: 10000007 */ b .L0f099e9c /* f099e80: ae090608 */ sw $t1,0x608($s0) .L0f099e84: -/* f099e84: 0fc27346 */ jal handSetState +/* f099e84: 0fc27346 */ jal bgunSetState /* f099e88: 00002825 */ or $a1,$zero,$zero /* f099e8c: 10400003 */ beqz $v0,.L0f099e9c /* f099e90: 00000000 */ nop @@ -4657,7 +4657,7 @@ glabel var7f1ac31c /* f099ec4: 332d0004 */ andi $t5,$t9,0x4 /* f099ec8: 51a0002b */ beqzl $t5,.L0f099f78 /* f099ecc: 8e18060c */ lw $t8,0x60c($s0) -/* f099ed0: 0fc26291 */ jal func0f098a44 +/* f099ed0: 0fc26291 */ jal bgun0f098a44 /* f099ed4: 24050001 */ addiu $a1,$zero,0x1 /* f099ed8: 5040001f */ beqzl $v0,.L0f099f58 /* f099edc: ae00060c */ sw $zero,0x60c($s0) @@ -4668,14 +4668,14 @@ glabel var7f1ac31c /* f099ef0: 17000019 */ bnez $t8,.L0f099f58 /* f099ef4: 24070001 */ addiu $a3,$zero,0x1 /* f099ef8: 92040003 */ lbu $a0,0x3($s0) -/* f099efc: 0fc2637e */ jal func0f098df8 +/* f099efc: 0fc2637e */ jal bgun0f098df8 /* f099f00: afa00010 */ sw $zero,0x10($sp) /* f099f04: 8e0a060c */ lw $t2,0x60c($s0) /* f099f08: 92040003 */ lbu $a0,0x3($s0) /* f099f0c: 02003025 */ or $a2,$s0,$zero /* f099f10: 35480010 */ ori $t0,$t2,0x10 /* f099f14: ae08060c */ sw $t0,0x60c($s0) -/* f099f18: 0fc26328 */ jal func0f098ca0 +/* f099f18: 0fc26328 */ jal bgun0f098ca0 /* f099f1c: 8fa50038 */ lw $a1,0x38($sp) /* f099f20: 28410002 */ slti $at,$v0,0x2 /* f099f24: 54200005 */ bnezl $at,.L0f099f3c @@ -4707,14 +4707,14 @@ glabel var7f1ac31c /* f099f7c: 330a0010 */ andi $t2,$t8,0x10 /* f099f80: 5540000e */ bnezl $t2,.L0f099fbc /* f099f84: 8e0b068c */ lw $t3,0x68c($s0) -/* f099f88: 0fc26291 */ jal func0f098a44 +/* f099f88: 0fc26291 */ jal bgun0f098a44 /* f099f8c: 24050001 */ addiu $a1,$zero,0x1 /* f099f90: 10400009 */ beqz $v0,.L0f099fb8 /* f099f94: 8fa50038 */ lw $a1,0x38($sp) /* f099f98: 92040003 */ lbu $a0,0x3($s0) /* f099f9c: afa00010 */ sw $zero,0x10($sp) /* f099fa0: 02003025 */ or $a2,$s0,$zero -/* f099fa4: 0fc2637e */ jal func0f098df8 +/* f099fa4: 0fc2637e */ jal bgun0f098df8 /* f099fa8: 00003825 */ or $a3,$zero,$zero /* f099fac: 8e08060c */ lw $t0,0x60c($s0) /* f099fb0: 350e0010 */ ori $t6,$t0,0x10 @@ -4726,7 +4726,7 @@ glabel var7f1ac31c /* f099fc0: 8fa4003c */ lw $a0,0x3c($sp) /* f099fc4: 51610008 */ beql $t3,$at,.L0f099fe8 /* f099fc8: 8e030608 */ lw $v1,0x608($s0) -/* f099fcc: 0fc27346 */ jal handSetState +/* f099fcc: 0fc27346 */ jal bgunSetState /* f099fd0: 00002825 */ or $a1,$zero,$zero /* f099fd4: 50400004 */ beqzl $v0,.L0f099fe8 /* f099fd8: 8e030608 */ lw $v1,0x608($s0) @@ -4766,7 +4766,7 @@ glabel var7f1ac31c /* f09a050: 46083282 */ mul.s $f10,$f6,$f8 /* f09a054: 46105483 */ div.s $f18,$f10,$f16 /* f09a058: 44059000 */ mfc1 $a1,$f18 -/* f09a05c: 0fc265e0 */ jal func0f099780 +/* f09a05c: 0fc265e0 */ jal bgun0f099780 /* f09a060: 00000000 */ nop /* f09a064: 8e030608 */ lw $v1,0x608($s0) .L0f09a068: @@ -4794,7 +4794,7 @@ glabel var7f1ac31c /* f09a0b8: 8de4000c */ lw $a0,0xc($t7) /* f09a0bc: 50800007 */ beqzl $a0,.L0f09a0dc /* f09a0c0: 8e0a060c */ lw $t2,0x60c($s0) -/* f09a0c4: 0fc26238 */ jal func0f0988e0 +/* f09a0c4: 0fc26238 */ jal bgun0f0988e0 /* f09a0c8: 02003025 */ or $a2,$s0,$zero /* f09a0cc: 920d0690 */ lbu $t5,0x690($s0) /* f09a0d0: 35a90040 */ ori $t1,$t5,0x40 @@ -4807,7 +4807,7 @@ glabel var7f1ac31c /* f09a0e8: 15000004 */ bnez $t0,.L0f09a0fc /* f09a0ec: 00003825 */ or $a3,$zero,$zero /* f09a0f0: 92040003 */ lbu $a0,0x3($s0) -/* f09a0f4: 0fc2637e */ jal func0f098df8 +/* f09a0f4: 0fc2637e */ jal bgun0f098df8 /* f09a0f8: afa00010 */ sw $zero,0x10($sp) .L0f09a0fc: /* f09a0fc: 3c18800a */ lui $t8,%hi(g_Vars+0x34) @@ -4820,7 +4820,7 @@ glabel var7f1ac31c /* f09a118: 8dcb0000 */ lw $t3,0x0($t6) /* f09a11c: 51610027 */ beql $t3,$at,.L0f09a1bc /* f09a120: 8e0e001c */ lw $t6,0x1c($s0) -/* f09a124: 0fc2775f */ jal func0f09dd7c +/* f09a124: 0fc2775f */ jal bgun0f09dd7c /* f09a128: 00000000 */ nop /* f09a12c: 10400022 */ beqz $v0,.L0f09a1b8 /* f09a130: 3c0c8007 */ lui $t4,%hi(g_PlayerInvincible) @@ -4880,7 +4880,7 @@ glabel var7f1ac31c /* f09a1fc: 10000004 */ b .L0f09a210 /* f09a200: ae000018 */ sw $zero,0x18($s0) .L0f09a204: -/* f09a204: 0fc265e0 */ jal func0f099780 +/* f09a204: 0fc265e0 */ jal bgun0f099780 /* f09a208: 34a55dd8 */ ori $a1,$a1,0x5dd8 /* f09a20c: 8e030608 */ lw $v1,0x608($s0) .L0f09a210: @@ -4926,7 +4926,7 @@ glabel var7f1ac31c /* f09a298: ae00001c */ sw $zero,0x1c($s0) /* f09a29c: ae000018 */ sw $zero,0x18($s0) /* f09a2a0: 8fa4003c */ lw $a0,0x3c($sp) -/* f09a2a4: 0fc27346 */ jal handSetState +/* f09a2a4: 0fc27346 */ jal bgunSetState /* f09a2a8: 00002825 */ or $a1,$zero,$zero /* f09a2ac: 50400013 */ beqzl $v0,.L0f09a2fc /* f09a2b0: 00001025 */ or $v0,$zero,$zero @@ -4946,7 +4946,7 @@ glabel var7f1ac31c /* f09a2e4: 460a4402 */ mul.s $f16,$f8,$f10 /* f09a2e8: 46128103 */ div.s $f4,$f16,$f18 /* f09a2ec: 44052000 */ mfc1 $a1,$f4 -/* f09a2f0: 0fc265e0 */ jal func0f099780 +/* f09a2f0: 0fc265e0 */ jal bgun0f099780 /* f09a2f4: 00000000 */ nop .L0f09a2f8: /* f09a2f8: 00001025 */ or $v0,$zero,$zero @@ -4959,184 +4959,184 @@ glabel var7f1ac31c ); #else GLOBAL_ASM( -glabel handTickIncReload +glabel bgunTickIncReload .late_rodata glabel var7f1ac1b8 .word 0x3f5f5dd8 glabel var7f1ac1bc -.word handTickIncReload+0x570 # f09a1b8 +.word bgunTickIncReload+0x570 # f09a1b8 glabel var7f1ac1c0 -.word handTickIncReload+0x570 # f09a1b8 +.word bgunTickIncReload+0x570 # f09a1b8 glabel var7f1ac1c4 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac1c8 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac1cc -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac1d0 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac1d4 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac1d8 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac1dc -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac1e0 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac1e4 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac1e8 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac1ec -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac1f0 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac1f4 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac1f8 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac1fc -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac200 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac204 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac208 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac20c -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac210 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac214 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac218 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac21c -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac220 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac224 -.word handTickIncReload+0x570 # f09a1b8 +.word bgunTickIncReload+0x570 # f09a1b8 glabel var7f1ac228 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac22c -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac230 -.word handTickIncReload+0x570 # f09a1b8 +.word bgunTickIncReload+0x570 # f09a1b8 glabel var7f1ac234 -.word handTickIncReload+0x570 # f09a1b8 +.word bgunTickIncReload+0x570 # f09a1b8 glabel var7f1ac238 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac23c -.word handTickIncReload+0x570 # f09a1b8 +.word bgunTickIncReload+0x570 # f09a1b8 glabel var7f1ac240 -.word handTickIncReload+0x570 # f09a1b8 +.word bgunTickIncReload+0x570 # f09a1b8 glabel var7f1ac244 -.word handTickIncReload+0x570 # f09a1b8 +.word bgunTickIncReload+0x570 # f09a1b8 glabel var7f1ac248 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac24c -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac250 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac254 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac258 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac25c -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac260 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac264 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac268 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac26c -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac270 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac274 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac278 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac27c -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac280 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac284 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac288 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac28c -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac290 -.word handTickIncReload+0x570 # f09a1b8 +.word bgunTickIncReload+0x570 # f09a1b8 glabel var7f1ac294 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac298 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac29c -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac2a0 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac2a4 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac2a8 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac2ac -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac2b0 -.word handTickIncReload+0x570 # f09a1b8 +.word bgunTickIncReload+0x570 # f09a1b8 glabel var7f1ac2b4 -.word handTickIncReload+0x570 # f09a1b8 +.word bgunTickIncReload+0x570 # f09a1b8 glabel var7f1ac2b8 -.word handTickIncReload+0x570 # f09a1b8 +.word bgunTickIncReload+0x570 # f09a1b8 glabel var7f1ac2bc -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac2c0 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac2c4 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac2c8 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac2cc -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac2d0 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac2d4 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac2d8 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac2dc -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac2e0 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac2e4 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac2e8 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac2ec -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac2f0 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac2f4 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac2f8 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac2fc -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac300 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac304 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac308 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac30c -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac310 -.word handTickIncReload+0x534 # f09a17c +.word bgunTickIncReload+0x534 # f09a17c glabel var7f1ac314 -.word handTickIncReload+0x570 +.word bgunTickIncReload+0x570 glabel var7f1ac31c .word 0x3f5f5dd8 .text @@ -5159,7 +5159,7 @@ glabel var7f1ac31c /* f099c88: 8e190618 */ lw $t9,0x618($s0) /* f099c8c: ae00068c */ sw $zero,0x68c($s0) /* f099c90: ae180680 */ sw $t8,0x680($s0) -/* f099c94: 0fc27346 */ jal handSetState +/* f099c94: 0fc27346 */ jal bgunSetState /* f099c98: 8fa4003c */ lw $a0,0x3c($sp) /* f099c9c: 50400004 */ beqzl $v0,.L0f099cb0 /* f099ca0: 8e190618 */ lw $t9,0x618($s0) @@ -5259,7 +5259,7 @@ glabel var7f1ac31c /* f099dfc: 8fa5003c */ lw $a1,0x3c($sp) /* f099e00: 1141001e */ beq $t2,$at,.L0f099e7c /* f099e04: 00000000 */ nop -/* f099e08: 0fc26238 */ jal func0f0988e0 +/* f099e08: 0fc26238 */ jal bgun0f0988e0 /* f099e0c: 02003025 */ or $a2,$s0,$zero /* f099e10: 920b06d6 */ lbu $t3,0x6d6($s0) /* f099e14: 8fa30038 */ lw $v1,0x38($sp) @@ -5294,7 +5294,7 @@ glabel var7f1ac31c /* f099e7c: 10000007 */ b .L0f099e9c /* f099e80: ae090608 */ sw $t1,0x608($s0) .L0f099e84: -/* f099e84: 0fc27346 */ jal handSetState +/* f099e84: 0fc27346 */ jal bgunSetState /* f099e88: 00002825 */ or $a1,$zero,$zero /* f099e8c: 10400003 */ beqz $v0,.L0f099e9c /* f099e90: 00000000 */ nop @@ -5315,7 +5315,7 @@ glabel var7f1ac31c /* f099ec4: 332d0004 */ andi $t5,$t9,0x4 /* f099ec8: 51a0002b */ beqzl $t5,.L0f099f78 /* f099ecc: 8e18060c */ lw $t8,0x60c($s0) -/* f099ed0: 0fc26291 */ jal func0f098a44 +/* f099ed0: 0fc26291 */ jal bgun0f098a44 /* f099ed4: 24050001 */ addiu $a1,$zero,0x1 /* f099ed8: 5040001f */ beqzl $v0,.L0f099f58 /* f099edc: ae00060c */ sw $zero,0x60c($s0) @@ -5326,14 +5326,14 @@ glabel var7f1ac31c /* f099ef0: 17000019 */ bnez $t8,.L0f099f58 /* f099ef4: 24070001 */ addiu $a3,$zero,0x1 /* f099ef8: 92040003 */ lbu $a0,0x3($s0) -/* f099efc: 0fc2637e */ jal func0f098df8 +/* f099efc: 0fc2637e */ jal bgun0f098df8 /* f099f00: afa00010 */ sw $zero,0x10($sp) /* f099f04: 8e0a060c */ lw $t2,0x60c($s0) /* f099f08: 92040003 */ lbu $a0,0x3($s0) /* f099f0c: 02003025 */ or $a2,$s0,$zero /* f099f10: 35480010 */ ori $t0,$t2,0x10 /* f099f14: ae08060c */ sw $t0,0x60c($s0) -/* f099f18: 0fc26328 */ jal func0f098ca0 +/* f099f18: 0fc26328 */ jal bgun0f098ca0 /* f099f1c: 8fa50038 */ lw $a1,0x38($sp) /* f099f20: 28410002 */ slti $at,$v0,0x2 /* f099f24: 54200005 */ bnezl $at,.L0f099f3c @@ -5365,14 +5365,14 @@ glabel var7f1ac31c /* f099f7c: 330a0010 */ andi $t2,$t8,0x10 /* f099f80: 5540000e */ bnezl $t2,.L0f099fbc /* f099f84: 8e0b068c */ lw $t3,0x68c($s0) -/* f099f88: 0fc26291 */ jal func0f098a44 +/* f099f88: 0fc26291 */ jal bgun0f098a44 /* f099f8c: 24050001 */ addiu $a1,$zero,0x1 /* f099f90: 10400009 */ beqz $v0,.L0f099fb8 /* f099f94: 8fa50038 */ lw $a1,0x38($sp) /* f099f98: 92040003 */ lbu $a0,0x3($s0) /* f099f9c: afa00010 */ sw $zero,0x10($sp) /* f099fa0: 02003025 */ or $a2,$s0,$zero -/* f099fa4: 0fc2637e */ jal func0f098df8 +/* f099fa4: 0fc2637e */ jal bgun0f098df8 /* f099fa8: 00003825 */ or $a3,$zero,$zero /* f099fac: 8e08060c */ lw $t0,0x60c($s0) /* f099fb0: 350e0010 */ ori $t6,$t0,0x10 @@ -5384,7 +5384,7 @@ glabel var7f1ac31c /* f099fc0: 8fa4003c */ lw $a0,0x3c($sp) /* f099fc4: 51610008 */ beql $t3,$at,.L0f099fe8 /* f099fc8: 8e030608 */ lw $v1,0x608($s0) -/* f099fcc: 0fc27346 */ jal handSetState +/* f099fcc: 0fc27346 */ jal bgunSetState /* f099fd0: 00002825 */ or $a1,$zero,$zero /* f099fd4: 50400004 */ beqzl $v0,.L0f099fe8 /* f099fd8: 8e030608 */ lw $v1,0x608($s0) @@ -5424,7 +5424,7 @@ glabel var7f1ac31c /* f09a050: 46083282 */ mul.s $f10,$f6,$f8 /* f09a054: 46105483 */ div.s $f18,$f10,$f16 /* f09a058: 44059000 */ mfc1 $a1,$f18 -/* f09a05c: 0fc265e0 */ jal func0f099780 +/* f09a05c: 0fc265e0 */ jal bgun0f099780 /* f09a060: 00000000 */ nop /* f09a064: 8e030608 */ lw $v1,0x608($s0) .L0f09a068: @@ -5452,7 +5452,7 @@ glabel var7f1ac31c /* f09a0b8: 8de4000c */ lw $a0,0xc($t7) /* f09a0bc: 50800007 */ beqzl $a0,.L0f09a0dc /* f09a0c0: 8e0a060c */ lw $t2,0x60c($s0) -/* f09a0c4: 0fc26238 */ jal func0f0988e0 +/* f09a0c4: 0fc26238 */ jal bgun0f0988e0 /* f09a0c8: 02003025 */ or $a2,$s0,$zero /* f09a0cc: 920d0690 */ lbu $t5,0x690($s0) /* f09a0d0: 35a90040 */ ori $t1,$t5,0x40 @@ -5465,7 +5465,7 @@ glabel var7f1ac31c /* f09a0e8: 15000004 */ bnez $t0,.L0f09a0fc /* f09a0ec: 00003825 */ or $a3,$zero,$zero /* f09a0f0: 92040003 */ lbu $a0,0x3($s0) -/* f09a0f4: 0fc2637e */ jal func0f098df8 +/* f09a0f4: 0fc2637e */ jal bgun0f098df8 /* f09a0f8: afa00010 */ sw $zero,0x10($sp) .L0f09a0fc: /* f09a0fc: 3c18800a */ lui $t8,%hi(g_Vars+0x34) @@ -5478,7 +5478,7 @@ glabel var7f1ac31c /* f09a118: 8dcb0000 */ lw $t3,0x0($t6) /* f09a11c: 51610027 */ beql $t3,$at,.L0f09a1bc /* f09a120: 8e0e001c */ lw $t6,0x1c($s0) -/* f09a124: 0fc2775f */ jal func0f09dd7c +/* f09a124: 0fc2775f */ jal bgun0f09dd7c /* f09a128: 00000000 */ nop /* f09a12c: 10400022 */ beqz $v0,.L0f09a1b8 /* f09a130: 3c0c8007 */ lui $t4,%hi(g_PlayerInvincible) @@ -5538,7 +5538,7 @@ glabel var7f1ac31c /* f09a1fc: 10000004 */ b .L0f09a210 /* f09a200: ae000018 */ sw $zero,0x18($s0) .L0f09a204: -/* f09a204: 0fc265e0 */ jal func0f099780 +/* f09a204: 0fc265e0 */ jal bgun0f099780 /* f09a208: 34a55dd8 */ ori $a1,$a1,0x5dd8 /* f09a20c: 8e030608 */ lw $v1,0x608($s0) .L0f09a210: @@ -5584,7 +5584,7 @@ glabel var7f1ac31c /* f09a298: ae00001c */ sw $zero,0x1c($s0) /* f09a29c: ae000018 */ sw $zero,0x18($s0) /* f09a2a0: 8fa4003c */ lw $a0,0x3c($sp) -/* f09a2a4: 0fc27346 */ jal handSetState +/* f09a2a4: 0fc27346 */ jal bgunSetState /* f09a2a8: 00002825 */ or $a1,$zero,$zero /* f09a2ac: 50400013 */ beqzl $v0,.L0f09a2fc /* f09a2b0: 00001025 */ or $v0,$zero,$zero @@ -5604,7 +5604,7 @@ glabel var7f1ac31c /* f09a2e4: 460a4402 */ mul.s $f16,$f8,$f10 /* f09a2e8: 46128103 */ div.s $f4,$f16,$f18 /* f09a2ec: 44052000 */ mfc1 $a1,$f4 -/* f09a2f0: 0fc265e0 */ jal func0f099780 +/* f09a2f0: 0fc265e0 */ jal bgun0f099780 /* f09a2f4: 00000000 */ nop .L0f09a2f8: /* f09a2f8: 00001025 */ or $v0,$zero,$zero @@ -5618,7 +5618,7 @@ glabel var7f1ac31c #endif // Mismatch: Branch logic near e9c is different (but functionally the same) -//s32 handTickIncReload(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate) +//s32 bgunTickIncReload(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate) //{ // struct weaponfunc *func = gsetGetWeaponFunction(&hand->gset); // @@ -5626,7 +5626,7 @@ glabel var7f1ac31c // hand->animmode = HANDANIMMODE_IDLE; // hand->animload = -1; // -// if (handSetState(handnum, HANDSTATE_IDLE)) { +// if (bgunSetState(handnum, HANDSTATE_IDLE)) { // return lvupdate; // } // } @@ -5661,7 +5661,7 @@ glabel var7f1ac31c // if (func && (func->ammoindex == 0 || func->ammoindex == 1)) { // if (info->definition->ammos[func->ammoindex]->reload_animation // && info->weaponnum != WEAPON_COMBATKNIFE) { -// func0f0988e0(info->definition->ammos[func->ammoindex]->reload_animation, handnum, hand); +// bgun0f0988e0(info->definition->ammos[func->ammoindex]->reload_animation, handnum, hand); // // hand->unk0d0e_07 = true; // @@ -5676,7 +5676,7 @@ glabel var7f1ac31c // hand->stateminor++; // } // } else { -// if (handSetState(handnum, HANDSTATE_IDLE)) { +// if (bgunSetState(handnum, HANDSTATE_IDLE)) { // return lvupdate; // } // } @@ -5685,13 +5685,13 @@ glabel var7f1ac31c // if (hand); // } else { // if (info->definition->ammos[func->ammoindex]->flags & 4) { -// if (func0f098a44(hand, 1)) { +// if (bgun0f098a44(hand, 1)) { // if ((hand->stateflags & HANDSTATEFLAG_00000010) == 0) { // s32 value; // -// func0f098df8(hand->gset.weaponfunc, info, hand, 1, 0); +// bgun0f098df8(hand->gset.weaponfunc, info, hand, 1, 0); // hand->stateflags |= HANDSTATEFLAG_00000010; -// value = func0f098ca0(hand->gset.weaponfunc, info, hand); +// value = bgun0f098ca0(hand->gset.weaponfunc, info, hand); // // if (value >= 2) { // hand->unk0cc8_03 = false; @@ -5710,15 +5710,15 @@ glabel var7f1ac31c // } // } else { // if ((hand->stateflags & HANDSTATEFLAG_00000010) == 0) { -// if (func0f098a44(hand, 1)) { -// func0f098df8(hand->gset.weaponfunc, info, hand, 0, 0); +// if (bgun0f098a44(hand, 1)) { +// bgun0f098df8(hand->gset.weaponfunc, info, hand, 0, 0); // hand->stateflags |= HANDSTATEFLAG_00000010; // } // } // } // // if (hand->animmode != HANDANIMMODE_BUSY) { -// if (handSetState(handnum, HANDSTATE_IDLE)) { +// if (bgunSetState(handnum, HANDSTATE_IDLE)) { // return lvupdate; // } // } @@ -5735,7 +5735,7 @@ glabel var7f1ac31c // hand->count60 = 0; // hand->count = 0; // } else { -// func0f099780(hand, (hand->count60 * 0.87252569198608f) / PALDOWN(16)); +// bgun0f099780(hand, (hand->count60 * 0.87252569198608f) / PALDOWN(16)); // } // } // @@ -5744,17 +5744,17 @@ glabel var7f1ac31c // if (info->weaponnum == WEAPON_COMBATKNIFE // && func->ammoindex >= 0 // && info->definition->ammos[func->ammoindex]->reload_animation) { -// func0f0988e0(info->definition->ammos[func->ammoindex]->reload_animation, handnum, hand); +// bgun0f0988e0(info->definition->ammos[func->ammoindex]->reload_animation, handnum, hand); // hand->unk0cc8_02 = true; // } // // if ((hand->stateflags & HANDSTATEFLAG_00000010) == 0) { -// func0f098df8(hand->gset.weaponfunc, info, hand, 0, 0); +// bgun0f098df8(hand->gset.weaponfunc, info, hand, 0, 0); // } // // if (g_Vars.lvupdate240 > 0 // && g_Vars.currentplayer->cameramode != CAMERAMODE_THIRDPERSON -// && func0f09dd7c() +// && bgun0f09dd7c() // && !g_PlayerInvincible // && !g_Vars.currentplayer->isdead) { // switch (info->weaponnum) { @@ -5785,7 +5785,7 @@ glabel var7f1ac31c // hand->count60 = 0; // hand->count = 0; // } else { -// func0f099780(hand, 0.87252569198608f); +// bgun0f099780(hand, 0.87252569198608f); // } // } // @@ -5806,18 +5806,18 @@ glabel var7f1ac31c // hand->count60 = 0; // hand->count = 0; // -// if (handSetState(handnum, HANDSTATE_IDLE)) { +// if (bgunSetState(handnum, HANDSTATE_IDLE)) { // return lvupdate; // } // } else { -// func0f099780(hand, (PALDOWN(23) - hand->count60) * 0.87252569198608f / PALDOWN(23)); +// bgun0f099780(hand, (PALDOWN(23) - hand->count60) * 0.87252569198608f / PALDOWN(23)); // } // } // // return 0; //} -s32 handTickIncChangeFunc(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate) +s32 bgunTickIncChangeFunc(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate) { struct guncmd *cmd; bool more = false; @@ -5834,7 +5834,7 @@ s32 handTickIncChangeFunc(struct handweaponinfo *info, s32 handnum, struct hand more = false; if (cmd != NULL) { - func0f0988e0(cmd, handnum, hand); + bgun0f0988e0(cmd, handnum, hand); more = true; g_Vars.currentplayer->hands[HAND_RIGHT].unk0dd4 = -1; } @@ -5844,14 +5844,14 @@ s32 handTickIncChangeFunc(struct handweaponinfo *info, s32 handnum, struct hand } } - if (!more && handSetState(handnum, HANDSTATE_IDLE)) { + if (!more && bgunSetState(handnum, HANDSTATE_IDLE)) { return lvupdate; } return 0; } -s32 func0f09a3f8(struct hand *hand, struct weaponfunc *func) +s32 bgun0f09a3f8(struct hand *hand, struct weaponfunc *func) { bool burst = false; bool smallburst = false; @@ -5981,7 +5981,7 @@ s32 func0f09a3f8(struct hand *hand, struct weaponfunc *func) #if VERSION >= VERSION_PAL_FINAL GLOBAL_ASM( -glabel func0f09a6f8 +glabel bgun0f09a6f8 .late_rodata glabel var7f1ac320 .word 0x3ecccccd @@ -6069,7 +6069,7 @@ glabel var7f1ac320 /* f09a828: a2060005 */ sb $a2,0x5($s0) .L0f09a82c: /* f09a82c: 8fa4005c */ lw $a0,0x5c($sp) -/* f09a830: 0fc288c2 */ jal handResetSlideInc +/* f09a830: 0fc288c2 */ jal bgunResetSlideInc /* f09a834: afa70064 */ sw $a3,0x64($sp) /* f09a838: 82020004 */ lb $v0,0x4($s0) /* f09a83c: 44803000 */ mtc1 $zero,$f6 @@ -6086,7 +6086,7 @@ glabel var7f1ac320 /* f09a868: 8fad0058 */ lw $t5,0x58($sp) /* f09a86c: 8fa4005c */ lw $a0,0x5c($sp) /* f09a870: 8da50000 */ lw $a1,0x0($t5) -/* f09a874: 0fc25ee8 */ jal func0f097ba0 +/* f09a874: 0fc25ee8 */ jal bgun0f097ba0 /* f09a878: afa70064 */ sw $a3,0x64($sp) /* f09a87c: 8fae0054 */ lw $t6,0x54($sp) /* f09a880: 24060001 */ addiu $a2,$zero,0x1 @@ -6311,7 +6311,7 @@ glabel var7f1ac320 ); #elif VERSION >= VERSION_NTSC_1_0 GLOBAL_ASM( -glabel func0f09a6f8 +glabel bgun0f09a6f8 .late_rodata glabel var7f1ac320 .word 0x3ecccccd @@ -6399,7 +6399,7 @@ glabel var7f1ac320 /* f09a828: a2060005 */ sb $a2,0x5($s0) .L0f09a82c: /* f09a82c: 8fa4005c */ lw $a0,0x5c($sp) -/* f09a830: 0fc288c2 */ jal handResetSlideInc +/* f09a830: 0fc288c2 */ jal bgunResetSlideInc /* f09a834: afa70064 */ sw $a3,0x64($sp) /* f09a838: 82020004 */ lb $v0,0x4($s0) /* f09a83c: 44803000 */ mtc1 $zero,$f6 @@ -6416,7 +6416,7 @@ glabel var7f1ac320 /* f09a868: 8fad0058 */ lw $t5,0x58($sp) /* f09a86c: 8fa4005c */ lw $a0,0x5c($sp) /* f09a870: 8da50000 */ lw $a1,0x0($t5) -/* f09a874: 0fc25ee8 */ jal func0f097ba0 +/* f09a874: 0fc25ee8 */ jal bgun0f097ba0 /* f09a878: afa70064 */ sw $a3,0x64($sp) /* f09a87c: 8fae0054 */ lw $t6,0x54($sp) /* f09a880: 24060001 */ addiu $a2,$zero,0x1 @@ -6641,7 +6641,7 @@ glabel var7f1ac320 ); #else GLOBAL_ASM( -glabel func0f09a6f8 +glabel bgun0f09a6f8 .late_rodata glabel var7f1ac320 .word 0x3ecccccd @@ -6729,7 +6729,7 @@ glabel var7f1ac320 /* f098864: a2060005 */ sb $a2,0x5($s0) .NB0f098868: /* f098868: 8fa40054 */ lw $a0,0x54($sp) -/* f09886c: 0fc28021 */ jal handResetSlideInc +/* f09886c: 0fc28021 */ jal bgunResetSlideInc /* f098870: afa7005c */ sw $a3,0x5c($sp) /* f098874: 82020004 */ lb $v0,0x4($s0) /* f098878: 44803000 */ mtc1 $zero,$f6 @@ -6746,7 +6746,7 @@ glabel var7f1ac320 /* f0988a4: 8fad0050 */ lw $t5,0x50($sp) /* f0988a8: 8fa40054 */ lw $a0,0x54($sp) /* f0988ac: 8da50000 */ lw $a1,0x0($t5) -/* f0988b0: 0fc256cc */ jal func0f097ba0 +/* f0988b0: 0fc256cc */ jal bgun0f097ba0 /* f0988b4: afa7005c */ sw $a3,0x5c($sp) /* f0988b8: 8fae004c */ lw $t6,0x4c($sp) /* f0988bc: 24060001 */ addiu $a2,$zero,0x1 @@ -6963,7 +6963,7 @@ u32 var80070124 = 4; const char var7f1ab890[] = "rontime"; const char var7f1ab898[] = "rofftime"; -//void func0f09a6f8(struct handweaponinfo *info, s32 handnum, struct hand *hand, struct weaponfunc *func) +//void bgun0f09a6f8(struct handweaponinfo *info, s32 handnum, struct hand *hand, struct weaponfunc *func) //{ // bool usesammo = true; // @@ -7009,7 +7009,7 @@ const char var7f1ab898[] = "rofftime"; // hand->flashon = true; // } // -// handResetSlideInc(handnum); +// bgunResetSlideInc(handnum); // // hand->loadslide = 0; // @@ -7018,7 +7018,7 @@ const char var7f1ab898[] = "rofftime"; // hand->stateflags |= HANDSTATEFLAG_00000020; // hand->stateflags |= HANDSTATEFLAG_00000010; // -// func0f097ba0(handnum, info->weaponnum); +// bgun0f097ba0(handnum, info->weaponnum); // // if (usesammo && func->ammoindex >= 0) { // hand->loadedammo[func->ammoindex] -= hand->shotstotake; @@ -7109,7 +7109,7 @@ const char var7f1ab898[] = "rofftime"; // } //} -bool func0f09aba4(struct hand *hand, struct handweaponinfo *info, s32 handnum, struct weaponfunc_shoot *func) +bool bgun0f09aba4(struct hand *hand, struct handweaponinfo *info, s32 handnum, struct weaponfunc_shoot *func) { s32 unk24; s32 unk25; @@ -7258,7 +7258,7 @@ bool func0f09aba4(struct hand *hand, struct handweaponinfo *info, s32 handnum, s return false; } -bool handTickIncAttackingShoot(struct handweaponinfo *info, s32 handnum, struct hand *hand) +bool bgunTickIncAttackingShoot(struct handweaponinfo *info, s32 handnum, struct hand *hand) { static u32 var80070128 = 99; @@ -7280,14 +7280,14 @@ bool handTickIncAttackingShoot(struct handweaponinfo *info, s32 handnum, struct hand->gs_float1 = 0; if (func->fire_animation) { - func0f0988e0(func->fire_animation, handnum, hand); + bgun0f0988e0(func->fire_animation, handnum, hand); hand->unk0cc8_01 = true; } hand->burstbullets = 0; } - if (!func0f098a44(hand, 2)) { + if (!bgun0f098a44(hand, 2)) { sp64 = 0; } @@ -7299,7 +7299,7 @@ bool handTickIncAttackingShoot(struct handweaponinfo *info, s32 handnum, struct } if (hand->stateminor == 1) { - sp60 = func0f09a3f8(hand, func); + sp60 = bgun0f09a3f8(hand, func); if ((func->type & 0xff00) == 0x100) { struct weaponfunc_shootauto *autofunc = (struct weaponfunc_shootauto *) func; @@ -7312,7 +7312,7 @@ bool handTickIncAttackingShoot(struct handweaponinfo *info, s32 handnum, struct } if (sp60 > 0) { - func0f09a6f8(info, handnum, hand, func); + bgun0f09a6f8(info, handnum, hand, func); } if (sp60 < 0 || sp60 == 2) { @@ -7334,7 +7334,7 @@ bool handTickIncAttackingShoot(struct handweaponinfo *info, s32 handnum, struct if (hand->stateminor == 2) { if (hand->stateflags & HANDSTATEFLAG_00000020) { - sp68 = func0f09aba4(hand, info, handnum, (struct weaponfunc_shoot *) func); + sp68 = bgun0f09aba4(hand, info, handnum, (struct weaponfunc_shoot *) func); } else { sp68 = true; } @@ -7359,7 +7359,7 @@ bool handTickIncAttackingShoot(struct handweaponinfo *info, s32 handnum, struct return false; } -bool handTickIncAttackingThrow(s32 handnum, struct hand *hand) +bool bgunTickIncAttackingThrow(s32 handnum, struct hand *hand) { struct weaponfunc_throw *func = (struct weaponfunc_throw *) gsetGetWeaponFunction(&hand->gset); @@ -7373,16 +7373,16 @@ bool handTickIncAttackingThrow(s32 handnum, struct hand *hand) invRemoveItemByNum(hand->gset.weaponnum); g_Vars.currentplayer->gunctrl.unk1583_04 = true; #if VERSION >= VERSION_NTSC_1_0 - func0f0a1ab0(); + bgun0f0a1ab0(); #else - currentPlayerAutoSwitchWeapon(); + bgunAutoSwitchWeapon(); #endif hand->primetimer = 0; return true; } if (func->base.fire_animation) { - func0f0988e0(func->base.fire_animation, handnum, hand); + bgun0f0988e0(func->base.fire_animation, handnum, hand); hand->unk0cc8_01 = true; } } @@ -7392,7 +7392,7 @@ bool handTickIncAttackingThrow(s32 handnum, struct hand *hand) hand->unk0cc8_01 = false; } - if (func0f098a44(hand, 2)) { + if (bgun0f098a44(hand, 2)) { hand->stateminor = 1; hand->unk0cc8_01 = false; } @@ -7415,7 +7415,7 @@ bool handTickIncAttackingThrow(s32 handnum, struct hand *hand) } if (hand->gset.weaponnum == WEAPON_REMOTEMINE - && currentPlayerIsUsingSecondaryFunction() == true + && bgunIsUsingSecondaryFunction() == true && hand->triggerreleased && hand->triggeron) { return true; @@ -7428,7 +7428,7 @@ bool handTickIncAttackingThrow(s32 handnum, struct hand *hand) // hand. It waits 4 seconds before finishing, which means the player won't // pull out another grenade until the flames have cleared. if (hand->stateminor == 55) { - handResetAnim(hand); + bgunResetAnim(hand); if (hand->stateframes > PALDOWN(func->activatetime60 + 240)) { return true; @@ -7454,7 +7454,7 @@ bool handTickIncAttackingThrow(s32 handnum, struct hand *hand) return false; } -s32 weaponGetMinClipQty(s32 weaponnum, s32 funcnum) +s32 bgunGetMinClipQty(s32 weaponnum, s32 funcnum) { if (weaponnum == WEAPON_TRANQUILIZER && funcnum == FUNC_SECONDARY) { return 4; @@ -7698,7 +7698,7 @@ u32 var80070354 = 0x00250026; u32 var80070358 = 0x00270028; u32 var8007035c = 0x0029002a; -bool handTickIncAttackingClose(s32 handnum, struct hand *hand) +bool bgunTickIncAttackingClose(s32 handnum, struct hand *hand) { struct weaponfunc *func = gsetGetWeaponFunction(&hand->gset); @@ -7740,7 +7740,7 @@ bool handTickIncAttackingClose(s32 handnum, struct hand *hand) hand->attacktype = HANDATTACKTYPE_CLOSERANGENOUNCLOAK; if (func->fire_animation) { - func0f0988e0(func->fire_animation, handnum, hand); + bgun0f0988e0(func->fire_animation, handnum, hand); hand->unk0cc8_01 = true; } } @@ -7750,7 +7750,7 @@ bool handTickIncAttackingClose(s32 handnum, struct hand *hand) hand->unk0cc8_01 = false; } - if (func0f098a44(hand, 2)) { + if (bgun0f098a44(hand, 2)) { hand->stateminor = 1; hand->unk0cc8_01 = false; } @@ -7759,7 +7759,7 @@ bool handTickIncAttackingClose(s32 handnum, struct hand *hand) } } - if (hand->stateminor == 3 && func0f098a44(hand, 3)) { + if (hand->stateminor == 3 && bgun0f098a44(hand, 3)) { hand->stateminor = 1; hand->unk0cc8_01 = false; } @@ -7769,15 +7769,15 @@ bool handTickIncAttackingClose(s32 handnum, struct hand *hand) hand->attacktype = HANDATTACKTYPE_CLOSERANGE; if (hand->gset.weaponnum == WEAPON_TRANQUILIZER && func->ammoindex >= 0) { - if (hand->loadedammo[func->ammoindex] > weaponGetMinClipQty(WEAPON_TRANQUILIZER, FUNC_SECONDARY)) { - hand->loadedammo[func->ammoindex] -= weaponGetMinClipQty(WEAPON_TRANQUILIZER, FUNC_SECONDARY); + if (hand->loadedammo[func->ammoindex] > bgunGetMinClipQty(WEAPON_TRANQUILIZER, FUNC_SECONDARY)) { + hand->loadedammo[func->ammoindex] -= bgunGetMinClipQty(WEAPON_TRANQUILIZER, FUNC_SECONDARY); } else { hand->loadedammo[func->ammoindex] = 0; } } if (func->fire_animation) { - if (func->fire_animation && !func0f098a44(hand, 3)) { + if (func->fire_animation && !bgun0f098a44(hand, 3)) { hand->stateminor = 3; } else { hand->stateminor = 2; @@ -7792,7 +7792,7 @@ bool handTickIncAttackingClose(s32 handnum, struct hand *hand) } if (hand->stateminor == 2) { - if (!handIsAnimBusy(hand)) { + if (!bgunIsAnimBusy(hand)) { return true; } @@ -7810,7 +7810,7 @@ bool handTickIncAttackingClose(s32 handnum, struct hand *hand) return false; } -bool handTickIncAttackingSpecial(struct hand *hand) +bool bgunTickIncAttackingSpecial(struct hand *hand) { struct weaponfunc_special *func = (struct weaponfunc_special *) gsetGetWeaponFunction(&hand->gset); @@ -7845,7 +7845,7 @@ bool handTickIncAttackingSpecial(struct hand *hand) return false; } -s32 handTickIncAttackEmpty(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate) +s32 bgunTickIncAttackEmpty(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate) { u32 stack; bool playsound = false; @@ -7873,7 +7873,7 @@ s32 handTickIncAttackEmpty(struct handweaponinfo *info, s32 handnum, struct hand hand->stateframes -= PALDOWN(25); hand->stateflags = 0; - handResetAnim(hand); + bgunResetAnim(hand); } if (hand->animmode != HANDANIMMODE_BUSY) { @@ -7887,7 +7887,7 @@ s32 handTickIncAttackEmpty(struct handweaponinfo *info, s32 handnum, struct hand } if (func && func->fire_animation) { - func0f0988e0(func->fire_animation, handnum, hand); + bgun0f0988e0(func->fire_animation, handnum, hand); restartedanim = true; } } @@ -7895,7 +7895,7 @@ s32 handTickIncAttackEmpty(struct handweaponinfo *info, s32 handnum, struct hand if (!restartedanim && hand->stateframes > PALDOWN(25)) { playsound = true; } - } else if (func0f098a44(hand, 5)) { + } else if (bgun0f098a44(hand, 5)) { playsound = true; } break; @@ -7908,7 +7908,7 @@ s32 handTickIncAttackEmpty(struct handweaponinfo *info, s32 handnum, struct hand hand->stateframes -= PALDOWN(25); hand->stateflags = 0; - handResetAnim(hand); + bgunResetAnim(hand); } } @@ -7995,17 +7995,17 @@ s32 handTickIncAttackEmpty(struct handweaponinfo *info, s32 handnum, struct hand hand->count60 = 0; hand->count = 0; - if (handSetState(handnum, HANDSTATE_IDLE)) { + if (bgunSetState(handnum, HANDSTATE_IDLE)) { return lvupdate; } - handResetAnim(hand); + bgunResetAnim(hand); } return 0; } -s32 handTickIncAttack(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate) +s32 bgunTickIncAttack(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate) { u32 stack; struct weaponfunc *func = NULL; @@ -8019,16 +8019,16 @@ s32 handTickIncAttack(struct handweaponinfo *info, s32 handnum, struct hand *han if (func != NULL) { switch (func->type & 0xff) { case INVENTORYFUNCTYPE_SHOOT: - finished = handTickIncAttackingShoot(info, handnum, hand); + finished = bgunTickIncAttackingShoot(info, handnum, hand); break; case INVENTORYFUNCTYPE_THROW: - finished = handTickIncAttackingThrow(handnum, hand); + finished = bgunTickIncAttackingThrow(handnum, hand); break; case INVENTORYFUNCTYPE_CLOSE: - finished = handTickIncAttackingClose(handnum, hand); + finished = bgunTickIncAttackingClose(handnum, hand); break; case INVENTORYFUNCTYPE_SPECIAL: - finished = handTickIncAttackingSpecial(hand); + finished = bgunTickIncAttackingSpecial(hand); break; } } @@ -8039,7 +8039,7 @@ s32 handTickIncAttack(struct handweaponinfo *info, s32 handnum, struct hand *han finished = false; } - if (finished && handSetState(handnum, HANDSTATE_IDLE)) { + if (finished && bgunSetState(handnum, HANDSTATE_IDLE)) { return lvupdate; } } @@ -8050,7 +8050,7 @@ s32 handTickIncAttack(struct handweaponinfo *info, s32 handnum, struct hand *han return 0; } -bool handIsReadyToSwitch(s32 handnum) +bool bgunIsReadyToSwitch(s32 handnum) { struct player *player = g_Vars.currentplayer; @@ -8100,7 +8100,7 @@ bool handIsReadyToSwitch(s32 handnum) return false; } -bool func0f09bec8(s32 handnum) +bool bgun0f09bec8(s32 handnum) { struct player *player = g_Vars.currentplayer; @@ -8114,12 +8114,12 @@ bool func0f09bec8(s32 handnum) return false; } -bool func0f09bf44(s32 handnum) +bool bgun0f09bf44(s32 handnum) { bool result = true; struct player *player = g_Vars.currentplayer; - if (!func0f09dd7c()) { + if (!bgun0f09dd7c()) { result = false; } @@ -8142,7 +8142,7 @@ bool func0f09bf44(s32 handnum) return result; } -s32 handTickIncChangeGun(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate) +s32 bgunTickIncChangeGun(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate) { u32 stack; struct weapon *weapon = info->definition; @@ -8161,7 +8161,7 @@ s32 handTickIncChangeGun(struct handweaponinfo *info, s32 handnum, struct hand * if (weaponHasFlag(info->weaponnum, WEAPONFLAG_00000001) && (info->weaponnum != WEAPON_REMOTEMINE || handnum != HAND_LEFT) - && func0f098ca0(0, info, hand) < 0) { + && bgun0f098ca0(0, info, hand) < 0) { skipanim = true; } @@ -8172,7 +8172,7 @@ s32 handTickIncChangeGun(struct handweaponinfo *info, s32 handnum, struct hand * && hand->inuse == true && (!hand->unk0d0e_00 || hand->unk0d0e_04)) { if (hand->statecycles == 0) { - func0f0988e0(weapon->unequip_animation, handnum, hand); + bgun0f0988e0(weapon->unequip_animation, handnum, hand); } else if (hand->animmode == HANDANIMMODE_IDLE) { hand->stateminor++; } @@ -8229,11 +8229,11 @@ s32 handTickIncChangeGun(struct handweaponinfo *info, s32 handnum, struct hand * currentPlayerSetWeaponReapable(handnum); } - func0f09fa20(handnum); + bgun0f09fa20(handnum); hand->mode = HANDMODE_6; hand->stateminor++; } else { - func0f099780(hand, 0.87252569198608f); + bgun0f099780(hand, 0.87252569198608f); if (g_Vars.currentplayer->gunctrl.unk1583_04 == 1 && hand->inuse) { hand->firing = true; @@ -8242,7 +8242,7 @@ s32 handTickIncChangeGun(struct handweaponinfo *info, s32 handnum, struct hand * } } } else { - func0f099780(hand, hand->stateframes * 0.87252569198608f / delay); + bgun0f099780(hand, hand->stateframes * 0.87252569198608f / delay); } } @@ -8252,17 +8252,17 @@ s32 handTickIncChangeGun(struct handweaponinfo *info, s32 handnum, struct hand * if (hand->pausechange == 0 || hand->pausetime60 <= hand->count60) { if (hand->mode == HANDMODE_6) { - if (func0f09bf44(handnum)) { + if (bgun0f09bf44(handnum)) { hand->mode = HANDMODE_7; - if (!hand->inuse && handSetState(handnum, HANDSTATE_IDLE)) { + if (!hand->inuse && bgunSetState(handnum, HANDSTATE_IDLE)) { return lvupdate; } } } else { - if (func0f09dd7c()) { + if (bgun0f09dd7c()) { if (info->definition->equip_animation) { - func0f0988e0(info->definition->equip_animation, handnum, hand); + bgun0f0988e0(info->definition->equip_animation, handnum, hand); hand->unk0cc8_02 = true; } @@ -8275,7 +8275,7 @@ s32 handTickIncChangeGun(struct handweaponinfo *info, s32 handnum, struct hand * } if (hand->mode == HANDMODE_6 || hand->mode == HANDMODE_7) { - func0f099780(hand, 0.87252569198608f); + bgun0f099780(hand, 0.87252569198608f); } } @@ -8298,12 +8298,12 @@ s32 handTickIncChangeGun(struct handweaponinfo *info, s32 handnum, struct hand * func0f128d20(handnum); } - func0f098f8c(info, hand); + bgun0f098f8c(info, hand); if (weaponHasFlag(info->weaponnum, WEAPONFLAG_00000001) && (info->weaponnum != WEAPON_REMOTEMINE || handnum != HAND_LEFT) - && func0f098ca0(0, info, hand) < 0 - && handSetState(handnum, HANDSTATE_AUTOSWITCH)) { + && bgun0f098ca0(0, info, hand) < 0 + && bgunSetState(handnum, HANDSTATE_AUTOSWITCH)) { hand->stateminor = 1; return lvupdate; } @@ -8312,7 +8312,7 @@ s32 handTickIncChangeGun(struct handweaponinfo *info, s32 handnum, struct hand * if (g_Vars.lvupdate240 > 0 && g_Vars.currentplayer->cameramode != CAMERAMODE_THIRDPERSON - && func0f09dd7c() + && bgun0f09dd7c() && !g_PlayerInvincible && !g_Vars.currentplayer->isdead) { #if VERSION >= VERSION_NTSC_1_0 @@ -8465,7 +8465,7 @@ s32 handTickIncChangeGun(struct handweaponinfo *info, s32 handnum, struct hand * hand->count60 = 0; hand->count = 0; } else { - func0f099780(hand, (delay - hand->count60) * 0.87252569198608f / delay); + bgun0f099780(hand, (delay - hand->count60) * 0.87252569198608f / delay); } } @@ -8473,12 +8473,12 @@ s32 handTickIncChangeGun(struct handweaponinfo *info, s32 handnum, struct hand * if (hand->stateminor == 4) { if (info->definition->equip_animation && !weaponHasFlag(hand->gset.weaponnum, WEAPONFLAG_00004000)) { if (hand->animmode == HANDANIMMODE_IDLE) { - if (handSetState(handnum, HANDSTATE_IDLE)) { + if (bgunSetState(handnum, HANDSTATE_IDLE)) { return lvupdate; } } } else { - if (handSetState(handnum, HANDSTATE_IDLE)) { + if (bgunSetState(handnum, HANDSTATE_IDLE)) { return lvupdate; } } @@ -8492,12 +8492,12 @@ s32 handTickIncChangeGun(struct handweaponinfo *info, s32 handnum, struct hand * * be held at the side of the screen, pointed upwards. The feature was shown in * a demo video but doesn't exist in any public version of the game. */ -s32 handTickIncState2(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate) +s32 bgunTickIncState2(struct handweaponinfo *info, s32 handnum, struct hand *hand, s32 lvupdate) { return 0; } -s32 handTickInc(struct handweaponinfo *info, s32 handnum, s32 lvupdate) +s32 bgunTickInc(struct handweaponinfo *info, s32 handnum, s32 lvupdate) { s32 result = 0; struct hand *hand = &g_Vars.currentplayer->hands[handnum]; @@ -8516,28 +8516,28 @@ s32 handTickInc(struct handweaponinfo *info, s32 handnum, s32 lvupdate) switch (hand->state) { case HANDSTATE_IDLE: - result = handTickIncIdle(info, handnum, hand, lvupdate); + result = bgunTickIncIdle(info, handnum, hand, lvupdate); break; case HANDSTATE_RELOAD: - result = handTickIncReload(info, handnum, hand, lvupdate); + result = bgunTickIncReload(info, handnum, hand, lvupdate); break; case HANDSTATE_ATTACK: - result = handTickIncAttack(info, handnum, hand, lvupdate); + result = bgunTickIncAttack(info, handnum, hand, lvupdate); break; case HANDSTATE_2: - result = handTickIncState2(info, handnum, hand, lvupdate); + result = bgunTickIncState2(info, handnum, hand, lvupdate); break; case HANDSTATE_CHANGEGUN: - result = handTickIncChangeGun(info, handnum, hand, lvupdate); + result = bgunTickIncChangeGun(info, handnum, hand, lvupdate); break; case HANDSTATE_ATTACKEMPTY: - result = handTickIncAttackEmpty(info, handnum, hand, lvupdate); + result = bgunTickIncAttackEmpty(info, handnum, hand, lvupdate); break; case HANDSTATE_AUTOSWITCH: - result = handTickIncAutoSwitch(info, handnum, hand, lvupdate); + result = bgunTickIncAutoSwitch(info, handnum, hand, lvupdate); break; case HANDSTATE_CHANGEFUNC: - result = handTickIncChangeFunc(info, handnum, hand, lvupdate); + result = bgunTickIncChangeFunc(info, handnum, hand, lvupdate); break; } @@ -8553,7 +8553,7 @@ s32 handTickInc(struct handweaponinfo *info, s32 handnum, s32 lvupdate) return result; } -bool handSetState(s32 handnum, s32 state) +bool bgunSetState(s32 handnum, s32 state) { bool valid = true; struct hand *hand = &g_Vars.currentplayer->hands[handnum]; @@ -8577,7 +8577,7 @@ bool handSetState(s32 handnum, s32 state) #if VERSION >= VERSION_PAL_FINAL GLOBAL_ASM( -glabel handTick +glabel bgunTick .late_rodata glabel var7f1ad810pf .word 0x3f99999a @@ -8604,7 +8604,7 @@ glabel var7f1ad810pf /* f09d0a8: 24110014 */ li $s1,0x14 /* f09d0ac: 02602025 */ move $a0,$s3 /* f09d0b0: afa3003c */ sw $v1,0x3c($sp) -/* f09d0b4: 0fc26333 */ jal handGetWeaponInfo +/* f09d0b4: 0fc26333 */ jal bgunGetWeaponInfo /* f09d0b8: 02402825 */ move $a1,$s2 /* f09d0bc: 8fa3003c */ lw $v1,0x3c($sp) /* f09d0c0: 3c02800a */ lui $v0,0x800a @@ -8626,7 +8626,7 @@ glabel var7f1ad810pf /* f09d100: 02602025 */ move $a0,$s3 .PF0f09d104: /* f09d104: 02402825 */ move $a1,$s2 -/* f09d108: 0fc2737d */ jal handTickInc +/* f09d108: 0fc2737d */ jal bgunTickInc /* f09d10c: 02003025 */ move $a2,$s0 /* f09d110: 00408025 */ move $s0,$v0 /* f09d114: 18400003 */ blez $v0,.PF0f09d124 @@ -8643,7 +8643,7 @@ glabel var7f1ad810pf /* f09d13c: 27bd0040 */ addiu $sp,$sp,0x40 ); #else -void handTick(s32 handnum) +void bgunTick(s32 handnum) { struct hand *hand = &g_Vars.currentplayer->hands[handnum]; struct handweaponinfo info; @@ -8655,7 +8655,7 @@ void handTick(s32 handnum) if (handnum); if (handnum); - handGetWeaponInfo(&info, handnum); + bgunGetWeaponInfo(&info, handnum); lvupdate = g_Vars.lvupdate240_60; @@ -8667,7 +8667,7 @@ void handTick(s32 handnum) #endif while (i >= 0) { - lvupdate = handTickInc(&info, handnum, lvupdate); + lvupdate = bgunTickInc(&info, handnum, lvupdate); i--; if (lvupdate <= 0) { @@ -8677,12 +8677,12 @@ void handTick(s32 handnum) } #endif -void func0f09ce8c(void) +void bgun0f09ce8c(void) { - func0f0a1528(); + bgun0f0a1528(); } -void func0f09ceac(void) +void bgun0f09ceac(void) { struct hand *hand; s32 i; @@ -8706,12 +8706,12 @@ void func0f09ceac(void) } } -f32 handGetNoiseRadius(s32 handnum) +f32 bgunGetNoiseRadius(s32 handnum) { return g_Vars.currentplayer->hands[handnum].noiseradius; } -void currentPlayerDecreaseNoiseRadius(void) +void bgunDecreaseNoiseRadius(void) { struct player *player = g_Vars.currentplayer; f32 consideramount; @@ -8728,7 +8728,7 @@ void currentPlayerDecreaseNoiseRadius(void) func0f0b201c(&shortright, sp28); // Right hand - if (handIsFiring(HAND_RIGHT)) { + if (bgunIsFiring(HAND_RIGHT)) { player->hands[HAND_RIGHT].noiseradius += sp28[2]; if (player->hands[HAND_RIGHT].noiseradius > sp28[1]) { @@ -8750,7 +8750,7 @@ void currentPlayerDecreaseNoiseRadius(void) } // Left hand - if (handIsFiring(HAND_LEFT)) { + if (bgunIsFiring(HAND_LEFT)) { player->hands[HAND_LEFT].noiseradius += sp3c[2]; if (player->hands[HAND_LEFT].noiseradius > sp3c[1]) { @@ -8773,7 +8773,7 @@ void currentPlayerDecreaseNoiseRadius(void) } GLOBAL_ASM( -glabel func0f09d140 +glabel bgun0f09d140 .late_rodata glabel var7f1ac614 .word 0x3da3d70a @@ -8792,7 +8792,7 @@ glabel var7f1ac620 /* f09d154: afb00024 */ sw $s0,0x24($sp) /* f09d158: f7b60018 */ sdc1 $f22,0x18($sp) /* f09d15c: f7b40010 */ sdc1 $f20,0x10($sp) -/* f09d160: 0fc2866a */ jal handGetWeaponNum +/* f09d160: 0fc2866a */ jal bgunGetWeaponNum /* f09d164: afa40068 */ sw $a0,0x68($sp) /* f09d168: 0fc2c3f4 */ jal weaponFindById /* f09d16c: 00402025 */ or $a0,$v0,$zero @@ -9061,7 +9061,7 @@ glabel var7f1ac620 #if VERSION >= VERSION_PAL_FINAL GLOBAL_ASM( -glabel func0f09d550 +glabel bgun0f09d550 .late_rodata glabel var7f1ac624 .word 0x3f7c154d @@ -9303,7 +9303,7 @@ glabel var7f1ac628 ); #else GLOBAL_ASM( -glabel func0f09d550 +glabel bgun0f09d550 .late_rodata glabel var7f1ac624 .word 0x3f7cb924 @@ -9545,7 +9545,7 @@ glabel var7f1ac628 ); #endif -void func0f09d8dc(f32 breathing, f32 arg1, f32 arg2, f32 arg3, f32 arg4) +void bgun0f09d8dc(f32 breathing, f32 arg1, f32 arg2, f32 arg3, f32 arg4) { f32 dampt[2]; struct player *player = g_Vars.currentplayer; @@ -9599,7 +9599,7 @@ void func0f09d8dc(f32 breathing, f32 arg1, f32 arg2, f32 arg3, f32 arg4) dampt[0] = player->hands[0].dampt + sp4c; while (dampt[0] >= 1.0f) { - func0f09d140(HAND_RIGHT); + bgun0f09d140(HAND_RIGHT); dampt[0] -= 1.0f; player->syncoffset++; } @@ -9630,7 +9630,7 @@ void func0f09d8dc(f32 breathing, f32 arg1, f32 arg2, f32 arg3, f32 arg4) dampt[1] = dampt[0] + player->syncoffset + player->gunsync; while (dampt[1] >= 1.0f) { - func0f09d140(HAND_LEFT); + bgun0f09d140(HAND_LEFT); dampt[1] -= 1.0f; player->syncoffset--; } @@ -9642,7 +9642,7 @@ void func0f09d8dc(f32 breathing, f32 arg1, f32 arg2, f32 arg3, f32 arg4) } } -bool func0f09dd7c(void) +bool bgun0f09dd7c(void) { if (g_Vars.currentplayer->gunctrl.gunmemowner) { return false; @@ -9652,22 +9652,22 @@ bool func0f09dd7c(void) || (g_Vars.currentplayer->gunctrl.gunmemnew < 0 && g_Vars.currentplayer->gunctrl.unk15b0 == 4); } -u32 func0f09ddcc(void) +u32 bgun0f09ddcc(void) { return g_Vars.currentplayer->gunctrl.gunmemtype; } -u32 func0f09dddc(void) +u32 bgun0f09dddc(void) { return g_Vars.currentplayer->gunctrl.unk1590; } -u8 *func0f09ddec(void) +u8 *bgun0f09ddec(void) { return g_Vars.currentplayer->gunctrl.unk158c; } -u32 func0f09ddfc(void) +u32 bgun0f09ddfc(void) { if (IS4MB() && PLAYERCOUNT() == 2) { return var800700ac; @@ -9687,12 +9687,12 @@ u32 func0f09ddfc(void) return var800700a8; } -void func0f09df50(void) +void bgun0f09df50(void) { g_Vars.currentplayer->gunctrl.gunmemowner = GUNMEMOWNER_11; } -void func0f09df64(s32 arg0) +void bgun0f09df64(s32 arg0) { struct player *player = g_Vars.currentplayer; @@ -9707,7 +9707,7 @@ void func0f09df64(s32 arg0) } GLOBAL_ASM( -glabel func0f09df9c +glabel bgun0f09df9c /* f09df9c: 3c04800a */ lui $a0,%hi(g_Vars) /* f09dfa0: 24849fc0 */ addiu $a0,$a0,%lo(g_Vars) /* f09dfa4: 8c8f0284 */ lw $t7,0x284($a0) @@ -9737,7 +9737,7 @@ glabel func0f09df9c /* f09e000: ac200524 */ sw $zero,%lo(g_CasingsActive)($at) ); -//void func0f09df9c(void) +//void bgun0f09df9c(void) //{ // s32 i; // @@ -9755,7 +9755,7 @@ glabel func0f09df9c // g_CasingsActive = 0; //} -bool func0f09e004(s32 newowner) +bool bgun0f09e004(s32 newowner) { struct player *player = g_Vars.currentplayer; @@ -9781,7 +9781,7 @@ bool func0f09e004(s32 newowner) } player->gunctrl.gunmemtype = -1; - func0f09df9c(); + bgun0f09df9c(); player->gunctrl.unk1583_06 = true; unlock = true; break; @@ -9819,7 +9819,7 @@ bool func0f09e004(s32 newowner) #if VERSION >= VERSION_NTSC_1_0 GLOBAL_ASM( -glabel func0f09e144 +glabel bgun0f09e144 /* f09e144: 27bdff80 */ addiu $sp,$sp,-128 /* f09e148: afb20028 */ sw $s2,0x28($sp) /* f09e14c: 3c12800a */ lui $s2,%hi(g_Vars+0x284) @@ -10066,7 +10066,7 @@ glabel func0f09e144 ); #else GLOBAL_ASM( -glabel func0f09e144 +glabel bgun0f09e144 /* f09c060: 27bdff80 */ addiu $sp,$sp,-128 /* f09c064: afb40030 */ sw $s4,0x30($sp) /* f09c068: 3c14800a */ lui $s4,0x800a @@ -10284,7 +10284,7 @@ glabel func0f09e144 #if VERSION >= VERSION_NTSC_1_0 GLOBAL_ASM( -glabel func0f09e4e0 +glabel bgun0f09e4e0 /* f09e4e0: 27bdff58 */ addiu $sp,$sp,-168 /* f09e4e4: afb5002c */ sw $s5,0x2c($sp) /* f09e4e8: 3c15800a */ lui $s5,%hi(g_Vars) @@ -10300,7 +10300,7 @@ glabel func0f09e4e0 /* f09e510: 924e15ea */ lbu $t6,0x15ea($s2) /* f09e514: 51c00006 */ beqzl $t6,.L0f09e530 /* f09e518: 8e421584 */ lw $v0,0x1584($s2) -/* f09e51c: 0fc27801 */ jal func0f09e004 +/* f09e51c: 0fc27801 */ jal bgun0f09e004 /* f09e520: 00002025 */ or $a0,$zero,$zero /* f09e524: 50400151 */ beqzl $v0,.L0f09ea6c /* f09e528: 8fbf0034 */ lw $ra,0x34($sp) @@ -10402,9 +10402,9 @@ glabel func0f09e4e0 /* f09e680: 925915b1 */ lbu $t9,0x15b1($s2) /* f09e684: 1720000f */ bnez $t9,.L0f09e6c4 /* f09e688: 00000000 */ nop -/* f09e68c: 0fc2777b */ jal func0f09ddec +/* f09e68c: 0fc2777b */ jal bgun0f09ddec /* f09e690: 00000000 */ nop -/* f09e694: 0fc2777f */ jal func0f09ddfc +/* f09e694: 0fc2777f */ jal bgun0f09ddfc /* f09e698: ae4215a0 */ sw $v0,0x15a0($s2) /* f09e69c: 24080001 */ addiu $t0,$zero,0x1 /* f09e6a0: 26491594 */ addiu $t1,$s2,0x1594 @@ -10417,7 +10417,7 @@ glabel func0f09e4e0 /* f09e6bc: ae4a15b8 */ sw $t2,0x15b8($s2) /* f09e6c0: ae4b15bc */ sw $t3,0x15bc($s2) .L0f09e6c4: -/* f09e6c4: 0fc27851 */ jal func0f09e144 +/* f09e6c4: 0fc27851 */ jal bgun0f09e144 /* f09e6c8: 00000000 */ nop /* f09e6cc: 924c15b1 */ lbu $t4,0x15b1($s2) /* f09e6d0: 568c00e6 */ bnel $s4,$t4,.L0f09ea6c @@ -10426,9 +10426,9 @@ glabel func0f09e4e0 /* f09e6dc: a651159c */ sh $s1,0x159c($s2) /* f09e6e0: a640159c */ sh $zero,0x159c($s2) .L0f09e6e4: -/* f09e6e4: 0fc2777b */ jal func0f09ddec +/* f09e6e4: 0fc2777b */ jal bgun0f09ddec /* f09e6e8: ae401594 */ sw $zero,0x1594($s2) -/* f09e6ec: 0fc2777f */ jal func0f09ddfc +/* f09e6ec: 0fc2777f */ jal bgun0f09ddfc /* f09e6f0: ae4215a0 */ sw $v0,0x15a0($s2) /* f09e6f4: ae4215a4 */ sw $v0,0x15a4($s2) .L0f09e6f8: @@ -10456,7 +10456,7 @@ glabel func0f09e4e0 /* f09e744: ae4f15a8 */ sw $t7,0x15a8($s2) /* f09e748: ae5815ac */ sw $t8,0x15ac($s2) .L0f09e74c: -/* f09e74c: 0fc27851 */ jal func0f09e144 +/* f09e74c: 0fc27851 */ jal bgun0f09e144 /* f09e750: 00000000 */ nop /* f09e754: 924b15b1 */ lbu $t3,0x15b1($s2) /* f09e758: 240c0003 */ addiu $t4,$zero,0x3 @@ -10576,7 +10576,7 @@ glabel func0f09e4e0 .L0f09e8ec: /* f09e8ec: 10600005 */ beqz $v1,.L0f09e904 /* f09e8f0: 00008825 */ or $s1,$zero,$zero -/* f09e8f4: 0fc27851 */ jal func0f09e144 +/* f09e8f4: 0fc27851 */ jal bgun0f09e144 /* f09e8f8: 00000000 */ nop /* f09e8fc: 1000005b */ b .L0f09ea6c /* f09e900: 8fbf0034 */ lw $ra,0x34($sp) @@ -10605,7 +10605,7 @@ glabel func0f09e4e0 /* f09e950: ae0b0794 */ sw $t3,0x794($s0) /* f09e954: 8e4c1590 */ lw $t4,0x1590($s2) /* f09e958: 8e4615a8 */ lw $a2,0x15a8($s2) -/* f09e95c: 0fc28ba5 */ jal func0f0a2e94 +/* f09e95c: 0fc28ba5 */ jal bgun0f0a2e94 /* f09e960: 8d850000 */ lw $a1,0x0($t4) /* f09e964: 8e4d15a8 */ lw $t5,0x15a8($s2) /* f09e968: 8e4f15ac */ lw $t7,0x15ac($s2) @@ -10620,7 +10620,7 @@ glabel func0f09e4e0 /* f09e98c: 8e491594 */ lw $t1,0x1594($s2) /* f09e990: 8e4615a8 */ lw $a2,0x15a8($s2) /* f09e994: 26040534 */ addiu $a0,$s0,0x534 -/* f09e998: 0fc28ba5 */ jal func0f0a2e94 +/* f09e998: 0fc28ba5 */ jal bgun0f0a2e94 /* f09e99c: 8d250000 */ lw $a1,0x0($t1) /* f09e9a0: 8e4a15a8 */ lw $t2,0x15a8($s2) /* f09e9a4: 8e4c15ac */ lw $t4,0x15ac($s2) @@ -10654,7 +10654,7 @@ glabel func0f09e4e0 /* f09ea10: ae4f0dd8 */ sw $t7,0xdd8($s2) /* f09ea14: ae400dd8 */ sw $zero,0xdd8($s2) .L0f09ea18: -/* f09ea18: 0fc2777f */ jal func0f09ddfc +/* f09ea18: 0fc2777f */ jal bgun0f09ddfc /* f09ea1c: 00000000 */ nop /* f09ea20: 240a0004 */ addiu $t2,$zero,0x4 /* f09ea24: a24a15b0 */ sb $t2,0x15b0($s2) @@ -10691,7 +10691,7 @@ glabel func0f09e4e0 ); #else GLOBAL_ASM( -glabel func0f09e4e0 +glabel bgun0f09e4e0 /* f09c38c: 27bdff58 */ addiu $sp,$sp,-168 /* f09c390: afb5002c */ sw $s5,0x2c($sp) /* f09c394: 3c15800a */ lui $s5,0x800a @@ -10707,7 +10707,7 @@ glabel func0f09e4e0 /* f09c3bc: 924e15ea */ lbu $t6,0x15ea($s2) /* f09c3c0: 51c00006 */ beqzl $t6,.NB0f09c3dc /* f09c3c4: 8e421584 */ lw $v0,0x1584($s2) -/* f09c3c8: 0fc26fc8 */ jal func0f09e004 +/* f09c3c8: 0fc26fc8 */ jal bgun0f09e004 /* f09c3cc: 00002025 */ or $a0,$zero,$zero /* f09c3d0: 5040014b */ beqzl $v0,.NB0f09c900 /* f09c3d4: 8fbf0034 */ lw $ra,0x34($sp) @@ -10809,9 +10809,9 @@ glabel func0f09e4e0 /* f09c52c: 924815b1 */ lbu $t0,0x15b1($s2) /* f09c530: 1500000f */ bnez $t0,.NB0f09c570 /* f09c534: 00000000 */ sll $zero,$zero,0x0 -/* f09c538: 0fc26f42 */ jal func0f09ddec +/* f09c538: 0fc26f42 */ jal bgun0f09ddec /* f09c53c: 00000000 */ sll $zero,$zero,0x0 -/* f09c540: 0fc26f46 */ jal func0f09ddfc +/* f09c540: 0fc26f46 */ jal bgun0f09ddfc /* f09c544: ae4215a0 */ sw $v0,0x15a0($s2) /* f09c548: 24090001 */ addiu $t1,$zero,0x1 /* f09c54c: 264a1594 */ addiu $t2,$s2,0x1594 @@ -10824,7 +10824,7 @@ glabel func0f09e4e0 /* f09c568: ae4b15b8 */ sw $t3,0x15b8($s2) /* f09c56c: ae4c15bc */ sw $t4,0x15bc($s2) .NB0f09c570: -/* f09c570: 0fc27018 */ jal func0f09e144 +/* f09c570: 0fc27018 */ jal bgun0f09e144 /* f09c574: 00000000 */ sll $zero,$zero,0x0 /* f09c578: 924d15b1 */ lbu $t5,0x15b1($s2) /* f09c57c: 568d00e0 */ bnel $s4,$t5,.NB0f09c900 @@ -10833,9 +10833,9 @@ glabel func0f09e4e0 /* f09c588: a651159c */ sh $s1,0x159c($s2) /* f09c58c: a640159c */ sh $zero,0x159c($s2) .NB0f09c590: -/* f09c590: 0fc26f42 */ jal func0f09ddec +/* f09c590: 0fc26f42 */ jal bgun0f09ddec /* f09c594: ae401594 */ sw $zero,0x1594($s2) -/* f09c598: 0fc26f46 */ jal func0f09ddfc +/* f09c598: 0fc26f46 */ jal bgun0f09ddfc /* f09c59c: ae4215a0 */ sw $v0,0x15a0($s2) /* f09c5a0: ae4215a4 */ sw $v0,0x15a4($s2) .NB0f09c5a4: @@ -10863,7 +10863,7 @@ glabel func0f09e4e0 /* f09c5f0: ae5815a8 */ sw $t8,0x15a8($s2) /* f09c5f4: ae5915ac */ sw $t9,0x15ac($s2) .NB0f09c5f8: -/* f09c5f8: 0fc27018 */ jal func0f09e144 +/* f09c5f8: 0fc27018 */ jal bgun0f09e144 /* f09c5fc: 00000000 */ sll $zero,$zero,0x0 /* f09c600: 924c15b1 */ lbu $t4,0x15b1($s2) /* f09c604: 240d0003 */ addiu $t5,$zero,0x3 @@ -10983,7 +10983,7 @@ glabel func0f09e4e0 .NB0f09c798: /* f09c798: 10600005 */ beqz $v1,.NB0f09c7b0 /* f09c79c: 00008825 */ or $s1,$zero,$zero -/* f09c7a0: 0fc27018 */ jal func0f09e144 +/* f09c7a0: 0fc27018 */ jal bgun0f09e144 /* f09c7a4: 00000000 */ sll $zero,$zero,0x0 /* f09c7a8: 10000055 */ beqz $zero,.NB0f09c900 /* f09c7ac: 8fbf0034 */ lw $ra,0x34($sp) @@ -11012,7 +11012,7 @@ glabel func0f09e4e0 /* f09c7fc: ae0c0794 */ sw $t4,0x794($s0) /* f09c800: 8e4d1590 */ lw $t5,0x1590($s2) /* f09c804: 8e4615a8 */ lw $a2,0x15a8($s2) -/* f09c808: 0fc282e3 */ jal func0f0a2e94 +/* f09c808: 0fc282e3 */ jal bgun0f0a2e94 /* f09c80c: 8da50000 */ lw $a1,0x0($t5) /* f09c810: 8e4e15a8 */ lw $t6,0x15a8($s2) /* f09c814: 8e5815ac */ lw $t8,0x15ac($s2) @@ -11027,7 +11027,7 @@ glabel func0f09e4e0 /* f09c838: 8e4a1594 */ lw $t2,0x1594($s2) /* f09c83c: 8e4615a8 */ lw $a2,0x15a8($s2) /* f09c840: 26040534 */ addiu $a0,$s0,0x534 -/* f09c844: 0fc282e3 */ jal func0f0a2e94 +/* f09c844: 0fc282e3 */ jal bgun0f0a2e94 /* f09c848: 8d450000 */ lw $a1,0x0($t2) /* f09c84c: 8e4b15a8 */ lw $t3,0x15a8($s2) /* f09c850: 8e4d15ac */ lw $t5,0x15ac($s2) @@ -11061,7 +11061,7 @@ glabel func0f09e4e0 /* f09c8bc: ae580dd8 */ sw $t8,0xdd8($s2) /* f09c8c0: ae400dd8 */ sw $zero,0xdd8($s2) .NB0f09c8c4: -/* f09c8c4: 0fc26f46 */ jal func0f09ddfc +/* f09c8c4: 0fc26f46 */ jal bgun0f09ddfc /* f09c8c8: 00000000 */ sll $zero,$zero,0x0 /* f09c8cc: 240b0004 */ addiu $t3,$zero,0x4 /* f09c8d0: a24b15b0 */ sb $t3,0x15b0($s2) @@ -11091,16 +11091,16 @@ glabel func0f09e4e0 ); #endif -void func0f09ea90(void) +void bgun0f09ea90(void) { s32 i; for (i = 0; i < g_Vars.lvupdate240; i += 8) { - func0f09e4e0(); + bgun0f09e4e0(); } } -bool func0f09eae4(void) +bool bgun0f09eae4(void) { // PAL adds a check for the eyespy being used #if VERSION >= VERSION_PAL_FINAL @@ -11110,7 +11110,7 @@ bool func0f09eae4(void) } #endif - func0f09df9c(); + bgun0f09df9c(); if (g_Vars.currentplayer->gunctrl.weaponnum != WEAPON_NONE) { g_Vars.currentplayer->gunctrl.gunmemnew = g_Vars.currentplayer->gunctrl.weaponnum; @@ -11123,7 +11123,7 @@ bool func0f09eae4(void) } if (g_Vars.currentplayer->gunctrl.gunmemowner) { - func0f09e004(GUNMEMOWNER_0); + bgun0f09e004(GUNMEMOWNER_0); if (g_Vars.currentplayer->gunctrl.gunmemowner) { g_Vars.lockscreen = true; @@ -11131,23 +11131,23 @@ bool func0f09eae4(void) } } - func0f09df9c(); + bgun0f09df9c(); do { - func0f09e4e0(); - } while (!func0f09dd7c()); + bgun0f09e4e0(); + } while (!bgun0f09dd7c()); g_Vars.currentplayer->gunctrl.unk1583_06 = false; return false; } -s32 func0f09ebbc(void) +s32 bgun0f09ebbc(void) { return g_Vars.currentplayer->gunctrl.unk1598; } -void func0f09ebcc(struct defaultobj *obj, struct coord *coord, s16 *rooms, Mtxf *matrix1, f32 *arg4, Mtxf *matrix2, struct prop *prop, struct coord *pos) +void bgun0f09ebcc(struct defaultobj *obj, struct coord *coord, s16 *rooms, Mtxf *matrix1, f32 *arg4, Mtxf *matrix2, struct prop *prop, struct coord *pos) { struct prop *objprop = obj->prop; @@ -11188,7 +11188,7 @@ void func0f09ebcc(struct defaultobj *obj, struct coord *coord, s16 *rooms, Mtxf } } -void func0f09ed2c(struct defaultobj *obj, struct coord *newpos, Mtxf *arg2, f32 *arg3, Mtxf *arg4) +void bgun0f09ed2c(struct defaultobj *obj, struct coord *newpos, Mtxf *arg2, f32 *arg3, Mtxf *arg4) { struct prop *objprop = obj->prop; struct coord pos; @@ -11203,7 +11203,7 @@ void func0f09ed2c(struct defaultobj *obj, struct coord *newpos, Mtxf *arg2, f32 roomsCopy(playerprop->rooms, rooms); - func0f09ebcc(obj, &pos, rooms, arg2, arg3, arg4, playerprop, newpos); + bgun0f09ebcc(obj, &pos, rooms, arg2, arg3, arg4, playerprop, newpos); if (obj->hidden & OBJHFLAG_AIRBORNE) { obj->projectile->flags |= PROJECTILEFLAG_00000080; @@ -11218,7 +11218,7 @@ void func0f09ed2c(struct defaultobj *obj, struct coord *newpos, Mtxf *arg2, f32 /** * Create a thrown projectile. */ -struct defaultobj *func0f09ee18(struct chrdata *chr, struct gset *gset, struct coord *pos, s16 *rooms, Mtxf *arg4, struct coord *arg5) +struct defaultobj *bgun0f09ee18(struct chrdata *chr, struct gset *gset, struct coord *pos, s16 *rooms, Mtxf *arg4, struct coord *arg5) { struct defaultobj *obj = NULL; struct weaponfunc *basefunc; @@ -11280,7 +11280,7 @@ struct defaultobj *func0f09ee18(struct chrdata *chr, struct gset *gset, struct c } if (obj != NULL) { - func0f09ebcc(obj, pos, rooms, arg4, (f32 *)arg5, (Mtxf *)mf, chr->prop, pos); + bgun0f09ebcc(obj, pos, rooms, arg4, (f32 *)arg5, (Mtxf *)mf, chr->prop, pos); obj->hidden &= 0x0fffffff; @@ -11307,7 +11307,7 @@ struct defaultobj *func0f09ee18(struct chrdata *chr, struct gset *gset, struct c #if PAL GLOBAL_ASM( -glabel handCreateThrownProjectile +glabel bgunCreateThrownProjectile .late_rodata glabel var7f1ac708 .word 0x4096c5bf @@ -11459,7 +11459,7 @@ glabel var7f1ac72c /* f09f2e8: 27a401e8 */ addiu $a0,$sp,0x1e8 /* f09f2ec: 27a501dc */ addiu $a1,$sp,0x1dc /* f09f2f0: 8fa60240 */ lw $a2,0x240($sp) -/* f09f2f4: 0fc2832c */ jal handCalculateShotSpread +/* f09f2f4: 0fc2832c */ jal bgunCalculateShotSpread /* f09f2f8: 24070001 */ addiu $a3,$zero,0x1 /* f09f2fc: 0fc2d5de */ jal currentPlayerGetUnk174c /* f09f300: 00000000 */ nop @@ -11665,7 +11665,7 @@ glabel var7f1ac72c /* f09f5fc: 91cf0000 */ lbu $t7,0x0($t6) /* f09f600: 15e10003 */ bne $t7,$at,.L0f09f610 /* f09f604: 00000000 */ nop -/* f09f608: 0fc284d3 */ jal func0f0a134c +/* f09f608: 0fc284d3 */ jal bgun0f0a134c /* f09f60c: 8fa40240 */ lw $a0,0x240($sp) .L0f09f610: /* f09f610: 3c08800a */ lui $t0,%hi(g_Vars) @@ -11713,7 +11713,7 @@ glabel var7f1ac72c /* f09f6b4: 27a70160 */ addiu $a3,$sp,0x160 /* f09f6b8: 8d640004 */ lw $a0,0x4($t3) /* f09f6bc: afb90014 */ sw $t9,0x14($sp) -/* f09f6c0: 0fc27b86 */ jal func0f09ee18 +/* f09f6c0: 0fc27b86 */ jal bgun0f09ee18 /* f09f6c4: afac0010 */ sw $t4,0x10($sp) /* f09f6c8: 1040005b */ beqz $v0,.L0f09f838 /* f09f6cc: 00402025 */ or $a0,$v0,$zero @@ -11823,7 +11823,7 @@ glabel var7f1ac72c ); #else GLOBAL_ASM( -glabel handCreateThrownProjectile +glabel bgunCreateThrownProjectile .late_rodata glabel var7f1ac708 .word 0x4096c5bf @@ -11975,7 +11975,7 @@ glabel var7f1ac72c /* f09f2e8: 27a401e8 */ addiu $a0,$sp,0x1e8 /* f09f2ec: 27a501dc */ addiu $a1,$sp,0x1dc /* f09f2f0: 8fa60240 */ lw $a2,0x240($sp) -/* f09f2f4: 0fc2832c */ jal handCalculateShotSpread +/* f09f2f4: 0fc2832c */ jal bgunCalculateShotSpread /* f09f2f8: 24070001 */ addiu $a3,$zero,0x1 /* f09f2fc: 0fc2d5de */ jal currentPlayerGetUnk174c /* f09f300: 00000000 */ nop @@ -12181,7 +12181,7 @@ glabel var7f1ac72c /* f09f5fc: 91cf0000 */ lbu $t7,0x0($t6) /* f09f600: 15e10003 */ bne $t7,$at,.L0f09f610 /* f09f604: 00000000 */ nop -/* f09f608: 0fc284d3 */ jal func0f0a134c +/* f09f608: 0fc284d3 */ jal bgun0f0a134c /* f09f60c: 8fa40240 */ lw $a0,0x240($sp) .L0f09f610: /* f09f610: 3c08800a */ lui $t0,%hi(g_Vars) @@ -12229,7 +12229,7 @@ glabel var7f1ac72c /* f09f6b4: 27a70160 */ addiu $a3,$sp,0x160 /* f09f6b8: 8d640004 */ lw $a0,0x4($t3) /* f09f6bc: afb90014 */ sw $t9,0x14($sp) -/* f09f6c0: 0fc27b86 */ jal func0f09ee18 +/* f09f6c0: 0fc27b86 */ jal bgun0f09ee18 /* f09f6c4: afac0010 */ sw $t4,0x10($sp) /* f09f6c8: 1040005b */ beqz $v0,.L0f09f838 /* f09f6cc: 00402025 */ or $a0,$v0,$zero @@ -12339,7 +12339,7 @@ glabel var7f1ac72c ); #endif -void func0f09f848(s32 handnum) +void bgun0f09f848(s32 handnum) { struct hand *hand = &g_Vars.currentplayer->hands[handnum]; struct defaultobj *obj = &hand->rocket->base; @@ -12375,7 +12375,7 @@ void func0f09f848(s32 handnum) } } -void func0f09f974(s32 handnum, struct weaponfunc_shootprojectile *func) +void bgun0f09f974(s32 handnum, struct weaponfunc_shootprojectile *func) { struct hand *hand = &g_Vars.currentplayer->hands[handnum]; struct weaponobj *obj; @@ -12400,7 +12400,7 @@ void func0f09f974(s32 handnum, struct weaponfunc_shootprojectile *func) } } -void func0f09fa20(s32 handnum) +void bgun0f09fa20(s32 handnum) { struct hand *hand = &g_Vars.currentplayer->hands[handnum]; @@ -12412,7 +12412,7 @@ void func0f09fa20(s32 handnum) #if VERSION >= VERSION_PAL_FINAL GLOBAL_ASM( -glabel handCreateFiredProjectile +glabel bgunCreateFiredProjectile .late_rodata glabel var7f1ac730 .word 0x3fd55555 @@ -12468,7 +12468,7 @@ glabel var7f1ac740 /* f09fe28: 27a40204 */ addiu $a0,$sp,0x204 /* f09fe2c: 27a501f8 */ addiu $a1,$sp,0x1f8 /* f09fe30: 02003025 */ move $a2,$s0 -/* f09fe34: 0fc283f5 */ jal handCalculateShotSpread +/* f09fe34: 0fc283f5 */ jal bgunCalculateShotSpread /* f09fe38: 24070001 */ li $a3,0x1 /* f09fe3c: 0fc2d726 */ jal currentPlayerGetUnk174c /* f09fe40: 00000000 */ nop @@ -12884,7 +12884,7 @@ glabel var7f1ac740 /* f0a0460: 000d7700 */ sll $t6,$t5,0x1c /* f0a0464: 016e7825 */ or $t7,$t3,$t6 /* f0a0468: ae0f0040 */ sw $t7,0x40($s0) -/* f0a046c: 0fc27c04 */ jal func0f09ed2c +/* f0a046c: 0fc27c04 */ jal bgun0f09ed2c /* f0a0470: afb80010 */ sw $t8,0x10($sp) /* f0a0474: 8e190040 */ lw $t9,0x40($s0) /* f0a0478: 8fa301d8 */ lw $v1,0x1d8($sp) @@ -13047,7 +13047,7 @@ glabel var7f1ac740 ); #elif VERSION >= VERSION_NTSC_1_0 GLOBAL_ASM( -glabel handCreateFiredProjectile +glabel bgunCreateFiredProjectile .late_rodata glabel var7f1ac730 .word 0x3fd55555 @@ -13103,7 +13103,7 @@ glabel var7f1ac740 /* f09fb24: 27a40204 */ addiu $a0,$sp,0x204 /* f09fb28: 27a501f8 */ addiu $a1,$sp,0x1f8 /* f09fb2c: 02003025 */ or $a2,$s0,$zero -/* f09fb30: 0fc2832c */ jal handCalculateShotSpread +/* f09fb30: 0fc2832c */ jal bgunCalculateShotSpread /* f09fb34: 24070001 */ addiu $a3,$zero,0x1 /* f09fb38: 0fc2d5de */ jal currentPlayerGetUnk174c /* f09fb3c: 00000000 */ nop @@ -13511,7 +13511,7 @@ glabel var7f1ac740 /* f0a013c: 000c6f00 */ sll $t5,$t4,0x1c /* f0a0140: 014d7025 */ or $t6,$t2,$t5 /* f0a0144: ae0e0040 */ sw $t6,0x40($s0) -/* f0a0148: 0fc27b4b */ jal func0f09ed2c +/* f0a0148: 0fc27b4b */ jal bgun0f09ed2c /* f0a014c: afaf0010 */ sw $t7,0x10($sp) /* f0a0150: 8e180040 */ lw $t8,0x40($s0) /* f0a0154: 8fa301d8 */ lw $v1,0x1d8($sp) @@ -13674,7 +13674,7 @@ glabel var7f1ac740 ); #else GLOBAL_ASM( -glabel handCreateFiredProjectile +glabel bgunCreateFiredProjectile .late_rodata glabel var7f1ac730 .word 0x3fd55555 @@ -13730,7 +13730,7 @@ glabel var7f1ac740 /* f09d99c: 27a40204 */ addiu $a0,$sp,0x204 /* f09d9a0: 27a501f8 */ addiu $a1,$sp,0x1f8 /* f09d9a4: 02003025 */ or $a2,$s0,$zero -/* f09d9a8: 0fc27a99 */ jal handCalculateShotSpread +/* f09d9a8: 0fc27a99 */ jal bgunCalculateShotSpread /* f09d9ac: 24070001 */ addiu $a3,$zero,0x1 /* f09d9b0: 0fc2cd36 */ jal currentPlayerGetUnk174c /* f09d9b4: 00000000 */ sll $zero,$zero,0x0 @@ -14115,7 +14115,7 @@ glabel var7f1ac740 /* f09df58: 000a5f00 */ sll $t3,$t2,0x1c /* f09df5c: 010b6025 */ or $t4,$t0,$t3 /* f09df60: ae0c0040 */ sw $t4,0x40($s0) -/* f09df64: 0fc272f0 */ jal func0f09ed2c +/* f09df64: 0fc272f0 */ jal bgun0f09ed2c /* f09df68: afad0010 */ sw $t5,0x10($sp) /* f09df6c: 8e0e0040 */ lw $t6,0x40($s0) /* f09df70: 3c0c800a */ lui $t4,0x800a @@ -14248,7 +14248,7 @@ glabel var7f1ac740 #if VERSION >= VERSION_PAL_FINAL GLOBAL_ASM( -glabel func0f0a0394 +glabel bgun0f0a0394 .late_rodata glabel var7f1ac744 .word 0x3e99999a @@ -14332,7 +14332,7 @@ glabel var7f1ac764 /* f0a0484: 00000000 */ nop /* f0a0488: 24100005 */ addiu $s0,$zero,0x5 .L0f0a048c: -/* f0a048c: 0fc26057 */ jal func0f09815c +/* f0a048c: 0fc26057 */ jal bgun0f09815c /* f0a0490: 26a40638 */ addiu $a0,$s5,0x638 /* f0a0494: 46000506 */ mov.s $f20,$f0 /* f0a0498: 0c007486 */ jal modelGetNumAnimFrames @@ -14766,7 +14766,7 @@ glabel var7f1ac764 /* f0a0ad8: 3c06447a */ lui $a2,0x447a /* f0a0adc: 0fc2d30f */ jal func0f0b4c3c /* f0a0ae0: e6aa1678 */ swc1 $f10,0x1678($s5) -/* f0a0ae4: 0fc2a4f8 */ jal handSetAimPos +/* f0a0ae4: 0fc2a4f8 */ jal bgunSetAimPos /* f0a0ae8: 02002025 */ or $a0,$s0,$zero /* f0a0aec: 8fbf0064 */ lw $ra,0x64($sp) /* f0a0af0: d7b40010 */ ldc1 $f20,0x10($sp) @@ -14788,7 +14788,7 @@ glabel var7f1ac764 ); #else GLOBAL_ASM( -glabel func0f0a0394 +glabel bgun0f0a0394 .late_rodata glabel var7f1ac744 .word 0x3e99999a @@ -14872,7 +14872,7 @@ glabel var7f1ac764 /* f0a0484: 00000000 */ nop /* f0a0488: 24100005 */ addiu $s0,$zero,0x5 .L0f0a048c: -/* f0a048c: 0fc26057 */ jal func0f09815c +/* f0a048c: 0fc26057 */ jal bgun0f09815c /* f0a0490: 26a40638 */ addiu $a0,$s5,0x638 /* f0a0494: 46000506 */ mov.s $f20,$f0 /* f0a0498: 0c007486 */ jal modelGetNumAnimFrames @@ -15306,7 +15306,7 @@ glabel var7f1ac764 /* f0a0ad8: 3c06447a */ lui $a2,0x447a /* f0a0adc: 0fc2d30f */ jal func0f0b4c3c /* f0a0ae0: e6aa1678 */ swc1 $f10,0x1678($s5) -/* f0a0ae4: 0fc2a4f8 */ jal handSetAimPos +/* f0a0ae4: 0fc2a4f8 */ jal bgunSetAimPos /* f0a0ae8: 02002025 */ or $a0,$s0,$zero /* f0a0aec: 8fbf0064 */ lw $ra,0x64($sp) /* f0a0af0: d7b40010 */ ldc1 $f20,0x10($sp) @@ -15328,9 +15328,9 @@ glabel var7f1ac764 ); #endif -void currentPlayerSwivelGunTowards(f32 screenx, f32 screeny, f32 damp) +void bgunSwivelTowards(f32 screenx, f32 screeny, f32 damp) { - struct weapon *weapon = weaponFindById(handGetWeaponNum(HAND_RIGHT)); + struct weapon *weapon = weaponFindById(bgunGetWeaponNum(HAND_RIGHT)); #if VERSION >= VERSION_PAL_FINAL f32 value = weapon->eptr->unk10; #else @@ -15341,22 +15341,22 @@ void currentPlayerSwivelGunTowards(f32 screenx, f32 screeny, f32 damp) value = damp; } - func0f0a0394(screenx, screeny, damp, value); + bgun0f0a0394(screenx, screeny, damp, value); } -void func0f0a0b98(f32 screenx, f32 screeny) +void bgun0f0a0b98(f32 screenx, f32 screeny) { - struct weapon *weapon = weaponFindById(handGetWeaponNum(HAND_RIGHT)); + struct weapon *weapon = weaponFindById(bgunGetWeaponNum(HAND_RIGHT)); #if VERSION >= VERSION_PAL_FINAL f32 value = weapon->eptr->unk10; #else f32 value = weapon->eptr->unk14; #endif - func0f0a0394(screenx, screeny, PAL ? 0.935f : 0.945f, value); + bgun0f0a0394(screenx, screeny, PAL ? 0.935f : 0.945f, value); } -void currentPlayerGetCrossPos(f32 *x, f32 *y) +void bgunGetCrossPos(f32 *x, f32 *y) { struct player *player = g_Vars.currentplayer; @@ -15364,7 +15364,7 @@ void currentPlayerGetCrossPos(f32 *x, f32 *y) *y = player->crosspos[1]; } -void func0f0a0c08(struct coord *arg0, struct coord *arg1) +void bgun0f0a0c08(struct coord *arg0, struct coord *arg1) { arg0->x = 0; arg0->y = 0; @@ -15373,7 +15373,7 @@ void func0f0a0c08(struct coord *arg0, struct coord *arg1) func0f0b4c3c(g_Vars.currentplayer->crosspos, arg1, 1); } -void func0f0a0c44(s32 handnum, struct coord *arg1, struct coord *arg2) +void bgun0f0a0c44(s32 handnum, struct coord *arg1, struct coord *arg2) { arg1->x = 0; arg1->y = 0; @@ -15382,7 +15382,7 @@ void func0f0a0c44(s32 handnum, struct coord *arg1, struct coord *arg2) func0f0b4c3c(g_Vars.currentplayer->hands[handnum].crosspos, arg2, 1); } -void handCalculateShotSpread(struct coord *arg0, struct coord *arg1, s32 handnum, bool dorandom) +void bgunCalculateShotSpread(struct coord *arg0, struct coord *arg1, s32 handnum, bool dorandom) { f32 crosspos[2]; f32 spread = 0; @@ -15397,7 +15397,7 @@ void handCalculateShotSpread(struct coord *arg0, struct coord *arg1, s32 handnum } // Unsure what this is - if (weaponHasClassFlag(getCurrentPlayerWeaponIdWrapper(handnum), WEAPONCLASSFLAG_00000004) + if (weaponHasClassFlag(bgunGetWeaponNum2(handnum), WEAPONCLASSFLAG_00000004) && player->hands[handnum].burstbullets == 1) { spread *= 0.25f; } @@ -15440,7 +15440,7 @@ void handCalculateShotSpread(struct coord *arg0, struct coord *arg1, s32 handnum } GLOBAL_ASM( -glabel func0f0a0fac +glabel bgun0f0a0fac /* f0a0fac: 27bdff58 */ addiu $sp,$sp,-168 /* f0a0fb0: 44801000 */ mtc1 $zero,$f2 /* f0a0fb4: afbf002c */ sw $ra,0x2c($sp) @@ -15647,7 +15647,7 @@ glabel func0f0a0fac /* f0a12ac: 00000000 */ nop ); -void handSetLastShootInfo(struct coord *pos, struct coord *dir, s32 handnum) +void bgunSetLastShootInfo(struct coord *pos, struct coord *dir, s32 handnum) { struct hand *hand = &g_Vars.currentplayer->hands[handnum]; @@ -15662,14 +15662,14 @@ void handSetLastShootInfo(struct coord *pos, struct coord *dir, s32 handnum) hand->lastshootdir.z = dir->z; } -u32 handGetUnk0c30(s32 handnum) +u32 bgunGetUnk0c30(s32 handnum) { struct hand *hand = &g_Vars.currentplayer->hands[handnum]; return hand->shotstotake; } -void func0f0a134c(s32 handnum) +void bgun0f0a134c(s32 handnum) { struct player *player = g_Vars.currentplayer; s32 i; @@ -15678,7 +15678,7 @@ void func0f0a134c(s32 handnum) for (i = 0; i < 2; i++) { if (player->gunctrl.ammotypes[i] >= 0) { s32 spaceinclip = player->hands[handnum].clipsizes[i] - player->hands[handnum].loadedammo[i]; - s32 index = weaponGetUnequippedReloadIndex(player->gunctrl.weaponnum); + s32 index = bgunGetUnequippedReloadIndex(player->gunctrl.weaponnum); if (index != -1) { #if VERSION >= VERSION_PAL_FINAL @@ -15701,17 +15701,17 @@ void func0f0a134c(s32 handnum) currentPlayerSetWeaponReapable(handnum); } - func0f09fa20(handnum); + bgun0f09fa20(handnum); } -void func0f0a1528(void) +void bgun0f0a1528(void) { struct player *player = g_Vars.currentplayer; struct gunctrl *ctrl = &g_Vars.currentplayer->gunctrl; s32 i; if (ctrl->switchtoweaponnum >= 0) { - if (func0f09bec8(HAND_RIGHT) && func0f09bec8(HAND_LEFT)) { + if (bgun0f09bec8(HAND_RIGHT) && bgun0f09bec8(HAND_LEFT)) { s32 weaponnum = player->gunctrl.weaponnum; s32 previnuse = player->hands[HAND_LEFT].inuse; struct hand *lefthand; @@ -15728,8 +15728,8 @@ void func0f0a1528(void) func0f0d7364(); - func0f0a134c(HAND_LEFT); - func0f0a134c(HAND_RIGHT); + bgun0f0a134c(HAND_LEFT); + bgun0f0a134c(HAND_RIGHT); if (weaponnum == WEAPON_HORIZONSCANNER) { g_Vars.currentplayer->insightaimmode = false; @@ -15760,7 +15760,7 @@ void func0f0a1528(void) righthand->inuse = false; ctrl->weaponnum = WEAPON_NONE; } else { - func0f09df64(ctrl->switchtoweaponnum); + bgun0f09df64(ctrl->switchtoweaponnum); ctrl->weaponnum = ctrl->switchtoweaponnum; lefthand->inuse = true; righthand->inuse = true; @@ -15809,7 +15809,7 @@ void func0f0a1528(void) player->hands[i].gset.unk0639 = (ctrl->upgradewant >> (i * 4)) & 0xf; player->hands[i].ganstarot = 0.0f; - func0f0abd30(i); + bgun0f0abd30(i); animInit(&player->hands[i].anim); @@ -15837,7 +15837,7 @@ void func0f0a1528(void) } invRemoveItemByNum(ctrl->weaponnum); - func0f0a1c2c(); + bgun0f0a1c2c(); } ctrl->curfnstr = 0; @@ -15847,14 +15847,14 @@ void func0f0a1528(void) } else { if (((player->hands[HAND_LEFT].inuse && !player->gunctrl.unk1583_00) || (!player->hands[HAND_LEFT].inuse && player->gunctrl.unk1583_00)) - && func0f09bec8(HAND_LEFT)) { - func0f0a134c(HAND_LEFT); + && bgun0f09bec8(HAND_LEFT)) { + bgun0f0a134c(HAND_LEFT); player->hands[HAND_LEFT].inuse = player->gunctrl.unk1583_00; } } } -void currentPlayerEquipWeapon(s32 weaponnum) +void bgunEquipWeapon(s32 weaponnum) { struct player *player = g_Vars.currentplayer; @@ -15866,7 +15866,7 @@ void currentPlayerEquipWeapon(s32 weaponnum) player->gunctrl.wantammo = false; } -s32 handGetWeaponNum(s32 handnum) +s32 bgunGetWeaponNum(s32 handnum) { if (!g_Vars.currentplayer->hands[handnum].inuse) { return WEAPON_NONE; @@ -15875,22 +15875,22 @@ s32 handGetWeaponNum(s32 handnum) return g_Vars.currentplayer->gunctrl.weaponnum; } -s32 getCurrentPlayerWeaponIdWrapper(s32 handnum) +s32 bgunGetWeaponNum2(s32 handnum) { - return handGetWeaponNum(handnum); + return bgunGetWeaponNum(handnum); } -bool func0f0a1a10(s32 weaponnum) +bool bgun0f0a1a10(s32 weaponnum) { if (weaponHasFlag(weaponnum, WEAPONFLAG_00000400) - && (weaponGetAmmoType(weaponnum, FUNC_PRIMARY) == 0 || currentPlayerGetAmmoQuantityForWeapon(weaponnum, FUNC_PRIMARY) > 0)) { + && (bgunGetAmmoTypeForWeapon(weaponnum, FUNC_PRIMARY) == 0 || bgunGetAmmoQtyForWeapon(weaponnum, FUNC_PRIMARY) > 0)) { return true; } return false; } -s32 func0f0a1a68(s32 arg0) +s32 bgun0f0a1a68(s32 arg0) { s32 weaponnum; @@ -15907,7 +15907,7 @@ s32 func0f0a1a68(s32 arg0) return weaponnum; } -void func0f0a1ab0(void) +void bgun0f0a1ab0(void) { if (g_Vars.tickmode != TICKMODE_CUTSCENE) { struct player *player = g_Vars.currentplayer; @@ -15915,30 +15915,30 @@ void func0f0a1ab0(void) #if VERSION >= VERSION_NTSC_1_0 if (invHasSingleWeaponIncAllGuns(player->gunctrl.prevweaponnum)) { - currentPlayerEquipWeaponWrapper(HAND_RIGHT, player->gunctrl.prevweaponnum); + bgunEquipWeapon2(HAND_RIGHT, player->gunctrl.prevweaponnum); dualweaponnum = invHasDoubleWeaponIncAllGuns(player->gunctrl.prevweaponnum, player->gunctrl.prevweaponnum) * player->gunctrl.prevweaponnum * player->gunctrl.unk1583_01; - currentPlayerEquipWeaponWrapper(HAND_LEFT, dualweaponnum); + bgunEquipWeapon2(HAND_LEFT, dualweaponnum); } else { - currentPlayerAutoSwitchWeapon(); + bgunAutoSwitchWeapon(); } #else - currentPlayerEquipWeaponWrapper(HAND_RIGHT, player->gunctrl.prevweaponnum); - currentPlayerEquipWeaponWrapper(HAND_LEFT, player->gunctrl.prevweaponnum * player->gunctrl.unk1583_01); + bgunEquipWeapon2(HAND_RIGHT, player->gunctrl.prevweaponnum); + bgunEquipWeapon2(HAND_LEFT, player->gunctrl.prevweaponnum * player->gunctrl.unk1583_01); #endif } } -void func0f0a1b50(void) +void bgun0f0a1b50(void) { s32 weaponnum1; s32 weaponnum2; struct player *player = g_Vars.currentplayer; if (g_Vars.tickmode != TICKMODE_CUTSCENE) { - weaponnum1 = func0f0a1a68(0); - weaponnum2 = func0f0a1a68(1); + weaponnum1 = bgun0f0a1a68(0); + weaponnum2 = bgun0f0a1a68(1); if (weaponnum1 > WEAPON_PSYCHOSISGUN || weaponnum2 > WEAPON_PSYCHOSISGUN) { weaponnum1 = player->gunctrl.prevweaponnum; @@ -15953,19 +15953,19 @@ void func0f0a1b50(void) player->gunctrl.unk1583_00 = true; } - currentPlayerEquipWeapon(weaponnum1); + bgunEquipWeapon(weaponnum1); } } -void func0f0a1c2c(void) +void bgun0f0a1c2c(void) { s32 weaponnum1; s32 weaponnum2; struct player *player = g_Vars.currentplayer; if (g_Vars.tickmode != TICKMODE_CUTSCENE) { - weaponnum1 = func0f0a1a68(0); - weaponnum2 = func0f0a1a68(1); + weaponnum1 = bgun0f0a1a68(0); + weaponnum2 = bgun0f0a1a68(1); if (weaponnum2 == WEAPON_REMOTEMINE) { weaponnum2 = WEAPON_NONE; @@ -15984,7 +15984,7 @@ void func0f0a1c2c(void) player->gunctrl.unk1583_00 = true; } - currentPlayerEquipWeapon(weaponnum1); + bgunEquipWeapon(weaponnum1); } } @@ -15994,7 +15994,7 @@ void func0f0a1c2c(void) * * Used by the active menu to colour the slots. */ -bool currentPlayerHasAmmoForWeapon(s32 weaponnum) +bool bgunHasAmmoForWeapon(s32 weaponnum) { bool ammodefexists = false; bool hasammo = false; @@ -16014,7 +16014,7 @@ bool currentPlayerHasAmmoForWeapon(s32 weaponnum) if (ammo) { ammodefexists = true; - if (currentPlayerGetAmmoCount(ammo->type) > 0) { + if (bgunGetAmmoCount(ammo->type) > 0) { hasammo = true; } } @@ -16033,7 +16033,7 @@ bool currentPlayerHasAmmoForWeapon(s32 weaponnum) } GLOBAL_ASM( -glabel currentPlayerAutoSwitchWeapon +glabel bgunAutoSwitchWeapon /* f0a1df4: 27bdff98 */ addiu $sp,$sp,-104 /* f0a1df8: 3c03800a */ lui $v1,%hi(g_Vars) /* f0a1dfc: 24639fc0 */ addiu $v1,$v1,%lo(g_Vars) @@ -16078,7 +16078,7 @@ glabel currentPlayerAutoSwitchWeapon /* f0a1e94: 00002825 */ or $a1,$zero,$zero /* f0a1e98: 00408825 */ or $s1,$v0,$zero /* f0a1e9c: 00402025 */ or $a0,$v0,$zero -/* f0a1ea0: 0fc2642c */ jal func0f0990b0 +/* f0a1ea0: 0fc2642c */ jal bgun0f0990b0 /* f0a1ea4: 02402825 */ or $a1,$s2,$zero /* f0a1ea8: 14400006 */ bnez $v0,.L0f0a1ec4 /* f0a1eac: 24010012 */ addiu $at,$zero,0x12 @@ -16099,7 +16099,7 @@ glabel currentPlayerAutoSwitchWeapon /* f0a1ee0: 24050001 */ addiu $a1,$zero,0x1 /* f0a1ee4: 00408825 */ or $s1,$v0,$zero /* f0a1ee8: 00402025 */ or $a0,$v0,$zero -/* f0a1eec: 0fc2642c */ jal func0f0990b0 +/* f0a1eec: 0fc2642c */ jal bgun0f0990b0 /* f0a1ef0: 02402825 */ or $a1,$s2,$zero /* f0a1ef4: 54400007 */ bnezl $v0,.L0f0a1f14 /* f0a1ef8: 8fac0044 */ lw $t4,0x44($sp) @@ -16197,7 +16197,7 @@ glabel currentPlayerAutoSwitchWeapon /* f0a2030: 31cfff7f */ andi $t7,$t6,0xff7f /* f0a2034: a04f1583 */ sb $t7,0x1583($v0) .L0f0a2038: -/* f0a2038: 0fc2865b */ jal currentPlayerEquipWeapon +/* f0a2038: 0fc2865b */ jal bgunEquipWeapon /* f0a203c: 03c02025 */ or $a0,$s8,$zero /* f0a2040: 8fb80040 */ lw $t8,0x40($sp) /* f0a2044: 3c02800a */ lui $v0,%hi(g_Vars+0x284) @@ -16251,7 +16251,7 @@ glabel currentPlayerAutoSwitchWeapon // Mismatch: First loop should store pointer to current item in s3 and do an // address comparison for the end, but the below stores index in s4 and does an // integer comparison. Variable refcounts affects this so might be related. -//void currentPlayerAutoSwitchWeapon(void) +//void bgunAutoSwitchWeapon(void) //{ // s32 i; // bool foundcurrent2; @@ -16284,7 +16284,7 @@ glabel currentPlayerAutoSwitchWeapon // weapon = weaponFindById(weaponnum); // func = weaponGetFunctionById(weaponnum, FUNC_PRIMARY); // -// if (!func0f0990b0(func, weapon) && (func->flags & FUNCFLAG_AUTOSWITCHUNSELECTABLE) == 0) { +// if (!bgun0f0990b0(func, weapon) && (func->flags & FUNCFLAG_AUTOSWITCHUNSELECTABLE) == 0) { // usable = true; // } // @@ -16293,7 +16293,7 @@ glabel currentPlayerAutoSwitchWeapon // } else { // func = weaponGetFunctionById(weaponnum, FUNC_SECONDARY); // -// if (!func0f0990b0(func, weapon) && (func->flags & FUNCFLAG_AUTOSWITCHUNSELECTABLE) == 0) { +// if (!bgun0f0990b0(func, weapon) && (func->flags & FUNCFLAG_AUTOSWITCHUNSELECTABLE) == 0) { // usable = true; // } // } @@ -16359,7 +16359,7 @@ glabel currentPlayerAutoSwitchWeapon // g_Vars.currentplayer->gunctrl.unk1583_00 = false; // } // -// currentPlayerEquipWeapon(newweaponnum); +// bgunEquipWeapon(newweaponnum); // // if (wantammo) { // g_Vars.currentplayer->gunctrl.wantammo = true; @@ -16367,7 +16367,7 @@ glabel currentPlayerAutoSwitchWeapon // } //} -void currentPlayerEquipWeaponWrapper(bool arg0, s32 weaponnum) +void bgunEquipWeapon2(bool arg0, s32 weaponnum) { if (arg0 == 1) { if (weaponnum == WEAPON_NONE) { @@ -16380,21 +16380,21 @@ void currentPlayerEquipWeaponWrapper(bool arg0, s32 weaponnum) weaponnum = WEAPON_UNARMED; } - currentPlayerEquipWeapon(weaponnum); + bgunEquipWeapon(weaponnum); } } -s32 handIsFiring(s32 handnum) +s32 bgunIsFiring(s32 handnum) { return g_Vars.currentplayer->hands[handnum].firing; } -s32 handGetAttackType(s32 handnum) +s32 bgunGetAttackType(s32 handnum) { return g_Vars.currentplayer->hands[handnum].attacktype; } -char *weaponGetName(s32 weaponnum) +char *bgunGetName(s32 weaponnum) { struct weapon *weapon = g_Weapons[weaponnum]; @@ -16405,7 +16405,7 @@ char *weaponGetName(s32 weaponnum) return "** error\n"; } -u16 weaponGetNameId(s32 weaponnum) +u16 bgunGetNameId(s32 weaponnum) { struct weapon *weapon = g_Weapons[weaponnum]; @@ -16416,7 +16416,7 @@ u16 weaponGetNameId(s32 weaponnum) return 0; } -char *weaponGetShortName(s32 weaponnum) +char *bgunGetShortName(s32 weaponnum) { struct weapon *weapon = g_Weapons[weaponnum]; @@ -16429,17 +16429,17 @@ char *weaponGetShortName(s32 weaponnum) const char var7f1ac170[] = "wantedfn %d tiggle %d\n"; -void currentPlayerReloadHandIfPossible(s32 handnum) +void bgunReloadIfPossible(s32 handnum) { struct player *player = g_Vars.currentplayer; - if (weaponGetAmmoType(handGetWeaponNum(handnum), 0) + if (bgunGetAmmoTypeForWeapon(bgunGetWeaponNum(handnum), 0) && player->hands[handnum].modenext == HANDMODE_NONE) { player->hands[handnum].modenext = HANDMODE_RELOAD; } } -void handSetAdjustPos(f32 angle) +void bgunSetAdjustPos(f32 angle) { struct player *player = g_Vars.currentplayer; @@ -16447,13 +16447,13 @@ void handSetAdjustPos(f32 angle) player->hands[1].adjustpos.z = (1 - cosf(angle)) * 5; } -void handResetSlideInc(s32 handnum) +void bgunResetSlideInc(s32 handnum) { g_Vars.currentplayer->hands[handnum].slideinc = 1; } GLOBAL_ASM( -glabel func0f0a233c +glabel bgun0f0a233c .late_rodata glabel var7f1ac768 .word 0x3e2aaaab @@ -16518,7 +16518,7 @@ glabel var7f1ac768 /* f0a2410: 5920001e */ blezl $t1,.L0f0a248c /* f0a2414: 8fbf0014 */ lw $ra,0x14($sp) /* f0a2418: afa3001c */ sw $v1,0x1c($sp) -/* f0a241c: 0fc26291 */ jal func0f098a44 +/* f0a241c: 0fc26291 */ jal bgun0f098a44 /* f0a2420: e7a2002c */ swc1 $f2,0x2c($sp) /* f0a2424: 3c06800a */ lui $a2,%hi(g_Vars) /* f0a2428: 44806000 */ mtc1 $zero,$f12 @@ -16554,19 +16554,19 @@ glabel var7f1ac768 /* f0a2494: 00000000 */ nop ); -f32 func0f0a2498(f32 arg0, f32 arg1, f32 arg2, f32 arg3) +f32 bgun0f0a2498(f32 arg0, f32 arg1, f32 arg2, f32 arg3) { f32 a = arg0 - arg2; return func0f096a7c(a / sqrtf(a * a + (arg1 - arg3) * (arg1 - arg3))); } -void func0f0a24f0(struct coord *arg0, s32 handnum) +void bgun0f0a24f0(struct coord *arg0, s32 handnum) { struct coord b; struct coord a; - func0f0a0c44(handnum, &a, &b); + bgun0f0a0c44(handnum, &a, &b); b.x *= 1000; b.y *= 1000; @@ -16579,7 +16579,7 @@ void func0f0a24f0(struct coord *arg0, s32 handnum) #if VERSION >= VERSION_PAL_FINAL GLOBAL_ASM( -glabel func0f0a256c +glabel bgun0f0a256c /* f0a256c: 3c0e800a */ lui $t6,%hi(var8009d148) /* f0a2570: 8dced148 */ lw $t6,%lo(var8009d148)($t6) /* f0a2574: 27bdff48 */ addiu $sp,$sp,-184 @@ -16739,7 +16739,7 @@ glabel func0f0a256c ); #else GLOBAL_ASM( -glabel func0f0a256c +glabel bgun0f0a256c /* f0a256c: 3c0e800a */ lui $t6,%hi(var8009d148) /* f0a2570: 8dced148 */ lw $t6,%lo(var8009d148)($t6) /* f0a2574: 27bdff48 */ addiu $sp,$sp,-184 @@ -16899,7 +16899,7 @@ glabel func0f0a256c ); #endif -bool func0f0a27c8(void) +bool bgun0f0a27c8(void) { struct hand *hand; struct weaponfunc *func; @@ -16912,7 +16912,7 @@ bool func0f0a27c8(void) && hand->state == HANDSTATE_ATTACK && hand->unk0ce8 != NULL && hand->animmode == HANDANIMMODE_BUSY - && !func0f098a44(hand, 2)) { + && !bgun0f098a44(hand, 2)) { return true; } @@ -16926,7 +16926,7 @@ bool func0f0a27c8(void) && hand->state == HANDSTATE_ATTACK && hand->unk0ce8 != NULL && hand->animmode == HANDANIMMODE_BUSY - && !func0f098a44(hand, 2)) { + && !bgun0f098a44(hand, 2)) { return true; } } @@ -16935,11 +16935,11 @@ bool func0f0a27c8(void) } /** - * This function is the same as above but it doesn't call func0f098a44(). + * This function is the same as above but it doesn't call bgun0f098a44(). * * This function is unused. */ -bool func0f0a28d8(void) +bool bgun0f0a28d8(void) { struct hand *hand; struct weaponfunc *func; @@ -16972,7 +16972,7 @@ bool func0f0a28d8(void) return false; } -void func0f0a29c8(void) +void bgun0f0a29c8(void) { struct player *player = g_Vars.currentplayer; s32 i; @@ -16993,16 +16993,16 @@ void func0f0a29c8(void) player->hands[i].matmot2 = 0; player->hands[i].matmot3 = 0; - handSetState(i, 0); + bgunSetState(i, 0); } - currentPlayerEquipWeaponWrapper(1, WEAPON_NONE); - currentPlayerEquipWeaponWrapper(0, WEAPON_NONE); + bgunEquipWeapon2(1, WEAPON_NONE); + bgunEquipWeapon2(0, WEAPON_NONE); } } #if VERSION >= VERSION_NTSC_1_0 -bool weaponIsMissionCritical(s32 weaponnum) +bool bgunIsMissionCritical(s32 weaponnum) { if (weaponnum == WEAPON_TIMEDMINE || weaponnum == WEAPON_REMOTEMINE @@ -17015,7 +17015,7 @@ bool weaponIsMissionCritical(s32 weaponnum) } #endif -void currentPlayerLoseGun(struct prop *attackerprop) +void bgunLoseGun(struct prop *attackerprop) { struct player *player = g_Vars.currentplayer; s32 weaponnum = player->hands[0].gset.weaponnum; @@ -17031,7 +17031,7 @@ void currentPlayerLoseGun(struct prop *attackerprop) // quantity. if (g_Vars.coopplayernum >= 0 && (attackerprop == g_Vars.bond->prop || attackerprop == g_Vars.coop->prop) - && weaponIsMissionCritical(weaponnum)) { + && bgunIsMissionCritical(weaponnum)) { return; } #endif @@ -17062,7 +17062,7 @@ void currentPlayerLoseGun(struct prop *attackerprop) && player->hands[i].state == HANDSTATE_ATTACK && player->hands[i].stateminor == 0) { drop = false; - handCreateThrownProjectile(i + 2, &player->hands[i].gset); + bgunCreateThrownProjectile(i + 2, &player->hands[i].gset); } } } @@ -17109,26 +17109,26 @@ void currentPlayerLoseGun(struct prop *attackerprop) player->visionmode = VISIONMODE_NORMAL; } - currentPlayerEquipWeaponWrapper(HAND_RIGHT, WEAPON_UNARMED); - currentPlayerEquipWeaponWrapper(HAND_LEFT, WEAPON_NONE); + bgunEquipWeapon2(HAND_RIGHT, WEAPON_UNARMED); + bgunEquipWeapon2(HAND_LEFT, WEAPON_NONE); } } GLOBAL_ASM( -glabel func0f0a2da8 +glabel bgun0f0a2da8 .late_rodata glabel var7f1ac76c -.word func0f0a2da8+0x38 # f0a2de0 +.word bgun0f0a2da8+0x38 # f0a2de0 glabel var7f1ac770 -.word func0f0a2da8+0x58 # f0a2e00 +.word bgun0f0a2da8+0x58 # f0a2e00 glabel var7f1ac774 -.word func0f0a2da8+0x78 # f0a2e20 +.word bgun0f0a2da8+0x78 # f0a2e20 glabel var7f1ac778 -.word func0f0a2da8+0x90 # f0a2e38 +.word bgun0f0a2da8+0x90 # f0a2e38 glabel var7f1ac77c -.word func0f0a2da8+0xa4 # f0a2e4c +.word bgun0f0a2da8+0xa4 # f0a2e4c glabel var7f1ac780 -.word func0f0a2da8+0xb8 # f0a2e60 +.word bgun0f0a2da8+0xb8 # f0a2e60 .text /* f0a2da8: 10800038 */ beqz $a0,.L0f0a2e8c /* f0a2dac: 00000000 */ nop @@ -17195,42 +17195,42 @@ glabel var7f1ac780 ); GLOBAL_ASM( -glabel func0f0a2e94 +glabel bgun0f0a2e94 .late_rodata glabel var7f1ac784 -.word func0f0a2e94+0x7c # f0a2f10 +.word bgun0f0a2e94+0x7c # f0a2f10 glabel var7f1ac788 -.word func0f0a2e94+0x1dc # f0a3070 +.word bgun0f0a2e94+0x1dc # f0a3070 glabel var7f1ac78c -.word func0f0a2e94+0x1dc # f0a3070 +.word bgun0f0a2e94+0x1dc # f0a3070 glabel var7f1ac790 -.word func0f0a2e94+0x120 # f0a2fb4 +.word bgun0f0a2e94+0x120 # f0a2fb4 glabel var7f1ac794 -.word func0f0a2e94+0x148 # f0a2fdc +.word bgun0f0a2e94+0x148 # f0a2fdc glabel var7f1ac798 -.word func0f0a2e94+0x1dc # f0a3070 +.word bgun0f0a2e94+0x1dc # f0a3070 glabel var7f1ac79c -.word func0f0a2e94+0x1dc # f0a3070 +.word bgun0f0a2e94+0x1dc # f0a3070 glabel var7f1ac7a0 -.word func0f0a2e94+0x1dc # f0a3070 +.word bgun0f0a2e94+0x1dc # f0a3070 glabel var7f1ac7a4 -.word func0f0a2e94+0x1dc # f0a3070 +.word bgun0f0a2e94+0x1dc # f0a3070 glabel var7f1ac7a8 -.word func0f0a2e94+0x1dc # f0a3070 +.word bgun0f0a2e94+0x1dc # f0a3070 glabel var7f1ac7ac -.word func0f0a2e94+0xb8 # f0a2f4c +.word bgun0f0a2e94+0xb8 # f0a2f4c glabel var7f1ac7b0 -.word func0f0a2e94+0x1dc # f0a3070 +.word bgun0f0a2e94+0x1dc # f0a3070 glabel var7f1ac7b4 -.word func0f0a2e94+0x1dc # f0a3070 +.word bgun0f0a2e94+0x1dc # f0a3070 glabel var7f1ac7b8 -.word func0f0a2e94+0x1dc # f0a3070 +.word bgun0f0a2e94+0x1dc # f0a3070 glabel var7f1ac7bc -.word func0f0a2e94+0x1dc # f0a3070 +.word bgun0f0a2e94+0x1dc # f0a3070 glabel var7f1ac7c0 -.word func0f0a2e94+0xf4 # f0a2f88 +.word bgun0f0a2e94+0xf4 # f0a2f88 glabel var7f1ac7c4 -.word func0f0a2e94+0x170 # f0a3004 +.word bgun0f0a2e94+0x170 # f0a3004 .text /* f0a2e94: 27bdffc0 */ addiu $sp,$sp,-64 /* f0a2e98: afb60030 */ sw $s6,0x30($sp) @@ -17398,13 +17398,13 @@ glabel var7f1ac7c4 /* f0a3100: 27bd0040 */ addiu $sp,$sp,0x40 ); -void playerDetonateRemoteMines(s32 playernum) +void bgunDetonateRemoteMines(s32 playernum) { s32 prevplayernum = g_Vars.currentplayernum; setCurrentPlayerNum(playernum); if (g_Vars.currentplayer->hands[HAND_LEFT].gset.weaponnum == WEAPON_REMOTEMINE) { - func0f0988e0(var80070200, 1, &g_Vars.currentplayer->hands[HAND_LEFT]); + bgun0f0988e0(var80070200, 1, &g_Vars.currentplayer->hands[HAND_LEFT]); } setCurrentPlayerNum(prevplayernum); @@ -17412,7 +17412,7 @@ void playerDetonateRemoteMines(s32 playernum) #if VERSION >= VERSION_PAL_FINAL GLOBAL_ASM( -glabel func0f0a3160 +glabel bgun0f0a3160 .late_rodata glabel var7f1ac7c8 .word 0x40490fdb @@ -17647,7 +17647,7 @@ glabel var7f1ac7d0 ); #else GLOBAL_ASM( -glabel func0f0a3160 +glabel bgun0f0a3160 .late_rodata glabel var7f1ac7c8 .word 0x40490fdb @@ -17884,92 +17884,92 @@ glabel var7f1ac7d0 #if VERSION >= VERSION_PAL_FINAL GLOBAL_ASM( -glabel func0f0a3490 +glabel bgun0f0a3490 .late_rodata glabel var7f1ac7d4 .word 0x3f19999a glabel var7f1ac7d8 .word 0x3e4ccccd glabel var7f1ac7dc -.word func0f0a3490+0x11c # f0a35ac +.word bgun0f0a3490+0x11c # f0a35ac glabel var7f1ac7e0 -.word func0f0a3490+0x24c # f0a36dc +.word bgun0f0a3490+0x24c # f0a36dc glabel var7f1ac7e4 -.word func0f0a3490+0x11c # f0a35ac +.word bgun0f0a3490+0x11c # f0a35ac glabel var7f1ac7e8 -.word func0f0a3490+0x14c # f0a35dc +.word bgun0f0a3490+0x14c # f0a35dc glabel var7f1ac7ec -.word func0f0a3490+0x14c # f0a35dc +.word bgun0f0a3490+0x14c # f0a35dc glabel var7f1ac7f0 -.word func0f0a3490+0x24c # f0a36dc +.word bgun0f0a3490+0x24c # f0a36dc glabel var7f1ac7f4 -.word func0f0a3490+0x17c # f0a360c +.word bgun0f0a3490+0x17c # f0a360c glabel var7f1ac7f8 -.word func0f0a3490+0x17c # f0a360c +.word bgun0f0a3490+0x17c # f0a360c glabel var7f1ac7fc -.word func0f0a3490+0x1ac # f0a363c +.word bgun0f0a3490+0x1ac # f0a363c glabel var7f1ac800 -.word func0f0a3490+0x1d4 # f0a3664 +.word bgun0f0a3490+0x1d4 # f0a3664 glabel var7f1ac804 -.word func0f0a3490+0x24c # f0a36dc +.word bgun0f0a3490+0x24c # f0a36dc glabel var7f1ac808 -.word func0f0a3490+0x200 # f0a3690 +.word bgun0f0a3490+0x200 # f0a3690 glabel var7f1ac80c -.word func0f0a3490+0x1d4 # f0a3664 +.word bgun0f0a3490+0x1d4 # f0a3664 glabel var7f1ac810 -.word func0f0a3490+0x1ac # f0a363c +.word bgun0f0a3490+0x1ac # f0a363c glabel var7f1ac814 -.word func0f0a3490+0x1ac # f0a363c +.word bgun0f0a3490+0x1ac # f0a363c glabel var7f1ac818 -.word func0f0a3490+0x1ac # f0a363c +.word bgun0f0a3490+0x1ac # f0a363c glabel var7f1ac81c -.word func0f0a3490+0x1ac # f0a363c +.word bgun0f0a3490+0x1ac # f0a363c glabel var7f1ac820 -.word func0f0a3490+0x234 # f0a36c4 +.word bgun0f0a3490+0x234 # f0a36c4 glabel var7f1ac824 -.word func0f0a3490+0x228 # f0a36b8 +.word bgun0f0a3490+0x228 # f0a36b8 glabel var7f1ac828 .word 0x3f28f5c3 glabel var7f1ac82c .word 0x3f666666 glabel var7f1ac830 -.word func0f0a3490+0x29c # f0a372c +.word bgun0f0a3490+0x29c # f0a372c glabel var7f1ac834 -.word func0f0a3490+0x2b0 # f0a3740 +.word bgun0f0a3490+0x2b0 # f0a3740 glabel var7f1ac838 -.word func0f0a3490+0x29c # f0a372c +.word bgun0f0a3490+0x29c # f0a372c glabel var7f1ac83c -.word func0f0a3490+0x29c # f0a372c +.word bgun0f0a3490+0x29c # f0a372c glabel var7f1ac840 -.word func0f0a3490+0x29c # f0a372c +.word bgun0f0a3490+0x29c # f0a372c glabel var7f1ac844 -.word func0f0a3490+0x2b0 # f0a3740 +.word bgun0f0a3490+0x2b0 # f0a3740 glabel var7f1ac848 -.word func0f0a3490+0x29c # f0a372c +.word bgun0f0a3490+0x29c # f0a372c glabel var7f1ac84c -.word func0f0a3490+0x29c # f0a372c +.word bgun0f0a3490+0x29c # f0a372c glabel var7f1ac850 -.word func0f0a3490+0x2b0 # f0a3740 +.word bgun0f0a3490+0x2b0 # f0a3740 glabel var7f1ac854 -.word func0f0a3490+0x2b0 # f0a3740 +.word bgun0f0a3490+0x2b0 # f0a3740 glabel var7f1ac858 -.word func0f0a3490+0x2b0 # f0a3740 +.word bgun0f0a3490+0x2b0 # f0a3740 glabel var7f1ac85c -.word func0f0a3490+0x2b0 # f0a3740 +.word bgun0f0a3490+0x2b0 # f0a3740 glabel var7f1ac860 -.word func0f0a3490+0x2b0 # f0a3740 +.word bgun0f0a3490+0x2b0 # f0a3740 glabel var7f1ac864 -.word func0f0a3490+0x2b0 # f0a3740 +.word bgun0f0a3490+0x2b0 # f0a3740 glabel var7f1ac868 -.word func0f0a3490+0x2b0 # f0a3740 +.word bgun0f0a3490+0x2b0 # f0a3740 glabel var7f1ac86c -.word func0f0a3490+0x2b0 # f0a3740 +.word bgun0f0a3490+0x2b0 # f0a3740 glabel var7f1ac870 -.word func0f0a3490+0x2b0 # f0a3740 +.word bgun0f0a3490+0x2b0 # f0a3740 glabel var7f1ac874 -.word func0f0a3490+0x2ac # f0a373c +.word bgun0f0a3490+0x2ac # f0a373c glabel var7f1ac878 -.word func0f0a3490+0x2a4 # f0a3734 +.word bgun0f0a3490+0x2a4 # f0a3734 .text /* f0a3490: 27bdffc8 */ addiu $sp,$sp,-56 /* f0a3494: afbf001c */ sw $ra,0x1c($sp) @@ -18187,92 +18187,92 @@ glabel var7f1ac878 ); #else GLOBAL_ASM( -glabel func0f0a3490 +glabel bgun0f0a3490 .late_rodata glabel var7f1ac7d4 .word 0x3f19999a glabel var7f1ac7d8 .word 0x3e4ccccd glabel var7f1ac7dc -.word func0f0a3490+0x11c # f0a35ac +.word bgun0f0a3490+0x11c # f0a35ac glabel var7f1ac7e0 -.word func0f0a3490+0x24c # f0a36dc +.word bgun0f0a3490+0x24c # f0a36dc glabel var7f1ac7e4 -.word func0f0a3490+0x11c # f0a35ac +.word bgun0f0a3490+0x11c # f0a35ac glabel var7f1ac7e8 -.word func0f0a3490+0x14c # f0a35dc +.word bgun0f0a3490+0x14c # f0a35dc glabel var7f1ac7ec -.word func0f0a3490+0x14c # f0a35dc +.word bgun0f0a3490+0x14c # f0a35dc glabel var7f1ac7f0 -.word func0f0a3490+0x24c # f0a36dc +.word bgun0f0a3490+0x24c # f0a36dc glabel var7f1ac7f4 -.word func0f0a3490+0x17c # f0a360c +.word bgun0f0a3490+0x17c # f0a360c glabel var7f1ac7f8 -.word func0f0a3490+0x17c # f0a360c +.word bgun0f0a3490+0x17c # f0a360c glabel var7f1ac7fc -.word func0f0a3490+0x1ac # f0a363c +.word bgun0f0a3490+0x1ac # f0a363c glabel var7f1ac800 -.word func0f0a3490+0x1d4 # f0a3664 +.word bgun0f0a3490+0x1d4 # f0a3664 glabel var7f1ac804 -.word func0f0a3490+0x24c # f0a36dc +.word bgun0f0a3490+0x24c # f0a36dc glabel var7f1ac808 -.word func0f0a3490+0x200 # f0a3690 +.word bgun0f0a3490+0x200 # f0a3690 glabel var7f1ac80c -.word func0f0a3490+0x1d4 # f0a3664 +.word bgun0f0a3490+0x1d4 # f0a3664 glabel var7f1ac810 -.word func0f0a3490+0x1ac # f0a363c +.word bgun0f0a3490+0x1ac # f0a363c glabel var7f1ac814 -.word func0f0a3490+0x1ac # f0a363c +.word bgun0f0a3490+0x1ac # f0a363c glabel var7f1ac818 -.word func0f0a3490+0x1ac # f0a363c +.word bgun0f0a3490+0x1ac # f0a363c glabel var7f1ac81c -.word func0f0a3490+0x1ac # f0a363c +.word bgun0f0a3490+0x1ac # f0a363c glabel var7f1ac820 -.word func0f0a3490+0x234 # f0a36c4 +.word bgun0f0a3490+0x234 # f0a36c4 glabel var7f1ac824 -.word func0f0a3490+0x228 # f0a36b8 +.word bgun0f0a3490+0x228 # f0a36b8 glabel var7f1ac828 .word 0x3f28f5c3 glabel var7f1ac82c .word 0x3f666666 glabel var7f1ac830 -.word func0f0a3490+0x29c # f0a372c +.word bgun0f0a3490+0x29c # f0a372c glabel var7f1ac834 -.word func0f0a3490+0x2b0 # f0a3740 +.word bgun0f0a3490+0x2b0 # f0a3740 glabel var7f1ac838 -.word func0f0a3490+0x29c # f0a372c +.word bgun0f0a3490+0x29c # f0a372c glabel var7f1ac83c -.word func0f0a3490+0x29c # f0a372c +.word bgun0f0a3490+0x29c # f0a372c glabel var7f1ac840 -.word func0f0a3490+0x29c # f0a372c +.word bgun0f0a3490+0x29c # f0a372c glabel var7f1ac844 -.word func0f0a3490+0x2b0 # f0a3740 +.word bgun0f0a3490+0x2b0 # f0a3740 glabel var7f1ac848 -.word func0f0a3490+0x29c # f0a372c +.word bgun0f0a3490+0x29c # f0a372c glabel var7f1ac84c -.word func0f0a3490+0x29c # f0a372c +.word bgun0f0a3490+0x29c # f0a372c glabel var7f1ac850 -.word func0f0a3490+0x2b0 # f0a3740 +.word bgun0f0a3490+0x2b0 # f0a3740 glabel var7f1ac854 -.word func0f0a3490+0x2b0 # f0a3740 +.word bgun0f0a3490+0x2b0 # f0a3740 glabel var7f1ac858 -.word func0f0a3490+0x2b0 # f0a3740 +.word bgun0f0a3490+0x2b0 # f0a3740 glabel var7f1ac85c -.word func0f0a3490+0x2b0 # f0a3740 +.word bgun0f0a3490+0x2b0 # f0a3740 glabel var7f1ac860 -.word func0f0a3490+0x2b0 # f0a3740 +.word bgun0f0a3490+0x2b0 # f0a3740 glabel var7f1ac864 -.word func0f0a3490+0x2b0 # f0a3740 +.word bgun0f0a3490+0x2b0 # f0a3740 glabel var7f1ac868 -.word func0f0a3490+0x2b0 # f0a3740 +.word bgun0f0a3490+0x2b0 # f0a3740 glabel var7f1ac86c -.word func0f0a3490+0x2b0 # f0a3740 +.word bgun0f0a3490+0x2b0 # f0a3740 glabel var7f1ac870 -.word func0f0a3490+0x2b0 # f0a3740 +.word bgun0f0a3490+0x2b0 # f0a3740 glabel var7f1ac874 -.word func0f0a3490+0x2ac # f0a373c +.word bgun0f0a3490+0x2ac # f0a373c glabel var7f1ac878 -.word func0f0a3490+0x2a4 # f0a3734 +.word bgun0f0a3490+0x2a4 # f0a3734 .text /* f0a3490: 27bdffc8 */ addiu $sp,$sp,-56 /* f0a3494: afbf001c */ sw $ra,0x1c($sp) @@ -18491,7 +18491,7 @@ glabel var7f1ac878 #endif GLOBAL_ASM( -glabel func0f0a37b4 +glabel bgun0f0a37b4 /* f0a37b4: 27bdff68 */ addiu $sp,$sp,-152 /* f0a37b8: afb00018 */ sw $s0,0x18($sp) /* f0a37bc: 00808025 */ or $s0,$a0,$zero @@ -18691,7 +18691,7 @@ glabel func0f0a37b4 #if VERSION >= VERSION_PAL_FINAL GLOBAL_ASM( -glabel func0f0a3aa4 +glabel bgun0f0a3aa4 .late_rodata glabel var7f1ac87c .word 0x3c23d70a @@ -18956,9 +18956,9 @@ glabel var7f1ac8b8 /* f0a3dfc: 00002825 */ or $a1,$zero,$zero /* f0a3e00: 3c01800a */ lui $at,%hi(var8009d0f0) /* f0a3e04: ac22d0dc */ sw $v0,%lo(var8009d0f0)($at) -/* f0a3e08: 3c0b7f0a */ lui $t3,%hi(func0f0a256c) +/* f0a3e08: 3c0b7f0a */ lui $t3,%hi(bgun0f0a256c) /* f0a3e0c: 3c10800a */ lui $s0,%hi(var8009d0f8) -/* f0a3e10: 256b256c */ addiu $t3,$t3,%lo(func0f0a256c) +/* f0a3e10: 256b256c */ addiu $t3,$t3,%lo(bgun0f0a256c) /* f0a3e14: 3c018006 */ lui $at,%hi(var8005efcc) /* f0a3e18: 2610d0f0 */ addiu $s0,$s0,%lo(var8009d0f8) /* f0a3e1c: ac2befcc */ sw $t3,%lo(var8005efcc)($at) @@ -19004,7 +19004,7 @@ glabel var7f1ac8b8 ); #else GLOBAL_ASM( -glabel func0f0a3aa4 +glabel bgun0f0a3aa4 .late_rodata glabel var7f1ac87c .word 0x3c23d70a @@ -19269,9 +19269,9 @@ glabel var7f1ac8b8 /* f0a3dfc: 00002825 */ or $a1,$zero,$zero /* f0a3e00: 3c01800a */ lui $at,%hi(var8009d0dc) /* f0a3e04: ac22d0dc */ sw $v0,%lo(var8009d0dc)($at) -/* f0a3e08: 3c0b7f0a */ lui $t3,%hi(func0f0a256c) +/* f0a3e08: 3c0b7f0a */ lui $t3,%hi(bgun0f0a256c) /* f0a3e0c: 3c10800a */ lui $s0,%hi(var8009d0f0) -/* f0a3e10: 256b256c */ addiu $t3,$t3,%lo(func0f0a256c) +/* f0a3e10: 256b256c */ addiu $t3,$t3,%lo(bgun0f0a256c) /* f0a3e14: 3c018006 */ lui $at,%hi(var8005efcc) /* f0a3e18: 2610d0f0 */ addiu $s0,$s0,%lo(var8009d0f0) /* f0a3e1c: ac2befcc */ sw $t3,%lo(var8005efcc)($at) @@ -19318,7 +19318,7 @@ glabel var7f1ac8b8 #endif GLOBAL_ASM( -glabel func0f0a3eac +glabel bgun0f0a3eac /* f0a3eac: 27bdff58 */ addiu $sp,$sp,-168 /* f0a3eb0: 3c0f8007 */ lui $t7,%hi(var8007021c) /* f0a3eb4: afbf0054 */ sw $ra,0x54($sp) @@ -19448,7 +19448,7 @@ glabel func0f0a3eac #if VERSION >= VERSION_PAL_FINAL GLOBAL_ASM( -glabel func0f0a4094 +glabel bgun0f0a4094 .late_rodata glabel var7f1ac8bc .word 0x3c23d70a @@ -19526,7 +19526,7 @@ glabel var7f1ac8c0 ); #else GLOBAL_ASM( -glabel func0f0a4094 +glabel bgun0f0a4094 .late_rodata glabel var7f1ac8bc .word 0x3c23d70a @@ -19606,7 +19606,7 @@ glabel var7f1ac8c0 #if VERSION >= VERSION_PAL_FINAL GLOBAL_ASM( -glabel func0f0a419c +glabel bgun0f0a419c .late_rodata glabel var7f1ac8c4 .word 0x3c23d70a @@ -19720,7 +19720,7 @@ glabel var7f1ac8c4 ); #else GLOBAL_ASM( -glabel func0f0a419c +glabel bgun0f0a419c .late_rodata glabel var7f1ac8c4 .word 0x3c23d70a @@ -19834,7 +19834,7 @@ glabel var7f1ac8c4 ); #endif -void func0f0a4334(struct hand *hand) +void bgun0f0a4334(struct hand *hand) { if (hand->firing && hand->gset.weaponfunc == FUNC_SECONDARY) { if (hand->audiohandle == NULL && g_Vars.lvupdate240 != 0) { @@ -19857,7 +19857,7 @@ void func0f0a4334(struct hand *hand) } GLOBAL_ASM( -glabel func0f0a4438 +glabel bgun0f0a4438 .late_rodata glabel var7f1ac8c8 .word 0x411fffff @@ -19946,20 +19946,20 @@ glabel var7f1ac8c8 /* f0a456c: 27bd00a0 */ addiu $sp,$sp,0xa0 ); -void func0f0a4570(struct hand *hand, s32 handnum, struct weaponfunc_shootprojectile *func) +void bgun0f0a4570(struct hand *hand, s32 handnum, struct weaponfunc_shootprojectile *func) { if (hand->rocket == NULL && hand->loadedammo[0] > 0) { - func0f09f974(handnum, func); + bgun0f09f974(handnum, func); } if (hand->rocket) { - func0f09f848(handnum); + bgun0f09f848(handnum); } } -void func0f0a256c(void); +void bgun0f0a256c(void); -void func0f0a45d0(struct hand *hand, struct modelfiledata *filedata, bool arg2) +void bgun0f0a45d0(struct hand *hand, struct modelfiledata *filedata, bool arg2) { struct modelnode *node = NULL; @@ -19981,7 +19981,7 @@ void func0f0a45d0(struct hand *hand, struct modelfiledata *filedata, bool arg2) if (node) { var8009d148 = func0001a524(node, 0); - var8005efcc = func0f0a256c; + var8005efcc = bgun0f0a256c; } else { var8009d148 = -1; } @@ -19989,7 +19989,7 @@ void func0f0a45d0(struct hand *hand, struct modelfiledata *filedata, bool arg2) #if VERSION >= VERSION_PAL_FINAL GLOBAL_ASM( -glabel func0f0a46a4 +glabel bgun0f0a46a4 .late_rodata glabel var7f1ac8cc .word 0x3f088888 @@ -20545,7 +20545,7 @@ glabel var7f1ac918 ); #else GLOBAL_ASM( -glabel func0f0a46a4 +glabel bgun0f0a46a4 .late_rodata glabel var7f1ac8cc .word 0x3f088888 @@ -21109,7 +21109,7 @@ glabel var7f1ac918 #endif GLOBAL_ASM( -glabel func0f0a4e44 +glabel bgun0f0a4e44 .late_rodata glabel var7f1ac91c .word 0x40c907a9 @@ -21448,94 +21448,94 @@ glabel var7f1ac934 ); GLOBAL_ASM( -glabel func0f0a5300 +glabel bgun0f0a5300 .late_rodata glabel var7f1ac938 .word 0x411fffff glabel var7f1ac93c -.word func0f0a5300+0x20c # f0a550c +.word bgun0f0a5300+0x20c # f0a550c glabel var7f1ac940 -.word func0f0a5300+0x20c # f0a550c +.word bgun0f0a5300+0x20c # f0a550c glabel var7f1ac944 -.word func0f0a5300+0x20c # f0a550c +.word bgun0f0a5300+0x20c # f0a550c glabel var7f1ac948 -.word func0f0a5300+0x20c # f0a550c +.word bgun0f0a5300+0x20c # f0a550c glabel var7f1ac94c -.word func0f0a5300+0x20c # f0a550c +.word bgun0f0a5300+0x20c # f0a550c glabel var7f1ac950 -.word func0f0a5300+0x20c # f0a550c +.word bgun0f0a5300+0x20c # f0a550c glabel var7f1ac954 -.word func0f0a5300+0x20c # f0a550c +.word bgun0f0a5300+0x20c # f0a550c glabel var7f1ac958 -.word func0f0a5300+0x20c # f0a550c +.word bgun0f0a5300+0x20c # f0a550c glabel var7f1ac95c -.word func0f0a5300+0x20c # f0a550c +.word bgun0f0a5300+0x20c # f0a550c glabel var7f1ac960 -.word func0f0a5300+0x20c # f0a550c +.word bgun0f0a5300+0x20c # f0a550c glabel var7f1ac964 -.word func0f0a5300+0x20c # f0a550c +.word bgun0f0a5300+0x20c # f0a550c glabel var7f1ac968 -.word func0f0a5300+0x20c # f0a550c +.word bgun0f0a5300+0x20c # f0a550c glabel var7f1ac96c -.word func0f0a5300+0x20c # f0a550c +.word bgun0f0a5300+0x20c # f0a550c glabel var7f1ac970 -.word func0f0a5300+0x20c # f0a550c +.word bgun0f0a5300+0x20c # f0a550c glabel var7f1ac974 -.word func0f0a5300+0x20c # f0a550c +.word bgun0f0a5300+0x20c # f0a550c glabel var7f1ac978 -.word func0f0a5300+0x20c # f0a550c +.word bgun0f0a5300+0x20c # f0a550c glabel var7f1ac97c -.word func0f0a5300+0x20c # f0a550c +.word bgun0f0a5300+0x20c # f0a550c glabel var7f1ac980 -.word func0f0a5300+0x240 # f0a5540 +.word bgun0f0a5300+0x240 # f0a5540 glabel var7f1ac984 -.word func0f0a5300+0x20c # f0a550c +.word bgun0f0a5300+0x20c # f0a550c glabel var7f1ac988 -.word func0f0a5300+0x20c # f0a550c +.word bgun0f0a5300+0x20c # f0a550c glabel var7f1ac98c -.word func0f0a5300+0x20c # f0a550c +.word bgun0f0a5300+0x20c # f0a550c glabel var7f1ac990 -.word func0f0a5300+0x240 # f0a5540 +.word bgun0f0a5300+0x240 # f0a5540 glabel var7f1ac994 -.word func0f0a5300+0x240 # f0a5540 +.word bgun0f0a5300+0x240 # f0a5540 glabel var7f1ac998 -.word func0f0a5300+0x240 # f0a5540 +.word bgun0f0a5300+0x240 # f0a5540 glabel var7f1ac99c -.word func0f0a5300+0x240 # f0a5540 +.word bgun0f0a5300+0x240 # f0a5540 glabel var7f1ac9a0 -.word func0f0a5300+0x240 # f0a5540 +.word bgun0f0a5300+0x240 # f0a5540 glabel var7f1ac9a4 -.word func0f0a5300+0x20c # f0a550c +.word bgun0f0a5300+0x20c # f0a550c glabel var7f1ac9a8 -.word func0f0a5300+0x228 # f0a5528 +.word bgun0f0a5300+0x228 # f0a5528 glabel var7f1ac9ac -.word func0f0a5300+0x240 # f0a5540 +.word bgun0f0a5300+0x240 # f0a5540 glabel var7f1ac9b0 -.word func0f0a5300+0x240 # f0a5540 +.word bgun0f0a5300+0x240 # f0a5540 glabel var7f1ac9b4 -.word func0f0a5300+0x240 # f0a5540 +.word bgun0f0a5300+0x240 # f0a5540 glabel var7f1ac9b8 -.word func0f0a5300+0x240 # f0a5540 +.word bgun0f0a5300+0x240 # f0a5540 glabel var7f1ac9bc -.word func0f0a5300+0x240 # f0a5540 +.word bgun0f0a5300+0x240 # f0a5540 glabel var7f1ac9c0 -.word func0f0a5300+0x240 # f0a5540 +.word bgun0f0a5300+0x240 # f0a5540 glabel var7f1ac9c4 -.word func0f0a5300+0x20c # f0a550c +.word bgun0f0a5300+0x20c # f0a550c glabel var7f1ac9c8 -.word func0f0a5300+0x20c # f0a550c +.word bgun0f0a5300+0x20c # f0a550c glabel var7f1ac9cc -.word func0f0a5300+0x20c # f0a550c +.word bgun0f0a5300+0x20c # f0a550c glabel var7f1ac9d0 -.word func0f0a5300+0x20c # f0a550c +.word bgun0f0a5300+0x20c # f0a550c glabel var7f1ac9d4 -.word func0f0a5300+0x20c # f0a550c +.word bgun0f0a5300+0x20c # f0a550c glabel var7f1ac9d8 -.word func0f0a5300+0x20c # f0a550c +.word bgun0f0a5300+0x20c # f0a550c glabel var7f1ac9dc -.word func0f0a5300+0x20c # f0a550c +.word bgun0f0a5300+0x20c # f0a550c glabel var7f1ac9e0 -.word func0f0a5300+0x20c # f0a550c +.word bgun0f0a5300+0x20c # f0a550c .text /* f0a5300: 27bdff88 */ addiu $sp,$sp,-120 /* f0a5304: 3c03800a */ lui $v1,%hi(g_Vars) @@ -21613,12 +21613,12 @@ glabel var7f1ac9e0 .L0f0a541c: /* f0a541c: 00002825 */ or $a1,$zero,$zero /* f0a5420: 8fa60078 */ lw $a2,0x78($sp) -/* f0a5424: 0fc25f9d */ jal func0f097e74 +/* f0a5424: 0fc25f9d */ jal bgun0f097e74 /* f0a5428: 8fa70088 */ lw $a3,0x88($sp) /* f0a542c: 24040047 */ addiu $a0,$zero,0x47 /* f0a5430: 24050001 */ addiu $a1,$zero,0x1 /* f0a5434: 8fa60078 */ lw $a2,0x78($sp) -/* f0a5438: 0fc25f9d */ jal func0f097e74 +/* f0a5438: 0fc25f9d */ jal bgun0f097e74 /* f0a543c: 8fa70088 */ lw $a3,0x88($sp) /* f0a5440: 3c03800a */ lui $v1,%hi(g_Vars) /* f0a5444: 24639fc0 */ addiu $v1,$v1,%lo(g_Vars) @@ -21700,80 +21700,80 @@ glabel var7f1ac9e0 #if VERSION >= VERSION_PAL_FINAL GLOBAL_ASM( -glabel func0f0a5550 +glabel bgun0f0a5550 .late_rodata glabel var7f1ac9e4 .word 0x40490fdb glabel var7f1ac9e8 .word 0x3dccccce glabel var7f1ac9ec -.word func0f0a5550+0xca8 +.word bgun0f0a5550+0xca8 glabel var7f1ac9f0 -.word func0f0a5550+0xd08 +.word bgun0f0a5550+0xd08 glabel var7f1ac9f4 -.word func0f0a5550+0xd08 +.word bgun0f0a5550+0xd08 glabel var7f1ac9f8 -.word func0f0a5550+0xd08 +.word bgun0f0a5550+0xd08 glabel var7f1ac9fc -.word func0f0a5550+0xd08 +.word bgun0f0a5550+0xd08 glabel var7f1aca00 -.word func0f0a5550+0xd08 +.word bgun0f0a5550+0xd08 glabel var7f1aca04 -.word func0f0a5550+0xcb0 +.word bgun0f0a5550+0xcb0 glabel var7f1aca08 -.word func0f0a5550+0xd08 +.word bgun0f0a5550+0xd08 glabel var7f1aca0c -.word func0f0a5550+0xd08 +.word bgun0f0a5550+0xd08 glabel var7f1aca10 -.word func0f0a5550+0xd08 +.word bgun0f0a5550+0xd08 glabel var7f1aca14 -.word func0f0a5550+0xcc4 +.word bgun0f0a5550+0xcc4 glabel var7f1aca18 -.word func0f0a5550+0xcc4 +.word bgun0f0a5550+0xcc4 glabel var7f1aca1c -.word func0f0a5550+0xcc4 +.word bgun0f0a5550+0xcc4 glabel var7f1aca20 -.word func0f0a5550+0xcc4 +.word bgun0f0a5550+0xcc4 glabel var7f1aca24 -.word func0f0a5550+0xcc4 +.word bgun0f0a5550+0xcc4 glabel var7f1aca28 -.word func0f0a5550+0xd08 +.word bgun0f0a5550+0xd08 glabel var7f1aca2c -.word func0f0a5550+0xd08 +.word bgun0f0a5550+0xd08 glabel var7f1aca30 -.word func0f0a5550+0xd08 +.word bgun0f0a5550+0xd08 glabel var7f1aca34 -.word func0f0a5550+0xd08 +.word bgun0f0a5550+0xd08 glabel var7f1aca38 -.word func0f0a5550+0xd08 +.word bgun0f0a5550+0xd08 glabel var7f1aca3c -.word func0f0a5550+0xd08 +.word bgun0f0a5550+0xd08 glabel var7f1aca40 -.word func0f0a5550+0xd08 +.word bgun0f0a5550+0xd08 glabel var7f1aca44 -.word func0f0a5550+0xd08 +.word bgun0f0a5550+0xd08 glabel var7f1aca48 -.word func0f0a5550+0xd08 +.word bgun0f0a5550+0xd08 glabel var7f1aca4c -.word func0f0a5550+0xd08 +.word bgun0f0a5550+0xd08 glabel var7f1aca50 -.word func0f0a5550+0xd08 +.word bgun0f0a5550+0xd08 glabel var7f1aca54 -.word func0f0a5550+0xd08 +.word bgun0f0a5550+0xd08 glabel var7f1aca58 -.word func0f0a5550+0xd08 +.word bgun0f0a5550+0xd08 glabel var7f1aca5c -.word func0f0a5550+0xd08 +.word bgun0f0a5550+0xd08 glabel var7f1aca60 -.word func0f0a5550+0xd08 +.word bgun0f0a5550+0xd08 glabel var7f1aca64 -.word func0f0a5550+0xd08 +.word bgun0f0a5550+0xd08 glabel var7f1aca68 -.word func0f0a5550+0xd08 +.word bgun0f0a5550+0xd08 glabel var7f1aca6c -.word func0f0a5550+0xd08 +.word bgun0f0a5550+0xd08 glabel var7f1aca70 -.word func0f0a5550+0xcc4 +.word bgun0f0a5550+0xcc4 glabel var7f1adc74pf .word 0x7f0a6668 glabel var7f1adc78pf @@ -21901,7 +21901,7 @@ glabel var7f1add20pf /* f0a58f4: afa001d4 */ sw $zero,0x1d4($sp) /* f0a58f8: afa30054 */ sw $v1,0x54($sp) /* f0a58fc: afa40310 */ sw $a0,0x310($sp) -/* f0a5900: 0fc28749 */ jal getCurrentPlayerWeaponIdWrapper +/* f0a5900: 0fc28749 */ jal bgunGetWeaponNum2 /* f0a5904: afa201e0 */ sw $v0,0x1e0($sp) /* f0a5908: afa201cc */ sw $v0,0x1cc($sp) /* f0a590c: afa001c0 */ sw $zero,0x1c0($sp) @@ -21932,12 +21932,12 @@ glabel var7f1add20pf .PF0f0a596c: /* f0a596c: 02002025 */ move $a0,$s0 .PF0f0a5970: -/* f0a5970: 0fc27601 */ jal func0f09d550 +/* f0a5970: 0fc27601 */ jal bgun0f09d550 /* f0a5974: 8fa50310 */ lw $a1,0x310($sp) /* f0a5978: 8fac0310 */ lw $t4,0x310($sp) /* f0a597c: 1580002b */ bnez $t4,.PF0f0a5a2c /* f0a5980: 00000000 */ nop -/* f0a5984: 0fc28749 */ jal getCurrentPlayerWeaponIdWrapper +/* f0a5984: 0fc28749 */ jal bgunGetWeaponNum2 /* f0a5988: 24040001 */ li $a0,0x1 /* f0a598c: 00402025 */ move $a0,$v0 /* f0a5990: 0fc2c720 */ jal weaponHasFlag @@ -21981,7 +21981,7 @@ glabel var7f1add20pf /* f0a5a24: 1000002b */ b .PF0f0a5ad4 /* f0a5a28: e60601bc */ swc1 $f6,0x1bc($s0) .PF0f0a5a2c: -/* f0a5a2c: 0fc28749 */ jal getCurrentPlayerWeaponIdWrapper +/* f0a5a2c: 0fc28749 */ jal bgunGetWeaponNum2 /* f0a5a30: 00002025 */ move $a0,$zero /* f0a5a34: 00402025 */ move $a0,$v0 /* f0a5a38: 0fc2c720 */ jal weaponHasFlag @@ -22325,14 +22325,14 @@ glabel var7f1add20pf /* f0a5f50: 24010007 */ li $at,0x7 /* f0a5f54: 5041000d */ beql $v0,$at,.PF0f0a5f8c /* f0a5f58: a2000007 */ sb $zero,0x7($s0) -/* f0a5f5c: 0fc2780c */ jal func0f09dd7c +/* f0a5f5c: 0fc2780c */ jal bgun0f09dd7c /* f0a5f60: 00000000 */ nop /* f0a5f64: 50400009 */ beqzl $v0,.PF0f0a5f8c /* f0a5f68: a2000007 */ sb $zero,0x7($s0) /* f0a5f6c: 820d0008 */ lb $t5,0x8($s0) /* f0a5f70: 51a00006 */ beqzl $t5,.PF0f0a5f8c /* f0a5f74: a2000007 */ sb $zero,0x7($s0) -/* f0a5f78: 0fc27820 */ jal func0f09ddcc +/* f0a5f78: 0fc27820 */ jal bgun0f09ddcc /* f0a5f7c: 00000000 */ nop /* f0a5f80: 54400003 */ bnezl $v0,.PF0f0a5f90 /* f0a5f84: 820c0007 */ lb $t4,0x7($s0) @@ -22375,24 +22375,24 @@ glabel var7f1add20pf /* f0a6008: 5420fff6 */ bnezl $at,.PF0f0a5fe4 /* f0a600c: afa201d0 */ sw $v0,0x1d0($sp) .PF0f0a6010: -/* f0a6010: 0fc28c37 */ jal func0f0a2da8 +/* f0a6010: 0fc28c37 */ jal bgun0f0a2da8 /* f0a6014: 8e040794 */ lw $a0,0x794($s0) /* f0a6018: 8fa901e0 */ lw $t1,0x1e0($sp) /* f0a601c: 8d2d1594 */ lw $t5,0x1594($t1) /* f0a6020: 51a00004 */ beqzl $t5,.PF0f0a6034 /* f0a6024: 02002025 */ move $a0,$s0 -/* f0a6028: 0fc28c37 */ jal func0f0a2da8 +/* f0a6028: 0fc28c37 */ jal bgun0f0a2da8 /* f0a602c: 8e040798 */ lw $a0,0x798($s0) /* f0a6030: 02002025 */ move $a0,$s0 .PF0f0a6034: -/* f0a6034: 0fc25fd4 */ jal func0f098030 +/* f0a6034: 0fc25fd4 */ jal bgun0f098030 /* f0a6038: 8fa50288 */ lw $a1,0x288($sp) /* f0a603c: 8fa401cc */ lw $a0,0x1cc($sp) /* f0a6040: 0fc2c720 */ jal weaponHasFlag /* f0a6044: 24052000 */ li $a1,0x2000 /* f0a6048: 10400003 */ beqz $v0,.PF0f0a6058 /* f0a604c: 02002025 */ move $a0,$s0 -/* f0a6050: 0fc26042 */ jal func0f0981e8 +/* f0a6050: 0fc26042 */ jal bgun0f0981e8 /* f0a6054: 8fa50288 */ lw $a1,0x288($sp) .PF0f0a6058: /* f0a6058: 0c0055d0 */ jal func000159b0 @@ -22448,7 +22448,7 @@ glabel var7f1add20pf /* f0a6110: afad0010 */ sw $t5,0x10($sp) /* f0a6114: 8fa50310 */ lw $a1,0x310($sp) /* f0a6118: 27a6027c */ addiu $a2,$sp,0x27c -/* f0a611c: 0fc28d25 */ jal func0f0a3160 +/* f0a611c: 0fc28d25 */ jal bgun0f0a3160 /* f0a6120: 8fa701d8 */ lw $a3,0x1d8($sp) .PF0f0a6124: /* f0a6124: 8e0a00b4 */ lw $t2,0xb4($s0) @@ -22516,19 +22516,19 @@ glabel var7f1add20pf /* f0a6210: 44804000 */ mtc1 $zero,$f8 /* f0a6214: 27a40120 */ addiu $a0,$sp,0x120 /* f0a6218: 8fa50310 */ lw $a1,0x310($sp) -/* f0a621c: 0fc28a09 */ jal func0f0a24f0 +/* f0a621c: 0fc28a09 */ jal bgun0f0a24f0 /* f0a6220: e7a801b0 */ swc1 $f8,0x1b0($sp) /* f0a6224: c7ac0120 */ lwc1 $f12,0x120($sp) /* f0a6228: c7ae0128 */ lwc1 $f14,0x128($sp) /* f0a622c: 8fa6027c */ lw $a2,0x27c($sp) -/* f0a6230: 0fc289f3 */ jal func0f0a2498 +/* f0a6230: 0fc289f3 */ jal bgun0f0a2498 /* f0a6234: 8fa70284 */ lw $a3,0x284($sp) /* f0a6238: 46000287 */ neg.s $f10,$f0 /* f0a623c: c7ac0124 */ lwc1 $f12,0x124($sp) /* f0a6240: e7aa01b0 */ swc1 $f10,0x1b0($sp) /* f0a6244: c7ae0128 */ lwc1 $f14,0x128($sp) /* f0a6248: 8fa60280 */ lw $a2,0x280($sp) -/* f0a624c: 0fc289f3 */ jal func0f0a2498 +/* f0a624c: 0fc289f3 */ jal bgun0f0a2498 /* f0a6250: 8fa70284 */ lw $a3,0x284($sp) /* f0a6254: e7a001ac */ swc1 $f0,0x1ac($sp) /* f0a6258: c7b201ac */ lwc1 $f18,0x1ac($sp) @@ -22652,7 +22652,7 @@ glabel var7f1add20pf /* f0a6418: 19400005 */ blez $t2,.PF0f0a6430 /* f0a641c: 02002025 */ move $a0,$s0 /* f0a6420: 8fa50288 */ lw $a1,0x288($sp) -/* f0a6424: 0fc29241 */ jal func0f0a45d0 +/* f0a6424: 0fc29241 */ jal bgun0f0a45d0 /* f0a6428: 8fa601c0 */ lw $a2,0x1c0($sp) /* f0a642c: 8fa801cc */ lw $t0,0x1cc($sp) .PF0f0a6430: @@ -22670,13 +22670,13 @@ glabel var7f1add20pf /* f0a645c: 2401001d */ li $at,0x1d /* f0a6460: 15010009 */ bne $t0,$at,.PF0f0a6488 /* f0a6464: 00000000 */ nop -/* f0a6468: 0fc2919a */ jal func0f0a4334 +/* f0a6468: 0fc2919a */ jal bgun0f0a4334 /* f0a646c: 02002025 */ move $a0,$s0 /* f0a6470: 10000005 */ b .PF0f0a6488 /* f0a6474: 8fa801cc */ lw $t0,0x1cc($sp) .PF0f0a6478: /* f0a6478: 02002025 */ move $a0,$s0 -/* f0a647c: 0fc28f76 */ jal func0f0a3aa4 +/* f0a647c: 0fc28f76 */ jal bgun0f0a3aa4 /* f0a6480: 8fa50288 */ lw $a1,0x288($sp) /* f0a6484: 8fa801cc */ lw $t0,0x1cc($sp) .PF0f0a6488: @@ -22915,7 +22915,7 @@ glabel var7f1add20pf /* f0a67d0: 0c0068ad */ jal func0001a524 /* f0a67d4: 00002825 */ move $a1,$zero /* f0a67d8: afa20084 */ sw $v0,0x84($sp) -/* f0a67dc: 0fc2899c */ jal func0f0a233c +/* f0a67dc: 0fc2899c */ jal bgun0f0a233c /* f0a67e0: 8fa40310 */ lw $a0,0x310($sp) /* f0a67e4: 44800000 */ mtc1 $zero,$f0 /* f0a67e8: 8fa90084 */ lw $t1,0x84($sp) @@ -22974,18 +22974,18 @@ glabel var7f1add20pf /* f0a68ac: 1000000d */ b .PF0f0a68e4 /* f0a68b0: 8fa40288 */ lw $a0,0x288($sp) .PF0f0a68b4: -/* f0a68b4: 0fc29078 */ jal func0f0a3eac +/* f0a68b4: 0fc29078 */ jal bgun0f0a3eac /* f0a68b8: 8fa5030c */ lw $a1,0x30c($sp) /* f0a68bc: 10000009 */ b .PF0f0a68e4 /* f0a68c0: 8fa40288 */ lw $a0,0x288($sp) .PF0f0a68c4: /* f0a68c4: 8fa5030c */ lw $a1,0x30c($sp) -/* f0a68c8: 0fc290f2 */ jal func0f0a4094 +/* f0a68c8: 0fc290f2 */ jal bgun0f0a4094 /* f0a68cc: 8fa60288 */ lw $a2,0x288($sp) /* f0a68d0: 10000004 */ b .PF0f0a68e4 /* f0a68d4: 8fa40288 */ lw $a0,0x288($sp) .PF0f0a68d8: -/* f0a68d8: 0fc29134 */ jal func0f0a419c +/* f0a68d8: 0fc29134 */ jal bgun0f0a419c /* f0a68dc: 8fa70288 */ lw $a3,0x288($sp) /* f0a68e0: 8fa40288 */ lw $a0,0x288($sp) .PF0f0a68e4: @@ -23078,7 +23078,7 @@ glabel var7f1add20pf /* f0a6a30: afb80010 */ sw $t8,0x10($sp) /* f0a6a34: afa90018 */ sw $t1,0x18($sp) /* f0a6a38: afa20020 */ sw $v0,0x20($sp) -/* f0a6a3c: 0fc29457 */ jal func0f0a4e44 +/* f0a6a3c: 0fc29457 */ jal bgun0f0a4e44 /* f0a6a40: afaa0014 */ sw $t2,0x14($sp) /* f0a6a44: 10000044 */ b .PF0f0a6b58 /* f0a6a48: 8fb901cc */ lw $t9,0x1cc($sp) @@ -23163,7 +23163,7 @@ glabel var7f1add20pf /* f0a6b6c: 1721000f */ bne $t9,$at,.PF0f0a6bac /* f0a6b70: 02002025 */ move $a0,$s0 /* f0a6b74: 8fa50310 */ lw $a1,0x310($sp) -/* f0a6b78: 0fc29229 */ jal func0f0a4570 +/* f0a6b78: 0fc29229 */ jal bgun0f0a4570 /* f0a6b7c: 8fa601d8 */ lw $a2,0x1d8($sp) /* f0a6b80: 1000000b */ b .PF0f0a6bb0 /* f0a6b84: 820c0004 */ lb $t4,0x4($s0) @@ -23175,7 +23175,7 @@ glabel var7f1add20pf /* f0a6b98: 000d7742 */ srl $t6,$t5,0x1d /* f0a6b9c: 19c00003 */ blez $t6,.PF0f0a6bac /* f0a6ba0: 8fa60288 */ lw $a2,0x288($sp) -/* f0a6ba4: 0fc291db */ jal func0f0a4438 +/* f0a6ba4: 0fc291db */ jal bgun0f0a4438 /* f0a6ba8: 8fa7030c */ lw $a3,0x30c($sp) .PF0f0a6bac: /* f0a6bac: 820c0004 */ lb $t4,0x4($s0) @@ -23191,7 +23191,7 @@ glabel var7f1add20pf /* f0a6bd0: 8fa9030c */ lw $t1,0x30c($sp) /* f0a6bd4: 8fa701cc */ lw $a3,0x1cc($sp) /* f0a6bd8: afb80010 */ sw $t8,0x10($sp) -/* f0a6bdc: 0fc29586 */ jal func0f0a5300 +/* f0a6bdc: 0fc29586 */ jal bgun0f0a5300 /* f0a6be0: afa90014 */ sw $t1,0x14($sp) .PF0f0a6be4: /* f0a6be4: 3c0b800a */ lui $t3,0x800a @@ -23243,7 +23243,7 @@ glabel var7f1add20pf /* f0a6c88: 8fa50310 */ lw $a1,0x310($sp) /* f0a6c8c: 11200003 */ beqz $t1,.PF0f0a6c9c /* f0a6c90: 8fa601cc */ lw $a2,0x1cc($sp) -/* f0a6c94: 0fc28df1 */ jal func0f0a3490 +/* f0a6c94: 0fc28df1 */ jal bgun0f0a3490 /* f0a6c98: 8fa701d8 */ lw $a3,0x1d8($sp) .PF0f0a6c9c: /* f0a6c9c: 960b06d6 */ lhu $t3,0x6d6($s0) @@ -23253,7 +23253,7 @@ glabel var7f1add20pf /* f0a6ca8: 000bcb02 */ srl $t9,$t3,0xc /* f0a6cac: 1b200003 */ blez $t9,.PF0f0a6cbc /* f0a6cb0: 00000000 */ nop -/* f0a6cb4: 0fc29276 */ jal func0f0a46a4 +/* f0a6cb4: 0fc29276 */ jal bgun0f0a46a4 /* f0a6cb8: 8fa601c0 */ lw $a2,0x1c0($sp) .PF0f0a6cbc: /* f0a6cbc: 3c0f800a */ lui $t7,0x800a @@ -23308,7 +23308,7 @@ glabel var7f1add20pf /* f0a6d64: 02002025 */ move $a0,$s0 /* f0a6d68: 8fa50288 */ lw $a1,0x288($sp) /* f0a6d6c: 8fa60310 */ lw $a2,0x310($sp) -/* f0a6d70: 0fc28eba */ jal func0f0a37b4 +/* f0a6d70: 0fc28eba */ jal bgun0f0a37b4 /* f0a6d74: 8fa7030c */ lw $a3,0x30c($sp) /* f0a6d78: 10000004 */ b .PF0f0a6d8c /* f0a6d7c: 44803000 */ mtc1 $zero,$f6 @@ -23327,80 +23327,80 @@ glabel var7f1add20pf ); #else GLOBAL_ASM( -glabel func0f0a5550 +glabel bgun0f0a5550 .late_rodata glabel var7f1ac9e4 .word 0x40490fdb glabel var7f1ac9e8 .word 0x3dccccce glabel var7f1ac9ec -.word func0f0a5550+0xca4 # f0a61f4 +.word bgun0f0a5550+0xca4 # f0a61f4 glabel var7f1ac9f0 -.word func0f0a5550+0xd04 # f0a6254 +.word bgun0f0a5550+0xd04 # f0a6254 glabel var7f1ac9f4 -.word func0f0a5550+0xd04 # f0a6254 +.word bgun0f0a5550+0xd04 # f0a6254 glabel var7f1ac9f8 -.word func0f0a5550+0xd04 # f0a6254 +.word bgun0f0a5550+0xd04 # f0a6254 glabel var7f1ac9fc -.word func0f0a5550+0xd04 # f0a6254 +.word bgun0f0a5550+0xd04 # f0a6254 glabel var7f1aca00 -.word func0f0a5550+0xd04 # f0a6254 +.word bgun0f0a5550+0xd04 # f0a6254 glabel var7f1aca04 -.word func0f0a5550+0xcac # f0a61fc +.word bgun0f0a5550+0xcac # f0a61fc glabel var7f1aca08 -.word func0f0a5550+0xd04 # f0a6254 +.word bgun0f0a5550+0xd04 # f0a6254 glabel var7f1aca0c -.word func0f0a5550+0xd04 # f0a6254 +.word bgun0f0a5550+0xd04 # f0a6254 glabel var7f1aca10 -.word func0f0a5550+0xd04 # f0a6254 +.word bgun0f0a5550+0xd04 # f0a6254 glabel var7f1aca14 -.word func0f0a5550+0xcc0 # f0a6210 +.word bgun0f0a5550+0xcc0 # f0a6210 glabel var7f1aca18 -.word func0f0a5550+0xcc0 # f0a6210 +.word bgun0f0a5550+0xcc0 # f0a6210 glabel var7f1aca1c -.word func0f0a5550+0xcc0 # f0a6210 +.word bgun0f0a5550+0xcc0 # f0a6210 glabel var7f1aca20 -.word func0f0a5550+0xcc0 # f0a6210 +.word bgun0f0a5550+0xcc0 # f0a6210 glabel var7f1aca24 -.word func0f0a5550+0xcc0 # f0a6210 +.word bgun0f0a5550+0xcc0 # f0a6210 glabel var7f1aca28 -.word func0f0a5550+0xd04 # f0a6254 +.word bgun0f0a5550+0xd04 # f0a6254 glabel var7f1aca2c -.word func0f0a5550+0xd04 # f0a6254 +.word bgun0f0a5550+0xd04 # f0a6254 glabel var7f1aca30 -.word func0f0a5550+0xd04 # f0a6254 +.word bgun0f0a5550+0xd04 # f0a6254 glabel var7f1aca34 -.word func0f0a5550+0xd04 # f0a6254 +.word bgun0f0a5550+0xd04 # f0a6254 glabel var7f1aca38 -.word func0f0a5550+0xd04 # f0a6254 +.word bgun0f0a5550+0xd04 # f0a6254 glabel var7f1aca3c -.word func0f0a5550+0xd04 # f0a6254 +.word bgun0f0a5550+0xd04 # f0a6254 glabel var7f1aca40 -.word func0f0a5550+0xd04 # f0a6254 +.word bgun0f0a5550+0xd04 # f0a6254 glabel var7f1aca44 -.word func0f0a5550+0xd04 # f0a6254 +.word bgun0f0a5550+0xd04 # f0a6254 glabel var7f1aca48 -.word func0f0a5550+0xd04 # f0a6254 +.word bgun0f0a5550+0xd04 # f0a6254 glabel var7f1aca4c -.word func0f0a5550+0xd04 # f0a6254 +.word bgun0f0a5550+0xd04 # f0a6254 glabel var7f1aca50 -.word func0f0a5550+0xd04 # f0a6254 +.word bgun0f0a5550+0xd04 # f0a6254 glabel var7f1aca54 -.word func0f0a5550+0xd04 # f0a6254 +.word bgun0f0a5550+0xd04 # f0a6254 glabel var7f1aca58 -.word func0f0a5550+0xd04 # f0a6254 +.word bgun0f0a5550+0xd04 # f0a6254 glabel var7f1aca5c -.word func0f0a5550+0xd04 # f0a6254 +.word bgun0f0a5550+0xd04 # f0a6254 glabel var7f1aca60 -.word func0f0a5550+0xd04 # f0a6254 +.word bgun0f0a5550+0xd04 # f0a6254 glabel var7f1aca64 -.word func0f0a5550+0xd04 # f0a6254 +.word bgun0f0a5550+0xd04 # f0a6254 glabel var7f1aca68 -.word func0f0a5550+0xd04 # f0a6254 +.word bgun0f0a5550+0xd04 # f0a6254 glabel var7f1aca6c -.word func0f0a5550+0xd04 # f0a6254 +.word bgun0f0a5550+0xd04 # f0a6254 glabel var7f1aca70 -.word func0f0a5550+0xcc0 # f0a6210 +.word bgun0f0a5550+0xcc0 # f0a6210 .text /* f0a5550: 27bdfcf8 */ addiu $sp,$sp,-776 /* f0a5554: 3c0f8007 */ lui $t7,%hi(var80070244) @@ -23440,7 +23440,7 @@ glabel var7f1aca70 /* f0a55dc: afa001cc */ sw $zero,0x1cc($sp) /* f0a55e0: afa30050 */ sw $v1,0x50($sp) /* f0a55e4: afa40308 */ sw $a0,0x308($sp) -/* f0a55e8: 0fc2867c */ jal getCurrentPlayerWeaponIdWrapper +/* f0a55e8: 0fc2867c */ jal bgunGetWeaponNum2 /* f0a55ec: afa201d8 */ sw $v0,0x1d8($sp) /* f0a55f0: afa201c4 */ sw $v0,0x1c4($sp) /* f0a55f4: afa001b8 */ sw $zero,0x1b8($sp) @@ -23471,12 +23471,12 @@ glabel var7f1aca70 .L0f0a5654: /* f0a5654: 02002025 */ or $a0,$s0,$zero .L0f0a5658: -/* f0a5658: 0fc27554 */ jal func0f09d550 +/* f0a5658: 0fc27554 */ jal bgun0f09d550 /* f0a565c: 8fa50308 */ lw $a1,0x308($sp) /* f0a5660: 8fac0308 */ lw $t4,0x308($sp) /* f0a5664: 1580002b */ bnez $t4,.L0f0a5714 /* f0a5668: 00000000 */ nop -/* f0a566c: 0fc2867c */ jal getCurrentPlayerWeaponIdWrapper +/* f0a566c: 0fc2867c */ jal bgunGetWeaponNum2 /* f0a5670: 24040001 */ addiu $a0,$zero,0x1 /* f0a5674: 00402025 */ or $a0,$v0,$zero /* f0a5678: 0fc2c5f0 */ jal weaponHasFlag @@ -23520,7 +23520,7 @@ glabel var7f1aca70 /* f0a570c: 1000002b */ b .L0f0a57bc /* f0a5710: e60601bc */ swc1 $f6,0x1bc($s0) .L0f0a5714: -/* f0a5714: 0fc2867c */ jal getCurrentPlayerWeaponIdWrapper +/* f0a5714: 0fc2867c */ jal bgunGetWeaponNum2 /* f0a5718: 00002025 */ or $a0,$zero,$zero /* f0a571c: 00402025 */ or $a0,$v0,$zero /* f0a5720: 0fc2c5f0 */ jal weaponHasFlag @@ -23864,14 +23864,14 @@ glabel var7f1aca70 /* f0a5c38: 24010007 */ addiu $at,$zero,0x7 /* f0a5c3c: 5041000d */ beql $v0,$at,.L0f0a5c74 /* f0a5c40: a2000007 */ sb $zero,0x7($s0) -/* f0a5c44: 0fc2775f */ jal func0f09dd7c +/* f0a5c44: 0fc2775f */ jal bgun0f09dd7c /* f0a5c48: 00000000 */ nop /* f0a5c4c: 50400009 */ beqzl $v0,.L0f0a5c74 /* f0a5c50: a2000007 */ sb $zero,0x7($s0) /* f0a5c54: 820d0008 */ lb $t5,0x8($s0) /* f0a5c58: 51a00006 */ beqzl $t5,.L0f0a5c74 /* f0a5c5c: a2000007 */ sb $zero,0x7($s0) -/* f0a5c60: 0fc27773 */ jal func0f09ddcc +/* f0a5c60: 0fc27773 */ jal bgun0f09ddcc /* f0a5c64: 00000000 */ nop /* f0a5c68: 54400003 */ bnezl $v0,.L0f0a5c78 /* f0a5c6c: 820c0007 */ lb $t4,0x7($s0) @@ -23914,24 +23914,24 @@ glabel var7f1aca70 /* f0a5cf0: 5420fff6 */ bnezl $at,.L0f0a5ccc /* f0a5cf4: afa201c8 */ sw $v0,0x1c8($sp) .L0f0a5cf8: -/* f0a5cf8: 0fc28b6a */ jal func0f0a2da8 +/* f0a5cf8: 0fc28b6a */ jal bgun0f0a2da8 /* f0a5cfc: 8e040794 */ lw $a0,0x794($s0) /* f0a5d00: 8fa901d8 */ lw $t1,0x1d8($sp) /* f0a5d04: 8d2d1594 */ lw $t5,0x1594($t1) /* f0a5d08: 51a00004 */ beqzl $t5,.L0f0a5d1c /* f0a5d0c: 02002025 */ or $a0,$s0,$zero -/* f0a5d10: 0fc28b6a */ jal func0f0a2da8 +/* f0a5d10: 0fc28b6a */ jal bgun0f0a2da8 /* f0a5d14: 8e040798 */ lw $a0,0x798($s0) /* f0a5d18: 02002025 */ or $a0,$s0,$zero .L0f0a5d1c: -/* f0a5d1c: 0fc2600c */ jal func0f098030 +/* f0a5d1c: 0fc2600c */ jal bgun0f098030 /* f0a5d20: 8fa50280 */ lw $a1,0x280($sp) /* f0a5d24: 8fa401c4 */ lw $a0,0x1c4($sp) /* f0a5d28: 0fc2c5f0 */ jal weaponHasFlag /* f0a5d2c: 24052000 */ addiu $a1,$zero,0x2000 /* f0a5d30: 10400003 */ beqz $v0,.L0f0a5d40 /* f0a5d34: 02002025 */ or $a0,$s0,$zero -/* f0a5d38: 0fc2607a */ jal func0f0981e8 +/* f0a5d38: 0fc2607a */ jal bgun0f0981e8 /* f0a5d3c: 8fa50280 */ lw $a1,0x280($sp) .L0f0a5d40: /* f0a5d40: 0c00566c */ jal func000159b0 @@ -23987,7 +23987,7 @@ glabel var7f1aca70 /* f0a5df8: afad0010 */ sw $t5,0x10($sp) /* f0a5dfc: 8fa50308 */ lw $a1,0x308($sp) /* f0a5e00: 27a60274 */ addiu $a2,$sp,0x274 -/* f0a5e04: 0fc28c58 */ jal func0f0a3160 +/* f0a5e04: 0fc28c58 */ jal bgun0f0a3160 /* f0a5e08: 8fa701d0 */ lw $a3,0x1d0($sp) .L0f0a5e0c: /* f0a5e0c: 8e0a00b4 */ lw $t2,0xb4($s0) @@ -24055,19 +24055,19 @@ glabel var7f1aca70 /* f0a5ef8: 44804000 */ mtc1 $zero,$f8 /* f0a5efc: 27a40118 */ addiu $a0,$sp,0x118 /* f0a5f00: 8fa50308 */ lw $a1,0x308($sp) -/* f0a5f04: 0fc2893c */ jal func0f0a24f0 +/* f0a5f04: 0fc2893c */ jal bgun0f0a24f0 /* f0a5f08: e7a801a8 */ swc1 $f8,0x1a8($sp) /* f0a5f0c: c7ac0118 */ lwc1 $f12,0x118($sp) /* f0a5f10: c7ae0120 */ lwc1 $f14,0x120($sp) /* f0a5f14: 8fa60274 */ lw $a2,0x274($sp) -/* f0a5f18: 0fc28926 */ jal func0f0a2498 +/* f0a5f18: 0fc28926 */ jal bgun0f0a2498 /* f0a5f1c: 8fa7027c */ lw $a3,0x27c($sp) /* f0a5f20: 46000287 */ neg.s $f10,$f0 /* f0a5f24: c7ac011c */ lwc1 $f12,0x11c($sp) /* f0a5f28: e7aa01a8 */ swc1 $f10,0x1a8($sp) /* f0a5f2c: c7ae0120 */ lwc1 $f14,0x120($sp) /* f0a5f30: 8fa60278 */ lw $a2,0x278($sp) -/* f0a5f34: 0fc28926 */ jal func0f0a2498 +/* f0a5f34: 0fc28926 */ jal bgun0f0a2498 /* f0a5f38: 8fa7027c */ lw $a3,0x27c($sp) /* f0a5f3c: e7a001a4 */ swc1 $f0,0x1a4($sp) /* f0a5f40: c7b201a4 */ lwc1 $f18,0x1a4($sp) @@ -24190,7 +24190,7 @@ glabel var7f1aca70 /* f0a60fc: 19600004 */ blez $t3,.L0f0a6110 /* f0a6100: 02002025 */ or $a0,$s0,$zero /* f0a6104: 8fa50280 */ lw $a1,0x280($sp) -/* f0a6108: 0fc29174 */ jal func0f0a45d0 +/* f0a6108: 0fc29174 */ jal bgun0f0a45d0 /* f0a610c: 8fa601b8 */ lw $a2,0x1b8($sp) .L0f0a6110: /* f0a6110: 2408ffff */ addiu $t0,$zero,-1 @@ -24207,13 +24207,13 @@ glabel var7f1aca70 /* f0a613c: 2401001d */ addiu $at,$zero,0x1d /* f0a6140: 17210009 */ bne $t9,$at,.L0f0a6168 /* f0a6144: 00000000 */ nop -/* f0a6148: 0fc290cd */ jal func0f0a4334 +/* f0a6148: 0fc290cd */ jal bgun0f0a4334 /* f0a614c: 02002025 */ or $a0,$s0,$zero /* f0a6150: 10000005 */ b .L0f0a6168 /* f0a6154: 2408ffff */ addiu $t0,$zero,-1 .L0f0a6158: /* f0a6158: 02002025 */ or $a0,$s0,$zero -/* f0a615c: 0fc28ea9 */ jal func0f0a3aa4 +/* f0a615c: 0fc28ea9 */ jal bgun0f0a3aa4 /* f0a6160: 8fa50280 */ lw $a1,0x280($sp) /* f0a6164: 2408ffff */ addiu $t0,$zero,-1 .L0f0a6168: @@ -24370,7 +24370,7 @@ glabel var7f1aca70 /* f0a638c: 0c006949 */ jal func0001a524 /* f0a6390: 00002825 */ or $a1,$zero,$zero /* f0a6394: afa20080 */ sw $v0,0x80($sp) -/* f0a6398: 0fc288cf */ jal func0f0a233c +/* f0a6398: 0fc288cf */ jal bgun0f0a233c /* f0a639c: 8fa40308 */ lw $a0,0x308($sp) /* f0a63a0: 44800000 */ mtc1 $zero,$f0 /* f0a63a4: 8fae0080 */ lw $t6,0x80($sp) @@ -24429,18 +24429,18 @@ glabel var7f1aca70 /* f0a6468: 1000000d */ b .L0f0a64a0 /* f0a646c: 8fa40280 */ lw $a0,0x280($sp) .L0f0a6470: -/* f0a6470: 0fc28fab */ jal func0f0a3eac +/* f0a6470: 0fc28fab */ jal bgun0f0a3eac /* f0a6474: 8fa50304 */ lw $a1,0x304($sp) /* f0a6478: 10000009 */ b .L0f0a64a0 /* f0a647c: 8fa40280 */ lw $a0,0x280($sp) .L0f0a6480: /* f0a6480: 8fa50304 */ lw $a1,0x304($sp) -/* f0a6484: 0fc29025 */ jal func0f0a4094 +/* f0a6484: 0fc29025 */ jal bgun0f0a4094 /* f0a6488: 8fa60280 */ lw $a2,0x280($sp) /* f0a648c: 10000004 */ b .L0f0a64a0 /* f0a6490: 8fa40280 */ lw $a0,0x280($sp) .L0f0a6494: -/* f0a6494: 0fc29067 */ jal func0f0a419c +/* f0a6494: 0fc29067 */ jal bgun0f0a419c /* f0a6498: 8fa70280 */ lw $a3,0x280($sp) /* f0a649c: 8fa40280 */ lw $a0,0x280($sp) .L0f0a64a0: @@ -24533,7 +24533,7 @@ glabel var7f1aca70 /* f0a65ec: afae0010 */ sw $t6,0x10($sp) /* f0a65f0: afb90018 */ sw $t9,0x18($sp) /* f0a65f4: afa20020 */ sw $v0,0x20($sp) -/* f0a65f8: 0fc29391 */ jal func0f0a4e44 +/* f0a65f8: 0fc29391 */ jal bgun0f0a4e44 /* f0a65fc: afb80014 */ sw $t8,0x14($sp) /* f0a6600: 10000044 */ b .L0f0a6714 /* f0a6604: 8fac01c4 */ lw $t4,0x1c4($sp) @@ -24618,7 +24618,7 @@ glabel var7f1aca70 /* f0a6728: 1581000f */ bne $t4,$at,.L0f0a6768 /* f0a672c: 02002025 */ or $a0,$s0,$zero /* f0a6730: 8fa50308 */ lw $a1,0x308($sp) -/* f0a6734: 0fc2915c */ jal func0f0a4570 +/* f0a6734: 0fc2915c */ jal bgun0f0a4570 /* f0a6738: 8fa601d0 */ lw $a2,0x1d0($sp) /* f0a673c: 1000000b */ b .L0f0a676c /* f0a6740: 820f0004 */ lb $t7,0x4($s0) @@ -24630,7 +24630,7 @@ glabel var7f1aca70 /* f0a6754: 000a5f42 */ srl $t3,$t2,0x1d /* f0a6758: 19600003 */ blez $t3,.L0f0a6768 /* f0a675c: 8fa60280 */ lw $a2,0x280($sp) -/* f0a6760: 0fc2910e */ jal func0f0a4438 +/* f0a6760: 0fc2910e */ jal bgun0f0a4438 /* f0a6764: 8fa70304 */ lw $a3,0x304($sp) .L0f0a6768: /* f0a6768: 820f0004 */ lb $t7,0x4($s0) @@ -24646,7 +24646,7 @@ glabel var7f1aca70 /* f0a678c: 8fb90304 */ lw $t9,0x304($sp) /* f0a6790: 8fa701c4 */ lw $a3,0x1c4($sp) /* f0a6794: afae0010 */ sw $t6,0x10($sp) -/* f0a6798: 0fc294c0 */ jal func0f0a5300 +/* f0a6798: 0fc294c0 */ jal bgun0f0a5300 /* f0a679c: afb90014 */ sw $t9,0x14($sp) .L0f0a67a0: /* f0a67a0: 3c0d800a */ lui $t5,%hi(g_Vars+0x6c) @@ -24698,7 +24698,7 @@ glabel var7f1aca70 /* f0a6844: 8fa50308 */ lw $a1,0x308($sp) /* f0a6848: 13200003 */ beqz $t9,.L0f0a6858 /* f0a684c: 8fa601c4 */ lw $a2,0x1c4($sp) -/* f0a6850: 0fc28d24 */ jal func0f0a3490 +/* f0a6850: 0fc28d24 */ jal bgun0f0a3490 /* f0a6854: 8fa701d0 */ lw $a3,0x1d0($sp) .L0f0a6858: /* f0a6858: 960d06d6 */ lhu $t5,0x6d6($s0) @@ -24708,7 +24708,7 @@ glabel var7f1aca70 /* f0a6864: 000d6302 */ srl $t4,$t5,0xc /* f0a6868: 19800003 */ blez $t4,.L0f0a6878 /* f0a686c: 00000000 */ nop -/* f0a6870: 0fc291a9 */ jal func0f0a46a4 +/* f0a6870: 0fc291a9 */ jal bgun0f0a46a4 /* f0a6874: 8fa601b8 */ lw $a2,0x1b8($sp) .L0f0a6878: /* f0a6878: 3c09800a */ lui $t1,%hi(g_Vars+0x6c) @@ -24763,7 +24763,7 @@ glabel var7f1aca70 /* f0a6920: 02002025 */ or $a0,$s0,$zero /* f0a6924: 8fa50280 */ lw $a1,0x280($sp) /* f0a6928: 8fa60308 */ lw $a2,0x308($sp) -/* f0a692c: 0fc28ded */ jal func0f0a37b4 +/* f0a692c: 0fc28ded */ jal bgun0f0a37b4 /* f0a6930: 8fa70304 */ lw $a3,0x304($sp) /* f0a6934: 10000004 */ b .L0f0a6948 /* f0a6938: ae000684 */ sw $zero,0x684($s0) @@ -24780,7 +24780,7 @@ glabel var7f1aca70 ); #endif -void handsTickMaulerCharge(void) +void bgunTickMaulerCharge(void) { struct player *player = g_Vars.currentplayer; s32 i; @@ -24790,7 +24790,7 @@ void handsTickMaulerCharge(void) u32 charging = false; if (hand->inuse) { - if (handIsReloading(hand)) { + if (bgunIsReloading(hand)) { // Reloading - reset charge amount hand->matmot1 = 0; } else if (hand->gset.weaponfunc == FUNC_SECONDARY) { @@ -24857,7 +24857,7 @@ void handsTickMaulerCharge(void) } } -void func0f0a6c30(void) +void bgun0f0a6c30(void) { struct player *player = g_Vars.currentplayer; struct hand *hand; @@ -24873,7 +24873,7 @@ void func0f0a6c30(void) if (player->gunctrl.unk1583_06) { // empty } else { - func0f09ea90(); + bgun0f09ea90(); } // Return control to Jo if eyespy has been deselected @@ -24883,7 +24883,7 @@ void func0f0a6c30(void) } if ((g_Vars.currentplayer->devicesactive & ~g_Vars.currentplayer->devicesinhibit & DEVICE_XRAYSCANNER) - && (handGetWeaponNum(HAND_RIGHT) != WEAPON_FARSIGHT || player->gunsightoff)) { + && (bgunGetWeaponNum(HAND_RIGHT) != WEAPON_FARSIGHT || player->gunsightoff)) { // Using normal xray scanner (not Farsight zoom) if (player->visionmode != VISIONMODE_XRAY) { player->erasertime = 0; @@ -24930,7 +24930,7 @@ void func0f0a6c30(void) } if (player->gunctrl.weaponnum == WEAPON_MAULER) { - handsTickMaulerCharge(); + bgunTickMaulerCharge(); } if (g_Vars.lvupdate240 == 0) { @@ -25010,26 +25010,26 @@ void func0f0a6c30(void) } } - handsTickUnequippedReload(); - func0f0a5550(HAND_RIGHT); + bgunTickUnequippedReload(); + bgun0f0a5550(HAND_RIGHT); if (player->hands[HAND_LEFT].inuse) { - func0f0a5550(HAND_LEFT); + bgun0f0a5550(HAND_LEFT); } else { player->hands[HAND_LEFT].unk0d0e_00 = 0; } - currentPlayerIsUsingSecondaryFunction(); + bgunIsUsingSecondaryFunction(); } #if VERSION >= VERSION_NTSC_1_0 -s8 freeFireslotWrapper(s32 fireslot_id) +s8 bgunFreeFireslotWrapper(s32 fireslot_id) { - return freeFireslot(fireslot_id); + return bgunFreeFireslot(fireslot_id); } #else GLOBAL_ASM( -glabel freeFireslotWrapper +glabel bgunFreeFireslotWrapper /* f0a4d84: 27bdffe0 */ addiu $sp,$sp,-32 /* f0a4d88: afbf0014 */ sw $ra,0x14($sp) /* f0a4d8c: 0480001b */ bltz $a0,.NB0f0a4dfc @@ -25063,7 +25063,7 @@ glabel freeFireslotWrapper /* f0a4df4: 0c00d428 */ jal audioStop /* f0a4df8: 8c640008 */ lw $a0,0x8($v1) .NB0f0a4dfc: -/* f0a4dfc: 0fc29385 */ jal freeFireslot +/* f0a4dfc: 0fc29385 */ jal bgunFreeFireslot /* f0a4e00: 8fa40020 */ lw $a0,0x20($sp) /* f0a4e04: 8fbf0014 */ lw $ra,0x14($sp) /* f0a4e08: 27bd0020 */ addiu $sp,$sp,0x20 @@ -25072,7 +25072,7 @@ glabel freeFireslotWrapper ); #endif -s8 freeFireslot(s32 fireslot_id) +s8 bgunFreeFireslot(s32 fireslot_id) { #if VERSION >= VERSION_NTSC_1_0 if (fireslot_id >= 0 && fireslot_id < NUM_FIRESLOTS) { @@ -25087,7 +25087,7 @@ s8 freeFireslot(s32 fireslot_id) return -1; } -s32 func0f0a70f8(void) +s32 bgun0f0a70f8(void) { s32 index = -1; s32 i; @@ -25112,7 +25112,7 @@ s32 func0f0a70f8(void) #if VERSION >= VERSION_PAL_FINAL GLOBAL_ASM( -glabel func0f0a7138 +glabel bgun0f0a7138 .late_rodata glabel var7f1aca8c .word 0x3faaaaab @@ -25317,7 +25317,7 @@ glabel var7f1aca90 /* f0a7410: 8fb500e4 */ lw $s5,0xe4($sp) /* f0a7414: 24120019 */ addiu $s2,$zero,0x1e .L0f0a7418: -/* f0a7418: 0fc2867c */ jal getCurrentPlayerWeaponIdWrapper +/* f0a7418: 0fc2867c */ jal bgunGetWeaponNum2 /* f0a741c: 02802025 */ or $a0,$s4,$zero /* f0a7420: afa200ec */ sw $v0,0xec($sp) /* f0a7424: 820a0007 */ lb $t2,0x7($s0) @@ -25953,7 +25953,7 @@ glabel var7f1aca90 ); #elif VERSION >= VERSION_NTSC_1_0 GLOBAL_ASM( -glabel func0f0a7138 +glabel bgun0f0a7138 .late_rodata glabel var7f1aca8c .word 0x3faaaaab @@ -26158,7 +26158,7 @@ glabel var7f1aca90 /* f0a7410: 8fb500e4 */ lw $s5,0xe4($sp) /* f0a7414: 24120019 */ addiu $s2,$zero,0x19 .L0f0a7418: -/* f0a7418: 0fc2867c */ jal getCurrentPlayerWeaponIdWrapper +/* f0a7418: 0fc2867c */ jal bgunGetWeaponNum2 /* f0a741c: 02802025 */ or $a0,$s4,$zero /* f0a7420: afa200ec */ sw $v0,0xec($sp) /* f0a7424: 820a0007 */ lb $t2,0x7($s0) @@ -26794,7 +26794,7 @@ glabel var7f1aca90 ); #else GLOBAL_ASM( -glabel func0f0a7138 +glabel bgun0f0a7138 .late_rodata glabel var7f1aca8c .word 0x3faaaaab @@ -26999,7 +26999,7 @@ glabel var7f1aca90 /* f0a515c: 8fb500dc */ lw $s5,0xdc($sp) /* f0a5160: 24120019 */ addiu $s2,$zero,0x19 .NB0f0a5164: -/* f0a5164: 0fc27de9 */ jal getCurrentPlayerWeaponIdWrapper +/* f0a5164: 0fc27de9 */ jal bgunGetWeaponNum2 /* f0a5168: 02802025 */ or $a0,$s4,$zero /* f0a516c: afa200e4 */ sw $v0,0xe4($sp) /* f0a5170: 820a0007 */ lb $t2,0x7($s0) @@ -27629,7 +27629,7 @@ glabel var7f1aca90 /** * Find and return an available audio handle out of a pool of four. */ -struct audiohandle **func0f0a7d5c(void) +struct audiohandle **bgun0f0a7d5c(void) { s32 i; @@ -27644,7 +27644,7 @@ struct audiohandle **func0f0a7d5c(void) #if VERSION >= VERSION_NTSC_1_0 GLOBAL_ASM( -glabel gsetPlayPropHitSound +glabel bgunPlayPropHitSound .late_rodata glabel var7f1aca94 .word 0x453b8000 @@ -27719,7 +27719,7 @@ glabel var7f1aca94 /* f0a7e9c: 10000156 */ b .L0f0a83f8 /* f0a7ea0: 8fbf0044 */ lw $ra,0x44($sp) .L0f0a7ea4: -/* f0a7ea4: 0fc29f57 */ jal func0f0a7d5c +/* f0a7ea4: 0fc29f57 */ jal bgun0f0a7d5c /* f0a7ea8: afa700c8 */ sw $a3,0xc8($sp) /* f0a7eac: 8fa700c8 */ lw $a3,0xc8($sp) /* f0a7eb0: 104000fa */ beqz $v0,.L0f0a829c @@ -28012,7 +28012,7 @@ glabel var7f1aca94 /* f0a82d8: 51400047 */ beqzl $t2,.L0f0a83f8 /* f0a82dc: 8fbf0044 */ lw $ra,0x44($sp) /* f0a82e0: a7ab005e */ sh $t3,0x5e($sp) -/* f0a82e4: 0fc29f57 */ jal func0f0a7d5c +/* f0a82e4: 0fc29f57 */ jal bgun0f0a7d5c /* f0a82e8: afa30054 */ sw $v1,0x54($sp) /* f0a82ec: 8fa30054 */ lw $v1,0x54($sp) /* f0a82f0: 10400040 */ beqz $v0,.L0f0a83f4 @@ -28092,7 +28092,7 @@ glabel var7f1aca94 ); #else GLOBAL_ASM( -glabel gsetPlayPropHitSound +glabel bgunPlayPropHitSound .late_rodata glabel var7f1aca94 .word 0x453b8000 @@ -28167,7 +28167,7 @@ glabel var7f1aca94 /* f0a5bc8: 10000181 */ beqz $zero,.NB0f0a61d0 /* f0a5bcc: 8fbf0044 */ lw $ra,0x44($sp) .NB0f0a5bd0: -/* f0a5bd0: 0fc296a2 */ jal func0f0a7d5c +/* f0a5bd0: 0fc296a2 */ jal bgun0f0a7d5c /* f0a5bd4: afa700b8 */ sw $a3,0xb8($sp) /* f0a5bd8: 8fa700b8 */ lw $a3,0xb8($sp) /* f0a5bdc: 1040012d */ beqz $v0,.NB0f0a6094 @@ -28513,7 +28513,7 @@ glabel var7f1aca94 /* f0a60d0: 5140003f */ beqzl $t2,.NB0f0a61d0 /* f0a60d4: 8fbf0044 */ lw $ra,0x44($sp) /* f0a60d8: a7ae005e */ sh $t6,0x5e($sp) -/* f0a60dc: 0fc296a2 */ jal func0f0a7d5c +/* f0a60dc: 0fc296a2 */ jal bgun0f0a7d5c /* f0a60e0: afa30054 */ sw $v1,0x54($sp) /* f0a60e4: 8fa30054 */ lw $v1,0x54($sp) /* f0a60e8: 10400038 */ beqz $v0,.NB0f0a61cc @@ -28584,10 +28584,10 @@ glabel var7f1aca94 ); #endif -void func0f0a8404(struct coord *pos, s16 *rooms, s32 arg2) +void bgun0f0a8404(struct coord *pos, s16 *rooms, s32 arg2) { if (g_Vars.lvupdate240 > 0) { - struct audiohandle **handle = func0f0a7d5c(); + struct audiohandle **handle = bgun0f0a7d5c(); if (handle) { sndStart(var80095200, SFX_HIT_GLASS, handle, -1, -1, -1, -1, -1); @@ -28601,7 +28601,7 @@ void func0f0a8404(struct coord *pos, s16 *rooms, s32 arg2) #if VERSION >= VERSION_NTSC_1_0 GLOBAL_ASM( -glabel func0f0a84c8 +glabel bgun0f0a84c8 .late_rodata glabel var7f1aca9c .word 0x453b8000 @@ -28640,7 +28640,7 @@ glabel var7f1acaa0 /* f0a853c: 11a000f0 */ beqz $t5,.L0f0a8900 .L0f0a8540: /* f0a8540: 240e0001 */ addiu $t6,$zero,0x1 -/* f0a8544: 0fc29f57 */ jal func0f0a7d5c +/* f0a8544: 0fc29f57 */ jal bgun0f0a7d5c /* f0a8548: afae0098 */ sw $t6,0x98($sp) /* f0a854c: 104000a5 */ beqz $v0,.L0f0a87e4 /* f0a8550: afa200a4 */ sw $v0,0xa4($sp) @@ -28822,7 +28822,7 @@ glabel var7f1acaa0 /* f0a87e4: 8fac0098 */ lw $t4,0x98($sp) /* f0a87e8: 51800046 */ beqzl $t4,.L0f0a8904 /* f0a87ec: 8fbf002c */ lw $ra,0x2c($sp) -/* f0a87f0: 0fc29f57 */ jal func0f0a7d5c +/* f0a87f0: 0fc29f57 */ jal bgun0f0a7d5c /* f0a87f4: 00000000 */ nop /* f0a87f8: 10400041 */ beqz $v0,.L0f0a8900 /* f0a87fc: afa200a4 */ sw $v0,0xa4($sp) @@ -28901,7 +28901,7 @@ glabel var7f1acaa0 ); #else GLOBAL_ASM( -glabel func0f0a84c8 +glabel bgun0f0a84c8 .late_rodata glabel var7f1aca9c .word 0x453b8000 @@ -28940,7 +28940,7 @@ glabel var7f1acaa0 /* f0a6314: 51a000e3 */ beqzl $t5,.NB0f0a66a4 /* f0a6318: 8fbf002c */ lw $ra,0x2c($sp) .NB0f0a631c: -/* f0a631c: 0fc296a2 */ jal func0f0a7d5c +/* f0a631c: 0fc296a2 */ jal bgun0f0a7d5c /* f0a6320: 00000000 */ sll $zero,$zero,0x0 /* f0a6324: 1040009a */ beqz $v0,.NB0f0a6590 /* f0a6328: afa2009c */ sw $v0,0x9c($sp) @@ -29108,7 +29108,7 @@ glabel var7f1acaa0 /* f0a6588: 54600046 */ bnezl $v1,.NB0f0a66a4 /* f0a658c: 8fbf002c */ lw $ra,0x2c($sp) .NB0f0a6590: -/* f0a6590: 0fc296a2 */ jal func0f0a7d5c +/* f0a6590: 0fc296a2 */ jal bgun0f0a7d5c /* f0a6594: 00000000 */ sll $zero,$zero,0x0 /* f0a6598: 10400041 */ beqz $v0,.NB0f0a66a0 /* f0a659c: afa2009c */ sw $v0,0x9c($sp) @@ -29187,7 +29187,7 @@ glabel var7f1acaa0 ); #endif -void handSetTriggerOn(s32 handnum, bool on) +void bgunSetTriggerOn(s32 handnum, bool on) { struct hand *hand = &g_Vars.currentplayer->hands[handnum]; @@ -29201,73 +29201,73 @@ void handSetTriggerOn(s32 handnum, bool on) #if VERSION >= VERSION_PAL_FINAL GLOBAL_ASM( -glabel currentPlayerConsiderToggleGunFunction +glabel bgunConsiderToggleGunFunction .late_rodata glabel var7f1acaa4 -.word currentPlayerConsiderToggleGunFunction+0x104 # f0a8a60 +.word bgunConsiderToggleGunFunction+0x104 # f0a8a60 glabel var7f1acaa8 -.word currentPlayerConsiderToggleGunFunction+0x1f4 # f0a8b50 +.word bgunConsiderToggleGunFunction+0x1f4 # f0a8b50 glabel var7f1acaac -.word currentPlayerConsiderToggleGunFunction+0x1f4 # f0a8b50 +.word bgunConsiderToggleGunFunction+0x1f4 # f0a8b50 glabel var7f1acab0 -.word currentPlayerConsiderToggleGunFunction+0x1f4 # f0a8b50 +.word bgunConsiderToggleGunFunction+0x1f4 # f0a8b50 glabel var7f1acab4 -.word currentPlayerConsiderToggleGunFunction+0x104 # f0a8a60 +.word bgunConsiderToggleGunFunction+0x104 # f0a8a60 glabel var7f1acab8 -.word currentPlayerConsiderToggleGunFunction+0x1f4 # f0a8b50 +.word bgunConsiderToggleGunFunction+0x1f4 # f0a8b50 glabel var7f1acabc -.word currentPlayerConsiderToggleGunFunction+0x1f4 # f0a8b50 +.word bgunConsiderToggleGunFunction+0x1f4 # f0a8b50 glabel var7f1acac0 -.word currentPlayerConsiderToggleGunFunction+0xb0 # f0a8a0c +.word bgunConsiderToggleGunFunction+0xb0 # f0a8a0c glabel var7f1acac4 -.word currentPlayerConsiderToggleGunFunction+0xb0 # f0a8a0c +.word bgunConsiderToggleGunFunction+0xb0 # f0a8a0c glabel var7f1acac8 -.word currentPlayerConsiderToggleGunFunction+0xb0 # f0a8a0c +.word bgunConsiderToggleGunFunction+0xb0 # f0a8a0c glabel var7f1acacc -.word currentPlayerConsiderToggleGunFunction+0x104 # f0a8a60 +.word bgunConsiderToggleGunFunction+0x104 # f0a8a60 glabel var7f1acad0 -.word currentPlayerConsiderToggleGunFunction+0x104 # f0a8a60 +.word bgunConsiderToggleGunFunction+0x104 # f0a8a60 glabel var7f1acad4 -.word currentPlayerConsiderToggleGunFunction+0x1f4 # f0a8b50 +.word bgunConsiderToggleGunFunction+0x1f4 # f0a8b50 glabel var7f1acad8 -.word currentPlayerConsiderToggleGunFunction+0x1f4 # f0a8b50 +.word bgunConsiderToggleGunFunction+0x1f4 # f0a8b50 glabel var7f1acadc -.word currentPlayerConsiderToggleGunFunction+0x1f4 # f0a8b50 +.word bgunConsiderToggleGunFunction+0x1f4 # f0a8b50 glabel var7f1acae0 -.word currentPlayerConsiderToggleGunFunction+0x44 # f0a89a0 +.word bgunConsiderToggleGunFunction+0x44 # f0a89a0 glabel var7f1acae4 -.word currentPlayerConsiderToggleGunFunction+0x104 # f0a8a60 +.word bgunConsiderToggleGunFunction+0x104 # f0a8a60 glabel var7f1acae8 -.word currentPlayerConsiderToggleGunFunction+0x1f4 # f0a8b50 +.word bgunConsiderToggleGunFunction+0x1f4 # f0a8b50 glabel var7f1acaec -.word currentPlayerConsiderToggleGunFunction+0x1f4 # f0a8b50 +.word bgunConsiderToggleGunFunction+0x1f4 # f0a8b50 glabel var7f1acaf0 -.word currentPlayerConsiderToggleGunFunction+0x1f4 # f0a8b50 +.word bgunConsiderToggleGunFunction+0x1f4 # f0a8b50 glabel var7f1acaf4 -.word currentPlayerConsiderToggleGunFunction+0x1f4 # f0a8b50 +.word bgunConsiderToggleGunFunction+0x1f4 # f0a8b50 glabel var7f1acaf8 -.word currentPlayerConsiderToggleGunFunction+0x1f4 # f0a8b50 +.word bgunConsiderToggleGunFunction+0x1f4 # f0a8b50 glabel var7f1acafc -.word currentPlayerConsiderToggleGunFunction+0x1f4 # f0a8b50 +.word bgunConsiderToggleGunFunction+0x1f4 # f0a8b50 glabel var7f1acb00 -.word currentPlayerConsiderToggleGunFunction+0x1f4 # f0a8b50 +.word bgunConsiderToggleGunFunction+0x1f4 # f0a8b50 glabel var7f1acb04 -.word currentPlayerConsiderToggleGunFunction+0x1f4 # f0a8b50 +.word bgunConsiderToggleGunFunction+0x1f4 # f0a8b50 glabel var7f1acb08 -.word currentPlayerConsiderToggleGunFunction+0x1f4 # f0a8b50 +.word bgunConsiderToggleGunFunction+0x1f4 # f0a8b50 glabel var7f1acb0c -.word currentPlayerConsiderToggleGunFunction+0x104 # f0a8a60 +.word bgunConsiderToggleGunFunction+0x104 # f0a8a60 glabel var7f1acb10 -.word currentPlayerConsiderToggleGunFunction+0x1f4 # f0a8b50 +.word bgunConsiderToggleGunFunction+0x1f4 # f0a8b50 glabel var7f1acb14 -.word currentPlayerConsiderToggleGunFunction+0xb0 # f0a8a0c +.word bgunConsiderToggleGunFunction+0xb0 # f0a8a0c .text /* f0a895c: 27bdffe8 */ addiu $sp,$sp,-24 /* f0a8960: afbf0014 */ sw $ra,0x14($sp) /* f0a8964: afa40018 */ sw $a0,0x18($sp) /* f0a8968: afa60020 */ sw $a2,0x20($sp) /* f0a896c: 00002025 */ or $a0,$zero,$zero -/* f0a8970: 0fc2866a */ jal handGetWeaponNum +/* f0a8970: 0fc2866a */ jal bgunGetWeaponNum /* f0a8974: afa5001c */ sw $a1,0x1c($sp) /* f0a8978: 244efffa */ addiu $t6,$v0,-6 /* f0a897c: 2dc1001d */ sltiu $at,$t6,0x1d @@ -29318,7 +29318,7 @@ glabel var7f1acb14 /* f0a8a24: 8fb90020 */ lw $t9,0x20($sp) /* f0a8a28: 1320000b */ beqz $t9,.L0f0a8a58 /* f0a8a2c: 00000000 */ nop -/* f0a8a30: 0fc2a31f */ jal currentPlayerIsUsingSecondaryFunction +/* f0a8a30: 0fc2a31f */ jal bgunIsUsingSecondaryFunction /* f0a8a34: 00000000 */ nop /* f0a8a38: 3c08800a */ lui $t0,%hi(g_Vars) /* f0a8a3c: 24010001 */ addiu $at,$zero,0x1 @@ -29469,73 +29469,73 @@ glabel var7f1acb14 ); #elif VERSION >= VERSION_NTSC_1_0 GLOBAL_ASM( -glabel currentPlayerConsiderToggleGunFunction +glabel bgunConsiderToggleGunFunction .late_rodata glabel var7f1acaa4 -.word currentPlayerConsiderToggleGunFunction+0x104 # f0a8a60 +.word bgunConsiderToggleGunFunction+0x104 # f0a8a60 glabel var7f1acaa8 -.word currentPlayerConsiderToggleGunFunction+0x1f4 # f0a8b50 +.word bgunConsiderToggleGunFunction+0x1f4 # f0a8b50 glabel var7f1acaac -.word currentPlayerConsiderToggleGunFunction+0x1f4 # f0a8b50 +.word bgunConsiderToggleGunFunction+0x1f4 # f0a8b50 glabel var7f1acab0 -.word currentPlayerConsiderToggleGunFunction+0x1f4 # f0a8b50 +.word bgunConsiderToggleGunFunction+0x1f4 # f0a8b50 glabel var7f1acab4 -.word currentPlayerConsiderToggleGunFunction+0x104 # f0a8a60 +.word bgunConsiderToggleGunFunction+0x104 # f0a8a60 glabel var7f1acab8 -.word currentPlayerConsiderToggleGunFunction+0x1f4 # f0a8b50 +.word bgunConsiderToggleGunFunction+0x1f4 # f0a8b50 glabel var7f1acabc -.word currentPlayerConsiderToggleGunFunction+0x1f4 # f0a8b50 +.word bgunConsiderToggleGunFunction+0x1f4 # f0a8b50 glabel var7f1acac0 -.word currentPlayerConsiderToggleGunFunction+0xb0 # f0a8a0c +.word bgunConsiderToggleGunFunction+0xb0 # f0a8a0c glabel var7f1acac4 -.word currentPlayerConsiderToggleGunFunction+0xb0 # f0a8a0c +.word bgunConsiderToggleGunFunction+0xb0 # f0a8a0c glabel var7f1acac8 -.word currentPlayerConsiderToggleGunFunction+0xb0 # f0a8a0c +.word bgunConsiderToggleGunFunction+0xb0 # f0a8a0c glabel var7f1acacc -.word currentPlayerConsiderToggleGunFunction+0x104 # f0a8a60 +.word bgunConsiderToggleGunFunction+0x104 # f0a8a60 glabel var7f1acad0 -.word currentPlayerConsiderToggleGunFunction+0x104 # f0a8a60 +.word bgunConsiderToggleGunFunction+0x104 # f0a8a60 glabel var7f1acad4 -.word currentPlayerConsiderToggleGunFunction+0x1f4 # f0a8b50 +.word bgunConsiderToggleGunFunction+0x1f4 # f0a8b50 glabel var7f1acad8 -.word currentPlayerConsiderToggleGunFunction+0x1f4 # f0a8b50 +.word bgunConsiderToggleGunFunction+0x1f4 # f0a8b50 glabel var7f1acadc -.word currentPlayerConsiderToggleGunFunction+0x1f4 # f0a8b50 +.word bgunConsiderToggleGunFunction+0x1f4 # f0a8b50 glabel var7f1acae0 -.word currentPlayerConsiderToggleGunFunction+0x44 # f0a89a0 +.word bgunConsiderToggleGunFunction+0x44 # f0a89a0 glabel var7f1acae4 -.word currentPlayerConsiderToggleGunFunction+0x104 # f0a8a60 +.word bgunConsiderToggleGunFunction+0x104 # f0a8a60 glabel var7f1acae8 -.word currentPlayerConsiderToggleGunFunction+0x1f4 # f0a8b50 +.word bgunConsiderToggleGunFunction+0x1f4 # f0a8b50 glabel var7f1acaec -.word currentPlayerConsiderToggleGunFunction+0x1f4 # f0a8b50 +.word bgunConsiderToggleGunFunction+0x1f4 # f0a8b50 glabel var7f1acaf0 -.word currentPlayerConsiderToggleGunFunction+0x1f4 # f0a8b50 +.word bgunConsiderToggleGunFunction+0x1f4 # f0a8b50 glabel var7f1acaf4 -.word currentPlayerConsiderToggleGunFunction+0x1f4 # f0a8b50 +.word bgunConsiderToggleGunFunction+0x1f4 # f0a8b50 glabel var7f1acaf8 -.word currentPlayerConsiderToggleGunFunction+0x1f4 # f0a8b50 +.word bgunConsiderToggleGunFunction+0x1f4 # f0a8b50 glabel var7f1acafc -.word currentPlayerConsiderToggleGunFunction+0x1f4 # f0a8b50 +.word bgunConsiderToggleGunFunction+0x1f4 # f0a8b50 glabel var7f1acb00 -.word currentPlayerConsiderToggleGunFunction+0x1f4 # f0a8b50 +.word bgunConsiderToggleGunFunction+0x1f4 # f0a8b50 glabel var7f1acb04 -.word currentPlayerConsiderToggleGunFunction+0x1f4 # f0a8b50 +.word bgunConsiderToggleGunFunction+0x1f4 # f0a8b50 glabel var7f1acb08 -.word currentPlayerConsiderToggleGunFunction+0x1f4 # f0a8b50 +.word bgunConsiderToggleGunFunction+0x1f4 # f0a8b50 glabel var7f1acb0c -.word currentPlayerConsiderToggleGunFunction+0x104 # f0a8a60 +.word bgunConsiderToggleGunFunction+0x104 # f0a8a60 glabel var7f1acb10 -.word currentPlayerConsiderToggleGunFunction+0x1f4 # f0a8b50 +.word bgunConsiderToggleGunFunction+0x1f4 # f0a8b50 glabel var7f1acb14 -.word currentPlayerConsiderToggleGunFunction+0xb0 # f0a8a0c +.word bgunConsiderToggleGunFunction+0xb0 # f0a8a0c .text /* f0a895c: 27bdffe8 */ addiu $sp,$sp,-24 /* f0a8960: afbf0014 */ sw $ra,0x14($sp) /* f0a8964: afa40018 */ sw $a0,0x18($sp) /* f0a8968: afa60020 */ sw $a2,0x20($sp) /* f0a896c: 00002025 */ or $a0,$zero,$zero -/* f0a8970: 0fc2866a */ jal handGetWeaponNum +/* f0a8970: 0fc2866a */ jal bgunGetWeaponNum /* f0a8974: afa5001c */ sw $a1,0x1c($sp) /* f0a8978: 244efffa */ addiu $t6,$v0,-6 /* f0a897c: 2dc1001d */ sltiu $at,$t6,0x1d @@ -29586,7 +29586,7 @@ glabel var7f1acb14 /* f0a8a24: 8fb90020 */ lw $t9,0x20($sp) /* f0a8a28: 1320000b */ beqz $t9,.L0f0a8a58 /* f0a8a2c: 00000000 */ nop -/* f0a8a30: 0fc2a31f */ jal currentPlayerIsUsingSecondaryFunction +/* f0a8a30: 0fc2a31f */ jal bgunIsUsingSecondaryFunction /* f0a8a34: 00000000 */ nop /* f0a8a38: 3c08800a */ lui $t0,%hi(g_Vars) /* f0a8a3c: 24010001 */ addiu $at,$zero,0x1 @@ -29737,70 +29737,70 @@ glabel var7f1acb14 ); #else GLOBAL_ASM( -glabel currentPlayerConsiderToggleGunFunction +glabel bgunConsiderToggleGunFunction .late_rodata glabel var7f1a6fccnb .word 0x453b8000 glabel var7f1a6fd0nb .word 0x453b8000 glabel var7f1acaa4 -.word currentPlayerConsiderToggleGunFunction+0x104 +.word bgunConsiderToggleGunFunction+0x104 glabel var7f1a6fd8nb -.word currentPlayerConsiderToggleGunFunction+0x1f4 +.word bgunConsiderToggleGunFunction+0x1f4 glabel var7f1a6fdcnb -.word currentPlayerConsiderToggleGunFunction+0x1f4 +.word bgunConsiderToggleGunFunction+0x1f4 glabel var7f1a6fe0nb -.word currentPlayerConsiderToggleGunFunction+0x1f4 +.word bgunConsiderToggleGunFunction+0x1f4 glabel var7f1a6fe4nb -.word currentPlayerConsiderToggleGunFunction+0x104 +.word bgunConsiderToggleGunFunction+0x104 glabel var7f1a6fe8nb -.word currentPlayerConsiderToggleGunFunction+0x1f4 +.word bgunConsiderToggleGunFunction+0x1f4 glabel var7f1a6fecnb -.word currentPlayerConsiderToggleGunFunction+0x1f4 +.word bgunConsiderToggleGunFunction+0x1f4 glabel var7f1a6ff0nb -.word currentPlayerConsiderToggleGunFunction+0x0b0 +.word bgunConsiderToggleGunFunction+0x0b0 glabel var7f1a6ff4nb -.word currentPlayerConsiderToggleGunFunction+0x0b0 +.word bgunConsiderToggleGunFunction+0x0b0 glabel var7f1a6ff8nb -.word currentPlayerConsiderToggleGunFunction+0x0b0 +.word bgunConsiderToggleGunFunction+0x0b0 glabel var7f1a6ffcnb -.word currentPlayerConsiderToggleGunFunction+0x104 +.word bgunConsiderToggleGunFunction+0x104 glabel var7f1a7000nb -.word currentPlayerConsiderToggleGunFunction+0x104 +.word bgunConsiderToggleGunFunction+0x104 glabel var7f1a7004nb -.word currentPlayerConsiderToggleGunFunction+0x1f4 +.word bgunConsiderToggleGunFunction+0x1f4 glabel var7f1a7008nb -.word currentPlayerConsiderToggleGunFunction+0x1f4 +.word bgunConsiderToggleGunFunction+0x1f4 glabel var7f1a700cnb -.word currentPlayerConsiderToggleGunFunction+0x1f4 +.word bgunConsiderToggleGunFunction+0x1f4 glabel var7f1a7010nb -.word currentPlayerConsiderToggleGunFunction+0x044 +.word bgunConsiderToggleGunFunction+0x044 glabel var7f1a7014nb -.word currentPlayerConsiderToggleGunFunction+0x104 +.word bgunConsiderToggleGunFunction+0x104 glabel var7f1a7018nb -.word currentPlayerConsiderToggleGunFunction+0x1f4 +.word bgunConsiderToggleGunFunction+0x1f4 glabel var7f1a701cnb -.word currentPlayerConsiderToggleGunFunction+0x1f4 +.word bgunConsiderToggleGunFunction+0x1f4 glabel var7f1a7020nb -.word currentPlayerConsiderToggleGunFunction+0x1f4 +.word bgunConsiderToggleGunFunction+0x1f4 glabel var7f1a7024nb -.word currentPlayerConsiderToggleGunFunction+0x1f4 +.word bgunConsiderToggleGunFunction+0x1f4 glabel var7f1a7028nb -.word currentPlayerConsiderToggleGunFunction+0x1f4 +.word bgunConsiderToggleGunFunction+0x1f4 glabel var7f1a702cnb -.word currentPlayerConsiderToggleGunFunction+0x1f4 +.word bgunConsiderToggleGunFunction+0x1f4 glabel var7f1a7030nb -.word currentPlayerConsiderToggleGunFunction+0x1f4 +.word bgunConsiderToggleGunFunction+0x1f4 glabel var7f1a7034nb -.word currentPlayerConsiderToggleGunFunction+0x1f4 +.word bgunConsiderToggleGunFunction+0x1f4 glabel var7f1a7038nb -.word currentPlayerConsiderToggleGunFunction+0x1f4 +.word bgunConsiderToggleGunFunction+0x1f4 glabel var7f1a703cnb -.word currentPlayerConsiderToggleGunFunction+0x104 +.word bgunConsiderToggleGunFunction+0x104 glabel var7f1a7040nb -.word currentPlayerConsiderToggleGunFunction+0x1f4 +.word bgunConsiderToggleGunFunction+0x1f4 glabel var7f1a7044nb -.word currentPlayerConsiderToggleGunFunction+0x0b0 +.word bgunConsiderToggleGunFunction+0x0b0 @@ -29810,7 +29810,7 @@ glabel var7f1a7044nb /* f0a8964: afa40018 */ sw $a0,0x18($sp) /* f0a8968: afa60020 */ sw $a2,0x20($sp) /* f0a896c: 00002025 */ or $a0,$zero,$zero -/* f0a8970: 0fc2866a */ jal handGetWeaponNum +/* f0a8970: 0fc2866a */ jal bgunGetWeaponNum /* f0a8974: afa5001c */ sw $a1,0x1c($sp) /* f0a8978: 244efffa */ addiu $t6,$v0,-6 /* f0a897c: 2dc1001d */ sltiu $at,$t6,0x1d @@ -29861,7 +29861,7 @@ glabel var7f1a7044nb /* f0a8a24: 8fb90020 */ lw $t9,0x20($sp) /* f0a8a28: 1320000b */ beqz $t9,.L0f0a8a58 /* f0a8a2c: 00000000 */ nop -/* f0a8a30: 0fc2a31f */ jal currentPlayerIsUsingSecondaryFunction +/* f0a8a30: 0fc2a31f */ jal bgunIsUsingSecondaryFunction /* f0a8a34: 00000000 */ nop /* f0a8a38: 3c08800a */ lui $t0,%hi(g_Vars) /* f0a8a3c: 24010001 */ addiu $at,$zero,0x1 @@ -30014,9 +30014,9 @@ glabel var7f1a7044nb // Mismatch near the first gunfuncs check. // Goal loads 1 into $t5 while the below uses $at. -//u32 currentPlayerConsiderToggleGunFunction(s32 usedowntime, bool firing, s32 arg2) +//u32 bgunConsiderToggleGunFunction(s32 usedowntime, bool firing, s32 arg2) //{ -// switch (handGetWeaponNum(HAND_RIGHT)) { +// switch (bgunGetWeaponNum(HAND_RIGHT)) { // case WEAPON_SNIPERRIFLE: // f0a89a0 // // Setting this allows the sniper rifle to behave somewhat similarly to // // a temporary function, meaning that it reverts to primary when B is @@ -30049,7 +30049,7 @@ glabel var7f1a7044nb // // These guns use temporary alt functions // g_Vars.currentplayer->invertgunfunc = true; // -// if (arg2 && currentPlayerIsUsingSecondaryFunction() == true) { +// if (arg2 && bgunIsUsingSecondaryFunction() == true) { // g_Vars.currentplayer->hands[HAND_RIGHT].unk0d0f_03 = true; // } // @@ -30101,14 +30101,14 @@ glabel var7f1a7044nb // } //} -void func0f0a8c50(void) +void bgun0f0a8c50(void) { if (g_Vars.currentplayer->hands[HAND_RIGHT].unk0d0f_03 == 0) { g_Vars.currentplayer->gunctrl.invertgunfunc = false; } } -bool currentPlayerIsUsingSecondaryFunction(void) +bool bgunIsUsingSecondaryFunction(void) { struct player *player = g_Vars.currentplayer; s32 weaponnum = player->gunctrl.weaponnum; @@ -30133,7 +30133,7 @@ bool currentPlayerIsUsingSecondaryFunction(void) return false; } -void handsTick(bool triggeron) +void bgunsTick(bool triggeron) { s32 gunsfiring[2] = {false, false}; struct player *player = g_Vars.currentplayer; @@ -30151,7 +30151,7 @@ void handsTick(bool triggeron) if (g_Vars.currentplayer->gunctrl.weaponnum != WEAPON_UNARMED && g_Vars.currentplayer->gunctrl.switchtoweaponnum != WEAPON_UNARMED) { - currentPlayerEquipWeapon(WEAPON_UNARMED); + bgunEquipWeapon(WEAPON_UNARMED); } g_Vars.currentplayer->gunctrl.unk1583_00 = 0; @@ -30182,13 +30182,13 @@ void handsTick(bool triggeron) weapon = weaponFindById(weaponnum); if (weapon && weapon->ammos[0] - && currentPlayerGetAmmoCount(weapon->ammos[0]->type) == 0) { - equippedweaponnum = handGetWeaponNum(HAND_RIGHT); + && bgunGetAmmoCount(weapon->ammos[0]->type) == 0) { + equippedweaponnum = bgunGetWeaponNum(HAND_RIGHT); invRemoveItemByNum(weaponnum); if (weaponnum == equippedweaponnum && !invHasSingleWeaponIncAllGuns(weaponnum)) { invCalculateCurrentIndex(); - currentPlayerEquipWeapon(invGetWeaponNumByIndex(g_Vars.currentplayer->equipcuritem)); + bgunEquipWeapon(invGetWeaponNumByIndex(g_Vars.currentplayer->equipcuritem)); } } } @@ -30219,13 +30219,13 @@ void handsTick(bool triggeron) if (player->playertrigtime240 > PALDOWN(80)) { gunsfiring[player->curguntofire] = 1; - if (func0f099008(1 - player->curguntofire) + if (bgun0f099008(1 - player->curguntofire) || player->hands[1 - player->curguntofire].triggeron) { gunsfiring[1 - player->curguntofire] = 1; } } else { if (player->playertriggerprev == false && - (func0f099008(1 - player->curguntofire) || !func0f099008(player->curguntofire))) { + (bgun0f099008(1 - player->curguntofire) || !bgun0f099008(player->curguntofire))) { player->curguntofire = 1 - player->curguntofire; } @@ -30249,13 +30249,13 @@ void handsTick(bool triggeron) player->playertrigtime240 = 0; } - handSetTriggerOn(HAND_RIGHT, gunsfiring[0]); - handSetTriggerOn(HAND_LEFT, gunsfiring[1]); + bgunSetTriggerOn(HAND_RIGHT, gunsfiring[0]); + bgunSetTriggerOn(HAND_LEFT, gunsfiring[1]); if (g_Vars.tickmode == TICKMODE_NORMAL && g_Vars.lvupdate240 > 0) { - handTick(HAND_RIGHT); - handTick(HAND_LEFT); - func0f09ce8c(); + bgunTick(HAND_RIGHT); + bgunTick(HAND_LEFT); + bgun0f09ce8c(); if (cheatIsActive(CHEAT_UNLIMITEDAMMONORELOADS)) { s32 i; @@ -30267,19 +30267,19 @@ void handsTick(bool triggeron) for (i = 0; i != 2; i++) { if (weapon && weapon->ammos[i] && - ammotypeAllowsUnlimitedAmmo(weapon->ammos[i]->type)) { + bgunAmmotypeAllowsUnlimitedAmmo(weapon->ammos[i]->type)) { rhand->loadedammo[i] = rhand->clipsizes[i]; lhand->loadedammo[i] = lhand->clipsizes[i]; } } - currentPlayerGiveUnlimitedAmmo(false); + bgunGiveMaxAmmo(false); } else if (cheatIsActive(CHEAT_UNLIMITEDAMMO)) { - currentPlayerGiveUnlimitedAmmo(false); + bgunGiveMaxAmmo(false); } } - currentPlayerDecreaseNoiseRadius(); + bgunDecreaseNoiseRadius(); if (player->resetshadecol) { func0f069144(g_Vars.currentplayer->prop, player->gunshadecol, player->floorcol); @@ -30290,10 +30290,10 @@ void handsTick(bool triggeron) colourTween(player->gunshadecol, shadecol); } - invIncrementHeldTime(handGetWeaponNum(HAND_RIGHT), handGetWeaponNum(HAND_LEFT)); + invIncrementHeldTime(bgunGetWeaponNum(HAND_RIGHT), bgunGetWeaponNum(HAND_LEFT)); } -void playersSetPassiveMode(bool enable) +void bgunSetPassiveMode(bool enable) { s32 i; @@ -30302,12 +30302,12 @@ void playersSetPassiveMode(bool enable) } } -void currentPlayerSetAimType(u32 aimtype) +void bgunSetAimType(u32 aimtype) { g_Vars.currentplayer->aimtype = aimtype; } -void handSetAimPos(struct coord *coord) +void bgunSetAimPos(struct coord *coord) { struct player *player = g_Vars.currentplayer; @@ -30320,7 +30320,7 @@ void handSetAimPos(struct coord *coord) player->hands[HAND_LEFT].aimpos.z = coord->z; } -void handSetHitPos(struct coord *coord) +void bgunSetHitPos(struct coord *coord) { struct player *player = g_Vars.currentplayer; @@ -30329,7 +30329,7 @@ void handSetHitPos(struct coord *coord) player->hands[HAND_LEFT].hitpos.z = player->hands[HAND_RIGHT].hitpos.z = coord->z; } -void func0f0a9494(u32 operation) +void bgun0f0a9494(u32 operation) { switch (operation) { case 0: @@ -30340,7 +30340,7 @@ void func0f0a9494(u32 operation) } } -void func0f0a94d0(u32 operation, struct coord *pos, struct coord *rot) +void bgun0f0a94d0(u32 operation, struct coord *pos, struct coord *rot) { struct player *player = g_Vars.currentplayer; @@ -30368,7 +30368,7 @@ void func0f0a94d0(u32 operation, struct coord *pos, struct coord *rot) } } -void currentPlayerSetGunAmmoVisible(u32 reason, bool enable) +void bgunSetGunAmmoVisible(u32 reason, bool enable) { if (enable) { g_Vars.currentplayer->gunammooff &= ~reason; @@ -30417,19 +30417,19 @@ struct ammotype g_AmmoTypes[] = { { 10, 0, 0 }, }; -void currentPlayerSetAmmoQuantity(s32 ammotype, s32 quantity) +void bgunSetAmmoQuantity(s32 ammotype, s32 quantity) { struct player *player = g_Vars.currentplayer; - s32 weaponnum = handGetWeaponNum(HAND_RIGHT); + s32 weaponnum = bgunGetWeaponNum(HAND_RIGHT); s32 funcnum = -1; s32 magamount; // Check if this ammo type applies to the player's equipped weapon - if (weaponGetAmmoType(weaponnum, FUNC_PRIMARY) == ammotype) { + if (bgunGetAmmoTypeForWeapon(weaponnum, FUNC_PRIMARY) == ammotype) { funcnum = FUNC_PRIMARY; } - if (weaponGetAmmoType(weaponnum, FUNC_SECONDARY) == ammotype) { + if (bgunGetAmmoTypeForWeapon(weaponnum, FUNC_SECONDARY) == ammotype) { funcnum = FUNC_SECONDARY; } @@ -30459,7 +30459,7 @@ void currentPlayerSetAmmoQuantity(s32 ammotype, s32 quantity) } } -s32 currentPlayerGetAmmoCountWithCheck(s32 ammotype) +s32 bgunGetAmmoCountWithCheck(s32 ammotype) { s32 i; s32 j; @@ -30479,7 +30479,7 @@ s32 currentPlayerGetAmmoCountWithCheck(s32 ammotype) return total; } -s32 currentPlayerGetAmmoCount(s32 ammotype) +s32 bgunGetAmmoCount(s32 ammotype) { s32 i; s32 j; @@ -30499,12 +30499,12 @@ s32 currentPlayerGetAmmoCount(s32 ammotype) return total; } -s32 ammotypeGetMaxCapacity(u32 ammotype) +s32 bgunGetCapacityByAmmotype(u32 ammotype) { return g_AmmoTypes[ammotype].capacity; } -bool ammotypeAllowsUnlimitedAmmo(u32 ammotype) +bool bgunAmmotypeAllowsUnlimitedAmmo(u32 ammotype) { switch (ammotype) { case AMMOTYPE_REMOTE_MINE: @@ -30534,7 +30534,7 @@ bool ammotypeAllowsUnlimitedAmmo(u32 ammotype) return true; } -void currentPlayerGiveUnlimitedAmmo(bool force) +void bgunGiveMaxAmmo(bool force) { s32 i; @@ -30542,16 +30542,16 @@ void currentPlayerGiveUnlimitedAmmo(bool force) bool give = true; if (!force) { - give = ammotypeAllowsUnlimitedAmmo(i); + give = bgunAmmotypeAllowsUnlimitedAmmo(i); } if (give) { - currentPlayerSetAmmoQuantity(i, g_AmmoTypes[i].capacity); + bgunSetAmmoQuantity(i, g_AmmoTypes[i].capacity); } } } -u32 weaponGetAmmoType(u32 weaponnum, u32 func) +u32 bgunGetAmmoTypeForWeapon(u32 weaponnum, u32 func) { struct weapon *weapon = weaponFindById(weaponnum); @@ -30566,7 +30566,7 @@ u32 weaponGetAmmoType(u32 weaponnum, u32 func) return weapon->ammos[func]->type; } -s32 currentPlayerGetAmmoQuantityForWeapon(u32 weaponnum, u32 func) +s32 bgunGetAmmoQtyForWeapon(u32 weaponnum, u32 func) { struct weapon *weapon = weaponFindById(weaponnum); @@ -30574,14 +30574,14 @@ s32 currentPlayerGetAmmoQuantityForWeapon(u32 weaponnum, u32 func) struct inventory_ammo *ammo = weapon->ammos[func]; if (ammo) { - return currentPlayerGetAmmoCountWithCheck(ammo->type); + return bgunGetAmmoCountWithCheck(ammo->type); } } return 0; } -void currentPlayerSetAmmoQtyForWeapon(u32 weaponnum, u32 func, u32 quantity) +void bgunSetAmmoQtyForWeapon(u32 weaponnum, u32 func, u32 quantity) { struct weapon *weapon = weaponFindById(weaponnum); @@ -30589,12 +30589,12 @@ void currentPlayerSetAmmoQtyForWeapon(u32 weaponnum, u32 func, u32 quantity) struct inventory_ammo *ammo = weapon->ammos[func]; if (ammo) { - currentPlayerSetAmmoQuantity(ammo->type, quantity); + bgunSetAmmoQuantity(ammo->type, quantity); } } } -s32 weaponGetAmmoCapacity(s32 weaponnum, s32 func) +s32 bgunGetAmmoCapacityForWeapon(s32 weaponnum, s32 func) { struct weapon *weapon = weaponFindById(weaponnum); struct inventory_ammo *ammo = weapon->ammos[func]; @@ -30606,7 +30606,7 @@ s32 weaponGetAmmoCapacity(s32 weaponnum, s32 func) return 0; } -Gfx *handRenderHudString(Gfx *gdl, char *text, s32 x, bool halign, s32 y, s32 valign, u32 colour) +Gfx *bgunRenderHudString(Gfx *gdl, char *text, s32 x, bool halign, s32 y, s32 valign, u32 colour) { s32 x1 = 0; s32 y1 = 0; @@ -30648,17 +30648,17 @@ Gfx *handRenderHudString(Gfx *gdl, char *text, s32 x, bool halign, s32 y, s32 va return gdl; } -Gfx *handRenderHudInteger(Gfx *gdl, s32 value, 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) { char buffer[12]; sprintf(buffer, "%d\n", value); - gdl = handRenderHudString(gdl, buffer, x, halign, y, valign, colour); + gdl = bgunRenderHudString(gdl, buffer, x, halign, y, valign, colour); return gdl; } -void abmagReset(struct abmag *abmag) +void bgunResetAbmag(struct abmag *abmag) { abmag->loadedammo = 0; abmag->change = 0; @@ -30668,7 +30668,7 @@ void abmagReset(struct abmag *abmag) #if VERSION >= VERSION_PAL_FINAL GLOBAL_ASM( -glabel func0f0a9da8 +glabel bgun0f0a9da8 /* f0aa1f4: 28c10015 */ slti $at,$a2,0x15 /* f0aa1f8: 54200023 */ bnezl $at,.PF0f0aa288 /* f0aa1fc: 80880005 */ lb $t0,0x5($a0) @@ -30826,7 +30826,7 @@ glabel func0f0a9da8 ); #else GLOBAL_ASM( -glabel func0f0a9da8 +glabel bgun0f0a9da8 /* f0a9da8: 28c10015 */ slti $at,$a2,0x15 /* f0a9dac: 54200023 */ bnezl $at,.L0f0a9e3c /* f0a9db0: 80880005 */ lb $t0,0x5($a0) @@ -30982,7 +30982,7 @@ glabel func0f0a9da8 #if VERSION >= VERSION_PAL_FINAL GLOBAL_ASM( -glabel handRenderHudGauge +glabel bgunRenderHudGauge /* f0aa41c: 27bdff28 */ addiu $sp,$sp,-216 /* f0aa420: afbe0038 */ sw $s8,0x38($sp) /* f0aa424: afa600e0 */ sw $a2,0xe0($sp) @@ -31006,7 +31006,7 @@ glabel handRenderHudGauge /* f0aa46c: 8fa500f0 */ lw $a1,0xf0($sp) /* f0aa470: 8fa400ec */ lw $a0,0xec($sp) /* f0aa474: afb000bc */ sw $s0,0xbc($sp) -/* f0aa478: 0fc2a87d */ jal func0f0a9da8 +/* f0aa478: 0fc2a87d */ jal bgun0f0a9da8 /* f0aa47c: 02003025 */ move $a2,$s0 /* f0aa480: 2a010015 */ slti $at,$s0,0x15 /* f0aa484: 8fa800ec */ lw $t0,0xec($sp) @@ -31605,7 +31605,7 @@ glabel handRenderHudGauge ); #else GLOBAL_ASM( -glabel handRenderHudGauge +glabel bgunRenderHudGauge /* f0a9fc0: 27bdff30 */ addiu $sp,$sp,-208 /* f0a9fc4: afa600d8 */ sw $a2,0xd8($sp) /* f0a9fc8: 8faf00d8 */ lw $t7,0xd8($sp) @@ -31630,7 +31630,7 @@ glabel handRenderHudGauge /* f0aa014: 8fa500e8 */ lw $a1,0xe8($sp) /* f0aa018: afb100b4 */ sw $s1,0xb4($sp) /* f0aa01c: 02203025 */ or $a2,$s1,$zero -/* f0aa020: 0fc2a76a */ jal func0f0a9da8 +/* f0aa020: 0fc2a76a */ jal bgun0f0a9da8 /* f0aa024: 02e02025 */ or $a0,$s7,$zero /* f0aa028: 2a210015 */ slti $at,$s1,0x15 /* f0aa02c: 8fa900e0 */ lw $t1,0xe0($sp) @@ -32221,7 +32221,7 @@ glabel handRenderHudGauge // - There are several callee-save registers (s2, s5, s8) which can either be // variables or used by the compiler to hold expressions that are used several // times. Below, s2 is a variable while s5 and s8 are inline expressions. -//Gfx *handRenderHudGauge(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, struct abmag *abmag, s32 remaining, s32 capacity, u32 emptycolour, u32 filledcolour, bool flip) +//Gfx *bgunRenderHudGauge(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, struct abmag *abmag, s32 remaining, s32 capacity, u32 emptycolour, u32 filledcolour, bool flip) //{ // s32 gaugeheight = y2 - y1; // s2 // s32 unitheight; @@ -32233,7 +32233,7 @@ glabel handRenderHudGauge // s32 i; // // // 020 -// func0f0a9da8(abmag, remaining, capacity, gaugeheight); +// bgun0f0a9da8(abmag, remaining, capacity, gaugeheight); // // if (capacity > 20) { // // Use a single merged bar @@ -32473,7 +32473,7 @@ glabel handRenderHudGauge #if VERSION >= VERSION_PAL_FINAL GLOBAL_ASM( -glabel handRenderHud +glabel bgunRenderHud /* f0aad34: 3c0e800a */ lui $t6,0x800a /* f0aad38: 8dcea794 */ lw $t6,-0x586c($t6) /* f0aad3c: 27bdfed0 */ addiu $sp,$sp,-304 @@ -32640,14 +32640,14 @@ glabel handRenderHud /* f0aaf84: afa2005c */ sw $v0,0x5c($sp) /* f0aaf88: 27a400dc */ addiu $a0,$sp,0xdc /* f0aaf8c: 00002825 */ move $a1,$zero -/* f0aaf90: 0fc26333 */ jal handGetWeaponInfo +/* f0aaf90: 0fc26333 */ jal bgunGetWeaponInfo /* f0aaf94: afb800f0 */ sw $t8,0xf0($sp) -/* f0aaf98: 0fc2a432 */ jal currentPlayerIsUsingSecondaryFunction +/* f0aaf98: 0fc2a432 */ jal bgunIsUsingSecondaryFunction /* f0aaf9c: 00000000 */ nop /* f0aafa0: afa200e8 */ sw $v0,0xe8($sp) /* f0aafa4: 00402025 */ move $a0,$v0 /* f0aafa8: 27a500dc */ addiu $a1,$sp,0xdc -/* f0aafac: 0fc26348 */ jal func0f098ca0 +/* f0aafac: 0fc26348 */ jal bgun0f098ca0 /* f0aafb0: 8fa6005c */ lw $a2,0x5c($sp) /* f0aafb4: 04400003 */ bltz $v0,.PF0f0aafc4 /* f0aafb8: 00000000 */ nop @@ -33218,13 +33218,13 @@ glabel handRenderHud /* f0ab800: 8fa4012c */ lw $a0,0x12c($sp) /* f0ab804: 11f9000d */ beq $t7,$t9,.PF0f0ab83c /* f0ab808: 24841568 */ addiu $a0,$a0,0x1568 -/* f0ab80c: 0fc2a878 */ jal abmagReset +/* f0ab80c: 0fc2a878 */ jal bgunResetAbmag /* f0ab810: afaa0058 */ sw $t2,0x58($sp) /* f0ab814: 8fa4005c */ lw $a0,0x5c($sp) -/* f0ab818: 0fc2a878 */ jal abmagReset +/* f0ab818: 0fc2a878 */ jal bgunResetAbmag /* f0ab81c: 2484078c */ addiu $a0,$a0,0x78c /* f0ab820: 8faa0058 */ lw $t2,0x58($sp) -/* f0ab824: 0fc2a878 */ jal abmagReset +/* f0ab824: 0fc2a878 */ jal bgunResetAbmag /* f0ab828: 2544005c */ addiu $a0,$t2,0x5c /* f0ab82c: 8faa0058 */ lw $t2,0x58($sp) /* f0ab830: 8fb80110 */ lw $t8,0x110($sp) @@ -33344,7 +33344,7 @@ glabel handRenderHud /* f0ab9dc: afa00028 */ sw $zero,0x28($sp) /* f0ab9e0: afa8001c */ sw $t0,0x1c($sp) /* f0ab9e4: 24c6fffd */ addiu $a2,$a2,-3 -/* f0ab9e8: 0fc2a907 */ jal handRenderHudGauge +/* f0ab9e8: 0fc2a907 */ jal bgunRenderHudGauge /* f0ab9ec: afaf0018 */ sw $t7,0x18($sp) /* f0ab9f0: 8fa3004c */ lw $v1,0x4c($sp) /* f0ab9f4: 8fb80048 */ lw $t8,0x48($sp) @@ -33358,7 +33358,7 @@ glabel handRenderHud /* f0aba14: afa00014 */ sw $zero,0x14($sp) /* f0aba18: 00402025 */ move $a0,$v0 /* f0aba1c: 24070001 */ li $a3,0x1 -/* f0aba20: 0fc2a85e */ jal handRenderHudInteger +/* f0aba20: 0fc2a85e */ jal bgunRenderHudInteger /* f0aba24: 24c60002 */ addiu $a2,$a2,0x2 /* f0aba28: 8faa0058 */ lw $t2,0x58($sp) /* f0aba2c: afa20130 */ sw $v0,0x130($sp) @@ -33483,7 +33483,7 @@ glabel handRenderHud /* f0abbe8: afa3001c */ sw $v1,0x1c($sp) /* f0abbec: 24c6fffd */ addiu $a2,$a2,-3 /* f0abbf0: 8fa40130 */ lw $a0,0x130($sp) -/* f0abbf4: 0fc2a907 */ jal handRenderHudGauge +/* f0abbf4: 0fc2a907 */ jal bgunRenderHudGauge /* f0abbf8: afb90018 */ sw $t9,0x18($sp) /* f0abbfc: 8fa80038 */ lw $t0,0x38($sp) /* f0abc00: 8fa60100 */ lw $a2,0x100($sp) @@ -33496,7 +33496,7 @@ glabel handRenderHud /* f0abc1c: 00402025 */ move $a0,$v0 /* f0abc20: 00003825 */ move $a3,$zero /* f0abc24: 24c6fffe */ addiu $a2,$a2,-2 -/* f0abc28: 0fc2a85e */ jal handRenderHudInteger +/* f0abc28: 0fc2a85e */ jal bgunRenderHudInteger /* f0abc2c: afb90010 */ sw $t9,0x10($sp) /* f0abc30: 8fa80038 */ lw $t0,0x38($sp) /* f0abc34: 8faa0058 */ lw $t2,0x58($sp) @@ -33564,7 +33564,7 @@ glabel handRenderHud /* f0abd18: afab001c */ sw $t3,0x1c($sp) /* f0abd1c: afa60048 */ sw $a2,0x48($sp) /* f0abd20: afa9009c */ sw $t1,0x9c($sp) -/* f0abd24: 0fc2a907 */ jal handRenderHudGauge +/* f0abd24: 0fc2a907 */ jal bgunRenderHudGauge /* f0abd28: afae0010 */ sw $t6,0x10($sp) /* f0abd2c: 8fae0048 */ lw $t6,0x48($sp) /* f0abd30: 3c1800ff */ lui $t8,0xff @@ -33576,7 +33576,7 @@ glabel handRenderHud /* f0abd48: 8fa5009c */ lw $a1,0x9c($sp) /* f0abd4c: 8fa60054 */ lw $a2,0x54($sp) /* f0abd50: 00003825 */ move $a3,$zero -/* f0abd54: 0fc2a85e */ jal handRenderHudInteger +/* f0abd54: 0fc2a85e */ jal bgunRenderHudInteger /* f0abd58: afa00014 */ sw $zero,0x14($sp) /* f0abd5c: afa20130 */ sw $v0,0x130($sp) /* f0abd60: 8fb9005c */ lw $t9,0x5c($sp) @@ -33719,7 +33719,7 @@ glabel handRenderHud /* f0abf50: 00003825 */ move $a3,$zero /* f0abf54: afa00014 */ sw $zero,0x14($sp) /* f0abf58: 24c6fffe */ addiu $a2,$a2,-2 -/* f0abf5c: 0fc2a7ed */ jal handRenderHudString +/* f0abf5c: 0fc2a7ed */ jal bgunRenderHudString /* f0abf60: afae0010 */ sw $t6,0x10($sp) /* f0abf64: afa20130 */ sw $v0,0x130($sp) .PF0f0abf68: @@ -33736,7 +33736,7 @@ glabel handRenderHud ); #elif VERSION >= VERSION_NTSC_1_0 GLOBAL_ASM( -glabel handRenderHud +glabel bgunRenderHud /* f0aa86c: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) /* f0aa870: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0aa874: 27bdfed0 */ addiu $sp,$sp,-304 @@ -33907,14 +33907,14 @@ glabel handRenderHud /* f0aaac4: afa2005c */ sw $v0,0x5c($sp) /* f0aaac8: 27a400dc */ addiu $a0,$sp,0xdc /* f0aaacc: 00002825 */ or $a1,$zero,$zero -/* f0aaad0: 0fc26313 */ jal handGetWeaponInfo +/* f0aaad0: 0fc26313 */ jal bgunGetWeaponInfo /* f0aaad4: afb900f0 */ sw $t9,0xf0($sp) -/* f0aaad8: 0fc2a31f */ jal currentPlayerIsUsingSecondaryFunction +/* f0aaad8: 0fc2a31f */ jal bgunIsUsingSecondaryFunction /* f0aaadc: 00000000 */ nop /* f0aaae0: afa200e8 */ sw $v0,0xe8($sp) /* f0aaae4: 00402025 */ or $a0,$v0,$zero /* f0aaae8: 27a500dc */ addiu $a1,$sp,0xdc -/* f0aaaec: 0fc26328 */ jal func0f098ca0 +/* f0aaaec: 0fc26328 */ jal bgun0f098ca0 /* f0aaaf0: 8fa6005c */ lw $a2,0x5c($sp) /* f0aaaf4: 04400003 */ bltz $v0,.L0f0aab04 /* f0aaaf8: 00000000 */ nop @@ -34486,13 +34486,13 @@ glabel handRenderHud /* f0ab344: 8fa4012c */ lw $a0,0x12c($sp) /* f0ab348: 132f000d */ beq $t9,$t7,.L0f0ab380 /* f0ab34c: 24841568 */ addiu $a0,$a0,0x1568 -/* f0ab350: 0fc2a765 */ jal abmagReset +/* f0ab350: 0fc2a765 */ jal bgunResetAbmag /* f0ab354: afaa0058 */ sw $t2,0x58($sp) /* f0ab358: 8fa4005c */ lw $a0,0x5c($sp) -/* f0ab35c: 0fc2a765 */ jal abmagReset +/* f0ab35c: 0fc2a765 */ jal bgunResetAbmag /* f0ab360: 2484078c */ addiu $a0,$a0,0x78c /* f0ab364: 8faa0058 */ lw $t2,0x58($sp) -/* f0ab368: 0fc2a765 */ jal abmagReset +/* f0ab368: 0fc2a765 */ jal bgunResetAbmag /* f0ab36c: 2544005c */ addiu $a0,$t2,0x5c /* f0ab370: 8faa0058 */ lw $t2,0x58($sp) /* f0ab374: 8fae0110 */ lw $t6,0x110($sp) @@ -34612,7 +34612,7 @@ glabel handRenderHud /* f0ab520: afa00028 */ sw $zero,0x28($sp) /* f0ab524: afa8001c */ sw $t0,0x1c($sp) /* f0ab528: 24c6fffd */ addiu $a2,$a2,-3 -/* f0ab52c: 0fc2a7f0 */ jal handRenderHudGauge +/* f0ab52c: 0fc2a7f0 */ jal bgunRenderHudGauge /* f0ab530: afb90018 */ sw $t9,0x18($sp) /* f0ab534: 8fa3004c */ lw $v1,0x4c($sp) /* f0ab538: 8fae0048 */ lw $t6,0x48($sp) @@ -34626,7 +34626,7 @@ glabel handRenderHud /* f0ab558: afa00014 */ sw $zero,0x14($sp) /* f0ab55c: 00402025 */ or $a0,$v0,$zero /* f0ab560: 24070001 */ addiu $a3,$zero,0x1 -/* f0ab564: 0fc2a74b */ jal handRenderHudInteger +/* f0ab564: 0fc2a74b */ jal bgunRenderHudInteger /* f0ab568: 24c60002 */ addiu $a2,$a2,0x2 /* f0ab56c: 8faa0058 */ lw $t2,0x58($sp) /* f0ab570: afa20130 */ sw $v0,0x130($sp) @@ -34751,7 +34751,7 @@ glabel handRenderHud /* f0ab72c: afa3001c */ sw $v1,0x1c($sp) /* f0ab730: 24c6fffd */ addiu $a2,$a2,-3 /* f0ab734: 8fa40130 */ lw $a0,0x130($sp) -/* f0ab738: 0fc2a7f0 */ jal handRenderHudGauge +/* f0ab738: 0fc2a7f0 */ jal bgunRenderHudGauge /* f0ab73c: afaf0018 */ sw $t7,0x18($sp) /* f0ab740: 8fa80038 */ lw $t0,0x38($sp) /* f0ab744: 8fa60100 */ lw $a2,0x100($sp) @@ -34764,7 +34764,7 @@ glabel handRenderHud /* f0ab760: 00402025 */ or $a0,$v0,$zero /* f0ab764: 00003825 */ or $a3,$zero,$zero /* f0ab768: 24c6fffe */ addiu $a2,$a2,-2 -/* f0ab76c: 0fc2a74b */ jal handRenderHudInteger +/* f0ab76c: 0fc2a74b */ jal bgunRenderHudInteger /* f0ab770: afaf0010 */ sw $t7,0x10($sp) /* f0ab774: 8fa80038 */ lw $t0,0x38($sp) /* f0ab778: 8faa0058 */ lw $t2,0x58($sp) @@ -34832,7 +34832,7 @@ glabel handRenderHud /* f0ab85c: afab001c */ sw $t3,0x1c($sp) /* f0ab860: afa60048 */ sw $a2,0x48($sp) /* f0ab864: afa9009c */ sw $t1,0x9c($sp) -/* f0ab868: 0fc2a7f0 */ jal handRenderHudGauge +/* f0ab868: 0fc2a7f0 */ jal bgunRenderHudGauge /* f0ab86c: afb80010 */ sw $t8,0x10($sp) /* f0ab870: 8fb80048 */ lw $t8,0x48($sp) /* f0ab874: 3c0e00ff */ lui $t6,0xff @@ -34844,7 +34844,7 @@ glabel handRenderHud /* f0ab88c: 8fa5009c */ lw $a1,0x9c($sp) /* f0ab890: 8fa60054 */ lw $a2,0x54($sp) /* f0ab894: 00003825 */ or $a3,$zero,$zero -/* f0ab898: 0fc2a74b */ jal handRenderHudInteger +/* f0ab898: 0fc2a74b */ jal bgunRenderHudInteger /* f0ab89c: afa00014 */ sw $zero,0x14($sp) /* f0ab8a0: afa20130 */ sw $v0,0x130($sp) /* f0ab8a4: 8faf005c */ lw $t7,0x5c($sp) @@ -34987,7 +34987,7 @@ glabel handRenderHud /* f0aba94: 00003825 */ or $a3,$zero,$zero /* f0aba98: afa00014 */ sw $zero,0x14($sp) /* f0aba9c: 24c6fffe */ addiu $a2,$a2,-2 -/* f0abaa0: 0fc2a6da */ jal handRenderHudString +/* f0abaa0: 0fc2a6da */ jal bgunRenderHudString /* f0abaa4: afb80010 */ sw $t8,0x10($sp) /* f0abaa8: afa20130 */ sw $v0,0x130($sp) .L0f0abaac: @@ -35004,7 +35004,7 @@ glabel handRenderHud ); #else GLOBAL_ASM( -glabel handRenderHud +glabel bgunRenderHud /* f0a860c: 3c0e800a */ lui $t6,0x800a /* f0a8610: 8dcee944 */ lw $t6,-0x16bc($t6) /* f0a8614: 27bdfee0 */ addiu $sp,$sp,-288 @@ -35737,13 +35737,13 @@ glabel handRenderHud /* f0a90a4: 8fa4011c */ lw $a0,0x11c($sp) /* f0a90a8: 11f9000d */ beq $t7,$t9,.NB0f0a90e0 /* f0a90ac: 24841568 */ addiu $a0,$a0,0x1568 -/* f0a90b0: 0fc29ecd */ jal abmagReset +/* f0a90b0: 0fc29ecd */ jal bgunResetAbmag /* f0a90b4: afaa0058 */ sw $t2,0x58($sp) /* f0a90b8: 8fa4005c */ lw $a0,0x5c($sp) -/* f0a90bc: 0fc29ecd */ jal abmagReset +/* f0a90bc: 0fc29ecd */ jal bgunResetAbmag /* f0a90c0: 2484078c */ addiu $a0,$a0,0x78c /* f0a90c4: 8faa0058 */ lw $t2,0x58($sp) -/* f0a90c8: 0fc29ecd */ jal abmagReset +/* f0a90c8: 0fc29ecd */ jal bgunResetAbmag /* f0a90cc: 2544005c */ addiu $a0,$t2,0x5c /* f0a90d0: 8faa0058 */ lw $t2,0x58($sp) /* f0a90d4: 8fae0100 */ lw $t6,0x100($sp) @@ -35863,7 +35863,7 @@ glabel handRenderHud /* f0a9280: afa00028 */ sw $zero,0x28($sp) /* f0a9284: afa8001c */ sw $t0,0x1c($sp) /* f0a9288: 24c6fffd */ addiu $a2,$a2,-3 -/* f0a928c: 0fc29f58 */ jal handRenderHudGauge +/* f0a928c: 0fc29f58 */ jal bgunRenderHudGauge /* f0a9290: afaf0018 */ sw $t7,0x18($sp) /* f0a9294: 8fa3004c */ lw $v1,0x4c($sp) /* f0a9298: 8fae0048 */ lw $t6,0x48($sp) @@ -35877,7 +35877,7 @@ glabel handRenderHud /* f0a92b8: afa00014 */ sw $zero,0x14($sp) /* f0a92bc: 00402025 */ or $a0,$v0,$zero /* f0a92c0: 24070001 */ addiu $a3,$zero,0x1 -/* f0a92c4: 0fc29eb3 */ jal handRenderHudInteger +/* f0a92c4: 0fc29eb3 */ jal bgunRenderHudInteger /* f0a92c8: 24c60002 */ addiu $a2,$a2,0x2 /* f0a92cc: 8faa0058 */ lw $t2,0x58($sp) /* f0a92d0: afa20120 */ sw $v0,0x120($sp) @@ -36002,7 +36002,7 @@ glabel handRenderHud /* f0a948c: afa3001c */ sw $v1,0x1c($sp) /* f0a9490: 24c6fffd */ addiu $a2,$a2,-3 /* f0a9494: 8fa40120 */ lw $a0,0x120($sp) -/* f0a9498: 0fc29f58 */ jal handRenderHudGauge +/* f0a9498: 0fc29f58 */ jal bgunRenderHudGauge /* f0a949c: afb90018 */ sw $t9,0x18($sp) /* f0a94a0: 8fa80038 */ lw $t0,0x38($sp) /* f0a94a4: 8fa600f0 */ lw $a2,0xf0($sp) @@ -36015,7 +36015,7 @@ glabel handRenderHud /* f0a94c0: 00402025 */ or $a0,$v0,$zero /* f0a94c4: 00003825 */ or $a3,$zero,$zero /* f0a94c8: 24c6fffe */ addiu $a2,$a2,-2 -/* f0a94cc: 0fc29eb3 */ jal handRenderHudInteger +/* f0a94cc: 0fc29eb3 */ jal bgunRenderHudInteger /* f0a94d0: afb90010 */ sw $t9,0x10($sp) /* f0a94d4: 8fa80038 */ lw $t0,0x38($sp) /* f0a94d8: 8faa0058 */ lw $t2,0x58($sp) @@ -36083,7 +36083,7 @@ glabel handRenderHud /* f0a95bc: afab001c */ sw $t3,0x1c($sp) /* f0a95c0: afa60048 */ sw $a2,0x48($sp) /* f0a95c4: afa9009c */ sw $t1,0x9c($sp) -/* f0a95c8: 0fc29f58 */ jal handRenderHudGauge +/* f0a95c8: 0fc29f58 */ jal bgunRenderHudGauge /* f0a95cc: afb80010 */ sw $t8,0x10($sp) /* f0a95d0: 8fb80048 */ lw $t8,0x48($sp) /* f0a95d4: 3c0e00ff */ lui $t6,0xff @@ -36095,7 +36095,7 @@ glabel handRenderHud /* f0a95ec: 8fa5009c */ lw $a1,0x9c($sp) /* f0a95f0: 8fa60054 */ lw $a2,0x54($sp) /* f0a95f4: 00003825 */ or $a3,$zero,$zero -/* f0a95f8: 0fc29eb3 */ jal handRenderHudInteger +/* f0a95f8: 0fc29eb3 */ jal bgunRenderHudInteger /* f0a95fc: afa00014 */ sw $zero,0x14($sp) /* f0a9600: afa20120 */ sw $v0,0x120($sp) /* f0a9604: 8fb9005c */ lw $t9,0x5c($sp) @@ -36238,7 +36238,7 @@ glabel handRenderHud /* f0a97f4: 00003825 */ or $a3,$zero,$zero /* f0a97f8: afa00014 */ sw $zero,0x14($sp) /* f0a97fc: 24c6fffe */ addiu $a2,$a2,-2 -/* f0a9800: 0fc29e42 */ jal handRenderHudString +/* f0a9800: 0fc29e42 */ jal bgunRenderHudString /* f0a9804: afb80010 */ sw $t8,0x10($sp) /* f0a9808: afa20120 */ sw $v0,0x120($sp) .NB0f0a980c: @@ -36259,7 +36259,7 @@ const char var7f1ac18c[] = "%02d:%02d:%02d\n"; const char var7f1ac19c[] = "%02d:%02d\n"; // Mismatch: regalloc near da8 -//Gfx *handRenderHud(Gfx *gdl) +//Gfx *bgunRenderHud(Gfx *gdl) //{ // struct player *player = g_Vars.currentplayer; // 12c // s32 bottom = viGetViewTop() + viGetViewHeight() - 13; // 128 @@ -36369,10 +36369,10 @@ const char var7f1ac19c[] = "%02d:%02d\n"; // fnfaderinc = PALUP(g_Vars.lvupdate240 * 2); // //#if VERSION >= VERSION_NTSC_1_0 -// handGetWeaponInfo(&info, HAND_RIGHT); -// tmpfuncnum = currentPlayerIsUsingSecondaryFunction(); +// bgunGetWeaponInfo(&info, HAND_RIGHT); +// tmpfuncnum = bgunIsUsingSecondaryFunction(); // -// if (func0f098ca0(tmpfuncnum, &info, hand) >= 0) { +// if (bgun0f098ca0(tmpfuncnum, &info, hand) >= 0) { // funcnum = tmpfuncnum; // } //#endif @@ -36573,9 +36573,9 @@ const char var7f1ac19c[] = "%02d:%02d\n"; // } // // if (ammoindex != ctrl->lastmag) { -// abmagReset(&player->hands[HAND_LEFT].abmag); -// abmagReset(&hand->abmag); -// abmagReset(&ctrl->abmag); +// bgunResetAbmag(&player->hands[HAND_LEFT].abmag); +// bgunResetAbmag(&hand->abmag); +// bgunResetAbmag(&ctrl->abmag); // ctrl->lastmag = ammoindex; // } // @@ -36593,11 +36593,11 @@ const char var7f1ac19c[] = "%02d:%02d\n"; // } // // if (lefthand->clipsizes[ammoindex] > 0 && (weapon->ammos[ammoindex]->flags & 2) == 0) { -// gdl = handRenderHudGauge(gdl, +// gdl = bgunRenderHudGauge(gdl, // xpos, bottom - reserveheight - clipheight - 3, xpos + barwidth, bottom - reserveheight - 3, // &lefthand->abmag, lefthand->loadedammo[ammoindex], lefthand->clipsizes[ammoindex], // 0x00300080, 0x00ff0040, false); -// gdl = handRenderHudInteger(gdl, lefthand->loadedammo[ammoindex], xpos + barwidth + 2, true, +// gdl = bgunRenderHudInteger(gdl, lefthand->loadedammo[ammoindex], xpos + barwidth + 2, true, // bottom - reserveheight - 8, 0, 0x00ff00a0); // } // } @@ -36630,10 +36630,10 @@ const char var7f1ac19c[] = "%02d:%02d\n"; // if (hand->clipsizes[ammoindex] > 0 // && weapon->ammos[ammoindex] != NULL // && (weapon->ammos[ammoindex]->flags & 2) == 0) { -// gdl = handRenderHudGauge(gdl, xpos, bottom - reserveheight - clipheight - 3, xpos + barwidth, +// gdl = bgunRenderHudGauge(gdl, xpos, bottom - reserveheight - clipheight - 3, xpos + barwidth, // bottom - reserveheight - 3, &hand->abmag, hand->loadedammo[ammoindex], hand->clipsizes[ammoindex], // 0x00300080, 0x00ff0040, false); -// gdl = handRenderHudInteger(gdl, hand->loadedammo[ammoindex], xpos - 2, false, +// gdl = bgunRenderHudInteger(gdl, hand->loadedammo[ammoindex], xpos - 2, false, // bottom - reserveheight - 8, 0, 0x00ff00a0); // } // @@ -36653,10 +36653,10 @@ const char var7f1ac19c[] = "%02d:%02d\n"; // } // } // -// gdl = handRenderHudGauge(gdl, xpos, bottom - reserveheight, xpos + barwidth, +// gdl = bgunRenderHudGauge(gdl, xpos, bottom - reserveheight, xpos + barwidth, // bottom, &ctrl->abmag, ammototal, g_AmmoTypes[ammotype].capacity, // 0x00403080, 0x00ffc040, true); -// gdl = handRenderHudInteger(gdl, ammototal, xpos - 2, false, bottom - reserveheight + 1, 0, 0x00ffc0a0); +// gdl = bgunRenderHudInteger(gdl, ammototal, xpos - 2, false, bottom - reserveheight + 1, 0, 0x00ffc0a0); // } // // // 8b8 @@ -36679,7 +36679,7 @@ const char var7f1ac19c[] = "%02d:%02d\n"; // } // // // a7c -// gdl = handRenderHudString(gdl, text, xpos + barwidth - 2, false, bottom - reserveheight + 1, 0, 0x00ffc0a0); +// gdl = bgunRenderHudString(gdl, text, xpos + barwidth - 2, false, bottom - reserveheight + 1, 0, 0x00ffc0a0); // } // } // @@ -36690,7 +36690,7 @@ const char var7f1ac19c[] = "%02d:%02d\n"; // return gdl; //} -void cboostAdd(s32 amount) +void bgunAddBoostc(s32 amount) { g_Vars.speedpilltime += amount; @@ -36707,7 +36707,7 @@ void cboostAdd(s32 amount) g_Vars.speedpillwant = true; } -void cboostSubtract(s32 amount) +void bgunSubtractBoost(s32 amount) { g_Vars.speedpilltime -= amount; @@ -36717,25 +36717,25 @@ void cboostSubtract(s32 amount) } } -void cboostBoost(void) +void bgunApplyBoost(void) { if (lvGetSlowMotionType() != SLOWMOTION_OFF) { - cboostSubtract(PALDOWN(1200)); + bgunSubtractBoost(PALDOWN(1200)); } else { - cboostAdd(PALDOWN(600)); + bgunAddBoostc(PALDOWN(600)); } } -void cboostRevert(void) +void bgunRevertBoost(void) { if (lvGetSlowMotionType() != SLOWMOTION_OFF) { - cboostAdd(PALDOWN(1200)); + bgunAddBoostc(PALDOWN(1200)); } else { - cboostSubtract(PALDOWN(600)); + bgunSubtractBoost(PALDOWN(600)); } } -void speedpillTick(void) +void bgunTickBoost(void) { if (g_Vars.speedpillon && g_Vars.speedpilltime > 0 && !g_Vars.in_cutscene) { g_Vars.speedpilltime -= g_Vars.lvupdate240_60; @@ -36747,7 +36747,7 @@ void speedpillTick(void) } } -void currentPlayerSetGunSightVisible(u32 reason, bool visible) +void bgunSetSightVisible(u32 reason, bool visible) { if (visible) { g_Vars.currentplayer->gunsightoff &= ~reason; @@ -36757,7 +36757,7 @@ void currentPlayerSetGunSightVisible(u32 reason, bool visible) g_Vars.currentplayer->gunsightoff |= reason; } -Gfx *func0f0abcb0(Gfx *gdl) +Gfx *bgun0f0abcb0(Gfx *gdl) { if (g_Vars.currentplayer->gunsightoff == false && !g_Vars.currentplayer->mpmenuon) { gdl = sightRender(gdl, true, currentPlayerGetSight()); @@ -36768,7 +36768,7 @@ Gfx *func0f0abcb0(Gfx *gdl) return gdl; } -void func0f0abd30(s32 handnum) +void bgun0f0abd30(s32 handnum) { struct player *player = g_Vars.currentplayer; struct hand *hand = &player->hands[handnum]; @@ -36802,10 +36802,10 @@ void func0f0abd30(s32 handnum) hand->finalmult[1] = 1; if (gunctrl->ammotypes[0] >= 0) { - abmagReset(&hand->abmag); + bgunResetAbmag(&hand->abmag); if (handnum == HAND_RIGHT) { - abmagReset(&gunctrl->abmag); + bgunResetAbmag(&gunctrl->abmag); } gunctrl->lastmag = false; diff --git a/src/game/bondmove.c b/src/game/bondmove.c index 1809d41e4..a027f4b45 100644 --- a/src/game/bondmove.c +++ b/src/game/bondmove.c @@ -11,7 +11,7 @@ #include "game/prop.h" #include "game/atan2f.h" #include "game/game_096ca0.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" @@ -1174,7 +1174,7 @@ glabel var7f1ad8e4 /* f0c8bd4: 0fc549c4 */ jal optionsGetControlMode /* f0c8bd8: 8dc40070 */ lw $a0,0x70($t6) /* f0c8bdc: afa201b0 */ sw $v0,0x1b0($sp) -/* f0c8be0: 0fc2866a */ jal handGetWeaponNum +/* f0c8be0: 0fc2866a */ jal bgunGetWeaponNum /* f0c8be4: 00002025 */ or $a0,$zero,$zero /* f0c8be8: afa201ac */ sw $v0,0x1ac($sp) /* f0c8bec: 00402025 */ or $a0,$v0,$zero @@ -1649,7 +1649,7 @@ glabel var7f1ad8e4 /* f0c9290: 1616ffe7 */ bne $s0,$s6,.L0f0c9230 /* f0c9294: ac69fffc */ sw $t1,-0x4($v1) .L0f0c9298: -/* f0c9298: 0fc2866a */ jal handGetWeaponNum +/* f0c9298: 0fc2866a */ jal bgunGetWeaponNum /* f0c929c: 00002025 */ or $a0,$zero,$zero /* f0c92a0: 24010032 */ addiu $at,$zero,0x32 /* f0c92a4: 54410005 */ bnel $v0,$at,.L0f0c92bc @@ -1936,7 +1936,7 @@ glabel var7f1ad8e4 /* f0c969c: 85a4024e */ lh $a0,0x24e($t5) /* f0c96a0: 04820009 */ bltzl $a0,.L0f0c96c8 /* f0c96a4: 8e450284 */ lw $a1,0x284($s2) -/* f0c96a8: 0fc2a257 */ jal currentPlayerConsiderToggleGunFunction +/* f0c96a8: 0fc2a257 */ jal bgunConsiderToggleGunFunction /* f0c96ac: 00003025 */ or $a2,$zero,$zero /* f0c96b0: 50400005 */ beqzl $v0,.L0f0c96c8 /* f0c96b4: 8e450284 */ lw $a1,0x284($s2) @@ -1951,7 +1951,7 @@ glabel var7f1ad8e4 /* f0c96d4: 14200016 */ bnez $at,.L0f0c9730 /* f0c96d8: 248b0001 */ addiu $t3,$a0,0x1 /* f0c96dc: 00002825 */ or $a1,$zero,$zero -/* f0c96e0: 0fc2a257 */ jal currentPlayerConsiderToggleGunFunction +/* f0c96e0: 0fc2a257 */ jal bgunConsiderToggleGunFunction /* f0c96e4: 00003025 */ or $a2,$zero,$zero /* f0c96e8: 24010001 */ addiu $at,$zero,0x1 /* f0c96ec: 54410005 */ bnel $v0,$at,.L0f0c9704 @@ -1980,7 +1980,7 @@ glabel var7f1ad8e4 .L0f0c973c: /* f0c973c: 1420000e */ bnez $at,.L0f0c9778 /* f0c9740: 00002825 */ or $a1,$zero,$zero -/* f0c9744: 0fc2a257 */ jal currentPlayerConsiderToggleGunFunction +/* f0c9744: 0fc2a257 */ jal bgunConsiderToggleGunFunction /* f0c9748: 00003025 */ or $a2,$zero,$zero /* f0c974c: 1000000b */ b .L0f0c977c /* f0c9750: 26100001 */ addiu $s0,$s0,0x1 @@ -1993,7 +1993,7 @@ glabel var7f1ad8e4 /* f0c9768: 00000000 */ nop /* f0c976c: afae01c0 */ sw $t6,0x1c0($sp) .L0f0c9770: -/* f0c9770: 0fc2a314 */ jal func0f0a8c50 +/* f0c9770: 0fc2a314 */ jal bgun0f0a8c50 /* f0c9774: a4a0024e */ sh $zero,0x24e($a1) .L0f0c9778: /* f0c9778: 26100001 */ addiu $s0,$s0,0x1 @@ -2188,7 +2188,7 @@ glabel var7f1ad8e4 .L0f0c9a20: /* f0c9a20: afa40234 */ sw $a0,0x234($sp) .L0f0c9a24: -/* f0c9a24: 0fc2866a */ jal handGetWeaponNum +/* f0c9a24: 0fc2866a */ jal bgunGetWeaponNum /* f0c9a28: 00002025 */ or $a0,$zero,$zero /* f0c9a2c: 24010016 */ addiu $at,$zero,0x16 /* f0c9a30: 54410011 */ bnel $v0,$at,.L0f0c9a78 @@ -2275,7 +2275,7 @@ glabel var7f1ad8e4 /* f0c9b48: 8e4b0284 */ lw $t3,0x284($s2) /* f0c9b4c: ad600274 */ sw $zero,0x274($t3) .L0f0c9b50: -/* f0c9b50: 0fc2866a */ jal handGetWeaponNum +/* f0c9b50: 0fc2866a */ jal bgunGetWeaponNum /* f0c9b54: 00002025 */ or $a0,$zero,$zero /* f0c9b58: 00402025 */ or $a0,$v0,$zero /* f0c9b5c: 0fc2c5f0 */ jal weaponHasFlag @@ -2437,7 +2437,7 @@ glabel var7f1ad8e4 /* f0c9d90: 1616ffe5 */ bne $s0,$s6,.L0f0c9d28 /* f0c9d94: ac6ffffc */ sw $t7,-0x4($v1) .L0f0c9d98: -/* f0c9d98: 0fc2866a */ jal handGetWeaponNum +/* f0c9d98: 0fc2866a */ jal bgunGetWeaponNum /* f0c9d9c: 00002025 */ or $a0,$zero,$zero /* f0c9da0: 24010032 */ addiu $at,$zero,0x32 /* f0c9da4: 54410005 */ bnel $v0,$at,.L0f0c9dbc @@ -2868,7 +2868,7 @@ glabel var7f1ad8e4 /* f0ca3c4: 8724024e */ lh $a0,0x24e($t9) /* f0ca3c8: 04820009 */ bltzl $a0,.L0f0ca3f0 /* f0ca3cc: 8e450284 */ lw $a1,0x284($s2) -/* f0ca3d0: 0fc2a257 */ jal currentPlayerConsiderToggleGunFunction +/* f0ca3d0: 0fc2a257 */ jal bgunConsiderToggleGunFunction /* f0ca3d4: 00003025 */ or $a2,$zero,$zero /* f0ca3d8: 50400005 */ beqzl $v0,.L0f0ca3f0 /* f0ca3dc: 8e450284 */ lw $a1,0x284($s2) @@ -2883,7 +2883,7 @@ glabel var7f1ad8e4 /* f0ca3fc: 14200016 */ bnez $at,.L0f0ca458 /* f0ca400: 248f0001 */ addiu $t7,$a0,0x1 /* f0ca404: 00002825 */ or $a1,$zero,$zero -/* f0ca408: 0fc2a257 */ jal currentPlayerConsiderToggleGunFunction +/* f0ca408: 0fc2a257 */ jal bgunConsiderToggleGunFunction /* f0ca40c: 00003025 */ or $a2,$zero,$zero /* f0ca410: 24010001 */ addiu $at,$zero,0x1 /* f0ca414: 54410005 */ bnel $v0,$at,.L0f0ca42c @@ -2912,7 +2912,7 @@ glabel var7f1ad8e4 /* f0ca460: 2881fffe */ slti $at,$a0,-2 /* f0ca464: 1420000e */ bnez $at,.L0f0ca4a0 /* f0ca468: 00002825 */ or $a1,$zero,$zero -/* f0ca46c: 0fc2a257 */ jal currentPlayerConsiderToggleGunFunction +/* f0ca46c: 0fc2a257 */ jal bgunConsiderToggleGunFunction /* f0ca470: 00003025 */ or $a2,$zero,$zero /* f0ca474: 1000000b */ b .L0f0ca4a4 /* f0ca478: 26100001 */ addiu $s0,$s0,0x1 @@ -2925,7 +2925,7 @@ glabel var7f1ad8e4 /* f0ca490: 00000000 */ nop /* f0ca494: afa801c0 */ sw $t0,0x1c0($sp) .L0f0ca498: -/* f0ca498: 0fc2a314 */ jal func0f0a8c50 +/* f0ca498: 0fc2a314 */ jal bgun0f0a8c50 /* f0ca49c: a4a0024e */ sh $zero,0x24e($a1) .L0f0ca4a0: /* f0ca4a0: 26100001 */ addiu $s0,$s0,0x1 @@ -2949,7 +2949,7 @@ glabel var7f1ad8e4 /* f0ca4e0: 0010682b */ sltu $t5,$zero,$s0 /* f0ca4e4: 01a08025 */ or $s0,$t5,$zero /* f0ca4e8: 01808825 */ or $s1,$t4,$zero -/* f0ca4ec: 0fc2866a */ jal handGetWeaponNum +/* f0ca4ec: 0fc2866a */ jal bgunGetWeaponNum /* f0ca4f0: e7a000bc */ swc1 $f0,0xbc($sp) /* f0ca4f4: 24010016 */ addiu $at,$zero,0x16 /* f0ca4f8: 14410004 */ bne $v0,$at,.L0f0ca50c @@ -3097,7 +3097,7 @@ glabel var7f1ad8e4 .L0f0ca6f0: /* f0ca6f0: afa40234 */ sw $a0,0x234($sp) .L0f0ca6f4: -/* f0ca6f4: 0fc2866a */ jal handGetWeaponNum +/* f0ca6f4: 0fc2866a */ jal bgunGetWeaponNum /* f0ca6f8: 00002025 */ or $a0,$zero,$zero /* f0ca6fc: 24010016 */ addiu $at,$zero,0x16 /* f0ca700: 5441000c */ bnel $v0,$at,.L0f0ca734 @@ -3180,7 +3180,7 @@ glabel var7f1ad8e4 /* f0ca810: 00000000 */ nop /* f0ca814: aca00274 */ sw $zero,0x274($a1) .L0f0ca818: -/* f0ca818: 0fc2866a */ jal handGetWeaponNum +/* f0ca818: 0fc2866a */ jal bgunGetWeaponNum /* f0ca81c: 00002025 */ or $a0,$zero,$zero /* f0ca820: 00402025 */ or $a0,$v0,$zero /* f0ca824: 0fc2c5f0 */ jal weaponHasFlag @@ -3262,27 +3262,27 @@ glabel var7f1ad8e4 /* f0ca934: e7a001f0 */ swc1 $f0,0x1f0($sp) /* f0ca938: e7a401ec */ swc1 $f4,0x1ec($sp) .L0f0ca93c: -/* f0ca93c: 0fc2a34d */ jal handsTick +/* f0ca93c: 0fc2a34d */ jal bgunsTick /* f0ca940: 8fa401bc */ lw $a0,0x1bc($sp) /* f0ca944: 8e580324 */ lw $t8,0x324($s2) /* f0ca948: 5300002b */ beqzl $t8,.L0f0ca9f8 /* f0ca94c: 24040002 */ addiu $a0,$zero,0x2 -/* f0ca950: 0fc2883f */ jal handIsFiring +/* f0ca950: 0fc2883f */ jal bgunIsFiring /* f0ca954: 00002025 */ or $a0,$zero,$zero /* f0ca958: 54400006 */ bnezl $v0,.L0f0ca974 /* f0ca95c: 44805000 */ mtc1 $zero,$f10 -/* f0ca960: 0fc2883f */ jal handIsFiring +/* f0ca960: 0fc2883f */ jal bgunIsFiring /* f0ca964: 24040001 */ addiu $a0,$zero,0x1 /* f0ca968: 50400023 */ beqzl $v0,.L0f0ca9f8 /* f0ca96c: 24040002 */ addiu $a0,$zero,0x2 /* f0ca970: 44805000 */ mtc1 $zero,$f10 .L0f0ca974: /* f0ca974: 00002025 */ or $a0,$zero,$zero -/* f0ca978: 0fc2883f */ jal handIsFiring +/* f0ca978: 0fc2883f */ jal bgunIsFiring /* f0ca97c: e7aa00b4 */ swc1 $f10,0xb4($sp) /* f0ca980: 1040000c */ beqz $v0,.L0f0ca9b4 /* f0ca984: 00000000 */ nop -/* f0ca988: 0fc273d6 */ jal handGetNoiseRadius +/* f0ca988: 0fc273d6 */ jal bgunGetNoiseRadius /* f0ca98c: 00002025 */ or $a0,$zero,$zero /* f0ca990: 44803000 */ mtc1 $zero,$f6 /* f0ca994: 00000000 */ nop @@ -3290,22 +3290,22 @@ glabel var7f1ad8e4 /* f0ca99c: 00000000 */ nop /* f0ca9a0: 45000004 */ bc1f .L0f0ca9b4 /* f0ca9a4: 00000000 */ nop -/* f0ca9a8: 0fc273d6 */ jal handGetNoiseRadius +/* f0ca9a8: 0fc273d6 */ jal bgunGetNoiseRadius /* f0ca9ac: 00002025 */ or $a0,$zero,$zero /* f0ca9b0: e7a000b4 */ swc1 $f0,0xb4($sp) .L0f0ca9b4: -/* f0ca9b4: 0fc2883f */ jal handIsFiring +/* f0ca9b4: 0fc2883f */ jal bgunIsFiring /* f0ca9b8: 24040001 */ addiu $a0,$zero,0x1 /* f0ca9bc: 1040000b */ beqz $v0,.L0f0ca9ec /* f0ca9c0: 00000000 */ nop -/* f0ca9c4: 0fc273d6 */ jal handGetNoiseRadius +/* f0ca9c4: 0fc273d6 */ jal bgunGetNoiseRadius /* f0ca9c8: 24040001 */ addiu $a0,$zero,0x1 /* f0ca9cc: c7a800b4 */ lwc1 $f8,0xb4($sp) /* f0ca9d0: 4600403c */ c.lt.s $f8,$f0 /* f0ca9d4: 00000000 */ nop /* f0ca9d8: 45000004 */ bc1f .L0f0ca9ec /* f0ca9dc: 00000000 */ nop -/* f0ca9e0: 0fc273d6 */ jal handGetNoiseRadius +/* f0ca9e0: 0fc273d6 */ jal bgunGetNoiseRadius /* f0ca9e4: 24040001 */ addiu $a0,$zero,0x1 /* f0ca9e8: e7a000b4 */ swc1 $f0,0xb4($sp) .L0f0ca9ec: @@ -3313,7 +3313,7 @@ glabel var7f1ad8e4 /* f0ca9f0: c7ac00b4 */ lwc1 $f12,0xb4($sp) /* f0ca9f4: 24040002 */ addiu $a0,$zero,0x2 .L0f0ca9f8: -/* f0ca9f8: 0fc2af1d */ jal currentPlayerSetGunSightVisible +/* f0ca9f8: 0fc2af1d */ jal bgunSetSightVisible /* f0ca9fc: 8fa50208 */ lw $a1,0x208($sp) /* f0caa00: c7ac0210 */ lwc1 $f12,0x210($sp) /* f0caa04: 44808000 */ mtc1 $zero,$f16 @@ -3345,7 +3345,7 @@ glabel var7f1ad8e4 /* f0caa64: 00000000 */ nop /* f0caa68: 44812000 */ mtc1 $at,$f4 /* f0caa6c: 00002025 */ or $a0,$zero,$zero -/* f0caa70: 0fc2866a */ jal handGetWeaponNum +/* f0caa70: 0fc2866a */ jal bgunGetWeaponNum /* f0caa74: e7a400b0 */ swc1 $f4,0xb0($sp) /* f0caa78: 24010016 */ addiu $at,$zero,0x16 /* f0caa7c: 5441008b */ bnel $v0,$at,.L0f0cacac @@ -3502,7 +3502,7 @@ glabel var7f1ad8e4 /* f0cacb8: 00000000 */ nop /* f0cacbc: e7a000b0 */ swc1 $f0,0xb0($sp) .L0f0cacc0: -/* f0cacc0: 0fc2866a */ jal handGetWeaponNum +/* f0cacc0: 0fc2866a */ jal bgunGetWeaponNum /* f0cacc4: 00002025 */ or $a0,$zero,$zero /* f0cacc8: 24010011 */ addiu $at,$zero,0x11 /* f0caccc: 5441000a */ bnel $v0,$at,.L0f0cacf8 @@ -4073,7 +4073,7 @@ glabel var7f1ad8e4 /* f0cb4b8: 10800008 */ beqz $a0,.L0f0cb4dc /* f0cb4bc: afa201fc */ sw $v0,0x1fc($sp) .L0f0cb4c0: -/* f0cb4c0: 0fc2870b */ jal func0f0a1c2c +/* f0cb4c0: 0fc2870b */ jal bgun0f0a1c2c /* f0cb4c4: 00000000 */ nop /* f0cb4c8: 8fa201fc */ lw $v0,0x1fc($sp) /* f0cb4cc: 0002202a */ slt $a0,$zero,$v0 @@ -4087,7 +4087,7 @@ glabel var7f1ad8e4 /* f0cb4e8: 10800008 */ beqz $a0,.L0f0cb50c /* f0cb4ec: afa20200 */ sw $v0,0x200($sp) .L0f0cb4f0: -/* f0cb4f0: 0fc286d4 */ jal func0f0a1b50 +/* f0cb4f0: 0fc286d4 */ jal bgun0f0a1b50 /* f0cb4f4: 00000000 */ nop /* f0cb4f8: 8fa20200 */ lw $v0,0x200($sp) /* f0cb4fc: 0002202a */ slt $a0,$zero,$v0 @@ -4106,7 +4106,7 @@ glabel var7f1ad8e4 .L0f0cb528: /* f0cb528: 1120007d */ beqz $t1,.L0f0cb720 /* f0cb52c: 8fb901b8 */ lw $t9,0x1b8($sp) -/* f0cb530: 0fc2a4f4 */ jal currentPlayerSetAimType +/* f0cb530: 0fc2a4f4 */ jal bgunSetAimType /* f0cb534: 00002025 */ or $a0,$zero,$zero /* f0cb538: 8faa022c */ lw $t2,0x22c($sp) /* f0cb53c: 11400015 */ beqz $t2,.L0f0cb594 @@ -4133,7 +4133,7 @@ glabel var7f1ad8e4 /* f0cb58c: 5440000b */ bnezl $v0,.L0f0cb5bc /* f0cb590: 00008025 */ or $s0,$zero,$zero .L0f0cb594: -/* f0cb594: 0fc2866a */ jal handGetWeaponNum +/* f0cb594: 0fc2866a */ jal bgunGetWeaponNum /* f0cb598: 00002025 */ or $a0,$zero,$zero /* f0cb59c: 2401000a */ addiu $at,$zero,0xa /* f0cb5a0: 54410037 */ bnel $v0,$at,.L0f0cb680 @@ -4144,7 +4144,7 @@ glabel var7f1ad8e4 /* f0cb5b4: 15c10031 */ bne $t6,$at,.L0f0cb67c /* f0cb5b8: 00008025 */ or $s0,$zero,$zero .L0f0cb5bc: -/* f0cb5bc: 0fc2866a */ jal handGetWeaponNum +/* f0cb5bc: 0fc2866a */ jal bgunGetWeaponNum /* f0cb5c0: 00002025 */ or $a0,$zero,$zero /* f0cb5c4: 2401000a */ addiu $at,$zero,0xa /* f0cb5c8: 54410008 */ bnel $v0,$at,.L0f0cb5ec @@ -4187,12 +4187,12 @@ glabel var7f1ad8e4 /* f0cb650: c420d8cc */ lwc1 $f0,%lo(var7f1ad8cc)($at) /* f0cb654: 44060000 */ mfc1 $a2,$f0 /* f0cb658: 44070000 */ mfc1 $a3,$f0 -/* f0cb65c: 0fc280e5 */ jal func0f0a0394 +/* f0cb65c: 0fc280e5 */ jal bgun0f0a0394 /* f0cb660: 00000000 */ nop /* f0cb664: 10000043 */ b .L0f0cb774 /* f0cb668: 8fbf0034 */ lw $ra,0x34($sp) .L0f0cb66c: -/* f0cb66c: 0fc282cc */ jal currentPlayerSwivelGunTowards +/* f0cb66c: 0fc282cc */ jal bgunSwivelTowards /* f0cb670: 8ca61b68 */ lw $a2,0x1b68($a1) /* f0cb674: 1000003f */ b .L0f0cb774 /* f0cb678: 8fbf0034 */ lw $ra,0x34($sp) @@ -4237,14 +4237,14 @@ glabel var7f1ad8e4 /* f0cb704: 44061000 */ mfc1 $a2,$f2 /* f0cb708: 46049300 */ add.s $f12,$f18,$f4 /* f0cb70c: c4b201b8 */ lwc1 $f18,0x1b8($a1) -/* f0cb710: 0fc282cc */ jal currentPlayerSwivelGunTowards +/* f0cb710: 0fc282cc */ jal bgunSwivelTowards /* f0cb714: 46124380 */ add.s $f14,$f8,$f18 /* f0cb718: 10000016 */ b .L0f0cb774 /* f0cb71c: 8fbf0034 */ lw $ra,0x34($sp) .L0f0cb720: /* f0cb720: 53200014 */ beqzl $t9,.L0f0cb774 /* f0cb724: 8fbf0034 */ lw $ra,0x34($sp) -/* f0cb728: 0fc2a4f4 */ jal currentPlayerSetAimType +/* f0cb728: 0fc2a4f4 */ jal bgunSetAimType /* f0cb72c: 00002025 */ or $a0,$zero,$zero /* f0cb730: 8fa30248 */ lw $v1,0x248($sp) /* f0cb734: 8fa4024c */ lw $a0,0x24c($sp) @@ -4260,7 +4260,7 @@ glabel var7f1ad8e4 /* f0cb75c: 00000000 */ nop /* f0cb760: 46004482 */ mul.s $f18,$f8,$f0 /* f0cb764: 46023303 */ div.s $f12,$f6,$f2 -/* f0cb768: 0fc282e6 */ jal func0f0a0b98 +/* f0cb768: 0fc282e6 */ jal bgun0f0a0b98 /* f0cb76c: 46029383 */ div.s $f14,$f18,$f2 .L0f0cb770: /* f0cb770: 8fbf0034 */ lw $ra,0x34($sp) @@ -4325,7 +4325,7 @@ glabel var7f1ad8e4 /* f0c8bd4: 0fc549c4 */ jal optionsGetControlMode /* f0c8bd8: 8dc40070 */ lw $a0,0x70($t6) /* f0c8bdc: afa201b0 */ sw $v0,0x1b0($sp) -/* f0c8be0: 0fc2866a */ jal handGetWeaponNum +/* f0c8be0: 0fc2866a */ jal bgunGetWeaponNum /* f0c8be4: 00002025 */ or $a0,$zero,$zero /* f0c8be8: afa201ac */ sw $v0,0x1ac($sp) /* f0c8bec: 00402025 */ or $a0,$v0,$zero @@ -4800,7 +4800,7 @@ glabel var7f1ad8e4 /* f0c9290: 1616ffe7 */ bne $s0,$s6,.L0f0c9230 /* f0c9294: ac69fffc */ sw $t1,-0x4($v1) .L0f0c9298: -/* f0c9298: 0fc2866a */ jal handGetWeaponNum +/* f0c9298: 0fc2866a */ jal bgunGetWeaponNum /* f0c929c: 00002025 */ or $a0,$zero,$zero /* f0c92a0: 24010032 */ addiu $at,$zero,0x32 /* f0c92a4: 54410005 */ bnel $v0,$at,.L0f0c92bc @@ -5087,7 +5087,7 @@ glabel var7f1ad8e4 /* f0c969c: 85a4024e */ lh $a0,0x24e($t5) /* f0c96a0: 04820009 */ bltzl $a0,.L0f0c96c8 /* f0c96a4: 8e450284 */ lw $a1,0x284($s2) -/* f0c96a8: 0fc2a257 */ jal currentPlayerConsiderToggleGunFunction +/* f0c96a8: 0fc2a257 */ jal bgunConsiderToggleGunFunction /* f0c96ac: 00003025 */ or $a2,$zero,$zero /* f0c96b0: 50400005 */ beqzl $v0,.L0f0c96c8 /* f0c96b4: 8e450284 */ lw $a1,0x284($s2) @@ -5102,7 +5102,7 @@ glabel var7f1ad8e4 /* f0c96d4: 14200016 */ bnez $at,.L0f0c9730 /* f0c96d8: 248b0001 */ addiu $t3,$a0,0x1 /* f0c96dc: 00002825 */ or $a1,$zero,$zero -/* f0c96e0: 0fc2a257 */ jal currentPlayerConsiderToggleGunFunction +/* f0c96e0: 0fc2a257 */ jal bgunConsiderToggleGunFunction /* f0c96e4: 00003025 */ or $a2,$zero,$zero /* f0c96e8: 24010001 */ addiu $at,$zero,0x1 /* f0c96ec: 54410005 */ bnel $v0,$at,.L0f0c9704 @@ -5131,7 +5131,7 @@ glabel var7f1ad8e4 .L0f0c973c: /* f0c973c: 1420000e */ bnez $at,.L0f0c9778 /* f0c9740: 00002825 */ or $a1,$zero,$zero -/* f0c9744: 0fc2a257 */ jal currentPlayerConsiderToggleGunFunction +/* f0c9744: 0fc2a257 */ jal bgunConsiderToggleGunFunction /* f0c9748: 00003025 */ or $a2,$zero,$zero /* f0c974c: 1000000b */ b .L0f0c977c /* f0c9750: 26100001 */ addiu $s0,$s0,0x1 @@ -5144,7 +5144,7 @@ glabel var7f1ad8e4 /* f0c9768: 00000000 */ nop /* f0c976c: afae01c0 */ sw $t6,0x1c0($sp) .L0f0c9770: -/* f0c9770: 0fc2a314 */ jal func0f0a8c50 +/* f0c9770: 0fc2a314 */ jal bgun0f0a8c50 /* f0c9774: a4a0024e */ sh $zero,0x24e($a1) .L0f0c9778: /* f0c9778: 26100001 */ addiu $s0,$s0,0x1 @@ -5339,7 +5339,7 @@ glabel var7f1ad8e4 .L0f0c9a20: /* f0c9a20: afa40234 */ sw $a0,0x234($sp) .L0f0c9a24: -/* f0c9a24: 0fc2866a */ jal handGetWeaponNum +/* f0c9a24: 0fc2866a */ jal bgunGetWeaponNum /* f0c9a28: 00002025 */ or $a0,$zero,$zero /* f0c9a2c: 24010016 */ addiu $at,$zero,0x16 /* f0c9a30: 54410011 */ bnel $v0,$at,.L0f0c9a78 @@ -5426,7 +5426,7 @@ glabel var7f1ad8e4 /* f0c9b48: 8e4b0284 */ lw $t3,0x284($s2) /* f0c9b4c: ad600274 */ sw $zero,0x274($t3) .L0f0c9b50: -/* f0c9b50: 0fc2866a */ jal handGetWeaponNum +/* f0c9b50: 0fc2866a */ jal bgunGetWeaponNum /* f0c9b54: 00002025 */ or $a0,$zero,$zero /* f0c9b58: 00402025 */ or $a0,$v0,$zero /* f0c9b5c: 0fc2c5f0 */ jal weaponHasFlag @@ -5588,7 +5588,7 @@ glabel var7f1ad8e4 /* f0c9d90: 1616ffe5 */ bne $s0,$s6,.L0f0c9d28 /* f0c9d94: ac6ffffc */ sw $t7,-0x4($v1) .L0f0c9d98: -/* f0c9d98: 0fc2866a */ jal handGetWeaponNum +/* f0c9d98: 0fc2866a */ jal bgunGetWeaponNum /* f0c9d9c: 00002025 */ or $a0,$zero,$zero /* f0c9da0: 24010032 */ addiu $at,$zero,0x32 /* f0c9da4: 54410005 */ bnel $v0,$at,.L0f0c9dbc @@ -6019,7 +6019,7 @@ glabel var7f1ad8e4 /* f0ca3c4: 8724024e */ lh $a0,0x24e($t9) /* f0ca3c8: 04820009 */ bltzl $a0,.L0f0ca3f0 /* f0ca3cc: 8e450284 */ lw $a1,0x284($s2) -/* f0ca3d0: 0fc2a257 */ jal currentPlayerConsiderToggleGunFunction +/* f0ca3d0: 0fc2a257 */ jal bgunConsiderToggleGunFunction /* f0ca3d4: 00003025 */ or $a2,$zero,$zero /* f0ca3d8: 50400005 */ beqzl $v0,.L0f0ca3f0 /* f0ca3dc: 8e450284 */ lw $a1,0x284($s2) @@ -6034,7 +6034,7 @@ glabel var7f1ad8e4 /* f0ca3fc: 14200016 */ bnez $at,.L0f0ca458 /* f0ca400: 248f0001 */ addiu $t7,$a0,0x1 /* f0ca404: 00002825 */ or $a1,$zero,$zero -/* f0ca408: 0fc2a257 */ jal currentPlayerConsiderToggleGunFunction +/* f0ca408: 0fc2a257 */ jal bgunConsiderToggleGunFunction /* f0ca40c: 00003025 */ or $a2,$zero,$zero /* f0ca410: 24010001 */ addiu $at,$zero,0x1 /* f0ca414: 54410005 */ bnel $v0,$at,.L0f0ca42c @@ -6063,7 +6063,7 @@ glabel var7f1ad8e4 /* f0ca460: 2881fffe */ slti $at,$a0,-2 /* f0ca464: 1420000e */ bnez $at,.L0f0ca4a0 /* f0ca468: 00002825 */ or $a1,$zero,$zero -/* f0ca46c: 0fc2a257 */ jal currentPlayerConsiderToggleGunFunction +/* f0ca46c: 0fc2a257 */ jal bgunConsiderToggleGunFunction /* f0ca470: 00003025 */ or $a2,$zero,$zero /* f0ca474: 1000000b */ b .L0f0ca4a4 /* f0ca478: 26100001 */ addiu $s0,$s0,0x1 @@ -6076,7 +6076,7 @@ glabel var7f1ad8e4 /* f0ca490: 00000000 */ nop /* f0ca494: afa801c0 */ sw $t0,0x1c0($sp) .L0f0ca498: -/* f0ca498: 0fc2a314 */ jal func0f0a8c50 +/* f0ca498: 0fc2a314 */ jal bgun0f0a8c50 /* f0ca49c: a4a0024e */ sh $zero,0x24e($a1) .L0f0ca4a0: /* f0ca4a0: 26100001 */ addiu $s0,$s0,0x1 @@ -6100,7 +6100,7 @@ glabel var7f1ad8e4 /* f0ca4e0: 0010682b */ sltu $t5,$zero,$s0 /* f0ca4e4: 01a08025 */ or $s0,$t5,$zero /* f0ca4e8: 01808825 */ or $s1,$t4,$zero -/* f0ca4ec: 0fc2866a */ jal handGetWeaponNum +/* f0ca4ec: 0fc2866a */ jal bgunGetWeaponNum /* f0ca4f0: e7a000bc */ swc1 $f0,0xbc($sp) /* f0ca4f4: 24010016 */ addiu $at,$zero,0x16 /* f0ca4f8: 14410004 */ bne $v0,$at,.L0f0ca50c @@ -6248,7 +6248,7 @@ glabel var7f1ad8e4 .L0f0ca6f0: /* f0ca6f0: afa40234 */ sw $a0,0x234($sp) .L0f0ca6f4: -/* f0ca6f4: 0fc2866a */ jal handGetWeaponNum +/* f0ca6f4: 0fc2866a */ jal bgunGetWeaponNum /* f0ca6f8: 00002025 */ or $a0,$zero,$zero /* f0ca6fc: 24010016 */ addiu $at,$zero,0x16 /* f0ca700: 5441000c */ bnel $v0,$at,.L0f0ca734 @@ -6331,7 +6331,7 @@ glabel var7f1ad8e4 /* f0ca810: 00000000 */ nop /* f0ca814: aca00274 */ sw $zero,0x274($a1) .L0f0ca818: -/* f0ca818: 0fc2866a */ jal handGetWeaponNum +/* f0ca818: 0fc2866a */ jal bgunGetWeaponNum /* f0ca81c: 00002025 */ or $a0,$zero,$zero /* f0ca820: 00402025 */ or $a0,$v0,$zero /* f0ca824: 0fc2c5f0 */ jal weaponHasFlag @@ -6413,27 +6413,27 @@ glabel var7f1ad8e4 /* f0ca934: e7a001f0 */ swc1 $f0,0x1f0($sp) /* f0ca938: e7a401ec */ swc1 $f4,0x1ec($sp) .L0f0ca93c: -/* f0ca93c: 0fc2a34d */ jal handsTick +/* f0ca93c: 0fc2a34d */ jal bgunsTick /* f0ca940: 8fa401bc */ lw $a0,0x1bc($sp) /* f0ca944: 8e580324 */ lw $t8,0x324($s2) /* f0ca948: 5300002b */ beqzl $t8,.L0f0ca9f8 /* f0ca94c: 24040002 */ addiu $a0,$zero,0x2 -/* f0ca950: 0fc2883f */ jal handIsFiring +/* f0ca950: 0fc2883f */ jal bgunIsFiring /* f0ca954: 00002025 */ or $a0,$zero,$zero /* f0ca958: 54400006 */ bnezl $v0,.L0f0ca974 /* f0ca95c: 44805000 */ mtc1 $zero,$f10 -/* f0ca960: 0fc2883f */ jal handIsFiring +/* f0ca960: 0fc2883f */ jal bgunIsFiring /* f0ca964: 24040001 */ addiu $a0,$zero,0x1 /* f0ca968: 50400023 */ beqzl $v0,.L0f0ca9f8 /* f0ca96c: 24040002 */ addiu $a0,$zero,0x2 /* f0ca970: 44805000 */ mtc1 $zero,$f10 .L0f0ca974: /* f0ca974: 00002025 */ or $a0,$zero,$zero -/* f0ca978: 0fc2883f */ jal handIsFiring +/* f0ca978: 0fc2883f */ jal bgunIsFiring /* f0ca97c: e7aa00b4 */ swc1 $f10,0xb4($sp) /* f0ca980: 1040000c */ beqz $v0,.L0f0ca9b4 /* f0ca984: 00000000 */ nop -/* f0ca988: 0fc273d6 */ jal handGetNoiseRadius +/* f0ca988: 0fc273d6 */ jal bgunGetNoiseRadius /* f0ca98c: 00002025 */ or $a0,$zero,$zero /* f0ca990: 44803000 */ mtc1 $zero,$f6 /* f0ca994: 00000000 */ nop @@ -6441,22 +6441,22 @@ glabel var7f1ad8e4 /* f0ca99c: 00000000 */ nop /* f0ca9a0: 45000004 */ bc1f .L0f0ca9b4 /* f0ca9a4: 00000000 */ nop -/* f0ca9a8: 0fc273d6 */ jal handGetNoiseRadius +/* f0ca9a8: 0fc273d6 */ jal bgunGetNoiseRadius /* f0ca9ac: 00002025 */ or $a0,$zero,$zero /* f0ca9b0: e7a000b4 */ swc1 $f0,0xb4($sp) .L0f0ca9b4: -/* f0ca9b4: 0fc2883f */ jal handIsFiring +/* f0ca9b4: 0fc2883f */ jal bgunIsFiring /* f0ca9b8: 24040001 */ addiu $a0,$zero,0x1 /* f0ca9bc: 1040000b */ beqz $v0,.L0f0ca9ec /* f0ca9c0: 00000000 */ nop -/* f0ca9c4: 0fc273d6 */ jal handGetNoiseRadius +/* f0ca9c4: 0fc273d6 */ jal bgunGetNoiseRadius /* f0ca9c8: 24040001 */ addiu $a0,$zero,0x1 /* f0ca9cc: c7a800b4 */ lwc1 $f8,0xb4($sp) /* f0ca9d0: 4600403c */ c.lt.s $f8,$f0 /* f0ca9d4: 00000000 */ nop /* f0ca9d8: 45000004 */ bc1f .L0f0ca9ec /* f0ca9dc: 00000000 */ nop -/* f0ca9e0: 0fc273d6 */ jal handGetNoiseRadius +/* f0ca9e0: 0fc273d6 */ jal bgunGetNoiseRadius /* f0ca9e4: 24040001 */ addiu $a0,$zero,0x1 /* f0ca9e8: e7a000b4 */ swc1 $f0,0xb4($sp) .L0f0ca9ec: @@ -6464,7 +6464,7 @@ glabel var7f1ad8e4 /* f0ca9f0: c7ac00b4 */ lwc1 $f12,0xb4($sp) /* f0ca9f4: 24040002 */ addiu $a0,$zero,0x2 .L0f0ca9f8: -/* f0ca9f8: 0fc2af1d */ jal currentPlayerSetGunSightVisible +/* f0ca9f8: 0fc2af1d */ jal bgunSetSightVisible /* f0ca9fc: 8fa50208 */ lw $a1,0x208($sp) /* f0caa00: c7ac0210 */ lwc1 $f12,0x210($sp) /* f0caa04: 44808000 */ mtc1 $zero,$f16 @@ -6496,7 +6496,7 @@ glabel var7f1ad8e4 /* f0caa64: 00000000 */ nop /* f0caa68: 44812000 */ mtc1 $at,$f4 /* f0caa6c: 00002025 */ or $a0,$zero,$zero -/* f0caa70: 0fc2866a */ jal handGetWeaponNum +/* f0caa70: 0fc2866a */ jal bgunGetWeaponNum /* f0caa74: e7a400b0 */ swc1 $f4,0xb0($sp) /* f0caa78: 24010016 */ addiu $at,$zero,0x16 /* f0caa7c: 5441008b */ bnel $v0,$at,.L0f0cacac @@ -6653,7 +6653,7 @@ glabel var7f1ad8e4 /* f0cacb8: 00000000 */ nop /* f0cacbc: e7a000b0 */ swc1 $f0,0xb0($sp) .L0f0cacc0: -/* f0cacc0: 0fc2866a */ jal handGetWeaponNum +/* f0cacc0: 0fc2866a */ jal bgunGetWeaponNum /* f0cacc4: 00002025 */ or $a0,$zero,$zero /* f0cacc8: 24010011 */ addiu $at,$zero,0x11 /* f0caccc: 5441000a */ bnel $v0,$at,.L0f0cacf8 @@ -7224,7 +7224,7 @@ glabel var7f1ad8e4 /* f0cb4b8: 10800008 */ beqz $a0,.L0f0cb4dc /* f0cb4bc: afa201fc */ sw $v0,0x1fc($sp) .L0f0cb4c0: -/* f0cb4c0: 0fc2870b */ jal func0f0a1c2c +/* f0cb4c0: 0fc2870b */ jal bgun0f0a1c2c /* f0cb4c4: 00000000 */ nop /* f0cb4c8: 8fa201fc */ lw $v0,0x1fc($sp) /* f0cb4cc: 0002202a */ slt $a0,$zero,$v0 @@ -7238,7 +7238,7 @@ glabel var7f1ad8e4 /* f0cb4e8: 10800008 */ beqz $a0,.L0f0cb50c /* f0cb4ec: afa20200 */ sw $v0,0x200($sp) .L0f0cb4f0: -/* f0cb4f0: 0fc286d4 */ jal func0f0a1b50 +/* f0cb4f0: 0fc286d4 */ jal bgun0f0a1b50 /* f0cb4f4: 00000000 */ nop /* f0cb4f8: 8fa20200 */ lw $v0,0x200($sp) /* f0cb4fc: 0002202a */ slt $a0,$zero,$v0 @@ -7257,7 +7257,7 @@ glabel var7f1ad8e4 .L0f0cb528: /* f0cb528: 1120007d */ beqz $t1,.L0f0cb720 /* f0cb52c: 8fb901b8 */ lw $t9,0x1b8($sp) -/* f0cb530: 0fc2a4f4 */ jal currentPlayerSetAimType +/* f0cb530: 0fc2a4f4 */ jal bgunSetAimType /* f0cb534: 00002025 */ or $a0,$zero,$zero /* f0cb538: 8faa022c */ lw $t2,0x22c($sp) /* f0cb53c: 11400015 */ beqz $t2,.L0f0cb594 @@ -7284,7 +7284,7 @@ glabel var7f1ad8e4 /* f0cb58c: 5440000b */ bnezl $v0,.L0f0cb5bc /* f0cb590: 00008025 */ or $s0,$zero,$zero .L0f0cb594: -/* f0cb594: 0fc2866a */ jal handGetWeaponNum +/* f0cb594: 0fc2866a */ jal bgunGetWeaponNum /* f0cb598: 00002025 */ or $a0,$zero,$zero /* f0cb59c: 2401000a */ addiu $at,$zero,0xa /* f0cb5a0: 54410037 */ bnel $v0,$at,.L0f0cb680 @@ -7295,7 +7295,7 @@ glabel var7f1ad8e4 /* f0cb5b4: 15c10031 */ bne $t6,$at,.L0f0cb67c /* f0cb5b8: 00008025 */ or $s0,$zero,$zero .L0f0cb5bc: -/* f0cb5bc: 0fc2866a */ jal handGetWeaponNum +/* f0cb5bc: 0fc2866a */ jal bgunGetWeaponNum /* f0cb5c0: 00002025 */ or $a0,$zero,$zero /* f0cb5c4: 2401000a */ addiu $at,$zero,0xa /* f0cb5c8: 54410008 */ bnel $v0,$at,.L0f0cb5ec @@ -7338,12 +7338,12 @@ glabel var7f1ad8e4 /* f0cb650: c420d8cc */ lwc1 $f0,%lo(var7f1ad8cc)($at) /* f0cb654: 44060000 */ mfc1 $a2,$f0 /* f0cb658: 44070000 */ mfc1 $a3,$f0 -/* f0cb65c: 0fc280e5 */ jal func0f0a0394 +/* f0cb65c: 0fc280e5 */ jal bgun0f0a0394 /* f0cb660: 00000000 */ nop /* f0cb664: 10000043 */ b .L0f0cb774 /* f0cb668: 8fbf0034 */ lw $ra,0x34($sp) .L0f0cb66c: -/* f0cb66c: 0fc282cc */ jal currentPlayerSwivelGunTowards +/* f0cb66c: 0fc282cc */ jal bgunSwivelTowards /* f0cb670: 8ca61b68 */ lw $a2,0x1b68($a1) /* f0cb674: 1000003f */ b .L0f0cb774 /* f0cb678: 8fbf0034 */ lw $ra,0x34($sp) @@ -7388,14 +7388,14 @@ glabel var7f1ad8e4 /* f0cb704: 44061000 */ mfc1 $a2,$f2 /* f0cb708: 46049300 */ add.s $f12,$f18,$f4 /* f0cb70c: c4b201b8 */ lwc1 $f18,0x1b8($a1) -/* f0cb710: 0fc282cc */ jal currentPlayerSwivelGunTowards +/* f0cb710: 0fc282cc */ jal bgunSwivelTowards /* f0cb714: 46124380 */ add.s $f14,$f8,$f18 /* f0cb718: 10000016 */ b .L0f0cb774 /* f0cb71c: 8fbf0034 */ lw $ra,0x34($sp) .L0f0cb720: /* f0cb720: 53200014 */ beqzl $t9,.L0f0cb774 /* f0cb724: 8fbf0034 */ lw $ra,0x34($sp) -/* f0cb728: 0fc2a4f4 */ jal currentPlayerSetAimType +/* f0cb728: 0fc2a4f4 */ jal bgunSetAimType /* f0cb72c: 00002025 */ or $a0,$zero,$zero /* f0cb730: 8fa30248 */ lw $v1,0x248($sp) /* f0cb734: 8fa4024c */ lw $a0,0x24c($sp) @@ -7411,7 +7411,7 @@ glabel var7f1ad8e4 /* f0cb75c: 00000000 */ nop /* f0cb760: 46004482 */ mul.s $f18,$f8,$f0 /* f0cb764: 46023303 */ div.s $f12,$f6,$f2 -/* f0cb768: 0fc282e6 */ jal func0f0a0b98 +/* f0cb768: 0fc282e6 */ jal bgun0f0a0b98 /* f0cb76c: 46029383 */ div.s $f14,$f18,$f2 .L0f0cb770: /* f0cb770: 8fbf0034 */ lw $ra,0x34($sp) @@ -7476,7 +7476,7 @@ glabel var7f1ad8e4 /* f0c6430: 0fc53380 */ jal optionsGetControlMode /* f0c6434: 8dc40070 */ lw $a0,0x70($t6) /* f0c6438: afa201b0 */ sw $v0,0x1b0($sp) -/* f0c643c: 0fc27dd7 */ jal handGetWeaponNum +/* f0c643c: 0fc27dd7 */ jal bgunGetWeaponNum /* f0c6440: 00002025 */ or $a0,$zero,$zero /* f0c6444: afa201ac */ sw $v0,0x1ac($sp) /* f0c6448: 00402025 */ or $a0,$v0,$zero @@ -7951,7 +7951,7 @@ glabel var7f1ad8e4 /* f0c6aec: 1616ffe7 */ bne $s0,$s6,.NB0f0c6a8c /* f0c6af0: ac69fffc */ sw $t1,-0x4($v1) .NB0f0c6af4: -/* f0c6af4: 0fc27dd7 */ jal handGetWeaponNum +/* f0c6af4: 0fc27dd7 */ jal bgunGetWeaponNum /* f0c6af8: 00002025 */ or $a0,$zero,$zero /* f0c6afc: 24010032 */ addiu $at,$zero,0x32 /* f0c6b00: 54410005 */ bnel $v0,$at,.NB0f0c6b18 @@ -8238,7 +8238,7 @@ glabel var7f1ad8e4 /* f0c6ef8: 85a4024e */ lh $a0,0x24e($t5) /* f0c6efc: 04820009 */ bltzl $a0,.NB0f0c6f24 /* f0c6f00: 8e450284 */ lw $a1,0x284($s2) -/* f0c6f04: 0fc299bf */ jal currentPlayerConsiderToggleGunFunction +/* f0c6f04: 0fc299bf */ jal bgunConsiderToggleGunFunction /* f0c6f08: 00003025 */ or $a2,$zero,$zero /* f0c6f0c: 50400005 */ beqzl $v0,.NB0f0c6f24 /* f0c6f10: 8e450284 */ lw $a1,0x284($s2) @@ -8253,7 +8253,7 @@ glabel var7f1ad8e4 /* f0c6f30: 14200016 */ bnez $at,.NB0f0c6f8c /* f0c6f34: 248b0001 */ addiu $t3,$a0,0x1 /* f0c6f38: 00002825 */ or $a1,$zero,$zero -/* f0c6f3c: 0fc299bf */ jal currentPlayerConsiderToggleGunFunction +/* f0c6f3c: 0fc299bf */ jal bgunConsiderToggleGunFunction /* f0c6f40: 00003025 */ or $a2,$zero,$zero /* f0c6f44: 24010001 */ addiu $at,$zero,0x1 /* f0c6f48: 54410005 */ bnel $v0,$at,.NB0f0c6f60 @@ -8282,7 +8282,7 @@ glabel var7f1ad8e4 .NB0f0c6f98: /* f0c6f98: 1420000e */ bnez $at,.NB0f0c6fd4 /* f0c6f9c: 00002825 */ or $a1,$zero,$zero -/* f0c6fa0: 0fc299bf */ jal currentPlayerConsiderToggleGunFunction +/* f0c6fa0: 0fc299bf */ jal bgunConsiderToggleGunFunction /* f0c6fa4: 00003025 */ or $a2,$zero,$zero /* f0c6fa8: 1000000b */ beqz $zero,.NB0f0c6fd8 /* f0c6fac: 26100001 */ addiu $s0,$s0,0x1 @@ -8295,7 +8295,7 @@ glabel var7f1ad8e4 /* f0c6fc4: 00000000 */ sll $zero,$zero,0x0 /* f0c6fc8: afae01c0 */ sw $t6,0x1c0($sp) .NB0f0c6fcc: -/* f0c6fcc: 0fc29a7c */ jal func0f0a8c50 +/* f0c6fcc: 0fc29a7c */ jal bgun0f0a8c50 /* f0c6fd0: a4a0024e */ sh $zero,0x24e($a1) .NB0f0c6fd4: /* f0c6fd4: 26100001 */ addiu $s0,$s0,0x1 @@ -8490,7 +8490,7 @@ glabel var7f1ad8e4 .NB0f0c727c: /* f0c727c: afa40234 */ sw $a0,0x234($sp) .NB0f0c7280: -/* f0c7280: 0fc27dd7 */ jal handGetWeaponNum +/* f0c7280: 0fc27dd7 */ jal bgunGetWeaponNum /* f0c7284: 00002025 */ or $a0,$zero,$zero /* f0c7288: 24010016 */ addiu $at,$zero,0x16 /* f0c728c: 54410011 */ bnel $v0,$at,.NB0f0c72d4 @@ -8577,7 +8577,7 @@ glabel var7f1ad8e4 /* f0c73a4: 8e4b0284 */ lw $t3,0x284($s2) /* f0c73a8: ad600274 */ sw $zero,0x274($t3) .NB0f0c73ac: -/* f0c73ac: 0fc27dd7 */ jal handGetWeaponNum +/* f0c73ac: 0fc27dd7 */ jal bgunGetWeaponNum /* f0c73b0: 00002025 */ or $a0,$zero,$zero /* f0c73b4: 00402025 */ or $a0,$v0,$zero /* f0c73b8: 0fc2bd48 */ jal weaponHasFlag @@ -8739,7 +8739,7 @@ glabel var7f1ad8e4 /* f0c75ec: 1616ffe5 */ bne $s0,$s6,.NB0f0c7584 /* f0c75f0: ac6ffffc */ sw $t7,-0x4($v1) .NB0f0c75f4: -/* f0c75f4: 0fc27dd7 */ jal handGetWeaponNum +/* f0c75f4: 0fc27dd7 */ jal bgunGetWeaponNum /* f0c75f8: 00002025 */ or $a0,$zero,$zero /* f0c75fc: 24010032 */ addiu $at,$zero,0x32 /* f0c7600: 54410005 */ bnel $v0,$at,.NB0f0c7618 @@ -9170,7 +9170,7 @@ glabel var7f1ad8e4 /* f0c7c20: 8724024e */ lh $a0,0x24e($t9) /* f0c7c24: 04820009 */ bltzl $a0,.NB0f0c7c4c /* f0c7c28: 8e450284 */ lw $a1,0x284($s2) -/* f0c7c2c: 0fc299bf */ jal currentPlayerConsiderToggleGunFunction +/* f0c7c2c: 0fc299bf */ jal bgunConsiderToggleGunFunction /* f0c7c30: 00003025 */ or $a2,$zero,$zero /* f0c7c34: 50400005 */ beqzl $v0,.NB0f0c7c4c /* f0c7c38: 8e450284 */ lw $a1,0x284($s2) @@ -9185,7 +9185,7 @@ glabel var7f1ad8e4 /* f0c7c58: 14200016 */ bnez $at,.NB0f0c7cb4 /* f0c7c5c: 248f0001 */ addiu $t7,$a0,0x1 /* f0c7c60: 00002825 */ or $a1,$zero,$zero -/* f0c7c64: 0fc299bf */ jal currentPlayerConsiderToggleGunFunction +/* f0c7c64: 0fc299bf */ jal bgunConsiderToggleGunFunction /* f0c7c68: 00003025 */ or $a2,$zero,$zero /* f0c7c6c: 24010001 */ addiu $at,$zero,0x1 /* f0c7c70: 54410005 */ bnel $v0,$at,.NB0f0c7c88 @@ -9214,7 +9214,7 @@ glabel var7f1ad8e4 /* f0c7cbc: 2881fffe */ slti $at,$a0,-2 /* f0c7cc0: 1420000e */ bnez $at,.NB0f0c7cfc /* f0c7cc4: 00002825 */ or $a1,$zero,$zero -/* f0c7cc8: 0fc299bf */ jal currentPlayerConsiderToggleGunFunction +/* f0c7cc8: 0fc299bf */ jal bgunConsiderToggleGunFunction /* f0c7ccc: 00003025 */ or $a2,$zero,$zero /* f0c7cd0: 1000000b */ beqz $zero,.NB0f0c7d00 /* f0c7cd4: 26100001 */ addiu $s0,$s0,0x1 @@ -9227,7 +9227,7 @@ glabel var7f1ad8e4 /* f0c7cec: 00000000 */ sll $zero,$zero,0x0 /* f0c7cf0: afa801c0 */ sw $t0,0x1c0($sp) .NB0f0c7cf4: -/* f0c7cf4: 0fc29a7c */ jal func0f0a8c50 +/* f0c7cf4: 0fc29a7c */ jal bgun0f0a8c50 /* f0c7cf8: a4a0024e */ sh $zero,0x24e($a1) .NB0f0c7cfc: /* f0c7cfc: 26100001 */ addiu $s0,$s0,0x1 @@ -9251,7 +9251,7 @@ glabel var7f1ad8e4 /* f0c7d3c: 0010682b */ sltu $t5,$zero,$s0 /* f0c7d40: 01a08025 */ or $s0,$t5,$zero /* f0c7d44: 01808825 */ or $s1,$t4,$zero -/* f0c7d48: 0fc27dd7 */ jal handGetWeaponNum +/* f0c7d48: 0fc27dd7 */ jal bgunGetWeaponNum /* f0c7d4c: e7a000bc */ swc1 $f0,0xbc($sp) /* f0c7d50: 24010016 */ addiu $at,$zero,0x16 /* f0c7d54: 14410004 */ bne $v0,$at,.NB0f0c7d68 @@ -9399,7 +9399,7 @@ glabel var7f1ad8e4 .NB0f0c7f4c: /* f0c7f4c: afa40234 */ sw $a0,0x234($sp) .NB0f0c7f50: -/* f0c7f50: 0fc27dd7 */ jal handGetWeaponNum +/* f0c7f50: 0fc27dd7 */ jal bgunGetWeaponNum /* f0c7f54: 00002025 */ or $a0,$zero,$zero /* f0c7f58: 24010016 */ addiu $at,$zero,0x16 /* f0c7f5c: 5441000c */ bnel $v0,$at,.NB0f0c7f90 @@ -9482,7 +9482,7 @@ glabel var7f1ad8e4 /* f0c806c: 00000000 */ sll $zero,$zero,0x0 /* f0c8070: aca00274 */ sw $zero,0x274($a1) .NB0f0c8074: -/* f0c8074: 0fc27dd7 */ jal handGetWeaponNum +/* f0c8074: 0fc27dd7 */ jal bgunGetWeaponNum /* f0c8078: 00002025 */ or $a0,$zero,$zero /* f0c807c: 00402025 */ or $a0,$v0,$zero /* f0c8080: 0fc2bd48 */ jal weaponHasFlag @@ -9564,27 +9564,27 @@ glabel var7f1ad8e4 /* f0c8190: e7a001f0 */ swc1 $f0,0x1f0($sp) /* f0c8194: e7a401ec */ swc1 $f4,0x1ec($sp) .NB0f0c8198: -/* f0c8198: 0fc29ab5 */ jal handsTick +/* f0c8198: 0fc29ab5 */ jal bgunsTick /* f0c819c: 8fa401bc */ lw $a0,0x1bc($sp) /* f0c81a0: 8e580324 */ lw $t8,0x324($s2) /* f0c81a4: 5300002b */ beqzl $t8,.NB0f0c8254 /* f0c81a8: 24040002 */ addiu $a0,$zero,0x2 -/* f0c81ac: 0fc27f9e */ jal handIsFiring +/* f0c81ac: 0fc27f9e */ jal bgunIsFiring /* f0c81b0: 00002025 */ or $a0,$zero,$zero /* f0c81b4: 54400006 */ bnezl $v0,.NB0f0c81d0 /* f0c81b8: 44805000 */ mtc1 $zero,$f10 -/* f0c81bc: 0fc27f9e */ jal handIsFiring +/* f0c81bc: 0fc27f9e */ jal bgunIsFiring /* f0c81c0: 24040001 */ addiu $a0,$zero,0x1 /* f0c81c4: 50400023 */ beqzl $v0,.NB0f0c8254 /* f0c81c8: 24040002 */ addiu $a0,$zero,0x2 /* f0c81cc: 44805000 */ mtc1 $zero,$f10 .NB0f0c81d0: /* f0c81d0: 00002025 */ or $a0,$zero,$zero -/* f0c81d4: 0fc27f9e */ jal handIsFiring +/* f0c81d4: 0fc27f9e */ jal bgunIsFiring /* f0c81d8: e7aa00b4 */ swc1 $f10,0xb4($sp) /* f0c81dc: 1040000c */ beqz $v0,.NB0f0c8210 /* f0c81e0: 00000000 */ sll $zero,$zero,0x0 -/* f0c81e4: 0fc26b9d */ jal handGetNoiseRadius +/* f0c81e4: 0fc26b9d */ jal bgunGetNoiseRadius /* f0c81e8: 00002025 */ or $a0,$zero,$zero /* f0c81ec: 44803000 */ mtc1 $zero,$f6 /* f0c81f0: 00000000 */ sll $zero,$zero,0x0 @@ -9592,22 +9592,22 @@ glabel var7f1ad8e4 /* f0c81f8: 00000000 */ sll $zero,$zero,0x0 /* f0c81fc: 45000004 */ bc1f .NB0f0c8210 /* f0c8200: 00000000 */ sll $zero,$zero,0x0 -/* f0c8204: 0fc26b9d */ jal handGetNoiseRadius +/* f0c8204: 0fc26b9d */ jal bgunGetNoiseRadius /* f0c8208: 00002025 */ or $a0,$zero,$zero /* f0c820c: e7a000b4 */ swc1 $f0,0xb4($sp) .NB0f0c8210: -/* f0c8210: 0fc27f9e */ jal handIsFiring +/* f0c8210: 0fc27f9e */ jal bgunIsFiring /* f0c8214: 24040001 */ addiu $a0,$zero,0x1 /* f0c8218: 1040000b */ beqz $v0,.NB0f0c8248 /* f0c821c: 00000000 */ sll $zero,$zero,0x0 -/* f0c8220: 0fc26b9d */ jal handGetNoiseRadius +/* f0c8220: 0fc26b9d */ jal bgunGetNoiseRadius /* f0c8224: 24040001 */ addiu $a0,$zero,0x1 /* f0c8228: c7a800b4 */ lwc1 $f8,0xb4($sp) /* f0c822c: 4600403c */ c.lt.s $f8,$f0 /* f0c8230: 00000000 */ sll $zero,$zero,0x0 /* f0c8234: 45000004 */ bc1f .NB0f0c8248 /* f0c8238: 00000000 */ sll $zero,$zero,0x0 -/* f0c823c: 0fc26b9d */ jal handGetNoiseRadius +/* f0c823c: 0fc26b9d */ jal bgunGetNoiseRadius /* f0c8240: 24040001 */ addiu $a0,$zero,0x1 /* f0c8244: e7a000b4 */ swc1 $f0,0xb4($sp) .NB0f0c8248: @@ -9615,7 +9615,7 @@ glabel var7f1ad8e4 /* f0c824c: c7ac00b4 */ lwc1 $f12,0xb4($sp) /* f0c8250: 24040002 */ addiu $a0,$zero,0x2 .NB0f0c8254: -/* f0c8254: 0fc2a675 */ jal currentPlayerSetGunSightVisible +/* f0c8254: 0fc2a675 */ jal bgunSetSightVisible /* f0c8258: 8fa50208 */ lw $a1,0x208($sp) /* f0c825c: c7ac0210 */ lwc1 $f12,0x210($sp) /* f0c8260: 44808000 */ mtc1 $zero,$f16 @@ -9647,7 +9647,7 @@ glabel var7f1ad8e4 /* f0c82c0: 00000000 */ sll $zero,$zero,0x0 /* f0c82c4: 44812000 */ mtc1 $at,$f4 /* f0c82c8: 00002025 */ or $a0,$zero,$zero -/* f0c82cc: 0fc27dd7 */ jal handGetWeaponNum +/* f0c82cc: 0fc27dd7 */ jal bgunGetWeaponNum /* f0c82d0: e7a400b0 */ swc1 $f4,0xb0($sp) /* f0c82d4: 24010016 */ addiu $at,$zero,0x16 /* f0c82d8: 5441008b */ bnel $v0,$at,.NB0f0c8508 @@ -9804,7 +9804,7 @@ glabel var7f1ad8e4 /* f0c8514: 00000000 */ sll $zero,$zero,0x0 /* f0c8518: e7a000b0 */ swc1 $f0,0xb0($sp) .NB0f0c851c: -/* f0c851c: 0fc27dd7 */ jal handGetWeaponNum +/* f0c851c: 0fc27dd7 */ jal bgunGetWeaponNum /* f0c8520: 00002025 */ or $a0,$zero,$zero /* f0c8524: 24010011 */ addiu $at,$zero,0x11 /* f0c8528: 5441000a */ bnel $v0,$at,.NB0f0c8554 @@ -10363,7 +10363,7 @@ glabel var7f1ad8e4 /* f0c8ce8: 10800008 */ beqz $a0,.NB0f0c8d0c /* f0c8cec: afa201fc */ sw $v0,0x1fc($sp) .NB0f0c8cf0: -/* f0c8cf0: 0fc27e6a */ jal func0f0a1c2c +/* f0c8cf0: 0fc27e6a */ jal bgun0f0a1c2c /* f0c8cf4: 00000000 */ sll $zero,$zero,0x0 /* f0c8cf8: 8fa201fc */ lw $v0,0x1fc($sp) /* f0c8cfc: 0002202a */ slt $a0,$zero,$v0 @@ -10377,7 +10377,7 @@ glabel var7f1ad8e4 /* f0c8d18: 10800008 */ beqz $a0,.NB0f0c8d3c /* f0c8d1c: afa20200 */ sw $v0,0x200($sp) .NB0f0c8d20: -/* f0c8d20: 0fc27e33 */ jal func0f0a1b50 +/* f0c8d20: 0fc27e33 */ jal bgun0f0a1b50 /* f0c8d24: 00000000 */ sll $zero,$zero,0x0 /* f0c8d28: 8fa20200 */ lw $v0,0x200($sp) /* f0c8d2c: 0002202a */ slt $a0,$zero,$v0 @@ -10396,7 +10396,7 @@ glabel var7f1ad8e4 .NB0f0c8d58: /* f0c8d58: 1320007d */ beqz $t9,.NB0f0c8f50 /* f0c8d5c: 8faf01b8 */ lw $t7,0x1b8($sp) -/* f0c8d60: 0fc29c5c */ jal currentPlayerSetAimType +/* f0c8d60: 0fc29c5c */ jal bgunSetAimType /* f0c8d64: 00002025 */ or $a0,$zero,$zero /* f0c8d68: 8fa8022c */ lw $t0,0x22c($sp) /* f0c8d6c: 11000015 */ beqz $t0,.NB0f0c8dc4 @@ -10423,7 +10423,7 @@ glabel var7f1ad8e4 /* f0c8dbc: 5440000b */ bnezl $v0,.NB0f0c8dec /* f0c8dc0: 00008025 */ or $s0,$zero,$zero .NB0f0c8dc4: -/* f0c8dc4: 0fc27dd7 */ jal handGetWeaponNum +/* f0c8dc4: 0fc27dd7 */ jal bgunGetWeaponNum /* f0c8dc8: 00002025 */ or $a0,$zero,$zero /* f0c8dcc: 2401000a */ addiu $at,$zero,0xa /* f0c8dd0: 54410037 */ bnel $v0,$at,.NB0f0c8eb0 @@ -10434,7 +10434,7 @@ glabel var7f1ad8e4 /* f0c8de4: 15810031 */ bne $t4,$at,.NB0f0c8eac /* f0c8de8: 00008025 */ or $s0,$zero,$zero .NB0f0c8dec: -/* f0c8dec: 0fc27dd7 */ jal handGetWeaponNum +/* f0c8dec: 0fc27dd7 */ jal bgunGetWeaponNum /* f0c8df0: 00002025 */ or $a0,$zero,$zero /* f0c8df4: 2401000a */ addiu $at,$zero,0xa /* f0c8df8: 54410008 */ bnel $v0,$at,.NB0f0c8e1c @@ -10477,12 +10477,12 @@ glabel var7f1ad8e4 /* f0c8e80: c4207c0c */ lwc1 $f0,0x7c0c($at) /* f0c8e84: 44060000 */ mfc1 $a2,$f0 /* f0c8e88: 44070000 */ mfc1 $a3,$f0 -/* f0c8e8c: 0fc27852 */ jal func0f0a0394 +/* f0c8e8c: 0fc27852 */ jal bgun0f0a0394 /* f0c8e90: 00000000 */ sll $zero,$zero,0x0 /* f0c8e94: 10000043 */ beqz $zero,.NB0f0c8fa4 /* f0c8e98: 8fbf0034 */ lw $ra,0x34($sp) .NB0f0c8e9c: -/* f0c8e9c: 0fc27a39 */ jal currentPlayerSwivelGunTowards +/* f0c8e9c: 0fc27a39 */ jal bgunSwivelTowards /* f0c8ea0: 8ca61b68 */ lw $a2,0x1b68($a1) /* f0c8ea4: 1000003f */ beqz $zero,.NB0f0c8fa4 /* f0c8ea8: 8fbf0034 */ lw $ra,0x34($sp) @@ -10527,14 +10527,14 @@ glabel var7f1ad8e4 /* f0c8f34: 44061000 */ mfc1 $a2,$f2 /* f0c8f38: 46049300 */ add.s $f12,$f18,$f4 /* f0c8f3c: c4b201b8 */ lwc1 $f18,0x1b8($a1) -/* f0c8f40: 0fc27a39 */ jal currentPlayerSwivelGunTowards +/* f0c8f40: 0fc27a39 */ jal bgunSwivelTowards /* f0c8f44: 46124380 */ add.s $f14,$f8,$f18 /* f0c8f48: 10000016 */ beqz $zero,.NB0f0c8fa4 /* f0c8f4c: 8fbf0034 */ lw $ra,0x34($sp) .NB0f0c8f50: /* f0c8f50: 51e00014 */ beqzl $t7,.NB0f0c8fa4 /* f0c8f54: 8fbf0034 */ lw $ra,0x34($sp) -/* f0c8f58: 0fc29c5c */ jal currentPlayerSetAimType +/* f0c8f58: 0fc29c5c */ jal bgunSetAimType /* f0c8f5c: 00002025 */ or $a0,$zero,$zero /* f0c8f60: 8fa30248 */ lw $v1,0x248($sp) /* f0c8f64: 8fa4024c */ lw $a0,0x24c($sp) @@ -10550,7 +10550,7 @@ glabel var7f1ad8e4 /* f0c8f8c: 00000000 */ sll $zero,$zero,0x0 /* f0c8f90: 46004482 */ mul.s $f18,$f8,$f0 /* f0c8f94: 46023303 */ div.s $f12,$f6,$f2 -/* f0c8f98: 0fc27a53 */ jal func0f0a0b98 +/* f0c8f98: 0fc27a53 */ jal bgun0f0a0b98 /* f0c8f9c: 46029383 */ div.s $f14,$f18,$f2 .NB0f0c8fa0: /* f0c8fa0: 8fbf0034 */ lw $ra,0x34($sp) @@ -10632,7 +10632,7 @@ glabel var7f1ad8e4 // s32 i; // // controlmode = optionsGetControlMode(g_Vars.currentplayerstats->mpindex); -// weaponnum = handGetWeaponNum(HAND_RIGHT); +// weaponnum = bgunGetWeaponNum(HAND_RIGHT); // sp1a8 = weaponHasClassFlag(weaponnum, WEAPONCLASSFLAG_MANUALZOOM); // contpad1 = optionsGetContpadNum1(g_Vars.currentplayerstats->mpindex); // @@ -10836,7 +10836,7 @@ glabel var7f1ad8e4 // } // // // 9298 -// if (handGetWeaponNum(HAND_RIGHT) == WEAPON_HORIZONSCANNER) { +// if (bgunGetWeaponNum(HAND_RIGHT) == WEAPON_HORIZONSCANNER) { // g_Vars.currentplayer->insightaimmode = true; // } // @@ -10945,13 +10945,13 @@ glabel var7f1ad8e4 // if (g_Vars.currentplayer->usedowntime >= -1) { // if (joyGetButtonsPressedOnSample(i, shootpad, shootallowedbuttons & Z_TRIG) // && g_Vars.currentplayer->usedowntime > -1 -// && currentPlayerConsiderToggleGunFunction(g_Vars.currentplayer->usedowntime, 1, 0)) { +// && bgunConsiderToggleGunFunction(g_Vars.currentplayer->usedowntime, 1, 0)) { // g_Vars.currentplayer->usedowntime = -3; // } // // if (g_Vars.currentplayer->usedowntime > -1) { // if (g_Vars.currentplayer->usedowntime > 25) { -// lVar8 = currentPlayerConsiderToggleGunFunction(g_Vars.currentplayer->usedowntime, 0, 0); +// lVar8 = bgunConsiderToggleGunFunction(g_Vars.currentplayer->usedowntime, 0, 0); // // if (lVar8 == 1) { // g_Vars.currentplayer->usedowntime = -1; @@ -10965,7 +10965,7 @@ glabel var7f1ad8e4 // } // } // } else if (g_Vars.currentplayer->usedowntime >= -2) { -// currentPlayerConsiderToggleGunFunction(g_Vars.currentplayer->usedowntime, 0, 0); +// bgunConsiderToggleGunFunction(g_Vars.currentplayer->usedowntime, 0, 0); // } // } else { // // Released B - activate or reload @@ -10974,7 +10974,7 @@ glabel var7f1ad8e4 // } // // g_Vars.currentplayer->usedowntime = 0; -// func0f0a8c50(); +// bgun0f0a8c50(); // } // } // } @@ -11061,7 +11061,7 @@ glabel var7f1ad8e4 // } // // // 9a24 -// if (handGetWeaponNum(HAND_RIGHT) == WEAPON_FARSIGHT) { +// if (bgunGetWeaponNum(HAND_RIGHT) == WEAPON_FARSIGHT) { // if (g_Vars.currentplayer->insightaimmode) { // movedata.unk14 = 0; // } @@ -11099,7 +11099,7 @@ glabel var7f1ad8e4 // g_Vars.currentplayer->waitforzrelease = false; // } // -// if (weaponHasFlag(handGetWeaponNum(HAND_RIGHT), WEAPONFLAG_80000000)) { +// if (weaponHasFlag(bgunGetWeaponNum(HAND_RIGHT), WEAPONFLAG_80000000)) { // if (arg2 // && joyGetButtonsPressedThisFrame(shootpad, shootallowedbuttons & Z_TRIG) // && g_Vars.currentplayer->pausemode == PAUSEMODE_UNPAUSED) { @@ -11157,7 +11157,7 @@ glabel var7f1ad8e4 // } // // // 9d98 -// if (handGetWeaponNum(HAND_RIGHT) == WEAPON_HORIZONSCANNER) { +// if (bgunGetWeaponNum(HAND_RIGHT) == WEAPON_HORIZONSCANNER) { // g_Vars.currentplayer->insightaimmode = true; // } // @@ -11325,13 +11325,13 @@ glabel var7f1ad8e4 // if (g_Vars.currentplayer->usedowntime >= -1) { // if (joyGetButtonsPressedOnSample(i, contpad1, shootbuttons & c1allowedbuttons) // && g_Vars.currentplayer->usedowntime >= 0 -// && currentPlayerConsiderToggleGunFunction(g_Vars.currentplayer->usedowntime, 1, 0)) { +// && bgunConsiderToggleGunFunction(g_Vars.currentplayer->usedowntime, 1, 0)) { // g_Vars.currentplayer->usedowntime = -3; // } // // if (g_Vars.currentplayer->usedowntime >= 0) { // if (g_Vars.currentplayer->usedowntime > 25) { -// s32 result = currentPlayerConsiderToggleGunFunction(g_Vars.currentplayer->usedowntime, 0, 0); +// s32 result = bgunConsiderToggleGunFunction(g_Vars.currentplayer->usedowntime, 0, 0); // // if (result == 1) { // g_Vars.currentplayer->usedowntime = -1; @@ -11346,7 +11346,7 @@ glabel var7f1ad8e4 // } // } else { // if (g_Vars.currentplayer->usedowntime >= -2) { -// currentPlayerConsiderToggleGunFunction(g_Vars.currentplayer->usedowntime, 0, 0); +// bgunConsiderToggleGunFunction(g_Vars.currentplayer->usedowntime, 0, 0); // } // } // } else { @@ -11356,7 +11356,7 @@ glabel var7f1ad8e4 // } // // g_Vars.currentplayer->usedowntime = 0; -// func0f0a8c50(); +// bgun0f0a8c50(); // } // } // } @@ -11368,7 +11368,7 @@ glabel var7f1ad8e4 // spbc = 1; // // // @bug? Should this be HAND_RIGHT? -// if (handGetWeaponNum(HAND_LEFT) == WEAPON_FARSIGHT) { +// if (bgunGetWeaponNum(HAND_LEFT) == WEAPON_FARSIGHT) { // increment = 0.5f; // } // @@ -11440,7 +11440,7 @@ glabel var7f1ad8e4 // && joyGetButtons(contpad1, c1allowedbuttons & (D_JPAD | D_CBUTTONS)); // } // -// if (handGetWeaponNum(HAND_RIGHT) == WEAPON_FARSIGHT) { +// if (bgunGetWeaponNum(HAND_RIGHT) == WEAPON_FARSIGHT) { // movedata.farsighttempautoseek = g_Vars.currentplayer->insightaimmode && (sp1a2 & (L_TRIG | R_TRIG | L_CBUTTONS | R_CBUTTONS)); // } else { // movedata.rleanleft = g_Vars.currentplayer->insightaimmode && (sp1a2 & (L_JPAD | L_CBUTTONS)); @@ -11469,7 +11469,7 @@ glabel var7f1ad8e4 // g_Vars.currentplayer->waitforzrelease = false; // } // -// if (weaponHasFlag(handGetWeaponNum(HAND_RIGHT), WEAPONFLAG_80000000)) { +// if (weaponHasFlag(bgunGetWeaponNum(HAND_RIGHT), WEAPONFLAG_80000000)) { // if ((sp1a0 & shootbuttons) // && g_Vars.currentplayer->pausemode == PAUSEMODE_UNPAUSED) { // movedata.btapcount++; @@ -11507,24 +11507,24 @@ glabel var7f1ad8e4 // movedata.speedvertadown = tmp; // } // -// handsTick(movedata.triggeron); +// bgunsTick(movedata.triggeron); // // // a944 -// if (g_Vars.bondvisible && (handIsFiring(0) || handIsFiring(1))) { +// if (g_Vars.bondvisible && (bgunIsFiring(0) || bgunIsFiring(1))) { // spb4 = 0; // -// if (handIsFiring(0) && handGetNoiseRadius(0) > spb4) { -// spb4 = handGetNoiseRadius(0); +// if (bgunIsFiring(0) && bgunGetNoiseRadius(0) > spb4) { +// spb4 = bgunGetNoiseRadius(0); // } // -// if (handIsFiring(1) && handGetNoiseRadius(1) > spb4) { -// spb4 = handGetNoiseRadius(1); +// if (bgunIsFiring(1) && bgunGetNoiseRadius(1) > spb4) { +// spb4 = bgunGetNoiseRadius(1); // } // // func0f028590(spb4); // } // -// currentPlayerSetGunSightVisible(GUNSIGHTREASON_AIMING, movedata.unk54); +// bgunSetSightVisible(GUNSIGHTREASON_AIMING, movedata.unk54); // // if (movedata.zoomoutfovpersec > 0) { // currentPlayerZoomOut(movedata.zoomoutfovpersec); @@ -11539,7 +11539,7 @@ glabel var7f1ad8e4 // spb0 = 60; // // // FarSight in secondary function -// if (handGetWeaponNum(HAND_RIGHT) == WEAPON_FARSIGHT +// if (bgunGetWeaponNum(HAND_RIGHT) == WEAPON_FARSIGHT // && g_Vars.currentplayer->insightaimmode // && movedata.farsighttempautoseek == false // && g_Vars.currentplayer->hands[HAND_RIGHT].weaponfunc == FUNC_SECONDARY @@ -11577,7 +11577,7 @@ glabel var7f1ad8e4 // spb0 = currentPlayerGetGunZoomFov(); // } // -// if (handGetWeaponNum(HAND_RIGHT) == WEAPON_AR34 +// if (bgunGetWeaponNum(HAND_RIGHT) == WEAPON_AR34 // && g_Vars.currentplayer->hands[HAND_RIGHT].weaponfunc == FUNC_SECONDARY) { // spb0 = currentPlayerGetGunZoomFov(); // } @@ -11792,11 +11792,11 @@ glabel var7f1ad8e4 // // b4a4 // if (cancycleweapons) { // while (movedata.weaponbackoffset--) { -// func0f0a1c2c(); +// bgun0f0a1c2c(); // } // // while (movedata.weaponforwardoffset--) { -// func0f0a1b50(); +// bgun0f0a1b50(); // } // } // @@ -11804,7 +11804,7 @@ glabel var7f1ad8e4 // if (g_Vars.currentplayer->unk1c64) { // g_Vars.currentplayer->unk1c64 = 0; // } else /*b528*/ if (movedata.canswivelgun) { -// currentPlayerSetAimType(0); +// bgunSetAimType(0); // // // b538 // if ( @@ -11815,11 +11815,11 @@ glabel var7f1ad8e4 // && g_Vars.currentplayer->autoyaimprop // && weaponHasClassFlag(weaponnum, WEAPONCLASSFLAG_AUTOAIM) // ) -// || (handGetWeaponNum(HAND_RIGHT) == WEAPON_CMP150 && g_Vars.currentplayer->hands[HAND_RIGHT].weaponfunc == FUNC_SECONDARY)) { +// || (bgunGetWeaponNum(HAND_RIGHT) == WEAPON_CMP150 && g_Vars.currentplayer->hands[HAND_RIGHT].weaponfunc == FUNC_SECONDARY)) { // // Auto aim - move crosshair towards target // s32 followlockon = false; // -// if (handGetWeaponNum(HAND_RIGHT) == WEAPON_CMP150 +// if (bgunGetWeaponNum(HAND_RIGHT) == WEAPON_CMP150 // && g_Vars.currentplayer->hands[HAND_RIGHT].weaponfunc == FUNC_SECONDARY) { // followlockon = true; // } @@ -11833,10 +11833,10 @@ glabel var7f1ad8e4 // } // // if (followlockon) { -// func0f0a0394(g_Vars.currentplayer->autoaimx, g_Vars.currentplayer->autoaimy, +// bgun0f0a0394(g_Vars.currentplayer->autoaimx, g_Vars.currentplayer->autoaimy, // 0.915f, 0.915f); // } else { -// currentPlayerSwivelGunTowards(g_Vars.currentplayer->autoaimx, g_Vars.currentplayer->autoaimy, +// bgunSwivelTowards(g_Vars.currentplayer->autoaimx, g_Vars.currentplayer->autoaimy, // g_Vars.currentplayer->autoaimdamp); // } // } else { @@ -11850,7 +11850,7 @@ glabel var7f1ad8e4 // g_Vars.currentplayer->autoaimdamp = 0.979f; // } // -// currentPlayerSwivelGunTowards( +// bgunSwivelTowards( // g_Vars.currentplayer->speedtheta * 0.3f + g_Vars.currentplayer->gunextraaimx, // -g_Vars.currentplayer->speedverta * 0.1f + g_Vars.currentplayer->gunextraaimy, // g_Vars.currentplayer->autoaimdamp); @@ -11858,8 +11858,8 @@ glabel var7f1ad8e4 // } else if (movedata.canmanualaim) { // // Adjust crosshair's position on screen // // when holding aim and moving stick -// currentPlayerSetAimType(0); -// func0f0a0b98( +// bgunSetAimType(0); +// bgun0f0a0b98( // (movedata.c1stickxraw * 0.65f) / 80.0f, // (movedata.c1stickyraw * 0.65f) / 80.0f); // } diff --git a/src/game/bondwalk.c b/src/game/bondwalk.c index b785709be..76e57d1de 100644 --- a/src/game/bondwalk.c +++ b/src/game/bondwalk.c @@ -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) diff --git a/src/game/chr/chr.c b/src/game/chr/chr.c index 2eecb0c12..90bc94761 100644 --- a/src/game/chr/chr.c +++ b/src/game/chr/chr.c @@ -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 diff --git a/src/game/chr/chraction.c b/src/game/chr/chraction.c index 013fca981..1ba43f9c6 100644 --- a/src/game/chr/chraction.c +++ b/src/game/chr/chraction.c @@ -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); diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c index f5c704a12..360cf0327 100644 --- a/src/game/chr/chraicommands.c +++ b/src/game/chr/chraicommands.c @@ -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; diff --git a/src/game/endscreen.c b/src/game/endscreen.c index f16d85044..739240d29 100644 --- a/src/game/endscreen.c +++ b/src/game/endscreen.c @@ -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 diff --git a/src/game/game_010b20.c b/src/game/game_010b20.c index 3eff9afc2..46ea9c4e8 100644 --- a/src/game/game_010b20.c +++ b/src/game/game_010b20.c @@ -1,7 +1,7 @@ #include #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(); } diff --git a/src/game/game_011110.c b/src/game/game_011110.c index b8db5e80e..62a0d0816 100644 --- a/src/game/game_011110.c +++ b/src/game/game_011110.c @@ -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) { diff --git a/src/game/game_01b0a0.c b/src/game/game_01b0a0.c index 95a1a38fc..fbb2b0485 100644 --- a/src/game/game_01b0a0.c +++ b/src/game/game_01b0a0.c @@ -1,7 +1,7 @@ #include #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" diff --git a/src/game/game_01bea0.c b/src/game/game_01bea0.c index de6898c48..1f8a6ec5b 100644 --- a/src/game/game_01bea0.c +++ b/src/game/game_01bea0.c @@ -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; // } // } diff --git a/src/game/game_0abe70.c b/src/game/game_0abe70.c index afc603059..c2ed22542 100644 --- a/src/game/game_0abe70.c +++ b/src/game/game_0abe70.c @@ -1,7 +1,7 @@ #include #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 diff --git a/src/game/game_0b0fd0.c b/src/game/game_0b0fd0.c index 296432477..6769d31fd 100644 --- a/src/game/game_0b0fd0.c +++ b/src/game/game_0b0fd0.c @@ -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; } diff --git a/src/game/game_0b63b0.c b/src/game/game_0b63b0.c index 754074d1f..6a8144044 100644 --- a/src/game/game_0b63b0.c +++ b/src/game/game_0b63b0.c @@ -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" diff --git a/src/game/game_0b69d0.c b/src/game/game_0b69d0.c index a97f0029a..a0c3d62af 100644 --- a/src/game/game_0b69d0.c +++ b/src/game/game_0b69d0.c @@ -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; diff --git a/src/game/game_0e0770.c b/src/game/game_0e0770.c index ecaa71cf5..b6747e6de 100644 --- a/src/game/game_0e0770.c +++ b/src/game/game_0e0770.c @@ -1,7 +1,7 @@ #include #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) diff --git a/src/game/game_0f09f0.c b/src/game/game_0f09f0.c index c9a4ca74d..2a44c1e8a 100644 --- a/src/game/game_0f09f0.c +++ b/src/game/game_0f09f0.c @@ -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) diff --git a/src/game/game_102240.c b/src/game/game_102240.c index 429f9b175..5cbb31e0f 100644 --- a/src/game/game_102240.c +++ b/src/game/game_102240.c @@ -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: diff --git a/src/game/game_127910.c b/src/game/game_127910.c index e83098738..12d3f8d82 100644 --- a/src/game/game_127910.c +++ b/src/game/game_127910.c @@ -1,7 +1,7 @@ #include #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) { diff --git a/src/game/game_190260.c b/src/game/game_190260.c index ea3957cbd..15cca61f9 100644 --- a/src/game/game_190260.c +++ b/src/game/game_190260.c @@ -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 diff --git a/src/game/game_1999b0.c b/src/game/game_1999b0.c index ab6dbf068..6064ece3b 100644 --- a/src/game/game_1999b0.c +++ b/src/game/game_1999b0.c @@ -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); diff --git a/src/game/game_1a7560.c b/src/game/game_1a7560.c index 12d404f9d..e95fd7aa1 100644 --- a/src/game/game_1a7560.c +++ b/src/game/game_1a7560.c @@ -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" diff --git a/src/game/inventory/inventory.c b/src/game/inventory/inventory.c index 87adeaf14..b595bb4db 100644 --- a/src/game/inventory/inventory.c +++ b/src/game/inventory/inventory.c @@ -1,7 +1,7 @@ #include #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; diff --git a/src/game/lv.c b/src/game/lv.c index 0632a19de..4bc9902f3 100644 --- a/src/game/lv.c +++ b/src/game/lv.c @@ -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 diff --git a/src/game/mplayer/mplayer.c b/src/game/mplayer/mplayer.c index 3c5e654ae..baf8a7890 100644 --- a/src/game/mplayer/mplayer.c +++ b/src/game/mplayer/mplayer.c @@ -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--; diff --git a/src/game/mplayer/scenarios.c b/src/game/mplayer/scenarios.c index e81a24807..a54778b32 100644 --- a/src/game/mplayer/scenarios.c +++ b/src/game/mplayer/scenarios.c @@ -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; diff --git a/src/game/mpstats.c b/src/game/mpstats.c index 8ea14b0d5..8cabf5441 100644 --- a/src/game/mpstats.c +++ b/src/game/mpstats.c @@ -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" diff --git a/src/game/prop.c b/src/game/prop.c index f17954307..0b5a36c8d 100644 --- a/src/game/prop.c +++ b/src/game/prop.c @@ -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; } diff --git a/src/game/propobj.c b/src/game/propobj.c index b77ab0ad0..c0c0eb6bc 100644 --- a/src/game/propobj.c +++ b/src/game/propobj.c @@ -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) diff --git a/src/game/sight.c b/src/game/sight.c index 161bc7680..d41c2ae59 100644 --- a/src/game/sight.c +++ b/src/game/sight.c @@ -1,7 +1,7 @@ #include #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; } diff --git a/src/game/title.c b/src/game/title.c index 5cb0ba272..ef2c86299 100644 --- a/src/game/title.c +++ b/src/game/title.c @@ -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; diff --git a/src/game/training/menus.c b/src/game/training/menus.c index b7499f3fb..b90a12674 100644 --- a/src/game/training/menus.c +++ b/src/game/training/menus.c @@ -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) diff --git a/src/game/training/training.c b/src/game/training/training.c index 4847e9d5e..26e6db04f 100644 --- a/src/game/training/training.c +++ b/src/game/training/training.c @@ -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; diff --git a/src/include/game/bondgun.h b/src/include/game/bondgun.h new file mode 100644 index 000000000..351c6ad65 --- /dev/null +++ b/src/include/game/bondgun.h @@ -0,0 +1,183 @@ +#ifndef _IN_GAME_BONDGUN_H +#define _IN_GAME_BONDGUN_H +#include +#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 diff --git a/src/include/game/game_097ba0.h b/src/include/game/game_097ba0.h deleted file mode 100644 index 5d65b5fac..000000000 --- a/src/include/game/game_097ba0.h +++ /dev/null @@ -1,183 +0,0 @@ -#ifndef _IN_GAME_GAME_097BA0_H -#define _IN_GAME_GAME_097BA0_H -#include -#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 diff --git a/src/include/types.h b/src/include/types.h index 036d8d8c5..a552444e8 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -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 diff --git a/tools/patchpiracysums b/tools/patchpiracysums index 29b77ab0d..aea1351e4 100755 --- a/tools/patchpiracysums +++ b/tools/patchpiracysums @@ -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')