From 33e4f93bbadfd9cb5c2cb0857ac1efc592980cea Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Fri, 29 Nov 2019 21:52:36 +1000 Subject: [PATCH] Decompile func0f0bb320 --- src/game/game_0b28d0.c | 22 +++++++--------------- src/include/types.h | 2 +- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/src/game/game_0b28d0.c b/src/game/game_0b28d0.c index d7762aa66..312ca7067 100644 --- a/src/game/game_0b28d0.c +++ b/src/game/game_0b28d0.c @@ -10096,21 +10096,13 @@ glabel func0f0bb2e8 /* f0bb31c: 00000000 */ sll $zero,$zero,0x0 ); -GLOBAL_ASM( -glabel func0f0bb320 -/* f0bb320: 3c02800a */ lui $v0,%hi(g_Vars) -/* f0bb324: 24429fc0 */ addiu $v0,$v0,%lo(g_Vars) -/* f0bb328: 8c4e0284 */ lw $t6,0x284($v0) -/* f0bb32c: 44876000 */ mtc1 $a3,$f12 -/* f0bb330: adc402d8 */ sw $a0,0x2d8($t6) -/* f0bb334: 8c4f0284 */ lw $t7,0x284($v0) -/* f0bb338: ade502dc */ sw $a1,0x2dc($t7) -/* f0bb33c: 8c580284 */ lw $t8,0x284($v0) -/* f0bb340: af0602e0 */ sw $a2,0x2e0($t8) -/* f0bb344: 8c590284 */ lw $t9,0x284($v0) -/* f0bb348: 03e00008 */ jr $ra -/* f0bb34c: e72c02e4 */ swc1 $f12,0x2e4($t9) -); +void func0f0bb320(s32 arg0, s32 arg1, s32 arg2, float arg3) +{ + g_Vars.currentplayer->unk02d8 = arg0; + g_Vars.currentplayer->unk02dc = arg1; + g_Vars.currentplayer->unk02e0 = arg2; + g_Vars.currentplayer->unk02e4 = arg3; +} GLOBAL_ASM( glabel func0f0bb350 diff --git a/src/include/types.h b/src/include/types.h index 7af7a51f7..ae4d3ecfb 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -656,7 +656,7 @@ struct player { /*0x02d8*/ u32 unk02d8; /*0x02dc*/ u32 unk02dc; /*0x02e0*/ u32 unk02e0; - /*0x02e4*/ u32 unk02e4; + /*0x02e4*/ float unk02e4; /*0x02e8*/ u32 unk02e8; /*0x02ec*/ u32 unk02ec; /*0x02f0*/ u32 unk02f0;