From c6afcba63a7bf5e17851b922db7e99917e6d2d20 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Fri, 31 Jan 2020 18:13:36 +1000 Subject: [PATCH] Decompile func0f0bd4a8 --- src/game/game_0b28d0.c | 25 +++++++------------------ src/include/game/game_0b28d0.h | 2 +- src/include/types.h | 2 +- 3 files changed, 9 insertions(+), 20 deletions(-) diff --git a/src/game/game_0b28d0.c b/src/game/game_0b28d0.c index d8e350661..08fc1db7f 100644 --- a/src/game/game_0b28d0.c +++ b/src/game/game_0b28d0.c @@ -12198,24 +12198,13 @@ void currentPlayerAutoWalk(s16 aimpad, u8 walkspeed, u8 turnspeed, u8 lookup, u8 g_Vars.currentplayer->autocontrol_dist = dist; } -GLOBAL_ASM( -glabel func0f0bd4a8 -/* f0bd4a8: 3c03800a */ lui $v1,%hi(g_Vars) -/* f0bd4ac: 24639fc0 */ addiu $v1,$v1,%lo(g_Vars) -/* f0bd4b0: 8c6e0284 */ lw $t6,0x284($v1) -/* f0bd4b4: 240f0002 */ addiu $t7,$zero,0x2 -/* f0bd4b8: 2401fff0 */ addiu $at,$zero,-16 -/* f0bd4bc: adc40264 */ sw $a0,0x264($t6) -/* f0bd4c0: 8c780284 */ lw $t8,0x284($v1) -/* f0bd4c4: a70f0010 */ sh $t7,0x10($t8) -/* f0bd4c8: 8c620284 */ lw $v0,0x284($v1) -/* f0bd4cc: 8c5900c4 */ lw $t9,0xc4($v0) -/* f0bd4d0: 03214024 */ and $t0,$t9,$at -/* f0bd4d4: ac4800c4 */ sw $t0,0xc4($v0) -/* f0bd4d8: 8c690284 */ lw $t1,0x284($v1) -/* f0bd4dc: 03e00008 */ jr $ra -/* f0bd4e0: ad2000c8 */ sw $zero,0xc8($t1) -); +void func0f0bd4a8(u32 arg0) +{ + g_Vars.currentplayer->unk0264 = arg0; + g_Vars.currentplayer->unk0010 = 2; + g_Vars.currentplayer->unk00c4 &= ~0x0000000f; + g_Vars.currentplayer->unk00c8 = 0; +} GLOBAL_ASM( glabel func0f0bd4e4 diff --git a/src/include/game/game_0b28d0.h b/src/include/game/game_0b28d0.h index 9ee83571e..c1d6afcf1 100644 --- a/src/include/game/game_0b28d0.h +++ b/src/include/game/game_0b28d0.h @@ -130,7 +130,7 @@ u32 func0f0bce24(void); u32 func0f0bd358(void); u32 func0f0bd3c4(void); void currentPlayerAutoWalk(s16 aimpad, u8 walkspeed, u8 turnspeed, u8 lookup, u8 dist); -u32 func0f0bd4a8(void); +void func0f0bd4a8(u32 arg0); u32 func0f0bd4e4(void); u32 func0f0bd764(void); u32 func0f0bd904(void); diff --git a/src/include/types.h b/src/include/types.h index 34cd547aa..646a95336 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -957,7 +957,7 @@ struct eyespy { struct player { /*0x0000*/ s32 cameramode; /*0x0004*/ struct coord memcampos; - /*0x0010*/ u32 unk0010; + /*0x0010*/ u16 unk0010; /*0x0014*/ s32 memcamroom; /*0x0018*/ u32 unk0018; /*0x001c*/ u32 unk001c;