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

Decompile currentPlayerUpdateSpeedSidewaysGrab

This commit is contained in:
Ryan Dwyer 2020-05-10 22:38:18 +10:00
parent 3de50e89f3
commit ea15434d1b
2 changed files with 21 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
src/game/bondgrab.c
View File

@ -1722,58 +1722,26 @@ void func0f0ce450(void)
} }
} }
GLOBAL_ASM( void currentPlayerUpdateSpeedSidewaysGrab(f32 targetspeed, f32 accelspeed, s32 mult)
glabel currentPlayerUpdateSpeedSidewaysGrab {
/* f0ce4a0: 3c03800a */ lui $v1,%hi(g_Vars) if (targetspeed < g_Vars.currentplayer->speedstrafe) {
/* f0ce4a4: 24639fc0 */ addiu $v1,$v1,%lo(g_Vars) g_Vars.currentplayer->speedstrafe -= accelspeed * mult;
/* f0ce4a8: 8c620284 */ lw $v0,0x284($v1)
/* f0ce4ac: c440016c */ lwc1 $f0,0x16c($v0) if (g_Vars.currentplayer->speedstrafe < targetspeed) {
/* f0ce4b0: 4600603c */ c.lt.s $f12,$f0 g_Vars.currentplayer->speedstrafe = targetspeed;
/* f0ce4b4: 00000000 */ sll $zero,$zero,0x0 }
/* f0ce4b8: 45020013 */ bc1fl .L0f0ce508 } else {
/* f0ce4bc: 460c003c */ c.lt.s $f0,$f12 if (g_Vars.currentplayer->speedstrafe < targetspeed) {
/* f0ce4c0: 44862000 */ mtc1 $a2,$f4 g_Vars.currentplayer->speedstrafe += accelspeed * mult;
/* f0ce4c4: 00000000 */ sll $zero,$zero,0x0
/* f0ce4c8: 468021a0 */ cvt.s.w $f6,$f4 if (g_Vars.currentplayer->speedstrafe > targetspeed) {
/* f0ce4cc: 46067202 */ mul.s $f8,$f14,$f6 g_Vars.currentplayer->speedstrafe = targetspeed;
/* f0ce4d0: 46080281 */ sub.s $f10,$f0,$f8 }
/* f0ce4d4: e44a016c */ swc1 $f10,0x16c($v0) }
/* f0ce4d8: 8c620284 */ lw $v0,0x284($v1) }
/* f0ce4dc: c440016c */ lwc1 $f0,0x16c($v0)
/* f0ce4e0: 460c003c */ c.lt.s $f0,$f12 g_Vars.currentplayer->speedsideways = g_Vars.currentplayer->speedstrafe;
/* f0ce4e4: 00000000 */ sll $zero,$zero,0x0 }
/* f0ce4e8: 4500001a */ bc1f .L0f0ce554
/* f0ce4ec: 00000000 */ sll $zero,$zero,0x0
/* f0ce4f0: e44c016c */ swc1 $f12,0x16c($v0)
/* f0ce4f4: 3c02800a */ lui $v0,%hi(g_Vars+0x284)
/* f0ce4f8: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0)
/* f0ce4fc: 10000015 */ beqz $zero,.L0f0ce554
/* f0ce500: c440016c */ lwc1 $f0,0x16c($v0)
/* f0ce504: 460c003c */ c.lt.s $f0,$f12
.L0f0ce508:
/* f0ce508: 00000000 */ sll $zero,$zero,0x0
/* f0ce50c: 45000011 */ bc1f .L0f0ce554
/* f0ce510: 00000000 */ sll $zero,$zero,0x0
/* f0ce514: 44868000 */ mtc1 $a2,$f16
/* f0ce518: 00000000 */ sll $zero,$zero,0x0
/* f0ce51c: 468084a0 */ cvt.s.w $f18,$f16
/* f0ce520: 46127102 */ mul.s $f4,$f14,$f18
/* f0ce524: 46040180 */ add.s $f6,$f0,$f4
/* f0ce528: e446016c */ swc1 $f6,0x16c($v0)
/* f0ce52c: 8c620284 */ lw $v0,0x284($v1)
/* f0ce530: c440016c */ lwc1 $f0,0x16c($v0)
/* f0ce534: 4600603c */ c.lt.s $f12,$f0
/* f0ce538: 00000000 */ sll $zero,$zero,0x0
/* f0ce53c: 45000005 */ bc1f .L0f0ce554
/* f0ce540: 00000000 */ sll $zero,$zero,0x0
/* f0ce544: e44c016c */ swc1 $f12,0x16c($v0)
/* f0ce548: 3c02800a */ lui $v0,%hi(g_Vars+0x284)
/* f0ce54c: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0)
/* f0ce550: c440016c */ lwc1 $f0,0x16c($v0)
.L0f0ce554:
/* f0ce554: 03e00008 */ jr $ra
/* f0ce558: e4400168 */ swc1 $f0,0x168($v0)
);
void currentPlayerUpdateSpeedForwardsGrab(f32 target, f32 speed) void currentPlayerUpdateSpeedForwardsGrab(f32 target, f32 speed)
{ {

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

@ -19,7 +19,7 @@ void currentPlayerUpdatePrevPosGrab(void);
void func0f0ce178(void); void func0f0ce178(void);
void func0f0ce1ac(void); void func0f0ce1ac(void);
void func0f0ce450(void); void func0f0ce450(void);
void currentPlayerUpdateSpeedSidewaysGrab(f32 arg0, f32 arg1, s32 mult); void currentPlayerUpdateSpeedSidewaysGrab(f32 targetspeed, f32 accelspeed, s32 mult);
void currentPlayerUpdateSpeedForwardsGrab(f32 target, f32 speed); void currentPlayerUpdateSpeedForwardsGrab(f32 target, f32 speed);
void currentPlayerUpdateSpeedGrab(struct movedata *data); void currentPlayerUpdateSpeedGrab(struct movedata *data);
void currentPlayerUpdateSpeedThetaGrab(void); void currentPlayerUpdateSpeedThetaGrab(void);