From 5bbec9a0932bdba1c5dd2c41aa4b2df737437529 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Wed, 1 Apr 2020 20:16:59 +1000 Subject: [PATCH] Decompile func0f0147a0 --- src/game/game_0147a0.c | 21 ++++++--------------- src/include/game/game_0147a0.h | 2 +- src/include/gvars/gvars.h | 1 + 3 files changed, 8 insertions(+), 16 deletions(-) diff --git a/src/game/game_0147a0.c b/src/game/game_0147a0.c index 32e74f9b7..daf6e4f8b 100644 --- a/src/game/game_0147a0.c +++ b/src/game/game_0147a0.c @@ -10,18 +10,9 @@ #include "gvars/gvars.h" #include "types.h" -GLOBAL_ASM( -glabel func0f0147a0 -/* f0147a0: 3c01800a */ lui $at,%hi(var800a33a0) -/* f0147a4: ac2433a0 */ sw $a0,%lo(var800a33a0)($at) -/* f0147a8: 3c01800a */ lui $at,%hi(var800a33a4) -/* f0147ac: ac2033a4 */ sw $zero,%lo(var800a33a4)($at) -/* f0147b0: 3c013f80 */ lui $at,0x3f80 -/* f0147b4: 44812000 */ mtc1 $at,$f4 -/* f0147b8: 3c018008 */ lui $at,0x8008 -/* f0147bc: 03e00008 */ jr $ra -/* f0147c0: e424db84 */ swc1 $f4,-0x247c($at) -/* f0147c4: 00000000 */ sll $zero,$zero,0x0 -/* f0147c8: 00000000 */ sll $zero,$zero,0x0 -/* f0147cc: 00000000 */ sll $zero,$zero,0x0 -); +void func0f0147a0(u32 stagenum) +{ + var800a33a0 = stagenum; + var800a33a4 = 0; + var8007db84 = 1; +} diff --git a/src/include/game/game_0147a0.h b/src/include/game/game_0147a0.h index c0c22ed3d..bf5a48a31 100644 --- a/src/include/game/game_0147a0.h +++ b/src/include/game/game_0147a0.h @@ -3,6 +3,6 @@ #include #include "types.h" -void func0f0147a0(s32 stagenum); +void func0f0147a0(u32 stagenum); #endif diff --git a/src/include/gvars/gvars.h b/src/include/gvars/gvars.h index 654b96bde..18384cf4c 100644 --- a/src/include/gvars/gvars.h +++ b/src/include/gvars/gvars.h @@ -673,6 +673,7 @@ extern struct var800a2380 var800a2380[4]; extern u32 var800a2eb0; extern u8 var800a316c[4]; extern u32 var800a3180; +extern u32 var800a33a0; extern u32 var800a33a4; extern u32 var800a33a8; extern u32 var800a33e8;