falso
/
perfect_dark
mirror of https://github.com/n64decomp/perfect_dark.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename modelGetNumAnimFrames to animGetNumFrames and decompile new modelGetNumAnimFrames

This commit is contained in:
Ryan Dwyer 2020-06-30 08:08:01 +10:00
parent d30264f1f3
commit e64b5f06e5
12 changed files with 56 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/game/chr/chraction.c
View File

@ -3404,7 +3404,7 @@ glabel var7f1a8d44
/* f03239c: 1000000f */ b .L0f0323dc
/* f0323a0: 8e180018 */ lw $t8,0x18($s0)
.L0f0323a4:
/* f0323a4: 0c008dda */ jal modelGetNumAnimFrames
/* f0323a4: 0c008dda */ jal animGetNumFrames
/* f0323a8: 84640000 */ lh $a0,0x0($v1)
/* f0323ac: 2459ffff */ addiu $t9,$v0,-1
/* f0323b0: 44994000 */ mtc1 $t9,$f8
@ -4112,7 +4112,7 @@ glabel var7f1a8d4c
/* f032dc8: 1000000f */ b .L0f032e08
/* f032dcc: 24080001 */ addiu $t0,$zero,0x1
.L0f032dd0:
/* f032dd0: 0c008dda */ jal modelGetNumAnimFrames
/* f032dd0: 0c008dda */ jal animGetNumFrames
/* f032dd4: 85040000 */ lh $a0,0x0($t0)
/* f032dd8: 2449ffff */ addiu $t1,$v0,-1
/* f032ddc: 44893000 */ mtc1 $t1,$f6
@ -4232,7 +4232,7 @@ glabel var7f1a8d4c
/* f032f94: 1000000f */ b .L0f032fd4
/* f032f98: 8fbf002c */ lw $ra,0x2c($sp)
.L0f032f9c:
/* f032f9c: 0c008dda */ jal modelGetNumAnimFrames
/* f032f9c: 0c008dda */ jal animGetNumFrames
/* f032fa0: 85040000 */ lh $a0,0x0($t0)
/* f032fa4: 244dffff */ addiu $t5,$v0,-1
/* f032fa8: 448d9000 */ mtc1 $t5,$f18
@ -12424,7 +12424,7 @@ glabel var7f1a8f08
/* f03c274: 02002025 */ or $a0,$s0,$zero
/* f03c278: 51a0001c */ beqzl $t5,.L0f03c2ec
/* f03c27c: 8e060034 */ lw $a2,0x34($s0)
/* f03c280: 0c007486 */ jal func0001d218
/* f03c280: 0c007486 */ jal modelGetNumAnimFrames
/* f03c284: 8e040020 */ lw $a0,0x20($s0)
/* f03c288: 244effff */ addiu $t6,$v0,-1
/* f03c28c: 448e4000 */ mtc1 $t6,$f8
@ -12530,7 +12530,7 @@ glabel var7f1a8f08
/* f03c404: e7a80010 */ swc1 $f8,0x10($sp)
/* f03c408: 0c007733 */ jal modelSetAnimation
/* f03c40c: e7aa0014 */ swc1 $f10,0x14($sp)
/* f03c410: 0c008dda */ jal modelGetNumAnimFrames
/* f03c410: 0c008dda */ jal animGetNumFrames
/* f03c414: 2404006b */ addiu $a0,$zero,0x6b
/* f03c418: 244dffff */ addiu $t5,$v0,-1
/* f03c41c: 448d8000 */ mtc1 $t5,$f16
@ -12559,7 +12559,7 @@ glabel var7f1a8f08
/* f03c470: e7b20010 */ swc1 $f18,0x10($sp)
/* f03c474: 0c007733 */ jal modelSetAnimation
/* f03c478: e7a40014 */ swc1 $f4,0x14($sp)
/* f03c47c: 0c008dda */ jal modelGetNumAnimFrames
/* f03c47c: 0c008dda */ jal animGetNumFrames
/* f03c480: 24040028 */ addiu $a0,$zero,0x28
/* f03c484: 2459ffff */ addiu $t9,$v0,-1
/* f03c488: 44993000 */ mtc1 $t9,$f6
@ -12587,7 +12587,7 @@ glabel var7f1a8f08
/* f03c4dc: e7a80010 */ swc1 $f8,0x10($sp)
/* f03c4e0: 0c007733 */ jal modelSetAnimation
/* f03c4e4: e7aa0014 */ swc1 $f10,0x14($sp)
/* f03c4e8: 0c008dda */ jal modelGetNumAnimFrames
/* f03c4e8: 0c008dda */ jal animGetNumFrames
/* f03c4ec: 24040392 */ addiu $a0,$zero,0x392
/* f03c4f0: 244bffff */ addiu $t3,$v0,-1
/* f03c4f4: 448b8000 */ mtc1 $t3,$f16
@ -13191,8 +13191,8 @@ void chrTickDie(struct chrdata *chr)
// Check for end of death animation and switch to ACT_DEAD
if (modelGetCurAnimFrame(model) >= func0001d1a0(model)) {
if (CHRRACE(chr) == RACE_HUMAN && modelGetAnimNum(model) == ANIM_DEATH_STOMACH_LONG) {
modelSetAnimation(model, ANIM_003C, !modelIsFlipped(model), 50, 0.3, modelGetNumAnimFrames(ANIM_003C) - 51.0f);
func0001deb0(model, 0.5, modelGetNumAnimFrames(ANIM_003C) - 51.0f);
modelSetAnimation(model, ANIM_003C, !modelIsFlipped(model), 50, 0.3, animGetNumFrames(ANIM_003C) - 51.0f);
func0001deb0(model, 0.5, animGetNumFrames(ANIM_003C) - 51.0f);
return;
}
@ -20323,7 +20323,7 @@ glabel chrTickAttackWalk
/* f0442c8: 0c00745f */ jal modelGetCurAnimFrame
/* f0442cc: 02202025 */ or $a0,$s1,$zero
/* f0442d0: e7a00034 */ swc1 $f0,0x34($sp)
/* f0442d4: 0c007486 */ jal func0001d218
/* f0442d4: 0c007486 */ jal modelGetNumAnimFrames
/* f0442d8: 02202025 */ or $a0,$s1,$zero
/* f0442dc: 44822000 */ mtc1 $v0,$f4
/* f0442e0: 3c013f00 */ lui $at,0x3f00
@ -20342,7 +20342,7 @@ glabel chrTickAttackWalk
/* f044314: 1000000d */ b .L0f04434c
/* f044318: 00000000 */ nop
.L0f04431c:
/* f04431c: 0c007486 */ jal func0001d218
/* f04431c: 0c007486 */ jal modelGetNumAnimFrames
/* f044320: 02202025 */ or $a0,$s1,$zero
/* f044324: 44829000 */ mtc1 $v0,$f18
/* f044328: 3c013f00 */ lui $at,0x3f00
@ -20770,19 +20770,19 @@ void chrTickRunPos(struct chrdata *chr)
fVar6 = fVar7 - zero;
if (fVar7 < 0) {
fVar6 += func0001d218(model);
fVar6 += modelGetNumAnimFrames(model);
}
if (func0001d218(model) * 0.5f < fVar6) {
if (modelGetNumAnimFrames(model) * 0.5f < fVar6) {
zero = 0;
func0001df04(model, func0001d218(model) - zero, 16);
func0001df04(model, modelGetNumAnimFrames(model) - zero, 16);
} else {
zero = 0;
fVar7 = func0001d218(model) * 0.5f;
fVar7 = modelGetNumAnimFrames(model) * 0.5f;
fVar6 = fVar7 - zero;
if (fVar7 < 0) {
fVar6 += func0001d218(model);
fVar6 += modelGetNumAnimFrames(model);
}
func0001df04(model, fVar6, 16);

4
src/game/chr/chraicommands.c
View File

@ -414,7 +414,7 @@ bool aiChrDoAnimation(void)
if (startframe == 0xffff) {
fstartframe = 0;
} else if (startframe == 0xfffe) {
fstartframe = modelGetNumAnimFrames(anim_id) - 1;
fstartframe = animGetNumFrames(anim_id) - 1;
} else {
fstartframe = startframe;
}
@ -5327,7 +5327,7 @@ bool aiObjectDoAnimation(void)
if (startframe == 0xffff) {
fstartframe = 0;
} else if (startframe == 0xfffe) {
fstartframe = modelGetNumAnimFrames(anim_id) - 2;
fstartframe = animGetNumFrames(anim_id) - 2;
if (fstartframe < 0) {
fstartframe = 0;

4
src/game/game_000130.c
View File

@ -363,14 +363,14 @@ glabel func0f0005c0
/* f0005c0: 27bdffe0 */ addiu $sp,$sp,-32
/* f0005c4: afbf0014 */ sw $ra,0x14($sp)
/* f0005c8: afa40020 */ sw $a0,0x20($sp)
/* f0005cc: 0c008dda */ jal modelGetNumAnimFrames
/* f0005cc: 0c008dda */ jal animGetNumFrames
/* f0005d0: 87a40022 */ lh $a0,0x22($sp)
/* f0005d4: 87a40022 */ lh $a0,0x22($sp)
/* f0005d8: 00002825 */ or $a1,$zero,$zero
/* f0005dc: 0fc000d6 */ jal func0f000358
/* f0005e0: 2446ffff */ addiu $a2,$v0,-1
/* f0005e4: afa20018 */ sw $v0,0x18($sp)
/* f0005e8: 0c008dda */ jal modelGetNumAnimFrames
/* f0005e8: 0c008dda */ jal animGetNumFrames
/* f0005ec: 87a40022 */ lh $a0,0x22($sp)
/* f0005f0: 8fae0018 */ lw $t6,0x18($sp)
/* f0005f4: 44824000 */ mtc1 $v0,$f8

8
src/game/game_097ba0.c
View File

@ -748,7 +748,7 @@ glabel func0f09815c
/* f098188: 24840384 */ addiu $a0,$a0,0x384
/* f09818c: 05e1000c */ bgez $t7,.L0f0981c0
/* f098190: 00000000 */ nop
/* f098194: 0c007486 */ jal func0001d218
/* f098194: 0c007486 */ jal modelGetNumAnimFrames
/* f098198: afa40018 */ sw $a0,0x18($sp)
/* f09819c: 8fa40018 */ lw $a0,0x18($sp)
/* f0981a0: 0c00745f */ jal modelGetCurAnimFrame
@ -803,7 +803,7 @@ glabel var7f1ac1b0
/* f098224: 0fc26057 */ jal func0f09815c
/* f098228: 00000000 */ nop
/* f09822c: e7a00060 */ swc1 $f0,0x60($sp)
/* f098230: 0c007486 */ jal func0001d218
/* f098230: 0c007486 */ jal modelGetNumAnimFrames
/* f098234: 26640384 */ addiu $a0,$s3,0x384
/* f098238: 2459ffff */ addiu $t9,$v0,-1
/* f09823c: 44993000 */ mtc1 $t9,$f6
@ -896,7 +896,7 @@ glabel var7f1ac1b0
/* f098384: e7ac0014 */ swc1 $f12,0x14($sp)
/* f098388: 0c007733 */ jal modelSetAnimation
/* f09838c: e7a80010 */ swc1 $f8,0x10($sp)
/* f098390: 0c007486 */ jal func0001d218
/* f098390: 0c007486 */ jal modelGetNumAnimFrames
/* f098394: 8fa40058 */ lw $a0,0x58($sp)
/* f098398: 44828000 */ mtc1 $v0,$f16
/* f09839c: 8fa40058 */ lw $a0,0x58($sp)
@ -10796,7 +10796,7 @@ glabel var7f1ac764
/* f0a048c: 0fc26057 */ jal func0f09815c
/* f0a0490: 26a40638 */ addiu $a0,$s5,0x638
/* f0a0494: 46000506 */ mov.s $f20,$f0
/* f0a0498: 0c007486 */ jal func0001d218
/* f0a0498: 0c007486 */ jal modelGetNumAnimFrames
/* f0a049c: 26a409bc */ addiu $a0,$s5,0x9bc
/* f0a04a0: 4600a20d */ trunc.w.s $f8,$f20
/* f0a04a4: 00507823 */ subu $t7,$v0,$s0

6
src/game/game_0b63b0.c
View File

@ -4431,7 +4431,7 @@ void func0f0ba010(void)
var8009de2c = -1;
var80070764 = 1;
func0f11dcb0(1);
g_Vars.in_cutscene = g_Vars.tickmode == TICKMODE_6 && var8009de10 < modelGetNumAnimFrames(var8009de18) - 1;
g_Vars.in_cutscene = g_Vars.tickmode == TICKMODE_6 && var8009de10 < animGetNumFrames(var8009de18) - 1;
g_Vars.unk0004e2 = 0;
}
@ -4506,7 +4506,7 @@ glabel var7f1ad5d8
/* f0ba198: ac24de2c */ sw $a0,%lo(var8009de2c)($at)
/* f0ba19c: afbf0024 */ sw $ra,0x24($sp)
/* f0ba1a0: 3c04800a */ lui $a0,%hi(var8009de18)
/* f0ba1a4: 0c008dda */ jal modelGetNumAnimFrames
/* f0ba1a4: 0c008dda */ jal animGetNumFrames
/* f0ba1a8: 8484de18 */ lh $a0,%lo(var8009de18)($a0)
/* f0ba1ac: 244effff */ addiu $t6,$v0,-1
/* f0ba1b0: 3c04800a */ lui $a0,%hi(var8009de18)
@ -4605,7 +4605,7 @@ glabel var7f1ad5dc
/* f0ba2fc: 2652de18 */ addiu $s2,$s2,%lo(var8009de18)
/* f0ba300: 0c008f4e */ jal func00023d38
/* f0ba304: 86440000 */ lh $a0,0x0($s2)
/* f0ba308: 0c008dda */ jal modelGetNumAnimFrames
/* f0ba308: 0c008dda */ jal animGetNumFrames
/* f0ba30c: 86440000 */ lh $a0,0x0($s2)
/* f0ba310: 8e780290 */ lw $t8,0x290($s3)
/* f0ba314: 2444ffff */ addiu $a0,$v0,-1

6
src/game/game_0f09f0.c
View File

@ -4850,7 +4850,7 @@ glabel var7f1b2948
/* f0f49a8: e7a40010 */ swc1 $f4,0x10($sp)
/* f0f49ac: 0c007733 */ jal modelSetAnimation
/* f0f49b0: e7a60014 */ swc1 $f6,0x14($sp)
/* f0f49b4: 0c007486 */ jal func0001d218
/* f0f49b4: 0c007486 */ jal modelGetNumAnimFrames
/* f0f49b8: 8fa4003c */ lw $a0,0x3c($sp)
/* f0f49bc: 44825000 */ mtc1 $v0,$f10
/* f0f49c0: 8fa4003c */ lw $a0,0x3c($sp)
@ -4884,7 +4884,7 @@ glabel var7f1b2948
/* f0f4a20: 00195ac0 */ sll $t3,$t9,0xb
/* f0f4a24: 0561000c */ bgez $t3,.L0f0f4a58
/* f0f4a28: 00000000 */ nop
/* f0f4a2c: 0c007486 */ jal func0001d218
/* f0f4a2c: 0c007486 */ jal modelGetNumAnimFrames
/* f0f4a30: 8fa4003c */ lw $a0,0x3c($sp)
/* f0f4a34: afa2004c */ sw $v0,0x4c($sp)
/* f0f4a38: 0c00745f */ jal modelGetCurAnimFrame
@ -4901,7 +4901,7 @@ glabel var7f1b2948
/* f0f4a60: 46000086 */ mov.s $f2,$f0
.L0f0f4a64:
/* f0f4a64: 8fa4003c */ lw $a0,0x3c($sp)
/* f0f4a68: 0c007486 */ jal func0001d218
/* f0f4a68: 0c007486 */ jal modelGetNumAnimFrames
/* f0f4a6c: e7a20178 */ swc1 $f2,0x178($sp)
/* f0f4a70: 244dffff */ addiu $t5,$v0,-1
/* f0f4a74: 448d4000 */ mtc1 $t5,$f8

2
src/game/game_167ae0.c
View File

@ -2497,7 +2497,7 @@ glabel var7f1b7868
/* f16a378: 00008025 */ or $s0,$zero,$zero
/* f16a37c: 44800000 */ mtc1 $zero,$f0
/* f16a380: 8484de18 */ lh $a0,%lo(var8009de18)($a0)
/* f16a384: 0c008dda */ jal modelGetNumAnimFrames
/* f16a384: 0c008dda */ jal animGetNumFrames
/* f16a388: e7a000c4 */ swc1 $f0,0xc4($sp)
/* f16a38c: 3c03800a */ lui $v1,%hi(var8009de10)
/* f16a390: 8c63de10 */ lw $v1,%lo(var8009de10)($v1)

4
src/game/propobj.c
View File

@ -28001,7 +28001,7 @@ s32 objTick(struct prop *prop)
if (model->anim) {
if (g_Anims[model->anim->animnum].flags & 0x02) {
if (g_Vars.tickmode != TICKMODE_6
&& modelGetCurAnimFrame(model) >= func0001d218(model) - 1) {
&& modelGetCurAnimFrame(model) >= modelGetNumAnimFrames(model) - 1) {
func0f0b3338(model->anim);
model->anim = NULL;
} else {
@ -28146,7 +28146,7 @@ s32 objTick(struct prop *prop)
func0f065e74(&prop->pos, prop->rooms, &sp236, sp220);
}
if (modelGetCurAnimFrame(model) >= func0001d218(model) - 1) {
if (modelGetCurAnimFrame(model) >= modelGetNumAnimFrames(model) - 1) {
func0f0b3338(model->anim);
model->anim = NULL;
func00015be4(currentPlayerGetUnk174c(), model->unk0c, sp248);

2
src/include/lib/lib_1a500.h
View File

@ -54,7 +54,7 @@ u32 modelGetAnimNum(struct model *model);
bool modelIsFlipped(struct model *model);
f32 modelGetCurAnimFrame(struct model *model);
f32 func0001d1a0(struct model *model);
s32 func0001d218(struct model *model);
s32 modelGetNumAnimFrames(struct model *model);
f32 modelGetAnimSpeed(struct model *model);
f32 func0001d288(struct model *model);
u32 func0001d320(void);

2
src/include/lib/lib_233c0.h
View File

@ -6,7 +6,7 @@
u32 func000233c0(void);
u32 func00023640(void);
void func0002373c(void);
s32 modelGetNumAnimFrames(s16 anim_id);
s32 animGetNumFrames(s16 anim_id);
u32 func00023794(void);
u32 func000237dc(void);
u32 func000237e8(void);

55
src/lib/lib_1a500.c
View File

@ -3443,7 +3443,7 @@ glabel func0001d1a0
.L0001d1d8:
/* 1d1d8: 10800007 */ beqz $a0,.L0001d1f8
/* 1d1dc: 00000000 */ nop
/* 1d1e0: 0c008dda */ jal modelGetNumAnimFrames
/* 1d1e0: 0c008dda */ jal animGetNumFrames
/* 1d1e4: 00000000 */ nop
/* 1d1e8: 244effff */ addiu $t6,$v0,-1
/* 1d1ec: 448e2000 */ mtc1 $t6,$f4
@ -3462,29 +3462,14 @@ glabel func0001d1a0
/* 1d214: 00000000 */ nop
);
GLOBAL_ASM(
glabel func0001d218
/* 1d218: 27bdffe8 */ addiu $sp,$sp,-24
/* 1d21c: afbf0014 */ sw $ra,0x14($sp)
/* 1d220: 8c8e0020 */ lw $t6,0x20($a0)
/* 1d224: 00001025 */ or $v0,$zero,$zero
/* 1d228: 11c00009 */ beqz $t6,.L0001d250
/* 1d22c: 00000000 */ nop
/* 1d230: 0c00744f */ jal modelGetAnimNum
/* 1d234: 00000000 */ nop
/* 1d238: 00022400 */ sll $a0,$v0,0x10
/* 1d23c: 00047c03 */ sra $t7,$a0,0x10
/* 1d240: 0c008dda */ jal modelGetNumAnimFrames
/* 1d244: 01e02025 */ or $a0,$t7,$zero
/* 1d248: 10000002 */ b .L0001d254
/* 1d24c: 8fbf0014 */ lw $ra,0x14($sp)
.L0001d250:
/* 1d250: 8fbf0014 */ lw $ra,0x14($sp)
.L0001d254:
/* 1d254: 27bd0018 */ addiu $sp,$sp,0x18
/* 1d258: 03e00008 */ jr $ra
/* 1d25c: 00000000 */ nop
);
s32 modelGetNumAnimFrames(struct model *model)
{
if (model->anim) {
return animGetNumFrames(modelGetAnimNum(model));
}
return 0;
}
f32 modelGetAnimSpeed(struct model *model)
{
@ -3570,13 +3555,13 @@ glabel func0001d320
/* 1d37c: 00046403 */ sra $t4,$a0,0x10
/* 1d380: 01802025 */ or $a0,$t4,$zero
/* 1d384: a7a50026 */ sh $a1,0x26($sp)
/* 1d388: 0c008dda */ jal modelGetNumAnimFrames
/* 1d388: 0c008dda */ jal animGetNumFrames
/* 1d38c: afa60020 */ sw $a2,0x20($sp)
/* 1d390: 87a50026 */ lh $a1,0x26($sp)
/* 1d394: afa2001c */ sw $v0,0x1c($sp)
/* 1d398: 00052400 */ sll $a0,$a1,0x10
/* 1d39c: 00046c03 */ sra $t5,$a0,0x10
/* 1d3a0: 0c008dda */ jal modelGetNumAnimFrames
/* 1d3a0: 0c008dda */ jal animGetNumFrames
/* 1d3a4: 01a02025 */ or $a0,$t5,$zero
/* 1d3a8: 8fa60020 */ lw $a2,0x20($sp)
/* 1d3ac: 8fae001c */ lw $t6,0x1c($sp)
@ -3620,7 +3605,7 @@ glabel func0001d320
/* 1d434: 00403025 */ or $a2,$v0,$zero
/* 1d438: a7a50026 */ sh $a1,0x26($sp)
.L0001d43c:
/* 1d43c: 0c008dda */ jal modelGetNumAnimFrames
/* 1d43c: 0c008dda */ jal animGetNumFrames
/* 1d440: afa60020 */ sw $a2,0x20($sp)
/* 1d444: 8fa60020 */ lw $a2,0x20($sp)
/* 1d448: 87a50026 */ lh $a1,0x26($sp)
@ -3643,7 +3628,7 @@ glabel func0001d320
.L0001d48c:
/* 1d48c: 0004c403 */ sra $t8,$a0,0x10
/* 1d490: 03002025 */ or $a0,$t8,$zero
/* 1d494: 0c008dda */ jal modelGetNumAnimFrames
/* 1d494: 0c008dda */ jal animGetNumFrames
/* 1d498: afa60020 */ sw $a2,0x20($sp)
/* 1d49c: 8fa60020 */ lw $a2,0x20($sp)
/* 1d4a0: 00c2001a */ div $zero,$a2,$v0
@ -3664,7 +3649,7 @@ glabel func0001d320
.L0001d4d4:
/* 1d4d4: 00052400 */ sll $a0,$a1,0x10
/* 1d4d8: 0004cc03 */ sra $t9,$a0,0x10
/* 1d4dc: 0c008dda */ jal modelGetNumAnimFrames
/* 1d4dc: 0c008dda */ jal animGetNumFrames
/* 1d4e0: 03202025 */ or $a0,$t9,$zero
/* 1d4e4: 2446ffff */ addiu $a2,$v0,-1
.L0001d4e8:
@ -4324,7 +4309,7 @@ glabel func0001de1c
/* 1de38: 50800010 */ beqzl $a0,.L0001de7c
/* 1de3c: 3c01bf80 */ lui $at,0xbf80
/* 1de40: afa3001c */ sw $v1,0x1c($sp)
/* 1de44: 0c008dda */ jal modelGetNumAnimFrames
/* 1de44: 0c008dda */ jal animGetNumFrames
/* 1de48: e7ac0024 */ swc1 $f12,0x24($sp)
/* 1de4c: 244effff */ addiu $t6,$v0,-1
/* 1de50: 448e2000 */ mtc1 $t6,$f4
@ -4409,7 +4394,7 @@ glabel func0001df04
/* 1df40: e7ae0028 */ swc1 $f14,0x28($sp)
/* 1df44: e7ac0024 */ swc1 $f12,0x24($sp)
/* 1df48: afa70020 */ sw $a3,0x20($sp)
/* 1df4c: 0c008dda */ jal modelGetNumAnimFrames
/* 1df4c: 0c008dda */ jal animGetNumFrames
/* 1df50: afa3001c */ sw $v1,0x1c($sp)
/* 1df54: 44822000 */ mtc1 $v0,$f4
/* 1df58: 8fa3001c */ lw $v1,0x1c($sp)
@ -5638,7 +5623,7 @@ glabel func0001ee18
/* 1f0a0: c6140060 */ lwc1 $f20,0x60($s0)
/* 1f0a4: 86040000 */ lh $a0,0x0($s0)
/* 1f0a8: e7b20088 */ swc1 $f18,0x88($sp)
/* 1f0ac: 0c008dda */ jal modelGetNumAnimFrames
/* 1f0ac: 0c008dda */ jal animGetNumFrames
/* 1f0b0: e7b0008c */ swc1 $f16,0x8c($sp)
/* 1f0b4: 2458ffff */ addiu $t8,$v0,-1
/* 1f0b8: 44985000 */ mtc1 $t8,$f10
@ -5659,7 +5644,7 @@ glabel func0001ee18
.L0001f0f4:
/* 1f0f4: 86040000 */ lh $a0,0x0($s0)
/* 1f0f8: e7b20088 */ swc1 $f18,0x88($sp)
/* 1f0fc: 0c008dda */ jal modelGetNumAnimFrames
/* 1f0fc: 0c008dda */ jal animGetNumFrames
/* 1f100: e7b0008c */ swc1 $f16,0x8c($sp)
/* 1f104: 2459ffff */ addiu $t9,$v0,-1
/* 1f108: 44993000 */ mtc1 $t9,$f6
@ -5978,7 +5963,7 @@ glabel func0001f314
/* 1f56c: c6140060 */ lwc1 $f20,0x60($s0)
/* 1f570: 86040000 */ lh $a0,0x0($s0)
/* 1f574: e7b20088 */ swc1 $f18,0x88($sp)
/* 1f578: 0c008dda */ jal modelGetNumAnimFrames
/* 1f578: 0c008dda */ jal animGetNumFrames
/* 1f57c: e7b0008c */ swc1 $f16,0x8c($sp)
/* 1f580: 2458ffff */ addiu $t8,$v0,-1
/* 1f584: 44983000 */ mtc1 $t8,$f6
@ -5999,7 +5984,7 @@ glabel func0001f314
.L0001f5c0:
/* 1f5c0: 86040000 */ lh $a0,0x0($s0)
/* 1f5c4: e7b20088 */ swc1 $f18,0x88($sp)
/* 1f5c8: 0c008dda */ jal modelGetNumAnimFrames
/* 1f5c8: 0c008dda */ jal animGetNumFrames
/* 1f5cc: e7b0008c */ swc1 $f16,0x8c($sp)
/* 1f5d0: 2459ffff */ addiu $t9,$v0,-1
/* 1f5d4: 44994000 */ mtc1 $t9,$f8

2
src/lib/lib_233c0.c
View File

@ -287,7 +287,7 @@ glabel func0002373c
);
GLOBAL_ASM(
glabel modelGetNumAnimFrames
glabel animGetNumFrames
/* 23768: 00047400 */ sll $t6,$a0,0x10
/* 2376c: 000e7c03 */ sra $t7,$t6,0x10
/* 23770: 3c188006 */ lui $t8,%hi(g_Anims)