From a8713d20785e8a519bc02d28f3ac653e80ef9190 Mon Sep 17 00:00:00 2001 From: ChiefFruitcake <96551211+ChiefFruitcake@users.noreply.github.com> Date: Fri, 21 Jan 2022 22:23:34 -0500 Subject: [PATCH] code_80057C60 (#146) * Match func_8006E058. Fix compiler warnings in code_80057C60.c * Match functions in code_80057C60 * Undo comments in Camera struct --- .../code_80057C60/func_80059D00.s | 240 -- .../code_80057C60/func_8005A070.s | 59 - .../code_80057C60/func_8005A380.s | 18 - .../code_80057C60/func_8005A71C.s | 14 - .../code_80057C60/func_8005A99C.s | 43 - .../code_80057C60/func_8005AA34.s | 7 - .../code_80057C60/func_8005AA4C.s | 9 - .../code_80057C60/func_8005AA6C.s | 6 - .../code_80057C60/func_8005AA80.s | 6 - .../code_80057C60/func_8005AA94.s | 26 - .../code_80057C60/func_8005AAF0.s | 13 - .../code_80057C60/func_8005AB20.s | 19 - .../code_80057C60/func_8005C6B4.s | 36 - .../code_80057C60/func_8005D0FC.s | 43 - .../code_80057C60/func_8005D18C.s | 28 - .../code_80057C60/func_80062F98.s | 80 - .../code_80057C60/func_800630C0.s | 60 - .../code_80057C60/func_800631A8.s | 56 - .../code_80057C60/func_80063268.s | 109 - .../code_80057C60/func_80063408.s | 123 - .../code_80057C60/func_800635D4.s | 271 -- .../code_80057C60/func_800639DC.s | 135 - .../code_80057C60/func_80063BD4.s | 101 - .../code_80057C60/func_80063D58.s | 278 -- .../code_80057C60/func_80063FBC.s | 118 + .../code_80057C60/func_800643A8.s | 83 - .../code_80057C60/func_800647C8.s | 74 - .../code_80057C60/func_800648E4.s | 44 - .../code_80057C60/func_80064988.s | 29 - .../code_80057C60/func_800649F4.s | 82 - .../code_80057C60/func_80064B30.s | 85 - .../code_80057C60/func_80064C74.s | 99 - .../code_80057C60/func_80064DEC.s | 49 - .../code_80057C60/func_80064EA4.s | 61 - .../code_80057C60/func_80064F88.s | 45 - .../code_80057C60/func_80065030.s | 54 - .../code_80057C60/func_800650FC.s | 68 - .../code_80057C60/func_800651F4.s | 60 - .../code_80057C60/func_8006DC54.s | 62 - .../code_80057C60/func_8006E420.s | 105 - .../code_80057C60/func_8006E5AC.s | 38 - .../code_80057C60/func_8006E634.s | 38 - .../code_80057C60/func_8006E6BC.s | 38 - .../code_80057C60/func_8006E744.s | 38 - .../code_80057C60/func_8006E7CC.s | 35 - .../code_80057C60/func_8006E848.s | 35 - .../code_80057C60/func_8006E8C4.s | 35 - .../code_80057C60/func_8006E940.s | 36 - include/common_structs.h | 32 +- src/code_80040E50.h | 2 +- src/code_80057C60.c | 2264 +++++++---------- src/code_8008C1D0.c | 54 +- 52 files changed, 1109 insertions(+), 4434 deletions(-) delete mode 100644 asm/non_matchings/code_80057C60/func_80059D00.s delete mode 100644 asm/non_matchings/code_80057C60/func_8005A070.s delete mode 100644 asm/non_matchings/code_80057C60/func_8005A380.s delete mode 100644 asm/non_matchings/code_80057C60/func_8005A71C.s delete mode 100644 asm/non_matchings/code_80057C60/func_8005A99C.s delete mode 100644 asm/non_matchings/code_80057C60/func_8005AA34.s delete mode 100644 asm/non_matchings/code_80057C60/func_8005AA4C.s delete mode 100644 asm/non_matchings/code_80057C60/func_8005AA6C.s delete mode 100644 asm/non_matchings/code_80057C60/func_8005AA80.s delete mode 100644 asm/non_matchings/code_80057C60/func_8005AA94.s delete mode 100644 asm/non_matchings/code_80057C60/func_8005AAF0.s delete mode 100644 asm/non_matchings/code_80057C60/func_8005AB20.s delete mode 100644 asm/non_matchings/code_80057C60/func_8005C6B4.s delete mode 100644 asm/non_matchings/code_80057C60/func_8005D0FC.s delete mode 100644 asm/non_matchings/code_80057C60/func_8005D18C.s delete mode 100644 asm/non_matchings/code_80057C60/func_80062F98.s delete mode 100644 asm/non_matchings/code_80057C60/func_800630C0.s delete mode 100644 asm/non_matchings/code_80057C60/func_800631A8.s delete mode 100644 asm/non_matchings/code_80057C60/func_80063268.s delete mode 100644 asm/non_matchings/code_80057C60/func_80063408.s delete mode 100644 asm/non_matchings/code_80057C60/func_800635D4.s delete mode 100644 asm/non_matchings/code_80057C60/func_800639DC.s delete mode 100644 asm/non_matchings/code_80057C60/func_80063BD4.s delete mode 100644 asm/non_matchings/code_80057C60/func_80063D58.s create mode 100644 asm/non_matchings/code_80057C60/func_80063FBC.s delete mode 100644 asm/non_matchings/code_80057C60/func_800643A8.s delete mode 100644 asm/non_matchings/code_80057C60/func_800647C8.s delete mode 100644 asm/non_matchings/code_80057C60/func_800648E4.s delete mode 100644 asm/non_matchings/code_80057C60/func_80064988.s delete mode 100644 asm/non_matchings/code_80057C60/func_800649F4.s delete mode 100644 asm/non_matchings/code_80057C60/func_80064B30.s delete mode 100644 asm/non_matchings/code_80057C60/func_80064C74.s delete mode 100644 asm/non_matchings/code_80057C60/func_80064DEC.s delete mode 100644 asm/non_matchings/code_80057C60/func_80064EA4.s delete mode 100644 asm/non_matchings/code_80057C60/func_80064F88.s delete mode 100644 asm/non_matchings/code_80057C60/func_80065030.s delete mode 100644 asm/non_matchings/code_80057C60/func_800650FC.s delete mode 100644 asm/non_matchings/code_80057C60/func_800651F4.s delete mode 100644 asm/non_matchings/code_80057C60/func_8006DC54.s delete mode 100644 asm/non_matchings/code_80057C60/func_8006E420.s delete mode 100644 asm/non_matchings/code_80057C60/func_8006E5AC.s delete mode 100644 asm/non_matchings/code_80057C60/func_8006E634.s delete mode 100644 asm/non_matchings/code_80057C60/func_8006E6BC.s delete mode 100644 asm/non_matchings/code_80057C60/func_8006E744.s delete mode 100644 asm/non_matchings/code_80057C60/func_8006E7CC.s delete mode 100644 asm/non_matchings/code_80057C60/func_8006E848.s delete mode 100644 asm/non_matchings/code_80057C60/func_8006E8C4.s delete mode 100644 asm/non_matchings/code_80057C60/func_8006E940.s diff --git a/asm/non_matchings/code_80057C60/func_80059D00.s b/asm/non_matchings/code_80057C60/func_80059D00.s deleted file mode 100644 index e3fea51c7..000000000 --- a/asm/non_matchings/code_80057C60/func_80059D00.s +++ /dev/null @@ -1,240 +0,0 @@ -glabel func_80059D00 -/* 05A900 80059D00 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 05A904 80059D04 AFBF0014 */ sw $ra, 0x14($sp) -/* 05A908 80059D08 0C016A67 */ jal func_8005A99C -/* 05A90C 80059D0C 00000000 */ nop -/* 05A910 80059D10 0C0168F0 */ jal func_8005A3C0 -/* 05A914 80059D14 00000000 */ nop -/* 05A918 80059D18 0C0168E0 */ jal func_8005A380 -/* 05A91C 80059D1C 00000000 */ nop -/* 05A920 80059D20 3C0E8016 */ lui $t6, %hi(D_801657AE) # $t6, 0x8016 -/* 05A924 80059D24 81CE57AE */ lb $t6, %lo(D_801657AE)($t6) -/* 05A928 80059D28 3C02800E */ lui $v0, %hi(gScreenModeSelection) # $v0, 0x800e -/* 05A92C 80059D2C 55C000CD */ bnel $t6, $zero, .L8005A064 -/* 05A930 80059D30 8FBF0014 */ lw $ra, 0x14($sp) -/* 05A934 80059D34 8C42C530 */ lw $v0, %lo(gScreenModeSelection)($v0) -/* 05A938 80059D38 24010001 */ li $at, 1 -/* 05A93C 80059D3C 10400009 */ beqz $v0, .L80059D64 -/* 05A940 80059D40 00000000 */ nop -/* 05A944 80059D44 1041005C */ beq $v0, $at, .L80059EB8 -/* 05A948 80059D48 24010002 */ li $at, 2 -/* 05A94C 80059D4C 10410036 */ beq $v0, $at, .L80059E28 -/* 05A950 80059D50 24010003 */ li $at, 3 -/* 05A954 80059D54 1041007C */ beq $v0, $at, .L80059F48 -/* 05A958 80059D58 00000000 */ nop -/* 05A95C 80059D5C 100000BE */ b .L8005A058 -/* 05A960 80059D60 00000000 */ nop -.L80059D64: -/* 05A964 80059D64 0C016635 */ jal func_800598D4 -/* 05A968 80059D68 00002025 */ move $a0, $zero -/* 05A96C 80059D6C 3C0F8019 */ lui $t7, %hi(D_8018D214) # $t7, 0x8019 -/* 05A970 80059D70 8DEFD214 */ lw $t7, %lo(D_8018D214)($t7) -/* 05A974 80059D74 15E00020 */ bnez $t7, .L80059DF8 -/* 05A978 80059D78 00000000 */ nop -/* 05A97C 80059D7C 0C016608 */ jal func_80059820 -/* 05A980 80059D80 00002025 */ move $a0, $zero -/* 05A984 80059D84 0C016E45 */ jal func_8005B914 -/* 05A988 80059D88 00000000 */ nop -/* 05A98C 80059D8C 3C18800E */ lui $t8, %hi(D_800DC51C) # $t8, 0x800e -/* 05A990 80059D90 9718C51C */ lhu $t8, %lo(D_800DC51C)($t8) -/* 05A994 80059D94 17000003 */ bnez $t8, .L80059DA4 -/* 05A998 80059D98 00000000 */ nop -/* 05A99C 80059D9C 0C01EA91 */ jal func_8007AA44 -/* 05A9A0 80059DA0 00002025 */ move $a0, $zero -.L80059DA4: -/* 05A9A4 80059DA4 0C01E31C */ jal func_80078C70 -/* 05A9A8 80059DA8 00002025 */ move $a0, $zero -/* 05A9AC 80059DAC 3C198019 */ lui $t9, %hi(D_8018CAE0) # $t9, 0x8019 -/* 05A9B0 80059DB0 8339CAE0 */ lb $t9, %lo(D_8018CAE0)($t9) -/* 05A9B4 80059DB4 3C08800E */ lui $t0, %hi(gPlayerOneCopy) # $t0, 0x800e -/* 05A9B8 80059DB8 1720000B */ bnez $t9, .L80059DE8 -/* 05A9BC 80059DBC 00000000 */ nop -/* 05A9C0 80059DC0 8D08C4FC */ lw $t0, %lo(gPlayerOneCopy)($t0) -/* 05A9C4 80059DC4 3C014190 */ li $at, 0x41900000 # 18.000000 -/* 05A9C8 80059DC8 44813000 */ mtc1 $at, $f6 -/* 05A9CC 80059DCC C5040094 */ lwc1 $f4, 0x94($t0) -/* 05A9D0 80059DD0 3C014358 */ li $at, 0x43580000 # 216.000000 -/* 05A9D4 80059DD4 44815000 */ mtc1 $at, $f10 -/* 05A9D8 80059DD8 46062203 */ div.s $f8, $f4, $f6 -/* 05A9DC 80059DDC 460A4302 */ mul.s $f12, $f8, $f10 -/* 05A9E0 80059DE0 0C0170D8 */ jal func_8005C360 -/* 05A9E4 80059DE4 00000000 */ nop -.L80059DE8: -/* 05A9E8 80059DE8 0C01743F */ jal func_8005D0FC -/* 05A9EC 80059DEC 00002025 */ move $a0, $zero -/* 05A9F0 80059DF0 10000009 */ b .L80059E18 -/* 05A9F4 80059DF4 00000000 */ nop -.L80059DF8: -/* 05A9F8 80059DF8 0C016608 */ jal func_80059820 -/* 05A9FC 80059DFC 00002025 */ move $a0, $zero -/* 05AA00 80059E00 0C01E31C */ jal func_80078C70 -/* 05AA04 80059E04 24040001 */ li $a0, 1 -/* 05AA08 80059E08 0C016608 */ jal func_80059820 -/* 05AA0C 80059E0C 24040001 */ li $a0, 1 -/* 05AA10 80059E10 0C01E31C */ jal func_80078C70 -/* 05AA14 80059E14 24040002 */ li $a0, 2 -.L80059E18: -/* 05AA18 80059E18 0C0169D3 */ jal func_8005A74C -/* 05AA1C 80059E1C 00000000 */ nop -/* 05AA20 80059E20 1000008D */ b .L8005A058 -/* 05AA24 80059E24 00000000 */ nop -.L80059E28: -/* 05AA28 80059E28 0C016635 */ jal func_800598D4 -/* 05AA2C 80059E2C 00002025 */ move $a0, $zero -/* 05AA30 80059E30 0C016635 */ jal func_800598D4 -/* 05AA34 80059E34 24040001 */ li $a0, 1 -/* 05AA38 80059E38 0C016608 */ jal func_80059820 -/* 05AA3C 80059E3C 00002025 */ move $a0, $zero -/* 05AA40 80059E40 0C01743F */ jal func_8005D0FC -/* 05AA44 80059E44 00002025 */ move $a0, $zero -/* 05AA48 80059E48 3C09800E */ lui $t1, %hi(D_800DC51C) # $t1, 0x800e -/* 05AA4C 80059E4C 9529C51C */ lhu $t1, %lo(D_800DC51C)($t1) -/* 05AA50 80059E50 15200003 */ bnez $t1, .L80059E60 -/* 05AA54 80059E54 00000000 */ nop -/* 05AA58 80059E58 0C01EA91 */ jal func_8007AA44 -/* 05AA5C 80059E5C 00002025 */ move $a0, $zero -.L80059E60: -/* 05AA60 80059E60 0C01E31C */ jal func_80078C70 -/* 05AA64 80059E64 24040001 */ li $a0, 1 -/* 05AA68 80059E68 0C01747D */ jal func_8005D1F4 -/* 05AA6C 80059E6C 00002025 */ move $a0, $zero -/* 05AA70 80059E70 0C016608 */ jal func_80059820 -/* 05AA74 80059E74 24040001 */ li $a0, 1 -/* 05AA78 80059E78 0C01743F */ jal func_8005D0FC -/* 05AA7C 80059E7C 24040001 */ li $a0, 1 -/* 05AA80 80059E80 3C0A800E */ lui $t2, %hi(D_800DC51C) # $t2, 0x800e -/* 05AA84 80059E84 954AC51C */ lhu $t2, %lo(D_800DC51C)($t2) -/* 05AA88 80059E88 15400003 */ bnez $t2, .L80059E98 -/* 05AA8C 80059E8C 00000000 */ nop -/* 05AA90 80059E90 0C01EA91 */ jal func_8007AA44 -/* 05AA94 80059E94 24040001 */ li $a0, 1 -.L80059E98: -/* 05AA98 80059E98 0C01E31C */ jal func_80078C70 -/* 05AA9C 80059E9C 24040002 */ li $a0, 2 -/* 05AAA0 80059EA0 0C01747D */ jal func_8005D1F4 -/* 05AAA4 80059EA4 24040001 */ li $a0, 1 -/* 05AAA8 80059EA8 0C0169D3 */ jal func_8005A74C -/* 05AAAC 80059EAC 00000000 */ nop -/* 05AAB0 80059EB0 10000069 */ b .L8005A058 -/* 05AAB4 80059EB4 00000000 */ nop -.L80059EB8: -/* 05AAB8 80059EB8 0C016635 */ jal func_800598D4 -/* 05AABC 80059EBC 00002025 */ move $a0, $zero -/* 05AAC0 80059EC0 0C016635 */ jal func_800598D4 -/* 05AAC4 80059EC4 24040001 */ li $a0, 1 -/* 05AAC8 80059EC8 0C016608 */ jal func_80059820 -/* 05AACC 80059ECC 00002025 */ move $a0, $zero -/* 05AAD0 80059ED0 0C01743F */ jal func_8005D0FC -/* 05AAD4 80059ED4 00002025 */ move $a0, $zero -/* 05AAD8 80059ED8 3C0B800E */ lui $t3, %hi(D_800DC51C) # $t3, 0x800e -/* 05AADC 80059EDC 956BC51C */ lhu $t3, %lo(D_800DC51C)($t3) -/* 05AAE0 80059EE0 15600003 */ bnez $t3, .L80059EF0 -/* 05AAE4 80059EE4 00000000 */ nop -/* 05AAE8 80059EE8 0C01EA91 */ jal func_8007AA44 -/* 05AAEC 80059EEC 00002025 */ move $a0, $zero -.L80059EF0: -/* 05AAF0 80059EF0 0C01E31C */ jal func_80078C70 -/* 05AAF4 80059EF4 24040003 */ li $a0, 3 -/* 05AAF8 80059EF8 0C01747D */ jal func_8005D1F4 -/* 05AAFC 80059EFC 00002025 */ move $a0, $zero -/* 05AB00 80059F00 0C016608 */ jal func_80059820 -/* 05AB04 80059F04 24040001 */ li $a0, 1 -/* 05AB08 80059F08 0C01743F */ jal func_8005D0FC -/* 05AB0C 80059F0C 24040001 */ li $a0, 1 -/* 05AB10 80059F10 3C0C800E */ lui $t4, %hi(D_800DC51C) # $t4, 0x800e -/* 05AB14 80059F14 958CC51C */ lhu $t4, %lo(D_800DC51C)($t4) -/* 05AB18 80059F18 15800003 */ bnez $t4, .L80059F28 -/* 05AB1C 80059F1C 00000000 */ nop -/* 05AB20 80059F20 0C01EA91 */ jal func_8007AA44 -/* 05AB24 80059F24 24040001 */ li $a0, 1 -.L80059F28: -/* 05AB28 80059F28 0C01E31C */ jal func_80078C70 -/* 05AB2C 80059F2C 24040004 */ li $a0, 4 -/* 05AB30 80059F30 0C01747D */ jal func_8005D1F4 -/* 05AB34 80059F34 24040001 */ li $a0, 1 -/* 05AB38 80059F38 0C0169D3 */ jal func_8005A74C -/* 05AB3C 80059F3C 00000000 */ nop -/* 05AB40 80059F40 10000045 */ b .L8005A058 -/* 05AB44 80059F44 00000000 */ nop -.L80059F48: -/* 05AB48 80059F48 0C016635 */ jal func_800598D4 -/* 05AB4C 80059F4C 00002025 */ move $a0, $zero -/* 05AB50 80059F50 0C016635 */ jal func_800598D4 -/* 05AB54 80059F54 24040001 */ li $a0, 1 -/* 05AB58 80059F58 0C016635 */ jal func_800598D4 -/* 05AB5C 80059F5C 24040002 */ li $a0, 2 -/* 05AB60 80059F60 0C016635 */ jal func_800598D4 -/* 05AB64 80059F64 24040003 */ li $a0, 3 -/* 05AB68 80059F68 0C016608 */ jal func_80059820 -/* 05AB6C 80059F6C 00002025 */ move $a0, $zero -/* 05AB70 80059F70 0C01743F */ jal func_8005D0FC -/* 05AB74 80059F74 00002025 */ move $a0, $zero -/* 05AB78 80059F78 3C0D800E */ lui $t5, %hi(D_800DC51C) # $t5, 0x800e -/* 05AB7C 80059F7C 95ADC51C */ lhu $t5, %lo(D_800DC51C)($t5) -/* 05AB80 80059F80 15A00003 */ bnez $t5, .L80059F90 -/* 05AB84 80059F84 00000000 */ nop -/* 05AB88 80059F88 0C01EA91 */ jal func_8007AA44 -/* 05AB8C 80059F8C 00002025 */ move $a0, $zero -.L80059F90: -/* 05AB90 80059F90 0C01747D */ jal func_8005D1F4 -/* 05AB94 80059F94 00002025 */ move $a0, $zero -/* 05AB98 80059F98 0C016608 */ jal func_80059820 -/* 05AB9C 80059F9C 24040001 */ li $a0, 1 -/* 05ABA0 80059FA0 0C01743F */ jal func_8005D0FC -/* 05ABA4 80059FA4 24040001 */ li $a0, 1 -/* 05ABA8 80059FA8 3C0E800E */ lui $t6, %hi(D_800DC51C) # $t6, 0x800e -/* 05ABAC 80059FAC 95CEC51C */ lhu $t6, %lo(D_800DC51C)($t6) -/* 05ABB0 80059FB0 15C00003 */ bnez $t6, .L80059FC0 -/* 05ABB4 80059FB4 00000000 */ nop -/* 05ABB8 80059FB8 0C01EA91 */ jal func_8007AA44 -/* 05ABBC 80059FBC 24040001 */ li $a0, 1 -.L80059FC0: -/* 05ABC0 80059FC0 0C01747D */ jal func_8005D1F4 -/* 05ABC4 80059FC4 24040001 */ li $a0, 1 -/* 05ABC8 80059FC8 0C016608 */ jal func_80059820 -/* 05ABCC 80059FCC 24040002 */ li $a0, 2 -/* 05ABD0 80059FD0 0C01743F */ jal func_8005D0FC -/* 05ABD4 80059FD4 24040002 */ li $a0, 2 -/* 05ABD8 80059FD8 3C0F800E */ lui $t7, %hi(D_800DC51C) # $t7, 0x800e -/* 05ABDC 80059FDC 95EFC51C */ lhu $t7, %lo(D_800DC51C)($t7) -/* 05ABE0 80059FE0 15E00003 */ bnez $t7, .L80059FF0 -/* 05ABE4 80059FE4 00000000 */ nop -/* 05ABE8 80059FE8 0C01EA91 */ jal func_8007AA44 -/* 05ABEC 80059FEC 24040002 */ li $a0, 2 -.L80059FF0: -/* 05ABF0 80059FF0 0C01747D */ jal func_8005D1F4 -/* 05ABF4 80059FF4 24040002 */ li $a0, 2 -/* 05ABF8 80059FF8 3C18800E */ lui $t8, %hi(gPlayerCountSelection1) # $t8, 0x800e -/* 05ABFC 80059FFC 8F18C538 */ lw $t8, %lo(gPlayerCountSelection1)($t8) -/* 05AC00 8005A000 24010004 */ li $at, 4 -/* 05AC04 8005A004 17010012 */ bne $t8, $at, .L8005A050 -/* 05AC08 8005A008 00000000 */ nop -/* 05AC0C 8005A00C 0C016608 */ jal func_80059820 -/* 05AC10 8005A010 24040003 */ li $a0, 3 -/* 05AC14 8005A014 0C01743F */ jal func_8005D0FC -/* 05AC18 8005A018 24040003 */ li $a0, 3 -/* 05AC1C 8005A01C 3C19800E */ lui $t9, %hi(D_800DC51C) # $t9, 0x800e -/* 05AC20 8005A020 9739C51C */ lhu $t9, %lo(D_800DC51C)($t9) -/* 05AC24 8005A024 3C08800E */ lui $t0, %hi(gPlayerCountSelection1) # $t0, 0x800e -/* 05AC28 8005A028 17200007 */ bnez $t9, .L8005A048 -/* 05AC2C 8005A02C 00000000 */ nop -/* 05AC30 8005A030 8D08C538 */ lw $t0, %lo(gPlayerCountSelection1)($t0) -/* 05AC34 8005A034 24010004 */ li $at, 4 -/* 05AC38 8005A038 15010003 */ bne $t0, $at, .L8005A048 -/* 05AC3C 8005A03C 00000000 */ nop -/* 05AC40 8005A040 0C01EA91 */ jal func_8007AA44 -/* 05AC44 8005A044 24040003 */ li $a0, 3 -.L8005A048: -/* 05AC48 8005A048 0C01747D */ jal func_8005D1F4 -/* 05AC4C 8005A04C 24040003 */ li $a0, 3 -.L8005A050: -/* 05AC50 8005A050 0C0169D3 */ jal func_8005A74C -/* 05AC54 8005A054 00000000 */ nop -.L8005A058: -/* 05AC58 8005A058 0C01D133 */ jal func_800744CC -/* 05AC5C 8005A05C 00000000 */ nop -/* 05AC60 8005A060 8FBF0014 */ lw $ra, 0x14($sp) -.L8005A064: -/* 05AC64 8005A064 27BD0018 */ addiu $sp, $sp, 0x18 -/* 05AC68 8005A068 03E00008 */ jr $ra -/* 05AC6C 8005A06C 00000000 */ nop diff --git a/asm/non_matchings/code_80057C60/func_8005A070.s b/asm/non_matchings/code_80057C60/func_8005A070.s deleted file mode 100644 index aa291ef37..000000000 --- a/asm/non_matchings/code_80057C60/func_8005A070.s +++ /dev/null @@ -1,59 +0,0 @@ -glabel func_8005A070 -/* 05AC70 8005A070 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 05AC74 8005A074 AFBF0014 */ sw $ra, 0x14($sp) -/* 05AC78 8005A078 3C048016 */ lui $a0, %hi(D_80165678) # $a0, 0x8016 -/* 05AC7C 8005A07C 0C023076 */ jal func_8008C1D8 -/* 05AC80 8005A080 24845678 */ addiu $a0, %lo(D_80165678) # addiu $a0, $a0, 0x5678 -/* 05AC84 8005A084 3C018019 */ lui $at, %hi(D_8018D120) # $at, 0x8019 -/* 05AC88 8005A088 AC20D120 */ sw $zero, %lo(D_8018D120)($at) -/* 05AC8C 8005A08C 3C018016 */ lui $at, %hi(D_801655C0) # $at, 0x8016 -/* 05AC90 8005A090 0C01074D */ jal func_80041D34 -/* 05AC94 8005A094 AC2055C0 */ sw $zero, %lo(D_801655C0)($at) -/* 05AC98 8005A098 3C0E800E */ lui $t6, %hi(D_800DC5FC) # $t6, 0x800e -/* 05AC9C 8005A09C 95CEC5FC */ lhu $t6, %lo(D_800DC5FC)($t6) -/* 05ACA0 8005A0A0 15C0001F */ bnez $t6, .L8005A120 -/* 05ACA4 8005A0A4 00000000 */ nop -/* 05ACA8 8005A0A8 0C0171CA */ jal func_8005C728 -/* 05ACAC 8005A0AC 00000000 */ nop -/* 05ACB0 8005A0B0 3C02800E */ lui $v0, %hi(D_800DC50C) # $v0, 0x800e -/* 05ACB4 8005A0B4 8C42C50C */ lw $v0, %lo(D_800DC50C)($v0) -/* 05ACB8 8005A0B8 24010005 */ li $at, 5 -/* 05ACBC 8005A0BC 5441000C */ bnel $v0, $at, .L8005A0F0 -/* 05ACC0 8005A0C0 24010009 */ li $at, 9 -/* 05ACC4 8005A0C4 0C021981 */ jal func_80086604 -/* 05ACC8 8005A0C8 00000000 */ nop -/* 05ACCC 8005A0CC 0C021B60 */ jal func_80086D80 -/* 05ACD0 8005A0D0 00000000 */ nop -/* 05ACD4 8005A0D4 0C01F0BE */ jal func_8007C2F8 -/* 05ACD8 8005A0D8 24040001 */ li $a0, 1 -/* 05ACDC 8005A0DC 0C01DD90 */ jal func_80077640 -/* 05ACE0 8005A0E0 00000000 */ nop -/* 05ACE4 8005A0E4 1000000E */ b .L8005A120 -/* 05ACE8 8005A0E8 00000000 */ nop -/* 05ACEC 8005A0EC 24010009 */ li $at, 9 -.L8005A0F0: -/* 05ACF0 8005A0F0 14410009 */ bne $v0, $at, .L8005A118 -/* 05ACF4 8005A0F4 00000000 */ nop -/* 05ACF8 8005A0F8 0C016608 */ jal func_80059820 -/* 05ACFC 8005A0FC 00002025 */ move $a0, $zero -/* 05AD00 8005A100 0C01E31C */ jal func_80078C70 -/* 05AD04 8005A104 00002025 */ move $a0, $zero -/* 05AD08 8005A108 0C0169D3 */ jal func_8005A74C -/* 05AD0C 8005A10C 00000000 */ nop -/* 05AD10 8005A110 10000003 */ b .L8005A120 -/* 05AD14 8005A114 00000000 */ nop -.L8005A118: -/* 05AD18 8005A118 0C016740 */ jal func_80059D00 -/* 05AD1C 8005A11C 00000000 */ nop -.L8005A120: -/* 05AD20 8005A120 0C023081 */ jal func_8008C204 -/* 05AD24 8005A124 00000000 */ nop -/* 05AD28 8005A128 3C048016 */ lui $a0, %hi(D_80165678) # $a0, 0x8016 -/* 05AD2C 8005A12C 3C058016 */ lui $a1, %hi(D_801655F0) # $a1, 0x8016 -/* 05AD30 8005A130 24A555F0 */ addiu $a1, %lo(D_801655F0) # addiu $a1, $a1, 0x55f0 -/* 05AD34 8005A134 0C023078 */ jal func_8008C1E0 -/* 05AD38 8005A138 24845678 */ addiu $a0, %lo(D_80165678) # addiu $a0, $a0, 0x5678 -/* 05AD3C 8005A13C 8FBF0014 */ lw $ra, 0x14($sp) -/* 05AD40 8005A140 27BD0018 */ addiu $sp, $sp, 0x18 -/* 05AD44 8005A144 03E00008 */ jr $ra -/* 05AD48 8005A148 00000000 */ nop diff --git a/asm/non_matchings/code_80057C60/func_8005A380.s b/asm/non_matchings/code_80057C60/func_8005A380.s deleted file mode 100644 index 8339bb3ff..000000000 --- a/asm/non_matchings/code_80057C60/func_8005A380.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_8005A380 -/* 05AF80 8005A380 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 05AF84 8005A384 AFB10018 */ sw $s1, 0x18($sp) -/* 05AF88 8005A388 AFB00014 */ sw $s0, 0x14($sp) -/* 05AF8C 8005A38C AFBF001C */ sw $ra, 0x1c($sp) -/* 05AF90 8005A390 00008025 */ move $s0, $zero -/* 05AF94 8005A394 24110008 */ li $s1, 8 -.L8005A398: -/* 05AF98 8005A398 0C016853 */ jal func_8005A14C -/* 05AF9C 8005A39C 02002025 */ move $a0, $s0 -/* 05AFA0 8005A3A0 26100001 */ addiu $s0, $s0, 1 -/* 05AFA4 8005A3A4 1611FFFC */ bne $s0, $s1, .L8005A398 -/* 05AFA8 8005A3A8 00000000 */ nop -/* 05AFAC 8005A3AC 8FBF001C */ lw $ra, 0x1c($sp) -/* 05AFB0 8005A3B0 8FB00014 */ lw $s0, 0x14($sp) -/* 05AFB4 8005A3B4 8FB10018 */ lw $s1, 0x18($sp) -/* 05AFB8 8005A3B8 03E00008 */ jr $ra -/* 05AFBC 8005A3BC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/non_matchings/code_80057C60/func_8005A71C.s b/asm/non_matchings/code_80057C60/func_8005A71C.s deleted file mode 100644 index 17df14f20..000000000 --- a/asm/non_matchings/code_80057C60/func_8005A71C.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_8005A71C -/* 05B31C 8005A71C 3C0E800E */ lui $t6, %hi(gCurrentCourseId) # $t6, 0x800e -/* 05B320 8005A720 85CEC5A0 */ lh $t6, %lo(gCurrentCourseId)($t6) -/* 05B324 8005A724 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 05B328 8005A728 24010002 */ li $at, 2 -/* 05B32C 8005A72C 15C10003 */ bne $t6, $at, .L8005A73C -/* 05B330 8005A730 AFBF0014 */ sw $ra, 0x14($sp) -/* 05B334 8005A734 0C020484 */ jal func_80081210 -/* 05B338 8005A738 00000000 */ nop -.L8005A73C: -/* 05B33C 8005A73C 8FBF0014 */ lw $ra, 0x14($sp) -/* 05B340 8005A740 27BD0018 */ addiu $sp, $sp, 0x18 -/* 05B344 8005A744 03E00008 */ jr $ra -/* 05B348 8005A748 00000000 */ nop diff --git a/asm/non_matchings/code_80057C60/func_8005A99C.s b/asm/non_matchings/code_80057C60/func_8005A99C.s deleted file mode 100644 index b568cdb46..000000000 --- a/asm/non_matchings/code_80057C60/func_8005A99C.s +++ /dev/null @@ -1,43 +0,0 @@ -glabel func_8005A99C -/* 05B59C 8005A99C 3C0E8019 */ lui $t6, %hi(D_8018D170) # $t6, 0x8019 -/* 05B5A0 8005A9A0 8DCED170 */ lw $t6, %lo(D_8018D170)($t6) -/* 05B5A4 8005A9A4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 05B5A8 8005A9A8 AFBF0014 */ sw $ra, 0x14($sp) -/* 05B5AC 8005A9AC 15C0001D */ bnez $t6, .L8005AA24 -/* 05B5B0 8005A9B0 3C038019 */ lui $v1, %hi(D_8018D178) # $v1, 0x8019 -/* 05B5B4 8005A9B4 2463D178 */ addiu $v1, %lo(D_8018D178) # addiu $v1, $v1, -0x2e88 -/* 05B5B8 8005A9B8 8C620000 */ lw $v0, ($v1) -/* 05B5BC 8005A9BC 14400018 */ bnez $v0, .L8005AA20 -/* 05B5C0 8005A9C0 244FFFFF */ addiu $t7, $v0, -1 -/* 05B5C4 8005A9C4 3C02800E */ lui $v0, %hi(gPlayerCountSelection1) # $v0, 0x800e -/* 05B5C8 8005A9C8 8C42C538 */ lw $v0, %lo(gPlayerCountSelection1)($v0) -/* 05B5CC 8005A9CC 24030001 */ li $v1, 1 -/* 05B5D0 8005A9D0 54620007 */ bnel $v1, $v0, .L8005A9F0 -/* 05B5D4 8005A9D4 24010003 */ li $at, 3 -/* 05B5D8 8005A9D8 0C016A8D */ jal func_8005AA34 -/* 05B5DC 8005A9DC 00000000 */ nop -/* 05B5E0 8005A9E0 3C02800E */ lui $v0, %hi(gPlayerCountSelection1) # $v0, 0x800e -/* 05B5E4 8005A9E4 8C42C538 */ lw $v0, %lo(gPlayerCountSelection1)($v0) -/* 05B5E8 8005A9E8 24030001 */ li $v1, 1 -/* 05B5EC 8005A9EC 24010003 */ li $at, 3 -.L8005A9F0: -/* 05B5F0 8005A9F0 14410002 */ bne $v0, $at, .L8005A9FC -/* 05B5F4 8005A9F4 3C018016 */ lui $at, %hi(D_801657E8) # $at, 0x8016 -/* 05B5F8 8005A9F8 A02357E8 */ sb $v1, %lo(D_801657E8)($at) -.L8005A9FC: -/* 05B5FC 8005A9FC 3C018019 */ lui $at, %hi(D_8018D188) # $at, 0x8019 -/* 05B600 8005AA00 AC23D188 */ sw $v1, %lo(D_8018D188)($at) -/* 05B604 8005AA04 3C018019 */ lui $at, %hi(D_8018D170) # $at, 0x8019 -/* 05B608 8005AA08 AC23D170 */ sw $v1, %lo(D_8018D170)($at) -/* 05B60C 8005AA0C 3C018019 */ lui $at, %hi(D_8018D190) # $at, 0x8019 -/* 05B610 8005AA10 AC23D190 */ sw $v1, %lo(D_8018D190)($at) -/* 05B614 8005AA14 3C018019 */ lui $at, %hi(D_8018D204) # $at, 0x8019 -/* 05B618 8005AA18 10000002 */ b .L8005AA24 -/* 05B61C 8005AA1C AC20D204 */ sw $zero, %lo(D_8018D204)($at) -.L8005AA20: -/* 05B620 8005AA20 AC6F0000 */ sw $t7, ($v1) -.L8005AA24: -/* 05B624 8005AA24 8FBF0014 */ lw $ra, 0x14($sp) -/* 05B628 8005AA28 27BD0018 */ addiu $sp, $sp, 0x18 -/* 05B62C 8005AA2C 03E00008 */ jr $ra -/* 05B630 8005AA30 00000000 */ nop diff --git a/asm/non_matchings/code_80057C60/func_8005AA34.s b/asm/non_matchings/code_80057C60/func_8005AA34.s deleted file mode 100644 index 3a583180c..000000000 --- a/asm/non_matchings/code_80057C60/func_8005AA34.s +++ /dev/null @@ -1,7 +0,0 @@ -glabel func_8005AA34 -/* 05B634 8005AA34 240E0001 */ li $t6, 1 -/* 05B638 8005AA38 3C018019 */ lui $at, %hi(D_8018D1CC) # $at, 0x8019 -/* 05B63C 8005AA3C AC2ED1CC */ sw $t6, %lo(D_8018D1CC)($at) -/* 05B640 8005AA40 3C018019 */ lui $at, %hi(D_8018D1A0) -/* 05B644 8005AA44 03E00008 */ jr $ra -/* 05B648 8005AA48 AC20D1A0 */ sw $zero, %lo(D_8018D1A0)($at) diff --git a/asm/non_matchings/code_80057C60/func_8005AA4C.s b/asm/non_matchings/code_80057C60/func_8005AA4C.s deleted file mode 100644 index 6439e163b..000000000 --- a/asm/non_matchings/code_80057C60/func_8005AA4C.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_8005AA4C -/* 05B64C 8005AA4C 3C028019 */ lui $v0, %hi(D_8018D1CC) # $v0, 0x8019 -/* 05B650 8005AA50 2442D1CC */ addiu $v0, %lo(D_8018D1CC) # addiu $v0, $v0, -0x2e34 -/* 05B654 8005AA54 8C4E0000 */ lw $t6, ($v0) -/* 05B658 8005AA58 3C018019 */ lui $at, %hi(D_8018D1A0) -/* 05B65C 8005AA5C 25CF0001 */ addiu $t7, $t6, 1 -/* 05B660 8005AA60 AC4F0000 */ sw $t7, ($v0) -/* 05B664 8005AA64 03E00008 */ jr $ra -/* 05B668 8005AA68 AC20D1A0 */ sw $zero, %lo(D_8018D1A0)($at) diff --git a/asm/non_matchings/code_80057C60/func_8005AA6C.s b/asm/non_matchings/code_80057C60/func_8005AA6C.s deleted file mode 100644 index 6114ab7c3..000000000 --- a/asm/non_matchings/code_80057C60/func_8005AA6C.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel func_8005AA6C -/* 05B66C 8005AA6C 3C018019 */ lui $at, %hi(D_8018D1CC) # $at, 0x8019 -/* 05B670 8005AA70 AC24D1CC */ sw $a0, %lo(D_8018D1CC)($at) -/* 05B674 8005AA74 3C018019 */ lui $at, %hi(D_8018D1A0) -/* 05B678 8005AA78 03E00008 */ jr $ra -/* 05B67C 8005AA7C AC20D1A0 */ sw $zero, %lo(D_8018D1A0)($at) diff --git a/asm/non_matchings/code_80057C60/func_8005AA80.s b/asm/non_matchings/code_80057C60/func_8005AA80.s deleted file mode 100644 index 82de1201e..000000000 --- a/asm/non_matchings/code_80057C60/func_8005AA80.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel func_8005AA80 -/* 05B680 8005AA80 3C018019 */ lui $at, %hi(D_8018D1CC) # $at, 0x8019 -/* 05B684 8005AA84 AC20D1CC */ sw $zero, %lo(D_8018D1CC)($at) -/* 05B688 8005AA88 3C018019 */ lui $at, %hi(D_8018D1A0) -/* 05B68C 8005AA8C 03E00008 */ jr $ra -/* 05B690 8005AA90 AC20D1A0 */ sw $zero, %lo(D_8018D1A0)($at) diff --git a/asm/non_matchings/code_80057C60/func_8005AA94.s b/asm/non_matchings/code_80057C60/func_8005AA94.s deleted file mode 100644 index 5c5f24623..000000000 --- a/asm/non_matchings/code_80057C60/func_8005AA94.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_8005AA94 -/* 05B694 8005AA94 3C028019 */ lui $v0, %hi(D_8018D1A0) # $v0, 0x8019 -/* 05B698 8005AA98 2442D1A0 */ addiu $v0, %lo(D_8018D1A0) # addiu $v0, $v0, -0x2e60 -/* 05B69C 8005AA9C 8C4E0000 */ lw $t6, ($v0) -/* 05B6A0 8005AAA0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 05B6A4 8005AAA4 AFBF0014 */ sw $ra, 0x14($sp) -/* 05B6A8 8005AAA8 15C00005 */ bnez $t6, .L8005AAC0 -/* 05B6AC 8005AAAC 3C038019 */ lui $v1, %hi(D_8018D1D4) # $v1, 0x8019 -/* 05B6B0 8005AAB0 2463D1D4 */ addiu $v1, %lo(D_8018D1D4) # addiu $v1, $v1, -0x2e2c -/* 05B6B4 8005AAB4 240F0001 */ li $t7, 1 -/* 05B6B8 8005AAB8 AC640000 */ sw $a0, ($v1) -/* 05B6BC 8005AABC AC4F0000 */ sw $t7, ($v0) -.L8005AAC0: -/* 05B6C0 8005AAC0 3C038019 */ lui $v1, %hi(D_8018D1D4) # $v1, 0x8019 -/* 05B6C4 8005AAC4 2463D1D4 */ addiu $v1, %lo(D_8018D1D4) # addiu $v1, $v1, -0x2e2c -/* 05B6C8 8005AAC8 8C780000 */ lw $t8, ($v1) -/* 05B6CC 8005AACC 2719FFFF */ addiu $t9, $t8, -1 -/* 05B6D0 8005AAD0 07210003 */ bgez $t9, .L8005AAE0 -/* 05B6D4 8005AAD4 AC790000 */ sw $t9, ($v1) -/* 05B6D8 8005AAD8 0C016A93 */ jal func_8005AA4C -/* 05B6DC 8005AADC AC400000 */ sw $zero, ($v0) -.L8005AAE0: -/* 05B6E0 8005AAE0 8FBF0014 */ lw $ra, 0x14($sp) -/* 05B6E4 8005AAE4 27BD0018 */ addiu $sp, $sp, 0x18 -/* 05B6E8 8005AAE8 03E00008 */ jr $ra -/* 05B6EC 8005AAEC 00000000 */ nop diff --git a/asm/non_matchings/code_80057C60/func_8005AAF0.s b/asm/non_matchings/code_80057C60/func_8005AAF0.s deleted file mode 100644 index 63ad2e2cb..000000000 --- a/asm/non_matchings/code_80057C60/func_8005AAF0.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_8005AAF0 -/* 05B6F0 8005AAF0 240E0001 */ li $t6, 1 -/* 05B6F4 8005AAF4 3C018019 */ lui $at, %hi(D_8018D1B4) # $at, 0x8019 -/* 05B6F8 8005AAF8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 05B6FC 8005AAFC AC2ED1B4 */ sw $t6, %lo(D_8018D1B4)($at) -/* 05B700 8005AB00 AFBF0014 */ sw $ra, 0x14($sp) -/* 05B704 8005AB04 3C018019 */ lui $at, %hi(D_8018D1A0) # $at, 0x8019 -/* 05B708 8005AB08 0C016A93 */ jal func_8005AA4C -/* 05B70C 8005AB0C AC20D1A0 */ sw $zero, %lo(D_8018D1A0)($at) -/* 05B710 8005AB10 8FBF0014 */ lw $ra, 0x14($sp) -/* 05B714 8005AB14 27BD0018 */ addiu $sp, $sp, 0x18 -/* 05B718 8005AB18 03E00008 */ jr $ra -/* 05B71C 8005AB1C 00000000 */ nop diff --git a/asm/non_matchings/code_80057C60/func_8005AB20.s b/asm/non_matchings/code_80057C60/func_8005AB20.s deleted file mode 100644 index e8b7ccef9..000000000 --- a/asm/non_matchings/code_80057C60/func_8005AB20.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_8005AB20 -/* 05B720 8005AB20 3C0E800E */ lui $t6, %hi(gModeSelection) # $t6, 0x800e -/* 05B724 8005AB24 8DCEC53C */ lw $t6, %lo(gModeSelection)($t6) -/* 05B728 8005AB28 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 05B72C 8005AB2C AFBF0014 */ sw $ra, 0x14($sp) -/* 05B730 8005AB30 15C00007 */ bnez $t6, .L8005AB50 -/* 05B734 8005AB34 3C0F800E */ lui $t7, %hi(gPlayerCountSelection1) # $t7, 0x800e -/* 05B738 8005AB38 8DEFC538 */ lw $t7, %lo(gPlayerCountSelection1)($t7) -/* 05B73C 8005AB3C 24010001 */ li $at, 1 -/* 05B740 8005AB40 55E10004 */ bnel $t7, $at, .L8005AB54 -/* 05B744 8005AB44 8FBF0014 */ lw $ra, 0x14($sp) -/* 05B748 8005AB48 0C016A9B */ jal func_8005AA6C -/* 05B74C 8005AB4C 24040014 */ li $a0, 20 -.L8005AB50: -/* 05B750 8005AB50 8FBF0014 */ lw $ra, 0x14($sp) -.L8005AB54: -/* 05B754 8005AB54 27BD0018 */ addiu $sp, $sp, 0x18 -/* 05B758 8005AB58 03E00008 */ jr $ra -/* 05B75C 8005AB5C 00000000 */ nop diff --git a/asm/non_matchings/code_80057C60/func_8005C6B4.s b/asm/non_matchings/code_80057C60/func_8005C6B4.s deleted file mode 100644 index ec587f86b..000000000 --- a/asm/non_matchings/code_80057C60/func_8005C6B4.s +++ /dev/null @@ -1,36 +0,0 @@ -glabel func_8005C6B4 -/* 05D2B4 8005C6B4 00047600 */ sll $t6, $a0, 0x18 -/* 05D2B8 8005C6B8 000E7E03 */ sra $t7, $t6, 0x18 -/* 05D2BC 8005C6BC 11E00009 */ beqz $t7, .L8005C6E4 -/* 05D2C0 8005C6C0 AFA40000 */ sw $a0, ($sp) -/* 05D2C4 8005C6C4 24010001 */ li $at, 1 -/* 05D2C8 8005C6C8 11E1000C */ beq $t7, $at, .L8005C6FC -/* 05D2CC 8005C6CC 24020040 */ li $v0, 64 -/* 05D2D0 8005C6D0 24010002 */ li $at, 2 -/* 05D2D4 8005C6D4 11E1000E */ beq $t7, $at, .L8005C710 -/* 05D2D8 8005C6D8 24020040 */ li $v0, 64 -/* 05D2DC 8005C6DC 03E00008 */ jr $ra -/* 05D2E0 8005C6E0 00000000 */ nop - -.L8005C6E4: -/* 05D2E4 8005C6E4 240300FF */ li $v1, 255 -/* 05D2E8 8005C6E8 24020040 */ li $v0, 64 -/* 05D2EC 8005C6EC A4A30000 */ sh $v1, ($a1) -/* 05D2F0 8005C6F0 A4C20000 */ sh $v0, ($a2) -/* 05D2F4 8005C6F4 03E00008 */ jr $ra -/* 05D2F8 8005C6F8 A4E20000 */ sh $v0, ($a3) - -.L8005C6FC: -/* 05D2FC 8005C6FC 240300FF */ li $v1, 255 -/* 05D300 8005C700 A4A30000 */ sh $v1, ($a1) -/* 05D304 8005C704 A4C30000 */ sh $v1, ($a2) -/* 05D308 8005C708 03E00008 */ jr $ra -/* 05D30C 8005C70C A4E20000 */ sh $v0, ($a3) - -.L8005C710: -/* 05D310 8005C710 A4A20000 */ sh $v0, ($a1) -/* 05D314 8005C714 240300FF */ li $v1, 255 -/* 05D318 8005C718 A4C20000 */ sh $v0, ($a2) -/* 05D31C 8005C71C A4E30000 */ sh $v1, ($a3) -/* 05D320 8005C720 03E00008 */ jr $ra -/* 05D324 8005C724 00000000 */ nop diff --git a/asm/non_matchings/code_80057C60/func_8005D0FC.s b/asm/non_matchings/code_80057C60/func_8005D0FC.s deleted file mode 100644 index f2e477335..000000000 --- a/asm/non_matchings/code_80057C60/func_8005D0FC.s +++ /dev/null @@ -1,43 +0,0 @@ -glabel func_8005D0FC -/* 05DCFC 8005D0FC 3C0E800E */ lui $t6, %hi(gModeSelection) # $t6, 0x800e -/* 05DD00 8005D100 8DCEC53C */ lw $t6, %lo(gModeSelection)($t6) -/* 05DD04 8005D104 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 05DD08 8005D108 24020003 */ li $v0, 3 -/* 05DD0C 8005D10C 104E001B */ beq $v0, $t6, .L8005D17C -/* 05DD10 8005D110 AFBF0014 */ sw $ra, 0x14($sp) -/* 05DD14 8005D114 1080000B */ beqz $a0, .L8005D144 -/* 05DD18 8005D118 3C058016 */ lui $a1, %hi(lapCount) -/* 05DD1C 8005D11C 24010001 */ li $at, 1 -/* 05DD20 8005D120 1081000C */ beq $a0, $at, .L8005D154 -/* 05DD24 8005D124 3C058016 */ lui $a1, %hi(D_80164394) -/* 05DD28 8005D128 24010002 */ li $at, 2 -/* 05DD2C 8005D12C 1081000D */ beq $a0, $at, .L8005D164 -/* 05DD30 8005D130 3C058016 */ lui $a1, %hi(D_80164398) -/* 05DD34 8005D134 1082000F */ beq $a0, $v0, .L8005D174 -/* 05DD38 8005D138 3C058016 */ lui $a1, %hi(D_8016439C) # $a1, 0x8016 -/* 05DD3C 8005D13C 10000010 */ b .L8005D180 -/* 05DD40 8005D140 8FBF0014 */ lw $ra, 0x14($sp) -.L8005D144: -/* 05DD44 8005D144 0C0172D8 */ jal func_8005CB60 -/* 05DD48 8005D148 8CA54390 */ lw $a1, %lo(lapCount)($a1) -/* 05DD4C 8005D14C 1000000C */ b .L8005D180 -/* 05DD50 8005D150 8FBF0014 */ lw $ra, 0x14($sp) -.L8005D154: -/* 05DD54 8005D154 0C0172D8 */ jal func_8005CB60 -/* 05DD58 8005D158 8CA54394 */ lw $a1, %lo(D_80164394)($a1) -/* 05DD5C 8005D15C 10000008 */ b .L8005D180 -/* 05DD60 8005D160 8FBF0014 */ lw $ra, 0x14($sp) -.L8005D164: -/* 05DD64 8005D164 0C0172D8 */ jal func_8005CB60 -/* 05DD68 8005D168 8CA54398 */ lw $a1, %lo(D_80164398)($a1) -/* 05DD6C 8005D16C 10000004 */ b .L8005D180 -/* 05DD70 8005D170 8FBF0014 */ lw $ra, 0x14($sp) -.L8005D174: -/* 05DD74 8005D174 0C0172D8 */ jal func_8005CB60 -/* 05DD78 8005D178 8CA5439C */ lw $a1, %lo(D_8016439C)($a1) # 0x439c($a1) -.L8005D17C: -/* 05DD7C 8005D17C 8FBF0014 */ lw $ra, 0x14($sp) -.L8005D180: -/* 05DD80 8005D180 27BD0018 */ addiu $sp, $sp, 0x18 -/* 05DD84 8005D184 03E00008 */ jr $ra -/* 05DD88 8005D188 00000000 */ nop diff --git a/asm/non_matchings/code_80057C60/func_8005D18C.s b/asm/non_matchings/code_80057C60/func_8005D18C.s deleted file mode 100644 index 124570d74..000000000 --- a/asm/non_matchings/code_80057C60/func_8005D18C.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel func_8005D18C -/* 05DD8C 8005D18C 3C0E800E */ lui $t6, %hi(gModeSelection) # $t6, 0x800e -/* 05DD90 8005D190 8DCEC53C */ lw $t6, %lo(gModeSelection)($t6) -/* 05DD94 8005D194 3C0F800E */ lui $t7, %hi(gPlayerCountSelection1) # $t7, 0x800e -/* 05DD98 8005D198 15C00014 */ bnez $t6, .L8005D1EC -/* 05DD9C 8005D19C 00000000 */ nop -/* 05DDA0 8005D1A0 8DEFC538 */ lw $t7, %lo(gPlayerCountSelection1)($t7) -/* 05DDA4 8005D1A4 24020001 */ li $v0, 1 -/* 05DDA8 8005D1A8 3C038019 */ lui $v1, %hi(D_8018D2BC) # $v1, 0x8019 -/* 05DDAC 8005D1AC 144F000F */ bne $v0, $t7, .L8005D1EC -/* 05DDB0 8005D1B0 2463D2BC */ addiu $v1, %lo(D_8018D2BC) # addiu $v1, $v1, -0x2d44 -/* 05DDB4 8005D1B4 3C018016 */ lui $at, %hi(D_801657D8) # $at, 0x8016 -/* 05DDB8 8005D1B8 3C048019 */ lui $a0, %hi(D_8018D2A4) # $a0, 0x8019 -/* 05DDBC 8005D1BC A02257D8 */ sb $v0, %lo(D_801657D8)($at) -/* 05DDC0 8005D1C0 2484D2A4 */ addiu $a0, %lo(D_8018D2A4) # addiu $a0, $a0, -0x2d5c -/* 05DDC4 8005D1C4 AC600000 */ sw $zero, ($v1) -/* 05DDC8 8005D1C8 AC800000 */ sw $zero, ($a0) -/* 05DDCC 8005D1CC 3C188016 */ lui $t8, %hi(gPlayerPositions) # $t8, 0x8016 -/* 05DDD0 8005D1D0 8F1843B8 */ lw $t8, %lo(gPlayerPositions)($t8) -/* 05DDD4 8005D1D4 2B010004 */ slti $at, $t8, 4 -/* 05DDD8 8005D1D8 14200004 */ bnez $at, .L8005D1EC -/* 05DDDC 8005D1DC 3C018019 */ lui $at, %hi(D_8018D1FC) # $at, 0x8019 -/* 05DDE0 8005D1E0 AC22D1FC */ sw $v0, %lo(D_8018D1FC)($at) -/* 05DDE4 8005D1E4 AC820000 */ sw $v0, ($a0) -/* 05DDE8 8005D1E8 AC620000 */ sw $v0, ($v1) -.L8005D1EC: -/* 05DDEC 8005D1EC 03E00008 */ jr $ra -/* 05DDF0 8005D1F0 00000000 */ nop diff --git a/asm/non_matchings/code_80057C60/func_80062F98.s b/asm/non_matchings/code_80057C60/func_80062F98.s deleted file mode 100644 index 250635c8e..000000000 --- a/asm/non_matchings/code_80057C60/func_80062F98.s +++ /dev/null @@ -1,80 +0,0 @@ -glabel func_80062F98 -/* 063B98 80062F98 00057400 */ sll $t6, $a1, 0x10 -/* 063B9C 80062F9C 000E7C03 */ sra $t7, $t6, 0x10 -/* 063BA0 80062FA0 000F40C0 */ sll $t0, $t7, 3 -/* 063BA4 80062FA4 010F4021 */ addu $t0, $t0, $t7 -/* 063BA8 80062FA8 000840C0 */ sll $t0, $t0, 3 -/* 063BAC 80062FAC AFA50004 */ sw $a1, 4($sp) -/* 063BB0 80062FB0 AFA60008 */ sw $a2, 8($sp) -/* 063BB4 80062FB4 AFA7000C */ sw $a3, 0xc($sp) -/* 063BB8 80062FB8 00881021 */ addu $v0, $a0, $t0 -/* 063BBC 80062FBC 3C014120 */ li $at, 0x41200000 # 10.000000 -/* 063BC0 80062FC0 44813000 */ mtc1 $at, $f6 -/* 063BC4 80062FC4 C4440540 */ lwc1 $f4, 0x540($v0) -/* 063BC8 80062FC8 C448052C */ lwc1 $f8, 0x52c($v0) -/* 063BCC 80062FCC 84490546 */ lh $t1, 0x546($v0) -/* 063BD0 80062FD0 46062003 */ div.s $f0, $f4, $f6 -/* 063BD4 80062FD4 0006C600 */ sll $t8, $a2, 0x18 -/* 063BD8 80062FD8 252A0001 */ addiu $t2, $t1, 1 -/* 063BDC 80062FDC A44A0546 */ sh $t2, 0x546($v0) -/* 063BE0 80062FE0 0018CE03 */ sra $t9, $t8, 0x18 -/* 063BE4 80062FE4 24010001 */ li $at, 1 -/* 063BE8 80062FE8 03203025 */ move $a2, $t9 -/* 063BEC 80062FEC 46004280 */ add.s $f10, $f8, $f0 -/* 063BF0 80062FF0 E44A052C */ swc1 $f10, 0x52c($v0) -/* 063BF4 80062FF4 848B00CA */ lh $t3, 0xca($a0) -/* 063BF8 80062FF8 316C0001 */ andi $t4, $t3, 1 -/* 063BFC 80062FFC 1581001C */ bne $t4, $at, .L80063070 -/* 063C00 80063000 3C01800F */ lui $at, %hi(D_800EE648) -/* 063C04 80063004 D432E648 */ ldc1 $f18, %lo(D_800EE648)($at) -/* 063C08 80063008 46000421 */ cvt.d.s $f16, $f0 -/* 063C0C 8006300C C446052C */ lwc1 $f6, 0x52c($v0) -/* 063C10 80063010 46328100 */ add.d $f4, $f16, $f18 -/* 063C14 80063014 844D0546 */ lh $t5, 0x546($v0) -/* 063C18 80063018 24010010 */ li $at, 16 -/* 063C1C 8006301C 46003221 */ cvt.d.s $f8, $f6 -/* 063C20 80063020 00197080 */ sll $t6, $t9, 2 -/* 063C24 80063024 46244280 */ add.d $f10, $f8, $f4 -/* 063C28 80063028 46205420 */ cvt.s.d $f16, $f10 -/* 063C2C 8006302C 11A1000C */ beq $t5, $at, .L80063060 -/* 063C30 80063030 E450052C */ swc1 $f16, 0x52c($v0) -/* 063C34 80063034 3C018016 */ lui $at, %hi(D_801652A0) -/* 063C38 80063038 002E0821 */ addu $at, $at, $t6 -/* 063C3C 8006303C C43252A0 */ lwc1 $f18, %lo(D_801652A0)($at) -/* 063C40 80063040 C446052C */ lwc1 $f6, 0x52c($v0) -/* 063C44 80063044 3C014040 */ li $at, 0x40400000 # 3.000000 -/* 063C48 80063048 44812000 */ mtc1 $at, $f4 -/* 063C4C 8006304C 46069201 */ sub.s $f8, $f18, $f6 -/* 063C50 80063050 4604403C */ c.lt.s $f8, $f4 -/* 063C54 80063054 00000000 */ nop -/* 063C58 80063058 45000017 */ bc1f .L800630B8 -/* 063C5C 8006305C 00000000 */ nop -.L80063060: -/* 063C60 80063060 A4400544 */ sh $zero, 0x544($v0) -/* 063C64 80063064 A4400546 */ sh $zero, 0x546($v0) -/* 063C68 80063068 03E00008 */ jr $ra -/* 063C6C 8006306C A440053A */ sh $zero, 0x53a($v0) - -.L80063070: -/* 063C70 80063070 844F0546 */ lh $t7, 0x546($v0) -/* 063C74 80063074 2401000A */ li $at, 10 -/* 063C78 80063078 0006C080 */ sll $t8, $a2, 2 -/* 063C7C 8006307C 11E1000B */ beq $t7, $at, .L800630AC -/* 063C80 80063080 3C018016 */ lui $at, %hi(D_801652A0) -/* 063C84 80063084 00380821 */ addu $at, $at, $t8 -/* 063C88 80063088 C42A52A0 */ lwc1 $f10, %lo(D_801652A0)($at) -/* 063C8C 8006308C C450052C */ lwc1 $f16, 0x52c($v0) -/* 063C90 80063090 3C014040 */ li $at, 0x40400000 # 3.000000 -/* 063C94 80063094 44813000 */ mtc1 $at, $f6 -/* 063C98 80063098 46105481 */ sub.s $f18, $f10, $f16 -/* 063C9C 8006309C 4606903C */ c.lt.s $f18, $f6 -/* 063CA0 800630A0 00000000 */ nop -/* 063CA4 800630A4 45000004 */ bc1f .L800630B8 -/* 063CA8 800630A8 00000000 */ nop -.L800630AC: -/* 063CAC 800630AC A4400544 */ sh $zero, 0x544($v0) -/* 063CB0 800630B0 A4400546 */ sh $zero, 0x546($v0) -/* 063CB4 800630B4 A440053A */ sh $zero, 0x53a($v0) -.L800630B8: -/* 063CB8 800630B8 03E00008 */ jr $ra -/* 063CBC 800630BC 00000000 */ nop diff --git a/asm/non_matchings/code_80057C60/func_800630C0.s b/asm/non_matchings/code_80057C60/func_800630C0.s deleted file mode 100644 index 98c5e44bf..000000000 --- a/asm/non_matchings/code_80057C60/func_800630C0.s +++ /dev/null @@ -1,60 +0,0 @@ -glabel func_800630C0 -/* 063CC0 800630C0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 063CC4 800630C4 00057400 */ sll $t6, $a1, 0x10 -/* 063CC8 800630C8 000E7C03 */ sra $t7, $t6, 0x10 -/* 063CCC 800630CC 000FC8C0 */ sll $t9, $t7, 3 -/* 063CD0 800630D0 032FC821 */ addu $t9, $t9, $t7 -/* 063CD4 800630D4 0019C8C0 */ sll $t9, $t9, 3 -/* 063CD8 800630D8 AFBF0014 */ sw $ra, 0x14($sp) -/* 063CDC 800630DC AFA40020 */ sw $a0, 0x20($sp) -/* 063CE0 800630E0 AFA50024 */ sw $a1, 0x24($sp) -/* 063CE4 800630E4 AFA60028 */ sw $a2, 0x28($sp) -/* 063CE8 800630E8 AFA7002C */ sw $a3, 0x2c($sp) -/* 063CEC 800630EC 00991021 */ addu $v0, $a0, $t9 -/* 063CF0 800630F0 84480276 */ lh $t0, 0x276($v0) -/* 063CF4 800630F4 94440278 */ lhu $a0, 0x278($v0) -/* 063CF8 800630F8 25090001 */ addiu $t1, $t0, 1 -/* 063CFC 800630FC A4490276 */ sh $t1, 0x276($v0) -/* 063D00 80063100 0C0AE00E */ jal coss -/* 063D04 80063104 AFA2001C */ sw $v0, 0x1c($sp) -/* 063D08 80063108 3C01800F */ lui $at, %hi(D_800EE650) -/* 063D0C 8006310C D426E650 */ ldc1 $f6, %lo(D_800EE650)($at) -/* 063D10 80063110 46000121 */ cvt.d.s $f4, $f0 -/* 063D14 80063114 8FAA0020 */ lw $t2, 0x20($sp) -/* 063D18 80063118 46262202 */ mul.d $f8, $f4, $f6 -/* 063D1C 8006311C 8FA2001C */ lw $v0, 0x1c($sp) -/* 063D20 80063120 C54A001C */ lwc1 $f10, 0x1c($t2) -/* 063D24 80063124 94440278 */ lhu $a0, 0x278($v0) -/* 063D28 80063128 46005421 */ cvt.d.s $f16, $f10 -/* 063D2C 8006312C 46304480 */ add.d $f18, $f8, $f16 -/* 063D30 80063130 46209120 */ cvt.s.d $f4, $f18 -/* 063D34 80063134 0C0AE006 */ jal sins -/* 063D38 80063138 E4440260 */ swc1 $f4, 0x260($v0) -/* 063D3C 8006313C 3C01800F */ lui $at, %hi(D_800EE658) -/* 063D40 80063140 D42AE658 */ ldc1 $f10, %lo(D_800EE658)($at) -/* 063D44 80063144 460001A1 */ cvt.d.s $f6, $f0 -/* 063D48 80063148 8FAB0020 */ lw $t3, 0x20($sp) -/* 063D4C 8006314C 462A3202 */ mul.d $f8, $f6, $f10 -/* 063D50 80063150 8FA2001C */ lw $v0, 0x1c($sp) -/* 063D54 80063154 C5700014 */ lwc1 $f16, 0x14($t3) -/* 063D58 80063158 3C018016 */ lui $at, %hi(D_801652A0) -/* 063D5C 8006315C 844E0276 */ lh $t6, 0x276($v0) -/* 063D60 80063160 460084A1 */ cvt.d.s $f18, $f16 -/* 063D64 80063164 46324100 */ add.d $f4, $f8, $f18 -/* 063D68 80063168 462021A0 */ cvt.s.d $f6, $f4 -/* 063D6C 8006316C E4460258 */ swc1 $f6, 0x258($v0) -/* 063D70 80063170 83AC002B */ lb $t4, 0x2b($sp) -/* 063D74 80063174 000C6880 */ sll $t5, $t4, 2 -/* 063D78 80063178 002D0821 */ addu $at, $at, $t5 -/* 063D7C 8006317C C42A52A0 */ lwc1 $f10, %lo(D_801652A0)($at) -/* 063D80 80063180 2401000F */ li $at, 15 -/* 063D84 80063184 15C10004 */ bne $t6, $at, .L80063198 -/* 063D88 80063188 E44A025C */ swc1 $f10, 0x25c($v0) -/* 063D8C 8006318C A4400274 */ sh $zero, 0x274($v0) -/* 063D90 80063190 A4400276 */ sh $zero, 0x276($v0) -/* 063D94 80063194 A440026A */ sh $zero, 0x26a($v0) -.L80063198: -/* 063D98 80063198 8FBF0014 */ lw $ra, 0x14($sp) -/* 063D9C 8006319C 27BD0020 */ addiu $sp, $sp, 0x20 -/* 063DA0 800631A0 03E00008 */ jr $ra -/* 063DA4 800631A4 00000000 */ nop diff --git a/asm/non_matchings/code_80057C60/func_800631A8.s b/asm/non_matchings/code_80057C60/func_800631A8.s deleted file mode 100644 index f2b0940e8..000000000 --- a/asm/non_matchings/code_80057C60/func_800631A8.s +++ /dev/null @@ -1,56 +0,0 @@ -glabel func_800631A8 -/* 063DA8 800631A8 00057400 */ sll $t6, $a1, 0x10 -/* 063DAC 800631AC 000E7C03 */ sra $t7, $t6, 0x10 -/* 063DB0 800631B0 000FC0C0 */ sll $t8, $t7, 3 -/* 063DB4 800631B4 030FC021 */ addu $t8, $t8, $t7 -/* 063DB8 800631B8 0018C0C0 */ sll $t8, $t8, 3 -/* 063DBC 800631BC AFA50004 */ sw $a1, 4($sp) -/* 063DC0 800631C0 AFA60008 */ sw $a2, 8($sp) -/* 063DC4 800631C4 AFA7000C */ sw $a3, 0xc($sp) -/* 063DC8 800631C8 00981021 */ addu $v0, $a0, $t8 -/* 063DCC 800631CC 84590276 */ lh $t9, 0x276($v0) -/* 063DD0 800631D0 27280001 */ addiu $t0, $t9, 1 -/* 063DD4 800631D4 A4480276 */ sh $t0, 0x276($v0) -/* 063DD8 800631D8 84430276 */ lh $v1, 0x276($v0) -/* 063DDC 800631DC 28610009 */ slti $at, $v1, 9 -/* 063DE0 800631E0 10200008 */ beqz $at, .L80063204 -/* 063DE4 800631E4 306B0001 */ andi $t3, $v1, 1 -/* 063DE8 800631E8 30690001 */ andi $t1, $v1, 1 -/* 063DEC 800631EC 11200003 */ beqz $t1, .L800631FC -/* 063DF0 800631F0 240A0008 */ li $t2, 8 -/* 063DF4 800631F4 10000011 */ b .L8006323C -/* 063DF8 800631F8 A44A0290 */ sh $t2, 0x290($v0) -.L800631FC: -/* 063DFC 800631FC 1000000F */ b .L8006323C -/* 063E00 80063200 A4400290 */ sh $zero, 0x290($v0) -.L80063204: -/* 063E04 80063204 15600005 */ bnez $t3, .L8006321C -/* 063E08 80063208 28610009 */ slti $at, $v1, 9 -/* 063E0C 8006320C 14200006 */ bnez $at, .L80063228 -/* 063E10 80063210 306D0002 */ andi $t5, $v1, 2 -/* 063E14 80063214 2861000C */ slti $at, $v1, 0xc -/* 063E18 80063218 10200003 */ beqz $at, .L80063228 -.L8006321C: -/* 063E1C 8006321C 240C00FF */ li $t4, 255 -/* 063E20 80063220 10000006 */ b .L8006323C -/* 063E24 80063224 A44C0290 */ sh $t4, 0x290($v0) -.L80063228: -/* 063E28 80063228 11A00003 */ beqz $t5, .L80063238 -/* 063E2C 8006322C 240E0008 */ li $t6, 8 -/* 063E30 80063230 10000002 */ b .L8006323C -/* 063E34 80063234 A44E0290 */ sh $t6, 0x290($v0) -.L80063238: -/* 063E38 80063238 A4400290 */ sh $zero, 0x290($v0) -.L8006323C: -/* 063E3C 8006323C 844F0276 */ lh $t7, 0x276($v0) -/* 063E40 80063240 A4400292 */ sh $zero, 0x292($v0) -/* 063E44 80063244 A4400294 */ sh $zero, 0x294($v0) -/* 063E48 80063248 29E10019 */ slti $at, $t7, 0x19 -/* 063E4C 8006324C 14200004 */ bnez $at, .L80063260 -/* 063E50 80063250 00000000 */ nop -/* 063E54 80063254 A4400274 */ sh $zero, 0x274($v0) -/* 063E58 80063258 A4400276 */ sh $zero, 0x276($v0) -/* 063E5C 8006325C A440026A */ sh $zero, 0x26a($v0) -.L80063260: -/* 063E60 80063260 03E00008 */ jr $ra -/* 063E64 80063264 00000000 */ nop diff --git a/asm/non_matchings/code_80057C60/func_80063268.s b/asm/non_matchings/code_80057C60/func_80063268.s deleted file mode 100644 index 7e1320cad..000000000 --- a/asm/non_matchings/code_80057C60/func_80063268.s +++ /dev/null @@ -1,109 +0,0 @@ -glabel func_80063268 -/* 063E68 80063268 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 063E6C 8006326C 00057400 */ sll $t6, $a1, 0x10 -/* 063E70 80063270 000E7C03 */ sra $t7, $t6, 0x10 -/* 063E74 80063274 000FC0C0 */ sll $t8, $t7, 3 -/* 063E78 80063278 030FC021 */ addu $t8, $t8, $t7 -/* 063E7C 8006327C 0018C0C0 */ sll $t8, $t8, 3 -/* 063E80 80063280 AFBF0014 */ sw $ra, 0x14($sp) -/* 063E84 80063284 AFA40020 */ sw $a0, 0x20($sp) -/* 063E88 80063288 AFA50024 */ sw $a1, 0x24($sp) -/* 063E8C 8006328C AFA60028 */ sw $a2, 0x28($sp) -/* 063E90 80063290 AFA7002C */ sw $a3, 0x2c($sp) -/* 063E94 80063294 00981021 */ addu $v0, $a0, $t8 -/* 063E98 80063298 84590276 */ lh $t9, 0x276($v0) -/* 063E9C 8006329C 44804000 */ mtc1 $zero, $f8 -/* 063EA0 800632A0 00803025 */ move $a2, $a0 -/* 063EA4 800632A4 2B21001E */ slti $at, $t9, 0x1e -/* 063EA8 800632A8 54200006 */ bnel $at, $zero, .L800632C4 -/* 063EAC 800632AC 844A0298 */ lh $t2, 0x298($v0) -/* 063EB0 800632B0 84480298 */ lh $t0, 0x298($v0) -/* 063EB4 800632B4 25091FFE */ addiu $t1, $t0, 0x1ffe -/* 063EB8 800632B8 10000004 */ b .L800632CC -/* 063EBC 800632BC A4490298 */ sh $t1, 0x298($v0) -/* 063EC0 800632C0 844A0298 */ lh $t2, 0x298($v0) -.L800632C4: -/* 063EC4 800632C4 254B1554 */ addiu $t3, $t2, 0x1554 -/* 063EC8 800632C8 A44B0298 */ sh $t3, 0x298($v0) -.L800632CC: -/* 063ECC 800632CC C444027C */ lwc1 $f4, 0x27c($v0) -/* 063ED0 800632D0 3C013FD0 */ li $at, 0x3FD00000 # 1.625000 -/* 063ED4 800632D4 44814800 */ mtc1 $at, $f9 -/* 063ED8 800632D8 460021A1 */ cvt.d.s $f6, $f4 -/* 063EDC 800632DC 844C0298 */ lh $t4, 0x298($v0) -/* 063EE0 800632E0 46283280 */ add.d $f10, $f6, $f8 -/* 063EE4 800632E4 844D0278 */ lh $t5, 0x278($v0) -/* 063EE8 800632E8 46205420 */ cvt.s.d $f16, $f10 -/* 063EEC 800632EC 018D2021 */ addu $a0, $t4, $t5 -/* 063EF0 800632F0 308EFFFF */ andi $t6, $a0, 0xffff -/* 063EF4 800632F4 01C02025 */ move $a0, $t6 -/* 063EF8 800632F8 E450027C */ swc1 $f16, 0x27c($v0) -/* 063EFC 800632FC AFA60020 */ sw $a2, 0x20($sp) -/* 063F00 80063300 0C0AE00E */ jal coss -/* 063F04 80063304 AFA2001C */ sw $v0, 0x1c($sp) -/* 063F08 80063308 3C014016 */ li $at, 0x40160000 # 2.343750 -/* 063F0C 8006330C 44812800 */ mtc1 $at, $f5 -/* 063F10 80063310 44802000 */ mtc1 $zero, $f4 -/* 063F14 80063314 460004A1 */ cvt.d.s $f18, $f0 -/* 063F18 80063318 8FA60020 */ lw $a2, 0x20($sp) -/* 063F1C 8006331C 46249182 */ mul.d $f6, $f18, $f4 -/* 063F20 80063320 8FA2001C */ lw $v0, 0x1c($sp) -/* 063F24 80063324 C4C8001C */ lwc1 $f8, 0x1c($a2) -/* 063F28 80063328 844F0298 */ lh $t7, 0x298($v0) -/* 063F2C 8006332C 460042A1 */ cvt.d.s $f10, $f8 -/* 063F30 80063330 84580278 */ lh $t8, 0x278($v0) -/* 063F34 80063334 462A3400 */ add.d $f16, $f6, $f10 -/* 063F38 80063338 01F82021 */ addu $a0, $t7, $t8 -/* 063F3C 8006333C 3099FFFF */ andi $t9, $a0, 0xffff -/* 063F40 80063340 03202025 */ move $a0, $t9 -/* 063F44 80063344 462084A0 */ cvt.s.d $f18, $f16 -/* 063F48 80063348 0C0AE006 */ jal sins -/* 063F4C 8006334C E4520260 */ swc1 $f18, 0x260($v0) -/* 063F50 80063350 3C014016 */ li $at, 0x40160000 # 2.343750 -/* 063F54 80063354 44814800 */ mtc1 $at, $f9 -/* 063F58 80063358 44804000 */ mtc1 $zero, $f8 -/* 063F5C 8006335C 46000121 */ cvt.d.s $f4, $f0 -/* 063F60 80063360 8FA60020 */ lw $a2, 0x20($sp) -/* 063F64 80063364 46282182 */ mul.d $f6, $f4, $f8 -/* 063F68 80063368 8FA2001C */ lw $v0, 0x1c($sp) -/* 063F6C 8006336C C4CA0014 */ lwc1 $f10, 0x14($a2) -/* 063F70 80063370 3C0140A0 */ li $at, 0x40A00000 # 5.000000 -/* 063F74 80063374 84480276 */ lh $t0, 0x276($v0) -/* 063F78 80063378 46005421 */ cvt.d.s $f16, $f10 -/* 063F7C 8006337C 44815000 */ mtc1 $at, $f10 -/* 063F80 80063380 25090001 */ addiu $t1, $t0, 1 -/* 063F84 80063384 46303480 */ add.d $f18, $f6, $f16 -/* 063F88 80063388 C450027C */ lwc1 $f16, 0x27c($v0) -/* 063F8C 8006338C 3C01800F */ lui $at, %hi(D_800EE660) -/* 063F90 80063390 844A0296 */ lh $t2, 0x296($v0) -/* 063F94 80063394 46209120 */ cvt.s.d $f4, $f18 -/* 063F98 80063398 254BFFFB */ addiu $t3, $t2, -5 -/* 063F9C 8006339C E4440258 */ swc1 $f4, 0x258($v0) -/* 063FA0 800633A0 C4C80018 */ lwc1 $f8, 0x18($a2) -/* 063FA4 800633A4 C4440264 */ lwc1 $f4, 0x264($v0) -/* 063FA8 800633A8 A4490276 */ sh $t1, 0x276($v0) -/* 063FAC 800633AC 460A4181 */ sub.s $f6, $f8, $f10 -/* 063FB0 800633B0 46002221 */ cvt.d.s $f8, $f4 -/* 063FB4 800633B4 46068480 */ add.s $f18, $f16, $f6 -/* 063FB8 800633B8 E452025C */ swc1 $f18, 0x25c($v0) -/* 063FBC 800633BC D42AE660 */ ldc1 $f10, %lo(D_800EE660)($at) -/* 063FC0 800633C0 A44B0296 */ sh $t3, 0x296($v0) -/* 063FC4 800633C4 844C0296 */ lh $t4, 0x296($v0) -/* 063FC8 800633C8 462A4400 */ add.d $f16, $f8, $f10 -/* 063FCC 800633CC 462081A0 */ cvt.s.d $f6, $f16 -/* 063FD0 800633D0 1D800002 */ bgtz $t4, .L800633DC -/* 063FD4 800633D4 E4460264 */ swc1 $f6, 0x264($v0) -/* 063FD8 800633D8 A4400296 */ sh $zero, 0x296($v0) -.L800633DC: -/* 063FDC 800633DC 844D0276 */ lh $t5, 0x276($v0) -/* 063FE0 800633E0 29A10028 */ slti $at, $t5, 0x28 -/* 063FE4 800633E4 54200005 */ bnel $at, $zero, .L800633FC -/* 063FE8 800633E8 8FBF0014 */ lw $ra, 0x14($sp) -/* 063FEC 800633EC A4400274 */ sh $zero, 0x274($v0) -/* 063FF0 800633F0 A4400276 */ sh $zero, 0x276($v0) -/* 063FF4 800633F4 A440026A */ sh $zero, 0x26a($v0) -/* 063FF8 800633F8 8FBF0014 */ lw $ra, 0x14($sp) -.L800633FC: -/* 063FFC 800633FC 27BD0020 */ addiu $sp, $sp, 0x20 -/* 064000 80063400 03E00008 */ jr $ra -/* 064004 80063404 00000000 */ nop diff --git a/asm/non_matchings/code_80057C60/func_80063408.s b/asm/non_matchings/code_80057C60/func_80063408.s deleted file mode 100644 index 2b8f0ae07..000000000 --- a/asm/non_matchings/code_80057C60/func_80063408.s +++ /dev/null @@ -1,123 +0,0 @@ -glabel func_80063408 -/* 064008 80063408 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 06400C 8006340C 00057400 */ sll $t6, $a1, 0x10 -/* 064010 80063410 000E7C03 */ sra $t7, $t6, 0x10 -/* 064014 80063414 000FC0C0 */ sll $t8, $t7, 3 -/* 064018 80063418 030FC021 */ addu $t8, $t8, $t7 -/* 06401C 8006341C AFB00014 */ sw $s0, 0x14($sp) -/* 064020 80063420 0018C0C0 */ sll $t8, $t8, 3 -/* 064024 80063424 AFBF001C */ sw $ra, 0x1c($sp) -/* 064028 80063428 AFB10018 */ sw $s1, 0x18($sp) -/* 06402C 8006342C AFA50024 */ sw $a1, 0x24($sp) -/* 064030 80063430 AFA60028 */ sw $a2, 0x28($sp) -/* 064034 80063434 AFA7002C */ sw $a3, 0x2c($sp) -/* 064038 80063438 00988021 */ addu $s0, $a0, $t8 -/* 06403C 8006343C 96190538 */ lhu $t9, 0x538($s0) -/* 064040 80063440 24010001 */ li $at, 1 -/* 064044 80063444 00808825 */ move $s1, $a0 -/* 064048 80063448 1721001C */ bne $t9, $at, .L800634BC -/* 06404C 8006344C 00000000 */ nop -/* 064050 80063450 0C0AE00E */ jal coss -/* 064054 80063454 96040548 */ lhu $a0, 0x548($s0) -/* 064058 80063458 86080546 */ lh $t0, 0x546($s0) -/* 06405C 8006345C C62A01D0 */ lwc1 $f10, 0x1d0($s1) -/* 064060 80063460 96040548 */ lhu $a0, 0x548($s0) -/* 064064 80063464 00080823 */ negu $at, $t0 -/* 064068 80063468 000148C0 */ sll $t1, $at, 3 -/* 06406C 8006346C 01214823 */ subu $t1, $t1, $at -/* 064070 80063470 44892000 */ mtc1 $t1, $f4 -/* 064074 80063474 00000000 */ nop -/* 064078 80063478 468021A0 */ cvt.s.w $f6, $f4 -/* 06407C 8006347C 46060202 */ mul.s $f8, $f0, $f6 -/* 064080 80063480 460A4400 */ add.s $f16, $f8, $f10 -/* 064084 80063484 0C0AE006 */ jal sins -/* 064088 80063488 E6100530 */ swc1 $f16, 0x530($s0) -/* 06408C 8006348C 86020546 */ lh $v0, 0x546($s0) -/* 064090 80063490 C62801C8 */ lwc1 $f8, 0x1c8($s1) -/* 064094 80063494 00020823 */ negu $at, $v0 -/* 064098 80063498 000150C0 */ sll $t2, $at, 3 -/* 06409C 8006349C 01415023 */ subu $t2, $t2, $at -/* 0640A0 800634A0 448A9000 */ mtc1 $t2, $f18 -/* 0640A4 800634A4 00000000 */ nop -/* 0640A8 800634A8 46809120 */ cvt.s.w $f4, $f18 -/* 0640AC 800634AC 46040182 */ mul.s $f6, $f0, $f4 -/* 0640B0 800634B0 46083280 */ add.s $f10, $f6, $f8 -/* 0640B4 800634B4 1000001B */ b .L80063524 -/* 0640B8 800634B8 E60A0528 */ swc1 $f10, 0x528($s0) -.L800634BC: -/* 0640BC 800634BC 0C0AE00E */ jal coss -/* 0640C0 800634C0 96040548 */ lhu $a0, 0x548($s0) -/* 0640C4 800634C4 860B0546 */ lh $t3, 0x546($s0) -/* 0640C8 800634C8 C62601E8 */ lwc1 $f6, 0x1e8($s1) -/* 0640CC 800634CC 96040548 */ lhu $a0, 0x548($s0) -/* 0640D0 800634D0 000B0823 */ negu $at, $t3 -/* 0640D4 800634D4 000160C0 */ sll $t4, $at, 3 -/* 0640D8 800634D8 01816023 */ subu $t4, $t4, $at -/* 0640DC 800634DC 448C8000 */ mtc1 $t4, $f16 -/* 0640E0 800634E0 00000000 */ nop -/* 0640E4 800634E4 468084A0 */ cvt.s.w $f18, $f16 -/* 0640E8 800634E8 46120102 */ mul.s $f4, $f0, $f18 -/* 0640EC 800634EC 46062200 */ add.s $f8, $f4, $f6 -/* 0640F0 800634F0 0C0AE006 */ jal sins -/* 0640F4 800634F4 E6080530 */ swc1 $f8, 0x530($s0) -/* 0640F8 800634F8 86020546 */ lh $v0, 0x546($s0) -/* 0640FC 800634FC C62401E0 */ lwc1 $f4, 0x1e0($s1) -/* 064100 80063500 00020823 */ negu $at, $v0 -/* 064104 80063504 000168C0 */ sll $t5, $at, 3 -/* 064108 80063508 01A16823 */ subu $t5, $t5, $at -/* 06410C 8006350C 448D5000 */ mtc1 $t5, $f10 -/* 064110 80063510 00000000 */ nop -/* 064114 80063514 46805420 */ cvt.s.w $f16, $f10 -/* 064118 80063518 46100482 */ mul.s $f18, $f0, $f16 -/* 06411C 8006351C 46049180 */ add.s $f6, $f18, $f4 -/* 064120 80063520 E6060528 */ swc1 $f6, 0x528($s0) -.L80063524: -/* 064124 80063524 3C013F80 */ li $at, 0x3F800000 # 1.000000 -/* 064128 80063528 44815000 */ mtc1 $at, $f10 -/* 06412C 8006352C C608052C */ lwc1 $f8, 0x52c($s0) -/* 064130 80063530 244E0001 */ addiu $t6, $v0, 1 -/* 064134 80063534 A60E0546 */ sh $t6, 0x546($s0) -/* 064138 80063538 460A4400 */ add.s $f16, $f8, $f10 -/* 06413C 8006353C E610052C */ swc1 $f16, 0x52c($s0) -/* 064140 80063540 8E2300BC */ lw $v1, 0xbc($s1) -/* 064144 80063544 306F0080 */ andi $t7, $v1, 0x80 -/* 064148 80063548 15E00003 */ bnez $t7, .L80063558 -/* 06414C 8006354C 30780040 */ andi $t8, $v1, 0x40 -/* 064150 80063550 53000004 */ beql $t8, $zero, .L80063564 -/* 064154 80063554 86020546 */ lh $v0, 0x546($s0) -.L80063558: -/* 064158 80063558 A6000544 */ sh $zero, 0x544($s0) -/* 06415C 8006355C A6000546 */ sh $zero, 0x546($s0) -/* 064160 80063560 86020546 */ lh $v0, 0x546($s0) -.L80063564: -/* 064164 80063564 24010008 */ li $at, 8 -/* 064168 80063568 54410006 */ bnel $v0, $at, .L80063584 -/* 06416C 8006356C C6120534 */ lwc1 $f18, 0x534($s0) -/* 064170 80063570 A6000546 */ sh $zero, 0x546($s0) -/* 064174 80063574 A6000544 */ sh $zero, 0x544($s0) -/* 064178 80063578 86020546 */ lh $v0, 0x546($s0) -/* 06417C 8006357C A600053A */ sh $zero, 0x53a($s0) -/* 064180 80063580 C6120534 */ lwc1 $f18, 0x534($s0) -.L80063584: -/* 064184 80063584 3C01800F */ lui $at, %hi(D_800EE668) -/* 064188 80063588 D426E668 */ ldc1 $f6, %lo(D_800EE668)($at) -/* 06418C 8006358C 46009121 */ cvt.d.s $f4, $f18 -/* 064190 80063590 28410004 */ slti $at, $v0, 4 -/* 064194 80063594 46262200 */ add.d $f8, $f4, $f6 -/* 064198 80063598 462042A0 */ cvt.s.d $f10, $f8 -/* 06419C 8006359C 14200004 */ bnez $at, .L800635B0 -/* 0641A0 800635A0 E60A0534 */ swc1 $f10, 0x534($s0) -/* 0641A4 800635A4 86190566 */ lh $t9, 0x566($s0) -/* 0641A8 800635A8 2728FFF0 */ addiu $t0, $t9, -0x10 -/* 0641AC 800635AC A6080566 */ sh $t0, 0x566($s0) -.L800635B0: -/* 0641B0 800635B0 86090566 */ lh $t1, 0x566($s0) -/* 0641B4 800635B4 5D200003 */ bgtzl $t1, .L800635C4 -/* 0641B8 800635B8 8FBF001C */ lw $ra, 0x1c($sp) -/* 0641BC 800635BC A6000566 */ sh $zero, 0x566($s0) -/* 0641C0 800635C0 8FBF001C */ lw $ra, 0x1c($sp) -.L800635C4: -/* 0641C4 800635C4 8FB00014 */ lw $s0, 0x14($sp) -/* 0641C8 800635C8 8FB10018 */ lw $s1, 0x18($sp) -/* 0641CC 800635CC 03E00008 */ jr $ra -/* 0641D0 800635D0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/non_matchings/code_80057C60/func_800635D4.s b/asm/non_matchings/code_80057C60/func_800635D4.s deleted file mode 100644 index 147419980..000000000 --- a/asm/non_matchings/code_80057C60/func_800635D4.s +++ /dev/null @@ -1,271 +0,0 @@ -glabel func_800635D4 -/* 0641D4 800635D4 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 0641D8 800635D8 00057400 */ sll $t6, $a1, 0x10 -/* 0641DC 800635DC 000E7C03 */ sra $t7, $t6, 0x10 -/* 0641E0 800635E0 000FC0C0 */ sll $t8, $t7, 3 -/* 0641E4 800635E4 030FC021 */ addu $t8, $t8, $t7 -/* 0641E8 800635E8 AFB00024 */ sw $s0, 0x24($sp) -/* 0641EC 800635EC 0018C0C0 */ sll $t8, $t8, 3 -/* 0641F0 800635F0 AFBF002C */ sw $ra, 0x2c($sp) -/* 0641F4 800635F4 AFB10028 */ sw $s1, 0x28($sp) -/* 0641F8 800635F8 AFA5004C */ sw $a1, 0x4c($sp) -/* 0641FC 800635FC AFA60050 */ sw $a2, 0x50($sp) -/* 064200 80063600 AFA70054 */ sw $a3, 0x54($sp) -/* 064204 80063604 00988021 */ addu $s0, $a0, $t8 -/* 064208 80063608 96190538 */ lhu $t9, 0x538($s0) -/* 06420C 8006360C 24010001 */ li $at, 1 -/* 064210 80063610 00808825 */ move $s1, $a0 -/* 064214 80063614 5721005C */ bnel $t9, $at, .L80063788 -/* 064218 80063618 8E2A00BC */ lw $t2, 0xbc($s1) -/* 06421C 8006361C 8C8800BC */ lw $t0, 0xbc($a0) -/* 064220 80063620 00084840 */ sll $t1, $t0, 1 -/* 064224 80063624 0521002A */ bgez $t1, .L800636D0 -/* 064228 80063628 00000000 */ nop -/* 06422C 8006362C 44802000 */ mtc1 $zero, $f4 -/* 064230 80063630 3C014190 */ li $at, 0x41900000 # 18.000000 -/* 064234 80063634 44814000 */ mtc1 $at, $f8 -/* 064238 80063638 E7A40010 */ swc1 $f4, 0x10($sp) -/* 06423C 8006363C C6260094 */ lwc1 $f6, 0x94($s1) -/* 064240 80063640 860A0546 */ lh $t2, 0x546($s0) -/* 064244 80063644 3C014358 */ li $at, 0x43580000 # 216.000000 -/* 064248 80063648 46083283 */ div.s $f10, $f6, $f8 -/* 06424C 8006364C 000A5823 */ negu $t3, $t2 -/* 064250 80063650 448B8000 */ mtc1 $t3, $f16 -/* 064254 80063654 44813000 */ mtc1 $at, $f6 -/* 064258 80063658 3C014180 */ li $at, 0x41800000 # 16.000000 -/* 06425C 8006365C 468084A0 */ cvt.s.w $f18, $f16 -/* 064260 80063660 44818000 */ mtc1 $at, $f16 -/* 064264 80063664 27A40044 */ addiu $a0, $sp, 0x44 -/* 064268 80063668 27A50040 */ addiu $a1, $sp, 0x40 -/* 06426C 8006366C 27A6003C */ addiu $a2, $sp, 0x3c -/* 064270 80063670 3C07C000 */ lui $a3, 0xc000 -/* 064274 80063674 460A9102 */ mul.s $f4, $f18, $f10 -/* 064278 80063678 00000000 */ nop -/* 06427C 8006367C 46062202 */ mul.s $f8, $f4, $f6 -/* 064280 80063680 46104483 */ div.s $f18, $f8, $f16 -/* 064284 80063684 E7B20014 */ swc1 $f18, 0x14($sp) -/* 064288 80063688 860C0548 */ lh $t4, 0x548($s0) -/* 06428C 8006368C 000C6823 */ negu $t5, $t4 -/* 064290 80063690 AFAD0018 */ sw $t5, 0x18($sp) -/* 064294 80063694 862E0206 */ lh $t6, 0x206($s1) -/* 064298 80063698 000E7823 */ negu $t7, $t6 -/* 06429C 8006369C 000FC040 */ sll $t8, $t7, 1 -/* 0642A0 800636A0 0C018AC6 */ jal func_80062B18 -/* 0642A4 800636A4 AFB8001C */ sw $t8, 0x1c($sp) -/* 0642A8 800636A8 C62A01C8 */ lwc1 $f10, 0x1c8($s1) -/* 0642AC 800636AC C7A40044 */ lwc1 $f4, 0x44($sp) -/* 0642B0 800636B0 86020546 */ lh $v0, 0x546($s0) -/* 0642B4 800636B4 46045180 */ add.s $f6, $f10, $f4 -/* 0642B8 800636B8 E6060528 */ swc1 $f6, 0x528($s0) -/* 0642BC 800636BC C7B0003C */ lwc1 $f16, 0x3c($sp) -/* 0642C0 800636C0 C62801D0 */ lwc1 $f8, 0x1d0($s1) -/* 0642C4 800636C4 46104480 */ add.s $f18, $f8, $f16 -/* 0642C8 800636C8 10000087 */ b .L800638E8 -/* 0642CC 800636CC E6120530 */ swc1 $f18, 0x530($s0) -.L800636D0: -/* 0642D0 800636D0 0C0AE00E */ jal coss -/* 0642D4 800636D4 96040548 */ lhu $a0, 0x548($s0) -/* 0642D8 800636D8 3C014190 */ li $at, 0x41900000 # 18.000000 -/* 0642DC 800636DC 44812000 */ mtc1 $at, $f4 -/* 0642E0 800636E0 C62A0094 */ lwc1 $f10, 0x94($s1) -/* 0642E4 800636E4 86190546 */ lh $t9, 0x546($s0) -/* 0642E8 800636E8 3C014358 */ li $at, 0x43580000 # 216.000000 -/* 0642EC 800636EC 46045183 */ div.s $f6, $f10, $f4 -/* 0642F0 800636F0 00194023 */ negu $t0, $t9 -/* 0642F4 800636F4 44884000 */ mtc1 $t0, $f8 -/* 0642F8 800636F8 44815000 */ mtc1 $at, $f10 -/* 0642FC 800636FC 3C014180 */ li $at, 0x41800000 # 16.000000 -/* 064300 80063700 46804420 */ cvt.s.w $f16, $f8 -/* 064304 80063704 44814000 */ mtc1 $at, $f8 -/* 064308 80063708 96040548 */ lhu $a0, 0x548($s0) -/* 06430C 8006370C 46068482 */ mul.s $f18, $f16, $f6 -/* 064310 80063710 00000000 */ nop -/* 064314 80063714 460A9102 */ mul.s $f4, $f18, $f10 -/* 064318 80063718 C63201D0 */ lwc1 $f18, 0x1d0($s1) -/* 06431C 8006371C 46082403 */ div.s $f16, $f4, $f8 -/* 064320 80063720 46100182 */ mul.s $f6, $f0, $f16 -/* 064324 80063724 46123280 */ add.s $f10, $f6, $f18 -/* 064328 80063728 0C0AE006 */ jal sins -/* 06432C 8006372C E60A0530 */ swc1 $f10, 0x530($s0) -/* 064330 80063730 3C014190 */ li $at, 0x41900000 # 18.000000 -/* 064334 80063734 44814000 */ mtc1 $at, $f8 -/* 064338 80063738 C6240094 */ lwc1 $f4, 0x94($s1) -/* 06433C 8006373C 86020546 */ lh $v0, 0x546($s0) -/* 064340 80063740 3C014358 */ li $at, 0x43580000 # 216.000000 -/* 064344 80063744 46082403 */ div.s $f16, $f4, $f8 -/* 064348 80063748 00024823 */ negu $t1, $v0 -/* 06434C 8006374C 44893000 */ mtc1 $t1, $f6 -/* 064350 80063750 44812000 */ mtc1 $at, $f4 -/* 064354 80063754 3C014180 */ li $at, 0x41800000 # 16.000000 -/* 064358 80063758 468034A0 */ cvt.s.w $f18, $f6 -/* 06435C 8006375C 44813000 */ mtc1 $at, $f6 -/* 064360 80063760 46109282 */ mul.s $f10, $f18, $f16 -/* 064364 80063764 00000000 */ nop -/* 064368 80063768 46045202 */ mul.s $f8, $f10, $f4 -/* 06436C 8006376C C62A01C8 */ lwc1 $f10, 0x1c8($s1) -/* 064370 80063770 46064483 */ div.s $f18, $f8, $f6 -/* 064374 80063774 46120402 */ mul.s $f16, $f0, $f18 -/* 064378 80063778 460A8100 */ add.s $f4, $f16, $f10 -/* 06437C 8006377C 1000005A */ b .L800638E8 -/* 064380 80063780 E6040528 */ swc1 $f4, 0x528($s0) -/* 064384 80063784 8E2A00BC */ lw $t2, 0xbc($s1) -.L80063788: -/* 064388 80063788 000A5840 */ sll $t3, $t2, 1 -/* 06438C 8006378C 0561002A */ bgez $t3, .L80063838 -/* 064390 80063790 00000000 */ nop -/* 064394 80063794 44804000 */ mtc1 $zero, $f8 -/* 064398 80063798 3C014190 */ li $at, 0x41900000 # 18.000000 -/* 06439C 8006379C 44819000 */ mtc1 $at, $f18 -/* 0643A0 800637A0 E7A80010 */ swc1 $f8, 0x10($sp) -/* 0643A4 800637A4 C6260094 */ lwc1 $f6, 0x94($s1) -/* 0643A8 800637A8 860C0546 */ lh $t4, 0x546($s0) -/* 0643AC 800637AC 3C014358 */ li $at, 0x43580000 # 216.000000 -/* 0643B0 800637B0 46123403 */ div.s $f16, $f6, $f18 -/* 0643B4 800637B4 000C6823 */ negu $t5, $t4 -/* 0643B8 800637B8 448D5000 */ mtc1 $t5, $f10 -/* 0643BC 800637BC 44813000 */ mtc1 $at, $f6 -/* 0643C0 800637C0 3C014180 */ li $at, 0x41800000 # 16.000000 -/* 0643C4 800637C4 46805120 */ cvt.s.w $f4, $f10 -/* 0643C8 800637C8 44815000 */ mtc1 $at, $f10 -/* 0643CC 800637CC 27A40044 */ addiu $a0, $sp, 0x44 -/* 0643D0 800637D0 27A50040 */ addiu $a1, $sp, 0x40 -/* 0643D4 800637D4 27A6003C */ addiu $a2, $sp, 0x3c -/* 0643D8 800637D8 3C074000 */ lui $a3, 0x4000 -/* 0643DC 800637DC 46102202 */ mul.s $f8, $f4, $f16 -/* 0643E0 800637E0 00000000 */ nop -/* 0643E4 800637E4 46064482 */ mul.s $f18, $f8, $f6 -/* 0643E8 800637E8 460A9103 */ div.s $f4, $f18, $f10 -/* 0643EC 800637EC E7A40014 */ swc1 $f4, 0x14($sp) -/* 0643F0 800637F0 860E0548 */ lh $t6, 0x548($s0) -/* 0643F4 800637F4 000E7823 */ negu $t7, $t6 -/* 0643F8 800637F8 AFAF0018 */ sw $t7, 0x18($sp) -/* 0643FC 800637FC 86380206 */ lh $t8, 0x206($s1) -/* 064400 80063800 0018C823 */ negu $t9, $t8 -/* 064404 80063804 00194040 */ sll $t0, $t9, 1 -/* 064408 80063808 0C018AC6 */ jal func_80062B18 -/* 06440C 8006380C AFA8001C */ sw $t0, 0x1c($sp) -/* 064410 80063810 C63001E0 */ lwc1 $f16, 0x1e0($s1) -/* 064414 80063814 C7A80044 */ lwc1 $f8, 0x44($sp) -/* 064418 80063818 86020546 */ lh $v0, 0x546($s0) -/* 06441C 8006381C 46088180 */ add.s $f6, $f16, $f8 -/* 064420 80063820 E6060528 */ swc1 $f6, 0x528($s0) -/* 064424 80063824 C7AA003C */ lwc1 $f10, 0x3c($sp) -/* 064428 80063828 C63201E8 */ lwc1 $f18, 0x1e8($s1) -/* 06442C 8006382C 460A9100 */ add.s $f4, $f18, $f10 -/* 064430 80063830 1000002D */ b .L800638E8 -/* 064434 80063834 E6040530 */ swc1 $f4, 0x530($s0) -.L80063838: -/* 064438 80063838 0C0AE00E */ jal coss -/* 06443C 8006383C 96040548 */ lhu $a0, 0x548($s0) -/* 064440 80063840 3C014190 */ li $at, 0x41900000 # 18.000000 -/* 064444 80063844 44814000 */ mtc1 $at, $f8 -/* 064448 80063848 C6300094 */ lwc1 $f16, 0x94($s1) -/* 06444C 8006384C 86090546 */ lh $t1, 0x546($s0) -/* 064450 80063850 3C014358 */ li $at, 0x43580000 # 216.000000 -/* 064454 80063854 46088183 */ div.s $f6, $f16, $f8 -/* 064458 80063858 00095023 */ negu $t2, $t1 -/* 06445C 8006385C 448A9000 */ mtc1 $t2, $f18 -/* 064460 80063860 44818000 */ mtc1 $at, $f16 -/* 064464 80063864 3C014180 */ li $at, 0x41800000 # 16.000000 -/* 064468 80063868 468092A0 */ cvt.s.w $f10, $f18 -/* 06446C 8006386C 44819000 */ mtc1 $at, $f18 -/* 064470 80063870 96040548 */ lhu $a0, 0x548($s0) -/* 064474 80063874 46065102 */ mul.s $f4, $f10, $f6 -/* 064478 80063878 00000000 */ nop -/* 06447C 8006387C 46102202 */ mul.s $f8, $f4, $f16 -/* 064480 80063880 C62401E8 */ lwc1 $f4, 0x1e8($s1) -/* 064484 80063884 46124283 */ div.s $f10, $f8, $f18 -/* 064488 80063888 460A0182 */ mul.s $f6, $f0, $f10 -/* 06448C 8006388C 46043400 */ add.s $f16, $f6, $f4 -/* 064490 80063890 0C0AE006 */ jal sins -/* 064494 80063894 E6100530 */ swc1 $f16, 0x530($s0) -/* 064498 80063898 3C014190 */ li $at, 0x41900000 # 18.000000 -/* 06449C 8006389C 44819000 */ mtc1 $at, $f18 -/* 0644A0 800638A0 C6280094 */ lwc1 $f8, 0x94($s1) -/* 0644A4 800638A4 86020546 */ lh $v0, 0x546($s0) -/* 0644A8 800638A8 3C014358 */ li $at, 0x43580000 # 216.000000 -/* 0644AC 800638AC 46124283 */ div.s $f10, $f8, $f18 -/* 0644B0 800638B0 00025823 */ negu $t3, $v0 -/* 0644B4 800638B4 448B3000 */ mtc1 $t3, $f6 -/* 0644B8 800638B8 44814000 */ mtc1 $at, $f8 -/* 0644BC 800638BC 3C014180 */ li $at, 0x41800000 # 16.000000 -/* 0644C0 800638C0 46803120 */ cvt.s.w $f4, $f6 -/* 0644C4 800638C4 44813000 */ mtc1 $at, $f6 -/* 0644C8 800638C8 460A2402 */ mul.s $f16, $f4, $f10 -/* 0644CC 800638CC 00000000 */ nop -/* 0644D0 800638D0 46088482 */ mul.s $f18, $f16, $f8 -/* 0644D4 800638D4 C63001E0 */ lwc1 $f16, 0x1e0($s1) -/* 0644D8 800638D8 46069103 */ div.s $f4, $f18, $f6 -/* 0644DC 800638DC 46040282 */ mul.s $f10, $f0, $f4 -/* 0644E0 800638E0 46105200 */ add.s $f8, $f10, $f16 -/* 0644E4 800638E4 E6080528 */ swc1 $f8, 0x528($s0) -.L800638E8: -/* 0644E8 800638E8 C612052C */ lwc1 $f18, 0x52c($s0) -/* 0644EC 800638EC 244C0001 */ addiu $t4, $v0, 1 -/* 0644F0 800638F0 A60C0546 */ sh $t4, 0x546($s0) -/* 0644F4 800638F4 3C01800F */ lui $at, %hi(D_800EE670) -/* 0644F8 800638F8 D424E670 */ ldc1 $f4, %lo(D_800EE670)($at) -/* 0644FC 800638FC 460091A1 */ cvt.d.s $f6, $f18 -/* 064500 80063900 46243280 */ add.d $f10, $f6, $f4 -/* 064504 80063904 46205420 */ cvt.s.d $f16, $f10 -/* 064508 80063908 E610052C */ swc1 $f16, 0x52c($s0) -/* 06450C 8006390C 8E2300BC */ lw $v1, 0xbc($s1) -/* 064510 80063910 306D0080 */ andi $t5, $v1, 0x80 -/* 064514 80063914 15A00003 */ bnez $t5, .L80063924 -/* 064518 80063918 306E0040 */ andi $t6, $v1, 0x40 -/* 06451C 8006391C 51C00004 */ beql $t6, $zero, .L80063930 -/* 064520 80063920 860F0546 */ lh $t7, 0x546($s0) -.L80063924: -/* 064524 80063924 A6000544 */ sh $zero, 0x544($s0) -/* 064528 80063928 A6000546 */ sh $zero, 0x546($s0) -/* 06452C 8006392C 860F0546 */ lh $t7, 0x546($s0) -.L80063930: -/* 064530 80063930 24010008 */ li $at, 8 -/* 064534 80063934 55E10005 */ bnel $t7, $at, .L8006394C -/* 064538 80063938 C6080534 */ lwc1 $f8, 0x534($s0) -/* 06453C 8006393C A6000544 */ sh $zero, 0x544($s0) -/* 064540 80063940 A6000546 */ sh $zero, 0x546($s0) -/* 064544 80063944 A600053A */ sh $zero, 0x53a($s0) -/* 064548 80063948 C6080534 */ lwc1 $f8, 0x534($s0) -.L8006394C: -/* 06454C 8006394C 3C01800F */ lui $at, %hi(D_800EE678) -/* 064550 80063950 D426E678 */ ldc1 $f6, %lo(D_800EE678)($at) -/* 064554 80063954 460044A1 */ cvt.d.s $f18, $f8 -/* 064558 80063958 86180568 */ lh $t8, 0x568($s0) -/* 06455C 8006395C 46269100 */ add.d $f4, $f18, $f6 -/* 064560 80063960 462022A0 */ cvt.s.d $f10, $f4 -/* 064564 80063964 1700000D */ bnez $t8, .L8006399C -/* 064568 80063968 E60A0534 */ swc1 $f10, 0x534($s0) -/* 06456C 8006396C 86190546 */ lh $t9, 0x546($s0) -/* 064570 80063970 2B210004 */ slti $at, $t9, 4 -/* 064574 80063974 54200005 */ bnel $at, $zero, .L8006398C -/* 064578 80063978 860A0566 */ lh $t2, 0x566($s0) -/* 06457C 8006397C 86080566 */ lh $t0, 0x566($s0) -/* 064580 80063980 2509FFF4 */ addiu $t1, $t0, -0xc -/* 064584 80063984 A6090566 */ sh $t1, 0x566($s0) -/* 064588 80063988 860A0566 */ lh $t2, 0x566($s0) -.L8006398C: -/* 06458C 8006398C 5D40000F */ bgtzl $t2, .L800639CC -/* 064590 80063990 8FBF002C */ lw $ra, 0x2c($sp) -/* 064594 80063994 1000000C */ b .L800639C8 -/* 064598 80063998 A6000566 */ sh $zero, 0x566($s0) -.L8006399C: -/* 06459C 8006399C 860B0546 */ lh $t3, 0x546($s0) -/* 0645A0 800639A0 29610004 */ slti $at, $t3, 4 -/* 0645A4 800639A4 54200005 */ bnel $at, $zero, .L800639BC -/* 0645A8 800639A8 860E0566 */ lh $t6, 0x566($s0) -/* 0645AC 800639AC 860C0566 */ lh $t4, 0x566($s0) -/* 0645B0 800639B0 258DFFF0 */ addiu $t5, $t4, -0x10 -/* 0645B4 800639B4 A60D0566 */ sh $t5, 0x566($s0) -/* 0645B8 800639B8 860E0566 */ lh $t6, 0x566($s0) -.L800639BC: -/* 0645BC 800639BC 5DC00003 */ bgtzl $t6, .L800639CC -/* 0645C0 800639C0 8FBF002C */ lw $ra, 0x2c($sp) -/* 0645C4 800639C4 A6000566 */ sh $zero, 0x566($s0) -.L800639C8: -/* 0645C8 800639C8 8FBF002C */ lw $ra, 0x2c($sp) -.L800639CC: -/* 0645CC 800639CC 8FB00024 */ lw $s0, 0x24($sp) -/* 0645D0 800639D0 8FB10028 */ lw $s1, 0x28($sp) -/* 0645D4 800639D4 03E00008 */ jr $ra -/* 0645D8 800639D8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/non_matchings/code_80057C60/func_800639DC.s b/asm/non_matchings/code_80057C60/func_800639DC.s deleted file mode 100644 index 895d02dbb..000000000 --- a/asm/non_matchings/code_80057C60/func_800639DC.s +++ /dev/null @@ -1,135 +0,0 @@ -glabel func_800639DC -/* 0645DC 800639DC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 0645E0 800639E0 00057400 */ sll $t6, $a1, 0x10 -/* 0645E4 800639E4 000E7C03 */ sra $t7, $t6, 0x10 -/* 0645E8 800639E8 000FC8C0 */ sll $t9, $t7, 3 -/* 0645EC 800639EC 032FC821 */ addu $t9, $t9, $t7 -/* 0645F0 800639F0 AFB00018 */ sw $s0, 0x18($sp) -/* 0645F4 800639F4 0019C8C0 */ sll $t9, $t9, 3 -/* 0645F8 800639F8 AFBF001C */ sw $ra, 0x1c($sp) -/* 0645FC 800639FC AFA40020 */ sw $a0, 0x20($sp) -/* 064600 80063A00 AFA50024 */ sw $a1, 0x24($sp) -/* 064604 80063A04 AFA60028 */ sw $a2, 0x28($sp) -/* 064608 80063A08 AFA7002C */ sw $a3, 0x2c($sp) -/* 06460C 80063A0C 00998021 */ addu $s0, $a0, $t9 -/* 064610 80063A10 96080538 */ lhu $t0, 0x538($s0) -/* 064614 80063A14 24010001 */ li $at, 1 -/* 064618 80063A18 1501001E */ bne $t0, $at, .L80063A94 -/* 06461C 80063A1C 00000000 */ nop -/* 064620 80063A20 0C0AE00E */ jal coss -/* 064624 80063A24 96040548 */ lhu $a0, 0x548($s0) -/* 064628 80063A28 86090546 */ lh $t1, 0x546($s0) -/* 06462C 80063A2C 3C01800F */ lui $at, %hi(D_800EE680) # $at, 0x800f -/* 064630 80063A30 C424E680 */ lwc1 $f4, %lo(D_800EE680)($at) -/* 064634 80063A34 44893000 */ mtc1 $t1, $f6 -/* 064638 80063A38 8FAA0020 */ lw $t2, 0x20($sp) -/* 06463C 80063A3C 96040548 */ lhu $a0, 0x548($s0) -/* 064640 80063A40 46803220 */ cvt.s.w $f8, $f6 -/* 064644 80063A44 C55201D0 */ lwc1 $f18, 0x1d0($t2) -/* 064648 80063A48 46082282 */ mul.s $f10, $f4, $f8 -/* 06464C 80063A4C 00000000 */ nop -/* 064650 80063A50 460A0402 */ mul.s $f16, $f0, $f10 -/* 064654 80063A54 46128180 */ add.s $f6, $f16, $f18 -/* 064658 80063A58 0C0AE006 */ jal sins -/* 06465C 80063A5C E6060530 */ swc1 $f6, 0x530($s0) -/* 064660 80063A60 86020546 */ lh $v0, 0x546($s0) -/* 064664 80063A64 3C01800F */ lui $at, %hi(D_800EE684) # $at, 0x800f -/* 064668 80063A68 C424E684 */ lwc1 $f4, %lo(D_800EE684)($at) -/* 06466C 80063A6C 44824000 */ mtc1 $v0, $f8 -/* 064670 80063A70 8FAB0020 */ lw $t3, 0x20($sp) -/* 064674 80063A74 468042A0 */ cvt.s.w $f10, $f8 -/* 064678 80063A78 C56601C8 */ lwc1 $f6, 0x1c8($t3) -/* 06467C 80063A7C 460A2402 */ mul.s $f16, $f4, $f10 -/* 064680 80063A80 00000000 */ nop -/* 064684 80063A84 46100482 */ mul.s $f18, $f0, $f16 -/* 064688 80063A88 46069200 */ add.s $f8, $f18, $f6 -/* 06468C 80063A8C 1000001D */ b .L80063B04 -/* 064690 80063A90 E6080528 */ swc1 $f8, 0x528($s0) -.L80063A94: -/* 064694 80063A94 0C0AE00E */ jal coss -/* 064698 80063A98 96040548 */ lhu $a0, 0x548($s0) -/* 06469C 80063A9C 860C0546 */ lh $t4, 0x546($s0) -/* 0646A0 80063AA0 3C01800F */ lui $at, %hi(D_800EE688) # $at, 0x800f -/* 0646A4 80063AA4 C424E688 */ lwc1 $f4, %lo(D_800EE688)($at) -/* 0646A8 80063AA8 448C5000 */ mtc1 $t4, $f10 -/* 0646AC 80063AAC 8FAD0020 */ lw $t5, 0x20($sp) -/* 0646B0 80063AB0 96040548 */ lhu $a0, 0x548($s0) -/* 0646B4 80063AB4 46805420 */ cvt.s.w $f16, $f10 -/* 0646B8 80063AB8 C5A801E8 */ lwc1 $f8, 0x1e8($t5) -/* 0646BC 80063ABC 46102482 */ mul.s $f18, $f4, $f16 -/* 0646C0 80063AC0 00000000 */ nop -/* 0646C4 80063AC4 46120182 */ mul.s $f6, $f0, $f18 -/* 0646C8 80063AC8 46083280 */ add.s $f10, $f6, $f8 -/* 0646CC 80063ACC 0C0AE006 */ jal sins -/* 0646D0 80063AD0 E60A0530 */ swc1 $f10, 0x530($s0) -/* 0646D4 80063AD4 86020546 */ lh $v0, 0x546($s0) -/* 0646D8 80063AD8 3C01800F */ lui $at, %hi(D_800EE68C) # $at, 0x800f -/* 0646DC 80063ADC C424E68C */ lwc1 $f4, %lo(D_800EE68C)($at) -/* 0646E0 80063AE0 44828000 */ mtc1 $v0, $f16 -/* 0646E4 80063AE4 8FAE0020 */ lw $t6, 0x20($sp) -/* 0646E8 80063AE8 468084A0 */ cvt.s.w $f18, $f16 -/* 0646EC 80063AEC C5CA01E0 */ lwc1 $f10, 0x1e0($t6) -/* 0646F0 80063AF0 46122182 */ mul.s $f6, $f4, $f18 -/* 0646F4 80063AF4 00000000 */ nop -/* 0646F8 80063AF8 46060202 */ mul.s $f8, $f0, $f6 -/* 0646FC 80063AFC 460A4400 */ add.s $f16, $f8, $f10 -/* 064700 80063B00 E6100528 */ swc1 $f16, 0x528($s0) -.L80063B04: -/* 064704 80063B04 C604052C */ lwc1 $f4, 0x52c($s0) -/* 064708 80063B08 244F0001 */ addiu $t7, $v0, 1 -/* 06470C 80063B0C A60F0546 */ sh $t7, 0x546($s0) -/* 064710 80063B10 3C01800F */ lui $at, %hi(D_800EE690) -/* 064714 80063B14 D426E690 */ ldc1 $f6, %lo(D_800EE690)($at) -/* 064718 80063B18 460024A1 */ cvt.d.s $f18, $f4 -/* 06471C 80063B1C 86180546 */ lh $t8, 0x546($s0) -/* 064720 80063B20 46269200 */ add.d $f8, $f18, $f6 -/* 064724 80063B24 24010008 */ li $at, 8 -/* 064728 80063B28 462042A0 */ cvt.s.d $f10, $f8 -/* 06472C 80063B2C 17010004 */ bne $t8, $at, .L80063B40 -/* 064730 80063B30 E60A052C */ swc1 $f10, 0x52c($s0) -/* 064734 80063B34 A6000544 */ sh $zero, 0x544($s0) -/* 064738 80063B38 A6000546 */ sh $zero, 0x546($s0) -/* 06473C 80063B3C A600053A */ sh $zero, 0x53a($s0) -.L80063B40: -/* 064740 80063B40 C6100534 */ lwc1 $f16, 0x534($s0) -/* 064744 80063B44 3C01800F */ lui $at, %hi(D_800EE698) -/* 064748 80063B48 D432E698 */ ldc1 $f18, %lo(D_800EE698)($at) -/* 06474C 80063B4C 46008121 */ cvt.d.s $f4, $f16 -/* 064750 80063B50 86190568 */ lh $t9, 0x568($s0) -/* 064754 80063B54 46322180 */ add.d $f6, $f4, $f18 -/* 064758 80063B58 46203220 */ cvt.s.d $f8, $f6 -/* 06475C 80063B5C 1720000D */ bnez $t9, .L80063B94 -/* 064760 80063B60 E6080534 */ swc1 $f8, 0x534($s0) -/* 064764 80063B64 86080546 */ lh $t0, 0x546($s0) -/* 064768 80063B68 29010004 */ slti $at, $t0, 4 -/* 06476C 80063B6C 54200005 */ bnel $at, $zero, .L80063B84 -/* 064770 80063B70 860B0566 */ lh $t3, 0x566($s0) -/* 064774 80063B74 86090566 */ lh $t1, 0x566($s0) -/* 064778 80063B78 252AFFFF */ addiu $t2, $t1, -1 -/* 06477C 80063B7C A60A0566 */ sh $t2, 0x566($s0) -/* 064780 80063B80 860B0566 */ lh $t3, 0x566($s0) -.L80063B84: -/* 064784 80063B84 5D60000F */ bgtzl $t3, .L80063BC4 -/* 064788 80063B88 8FBF001C */ lw $ra, 0x1c($sp) -/* 06478C 80063B8C 1000000C */ b .L80063BC0 -/* 064790 80063B90 A6000566 */ sh $zero, 0x566($s0) -.L80063B94: -/* 064794 80063B94 860C0546 */ lh $t4, 0x546($s0) -/* 064798 80063B98 29810004 */ slti $at, $t4, 4 -/* 06479C 80063B9C 54200005 */ bnel $at, $zero, .L80063BB4 -/* 0647A0 80063BA0 860F0566 */ lh $t7, 0x566($s0) -/* 0647A4 80063BA4 860D0566 */ lh $t5, 0x566($s0) -/* 0647A8 80063BA8 25AEFFF0 */ addiu $t6, $t5, -0x10 -/* 0647AC 80063BAC A60E0566 */ sh $t6, 0x566($s0) -/* 0647B0 80063BB0 860F0566 */ lh $t7, 0x566($s0) -.L80063BB4: -/* 0647B4 80063BB4 5DE00003 */ bgtzl $t7, .L80063BC4 -/* 0647B8 80063BB8 8FBF001C */ lw $ra, 0x1c($sp) -/* 0647BC 80063BBC A6000566 */ sh $zero, 0x566($s0) -.L80063BC0: -/* 0647C0 80063BC0 8FBF001C */ lw $ra, 0x1c($sp) -.L80063BC4: -/* 0647C4 80063BC4 8FB00018 */ lw $s0, 0x18($sp) -/* 0647C8 80063BC8 27BD0020 */ addiu $sp, $sp, 0x20 -/* 0647CC 80063BCC 03E00008 */ jr $ra -/* 0647D0 80063BD0 00000000 */ nop diff --git a/asm/non_matchings/code_80057C60/func_80063BD4.s b/asm/non_matchings/code_80057C60/func_80063BD4.s deleted file mode 100644 index 30d27b1e5..000000000 --- a/asm/non_matchings/code_80057C60/func_80063BD4.s +++ /dev/null @@ -1,101 +0,0 @@ -glabel func_80063BD4 -/* 0647D4 80063BD4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 0647D8 80063BD8 00057400 */ sll $t6, $a1, 0x10 -/* 0647DC 80063BDC 000E7C03 */ sra $t7, $t6, 0x10 -/* 0647E0 80063BE0 000FC0C0 */ sll $t8, $t7, 3 -/* 0647E4 80063BE4 030FC021 */ addu $t8, $t8, $t7 -/* 0647E8 80063BE8 AFB00014 */ sw $s0, 0x14($sp) -/* 0647EC 80063BEC 0018C0C0 */ sll $t8, $t8, 3 -/* 0647F0 80063BF0 AFBF001C */ sw $ra, 0x1c($sp) -/* 0647F4 80063BF4 AFB10018 */ sw $s1, 0x18($sp) -/* 0647F8 80063BF8 AFA50024 */ sw $a1, 0x24($sp) -/* 0647FC 80063BFC AFA60028 */ sw $a2, 0x28($sp) -/* 064800 80063C00 AFA7002C */ sw $a3, 0x2c($sp) -/* 064804 80063C04 00988021 */ addu $s0, $a0, $t8 -/* 064808 80063C08 96190538 */ lhu $t9, 0x538($s0) -/* 06480C 80063C0C 24010001 */ li $at, 1 -/* 064810 80063C10 00808825 */ move $s1, $a0 -/* 064814 80063C14 1721001A */ bne $t9, $at, .L80063C80 -/* 064818 80063C18 00000000 */ nop -/* 06481C 80063C1C 0C0AE00E */ jal coss -/* 064820 80063C20 96040548 */ lhu $a0, 0x548($s0) -/* 064824 80063C24 86080546 */ lh $t0, 0x546($s0) -/* 064828 80063C28 C62A01D0 */ lwc1 $f10, 0x1d0($s1) -/* 06482C 80063C2C 96040548 */ lhu $a0, 0x548($s0) -/* 064830 80063C30 00080823 */ negu $at, $t0 -/* 064834 80063C34 00014840 */ sll $t1, $at, 1 -/* 064838 80063C38 44892000 */ mtc1 $t1, $f4 -/* 06483C 80063C3C 00000000 */ nop -/* 064840 80063C40 468021A0 */ cvt.s.w $f6, $f4 -/* 064844 80063C44 46060202 */ mul.s $f8, $f0, $f6 -/* 064848 80063C48 460A4400 */ add.s $f16, $f8, $f10 -/* 06484C 80063C4C 0C0AE006 */ jal sins -/* 064850 80063C50 E6100530 */ swc1 $f16, 0x530($s0) -/* 064854 80063C54 86020546 */ lh $v0, 0x546($s0) -/* 064858 80063C58 C62801C8 */ lwc1 $f8, 0x1c8($s1) -/* 06485C 80063C5C 00020823 */ negu $at, $v0 -/* 064860 80063C60 00015040 */ sll $t2, $at, 1 -/* 064864 80063C64 448A9000 */ mtc1 $t2, $f18 -/* 064868 80063C68 00000000 */ nop -/* 06486C 80063C6C 46809120 */ cvt.s.w $f4, $f18 -/* 064870 80063C70 46040182 */ mul.s $f6, $f0, $f4 -/* 064874 80063C74 46083280 */ add.s $f10, $f6, $f8 -/* 064878 80063C78 10000019 */ b .L80063CE0 -/* 06487C 80063C7C E60A0528 */ swc1 $f10, 0x528($s0) -.L80063C80: -/* 064880 80063C80 0C0AE00E */ jal coss -/* 064884 80063C84 96040548 */ lhu $a0, 0x548($s0) -/* 064888 80063C88 860B0546 */ lh $t3, 0x546($s0) -/* 06488C 80063C8C C62601E8 */ lwc1 $f6, 0x1e8($s1) -/* 064890 80063C90 96040548 */ lhu $a0, 0x548($s0) -/* 064894 80063C94 000B0823 */ negu $at, $t3 -/* 064898 80063C98 00016040 */ sll $t4, $at, 1 -/* 06489C 80063C9C 448C8000 */ mtc1 $t4, $f16 -/* 0648A0 80063CA0 00000000 */ nop -/* 0648A4 80063CA4 468084A0 */ cvt.s.w $f18, $f16 -/* 0648A8 80063CA8 46120102 */ mul.s $f4, $f0, $f18 -/* 0648AC 80063CAC 46062200 */ add.s $f8, $f4, $f6 -/* 0648B0 80063CB0 0C0AE006 */ jal sins -/* 0648B4 80063CB4 E6080530 */ swc1 $f8, 0x530($s0) -/* 0648B8 80063CB8 86020546 */ lh $v0, 0x546($s0) -/* 0648BC 80063CBC C62401E0 */ lwc1 $f4, 0x1e0($s1) -/* 0648C0 80063CC0 00020823 */ negu $at, $v0 -/* 0648C4 80063CC4 00016840 */ sll $t5, $at, 1 -/* 0648C8 80063CC8 448D5000 */ mtc1 $t5, $f10 -/* 0648CC 80063CCC 00000000 */ nop -/* 0648D0 80063CD0 46805420 */ cvt.s.w $f16, $f10 -/* 0648D4 80063CD4 46100482 */ mul.s $f18, $f0, $f16 -/* 0648D8 80063CD8 46049180 */ add.s $f6, $f18, $f4 -/* 0648DC 80063CDC E6060528 */ swc1 $f6, 0x528($s0) -.L80063CE0: -/* 0648E0 80063CE0 C608052C */ lwc1 $f8, 0x52c($s0) -/* 0648E4 80063CE4 244E0001 */ addiu $t6, $v0, 1 -/* 0648E8 80063CE8 A60E0546 */ sh $t6, 0x546($s0) -/* 0648EC 80063CEC 3C01800F */ lui $at, %hi(D_800EE6A0) -/* 0648F0 80063CF0 D430E6A0 */ ldc1 $f16, %lo(D_800EE6A0)($at) -/* 0648F4 80063CF4 460042A1 */ cvt.d.s $f10, $f8 -/* 0648F8 80063CF8 860F0546 */ lh $t7, 0x546($s0) -/* 0648FC 80063CFC 46305480 */ add.d $f18, $f10, $f16 -/* 064900 80063D00 24010008 */ li $at, 8 -/* 064904 80063D04 46209120 */ cvt.s.d $f4, $f18 -/* 064908 80063D08 15E10004 */ bne $t7, $at, .L80063D1C -/* 06490C 80063D0C E604052C */ swc1 $f4, 0x52c($s0) -/* 064910 80063D10 A6000544 */ sh $zero, 0x544($s0) -/* 064914 80063D14 A6000546 */ sh $zero, 0x546($s0) -/* 064918 80063D18 A600053A */ sh $zero, 0x53a($s0) -.L80063D1C: -/* 06491C 80063D1C 3C014000 */ li $at, 0x40000000 # 2.000000 -/* 064920 80063D20 44813000 */ mtc1 $at, $f6 -/* 064924 80063D24 C6080534 */ lwc1 $f8, 0x534($s0) -/* 064928 80063D28 3C01800F */ lui $at, %hi(D_800EE6A8) -/* 06492C 80063D2C E6060540 */ swc1 $f6, 0x540($s0) -/* 064930 80063D30 D430E6A8 */ ldc1 $f16, %lo(D_800EE6A8)($at) -/* 064934 80063D34 460042A1 */ cvt.d.s $f10, $f8 -/* 064938 80063D38 46305481 */ sub.d $f18, $f10, $f16 -/* 06493C 80063D3C 46209120 */ cvt.s.d $f4, $f18 -/* 064940 80063D40 E6040534 */ swc1 $f4, 0x534($s0) -/* 064944 80063D44 8FBF001C */ lw $ra, 0x1c($sp) -/* 064948 80063D48 8FB10018 */ lw $s1, 0x18($sp) -/* 06494C 80063D4C 8FB00014 */ lw $s0, 0x14($sp) -/* 064950 80063D50 03E00008 */ jr $ra -/* 064954 80063D54 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/non_matchings/code_80057C60/func_80063D58.s b/asm/non_matchings/code_80057C60/func_80063D58.s deleted file mode 100644 index e87a73eb9..000000000 --- a/asm/non_matchings/code_80057C60/func_80063D58.s +++ /dev/null @@ -1,278 +0,0 @@ -glabel func_80063D58 -/* 064958 80063D58 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 06495C 80063D5C 00057400 */ sll $t6, $a1, 0x10 -/* 064960 80063D60 000E7C03 */ sra $t7, $t6, 0x10 -/* 064964 80063D64 000FC0C0 */ sll $t8, $t7, 3 -/* 064968 80063D68 030FC021 */ addu $t8, $t8, $t7 -/* 06496C 80063D6C AFB00014 */ sw $s0, 0x14($sp) -/* 064970 80063D70 0018C0C0 */ sll $t8, $t8, 3 -/* 064974 80063D74 AFBF001C */ sw $ra, 0x1c($sp) -/* 064978 80063D78 AFB10018 */ sw $s1, 0x18($sp) -/* 06497C 80063D7C AFA50024 */ sw $a1, 0x24($sp) -/* 064980 80063D80 AFA60028 */ sw $a2, 0x28($sp) -/* 064984 80063D84 AFA7002C */ sw $a3, 0x2c($sp) -/* 064988 80063D88 00988021 */ addu $s0, $a0, $t8 -/* 06498C 80063D8C 96190538 */ lhu $t9, 0x538($s0) -/* 064990 80063D90 24010001 */ li $at, 1 -/* 064994 80063D94 00808825 */ move $s1, $a0 -/* 064998 80063D98 1721002E */ bne $t9, $at, .L80063E54 -/* 06499C 80063D9C 00000000 */ nop -/* 0649A0 80063DA0 0C0AE00E */ jal coss -/* 0649A4 80063DA4 96040548 */ lhu $a0, 0x548($s0) -/* 0649A8 80063DA8 3C014190 */ li $at, 0x41900000 # 18.000000 -/* 0649AC 80063DAC 44813000 */ mtc1 $at, $f6 -/* 0649B0 80063DB0 C6240094 */ lwc1 $f4, 0x94($s1) -/* 0649B4 80063DB4 86080546 */ lh $t0, 0x546($s0) -/* 0649B8 80063DB8 3C014358 */ li $at, 0x43580000 # 216.000000 -/* 0649BC 80063DBC 46062203 */ div.s $f8, $f4, $f6 -/* 0649C0 80063DC0 00084823 */ negu $t1, $t0 -/* 0649C4 80063DC4 44895000 */ mtc1 $t1, $f10 -/* 0649C8 80063DC8 44812000 */ mtc1 $at, $f4 -/* 0649CC 80063DCC 3C0141A0 */ li $at, 0x41A00000 # 20.000000 -/* 0649D0 80063DD0 46805420 */ cvt.s.w $f16, $f10 -/* 0649D4 80063DD4 44815000 */ mtc1 $at, $f10 -/* 0649D8 80063DD8 96040548 */ lhu $a0, 0x548($s0) -/* 0649DC 80063DDC 46088482 */ mul.s $f18, $f16, $f8 -/* 0649E0 80063DE0 00000000 */ nop -/* 0649E4 80063DE4 46049182 */ mul.s $f6, $f18, $f4 -/* 0649E8 80063DE8 C63201D0 */ lwc1 $f18, 0x1d0($s1) -/* 0649EC 80063DEC 460A3403 */ div.s $f16, $f6, $f10 -/* 0649F0 80063DF0 46100202 */ mul.s $f8, $f0, $f16 -/* 0649F4 80063DF4 46124100 */ add.s $f4, $f8, $f18 -/* 0649F8 80063DF8 0C0AE006 */ jal sins -/* 0649FC 80063DFC E6040530 */ swc1 $f4, 0x530($s0) -/* 064A00 80063E00 3C014190 */ li $at, 0x41900000 # 18.000000 -/* 064A04 80063E04 44815000 */ mtc1 $at, $f10 -/* 064A08 80063E08 C6260094 */ lwc1 $f6, 0x94($s1) -/* 064A0C 80063E0C 86020546 */ lh $v0, 0x546($s0) -/* 064A10 80063E10 3C014358 */ li $at, 0x43580000 # 216.000000 -/* 064A14 80063E14 460A3403 */ div.s $f16, $f6, $f10 -/* 064A18 80063E18 00025023 */ negu $t2, $v0 -/* 064A1C 80063E1C 448A4000 */ mtc1 $t2, $f8 -/* 064A20 80063E20 44813000 */ mtc1 $at, $f6 -/* 064A24 80063E24 3C0141A0 */ li $at, 0x41A00000 # 20.000000 -/* 064A28 80063E28 468044A0 */ cvt.s.w $f18, $f8 -/* 064A2C 80063E2C 44814000 */ mtc1 $at, $f8 -/* 064A30 80063E30 46109102 */ mul.s $f4, $f18, $f16 -/* 064A34 80063E34 00000000 */ nop -/* 064A38 80063E38 46062282 */ mul.s $f10, $f4, $f6 -/* 064A3C 80063E3C C62401C8 */ lwc1 $f4, 0x1c8($s1) -/* 064A40 80063E40 46085483 */ div.s $f18, $f10, $f8 -/* 064A44 80063E44 46120402 */ mul.s $f16, $f0, $f18 -/* 064A48 80063E48 46048180 */ add.s $f6, $f16, $f4 -/* 064A4C 80063E4C 1000002D */ b .L80063F04 -/* 064A50 80063E50 E6060528 */ swc1 $f6, 0x528($s0) -.L80063E54: -/* 064A54 80063E54 0C0AE00E */ jal coss -/* 064A58 80063E58 96040548 */ lhu $a0, 0x548($s0) -/* 064A5C 80063E5C 3C014190 */ li $at, 0x41900000 # 18.000000 -/* 064A60 80063E60 44814000 */ mtc1 $at, $f8 -/* 064A64 80063E64 C62A0094 */ lwc1 $f10, 0x94($s1) -/* 064A68 80063E68 860B0546 */ lh $t3, 0x546($s0) -/* 064A6C 80063E6C 3C014358 */ li $at, 0x43580000 # 216.000000 -/* 064A70 80063E70 46085483 */ div.s $f18, $f10, $f8 -/* 064A74 80063E74 000B6023 */ negu $t4, $t3 -/* 064A78 80063E78 448C8000 */ mtc1 $t4, $f16 -/* 064A7C 80063E7C 44815000 */ mtc1 $at, $f10 -/* 064A80 80063E80 3C0141A0 */ li $at, 0x41A00000 # 20.000000 -/* 064A84 80063E84 46808120 */ cvt.s.w $f4, $f16 -/* 064A88 80063E88 44818000 */ mtc1 $at, $f16 -/* 064A8C 80063E8C 96040548 */ lhu $a0, 0x548($s0) -/* 064A90 80063E90 46122182 */ mul.s $f6, $f4, $f18 -/* 064A94 80063E94 00000000 */ nop -/* 064A98 80063E98 460A3202 */ mul.s $f8, $f6, $f10 -/* 064A9C 80063E9C C62601E8 */ lwc1 $f6, 0x1e8($s1) -/* 064AA0 80063EA0 46104103 */ div.s $f4, $f8, $f16 -/* 064AA4 80063EA4 46040482 */ mul.s $f18, $f0, $f4 -/* 064AA8 80063EA8 46069280 */ add.s $f10, $f18, $f6 -/* 064AAC 80063EAC 0C0AE006 */ jal sins -/* 064AB0 80063EB0 E60A0530 */ swc1 $f10, 0x530($s0) -/* 064AB4 80063EB4 3C014190 */ li $at, 0x41900000 # 18.000000 -/* 064AB8 80063EB8 44818000 */ mtc1 $at, $f16 -/* 064ABC 80063EBC C6280094 */ lwc1 $f8, 0x94($s1) -/* 064AC0 80063EC0 86020546 */ lh $v0, 0x546($s0) -/* 064AC4 80063EC4 3C014358 */ li $at, 0x43580000 # 216.000000 -/* 064AC8 80063EC8 46104103 */ div.s $f4, $f8, $f16 -/* 064ACC 80063ECC 00026823 */ negu $t5, $v0 -/* 064AD0 80063ED0 448D9000 */ mtc1 $t5, $f18 -/* 064AD4 80063ED4 44814000 */ mtc1 $at, $f8 -/* 064AD8 80063ED8 3C0141A0 */ li $at, 0x41A00000 # 20.000000 -/* 064ADC 80063EDC 468091A0 */ cvt.s.w $f6, $f18 -/* 064AE0 80063EE0 44819000 */ mtc1 $at, $f18 -/* 064AE4 80063EE4 46043282 */ mul.s $f10, $f6, $f4 -/* 064AE8 80063EE8 00000000 */ nop -/* 064AEC 80063EEC 46085402 */ mul.s $f16, $f10, $f8 -/* 064AF0 80063EF0 C62A01E0 */ lwc1 $f10, 0x1e0($s1) -/* 064AF4 80063EF4 46128183 */ div.s $f6, $f16, $f18 -/* 064AF8 80063EF8 46060102 */ mul.s $f4, $f0, $f6 -/* 064AFC 80063EFC 460A2200 */ add.s $f8, $f4, $f10 -/* 064B00 80063F00 E6080528 */ swc1 $f8, 0x528($s0) -.L80063F04: -/* 064B04 80063F04 244E0001 */ addiu $t6, $v0, 1 -/* 064B08 80063F08 A60E0546 */ sh $t6, 0x546($s0) -/* 064B0C 80063F0C 86020546 */ lh $v0, 0x546($s0) -/* 064B10 80063F10 24010008 */ li $at, 8 -/* 064B14 80063F14 54410006 */ bnel $v0, $at, .L80063F30 -/* 064B18 80063F18 C6100534 */ lwc1 $f16, 0x534($s0) -/* 064B1C 80063F1C A6000546 */ sh $zero, 0x546($s0) -/* 064B20 80063F20 A6000544 */ sh $zero, 0x544($s0) -/* 064B24 80063F24 86020546 */ lh $v0, 0x546($s0) -/* 064B28 80063F28 A600053A */ sh $zero, 0x53a($s0) -/* 064B2C 80063F2C C6100534 */ lwc1 $f16, 0x534($s0) -.L80063F30: -/* 064B30 80063F30 3C01800F */ lui $at, %hi(D_800EE6B0) -/* 064B34 80063F34 D426E6B0 */ ldc1 $f6, %lo(D_800EE6B0)($at) -/* 064B38 80063F38 460084A1 */ cvt.d.s $f18, $f16 -/* 064B3C 80063F3C 28410004 */ slti $at, $v0, 4 -/* 064B40 80063F40 46269100 */ add.d $f4, $f18, $f6 -/* 064B44 80063F44 462022A0 */ cvt.s.d $f10, $f4 -/* 064B48 80063F48 1420000C */ bnez $at, .L80063F7C -/* 064B4C 80063F4C E60A0534 */ swc1 $f10, 0x534($s0) -/* 064B50 80063F50 860F0566 */ lh $t7, 0x566($s0) -/* 064B54 80063F54 C608052C */ lwc1 $f8, 0x52c($s0) -/* 064B58 80063F58 3C01800F */ lui $at, %hi(D_800EE6B8) -/* 064B5C 80063F5C 25F8FFEE */ addiu $t8, $t7, -0x12 -/* 064B60 80063F60 A6180566 */ sh $t8, 0x566($s0) -/* 064B64 80063F64 D432E6B8 */ ldc1 $f18, %lo(D_800EE6B8)($at) -/* 064B68 80063F68 46004421 */ cvt.d.s $f16, $f8 -/* 064B6C 80063F6C 46328181 */ sub.d $f6, $f16, $f18 -/* 064B70 80063F70 46203120 */ cvt.s.d $f4, $f6 -/* 064B74 80063F74 10000008 */ b .L80063F98 -/* 064B78 80063F78 E604052C */ swc1 $f4, 0x52c($s0) -.L80063F7C: -/* 064B7C 80063F7C C60A052C */ lwc1 $f10, 0x52c($s0) -/* 064B80 80063F80 3C01800F */ lui $at, %hi(D_800EE6C0) -/* 064B84 80063F84 D430E6C0 */ ldc1 $f16, %lo(D_800EE6C0)($at) -/* 064B88 80063F88 46005221 */ cvt.d.s $f8, $f10 -/* 064B8C 80063F8C 46304480 */ add.d $f18, $f8, $f16 -/* 064B90 80063F90 462091A0 */ cvt.s.d $f6, $f18 -/* 064B94 80063F94 E606052C */ swc1 $f6, 0x52c($s0) -.L80063F98: -/* 064B98 80063F98 86190566 */ lh $t9, 0x566($s0) -/* 064B9C 80063F9C 5F200003 */ bgtzl $t9, .L80063FAC -/* 064BA0 80063FA0 8FBF001C */ lw $ra, 0x1c($sp) -/* 064BA4 80063FA4 A6000566 */ sh $zero, 0x566($s0) -/* 064BA8 80063FA8 8FBF001C */ lw $ra, 0x1c($sp) -.L80063FAC: -/* 064BAC 80063FAC 8FB00014 */ lw $s0, 0x14($sp) -/* 064BB0 80063FB0 8FB10018 */ lw $s1, 0x18($sp) -/* 064BB4 80063FB4 03E00008 */ jr $ra -/* 064BB8 80063FB8 27BD0020 */ addiu $sp, $sp, 0x20 - -/* 064BBC 80063FBC 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 064BC0 80063FC0 00057400 */ sll $t6, $a1, 0x10 -/* 064BC4 80063FC4 000E7C03 */ sra $t7, $t6, 0x10 -/* 064BC8 80063FC8 000FC0C0 */ sll $t8, $t7, 3 -/* 064BCC 80063FCC 030FC021 */ addu $t8, $t8, $t7 -/* 064BD0 80063FD0 0018C0C0 */ sll $t8, $t8, 3 -/* 064BD4 80063FD4 AFBF002C */ sw $ra, 0x2c($sp) -/* 064BD8 80063FD8 AFB00028 */ sw $s0, 0x28($sp) -/* 064BDC 80063FDC AFA50044 */ sw $a1, 0x44($sp) -/* 064BE0 80063FE0 AFA60048 */ sw $a2, 0x48($sp) -/* 064BE4 80063FE4 AFA7004C */ sw $a3, 0x4c($sp) -/* 064BE8 80063FE8 00981021 */ addu $v0, $a0, $t8 -/* 064BEC 80063FEC 94590538 */ lhu $t9, 0x538($v0) -/* 064BF0 80063FF0 24010001 */ li $at, 1 -/* 064BF4 80063FF4 00808025 */ move $s0, $a0 -/* 064BF8 80063FF8 57210025 */ bnel $t9, $at, .L80064090 -/* 064BFC 80063FFC 44803000 */ mtc1 $zero, $f6 -/* 064C00 80064000 44802000 */ mtc1 $zero, $f4 -/* 064C04 80064004 3C014190 */ li $at, 0x41900000 # 18.000000 -/* 064C08 80064008 44814000 */ mtc1 $at, $f8 -/* 064C0C 8006400C E7A40010 */ swc1 $f4, 0x10($sp) -/* 064C10 80064010 C6060094 */ lwc1 $f6, 0x94($s0) -/* 064C14 80064014 3C014358 */ li $at, 0x43580000 # 216.000000 -/* 064C18 80064018 44818000 */ mtc1 $at, $f16 -/* 064C1C 8006401C 46083283 */ div.s $f10, $f6, $f8 -/* 064C20 80064020 3C014170 */ li $at, 0x41700000 # 15.000000 -/* 064C24 80064024 44812000 */ mtc1 $at, $f4 -/* 064C28 80064028 84480546 */ lh $t0, 0x546($v0) -/* 064C2C 8006402C 3C01C016 */ li $at, 0xC0160000 # -2.343750 -/* 064C30 80064030 44812800 */ mtc1 $at, $f5 -/* 064C34 80064034 44884000 */ mtc1 $t0, $f8 -/* 064C38 80064038 27A4003C */ addiu $a0, $sp, 0x3c -/* 064C3C 8006403C 27A50034 */ addiu $a1, $sp, 0x34 -/* 064C40 80064040 27A60038 */ addiu $a2, $sp, 0x38 -/* 064C44 80064044 3C074040 */ lui $a3, 0x4040 -/* 064C48 80064048 46105482 */ mul.s $f18, $f10, $f16 -/* 064C4C 8006404C 468042A0 */ cvt.s.w $f10, $f8 -/* 064C50 80064050 46049183 */ div.s $f6, $f18, $f4 -/* 064C54 80064054 44802000 */ mtc1 $zero, $f4 -/* 064C58 80064058 46065402 */ mul.s $f16, $f10, $f6 -/* 064C5C 8006405C 460084A1 */ cvt.d.s $f18, $f16 -/* 064C60 80064060 46322201 */ sub.d $f8, $f4, $f18 -/* 064C64 80064064 462042A0 */ cvt.s.d $f10, $f8 -/* 064C68 80064068 E7AA0014 */ swc1 $f10, 0x14($sp) -/* 064C6C 8006406C 84490548 */ lh $t1, 0x548($v0) -/* 064C70 80064070 AFA20030 */ sw $v0, 0x30($sp) -/* 064C74 80064074 AFA0001C */ sw $zero, 0x1c($sp) -/* 064C78 80064078 00095023 */ negu $t2, $t1 -/* 064C7C 8006407C 0C018AC6 */ jal func_80062B18 -/* 064C80 80064080 AFAA0018 */ sw $t2, 0x18($sp) -/* 064C84 80064084 10000023 */ b .L80064114 -/* 064C88 80064088 8FA20030 */ lw $v0, 0x30($sp) -/* 064C8C 8006408C 44803000 */ mtc1 $zero, $f6 -.L80064090: -/* 064C90 80064090 3C014190 */ li $at, 0x41900000 # 18.000000 -/* 064C94 80064094 44812000 */ mtc1 $at, $f4 -/* 064C98 80064098 E7A60010 */ swc1 $f6, 0x10($sp) -/* 064C9C 8006409C C6100094 */ lwc1 $f16, 0x94($s0) -/* 064CA0 800640A0 3C014358 */ li $at, 0x43580000 # 216.000000 -/* 064CA4 800640A4 44814000 */ mtc1 $at, $f8 -/* 064CA8 800640A8 46048483 */ div.s $f18, $f16, $f4 -/* 064CAC 800640AC 3C014170 */ li $at, 0x41700000 # 15.000000 -/* 064CB0 800640B0 44813000 */ mtc1 $at, $f6 -/* 064CB4 800640B4 844B0546 */ lh $t3, 0x546($v0) -/* 064CB8 800640B8 3C01C016 */ li $at, 0xC0160000 # -2.343750 -/* 064CBC 800640BC 44813800 */ mtc1 $at, $f7 -/* 064CC0 800640C0 448B2000 */ mtc1 $t3, $f4 -/* 064CC4 800640C4 27A4003C */ addiu $a0, $sp, 0x3c -/* 064CC8 800640C8 27A50034 */ addiu $a1, $sp, 0x34 -/* 064CCC 800640CC 27A60038 */ addiu $a2, $sp, 0x38 -/* 064CD0 800640D0 3C07C040 */ lui $a3, 0xc040 -/* 064CD4 800640D4 46089282 */ mul.s $f10, $f18, $f8 -/* 064CD8 800640D8 468024A0 */ cvt.s.w $f18, $f4 -/* 064CDC 800640DC 46065403 */ div.s $f16, $f10, $f6 -/* 064CE0 800640E0 44803000 */ mtc1 $zero, $f6 -/* 064CE4 800640E4 46109202 */ mul.s $f8, $f18, $f16 -/* 064CE8 800640E8 460042A1 */ cvt.d.s $f10, $f8 -/* 064CEC 800640EC 462A3101 */ sub.d $f4, $f6, $f10 -/* 064CF0 800640F0 462024A0 */ cvt.s.d $f18, $f4 -/* 064CF4 800640F4 E7B20014 */ swc1 $f18, 0x14($sp) -/* 064CF8 800640F8 844C0548 */ lh $t4, 0x548($v0) -/* 064CFC 800640FC AFA20030 */ sw $v0, 0x30($sp) -/* 064D00 80064100 AFA0001C */ sw $zero, 0x1c($sp) -/* 064D04 80064104 000C6823 */ negu $t5, $t4 -/* 064D08 80064108 0C018AC6 */ jal func_80062B18 -/* 064D0C 8006410C AFAD0018 */ sw $t5, 0x18($sp) -/* 064D10 80064110 8FA20030 */ lw $v0, 0x30($sp) -.L80064114: -/* 064D14 80064114 C6100014 */ lwc1 $f16, 0x14($s0) -/* 064D18 80064118 C7A8003C */ lwc1 $f8, 0x3c($sp) -/* 064D1C 8006411C 844E0546 */ lh $t6, 0x546($v0) -/* 064D20 80064120 24010006 */ li $at, 6 -/* 064D24 80064124 46088180 */ add.s $f6, $f16, $f8 -/* 064D28 80064128 25CF0001 */ addiu $t7, $t6, 1 -/* 064D2C 8006412C E4460528 */ swc1 $f6, 0x528($v0) -/* 064D30 80064130 C7A40038 */ lwc1 $f4, 0x38($sp) -/* 064D34 80064134 C60A001C */ lwc1 $f10, 0x1c($s0) -/* 064D38 80064138 46045480 */ add.s $f18, $f10, $f4 -/* 064D3C 8006413C E4520530 */ swc1 $f18, 0x530($v0) -/* 064D40 80064140 C6080070 */ lwc1 $f8, 0x70($s0) -/* 064D44 80064144 C6100018 */ lwc1 $f16, 0x18($s0) -/* 064D48 80064148 C7AA0034 */ lwc1 $f10, 0x34($sp) -/* 064D4C 8006414C A44F0546 */ sh $t7, 0x546($v0) -/* 064D50 80064150 46088181 */ sub.s $f6, $f16, $f8 -/* 064D54 80064154 84580546 */ lh $t8, 0x546($v0) -/* 064D58 80064158 460A3100 */ add.s $f4, $f6, $f10 -/* 064D5C 8006415C 17010004 */ bne $t8, $at, .L80064170 -/* 064D60 80064160 E444052C */ swc1 $f4, 0x52c($v0) -/* 064D64 80064164 A4400544 */ sh $zero, 0x544($v0) -/* 064D68 80064168 A4400546 */ sh $zero, 0x546($v0) -/* 064D6C 8006416C A440053A */ sh $zero, 0x53a($v0) -.L80064170: -/* 064D70 80064170 8FBF002C */ lw $ra, 0x2c($sp) -/* 064D74 80064174 8FB00028 */ lw $s0, 0x28($sp) -/* 064D78 80064178 27BD0040 */ addiu $sp, $sp, 0x40 -/* 064D7C 8006417C 03E00008 */ jr $ra -/* 064D80 80064180 00000000 */ nop diff --git a/asm/non_matchings/code_80057C60/func_80063FBC.s b/asm/non_matchings/code_80057C60/func_80063FBC.s new file mode 100644 index 000000000..a93c8e295 --- /dev/null +++ b/asm/non_matchings/code_80057C60/func_80063FBC.s @@ -0,0 +1,118 @@ +glabel func_80063FBC +/* 064BBC 80063FBC 27BDFFC0 */ addiu $sp, $sp, -0x40 +/* 064BC0 80063FC0 00057400 */ sll $t6, $a1, 0x10 +/* 064BC4 80063FC4 000E7C03 */ sra $t7, $t6, 0x10 +/* 064BC8 80063FC8 000FC0C0 */ sll $t8, $t7, 3 +/* 064BCC 80063FCC 030FC021 */ addu $t8, $t8, $t7 +/* 064BD0 80063FD0 0018C0C0 */ sll $t8, $t8, 3 +/* 064BD4 80063FD4 AFBF002C */ sw $ra, 0x2c($sp) +/* 064BD8 80063FD8 AFB00028 */ sw $s0, 0x28($sp) +/* 064BDC 80063FDC AFA50044 */ sw $a1, 0x44($sp) +/* 064BE0 80063FE0 AFA60048 */ sw $a2, 0x48($sp) +/* 064BE4 80063FE4 AFA7004C */ sw $a3, 0x4c($sp) +/* 064BE8 80063FE8 00981021 */ addu $v0, $a0, $t8 +/* 064BEC 80063FEC 94590538 */ lhu $t9, 0x538($v0) +/* 064BF0 80063FF0 24010001 */ li $at, 1 +/* 064BF4 80063FF4 00808025 */ move $s0, $a0 +/* 064BF8 80063FF8 57210025 */ bnel $t9, $at, .L80064090 +/* 064BFC 80063FFC 44803000 */ mtc1 $zero, $f6 +/* 064C00 80064000 44802000 */ mtc1 $zero, $f4 +/* 064C04 80064004 3C014190 */ li $at, 0x41900000 # 18.000000 +/* 064C08 80064008 44814000 */ mtc1 $at, $f8 +/* 064C0C 8006400C E7A40010 */ swc1 $f4, 0x10($sp) +/* 064C10 80064010 C6060094 */ lwc1 $f6, 0x94($s0) +/* 064C14 80064014 3C014358 */ li $at, 0x43580000 # 216.000000 +/* 064C18 80064018 44818000 */ mtc1 $at, $f16 +/* 064C1C 8006401C 46083283 */ div.s $f10, $f6, $f8 +/* 064C20 80064020 3C014170 */ li $at, 0x41700000 # 15.000000 +/* 064C24 80064024 44812000 */ mtc1 $at, $f4 +/* 064C28 80064028 84480546 */ lh $t0, 0x546($v0) +/* 064C2C 8006402C 3C01C016 */ li $at, 0xC0160000 # -2.343750 +/* 064C30 80064030 44812800 */ mtc1 $at, $f5 +/* 064C34 80064034 44884000 */ mtc1 $t0, $f8 +/* 064C38 80064038 27A4003C */ addiu $a0, $sp, 0x3c +/* 064C3C 8006403C 27A50034 */ addiu $a1, $sp, 0x34 +/* 064C40 80064040 27A60038 */ addiu $a2, $sp, 0x38 +/* 064C44 80064044 3C074040 */ lui $a3, 0x4040 +/* 064C48 80064048 46105482 */ mul.s $f18, $f10, $f16 +/* 064C4C 8006404C 468042A0 */ cvt.s.w $f10, $f8 +/* 064C50 80064050 46049183 */ div.s $f6, $f18, $f4 +/* 064C54 80064054 44802000 */ mtc1 $zero, $f4 +/* 064C58 80064058 46065402 */ mul.s $f16, $f10, $f6 +/* 064C5C 8006405C 460084A1 */ cvt.d.s $f18, $f16 +/* 064C60 80064060 46322201 */ sub.d $f8, $f4, $f18 +/* 064C64 80064064 462042A0 */ cvt.s.d $f10, $f8 +/* 064C68 80064068 E7AA0014 */ swc1 $f10, 0x14($sp) +/* 064C6C 8006406C 84490548 */ lh $t1, 0x548($v0) +/* 064C70 80064070 AFA20030 */ sw $v0, 0x30($sp) +/* 064C74 80064074 AFA0001C */ sw $zero, 0x1c($sp) +/* 064C78 80064078 00095023 */ negu $t2, $t1 +/* 064C7C 8006407C 0C018AC6 */ jal func_80062B18 +/* 064C80 80064080 AFAA0018 */ sw $t2, 0x18($sp) +/* 064C84 80064084 10000023 */ b .L80064114 +/* 064C88 80064088 8FA20030 */ lw $v0, 0x30($sp) +/* 064C8C 8006408C 44803000 */ mtc1 $zero, $f6 +.L80064090: +/* 064C90 80064090 3C014190 */ li $at, 0x41900000 # 18.000000 +/* 064C94 80064094 44812000 */ mtc1 $at, $f4 +/* 064C98 80064098 E7A60010 */ swc1 $f6, 0x10($sp) +/* 064C9C 8006409C C6100094 */ lwc1 $f16, 0x94($s0) +/* 064CA0 800640A0 3C014358 */ li $at, 0x43580000 # 216.000000 +/* 064CA4 800640A4 44814000 */ mtc1 $at, $f8 +/* 064CA8 800640A8 46048483 */ div.s $f18, $f16, $f4 +/* 064CAC 800640AC 3C014170 */ li $at, 0x41700000 # 15.000000 +/* 064CB0 800640B0 44813000 */ mtc1 $at, $f6 +/* 064CB4 800640B4 844B0546 */ lh $t3, 0x546($v0) +/* 064CB8 800640B8 3C01C016 */ li $at, 0xC0160000 # -2.343750 +/* 064CBC 800640BC 44813800 */ mtc1 $at, $f7 +/* 064CC0 800640C0 448B2000 */ mtc1 $t3, $f4 +/* 064CC4 800640C4 27A4003C */ addiu $a0, $sp, 0x3c +/* 064CC8 800640C8 27A50034 */ addiu $a1, $sp, 0x34 +/* 064CCC 800640CC 27A60038 */ addiu $a2, $sp, 0x38 +/* 064CD0 800640D0 3C07C040 */ lui $a3, 0xc040 +/* 064CD4 800640D4 46089282 */ mul.s $f10, $f18, $f8 +/* 064CD8 800640D8 468024A0 */ cvt.s.w $f18, $f4 +/* 064CDC 800640DC 46065403 */ div.s $f16, $f10, $f6 +/* 064CE0 800640E0 44803000 */ mtc1 $zero, $f6 +/* 064CE4 800640E4 46109202 */ mul.s $f8, $f18, $f16 +/* 064CE8 800640E8 460042A1 */ cvt.d.s $f10, $f8 +/* 064CEC 800640EC 462A3101 */ sub.d $f4, $f6, $f10 +/* 064CF0 800640F0 462024A0 */ cvt.s.d $f18, $f4 +/* 064CF4 800640F4 E7B20014 */ swc1 $f18, 0x14($sp) +/* 064CF8 800640F8 844C0548 */ lh $t4, 0x548($v0) +/* 064CFC 800640FC AFA20030 */ sw $v0, 0x30($sp) +/* 064D00 80064100 AFA0001C */ sw $zero, 0x1c($sp) +/* 064D04 80064104 000C6823 */ negu $t5, $t4 +/* 064D08 80064108 0C018AC6 */ jal func_80062B18 +/* 064D0C 8006410C AFAD0018 */ sw $t5, 0x18($sp) +/* 064D10 80064110 8FA20030 */ lw $v0, 0x30($sp) +.L80064114: +/* 064D14 80064114 C6100014 */ lwc1 $f16, 0x14($s0) +/* 064D18 80064118 C7A8003C */ lwc1 $f8, 0x3c($sp) +/* 064D1C 8006411C 844E0546 */ lh $t6, 0x546($v0) +/* 064D20 80064120 24010006 */ li $at, 6 +/* 064D24 80064124 46088180 */ add.s $f6, $f16, $f8 +/* 064D28 80064128 25CF0001 */ addiu $t7, $t6, 1 +/* 064D2C 8006412C E4460528 */ swc1 $f6, 0x528($v0) +/* 064D30 80064130 C7A40038 */ lwc1 $f4, 0x38($sp) +/* 064D34 80064134 C60A001C */ lwc1 $f10, 0x1c($s0) +/* 064D38 80064138 46045480 */ add.s $f18, $f10, $f4 +/* 064D3C 8006413C E4520530 */ swc1 $f18, 0x530($v0) +/* 064D40 80064140 C6080070 */ lwc1 $f8, 0x70($s0) +/* 064D44 80064144 C6100018 */ lwc1 $f16, 0x18($s0) +/* 064D48 80064148 C7AA0034 */ lwc1 $f10, 0x34($sp) +/* 064D4C 8006414C A44F0546 */ sh $t7, 0x546($v0) +/* 064D50 80064150 46088181 */ sub.s $f6, $f16, $f8 +/* 064D54 80064154 84580546 */ lh $t8, 0x546($v0) +/* 064D58 80064158 460A3100 */ add.s $f4, $f6, $f10 +/* 064D5C 8006415C 17010004 */ bne $t8, $at, .L80064170 +/* 064D60 80064160 E444052C */ swc1 $f4, 0x52c($v0) +/* 064D64 80064164 A4400544 */ sh $zero, 0x544($v0) +/* 064D68 80064168 A4400546 */ sh $zero, 0x546($v0) +/* 064D6C 8006416C A440053A */ sh $zero, 0x53a($v0) +.L80064170: +/* 064D70 80064170 8FBF002C */ lw $ra, 0x2c($sp) +/* 064D74 80064174 8FB00028 */ lw $s0, 0x28($sp) +/* 064D78 80064178 27BD0040 */ addiu $sp, $sp, 0x40 +/* 064D7C 8006417C 03E00008 */ jr $ra +/* 064D80 80064180 00000000 */ nop diff --git a/asm/non_matchings/code_80057C60/func_800643A8.s b/asm/non_matchings/code_80057C60/func_800643A8.s deleted file mode 100644 index ea6deb156..000000000 --- a/asm/non_matchings/code_80057C60/func_800643A8.s +++ /dev/null @@ -1,83 +0,0 @@ -glabel func_800643A8 -/* 064FA8 800643A8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 064FAC 800643AC 00057400 */ sll $t6, $a1, 0x10 -/* 064FB0 800643B0 000E7C03 */ sra $t7, $t6, 0x10 -/* 064FB4 800643B4 000FC8C0 */ sll $t9, $t7, 3 -/* 064FB8 800643B8 032FC821 */ addu $t9, $t9, $t7 -/* 064FBC 800643BC 0019C8C0 */ sll $t9, $t9, 3 -/* 064FC0 800643C0 AFBF0014 */ sw $ra, 0x14($sp) -/* 064FC4 800643C4 AFA40020 */ sw $a0, 0x20($sp) -/* 064FC8 800643C8 AFA50024 */ sw $a1, 0x24($sp) -/* 064FCC 800643CC AFA60028 */ sw $a2, 0x28($sp) -/* 064FD0 800643D0 AFA7002C */ sw $a3, 0x2c($sp) -/* 064FD4 800643D4 00991021 */ addu $v0, $a0, $t9 -/* 064FD8 800643D8 94440548 */ lhu $a0, 0x548($v0) -/* 064FDC 800643DC 0C0AE00E */ jal coss -/* 064FE0 800643E0 AFA2001C */ sw $v0, 0x1c($sp) -/* 064FE4 800643E4 8FA2001C */ lw $v0, 0x1c($sp) -/* 064FE8 800643E8 3C01800F */ lui $at, %hi(D_800EE6D8) -/* 064FEC 800643EC D424E6D8 */ ldc1 $f4, %lo(D_800EE6D8)($at) -/* 064FF0 800643F0 84480546 */ lh $t0, 0x546($v0) -/* 064FF4 800643F4 46000421 */ cvt.d.s $f16, $f0 -/* 064FF8 800643F8 8FA90020 */ lw $t1, 0x20($sp) -/* 064FFC 800643FC 44883000 */ mtc1 $t0, $f6 -/* 065000 80064400 94440548 */ lhu $a0, 0x548($v0) -/* 065004 80064404 46803221 */ cvt.d.w $f8, $f6 -/* 065008 80064408 C526001C */ lwc1 $f6, 0x1c($t1) -/* 06500C 8006440C 46282282 */ mul.d $f10, $f4, $f8 -/* 065010 80064410 46003121 */ cvt.d.s $f4, $f6 -/* 065014 80064414 462A8482 */ mul.d $f18, $f16, $f10 -/* 065018 80064418 46249200 */ add.d $f8, $f18, $f4 -/* 06501C 8006441C 46204420 */ cvt.s.d $f16, $f8 -/* 065020 80064420 0C0AE006 */ jal sins -/* 065024 80064424 E4500530 */ swc1 $f16, 0x530($v0) -/* 065028 80064428 8FA2001C */ lw $v0, 0x1c($sp) -/* 06502C 8006442C 3C01800F */ lui $at, %hi(D_800EE6E0) -/* 065030 80064430 D42AE6E0 */ ldc1 $f10, %lo(D_800EE6E0)($at) -/* 065034 80064434 84430546 */ lh $v1, 0x546($v0) -/* 065038 80064438 46000221 */ cvt.d.s $f8, $f0 -/* 06503C 8006443C 8FAA0020 */ lw $t2, 0x20($sp) -/* 065040 80064440 44833000 */ mtc1 $v1, $f6 -/* 065044 80064444 3C013FE0 */ li $at, 0x3FE00000 # 1.750000 -/* 065048 80064448 246B0001 */ addiu $t3, $v1, 1 -/* 06504C 8006444C 468034A1 */ cvt.d.w $f18, $f6 -/* 065050 80064450 C5460014 */ lwc1 $f6, 0x14($t2) -/* 065054 80064454 A44B0546 */ sh $t3, 0x546($v0) -/* 065058 80064458 844C0546 */ lh $t4, 0x546($v0) -/* 06505C 8006445C 46325102 */ mul.d $f4, $f10, $f18 -/* 065060 80064460 460032A1 */ cvt.d.s $f10, $f6 -/* 065064 80064464 46244402 */ mul.d $f16, $f8, $f4 -/* 065068 80064468 C444052C */ lwc1 $f4, 0x52c($v0) -/* 06506C 8006446C 460021A1 */ cvt.d.s $f6, $f4 -/* 065070 80064470 462A8480 */ add.d $f18, $f16, $f10 -/* 065074 80064474 44808000 */ mtc1 $zero, $f16 -/* 065078 80064478 44818800 */ mtc1 $at, $f17 -/* 06507C 8006447C 2401000A */ li $at, 10 -/* 065080 80064480 46209220 */ cvt.s.d $f8, $f18 -/* 065084 80064484 46303280 */ add.d $f10, $f6, $f16 -/* 065088 80064488 E4480528 */ swc1 $f8, 0x528($v0) -/* 06508C 8006448C 462054A0 */ cvt.s.d $f18, $f10 -/* 065090 80064490 15810004 */ bne $t4, $at, .L800644A4 -/* 065094 80064494 E452052C */ swc1 $f18, 0x52c($v0) -/* 065098 80064498 A4400544 */ sh $zero, 0x544($v0) -/* 06509C 8006449C A4400546 */ sh $zero, 0x546($v0) -/* 0650A0 800644A0 A440053A */ sh $zero, 0x53a($v0) -.L800644A4: -/* 0650A4 800644A4 C4480534 */ lwc1 $f8, 0x534($v0) -/* 0650A8 800644A8 3C01800F */ lui $at, %hi(D_800EE6E8) -/* 0650AC 800644AC D426E6E8 */ ldc1 $f6, %lo(D_800EE6E8)($at) -/* 0650B0 800644B0 46004121 */ cvt.d.s $f4, $f8 -/* 0650B4 800644B4 844D0566 */ lh $t5, 0x566($v0) -/* 0650B8 800644B8 46262400 */ add.d $f16, $f4, $f6 -/* 0650BC 800644BC 25AEFFF8 */ addiu $t6, $t5, -8 -/* 0650C0 800644C0 A44E0566 */ sh $t6, 0x566($v0) -/* 0650C4 800644C4 462082A0 */ cvt.s.d $f10, $f16 -/* 0650C8 800644C8 844F0566 */ lh $t7, 0x566($v0) -/* 0650CC 800644CC 1DE00002 */ bgtz $t7, .L800644D8 -/* 0650D0 800644D0 E44A0534 */ swc1 $f10, 0x534($v0) -/* 0650D4 800644D4 A4400566 */ sh $zero, 0x566($v0) -.L800644D8: -/* 0650D8 800644D8 8FBF0014 */ lw $ra, 0x14($sp) -/* 0650DC 800644DC 27BD0020 */ addiu $sp, $sp, 0x20 -/* 0650E0 800644E0 03E00008 */ jr $ra -/* 0650E4 800644E4 00000000 */ nop diff --git a/asm/non_matchings/code_80057C60/func_800647C8.s b/asm/non_matchings/code_80057C60/func_800647C8.s deleted file mode 100644 index 521c64b82..000000000 --- a/asm/non_matchings/code_80057C60/func_800647C8.s +++ /dev/null @@ -1,74 +0,0 @@ -glabel func_800647C8 -/* 0653C8 800647C8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 0653CC 800647CC 00057400 */ sll $t6, $a1, 0x10 -/* 0653D0 800647D0 000E7C03 */ sra $t7, $t6, 0x10 -/* 0653D4 800647D4 000FC8C0 */ sll $t9, $t7, 3 -/* 0653D8 800647D8 032FC821 */ addu $t9, $t9, $t7 -/* 0653DC 800647DC 0019C8C0 */ sll $t9, $t9, 3 -/* 0653E0 800647E0 AFBF0014 */ sw $ra, 0x14($sp) -/* 0653E4 800647E4 AFA40020 */ sw $a0, 0x20($sp) -/* 0653E8 800647E8 AFA50024 */ sw $a1, 0x24($sp) -/* 0653EC 800647EC AFA60028 */ sw $a2, 0x28($sp) -/* 0653F0 800647F0 AFA7002C */ sw $a3, 0x2c($sp) -/* 0653F4 800647F4 00991021 */ addu $v0, $a0, $t9 -/* 0653F8 800647F8 84480AE6 */ lh $t0, 0xae6($v0) -/* 0653FC 800647FC 94440AE8 */ lhu $a0, 0xae8($v0) -/* 065400 80064800 25090001 */ addiu $t1, $t0, 1 -/* 065404 80064804 A4490AE6 */ sh $t1, 0xae6($v0) -/* 065408 80064808 0C0AE00E */ jal coss -/* 06540C 8006480C AFA2001C */ sw $v0, 0x1c($sp) -/* 065410 80064810 8FA2001C */ lw $v0, 0x1c($sp) -/* 065414 80064814 3C01800F */ lui $at, %hi(D_800EE710) -/* 065418 80064818 D424E710 */ ldc1 $f4, %lo(D_800EE710)($at) -/* 06541C 8006481C 844A0AE6 */ lh $t2, 0xae6($v0) -/* 065420 80064820 46000421 */ cvt.d.s $f16, $f0 -/* 065424 80064824 8FAB0020 */ lw $t3, 0x20($sp) -/* 065428 80064828 448A3000 */ mtc1 $t2, $f6 -/* 06542C 8006482C 94440AE8 */ lhu $a0, 0xae8($v0) -/* 065430 80064830 46803221 */ cvt.d.w $f8, $f6 -/* 065434 80064834 C566001C */ lwc1 $f6, 0x1c($t3) -/* 065438 80064838 46282282 */ mul.d $f10, $f4, $f8 -/* 06543C 8006483C 46003121 */ cvt.d.s $f4, $f6 -/* 065440 80064840 462A8482 */ mul.d $f18, $f16, $f10 -/* 065444 80064844 46249200 */ add.d $f8, $f18, $f4 -/* 065448 80064848 46204420 */ cvt.s.d $f16, $f8 -/* 06544C 8006484C 0C0AE006 */ jal sins -/* 065450 80064850 E4500AD0 */ swc1 $f16, 0xad0($v0) -/* 065454 80064854 8FA2001C */ lw $v0, 0x1c($sp) -/* 065458 80064858 3C01800F */ lui $at, %hi(D_800EE718) -/* 06545C 8006485C D42AE718 */ ldc1 $f10, %lo(D_800EE718)($at) -/* 065460 80064860 84430AE6 */ lh $v1, 0xae6($v0) -/* 065464 80064864 46000221 */ cvt.d.s $f8, $f0 -/* 065468 80064868 8FA40020 */ lw $a0, 0x20($sp) -/* 06546C 8006486C 44833000 */ mtc1 $v1, $f6 -/* 065470 80064870 3C014000 */ li $at, 0x40000000 # 2.000000 -/* 065474 80064874 468034A1 */ cvt.d.w $f18, $f6 -/* 065478 80064878 C4860014 */ lwc1 $f6, 0x14($a0) -/* 06547C 8006487C 46325102 */ mul.d $f4, $f10, $f18 -/* 065480 80064880 460032A1 */ cvt.d.s $f10, $f6 -/* 065484 80064884 44813000 */ mtc1 $at, $f6 -/* 065488 80064888 2401000E */ li $at, 14 -/* 06548C 8006488C 46244402 */ mul.d $f16, $f8, $f4 -/* 065490 80064890 462A8480 */ add.d $f18, $f16, $f10 -/* 065494 80064894 46209220 */ cvt.s.d $f8, $f18 -/* 065498 80064898 E4480AC8 */ swc1 $f8, 0xac8($v0) -/* 06549C 8006489C C4840074 */ lwc1 $f4, 0x74($a0) -/* 0654A0 800648A0 46062400 */ add.s $f16, $f4, $f6 -/* 0654A4 800648A4 14610004 */ bne $v1, $at, .L800648B8 -/* 0654A8 800648A8 E4500ACC */ swc1 $f16, 0xacc($v0) -/* 0654AC 800648AC A4400AE4 */ sh $zero, 0xae4($v0) -/* 0654B0 800648B0 A4400AE6 */ sh $zero, 0xae6($v0) -/* 0654B4 800648B4 A4400ADA */ sh $zero, 0xada($v0) -.L800648B8: -/* 0654B8 800648B8 844C0B06 */ lh $t4, 0xb06($v0) -/* 0654BC 800648BC 258DFFF4 */ addiu $t5, $t4, -0xc -/* 0654C0 800648C0 A44D0B06 */ sh $t5, 0xb06($v0) -/* 0654C4 800648C4 844E0B06 */ lh $t6, 0xb06($v0) -/* 0654C8 800648C8 5DC00003 */ bgtzl $t6, .L800648D8 -/* 0654CC 800648CC 8FBF0014 */ lw $ra, 0x14($sp) -/* 0654D0 800648D0 A4400B06 */ sh $zero, 0xb06($v0) -/* 0654D4 800648D4 8FBF0014 */ lw $ra, 0x14($sp) -.L800648D8: -/* 0654D8 800648D8 27BD0020 */ addiu $sp, $sp, 0x20 -/* 0654DC 800648DC 03E00008 */ jr $ra -/* 0654E0 800648E0 00000000 */ nop diff --git a/asm/non_matchings/code_80057C60/func_800648E4.s b/asm/non_matchings/code_80057C60/func_800648E4.s deleted file mode 100644 index c2ff2b7c6..000000000 --- a/asm/non_matchings/code_80057C60/func_800648E4.s +++ /dev/null @@ -1,44 +0,0 @@ -glabel func_800648E4 -/* 0654E4 800648E4 00057400 */ sll $t6, $a1, 0x10 -/* 0654E8 800648E8 000E7C03 */ sra $t7, $t6, 0x10 -/* 0654EC 800648EC 000FC0C0 */ sll $t8, $t7, 3 -/* 0654F0 800648F0 030FC021 */ addu $t8, $t8, $t7 -/* 0654F4 800648F4 0018C0C0 */ sll $t8, $t8, 3 -/* 0654F8 800648F8 AFA50004 */ sw $a1, 4($sp) -/* 0654FC 800648FC AFA60008 */ sw $a2, 8($sp) -/* 065500 80064900 AFA7000C */ sw $a3, 0xc($sp) -/* 065504 80064904 00981021 */ addu $v0, $a0, $t8 -/* 065508 80064908 84590AE6 */ lh $t9, 0xae6($v0) -/* 06550C 8006490C C4440AD4 */ lwc1 $f4, 0xad4($v0) -/* 065510 80064910 3C01800F */ lui $at, %hi(D_800EE720) -/* 065514 80064914 27280001 */ addiu $t0, $t9, 1 -/* 065518 80064918 A4480AE6 */ sh $t0, 0xae6($v0) -/* 06551C 8006491C D428E720 */ ldc1 $f8, %lo(D_800EE720)($at) -/* 065520 80064920 460021A1 */ cvt.d.s $f6, $f4 -/* 065524 80064924 C4520ACC */ lwc1 $f18, 0xacc($v0) -/* 065528 80064928 46283281 */ sub.d $f10, $f6, $f8 -/* 06552C 8006492C 3C01800F */ lui $at, %hi(D_800EE728) -/* 065530 80064930 84490B06 */ lh $t1, 0xb06($v0) -/* 065534 80064934 46009121 */ cvt.d.s $f4, $f18 -/* 065538 80064938 46205420 */ cvt.s.d $f16, $f10 -/* 06553C 8006493C 252AFFF4 */ addiu $t2, $t1, -0xc -/* 065540 80064940 E4500AD4 */ swc1 $f16, 0xad4($v0) -/* 065544 80064944 D426E728 */ ldc1 $f6, %lo(D_800EE728)($at) -/* 065548 80064948 A44A0B06 */ sh $t2, 0xb06($v0) -/* 06554C 8006494C 844B0B06 */ lh $t3, 0xb06($v0) -/* 065550 80064950 46262200 */ add.d $f8, $f4, $f6 -/* 065554 80064954 462042A0 */ cvt.s.d $f10, $f8 -/* 065558 80064958 1D600002 */ bgtz $t3, .L80064964 -/* 06555C 8006495C E44A0ACC */ swc1 $f10, 0xacc($v0) -/* 065560 80064960 A4400B06 */ sh $zero, 0xb06($v0) -.L80064964: -/* 065564 80064964 844C0AE6 */ lh $t4, 0xae6($v0) -/* 065568 80064968 2401000A */ li $at, 10 -/* 06556C 8006496C 15810004 */ bne $t4, $at, .L80064980 -/* 065570 80064970 00000000 */ nop -/* 065574 80064974 A4400AE4 */ sh $zero, 0xae4($v0) -/* 065578 80064978 A4400AE6 */ sh $zero, 0xae6($v0) -/* 06557C 8006497C A4400ADA */ sh $zero, 0xada($v0) -.L80064980: -/* 065580 80064980 03E00008 */ jr $ra -/* 065584 80064984 00000000 */ nop diff --git a/asm/non_matchings/code_80057C60/func_80064988.s b/asm/non_matchings/code_80057C60/func_80064988.s deleted file mode 100644 index ebbbb0343..000000000 --- a/asm/non_matchings/code_80057C60/func_80064988.s +++ /dev/null @@ -1,29 +0,0 @@ -glabel func_80064988 -/* 065588 80064988 00057400 */ sll $t6, $a1, 0x10 -/* 06558C 8006498C 000E7C03 */ sra $t7, $t6, 0x10 -/* 065590 80064990 000FC0C0 */ sll $t8, $t7, 3 -/* 065594 80064994 030FC021 */ addu $t8, $t8, $t7 -/* 065598 80064998 0018C0C0 */ sll $t8, $t8, 3 -/* 06559C 8006499C AFA50004 */ sw $a1, 4($sp) -/* 0655A0 800649A0 AFA60008 */ sw $a2, 8($sp) -/* 0655A4 800649A4 AFA7000C */ sw $a3, 0xc($sp) -/* 0655A8 800649A8 00981021 */ addu $v0, $a0, $t8 -/* 0655AC 800649AC 84590AE6 */ lh $t9, 0xae6($v0) -/* 0655B0 800649B0 C4440ACC */ lwc1 $f4, 0xacc($v0) -/* 0655B4 800649B4 3C01800F */ lui $at, %hi(D_800EE730) -/* 0655B8 800649B8 27280001 */ addiu $t0, $t9, 1 -/* 0655BC 800649BC A4480AE6 */ sh $t0, 0xae6($v0) -/* 0655C0 800649C0 D428E730 */ ldc1 $f8, %lo(D_800EE730)($at) -/* 0655C4 800649C4 460021A1 */ cvt.d.s $f6, $f4 -/* 0655C8 800649C8 84490AE6 */ lh $t1, 0xae6($v0) -/* 0655CC 800649CC 46283281 */ sub.d $f10, $f6, $f8 -/* 0655D0 800649D0 2401000A */ li $at, 10 -/* 0655D4 800649D4 46205420 */ cvt.s.d $f16, $f10 -/* 0655D8 800649D8 15210004 */ bne $t1, $at, .L800649EC -/* 0655DC 800649DC E4500ACC */ swc1 $f16, 0xacc($v0) -/* 0655E0 800649E0 A4400AE4 */ sh $zero, 0xae4($v0) -/* 0655E4 800649E4 A4400AE6 */ sh $zero, 0xae6($v0) -/* 0655E8 800649E8 A4400ADA */ sh $zero, 0xada($v0) -.L800649EC: -/* 0655EC 800649EC 03E00008 */ jr $ra -/* 0655F0 800649F0 00000000 */ nop diff --git a/asm/non_matchings/code_80057C60/func_800649F4.s b/asm/non_matchings/code_80057C60/func_800649F4.s deleted file mode 100644 index f009bb5cb..000000000 --- a/asm/non_matchings/code_80057C60/func_800649F4.s +++ /dev/null @@ -1,82 +0,0 @@ -glabel func_800649F4 -/* 0655F4 800649F4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 0655F8 800649F8 00057400 */ sll $t6, $a1, 0x10 -/* 0655FC 800649FC 000E7C03 */ sra $t7, $t6, 0x10 -/* 065600 80064A00 000FC8C0 */ sll $t9, $t7, 3 -/* 065604 80064A04 032FC821 */ addu $t9, $t9, $t7 -/* 065608 80064A08 0019C8C0 */ sll $t9, $t9, 3 -/* 06560C 80064A0C AFBF0014 */ sw $ra, 0x14($sp) -/* 065610 80064A10 AFA40028 */ sw $a0, 0x28($sp) -/* 065614 80064A14 AFA5002C */ sw $a1, 0x2c($sp) -/* 065618 80064A18 AFA60030 */ sw $a2, 0x30($sp) -/* 06561C 80064A1C AFA70034 */ sw $a3, 0x34($sp) -/* 065620 80064A20 00991021 */ addu $v0, $a0, $t9 -/* 065624 80064A24 C4440AE0 */ lwc1 $f4, 0xae0($v0) -/* 065628 80064A28 E7A40024 */ swc1 $f4, 0x24($sp) -/* 06562C 80064A2C 94440AE8 */ lhu $a0, 0xae8($v0) -/* 065630 80064A30 0C0AE00E */ jal coss -/* 065634 80064A34 AFA20020 */ sw $v0, 0x20($sp) -/* 065638 80064A38 8FA20020 */ lw $v0, 0x20($sp) -/* 06563C 80064A3C C7A20024 */ lwc1 $f2, 0x24($sp) -/* 065640 80064A40 8FA90028 */ lw $t1, 0x28($sp) -/* 065644 80064A44 84480AE6 */ lh $t0, 0xae6($v0) -/* 065648 80064A48 46001087 */ neg.s $f2, $f2 -/* 06564C 80064A4C C532021C */ lwc1 $f18, 0x21c($t1) -/* 065650 80064A50 44883000 */ mtc1 $t0, $f6 -/* 065654 80064A54 94440AE8 */ lhu $a0, 0xae8($v0) -/* 065658 80064A58 46803220 */ cvt.s.w $f8, $f6 -/* 06565C 80064A5C 46081282 */ mul.s $f10, $f2, $f8 -/* 065660 80064A60 00000000 */ nop -/* 065664 80064A64 460A0402 */ mul.s $f16, $f0, $f10 -/* 065668 80064A68 46128100 */ add.s $f4, $f16, $f18 -/* 06566C 80064A6C E4440AD0 */ swc1 $f4, 0xad0($v0) -/* 065670 80064A70 0C0AE006 */ jal sins -/* 065674 80064A74 E7A2001C */ swc1 $f2, 0x1c($sp) -/* 065678 80064A78 8FA20020 */ lw $v0, 0x20($sp) -/* 06567C 80064A7C C7A2001C */ lwc1 $f2, 0x1c($sp) -/* 065680 80064A80 8FA40028 */ lw $a0, 0x28($sp) -/* 065684 80064A84 84430AE6 */ lh $v1, 0xae6($v0) -/* 065688 80064A88 3C01800F */ lui $at, %hi(D_800EE738) -/* 06568C 80064A8C C4920218 */ lwc1 $f18, 0x218($a0) -/* 065690 80064A90 44833000 */ mtc1 $v1, $f6 -/* 065694 80064A94 246A0001 */ addiu $t2, $v1, 1 -/* 065698 80064A98 46803220 */ cvt.s.w $f8, $f6 -/* 06569C 80064A9C C4460ADC */ lwc1 $f6, 0xadc($v0) -/* 0656A0 80064AA0 46081282 */ mul.s $f10, $f2, $f8 -/* 0656A4 80064AA4 00000000 */ nop -/* 0656A8 80064AA8 460A0402 */ mul.s $f16, $f0, $f10 -/* 0656AC 80064AAC 46128100 */ add.s $f4, $f16, $f18 -/* 0656B0 80064AB0 C4500AD4 */ lwc1 $f16, 0xad4($v0) -/* 0656B4 80064AB4 E4440AC8 */ swc1 $f4, 0xac8($v0) -/* 0656B8 80064AB8 C4880018 */ lwc1 $f8, 0x18($a0) -/* 0656BC 80064ABC 460084A1 */ cvt.d.s $f18, $f16 -/* 0656C0 80064AC0 46083280 */ add.s $f10, $f6, $f8 -/* 0656C4 80064AC4 E44A0ACC */ swc1 $f10, 0xacc($v0) -/* 0656C8 80064AC8 D424E738 */ ldc1 $f4, %lo(D_800EE738)($at) -/* 0656CC 80064ACC A44A0AE6 */ sh $t2, 0xae6($v0) -/* 0656D0 80064AD0 84430AE6 */ lh $v1, 0xae6($v0) -/* 0656D4 80064AD4 46249180 */ add.d $f6, $f18, $f4 -/* 0656D8 80064AD8 2401000C */ li $at, 12 -/* 0656DC 80064ADC 46203220 */ cvt.s.d $f8, $f6 -/* 0656E0 80064AE0 14610005 */ bne $v1, $at, .L80064AF8 -/* 0656E4 80064AE4 E4480AD4 */ swc1 $f8, 0xad4($v0) -/* 0656E8 80064AE8 A4400AE6 */ sh $zero, 0xae6($v0) -/* 0656EC 80064AEC A4400AE4 */ sh $zero, 0xae4($v0) -/* 0656F0 80064AF0 84430AE6 */ lh $v1, 0xae6($v0) -/* 0656F4 80064AF4 A4400ADA */ sh $zero, 0xada($v0) -.L80064AF8: -/* 0656F8 80064AF8 28610009 */ slti $at, $v1, 9 -/* 0656FC 80064AFC 54200009 */ bnel $at, $zero, .L80064B24 -/* 065700 80064B00 8FBF0014 */ lw $ra, 0x14($sp) -/* 065704 80064B04 844B0B06 */ lh $t3, 0xb06($v0) -/* 065708 80064B08 256CFFF0 */ addiu $t4, $t3, -0x10 -/* 06570C 80064B0C A44C0B06 */ sh $t4, 0xb06($v0) -/* 065710 80064B10 844D0B06 */ lh $t5, 0xb06($v0) -/* 065714 80064B14 5DA00003 */ bgtzl $t5, .L80064B24 -/* 065718 80064B18 8FBF0014 */ lw $ra, 0x14($sp) -/* 06571C 80064B1C A4400B06 */ sh $zero, 0xb06($v0) -/* 065720 80064B20 8FBF0014 */ lw $ra, 0x14($sp) -.L80064B24: -/* 065724 80064B24 27BD0028 */ addiu $sp, $sp, 0x28 -/* 065728 80064B28 03E00008 */ jr $ra -/* 06572C 80064B2C 00000000 */ nop diff --git a/asm/non_matchings/code_80057C60/func_80064B30.s b/asm/non_matchings/code_80057C60/func_80064B30.s deleted file mode 100644 index 575b20554..000000000 --- a/asm/non_matchings/code_80057C60/func_80064B30.s +++ /dev/null @@ -1,85 +0,0 @@ -glabel func_80064B30 -/* 065730 80064B30 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 065734 80064B34 00057400 */ sll $t6, $a1, 0x10 -/* 065738 80064B38 000E7C03 */ sra $t7, $t6, 0x10 -/* 06573C 80064B3C 000FC8C0 */ sll $t9, $t7, 3 -/* 065740 80064B40 032FC821 */ addu $t9, $t9, $t7 -/* 065744 80064B44 0019C8C0 */ sll $t9, $t9, 3 -/* 065748 80064B48 AFBF0014 */ sw $ra, 0x14($sp) -/* 06574C 80064B4C AFA40028 */ sw $a0, 0x28($sp) -/* 065750 80064B50 AFA5002C */ sw $a1, 0x2c($sp) -/* 065754 80064B54 AFA60030 */ sw $a2, 0x30($sp) -/* 065758 80064B58 AFA70034 */ sw $a3, 0x34($sp) -/* 06575C 80064B5C 00991021 */ addu $v0, $a0, $t9 -/* 065760 80064B60 C4440AE0 */ lwc1 $f4, 0xae0($v0) -/* 065764 80064B64 3C01800F */ lui $at, %hi(D_800EE740) -/* 065768 80064B68 D428E740 */ ldc1 $f8, %lo(D_800EE740)($at) -/* 06576C 80064B6C 460021A1 */ cvt.d.s $f6, $f4 -/* 065770 80064B70 46283282 */ mul.d $f10, $f6, $f8 -/* 065774 80064B74 46205420 */ cvt.s.d $f16, $f10 -/* 065778 80064B78 E7B00024 */ swc1 $f16, 0x24($sp) -/* 06577C 80064B7C 94440AE8 */ lhu $a0, 0xae8($v0) -/* 065780 80064B80 0C0AE00E */ jal coss -/* 065784 80064B84 AFA20020 */ sw $v0, 0x20($sp) -/* 065788 80064B88 8FA20020 */ lw $v0, 0x20($sp) -/* 06578C 80064B8C C7A20024 */ lwc1 $f2, 0x24($sp) -/* 065790 80064B90 8FA90028 */ lw $t1, 0x28($sp) -/* 065794 80064B94 84480AE6 */ lh $t0, 0xae6($v0) -/* 065798 80064B98 46001087 */ neg.s $f2, $f2 -/* 06579C 80064B9C C52A001C */ lwc1 $f10, 0x1c($t1) -/* 0657A0 80064BA0 44889000 */ mtc1 $t0, $f18 -/* 0657A4 80064BA4 94440AE8 */ lhu $a0, 0xae8($v0) -/* 0657A8 80064BA8 46809120 */ cvt.s.w $f4, $f18 -/* 0657AC 80064BAC 46041182 */ mul.s $f6, $f2, $f4 -/* 0657B0 80064BB0 00000000 */ nop -/* 0657B4 80064BB4 46060202 */ mul.s $f8, $f0, $f6 -/* 0657B8 80064BB8 460A4400 */ add.s $f16, $f8, $f10 -/* 0657BC 80064BBC E4500AD0 */ swc1 $f16, 0xad0($v0) -/* 0657C0 80064BC0 0C0AE006 */ jal sins -/* 0657C4 80064BC4 E7A2001C */ swc1 $f2, 0x1c($sp) -/* 0657C8 80064BC8 8FA20020 */ lw $v0, 0x20($sp) -/* 0657CC 80064BCC C7A2001C */ lwc1 $f2, 0x1c($sp) -/* 0657D0 80064BD0 8FAA0028 */ lw $t2, 0x28($sp) -/* 0657D4 80064BD4 84430AE6 */ lh $v1, 0xae6($v0) -/* 0657D8 80064BD8 3C01800F */ lui $at, %hi(D_800EE748) -/* 0657DC 80064BDC C54A0014 */ lwc1 $f10, 0x14($t2) -/* 0657E0 80064BE0 44839000 */ mtc1 $v1, $f18 -/* 0657E4 80064BE4 246B0001 */ addiu $t3, $v1, 1 -/* 0657E8 80064BE8 46809120 */ cvt.s.w $f4, $f18 -/* 0657EC 80064BEC C4520ACC */ lwc1 $f18, 0xacc($v0) -/* 0657F0 80064BF0 46041182 */ mul.s $f6, $f2, $f4 -/* 0657F4 80064BF4 46009121 */ cvt.d.s $f4, $f18 -/* 0657F8 80064BF8 46060202 */ mul.s $f8, $f0, $f6 -/* 0657FC 80064BFC 460A4400 */ add.s $f16, $f8, $f10 -/* 065800 80064C00 E4500AC8 */ swc1 $f16, 0xac8($v0) -/* 065804 80064C04 D426E748 */ ldc1 $f6, %lo(D_800EE748)($at) -/* 065808 80064C08 A44B0AE6 */ sh $t3, 0xae6($v0) -/* 06580C 80064C0C 84430AE6 */ lh $v1, 0xae6($v0) -/* 065810 80064C10 46262200 */ add.d $f8, $f4, $f6 -/* 065814 80064C14 2401000A */ li $at, 10 -/* 065818 80064C18 462042A0 */ cvt.s.d $f10, $f8 -/* 06581C 80064C1C 14610005 */ bne $v1, $at, .L80064C34 -/* 065820 80064C20 E44A0ACC */ swc1 $f10, 0xacc($v0) -/* 065824 80064C24 A4400AE6 */ sh $zero, 0xae6($v0) -/* 065828 80064C28 A4400AE4 */ sh $zero, 0xae4($v0) -/* 06582C 80064C2C 84430AE6 */ lh $v1, 0xae6($v0) -/* 065830 80064C30 A4400ADA */ sh $zero, 0xada($v0) -.L80064C34: -/* 065834 80064C34 844C0B00 */ lh $t4, 0xb00($v0) -/* 065838 80064C38 28610006 */ slti $at, $v1, 6 -/* 06583C 80064C3C 258D071C */ addiu $t5, $t4, 0x71c -/* 065840 80064C40 14200008 */ bnez $at, .L80064C64 -/* 065844 80064C44 A44D0B00 */ sh $t5, 0xb00($v0) -/* 065848 80064C48 844E0B06 */ lh $t6, 0xb06($v0) -/* 06584C 80064C4C 25CFFFF0 */ addiu $t7, $t6, -0x10 -/* 065850 80064C50 A44F0B06 */ sh $t7, 0xb06($v0) -/* 065854 80064C54 84580B06 */ lh $t8, 0xb06($v0) -/* 065858 80064C58 5F000003 */ bgtzl $t8, .L80064C68 -/* 06585C 80064C5C 8FBF0014 */ lw $ra, 0x14($sp) -/* 065860 80064C60 A4400B06 */ sh $zero, 0xb06($v0) -.L80064C64: -/* 065864 80064C64 8FBF0014 */ lw $ra, 0x14($sp) -.L80064C68: -/* 065868 80064C68 27BD0028 */ addiu $sp, $sp, 0x28 -/* 06586C 80064C6C 03E00008 */ jr $ra -/* 065870 80064C70 00000000 */ nop diff --git a/asm/non_matchings/code_80057C60/func_80064C74.s b/asm/non_matchings/code_80057C60/func_80064C74.s deleted file mode 100644 index 4fa01b39e..000000000 --- a/asm/non_matchings/code_80057C60/func_80064C74.s +++ /dev/null @@ -1,99 +0,0 @@ -glabel func_80064C74 -/* 065874 80064C74 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 065878 80064C78 00057400 */ sll $t6, $a1, 0x10 -/* 06587C 80064C7C 000E7C03 */ sra $t7, $t6, 0x10 -/* 065880 80064C80 000FC0C0 */ sll $t8, $t7, 3 -/* 065884 80064C84 030FC021 */ addu $t8, $t8, $t7 -/* 065888 80064C88 0018C0C0 */ sll $t8, $t8, 3 -/* 06588C 80064C8C AFBF0014 */ sw $ra, 0x14($sp) -/* 065890 80064C90 AFA40020 */ sw $a0, 0x20($sp) -/* 065894 80064C94 AFA50024 */ sw $a1, 0x24($sp) -/* 065898 80064C98 AFA60028 */ sw $a2, 0x28($sp) -/* 06589C 80064C9C AFA7002C */ sw $a3, 0x2c($sp) -/* 0658A0 80064CA0 00981021 */ addu $v0, $a0, $t8 -/* 0658A4 80064CA4 94590AD8 */ lhu $t9, 0xad8($v0) -/* 0658A8 80064CA8 24010001 */ li $at, 1 -/* 0658AC 80064CAC 00803025 */ move $a2, $a0 -/* 0658B0 80064CB0 57210006 */ bnel $t9, $at, .L80064CCC -/* 0658B4 80064CB4 844A0AE8 */ lh $t2, 0xae8($v0) -/* 0658B8 80064CB8 84480AE8 */ lh $t0, 0xae8($v0) -/* 0658BC 80064CBC 25090888 */ addiu $t1, $t0, 0x888 -/* 0658C0 80064CC0 10000004 */ b .L80064CD4 -/* 0658C4 80064CC4 A4490AE8 */ sh $t1, 0xae8($v0) -/* 0658C8 80064CC8 844A0AE8 */ lh $t2, 0xae8($v0) -.L80064CCC: -/* 0658CC 80064CCC 254BF778 */ addiu $t3, $t2, -0x888 -/* 0658D0 80064CD0 A44B0AE8 */ sh $t3, 0xae8($v0) -.L80064CD4: -/* 0658D4 80064CD4 844C0AE8 */ lh $t4, 0xae8($v0) -/* 0658D8 80064CD8 84CD002E */ lh $t5, 0x2e($a2) -/* 0658DC 80064CDC 84CF00C0 */ lh $t7, 0xc0($a2) -/* 0658E0 80064CE0 AFA60020 */ sw $a2, 0x20($sp) -/* 0658E4 80064CE4 018D7023 */ subu $t6, $t4, $t5 -/* 0658E8 80064CE8 01CF2023 */ subu $a0, $t6, $t7 -/* 0658EC 80064CEC 3098FFFF */ andi $t8, $a0, 0xffff -/* 0658F0 80064CF0 03002025 */ move $a0, $t8 -/* 0658F4 80064CF4 0C0AE00E */ jal coss -/* 0658F8 80064CF8 AFA2001C */ sw $v0, 0x1c($sp) -/* 0658FC 80064CFC 3C0140A0 */ li $at, 0x40A00000 # 5.000000 -/* 065900 80064D00 44812000 */ mtc1 $at, $f4 -/* 065904 80064D04 8FA60020 */ lw $a2, 0x20($sp) -/* 065908 80064D08 8FA2001C */ lw $v0, 0x1c($sp) -/* 06590C 80064D0C 46040182 */ mul.s $f6, $f0, $f4 -/* 065910 80064D10 C4C8001C */ lwc1 $f8, 0x1c($a2) -/* 065914 80064D14 84590AE8 */ lh $t9, 0xae8($v0) -/* 065918 80064D18 46083280 */ add.s $f10, $f6, $f8 -/* 06591C 80064D1C E44A0AD0 */ swc1 $f10, 0xad0($v0) -/* 065920 80064D20 84C8002E */ lh $t0, 0x2e($a2) -/* 065924 80064D24 84CA00C0 */ lh $t2, 0xc0($a2) -/* 065928 80064D28 03284823 */ subu $t1, $t9, $t0 -/* 06592C 80064D2C 012A2023 */ subu $a0, $t1, $t2 -/* 065930 80064D30 308BFFFF */ andi $t3, $a0, 0xffff -/* 065934 80064D34 0C0AE006 */ jal sins -/* 065938 80064D38 01602025 */ move $a0, $t3 -/* 06593C 80064D3C 3C0140A0 */ li $at, 0x40A00000 # 5.000000 -/* 065940 80064D40 44818000 */ mtc1 $at, $f16 -/* 065944 80064D44 8FA60020 */ lw $a2, 0x20($sp) -/* 065948 80064D48 8FA2001C */ lw $v0, 0x1c($sp) -/* 06594C 80064D4C 46100482 */ mul.s $f18, $f0, $f16 -/* 065950 80064D50 C4C40014 */ lwc1 $f4, 0x14($a2) -/* 065954 80064D54 3C013F80 */ li $at, 0x3F800000 # 1.000000 -/* 065958 80064D58 44815000 */ mtc1 $at, $f10 -/* 06595C 80064D5C 3C01800F */ lui $at, %hi(D_800EE750) -/* 065960 80064D60 844C0AE6 */ lh $t4, 0xae6($v0) -/* 065964 80064D64 46049180 */ add.s $f6, $f18, $f4 -/* 065968 80064D68 C4520AD4 */ lwc1 $f18, 0xad4($v0) -/* 06596C 80064D6C 258D0001 */ addiu $t5, $t4, 1 -/* 065970 80064D70 E4460AC8 */ swc1 $f6, 0xac8($v0) -/* 065974 80064D74 C4C80018 */ lwc1 $f8, 0x18($a2) -/* 065978 80064D78 46009121 */ cvt.d.s $f4, $f18 -/* 06597C 80064D7C 460A4401 */ sub.s $f16, $f8, $f10 -/* 065980 80064D80 E4500ACC */ swc1 $f16, 0xacc($v0) -/* 065984 80064D84 D426E750 */ ldc1 $f6, %lo(D_800EE750)($at) -/* 065988 80064D88 A44D0AE6 */ sh $t5, 0xae6($v0) -/* 06598C 80064D8C 84430AE6 */ lh $v1, 0xae6($v0) -/* 065990 80064D90 46262200 */ add.d $f8, $f4, $f6 -/* 065994 80064D94 2401000A */ li $at, 10 -/* 065998 80064D98 462042A0 */ cvt.s.d $f10, $f8 -/* 06599C 80064D9C 14610005 */ bne $v1, $at, .L80064DB4 -/* 0659A0 80064DA0 E44A0AD4 */ swc1 $f10, 0xad4($v0) -/* 0659A4 80064DA4 A4400AE6 */ sh $zero, 0xae6($v0) -/* 0659A8 80064DA8 A4400AE4 */ sh $zero, 0xae4($v0) -/* 0659AC 80064DAC 84430AE6 */ lh $v1, 0xae6($v0) -/* 0659B0 80064DB0 A4400ADA */ sh $zero, 0xada($v0) -.L80064DB4: -/* 0659B4 80064DB4 28610005 */ slti $at, $v1, 5 -/* 0659B8 80064DB8 54200009 */ bnel $at, $zero, .L80064DE0 -/* 0659BC 80064DBC 8FBF0014 */ lw $ra, 0x14($sp) -/* 0659C0 80064DC0 844E0B06 */ lh $t6, 0xb06($v0) -/* 0659C4 80064DC4 25CFFFEC */ addiu $t7, $t6, -0x14 -/* 0659C8 80064DC8 A44F0B06 */ sh $t7, 0xb06($v0) -/* 0659CC 80064DCC 84580B06 */ lh $t8, 0xb06($v0) -/* 0659D0 80064DD0 5F000003 */ bgtzl $t8, .L80064DE0 -/* 0659D4 80064DD4 8FBF0014 */ lw $ra, 0x14($sp) -/* 0659D8 80064DD8 A4400B06 */ sh $zero, 0xb06($v0) -/* 0659DC 80064DDC 8FBF0014 */ lw $ra, 0x14($sp) -.L80064DE0: -/* 0659E0 80064DE0 27BD0020 */ addiu $sp, $sp, 0x20 -/* 0659E4 80064DE4 03E00008 */ jr $ra -/* 0659E8 80064DE8 00000000 */ nop diff --git a/asm/non_matchings/code_80057C60/func_80064DEC.s b/asm/non_matchings/code_80057C60/func_80064DEC.s deleted file mode 100644 index 2484e9588..000000000 --- a/asm/non_matchings/code_80057C60/func_80064DEC.s +++ /dev/null @@ -1,49 +0,0 @@ -glabel func_80064DEC -/* 0659EC 80064DEC 00077600 */ sll $t6, $a3, 0x18 -/* 0659F0 80064DF0 000E7E03 */ sra $t7, $t6, 0x18 -/* 0659F4 80064DF4 000FC0C0 */ sll $t8, $t7, 3 -/* 0659F8 80064DF8 030FC021 */ addu $t8, $t8, $t7 -/* 0659FC 80064DFC 0018C0C0 */ sll $t8, $t8, 3 -/* 065A00 80064E00 AFA50004 */ sw $a1, 4($sp) -/* 065A04 80064E04 AFA60008 */ sw $a2, 8($sp) -/* 065A08 80064E08 AFA7000C */ sw $a3, 0xc($sp) -/* 065A0C 80064E0C 00981021 */ addu $v0, $a0, $t8 -/* 065A10 80064E10 84590816 */ lh $t9, 0x816($v0) -/* 065A14 80064E14 C4840018 */ lwc1 $f4, 0x18($a0) -/* 065A18 80064E18 24010009 */ li $at, 9 -/* 065A1C 80064E1C 27280001 */ addiu $t0, $t9, 1 -/* 065A20 80064E20 A4480816 */ sh $t0, 0x816($v0) -/* 065A24 80064E24 84490816 */ lh $t1, 0x816($v0) -/* 065A28 80064E28 E44407FC */ swc1 $f4, 0x7fc($v0) -/* 065A2C 80064E2C 55210008 */ bnel $t1, $at, .L80064E50 -/* 065A30 80064E30 C4460804 */ lwc1 $f6, 0x804($v0) -/* 065A34 80064E34 948A00B6 */ lhu $t2, 0xb6($a0) -/* 065A38 80064E38 314BFFBF */ andi $t3, $t2, 0xffbf -/* 065A3C 80064E3C A48B00B6 */ sh $t3, 0xb6($a0) -/* 065A40 80064E40 A4400814 */ sh $zero, 0x814($v0) -/* 065A44 80064E44 A4400816 */ sh $zero, 0x816($v0) -/* 065A48 80064E48 A440080A */ sh $zero, 0x80a($v0) -/* 065A4C 80064E4C C4460804 */ lwc1 $f6, 0x804($v0) -.L80064E50: -/* 065A50 80064E50 3C01800F */ lui $at, %hi(D_800EE758) -/* 065A54 80064E54 D42AE758 */ ldc1 $f10, %lo(D_800EE758)($at) -/* 065A58 80064E58 46003221 */ cvt.d.s $f8, $f6 -/* 065A5C 80064E5C 3C014004 */ li $at, 0x40040000 # 2.062500 -/* 065A60 80064E60 462A4400 */ add.d $f16, $f8, $f10 -/* 065A64 80064E64 44804000 */ mtc1 $zero, $f8 -/* 065A68 80064E68 44814800 */ mtc1 $at, $f9 -/* 065A6C 80064E6C 3C014020 */ li $at, 0x40200000 # 2.500000 -/* 065A70 80064E70 462084A0 */ cvt.s.d $f18, $f16 -/* 065A74 80064E74 E4520804 */ swc1 $f18, 0x804($v0) -/* 065A78 80064E78 C4440804 */ lwc1 $f4, 0x804($v0) -/* 065A7C 80064E7C 460021A1 */ cvt.d.s $f6, $f4 -/* 065A80 80064E80 4626403E */ c.le.d $f8, $f6 -/* 065A84 80064E84 00000000 */ nop -/* 065A88 80064E88 45000004 */ bc1f .L80064E9C -/* 065A8C 80064E8C 00000000 */ nop -/* 065A90 80064E90 44815000 */ mtc1 $at, $f10 -/* 065A94 80064E94 00000000 */ nop -/* 065A98 80064E98 E44A0804 */ swc1 $f10, 0x804($v0) -.L80064E9C: -/* 065A9C 80064E9C 03E00008 */ jr $ra -/* 065AA0 80064EA0 00000000 */ nop diff --git a/asm/non_matchings/code_80057C60/func_80064EA4.s b/asm/non_matchings/code_80057C60/func_80064EA4.s deleted file mode 100644 index 588f01ec5..000000000 --- a/asm/non_matchings/code_80057C60/func_80064EA4.s +++ /dev/null @@ -1,61 +0,0 @@ -glabel func_80064EA4 -/* 065AA4 80064EA4 00077600 */ sll $t6, $a3, 0x18 -/* 065AA8 80064EA8 000E7E03 */ sra $t7, $t6, 0x18 -/* 065AAC 80064EAC 000FC0C0 */ sll $t8, $t7, 3 -/* 065AB0 80064EB0 030FC021 */ addu $t8, $t8, $t7 -/* 065AB4 80064EB4 0018C0C0 */ sll $t8, $t8, 3 -/* 065AB8 80064EB8 AFA50004 */ sw $a1, 4($sp) -/* 065ABC 80064EBC AFA60008 */ sw $a2, 8($sp) -/* 065AC0 80064EC0 AFA7000C */ sw $a3, 0xc($sp) -/* 065AC4 80064EC4 00981021 */ addu $v0, $a0, $t8 -/* 065AC8 80064EC8 84590816 */ lh $t9, 0x816($v0) -/* 065ACC 80064ECC 27280001 */ addiu $t0, $t9, 1 -/* 065AD0 80064ED0 A4480816 */ sh $t0, 0x816($v0) -/* 065AD4 80064ED4 84490816 */ lh $t1, 0x816($v0) -/* 065AD8 80064ED8 29210004 */ slti $at, $t1, 4 -/* 065ADC 80064EDC 50200016 */ beql $at, $zero, .L80064F38 -/* 065AE0 80064EE0 C44A0804 */ lwc1 $f10, 0x804($v0) -/* 065AE4 80064EE4 C4440804 */ lwc1 $f4, 0x804($v0) -/* 065AE8 80064EE8 3C01800F */ lui $at, %hi(D_800EE760) -/* 065AEC 80064EEC D428E760 */ ldc1 $f8, %lo(D_800EE760)($at) -/* 065AF0 80064EF0 460021A1 */ cvt.d.s $f6, $f4 -/* 065AF4 80064EF4 3C01400C */ li $at, 0x400C0000 # 2.187500 -/* 065AF8 80064EF8 46283280 */ add.d $f10, $f6, $f8 -/* 065AFC 80064EFC 44803000 */ mtc1 $zero, $f6 -/* 065B00 80064F00 44813800 */ mtc1 $at, $f7 -/* 065B04 80064F04 3C014060 */ li $at, 0x40600000 # 3.500000 -/* 065B08 80064F08 46205420 */ cvt.s.d $f16, $f10 -/* 065B0C 80064F0C E4500804 */ swc1 $f16, 0x804($v0) -/* 065B10 80064F10 C4520804 */ lwc1 $f18, 0x804($v0) -/* 065B14 80064F14 46009121 */ cvt.d.s $f4, $f18 -/* 065B18 80064F18 4624303E */ c.le.d $f6, $f4 -/* 065B1C 80064F1C 00000000 */ nop -/* 065B20 80064F20 45000017 */ bc1f .L80064F80 -/* 065B24 80064F24 00000000 */ nop -/* 065B28 80064F28 44814000 */ mtc1 $at, $f8 -/* 065B2C 80064F2C 03E00008 */ jr $ra -/* 065B30 80064F30 E4480804 */ swc1 $f8, 0x804($v0) - -/* 065B34 80064F34 C44A0804 */ lwc1 $f10, 0x804($v0) -.L80064F38: -/* 065B38 80064F38 3C01800F */ lui $at, %hi(D_800EE768) -/* 065B3C 80064F3C D432E768 */ ldc1 $f18, %lo(D_800EE768)($at) -/* 065B40 80064F40 46005421 */ cvt.d.s $f16, $f10 -/* 065B44 80064F44 44804000 */ mtc1 $zero, $f8 -/* 065B48 80064F48 46328101 */ sub.d $f4, $f16, $f18 -/* 065B4C 80064F4C 462021A0 */ cvt.s.d $f6, $f4 -/* 065B50 80064F50 E4460804 */ swc1 $f6, 0x804($v0) -/* 065B54 80064F54 C44A0804 */ lwc1 $f10, 0x804($v0) -/* 065B58 80064F58 4608503E */ c.le.s $f10, $f8 -/* 065B5C 80064F5C 00000000 */ nop -/* 065B60 80064F60 45000007 */ bc1f .L80064F80 -/* 065B64 80064F64 00000000 */ nop -/* 065B68 80064F68 948A00B6 */ lhu $t2, 0xb6($a0) -/* 065B6C 80064F6C 314BEFFF */ andi $t3, $t2, 0xefff -/* 065B70 80064F70 A48B00B6 */ sh $t3, 0xb6($a0) -/* 065B74 80064F74 A4400814 */ sh $zero, 0x814($v0) -/* 065B78 80064F78 A4400816 */ sh $zero, 0x816($v0) -/* 065B7C 80064F7C A440080A */ sh $zero, 0x80a($v0) -.L80064F80: -/* 065B80 80064F80 03E00008 */ jr $ra -/* 065B84 80064F84 00000000 */ nop diff --git a/asm/non_matchings/code_80057C60/func_80064F88.s b/asm/non_matchings/code_80057C60/func_80064F88.s deleted file mode 100644 index 0c8981914..000000000 --- a/asm/non_matchings/code_80057C60/func_80064F88.s +++ /dev/null @@ -1,45 +0,0 @@ -glabel func_80064F88 -/* 065B88 80064F88 00077600 */ sll $t6, $a3, 0x18 -/* 065B8C 80064F8C 000E7E03 */ sra $t7, $t6, 0x18 -/* 065B90 80064F90 000FC0C0 */ sll $t8, $t7, 3 -/* 065B94 80064F94 030FC021 */ addu $t8, $t8, $t7 -/* 065B98 80064F98 0018C0C0 */ sll $t8, $t8, 3 -/* 065B9C 80064F9C AFA50004 */ sw $a1, 4($sp) -/* 065BA0 80064FA0 AFA60008 */ sw $a2, 8($sp) -/* 065BA4 80064FA4 AFA7000C */ sw $a3, 0xc($sp) -/* 065BA8 80064FA8 00981021 */ addu $v0, $a0, $t8 -/* 065BAC 80064FAC 84590816 */ lh $t9, 0x816($v0) -/* 065BB0 80064FB0 C4440804 */ lwc1 $f4, 0x804($v0) -/* 065BB4 80064FB4 3C01800F */ lui $at, %hi(D_800EE770) -/* 065BB8 80064FB8 27280001 */ addiu $t0, $t9, 1 -/* 065BBC 80064FBC A4480816 */ sh $t0, 0x816($v0) -/* 065BC0 80064FC0 D428E770 */ ldc1 $f8, %lo(D_800EE770)($at) -/* 065BC4 80064FC4 460021A1 */ cvt.d.s $f6, $f4 -/* 065BC8 80064FC8 3C01800F */ lui $at, %hi(D_800EE778) -/* 065BCC 80064FCC 46283280 */ add.d $f10, $f6, $f8 -/* 065BD0 80064FD0 46205420 */ cvt.s.d $f16, $f10 -/* 065BD4 80064FD4 E4500804 */ swc1 $f16, 0x804($v0) -/* 065BD8 80064FD8 C4520804 */ lwc1 $f18, 0x804($v0) -/* 065BDC 80064FDC D426E778 */ ldc1 $f6, %lo(D_800EE778)($at) -/* 065BE0 80064FE0 3C01800F */ lui $at, %hi(D_800EE780) # $at, 0x800f -/* 065BE4 80064FE4 46009121 */ cvt.d.s $f4, $f18 -/* 065BE8 80064FE8 4624303E */ c.le.d $f6, $f4 -/* 065BEC 80064FEC 00000000 */ nop -/* 065BF0 80064FF0 45020004 */ bc1fl .L80065004 -/* 065BF4 80064FF4 84490816 */ lh $t1, 0x816($v0) -/* 065BF8 80064FF8 C428E780 */ lwc1 $f8, %lo(D_800EE780)($at) -/* 065BFC 80064FFC E4480804 */ swc1 $f8, 0x804($v0) -/* 065C00 80065000 84490816 */ lh $t1, 0x816($v0) -.L80065004: -/* 065C04 80065004 2921000C */ slti $at, $t1, 0xc -/* 065C08 80065008 14200007 */ bnez $at, .L80065028 -/* 065C0C 8006500C 00000000 */ nop -/* 065C10 80065010 948A00B6 */ lhu $t2, 0xb6($a0) -/* 065C14 80065014 314BF7FF */ andi $t3, $t2, 0xf7ff -/* 065C18 80065018 A48B00B6 */ sh $t3, 0xb6($a0) -/* 065C1C 8006501C A4400814 */ sh $zero, 0x814($v0) -/* 065C20 80065020 A4400816 */ sh $zero, 0x816($v0) -/* 065C24 80065024 A440080A */ sh $zero, 0x80a($v0) -.L80065028: -/* 065C28 80065028 03E00008 */ jr $ra -/* 065C2C 8006502C 00000000 */ nop diff --git a/asm/non_matchings/code_80057C60/func_80065030.s b/asm/non_matchings/code_80057C60/func_80065030.s deleted file mode 100644 index 61c42515f..000000000 --- a/asm/non_matchings/code_80057C60/func_80065030.s +++ /dev/null @@ -1,54 +0,0 @@ -glabel func_80065030 -/* 065C30 80065030 00077600 */ sll $t6, $a3, 0x18 -/* 065C34 80065034 000E7E03 */ sra $t7, $t6, 0x18 -/* 065C38 80065038 000FC0C0 */ sll $t8, $t7, 3 -/* 065C3C 8006503C 030FC021 */ addu $t8, $t8, $t7 -/* 065C40 80065040 0018C0C0 */ sll $t8, $t8, 3 -/* 065C44 80065044 AFA50004 */ sw $a1, 4($sp) -/* 065C48 80065048 AFA60008 */ sw $a2, 8($sp) -/* 065C4C 8006504C AFA7000C */ sw $a3, 0xc($sp) -/* 065C50 80065050 00981021 */ addu $v0, $a0, $t8 -/* 065C54 80065054 84590816 */ lh $t9, 0x816($v0) -/* 065C58 80065058 C44407FC */ lwc1 $f4, 0x7fc($v0) -/* 065C5C 8006505C 3C01800F */ lui $at, %hi(D_800EE788) -/* 065C60 80065060 27280001 */ addiu $t0, $t9, 1 -/* 065C64 80065064 A4480816 */ sh $t0, 0x816($v0) -/* 065C68 80065068 D428E788 */ ldc1 $f8, %lo(D_800EE788)($at) -/* 065C6C 8006506C 460021A1 */ cvt.d.s $f6, $f4 -/* 065C70 80065070 C4520804 */ lwc1 $f18, 0x804($v0) -/* 065C74 80065074 46283280 */ add.d $f10, $f6, $f8 -/* 065C78 80065078 3C01800F */ lui $at, %hi(D_800EE790) -/* 065C7C 8006507C 46009121 */ cvt.d.s $f4, $f18 -/* 065C80 80065080 46205420 */ cvt.s.d $f16, $f10 -/* 065C84 80065084 E45007FC */ swc1 $f16, 0x7fc($v0) -/* 065C88 80065088 D426E790 */ ldc1 $f6, %lo(D_800EE790)($at) -/* 065C8C 8006508C 3C013FF8 */ li $at, 0x3FF80000 # 1.937500 -/* 065C90 80065090 46262200 */ add.d $f8, $f4, $f6 -/* 065C94 80065094 44802000 */ mtc1 $zero, $f4 -/* 065C98 80065098 44812800 */ mtc1 $at, $f5 -/* 065C9C 8006509C 3C013FC0 */ li $at, 0x3FC00000 # 1.500000 -/* 065CA0 800650A0 462042A0 */ cvt.s.d $f10, $f8 -/* 065CA4 800650A4 E44A0804 */ swc1 $f10, 0x804($v0) -/* 065CA8 800650A8 C4500804 */ lwc1 $f16, 0x804($v0) -/* 065CAC 800650AC 460084A1 */ cvt.d.s $f18, $f16 -/* 065CB0 800650B0 4632203E */ c.le.d $f4, $f18 -/* 065CB4 800650B4 00000000 */ nop -/* 065CB8 800650B8 45020005 */ bc1fl .L800650D0 -/* 065CBC 800650BC 84490816 */ lh $t1, 0x816($v0) -/* 065CC0 800650C0 44813000 */ mtc1 $at, $f6 -/* 065CC4 800650C4 00000000 */ nop -/* 065CC8 800650C8 E4460804 */ swc1 $f6, 0x804($v0) -/* 065CCC 800650CC 84490816 */ lh $t1, 0x816($v0) -.L800650D0: -/* 065CD0 800650D0 2921000C */ slti $at, $t1, 0xc -/* 065CD4 800650D4 14200007 */ bnez $at, .L800650F4 -/* 065CD8 800650D8 00000000 */ nop -/* 065CDC 800650DC 948A00B6 */ lhu $t2, 0xb6($a0) -/* 065CE0 800650E0 314BFEFF */ andi $t3, $t2, 0xfeff -/* 065CE4 800650E4 A48B00B6 */ sh $t3, 0xb6($a0) -/* 065CE8 800650E8 A4400814 */ sh $zero, 0x814($v0) -/* 065CEC 800650EC A4400816 */ sh $zero, 0x816($v0) -/* 065CF0 800650F0 A440080A */ sh $zero, 0x80a($v0) -.L800650F4: -/* 065CF4 800650F4 03E00008 */ jr $ra -/* 065CF8 800650F8 00000000 */ nop diff --git a/asm/non_matchings/code_80057C60/func_800650FC.s b/asm/non_matchings/code_80057C60/func_800650FC.s deleted file mode 100644 index 6678cd252..000000000 --- a/asm/non_matchings/code_80057C60/func_800650FC.s +++ /dev/null @@ -1,68 +0,0 @@ -glabel func_800650FC -/* 065CFC 800650FC 00077600 */ sll $t6, $a3, 0x18 -/* 065D00 80065100 000E7E03 */ sra $t7, $t6, 0x18 -/* 065D04 80065104 AFA50004 */ sw $a1, 4($sp) -/* 065D08 80065108 AFA60008 */ sw $a2, 8($sp) -/* 065D0C 8006510C AFA7000C */ sw $a3, 0xc($sp) -/* 065D10 80065110 000FC0C0 */ sll $t8, $t7, 3 -/* 065D14 80065114 C484001C */ lwc1 $f4, 0x1c($a0) -/* 065D18 80065118 030FC021 */ addu $t8, $t8, $t7 -/* 065D1C 8006511C 0018C0C0 */ sll $t8, $t8, 3 -/* 065D20 80065120 00981021 */ addu $v0, $a0, $t8 -/* 065D24 80065124 E4440800 */ swc1 $f4, 0x800($v0) -/* 065D28 80065128 C4860014 */ lwc1 $f6, 0x14($a0) -/* 065D2C 8006512C 3C014080 */ li $at, 0x40800000 # 4.000000 -/* 065D30 80065130 44815000 */ mtc1 $at, $f10 -/* 065D34 80065134 E44607F8 */ swc1 $f6, 0x7f8($v0) -/* 065D38 80065138 C4880018 */ lwc1 $f8, 0x18($a0) -/* 065D3C 8006513C 24050080 */ li $a1, 128 -/* 065D40 80065140 24010040 */ li $at, 64 -/* 065D44 80065144 460A4400 */ add.s $f16, $f8, $f10 -/* 065D48 80065148 E45007FC */ swc1 $f16, 0x7fc($v0) -/* 065D4C 8006514C 8C9900BC */ lw $t9, 0xbc($a0) -/* 065D50 80065150 33280080 */ andi $t0, $t9, 0x80 -/* 065D54 80065154 54A80006 */ bnel $a1, $t0, .L80065170 -/* 065D58 80065158 844B0818 */ lh $t3, 0x818($v0) -/* 065D5C 8006515C 84490818 */ lh $t1, 0x818($v0) -/* 065D60 80065160 252A127C */ addiu $t2, $t1, 0x127c -/* 065D64 80065164 10000004 */ b .L80065178 -/* 065D68 80065168 A44A0818 */ sh $t2, 0x818($v0) -/* 065D6C 8006516C 844B0818 */ lh $t3, 0x818($v0) -.L80065170: -/* 065D70 80065170 256CED84 */ addiu $t4, $t3, -0x127c -/* 065D74 80065174 A44C0818 */ sh $t4, 0x818($v0) -.L80065178: -/* 065D78 80065178 8C8300BC */ lw $v1, 0xbc($a0) -/* 065D7C 8006517C 306D0080 */ andi $t5, $v1, 0x80 -/* 065D80 80065180 10AD0006 */ beq $a1, $t5, .L8006519C -/* 065D84 80065184 306E0040 */ andi $t6, $v1, 0x40 -/* 065D88 80065188 51C10005 */ beql $t6, $at, .L800651A0 -/* 065D8C 8006518C C4520804 */ lwc1 $f18, 0x804($v0) -/* 065D90 80065190 A4400814 */ sh $zero, 0x814($v0) -/* 065D94 80065194 A4400816 */ sh $zero, 0x816($v0) -/* 065D98 80065198 A440080A */ sh $zero, 0x80a($v0) -.L8006519C: -/* 065D9C 8006519C C4520804 */ lwc1 $f18, 0x804($v0) -.L800651A0: -/* 065DA0 800651A0 3C01800F */ lui $at, %hi(D_800EE798) -/* 065DA4 800651A4 D426E798 */ ldc1 $f6, %lo(D_800EE798)($at) -/* 065DA8 800651A8 46009121 */ cvt.d.s $f4, $f18 -/* 065DAC 800651AC 3C013FF8 */ li $at, 0x3FF80000 # 1.937500 -/* 065DB0 800651B0 46262200 */ add.d $f8, $f4, $f6 -/* 065DB4 800651B4 44802000 */ mtc1 $zero, $f4 -/* 065DB8 800651B8 44812800 */ mtc1 $at, $f5 -/* 065DBC 800651BC 3C013FC0 */ li $at, 0x3FC00000 # 1.500000 -/* 065DC0 800651C0 462042A0 */ cvt.s.d $f10, $f8 -/* 065DC4 800651C4 E44A0804 */ swc1 $f10, 0x804($v0) -/* 065DC8 800651C8 C4500804 */ lwc1 $f16, 0x804($v0) -/* 065DCC 800651CC 460084A1 */ cvt.d.s $f18, $f16 -/* 065DD0 800651D0 4632203E */ c.le.d $f4, $f18 -/* 065DD4 800651D4 00000000 */ nop -/* 065DD8 800651D8 45000004 */ bc1f .L800651EC -/* 065DDC 800651DC 00000000 */ nop -/* 065DE0 800651E0 44813000 */ mtc1 $at, $f6 -/* 065DE4 800651E4 00000000 */ nop -/* 065DE8 800651E8 E4460804 */ swc1 $f6, 0x804($v0) -.L800651EC: -/* 065DEC 800651EC 03E00008 */ jr $ra -/* 065DF0 800651F0 00000000 */ nop diff --git a/asm/non_matchings/code_80057C60/func_800651F4.s b/asm/non_matchings/code_80057C60/func_800651F4.s deleted file mode 100644 index d4623e829..000000000 --- a/asm/non_matchings/code_80057C60/func_800651F4.s +++ /dev/null @@ -1,60 +0,0 @@ -glabel func_800651F4 -/* 065DF4 800651F4 00077600 */ sll $t6, $a3, 0x18 -/* 065DF8 800651F8 000E7E03 */ sra $t7, $t6, 0x18 -/* 065DFC 800651FC 000FC0C0 */ sll $t8, $t7, 3 -/* 065E00 80065200 030FC021 */ addu $t8, $t8, $t7 -/* 065E04 80065204 0018C0C0 */ sll $t8, $t8, 3 -/* 065E08 80065208 AFA50004 */ sw $a1, 4($sp) -/* 065E0C 8006520C AFA60008 */ sw $a2, 8($sp) -/* 065E10 80065210 AFA7000C */ sw $a3, 0xc($sp) -/* 065E14 80065214 00981021 */ addu $v0, $a0, $t8 -/* 065E18 80065218 84590816 */ lh $t9, 0x816($v0) -/* 065E1C 8006521C 27280001 */ addiu $t0, $t9, 1 -/* 065E20 80065220 A4480816 */ sh $t0, 0x816($v0) -/* 065E24 80065224 84490816 */ lh $t1, 0x816($v0) -/* 065E28 80065228 29210008 */ slti $at, $t1, 8 -/* 065E2C 8006522C 50200015 */ beql $at, $zero, .L80065284 -/* 065E30 80065230 C44A0804 */ lwc1 $f10, 0x804($v0) -/* 065E34 80065234 C4440804 */ lwc1 $f4, 0x804($v0) -/* 065E38 80065238 3C01800F */ lui $at, %hi(D_800EE7A0) -/* 065E3C 8006523C D428E7A0 */ ldc1 $f8, %lo(D_800EE7A0)($at) -/* 065E40 80065240 460021A1 */ cvt.d.s $f6, $f4 -/* 065E44 80065244 3C01800F */ lui $at, %hi(D_800EE7A8) -/* 065E48 80065248 46283280 */ add.d $f10, $f6, $f8 -/* 065E4C 8006524C 46205420 */ cvt.s.d $f16, $f10 -/* 065E50 80065250 E4500804 */ swc1 $f16, 0x804($v0) -/* 065E54 80065254 C4520804 */ lwc1 $f18, 0x804($v0) -/* 065E58 80065258 D426E7A8 */ ldc1 $f6, %lo(D_800EE7A8)($at) -/* 065E5C 8006525C 3C01800F */ lui $at, %hi(D_800EE7B0) # $at, 0x800f -/* 065E60 80065260 46009121 */ cvt.d.s $f4, $f18 -/* 065E64 80065264 4624303E */ c.le.d $f6, $f4 -/* 065E68 80065268 00000000 */ nop -/* 065E6C 8006526C 45000017 */ bc1f .L800652CC -/* 065E70 80065270 00000000 */ nop -/* 065E74 80065274 C428E7B0 */ lwc1 $f8, %lo(D_800EE7B0)($at) -/* 065E78 80065278 03E00008 */ jr $ra -/* 065E7C 8006527C E4480804 */ swc1 $f8, 0x804($v0) - -/* 065E80 80065280 C44A0804 */ lwc1 $f10, 0x804($v0) -.L80065284: -/* 065E84 80065284 3C01800F */ lui $at, %hi(D_800EE7B8) -/* 065E88 80065288 D432E7B8 */ ldc1 $f18, %lo(D_800EE7B8)($at) -/* 065E8C 8006528C 46005421 */ cvt.d.s $f16, $f10 -/* 065E90 80065290 44804000 */ mtc1 $zero, $f8 -/* 065E94 80065294 46328101 */ sub.d $f4, $f16, $f18 -/* 065E98 80065298 462021A0 */ cvt.s.d $f6, $f4 -/* 065E9C 8006529C E4460804 */ swc1 $f6, 0x804($v0) -/* 065EA0 800652A0 C44A0804 */ lwc1 $f10, 0x804($v0) -/* 065EA4 800652A4 4608503E */ c.le.s $f10, $f8 -/* 065EA8 800652A8 00000000 */ nop -/* 065EAC 800652AC 45000007 */ bc1f .L800652CC -/* 065EB0 800652B0 00000000 */ nop -/* 065EB4 800652B4 948A00B6 */ lhu $t2, 0xb6($a0) -/* 065EB8 800652B8 314BFFDF */ andi $t3, $t2, 0xffdf -/* 065EBC 800652BC A48B00B6 */ sh $t3, 0xb6($a0) -/* 065EC0 800652C0 A4400814 */ sh $zero, 0x814($v0) -/* 065EC4 800652C4 A4400816 */ sh $zero, 0x816($v0) -/* 065EC8 800652C8 A440080A */ sh $zero, 0x80a($v0) -.L800652CC: -/* 065ECC 800652CC 03E00008 */ jr $ra -/* 065ED0 800652D0 00000000 */ nop diff --git a/asm/non_matchings/code_80057C60/func_8006DC54.s b/asm/non_matchings/code_80057C60/func_8006DC54.s deleted file mode 100644 index 082bb1dba..000000000 --- a/asm/non_matchings/code_80057C60/func_8006DC54.s +++ /dev/null @@ -1,62 +0,0 @@ -glabel func_8006DC54 -/* 06E854 8006DC54 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 06E858 8006DC58 AFB40024 */ sw $s4, 0x24($sp) -/* 06E85C 8006DC5C 0006A600 */ sll $s4, $a2, 0x18 -/* 06E860 8006DC60 AFBF002C */ sw $ra, 0x2c($sp) -/* 06E864 8006DC64 AFB50028 */ sw $s5, 0x28($sp) -/* 06E868 8006DC68 AFB30020 */ sw $s3, 0x20($sp) -/* 06E86C 8006DC6C AFB2001C */ sw $s2, 0x1c($sp) -/* 06E870 8006DC70 AFB10018 */ sw $s1, 0x18($sp) -/* 06E874 8006DC74 AFB00014 */ sw $s0, 0x14($sp) -/* 06E878 8006DC78 AFA50034 */ sw $a1, 0x34($sp) -/* 06E87C 8006DC7C AFA60038 */ sw $a2, 0x38($sp) -/* 06E880 8006DC80 94880002 */ lhu $t0, 2($a0) -/* 06E884 8006DC84 00147E03 */ sra $t7, $s4, 0x18 -/* 06E888 8006DC88 000FC080 */ sll $t8, $t7, 2 -/* 06E88C 8006DC8C 24190008 */ li $t9, 8 -/* 06E890 8006DC90 0005AE00 */ sll $s5, $a1, 0x18 -/* 06E894 8006DC94 03191004 */ sllv $v0, $t9, $t8 -/* 06E898 8006DC98 00157603 */ sra $t6, $s5, 0x18 -/* 06E89C 8006DC9C 01024824 */ and $t1, $t0, $v0 -/* 06E8A0 8006DCA0 01C0A825 */ move $s5, $t6 -/* 06E8A4 8006DCA4 01E0A025 */ move $s4, $t7 -/* 06E8A8 8006DCA8 1449001B */ bne $v0, $t1, .L8006DD18 -/* 06E8AC 8006DCAC 00808825 */ move $s1, $a0 -/* 06E8B0 8006DCB0 00008025 */ move $s0, $zero -/* 06E8B4 8006DCB4 24130048 */ li $s3, 72 -/* 06E8B8 8006DCB8 24120007 */ li $s2, 7 -.L8006DCBC: -/* 06E8BC 8006DCBC 02130019 */ multu $s0, $s3 -/* 06E8C0 8006DCC0 00152E00 */ sll $a1, $s5, 0x18 -/* 06E8C4 8006DCC4 00103400 */ sll $a2, $s0, 0x10 -/* 06E8C8 8006DCC8 00067403 */ sra $t6, $a2, 0x10 -/* 06E8CC 8006DCCC 00056E03 */ sra $t5, $a1, 0x18 -/* 06E8D0 8006DCD0 00143E00 */ sll $a3, $s4, 0x18 -/* 06E8D4 8006DCD4 00077E03 */ sra $t7, $a3, 0x18 -/* 06E8D8 8006DCD8 01A02825 */ move $a1, $t5 -/* 06E8DC 8006DCDC 01C03025 */ move $a2, $t6 -/* 06E8E0 8006DCE0 02202025 */ move $a0, $s1 -/* 06E8E4 8006DCE4 00005012 */ mflo $t2 -/* 06E8E8 8006DCE8 022A5821 */ addu $t3, $s1, $t2 -/* 06E8EC 8006DCEC 956C026A */ lhu $t4, 0x26a($t3) -/* 06E8F0 8006DCF0 564C0004 */ bnel $s2, $t4, .L8006DD04 -/* 06E8F4 8006DCF4 26100001 */ addiu $s0, $s0, 1 -/* 06E8F8 8006DCF8 0C019628 */ jal func_800658A0 -/* 06E8FC 8006DCFC 01E03825 */ move $a3, $t7 -/* 06E900 8006DD00 26100001 */ addiu $s0, $s0, 1 -.L8006DD04: -/* 06E904 8006DD04 0010CC00 */ sll $t9, $s0, 0x10 -/* 06E908 8006DD08 00198403 */ sra $s0, $t9, 0x10 -/* 06E90C 8006DD0C 2A01000A */ slti $at, $s0, 0xa -/* 06E910 8006DD10 1420FFEA */ bnez $at, .L8006DCBC -/* 06E914 8006DD14 00000000 */ nop -.L8006DD18: -/* 06E918 8006DD18 8FBF002C */ lw $ra, 0x2c($sp) -/* 06E91C 8006DD1C 8FB00014 */ lw $s0, 0x14($sp) -/* 06E920 8006DD20 8FB10018 */ lw $s1, 0x18($sp) -/* 06E924 8006DD24 8FB2001C */ lw $s2, 0x1c($sp) -/* 06E928 8006DD28 8FB30020 */ lw $s3, 0x20($sp) -/* 06E92C 8006DD2C 8FB40024 */ lw $s4, 0x24($sp) -/* 06E930 8006DD30 8FB50028 */ lw $s5, 0x28($sp) -/* 06E934 8006DD34 03E00008 */ jr $ra -/* 06E938 8006DD38 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/non_matchings/code_80057C60/func_8006E420.s b/asm/non_matchings/code_80057C60/func_8006E420.s deleted file mode 100644 index 0e8ca8381..000000000 --- a/asm/non_matchings/code_80057C60/func_8006E420.s +++ /dev/null @@ -1,105 +0,0 @@ -glabel func_8006E420 -/* 06F020 8006E420 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 06F024 8006E424 AFBF0034 */ sw $ra, 0x34($sp) -/* 06F028 8006E428 AFB60030 */ sw $s6, 0x30($sp) -/* 06F02C 8006E42C AFB5002C */ sw $s5, 0x2c($sp) -/* 06F030 8006E430 AFB40028 */ sw $s4, 0x28($sp) -/* 06F034 8006E434 AFB30024 */ sw $s3, 0x24($sp) -/* 06F038 8006E438 AFB20020 */ sw $s2, 0x20($sp) -/* 06F03C 8006E43C AFB1001C */ sw $s1, 0x1c($sp) -/* 06F040 8006E440 AFB00018 */ sw $s0, 0x18($sp) -/* 06F044 8006E444 AFA5003C */ sw $a1, 0x3c($sp) -/* 06F048 8006E448 AFA60040 */ sw $a2, 0x40($sp) -/* 06F04C 8006E44C 94820000 */ lhu $v0, ($a0) -/* 06F050 8006E450 00069600 */ sll $s2, $a2, 0x18 -/* 06F054 8006E454 00059E00 */ sll $s3, $a1, 0x18 -/* 06F058 8006E458 00137603 */ sra $t6, $s3, 0x18 -/* 06F05C 8006E45C 00127E03 */ sra $t7, $s2, 0x18 -/* 06F060 8006E460 34018000 */ li $at, 32768 -/* 06F064 8006E464 30588000 */ andi $t8, $v0, 0x8000 -/* 06F068 8006E468 01E09025 */ move $s2, $t7 -/* 06F06C 8006E46C 01C09825 */ move $s3, $t6 -/* 06F070 8006E470 17010044 */ bne $t8, $at, .L8006E584 -/* 06F074 8006E474 00808825 */ move $s1, $a0 -/* 06F078 8006E478 24164000 */ li $s6, 16384 -/* 06F07C 8006E47C 30594000 */ andi $t9, $v0, 0x4000 -/* 06F080 8006E480 16D90007 */ bne $s6, $t9, .L8006E4A0 -/* 06F084 8006E484 000E2E00 */ sll $a1, $t6, 0x18 -/* 06F088 8006E488 000F3600 */ sll $a2, $t7, 0x18 -/* 06F08C 8006E48C 00064E03 */ sra $t1, $a2, 0x18 -/* 06F090 8006E490 00054603 */ sra $t0, $a1, 0x18 -/* 06F094 8006E494 01002825 */ move $a1, $t0 -/* 06F098 8006E498 0C01B465 */ jal func_8006D194 -/* 06F09C 8006E49C 01203025 */ move $a2, $t1 -.L8006E4A0: -/* 06F0A0 8006E4A0 3C15800E */ lui $s5, %hi(D_800DC50C) # $s5, 0x800e -/* 06F0A4 8006E4A4 26B5C50C */ addiu $s5, %lo(D_800DC50C) # addiu $s5, $s5, -0x3af4 -/* 06F0A8 8006E4A8 00008025 */ move $s0, $zero -/* 06F0AC 8006E4AC 24140005 */ li $s4, 5 -/* 06F0B0 8006E4B0 00102C00 */ sll $a1, $s0, 0x10 -.L8006E4B4: -/* 06F0B4 8006E4B4 00133600 */ sll $a2, $s3, 0x18 -/* 06F0B8 8006E4B8 00123E00 */ sll $a3, $s2, 0x18 -/* 06F0BC 8006E4BC 00076603 */ sra $t4, $a3, 0x18 -/* 06F0C0 8006E4C0 00065E03 */ sra $t3, $a2, 0x18 -/* 06F0C4 8006E4C4 00055403 */ sra $t2, $a1, 0x10 -/* 06F0C8 8006E4C8 01402825 */ move $a1, $t2 -/* 06F0CC 8006E4CC 01603025 */ move $a2, $t3 -/* 06F0D0 8006E4D0 01803825 */ move $a3, $t4 -/* 06F0D4 8006E4D4 0C01B3B0 */ jal func_8006CEC0 -/* 06F0D8 8006E4D8 02202025 */ move $a0, $s1 -/* 06F0DC 8006E4DC 962D0000 */ lhu $t5, ($s1) -/* 06F0E0 8006E4E0 00102C00 */ sll $a1, $s0, 0x10 -/* 06F0E4 8006E4E4 0005C403 */ sra $t8, $a1, 0x10 -/* 06F0E8 8006E4E8 31AE4000 */ andi $t6, $t5, 0x4000 -/* 06F0EC 8006E4EC 12CE0003 */ beq $s6, $t6, .L8006E4FC -/* 06F0F0 8006E4F0 02202025 */ move $a0, $s1 -/* 06F0F4 8006E4F4 8EAF0000 */ lw $t7, ($s5) -/* 06F0F8 8006E4F8 168F0008 */ bne $s4, $t7, .L8006E51C -.L8006E4FC: -/* 06F0FC 8006E4FC 00133600 */ sll $a2, $s3, 0x18 -/* 06F100 8006E500 00123E00 */ sll $a3, $s2, 0x18 -/* 06F104 8006E504 00074603 */ sra $t0, $a3, 0x18 -/* 06F108 8006E508 0006CE03 */ sra $t9, $a2, 0x18 -/* 06F10C 8006E50C 03203025 */ move $a2, $t9 -/* 06F110 8006E510 01003825 */ move $a3, $t0 -/* 06F114 8006E514 0C01B26E */ jal func_8006C9B8 -/* 06F118 8006E518 03002825 */ move $a1, $t8 -.L8006E51C: -/* 06F11C 8006E51C 00102C00 */ sll $a1, $s0, 0x10 -/* 06F120 8006E520 00133600 */ sll $a2, $s3, 0x18 -/* 06F124 8006E524 00123E00 */ sll $a3, $s2, 0x18 -/* 06F128 8006E528 00075E03 */ sra $t3, $a3, 0x18 -/* 06F12C 8006E52C 00065603 */ sra $t2, $a2, 0x18 -/* 06F130 8006E530 00054C03 */ sra $t1, $a1, 0x10 -/* 06F134 8006E534 01202825 */ move $a1, $t1 -/* 06F138 8006E538 01403025 */ move $a2, $t2 -/* 06F13C 8006E53C 01603825 */ move $a3, $t3 -/* 06F140 8006E540 0C01B1AB */ jal func_8006C6AC -/* 06F144 8006E544 02202025 */ move $a0, $s1 -/* 06F148 8006E548 26100001 */ addiu $s0, $s0, 1 -/* 06F14C 8006E54C 00106400 */ sll $t4, $s0, 0x10 -/* 06F150 8006E550 000C8403 */ sra $s0, $t4, 0x10 -/* 06F154 8006E554 2A01000A */ slti $at, $s0, 0xa -/* 06F158 8006E558 5420FFD6 */ bnel $at, $zero, .L8006E4B4 -/* 06F15C 8006E55C 00102C00 */ sll $a1, $s0, 0x10 -/* 06F160 8006E560 3C0E800E */ lui $t6, %hi(gModeSelection) # $t6, 0x800e -/* 06F164 8006E564 8DCEC53C */ lw $t6, %lo(gModeSelection)($t6) -/* 06F168 8006E568 24010003 */ li $at, 3 -/* 06F16C 8006E56C 02202025 */ move $a0, $s1 -/* 06F170 8006E570 15C10004 */ bne $t6, $at, .L8006E584 -/* 06F174 8006E574 00132E00 */ sll $a1, $s3, 0x18 -/* 06F178 8006E578 00057E03 */ sra $t7, $a1, 0x18 -/* 06F17C 8006E57C 0C01AE73 */ jal func_8006B9CC -/* 06F180 8006E580 01E02825 */ move $a1, $t7 -.L8006E584: -/* 06F184 8006E584 8FBF0034 */ lw $ra, 0x34($sp) -/* 06F188 8006E588 8FB00018 */ lw $s0, 0x18($sp) -/* 06F18C 8006E58C 8FB1001C */ lw $s1, 0x1c($sp) -/* 06F190 8006E590 8FB20020 */ lw $s2, 0x20($sp) -/* 06F194 8006E594 8FB30024 */ lw $s3, 0x24($sp) -/* 06F198 8006E598 8FB40028 */ lw $s4, 0x28($sp) -/* 06F19C 8006E59C 8FB5002C */ lw $s5, 0x2c($sp) -/* 06F1A0 8006E5A0 8FB60030 */ lw $s6, 0x30($sp) -/* 06F1A4 8006E5A4 03E00008 */ jr $ra -/* 06F1A8 8006E5A8 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/non_matchings/code_80057C60/func_8006E5AC.s b/asm/non_matchings/code_80057C60/func_8006E5AC.s deleted file mode 100644 index aaf52afe0..000000000 --- a/asm/non_matchings/code_80057C60/func_8006E5AC.s +++ /dev/null @@ -1,38 +0,0 @@ -glabel func_8006E5AC -/* 06F1AC 8006E5AC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 06F1B0 8006E5B0 AFBF0014 */ sw $ra, 0x14($sp) -/* 06F1B4 8006E5B4 AFA5001C */ sw $a1, 0x1c($sp) -/* 06F1B8 8006E5B8 AFA60020 */ sw $a2, 0x20($sp) -/* 06F1BC 8006E5BC 948E0000 */ lhu $t6, ($a0) -/* 06F1C0 8006E5C0 34018000 */ li $at, 32768 -/* 06F1C4 8006E5C4 31CF8000 */ andi $t7, $t6, 0x8000 -/* 06F1C8 8006E5C8 55E10017 */ bnel $t7, $at, .L8006E628 -/* 06F1CC 8006E5CC 8FBF0014 */ lw $ra, 0x14($sp) -/* 06F1D0 8006E5D0 8C9800BC */ lw $t8, 0xbc($a0) -/* 06F1D4 8006E5D4 3C028000 */ lui $v0, 0x8000 -/* 06F1D8 8006E5D8 83A5001F */ lb $a1, 0x1f($sp) -/* 06F1DC 8006E5DC 0302C824 */ and $t9, $t8, $v0 -/* 06F1E0 8006E5E0 1459000A */ bne $v0, $t9, .L8006E60C -/* 06F1E4 8006E5E4 83A60023 */ lb $a2, 0x23($sp) -/* 06F1E8 8006E5E8 83A8001F */ lb $t0, 0x1f($sp) -/* 06F1EC 8006E5EC 83A90023 */ lb $t1, 0x23($sp) -/* 06F1F0 8006E5F0 01002825 */ move $a1, $t0 -/* 06F1F4 8006E5F4 15090008 */ bne $t0, $t1, .L8006E618 -/* 06F1F8 8006E5F8 01203025 */ move $a2, $t1 -/* 06F1FC 8006E5FC 0C01B51D */ jal func_8006D474 -/* 06F200 8006E600 AFA40018 */ sw $a0, 0x18($sp) -/* 06F204 8006E604 10000004 */ b .L8006E618 -/* 06F208 8006E608 8FA40018 */ lw $a0, 0x18($sp) -.L8006E60C: -/* 06F20C 8006E60C 0C01B51D */ jal func_8006D474 -/* 06F210 8006E610 AFA40018 */ sw $a0, 0x18($sp) -/* 06F214 8006E614 8FA40018 */ lw $a0, 0x18($sp) -.L8006E618: -/* 06F218 8006E618 83A5001F */ lb $a1, 0x1f($sp) -/* 06F21C 8006E61C 0C01B715 */ jal func_8006DC54 -/* 06F220 8006E620 83A60023 */ lb $a2, 0x23($sp) -/* 06F224 8006E624 8FBF0014 */ lw $ra, 0x14($sp) -.L8006E628: -/* 06F228 8006E628 27BD0018 */ addiu $sp, $sp, 0x18 -/* 06F22C 8006E62C 03E00008 */ jr $ra -/* 06F230 8006E630 00000000 */ nop diff --git a/asm/non_matchings/code_80057C60/func_8006E634.s b/asm/non_matchings/code_80057C60/func_8006E634.s deleted file mode 100644 index a6318ab1c..000000000 --- a/asm/non_matchings/code_80057C60/func_8006E634.s +++ /dev/null @@ -1,38 +0,0 @@ -glabel func_8006E634 -/* 06F234 8006E634 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 06F238 8006E638 AFBF0014 */ sw $ra, 0x14($sp) -/* 06F23C 8006E63C AFA5001C */ sw $a1, 0x1c($sp) -/* 06F240 8006E640 AFA60020 */ sw $a2, 0x20($sp) -/* 06F244 8006E644 948E0000 */ lhu $t6, ($a0) -/* 06F248 8006E648 34018000 */ li $at, 32768 -/* 06F24C 8006E64C 31CF8000 */ andi $t7, $t6, 0x8000 -/* 06F250 8006E650 55E10017 */ bnel $t7, $at, .L8006E6B0 -/* 06F254 8006E654 8FBF0014 */ lw $ra, 0x14($sp) -/* 06F258 8006E658 8C9800BC */ lw $t8, 0xbc($a0) -/* 06F25C 8006E65C 3C028000 */ lui $v0, 0x8000 -/* 06F260 8006E660 83A5001F */ lb $a1, 0x1f($sp) -/* 06F264 8006E664 0302C824 */ and $t9, $t8, $v0 -/* 06F268 8006E668 1459000A */ bne $v0, $t9, .L8006E694 -/* 06F26C 8006E66C 83A60023 */ lb $a2, 0x23($sp) -/* 06F270 8006E670 83A8001F */ lb $t0, 0x1f($sp) -/* 06F274 8006E674 83A90023 */ lb $t1, 0x23($sp) -/* 06F278 8006E678 01002825 */ move $a1, $t0 -/* 06F27C 8006E67C 15090008 */ bne $t0, $t1, .L8006E6A0 -/* 06F280 8006E680 01203025 */ move $a2, $t1 -/* 06F284 8006E684 0C01B51D */ jal func_8006D474 -/* 06F288 8006E688 AFA40018 */ sw $a0, 0x18($sp) -/* 06F28C 8006E68C 10000004 */ b .L8006E6A0 -/* 06F290 8006E690 8FA40018 */ lw $a0, 0x18($sp) -.L8006E694: -/* 06F294 8006E694 0C01B51D */ jal func_8006D474 -/* 06F298 8006E698 AFA40018 */ sw $a0, 0x18($sp) -/* 06F29C 8006E69C 8FA40018 */ lw $a0, 0x18($sp) -.L8006E6A0: -/* 06F2A0 8006E6A0 83A5001F */ lb $a1, 0x1f($sp) -/* 06F2A4 8006E6A4 0C01B715 */ jal func_8006DC54 -/* 06F2A8 8006E6A8 83A60023 */ lb $a2, 0x23($sp) -/* 06F2AC 8006E6AC 8FBF0014 */ lw $ra, 0x14($sp) -.L8006E6B0: -/* 06F2B0 8006E6B0 27BD0018 */ addiu $sp, $sp, 0x18 -/* 06F2B4 8006E6B4 03E00008 */ jr $ra -/* 06F2B8 8006E6B8 00000000 */ nop diff --git a/asm/non_matchings/code_80057C60/func_8006E6BC.s b/asm/non_matchings/code_80057C60/func_8006E6BC.s deleted file mode 100644 index 9e67a2a6a..000000000 --- a/asm/non_matchings/code_80057C60/func_8006E6BC.s +++ /dev/null @@ -1,38 +0,0 @@ -glabel func_8006E6BC -/* 06F2BC 8006E6BC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 06F2C0 8006E6C0 AFBF0014 */ sw $ra, 0x14($sp) -/* 06F2C4 8006E6C4 AFA5001C */ sw $a1, 0x1c($sp) -/* 06F2C8 8006E6C8 AFA60020 */ sw $a2, 0x20($sp) -/* 06F2CC 8006E6CC 948E0000 */ lhu $t6, ($a0) -/* 06F2D0 8006E6D0 34018000 */ li $at, 32768 -/* 06F2D4 8006E6D4 31CF8000 */ andi $t7, $t6, 0x8000 -/* 06F2D8 8006E6D8 55E10017 */ bnel $t7, $at, .L8006E738 -/* 06F2DC 8006E6DC 8FBF0014 */ lw $ra, 0x14($sp) -/* 06F2E0 8006E6E0 8C9800BC */ lw $t8, 0xbc($a0) -/* 06F2E4 8006E6E4 3C028000 */ lui $v0, 0x8000 -/* 06F2E8 8006E6E8 83A5001F */ lb $a1, 0x1f($sp) -/* 06F2EC 8006E6EC 0302C824 */ and $t9, $t8, $v0 -/* 06F2F0 8006E6F0 1459000A */ bne $v0, $t9, .L8006E71C -/* 06F2F4 8006E6F4 83A60023 */ lb $a2, 0x23($sp) -/* 06F2F8 8006E6F8 83A8001F */ lb $t0, 0x1f($sp) -/* 06F2FC 8006E6FC 83A90023 */ lb $t1, 0x23($sp) -/* 06F300 8006E700 01002825 */ move $a1, $t0 -/* 06F304 8006E704 15090008 */ bne $t0, $t1, .L8006E728 -/* 06F308 8006E708 01203025 */ move $a2, $t1 -/* 06F30C 8006E70C 0C01B51D */ jal func_8006D474 -/* 06F310 8006E710 AFA40018 */ sw $a0, 0x18($sp) -/* 06F314 8006E714 10000004 */ b .L8006E728 -/* 06F318 8006E718 8FA40018 */ lw $a0, 0x18($sp) -.L8006E71C: -/* 06F31C 8006E71C 0C01B51D */ jal func_8006D474 -/* 06F320 8006E720 AFA40018 */ sw $a0, 0x18($sp) -/* 06F324 8006E724 8FA40018 */ lw $a0, 0x18($sp) -.L8006E728: -/* 06F328 8006E728 83A5001F */ lb $a1, 0x1f($sp) -/* 06F32C 8006E72C 0C01B715 */ jal func_8006DC54 -/* 06F330 8006E730 83A60023 */ lb $a2, 0x23($sp) -/* 06F334 8006E734 8FBF0014 */ lw $ra, 0x14($sp) -.L8006E738: -/* 06F338 8006E738 27BD0018 */ addiu $sp, $sp, 0x18 -/* 06F33C 8006E73C 03E00008 */ jr $ra -/* 06F340 8006E740 00000000 */ nop diff --git a/asm/non_matchings/code_80057C60/func_8006E744.s b/asm/non_matchings/code_80057C60/func_8006E744.s deleted file mode 100644 index acfedf3eb..000000000 --- a/asm/non_matchings/code_80057C60/func_8006E744.s +++ /dev/null @@ -1,38 +0,0 @@ -glabel func_8006E744 -/* 06F344 8006E744 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 06F348 8006E748 AFBF0014 */ sw $ra, 0x14($sp) -/* 06F34C 8006E74C AFA5001C */ sw $a1, 0x1c($sp) -/* 06F350 8006E750 AFA60020 */ sw $a2, 0x20($sp) -/* 06F354 8006E754 948E0000 */ lhu $t6, ($a0) -/* 06F358 8006E758 34018000 */ li $at, 32768 -/* 06F35C 8006E75C 31CF8000 */ andi $t7, $t6, 0x8000 -/* 06F360 8006E760 55E10017 */ bnel $t7, $at, .L8006E7C0 -/* 06F364 8006E764 8FBF0014 */ lw $ra, 0x14($sp) -/* 06F368 8006E768 8C9800BC */ lw $t8, 0xbc($a0) -/* 06F36C 8006E76C 3C028000 */ lui $v0, 0x8000 -/* 06F370 8006E770 83A5001F */ lb $a1, 0x1f($sp) -/* 06F374 8006E774 0302C824 */ and $t9, $t8, $v0 -/* 06F378 8006E778 1459000A */ bne $v0, $t9, .L8006E7A4 -/* 06F37C 8006E77C 83A60023 */ lb $a2, 0x23($sp) -/* 06F380 8006E780 83A8001F */ lb $t0, 0x1f($sp) -/* 06F384 8006E784 83A90023 */ lb $t1, 0x23($sp) -/* 06F388 8006E788 01002825 */ move $a1, $t0 -/* 06F38C 8006E78C 15090008 */ bne $t0, $t1, .L8006E7B0 -/* 06F390 8006E790 01203025 */ move $a2, $t1 -/* 06F394 8006E794 0C01B51D */ jal func_8006D474 -/* 06F398 8006E798 AFA40018 */ sw $a0, 0x18($sp) -/* 06F39C 8006E79C 10000004 */ b .L8006E7B0 -/* 06F3A0 8006E7A0 8FA40018 */ lw $a0, 0x18($sp) -.L8006E7A4: -/* 06F3A4 8006E7A4 0C01B51D */ jal func_8006D474 -/* 06F3A8 8006E7A8 AFA40018 */ sw $a0, 0x18($sp) -/* 06F3AC 8006E7AC 8FA40018 */ lw $a0, 0x18($sp) -.L8006E7B0: -/* 06F3B0 8006E7B0 83A5001F */ lb $a1, 0x1f($sp) -/* 06F3B4 8006E7B4 0C01B715 */ jal func_8006DC54 -/* 06F3B8 8006E7B8 83A60023 */ lb $a2, 0x23($sp) -/* 06F3BC 8006E7BC 8FBF0014 */ lw $ra, 0x14($sp) -.L8006E7C0: -/* 06F3C0 8006E7C0 27BD0018 */ addiu $sp, $sp, 0x18 -/* 06F3C4 8006E7C4 03E00008 */ jr $ra -/* 06F3C8 8006E7C8 00000000 */ nop diff --git a/asm/non_matchings/code_80057C60/func_8006E7CC.s b/asm/non_matchings/code_80057C60/func_8006E7CC.s deleted file mode 100644 index a042f7ed1..000000000 --- a/asm/non_matchings/code_80057C60/func_8006E7CC.s +++ /dev/null @@ -1,35 +0,0 @@ -glabel func_8006E7CC -/* 06F3CC 8006E7CC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 06F3D0 8006E7D0 AFBF0014 */ sw $ra, 0x14($sp) -/* 06F3D4 8006E7D4 AFA5001C */ sw $a1, 0x1c($sp) -/* 06F3D8 8006E7D8 AFA60020 */ sw $a2, 0x20($sp) -/* 06F3DC 8006E7DC 94880000 */ lhu $t0, ($a0) -/* 06F3E0 8006E7E0 00057600 */ sll $t6, $a1, 0x18 -/* 06F3E4 8006E7E4 0006C600 */ sll $t8, $a2, 0x18 -/* 06F3E8 8006E7E8 0018CE03 */ sra $t9, $t8, 0x18 -/* 06F3EC 8006E7EC 000E7E03 */ sra $t7, $t6, 0x18 -/* 06F3F0 8006E7F0 34018000 */ li $at, 32768 -/* 06F3F4 8006E7F4 31098000 */ andi $t1, $t0, 0x8000 -/* 06F3F8 8006E7F8 01E02825 */ move $a1, $t7 -/* 06F3FC 8006E7FC 1521000E */ bne $t1, $at, .L8006E838 -/* 06F400 8006E800 03203025 */ move $a2, $t9 -/* 06F404 8006E804 8C8A00BC */ lw $t2, 0xbc($a0) -/* 06F408 8006E808 3C028000 */ lui $v0, 0x8000 -/* 06F40C 8006E80C 01425824 */ and $t3, $t2, $v0 -/* 06F410 8006E810 144B0007 */ bne $v0, $t3, .L8006E830 -/* 06F414 8006E814 00000000 */ nop -/* 06F418 8006E818 55F90008 */ bnel $t7, $t9, .L8006E83C -/* 06F41C 8006E81C 8FBF0014 */ lw $ra, 0x14($sp) -/* 06F420 8006E820 0C01B74F */ jal func_8006DD3C -/* 06F424 8006E824 00000000 */ nop -/* 06F428 8006E828 10000004 */ b .L8006E83C -/* 06F42C 8006E82C 8FBF0014 */ lw $ra, 0x14($sp) -.L8006E830: -/* 06F430 8006E830 0C01B74F */ jal func_8006DD3C -/* 06F434 8006E834 00000000 */ nop -.L8006E838: -/* 06F438 8006E838 8FBF0014 */ lw $ra, 0x14($sp) -.L8006E83C: -/* 06F43C 8006E83C 27BD0018 */ addiu $sp, $sp, 0x18 -/* 06F440 8006E840 03E00008 */ jr $ra -/* 06F444 8006E844 00000000 */ nop diff --git a/asm/non_matchings/code_80057C60/func_8006E848.s b/asm/non_matchings/code_80057C60/func_8006E848.s deleted file mode 100644 index 3f1675d04..000000000 --- a/asm/non_matchings/code_80057C60/func_8006E848.s +++ /dev/null @@ -1,35 +0,0 @@ -glabel func_8006E848 -/* 06F448 8006E848 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 06F44C 8006E84C AFBF0014 */ sw $ra, 0x14($sp) -/* 06F450 8006E850 AFA5001C */ sw $a1, 0x1c($sp) -/* 06F454 8006E854 AFA60020 */ sw $a2, 0x20($sp) -/* 06F458 8006E858 94880000 */ lhu $t0, ($a0) -/* 06F45C 8006E85C 00057600 */ sll $t6, $a1, 0x18 -/* 06F460 8006E860 0006C600 */ sll $t8, $a2, 0x18 -/* 06F464 8006E864 0018CE03 */ sra $t9, $t8, 0x18 -/* 06F468 8006E868 000E7E03 */ sra $t7, $t6, 0x18 -/* 06F46C 8006E86C 34018000 */ li $at, 32768 -/* 06F470 8006E870 31098000 */ andi $t1, $t0, 0x8000 -/* 06F474 8006E874 01E02825 */ move $a1, $t7 -/* 06F478 8006E878 1521000E */ bne $t1, $at, .L8006E8B4 -/* 06F47C 8006E87C 03203025 */ move $a2, $t9 -/* 06F480 8006E880 8C8A00BC */ lw $t2, 0xbc($a0) -/* 06F484 8006E884 3C028000 */ lui $v0, 0x8000 -/* 06F488 8006E888 01425824 */ and $t3, $t2, $v0 -/* 06F48C 8006E88C 144B0007 */ bne $v0, $t3, .L8006E8AC -/* 06F490 8006E890 00000000 */ nop -/* 06F494 8006E894 55F90008 */ bnel $t7, $t9, .L8006E8B8 -/* 06F498 8006E898 8FBF0014 */ lw $ra, 0x14($sp) -/* 06F49C 8006E89C 0C01B74F */ jal func_8006DD3C -/* 06F4A0 8006E8A0 00000000 */ nop -/* 06F4A4 8006E8A4 10000004 */ b .L8006E8B8 -/* 06F4A8 8006E8A8 8FBF0014 */ lw $ra, 0x14($sp) -.L8006E8AC: -/* 06F4AC 8006E8AC 0C01B74F */ jal func_8006DD3C -/* 06F4B0 8006E8B0 00000000 */ nop -.L8006E8B4: -/* 06F4B4 8006E8B4 8FBF0014 */ lw $ra, 0x14($sp) -.L8006E8B8: -/* 06F4B8 8006E8B8 27BD0018 */ addiu $sp, $sp, 0x18 -/* 06F4BC 8006E8BC 03E00008 */ jr $ra -/* 06F4C0 8006E8C0 00000000 */ nop diff --git a/asm/non_matchings/code_80057C60/func_8006E8C4.s b/asm/non_matchings/code_80057C60/func_8006E8C4.s deleted file mode 100644 index 31ff235d9..000000000 --- a/asm/non_matchings/code_80057C60/func_8006E8C4.s +++ /dev/null @@ -1,35 +0,0 @@ -glabel func_8006E8C4 -/* 06F4C4 8006E8C4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 06F4C8 8006E8C8 AFBF0014 */ sw $ra, 0x14($sp) -/* 06F4CC 8006E8CC AFA5001C */ sw $a1, 0x1c($sp) -/* 06F4D0 8006E8D0 AFA60020 */ sw $a2, 0x20($sp) -/* 06F4D4 8006E8D4 94880000 */ lhu $t0, ($a0) -/* 06F4D8 8006E8D8 00057600 */ sll $t6, $a1, 0x18 -/* 06F4DC 8006E8DC 0006C600 */ sll $t8, $a2, 0x18 -/* 06F4E0 8006E8E0 0018CE03 */ sra $t9, $t8, 0x18 -/* 06F4E4 8006E8E4 000E7E03 */ sra $t7, $t6, 0x18 -/* 06F4E8 8006E8E8 34018000 */ li $at, 32768 -/* 06F4EC 8006E8EC 31098000 */ andi $t1, $t0, 0x8000 -/* 06F4F0 8006E8F0 01E02825 */ move $a1, $t7 -/* 06F4F4 8006E8F4 1521000E */ bne $t1, $at, .L8006E930 -/* 06F4F8 8006E8F8 03203025 */ move $a2, $t9 -/* 06F4FC 8006E8FC 8C8A00BC */ lw $t2, 0xbc($a0) -/* 06F500 8006E900 3C028000 */ lui $v0, 0x8000 -/* 06F504 8006E904 01425824 */ and $t3, $t2, $v0 -/* 06F508 8006E908 144B0007 */ bne $v0, $t3, .L8006E928 -/* 06F50C 8006E90C 00000000 */ nop -/* 06F510 8006E910 55F90008 */ bnel $t7, $t9, .L8006E934 -/* 06F514 8006E914 8FBF0014 */ lw $ra, 0x14($sp) -/* 06F518 8006E918 0C01B74F */ jal func_8006DD3C -/* 06F51C 8006E91C 00000000 */ nop -/* 06F520 8006E920 10000004 */ b .L8006E934 -/* 06F524 8006E924 8FBF0014 */ lw $ra, 0x14($sp) -.L8006E928: -/* 06F528 8006E928 0C01B74F */ jal func_8006DD3C -/* 06F52C 8006E92C 00000000 */ nop -.L8006E930: -/* 06F530 8006E930 8FBF0014 */ lw $ra, 0x14($sp) -.L8006E934: -/* 06F534 8006E934 27BD0018 */ addiu $sp, $sp, 0x18 -/* 06F538 8006E938 03E00008 */ jr $ra -/* 06F53C 8006E93C 00000000 */ nop diff --git a/asm/non_matchings/code_80057C60/func_8006E940.s b/asm/non_matchings/code_80057C60/func_8006E940.s deleted file mode 100644 index 948a61897..000000000 --- a/asm/non_matchings/code_80057C60/func_8006E940.s +++ /dev/null @@ -1,36 +0,0 @@ -glabel func_8006E940 -/* 06F540 8006E940 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 06F544 8006E944 AFBF0014 */ sw $ra, 0x14($sp) -/* 06F548 8006E948 AFA5001C */ sw $a1, 0x1c($sp) -/* 06F54C 8006E94C AFA60020 */ sw $a2, 0x20($sp) -/* 06F550 8006E950 94880000 */ lhu $t0, ($a0) -/* 06F554 8006E954 00057600 */ sll $t6, $a1, 0x18 -/* 06F558 8006E958 0006C600 */ sll $t8, $a2, 0x18 -/* 06F55C 8006E95C 0018CE03 */ sra $t9, $t8, 0x18 -/* 06F560 8006E960 000E7E03 */ sra $t7, $t6, 0x18 -/* 06F564 8006E964 34018000 */ li $at, 32768 -/* 06F568 8006E968 31098000 */ andi $t1, $t0, 0x8000 -/* 06F56C 8006E96C 01E02825 */ move $a1, $t7 -/* 06F570 8006E970 1521000E */ bne $t1, $at, .L8006E9AC -/* 06F574 8006E974 03203025 */ move $a2, $t9 -/* 06F578 8006E978 8C8A00BC */ lw $t2, 0xbc($a0) -/* 06F57C 8006E97C 3C028000 */ lui $v0, 0x8000 -/* 06F580 8006E980 01425824 */ and $t3, $t2, $v0 -/* 06F584 8006E984 144B0007 */ bne $v0, $t3, .L8006E9A4 -/* 06F588 8006E988 00000000 */ nop -/* 06F58C 8006E98C 55F90008 */ bnel $t7, $t9, .L8006E9B0 -/* 06F590 8006E990 8FBF0014 */ lw $ra, 0x14($sp) -/* 06F594 8006E994 0C01B74F */ jal func_8006DD3C -/* 06F598 8006E998 00000000 */ nop -/* 06F59C 8006E99C 10000004 */ b .L8006E9B0 -/* 06F5A0 8006E9A0 8FBF0014 */ lw $ra, 0x14($sp) -.L8006E9A4: -/* 06F5A4 8006E9A4 0C01B74F */ jal func_8006DD3C -/* 06F5A8 8006E9A8 00000000 */ nop -.L8006E9AC: -/* 06F5AC 8006E9AC 8FBF0014 */ lw $ra, 0x14($sp) -.L8006E9B0: -/* 06F5B0 8006E9B0 27BD0018 */ addiu $sp, $sp, 0x18 -/* 06F5B4 8006E9B4 03E00008 */ jr $ra -/* 06F5B8 8006E9B8 00000000 */ nop - diff --git a/include/common_structs.h b/include/common_structs.h index ca4094a29..a13aa1aa1 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -134,12 +134,40 @@ typedef struct { } Camera; typedef struct { - s16 unk_000[0x24]; + /* 0x00 */ f32 unk_000; + /* 0x04 */ f32 unk_004; + /* 0x08 */ f32 unk_008; + /* 0x0C */ f32 unk_00C; + /* 0x10 */ u16 unk_010; + /* 0x12 */ u16 unk_012; + /* 0x14 */ f32 unk_014; + /* 0x18 */ f32 unk_018; + /* 0x1C */ s16 unk_01C; + /* 0x1E */ s16 unk_01E; + /* 0x20 */ s16 unk_020; + /* 0x22 */ s16 unk_022; + /* 0x24 */ f32 unk_024; + /* 0x28 */ s16 unk_028; + /* 0x2A */ s16 unk_02A; + /* 0x2C */ s16 unk_02C; + /* 0x2E */ s16 unk_02E; + /* 0x30 */ s16 unk_030; + /* 0x32 */ s16 unk_032; + /* 0x34 */ s16 unk_034; + /* 0x36 */ s16 unk_036; + /* 0x38 */ s16 unk_038; + /* 0x3A */ s16 unk_03A; + /* 0x3C */ s16 unk_03C; + /* 0x3E */ s16 unk_03E; + /* 0x40 */ s16 unk_040; + /* 0x42 */ s16 unk_042; + /* 0x44 */ s16 unk_044; + /* 0x46 */ s16 unk_046; } UnkPlayerStruct258; // size = 0x48 typedef struct { /* 0x0000 */ u16 unk_000; - /* 0x0002 */ s16 unk_002; + /* 0x0002 */ u16 unk_002; /* 0x0004 */ s16 unk_004; // currentPosition /* 0x0006 */ u16 unk_006; /* 0x0008 */ s16 unk_008; // lapCount? diff --git a/src/code_80040E50.h b/src/code_80040E50.h index 0f5015d70..c4358ff25 100644 --- a/src/code_80040E50.h +++ b/src/code_80040E50.h @@ -8,4 +8,4 @@ void func_80041EF4(); /* This is where I'd put my static data, if I had any */ -#endif \ No newline at end of file +#endif diff --git a/src/code_80057C60.c b/src/code_80057C60.c index 54528394d..687aae3be 100644 --- a/src/code_80057C60.c +++ b/src/code_80057C60.c @@ -6,6 +6,91 @@ #include #include #include +#include "code_80040E50.h" + +void func_8001C3C4(s32); +void func_80041D34(void); +void func_8004E638(s32); +void func_8004E78C(s32); +void func_8004E800(s32); +void func_8004E998(s32); +void func_8004EB30(s32); +void func_8004EB38(s32); +void func_8004ED40(s32); +void func_8004EE54(s32); +void func_8004F020(s32); +void func_8004F3E4(s32); +void func_8004FA78(s32); +void func_80050320(void); +void func_800514BC(void); +void func_800517C8(void); +void func_80051EBC(void); +void func_80051EF8(void); +void func_80051F9C(void); +void func_80052044(void); +void func_80052080(void); +void func_80052C60(void); +void func_800532A4(s32); +void func_80054BE8(s32); +void func_80055F48(s32); +void func_80056160(s32); +void func_80059360(void); +void func_80059560(s32); +void func_80059820(s32); +void func_8005995C(void); +void func_80059D00(void); +void func_8005A14C(s32); +void func_8005A380(void); +void func_8005A3C0(void); +void func_8005A71C(void); +void func_8005A74C(void); +void func_8005A99C(void); +void func_8005AA34(void); +void func_8005B914(void); +void func_8005C360(f32); +void func_8005C728(void); +void func_8005CB60(s32, s32); +void func_8005D0FC(s32); +void func_8005D1F4(s32); +void func_80062B18(f32*, f32*, f32*, f32, f32, f32, u16, u16); +void func_80066998(Player*, s8, s16, s8); +void func_80067964(Player*, s8, s32, s8, s32); +void func_80067D3C(Player*, s8, s32, s32, f32, s32); +void func_8006801C(Player*, s8, s32, s32, f32, s32); +void func_80068310(Player*, s8, s32, s8, s32); +void func_80068724(Player*, s8, s32, s8, s32); +void func_80068AA4(Player*, s8, s32, s8, s32); +void func_80068DA0(Player*, s8, s32, s8, s32); +void func_8006A280(Player*, s8, s16, s8); +void func_800658A0(Player*, s8, s16, s8); +void func_8006B9CC(Player*, s8); +void func_8006AFD0(Player*, s16, s8, s8); +void func_8006C6AC(Player*, s16, s8, s8); +void func_8006C9B8(Player*, s16, s8, s8); +void func_8006CEC0(Player*, s16, s8, s8); +void func_8006D194(Player*, s8, s8); +void func_8006D474(Player*, s8, s8); +void func_8006DC54(Player*, s8, s8); +void func_8006DD3C(Player*, s8, s8); +void func_8006E420(Player*, s8, s8); +void func_800744CC(void); +void func_80077640(void); +void func_80078C70(s32); +void func_8007A948(s32); +void func_8007AA44(s32); +void func_8007BB9C(s32); +void func_8007C2F8(s32); +void func_80081210(void); +void func_80086604(void); +void func_80086D80(void); +void func_800892E0(s32); +void func_8008C1D8(s32*); +void func_8008C1E0(s32*, s32*); +void func_8008C204(void); +void func_802A3730(struct UnkStruct_800DC5EC*); + +f32 coss(u16); +f32 sins(u16); extern Mtx *D_80183D60; extern Vp D_802B8880; @@ -14,7 +99,6 @@ extern struct GfxPool *gGfxPool; extern s32 gPlayerCountSelection1; extern s16 gCurrentCourseId; -extern void func_802A3730(struct UnkStruct_800DC5EC*); extern struct UnkStruct_800DC5EC *D_800DC5EC; extern struct UnkStruct_800DC5EC *D_800DC5F0; extern struct UnkStruct_800DC5EC *D_800DC5F4; @@ -23,7 +107,94 @@ extern s32 D_8018D21C; extern u16 gPlayerBalloonStatus[8][3]; // 0x8018D5F0 extern s16 gPlayerBalloonCount[]; -void func_8006AFD0(s32, s32, s32, s32); +extern Player* gPlayerOneCopy; +extern u16 D_800DC5FC; +extern f64 D_800EE648; +extern f64 D_800EE650; +extern f64 D_800EE658; +extern f64 D_800EE660; +extern f64 D_800EE668; +extern f64 D_800EE670; +extern f64 D_800EE678; +extern f32 D_800EE680; +extern f32 D_800EE684; +extern f32 D_800EE688; +extern f32 D_800EE68C; +extern f64 D_800EE690; +extern f64 D_800EE698; +extern f64 D_800EE6A0; +extern f64 D_800EE6A8; +extern f64 D_800EE6B0; +extern f64 D_800EE6B8; +extern f64 D_800EE6C0; +extern f64 D_800EE6D8; +extern f64 D_800EE6E0; +extern f64 D_800EE6E8; +extern f64 D_800EE700; +extern f64 D_800EE708; +extern f64 D_800EE710; +extern f64 D_800EE718; +extern f64 D_800EE720; +extern f64 D_800EE728; +extern f64 D_800EE730; +extern f64 D_800EE738; +extern f64 D_800EE740; +extern f64 D_800EE748; +extern f64 D_800EE750; +extern f64 D_800EE758; +extern f64 D_800EE760; +extern f64 D_800EE768; +extern f64 D_800EE770; +extern f64 D_800EE778; +extern f32 D_800EE780; +extern f64 D_800EE788; +extern f64 D_800EE790; +extern f64 D_800EE798; +extern f64 D_800EE7A0; +extern f64 D_800EE7A8; +extern f32 D_800EE7B0; +extern f64 D_800EE7B8; +extern f32 D_800EE948; +extern f32 D_800EE94C; +extern s32 lapCount; +extern s32 D_80164394; +extern s32 D_80164398; +extern s32 D_8016439C; +extern s32 gPlayerPositions; +extern f32 D_801652A0[]; +extern s32 D_801655C0; +extern s32 D_801655F0; +extern s32 D_80165678; +extern s8 D_801657AE; +extern s8 D_801657D8; +extern s8 D_801657E8; +extern s8 D_8018CAE0; +extern s32 D_8018D120; +extern s32 D_8018D170; +extern s32 D_8018D178; +extern s32 D_8018D188; +extern s32 D_8018D190; +extern s32 D_8018D1A0; +extern s32 D_8018D1B4; +extern s32 D_8018D1D4; +extern s32 D_8018D1CC; +extern s32 D_8018D1FC; +extern s32 D_8018D204; +extern s32 D_8018D2A4; +extern s32 D_8018D2BC; +extern s32 D_8018D480; +extern s32 D_8018D484; +extern s32 gActiveScreenMode; +extern s32 gModeSelection; +extern s32 gPlayerCountSelection1; +extern Player* gPlayerEight; +extern Player* gPlayerFive; +extern Player* gPlayerFour; +extern Player* gPlayerOne; +extern Player* gPlayerSeven; +extern Player* gPlayerSix; +extern Player* gPlayerThree; +extern Player* gPlayerTwo; // UI Code? void func_80057C60(void) { @@ -89,7 +260,7 @@ extern u8 D_0D0076F8; extern s8 D_801657C8; extern s8 D_801657B0; void func_80057FC4(u32 arg0) { - Gfx *temp_v1; + UNUSED Gfx *temp_v1; if ((D_801657B0 != 0)) { @@ -129,7 +300,7 @@ void func_80058394(); void func_8005845C(); void func_80058090(u32 arg0) { - Gfx *temp_v1; + UNUSED Gfx *temp_v1; if (D_801657B0 != 0) { return; @@ -247,7 +418,7 @@ void func_800587A4(); /* extern */ void func_8005884C(); /* extern */ void func_80058538(u32 arg0) { - Gfx *temp_v1; + UNUSED Gfx *temp_v1; if (D_801657B0 != 0) { return; @@ -352,15 +523,15 @@ extern s8 D_80165898; void func_800588F4(s32 arg0) { switch (gCurrentCourseId) { - case 0: + case COURSE_MARIO_RACEWAY: break; - case 1: + case COURSE_CHOCO_MOUNTAIN: break; - case 2: + case COURSE_BOWSER_CASTLE: func_80053870(arg0); func_80054664(arg0); break; - case 3: + case COURSE_BANSHEE_BOARDWALK: if (D_800DC50C != CREDITS_SEQUENCE) { func_800527D8(arg0); func_80052590(arg0); @@ -368,18 +539,18 @@ void func_800588F4(s32 arg0) { func_800524B4(arg0); } break; - case 4: + case COURSE_YOSHI_VALLEY: func_80055228(arg0); if (D_800DC50C != CREDITS_SEQUENCE) { func_8005568C(arg0); } break; - case 5: + case COURSE_FRAPPE_SNOWLAND: if (D_800DC50C != CREDITS_SEQUENCE) { func_8005327C(arg0); } break; - case 6: + case COURSE_KOOPA_BEACH: if (D_800DC50C != CREDITS_SEQUENCE) { func_80055528(arg0); } @@ -392,59 +563,59 @@ void func_800588F4(s32 arg0) { func_80055380(arg0); } break; - case 7: + case COURSE_ROYAL_RACEWAY: break; - case 8: + case COURSE_LUIGI_RACEWAY: if (D_80165898 != 0) { func_80055E68(arg0); } break; - case 9: + case COURSE_MOO_MOO_FARM: if (D_800DC50C != CREDITS_SEQUENCE) { func_800550A4(arg0); } break; - case 10: + case COURSE_TOADS_TURNPIKE: break; - case 11: + case COURSE_KALAMARI_DESERT: func_800541BC(arg0); break; - case 12: + case COURSE_SHERBET_LAND: if (D_800DC50C != CREDITS_SEQUENCE) { func_80052E30(arg0); } func_8005592C(arg0); break; - case 13: + case COURSE_RAINBOW_ROAD: if (D_800DC50C != CREDITS_SEQUENCE) { func_80056188(arg0); func_80055C38(arg0); } break; - case 14: + case COURSE_WARIO_STADIUM: break; - case 15: + case COURSE_BLOCK_FORT: break; - case 16: + case COURSE_SKYSCRAPER: break; - case 17: + case COURSE_DOUBLE_DECK: break; - case 18: + case COURSE_DK_JUNGLE: if (D_800DC50C != CREDITS_SEQUENCE) { func_80054414(arg0); } break; - } + } - func_80054938(arg0); - func_80051638(arg0); + func_80054938(arg0); + func_80051638(arg0); - if (D_80165730 != 0) { - func_80053E6C(arg0); - } - if (gModeSelection == BATTLE) { - func_80056AC0(arg0); - } + if (D_80165730 != 0) { + func_80053E6C(arg0); + } + if (gModeSelection == BATTLE) { + func_80056AC0(arg0); + } } extern u16 D_8015F894; @@ -826,7 +997,7 @@ extern s32 D_8018D188; void func_80059488(s32 arg0) { if ((gModeSelection != BATTLE) && (*(&D_80165800 + arg0) == 0) && (D_8018D188 != 0)) { - func_8004FA78(); + func_8004FA78(arg0); func_8004E78C(arg0); } func_8004E638(arg0); @@ -1054,7 +1225,7 @@ GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8005995C.s") #endif void func_80059A88(s32 arg0) { - func_80059820(); + func_80059820(arg0); if (D_800DC51C == 0) { func_8007A948(arg0); func_8007BB9C(arg0); @@ -1068,7 +1239,7 @@ void func_80059A88(s32 arg0) { //? func_80059A88(?); // extern //? func_8005A71C(); // extern //? func_800892E0(s32); // extern -s32 func_8008A890(struct UnkStruct8008A890*); // extern +s32 func_8008A890(Camera*); // extern //? func_8008C1D8(? *); // extern extern u16 D_800DC5FC; extern s32 D_80165678; @@ -1079,14 +1250,14 @@ extern Camera *camera1; // unused? void func_80059AC8(void) { //s32 temp_s0; - s32 temp_v0; + UNUSED s32 temp_v0; s16 *phi_s2; s32 phi_s0; if (D_800DC5FC == 0) { func_8008C1D8(&D_80165678); gRaceFrameCounter++; - phi_s2 = &D_8018CF68; + phi_s2 = (s16*) &D_8018CF68; phi_s0 = 0; //phi_s1 = 0; for (phi_s0 = 0; phi_s0 != 8; phi_s0++) { @@ -1175,110 +1346,15 @@ void func_80059C50(void) { GLOBAL_ASM("asm/non_matchings/code_80057C60/func_80059C50.s") #endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80059820(?); // extern -? func_800598D4(?); // extern -? func_8005A380(); // extern -? func_8005A3C0(); // extern -? func_8005A74C(); // extern -? func_8005A99C(); // extern -? func_8005B914(); // extern -? func_8005C360(f32); // extern -? func_8005D0FC(?); // extern -? func_8005D1F4(?); // extern -? func_800744CC(); // extern -? func_80078C70(?); // extern -? func_8007AA44(?); // extern -extern s8 D_801657AE; -extern s8 D_8018CAE0; -extern s32 D_8018D214; - void func_80059D00(void) { - s32 temp_v0; - + func_8005A99C(); func_8005A3C0(); func_8005A380(); - if (D_801657AE == 0) { - temp_v0 = gScreenModeSelection; - if (temp_v0 != 0) { - if (temp_v0 != 1) { - if (temp_v0 != 2) { - if (temp_v0 != 3) { - } else { - func_800598D4(0); - func_800598D4(1); - func_800598D4(2); - func_800598D4(3); - func_80059820(0); - func_8005D0FC(0); - if (D_800DC51C == 0) { - func_8007AA44(0); - } - func_8005D1F4(0); - func_80059820(1); - func_8005D0FC(1); - if (D_800DC51C == 0) { - func_8007AA44(1); - } - func_8005D1F4(1); - func_80059820(2); - func_8005D0FC(2); - if (D_800DC51C == 0) { - func_8007AA44(2); - } - func_8005D1F4(2); - if (gPlayerCountSelection1 == 4) { - func_80059820(3); - func_8005D0FC(3); - if ((D_800DC51C == 0) && (gPlayerCountSelection1 == 4)) { - func_8007AA44(3); - } - func_8005D1F4(3); - } - func_8005A74C(); - } - } else { - func_800598D4(0); - func_800598D4(1); - func_80059820(0); - func_8005D0FC(0); - if (D_800DC51C == 0) { - func_8007AA44(0); - } - func_80078C70(1); - func_8005D1F4(0); - func_80059820(1); - func_8005D0FC(1); - if (D_800DC51C == 0) { - func_8007AA44(1); - } - func_80078C70(2); - func_8005D1F4(1); - func_8005A74C(); - } - } else { - func_800598D4(0); - func_800598D4(1); - func_80059820(0); - func_8005D0FC(0); - if (D_800DC51C == 0) { - func_8007AA44(0); - } - func_80078C70(3); - func_8005D1F4(0); - func_80059820(1); - func_8005D0FC(1); - if (D_800DC51C == 0) { - func_8007AA44(1); - } - func_80078C70(4); - func_8005D1F4(1); - func_8005A74C(); - } - } else { + if (D_801657AE == 0) { + switch (gScreenModeSelection) { + case SCREEN_MODE_1P: func_800598D4(0); if (D_8018D214 == 0) { func_80059820(0); @@ -1298,51 +1374,96 @@ void func_80059D00(void) { func_80078C70(2); } func_8005A74C(); + break; + case SCREEN_MODE_2P_SPLITSCREEN_VERTICAL: + func_800598D4(0); + func_800598D4(1); + func_80059820(0); + func_8005D0FC(0); + if (D_800DC51C == 0) { + func_8007AA44(0); + } + func_80078C70(1); + func_8005D1F4(0); + func_80059820(1); + func_8005D0FC(1); + if (D_800DC51C == 0) { + func_8007AA44(1); + } + func_80078C70(2); + func_8005D1F4(1); + func_8005A74C(); + break; + case SCREEN_MODE_2P_SPLITSCREEN_HORIZONTAL: + func_800598D4(0); + func_800598D4(1); + func_80059820(0); + func_8005D0FC(0); + if (D_800DC51C == 0) { + func_8007AA44(0); + } + func_80078C70(3); + func_8005D1F4(0); + func_80059820(1); + func_8005D0FC(1); + if (D_800DC51C == 0) { + func_8007AA44(1); + } + func_80078C70(4); + func_8005D1F4(1); + func_8005A74C(); + break; + case SCREEN_MODE_3P_4P_SPLITSCREEN: + func_800598D4(0); + func_800598D4(1); + func_800598D4(2); + func_800598D4(3); + func_80059820(0); + func_8005D0FC(0); + if (D_800DC51C == 0) { + func_8007AA44(0); + } + func_8005D1F4(0); + func_80059820(1); + func_8005D0FC(1); + if (D_800DC51C == 0) { + func_8007AA44(1); + } + func_8005D1F4(1); + func_80059820(2); + func_8005D0FC(2); + if (D_800DC51C == 0) { + func_8007AA44(2); + } + func_8005D1F4(2); + if (gPlayerCountSelection1 == 4) { + func_80059820(3); + func_8005D0FC(3); + if ((D_800DC51C == 0) && (gPlayerCountSelection1 == 4)) { + func_8007AA44(3); + } + func_8005D1F4(3); + } + func_8005A74C(); + break; } func_800744CC(); } } -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_80059D00.s") -#endif - -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80041D34(); // extern -? func_80059820(?); // extern -? func_80059D00(); // extern -? func_8005A74C(); // extern -? func_8005C728(); // extern -? func_80077640(); // extern -? func_80078C70(?); // extern -? func_8007C2F8(?); // extern -? func_80086604(); // extern -? func_80086D80(); // extern -? func_8008C1D8(? *); // extern -? func_8008C1E0(? *, ? *); // extern -? func_8008C204(); // extern -extern u16 D_800DC5FC; -extern s32 D_801655C0; -extern ? D_801655F0; -extern ? D_80165678; -extern s32 D_8018D120; void func_8005A070(void) { - s32 temp_v0; - func_8008C1D8(&D_80165678); D_8018D120 = 0; D_801655C0 = 0; func_80041D34(); if (D_800DC5FC == 0) { func_8005C728(); - temp_v0 = D_800DC50C; - if (temp_v0 == 5) { + if (D_800DC50C == ENDING_SEQUENCE) { func_80086604(); func_80086D80(); func_8007C2F8(1); func_80077640(); - } else if (temp_v0 == 9) { + } else if (D_800DC50C == CREDITS_SEQUENCE) { func_80059820(0); func_80078C70(0); func_8005A74C(); @@ -1353,9 +1474,6 @@ void func_8005A070(void) { func_8008C204(); func_8008C1E0(&D_80165678, &D_801655F0); } -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8005A070.s") -#endif #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 @@ -1441,24 +1559,12 @@ block_5: GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8005A14C.s") #endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8005A14C(s32); // extern - void func_8005A380(void) { s32 temp_s0; - s32 phi_s0; - - phi_s0 = 0; - do { - func_8005A14C(phi_s0); - temp_s0 = phi_s0 + 1; - phi_s0 = temp_s0; - } while (temp_s0 != 8); + for (temp_s0 = 0; temp_s0 < 8; ++temp_s0) { + func_8005A14C(temp_s0); + } } -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8005A380.s") -#endif #ifdef MIPS_TO_C //generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909 @@ -1564,18 +1670,11 @@ void func_8005A3C0(s32 arg2) { GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8005A3C0.s") #endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80081210(); // extern - void func_8005A71C(void) { if (gCurrentCourseId == 2) { func_80081210(); } } -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8005A71C.s") -#endif #ifdef MIPS_TO_C //generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909 @@ -1688,150 +1787,69 @@ void func_8005A74C(void) { GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8005A74C.s") #endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8005AA34(); // extern -extern s8 D_801657E8; -extern s32 D_8018D170; -extern s32 D_8018D178; -extern s32 D_8018D188; -extern s32 D_8018D190; -extern s32 D_8018D204; - void func_8005A99C(void) { - s32 temp_v0; - s32 temp_v0_2; - s32 phi_v0; - if (D_8018D170 == 0) { - temp_v0 = D_8018D178; - if (temp_v0 == 0) { - temp_v0_2 = gPlayerCountSelection1; - phi_v0 = temp_v0_2; - if (temp_v0_2 == 1) { + if (D_8018D178 == 0) { + if (gPlayerCountSelection1 == 1) { func_8005AA34(); - phi_v0 = gPlayerCountSelection1; } - if (phi_v0 == 3) { + if (gPlayerCountSelection1 == 3) { D_801657E8 = 1; } - D_8018D188 = 1; - D_8018D170 = 1; - D_8018D190 = 1; + D_8018D188 = (s32) 1; + D_8018D170 = (s32) 1; + D_8018D190 = (s32) 1; D_8018D204 = 0; return; } - D_8018D178 = temp_v0 - 1; - // Duplicate return node #8. Try simplifying control flow for better match + --D_8018D178; } } -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8005A99C.s") -#endif - -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern s32 D_8018D1A0; -extern s32 D_8018D1CC; void func_8005AA34(void) { D_8018D1CC = 1; D_8018D1A0 = 0; } -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8005AA34.s") -#endif - -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern s32 D_8018D1A0; -extern s32 D_8018D1CC; void func_8005AA4C(void) { - D_8018D1CC = D_8018D1CC + 1; + ++D_8018D1CC; D_8018D1A0 = 0; } -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8005AA4C.s") -#endif - -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern s32 D_8018D1A0; -extern s32 D_8018D1CC; void func_8005AA6C(s32 arg0) { D_8018D1CC = arg0; D_8018D1A0 = 0; } -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8005AA6C.s") -#endif - -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern s32 D_8018D1A0; -extern s32 D_8018D1CC; void func_8005AA80(void) { D_8018D1CC = 0; D_8018D1A0 = 0; } -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8005AA80.s") -#endif - -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8005AA4C(); // extern -extern s32 D_8018D1A0; -extern s32 D_8018D1D4; void func_8005AA94(s32 arg0) { - s32 temp_t9; - if (D_8018D1A0 == 0) { D_8018D1D4 = arg0; D_8018D1A0 = 1; } - temp_t9 = D_8018D1D4 - 1; - D_8018D1D4 = temp_t9; - if (temp_t9 < 0) { + + --D_8018D1D4; + if (D_8018D1D4 < 0) { D_8018D1A0 = 0; func_8005AA4C(); } } -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8005AA94.s") -#endif - -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8005AA4C(); // extern -extern s32 D_8018D1A0; -extern s32 D_8018D1B4; void func_8005AAF0(void) { D_8018D1B4 = 1; D_8018D1A0 = 0; func_8005AA4C(); } -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8005AAF0.s") -#endif - -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8005AA6C(?); // extern void func_8005AB20(void) { - if ((gModeSelection == GRAND_PRIX) && (gPlayerCountSelection1 == 1)) { + if ((gModeSelection == 0) && (gPlayerCountSelection1 == 1)) { func_8005AA6C(0x14); } } -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8005AB20.s") -#endif #ifdef MIPS_TO_C //generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909 @@ -2707,31 +2725,25 @@ void func_8005C674(s8 arg0, s16 *arg1, s16 *arg2, s16 *arg3) { GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8005C674.s") #endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -void func_8005C6B4(s8 arg0, s16 *arg1, s16 *arg2, s16 *arg3) { - if (arg0 != 0) { - if (arg0 != 1) { - if (arg0 != 2) { - return; - } - *arg1 = 0x40; - *arg2 = 0x40; - *arg3 = 0xFF; - return; - } +void func_8005C6B4(s8 arg0, s16* arg1, s16* arg2, s16* arg3) { + switch (arg0) { + case 0: + *arg1 = 0xFF; + *arg2 = 0x40; + *arg3 = 0x40; + break; + case 1: *arg1 = 0xFF; *arg2 = 0xFF; *arg3 = 0x40; - return; + break; + case 2: + *arg1 = 0x40; + *arg2 = 0x40; + *arg3 = 0xFF; + break; } - *arg1 = 0xFF; - *arg2 = 0x40; - *arg3 = 0x40; } -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8005C6B4.s") -#endif #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 @@ -3153,61 +3165,37 @@ void func_8005CB60(s32 arg0, s32 arg1) { GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8005CB60.s") #endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8005CB60(s32); // extern -extern s32 D_80164394; -extern s32 D_80164398; -extern s32 D_8016439C; -extern s32 lapCount; - void func_8005D0FC(s32 arg0) { if (gModeSelection != BATTLE) { - if (arg0 != 0) { - if (arg0 != 1) { - if (arg0 != 2) { - if (arg0 != 3) { - return; - } - func_8005CB60(D_8016439C); - // Duplicate return node #10. Try simplifying control flow for better match - return; - } - func_8005CB60(D_80164398); - return; - } - func_8005CB60(D_80164394); - return; + switch (arg0) { /* irregular */ + case 0: + func_8005CB60(arg0, lapCount); + break; + case 1: + func_8005CB60(arg0, D_80164394); + break; + case 2: + func_8005CB60(arg0, D_80164398); + break; + case 3: + func_8005CB60(arg0, D_8016439C); + break; } - func_8005CB60(lapCount); } } -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8005D0FC.s") -#endif - -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern s8 D_801657D8; -extern s32 D_8018D1FC; -extern s32 D_8018D2A4; -extern s32 D_8018D2BC; void func_8005D18C(void) { - if ((gModeSelection == GRAND_PRIX) && (gPlayerCountSelection1 == 1)) { + if ((gModeSelection == GRAND_PRIX) && (gPlayerCountSelection1 == TIME_TRIALS)) { D_801657D8 = 1; D_8018D2BC = 0; D_8018D2A4 = 0; - if (*gPlayerPositions >= 4) { + if (gPlayerPositions >= 4) { D_8018D1FC = 1; D_8018D2A4 = 1; D_8018D2BC = 1; } } } -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8005D18C.s") -#endif #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 @@ -6014,371 +6002,292 @@ void func_80062C74(void *arg0, s16 arg1, ? arg2, ? arg3) { GLOBAL_ASM("asm/non_matchings/code_80057C60/func_80062C74.s") #endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern f64 D_800EE648; - -void func_80062F98(void *arg0, s16 arg1, s8 arg2, ? arg3) { +void func_80062F98(Player* arg0, s16 arg1, s8 arg2, UNUSED s8 arg3) { f32 temp_f0; - void *temp_v0; - - temp_v0 = arg0 + (arg1 * 0x48); - temp_f0 = temp_v0->unk540 / 10.0f; - temp_v0->unk546 = temp_v0->unk546 + 1; - temp_v0->unk52C = temp_v0->unk52C + temp_f0; - if ((arg0->unkCA & 1) == 1) { - temp_v0->unk52C = temp_v0->unk52C + (temp_f0 + D_800EE648); - if ((temp_v0->unk546 == 0x10) || ((D_801652A0[arg2] - temp_v0->unk52C) < 3.0f)) { - temp_v0->unk544 = 0; - temp_v0->unk546 = 0; - temp_v0->unk53A = 0; - return; + + temp_f0 = arg0->unk_258[10 + arg1].unk_018 / 10.0f; + ++arg0->unk_258[10 + arg1].unk_01E; + arg0->unk_258[10 + arg1].unk_004 += temp_f0; + if ((arg0->unk_0CA & 1) == 1) { + arg0->unk_258[10 + arg1].unk_004 += (temp_f0 + D_800EE648); + if ((arg0->unk_258[10 + arg1].unk_01E == 0x10) || ((D_801652A0[arg2] - arg0->unk_258[10 + arg1].unk_004) < 3.0f)) { + arg0->unk_258[10 + arg1].unk_01C = 0; + arg0->unk_258[10 + arg1].unk_01E = 0; + arg0->unk_258[10 + arg1].unk_012 = 0; } - // Duplicate return node #7. Try simplifying control flow for better match - return; - } - if ((temp_v0->unk546 == 0xA) || ((D_801652A0[arg2] - temp_v0->unk52C) < 3.0f)) { - temp_v0->unk544 = 0; - temp_v0->unk546 = 0; - temp_v0->unk53A = 0; + } else if ((arg0->unk_258[10 + arg1].unk_01E == 0xA) || ((D_801652A0[arg2] - arg0->unk_258[10 + arg1].unk_004) < 3.0f)) { + arg0->unk_258[10 + arg1].unk_01C = 0; + arg0->unk_258[10 + arg1].unk_01E = 0; + arg0->unk_258[10 + arg1].unk_012 = 0; } } -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_80062F98.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -f32 sins(u16); // extern -f32 coss(u16); // extern -extern f64 D_800EE650; -extern f64 D_800EE658; - -void func_800630C0(void *arg0, s16 arg1, s8 arg2, ? arg3) { - void *sp1C; - void *temp_v0; - - temp_v0 = arg0 + (arg1 * 0x48); - temp_v0->unk276 = temp_v0->unk276 + 1; - sp1C = temp_v0; - temp_v0->unk260 = (coss(temp_v0->unk278) * D_800EE650) + arg0->unk1C; - temp_v0->unk258 = (sins(temp_v0->unk278) * D_800EE658) + arg0->unk14; - temp_v0->unk25C = D_801652A0[arg2]; - if (temp_v0->unk276 == 0xF) { - temp_v0->unk274 = 0; - temp_v0->unk276 = 0; - temp_v0->unk26A = 0; +void func_800630C0(Player* arg0, s16 arg1, s8 arg2, UNUSED s8 arg3) { + ++arg0->unk_258[arg1].unk_01E; + arg0->unk_258[arg1].unk_008 = coss(arg0->unk_258[arg1].unk_020) * D_800EE650 + arg0->posZ; + arg0->unk_258[arg1].unk_000 = sins(arg0->unk_258[arg1].unk_020) * D_800EE658 + arg0->posX; + arg0->unk_258[arg1].unk_004 = D_801652A0[arg2]; + if (arg0->unk_258[arg1].unk_01E == 15) { + arg0->unk_258[arg1].unk_01C = 0; + arg0->unk_258[arg1].unk_01E = 0; + arg0->unk_258[arg1].unk_012 = 0; } } -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_800630C0.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -void func_800631A8(s32 arg0, s16 arg1, ? arg2, ? arg3) { - s16 temp_v1; - void *temp_v0; - - temp_v0 = arg0 + (arg1 * 0x48); - temp_v0->unk276 = temp_v0->unk276 + 1; - temp_v1 = temp_v0->unk276; - if (temp_v1 < 9) { - if ((temp_v1 & 1) != 0) { - temp_v0->unk290 = 8; +void func_800631A8(Player* arg0, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3) { + ++arg0->unk_258[arg1].unk_01E; + if ((s32) arg0->unk_258[arg1].unk_01E < 9) { + if ((arg0->unk_258[arg1].unk_01E & 1) != 0) { + arg0->unk_258[arg1].unk_038 = 8; } else { - goto block_10; + arg0->unk_258[arg1].unk_038 = 0; } - } else if (((temp_v1 & 1) != 0) || ((temp_v1 >= 9) && (temp_v1 < 0xC))) { - temp_v0->unk290 = 0xFF; - } else if ((temp_v1 & 2) != 0) { - temp_v0->unk290 = 8; + } else if (((arg0->unk_258[arg1].unk_01E & 1) != 0) || ((arg0->unk_258[arg1].unk_01E >= 9) && (arg0->unk_258[arg1].unk_01E < 12))) { + arg0->unk_258[arg1].unk_038 = 0xFF; + } else if ((arg0->unk_258[arg1].unk_01E & 2) != 0) { + arg0->unk_258[arg1].unk_038 = 8; } else { -block_10: - temp_v0->unk290 = 0; + arg0->unk_258[arg1].unk_038 = 0; } - temp_v0->unk292 = 0; - temp_v0->unk294 = 0; - if (temp_v0->unk276 >= 0x19) { - temp_v0->unk274 = 0; - temp_v0->unk276 = 0; - temp_v0->unk26A = 0; + arg0->unk_258[arg1].unk_03A = 0; + arg0->unk_258[arg1].unk_03C = 0; + if ((s32) arg0->unk_258[arg1].unk_01E >= 0x19) { + arg0->unk_258[arg1].unk_01C = 0; + arg0->unk_258[arg1].unk_01E = 0; + arg0->unk_258[arg1].unk_012 = 0; } } -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_800631A8.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -f32 sins(s32); // extern -f32 coss(s32, void *); // extern -extern f64 D_800EE660; - -void func_80063268(void *arg0, s16 arg1, ? arg2, ? arg3) { - void *sp1C; - void *temp_a2; - void *temp_v0; - - temp_v0 = arg0 + (arg1 * 0x48); - temp_a2 = arg0; - if (temp_v0->unk276 >= 0x1E) { - temp_v0->unk298 = temp_v0->unk298 + 0x1FFE; +void func_80063268(Player* arg0, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3) { + if (arg0->unk_258[arg1].unk_01E >= 0x1E) { + arg0->unk_258[arg1].unk_040 += 0x1FFE; } else { - temp_v0->unk298 = temp_v0->unk298 + 0x1554; + arg0->unk_258[arg1].unk_040 += 0x1554; } - temp_v0->unk27C = temp_v0->unk27C + 0.25; - arg0 = temp_a2; - sp1C = temp_v0; - temp_v0->unk260 = (coss((temp_v0->unk298 + temp_v0->unk278) & 0xFFFF, temp_a2) * 5.5) + arg0->unk1C; - temp_v0->unk258 = (sins((temp_v0->unk298 + temp_v0->unk278) & 0xFFFF) * 5.5) + arg0->unk14; - temp_v0->unk276 = temp_v0->unk276 + 1; - temp_v0->unk25C = temp_v0->unk27C + (arg0->unk18 - 5.0f); - temp_v0->unk296 = temp_v0->unk296 - 5; - temp_v0->unk264 = temp_v0->unk264 + D_800EE660; - if (temp_v0->unk296 <= 0) { - temp_v0->unk296 = 0; + + arg0->unk_258[arg1].unk_024 += 0.25; + arg0->unk_258[arg1].unk_008 = (coss((arg0->unk_258[arg1].unk_020 + arg0->unk_258[arg1].unk_040)) * 5.5) + arg0->posZ; + arg0->unk_258[arg1].unk_000 = (sins((arg0->unk_258[arg1].unk_020 + arg0->unk_258[arg1].unk_040)) * 5.5) + arg0->posX; + arg0->unk_258[arg1].unk_004 = (arg0->unk_258[arg1].unk_024 + (arg0->posY - 5.0f)); + ++arg0->unk_258[arg1].unk_01E; + arg0->unk_258[arg1].unk_00C += D_800EE660; + arg0->unk_258[arg1].unk_03E -= 5; + + if ((s32) arg0->unk_258[arg1].unk_03E <= 0) { + arg0->unk_258[arg1].unk_03E = 0; } - if (temp_v0->unk276 >= 0x28) { - temp_v0->unk274 = 0; - temp_v0->unk276 = 0; - temp_v0->unk26A = 0; + + if ((s32) arg0->unk_258[arg1].unk_01E >= 0x28) { + arg0->unk_258[arg1].unk_01C = 0; + arg0->unk_258[arg1].unk_01E = 0; + arg0->unk_258[arg1].unk_012 = 0; } } -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_80063268.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -f32 sins(u16); // extern -f32 coss(u16); // extern -extern f64 D_800EE668; - -void func_80063408(void *arg0, s16 arg1, ? arg2, ? arg3) { - s32 temp_v1; - void *temp_s0; - - temp_s0 = arg0 + (arg1 * 0x48); - if (temp_s0->unk538 == 1) { - temp_s0->unk530 = (coss(temp_s0->unk548) * (temp_s0->unk546 * -7)) + arg0->unk1D0; - temp_s0->unk528 = (sins(temp_s0->unk548) * (temp_s0->unk546 * -7)) + arg0->unk1C8; +void func_80063408(Player* arg0, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3) { + if (arg0->unk_258[10 + arg1].unk_010 == 1) { + arg0->unk_258[10 + arg1].unk_008 = (arg0->unk_258[10 + arg1].unk_01E * -7) * coss(arg0->unk_258[10 + arg1].unk_020) + arg0->unk_1D0; + arg0->unk_258[10 + arg1].unk_000 = (arg0->unk_258[10 + arg1].unk_01E * -7) * sins(arg0->unk_258[10 + arg1].unk_020) + arg0->unk_1C8; } else { - temp_s0->unk530 = (coss(temp_s0->unk548) * (temp_s0->unk546 * -7)) + arg0->unk1E8; - temp_s0->unk528 = (sins(temp_s0->unk548) * (temp_s0->unk546 * -7)) + arg0->unk1E0; + arg0->unk_258[10 + arg1].unk_008 = (arg0->unk_258[10 + arg1].unk_01E * -7) * coss(arg0->unk_258[10 + arg1].unk_020) + arg0->unk_1E8; + arg0->unk_258[10 + arg1].unk_000 = (arg0->unk_258[10 + arg1].unk_01E * -7) * sins(arg0->unk_258[10 + arg1].unk_020) + arg0->unk_1E0; } - temp_s0->unk546 = temp_s0->unk546 + 1; - temp_s0->unk52C = temp_s0->unk52C + 1.0f; - temp_v1 = arg0->unkBC; - if (((temp_v1 & 0x80) != 0) || ((temp_v1 & 0x40) != 0)) { - temp_s0->unk544 = 0; - temp_s0->unk546 = 0; + + ++arg0->unk_258[10 + arg1].unk_01E; + arg0->unk_258[10 + arg1].unk_004 += 1.0f; + + if (((arg0->unk_0BC & 0x80) != 0) || ((arg0->unk_0BC & 0x40) != 0)) { + arg0->unk_258[10 + arg1].unk_01C = 0; + arg0->unk_258[10 + arg1].unk_01E = 0; } - if (temp_s0->unk546 == 8) { - temp_s0->unk546 = 0; - temp_s0->unk544 = 0; - temp_s0->unk53A = 0; + + if (arg0->unk_258[10 + arg1].unk_01E == 8) { + arg0->unk_258[10 + arg1].unk_01E = 0; + arg0->unk_258[10 + arg1].unk_01C = 0; + arg0->unk_258[10 + arg1].unk_012 = 0; } - temp_s0->unk534 = temp_s0->unk534 + D_800EE668; - if (temp_s0->unk546 >= 4) { - temp_s0->unk566 = temp_s0->unk566 - 0x10; + + arg0->unk_258[10 + arg1].unk_00C += D_800EE668; + if (arg0->unk_258[10 + arg1].unk_01E >= 4) { + arg0->unk_258[10 + arg1].unk_03E -= 16; } - if (temp_s0->unk566 <= 0) { - temp_s0->unk566 = 0; + + if (arg0->unk_258[10 + arg1].unk_03E <= 0) { + arg0->unk_258[10 + arg1].unk_03E = 0; } } -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_80063408.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80062B18(f32 *, ? *, f32 *, ?, f32, f32, s32, s32); // extern -f32 sins(u16); // extern -f32 coss(u16); // extern -extern f64 D_800EE670; -extern f64 D_800EE678; - -void func_800635D4(void *arg0, s16 arg1, ? arg2, ? arg3) { +void func_800635D4(Player* arg0, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3) { f32 sp44; - ? sp40; + f32 sp40; f32 sp3C; - s32 temp_v1; - void *temp_s0; - temp_s0 = arg0 + (arg1 * 0x48); - if (temp_s0->unk538 == 1) { - if ((arg0->unkBC * 2) < 0) { - func_80062B18(&sp44, &sp40, &sp3C, 0xC0000000, 0.0f, (-temp_s0->unk546 * (arg0->unk94 / 18.0f) * 216.0f) / 16.0f, -temp_s0->unk548, arg0->unk206 * -2); - temp_s0->unk528 = arg0->unk1C8 + sp44; - temp_s0->unk530 = arg0->unk1D0 + sp3C; + if (arg0->unk_258[10 + arg1].unk_010 == 1) { + if ((arg0->unk_0BC * 2) < 0) { + func_80062B18(&sp44, &sp40, &sp3C, -2.0f, 0.0f, (-arg0->unk_258[10 + arg1].unk_01E * (arg0->unk_094 / 18.0f) * 216.0f) / 16, -arg0->unk_258[10 + arg1].unk_020, 2 * -arg0->unk_206); + arg0->unk_258[10 + arg1].unk_000 = arg0->unk_1C8 + sp44; + arg0->unk_258[10 + arg1].unk_008 = arg0->unk_1D0 + sp3C; } else { - temp_s0->unk530 = (coss(temp_s0->unk548) * ((-temp_s0->unk546 * (arg0->unk94 / 18.0f) * 216.0f) / 16.0f)) + arg0->unk1D0; - temp_s0->unk528 = (sins(temp_s0->unk548) * ((-temp_s0->unk546 * (arg0->unk94 / 18.0f) * 216.0f) / 16.0f)) + arg0->unk1C8; + arg0->unk_258[10 + arg1].unk_008 = ((-arg0->unk_258[10 + arg1].unk_01E * (arg0->unk_094 / 18.0f) * 216.0f) / 16) * coss(arg0->unk_258[10 + arg1].unk_020) + arg0->unk_1D0; + arg0->unk_258[10 + arg1].unk_000 = ((-arg0->unk_258[10 + arg1].unk_01E * (arg0->unk_094 / 18.0f) * 216.0f) / 16) * sins(arg0->unk_258[10 + arg1].unk_020) + arg0->unk_1C8; } - } else if ((arg0->unkBC * 2) < 0) { - func_80062B18(&sp44, &sp40, &sp3C, 0x40000000, 0.0f, (-temp_s0->unk546 * (arg0->unk94 / 18.0f) * 216.0f) / 16.0f, -temp_s0->unk548, arg0->unk206 * -2); - temp_s0->unk528 = arg0->unk1E0 + sp44; - temp_s0->unk530 = arg0->unk1E8 + sp3C; + } else if ((arg0->unk_0BC * 2) < 0) { + func_80062B18(&sp44, &sp40, &sp3C, 2.0f, 0.0f, (-arg0->unk_258[10 + arg1].unk_01E * (arg0->unk_094 / 18.0f) * 216.0f) / 16, - arg0->unk_258[10 + arg1].unk_020, 2 * -arg0->unk_206); + arg0->unk_258[10 + arg1].unk_000 = arg0->unk_1E0 + sp44; + arg0->unk_258[10 + arg1].unk_008 = arg0->unk_1E8 + sp3C; } else { - temp_s0->unk530 = (coss(temp_s0->unk548) * ((-temp_s0->unk546 * (arg0->unk94 / 18.0f) * 216.0f) / 16.0f)) + arg0->unk1E8; - temp_s0->unk528 = (sins(temp_s0->unk548) * ((-temp_s0->unk546 * (arg0->unk94 / 18.0f) * 216.0f) / 16.0f)) + arg0->unk1E0; + arg0->unk_258[10 + arg1].unk_008 = ((-arg0->unk_258[10 + arg1].unk_01E * (arg0->unk_094 / 18.0f) * 216.0f) / 16) * coss(arg0->unk_258[10 + arg1].unk_020) + arg0->unk_1E8; + arg0->unk_258[10 + arg1].unk_000 = ((-arg0->unk_258[10 + arg1].unk_01E * (arg0->unk_094 / 18.0f) * 216.0f) / 16) * sins(arg0->unk_258[10 + arg1].unk_020) + arg0->unk_1E0; } - temp_s0->unk546 = temp_s0->unk546 + 1; - temp_s0->unk52C = temp_s0->unk52C + D_800EE670; - temp_v1 = arg0->unkBC; - if (((temp_v1 & 0x80) != 0) || ((temp_v1 & 0x40) != 0)) { - temp_s0->unk544 = 0; - temp_s0->unk546 = 0; + + ++arg0->unk_258[10 + arg1].unk_01E; + arg0->unk_258[10 + arg1].unk_004 += D_800EE670; + if (((arg0->unk_0BC & 0x80) != 0) || ((arg0->unk_0BC & 0x40) != 0)) { + arg0->unk_258[10 + arg1].unk_01C = 0; + arg0->unk_258[10 + arg1].unk_01E = 0; } - if (temp_s0->unk546 == 8) { - temp_s0->unk544 = 0; - temp_s0->unk546 = 0; - temp_s0->unk53A = 0; + + if (arg0->unk_258[10 + arg1].unk_01E == 8) { + arg0->unk_258[10 + arg1].unk_01C = 0; + arg0->unk_258[10 + arg1].unk_01E = 0; + arg0->unk_258[10 + arg1].unk_012 = 0; } - temp_s0->unk534 = temp_s0->unk534 + D_800EE678; - if (temp_s0->unk568 == 0) { - if (temp_s0->unk546 >= 4) { - temp_s0->unk566 = temp_s0->unk566 - 0xC; + + arg0->unk_258[10 + arg1].unk_00C += D_800EE678; + if (arg0->unk_258[10 + arg1].unk_040 == 0) { + if (arg0->unk_258[10 + arg1].unk_01E >= 4) { + arg0->unk_258[10 + arg1].unk_03E -= 12; } - if (temp_s0->unk566 <= 0) { - goto block_20; + if (arg0->unk_258[10 + arg1].unk_03E <= 0) { + arg0->unk_258[10 + arg1].unk_03E = 0; } } else { - if (temp_s0->unk546 >= 4) { - temp_s0->unk566 = temp_s0->unk566 - 0x10; + if (arg0->unk_258[10 + arg1].unk_01E >= 4) { + arg0->unk_258[10 + arg1].unk_03E -= 16; } - if (temp_s0->unk566 <= 0) { -block_20: - temp_s0->unk566 = 0; + if (arg0->unk_258[10 + arg1].unk_03E <= 0) { + arg0->unk_258[10 + arg1].unk_03E = 0; } } } -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_800635D4.s") -#endif + +void func_800639DC(Player* arg0, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3) { + if (arg0->unk_258[10 + arg1].unk_010 == 1) { + arg0->unk_258[10 + arg1].unk_008 = (D_800EE680 * arg0->unk_258[10 + arg1].unk_01E) * coss(arg0->unk_258[10 + arg1].unk_020) + arg0->unk_1D0; + arg0->unk_258[10 + arg1].unk_000 = (D_800EE684 * arg0->unk_258[10 + arg1].unk_01E) * sins(arg0->unk_258[10 + arg1].unk_020) + arg0->unk_1C8; + } else { + arg0->unk_258[10 + arg1].unk_008 = (D_800EE688 * arg0->unk_258[10 + arg1].unk_01E) * coss(arg0->unk_258[10 + arg1].unk_020) + arg0->unk_1E8; + arg0->unk_258[10 + arg1].unk_000 = (D_800EE68C * arg0->unk_258[10 + arg1].unk_01E) * sins(arg0->unk_258[10 + arg1].unk_020) + arg0->unk_1E0; + } + ++arg0->unk_258[10 + arg1].unk_01E; + arg0->unk_258[10 + arg1].unk_004 += D_800EE690; + if (arg0->unk_258[10 + arg1].unk_01E == 8) { + arg0->unk_258[10 + arg1].unk_01C = 0; + arg0->unk_258[10 + arg1].unk_01E = 0; + arg0->unk_258[10 + arg1].unk_012 = 0; + } + + arg0->unk_258[10 + arg1].unk_00C += D_800EE698; + if (arg0->unk_258[10 + arg1].unk_040 == 0) { + if ((s32) arg0->unk_258[10 + arg1].unk_01E >= 4) { + --arg0->unk_258[10 + arg1].unk_03E; + } + if ((s32) arg0->unk_258[10 + arg1].unk_03E <= 0) { + arg0->unk_258[10 + arg1].unk_03E = 0; + } + } else { + if ((s32) arg0->unk_258[10 + arg1].unk_01E >= 4) { + arg0->unk_258[10 + arg1].unk_03E -= 16; + } + if ((s32) arg0->unk_258[10 + arg1].unk_03E <= 0) { + + arg0->unk_258[10 + arg1].unk_03E = 0; + } + } +} + +void func_80063BD4(Player* arg0, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3) { + if (arg0->unk_258[10 + arg1].unk_010 == 1) { + arg0->unk_258[10 + arg1].unk_008 = (-2 * arg0->unk_258[10 + arg1].unk_01E * coss(arg0->unk_258[10 + arg1].unk_020) + arg0->unk_1D0); + arg0->unk_258[10 + arg1].unk_000 = (-2 * arg0->unk_258[10 + arg1].unk_01E * sins(arg0->unk_258[10 + arg1].unk_020) + arg0->unk_1C8); + } else { + arg0->unk_258[10 + arg1].unk_008 = (-2 * arg0->unk_258[10 + arg1].unk_01E * coss(arg0->unk_258[10 + arg1].unk_020) + arg0->unk_1E8); + arg0->unk_258[10 + arg1].unk_000 = (-2 * arg0->unk_258[10 + arg1].unk_01E * sins(arg0->unk_258[10 + arg1].unk_020) + arg0->unk_1E0); + } + + ++arg0->unk_258[10 + arg1].unk_01E; + arg0->unk_258[10 + arg1].unk_004 += D_800EE6A0; + if (arg0->unk_258[10 + arg1].unk_01E == 8) { + arg0->unk_258[10 + arg1].unk_01C = 0; + arg0->unk_258[10 + arg1].unk_01E = 0; + arg0->unk_258[10 + arg1].unk_012 = 0; + } + + arg0->unk_258[10 + arg1].unk_018 = 2.0f; + arg0->unk_258[10 + arg1].unk_00C -= D_800EE6A8; +} + +void func_80063D58(Player* arg0, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3) { + if (arg0->unk_258[10 + arg1].unk_010 == 1) { + arg0->unk_258[10 + arg1].unk_008 = ((-arg0->unk_258[10 + arg1].unk_01E * (arg0->unk_094 / 18.0f) * 216.0f) / 20.0f) * coss(arg0->unk_258[10 + arg1].unk_020) + arg0->unk_1D0; + arg0->unk_258[10 + arg1].unk_000 = ((-arg0->unk_258[10 + arg1].unk_01E * (arg0->unk_094 / 18.0f) * 216.0f) / 20.0f) * sins(arg0->unk_258[10 + arg1].unk_020) + arg0->unk_1C8; + } else { + arg0->unk_258[10 + arg1].unk_008 = ((-arg0->unk_258[10 + arg1].unk_01E * (arg0->unk_094 / 18.0f) * 216.0f) / 20.0f) * coss(arg0->unk_258[10 + arg1].unk_020) + arg0->unk_1E8; + arg0->unk_258[10 + arg1].unk_000 = ((-arg0->unk_258[10 + arg1].unk_01E * (arg0->unk_094 / 18.0f) * 216.0f) / 20.0f) * sins(arg0->unk_258[10 + arg1].unk_020) + arg0->unk_1E0; + } + + ++arg0->unk_258[10 + arg1].unk_01E; + if (arg0->unk_258[10 + arg1].unk_01E == 8) { + arg0->unk_258[10 + arg1].unk_01E = 0; + arg0->unk_258[10 + arg1].unk_01C = 0; + arg0->unk_258[10 + arg1].unk_012 = 0; + } + + arg0->unk_258[10 + arg1].unk_00C += D_800EE6B0; + if (arg0->unk_258[10 + arg1].unk_01E >= 4) { + arg0->unk_258[10 + arg1].unk_03E -= 18; + arg0->unk_258[10 + arg1].unk_004 -= D_800EE6B8; + } else { + arg0->unk_258[10 + arg1].unk_004 += D_800EE6C0; + } + + if (arg0->unk_258[10 + arg1].unk_03E <= 0) { + arg0->unk_258[10 + arg1].unk_03E = 0; + } +} #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -f32 sins(u16); // extern -f32 coss(u16); // extern -extern f32 D_800EE680; -extern f32 D_800EE684; -extern f32 D_800EE688; -extern f32 D_800EE68C; -extern f64 D_800EE690; -extern f64 D_800EE698; +? func_80062B18(f32 *, f32 *, f32 *, ?, f32, f32, s32, s32); // extern -void func_800639DC(void *arg0, s16 arg1, ? arg2, ? arg3) { - void *temp_s0; +// Separated from asm in code_80057C60/func_80063D58.s +UNUSED void func_80063FBC(void *arg0, s16 arg1, ? arg2, ? arg3) { + f32 sp3C; + f32 sp38; + f32 sp34; + void *sp30; + void *temp_v0; - temp_s0 = arg0 + (arg1 * 0x48); - if (temp_s0->unk538 == 1) { - temp_s0->unk530 = (coss(temp_s0->unk548) * (D_800EE680 * temp_s0->unk546)) + arg0->unk1D0; - temp_s0->unk528 = (sins(temp_s0->unk548) * (D_800EE684 * temp_s0->unk546)) + arg0->unk1C8; + temp_v0 = arg0 + (arg1 * 0x48); + if (temp_v0->unk538 == 1) { + sp30 = temp_v0; + func_80062B18(&sp3C, &sp34, &sp38, 0x40400000, 0.0f, (f32) (-5.5 - (f64) ((f32) temp_v0->unk546 * (((arg0->unk94 / 18.0f) * 216.0f) / 15.0f))), -(s32) temp_v0->unk548, 0); } else { - temp_s0->unk530 = (coss(temp_s0->unk548) * (D_800EE688 * temp_s0->unk546)) + arg0->unk1E8; - temp_s0->unk528 = (sins(temp_s0->unk548) * (D_800EE68C * temp_s0->unk546)) + arg0->unk1E0; + sp30 = temp_v0; + func_80062B18(&sp3C, &sp34, &sp38, 0xC0400000, 0.0f, (f32) (-5.5 - (f64) ((f32) temp_v0->unk546 * (((arg0->unk94 / 18.0f) * 216.0f) / 15.0f))), -(s32) temp_v0->unk548, 0); } - temp_s0->unk546 = temp_s0->unk546 + 1; - temp_s0->unk52C = temp_s0->unk52C + D_800EE690; - if (temp_s0->unk546 == 8) { - temp_s0->unk544 = 0; - temp_s0->unk546 = 0; - temp_s0->unk53A = 0; - } - temp_s0->unk534 = temp_s0->unk534 + D_800EE698; - if (temp_s0->unk568 == 0) { - if (temp_s0->unk546 >= 4) { - temp_s0->unk566 = temp_s0->unk566 - 1; - } - if (temp_s0->unk566 <= 0) { - goto block_13; - } - } else { - if (temp_s0->unk546 >= 4) { - temp_s0->unk566 = temp_s0->unk566 - 0x10; - } - if (temp_s0->unk566 <= 0) { -block_13: - temp_s0->unk566 = 0; - } + sp30->unk528 = (f32) (arg0->unk14 + sp3C); + sp30->unk530 = (f32) (arg0->unk1C + sp38); + sp30->unk546 = (s16) (sp30->unk546 + 1); + sp30->unk52C = (f32) ((arg0->unk18 - arg0->unk70) + sp34); + if (sp30->unk546 == 6) { + sp30->unk544 = 0; + sp30->unk546 = 0; + sp30->unk53A = 0; } } #else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_800639DC.s") -#endif - -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -f32 sins(u16); // extern -f32 coss(u16); // extern -extern f64 D_800EE6A0; -extern f64 D_800EE6A8; - -void func_80063BD4(void *arg0, s16 arg1, ? arg2, ? arg3) { - void *temp_s0; - - temp_s0 = arg0 + (arg1 * 0x48); - if (temp_s0->unk538 == 1) { - temp_s0->unk530 = (coss(temp_s0->unk548) * (temp_s0->unk546 * -2)) + arg0->unk1D0; - temp_s0->unk528 = (sins(temp_s0->unk548) * (temp_s0->unk546 * -2)) + arg0->unk1C8; - } else { - temp_s0->unk530 = (coss(temp_s0->unk548) * (temp_s0->unk546 * -2)) + arg0->unk1E8; - temp_s0->unk528 = (sins(temp_s0->unk548) * (temp_s0->unk546 * -2)) + arg0->unk1E0; - } - temp_s0->unk546 = temp_s0->unk546 + 1; - temp_s0->unk52C = temp_s0->unk52C + D_800EE6A0; - if (temp_s0->unk546 == 8) { - temp_s0->unk544 = 0; - temp_s0->unk546 = 0; - temp_s0->unk53A = 0; - } - temp_s0->unk540 = 2.0f; - temp_s0->unk534 = temp_s0->unk534 - D_800EE6A8; -} -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_80063BD4.s") -#endif - -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -f32 sins(u16); // extern -f32 coss(u16); // extern -extern f64 D_800EE6B0; -extern f64 D_800EE6B8; -extern f64 D_800EE6C0; - -void func_80063D58(void *arg0, s16 arg1, ? arg2, ? arg3) { - void *temp_s0; - - temp_s0 = arg0 + (arg1 * 0x48); - if (temp_s0->unk538 == 1) { - temp_s0->unk530 = (coss(temp_s0->unk548) * ((-temp_s0->unk546 * (arg0->unk94 / 18.0f) * 216.0f) / 20.0f)) + arg0->unk1D0; - temp_s0->unk528 = (sins(temp_s0->unk548) * ((-temp_s0->unk546 * (arg0->unk94 / 18.0f) * 216.0f) / 20.0f)) + arg0->unk1C8; - } else { - temp_s0->unk530 = (coss(temp_s0->unk548) * ((-temp_s0->unk546 * (arg0->unk94 / 18.0f) * 216.0f) / 20.0f)) + arg0->unk1E8; - temp_s0->unk528 = (sins(temp_s0->unk548) * ((-temp_s0->unk546 * (arg0->unk94 / 18.0f) * 216.0f) / 20.0f)) + arg0->unk1E0; - } - temp_s0->unk546 = temp_s0->unk546 + 1; - if (temp_s0->unk546 == 8) { - temp_s0->unk546 = 0; - temp_s0->unk544 = 0; - temp_s0->unk53A = 0; - } - temp_s0->unk534 = temp_s0->unk534 + D_800EE6B0; - if (temp_s0->unk546 >= 4) { - temp_s0->unk566 = temp_s0->unk566 - 0x12; - temp_s0->unk52C = temp_s0->unk52C - D_800EE6B8; - } else { - temp_s0->unk52C = temp_s0->unk52C + D_800EE6C0; - } - if (temp_s0->unk566 <= 0) { - temp_s0->unk566 = 0; - } -} -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_80063D58.s") +GLOBAL_ASM("asm/non_matchings/code_80057C60/func_80063FBC.s") #endif #ifdef MIPS_TO_C @@ -6430,44 +6339,24 @@ void func_80064184(void *arg0, s16 arg1, s8 arg2, ? arg3) { GLOBAL_ASM("asm/non_matchings/code_80057C60/func_80064184.s") #endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -f32 sins(u16); // extern -f32 coss(u16); // extern -extern f64 D_800EE6D8; -extern f64 D_800EE6E0; -extern f64 D_800EE6E8; +void func_800643A8(Player* arg0, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3) { + arg0->unk_258[10 + arg1].unk_008 = (D_800EE6D8 * arg0->unk_258[10 + arg1].unk_01E * coss(arg0->unk_258[10 + arg1].unk_020) + arg0->posZ); + arg0->unk_258[10 + arg1].unk_000 = (D_800EE6E0 * arg0->unk_258[10 + arg1].unk_01E * sins(arg0->unk_258[10 + arg1].unk_020) + arg0->posX); + arg0->unk_258[10 + arg1].unk_004 = arg0->unk_258[10 + arg1].unk_004 + 0.5; -void func_800643A8(void *arg0, s16 arg1, ? arg2, ? arg3) { - void *sp1C; - f64 temp_f18; - f64 temp_f8; - s16 temp_v1; - void *temp_v0; - - temp_v0 = arg0 + (arg1 * 0x48); - sp1C = temp_v0; - temp_v0->unk530 = (coss(temp_v0->unk548) * (D_800EE6D8 * temp_v0->unk546)) + arg0->unk1C; - temp_v1 = temp_v0->unk546; - temp_f8 = sins(temp_v0->unk548); - temp_f18 = temp_v1; - temp_v0->unk546 = temp_v1 + 1; - temp_v0->unk528 = (temp_f8 * (D_800EE6E0 * temp_f18)) + arg0->unk14; - temp_v0->unk52C = temp_v0->unk52C + 0.5; - if (temp_v0->unk546 == 0xA) { - temp_v0->unk544 = 0; - temp_v0->unk546 = 0; - temp_v0->unk53A = 0; + ++arg0->unk_258[10 + arg1].unk_01E; + if (arg0->unk_258[10 + arg1].unk_01E == 10) { + arg0->unk_258[10 + arg1].unk_01C = 0; + arg0->unk_258[10 + arg1].unk_01E = 0; + arg0->unk_258[10 + arg1].unk_012 = 0; } - temp_v0->unk566 = temp_v0->unk566 - 8; - temp_v0->unk534 = temp_v0->unk534 + D_800EE6E8; - if (temp_v0->unk566 <= 0) { - temp_v0->unk566 = 0; + + arg0->unk_258[10 + arg1].unk_00C += D_800EE6E8; + arg0->unk_258[10 + arg1].unk_03E -= 8; + if ( arg0->unk_258[10 + arg1].unk_03E <= 0) { + arg0->unk_258[10 + arg1].unk_03E = 0; } } -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_800643A8.s") -#endif #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 @@ -6564,385 +6453,235 @@ void func_80064664(void *arg0, s16 arg1, ? arg2, ? arg3) { GLOBAL_ASM("asm/non_matchings/code_80057C60/func_80064664.s") #endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -f32 sins(u16); // extern -f32 coss(u16); // extern -extern f64 D_800EE710; -extern f64 D_800EE718; +void func_800647C8(Player* arg0, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3) { -void func_800647C8(void *arg0, s16 arg1, ? arg2, ? arg3) { - void *sp1C; - s16 temp_v1; - void *temp_v0; + ++arg0->unk_258[30 + arg1].unk_01E; + arg0->unk_258[30 + arg1].unk_008 = ((D_800EE710 * (arg0->unk_258[30 + arg1].unk_01E)) * coss(arg0->unk_258[30 + arg1].unk_020)) + arg0->posZ; + arg0->unk_258[30 + arg1].unk_000 = ((D_800EE718 * (arg0->unk_258[30 + arg1].unk_01E)) * sins(arg0->unk_258[30 + arg1].unk_020) + arg0->posX); + arg0->unk_258[30 + arg1].unk_004 = (arg0->unk_074 + 2.0f); - temp_v0 = arg0 + (arg1 * 0x48); - temp_v0->unkAE6 = temp_v0->unkAE6 + 1; - sp1C = temp_v0; - temp_v0->unkAD0 = (coss(temp_v0->unkAE8) * (D_800EE710 * temp_v0->unkAE6)) + arg0->unk1C; - temp_v1 = temp_v0->unkAE6; - temp_v0->unkAC8 = (sins(temp_v0->unkAE8) * (D_800EE718 * temp_v1)) + arg0->unk14; - temp_v0->unkACC = arg0->unk74 + 2.0f; - if (temp_v1 == 0xE) { - temp_v0->unkAE4 = 0; - temp_v0->unkAE6 = 0; - temp_v0->unkADA = 0; + if (arg0->unk_258[30 + arg1].unk_01E == 14) { + arg0->unk_258[30 + arg1].unk_01C = 0; + arg0->unk_258[30 + arg1].unk_01E = 0; + arg0->unk_258[30 + arg1].unk_012 = 0; } - temp_v0->unkB06 = temp_v0->unkB06 - 0xC; - if (temp_v0->unkB06 <= 0) { - temp_v0->unkB06 = 0; + + arg0->unk_258[30 + arg1].unk_03E -= 12; + if (arg0->unk_258[30 + arg1].unk_03E <= 0) { + arg0->unk_258[30 + arg1].unk_03E = 0; } } -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_800647C8.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern f64 D_800EE720; -extern f64 D_800EE728; - -void func_800648E4(s32 arg0, s16 arg1, ? arg2, ? arg3) { - void *temp_v0; - - temp_v0 = arg0 + (arg1 * 0x48); - temp_v0->unkAE6 = temp_v0->unkAE6 + 1; - temp_v0->unkAD4 = temp_v0->unkAD4 - D_800EE720; - temp_v0->unkB06 = temp_v0->unkB06 - 0xC; - temp_v0->unkACC = temp_v0->unkACC + D_800EE728; - if (temp_v0->unkB06 <= 0) { - temp_v0->unkB06 = 0; +void func_800648E4(Player* arg0, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3) { + ++arg0->unk_258[30 + arg1].unk_01E; + arg0->unk_258[30 + arg1].unk_00C -= D_800EE720; + arg0->unk_258[30 + arg1].unk_004 += D_800EE728; + arg0->unk_258[30 + arg1].unk_03E -= 12; + + if (arg0->unk_258[30 + arg1].unk_03E <= 0) { + arg0->unk_258[30 + arg1].unk_03E = 0; } - if (temp_v0->unkAE6 == 0xA) { - temp_v0->unkAE4 = 0; - temp_v0->unkAE6 = 0; - temp_v0->unkADA = 0; + + if (arg0->unk_258[30 + arg1].unk_01E == 10) { + arg0->unk_258[30 + arg1].unk_01C = 0; + arg0->unk_258[30 + arg1].unk_01E = 0; + arg0->unk_258[30 + arg1].unk_012 = 0; } } -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_800648E4.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern f64 D_800EE730; +void func_80064988(Player* arg0, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3) { + ++arg0->unk_258[30 + arg1].unk_01E; + arg0->unk_258[30 + arg1].unk_004 -= D_800EE730; -void func_80064988(s32 arg0, s16 arg1, ? arg2, ? arg3) { - void *temp_v0; - - temp_v0 = arg0 + (arg1 * 0x48); - temp_v0->unkAE6 = temp_v0->unkAE6 + 1; - temp_v0->unkACC = temp_v0->unkACC - D_800EE730; - if (temp_v0->unkAE6 == 0xA) { - temp_v0->unkAE4 = 0; - temp_v0->unkAE6 = 0; - temp_v0->unkADA = 0; + if (arg0->unk_258[30 + arg1].unk_01E == 10) { + arg0->unk_258[30 + arg1].unk_01C = 0; + arg0->unk_258[30 + arg1].unk_01E = 0; + arg0->unk_258[30 + arg1].unk_012 = 0; } } -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_80064988.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -f32 sins(u16); // extern -f32 coss(u16); // extern -extern f64 D_800EE738; +void func_800649F4(Player* arg0, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3) { + f32 temp; + temp = arg0->unk_258[30 + arg1].unk_018; + + arg0->unk_258[30 + arg1].unk_008 = ((-temp * arg0->unk_258[30 + arg1].unk_01E) * (coss(arg0->unk_258[30 + arg1].unk_020) ) + arg0->unk_21C); + arg0->unk_258[30 + arg1].unk_000 = ((-temp * arg0->unk_258[30 + arg1].unk_01E) * (sins(arg0->unk_258[30 + arg1].unk_020)) + arg0->unk_218); + arg0->unk_258[30 + arg1].unk_004 = (arg0->unk_258[30 + arg1].unk_014 + arg0->posY); + arg0->unk_258[30 + arg1].unk_00C += D_800EE738; -void func_800649F4(void *arg0, s16 arg1, ? arg2, ? arg3) { - f32 sp24; - void *sp20; - f32 sp1C; - f32 temp_f2; - s16 temp_v1; - void *temp_v0; - - temp_v0 = arg0 + (arg1 * 0x48); - sp24 = temp_v0->unkAE0; - sp20 = temp_v0; - temp_f2 = -sp24; - temp_v0->unkAD0 = (coss(temp_v0->unkAE8) * (temp_f2 * temp_v0->unkAE6)) + arg0->unk21C; - sp1C = temp_f2; - temp_v1 = temp_v0->unkAE6; - temp_v0->unkAC8 = (sins(temp_v0->unkAE8) * (temp_f2 * temp_v1)) + arg0->unk218; - temp_v0->unkACC = temp_v0->unkADC + arg0->unk18; - temp_v0->unkAE6 = temp_v1 + 1; - temp_v0->unkAD4 = temp_v0->unkAD4 + D_800EE738; - if (temp_v0->unkAE6 == 0xC) { - temp_v0->unkAE6 = 0; - temp_v0->unkAE4 = 0; - temp_v0->unkADA = 0; + ++arg0->unk_258[30 + arg1].unk_01E; + if (arg0->unk_258[30 + arg1].unk_01E == 12) { + arg0->unk_258[30 + arg1].unk_01E = 0; + arg0->unk_258[30 + arg1].unk_01C = 0; + arg0->unk_258[30 + arg1].unk_012 = 0; } - if (temp_v0->unkAE6 >= 9) { - temp_v0->unkB06 = temp_v0->unkB06 - 0x10; - if (temp_v0->unkB06 <= 0) { - temp_v0->unkB06 = 0; + + if (arg0->unk_258[30 + arg1].unk_01E >= 9) { + arg0->unk_258[30 + arg1].unk_03E -= 0x10; + if (arg0->unk_258[30 + arg1].unk_03E <= 0) { + arg0->unk_258[30 + arg1].unk_03E = 0; } } } -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_800649F4.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -f32 sins(u16); // extern -f32 coss(u16); // extern -extern f64 D_800EE740; -extern f64 D_800EE748; +void func_80064B30(Player* arg0, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3) { + f32 temp; + temp = arg0->unk_258[30 + arg1].unk_018 * D_800EE740; -void func_80064B30(void *arg0, s16 arg1, ? arg2, ? arg3) { - f32 sp24; - void *sp20; - f32 sp1C; - f32 temp_f2; - s16 temp_v1; - void *temp_v0; + arg0->unk_258[30 + arg1].unk_008 = ((-temp * arg0->unk_258[30 + arg1].unk_01E) * (coss(arg0->unk_258[30 + arg1].unk_020)) + arg0->posZ); + arg0->unk_258[30 + arg1].unk_000 = ((-temp * arg0->unk_258[30 + arg1].unk_01E) * (sins(arg0->unk_258[30 + arg1].unk_020)) + arg0->posX); + arg0->unk_258[30 + arg1].unk_004 += D_800EE748; - temp_v0 = arg0 + (arg1 * 0x48); - sp24 = temp_v0->unkAE0 * D_800EE740; - sp20 = temp_v0; - temp_f2 = -sp24; - temp_v0->unkAD0 = (coss(temp_v0->unkAE8) * (temp_f2 * temp_v0->unkAE6)) + arg0->unk1C; - sp1C = temp_f2; - temp_v1 = temp_v0->unkAE6; - temp_v0->unkAC8 = (sins(temp_v0->unkAE8) * (temp_f2 * temp_v1)) + arg0->unk14; - temp_v0->unkAE6 = temp_v1 + 1; - temp_v0->unkACC = temp_v0->unkACC + D_800EE748; - if (temp_v0->unkAE6 == 0xA) { - temp_v0->unkAE6 = 0; - temp_v0->unkAE4 = 0; - temp_v0->unkADA = 0; + ++arg0->unk_258[30 + arg1].unk_01E; + if (arg0->unk_258[30 + arg1].unk_01E == 10) { + arg0->unk_258[30 + arg1].unk_01E = 0; + arg0->unk_258[30 + arg1].unk_01C = 0; + arg0->unk_258[30 + arg1].unk_012 = 0; } - temp_v0->unkB00 = temp_v0->unkB00 + 0x71C; - if (temp_v0->unkAE6 >= 6) { - temp_v0->unkB06 = temp_v0->unkB06 - 0x10; - if (temp_v0->unkB06 <= 0) { - temp_v0->unkB06 = 0; + + arg0->unk_258[30 + arg1].unk_038 += 1820; + if (arg0->unk_258[30 + arg1].unk_01E >= 6) { + arg0->unk_258[30 + arg1].unk_03E -= 16; + if (arg0->unk_258[30 + arg1].unk_03E <= 0) { + arg0->unk_258[30 + arg1].unk_03E = 0; } } } -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_80064B30.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -f32 sins(s32); // extern -f32 coss(s32, void *); // extern -extern f64 D_800EE750; +void func_80064C74(Player* arg0, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3) { -void func_80064C74(void *arg0, s16 arg1, ? arg2, ? arg3) { - void *sp1C; - s16 temp_t5; - s16 temp_t7; - void *temp_a2; - void *temp_v0; - - temp_v0 = arg0 + (arg1 * 0x48); - temp_a2 = arg0; - if (temp_v0->unkAD8 == 1) { - temp_v0->unkAE8 = temp_v0->unkAE8 + 0x888; + if (arg0->unk_258[30 + arg1].unk_010 == 1) { + arg0->unk_258[30 + arg1].unk_020 += 2184; } else { - temp_v0->unkAE8 = temp_v0->unkAE8 - 0x888; + arg0->unk_258[30 + arg1].unk_020 -= 2184; } - temp_t5 = temp_a2->unk2E; - temp_t7 = temp_a2->unkC0; - arg0 = temp_a2; - sp1C = temp_v0; - temp_v0->unkAD0 = (coss(((temp_v0->unkAE8 - temp_t5) - temp_t7) & 0xFFFF, temp_a2) * 5.0f) + arg0->unk1C; - temp_v0->unkAC8 = (sins(((temp_v0->unkAE8 - arg0->unk2E) - arg0->unkC0) & 0xFFFF) * 5.0f) + arg0->unk14; - temp_v0->unkACC = arg0->unk18 - 1.0f; - temp_v0->unkAE6 = temp_v0->unkAE6 + 1; - temp_v0->unkAD4 = temp_v0->unkAD4 + D_800EE750; - if (temp_v0->unkAE6 == 0xA) { - temp_v0->unkAE6 = 0; - temp_v0->unkAE4 = 0; - temp_v0->unkADA = 0; + + arg0->unk_258[30 + arg1].unk_008 = (coss(arg0->unk_258[30 + arg1].unk_020 - arg0->unk_02E - arg0->unk_0C0) * 5.0f) + arg0->posZ; + arg0->unk_258[30 + arg1].unk_000 = (sins(arg0->unk_258[30 + arg1].unk_020 - arg0->unk_02E - arg0->unk_0C0) * 5.0f) + arg0->posX; + arg0->unk_258[30 + arg1].unk_004 = arg0->posY - 1.0f; + arg0->unk_258[30 + arg1].unk_00C += D_800EE750; + ++arg0->unk_258[30 + arg1].unk_01E; + + if (arg0->unk_258[30 + arg1].unk_01E == 10) { + arg0->unk_258[30 + arg1].unk_01E = 0; + arg0->unk_258[30 + arg1].unk_01C = 0; + arg0->unk_258[30 + arg1].unk_012 = 0; } - if (temp_v0->unkAE6 >= 5) { - temp_v0->unkB06 = temp_v0->unkB06 - 0x14; - if (temp_v0->unkB06 <= 0) { - temp_v0->unkB06 = 0; + if (arg0->unk_258[30 + arg1].unk_01E >= 5) { + arg0->unk_258[30 + arg1].unk_03E -= 20; + if (arg0->unk_258[30 + arg1].unk_03E <= 0) { + arg0->unk_258[30 + arg1].unk_03E = 0; } } } -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_80064C74.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern f64 D_800EE758; +void func_80064DEC(Player* arg0, UNUSED s16 arg1, UNUSED s8 arg2, s8 arg3) { -void func_80064DEC(void *arg0, ? arg1, ? arg2, s8 arg3) { - void *temp_v0; - - temp_v0 = arg0 + (arg3 * 0x48); - temp_v0->unk816 = temp_v0->unk816 + 1; - temp_v0->unk7FC = arg0->unk18; - if (temp_v0->unk816 == 9) { - arg0->unkB6 = arg0->unkB6 & 0xFFBF; - temp_v0->unk814 = 0; - temp_v0->unk816 = 0; - temp_v0->unk80A = 0; + arg0->unk_258[20 + arg3].unk_004 = arg0->posY; + ++arg0->unk_258[20 + arg3].unk_01E; + + if (arg0->unk_258[20 + arg3].unk_01E == 9) { + arg0->unk_0B6 &= ~0x0040; + arg0->unk_258[20 + arg3].unk_01C = 0; + arg0->unk_258[20 + arg3].unk_01E = 0; + arg0->unk_258[20 + arg3].unk_012 = 0; } - temp_v0->unk804 = temp_v0->unk804 + D_800EE758; - if (temp_v0->unk804 >= 2.5) { - temp_v0->unk804 = 2.5f; + + arg0->unk_258[20 + arg3].unk_00C += D_800EE758; + if (arg0->unk_258[20 + arg3].unk_00C >= (f64) 2.5) { + arg0->unk_258[20 + arg3].unk_00C = 2.5f; } } -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_80064DEC.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern f64 D_800EE760; -extern f64 D_800EE768; - -void func_80064EA4(void *arg0, ? arg1, ? arg2, s8 arg3) { - void *temp_v0; - - temp_v0 = arg0 + (arg3 * 0x48); - temp_v0->unk816 = temp_v0->unk816 + 1; - if (temp_v0->unk816 < 4) { - temp_v0->unk804 = temp_v0->unk804 + D_800EE760; - if (temp_v0->unk804 >= 3.5) { - temp_v0->unk804 = 3.5f; - return; +void func_80064EA4(Player* arg0, UNUSED s16 arg1, UNUSED s8 arg2, s8 arg3) { + ++arg0->unk_258[20 + arg3].unk_01E; + if (arg0->unk_258[20 + arg3].unk_01E < 4) { + arg0->unk_258[20 + arg3].unk_00C += D_800EE760; + if (arg0->unk_258[20 + arg3].unk_00C >= 3.5) { + arg0->unk_258[20 + arg3].unk_00C = 3.5f; } - // Duplicate return node #5. Try simplifying control flow for better match - return; - } - temp_v0->unk804 = temp_v0->unk804 - D_800EE768; - if (temp_v0->unk804 <= 0.0f) { - arg0->unkB6 = arg0->unkB6 & 0xEFFF; - temp_v0->unk814 = 0; - temp_v0->unk816 = 0; - temp_v0->unk80A = 0; - } -} -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_80064EA4.s") -#endif - -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern f64 D_800EE770; -extern f64 D_800EE778; -extern f32 D_800EE780; - -void func_80064F88(void *arg0, ? arg1, ? arg2, s8 arg3) { - void *temp_v0; - - temp_v0 = arg0 + (arg3 * 0x48); - temp_v0->unk816 = temp_v0->unk816 + 1; - temp_v0->unk804 = temp_v0->unk804 + D_800EE770; - if (D_800EE778 <= temp_v0->unk804) { - temp_v0->unk804 = D_800EE780; - } - if (temp_v0->unk816 >= 0xC) { - arg0->unkB6 = arg0->unkB6 & 0xF7FF; - temp_v0->unk814 = 0; - temp_v0->unk816 = 0; - temp_v0->unk80A = 0; - } -} -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_80064F88.s") -#endif - -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern f64 D_800EE788; -extern f64 D_800EE790; - -void func_80065030(void *arg0, ? arg1, ? arg2, s8 arg3) { - void *temp_v0; - - temp_v0 = arg0 + (arg3 * 0x48); - temp_v0->unk816 = temp_v0->unk816 + 1; - temp_v0->unk7FC = temp_v0->unk7FC + D_800EE788; - temp_v0->unk804 = temp_v0->unk804 + D_800EE790; - if (temp_v0->unk804 >= 1.5) { - temp_v0->unk804 = 1.5f; - } - if (temp_v0->unk816 >= 0xC) { - arg0->unkB6 = arg0->unkB6 & 0xFEFF; - temp_v0->unk814 = 0; - temp_v0->unk816 = 0; - temp_v0->unk80A = 0; - } -} -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_80065030.s") -#endif - -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern f64 D_800EE798; - -void func_800650FC(void *arg0, ? arg1, ? arg2, s8 arg3) { - s32 temp_v1; - void *temp_v0; - - temp_v0 = arg0 + (arg3 * 0x48); - temp_v0->unk800 = arg0->unk1C; - temp_v0->unk7F8 = arg0->unk14; - temp_v0->unk7FC = arg0->unk18 + 4.0f; - if ((arg0->unkBC & 0x80) == 0x80) { - temp_v0->unk818 = temp_v0->unk818 + 0x127C; } else { - temp_v0->unk818 = temp_v0->unk818 - 0x127C; - } - temp_v1 = arg0->unkBC; - if (((temp_v1 & 0x80) != 0x80) && ((temp_v1 & 0x40) != 0x40)) { - temp_v0->unk814 = 0; - temp_v0->unk816 = 0; - temp_v0->unk80A = 0; - } - temp_v0->unk804 = temp_v0->unk804 + D_800EE798; - if (temp_v0->unk804 >= 1.5) { - temp_v0->unk804 = 1.5f; - } -} -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_800650FC.s") -#endif - -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern f64 D_800EE7A0; -extern f64 D_800EE7A8; -extern f32 D_800EE7B0; -extern f64 D_800EE7B8; - -void func_800651F4(void *arg0, ? arg1, ? arg2, s8 arg3) { - void *temp_v0; - - temp_v0 = arg0 + (arg3 * 0x48); - temp_v0->unk816 = temp_v0->unk816 + 1; - if (temp_v0->unk816 < 8) { - temp_v0->unk804 = temp_v0->unk804 + D_800EE7A0; - if (D_800EE7A8 <= temp_v0->unk804) { - temp_v0->unk804 = D_800EE7B0; - return; + arg0->unk_258[20 + arg3].unk_00C -= D_800EE768; + if (arg0->unk_258[20 + arg3].unk_00C <= 0.0f) { + arg0->unk_0B6 &= ~0x1000; + arg0->unk_258[20 + arg3].unk_01C = 0; + arg0->unk_258[20 + arg3].unk_01E = 0; + arg0->unk_258[20 + arg3].unk_012 = 0; + } + } +} + +void func_80064F88(Player* arg0, UNUSED s16 arg1, UNUSED s8 arg2, s8 arg3) { + ++arg0->unk_258[20 + arg3].unk_01E; + arg0->unk_258[20 + arg3].unk_00C += D_800EE770; + + if (D_800EE778 <= arg0->unk_258[20 + arg3].unk_00C) { + arg0->unk_258[20 + arg3].unk_00C = D_800EE780; + } + if (arg0->unk_258[20 + arg3].unk_01E >= 12) { + arg0->unk_0B6 &= ~0x0800; + arg0->unk_258[20 + arg3].unk_01C = 0; + arg0->unk_258[20 + arg3].unk_01E = 0; + arg0->unk_258[20 + arg3].unk_012 = 0; + } +} + +void func_80065030(Player* arg0, UNUSED s16 arg1, UNUSED s8 arg2, s8 arg3) { + ++arg0->unk_258[20 + arg3].unk_01E; + + arg0->unk_258[20 + arg3].unk_004 += D_800EE788; + arg0->unk_258[20 + arg3].unk_00C += D_800EE790; + if (arg0->unk_258[20 + arg3].unk_00C >= (f64) 1.5) { + arg0->unk_258[20 + arg3].unk_00C = 1.5f; + } + + if (arg0->unk_258[20 + arg3].unk_01E >= 12) { + arg0->unk_0B6 &= ~0x0100; + arg0->unk_258[20 + arg3].unk_01C = 0; + arg0->unk_258[20 + arg3].unk_01E = 0; + arg0->unk_258[20 + arg3].unk_012 = 0; + } +} + +void func_800650FC(Player* arg0, UNUSED s16 arg1, UNUSED s8 arg2, s8 arg3) { + arg0->unk_258[20 + arg3].unk_008 = (f32) arg0->posZ; + arg0->unk_258[20 + arg3].unk_000 = (f32) arg0->posX; + arg0->unk_258[20 + arg3].unk_004 = (f32) (arg0->posY + 4.0f); + if ((arg0->unk_0BC & 0x80) == 0x80) { + arg0->unk_258[20 + arg3].unk_020 += 4732; + } else { + arg0->unk_258[20 + arg3].unk_020 -= 4732; + } + + if (((arg0->unk_0BC & 0x80) != 0x80) && ((arg0->unk_0BC & 0x40) != 0x40)) { + arg0->unk_258[20 + arg3].unk_01C = 0; + arg0->unk_258[20 + arg3].unk_01E = 0; + arg0->unk_258[20 + arg3].unk_012 = 0; + } + + arg0->unk_258[20 + arg3].unk_00C += D_800EE798; + if (arg0->unk_258[20 + arg3].unk_00C >= 1.5) { + arg0->unk_258[20 + arg3].unk_00C = 1.5f; + } +} + +void func_800651F4(Player* arg0, UNUSED s16 arg1, UNUSED s8 arg2, s8 arg3) { + ++arg0->unk_258[20 + arg3].unk_01E; + if (arg0->unk_258[20 + arg3].unk_01E < 8) { + arg0->unk_258[20 + arg3].unk_00C += D_800EE7A0; + if (D_800EE7A8 <= arg0->unk_258[20 + arg3].unk_00C) { + arg0->unk_258[20 + arg3].unk_00C = D_800EE7B0; + } + } else { + arg0->unk_258[20 + arg3].unk_00C -= D_800EE7B8; + if (arg0->unk_258[20 + arg3].unk_00C <= 0.0f) { + arg0->unk_0B6 &= ~0x0020; + arg0->unk_258[20 + arg3].unk_01C = 0; + arg0->unk_258[20 + arg3].unk_01E = 0; + arg0->unk_258[20 + arg3].unk_012 = 0; } - // Duplicate return node #5. Try simplifying control flow for better match - return; - } - temp_v0->unk804 = temp_v0->unk804 - D_800EE7B8; - if (temp_v0->unk804 <= 0.0f) { - arg0->unkB6 = arg0->unkB6 & 0xFFDF; - temp_v0->unk814 = 0; - temp_v0->unk816 = 0; - temp_v0->unk80A = 0; } } -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_800651F4.s") -#endif #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 @@ -10862,7 +10601,7 @@ void func_8006B7E4(Player *player, s32 arg1) { GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8006B7E4.s") #endif -void func_8006B87C(s32 arg0, s8 playerIndex) { +void func_8006B87C(UNUSED s32 arg0, s8 playerIndex) { gPlayerBalloonStatus[playerIndex][0] = BALLOON_STATUS_GONE; gPlayerBalloonStatus[playerIndex][1] = BALLOON_STATUS_GONE; gPlayerBalloonStatus[playerIndex][2] = BALLOON_STATUS_GONE; @@ -10906,7 +10645,7 @@ void func_8006B8B4(s32 arg0, s8 playerIndex) { GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8006B8B4.s") #endif -void func_8006B974(s32 arg0, s8 playerIndex, s8 balloonIndex) { +void func_8006B974(UNUSED s32 arg0, s8 playerIndex, s8 balloonIndex) { if (gPlayerBalloonCount[playerIndex] >= 0) { gPlayerBalloonStatus[playerIndex][balloonIndex] = BALLOON_STATUS_GONE; } @@ -10940,7 +10679,7 @@ void func_8006B9CC(s32 arg0, s8 arg1) { GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8006B9CC.s") #endif -void func_8006BA94(s32 arg0, s8 playerIndex, s8 arg2) { +void func_8006BA94(Player* arg0, s8 playerIndex, s8 arg2) { if (gPlayerBalloonStatus[playerIndex][0] != BALLOON_STATUS_GONE) { func_8006AFD0(arg0, playerIndex, 0, arg2); } @@ -11749,91 +11488,63 @@ void func_8006D474(void *arg0, s8 arg1, s8 arg2) { GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8006D474.s") #endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_800658A0(void *, s8, s16, s8); // extern - -void func_8006DC54(void *arg0, s8 arg1, s8 arg2) { +void func_8006DC54(Player* arg0, s8 arg1, s8 arg2) { s16 temp_s0; s32 temp_v0; - s16 phi_s0; temp_v0 = 8 << (arg2 * 4); - if (temp_v0 == (arg0->unk2 & temp_v0)) { - phi_s0 = 0; - do { - if ((arg0 + (phi_s0 * 0x48))->unk26A == 7) { - func_800658A0(arg0, arg1, phi_s0, arg2); + if (temp_v0 == (arg0->unk_002 & temp_v0)) { + for (temp_s0 = 0; temp_s0 < 10; ++temp_s0) { + if (arg0->unk_258[temp_s0].unk_012 == 7) { + func_800658A0(arg0, arg1, temp_s0, arg2); } - temp_s0 = phi_s0 + 1; - phi_s0 = temp_s0; - } while (temp_s0 < 0xA); + } } } -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8006DC54.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909 -? func_80066998(void *, s8, s16, s8); /* extern */ -? func_80067964(void *, s8, s32, s8, s32); /* extern */ -? func_80067D3C(void *, s8, s32, ?, f32, s32); /* extern */ -? func_8006801C(void *, s8, s32, ?, f32, s32); /* extern */ -? func_80068310(void *, s8, s32, s8, s32); /* extern */ -? func_80068724(void *, s8, s32, s8, s32); /* extern */ -? func_80068AA4(void *, s8, s32, s8, s32); /* extern */ -? func_80068DA0(void *, s8, s32, s8, s32); /* extern */ -? func_8006A280(void *, s8, s16, s8); /* extern */ - -void func_8006DD3C(void *arg0, s8 arg1, s8 arg2) { +#ifdef NEEDS_RODATA +void func_8006DD3C(Player* arg0, s8 arg1, s8 arg2) { s16 temp_s0; s32 temp_v0; - u16 temp_t9; - u16 temp_v0_2; - s16 phi_s0; temp_v0 = 8 << (arg2 * 4); - if (temp_v0 == (arg0->unk2 & temp_v0)) { - phi_s0 = 0; - do { - temp_v0_2 = (arg0 + (phi_s0 * 0x48))->unk26A; - if (temp_v0_2 != 3) { - if (temp_v0_2 == 5) { - func_8006A280(arg0, arg1, phi_s0, arg2); + if (temp_v0 == (arg0->unk_002 & temp_v0)) { + for (temp_s0 = 0; temp_s0 < 10; ++temp_s0) { + temp_v0 = arg0->unk_258[temp_s0].unk_012; + if (temp_v0 != 3) { + if (temp_v0 == 5) { + func_8006A280(arg0, arg1, temp_s0, arg2); } } else if (gActiveScreenMode == 3) { if (arg2 == arg1) { - func_80066998(arg0, arg1, phi_s0, arg2); + func_80066998(arg0, arg1, temp_s0, arg2); } } else { - func_80066998(arg0, arg1, phi_s0, arg2); + func_80066998(arg0, arg1, temp_s0, arg2); } - temp_s0 = phi_s0 + 1; - phi_s0 = temp_s0; - } while (temp_s0 < 0xA); - if (((arg0->unk0 & 0x4000) == 0x4000) && (arg2 == arg1)) { - temp_t9 = arg0->unk80A; - switch (temp_t9) { + } + + if (((arg0->unk_000 & 0x4000) == 0x4000) && (arg2 == arg1)) { + switch (arg0->unk_258[20].unk_012) { case 2: - func_80068310(arg0, arg1, arg0->unk804, arg2, 0); + func_80068310(arg0, arg1, arg0->unk_258[20].unk_00C, arg2, 0); break; case 3: - func_80067964(arg0, arg1, arg0->unk804, arg2, 0); + func_80067964(arg0, arg1, arg0->unk_258[20].unk_00C, arg2, 0); break; case 4: - func_80068724(arg0, arg1, arg0->unk804, arg2, 0); + func_80068724(arg0, arg1, arg0->unk_258[20].unk_00C, arg2, 0); break; case 5: - func_80068AA4(arg0, arg1, arg0->unk804, arg2, 0); + func_80068AA4(arg0, arg1, arg0->unk_258[20].unk_00C, arg2, 0); break; case 6: - func_80068DA0(arg0, arg1, arg0->unk804, arg2, 0); + func_80068DA0(arg0, arg1, arg0->unk_258[20].unk_00C, arg2, 0); break; } - if (arg0->unk852 == 5) { - func_80067D3C(arg0, arg2, D_8018D480, 1, 1.6f, 0xFFFFFF); - func_8006801C(arg0, arg2, D_8018D484, 1, 1.6f, 0xFF); + if (arg0->unk_258[21].unk_012 == 5) { + func_80067D3C(arg0, arg2, D_8018D480, 1, D_800EE948, 0xFFFFFF); + func_8006801C(arg0, arg2, D_8018D484, 1, D_800EE94C, 0xFF); } } } @@ -11842,327 +11553,218 @@ void func_8006DD3C(void *arg0, s8 arg1, s8 arg2) { GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8006DD3C.s") #endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8006E420(Player *, ?, ?); // extern - void func_8006E058(void) { - Player *temp_a0; - Player *temp_a0_2; - Player *temp_a0_3; - s32 temp_v0; - s32 temp_v0_2; - s32 temp_v0_3; - s32 temp_v0_4; - s32 temp_v0_5; - s32 phi_v0; - - temp_v0 = gActiveScreenMode; - if (temp_v0 != 0) { - if ((temp_v0 != 1) && (temp_v0 != 2)) { - if (temp_v0 != 3) { - return; - } - temp_v0_2 = gModeSelection; - if ((temp_v0_2 == VERSUS) || (temp_v0_2 == BATTLE)) { - func_8006E420(gPlayerOne, 0, 0); - func_8006E420(gPlayerTwo, 1, 0); - func_8006E420(gPlayerThree, 2, 0); - if (gPlayerCountSelection1 == 4) { - func_8006E420(gPlayerFour, 3, 0); - } - } - // Duplicate return node #32. Try simplifying control flow for better match - return; - } - temp_v0_3 = gModeSelection; - if (temp_v0_3 != GRAND_PRIX) { - if (temp_v0_3 != TIME_TRIALS) { - if ((temp_v0_3 != VERSUS) && (temp_v0_3 != BATTLE)) { - return; - } - func_8006E420(gPlayerOne, 0, 0); - func_8006E420(gPlayerTwo, 1, 0); - return; - } - func_8006E420(gPlayerOne, 0, 0); - temp_a0 = gPlayerTwo; - if ((temp_a0->unk_000 & 0x8000) == 0x8000) { - func_8006E420(temp_a0, 1, 0); - return; - } - // Duplicate return node #32. Try simplifying control flow for better match - return; - } - func_8006E420(gPlayerOne, 0, 0); - func_8006E420(gPlayerTwo, 1, 0); - func_8006E420(gPlayerThree, 2, 0); - func_8006E420(gPlayerFour, 3, 0); - func_8006E420(gPlayerFive, 4, 0); - func_8006E420(gPlayerSix, 5, 0); - func_8006E420(gPlayerSeven, 6, 0); - func_8006E420(gPlayerEight, 7, 0); - return; - } - temp_v0_4 = gModeSelection; - if (temp_v0_4 != GRAND_PRIX) { - if (temp_v0_4 != TIME_TRIALS) { - if ((temp_v0_4 != VERSUS) && (temp_v0_4 != BATTLE)) { - return; - } + switch (gActiveScreenMode) { + case SCREEN_MODE_1P: + switch (gModeSelection) { + case GRAND_PRIX: func_8006E420(gPlayerOne, 0, 0); func_8006E420(gPlayerTwo, 1, 0); - temp_v0_5 = gPlayerCountSelection1; - phi_v0 = temp_v0_5; - if (temp_v0_5 >= 3) { + func_8006E420(gPlayerThree, 2, 0); + func_8006E420(gPlayerFour, 3, 0); + func_8006E420(gPlayerFive, 4, 0); + func_8006E420(gPlayerSix, 5, 0); + func_8006E420(gPlayerSeven, 6, 0); + func_8006E420(gPlayerEight, 7, 0); + + break; + case TIME_TRIALS: + func_8006E420(gPlayerOne, 0, 0); + + if ((gPlayerTwo->unk_000 & 0x100) == 0x100) { + func_8006E420(gPlayerTwo, 1, 0); + } + + if ((gPlayerThree->unk_000 & 0x100) == 0x100) { func_8006E420(gPlayerThree, 2, 0); - phi_v0 = gPlayerCountSelection1; + break; } - if (phi_v0 == 4) { + + break; + case VERSUS: + case BATTLE: + func_8006E420(gPlayerOne, 0, 0); + func_8006E420(gPlayerTwo, 1, 0); + + if (gPlayerCountSelection1 >= 3) { + func_8006E420(gPlayerThree, 2, 0); + } + + if (gPlayerCountSelection1 == 4) { func_8006E420(gPlayerFour, 3, 0); - return; + break; } - // Duplicate return node #32. Try simplifying control flow for better match - return; + + break; } - func_8006E420(gPlayerOne, 0, 0); - temp_a0_2 = gPlayerTwo; - if ((temp_a0_2->unk_000 & 0x100) == 0x100) { - func_8006E420(temp_a0_2, 1, 0); + + break; + case SCREEN_MODE_2P_SPLITSCREEN_HORIZONTAL: + case SCREEN_MODE_2P_SPLITSCREEN_VERTICAL: + switch (gModeSelection) { + case GRAND_PRIX: + func_8006E420(gPlayerOne, 0, 0); + func_8006E420(gPlayerTwo, 1, 0); + func_8006E420(gPlayerThree, 2, 0); + func_8006E420(gPlayerFour, 3, 0); + func_8006E420(gPlayerFive, 4, 0); + func_8006E420(gPlayerSix, 5, 0); + func_8006E420(gPlayerSeven, 6, 0); + func_8006E420(gPlayerEight, 7, 0); + + break; + case VERSUS: + case BATTLE: + func_8006E420(gPlayerOne, 0, 0); + func_8006E420(gPlayerTwo, 1, 0); + + break; + case TIME_TRIALS: + func_8006E420(gPlayerOne, 0, 0); + + if ((gPlayerTwo->unk_000 & 0x8000) == 0x8000) { + func_8006E420(gPlayerTwo, 1, 0); + break; + } + + break; } - temp_a0_3 = gPlayerThree; - if ((temp_a0_3->unk_000 & 0x100) == 0x100) { - func_8006E420(temp_a0_3, 2, 0); - return; + + break; + case SCREEN_MODE_3P_4P_SPLITSCREEN: + if ((VERSUS == gModeSelection) || (BATTLE == gModeSelection)) { + func_8006E420(gPlayerOne, 0, 0); + func_8006E420(gPlayerTwo, 1, 0); + func_8006E420(gPlayerThree, 2, 0); + + if (gPlayerCountSelection1 == 4) { + func_8006E420(gPlayerFour, 3, 0); + } } - return; + + break; } - func_8006E420(gPlayerOne, 0, 0); - func_8006E420(gPlayerTwo, 1, 0); - func_8006E420(gPlayerThree, 2, 0); - func_8006E420(gPlayerFour, 3, 0); - func_8006E420(gPlayerFive, 4, 0); - func_8006E420(gPlayerSix, 5, 0); - func_8006E420(gPlayerSeven, 6, 0); - func_8006E420(gPlayerEight, 7, 0); } -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8006E058.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8006B9CC(u16 *, s8); // extern -? func_8006C6AC(u16 *, s16, s8, s8); // extern -? func_8006C9B8(u16 *, s16, s8, s8); // extern -? func_8006CEC0(u16 *, s16, s8, s8); // extern -? func_8006D194(s8, s8); // extern - -void func_8006E420(u16 *arg0, s8 arg1, s8 arg2) { +void func_8006E420(Player* player, s8 arg1, s8 arg2) { s16 temp_s0; - u16 temp_v0; - s16 phi_s0; - temp_v0 = *arg0; - if ((temp_v0 & 0x8000) == 0x8000) { - if ((temp_v0 & 0x4000) == 0x4000) { - func_8006D194(arg1, arg2); + if ((player->unk_000 & 0x8000) == 0x8000) { + if ((player->unk_000 & 0x4000) == 0x4000) { + func_8006D194(player, arg1, arg2); } - phi_s0 = 0; - do { - func_8006CEC0(arg0, phi_s0, arg1, arg2); - if (((*arg0 & 0x4000) == 0x4000) || (D_800DC50C == ENDING_SEQUENCE)) { - func_8006C9B8(arg0, phi_s0, arg1, arg2); + + for (temp_s0 = 0; temp_s0 < 10; ++temp_s0) + { + func_8006CEC0(player, temp_s0, arg1, arg2); + if (((player->unk_000 & 0x4000) == 0x4000) || (D_800DC50C == ENDING_SEQUENCE)) { + func_8006C9B8(player, temp_s0, arg1, arg2); } - func_8006C6AC(arg0, phi_s0, arg1, arg2); - temp_s0 = phi_s0 + 1; - phi_s0 = temp_s0; - } while (temp_s0 < 0xA); + func_8006C6AC(player, temp_s0, arg1, arg2); + } + if (gModeSelection == BATTLE) { - func_8006B9CC(arg0, arg1); + func_8006B9CC(player, arg1); } } } -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8006E420.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8006D474(s8, s8); // extern -? func_8006DC54(void *, s8, s8); // extern - -void func_8006E5AC(void *arg0, s8 arg1, s8 arg2) { - if ((arg0->unk0 & 0x8000) == 0x8000) { - if ((arg0->unkBC & 0x80000000) == 0x80000000) { +void func_8006E5AC(Player* player, s8 arg1, s8 arg2) { + if ((player->unk_000 & 0x8000) == 0x8000) { + if ((player->unk_0BC & 0x80000000) == 0x80000000) { if (arg1 == arg2) { - func_8006D474(arg1, arg2); - goto block_5; + func_8006D474(player, arg1, arg2); } } else { - func_8006D474(arg1, arg2); -block_5: + func_8006D474(player, arg1, arg2); } - func_8006DC54(arg0, arg1, arg2); + func_8006DC54(player, arg1, arg2); } } -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8006E5AC.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8006D474(s8, s8); // extern -? func_8006DC54(void *, s8, s8); // extern - -void func_8006E634(void *arg0, s8 arg1, s8 arg2) { - if ((arg0->unk0 & 0x8000) == 0x8000) { - if ((arg0->unkBC & 0x80000000) == 0x80000000) { +void func_8006E634(Player* player, s8 arg1, s8 arg2) { + if ((player->unk_000 & 0x8000) == 0x8000) { + if ((player->unk_0BC & 0x80000000) == 0x80000000) { if (arg1 == arg2) { - func_8006D474(arg1, arg2); - goto block_5; + func_8006D474(player, arg1, arg2); } } else { - func_8006D474(arg1, arg2); -block_5: + func_8006D474(player, arg1, arg2); } - func_8006DC54(arg0, arg1, arg2); + func_8006DC54(player, arg1, arg2); } } -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8006E634.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8006D474(s8, s8); // extern -? func_8006DC54(void *, s8, s8); // extern - -void func_8006E6BC(void *arg0, s8 arg1, s8 arg2) { - if ((arg0->unk0 & 0x8000) == 0x8000) { - if ((arg0->unkBC & 0x80000000) == 0x80000000) { +void func_8006E6BC(Player* player, s8 arg1, s8 arg2) { + if ((player->unk_000 & 0x8000) == 0x8000) { + if ((player->unk_0BC & 0x80000000) == 0x80000000) { if (arg1 == arg2) { - func_8006D474(arg1, arg2); - goto block_5; + func_8006D474(player, arg1, arg2); } } else { - func_8006D474(arg1, arg2); -block_5: + func_8006D474(player, arg1, arg2); } - func_8006DC54(arg0, arg1, arg2); + func_8006DC54(player, arg1, arg2); } } -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8006E6BC.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8006D474(s8, s8); // extern -? func_8006DC54(void *, s8, s8); // extern - -void func_8006E744(void *arg0, s8 arg1, s8 arg2) { - if ((arg0->unk0 & 0x8000) == 0x8000) { - if ((arg0->unkBC & 0x80000000) == 0x80000000) { +void func_8006E744(Player* player, s8 arg1, s8 arg2) { + if ((player->unk_000 & 0x8000) == 0x8000) { + if ((player->unk_0BC & 0x80000000) == 0x80000000) { if (arg1 == arg2) { - func_8006D474(arg1, arg2); - goto block_5; + func_8006D474(player, arg1, arg2); } } else { - func_8006D474(arg1, arg2); -block_5: + func_8006D474(player, arg1, arg2); } - func_8006DC54(arg0, arg1, arg2); + func_8006DC54(player, arg1, arg2); } } -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8006E744.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8006DD3C(s8, s8); // extern - -void func_8006E7CC(void *arg0, s8 arg1, s8 arg2) { - if ((arg0->unk0 & 0x8000) == 0x8000) { - if ((arg0->unkBC & 0x80000000) == 0x80000000) { +void func_8006E7CC(Player* player, s8 arg1, s8 arg2) { + if ((player->unk_000 & 0x8000) == 0x8000) { + if ((player->unk_0BC & 0x80000000) == 0x80000000) { if (arg1 == arg2) { - func_8006DD3C(arg1, arg2); - return; + func_8006DD3C(player, arg1, arg2); } - // Duplicate return node #5. Try simplifying control flow for better match - return; + } else { + func_8006DD3C(player, arg1, arg2); } - func_8006DD3C(arg1, arg2); - // Duplicate return node #5. Try simplifying control flow for better match } } -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8006E7CC.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8006DD3C(s8, s8); // extern - -void func_8006E848(void *arg0, s8 arg1, s8 arg2) { - if ((arg0->unk0 & 0x8000) == 0x8000) { - if ((arg0->unkBC & 0x80000000) == 0x80000000) { +void func_8006E848(Player* player, s8 arg1, s8 arg2) { + if ((player->unk_000 & 0x8000) == 0x8000) { + if ((player->unk_0BC & 0x80000000) == 0x80000000) { if (arg1 == arg2) { - func_8006DD3C(arg1, arg2); - return; + func_8006DD3C(player, arg1, arg2); } - // Duplicate return node #5. Try simplifying control flow for better match - return; + } else { + func_8006DD3C(player, arg1, arg2); } - func_8006DD3C(arg1, arg2); - // Duplicate return node #5. Try simplifying control flow for better match } } -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8006E848.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8006DD3C(s8, s8); // extern - -void func_8006E8C4(void *arg0, s8 arg1, s8 arg2) { - if ((arg0->unk0 & 0x8000) == 0x8000) { - if ((arg0->unkBC & 0x80000000) == 0x80000000) { +void func_8006E8C4(Player* player, s8 arg1, s8 arg2) { + if ((player->unk_000 & 0x8000) == 0x8000) { + if ((player->unk_0BC & 0x80000000) == 0x80000000) { if (arg1 == arg2) { - func_8006DD3C(arg1, arg2); - return; + func_8006DD3C(player, arg1, arg2); } - // Duplicate return node #5. Try simplifying control flow for better match - return; + } else { + func_8006DD3C(player, arg1, arg2); } - func_8006DD3C(arg1, arg2); - // Duplicate return node #5. Try simplifying control flow for better match } } -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8006E8C4.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8006DD3C(s8, s8); // extern - -void func_8006E940(void *arg0, s8 arg1, s8 arg2) { - if ((arg0->unk0 & 0x8000) == 0x8000) { - if ((arg0->unkBC & 0x80000000) == 0x80000000) { +void func_8006E940(Player* player, s8 arg1, s8 arg2) { + if ((player->unk_000 & 0x8000) == 0x8000) { + if ((player->unk_0BC & 0x80000000) == 0x80000000) { if (arg1 == arg2) { - func_8006DD3C(arg1, arg2); - return; + func_8006DD3C(player, arg1, arg2); } - // Duplicate return node #5. Try simplifying control flow for better match - return; + } else { + func_8006DD3C(player, arg1, arg2); } - func_8006DD3C(arg1, arg2); - // Duplicate return node #5. Try simplifying control flow for better match } } -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8006E940.s") -#endif diff --git a/src/code_8008C1D0.c b/src/code_8008C1D0.c index fa6aa619c..f7b7964cc 100644 --- a/src/code_8008C1D0.c +++ b/src/code_8008C1D0.c @@ -1623,9 +1623,9 @@ void func_8008FA38(Player* player, s8 arg1) { player->unk_044 |= 0x200; for (temp_v1 = 0; temp_v1 < 10; ++temp_v1) { - player->unk_258[temp_v1].unk_000[14] = 0; - player->unk_258[temp_v1].unk_000[15] = 0; - player->unk_258[temp_v1].unk_000[9] = 0; + player->unk_258[temp_v1].unk_01C = 0; + player->unk_258[temp_v1].unk_01E = 0; + player->unk_258[temp_v1].unk_012 = 0; } } @@ -1704,9 +1704,9 @@ void func_8008FD4C(Player* player, UNUSED s8 arg1) { player->unk_044 |= 0x200; for (temp_v0 = 0; temp_v0 < 10; ++temp_v0) { - player->unk_258[temp_v0].unk_000[14] = 0; - player->unk_258[temp_v0].unk_000[15] = 0; - player->unk_258[temp_v0].unk_000[9] = 0; + player->unk_258[temp_v0].unk_01C = 0; + player->unk_258[temp_v0].unk_01E = 0; + player->unk_258[temp_v0].unk_012 = 0; } } @@ -1714,9 +1714,9 @@ void func_8008FDA8(Player* player, UNUSED s8 arg1) { s16 temp_v0; player->unk_044 |= 0x200; for (temp_v0 = 0; temp_v0 < 10; ++temp_v0) { - player->unk_258[temp_v0].unk_000[14] = 0; - player->unk_258[temp_v0].unk_000[15] = 0; - player->unk_258[temp_v0].unk_000[9] = 0; + player->unk_258[temp_v0].unk_01C = 0; + player->unk_258[temp_v0].unk_01E = 0; + player->unk_258[temp_v0].unk_012 = 0; } } @@ -2365,28 +2365,28 @@ void func_800911B4(Player* player, s8 arg1) { player->unk_078 = 0; D_8018D920[arg1] = 0; - player->unk_258[31].unk_000[9] = 0; - player->unk_258[31].unk_000[15] = 0; - player->unk_258[31].unk_000[14] = 0; - player->unk_258[30].unk_000[9] = 0; - player->unk_258[30].unk_000[15] = 0; - player->unk_258[30].unk_000[14] = 0; + player->unk_258[31].unk_012 = 0; + player->unk_258[31].unk_01E = 0; + player->unk_258[31].unk_01C = 0; + player->unk_258[30].unk_012 = 0; + player->unk_258[30].unk_01E = 0; + player->unk_258[30].unk_01C = 0; temp_v0 = 2; do { - player->unk_258[31 + temp_v0].unk_000[14] = 0; - player->unk_258[31 + temp_v0].unk_000[15] = 0; - player->unk_258[31 + temp_v0].unk_000[9] = 0; - player->unk_258[32 + temp_v0].unk_000[14] = 0; - player->unk_258[32 + temp_v0].unk_000[15] = 0; - player->unk_258[32 + temp_v0].unk_000[9] = 0; - player->unk_258[33 + temp_v0].unk_000[14] = 0; - player->unk_258[33 + temp_v0].unk_000[15] = 0; - player->unk_258[33 + temp_v0].unk_000[9] = 0; + player->unk_258[31 + temp_v0].unk_01C = 0; + player->unk_258[31 + temp_v0].unk_01E = 0; + player->unk_258[31 + temp_v0].unk_012 = 0; + player->unk_258[32 + temp_v0].unk_01C = 0; + player->unk_258[32 + temp_v0].unk_01E = 0; + player->unk_258[32 + temp_v0].unk_012 = 0; + player->unk_258[33 + temp_v0].unk_01C = 0; + player->unk_258[33 + temp_v0].unk_01E = 0; + player->unk_258[33 + temp_v0].unk_012 = 0; temp_v0 += 4; - player->unk_258[26 + temp_v0].unk_000[14] = 0; - player->unk_258[26 + temp_v0].unk_000[15] = 0; - player->unk_258[26 + temp_v0].unk_000[9] = 0; + player->unk_258[26 + temp_v0].unk_01C = 0; + player->unk_258[26 + temp_v0].unk_01E = 0; + player->unk_258[26 + temp_v0].unk_012 = 0; } while (temp_v0 < 10); }