diff --git a/src/include/types.h b/src/include/types.h index 31b8647d2..40b7e5e40 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -82,8 +82,8 @@ struct pad { }; struct anim { - /*0x00*/ u16 animnum; - /*0x02*/ u16 animnum2; + /*0x00*/ s16 animnum; + /*0x02*/ s16 animnum2; /*0x04*/ u32 unk04; /*0x08*/ s8 flip; /*0x09*/ u8 flip2; diff --git a/src/library/library_1a500.c b/src/library/library_1a500.c index 63c8af42d..e5de1fac4 100644 --- a/src/library/library_1a500.c +++ b/src/library/library_1a500.c @@ -3549,18 +3549,14 @@ glabel func0001cebc /* 1d138: 00000000 */ sll $zero,$zero,0x0 ); -GLOBAL_ASM( -glabel animGetId -/* 1d13c: 8c830020 */ lw $v1,0x20($a0) -/* 1d140: 00001025 */ or $v0,$zero,$zero -/* 1d144: 10600003 */ beqz $v1,.L0001d154 -/* 1d148: 00000000 */ sll $zero,$zero,0x0 -/* 1d14c: 03e00008 */ jr $ra -/* 1d150: 84620000 */ lh $v0,0x0($v1) -.L0001d154: -/* 1d154: 03e00008 */ jr $ra -/* 1d158: 00000000 */ sll $zero,$zero,0x0 -); +u32 animGetId(struct animdata *animdata) +{ + if (animdata->anim) { + return animdata->anim->animnum; + } + + return 0; +} GLOBAL_ASM( glabel func0001d15c @@ -10466,4 +10462,4 @@ glabel func00023314 /* 233b4: 00000000 */ sll $zero,$zero,0x0 /* 233b8: 00000000 */ sll $zero,$zero,0x0 /* 233bc: 00000000 */ sll $zero,$zero,0x0 -); \ No newline at end of file +);