diff --git a/src/game/game_097ba0.c b/src/game/game_097ba0.c index 97fc259c4..2d9f97491 100644 --- a/src/game/game_097ba0.c +++ b/src/game/game_097ba0.c @@ -21309,21 +21309,14 @@ glabel func0f0a93e0 /* f0a9460: 00000000 */ sll $zero,$zero,0x0 ); -GLOBAL_ASM( -glabel func0f0a9464 -/* f0a9464: 3c02800a */ lui $v0,%hi(g_Vars+0x284) -/* f0a9468: 8c42a244 */ lw $v0,%lo(g_Vars+0x284)($v0) -/* f0a946c: c4800000 */ lwc1 $f0,0x0($a0) -/* f0a9470: e4400b94 */ swc1 $f0,0xb94($v0) -/* f0a9474: e4401338 */ swc1 $f0,0x1338($v0) -/* f0a9478: c4800004 */ lwc1 $f0,0x4($a0) -/* f0a947c: e4400b98 */ swc1 $f0,0xb98($v0) -/* f0a9480: e440133c */ swc1 $f0,0x133c($v0) -/* f0a9484: c4800008 */ lwc1 $f0,0x8($a0) -/* f0a9488: e4400b9c */ swc1 $f0,0xb9c($v0) -/* f0a948c: 03e00008 */ jr $ra -/* f0a9490: e4401340 */ swc1 $f0,0x1340($v0) -); +void func0f0a9464(struct coord *coord) +{ + struct player *player = g_Vars.currentplayer; + + player->unk1338.x = player->unk0b94.x = coord->x; + player->unk1338.y = player->unk0b94.y = coord->y; + player->unk1338.z = player->unk0b94.z = coord->z; +} void func0f0a9494(u32 operation) { diff --git a/src/include/game/game_097ba0.h b/src/include/game/game_097ba0.h index da9697196..4451d641c 100644 --- a/src/include/game/game_097ba0.h +++ b/src/include/game/game_097ba0.h @@ -147,7 +147,7 @@ u32 func0f0a8d34(void); void func0f0a92ac(u32 arg0); void currentPlayerSetAimType(u32 aimtype); u32 func0f0a93e0(void); -u32 func0f0a9464(void); +void func0f0a9464(struct coord *coord); void func0f0a9494(u32 operation); void func0f0a94d0(u32 operation, struct coord *a, struct coord *b); void func0f0a95ec(u32 arg0, bool enable); diff --git a/src/include/types.h b/src/include/types.h index ad83d9032..19ea7933a 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -1828,9 +1828,7 @@ struct player { /*0x0b88*/ u32 unk0b88; /*0x0b8c*/ u32 unk0b8c; /*0x0b90*/ u32 unk0b90; - /*0x0b94*/ u32 unk0b94; - /*0x0b98*/ u32 unk0b98; - /*0x0b9c*/ u32 unk0b9c; + /*0x0b94*/ struct coord unk0b94; /*0x0ba0*/ u32 unk0ba0; /*0x0ba4*/ u32 unk0ba4; /*0x0ba8*/ u32 unk0ba8; @@ -2313,9 +2311,7 @@ struct player { /*0x132c*/ u32 unk132c; /*0x1330*/ u32 unk1330; /*0x1334*/ u32 unk1334; - /*0x1338*/ u32 unk1338; - /*0x133c*/ u32 unk133c; - /*0x1340*/ u32 unk1340; + /*0x1338*/ struct coord unk1338; /*0x1344*/ u32 unk1344; /*0x1348*/ u32 unk1348; /*0x134c*/ u32 unk134c;