From 79372eba74afaafbe4451b58b5d2688c13622675 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Tue, 8 Sep 2020 17:33:15 +1000 Subject: [PATCH] Decompile func0f00cc44 --- src/game/game_00c490.c | 14 +++++--------- src/game/propobj.c | 2 +- src/include/game/data/data_00e460.h | 2 +- src/include/game/game_00c490.h | 2 +- src/include/types.h | 8 ++++++++ 5 files changed, 16 insertions(+), 12 deletions(-) diff --git a/src/game/game_00c490.c b/src/game/game_00c490.c index 3e69ed0d7..cd7875bc2 100644 --- a/src/game/game_00c490.c +++ b/src/game/game_00c490.c @@ -581,15 +581,11 @@ void func0f00cc2c(struct padlockeddoor *door) g_PadlockedDoors = door; } -GLOBAL_ASM( -glabel func0f00cc44 -/* f00cc44: 3c028007 */ lui $v0,%hi(var80069924) -/* f00cc48: 24429924 */ addiu $v0,$v0,%lo(var80069924) -/* f00cc4c: 8c4e0000 */ lw $t6,0x0($v0) -/* f00cc50: ac8e0010 */ sw $t6,0x10($a0) -/* f00cc54: 03e00008 */ jr $ra -/* f00cc58: ac440000 */ sw $a0,0x0($v0) -); +void func0f00cc44(struct var80069924 *thing) +{ + thing->next = var80069924; + var80069924 = thing; +} GLOBAL_ASM( glabel func0f00cc5c diff --git a/src/game/propobj.c b/src/game/propobj.c index bda57c907..c381f9c1a 100644 --- a/src/game/propobj.c +++ b/src/game/propobj.c @@ -119,7 +119,7 @@ u32 var80069914 = 0x00000000; u32 var80069918 = 0x00000000; struct var8006991c *var8006991c = NULL; struct padlockeddoor *g_PadlockedDoors = NULL; -u32 var80069924 = 0x00000000; +struct var80069924 *var80069924 = NULL; u32 var80069928 = 0x00000000; u32 var8006992c = 0x00000000; u32 var80069930 = 0x00000000; diff --git a/src/include/game/data/data_00e460.h b/src/include/game/data/data_00e460.h index 0217426b7..d43867589 100644 --- a/src/include/game/data/data_00e460.h +++ b/src/include/game/data/data_00e460.h @@ -39,7 +39,7 @@ extern u32 var80069910; extern u32 var80069918; extern struct var8006991c *var8006991c; extern struct padlockeddoor *g_PadlockedDoors; -extern u32 var80069924; +extern struct var80069924 *var80069924; extern u32 var80069928; extern u32 var8006992c; extern u32 var8006993c; diff --git a/src/include/game/game_00c490.h b/src/include/game/game_00c490.h index 632a04e32..a37adaa7b 100644 --- a/src/include/game/game_00c490.h +++ b/src/include/game/game_00c490.h @@ -6,7 +6,7 @@ void func0f00c490(void); void func0f00cc14(struct var8006991c *thing); void func0f00cc2c(struct padlockeddoor *door); -u32 func0f00cc44(void); +void func0f00cc44(struct var80069924 *thing); u32 func0f00cc5c(void); u32 func0f00cc74(void); u32 func0f00cc8c(void); diff --git a/src/include/types.h b/src/include/types.h index 6342bc3dd..4752a6f61 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -6200,6 +6200,14 @@ struct padlockeddoor { struct padlockeddoor *next; }; +struct var80069924 { + u32 unk00; + u32 unk04; + u32 unk08; + u32 unk0c; + struct var80069924 *next; +}; + struct model08thing { u32 unk00; f32 unk04[4];