diff --git a/src/game/game_097ba0.c b/src/game/game_097ba0.c index c094c49a0..457628ee3 100644 --- a/src/game/game_097ba0.c +++ b/src/game/game_097ba0.c @@ -11304,24 +11304,14 @@ glabel func0f0a0bec /* f0a0c04: e4a60000 */ swc1 $f6,0x0($a1) ); -GLOBAL_ASM( -glabel func0f0a0c08 -/* f0a0c08: 44800000 */ mtc1 $zero,$f0 -/* f0a0c0c: 27bdffe8 */ addiu $sp,$sp,-24 -/* f0a0c10: afbf0014 */ sw $ra,0x14($sp) -/* f0a0c14: e4800000 */ swc1 $f0,0x0($a0) -/* f0a0c18: e4800004 */ swc1 $f0,0x4($a0) -/* f0a0c1c: e4800008 */ swc1 $f0,0x8($a0) -/* f0a0c20: 3c04800a */ lui $a0,%hi(g_Vars+0x284) -/* f0a0c24: 8c84a244 */ lw $a0,%lo(g_Vars+0x284)($a0) -/* f0a0c28: 3c063f80 */ lui $a2,0x3f80 -/* f0a0c2c: 0fc2d30f */ jal func0f0b4c3c -/* f0a0c30: 24841660 */ addiu $a0,$a0,5728 -/* f0a0c34: 8fbf0014 */ lw $ra,0x14($sp) -/* f0a0c38: 27bd0018 */ addiu $sp,$sp,0x18 -/* f0a0c3c: 03e00008 */ jr $ra -/* f0a0c40: 00000000 */ nop -); +void func0f0a0c08(struct coord *arg0, struct coord *arg1) +{ + arg0->x = 0; + arg0->y = 0; + arg0->z = 0; + + func0f0b4c3c(g_Vars.currentplayer->crosspos, arg1, 1); +} GLOBAL_ASM( glabel func0f0a0c44 diff --git a/src/include/game/game_0b3350.h b/src/include/game/game_0b3350.h index 8c7ae9cbc..14fabe536 100644 --- a/src/include/game/game_0b3350.h +++ b/src/include/game/game_0b3350.h @@ -16,7 +16,7 @@ void currentPlayerSetScreenPosition(f32 left, f32 top); void currentPlayerSetPerspective(f32 near, f32 fovy, f32 aspect); f32 func0f0b49b8(f32 arg0); void currentPlayerSetCameraScale(void); -u32 func0f0b4c3c(void); +void func0f0b4c3c(f32 *crosspos, struct coord *arg1, f32 arg2); void func0f0b4d04(struct coord *in, f32 *out); void func0f0b4d68(struct coord *in, struct coord *out); void func0f0b4dec(struct coord *in, struct coord *out); diff --git a/src/include/types.h b/src/include/types.h index cf5e7e3e1..4f702e642 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -2363,8 +2363,7 @@ struct player { /*0x1620*/ u32 aimtype; /*0x1624*/ struct threat lookingatprop; /*0x1630*/ struct threat cmpfollowprops[4]; - /*0x1660*/ u32 unk1660; - /*0x1664*/ u32 unk1664; + /*0x1660*/ f32 crosspos[2]; /*0x1668*/ u32 unk1668; /*0x166c*/ u32 unk166c; /*0x1670*/ u32 unk1670;