mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-05-10 11:03:46 +00:00
Code Issues Projects Releases Wiki Activity

rename code_8007BF90.c to z_olib.c, rename functions in z_olib.c (#181)

Browse source 
* rename code_8007BF90.c to z_olib.c, rename functions in z_olib.c

* pr updates
This commit is contained in:
krimtonz 2020-06-04 00:59:17 -05:00 • committed by GitHub
parent 69e30364b9
commit d6fc300ed2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
56 changed files with 501 additions and 503 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
asm/non_matchings/code/db_camera/func_800B3B50.s
View file

@ -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)

4
asm/non_matchings/code/db_camera/func_800B3F94.s
View file

@ -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

2
asm/non_matchings/code/db_camera/func_800B3FF4.s
View file

@ -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)

18
asm/non_matchings/code/db_camera/func_800B4E7C.s
View file

@ -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:
@ -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)
@ -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
@ -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)
@ -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)
@ -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)
@ -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)

2
asm/non_matchings/code/db_camera/func_800B9638.s
View file

@ -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)

12
asm/non_matchings/code/z_camera/Camera_Battle1.s
View file

@ -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)

4
asm/non_matchings/code/z_camera/Camera_Battle4.s
View file

@ -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

6
asm/non_matchings/code/z_camera/Camera_Data4.s
View file

@ -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)

2
asm/non_matchings/code/z_camera/Camera_Demo1.s
View file

@ -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)

12
asm/non_matchings/code/z_camera/Camera_Demo3.s
View file

@ -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)

6
asm/non_matchings/code/z_camera/Camera_Demo5.s
View file

@ -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)

4
asm/non_matchings/code/z_camera/Camera_Fixed1.s
View file

@ -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)

2
asm/non_matchings/code/z_camera/Camera_Fixed2.s
View file

@ -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)

2
asm/non_matchings/code/z_camera/Camera_Fixed3.s
View file

@ -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)

6
asm/non_matchings/code/z_camera/Camera_Fixed4.s
View file

@ -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)

10
asm/non_matchings/code/z_camera/Camera_Jump1.s
View file

@ -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

6
asm/non_matchings/code/z_camera/Camera_Jump2.s
View file

@ -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)

8
asm/non_matchings/code/z_camera/Camera_Jump3.s
View file

@ -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)

4
asm/non_matchings/code/z_camera/Camera_KeepOn0.s
View file

@ -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)

16
asm/non_matchings/code/z_camera/Camera_KeepOn1.s
View file

@ -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)

6
asm/non_matchings/code/z_camera/Camera_KeepOn3.s
View file

@ -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

4
asm/non_matchings/code/z_camera/Camera_KeepOn4.s
View file

@ -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)

8
asm/non_matchings/code/z_camera/Camera_Normal1.s
View file

@ -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)

12
asm/non_matchings/code/z_camera/Camera_Normal2.s
View file

@ -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)

6
asm/non_matchings/code/z_camera/Camera_Normal3.s
View file

@ -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)

8
asm/non_matchings/code/z_camera/Camera_Parallel1.s
View file

@ -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)

8
asm/non_matchings/code/z_camera/Camera_Special5.s
View file

@ -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)

2
asm/non_matchings/code/z_camera/Camera_Special6.s
View file

@ -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

2
asm/non_matchings/code/z_camera/Camera_Special7.s
View file

@ -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)

4
asm/non_matchings/code/z_camera/Camera_Special9.s
View file

@ -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)

2
asm/non_matchings/code/z_camera/Camera_Subj3.s
View file

@ -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

6
asm/non_matchings/code/z_camera/Camera_Subj4.s
View file

@ -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)

10
asm/non_matchings/code/z_camera/Camera_Unique0.s
View file

@ -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)

8
asm/non_matchings/code/z_camera/Camera_Unique1.s
View file

@ -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)

10
asm/non_matchings/code/z_camera/Camera_Unique2.s
View file

@ -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

4
asm/non_matchings/code/z_camera/Camera_Unique3.s
View file

@ -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

2
asm/non_matchings/code/z_camera/Camera_Unique7.s
View file

@ -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

24
asm/non_matchings/code/z_camera/Camera_Unique9.s
View file

@ -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

6
asm/non_matchings/code/z_camera/func_80043F94.s
View file

@ -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)
@ -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

2
asm/non_matchings/code/z_camera/func_80044ADC.s
View file

@ -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

4
asm/non_matchings/code/z_camera/func_80045508.s
View file

@ -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)

2
asm/non_matchings/code/z_camera/func_80045714.s
View file

@ -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)

2
asm/non_matchings/code/z_camera/func_800458D4.s
View file

@ -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

4
asm/non_matchings/code/z_camera/func_80045C74.s
View file

@ -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
@ -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

8
asm/non_matchings/code/z_camera/func_800460A8.s
View file

@ -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
@ -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)
@ -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
@ -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

8
asm/non_matchings/code/z_camera/func_80046E20.s
View file

@ -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

8
asm/non_matchings/code/z_camera/func_800591EC.s
View file

@ -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)

2
asm/non_matchings/code/z_onepointdemo/func_8007C680.s
View file

@ -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)

18
asm/non_matchings/code/z_onepointdemo/func_8007C850.s
View file

@ -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
@ -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)
@ -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
@ -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)

2
asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098AAE4.s
View file

@ -5,7 +5,7 @@ glabel func_8098AAE4
/* 01C70 8098AAF0 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000
/* 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)

2
asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098AB68.s
View file

@ -7,7 +7,7 @@ glabel func_8098AB68
/* 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)

14
include/functions.h
View file

@ -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(?);

2
spec
View file

@ -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"

30
src/code/z_camera.c
View file

@ -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;
}

106
src/code/code_8007BF90.c → src/code/z_olib.c
View file

@ -1,9 +1,7 @@
#include <ultra64.h>
#include <global.h>
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) {

8
src/code/z_quake.c
View file

@ -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;
}