From 0a35938e7942e5ed5565612b61449715631969d4 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Wed, 25 Mar 2020 23:11:55 +1000 Subject: [PATCH] Decompile func0f0f139c --- src/game/game_0f09f0.c | 41 +++++++++++++--------------------- src/include/game/game_0f09f0.h | 2 +- 2 files changed, 17 insertions(+), 26 deletions(-) diff --git a/src/game/game_0f09f0.c b/src/game/game_0f09f0.c index 36113936a..804855e53 100644 --- a/src/game/game_0f09f0.c +++ b/src/game/game_0f09f0.c @@ -968,31 +968,22 @@ struct menustackdfc *func0f0f1338(u32 arg0) return NULL; } -GLOBAL_ASM( -glabel func0f0f139c -/* f0f139c: 27bdffe8 */ addiu $sp,$sp,-24 -/* f0f13a0: afbf0014 */ sw $ra,0x14($sp) -/* f0f13a4: afa40018 */ sw $a0,0x18($sp) -/* f0f13a8: 0fc3c4ce */ jal func0f0f1338 -/* f0f13ac: afa5001c */ sw $a1,0x1c($sp) -/* f0f13b0: 10400003 */ beqz $v0,.L0f0f13c0 -/* f0f13b4: c7a4001c */ lwc1 $f4,0x1c($sp) -/* f0f13b8: 10000008 */ beqz $zero,.L0f0f13dc -/* f0f13bc: e4440004 */ swc1 $f4,0x4($v0) -.L0f0f13c0: -/* f0f13c0: 0fc3c4ce */ jal func0f0f1338 -/* f0f13c4: 00002025 */ or $a0,$zero,$zero -/* f0f13c8: 10400004 */ beqz $v0,.L0f0f13dc -/* f0f13cc: 8fae0018 */ lw $t6,0x18($sp) -/* f0f13d0: ac4e0000 */ sw $t6,0x0($v0) -/* f0f13d4: c7a6001c */ lwc1 $f6,0x1c($sp) -/* f0f13d8: e4460004 */ swc1 $f6,0x4($v0) -.L0f0f13dc: -/* f0f13dc: 8fbf0014 */ lw $ra,0x14($sp) -/* f0f13e0: 27bd0018 */ addiu $sp,$sp,0x18 -/* f0f13e4: 03e00008 */ jr $ra -/* f0f13e8: 00000000 */ sll $zero,$zero,0x0 -); +void func0f0f139c(s32 arg0, f32 arg1) +{ + struct menustackdfc *thing = func0f0f1338(arg0); + + if (thing) { + thing->unk04 = arg1; + return; + } + + thing = func0f0f1338(0); + + if (thing) { + thing->unk00 = arg0; + thing->unk04 = arg1; + } +} void func0f0f13ec(s32 arg0) { diff --git a/src/include/game/game_0f09f0.h b/src/include/game/game_0f09f0.h index bebce7eb4..ce55b4c35 100644 --- a/src/include/game/game_0f09f0.h +++ b/src/include/game/game_0f09f0.h @@ -10,7 +10,7 @@ bool func0f0f0c68(void); void func0f0f0ca0(s32 value, bool allplayers); u32 func0f0f0ce8(void); struct menustackdfc *func0f0f1338(u32 arg0); -u32 func0f0f139c(void); +void func0f0f139c(s32 arg0, f32 arg1); void func0f0f13ec(s32 arg0); void func0f0f1418(void); void func0f0f1494(void);