Decompile currentPlayerUpdateSpeedForwardsWalk

This commit is contained in:
Ryan Dwyer
2020-03-05 17:57:48 +10:00
parent 7f0571942a
commit 8ba1801133
9 changed files with 116 additions and 163 deletions
+1 -1
View File
@@ -20,7 +20,7 @@ void func0f0ce178(void);
u32 func0f0ce1ac(void);
void func0f0ce450(void);
u32 func0f0ce4a0(void);
void func0f0ce55c(f32 target, f32 speed);
void currentPlayerUpdateSpeedForwardsGrab(f32 target, f32 speed);
u32 func0f0ce608(void);
void currentPlayerUpdateSpeedThetaGrab(void);
u32 func0f0ce924(void);
+2 -2
View File
@@ -15,8 +15,8 @@ s32 func0f0c47d0(struct coord *a, struct coord *b, struct coord *c, struct coord
u32 func0f0c494c(void);
u32 func0f0c4a5c(void);
void func0f0c4d98(void);
void currentPlayerUpdateSpeedStrafe(f32 targetspeed, f32 accelspeed, s32 arg2);
u32 func0f0c4ec4(void);
void currentPlayerUpdateSpeedSidewaysWalk(f32 targetspeed, f32 accelspeed, s32 arg2);
void currentPlayerUpdateSpeedForwardsWalk(f32 targetspeed, f32 accelspeed);
u32 func0f0c4fd8(void);
void currentPlayerApplyCrouchSpeed(void);
void func0f0c6080(void);
+1 -1
View File
@@ -10,7 +10,7 @@ u32 func0f153204(void);
u32 func0f1532ec(void);
u32 func0f153628(void);
Gfx *func0f153780(Gfx *gdl);
u32 func0f1537dc(void);
Gfx *func0f1537dc(Gfx *gdl, u32 colour);
u32 func0f153838(void);
u32 func0f153858(void);
u32 func0f1538e4(void);
+23 -23
View File
@@ -2639,35 +2639,35 @@ struct player {
/*0x1924*/ u32 healthdamagetype;
/*0x1928*/ f32 bondleandown;
/*0x192c*/ u32 mpmenuon;
/*0x1930*/ u32 mpquitconfirm;
/*0x1934*/ u32 mpjoywascentre;
/*0x1938*/ u32 damagetype;
/*0x193c*/ u32 deathcount;
/*0x1940*/ u32 oldcrosspos[2];
/*0x1948*/ u32 lastkilltime60;
/*0x194c*/ u32 lastkilltime60_2;
/*0x1950*/ u32 lastkilltime60_3;
/*0x1954*/ u32 lastkilltime60_4;
/*0x1958*/ u32 lifestarttime60;
/*0x195c*/ u32 killsthislife;
/*0x1960*/ u32 healthdisplaytime60;
/*0x1964*/ u32 guncloseroffset;
/*0x1968*/ f32 unk1968;
/*0x196c*/ u32 shootroty;
/*0x1970*/ u32 chrmuzzlelast;
/*0x1974*/ u32 healthscale;
/*0x1978*/ u32 armourscale;
/*0x197c*/ u32 speedgo;
/*0x1980*/ u32 sighttimer240;
/*0x1984*/ u32 crouchoffsetreal;
/*0x1988*/ u16 floorroom;
/*0x1930*/ u32 mpmenumode;
/*0x1934*/ u32 mpquitconfirm;
/*0x1938*/ u32 mpjoywascentre;
/*0x193c*/ u32 damagetype;
/*0x1940*/ u32 deathcount;
/*0x1948*/ u32 oldcrosspos[2];
/*0x194c*/ u32 lastkilltime60;
/*0x1950*/ u32 lastkilltime60_2;
/*0x1954*/ u32 lastkilltime60_3;
/*0x1958*/ u32 lastkilltime60_4;
/*0x195c*/ u32 lifestarttime60;
/*0x1960*/ u32 killsthislife;
/*0x1964*/ u32 healthdisplaytime60;
/*0x1968*/ f32 guncloseroffset;
/*0x196c*/ u32 shootrotx;
/*0x1970*/ u32 shootroty;
/*0x1974*/ u32 unk1974;
/*0x1978*/ u32 unk1978;
/*0x197c*/ u32 unk197c;
/*0x1980*/ u32 unk1980;
/*0x1984*/ u32 unk1984;
/*0x1988*/ u16 unk1988;
/*0x198c*/ u32 unk198c;
/*0x1990*/ u32 unk1990;
/*0x1994*/ u32 unk1994;
/*0x1998*/ u32 unk1998;
/*0x199c*/ u32 unk199c;
/*0x19a0*/ u32 unk19a0;
/*0x19a4*/ f32 unk19a4;
/*0x19a4*/ f32 speedgo;
/*0x19a8*/ u32 unk19a8;
/*0x19ac*/ s32 unk19ac;
/*0x19b0*/ u32 unk19b0;
+3 -6
View File
@@ -482,16 +482,13 @@ typedef union
#define G_SETPRIMCOLOR 0xFA
#define gDPSetPrimColor(pkt, m, l, r, g, b, a) \
#define gDPSetPrimColor(pkt, m, l, rgba) \
{ \
Gfx *_g = (Gfx *)(pkt); \
_g->words.w0 = _SHIFTL(G_SETPRIMCOLOR, 24, 8) \
| _SHIFTL(m, 8, 8) \
| _SHIFTL(l, 0, 8); \
_g->words.w1 = _SHIFTL(r, 24, 8) \
| _SHIFTL(g, 16, 8) \
| _SHIFTL(b, 8, 8) \
| _SHIFTL(a, 0, 8); \
_g->words.w1 = (rgba); \
}
#define gDPSetEnvColor(pkt, r, g, b, a) \
@@ -695,7 +692,7 @@ typedef union {
#define LIGHT_2 2
#define LIGHT_3 3
#define LIGHT_4 4
#define LIGHT_5 5
#define LIGHT_5 5
#define LIGHT_6 6
#define LIGHT_7 7
#define LIGHT_8 8