diff --git a/src/game/propobj.c b/src/game/propobj.c index 208df9332..8cff4dfe9 100644 --- a/src/game/propobj.c +++ b/src/game/propobj.c @@ -3306,17 +3306,10 @@ glabel func0f068ad4 /* f068af0: 00000000 */ nop ); -GLOBAL_ASM( -glabel func0f068af4 -/* f068af4: 27bdffe8 */ addiu $sp,$sp,-24 -/* f068af8: afbf0014 */ sw $ra,0x14($sp) -/* f068afc: 0fc1a2aa */ jal func0f068aa8 -/* f068b00: 8c840018 */ lw $a0,0x18($a0) -/* f068b04: 8fbf0014 */ lw $ra,0x14($sp) -/* f068b08: 27bd0018 */ addiu $sp,$sp,0x18 -/* f068b0c: 03e00008 */ jr $ra -/* f068b10: 00000000 */ nop -); +struct model08thing *func0f068af4(struct defaultobj *obj) +{ + return func0f068aa8(obj->model); +} GLOBAL_ASM( glabel func0f068b14 diff --git a/src/include/game/propobj.h b/src/include/game/propobj.h index af794ddac..0cb3fed04 100644 --- a/src/include/game/propobj.h +++ b/src/include/game/propobj.h @@ -73,7 +73,7 @@ u32 func0f0687e4(void); u32 func0f0688f4(void); f32 *func0f06896c(void *modelfiledata); u32 func0f068998(void); -u32 func0f068aa8(struct model *model); +struct model08thing *func0f068aa8(struct model *model); u32 func0f068ad4(void); struct model08thing *func0f068af4(struct defaultobj *obj); u32 func0f068b14(void);