mirror/perfect-dark
1
0
Fork 0
mirror of https://gitlab.com/ryandwyer/perfect-dark synced 2026-08-03 16:42:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

Restructure weapon function structs and decompile func0f011560

Browse Source
This commit is contained in:
Ryan Dwyer
2020-02-02 23:03:27 +10:00
parent cbd4799e52
commit aeb34076f1
9 changed files with 1369 additions and 1653 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/include/constants.h
+8 -6
View File
@@ -508,12 +508,14 @@
#define INTROTYPE_HILL 11
#define INTROTYPE_END 12
#define INVENTORYFUNCTYPE_NONE 0
#define INVENTORYFUNCTYPE_SHOOT 1
#define INVENTORYFUNCTYPE_THROW 2
#define INVENTORYFUNCTYPE_CLOSE 3
#define INVENTORYFUNCTYPE_SPECIAL 4
#define INVENTORYFUNCTYPE_VISUAL 5
#define INVENTORYFUNCTYPE_NONE 0x0000
#define INVENTORYFUNCTYPE_SHOOT_SINGLE 0x0001
#define INVENTORYFUNCTYPE_SHOOT_AUTOMATIC 0x0101
#define INVENTORYFUNCTYPE_SHOOT_PROJECTILE 0x0201
#define INVENTORYFUNCTYPE_THROW 0x0002
#define INVENTORYFUNCTYPE_CLOSE 0x0003
#define INVENTORYFUNCTYPE_SPECIAL 0x0004
#define INVENTORYFUNCTYPE_VISUAL 0x0005
// These actions are assigned to chr->myaction
#define MA_NONE 0
src/include/game/game_011110.h
+1 -1
View File
@@ -6,7 +6,7 @@
void func0f011110(void);
void func0f011124(s32 value);
u32 func0f011130(void);
void func0f011560(s32 weapon);
u32 func0f011560(s32 weaponnum);
void currentPlayerInitEyespy(void);
void currentPlayerInit(void);
src/include/game/game_066310.h
+1 -1
View File
@@ -343,7 +343,7 @@ s32 setupGetCommandLength(u32 *ptr);
u32 func0f092004(u32 arg0);
u32 func0f092098(struct tag *tag);
u32 func0f092124(void);
u32 func0f0921b4(void);
u32 func0f0921b4(s32 modelnum);
u32 func0f09220c(void);
u32 func0f092304(void);
u32 func0f09233c(void);
src/include/game/game_0b0420.h
+1 -1
View File
@@ -18,7 +18,7 @@ u32 func0f0b0764(void);
u32 func0f0b0818(void);
s32 func0f0b09f4(s32 arg0, s32 arg1);
struct weapon *weaponFindById(s32 itemid);
struct inventory_function *weaponGetFunctionById(s32 weapon_id, s32 which);
struct weaponfunc *weaponGetFunctionById(s32 weapon_id, s32 which);
u32 func0f0b103c(void);
u32 func0f0b107c(void);
u32 func0f0b10b8(void);
src/include/types.h
+106 -12
View File
@@ -2774,16 +2774,111 @@ struct inventory_typef {
u32 unk10;
};
struct inventory_function {
u16 unk00;
u8 unk02;
u8 type;
u16 name;
u8 unk06;
s8 unk07;
struct inventory_menupos *menupos;
u32 *fire_animation;
u32 flags;
struct weaponfunc {
/*0x00*/ u32 type;
/*0x04*/ u16 name;
/*0x06*/ u8 unk06;
/*0x07*/ s8 unk07;
/*0x08*/ struct inventory_menupos *menupos;
/*0x0c*/ u32 *fire_animation;
/*0x10*/ u32 flags;
};
struct weaponfunc_shootsingle {
struct weaponfunc base;
/*0x14*/ u32 unk14;
/*0x18*/ u32 unk18;
/*0x1c*/ u32 unk1c;
/*0x20*/ u32 unk20;
/*0x24*/ u32 unk24;
/*0x28*/ u32 unk28;
/*0x2c*/ u32 unk2c;
/*0x30*/ u32 unk30;
/*0x34*/ u32 unk34;
/*0x38*/ u32 unk38;
/*0x3c*/ u32 unk3c;
};
struct weaponfunc_shootauto {
struct weaponfunc base;
/*0x14*/ u32 unk14;
/*0x18*/ u32 unk18;
/*0x1c*/ u32 unk1c;
/*0x20*/ u32 unk20;
/*0x24*/ u32 unk24;
/*0x28*/ u32 unk28;
/*0x2c*/ u32 unk2c;
/*0x30*/ u32 unk30;
/*0x34*/ u32 unk34;
/*0x38*/ u32 unk38;
/*0x3c*/ u32 unk3c;
/*0x40*/ u32 unk40;
/*0x44*/ u32 unk44;
/*0x48*/ u32 unk48;
/*0x4c*/ u32 unk4c;
/*0x50*/ u32 unk50;
};
struct weaponfunc_shootprojectile {
struct weaponfunc base;
/*0x14*/ u32 unk14;
/*0x18*/ u32 unk18;
/*0x1c*/ u32 unk1c;
/*0x20*/ u32 unk20;
/*0x24*/ u32 unk24;
/*0x28*/ u32 unk28;
/*0x2c*/ u32 unk2c;
/*0x30*/ u32 unk30;
/*0x34*/ u32 unk34;
/*0x38*/ u32 unk38;
/*0x3c*/ u32 unk3c;
/*0x40*/ s32 projectilemodelnum;
/*0x44*/ u32 unk44;
/*0x48*/ u32 unk48;
/*0x4c*/ u32 unk4c;
/*0x50*/ u32 unk50;
/*0x54*/ u32 unk54;
/*0x58*/ u32 unk58;
/*0x5c*/ u32 unk5c;
/*0x60*/ u32 unk60;
};
struct weaponfunc_throw {
struct weaponfunc base;
/*0x14*/ s32 projectilemodelnum;
/*0x18*/ u32 unk18;
/*0x1c*/ u32 unk1c;
/*0x20*/ u32 unk20;
};
struct weaponfunc_close {
struct weaponfunc base;
/*0x14*/ u32 unk14;
/*0x18*/ u32 unk18;
/*0x1c*/ u32 unk1c;
/*0x20*/ u32 unk20;
/*0x24*/ u32 unk24;
/*0x28*/ u32 unk28;
/*0x2c*/ u32 unk2c;
/*0x30*/ u32 unk30;
/*0x34*/ u32 unk34;
/*0x38*/ u32 unk38;
/*0x3c*/ u32 unk3c;
/*0x40*/ u32 unk40;
/*0x44*/ u32 unk44;
/*0x48*/ u32 unk48;
};
struct weaponfunc_special {
struct weaponfunc base;
/*0x14*/ u32 unk14;
/*0x18*/ u32 unk18;
/*0x1c*/ u32 unk1c;
};
struct weaponfunc_visual {
struct weaponfunc base;
/*0x14*/ u32 unk14;
};
struct inventory_ammo {
@@ -2803,8 +2898,7 @@ struct weapon {
/*0x08*/ u32 *unequip_animation;
/*0x0c*/ u32 *pritosec_animation;
/*0x10*/ u32 *sectopri_animation;
/*0x14*/ struct inventory_function *pri_function;
/*0x18*/ struct inventory_function *sec_function;
/*0x14*/ void *functions[2];
/*0x1c*/ struct inventory_ammo *pri_ammo;
/*0x20*/ struct inventory_ammo *sec_ammo;
/*0x24*/ struct inventory_typee *eptr;