mirror/mk64
1
0
Fork 0
mirror of https://github.com/n64decomp/mk64 synced 2026-06-28 01:33:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Match the other move_towards functions (#125)

Browse Source 
Signed-off-by: Taggerung <tyler.taggerung@gmail.com>
This commit is contained in:
Tyler McGavran
2022-01-01 20:22:31 -05:00
committed by GitHub
parent c4048a1e1c
commit c669d792a2
30 changed files with 237 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/non_matchings/code_8001C4D0/func_8001CA78.s
+1 -1
View File
@@ -130,7 +130,7 @@ glabel func_8001CA78
/* 01D868 8001CC68 E7B00044 */ swc1 $f16, 0x44($sp)
/* 01D86C 8001CC6C 46044280 */ add.s $f10, $f8, $f4
/* 01D870 8001CC70 460A3480 */ add.s $f18, $f6, $f10
/* 01D874 8001CC74 0C008973 */ jal func_800225CC
/* 01D874 8001CC74 0C008973 */ jal move_f32_towards
/* 01D878 8001CC78 E7B20048 */ swc1 $f18, 0x48($sp)
/* 01D87C 8001CC7C C7AE004C */ lwc1 $f14, 0x4c($sp)
/* 01D880 8001CC80 C6000000 */ lwc1 $f0, ($s0)
asm/non_matchings/code_8001C4D0/func_8001CCEC.s
+12 -12
View File
@@ -126,7 +126,7 @@ glabel func_8001CCEC
/* 01DAC4 8001CEC4 00000000 */ nop
/* 01DAC8 8001CEC8 AFA40044 */ sw $a0, 0x44($sp)
/* 01DACC 8001CECC E7B00050 */ swc1 $f16, 0x50($sp)
/* 01DAD0 8001CED0 0C008973 */ jal func_800225CC
/* 01DAD0 8001CED0 0C008973 */ jal move_f32_towards
/* 01DAD4 8001CED4 E7B2005C */ swc1 $f18, 0x5c($sp)
/* 01DAD8 8001CED8 3C0E8016 */ lui $t6, %hi(D_80164A48) # $t6, 0x8016
/* 01DADC 8001CEDC 25CE4A48 */ addiu $t6, %lo(D_80164A48) # addiu $t6, $t6, 0x4a48
@@ -134,7 +134,7 @@ glabel func_8001CCEC
/* 01DAE4 8001CEE4 3C063DCC */ lui $a2, (0x3DCCCCCD >> 16) # lui $a2, 0x3dcc
/* 01DAE8 8001CEE8 34C6CCCD */ ori $a2, (0x3DCCCCCD & 0xFFFF) # ori $a2, $a2, 0xcccd
/* 01DAEC 8001CEEC AFA40040 */ sw $a0, 0x40($sp)
/* 01DAF0 8001CEF0 0C008973 */ jal func_800225CC
/* 01DAF0 8001CEF0 0C008973 */ jal move_f32_towards
/* 01DAF4 8001CEF4 3C053FC0 */ lui $a1, 0x3fc0
/* 01DAF8 8001CEF8 3C0F8016 */ lui $t7, %hi(D_80164A78) # $t7, 0x8016
/* 01DAFC 8001CEFC 25EF4A78 */ addiu $t7, %lo(D_80164A78) # addiu $t7, $t7, 0x4a78
@@ -167,7 +167,7 @@ glabel func_8001CCEC
/* 01DB64 8001CF64 34C6CCCD */ ori $a2, (0x3DCCCCCD & 0xFFFF) # ori $a2, $a2, 0xcccd
/* 01DB68 8001CF68 AFA40044 */ sw $a0, 0x44($sp)
/* 01DB6C 8001CF6C E7B00050 */ swc1 $f16, 0x50($sp)
/* 01DB70 8001CF70 0C008973 */ jal func_800225CC
/* 01DB70 8001CF70 0C008973 */ jal move_f32_towards
/* 01DB74 8001CF74 E7B2005C */ swc1 $f18, 0x5c($sp)
/* 01DB78 8001CF78 3C198016 */ lui $t9, %hi(D_80164A48) # $t9, 0x8016
/* 01DB7C 8001CF7C 27394A48 */ addiu $t9, %lo(D_80164A48) # addiu $t9, $t9, 0x4a48
@@ -175,7 +175,7 @@ glabel func_8001CCEC
/* 01DB84 8001CF84 3C063DCC */ lui $a2, (0x3DCCCCCD >> 16) # lui $a2, 0x3dcc
/* 01DB88 8001CF88 34C6CCCD */ ori $a2, (0x3DCCCCCD & 0xFFFF) # ori $a2, $a2, 0xcccd
/* 01DB8C 8001CF8C AFA40040 */ sw $a0, 0x40($sp)
/* 01DB90 8001CF90 0C008973 */ jal func_800225CC
/* 01DB90 8001CF90 0C008973 */ jal move_f32_towards
/* 01DB94 8001CF94 24050000 */ li $a1, 0
/* 01DB98 8001CF98 3C098016 */ lui $t1, %hi(D_80164A78) # $t1, 0x8016
/* 01DB9C 8001CF9C 25294A78 */ addiu $t1, %lo(D_80164A78) # addiu $t1, $t1, 0x4a78
@@ -222,7 +222,7 @@ glabel func_8001CCEC
/* 01DC34 8001D034 34C6D70A */ ori $a2, (0x3CA3D70A & 0xFFFF) # ori $a2, $a2, 0xd70a
/* 01DC38 8001D038 AFA40038 */ sw $a0, 0x38($sp)
/* 01DC3C 8001D03C 3C0541A0 */ lui $a1, 0x41a0
/* 01DC40 8001D040 0C008973 */ jal func_800225CC
/* 01DC40 8001D040 0C008973 */ jal move_f32_towards
/* 01DC44 8001D044 AFA3003C */ sw $v1, 0x3c($sp)
/* 01DC48 8001D048 3C0F8016 */ lui $t7, %hi(D_80164AA0) # $t7, 0x8016
/* 01DC4C 8001D04C 25EF4AA0 */ addiu $t7, %lo(D_80164AA0) # addiu $t7, $t7, 0x4aa0
@@ -230,7 +230,7 @@ glabel func_8001CCEC
/* 01DC54 8001D054 3C063CA3 */ lui $a2, (0x3CA3D70A >> 16) # lui $a2, 0x3ca3
/* 01DC58 8001D058 34C6D70A */ ori $a2, (0x3CA3D70A & 0xFFFF) # ori $a2, $a2, 0xd70a
/* 01DC5C 8001D05C AFA40034 */ sw $a0, 0x34($sp)
/* 01DC60 8001D060 0C008973 */ jal func_800225CC
/* 01DC60 8001D060 0C008973 */ jal move_f32_towards
/* 01DC64 8001D064 3C054120 */ lui $a1, 0x4120
/* 01DC68 8001D068 8FA3003C */ lw $v1, 0x3c($sp)
/* 01DC6C 8001D06C 1000003F */ b .L8001D16C
@@ -248,7 +248,7 @@ glabel func_8001CCEC
/* 01DC98 8001D098 34C6D70A */ ori $a2, (0x3D23D70A & 0xFFFF) # ori $a2, $a2, 0xd70a
/* 01DC9C 8001D09C AFA40038 */ sw $a0, 0x38($sp)
/* 01DCA0 8001D0A0 3C054248 */ lui $a1, 0x4248
/* 01DCA4 8001D0A4 0C008973 */ jal func_800225CC
/* 01DCA4 8001D0A4 0C008973 */ jal move_f32_towards
/* 01DCA8 8001D0A8 AFA3003C */ sw $v1, 0x3c($sp)
/* 01DCAC 8001D0AC 3C098016 */ lui $t1, %hi(D_80164AA0) # $t1, 0x8016
/* 01DCB0 8001D0B0 25294AA0 */ addiu $t1, %lo(D_80164AA0) # addiu $t1, $t1, 0x4aa0
@@ -256,7 +256,7 @@ glabel func_8001CCEC
/* 01DCB8 8001D0B8 3C063D23 */ lui $a2, (0x3D23D70A >> 16) # lui $a2, 0x3d23
/* 01DCBC 8001D0BC 34C6D70A */ ori $a2, (0x3D23D70A & 0xFFFF) # ori $a2, $a2, 0xd70a
/* 01DCC0 8001D0C0 AFA40034 */ sw $a0, 0x34($sp)
/* 01DCC4 8001D0C4 0C008973 */ jal func_800225CC
/* 01DCC4 8001D0C4 0C008973 */ jal move_f32_towards
/* 01DCC8 8001D0C8 3C05420C */ lui $a1, 0x420c
/* 01DCCC 8001D0CC 8FA3003C */ lw $v1, 0x3c($sp)
/* 01DCD0 8001D0D0 10000026 */ b .L8001D16C
@@ -267,7 +267,7 @@ glabel func_8001CCEC
/* 01DCE0 8001D0E0 34C6D70A */ ori $a2, (0x3CA3D70A & 0xFFFF) # ori $a2, $a2, 0xd70a
/* 01DCE4 8001D0E4 AFA40038 */ sw $a0, 0x38($sp)
/* 01DCE8 8001D0E8 3C054220 */ lui $a1, 0x4220
/* 01DCEC 8001D0EC 0C008973 */ jal func_800225CC
/* 01DCEC 8001D0EC 0C008973 */ jal move_f32_towards
/* 01DCF0 8001D0F0 AFA3003C */ sw $v1, 0x3c($sp)
/* 01DCF4 8001D0F4 3C0B8016 */ lui $t3, %hi(D_80164AA0) # $t3, 0x8016
/* 01DCF8 8001D0F8 256B4AA0 */ addiu $t3, %lo(D_80164AA0) # addiu $t3, $t3, 0x4aa0
@@ -275,7 +275,7 @@ glabel func_8001CCEC
/* 01DD00 8001D100 3C063CA3 */ lui $a2, (0x3CA3D70A >> 16) # lui $a2, 0x3ca3
/* 01DD04 8001D104 34C6D70A */ ori $a2, (0x3CA3D70A & 0xFFFF) # ori $a2, $a2, 0xd70a
/* 01DD08 8001D108 AFA40034 */ sw $a0, 0x34($sp)
/* 01DD0C 8001D10C 0C008973 */ jal func_800225CC
/* 01DD0C 8001D10C 0C008973 */ jal move_f32_towards
/* 01DD10 8001D110 3C0541A0 */ lui $a1, 0x41a0
/* 01DD14 8001D114 8FA3003C */ lw $v1, 0x3c($sp)
/* 01DD18 8001D118 10000014 */ b .L8001D16C
@@ -288,7 +288,7 @@ glabel func_8001CCEC
/* 01DD30 8001D130 34C6D70A */ ori $a2, (0x3D23D70A & 0xFFFF) # ori $a2, $a2, 0xd70a
/* 01DD34 8001D134 AFA40038 */ sw $a0, 0x38($sp)
/* 01DD38 8001D138 24050000 */ li $a1, 0
/* 01DD3C 8001D13C 0C008973 */ jal func_800225CC
/* 01DD3C 8001D13C 0C008973 */ jal move_f32_towards
/* 01DD40 8001D140 AFA3003C */ sw $v1, 0x3c($sp)
/* 01DD44 8001D144 3C0E8016 */ lui $t6, %hi(D_80164AA0) # $t6, 0x8016
/* 01DD48 8001D148 25CE4AA0 */ addiu $t6, %lo(D_80164AA0) # addiu $t6, $t6, 0x4aa0
@@ -296,7 +296,7 @@ glabel func_8001CCEC
/* 01DD50 8001D150 3C063D23 */ lui $a2, (0x3D23D70A >> 16) # lui $a2, 0x3d23
/* 01DD54 8001D154 34C6D70A */ ori $a2, (0x3D23D70A & 0xFFFF) # ori $a2, $a2, 0xd70a
/* 01DD58 8001D158 AFA40034 */ sw $a0, 0x34($sp)
/* 01DD5C 8001D15C 0C008973 */ jal func_800225CC
/* 01DD5C 8001D15C 0C008973 */ jal move_f32_towards
/* 01DD60 8001D160 24050000 */ li $a1, 0
/* 01DD64 8001D164 8FA3003C */ lw $v1, 0x3c($sp)
/* 01DD68 8001D168 8FA40034 */ lw $a0, 0x34($sp)
asm/non_matchings/code_8001C4D0/func_8001D53C.s
+2 -2
View File
@@ -28,14 +28,14 @@ glabel func_8001D53C
/* 01E19C 8001D59C 3C063D75 */ lui $a2, (0x3D75C28F >> 16) # lui $a2, 0x3d75
/* 01E1A0 8001D5A0 34C6C28F */ ori $a2, (0x3D75C28F & 0xFFFF) # ori $a2, $a2, 0xc28f
/* 01E1A4 8001D5A4 260400A0 */ addiu $a0, $s0, 0xa0
/* 01E1A8 8001D5A8 0C008973 */ jal func_800225CC
/* 01E1A8 8001D5A8 0C008973 */ jal move_f32_towards
/* 01E1AC 8001D5AC 3C0541A0 */ lui $a1, 0x41a0
/* 01E1B0 8001D5B0 10000006 */ b .L8001D5CC
/* 01E1B4 8001D5B4 87A200B6 */ lh $v0, 0xb6($sp)
.L8001D5B8:
/* 01E1B8 8001D5B8 4405A000 */ mfc1 $a1, $f20
/* 01E1BC 8001D5BC 3C063D75 */ lui $a2, (0x3D75C28F >> 16) # lui $a2, 0x3d75
/* 01E1C0 8001D5C0 0C008973 */ jal func_800225CC
/* 01E1C0 8001D5C0 0C008973 */ jal move_f32_towards
/* 01E1C4 8001D5C4 34C6C28F */ ori $a2, (0x3D75C28F & 0xFFFF) # ori $a2, $a2, 0xc28f
/* 01E1C8 8001D5C8 87A200B6 */ lh $v0, 0xb6($sp)
.L8001D5CC:
asm/non_matchings/code_8001C4D0/func_8001D944.s
+8 -8
View File
@@ -126,7 +126,7 @@ glabel func_8001D944
/* 01E71C 8001DB1C 00000000 */ nop
/* 01E720 8001DB20 AFA40048 */ sw $a0, 0x48($sp)
/* 01E724 8001DB24 E7B00050 */ swc1 $f16, 0x50($sp)
/* 01E728 8001DB28 0C008973 */ jal func_800225CC
/* 01E728 8001DB28 0C008973 */ jal move_f32_towards
/* 01E72C 8001DB2C E7B2005C */ swc1 $f18, 0x5c($sp)
/* 01E730 8001DB30 3C0E8016 */ lui $t6, %hi(D_80164A48) # $t6, 0x8016
/* 01E734 8001DB34 25CE4A48 */ addiu $t6, %lo(D_80164A48) # addiu $t6, $t6, 0x4a48
@@ -134,7 +134,7 @@ glabel func_8001D944
/* 01E73C 8001DB3C 3C063DCC */ lui $a2, (0x3DCCCCCD >> 16) # lui $a2, 0x3dcc
/* 01E740 8001DB40 34C6CCCD */ ori $a2, (0x3DCCCCCD & 0xFFFF) # ori $a2, $a2, 0xcccd
/* 01E744 8001DB44 AFA40044 */ sw $a0, 0x44($sp)
/* 01E748 8001DB48 0C008973 */ jal func_800225CC
/* 01E748 8001DB48 0C008973 */ jal move_f32_towards
/* 01E74C 8001DB4C 3C053FC0 */ lui $a1, 0x3fc0
/* 01E750 8001DB50 3C0F8016 */ lui $t7, %hi(D_80164A78) # $t7, 0x8016
/* 01E754 8001DB54 25EF4A78 */ addiu $t7, %lo(D_80164A78) # addiu $t7, $t7, 0x4a78
@@ -167,7 +167,7 @@ glabel func_8001D944
/* 01E7BC 8001DBBC 34C6CCCD */ ori $a2, (0x3DCCCCCD & 0xFFFF) # ori $a2, $a2, 0xcccd
/* 01E7C0 8001DBC0 AFA40048 */ sw $a0, 0x48($sp)
/* 01E7C4 8001DBC4 E7B00050 */ swc1 $f16, 0x50($sp)
/* 01E7C8 8001DBC8 0C008973 */ jal func_800225CC
/* 01E7C8 8001DBC8 0C008973 */ jal move_f32_towards
/* 01E7CC 8001DBCC E7B2005C */ swc1 $f18, 0x5c($sp)
/* 01E7D0 8001DBD0 3C198016 */ lui $t9, %hi(D_80164A48) # $t9, 0x8016
/* 01E7D4 8001DBD4 27394A48 */ addiu $t9, %lo(D_80164A48) # addiu $t9, $t9, 0x4a48
@@ -175,7 +175,7 @@ glabel func_8001D944
/* 01E7DC 8001DBDC 3C063DCC */ lui $a2, (0x3DCCCCCD >> 16) # lui $a2, 0x3dcc
/* 01E7E0 8001DBE0 34C6CCCD */ ori $a2, (0x3DCCCCCD & 0xFFFF) # ori $a2, $a2, 0xcccd
/* 01E7E4 8001DBE4 AFA40044 */ sw $a0, 0x44($sp)
/* 01E7E8 8001DBE8 0C008973 */ jal func_800225CC
/* 01E7E8 8001DBE8 0C008973 */ jal move_f32_towards
/* 01E7EC 8001DBEC 24050000 */ li $a1, 0
/* 01E7F0 8001DBF0 3C098016 */ lui $t1, %hi(D_80164A78) # $t1, 0x8016
/* 01E7F4 8001DBF4 25294A78 */ addiu $t1, %lo(D_80164A78) # addiu $t1, $t1, 0x4a78
@@ -212,7 +212,7 @@ glabel func_8001D944
/* 01E868 8001DC68 34C6D70A */ ori $a2, (0x3CA3D70A & 0xFFFF) # ori $a2, $a2, 0xd70a
/* 01E86C 8001DC6C AFA4003C */ sw $a0, 0x3c($sp)
/* 01E870 8001DC70 3C054170 */ lui $a1, 0x4170
/* 01E874 8001DC74 0C008973 */ jal func_800225CC
/* 01E874 8001DC74 0C008973 */ jal move_f32_towards
/* 01E878 8001DC78 AFA20040 */ sw $v0, 0x40($sp)
/* 01E87C 8001DC7C 3C0F8016 */ lui $t7, %hi(D_80164AA0) # $t7, 0x8016
/* 01E880 8001DC80 25EF4AA0 */ addiu $t7, %lo(D_80164AA0) # addiu $t7, $t7, 0x4aa0
@@ -220,7 +220,7 @@ glabel func_8001D944
/* 01E888 8001DC88 3C063CA3 */ lui $a2, (0x3CA3D70A >> 16) # lui $a2, 0x3ca3
/* 01E88C 8001DC8C 34C6D70A */ ori $a2, (0x3CA3D70A & 0xFFFF) # ori $a2, $a2, 0xd70a
/* 01E890 8001DC90 AFA40038 */ sw $a0, 0x38($sp)
/* 01E894 8001DC94 0C008973 */ jal func_800225CC
/* 01E894 8001DC94 0C008973 */ jal move_f32_towards
/* 01E898 8001DC98 3C0541A0 */ lui $a1, 0x41a0
/* 01E89C 8001DC9C 8FA20040 */ lw $v0, 0x40($sp)
/* 01E8A0 8001DCA0 10000014 */ b .L8001DCF4
@@ -233,7 +233,7 @@ glabel func_8001D944
/* 01E8B8 8001DCB8 34C6D70A */ ori $a2, (0x3CA3D70A & 0xFFFF) # ori $a2, $a2, 0xd70a
/* 01E8BC 8001DCBC AFA4003C */ sw $a0, 0x3c($sp)
/* 01E8C0 8001DCC0 24050000 */ li $a1, 0
/* 01E8C4 8001DCC4 0C008973 */ jal func_800225CC
/* 01E8C4 8001DCC4 0C008973 */ jal move_f32_towards
/* 01E8C8 8001DCC8 AFA20040 */ sw $v0, 0x40($sp)
/* 01E8CC 8001DCCC 3C198016 */ lui $t9, %hi(D_80164AA0) # $t9, 0x8016
/* 01E8D0 8001DCD0 27394AA0 */ addiu $t9, %lo(D_80164AA0) # addiu $t9, $t9, 0x4aa0
@@ -241,7 +241,7 @@ glabel func_8001D944
/* 01E8D8 8001DCD8 3C063CA3 */ lui $a2, (0x3CA3D70A >> 16) # lui $a2, 0x3ca3
/* 01E8DC 8001DCDC 34C6D70A */ ori $a2, (0x3CA3D70A & 0xFFFF) # ori $a2, $a2, 0xd70a
/* 01E8E0 8001DCE0 AFA40038 */ sw $a0, 0x38($sp)
/* 01E8E4 8001DCE4 0C008973 */ jal func_800225CC
/* 01E8E4 8001DCE4 0C008973 */ jal move_f32_towards
/* 01E8E8 8001DCE8 24050000 */ li $a1, 0
/* 01E8EC 8001DCEC 8FA20040 */ lw $v0, 0x40($sp)
/* 01E8F0 8001DCF0 8FA40038 */ lw $a0, 0x38($sp)
asm/non_matchings/code_8001C4D0/func_8001E45C.s
+5 -5
View File
@@ -36,7 +36,7 @@ glabel func_8001E45C
/* 01F0DC 8001E4DC 34C6CCCD */ ori $a2, (0x3DCCCCCD & 0xFFFF) # ori $a2, $a2, 0xcccd
/* 01F0E0 8001E4E0 260400B0 */ addiu $a0, $s0, 0xb0
/* 01F0E4 8001E4E4 2405F4A0 */ li $a1, -2912
/* 01F0E8 8001E4E8 0C00898D */ jal func_80022634
/* 01F0E8 8001E4E8 0C00898D */ jal move_s16_towards
/* 01F0EC 8001E4EC A7A8004E */ sh $t0, 0x4e($sp)
/* 01F0F0 8001E4F0 10000022 */ b .L8001E57C
/* 01F0F4 8001E4F4 87A7004E */ lh $a3, 0x4e($sp)
@@ -45,7 +45,7 @@ glabel func_8001E45C
/* 01F0FC 8001E4FC 34C6CCCD */ ori $a2, (0x3DCCCCCD & 0xFFFF) # ori $a2, $a2, 0xcccd
/* 01F100 8001E500 260400B0 */ addiu $a0, $s0, 0xb0
/* 01F104 8001E504 2405F778 */ li $a1, -2184
/* 01F108 8001E508 0C00898D */ jal func_80022634
/* 01F108 8001E508 0C00898D */ jal move_s16_towards
/* 01F10C 8001E50C A7A7004E */ sh $a3, 0x4e($sp)
/* 01F110 8001E510 1000001A */ b .L8001E57C
/* 01F114 8001E514 87A7004E */ lh $a3, 0x4e($sp)
@@ -65,7 +65,7 @@ glabel func_8001E45C
/* 01F144 8001E544 34C6CCCD */ ori $a2, (0x3DCCCCCD & 0xFFFF) # ori $a2, $a2, 0xcccd
/* 01F148 8001E548 260400B0 */ addiu $a0, $s0, 0xb0
/* 01F14C 8001E54C 24050B60 */ li $a1, 2912
/* 01F150 8001E550 0C00898D */ jal func_80022634
/* 01F150 8001E550 0C00898D */ jal move_s16_towards
/* 01F154 8001E554 A7AB004E */ sh $t3, 0x4e($sp)
/* 01F158 8001E558 10000008 */ b .L8001E57C
/* 01F15C 8001E55C 87A7004E */ lh $a3, 0x4e($sp)
@@ -74,7 +74,7 @@ glabel func_8001E45C
/* 01F164 8001E564 34C6CCCD */ ori $a2, (0x3DCCCCCD & 0xFFFF) # ori $a2, $a2, 0xcccd
/* 01F168 8001E568 260400B0 */ addiu $a0, $s0, 0xb0
/* 01F16C 8001E56C 24050888 */ li $a1, 2184
/* 01F170 8001E570 0C00898D */ jal func_80022634
/* 01F170 8001E570 0C00898D */ jal move_s16_towards
/* 01F174 8001E574 A7A7004E */ sh $a3, 0x4e($sp)
/* 01F178 8001E578 87A7004E */ lh $a3, 0x4e($sp)
.L8001E57C:
@@ -84,7 +84,7 @@ glabel func_8001E45C
/* 01F184 8001E584 3C063D4C */ lui $a2, (0x3D4CCCCD >> 16) # lui $a2, 0x3d4c
/* 01F188 8001E588 34C6CCCD */ ori $a2, (0x3D4CCCCD & 0xFFFF) # ori $a2, $a2, 0xcccd
/* 01F18C 8001E58C 260400B0 */ addiu $a0, $s0, 0xb0
/* 01F190 8001E590 0C00898D */ jal func_80022634
/* 01F190 8001E590 0C00898D */ jal move_s16_towards
/* 01F194 8001E594 00002825 */ move $a1, $zero
/* 01F198 8001E598 240200B6 */ li $v0, 182
/* 01F19C 8001E59C 860D002C */ lh $t5, 0x2c($s0)
asm/non_matchings/code_8001C4D0/func_8001EA0C.s
+5 -5
View File
@@ -36,7 +36,7 @@ glabel func_8001EA0C
/* 01F68C 8001EA8C 34C6CCCD */ ori $a2, (0x3DCCCCCD & 0xFFFF) # ori $a2, $a2, 0xcccd
/* 01F690 8001EA90 260400B0 */ addiu $a0, $s0, 0xb0
/* 01F694 8001EA94 2405F4A0 */ li $a1, -2912
/* 01F698 8001EA98 0C00898D */ jal func_80022634
/* 01F698 8001EA98 0C00898D */ jal move_s16_towards
/* 01F69C 8001EA9C A7A8004E */ sh $t0, 0x4e($sp)
/* 01F6A0 8001EAA0 10000022 */ b .L8001EB2C
/* 01F6A4 8001EAA4 87A7004E */ lh $a3, 0x4e($sp)
@@ -45,7 +45,7 @@ glabel func_8001EA0C
/* 01F6AC 8001EAAC 34C6CCCD */ ori $a2, (0x3DCCCCCD & 0xFFFF) # ori $a2, $a2, 0xcccd
/* 01F6B0 8001EAB0 260400B0 */ addiu $a0, $s0, 0xb0
/* 01F6B4 8001EAB4 2405F778 */ li $a1, -2184
/* 01F6B8 8001EAB8 0C00898D */ jal func_80022634
/* 01F6B8 8001EAB8 0C00898D */ jal move_s16_towards
/* 01F6BC 8001EABC A7A7004E */ sh $a3, 0x4e($sp)
/* 01F6C0 8001EAC0 1000001A */ b .L8001EB2C
/* 01F6C4 8001EAC4 87A7004E */ lh $a3, 0x4e($sp)
@@ -65,7 +65,7 @@ glabel func_8001EA0C
/* 01F6F4 8001EAF4 34C6CCCD */ ori $a2, (0x3DCCCCCD & 0xFFFF) # ori $a2, $a2, 0xcccd
/* 01F6F8 8001EAF8 260400B0 */ addiu $a0, $s0, 0xb0
/* 01F6FC 8001EAFC 24050B60 */ li $a1, 2912
/* 01F700 8001EB00 0C00898D */ jal func_80022634
/* 01F700 8001EB00 0C00898D */ jal move_s16_towards
/* 01F704 8001EB04 A7AB004E */ sh $t3, 0x4e($sp)
/* 01F708 8001EB08 10000008 */ b .L8001EB2C
/* 01F70C 8001EB0C 87A7004E */ lh $a3, 0x4e($sp)
@@ -74,7 +74,7 @@ glabel func_8001EA0C
/* 01F714 8001EB14 34C6CCCD */ ori $a2, (0x3DCCCCCD & 0xFFFF) # ori $a2, $a2, 0xcccd
/* 01F718 8001EB18 260400B0 */ addiu $a0, $s0, 0xb0
/* 01F71C 8001EB1C 24050888 */ li $a1, 2184
/* 01F720 8001EB20 0C00898D */ jal func_80022634
/* 01F720 8001EB20 0C00898D */ jal move_s16_towards
/* 01F724 8001EB24 A7A7004E */ sh $a3, 0x4e($sp)
/* 01F728 8001EB28 87A7004E */ lh $a3, 0x4e($sp)
.L8001EB2C:
@@ -84,7 +84,7 @@ glabel func_8001EA0C
/* 01F734 8001EB34 3C063D4C */ lui $a2, (0x3D4CCCCD >> 16) # lui $a2, 0x3d4c
/* 01F738 8001EB38 34C6CCCD */ ori $a2, (0x3D4CCCCD & 0xFFFF) # ori $a2, $a2, 0xcccd
/* 01F73C 8001EB3C 260400B0 */ addiu $a0, $s0, 0xb0
/* 01F740 8001EB40 0C00898D */ jal func_80022634
/* 01F740 8001EB40 0C00898D */ jal move_s16_towards
/* 01F744 8001EB44 00002825 */ move $a1, $zero
/* 01F748 8001EB48 240200B6 */ li $v0, 182
/* 01F74C 8001EB4C 860D002C */ lh $t5, 0x2c($s0)
asm/non_matchings/code_8001C4D0/func_8001F394.s
+6 -6
View File
@@ -103,7 +103,7 @@ glabel L8001F4E0
/* 0200F8 8001F4F8 3C063E4C */ lui $a2, (0x3E4CCCCD >> 16) # $a2, 0x3e4c
/* 0200FC 8001F4FC 34C6CCCD */ ori $a2, (0x3E4CCCCD & 0xFFFF) # ori $a2, $a2, 0xcccd
/* 020100 8001F500 3C0541A0 */ lui $a1, 0x41a0
/* 020104 8001F504 0C008973 */ jal func_800225CC
/* 020104 8001F504 0C008973 */ jal move_f32_towards
/* 020108 8001F508 AFA7001C */ sw $a3, 0x1c($sp)
/* 02010C 8001F50C 44806000 */ mtc1 $zero, $f12
/* 020110 8001F510 10000092 */ b .L8001F75C
@@ -138,7 +138,7 @@ glabel L8001F54C
/* 020178 8001F578 3C063E4C */ lui $a2, (0x3E4CCCCD >> 16) # $a2, 0x3e4c
/* 02017C 8001F57C 34C6CCCD */ ori $a2, (0x3E4CCCCD & 0xFFFF) # ori $a2, $a2, 0xcccd
/* 020180 8001F580 3C054100 */ lui $a1, 0x4100
/* 020184 8001F584 0C008973 */ jal func_800225CC
/* 020184 8001F584 0C008973 */ jal move_f32_towards
/* 020188 8001F588 AFA7001C */ sw $a3, 0x1c($sp)
/* 02018C 8001F58C 44806000 */ mtc1 $zero, $f12
/* 020190 8001F590 10000072 */ b .L8001F75C
@@ -175,7 +175,7 @@ glabel L8001F5DC
/* 020200 8001F600 3C0541A0 */ lui $a1, 0x41a0
/* 020204 8001F604 3C063DCC */ lui $a2, (0x3DCCCCCD >> 16) # $a2, 0x3dcc
/* 020208 8001F608 34C6CCCD */ ori $a2, (0x3DCCCCCD & 0xFFFF) # ori $a2, $a2, 0xcccd
/* 02020C 8001F60C 0C008973 */ jal func_800225CC
/* 02020C 8001F60C 0C008973 */ jal move_f32_towards
/* 020210 8001F610 AFA7001C */ sw $a3, 0x1c($sp)
/* 020214 8001F614 44806000 */ mtc1 $zero, $f12
/* 020218 8001F618 10000050 */ b .L8001F75C
@@ -208,8 +208,8 @@ glabel L8001F654
/* 020278 8001F678 3C0541C8 */ lui $a1, 0x41c8
/* 02027C 8001F67C AFA7001C */ sw $a3, 0x1c($sp)
/* 020280 8001F680 44061000 */ mfc1 $a2, $f2
/* 020284 8001F684 0C008973 */ jal func_800225CC
/* 020288 8001F688 00000000 */ nop
/* 020284 8001F684 0C008973 */ jal move_f32_towards
/* 020288 8001F688 00000000 */ nop
/* 02028C 8001F68C 44806000 */ mtc1 $zero, $f12
/* 020290 8001F690 10000032 */ b .L8001F75C
/* 020294 8001F694 8FA7001C */ lw $a3, 0x1c($sp)
@@ -246,7 +246,7 @@ glabel L8001F6D8
/* 020300 8001F700 3C063E4C */ lui $a2, (0x3E4CCCCD >> 16) # lui $a2, 0x3e4c
/* 020304 8001F704 34C6CCCD */ ori $a2, (0x3E4CCCCD & 0xFFFF) # ori $a2, $a2, 0xcccd
/* 020308 8001F708 3C054190 */ lui $a1, 0x4190
/* 02030C 8001F70C 0C008973 */ jal func_800225CC
/* 02030C 8001F70C 0C008973 */ jal move_f32_towards
/* 020310 8001F710 AFA7001C */ sw $a3, 0x1c($sp)
/* 020314 8001F714 44806000 */ mtc1 $zero, $f12
/* 020318 8001F718 10000010 */ b .L8001F75C
asm/non_matchings/code_8001F980/func_80022598.s
+1 -1
View File
@@ -1,4 +1,4 @@
glabel func_80022598
glabel move_s32_towards
/* 023198 80022598 8C820000 */ lw $v0, ($a0)
/* 02319C 8002259C 44866000 */ mtc1 $a2, $f12
/* 0231A0 800225A0 00457023 */ subu $t6, $v0, $a1
asm/non_matchings/code_8001F980/func_80022634.s
+1 -1
View File
@@ -1,4 +1,4 @@
glabel func_80022634
glabel move_s16_towards
/* 023234 80022634 AFA50004 */ sw $a1, 4($sp)
/* 023238 80022638 84820000 */ lh $v0, ($a0)
/* 02323C 8002263C 00057400 */ sll $t6, $a1, 0x10
asm/non_matchings/code_8001F980/func_80022674.s
+1 -1
View File
@@ -1,4 +1,4 @@
glabel func_80022674
glabel move_u16_towards
/* 023274 80022674 AFA50004 */ sw $a1, 4($sp)
/* 023278 80022678 94820000 */ lhu $v0, ($a0)
/* 02327C 8002267C 00057400 */ sll $t6, $a1, 0x10
asm/non_matchings/code_8001F980/func_80023038.s
+3 -3
View File
@@ -15,7 +15,7 @@ glabel func_80023038
/* 023C6C 8002306C 004E2021 */ addu $a0, $v0, $t6
/* 023C70 80023070 AFA2001C */ sw $v0, 0x1c($sp)
/* 023C74 80023074 00192C03 */ sra $a1, $t9, 0x10
/* 023C78 80023078 0C00899D */ jal func_80022674
/* 023C78 80023078 0C00899D */ jal move_u16_towards
/* 023C7C 8002307C 8FA6002C */ lw $a2, 0x2c($sp)
/* 023C80 80023080 8FA50028 */ lw $a1, 0x28($sp)
/* 023C84 80023084 8FA9001C */ lw $t1, 0x1c($sp)
@@ -26,7 +26,7 @@ glabel func_80023038
/* 023C98 80023098 254A4B50 */ addiu $t2, %lo(D_80164B50) # addiu $t2, $t2, 0x4b50
/* 023C9C 8002309C 000D2C03 */ sra $a1, $t5, 0x10
/* 023CA0 800230A0 8FA6002C */ lw $a2, 0x2c($sp)
/* 023CA4 800230A4 0C00899D */ jal func_80022674
/* 023CA4 800230A4 0C00899D */ jal move_u16_towards
/* 023CA8 800230A8 012A2021 */ addu $a0, $t1, $t2
/* 023CAC 800230AC 8FA50028 */ lw $a1, 0x28($sp)
/* 023CB0 800230B0 8FAF001C */ lw $t7, 0x1c($sp)
@@ -36,7 +36,7 @@ glabel func_80023038
/* 023CC0 800230C0 27184B60 */ addiu $t8, %lo(D_80164B60) # addiu $t8, $t8, 0x4b60
/* 023CC4 800230C4 00082C03 */ sra $a1, $t0, 0x10
/* 023CC8 800230C8 8FA6002C */ lw $a2, 0x2c($sp)
/* 023CCC 800230CC 0C00899D */ jal func_80022674
/* 023CCC 800230CC 0C00899D */ jal move_u16_towards
/* 023CD0 800230D0 01F82021 */ addu $a0, $t7, $t8
/* 023CD4 800230D4 8FBF0014 */ lw $ra, 0x14($sp)
/* 023CD8 800230D8 27BD0020 */ addiu $sp, $sp, 0x20
asm/non_matchings/code_80027D00/func_8002934C.s
+1 -1
View File
@@ -184,7 +184,7 @@ glabel func_8002934C
/* 02A1FC 800295FC 44053000 */ mfc1 $a1, $f6
/* 02A200 80029600 00000000 */ nop
/* 02A204 80029604 00057C00 */ sll $t7, $a1, 0x10
/* 02A208 80029608 0C00898D */ jal func_80022634
/* 02A208 80029608 0C00898D */ jal move_s16_towards
/* 02A20C 8002960C 000F2C03 */ sra $a1, $t7, 0x10
/* 02A210 80029610 8FA70024 */ lw $a3, 0x24($sp)
/* 02A214 80029614 83AC006B */ lb $t4, 0x6b($sp)
asm/non_matchings/code_80027D00/func_80029B4C.s
+6 -6
View File
@@ -240,7 +240,7 @@ glabel func_80029B4C
/* 02AAFC 80029EFC 3C063F00 */ lui $a2, 0x3f00
/* 02AB00 80029F00 46049003 */ div.s $f0, $f18, $f4
/* 02AB04 80029F04 44050000 */ mfc1 $a1, $f0
/* 02AB08 80029F08 0C008973 */ jal func_800225CC
/* 02AB08 80029F08 0C008973 */ jal move_f32_towards
/* 02AB0C 80029F0C 00000000 */ nop
/* 02AB10 80029F10 C60A01C0 */ lwc1 $f10, 0x1c0($s0)
/* 02AB14 80029F14 C60601F0 */ lwc1 $f6, 0x1f0($s0)
@@ -251,7 +251,7 @@ glabel func_80029B4C
/* 02AB28 80029F28 3C063F00 */ lui $a2, 0x3f00
/* 02AB2C 80029F2C 46104003 */ div.s $f0, $f8, $f16
/* 02AB30 80029F30 44050000 */ mfc1 $a1, $f0
/* 02AB34 80029F34 0C008973 */ jal func_800225CC
/* 02AB34 80029F34 0C008973 */ jal move_f32_towards
/* 02AB38 80029F38 00000000 */ nop
/* 02AB3C 80029F3C C61201A8 */ lwc1 $f18, 0x1a8($s0)
/* 02AB40 80029F40 C60401C0 */ lwc1 $f4, 0x1c0($s0)
@@ -262,7 +262,7 @@ glabel func_80029B4C
/* 02AB54 80029F54 3C063F00 */ lui $a2, 0x3f00
/* 02AB58 80029F58 46065003 */ div.s $f0, $f10, $f6
/* 02AB5C 80029F5C 44050000 */ mfc1 $a1, $f0
/* 02AB60 80029F60 0C008973 */ jal func_800225CC
/* 02AB60 80029F60 0C008973 */ jal move_f32_towards
/* 02AB64 80029F64 00000000 */ nop
/* 02AB68 80029F68 C60801D8 */ lwc1 $f8, 0x1d8($s0)
/* 02AB6C 80029F6C C61001F0 */ lwc1 $f16, 0x1f0($s0)
@@ -273,7 +273,7 @@ glabel func_80029B4C
/* 02AB80 80029F80 3C063F00 */ lui $a2, 0x3f00
/* 02AB84 80029F84 46049003 */ div.s $f0, $f18, $f4
/* 02AB88 80029F88 44050000 */ mfc1 $a1, $f0
/* 02AB8C 80029F8C 0C008973 */ jal func_800225CC
/* 02AB8C 80029F8C 0C008973 */ jal move_f32_towards
/* 02AB90 80029F90 00000000 */ nop
/* 02AB94 80029F94 960F0254 */ lhu $t7, 0x254($s0)
.L80029F98:
@@ -324,7 +324,7 @@ glabel func_80029B4C
/* 02AC40 8002A040 00056403 */ sra $t4, $a1, 0x10
/* 02AC44 8002A044 01802825 */ move $a1, $t4
/* 02AC48 8002A048 260400C4 */ addiu $a0, $s0, 0xc4
/* 02AC4C 8002A04C 0C00898D */ jal func_80022634
/* 02AC4C 8002A04C 0C00898D */ jal move_s16_towards
/* 02AC50 8002A050 3C063F00 */ lui $a2, 0x3f00
/* 02AC54 8002A054 1000001A */ b .L8002A0C0
/* 02AC58 8002A058 8E1900BC */ lw $t9, 0xbc($s0)
@@ -353,7 +353,7 @@ glabel func_80029B4C
/* 02ACAC 8002A0AC 10000001 */ b .L8002A0B4
/* 02ACB0 8002A0B0 000D2C03 */ sra $a1, $t5, 0x10
.L8002A0B4:
/* 02ACB4 8002A0B4 0C00898D */ jal func_80022634
/* 02ACB4 8002A0B4 0C00898D */ jal move_s16_towards
/* 02ACB8 8002A0B8 3C063F00 */ lui $a2, 0x3f00
/* 02ACBC 8002A0BC 8E1900BC */ lw $t9, 0xbc($s0)
.L8002A0C0:
asm/non_matchings/code_80027D00/func_8002A194.s
+2 -2
View File
@@ -208,7 +208,7 @@ glabel func_8002A194
/* 02B0C0 8002A4C0 0005CC03 */ sra $t9, $a1, 0x10
/* 02B0C4 8002A4C4 03202825 */ move $a1, $t9
/* 02B0C8 8002A4C8 260400C4 */ addiu $a0, $s0, 0xc4
/* 02B0CC 8002A4CC 0C00898D */ jal func_80022634
/* 02B0CC 8002A4CC 0C00898D */ jal move_s16_towards
/* 02B0D0 8002A4D0 3C063F00 */ lui $a2, 0x3f00
/* 02B0D4 8002A4D4 10000017 */ b .L8002A534
/* 02B0D8 8002A4D8 00000000 */ nop
@@ -234,7 +234,7 @@ glabel func_8002A194
/* 02B124 8002A524 10000001 */ b .L8002A52C
/* 02B128 8002A528 00082C03 */ sra $a1, $t0, 0x10
.L8002A52C:
/* 02B12C 8002A52C 0C00898D */ jal func_80022634
/* 02B12C 8002A52C 0C00898D */ jal move_s16_towards
/* 02B130 8002A530 3C063F00 */ lui $a2, 0x3f00
.L8002A534:
/* 02B134 8002A534 0C0AAF5F */ jal func_802ABD7C
asm/non_matchings/code_80027D00/func_8002AB70.s
+9 -9
View File
@@ -39,13 +39,13 @@ glabel func_8002AB70
/* 02B804 8002AC04 4502000D */ bc1fl .L8002AC3C
/* 02B808 8002AC08 96190254 */ lhu $t9, 0x254($s0)
/* 02B80C 8002AC0C 3C0543FA */ lui $a1, 0x43fa
/* 02B810 8002AC10 0C008973 */ jal func_800225CC
/* 02B810 8002AC10 0C008973 */ jal move_f32_towards
/* 02B814 8002AC14 3C063F80 */ lui $a2, 0x3f80
/* 02B818 8002AC18 26040DAC */ addiu $a0, $s0, 0xdac
/* 02B81C 8002AC1C 3C063D4C */ lui $a2, (0x3D4CCCCD >> 16) # lui $a2, 0x3d4c
/* 02B820 8002AC20 34C6CCCD */ ori $a2, (0x3D4CCCCD & 0xFFFF) # ori $a2, $a2, 0xcccd
/* 02B824 8002AC24 AFA40020 */ sw $a0, 0x20($sp)
/* 02B828 8002AC28 0C008973 */ jal func_800225CC
/* 02B828 8002AC28 0C008973 */ jal move_f32_towards
/* 02B82C 8002AC2C 3C054040 */ lui $a1, 0x4040
/* 02B830 8002AC30 10000036 */ b .L8002AD0C
/* 02B834 8002AC34 8E0200BC */ lw $v0, 0xbc($s0)
@@ -56,13 +56,13 @@ glabel func_8002AB70
/* 02B840 8002AC40 34C6CCCD */ ori $a2, (0x3D4CCCCD & 0xFFFF) # ori $a2, $a2, 0xcccd
/* 02B844 8002AC44 00194080 */ sll $t0, $t9, 2
/* 02B848 8002AC48 00A82821 */ addu $a1, $a1, $t0
/* 02B84C 8002AC4C 0C008973 */ jal func_800225CC
/* 02B84C 8002AC4C 0C008973 */ jal move_f32_towards
/* 02B850 8002AC50 8CA52650 */ lw $a1, %lo(gKartGravityTable)($a1) # 0x2650($a1)
/* 02B854 8002AC54 26040DAC */ addiu $a0, $s0, 0xdac
/* 02B858 8002AC58 3C063D8F */ lui $a2, (0x3D8F5C29 >> 16) # lui $a2, 0x3d8f
/* 02B85C 8002AC5C 34C65C29 */ ori $a2, (0x3D8F5C29 & 0xFFFF) # ori $a2, $a2, 0x5c29
/* 02B860 8002AC60 AFA40020 */ sw $a0, 0x20($sp)
/* 02B864 8002AC64 0C008973 */ jal func_800225CC
/* 02B864 8002AC64 0C008973 */ jal move_f32_towards
/* 02B868 8002AC68 3C053F80 */ lui $a1, 0x3f80
/* 02B86C 8002AC6C 10000027 */ b .L8002AD0C
/* 02B870 8002AC70 8E0200BC */ lw $v0, 0xbc($s0)
@@ -85,7 +85,7 @@ glabel func_8002AB70
/* 02B8AC 8002ACAC 34C6D70A */ ori $a2, (0x3CA3D70A & 0xFFFF) # ori $a2, $a2, 0xd70a
/* 02B8B0 8002ACB0 00095080 */ sll $t2, $t1, 2
/* 02B8B4 8002ACB4 00AA2821 */ addu $a1, $a1, $t2
/* 02B8B8 8002ACB8 0C008973 */ jal func_800225CC
/* 02B8B8 8002ACB8 0C008973 */ jal move_f32_towards
/* 02B8BC 8002ACBC 8CA52650 */ lw $a1, %lo(gKartGravityTable)($a1) # 0x2650($a1)
/* 02B8C0 8002ACC0 8E0B00BC */ lw $t3, 0xbc($s0)
/* 02B8C4 8002ACC4 24010002 */ li $at, 2
@@ -97,14 +97,14 @@ glabel func_8002AB70
/* 02B8DC 8002ACDC 3C063D8F */ lui $a2, (0x3D8F5C29 >> 16) # lui $a2, 0x3d8f
/* 02B8E0 8002ACE0 34C65C29 */ ori $a2, (0x3D8F5C29 & 0xFFFF) # ori $a2, $a2, 0x5c29
/* 02B8E4 8002ACE4 AFA40020 */ sw $a0, 0x20($sp)
/* 02B8E8 8002ACE8 0C008973 */ jal func_800225CC
/* 02B8E8 8002ACE8 0C008973 */ jal move_f32_towards
/* 02B8EC 8002ACEC 3C053F80 */ lui $a1, 0x3f80
/* 02B8F0 8002ACF0 10000006 */ b .L8002AD0C
/* 02B8F4 8002ACF4 8E0200BC */ lw $v0, 0xbc($s0)
.L8002ACF8:
/* 02B8F8 8002ACF8 3C063D8F */ lui $a2, (0x3D8F5C29 >> 16) # lui $a2, 0x3d8f
/* 02B8FC 8002ACFC 34C65C29 */ ori $a2, (0x3D8F5C29 & 0xFFFF) # ori $a2, $a2, 0x5c29
/* 02B900 8002AD00 0C008973 */ jal func_800225CC
/* 02B900 8002AD00 0C008973 */ jal move_f32_towards
/* 02B904 8002AD04 AFA40020 */ sw $a0, 0x20($sp)
/* 02B908 8002AD08 8E0200BC */ lw $v0, 0xbc($s0)
.L8002AD0C:
@@ -113,7 +113,7 @@ glabel func_8002AB70
/* 02B914 8002AD14 00436824 */ and $t5, $v0, $v1
/* 02B918 8002AD18 146D0007 */ bne $v1, $t5, .L8002AD38
/* 02B91C 8002AD1C 3C0541A0 */ lui $a1, 0x41a0
/* 02B920 8002AD20 0C008973 */ jal func_800225CC
/* 02B920 8002AD20 0C008973 */ jal move_f32_towards
/* 02B924 8002AD24 3C063F80 */ lui $a2, 0x3f80
/* 02B928 8002AD28 3C01800F */ lui $at, %hi(D_800ED7B8) # $at, 0x800f
/* 02B92C 8002AD2C C432D7B8 */ lwc1 $f18, %lo(D_800ED7B8)($at)
@@ -125,7 +125,7 @@ glabel func_8002AB70
/* 02B940 8002AD40 15C10008 */ bne $t6, $at, .L8002AD64
/* 02B944 8002AD44 8FA40020 */ lw $a0, 0x20($sp)
/* 02B948 8002AD48 3C0541C8 */ lui $a1, 0x41c8
/* 02B94C 8002AD4C 0C008973 */ jal func_800225CC
/* 02B94C 8002AD4C 0C008973 */ jal move_f32_towards
/* 02B950 8002AD50 3C063F80 */ lui $a2, 0x3f80
/* 02B954 8002AD54 3C0144E1 */ li $at, 0x44E10000 # 1800.000000
/* 02B958 8002AD58 44812000 */ mtc1 $at, $f4
asm/non_matchings/code_80027D00/func_80030150.s
+9 -9
View File
@@ -355,7 +355,7 @@ glabel func_80030150
/* 031260 80030660 24E400A0 */ addiu $a0, $a3, 0xa0
/* 031264 80030664 462091A0 */ cvt.s.d $f6, $f18
/* 031268 80030668 44053000 */ mfc1 $a1, $f6
/* 03126C 8003066C 0C008973 */ jal func_800225CC
/* 03126C 8003066C 0C008973 */ jal move_f32_towards
/* 031270 80030670 00000000 */ nop
/* 031274 80030674 44807000 */ mtc1 $zero, $f14
/* 031278 80030678 8FA70028 */ lw $a3, 0x28($sp)
@@ -366,7 +366,7 @@ glabel func_80030150
/* 031288 80030688 3C063DCC */ lui $a2, (0x3DCCCCCD >> 16) # lui $a2, 0x3dcc
/* 03128C 8003068C 34C6CCCD */ ori $a2, (0x3DCCCCCD & 0xFFFF) # ori $a2, $a2, 0xcccd
/* 031290 80030690 AFA70028 */ sw $a3, 0x28($sp)
/* 031294 80030694 0C008973 */ jal func_800225CC
/* 031294 80030694 0C008973 */ jal move_f32_towards
/* 031298 80030698 E7A00024 */ swc1 $f0, 0x24($sp)
/* 03129C 8003069C 8FA70028 */ lw $a3, 0x28($sp)
/* 0312A0 800306A0 C7A00024 */ lwc1 $f0, 0x24($sp)
@@ -423,7 +423,7 @@ glabel func_80030150
/* 031358 80030758 3C0543BE */ lui $a1, 0x43be
/* 03135C 8003075C 3C063F00 */ lui $a2, (0x3F00CCCD >> 16) # lui $a2, 0x3f00
/* 031360 80030760 AFA70028 */ sw $a3, 0x28($sp)
/* 031364 80030764 0C008973 */ jal func_800225CC
/* 031364 80030764 0C008973 */ jal move_f32_towards
/* 031368 80030768 E7A00024 */ swc1 $f0, 0x24($sp)
/* 03136C 8003076C 8FA70028 */ lw $a3, 0x28($sp)
/* 031370 80030770 44807000 */ mtc1 $zero, $f14
@@ -436,7 +436,7 @@ glabel func_80030150
/* 031388 80030788 44057000 */ mfc1 $a1, $f14
/* 03138C 8003078C 34C6CCCD */ ori $a2, (0x3F00CCCD & 0xFFFF) # ori $a2, $a2, 0xcccd
/* 031390 80030790 AFA70028 */ sw $a3, 0x28($sp)
/* 031394 80030794 0C008973 */ jal func_800225CC
/* 031394 80030794 0C008973 */ jal move_f32_towards
/* 031398 80030798 E7A00024 */ swc1 $f0, 0x24($sp)
/* 03139C 8003079C 8FA70028 */ lw $a3, 0x28($sp)
/* 0313A0 800307A0 44807000 */ mtc1 $zero, $f14
@@ -460,7 +460,7 @@ glabel func_80030150
/* 0313E4 800307E4 3C063E4C */ lui $a2, (0x3E4CCCCD >> 16) # lui $a2, 0x3e4c
/* 0313E8 800307E8 34C6CCCD */ ori $a2, (0x3E4CCCCD & 0xFFFF) # ori $a2, $a2, 0xcccd
/* 0313EC 800307EC AFA70028 */ sw $a3, 0x28($sp)
/* 0313F0 800307F0 0C008973 */ jal func_800225CC
/* 0313F0 800307F0 0C008973 */ jal move_f32_towards
/* 0313F4 800307F4 E7A00024 */ swc1 $f0, 0x24($sp)
/* 0313F8 800307F8 8FA70028 */ lw $a3, 0x28($sp)
/* 0313FC 800307FC 10000009 */ b .L80030824
@@ -470,7 +470,7 @@ glabel func_80030150
/* 031408 80030808 3C063C23 */ lui $a2, (0x3C23D70A >> 16) # lui $a2, 0x3c23
/* 03140C 8003080C 34C6D70A */ ori $a2, (0x3C23D70A & 0xFFFF) # ori $a2, $a2, 0xd70a
/* 031410 80030810 AFA70028 */ sw $a3, 0x28($sp)
/* 031414 80030814 0C008973 */ jal func_800225CC
/* 031414 80030814 0C008973 */ jal move_f32_towards
/* 031418 80030818 E7A00024 */ swc1 $f0, 0x24($sp)
/* 03141C 8003081C 8FA70028 */ lw $a3, 0x28($sp)
/* 031420 80030820 C7A00024 */ lwc1 $f0, 0x24($sp)
@@ -486,7 +486,7 @@ glabel func_80030150
/* 031444 80030844 24E400E4 */ addiu $a0, $a3, 0xe4
/* 031448 80030848 3C054411 */ lui $a1, 0x4411
/* 03144C 8003084C AFA70028 */ sw $a3, 0x28($sp)
/* 031450 80030850 0C008973 */ jal func_800225CC
/* 031450 80030850 0C008973 */ jal move_f32_towards
/* 031454 80030854 E7A00024 */ swc1 $f0, 0x24($sp)
/* 031458 80030858 8FA70028 */ lw $a3, 0x28($sp)
/* 03145C 8003085C 10000008 */ b .L80030880
@@ -495,7 +495,7 @@ glabel func_80030150
/* 031464 80030864 3C063C23 */ lui $a2, (0x3C23D70A >> 16) # lui $a2, 0x3c23
/* 031468 80030868 34C6D70A */ ori $a2, (0x3C23D70A & 0xFFFF) # ori $a2, $a2, 0xd70a
/* 03146C 8003086C AFA70028 */ sw $a3, 0x28($sp)
/* 031470 80030870 0C008973 */ jal func_800225CC
/* 031470 80030870 0C008973 */ jal move_f32_towards
/* 031474 80030874 E7A00024 */ swc1 $f0, 0x24($sp)
/* 031478 80030878 8FA70028 */ lw $a3, 0x28($sp)
/* 03147C 8003087C C7A00024 */ lwc1 $f0, 0x24($sp)
@@ -515,7 +515,7 @@ glabel func_80030150
/* 0314AC 800308AC 24E40104 */ addiu $a0, $a3, 0x104
/* 0314B0 800308B0 462044A0 */ cvt.s.d $f18, $f8
/* 0314B4 800308B4 44069000 */ mfc1 $a2, $f18
/* 0314B8 800308B8 0C008973 */ jal func_800225CC
/* 0314B8 800308B8 0C008973 */ jal move_f32_towards
/* 0314BC 800308BC 00000000 */ nop
/* 0314C0 800308C0 8FA70028 */ lw $a3, 0x28($sp)
/* 0314C4 800308C4 C4E0008C */ lwc1 $f0, 0x8c($a3)
asm/non_matchings/code_80027D00/func_8003680C.s
+1 -1
View File
@@ -83,7 +83,7 @@ glabel func_8003680C
/* 03754C 8003694C 000E4C03 */ sra $t1, $t6, 0x10
/* 037550 80036950 AFA90304 */ sw $t1, 0x304($sp)
/* 037554 80036954 AFA70308 */ sw $a3, 0x308($sp)
/* 037558 80036958 0C008966 */ jal func_80022598
/* 037558 80036958 0C008966 */ jal move_s32_towards
/* 03755C 8003695C 87A5030E */ lh $a1, 0x30e($sp)
/* 037560 80036960 8FAD0304 */ lw $t5, 0x304($sp)
/* 037564 80036964 8FA70308 */ lw $a3, 0x308($sp)
asm/non_matchings/code_80057C60/func_8006A7C0.s
+3 -3
View File
@@ -200,7 +200,7 @@ glabel func_8006A7C0
/* 06B6C4 8006AAC4 44058000 */ mfc1 $a1, $f16
/* 06B6C8 8006AAC8 00000000 */ nop
/* 06B6CC 8006AACC 00057400 */ sll $t6, $a1, 0x10
/* 06B6D0 8006AAD0 0C00898D */ jal func_80022634
/* 06B6D0 8006AAD0 0C00898D */ jal move_s16_towards
/* 06B6D4 8006AAD4 000E2C03 */ sra $a1, $t6, 0x10
/* 06B6D8 8006AAD8 8FA8005C */ lw $t0, 0x5c($sp)
/* 06B6DC 8006AADC C62C0094 */ lwc1 $f12, 0x94($s1)
@@ -502,7 +502,7 @@ glabel func_8006A7C0
/* 06BB4C 8006AF4C 030C2021 */ addu $a0, $t8, $t4
/* 06BB50 8006AF50 AFA30060 */ sw $v1, 0x60($sp)
/* 06BB54 8006AF54 00002825 */ move $a1, $zero
/* 06BB58 8006AF58 0C00898D */ jal func_80022634
/* 06BB58 8006AF58 0C00898D */ jal move_s16_towards
/* 06BB5C 8006AF5C AFA8005C */ sw $t0, 0x5c($sp)
/* 06BB60 8006AF60 8FA8005C */ lw $t0, 0x5c($sp)
/* 06BB64 8006AF64 00107080 */ sll $t6, $s0, 2
@@ -514,7 +514,7 @@ glabel func_8006A7C0
/* 06BB7C 8006AF7C 01C86821 */ addu $t5, $t6, $t0
/* 06BB80 8006AF80 01AB2021 */ addu $a0, $t5, $t3
/* 06BB84 8006AF84 34C6CCCD */ ori $a2, (0x3DCCCCCD & 0xFFFF) # ori $a2, $a2, 0xcccd
/* 06BB88 8006AF88 0C00898D */ jal func_80022634
/* 06BB88 8006AF88 0C00898D */ jal move_s16_towards
/* 06BB8C 8006AF8C 00002825 */ move $a1, $zero
/* 06BB90 8006AF90 8FA30060 */ lw $v1, 0x60($sp)
/* 06BB94 8006AF94 00102E00 */ sll $a1, $s0, 0x18
asm/non_matchings/code_8008C1D0/code_8008C1D0.s
+23 -23
View File
@@ -763,7 +763,7 @@ glabel func_8008D4B4
/* 08E0E4 8008D4E4 24E40080 */ addiu $a0, $a3, 0x80
/* 08E0E8 8008D4E8 3C0543C8 */ lui $a1, 0x43c8
/* 08E0EC 8008D4EC 3C063F00 */ lui $a2, 0x3f00
/* 08E0F0 8008D4F0 0C008973 */ jal func_800225CC
/* 08E0F0 8008D4F0 0C008973 */ jal move_f32_towards
/* 08E0F4 8008D4F4 AFA70018 */ sw $a3, 0x18($sp)
/* 08E0F8 8008D4F8 10000007 */ b .L8008D518
/* 08E0FC 8008D4FC 8FA70018 */ lw $a3, 0x18($sp)
@@ -771,7 +771,7 @@ glabel func_8008D4B4
/* 08E100 8008D500 3C063DCC */ lui $a2, (0x3DCCCCCD >> 16) # lui $a2, 0x3dcc
/* 08E104 8008D504 34C6CCCD */ ori $a2, (0x3DCCCCCD & 0xFFFF) # ori $a2, $a2, 0xcccd
/* 08E108 8008D508 24050000 */ li $a1, 0
/* 08E10C 8008D50C 0C008973 */ jal func_800225CC
/* 08E10C 8008D50C 0C008973 */ jal move_f32_towards
/* 08E110 8008D510 AFA70018 */ sw $a3, 0x18($sp)
/* 08E114 8008D514 8FA70018 */ lw $a3, 0x18($sp)
.L8008D518:
@@ -1738,7 +1738,7 @@ glabel func_8008E118
/* 08EF0C 8008E30C 3C053F33 */ lui $a1, (0x3F333333 >> 16) # lui $a1, 0x3f33
/* 08EF10 8008E310 3C063DCC */ lui $a2, (0x3DCCCCCD >> 16) # lui $a2, 0x3dcc
/* 08EF14 8008E314 34C6CCCD */ ori $a2, (0x3DCCCCCD & 0xFFFF) # ori $a2, $a2, 0xcccd
/* 08EF18 8008E318 0C008973 */ jal func_800225CC
/* 08EF18 8008E318 0C008973 */ jal move_f32_towards
/* 08EF1C 8008E31C 34A53333 */ ori $a1, (0x3F333333 & 0xFFFF) # ori $a1, $a1, 0x3333
/* 08EF20 8008E320 960E0254 */ lhu $t6, 0x254($s0)
/* 08EF24 8008E324 3C01800E */ lui $at, %hi(gKartBoundingBoxTable)
@@ -1754,8 +1754,8 @@ glabel func_8008E118
/* 08EF4C 8008E34C 26040070 */ addiu $a0, $s0, 0x70
/* 08EF50 8008E350 462042A0 */ cvt.s.d $f10, $f8
/* 08EF54 8008E354 44055000 */ mfc1 $a1, $f10
/* 08EF58 8008E358 0C008973 */ jal func_800225CC
/* 08EF5C 8008E35C 00000000 */ nop
/* 08EF58 8008E358 0C008973 */ jal move_f32_towards
/* 08EF5C 8008E35C 00000000 */ nop
/* 08EF60 8008E360 10000013 */ b .L8008E3B0
/* 08EF64 8008E364 8FBF001C */ lw $ra, 0x1c($sp)
.L8008E368:
@@ -1793,7 +1793,7 @@ glabel func_8008E3C0
/* 08EFD4 8008E3D4 34C6CCCD */ ori $a2, (0x3DCCCCCD & 0xFFFF) # ori $a2, $a2, 0xcccd
/* 08EFD8 8008E3D8 AFA70018 */ sw $a3, 0x18($sp)
/* 08EFDC 8008E3DC 24840224 */ addiu $a0, $a0, 0x224
/* 08EFE0 8008E3E0 0C008973 */ jal func_800225CC
/* 08EFE0 8008E3E0 0C008973 */ jal move_f32_towards
/* 08EFE4 8008E3E4 3C053F80 */ lui $a1, 0x3f80
/* 08EFE8 8008E3E8 8FA70018 */ lw $a3, 0x18($sp)
/* 08EFEC 8008E3EC 3C05800E */ lui $a1, %hi(gKartBoundingBoxTable) # 0x800e
@@ -1803,7 +1803,7 @@ glabel func_8008E3C0
/* 08EFFC 8008E3FC 24E40070 */ addiu $a0, $a3, 0x70
/* 08F000 8008E400 000E7880 */ sll $t7, $t6, 2
/* 08F004 8008E404 00AF2821 */ addu $a1, $a1, $t7
/* 08F008 8008E408 0C008973 */ jal func_800225CC
/* 08F008 8008E408 0C008973 */ jal move_f32_towards
/* 08F00C 8008E40C 8CA526B0 */ lw $a1, %lo(gKartBoundingBoxTable)($a1) # 0x26b0($a1)
/* 08F010 8008E410 8FA70018 */ lw $a3, 0x18($sp)
/* 08F014 8008E414 3C01BFFF */ lui $at, (0xBFFFFFFF >> 16) # lui $at, 0xbfff
@@ -2490,7 +2490,7 @@ glabel func_8008EDC0
/* 08FA10 8008EE10 3C063C23 */ lui $a2, 0x3c23
/* 08FA14 8008EE14 24E40080 */ addiu $a0, $a3, 0x80
/* 08FA18 8008EE18 24050000 */ li $a1, 0
/* 08FA1C 8008EE1C 0C008973 */ jal func_800225CC
/* 08FA1C 8008EE1C 0C008973 */ jal move_f32_towards
/* 08FA20 8008EE20 AFA70018 */ sw $a3, 0x18($sp)
/* 08FA24 8008EE24 10000006 */ b .L8008EE40
/* 08FA28 8008EE28 8FA70018 */ lw $a3, 0x18($sp)
@@ -2498,7 +2498,7 @@ glabel func_8008EDC0
/* 08FA2C 8008EE2C 3C063C23 */ lui $a2, (0x3C23D70A >> 16) # lui $a2, 0x3c23
.L8008EE30:
/* 08FA30 8008EE30 34C6D70A */ ori $a2, (0x3C23D70A & 0xFFFF) # ori $a2, $a2, 0xd70a
/* 08FA34 8008EE34 0C008973 */ jal func_800225CC
/* 08FA34 8008EE34 0C008973 */ jal move_f32_towards
/* 08FA38 8008EE38 AFA70018 */ sw $a3, 0x18($sp)
/* 08FA3C 8008EE3C 8FA70018 */ lw $a3, 0x18($sp)
.L8008EE40:
@@ -2647,7 +2647,7 @@ glabel func_8008F008
/* 08FC4C 8008F04C 11410006 */ beq $t2, $at, .L8008F068
/* 08FC50 8008F050 24050000 */ li $a1, 0
/* 08FC54 8008F054 3C063F80 */ lui $a2, 0x3f80
/* 08FC58 8008F058 0C008973 */ jal func_800225CC
/* 08FC58 8008F058 0C008973 */ jal move_f32_towards
/* 08FC5C 8008F05C AFA70018 */ sw $a3, 0x18($sp)
/* 08FC60 8008F060 10000008 */ b .L8008F084
/* 08FC64 8008F064 8FA70018 */ lw $a3, 0x18($sp)
@@ -2656,7 +2656,7 @@ glabel func_8008F008
/* 08FC6C 8008F06C 34C6CCCD */ ori $a2, (0x3DCCCCCD & 0xFFFF) # ori $a2, $a2, 0xcccd
/* 08FC70 8008F070 24E40080 */ addiu $a0, $a3, 0x80
/* 08FC74 8008F074 3C054396 */ lui $a1, 0x4396
/* 08FC78 8008F078 0C008973 */ jal func_800225CC
/* 08FC78 8008F078 0C008973 */ jal move_f32_towards
/* 08FC7C 8008F07C AFA70018 */ sw $a3, 0x18($sp)
/* 08FC80 8008F080 8FA70018 */ lw $a3, 0x18($sp)
.L8008F084:
@@ -4460,15 +4460,15 @@ glabel L800909D0
/* 09164C 80090A4C AFA20028 */ sw $v0, 0x28($sp)
/* 091650 80090A50 26040018 */ addiu $a0, $s0, 0x18
/* 091654 80090A54 44055000 */ mfc1 $a1, $f10
/* 091658 80090A58 0C008973 */ jal func_800225CC
/* 09165C 80090A5C 00000000 */ nop
/* 091658 80090A58 0C008973 */ jal move_f32_towards
/* 09165C 80090A5C 00000000 */ nop
/* 091660 80090A60 83AE0063 */ lb $t6, 0x63($sp)
/* 091664 80090A64 3C063E4C */ lui $a2, (0x3E4CCCCD >> 16) # lui $a2, 0x3e4c
/* 091668 80090A68 34C6CCCD */ ori $a2, (0x3E4CCCCD & 0xFFFF) # ori $a2, $a2, 0xcccd
/* 09166C 80090A6C 000E7840 */ sll $t7, $t6, 1
/* 091670 80090A70 020F2021 */ addu $a0, $s0, $t7
/* 091674 80090A74 248400CC */ addiu $a0, $a0, 0xcc
/* 091678 80090A78 0C00898D */ jal func_80022634
/* 091678 80090A78 0C00898D */ jal move_s16_towards
/* 09167C 80090A7C 00002825 */ move $a1, $zero
/* 091680 80090A80 8FB80028 */ lw $t8, 0x28($sp)
/* 091684 80090A84 3C014220 */ li $at, 0x42200000 # 40.000000
@@ -4499,15 +4499,15 @@ glabel L800909D0
/* 0916E4 80090AE4 460A4480 */ add.s $f18, $f8, $f10
/* 0916E8 80090AE8 26040018 */ addiu $a0, $s0, 0x18
/* 0916EC 80090AEC 44059000 */ mfc1 $a1, $f18
/* 0916F0 80090AF0 0C008973 */ jal func_800225CC
/* 0916F4 80090AF4 00000000 */ nop
/* 0916F0 80090AF0 0C008973 */ jal move_f32_towards
/* 0916F4 80090AF4 00000000 */ nop
/* 0916F8 80090AF8 83AC0063 */ lb $t4, 0x63($sp)
/* 0916FC 80090AFC 3C063E4C */ lui $a2, (0x3E4CCCCD >> 16) # lui $a2, 0x3e4c
/* 091700 80090B00 34C6CCCD */ ori $a2, (0x3E4CCCCD & 0xFFFF) # ori $a2, $a2, 0xcccd
/* 091704 80090B04 000C6840 */ sll $t5, $t4, 1
/* 091708 80090B08 020D2021 */ addu $a0, $s0, $t5
/* 09170C 80090B0C 248400CC */ addiu $a0, $a0, 0xcc
/* 091710 80090B10 0C00898D */ jal func_80022634
/* 091710 80090B10 0C00898D */ jal move_s16_towards
/* 091714 80090B14 00002825 */ move $a1, $zero
/* 091718 80090B18 3C014220 */ li $at, 0x42200000 # 40.000000
/* 09171C 80090B1C 44813000 */ mtc1 $at, $f6
@@ -4564,8 +4564,8 @@ glabel L80090B80
/* 0917D8 80090BD8 46125400 */ add.s $f16, $f10, $f18
/* 0917DC 80090BDC 26040018 */ addiu $a0, $s0, 0x18
/* 0917E0 80090BE0 44058000 */ mfc1 $a1, $f16
/* 0917E4 80090BE4 0C008973 */ jal func_800225CC
/* 0917E8 80090BE8 00000000 */ nop
/* 0917E4 80090BE4 0C008973 */ jal move_f32_towards
/* 0917E8 80090BE8 00000000 */ nop
/* 0917EC 80090BEC 861800C6 */ lh $t8, 0xc6($s0)
/* 0917F0 80090BF0 24090002 */ li $t1, 2
/* 0917F4 80090BF4 2719FFF8 */ addiu $t9, $t8, -8
@@ -4589,8 +4589,8 @@ glabel L80090B80
/* 091838 80090C38 46043200 */ add.s $f8, $f6, $f4
/* 09183C 80090C3C 26040018 */ addiu $a0, $s0, 0x18
/* 091840 80090C40 44054000 */ mfc1 $a1, $f8
/* 091844 80090C44 0C008973 */ jal func_800225CC
/* 091848 80090C48 00000000 */ nop
/* 091844 80090C44 0C008973 */ jal move_f32_towards
/* 091848 80090C48 00000000 */ nop
/* 09184C 80090C4C 860C00C6 */ lh $t4, 0xc6($s0)
/* 091850 80090C50 240F0002 */ li $t7, 2
/* 091854 80090C54 258DFFF8 */ addiu $t5, $t4, -8
@@ -4771,8 +4771,8 @@ glabel L80090E08
/* 091AEC 80090EEC 26040018 */ addiu $a0, $s0, 0x18
/* 091AF0 80090EF0 46082281 */ sub.s $f10, $f4, $f8
/* 091AF4 80090EF4 44055000 */ mfc1 $a1, $f10
/* 091AF8 80090EF8 0C008973 */ jal func_800225CC
/* 091AFC 80090EFC 00000000 */ nop
/* 091AF8 80090EF8 0C008973 */ jal move_f32_towards
/* 091AFC 80090EFC 00000000 */ nop
/* 091B00 80090F00 860E00C8 */ lh $t6, 0xc8($s0)
/* 091B04 80090F04 8E0200BC */ lw $v0, 0xbc($s0)
/* 091B08 80090F08 24010008 */ li $at, 8
asm/non_matchings/code_8008C1D0/func_8008D4B4.s
+2 -2
View File
@@ -15,7 +15,7 @@ glabel func_8008D4B4
/* 08E0E4 8008D4E4 24E40080 */ addiu $a0, $a3, 0x80
/* 08E0E8 8008D4E8 3C0543C8 */ lui $a1, 0x43c8
/* 08E0EC 8008D4EC 3C063F00 */ lui $a2, 0x3f00
/* 08E0F0 8008D4F0 0C008973 */ jal func_800225CC
/* 08E0F0 8008D4F0 0C008973 */ jal move_f32_towards
/* 08E0F4 8008D4F4 AFA70018 */ sw $a3, 0x18($sp)
/* 08E0F8 8008D4F8 10000007 */ b .L8008D518
/* 08E0FC 8008D4FC 8FA70018 */ lw $a3, 0x18($sp)
@@ -23,7 +23,7 @@ glabel func_8008D4B4
/* 08E100 8008D500 3C063DCC */ lui $a2, (0x3DCCCCCD >> 16) # lui $a2, 0x3dcc
/* 08E104 8008D504 34C6CCCD */ ori $a2, (0x3DCCCCCD & 0xFFFF) # ori $a2, $a2, 0xcccd
/* 08E108 8008D508 24050000 */ li $a1, 0
/* 08E10C 8008D50C 0C008973 */ jal func_800225CC
/* 08E10C 8008D50C 0C008973 */ jal move_f32_towards
/* 08E110 8008D510 AFA70018 */ sw $a3, 0x18($sp)
/* 08E114 8008D514 8FA70018 */ lw $a3, 0x18($sp)
.L8008D518:
asm/non_matchings/code_8008C1D0/func_8008E118.s
+2 -2
View File
@@ -131,7 +131,7 @@ glabel func_8008E118
/* 08EF0C 8008E30C 3C053F33 */ lui $a1, (0x3F333333 >> 16) # lui $a1, 0x3f33
/* 08EF10 8008E310 3C063DCC */ lui $a2, (0x3DCCCCCD >> 16) # lui $a2, 0x3dcc
/* 08EF14 8008E314 34C6CCCD */ ori $a2, (0x3DCCCCCD & 0xFFFF) # ori $a2, $a2, 0xcccd
/* 08EF18 8008E318 0C008973 */ jal func_800225CC
/* 08EF18 8008E318 0C008973 */ jal move_f32_towards
/* 08EF1C 8008E31C 34A53333 */ ori $a1, (0x3F333333 & 0xFFFF) # ori $a1, $a1, 0x3333
/* 08EF20 8008E320 960E0254 */ lhu $t6, 0x254($s0)
/* 08EF24 8008E324 3C01800E */ lui $at, %hi(gKartBoundingBoxTable)
@@ -147,7 +147,7 @@ glabel func_8008E118
/* 08EF4C 8008E34C 26040070 */ addiu $a0, $s0, 0x70
/* 08EF50 8008E350 462042A0 */ cvt.s.d $f10, $f8
/* 08EF54 8008E354 44055000 */ mfc1 $a1, $f10
/* 08EF58 8008E358 0C008973 */ jal func_800225CC
/* 08EF58 8008E358 0C008973 */ jal move_f32_towards
/* 08EF5C 8008E35C 00000000 */ nop
/* 08EF60 8008E360 10000013 */ b .L8008E3B0
/* 08EF64 8008E364 8FBF001C */ lw $ra, 0x1c($sp)
asm/non_matchings/code_8008C1D0/func_8008E3C0.s
+2 -2
View File
@@ -7,7 +7,7 @@ glabel func_8008E3C0
/* 08EFD4 8008E3D4 34C6CCCD */ ori $a2, (0x3DCCCCCD & 0xFFFF) # ori $a2, $a2, 0xcccd
/* 08EFD8 8008E3D8 AFA70018 */ sw $a3, 0x18($sp)
/* 08EFDC 8008E3DC 24840224 */ addiu $a0, $a0, 0x224
/* 08EFE0 8008E3E0 0C008973 */ jal func_800225CC
/* 08EFE0 8008E3E0 0C008973 */ jal move_f32_towards
/* 08EFE4 8008E3E4 3C053F80 */ lui $a1, 0x3f80
/* 08EFE8 8008E3E8 8FA70018 */ lw $a3, 0x18($sp)
/* 08EFEC 8008E3EC 3C05800E */ lui $a1, %hi(gKartBoundingBoxTable) # 0x800e
@@ -17,7 +17,7 @@ glabel func_8008E3C0
/* 08EFFC 8008E3FC 24E40070 */ addiu $a0, $a3, 0x70
/* 08F000 8008E400 000E7880 */ sll $t7, $t6, 2
/* 08F004 8008E404 00AF2821 */ addu $a1, $a1, $t7
/* 08F008 8008E408 0C008973 */ jal func_800225CC
/* 08F008 8008E408 0C008973 */ jal move_f32_towards
/* 08F00C 8008E40C 8CA526B0 */ lw $a1, %lo(gKartBoundingBoxTable)($a1) # 0x26b0($a1)
/* 08F010 8008E410 8FA70018 */ lw $a3, 0x18($sp)
/* 08F014 8008E414 3C01BFFF */ lui $at, (0xBFFFFFFF >> 16) # lui $at, 0xbfff
asm/non_matchings/code_8008C1D0/func_8008EDC0.s
+2 -2
View File
@@ -23,7 +23,7 @@ glabel func_8008EDC0
/* 08FA10 8008EE10 3C063C23 */ lui $a2, 0x3c23
/* 08FA14 8008EE14 24E40080 */ addiu $a0, $a3, 0x80
/* 08FA18 8008EE18 24050000 */ li $a1, 0
/* 08FA1C 8008EE1C 0C008973 */ jal func_800225CC
/* 08FA1C 8008EE1C 0C008973 */ jal move_f32_towards
/* 08FA20 8008EE20 AFA70018 */ sw $a3, 0x18($sp)
/* 08FA24 8008EE24 10000006 */ b .L8008EE40
/* 08FA28 8008EE28 8FA70018 */ lw $a3, 0x18($sp)
@@ -31,7 +31,7 @@ glabel func_8008EDC0
/* 08FA2C 8008EE2C 3C063C23 */ lui $a2, (0x3C23D70A >> 16) # lui $a2, 0x3c23
.L8008EE30:
/* 08FA30 8008EE30 34C6D70A */ ori $a2, (0x3C23D70A & 0xFFFF) # ori $a2, $a2, 0xd70a
/* 08FA34 8008EE34 0C008973 */ jal func_800225CC
/* 08FA34 8008EE34 0C008973 */ jal move_f32_towards
/* 08FA38 8008EE38 AFA70018 */ sw $a3, 0x18($sp)
/* 08FA3C 8008EE3C 8FA70018 */ lw $a3, 0x18($sp)
.L8008EE40:
asm/non_matchings/code_8008C1D0/func_8008F008.s
+2 -2
View File
@@ -19,7 +19,7 @@ glabel func_8008F008
/* 08FC4C 8008F04C 11410006 */ beq $t2, $at, .L8008F068
/* 08FC50 8008F050 24050000 */ li $a1, 0
/* 08FC54 8008F054 3C063F80 */ lui $a2, 0x3f80
/* 08FC58 8008F058 0C008973 */ jal func_800225CC
/* 08FC58 8008F058 0C008973 */ jal move_f32_towards
/* 08FC5C 8008F05C AFA70018 */ sw $a3, 0x18($sp)
/* 08FC60 8008F060 10000008 */ b .L8008F084
/* 08FC64 8008F064 8FA70018 */ lw $a3, 0x18($sp)
@@ -28,7 +28,7 @@ glabel func_8008F008
/* 08FC6C 8008F06C 34C6CCCD */ ori $a2, (0x3DCCCCCD & 0xFFFF) # ori $a2, $a2, 0xcccd
/* 08FC70 8008F070 24E40080 */ addiu $a0, $a3, 0x80
/* 08FC74 8008F074 3C054396 */ lui $a1, 0x4396
/* 08FC78 8008F078 0C008973 */ jal func_800225CC
/* 08FC78 8008F078 0C008973 */ jal move_f32_towards
/* 08FC7C 8008F07C AFA70018 */ sw $a3, 0x18($sp)
/* 08FC80 8008F080 8FA70018 */ lw $a3, 0x18($sp)
.L8008F084:
asm/non_matchings/code_8008C1D0/func_80090970.s
+7 -7
View File
@@ -60,7 +60,7 @@ glabel L800909D0
/* 09164C 80090A4C AFA20028 */ sw $v0, 0x28($sp)
/* 091650 80090A50 26040018 */ addiu $a0, $s0, 0x18
/* 091654 80090A54 44055000 */ mfc1 $a1, $f10
/* 091658 80090A58 0C008973 */ jal func_800225CC
/* 091658 80090A58 0C008973 */ jal move_f32_towards
/* 09165C 80090A5C 00000000 */ nop
/* 091660 80090A60 83AE0063 */ lb $t6, 0x63($sp)
/* 091664 80090A64 3C063E4C */ lui $a2, (0x3E4CCCCD >> 16) # lui $a2, 0x3e4c
@@ -68,7 +68,7 @@ glabel L800909D0
/* 09166C 80090A6C 000E7840 */ sll $t7, $t6, 1
/* 091670 80090A70 020F2021 */ addu $a0, $s0, $t7
/* 091674 80090A74 248400CC */ addiu $a0, $a0, 0xcc
/* 091678 80090A78 0C00898D */ jal func_80022634
/* 091678 80090A78 0C00898D */ jal move_s16_towards
/* 09167C 80090A7C 00002825 */ move $a1, $zero
/* 091680 80090A80 8FB80028 */ lw $t8, 0x28($sp)
/* 091684 80090A84 3C014220 */ li $at, 0x42200000 # 40.000000
@@ -99,7 +99,7 @@ glabel L800909D0
/* 0916E4 80090AE4 460A4480 */ add.s $f18, $f8, $f10
/* 0916E8 80090AE8 26040018 */ addiu $a0, $s0, 0x18
/* 0916EC 80090AEC 44059000 */ mfc1 $a1, $f18
/* 0916F0 80090AF0 0C008973 */ jal func_800225CC
/* 0916F0 80090AF0 0C008973 */ jal move_f32_towards
/* 0916F4 80090AF4 00000000 */ nop
/* 0916F8 80090AF8 83AC0063 */ lb $t4, 0x63($sp)
/* 0916FC 80090AFC 3C063E4C */ lui $a2, (0x3E4CCCCD >> 16) # lui $a2, 0x3e4c
@@ -107,7 +107,7 @@ glabel L800909D0
/* 091704 80090B04 000C6840 */ sll $t5, $t4, 1
/* 091708 80090B08 020D2021 */ addu $a0, $s0, $t5
/* 09170C 80090B0C 248400CC */ addiu $a0, $a0, 0xcc
/* 091710 80090B10 0C00898D */ jal func_80022634
/* 091710 80090B10 0C00898D */ jal move_s16_towards
/* 091714 80090B14 00002825 */ move $a1, $zero
/* 091718 80090B18 3C014220 */ li $at, 0x42200000 # 40.000000
/* 09171C 80090B1C 44813000 */ mtc1 $at, $f6
@@ -164,7 +164,7 @@ glabel L80090B80
/* 0917D8 80090BD8 46125400 */ add.s $f16, $f10, $f18
/* 0917DC 80090BDC 26040018 */ addiu $a0, $s0, 0x18
/* 0917E0 80090BE0 44058000 */ mfc1 $a1, $f16
/* 0917E4 80090BE4 0C008973 */ jal func_800225CC
/* 0917E4 80090BE4 0C008973 */ jal move_f32_towards
/* 0917E8 80090BE8 00000000 */ nop
/* 0917EC 80090BEC 861800C6 */ lh $t8, 0xc6($s0)
/* 0917F0 80090BF0 24090002 */ li $t1, 2
@@ -189,7 +189,7 @@ glabel L80090B80
/* 091838 80090C38 46043200 */ add.s $f8, $f6, $f4
/* 09183C 80090C3C 26040018 */ addiu $a0, $s0, 0x18
/* 091840 80090C40 44054000 */ mfc1 $a1, $f8
/* 091844 80090C44 0C008973 */ jal func_800225CC
/* 091844 80090C44 0C008973 */ jal move_f32_towards
/* 091848 80090C48 00000000 */ nop
/* 09184C 80090C4C 860C00C6 */ lh $t4, 0xc6($s0)
/* 091850 80090C50 240F0002 */ li $t7, 2
@@ -371,7 +371,7 @@ glabel L80090E08
/* 091AEC 80090EEC 26040018 */ addiu $a0, $s0, 0x18
/* 091AF0 80090EF0 46082281 */ sub.s $f10, $f4, $f8
/* 091AF4 80090EF4 44055000 */ mfc1 $a1, $f10
/* 091AF8 80090EF8 0C008973 */ jal func_800225CC
/* 091AF8 80090EF8 0C008973 */ jal move_f32_towards
/* 091AFC 80090EFC 00000000 */ nop
/* 091B00 80090F00 860E00C8 */ lh $t6, 0xc8($s0)
/* 091B04 80090F04 8E0200BC */ lw $v0, 0xbc($s0)
src/code_8001C4D0.c
+45 -45
View File
@@ -248,7 +248,7 @@ void func_8001CA24(Player *arg0, f32 arg1) {
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
//? func_800225CC(f32 *, ?, ?); // extern
//? move_f32_towards(f32 *, ?, ?); // extern
//? func_802B63B8(f32 *, f32 *); // extern
extern u16 D_801645C8;
extern f32 D_80164A30;
@@ -304,7 +304,7 @@ void func_8001CA78(s32 arg0, void *arg1, void *arg2, f32 *arg3, f32 *arg4, f32 *
sp44 = temp_f16;
temp_f18 = sp6C + (temp_s2->unk2 + D_80164A30 + 6.0f);
sp48 = temp_f18;
func_800225CC(&D_80164A30, 0, 0x3CA3D70A);
move_f32_towards(&D_80164A30, 0, 0x3CA3D70A);
temp_f0 = arg1->unk0;
*arg3 = ((phi_f14_2 - temp_f0) * 1.0f) + temp_f0;
temp_f2 = arg1->unk4;
@@ -318,7 +318,7 @@ GLOBAL_ASM("asm/non_matchings/code_8001C4D0/func_8001CA78.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800225CC(f32, f32, f32 *, f32, ?); // extern
? move_f32_towards(f32, f32, f32 *, f32, ?); // extern
? func_802B63B8(f32 *, f32 *, f32 *, f32 *); // extern
extern ? D_800DDB30;
extern f64 D_800ED528;
@@ -442,10 +442,10 @@ void func_8001CCEC(void *arg0, void *arg1, void *arg2, f32 *arg3, f32 *arg4, f32
sp44 = temp_a0;
sp50 = phi_f16;
sp5C = phi_f18;
func_800225CC(temp_f12, 0.0f, temp_a0, 20.0f, 0x3DCCCCCD);
move_f32_towards(temp_f12, 0.0f, temp_a0, 20.0f, 0x3DCCCCCD);
temp_a0_2 = temp_s2 + &D_80164A48;
sp40 = temp_a0_2;
func_800225CC((bitwise f32) temp_a0_2, 1.5f, 0x3DCCCCCD);
move_f32_towards((bitwise f32) temp_a0_2, 1.5f, 0x3DCCCCCD);
temp_v1_2 = temp_s2 + &D_80164A78;
*temp_v1_2 = *temp_v1_2 + D_800ED550;
phi_v1_2 = temp_v1_2;
@@ -458,10 +458,10 @@ void func_8001CCEC(void *arg0, void *arg1, void *arg2, f32 *arg3, f32 *arg4, f32
sp44 = temp_a0_3;
sp50 = phi_f16;
sp5C = phi_f18;
func_800225CC(temp_f12, 0.0f, temp_a0_3, 0.0f, 0x3DCCCCCD);
move_f32_towards(temp_f12, 0.0f, temp_a0_3, 0.0f, 0x3DCCCCCD);
temp_a0_4 = temp_s2_2 + &D_80164A48;
sp40 = temp_a0_4;
func_800225CC((bitwise f32) temp_a0_4, 0.0f, 0x3DCCCCCD);
move_f32_towards((bitwise f32) temp_a0_4, 0.0f, 0x3DCCCCCD);
temp_v1_3 = temp_s2_2 + &D_80164A78;
*temp_v1_3 = *temp_v1_3 - D_800ED558;
temp_f0_4 = *(&D_800DDB30 + (D_800DC52C * 4));
@@ -477,35 +477,35 @@ void func_8001CCEC(void *arg0, void *arg1, void *arg2, f32 *arg3, f32 *arg4, f32
temp_a0_9 = phi_s2 + &D_80164A90;
sp38 = temp_a0_9;
sp3C = phi_v1_2;
func_800225CC((bitwise f32) temp_a0_9, 20.0f, 0x3CA3D70A);
move_f32_towards((bitwise f32) temp_a0_9, 20.0f, 0x3CA3D70A);
temp_a0_10 = phi_s2 + &D_80164AA0;
sp34 = temp_a0_10;
func_800225CC((bitwise f32) temp_a0_10, 10.0f, 0x3CA3D70A);
move_f32_towards((bitwise f32) temp_a0_10, 10.0f, 0x3CA3D70A);
} else if (gCurrentCourseId == 4) {
temp_a0_5 = phi_s2 + &D_80164A90;
sp38 = temp_a0_5;
sp3C = phi_v1_2;
func_800225CC((bitwise f32) temp_a0_5, 50.0f, 0x3D23D70A);
move_f32_towards((bitwise f32) temp_a0_5, 50.0f, 0x3D23D70A);
temp_a0_6 = phi_s2 + &D_80164AA0;
sp34 = temp_a0_6;
func_800225CC((bitwise f32) temp_a0_6, 35.0f, 0x3D23D70A);
move_f32_towards((bitwise f32) temp_a0_6, 35.0f, 0x3D23D70A);
} else {
temp_a0_7 = phi_s2 + &D_80164A90;
sp38 = temp_a0_7;
sp3C = phi_v1_2;
func_800225CC((bitwise f32) temp_a0_7, 40.0f, 0x3CA3D70A);
move_f32_towards((bitwise f32) temp_a0_7, 40.0f, 0x3CA3D70A);
temp_a0_8 = phi_s2 + &D_80164AA0;
sp34 = temp_a0_8;
func_800225CC((bitwise f32) temp_a0_8, 20.0f, 0x3CA3D70A);
move_f32_towards((bitwise f32) temp_a0_8, 20.0f, 0x3CA3D70A);
}
} else {
temp_a0_11 = phi_s2 + &D_80164A90;
sp38 = temp_a0_11;
sp3C = phi_v1_2;
func_800225CC((bitwise f32) temp_a0_11, 0.0f, 0x3D23D70A);
move_f32_towards((bitwise f32) temp_a0_11, 0.0f, 0x3D23D70A);
temp_a0_12 = phi_s2 + &D_80164AA0;
sp34 = temp_a0_12;
func_800225CC((bitwise f32) temp_a0_12, 0.0f, 0x3D23D70A);
move_f32_towards((bitwise f32) temp_a0_12, 0.0f, 0x3D23D70A);
}
temp_f0_5 = D_800ED560;
sp90 = arg1->unk30;
@@ -561,7 +561,7 @@ GLOBAL_ASM("asm/non_matchings/code_8001C4D0/func_8001CCEC.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800225CC(void *, f32, ?); // extern
? move_f32_towards(void *, f32, ?); // extern
? func_802B63B8(f32 *, f32 *, f32 *, f32 *); // extern
extern ? D_80164A90;
extern ? D_80164AA0;
@@ -586,9 +586,9 @@ void func_8001D53C(void *arg0, void *arg1, void *arg2, f32 *arg3, f32 *arg4, f32
arg1->unkA0 = 0.0f;
}
if (arg0->unk222 != 4) {
func_800225CC(arg1 + 0xA0, 20.0f, 0x3D75C28F);
move_f32_towards(arg1 + 0xA0, 20.0f, 0x3D75C28F);
} else {
func_800225CC(arg1 + 0xA0, 0.0f, 0x3D75C28F);
move_f32_towards(arg1 + 0xA0, 0.0f, 0x3D75C28F);
}
temp_f6 = D_801652A0[arg7];
sp3C = temp_f6;
@@ -669,7 +669,7 @@ GLOBAL_ASM("asm/non_matchings/code_8001C4D0/func_8001D794.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800225CC(f32, f32, f32 *, f32, ?); // extern
? move_f32_towards(f32, f32, f32 *, f32, ?); // extern
? func_802B63B8(f32 *, f32 *, f32 *, f32 *); // extern
extern ? D_800DDB30;
extern f64 D_800ED580;
@@ -789,10 +789,10 @@ void func_8001D944(void *arg0, void *arg1, void *arg2, f32 *arg3, f32 *arg4, f32
sp48 = temp_a0;
sp50 = phi_f16;
sp5C = phi_f18;
func_800225CC(temp_f12, 0.0f, temp_a0, 20.0f, 0x3DCCCCCD);
move_f32_towards(temp_f12, 0.0f, temp_a0, 20.0f, 0x3DCCCCCD);
temp_a0_2 = temp_s2 + &D_80164A48;
sp44 = temp_a0_2;
func_800225CC((bitwise f32) temp_a0_2, 1.5f, 0x3DCCCCCD);
move_f32_towards((bitwise f32) temp_a0_2, 1.5f, 0x3DCCCCCD);
temp_v0_2 = temp_s2 + &D_80164A78;
*temp_v0_2 = *temp_v0_2 + D_800ED5A8;
phi_v0_2 = temp_v0_2;
@@ -805,10 +805,10 @@ void func_8001D944(void *arg0, void *arg1, void *arg2, f32 *arg3, f32 *arg4, f32
sp48 = temp_a0_3;
sp50 = phi_f16;
sp5C = phi_f18;
func_800225CC(temp_f12, 0.0f, temp_a0_3, 0.0f, 0x3DCCCCCD);
move_f32_towards(temp_f12, 0.0f, temp_a0_3, 0.0f, 0x3DCCCCCD);
temp_a0_4 = temp_s2_2 + &D_80164A48;
sp44 = temp_a0_4;
func_800225CC((bitwise f32) temp_a0_4, 0.0f, 0x3DCCCCCD);
move_f32_towards((bitwise f32) temp_a0_4, 0.0f, 0x3DCCCCCD);
temp_v0_3 = temp_s2_2 + &D_80164A78;
*temp_v0_3 = *temp_v0_3 - D_800ED5B0;
temp_f0_4 = *(&D_800DDB30 + (D_800DC52C * 4));
@@ -822,18 +822,18 @@ void func_8001D944(void *arg0, void *arg1, void *arg2, f32 *arg3, f32 *arg4, f32
temp_a0_5 = phi_s2 + &D_80164A90;
sp3C = temp_a0_5;
sp40 = phi_v0_2;
func_800225CC((bitwise f32) temp_a0_5, 15.0f, 0x3CA3D70A);
move_f32_towards((bitwise f32) temp_a0_5, 15.0f, 0x3CA3D70A);
temp_a0_6 = phi_s2 + &D_80164AA0;
sp38 = temp_a0_6;
func_800225CC((bitwise f32) temp_a0_6, 20.0f, 0x3CA3D70A);
move_f32_towards((bitwise f32) temp_a0_6, 20.0f, 0x3CA3D70A);
} else {
temp_a0_7 = phi_s2 + &D_80164A90;
sp3C = temp_a0_7;
sp40 = phi_v0_2;
func_800225CC((bitwise f32) temp_a0_7, 0.0f, 0x3CA3D70A);
move_f32_towards((bitwise f32) temp_a0_7, 0.0f, 0x3CA3D70A);
temp_a0_8 = phi_s2 + &D_80164AA0;
sp38 = temp_a0_8;
func_800225CC((bitwise f32) temp_a0_8, 0.0f, 0x3CA3D70A);
move_f32_towards((bitwise f32) temp_a0_8, 0.0f, 0x3CA3D70A);
}
temp_f2_3 = D_800ED5B8;
sp90 = arg1->unk30;
@@ -973,7 +973,7 @@ GLOBAL_ASM("asm/non_matchings/code_8001C4D0/func_8001E0C4.s")
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_8001CCEC(void *, void *, f32 *, f32 *, f32 *, f32 *, ? *, s32, s32); // extern
? func_800224F0(void *, s16, s16, s16); // extern
? func_80022634(void *, ?, ?, s16); // extern
? move_s16_towards(void *, ?, ?, s16); // extern
? func_802ADDC8(void *, f32, f32, f32, f32); // extern
s16 func_802B7830(f32, f32); // extern
@@ -1008,26 +1008,26 @@ void func_8001E45C(void *arg0, void *arg1, s8 arg2) {
temp_a3 = 0xA5 - (temp_v1 / 2);
if ((temp_v0 & 0x20000000) == 0x20000000) {
sp4E = temp_a3;
func_80022634(arg0 + 0xB0, -0xB60, 0x3DCCCCCD, temp_a3);
move_s16_towards(arg0 + 0xB0, -0xB60, 0x3DCCCCCD, temp_a3);
} else {
sp4E = temp_a3;
func_80022634(arg0 + 0xB0, -0x888, 0x3DCCCCCD, temp_a3);
move_s16_towards(arg0 + 0xB0, -0x888, 0x3DCCCCCD, temp_a3);
}
} else {
temp_a3_2 = (temp_v1 / 2) + 0xA5;
if ((temp_v0 & 0x20000000) == 0x20000000) {
sp4E = temp_a3_2;
func_80022634(arg0 + 0xB0, 0xB60, 0x3DCCCCCD, temp_a3_2);
move_s16_towards(arg0 + 0xB0, 0xB60, 0x3DCCCCCD, temp_a3_2);
} else {
sp4E = temp_a3_2;
func_80022634(arg0 + 0xB0, 0x888, 0x3DCCCCCD, temp_a3_2);
move_s16_towards(arg0 + 0xB0, 0x888, 0x3DCCCCCD, temp_a3_2);
}
}
phi_a3 = sp4E;
}
goto block_26;
}
func_80022634(arg0 + 0xB0, 0, 0x3D4CCCCD);
move_s16_towards(arg0 + 0xB0, 0, 0x3D4CCCCD);
temp_v1_2 = arg1->unk78;
temp_a3_3 = (arg0->unk2C / 0xB6) - (arg1->unk2E / 0xB6);
if (temp_v1_2 == 0) {
@@ -1121,7 +1121,7 @@ GLOBAL_ASM("asm/non_matchings/code_8001C4D0/func_8001E8E8.s")
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_8001D944(void *, void *, f32 *, f32 *, f32 *, f32 *, ? *, s32, s32); // extern
? func_800224F0(void *, s16, s16, s16); // extern
? func_80022634(void *, ?, ?, s16); // extern
? move_s16_towards(void *, ?, ?, s16); // extern
? func_802ADDC8(void *, f32, f32, f32, f32); // extern
s16 func_802B7830(f32, f32); // extern
@@ -1156,26 +1156,26 @@ void func_8001EA0C(void *arg0, void *arg1, s8 arg2) {
temp_a3 = 0xA5 - (temp_v1 / 2);
if ((temp_v0 & 0x20000000) == 0x20000000) {
sp4E = temp_a3;
func_80022634(arg0 + 0xB0, -0xB60, 0x3DCCCCCD, temp_a3);
move_s16_towards(arg0 + 0xB0, -0xB60, 0x3DCCCCCD, temp_a3);
} else {
sp4E = temp_a3;
func_80022634(arg0 + 0xB0, -0x888, 0x3DCCCCCD, temp_a3);
move_s16_towards(arg0 + 0xB0, -0x888, 0x3DCCCCCD, temp_a3);
}
} else {
temp_a3_2 = (temp_v1 / 2) + 0xA5;
if ((temp_v0 & 0x20000000) == 0x20000000) {
sp4E = temp_a3_2;
func_80022634(arg0 + 0xB0, 0xB60, 0x3DCCCCCD, temp_a3_2);
move_s16_towards(arg0 + 0xB0, 0xB60, 0x3DCCCCCD, temp_a3_2);
} else {
sp4E = temp_a3_2;
func_80022634(arg0 + 0xB0, 0x888, 0x3DCCCCCD, temp_a3_2);
move_s16_towards(arg0 + 0xB0, 0x888, 0x3DCCCCCD, temp_a3_2);
}
}
phi_a3 = sp4E;
}
goto block_26;
}
func_80022634(arg0 + 0xB0, 0, 0x3D4CCCCD);
move_s16_towards(arg0 + 0xB0, 0, 0x3D4CCCCD);
temp_v1_2 = arg1->unk78;
temp_a3_3 = (arg0->unk2C / 0xB6) - (arg1->unk2E / 0xB6);
if (temp_v1_2 == 0) {
@@ -1382,7 +1382,7 @@ GLOBAL_ASM("asm/non_matchings/code_8001C4D0/func_8001EE98.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909
? func_800225CC(f32, f32 *, ?, ?, s32); /* extern */
? move_f32_towards(f32, f32 *, ?, ?, s32); /* extern */
extern ? D_80164498;
extern ? D_80164A08;
@@ -1451,7 +1451,7 @@ void func_8001F394(Player *player, f32 *arg1) {
phi_a0 = temp_a0;
if (player->unk_00C & 0x40000) {
sp1C = temp_t3;
func_800225CC(0.0f, temp_a0, 0x41A00000, 0x3E4CCCCD, temp_t3);
move_f32_towards(0.0f, temp_a0, 0x41A00000, 0x3E4CCCCD, temp_t3);
} else {
temp_f0 = *temp_a0;
if (temp_f0 > 1.0f) {
@@ -1467,7 +1467,7 @@ block_51:
if ((player->unk_0BC & 0x2000) == 0x2000) {
if (player->unk_0DC != 0) {
sp1C = temp_t3;
func_800225CC(0.0f, temp_t3 + &D_80164498, 0x41000000, 0x3E4CCCCD, temp_t3);
move_f32_towards(0.0f, temp_t3 + &D_80164498, 0x41000000, 0x3E4CCCCD, temp_t3);
}
} else {
temp_a0_2 = temp_t3 + &D_80164498;
@@ -1487,7 +1487,7 @@ block_51:
phi_a0 = temp_a0_3;
if (((temp_v0_2 & 0x100000) == 0x100000) && ((temp_v0_2 & 8) == 8)) {
sp1C = temp_t3;
func_800225CC(0.0f, temp_a0_3, 0x41A00000, 0x3DCCCCCD, temp_t3);
move_f32_towards(0.0f, temp_a0_3, 0x41A00000, 0x3DCCCCCD, temp_t3);
} else {
temp_f0_3 = *temp_a0_3;
if (temp_f0_3 > 1.0f) {
@@ -1503,7 +1503,7 @@ block_51:
phi_a0 = temp_a0_4;
if ((player->unk_00C & 0x100) == 0x100) {
sp1C = temp_t3;
func_800225CC(0.0f, temp_a0_4, 0x41C80000, 0x3F800000, temp_t3);
move_f32_towards(0.0f, temp_a0_4, 0x41C80000, 0x3F800000, temp_t3);
} else {
temp_f0_4 = *temp_a0_4;
if (temp_f0_4 > 1.0f) {
@@ -1520,7 +1520,7 @@ block_51:
phi_a0 = temp_a0_5;
if (((temp_v0_3 & 0x80) == 0x80) || ((temp_v0_3 & 0x40) == 0x40)) {
sp1C = temp_t3;
func_800225CC(0.0f, temp_a0_5, 0x41900000, 0x3E4CCCCD, temp_t3);
move_f32_towards(0.0f, temp_a0_5, 0x41900000, 0x3E4CCCCD, temp_t3);
} else {
temp_f0_5 = *temp_a0_5;
if (temp_f0_5 > 1.0f) {
src/code_8001F980.c
+13 -37
View File
@@ -1050,23 +1050,15 @@ block_8:
GLOBAL_ASM("asm/non_matchings/code_8001F980/func_800224F0.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
void func_80022598(s32 *arg0, s32 arg1, f32 arg2) {
s32 temp_v0;
temp_v0 = *arg0;
*arg0 = temp_v0 - ((temp_v0 - arg1) * arg2);
void move_s32_towards(s32 *startingValue, s32 targetValue, f32 somePercent) {
*startingValue -= ((*startingValue - targetValue) * somePercent);
}
#else
GLOBAL_ASM("asm/non_matchings/code_8001F980/func_80022598.s")
#endif
extern f64 D_800ED680;
extern f64 D_800ED688;
/**
* Function: func_800225CC
* Function: move_f32_towards
* Parameters:
* f32 *startingValue - Pointer to the float that will be modified
@@ -1077,7 +1069,7 @@ extern f64 D_800ED688;
* Moves a given startingValue the given somePercent towards the targetValue
* f32 *thing = 2500;
* func_800225CC(thing, 500, 0.75f);
* move_f32_towards(thing, 500, 0.75f);
* thing now has a value of 1000
* If after the move startingValue is inside of the range [D_800ED688, D_800ED680],
@@ -1088,36 +1080,20 @@ extern f64 D_800ED688;
* can't hit exactly 0 with any reliability, so they force it to 0 if you're
* in a small range around it. Why they only do this for 0 is anyone's guess though
**/
void func_800225CC(f32 *startingValue, f32 targetValue, f32 somePercent) {
void move_f32_towards(f32 *startingValue, f32 targetValue, f32 somePercent) {
*startingValue -= ((*startingValue - targetValue) * somePercent);
if ((*startingValue < D_800ED680) && (D_800ED688 < *startingValue)) {
*startingValue = 0.0f;
}
}
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
void func_80022634(s16 *arg0, s16 arg1, f32 arg2) {
s16 temp_v0;
temp_v0 = *arg0;
*arg0 = temp_v0 - ((temp_v0 - arg1) * arg2);
void move_s16_towards(s16 *startingValue, s16 targetValue, f32 somePercent) {
*startingValue -= ((*startingValue - targetValue) * somePercent);
}
#else
GLOBAL_ASM("asm/non_matchings/code_8001F980/func_80022634.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
void func_80022674(u16 *arg0, s16 arg1, f32 arg2) {
u16 temp_v0;
temp_v0 = *arg0;
*arg0 = temp_v0 - ((temp_v0 - arg1) * arg2);
void move_u16_towards(u16 *startingValue, s16 targetValue, f32 somePercent) {
*startingValue -= ((*startingValue - targetValue) * somePercent);
}
#else
GLOBAL_ASM("asm/non_matchings/code_8001F980/func_80022674.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
@@ -1489,7 +1465,7 @@ GLOBAL_ASM("asm/non_matchings/code_8001F980/func_80022F14.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_80022674(void *, s16, s32, s8); // extern
? move_u16_towards(void *, s16, s32, s8); // extern
extern ? D_80164B40;
extern ? D_80164B50;
extern ? D_80164B60;
@@ -1500,9 +1476,9 @@ void func_80023038(s32 arg0, s8 arg1, s32 arg2, s32 arg3) {
temp_v0 = arg1 * 2;
sp1C = temp_v0;
func_80022674(temp_v0 + &D_80164B40, (arg2 >> 0x10) & 0xFF, arg3, arg1);
func_80022674(sp1C + &D_80164B50, (arg2 >> 8) & 0xFF, arg3);
func_80022674(sp1C + &D_80164B60, arg2 & 0xFF, arg3);
move_u16_towards(temp_v0 + &D_80164B40, (arg2 >> 0x10) & 0xFF, arg3, arg1);
move_u16_towards(sp1C + &D_80164B50, (arg2 >> 8) & 0xFF, arg3);
move_u16_towards(sp1C + &D_80164B60, arg2 & 0xFF, arg3);
}
#else
GLOBAL_ASM("asm/non_matchings/code_8001F980/func_80023038.s")
src/code_80027D00.c
+35 -35
View File
@@ -828,7 +828,7 @@ GLOBAL_ASM("asm/non_matchings/code_80027D00/func_80029200.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_80022634(void *, s16, ?, void *); // extern
? move_s16_towards(void *, s16, ?, void *); // extern
? func_80029200(Player *, s8); // extern
s16 func_802B7830(f32, f32); // extern
s32 func_802B7C40(f32, s32); // extern
@@ -940,7 +940,7 @@ void func_8002934C(Player *player, s32 arg1, s8 arg2, s8 arg3) {
temp_a0 = (player->unk_02E + phi_a3->unk48 + player->unk_0C0) & 0xFFFF;
sp20 = temp_a0;
sp28 = sins(temp_a0);
func_80022634(phi_a3 + 0x50, (coss(temp_a0) * phi_a3->unkCC) + (phi_a3->unkD4 * sp28), 0x3F000000, phi_a3);
move_s16_towards(phi_a3 + 0x50, (coss(temp_a0) * phi_a3->unkCC) + (phi_a3->unkD4 * sp28), 0x3F000000, phi_a3);
temp_a0_2 = phi_a3->unk244;
temp_t3 = arg2 * 4;
temp_v1_2 = 4 << temp_t3;
@@ -1052,8 +1052,8 @@ GLOBAL_ASM("asm/non_matchings/code_80027D00/func_8002934C.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800225CC(void *, f32, ?); // extern
? func_80022634(void *, s16, ?); // extern
? move_f32_towards(void *, f32, ?); // extern
? move_s16_towards(void *, s16, ?); // extern
s32 func_802ABD10(u16); // extern
? func_802AFA34(void *, void *, f32, f32, f32); // extern
? func_802B63B8(f32, f32 *, f32 *, f32 *); // extern
@@ -1167,10 +1167,10 @@ void func_80029B4C(void *arg0, ? arg1, f32 arg2, ? arg3) {
arg0->unk1E8 = sp94 + arg0->unk1C;
func_802AFA34(arg0, arg0 + 0x1E0, sp80, sp84, sp88);
if ((arg0->unkBC & 8) == 0) {
func_800225CC(arg0 + 0x230, (arg0->unk1A8 + arg0->unk1D8) / 2.0f, 0x3F000000);
func_800225CC(arg0 + 0x23C, (arg0->unk1C0 + arg0->unk1F0) / 2.0f, 0x3F000000);
func_800225CC(arg0 + 0x1FC, (arg0->unk1A8 + arg0->unk1C0) / 2.0f, 0x3F000000);
func_800225CC(arg0 + 0x1F8, (arg0->unk1D8 + arg0->unk1F0) / 2.0f, 0x3F000000);
move_f32_towards(arg0 + 0x230, (arg0->unk1A8 + arg0->unk1D8) / 2.0f, 0x3F000000);
move_f32_towards(arg0 + 0x23C, (arg0->unk1C0 + arg0->unk1F0) / 2.0f, 0x3F000000);
move_f32_towards(arg0 + 0x1FC, (arg0->unk1A8 + arg0->unk1C0) / 2.0f, 0x3F000000);
move_f32_towards(arg0 + 0x1F8, (arg0->unk1D8 + arg0->unk1F0) / 2.0f, 0x3F000000);
}
temp_f2_3 = ((*(&D_800DDBD4 + (arg0->unk254 * 4)) * 18.0f) + 1.0f) * arg0->unk224;
sp50 = temp_f2_3;
@@ -1180,7 +1180,7 @@ void func_80029B4C(void *arg0, ? arg1, f32 arg2, ? arg3) {
phi_v0 = arg0->unkBC & 8;
}
if (phi_v0 != 8) {
func_80022634(arg0 + 0xC4, func_802B7C40((arg0->unk1F8 - arg0->unk1FC) / temp_f2_3), 0x3F000000);
move_s16_towards(arg0 + 0xC4, func_802B7C40((arg0->unk1F8 - arg0->unk1FC) / temp_f2_3), 0x3F000000);
} else {
temp_f0_2 = arg0->unk24 - arg2;
sp54 = temp_f0_2;
@@ -1189,7 +1189,7 @@ void func_80029B4C(void *arg0, ? arg1, f32 arg2, ? arg3) {
if (temp_f0_2 >= 0.0f) {
phi_a1 = temp_v0 / 4;
}
func_80022634(arg0 + 0xC4, phi_a1, 0x3F000000);
move_s16_towards(arg0 + 0xC4, phi_a1, 0x3F000000);
}
if (((arg0->unkBC & 8) == 8) && ((arg0->unkCA & 2) == 2)) {
arg0->unkC4 = arg0->unkD9C;
@@ -1222,7 +1222,7 @@ GLOBAL_ASM("asm/non_matchings/code_80027D00/func_80029B4C.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_80022634(void *, s16, ?); // extern
? move_s16_towards(void *, s16, ?); // extern
s32 func_802ABD10(u16); // extern
s32 func_802ABD7C(u16); // extern
f32 func_802ABE30(f32, f32, f32, u16); // extern
@@ -1305,7 +1305,7 @@ void func_8002A194(void *arg0, f32 arg1, f32 arg2, f32 arg3) {
temp_f20 = (*(&D_800DDBD4 + (arg0->unk254 * 4)) * 18.0f) + 1.0f;
arg0->unk206 = -func_802B7C40((arg0->unk23C - arg0->unk230) / temp_f20);
if ((arg0->unkBC & 8) != 8) {
func_80022634(arg0 + 0xC4, func_802B7C40((arg0->unk1F8 - arg0->unk1FC) / temp_f20), 0x3F000000);
move_s16_towards(arg0 + 0xC4, func_802B7C40((arg0->unk1F8 - arg0->unk1FC) / temp_f20), 0x3F000000);
} else {
temp_f0_2 = arg0->unk24 - arg2;
sp30 = temp_f0_2;
@@ -1314,7 +1314,7 @@ void func_8002A194(void *arg0, f32 arg1, f32 arg2, f32 arg3) {
if (temp_f0_2 >= 0.0f) {
phi_a1 = (temp_v0 << 0x11) >> 0x10;
}
func_80022634(arg0 + 0xC4, phi_a1, 0x3F000000);
move_s16_towards(arg0 + 0xC4, phi_a1, 0x3F000000);
}
if (func_802ABD7C(arg0->unk11A) != 0) {
arg0->unk1F4 = arg0->unk1F4 | 1;
@@ -1608,7 +1608,7 @@ void func_8002AAC0(Player *player) {
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800225CC(void *, f32, ?); // extern
? move_f32_towards(void *, f32, ?); // extern
extern f32 D_800ED7B8;
extern f32 D_800ED7BC;
extern f32 D_800ED7C0;
@@ -1629,38 +1629,38 @@ void func_8002AB70(void *arg0) {
if (((arg0->unkBC & 8) != 8) && (arg0->unk8C > 0.0f)) {
temp_lo = arg0->unkC4 / 0xB6;
if ((temp_lo < -1) && (temp_lo >= -0x14) && (((arg0->unk94 / 18.0f) * 216.0f) >= 20.0f)) {
func_800225CC(arg0 + 0x100, 500.0f, 0x3F800000);
move_f32_towards(arg0 + 0x100, 500.0f, 0x3F800000);
temp_a0 = arg0 + 0xDAC;
sp20 = temp_a0;
func_800225CC(temp_a0, 3.0f, 0x3D4CCCCD);
move_f32_towards(temp_a0, 3.0f, 0x3D4CCCCD);
} else {
func_800225CC(arg0 + 0x100, gKartGravityTable[arg0->unk254], 0x3DCCCCCD);
move_f32_towards(arg0 + 0x100, gKartGravityTable[arg0->unk254], 0x3DCCCCCD);
temp_a0_2 = arg0 + 0xDAC;
sp20 = temp_a0_2;
func_800225CC(temp_a0_2, 1.0f, 0x3D8F5C29);
move_f32_towards(temp_a0_2, 1.0f, 0x3D8F5C29);
}
} else {
if (arg0->unk124 >= 50.0f) {
arg0->unkDAC = 2.0f;
}
func_800225CC(arg0 + 0x100, gKartGravityTable[arg0->unk254], 0x3CA3D70A);
move_f32_towards(arg0 + 0x100, gKartGravityTable[arg0->unk254], 0x3CA3D70A);
temp_a0_3 = arg0 + 0xDAC;
if ((arg0->unkBC & 2) == 2) {
temp_a0_4 = arg0 + 0xDAC;
sp20 = temp_a0_4;
func_800225CC(temp_a0_4, 1.0f, 0x3D8F5C29);
move_f32_towards(temp_a0_4, 1.0f, 0x3D8F5C29);
} else {
sp20 = temp_a0_3;
func_800225CC(temp_a0_3, 1.0f, 0x3D8F5C29);
move_f32_towards(temp_a0_3, 1.0f, 0x3D8F5C29);
}
}
if ((arg0->unkBC & 0x100000) == 0x100000) {
func_800225CC(sp20, 20.0f, 0x3F800000);
move_f32_towards(sp20, 20.0f, 0x3F800000);
arg0->unk100 = D_800ED7B8;
}
phi_v0 = arg0->unkBC;
if ((arg0->unkBC & 4) == 4) {
func_800225CC(sp20, 25.0f, 0x3F800000);
move_f32_towards(sp20, 25.0f, 0x3F800000);
arg0->unk100 = 1800.0f;
phi_v0 = arg0->unkBC;
}
@@ -4272,7 +4272,7 @@ GLOBAL_ASM("asm/non_matchings/code_80027D00/func_8002FE84.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800225CC(void *, f32, void *, f32, ?, void *); // extern
? move_f32_towards(void *, f32, void *, f32, ?, void *); // extern
? func_8002FE84(f32, void *, f32); // extern
extern ? D_800E2E90;
extern ? D_800E2EB0;
@@ -4460,13 +4460,13 @@ block_44:
temp_f18 = temp_a3->unk8C * D_800ED998;
sp24 = phi_f0;
arg0 = temp_a3;
func_800225CC(phi_f12, 0.0f, temp_a3 + 0xA0, temp_f18, 0x3E19999A, temp_a3);
move_f32_towards(phi_f12, 0.0f, temp_a3 + 0xA0, temp_f18, 0x3E19999A, temp_a3);
phi_a3 = arg0;
phi_f0_2 = phi_f0;
} else {
arg0 = temp_a3;
sp24 = phi_f0;
func_800225CC(phi_f12, 0.0f, temp_a3 + 0xA0, 0.0f, 0x3DCCCCCD, temp_a3);
move_f32_towards(phi_f12, 0.0f, temp_a3 + 0xA0, 0.0f, 0x3DCCCCCD, temp_a3);
phi_a3 = arg0;
phi_f0_2 = phi_f0;
}
@@ -4489,13 +4489,13 @@ block_44:
if ((phi_a3->unkBC & 0x200000) == 0x200000) {
arg0 = phi_a3;
sp24 = phi_f0_2;
func_800225CC(phi_a3 + 0xE8, 380.0f, 0x3F000000, (bitwise f32) phi_a3);
move_f32_towards(phi_a3 + 0xE8, 380.0f, 0x3F000000, (bitwise f32) phi_a3);
phi_v0_2 = arg0->unk0 & 0x4000;
phi_a3_2 = arg0;
} else {
arg0 = phi_a3;
sp24 = phi_f0_2;
func_800225CC(phi_a3 + 0xE8, 0.0f, 0x3DCCCCCD, (bitwise f32) phi_a3);
move_f32_towards(phi_a3 + 0xE8, 0.0f, 0x3DCCCCCD, (bitwise f32) phi_a3);
phi_v0_2 = arg0->unk0 & 0x4000;
phi_a3_2 = arg0;
}
@@ -4508,26 +4508,26 @@ block_44:
if (((temp_a1_2 & 0x100) == 0x100) && ((temp_a1_2 & 0x10) != 0x10)) {
arg0 = phi_a3_2;
sp24 = phi_f0_2;
func_800225CC(temp_a0, 580.0f, 0x3E4CCCCD, (bitwise f32) phi_a3_2);
move_f32_towards(temp_a0, 580.0f, 0x3E4CCCCD, (bitwise f32) phi_a3_2);
} else {
arg0 = phi_a3_2;
sp24 = phi_f0_2;
func_800225CC(temp_a0, phi_f14, 0x3C23D70A, (bitwise f32) phi_a3_2);
move_f32_towards(temp_a0, phi_f14, 0x3C23D70A, (bitwise f32) phi_a3_2);
}
if ((arg0->unkBC & 0x200000) == 0x200000) {
arg0 = arg0;
sp24 = sp24;
func_800225CC(arg0 + 0xE4, 580.0f, 0x3C23D70A, (bitwise f32) arg0);
move_f32_towards(arg0 + 0xE4, 580.0f, 0x3C23D70A, (bitwise f32) arg0);
} else {
arg0 = arg0;
sp24 = sp24;
func_800225CC(arg0 + 0xE4, 0.0f, 0x3C23D70A, (bitwise f32) arg0);
move_f32_towards(arg0 + 0xE4, 0.0f, 0x3C23D70A, (bitwise f32) arg0);
}
phi_a3_3 = arg0;
phi_f0_3 = sp24;
}
arg0 = phi_a3_3;
func_800225CC(phi_a3_3 + 0x104, phi_f0_3, (bitwise void *) (*(&gKartTurnSpeedReductionTable1 + (phi_a3_3->unk254 * 4)) + D_800ED9B0), (bitwise f32) phi_a3_3);
move_f32_towards(phi_a3_3 + 0x104, phi_f0_3, (bitwise void *) (*(&gKartTurnSpeedReductionTable1 + (phi_a3_3->unk254 * 4)) + D_800ED9B0), (bitwise f32) phi_a3_3);
temp_f0_3 = arg0->unk8C;
temp_f12 = arg0->unk80;
temp_f2_3 = (temp_f0_3 + arg0->unkE8 + temp_f12 + arg0->unkE4) - arg0->unkA0;
@@ -6633,7 +6633,7 @@ GLOBAL_ASM("asm/non_matchings/code_80027D00/func_80033AE0.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_80022598(f32, s32 *, s16, ?, void *); // extern
? move_s32_towards(f32, s32 *, s16, ?, void *); // extern
? func_80036CB4(f32, void *, s32); // extern
extern s32 D_800E4068;
extern ? D_800E4308;
@@ -6694,7 +6694,7 @@ void func_8003680C(void *arg0, s16 arg1) {
if ((temp_t8 & 0x40) == 0) {
sp304 = temp_a3->unk7C >> 0x10;
arg0 = temp_a3;
func_80022598(216.0f, temp_a0, arg1, 0x3EB33333, temp_a3);
move_s32_towards(216.0f, temp_a0, arg1, 0x3EB33333, temp_a3);
temp_t4 = sp304 << 0x10;
sp304 = temp_t4;
temp_v0_2 = arg0->unkBC;
src/code_80057C60.c
+4 -4
View File
@@ -10310,7 +10310,7 @@ GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8006A50C.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_80022634(void *, s16, ?); // extern
? move_s16_towards(void *, s16, ?); // extern
? func_80062B18(f32 *, f32 *, f32 *, s32, f32, f32, s32, s32); // extern
? func_8006B974(void *, s8, s8); // extern
extern ? D_800E4914;
@@ -10448,7 +10448,7 @@ void func_8006A7C0(void *arg0, s32 arg1, f32 arg2, s8 arg3, s8 arg4) {
}
*(&D_8018D620 + ((arg3 * 6) + (arg4 * 2))) = -arg0->unk2E - arg0->unkC0;
sp5C = arg4 * 2;
func_80022634((arg3 * 6) + (arg4 * 2) + &D_8018D890, arg0->unk94 * 182.0f, 0x3DCCCCCD);
move_s16_towards((arg3 * 6) + (arg4 * 2) + &D_8018D890, arg0->unk94 * 182.0f, 0x3DCCCCCD);
phi_t0 = arg4 * 2;
phi_f12_2 = arg0->unk94;
}
@@ -10530,8 +10530,8 @@ void func_8006A7C0(void *arg0, s32 arg1, f32 arg2, s8 arg3, s8 arg4) {
*temp_v1_3 = *temp_v1_3 + 1;
sp60 = temp_v1_3;
sp5C = phi_t0;
func_80022634((arg3 * 6) + phi_t0 + &D_8018D890, 0, 0x3DCCCCCD);
func_80022634((arg3 * 6) + phi_t0 + &D_8018D860, 0, 0x3DCCCCCD);
move_s16_towards((arg3 * 6) + phi_t0 + &D_8018D890, 0, 0x3DCCCCCD);
move_s16_towards((arg3 * 6) + phi_t0 + &D_8018D860, 0, 0x3DCCCCCD);
if (*temp_v1_3 >= 0x78) {
func_8006B974(arg0, arg3, arg4);
}
src/code_8008C1D0.c
+24 -24
View File
@@ -800,7 +800,7 @@ GLOBAL_ASM("asm/non_matchings/code_8008C1D0/func_8008D3C4.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909
? func_800225CC(void *, ?, ?, void *); /* extern */
? move_f32_towards(void *, ?, ?, void *); /* extern */
void func_8008D4B4(void *arg0) {
s16 temp_v0;
@@ -816,10 +816,10 @@ void func_8008D4B4(void *arg0) {
if (arg0->unkDC != 0) {
temp_a0 = temp_a3 + 0x80;
arg0 = temp_a3;
func_800225CC(temp_a0, 0x43C80000, 0x3F000000, temp_a3);
move_f32_towards(temp_a0, 0x43C80000, 0x3F000000, temp_a3);
} else {
arg0 = temp_a3;
func_800225CC(temp_a3 + 0x80, 0, 0x3DCCCCCD, temp_a3);
move_f32_towards(temp_a3 + 0x80, 0, 0x3DCCCCCD, temp_a3);
}
if (arg0->unk80 <= 1.0f) {
arg0->unkBC = arg0->unkBC & ~0x2000;
@@ -1313,7 +1313,7 @@ GLOBAL_ASM("asm/non_matchings/code_8008C1D0/func_8008DF98.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909
? func_800225CC(void *, f32, ?); /* extern */
? move_f32_towards(void *, f32, ?); /* extern */
? func_80031F48(void *, ?, s8); /* extern */
? func_8008DABC(void *, s8, s8); /* extern */
? func_8008E3C0(s8, s8, s8); /* extern */
@@ -1385,8 +1385,8 @@ void func_8008E118(void *arg0, s8 arg1) {
phi_a2 = arg1;
}
if ((arg0->unkB0 >= 0) && (arg0->unkB0 < 0x1CC)) {
func_800225CC(arg0 + 0x224, 0.7f, 0x3DCCCCCD);
func_800225CC(arg0 + 0x70, *(&gKartBoundingBoxTable + (arg0->unk254 * 4)) * 0.9, 0x3DCCCCCD);
move_f32_towards(arg0 + 0x224, 0.7f, 0x3DCCCCCD);
move_f32_towards(arg0 + 0x70, *(&gKartBoundingBoxTable + (arg0->unk254 * 4)) * 0.9, 0x3DCCCCCD);
return;
}
arg1 = phi_a2;
@@ -1401,7 +1401,7 @@ GLOBAL_ASM("asm/non_matchings/code_8008C1D0/func_8008E118.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909
? func_800225CC(void *, s32, ?, void *); /* extern */
? move_f32_towards(void *, s32, ?, void *); /* extern */
extern ? gKartBoundingBoxTable;
void func_8008E3C0(void *arg0, ? arg1) {
@@ -1411,8 +1411,8 @@ void func_8008E3C0(void *arg0, ? arg1) {
temp_a3 = arg0;
arg0 = temp_a3;
func_800225CC(arg0 + 0x224, 0x3F800000, 0x3DCCCCCD, temp_a3);
func_800225CC(arg0 + 0x70, *(&gKartBoundingBoxTable + (arg0->unk254 * 4)), 0x3DCCCCCD, arg0);
move_f32_towards(arg0 + 0x224, 0x3F800000, 0x3DCCCCCD, temp_a3);
move_f32_towards(arg0 + 0x70, *(&gKartBoundingBoxTable + (arg0->unk254 * 4)), 0x3DCCCCCD, arg0);
temp_t9 = arg0->unkBC & 0xBFFFFFFF;
arg0->unkBC = temp_t9;
arg0->unk224 = 1.0f;
@@ -1804,7 +1804,7 @@ GLOBAL_ASM("asm/non_matchings/code_8008C1D0/func_8008EC88.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909
? func_800225CC(void *, ?, ?, void *); /* extern */
? move_f32_towards(void *, ?, ?, void *); /* extern */
void func_8008EDC0(void *arg0) {
void *temp_a0;
@@ -1818,10 +1818,10 @@ void func_8008EDC0(void *arg0) {
if ((temp_a3->unkF8 != 0xFE) && ((temp_a3->unkBC & 8) != 8)) {
temp_a0 = temp_a3 + 0x80;
arg0 = temp_a3;
func_800225CC(temp_a0, 0, 0x3F800000, temp_a3);
move_f32_towards(temp_a0, 0, 0x3F800000, temp_a3);
} else {
arg0 = temp_a3;
func_800225CC(temp_a3 + 0x80, 0x43C80000, 0x3C23D70A, temp_a3);
move_f32_towards(temp_a3 + 0x80, 0x43C80000, 0x3C23D70A, temp_a3);
}
if (arg0->unk80 <= 1.0f) {
arg0->unkBC = arg0->unkBC & 0xFFEFFFFF;
@@ -1893,7 +1893,7 @@ GLOBAL_ASM("asm/non_matchings/code_8008C1D0/func_8008EEE4.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909
? func_800225CC(void *, ?, ?, void *); /* extern */
? move_f32_towards(void *, ?, ?, void *); /* extern */
extern s32 D_800E261C;
void func_8008F008(void *arg0) {
@@ -1904,10 +1904,10 @@ void func_8008F008(void *arg0) {
arg0->unk9C = *(D_800E261C + (arg0->unk254 * 4));
if ((arg0->unkF8 != 0xFC) && (temp_a0 = arg0 + 0x80, ((arg0->unkBC & 8) != 8))) {
arg0 = temp_a3;
func_800225CC(temp_a0, 0, 0x3F800000, temp_a3);
move_f32_towards(temp_a0, 0, 0x3F800000, temp_a3);
} else {
arg0 = temp_a3;
func_800225CC(temp_a3 + 0x80, 0x43960000, 0x3DCCCCCD, temp_a3);
move_f32_towards(temp_a3 + 0x80, 0x43960000, 0x3DCCCCCD, temp_a3);
}
if (arg0->unk80 <= 1.0f) {
arg0->unkBC = arg0->unkBC & ~4;
@@ -2988,8 +2988,8 @@ GLOBAL_ASM("asm/non_matchings/code_8008C1D0/func_80090868.s")
// Should put this func through mips to C prior to decomp.
#ifdef MIPS_TO_C
//generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909
? func_800225CC(void *, f32, ?); /* extern */
? func_80022634(void *, ?, ?); /* extern */
? move_f32_towards(void *, f32, ?); /* extern */
? move_s16_towards(void *, ?, ?); /* extern */
? func_8006B8B4(void *, s8); /* extern */
? func_8008C354(s8); /* extern */
? func_8008F104(void *, s8); /* extern */
@@ -3047,8 +3047,8 @@ void func_80090970(void *arg0, s8 arg1, s8 arg2) {
} else {
temp_v0_2 = (arg1 * 4) + &D_801652A0;
sp28 = temp_v0_2;
func_800225CC(arg0 + 0x18, *temp_v0_2 + 100.0f, 0x3C449BA6);
func_80022634(arg0 + (arg2 * 2) + 0xCC, 0, 0x3E4CCCCD);
move_f32_towards(arg0 + 0x18, *temp_v0_2 + 100.0f, 0x3C449BA6);
move_s16_towards(arg0 + (arg2 * 2) + 0xCC, 0, 0x3E4CCCCD);
phi_at = 40.0f;
if ((*sp28 + 40.0f) <= arg0->unk18) {
arg0->unk222 = 1;
@@ -3060,8 +3060,8 @@ void func_80090970(void *arg0, s8 arg1, s8 arg2) {
} else {
phi_at = 100.0f;
if ((temp_v1 & 2) == 2) {
func_800225CC(arg0 + 0x18, arg0->unk74 + 100.0f, 0x3CCCCCCD);
func_80022634(arg0 + (arg2 * 2) + 0xCC, 0, 0x3E4CCCCD);
move_f32_towards(arg0 + 0x18, arg0->unk74 + 100.0f, 0x3CCCCCCD);
move_s16_towards(arg0 + (arg2 * 2) + 0xCC, 0, 0x3E4CCCCD);
phi_at = 40.0f;
if ((arg0->unk74 + 40.0f) <= arg0->unk18) {
arg0->unk222 = 1;
@@ -3088,7 +3088,7 @@ block_49:
func_8009E088(arg1, 0xA);
}
if ((arg0->unkCA & 1) == 1) {
func_800225CC(arg0 + 0x18, *(&D_801652A0 + (arg1 * 4)) + 40.0f, 0x3CA3D70A);
move_f32_towards(arg0 + 0x18, *(&D_801652A0 + (arg1 * 4)) + 40.0f, 0x3CA3D70A);
arg0->unkC6 = arg0->unkC6 - 8;
if (arg0->unkC6 < 9) {
arg0->unkC6 = 0;
@@ -3096,7 +3096,7 @@ block_49:
arg0->unkCA = arg0->unkCA & 0xFFFE;
}
} else {
func_800225CC(arg0 + 0x18, arg0->unk24 + 40.0f, 0x3CA3D70A);
move_f32_towards(arg0 + 0x18, arg0->unk24 + 40.0f, 0x3CA3D70A);
arg0->unkC6 = arg0->unkC6 - 8;
if (arg0->unkC6 < 9) {
arg0->unkC6 = 0;
@@ -3148,7 +3148,7 @@ block_49:
arg0->unk18 = temp_v0_7->unk2;
arg0->unk1C = temp_v0_7->unk4;
}
func_800225CC(arg0 + 0x18, (arg0->unk74 + arg0->unk70) - 2.0f, 0x3D23D70A);
move_f32_towards(arg0 + 0x18, (arg0->unk74 + arg0->unk70) - 2.0f, 0x3D23D70A);
arg0->unkC8 = arg0->unkC8 + 1;
phi_at = (bitwise f32) 8;
if ((arg0->unkBC & 8) == 8) {