diff --git a/src/include/lib/model.h b/src/include/lib/model.h index cd44629a4..780033cdc 100644 --- a/src/include/lib/model.h +++ b/src/include/lib/model.h @@ -94,8 +94,8 @@ u32 func000220fc(void); s32 func000225d4(struct model *model, struct coord *arg1, struct coord *arg2, u32 *arg3); u32 func000227a4(void); void func00022a24(void *arg0, u32 arg1, void *arg2); -u32 func00022b68(void); -void func00022d24(void *data); +s32 func00022b68(struct modelnode *node); +void func00022d24(struct modelfiledata *filedata); u32 func00022d50(void); void func00022fa4(struct model *model, u32 *arg1, u32 *arg2, u32 arg3); void animInitialise(struct anim *anim); diff --git a/src/include/types.h b/src/include/types.h index 356ce0510..93f385dbd 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -651,6 +651,7 @@ struct modelfiledata { s16 numparts; s16 nummatrices; f32 unk10; + u16 unk14; }; struct model { diff --git a/src/lib/model.c b/src/lib/model.c index 946aa21fd..a95961933 100644 --- a/src/lib/model.c +++ b/src/lib/model.c @@ -10525,20 +10525,10 @@ glabel var700545d4 /* 22d20: 27bd0028 */ addiu $sp,$sp,0x28 ); -GLOBAL_ASM( -glabel func00022d24 -/* 22d24: 27bdffe8 */ addiu $sp,$sp,-24 -/* 22d28: afbf0014 */ sw $ra,0x14($sp) -/* 22d2c: afa40018 */ sw $a0,0x18($sp) -/* 22d30: 0c008ada */ jal func00022b68 -/* 22d34: 8c840000 */ lw $a0,0x0($a0) -/* 22d38: 8faf0018 */ lw $t7,0x18($sp) -/* 22d3c: a5e20014 */ sh $v0,0x14($t7) -/* 22d40: 8fbf0014 */ lw $ra,0x14($sp) -/* 22d44: 27bd0018 */ addiu $sp,$sp,0x18 -/* 22d48: 03e00008 */ jr $ra -/* 22d4c: 00000000 */ nop -); +void func00022d24(struct modelfiledata *filedata) +{ + filedata->unk14 = func00022b68(filedata->rootnode); +} GLOBAL_ASM( glabel func00022d50