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

Rename many hand struct properties

Browse Source
This commit is contained in:
Ryan Dwyer
2021-03-02 17:20:04 +10:00
parent 1175fdae70
commit 3dcb784dd0
24 changed files with 413 additions and 486 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/include/game/game_097ba0.h
+5 -5
View File
@@ -51,7 +51,7 @@ u32 func0f09cd18(void);
void func0f09cdc4(s32 hand);
void func0f09ce8c(void);
void func0f09ceac(void);
f32 func0f09cf58(u32 arg0);
f32 handGetNoiseRadius(s32 handnum);
void func0f09cf88(void);
void func0f09d140(s32 hand);
u32 func0f09d550(void);
@@ -99,13 +99,13 @@ void func0f0a1c2c(void);
bool func0f0a1d14(u32 weaponnum);
void func0f0a1df4(void);
void currentPlayerEquipWeaponWrapper(bool arg0, s32 weaponnum);
s32 handIsAttackingOnThisTick(s32 handnum);
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 func0f0a2290(f32 angle);
void handSetAdjustPos(f32 angle);
void func0f0a2308(s32 handnum);
u32 func0f0a233c(void);
u32 func0f0a2498(void);
@@ -140,14 +140,14 @@ u32 func0f0a7d5c(void);
void func0f0a7d98(struct shorthand *hand, struct prop *prop, s32 arg2);
void func0f0a8404(struct coord *pos, s16 *rooms, s32 arg2);
u32 func0f0a84c8(void);
void handSetFiring(s32 hand, bool firing);
void handSetTriggerOn(s32 handnum, bool on);
s32 currentPlayerConsiderToggleGunFunction(s32 usedowntime, bool firing, s32 arg2);
void func0f0a8c50(void);
bool currentPlayerIsUsingSecondaryFunction(void);
void currentPlayerTickInventory(bool triggeron);
void playersSetPassiveMode(bool enable);
void currentPlayerSetAimType(u32 aimtype);
void func0f0a93e0(struct coord *coord);
void handSetAimPos(struct coord *coord);
void func0f0a9464(struct coord *coord);
void func0f0a9494(u32 operation);
void func0f0a94d0(u32 operation, struct coord *a, struct coord *b);
src/include/game/game_0abe70.h
+2 -2
View File
@@ -7,8 +7,8 @@
u32 func0f0abe70(void);
u32 func0f0ac138(void);
Gfx *func0f0ac4b8(Gfx *gdl, struct textureconfig *arg1, f32 arg2, struct coord *arg3, u32 colour1, f32 arg5, struct coord *arg6, u32 colour2);
Gfx *func0f0acb90(Gfx *gdl, struct bullettail *bullettail, bool arg2, u32 arg3);
void bullettailTick(struct bullettail *bullettail);
Gfx *func0f0acb90(Gfx *gdl, struct beam *beam, bool arg2, u32 arg3);
void beamTick(struct beam *beam);
u32 func0f0adcc8(void);
u32 func0f0ade00(void);
u32 func0f0ae964(void);
src/include/game/game_0b0fd0.h
+1 -1
View File
@@ -12,7 +12,7 @@ struct weaponfunc *weaponGetFunction(u8 *arg0, s32 which);
struct weaponfunc *currentPlayerGetWeaponFunction(u32 hand);
struct inventory_typee *func0f0b11bc(struct shorthand *hand);
struct inventory_ammo *weaponGetAmmoByFunction(u32 weaponnum, u32 funcnum);
f32 handGetXOffset(u32 arg0);
f32 handGetXShift(s32 handnum);
f32 func0f0b131c(u32 hand);
f32 currentPlayerGetGunZoomFov(void);
void currentPlayerZoomOut(f32 fovpersec);
src/include/game/propobj.h
+1 -1
View File
@@ -203,7 +203,7 @@ void func0f07e2cc(struct prop *prop);
bool propCanRegen(struct prop *prop);
u32 func0f07e474(struct prop *prop);
s32 objTick(struct prop *prop);
Gfx *propsRenderBulletTails(Gfx *gdl);
Gfx *propsRenderBeams(Gfx *gdl);
u32 func0f07f918(void);
void imageSlotSetImage(struct monitorscreen *screen, u32 arg1);
u32 func0f07fbf0(void);
src/include/types.h
+60 -130
View File
@@ -1350,7 +1350,7 @@ struct autogunobj { // objtype 0x0d
/*0x90*/ s32 unk90;
/*0x94*/ s32 unk94;
/*0x98*/ s32 unk98;
/*0x9c*/ struct bullettail *bullettail;
/*0x9c*/ struct beam *beam;
/*0xa0*/ f32 unka0;
/*0xa4*/ u32 unka4;
/*0xa8*/ u8 autogun_type;
@@ -1704,7 +1704,7 @@ struct threat {
s16 unk0a;
};
struct bullettail {
struct beam {
/*0x00*/ s8 age;
/*0x01*/ s8 unk01;
/*0x04*/ u32 unk04;
@@ -1730,127 +1730,57 @@ struct shorthand {
// Weapon data per hand
struct hand {
struct shorthand base;
/*0x063c*/ s8 unk063c;
/*0x063d*/ s8 torchon;
/*0x063e*/ u8 unk063e;
/*0x063f*/ u8 unk063f;
/*0x0640*/ s8 unk0640;
/*0x0644*/ bool firing;
/*0x0648*/ bool prevfiring;
/*0x064c*/ bool unk064c; // Set to true when firing stops. If set to false, pistols cannot rapid fire by tapping Z
/*0x0650*/ u32 unk0650;
/*0x0654*/ u32 unk0654;
/*0x0658*/ u32 unk0658;
/*0x065c*/ u32 unk065c; // hand state? 0 = idle, 9 = reloading
/*0x0660*/ u32 unk0660;
/*0x0664*/ u32 unk0664;
/*0x0668*/ u32 unk0668;
/*0x066c*/ u32 unk066c;
/*0x0670*/ u32 unk0670;
/*0x0674*/ u32 unk0674;
/*0x0678*/ u32 unk0678;
/*0x067c*/ u32 unk067c;
/*0x0680*/ u32 unk0680;
/*0x0684*/ u32 unk0684;
/*0x0688*/ u32 unk0688;
/*0x068c*/ u32 unk068c;
/*0x0690*/ u32 unk0690;
/*0x0694*/ u32 unk0694;
/*0x0698*/ u32 unk0698;
/*0x069c*/ u32 unk069c;
/*0x06a0*/ u32 unk06a0;
/*0x06a4*/ u32 unk06a4;
/*0x06a8*/ u32 unk06a8;
/*0x06ac*/ f32 unk06ac;
/*0x06b0*/ u32 unk06b0;
/*0x06b4*/ u32 unk06b4;
/*0x06b8*/ u32 unk06b8;
/*0x06bc*/ u32 unk06bc;
/*0x06c0*/ f32 unk06c0;
/*0x06c4*/ u32 unk06c4;
/*0x06c8*/ u32 unk06c8;
/*0x06cc*/ u32 unk06cc;
/*0x06d0*/ u32 unk06d0;
/*0x06d4*/ f32 unk06d4;
/*0x06d8*/ u32 unk06d8;
/*0x06dc*/ u32 unk06dc;
/*0x06e0*/ u32 unk06e0;
/*0x06e4*/ u32 unk06e4;
/*0x06e8*/ f32 unk06e8;
/*0x06ec*/ u32 unk06ec;
/*0x06f0*/ u32 unk06f0;
/*0x06f4*/ u32 unk06f4;
/*0x06f8*/ u32 unk06f8;
/*0x06fc*/ u32 unk06fc;
/*0x0700*/ u32 unk0700;
/*0x0704*/ f32 unk0704;
/*0x0708*/ u32 unk0708;
/*0x070c*/ f32 unk070c;
/*0x0710*/ u32 unk0710;
/*0x0714*/ u32 unk0714;
/*0x0718*/ u32 unk0718;
/*0x071c*/ u32 unk071c;
/*0x0720*/ u32 unk0720;
/*0x0724*/ u32 unk0724;
/*0x0728*/ f32 unk0728;
/*0x072c*/ u32 unk072c;
/*0x0730*/ f32 unk0730;
/*0x0734*/ u32 unk0734;
/*0x0738*/ u32 unk0738;
/*0x073c*/ u32 unk073c;
/*0x0740*/ u32 unk0740;
/*0x0744*/ u32 unk0744;
/*0x0748*/ u32 unk0748;
/*0x074c*/ u32 unk074c;
/*0x0750*/ u32 unk0750;
/*0x0754*/ u32 unk0754;
/*0x0758*/ u32 unk0758;
/*0x075c*/ u32 unk075c;
/*0x0760*/ u32 unk0760;
/*0x0764*/ u32 unk0764;
/*0x0768*/ u32 unk0768;
/*0x076c*/ u32 unk076c;
/*0x0770*/ f32 unk0770;
/*0x0774*/ u32 unk0774;
/*0x0778*/ u32 unk0778;
/*0x077c*/ f32 unk077c;
/*0x0780*/ u32 unk0780;
/*0x0784*/ u32 unk0784;
/*0x0788*/ f32 unk0788;
/*0x078c*/ u32 unk078c;
/*0x0790*/ u32 unk0790;
/*0x0794*/ f32 unk0794;
/*0x0798*/ u32 unk0798;
/*0x079c*/ f32 unk079c;
/*0x07a0*/ u32 unk07a0;
/*0x07a4*/ u32 unk07a4;
/*0x07a8*/ f32 unk07a8;
/*0x07ac*/ u32 unk07ac;
/*0x07b0*/ u32 unk07b0;
/*0x07b4*/ f32 unk07b4;
/*0x07b8*/ u32 unk07b8;
/*0x07bc*/ u32 unk07bc;
/*0x07c0*/ f32 unk07c0;
/*0x07c4*/ u32 unk07c4;
/*0x07c8*/ u32 unk07c8;
/*0x07cc*/ u32 unk07cc;
/*0x07d0*/ f32 unk07d0;
/*0x07d4*/ f32 unk07d4;
/*0x07d8*/ u32 unk07d8;
/*0x07dc*/ u32 unk07dc;
/*0x07e0*/ u32 unk07e0;
/*0x07e4*/ u32 unk07e4;
/*0x07e8*/ u32 unk07e8;
/*0x07ec*/ u32 unk07ec;
/*0x07f0*/ f32 unk07f0;
/*0x07f4*/ f32 xoffset;
/*0x07f8*/ struct coord unk07f8;
/*0x063c*/ s8 firing;
/*0x063d*/ s8 flashon;
/*0x063e*/ u8 gunon;
/*0x063f*/ u8 visible;
/*0x0640*/ s8 inuse; // true if hand is holding a gun, false if not
/*0x0644*/ bool triggeron;
/*0x0648*/ bool triggerprev;
/*0x064c*/ bool triggerreleased;
/*0x0650*/ u32 count;
/*0x0654*/ u32 count60;
/*0x0658*/ u32 mode;
/*0x065c*/ u32 modenext; // 0 = idle, 9 = reloading
/*0x0660*/ u32 numfires;
/*0x0664*/ u32 numshotguncarts;
/*0x0668*/ u32 refiretime;
/*0x066c*/ u32 typechange;
/*0x0670*/ u32 pausetime60;
/*0x0674*/ u32 pausechange;
/*0x0678*/ u32 nextprevchange; // "
/*0x067c*/ struct coord posstart;
/*0x0688*/ u32 rotxstart;
/*0x068c*/ struct coord posend;
/*0x0698*/ u32 rotxend;
/*0x069c*/ struct coord posoffset;
/*0x06a8*/ u32 rotxoffset;
/*0x06ac*/ Mtxf posrotmtx;
/*0x06ec*/ u32 useposrot;
/*0x06f0*/ struct coord damppos;
/*0x06fc*/ struct coord damplook;
/*0x0708*/ struct coord dampup;
/*0x0714*/ struct coord damppossum;
/*0x0720*/ struct coord damplooksum;
/*0x072c*/ struct coord dampupsum;
/*0x0738*/ f32 blendpos[12];
/*0x0768*/ f32 blendlook[12];
/*0x0798*/ f32 blendup[12];
/*0x07c8*/ u32 curblendpos;
/*0x07cc*/ u32 dampt;
/*0x07d0*/ f32 blendescale;
/*0x07d4*/ f32 blendescale1;
/*0x07d8*/ u32 sideflag;
/*0x07dc*/ struct coord adjustdamp;
/*0x07e8*/ struct coord adjustpos;
/*0x07f4*/ f32 xshift;
/*0x07f8*/ struct coord aimpos;
/*0x0804*/ struct audiohandle *audiohandle2;
/*0x0808*/ u32 unk0808;
/*0x080c*/ u32 unk080c;
/*0x0810*/ u32 unk0810;
/*0x0814*/ struct bullettail bullettail;
/*0x0840*/ f32 unk0840;
/*0x080c*/ u32 allowshootframe;
/*0x0810*/ u32 lastshootframe60;
/*0x0814*/ struct beam beam;
/*0x0840*/ f32 noiseradius;
/*0x0844*/ u32 unk0844;
/*0x0848*/ u32 unk0848;
/*0x084c*/ u32 unk084c;
@@ -1858,12 +1788,12 @@ struct hand {
/*0x0854*/ u32 unk0854;
/*0x0858*/ s32 loadedammo[2];
/*0x0860*/ s32 clipsizes[2];
/*0x0868*/ f32 unk0868;
/*0x086c*/ u32 unk086c;
/*0x0870*/ u32 unk0870;
/*0x0874*/ f32 unk0874; // Mauler charge amount? Or a timer
/*0x0878*/ f32 unk0878;
/*0x087c*/ f32 unk087c;
/*0x0868*/ f32 angledamper;
/*0x086c*/ u32 lastrotangx;
/*0x0870*/ u32 lastrotangy;
/*0x0874*/ f32 matmot1;
/*0x0878*/ f32 matmot2;
/*0x087c*/ f32 matmot3;
/*0x0880*/ u32 unk0880;
/*0x0884*/ u32 unk0884;
/*0x0888*/ f32 unk0888;
@@ -2226,7 +2156,7 @@ struct gunctrl {
/*0x15d8*/ u32 unk15d8;
/*0x15dc*/ u32 unk15dc;
/*0x15e0*/ u32 unk15e0;
/*0x15e4*/ s8 totalammo[2];
/*0x15e4*/ s8 ammotypes[2];
/*0x15e6*/ u8 unk15e6;
/*0x15e7*/ u8 unk15e7;
/*0x15e8*/ u8 unk15e8;
@@ -3563,7 +3493,7 @@ struct room {
struct fireslotthing {
/*0x00*/ u8 unk00;
/*0x01*/ u8 unk01;
/*0x04*/ struct bullettail *bullettail;
/*0x04*/ struct beam *beam;
/*0x08*/ s32 unk08;
/*0x0c*/ f32 unk0c;
/*0x10*/ f32 unk10;
@@ -3574,7 +3504,7 @@ struct fireslotthing {
struct fireslot {
/*0x00*/ s32 unk00;
/*0x04*/ struct bullettail bullettail;
/*0x04*/ struct beam beam;
};
struct menulayer {