diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c index f73793ec1..721b52a38 100644 --- a/src/game/chr/chraicommands.c +++ b/src/game/chr/chraicommands.c @@ -5360,7 +5360,7 @@ bool aiObjectDoAnimation(void) func000230a0(obj->model->anim); modelSetAnimation(obj->model, anim_id, 0, fstartframe, thing, 0); - func0001af64(obj->model, func0f15c888() * obj->model->unk14 * 100.0f); + modelSetAnimScale(obj->model, func0f15c888() * obj->model->unk14 * 100.0f); } } diff --git a/src/game/game_02cde0.c b/src/game/game_02cde0.c index 4c0bd44fa..30b421f76 100644 --- a/src/game/game_02cde0.c +++ b/src/game/game_02cde0.c @@ -341,7 +341,7 @@ glabel var7f1a8a84 /* f02d274: 0c006bd6 */ jal modelSetUnk14 /* f02d278: 8fa50044 */ lw $a1,0x44($sp) /* f02d27c: 8fa4005c */ lw $a0,0x5c($sp) -/* f02d280: 0c006bd9 */ jal func0001af64 +/* f02d280: 0c006bd9 */ jal modelSetAnimScale /* f02d284: 8fa50040 */ lw $a1,0x40($sp) /* f02d288: 8fa60054 */ lw $a2,0x54($sp) /* f02d28c: 8fad001c */ lw $t5,0x1c($sp) diff --git a/src/include/lib/lib_1a500.h b/src/include/lib/lib_1a500.h index 66dc1ec1f..b954896a8 100644 --- a/src/include/lib/lib_1a500.h +++ b/src/include/lib/lib_1a500.h @@ -26,7 +26,7 @@ u32 func0001ad5c(void); f32 func0001ae44(struct model *model); void func0001ae90(struct model *model, f32 arg1); void modelSetUnk14(struct model *model, f32 arg1); -void func0001af64(struct model *model, f32 arg1); +void modelSetAnimScale(struct model *model, f32 scale); f32 func0001af80(struct model *model); u32 func0001af98(void); f32 func0001afe8(f32 arg0, f32 distance, f32 arg2); diff --git a/src/include/types.h b/src/include/types.h index b15b16d4c..4d71d48da 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -146,7 +146,7 @@ struct anim { /*0x7c*/ u32 oldplay; /*0x80*/ u32 timeplay; /*0x84*/ u32 elapseplay; - /*0x88*/ u32 animscale; + /*0x88*/ f32 animscale; }; struct stagethinglist { diff --git a/src/lib/lib_1a500.c b/src/lib/lib_1a500.c index d16f44535..75a3d624e 100644 --- a/src/lib/lib_1a500.c +++ b/src/lib/lib_1a500.c @@ -821,17 +821,12 @@ void modelSetUnk14(struct model *model, f32 arg1) model->unk14 = arg1; } -GLOBAL_ASM( -glabel func0001af64 -/* 1af64: 8c820020 */ lw $v0,0x20($a0) -/* 1af68: 44856000 */ mtc1 $a1,$f12 -/* 1af6c: 10400002 */ beqz $v0,.L0001af78 -/* 1af70: 00000000 */ nop -/* 1af74: e44c0088 */ swc1 $f12,0x88($v0) -.L0001af78: -/* 1af78: 03e00008 */ jr $ra -/* 1af7c: 00000000 */ nop -); +void modelSetAnimScale(struct model *model, f32 scale) +{ + if (model->anim) { + model->anim->animscale = scale; + } +} f32 func0001af80(struct model *model) {