From a50cb6b61880a31d3e5c83ff6f7cbd7708cd8852 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Thu, 4 Mar 2021 08:29:17 +1000 Subject: [PATCH] Decompile func0f09ddec --- src/game/endscreen.c | 8 ++++---- src/game/game_097ba0.c | 11 ++++------- src/include/game/game_097ba0.h | 2 +- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/src/game/endscreen.c b/src/game/endscreen.c index 924b2390c..8f35f9c4d 100644 --- a/src/game/endscreen.c +++ b/src/game/endscreen.c @@ -356,16 +356,16 @@ struct menudialog *func0f10d730(void) void func0f10d770(void) { func0f0f8bb4(&g_Menus[0].unk840, func0f09ddfc() - func0f0e4fe0(), 0); - g_Menus[0].unk844 = func0f09ddec() + func0f0e4fe0(); + g_Menus[0].mpconfigbuffer = func0f09ddec() + func0f0e4fe0(); func0f0f8bb4(&g_Menus[1].unk840, func0f09ddfc() - func0f0e4fe0(), 0); - g_Menus[1].unk844 = func0f09ddec() + func0f0e4fe0(); + g_Menus[1].mpconfigbuffer = func0f09ddec() + func0f0e4fe0(); func0f0f8bb4(&g_Menus[2].unk840, func0f09ddfc() - func0f0e4fe0(), 0); - g_Menus[2].unk844 = func0f09ddec() + func0f0e4fe0(); + g_Menus[2].mpconfigbuffer = func0f09ddec() + func0f0e4fe0(); func0f0f8bb4(&g_Menus[3].unk840, func0f09ddfc() - func0f0e4fe0(), 0); - g_Menus[3].unk844 = func0f09ddec() + func0f0e4fe0(); + g_Menus[3].mpconfigbuffer = func0f09ddec() + func0f0e4fe0(); } s32 menuhandlerReplayLastLevel(s32 operation, struct menuitem *item, union handlerdata *data) diff --git a/src/game/game_097ba0.c b/src/game/game_097ba0.c index a57b4134d..684036e06 100644 --- a/src/game/game_097ba0.c +++ b/src/game/game_097ba0.c @@ -7707,13 +7707,10 @@ glabel func0f09ddcc /* f09dde8: 8dc21590 */ lw $v0,0x1590($t6) ); -GLOBAL_ASM( -glabel func0f09ddec -/* f09ddec: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) -/* f09ddf0: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) -/* f09ddf4: 03e00008 */ jr $ra -/* f09ddf8: 8dc2158c */ lw $v0,0x158c($t6) -); +u8 *func0f09ddec(void) +{ + return g_Vars.currentplayer->gunctrl.unk158c; +} GLOBAL_ASM( glabel func0f09ddfc diff --git a/src/include/game/game_097ba0.h b/src/include/game/game_097ba0.h index 433c26166..236d5f249 100644 --- a/src/include/game/game_097ba0.h +++ b/src/include/game/game_097ba0.h @@ -58,7 +58,7 @@ u32 func0f09d550(void); void func0f09d8dc(f32 breathing, f32 arg1, f32 arg2, f32 arg3, f32 arg4); bool func0f09dd7c(void); u32 func0f09ddcc(void); -u32 func0f09ddec(void); +u8 *func0f09ddec(void); u32 func0f09ddfc(void); void func0f09df50(void); void func0f09df64(s32 weaponnum);