mirror/perfect-dark
1
0
Fork 0
mirror of https://gitlab.com/ryandwyer/perfect-dark synced 2026-07-29 15:33:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Decompile func0f08b880

Browse Source
This commit is contained in:
Ryan Dwyer
2021-05-18 21:29:23 +10:00
parent c9a2517fae
commit 7598883bbb
7 changed files with 95 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/include/bss.h
+1 -1
View File
@@ -115,7 +115,7 @@ extern s32 var8009ce48;
extern s32 var8009ce4c;
extern s32 g_NumProjectiles;
extern s32 g_NumMonitorThings;
extern struct var8009ce58 *var8009ce58;
extern struct weaponobj *var8009ce58;
extern struct defaultobj *var8009ce5c;
extern struct var8009ce60 *var8009ce60;
extern struct defaultobj *var8009ce64;
src/include/game/game_097ba0.h
+1 -1
View File
@@ -71,7 +71,7 @@ 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 var8009ce58 *func0f09ee18(struct chrdata *chr, struct shorthand *hand, struct coord *pos, s16 *rooms, Mtxf *arg4, struct coord *arg5);
struct weaponobj *func0f09ee18(struct chrdata *chr, struct shorthand *hand, struct coord *pos, s16 *rooms, Mtxf *arg4, struct coord *arg5);
void handCreateThrownProjectile(s32 handnum, struct shorthand *hand);
void func0f09f848(s32 handnum);
void func0f09f974(s32 handnum, struct weaponfunc_shootprojectile *func);
src/include/game/propobj.h
+3 -3
View File
@@ -285,9 +285,9 @@ u32 func0f08ae54(struct defaultobj *obj, struct chrdata *chr);
u32 func0f08b108(struct weaponobj *weapon, struct chrdata *chr, struct modelfiledata *modelfiledata, u32 arg3, u32 arg4);
void func0f08b208(struct weaponobj *weapon, struct chrdata *chr);
void func0f08b25c(struct weaponobj *weapon, struct chrdata *chr);
struct var8009ce58 *func0f08b27c(s32 modelnum, struct shorthand *hand, struct chrdata *chr);
struct var8009ce58 *func0f08b658(s32 modelnum, struct shorthand *hand, struct chrdata *chr);
struct weaponobj *func0f08b880(u32 model, u32 weaponnum, struct chrdata *chr);
struct weaponobj *func0f08b27c(s32 modelnum, struct shorthand *hand, struct chrdata *chr);
struct weaponobj *func0f08b658(s32 modelnum, struct shorthand *hand, struct chrdata *chr);
struct weaponobj *func0f08b880(s32 modelnum, s32 weaponnum, struct chrdata *chr);
void chrSetObjHiddenFlag4OnWeapon(struct chrdata *chr, s32 hand);
struct prop *func0f08b8e8(struct chrdata *chr, s32 weaponnum, s32 arg2, u32 flags, s32 arg4, s32 arg5);
struct prop *chrGiveWeapon(struct chrdata *chr, s32 model, s32 weaponnum, u32 flags);
src/include/types.h
+1 -11
View File
@@ -1742,7 +1742,7 @@ struct weaponobj { // objtype 0x08
/**
* Appears to have multiple uses:
* Grenades = timer?
* Proxy mines = timer? Or isarmed
* Proxy mines = timer240 (counts down)
* CTC briefcase = team index
*/
/*0x62*/ s16 unk62;
@@ -6908,16 +6908,6 @@ struct var8009cda4 {
s16 unk00[8];
};
// Suspect this is just a weaponobj
struct var8009ce58 {
struct defaultobj base;
/*0x5c*/ u8 weaponnum;
/*0x60*/ u16 unk5e;
/*0x60*/ u16 unk60;
/*0x62*/ s16 activatetime240;
/*0x64*/ u32 unk64;
};
struct var8009ce60 {
struct defaultobj base;
/*0x5c*/ u32 unk5c;