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

Attempt to decompile func0f0c8b90

Browse Source
This commit is contained in:
Ryan Dwyer
2020-05-05 18:44:56 +10:00
parent 26511167a8
commit c09bc9b4c9
6 changed files with 1262 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/bondmove.c
+1230
View File
File diff suppressed because it is too large Load Diff
src/game/game_0b63b0.c
+4 -4
View File
@@ -5327,7 +5327,7 @@ void currentPlayerPause(u32 mode)
{
g_PauseMode = mode;
if (g_Vars.currentplayer->pausemode == PAUSEMODE_0) {
if (g_Vars.currentplayer->pausemode == PAUSEMODE_UNPAUSED) {
g_Vars.currentplayer->pausemode = PAUSEMODE_1;
}
}
@@ -5337,7 +5337,7 @@ void func0f0baf38(void)
if (g_Vars.currentplayer->pausemode == PAUSEMODE_3) {
soloSetPaused(0);
func0f16db3c();
g_Vars.currentplayer->pausemode = PAUSEMODE_0;
g_Vars.currentplayer->pausemode = PAUSEMODE_UNPAUSED;
}
}
@@ -10695,7 +10695,7 @@ glabel var7f1ad6ac
// u16 buttons = param_1 ? func00014f60(contpad1, 0xffff) : 0;
//
// if (g_Vars.currentplayer->isdead == false
// && g_Vars.currentplayer->pausemode == PAUSEMODE_0
// && g_Vars.currentplayer->pausemode == PAUSEMODE_UNPAUSED
// && (buttons & START_BUTTON)) {
// if (g_Vars.mplayerisrunning == false) {
// currentPlayerPause(PAUSEMODE_2);
@@ -10745,7 +10745,7 @@ glabel var7f1ad6ac
// }
//
// // df64
// if (g_Vars.currentplayer->pausemode != PAUSEMODE_0) {
// if (g_Vars.currentplayer->pausemode != PAUSEMODE_UNPAUSED) {
// func0f0bad6c();
// }
//
src/include/constants.h
+5 -4
View File
@@ -2102,10 +2102,10 @@
#define PATHTYPE_FLYING 2
#define PATHTYPE_4 4
#define PAUSEMODE_0 0
#define PAUSEMODE_1 1
#define PAUSEMODE_2 2
#define PAUSEMODE_3 3
#define PAUSEMODE_UNPAUSED 0
#define PAUSEMODE_1 1
#define PAUSEMODE_2 2
#define PAUSEMODE_3 3
#define PDMODEPROP_REACTION 0
#define PDMODEPROP_HEALTH 1
@@ -2642,6 +2642,7 @@
#define WEAPONFLAG_DETERMINER_F_THE 0x01000000
#define WEAPONFLAG_DETERMINER_S_SOME 0x10000000
#define WEAPONFLAG_DETERMINER_F_SOME 0x20000000
#define WEAPONFLAG_80000000 0x80000000
#define WEATHERTYPE_RAIN 0
#define WEATHERTYPE_SNOW 1
src/include/game/game_097ba0.h
+4 -4
View File
@@ -50,7 +50,7 @@ u32 func0f09cd18(void);
u32 func0f09cdc4(void);
u32 func0f09ce8c(void);
u32 func0f09ceac(void);
u32 func0f09cf58(void);
f32 func0f09cf58(u32 arg0);
u32 func0f09cf88(void);
u32 func0f09d140(void);
u32 func0f09d550(void);
@@ -76,8 +76,8 @@ u32 func0f09f848(void);
u32 func0f09f974(void);
u32 func0f09fa20(void);
u32 func0f09fa84(void);
u32 func0f0a0394(void);
u32 func0f0a0b30(void);
void func0f0a0394(void);
void func0f0a0b30(f32 autoaimx, f32 autoaimy);
u32 func0f0a0b98(void);
u32 func0f0a0bec(void);
u32 func0f0a0c08(void);
@@ -98,7 +98,7 @@ u32 func0f0a1c2c(void);
bool func0f0a1d14(u32 weaponnum);
u32 func0f0a1df4(void);
void currentPlayerEquipWeapon(u32 arg0, u32 arg1);
u32 func0f0a20fc(void);
bool func0f0a20fc(u32 arg0);
u32 func0f0a212c(void);
char *weaponGetName(s32 weaponnum);
u16 weaponGetNameId(s32 weaponnum);
src/include/game/game_0b0420.h
+1 -1
View File
@@ -27,7 +27,7 @@ u32 func0f0b11bc(void);
u32 func0f0b11ec(void);
f32 func0f0b12ec(u32 arg0);
u32 func0f0b131c(void);
u32 func0f0b14d8(void);
f32 func0f0b14d8(void);
u32 func0f0b1588(void);
void currentPlayerUpdateGunZoomFovs(f32 arg0);
bool weaponHasFlag(s32 itemid, u32 flag);
src/include/types.h
+18 -16
View File
@@ -1165,7 +1165,7 @@ struct player638 {
/*0x0638*/ u8 unk0638;
/*0x0639*/ u8 unk0639;
/*0x063a*/ u8 unk063a;
/*0x063b*/ u8 unk063b;
/*0x063b*/ u8 unk063b; // 1 if using second function
/*0x063c*/ u8 unk063c;
/*0x0640*/ u32 unk0640;
/*0x0644*/ u32 unk0644;
@@ -1706,14 +1706,14 @@ struct player {
/*0x00f4*/ u32 unk00f4;
/*0x00f8*/ u32 unk00f8;
/*0x00fc*/ u32 unk00fc;
/*0x0100*/ u32 unk0100;
/*0x0100*/ bool docentreupdown;
/*0x0104*/ u32 unk0104;
/*0x0108*/ u32 unk0108;
/*0x010c*/ u32 unk010c;
/*0x0110*/ u32 unk0110;
/*0x0108*/ bool prevupdown;
/*0x010c*/ bool movecentrerelease;
/*0x0110*/ bool lookaheadcentreenabled;
/*0x0114*/ bool automovecentreenabled;
/*0x0118*/ u32 unk0118;
/*0x011c*/ u32 unk011c;
/*0x0118*/ bool fastmovecentreenabled;
/*0x011c*/ bool automovecentre;
/*0x0120*/ bool insightaimmode;
/*0x0124*/ bool autoyaimenabled;
@@ -1740,8 +1740,8 @@ struct player {
/*0x0168*/ f32 speedsideways;
/*0x016c*/ f32 speedstrafe;
/*0x0170*/ f32 speedforwards;
/*0x0174*/ f32 speedboost;
/*0x0178*/ u32 speedmaxtime60;
/*0x0174*/ f32 speedboost; // speed multiplier - ranges from 1 to 1.25 - kicks in after 3 seconds of full speed
/*0x0178*/ u32 speedmaxtime60; // amount of time player has held full forward speed - 60 is 1 second
/*0x017c*/ f32 bondshotspeed[3];
/*0x0188*/ f32 unk0188;
/*0x018c*/ f32 unk018c;
@@ -1793,10 +1793,10 @@ struct player {
/*0x024c*/ s16 invdowntime;
/*0x024e*/ s16 usedowntime;
/*0x0250*/ u8 activemenumode;
/*0x0254*/ u32 unk0254;
/*0x0258*/ u32 unk0258;
/*0x025c*/ u32 unk025c;
/*0x0260*/ u32 unk0260;
/*0x0254*/ u32 erasertime; // related to FarSight's auto tracking
/*0x0258*/ f32 autoeraserdist;
/*0x025c*/ struct prop *unk025c; // eraser target?
/*0x0260*/ s32 aimtaptime;
/*0x0264*/ struct weaponobj *slayerrocket;
/*0x0268*/ bool eyesshut;
/*0x026c*/ f32 eyesshutfrac;
@@ -2292,9 +2292,9 @@ struct player {
/*0x1bc8*/ struct coord cam_up;
/*0x1bd4*/ u32 unk1bd4;
/*0x1bd8*/ s32 unk1bd8;
/*0x1bdc*/ u32 unk1bdc;
/*0x1be0*/ u32 unk1be0;
/*0x1be4*/ u16 unk1be4;
/*0x1bdc*/ s32 unk1bdc;
/*0x1be0*/ u32 cachedlookahead;
/*0x1be4*/ u16 lookaheadframe;
/*0x1be6*/ u8 numaibuddies;
/*0x1be7*/ u8 aibuddynums[MAX_SIMULANTS];
/*0x1bf0*/ u32 bondexploding;
@@ -2327,6 +2327,8 @@ struct player {
/*0x1c54*/ u32 unk1c54;
/*0x1c58*/ f32 unk1c58;
/*0x1c5c*/ f32 stealhealth;
/*0x1c60*/ s32 unk1c60;
/*0x1c64*/ s32 unk1c64;
};
struct stagesetup00 {