Rename lib_18680.s to modelasm.s

This commit is contained in:
Ryan Dwyer
2021-10-11 21:59:02 +10:00
parent bba63fe1fd
commit 055c136e9d
21 changed files with 523 additions and 544 deletions
+1 -1
View File
@@ -56,7 +56,7 @@
build/ROMID/lib/mtx.o (section); \
build/ROMID/lib/lib_17ce0.o (section); \
build/ROMID/lib/lib_184d0.o (section); \
build/ROMID/lib/lib_18680.o (section); \
build/ROMID/lib/modelasm.o (section); \
build/ROMID/lib/model.o (section); \
build/ROMID/game/game_1a7560.o (section); \
build/ROMID/lib/lib_233c0.o (section); \
+1 -1
View File
@@ -54,7 +54,7 @@
build/ROMID/lib/mtx.o (section); \
build/ROMID/lib/lib_17ce0.o (section); \
build/ROMID/lib/lib_184d0.o (section); \
build/ROMID/lib/lib_18680.o (section); \
build/ROMID/lib/modelasm.o (section); \
build/ROMID/lib/model.o (section); \
build/ROMID/lib/lib_233c0.o (section); \
build/ROMID/lib/lib_24e40.o (section); \
+1 -1
View File
@@ -54,7 +54,7 @@
build/ROMID/lib/mtx.o (section); \
build/ROMID/lib/lib_17ce0.o (section); \
build/ROMID/lib/lib_184d0.o (section); \
build/ROMID/lib/lib_18680.o (section); \
build/ROMID/lib/modelasm.o (section); \
build/ROMID/lib/model.o (section); \
build/ROMID/lib/lib_233c0.o (section); \
build/ROMID/lib/lib_24e40.o (section); \
+44 -44
View File
@@ -650,7 +650,7 @@ glabel var7f1ad3acpf
/* f0982bc: 02802025 */ move $a0,$s4
/* f0982c0: 468052a0 */ cvt.s.w $f10,$f10
/* f0982c4: 44055000 */ mfc1 $a1,$f10
/* f0982c8: 0c00777a */ jal func0001e018
/* f0982c8: 0c00777a */ jal model0001e018
/* f0982cc: 00000000 */ nop
/* f0982d0: 1000000b */ b .PF0f098300
/* f0982d4: 240affff */ li $t2,-1
@@ -913,7 +913,7 @@ glabel var7f1ad3acpf
/* f09867c: e6520688 */ swc1 $f18,0x688($s2)
/* f098680: 44050000 */ mfc1 $a1,$f0
/* f098684: 46000506 */ mov.s $f20,$f0
/* f098688: 0c00777a */ jal func0001e018
/* f098688: 0c00777a */ jal model0001e018
/* f09868c: e7a00080 */ swc1 $f0,0x80($sp)
/* f098690: 924a0691 */ lbu $t2,0x691($s2)
/* f098694: c7ae0080 */ lwc1 $f14,0x80($sp)
@@ -956,7 +956,7 @@ glabel var7f1ad3acpf
/* f098714: 24060000 */ li $a2,0x0
/* f098718: 02802025 */ move $a0,$s4
/* f09871c: 8e450684 */ lw $a1,0x684($s2)
/* f098720: 0c007afa */ jal func0001ee18
/* f098720: 0c007afa */ jal model0001ee18
/* f098724: 24060001 */ li $a2,0x1
/* f098728: 0fc2601f */ jal bgun0f09815c
/* f09872c: 02402025 */ move $a0,$s2
@@ -1217,7 +1217,7 @@ glabel var7f1ac1b0
/* f09839c: 8fa40058 */ lw $a0,0x58($sp)
/* f0983a0: 46808420 */ cvt.s.w $f16,$f16
/* f0983a4: 44058000 */ mfc1 $a1,$f16
/* f0983a8: 0c007806 */ jal func0001e018
/* f0983a8: 0c007806 */ jal model0001e018
/* f0983ac: 00000000 */ nop
/* f0983b0: 1000000b */ b .L0f0983e0
/* f0983b4: 240dffff */ addiu $t5,$zero,-1
@@ -1412,7 +1412,7 @@ glabel var7f1ac1b0
/* f098654: afa90144 */ sw $t1,0x144($sp)
/* f098658: 8fa40058 */ lw $a0,0x58($sp)
/* f09865c: 44055000 */ mfc1 $a1,$f10
/* f098660: 0c007806 */ jal func0001e018
/* f098660: 0c007806 */ jal model0001e018
/* f098664: 00000000 */ nop
/* f098668: 926a0691 */ lbu $t2,0x691($s3)
/* f09866c: 8fb20078 */ lw $s2,0x78($sp)
@@ -1449,7 +1449,7 @@ glabel var7f1ac1b0
/* f0986dc: 8fa40058 */ lw $a0,0x58($sp)
.L0f0986e0:
/* f0986e0: 8e650684 */ lw $a1,0x684($s3)
/* f0986e4: 0c007cc5 */ jal func0001f314
/* f0986e4: 0c007cc5 */ jal model0001f314
/* f0986e8: 24060001 */ addiu $a2,$zero,0x1
/* f0986ec: 0fc26057 */ jal bgun0f09815c
/* f0986f0: 02602025 */ or $a0,$s3,$zero
@@ -1691,7 +1691,7 @@ glabel var7f1ac1b0
/* f096408: 8fa4004c */ lw $a0,0x4c($sp)
/* f09640c: 46808420 */ cvt.s.w $f16,$f16
/* f096410: 44058000 */ mfc1 $a1,$f16
/* f096414: 0c007c2c */ jal func0001e018
/* f096414: 0c007c2c */ jal model0001e018
/* f096418: 00000000 */ sll $zero,$zero,0x0
/* f09641c: 1000000b */ beqz $zero,.NB0f09644c
/* f096420: 240dffff */ addiu $t5,$zero,-1
@@ -1886,7 +1886,7 @@ glabel var7f1ac1b0
/* f0966c0: afa9013c */ sw $t1,0x13c($sp)
/* f0966c4: 8fa4004c */ lw $a0,0x4c($sp)
/* f0966c8: 44055000 */ mfc1 $a1,$f10
/* f0966cc: 0c007c2c */ jal func0001e018
/* f0966cc: 0c007c2c */ jal model0001e018
/* f0966d0: 00000000 */ sll $zero,$zero,0x0
/* f0966d4: 926a0691 */ lbu $t2,0x691($s3)
/* f0966d8: 8fb20070 */ lw $s2,0x70($sp)
@@ -1923,7 +1923,7 @@ glabel var7f1ac1b0
/* f096748: 8fa4004c */ lw $a0,0x4c($sp)
.NB0f09674c:
/* f09674c: 8e650684 */ lw $a1,0x684($s3)
/* f096750: 0c0080eb */ jal func0001f314
/* f096750: 0c0080eb */ jal model0001f314
/* f096754: 24060001 */ addiu $a2,$zero,0x1
/* f096758: 0fc25872 */ jal bgun0f09815c
/* f09675c: 02602025 */ or $a0,$s3,$zero
@@ -7011,7 +7011,7 @@ bool bgun0f09aba4(struct hand *hand, struct handweaponinfo *info, s32 handnum, s
if (unk27 > frames - hand->statevar1) {
mult1 = cosf((f32)(unk27 - frames + hand->statevar1) * 1.5707963705063f / (f32)unk27) * 0.5f + 0.5f;
hand->rotxoffset = func0001afe8(hand->rotxstart, hand->rotxend, mult1);
hand->rotxoffset = model0001afe8(hand->rotxstart, hand->rotxend, mult1);
hand->useposrot = true;
hand->posoffset.x = (hand->posend.x - hand->posstart.x) * mult1 + hand->posstart.x;
@@ -7051,7 +7051,7 @@ bool bgun0f09aba4(struct hand *hand, struct handweaponinfo *info, s32 handnum, s
mult2 = cosf((f32)(frames - unk24) * M_PI / (f32)unk25) * 0.5f + 0.5f;
}
hand->rotxoffset = func0001afe8(hand->rotxstart, hand->rotxend, mult2);
hand->rotxoffset = model0001afe8(hand->rotxstart, hand->rotxend, mult2);
hand->useposrot = true;
hand->posoffset.x = (hand->posend.x - hand->posstart.x) * mult2 + hand->posstart.x;
@@ -11907,7 +11907,7 @@ void bgun0f09f848(s32 handnum)
model->matrices = gfxAllocate(model->filedata->nummatrices * sizeof(Mtxf));
mtx00015d18(&hand->muzzlemat, &model->matrices[0]);
func0001cb0c(model, model->filedata->rootnode);
model0001cb0c(model, model->filedata->rootnode);
objprop->flags |= PROPFLAG_40 | PROPFLAG_ONSCREEN;
objprop->z = -model->matrices[0].m[3][2];
@@ -18044,7 +18044,7 @@ glabel bgun0f0a37b4
/* f0a37dc: 104000ac */ beqz $v0,.L0f0a3a90
/* f0a37e0: 00402025 */ or $a0,$v0,$zero
/* f0a37e4: 00002825 */ or $a1,$zero,$zero
/* f0a37e8: 0c006949 */ jal func0001a524
/* f0a37e8: 0c006949 */ jal model0001a524
/* f0a37ec: afa20094 */ sw $v0,0x94($sp)
/* f0a37f0: 8fae00a4 */ lw $t6,0xa4($sp)
/* f0a37f4: 00027980 */ sll $t7,$v0,0x6
@@ -18151,7 +18151,7 @@ glabel bgun0f0a37b4
/* f0a397c: 27a50088 */ addiu $a1,$sp,0x88
/* f0a3980: 8fa40094 */ lw $a0,0x94($sp)
/* f0a3984: 00002825 */ or $a1,$zero,$zero
/* f0a3988: 0c006949 */ jal func0001a524
/* f0a3988: 0c006949 */ jal model0001a524
/* f0a398c: afa3002c */ sw $v1,0x2c($sp)
/* f0a3990: 44801000 */ mtc1 $zero,$f2
/* f0a3994: 3c0143fa */ lui $at,0x43fa
@@ -18491,7 +18491,7 @@ glabel var7f1ac8b8
.L0f0a3df0:
/* f0a3df0: 1140000f */ beqz $t2,.L0f0a3e30
/* f0a3df4: 01402025 */ or $a0,$t2,$zero
/* f0a3df8: 0c006949 */ jal func0001a524
/* f0a3df8: 0c006949 */ jal model0001a524
/* f0a3dfc: 00002825 */ or $a1,$zero,$zero
/* f0a3e00: 3c01800a */ lui $at,%hi(var8009d0f0)
/* f0a3e04: ac22d0dc */ sw $v0,%lo(var8009d0f0)($at)
@@ -18513,7 +18513,7 @@ glabel var7f1ac8b8
/* f0a3e40: 2405002d */ addiu $a1,$zero,0x2d
/* f0a3e44: 10400004 */ beqz $v0,.L0f0a3e58
/* f0a3e48: 00402025 */ or $a0,$v0,$zero
/* f0a3e4c: 0c006949 */ jal func0001a524
/* f0a3e4c: 0c006949 */ jal model0001a524
/* f0a3e50: 00002825 */ or $a1,$zero,$zero
/* f0a3e54: ae020000 */ sw $v0,0x0($s0)
.L0f0a3e58:
@@ -18522,7 +18522,7 @@ glabel var7f1ac8b8
/* f0a3e60: 2405002e */ addiu $a1,$zero,0x2e
/* f0a3e64: 10400004 */ beqz $v0,.L0f0a3e78
/* f0a3e68: 00402025 */ or $a0,$v0,$zero
/* f0a3e6c: 0c006949 */ jal func0001a524
/* f0a3e6c: 0c006949 */ jal model0001a524
/* f0a3e70: 00002825 */ or $a1,$zero,$zero
/* f0a3e74: ae020004 */ sw $v0,0x4($s0)
.L0f0a3e78:
@@ -18531,7 +18531,7 @@ glabel var7f1ac8b8
/* f0a3e80: 2405002f */ addiu $a1,$zero,0x2f
/* f0a3e84: 10400004 */ beqz $v0,.L0f0a3e98
/* f0a3e88: 00402025 */ or $a0,$v0,$zero
/* f0a3e8c: 0c006949 */ jal func0001a524
/* f0a3e8c: 0c006949 */ jal model0001a524
/* f0a3e90: 00002825 */ or $a1,$zero,$zero
/* f0a3e94: ae020008 */ sw $v0,0x8($s0)
.L0f0a3e98:
@@ -18804,7 +18804,7 @@ glabel var7f1ac8b8
.L0f0a3df0:
/* f0a3df0: 1140000f */ beqz $t2,.L0f0a3e30
/* f0a3df4: 01402025 */ or $a0,$t2,$zero
/* f0a3df8: 0c006949 */ jal func0001a524
/* f0a3df8: 0c006949 */ jal model0001a524
/* f0a3dfc: 00002825 */ or $a1,$zero,$zero
/* f0a3e00: 3c01800a */ lui $at,%hi(var8009d0dc)
/* f0a3e04: ac22d0dc */ sw $v0,%lo(var8009d0dc)($at)
@@ -18826,7 +18826,7 @@ glabel var7f1ac8b8
/* f0a3e40: 2405002d */ addiu $a1,$zero,0x2d
/* f0a3e44: 10400004 */ beqz $v0,.L0f0a3e58
/* f0a3e48: 00402025 */ or $a0,$v0,$zero
/* f0a3e4c: 0c006949 */ jal func0001a524
/* f0a3e4c: 0c006949 */ jal model0001a524
/* f0a3e50: 00002825 */ or $a1,$zero,$zero
/* f0a3e54: ae020000 */ sw $v0,0x0($s0)
.L0f0a3e58:
@@ -18835,7 +18835,7 @@ glabel var7f1ac8b8
/* f0a3e60: 2405002e */ addiu $a1,$zero,0x2e
/* f0a3e64: 10400004 */ beqz $v0,.L0f0a3e78
/* f0a3e68: 00402025 */ or $a0,$v0,$zero
/* f0a3e6c: 0c006949 */ jal func0001a524
/* f0a3e6c: 0c006949 */ jal model0001a524
/* f0a3e70: 00002825 */ or $a1,$zero,$zero
/* f0a3e74: ae020004 */ sw $v0,0x4($s0)
.L0f0a3e78:
@@ -18844,7 +18844,7 @@ glabel var7f1ac8b8
/* f0a3e80: 2405002f */ addiu $a1,$zero,0x2f
/* f0a3e84: 10400004 */ beqz $v0,.L0f0a3e98
/* f0a3e88: 00402025 */ or $a0,$v0,$zero
/* f0a3e8c: 0c006949 */ jal func0001a524
/* f0a3e8c: 0c006949 */ jal model0001a524
/* f0a3e90: 00002825 */ or $a1,$zero,$zero
/* f0a3e94: ae020008 */ sw $v0,0x8($s0)
.L0f0a3e98:
@@ -18928,7 +18928,7 @@ glabel bgun0f0a3eac
/* f0a3fb4: 27a90088 */ addiu $t1,$sp,0x88
/* f0a3fb8: 02698821 */ addu $s1,$s3,$t1
/* f0a3fbc: 4612d502 */ mul.s $f20,$f26,$f18
/* f0a3fc0: 0c006949 */ jal func0001a524
/* f0a3fc0: 0c006949 */ jal model0001a524
/* f0a3fc4: 00002825 */ or $a1,$zero,$zero
/* f0a3fc8: 44922000 */ mtc1 $s2,$f4
/* f0a3fcc: 00401825 */ or $v1,$v0,$zero
@@ -19006,7 +19006,7 @@ glabel var7f1ac8c0
/* f0a40b8: 10400034 */ beqz $v0,.L0f0a418c
/* f0a40bc: 00402025 */ or $a0,$v0,$zero
/* f0a40c0: 00002825 */ or $a1,$zero,$zero
/* f0a40c4: 0c006949 */ jal func0001a524
/* f0a40c4: 0c006949 */ jal model0001a524
/* f0a40c8: afa70038 */ sw $a3,0x38($sp)
/* f0a40cc: 3c013f80 */ lui $at,0x3f80
/* f0a40d0: 44811000 */ mtc1 $at,$f2
@@ -19084,7 +19084,7 @@ glabel var7f1ac8c0
/* f0a40b8: 10400034 */ beqz $v0,.L0f0a418c
/* f0a40bc: 00402025 */ or $a0,$v0,$zero
/* f0a40c0: 00002825 */ or $a1,$zero,$zero
/* f0a40c4: 0c006949 */ jal func0001a524
/* f0a40c4: 0c006949 */ jal model0001a524
/* f0a40c8: afa70038 */ sw $a3,0x38($sp)
/* f0a40cc: 3c013f80 */ lui $at,0x3f80
/* f0a40d0: 44811000 */ mtc1 $at,$f2
@@ -19206,7 +19206,7 @@ glabel var7f1ac8c4
/* f0a4268: 00402025 */ or $a0,$v0,$zero
/* f0a426c: 1040002c */ beqz $v0,.L0f0a4320
/* f0a4270: ad490000 */ sw $t1,0x0($t2)
/* f0a4274: 0c006949 */ jal func0001a524
/* f0a4274: 0c006949 */ jal model0001a524
/* f0a4278: 00002825 */ or $a1,$zero,$zero
/* f0a427c: afa20034 */ sw $v0,0x34($sp)
/* f0a4280: 3c013f80 */ lui $at,0x3f80
@@ -19320,7 +19320,7 @@ glabel var7f1ac8c4
/* f0a4268: 00402025 */ or $a0,$v0,$zero
/* f0a426c: 1040002c */ beqz $v0,.L0f0a4320
/* f0a4270: ad490000 */ sw $t1,0x0($t2)
/* f0a4274: 0c006949 */ jal func0001a524
/* f0a4274: 0c006949 */ jal model0001a524
/* f0a4278: 00002825 */ or $a1,$zero,$zero
/* f0a427c: afa20034 */ sw $v0,0x34($sp)
/* f0a4280: 3c013f80 */ lui $at,0x3f80
@@ -19444,7 +19444,7 @@ glabel var7f1ac8c8
/* f0a44d0: 00000000 */ nop
/* f0a44d4: 10400013 */ beqz $v0,.L0f0a4524
/* f0a44d8: 00402025 */ or $a0,$v0,$zero
/* f0a44dc: 0c006949 */ jal func0001a524
/* f0a44dc: 0c006949 */ jal model0001a524
/* f0a44e0: 00002825 */ or $a1,$zero,$zero
/* f0a44e4: 00024180 */ sll $t0,$v0,0x6
/* f0a44e8: 02a82021 */ addu $a0,$s5,$t0
@@ -19519,7 +19519,7 @@ void bgun0f0a45d0(struct hand *hand, struct modelfiledata *filedata, bool arg2)
}
if (node) {
var8009d148 = func0001a524(node, 0);
var8009d148 = model0001a524(node, 0);
var8005efcc = bgun0f0a256c;
} else {
var8009d148 = -1;
@@ -20858,7 +20858,7 @@ glabel var7f1ac934
/* f0a5104: 8c500004 */ lw $s0,0x4($v0)
/* f0a5108: 00002825 */ or $a1,$zero,$zero
/* f0a510c: 460a3502 */ mul.s $f20,$f6,$f10
/* f0a5110: 0c006949 */ jal func0001a524
/* f0a5110: 0c006949 */ jal model0001a524
/* f0a5114: 00000000 */ nop
/* f0a5118: c6100000 */ lwc1 $f16,0x0($s0)
/* f0a511c: c7b200d8 */ lwc1 $f18,0xd8($sp)
@@ -21120,7 +21120,7 @@ glabel var7f1ac9e0
/* f0a53a0: 00000000 */ nop
/* f0a53a4: 10400017 */ beqz $v0,.L0f0a5404
/* f0a53a8: 00402025 */ or $a0,$v0,$zero
/* f0a53ac: 0c006949 */ jal func0001a524
/* f0a53ac: 0c006949 */ jal model0001a524
/* f0a53b0: 00002825 */ or $a1,$zero,$zero
/* f0a53b4: 8fad008c */ lw $t5,0x8c($sp)
/* f0a53b8: 00027180 */ sll $t6,$v0,0x6
@@ -22383,7 +22383,7 @@ glabel var7f1add20pf
/* f0a66cc: 27a400d8 */ addiu $a0,$sp,0xd8
/* f0a66d0: 8fa50054 */ lw $a1,0x54($sp)
/* f0a66d4: afa600c8 */ sw $a2,0xc8($sp)
/* f0a66d8: 0c007323 */ jal func0001cebc
/* f0a66d8: 0c007323 */ jal model0001cebc
/* f0a66dc: afa700d4 */ sw $a3,0xd4($sp)
/* f0a66e0: 8fa700d4 */ lw $a3,0xd4($sp)
/* f0a66e4: 3c018006 */ lui $at,0x8006
@@ -22435,7 +22435,7 @@ glabel var7f1add20pf
.PF0f0a678c:
/* f0a678c: 27a400d8 */ addiu $a0,$sp,0xd8
/* f0a6790: 8fa50054 */ lw $a1,0x54($sp)
/* f0a6794: 0c007323 */ jal func0001cebc
/* f0a6794: 0c007323 */ jal model0001cebc
/* f0a6798: afa700d4 */ sw $a3,0xd4($sp)
/* f0a679c: 8fa700d4 */ lw $a3,0xd4($sp)
/* f0a67a0: 3c018006 */ lui $at,0x8006
@@ -22451,7 +22451,7 @@ glabel var7f1add20pf
/* f0a67c4: 24050033 */ li $a1,0x33
/* f0a67c8: 10400020 */ beqz $v0,.PF0f0a684c
/* f0a67cc: 00402025 */ move $a0,$v0
/* f0a67d0: 0c0068ad */ jal func0001a524
/* f0a67d0: 0c0068ad */ jal model0001a524
/* f0a67d4: 00002825 */ move $a1,$zero
/* f0a67d8: afa20084 */ sw $v0,0x84($sp)
/* f0a67dc: 0fc2899c */ jal bgun0f0a233c
@@ -22566,7 +22566,7 @@ glabel var7f1add20pf
.PF0f0a6968:
/* f0a6968: 10400038 */ beqz $v0,.PF0f0a6a4c
/* f0a696c: 8fad01cc */ lw $t5,0x1cc($sp)
/* f0a6970: 0c0068ad */ jal func0001a524
/* f0a6970: 0c0068ad */ jal model0001a524
/* f0a6974: 00002825 */ move $a1,$zero
/* f0a6978: 8faa030c */ lw $t2,0x30c($sp)
/* f0a697c: 00025980 */ sll $t3,$v0,0x6
@@ -22638,7 +22638,7 @@ glabel var7f1add20pf
/* f0a6a7c: 0c0069ab */ jal modelGetPart
/* f0a6a80: 24050037 */ li $a1,0x37
/* f0a6a84: 00402025 */ move $a0,$v0
/* f0a6a88: 0c0068ad */ jal func0001a524
/* f0a6a88: 0c0068ad */ jal model0001a524
/* f0a6a8c: 00002825 */ move $a1,$zero
/* f0a6a90: 8fae030c */ lw $t6,0x30c($sp)
/* f0a6a94: 00026180 */ sll $t4,$v0,0x6
@@ -23860,7 +23860,7 @@ glabel var7f1aca70
/* f0a62d8: 27a400d0 */ addiu $a0,$sp,0xd0
/* f0a62dc: 26050384 */ addiu $a1,$s0,0x384
/* f0a62e0: afa600c4 */ sw $a2,0xc4($sp)
/* f0a62e4: 0c0073af */ jal func0001cebc
/* f0a62e4: 0c0073af */ jal model0001cebc
/* f0a62e8: afb900e0 */ sw $t9,0xe0($sp)
/* f0a62ec: 8faf01d8 */ lw $t7,0x1d8($sp)
/* f0a62f0: 8fa600c4 */ lw $a2,0xc4($sp)
@@ -23896,7 +23896,7 @@ glabel var7f1aca70
/* f0a6360: 10000003 */ b .L0f0a6370
/* f0a6364: 00000000 */ nop
.L0f0a6368:
/* f0a6368: 0c0073af */ jal func0001cebc
/* f0a6368: 0c0073af */ jal model0001cebc
/* f0a636c: 00c02025 */ or $a0,$a2,$zero
.L0f0a6370:
/* f0a6370: 3c018006 */ lui $at,%hi(var8005efcc)
@@ -23906,7 +23906,7 @@ glabel var7f1aca70
/* f0a6380: 24050033 */ addiu $a1,$zero,0x33
/* f0a6384: 10400020 */ beqz $v0,.L0f0a6408
/* f0a6388: 00402025 */ or $a0,$v0,$zero
/* f0a638c: 0c006949 */ jal func0001a524
/* f0a638c: 0c006949 */ jal model0001a524
/* f0a6390: 00002825 */ or $a1,$zero,$zero
/* f0a6394: afa20080 */ sw $v0,0x80($sp)
/* f0a6398: 0fc288cf */ jal bgun0f0a233c
@@ -24021,7 +24021,7 @@ glabel var7f1aca70
.L0f0a6524:
/* f0a6524: 10400038 */ beqz $v0,.L0f0a6608
/* f0a6528: 8faa01c4 */ lw $t2,0x1c4($sp)
/* f0a652c: 0c006949 */ jal func0001a524
/* f0a652c: 0c006949 */ jal model0001a524
/* f0a6530: 00002825 */ or $a1,$zero,$zero
/* f0a6534: 8fb80304 */ lw $t8,0x304($sp)
/* f0a6538: 00026980 */ sll $t5,$v0,0x6
@@ -24093,7 +24093,7 @@ glabel var7f1aca70
/* f0a6638: 0c006a47 */ jal modelGetPart
/* f0a663c: 24050037 */ addiu $a1,$zero,0x37
/* f0a6640: 00402025 */ or $a0,$v0,$zero
/* f0a6644: 0c006949 */ jal func0001a524
/* f0a6644: 0c006949 */ jal model0001a524
/* f0a6648: 00002825 */ or $a1,$zero,$zero
/* f0a664c: 8fab0304 */ lw $t3,0x304($sp)
/* f0a6650: 00027980 */ sll $t7,$v0,0x6
@@ -25327,7 +25327,7 @@ glabel var7f1aca90
/* f0a7b5c: 26050534 */ addiu $a1,$s0,0x534
/* f0a7b60: 00a02025 */ or $a0,$a1,$zero
/* f0a7b64: ae0e0540 */ sw $t6,0x540($s0)
/* f0a7b68: 0c007308 */ jal func0001cc20
/* f0a7b68: 0c007308 */ jal model0001cc20
/* f0a7b6c: afa50054 */ sw $a1,0x54($sp)
/* f0a7b70: 8fa50054 */ lw $a1,0x54($sp)
/* f0a7b74: afb50140 */ sw $s5,0x140($sp)
@@ -26168,7 +26168,7 @@ glabel var7f1aca90
/* f0a7b5c: 26050534 */ addiu $a1,$s0,0x534
/* f0a7b60: 00a02025 */ or $a0,$a1,$zero
/* f0a7b64: ae0e0540 */ sw $t6,0x540($s0)
/* f0a7b68: 0c007308 */ jal func0001cc20
/* f0a7b68: 0c007308 */ jal model0001cc20
/* f0a7b6c: afa50054 */ sw $a1,0x54($sp)
/* f0a7b70: 8fa50054 */ lw $a1,0x54($sp)
/* f0a7b74: afb50140 */ sw $s5,0x140($sp)
@@ -27000,7 +27000,7 @@ glabel var7f1aca90
/* f0a5888: 26050534 */ addiu $a1,$s0,0x534
/* f0a588c: 00a02025 */ or $a0,$a1,$zero
/* f0a5890: ae0f0540 */ sw $t7,0x540($s0)
/* f0a5894: 0c007728 */ jal func0001cc20
/* f0a5894: 0c007728 */ jal model0001cc20
/* f0a5898: afa50050 */ sw $a1,0x50($sp)
/* f0a589c: 8fa50050 */ lw $a1,0x50($sp)
/* f0a58a0: afb50138 */ sw $s5,0x138($sp)
+6 -6
View File
@@ -146,19 +146,19 @@ void bheadUpdate(f32 arg0, f32 arg1)
struct objticksp476 sp80 = {NULL, 1, 3};
Mtxf sp40;
struct coord modelpos = {0, 0, 0};
bool somebool = func0001e2a8();
bool somebool = model0001e2a8();
g_Vars.currentplayer->resetheadtick = false;
func0001e29c(false);
func0001ee18(&g_Vars.currentplayer->model, g_Vars.lvupdate240, true);
func0001e29c(somebool);
func0001b3bc(&g_Vars.currentplayer->model);
model0001e29c(false);
model0001ee18(&g_Vars.currentplayer->model, g_Vars.lvupdate240, true);
model0001e29c(somebool);
model0001b3bc(&g_Vars.currentplayer->model);
mtx000159b0(&sp40);
sp80.matrix = &sp40;
sp80.unk10 = g_Vars.currentplayer->bondheadmatrices;
func0001cebc(&sp80, &g_Vars.currentplayer->model);
model0001cebc(&sp80, &g_Vars.currentplayer->model);
g_Vars.currentplayer->headbodyoffset.x = g_Vars.currentplayer->standbodyoffset.x;
g_Vars.currentplayer->headbodyoffset.y = g_Vars.currentplayer->standbodyoffset.y;
+79 -79
View File
@@ -6431,11 +6431,11 @@ void func0f0220ec(struct chrdata *chr, s32 arg1, s32 arg2)
} else if (arg2) {
if ((chr->hidden & CHRHFLAG_00000800) == 0) {
modelGetRootPosition(model, &chr->prevpos);
func0001ee18(model, arg1, 1);
func0001b3bc(model);
model0001ee18(model, arg1, 1);
model0001b3bc(model);
}
} else {
func0001ee18(model, arg1, 0);
model0001ee18(model, arg1, 0);
}
}
@@ -6488,7 +6488,7 @@ glabel var7f1a87a8
/* f0222a0: 00194300 */ sll $t0,$t9,0xc
/* f0222a4: 05020061 */ bltzl $t0,.L0f02242c
/* f0222a8: 924a0001 */ lbu $t2,0x1($s2)
/* f0222ac: 0c006973 */ jal func0001a5cc
/* f0222ac: 0c006973 */ jal model0001a5cc
/* f0222b0: afa30110 */ sw $v1,0x110($sp)
/* f0222b4: 3c0a8006 */ lui $t2,%hi(var80062998)
/* f0222b8: 254a2998 */ addiu $t2,$t2,%lo(var80062998)
@@ -6572,7 +6572,7 @@ glabel var7f1a87a8
/* f0223d8: 01a02025 */ or $a0,$t5,$zero
/* f0223dc: afa200d4 */ sw $v0,0xd4($sp)
/* f0223e0: 27a400c4 */ addiu $a0,$sp,0xc4
/* f0223e4: 0c007399 */ jal func0001ce64
/* f0223e4: 0c007399 */ jal model0001ce64
/* f0223e8: 8fa50110 */ lw $a1,0x110($sp)
/* f0223ec: 02402025 */ or $a0,$s2,$zero
/* f0223f0: 0fc1c18f */ jal func0f07063c
@@ -7250,7 +7250,7 @@ glabel var7f1a99ecpf
/* f0235ac: 10000009 */ b .PF0f0235d4
/* f0235b0: 00003825 */ move $a3,$zero
.PF0f0235b4:
/* f0235b4: 0c006b44 */ jal func0001af80
/* f0235b4: 0c006b44 */ jal model0001af80
/* f0235b8: 8fa40208 */ lw $a0,0x208($sp)
/* f0235bc: 8fa40250 */ lw $a0,0x250($sp)
/* f0235c0: 44060000 */ mfc1 $a2,$f0
@@ -7415,7 +7415,7 @@ glabel var7f1a99ecpf
/* f023808: 15810014 */ bne $t4,$at,.PF0f02385c
/* f02380c: 00000000 */ nop
.PF0f023810:
/* f023810: 0c006b44 */ jal func0001af80
/* f023810: 0c006b44 */ jal model0001af80
/* f023814: 8fa40208 */ lw $a0,0x208($sp)
/* f023818: 8fa40250 */ lw $a0,0x250($sp)
/* f02381c: 44060000 */ mfc1 $a2,$f0
@@ -7430,7 +7430,7 @@ glabel var7f1a99ecpf
/* f023840: a1e0000b */ sb $zero,0xb($t7)
/* f023844: 0c006aa7 */ jal modelGetRootPosition
/* f023848: afa20204 */ sw $v0,0x204($sp)
/* f02384c: 0c006c56 */ jal func0001b3bc
/* f02384c: 0c006c56 */ jal model0001b3bc
/* f023850: 8fa40208 */ lw $a0,0x208($sp)
/* f023854: 1000012c */ b .PF0f023d08
/* f023858: 8fa70204 */ lw $a3,0x204($sp)
@@ -7441,7 +7441,7 @@ glabel var7f1a99ecpf
/* f023868: 0fc0888a */ jal func0f0220ec
/* f02386c: 24060001 */ li $a2,0x1
.PF0f023870:
/* f023870: 0c006b44 */ jal func0001af80
/* f023870: 0c006b44 */ jal model0001af80
/* f023874: 8fa40208 */ lw $a0,0x208($sp)
/* f023878: 8fa40250 */ lw $a0,0x250($sp)
/* f02387c: 44060000 */ mfc1 $a2,$f0
@@ -7484,7 +7484,7 @@ glabel var7f1a99ecpf
/* f023900: 8e18002c */ lw $t8,0x2c($s0)
/* f023904: 57000022 */ bnezl $t8,.PF0f023990
/* f023908: 24010001 */ li $at,0x1
/* f02390c: 0c006b44 */ jal func0001af80
/* f02390c: 0c006b44 */ jal model0001af80
/* f023910: 8fa40208 */ lw $a0,0x208($sp)
/* f023914: 8fa40250 */ lw $a0,0x250($sp)
/* f023918: 44060000 */ mfc1 $a2,$f0
@@ -7532,7 +7532,7 @@ glabel var7f1a99ecpf
/* f0239b4: 00000000 */ nop
/* f0239b8: 0fc0888a */ jal func0f0220ec
/* f0239bc: 24060001 */ li $a2,0x1
/* f0239c0: 0c006b44 */ jal func0001af80
/* f0239c0: 0c006b44 */ jal model0001af80
/* f0239c4: 8fa40208 */ lw $a0,0x208($sp)
/* f0239c8: 8fa40250 */ lw $a0,0x250($sp)
/* f0239cc: 44060000 */ mfc1 $a2,$f0
@@ -7542,7 +7542,7 @@ glabel var7f1a99ecpf
/* f0239dc: 100000ca */ b .PF0f023d08
/* f0239e0: 00403825 */ move $a3,$v0
.PF0f0239e4:
/* f0239e4: 0c006b44 */ jal func0001af80
/* f0239e4: 0c006b44 */ jal model0001af80
/* f0239e8: 8fa40208 */ lw $a0,0x208($sp)
/* f0239ec: 8fa40250 */ lw $a0,0x250($sp)
/* f0239f0: 44060000 */ mfc1 $a2,$f0
@@ -7630,7 +7630,7 @@ glabel var7f1a99ecpf
/* f023b1c: 24010005 */ li $at,0x5
/* f023b20: 1461000a */ bne $v1,$at,.PF0f023b4c
/* f023b24: 8fa90250 */ lw $t1,0x250($sp)
/* f023b28: 0c006b44 */ jal func0001af80
/* f023b28: 0c006b44 */ jal model0001af80
/* f023b2c: 8fa40208 */ lw $a0,0x208($sp)
/* f023b30: 8fa40250 */ lw $a0,0x250($sp)
/* f023b34: 44060000 */ mfc1 $a2,$f0
@@ -7673,7 +7673,7 @@ glabel var7f1a99ecpf
/* f023bbc: a300000b */ sb $zero,0xb($t8)
/* f023bc0: 0fc0888a */ jal func0f0220ec
/* f023bc4: 8fa501fc */ lw $a1,0x1fc($sp)
/* f023bc8: 0c006b44 */ jal func0001af80
/* f023bc8: 0c006b44 */ jal model0001af80
/* f023bcc: 8fa40208 */ lw $a0,0x208($sp)
/* f023bd0: 8fa40250 */ lw $a0,0x250($sp)
/* f023bd4: 44060000 */ mfc1 $a2,$f0
@@ -7749,7 +7749,7 @@ glabel var7f1a99ecpf
/* f023ce0: 10000009 */ b .PF0f023d08
/* f023ce4: 00003825 */ move $a3,$zero
.PF0f023ce8:
/* f023ce8: 0c006b44 */ jal func0001af80
/* f023ce8: 0c006b44 */ jal model0001af80
/* f023cec: 8fa40208 */ lw $a0,0x208($sp)
/* f023cf0: 8fa40250 */ lw $a0,0x250($sp)
/* f023cf4: 44060000 */ mfc1 $a2,$f0
@@ -8168,7 +8168,7 @@ glabel var7f1a99ecpf
/* f0242f4: 8fa50208 */ lw $a1,0x208($sp)
.PF0f0242f8:
/* f0242f8: afa20128 */ sw $v0,0x128($sp)
/* f0242fc: 0c007323 */ jal func0001cebc
/* f0242fc: 0c007323 */ jal model0001cebc
/* f024300: afa60110 */ sw $a2,0x110($sp)
/* f024304: 8fa60110 */ lw $a2,0x110($sp)
/* f024308: 8fa20128 */ lw $v0,0x128($sp)
@@ -8194,7 +8194,7 @@ glabel var7f1a99ecpf
/* f024354: 0fc1a666 */ jal colourTween
/* f024358: 260500fc */ addiu $a1,$s0,0xfc
.PF0f02435c:
/* f02435c: 0c0069de */ jal func0001a9e8
/* f02435c: 0c0069de */ jal model0001a9e8
/* f024360: 8fa40208 */ lw $a0,0x208($sp)
/* f024364: 8faa0250 */ lw $t2,0x250($sp)
/* f024368: 8d47001c */ lw $a3,0x1c($t2)
@@ -8688,7 +8688,7 @@ glabel var7f1a87d8
/* f023488: 10000009 */ b .L0f0234b0
/* f02348c: 00003825 */ or $a3,$zero,$zero
.L0f023490:
/* f023490: 0c006be0 */ jal func0001af80
/* f023490: 0c006be0 */ jal model0001af80
/* f023494: 8fa40208 */ lw $a0,0x208($sp)
/* f023498: 8fa40250 */ lw $a0,0x250($sp)
/* f02349c: 44060000 */ mfc1 $a2,$f0
@@ -8853,7 +8853,7 @@ glabel var7f1a87d8
/* f0236e4: 17010014 */ bne $t8,$at,.L0f023738
/* f0236e8: 00000000 */ nop
.L0f0236ec:
/* f0236ec: 0c006be0 */ jal func0001af80
/* f0236ec: 0c006be0 */ jal model0001af80
/* f0236f0: 8fa40208 */ lw $a0,0x208($sp)
/* f0236f4: 8fa40250 */ lw $a0,0x250($sp)
/* f0236f8: 44060000 */ mfc1 $a2,$f0
@@ -8868,7 +8868,7 @@ glabel var7f1a87d8
/* f02371c: a320000b */ sb $zero,0xb($t9)
/* f023720: 0c006b43 */ jal modelGetRootPosition
/* f023724: afa20204 */ sw $v0,0x204($sp)
/* f023728: 0c006cef */ jal func0001b3bc
/* f023728: 0c006cef */ jal model0001b3bc
/* f02372c: 8fa40208 */ lw $a0,0x208($sp)
/* f023730: 1000012c */ b .L0f023be4
/* f023734: 8fa70204 */ lw $a3,0x204($sp)
@@ -8879,7 +8879,7 @@ glabel var7f1a87d8
/* f023744: 0fc0883b */ jal func0f0220ec
/* f023748: 24060001 */ addiu $a2,$zero,0x1
.L0f02374c:
/* f02374c: 0c006be0 */ jal func0001af80
/* f02374c: 0c006be0 */ jal model0001af80
/* f023750: 8fa40208 */ lw $a0,0x208($sp)
/* f023754: 8fa40250 */ lw $a0,0x250($sp)
/* f023758: 44060000 */ mfc1 $a2,$f0
@@ -8922,7 +8922,7 @@ glabel var7f1a87d8
/* f0237dc: 8e08002c */ lw $t0,0x2c($s0)
/* f0237e0: 55000022 */ bnezl $t0,.L0f02386c
/* f0237e4: 24010001 */ addiu $at,$zero,0x1
/* f0237e8: 0c006be0 */ jal func0001af80
/* f0237e8: 0c006be0 */ jal model0001af80
/* f0237ec: 8fa40208 */ lw $a0,0x208($sp)
/* f0237f0: 8fa40250 */ lw $a0,0x250($sp)
/* f0237f4: 44060000 */ mfc1 $a2,$f0
@@ -8970,7 +8970,7 @@ glabel var7f1a87d8
/* f023890: 00000000 */ nop
/* f023894: 0fc0883b */ jal func0f0220ec
/* f023898: 24060001 */ addiu $a2,$zero,0x1
/* f02389c: 0c006be0 */ jal func0001af80
/* f02389c: 0c006be0 */ jal model0001af80
/* f0238a0: 8fa40208 */ lw $a0,0x208($sp)
/* f0238a4: 8fa40250 */ lw $a0,0x250($sp)
/* f0238a8: 44060000 */ mfc1 $a2,$f0
@@ -8980,7 +8980,7 @@ glabel var7f1a87d8
/* f0238b8: 100000ca */ b .L0f023be4
/* f0238bc: 00403825 */ or $a3,$v0,$zero
.L0f0238c0:
/* f0238c0: 0c006be0 */ jal func0001af80
/* f0238c0: 0c006be0 */ jal model0001af80
/* f0238c4: 8fa40208 */ lw $a0,0x208($sp)
/* f0238c8: 8fa40250 */ lw $a0,0x250($sp)
/* f0238cc: 44060000 */ mfc1 $a2,$f0
@@ -9068,7 +9068,7 @@ glabel var7f1a87d8
/* f0239f8: 24010005 */ addiu $at,$zero,0x5
/* f0239fc: 1461000a */ bne $v1,$at,.L0f023a28
/* f023a00: 8fab0250 */ lw $t3,0x250($sp)
/* f023a04: 0c006be0 */ jal func0001af80
/* f023a04: 0c006be0 */ jal model0001af80
/* f023a08: 8fa40208 */ lw $a0,0x208($sp)
/* f023a0c: 8fa40250 */ lw $a0,0x250($sp)
/* f023a10: 44060000 */ mfc1 $a2,$f0
@@ -9111,7 +9111,7 @@ glabel var7f1a87d8
/* f023a98: a100000b */ sb $zero,0xb($t0)
/* f023a9c: 0fc0883b */ jal func0f0220ec
/* f023aa0: 8fa501fc */ lw $a1,0x1fc($sp)
/* f023aa4: 0c006be0 */ jal func0001af80
/* f023aa4: 0c006be0 */ jal model0001af80
/* f023aa8: 8fa40208 */ lw $a0,0x208($sp)
/* f023aac: 8fa40250 */ lw $a0,0x250($sp)
/* f023ab0: 44060000 */ mfc1 $a2,$f0
@@ -9187,7 +9187,7 @@ glabel var7f1a87d8
/* f023bbc: 10000009 */ b .L0f023be4
/* f023bc0: 00003825 */ or $a3,$zero,$zero
.L0f023bc4:
/* f023bc4: 0c006be0 */ jal func0001af80
/* f023bc4: 0c006be0 */ jal model0001af80
/* f023bc8: 8fa40208 */ lw $a0,0x208($sp)
/* f023bcc: 8fa40250 */ lw $a0,0x250($sp)
/* f023bd0: 44060000 */ mfc1 $a2,$f0
@@ -9606,7 +9606,7 @@ glabel var7f1a87d8
/* f0241d0: 8fa50208 */ lw $a1,0x208($sp)
.L0f0241d4:
/* f0241d4: afa20128 */ sw $v0,0x128($sp)
/* f0241d8: 0c0073af */ jal func0001cebc
/* f0241d8: 0c0073af */ jal model0001cebc
/* f0241dc: afa60110 */ sw $a2,0x110($sp)
/* f0241e0: 8fa60110 */ lw $a2,0x110($sp)
/* f0241e4: 8fa20128 */ lw $v0,0x128($sp)
@@ -9632,7 +9632,7 @@ glabel var7f1a87d8
/* f024230: 0fc1a5c4 */ jal colourTween
/* f024234: 260500fc */ addiu $a1,$s0,0xfc
.L0f024238:
/* f024238: 0c006a7a */ jal func0001a9e8
/* f024238: 0c006a7a */ jal model0001a9e8
/* f02423c: 8fa40208 */ lw $a0,0x208($sp)
/* f024240: 8fac0250 */ lw $t4,0x250($sp)
/* f024244: 8d87001c */ lw $a3,0x1c($t4)
@@ -10116,7 +10116,7 @@ glabel var7f1a87d8
/* f022f50: 10000009 */ beqz $zero,.NB0f022f78
/* f022f54: 00003825 */ or $a3,$zero,$zero
.NB0f022f58:
/* f022f58: 0c007000 */ jal func0001af80
/* f022f58: 0c007000 */ jal model0001af80
/* f022f5c: 8fa40208 */ lw $a0,0x208($sp)
/* f022f60: 8fa40250 */ lw $a0,0x250($sp)
/* f022f64: 44060000 */ mfc1 $a2,$f0
@@ -10281,7 +10281,7 @@ glabel var7f1a87d8
/* f0231ac: 15610014 */ bne $t3,$at,.NB0f023200
/* f0231b0: 00000000 */ sll $zero,$zero,0x0
.NB0f0231b4:
/* f0231b4: 0c007000 */ jal func0001af80
/* f0231b4: 0c007000 */ jal model0001af80
/* f0231b8: 8fa40208 */ lw $a0,0x208($sp)
/* f0231bc: 8fa40250 */ lw $a0,0x250($sp)
/* f0231c0: 44060000 */ mfc1 $a2,$f0
@@ -10296,7 +10296,7 @@ glabel var7f1a87d8
/* f0231e4: a300000b */ sb $zero,0xb($t8)
/* f0231e8: 0c006f63 */ jal modelGetRootPosition
/* f0231ec: afa20204 */ sw $v0,0x204($sp)
/* f0231f0: 0c00710f */ jal func0001b3bc
/* f0231f0: 0c00710f */ jal model0001b3bc
/* f0231f4: 8fa40208 */ lw $a0,0x208($sp)
/* f0231f8: 1000012c */ beqz $zero,.NB0f0236ac
/* f0231fc: 8fa70204 */ lw $a3,0x204($sp)
@@ -10307,7 +10307,7 @@ glabel var7f1a87d8
/* f02320c: 0fc08709 */ jal func0f0220ec
/* f023210: 24060001 */ addiu $a2,$zero,0x1
.NB0f023214:
/* f023214: 0c007000 */ jal func0001af80
/* f023214: 0c007000 */ jal model0001af80
/* f023218: 8fa40208 */ lw $a0,0x208($sp)
/* f02321c: 8fa40250 */ lw $a0,0x250($sp)
/* f023220: 44060000 */ mfc1 $a2,$f0
@@ -10350,7 +10350,7 @@ glabel var7f1a87d8
/* f0232a4: 8e0c002c */ lw $t4,0x2c($s0)
/* f0232a8: 55800022 */ bnezl $t4,.NB0f023334
/* f0232ac: 24010001 */ addiu $at,$zero,0x1
/* f0232b0: 0c007000 */ jal func0001af80
/* f0232b0: 0c007000 */ jal model0001af80
/* f0232b4: 8fa40208 */ lw $a0,0x208($sp)
/* f0232b8: 8fa40250 */ lw $a0,0x250($sp)
/* f0232bc: 44060000 */ mfc1 $a2,$f0
@@ -10398,7 +10398,7 @@ glabel var7f1a87d8
/* f023358: 00000000 */ sll $zero,$zero,0x0
/* f02335c: 0fc08709 */ jal func0f0220ec
/* f023360: 24060001 */ addiu $a2,$zero,0x1
/* f023364: 0c007000 */ jal func0001af80
/* f023364: 0c007000 */ jal model0001af80
/* f023368: 8fa40208 */ lw $a0,0x208($sp)
/* f02336c: 8fa40250 */ lw $a0,0x250($sp)
/* f023370: 44060000 */ mfc1 $a2,$f0
@@ -10408,7 +10408,7 @@ glabel var7f1a87d8
/* f023380: 100000ca */ beqz $zero,.NB0f0236ac
/* f023384: 00403825 */ or $a3,$v0,$zero
.NB0f023388:
/* f023388: 0c007000 */ jal func0001af80
/* f023388: 0c007000 */ jal model0001af80
/* f02338c: 8fa40208 */ lw $a0,0x208($sp)
/* f023390: 8fa40250 */ lw $a0,0x250($sp)
/* f023394: 44060000 */ mfc1 $a2,$f0
@@ -10496,7 +10496,7 @@ glabel var7f1a87d8
/* f0234c0: 24010005 */ addiu $at,$zero,0x5
/* f0234c4: 1461000a */ bne $v1,$at,.NB0f0234f0
/* f0234c8: 8fae0250 */ lw $t6,0x250($sp)
/* f0234cc: 0c007000 */ jal func0001af80
/* f0234cc: 0c007000 */ jal model0001af80
/* f0234d0: 8fa40208 */ lw $a0,0x208($sp)
/* f0234d4: 8fa40250 */ lw $a0,0x250($sp)
/* f0234d8: 44060000 */ mfc1 $a2,$f0
@@ -10539,7 +10539,7 @@ glabel var7f1a87d8
/* f023560: a180000b */ sb $zero,0xb($t4)
/* f023564: 0fc08709 */ jal func0f0220ec
/* f023568: 8fa501fc */ lw $a1,0x1fc($sp)
/* f02356c: 0c007000 */ jal func0001af80
/* f02356c: 0c007000 */ jal model0001af80
/* f023570: 8fa40208 */ lw $a0,0x208($sp)
/* f023574: 8fa40250 */ lw $a0,0x250($sp)
/* f023578: 44060000 */ mfc1 $a2,$f0
@@ -10615,7 +10615,7 @@ glabel var7f1a87d8
/* f023684: 10000009 */ beqz $zero,.NB0f0236ac
/* f023688: 00003825 */ or $a3,$zero,$zero
.NB0f02368c:
/* f02368c: 0c007000 */ jal func0001af80
/* f02368c: 0c007000 */ jal model0001af80
/* f023690: 8fa40208 */ lw $a0,0x208($sp)
/* f023694: 8fa40250 */ lw $a0,0x250($sp)
/* f023698: 44060000 */ mfc1 $a2,$f0
@@ -10985,7 +10985,7 @@ glabel var7f1a87d8
/* f023be8: 8fa50208 */ lw $a1,0x208($sp)
.NB0f023bec:
/* f023bec: afa20128 */ sw $v0,0x128($sp)
/* f023bf0: 0c0077cf */ jal func0001cebc
/* f023bf0: 0c0077cf */ jal model0001cebc
/* f023bf4: afa60110 */ sw $a2,0x110($sp)
/* f023bf8: 8fa60110 */ lw $a2,0x110($sp)
/* f023bfc: 8fa20128 */ lw $v0,0x128($sp)
@@ -11011,7 +11011,7 @@ glabel var7f1a87d8
/* f023c48: 0fc1a25f */ jal colourTween
/* f023c4c: 260500fc */ addiu $a1,$s0,0xfc
.NB0f023c50:
/* f023c50: 0c006ed6 */ jal func0001a9e8
/* f023c50: 0c006ed6 */ jal model0001a9e8
/* f023c54: 8fa40208 */ lw $a0,0x208($sp)
/* f023c58: 8fae0250 */ lw $t6,0x250($sp)
/* f023c5c: 8dc7001c */ lw $a3,0x1c($t6)
@@ -11626,7 +11626,7 @@ glabel var7f1a87f8
.L0f024bb8:
/* f024bb8: 10400120 */ beqz $v0,.L0f02503c
/* f024bbc: 00003025 */ or $a2,$zero,$zero
/* f024bc0: 0c006973 */ jal func0001a5cc
/* f024bc0: 0c006973 */ jal model0001a5cc
/* f024bc4: 8c500004 */ lw $s0,0x4($v0)
/* f024bc8: 3c098006 */ lui $t1,%hi(var80062964)
/* f024bcc: 8d292964 */ lw $t1,%lo(var80062964)($t1)
@@ -12083,7 +12083,7 @@ Gfx *chrRender(struct prop *prop, Gfx *gdl, bool withalpha)
bodyGetBloodColour(chr->bodynum, spec, NULL);
func0f0246e4(spec);
alpha *= func0f08e6bc(prop, func0001af80(model));
alpha *= func0f08e6bc(prop, model0001af80(model));
if (g_Vars.currentplayer->visionmode == VISIONMODE_XRAY) {
f32 fadedist;
@@ -12430,7 +12430,7 @@ glabel func0f0260c4
/* f026120: 25cf0014 */ addiu $t7,$t6,0x14
/* f026124: afaf00cc */ sw $t7,0xcc($sp)
/* f026128: afa000c0 */ sw $zero,0xc0($sp)
/* f02612c: 0c0069d0 */ jal func0001a740
/* f02612c: 0c0069d0 */ jal model0001a740
/* f026130: 02602025 */ or $a0,$s3,$zero
/* f026134: 8fa40128 */ lw $a0,0x128($sp)
/* f026138: 00402825 */ or $a1,$v0,$zero
@@ -12592,7 +12592,7 @@ glabel func0f0260c4
/* f026380: 3c0100ff */ lui $at,0xff
/* f026384: 3421ffff */ ori $at,$at,0xffff
/* f026388: 0041c824 */ and $t9,$v0,$at
/* f02638c: 0c00698d */ jal func0001a634
/* f02638c: 0c00698d */ jal model0001a634
/* f026390: 00192982 */ srl $a1,$t9,0x6
/* f026394: afa20100 */ sw $v0,0x100($sp)
/* f026398: 8fa40128 */ lw $a0,0x128($sp)
@@ -12622,13 +12622,13 @@ glabel func0f0260c4
/* f0263f4: 1000ff91 */ b .L0f02623c
/* f0263f8: 27de0008 */ addiu $s8,$s8,0x8
.L0f0263fc:
/* f0263fc: 0c0071e1 */ jal func0001c784
/* f0263fc: 0c0071e1 */ jal model0001c784
/* f026400: afa50110 */ sw $a1,0x110($sp)
/* f026404: 8fa50110 */ lw $a1,0x110($sp)
/* f026408: 1000000a */ b .L0f026434
/* f02640c: 8ca20014 */ lw $v0,0x14($a1)
.L0f026410:
/* f026410: 0c0071f4 */ jal func0001c7d0
/* f026410: 0c0071f4 */ jal model0001c7d0
/* f026414: afa50110 */ sw $a1,0x110($sp)
/* f026418: 8fa50110 */ lw $a1,0x110($sp)
/* f02641c: 10000005 */ b .L0f026434
@@ -12886,7 +12886,7 @@ glabel func0f0260c4
/* f0267a8: 3c0100ff */ lui $at,0xff
/* f0267ac: 3421ffff */ ori $at,$at,0xffff
/* f0267b0: 00417024 */ and $t6,$v0,$at
/* f0267b4: 0c00698d */ jal func0001a634
/* f0267b4: 0c00698d */ jal model0001a634
/* f0267b8: 000e2982 */ srl $a1,$t6,0x6
/* f0267bc: afa20100 */ sw $v0,0x100($sp)
/* f0267c0: 8fa40128 */ lw $a0,0x128($sp)
@@ -12908,14 +12908,14 @@ glabel func0f0260c4
/* f0267f8: 1000ff5b */ b .L0f026568
/* f0267fc: 27de0008 */ addiu $s8,$s8,0x8
.L0f026800:
/* f026800: 0c0071e1 */ jal func0001c784
/* f026800: 0c0071e1 */ jal model0001c784
/* f026804: afa50110 */ sw $a1,0x110($sp)
/* f026808: 8fa50110 */ lw $a1,0x110($sp)
/* f02680c: 8fa40128 */ lw $a0,0x128($sp)
/* f026810: 1000000c */ b .L0f026844
/* f026814: 8ca20014 */ lw $v0,0x14($a1)
.L0f026818:
/* f026818: 0c0071f4 */ jal func0001c7d0
/* f026818: 0c0071f4 */ jal model0001c7d0
/* f02681c: afa50110 */ sw $a1,0x110($sp)
/* f026820: 8fa50110 */ lw $a1,0x110($sp)
/* f026824: 8fa40128 */ lw $a0,0x128($sp)
@@ -13030,7 +13030,7 @@ glabel var7f1a8944
/* f026918: 25cf0014 */ addiu $t7,$t6,0x14
/* f02691c: afaf00b8 */ sw $t7,0xb8($sp)
/* f026920: afa000ac */ sw $zero,0xac($sp)
/* f026924: 0c0069d0 */ jal func0001a740
/* f026924: 0c0069d0 */ jal model0001a740
/* f026928: 02802025 */ or $a0,$s4,$zero
/* f02692c: 8fa40120 */ lw $a0,0x120($sp)
/* f026930: 00402825 */ or $a1,$v0,$zero
@@ -13190,7 +13190,7 @@ glabel var7f1a8944
/* f026b70: 3c0100ff */ lui $at,0xff
/* f026b74: 3421ffff */ ori $at,$at,0xffff
/* f026b78: 0041c824 */ and $t9,$v0,$at
/* f026b7c: 0c00698d */ jal func0001a634
/* f026b7c: 0c00698d */ jal model0001a634
/* f026b80: 00192982 */ srl $a1,$t9,0x6
/* f026b84: afa200ec */ sw $v0,0xec($sp)
/* f026b88: 8fa40120 */ lw $a0,0x120($sp)
@@ -13220,13 +13220,13 @@ glabel var7f1a8944
/* f026be4: 1000ff91 */ b .L0f026a2c
/* f026be8: 27de0008 */ addiu $s8,$s8,0x8
.L0f026bec:
/* f026bec: 0c0071e1 */ jal func0001c784
/* f026bec: 0c0071e1 */ jal model0001c784
/* f026bf0: afa500fc */ sw $a1,0xfc($sp)
/* f026bf4: 8fa500fc */ lw $a1,0xfc($sp)
/* f026bf8: 1000000a */ b .L0f026c24
/* f026bfc: 8ca20014 */ lw $v0,0x14($a1)
.L0f026c00:
/* f026c00: 0c0071f4 */ jal func0001c7d0
/* f026c00: 0c0071f4 */ jal model0001c7d0
/* f026c04: afa500fc */ sw $a1,0xfc($sp)
/* f026c08: 8fa500fc */ lw $a1,0xfc($sp)
/* f026c0c: 10000005 */ b .L0f026c24
@@ -13503,7 +13503,7 @@ glabel var7f1a8944
/* f026fdc: 8fcf0004 */ lw $t7,0x4($s8)
/* f026fe0: 8fa40120 */ lw $a0,0x120($sp)
/* f026fe4: 01e61024 */ and $v0,$t7,$a2
/* f026fe8: 0c00698d */ jal func0001a634
/* f026fe8: 0c00698d */ jal model0001a634
/* f026fec: 00022982 */ srl $a1,$v0,0x6
/* f026ff0: afa200ec */ sw $v0,0xec($sp)
/* f026ff4: 8fa40120 */ lw $a0,0x120($sp)
@@ -13525,13 +13525,13 @@ glabel var7f1a8944
/* f02702c: 1000ff67 */ b .L0f026dcc
/* f027030: 27de0008 */ addiu $s8,$s8,0x8
/* f027034: 00e02025 */ or $a0,$a3,$zero
/* f027038: 0c0071e1 */ jal func0001c784
/* f027038: 0c0071e1 */ jal model0001c784
/* f02703c: afa500fc */ sw $a1,0xfc($sp)
/* f027040: 8fa70120 */ lw $a3,0x120($sp)
/* f027044: 1000000c */ b .L0f027078
/* f027048: 8fa500fc */ lw $a1,0xfc($sp)
/* f02704c: 00e02025 */ or $a0,$a3,$zero
/* f027050: 0c0071f4 */ jal func0001c7d0
/* f027050: 0c0071f4 */ jal model0001c7d0
/* f027054: afa500fc */ sw $a1,0xfc($sp)
/* f027058: 8fa70120 */ lw $a3,0x120($sp)
/* f02705c: 10000006 */ b .L0f027078
@@ -14026,7 +14026,7 @@ glabel func0f0270f4
/* f027744: 3c0100ff */ lui $at,0xff
/* f027748: 3421ffff */ ori $at,$at,0xffff
/* f02774c: 0041c024 */ and $t8,$v0,$at
/* f027750: 0c00698d */ jal func0001a634
/* f027750: 0c00698d */ jal model0001a634
/* f027754: 00182982 */ srl $a1,$t8,0x6
/* f027758: afa20080 */ sw $v0,0x80($sp)
/* f02775c: 8fa40094 */ lw $a0,0x94($sp)
@@ -14074,14 +14074,14 @@ glabel func0f0270f4
/* f0277e8: 10000012 */ b .L0f027834
/* f0277ec: 8ca20014 */ lw $v0,0x14($a1)
.L0f0277f0:
/* f0277f0: 0c0071e1 */ jal func0001c784
/* f0277f0: 0c0071e1 */ jal model0001c784
/* f0277f4: afa500a4 */ sw $a1,0xa4($sp)
/* f0277f8: 8fa500a4 */ lw $a1,0xa4($sp)
/* f0277fc: 8fa40094 */ lw $a0,0x94($sp)
/* f027800: 1000000c */ b .L0f027834
/* f027804: 8ca20014 */ lw $v0,0x14($a1)
.L0f027808:
/* f027808: 0c0071f4 */ jal func0001c7d0
/* f027808: 0c0071f4 */ jal model0001c7d0
/* f02780c: afa500a4 */ sw $a1,0xa4($sp)
/* f027810: 8fa500a4 */ lw $a1,0xa4($sp)
/* f027814: 8fa40094 */ lw $a0,0x94($sp)
@@ -14137,12 +14137,12 @@ f32 func0f0278a4(struct chrdata *chr)
f32 highest = 0;
if (chr->model) {
result = func0001af80(chr->model);
result = model0001af80(chr->model);
for (i = 0; i < 2; i++) {
if (chr->weapons_held[i]) {
struct defaultobj *obj = chr->weapons_held[i]->obj;
f32 value = func0001af80(obj->model) * chr->model->scale;
f32 value = model0001af80(obj->model) * chr->model->scale;
if (value > highest) {
highest = value;
@@ -14179,7 +14179,7 @@ void func0f027994(struct prop *prop, struct shotdata *shotdata, bool arg2, bool
struct hitthing sp88;
s32 sp84 = 0;
struct modelnode *sp80 = NULL;
Mtxf *iVar5 = func0001a60c(model);
Mtxf *iVar5 = model0001a60c(model);
struct prop *next;
struct prop *child;
s32 sp70;
@@ -14205,7 +14205,7 @@ void func0f027994(struct prop *prop, struct shotdata *shotdata, bool arg2, bool
}
if (arg3 || var8005efc0 > 0.0f) {
spc0 = func000225d4(model, &shotdata->unk00, &shotdata->unk0c, &node);
spc0 = model000225d4(model, &shotdata->unk00, &shotdata->unk0c, &node);
while (spc0 > 0) {
if (func0f084594(model, node, &shotdata->unk00, &shotdata->unk0c, &sp88, &sp84, &sp80)) {
@@ -14216,10 +14216,10 @@ void func0f027994(struct prop *prop, struct shotdata *shotdata, bool arg2, bool
break;
}
spc0 = func000225d4(model, &shotdata->unk00, &shotdata->unk0c, &node);
spc0 = model000225d4(model, &shotdata->unk00, &shotdata->unk0c, &node);
}
} else {
spc0 = func000225d4(model, &shotdata->unk00, &shotdata->unk0c, &node);
spc0 = model000225d4(model, &shotdata->unk00, &shotdata->unk0c, &node);
if (spc0 > 0) {
if (func0f06bea0(model, model->filedata->rootnode, model->filedata->rootnode, &shotdata->unk00,
@@ -14626,7 +14626,7 @@ glabel func0f027e1c
.L0f028374:
/* f028374: 8e240048 */ lw $a0,0x48($s1)
/* f028378: 8e25000c */ lw $a1,0xc($s1)
/* f02837c: 0c006973 */ jal func0001a5cc
/* f02837c: 0c006973 */ jal model0001a5cc
/* f028380: afa30068 */ sw $v1,0x68($sp)
/* f028384: 00402025 */ or $a0,$v0,$zero
/* f028388: 0c005c67 */ jal mtx0001719c
@@ -15067,7 +15067,7 @@ glabel func0f027e1c
.NB0f027d88:
/* f027d88: 8e240048 */ lw $a0,0x48($s1)
/* f027d8c: 8e25000c */ lw $a1,0xc($s1)
/* f027d90: 0c006dcf */ jal func0001a5cc
/* f027d90: 0c006dcf */ jal model0001a5cc
/* f027d94: afa30068 */ sw $v1,0x68($sp)
/* f027d98: 00402025 */ or $a0,$v0,$zero
/* f027d9c: 0c006082 */ jal mtx0001719c
@@ -15560,7 +15560,7 @@ glabel func0f028a50
bool func0f028d50(struct prop *arg0, struct prop *arg1, struct modelnode *node, struct model *model, s32 *total)
{
if (arg1 == arg0) {
*total += func0001a524(node, 0);
*total += model0001a524(node, 0);
return true;
}
@@ -15647,7 +15647,7 @@ glabel func0f028e6c
/* f028f30: ae500000 */ sw $s0,0x0($s2)
.L0f028f34:
/* f028f34: afa40040 */ sw $a0,0x40($sp)
/* f028f38: 0c00698d */ jal func0001a634
/* f028f38: 0c00698d */ jal model0001a634
/* f028f3c: 02202825 */ or $a1,$s1,$zero
/* f028f40: 8fa40040 */ lw $a0,0x40($sp)
/* f028f44: ae620000 */ sw $v0,0x0($s3)
@@ -15697,7 +15697,7 @@ glabel func0f028e6c
// }
// } else {
// *propptr = prop;
// *nodeptr = func0001a634(model, arg0);
// *nodeptr = model0001a634(model, arg0);
// *modelptr = model;
// result = true;
// }
@@ -16022,7 +16022,7 @@ s32 func0f02932c(struct prop *prop, s32 arg1)
struct model *model;
if (func0f028e6c(arg1, prop, &prop2, &node, &model) && node) {
node2 = func0001a784(node);
node2 = model0001a784(node);
if (node2) {
result = func0f028e18(prop2, node2, model, prop);
@@ -16054,7 +16054,7 @@ glabel func0f0293ec
/* f029428: 8fa40030 */ lw $a0,0x30($sp)
/* f02942c: 50800023 */ beqzl $a0,.L0f0294bc
/* f029430: 8fbf001c */ lw $ra,0x1c($sp)
/* f029434: 0c0069f3 */ jal func0001a7cc
/* f029434: 0c0069f3 */ jal model0001a7cc
/* f029438: afa3003c */ sw $v1,0x3c($sp)
/* f02943c: 8fa3003c */ lw $v1,0x3c($sp)
/* f029440: 10400007 */ beqz $v0,.L0f029460
@@ -16118,7 +16118,7 @@ glabel func0f0294cc
/* f029504: 8fa40030 */ lw $a0,0x30($sp)
/* f029508: 50800037 */ beqzl $a0,.L0f0295e8
/* f02950c: 8fbf001c */ lw $ra,0x1c($sp)
/* f029510: 0c006a17 */ jal func0001a85c
/* f029510: 0c006a17 */ jal model0001a85c
/* f029514: 00000000 */ nop
/* f029518: 10400007 */ beqz $v0,.L0f029538
/* f02951c: 00402825 */ or $a1,$v0,$zero
@@ -16129,7 +16129,7 @@ glabel func0f0294cc
/* f029530: 1000002c */ b .L0f0295e4
/* f029534: afa2003c */ sw $v0,0x3c($sp)
.L0f029538:
/* f029538: 0c0069e1 */ jal func0001a784
/* f029538: 0c0069e1 */ jal model0001a784
/* f02953c: 8fa40030 */ lw $a0,0x30($sp)
/* f029540: 14400028 */ bnez $v0,.L0f0295e4
/* f029544: 8fb80034 */ lw $t8,0x34($sp)
@@ -16370,7 +16370,7 @@ glabel var7f1a9ba0pf
.PF0f029aa0:
/* f029aa0: 00002825 */ move $a1,$zero
/* f029aa4: e7a20170 */ swc1 $f2,0x170($sp)
/* f029aa8: 0c0068ad */ jal func0001a524
/* f029aa8: 0c0068ad */ jal model0001a524
/* f029aac: e7ae016c */ swc1 $f14,0x16c($sp)
/* f029ab0: c7a20170 */ lwc1 $f2,0x170($sp)
/* f029ab4: c6680004 */ lwc1 $f8,0x4($s3)
@@ -18526,7 +18526,7 @@ glabel var7f1a8980
.L0f02997c:
/* f02997c: 00002825 */ or $a1,$zero,$zero
/* f029980: e7a20170 */ swc1 $f2,0x170($sp)
/* f029984: 0c006949 */ jal func0001a524
/* f029984: 0c006949 */ jal model0001a524
/* f029988: e7ae016c */ swc1 $f14,0x16c($sp)
/* f02998c: c7a20170 */ lwc1 $f2,0x170($sp)
/* f029990: c6680004 */ lwc1 $f8,0x4($s3)
@@ -21198,11 +21198,11 @@ glabel func0f02bdf8
/* f02c108: 2aa10014 */ slti $at,$s5,0x14
/* f02c10c: 502000e6 */ beqzl $at,.L0f02c4a8
/* f02c110: 8e020014 */ lw $v0,0x14($s0)
/* f02c114: 0c0069d0 */ jal func0001a740
/* f02c114: 0c0069d0 */ jal model0001a740
/* f02c118: 02002025 */ or $a0,$s0,$zero
/* f02c11c: 02e02025 */ or $a0,$s7,$zero
/* f02c120: 00402825 */ or $a1,$v0,$zero
/* f02c124: 0c006973 */ jal func0001a5cc
/* f02c124: 0c006973 */ jal model0001a5cc
/* f02c128: 00003025 */ or $a2,$zero,$zero
/* f02c12c: c4440030 */ lwc1 $f4,0x30($v0)
/* f02c130: 27a400d4 */ addiu $a0,$sp,0xd4
+14 -14
View File
@@ -10052,7 +10052,7 @@ f32 chrGetInverseTheta(struct chrdata *chr)
return angle;
}
return func0001ae44(chr->model);
return model0001ae44(chr->model);
}
void chrSetLookAngle(struct chrdata *chr, f32 angle)
@@ -10060,7 +10060,7 @@ void chrSetLookAngle(struct chrdata *chr, f32 angle)
if (chr->aibot) {
chr->aibot->unk0b0 = angle;
} else {
func0001ae90(chr->model, angle);
model0001ae90(chr->model, angle);
}
}
@@ -10070,7 +10070,7 @@ f32 func0f03e578(struct chrdata *chr)
return chr->aibot->unk0a4;
}
return func0001ae44(chr->model);
return model0001ae44(chr->model);
}
void func0f03e5b0(struct chrdata *chr, f32 arg1)
@@ -10078,7 +10078,7 @@ void func0f03e5b0(struct chrdata *chr, f32 arg1)
if (chr->aibot) {
chr->aibot->unk0a4 = arg1;
} else {
func0001ae90(chr->model, arg1);
model0001ae90(chr->model, arg1);
}
}
@@ -10905,7 +10905,7 @@ glabel var7f1a8fc8
/* f03f314: 00402825 */ or $a1,$v0,$zero
/* f03f318: 00e02025 */ or $a0,$a3,$zero
/* f03f31c: 00003025 */ or $a2,$zero,$zero
/* f03f320: 0c006973 */ jal func0001a5cc
/* f03f320: 0c006973 */ jal model0001a5cc
/* f03f324: afa20110 */ sw $v0,0x110($sp)
/* f03f328: 8fa50110 */ lw $a1,0x110($sp)
/* f03f32c: afa20108 */ sw $v0,0x108($sp)
@@ -10949,7 +10949,7 @@ glabel var7f1a8fc8
/* f03f3c0: 10400017 */ beqz $v0,.L0f03f420
/* f03f3c4: 00402825 */ or $a1,$v0,$zero
/* f03f3c8: 00e02025 */ or $a0,$a3,$zero
/* f03f3cc: 0c006973 */ jal func0001a5cc
/* f03f3cc: 0c006973 */ jal model0001a5cc
/* f03f3d0: 00003025 */ or $a2,$zero,$zero
/* f03f3d4: afa200b0 */ sw $v0,0xb0($sp)
/* f03f3d8: 0fc2d4e9 */ jal func0f0b53a4
@@ -11508,7 +11508,7 @@ bool func0f03fde4(struct chrdata *chr, s32 handnum, struct coord *arg2)
if ((chr->prop->flags & PROPFLAG_ONSCREEN) && (weaponprop->flags & PROPFLAG_ONSCREEN)) {
if ((part0 = modelGetPart(model->filedata, MODELPART_0000))) {
spac = func0001a5cc(model, part0, 0);
spac = model0001a5cc(model, part0, 0);
rodata = &part0->rodata->gunfire;
arg2->x = rodata->pos.x;
@@ -11519,7 +11519,7 @@ bool func0f03fde4(struct chrdata *chr, s32 handnum, struct coord *arg2)
mtx00015b64(&sp6c, arg2);
result = true;
} else if ((part1 = modelGetPart(model->filedata, MODELPART_0001))) {
sp64 = func0001a5cc(model, part1, 0);
sp64 = model0001a5cc(model, part1, 0);
mtx00015be4(currentPlayerGetUnk174c(), sp64, &sp24);
@@ -11588,7 +11588,7 @@ void chrCalculateShieldHit(struct chrdata *chr, struct coord *pos, struct coord
while (node) {
if ((node->type & 0xff) == MODELNODETYPE_BBOX) {
mtxptr1 = func0001a5cc(chr->model, node, 0);
mtxptr1 = model0001a5cc(chr->model, node, 0);
if (isdifferentmtx) {
mtx00016798(mtxptr1, &spc8);
@@ -11636,7 +11636,7 @@ void chrCalculateShieldHit(struct chrdata *chr, struct coord *pos, struct coord
*modelptr = chr->model;
*sideptr = 0;
mtxptr2 = func0001a5cc(chr->model, bestnode, 0);
mtxptr2 = model0001a5cc(chr->model, bestnode, 0);
if (isdifferentmtx) {
mtx00016798(mtxptr2, &sp48);
@@ -17204,7 +17204,7 @@ void func0f0429d8(struct chrdata *chr, f32 arg1, f32 arg2)
{
struct prop *prop = chrGetTargetProp(chr);
f32 distance = atan2f(prop->pos.x - chr->prop->pos.x, prop->pos.z - chr->prop->pos.z);
f32 value = func0001afe8(arg2, distance, arg1);
f32 value = model0001afe8(arg2, distance, arg1);
chrSetLookAngle(chr, value);
}
@@ -22040,7 +22040,7 @@ void chrTickSkJump(struct chrdata *chr)
switch (chr->act_skjump.state) {
case SKJUMPSTATE_TAKEOFF:
fVar6 = chrGetInverseTheta(chr);
fVar5 = func0001afe8(fVar6, chr->act_skjump.roty, 0.35);
fVar5 = model0001afe8(fVar6, chr->act_skjump.roty, 0.35);
chrSetLookAngle(chr, fVar5);
frame = modelGetCurAnimFrame(chr->model);
@@ -24547,7 +24547,7 @@ bool chrCanSeeTargetWithExtraCheck(struct chrdata *chr)
struct coord sp68;
struct coord sp56;
struct coord sp44;
f32 somefloat = func0001af80(model) * 0.8f;
f32 somefloat = model0001af80(model) * 0.8f;
bgun0f0a0c08(&sp68, &sp56);
modelGetRootPosition(model, &sp44);
@@ -27528,7 +27528,7 @@ void chrAvoid(struct chrdata *chr)
f32 xdiff;
f32 zdiff;
f32 halfchrwidth;
f32 chrangle = func0001ae44(chr->model);
f32 chrangle = model0001ae44(chr->model);
s16 dstrooms[8];
struct coord dstpos;
+2 -2
View File
@@ -101,11 +101,11 @@ void currentPlayerInitAnimation(void)
modelSetAnimation(&g_Vars.currentplayer->model, 1, 0, 0, 0.5f, 0);
func0001b3bc(&g_Vars.currentplayer->model);
model0001b3bc(&g_Vars.currentplayer->model);
mtx000159b0(&sp48);
sp88.matrix = &sp48;
sp88.unk10 = g_Vars.currentplayer->bondheadmatrices;
func0001cebc(&sp88, &g_Vars.currentplayer->model);
model0001cebc(&sp88, &g_Vars.currentplayer->model);
g_Vars.currentplayer->standheight = g_Vars.currentplayer->bondheadmatrices[0].m[3][1];
+2 -2
View File
@@ -220,10 +220,10 @@ void aibotAllocate(s32 chrnum, s32 aibotnum)
aibot->unk0e4[1] = 0.0f;
aibot->unk0e4[0] = 0.0f;
aibot->unk0a4 = func0001ae44(chr->model);
aibot->unk0a4 = model0001ae44(chr->model);
aibot->angleoffset = 0.0f;
aibot->speedtheta = 0.0f;
aibot->unk0b0 = func0001ae44(chr->model);
aibot->unk0b0 = model0001ae44(chr->model);
aibot->unk0b4 = 0.0f;
aibot->unk0b8 = 0.0f;
+1 -1
View File
@@ -758,7 +758,7 @@ glabel func0f0b32a0
/* f0b32b0: afa5001c */ sw $a1,0x1c($sp)
/* f0b32b4: 8c850008 */ lw $a1,0x8($a0)
/* f0b32b8: afa40018 */ sw $a0,0x18($sp)
/* f0b32bc: 0c008c42 */ jal func00023108
/* f0b32bc: 0c008c42 */ jal model00023108
/* f0b32c0: 8fa70020 */ lw $a3,0x20($sp)
/* f0b32c4: 8fae0020 */ lw $t6,0x20($sp)
/* f0b32c8: 8fa40018 */ lw $a0,0x18($sp)
+1 -1
View File
@@ -1405,7 +1405,7 @@ void currentPlayerSpawn(void)
if (g_Vars.lvframenum > 0
&& (g_ChrSlots[i].hidden & CHRHFLAG_00800000)
&& func0f06b39c(&sp78, &sp90, &g_ChrSlots[i].prop->pos, func0001af80(g_ChrSlots[i].model))
&& func0f06b39c(&sp78, &sp90, &g_ChrSlots[i].prop->pos, model0001af80(g_ChrSlots[i].model))
&& (random() % 8)) {
sqdist += 1000000;
}
+16 -16
View File
@@ -6349,7 +6349,7 @@ glabel var7f1b3c40pf
/* f0f50f0: 8fa4003c */ lw $a0,0x3c($sp)
/* f0f50f4: 468031a0 */ cvt.s.w $f6,$f6
/* f0f50f8: 44053000 */ mfc1 $a1,$f6
/* f0f50fc: 0c00777a */ jal func0001e018
/* f0f50fc: 0c00777a */ jal model0001e018
/* f0f5100: 00000000 */ nop
/* f0f5104: 10000008 */ b .PF0f0f5128
/* f0f5108: 860c005c */ lh $t4,0x5c($s0)
@@ -6371,7 +6371,7 @@ glabel var7f1b3c40pf
/* f0f5138: 3c05800a */ lui $a1,0x800a
/* f0f513c: 8ca5a550 */ lw $a1,-0x5ab0($a1)
/* f0f5140: 8fa4003c */ lw $a0,0x3c($sp)
/* f0f5144: 0c007afa */ jal func0001ee18
/* f0f5144: 0c007afa */ jal model0001ee18
/* f0f5148: 24060001 */ li $a2,0x1
/* f0f514c: 8e1905b0 */ lw $t9,0x5b0($s0)
/* f0f5150: 00196ac0 */ sll $t5,$t9,0xb
@@ -6415,7 +6415,7 @@ glabel var7f1b3c40pf
/* f0f51d8: 8fa5003c */ lw $a1,0x3c($sp)
/* f0f51dc: afaa03b8 */ sw $t2,0x3b8($sp)
/* f0f51e0: 8e0b006c */ lw $t3,0x6c($s0)
/* f0f51e4: 0c007323 */ jal func0001cebc
/* f0f51e4: 0c007323 */ jal model0001cebc
/* f0f51e8: afab03c8 */ sw $t3,0x3c8($sp)
/* f0f51ec: 8e040054 */ lw $a0,0x54($s0)
/* f0f51f0: 3c0c8008 */ lui $t4,0x8008
@@ -6484,7 +6484,7 @@ glabel var7f1b3c40pf
/* f0f52dc: 24050002 */ li $a1,0x2
/* f0f52e0: 10400019 */ beqz $v0,.PF0f0f5348
/* f0f52e4: 00402025 */ move $a0,$v0
/* f0f52e8: 0c0068ad */ jal func0001a524
/* f0f52e8: 0c0068ad */ jal model0001a524
/* f0f52ec: 00002825 */ move $a1,$zero
/* f0f52f0: afa20160 */ sw $v0,0x160($sp)
/* f0f52f4: 0c0055d0 */ jal mtx000159b0
@@ -6526,7 +6526,7 @@ glabel var7f1b3c40pf
/* f0f5380: 54410035 */ bnel $v0,$at,.PF0f0f5458
/* f0f5384: 8fad0440 */ lw $t5,0x440($sp)
.PF0f0f5388:
/* f0f5388: 0c0068ad */ jal func0001a524
/* f0f5388: 0c0068ad */ jal model0001a524
/* f0f538c: 00002825 */ move $a1,$zero
/* f0f5390: 8fb903b4 */ lw $t9,0x3b4($sp)
/* f0f5394: 00027180 */ sll $t6,$v0,0x6
@@ -7962,7 +7962,7 @@ glabel var7f1b2948
/* f0f49c0: 8fa4003c */ lw $a0,0x3c($sp)
/* f0f49c4: 468052a0 */ cvt.s.w $f10,$f10
/* f0f49c8: 44055000 */ mfc1 $a1,$f10
/* f0f49cc: 0c007806 */ jal func0001e018
/* f0f49cc: 0c007806 */ jal model0001e018
/* f0f49d0: 00000000 */ nop
/* f0f49d4: 10000008 */ b .L0f0f49f8
/* f0f49d8: 860f005c */ lh $t7,0x5c($s0)
@@ -7984,7 +7984,7 @@ glabel var7f1b2948
/* f0f4a08: 3c05800a */ lui $a1,%hi(g_Vars+0x40)
/* f0f4a0c: 8ca5a000 */ lw $a1,%lo(g_Vars+0x40)($a1)
/* f0f4a10: 8fa4003c */ lw $a0,0x3c($sp)
/* f0f4a14: 0c007b86 */ jal func0001ee18
/* f0f4a14: 0c007b86 */ jal model0001ee18
/* f0f4a18: 24060001 */ addiu $a2,$zero,0x1
/* f0f4a1c: 8e1905b0 */ lw $t9,0x5b0($s0)
/* f0f4a20: 00195ac0 */ sll $t3,$t9,0xb
@@ -8028,7 +8028,7 @@ glabel var7f1b2948
/* f0f4aa8: 8fa5003c */ lw $a1,0x3c($sp)
/* f0f4aac: afac03b8 */ sw $t4,0x3b8($sp)
/* f0f4ab0: 8e0f006c */ lw $t7,0x6c($s0)
/* f0f4ab4: 0c0073af */ jal func0001cebc
/* f0f4ab4: 0c0073af */ jal model0001cebc
/* f0f4ab8: afaf03c8 */ sw $t7,0x3c8($sp)
/* f0f4abc: 8e040054 */ lw $a0,0x54($s0)
/* f0f4ac0: 3c188008 */ lui $t8,%hi(g_ModelTypeHudPiece)
@@ -8094,7 +8094,7 @@ glabel var7f1b2948
/* f0f4b9c: 24050002 */ addiu $a1,$zero,0x2
/* f0f4ba0: 10400019 */ beqz $v0,.L0f0f4c08
/* f0f4ba4: 00402025 */ or $a0,$v0,$zero
/* f0f4ba8: 0c006949 */ jal func0001a524
/* f0f4ba8: 0c006949 */ jal model0001a524
/* f0f4bac: 00002825 */ or $a1,$zero,$zero
/* f0f4bb0: afa20160 */ sw $v0,0x160($sp)
/* f0f4bb4: 0c00566c */ jal mtx000159b0
@@ -8136,7 +8136,7 @@ glabel var7f1b2948
/* f0f4c40: 54410035 */ bnel $v0,$at,.L0f0f4d18
/* f0f4c44: 8fb80440 */ lw $t8,0x440($sp)
.L0f0f4c48:
/* f0f4c48: 0c006949 */ jal func0001a524
/* f0f4c48: 0c006949 */ jal model0001a524
/* f0f4c4c: 00002825 */ or $a1,$zero,$zero
/* f0f4c50: 8fad03b4 */ lw $t5,0x3b4($sp)
/* f0f4c54: 00027180 */ sll $t6,$v0,0x6
@@ -9344,7 +9344,7 @@ glabel var7f1b2948
/* f0f11ac: ae0c0004 */ sw $t4,0x4($s0)
/* f0f11b0: 8dc10008 */ lw $at,0x8($t6)
/* f0f11b4: ae010008 */ sw $at,0x8($s0)
/* f0f11b8: 0c00710f */ jal func0001b3bc
/* f0f11b8: 0c00710f */ jal model0001b3bc
/* f0f11bc: 8fa40040 */ lw $a0,0x40($sp)
/* f0f11c0: 8fa40040 */ lw $a0,0x40($sp)
/* f0f11c4: 0c006f63 */ jal modelGetRootPosition
@@ -9596,7 +9596,7 @@ glabel var7f1b2948
/* f0f1564: 8fa40040 */ lw $a0,0x40($sp)
/* f0f1568: 468052a0 */ cvt.s.w $f10,$f10
/* f0f156c: 44055000 */ mfc1 $a1,$f10
/* f0f1570: 0c007c2c */ jal func0001e018
/* f0f1570: 0c007c2c */ jal model0001e018
/* f0f1574: 00000000 */ sll $zero,$zero,0x0
/* f0f1578: 10000008 */ beqz $zero,.NB0f0f159c
/* f0f157c: 862d005c */ lh $t5,0x5c($s1)
@@ -9618,7 +9618,7 @@ glabel var7f1b2948
/* f0f15ac: 3c05800a */ lui $a1,0x800a
/* f0f15b0: 8ca5e700 */ lw $a1,-0x1900($a1)
/* f0f15b4: 8fa40040 */ lw $a0,0x40($sp)
/* f0f15b8: 0c007fac */ jal func0001ee18
/* f0f15b8: 0c007fac */ jal model0001ee18
/* f0f15bc: 24060001 */ addiu $a2,$zero,0x1
/* f0f15c0: 8e2c05b0 */ lw $t4,0x5b0($s1)
/* f0f15c4: 000cc2c0 */ sll $t8,$t4,0xb
@@ -9662,7 +9662,7 @@ glabel var7f1b2948
/* f0f164c: 8fa50040 */ lw $a1,0x40($sp)
/* f0f1650: afab03e0 */ sw $t3,0x3e0($sp)
/* f0f1654: 8e2d006c */ lw $t5,0x6c($s1)
/* f0f1658: 0c0077cf */ jal func0001cebc
/* f0f1658: 0c0077cf */ jal model0001cebc
/* f0f165c: afad03f0 */ sw $t5,0x3f0($sp)
/* f0f1660: 8e240054 */ lw $a0,0x54($s1)
/* f0f1664: 3c0e8008 */ lui $t6,0x8008
@@ -9728,7 +9728,7 @@ glabel var7f1b2948
/* f0f1740: 24050002 */ addiu $a1,$zero,0x2
/* f0f1744: 10400019 */ beqz $v0,.NB0f0f17ac
/* f0f1748: 00402025 */ or $a0,$v0,$zero
/* f0f174c: 0c006da5 */ jal func0001a524
/* f0f174c: 0c006da5 */ jal model0001a524
/* f0f1750: 00002825 */ or $a1,$zero,$zero
/* f0f1754: afa20164 */ sw $v0,0x164($sp)
/* f0f1758: 0c005a28 */ jal mtx000159b0
@@ -9770,7 +9770,7 @@ glabel var7f1b2948
/* f0f17e4: 54410035 */ bnel $v0,$at,.NB0f0f18bc
/* f0f17e8: 8fae0468 */ lw $t6,0x468($sp)
.NB0f0f17ec:
/* f0f17ec: 0c006da5 */ jal func0001a524
/* f0f17ec: 0c006da5 */ jal model0001a524
/* f0f17f0: 00002825 */ or $a1,$zero,$zero
/* f0f17f4: 8faa03dc */ lw $t2,0x3dc($sp)
/* f0f17f8: 0002c980 */ sll $t9,$v0,0x6
+2 -2
View File
@@ -67,10 +67,10 @@ void func0f129210(union modelrwdata *find, union modelrwdata *replacement)
}
break;
case MODELNODETYPE_DISTANCE:
func0001c784(obj->model, node);
model0001c784(obj->model, node);
break;
case MODELNODETYPE_TOGGLE:
func0001c7d0(obj->model, node);
model0001c7d0(obj->model, node);
break;
case MODELNODETYPE_HEADSPOT:
modelAttachHead(obj->model, node);
+3 -3
View File
@@ -930,10 +930,10 @@ void mpInitSimulant(struct chrdata *chr, u8 full)
thing = scenarioChooseSpawnLocation(chr->chrwidth, &pos, rooms, chr->prop);
chr->hidden |= CHRHFLAG_00100000;
chrMoveToPos(chr, &pos, rooms, thing, true);
chr->aibot->unk0a4 = func0001ae44(chr->model);
chr->aibot->unk0a4 = model0001ae44(chr->model);
chr->aibot->angleoffset = 0;
chr->aibot->speedtheta = 0;
chr->aibot->unk0b0 = func0001ae44(chr->model);
chr->aibot->unk0b0 = model0001ae44(chr->model);
chr->aibot->unk0b4 = 0;
chr->aibot->unk0b8 = 0;
func0f02e9a0(chr, 0);
@@ -2614,7 +2614,7 @@ bool func0f191448(struct chrdata *chr)
angle2 -= M_BADTAU;
}
func0001ae90(chr->model, angle2);
model0001ae90(chr->model, angle2);
return true;
}
+2 -2
View File
@@ -1183,7 +1183,7 @@ void handInflictCloseRangeDamage(s32 handnum, struct gset *gset, bool arg2)
bgunCalculateShotSpread(&spd8, &spcc, handnum, true);
if (func000225d4(model, &spd8, &spcc, &node) > 0) {
if (model000225d4(model, &spd8, &spcc, &node) > 0) {
f32 damage = gsetGetDamage(gset) * 2.5f;
skipthething = true;
bgun0f0a8404(&playerprop->pos, playerprop->rooms, -1);
@@ -5501,7 +5501,7 @@ void autoaimTick(void)
if (bestprop->flags & PROPFLAG_ONSCREEN) {
struct defaultobj *obj = bestprop->obj;
Mtxf *mtx = func0001a60c(obj->model);
Mtxf *mtx = model0001a60c(obj->model);
struct coord spac;
spac.z = mtx->m[3][2];
+74 -74
View File
@@ -1734,7 +1734,7 @@ glabel func0f0679ac
/* f067a10: 305800ff */ andi $t8,$v0,0xff
/* f067a14: 171e004c */ bne $t8,$s8,.L0f067b48
/* f067a18: 00003025 */ or $a2,$zero,$zero
/* f067a1c: 0c006973 */ jal func0001a5cc
/* f067a1c: 0c006973 */ jal model0001a5cc
/* f067a20: 8e120004 */ lw $s2,0x4($s0)
/* f067a24: 00408825 */ or $s1,$v0,$zero
/* f067a28: 02402025 */ or $a0,$s2,$zero
@@ -1884,7 +1884,7 @@ glabel func0f067bc4
/* f067c28: 305800ff */ andi $t8,$v0,0xff
/* f067c2c: 17170038 */ bne $t8,$s7,.L0f067d10
/* f067c30: 00003025 */ or $a2,$zero,$zero
/* f067c34: 0c006973 */ jal func0001a5cc
/* f067c34: 0c006973 */ jal model0001a5cc
/* f067c38: 8e120004 */ lw $s2,0x4($s0)
/* f067c3c: 1680000c */ bnez $s4,.L0f067c70
/* f067c40: 00408825 */ or $s1,$v0,$zero
@@ -2024,7 +2024,7 @@ glabel func0f067dc4
/* f067e30: 15e10058 */ bne $t7,$at,.L0f067f94
/* f067e34: 02002825 */ or $a1,$s0,$zero
/* f067e38: 8e120004 */ lw $s2,0x4($s0)
/* f067e3c: 0c006973 */ jal func0001a5cc
/* f067e3c: 0c006973 */ jal model0001a5cc
/* f067e40: 00003025 */ or $a2,$zero,$zero
/* f067e44: c4440038 */ lwc1 $f4,0x38($v0)
/* f067e48: 44803000 */ mtc1 $zero,$f6
@@ -2550,10 +2550,10 @@ struct modelnode *func0f0687e4(struct model *model)
case MODELNODETYPE_DL:
return node;
case MODELNODETYPE_DISTANCE:
func0001c784(model, node);
model0001c784(model, node);
break;
case MODELNODETYPE_TOGGLE:
func0001c7d0(model, node);
model0001c7d0(model, node);
break;
case MODELNODETYPE_HEADSPOT:
modelAttachHead(model, node);
@@ -2625,10 +2625,10 @@ struct modelnode *modelFindBboxNode(struct model *model)
case MODELNODETYPE_BBOX:
return node;
case MODELNODETYPE_DISTANCE:
func0001c784(model, node);
model0001c784(model, node);
break;
case MODELNODETYPE_TOGGLE:
func0001c7d0(model, node);
model0001c7d0(model, node);
break;
case MODELNODETYPE_HEADSPOT:
modelAttachHead(model, node);
@@ -6606,7 +6606,7 @@ glabel func0f06b610
/* f06b648: afa7013c */ sw $a3,0x13c($sp)
/* f06b64c: 8c940018 */ lw $s4,0x18($a0)
/* f06b650: 00808025 */ or $s0,$a0,$zero
/* f06b654: 0c006be0 */ jal func0001af80
/* f06b654: 0c006be0 */ jal model0001af80
/* f06b658: 02802025 */ or $a0,$s4,$zero
/* f06b65c: 8e020014 */ lw $v0,0x14($s0)
/* f06b660: afa000e4 */ sw $zero,0xe4($sp)
@@ -6664,7 +6664,7 @@ glabel func0f06b610
/* f06b72c: 45000088 */ bc1f .L0f06b950
/* f06b730: 02602825 */ or $a1,$s3,$zero
/* f06b734: 27a700e4 */ addiu $a3,$sp,0xe4
/* f06b738: 0c008975 */ jal func000225d4
/* f06b738: 0c008975 */ jal model000225d4
/* f06b73c: afa20114 */ sw $v0,0x114($sp)
/* f06b740: 18400081 */ blez $v0,.L0f06b948
/* f06b744: 0040a825 */ or $s5,$v0,$zero
@@ -6799,7 +6799,7 @@ glabel func0f06b610
.L0f06b930:
/* f06b930: 02602825 */ or $a1,$s3,$zero
/* f06b934: 02403025 */ or $a2,$s2,$zero
/* f06b938: 0c008975 */ jal func000225d4
/* f06b938: 0c008975 */ jal model000225d4
/* f06b93c: 27a700e4 */ addiu $a3,$sp,0xe4
/* f06b940: 1c40ff86 */ bgtz $v0,.L0f06b75c
/* f06b944: 0040a825 */ or $s5,$v0,$zero
@@ -6815,7 +6815,7 @@ glabel func0f06b610
.L0f06b964:
/* f06b964: 02602825 */ or $a1,$s3,$zero
/* f06b968: 02403025 */ or $a2,$s2,$zero
/* f06b96c: 0c008975 */ jal func000225d4
/* f06b96c: 0c008975 */ jal model000225d4
/* f06b970: 27a700e4 */ addiu $a3,$sp,0xe4
/* f06b974: 1840000d */ blez $v0,.L0f06b9ac
/* f06b978: 0040a825 */ or $s5,$v0,$zero
@@ -7060,7 +7060,7 @@ glabel func0f06b610
/* f06bd08: 1000001e */ b .L0f06bd84
/* f06bd0c: 8fa20114 */ lw $v0,0x114($sp)
.L0f06bd10:
/* f06bd10: 0c006be0 */ jal func0001af80
/* f06bd10: 0c006be0 */ jal model0001af80
/* f06bd14: afa20114 */ sw $v0,0x114($sp)
/* f06bd18: 8fa60114 */ lw $a2,0x114($sp)
/* f06bd1c: 44070000 */ mfc1 $a3,$f0
@@ -7293,12 +7293,12 @@ glabel var7f1aa264
/* f06bfa4: 8e110004 */ lw $s1,0x4($s0)
/* f06bfa8: 02602025 */ or $a0,$s3,$zero
/* f06bfac: 02002825 */ or $a1,$s0,$zero
/* f06bfb0: 0c006973 */ jal func0001a5cc
/* f06bfb0: 0c006973 */ jal model0001a5cc
/* f06bfb4: 00003025 */ or $a2,$zero,$zero
/* f06bfb8: 02202025 */ or $a0,$s1,$zero
/* f06bfbc: 00402825 */ or $a1,$v0,$zero
/* f06bfc0: 8fa600b4 */ lw $a2,0xb4($sp)
/* f06bfc4: 0c00883f */ jal func000220fc
/* f06bfc4: 0c00883f */ jal model000220fc
/* f06bfc8: 8fa700b8 */ lw $a3,0xb8($sp)
/* f06bfcc: 1040000d */ beqz $v0,.L0f06c004
/* f06bfd0: 3c014120 */ lui $at,0x4120
@@ -7323,12 +7323,12 @@ glabel var7f1aa264
/* f06c018: 02602025 */ or $a0,$s3,$zero
/* f06c01c: 02002825 */ or $a1,$s0,$zero
/* f06c020: 00003025 */ or $a2,$zero,$zero
/* f06c024: 0c006973 */ jal func0001a5cc
/* f06c024: 0c006973 */ jal model0001a5cc
/* f06c028: e424efc0 */ swc1 $f4,%lo(var8005efc0)($at)
/* f06c02c: 02202025 */ or $a0,$s1,$zero
/* f06c030: 00402825 */ or $a1,$v0,$zero
/* f06c034: 8fa600b4 */ lw $a2,0xb4($sp)
/* f06c038: 0c00883f */ jal func000220fc
/* f06c038: 0c00883f */ jal model000220fc
/* f06c03c: 8fa700b8 */ lw $a3,0xb8($sp)
/* f06c040: 5040000b */ beqzl $v0,.L0f06c070
/* f06c044: 3c014020 */ lui $at,0x4020
@@ -7394,12 +7394,12 @@ glabel var7f1aa264
/* f06c120: 1000000e */ b .L0f06c15c
/* f06c124: afa3008c */ sw $v1,0x8c($sp)
/* f06c128: 02602025 */ or $a0,$s3,$zero
/* f06c12c: 0c0071e1 */ jal func0001c784
/* f06c12c: 0c0071e1 */ jal model0001c784
/* f06c130: 02002825 */ or $a1,$s0,$zero
/* f06c134: 10000009 */ b .L0f06c15c
/* f06c138: 00000000 */ nop
/* f06c13c: 02602025 */ or $a0,$s3,$zero
/* f06c140: 0c0071f4 */ jal func0001c7d0
/* f06c140: 0c0071f4 */ jal model0001c7d0
/* f06c144: 02002825 */ or $a1,$s0,$zero
/* f06c148: 10000004 */ b .L0f06c15c
/* f06c14c: 00000000 */ nop
@@ -7470,7 +7470,7 @@ glabel var7f1aa264
/* f06c230: e5a00000 */ swc1 $f0,0x0($t5)
/* f06c234: 8faf00d0 */ lw $t7,0xd0($sp)
/* f06c238: 8fa40088 */ lw $a0,0x88($sp)
/* f06c23c: 0c006949 */ jal func0001a524
/* f06c23c: 0c006949 */ jal model0001a524
/* f06c240: ade40000 */ sw $a0,0x0($t7)
/* f06c244: 8fb800cc */ lw $t8,0xcc($sp)
/* f06c248: af020000 */ sw $v0,0x0($t8)
@@ -7596,7 +7596,7 @@ glabel func0f06c28c
/* f06c410: 8fb40108 */ lw $s4,0x108($sp)
/* f06c414: 02402025 */ or $a0,$s2,$zero
/* f06c418: 02602825 */ or $a1,$s3,$zero
/* f06c41c: 0c008975 */ jal func000225d4
/* f06c41c: 0c008975 */ jal model000225d4
/* f06c420: 02803025 */ or $a2,$s4,$zero
/* f06c424: 18400085 */ blez $v0,.L0f06c63c
/* f06c428: afa200d0 */ sw $v0,0xd0($sp)
@@ -7735,7 +7735,7 @@ glabel func0f06c28c
.L0f06c624:
/* f06c624: 02602825 */ or $a1,$s3,$zero
/* f06c628: 02803025 */ or $a2,$s4,$zero
/* f06c62c: 0c008975 */ jal func000225d4
/* f06c62c: 0c008975 */ jal model000225d4
/* f06c630: 27a700cc */ addiu $a3,$sp,0xcc
/* f06c634: 1c40ff84 */ bgtz $v0,.L0f06c448
/* f06c638: afa200d0 */ sw $v0,0xd0($sp)
@@ -7743,7 +7743,7 @@ glabel func0f06c28c
/* f06c63c: 10000053 */ b .L0f06c78c
/* f06c640: 00000000 */ nop
.L0f06c644:
/* f06c644: 0c008975 */ jal func000225d4
/* f06c644: 0c008975 */ jal model000225d4
/* f06c648: 27a700cc */ addiu $a3,$sp,0xcc
/* f06c64c: 1840004f */ blez $v0,.L0f06c78c
/* f06c650: afa200d0 */ sw $v0,0xd0($sp)
@@ -11568,7 +11568,7 @@ glabel func0f06ef44
/* f06ef80: ae020048 */ sw $v0,0x48($s0)
/* f06ef84: 8fa40180 */ lw $a0,0x180($sp)
/* f06ef88: 8fa50184 */ lw $a1,0x184($sp)
/* f06ef8c: 0c006973 */ jal func0001a5cc
/* f06ef8c: 0c006973 */ jal model0001a5cc
/* f06ef90: 00003025 */ or $a2,$zero,$zero
/* f06ef94: afa20024 */ sw $v0,0x24($sp)
/* f06ef98: 8e190040 */ lw $t9,0x40($s0)
@@ -11848,7 +11848,7 @@ glabel func0f06f314
/* f06f37c: 53200012 */ beqzl $t9,.L0f06f3c8
/* f06f380: c46a0008 */ lwc1 $f10,0x8($v1)
/* f06f384: 8d040018 */ lw $a0,0x18($t0)
/* f06f388: 0c006983 */ jal func0001a60c
/* f06f388: 0c006983 */ jal model0001a60c
/* f06f38c: afa30088 */ sw $v1,0x88($sp)
/* f06f390: c4440030 */ lwc1 $f4,0x30($v0)
/* f06f394: e7a4007c */ swc1 $f4,0x7c($sp)
@@ -15328,7 +15328,7 @@ glabel func0f07079c
/* f070800: 13000035 */ beqz $t8,.L0f0708d8
/* f070804: 00003025 */ or $a2,$zero,$zero
/* f070808: 8c640018 */ lw $a0,0x18($v1)
/* f07080c: 0c006973 */ jal func0001a5cc
/* f07080c: 0c006973 */ jal model0001a5cc
/* f070810: afa300c0 */ sw $v1,0xc0($sp)
/* f070814: 3c088007 */ lui $t0,%hi(var80069a08)
/* f070818: 25089a08 */ addiu $t0,$t0,%lo(var80069a08)
@@ -15364,7 +15364,7 @@ glabel func0f07079c
/* f07088c: afa20084 */ sw $v0,0x84($sp)
/* f070890: afaa0074 */ sw $t2,0x74($sp)
/* f070894: 27a40074 */ addiu $a0,$sp,0x74
/* f070898: 0c007399 */ jal func0001ce64
/* f070898: 0c007399 */ jal model0001ce64
/* f07089c: 8fa500c0 */ lw $a1,0xc0($sp)
/* f0708a0: 02002025 */ or $a0,$s0,$zero
/* f0708a4: 0fc1c18f */ jal func0f07063c
@@ -20167,13 +20167,13 @@ glabel var7f1aa3d0
.L0f07360c:
/* f07360c: 34c6999a */ ori $a2,$a2,0xfe09
/* f073610: c64c0018 */ lwc1 $f12,0x18($s2)
/* f073614: 0c006bfa */ jal func0001afe8
/* f073614: 0c006bfa */ jal model0001afe8
/* f073618: c7ae0084 */ lwc1 $f14,0x84($sp)
/* f07361c: 3c063c99 */ lui $a2,0x3cb7
/* f073620: e6400018 */ swc1 $f0,0x18($s2)
/* f073624: 34c6999a */ ori $a2,$a2,0xfe09
/* f073628: c64c0014 */ lwc1 $f12,0x14($s2)
/* f07362c: 0c006bfa */ jal func0001afe8
/* f07362c: 0c006bfa */ jal model0001afe8
/* f073630: 4600a386 */ mov.s $f14,$f20
/* f073634: e6400014 */ swc1 $f0,0x14($s2)
/* f073638: 8ead0034 */ lw $t5,0x34($s5)
@@ -20624,13 +20624,13 @@ glabel var7f1aa3d0
.L0f07360c:
/* f07360c: 34c6999a */ ori $a2,$a2,0x999a
/* f073610: c64c0018 */ lwc1 $f12,0x18($s2)
/* f073614: 0c006bfa */ jal func0001afe8
/* f073614: 0c006bfa */ jal model0001afe8
/* f073618: c7ae0084 */ lwc1 $f14,0x84($sp)
/* f07361c: 3c063c99 */ lui $a2,0x3c99
/* f073620: e6400018 */ swc1 $f0,0x18($s2)
/* f073624: 34c6999a */ ori $a2,$a2,0x999a
/* f073628: c64c0014 */ lwc1 $f12,0x14($s2)
/* f07362c: 0c006bfa */ jal func0001afe8
/* f07362c: 0c006bfa */ jal model0001afe8
/* f073630: 4600a386 */ mov.s $f14,$f20
/* f073634: e6400014 */ swc1 $f0,0x14($s2)
/* f073638: 8ead0034 */ lw $t5,0x34($s5)
@@ -23060,7 +23060,7 @@ glabel var7f1ab6dcpf
/* f075b5c: 104100f7 */ beq $v0,$at,.PF0f075f3c
/* f075b60: 3c05800a */ lui $a1,0x800a
/* f075b64: 8ca5d3d4 */ lw $a1,-0x2c2c($a1)
/* f075b68: 0c0068d7 */ jal func0001a5cc
/* f075b68: 0c0068d7 */ jal model0001a5cc
/* f075b6c: 00003025 */ move $a2,$zero
/* f075b70: 0fc2d706 */ jal currentPlayerGetMatrix1740
/* f075b74: afa20184 */ sw $v0,0x184($sp)
@@ -26598,7 +26598,7 @@ glabel var7f1aa438
/* f0758d8: 104100f7 */ beq $v0,$at,.L0f075cb8
/* f0758dc: 3c05800a */ lui $a1,%hi(var8009ce74)
/* f0758e0: 8ca5ce74 */ lw $a1,%lo(var8009ce74)($a1)
/* f0758e4: 0c006973 */ jal func0001a5cc
/* f0758e4: 0c006973 */ jal model0001a5cc
/* f0758e8: 00003025 */ or $a2,$zero,$zero
/* f0758ec: 0fc2d5be */ jal currentPlayerGetMatrix1740
/* f0758f0: afa20184 */ sw $v0,0x184($sp)
@@ -30100,7 +30100,7 @@ glabel var7f1aa438
/* f074604: 104100f8 */ beq $v0,$at,.NB0f0749e8
/* f074608: 3c05800a */ lui $a1,0x800a
/* f07460c: 8ca515a4 */ lw $a1,0x15a4($a1)
/* f074610: 0c006dcf */ jal func0001a5cc
/* f074610: 0c006dcf */ jal model0001a5cc
/* f074614: 00003025 */ or $a2,$zero,$zero
/* f074618: 0fc2cd16 */ jal currentPlayerGetMatrix1740
/* f07461c: afa20188 */ sw $v0,0x188($sp)
@@ -36085,7 +36085,7 @@ glabel var7f1aa588
/* f079dbc: 8fa50024 */ lw $a1,0x24($sp)
/* f079dc0: 02202025 */ or $a0,$s1,$zero
/* f079dc4: 02002825 */ or $a1,$s0,$zero
/* f079dc8: 0c006973 */ jal func0001a5cc
/* f079dc8: 0c006973 */ jal model0001a5cc
/* f079dcc: 24060100 */ addiu $a2,$zero,0x100
/* f079dd0: 1040000e */ beqz $v0,.L0f079e0c
/* f079dd4: 00408025 */ or $s0,$v0,$zero
@@ -36110,7 +36110,7 @@ glabel var7f1aa588
/* f079e1c: 02202025 */ or $a0,$s1,$zero
/* f079e20: 00402825 */ or $a1,$v0,$zero
/* f079e24: 00003025 */ or $a2,$zero,$zero
/* f079e28: 0c006973 */ jal func0001a5cc
/* f079e28: 0c006973 */ jal model0001a5cc
/* f079e2c: afa20038 */ sw $v0,0x38($sp)
/* f079e30: 8fa70038 */ lw $a3,0x38($sp)
/* f079e34: 8fa90064 */ lw $t1,0x64($sp)
@@ -36134,7 +36134,7 @@ glabel var7f1aa588
/* f079e78: 02202025 */ or $a0,$s1,$zero
/* f079e7c: 00402825 */ or $a1,$v0,$zero
/* f079e80: 00003025 */ or $a2,$zero,$zero
/* f079e84: 0c006973 */ jal func0001a5cc
/* f079e84: 0c006973 */ jal model0001a5cc
/* f079e88: afa20034 */ sw $v0,0x34($sp)
/* f079e8c: 8fa70034 */ lw $a3,0x34($sp)
/* f079e90: 00408025 */ or $s0,$v0,$zero
@@ -36152,7 +36152,7 @@ glabel var7f1aa588
/* f079ebc: 02202025 */ or $a0,$s1,$zero
/* f079ec0: 00402825 */ or $a1,$v0,$zero
/* f079ec4: 00003025 */ or $a2,$zero,$zero
/* f079ec8: 0c006973 */ jal func0001a5cc
/* f079ec8: 0c006973 */ jal model0001a5cc
/* f079ecc: afa20030 */ sw $v0,0x30($sp)
/* f079ed0: 8fa70030 */ lw $a3,0x30($sp)
/* f079ed4: 8fab0064 */ lw $t3,0x64($sp)
@@ -36325,7 +36325,7 @@ glabel var7f1aa5a8
/* f07a0f0: 8fa40184 */ lw $a0,0x184($sp)
/* f07a0f4: 00e02825 */ or $a1,$a3,$zero
/* f07a0f8: 00003025 */ or $a2,$zero,$zero
/* f07a0fc: 0c006973 */ jal func0001a5cc
/* f07a0fc: 0c006973 */ jal model0001a5cc
/* f07a100: afa70120 */ sw $a3,0x120($sp)
/* f07a104: 8fa70120 */ lw $a3,0x120($sp)
/* f07a108: 00402825 */ or $a1,$v0,$zero
@@ -36339,7 +36339,7 @@ glabel var7f1aa5a8
/* f07a128: e7a80170 */ swc1 $f8,0x170($sp)
.L0f07a12c:
/* f07a12c: 8fa5011c */ lw $a1,0x11c($sp)
/* f07a130: 0c006973 */ jal func0001a5cc
/* f07a130: 0c006973 */ jal model0001a5cc
/* f07a134: 00003025 */ or $a2,$zero,$zero
/* f07a138: 44805000 */ mtc1 $zero,$f10
/* f07a13c: 44808000 */ mtc1 $zero,$f16
@@ -37287,7 +37287,7 @@ glabel var7f1aa5a8
/* f07a0f0: 8fa40184 */ lw $a0,0x184($sp)
/* f07a0f4: 00e02825 */ or $a1,$a3,$zero
/* f07a0f8: 00003025 */ or $a2,$zero,$zero
/* f07a0fc: 0c006973 */ jal func0001a5cc
/* f07a0fc: 0c006973 */ jal model0001a5cc
/* f07a100: afa70120 */ sw $a3,0x120($sp)
/* f07a104: 8fa70120 */ lw $a3,0x120($sp)
/* f07a108: 00402825 */ or $a1,$v0,$zero
@@ -37301,7 +37301,7 @@ glabel var7f1aa5a8
/* f07a128: e7a80170 */ swc1 $f8,0x170($sp)
.L0f07a12c:
/* f07a12c: 8fa5011c */ lw $a1,0x11c($sp)
/* f07a130: 0c006973 */ jal func0001a5cc
/* f07a130: 0c006973 */ jal model0001a5cc
/* f07a134: 00003025 */ or $a2,$zero,$zero
/* f07a138: 44805000 */ mtc1 $zero,$f10
/* f07a13c: 44808000 */ mtc1 $zero,$f16
@@ -46106,7 +46106,7 @@ glabel func0f07e2cc
/* f07e440: 8dcf000c */ lw $t7,0xc($t6)
/* f07e444: afb8006c */ sw $t8,0x6c($sp)
/* f07e448: afaf007c */ sw $t7,0x7c($sp)
/* f07e44c: 0c007399 */ jal func0001ce64
/* f07e44c: 0c007399 */ jal model0001ce64
/* f07e450: 8e050018 */ lw $a1,0x18($s0)
/* f07e454: 8fbf001c */ lw $ra,0x1c($sp)
.L0f07e458:
@@ -46309,7 +46309,7 @@ s32 objTick(struct prop *prop)
iVar10 += g_Vars.cutsceneskip60ths * 4;
}
func0001ee18(model, iVar10, true);
model0001ee18(model, iVar10, true);
}
func00023d38(model->anim->animnum);
@@ -46319,13 +46319,13 @@ s32 objTick(struct prop *prop)
sp552 = true;
} else {
if (sp572) {
func0001b3bc(model);
model0001b3bc(model);
}
sp556 = true;
sp476.unk10 = gfxAllocate(model->filedata->nummatrices * sizeof(Mtxf));
sp476.matrix = currentPlayerGetMatrix1740();
func0001cebc(&sp476, model);
model0001cebc(&sp476, model);
if (sp572) {
mtx00015be4(currentPlayerGetUnk174c(), model->matrices, &sp412);
@@ -46402,7 +46402,7 @@ s32 objTick(struct prop *prop)
if (sp572) {
sp148 = floorf(model->anim->frame);
sp148++;
func0001ee18(model, g_Vars.lvupdate240, 1);
model0001ee18(model, g_Vars.lvupdate240, 1);
sp144 = floorf(model->anim->frame);
for (i = sp148; i <= sp144; i++) {
@@ -46423,7 +46423,7 @@ s32 objTick(struct prop *prop)
sp556 = true;
sp312.unk10 = gfxAllocate(model->filedata->nummatrices * sizeof(Mtxf));
sp312.matrix = &sp152;
func0001cebc(&sp312, model);
model0001cebc(&sp312, model);
if (sp572) {
sp236.x = (f32)sp116.x + prop->pos.x;
@@ -46542,7 +46542,7 @@ s32 objTick(struct prop *prop)
} else if (obj->flags2 & OBJFLAG2_04000000) {
pass2 = posIsInDrawDistance(&prop->pos);
} else if ((obj->hidden & OBJHFLAG_00000800) == 0 && (obj->flags2 & OBJFLAG2_INVISIBLE) == 0) {
pass2 = func0f08e8ac(prop, &prop->pos, func0001af80(model), sp564);
pass2 = func0f08e8ac(prop, &prop->pos, model0001af80(model), sp564);
} else {
pass2 = false;
}
@@ -46574,7 +46574,7 @@ s32 objTick(struct prop *prop)
if (sp556 == false) {
model->matrices = gfxAllocate(model->filedata->nummatrices * sizeof(Mtxf));
func0f07e2cc(prop);
func0001cb0c(model, model->filedata->rootnode);
model0001cb0c(model, model->filedata->rootnode);
}
prop->z = -model->matrices[0].m[3][2];
@@ -48977,7 +48977,7 @@ glabel var7f1aa82c
/* f081390: 2401002f */ addiu $at,$zero,0x2f
/* f081394: 11410023 */ beq $t2,$at,.L0f081424
/* f081398: 00000000 */ nop
/* f08139c: 0c006be0 */ jal func0001af80
/* f08139c: 0c006be0 */ jal model0001af80
/* f0813a0: 8e040018 */ lw $a0,0x18($s0)
/* f0813a4: 44050000 */ mfc1 $a1,$f0
/* f0813a8: 0fc239af */ jal func0f08e6bc
@@ -49612,7 +49612,7 @@ glabel var7f1aa82c
/* f081390: 2401002f */ addiu $at,$zero,0x2f
/* f081394: 11410023 */ beq $t2,$at,.L0f081424
/* f081398: 00000000 */ nop
/* f08139c: 0c006be0 */ jal func0001af80
/* f08139c: 0c006be0 */ jal model0001af80
/* f0813a0: 8e040018 */ lw $a0,0x18($s0)
/* f0813a4: 44050000 */ mfc1 $a1,$f0
/* f0813a8: 0fc239af */ jal func0f08e6bc
@@ -50239,7 +50239,7 @@ glabel var7f1aa82c
// }
//
// if (obj->type != OBJTYPE_TINTEDGLASS) {
// fVar17 = func0f08e6bc(prop, func0001af80(obj->model));
// fVar17 = func0f08e6bc(prop, model0001af80(obj->model));
//
// if (prop->timetoregen > 0 && prop->timetoregen < 60) {
// fVar17 *= (60.0f - prop->timetoregen) * 0.016666667535901f;
@@ -51125,13 +51125,13 @@ glabel var7f1aa838
/* f0825e8: 1000000f */ b .L0f082628
/* f0825ec: 8fa600d0 */ lw $a2,0xd0($sp)
.L0f0825f0:
/* f0825f0: 0c0071e1 */ jal func0001c784
/* f0825f0: 0c0071e1 */ jal model0001c784
/* f0825f4: 8cc40018 */ lw $a0,0x18($a2)
/* f0825f8: 8fc20014 */ lw $v0,0x14($s8)
/* f0825fc: 1000000a */ b .L0f082628
/* f082600: 8fa600d0 */ lw $a2,0xd0($sp)
.L0f082604:
/* f082604: 0c0071f4 */ jal func0001c7d0
/* f082604: 0c0071f4 */ jal model0001c7d0
/* f082608: 8cc40018 */ lw $a0,0x18($a2)
/* f08260c: 8fc20014 */ lw $v0,0x14($s8)
/* f082610: 10000005 */ b .L0f082628
@@ -51839,13 +51839,13 @@ glabel var7f1aa838
/* f08105c: 1000000f */ beqz $zero,.NB0f08109c
/* f081060: 8fa600d8 */ lw $a2,0xd8($sp)
.NB0f081064:
/* f081064: 0c007601 */ jal func0001c784
/* f081064: 0c007601 */ jal model0001c784
/* f081068: 8cc40018 */ lw $a0,0x18($a2)
/* f08106c: 8ec20014 */ lw $v0,0x14($s6)
/* f081070: 1000000a */ beqz $zero,.NB0f08109c
/* f081074: 8fa600d8 */ lw $a2,0xd8($sp)
.NB0f081078:
/* f081078: 0c007614 */ jal func0001c7d0
/* f081078: 0c007614 */ jal model0001c7d0
/* f08107c: 8cc40018 */ lw $a0,0x18($a2)
/* f081080: 8ec20014 */ lw $v0,0x14($s6)
/* f081084: 10000005 */ beqz $zero,.NB0f08109c
@@ -53331,7 +53331,7 @@ glabel var7f1aa978
/* f083154: 8fa40138 */ lw $a0,0x138($sp)
/* f083158: 0fc1a2b5 */ jal func0f068ad4
/* f08315c: afa900c8 */ sw $t1,0xc8($sp)
/* f083160: 0c0069d0 */ jal func0001a740
/* f083160: 0c0069d0 */ jal model0001a740
/* f083164: 00402025 */ or $a0,$v0,$zero
/* f083168: 8faa0138 */ lw $t2,0x138($sp)
/* f08316c: 00402825 */ or $a1,$v0,$zero
@@ -53340,7 +53340,7 @@ glabel var7f1aa978
/* f083178: 8d440018 */ lw $a0,0x18($t2)
/* f08317c: 0fc1a2b5 */ jal func0f068ad4
/* f083180: 8fa400c8 */ lw $a0,0xc8($sp)
/* f083184: 0c0069d0 */ jal func0001a740
/* f083184: 0c0069d0 */ jal model0001a740
/* f083188: 00402025 */ or $a0,$v0,$zero
/* f08318c: 8fab00c8 */ lw $t3,0xc8($sp)
/* f083190: 00402825 */ or $a1,$v0,$zero
@@ -54019,7 +54019,7 @@ glabel var7f1aa978
/* f083b8c: 31e80002 */ andi $t0,$t7,0x2
/* f083b90: 1100003c */ beqz $t0,.L0f083c84
/* f083b94: 00000000 */ nop
/* f083b98: 0c006983 */ jal func0001a60c
/* f083b98: 0c006983 */ jal model0001a60c
/* f083b9c: 8fa40130 */ lw $a0,0x130($sp)
/* f083ba0: 0fc2d5de */ jal currentPlayerGetUnk174c
/* f083ba4: afa20048 */ sw $v0,0x48($sp)
@@ -54304,7 +54304,7 @@ glabel var7f1aa978
/* f083154: 8fa40138 */ lw $a0,0x138($sp)
/* f083158: 0fc1a2b5 */ jal func0f068ad4
/* f08315c: afa900c8 */ sw $t1,0xc8($sp)
/* f083160: 0c0069d0 */ jal func0001a740
/* f083160: 0c0069d0 */ jal model0001a740
/* f083164: 00402025 */ or $a0,$v0,$zero
/* f083168: 8faa0138 */ lw $t2,0x138($sp)
/* f08316c: 00402825 */ or $a1,$v0,$zero
@@ -54313,7 +54313,7 @@ glabel var7f1aa978
/* f083178: 8d440018 */ lw $a0,0x18($t2)
/* f08317c: 0fc1a2b5 */ jal func0f068ad4
/* f083180: 8fa400c8 */ lw $a0,0xc8($sp)
/* f083184: 0c0069d0 */ jal func0001a740
/* f083184: 0c0069d0 */ jal model0001a740
/* f083188: 00402025 */ or $a0,$v0,$zero
/* f08318c: 8fab00c8 */ lw $t3,0xc8($sp)
/* f083190: 00402825 */ or $a1,$v0,$zero
@@ -54992,7 +54992,7 @@ glabel var7f1aa978
/* f083b8c: 31e80002 */ andi $t0,$t7,0x2
/* f083b90: 1100003c */ beqz $t0,.L0f083c84
/* f083b94: 00000000 */ nop
/* f083b98: 0c006983 */ jal func0001a60c
/* f083b98: 0c006983 */ jal model0001a60c
/* f083b9c: 8fa40130 */ lw $a0,0x130($sp)
/* f083ba0: 0fc2d5de */ jal currentPlayerGetUnk174c
/* f083ba4: afa20048 */ sw $v0,0x48($sp)
@@ -56524,7 +56524,7 @@ glabel func0f084594
/* f0845b4: 00a02025 */ or $a0,$a1,$zero
/* f0845b8: 00c08825 */ or $s1,$a2,$zero
/* f0845bc: 00002825 */ or $a1,$zero,$zero
/* f0845c0: 0c006949 */ jal func0001a524
/* f0845c0: 0c006949 */ jal model0001a524
/* f0845c4: afa300c8 */ sw $v1,0xc8($sp)
/* f0845c8: afa200d8 */ sw $v0,0xd8($sp)
/* f0845cc: 8e0f000c */ lw $t7,0xc($s0)
@@ -56942,12 +56942,12 @@ glabel var7f1aaa00
/* f084afc: 1000000e */ b .L0f084b38
/* f084b00: 0060f025 */ or $s8,$v1,$zero
/* f084b04: 02c02025 */ or $a0,$s6,$zero
/* f084b08: 0c0071e1 */ jal func0001c784
/* f084b08: 0c0071e1 */ jal model0001c784
/* f084b0c: 02002825 */ or $a1,$s0,$zero
/* f084b10: 10000009 */ b .L0f084b38
/* f084b14: 00000000 */ nop
/* f084b18: 02c02025 */ or $a0,$s6,$zero
/* f084b1c: 0c0071f4 */ jal func0001c7d0
/* f084b1c: 0c0071f4 */ jal model0001c7d0
/* f084b20: 02002825 */ or $a1,$s0,$zero
/* f084b24: 10000004 */ b .L0f084b38
/* f084b28: 00000000 */ nop
@@ -56958,7 +56958,7 @@ glabel var7f1aaa00
/* f084b38: 12600043 */ beqz $s3,.L0f084c48
/* f084b3c: 02002025 */ or $a0,$s0,$zero
/* f084b40: 00002825 */ or $a1,$zero,$zero
/* f084b44: 0c006949 */ jal func0001a524
/* f084b44: 0c006949 */ jal model0001a524
/* f084b48: 00008825 */ or $s1,$zero,$zero
/* f084b4c: 04400004 */ bltz $v0,.L0f084b60
/* f084b50: 0040a025 */ or $s4,$v0,$zero
@@ -57166,7 +57166,7 @@ void func0f084f64(struct defaultobj *obj)
if (prop->flags & PROPFLAG_ONSCREEN) {
rodata = modelGetPartRodata(model->filedata, 2);
sp7c = func0001a5cc(model, modelGetPart(model->filedata, 1), 0);
sp7c = model0001a5cc(model, modelGetPart(model->filedata, 1), 0);
mtx00015be4(currentPlayerGetUnk174c(), sp7c, &matrix);
shardsCreate((struct coord *) matrix.m[3], matrix.m[0], matrix.m[1], matrix.m[2],
@@ -57577,18 +57577,18 @@ void func0f0859a0(struct prop *prop, struct shotdata *shotdata)
}
if (var8005efc0 > 0.0f) {
lVar3 = func000225d4(model, &shotdata->unk00, &shotdata->unk0c, &node1);
lVar3 = model000225d4(model, &shotdata->unk00, &shotdata->unk0c, &node1);
while (lVar3 > 0) {
if (func0f084594(model, node1, &shotdata->unk00, &shotdata->unk0c, &hitthing1, &spe4, &node2)) {
break;
}
lVar3 = func000225d4(model, &shotdata->unk00, &shotdata->unk0c, &node1);
lVar3 = model000225d4(model, &shotdata->unk00, &shotdata->unk0c, &node1);
}
} else {
do {
lVar3 = func000225d4(model, &shotdata->unk00, &shotdata->unk0c, &node1);
lVar3 = model000225d4(model, &shotdata->unk00, &shotdata->unk0c, &node1);
if (lVar3 > 0 && func0f0849dc(model, node1, &shotdata->unk00, &shotdata->unk0c, &hitthing1, &spe4, &node2)) {
break;
@@ -59457,7 +59457,7 @@ void propObjGetBbox(struct prop *prop, f32 *width, f32 *ymax, f32 *ymin)
*ymin = obj->geo3->ymin;
*ymax = obj->geo3->ymax;
} else {
*width = func0001af80(obj->model);
*width = model0001af80(obj->model);
*ymin = obj->geo2->ymin;
*ymax = obj->geo2->ymax;
}
@@ -62670,7 +62670,7 @@ bool func0f0899dc(struct prop *prop, struct coord *arg1, f32 *arg2, f32 *arg3)
{
if (prop->flags & PROPFLAG_ONSCREEN) {
struct defaultobj *obj = prop->obj;
Mtxf *matrix = func0001a60c(obj->model);
Mtxf *matrix = model0001a60c(obj->model);
arg1->z = matrix->m[3][2];
@@ -62781,12 +62781,12 @@ glabel func0f089a94
/* f089bcc: 1000000c */ b .L0f089c00
/* f089bd0: 8e020014 */ lw $v0,0x14($s0)
.L0f089bd4:
/* f089bd4: 0c0071e1 */ jal func0001c784
/* f089bd4: 0c0071e1 */ jal model0001c784
/* f089bd8: 02002825 */ or $a1,$s0,$zero
/* f089bdc: 10000008 */ b .L0f089c00
/* f089be0: 8e020014 */ lw $v0,0x14($s0)
.L0f089be4:
/* f089be4: 0c0071f4 */ jal func0001c7d0
/* f089be4: 0c0071f4 */ jal model0001c7d0
/* f089be8: 02002825 */ or $a1,$s0,$zero
/* f089bec: 10000004 */ b .L0f089c00
/* f089bf0: 8e020014 */ lw $v0,0x14($s0)
+5 -5
View File
@@ -2353,7 +2353,7 @@ glabel func0f017248
/* f0178b0: 00402825 */ or $a1,$v0,$zero
/* f0178b4: 8fb80120 */ lw $t8,0x120($sp)
/* f0178b8: 02e02025 */ or $a0,$s7,$zero
/* f0178bc: 0c007308 */ jal func0001cc20
/* f0178bc: 0c007308 */ jal model0001cc20
/* f0178c0: aef8000c */ sw $t8,0xc($s7)
/* f0178c4: 8fac0150 */ lw $t4,0x150($sp)
/* f0178c8: 240b0003 */ addiu $t3,$zero,0x3
@@ -5665,7 +5665,7 @@ glabel var7f1a84a0
/* f0199b8: 8faf0160 */ lw $t7,0x160($sp)
/* f0199bc: 8e790000 */ lw $t9,0x0($s3)
/* f0199c0: af2f000c */ sw $t7,0xc($t9)
/* f0199c4: 0c007308 */ jal func0001cc20
/* f0199c4: 0c007308 */ jal model0001cc20
/* f0199c8: 8e640000 */ lw $a0,0x0($s3)
/* f0199cc: 8fa80190 */ lw $t0,0x190($sp)
/* f0199d0: 240e0003 */ addiu $t6,$zero,0x3
@@ -5965,7 +5965,7 @@ glabel var7f1a84a0
/* f0199b8: 8faf0160 */ lw $t7,0x160($sp)
/* f0199bc: 8e790000 */ lw $t9,0x0($s3)
/* f0199c0: af2f000c */ sw $t7,0xc($t9)
/* f0199c4: 0c007308 */ jal func0001cc20
/* f0199c4: 0c007308 */ jal model0001cc20
/* f0199c8: 8e640000 */ lw $a0,0x0($s3)
/* f0199cc: 8fa80190 */ lw $t0,0x190($sp)
/* f0199d0: 240e0003 */ addiu $t6,$zero,0x3
@@ -6383,7 +6383,7 @@ glabel var7f1a84bc
/* f01a0e4: 8fab0170 */ lw $t3,0x170($sp)
/* f01a0e8: 8e6d0000 */ lw $t5,0x0($s3)
/* f01a0ec: adab000c */ sw $t3,0xc($t5)
/* f01a0f0: 0c007308 */ jal func0001cc20
/* f01a0f0: 0c007308 */ jal model0001cc20
/* f01a0f4: 8e640000 */ lw $a0,0x0($s3)
/* f01a0f8: 8e790000 */ lw $t9,0x0($s3)
/* f01a0fc: 2405000b */ addiu $a1,$zero,0xb
@@ -6801,7 +6801,7 @@ glabel var7f1a84bc
/* f01a0e4: 8fab0170 */ lw $t3,0x170($sp)
/* f01a0e8: 8e6d0000 */ lw $t5,0x0($s3)
/* f01a0ec: adab000c */ sw $t3,0xc($t5)
/* f01a0f0: 0c007308 */ jal func0001cc20
/* f01a0f0: 0c007308 */ jal model0001cc20
/* f01a0f4: 8e640000 */ lw $a0,0x0($s3)
/* f01a0f8: 8e790000 */ lw $t9,0x0($s3)
/* f01a0fc: 2405000b */ addiu $a1,$zero,0xb
-22
View File
@@ -1,22 +0,0 @@
#ifndef _IN_LIB_LIB_18680_H
#define _IN_LIB_LIB_18680_H
#include <ultra64.h>
#include "data.h"
#include "types.h"
bool func00018680(void);
u32 func00019634(void);
u32 func000198dc(void);
u32 func00019be0(void);
u32 func00019d1c(void);
u32 func00019ddc(void);
u32 func00019f2c(void);
u32 func00019f98(void);
u32 func0001a024(void);
u32 func0001a0ac(void);
u32 func0001a110(void);
u32 func0001a1c0(void);
u32 func0001a25c(void);
u32 func0001a2dc(void);
#endif
+49 -48
View File
@@ -4,52 +4,53 @@
#include "data.h"
#include "types.h"
bool model00018680(void);
void modelSetDistanceScale(f32 value);
void modelSetVtxAllocatorFunc(struct gfxvtx *(*fn)(s32 numvertices));
s32 func0001a524(struct modelnode *node, s32 arg1);
Mtxf *func0001a5cc(struct model *model, struct modelnode *node, s32 arg2);
Mtxf *func0001a60c(struct model *model);
struct modelnode *func0001a634(struct model *model, s32 mtxindex);
struct modelnode *func0001a740(struct modelnode *node);
struct modelnode *func0001a784(struct modelnode *node);
struct modelnode *func0001a7cc(struct modelnode *node);
struct modelnode *func0001a85c(struct modelnode *node);
s32 model0001a524(struct modelnode *node, s32 arg1);
Mtxf *model0001a5cc(struct model *model, struct modelnode *node, s32 arg2);
Mtxf *model0001a60c(struct model *model);
struct modelnode *model0001a634(struct model *model, s32 mtxindex);
struct modelnode *model0001a740(struct modelnode *node);
struct modelnode *model0001a784(struct modelnode *node);
struct modelnode *model0001a7cc(struct modelnode *node);
struct modelnode *model0001a85c(struct modelnode *node);
struct modelnode *modelGetPart(struct modelfiledata *arg0, s32 partnum);
union modelrodata *modelGetPartRodata(struct modelfiledata *modelfiledata, s32 partnum);
f32 func0001a9e8(struct model *model);
f32 model0001a9e8(struct model *model);
void *modelGetNodeRwData(struct model *model, struct modelnode *node);
void modelNodeGetPosition(struct model *model, struct modelnode *node, struct coord *pos);
void modelNodeSetPosition(struct model *model, struct modelnode *node, struct coord *pos);
void modelGetRootPosition(struct model *model, struct coord *pos);
void modelSetRootPosition(struct model *model, struct coord *pos);
void modelNodeGetModelRelativePosition(struct model *model, struct modelnode *node, struct coord *pos);
f32 func0001ae44(struct model *model);
void func0001ae90(struct model *model, f32 angle);
f32 model0001ae44(struct model *model);
void model0001ae90(struct model *model, f32 angle);
void modelSetScale(struct model *model, f32 scale);
void modelSetAnimScale(struct model *model, f32 scale);
f32 func0001af80(struct model *model);
void func0001af98(struct coord *arg0, struct coord *arg1, f32 frac);
f32 func0001afe8(f32 arg0, f32 angle, f32 frac);
void func0001b07c(struct coord *arg0, struct coord *arg1, f32 mult);
void func0001b0e8(struct model *model, struct modelnode *node);
void func0001b3bc(struct model *model);
void func0001b400(struct objticksp476 *arg0, struct model *model, struct modelnode *node);
u32 func0001b80c(void);
u32 func0001bc14(void);
void func0001bfa8(struct objticksp476 *arg0, struct model *model, struct modelnode *node);
void func0001c5b4(struct objticksp476 *arg0, struct model *model, struct modelnode *node);
void func0001c664(struct model *model, struct modelnode *node);
void func0001c784(struct model *model, struct modelnode *node);
void func0001c7d0(struct model *model, struct modelnode *node);
f32 model0001af80(struct model *model);
void model0001af98(struct coord *arg0, struct coord *arg1, f32 frac);
f32 model0001afe8(f32 arg0, f32 angle, f32 frac);
void model0001b07c(struct coord *arg0, struct coord *arg1, f32 mult);
void model0001b0e8(struct model *model, struct modelnode *node);
void model0001b3bc(struct model *model);
void model0001b400(struct objticksp476 *arg0, struct model *model, struct modelnode *node);
u32 model0001b80c(void);
u32 model0001bc14(void);
void model0001bfa8(struct objticksp476 *arg0, struct model *model, struct modelnode *node);
void model0001c5b4(struct objticksp476 *arg0, struct model *model, struct modelnode *node);
void model0001c664(struct model *model, struct modelnode *node);
void model0001c784(struct model *model, struct modelnode *node);
void model0001c7d0(struct model *model, struct modelnode *node);
void modelAttachHead(struct model *model, struct modelnode *node);
void func0001c868(struct modelnode *node, bool visible);
void model0001c868(struct modelnode *node, bool visible);
void modelRenderNodeReorder(struct model *model, struct modelnode *node);
void func0001c950(struct model *model, struct modelnode *node);
void func0001cb0c(struct model *model, struct modelnode *node);
void func0001cc20(struct model *model);
void func0001cd18(struct objticksp476 *arg0, struct model *model);
void func0001ce64(struct objticksp476 *arg0, struct model *model);
void func0001cebc(struct objticksp476 *arg0, struct model *model);
void model0001c950(struct model *model, struct modelnode *node);
void model0001cb0c(struct model *model, struct modelnode *node);
void model0001cc20(struct model *model);
void model0001cd18(struct objticksp476 *arg0, struct model *model);
void model0001ce64(struct objticksp476 *arg0, struct model *model);
void model0001cebc(struct objticksp476 *arg0, struct model *model);
s16 modelGetAnimNum(struct model *model);
bool modelIsFlipped(struct model *model);
f32 modelGetCurAnimFrame(struct model *model);
@@ -59,7 +60,7 @@ f32 modelGetAnimSpeed(struct model *model);
f32 modelGetAbsAnimSpeed(struct model *model);
s32 modelConstrainOrWrapAnimFrame(s32 frame, s16 animnum, f32 endframe);
void modelCopyAnimForMerge(struct model *model, f32 merge);
void func0001d62c(struct model *model, s16 animnum, s32 flip, f32 fstartframe, f32 speed, f32 merge);
void model0001d62c(struct model *model, s16 animnum, s32 flip, f32 fstartframe, f32 speed, f32 merge);
bool modelIsAnimMerging(struct model *model);
void modelSetAnimationWithMerge(struct model *model, s16 animnum, u32 flip, f32 startframe, f32 speed, f32 timemerge, bool domerge);
void modelSetAnimation(struct model *model, s16 animnum, s32 flip, f32 fstartframe, f32 speed, f32 merge);
@@ -71,26 +72,26 @@ void modelSetAnimSpeed(struct model *model, f32 speed, f32 startframe);
void modelSetAnimSpeedAuto(struct model *model, f32 arg1, f32 startframe);
void modelSetAnimPlaySpeed(struct model *model, f32 speed, f32 frame);
void modelSetAnim70(struct model *model, void *callback);
void func0001e018(struct model *model, f32 startframe);
void func0001e14c(struct model *model, f32 arg1, f32 arg2);
void func0001e29c(bool value);
bool func0001e2a8(void);
void func0001e2b4(struct model *model, f32 frame, f32 arg2, f32 frame2, f32 arg4);
void func0001ee18(struct model *model, s32 lvupdate240, bool arg2);
void func0001f314(struct model *model, s32 lvupdate240, bool arg2);
void func0001f7e0(struct modelrenderdata *renderdata);
void func0001f890(struct modelrenderdata *renderdata, bool arg1);
void func00020248(struct modelrenderdata *renderdata, bool arg1);
void func00020bdc(struct modelrenderdata *renderdata);
void model0001e018(struct model *model, f32 startframe);
void model0001e14c(struct model *model, f32 arg1, f32 arg2);
void model0001e29c(bool value);
bool model0001e2a8(void);
void model0001e2b4(struct model *model, f32 frame, f32 arg2, f32 frame2, f32 arg4);
void model0001ee18(struct model *model, s32 lvupdate240, bool arg2);
void model0001f314(struct model *model, s32 lvupdate240, bool arg2);
void model0001f7e0(struct modelrenderdata *renderdata);
void model0001f890(struct modelrenderdata *renderdata, bool arg1);
void model00020248(struct modelrenderdata *renderdata, bool arg1);
void model00020bdc(struct modelrenderdata *renderdata);
void modelApplyCullMode(struct modelrenderdata *renderdata);
void modelRenderNodeGundl(struct modelrenderdata *renderdata, struct model *model, struct modelnode *node);
void modelRenderNodeDl(struct modelrenderdata *renderdata, struct model *model, struct modelnode *node);
void modelRenderNodeType16(struct modelrenderdata *renderdata, struct modelnode *node);
void func000216cc(struct modelrenderdata *renderdata, struct textureconfig *tconfig, s32 arg2);
void model000216cc(struct modelrenderdata *renderdata, struct textureconfig *tconfig, s32 arg2);
void modelRenderNodeGunfire(struct modelrenderdata *renderdata, struct model *model, struct modelnode *node);
void modelRender(struct modelrenderdata *renderdata, struct model *model);
bool func000220fc(union modelrodata *rodata, Mtxf *mtx, struct coord *arg2, struct coord *arg3);
s32 func000225d4(struct model *model, struct coord *arg1, struct coord *arg2, struct modelnode **startnode);
bool model000220fc(union modelrodata *rodata, Mtxf *mtx, struct coord *arg2, struct coord *arg3);
s32 model000225d4(struct model *model, struct coord *arg1, struct coord *arg2, struct modelnode **startnode);
void modelPromoteNodeOffsetsToPointers(struct modelnode *node, u32 vma, u32 fileramaddr);
void modelPromoteOffsetsToPointers(struct modelfiledata *filedata, u32 arg1, u32 arg2);
s32 modelCalculateRwDataIndexes(struct modelnode *node);
@@ -98,7 +99,7 @@ void modelCalculateRwDataLen(struct modelfiledata *filedata);
void modelInitRwData(struct model *model, struct modelnode *node);
void modelInit(struct model *model, struct modelfiledata *filedata, union modelrwdata **rwdatas, bool resetanim);
void animInit(struct anim *anim);
u32 func00023108(void);
u32 model00023108(void);
void modelIterateDisplayLists(struct modelfiledata *filedata, struct modelnode **nodeptr, Gfx **gdlptr);
void modelNodeReplaceGdl(u32 arg0, struct modelnode *node, Gfx *find, Gfx *replacement);
+147 -147
View File
@@ -52,7 +52,7 @@ void modelSetVtxAllocatorFunc(struct gfxvtx *(*fn)(s32 numvertices))
g_ModelVtxAllocatorFunc = fn;
}
s32 func0001a524(struct modelnode *node, s32 arg1)
s32 model0001a524(struct modelnode *node, s32 arg1)
{
s32 index;
union modelrodata *rodata1;
@@ -78,9 +78,9 @@ s32 func0001a524(struct modelnode *node, s32 arg1)
return -1;
}
Mtxf *func0001a5cc(struct model *model, struct modelnode *node, s32 arg2)
Mtxf *model0001a5cc(struct model *model, struct modelnode *node, s32 arg2)
{
s32 index = func0001a524(node, arg2);
s32 index = model0001a524(node, arg2);
if (index >= 0) {
return &model->matrices[index];
@@ -89,12 +89,12 @@ Mtxf *func0001a5cc(struct model *model, struct modelnode *node, s32 arg2)
return NULL;
}
Mtxf *func0001a60c(struct model *model)
Mtxf *model0001a60c(struct model *model)
{
return func0001a5cc(model, model->filedata->rootnode, 0);
return model0001a5cc(model, model->filedata->rootnode, 0);
}
struct modelnode *func0001a634(struct model *model, s32 mtxindex)
struct modelnode *model0001a634(struct model *model, s32 mtxindex)
{
struct modelnode *node = model->filedata->rootnode;
union modelrodata *rodata1;
@@ -142,7 +142,7 @@ struct modelnode *func0001a634(struct model *model, s32 mtxindex)
return NULL;
}
struct modelnode *func0001a740(struct modelnode *node)
struct modelnode *model0001a740(struct modelnode *node)
{
while (node) {
u32 type = node->type & 0xff;
@@ -159,7 +159,7 @@ struct modelnode *func0001a740(struct modelnode *node)
return node;
}
struct modelnode *func0001a784(struct modelnode *node)
struct modelnode *model0001a784(struct modelnode *node)
{
while ((node = node->parent)) {
u32 type = node->type & 0xff;
@@ -174,7 +174,7 @@ struct modelnode *func0001a784(struct modelnode *node)
return node;
}
struct modelnode *func0001a7cc(struct modelnode *basenode)
struct modelnode *model0001a7cc(struct modelnode *basenode)
{
struct modelnode *node = basenode->child;
@@ -209,7 +209,7 @@ struct modelnode *func0001a7cc(struct modelnode *basenode)
return node;
}
struct modelnode *func0001a85c(struct modelnode *basenode)
struct modelnode *model0001a85c(struct modelnode *basenode)
{
struct modelnode *node = basenode;
struct modelnode *next;
@@ -299,9 +299,9 @@ union modelrodata *modelGetPartRodata(struct modelfiledata *modelfiledata, s32 p
return NULL;
}
f32 func0001a9e8(struct model *model)
f32 model0001a9e8(struct model *model)
{
Mtxf *mtx = func0001a60c(model);
Mtxf *mtx = model0001a60c(model);
if (mtx) {
return -mtx->m[3][2];
@@ -466,7 +466,7 @@ void modelNodeGetModelRelativePosition(struct model *model, struct modelnode *no
}
}
f32 func0001ae44(struct model *model)
f32 model0001ae44(struct model *model)
{
if ((model->filedata->rootnode->type & 0xff) == MODELNODETYPE_CHRINFO) {
union modelrwdata *rwdata = modelGetNodeRwData(model, model->filedata->rootnode);
@@ -476,7 +476,7 @@ f32 func0001ae44(struct model *model)
return 0;
}
void func0001ae90(struct model *model, f32 angle)
void model0001ae90(struct model *model, f32 angle)
{
if ((model->filedata->rootnode->type & 0xff) == MODELNODETYPE_CHRINFO) {
struct modelrwdata_chrinfo *rwdata = modelGetNodeRwData(model, model->filedata->rootnode);
@@ -514,19 +514,19 @@ void modelSetAnimScale(struct model *model, f32 scale)
}
}
f32 func0001af80(struct model *model)
f32 model0001af80(struct model *model)
{
return model->filedata->unk10 * model->scale;
}
void func0001af98(struct coord *arg0, struct coord *arg1, f32 frac)
void model0001af98(struct coord *arg0, struct coord *arg1, f32 frac)
{
arg0->x += (arg1->x - arg0->x) * frac;
arg0->y += (arg1->y - arg0->y) * frac;
arg0->z += (arg1->z - arg0->z) * frac;
}
f32 func0001afe8(f32 arg0, f32 angle, f32 mult)
f32 model0001afe8(f32 arg0, f32 angle, f32 mult)
{
f32 value = angle - arg0;
@@ -551,14 +551,14 @@ f32 func0001afe8(f32 arg0, f32 angle, f32 mult)
return arg0;
}
void func0001b07c(struct coord *arg0, struct coord *arg1, f32 mult)
void model0001b07c(struct coord *arg0, struct coord *arg1, f32 mult)
{
arg0->x = func0001afe8(arg0->x, arg1->x, mult);
arg0->y = func0001afe8(arg0->y, arg1->y, mult);
arg0->z = func0001afe8(arg0->z, arg1->z, mult);
arg0->x = model0001afe8(arg0->x, arg1->x, mult);
arg0->y = model0001afe8(arg0->y, arg1->y, mult);
arg0->z = model0001afe8(arg0->z, arg1->z, mult);
}
void func0001b0e8(struct model *model, struct modelnode *node)
void model0001b0e8(struct model *model, struct modelnode *node)
{
union modelrwdata *rwdata;
struct anim *anim = model->anim;
@@ -593,9 +593,9 @@ void func0001b0e8(struct model *model, struct modelnode *node)
}
if (frac != 0.0f && rwdata->chrinfo.unk01) {
func0001af98(&sp34, &rwdata->chrinfo.unk24, frac);
model0001af98(&sp34, &rwdata->chrinfo.unk24, frac);
rwdata->chrinfo.unk14 = func0001afe8(rwdata->chrinfo.unk30, rwdata->chrinfo.unk20, frac);
rwdata->chrinfo.unk14 = model0001afe8(rwdata->chrinfo.unk30, rwdata->chrinfo.unk20, frac);
}
if (anim->animnum2 || anim->fracmerge) {
@@ -646,16 +646,16 @@ void func0001b0e8(struct model *model, struct modelnode *node)
}
}
void func0001b3bc(struct model *model)
void model0001b3bc(struct model *model)
{
struct modelnode *node = model->filedata->rootnode;
if (node && (node->type & 0xff) == MODELNODETYPE_CHRINFO) {
func0001b0e8(model, node);
model0001b0e8(model, node);
}
}
void func0001b400(struct objticksp476 *arg0, struct model *model, struct modelnode *node)
void model0001b400(struct objticksp476 *arg0, struct model *model, struct modelnode *node)
{
struct anim *anim = model->anim;
union modelrodata *rodata = node->rodata;
@@ -696,7 +696,7 @@ void func0001b400(struct objticksp476 *arg0, struct model *model, struct modelno
if (rodata->chrinfo.mtxindex);
if (node->parent) {
sp24c = func0001a5cc(model, node->parent, 0);
sp24c = model0001a5cc(model, node->parent, 0);
} else {
sp24c = arg0->matrix;
}
@@ -715,7 +715,7 @@ void func0001b400(struct objticksp476 *arg0, struct model *model, struct modelno
if (sp154 != 0.0f) {
func00024050(sp240, anim->flip, type, anim->animnum, anim->unk05, &sp148, &sp13c, &sp130);
func0001b07c(&sp230, &sp148, sp154);
model0001b07c(&sp230, &sp148, sp154);
}
if (anim->fracmerge != 0.0f) {
@@ -723,7 +723,7 @@ void func0001b400(struct objticksp476 *arg0, struct model *model, struct modelno
if (anim->frac2 != 0.0f) {
func00024050(sp240, anim->flip2, type, anim->animnum2, anim->unk07, &spd0, &spc4, &spb8);
func0001b07c(&sp124, &spd0, anim->frac2);
model0001b07c(&sp124, &spd0, anim->frac2);
}
if ((g_Anims[anim->animnum].flags & ANIMFLAG_02) && (g_Anims[anim->animnum2].flags & ANIMFLAG_02) == 0) {
@@ -747,7 +747,7 @@ void func0001b400(struct objticksp476 *arg0, struct model *model, struct modelno
mtx000166dc(sp254, &sp198);
} else {
if (rwdata->chrinfo.unk18 != 0.0f) {
sp250 = func0001afe8(sp250, rwdata->chrinfo.unk1c, rwdata->chrinfo.unk18);
sp250 = model0001afe8(sp250, rwdata->chrinfo.unk1c, rwdata->chrinfo.unk18);
}
mtx00016248(sp254, sp250, &sp198);
@@ -767,7 +767,7 @@ void func0001b400(struct objticksp476 *arg0, struct model *model, struct modelno
}
GLOBAL_ASM(
glabel func0001b80c
glabel model0001b80c
.late_rodata
glabel var700542f4
.word 0x40490fdb
@@ -802,7 +802,7 @@ glabel var70054308
/* 1b850: 11400006 */ beqz $t2,.L0001b86c
/* 1b854: afaa001c */ sw $t2,0x1c($sp)
/* 1b858: 00a02025 */ or $a0,$a1,$zero
/* 1b85c: 0c006973 */ jal func0001a5cc
/* 1b85c: 0c006973 */ jal model0001a5cc
/* 1b860: 01402825 */ or $a1,$t2,$zero
/* 1b864: 10000003 */ b .L0001b874
/* 1b868: afa200ac */ sw $v0,0xac($sp)
@@ -1065,7 +1065,7 @@ glabel var70054308
);
GLOBAL_ASM(
glabel func0001bc14
glabel model0001bc14
.late_rodata
glabel var7005430c
.word 0x40490fdb
@@ -1100,7 +1100,7 @@ glabel var70054320
/* 1bc58: 11400006 */ beqz $t2,.L0001bc74
/* 1bc5c: afaa001c */ sw $t2,0x1c($sp)
/* 1bc60: 00a02025 */ or $a0,$a1,$zero
/* 1bc64: 0c006973 */ jal func0001a5cc
/* 1bc64: 0c006973 */ jal model0001a5cc
/* 1bc68: 01402825 */ or $a1,$t2,$zero
/* 1bc6c: 10000003 */ b .L0001bc7c
/* 1bc70: afa2009c */ sw $v0,0x9c($sp)
@@ -1333,7 +1333,7 @@ glabel var70054320
#if VERSION >= VERSION_PAL_FINAL
GLOBAL_ASM(
glabel func0001bfa8
glabel model0001bfa8
.late_rodata
glabel var70053fc0pf
.word 0x3c23d70a
@@ -1431,7 +1431,7 @@ glabel var70053fc0pf
/* 1beac: 27a40144 */ addiu $a0,$sp,0x144
/* 1beb0: 27a500d4 */ addiu $a1,$sp,0xd4
/* 1beb4: 44061000 */ mfc1 $a2,$f2
/* 1beb8: 0c006b83 */ jal func0001b07c
/* 1beb8: 0c006b83 */ jal model0001b07c
/* 1bebc: 00000000 */ nop
/* 1bec0: 8faf003c */ lw $t7,0x3c($sp)
/* 1bec4: c7a200e0 */ lwc1 $f2,0xe0($sp)
@@ -1443,7 +1443,7 @@ glabel var70053fc0pf
/* 1bedc: 44807000 */ mtc1 $zero,$f14
.PF0001bee0:
/* 1bee0: 44061000 */ mfc1 $a2,$f2
/* 1bee4: 0c006b4a */ jal func0001af98
/* 1bee4: 0c006b4a */ jal model0001af98
/* 1bee8: 27a500c8 */ addiu $a1,$sp,0xc8
.PF0001beec:
/* 1beec: 44807000 */ mtc1 $zero,$f14
@@ -1503,7 +1503,7 @@ glabel var70053fc0pf
/* 1bfb8: afab0010 */ sw $t3,0x10($sp)
/* 1bfbc: 27a400b0 */ addiu $a0,$sp,0xb0
/* 1bfc0: 27a5005c */ addiu $a1,$sp,0x5c
/* 1bfc4: 0c006b83 */ jal func0001b07c
/* 1bfc4: 0c006b83 */ jal model0001b07c
/* 1bfc8: 8e060034 */ lw $a2,0x34($s0)
/* 1bfcc: 27a40144 */ addiu $a0,$sp,0x144
.PF0001bfd0:
@@ -1573,7 +1573,7 @@ glabel var70053fc0pf
/* 1c0c8: 8fa40160 */ lw $a0,0x160($sp)
.PF0001c0cc:
/* 1c0cc: afb80010 */ sw $t8,0x10($sp)
/* 1c0d0: 0c006e6f */ jal func0001bc14
/* 1c0d0: 0c006e6f */ jal model0001bc14
/* 1c0d4: afa80014 */ sw $t0,0x14($sp)
/* 1c0d8: 100000a2 */ b .PF0001c364
/* 1c0dc: 8fbf002c */ lw $ra,0x2c($sp)
@@ -1591,13 +1591,13 @@ glabel var70053fc0pf
/* 1c108: afad0014 */ sw $t5,0x14($sp)
/* 1c10c: 8fa40160 */ lw $a0,0x160($sp)
/* 1c110: 01202825 */ move $a1,$t1
/* 1c114: 0c006e6f */ jal func0001bc14
/* 1c114: 0c006e6f */ jal model0001bc14
/* 1c118: afac0010 */ sw $t4,0x10($sp)
/* 1c11c: 10000091 */ b .PF0001c364
/* 1c120: 8fbf002c */ lw $ra,0x2c($sp)
.PF0001c124:
/* 1c124: afae0010 */ sw $t6,0x10($sp)
/* 1c128: 0c006e6f */ jal func0001bc14
/* 1c128: 0c006e6f */ jal model0001bc14
/* 1c12c: afaf0014 */ sw $t7,0x14($sp)
/* 1c130: 1000008c */ b .PF0001c364
/* 1c134: 8fbf002c */ lw $ra,0x2c($sp)
@@ -1624,7 +1624,7 @@ glabel var70053fc0pf
/* 1c184: 8fa50164 */ lw $a1,0x164($sp)
/* 1c188: e7a80140 */ swc1 $f8,0x140($sp)
/* 1c18c: 8fa60168 */ lw $a2,0x168($sp)
/* 1c190: 0c006d6d */ jal func0001b80c
/* 1c190: 0c006d6d */ jal model0001b80c
/* 1c194: 27a70144 */ addiu $a3,$sp,0x144
/* 1c198: 10000072 */ b .PF0001c364
/* 1c19c: 8fbf002c */ lw $ra,0x2c($sp)
@@ -1679,7 +1679,7 @@ glabel var70053fc0pf
/* 1c250: 8fa60168 */ lw $a2,0x168($sp)
/* 1c254: afaf0010 */ sw $t7,0x10($sp)
/* 1c258: afa00014 */ sw $zero,0x14($sp)
/* 1c25c: 0c006d6d */ jal func0001b80c
/* 1c25c: 0c006d6d */ jal model0001b80c
/* 1c260: afb90018 */ sw $t9,0x18($sp)
/* 1c264: 1000003f */ b .PF0001c364
/* 1c268: 8fbf002c */ lw $ra,0x2c($sp)
@@ -1700,7 +1700,7 @@ glabel var70053fc0pf
/* 1c2a0: 03003025 */ move $a2,$t8
/* 1c2a4: 27a70144 */ addiu $a3,$sp,0x144
/* 1c2a8: afa00014 */ sw $zero,0x14($sp)
/* 1c2ac: 0c006d6d */ jal func0001b80c
/* 1c2ac: 0c006d6d */ jal model0001b80c
/* 1c2b0: afac0010 */ sw $t4,0x10($sp)
/* 1c2b4: 1000002b */ b .PF0001c364
/* 1c2b8: 8fbf002c */ lw $ra,0x2c($sp)
@@ -1709,7 +1709,7 @@ glabel var70053fc0pf
/* 1c2c0: 27ae012c */ addiu $t6,$sp,0x12c
/* 1c2c4: afae0018 */ sw $t6,0x18($sp)
/* 1c2c8: afad0010 */ sw $t5,0x10($sp)
/* 1c2cc: 0c006d6d */ jal func0001b80c
/* 1c2cc: 0c006d6d */ jal model0001b80c
/* 1c2d0: afa00014 */ sw $zero,0x14($sp)
/* 1c2d4: 10000023 */ b .PF0001c364
/* 1c2d8: 8fbf002c */ lw $ra,0x2c($sp)
@@ -1720,7 +1720,7 @@ glabel var70053fc0pf
/* 1c2e8: 8de50008 */ lw $a1,0x8($t7)
/* 1c2ec: 50a00006 */ beqzl $a1,.PF0001c308
/* 1c2f0: 8f300000 */ lw $s0,0x0($t9)
/* 1c2f4: 0c0068d7 */ jal func0001a5cc
/* 1c2f4: 0c0068d7 */ jal model0001a5cc
/* 1c2f8: 00003025 */ move $a2,$zero
/* 1c2fc: 10000002 */ b .PF0001c308
/* 1c300: 00408025 */ move $s0,$v0
@@ -1758,7 +1758,7 @@ glabel var70053fc0pf
);
#else
GLOBAL_ASM(
glabel func0001bfa8
glabel model0001bfa8
/* 1bfa8: 27bdfea0 */ addiu $sp,$sp,-352
/* 1bfac: afbf002c */ sw $ra,0x2c($sp)
/* 1bfb0: afb00028 */ sw $s0,0x28($sp)
@@ -1850,7 +1850,7 @@ glabel func0001bfa8
/* 1c0fc: 27a40144 */ addiu $a0,$sp,0x144
/* 1c100: 27a500d4 */ addiu $a1,$sp,0xd4
/* 1c104: 44061000 */ mfc1 $a2,$f2
/* 1c108: 0c006c1f */ jal func0001b07c
/* 1c108: 0c006c1f */ jal model0001b07c
/* 1c10c: 00000000 */ nop
/* 1c110: 8faf003c */ lw $t7,0x3c($sp)
/* 1c114: c7a200e0 */ lwc1 $f2,0xe0($sp)
@@ -1858,7 +1858,7 @@ glabel func0001bfa8
/* 1c11c: 51e00005 */ beqzl $t7,.L0001c134
/* 1c120: 44807000 */ mtc1 $zero,$f14
/* 1c124: 44061000 */ mfc1 $a2,$f2
/* 1c128: 0c006be6 */ jal func0001af98
/* 1c128: 0c006be6 */ jal model0001af98
/* 1c12c: 27a500c8 */ addiu $a1,$sp,0xc8
.L0001c130:
/* 1c130: 44807000 */ mtc1 $zero,$f14
@@ -1918,7 +1918,7 @@ glabel func0001bfa8
/* 1c1fc: afaa0010 */ sw $t2,0x10($sp)
/* 1c200: 27a400b0 */ addiu $a0,$sp,0xb0
/* 1c204: 27a5005c */ addiu $a1,$sp,0x5c
/* 1c208: 0c006c1f */ jal func0001b07c
/* 1c208: 0c006c1f */ jal model0001b07c
/* 1c20c: 8e060034 */ lw $a2,0x34($s0)
/* 1c210: 27a40144 */ addiu $a0,$sp,0x144
.L0001c214:
@@ -1988,7 +1988,7 @@ glabel func0001bfa8
/* 1c30c: 8fa40160 */ lw $a0,0x160($sp)
.L0001c310:
/* 1c310: afb90010 */ sw $t9,0x10($sp)
/* 1c314: 0c006f05 */ jal func0001bc14
/* 1c314: 0c006f05 */ jal model0001bc14
/* 1c318: afb80014 */ sw $t8,0x14($sp)
/* 1c31c: 100000a1 */ b .L0001c5a4
/* 1c320: 8fbf002c */ lw $ra,0x2c($sp)
@@ -2006,13 +2006,13 @@ glabel func0001bfa8
/* 1c34c: afac0014 */ sw $t4,0x14($sp)
/* 1c350: 8fa40160 */ lw $a0,0x160($sp)
/* 1c354: 01002825 */ or $a1,$t0,$zero
/* 1c358: 0c006f05 */ jal func0001bc14
/* 1c358: 0c006f05 */ jal model0001bc14
/* 1c35c: afab0010 */ sw $t3,0x10($sp)
/* 1c360: 10000090 */ b .L0001c5a4
/* 1c364: 8fbf002c */ lw $ra,0x2c($sp)
.L0001c368:
/* 1c368: afad0010 */ sw $t5,0x10($sp)
/* 1c36c: 0c006f05 */ jal func0001bc14
/* 1c36c: 0c006f05 */ jal model0001bc14
/* 1c370: afae0014 */ sw $t6,0x14($sp)
/* 1c374: 1000008b */ b .L0001c5a4
/* 1c378: 8fbf002c */ lw $ra,0x2c($sp)
@@ -2039,7 +2039,7 @@ glabel func0001bfa8
/* 1c3c8: 8fa50164 */ lw $a1,0x164($sp)
/* 1c3cc: e7a40140 */ swc1 $f4,0x140($sp)
/* 1c3d0: 8fa60168 */ lw $a2,0x168($sp)
/* 1c3d4: 0c006e03 */ jal func0001b80c
/* 1c3d4: 0c006e03 */ jal model0001b80c
/* 1c3d8: 27a70144 */ addiu $a3,$sp,0x144
/* 1c3dc: 10000071 */ b .L0001c5a4
/* 1c3e0: 8fbf002c */ lw $ra,0x2c($sp)
@@ -2094,7 +2094,7 @@ glabel func0001bfa8
/* 1c494: 8fa60168 */ lw $a2,0x168($sp)
/* 1c498: afae0010 */ sw $t6,0x10($sp)
/* 1c49c: afa00014 */ sw $zero,0x14($sp)
/* 1c4a0: 0c006e03 */ jal func0001b80c
/* 1c4a0: 0c006e03 */ jal model0001b80c
/* 1c4a4: afaf0018 */ sw $t7,0x18($sp)
/* 1c4a8: 1000003e */ b .L0001c5a4
/* 1c4ac: 8fbf002c */ lw $ra,0x2c($sp)
@@ -2115,7 +2115,7 @@ glabel func0001bfa8
/* 1c4e4: 03203025 */ or $a2,$t9,$zero
/* 1c4e8: 27a70144 */ addiu $a3,$sp,0x144
/* 1c4ec: afa00014 */ sw $zero,0x14($sp)
/* 1c4f0: 0c006e03 */ jal func0001b80c
/* 1c4f0: 0c006e03 */ jal model0001b80c
/* 1c4f4: afab0010 */ sw $t3,0x10($sp)
/* 1c4f8: 1000002a */ b .L0001c5a4
/* 1c4fc: 8fbf002c */ lw $ra,0x2c($sp)
@@ -2124,7 +2124,7 @@ glabel func0001bfa8
/* 1c504: 27ad012c */ addiu $t5,$sp,0x12c
/* 1c508: afad0018 */ sw $t5,0x18($sp)
/* 1c50c: afac0010 */ sw $t4,0x10($sp)
/* 1c510: 0c006e03 */ jal func0001b80c
/* 1c510: 0c006e03 */ jal model0001b80c
/* 1c514: afa00014 */ sw $zero,0x14($sp)
/* 1c518: 10000022 */ b .L0001c5a4
/* 1c51c: 8fbf002c */ lw $ra,0x2c($sp)
@@ -2134,7 +2134,7 @@ glabel func0001bfa8
/* 1c528: 8faf0160 */ lw $t7,0x160($sp)
/* 1c52c: 50a00006 */ beqzl $a1,.L0001c548
/* 1c530: 8df00000 */ lw $s0,0x0($t7)
/* 1c534: 0c006973 */ jal func0001a5cc
/* 1c534: 0c006973 */ jal model0001a5cc
/* 1c538: 00003025 */ or $a2,$zero,$zero
/* 1c53c: 10000002 */ b .L0001c548
/* 1c540: 00408025 */ or $s0,$v0,$zero
@@ -2172,7 +2172,7 @@ glabel func0001bfa8
);
#endif
void func0001c5b4(struct objticksp476 *arg0, struct model *model, struct modelnode *node)
void model0001c5b4(struct objticksp476 *arg0, struct model *model, struct modelnode *node)
{
union modelrodata *rodata = node->rodata;
Mtxf *sp68;
@@ -2181,7 +2181,7 @@ void func0001c5b4(struct objticksp476 *arg0, struct model *model, struct modelno
Mtxf *matrices = model->matrices;
if (node->parent) {
sp68 = func0001a5cc(model, node->parent, 0);
sp68 = model0001a5cc(model, node->parent, 0);
} else {
sp68 = arg0->matrix;
}
@@ -2197,11 +2197,11 @@ void func0001c5b4(struct objticksp476 *arg0, struct model *model, struct modelno
/**
* For a distance node, set its target to visible based on distance.
*/
void func0001c664(struct model *model, struct modelnode *node)
void model0001c664(struct model *model, struct modelnode *node)
{
union modelrodata *rodata = node->rodata;
union modelrwdata *rwdata = modelGetNodeRwData(model, node);
Mtxf *mtx = func0001a5cc(model, node, 0);
Mtxf *mtx = model0001a5cc(model, node, 0);
f32 distance;
if (g_ModelDistanceDisabled || !mtx) {
@@ -2226,7 +2226,7 @@ void func0001c664(struct model *model, struct modelnode *node)
node->child = NULL;
}
void func0001c784(struct model *model, struct modelnode *node)
void model0001c784(struct model *model, struct modelnode *node)
{
struct modelrodata_distance *rodata = &node->rodata->distance;
struct modelrwdata_distance *rwdata = modelGetNodeRwData(model, node);
@@ -2238,7 +2238,7 @@ void func0001c784(struct model *model, struct modelnode *node)
}
}
void func0001c7d0(struct model *model, struct modelnode *node)
void model0001c7d0(struct model *model, struct modelnode *node)
{
struct modelrodata_toggle *rodata = &node->rodata->toggle;
struct modelrwdata_toggle *rwdata = modelGetNodeRwData(model, node);
@@ -2271,7 +2271,7 @@ void modelAttachHead(struct model *model, struct modelnode *bodynode)
}
}
void func0001c868(struct modelnode *basenode, bool visible)
void model0001c868(struct modelnode *basenode, bool visible)
{
union modelrodata *rodata = basenode->rodata;
struct modelnode *node1;
@@ -2329,14 +2329,14 @@ void modelRenderNodeReorder(struct model *model, struct modelnode *node)
{
union modelrwdata *rwdata = modelGetNodeRwData(model, node);
func0001c868(node, rwdata->reorder.visible);
model0001c868(node, rwdata->reorder.visible);
}
void func0001c950(struct model *model, struct modelnode *node)
void model0001c950(struct model *model, struct modelnode *node)
{
union modelrodata *rodata = node->rodata;
union modelrwdata *rwdata = modelGetNodeRwData(model, node);
Mtxf *mtx = func0001a5cc(model, node, 0);
Mtxf *mtx = model0001a5cc(model, node, 0);
struct coord sp38;
struct coord sp2c;
f32 tmp;
@@ -2377,7 +2377,7 @@ void func0001c950(struct model *model, struct modelnode *node)
modelRenderNodeReorder(model, node);
}
void func0001cb0c(struct model *model, struct modelnode *parent)
void model0001cb0c(struct model *model, struct modelnode *parent)
{
struct modelnode *node = parent->child;
@@ -2399,10 +2399,10 @@ void func0001cb0c(struct model *model, struct modelnode *parent)
dochildren = false;
break;
case MODELNODETYPE_DISTANCE:
func0001c664(model, node);
model0001c664(model, node);
break;
case MODELNODETYPE_REORDER:
func0001c950(model, node);
model0001c950(model, node);
break;
case MODELNODETYPE_HEADSPOT:
modelAttachHead(model, node);
@@ -2431,7 +2431,7 @@ void func0001cb0c(struct model *model, struct modelnode *parent)
}
}
void func0001cc20(struct model *model)
void model0001cc20(struct model *model)
{
struct modelnode *node = model->filedata->rootnode;
@@ -2440,13 +2440,13 @@ void func0001cc20(struct model *model)
switch (type) {
case MODELNODETYPE_DISTANCE:
func0001c664(model, node);
model0001c664(model, node);
break;
case MODELNODETYPE_REORDER:
func0001c950(model, node);
model0001c950(model, node);
break;
case MODELNODETYPE_TOGGLE:
func0001c7d0(model, node);
model0001c7d0(model, node);
break;
case MODELNODETYPE_HEADSPOT:
modelAttachHead(model, node);
@@ -2472,7 +2472,7 @@ void func0001cc20(struct model *model)
}
}
void func0001cd18(struct objticksp476 *arg0, struct model *model)
void model0001cd18(struct objticksp476 *arg0, struct model *model)
{
struct modelnode *node = model->filedata->rootnode;
@@ -2481,22 +2481,22 @@ void func0001cd18(struct objticksp476 *arg0, struct model *model)
switch (type) {
case MODELNODETYPE_CHRINFO:
func0001b400(arg0, model, node);
model0001b400(arg0, model, node);
break;
case MODELNODETYPE_POSITION:
func0001bfa8(arg0, model, node);
model0001bfa8(arg0, model, node);
break;
case MODELNODETYPE_POSITIONHELD:
func0001c5b4(arg0, model, node);
model0001c5b4(arg0, model, node);
break;
case MODELNODETYPE_DISTANCE:
func0001c664(model, node);
model0001c664(model, node);
break;
case MODELNODETYPE_REORDER:
func0001c950(model, node);
model0001c950(model, node);
break;
case MODELNODETYPE_TOGGLE:
func0001c7d0(model, node);
model0001c7d0(model, node);
break;
case MODELNODETYPE_HEADSPOT:
modelAttachHead(model, node);
@@ -2521,24 +2521,24 @@ void func0001cd18(struct objticksp476 *arg0, struct model *model)
}
}
void func0001ce64(struct objticksp476 *arg0, struct model *model)
void model0001ce64(struct objticksp476 *arg0, struct model *model)
{
model->matrices = arg0->unk10;
arg0->unk10 += model->filedata->nummatrices;
#if VERSION >= VERSION_PAL_FINAL
if (var8005efb0_2 || !func00018680()) {
func0001cd18(arg0, model);
if (var8005efb0_2 || !model00018680()) {
model0001cd18(arg0, model);
}
#else
if (!func00018680()) {
func0001cd18(arg0, model);
if (!model00018680()) {
model0001cd18(arg0, model);
}
#endif
}
void func0001cebc(struct objticksp476 *arg0, struct model *model)
void model0001cebc(struct objticksp476 *arg0, struct model *model)
{
struct anim *anim = model->anim;
f32 speed;
@@ -2580,7 +2580,7 @@ void func0001cebc(struct objticksp476 *arg0, struct model *model)
func00023d0c();
}
func0001ce64(arg0, model);
model0001ce64(arg0, model);
if (PLAYERCOUNT() >= 2 && anim && anim->animnum) {
anim->frac = frac;
@@ -2747,7 +2747,7 @@ void modelCopyAnimForMerge(struct model *model, f32 merge)
}
}
void func0001d62c(struct model *model, s16 animnum, s32 flip, f32 fstartframe, f32 speed, f32 merge)
void model0001d62c(struct model *model, s16 animnum, s32 flip, f32 fstartframe, f32 speed, f32 merge)
{
struct anim *anim = model->anim;
@@ -2770,7 +2770,7 @@ void func0001d62c(struct model *model, s16 animnum, s32 flip, f32 fstartframe, f
anim->speed = speed;
anim->timespeed = 0;
func0001e018(model, fstartframe);
model0001e018(model, fstartframe);
anim->looping = false;
@@ -2889,7 +2889,7 @@ void func0001d62c(struct model *model, s16 animnum, s32 flip, f32 fstartframe, f
angle += M_BADTAU;
}
rwdata->unk30 = func0001afe8(rwdata->unk14, angle, anim->frac);
rwdata->unk30 = model0001afe8(rwdata->unk14, angle, anim->frac);
if (rwdata->unk18 == 0) {
rwdata->unk20 = rwdata->unk30 + sp84;
@@ -2933,7 +2933,7 @@ void modelSetAnimationWithMerge(struct model *model, s16 animnum, u32 flip, f32
modelCopyAnimForMerge(model, timemerge);
}
func0001d62c(model, animnum, flip, startframe, speed, timemerge);
model0001d62c(model, animnum, flip, startframe, speed, timemerge);
}
}
@@ -2947,7 +2947,7 @@ void modelSetAnimation(struct model *model, s16 animnum, s32 flip, f32 startfram
}
modelCopyAnimForMerge(model, merge);
func0001d62c(model, animnum, flip, startframe, speed, merge);
model0001d62c(model, animnum, flip, startframe, speed, merge);
}
}
@@ -3056,7 +3056,7 @@ void modelSetAnim70(struct model *model, void *callback)
}
}
void func0001e018(struct model *model, f32 arg1)
void model0001e018(struct model *model, f32 arg1)
{
s32 sp28;
s32 sp24;
@@ -3085,12 +3085,12 @@ void func0001e018(struct model *model, f32 arg1)
}
}
void func0001e14c(struct model *model, f32 arg1, f32 arg2)
void model0001e14c(struct model *model, f32 arg1, f32 arg2)
{
struct anim *anim = model->anim;
if (anim) {
func0001e018(model, arg1);
model0001e018(model, arg1);
if (anim->animnum2) {
s32 sp28 = floor(arg2);
@@ -3125,18 +3125,18 @@ u32 var8005eff0 = 0x00000000;
u32 var8005eff4 = 0x00000000;
u32 var8005eff8 = 0xffffffff;
void func0001e29c(bool value)
void model0001e29c(bool value)
{
var8005efdc = value;
}
bool func0001e2a8(void)
bool model0001e2a8(void)
{
return var8005efdc;
}
GLOBAL_ASM(
glabel func0001e2b4
glabel model0001e2b4
.late_rodata
glabel var70054450
.word 0x40c907a9
@@ -3896,7 +3896,7 @@ glabel var70054450
/* 1edac: 02002025 */ or $a0,$s0,$zero
/* 1edb0: 8fa50138 */ lw $a1,0x138($sp)
/* 1edb4: 4406a000 */ mfc1 $a2,$f20
/* 1edb8: 0c007853 */ jal func0001e14c
/* 1edb8: 0c007853 */ jal model0001e14c
/* 1edbc: 00000000 */ nop
/* 1edc0: 10000008 */ b .L0001ede4
/* 1edc4: 8fbf006c */ lw $ra,0x6c($sp)
@@ -3905,7 +3905,7 @@ glabel var70054450
/* 1edcc: 02002025 */ or $a0,$s0,$zero
/* 1edd0: 8fa50138 */ lw $a1,0x138($sp)
/* 1edd4: 4406a000 */ mfc1 $a2,$f20
/* 1edd8: 0c007853 */ jal func0001e14c
/* 1edd8: 0c007853 */ jal model0001e14c
/* 1eddc: 00000000 */ nop
.L0001ede0:
/* 1ede0: 8fbf006c */ lw $ra,0x6c($sp)
@@ -3925,7 +3925,7 @@ glabel var70054450
/* 1ee14: 27bd0130 */ addiu $sp,$sp,0x130
);
void func0001ee18(struct model *model, s32 lvupdate240, bool arg2)
void model0001ee18(struct model *model, s32 lvupdate240, bool arg2)
{
f32 frame;
f32 frame2;
@@ -4024,9 +4024,9 @@ void func0001ee18(struct model *model, s32 lvupdate240, bool arg2)
f32 prevelapsespeed = anim->elapsespeed;
if (arg2) {
func0001e2b4(model, anim->frame, endframe, 0, 0);
model0001e2b4(model, anim->frame, endframe, 0, 0);
} else {
func0001e14c(model, endframe, 0);
model0001e14c(model, endframe, 0);
}
modelSetAnimation(model, anim->animnum, anim->flip, startframe, anim->speed, anim->loopmerge);
@@ -4051,15 +4051,15 @@ void func0001ee18(struct model *model, s32 lvupdate240, bool arg2)
if (arg2) {
if (anim->animnum2) {
func0001e2b4(model, anim->frame, frame, anim->frame2, frame2);
model0001e2b4(model, anim->frame, frame, anim->frame2, frame2);
} else {
func0001e2b4(model, anim->frame, frame, 0, 0);
model0001e2b4(model, anim->frame, frame, 0, 0);
}
} else {
if (anim->animnum2) {
func0001e14c(model, frame, frame2);
model0001e14c(model, frame, frame2);
} else {
func0001e14c(model, frame, 0);
model0001e14c(model, frame, 0);
}
}
}
@@ -4069,7 +4069,7 @@ void func0001ee18(struct model *model, s32 lvupdate240, bool arg2)
/**
* This is identical to the above function but removes the 0.25f multipliers.
*/
void func0001f314(struct model *model, s32 lvupdate240, bool arg2)
void model0001f314(struct model *model, s32 lvupdate240, bool arg2)
{
f32 frame;
f32 frame2;
@@ -4168,9 +4168,9 @@ void func0001f314(struct model *model, s32 lvupdate240, bool arg2)
f32 prevelapsespeed = anim->elapsespeed;
if (arg2) {
func0001e2b4(model, anim->frame, endframe, 0, 0);
model0001e2b4(model, anim->frame, endframe, 0, 0);
} else {
func0001e14c(model, endframe, 0);
model0001e14c(model, endframe, 0);
}
modelSetAnimation(model, anim->animnum, anim->flip, startframe, anim->speed, anim->loopmerge);
@@ -4195,22 +4195,22 @@ void func0001f314(struct model *model, s32 lvupdate240, bool arg2)
if (arg2) {
if (anim->animnum2) {
func0001e2b4(model, anim->frame, frame, anim->frame2, frame2);
model0001e2b4(model, anim->frame, frame, anim->frame2, frame2);
} else {
func0001e2b4(model, anim->frame, frame, 0, 0);
model0001e2b4(model, anim->frame, frame, 0, 0);
}
} else {
if (anim->animnum2) {
func0001e14c(model, frame, frame2);
model0001e14c(model, frame, frame2);
} else {
func0001e14c(model, frame, 0);
model0001e14c(model, frame, 0);
}
}
}
}
#endif
void func0001f7e0(struct modelrenderdata *renderdata)
void model0001f7e0(struct modelrenderdata *renderdata)
{
gDPPipeSync(renderdata->gdl++);
gDPSetCycleType(renderdata->gdl++, G_CYC_1CYCLE);
@@ -4224,7 +4224,7 @@ void func0001f7e0(struct modelrenderdata *renderdata)
gDPSetCombineMode(renderdata->gdl++, G_CC_MODULATEIA, G_CC_MODULATEIA);
}
void func0001f890(struct modelrenderdata *renderdata, bool arg1)
void model0001f890(struct modelrenderdata *renderdata, bool arg1)
{
if (renderdata->unk30 == 7) {
if (arg1) {
@@ -4382,7 +4382,7 @@ void func0001f890(struct modelrenderdata *renderdata, bool arg1)
}
}
void func00020248(struct modelrenderdata *renderdata, bool arg1)
void model00020248(struct modelrenderdata *renderdata, bool arg1)
{
if (renderdata->unk30 == 7) {
gDPPipeSync(renderdata->gdl++);
@@ -4537,7 +4537,7 @@ void func00020248(struct modelrenderdata *renderdata, bool arg1)
}
}
void func00020bdc(struct modelrenderdata *renderdata)
void model00020bdc(struct modelrenderdata *renderdata)
{
gDPPipeSync(renderdata->gdl++);
gDPSetCycleType(renderdata->gdl++, G_CYC_2CYCLE);
@@ -4579,23 +4579,23 @@ void modelRenderNodeGundl(struct modelrenderdata *renderdata, struct model *mode
switch (rodata->unk12) {
case 1:
func0001f7e0(renderdata);
model0001f7e0(renderdata);
break;
case 3:
func0001f890(renderdata, true);
model0001f890(renderdata, true);
break;
case 4:
func00020248(renderdata, true);
model00020248(renderdata, true);
break;
case 2:
func00020bdc(renderdata);
model00020bdc(renderdata);
break;
}
gSPDisplayList(renderdata->gdl++, rodata->primary);
if (rodata->unk12 == 3 && rodata->secondary) {
func0001f890(renderdata, false);
model0001f890(renderdata, false);
gSPDisplayList(renderdata->gdl++, rodata->secondary);
}
@@ -4608,7 +4608,7 @@ void modelRenderNodeGundl(struct modelrenderdata *renderdata, struct model *mode
modelApplyCullMode(renderdata);
}
func00020248(renderdata, false);
model00020248(renderdata, false);
gSPDisplayList(renderdata->gdl++, rodata->secondary);
}
@@ -4634,16 +4634,16 @@ void modelRenderNodeDl(struct modelrenderdata *renderdata, struct model *model,
switch (rodata->dl.mcount) {
case 1:
func0001f7e0(renderdata);
model0001f7e0(renderdata);
break;
case 3:
func0001f890(renderdata, true);
model0001f890(renderdata, true);
break;
case 4:
func00020248(renderdata, true);
model00020248(renderdata, true);
break;
case 2:
func00020bdc(renderdata);
model00020bdc(renderdata);
break;
}
@@ -4653,7 +4653,7 @@ void modelRenderNodeDl(struct modelrenderdata *renderdata, struct model *model,
gSPDisplayList(renderdata->gdl++, rwdata->dl.gdl);
if (rodata->dl.mcount == 3 && rodata->dl.secondary) {
func0001f890(renderdata, false);
model0001f890(renderdata, false);
gSPDisplayList(renderdata->gdl++, rodata->dl.secondary);
}
@@ -4673,7 +4673,7 @@ void modelRenderNodeDl(struct modelrenderdata *renderdata, struct model *model,
gSPSegment(renderdata->gdl++, 0x04, osVirtualToPhysical(rwdata->dl.vertices));
gSPSegment(renderdata->gdl++, 0x06, osVirtualToPhysical(rwdata->dl.unk08));
func00020248(renderdata, false);
model00020248(renderdata, false);
gSPDisplayList(renderdata->gdl++, rodata->dl.secondary);
}
@@ -4978,7 +4978,7 @@ glabel modelRenderNodeType16
/* 216c8: 27bd0048 */ addiu $sp,$sp,0x48
);
void func000216cc(struct modelrenderdata *renderdata, struct textureconfig *tconfig, s32 arg2)
void model000216cc(struct modelrenderdata *renderdata, struct textureconfig *tconfig, s32 arg2)
{
func0f0b39c0(&renderdata->gdl, tconfig, arg2, renderdata->zbufferenabled, 2, 1, NULL);
}
@@ -5022,7 +5022,7 @@ glabel var70054454
/* 21784: 02002025 */ or $a0,$s0,$zero
/* 21788: 51c001d4 */ beqzl $t6,.L00021edc
/* 2178c: 8fbf0024 */ lw $ra,0x24($sp)
/* 21790: 0c006949 */ jal func0001a524
/* 21790: 0c006949 */ jal model0001a524
/* 21794: 00002825 */ or $a1,$zero,$zero
/* 21798: 8fab0114 */ lw $t3,0x114($sp)
/* 2179c: 0002c180 */ sll $t8,$v0,0x6
@@ -5444,12 +5444,12 @@ glabel var70054454
/* 21e0c: a6070014 */ sh $a3,0x14($s0)
/* 21e10: a6070022 */ sh $a3,0x22($s0)
/* 21e14: a609002c */ sh $t1,0x2c($s0)
/* 21e18: 0c0085b3 */ jal func000216cc
/* 21e18: 0c0085b3 */ jal model000216cc
/* 21e1c: 02202825 */ or $a1,$s1,$zero
/* 21e20: 10000004 */ b .L00021e34
/* 21e24: 8e63000c */ lw $v1,0xc($s3)
.L00021e28:
/* 21e28: 0c0085b3 */ jal func000216cc
/* 21e28: 0c0085b3 */ jal model000216cc
/* 21e2c: 24060001 */ addiu $a2,$zero,0x1
/* 21e30: 8e63000c */ lw $v1,0xc($s3)
.L00021e34:
@@ -5544,7 +5544,7 @@ glabel var70054454
//
// // 778
// if ((renderdata->flags & 2) && rwdata->gunfire.visible) {
// mtx = &model->matrices[func0001a524(node, 0)];
// mtx = &model->matrices[model0001a524(node, 0)];
//
// spe0.x = -(rodata->pos.f[0] * mtx->m[0][0] + rodata->pos.f[1] * mtx->m[1][0] + rodata->pos.f[2] * mtx->m[2][0] + mtx->m[3][0]);
// spe0.y = -(rodata->pos.f[0] * mtx->m[0][1] + rodata->pos.f[1] * mtx->m[1][1] + rodata->pos.f[2] * mtx->m[2][1] + mtx->m[3][1]);
@@ -5644,9 +5644,9 @@ glabel var70054454
// vertices[3].unk08 = centre - sp58;
// vertices[3].unk0a = centre + sp5c;
//
// func000216cc(renderdata, tconfig, 4);
// model000216cc(renderdata, tconfig, 4);
// } else {
// func000216cc(renderdata, NULL, 1);
// model000216cc(renderdata, NULL, 1);
// }
//
// gSPSetGeometryMode(renderdata->gdl++, G_CULL_BACK);
@@ -5733,7 +5733,7 @@ void modelRender(struct modelrenderdata *renderdata, struct model *model)
}
GLOBAL_ASM(
glabel func000220fc
glabel model000220fc
/* 220fc: 3c018006 */ lui $at,%hi(var8005efc0)
/* 22100: c424efc0 */ lwc1 $f4,%lo(var8005efc0)($at)
/* 22104: 44803000 */ mtc1 $zero,$f6
@@ -6065,7 +6065,7 @@ glabel func000220fc
/* 225d0: 27bd00d0 */ addiu $sp,$sp,0xd0
);
s32 func000225d4(struct model *model, struct coord *arg1, struct coord *arg2, struct modelnode **startnode)
s32 model000225d4(struct model *model, struct coord *arg1, struct coord *arg2, struct modelnode **startnode)
{
struct modelnode *node;
bool dochildren = true;
@@ -6107,9 +6107,9 @@ s32 func000225d4(struct model *model, struct coord *arg1, struct coord *arg2, st
switch (type) {
case MODELNODETYPE_BBOX:
rodata = node->rodata;
mtx = func0001a5cc(model, node, 0);
mtx = model0001a5cc(model, node, 0);
if (func000220fc(rodata, mtx, arg1, arg2)) {
if (model000220fc(rodata, mtx, arg1, arg2)) {
*startnode = node;
return rodata->bbox.hitpart;
}
@@ -6329,7 +6329,7 @@ s32 modelCalculateRwDataIndexes(struct modelnode *basenode)
rodata = node->rodata;
rodata->reorder.rwdataindex = len;
len += sizeof(struct modelrwdata_reorder) / 4;
func0001c868(node, false);
model0001c868(node, false);
break;
case MODELNODETYPE_0B:
rodata = node->rodata;
@@ -6556,7 +6556,7 @@ void animInit(struct anim *anim)
}
GLOBAL_ASM(
glabel func00023108
glabel model00023108
/* 23108: 27bdffe8 */ addiu $sp,$sp,-24
/* 2310c: afbf0014 */ sw $ra,0x14($sp)
/* 23110: afa5001c */ sw $a1,0x1c($sp)
@@ -6658,7 +6658,7 @@ void modelIterateDisplayLists(struct modelfiledata *filedata, struct modelnode *
node->child = rodata->toggle.target;
break;
case MODELNODETYPE_REORDER:
func0001c868(node, true);
model0001c868(node, true);
break;
}
+73 -73
View File
@@ -15,23 +15,23 @@ glabel var8005ef40
.word 0x00000000
glabel var8005ef5c
.word func00018680+0xef4
.word func00018680+0xa3c
.word func00018680+0x3a8
.word func00018680+0x990
.word func00018680+0xecc
.word func00018680+0xed4
.word func00018680+0xe60
.word func00018680+0xe24
.word model00018680+0xef4
.word model00018680+0xa3c
.word model00018680+0x3a8
.word model00018680+0x990
.word model00018680+0xecc
.word model00018680+0xed4
.word model00018680+0xe60
.word model00018680+0xe24
glabel var8005ef7c
.word 0x00000000
glabel var8005ef80
.word func00019be0+0x84
.word func00019be0+0x90
.word func00019be0+0xa8
.word func00019be0+0xcc
.word model00019be0+0x84
.word model00019be0+0x90
.word model00019be0+0xa8
.word model00019be0+0xcc
glabel var8005ef90
.word 0xff08ffff
@@ -121,7 +121,7 @@ glabel var70054270
.text
glabel func00018680
glabel model00018680
addiu $sp, $sp, -2048
sw $s0, 0x780($sp)
sw $s1, 0x784($sp)
@@ -194,7 +194,7 @@ glabel func00018680
sll $t6, $t6, 0x2
add $t6, $t5, $t6
lw $t6, 0x0($t6)
jal func00019634
jal model00019634
addi $gp, $zero, 0x0
mtc1 $zero, $f1
lwc1 $f0, 0x10($a2)
@@ -247,7 +247,7 @@ glabel func00018680
sll $t6, $t6, 0x2
add $t6, $t5, $t6
lw $t6, 0x0($t6)
jal func000198dc
jal model000198dc
addi $gp, $zero, 0x0
.L00018874:
mtc1 $zero, $f1
@@ -289,7 +289,7 @@ glabel func00018680
sll $t6, $t6, 0x2
add $t6, $t5, $t6
lw $t6, 0x0($t6)
jal func00019634
jal model00019634
addi $gp, $zero, 0x0
mtc1 $zero, $f1
lwc1 $f0, 0x34($a2)
@@ -334,7 +334,7 @@ glabel func00018680
sll $t6, $t6, 0x2
add $t6, $t5, $t6
lw $t6, 0x0($t6)
jal func000198dc
jal model000198dc
addi $gp, $zero, 0x0
.L000189cc:
lw $a3, 0x8($a1)
@@ -438,9 +438,9 @@ glabel func00018680
lhu $s3, 0x3c4($t0)
lhu $s4, 0x3c6($t0)
.L00018b3c:
jal func0001a024
jal model0001a024
sw $t0, 0x7e8($sp)
jal func00019f2c
jal model00019f2c
nop
mov.s $f16, $f0
mov.s $f17, $f1
@@ -448,11 +448,11 @@ glabel func00018680
mov.s $f19, $f3
or $t2, $s2, $zero
or $t3, $s3, $zero
jal func0001a024
jal model0001a024
or $t4, $s4, $zero
jal func00019f2c
jal model00019f2c
nop
jal func00019ddc
jal model00019ddc
lwc1 $f30, 0x7e0($sp)
addiu $t0, $zero, 0x1
sw $t0, 0x7e4($sp)
@@ -461,7 +461,7 @@ glabel func00018680
swc1 $f1, 0x7ec($sp)
swc1 $f2, 0x7f0($sp)
swc1 $f3, 0x7f4($sp)
jal func0001a110
jal model0001a110
nop
j .L00018c6c
nop
@@ -516,9 +516,9 @@ glabel func00018680
add $s0, $zero, $t2
add $s1, $zero, $t3
add $s2, $zero, $t4
jal func00019f98
jal model00019f98
add $s3, $zero, $t0
jal func0001a0ac
jal model0001a0ac
add $t0, $zero, $s3
.L00018c6c:
andi $t2, $s8, 0x2
@@ -576,7 +576,7 @@ glabel func00018680
lw $t0, 0x8($gp)
beqz $t0, .L00018d48
nop
jal func0001a25c
jal model0001a25c
nop
b .L00018d4c
nop
@@ -587,7 +587,7 @@ glabel func00018680
lhu $t2, 0xe($t1)
sll $t2, $t2, 0x6
lw $t1, 0xc($a1)
jal func0001a1c0
jal model0001a1c0
add $t1, $t1, $t2
lui $t3, %hi(var8005efcc)
addiu $t3, $t3, %lo(var8005efcc)
@@ -677,9 +677,9 @@ glabel func00018680
add $t2, $zero, $s0
add $t3, $zero, $s1
add $t4, $zero, $s2
jal func0001a024
jal model0001a024
add $s0, $zero, $t0
jal func00019f2c
jal model00019f2c
add $t0, $zero, $s0
.L00018ecc:
lui $at, 0x3f00
@@ -714,7 +714,7 @@ glabel func00018680
c.le.s $f6, $f7
bc1f .L00018f8c
nop
jal func0001a2dc
jal model0001a2dc
nop
mov.s $f17, $f0
mul.s $f12, $f6, $f8
@@ -744,12 +744,12 @@ glabel func00018680
mul.s $f3, $f3, $f8
add.s $f0, $f0, $f4
.L00018fb4:
jal func0001a110
jal model0001a110
lw $t1, 0x4($gp)
lhu $t2, 0x10($t1)
sll $t2, $t2, 0x6
lw $t1, 0xc($a1)
jal func0001a1c0
jal model0001a1c0
add $t1, $t1, $t2
j .L00019574
nop
@@ -769,11 +769,11 @@ glabel func00018680
lhu $s8, 0x0($t0)
.L0001900c:
syscall
jal func0001a25c
jal model0001a25c
add $t0, $zero, $gp
lui $t2, %hi(g_ModelDistanceDisabled)
addiu $t2, $t2, %lo(g_ModelDistanceDisabled)
jal func00019d1c
jal model00019d1c
lw $t1, 0x4($gp)
lw $t2, 0x0($t2)
bnez $t2, .L00019068
@@ -891,9 +891,9 @@ glabel func00018680
lhu $s3, 0x3c4($t0)
lhu $s4, 0x3c6($t0)
.L000191cc:
jal func0001a024
jal model0001a024
sw $t0, 0x7e8($sp)
jal func00019f2c
jal model00019f2c
nop
mov.s $f16, $f0
mov.s $f17, $f1
@@ -901,14 +901,14 @@ glabel func00018680
mov.s $f19, $f3
or $t2, $s2, $zero
or $t3, $s3, $zero
jal func0001a024
jal model0001a024
or $t4, $s4, $zero
jal func00019f2c
jal model00019f2c
nop
jal func00019ddc
jal model00019ddc
lwc1 $f30, 0x7e0($sp)
lw $t0, 0x7e8($sp)
jal func0001a110
jal model0001a110
nop
j .L000192a8
nop
@@ -936,7 +936,7 @@ glabel func00018680
.L0001926c:
andi $t3, $t3, 0xffff
andi $t4, $t4, 0xffff
jal func00019f98
jal model00019f98
lhu $t2, 0x2($t0)
b .L000192a0
nop
@@ -946,13 +946,13 @@ glabel func00018680
lhu $s8, 0x0($t0)
lhu $t4, 0x6($t0)
lhu $t3, 0x4($t0)
jal func00019f98
jal model00019f98
lhu $t2, 0x2($t0)
.L000192a0:
jal func0001a0ac
jal model0001a0ac
nop
.L000192a8:
jal func00019d1c
jal model00019d1c
mtc1 $zero, $f0
mov.s $f27, $f12
mov.s $f28, $f13
@@ -1066,7 +1066,7 @@ glabel func00018680
lhu $t2, 0x2($t1)
sll $t2, $t2, 0x6
lw $t1, 0xc($a1)
jal func0001a1c0
jal model0001a1c0
add $t1, $t1, $t2
j .L00019574
nop
@@ -1086,7 +1086,7 @@ glabel func00018680
lhu $s8, 0x0($t0)
.L000194a0:
syscall
jal func00019d1c
jal model00019d1c
nop
lw $t1, 0x0($v0)
beqz $t1, .L00019574
@@ -1108,7 +1108,7 @@ glabel func00018680
j .L000194fc
lw $t0, 0x0($a0)
.L000194f4:
jal func0001a25c
jal model0001a25c
nop
.L000194fc:
lw $t1, 0x4($gp)
@@ -1127,13 +1127,13 @@ glabel func00018680
lhu $t2, 0xc($t1)
sll $t2, $t2, 0x6
lw $t1, 0xc($a1)
jal func0001a1c0
jal model0001a1c0
add $t1, $t1, $t2
j .L00019574
nop
j .L00019574
nop
jal func00019d1c
jal model00019d1c
lw $t0, 0x4($gp)
lw $t1, 0x0($v0)
beqz $t1, .L00019570
@@ -1196,7 +1196,7 @@ glabel func00018680
addiu $sp, $sp, 0x800
syscall
glabel func00019634
glabel model00019634
sw $ra, 0x7ac($sp)
.L00019638:
lbu $t7, 0x0($t2)
@@ -1238,7 +1238,7 @@ glabel func00019634
j .L00019808
addi $t2, $t2, 0xc
.L000196cc:
jal func00019be0
jal model00019be0
lbu $v1, 0x2($t2)
add $s0, $zero, $v0
lbu $v1, 0x2($t2)
@@ -1264,7 +1264,7 @@ glabel func00019634
addu $s3, $s3, $s4
addu $s0, $s0, $s3
andi $s0, $s0, 0xffff
jal func00019be0
jal model00019be0
lbu $v1, 0x5($t2)
add $s1, $zero, $v0
lbu $v1, 0x5($t2)
@@ -1290,7 +1290,7 @@ glabel func00019634
addu $s3, $s3, $s4
addu $s1, $s1, $s3
andi $s1, $s1, 0xffff
jal func00019be0
jal model00019be0
lbu $v1, 0x8($t2)
add $s2, $zero, $v0
lbu $v1, 0x8($t2)
@@ -1328,7 +1328,7 @@ glabel func00019634
j .L000198b4
addi $s2, $zero, 0x0
.L00019820:
jal func00019be0
jal model00019be0
lbu $v1, 0x2($t2)
add $s0, $zero, $v0
lbu $v1, 0x0($t2)
@@ -1340,7 +1340,7 @@ glabel func00019634
sub $v0, $v0, $t4
sllv $s0, $s0, $v0
andi $s0, $s0, 0xffff
jal func00019be0
jal model00019be0
lbu $v1, 0x5($t2)
add $s1, $zero, $v0
lbu $v1, 0x3($t2)
@@ -1352,7 +1352,7 @@ glabel func00019634
sub $v0, $v0, $t4
sllv $s1, $s1, $v0
andi $s1, $s1, 0xffff
jal func00019be0
jal model00019be0
lbu $v1, 0x8($t2)
add $s2, $zero, $v0
lbu $v1, 0x6($t2)
@@ -1377,7 +1377,7 @@ glabel func00019634
jr $ra
nop
glabel func000198dc
glabel model000198dc
sw $ra, 0x7ac($sp)
.L000198e0:
lbu $t7, 0x0($t2)
@@ -1445,7 +1445,7 @@ glabel func000198dc
j .L00019a64
addi $s2, $zero, 0x0
.L000199d0:
jal func00019be0
jal model00019be0
lbu $v1, 0x2($t2)
add $s0, $zero, $v0
lbu $v1, 0x0($t2)
@@ -1457,7 +1457,7 @@ glabel func000198dc
sub $v0, $v0, $t4
sllv $s0, $s0, $v0
andi $s0, $s0, 0xffff
jal func00019be0
jal model00019be0
lbu $v1, 0x5($t2)
add $s1, $zero, $v0
lbu $v1, 0x3($t2)
@@ -1469,7 +1469,7 @@ glabel func000198dc
sub $v0, $v0, $t4
sllv $s1, $s1, $v0
andi $s1, $s1, 0xffff
jal func00019be0
jal model00019be0
lbu $v1, 0x8($t2)
add $s2, $zero, $v0
lbu $v1, 0x6($t2)
@@ -1588,7 +1588,7 @@ glabel func000198dc
jr $ra
nop
glabel func00019be0
glabel model00019be0
beqz $v1, .L00019d14
addi $v0, $zero, 0x0
.L00019be8:
@@ -1675,7 +1675,7 @@ glabel func00019be0
jr $ra
nop
glabel func00019d1c
glabel model00019d1c
addiu $sp, $sp, -32
sw $gp, 0x0($sp)
sw $t0, 0x4($sp)
@@ -1712,7 +1712,7 @@ glabel func00019d1c
addiu $at, $zero, 0x17
bne $t1, $at, .L00019d84
nop
jal func00019d1c
jal model00019d1c
nop
lw $t3, 0x4($v0)
.L00019db0:
@@ -1781,7 +1781,7 @@ glabel modelGetNodeRwData
addiu $sp, $sp, 0x10
#endif
glabel func00019ddc
glabel model00019ddc
sw $ra, 0x7ac($sp)
.L00019de0:
mul.s $f5, $f16, $f0
@@ -1831,7 +1831,7 @@ glabel func00019ddc
c.le.s $f6, $f7
bc1f .L00019f20
nop
jal func0001a2dc
jal model0001a2dc
nop
mov.s $f20, $f0
jal sinf
@@ -1872,7 +1872,7 @@ glabel func00019ddc
j .L00019ed8
sub.s $f5, $f5, $f30
glabel func00019f2c
glabel model00019f2c
mul.s $f6, $f0, $f2
nop
mul.s $f7, $f0, $f3
@@ -1901,7 +1901,7 @@ glabel func00019f2c
jr $ra
sub.s $f3, $f26, $f10
glabel func00019f98
glabel model00019f98
add $t5, $zero, $ra
lui $at, %hi(var7005422c)
lwc1 $f29, %lo(var7005422c)($at)
@@ -1938,7 +1938,7 @@ glabel func00019f98
jr $ra
nop
glabel func0001a024
glabel model0001a024
add $t5, $zero, $ra
lui $at, %hi(var70054234)
lwc1 $f29, %lo(var70054234)($at)
@@ -1974,7 +1974,7 @@ glabel func0001a024
jr $ra
nop
glabel func0001a0ac
glabel model0001a0ac
mul.s $f6, $f1, $f5
nop
mul.s $f7, $f0, $f5
@@ -2001,7 +2001,7 @@ glabel func0001a0ac
jr $ra
sub.s $f19, $f19, $f8
glabel func0001a110
glabel model0001a110
mul.s $f4, $f0, $f0
nop
mul.s $f5, $f1, $f1
@@ -2047,7 +2047,7 @@ glabel func0001a110
jr $ra
sub.s $f20, $f20, $f26
glabel func0001a1c0
glabel model0001a1c0
addiu $t2, $zero, 0x3
.L0001a1c4:
lwc1 $f0, 0x0($t0)
@@ -2089,7 +2089,7 @@ glabel func0001a1c0
jr $ra
swc1 $f31, 0x30($t1)
glabel func0001a25c
glabel model0001a25c
.L0001a25c:
lh $t1, 0x0($t0)
andi $t1, $t1, 0xff
@@ -2127,7 +2127,7 @@ glabel func0001a25c
jr $ra
add $t0, $zero, $zero
glabel func0001a2dc
glabel model0001a2dc
lui $at, %hi(var7005423c)
lwc1 $f7, %lo(var7005423c)($at)
mul.s $f7, $f6, $f7