diff --git a/src/game/game_00c490.c b/src/game/game_00c490.c index cd7875bc2..77c7c5133 100644 --- a/src/game/game_00c490.c +++ b/src/game/game_00c490.c @@ -587,15 +587,11 @@ void func0f00cc44(struct var80069924 *thing) var80069924 = thing; } -GLOBAL_ASM( -glabel func0f00cc5c -/* f00cc5c: 3c028007 */ lui $v0,%hi(var80069928) -/* f00cc60: 24429928 */ addiu $v0,$v0,%lo(var80069928) -/* f00cc64: 8c4e0000 */ lw $t6,0x0($v0) -/* f00cc68: ac8e0010 */ sw $t6,0x10($a0) -/* f00cc6c: 03e00008 */ jr $ra -/* f00cc70: ac440000 */ sw $a0,0x0($v0) -); +void func0f00cc5c(struct var80069928 *thing) +{ + thing->next = var80069928; + var80069928 = thing; +} GLOBAL_ASM( glabel func0f00cc74 diff --git a/src/game/propobj.c b/src/game/propobj.c index c381f9c1a..ae8bce60e 100644 --- a/src/game/propobj.c +++ b/src/game/propobj.c @@ -120,7 +120,7 @@ u32 var80069918 = 0x00000000; struct var8006991c *var8006991c = NULL; struct padlockeddoor *g_PadlockedDoors = NULL; struct var80069924 *var80069924 = NULL; -u32 var80069928 = 0x00000000; +struct var80069928 *var80069928 = NULL; u32 var8006992c = 0x00000000; u32 var80069930 = 0x00000000; u32 var80069934 = 0x00000000; diff --git a/src/include/game/data/data_00e460.h b/src/include/game/data/data_00e460.h index d43867589..8287c93cc 100644 --- a/src/include/game/data/data_00e460.h +++ b/src/include/game/data/data_00e460.h @@ -40,7 +40,7 @@ extern u32 var80069918; extern struct var8006991c *var8006991c; extern struct padlockeddoor *g_PadlockedDoors; extern struct var80069924 *var80069924; -extern u32 var80069928; +extern struct var80069928 *var80069928; extern u32 var8006992c; extern u32 var8006993c; extern f32 g_AmmoMultiplier; diff --git a/src/include/game/game_00c490.h b/src/include/game/game_00c490.h index a37adaa7b..5529f6f36 100644 --- a/src/include/game/game_00c490.h +++ b/src/include/game/game_00c490.h @@ -7,7 +7,7 @@ void func0f00c490(void); void func0f00cc14(struct var8006991c *thing); void func0f00cc2c(struct padlockeddoor *door); void func0f00cc44(struct var80069924 *thing); -u32 func0f00cc5c(void); +void func0f00cc5c(struct var80069928 *thing); u32 func0f00cc74(void); u32 func0f00cc8c(void); u32 func0f00ce3c(void); diff --git a/src/include/types.h b/src/include/types.h index 4752a6f61..9d2bb6eda 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -6208,6 +6208,14 @@ struct var80069924 { struct var80069924 *next; }; +struct var80069928 { + u32 unk00; + u32 unk04; + u32 unk08; + u32 unk0c; + struct var80069928 *next; +}; + struct model08thing { u32 unk00; f32 unk04[4];