diff --git a/src/game/game_0b63b0.c b/src/game/game_0b63b0.c index 339b1ac3b..cf8cb1b53 100644 --- a/src/game/game_0b63b0.c +++ b/src/game/game_0b63b0.c @@ -14610,18 +14610,11 @@ glabel func0f0c32a0 /* f0c32f8: 00000000 */ sll $zero,$zero,0x0 ); -GLOBAL_ASM( -glabel func0f0c32fc -/* f0c32fc: 3c0e0102 */ lui $t6,0x102 -/* f0c3300: 35ce0040 */ ori $t6,$t6,0x40 -/* f0c3304: ac8e0000 */ sw $t6,0x0($a0) -/* f0c3308: 3c0f800a */ lui $t7,%hi(g_Vars+0x284) -/* f0c330c: 8defa244 */ lw $t7,%lo(g_Vars+0x284)($t7) -/* f0c3310: 24820008 */ addiu $v0,$a0,0x8 -/* f0c3314: 8df8005c */ lw $t8,0x5c($t7) -/* f0c3318: 03e00008 */ jr $ra -/* f0c331c: ac980004 */ sw $t8,0x4($a0) -); +Gfx *currentPlayerLoadMatrix(Gfx *gdl) +{ + gSPMatrix(gdl++, g_Vars.currentplayer->matrix, G_MTX_LOAD); + return gdl; +} GLOBAL_ASM( glabel func0f0c3320 diff --git a/src/game/game_157db0.c b/src/game/game_157db0.c index 60abada84..5b5ee2c2b 100644 --- a/src/game/game_157db0.c +++ b/src/game/game_157db0.c @@ -3201,7 +3201,7 @@ glabel func0f15a6f4 /* f15aadc: 0c012d20 */ jal osVirtualToPhysical /* f15aae0: 00402025 */ or $a0,$v0,$zero /* f15aae4: ae020004 */ sw $v0,0x4($s0) -/* f15aae8: 0fc30cbf */ jal func0f0c32fc +/* f15aae8: 0fc30cbf */ jal currentPlayerLoadMatrix /* f15aaec: 02202025 */ or $a0,$s1,$zero /* f15aaf0: 0fc599b2 */ jal func0f1666c8 /* f15aaf4: 00402025 */ or $a0,$v0,$zero @@ -5502,7 +5502,7 @@ glabel func0f15cae0 /* f15cb38: 3c198009 */ lui $t9,%hi(var80092870) /* f15cb3c: 8f392870 */ lw $t9,%lo(var80092870)($t9) /* f15cb40: 24440008 */ addiu $a0,$v0,0x8 -/* f15cb44: 0fc30cbf */ jal func0f0c32fc +/* f15cb44: 0fc30cbf */ jal currentPlayerLoadMatrix /* f15cb48: ac590004 */ sw $t9,0x4($v0) /* f15cb4c: 8fbf0014 */ lw $ra,0x14($sp) /* f15cb50: 27bd0018 */ addiu $sp,$sp,0x18 diff --git a/src/include/game/game_0b63b0.h b/src/include/game/game_0b63b0.h index 531a4ace5..4602d706d 100644 --- a/src/include/game/game_0b63b0.h +++ b/src/include/game/game_0b63b0.h @@ -85,7 +85,7 @@ u32 func0f0c228c(void); u32 func0f0c2364(void); u32 func0f0c2a58(void); u32 func0f0c32a0(void); -u32 func0f0c32fc(void); +Gfx *currentPlayerLoadMatrix(Gfx *gdl); u32 func0f0c3320(void); void setTickMode(s32 tickmode); void func0f0b9650(void); diff --git a/src/include/types.h b/src/include/types.h index a0817c42f..15d8abc43 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -1666,7 +1666,7 @@ struct player { /*0x0038*/ struct coord globaldrawworldoffset; /*0x0044*/ struct coord globaldrawcameraoffset; /*0x0050*/ struct coord globaldrawworldbgoffset; - /*0x005c*/ u32 unk005c; + /*0x005c*/ f32 *matrix; /*0x0060*/ u32 unk0060; /*0x0064*/ u32 unk0064; /*0x0068*/ u32 unk0068;