From d6fc300ed2522632e6bbfa1d6d87ebab2aa0e448 Mon Sep 17 00:00:00 2001 From: krimtonz <33664508+krimtonz@users.noreply.github.com> Date: Thu, 4 Jun 2020 00:59:17 -0500 Subject: [PATCH] rename code_8007BF90.c to z_olib.c, rename functions in z_olib.c (#181) * rename code_8007BF90.c to z_olib.c, rename functions in z_olib.c * pr updates --- .../code/db_camera/func_800B3B50.s | 4 +- .../code/db_camera/func_800B3F94.s | 6 +- .../code/db_camera/func_800B3FF4.s | 4 +- .../code/db_camera/func_800B4E7C.s | 180 +++++++++--------- .../code/db_camera/func_800B9638.s | 28 +-- .../code/z_camera/Camera_Battle1.s | 12 +- .../code/z_camera/Camera_Battle4.s | 4 +- .../code/z_camera/Camera_Data4.s | 6 +- .../code/z_camera/Camera_Demo1.s | 2 +- .../code/z_camera/Camera_Demo3.s | 12 +- .../code/z_camera/Camera_Demo5.s | 6 +- .../code/z_camera/Camera_Fixed1.s | 4 +- .../code/z_camera/Camera_Fixed2.s | 2 +- .../code/z_camera/Camera_Fixed3.s | 2 +- .../code/z_camera/Camera_Fixed4.s | 6 +- .../code/z_camera/Camera_Jump1.s | 10 +- .../code/z_camera/Camera_Jump2.s | 6 +- .../code/z_camera/Camera_Jump3.s | 8 +- .../code/z_camera/Camera_KeepOn0.s | 4 +- .../code/z_camera/Camera_KeepOn1.s | 16 +- .../code/z_camera/Camera_KeepOn3.s | 6 +- .../code/z_camera/Camera_KeepOn4.s | 4 +- .../code/z_camera/Camera_Normal1.s | 8 +- .../code/z_camera/Camera_Normal2.s | 12 +- .../code/z_camera/Camera_Normal3.s | 6 +- .../code/z_camera/Camera_Parallel1.s | 8 +- .../code/z_camera/Camera_Special5.s | 8 +- .../code/z_camera/Camera_Special6.s | 2 +- .../code/z_camera/Camera_Special7.s | 2 +- .../code/z_camera/Camera_Special9.s | 4 +- .../code/z_camera/Camera_Subj3.s | 2 +- .../code/z_camera/Camera_Subj4.s | 6 +- .../code/z_camera/Camera_Unique0.s | 10 +- .../code/z_camera/Camera_Unique1.s | 8 +- .../code/z_camera/Camera_Unique2.s | 10 +- .../code/z_camera/Camera_Unique3.s | 4 +- .../code/z_camera/Camera_Unique7.s | 2 +- .../code/z_camera/Camera_Unique9.s | 24 +-- .../code/z_camera/func_80043F94.s | 24 +-- .../code/z_camera/func_80044ADC.s | 28 +-- .../code/z_camera/func_80045508.s | 4 +- .../code/z_camera/func_80045714.s | 6 +- .../code/z_camera/func_800458D4.s | 26 +-- .../code/z_camera/func_80045C74.s | 56 +++--- .../code/z_camera/func_800460A8.s | 58 +++--- .../code/z_camera/func_80046E20.s | 18 +- .../code/z_camera/func_800591EC.s | 8 +- .../code/z_onepointdemo/func_8007C680.s | 4 +- .../code/z_onepointdemo/func_8007C850.s | 104 +++++----- .../actors/ovl_Demo_Kankyo/func_8098AAE4.s | 34 ++-- .../actors/ovl_Demo_Kankyo/func_8098AB68.s | 26 +-- include/functions.h | 14 +- spec | 2 +- src/code/z_camera.c | 30 +-- src/code/{code_8007BF90.c => z_olib.c} | 106 +++++------ src/code/z_quake.c | 8 +- 56 files changed, 501 insertions(+), 503 deletions(-) rename src/code/{code_8007BF90.c => z_olib.c} (50%) diff --git a/asm/non_matchings/code/db_camera/func_800B3B50.s b/asm/non_matchings/code/db_camera/func_800B3B50.s index 0636973bec..12e60b03cc 100644 --- a/asm/non_matchings/code/db_camera/func_800B3B50.s +++ b/asm/non_matchings/code/db_camera/func_800B3B50.s @@ -5,7 +5,7 @@ glabel func_800B3B50 /* B2ACFC 800B3B5C 00A03825 */ move $a3, $a1 /* B2AD00 800B3B60 AFA70034 */ sw $a3, 0x34($sp) /* B2AD04 800B3B64 00C02825 */ move $a1, $a2 -/* B2AD08 800B3B68 0C01F097 */ jal func_8007C25C +/* B2AD08 800B3B68 0C01F097 */ jal OLib_VecSphRot90ToVec3f /* B2AD0C 800B3B6C 27A40018 */ addiu $a0, $sp, 0x18 /* B2AD10 800B3B70 8FA70034 */ lw $a3, 0x34($sp) /* B2AD14 800B3B74 C7A60018 */ lwc1 $f6, 0x18($sp) @@ -31,5 +31,5 @@ glabel func_800B3B50 /* B2AD64 800B3BC4 8FBF0014 */ lw $ra, 0x14($sp) /* B2AD68 800B3BC8 27BD0030 */ addiu $sp, $sp, 0x30 /* B2AD6C 800B3BCC 03E00008 */ jr $ra -/* B2AD70 800B3BD0 00000000 */ nop +/* B2AD70 800B3BD0 00000000 */ nop diff --git a/asm/non_matchings/code/db_camera/func_800B3F94.s b/asm/non_matchings/code/db_camera/func_800B3F94.s index 2b1939c8b0..705882c688 100644 --- a/asm/non_matchings/code/db_camera/func_800B3F94.s +++ b/asm/non_matchings/code/db_camera/func_800B3F94.s @@ -6,7 +6,7 @@ glabel func_800B3F94 /* B2B144 800B3FA4 AFA40030 */ sw $a0, 0x30($sp) /* B2B148 800B3FA8 AFA50034 */ sw $a1, 0x34($sp) /* B2B14C 800B3FAC 8FA50030 */ lw $a1, 0x30($sp) -/* B2B150 800B3FB0 0C01F124 */ jal func_8007C490 +/* B2B150 800B3FB0 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* B2B154 800B3FB4 27A40028 */ addiu $a0, $sp, 0x28 /* B2B158 800B3FB8 8FAF0030 */ lw $t7, 0x30($sp) /* B2B15C 800B3FBC 87AE002E */ lh $t6, 0x2e($sp) @@ -14,7 +14,7 @@ glabel func_800B3F94 /* B2B164 800B3FC4 85F8000E */ lh $t8, 0xe($t7) /* B2B168 800B3FC8 27A50028 */ addiu $a1, $sp, 0x28 /* B2B16C 800B3FCC 01D8C823 */ subu $t9, $t6, $t8 -/* B2B170 800B3FD0 0C01F097 */ jal func_8007C25C +/* B2B170 800B3FD0 0C01F097 */ jal OLib_VecSphRot90ToVec3f /* B2B174 800B3FD4 A7B9002E */ sh $t9, 0x2e($sp) /* B2B178 800B3FD8 27A4001C */ addiu $a0, $sp, 0x1c /* B2B17C 800B3FDC 0C02CFBF */ jal func_800B3EFC @@ -22,5 +22,5 @@ glabel func_800B3F94 /* B2B184 800B3FE4 8FBF0014 */ lw $ra, 0x14($sp) /* B2B188 800B3FE8 27BD0030 */ addiu $sp, $sp, 0x30 /* B2B18C 800B3FEC 03E00008 */ jr $ra -/* B2B190 800B3FF0 00000000 */ nop +/* B2B190 800B3FF0 00000000 */ nop diff --git a/asm/non_matchings/code/db_camera/func_800B3FF4.s b/asm/non_matchings/code/db_camera/func_800B3FF4.s index 1b5009f4ed..9513f3e144 100644 --- a/asm/non_matchings/code/db_camera/func_800B3FF4.s +++ b/asm/non_matchings/code/db_camera/func_800B3FF4.s @@ -7,7 +7,7 @@ glabel func_800B3FF4 /* B2B1A8 800B4008 0C02CFCE */ jal func_800B3F38 /* B2B1AC 800B400C 27A5001C */ addiu $a1, $sp, 0x1c /* B2B1B0 800B4010 27A40028 */ addiu $a0, $sp, 0x28 -/* B2B1B4 800B4014 0C01F0FD */ jal func_8007C3F4 +/* B2B1B4 800B4014 0C01F0FD */ jal OLib_Vec3fToVecSphRot90 /* B2B1B8 800B4018 27A5001C */ addiu $a1, $sp, 0x1c /* B2B1BC 800B401C 8FA50030 */ lw $a1, 0x30($sp) /* B2B1C0 800B4020 87AE002E */ lh $t6, 0x2e($sp) @@ -20,5 +20,5 @@ glabel func_800B3FF4 /* B2B1DC 800B403C 8FBF0014 */ lw $ra, 0x14($sp) /* B2B1E0 800B4040 27BD0030 */ addiu $sp, $sp, 0x30 /* B2B1E4 800B4044 03E00008 */ jr $ra -/* B2B1E8 800B4048 00000000 */ nop +/* B2B1E8 800B4048 00000000 */ nop diff --git a/asm/non_matchings/code/db_camera/func_800B4E7C.s b/asm/non_matchings/code/db_camera/func_800B4E7C.s index b2cf93e4dc..0013d0b962 100644 --- a/asm/non_matchings/code/db_camera/func_800B4E7C.s +++ b/asm/non_matchings/code/db_camera/func_800B4E7C.s @@ -211,7 +211,7 @@ glabel func_800B4E7C /* B2C30C 800B516C 27B10104 */ addiu $s1, $sp, 0x104 /* B2C310 800B5170 02202025 */ move $a0, $s1 /* B2C314 800B5174 8FA5007C */ lw $a1, 0x7c($sp) -/* B2C318 800B5178 0C01F124 */ jal func_8007C490 +/* B2C318 800B5178 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* B2C31C 800B517C 8FA60080 */ lw $a2, 0x80($sp) /* B2C320 800B5180 10000007 */ b .L800B51A0 /* B2C324 800B5184 8EA20044 */ lw $v0, 0x44($s5) @@ -219,7 +219,7 @@ glabel func_800B4E7C /* B2C328 800B5188 27B10104 */ addiu $s1, $sp, 0x104 /* B2C32C 800B518C 02202025 */ move $a0, $s1 /* B2C330 800B5190 8FA50080 */ lw $a1, 0x80($sp) -/* B2C334 800B5194 0C01F124 */ jal func_8007C490 +/* B2C334 800B5194 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* B2C338 800B5198 8FA6007C */ lw $a2, 0x7c($sp) /* B2C33C 800B519C 8EA20044 */ lw $v0, 0x44($s5) .L800B51A0: @@ -1038,11 +1038,11 @@ glabel func_800B4E7C /* B2CEE4 800B5D44 15C0005A */ bnez $t6, .L800B5EB0 /* B2CEE8 800B5D48 468030A0 */ cvt.s.w $f2, $f6 /* B2CEEC 800B5D4C 44806000 */ mtc1 $zero, $f12 -/* B2CEF0 800B5D50 00000000 */ nop +/* B2CEF0 800B5D50 00000000 */ nop /* B2CEF4 800B5D54 4600603E */ c.le.s $f12, $f0 -/* B2CEF8 800B5D58 00000000 */ nop +/* B2CEF8 800B5D58 00000000 */ nop /* B2CEFC 800B5D5C 45000015 */ bc1f .L800B5DB4 -/* B2CF00 800B5D60 00000000 */ nop +/* B2CF00 800B5D60 00000000 */ nop /* B2CF04 800B5D64 46000202 */ mul.s $f8, $f0, $f0 /* B2CF08 800B5D68 3C014416 */ li $at, 0x44160000 # 0.000000 /* B2CF0C 800B5D6C 44817000 */ mtc1 $at, $f14 @@ -1054,12 +1054,12 @@ glabel func_800B4E7C /* B2CF24 800B5D84 3C013F00 */ li $at, 0x3F000000 # 0.000000 /* B2CF28 800B5D88 4481A000 */ mtc1 $at, $f20 /* B2CF2C 800B5D8C 46105102 */ mul.s $f4, $f10, $f16 -/* B2CF30 800B5D90 00000000 */ nop +/* B2CF30 800B5D90 00000000 */ nop /* B2CF34 800B5D94 46122182 */ mul.s $f6, $f4, $f18 /* B2CF38 800B5D98 46143200 */ add.s $f8, $f6, $f20 /* B2CF3C 800B5D9C 4600428D */ trunc.w.s $f10, $f8 /* B2CF40 800B5DA0 44105000 */ mfc1 $s0, $f10 -/* B2CF44 800B5DA4 00000000 */ nop +/* B2CF44 800B5DA4 00000000 */ nop /* B2CF48 800B5DA8 00108400 */ sll $s0, $s0, 0x10 /* B2CF4C 800B5DAC 10000015 */ b .L800B5E04 /* B2CF50 800B5DB0 00108403 */ sra $s0, $s0, 0x10 @@ -1075,12 +1075,12 @@ glabel func_800B4E7C /* B2CF74 800B5DD4 3C013F00 */ li $at, 0x3F000000 # 0.000000 /* B2CF78 800B5DD8 4481A000 */ mtc1 $at, $f20 /* B2CF7C 800B5DDC 46103202 */ mul.s $f8, $f6, $f16 -/* B2CF80 800B5DE0 00000000 */ nop +/* B2CF80 800B5DE0 00000000 */ nop /* B2CF84 800B5DE4 46124282 */ mul.s $f10, $f8, $f18 /* B2CF88 800B5DE8 46145100 */ add.s $f4, $f10, $f20 /* B2CF8C 800B5DEC 4600218D */ trunc.w.s $f6, $f4 /* B2CF90 800B5DF0 44103000 */ mfc1 $s0, $f6 -/* B2CF94 800B5DF4 00000000 */ nop +/* B2CF94 800B5DF4 00000000 */ nop /* B2CF98 800B5DF8 00108400 */ sll $s0, $s0, 0x10 /* B2CF9C 800B5DFC 00108403 */ sra $s0, $s0, 0x10 /* B2CFA0 800B5E00 00108023 */ negu $s0, $s0 @@ -1093,12 +1093,12 @@ glabel func_800B4E7C /* B2CFB8 800B5E18 46021202 */ mul.s $f8, $f2, $f2 /* B2CFBC 800B5E1C 460E4283 */ div.s $f10, $f8, $f14 /* B2CFC0 800B5E20 46105102 */ mul.s $f4, $f10, $f16 -/* B2CFC4 800B5E24 00000000 */ nop +/* B2CFC4 800B5E24 00000000 */ nop /* B2CFC8 800B5E28 46122182 */ mul.s $f6, $f4, $f18 /* B2CFCC 800B5E2C 46143200 */ add.s $f8, $f6, $f20 /* B2CFD0 800B5E30 4600428D */ trunc.w.s $f10, $f8 /* B2CFD4 800B5E34 44105000 */ mfc1 $s0, $f10 -/* B2CFD8 800B5E38 00000000 */ nop +/* B2CFD8 800B5E38 00000000 */ nop /* B2CFDC 800B5E3C 00108400 */ sll $s0, $s0, 0x10 /* B2CFE0 800B5E40 1000000D */ b .L800B5E78 /* B2CFE4 800B5E44 00108403 */ sra $s0, $s0, 0x10 @@ -1106,12 +1106,12 @@ glabel func_800B4E7C /* B2CFE8 800B5E48 46021102 */ mul.s $f4, $f2, $f2 /* B2CFEC 800B5E4C 460E2183 */ div.s $f6, $f4, $f14 /* B2CFF0 800B5E50 46103202 */ mul.s $f8, $f6, $f16 -/* B2CFF4 800B5E54 00000000 */ nop +/* B2CFF4 800B5E54 00000000 */ nop /* B2CFF8 800B5E58 46124282 */ mul.s $f10, $f8, $f18 /* B2CFFC 800B5E5C 46145100 */ add.s $f4, $f10, $f20 /* B2D000 800B5E60 4600218D */ trunc.w.s $f6, $f4 /* B2D004 800B5E64 44103000 */ mfc1 $s0, $f6 -/* B2D008 800B5E68 00000000 */ nop +/* B2D008 800B5E68 00000000 */ nop /* B2D00C 800B5E6C 00108400 */ sll $s0, $s0, 0x10 /* B2D010 800B5E70 00108403 */ sra $s0, $s0, 0x10 /* B2D014 800B5E74 00108023 */ negu $s0, $s0 @@ -1132,11 +1132,11 @@ glabel func_800B4E7C /* B2D04C 800B5EAC A6AC10C8 */ sh $t4, 0x10c8($s5) .L800B5EB0: /* B2D050 800B5EB0 44806000 */ mtc1 $zero, $f12 -/* B2D054 800B5EB4 00000000 */ nop +/* B2D054 800B5EB4 00000000 */ nop /* B2D058 800B5EB8 4600603E */ c.le.s $f12, $f0 -/* B2D05C 800B5EBC 00000000 */ nop +/* B2D05C 800B5EBC 00000000 */ nop /* B2D060 800B5EC0 45000016 */ bc1f .L800B5F1C -/* B2D064 800B5EC4 00000000 */ nop +/* B2D064 800B5EC4 00000000 */ nop /* B2D068 800B5EC8 46000202 */ mul.s $f8, $f0, $f0 /* B2D06C 800B5ECC 3C014416 */ li $at, 0x44160000 # 0.000000 /* B2D070 800B5ED0 44817000 */ mtc1 $at, $f14 @@ -1148,12 +1148,12 @@ glabel func_800B4E7C /* B2D088 800B5EE8 3C013F00 */ li $at, 0x3F000000 # 0.000000 /* B2D08C 800B5EEC 4481A000 */ mtc1 $at, $f20 /* B2D090 800B5EF0 46105102 */ mul.s $f4, $f10, $f16 -/* B2D094 800B5EF4 00000000 */ nop +/* B2D094 800B5EF4 00000000 */ nop /* B2D098 800B5EF8 46122182 */ mul.s $f6, $f4, $f18 /* B2D09C 800B5EFC 46143200 */ add.s $f8, $f6, $f20 /* B2D0A0 800B5F00 4600428D */ trunc.w.s $f10, $f8 /* B2D0A4 800B5F04 44105000 */ mfc1 $s0, $f10 -/* B2D0A8 800B5F08 00000000 */ nop +/* B2D0A8 800B5F08 00000000 */ nop /* B2D0AC 800B5F0C 00108400 */ sll $s0, $s0, 0x10 /* B2D0B0 800B5F10 00108403 */ sra $s0, $s0, 0x10 /* B2D0B4 800B5F14 10000014 */ b .L800B5F68 @@ -1170,12 +1170,12 @@ glabel func_800B4E7C /* B2D0DC 800B5F3C 3C013F00 */ li $at, 0x3F000000 # 0.000000 /* B2D0E0 800B5F40 4481A000 */ mtc1 $at, $f20 /* B2D0E4 800B5F44 46103202 */ mul.s $f8, $f6, $f16 -/* B2D0E8 800B5F48 00000000 */ nop +/* B2D0E8 800B5F48 00000000 */ nop /* B2D0EC 800B5F4C 46124282 */ mul.s $f10, $f8, $f18 /* B2D0F0 800B5F50 46145100 */ add.s $f4, $f10, $f20 /* B2D0F4 800B5F54 4600218D */ trunc.w.s $f6, $f4 /* B2D0F8 800B5F58 44103000 */ mfc1 $s0, $f6 -/* B2D0FC 800B5F5C 00000000 */ nop +/* B2D0FC 800B5F5C 00000000 */ nop /* B2D100 800B5F60 00108400 */ sll $s0, $s0, 0x10 /* B2D104 800B5F64 00108403 */ sra $s0, $s0, 0x10 .L800B5F68: @@ -1187,12 +1187,12 @@ glabel func_800B4E7C /* B2D11C 800B5F7C 46021202 */ mul.s $f8, $f2, $f2 /* B2D120 800B5F80 460E4283 */ div.s $f10, $f8, $f14 /* B2D124 800B5F84 46105102 */ mul.s $f4, $f10, $f16 -/* B2D128 800B5F88 00000000 */ nop +/* B2D128 800B5F88 00000000 */ nop /* B2D12C 800B5F8C 46122182 */ mul.s $f6, $f4, $f18 /* B2D130 800B5F90 46143200 */ add.s $f8, $f6, $f20 /* B2D134 800B5F94 4600428D */ trunc.w.s $f10, $f8 /* B2D138 800B5F98 44105000 */ mfc1 $s0, $f10 -/* B2D13C 800B5F9C 00000000 */ nop +/* B2D13C 800B5F9C 00000000 */ nop /* B2D140 800B5FA0 00108400 */ sll $s0, $s0, 0x10 /* B2D144 800B5FA4 00108403 */ sra $s0, $s0, 0x10 /* B2D148 800B5FA8 1000000C */ b .L800B5FDC @@ -1201,12 +1201,12 @@ glabel func_800B4E7C /* B2D150 800B5FB0 46021102 */ mul.s $f4, $f2, $f2 /* B2D154 800B5FB4 460E2183 */ div.s $f6, $f4, $f14 /* B2D158 800B5FB8 46103202 */ mul.s $f8, $f6, $f16 -/* B2D15C 800B5FBC 00000000 */ nop +/* B2D15C 800B5FBC 00000000 */ nop /* B2D160 800B5FC0 46124282 */ mul.s $f10, $f8, $f18 /* B2D164 800B5FC4 46145100 */ add.s $f4, $f10, $f20 /* B2D168 800B5FC8 4600218D */ trunc.w.s $f6, $f4 /* B2D16C 800B5FCC 44103000 */ mfc1 $s0, $f6 -/* B2D170 800B5FD0 00000000 */ nop +/* B2D170 800B5FD0 00000000 */ nop /* B2D174 800B5FD4 00108400 */ sll $s0, $s0, 0x10 /* B2D178 800B5FD8 00108403 */ sra $s0, $s0, 0x10 .L800B5FDC: @@ -1224,7 +1224,7 @@ glabel func_800B4E7C .L800B6008: /* B2D1A8 800B6008 27A400F4 */ addiu $a0, $sp, 0xf4 /* B2D1AC 800B600C 8FA50080 */ lw $a1, 0x80($sp) -/* B2D1B0 800B6010 0C01F124 */ jal func_8007C490 +/* B2D1B0 800B6010 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* B2D1B4 800B6014 8FA6007C */ lw $a2, 0x7c($sp) /* B2D1B8 800B6018 3C018014 */ lui $at, %hi(D_80143C8C) /* B2D1BC 800B601C C4323C8C */ lwc1 $f18, %lo(D_80143C8C)($at) @@ -1236,7 +1236,7 @@ glabel func_800B4E7C /* B2D1D4 800B6034 46145100 */ add.s $f4, $f10, $f20 /* B2D1D8 800B6038 4600218D */ trunc.w.s $f6, $f4 /* B2D1DC 800B603C 44073000 */ mfc1 $a3, $f6 -/* B2D1E0 800B6040 00000000 */ nop +/* B2D1E0 800B6040 00000000 */ nop /* B2D1E4 800B6044 00073C00 */ sll $a3, $a3, 0x10 /* B2D1E8 800B6048 0C02CEF5 */ jal func_800B3BD4 /* B2D1EC 800B604C 00073C03 */ sra $a3, $a3, 0x10 @@ -1258,7 +1258,7 @@ glabel func_800B4E7C /* B2D22C 800B608C BAEF0137 */ swr $t7, 0x137($s7) /* B2D230 800B6090 96AF10CA */ lhu $t7, 0x10ca($s5) /* B2D234 800B6094 02802025 */ move $a0, $s4 -/* B2D238 800B6098 0C01EFE4 */ jal func_8007BF90 +/* B2D238 800B6098 0C01EFE4 */ jal OLib_Vec3fDist /* B2D23C 800B609C A6EF0138 */ sh $t7, 0x138($s7) /* B2D240 800B60A0 8FB8007C */ lw $t8, 0x7c($sp) /* B2D244 800B60A4 27A600FC */ addiu $a2, $sp, 0xfc @@ -1382,7 +1382,7 @@ glabel func_800B4E7C /* B2D408 800B6268 2401FFF7 */ li $at, -9 /* B2D40C 800B626C 00811027 */ nor $v0, $a0, $at /* B2D410 800B6270 1440001C */ bnez $v0, .L800B62E4 -/* B2D414 800B6274 00000000 */ nop +/* B2D414 800B6274 00000000 */ nop /* B2D418 800B6278 946F0044 */ lhu $t7, 0x44($v1) /* B2D41C 800B627C 2401FFDF */ li $at, -33 /* B2D420 800B6280 01E1C027 */ nor $t8, $t7, $at @@ -1476,7 +1476,7 @@ glabel func_800B4E7C /* B2D564 800B63C4 A6AB004C */ sh $t3, 0x4c($s5) /* B2D568 800B63C8 86AD004C */ lh $t5, 0x4c($s5) /* B2D56C 800B63CC 448D3000 */ mtc1 $t5, $f6 -/* B2D570 800B63D0 00000000 */ nop +/* B2D570 800B63D0 00000000 */ nop /* B2D574 800B63D4 46803220 */ cvt.s.w $f8, $f6 /* B2D578 800B63D8 460A4102 */ mul.s $f4, $f8, $f10 /* B2D57C 800B63DC E6A40050 */ swc1 $f4, 0x50($s5) @@ -1575,7 +1575,7 @@ glabel func_800B4E7C /* B2D6D4 800B6534 A6AD004C */ sh $t5, 0x4c($s5) /* B2D6D8 800B6538 86AC004C */ lh $t4, 0x4c($s5) /* B2D6DC 800B653C 448C2000 */ mtc1 $t4, $f4 -/* B2D6E0 800B6540 00000000 */ nop +/* B2D6E0 800B6540 00000000 */ nop /* B2D6E4 800B6544 468021A0 */ cvt.s.w $f6, $f4 /* B2D6E8 800B6548 46083282 */ mul.s $f10, $f6, $f8 /* B2D6EC 800B654C E6AA0050 */ swc1 $f10, 0x50($s5) @@ -1647,14 +1647,14 @@ glabel func_800B4E7C /* B2D7E0 800B6640 A16A000A */ sb $t2, 0xa($t3) /* B2D7E4 800B6644 86AD0080 */ lh $t5, 0x80($s5) /* B2D7E8 800B6648 14400002 */ bnez $v0, .L800B6654 -/* B2D7EC 800B664C 00000000 */ nop +/* B2D7EC 800B664C 00000000 */ nop /* B2D7F0 800B6650 0007000D */ break 7 .L800B6654: /* B2D7F4 800B6654 2401FFFF */ li $at, -1 /* B2D7F8 800B6658 14410004 */ bne $v0, $at, .L800B666C /* B2D7FC 800B665C 3C018000 */ lui $at, 0x8000 /* B2D800 800B6660 14610002 */ bne $v1, $at, .L800B666C -/* B2D804 800B6664 00000000 */ nop +/* B2D804 800B6664 00000000 */ nop /* B2D808 800B6668 0006000D */ break 6 .L800B666C: /* B2D80C 800B666C 01A2001A */ div $zero, $t5, $v0 @@ -1662,14 +1662,14 @@ glabel func_800B4E7C /* B2D814 800B6674 00006010 */ mfhi $t4 /* B2D818 800B6678 258F0030 */ addiu $t7, $t4, 0x30 /* B2D81C 800B667C 14400002 */ bnez $v0, .L800B6688 -/* B2D820 800B6680 00000000 */ nop +/* B2D820 800B6680 00000000 */ nop /* B2D824 800B6684 0007000D */ break 7 .L800B6688: /* B2D828 800B6688 2401FFFF */ li $at, -1 /* B2D82C 800B668C 14410004 */ bne $v0, $at, .L800B66A0 /* B2D830 800B6690 3C018000 */ lui $at, 0x8000 /* B2D834 800B6694 15A10002 */ bne $t5, $at, .L800B66A0 -/* B2D838 800B6698 00000000 */ nop +/* B2D838 800B6698 00000000 */ nop /* B2D83C 800B669C 0006000D */ break 6 .L800B66A0: /* B2D840 800B66A0 A30F000B */ sb $t7, 0xb($t8) @@ -1693,14 +1693,14 @@ glabel func_800B4E7C /* B2D884 800B66E4 86AB0082 */ lh $t3, 0x82($s5) /* B2D888 800B66E8 8C780020 */ lw $t8, 0x20($v1) /* B2D88C 800B66EC 14400002 */ bnez $v0, .L800B66F8 -/* B2D890 800B66F0 00000000 */ nop +/* B2D890 800B66F0 00000000 */ nop /* B2D894 800B66F4 0007000D */ break 7 .L800B66F8: /* B2D898 800B66F8 2401FFFF */ li $at, -1 /* B2D89C 800B66FC 14410004 */ bne $v0, $at, .L800B6710 /* B2D8A0 800B6700 3C018000 */ lui $at, 0x8000 /* B2D8A4 800B6704 15C10002 */ bne $t6, $at, .L800B6710 -/* B2D8A8 800B6708 00000000 */ nop +/* B2D8A8 800B6708 00000000 */ nop /* B2D8AC 800B670C 0006000D */ break 6 .L800B6710: /* B2D8B0 800B6710 256D0001 */ addiu $t5, $t3, 1 @@ -1711,14 +1711,14 @@ glabel func_800B4E7C /* B2D8C4 800B6724 86AE0080 */ lh $t6, 0x80($s5) /* B2D8C8 800B6728 8C6B0020 */ lw $t3, 0x20($v1) /* B2D8CC 800B672C 14400002 */ bnez $v0, .L800B6738 -/* B2D8D0 800B6730 00000000 */ nop +/* B2D8D0 800B6730 00000000 */ nop /* B2D8D4 800B6734 0007000D */ break 7 .L800B6738: /* B2D8D8 800B6738 2401FFFF */ li $at, -1 /* B2D8DC 800B673C 14410004 */ bne $v0, $at, .L800B6750 /* B2D8E0 800B6740 3C018000 */ lui $at, 0x8000 /* B2D8E4 800B6744 15A10002 */ bne $t5, $at, .L800B6750 -/* B2D8E8 800B6748 00000000 */ nop +/* B2D8E8 800B6748 00000000 */ nop /* B2D8EC 800B674C 0006000D */ break 6 .L800B6750: /* B2D8F0 800B6750 25C9FFFF */ addiu $t1, $t6, -1 @@ -1728,14 +1728,14 @@ glabel func_800B4E7C /* B2D900 800B6760 A16A000D */ sb $t2, 0xd($t3) /* B2D904 800B6764 86AD0080 */ lh $t5, 0x80($s5) /* B2D908 800B6768 14400002 */ bnez $v0, .L800B6774 -/* B2D90C 800B676C 00000000 */ nop +/* B2D90C 800B676C 00000000 */ nop /* B2D910 800B6770 0007000D */ break 7 .L800B6774: /* B2D914 800B6774 2401FFFF */ li $at, -1 /* B2D918 800B6778 14410004 */ bne $v0, $at, .L800B678C /* B2D91C 800B677C 3C018000 */ lui $at, 0x8000 /* B2D920 800B6780 15210002 */ bne $t1, $at, .L800B678C -/* B2D924 800B6784 00000000 */ nop +/* B2D924 800B6784 00000000 */ nop /* B2D928 800B6788 0006000D */ break 6 .L800B678C: /* B2D92C 800B678C 25ACFFFF */ addiu $t4, $t5, -1 @@ -1744,14 +1744,14 @@ glabel func_800B4E7C /* B2D938 800B6798 00007810 */ mfhi $t7 /* B2D93C 800B679C 25F80030 */ addiu $t8, $t7, 0x30 /* B2D940 800B67A0 14400002 */ bnez $v0, .L800B67AC -/* B2D944 800B67A4 00000000 */ nop +/* B2D944 800B67A4 00000000 */ nop /* B2D948 800B67A8 0007000D */ break 7 .L800B67AC: /* B2D94C 800B67AC 2401FFFF */ li $at, -1 /* B2D950 800B67B0 14410004 */ bne $v0, $at, .L800B67C4 /* B2D954 800B67B4 3C018000 */ lui $at, 0x8000 /* B2D958 800B67B8 15810002 */ bne $t4, $at, .L800B67C4 -/* B2D95C 800B67BC 00000000 */ nop +/* B2D95C 800B67BC 00000000 */ nop /* B2D960 800B67C0 0006000D */ break 6 .L800B67C4: /* B2D964 800B67C4 A1D8000E */ sb $t8, 0xe($t6) @@ -1806,7 +1806,7 @@ glabel func_800B4E7C /* B2DA14 800B6874 46083282 */ mul.s $f10, $f6, $f8 /* B2DA18 800B6878 4600510D */ trunc.w.s $f4, $f10 /* B2DA1C 800B687C 44042000 */ mfc1 $a0, $f4 -/* B2DA20 800B6880 00000000 */ nop +/* B2DA20 800B6880 00000000 */ nop /* B2DA24 800B6884 00042400 */ sll $a0, $a0, 0x10 /* B2DA28 800B6888 0C02CF7E */ jal func_800B3DF8 /* B2DA2C 800B688C 00042403 */ sra $a0, $a0, 0x10 @@ -1827,7 +1827,7 @@ glabel func_800B4E7C /* B2DA68 800B68C8 460A4102 */ mul.s $f4, $f8, $f10 /* B2DA6C 800B68CC 4600218D */ trunc.w.s $f6, $f4 /* B2DA70 800B68D0 44043000 */ mfc1 $a0, $f6 -/* B2DA74 800B68D4 00000000 */ nop +/* B2DA74 800B68D4 00000000 */ nop /* B2DA78 800B68D8 00042400 */ sll $a0, $a0, 0x10 /* B2DA7C 800B68DC 0C02CF7E */ jal func_800B3DF8 /* B2DA80 800B68E0 00042403 */ sra $a0, $a0, 0x10 @@ -1843,7 +1843,7 @@ glabel func_800B4E7C /* B2DAA8 800B6908 4600020D */ trunc.w.s $f8, $f0 /* B2DAAC 800B690C 24060006 */ li $a2, 6 /* B2DAB0 800B6910 44044000 */ mfc1 $a0, $f8 -/* B2DAB4 800B6914 00000000 */ nop +/* B2DAB4 800B6914 00000000 */ nop /* B2DAB8 800B6918 00042400 */ sll $a0, $a0, 0x10 /* B2DABC 800B691C 0C02CF7E */ jal func_800B3DF8 /* B2DAC0 800B6920 00042403 */ sra $a0, $a0, 0x10 @@ -1877,7 +1877,7 @@ glabel func_800B4E7C /* B2DB2C 800B698C 4600510D */ trunc.w.s $f4, $f10 /* B2DB30 800B6990 24060007 */ li $a2, 7 /* B2DB34 800B6994 44042000 */ mfc1 $a0, $f4 -/* B2DB38 800B6998 00000000 */ nop +/* B2DB38 800B6998 00000000 */ nop /* B2DB3C 800B699C 00042400 */ sll $a0, $a0, 0x10 /* B2DB40 800B69A0 0C02CF7E */ jal func_800B3DF8 /* B2DB44 800B69A4 00042403 */ sra $a0, $a0, 0x10 @@ -1894,7 +1894,7 @@ glabel func_800B4E7C /* B2DB70 800B69D0 24060007 */ li $a2, 7 /* B2DB74 800B69D4 4600320D */ trunc.w.s $f8, $f6 /* B2DB78 800B69D8 44044000 */ mfc1 $a0, $f8 -/* B2DB7C 800B69DC 00000000 */ nop +/* B2DB7C 800B69DC 00000000 */ nop /* B2DB80 800B69E0 00042400 */ sll $a0, $a0, 0x10 /* B2DB84 800B69E4 0C02CF7E */ jal func_800B3DF8 /* B2DB88 800B69E8 00042403 */ sra $a0, $a0, 0x10 @@ -1910,7 +1910,7 @@ glabel func_800B4E7C /* B2DBB0 800B6A10 24060007 */ li $a2, 7 /* B2DBB4 800B6A14 4600510D */ trunc.w.s $f4, $f10 /* B2DBB8 800B6A18 44042000 */ mfc1 $a0, $f4 -/* B2DBBC 800B6A1C 00000000 */ nop +/* B2DBBC 800B6A1C 00000000 */ nop /* B2DBC0 800B6A20 00042400 */ sll $a0, $a0, 0x10 /* B2DBC4 800B6A24 0C02CF7E */ jal func_800B3DF8 /* B2DBC8 800B6A28 00042403 */ sra $a0, $a0, 0x10 @@ -2089,12 +2089,12 @@ glabel func_800B4E7C /* B2DE48 800B6CA8 26310010 */ addiu $s1, $s1, 0x10 .L800B6CAC: /* B2DE4C 800B6CAC 1000001D */ b .L800B6D24 -/* B2DE50 800B6CB0 00000000 */ nop +/* B2DE50 800B6CB0 00000000 */ nop /* B2DE54 800B6CB4 86AD0080 */ lh $t5, 0x80($s5) .L800B6CB8: /* B2DE58 800B6CB8 00009025 */ move $s2, $zero /* B2DE5C 800B6CBC 19A00019 */ blez $t5, .L800B6D24 -/* B2DE60 800B6CC0 00000000 */ nop +/* B2DE60 800B6CC0 00000000 */ nop /* B2DE64 800B6CC4 02A09825 */ move $s3, $s5 /* B2DE68 800B6CC8 26B008B8 */ addiu $s0, $s5, 0x8b8 /* B2DE6C 800B6CCC 26B100A8 */ addiu $s1, $s5, 0xa8 @@ -2265,7 +2265,7 @@ glabel func_800B4E7C /* B2E0C4 800B6F24 86AD007E */ lh $t5, 0x7e($s5) /* B2E0C8 800B6F28 29A1FFFF */ slti $at, $t5, -1 /* B2E0CC 800B6F2C 10200027 */ beqz $at, .L800B6FCC -/* B2E0D0 800B6F30 00000000 */ nop +/* B2E0D0 800B6F30 00000000 */ nop /* B2E0D4 800B6F34 86A30080 */ lh $v1, 0x80($s5) /* B2E0D8 800B6F38 28610005 */ slti $at, $v1, 5 /* B2E0DC 800B6F3C 50200005 */ beql $at, $zero, .L800B6F54 @@ -2299,14 +2299,14 @@ glabel func_800B4E7C /* B2E140 800B6FA0 004B6823 */ subu $t5, $v0, $t3 /* B2E144 800B6FA4 A6AD007E */ sh $t5, 0x7e($s5) /* B2E148 800B6FA8 14600002 */ bnez $v1, .L800B6FB4 -/* B2E14C 800B6FAC 00000000 */ nop +/* B2E14C 800B6FAC 00000000 */ nop /* B2E150 800B6FB0 0007000D */ break 7 .L800B6FB4: /* B2E154 800B6FB4 2401FFFF */ li $at, -1 /* B2E158 800B6FB8 14610004 */ bne $v1, $at, .L800B6FCC /* B2E15C 800B6FBC 3C018000 */ lui $at, 0x8000 /* B2E160 800B6FC0 14410002 */ bne $v0, $at, .L800B6FCC -/* B2E164 800B6FC4 00000000 */ nop +/* B2E164 800B6FC4 00000000 */ nop /* B2E168 800B6FC8 0006000D */ break 6 .L800B6FCC: /* B2E16C 800B6FCC 3C038016 */ lui $v1, %hi(D_80161100) # $v1, 0x8016 @@ -2516,7 +2516,7 @@ glabel func_800B4E7C /* B2E458 800B72B8 12000005 */ beqz $s0, .L800B72D0 /* B2E45C 800B72BC 24010005 */ li $at, 5 /* B2E460 800B72C0 12010022 */ beq $s0, $at, .L800B734C -/* B2E464 800B72C4 00000000 */ nop +/* B2E464 800B72C4 00000000 */ nop /* B2E468 800B72C8 1000002D */ b .L800B7380 /* B2E46C 800B72CC 86AC0082 */ lh $t4, 0x82($s5) .L800B72D0: @@ -2577,7 +2577,7 @@ glabel func_800B4E7C /* B2E534 800B7394 24060003 */ li $a2, 3 /* B2E538 800B7398 4600320D */ trunc.w.s $f8, $f6 /* B2E53C 800B739C 44044000 */ mfc1 $a0, $f8 -/* B2E540 800B73A0 00000000 */ nop +/* B2E540 800B73A0 00000000 */ nop /* B2E544 800B73A4 00042400 */ sll $a0, $a0, 0x10 /* B2E548 800B73A8 0C02CF7E */ jal func_800B3DF8 /* B2E54C 800B73AC 00042403 */ sra $a0, $a0, 0x10 @@ -2743,14 +2743,14 @@ glabel func_800B4E7C /* B2E784 800B75E4 27A400FC */ addiu $a0, $sp, 0xfc /* B2E788 800B75E8 86AA0084 */ lh $t2, 0x84($s5) /* B2E78C 800B75EC 146A000A */ bne $v1, $t2, .L800B7618 -/* B2E790 800B75F0 00000000 */ nop +/* B2E790 800B75F0 00000000 */ nop /* B2E794 800B75F4 86AB0086 */ lh $t3, 0x86($s5) /* B2E798 800B75F8 24010004 */ li $at, 4 /* B2E79C 800B75FC 15610006 */ bne $t3, $at, .L800B7618 /* B2E7A0 800B7600 3C0D8016 */ lui $t5, %hi(D_80161144) # $t5, 0x8016 /* B2E7A4 800B7604 8DAD1144 */ lw $t5, %lo(D_80161144)($t5) /* B2E7A8 800B7608 15A00003 */ bnez $t5, .L800B7618 -/* B2E7AC 800B760C 00000000 */ nop +/* B2E7AC 800B760C 00000000 */ nop /* B2E7B0 800B7610 10000009 */ b .L800B7638 /* B2E7B4 800B7614 24100007 */ li $s0, 7 .L800B7618: @@ -2777,7 +2777,7 @@ glabel func_800B4E7C /* B2E800 800B7660 24060006 */ li $a2, 6 /* B2E804 800B7664 4600510D */ trunc.w.s $f4, $f10 /* B2E808 800B7668 44042000 */ mfc1 $a0, $f4 -/* B2E80C 800B766C 00000000 */ nop +/* B2E80C 800B766C 00000000 */ nop /* B2E810 800B7670 00042400 */ sll $a0, $a0, 0x10 /* B2E814 800B7674 0C02CF7E */ jal func_800B3DF8 /* B2E818 800B7678 00042403 */ sra $a0, $a0, 0x10 @@ -2793,7 +2793,7 @@ glabel func_800B4E7C /* B2E840 800B76A0 24060006 */ li $a2, 6 /* B2E844 800B76A4 4600320D */ trunc.w.s $f8, $f6 /* B2E848 800B76A8 44044000 */ mfc1 $a0, $f8 -/* B2E84C 800B76AC 00000000 */ nop +/* B2E84C 800B76AC 00000000 */ nop /* B2E850 800B76B0 00042400 */ sll $a0, $a0, 0x10 /* B2E854 800B76B4 0C02CF7E */ jal func_800B3DF8 /* B2E858 800B76B8 00042403 */ sra $a0, $a0, 0x10 @@ -2809,7 +2809,7 @@ glabel func_800B4E7C /* B2E880 800B76E0 24060006 */ li $a2, 6 /* B2E884 800B76E4 4600510D */ trunc.w.s $f4, $f10 /* B2E888 800B76E8 44042000 */ mfc1 $a0, $f4 -/* B2E88C 800B76EC 00000000 */ nop +/* B2E88C 800B76EC 00000000 */ nop /* B2E890 800B76F0 00042400 */ sll $a0, $a0, 0x10 /* B2E894 800B76F4 0C02CF7E */ jal func_800B3DF8 /* B2E898 800B76F8 00042403 */ sra $a0, $a0, 0x10 @@ -2821,14 +2821,14 @@ glabel func_800B4E7C /* B2E8B0 800B7710 86AB0084 */ lh $t3, 0x84($s5) /* B2E8B4 800B7714 24010001 */ li $at, 1 /* B2E8B8 800B7718 1561000A */ bne $t3, $at, .L800B7744 -/* B2E8BC 800B771C 00000000 */ nop +/* B2E8BC 800B771C 00000000 */ nop /* B2E8C0 800B7720 86AD0086 */ lh $t5, 0x86($s5) /* B2E8C4 800B7724 24010004 */ li $at, 4 /* B2E8C8 800B7728 15A10006 */ bne $t5, $at, .L800B7744 /* B2E8CC 800B772C 3C0C8016 */ lui $t4, %hi(D_80161144) # $t4, 0x8016 /* B2E8D0 800B7730 8D8C1144 */ lw $t4, %lo(D_80161144)($t4) /* B2E8D4 800B7734 11800003 */ beqz $t4, .L800B7744 -/* B2E8D8 800B7738 00000000 */ nop +/* B2E8D8 800B7738 00000000 */ nop /* B2E8DC 800B773C 10000009 */ b .L800B7764 /* B2E8E0 800B7740 24100007 */ li $s0, 7 .L800B7744: @@ -2855,7 +2855,7 @@ glabel func_800B4E7C /* B2E92C 800B778C 24060006 */ li $a2, 6 /* B2E930 800B7790 4600320D */ trunc.w.s $f8, $f6 /* B2E934 800B7794 44044000 */ mfc1 $a0, $f8 -/* B2E938 800B7798 00000000 */ nop +/* B2E938 800B7798 00000000 */ nop /* B2E93C 800B779C 00042400 */ sll $a0, $a0, 0x10 /* B2E940 800B77A0 0C02CF7E */ jal func_800B3DF8 /* B2E944 800B77A4 00042403 */ sra $a0, $a0, 0x10 @@ -2871,7 +2871,7 @@ glabel func_800B4E7C /* B2E96C 800B77CC 24060006 */ li $a2, 6 /* B2E970 800B77D0 4600510D */ trunc.w.s $f4, $f10 /* B2E974 800B77D4 44042000 */ mfc1 $a0, $f4 -/* B2E978 800B77D8 00000000 */ nop +/* B2E978 800B77D8 00000000 */ nop /* B2E97C 800B77DC 00042400 */ sll $a0, $a0, 0x10 /* B2E980 800B77E0 0C02CF7E */ jal func_800B3DF8 /* B2E984 800B77E4 00042403 */ sra $a0, $a0, 0x10 @@ -2887,7 +2887,7 @@ glabel func_800B4E7C /* B2E9AC 800B780C 24060006 */ li $a2, 6 /* B2E9B0 800B7810 4600320D */ trunc.w.s $f8, $f6 /* B2E9B4 800B7814 44044000 */ mfc1 $a0, $f8 -/* B2E9B8 800B7818 00000000 */ nop +/* B2E9B8 800B7818 00000000 */ nop /* B2E9BC 800B781C 00042400 */ sll $a0, $a0, 0x10 /* B2E9C0 800B7820 0C02CF7E */ jal func_800B3DF8 /* B2E9C4 800B7824 00042403 */ sra $a0, $a0, 0x10 @@ -2901,7 +2901,7 @@ glabel func_800B4E7C /* B2E9E4 800B7844 27A400FC */ addiu $a0, $sp, 0xfc .L800B7848: /* B2E9E8 800B7848 8FA50090 */ lw $a1, 0x90($sp) -/* B2E9EC 800B784C 0C01F124 */ jal func_8007C490 +/* B2E9EC 800B784C 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* B2E9F0 800B7850 8FA6007C */ lw $a2, 0x7c($sp) /* B2E9F4 800B7854 87AD0102 */ lh $t5, 0x102($sp) /* B2E9F8 800B7858 86EC00A2 */ lh $t4, 0xa2($s7) @@ -2910,14 +2910,14 @@ glabel func_800B4E7C /* B2EA04 800B7864 A7AF0102 */ sh $t7, 0x102($sp) /* B2EA08 800B7868 86B80084 */ lh $t8, 0x84($s5) /* B2EA0C 800B786C 1701000A */ bne $t8, $at, .L800B7898 -/* B2EA10 800B7870 00000000 */ nop +/* B2EA10 800B7870 00000000 */ nop /* B2EA14 800B7874 86AE0086 */ lh $t6, 0x86($s5) /* B2EA18 800B7878 24010004 */ li $at, 4 /* B2EA1C 800B787C 15C10006 */ bne $t6, $at, .L800B7898 /* B2EA20 800B7880 3C098016 */ lui $t1, %hi(D_80161144) # $t1, 0x8016 /* B2EA24 800B7884 8D291144 */ lw $t1, %lo(D_80161144)($t1) /* B2EA28 800B7888 15200003 */ bnez $t1, .L800B7898 -/* B2EA2C 800B788C 00000000 */ nop +/* B2EA2C 800B788C 00000000 */ nop /* B2EA30 800B7890 10000009 */ b .L800B78B8 /* B2EA34 800B7894 24100007 */ li $s0, 7 .L800B7898: @@ -2949,7 +2949,7 @@ glabel func_800B4E7C /* B2EA94 800B78F4 46062202 */ mul.s $f8, $f4, $f6 /* B2EA98 800B78F8 4600428D */ trunc.w.s $f10, $f8 /* B2EA9C 800B78FC 44045000 */ mfc1 $a0, $f10 -/* B2EAA0 800B7900 00000000 */ nop +/* B2EAA0 800B7900 00000000 */ nop /* B2EAA4 800B7904 00042400 */ sll $a0, $a0, 0x10 /* B2EAA8 800B7908 0C02CF7E */ jal func_800B3DF8 /* B2EAAC 800B790C 00042403 */ sra $a0, $a0, 0x10 @@ -2971,7 +2971,7 @@ glabel func_800B4E7C /* B2EAEC 800B794C 46083282 */ mul.s $f10, $f6, $f8 /* B2EAF0 800B7950 4600510D */ trunc.w.s $f4, $f10 /* B2EAF4 800B7954 44042000 */ mfc1 $a0, $f4 -/* B2EAF8 800B7958 00000000 */ nop +/* B2EAF8 800B7958 00000000 */ nop /* B2EAFC 800B795C 00042400 */ sll $a0, $a0, 0x10 /* B2EB00 800B7960 0C02CF7E */ jal func_800B3DF8 /* B2EB04 800B7964 00042403 */ sra $a0, $a0, 0x10 @@ -2988,7 +2988,7 @@ glabel func_800B4E7C /* B2EB30 800B7990 02602825 */ move $a1, $s3 /* B2EB34 800B7994 24060006 */ li $a2, 6 /* B2EB38 800B7998 44044000 */ mfc1 $a0, $f8 -/* B2EB3C 800B799C 00000000 */ nop +/* B2EB3C 800B799C 00000000 */ nop /* B2EB40 800B79A0 00042400 */ sll $a0, $a0, 0x10 /* B2EB44 800B79A4 0C02CF7E */ jal func_800B3DF8 /* B2EB48 800B79A8 00042403 */ sra $a0, $a0, 0x10 @@ -3000,7 +3000,7 @@ glabel func_800B4E7C /* B2EB60 800B79C0 24060003 */ li $a2, 3 /* B2EB64 800B79C4 27A400FC */ addiu $a0, $sp, 0xfc /* B2EB68 800B79C8 8FA50090 */ lw $a1, 0x90($sp) -/* B2EB6C 800B79CC 0C01F124 */ jal func_8007C490 +/* B2EB6C 800B79CC 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* B2EB70 800B79D0 8FA60080 */ lw $a2, 0x80($sp) /* B2EB74 800B79D4 87B80102 */ lh $t8, 0x102($sp) /* B2EB78 800B79D8 86EE00A2 */ lh $t6, 0xa2($s7) @@ -3009,14 +3009,14 @@ glabel func_800B4E7C /* B2EB84 800B79E4 A7A90102 */ sh $t1, 0x102($sp) /* B2EB88 800B79E8 86B90084 */ lh $t9, 0x84($s5) /* B2EB8C 800B79EC 1721000A */ bne $t9, $at, .L800B7A18 -/* B2EB90 800B79F0 00000000 */ nop +/* B2EB90 800B79F0 00000000 */ nop /* B2EB94 800B79F4 86AA0086 */ lh $t2, 0x86($s5) /* B2EB98 800B79F8 24010004 */ li $at, 4 /* B2EB9C 800B79FC 15410006 */ bne $t2, $at, .L800B7A18 /* B2EBA0 800B7A00 3C0B8016 */ lui $t3, %hi(D_80161144) # $t3, 0x8016 /* B2EBA4 800B7A04 8D6B1144 */ lw $t3, %lo(D_80161144)($t3) /* B2EBA8 800B7A08 11600003 */ beqz $t3, .L800B7A18 -/* B2EBAC 800B7A0C 00000000 */ nop +/* B2EBAC 800B7A0C 00000000 */ nop /* B2EBB0 800B7A10 10000009 */ b .L800B7A38 /* B2EBB4 800B7A14 24100007 */ li $s0, 7 .L800B7A18: @@ -3046,7 +3046,7 @@ glabel func_800B4E7C /* B2EC0C 800B7A6C 46062202 */ mul.s $f8, $f4, $f6 /* B2EC10 800B7A70 4600428D */ trunc.w.s $f10, $f8 /* B2EC14 800B7A74 44045000 */ mfc1 $a0, $f10 -/* B2EC18 800B7A78 00000000 */ nop +/* B2EC18 800B7A78 00000000 */ nop /* B2EC1C 800B7A7C 00042400 */ sll $a0, $a0, 0x10 /* B2EC20 800B7A80 0C02CF7E */ jal func_800B3DF8 /* B2EC24 800B7A84 00042403 */ sra $a0, $a0, 0x10 @@ -3066,7 +3066,7 @@ glabel func_800B4E7C /* B2EC5C 800B7ABC 46083282 */ mul.s $f10, $f6, $f8 /* B2EC60 800B7AC0 4600510D */ trunc.w.s $f4, $f10 /* B2EC64 800B7AC4 44042000 */ mfc1 $a0, $f4 -/* B2EC68 800B7AC8 00000000 */ nop +/* B2EC68 800B7AC8 00000000 */ nop /* B2EC6C 800B7ACC 00042400 */ sll $a0, $a0, 0x10 /* B2EC70 800B7AD0 0C02CF7E */ jal func_800B3DF8 /* B2EC74 800B7AD4 00042403 */ sra $a0, $a0, 0x10 @@ -3081,7 +3081,7 @@ glabel func_800B4E7C /* B2EC98 800B7AF8 24060006 */ li $a2, 6 /* B2EC9C 800B7AFC 4600320D */ trunc.w.s $f8, $f6 /* B2ECA0 800B7B00 44044000 */ mfc1 $a0, $f8 -/* B2ECA4 800B7B04 00000000 */ nop +/* B2ECA4 800B7B04 00000000 */ nop /* B2ECA8 800B7B08 00042400 */ sll $a0, $a0, 0x10 /* B2ECAC 800B7B0C 0C02CF7E */ jal func_800B3DF8 /* B2ECB0 800B7B10 00042403 */ sra $a0, $a0, 0x10 @@ -3215,7 +3215,7 @@ glabel func_800B4E7C /* B2EEA4 800B7D04 27A400FC */ addiu $a0, $sp, 0xfc .L800B7D08: /* B2EEA8 800B7D08 02802825 */ move $a1, $s4 -/* B2EEAC 800B7D0C 0C01F124 */ jal func_8007C490 +/* B2EEAC 800B7D0C 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* B2EEB0 800B7D10 27A600B8 */ addiu $a2, $sp, 0xb8 /* B2EEB4 800B7D14 826208B1 */ lb $v0, 0x8b1($s3) /* B2EEB8 800B7D18 86AC0082 */ lh $t4, 0x82($s5) @@ -3479,7 +3479,7 @@ glabel func_800B4E7C /* B2F2A0 800B8100 4600510D */ trunc.w.s $f4, $f10 /* B2F2A4 800B8104 24060006 */ li $a2, 6 /* B2F2A8 800B8108 44042000 */ mfc1 $a0, $f4 -/* B2F2AC 800B810C 00000000 */ nop +/* B2F2AC 800B810C 00000000 */ nop /* B2F2B0 800B8110 00042400 */ sll $a0, $a0, 0x10 /* B2F2B4 800B8114 0C02CF7E */ jal func_800B3DF8 /* B2F2B8 800B8118 00042403 */ sra $a0, $a0, 0x10 @@ -3496,7 +3496,7 @@ glabel func_800B4E7C /* B2F2E4 800B8144 24060006 */ li $a2, 6 /* B2F2E8 800B8148 4600320D */ trunc.w.s $f8, $f6 /* B2F2EC 800B814C 44044000 */ mfc1 $a0, $f8 -/* B2F2F0 800B8150 00000000 */ nop +/* B2F2F0 800B8150 00000000 */ nop /* B2F2F4 800B8154 00042400 */ sll $a0, $a0, 0x10 /* B2F2F8 800B8158 0C02CF7E */ jal func_800B3DF8 /* B2F2FC 800B815C 00042403 */ sra $a0, $a0, 0x10 @@ -3512,7 +3512,7 @@ glabel func_800B4E7C /* B2F324 800B8184 24060006 */ li $a2, 6 /* B2F328 800B8188 4600510D */ trunc.w.s $f4, $f10 /* B2F32C 800B818C 44042000 */ mfc1 $a0, $f4 -/* B2F330 800B8190 00000000 */ nop +/* B2F330 800B8190 00000000 */ nop /* B2F334 800B8194 00042400 */ sll $a0, $a0, 0x10 /* B2F338 800B8198 0C02CF7E */ jal func_800B3DF8 /* B2F33C 800B819C 00042403 */ sra $a0, $a0, 0x10 @@ -3542,7 +3542,7 @@ glabel func_800B4E7C /* B2F398 800B81F8 24060006 */ li $a2, 6 /* B2F39C 800B81FC 4600320D */ trunc.w.s $f8, $f6 /* B2F3A0 800B8200 44044000 */ mfc1 $a0, $f8 -/* B2F3A4 800B8204 00000000 */ nop +/* B2F3A4 800B8204 00000000 */ nop /* B2F3A8 800B8208 00042400 */ sll $a0, $a0, 0x10 /* B2F3AC 800B820C 0C02CF7E */ jal func_800B3DF8 /* B2F3B0 800B8210 00042403 */ sra $a0, $a0, 0x10 @@ -3558,7 +3558,7 @@ glabel func_800B4E7C /* B2F3D8 800B8238 24060006 */ li $a2, 6 /* B2F3DC 800B823C 4600510D */ trunc.w.s $f4, $f10 /* B2F3E0 800B8240 44042000 */ mfc1 $a0, $f4 -/* B2F3E4 800B8244 00000000 */ nop +/* B2F3E4 800B8244 00000000 */ nop /* B2F3E8 800B8248 00042400 */ sll $a0, $a0, 0x10 /* B2F3EC 800B824C 0C02CF7E */ jal func_800B3DF8 /* B2F3F0 800B8250 00042403 */ sra $a0, $a0, 0x10 @@ -3574,7 +3574,7 @@ glabel func_800B4E7C /* B2F418 800B8278 24060006 */ li $a2, 6 /* B2F41C 800B827C 4600320D */ trunc.w.s $f8, $f6 /* B2F420 800B8280 44044000 */ mfc1 $a0, $f8 -/* B2F424 800B8284 00000000 */ nop +/* B2F424 800B8284 00000000 */ nop /* B2F428 800B8288 00042400 */ sll $a0, $a0, 0x10 /* B2F42C 800B828C 0C02CF7E */ jal func_800B3DF8 /* B2F430 800B8290 00042403 */ sra $a0, $a0, 0x10 @@ -3609,7 +3609,7 @@ glabel func_800B4E7C /* B2F49C 800B82FC 46062202 */ mul.s $f8, $f4, $f6 /* B2F4A0 800B8300 4600428D */ trunc.w.s $f10, $f8 /* B2F4A4 800B8304 44045000 */ mfc1 $a0, $f10 -/* B2F4A8 800B8308 00000000 */ nop +/* B2F4A8 800B8308 00000000 */ nop /* B2F4AC 800B830C 00042400 */ sll $a0, $a0, 0x10 /* B2F4B0 800B8310 0C02CF7E */ jal func_800B3DF8 /* B2F4B4 800B8314 00042403 */ sra $a0, $a0, 0x10 @@ -3630,7 +3630,7 @@ glabel func_800B4E7C /* B2F4F0 800B8350 46083282 */ mul.s $f10, $f6, $f8 /* B2F4F4 800B8354 4600510D */ trunc.w.s $f4, $f10 /* B2F4F8 800B8358 44042000 */ mfc1 $a0, $f4 -/* B2F4FC 800B835C 00000000 */ nop +/* B2F4FC 800B835C 00000000 */ nop /* B2F500 800B8360 00042400 */ sll $a0, $a0, 0x10 /* B2F504 800B8364 0C02CF7E */ jal func_800B3DF8 /* B2F508 800B8368 00042403 */ sra $a0, $a0, 0x10 @@ -3646,7 +3646,7 @@ glabel func_800B4E7C /* B2F530 800B8390 4600018D */ trunc.w.s $f6, $f0 /* B2F534 800B8394 24060006 */ li $a2, 6 /* B2F538 800B8398 44043000 */ mfc1 $a0, $f6 -/* B2F53C 800B839C 00000000 */ nop +/* B2F53C 800B839C 00000000 */ nop /* B2F540 800B83A0 00042400 */ sll $a0, $a0, 0x10 /* B2F544 800B83A4 0C02CF7E */ jal func_800B3DF8 /* B2F548 800B83A8 00042403 */ sra $a0, $a0, 0x10 @@ -3665,7 +3665,7 @@ glabel func_800B4E7C /* B2F57C 800B83DC 0C018DDB */ jal func_8006376C /* B2F580 800B83E0 24060001 */ li $a2, 1 /* B2F584 800B83E4 10000007 */ b .L800B8404 -/* B2F588 800B83E8 00000000 */ nop +/* B2F588 800B83E8 00000000 */ nop .L800B83EC: /* B2F58C 800B83EC 3C078013 */ lui $a3, %hi(D_8012CF40) # $a3, 0x8013 /* B2F590 800B83F0 8CE7CF40 */ lw $a3, %lo(D_8012CF40)($a3) @@ -3685,7 +3685,7 @@ glabel func_800B4E7C /* B2F5C4 800B8424 AC22D110 */ sw $v0, %lo(D_8012D110)($at) /* B2F5C8 800B8428 02002025 */ move $a0, $s0 /* B2F5CC 800B842C 02602825 */ move $a1, $s3 -/* B2F5D0 800B8430 0C01F124 */ jal func_8007C490 +/* B2F5D0 800B8430 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* B2F5D4 800B8434 02803025 */ move $a2, $s4 /* B2F5D8 800B8438 C6A80008 */ lwc1 $f8, 8($s5) /* B2F5DC 800B843C C6AC0004 */ lwc1 $f12, 4($s5) @@ -3836,7 +3836,7 @@ glabel func_800B4E7C /* B2F820 800B8680 AFA90038 */ sw $t1, 0x38($sp) /* B2F824 800B8684 02002025 */ move $a0, $s0 /* B2F828 800B8688 26E50074 */ addiu $a1, $s7, 0x74 -/* B2F82C 800B868C 0C01F124 */ jal func_8007C490 +/* B2F82C 800B868C 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* B2F830 800B8690 02803025 */ move $a2, $s4 /* B2F834 800B8694 C6EC0074 */ lwc1 $f12, 0x74($s7) /* B2F838 800B8698 C6EE0078 */ lwc1 $f14, 0x78($s7) diff --git a/asm/non_matchings/code/db_camera/func_800B9638.s b/asm/non_matchings/code/db_camera/func_800B9638.s index 61f5c0dbb3..561d533bcc 100644 --- a/asm/non_matchings/code/db_camera/func_800B9638.s +++ b/asm/non_matchings/code/db_camera/func_800B9638.s @@ -55,7 +55,7 @@ glabel func_800B9638 /* B308A8 800B9708 50410142 */ beql $v0, $at, .L800B9C14 /* B308AC 800B970C 864D10C4 */ lh $t5, 0x10c4($s2) /* B308B0 800B9710 10000185 */ b .L800B9D28 -/* B308B4 800B9714 00000000 */ nop +/* B308B4 800B9714 00000000 */ nop .L800B9718: /* B308B8 800B9718 24010001 */ li $at, 1 /* B308BC 800B971C 104101A4 */ beq $v0, $at, .L800B9DB0 @@ -71,9 +71,9 @@ glabel func_800B9638 /* B308E4 800B9744 10410005 */ beq $v0, $at, .L800B975C /* B308E8 800B9748 240100C9 */ li $at, 201 /* B308EC 800B974C 104100B9 */ beq $v0, $at, .L800B9A34 -/* B308F0 800B9750 00000000 */ nop +/* B308F0 800B9750 00000000 */ nop /* B308F4 800B9754 10000174 */ b .L800B9D28 -/* B308F8 800B9758 00000000 */ nop +/* B308F8 800B9758 00000000 */ nop .L800B975C: /* B308FC 800B975C 3C0C8016 */ lui $t4, %hi(D_80161104) # $t4, 0x8016 /* B30900 800B9760 8D8C1104 */ lw $t4, %lo(D_80161104)($t4) @@ -304,7 +304,7 @@ glabel func_800B9638 /* B30C4C 800B9AAC 8F19FFFC */ lw $t9, -4($t8) /* B30C50 800B9AB0 24840009 */ addiu $a0, $a0, 9 /* B30C54 800B9AB4 0320F809 */ jalr $t9 -/* B30C58 800B9AB8 00000000 */ nop +/* B30C58 800B9AB8 00000000 */ nop /* B30C5C 800B9ABC 50400007 */ beql $v0, $zero, .L800B9ADC /* B30C60 800B9AC0 864C10C0 */ lh $t4, 0x10c0($s2) /* B30C64 800B9AC4 864A10C0 */ lh $t2, 0x10c0($s2) @@ -391,7 +391,7 @@ glabel func_800B9638 /* B30D94 800B9BF4 240100CA */ li $at, 202 /* B30D98 800B9BF8 24020001 */ li $v0, 1 /* B30D9C 800B9BFC 15810002 */ bne $t4, $at, .L800B9C08 -/* B30DA0 800B9C00 00000000 */ nop +/* B30DA0 800B9C00 00000000 */ nop /* B30DA4 800B9C04 A64010C2 */ sh $zero, 0x10c2($s2) .L800B9C08: /* B30DA8 800B9C08 10000506 */ b .L800BB024 @@ -665,7 +665,7 @@ glabel func_800B9638 /* B31188 800B9FE8 0C018DDB */ jal func_8006376C /* B3118C 800B9FEC 24060007 */ li $a2, 7 /* B31190 800B9FF0 0C02E2E9 */ jal func_800B8BA4 -/* B31194 800B9FF4 00000000 */ nop +/* B31194 800B9FF4 00000000 */ nop /* B31198 800B9FF8 00022400 */ sll $a0, $v0, 0x10 /* B3119C 800B9FFC 00042403 */ sra $a0, $a0, 0x10 /* B311A0 800BA000 27A50074 */ addiu $a1, $sp, 0x74 @@ -1061,7 +1061,7 @@ glabel func_800B9638 /* B3177C 800BA5DC 27A4005C */ addiu $a0, $sp, 0x5c .L800BA5E0: /* B31780 800BA5E0 26450010 */ addiu $a1, $s2, 0x10 -/* B31784 800BA5E4 0C01F124 */ jal func_8007C490 +/* B31784 800BA5E4 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* B31788 800BA5E8 26460004 */ addiu $a2, $s2, 4 /* B3178C 800BA5EC 3C018014 */ lui $at, %hi(D_80143CD0) /* B31790 800BA5F0 C4323CD0 */ lwc1 $f18, %lo(D_80143CD0)($at) @@ -1075,7 +1075,7 @@ glabel func_800B9638 /* B317B0 800BA610 46062200 */ add.s $f8, $f4, $f6 /* B317B4 800BA614 4600428D */ trunc.w.s $f10, $f8 /* B317B8 800BA618 44075000 */ mfc1 $a3, $f10 -/* B317BC 800BA61C 00000000 */ nop +/* B317BC 800BA61C 00000000 */ nop /* B317C0 800BA620 00073C00 */ sll $a3, $a3, 0x10 /* B317C4 800BA624 0C02CEF5 */ jal func_800B3BD4 /* B317C8 800BA628 00073C03 */ sra $a3, $a3, 0x10 @@ -1651,7 +1651,7 @@ glabel func_800B9638 /* B3202C 800BAE8C 0C02E418 */ jal func_800B9060 /* B32030 800BAE90 8FA400AC */ lw $a0, 0xac($sp) /* B32034 800BAE94 10000042 */ b .L800BAFA0 -/* B32038 800BAE98 00000000 */ nop +/* B32038 800BAE98 00000000 */ nop .L800BAE9C: /* B3203C 800BAE9C 14400020 */ bnez $v0, .L800BAF20 /* B32040 800BAEA0 2401FFFD */ li $at, -3 @@ -1687,7 +1687,7 @@ glabel func_800B9638 /* B320B0 800BAF10 1621FFF4 */ bne $s1, $at, .L800BAEE4 /* B320B4 800BAF14 26100010 */ addiu $s0, $s0, 0x10 /* B320B8 800BAF18 10000021 */ b .L800BAFA0 -/* B320BC 800BAF1C 00000000 */ nop +/* B320BC 800BAF1C 00000000 */ nop .L800BAF20: /* B320C0 800BAF20 2401FFFE */ li $at, -2 /* B320C4 800BAF24 00615027 */ nor $t2, $v1, $at @@ -1744,7 +1744,7 @@ glabel func_800B9638 /* B3218C 800BAFEC 0C018DDB */ jal func_8006376C /* B32190 800BAFF0 A3AC0074 */ sb $t4, 0x74($sp) /* B32194 800BAFF4 10000002 */ b .L800BB000 -/* B32198 800BAFF8 00000000 */ nop +/* B32198 800BAFF8 00000000 */ nop .L800BAFFC: /* B3219C 800BAFFC A3AD0074 */ sb $t5, 0x74($sp) .L800BB000: @@ -1773,7 +1773,7 @@ glabel func_800B9638 /* B321F0 800BB050 8FBF0014 */ lw $ra, 0x14($sp) /* B321F4 800BB054 27BD0018 */ addiu $sp, $sp, 0x18 /* B321F8 800BB058 03E00008 */ jr $ra -/* B321FC 800BB05C 00000000 */ nop +/* B321FC 800BB05C 00000000 */ nop /* B32200 800BB060 3C018016 */ lui $at, %hi(D_8016111A) /* B32204 800BB064 03E00008 */ jr $ra @@ -1785,10 +1785,10 @@ glabel func_800B9638 /* B32218 800BB078 38420002 */ xori $v0, $v0, 2 /* B3221C 800BB07C 2C420001 */ sltiu $v0, $v0, 1 /* B32220 800BB080 10400004 */ beqz $v0, .L800BB094 -/* B32224 800BB084 00000000 */ nop +/* B32224 800BB084 00000000 */ nop /* B32228 800BB088 3C028016 */ lui $v0, %hi(D_8016111A) # $v0, 0x8016 /* B3222C 800BB08C 8442111A */ lh $v0, %lo(D_8016111A)($v0) /* B32230 800BB090 0002102B */ sltu $v0, $zero, $v0 .L800BB094: /* B32234 800BB094 03E00008 */ jr $ra -/* B32238 800BB098 00000000 */ nop +/* B32238 800BB098 00000000 */ nop diff --git a/asm/non_matchings/code/z_camera/Camera_Battle1.s b/asm/non_matchings/code/z_camera/Camera_Battle1.s index 5b81964c1f..3c1457da6e 100644 --- a/asm/non_matchings/code/z_camera/Camera_Battle1.s +++ b/asm/non_matchings/code/z_camera/Camera_Battle1.s @@ -462,12 +462,12 @@ glabel Camera_Battle1 /* AC2C90 8004BAF0 AFA6004C */ sw $a2, 0x4c($sp) /* AC2C94 8004BAF4 AFA50048 */ sw $a1, 0x48($sp) /* AC2C98 8004BAF8 27A4009C */ addiu $a0, $sp, 0x9c -/* AC2C9C 8004BAFC 0C01F124 */ jal func_8007C490 +/* AC2C9C 8004BAFC 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* AC2CA0 8004BB00 E7A80064 */ swc1 $f8, 0x64($sp) /* AC2CA4 8004BB04 26060074 */ addiu $a2, $s0, 0x74 /* AC2CA8 8004BB08 AFA60044 */ sw $a2, 0x44($sp) /* AC2CAC 8004BB0C 27A40094 */ addiu $a0, $sp, 0x94 -/* AC2CB0 8004BB10 0C01F124 */ jal func_8007C490 +/* AC2CB0 8004BB10 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* AC2CB4 8004BB14 8FA50048 */ lw $a1, 0x48($sp) /* AC2CB8 8004BB18 8E0300A8 */ lw $v1, 0xa8($s0) /* AC2CBC 8004BB1C 10600004 */ beqz $v1, .L8004BB30 @@ -662,7 +662,7 @@ glabel Camera_Battle1 /* AC2F68 8004BDC8 8FA60038 */ lw $a2, 0x38($sp) /* AC2F6C 8004BDCC A7A8008C */ sh $t0, 0x8c($sp) /* AC2F70 8004BDD0 46044180 */ add.s $f6, $f8, $f4 -/* AC2F74 8004BDD4 0C01F124 */ jal func_8007C490 +/* AC2F74 8004BDD4 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* AC2F78 8004BDD8 E7A60120 */ swc1 $f6, 0x120($sp) /* AC2F7C 8004BDDC C7A000A4 */ lwc1 $f0, 0xa4($sp) /* AC2F80 8004BDE0 C7A20080 */ lwc1 $f2, 0x80($sp) @@ -689,7 +689,7 @@ glabel Camera_Battle1 /* AC2FCC 8004BE2C 8DAF0008 */ lw $t7, 8($t5) /* AC2FD0 8004BE30 ACCF0008 */ sw $t7, 8($a2) /* AC2FD4 8004BE34 A7A8008C */ sh $t0, 0x8c($sp) -/* AC2FD8 8004BE38 0C01F124 */ jal func_8007C490 +/* AC2FD8 8004BE38 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* AC2FDC 8004BE3C 8FA50048 */ lw $a1, 0x48($sp) /* AC2FE0 8004BE40 C7AC00AC */ lwc1 $f12, 0xac($sp) /* AC2FE4 8004BE44 C7A40080 */ lwc1 $f4, 0x80($sp) @@ -763,7 +763,7 @@ glabel Camera_Battle1 /* AC30F0 8004BF50 A7AF0086 */ sh $t7, 0x86($sp) /* AC30F4 8004BF54 8FA50048 */ lw $a1, 0x48($sp) /* AC30F8 8004BF58 8FA6004C */ lw $a2, 0x4c($sp) -/* AC30FC 8004BF5C 0C01F124 */ jal func_8007C490 +/* AC30FC 8004BF5C 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* AC3100 8004BF60 A7A8008C */ sh $t0, 0x8c($sp) /* AC3104 8004BF64 87A8008C */ lh $t0, 0x8c($sp) /* AC3108 8004BF68 3C038016 */ lui $v1, %hi(gGameInfo) @@ -1097,7 +1097,7 @@ glabel Camera_Battle1 /* AC35F0 8004C450 10000010 */ b .L8004C494 /* AC35F4 8004C454 27B900BC */ addiu $t9, $sp, 0xbc .L8004C458: -/* AC35F8 8004C458 0C01F03E */ jal func_8007C0F8 +/* AC35F8 8004C458 0C01F03E */ jal OLib_Vec3fDistNormalize /* AC35FC 8004C45C 8FA50048 */ lw $a1, 0x48($sp) /* AC3600 8004C460 C7A400BC */ lwc1 $f4, 0xbc($sp) /* AC3604 8004C464 C7AA0128 */ lwc1 $f10, 0x128($sp) diff --git a/asm/non_matchings/code/z_camera/Camera_Battle4.s b/asm/non_matchings/code/z_camera/Camera_Battle4.s index 875e59d60d..a99d4136b6 100644 --- a/asm/non_matchings/code/z_camera/Camera_Battle4.s +++ b/asm/non_matchings/code/z_camera/Camera_Battle4.s @@ -134,12 +134,12 @@ glabel Camera_Battle4 /* AC3968 8004C7C8 2606005C */ addiu $a2, $s0, 0x5c /* AC396C 8004C7CC AFA60034 */ sw $a2, 0x34($sp) /* AC3970 8004C7D0 AFA50030 */ sw $a1, 0x30($sp) -/* AC3974 8004C7D4 0C01F124 */ jal func_8007C490 +/* AC3974 8004C7D4 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* AC3978 8004C7D8 27A4005C */ addiu $a0, $sp, 0x5c /* AC397C 8004C7DC 26060074 */ addiu $a2, $s0, 0x74 /* AC3980 8004C7E0 AFA6002C */ sw $a2, 0x2c($sp) /* AC3984 8004C7E4 27A40054 */ addiu $a0, $sp, 0x54 -/* AC3988 8004C7E8 0C01F124 */ jal func_8007C490 +/* AC3988 8004C7E8 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* AC398C 8004C7EC 8FA50030 */ lw $a1, 0x30($sp) /* AC3990 8004C7F0 860D0018 */ lh $t5, 0x18($s0) /* AC3994 8004C7F4 3C018012 */ lui $at, %hi(D_8011D3A0) # $at, 0x8012 diff --git a/asm/non_matchings/code/z_camera/Camera_Data4.s b/asm/non_matchings/code/z_camera/Camera_Data4.s index f3a21af8d4..9e8366e358 100644 --- a/asm/non_matchings/code/z_camera/Camera_Data4.s +++ b/asm/non_matchings/code/z_camera/Camera_Data4.s @@ -144,7 +144,7 @@ glabel Camera_Data4 /* AC85D8 80051438 26050050 */ addiu $a1, $s0, 0x50 /* AC85DC 8005143C AFA50024 */ sw $a1, 0x24($sp) /* AC85E0 80051440 27A40064 */ addiu $a0, $sp, 0x64 -/* AC85E4 80051444 0C01F124 */ jal func_8007C490 +/* AC85E4 80051444 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* AC85E8 80051448 26060074 */ addiu $a2, $s0, 0x74 /* AC85EC 8005144C 02002025 */ move $a0, $s0 /* AC85F0 80051450 27A50064 */ addiu $a1, $sp, 0x64 @@ -153,7 +153,7 @@ glabel Camera_Data4 /* AC85FC 8005145C 00003825 */ move $a3, $zero /* AC8600 80051460 27A40074 */ addiu $a0, $sp, 0x74 /* AC8604 80051464 8FA50028 */ lw $a1, 0x28($sp) -/* AC8608 80051468 0C01F124 */ jal func_8007C490 +/* AC8608 80051468 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* AC860C 8005146C 8FA60024 */ lw $a2, 0x24($sp) /* AC8610 80051470 C7A40074 */ lwc1 $f4, 0x74($sp) /* AC8614 80051474 87AE007A */ lh $t6, 0x7a($sp) @@ -218,7 +218,7 @@ glabel Camera_Data4 /* AC86F8 80051558 C7A80038 */ lwc1 $f8, 0x38($sp) /* AC86FC 8005155C 8FA50028 */ lw $a1, 0x28($sp) /* AC8700 80051560 46089400 */ add.s $f16, $f18, $f8 -/* AC8704 80051564 0C01EFE4 */ jal func_8007BF90 +/* AC8704 80051564 0C01EFE4 */ jal OLib_Vec3fDist /* AC8708 80051568 E7B0004C */ swc1 $f16, 0x4c($sp) /* AC870C 8005156C 44802000 */ mtc1 $zero, $f4 /* AC8710 80051570 C60A0004 */ lwc1 $f10, 4($s0) diff --git a/asm/non_matchings/code/z_camera/Camera_Demo1.s b/asm/non_matchings/code/z_camera/Camera_Demo1.s index 226a0cea1f..581844b548 100644 --- a/asm/non_matchings/code/z_camera/Camera_Demo1.s +++ b/asm/non_matchings/code/z_camera/Camera_Demo1.s @@ -198,7 +198,7 @@ glabel Camera_Demo1 /* ACB8E8 80054748 46083282 */ mul.s $f10, $f6, $f8 /* ACB8EC 8005474C 4600540D */ trunc.w.s $f16, $f10 /* ACB8F0 80054750 44198000 */ mfc1 $t9, $f16 -/* ACB8F4 80054754 0C01EFE4 */ jal func_8007BF90 +/* ACB8F4 80054754 0C01EFE4 */ jal OLib_Vec3fDist /* ACB8F8 80054758 A619015A */ sh $t9, 0x15a($s0) /* ACB8FC 8005475C E60000DC */ swc1 $f0, 0xdc($s0) /* ACB900 80054760 8FBF0024 */ lw $ra, 0x24($sp) diff --git a/asm/non_matchings/code/z_camera/Camera_Demo3.s b/asm/non_matchings/code/z_camera/Camera_Demo3.s index 36fc161207..beb5b7021f 100644 --- a/asm/non_matchings/code/z_camera/Camera_Demo3.s +++ b/asm/non_matchings/code/z_camera/Camera_Demo3.s @@ -122,7 +122,7 @@ glabel Camera_Demo3 /* ACBA10 80054870 AFA60034 */ sw $a2, 0x34($sp) /* ACBA14 80054874 AFA50030 */ sw $a1, 0x30($sp) /* ACBA18 80054878 27A40090 */ addiu $a0, $sp, 0x90 -/* ACBA1C 8005487C 0C01F124 */ jal func_8007C490 +/* ACBA1C 8005487C 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* ACBA20 80054880 E7B0004C */ swc1 $f16, 0x4c($sp) /* ACBA24 80054884 86390008 */ lh $t9, 8($s1) /* ACBA28 80054888 3C018012 */ lui $at, %hi(D_8011D3A0) # $at, 0x8012 @@ -240,7 +240,7 @@ glabel L800548B8 /* ACBBD4 80054A34 A6090012 */ sh $t1, 0x12($s0) .L80054A38: /* ACBBD8 80054A38 24C5D678 */ addiu $a1, $a2, %lo(D_8011D678) -/* ACBBDC 80054A3C 0C01F0FD */ jal func_8007C3F4 +/* ACBBDC 80054A3C 0C01F0FD */ jal OLib_Vec3fToVecSphRot90 /* ACBBE0 80054A40 27A40080 */ addiu $a0, $sp, 0x80 /* ACBBE4 80054A44 8FAC0028 */ lw $t4, 0x28($sp) /* ACBBE8 80054A48 87AB0086 */ lh $t3, 0x86($sp) @@ -302,7 +302,7 @@ glabel L80054AB4 /* ACBCC0 80054B20 460E9101 */ sub.s $f4, $f18, $f14 /* ACBCC4 80054B24 46002182 */ mul.s $f6, $f4, $f0 /* ACBCC8 80054B28 460E3200 */ add.s $f8, $f6, $f14 -/* ACBCCC 80054B2C 0C01F0FD */ jal func_8007C3F4 +/* ACBCCC 80054B2C 0C01F0FD */ jal OLib_Vec3fToVecSphRot90 /* ACBCD0 80054B30 E7A80064 */ swc1 $f8, 0x64($sp) /* ACBCD4 80054B34 87AE0086 */ lh $t6, 0x86($sp) /* ACBCD8 80054B38 860F0012 */ lh $t7, 0x12($s0) @@ -406,7 +406,7 @@ glabel L80054C40 /* ACBE58 80054CB8 46103200 */ add.s $f8, $f6, $f16 /* ACBE5C 80054CBC 460C2180 */ add.s $f6, $f4, $f12 /* ACBE60 80054CC0 E7A80060 */ swc1 $f8, 0x60($sp) -/* ACBE64 80054CC4 0C01F0FD */ jal func_8007C3F4 +/* ACBE64 80054CC4 0C01F0FD */ jal OLib_Vec3fToVecSphRot90 /* ACBE68 80054CC8 E7A60064 */ swc1 $f6, 0x64($sp) /* ACBE6C 80054CCC 87B80086 */ lh $t8, 0x86($sp) /* ACBE70 80054CD0 860C0012 */ lh $t4, 0x12($s0) @@ -509,7 +509,7 @@ glabel L80054DD8 /* ACBFEC 80054E4C 46109100 */ add.s $f4, $f18, $f16 /* ACBFF0 80054E50 460E5480 */ add.s $f18, $f10, $f14 /* ACBFF4 80054E54 E7A40060 */ swc1 $f4, 0x60($sp) -/* ACBFF8 80054E58 0C01F0FD */ jal func_8007C3F4 +/* ACBFF8 80054E58 0C01F0FD */ jal OLib_Vec3fToVecSphRot90 /* ACBFFC 80054E5C E7B20064 */ swc1 $f18, 0x64($sp) /* ACC000 80054E60 87AB0086 */ lh $t3, 0x86($sp) /* ACC004 80054E64 86190012 */ lh $t9, 0x12($s0) @@ -771,7 +771,7 @@ glabel L8005508C /* ACC3A8 80055208 AD8D0008 */ sw $t5, 8($t4) /* ACC3AC 8005520C 8FA40030 */ lw $a0, 0x30($sp) .L80055210: -/* ACC3B0 80055210 0C01EFE4 */ jal func_8007BF90 +/* ACC3B0 80055210 0C01EFE4 */ jal OLib_Vec3fDist /* ACC3B4 80055214 8FA50034 */ lw $a1, 0x34($sp) /* ACC3B8 80055218 E62000DC */ swc1 $f0, 0xdc($s1) /* ACC3BC 8005521C 3C018014 */ lui $at, %hi(D_8013A354) diff --git a/asm/non_matchings/code/z_camera/Camera_Demo5.s b/asm/non_matchings/code/z_camera/Camera_Demo5.s index f96d4a1a63..4250cc80e2 100644 --- a/asm/non_matchings/code/z_camera/Camera_Demo5.s +++ b/asm/non_matchings/code/z_camera/Camera_Demo5.s @@ -58,7 +58,7 @@ glabel Camera_Demo5 /* ACC4A8 80055308 AFA40020 */ sw $a0, 0x20($sp) /* ACC4AC 8005530C 27A40088 */ addiu $a0, $sp, 0x88 /* ACC4B0 80055310 8FA50020 */ lw $a1, 0x20($sp) -/* ACC4B4 80055314 0C01F124 */ jal func_8007C490 +/* ACC4B4 80055314 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* ACC4B8 80055318 26060094 */ addiu $a2, $s0, 0x94 /* ACC4BC 8005531C 8E1900A8 */ lw $t9, 0xa8($s0) /* ACC4C0 80055320 3C018012 */ lui $at, %hi(D_8011D3AC) # $at, 0x8012 @@ -70,12 +70,12 @@ glabel Camera_Demo5 /* ACC4D8 80055338 0C00BCDD */ jal func_8002F374 /* ACC4DC 8005533C 8E04008C */ lw $a0, 0x8c($s0) /* ACC4E0 80055340 8FA40020 */ lw $a0, 0x20($sp) -/* ACC4E4 80055344 0C01EFE4 */ jal func_8007BF90 +/* ACC4E4 80055344 0C01EFE4 */ jal OLib_Vec3fDist /* ACC4E8 80055348 2605005C */ addiu $a1, $s0, 0x5c /* ACC4EC 8005534C E7A00094 */ swc1 $f0, 0x94($sp) /* ACC4F0 80055350 27A40080 */ addiu $a0, $sp, 0x80 /* ACC4F4 80055354 27A50064 */ addiu $a1, $sp, 0x64 -/* ACC4F8 80055358 0C01F124 */ jal func_8007C490 +/* ACC4F8 80055358 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* ACC4FC 8005535C 26060074 */ addiu $a2, $s0, 0x74 /* ACC500 80055360 87A90086 */ lh $t1, 0x86($sp) /* ACC504 80055364 87AA008E */ lh $t2, 0x8e($sp) diff --git a/asm/non_matchings/code/z_camera/Camera_Fixed1.s b/asm/non_matchings/code/z_camera/Camera_Fixed1.s index ac38580ae0..8f48dda441 100644 --- a/asm/non_matchings/code/z_camera/Camera_Fixed1.s +++ b/asm/non_matchings/code/z_camera/Camera_Fixed1.s @@ -144,7 +144,7 @@ glabel Camera_Fixed1 /* AC6A1C 8004F87C 26060050 */ addiu $a2, $s0, 0x50 /* AC6A20 8004F880 AFA60030 */ sw $a2, 0x30($sp) /* AC6A24 8004F884 AFA50034 */ sw $a1, 0x34($sp) -/* AC6A28 8004F888 0C01F124 */ jal func_8007C490 +/* AC6A28 8004F888 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* AC6A2C 8004F88C 27A40064 */ addiu $a0, $sp, 0x64 /* AC6A30 8004F890 3C018014 */ lui $at, %hi(D_8013A178) /* AC6A34 8004F894 C420A178 */ lwc1 $f0, %lo(D_8013A178)($at) @@ -169,7 +169,7 @@ glabel Camera_Fixed1 /* AC6A80 8004F8E0 AFA2002C */ sw $v0, 0x2c($sp) /* AC6A84 8004F8E4 8FA50034 */ lw $a1, 0x34($sp) /* AC6A88 8004F8E8 46105480 */ add.s $f18, $f10, $f16 -/* AC6A8C 8004F8EC 0C01EFE4 */ jal func_8007BF90 +/* AC6A8C 8004F8EC 0C01EFE4 */ jal OLib_Vec3fDist /* AC6A90 8004F8F0 E7B20058 */ swc1 $f18, 0x58($sp) /* AC6A94 8004F8F4 E60000DC */ swc1 $f0, 0xdc($s0) /* AC6A98 8004F8F8 E7A0006C */ swc1 $f0, 0x6c($sp) diff --git a/asm/non_matchings/code/z_camera/Camera_Fixed2.s b/asm/non_matchings/code/z_camera/Camera_Fixed2.s index 74b5b4a065..abd899673f 100644 --- a/asm/non_matchings/code/z_camera/Camera_Fixed2.s +++ b/asm/non_matchings/code/z_camera/Camera_Fixed2.s @@ -244,7 +244,7 @@ glabel Camera_Fixed2 /* AC6EE8 8004FD48 8DAF0008 */ lw $t7, 8($t5) /* AC6EEC 8004FD4C AD8F0008 */ sw $t7, 8($t4) /* AC6EF0 8004FD50 8FA5003C */ lw $a1, 0x3c($sp) -/* AC6EF4 8004FD54 0C01EFE4 */ jal func_8007BF90 +/* AC6EF4 8004FD54 0C01EFE4 */ jal OLib_Vec3fDist /* AC6EF8 8004FD58 8FA40038 */ lw $a0, 0x38($sp) /* AC6EFC 8004FD5C 44808000 */ mtc1 $zero, $f16 /* AC6F00 8004FD60 E60000DC */ swc1 $f0, 0xdc($s0) diff --git a/asm/non_matchings/code/z_camera/Camera_Fixed3.s b/asm/non_matchings/code/z_camera/Camera_Fixed3.s index b813c67432..0b97e2920e 100644 --- a/asm/non_matchings/code/z_camera/Camera_Fixed3.s +++ b/asm/non_matchings/code/z_camera/Camera_Fixed3.s @@ -19,7 +19,7 @@ glabel Camera_Fixed3 /* AC6FA0 8004FE00 AFA60030 */ sw $a2, 0x30($sp) /* AC6FA4 8004FE04 AFA50034 */ sw $a1, 0x34($sp) /* AC6FA8 8004FE08 27A40048 */ addiu $a0, $sp, 0x48 -/* AC6FAC 8004FE0C 0C01F124 */ jal func_8007C490 +/* AC6FAC 8004FE0C 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* AC6FB0 8004FE10 AFA20050 */ sw $v0, 0x50($sp) /* AC6FB4 8004FE14 8603015E */ lh $v1, 0x15e($s0) /* AC6FB8 8004FE18 8FA70050 */ lw $a3, 0x50($sp) diff --git a/asm/non_matchings/code/z_camera/Camera_Fixed4.s b/asm/non_matchings/code/z_camera/Camera_Fixed4.s index fc62da3653..1380ae5488 100644 --- a/asm/non_matchings/code/z_camera/Camera_Fixed4.s +++ b/asm/non_matchings/code/z_camera/Camera_Fixed4.s @@ -203,11 +203,11 @@ glabel Camera_Fixed4 /* AC74F4 80050354 460C9281 */ sub.s $f10, $f18, $f12 /* AC74F8 80050358 46085102 */ mul.s $f4, $f10, $f8 /* AC74FC 8005035C 46046180 */ add.s $f6, $f12, $f4 -/* AC7500 80050360 0C01F124 */ jal func_8007C490 +/* AC7500 80050360 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* AC7504 80050364 E7A6008C */ swc1 $f6, 0x8c($sp) /* AC7508 80050368 27A40068 */ addiu $a0, $sp, 0x68 /* AC750C 8005036C 02202825 */ move $a1, $s1 -/* AC7510 80050370 0C01F124 */ jal func_8007C490 +/* AC7510 80050370 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* AC7514 80050374 27A60084 */ addiu $a2, $sp, 0x84 /* AC7518 80050378 C7AA0068 */ lwc1 $f10, 0x68($sp) /* AC751C 8005037C C7A80070 */ lwc1 $f8, 0x70($sp) @@ -241,7 +241,7 @@ glabel Camera_Fixed4 /* AC758C 800503EC 0C010F0A */ jal func_80043C28 /* AC7590 800503F0 27A60070 */ addiu $a2, $sp, 0x70 /* AC7594 800503F4 8FA40040 */ lw $a0, 0x40($sp) -/* AC7598 800503F8 0C01EFE4 */ jal func_8007BF90 +/* AC7598 800503F8 0C01EFE4 */ jal OLib_Vec3fDist /* AC759C 800503FC 8FA50044 */ lw $a1, 0x44($sp) /* AC75A0 80050400 C60A000C */ lwc1 $f10, 0xc($s0) /* AC75A4 80050404 E60000DC */ swc1 $f0, 0xdc($s0) diff --git a/asm/non_matchings/code/z_camera/Camera_Jump1.s b/asm/non_matchings/code/z_camera/Camera_Jump1.s index b24b3851f0..6206e8b80b 100644 --- a/asm/non_matchings/code/z_camera/Camera_Jump1.s +++ b/asm/non_matchings/code/z_camera/Camera_Jump1.s @@ -155,12 +155,12 @@ glabel Camera_Jump1 /* AC0D94 80049BF4 2606005C */ addiu $a2, $s0, 0x5c /* AC0D98 80049BF8 AFA60040 */ sw $a2, 0x40($sp) /* AC0D9C 80049BFC AFA5003C */ sw $a1, 0x3c($sp) -/* AC0DA0 80049C00 0C01F124 */ jal func_8007C490 +/* AC0DA0 80049C00 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* AC0DA4 80049C04 27A40090 */ addiu $a0, $sp, 0x90 /* AC0DA8 80049C08 26060074 */ addiu $a2, $s0, 0x74 /* AC0DAC 80049C0C AFA60038 */ sw $a2, 0x38($sp) /* AC0DB0 80049C10 27A40088 */ addiu $a0, $sp, 0x88 -/* AC0DB4 80049C14 0C01F124 */ jal func_8007C490 +/* AC0DB4 80049C14 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* AC0DB8 80049C18 8FA5003C */ lw $a1, 0x3c($sp) /* AC0DBC 80049C1C 860C001C */ lh $t4, 0x1c($s0) /* AC0DC0 80049C20 3C018012 */ lui $at, %hi(D_8011D3A0) # $at, 0x8012 @@ -354,7 +354,7 @@ glabel Camera_Jump1 /* AC10A0 80049F00 8DF80004 */ lw $t8, 4($t7) /* AC10A4 80049F04 ADD80004 */ sw $t8, 4($t6) /* AC10A8 80049F08 8FA60040 */ lw $a2, 0x40($sp) -/* AC10AC 80049F0C 0C01F124 */ jal func_8007C490 +/* AC10AC 80049F0C 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* AC10B0 80049F10 8FA5003C */ lw $a1, 0x3c($sp) /* AC10B4 80049F14 3C198016 */ lui $t9, %hi(gGameInfo) # $t9, 0x8016 /* AC10B8 80049F18 8F39FA90 */ lw $t9, %lo(gGameInfo)($t9) @@ -508,7 +508,7 @@ glabel Camera_Jump1 /* AC12F0 8004A150 10000008 */ b .L8004A174 /* AC12F4 8004A154 A6180136 */ sh $t8, 0x136($s0) .L8004A158: -/* AC12F8 8004A158 0C01F124 */ jal func_8007C490 +/* AC12F8 8004A158 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* AC12FC 8004A15C 8FA6003C */ lw $a2, 0x3c($sp) /* AC1300 8004A160 87A80084 */ lh $t0, 0x84($sp) /* AC1304 8004A164 A6080134 */ sh $t0, 0x134($s0) @@ -555,7 +555,7 @@ glabel Camera_Jump1 .L8004A200: /* AC13A0 8004A200 8FA4003C */ lw $a0, 0x3c($sp) .L8004A204: -/* AC13A4 8004A204 0C01EFE4 */ jal func_8007BF90 +/* AC13A4 8004A204 0C01EFE4 */ jal OLib_Vec3fDist /* AC13A8 8004A208 8FA50040 */ lw $a1, 0x40($sp) /* AC13AC 8004A20C E60000DC */ swc1 $f0, 0xdc($s0) /* AC13B0 8004A210 00002025 */ move $a0, $zero diff --git a/asm/non_matchings/code/z_camera/Camera_Jump2.s b/asm/non_matchings/code/z_camera/Camera_Jump2.s index 291f66ba2a..acb25566e0 100644 --- a/asm/non_matchings/code/z_camera/Camera_Jump2.s +++ b/asm/non_matchings/code/z_camera/Camera_Jump2.s @@ -170,12 +170,12 @@ glabel Camera_Jump2 /* AC15E0 8004A440 2606005C */ addiu $a2, $s0, 0x5c /* AC15E4 8004A444 AFA60038 */ sw $a2, 0x38($sp) /* AC15E8 8004A448 AFA50034 */ sw $a1, 0x34($sp) -/* AC15EC 8004A44C 0C01F124 */ jal func_8007C490 +/* AC15EC 8004A44C 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* AC15F0 8004A450 27A4009C */ addiu $a0, $sp, 0x9c /* AC15F4 8004A454 26060074 */ addiu $a2, $s0, 0x74 /* AC15F8 8004A458 AFA60030 */ sw $a2, 0x30($sp) /* AC15FC 8004A45C 27A400A4 */ addiu $a0, $sp, 0xa4 -/* AC1600 8004A460 0C01F124 */ jal func_8007C490 +/* AC1600 8004A460 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* AC1604 8004A464 8FA50034 */ lw $a1, 0x34($sp) /* AC1608 8004A468 860C0020 */ lh $t4, 0x20($s0) /* AC160C 8004A46C 3C018012 */ lui $at, %hi(D_8011D3A0) # $at, 0x8012 @@ -390,7 +390,7 @@ glabel Camera_Jump2 /* AC1930 8004A790 E61200C0 */ swc1 $f18, 0xc0($s0) /* AC1934 8004A794 27A400B4 */ addiu $a0, $sp, 0xb4 /* AC1938 8004A798 8FA50034 */ lw $a1, 0x34($sp) -/* AC193C 8004A79C 0C01F124 */ jal func_8007C490 +/* AC193C 8004A79C 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* AC1940 8004A7A0 8FA60038 */ lw $a2, 0x38($sp) /* AC1944 8004A7A4 C60C0008 */ lwc1 $f12, 8($s0) /* AC1948 8004A7A8 C60E000C */ lwc1 $f14, 0xc($s0) diff --git a/asm/non_matchings/code/z_camera/Camera_Jump3.s b/asm/non_matchings/code/z_camera/Camera_Jump3.s index 04b093c987..bb7a27aca0 100644 --- a/asm/non_matchings/code/z_camera/Camera_Jump3.s +++ b/asm/non_matchings/code/z_camera/Camera_Jump3.s @@ -87,12 +87,12 @@ glabel Camera_Jump3 .L8004ADB4: /* AC1F54 8004ADB4 AFA5003C */ sw $a1, 0x3c($sp) /* AC1F58 8004ADB8 AFA60040 */ sw $a2, 0x40($sp) -/* AC1F5C 8004ADBC 0C01F124 */ jal func_8007C490 +/* AC1F5C 8004ADBC 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* AC1F60 8004ADC0 AFA70054 */ sw $a3, 0x54($sp) /* AC1F64 8004ADC4 26060074 */ addiu $a2, $s0, 0x74 /* AC1F68 8004ADC8 AFA60038 */ sw $a2, 0x38($sp) /* AC1F6C 8004ADCC 27A40090 */ addiu $a0, $sp, 0x90 -/* AC1F70 8004ADD0 0C01F124 */ jal func_8007C490 +/* AC1F70 8004ADD0 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* AC1F74 8004ADD4 8FA5003C */ lw $a1, 0x3c($sp) /* AC1F78 8004ADD8 8603015E */ lh $v1, 0x15e($s0) /* AC1F7C 8004ADDC 8FA70054 */ lw $a3, 0x54($sp) @@ -391,7 +391,7 @@ glabel Camera_Jump3 /* AC23E4 8004B244 86070022 */ lh $a3, 0x22($s0) /* AC23E8 8004B248 27A400A8 */ addiu $a0, $sp, 0xa8 /* AC23EC 8004B24C 8FA5003C */ lw $a1, 0x3c($sp) -/* AC23F0 8004B250 0C01F124 */ jal func_8007C490 +/* AC23F0 8004B250 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* AC23F4 8004B254 8FA60038 */ lw $a2, 0x38($sp) /* AC23F8 8004B258 86280020 */ lh $t0, 0x20($s1) /* AC23FC 8004B25C 8E060004 */ lw $a2, 4($s0) @@ -532,7 +532,7 @@ glabel Camera_Jump3 /* AC25F4 8004B454 10000008 */ b .L8004B478 /* AC25F8 8004B458 A60A0136 */ sh $t2, 0x136($s0) .L8004B45C: -/* AC25FC 8004B45C 0C01F124 */ jal func_8007C490 +/* AC25FC 8004B45C 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* AC2600 8004B460 8FA6003C */ lw $a2, 0x3c($sp) /* AC2604 8004B464 87AB00AC */ lh $t3, 0xac($sp) /* AC2608 8004B468 A60B0134 */ sh $t3, 0x134($s0) diff --git a/asm/non_matchings/code/z_camera/Camera_KeepOn0.s b/asm/non_matchings/code/z_camera/Camera_KeepOn0.s index 7cbf4b2b06..ff5e8077b4 100644 --- a/asm/non_matchings/code/z_camera/Camera_KeepOn0.s +++ b/asm/non_matchings/code/z_camera/Camera_KeepOn0.s @@ -128,11 +128,11 @@ glabel Camera_KeepOn0 /* AC66E0 8004F540 26060050 */ addiu $a2, $s0, 0x50 /* AC66E4 8004F544 AFA6002C */ sw $a2, 0x2c($sp) /* AC66E8 8004F548 27A40054 */ addiu $a0, $sp, 0x54 -/* AC66EC 8004F54C 0C01F124 */ jal func_8007C490 +/* AC66EC 8004F54C 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* AC66F0 8004F550 8FA50030 */ lw $a1, 0x30($sp) /* AC66F4 8004F554 27A4005C */ addiu $a0, $sp, 0x5c /* AC66F8 8004F558 8FA50030 */ lw $a1, 0x30($sp) -/* AC66FC 8004F55C 0C01F124 */ jal func_8007C490 +/* AC66FC 8004F55C 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* AC6700 8004F560 8FA60028 */ lw $a2, 0x28($sp) /* AC6704 8004F564 8618000A */ lh $t8, 0xa($s0) /* AC6708 8004F568 3C018012 */ lui $at, %hi(D_8011D3A0) diff --git a/asm/non_matchings/code/z_camera/Camera_KeepOn1.s b/asm/non_matchings/code/z_camera/Camera_KeepOn1.s index b4c62bdda6..30fe86d326 100644 --- a/asm/non_matchings/code/z_camera/Camera_KeepOn1.s +++ b/asm/non_matchings/code/z_camera/Camera_KeepOn1.s @@ -219,12 +219,12 @@ glabel Camera_KeepOn1 /* AC3E50 8004CCB0 AFA60048 */ sw $a2, 0x48($sp) /* AC3E54 8004CCB4 AFA50044 */ sw $a1, 0x44($sp) /* AC3E58 8004CCB8 27A400C0 */ addiu $a0, $sp, 0xc0 -/* AC3E5C 8004CCBC 0C01F124 */ jal func_8007C490 +/* AC3E5C 8004CCBC 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* AC3E60 8004CCC0 E7A80070 */ swc1 $f8, 0x70($sp) /* AC3E64 8004CCC4 26060074 */ addiu $a2, $s0, 0x74 /* AC3E68 8004CCC8 AFA60040 */ sw $a2, 0x40($sp) /* AC3E6C 8004CCCC 27A400B8 */ addiu $a0, $sp, 0xb8 -/* AC3E70 8004CCD0 0C01F124 */ jal func_8007C490 +/* AC3E70 8004CCD0 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* AC3E74 8004CCD4 8FA50044 */ lw $a1, 0x44($sp) /* AC3E78 8004CCD8 860E0030 */ lh $t6, 0x30($s0) /* AC3E7C 8004CCDC 3C018012 */ lui $at, %hi(D_8011D3A0) @@ -490,7 +490,7 @@ glabel Camera_KeepOn1 /* AC4254 8004D0B4 C7A60070 */ lwc1 $f6, 0x70($sp) /* AC4258 8004D0B8 8FA60030 */ lw $a2, 0x30($sp) /* AC425C 8004D0BC 46062280 */ add.s $f10, $f4, $f6 -/* AC4260 8004D0C0 0C01F124 */ jal func_8007C490 +/* AC4260 8004D0C0 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* AC4264 8004D0C4 E7AA0118 */ swc1 $f10, 0x118($sp) /* AC4268 8004D0C8 C7A000C8 */ lwc1 $f0, 0xc8($sp) /* AC426C 8004D0CC C7A80104 */ lwc1 $f8, 0x104($sp) @@ -511,7 +511,7 @@ glabel Camera_KeepOn1 .L8004D100: /* AC42A0 8004D100 27A400D8 */ addiu $a0, $sp, 0xd8 /* AC42A4 8004D104 8FA60040 */ lw $a2, 0x40($sp) -/* AC42A8 8004D108 0C01F124 */ jal func_8007C490 +/* AC42A8 8004D108 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* AC42AC 8004D10C AFA90038 */ sw $t1, 0x38($sp) /* AC42B0 8004D110 C6000004 */ lwc1 $f0, 4($s0) /* AC42B4 8004D114 C7A800D8 */ lwc1 $f8, 0xd8($sp) @@ -589,7 +589,7 @@ glabel Camera_KeepOn1 /* AC43C8 8004D228 ACD80004 */ sw $t8, 4($a2) /* AC43CC 8004D22C 8DF90008 */ lw $t9, 8($t7) /* AC43D0 8004D230 ACD90008 */ sw $t9, 8($a2) -/* AC43D4 8004D234 0C01F124 */ jal func_8007C490 +/* AC43D4 8004D234 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* AC43D8 8004D238 8FA50044 */ lw $a1, 0x44($sp) /* AC43DC 8004D23C C7A000D0 */ lwc1 $f0, 0xd0($sp) /* AC43E0 8004D240 C7AC00E8 */ lwc1 $f12, 0xe8($sp) @@ -663,7 +663,7 @@ glabel Camera_KeepOn1 /* AC44EC 8004D34C 8FA50044 */ lw $a1, 0x44($sp) /* AC44F0 8004D350 8FA60048 */ lw $a2, 0x48($sp) /* AC44F4 8004D354 AFA90038 */ sw $t1, 0x38($sp) -/* AC44F8 8004D358 0C01F124 */ jal func_8007C490 +/* AC44F8 8004D358 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* AC44FC 8004D35C A7AA00E2 */ sh $t2, 0xe2($sp) /* AC4500 8004D360 87AC00E2 */ lh $t4, 0xe2($sp) /* AC4504 8004D364 3C038016 */ lui $v1, %hi(gGameInfo) @@ -1015,7 +1015,7 @@ glabel Camera_KeepOn1 /* AC4A34 8004D894 10000010 */ b .L8004D8D8 /* AC4A38 8004D898 27AF008C */ addiu $t7, $sp, 0x8c .L8004D89C: -/* AC4A3C 8004D89C 0C01F03E */ jal func_8007C0F8 +/* AC4A3C 8004D89C 0C01F03E */ jal OLib_Vec3fDistNormalize /* AC4A40 8004D8A0 8FA50044 */ lw $a1, 0x44($sp) /* AC4A44 8004D8A4 C7A6008C */ lwc1 $f6, 0x8c($sp) /* AC4A48 8004D8A8 C7A40120 */ lwc1 $f4, 0x120($sp) @@ -1050,7 +1050,7 @@ glabel Camera_KeepOn1 .L8004D914: /* AC4AB4 8004D914 27A40120 */ addiu $a0, $sp, 0x120 /* AC4AB8 8004D918 8FA50048 */ lw $a1, 0x48($sp) -/* AC4ABC 8004D91C 0C01F03E */ jal func_8007C0F8 +/* AC4ABC 8004D91C 0C01F03E */ jal OLib_Vec3fDistNormalize /* AC4AC0 8004D920 8FA60044 */ lw $a2, 0x44($sp) /* AC4AC4 8004D924 3C0F8016 */ lui $t7, %hi(gGameInfo) # $t7, 0x8016 /* AC4AC8 8004D928 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) diff --git a/asm/non_matchings/code/z_camera/Camera_KeepOn3.s b/asm/non_matchings/code/z_camera/Camera_KeepOn3.s index e6687922cb..14804c9ce0 100644 --- a/asm/non_matchings/code/z_camera/Camera_KeepOn3.s +++ b/asm/non_matchings/code/z_camera/Camera_KeepOn3.s @@ -194,12 +194,12 @@ glabel Camera_KeepOn3 /* AC4E00 8004DC60 AFA60048 */ sw $a2, 0x48($sp) /* AC4E04 8004DC64 02002825 */ move $a1, $s0 /* AC4E08 8004DC68 27A40094 */ addiu $a0, $sp, 0x94 -/* AC4E0C 8004DC6C 0C01F124 */ jal func_8007C490 +/* AC4E0C 8004DC6C 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* AC4E10 8004DC70 E7A80058 */ swc1 $f8, 0x58($sp) /* AC4E14 8004DC74 26720074 */ addiu $s2, $s3, 0x74 /* AC4E18 8004DC78 02403025 */ move $a2, $s2 /* AC4E1C 8004DC7C 27A4008C */ addiu $a0, $sp, 0x8c -/* AC4E20 8004DC80 0C01F124 */ jal func_8007C490 +/* AC4E20 8004DC80 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* AC4E24 8004DC84 02002825 */ move $a1, $s0 /* AC4E28 8004DC88 267100AC */ addiu $s1, $s3, 0xac /* AC4E2C 8004DC8C 02202025 */ move $a0, $s1 @@ -222,7 +222,7 @@ glabel Camera_KeepOn3 /* AC4E70 8004DCD0 C7A60058 */ lwc1 $f6, 0x58($sp) /* AC4E74 8004DCD4 AFA8003C */ sw $t0, 0x3c($sp) /* AC4E78 8004DCD8 46062280 */ add.s $f10, $f4, $f6 -/* AC4E7C 8004DCDC 0C01F124 */ jal func_8007C490 +/* AC4E7C 8004DCDC 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* AC4E80 8004DCE0 E7AA00D4 */ swc1 $f10, 0xd4($sp) /* AC4E84 8004DCE4 866C002A */ lh $t4, 0x2a($s3) /* AC4E88 8004DCE8 3C018012 */ lui $at, %hi(D_8011D3A0) # $at, 0x8012 diff --git a/asm/non_matchings/code/z_camera/Camera_KeepOn4.s b/asm/non_matchings/code/z_camera/Camera_KeepOn4.s index 517bbf39a0..c8cf920725 100644 --- a/asm/non_matchings/code/z_camera/Camera_KeepOn4.s +++ b/asm/non_matchings/code/z_camera/Camera_KeepOn4.s @@ -578,12 +578,12 @@ glabel L8004EB20 /* AC5D00 8004EB60 AFA50040 */ sw $a1, 0x40($sp) /* AC5D04 8004EB64 E7AE0088 */ swc1 $f14, 0x88($sp) /* AC5D08 8004EB68 27A400B0 */ addiu $a0, $sp, 0xb0 -/* AC5D0C 8004EB6C 0C01F124 */ jal func_8007C490 +/* AC5D0C 8004EB6C 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* AC5D10 8004EB70 AC2AD3A0 */ sw $t2, %lo(D_8011D3A0)($at) /* AC5D14 8004EB74 26260074 */ addiu $a2, $s1, 0x74 /* AC5D18 8004EB78 AFA6003C */ sw $a2, 0x3c($sp) /* AC5D1C 8004EB7C 27A400A8 */ addiu $a0, $sp, 0xa8 -/* AC5D20 8004EB80 0C01F124 */ jal func_8007C490 +/* AC5D20 8004EB80 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* AC5D24 8004EB84 8FA50040 */ lw $a1, 0x40($sp) /* AC5D28 8004EB88 26230094 */ addiu $v1, $s1, 0x94 /* AC5D2C 8004EB8C 8C6C0000 */ lw $t4, ($v1) diff --git a/asm/non_matchings/code/z_camera/Camera_Normal1.s b/asm/non_matchings/code/z_camera/Camera_Normal1.s index ce4141b370..9ebd4afa5d 100644 --- a/asm/non_matchings/code/z_camera/Camera_Normal1.s +++ b/asm/non_matchings/code/z_camera/Camera_Normal1.s @@ -163,12 +163,12 @@ glabel Camera_Normal1 /* ABE718 80047578 AFA60040 */ sw $a2, 0x40($sp) /* ABE71C 8004757C AFA5003C */ sw $a1, 0x3c($sp) /* ABE720 80047580 27A40074 */ addiu $a0, $sp, 0x74 -/* ABE724 80047584 0C01F124 */ jal func_8007C490 +/* ABE724 80047584 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* ABE728 80047588 AC38D3A0 */ sw $t8, %lo(D_8011D3A0)($at) /* ABE72C 8004758C 26060074 */ addiu $a2, $s0, 0x74 /* ABE730 80047590 AFA60038 */ sw $a2, 0x38($sp) /* ABE734 80047594 27A4006C */ addiu $a0, $sp, 0x6c -/* ABE738 80047598 0C01F124 */ jal func_8007C490 +/* ABE738 80047598 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* ABE73C 8004759C 8FA5003C */ lw $a1, 0x3c($sp) /* ABE740 800475A0 8603015E */ lh $v1, 0x15e($s0) /* ABE744 800475A4 2401000A */ li $at, 10 @@ -572,7 +572,7 @@ glabel Camera_Normal1 /* ABED20 80047B80 27A4007C */ addiu $a0, $sp, 0x7c .L80047B84: /* ABED24 80047B84 8FA5003C */ lw $a1, 0x3c($sp) -/* ABED28 80047B88 0C01F124 */ jal func_8007C490 +/* ABED28 80047B88 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* ABED2C 80047B8C 8FA60038 */ lw $a2, 0x38($sp) /* ABED30 80047B90 862B0028 */ lh $t3, 0x28($s1) /* ABED34 80047B94 8E060004 */ lw $a2, 4($s0) @@ -753,7 +753,7 @@ glabel Camera_Normal1 /* ABEFC8 80047E28 10000008 */ b .L80047E4C /* ABEFCC 80047E2C A60E0136 */ sh $t6, 0x136($s0) .L80047E30: -/* ABEFD0 80047E30 0C01F124 */ jal func_8007C490 +/* ABEFD0 80047E30 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* ABEFD4 80047E34 8FA6003C */ lw $a2, 0x3c($sp) /* ABEFD8 80047E38 87AF0080 */ lh $t7, 0x80($sp) /* ABEFDC 80047E3C A60F0134 */ sh $t7, 0x134($s0) diff --git a/asm/non_matchings/code/z_camera/Camera_Normal2.s b/asm/non_matchings/code/z_camera/Camera_Normal2.s index 2f0eaba1db..6fe810b626 100644 --- a/asm/non_matchings/code/z_camera/Camera_Normal2.s +++ b/asm/non_matchings/code/z_camera/Camera_Normal2.s @@ -237,7 +237,7 @@ glabel Camera_Normal2 /* ABF40C 8004826C 2624000C */ addiu $a0, $s1, 0xc /* ABF410 80048270 E7A60088 */ swc1 $f6, 0x88($sp) /* ABF414 80048274 25AE3FFF */ addiu $t6, $t5, 0x3fff -/* ABF418 80048278 0C01F097 */ jal func_8007C25C +/* ABF418 80048278 0C01F097 */ jal OLib_VecSphRot90ToVec3f /* ABF41C 8004827C A7AE008E */ sh $t6, 0x8e($sp) /* ABF420 80048280 3C014248 */ li $at, 0x42480000 # 0.000000 .L80048284: @@ -261,12 +261,12 @@ glabel Camera_Normal2 /* ABF460 800482C0 2606005C */ addiu $a2, $s0, 0x5c /* ABF464 800482C4 AFA60048 */ sw $a2, 0x48($sp) /* ABF468 800482C8 AFA50044 */ sw $a1, 0x44($sp) -/* ABF46C 800482CC 0C01F124 */ jal func_8007C490 +/* ABF46C 800482CC 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* ABF470 800482D0 27A40080 */ addiu $a0, $sp, 0x80 /* ABF474 800482D4 26060074 */ addiu $a2, $s0, 0x74 /* ABF478 800482D8 AFA60040 */ sw $a2, 0x40($sp) /* ABF47C 800482DC 27A40078 */ addiu $a0, $sp, 0x78 -/* ABF480 800482E0 0C01F124 */ jal func_8007C490 +/* ABF480 800482E0 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* ABF484 800482E4 8FA50044 */ lw $a1, 0x44($sp) /* ABF488 800482E8 3C018014 */ lui $at, %hi(D_80139EDC) /* ABF48C 800482EC C4309EDC */ lwc1 $f16, %lo(D_80139EDC)($at) @@ -404,11 +404,11 @@ glabel Camera_Normal2 /* ABF690 800484F0 02202825 */ move $a1, $s1 /* ABF694 800484F4 C4440004 */ lwc1 $f4, 4($v0) /* ABF698 800484F8 E6240004 */ swc1 $f4, 4($s1) -/* ABF69C 800484FC 0C01F124 */ jal func_8007C490 +/* ABF69C 800484FC 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* ABF6A0 80048500 8FA60044 */ lw $a2, 0x44($sp) /* ABF6A4 80048504 27A40090 */ addiu $a0, $sp, 0x90 /* ABF6A8 80048508 8FA50044 */ lw $a1, 0x44($sp) -/* ABF6AC 8004850C 0C01F124 */ jal func_8007C490 +/* ABF6AC 8004850C 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* ABF6B0 80048510 8FA60040 */ lw $a2, 0x40($sp) /* ABF6B4 80048514 862C0028 */ lh $t4, 0x28($s1) /* ABF6B8 80048518 318D0002 */ andi $t5, $t4, 2 @@ -584,7 +584,7 @@ glabel Camera_Normal2 /* ABF924 80048784 ACA90004 */ sw $t1, 4($a1) /* ABF928 80048788 8D4B0008 */ lw $t3, 8($t2) /* ABF92C 8004878C ACAB0008 */ sw $t3, 8($a1) -/* ABF930 80048790 0C01F124 */ jal func_8007C490 +/* ABF930 80048790 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* ABF934 80048794 8FA60044 */ lw $a2, 0x44($sp) /* ABF938 80048798 87AC009C */ lh $t4, 0x9c($sp) /* ABF93C 8004879C A60C0134 */ sh $t4, 0x134($s0) diff --git a/asm/non_matchings/code/z_camera/Camera_Normal3.s b/asm/non_matchings/code/z_camera/Camera_Normal3.s index 8ab735c7a1..b1007c5566 100644 --- a/asm/non_matchings/code/z_camera/Camera_Normal3.s +++ b/asm/non_matchings/code/z_camera/Camera_Normal3.s @@ -128,12 +128,12 @@ glabel Camera_Normal3 /* ABFB1C 8004897C 2606005C */ addiu $a2, $s0, 0x5c /* ABFB20 80048980 AFA60048 */ sw $a2, 0x48($sp) /* ABFB24 80048984 AFA50044 */ sw $a1, 0x44($sp) -/* ABFB28 80048988 0C01F124 */ jal func_8007C490 +/* ABFB28 80048988 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* ABFB2C 8004898C 27A4007C */ addiu $a0, $sp, 0x7c /* ABFB30 80048990 26060074 */ addiu $a2, $s0, 0x74 /* ABFB34 80048994 AFA60040 */ sw $a2, 0x40($sp) /* ABFB38 80048998 27A40074 */ addiu $a0, $sp, 0x74 -/* ABFB3C 8004899C 0C01F124 */ jal func_8007C490 +/* ABFB3C 8004899C 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* ABFB40 800489A0 8FA50044 */ lw $a1, 0x44($sp) /* ABFB44 800489A4 24040001 */ li $a0, 1 /* ABFB48 800489A8 3C018012 */ lui $at, %hi(D_8011D3E8) # $at, 0x8012 @@ -369,7 +369,7 @@ glabel Camera_Normal3 /* ABFECC 80048D2C 8FA50044 */ lw $a1, 0x44($sp) /* ABFED0 80048D30 8FA60040 */ lw $a2, 0x40($sp) /* ABFED4 80048D34 46065202 */ mul.s $f8, $f10, $f6 -/* ABFED8 80048D38 0C01F124 */ jal func_8007C490 +/* ABFED8 80048D38 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* ABFEDC 80048D3C E7A80090 */ swc1 $f8, 0x90($sp) /* ABFEE0 80048D40 862B002A */ lh $t3, 0x2a($s1) /* ABFEE4 80048D44 8E060004 */ lw $a2, 4($s0) diff --git a/asm/non_matchings/code/z_camera/Camera_Parallel1.s b/asm/non_matchings/code/z_camera/Camera_Parallel1.s index 8170cd566a..35b08000df 100644 --- a/asm/non_matchings/code/z_camera/Camera_Parallel1.s +++ b/asm/non_matchings/code/z_camera/Camera_Parallel1.s @@ -171,12 +171,12 @@ glabel Camera_Parallel1 /* AC03BC 8004921C 2606005C */ addiu $a2, $s0, 0x5c /* AC03C0 80049220 AFA60040 */ sw $a2, 0x40($sp) /* AC03C4 80049224 AFA5003C */ sw $a1, 0x3c($sp) -/* AC03C8 80049228 0C01F124 */ jal func_8007C490 +/* AC03C8 80049228 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* AC03CC 8004922C 27A400A0 */ addiu $a0, $sp, 0xa0 /* AC03D0 80049230 26060074 */ addiu $a2, $s0, 0x74 /* AC03D4 80049234 AFA60038 */ sw $a2, 0x38($sp) /* AC03D8 80049238 27A40098 */ addiu $a0, $sp, 0x98 -/* AC03DC 8004923C 0C01F124 */ jal func_8007C490 +/* AC03DC 8004923C 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* AC03E0 80049240 8FA5003C */ lw $a1, 0x3c($sp) /* AC03E4 80049244 8603015E */ lh $v1, 0x15e($s0) /* AC03E8 80049248 10600009 */ beqz $v1, .L80049270 @@ -517,7 +517,7 @@ glabel Camera_Parallel1 /* AC08D4 80049734 E60000DC */ swc1 $f0, 0xdc($s0) /* AC08D8 80049738 8FA60038 */ lw $a2, 0x38($sp) /* AC08DC 8004973C 8FA5003C */ lw $a1, 0x3c($sp) -/* AC08E0 80049740 0C01F124 */ jal func_8007C490 +/* AC08E0 80049740 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* AC08E4 80049744 27A400A8 */ addiu $a0, $sp, 0xa8 /* AC08E8 80049748 C60400DC */ lwc1 $f4, 0xdc($s0) /* AC08EC 8004974C 3C063F4C */ lui $a2, (0x3F4CCCCD >> 16) # lui $a2, 0x3f4c @@ -636,7 +636,7 @@ glabel Camera_Parallel1 /* AC0A90 800498F0 ACAB0004 */ sw $t3, 4($a1) /* AC0A94 800498F4 8D580008 */ lw $t8, 8($t2) /* AC0A98 800498F8 ACB80008 */ sw $t8, 8($a1) -/* AC0A9C 800498FC 0C01F124 */ jal func_8007C490 +/* AC0A9C 800498FC 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* AC0AA0 80049900 8FA6003C */ lw $a2, 0x3c($sp) /* AC0AA4 80049904 87AC00AC */ lh $t4, 0xac($sp) /* AC0AA8 80049908 A60C0134 */ sh $t4, 0x134($s0) diff --git a/asm/non_matchings/code/z_camera/Camera_Special5.s b/asm/non_matchings/code/z_camera/Camera_Special5.s index f47de2092a..687d3c294b 100644 --- a/asm/non_matchings/code/z_camera/Camera_Special5.s +++ b/asm/non_matchings/code/z_camera/Camera_Special5.s @@ -129,12 +129,12 @@ glabel Camera_Special5 /* ACDB2C 8005698C 2606005C */ addiu $a2, $s0, 0x5c /* ACDB30 80056990 AFA60038 */ sw $a2, 0x38($sp) /* ACDB34 80056994 AFA50034 */ sw $a1, 0x34($sp) -/* ACDB38 80056998 0C01F124 */ jal func_8007C490 +/* ACDB38 80056998 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* ACDB3C 8005699C 27A40064 */ addiu $a0, $sp, 0x64 /* ACDB40 800569A0 26060074 */ addiu $a2, $s0, 0x74 /* ACDB44 800569A4 AFA60030 */ sw $a2, 0x30($sp) /* ACDB48 800569A8 27A4005C */ addiu $a0, $sp, 0x5c -/* ACDB4C 800569AC 0C01F124 */ jal func_8007C490 +/* ACDB4C 800569AC 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* ACDB50 800569B0 8FA50034 */ lw $a1, 0x34($sp) /* ACDB54 800569B4 27A400A8 */ addiu $a0, $sp, 0xa8 /* ACDB58 800569B8 0C00BBC5 */ jal func_8002EF14 @@ -173,7 +173,7 @@ glabel Camera_Special5 /* ACDBD0 80056A30 24020001 */ li $v0, 1 .L80056A34: /* ACDBD4 80056A34 A4C90000 */ sh $t1, ($a2) -/* ACDBD8 80056A38 0C01EFE4 */ jal func_8007BF90 +/* ACDBD8 80056A38 0C01EFE4 */ jal OLib_Vec3fDist /* ACDBDC 80056A3C AFA5002C */ sw $a1, 0x2c($sp) /* ACDBE0 80056A40 C6060008 */ lwc1 $f6, 8($s0) /* ACDBE4 80056A44 8FA2002C */ lw $v0, 0x2c($sp) @@ -197,7 +197,7 @@ glabel Camera_Special5 /* ACDC2C 80056A8C 0C010F46 */ jal func_80043D18 /* ACDC30 80056A90 27A6007C */ addiu $a2, $sp, 0x7c /* ACDC34 80056A94 27A4006C */ addiu $a0, $sp, 0x6c -/* ACDC38 80056A98 0C01F0FD */ jal func_8007C3F4 +/* ACDC38 80056A98 0C01F0FD */ jal OLib_Vec3fToVecSphRot90 /* ACDC3C 80056A9C 27A50088 */ addiu $a1, $sp, 0x88 /* ACDC40 80056AA0 8FAD002C */ lw $t5, 0x2c($sp) /* ACDC44 80056AA4 87AF0072 */ lh $t7, 0x72($sp) diff --git a/asm/non_matchings/code/z_camera/Camera_Special6.s b/asm/non_matchings/code/z_camera/Camera_Special6.s index 49ff5afbba..190d5dafb7 100644 --- a/asm/non_matchings/code/z_camera/Camera_Special6.s +++ b/asm/non_matchings/code/z_camera/Camera_Special6.s @@ -54,7 +54,7 @@ glabel Camera_Special6 /* ACE1A0 80057000 26120050 */ addiu $s2, $s0, 0x50 /* ACE1A4 80057004 02403025 */ move $a2, $s2 /* ACE1A8 80057008 02202825 */ move $a1, $s1 -/* ACE1AC 8005700C 0C01F124 */ jal func_8007C490 +/* ACE1AC 8005700C 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* ACE1B0 80057010 27A40074 */ addiu $a0, $sp, 0x74 /* ACE1B4 80057014 0C0111DB */ jal func_8004476C /* ACE1B8 80057018 02002025 */ move $a0, $s0 diff --git a/asm/non_matchings/code/z_camera/Camera_Special7.s b/asm/non_matchings/code/z_camera/Camera_Special7.s index c2ebddb65f..de74aa0fcd 100644 --- a/asm/non_matchings/code/z_camera/Camera_Special7.s +++ b/asm/non_matchings/code/z_camera/Camera_Special7.s @@ -212,7 +212,7 @@ glabel Camera_Special7 /* ACE0A4 80056F04 ACAB0008 */ sw $t3, 8($a1) /* ACE0A8 80056F08 E60600FC */ swc1 $f6, 0xfc($s0) .L80056F0C: -/* ACE0AC 80056F0C 0C01EFE4 */ jal func_8007BF90 +/* ACE0AC 80056F0C 0C01EFE4 */ jal OLib_Vec3fDist /* ACE0B0 80056F10 02402025 */ move $a0, $s2 /* ACE0B4 80056F14 44804000 */ mtc1 $zero, $f8 /* ACE0B8 80056F18 E60000DC */ swc1 $f0, 0xdc($s0) diff --git a/asm/non_matchings/code/z_camera/Camera_Special9.s b/asm/non_matchings/code/z_camera/Camera_Special9.s index 30f3f0201b..0c70b2f600 100644 --- a/asm/non_matchings/code/z_camera/Camera_Special9.s +++ b/asm/non_matchings/code/z_camera/Camera_Special9.s @@ -136,7 +136,7 @@ glabel Camera_Special9 /* ACE794 800575F4 2606005C */ addiu $a2, $s0, 0x5c /* ACE798 800575F8 AFA60048 */ sw $a2, 0x48($sp) /* ACE79C 800575FC AFA50044 */ sw $a1, 0x44($sp) -/* ACE7A0 80057600 0C01F124 */ jal func_8007C490 +/* ACE7A0 80057600 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* ACE7A4 80057604 27A4009C */ addiu $a0, $sp, 0x9c /* ACE7A8 80057608 8FAA0038 */ lw $t2, 0x38($sp) /* ACE7AC 8005760C 3C018012 */ lui $at, %hi(D_8011D3A0) # $at, 0x8012 @@ -485,7 +485,7 @@ glabel L80057A38 /* ACECD4 80057B34 C7B00098 */ lwc1 $f16, 0x98($sp) /* ACECD8 80057B38 8FA50048 */ lw $a1, 0x48($sp) /* ACECDC 80057B3C 46104480 */ add.s $f18, $f8, $f16 -/* ACECE0 80057B40 0C01EFE4 */ jal func_8007BF90 +/* ACECE0 80057B40 0C01EFE4 */ jal OLib_Vec3fDist /* ACECE4 80057B44 E7B200B0 */ swc1 $f18, 0xb0($sp) /* ACECE8 80057B48 8FA3003C */ lw $v1, 0x3c($sp) /* ACECEC 80057B4C E60000DC */ swc1 $f0, 0xdc($s0) diff --git a/asm/non_matchings/code/z_camera/Camera_Subj3.s b/asm/non_matchings/code/z_camera/Camera_Subj3.s index 6edc5ea703..1f47a59b1f 100644 --- a/asm/non_matchings/code/z_camera/Camera_Subj3.s +++ b/asm/non_matchings/code/z_camera/Camera_Subj3.s @@ -129,7 +129,7 @@ glabel Camera_Subj3 /* AC77F0 80050650 2606005C */ addiu $a2, $s0, 0x5c /* AC77F4 80050654 AFA60038 */ sw $a2, 0x38($sp) /* AC77F8 80050658 02202825 */ move $a1, $s1 -/* AC77FC 8005065C 0C01F124 */ jal func_8007C490 +/* AC77FC 8005065C 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* AC7800 80050660 27A4007C */ addiu $a0, $sp, 0x7c /* AC7804 80050664 860D0020 */ lh $t5, 0x20($s0) /* AC7808 80050668 3C018012 */ lui $at, %hi(D_8011D3A0) # $at, 0x8012 diff --git a/asm/non_matchings/code/z_camera/Camera_Subj4.s b/asm/non_matchings/code/z_camera/Camera_Subj4.s index fd37ed5cad..6f2cb22e3a 100644 --- a/asm/non_matchings/code/z_camera/Camera_Subj4.s +++ b/asm/non_matchings/code/z_camera/Camera_Subj4.s @@ -64,7 +64,7 @@ glabel Camera_Subj4 /* AC7D94 80050BF4 2633005C */ addiu $s3, $s1, 0x5c /* AC7D98 80050BF8 02603025 */ move $a2, $s3 /* AC7D9C 80050BFC 02402825 */ move $a1, $s2 -/* AC7DA0 80050C00 0C01F124 */ jal func_8007C490 +/* AC7DA0 80050C00 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* AC7DA4 80050C04 27A4005C */ addiu $a0, $sp, 0x5c /* AC7DA8 80050C08 86380000 */ lh $t8, ($s1) /* AC7DAC 80050C0C 3C018012 */ lui $at, %hi(D_8011D3A0) @@ -100,11 +100,11 @@ glabel Camera_Subj4 /* AC7E24 80050C84 26240094 */ addiu $a0, $s1, 0x94 /* AC7E28 80050C88 A7A2006A */ sh $v0, 0x6a($sp) /* AC7E2C 80050C8C AFA40034 */ sw $a0, 0x34($sp) -/* AC7E30 80050C90 0C01EFE4 */ jal func_8007BF90 +/* AC7E30 80050C90 0C01EFE4 */ jal OLib_Vec3fDist /* AC7E34 80050C94 02002825 */ move $a1, $s0 /* AC7E38 80050C98 8FA40034 */ lw $a0, 0x34($sp) /* AC7E3C 80050C9C 27A50098 */ addiu $a1, $sp, 0x98 -/* AC7E40 80050CA0 0C01EFE4 */ jal func_8007BF90 +/* AC7E40 80050CA0 0C01EFE4 */ jal OLib_Vec3fDist /* AC7E44 80050CA4 E7A00088 */ swc1 $f0, 0x88($sp) /* AC7E48 80050CA8 C7A20088 */ lwc1 $f2, 0x88($sp) /* AC7E4C 80050CAC C7AA0098 */ lwc1 $f10, 0x98($sp) diff --git a/asm/non_matchings/code/z_camera/Camera_Unique0.s b/asm/non_matchings/code/z_camera/Camera_Unique0.s index 8e49b02900..df002da27d 100644 --- a/asm/non_matchings/code/z_camera/Camera_Unique0.s +++ b/asm/non_matchings/code/z_camera/Camera_Unique0.s @@ -145,7 +145,7 @@ glabel Camera_Unique0 /* AC9804 80052664 01495821 */ addu $t3, $t2, $t1 /* AC9808 80052668 A4EB000C */ sh $t3, 0xc($a3) .L8005266C: -/* AC980C 8005266C 0C01EFE4 */ jal func_8007BF90 +/* AC980C 8005266C 0C01EFE4 */ jal OLib_Vec3fDist /* AC9810 80052670 AFA7002C */ sw $a3, 0x2c($sp) /* AC9814 80052674 87AD005C */ lh $t5, 0x5c($sp) /* AC9818 80052678 8FA7002C */ lw $a3, 0x2c($sp) @@ -155,7 +155,7 @@ glabel Camera_Unique0 /* AC9828 80052688 A7AE006C */ sh $t6, 0x6c($sp) /* AC982C 8005268C 27A50068 */ addiu $a1, $sp, 0x68 /* AC9830 80052690 24E4001C */ addiu $a0, $a3, 0x1c -/* AC9834 80052694 0C01F097 */ jal func_8007C25C +/* AC9834 80052694 0C01F097 */ jal OLib_VecSphRot90ToVec3f /* AC9838 80052698 A7AC006E */ sh $t4, 0x6e($sp) /* AC983C 8005269C 8FA40024 */ lw $a0, 0x24($sp) /* AC9840 800526A0 8FA50034 */ lw $a1, 0x34($sp) @@ -212,7 +212,7 @@ glabel Camera_Unique0 /* AC9900 80052760 01C37824 */ and $t7, $t6, $v1 /* AC9904 80052764 55E00098 */ bnezl $t7, .L800529C8 /* AC9908 80052768 8FBF001C */ lw $ra, 0x1c($sp) -/* AC990C 8005276C 0C01F00A */ jal func_8007C028 +/* AC990C 8005276C 0C01F00A */ jal OLib_Vec3fDistXZ /* AC9910 80052770 AFA60034 */ sw $a2, 0x34($sp) /* AC9914 80052774 3C014120 */ li $at, 0x41200000 # 0.000000 /* AC9918 80052778 44814000 */ mtc1 $at, $f8 @@ -251,7 +251,7 @@ glabel Camera_Unique0 /* AC999C 800527FC 55E00072 */ bnezl $t7, .L800529C8 /* AC99A0 80052800 8FBF001C */ lw $ra, 0x1c($sp) .L80052804: -/* AC99A4 80052804 0C01EFE4 */ jal func_8007BF90 +/* AC99A4 80052804 0C01EFE4 */ jal OLib_Vec3fDist /* AC99A8 80052808 2605005C */ addiu $a1, $s0, 0x5c /* AC99AC 8005280C 8FA20034 */ lw $v0, 0x34($sp) /* AC99B0 80052810 E60000DC */ swc1 $f0, 0xdc($s0) @@ -341,7 +341,7 @@ glabel Camera_Unique0 /* AC9AF0 80052950 55E0001D */ bnezl $t7, .L800529C8 /* AC9AF4 80052954 8FBF001C */ lw $ra, 0x1c($sp) .L80052958: -/* AC9AF8 80052958 0C01EFE4 */ jal func_8007BF90 +/* AC9AF8 80052958 0C01EFE4 */ jal OLib_Vec3fDist /* AC9AFC 8005295C AFA60034 */ sw $a2, 0x34($sp) /* AC9B00 80052960 E60000DC */ swc1 $f0, 0xdc($s0) /* AC9B04 80052964 8FB80034 */ lw $t8, 0x34($sp) diff --git a/asm/non_matchings/code/z_camera/Camera_Unique1.s b/asm/non_matchings/code/z_camera/Camera_Unique1.s index 0df7d872cc..5ca741f51c 100644 --- a/asm/non_matchings/code/z_camera/Camera_Unique1.s +++ b/asm/non_matchings/code/z_camera/Camera_Unique1.s @@ -140,12 +140,12 @@ glabel Camera_Unique1 /* AC88F8 80051758 AC2DD3E8 */ sw $t5, %lo(D_8011D3E8)($at) /* AC88FC 8005175C AFA60038 */ sw $a2, 0x38($sp) /* AC8900 80051760 AFA50034 */ sw $a1, 0x34($sp) -/* AC8904 80051764 0C01F124 */ jal func_8007C490 +/* AC8904 80051764 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* AC8908 80051768 27A4007C */ addiu $a0, $sp, 0x7c /* AC890C 8005176C 26060074 */ addiu $a2, $s0, 0x74 /* AC8910 80051770 AFA60030 */ sw $a2, 0x30($sp) /* AC8914 80051774 27A40074 */ addiu $a0, $sp, 0x74 -/* AC8918 80051778 0C01F124 */ jal func_8007C490 +/* AC8918 80051778 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* AC891C 8005177C 8FA50034 */ lw $a1, 0x34($sp) /* AC8920 80051780 860E001A */ lh $t6, 0x1a($s0) /* AC8924 80051784 3C018012 */ lui $at, %hi(D_8011D3A0) @@ -171,7 +171,7 @@ glabel Camera_Unique1 /* AC8974 800517D4 8D19090C */ lw $t9, 0x90c($t0) /* AC8978 800517D8 ACD90004 */ sw $t9, 4($a2) /* AC897C 800517DC 8D090910 */ lw $t1, 0x910($t0) -/* AC8980 800517E0 0C01F124 */ jal func_8007C490 +/* AC8980 800517E0 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* AC8984 800517E4 ACC90008 */ sw $t1, 8($a2) /* AC8988 800517E8 3C0A8016 */ lui $t2, %hi(gGameInfo) # $t2, 0x8016 /* AC898C 800517EC 8D4AFA90 */ lw $t2, %lo(gGameInfo)($t2) @@ -313,7 +313,7 @@ glabel Camera_Unique1 /* AC8B90 800519F0 24070001 */ li $a3, 1 /* AC8B94 800519F4 27A4008C */ addiu $a0, $sp, 0x8c /* AC8B98 800519F8 8FA50034 */ lw $a1, 0x34($sp) -/* AC8B9C 800519FC 0C01F124 */ jal func_8007C490 +/* AC8B9C 800519FC 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* AC8BA0 80051A00 8FA60030 */ lw $a2, 0x30($sp) /* AC8BA4 80051A04 02002025 */ move $a0, $s0 /* AC8BA8 80051A08 8FA5008C */ lw $a1, 0x8c($sp) diff --git a/asm/non_matchings/code/z_camera/Camera_Unique2.s b/asm/non_matchings/code/z_camera/Camera_Unique2.s index a28479ee1f..8750967bd9 100644 --- a/asm/non_matchings/code/z_camera/Camera_Unique2.s +++ b/asm/non_matchings/code/z_camera/Camera_Unique2.s @@ -31,7 +31,7 @@ glabel Camera_Unique2 /* AC8D00 80051B60 E7A00048 */ swc1 $f0, 0x48($sp) /* AC8D04 80051B64 AFA6003C */ sw $a2, 0x3c($sp) /* AC8D08 80051B68 02202825 */ move $a1, $s1 -/* AC8D0C 80051B6C 0C01F124 */ jal func_8007C490 +/* AC8D0C 80051B6C 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* AC8D10 80051B70 27A40060 */ addiu $a0, $sp, 0x60 /* AC8D14 80051B74 8603015E */ lh $v1, 0x15e($s0) /* AC8D18 80051B78 2401000A */ li $at, 10 @@ -201,7 +201,7 @@ glabel Camera_Unique2 /* AC8F88 80051DE8 306C0001 */ andi $t4, $v1, 1 /* AC8F8C 80051DEC 11800015 */ beqz $t4, .L80051E44 /* AC8F90 80051DF0 306D0002 */ andi $t5, $v1, 2 -/* AC8F94 80051DF4 0C01F124 */ jal func_8007C490 +/* AC8F94 80051DF4 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* AC8F98 80051DF8 26060074 */ addiu $a2, $s0, 0x74 /* AC8F9C 80051DFC C60A0004 */ lwc1 $f10, 4($s0) /* AC8FA0 80051E00 27A40070 */ addiu $a0, $sp, 0x70 @@ -225,7 +225,7 @@ glabel Camera_Unique2 /* AC8FE4 80051E44 11A00029 */ beqz $t5, .L80051EEC /* AC8FE8 80051E48 02202025 */ move $a0, $s1 /* AC8FEC 80051E4C 26050074 */ addiu $a1, $s0, 0x74 -/* AC8FF0 80051E50 0C01F00A */ jal func_8007C028 +/* AC8FF0 80051E50 0C01F00A */ jal OLib_Vec3fDistXZ /* AC8FF4 80051E54 AFA50034 */ sw $a1, 0x34($sp) /* AC8FF8 80051E58 C6040004 */ lwc1 $f4, 4($s0) /* AC8FFC 80051E5C 8FA60034 */ lw $a2, 0x34($sp) @@ -236,7 +236,7 @@ glabel Camera_Unique2 /* AC9010 80051E70 45020018 */ bc1fl .L80051ED4 /* AC9014 80051E74 44810000 */ mtc1 $at, $f0 /* AC9018 80051E78 27A40068 */ addiu $a0, $sp, 0x68 -/* AC901C 80051E7C 0C01F124 */ jal func_8007C490 +/* AC901C 80051E7C 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* AC9020 80051E80 02202825 */ move $a1, $s1 /* AC9024 80051E84 3C063DCC */ li $a2, 0x3DCC0000 # 0.000000 /* AC9028 80051E88 34C6CCCD */ ori $a2, (0x3DCCCCCD & 0xFFFF) # ori $a2, $a2, 0xcccd @@ -272,7 +272,7 @@ glabel Camera_Unique2 /* AC9094 80051EF4 0C010FCD */ jal func_80043F34 /* AC9098 80051EF8 8FA6003C */ lw $a2, 0x3c($sp) /* AC909C 80051EFC 02202025 */ move $a0, $s1 -/* AC90A0 80051F00 0C01EFE4 */ jal func_8007BF90 +/* AC90A0 80051F00 0C01EFE4 */ jal OLib_Vec3fDist /* AC90A4 80051F04 8FA5003C */ lw $a1, 0x3c($sp) /* AC90A8 80051F08 3C063E4C */ lui $a2, (0x3E4CCCCD >> 16) # lui $a2, 0x3e4c /* AC90AC 80051F0C 3C073DCC */ lui $a3, (0x3DCCCCCD >> 16) # lui $a3, 0x3dcc diff --git a/asm/non_matchings/code/z_camera/Camera_Unique3.s b/asm/non_matchings/code/z_camera/Camera_Unique3.s index 7e8a3621d8..8613246208 100644 --- a/asm/non_matchings/code/z_camera/Camera_Unique3.s +++ b/asm/non_matchings/code/z_camera/Camera_Unique3.s @@ -114,7 +114,7 @@ glabel L800520A8 /* AC9264 800520C4 E4480000 */ swc1 $f8, ($v0) /* AC9268 800520C8 AFA2002C */ sw $v0, 0x2c($sp) /* AC926C 800520CC 26040050 */ addiu $a0, $s0, 0x50 -/* AC9270 800520D0 0C01EFE4 */ jal func_8007BF90 +/* AC9270 800520D0 0C01EFE4 */ jal OLib_Vec3fDist /* AC9274 800520D4 2605005C */ addiu $a1, $s0, 0x5c /* AC9278 800520D8 8FA2002C */ lw $v0, 0x2c($sp) /* AC927C 800520DC E4400004 */ swc1 $f0, 4($v0) @@ -290,7 +290,7 @@ glabel L80052318 /* AC94EC 8005234C E60000FC */ swc1 $f0, 0xfc($s0) /* AC94F0 80052350 8FA60024 */ lw $a2, 0x24($sp) /* AC94F4 80052354 8FA5002C */ lw $a1, 0x2c($sp) -/* AC94F8 80052358 0C01F124 */ jal func_8007C490 +/* AC94F8 80052358 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* AC94FC 8005235C 27A40060 */ addiu $a0, $sp, 0x60 /* AC9500 80052360 3C0142C8 */ li $at, 0x42C80000 # 0.000000 /* AC9504 80052364 44816000 */ mtc1 $at, $f12 diff --git a/asm/non_matchings/code/z_camera/Camera_Unique7.s b/asm/non_matchings/code/z_camera/Camera_Unique7.s index 20c63b9f0e..df623ffddc 100644 --- a/asm/non_matchings/code/z_camera/Camera_Unique7.s +++ b/asm/non_matchings/code/z_camera/Camera_Unique7.s @@ -71,7 +71,7 @@ glabel Camera_Unique7 /* AC9E24 80052C84 AF090000 */ sw $t1, ($t8) /* AC9E28 80052C88 9509000A */ lhu $t1, 0xa($t0) /* AC9E2C 80052C8C A7090004 */ sh $t1, 4($t8) -/* AC9E30 80052C90 0C01F124 */ jal func_8007C490 +/* AC9E30 80052C90 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* AC9E34 80052C94 AFA50024 */ sw $a1, 0x24($sp) /* AC9E38 80052C98 8FAA0044 */ lw $t2, 0x44($sp) /* AC9E3C 80052C9C 2401FFFF */ li $at, -1 diff --git a/asm/non_matchings/code/z_camera/Camera_Unique9.s b/asm/non_matchings/code/z_camera/Camera_Unique9.s index a73155706a..9694d63402 100644 --- a/asm/non_matchings/code/z_camera/Camera_Unique9.s +++ b/asm/non_matchings/code/z_camera/Camera_Unique9.s @@ -337,7 +337,7 @@ glabel Camera_Unique9 /* ACA34C 800531AC 27A500C0 */ addiu $a1, $sp, 0xc0 /* ACA350 800531B0 27A600AC */ addiu $a2, $sp, 0xac /* ACA354 800531B4 E7A800AC */ swc1 $f8, 0xac($sp) -/* ACA358 800531B8 0C01F124 */ jal func_8007C490 +/* ACA358 800531B8 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* ACA35C 800531BC E7AA00B4 */ swc1 $f10, 0xb4($sp) /* ACA360 800531C0 87A700D8 */ lh $a3, 0xd8($sp) /* ACA364 800531C4 24018080 */ li $at, -32640 @@ -374,7 +374,7 @@ glabel Camera_Unique9 /* ACA3E0 80053240 8E050000 */ lw $a1, ($s0) .L80053244: /* ACA3E4 80053244 27A400E4 */ addiu $a0, $sp, 0xe4 -/* ACA3E8 80053248 0C01F0FD */ jal func_8007C3F4 +/* ACA3E8 80053248 0C01F0FD */ jal OLib_Vec3fToVecSphRot90 /* ACA3EC 8005324C 24A50010 */ addiu $a1, $a1, 0x10 .L80053250: /* ACA3F0 80053250 87AB00EA */ lh $t3, 0xea($sp) @@ -496,7 +496,7 @@ glabel Camera_Unique9 /* ACA598 800533F8 8E050000 */ lw $a1, ($s0) .L800533FC: /* ACA59C 800533FC 27A400E4 */ addiu $a0, $sp, 0xe4 -/* ACA5A0 80053400 0C01F0FD */ jal func_8007C3F4 +/* ACA5A0 80053400 0C01F0FD */ jal OLib_Vec3fToVecSphRot90 /* ACA5A4 80053404 24A50010 */ addiu $a1, $a1, 0x10 .L80053408: /* ACA5A8 80053408 87AB00EA */ lh $t3, 0xea($sp) @@ -640,7 +640,7 @@ glabel Camera_Unique9 /* ACA7A0 80053600 27A500C0 */ addiu $a1, $sp, 0xc0 /* ACA7A4 80053604 27A600AC */ addiu $a2, $sp, 0xac /* ACA7A8 80053608 E7A400AC */ swc1 $f4, 0xac($sp) -/* ACA7AC 8005360C 0C01F124 */ jal func_8007C490 +/* ACA7AC 8005360C 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* ACA7B0 80053610 E7A600B4 */ swc1 $f6, 0xb4($sp) /* ACA7B4 80053614 87A700D6 */ lh $a3, 0xd6($sp) /* ACA7B8 80053618 24010400 */ li $at, 1024 @@ -701,7 +701,7 @@ glabel Camera_Unique9 /* ACA888 800536E8 8E050000 */ lw $a1, ($s0) .L800536EC: /* ACA88C 800536EC 27A400E4 */ addiu $a0, $sp, 0xe4 -/* ACA890 800536F0 0C01F0FD */ jal func_8007C3F4 +/* ACA890 800536F0 0C01F0FD */ jal OLib_Vec3fToVecSphRot90 /* ACA894 800536F4 24A5001C */ addiu $a1, $a1, 0x1c .L800536F8: /* ACA898 800536F8 87AB00EA */ lh $t3, 0xea($sp) @@ -822,7 +822,7 @@ glabel Camera_Unique9 /* ACAA3C 8005389C 8E050000 */ lw $a1, ($s0) .L800538A0: /* ACAA40 800538A0 27A400E4 */ addiu $a0, $sp, 0xe4 -/* ACAA44 800538A4 0C01F0FD */ jal func_8007C3F4 +/* ACAA44 800538A4 0C01F0FD */ jal OLib_Vec3fToVecSphRot90 /* ACAA48 800538A8 24A5001C */ addiu $a1, $a1, 0x1c .L800538AC: /* ACAA4C 800538AC 87AB00EA */ lh $t3, 0xea($sp) @@ -1024,11 +1024,11 @@ glabel Camera_Unique9 /* ACAD20 80053B80 AFA70028 */ sw $a3, 0x28($sp) /* ACAD24 80053B84 27A400EC */ addiu $a0, $sp, 0xec /* ACAD28 80053B88 8FA50030 */ lw $a1, 0x30($sp) -/* ACAD2C 80053B8C 0C01F124 */ jal func_8007C490 +/* ACAD2C 80053B8C 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* ACAD30 80053B90 8FA60034 */ lw $a2, 0x34($sp) /* ACAD34 80053B94 8FA50028 */ lw $a1, 0x28($sp) /* ACAD38 80053B98 2604002C */ addiu $a0, $s0, 0x2c -/* ACAD3C 80053B9C 0C01F124 */ jal func_8007C490 +/* ACAD3C 80053B9C 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* ACAD40 80053BA0 8FA60024 */ lw $a2, 0x24($sp) /* ACAD44 80053BA4 8618003C */ lh $t8, 0x3c($s0) /* ACAD48 80053BA8 3C013F80 */ li $at, 0x3F800000 # 0.000000 @@ -1214,11 +1214,11 @@ glabel Camera_Unique9 /* ACB00C 80053E6C AFA70028 */ sw $a3, 0x28($sp) /* ACB010 80053E70 27A400EC */ addiu $a0, $sp, 0xec /* ACB014 80053E74 8FA50030 */ lw $a1, 0x30($sp) -/* ACB018 80053E78 0C01F124 */ jal func_8007C490 +/* ACB018 80053E78 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* ACB01C 80053E7C 8FA60034 */ lw $a2, 0x34($sp) /* ACB020 80053E80 8FA50028 */ lw $a1, 0x28($sp) /* ACB024 80053E84 2604002C */ addiu $a0, $s0, 0x2c -/* ACB028 80053E88 0C01F124 */ jal func_8007C490 +/* ACB028 80053E88 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* ACB02C 80053E8C 8FA60024 */ lw $a2, 0x24($sp) /* ACB030 80053E90 8E0F0000 */ lw $t7, ($s0) /* ACB034 80053E94 3C073DCC */ lui $a3, (0x3DCCCCCD >> 16) # lui $a3, 0x3dcc @@ -1328,7 +1328,7 @@ glabel Camera_Unique9 /* ACB1D0 80054030 E6200058 */ swc1 $f0, 0x58($s1) /* ACB1D4 80054034 8FA60034 */ lw $a2, 0x34($sp) /* ACB1D8 80054038 8FA50030 */ lw $a1, 0x30($sp) -/* ACB1DC 8005403C 0C01F124 */ jal func_8007C490 +/* ACB1DC 8005403C 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* ACB1E0 80054040 27A400E4 */ addiu $a0, $sp, 0xe4 /* ACB1E4 80054044 8E0C0000 */ lw $t4, ($s0) /* ACB1E8 80054048 3C018014 */ lui $at, %hi(D_8013A2B4) @@ -1516,7 +1516,7 @@ glabel Camera_Unique9 /* ACB488 800542E8 460A4181 */ sub.s $f6, $f8, $f10 /* ACB48C 800542EC E62600EC */ swc1 $f6, 0xec($s1) .L800542F0: -/* ACB490 800542F0 0C01EFE4 */ jal func_8007BF90 +/* ACB490 800542F0 0C01EFE4 */ jal OLib_Vec3fDist /* ACB494 800542F4 8FA40030 */ lw $a0, 0x30($sp) /* ACB498 800542F8 E62000DC */ swc1 $f0, 0xdc($s1) /* ACB49C 800542FC 24020001 */ li $v0, 1 diff --git a/asm/non_matchings/code/z_camera/func_80043F94.s b/asm/non_matchings/code/z_camera/func_80043F94.s index 54c0fd97b2..2cc6ce43c6 100644 --- a/asm/non_matchings/code/z_camera/func_80043F94.s +++ b/asm/non_matchings/code/z_camera/func_80043F94.s @@ -4,7 +4,7 @@ glabel D_80139DA8 glabel D_80139DAC .float -0.8 - + .text glabel func_80043F94 /* ABB134 80043F94 27BDFF78 */ addiu $sp, $sp, -0x88 @@ -17,7 +17,7 @@ glabel func_80043F94 /* ABB150 80043FB0 00A08825 */ move $s1, $a1 /* ABB154 80043FB4 25F807C0 */ addiu $t8, $t7, 0x7c0 /* ABB158 80043FB8 AFB80084 */ sw $t8, 0x84($sp) -/* ABB15C 80043FBC 0C01F124 */ jal func_8007C490 +/* ABB15C 80043FBC 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* ABB160 80043FC0 27A40040 */ addiu $a0, $sp, 0x40 /* ABB164 80043FC4 3C014100 */ li $at, 0x41000000 # 0.000000 /* ABB168 80043FC8 44813000 */ mtc1 $at, $f6 @@ -48,7 +48,7 @@ glabel func_80043F94 /* ABB1CC 8004402C 1440003A */ bnez $v0, .L80044118 /* ABB1D0 80044030 27A40060 */ addiu $a0, $sp, 0x60 /* ABB1D4 80044034 02202825 */ move $a1, $s1 -/* ABB1D8 80044038 0C01F03E */ jal func_8007C0F8 +/* ABB1D8 80044038 0C01F03E */ jal OLib_Vec3fDistNormalize /* ABB1DC 8004403C 02003025 */ move $a2, $s0 /* ABB1E0 80044040 C7AA0060 */ lwc1 $f10, 0x60($sp) /* ABB1E4 80044044 8E0E0000 */ lw $t6, ($s0) @@ -81,7 +81,7 @@ glabel func_80043F94 /* ABB250 800440B0 46001181 */ sub.s $f6, $f2, $f0 /* ABB254 800440B4 3C013F80 */ li $at, 0x3F800000 # 0.000000 /* ABB258 800440B8 4606203C */ c.lt.s $f4, $f6 -/* ABB25C 800440BC 00000000 */ nop +/* ABB25C 800440BC 00000000 */ nop /* ABB260 800440C0 4502000F */ bc1fl .L80044100 /* ABB264 800440C4 44818000 */ mtc1 $at, $f16 /* ABB268 800440C8 C6080000 */ lwc1 $f8, ($s0) @@ -112,13 +112,13 @@ glabel func_80043F94 /* ABB2C4 80044124 84590008 */ lh $t9, 8($v0) /* ABB2C8 80044128 3C013F00 */ li $at, 0x3F000000 # 0.000000 /* ABB2CC 8004412C 44992000 */ mtc1 $t9, $f4 -/* ABB2D0 80044130 00000000 */ nop +/* ABB2D0 80044130 00000000 */ nop /* ABB2D4 80044134 468021A0 */ cvt.s.w $f6, $f4 /* ABB2D8 80044138 46003202 */ mul.s $f8, $f6, $f0 /* ABB2DC 8004413C E608000C */ swc1 $f8, 0xc($s0) /* ABB2E0 80044140 8448000A */ lh $t0, 0xa($v0) /* ABB2E4 80044144 44885000 */ mtc1 $t0, $f10 -/* ABB2E8 80044148 00000000 */ nop +/* ABB2E8 80044148 00000000 */ nop /* ABB2EC 8004414C 46805420 */ cvt.s.w $f16, $f10 /* ABB2F0 80044150 44815000 */ mtc1 $at, $f10 /* ABB2F4 80044154 3C018014 */ lui $at, %hi(D_80139DAC) @@ -135,9 +135,9 @@ glabel func_80043F94 /* ABB320 80044180 C4309DAC */ lwc1 $f16, %lo(D_80139DAC)($at) /* ABB324 80044184 3C028016 */ lui $v0, %hi(D_8015CE4C) # $v0, 0x8016 /* ABB328 80044188 4610103C */ c.lt.s $f2, $f16 -/* ABB32C 8004418C 00000000 */ nop +/* ABB32C 8004418C 00000000 */ nop /* ABB330 80044190 4500000D */ bc1f .L800441C8 -/* ABB334 80044194 00000000 */ nop +/* ABB334 80044194 00000000 */ nop .L80044198: /* ABB338 80044198 C612000C */ lwc1 $f18, 0xc($s0) /* ABB33C 8004419C C7A40078 */ lwc1 $f4, 0x78($sp) @@ -165,13 +165,13 @@ glabel func_80043F94 /* ABB390 800441F0 E7AC0054 */ swc1 $f12, 0x54($sp) /* ABB394 800441F4 844B000A */ lh $t3, 0xa($v0) /* ABB398 800441F8 448B8000 */ mtc1 $t3, $f16 -/* ABB39C 800441FC 00000000 */ nop +/* ABB39C 800441FC 00000000 */ nop /* ABB3A0 80044200 468084A0 */ cvt.s.w $f18, $f16 /* ABB3A4 80044204 46009382 */ mul.s $f14, $f18, $f0 /* ABB3A8 80044208 E7AE0058 */ swc1 $f14, 0x58($sp) /* ABB3AC 8004420C 844C000C */ lh $t4, 0xc($v0) /* ABB3B0 80044210 448C3000 */ mtc1 $t4, $f6 -/* ABB3B4 80044214 00000000 */ nop +/* ABB3B4 80044214 00000000 */ nop /* ABB3B8 80044218 46803220 */ cvt.s.w $f8, $f6 /* ABB3BC 8004421C 46004402 */ mul.s $f16, $f8, $f0 /* ABB3C0 80044220 E7B0005C */ swc1 $f16, 0x5c($sp) @@ -185,7 +185,7 @@ glabel func_80043F94 /* ABB3E0 80044240 AFB10010 */ sw $s1, 0x10($sp) /* ABB3E4 80044244 44079000 */ mfc1 $a3, $f18 /* ABB3E8 80044248 0C033857 */ jal func_800CE15C -/* ABB3EC 8004424C 00000000 */ nop +/* ABB3EC 8004424C 00000000 */ nop /* ABB3F0 80044250 1040001B */ beqz $v0, .L800442C0 /* ABB3F4 80044254 27A40060 */ addiu $a0, $sp, 0x60 /* ABB3F8 80044258 27B90054 */ addiu $t9, $sp, 0x54 @@ -216,7 +216,7 @@ glabel func_80043F94 /* ABB45C 800442BC E60A0008 */ swc1 $f10, 8($s0) .L800442C0: /* ABB460 800442C0 02202825 */ move $a1, $s1 -/* ABB464 800442C4 0C01F03E */ jal func_8007C0F8 +/* ABB464 800442C4 0C01F03E */ jal OLib_Vec3fDistNormalize /* ABB468 800442C8 02003025 */ move $a2, $s0 /* ABB46C 800442CC C7A40060 */ lwc1 $f4, 0x60($sp) /* ABB470 800442D0 00001025 */ move $v0, $zero diff --git a/asm/non_matchings/code/z_camera/func_80044ADC.s b/asm/non_matchings/code/z_camera/func_80044ADC.s index b66957eda5..54f209099a 100644 --- a/asm/non_matchings/code/z_camera/func_80044ADC.s +++ b/asm/non_matchings/code/z_camera/func_80044ADC.s @@ -1,22 +1,22 @@ .late_rodata glabel D_80139DC0 .float 0.01 - + glabel D_80139DC4 .float 0.01 - + glabel D_80139DC8 .float 57.295776 glabel D_80139DCC .float 182.041672 - + glabel D_80139DD0 .float 57.295776 glabel D_80139DD4 .float 182.041672 - + .text glabel func_80044ADC /* ABBC7C 80044ADC 27BDFF90 */ addiu $sp, $sp, -0x70 @@ -48,7 +48,7 @@ glabel func_80044ADC /* ABBCE4 80044B44 3C018016 */ lui $at, %hi(D_8015CE5C) /* ABBCE8 80044B48 46805120 */ cvt.s.w $f4, $f10 /* ABBCEC 80044B4C 46123202 */ mul.s $f8, $f6, $f18 -/* ABBCF0 80044B50 00000000 */ nop +/* ABBCF0 80044B50 00000000 */ nop /* ABBCF4 80044B54 46004082 */ mul.s $f2, $f8, $f0 /* ABBCF8 80044B58 44984000 */ mtc1 $t8, $f8 /* ABBCFC 80044B5C 46122182 */ mul.s $f6, $f4, $f18 @@ -82,7 +82,7 @@ glabel func_80044ADC /* ABBD6C 80044BCC 27A40064 */ addiu $a0, $sp, 0x64 /* ABBD70 80044BD0 312A0001 */ andi $t2, $t1, 1 /* ABBD74 80044BD4 15400022 */ bnez $t2, .L80044C60 -/* ABBD78 80044BD8 00000000 */ nop +/* ABBD78 80044BD8 00000000 */ nop .L80044BDC: /* ABBD7C 80044BDC C7B2003C */ lwc1 $f18, 0x3c($sp) /* ABBD80 80044BE0 C7AA0064 */ lwc1 $f10, 0x64($sp) @@ -105,7 +105,7 @@ glabel func_80044ADC /* ABBDC4 80044C24 E428CE60 */ swc1 $f8, %lo(D_8015CE60)($at) /* ABBDC8 80044C28 87AB007A */ lh $t3, 0x7a($sp) /* ABBDCC 80044C2C 11600006 */ beqz $t3, .L80044C48 -/* ABBDD0 80044C30 00000000 */ nop +/* ABBDD0 80044C30 00000000 */ nop /* ABBDD4 80044C34 C6120104 */ lwc1 $f18, 0x104($s0) /* ABBDD8 80044C38 3C018016 */ lui $at, %hi(D_8015CE54) /* ABBDDC 80044C3C E432CE54 */ swc1 $f18, %lo(D_8015CE54)($at) @@ -119,7 +119,7 @@ glabel func_80044ADC /* ABBDF8 80044C58 10000048 */ b .L80044D7C /* ABBDFC 80044C5C C6020104 */ lwc1 $f2, 0x104($s0) .L80044C60: -/* ABBE00 80044C60 0C01F00A */ jal func_8007C028 +/* ABBE00 80044C60 0C01F00A */ jal OLib_Vec3fDistXZ /* ABBE04 80044C64 E7B00030 */ swc1 $f16, 0x30($sp) /* ABBE08 80044C68 3C0140A0 */ li $at, 0x40A00000 # 0.000000 /* ABBE0C 80044C6C 44811000 */ mtc1 $at, $f2 @@ -181,9 +181,9 @@ glabel func_80044ADC .L80044D48: /* ABBEE8 80044D48 3C01C6FA */ li $at, 0xC6FA0000 # 0.000000 /* ABBEEC 80044D4C 44816000 */ mtc1 $at, $f12 -/* ABBEF0 80044D50 00000000 */ nop +/* ABBEF0 80044D50 00000000 */ nop /* ABBEF4 80044D54 460C9032 */ c.eq.s $f18, $f12 -/* ABBEF8 80044D58 00000000 */ nop +/* ABBEF8 80044D58 00000000 */ nop /* ABBEFC 80044D5C 45020003 */ bc1fl .L80044D6C /* ABBF00 80044D60 460C0032 */ c.eq.s $f0, $f12 /* ABBF04 80044D64 C6120104 */ lwc1 $f18, 0x104($s0) @@ -191,7 +191,7 @@ glabel func_80044ADC .L80044D6C: /* ABBF0C 80044D6C C6020104 */ lwc1 $f2, 0x104($s0) /* ABBF10 80044D70 45000002 */ bc1f .L80044D7C -/* ABBF14 80044D74 00000000 */ nop +/* ABBF14 80044D74 00000000 */ nop /* ABBF18 80044D78 46009406 */ mov.s $f16, $f18 .L80044D7C: /* ABBF1C 80044D7C 3C0C8016 */ lui $t4, %hi(gGameInfo) # $t4, 0x8016 @@ -213,7 +213,7 @@ glabel func_80044ADC /* ABBF5C 80044DBC 46028201 */ sub.s $f8, $f16, $f2 /* ABBF60 80044DC0 46005101 */ sub.s $f4, $f10, $f0 /* ABBF64 80044DC4 46060302 */ mul.s $f12, $f0, $f6 -/* ABBF68 80044DC8 00000000 */ nop +/* ABBF68 80044DC8 00000000 */ nop /* ABBF6C 80044DCC 46082182 */ mul.s $f6, $f4, $f8 /* ABBF70 80044DD0 0C03F494 */ jal Math_atan2f /* ABBF74 80044DD4 E7A60040 */ swc1 $f6, 0x40($sp) @@ -230,7 +230,7 @@ glabel func_80044ADC /* ABBFA0 80044E00 460A3100 */ add.s $f4, $f6, $f10 /* ABBFA4 80044E04 4600220D */ trunc.w.s $f8, $f4 /* ABBFA8 80044E08 44104000 */ mfc1 $s0, $f8 -/* ABBFAC 80044E0C 00000000 */ nop +/* ABBFAC 80044E0C 00000000 */ nop /* ABBFB0 80044E10 00108400 */ sll $s0, $s0, 0x10 /* ABBFB4 80044E14 0C03F494 */ jal Math_atan2f /* ABBFB8 80044E18 00108403 */ sra $s0, $s0, 0x10 @@ -246,7 +246,7 @@ glabel func_80044ADC /* ABBFE0 80044E40 46064280 */ add.s $f10, $f8, $f6 /* ABBFE4 80044E44 4600510D */ trunc.w.s $f4, $f10 /* ABBFE8 80044E48 44082000 */ mfc1 $t0, $f4 -/* ABBFEC 80044E4C 00000000 */ nop +/* ABBFEC 80044E4C 00000000 */ nop /* ABBFF0 80044E50 02081021 */ addu $v0, $s0, $t0 /* ABBFF4 80044E54 00021400 */ sll $v0, $v0, 0x10 /* ABBFF8 80044E58 8FB00018 */ lw $s0, 0x18($sp) diff --git a/asm/non_matchings/code/z_camera/func_80045508.s b/asm/non_matchings/code/z_camera/func_80045508.s index d6bd05d48e..25712c393a 100644 --- a/asm/non_matchings/code/z_camera/func_80045508.s +++ b/asm/non_matchings/code/z_camera/func_80045508.s @@ -31,7 +31,7 @@ glabel func_80045508 /* ABC71C 8004557C AE390004 */ sw $t9, 4($s1) /* ABC720 80045580 8F080008 */ lw $t0, 8($t8) /* ABC724 80045584 AE280008 */ sw $t0, 8($s1) -/* ABC728 80045588 0C01F0FD */ jal func_8007C3F4 +/* ABC728 80045588 0C01F0FD */ jal OLib_Vec3fToVecSphRot90 /* ABC72C 8004558C AFA50024 */ sw $a1, 0x24($sp) /* ABC730 80045590 86090020 */ lh $t1, 0x20($s0) /* ABC734 80045594 8FAA005C */ lw $t2, 0x5c($sp) @@ -93,7 +93,7 @@ glabel func_80045508 /* ABC804 80045664 2630000C */ addiu $s0, $s1, 0xc .L80045668: /* ABC808 80045668 02002825 */ move $a1, $s0 -/* ABC80C 8004566C 0C01F0FD */ jal func_8007C3F4 +/* ABC80C 8004566C 0C01F0FD */ jal OLib_Vec3fToVecSphRot90 /* ABC810 80045670 2624001C */ addiu $a0, $s1, 0x1c /* ABC814 80045674 862E0020 */ lh $t6, 0x20($s1) /* ABC818 80045678 8FAF005C */ lw $t7, 0x5c($sp) diff --git a/asm/non_matchings/code/z_camera/func_80045714.s b/asm/non_matchings/code/z_camera/func_80045714.s index 8128a60bb2..4d46f28dba 100644 --- a/asm/non_matchings/code/z_camera/func_80045714.s +++ b/asm/non_matchings/code/z_camera/func_80045714.s @@ -6,7 +6,7 @@ glabel func_80045714 /* ABC8C4 80045724 AFA40028 */ sw $a0, 0x28($sp) /* ABC8C8 80045728 AFA60030 */ sw $a2, 0x30($sp) /* ABC8CC 8004572C AFA70034 */ sw $a3, 0x34($sp) -/* ABC8D0 80045730 0C01F0FD */ jal func_8007C3F4 +/* ABC8D0 80045730 0C01F0FD */ jal OLib_Vec3fToVecSphRot90 /* ABC8D4 80045734 27A4001C */ addiu $a0, $sp, 0x1c /* ABC8D8 80045738 0C01DE0D */ jal Math_Coss /* ABC8DC 8004573C 87A40020 */ lh $a0, 0x20($sp) @@ -32,8 +32,8 @@ glabel func_80045714 /* ABC92C 8004578C 8FBF0014 */ lw $ra, 0x14($sp) /* ABC930 80045790 27BD0028 */ addiu $sp, $sp, 0x28 /* ABC934 80045794 46083282 */ mul.s $f10, $f6, $f8 -/* ABC938 80045798 00000000 */ nop +/* ABC938 80045798 00000000 */ nop /* ABC93C 8004579C 460A0002 */ mul.s $f0, $f0, $f10 /* ABC940 800457A0 03E00008 */ jr $ra -/* ABC944 800457A4 00000000 */ nop +/* ABC944 800457A4 00000000 */ nop diff --git a/asm/non_matchings/code/z_camera/func_800458D4.s b/asm/non_matchings/code/z_camera/func_800458D4.s index 698b364fb8..36a42c68ae 100644 --- a/asm/non_matchings/code/z_camera/func_800458D4.s +++ b/asm/non_matchings/code/z_camera/func_800458D4.s @@ -1,10 +1,10 @@ .late_rodata glabel D_80139DE4 .float 0.017453292 # pi / 180 - + glabel D_80139DE8 .float 0.01 - + glabel D_80139DEC .float 0.1 @@ -38,11 +38,11 @@ glabel func_800458D4 /* ABCACC 8004592C 85F801A6 */ lh $t8, 0x1a6($t7) /* ABCAD0 80045930 86260006 */ lh $a2, 6($s1) /* ABCAD4 80045934 44984000 */ mtc1 $t8, $f8 -/* ABCAD8 80045938 00000000 */ nop +/* ABCAD8 80045938 00000000 */ nop /* ABCADC 8004593C 46804220 */ cvt.s.w $f8, $f8 /* ABCAE0 80045940 44074000 */ mfc1 $a3, $f8 /* ABCAE4 80045944 0C0115C5 */ jal func_80045714 -/* ABCAE8 80045948 00000000 */ nop +/* ABCAE8 80045948 00000000 */ nop /* ABCAEC 8004594C C7AA0064 */ lwc1 $f10, 0x64($sp) /* ABCAF0 80045950 46005401 */ sub.s $f16, $f10, $f0 /* ABCAF4 80045954 E7B00064 */ swc1 $f16, 0x64($sp) @@ -55,7 +55,7 @@ glabel func_800458D4 /* ABCB0C 8004596C AFA40030 */ sw $a0, 0x30($sp) /* ABCB10 80045970 46049181 */ sub.s $f6, $f18, $f4 /* ABCB14 80045974 2605005C */ addiu $a1, $s0, 0x5c -/* ABCB18 80045978 0C01F00A */ jal func_8007C028 +/* ABCB18 80045978 0C01F00A */ jal OLib_Vec3fDistXZ /* ABCB1C 8004597C E7A60048 */ swc1 $f6, 0x48($sp) /* ABCB20 80045980 C7AC0048 */ lwc1 $f12, 0x48($sp) /* ABCB24 80045984 0C03F494 */ jal Math_atan2f @@ -67,11 +67,11 @@ glabel func_800458D4 /* ABCB3C 8004599C 844801D4 */ lh $t0, 0x1d4($v0) /* ABCB40 800459A0 46000386 */ mov.s $f14, $f0 /* ABCB44 800459A4 44884000 */ mtc1 $t0, $f8 -/* ABCB48 800459A8 00000000 */ nop +/* ABCB48 800459A8 00000000 */ nop /* ABCB4C 800459AC 468042A0 */ cvt.s.w $f10, $f8 /* ABCB50 800459B0 460C5082 */ mul.s $f2, $f10, $f12 /* ABCB54 800459B4 4600103C */ c.lt.s $f2, $f0 -/* ABCB58 800459B8 00000000 */ nop +/* ABCB58 800459B8 00000000 */ nop /* ABCB5C 800459BC 4502000A */ bc1fl .L800459E8 /* ABCB60 800459C0 844901D6 */ lh $t1, 0x1d6($v0) /* ABCB64 800459C4 0C0400A4 */ jal sinf @@ -86,11 +86,11 @@ glabel func_800458D4 .L800459E8: /* ABCB88 800459E8 3C013F80 */ li $at, 0x3F800000 # 0.000000 /* ABCB8C 800459EC 44899000 */ mtc1 $t1, $f18 -/* ABCB90 800459F0 00000000 */ nop +/* ABCB90 800459F0 00000000 */ nop /* ABCB94 800459F4 46809120 */ cvt.s.w $f4, $f18 /* ABCB98 800459F8 460C2082 */ mul.s $f2, $f4, $f12 /* ABCB9C 800459FC 4602003C */ c.lt.s $f0, $f2 -/* ABCBA0 80045A00 00000000 */ nop +/* ABCBA0 80045A00 00000000 */ nop /* ABCBA4 80045A04 4502000A */ bc1fl .L80045A30 /* ABCBA8 80045A08 44811000 */ mtc1 $at, $f2 /* ABCBAC 80045A0C 0C0400A4 */ jal sinf @@ -103,7 +103,7 @@ glabel func_800458D4 /* ABCBC8 80045A28 46003081 */ sub.s $f2, $f6, $f0 /* ABCBCC 80045A2C 44811000 */ mtc1 $at, $f2 .L80045A30: -/* ABCBD0 80045A30 00000000 */ nop +/* ABCBD0 80045A30 00000000 */ nop .L80045A34: /* ABCBD4 80045A34 C7AA0048 */ lwc1 $f10, 0x48($sp) /* ABCBD8 80045A38 C7A80064 */ lwc1 $f8, 0x64($sp) @@ -124,12 +124,12 @@ glabel func_800458D4 /* ABCC14 80045A74 E7A40010 */ swc1 $f4, 0x10($sp) /* ABCC18 80045A78 46804420 */ cvt.s.w $f16, $f8 /* ABCC1C 80045A7C 46003282 */ mul.s $f10, $f6, $f0 -/* ABCC20 80045A80 00000000 */ nop +/* ABCC20 80045A80 00000000 */ nop /* ABCC24 80045A84 46008482 */ mul.s $f18, $f16, $f0 /* ABCC28 80045A88 44065000 */ mfc1 $a2, $f10 /* ABCC2C 80045A8C 44079000 */ mfc1 $a3, $f18 /* ABCC30 80045A90 0C010E8F */ jal func_80043A3C -/* ABCC34 80045A94 00000000 */ nop +/* ABCC34 80045A94 00000000 */ nop /* ABCC38 80045A98 C6260000 */ lwc1 $f6, ($s1) /* ABCC3C 80045A9C C60A00E4 */ lwc1 $f10, 0xe4($s0) /* ABCC40 80045AA0 3C018014 */ lui $at, %hi(D_80139DF0) @@ -151,7 +151,7 @@ glabel func_800458D4 /* ABCC80 80045AE0 44060000 */ mfc1 $a2, $f0 /* ABCC84 80045AE4 44070000 */ mfc1 $a3, $f0 /* ABCC88 80045AE8 0C010E8F */ jal func_80043A3C -/* ABCC8C 80045AEC 00000000 */ nop +/* ABCC8C 80045AEC 00000000 */ nop /* ABCC90 80045AF0 8FBF0024 */ lw $ra, 0x24($sp) /* ABCC94 80045AF4 8FB0001C */ lw $s0, 0x1c($sp) /* ABCC98 80045AF8 8FB10020 */ lw $s1, 0x20($sp) diff --git a/asm/non_matchings/code/z_camera/func_80045C74.s b/asm/non_matchings/code/z_camera/func_80045C74.s index 9fc81b1020..46a70fcbec 100644 --- a/asm/non_matchings/code/z_camera/func_80045C74.s +++ b/asm/non_matchings/code/z_camera/func_80045C74.s @@ -4,28 +4,28 @@ glabel D_80139DFC glabel D_80139E00 .float 0.01 - + glabel D_80139E04 .float 0.1 - + glabel D_80139E08 .float 0.017453292 - + glabel D_80139E0C .float 0.4 - + glabel D_80139E10 .float 0.017453292 - + glabel D_80139E14 .float 0.01 - + glabel D_80139E18 .float 0.1 - + glabel D_80139E1C .float 0.2 - + .text glabel func_80045C74 /* ABCE14 80045C74 27BDFF80 */ addiu $sp, $sp, -0x80 @@ -60,7 +60,7 @@ glabel func_80045C74 /* ABCE88 80045CE8 468031A0 */ cvt.s.w $f6, $f6 /* ABCE8C 80045CEC 44073000 */ mfc1 $a3, $f6 /* ABCE90 80045CF0 0C0115C5 */ jal func_80045714 -/* ABCE94 80045CF4 00000000 */ nop +/* ABCE94 80045CF4 00000000 */ nop /* ABCE98 80045CF8 C7A80074 */ lwc1 $f8, 0x74($sp) /* ABCE9C 80045CFC 3C028016 */ lui $v0, %hi(gGameInfo) # $v0, 0x8016 /* ABCEA0 80045D00 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) @@ -71,7 +71,7 @@ glabel func_80045C74 /* ABCEB0 80045D10 C6060104 */ lwc1 $f6, 0x104($s0) /* ABCEB4 80045D14 26080094 */ addiu $t0, $s0, 0x94 /* ABCEB8 80045D18 46062032 */ c.eq.s $f4, $f6 -/* ABCEBC 80045D1C 00000000 */ nop +/* ABCEBC 80045D1C 00000000 */ nop /* ABCEC0 80045D20 4503000E */ bc1tl .L80045D5C /* ABCEC4 80045D24 844C01EA */ lh $t4, 0x1ea($v0) /* ABCEC8 80045D28 8E030090 */ lw $v1, 0x90($s0) @@ -79,7 +79,7 @@ glabel func_80045C74 /* ABCED0 80045D30 C4289DFC */ lwc1 $f8, %lo(D_80139DFC)($at) /* ABCED4 80045D34 C46A006C */ lwc1 $f10, 0x6c($v1) /* ABCED8 80045D38 460A403C */ c.lt.s $f8, $f10 -/* ABCEDC 80045D3C 00000000 */ nop +/* ABCEDC 80045D3C 00000000 */ nop /* ABCEE0 80045D40 45030006 */ bc1tl .L80045D5C /* ABCEE4 80045D44 844C01EA */ lh $t4, 0x1ea($v0) /* ABCEE8 80045D48 8C69067C */ lw $t1, 0x67c($v1) @@ -101,7 +101,7 @@ glabel func_80045C74 /* ABCF24 80045D84 46143202 */ mul.s $f8, $f6, $f20 /* ABCF28 80045D88 44064000 */ mfc1 $a2, $f8 /* ABCF2C 80045D8C 0C010E27 */ jal func_8004389C -/* ABCF30 80045D90 00000000 */ nop +/* ABCF30 80045D90 00000000 */ nop /* ABCF34 80045D94 8FAD008C */ lw $t5, 0x8c($sp) /* ABCF38 80045D98 3C018014 */ lui $at, %hi(D_80139E04) /* ABCF3C 80045D9C 27A40070 */ addiu $a0, $sp, 0x70 @@ -134,7 +134,7 @@ glabel func_80045C74 /* ABCFA4 80045E04 AFA8003C */ sw $t0, 0x3c($sp) /* ABCFA8 80045E08 AFA40040 */ sw $a0, 0x40($sp) /* ABCFAC 80045E0C 2605005C */ addiu $a1, $s0, 0x5c -/* ABCFB0 80045E10 0C01F00A */ jal func_8007C028 +/* ABCFB0 80045E10 0C01F00A */ jal OLib_Vec3fDistXZ /* ABCFB4 80045E14 46045501 */ sub.s $f20, $f10, $f4 /* ABCFB8 80045E18 4600A306 */ mov.s $f12, $f20 /* ABCFBC 80045E1C 46000386 */ mov.s $f14, $f0 @@ -146,15 +146,15 @@ glabel func_80045C74 /* ABCFD4 80045E34 C4289E0C */ lwc1 $f8, %lo(D_80139E0C)($at) /* ABCFD8 80045E38 C60600FC */ lwc1 $f6, 0xfc($s0) /* ABCFDC 80045E3C 46083282 */ mul.s $f10, $f6, $f8 -/* ABCFE0 80045E40 00000000 */ nop +/* ABCFE0 80045E40 00000000 */ nop /* ABCFE4 80045E44 46125302 */ mul.s $f12, $f10, $f18 /* ABCFE8 80045E48 0C03F3A0 */ jal Math_tanf -/* ABCFEC 80045E4C 00000000 */ nop +/* ABCFEC 80045E4C 00000000 */ nop /* ABCFF0 80045E50 C7B00054 */ lwc1 $f16, 0x54($sp) /* ABCFF4 80045E54 8FA2008C */ lw $v0, 0x8c($sp) /* ABCFF8 80045E58 46100082 */ mul.s $f2, $f0, $f16 /* ABCFFC 80045E5C 4614103C */ c.lt.s $f2, $f20 -/* ABD000 80045E60 00000000 */ nop +/* ABD000 80045E60 00000000 */ nop /* ABD004 80045E64 45020008 */ bc1fl .L80045E88 /* ABD008 80045E68 46001007 */ neg.s $f0, $f2 /* ABD00C 80045E6C 4602A181 */ sub.s $f6, $f20, $f2 @@ -167,7 +167,7 @@ glabel func_80045C74 .L80045E88: /* ABD028 80045E88 8FA2008C */ lw $v0, 0x8c($sp) /* ABD02C 80045E8C 4600A03C */ c.lt.s $f20, $f0 -/* ABD030 80045E90 00000000 */ nop +/* ABD030 80045E90 00000000 */ nop /* ABD034 80045E94 45020007 */ bc1fl .L80045EB4 /* ABD038 80045E98 C7A80074 */ lwc1 $f8, 0x74($sp) /* ABD03C 80045E9C 4602A100 */ add.s $f4, $f20, $f2 @@ -188,7 +188,7 @@ glabel func_80045C74 /* ABD06C 80045ECC C5260000 */ lwc1 $f6, ($t1) /* ABD070 80045ED0 AFA8003C */ sw $t0, 0x3c($sp) /* ABD074 80045ED4 AFA40040 */ sw $a0, 0x40($sp) -/* ABD078 80045ED8 0C01F00A */ jal func_8007C028 +/* ABD078 80045ED8 0C01F00A */ jal OLib_Vec3fDistXZ /* ABD07C 80045EDC 46062501 */ sub.s $f20, $f4, $f6 /* ABD080 80045EE0 4600A306 */ mov.s $f12, $f20 /* ABD084 80045EE4 0C03F494 */ jal Math_atan2f @@ -200,11 +200,11 @@ glabel func_80045C74 /* ABD09C 80045EFC 844B01D4 */ lh $t3, 0x1d4($v0) /* ABD0A0 80045F00 46000086 */ mov.s $f2, $f0 /* ABD0A4 80045F04 448B4000 */ mtc1 $t3, $f8 -/* ABD0A8 80045F08 00000000 */ nop +/* ABD0A8 80045F08 00000000 */ nop /* ABD0AC 80045F0C 468042A0 */ cvt.s.w $f10, $f8 /* ABD0B0 80045F10 46125382 */ mul.s $f14, $f10, $f18 /* ABD0B4 80045F14 4600703C */ c.lt.s $f14, $f0 -/* ABD0B8 80045F18 00000000 */ nop +/* ABD0B8 80045F18 00000000 */ nop /* ABD0BC 80045F1C 4502000A */ bc1fl .L80045F48 /* ABD0C0 80045F20 844C01D6 */ lh $t4, 0x1d6($v0) /* ABD0C4 80045F24 0C0400A4 */ jal sinf @@ -219,11 +219,11 @@ glabel func_80045C74 .L80045F48: /* ABD0E8 80045F48 3C013F80 */ li $at, 0x3F800000 # 0.000000 /* ABD0EC 80045F4C 448C3000 */ mtc1 $t4, $f6 -/* ABD0F0 80045F50 00000000 */ nop +/* ABD0F0 80045F50 00000000 */ nop /* ABD0F4 80045F54 46803220 */ cvt.s.w $f8, $f6 /* ABD0F8 80045F58 46124382 */ mul.s $f14, $f8, $f18 /* ABD0FC 80045F5C 460E003C */ c.lt.s $f0, $f14 -/* ABD100 80045F60 00000000 */ nop +/* ABD100 80045F60 00000000 */ nop /* ABD104 80045F64 4502000A */ bc1fl .L80045F90 /* ABD108 80045F68 44818000 */ mtc1 $at, $f16 /* ABD10C 80045F6C 0C0400A4 */ jal sinf @@ -236,7 +236,7 @@ glabel func_80045C74 /* ABD128 80045F88 46005401 */ sub.s $f16, $f10, $f0 /* ABD12C 80045F8C 44818000 */ mtc1 $at, $f16 .L80045F90: -/* ABD130 80045F90 00000000 */ nop +/* ABD130 80045F90 00000000 */ nop .L80045F94: /* ABD134 80045F94 4610A182 */ mul.s $f6, $f20, $f16 /* ABD138 80045F98 C7A40074 */ lwc1 $f4, 0x74($sp) @@ -255,27 +255,27 @@ glabel func_80045C74 /* ABD168 80045FC8 260500E4 */ addiu $a1, $s0, 0xe4 /* ABD16C 80045FCC 468042A0 */ cvt.s.w $f10, $f8 /* ABD170 80045FD0 46142182 */ mul.s $f6, $f4, $f20 -/* ABD174 80045FD4 00000000 */ nop +/* ABD174 80045FD4 00000000 */ nop /* ABD178 80045FD8 46145102 */ mul.s $f4, $f10, $f20 /* ABD17C 80045FDC 44063000 */ mfc1 $a2, $f6 /* ABD180 80045FE0 C4269E18 */ lwc1 $f6, %lo(D_80139E18)($at) /* ABD184 80045FE4 E7A60010 */ swc1 $f6, 0x10($sp) /* ABD188 80045FE8 44072000 */ mfc1 $a3, $f4 /* ABD18C 80045FEC 0C010E8F */ jal func_80043A3C -/* ABD190 80045FF0 00000000 */ nop +/* ABD190 80045FF0 00000000 */ nop /* ABD194 80045FF4 3C0F8016 */ lui $t7, %hi(gGameInfo) # $t7, 0x8016 /* ABD198 80045FF8 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) /* ABD19C 80045FFC 3C198016 */ lui $t9, %hi(gGameInfo) # $t9, 0x8016 /* ABD1A0 80046000 85F801CE */ lh $t8, 0x1ce($t7) /* ABD1A4 80046004 44984000 */ mtc1 $t8, $f8 -/* ABD1A8 80046008 00000000 */ nop +/* ABD1A8 80046008 00000000 */ nop /* ABD1AC 8004600C 468042A0 */ cvt.s.w $f10, $f8 /* ABD1B0 80046010 46145102 */ mul.s $f4, $f10, $f20 /* ABD1B4 80046014 E60400D0 */ swc1 $f4, 0xd0($s0) /* ABD1B8 80046018 8F39FA90 */ lw $t9, %lo(gGameInfo)($t9) /* ABD1BC 8004601C 872901D0 */ lh $t1, 0x1d0($t9) /* ABD1C0 80046020 44893000 */ mtc1 $t1, $f6 -/* ABD1C4 80046024 00000000 */ nop +/* ABD1C4 80046024 00000000 */ nop /* ABD1C8 80046028 46803220 */ cvt.s.w $f8, $f6 /* ABD1CC 8004602C 46144282 */ mul.s $f10, $f8, $f20 /* ABD1D0 80046030 E60A00CC */ swc1 $f10, 0xcc($s0) @@ -302,7 +302,7 @@ glabel func_80045C74 /* ABD220 80046080 44060000 */ mfc1 $a2, $f0 /* ABD224 80046084 44070000 */ mfc1 $a3, $f0 /* ABD228 80046088 0C010E8F */ jal func_80043A3C -/* ABD22C 8004608C 00000000 */ nop +/* ABD22C 8004608C 00000000 */ nop /* ABD230 80046090 8FBF002C */ lw $ra, 0x2c($sp) /* ABD234 80046094 D7B40020 */ ldc1 $f20, 0x20($sp) /* ABD238 80046098 8FB00028 */ lw $s0, 0x28($sp) diff --git a/asm/non_matchings/code/z_camera/func_800460A8.s b/asm/non_matchings/code/z_camera/func_800460A8.s index 47ce626047..dabe53f86b 100644 --- a/asm/non_matchings/code/z_camera/func_800460A8.s +++ b/asm/non_matchings/code/z_camera/func_800460A8.s @@ -85,7 +85,7 @@ glabel func_800460A8 /* ABD2C4 80046124 46804220 */ cvt.s.w $f8, $f8 /* ABD2C8 80046128 44074000 */ mfc1 $a3, $f8 /* ABD2CC 8004612C 0C0115C5 */ jal func_80045714 -/* ABD2D0 80046130 00000000 */ nop +/* ABD2D0 80046130 00000000 */ nop /* ABD2D4 80046134 C7AA009C */ lwc1 $f10, 0x9c($sp) /* ABD2D8 80046138 46005101 */ sub.s $f4, $f10, $f0 /* ABD2DC 8004613C E7A4009C */ swc1 $f4, 0x9c($sp) @@ -104,7 +104,7 @@ glabel func_800460A8 /* ABD308 80046168 8FA600B0 */ lw $a2, 0xb0($sp) /* ABD30C 8004616C 46143200 */ add.s $f8, $f6, $f20 /* ABD310 80046170 8FA400C0 */ lw $a0, 0xc0($sp) -/* ABD314 80046174 0C01F124 */ jal func_8007C490 +/* ABD314 80046174 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* ABD318 80046178 E7A80090 */ swc1 $f8, 0x90($sp) /* ABD31C 8004617C 8FAC00C0 */ lw $t4, 0xc0($sp) /* ABD320 80046180 27AB0074 */ addiu $t3, $sp, 0x74 @@ -117,7 +117,7 @@ glabel func_800460A8 /* ABD33C 8004619C C7AA00B8 */ lwc1 $f10, 0xb8($sp) /* ABD340 800461A0 8FB90050 */ lw $t9, 0x50($sp) /* ABD344 800461A4 4604503C */ c.lt.s $f10, $f4 -/* ABD348 800461A8 00000000 */ nop +/* ABD348 800461A8 00000000 */ nop /* ABD34C 800461AC 4502000E */ bc1fl .L800461E8 /* ABD350 800461B0 C72A0004 */ lwc1 $f10, 4($t9) /* ABD354 800461B4 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) @@ -125,10 +125,10 @@ glabel func_800460A8 /* ABD35C 800461BC C42A9E20 */ lwc1 $f10, %lo(D_80139E20)($at) /* ABD360 800461C0 85F801E0 */ lh $t8, 0x1e0($t7) /* ABD364 800461C4 44983000 */ mtc1 $t8, $f6 -/* ABD368 800461C8 00000000 */ nop +/* ABD368 800461C8 00000000 */ nop /* ABD36C 800461CC 46803220 */ cvt.s.w $f8, $f6 /* ABD370 800461D0 460A4182 */ mul.s $f6, $f8, $f10 -/* ABD374 800461D4 00000000 */ nop +/* ABD374 800461D4 00000000 */ nop /* ABD378 800461D8 46043202 */ mul.s $f8, $f6, $f4 /* ABD37C 800461DC 10000024 */ b .L80046270 /* ABD380 800461E0 E7A80074 */ swc1 $f8, 0x74($sp) @@ -160,7 +160,7 @@ glabel func_800460A8 /* ABD3E4 80046244 46082282 */ mul.s $f10, $f4, $f8 /* ABD3E8 80046248 46064103 */ div.s $f4, $f8, $f6 /* ABD3EC 8004624C 46045182 */ mul.s $f6, $f10, $f4 -/* ABD3F0 80046250 00000000 */ nop +/* ABD3F0 80046250 00000000 */ nop /* ABD3F4 80046254 46024282 */ mul.s $f10, $f8, $f2 /* ABD3F8 80046258 46065101 */ sub.s $f4, $f10, $f6 /* ABD3FC 8004625C 46002202 */ mul.s $f8, $f4, $f0 @@ -184,7 +184,7 @@ glabel func_800460A8 /* ABD440 800462A0 E60000CC */ swc1 $f0, 0xcc($s0) /* ABD444 800462A4 E60000D0 */ swc1 $f0, 0xd0($s0) .L800462A8: -/* ABD448 800462A8 0C01F097 */ jal func_8007C25C +/* ABD448 800462A8 0C01F097 */ jal OLib_VecSphRot90ToVec3f /* ABD44C 800462AC AFA3004C */ sw $v1, 0x4c($sp) /* ABD450 800462B0 3C0A8016 */ lui $t2, %hi(gGameInfo) # $t2, 0x8016 /* ABD454 800462B4 8D4AFA90 */ lw $t2, %lo(gGameInfo)($t2) @@ -232,21 +232,21 @@ glabel func_800460A8 /* ABD4F8 80046358 C6040104 */ lwc1 $f4, 0x104($s0) /* ABD4FC 8004635C C6080098 */ lwc1 $f8, 0x98($s0) /* ABD500 80046360 46044032 */ c.eq.s $f8, $f4 -/* ABD504 80046364 00000000 */ nop +/* ABD504 80046364 00000000 */ nop /* ABD508 80046368 4501000D */ bc1t .L800463A0 -/* ABD50C 8004636C 00000000 */ nop +/* ABD50C 8004636C 00000000 */ nop /* ABD510 80046370 8E020090 */ lw $v0, 0x90($s0) /* ABD514 80046374 3C018014 */ lui $at, %hi(D_80139E34) /* ABD518 80046378 C42A9E34 */ lwc1 $f10, %lo(D_80139E34)($at) /* ABD51C 8004637C C446006C */ lwc1 $f6, 0x6c($v0) /* ABD520 80046380 4606503C */ c.lt.s $f10, $f6 -/* ABD524 80046384 00000000 */ nop +/* ABD524 80046384 00000000 */ nop /* ABD528 80046388 45010005 */ bc1t .L800463A0 -/* ABD52C 8004638C 00000000 */ nop +/* ABD52C 8004638C 00000000 */ nop /* ABD530 80046390 8C4C067C */ lw $t4, 0x67c($v0) /* ABD534 80046394 000C6A80 */ sll $t5, $t4, 0xa /* ABD538 80046398 05A10024 */ bgez $t5, .L8004642C -/* ABD53C 8004639C 00000000 */ nop +/* ABD53C 8004639C 00000000 */ nop .L800463A0: /* ABD540 800463A0 8F18FA90 */ lw $t8, %lo(gGameInfo)($t8) /* ABD544 800463A4 3C018014 */ lui $at, %hi(D_80139E38) @@ -263,7 +263,7 @@ glabel func_800460A8 /* ABD570 800463D0 460A2182 */ mul.s $f6, $f4, $f10 /* ABD574 800463D4 44063000 */ mfc1 $a2, $f6 /* ABD578 800463D8 0C010E27 */ jal func_8004389C -/* ABD57C 800463DC 00000000 */ nop +/* ABD57C 800463DC 00000000 */ nop /* ABD580 800463E0 8FA800BC */ lw $t0, 0xbc($sp) /* ABD584 800463E4 3C018014 */ lui $at, %hi(D_80139E3C) /* ABD588 800463E8 27A40098 */ addiu $a0, $sp, 0x98 @@ -293,7 +293,7 @@ glabel func_800460A8 /* ABD5E4 80046444 C5840000 */ lwc1 $f4, ($t4) /* ABD5E8 80046448 AFA40054 */ sw $a0, 0x54($sp) /* ABD5EC 8004644C 2605005C */ addiu $a1, $s0, 0x5c -/* ABD5F0 80046450 0C01F00A */ jal func_8007C028 +/* ABD5F0 80046450 0C01F00A */ jal OLib_Vec3fDistXZ /* ABD5F4 80046454 46044501 */ sub.s $f20, $f8, $f4 /* ABD5F8 80046458 4600A306 */ mov.s $f12, $f20 /* ABD5FC 8004645C 46000386 */ mov.s $f14, $f0 @@ -305,15 +305,15 @@ glabel func_800460A8 /* ABD614 80046474 C4269E44 */ lwc1 $f6, %lo(D_80139E44)($at) /* ABD618 80046478 C60A00FC */ lwc1 $f10, 0xfc($s0) /* ABD61C 8004647C 46065202 */ mul.s $f8, $f10, $f6 -/* ABD620 80046480 00000000 */ nop +/* ABD620 80046480 00000000 */ nop /* ABD624 80046484 46124302 */ mul.s $f12, $f8, $f18 /* ABD628 80046488 0C03F3A0 */ jal Math_tanf -/* ABD62C 8004648C 00000000 */ nop +/* ABD62C 8004648C 00000000 */ nop /* ABD630 80046490 C7B00068 */ lwc1 $f16, 0x68($sp) /* ABD634 80046494 8FA200BC */ lw $v0, 0xbc($sp) /* ABD638 80046498 46100082 */ mul.s $f2, $f0, $f16 /* ABD63C 8004649C 4614103C */ c.lt.s $f2, $f20 -/* ABD640 800464A0 00000000 */ nop +/* ABD640 800464A0 00000000 */ nop /* ABD644 800464A4 45020008 */ bc1fl .L800464C8 /* ABD648 800464A8 46001007 */ neg.s $f0, $f2 /* ABD64C 800464AC 4602A281 */ sub.s $f10, $f20, $f2 @@ -326,7 +326,7 @@ glabel func_800460A8 .L800464C8: /* ABD668 800464C8 8FA200BC */ lw $v0, 0xbc($sp) /* ABD66C 800464CC 4600A03C */ c.lt.s $f20, $f0 -/* ABD670 800464D0 00000000 */ nop +/* ABD670 800464D0 00000000 */ nop /* ABD674 800464D4 45020007 */ bc1fl .L800464F4 /* ABD678 800464D8 C7A6009C */ lwc1 $f6, 0x9c($sp) /* ABD67C 800464DC 4602A100 */ add.s $f4, $f20, $f2 @@ -349,7 +349,7 @@ glabel func_800460A8 /* ABD6B4 80046514 C5CA0000 */ lwc1 $f10, ($t6) /* ABD6B8 80046518 AFA40054 */ sw $a0, 0x54($sp) /* ABD6BC 8004651C 2605005C */ addiu $a1, $s0, 0x5c -/* ABD6C0 80046520 0C01F00A */ jal func_8007C028 +/* ABD6C0 80046520 0C01F00A */ jal OLib_Vec3fDistXZ /* ABD6C4 80046524 460A2501 */ sub.s $f20, $f4, $f10 /* ABD6C8 80046528 4600A306 */ mov.s $f12, $f20 /* ABD6CC 8004652C 0C03F494 */ jal Math_atan2f @@ -361,11 +361,11 @@ glabel func_800460A8 /* ABD6E4 80046544 845801D4 */ lh $t8, 0x1d4($v0) /* ABD6E8 80046548 46000086 */ mov.s $f2, $f0 /* ABD6EC 8004654C 44983000 */ mtc1 $t8, $f6 -/* ABD6F0 80046550 00000000 */ nop +/* ABD6F0 80046550 00000000 */ nop /* ABD6F4 80046554 46803220 */ cvt.s.w $f8, $f6 /* ABD6F8 80046558 46124382 */ mul.s $f14, $f8, $f18 /* ABD6FC 8004655C 4600703C */ c.lt.s $f14, $f0 -/* ABD700 80046560 00000000 */ nop +/* ABD700 80046560 00000000 */ nop /* ABD704 80046564 4502000A */ bc1fl .L80046590 /* ABD708 80046568 845901D6 */ lh $t9, 0x1d6($v0) /* ABD70C 8004656C 0C0400A4 */ jal sinf @@ -380,11 +380,11 @@ glabel func_800460A8 .L80046590: /* ABD730 80046590 3C013F80 */ li $at, 0x3F800000 # 0.000000 /* ABD734 80046594 44995000 */ mtc1 $t9, $f10 -/* ABD738 80046598 00000000 */ nop +/* ABD738 80046598 00000000 */ nop /* ABD73C 8004659C 468051A0 */ cvt.s.w $f6, $f10 /* ABD740 800465A0 46123382 */ mul.s $f14, $f6, $f18 /* ABD744 800465A4 460E003C */ c.lt.s $f0, $f14 -/* ABD748 800465A8 00000000 */ nop +/* ABD748 800465A8 00000000 */ nop /* ABD74C 800465AC 4502000A */ bc1fl .L800465D8 /* ABD750 800465B0 44818000 */ mtc1 $at, $f16 /* ABD754 800465B4 0C0400A4 */ jal sinf @@ -397,7 +397,7 @@ glabel func_800460A8 /* ABD770 800465D0 46004401 */ sub.s $f16, $f8, $f0 /* ABD774 800465D4 44818000 */ mtc1 $at, $f16 .L800465D8: -/* ABD778 800465D8 00000000 */ nop +/* ABD778 800465D8 00000000 */ nop .L800465DC: /* ABD77C 800465DC 4610A282 */ mul.s $f10, $f20, $f16 /* ABD780 800465E0 C7A4009C */ lwc1 $f4, 0x9c($sp) @@ -416,14 +416,14 @@ glabel func_800460A8 /* ABD7B0 80046610 260500E4 */ addiu $a1, $s0, 0xe4 /* ABD7B4 80046614 46803220 */ cvt.s.w $f8, $f6 /* ABD7B8 80046618 46002282 */ mul.s $f10, $f4, $f0 -/* ABD7BC 8004661C 00000000 */ nop +/* ABD7BC 8004661C 00000000 */ nop /* ABD7C0 80046620 46004102 */ mul.s $f4, $f8, $f0 /* ABD7C4 80046624 44065000 */ mfc1 $a2, $f10 /* ABD7C8 80046628 C42A9E50 */ lwc1 $f10, %lo(D_80139E50)($at) /* ABD7CC 8004662C E7AA0010 */ swc1 $f10, 0x10($sp) /* ABD7D0 80046630 44072000 */ mfc1 $a3, $f4 /* ABD7D4 80046634 0C010E8F */ jal func_80043A3C -/* ABD7D8 80046638 00000000 */ nop +/* ABD7D8 80046638 00000000 */ nop /* ABD7DC 8004663C 3C0A8016 */ lui $t2, %hi(gGameInfo) # $t2, 0x8016 /* ABD7E0 80046640 8D4AFA90 */ lw $t2, %lo(gGameInfo)($t2) /* ABD7E4 80046644 3C018014 */ lui $at, %hi(D_80139E54) @@ -431,14 +431,14 @@ glabel func_800460A8 /* ABD7EC 8004664C 854B01CE */ lh $t3, 0x1ce($t2) /* ABD7F0 80046650 3C0C8016 */ lui $t4, %hi(gGameInfo) /* ABD7F4 80046654 448B3000 */ mtc1 $t3, $f6 -/* ABD7F8 80046658 00000000 */ nop +/* ABD7F8 80046658 00000000 */ nop /* ABD7FC 8004665C 46803220 */ cvt.s.w $f8, $f6 /* ABD800 80046660 46004102 */ mul.s $f4, $f8, $f0 /* ABD804 80046664 E60400D0 */ swc1 $f4, 0xd0($s0) /* ABD808 80046668 8D8CFA90 */ lw $t4, %lo(gGameInfo)($t4) /* ABD80C 8004666C 858D01D0 */ lh $t5, 0x1d0($t4) /* ABD810 80046670 448D5000 */ mtc1 $t5, $f10 -/* ABD814 80046674 00000000 */ nop +/* ABD814 80046674 00000000 */ nop /* ABD818 80046678 468051A0 */ cvt.s.w $f6, $f10 /* ABD81C 8004667C 46003202 */ mul.s $f8, $f6, $f0 /* ABD820 80046680 E60800CC */ swc1 $f8, 0xcc($s0) @@ -465,7 +465,7 @@ glabel func_800460A8 /* ABD870 800466D0 44060000 */ mfc1 $a2, $f0 /* ABD874 800466D4 44070000 */ mfc1 $a3, $f0 /* ABD878 800466D8 0C010E8F */ jal func_80043A3C -/* ABD87C 800466DC 00000000 */ nop +/* ABD87C 800466DC 00000000 */ nop /* ABD880 800466E0 8FBF0044 */ lw $ra, 0x44($sp) /* ABD884 800466E4 D7B40038 */ ldc1 $f20, 0x38($sp) /* ABD888 800466E8 8FB00040 */ lw $s0, 0x40($sp) diff --git a/asm/non_matchings/code/z_camera/func_80046E20.s b/asm/non_matchings/code/z_camera/func_80046E20.s index 1766404171..19b468676a 100644 --- a/asm/non_matchings/code/z_camera/func_80046E20.s +++ b/asm/non_matchings/code/z_camera/func_80046E20.s @@ -4,10 +4,10 @@ glabel D_80139E80 glabel D_80139E84 .float 16380 - + glabel D_80139E88 .float 0.01 - + .text glabel func_80046E20 /* ABDFC0 80046E20 27BDFF90 */ addiu $sp, $sp, -0x70 @@ -76,7 +76,7 @@ glabel func_80046E20 /* ABE0B8 80046F18 E7A8005C */ swc1 $f8, 0x5c($sp) /* ABE0BC 80046F1C C62A0008 */ lwc1 $f10, 8($s1) /* ABE0C0 80046F20 46045180 */ add.s $f6, $f10, $f4 -/* ABE0C4 80046F24 0C01EFE4 */ jal func_8007BF90 +/* ABE0C4 80046F24 0C01EFE4 */ jal OLib_Vec3fDist /* ABE0C8 80046F28 E7A60060 */ swc1 $f6, 0x60($sp) /* ABE0CC 80046F2C C7A20078 */ lwc1 $f2, 0x78($sp) /* ABE0D0 80046F30 3C013F80 */ lui $at, 0x3f80 @@ -108,7 +108,7 @@ glabel func_80046E20 /* ABE130 80046F90 E6260010 */ swc1 $f6, 0x10($s1) /* ABE134 80046F94 8D29CEC0 */ lw $t1, %lo(D_8015CEC0)($t1) /* ABE138 80046F98 AE29000C */ sw $t1, 0xc($s1) -/* ABE13C 80046F9C 0C01F124 */ jal func_8007C490 +/* ABE13C 80046F9C 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* ABE140 80046FA0 8FA50034 */ lw $a1, 0x34($sp) /* ABE144 80046FA4 8FAA0074 */ lw $t2, 0x74($sp) /* ABE148 80046FA8 2650005C */ addiu $s0, $s2, 0x5c @@ -197,7 +197,7 @@ glabel func_80046E20 /* ABE28C 800470EC E7AA005C */ swc1 $f10, 0x5c($sp) /* ABE290 800470F0 C6240008 */ lwc1 $f4, 8($s1) /* ABE294 800470F4 46102481 */ sub.s $f18, $f4, $f16 -/* ABE298 800470F8 0C01F124 */ jal func_8007C490 +/* ABE298 800470F8 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* ABE29C 800470FC E7B20060 */ swc1 $f18, 0x60($sp) /* ABE2A0 80047100 8FAB0074 */ lw $t3, 0x74($sp) /* ABE2A4 80047104 8FA40030 */ lw $a0, 0x30($sp) @@ -250,7 +250,7 @@ glabel func_80046E20 /* ABE350 800471B0 8E190008 */ lw $t9, 8($s0) /* ABE354 800471B4 AE59007C */ sw $t9, 0x7c($s2) .L800471B8: -/* ABE358 800471B8 0C01EFE4 */ jal func_8007BF90 +/* ABE358 800471B8 0C01EFE4 */ jal OLib_Vec3fDist /* ABE35C 800471BC 24A5CE80 */ addiu $a1, %lo(D_8015CE80) # addiu $a1, $a1, -0x3180 /* ABE360 800471C0 C7AC0078 */ lwc1 $f12, 0x78($sp) /* ABE364 800471C4 46000086 */ mov.s $f2, $f0 @@ -288,10 +288,10 @@ glabel func_80046E20 /* ABE3DC 8004723C 3C048016 */ lui $a0, %hi(D_8015CEA0) # $a0, 0x8016 /* ABE3E0 80047240 850901BE */ lh $t1, 0x1be($t0) /* ABE3E4 80047244 44895000 */ mtc1 $t1, $f10 -/* ABE3E8 80047248 00000000 */ nop +/* ABE3E8 80047248 00000000 */ nop /* ABE3EC 8004724C 468051A0 */ cvt.s.w $f6, $f10 /* ABE3F0 80047250 4606103C */ c.lt.s $f2, $f6 -/* ABE3F4 80047254 00000000 */ nop +/* ABE3F4 80047254 00000000 */ nop /* ABE3F8 80047258 45020049 */ bc1fl .L80047380 /* ABE3FC 8004725C 8FBF002C */ lw $ra, 0x2c($sp) /* ABE400 80047260 8484CEA0 */ lh $a0, %lo(D_8015CEA0)($a0) @@ -315,7 +315,7 @@ glabel func_80046E20 /* ABE448 800472A8 27A60040 */ addiu $a2, $sp, 0x40 /* ABE44C 800472AC 4600240D */ trunc.w.s $f16, $f4 /* ABE450 800472B0 44188000 */ mfc1 $t8, $f16 -/* ABE454 800472B4 00000000 */ nop +/* ABE454 800472B4 00000000 */ nop /* ABE458 800472B8 A7B80044 */ sh $t8, 0x44($sp) /* ABE45C 800472BC 845901C0 */ lh $t9, 0x1c0($v0) /* ABE460 800472C0 844C01BE */ lh $t4, 0x1be($v0) diff --git a/asm/non_matchings/code/z_camera/func_800591EC.s b/asm/non_matchings/code/z_camera/func_800591EC.s index 11074b3adb..3bc7d097c1 100644 --- a/asm/non_matchings/code/z_camera/func_800591EC.s +++ b/asm/non_matchings/code/z_camera/func_800591EC.s @@ -121,7 +121,7 @@ glabel func_800591EC /* AD043C 8005929C 27A40080 */ addiu $a0, $sp, 0x80 /* AD0440 800592A0 26050094 */ addiu $a1, $s0, 0x94 /* AD0444 800592A4 AFA50050 */ sw $a1, 0x50($sp) -/* AD0448 800592A8 0C01F00A */ jal func_8007C028 +/* AD0448 800592A8 0C01F00A */ jal OLib_Vec3fDistXZ /* AD044C 800592AC 27A40080 */ addiu $a0, $sp, 0x80 /* AD0450 800592B0 E7A000A0 */ swc1 $f0, 0xa0($sp) /* AD0454 800592B4 E60000D8 */ swc1 $f0, 0xd8($s0) @@ -412,7 +412,7 @@ glabel func_800591EC /* AD0894 800596F4 26050050 */ addiu $a1, $s0, 0x50 /* AD0898 800596F8 51C00009 */ beql $t6, $zero, .L80059720 /* AD089C 800596FC 860F0140 */ lh $t7, 0x140($s0) -/* AD08A0 80059700 0C01F124 */ jal func_8007C490 +/* AD08A0 80059700 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* AD08A4 80059704 2606005C */ addiu $a2, $s0, 0x5c /* AD08A8 80059708 02002025 */ move $a0, $s0 /* AD08AC 8005970C 27A50098 */ addiu $a1, $sp, 0x98 @@ -660,7 +660,7 @@ glabel func_800591EC /* AD0C3C 80059A9C E7A400CC */ swc1 $f4, 0xcc($sp) /* AD0C40 80059AA0 C6060064 */ lwc1 $f6, 0x64($s0) /* AD0C44 80059AA4 46083280 */ add.s $f10, $f6, $f8 -/* AD0C48 80059AA8 0C01F124 */ jal func_8007C490 +/* AD0C48 80059AA8 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* AD0C4C 80059AAC E7AA00D0 */ swc1 $f10, 0xd0($sp) /* AD0C50 80059AB0 87B9009C */ lh $t9, 0x9c($sp) /* AD0C54 80059AB4 87AE0074 */ lh $t6, 0x74($sp) @@ -703,7 +703,7 @@ glabel func_800591EC /* AD0CE0 80059B40 8E190060 */ lw $t9, 0x60($s0) /* AD0CE4 80059B44 ADB90004 */ sw $t9, 4($t5) /* AD0CE8 80059B48 8E0E0064 */ lw $t6, 0x64($s0) -/* AD0CEC 80059B4C 0C01F124 */ jal func_8007C490 +/* AD0CEC 80059B4C 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* AD0CF0 80059B50 ADAE0008 */ sw $t6, 8($t5) /* AD0CF4 80059B54 27A400BC */ addiu $a0, $sp, 0xbc /* AD0CF8 80059B58 87A5009C */ lh $a1, 0x9c($sp) diff --git a/asm/non_matchings/code/z_onepointdemo/func_8007C680.s b/asm/non_matchings/code/z_onepointdemo/func_8007C680.s index 94a62ec54d..ec7d4a7928 100644 --- a/asm/non_matchings/code/z_onepointdemo/func_8007C680.s +++ b/asm/non_matchings/code/z_onepointdemo/func_8007C680.s @@ -5,7 +5,7 @@ glabel func_8007C680 /* AF382C 8007C68C 00A03825 */ move $a3, $a1 /* AF3830 8007C690 AFA70034 */ sw $a3, 0x34($sp) /* AF3834 8007C694 00C02825 */ move $a1, $a2 -/* AF3838 8007C698 0C01F097 */ jal func_8007C25C +/* AF3838 8007C698 0C01F097 */ jal OLib_VecSphRot90ToVec3f /* AF383C 8007C69C 27A40018 */ addiu $a0, $sp, 0x18 /* AF3840 8007C6A0 8FA70034 */ lw $a3, 0x34($sp) /* AF3844 8007C6A4 C7A60018 */ lwc1 $f6, 0x18($sp) @@ -31,5 +31,5 @@ glabel func_8007C680 /* AF3894 8007C6F4 8FBF0014 */ lw $ra, 0x14($sp) /* AF3898 8007C6F8 27BD0030 */ addiu $sp, $sp, 0x30 /* AF389C 8007C6FC 03E00008 */ jr $ra -/* AF38A0 8007C700 00000000 */ nop +/* AF38A0 8007C700 00000000 */ nop diff --git a/asm/non_matchings/code/z_onepointdemo/func_8007C850.s b/asm/non_matchings/code/z_onepointdemo/func_8007C850.s index 1f9ab8c2e4..19228d5f07 100644 --- a/asm/non_matchings/code/z_onepointdemo/func_8007C850.s +++ b/asm/non_matchings/code/z_onepointdemo/func_8007C850.s @@ -651,9 +651,9 @@ glabel func_8007C850 /* AF3A90 8007C8F0 10C10C04 */ beq $a2, $at, .L8007F904 /* AF3A94 8007C8F4 240126B4 */ li $at, 9908 /* AF3A98 8007C8F8 10C10C1C */ beq $a2, $at, .L8007F96C -/* AF3A9C 8007C8FC 00000000 */ nop +/* AF3A9C 8007C8FC 00000000 */ nop /* AF3AA0 8007C900 10000DA9 */ b .L8007FFA8 -/* AF3AA4 8007C904 00000000 */ nop +/* AF3AA4 8007C904 00000000 */ nop .L8007C908: /* AF3AA8 8007C908 2401219C */ li $at, 8604 /* AF3AAC 8007C90C 10C10CCC */ beq $a2, $at, .L8007FC40 @@ -667,7 +667,7 @@ glabel func_8007C850 /* AF3ACC 8007C92C 50C10450 */ beql $a2, $at, .L8007DA70 /* AF3AD0 8007C930 00152C00 */ sll $a1, $s5, 0x10 /* AF3AD4 8007C934 10000D9C */ b .L8007FFA8 -/* AF3AD8 8007C938 00000000 */ nop +/* AF3AD8 8007C938 00000000 */ nop .L8007C93C: /* AF3ADC 8007C93C 28C11401 */ slti $at, $a2, 0x1401 /* AF3AE0 8007C940 1420000D */ bnez $at, .L8007C978 @@ -681,9 +681,9 @@ glabel func_8007C850 /* AF3B00 8007C960 10C10B75 */ beq $a2, $at, .L8007F738 /* AF3B04 8007C964 2401219B */ li $at, 8603 /* AF3B08 8007C968 10C10CA8 */ beq $a2, $at, .L8007FC0C -/* AF3B0C 8007C96C 00000000 */ nop +/* AF3B0C 8007C96C 00000000 */ nop /* AF3B10 8007C970 10000D8D */ b .L8007FFA8 -/* AF3B14 8007C974 00000000 */ nop +/* AF3B14 8007C974 00000000 */ nop .L8007C978: /* AF3B18 8007C978 2401119E */ li $at, 4510 /* AF3B1C 8007C97C 10C1038D */ beq $a2, $at, .L8007D7B4 @@ -697,7 +697,7 @@ glabel func_8007C850 /* AF3B3C 8007C99C 50C10375 */ beql $a2, $at, .L8007D774 /* AF3B40 8007C9A0 02402025 */ move $a0, $s2 /* AF3B44 8007C9A4 10000D80 */ b .L8007FFA8 -/* AF3B48 8007C9A8 00000000 */ nop +/* AF3B48 8007C9A8 00000000 */ nop .L8007C9AC: /* AF3B4C 8007C9AC 28C108DF */ slti $at, $a2, 0x8df /* AF3B50 8007C9B0 1420004E */ bnez $at, .L8007CAEC @@ -711,7 +711,7 @@ glabel func_8007C850 /* AF3B70 8007C9D0 50C10397 */ beql $a2, $at, .L8007D830 /* AF3B74 8007C9D4 27B000A0 */ addiu $s0, $sp, 0xa0 /* AF3B78 8007C9D8 10000D73 */ b .L8007FFA8 -/* AF3B7C 8007C9DC 00000000 */ nop +/* AF3B7C 8007C9DC 00000000 */ nop .L8007C9E0: /* AF3B80 8007C9E0 24D8EFFC */ addiu $t8, $a2, -0x1004 /* AF3B84 8007C9E4 2F01007A */ sltiu $at, $t8, 0x7a @@ -721,7 +721,7 @@ glabel func_8007C850 /* AF3B94 8007C9F4 00380821 */ addu $at, $at, $t8 /* AF3B98 8007C9F8 8C38CE48 */ lw $t8, %lo(jtbl_8013CE48)($at) /* AF3B9C 8007C9FC 03000008 */ jr $t8 -/* AF3BA0 8007CA00 00000000 */ nop +/* AF3BA0 8007CA00 00000000 */ nop .L8007CA04: /* AF3BA4 8007CA04 28C10D7B */ slti $at, $a2, 0xd7b /* AF3BA8 8007CA08 14200009 */ bnez $at, .L8007CA30 @@ -733,7 +733,7 @@ glabel func_8007C850 /* AF3BC0 8007CA20 00390821 */ addu $at, $at, $t9 /* AF3BC4 8007CA24 8C39D030 */ lw $t9, %lo(jtbl_8013D030)($at) /* AF3BC8 8007CA28 03200008 */ jr $t9 -/* AF3BCC 8007CA2C 00000000 */ nop +/* AF3BCC 8007CA2C 00000000 */ nop .L8007CA30: /* AF3BD0 8007CA30 28C10CBE */ slti $at, $a2, 0xcbe /* AF3BD4 8007CA34 14200009 */ bnez $at, .L8007CA5C @@ -745,7 +745,7 @@ glabel func_8007C850 /* AF3BEC 8007CA4C 002D0821 */ addu $at, $at, $t5 /* AF3BF0 8007CA50 8C2DD08C */ lw $t5, %lo(jtbl_8013D08C)($at) /* AF3BF4 8007CA54 01A00008 */ jr $t5 -/* AF3BF8 8007CA58 00000000 */ nop +/* AF3BF8 8007CA58 00000000 */ nop .L8007CA5C: /* AF3BFC 8007CA5C 24CEF36C */ addiu $t6, $a2, -0xc94 /* AF3C00 8007CA60 2DC1002A */ sltiu $at, $t6, 0x2a @@ -755,7 +755,7 @@ glabel func_8007C850 /* AF3C10 8007CA70 002E0821 */ addu $at, $at, $t6 /* AF3C14 8007CA74 8C2ED310 */ lw $t6, %lo(jtbl_8013D310)($at) /* AF3C18 8007CA78 01C00008 */ jr $t6 -/* AF3C1C 8007CA7C 00000000 */ nop +/* AF3C1C 8007CA7C 00000000 */ nop .L8007CA80: /* AF3C20 8007CA80 28C10925 */ slti $at, $a2, 0x925 /* AF3C24 8007CA84 14200010 */ bnez $at, .L8007CAC8 @@ -769,13 +769,13 @@ glabel func_8007C850 /* AF3C44 8007CAA4 002F0821 */ addu $at, $at, $t7 /* AF3C48 8007CAA8 8C2FD3B8 */ lw $t7, %lo(jtbl_8013D3B8)($at) /* AF3C4C 8007CAAC 01E00008 */ jr $t7 -/* AF3C50 8007CAB0 00000000 */ nop +/* AF3C50 8007CAB0 00000000 */ nop .L8007CAB4: /* AF3C54 8007CAB4 2401092E */ li $at, 2350 /* AF3C58 8007CAB8 10C10261 */ beq $a2, $at, .L8007D440 -/* AF3C5C 8007CABC 00000000 */ nop +/* AF3C5C 8007CABC 00000000 */ nop /* AF3C60 8007CAC0 10000D39 */ b .L8007FFA8 -/* AF3C64 8007CAC4 00000000 */ nop +/* AF3C64 8007CAC4 00000000 */ nop .L8007CAC8: /* AF3C68 8007CAC8 240108E8 */ li $at, 2280 /* AF3C6C 8007CACC 10C10196 */ beq $a2, $at, .L8007D128 @@ -783,9 +783,9 @@ glabel func_8007C850 /* AF3C74 8007CAD4 10C10311 */ beq $a2, $at, .L8007D71C /* AF3C78 8007CAD8 24010924 */ li $at, 2340 /* AF3C7C 8007CADC 10C10236 */ beq $a2, $at, .L8007D3B8 -/* AF3C80 8007CAE0 00000000 */ nop +/* AF3C80 8007CAE0 00000000 */ nop /* AF3C84 8007CAE4 10000D30 */ b .L8007FFA8 -/* AF3C88 8007CAE8 00000000 */ nop +/* AF3C88 8007CAE8 00000000 */ nop .L8007CAEC: /* AF3C8C 8007CAEC 28C10899 */ slti $at, $a2, 0x899 /* AF3C90 8007CAF0 1420000D */ bnez $at, .L8007CB28 @@ -799,9 +799,9 @@ glabel func_8007C850 /* AF3CB0 8007CB10 10C100E7 */ beq $a2, $at, .L8007CEB0 /* AF3CB4 8007CB14 240108DE */ li $at, 2270 /* AF3CB8 8007CB18 10C1011C */ beq $a2, $at, .L8007CF8C -/* AF3CBC 8007CB1C 00000000 */ nop +/* AF3CBC 8007CB1C 00000000 */ nop /* AF3CC0 8007CB20 10000D21 */ b .L8007FFA8 -/* AF3CC4 8007CB24 00000000 */ nop +/* AF3CC4 8007CB24 00000000 */ nop .L8007CB28: /* AF3CC8 8007CB28 240103E8 */ li $at, 1000 /* AF3CCC 8007CB2C 10C10C18 */ beq $a2, $at, .L8007FB90 @@ -817,7 +817,7 @@ glabel func_8007C850 /* AF3CF4 8007CB54 50C10248 */ beql $a2, $at, .L8007D478 /* AF3CF8 8007CB58 02402025 */ move $a0, $s2 /* AF3CFC 8007CB5C 10000D12 */ b .L8007FFA8 -/* AF3D00 8007CB60 00000000 */ nop +/* AF3D00 8007CB60 00000000 */ nop .L8007CB64: /* AF3D04 8007CB64 87B800FA */ lh $t8, 0xfa($sp) /* AF3D08 8007CB68 2B010014 */ slti $at, $t8, 0x14 @@ -915,7 +915,7 @@ glabel func_8007C850 /* AF3E70 8007CCD0 C64600D0 */ lwc1 $f6, 0xd0($s2) /* AF3E74 8007CCD4 27050050 */ addiu $a1, $t8, 0x50 /* AF3E78 8007CCD8 2706005C */ addiu $a2, $t8, 0x5c -/* AF3E7C 8007CCDC 0C01F124 */ jal func_8007C490 +/* AF3E7C 8007CCDC 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* AF3E80 8007CCE0 E6060008 */ swc1 $f6, 8($s0) /* AF3E84 8007CCE4 87B900D6 */ lh $t9, 0xd6($sp) /* AF3E88 8007CCE8 3C018014 */ lui $at, %hi(D_8013D68C) @@ -978,7 +978,7 @@ glabel func_8007C850 /* AF3F68 8007CDC8 8FA600DC */ lw $a2, 0xdc($sp) /* AF3F6C 8007CDCC E6020058 */ swc1 $f2, 0x58($s0) /* AF3F70 8007CDD0 E6020008 */ swc1 $f2, 8($s0) -/* AF3F74 8007CDD4 0C01F124 */ jal func_8007C490 +/* AF3F74 8007CDD4 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* AF3F78 8007CDD8 24C60050 */ addiu $a2, $a2, 0x50 /* AF3F7C 8007CDDC 8FB900DC */ lw $t9, 0xdc($sp) /* AF3F80 8007CDE0 3C048012 */ lui $a0, %hi(D_801209F8) # $a0, 0x8012 @@ -1044,11 +1044,11 @@ glabel func_8007C850 /* AF4064 8007CEC4 3C01C120 */ li $at, 0xC1200000 # 0.000000 /* AF4068 8007CEC8 44816000 */ mtc1 $at, $f12 /* AF406C 8007CECC 10000004 */ b .L8007CEE0 -/* AF4070 8007CED0 00000000 */ nop +/* AF4070 8007CED0 00000000 */ nop .L8007CED4: /* AF4074 8007CED4 3C014120 */ li $at, 0x41200000 # 0.000000 /* AF4078 8007CED8 44816000 */ mtc1 $at, $f12 -/* AF407C 8007CEDC 00000000 */ nop +/* AF407C 8007CEDC 00000000 */ nop .L8007CEE0: /* AF4080 8007CEE0 0C03F66B */ jal Math_Rand_ZeroOne /* AF4084 8007CEE4 E7AC005C */ swc1 $f12, 0x5c($sp) @@ -1069,11 +1069,11 @@ glabel func_8007C850 /* AF40C0 8007CF20 3C0141A0 */ li $at, 0x41A00000 # 0.000000 /* AF40C4 8007CF24 44816000 */ mtc1 $at, $f12 /* AF40C8 8007CF28 10000004 */ b .L8007CF3C -/* AF40CC 8007CF2C 00000000 */ nop +/* AF40CC 8007CF2C 00000000 */ nop .L8007CF30: /* AF40D0 8007CF30 3C01C1A0 */ li $at, 0xC1A00000 # 0.000000 /* AF40D4 8007CF34 44816000 */ mtc1 $at, $f12 -/* AF40D8 8007CF38 00000000 */ nop +/* AF40D8 8007CF38 00000000 */ nop .L8007CF3C: /* AF40DC 8007CF3C 0C03F66B */ jal Math_Rand_ZeroOne /* AF40E0 8007CF40 E7AC005C */ swc1 $f12, 0x5c($sp) @@ -1110,10 +1110,10 @@ glabel func_8007C850 /* AF4154 8007CFB4 51A10021 */ beql $t5, $at, .L8007D03C /* AF4158 8007CFB8 8FAE0084 */ lw $t6, 0x84($sp) /* AF415C 8007CFBC 0C03F66B */ jal Math_Rand_ZeroOne -/* AF4160 8007CFC0 00000000 */ nop +/* AF4160 8007CFC0 00000000 */ nop /* AF4164 8007CFC4 3C0140A0 */ li $at, 0x40A00000 # 0.000000 /* AF4168 8007CFC8 44815000 */ mtc1 $at, $f10 -/* AF416C 8007CFCC 00000000 */ nop +/* AF416C 8007CFCC 00000000 */ nop /* AF4170 8007CFD0 460A0402 */ mul.s $f16, $f0, $f10 /* AF4174 8007CFD4 0C03F66B */ jal Math_Rand_ZeroOne /* AF4178 8007CFD8 E6100010 */ swc1 $f16, 0x10($s0) @@ -1157,11 +1157,11 @@ glabel func_8007C850 /* AF420C 8007D06C 3C014040 */ li $at, 0x40400000 # 0.000000 /* AF4210 8007D070 44811000 */ mtc1 $at, $f2 /* AF4214 8007D074 10000004 */ b .L8007D088 -/* AF4218 8007D078 00000000 */ nop +/* AF4218 8007D078 00000000 */ nop .L8007D07C: /* AF421C 8007D07C 3C01C040 */ li $at, 0xC0400000 # 0.000000 /* AF4220 8007D080 44811000 */ mtc1 $at, $f2 -/* AF4224 8007D084 00000000 */ nop +/* AF4224 8007D084 00000000 */ nop .L8007D088: /* AF4228 8007D088 0C03F66B */ jal Math_Rand_ZeroOne /* AF422C 8007D08C E7A20060 */ swc1 $f2, 0x60($sp) @@ -1218,10 +1218,10 @@ glabel func_8007C850 /* AF42F0 8007D150 51E10021 */ beql $t7, $at, .L8007D1D8 /* AF42F4 8007D154 8FB80084 */ lw $t8, 0x84($sp) /* AF42F8 8007D158 0C03F66B */ jal Math_Rand_ZeroOne -/* AF42FC 8007D15C 00000000 */ nop +/* AF42FC 8007D15C 00000000 */ nop /* AF4300 8007D160 3C0141A0 */ li $at, 0x41A00000 # 0.000000 /* AF4304 8007D164 44819000 */ mtc1 $at, $f18 -/* AF4308 8007D168 00000000 */ nop +/* AF4308 8007D168 00000000 */ nop /* AF430C 8007D16C 46120102 */ mul.s $f4, $f0, $f18 /* AF4310 8007D170 0C03F66B */ jal Math_Rand_ZeroOne /* AF4314 8007D174 E6040010 */ swc1 $f4, 0x10($s0) @@ -1265,11 +1265,11 @@ glabel func_8007C850 /* AF43A8 8007D208 3C014040 */ li $at, 0x40400000 # 0.000000 /* AF43AC 8007D20C 44811000 */ mtc1 $at, $f2 /* AF43B0 8007D210 10000004 */ b .L8007D224 -/* AF43B4 8007D214 00000000 */ nop +/* AF43B4 8007D214 00000000 */ nop .L8007D218: /* AF43B8 8007D218 3C01C040 */ li $at, 0xC0400000 # 0.000000 /* AF43BC 8007D21C 44811000 */ mtc1 $at, $f2 -/* AF43C0 8007D220 00000000 */ nop +/* AF43C0 8007D220 00000000 */ nop .L8007D224: /* AF43C4 8007D224 0C03F66B */ jal Math_Rand_ZeroOne /* AF43C8 8007D228 E7A20060 */ swc1 $f2, 0x60($sp) @@ -1351,7 +1351,7 @@ glabel func_8007C850 /* AF44F0 8007D350 44818000 */ mtc1 $at, $f16 /* AF44F4 8007D354 C68A002C */ lwc1 $f10, 0x2c($s4) /* AF44F8 8007D358 4610503C */ c.lt.s $f10, $f16 -/* AF44FC 8007D35C 00000000 */ nop +/* AF44FC 8007D35C 00000000 */ nop /* AF4500 8007D360 45000008 */ bc1f .L8007D384 /* AF4504 8007D364 3C028012 */ lui $v0, %hi(D_80120FA4) # $v0, 0x8012 /* AF4508 8007D368 24420FA4 */ addiu $v0, %lo(D_80120FA4) # addiu $v0, $v0, 0xfa4 @@ -1548,7 +1548,7 @@ glabel func_8007C850 /* AF47EC 8007D64C 0C00084C */ jal osSyncPrintf /* AF47F0 8007D650 F7A40020 */ sdc1 $f4, 0x20($sp) /* AF47F4 8007D654 0C03F66B */ jal Math_Rand_ZeroOne -/* AF47F8 8007D658 00000000 */ nop +/* AF47F8 8007D658 00000000 */ nop /* AF47FC 8007D65C 3C0142F0 */ li $at, 0x42F00000 # 0.000000 /* AF4800 8007D660 44811000 */ mtc1 $at, $f2 /* AF4804 8007D664 C7AA00C0 */ lwc1 $f10, 0xc0($sp) @@ -1728,7 +1728,7 @@ glabel func_8007C850 .L8007D904: /* AF4AA4 8007D904 27A400D0 */ addiu $a0, $sp, 0xd0 /* AF4AA8 8007D908 26850024 */ addiu $a1, $s4, 0x24 -/* AF4AAC 8007D90C 0C01F124 */ jal func_8007C490 +/* AF4AAC 8007D90C 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* AF4AB0 8007D910 26260024 */ addiu $a2, $s1, 0x24 /* AF4AB4 8007D914 87AF00D6 */ lh $t7, 0xd6($sp) /* AF4AB8 8007D918 3C018014 */ lui $at, %hi(D_8013D690) @@ -1744,9 +1744,9 @@ glabel func_8007C850 /* AF4AE0 8007D940 0C03F66B */ jal Math_Rand_ZeroOne /* AF4AE4 8007D944 E6000020 */ swc1 $f0, 0x20($s0) /* AF4AE8 8007D948 44808000 */ mtc1 $zero, $f16 -/* AF4AEC 8007D94C 00000000 */ nop +/* AF4AEC 8007D94C 00000000 */ nop /* AF4AF0 8007D950 4610003C */ c.lt.s $f0, $f16 -/* AF4AF4 8007D954 00000000 */ nop +/* AF4AF4 8007D954 00000000 */ nop /* AF4AF8 8007D958 45020005 */ bc1fl .L8007D970 /* AF4AFC 8007D95C 02402025 */ move $a0, $s2 /* AF4B00 8007D960 C6060094 */ lwc1 $f6, 0x94($s0) @@ -1933,7 +1933,7 @@ glabel L8007DBF8 /* AF4DB4 8007DC14 8DF8009C */ lw $t8, 0x9c($t7) /* AF4DB8 8007DC18 33190001 */ andi $t9, $t8, 1 /* AF4DBC 8007DC1C 1320000D */ beqz $t9, .L8007DC54 -/* AF4DC0 8007DC20 00000000 */ nop +/* AF4DC0 8007DC20 00000000 */ nop /* AF4DC4 8007DC24 C60A0010 */ lwc1 $f10, 0x10($s0) /* AF4DC8 8007DC28 C610001C */ lwc1 $f16, 0x1c($s0) /* AF4DCC 8007DC2C C6080038 */ lwc1 $f8, 0x38($s0) @@ -1948,7 +1948,7 @@ glabel L8007DBF8 /* AF4DF0 8007DC50 E6040044 */ swc1 $f4, 0x44($s0) .L8007DC54: /* AF4DF4 8007DC54 0C03F66B */ jal Math_Rand_ZeroOne -/* AF4DF8 8007DC58 00000000 */ nop +/* AF4DF8 8007DC58 00000000 */ nop /* AF4DFC 8007DC5C 3C014170 */ li $at, 0x41700000 # 0.000000 /* AF4E00 8007DC60 44818000 */ mtc1 $at, $f16 /* AF4E04 8007DC64 C606001C */ lwc1 $f6, 0x1c($s0) @@ -2639,7 +2639,7 @@ glabel L8007E5DC /* AF585C 8007E6BC 02A03025 */ move $a2, $s5 /* AF5860 8007E6C0 E7B200C4 */ swc1 $f18, 0xc4($sp) /* AF5864 8007E6C4 E7B000C0 */ swc1 $f16, 0xc0($sp) -/* AF5868 8007E6C8 0C01F124 */ jal func_8007C490 +/* AF5868 8007E6C8 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* AF586C 8007E6CC E7AA00C8 */ swc1 $f10, 0xc8($sp) /* AF5870 8007E6D0 3C0142F0 */ li $at, 0x42F00000 # 0.000000 /* AF5874 8007E6D4 44812000 */ mtc1 $at, $f4 @@ -2750,7 +2750,7 @@ glabel L8007E824 /* AF5A10 8007E870 02802825 */ move $a1, $s4 /* AF5A14 8007E874 27A400D0 */ addiu $a0, $sp, 0xd0 /* AF5A18 8007E878 02202825 */ move $a1, $s1 -/* AF5A1C 8007E87C 0C01F124 */ jal func_8007C490 +/* AF5A1C 8007E87C 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* AF5A20 8007E880 02003025 */ move $a2, $s0 /* AF5A24 8007E884 87AD00D6 */ lh $t5, 0xd6($sp) /* AF5A28 8007E888 3C0143C8 */ li $at, 0x43C80000 # 0.000000 @@ -2827,7 +2827,7 @@ glabel L8007E914 /* AF5B3C 8007E99C C42AD6CC */ lwc1 $f10, %lo(D_8013D6CC)($at) /* AF5B40 8007E9A0 C7A400A8 */ lwc1 $f4, 0xa8($sp) /* AF5B44 8007E9A4 4604503C */ c.lt.s $f10, $f4 -/* AF5B48 8007E9A8 00000000 */ nop +/* AF5B48 8007E9A8 00000000 */ nop /* AF5B4C 8007E9AC 4500000E */ bc1f .L8007E9E8 /* AF5B50 8007E9B0 3C128012 */ lui $s2, %hi(D_801208E4) # $s2, 0x8012 /* AF5B54 8007E9B4 3C0D8012 */ lui $t5, %hi(D_80120820) # $t5, 0x8012 @@ -3173,7 +3173,7 @@ glabel L8007EE90 /* AF6080 8007EEE0 E6080008 */ swc1 $f8, 8($s0) /* AF6084 8007EEE4 C62A0024 */ lwc1 $f10, 0x24($s1) /* AF6088 8007EEE8 460A903C */ c.lt.s $f18, $f10 -/* AF608C 8007EEEC 00000000 */ nop +/* AF608C 8007EEEC 00000000 */ nop /* AF6090 8007EEF0 45000012 */ bc1f .L8007EF3C /* AF6094 8007EEF4 3C014248 */ li $at, 0x42480000 # 0.000000 /* AF6098 8007EEF8 C6040038 */ lwc1 $f4, 0x38($s0) @@ -3617,7 +3617,7 @@ glabel L8007F588 /* AF672C 8007F58C 44818000 */ mtc1 $at, $f16 /* AF6730 8007F590 C684002C */ lwc1 $f4, 0x2c($s4) /* AF6734 8007F594 4610203C */ c.lt.s $f4, $f16 -/* AF6738 8007F598 00000000 */ nop +/* AF6738 8007F598 00000000 */ nop /* AF673C 8007F59C 45000004 */ bc1f .L8007F5B0 /* AF6740 8007F5A0 3C188012 */ lui $t8, %hi(D_80122C3C) # $t8, 0x8012 /* AF6744 8007F5A4 27182C3C */ addiu $t8, %lo(D_80122C3C) # addiu $t8, $t8, 0x2c3c @@ -3887,11 +3887,11 @@ glabel L8007F6E8 /* AF6B24 8007F984 3C0142C8 */ li $at, 0x42C80000 # 0.000000 /* AF6B28 8007F988 44816000 */ mtc1 $at, $f12 /* AF6B2C 8007F98C 10000004 */ b .L8007F9A0 -/* AF6B30 8007F990 00000000 */ nop +/* AF6B30 8007F990 00000000 */ nop .L8007F994: /* AF6B34 8007F994 3C0142F0 */ li $at, 0x42F00000 # 0.000000 /* AF6B38 8007F998 44816000 */ mtc1 $at, $f12 -/* AF6B3C 8007F99C 00000000 */ nop +/* AF6B3C 8007F99C 00000000 */ nop .L8007F9A0: /* AF6B40 8007F9A0 3C118012 */ lui $s1, %hi(D_801231B4) # lui $s1, 0x8012 /* AF6B44 8007F9A4 263131B4 */ addiu $s1, %lo(D_801231B4) # addiu $s1, $s1, 0x31b4 @@ -3902,7 +3902,7 @@ glabel L8007F6E8 /* AF6B58 8007F9B8 07030005 */ bgezl $t8, .L8007F9D0 /* AF6B5C 8007F9BC 27B000A0 */ addiu $s0, $sp, 0xa0 /* AF6B60 8007F9C0 44804000 */ mtc1 $zero, $f8 -/* AF6B64 8007F9C4 00000000 */ nop +/* AF6B64 8007F9C4 00000000 */ nop /* AF6B68 8007F9C8 E6280068 */ swc1 $f8, 0x68($s1) /* AF6B6C 8007F9CC 27B000A0 */ addiu $s0, $sp, 0xa0 .L8007F9D0: @@ -3912,7 +3912,7 @@ glabel L8007F6E8 /* AF6B7C 8007F9DC 8FA600DC */ lw $a2, 0xdc($sp) /* AF6B80 8007F9E0 27A400D0 */ addiu $a0, $sp, 0xd0 /* AF6B84 8007F9E4 02002825 */ move $a1, $s0 -/* AF6B88 8007F9E8 0C01F124 */ jal func_8007C490 +/* AF6B88 8007F9E8 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* AF6B8C 8007F9EC 24C60050 */ addiu $a2, $a2, 0x50 /* AF6B90 8007F9F0 87B900D6 */ lh $t9, 0xd6($sp) /* AF6B94 8007F9F4 87AD00AE */ lh $t5, 0xae($sp) @@ -3920,12 +3920,12 @@ glabel L8007F6E8 /* AF6B9C 8007F9FC 2484323C */ addiu $a0, %lo(D_8012323C) # addiu $a0, $a0, 0x323c /* AF6BA0 8007FA00 032D7023 */ subu $t6, $t9, $t5 /* AF6BA4 8007FA04 A7AE00D6 */ sh $t6, 0xd6($sp) -/* AF6BA8 8007FA08 0C01F097 */ jal func_8007C25C +/* AF6BA8 8007FA08 0C01F097 */ jal OLib_VecSphRot90ToVec3f /* AF6BAC 8007FA0C 27A500D0 */ addiu $a1, $sp, 0xd0 /* AF6BB0 8007FA10 8FA600DC */ lw $a2, 0xdc($sp) /* AF6BB4 8007FA14 27A400D0 */ addiu $a0, $sp, 0xd0 /* AF6BB8 8007FA18 02002825 */ move $a1, $s0 -/* AF6BBC 8007FA1C 0C01F124 */ jal func_8007C490 +/* AF6BBC 8007FA1C 0C01F124 */ jal OLib_Vec3fDiffToVecSphRot90 /* AF6BC0 8007FA20 24C6005C */ addiu $a2, $a2, 0x5c /* AF6BC4 8007FA24 87AF00D6 */ lh $t7, 0xd6($sp) /* AF6BC8 8007FA28 87B800AE */ lh $t8, 0xae($sp) @@ -3933,7 +3933,7 @@ glabel L8007F6E8 /* AF6BD0 8007FA30 24843248 */ addiu $a0, %lo(D_80123248) # addiu $a0, $a0, 0x3248 /* AF6BD4 8007FA34 01F8C823 */ subu $t9, $t7, $t8 /* AF6BD8 8007FA38 A7B900D6 */ sh $t9, 0xd6($sp) -/* AF6BDC 8007FA3C 0C01F097 */ jal func_8007C25C +/* AF6BDC 8007FA3C 0C01F097 */ jal OLib_VecSphRot90ToVec3f /* AF6BE0 8007FA40 27A500D0 */ addiu $a1, $sp, 0xd0 /* AF6BE4 8007FA44 8FAD00DC */ lw $t5, 0xdc($sp) /* AF6BE8 8007FA48 87AE00FA */ lh $t6, 0xfa($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098AAE4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098AAE4.s index 72a23ac8d1..fde8c4f3b8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098AAE4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098AAE4.s @@ -1,34 +1,34 @@ glabel func_8098AAE4 /* 01C64 8098AAE4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 01C68 8098AAE8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01C6C 8098AAEC AFA40030 */ sw $a0, 0x0030($sp) +/* 01C68 8098AAE8 AFBF0014 */ sw $ra, 0x0014($sp) +/* 01C6C 8098AAEC AFA40030 */ sw $a0, 0x0030($sp) /* 01C70 8098AAF0 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 01C74 8098AAF4 AFA70034 */ sw $a3, 0x0034($sp) +/* 01C74 8098AAF4 AFA70034 */ sw $a3, 0x0034($sp) /* 01C78 8098AAF8 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 01C7C 8098AAFC 0C01F097 */ jal func_8007C25C +/* 01C7C 8098AAFC 0C01F097 */ jal OLib_VecSphRot90ToVec3f /* 01C80 8098AB00 27A40018 */ addiu $a0, $sp, 0x0018 ## $a0 = FFFFFFE8 -/* 01C84 8098AB04 8FA70034 */ lw $a3, 0x0034($sp) -/* 01C88 8098AB08 C7A60018 */ lwc1 $f6, 0x0018($sp) -/* 01C8C 8098AB0C C7B0001C */ lwc1 $f16, 0x001C($sp) +/* 01C84 8098AB04 8FA70034 */ lw $a3, 0x0034($sp) +/* 01C88 8098AB08 C7A60018 */ lwc1 $f6, 0x0018($sp) +/* 01C8C 8098AB0C C7B0001C */ lwc1 $f16, 0x001C($sp) /* 01C90 8098AB10 C4E40000 */ lwc1 $f4, 0x0000($a3) ## 00000000 /* 01C94 8098AB14 27AE0024 */ addiu $t6, $sp, 0x0024 ## $t6 = FFFFFFF4 -/* 01C98 8098AB18 8FA20030 */ lw $v0, 0x0030($sp) -/* 01C9C 8098AB1C 46062200 */ add.s $f8, $f4, $f6 -/* 01CA0 8098AB20 C7A60020 */ lwc1 $f6, 0x0020($sp) -/* 01CA4 8098AB24 E7A80024 */ swc1 $f8, 0x0024($sp) +/* 01C98 8098AB18 8FA20030 */ lw $v0, 0x0030($sp) +/* 01C9C 8098AB1C 46062200 */ add.s $f8, $f4, $f6 +/* 01CA0 8098AB20 C7A60020 */ lwc1 $f6, 0x0020($sp) +/* 01CA4 8098AB24 E7A80024 */ swc1 $f8, 0x0024($sp) /* 01CA8 8098AB28 C4EA0004 */ lwc1 $f10, 0x0004($a3) ## 00000004 -/* 01CAC 8098AB2C 46105480 */ add.s $f18, $f10, $f16 -/* 01CB0 8098AB30 E7B20028 */ swc1 $f18, 0x0028($sp) +/* 01CAC 8098AB2C 46105480 */ add.s $f18, $f10, $f16 +/* 01CB0 8098AB30 E7B20028 */ swc1 $f18, 0x0028($sp) /* 01CB4 8098AB34 C4E40008 */ lwc1 $f4, 0x0008($a3) ## 00000008 -/* 01CB8 8098AB38 46062200 */ add.s $f8, $f4, $f6 -/* 01CBC 8098AB3C E7A8002C */ swc1 $f8, 0x002C($sp) +/* 01CB8 8098AB38 46062200 */ add.s $f8, $f4, $f6 +/* 01CBC 8098AB3C E7A8002C */ swc1 $f8, 0x002C($sp) /* 01CC0 8098AB40 8DD80000 */ lw $t8, 0x0000($t6) ## FFFFFFF4 /* 01CC4 8098AB44 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 /* 01CC8 8098AB48 8DCF0004 */ lw $t7, 0x0004($t6) ## FFFFFFF8 /* 01CCC 8098AB4C AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 /* 01CD0 8098AB50 8DD80008 */ lw $t8, 0x0008($t6) ## FFFFFFFC /* 01CD4 8098AB54 AC580008 */ sw $t8, 0x0008($v0) ## 00000008 -/* 01CD8 8098AB58 8FBF0014 */ lw $ra, 0x0014($sp) +/* 01CD8 8098AB58 8FBF0014 */ lw $ra, 0x0014($sp) /* 01CDC 8098AB5C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01CE0 8098AB60 03E00008 */ jr $ra +/* 01CE0 8098AB60 03E00008 */ jr $ra /* 01CE4 8098AB64 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098AB68.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098AB68.s index aea531e4b4..4f2359437b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098AB68.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098AB68.s @@ -1,23 +1,23 @@ glabel func_8098AB68 /* 01CE8 8098AB68 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 01CEC 8098AB6C AFA40030 */ sw $a0, 0x0030($sp) -/* 01CF0 8098AB70 AFBF0014 */ sw $ra, 0x0014($sp) +/* 01CEC 8098AB6C AFA40030 */ sw $a0, 0x0030($sp) +/* 01CF0 8098AB70 AFBF0014 */ sw $ra, 0x0014($sp) /* 01CF4 8098AB74 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 01CF8 8098AB78 AFA60038 */ sw $a2, 0x0038($sp) -/* 01CFC 8098AB7C 0C262AB2 */ jal func_8098AAC8 +/* 01CF8 8098AB78 AFA60038 */ sw $a2, 0x0038($sp) +/* 01CFC 8098AB7C 0C262AB2 */ jal func_8098AAC8 /* 01D00 8098AB80 27A5001C */ addiu $a1, $sp, 0x001C ## $a1 = FFFFFFEC /* 01D04 8098AB84 27A40028 */ addiu $a0, $sp, 0x0028 ## $a0 = FFFFFFF8 -/* 01D08 8098AB88 0C01F0FD */ jal func_8007C3F4 +/* 01D08 8098AB88 0C01F0FD */ jal OLib_Vec3fToVecSphRot90 /* 01D0C 8098AB8C 27A5001C */ addiu $a1, $sp, 0x001C ## $a1 = FFFFFFEC -/* 01D10 8098AB90 8FA50030 */ lw $a1, 0x0030($sp) -/* 01D14 8098AB94 87AE002E */ lh $t6, 0x002E($sp) -/* 01D18 8098AB98 8FA40038 */ lw $a0, 0x0038($sp) +/* 01D10 8098AB90 8FA50030 */ lw $a1, 0x0030($sp) +/* 01D14 8098AB94 87AE002E */ lh $t6, 0x002E($sp) +/* 01D18 8098AB98 8FA40038 */ lw $a0, 0x0038($sp) /* 01D1C 8098AB9C 84AF000E */ lh $t7, 0x000E($a1) ## 0000000E /* 01D20 8098ABA0 27A60028 */ addiu $a2, $sp, 0x0028 ## $a2 = FFFFFFF8 -/* 01D24 8098ABA4 01CFC021 */ addu $t8, $t6, $t7 -/* 01D28 8098ABA8 0C262AB9 */ jal func_8098AAE4 -/* 01D2C 8098ABAC A7B8002E */ sh $t8, 0x002E($sp) -/* 01D30 8098ABB0 8FBF0014 */ lw $ra, 0x0014($sp) +/* 01D24 8098ABA4 01CFC021 */ addu $t8, $t6, $t7 +/* 01D28 8098ABA8 0C262AB9 */ jal func_8098AAE4 +/* 01D2C 8098ABAC A7B8002E */ sh $t8, 0x002E($sp) +/* 01D30 8098ABB0 8FBF0014 */ lw $ra, 0x0014($sp) /* 01D34 8098ABB4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01D38 8098ABB8 03E00008 */ jr $ra +/* 01D38 8098ABB8 03E00008 */ jr $ra /* 01D3C 8098ABBC 00000000 */ nop diff --git a/include/functions.h b/include/functions.h index 31540f66b5..d05a003e9c 100644 --- a/include/functions.h +++ b/include/functions.h @@ -1017,15 +1017,15 @@ void PreNmiBuff_Init(PreNmiBuff* this); void PreNmiBuff_SetReset(PreNmiBuff* this); u32 PreNmiBuff_IsResetting(PreNmiBuff* this); void MsgEvent_SendNullTask(); -f32 func_8007BF90(Vec3f*, Vec3f*); -// ? func_8007C028(?); +f32 OLib_Vec3fDist(Vec3f*, Vec3f*); +// ? OLib_Vec3fDistXZ(?); // ? func_8007C058(?); // ? func_8007C0A8(?); -// ? func_8007C0F8(?); -// ? func_8007C25C(?); -// ? func_8007C29C(?); -VecSph* func_8007C3F4(VecSph* arg0, Vec3f* arg1); -void func_8007C490(VecSph* arg0, Vec3f* a, Vec3f* b); +// ? OLib_Vec3fDistNormalize(?); +// ? OLib_VecSphRot90ToVec3f(?); +// ? OLib_Vec3fToVecSph(?); +VecSph* OLib_Vec3fToVecSphRot90(VecSph* arg0, Vec3f* arg1); +VecSph* OLib_Vec3fDiffToVecSphRot90(VecSph* arg0, Vec3f* a, Vec3f* b); // ? func_8007C4E0(?); // ? func_8007C680(?); // ? func_8007C704(?); diff --git a/spec b/spec index 356035f7d2..63326a906d 100644 --- a/spec +++ b/spec @@ -330,7 +330,7 @@ beginseg include "build/src/code/z_moji.o" include "build/src/code/z_prenmi_buff.o" include "build/src/code/z_msgevent.o" - include "build/src/code/code_8007BF90.o" + include "build/src/code/z_olib.o" include "build/src/code/z_onepointdemo.o" include "build/data/z_onepointdemo.data.o" include "build/src/code/z_map_exp.o" diff --git a/src/code/z_camera.c b/src/code/z_camera.c index dbcb35a051..510340516b 100644 --- a/src/code/z_camera.c +++ b/src/code/z_camera.c @@ -1850,7 +1850,7 @@ Vec3f* func_80043BC4(Vec3f* arg0, Vec3s* arg1) { Vec3f* func_80043C28(Vec3f* arg0, Vec3f* arg1, VecSph* arg2) { Vec3f sp24, sp18; - func_8007C25C(&sp18, arg2); + OLib_VecSphRot90ToVec3f(&sp18, arg2); sp24.x = arg1->x + sp18.x; sp24.y = arg1->y + sp18.y; @@ -1880,12 +1880,12 @@ s32 func_80043D18(Camera* camera, Vec3f* arg1, struct_80043D18* arg2) { VecSph sp3C; colCtx = &camera->globalCtx->colCtx; - func_8007C490(&sp3C, arg1, &arg2->unk_00); + OLib_Vec3fDiffToVecSphRot90(&sp3C, arg1, &arg2->unk_00); sp3C.r += 8.0f; func_80043C28(&sp5C, arg1, &sp3C); if (func_8003DD6C(colCtx, arg1, &sp5C, &sp68, &arg2->unk_18, 1, 1, 1, -1, &arg2->unk_24) == 0) { - func_8007C0F8(&sp50, arg1, &arg2->unk_00); + OLib_Vec3fDistNormalize(&sp50, arg1, &arg2->unk_00); arg2->unk_0C.x = -sp50.x; arg2->unk_0C.y = -sp50.y; @@ -2152,7 +2152,7 @@ f32 func_80045714(Vec3f* arg0, s16 arg1, s16 arg2, f32 arg3) { VecSph sp1C; f32 sp18; - func_8007C3F4(&sp1C, arg0); + OLib_Vec3fToVecSphRot90(&sp1C, arg0); sp18 = Math_Coss(sp1C.phi); sp18 = fabsf(Math_Coss(arg1 - sp1C.theta) * sp18); return Math_Coss(arg1 - arg2) * (sp18 * arg3); @@ -2213,7 +2213,7 @@ s32 func_800458D4(Camera* camera, VecSph* arg1, f32 arg2, f32* arg3, s16 arg4) { } sp48 = temp_s1->pos.y - *arg3; - temp_ret = Math_atan2f(sp48, func_8007C028(&camera->at, &camera->eye)); // f2 and f14 are swapped + temp_ret = Math_atan2f(sp48, OLib_Vec3fDistXZ(&camera->at, &camera->eye)); // f2 and f14 are swapped if (OREG(32) * (M_PI / 180) < temp_ret) { phi_f2 = 1.0f - sinf(temp_ret - OREG(32) * (M_PI / 180)); @@ -2509,8 +2509,8 @@ s32 Camera_Normal3(Camera* camera) { sp44 = &camera->at; sp40 = &camera->eyeNext; playerPostRot = &camera->playerPosRot; - func_8007C490(&sp7C, sp44, sp48); - func_8007C490(&sp74, sp44, sp40); + OLib_Vec3fDiffToVecSphRot90(&sp7C, sp44, sp48); + OLib_Vec3fDiffToVecSphRot90(&sp74, sp44, sp40); D_8011D3E8 = 1; D_8011D3A0.w = normal3->unk_1E; unk20 = &normal3->unk_20; @@ -2565,7 +2565,7 @@ s32 Camera_Normal3(Camera* camera) { temp_f0 + (temp_f0 * (1.0f - camera->unk_E0)), 0xF); func_800466F8(camera, &sp74, normal3->unk_00, &unk20->unk_20, 1); sp90 = (normal3->unk_08 + normal3->unk_04) * 0.5f; - func_8007C490(&sp84, sp44, sp40); + OLib_Vec3fDiffToVecSphRot90(&sp84, sp44, sp40); sp84.r = func_800469C0(camera, sp84.r, normal3->unk_04, normal3->unk_08, unk20->unk_2A); camera->dist = sp84.r; if (0.001f < camera->unk_D8) { @@ -2786,12 +2786,12 @@ s32 Camera_Unique6(Camera* camera) { playerPosRot = &camera->playerPosRot.pos; sp2C = *playerPosRot; sp2C.y += offset; - camera->dist = func_8007BF90(&sp2C, &camera->eye); + camera->dist = OLib_Vec3fDist(&sp2C, &camera->eye); camera->unk_E4.x = camera->at.x - playerPosRot->x; camera->unk_E4.y = camera->at.y - playerPosRot->y; camera->unk_E4.z = camera->at.z - playerPosRot->z; } else { - camera->dist = func_8007BF90(&camera->at, &camera->eye); + camera->dist = OLib_Vec3fDist(&camera->at, &camera->eye); } if (camera->unk_00.sh[0] & 1) { if (camera->unk_160 > 0) { @@ -2837,7 +2837,7 @@ void func_80054478(PosRot* arg0, Vec3f* arg1, Vec3f* arg2) { Vec3f sp1C; Camera_Vec3fCopy(arg1, &sp1C); - func_8007C3F4(&sp28, &sp1C); + OLib_Vec3fToVecSphRot90(&sp28, &sp1C); sp28.theta += arg0->rot.y; func_80043C28(arg2, &arg0->pos, &sp28); } @@ -2907,7 +2907,7 @@ s32 Camera_Demo1(Camera* camera) { } *eye = *eyeNext; camera->roll = sp4C * 256.0f; - camera->dist = func_8007BF90(at, eye); + camera->dist = OLib_Vec3fDist(at, eye); break; } return 1; @@ -2985,7 +2985,7 @@ s32 Camera_Special0(Camera* camera) { camera->unk_E4.x = camera->at.x - playerPosRot->x; camera->unk_E4.y = camera->at.y - playerPosRot->y; camera->unk_E4.z = camera->at.z - playerPosRot->z; - camera->dist = func_8007BF90(&camera->at, &camera->eye); + camera->dist = OLib_Vec3fDist(&camera->at, &camera->eye); camera->unk_D8 = 0.0f; if (camera->unk_160 > 0) { camera->unk_160--; @@ -3900,7 +3900,7 @@ s32 func_8005AE64(Camera* camera, Camera* otherCamera) { camera->eyeNext = sp30; camera->eye = sp30; - camera->dist = func_8007BF90(&camera->at, &camera->eye); + camera->dist = OLib_Vec3fDist(&camera->at, &camera->eye); camera->fov = otherCamera->fov; camera->roll = otherCamera->roll; func_80043B60(camera); @@ -3910,7 +3910,7 @@ s32 func_8005AE64(Camera* camera, Camera* otherCamera) { camera->unk_E4.x = camera->at.x - camera->playerPosRot.pos.x; camera->unk_E4.y = camera->at.y - camera->playerPosRot.pos.y; camera->unk_E4.z = camera->at.z - camera->playerPosRot.pos.z; - camera->dist = func_8007BF90(&camera->playerPosRot.pos, &camera->eye); + camera->dist = OLib_Vec3fDist(&camera->playerPosRot.pos, &camera->eye); camera->unk_CC.x = 1.0f; camera->unk_CC.y = 1.0f; } diff --git a/src/code/code_8007BF90.c b/src/code/z_olib.c similarity index 50% rename from src/code/code_8007BF90.c rename to src/code/z_olib.c index 9050449e4a..dae3adb11d 100644 --- a/src/code/code_8007BF90.c +++ b/src/code/z_olib.c @@ -1,9 +1,7 @@ #include #include -Vec3f* func_8007C1AC(Vec3f* dest, VecSph* arg1); - -f32 func_8007BF90(Vec3f* a, Vec3f* b) { +f32 OLib_Vec3fDist(Vec3f* a, Vec3f* b) { f32 dx = a->x - b->x; f32 dy = a->y - b->y; f32 dz = a->z - b->z; @@ -11,7 +9,7 @@ f32 func_8007BF90(Vec3f* a, Vec3f* b) { return sqrtf(SQ(dx) + SQ(dy) + SQ(dz)); } -f32 func_8007BFD0(Vec3f* a, Vec3f* b, Vec3f* dest) { +f32 OLib_Vec3fDistOutDiff(Vec3f* a, Vec3f* b, Vec3f* dest) { dest->x = a->x - b->x; dest->y = a->y - b->y; dest->z = a->z - b->z; @@ -19,7 +17,7 @@ f32 func_8007BFD0(Vec3f* a, Vec3f* b, Vec3f* dest) { return sqrtf(SQ(dest->x) + SQ(dest->y) + SQ(dest->z)); } -f32 func_8007C028(Vec3f* a, Vec3f* b) { +f32 OLib_Vec3fDistXZ(Vec3f* a, Vec3f* b) { return sqrtf(SQ(a->x - b->x) + SQ(a->z - b->z)); } @@ -31,7 +29,7 @@ f32 func_8007C0A8(f32 arg0, f32 arg1) { return (fabsf(arg0) <= arg1) ? arg0 : ((arg0 >= 0) ? arg1 : -arg1); } -Vec3f* func_8007C0F8(Vec3f* dest, Vec3f* a, Vec3f* b) { +Vec3f* OLib_Vec3fDistNormalize(Vec3f* dest, Vec3f* a, Vec3f* b) { Vec3f v1; Vec3f v2; f32 temp; @@ -51,93 +49,93 @@ Vec3f* func_8007C0F8(Vec3f* dest, Vec3f* a, Vec3f* b) { return dest; } -Vec3f* func_8007C1AC(Vec3f* dest, VecSph* arg1) { +Vec3f* OLib_VecSphToVec3f(Vec3f* dest, VecSph* sph) { Vec3f v; - f32 sin4; - f32 cos4; - f32 sin6; - f32 cos6; + f32 sinPhi; + f32 cosPhi; + f32 sinTheta; + f32 cosTheta; - cos4 = Math_Coss(arg1->phi); - cos6 = Math_Coss(arg1->theta); - sin4 = Math_Sins(arg1->phi); - sin6 = Math_Sins(arg1->theta); + cosPhi = Math_Coss(sph->phi); + cosTheta = Math_Coss(sph->theta); + sinPhi = Math_Sins(sph->phi); + sinTheta = Math_Sins(sph->theta); - v.x = arg1->r * sin4 * sin6; - v.y = arg1->r * cos4; - v.z = arg1->r * sin4 * cos6; + v.x = sph->r * sinPhi * sinTheta; + v.y = sph->r * cosPhi; + v.z = sph->r * sinPhi * cosTheta; *dest = v; return dest; } -void func_8007C25C(Vec3f* dest, VecSph* arg1) { - VecSph var; +void OLib_VecSphRot90ToVec3f(Vec3f* dest, VecSph* sph) { + VecSph src; - var.r = arg1->r; - var.phi = 0x3FFF - arg1->phi; - var.theta = arg1->theta; + src.r = sph->r; + src.phi = 0x3FFF - sph->phi; + src.theta = sph->theta; - func_8007C1AC(dest, &var); + OLib_VecSphToVec3f(dest, &src); } -VecSph* func_8007C29C(VecSph* arg0, Vec3f* arg1) { - VecSph sp28; +VecSph* OLib_Vec3fToVecSph(VecSph* dest, Vec3f* vec) { + VecSph sph; f32 distSquared; f32 dist; - distSquared = SQ(arg1->x) + SQ(arg1->z); + distSquared = SQ(vec->x) + SQ(vec->z); dist = sqrtf(distSquared); - if ((dist == 0.0f) && (arg1->y == 0.0f)) { - sp28.phi = 0; + if ((dist == 0.0f) && (vec->y == 0.0f)) { + sph.phi = 0; } else { - sp28.phi = Math_atan2f(dist, arg1->y) * 57.295776f * 182.04167f + 0.5f; + sph.phi = Math_atan2f(dist, vec->y) * 57.295776f * 182.04167f + 0.5f; } - sp28.r = sqrtf(SQ(arg1->y) + distSquared); - if ((arg1->x == 0.0f) && (arg1->z == 0.0f)) { - sp28.theta = 0; + sph.r = sqrtf(SQ(vec->y) + distSquared); + if ((vec->x == 0.0f) && (vec->z == 0.0f)) { + sph.theta = 0; } else { - sp28.theta = Math_atan2f(arg1->x, arg1->z) * 57.295776f * 182.04167f + 0.5f; + sph.theta = Math_atan2f(vec->x, vec->z) * 57.295776f * 182.04167f + 0.5f; } - *arg0 = sp28; + *dest = sph; - return arg0; + return dest; } -VecSph* func_8007C3F4(VecSph* arg0, Vec3f* arg1) { - VecSph sp18; +VecSph* OLib_Vec3fToVecSphRot90(VecSph* dest, Vec3f* vec) { + VecSph sph; - func_8007C29C(&sp18, arg1); - sp18.phi = 0x3FFF - sp18.phi; + OLib_Vec3fToVecSph(&sph, vec); + sph.phi = 0x3FFF - sph.phi; - *arg0 = sp18; + *dest = sph; - return arg0; + return dest; } -void func_8007C440(VecSph* arg0, Vec3f* a, Vec3f* b) { - Vec3f var; +VecSph* OLib_Vec3fDiffToVecSph(VecSph* dest, Vec3f* a, Vec3f* b) { + Vec3f sph; - var.x = b->x - a->x; - var.y = b->y - a->y; - var.z = b->z - a->z; + sph.x = b->x - a->x; + sph.y = b->y - a->y; + sph.z = b->z - a->z; - func_8007C29C(arg0, &var); + return OLib_Vec3fToVecSph(dest, &sph); } -void func_8007C490(VecSph* arg0, Vec3f* a, Vec3f* b) { - Vec3f var; +VecSph* OLib_Vec3fDiffToVecSphRot90(VecSph* dest, Vec3f* a, Vec3f* b) { + Vec3f sph; - var.x = b->x - a->x; - var.y = b->y - a->y; - var.z = b->z - a->z; + sph.x = b->x - a->x; + sph.y = b->y - a->y; + sph.z = b->z - a->z; - func_8007C3F4(arg0, &var); + return OLib_Vec3fToVecSphRot90(dest, &sph); } Vec3f* func_8007C4E0(Vec3f* dest, Vec3f* a, Vec3f* b) { diff --git a/src/code/z_quake.c b/src/code/z_quake.c index be31c4fd68..379fa03e78 100644 --- a/src/code/z_quake.c +++ b/src/code/z_quake.c @@ -13,7 +13,7 @@ Vec3f* Quake_AddVec(Vec3f* dst, Vec3f* arg1, VecSph* arg2) { Vec3f vec1; Vec3f vec2; - func_8007C25C(&vec2, arg2); + OLib_VecSphRot90ToVec3f(&vec2, arg2); vec1.x = arg1->x + vec2.x; vec1.y = arg1->y + vec2.y; vec1.z = arg1->z + vec2.z; @@ -34,7 +34,7 @@ void Quake_UpdateShakeInfo(QuakeRequest* req, ShakeInfo* shake, f32 y, f32 x) { vec.x = 0; vec.y = 0; vec.z = 0; - func_8007C490(&struc1, unk5C, unk50); + OLib_Vec3fDiffToVecSphRot90(&struc1, unk5C, unk50); struc2.r = req->y * y; struc2.phi = struc1.phi + req->unk_14.unk_00 + 0x4000; struc2.theta = struc1.theta + req->unk_14.unk_02; @@ -367,8 +367,8 @@ s16 Quake_Calc(Camera* camera, UnkQuakeCalcStruct* camData) { camData->zoom = shake.zoom; } - max = func_8007BF90(&shake.vec1, &vec) * absSpeedDiv; - max2 = func_8007BF90(&shake.vec2, &vec) * absSpeedDiv; + max = OLib_Vec3fDist(&shake.vec1, &vec) * absSpeedDiv; + max2 = OLib_Vec3fDist(&shake.vec2, &vec) * absSpeedDiv; if (max < max2) { max = max2; }