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

Decompile func0f010bb0

This commit is contained in:
Ryan Dwyer 2021-01-03 21:16:55 +10:00
parent 2dd434f0b1
commit b4fe2ded7f
15 changed files with 321 additions and 924 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/files/setup/setupcave.c
View File

@ -528,7 +528,7 @@ s32 intro[] = {
ammo(AMMOTYPE_CROSSBOW, 12)
ammo(AMMOTYPE_PROXY_MINE, 3)
ammo(AMMOTYPE_RIFLE, 30)
intro_weapon(WEAPON_CAMSPY, -1)
intro_weapon(WEAPON_EYESPY, -1)
outfit(OUTFIT_SNOW)
endintro
};

2
src/files/setup/setupdepo.c
View File

@ -435,7 +435,7 @@ s32 intro[] = {
ammo(AMMOTYPE_NBOMB, 6)
outfit(OUTFIT_LEATHER)
intro_weapon(WEAPON_DOORDECODER, -1)
intro_weapon(WEAPON_CAMSPY, -1)
intro_weapon(WEAPON_EYESPY, -1)
spawn(0x0083)
endintro
};

6
src/files/setup/setupdish.c
View File

@ -313,7 +313,7 @@ u32 props[] = {
tag(0x32, 1)
multimonitor(0x0140, MODEL_CIHUB, 0x0239, 0x00000002, 0x00000000, 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x03000000)
tag(0x26, 1)
weapon(0x0100, MODEL_CHREYESPY, 0xffff, 0x00100001, 0x00080000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, WEAPON_CAMSPY, 0x00ffffff, 0x00000000)
weapon(0x0100, MODEL_CHREYESPY, 0xffff, 0x00100001, 0x00080000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, WEAPON_EYESPY, 0x00ffffff, 0x00000000)
tag(0x27, 1)
weapon(0x0180, MODEL_CHRNIGHTSIGHT, 0xffff, 0x00100001, 0x00080000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, WEAPON_NIGHTVISION, 0x00ffffff, 0x00000000)
tag(0x34, 1)
@ -843,13 +843,13 @@ u8 func1002_devicetraining_camspy[] = {
label(0x2f)
label(0x8d)
remove_hudmsgs
if_chr_weapon_equipped(CHR_BOND, WEAPON_CAMSPY, /*goto*/ 0x2f)
if_chr_weapon_equipped(CHR_BOND, WEAPON_EYESPY, /*goto*/ 0x2f)
show_hudmsg_middle(0x01, COLOR_04_ORANGE, L_DISH(57)) // "Select the CamSpy. - Hold A Button. - Use Control Stick to change selection. - Highlight CamSpy and release A Button."
restart_timer
beginloop(0x8e)
if_stage_flag_eq(STAGEFLAG_DEVICE_ABORTING, TRUE, /*goto*/ 0x90)
if_player_using_device(CHR_BOND, WEAPON_CAMSPY, /*goto*/ 0x2f)
if_player_using_device(CHR_BOND, WEAPON_EYESPY, /*goto*/ 0x2f)
if_timer_gt(1200, /*goto*/ 0x06)
endloop(0x8e)

2
src/files/setup/setupear.c
View File

@ -632,7 +632,7 @@ s32 intro[] = {
intro_weapon(WEAPON_FALCON2, -1)
ammo(AMMOTYPE_PISTOL, 100)
ammo(AMMOTYPE_RIFLE, 50)
intro_weapon(WEAPON_CAMSPY, -1)
intro_weapon(WEAPON_EYESPY, -1)
outfit(OUTFIT_DEFAULT)
spawn(0x001b)
endintro

2
src/files/setup/setuppete.c
View File

@ -273,7 +273,7 @@ u32 props[] = {
door(0x0100, MODEL_DD_OFFICEDOOR, 0x0105, 0x20000000, 0x10000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, 0x005a0000, 0x03e80000, 0x00640000, 0x00640000, 0x00010000, 0x00000005, 0x00000001, 0x000005dc, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xffffffff, 0x00000000, 0x00000000, 0x00000000, 0xff000000, 0x00000000, 0x00000000, 0x00000000)
tag(0x25, 1)
stdobject(0x0100, MODEL_DUMPSTER, 0x011e, 0x004001e1, 0x00004000, 0x00000801, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000)
weapon(0x0100, MODEL_CHRBRIEFCASE, 0xffff, 0x40008000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, WEAPON_CAMSPY, 0x00ffffff, 0x00000000)
weapon(0x0100, MODEL_CHRBRIEFCASE, 0xffff, 0x40008000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000, WEAPON_EYESPY, 0x00ffffff, 0x00000000)
tag(0x24, -1)
stdobject(0x0100, MODEL_BARREL, 0x010b, 0x000001e1, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000)
stdobject(0x0100, MODEL_BARREL, 0x010c, 0x000001e1, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000003e8, 0x00000000, 0x00000000, 0x0fff0000)

2
src/files/setup/setupwax.c
View File

@ -561,7 +561,7 @@ u32 props[] = {
s32 intro[] = {
intro_weapon(WEAPON_MAULER, -1)
ammo(AMMOTYPE_PISTOL, 100)
intro_weapon(WEAPON_CAMSPY, -1)
intro_weapon(WEAPON_EYESPY, -1)
outfit(OUTFIT_MRBLONDE)
intro_weapon(WEAPON_CLOAKINGDEVICE, -1)
#if VERSION == VERSION_PAL_FINAL

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

@ -5204,7 +5204,7 @@ bool aiShowObj(void)
if (g_Vars.currentplayer->eyespy == NULL && obj->type == OBJTYPE_WEAPON) {
struct weaponobj *weapon = (struct weaponobj *) obj;
if (weapon->weaponnum == WEAPON_CAMSPY) {
if (weapon->weaponnum == WEAPON_EYESPY) {
currentPlayerInitEyespy();
}
}

1114
src/game/game_010b20.c
View File

File diff suppressed because it is too large Load Diff

6
src/game/game_011110.c
View File

@ -450,8 +450,8 @@ void currentPlayerInitEyespy(void)
if (stageGetIndex(g_Vars.stagenum) == STAGEINDEX_AIRBASE) {
g_Vars.currentplayer->eyespy->mode = EYESPYMODE_DRUGSPY;
g_Weapons[WEAPON_CAMSPY]->name = L_GUN(61); // "DrugSpy"
g_Weapons[WEAPON_CAMSPY]->shortname = L_GUN(61); // "DrugSpy"
g_Weapons[WEAPON_EYESPY]->name = L_GUN(61); // "DrugSpy"
g_Weapons[WEAPON_EYESPY]->shortname = L_GUN(61); // "DrugSpy"
} else if (stageGetIndex(g_Vars.stagenum) == STAGEINDEX_MBR || stageGetIndex(g_Vars.stagenum) == STAGEINDEX_CHICAGO) {
g_Vars.currentplayer->eyespy->mode = EYESPYMODE_BOMBSPY;
} else {
@ -1368,7 +1368,7 @@ glabel var7f1a827c
// hasdefaultweapon = true;
// }
//
// if (cmd[1] == WEAPON_CAMSPY) {
// if (cmd[1] == WEAPON_EYESPY) {
// haseyespy = true;
// }
// }

2
src/game/game_102240.c
View File

@ -3422,7 +3422,7 @@ char *invMenuTextWeaponDescription(struct menuitem *item)
struct weapon *weapon = weaponFindById(g_InventoryWeapon);
if (weapon) {
if (g_InventoryWeapon == WEAPON_CAMSPY && g_Vars.currentplayer->eyespy) {
if (g_InventoryWeapon == WEAPON_EYESPY && g_Vars.currentplayer->eyespy) {
if (g_Vars.currentplayer->eyespy->mode == EYESPYMODE_DRUGSPY) {
return langGet(L_GUN(237)); // Drugspy description
}

8
src/game/propobj.c
View File

@ -37854,7 +37854,7 @@ void func0f087d10(s32 weaponnum)
sound = 0xf2;
} else if (weaponnum == WEAPON_BOLT) {
sound = 0xe8;
} else if (weaponnum == WEAPON_CAMSPY) {
} else if (weaponnum == WEAPON_EYESPY) {
sound = 0xe5;
} else if (weaponnum > WEAPON_PSYCHOSISGUN) {
sound = 0xe5;
@ -38111,7 +38111,7 @@ void weaponGetPickupText(char *buffer, s32 weaponnum, bool dual)
if (full) {
strcat(buffer, langGet(L_PROPOBJ(0))); // "Picked up"
if (weaponnum == WEAPON_CAMSPY && g_Vars.currentplayer->eyespy) {
if (weaponnum == WEAPON_EYESPY && g_Vars.currentplayer->eyespy) {
textid = L_PROPOBJ(50); // "your"
} else if (weaponHasFlag(weaponnum, WEAPONFLAG_DETERMINER_F_SOME)) {
textid = L_PROPOBJ(2); // "some"
@ -38125,7 +38125,7 @@ void weaponGetPickupText(char *buffer, s32 weaponnum, bool dual)
strcat(buffer, langGet(textid));
} else {
if (weaponnum == WEAPON_CAMSPY && g_Vars.currentplayer->eyespy) {
if (weaponnum == WEAPON_EYESPY && g_Vars.currentplayer->eyespy) {
textid = L_PROPOBJ(51); // "Your"
} else if (weaponHasFlag(weaponnum, WEAPONFLAG_DETERMINER_S_SOME)) {
textid = L_PROPOBJ(3); // "Some"
@ -39036,7 +39036,7 @@ glabel var7f1aae70
// }
// }
//
// if (weapon->weaponnum == WEAPON_CAMSPY && g_Vars.currentplayer->eyespy == NULL) {
// if (weapon->weaponnum == WEAPON_EYESPY && g_Vars.currentplayer->eyespy == NULL) {
// currentPlayerInitEyespy();
// }
//

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

@ -4852,7 +4852,7 @@ u32 dtGetWeaponByDeviceIndex(s32 deviceindex)
u32 weapons[] = {
WEAPON_DATAUPLINK,
WEAPON_ECMMINE,
WEAPON_CAMSPY,
WEAPON_EYESPY,
WEAPON_NIGHTVISION,
WEAPON_DOORDECODER,
WEAPON_RTRACKER,

4
src/include/constants.h
View File

@ -3170,7 +3170,7 @@
#define WEAPON_RCP45 0x2b
#define WEAPON_PSYCHOSISGUN 0x2c
#define WEAPON_NIGHTVISION 0x2d
#define WEAPON_CAMSPY 0x2e
#define WEAPON_EYESPY 0x2e
#define WEAPON_XRAYSCANNER 0x2f
#define WEAPON_IRSCANNER 0x30
#define WEAPON_CLOAKINGDEVICE 0x31
@ -3230,6 +3230,8 @@
#define WEAPONFLAG_DETERMINER_F_AN 0x00400000 // "Picked up an ..." (full version)
#define WEAPONFLAG_DETERMINER_S_THE 0x00800000 // "The ..." (short version - when vertically split)
#define WEAPONFLAG_DETERMINER_F_THE 0x01000000 // "Picked up the ..." (full version)
#define WEAPONFLAG_00200000 0x00200000 // Camspy related
#define WEAPONFLAG_00400000 0x00400000 // Camspy related
#define WEAPONFLAG_08000000 0x08000000
#define WEAPONFLAG_DETERMINER_S_SOME 0x10000000 // "Some ..." (short version - when vertically split)
#define WEAPONFLAG_DETERMINER_F_SOME 0x20000000 // "Picked up some ..." (full version)

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

@ -49,10 +49,10 @@ u32 func0f09cb5c(void);
u32 func0f09cd18(void);
void func0f09cdc4(s32 hand);
void func0f09ce8c(void);
u32 func0f09ceac(void);
void func0f09ceac(void);
f32 func0f09cf58(u32 arg0);
void func0f09cf88(void);
u32 func0f09d140(void);
void func0f09d140(s32 hand);
u32 func0f09d550(void);
u32 func0f09d8dc(void);
u32 func0f09dd7c(void);

87
src/include/types.h
View File

@ -1732,40 +1732,40 @@ struct hand {
/*0x06a0*/ u32 unk06a0;
/*0x06a4*/ u32 unk06a4;
/*0x06a8*/ u32 unk06a8;
/*0x06ac*/ u32 unk06ac;
/*0x06ac*/ f32 unk06ac;
/*0x06b0*/ u32 unk06b0;
/*0x06b4*/ u32 unk06b4;
/*0x06b8*/ u32 unk06b8;
/*0x06bc*/ u32 unk06bc;
/*0x06c0*/ u32 unk06c0;
/*0x06c0*/ f32 unk06c0;
/*0x06c4*/ u32 unk06c4;
/*0x06c8*/ u32 unk06c8;
/*0x06cc*/ u32 unk06cc;
/*0x06d0*/ u32 unk06d0;
/*0x06d4*/ u32 unk06d4;
/*0x06d4*/ f32 unk06d4;
/*0x06d8*/ u32 unk06d8;
/*0x06dc*/ u32 unk06dc;
/*0x06e0*/ u32 unk06e0;
/*0x06e4*/ u32 unk06e4;
/*0x06e8*/ u32 unk06e8;
/*0x06e8*/ f32 unk06e8;
/*0x06ec*/ u32 unk06ec;
/*0x06f0*/ u32 unk06f0;
/*0x06f4*/ u32 unk06f4;
/*0x06f8*/ u32 unk06f8;
/*0x06fc*/ u32 unk06fc;
/*0x0700*/ u32 unk0700;
/*0x0704*/ u32 unk0704;
/*0x0704*/ f32 unk0704;
/*0x0708*/ u32 unk0708;
/*0x070c*/ u32 unk070c;
/*0x070c*/ f32 unk070c;
/*0x0710*/ u32 unk0710;
/*0x0714*/ u32 unk0714;
/*0x0718*/ u32 unk0718;
/*0x071c*/ u32 unk071c;
/*0x0720*/ u32 unk0720;
/*0x0724*/ u32 unk0724;
/*0x0728*/ u32 unk0728;
/*0x0728*/ f32 unk0728;
/*0x072c*/ u32 unk072c;
/*0x0730*/ u32 unk0730;
/*0x0730*/ f32 unk0730;
/*0x0734*/ u32 unk0734;
/*0x0738*/ u32 unk0738;
/*0x073c*/ u32 unk073c;
@ -1781,32 +1781,32 @@ struct hand {
/*0x0764*/ u32 unk0764;
/*0x0768*/ u32 unk0768;
/*0x076c*/ u32 unk076c;
/*0x0770*/ u32 unk0770;
/*0x0770*/ f32 unk0770;
/*0x0774*/ u32 unk0774;
/*0x0778*/ u32 unk0778;
/*0x077c*/ u32 unk077c;
/*0x077c*/ f32 unk077c;
/*0x0780*/ u32 unk0780;
/*0x0784*/ u32 unk0784;
/*0x0788*/ u32 unk0788;
/*0x0788*/ f32 unk0788;
/*0x078c*/ u32 unk078c;
/*0x0790*/ u32 unk0790;
/*0x0794*/ u32 unk0794;
/*0x0794*/ f32 unk0794;
/*0x0798*/ u32 unk0798;
/*0x079c*/ u32 unk079c;
/*0x079c*/ f32 unk079c;
/*0x07a0*/ u32 unk07a0;
/*0x07a4*/ u32 unk07a4;
/*0x07a8*/ u32 unk07a8;
/*0x07a8*/ f32 unk07a8;
/*0x07ac*/ u32 unk07ac;
/*0x07b0*/ u32 unk07b0;
/*0x07b4*/ u32 unk07b4;
/*0x07b4*/ f32 unk07b4;
/*0x07b8*/ u32 unk07b8;
/*0x07bc*/ u32 unk07bc;
/*0x07c0*/ u32 unk07c0;
/*0x07c0*/ f32 unk07c0;
/*0x07c4*/ u32 unk07c4;
/*0x07c8*/ u32 unk07c8;
/*0x07cc*/ u32 unk07cc;
/*0x07d0*/ u32 unk07d0;
/*0x07d4*/ u32 unk07d4;
/*0x07d0*/ f32 unk07d0;
/*0x07d4*/ f32 unk07d4;
/*0x07d8*/ u32 unk07d8;
/*0x07dc*/ u32 unk07dc;
/*0x07e0*/ u32 unk07e0;
@ -2127,7 +2127,8 @@ struct hand {
/*0x0d0e*/ u8 unk0d0e_00 : 4;
/*0x0d0e*/ u8 unk0d0e_04 : 3;
/*0x0d0e*/ u8 unk0d0e_07 : 1;
/*0x0d0f*/ u8 unk0d0f_00 : 3;
/*0x0d0f*/ u8 unk0d0f_00 : 2;
/*0x0d0f*/ u8 unk0d0f_02 : 1;
/*0x0d0f*/ u8 unk0d0f_03 : 1;
/*0x0d0f*/ u8 unk0d0f_04 : 4;
/*0x0d10*/ u32 unk0d10;
@ -2504,9 +2505,9 @@ struct player {
/*0x1583*/ u8 unk1583_05 : 1;
/*0x1583*/ u8 unk1583_06 : 1;
/*0x1583*/ u8 passivemode : 1;
/*0x1584*/ u32 unk1584;
/*0x1584*/ s32 unk1584;
/*0x1588*/ u32 unk1588;
/*0x158c*/ u32 unk158c;
/*0x158c*/ void *unk158c;
/*0x1590*/ u32 unk1590;
/*0x1594*/ s32 unk1594;
/*0x1598*/ u32 unk1598;
@ -2530,15 +2531,17 @@ struct player {
/*0x15dc*/ u32 unk15dc;
/*0x15e0*/ u32 unk15e0;
/*0x15e4*/ s8 equippedammotypes[2];
/*0x15e6*/ u16 unk15e6;
/*0x15e6*/ u8 unk15e6;
/*0x15e7*/ u8 unk15e7;
/*0x15e8*/ u16 unk15e8;
/*0x15ea*/ u8 unk15ea;
/*0x15eb*/ s8 unk15eb;
/*0x15ec*/ u32 unk15ec;
/*0x15f0*/ u32 unk15f0;
/*0x15f0*/ u16 unk15f0;
/*0x15f2*/ u16 unk15f2;
/*0x15f4*/ u32 unk15f4;
/*0x15f8*/ u32 unk15f8;
/*0x15fc*/ u32 unk15fc;
/*0x15f8*/ f32 unk15f8;
/*0x15fc*/ f32 unk15fc;
/*0x1600*/ s32 doautoselect;
/*0x1604*/ u32 playertriggeron;
/*0x1608*/ u32 playertriggerprev;
@ -2553,17 +2556,17 @@ struct player {
/*0x1624*/ struct threat lookingatprop;
/*0x1630*/ struct threat cmpfollowprops[4];
/*0x1660*/ f32 crosspos[2];
/*0x1668*/ u32 unk1668;
/*0x166c*/ u32 unk166c;
/*0x1670*/ u32 unk1670;
/*0x1674*/ u32 unk1674;
/*0x1678*/ u32 unk1678;
/*0x167c*/ u32 unk167c;
/*0x1680*/ u32 unk1680;
/*0x1684*/ u32 unk1684;
/*0x1688*/ u32 unk1688;
/*0x168c*/ u32 unk168c;
/*0x1690*/ u32 unk1690;
/*0x1668*/ f32 unk1668;
/*0x166c*/ f32 unk166c;
/*0x1670*/ f32 unk1670;
/*0x1674*/ f32 unk1674;
/*0x1678*/ f32 unk1678;
/*0x167c*/ f32 unk167c;
/*0x1680*/ f32 unk1680;
/*0x1684*/ f32 unk1684;
/*0x1688*/ f32 unk1688;
/*0x168c*/ f32 unk168c;
/*0x1690*/ f32 unk1690;
/*0x1694*/ u32 unk1694;
/*0x1698*/ u32 unk1698;
/*0x169c*/ u32 unk169c;
@ -2582,12 +2585,12 @@ struct player {
/*0x16d0*/ u32 unk16d0;
/*0x16d4*/ u32 unk16d4;
/*0x16d8*/ u32 unk16d8;
/*0x16dc*/ u32 unk16dc;
/*0x16e0*/ u32 unk16e0;
/*0x16e4*/ u32 unk16e4;
/*0x16dc*/ f32 unk16dc;
/*0x16e0*/ f32 unk16e0;
/*0x16e4*/ f32 unk16e4;
/*0x16e8*/ u32 unk16e8;
/*0x16ec*/ u32 unk16ec;
/*0x16f0*/ u32 unk16f0;
/*0x16ec*/ f32 unk16ec;
/*0x16f0*/ f32 unk16f0;
/*0x16f4*/ f32 gunzoomfovs[3]; // saved zoom levels/fovs for sniper, farsight and horizon scanner
/*0x1700*/ u32 lastroomforoffset;
/*0x1704*/ f32 c_screenwidth;
@ -2648,7 +2651,7 @@ struct player {
/*0x1870*/ u32 equipallguns;
/*0x1874*/ u32 equipcuritem;
/*0x1878*/ struct gunheld gunheldarr[10];
/*0x18f0*/ u32 magnetattracttime;
/*0x18f0*/ s32 magnetattracttime;
/*0x18f4*/ u32 angleoffset;
/*0x18f8*/ u32 buthist[10];
/*0x1920*/ u8 buthistindex;