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

Decompile currentPlayerUpdateAutoAimXProp

Browse Source
This commit is contained in:
Ryan Dwyer
2020-02-29 23:38:49 +10:00
parent 78c80d7669
commit 78cd37b8d9
4 changed files with 23 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/game_0601b0.c
+2 -2
View File
@@ -5918,7 +5918,7 @@ glabel func0f064ce8
/* f0653e4: 46124283 */ div.s $f10,$f8,$f18
/* f0653e8: 46105101 */ sub.s $f4,$f10,$f16
/* f0653ec: 44052000 */ mfc1 $a1,$f4
/* f0653f0: 0fc31f0d */ jal func0f0c7c34
/* f0653f0: 0fc31f0d */ jal currentPlayerUpdateAutoAimXProp
/* f0653f4: 00000000 */ sll $zero,$zero,0x0
/* f0653f8: 8fb900e4 */ lw $t9,0xe4($sp)
.L0f0653fc:
@@ -5968,7 +5968,7 @@ glabel func0f064ce8
/* f06549c: 0fc31ec0 */ jal func0f0c7b00
/* f0654a0: 24050000 */ addiu $a1,$zero,0x0
/* f0654a4: 00002025 */ or $a0,$zero,$zero
/* f0654a8: 0fc31f0d */ jal func0f0c7c34
/* f0654a8: 0fc31f0d */ jal currentPlayerUpdateAutoAimXProp
/* f0654ac: 24050000 */ addiu $a1,$zero,0x0
/* f0654b0: 8ea20284 */ lw $v0,0x284($s5)
/* f0654b4: 904c1583 */ lbu $t4,0x1583($v0)
src/game/game_0c79f0.c
+17 -30
View File
@@ -319,36 +319,23 @@ glabel func0f0c7bd0
/* f0c7c30: 00000000 */ sll $zero,$zero,0x0
);
GLOBAL_ASM(
glabel func0f0c7c34
/* f0c7c34: 44856000 */ mtc1 $a1,$f12
/* f0c7c38: 3c05800a */ lui $a1,%hi(g_Vars)
/* f0c7c3c: 24a59fc0 */ addiu $a1,$a1,%lo(g_Vars)
/* f0c7c40: 8ca20284 */ lw $v0,0x284($a1)
/* f0c7c44: 8c430140 */ lw $v1,0x140($v0)
/* f0c7c48: 04620006 */ bltzl $v1,.L0f0c7c64
/* f0c7c4c: 8c58013c */ lw $t8,0x13c($v0)
/* f0c7c50: 8cae0038 */ lw $t6,0x38($a1)
/* f0c7c54: 006e7823 */ subu $t7,$v1,$t6
/* f0c7c58: ac4f0140 */ sw $t7,0x140($v0)
/* f0c7c5c: 8ca20284 */ lw $v0,0x284($a1)
/* f0c7c60: 8c58013c */ lw $t8,0x13c($v0)
.L0f0c7c64:
/* f0c7c64: 5098000a */ beql $a0,$t8,.L0f0c7c90
/* f0c7c68: e44c0138 */ swc1 $f12,0x138($v0)
/* f0c7c6c: 8c590140 */ lw $t9,0x140($v0)
/* f0c7c70: 2408001e */ addiu $t0,$zero,0x1e
/* f0c7c74: 07210006 */ bgez $t9,.L0f0c7c90
/* f0c7c78: 00000000 */ sll $zero,$zero,0x0
/* f0c7c7c: ac480140 */ sw $t0,0x140($v0)
/* f0c7c80: 8ca90284 */ lw $t1,0x284($a1)
/* f0c7c84: ad24013c */ sw $a0,0x13c($t1)
/* f0c7c88: 8ca20284 */ lw $v0,0x284($a1)
/* f0c7c8c: e44c0138 */ swc1 $f12,0x138($v0)
.L0f0c7c90:
/* f0c7c90: 03e00008 */ jr $ra
/* f0c7c94: 00000000 */ sll $zero,$zero,0x0
);
void currentPlayerUpdateAutoAimXProp(struct prop *prop, f32 autoaimx)
{
if (g_Vars.currentplayer->autoxaimtime60 >= 0) {
g_Vars.currentplayer->autoxaimtime60 -= g_Vars.lvupdate240_60;
}
if (prop != g_Vars.currentplayer->autoxaimprop) {
if (g_Vars.currentplayer->autoxaimtime60 < 0) {
g_Vars.currentplayer->autoxaimtime60 = 30;
g_Vars.currentplayer->autoxaimprop = prop;
} else {
return;
}
}
g_Vars.currentplayer->autoaimx = autoaimx;
}
GLOBAL_ASM(
glabel func0f0c7c98
src/include/game/game_0c79f0.h
+1 -1
View File
@@ -13,7 +13,7 @@ u32 func0f0c7b00(void);
void currentPlayerSetAutoAimX(bool enabled);
bool currentPlayerIsAutoAimXEnabled(void);
u32 func0f0c7bd0(void);
u32 func0f0c7c34(void);
void currentPlayerUpdateAutoAimXProp(struct prop *prop, f32 autoaimx);
u32 func0f0c7c98(void);
u32 func0f0c7cc4(void);
void currentPlayerGrabProp(struct prop *prop);
src/include/types.h
+3 -3
View File
@@ -1096,9 +1096,9 @@ struct player {
/*0x012c*/ u32 unk012c;
/*0x0130*/ u32 unk0130;
/*0x0134*/ bool autoxaimenabled;
/*0x0138*/ u32 unk0138;
/*0x013c*/ u32 unk013c;
/*0x0140*/ u32 unk0140;
/*0x0138*/ f32 autoaimx;
/*0x013c*/ struct prop *autoxaimprop;
/*0x0140*/ s32 autoxaimtime60;
/*0x0144*/ f32 unk0144;
/*0x0148*/ u32 unk0148;
/*0x014c*/ u32 unk014c;