diff --git a/src/game/chr/chr.c b/src/game/chr/chr.c index 32e83e325..9f2e83ca6 100644 --- a/src/game/chr/chr.c +++ b/src/game/chr/chr.c @@ -28228,7 +28228,7 @@ glabel func0f034524 /* f0362fc: c6320010 */ lwc1 $f18,0x10($s1) /* f036300: c5e40010 */ lwc1 $f4,0x10($t7) /* f036304: 46122281 */ sub.s $f10,$f4,$f18 -/* f036308: 0c0011e4 */ jal func00004790 +/* f036308: 0c0011e4 */ jal scaleTo1 /* f03630c: e60a02f8 */ swc1 $f10,0x2f8($s0) /* f036310: c60602f0 */ lwc1 $f6,0x2f0($s0) /* f036314: c7a80080 */ lwc1 $f8,0x80($sp) @@ -34650,7 +34650,7 @@ glabel func0f03ba44 /* f03bb2c: c6240010 */ lwc1 $f4,0x10($s1) /* f03bb30: c5860010 */ lwc1 $f6,0x10($t4) /* f03bb34: 46062201 */ sub.s $f8,$f4,$f6 -/* f03bb38: 0c0011e4 */ jal func00004790 +/* f03bb38: 0c0011e4 */ jal scaleTo1 /* f03bb3c: e7a8003c */ swc1 $f8,0x3c($sp) /* f03bb40: 27a40040 */ addiu $a0,$sp,0x40 /* f03bb44: 02202825 */ or $a1,$s1,$zero @@ -40196,7 +40196,7 @@ glabel func0f0404d4 /* f040944: e7a601e4 */ swc1 $f6,0x1e4($sp) /* f040948: c4ea0010 */ lwc1 $f10,0x10($a3) /* f04094c: 46105481 */ sub.s $f18,$f10,$f16 -/* f040950: 0c0011e4 */ jal func00004790 +/* f040950: 0c0011e4 */ jal scaleTo1 /* f040954: e7b201e8 */ swc1 $f18,0x1e8($sp) /* f040958: 8fa4025c */ lw $a0,0x25c($sp) /* f04095c: 0fc1905e */ jal func0f064178 @@ -40551,7 +40551,7 @@ glabel func0f0404d4 /* f040e74: e7a600c0 */ swc1 $f6,0xc0($sp) /* f040e78: 460a3401 */ sub.s $f16,$f6,$f10 /* f040e7c: e7a401e4 */ swc1 $f4,0x1e4($sp) -/* f040e80: 0c0011e4 */ jal func00004790 +/* f040e80: 0c0011e4 */ jal scaleTo1 /* f040e84: e7b001e8 */ swc1 $f16,0x1e8($sp) /* f040e88: 1000003b */ beqz $zero,.L0f040f78 /* f040e8c: 24030001 */ addiu $v1,$zero,0x1 @@ -53023,7 +53023,7 @@ glabel func0f04bffc /* f04c0b4: c5120010 */ lwc1 $f18,0x10($t0) /* f04c0b8: 46049181 */ sub.s $f6,$f18,$f4 /* f04c0bc: 0000a812 */ mflo $s5 -/* f04c0c0: 0c0011e4 */ jal func00004790 +/* f04c0c0: 0c0011e4 */ jal scaleTo1 /* f04c0c4: e7a600a0 */ swc1 $f6,0xa0($sp) /* f04c0c8: 1a600048 */ blez $s3,.L0f04c1ec /* f04c0cc: 00008025 */ or $s0,$zero,$zero @@ -53076,7 +53076,7 @@ glabel func0f04bffc /* f04c184: c54a0008 */ lwc1 $f10,0x8($t2) /* f04c188: c5900010 */ lwc1 $f16,0x10($t4) /* f04c18c: 46105481 */ sub.s $f18,$f10,$f16 -/* f04c190: 0c0011e4 */ jal func00004790 +/* f04c190: 0c0011e4 */ jal scaleTo1 /* f04c194: e7b20098 */ swc1 $f18,0x98($sp) /* f04c198: c7a40098 */ lwc1 $f4,0x98($sp) /* f04c19c: c7a600a0 */ lwc1 $f6,0xa0($sp) diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c index 845c22dd7..6a60ddb60 100644 --- a/src/game/chr/chraicommands.c +++ b/src/game/chr/chraicommands.c @@ -999,7 +999,7 @@ glabel ai001a /* f04efd8: c7240010 */ lwc1 $f4,0x10($t9) /* f04efdc: afa30048 */ sw $v1,0x48($sp) /* f04efe0: 46062201 */ sub.s $f8,$f4,$f6 -/* f04efe4: 0c0011e4 */ jal func00004790 +/* f04efe4: 0c0011e4 */ jal scaleTo1 /* f04efe8: e7a80040 */ swc1 $f8,0x40($sp) /* f04efec: 8fa30048 */ lw $v1,0x48($sp) /* f04eff0: 8c620004 */ lw $v0,0x4($v1) diff --git a/src/game/game_005fd0.c b/src/game/game_005fd0.c index 1f26a7b90..0e9127d01 100644 --- a/src/game/game_005fd0.c +++ b/src/game/game_005fd0.c @@ -3658,7 +3658,7 @@ glabel func0f008558 /* f00948c: 26050008 */ addiu $a1,$s0,0x8 /* f009490: 2606000c */ addiu $a2,$s0,0xc /* f009494: 460a3401 */ sub.s $f16,$f6,$f10 -/* f009498: 0c0011e4 */ jal func00004790 +/* f009498: 0c0011e4 */ jal scaleTo1 /* f00949c: e610000c */ swc1 $f16,0xc($s0) /* f0094a0: 8fbf001c */ lw $ra,0x1c($sp) /* f0094a4: 8fb00018 */ lw $s0,0x18($sp) diff --git a/src/game/game_013540.c b/src/game/game_013540.c index ecb0d366c..351ff16d9 100644 --- a/src/game/game_013540.c +++ b/src/game/game_013540.c @@ -1178,7 +1178,7 @@ glabel func0f0142e8 /* f014538: 44802000 */ mtc1 $zero,$f4 /* f01453c: 24850004 */ addiu $a1,$a0,0x4 /* f014540: 24860008 */ addiu $a2,$a0,0x8 -/* f014544: 0c0011e4 */ jal func00004790 +/* f014544: 0c0011e4 */ jal scaleTo1 /* f014548: e4840004 */ swc1 $f4,0x4($a0) .L0f01454c: /* f01454c: 8fa408dc */ lw $a0,0x8dc($sp) diff --git a/src/game/game_015470.c b/src/game/game_015470.c index bc0eae5ea..626c49e0e 100644 --- a/src/game/game_015470.c +++ b/src/game/game_015470.c @@ -518,7 +518,7 @@ glabel func0f0155f0 /* f015934: 27a600c8 */ addiu $a2,$sp,0xc8 /* f015938: ac8f0004 */ sw $t7,0x4($a0) /* f01593c: 8f210008 */ lw $at,0x8($t9) -/* f015940: 0c0011e4 */ jal func00004790 +/* f015940: 0c0011e4 */ jal scaleTo1 /* f015944: ac810008 */ sw $at,0x8($a0) /* f015948: 3c0142fe */ lui $at,0x42fe /* f01594c: 44810000 */ mtc1 $at,$f0 @@ -2601,7 +2601,7 @@ glabel func0f017248 /* f01778c: 45030004 */ bc1tl .L0f0177a0 /* f017790: c7a600c0 */ lwc1 $f6,0xc0($sp) .L0f017794: -/* f017794: 0c0011e4 */ jal func00004790 +/* f017794: 0c0011e4 */ jal scaleTo1 /* f017798: 27a600c8 */ addiu $a2,$sp,0xc8 /* f01779c: c7a600c0 */ lwc1 $f6,0xc0($sp) .L0f0177a0: @@ -4792,7 +4792,7 @@ glabel func0f019658 /* f019784: e7a000f8 */ swc1 $f0,0xf8($sp) /* f019788: 02002025 */ or $a0,$s0,$zero /* f01978c: 27a500fc */ addiu $a1,$sp,0xfc -/* f019790: 0c0011e4 */ jal func00004790 +/* f019790: 0c0011e4 */ jal scaleTo1 /* f019794: 27a60100 */ addiu $a2,$sp,0x100 /* f019798: 3c017f1b */ lui $at,%hi(var7f1a8480) /* f01979c: c4208480 */ lwc1 $f0,%lo(var7f1a8480)($at) @@ -5256,7 +5256,7 @@ glabel func0f019d38 /* f019e28: e7a00104 */ swc1 $f0,0x104($sp) /* f019e2c: 02603025 */ or $a2,$s3,$zero /* f019e30: 02402825 */ or $a1,$s2,$zero -/* f019e34: 0c0011e4 */ jal func00004790 +/* f019e34: 0c0011e4 */ jal scaleTo1 /* f019e38: 02202025 */ or $a0,$s1,$zero /* f019e3c: 3c017f1b */ lui $at,%hi(var7f1a84b4) /* f019e40: c42084b4 */ lwc1 $f0,%lo(var7f1a84b4)($at) @@ -5343,7 +5343,7 @@ glabel func0f019d38 /* f019f70: e7a00104 */ swc1 $f0,0x104($sp) /* f019f74: 02202025 */ or $a0,$s1,$zero /* f019f78: 02402825 */ or $a1,$s2,$zero -/* f019f7c: 0c0011e4 */ jal func00004790 +/* f019f7c: 0c0011e4 */ jal scaleTo1 /* f019f80: 02603025 */ or $a2,$s3,$zero /* f019f84: 44805000 */ mtc1 $zero,$f10 /* f019f88: 3c048006 */ lui $a0,%hi(var800625a8) diff --git a/src/game/game_066310.c b/src/game/game_066310.c index 61219c464..4b3ad37e4 100644 --- a/src/game/game_066310.c +++ b/src/game/game_066310.c @@ -7330,7 +7330,7 @@ glabel func0f06b488 /* f06b5a8: 45030006 */ bc1tl .L0f06b5c4 /* f06b5ac: 44815000 */ mtc1 $at,$f10 .L0f06b5b0: -/* f06b5b0: 0c0011e4 */ jal func00004790 +/* f06b5b0: 0c0011e4 */ jal scaleTo1 /* f06b5b4: 24860008 */ addiu $a2,$a0,0x8 /* f06b5b8: 10000005 */ beqz $zero,.L0f06b5d0 /* f06b5bc: 8fae0048 */ lw $t6,0x48($sp) @@ -7528,7 +7528,7 @@ glabel func0f06b610 /* f06b894: 45030006 */ bc1tl .L0f06b8b0 /* f06b898: 44814000 */ mtc1 $at,$f8 .L0f06b89c: -/* f06b89c: 0c0011e4 */ jal func00004790 +/* f06b89c: 0c0011e4 */ jal scaleTo1 /* f06b8a0: 26060008 */ addiu $a2,$s0,0x8 /* f06b8a4: 10000005 */ beqz $zero,.L0f06b8bc /* f06b8a8: 8fb90114 */ lw $t9,0x114($sp) @@ -7782,7 +7782,7 @@ glabel func0f06b610 /* f06bc50: 45030006 */ bc1tl .L0f06bc6c /* f06bc54: 44813000 */ mtc1 $at,$f6 .L0f06bc58: -/* f06bc58: 0c0011e4 */ jal func00004790 +/* f06bc58: 0c0011e4 */ jal scaleTo1 /* f06bc5c: 26060008 */ addiu $a2,$s0,0x8 /* f06bc60: 10000005 */ beqz $zero,.L0f06bc78 /* f06bc64: 8faa0114 */ lw $t2,0x114($sp) @@ -8415,7 +8415,7 @@ glabel func0f06c28c /* f06c584: 45030006 */ bc1tl .L0f06c5a0 /* f06c588: 44814000 */ mtc1 $at,$f8 .L0f06c58c: -/* f06c58c: 0c0011e4 */ jal func00004790 +/* f06c58c: 0c0011e4 */ jal scaleTo1 /* f06c590: 26260008 */ addiu $a2,$s1,0x8 /* f06c594: 10000005 */ beqz $zero,.L0f06c5ac /* f06c598: 8fb900e8 */ lw $t9,0xe8($sp) @@ -8531,7 +8531,7 @@ glabel func0f06c28c /* f06c734: 45030006 */ bc1tl .L0f06c750 /* f06c738: 44812000 */ mtc1 $at,$f4 .L0f06c73c: -/* f06c73c: 0c0011e4 */ jal func00004790 +/* f06c73c: 0c0011e4 */ jal scaleTo1 /* f06c740: 26260008 */ addiu $a2,$s1,0x8 /* f06c744: 10000005 */ beqz $zero,.L0f06c75c /* f06c748: 8fad00e8 */ lw $t5,0xe8($sp) @@ -9345,7 +9345,7 @@ glabel func0f06cd00 /* f06d310: 45030006 */ bc1tl .L0f06d32c /* f06d314: e6960008 */ swc1 $f22,0x8($s4) .L0f06d318: -/* f06d318: 0c0011e4 */ jal func00004790 +/* f06d318: 0c0011e4 */ jal scaleTo1 /* f06d31c: 26860008 */ addiu $a2,$s4,0x8 /* f06d320: 10000002 */ beqz $zero,.L0f06d32c /* f06d324: 00000000 */ sll $zero,$zero,0x0 @@ -9507,7 +9507,7 @@ glabel func0f06d37c /* f06d568: 45030006 */ bc1tl .L0f06d584 /* f06d56c: 44814000 */ mtc1 $at,$f8 .L0f06d570: -/* f06d570: 0c0011e4 */ jal func00004790 +/* f06d570: 0c0011e4 */ jal scaleTo1 /* f06d574: 24860008 */ addiu $a2,$a0,0x8 /* f06d578: 10000005 */ beqz $zero,.L0f06d590 /* f06d57c: c6020008 */ lwc1 $f2,0x8($s0) @@ -17383,7 +17383,7 @@ glabel func0f073c6c /* f074588: 45030006 */ bc1tl .L0f0745a4 /* f07458c: 44814000 */ mtc1 $at,$f8 .L0f074590: -/* f074590: 0c0011e4 */ jal func00004790 +/* f074590: 0c0011e4 */ jal scaleTo1 /* f074594: e7b0058c */ swc1 $f16,0x58c($sp) /* f074598: 10000004 */ beqz $zero,.L0f0745ac /* f07459c: c7b0058c */ lwc1 $f16,0x58c($sp) @@ -18032,7 +18032,7 @@ glabel func0f073c6c /* f074f2c: c7240010 */ lwc1 $f4,0x10($t9) /* f074f30: e7a2029c */ swc1 $f2,0x29c($sp) /* f074f34: 460a2201 */ sub.s $f8,$f4,$f10 -/* f074f38: 0c0011e4 */ jal func00004790 +/* f074f38: 0c0011e4 */ jal scaleTo1 /* f074f3c: e7a80298 */ swc1 $f8,0x298($sp) /* f074f40: c6060004 */ lwc1 $f6,0x4($s0) /* f074f44: 27a402ec */ addiu $a0,$sp,0x2ec @@ -18042,7 +18042,7 @@ glabel func0f073c6c /* f074f54: 27a602f4 */ addiu $a2,$sp,0x2f4 /* f074f58: e7a402f0 */ swc1 $f4,0x2f0($sp) /* f074f5c: c60a000c */ lwc1 $f10,0xc($s0) -/* f074f60: 0c0011e4 */ jal func00004790 +/* f074f60: 0c0011e4 */ jal scaleTo1 /* f074f64: e7aa02f4 */ swc1 $f10,0x2f4($sp) /* f074f68: c7a80298 */ lwc1 $f8,0x298($sp) /* f074f6c: c7a602f4 */ lwc1 $f6,0x2f4($sp) @@ -19126,7 +19126,7 @@ glabel func0f073c6c /* f075f0c: e7a80154 */ swc1 $f8,0x154($sp) /* f075f10: c604000c */ lwc1 $f4,0xc($s0) /* f075f14: afa2014c */ sw $v0,0x14c($sp) -/* f075f18: 0c0011e4 */ jal func00004790 +/* f075f18: 0c0011e4 */ jal scaleTo1 /* f075f1c: e7a40158 */ swc1 $f4,0x158($sp) /* f075f20: 8fa2014c */ lw $v0,0x14c($sp) /* f075f24: 50400005 */ beqzl $v0,.L0f075f3c @@ -19289,7 +19289,7 @@ glabel func0f073c6c /* f07616c: a7a3038e */ sh $v1,0x38e($sp) /* f076170: e7a405f4 */ swc1 $f4,0x5f4($sp) /* f076174: e7aa05f8 */ swc1 $f10,0x5f8($sp) -/* f076178: 0c0011e4 */ jal func00004790 +/* f076178: 0c0011e4 */ jal scaleTo1 /* f07617c: e7a605fc */ swc1 $f6,0x5fc($sp) /* f076180: c6480008 */ lwc1 $f8,0x8($s2) /* f076184: c7a40390 */ lwc1 $f4,0x390($sp) @@ -19631,7 +19631,7 @@ glabel func0f073c6c /* f07665c: 27a60110 */ addiu $a2,$sp,0x110 /* f076660: e7aa010c */ swc1 $f10,0x10c($sp) /* f076664: c606000c */ lwc1 $f6,0xc($s0) -/* f076668: 0c0011e4 */ jal func00004790 +/* f076668: 0c0011e4 */ jal scaleTo1 /* f07666c: e7a60110 */ swc1 $f6,0x110($sp) /* f076670: 3c0141a0 */ lui $at,0x41a0 /* f076674: 44810000 */ mtc1 $at,$f0 @@ -24897,7 +24897,7 @@ glabel func0f07b164 /* f07b1dc: 27a6003c */ addiu $a2,$sp,0x3c /* f07b1e0: 46105481 */ sub.s $f18,$f10,$f16 /* f07b1e4: 27a40034 */ addiu $a0,$sp,0x34 -/* f07b1e8: 0c0011e4 */ jal func00004790 +/* f07b1e8: 0c0011e4 */ jal scaleTo1 /* f07b1ec: e7b20030 */ swc1 $f18,0x30($sp) /* f07b1f0: c7a40028 */ lwc1 $f4,0x28($sp) /* f07b1f4: c7a60034 */ lwc1 $f6,0x34($sp) @@ -25014,7 +25014,7 @@ glabel func0f07b290 /* f07b398: e7a600c8 */ swc1 $f6,0xc8($sp) /* f07b39c: c6280010 */ lwc1 $f8,0x10($s1) /* f07b3a0: 460a4481 */ sub.s $f18,$f8,$f10 -/* f07b3a4: 0c0011e4 */ jal func00004790 +/* f07b3a4: 0c0011e4 */ jal scaleTo1 /* f07b3a8: e7b200cc */ swc1 $f18,0xcc($sp) /* f07b3ac: 27a400b8 */ addiu $a0,$sp,0xb8 /* f07b3b0: 26050028 */ addiu $a1,$s0,0x28 @@ -25635,7 +25635,7 @@ glabel func0f07ba38 /* f07bcb0: 00000000 */ sll $zero,$zero,0x0 /* f07bcb4: 4500000f */ bc1f .L0f07bcf4 /* f07bcb8: 00000000 */ sll $zero,$zero,0x0 -/* f07bcbc: 0c0011e4 */ jal func00004790 +/* f07bcbc: 0c0011e4 */ jal scaleTo1 /* f07bcc0: e7a0010c */ swc1 $f0,0x10c($sp) /* f07bcc4: c7a0010c */ lwc1 $f0,0x10c($sp) /* f07bcc8: c6120098 */ lwc1 $f18,0x98($s0) @@ -26573,7 +26573,7 @@ glabel func0f07c830 /* f07ca44: e7aa0098 */ swc1 $f10,0x98($sp) /* f07ca48: c6320010 */ lwc1 $f18,0x10($s1) /* f07ca4c: 46128101 */ sub.s $f4,$f16,$f18 -/* f07ca50: 0c0011e4 */ jal func00004790 +/* f07ca50: 0c0011e4 */ jal scaleTo1 /* f07ca54: e7a4009c */ swc1 $f4,0x9c($sp) /* f07ca58: 10000012 */ beqz $zero,.L0f07caa4 /* f07ca5c: 02202025 */ or $a0,$s1,$zero @@ -26969,7 +26969,7 @@ glabel func0f07cacc /* f07cff0: e7a6007c */ swc1 $f6,0x7c($sp) /* f07cff4: 27a5007c */ addiu $a1,$sp,0x7c /* f07cff8: 27a60080 */ addiu $a2,$sp,0x80 -/* f07cffc: 0c0011e4 */ jal func00004790 +/* f07cffc: 0c0011e4 */ jal scaleTo1 /* f07d000: e7b00080 */ swc1 $f16,0x80($sp) /* f07d004: 3c0143c8 */ lui $at,0x43c8 /* f07d008: 44810000 */ mtc1 $at,$f0 @@ -27020,7 +27020,7 @@ glabel func0f07cacc /* f07d0b4: e7a40144 */ swc1 $f4,0x144($sp) /* f07d0b8: c7280010 */ lwc1 $f8,0x10($t9) /* f07d0bc: 46089181 */ sub.s $f6,$f18,$f8 -/* f07d0c0: 0c0011e4 */ jal func00004790 +/* f07d0c0: 0c0011e4 */ jal scaleTo1 /* f07d0c4: e7a60148 */ swc1 $f6,0x148($sp) /* f07d0c8: c7b00140 */ lwc1 $f16,0x140($sp) /* f07d0cc: c66a00a8 */ lwc1 $f10,0xa8($s3) diff --git a/src/game/game_097a50.c b/src/game/game_097a50.c index f5fec1f37..df5ddada4 100644 --- a/src/game/game_097a50.c +++ b/src/game/game_097a50.c @@ -9348,15 +9348,15 @@ glabel func0f09f100 /* f09f214: 24840c58 */ addiu $a0,$a0,0xc58 /* f09f218: 27a40190 */ addiu $a0,$sp,0x190 /* f09f21c: 27a50194 */ addiu $a1,$sp,0x194 -/* f09f220: 0c0011e4 */ jal func00004790 +/* f09f220: 0c0011e4 */ jal scaleTo1 /* f09f224: 27a60198 */ addiu $a2,$sp,0x198 /* f09f228: 27a401a0 */ addiu $a0,$sp,0x1a0 /* f09f22c: 27a501a4 */ addiu $a1,$sp,0x1a4 -/* f09f230: 0c0011e4 */ jal func00004790 +/* f09f230: 0c0011e4 */ jal scaleTo1 /* f09f234: 27a601a8 */ addiu $a2,$sp,0x1a8 /* f09f238: 27a401b0 */ addiu $a0,$sp,0x1b0 /* f09f23c: 27a501b4 */ addiu $a1,$sp,0x1b4 -/* f09f240: 0c0011e4 */ jal func00004790 +/* f09f240: 0c0011e4 */ jal scaleTo1 /* f09f244: 27a601b8 */ addiu $a2,$sp,0x1b8 /* f09f248: 44800000 */ mtc1 $zero,$f0 /* f09f24c: 27a40190 */ addiu $a0,$sp,0x190 @@ -11532,7 +11532,7 @@ glabel func0f0a0fac /* f0a11b8: 46105102 */ mul.s $f4,$f10,$f16 /* f0a11bc: 00000000 */ sll $zero,$zero,0x0 /* f0a11c0: 46043202 */ mul.s $f8,$f6,$f4 -/* f0a11c4: 0c0011e4 */ jal func00004790 +/* f0a11c4: 0c0011e4 */ jal scaleTo1 /* f0a11c8: e7a8004c */ swc1 $f8,0x4c($sp) /* f0a11cc: 8fa200a8 */ lw $v0,0xa8($sp) /* f0a11d0: 44800000 */ mtc1 $zero,$f0 diff --git a/src/game/game_0abe70.c b/src/game/game_0abe70.c index dd37d1ec4..c71ba946a 100644 --- a/src/game/game_0abe70.c +++ b/src/game/game_0abe70.c @@ -474,7 +474,7 @@ glabel func0f0ac138 /* f0ac370: afa30028 */ sw $v1,0x28($sp) /* f0ac374: afa20024 */ sw $v0,0x24($sp) /* f0ac378: 46128201 */ sub.s $f8,$f16,$f18 -/* f0ac37c: 0c0011e4 */ jal func00004790 +/* f0ac37c: 0c0011e4 */ jal scaleTo1 /* f0ac380: e7a80058 */ swc1 $f8,0x58($sp) /* f0ac384: 8fa30028 */ lw $v1,0x28($sp) /* f0ac388: 27a40044 */ addiu $a0,$sp,0x44 @@ -491,7 +491,7 @@ glabel func0f0ac138 /* f0ac3b4: c46a037c */ lwc1 $f10,0x37c($v1) /* f0ac3b8: c4660564 */ lwc1 $f6,0x564($v1) /* f0ac3bc: 460a3101 */ sub.s $f4,$f6,$f10 -/* f0ac3c0: 0c0011e4 */ jal func00004790 +/* f0ac3c0: 0c0011e4 */ jal scaleTo1 /* f0ac3c4: e7a4004c */ swc1 $f4,0x4c($sp) /* f0ac3c8: c7b00050 */ lwc1 $f16,0x50($sp) /* f0ac3cc: c7b20044 */ lwc1 $f18,0x44($sp) @@ -798,7 +798,7 @@ glabel func0f0ac4b8 /* f0ac82c: 27a400d0 */ addiu $a0,$sp,0xd0 .L0f0ac830: /* f0ac830: 27a500d4 */ addiu $a1,$sp,0xd4 -/* f0ac834: 0c0011e4 */ jal func00004790 +/* f0ac834: 0c0011e4 */ jal scaleTo1 /* f0ac838: 27a600d8 */ addiu $a2,$sp,0xd8 /* f0ac83c: 10000005 */ beqz $zero,.L0f0ac854 /* f0ac840: 00000000 */ sll $zero,$zero,0x0 @@ -1296,7 +1296,7 @@ glabel func0f0acb90 /* f0acfa4: 4503000f */ bc1tl .L0f0acfe4 /* f0acfa8: c7a60130 */ lwc1 $f6,0x130($sp) .L0f0acfac: -/* f0acfac: 0c0011e4 */ jal func00004790 +/* f0acfac: 0c0011e4 */ jal scaleTo1 /* f0acfb0: e7b0012c */ swc1 $f16,0x12c($sp) /* f0acfb4: c7a00130 */ lwc1 $f0,0x130($sp) /* f0acfb8: c7a8010c */ lwc1 $f8,0x10c($sp) @@ -1342,7 +1342,7 @@ glabel func0f0acb90 /* f0ad050: c62a0014 */ lwc1 $f10,0x14($s1) /* f0ad054: 460a2202 */ mul.s $f8,$f4,$f10 /* f0ad058: 46083101 */ sub.s $f4,$f6,$f8 -/* f0ad05c: 0c0011e4 */ jal func00004790 +/* f0ad05c: 0c0011e4 */ jal scaleTo1 /* f0ad060: e7a40120 */ swc1 $f4,0x120($sp) /* f0ad064: c7a00130 */ lwc1 $f0,0x130($sp) /* f0ad068: c7aa0118 */ lwc1 $f10,0x118($sp) @@ -4428,7 +4428,7 @@ glabel func0f0afa4c /* f0afda8: 3c014000 */ lui $at,0x4000 /* f0afdac: 44813000 */ mtc1 $at,$f6 /* f0afdb0: e7bc00b0 */ swc1 $f28,0xb0($sp) -/* f0afdb4: 0c0011e4 */ jal func00004790 +/* f0afdb4: 0c0011e4 */ jal scaleTo1 /* f0afdb8: e7a600ac */ swc1 $f6,0xac($sp) /* f0afdbc: 27a4010c */ addiu $a0,$sp,0x10c /* f0afdc0: 0c0056c4 */ jal func00015b10 @@ -4468,7 +4468,7 @@ glabel func0f0afa4c /* f0afe48: e7aa00b8 */ swc1 $f10,0xb8($sp) /* f0afe4c: 27a500b8 */ addiu $a1,$sp,0xb8 /* f0afe50: 27a600bc */ addiu $a2,$sp,0xbc -/* f0afe54: 0c0011e4 */ jal func00004790 +/* f0afe54: 0c0011e4 */ jal scaleTo1 /* f0afe58: e7a400bc */ swc1 $f4,0xbc($sp) /* f0afe5c: 0fc59e73 */ jal func0f1679cc /* f0afe60: 24040002 */ addiu $a0,$zero,0x2 diff --git a/src/game/game_0c37d0.c b/src/game/game_0c37d0.c index 830f96589..d936a0d06 100644 --- a/src/game/game_0c37d0.c +++ b/src/game/game_0c37d0.c @@ -359,7 +359,7 @@ glabel func0f0c3b38 /* f0c3bdc: 45030006 */ bc1tl .L0f0c3bf8 /* f0c3be0: 44812000 */ mtc1 $at,$f4 .L0f0c3be4: -/* f0c3be4: 0c0011e4 */ jal func00004790 +/* f0c3be4: 0c0011e4 */ jal scaleTo1 /* f0c3be8: 27a60060 */ addiu $a2,$sp,0x60 /* f0c3bec: 10000005 */ beqz $zero,.L0f0c3c04 /* f0c3bf0: 27a80064 */ addiu $t0,$sp,0x64 @@ -865,7 +865,7 @@ glabel func0f0c4250 /* f0c4334: 45010006 */ bc1t .L0f0c4350 .L0f0c4338: /* f0c4338: 27a50094 */ addiu $a1,$sp,0x94 -/* f0c433c: 0c0011e4 */ jal func00004790 +/* f0c433c: 0c0011e4 */ jal scaleTo1 /* f0c4340: 27a60098 */ addiu $a2,$sp,0x98 /* f0c4344: 3c08800a */ lui $t0,%hi(g_Vars) /* f0c4348: 10000004 */ beqz $zero,.L0f0c435c @@ -4062,7 +4062,7 @@ glabel func0f0c69b8 /* f0c7168: 246502a4 */ addiu $a1,$v1,0x2a4 /* f0c716c: 51a0006a */ beqzl $t5,.L0f0c7318 /* f0c7170: 8c640298 */ lw $a0,0x298($v1) -/* f0c7174: 0c0011e4 */ jal func00004790 +/* f0c7174: 0c0011e4 */ jal scaleTo1 /* f0c7178: 246602a8 */ addiu $a2,$v1,0x2a8 /* f0c717c: 3c08800a */ lui $t0,%hi(g_Vars) /* f0c7180: 25089fc0 */ addiu $t0,$t0,%lo(g_Vars) diff --git a/src/game/game_0c79f0.c b/src/game/game_0c79f0.c index 28a7452ae..a3f581cf0 100644 --- a/src/game/game_0c79f0.c +++ b/src/game/game_0c79f0.c @@ -6046,7 +6046,7 @@ glabel func0f0ccbf0 /* f0cccc8: 45030006 */ bc1tl .L0f0ccce4 /* f0ccccc: 44812000 */ mtc1 $at,$f4 .L0f0cccd0: -/* f0cccd0: 0c0011e4 */ jal func00004790 +/* f0cccd0: 0c0011e4 */ jal scaleTo1 /* f0cccd4: 27a600d0 */ addiu $a2,$sp,0xd0 /* f0cccd8: 10000005 */ beqz $zero,.L0f0cccf0 /* f0cccdc: 27ab00d4 */ addiu $t3,$sp,0xd4 @@ -6169,7 +6169,7 @@ glabel func0f0ccbf0 /* f0cce9c: 45030007 */ bc1tl .L0f0ccebc /* f0ccea0: 44814000 */ mtc1 $at,$f8 .L0f0ccea4: -/* f0ccea4: 0c0011e4 */ jal func00004790 +/* f0ccea4: 0c0011e4 */ jal scaleTo1 /* f0ccea8: 27a60088 */ addiu $a2,$sp,0x88 /* f0cceac: 44809000 */ mtc1 $zero,$f18 /* f0cceb0: 10000004 */ beqz $zero,.L0f0ccec4 diff --git a/src/game/game_0cf150.c b/src/game/game_0cf150.c index 081b63cf8..a504a0d73 100644 --- a/src/game/game_0cf150.c +++ b/src/game/game_0cf150.c @@ -523,7 +523,7 @@ glabel func0f0cf728 /* f0cf804: 27a40038 */ addiu $a0,$sp,0x38 /* f0cf808: 27a5003c */ addiu $a1,$sp,0x3c /* f0cf80c: 27a60040 */ addiu $a2,$sp,0x40 -/* f0cf810: 0c0011e4 */ jal func00004790 +/* f0cf810: 0c0011e4 */ jal scaleTo1 /* f0cf814: afa90048 */ sw $t1,0x48($sp) /* f0cf818: 3c088007 */ lui $t0,%hi(var80070ec4) /* f0cf81c: 25080ec4 */ addiu $t0,$t0,%lo(var80070ec4) diff --git a/src/game/game_0d1fe0.c b/src/game/game_0d1fe0.c index 97e98b549..5e72c4ab7 100644 --- a/src/game/game_0d1fe0.c +++ b/src/game/game_0d1fe0.c @@ -910,7 +910,7 @@ glabel func0f0d2b40 /* f0d2c68: 45030007 */ bc1tl .L0f0d2c88 /* f0d2c6c: 44812000 */ mtc1 $at,$f4 .L0f0d2c70: -/* f0d2c70: 0c0011e4 */ jal func00004790 +/* f0d2c70: 0c0011e4 */ jal scaleTo1 /* f0d2c74: 27a60098 */ addiu $a2,$sp,0x98 /* f0d2c78: 44809000 */ mtc1 $zero,$f18 /* f0d2c7c: 10000004 */ beqz $zero,.L0f0d2c90 diff --git a/src/game/game_129900.c b/src/game/game_129900.c index 4917e0cfe..0fa6c6050 100644 --- a/src/game/game_129900.c +++ b/src/game/game_129900.c @@ -14890,7 +14890,7 @@ glabel func0f1360e8 /* f13645c: 27a600dc */ addiu $a2,$sp,0xdc /* f136460: 46000180 */ add.s $f6,$f0,$f0 /* f136464: 461e3301 */ sub.s $f12,$f6,$f30 -/* f136468: 0c0011e4 */ jal func00004790 +/* f136468: 0c0011e4 */ jal scaleTo1 /* f13646c: e7ac00dc */ swc1 $f12,0xdc($sp) /* f136470: c7ae00d4 */ lwc1 $f14,0xd4($sp) /* f136474: c7b000d8 */ lwc1 $f16,0xd8($sp) diff --git a/src/include/library/library_04790.h b/src/include/library/library_04790.h index 5681d0427..6600d26bf 100644 --- a/src/include/library/library_04790.h +++ b/src/include/library/library_04790.h @@ -3,6 +3,6 @@ #include #include "types.h" -u32 func00004790(void); +float scaleTo1(float *x, float *y, float *z); #endif diff --git a/src/library/library_04790.c b/src/library/library_04790.c index 3547720fe..027dc8914 100644 --- a/src/library/library_04790.c +++ b/src/library/library_04790.c @@ -2,52 +2,18 @@ #include "types.h" #include "library/library_4a360.h" -GLOBAL_ASM( -glabel func00004790 -/* 4790: 27bdffe8 */ addiu $sp,$sp,-24 -/* 4794: afbf0014 */ sw $ra,0x14($sp) -/* 4798: c4820000 */ lwc1 $f2,0x0($a0) -/* 479c: c4ae0000 */ lwc1 $f14,0x0($a1) -/* 47a0: c4c00000 */ lwc1 $f0,0x0($a2) -/* 47a4: 46021102 */ mul.s $f4,$f2,$f2 -/* 47a8: afa60020 */ sw $a2,0x20($sp) -/* 47ac: afa5001c */ sw $a1,0x1c($sp) -/* 47b0: 460e7182 */ mul.s $f6,$f14,$f14 -/* 47b4: afa40018 */ sw $a0,0x18($sp) -/* 47b8: 46000282 */ mul.s $f10,$f0,$f0 -/* 47bc: 46062200 */ add.s $f8,$f4,$f6 -/* 47c0: 0c012974 */ jal sqrtf -/* 47c4: 46085300 */ add.s $f12,$f10,$f8 -/* 47c8: 44801000 */ mtc1 $zero,$f2 -/* 47cc: 8fa40018 */ lw $a0,0x18($sp) -/* 47d0: 8fa5001c */ lw $a1,0x1c($sp) -/* 47d4: 4600103c */ c.lt.s $f2,$f0 -/* 47d8: 8fa60020 */ lw $a2,0x20($sp) -/* 47dc: 3c013f80 */ lui $at,0x3f80 -/* 47e0: 4502000f */ bc1fl .L00004820 -/* 47e4: 44819000 */ mtc1 $at,$f18 -/* 47e8: 3c013f80 */ lui $at,0x3f80 -/* 47ec: 44818000 */ mtc1 $at,$f16 -/* 47f0: c4920000 */ lwc1 $f18,0x0($a0) -/* 47f4: 46008083 */ div.s $f2,$f16,$f0 -/* 47f8: 46029102 */ mul.s $f4,$f18,$f2 -/* 47fc: e4840000 */ swc1 $f4,0x0($a0) -/* 4800: c4a60000 */ lwc1 $f6,0x0($a1) -/* 4804: 46023282 */ mul.s $f10,$f6,$f2 -/* 4808: e4aa0000 */ swc1 $f10,0x0($a1) -/* 480c: c4c80000 */ lwc1 $f8,0x0($a2) -/* 4810: 46024402 */ mul.s $f16,$f8,$f2 -/* 4814: 10000005 */ beqz $zero,.L0000482c -/* 4818: e4d00000 */ swc1 $f16,0x0($a2) -/* 481c: 44819000 */ mtc1 $at,$f18 -.L00004820: -/* 4820: e4820000 */ swc1 $f2,0x0($a0) -/* 4824: e4a20000 */ swc1 $f2,0x0($a1) -/* 4828: e4d20000 */ swc1 $f18,0x0($a2) -.L0000482c: -/* 482c: 8fbf0014 */ lw $ra,0x14($sp) -/* 4830: 27bd0018 */ addiu $sp,$sp,0x18 -/* 4834: 03e00008 */ jr $ra -/* 4838: 00000000 */ sll $zero,$zero,0x0 -/* 483c: 00000000 */ sll $zero,$zero,0x0 -); \ No newline at end of file +void scaleTo1(float *x, float *y, float *z) +{ + float hyp = sqrtf(*x * *x + *y * *y + *z * *z); + + if (hyp > 0.0f) { + float hyp2 = 1.0f / hyp; + *x = *x * hyp2; + *y = *y * hyp2; + *z = *z * hyp2; + } else { + *x = 0.0f; + *y = 0.0f; + *z = 1.0f; + } +} diff --git a/src/library/library_04a80.c b/src/library/library_04a80.c index 97eefb045..758157820 100644 --- a/src/library/library_04a80.c +++ b/src/library/library_04a80.c @@ -58,7 +58,7 @@ glabel func00004a80 /* 4a98: afa70044 */ sw $a3,0x44($sp) /* 4a9c: 27a60048 */ addiu $a2,$sp,0x48 /* 4aa0: 27a50044 */ addiu $a1,$sp,0x44 -/* 4aa4: 0c0011e4 */ jal func00004790 +/* 4aa4: 0c0011e4 */ jal scaleTo1 /* 4aa8: 27a40040 */ addiu $a0,$sp,0x40 /* 4aac: 3c017005 */ lui $at,%hi(var700524c0) /* 4ab0: c7ac003c */ lwc1 $f12,0x3c($sp) @@ -1481,4 +1481,4 @@ glabel func00005dc0 /* 5e34: 00000000 */ sll $zero,$zero,0x0 /* 5e38: 00000000 */ sll $zero,$zero,0x0 /* 5e3c: 00000000 */ sll $zero,$zero,0x0 -); \ No newline at end of file +); diff --git a/src/library/library_16110.c b/src/library/library_16110.c index 7a9646937..0e18628f6 100644 --- a/src/library/library_16110.c +++ b/src/library/library_16110.c @@ -1023,7 +1023,7 @@ glabel func00016e98 /* 16eb4: afa70054 */ sw $a3,0x54($sp) /* 16eb8: 27a60058 */ addiu $a2,$sp,0x58 /* 16ebc: 27a40050 */ addiu $a0,$sp,0x50 -/* 16ec0: 0c0011e4 */ jal func00004790 +/* 16ec0: 0c0011e4 */ jal scaleTo1 /* 16ec4: 27a50054 */ addiu $a1,$sp,0x54 /* 16ec8: 0c0068f7 */ jal func0001a3dc /* 16ecc: 4600a306 */ mov.s $f12,$f20 @@ -4795,4 +4795,4 @@ glabel func0001a3dc /* 1a4f4: 00000000 */ sll $zero,$zero,0x0 /* 1a4f8: 00000000 */ sll $zero,$zero,0x0 /* 1a4fc: 00000000 */ sll $zero,$zero,0x0 -); \ No newline at end of file +); diff --git a/src/library/library_233c0.c b/src/library/library_233c0.c index 8f1014065..474e941f2 100644 --- a/src/library/library_233c0.c +++ b/src/library/library_233c0.c @@ -13515,7 +13515,7 @@ glabel func0002f308 /* 2f36c: c6320008 */ lwc1 $f18,0x8($s1) /* 2f370: c6100008 */ lwc1 $f16,0x8($s0) /* 2f374: 46128101 */ sub.s $f4,$f16,$f18 -/* 2f378: 0c0011e4 */ jal func00004790 +/* 2f378: 0c0011e4 */ jal scaleTo1 /* 2f37c: e7a40030 */ swc1 $f4,0x30($sp) /* 2f380: c7ac0054 */ lwc1 $f12,0x54($sp) /* 2f384: c7a60028 */ lwc1 $f6,0x28($sp) @@ -13591,4 +13591,4 @@ glabel func0002f450 /* 2f484: 00000000 */ sll $zero,$zero,0x0 /* 2f488: 00000000 */ sll $zero,$zero,0x0 /* 2f48c: 00000000 */ sll $zero,$zero,0x0 -); \ No newline at end of file +); diff --git a/src/library/library_4f5e0.c b/src/library/library_4f5e0.c index 9b3a21ca6..f7c61d83e 100644 --- a/src/library/library_4f5e0.c +++ b/src/library/library_4f5e0.c @@ -302,7 +302,7 @@ glabel func0004f9b0 /* 4f9d8: 27a60040 */ addiu $a2,$sp,0x40 /* 4f9dc: 27a5003c */ addiu $a1,$sp,0x3c /* 4f9e0: 27a40038 */ addiu $a0,$sp,0x38 -/* 4f9e4: 0c0011e4 */ jal func00004790 +/* 4f9e4: 0c0011e4 */ jal scaleTo1 /* 4f9e8: e424ca70 */ swc1 $f4,-0x3590($at) /* 4f9ec: 3c01800a */ lui $at,0x800a /* 4f9f0: c7ac0034 */ lwc1 $f12,0x34($sp) @@ -591,4 +591,4 @@ glabel func0004fc60 /* 4fe14: 03e00008 */ jr $ra /* 4fe18: 00000000 */ sll $zero,$zero,0x0 /* 4fe1c: 00000000 */ sll $zero,$zero,0x0 -); \ No newline at end of file +);