From f2172788aa2a1c4c1f8b808af4fb8acbdc286d47 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sun, 5 Apr 2020 16:35:07 +1000 Subject: [PATCH] Decompile func0f00b420 --- src/game/game_00b320.c | 34 +++++++--------------------------- src/gvars/gvars.c | 6 +++--- src/include/game/game_00b320.h | 2 +- src/include/gvars/gvars.h | 3 +++ 4 files changed, 14 insertions(+), 31 deletions(-) diff --git a/src/game/game_00b320.c b/src/game/game_00b320.c index 83c4d46eb..c3bd69264 100644 --- a/src/game/game_00b320.c +++ b/src/game/game_00b320.c @@ -33,30 +33,10 @@ void stageLoadCommonLang(s32 stagenum) } } -GLOBAL_ASM( -glabel func0f00b420 -/* f00b420: 27bdffe8 */ addiu $sp,$sp,-24 -/* f00b424: afbf0014 */ sw $ra,0x14($sp) -/* f00b428: 3c018006 */ lui $at,%hi(var80062410) -/* f00b42c: ac202410 */ sw $zero,%lo(var80062410)($at) -/* f00b430: 24040080 */ addiu $a0,$zero,0x80 -/* f00b434: 0c0048f2 */ jal malloc -/* f00b438: 24050004 */ addiu $a1,$zero,0x4 -/* f00b43c: 3c01800a */ lui $at,%hi(var8009cc80) -/* f00b440: ac22cc80 */ sw $v0,%lo(var8009cc80)($at) -/* f00b444: 24040080 */ addiu $a0,$zero,0x80 -/* f00b448: 0c0048f2 */ jal malloc -/* f00b44c: 24050004 */ addiu $a1,$zero,0x4 -/* f00b450: 3c01800a */ lui $at,%hi(var8009cc84) -/* f00b454: ac22cc84 */ sw $v0,%lo(var8009cc84)($at) -/* f00b458: 24040080 */ addiu $a0,$zero,0x80 -/* f00b45c: 0c0048f2 */ jal malloc -/* f00b460: 24050004 */ addiu $a1,$zero,0x4 -/* f00b464: 8fbf0014 */ lw $ra,0x14($sp) -/* f00b468: 3c01800a */ lui $at,%hi(var8009cc88) -/* f00b46c: ac22cc88 */ sw $v0,%lo(var8009cc88)($at) -/* f00b470: 03e00008 */ jr $ra -/* f00b474: 27bd0018 */ addiu $sp,$sp,0x18 -/* f00b478: 00000000 */ sll $zero,$zero,0x0 -/* f00b47c: 00000000 */ sll $zero,$zero,0x0 -); +void func0f00b420(void) +{ + var80062410 = 0; + var8009cc80 = malloc(0x80, 4); + var8009cc84 = malloc(0x80, 4); + var8009cc88 = malloc(0x80, 4); +} diff --git a/src/gvars/gvars.c b/src/gvars/gvars.c index ddeb63419..24863f7f3 100644 --- a/src/gvars/gvars.c +++ b/src/gvars/gvars.c @@ -15223,9 +15223,9 @@ u32 var8009cc70 = 0; u32 var8009cc74 = 0; u32 var8009cc78 = 0; u32 var8009cc7c = 0; -u32 var8009cc80 = 0; -u32 var8009cc84 = 0; -u32 var8009cc88 = 0; +void *var8009cc80 = NULL; +void *var8009cc84 = NULL; +void *var8009cc88 = NULL; u32 var8009cc8c = 0; u32 var8009cc90 = 0; u32 var8009cc94 = 0; diff --git a/src/include/game/game_00b320.h b/src/include/game/game_00b320.h index 82ad05854..05945eced 100644 --- a/src/include/game/game_00b320.h +++ b/src/include/game/game_00b320.h @@ -4,6 +4,6 @@ #include "types.h" void stageLoadCommonLang(s32 stagenum); -u32 func0f00b420(void); +void func0f00b420(void); #endif diff --git a/src/include/gvars/gvars.h b/src/include/gvars/gvars.h index 41c8ab526..ec739d1ef 100644 --- a/src/include/gvars/gvars.h +++ b/src/include/gvars/gvars.h @@ -531,6 +531,9 @@ extern u32 var8009cc4c; extern u32 var8009cc50; extern u32 var8009cc54; extern u32 var8009cc58; +extern void *var8009cc80; +extern void *var8009cc84; +extern void *var8009cc88; extern u32 var8009cc90; extern u32 var8009cca8; extern u32 var8009ccb0;