diff --git a/src/game/mplayer.c b/src/game/mplayer.c index 17a177299..01c974bba 100644 --- a/src/game/mplayer.c +++ b/src/game/mplayer.c @@ -626,21 +626,12 @@ glabel func0f187e70 /* f187fb8: 00000000 */ sll $zero,$zero,0x0 ); -GLOBAL_ASM( -glabel func0f187fbc -/* f187fbc: 00047080 */ sll $t6,$a0,0x2 -/* f187fc0: 01c47021 */ addu $t6,$t6,$a0 -/* f187fc4: 3c0f800b */ lui $t7,%hi(g_MpPlayers) -/* f187fc8: 25efc7b8 */ addiu $t7,$t7,%lo(g_MpPlayers) -/* f187fcc: 000e7140 */ sll $t6,$t6,0x5 -/* f187fd0: 01cf1021 */ addu $v0,$t6,$t7 -/* f187fd4: 24030050 */ addiu $v1,$zero,0x50 -/* f187fd8: 2418004b */ addiu $t8,$zero,0x4b -/* f187fdc: a4430018 */ sh $v1,0x18($v0) -/* f187fe0: a443001a */ sh $v1,0x1a($v0) -/* f187fe4: 03e00008 */ jr $ra -/* f187fe8: a458001c */ sh $t8,0x1c($v0) -); +void func0f187fbc(s32 playernum) +{ + g_MpPlayers[playernum].base.unk18 = 80; + g_MpPlayers[playernum].base.unk1a = 80; + g_MpPlayers[playernum].base.unk1c = 75; +} void func0f187fec(void) { diff --git a/src/include/game/mplayer.h b/src/include/game/mplayer.h index 74cce60bd..2789cee41 100644 --- a/src/include/game/mplayer.h +++ b/src/include/game/mplayer.h @@ -8,7 +8,7 @@ u32 func0f187838(void); u32 func0f187864(void); u32 func0f187944(void); void func0f187e70(void); -u32 func0f187fbc(void); +void func0f187fbc(s32 playernum); void func0f187fec(void); u32 func0f18800c(void); u32 func0f1881d4(void); diff --git a/src/include/types.h b/src/include/types.h index 51f405ba6..55409a1fd 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -4064,9 +4064,10 @@ struct mpchr { /*0x10*/ u8 bodynum; /*0x11*/ u8 team; /*0x14*/ u32 displayoptions; - /*0x18*/ u32 unk18; + /*0x18*/ u16 unk18; + /*0x1a*/ u16 unk1a; /*0x1c*/ u16 unk1c; - /*0x1c*/ s8 placement; + /*0x1e*/ s8 placement; /*0x20*/ u32 unk20; /*0x24*/ s16 unk24[12]; /*0x3c*/ s16 unk3c;