diff --git a/src/game/game_00c490.c b/src/game/game_00c490.c index 77c7c5133..3f5ddda92 100644 --- a/src/game/game_00c490.c +++ b/src/game/game_00c490.c @@ -593,15 +593,11 @@ void func0f00cc5c(struct var80069928 *thing) var80069928 = thing; } -GLOBAL_ASM( -glabel func0f00cc74 -/* f00cc74: 3c028007 */ lui $v0,%hi(var8006992c) -/* f00cc78: 2442992c */ addiu $v0,$v0,%lo(var8006992c) -/* f00cc7c: 8c4e0000 */ lw $t6,0x0($v0) -/* f00cc80: ac8e000c */ sw $t6,0xc($a0) -/* f00cc84: 03e00008 */ jr $ra -/* f00cc88: ac440000 */ sw $a0,0x0($v0) -); +void func0f00cc74(struct var8006992c *thing) +{ + thing->next = var8006992c; + var8006992c = thing; +} GLOBAL_ASM( glabel func0f00cc8c diff --git a/src/game/propobj.c b/src/game/propobj.c index ae8bce60e..b1781c9f3 100644 --- a/src/game/propobj.c +++ b/src/game/propobj.c @@ -121,7 +121,7 @@ struct var8006991c *var8006991c = NULL; struct padlockeddoor *g_PadlockedDoors = NULL; struct var80069924 *var80069924 = NULL; struct var80069928 *var80069928 = NULL; -u32 var8006992c = 0x00000000; +struct var8006992c *var8006992c = NULL; u32 var80069930 = 0x00000000; u32 var80069934 = 0x00000000; u32 var80069938 = 0x00000000; diff --git a/src/include/game/data/data_00e460.h b/src/include/game/data/data_00e460.h index 8287c93cc..46b417c94 100644 --- a/src/include/game/data/data_00e460.h +++ b/src/include/game/data/data_00e460.h @@ -41,7 +41,7 @@ extern struct var8006991c *var8006991c; extern struct padlockeddoor *g_PadlockedDoors; extern struct var80069924 *var80069924; extern struct var80069928 *var80069928; -extern u32 var8006992c; +extern struct var8006992c *var8006992c; extern u32 var8006993c; extern f32 g_AmmoMultiplier; extern u32 var80069964; diff --git a/src/include/game/game_00c490.h b/src/include/game/game_00c490.h index 5529f6f36..7af71b419 100644 --- a/src/include/game/game_00c490.h +++ b/src/include/game/game_00c490.h @@ -8,7 +8,7 @@ void func0f00cc14(struct var8006991c *thing); void func0f00cc2c(struct padlockeddoor *door); void func0f00cc44(struct var80069924 *thing); void func0f00cc5c(struct var80069928 *thing); -u32 func0f00cc74(void); +void func0f00cc74(struct var8006992c *thing); u32 func0f00cc8c(void); u32 func0f00ce3c(void); u32 setupCountCommandType(u8 type); diff --git a/src/include/types.h b/src/include/types.h index 9d2bb6eda..a214e1e7a 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -6216,6 +6216,13 @@ struct var80069928 { struct var80069928 *next; }; +struct var8006992c { + u32 unk00; + u32 unk04; + u32 unk08; + struct var8006992c *next; +}; + struct model08thing { u32 unk00; f32 unk04[4];