Decompile animTurnOff

This commit is contained in:
Ryan Dwyer
2020-07-27 22:34:48 +10:00
parent 2299b6c66f
commit 05ab8b14c3
3 changed files with 8 additions and 13 deletions
+5 -10
View File
@@ -728,7 +728,7 @@ glabel modelFree
.L0f0b3254:
/* f0b3254: 50800006 */ beqzl $a0,.L0f0b3270
/* f0b3258: acc00008 */ sw $zero,0x8($a2)
/* f0b325c: 0fc2ccce */ jal func0f0b3338
/* f0b325c: 0fc2ccce */ jal animTurnOff
/* f0b3260: afa60018 */ sw $a2,0x18($sp)
/* f0b3264: 8fa60018 */ lw $a2,0x18($sp)
/* f0b3268: acc00020 */ sw $zero,0x20($a2)
@@ -801,12 +801,7 @@ glabel func0f0b32e4
/* f0b3334: 00601025 */ or $v0,$v1,$zero
);
GLOBAL_ASM(
glabel func0f0b3338
/* f0b3338: 240effff */ addiu $t6,$zero,-1
/* f0b333c: 03e00008 */ jr $ra
/* f0b3340: a48e0000 */ sh $t6,0x0($a0)
/* f0b3344: 00000000 */ nop
/* f0b3348: 00000000 */ nop
/* f0b334c: 00000000 */ nop
);
void animTurnOff(struct anim *anim)
{
anim->animnum = -1;
}
+2 -2
View File
@@ -28002,7 +28002,7 @@ s32 objTick(struct prop *prop)
if (g_Anims[model->anim->animnum].flags & 0x02) {
if (g_Vars.tickmode != TICKMODE_6
&& modelGetCurAnimFrame(model) >= modelGetNumAnimFrames(model) - 1) {
func0f0b3338(model->anim);
animTurnOff(model->anim);
model->anim = NULL;
} else {
// In cutscene
@@ -28147,7 +28147,7 @@ s32 objTick(struct prop *prop)
}
if (modelGetCurAnimFrame(model) >= modelGetNumAnimFrames(model) - 1) {
func0f0b3338(model->anim);
animTurnOff(model->anim);
model->anim = NULL;
func00015be4(currentPlayerGetUnk174c(), model->unk0c, sp248);
func00015da0(sp248, obj->realrot);
+1 -1
View File
@@ -11,6 +11,6 @@ void modelFree(struct model *model);
struct model *func0f0b3280(void *modelfiledata);
u32 func0f0b32a0(void);
struct anim *func0f0b32e4(void);
void func0f0b3338(struct anim *anim);
void animTurnOff(struct anim *anim);
#endif