falso
/
perfect_dark
mirror of https://github.com/n64decomp/perfect_dark.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Decompile bmoveProcessInput

This commit is contained in:
Ryan Dwyer 2021-06-19 21:42:24 +10:00
parent 8e6c723d99
commit ac630cb0c1
9 changed files with 1241 additions and 10744 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/piracychecks.md
View File

@ -60,7 +60,7 @@ The decomp project wraps all decompiled piracy checks in `#if PIRACYCHECKS` stat
--- ---
### func0f028590 ### chrsCheckForNoise
**When Called:** When a guard hears you. **When Called:** When a guard hears you.

11961
src/game/bondmove.c
View File

File diff suppressed because it is too large Load Diff

4
src/game/chr/chr.c
View File

@ -15182,7 +15182,7 @@ void func0f02855c(s32 arg0)
func0000db30("selectanimnum", &g_SelectedAnimNum); func0000db30("selectanimnum", &g_SelectedAnimNum);
} }
void func0f028590(f32 arg0) void chrsCheckForNoise(f32 noiseradius)
{ {
s32 i; s32 i;
f32 add = 0.075f; f32 add = 0.075f;
@ -15199,7 +15199,7 @@ void func0f028590(f32 arg0)
if (distance == 0) { if (distance == 0) {
distance = 2; distance = 2;
} else { } else {
distance = (arg0 * 100 * g_ChrSlots[i].hearingscale * (1.0f + add)) / distance; distance = (noiseradius * 100 * g_ChrSlots[i].hearingscale * (1.0f + add)) / distance;
} }
if (distance > 1.0f) { if (distance > 1.0f) {

4
src/include/game/bondmove.h
View File

@ -29,14 +29,14 @@ f32 bmoveGetSpeedThetaControlLimit(f32 value);
void bmoveUpdateSpeedThetaControl(f32 value); void bmoveUpdateSpeedThetaControl(f32 value);
f32 bmoveCalculateLookahead(void); f32 bmoveCalculateLookahead(void);
void bmoveResetMoveData(struct movedata *data); void bmoveResetMoveData(struct movedata *data);
void bmoveProcessInput(s32 arg0, s32 arg1, s32 arg2, s32 arg3); void bmoveProcessInput(bool allowc1x, bool allowc1y, bool allowc1buttons, bool ignorec2);
void bmove0f0cb79c(struct player *player, struct coord *arg1, s16 *rooms); void bmove0f0cb79c(struct player *player, struct coord *arg1, s16 *rooms);
void bmove0f0cb89c(struct player *player, s16 *rooms); void bmove0f0cb89c(struct player *player, s16 *rooms);
void bmove0f0cb8c4(struct player *player); void bmove0f0cb8c4(struct player *player);
void bmove0f0cb904(struct coord *coord); void bmove0f0cb904(struct coord *coord);
void bmove0f0cba88(f32 *a, f32 *b, struct coord *c, f32 mult1, f32 mult2); void bmove0f0cba88(f32 *a, f32 *b, struct coord *c, f32 mult1, f32 mult2);
void bmoveUpdateMoveInitSpeed(struct coord *newpos); void bmoveUpdateMoveInitSpeed(struct coord *newpos);
void bmoveTick(bool arg0, bool arg1, bool arg2, bool arg3); void bmoveTick(bool allowc1x, bool allowc1y, bool allowc1buttons, bool ignorec2);
void bmoveUpdateVerta(void); void bmoveUpdateVerta(void);
void bmove0f0cc19c(struct coord *arg); void bmove0f0cc19c(struct coord *arg);
void bmoveUpdateHead(f32 arg0, f32 arg1, f32 arg2, Mtxf *arg3, f32 arg4); void bmoveUpdateHead(f32 arg0, f32 arg1, f32 arg2, Mtxf *arg3, f32 arg4);

2
src/include/game/chr/chr.h
View File

@ -44,7 +44,7 @@ f32 func0f0278a4(struct chrdata *chr);
void func0f027994(struct prop *prop, struct shotdata *shotdata, bool arg2, bool arg3); void func0f027994(struct prop *prop, struct shotdata *shotdata, bool arg2, bool arg3);
void func0f027e1c(struct shotdata *shotdata, struct hit *hit); void func0f027e1c(struct shotdata *shotdata, struct hit *hit);
void func0f028498(bool value); void func0f028498(bool value);
void func0f028590(f32 arg0); void chrsCheckForNoise(f32 noiseradius);
bool func0f028a50(struct prop *prop, struct coord *arg1, f32 *arg2, f32 *arg3); bool func0f028a50(struct prop *prop, struct coord *arg1, f32 *arg2, f32 *arg3);
s32 func0f028e18(struct prop *arg0, struct modelnode *node, struct model *model, struct prop *arg3); s32 func0f028e18(struct prop *arg0, struct modelnode *node, struct model *model, struct prop *arg3);
bool func0f028e6c(s32 arg0, struct prop *prop, struct prop **propptr, struct modelnode **nodeptr, struct model **modelptr); bool func0f028e6c(s32 arg0, struct prop *prop, struct prop **propptr, struct modelnode **nodeptr, struct model **modelptr);

4
src/include/lib/joy.h
View File

@ -33,8 +33,8 @@ s32 joyGetStickYOnSampleIndex(s32 samplenum, s8 contpadnum);
u16 joyGetButtonsOnSample(s32 samplenum, s8 contpadnum, u16 mask); u16 joyGetButtonsOnSample(s32 samplenum, s8 contpadnum, u16 mask);
u16 joyGetButtonsPressedOnSample(s32 samplenum, s8 contpadnum, u16 mask); u16 joyGetButtonsPressedOnSample(s32 samplenum, s8 contpadnum, u16 mask);
s32 joyCountButtonsOnSpecificSamples(u32 *arg0, s8 contpadnum, u16 mask); s32 joyCountButtonsOnSpecificSamples(u32 *arg0, s8 contpadnum, u16 mask);
s8 joyGetStickX(s8 contpadnum); s32 joyGetStickX(s8 contpadnum);
s8 joyGetStickY(s8 contpadnum); s32 joyGetStickY(s8 contpadnum);
u16 joyGetButtons(s8 contpadnum, u16 mask); u16 joyGetButtons(s8 contpadnum, u16 mask);
u16 joyGetButtonsPressedThisFrame(s8 contpadnum, u16 mask); u16 joyGetButtonsPressedThisFrame(s8 contpadnum, u16 mask);
s32 joy000150c4(void); s32 joy000150c4(void);

2
src/include/types.h
View File

@ -2571,7 +2571,7 @@ struct player {
/*0x016c*/ f32 speedstrafe; /*0x016c*/ f32 speedstrafe;
/*0x0170*/ f32 speedforwards; // range -1 to 1 /*0x0170*/ f32 speedforwards; // range -1 to 1
/*0x0174*/ f32 speedboost; // speed multiplier - ranges from 1 to 1.25 - kicks in after 3 seconds of full speed /*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 /*0x0178*/ s32 speedmaxtime60; // amount of time player has held full forward speed
/*0x017c*/ f32 bondshotspeed[3]; /*0x017c*/ f32 bondshotspeed[3];
/*0x0188*/ f32 bondfadetime60; /*0x0188*/ f32 bondfadetime60;
/*0x018c*/ f32 bondfadetimemax60; /*0x018c*/ f32 bondfadetimemax60;

4
src/lib/joy.c
View File

@ -1128,7 +1128,7 @@ s32 joyCountButtonsOnSpecificSamples(u32 *checksamples, s8 contpadnum, u16 mask)
return count; return count;
} }
s8 joyGetStickX(s8 contpadnum) s32 joyGetStickX(s8 contpadnum)
{ {
if (g_JoyDataPtr->unk200 < 0 && (g_JoyConnectedControllers >> contpadnum & 1) == 0) { if (g_JoyDataPtr->unk200 < 0 && (g_JoyConnectedControllers >> contpadnum & 1) == 0) {
g_JoyBadReadsStickX[contpadnum]++; g_JoyBadReadsStickX[contpadnum]++;
@ -1142,7 +1142,7 @@ s8 joyGetStickX(s8 contpadnum)
return g_JoyDataPtr->samples[g_JoyDataPtr->curlast].pads[contpadnum].stick_x; return g_JoyDataPtr->samples[g_JoyDataPtr->curlast].pads[contpadnum].stick_x;
} }
s8 joyGetStickY(s8 contpadnum) s32 joyGetStickY(s8 contpadnum)
{ {
if (g_JoyDataPtr->unk200 < 0 && (g_JoyConnectedControllers >> contpadnum & 1) == 0) { if (g_JoyDataPtr->unk200 < 0 && (g_JoyConnectedControllers >> contpadnum & 1) == 0) {
g_JoyBadReadsStickY[contpadnum]++; g_JoyBadReadsStickY[contpadnum]++;

2
tools/patchpiracysums
View File

@ -189,7 +189,7 @@ class Tool:
self.patch(algo02, 'cheatMenuHandleDialog', '__scHandleRetrace') self.patch(algo02, 'cheatMenuHandleDialog', '__scHandleRetrace')
self.patch(algo03, 'propobjHandlePickupByAibot', 'func0f08e2ac') self.patch(algo03, 'propobjHandlePickupByAibot', 'func0f08e2ac')
self.patch(algo04, 'chrUncloak', 'propobjHandlePickupByAibot') self.patch(algo04, 'chrUncloak', 'propobjHandlePickupByAibot')
self.patch(algo05, 'func0f028590', 'func00002078') self.patch(algo05, 'chrsCheckForNoise', 'func00002078')
self.patch(algo06, 'lvInit', 'lvGetSlowMotionType') self.patch(algo06, 'lvInit', 'lvGetSlowMotionType')
self.patch(algo07, 'propAllocateEyespy', 'lvInit') self.patch(algo07, 'propAllocateEyespy', 'lvInit')
self.patch(algo08, 'chrConsiderGrenadeThrow', 'bgInit') self.patch(algo08, 'chrConsiderGrenadeThrow', 'bgInit')