mirror/perfect-dark
1
0
Fork 0
mirror of https://gitlab.com/ryandwyer/perfect-dark synced 2026-06-29 10:30:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Decompile gsetGetNoiseSettings

Browse Source
This commit is contained in:
Ryan Dwyer
2021-09-09 23:14:40 +10:00
parent d6cccc48ae
commit 6d34869161
8 changed files with 210 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/include/data.h
+1 -1
View File
@@ -271,7 +271,7 @@ extern bool g_ObjectiveChecksDisabled;
extern u16 var8006ae90[];
extern u16 var8006af0c[];
extern u16 var8006af8c[];
extern struct inventory_menupos invmenupos_00010fd0;
extern struct noisesettings invnoisesettings_00010fd0;
extern struct inventory_class invclass_default;
extern struct weapon *g_Weapons[];
extern u32 var800700ac;
src/include/game/game_0b0fd0.h
+2 -2
View File
@@ -24,7 +24,7 @@ s32 currentPlayerGetDeviceState(s32 weaponnum);
void currentPlayerSetDeviceActive(s32 weaponum, bool active);
u16 weaponGetModelNum(s32 weaponnum);
u16 weaponGetModelNum2(s32 weaponnum);
void handPopulateFromCurrentPlayer(s32 handnum, struct gset *gset);
void gsetPopulateFromCurrentPlayer(s32 handnum, struct gset *gset);
struct inventory_ammo *gsetGetAmmoDefinition(struct gset *gset);
u8 gsetGetSingleUnk3c(struct gset *gset);
f32 gsetGetStrength(struct gset *gset);
@@ -34,7 +34,7 @@ u16 gsetGetSingleShootSound(struct gset *gset);
bool gsetHasFunctionFlags(struct gset *gset, u32 flags);
s8 weaponGetNumTicksPerShot(u32 weaponnum, u32 funcindex);
u32 currentPlayerGetSight(void);
void func0f0b201c(struct gset *gset, f32 *arg1);
void gsetGetNoiseSettings(struct gset *gset, struct noisesettings *settings);
struct guncmd *gsetGetPriToSecAnim(struct gset *gset);
struct guncmd *gsetGetSecToPriAnim(struct gset *gset);
src/include/game/inventory/items.h
+1 -1
View File
@@ -2,7 +2,7 @@
#define IN_GAME_INVENTORY_ITEMS_H
#include <ultra64.h>
extern struct inventory_menupos invmenupos_00010fd0;
extern struct noisesettings invnoisesettings_00010fd0;
extern struct inventory_class invclass_default;
extern struct weapon *g_Weapons[WEAPON_SUICIDEPILL + 1];
src/include/types.h
+8 -8
View File
@@ -2959,12 +2959,12 @@ struct stagesetup {
/*0x1c*/ s8 *padfiledata;
};
struct inventory_menupos {
f32 x;
f32 y;
f32 z;
f32 rotation;
f32 size;
struct noisesettings {
f32 minradius;
f32 maxradius;
f32 incradius;
f32 unk0c;
f32 unk10;
};
struct inventory_class {
@@ -3004,14 +3004,14 @@ struct weaponfunc {
/*0x04*/ u16 name;
/*0x06*/ u8 unk06;
/*0x07*/ s8 ammoindex; // -1 = no ammo, 0 or 1 = index into weapon->ammos[]
/*0x08*/ struct inventory_menupos *menupos;
/*0x08*/ struct noisesettings *noisesettings;
/*0x0c*/ struct guncmd *fire_animation;
/*0x10*/ u32 flags;
};
struct weaponfunc_shoot {
struct weaponfunc base;
/*0x14*/ struct inventory_menupos *unk14;
/*0x14*/ struct noisesettings *unk14;
/*0x18*/ s8 unk18;
/*0x1c*/ f32 damage;
/*0x20*/ f32 spread;