From 87297bc3b482ae530988324bfc514292157c87a6 Mon Sep 17 00:00:00 2001 From: Tyler McGavran Date: Fri, 4 Aug 2023 17:05:13 -0400 Subject: [PATCH] Lots of code_80071F00 matches (#347) * Lots of code_80071F00 matches Also removed a bunch of fake variables related to the object list. Also gave names to some of the members of the object list type Signed-off-by: Taggerung --- asm/bss_8001C4D0.s | 130 +- .../code_80057C60/func_8005A14C.s | 161 -- .../code_8006E9C0/func_80070148.s | 20 - .../code_8006E9C0/func_80070250.s | 56 - .../code_8006E9C0/func_80070328.s | 48 - .../code_8006E9C0/func_8007055C.s | 138 -- .../code_80071F00/func_800791F0.s | 62 - .../code_80071F00/func_8007BBBC.s | 91 - .../code_80071F00/func_8007BEC8.s | 75 - .../code_80071F00/func_8007BFB0.s | 240 -- .../code_80071F00/func_8007C684.s | 94 - .../code_80071F00/func_8007C9F8.s | 39 - .../code_80071F00/func_8007D794.s | 32 - .../code_80071F00/func_8007DF20.s | 72 - .../code_80071F00/func_8007E00C.s | 2 +- .../code_80071F00/func_8007E63C.s | 429 ---- .../code_80071F00/func_8007EC30.s | 82 - .../code_80071F00/func_8007ED6C.s | 76 - .../code_80071F00/func_8007EE5C.s | 93 - .../code_80071F00/func_8007F5A8.s | 51 - .../code_80071F00/func_8007FA08.s | 83 - .../code_80071F00/func_800801FC.s | 64 - .../code_80071F00/func_800802C0.s | 85 - .../code_80071F00/func_80080408.s | 86 - .../code_80071F00/func_80080524.s | 109 - .../code_80071F00/func_8008078C.s | 57 - .../code_80071F00/func_80080B28.s | 191 -- .../code_80071F00/func_80080DE4.s | 48 - .../code_80071F00/func_80081080.s | 30 - .../code_80071F00/func_800810F4.s | 81 - .../code_80071F00/func_8008153C.s | 180 -- .../code_80071F00/func_80081848.s | 63 - .../code_80071F00/func_80081D34.s | 185 -- .../code_80071F00/func_8008275C.s | 73 - .../code_80071F00/func_80082A4C.s | 66 - .../code_80071F00/func_80082B34.s | 2 +- .../code_80071F00/func_80082E18.s | 19 - .../code_80071F00/func_80082E5C.s | 51 - .../code_80071F00/func_8008311C.s | 87 - .../code_80071F00/func_800833D0.s | 48 - .../code_80071F00/func_800834B8.s | 34 - .../code_80071F00/func_80083538.s | 132 -- .../code_80071F00/func_80083868.s | 64 - .../code_80071F00/func_80083A94.s | 34 - .../code_80071F00/func_80083B0C.s | 62 - .../code_80071F00/func_80083C04.s | 117 - .../code_80071F00/func_800853DC.s | 96 - .../code_80071F00/func_80085768.s | 26 - .../code_80071F00/func_800857C0.s | 48 - .../code_80071F00/func_80085878.s | 92 - .../code_80071F00/func_80085C20.s | 40 - .../code_80071F00/func_80085CA0.s | 93 - .../code_80071F00/func_80085DB8.s | 40 - .../code_80071F00/func_80085E38.s | 65 - .../code_80071F00/func_80085EF8.s | 39 - .../code_80071F00/func_80085F74.s | 87 - .../code_80071F00/func_80086110.s | 21 - .../code_80071F00/func_80086158.s | 41 - .../code_80071F00/func_800861E0.s | 50 - .../code_80071F00/func_80086C6C.s | 74 - .../code_80086E70/func_80088364.s | 50 - .../code_80086E70/func_800892E0.s | 25 - .../code_80086E70/func_8008933C.s | 84 - .../code_80086E70/func_80089474.s | 256 -- .../code_80086E70/func_80089820.s | 135 -- .../code_80086E70/func_80089A04.s | 94 - .../code_80086E70/func_80089B50.s | 96 - .../code_80086E70/func_80089CBC.s | 165 -- .../code_80086E70/func_80089F24.s | 85 - .../code_80086E70/func_8008B928.s | 71 - .../hud_renderer/func_80050E34.s | 4 +- .../hud_renderer/func_800527D8.s | 36 - .../hud_renderer/func_80052F20.s | 98 - .../hud_renderer/func_800532A4.s | 137 -- .../hud_renderer/func_80054664.s | 73 - .../hud_renderer/func_80054938.s | 118 - .../hud_renderer/func_80055164.s | 52 - .../hud_renderer/func_80055228.s | 40 - .../hud_renderer/func_800552BC.s | 52 - .../hud_renderer/func_800557B4.s | 98 - .../hud_renderer/func_8005592C.s | 111 - .../hud_renderer/func_80055AB8.s | 100 - .../hud_renderer/func_80055C38.s | 40 - data/data_code_80071F00.s | 15 +- include/common_structs.h | 4 +- include/objects.h | 50 +- permuter_settings.toml | 2 + src/ceremony_and_credits.c | 5 +- src/code_80004740.h | 2 +- src/code_8001F980.c | 63 +- src/code_80027D00.c | 4 +- src/code_80057C60.c | 88 +- src/code_8006E9C0.c | 422 ++-- src/code_8006E9C0.h | 30 +- src/code_80071F00.c | 2107 ++++++----------- src/code_80071F00.h | 133 +- src/code_80086E70.c | 560 ++--- src/code_80086E70.h | 14 +- src/common_textures.h | 10 +- src/common_textures.inc.c | 54 +- src/hud_renderer.c | 730 +++--- src/hud_renderer.h | 10 +- src/math_util_2.c | 24 +- src/spawn_players.c | 4 +- 104 files changed, 1711 insertions(+), 9494 deletions(-) delete mode 100644 asm/non_matchings/code_80057C60/func_8005A14C.s delete mode 100644 asm/non_matchings/code_8006E9C0/func_80070148.s delete mode 100644 asm/non_matchings/code_8006E9C0/func_80070250.s delete mode 100644 asm/non_matchings/code_8006E9C0/func_80070328.s delete mode 100644 asm/non_matchings/code_8006E9C0/func_8007055C.s delete mode 100644 asm/non_matchings/code_80071F00/func_800791F0.s delete mode 100644 asm/non_matchings/code_80071F00/func_8007BBBC.s delete mode 100644 asm/non_matchings/code_80071F00/func_8007BEC8.s delete mode 100644 asm/non_matchings/code_80071F00/func_8007BFB0.s delete mode 100644 asm/non_matchings/code_80071F00/func_8007C684.s delete mode 100644 asm/non_matchings/code_80071F00/func_8007C9F8.s delete mode 100644 asm/non_matchings/code_80071F00/func_8007D794.s delete mode 100644 asm/non_matchings/code_80071F00/func_8007DF20.s delete mode 100644 asm/non_matchings/code_80071F00/func_8007E63C.s delete mode 100644 asm/non_matchings/code_80071F00/func_8007EC30.s delete mode 100644 asm/non_matchings/code_80071F00/func_8007ED6C.s delete mode 100644 asm/non_matchings/code_80071F00/func_8007EE5C.s delete mode 100644 asm/non_matchings/code_80071F00/func_8007F5A8.s delete mode 100644 asm/non_matchings/code_80071F00/func_8007FA08.s delete mode 100644 asm/non_matchings/code_80071F00/func_800801FC.s delete mode 100644 asm/non_matchings/code_80071F00/func_800802C0.s delete mode 100644 asm/non_matchings/code_80071F00/func_80080408.s delete mode 100644 asm/non_matchings/code_80071F00/func_80080524.s delete mode 100644 asm/non_matchings/code_80071F00/func_8008078C.s delete mode 100644 asm/non_matchings/code_80071F00/func_80080B28.s delete mode 100644 asm/non_matchings/code_80071F00/func_80080DE4.s delete mode 100644 asm/non_matchings/code_80071F00/func_80081080.s delete mode 100644 asm/non_matchings/code_80071F00/func_800810F4.s delete mode 100644 asm/non_matchings/code_80071F00/func_8008153C.s delete mode 100644 asm/non_matchings/code_80071F00/func_80081848.s delete mode 100644 asm/non_matchings/code_80071F00/func_80081D34.s delete mode 100644 asm/non_matchings/code_80071F00/func_8008275C.s delete mode 100644 asm/non_matchings/code_80071F00/func_80082A4C.s delete mode 100644 asm/non_matchings/code_80071F00/func_80082E18.s delete mode 100644 asm/non_matchings/code_80071F00/func_80082E5C.s delete mode 100644 asm/non_matchings/code_80071F00/func_8008311C.s delete mode 100644 asm/non_matchings/code_80071F00/func_800833D0.s delete mode 100644 asm/non_matchings/code_80071F00/func_800834B8.s delete mode 100644 asm/non_matchings/code_80071F00/func_80083538.s delete mode 100644 asm/non_matchings/code_80071F00/func_80083868.s delete mode 100644 asm/non_matchings/code_80071F00/func_80083A94.s delete mode 100644 asm/non_matchings/code_80071F00/func_80083B0C.s delete mode 100644 asm/non_matchings/code_80071F00/func_80083C04.s delete mode 100644 asm/non_matchings/code_80071F00/func_800853DC.s delete mode 100644 asm/non_matchings/code_80071F00/func_80085768.s delete mode 100644 asm/non_matchings/code_80071F00/func_800857C0.s delete mode 100644 asm/non_matchings/code_80071F00/func_80085878.s delete mode 100644 asm/non_matchings/code_80071F00/func_80085C20.s delete mode 100644 asm/non_matchings/code_80071F00/func_80085CA0.s delete mode 100644 asm/non_matchings/code_80071F00/func_80085DB8.s delete mode 100644 asm/non_matchings/code_80071F00/func_80085E38.s delete mode 100644 asm/non_matchings/code_80071F00/func_80085EF8.s delete mode 100644 asm/non_matchings/code_80071F00/func_80085F74.s delete mode 100644 asm/non_matchings/code_80071F00/func_80086110.s delete mode 100644 asm/non_matchings/code_80071F00/func_80086158.s delete mode 100644 asm/non_matchings/code_80071F00/func_800861E0.s delete mode 100644 asm/non_matchings/code_80071F00/func_80086C6C.s delete mode 100644 asm/non_matchings/code_80086E70/func_800892E0.s delete mode 100644 asm/non_matchings/code_80086E70/func_8008933C.s delete mode 100644 asm/non_matchings/code_80086E70/func_80089474.s delete mode 100644 asm/non_matchings/code_80086E70/func_80089820.s delete mode 100644 asm/non_matchings/code_80086E70/func_80089A04.s delete mode 100644 asm/non_matchings/code_80086E70/func_80089B50.s delete mode 100644 asm/non_matchings/code_80086E70/func_80089CBC.s delete mode 100644 asm/non_matchings/code_80086E70/func_80089F24.s delete mode 100644 asm/non_matchings/code_80086E70/func_8008B928.s delete mode 100644 asm/non_matchings/hud_renderer/func_800527D8.s delete mode 100644 asm/non_matchings/hud_renderer/func_80052F20.s delete mode 100644 asm/non_matchings/hud_renderer/func_800532A4.s delete mode 100644 asm/non_matchings/hud_renderer/func_80054664.s delete mode 100644 asm/non_matchings/hud_renderer/func_80054938.s delete mode 100644 asm/non_matchings/hud_renderer/func_80055164.s delete mode 100644 asm/non_matchings/hud_renderer/func_80055228.s delete mode 100644 asm/non_matchings/hud_renderer/func_800552BC.s delete mode 100644 asm/non_matchings/hud_renderer/func_800557B4.s delete mode 100644 asm/non_matchings/hud_renderer/func_8005592C.s delete mode 100644 asm/non_matchings/hud_renderer/func_80055AB8.s delete mode 100644 asm/non_matchings/hud_renderer/func_80055C38.s diff --git a/asm/bss_8001C4D0.s b/asm/bss_8001C4D0.s index 4c97a1306..4c4ee2c69 100644 --- a/asm/bss_8001C4D0.s +++ b/asm/bss_8001C4D0.s @@ -589,48 +589,16 @@ glabel D_80165908 glabel D_80165A90 .skip 392 +# object list begin +# D_80165C18 should be of size 123,200 (0xE0 * 0x226) +# D_80165C94 through D_80165CF5 are all fake variables glabel D_80165C18 -.skip 8 - -glabel D_80165C20 -.skip 8 - -glabel D_80165C28 -.skip 4 - -glabel D_80165C2C -.skip 4 - -glabel D_80165C30 -.skip 16 - -glabel D_80165C40 -.skip 20 - -glabel D_80165C54 -.skip 16 - -glabel D_80165C64 -.skip 8 - -glabel D_80165C6C -.skip 4 - -glabel D_80165C70 -.skip 36 +.skip 124 glabel D_80165C94 -.skip 32 - -glabel D_80165CB4 -.skip 4 - -glabel D_80165CB8 -.skip 2 - -glabel D_80165CBA -.skip 2 +.skip 40 +# Currently referenced in func_800534E8.s, but that function is in NEEDS_RODATA state glabel D_80165CBC .skip 2 @@ -638,58 +606,17 @@ glabel D_80165CBE .skip 8 glabel D_80165CC6 -.skip 2 - -glabel D_80165CC8 -.skip 16 - -glabel D_80165CD8 -.skip 10 - -glabel D_80165CE2 -.skip 1 - -glabel D_80165CE3 -.skip 1 - -glabel D_80165CE4 -.skip 1 - -glabel D_80165CE5 -.skip 2 - -glabel D_80165CE7 -.skip 3 - -glabel D_80165CEA -.skip 3 +.skip 39 glabel D_80165CED -.skip 1 - -glabel D_80165CEE -.skip 1 - -glabel D_80165CEF -.skip 1 - -glabel D_80165CF0 .skip 3 -glabel D_80165CF3 -.skip 1 - -glabel D_80165CF4 -.skip 1 +glabel D_80165CF0 +.skip 5 glabel D_80165CF5 -.skip 205 - -glabel D_80165DC2 -.skip 22 - -glabel D_80165DD8 -.skip 122752 +.skip 122979 +# object list end glabel D_80183D58 .skip 4 @@ -838,9 +765,12 @@ glabel D_8018C028 glabel D_8018C030 .skip 128 +# Array of (4) UnkActorInners? glabel D_8018C0B0 .skip 256 +# begin D_8018C1B0, should be 512 bytes big +# D_8018C1D8 through D_8018C278 are fake variables glabel D_8018C1B0 .skip 40 @@ -848,23 +778,18 @@ glabel D_8018C1D8 .skip 80 glabel D_8018C228 -.skip 4 - -glabel D_8018C22C -.skip 76 +.skip 80 glabel D_8018C278 .skip 312 +# end D_8018C1B0 +# Some UnkActorInner glabel D_8018C3B0 -.skip 4 - -glabel D_8018C3B4 -.skip 6 - -glabel D_8018C3BA -.skip 54 +.skip 64 +# begin D_8018C3F0, should be 512 bytes big +# D_8018C404 and D_8018C490 are fake variables glabel D_8018C3F0 .skip 20 @@ -873,10 +798,14 @@ glabel D_8018C404 glabel D_8018C490 .skip 352 +# end D_8018C3F0 +# Maybe some unused UnkActorInner? glabel D_8018C5F0 .skip 64 +# begin D_8018C630, should be 512 bytes big +# D_8018C6A8 and D_8018C6B0 are fake variables glabel D_8018C630 .skip 120 @@ -885,7 +814,9 @@ glabel D_8018C6A8 glabel D_8018C6B0 .skip 384 +# end D_8018C630 +# Some UnkActorInner glabel D_8018C830 .skip 64 @@ -895,6 +826,9 @@ glabel D_8018C870 glabel D_8018C970 .skip 256 +# some hud related list begin +# D_8018CA70 should be of size 528 (0x84 * 0x4) +# D_8018CA74 through D_8018CC7D are all fake glabel D_8018CA70 .skip 4 @@ -990,15 +924,13 @@ glabel D_8018CC6E glabel D_8018CC7D .skip 3 +# some hud related list end glabel D_8018CC80 .skip 400 glabel D_8018CE10 -.skip 20 - -glabel D_8018CE24 -.skip 236 +.skip 256 glabel D_8018CF10 .skip 4 diff --git a/asm/non_matchings/code_80057C60/func_8005A14C.s b/asm/non_matchings/code_80057C60/func_8005A14C.s deleted file mode 100644 index 68dcb5e60..000000000 --- a/asm/non_matchings/code_80057C60/func_8005A14C.s +++ /dev/null @@ -1,161 +0,0 @@ -.section .late_rodata - -glabel D_800EE1E0 -.float 0.6 - -.section .text - -glabel func_8005A14C -/* 05AD4C 8005A14C 000470C0 */ sll $t6, $a0, 3 -/* 05AD50 8005A150 01C47023 */ subu $t6, $t6, $a0 -/* 05AD54 8005A154 000E7100 */ sll $t6, $t6, 4 -/* 05AD58 8005A158 0004C880 */ sll $t9, $a0, 2 -/* 05AD5C 8005A15C 3C098016 */ lui $t1, %hi(gLapCountByPlayerId) -/* 05AD60 8005A160 01C47023 */ subu $t6, $t6, $a0 -/* 05AD64 8005A164 3C0F800E */ lui $t7, %hi(gPlayerOne) # $t7, 0x800e -/* 05AD68 8005A168 01394821 */ addu $t1, $t1, $t9 -/* 05AD6C 8005A16C 8DEFC4DC */ lw $t7, %lo(gPlayerOne)($t7) -/* 05AD70 8005A170 8D294390 */ lw $t1, %lo(gLapCountByPlayerId)($t1) -/* 05AD74 8005A174 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 05AD78 8005A178 000E7080 */ sll $t6, $t6, 2 -/* 05AD7C 8005A17C 01C47023 */ subu $t6, $t6, $a0 -/* 05AD80 8005A180 000E70C0 */ sll $t6, $t6, 3 -/* 05AD84 8005A184 AFBF001C */ sw $ra, 0x1c($sp) -/* 05AD88 8005A188 AFB00018 */ sw $s0, 0x18($sp) -/* 05AD8C 8005A18C 01CF4021 */ addu $t0, $t6, $t7 -/* 05AD90 8005A190 AFA90028 */ sw $t1, 0x28($sp) -/* 05AD94 8005A194 950A0000 */ lhu $t2, ($t0) -/* 05AD98 8005A198 0004C140 */ sll $t8, $a0, 5 -/* 05AD9C 8005A19C 3C078019 */ lui $a3, %hi(D_8018CE24) -/* 05ADA0 8005A1A0 00F83821 */ addu $a3, $a3, $t8 -/* 05ADA4 8005A1A4 314B8000 */ andi $t3, $t2, 0x8000 -/* 05ADA8 8005A1A8 11600070 */ beqz $t3, .L8005A36C -/* 05ADAC 8005A1AC 8CE7CE24 */ lw $a3, %lo(D_8018CE24)($a3) -/* 05ADB0 8005A1B0 8D0200BC */ lw $v0, 0xbc($t0) -/* 05ADB4 8005A1B4 3C010002 */ lui $at, (0x000204C0 >> 16) # lui $at, 2 -/* 05ADB8 8005A1B8 342104C0 */ ori $at, (0x000204C0 & 0xFFFF) # ori $at, $at, 0x4c0 -/* 05ADBC 8005A1BC 00416024 */ and $t4, $v0, $at -/* 05ADC0 8005A1C0 1180000C */ beqz $t4, .L8005A1F4 -/* 05ADC4 8005A1C4 0007C8C0 */ sll $t9, $a3, 3 -/* 05ADC8 8005A1C8 000768C0 */ sll $t5, $a3, 3 -/* 05ADCC 8005A1CC 01A76823 */ subu $t5, $t5, $a3 -/* 05ADD0 8005A1D0 3C0E8016 */ lui $t6, %hi(D_80165C18) # $t6, 0x8016 -/* 05ADD4 8005A1D4 25CE5C18 */ addiu $t6, %lo(D_80165C18) # addiu $t6, $t6, 0x5c18 -/* 05ADD8 8005A1D8 000D6940 */ sll $t5, $t5, 5 -/* 05ADDC 8005A1DC 01AE8021 */ addu $s0, $t5, $t6 -/* 05ADE0 8005A1E0 960F00C2 */ lhu $t7, 0xc2($s0) -/* 05ADE4 8005A1E4 25F81000 */ addiu $t8, $t7, 0x1000 -/* 05ADE8 8005A1E8 A61800C2 */ sh $t8, 0xc2($s0) -/* 05ADEC 8005A1EC 1000000B */ b .L8005A21C -/* 05ADF0 8005A1F0 8D0200BC */ lw $v0, 0xbc($t0) -.L8005A1F4: -/* 05ADF4 8005A1F4 0327C823 */ subu $t9, $t9, $a3 -/* 05ADF8 8005A1F8 3C098016 */ lui $t1, %hi(D_80165C18) # $t1, 0x8016 -/* 05ADFC 8005A1FC 25295C18 */ addiu $t1, %lo(D_80165C18) # addiu $t1, $t1, 0x5c18 -/* 05AE00 8005A200 0019C940 */ sll $t9, $t9, 5 -/* 05AE04 8005A204 03298021 */ addu $s0, $t9, $t1 -/* 05AE08 8005A208 960300C2 */ lhu $v1, 0xc2($s0) -/* 05AE0C 8005A20C 10600003 */ beqz $v1, .L8005A21C -/* 05AE10 8005A210 246A1000 */ addiu $t2, $v1, 0x1000 -/* 05AE14 8005A214 A60A00C2 */ sh $t2, 0xc2($s0) -/* 05AE18 8005A218 8D0200BC */ lw $v0, 0xbc($t0) -.L8005A21C: -/* 05AE1C 8005A21C 00025840 */ sll $t3, $v0, 1 -/* 05AE20 8005A220 0561000B */ bgez $t3, .L8005A250 -/* 05AE24 8005A224 02002025 */ move $a0, $s0 -/* 05AE28 8005A228 3C053E99 */ lui $a1, (0x3E99999A >> 16) # lui $a1, 0x3e99 -/* 05AE2C 8005A22C 3C063CA3 */ lui $a2, (0x3CA3D70A >> 16) # lui $a2, 0x3ca3 -/* 05AE30 8005A230 34C6D70A */ ori $a2, (0x3CA3D70A & 0xFFFF) # ori $a2, $a2, 0xd70a -/* 05AE34 8005A234 34A5999A */ ori $a1, (0x3E99999A & 0xFFFF) # ori $a1, $a1, 0x999a -/* 05AE38 8005A238 02002025 */ move $a0, $s0 -/* 05AE3C 8005A23C AFA7002C */ sw $a3, 0x2c($sp) -/* 05AE40 8005A240 0C0104EE */ jal f32_step_towards -/* 05AE44 8005A244 AFA80024 */ sw $t0, 0x24($sp) -/* 05AE48 8005A248 10000009 */ b .L8005A270 -/* 05AE4C 8005A24C 8FA80024 */ lw $t0, 0x24($sp) -.L8005A250: -/* 05AE50 8005A250 3C053F19 */ lui $a1, (0x3F19999A >> 16) # lui $a1, 0x3f19 -/* 05AE54 8005A254 3C063CA3 */ lui $a2, (0x3CA3D70A >> 16) # lui $a2, 0x3ca3 -/* 05AE58 8005A258 34C6D70A */ ori $a2, (0x3CA3D70A & 0xFFFF) # ori $a2, $a2, 0xd70a -/* 05AE5C 8005A25C 34A5999A */ ori $a1, (0x3F19999A & 0xFFFF) # ori $a1, $a1, 0x999a -/* 05AE60 8005A260 AFA7002C */ sw $a3, 0x2c($sp) -/* 05AE64 8005A264 0C0104EE */ jal f32_step_towards -/* 05AE68 8005A268 AFA80024 */ sw $t0, 0x24($sp) -/* 05AE6C 8005A26C 8FA80024 */ lw $t0, 0x24($sp) -.L8005A270: -/* 05AE70 8005A270 8D0C00BC */ lw $t4, 0xbc($t0) -/* 05AE74 8005A274 260400BE */ addiu $a0, $s0, 0xbe -/* 05AE78 8005A278 00002825 */ move $a1, $zero -/* 05AE7C 8005A27C 000C6940 */ sll $t5, $t4, 5 -/* 05AE80 8005A280 05A10008 */ bgez $t5, .L8005A2A4 -/* 05AE84 8005A284 24060100 */ li $a2, 256 -/* 05AE88 8005A288 260400BE */ addiu $a0, $s0, 0xbe -/* 05AE8C 8005A28C 24050C00 */ li $a1, 3072 -/* 05AE90 8005A290 24060100 */ li $a2, 256 -/* 05AE94 8005A294 0C01040A */ jal u16_step_up_towards -/* 05AE98 8005A298 AFA80024 */ sw $t0, 0x24($sp) -/* 05AE9C 8005A29C 10000004 */ b .L8005A2B0 -/* 05AEA0 8005A2A0 8FA80024 */ lw $t0, 0x24($sp) -.L8005A2A4: -/* 05AEA4 8005A2A4 0C01042F */ jal u16_step_down_towards -/* 05AEA8 8005A2A8 AFA80024 */ sw $t0, 0x24($sp) -/* 05AEAC 8005A2AC 8FA80024 */ lw $t0, 0x24($sp) -.L8005A2B0: -/* 05AEB0 8005A2B0 8D0E00BC */ lw $t6, 0xbc($t0) -/* 05AEB4 8005A2B4 3C010300 */ lui $at, 0x300 -/* 05AEB8 8005A2B8 2604002C */ addiu $a0, $s0, 0x2c -/* 05AEBC 8005A2BC 01C17824 */ and $t7, $t6, $at -/* 05AEC0 8005A2C0 11E00009 */ beqz $t7, .L8005A2E8 -/* 05AEC4 8005A2C4 24050000 */ li $a1, 0 -/* 05AEC8 8005A2C8 8FA4002C */ lw $a0, 0x2c($sp) -/* 05AECC 8005A2CC 3C0540C0 */ lui $a1, 0x40c0 -/* 05AED0 8005A2D0 3C063FC0 */ lui $a2, 0x3fc0 -/* 05AED4 8005A2D4 24070000 */ li $a3, 0 -/* 05AED8 8005A2D8 0C021F49 */ jal func_80087D24 -/* 05AEDC 8005A2DC AFA80024 */ sw $t0, 0x24($sp) -/* 05AEE0 8005A2E0 10000005 */ b .L8005A2F8 -/* 05AEE4 8005A2E4 8FA80024 */ lw $t0, 0x24($sp) -.L8005A2E8: -/* 05AEE8 8005A2E8 3C063F80 */ lui $a2, 0x3f80 -/* 05AEEC 8005A2EC 0C0104EE */ jal f32_step_towards -/* 05AEF0 8005A2F0 AFA80024 */ sw $t0, 0x24($sp) -/* 05AEF4 8005A2F4 8FA80024 */ lw $t0, 0x24($sp) -.L8005A2F8: -/* 05AEF8 8005A2F8 95180000 */ lhu $t8, ($t0) -/* 05AEFC 8005A2FC 240B0050 */ li $t3, 80 -/* 05AF00 8005A300 33190100 */ andi $t9, $t8, 0x100 -/* 05AF04 8005A304 17200006 */ bnez $t9, .L8005A320 -/* 05AF08 8005A308 00000000 */ nop -/* 05AF0C 8005A30C 8D0900BC */ lw $t1, 0xbc($t0) -/* 05AF10 8005A310 240C00FF */ li $t4, 255 -/* 05AF14 8005A314 00095000 */ sll $t2, $t1, 0 -/* 05AF18 8005A318 05430004 */ bgezl $t2, .L8005A32C -/* 05AF1C 8005A31C A60C00A0 */ sh $t4, 0xa0($s0) -.L8005A320: -/* 05AF20 8005A320 10000002 */ b .L8005A32C -/* 05AF24 8005A324 A60B00A0 */ sh $t3, 0xa0($s0) -/* 05AF28 8005A328 A60C00A0 */ sh $t4, 0xa0($s0) -.L8005A32C: -/* 05AF2C 8005A32C 8FAD0028 */ lw $t5, 0x28($sp) -/* 05AF30 8005A330 29A10003 */ slti $at, $t5, 3 -/* 05AF34 8005A334 5420000E */ bnel $at, $zero, .L8005A370 -/* 05AF38 8005A338 8FBF001C */ lw $ra, 0x1c($sp) -/* 05AF3C 8005A33C 44800000 */ mtc1 $zero, $f0 -/* 05AF40 8005A340 A60000C2 */ sh $zero, 0xc2($s0) -/* 05AF44 8005A344 A60000C0 */ sh $zero, 0xc0($s0) -/* 05AF48 8005A348 A60000BE */ sh $zero, 0xbe($s0) -/* 05AF4C 8005A34C 3C01800F */ lui $at, %hi(D_800EE1E0) # $at, 0x800f -/* 05AF50 8005A350 E6000030 */ swc1 $f0, 0x30($s0) -/* 05AF54 8005A354 E600002C */ swc1 $f0, 0x2c($s0) -/* 05AF58 8005A358 E6000028 */ swc1 $f0, 0x28($s0) -/* 05AF5C 8005A35C C424E1E0 */ lwc1 $f4, %lo(D_800EE1E0)($at) -/* 05AF60 8005A360 240E00FF */ li $t6, 255 -/* 05AF64 8005A364 A60E00A0 */ sh $t6, 0xa0($s0) -/* 05AF68 8005A368 E6040000 */ swc1 $f4, ($s0) -.L8005A36C: -/* 05AF6C 8005A36C 8FBF001C */ lw $ra, 0x1c($sp) -.L8005A370: -/* 05AF70 8005A370 8FB00018 */ lw $s0, 0x18($sp) -/* 05AF74 8005A374 27BD0030 */ addiu $sp, $sp, 0x30 -/* 05AF78 8005A378 03E00008 */ jr $ra -/* 05AF7C 8005A37C 00000000 */ nop diff --git a/asm/non_matchings/code_8006E9C0/func_80070148.s b/asm/non_matchings/code_8006E9C0/func_80070148.s deleted file mode 100644 index 7412f2873..000000000 --- a/asm/non_matchings/code_8006E9C0/func_80070148.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_80070148 -/* 070D48 80070148 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 070D4C 8007014C AFB10018 */ sw $s1, 0x18($sp) -/* 070D50 80070150 AFB00014 */ sw $s0, 0x14($sp) -/* 070D54 80070154 3C108019 */ lui $s0, %hi(D_8018CE24) # $s0, 0x8019 -/* 070D58 80070158 3C118019 */ lui $s1, %hi(D_8018CF24) # $s1, 0x8019 -/* 070D5C 8007015C AFBF001C */ sw $ra, 0x1c($sp) -/* 070D60 80070160 2631CF24 */ addiu $s1, %lo(D_8018CF24) # addiu $s1, $s1, -0x30dc -/* 070D64 80070164 2610CE24 */ addiu $s0, %lo(D_8018CE24) # addiu $s0, $s0, -0x31dc -.L80070168: -/* 070D68 80070168 0C01C7C0 */ jal find_unused_obj_index -/* 070D6C 8007016C 02002025 */ move $a0, $s0 -/* 070D70 80070170 26100020 */ addiu $s0, $s0, 0x20 -/* 070D74 80070174 1611FFFC */ bne $s0, $s1, .L80070168 -/* 070D78 80070178 00000000 */ nop -/* 070D7C 8007017C 8FBF001C */ lw $ra, 0x1c($sp) -/* 070D80 80070180 8FB00014 */ lw $s0, 0x14($sp) -/* 070D84 80070184 8FB10018 */ lw $s1, 0x18($sp) -/* 070D88 80070188 03E00008 */ jr $ra -/* 070D8C 8007018C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/non_matchings/code_8006E9C0/func_80070250.s b/asm/non_matchings/code_8006E9C0/func_80070250.s deleted file mode 100644 index 8c2d184bd..000000000 --- a/asm/non_matchings/code_8006E9C0/func_80070250.s +++ /dev/null @@ -1,56 +0,0 @@ -glabel func_80070250 -/* 070E50 80070250 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 070E54 80070254 AFBF001C */ sw $ra, 0x1c($sp) -/* 070E58 80070258 AFB00018 */ sw $s0, 0x18($sp) -/* 070E5C 8007025C 00C08025 */ move $s0, $a2 -/* 070E60 80070260 0C01C8E9 */ jal func_800723A4 -/* 070E64 80070264 AFA40028 */ sw $a0, 0x28($sp) -/* 070E68 80070268 8FA40028 */ lw $a0, 0x28($sp) -/* 070E6C 8007026C 3C0F8016 */ lui $t7, %hi(D_80165C18) # $t7, 0x8016 -/* 070E70 80070270 96180006 */ lhu $t8, 6($s0) -/* 070E74 80070274 000470C0 */ sll $t6, $a0, 3 -/* 070E78 80070278 01C47023 */ subu $t6, $t6, $a0 -/* 070E7C 8007027C 000E7140 */ sll $t6, $t6, 5 -/* 070E80 80070280 25EF5C18 */ addiu $t7, %lo(D_80165C18) # addiu $t7, $t7, 0x5c18 -/* 070E84 80070284 01CF1021 */ addu $v0, $t6, $t7 -/* 070E88 80070288 A44000A4 */ sh $zero, 0xa4($v0) -/* 070E8C 8007028C A05800D5 */ sb $t8, 0xd5($v0) -/* 070E90 80070290 96190000 */ lhu $t9, ($s0) -/* 070E94 80070294 44808000 */ mtc1 $zero, $f16 -/* 070E98 80070298 3C014F80 */ li $at, 0x4F800000 # 4294967296.000000 -/* 070E9C 8007029C A45900C0 */ sh $t9, 0xc0($v0) -/* 070EA0 800702A0 96080002 */ lhu $t0, 2($s0) -/* 070EA4 800702A4 A448009E */ sh $t0, 0x9e($v0) -/* 070EA8 800702A8 96090004 */ lhu $t1, 4($s0) -/* 070EAC 800702AC 44892000 */ mtc1 $t1, $f4 -/* 070EB0 800702B0 05210004 */ bgez $t1, .L800702C4 -/* 070EB4 800702B4 468021A0 */ cvt.s.w $f6, $f4 -/* 070EB8 800702B8 44814000 */ mtc1 $at, $f8 -/* 070EBC 800702BC 00000000 */ nop -/* 070EC0 800702C0 46083180 */ add.s $f6, $f6, $f8 -.L800702C4: -/* 070EC4 800702C4 3C014059 */ li $at, 0x40590000 # 3.390625 -/* 070EC8 800702C8 44818800 */ mtc1 $at, $f17 -/* 070ECC 800702CC 460032A1 */ cvt.d.s $f10, $f6 -/* 070ED0 800702D0 3C0C8019 */ lui $t4, %hi(D_8018D220) # $t4, 0x8019 -/* 070ED4 800702D4 46305483 */ div.d $f18, $f10, $f16 -/* 070ED8 800702D8 3C070D00 */ lui $a3, %hi(D_0D005FB0) # $a3, 0xd00 -/* 070EDC 800702DC 24E75FB0 */ addiu $a3, %lo(D_0D005FB0) # addiu $a3, $a3, 0x5fb0 -/* 070EE0 800702E0 24050040 */ li $a1, 64 -/* 070EE4 800702E4 24060020 */ li $a2, 32 -/* 070EE8 800702E8 46209120 */ cvt.s.d $f4, $f18 -/* 070EEC 800702EC E4440000 */ swc1 $f4, ($v0) -/* 070EF0 800702F0 960A0006 */ lhu $t2, 6($s0) -/* 070EF4 800702F4 8D8CD220 */ lw $t4, %lo(D_8018D220)($t4) -/* 070EF8 800702F8 AFA20020 */ sw $v0, 0x20($sp) -/* 070EFC 800702FC 000A5A80 */ sll $t3, $t2, 0xa -/* 070F00 80070300 016C6821 */ addu $t5, $t3, $t4 -/* 070F04 80070304 0C01CD01 */ jal func_80073404 -/* 070F08 80070308 AC4D0064 */ sw $t5, 0x64($v0) -/* 070F0C 8007030C 8FBF001C */ lw $ra, 0x1c($sp) -/* 070F10 80070310 8FA20020 */ lw $v0, 0x20($sp) -/* 070F14 80070314 240E00FF */ li $t6, 255 -/* 070F18 80070318 8FB00018 */ lw $s0, 0x18($sp) -/* 070F1C 8007031C 27BD0028 */ addiu $sp, $sp, 0x28 -/* 070F20 80070320 03E00008 */ jr $ra -/* 070F24 80070324 A44E00A0 */ sh $t6, 0xa0($v0) diff --git a/asm/non_matchings/code_8006E9C0/func_80070328.s b/asm/non_matchings/code_8006E9C0/func_80070328.s deleted file mode 100644 index 499335e6b..000000000 --- a/asm/non_matchings/code_8006E9C0/func_80070328.s +++ /dev/null @@ -1,48 +0,0 @@ -glabel func_80070328 -/* 070F28 80070328 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 070F2C 8007032C AFB50028 */ sw $s5, 0x28($sp) -/* 070F30 80070330 AFB30020 */ sw $s3, 0x20($sp) -/* 070F34 80070334 AFB40024 */ sw $s4, 0x24($sp) -/* 070F38 80070338 AFB2001C */ sw $s2, 0x1c($sp) -/* 070F3C 8007033C AFB10018 */ sw $s1, 0x18($sp) -/* 070F40 80070340 AFB00014 */ sw $s0, 0x14($sp) -/* 070F44 80070344 3C138019 */ lui $s3, %hi(D_8018CC80) # $s3, 0x8019 -/* 070F48 80070348 3C158019 */ lui $s5, %hi(D_8018D1F8) # $s5, 0x8019 -/* 070F4C 8007034C AFBF002C */ sw $ra, 0x2c($sp) -/* 070F50 80070350 00009025 */ move $s2, $zero -/* 070F54 80070354 00808025 */ move $s0, $a0 -/* 070F58 80070358 26B5D1F8 */ addiu $s5, %lo(D_8018D1F8) # addiu $s5, $s5, -0x2e08 -/* 070F5C 8007035C 2673CC80 */ addiu $s3, %lo(D_8018CC80) # addiu $s3, $s3, -0x3380 -/* 070F60 80070360 00008825 */ move $s1, $zero -/* 070F64 80070364 3414FFFF */ li $s4, 65535 -.L80070368: -/* 070F68 80070368 8EAE0000 */ lw $t6, ($s5) -/* 070F6C 8007036C 000E7880 */ sll $t7, $t6, 2 -/* 070F70 80070370 026FC021 */ addu $t8, $s3, $t7 -/* 070F74 80070374 0C01C7C0 */ jal find_unused_obj_index -/* 070F78 80070378 03112021 */ addu $a0, $t8, $s1 -/* 070F7C 8007037C 00402025 */ move $a0, $v0 -/* 070F80 80070380 24050001 */ li $a1, 1 -/* 070F84 80070384 0C01C094 */ jal func_80070250 -/* 070F88 80070388 02003025 */ move $a2, $s0 -/* 070F8C 8007038C 96190008 */ lhu $t9, 8($s0) -/* 070F90 80070390 26520001 */ addiu $s2, $s2, 1 -/* 070F94 80070394 26310004 */ addiu $s1, $s1, 4 -/* 070F98 80070398 1699FFF3 */ bne $s4, $t9, .L80070368 -/* 070F9C 8007039C 26100008 */ addiu $s0, $s0, 8 -/* 070FA0 800703A0 8EA80000 */ lw $t0, ($s5) -/* 070FA4 800703A4 3C018019 */ lui $at, %hi(D_8018D1F0) # $at, 0x8019 -/* 070FA8 800703A8 8FBF002C */ lw $ra, 0x2c($sp) -/* 070FAC 800703AC 01124821 */ addu $t1, $t0, $s2 -/* 070FB0 800703B0 AEA90000 */ sw $t1, ($s5) -/* 070FB4 800703B4 AC32D1F0 */ sw $s2, %lo(D_8018D1F0)($at) -/* 070FB8 800703B8 3C018019 */ lui $at, %hi(D_8018D230) # $at, 0x8019 -/* 070FBC 800703BC 8FB2001C */ lw $s2, 0x1c($sp) -/* 070FC0 800703C0 8FB50028 */ lw $s5, 0x28($sp) -/* 070FC4 800703C4 8FB00014 */ lw $s0, 0x14($sp) -/* 070FC8 800703C8 8FB10018 */ lw $s1, 0x18($sp) -/* 070FCC 800703CC 8FB30020 */ lw $s3, 0x20($sp) -/* 070FD0 800703D0 8FB40024 */ lw $s4, 0x24($sp) -/* 070FD4 800703D4 A020D230 */ sb $zero, %lo(D_8018D230)($at) -/* 070FD8 800703D8 03E00008 */ jr $ra -/* 070FDC 800703DC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/non_matchings/code_8006E9C0/func_8007055C.s b/asm/non_matchings/code_8006E9C0/func_8007055C.s deleted file mode 100644 index ee7b39989..000000000 --- a/asm/non_matchings/code_8006E9C0/func_8007055C.s +++ /dev/null @@ -1,138 +0,0 @@ -.section .late_rodata - -glabel jpt_800EE9F0 -.word L800705A0, L800706EC, L800706EC, L800706EC -.word L800705B4, L800705C8, L80070640, L80070654 -.word L80070668, L8007067C, L80070690, L800706A4 -.word L800706B8, L800706CC, L800706E0 - -.section .text - -glabel func_8007055C -/* 07115C 8007055C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 071160 80070560 3C0E800E */ lui $t6, %hi(gCurrentCourseId) # $t6, 0x800e -/* 071164 80070564 95CEC5A0 */ lhu $t6, %lo(gCurrentCourseId)($t6) -/* 071168 80070568 AFBF002C */ sw $ra, 0x2c($sp) -/* 07116C 8007056C AFB40028 */ sw $s4, 0x28($sp) -/* 071170 80070570 2DC1000F */ sltiu $at, $t6, 0xf -/* 071174 80070574 AFB30024 */ sw $s3, 0x24($sp) -/* 071178 80070578 AFB20020 */ sw $s2, 0x20($sp) -/* 07117C 8007057C AFB1001C */ sw $s1, 0x1c($sp) -/* 071180 80070580 1020005A */ beqz $at, .L800706EC -/* 071184 80070584 AFB00018 */ sw $s0, 0x18($sp) -/* 071188 80070588 000E7080 */ sll $t6, $t6, 2 -/* 07118C 8007058C 3C01800F */ lui $at, %hi(jpt_800EE9F0) -/* 071190 80070590 002E0821 */ addu $at, $at, $t6 -/* 071194 80070594 8C2EE9F0 */ lw $t6, %lo(jpt_800EE9F0)($at) -/* 071198 80070598 01C00008 */ jr $t6 -/* 07119C 8007059C 00000000 */ nop -glabel L800705A0 -/* 0711A0 800705A0 3C04800E */ lui $a0, %hi(D_800E6C10) # $a0, 0x800e -/* 0711A4 800705A4 0C01C0CA */ jal func_80070328 -/* 0711A8 800705A8 24846C10 */ addiu $a0, %lo(D_800E6C10) # addiu $a0, $a0, 0x6c10 -/* 0711AC 800705AC 1000004F */ b .L800706EC -/* 0711B0 800705B0 00000000 */ nop -glabel L800705B4 -/* 0711B4 800705B4 3C04800E */ lui $a0, %hi(D_800E6AA8) # $a0, 0x800e -/* 0711B8 800705B8 0C01C0CA */ jal func_80070328 -/* 0711BC 800705BC 24846AA8 */ addiu $a0, %lo(D_800E6AA8) # addiu $a0, $a0, 0x6aa8 -/* 0711C0 800705C0 1000004A */ b .L800706EC -/* 0711C4 800705C4 00000000 */ nop -glabel L800705C8 -/* 0711C8 800705C8 3C0F8019 */ lui $t7, %hi(D_8018EDF3) # $t7, 0x8019 -/* 0711CC 800705CC 81EFEDF3 */ lb $t7, %lo(D_8018EDF3)($t7) -/* 0711D0 800705D0 24010001 */ li $at, 1 -/* 0711D4 800705D4 24140019 */ li $s4, 25 -/* 0711D8 800705D8 15E10003 */ bne $t7, $at, .L800705E8 -/* 0711DC 800705DC 00008025 */ move $s0, $zero -/* 0711E0 800705E0 10000001 */ b .L800705E8 -/* 0711E4 800705E4 24140032 */ li $s4, 50 -.L800705E8: -/* 0711E8 800705E8 1A80000D */ blez $s4, .L80070620 -/* 0711EC 800705EC 00008825 */ move $s1, $zero -/* 0711F0 800705F0 3C138019 */ lui $s3, %hi(D_8018CC80) # $s3, 0x8019 -/* 0711F4 800705F4 3C128019 */ lui $s2, %hi(D_8018D1F8) # $s2, 0x8019 -/* 0711F8 800705F8 2652D1F8 */ addiu $s2, %lo(D_8018D1F8) # addiu $s2, $s2, -0x2e08 -/* 0711FC 800705FC 2673CC80 */ addiu $s3, %lo(D_8018CC80) # addiu $s3, $s3, -0x3380 -.L80070600: -/* 071200 80070600 8E580000 */ lw $t8, ($s2) -/* 071204 80070604 0018C880 */ sll $t9, $t8, 2 -/* 071208 80070608 02794021 */ addu $t0, $s3, $t9 -/* 07120C 8007060C 0C01C7C0 */ jal find_unused_obj_index -/* 071210 80070610 01102021 */ addu $a0, $t0, $s0 -/* 071214 80070614 26310001 */ addiu $s1, $s1, 1 -/* 071218 80070618 1634FFF9 */ bne $s1, $s4, .L80070600 -/* 07121C 8007061C 26100004 */ addiu $s0, $s0, 4 -.L80070620: -/* 071220 80070620 3C128019 */ lui $s2, %hi(D_8018D1F8) # $s2, 0x8019 -/* 071224 80070624 2652D1F8 */ addiu $s2, %lo(D_8018D1F8) # addiu $s2, $s2, -0x2e08 -/* 071228 80070628 8E490000 */ lw $t1, ($s2) -/* 07122C 8007062C 3C018019 */ lui $at, %hi(D_8018D1F0) # $at, 0x8019 -/* 071230 80070630 01315021 */ addu $t2, $t1, $s1 -/* 071234 80070634 AE4A0000 */ sw $t2, ($s2) -/* 071238 80070638 1000002C */ b .L800706EC -/* 07123C 8007063C AC31D1F0 */ sw $s1, %lo(D_8018D1F0)($at) -glabel L80070640 -/* 071240 80070640 3C04800E */ lui $a0, %hi(D_800E6B00) # $a0, 0x800e -/* 071244 80070644 0C01C0CA */ jal func_80070328 -/* 071248 80070648 24846B00 */ addiu $a0, %lo(D_800E6B00) # addiu $a0, $a0, 0x6b00 -/* 07124C 8007064C 10000027 */ b .L800706EC -/* 071250 80070650 00000000 */ nop -glabel L80070654 -/* 071254 80070654 3C04800E */ lui $a0, %hi(D_800E6B38) # $a0, 0x800e -/* 071258 80070658 0C01C0CA */ jal func_80070328 -/* 07125C 8007065C 24846B38 */ addiu $a0, %lo(D_800E6B38) # addiu $a0, $a0, 0x6b38 -/* 071260 80070660 10000022 */ b .L800706EC -/* 071264 80070664 00000000 */ nop -glabel L80070668 -/* 071268 80070668 3C04800E */ lui $a0, %hi(D_800E6A38) # $a0, 0x800e -/* 07126C 8007066C 0C01C0CA */ jal func_80070328 -/* 071270 80070670 24846A38 */ addiu $a0, %lo(D_800E6A38) # addiu $a0, $a0, 0x6a38 -/* 071274 80070674 1000001D */ b .L800706EC -/* 071278 80070678 00000000 */ nop -glabel L8007067C -/* 07127C 8007067C 3C04800E */ lui $a0, %hi(D_800E6AA8) # $a0, 0x800e -/* 071280 80070680 0C01C0CA */ jal func_80070328 -/* 071284 80070684 24846AA8 */ addiu $a0, %lo(D_800E6AA8) # addiu $a0, $a0, 0x6aa8 -/* 071288 80070688 10000018 */ b .L800706EC -/* 07128C 8007068C 00000000 */ nop -glabel L80070690 -/* 071290 80070690 3C04800E */ lui $a0, %hi(D_800E6C80) # $a0, 0x800e -/* 071294 80070694 0C01C128 */ jal func_800704A0 -/* 071298 80070698 24846C80 */ addiu $a0, %lo(D_800E6C80) # addiu $a0, $a0, 0x6c80 -/* 07129C 8007069C 10000013 */ b .L800706EC -/* 0712A0 800706A0 00000000 */ nop -glabel L800706A4 -/* 0712A4 800706A4 3C04800E */ lui $a0, %hi(D_800E6C10) # $a0, 0x800e -/* 0712A8 800706A8 0C01C0CA */ jal func_80070328 -/* 0712AC 800706AC 24846C10 */ addiu $a0, %lo(D_800E6C10) # addiu $a0, $a0, 0x6c10 -/* 0712B0 800706B0 1000000E */ b .L800706EC -/* 0712B4 800706B4 00000000 */ nop -glabel L800706B8 -/* 0712B8 800706B8 3C04800E */ lui $a0, %hi(D_800E6BA8) # $a0, 0x800e -/* 0712BC 800706BC 0C01C0CA */ jal func_80070328 -/* 0712C0 800706C0 24846BA8 */ addiu $a0, %lo(D_800E6BA8) # addiu $a0, $a0, 0x6ba8 -/* 0712C4 800706C4 10000009 */ b .L800706EC -/* 0712C8 800706C8 00000000 */ nop -glabel L800706CC -/* 0712CC 800706CC 3C04800E */ lui $a0, %hi(D_800E6C80) # $a0, 0x800e -/* 0712D0 800706D0 0C01C128 */ jal func_800704A0 -/* 0712D4 800706D4 24846C80 */ addiu $a0, %lo(D_800E6C80) # addiu $a0, $a0, 0x6c80 -/* 0712D8 800706D8 10000004 */ b .L800706EC -/* 0712DC 800706DC 00000000 */ nop -glabel L800706E0 -/* 0712E0 800706E0 3C04800E */ lui $a0, %hi(D_800E6DE0) # $a0, 0x800e -/* 0712E4 800706E4 0C01C128 */ jal func_800704A0 -/* 0712E8 800706E8 24846DE0 */ addiu $a0, %lo(D_800E6DE0) # addiu $a0, $a0, 0x6de0 -.L800706EC: -glabel L800706EC -/* 0712EC 800706EC 0C02308F */ jal func_8008C23C -/* 0712F0 800706F0 00000000 */ nop -/* 0712F4 800706F4 8FBF002C */ lw $ra, 0x2c($sp) -/* 0712F8 800706F8 8FB00018 */ lw $s0, 0x18($sp) -/* 0712FC 800706FC 8FB1001C */ lw $s1, 0x1c($sp) -/* 071300 80070700 8FB20020 */ lw $s2, 0x20($sp) -/* 071304 80070704 8FB30024 */ lw $s3, 0x24($sp) -/* 071308 80070708 8FB40028 */ lw $s4, 0x28($sp) -/* 07130C 8007070C 03E00008 */ jr $ra -/* 071310 80070710 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/non_matchings/code_80071F00/func_800791F0.s b/asm/non_matchings/code_80071F00/func_800791F0.s deleted file mode 100644 index 04b499dc3..000000000 --- a/asm/non_matchings/code_80071F00/func_800791F0.s +++ /dev/null @@ -1,62 +0,0 @@ -glabel func_800791F0 -/* 079DF0 800791F0 000578C0 */ sll $t7, $a1, 3 -/* 079DF4 800791F4 0004C8C0 */ sll $t9, $a0, 3 -/* 079DF8 800791F8 01E57823 */ subu $t7, $t7, $a1 -/* 079DFC 800791FC 0324C823 */ subu $t9, $t9, $a0 -/* 079E00 80079200 000F7900 */ sll $t7, $t7, 4 -/* 079E04 80079204 0019C940 */ sll $t9, $t9, 5 -/* 079E08 80079208 3C028016 */ lui $v0, %hi(D_80165CF0) # 0x8016 -/* 079E0C 8007920C 01E57823 */ subu $t7, $t7, $a1 -/* 079E10 80079210 00591021 */ addu $v0, $v0, $t9 -/* 079E14 80079214 90425CF0 */ lbu $v0, %lo(D_80165CF0)($v0) # 0x5cf0($v0) -/* 079E18 80079218 000F7880 */ sll $t7, $t7, 2 -/* 079E1C 8007921C 3C18800E */ lui $t8, %hi(gPlayerOne) # $t8, 0x800e -/* 079E20 80079220 8F18C4DC */ lw $t8, %lo(gPlayerOne)($t8) -/* 079E24 80079224 01E57823 */ subu $t7, $t7, $a1 -/* 079E28 80079228 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 079E2C 8007922C 000F78C0 */ sll $t7, $t7, 3 -/* 079E30 80079230 24010003 */ li $at, 3 -/* 079E34 80079234 AFBF0014 */ sw $ra, 0x14($sp) -/* 079E38 80079238 AFA50024 */ sw $a1, 0x24($sp) -/* 079E3C 8007923C 10410013 */ beq $v0, $at, .L8007928C -/* 079E40 80079240 01F81821 */ addu $v1, $t7, $t8 -/* 079E44 80079244 24010007 */ li $at, 7 -/* 079E48 80079248 10410010 */ beq $v0, $at, .L8007928C -/* 079E4C 8007924C 24050001 */ li $a1, 1 -/* 079E50 80079250 AFA3001C */ sw $v1, 0x1c($sp) -/* 079E54 80079254 0C01C8B3 */ jal func_800722CC -/* 079E58 80079258 AFA40020 */ sw $a0, 0x20($sp) -/* 079E5C 8007925C 3C02800E */ lui $v0, %hi(gCurrentCourseId) # $v0, 0x800e -/* 079E60 80079260 8442C5A0 */ lh $v0, %lo(gCurrentCourseId)($v0) -/* 079E64 80079264 2401000C */ li $at, 12 -/* 079E68 80079268 8FA3001C */ lw $v1, 0x1c($sp) -/* 079E6C 8007926C 14410009 */ bne $v0, $at, .L80079294 -/* 079E70 80079270 8FA40020 */ lw $a0, 0x20($sp) -/* 079E74 80079274 846800CA */ lh $t0, 0xca($v1) -/* 079E78 80079278 3C02800E */ lui $v0, %hi(gCurrentCourseId) # $v0, 0x800e -/* 079E7C 8007927C 3109FFEF */ andi $t1, $t0, 0xffef -/* 079E80 80079280 A46900CA */ sh $t1, 0xca($v1) -/* 079E84 80079284 10000003 */ b .L80079294 -/* 079E88 80079288 8442C5A0 */ lh $v0, %lo(gCurrentCourseId)($v0) -.L8007928C: -/* 079E8C 8007928C 3C02800E */ lui $v0, %hi(gCurrentCourseId) # $v0, 0x800e -/* 079E90 80079290 8442C5A0 */ lh $v0, %lo(gCurrentCourseId)($v0) -.L80079294: -/* 079E94 80079294 2401000C */ li $at, 12 -/* 079E98 80079298 14410007 */ bne $v0, $at, .L800792B8 -/* 079E9C 8007929C 24050010 */ li $a1, 16 -/* 079EA0 800792A0 0C01C8B3 */ jal func_800722CC -/* 079EA4 800792A4 AFA3001C */ sw $v1, 0x1c($sp) -/* 079EA8 800792A8 8FA3001C */ lw $v1, 0x1c($sp) -/* 079EAC 800792AC 846A00CA */ lh $t2, 0xca($v1) -/* 079EB0 800792B0 314BFFDF */ andi $t3, $t2, 0xffdf -/* 079EB4 800792B4 A46B00CA */ sh $t3, 0xca($v1) -.L800792B8: -/* 079EB8 800792B8 3C050100 */ lui $a1, (0x0100FA28 >> 16) # lui $a1, 0x100 -/* 079EBC 800792BC 34A5FA28 */ ori $a1, (0x0100FA28 & 0xFFFF) # ori $a1, $a1, 0xfa28 -/* 079EC0 800792C0 0C032406 */ jal func_800C9018 -/* 079EC4 800792C4 93A40027 */ lbu $a0, 0x27($sp) -/* 079EC8 800792C8 8FBF0014 */ lw $ra, 0x14($sp) -/* 079ECC 800792CC 27BD0020 */ addiu $sp, $sp, 0x20 -/* 079ED0 800792D0 03E00008 */ jr $ra -/* 079ED4 800792D4 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_8007BBBC.s b/asm/non_matchings/code_80071F00/func_8007BBBC.s deleted file mode 100644 index 33b59a731..000000000 --- a/asm/non_matchings/code_80071F00/func_8007BBBC.s +++ /dev/null @@ -1,91 +0,0 @@ -glabel func_8007BBBC -/* 07C7BC 8007BBBC 000470C0 */ sll $t6, $a0, 3 -/* 07C7C0 8007BBC0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 07C7C4 8007BBC4 01C47023 */ subu $t6, $t6, $a0 -/* 07C7C8 8007BBC8 3C0F8016 */ lui $t7, %hi(D_80165C18) # $t7, 0x8016 -/* 07C7CC 8007BBCC AFB10020 */ sw $s1, 0x20($sp) -/* 07C7D0 8007BBD0 25EF5C18 */ addiu $t7, %lo(D_80165C18) # addiu $t7, $t7, 0x5c18 -/* 07C7D4 8007BBD4 000E7140 */ sll $t6, $t6, 5 -/* 07C7D8 8007BBD8 01CF8821 */ addu $s1, $t6, $t7 -/* 07C7DC 8007BBDC 862200A6 */ lh $v0, 0xa6($s1) -/* 07C7E0 8007BBE0 AFB0001C */ sw $s0, 0x1c($sp) -/* 07C7E4 8007BBE4 00808025 */ move $s0, $a0 -/* 07C7E8 8007BBE8 10400041 */ beqz $v0, .L8007BCF0 -/* 07C7EC 8007BBEC AFBF0024 */ sw $ra, 0x24($sp) -/* 07C7F0 8007BBF0 24010001 */ li $at, 1 -/* 07C7F4 8007BBF4 10410009 */ beq $v0, $at, .L8007BC1C -/* 07C7F8 8007BBF8 02002025 */ move $a0, $s0 -/* 07C7FC 8007BBFC 24010002 */ li $at, 2 -/* 07C800 8007BC00 1041000F */ beq $v0, $at, .L8007BC40 -/* 07C804 8007BC04 3C18800E */ lui $t8, %hi(gIsMirrorMode) # $t8, 0x800e -/* 07C808 8007BC08 24010003 */ li $at, 3 -/* 07C80C 8007BC0C 10410036 */ beq $v0, $at, .L8007BCE8 -/* 07C810 8007BC10 00000000 */ nop -/* 07C814 8007BC14 10000037 */ b .L8007BCF4 -/* 07C818 8007BC18 8FBF0024 */ lw $ra, 0x24($sp) -.L8007BC1C: -/* 07C81C 8007BC1C 3C050600 */ lui $a1, %hi(d_course_banshee_boardwalk_dl_cheep_cheep) # $a1, 0x600 -/* 07C820 8007BC20 24A57BA8 */ addiu $a1, %lo(d_course_banshee_boardwalk_dl_cheep_cheep) # addiu $a1, $a1, 0x7ba8 -/* 07C824 8007BC24 0C01CD6F */ jal func_800735BC -/* 07C828 8007BC28 3C064000 */ lui $a2, 0x4000 -/* 07C82C 8007BC2C 02002025 */ move $a0, $s0 -/* 07C830 8007BC30 0C01C870 */ jal func_800721C0 -/* 07C834 8007BC34 24050010 */ li $a1, 16 -/* 07C838 8007BC38 1000002D */ b .L8007BCF0 -/* 07C83C 8007BC3C A22000D5 */ sb $zero, 0xd5($s1) -.L8007BC40: -/* 07C840 8007BC40 8F18C604 */ lw $t8, %lo(gIsMirrorMode)($t8) -/* 07C844 8007BC44 02002025 */ move $a0, $s0 -/* 07C848 8007BC48 3C054190 */ lui $a1, 0x4190 -/* 07C84C 8007BC4C 1300000D */ beqz $t8, .L8007BC84 -/* 07C850 8007BC50 3C063F33 */ lui $a2, 0x3f33 -/* 07C854 8007BC54 3C063F33 */ lui $a2, (0x3F333333 >> 16) # lui $a2, 0x3f33 -/* 07C858 8007BC58 2419A800 */ li $t9, -22528 -/* 07C85C 8007BC5C 2408012C */ li $t0, 300 -/* 07C860 8007BC60 AFA80014 */ sw $t0, 0x14($sp) -/* 07C864 8007BC64 AFB90010 */ sw $t9, 0x10($sp) -/* 07C868 8007BC68 34C63333 */ ori $a2, (0x3F333333 & 0xFFFF) # ori $a2, $a2, 0x3333 -/* 07C86C 8007BC6C 02002025 */ move $a0, $s0 -/* 07C870 8007BC70 3C054190 */ lui $a1, 0x4190 -/* 07C874 8007BC74 0C021F82 */ jal func_80087E08 -/* 07C878 8007BC78 3C0741C8 */ lui $a3, 0x41c8 -/* 07C87C 8007BC7C 10000009 */ b .L8007BCA4 -/* 07C880 8007BC80 C6200040 */ lwc1 $f0, 0x40($s1) -.L8007BC84: -/* 07C884 8007BC84 24095800 */ li $t1, 22528 -/* 07C888 8007BC88 240A012C */ li $t2, 300 -/* 07C88C 8007BC8C AFAA0014 */ sw $t2, 0x14($sp) -/* 07C890 8007BC90 AFA90010 */ sw $t1, 0x10($sp) -/* 07C894 8007BC94 34C63333 */ ori $a2, (0x3F333333 & 0xFFFF) # ori $a2, $a2, 0x3333 -/* 07C898 8007BC98 0C021F82 */ jal func_80087E08 -/* 07C89C 8007BC9C 3C0741C8 */ lui $a3, 0x41c8 -/* 07C8A0 8007BCA0 C6200040 */ lwc1 $f0, 0x40($s1) -.L8007BCA4: -/* 07C8A4 8007BCA4 44802000 */ mtc1 $zero, $f4 -/* 07C8A8 8007BCA8 00000000 */ nop -/* 07C8AC 8007BCAC 4604003C */ c.lt.s $f0, $f4 -/* 07C8B0 8007BCB0 00000000 */ nop -/* 07C8B4 8007BCB4 45020004 */ bc1fl .L8007BCC8 -/* 07C8B8 8007BCB8 46000386 */ mov.s $f14, $f0 -/* 07C8BC 8007BCBC 10000002 */ b .L8007BCC8 -/* 07C8C0 8007BCC0 46000387 */ neg.s $f14, $f0 -/* 07C8C4 8007BCC4 46000386 */ mov.s $f14, $f0 -.L8007BCC8: -/* 07C8C8 8007BCC8 0C010596 */ jal func_80041658 -/* 07C8CC 8007BCCC C62C003C */ lwc1 $f12, 0x3c($s1) -/* 07C8D0 8007BCD0 A62200BE */ sh $v0, 0xbe($s1) -/* 07C8D4 8007BCD4 02002025 */ move $a0, $s0 -/* 07C8D8 8007BCD8 0C01C9E3 */ jal func_8007278C -/* 07C8DC 8007BCDC 24050046 */ li $a1, 70 -/* 07C8E0 8007BCE0 10000004 */ b .L8007BCF4 -/* 07C8E4 8007BCE4 8FBF0024 */ lw $ra, 0x24($sp) -.L8007BCE8: -/* 07C8E8 8007BCE8 0C01C90A */ jal func_80072428 -/* 07C8EC 8007BCEC 02002025 */ move $a0, $s0 -.L8007BCF0: -/* 07C8F0 8007BCF0 8FBF0024 */ lw $ra, 0x24($sp) -.L8007BCF4: -/* 07C8F4 8007BCF4 8FB0001C */ lw $s0, 0x1c($sp) -/* 07C8F8 8007BCF8 8FB10020 */ lw $s1, 0x20($sp) -/* 07C8FC 8007BCFC 03E00008 */ jr $ra -/* 07C900 8007BD00 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/non_matchings/code_80071F00/func_8007BEC8.s b/asm/non_matchings/code_80071F00/func_8007BEC8.s deleted file mode 100644 index 8cd1c42e4..000000000 --- a/asm/non_matchings/code_80071F00/func_8007BEC8.s +++ /dev/null @@ -1,75 +0,0 @@ -.section .late_rodata - -glabel jpt_800EEE20 -.word L8007BFA0, L8007BF0C, L8007BF1C, L8007BF4C -.word L8007BF68, L8007BF8C - -.section .text - -glabel func_8007BEC8 -/* 07CAC8 8007BEC8 000470C0 */ sll $t6, $a0, 3 -/* 07CACC 8007BECC 01C47023 */ subu $t6, $t6, $a0 -/* 07CAD0 8007BED0 3C0F8016 */ lui $t7, %hi(D_80165C18) # $t7, 0x8016 -/* 07CAD4 8007BED4 25EF5C18 */ addiu $t7, %lo(D_80165C18) # addiu $t7, $t7, 0x5c18 -/* 07CAD8 8007BED8 000E7140 */ sll $t6, $t6, 5 -/* 07CADC 8007BEDC 01CF1021 */ addu $v0, $t6, $t7 -/* 07CAE0 8007BEE0 945800A6 */ lhu $t8, 0xa6($v0) -/* 07CAE4 8007BEE4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 07CAE8 8007BEE8 AFBF0014 */ sw $ra, 0x14($sp) -/* 07CAEC 8007BEEC 2F010006 */ sltiu $at, $t8, 6 -/* 07CAF0 8007BEF0 1020002B */ beqz $at, .L8007BFA0 -/* 07CAF4 8007BEF4 0018C080 */ sll $t8, $t8, 2 -/* 07CAF8 8007BEF8 3C01800F */ lui $at, %hi(jpt_800EEE20) -/* 07CAFC 8007BEFC 00380821 */ addu $at, $at, $t8 -/* 07CB00 8007BF00 8C38EE20 */ lw $t8, %lo(jpt_800EEE20)($at) -/* 07CB04 8007BF04 03000008 */ jr $t8 -/* 07CB08 8007BF08 00000000 */ nop -glabel L8007BF0C -/* 07CB0C 8007BF0C 0C01EF78 */ jal func_8007BDE0 -/* 07CB10 8007BF10 00000000 */ nop -/* 07CB14 8007BF14 10000023 */ b .L8007BFA4 -/* 07CB18 8007BF18 8FBF0014 */ lw $ra, 0x14($sp) -glabel L8007BF1C -/* 07CB1C 8007BF1C 2405003C */ li $a1, 60 -/* 07CB20 8007BF20 0C01C9E3 */ jal func_8007278C -/* 07CB24 8007BF24 AFA40018 */ sw $a0, 0x18($sp) -/* 07CB28 8007BF28 1040001D */ beqz $v0, .L8007BFA0 -/* 07CB2C 8007BF2C 8FA40018 */ lw $a0, 0x18($sp) -/* 07CB30 8007BF30 24050010 */ li $a1, 16 -/* 07CB34 8007BF34 0C01C870 */ jal func_800721C0 -/* 07CB38 8007BF38 AFA40018 */ sw $a0, 0x18($sp) -/* 07CB3C 8007BF3C 0C021B9C */ jal func_80086E70 -/* 07CB40 8007BF40 8FA40018 */ lw $a0, 0x18($sp) -/* 07CB44 8007BF44 10000017 */ b .L8007BFA4 -/* 07CB48 8007BF48 8FBF0014 */ lw $ra, 0x14($sp) -glabel L8007BF4C -/* 07CB4C 8007BF4C 845900AE */ lh $t9, 0xae($v0) -/* 07CB50 8007BF50 57200014 */ bnel $t9, $zero, .L8007BFA4 -/* 07CB54 8007BF54 8FBF0014 */ lw $ra, 0x14($sp) -/* 07CB58 8007BF58 0C01C922 */ jal func_80072488 -/* 07CB5C 8007BF5C 00000000 */ nop -/* 07CB60 8007BF60 10000010 */ b .L8007BFA4 -/* 07CB64 8007BF64 8FBF0014 */ lw $ra, 0x14($sp) -glabel L8007BF68 -/* 07CB68 8007BF68 2405000A */ li $a1, 10 -/* 07CB6C 8007BF6C 0C01C9E3 */ jal func_8007278C -/* 07CB70 8007BF70 AFA40018 */ sw $a0, 0x18($sp) -/* 07CB74 8007BF74 1040000A */ beqz $v0, .L8007BFA0 -/* 07CB78 8007BF78 8FA40018 */ lw $a0, 0x18($sp) -/* 07CB7C 8007BF7C 0C021C07 */ jal func_8008701C -/* 07CB80 8007BF80 24050002 */ li $a1, 2 -/* 07CB84 8007BF84 10000007 */ b .L8007BFA4 -/* 07CB88 8007BF88 8FBF0014 */ lw $ra, 0x14($sp) -glabel L8007BF8C -/* 07CB8C 8007BF8C 844800AE */ lh $t0, 0xae($v0) -/* 07CB90 8007BF90 55000004 */ bnel $t0, $zero, .L8007BFA4 -/* 07CB94 8007BF94 8FBF0014 */ lw $ra, 0x14($sp) -/* 07CB98 8007BF98 0C01C90A */ jal func_80072428 -/* 07CB9C 8007BF9C 00000000 */ nop -.L8007BFA0: -glabel L8007BFA0 -/* 07CBA0 8007BFA0 8FBF0014 */ lw $ra, 0x14($sp) -.L8007BFA4: -/* 07CBA4 8007BFA4 27BD0018 */ addiu $sp, $sp, 0x18 -/* 07CBA8 8007BFA8 03E00008 */ jr $ra -/* 07CBAC 8007BFAC 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_8007BFB0.s b/asm/non_matchings/code_80071F00/func_8007BFB0.s deleted file mode 100644 index c49c08fbf..000000000 --- a/asm/non_matchings/code_80071F00/func_8007BFB0.s +++ /dev/null @@ -1,240 +0,0 @@ -.section .late_rodata - -glabel jpt_800EEE38 -.word L8007C220, L8007C000 -.word L8007C040, L8007C060, L8007C0BC, L8007C0F8 -.word L8007C180, L8007C1B0, L8007C214 - -glabel D_800EEE5C -.float -0.2 - -glabel D_800EEE60 -.double 0.0015 - -glabel D_800EEE68 -.double 0.0015 - -glabel D_800EEE70 -.float 0.001 -.word 0x00000000 - -glabel D_800EEE78 -.double 0.004 - -glabel D_800EEE80 -.double 0.0002 - -glabel D_800EEE88 -.double 0.05 - -glabel D_800EEE90 -.double 0.01 - -glabel D_800EEE98 -.float 0.000001 - -glabel D_800EEE9C -.float 0.001 - -.section .text - -glabel func_8007BFB0 -/* 07CBB0 8007BFB0 000470C0 */ sll $t6, $a0, 3 -/* 07CBB4 8007BFB4 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 07CBB8 8007BFB8 01C47023 */ subu $t6, $t6, $a0 -/* 07CBBC 8007BFBC 3C0F8016 */ lui $t7, %hi(D_80165C18) # $t7, 0x8016 -/* 07CBC0 8007BFC0 AFB00024 */ sw $s0, 0x24($sp) -/* 07CBC4 8007BFC4 25EF5C18 */ addiu $t7, %lo(D_80165C18) # addiu $t7, $t7, 0x5c18 -/* 07CBC8 8007BFC8 000E7140 */ sll $t6, $t6, 5 -/* 07CBCC 8007BFCC 01CF8021 */ addu $s0, $t6, $t7 -/* 07CBD0 8007BFD0 860200AE */ lh $v0, 0xae($s0) -/* 07CBD4 8007BFD4 AFB10028 */ sw $s1, 0x28($sp) -/* 07CBD8 8007BFD8 00808825 */ move $s1, $a0 -/* 07CBDC 8007BFDC 2C410009 */ sltiu $at, $v0, 9 -/* 07CBE0 8007BFE0 1020008F */ beqz $at, .L8007C220 -/* 07CBE4 8007BFE4 AFBF002C */ sw $ra, 0x2c($sp) -/* 07CBE8 8007BFE8 0002C080 */ sll $t8, $v0, 2 -/* 07CBEC 8007BFEC 3C01800F */ lui $at, %hi(jpt_800EEE38) # 0x800f -/* 07CBF0 8007BFF0 00380821 */ addu $at, $at, $t8 -/* 07CBF4 8007BFF4 8C38EE38 */ lw $t8, %lo(jpt_800EEE38)($at) # -0x11c8($at) -/* 07CBF8 8007BFF8 03000008 */ jr $t8 -/* 07CBFC 8007BFFC 00000000 */ nop -glabel L8007C000 -/* 07CC00 8007C000 C608002C */ lwc1 $f8, 0x2c($s0) -/* 07CC04 8007C004 44803800 */ mtc1 $zero, $f7 -/* 07CC08 8007C008 44803000 */ mtc1 $zero, $f6 -/* 07CC0C 8007C00C 460042A1 */ cvt.d.s $f10, $f8 -/* 07CC10 8007C010 3C01800F */ lui $at, %hi(D_800EEE5C) # $at, 0x800f -/* 07CC14 8007C014 4626503E */ c.le.d $f10, $f6 -/* 07CC18 8007C018 C424EE5C */ lwc1 $f4, %lo(D_800EEE5C)($at) -/* 07CC1C 8007C01C 45000006 */ bc1f .L8007C038 -/* 07CC20 8007C020 E604003C */ swc1 $f4, 0x3c($s0) -/* 07CC24 8007C024 44800000 */ mtc1 $zero, $f0 -/* 07CC28 8007C028 02202025 */ move $a0, $s1 -/* 07CC2C 8007C02C E600002C */ swc1 $f0, 0x2c($s0) -/* 07CC30 8007C030 0C021BD8 */ jal func_80086F60 -/* 07CC34 8007C034 E600003C */ swc1 $f0, 0x3c($s0) -.L8007C038: -/* 07CC38 8007C038 10000079 */ b .L8007C220 -/* 07CC3C 8007C03C 860200AE */ lh $v0, 0xae($s0) -glabel L8007C040 -/* 07CC40 8007C040 02202025 */ move $a0, $s1 -/* 07CC44 8007C044 0C021C6B */ jal func_800871AC -/* 07CC48 8007C048 24050014 */ li $a1, 20 -/* 07CC4C 8007C04C 10400002 */ beqz $v0, .L8007C058 -/* 07CC50 8007C050 24190040 */ li $t9, 64 -/* 07CC54 8007C054 A6190092 */ sh $t9, 0x92($s0) -.L8007C058: -/* 07CC58 8007C058 10000071 */ b .L8007C220 -/* 07CC5C 8007C05C 860200AE */ lh $v0, 0xae($s0) -glabel L8007C060 -/* 07CC60 8007C060 C6100000 */ lwc1 $f16, ($s0) -/* 07CC64 8007C064 3C01800F */ lui $at, %hi(D_800EEE60) -/* 07CC68 8007C068 D424EE60 */ ldc1 $f4, %lo(D_800EEE60)($at) -/* 07CC6C 8007C06C 460084A1 */ cvt.d.s $f18, $f16 -/* 07CC70 8007C070 960800BE */ lhu $t0, 0xbe($s0) -/* 07CC74 8007C074 46249201 */ sub.d $f8, $f18, $f4 -/* 07CC78 8007C078 260400BE */ addiu $a0, $s0, 0xbe -/* 07CC7C 8007C07C 29010A01 */ slti $at, $t0, 0xa01 -/* 07CC80 8007C080 24050C00 */ li $a1, 3072 -/* 07CC84 8007C084 462041A0 */ cvt.s.d $f6, $f8 -/* 07CC88 8007C088 14200004 */ bnez $at, .L8007C09C -/* 07CC8C 8007C08C E6060000 */ swc1 $f6, ($s0) -/* 07CC90 8007C090 86090092 */ lh $t1, 0x92($s0) -/* 07CC94 8007C094 252AFFFC */ addiu $t2, $t1, -4 -/* 07CC98 8007C098 A60A0092 */ sh $t2, 0x92($s0) -.L8007C09C: -/* 07CC9C 8007C09C 0C01040A */ jal u16_step_up_towards -/* 07CCA0 8007C0A0 96060092 */ lhu $a2, 0x92($s0) -/* 07CCA4 8007C0A4 10400003 */ beqz $v0, .L8007C0B4 -/* 07CCA8 8007C0A8 00000000 */ nop -/* 07CCAC 8007C0AC 0C021BF5 */ jal func_80086FD4 -/* 07CCB0 8007C0B0 02202025 */ move $a0, $s1 -.L8007C0B4: -/* 07CCB4 8007C0B4 1000005A */ b .L8007C220 -/* 07CCB8 8007C0B8 860200AE */ lh $v0, 0xae($s0) -glabel L8007C0BC -/* 07CCBC 8007C0BC C60A0000 */ lwc1 $f10, ($s0) -/* 07CCC0 8007C0C0 3C01800F */ lui $at, %hi(D_800EEE68) -/* 07CCC4 8007C0C4 D432EE68 */ ldc1 $f18, %lo(D_800EEE68)($at) -/* 07CCC8 8007C0C8 46005421 */ cvt.d.s $f16, $f10 -/* 07CCCC 8007C0CC 3C01800F */ lui $at, %hi(D_800EEE70) # $at, 0x800f -/* 07CCD0 8007C0D0 46328101 */ sub.d $f4, $f16, $f18 -/* 07CCD4 8007C0D4 02202025 */ move $a0, $s1 -/* 07CCD8 8007C0D8 46202220 */ cvt.s.d $f8, $f4 -/* 07CCDC 8007C0DC E6080000 */ swc1 $f8, ($s0) -/* 07CCE0 8007C0E0 C426EE70 */ lwc1 $f6, %lo(D_800EEE70)($at) -/* 07CCE4 8007C0E4 0C021BF5 */ jal func_80086FD4 -/* 07CCE8 8007C0E8 E6060034 */ swc1 $f6, 0x34($s0) -/* 07CCEC 8007C0EC A6000092 */ sh $zero, 0x92($s0) -/* 07CCF0 8007C0F0 1000004B */ b .L8007C220 -/* 07CCF4 8007C0F4 860200AE */ lh $v0, 0xae($s0) -glabel L8007C0F8 -/* 07CCF8 8007C0F8 C6020034 */ lwc1 $f2, 0x34($s0) -/* 07CCFC 8007C0FC 3C01800F */ lui $at, %hi(D_800EEE78) -/* 07CD00 8007C100 D42AEE78 */ ldc1 $f10, %lo(D_800EEE78)($at) -/* 07CD04 8007C104 46001021 */ cvt.d.s $f0, $f2 -/* 07CD08 8007C108 3C01800F */ lui $at, %hi(D_800EEE80) -/* 07CD0C 8007C10C 462A003E */ c.le.d $f0, $f10 -/* 07CD10 8007C110 00000000 */ nop -/* 07CD14 8007C114 45020007 */ bc1fl .L8007C134 -/* 07CD18 8007C118 C6080000 */ lwc1 $f8, ($s0) -/* 07CD1C 8007C11C D430EE80 */ ldc1 $f16, %lo(D_800EEE80)($at) -/* 07CD20 8007C120 46300480 */ add.d $f18, $f0, $f16 -/* 07CD24 8007C124 46209120 */ cvt.s.d $f4, $f18 -/* 07CD28 8007C128 E6040034 */ swc1 $f4, 0x34($s0) -/* 07CD2C 8007C12C C6020034 */ lwc1 $f2, 0x34($s0) -/* 07CD30 8007C130 C6080000 */ lwc1 $f8, ($s0) -.L8007C134: -/* 07CD34 8007C134 26040092 */ addiu $a0, $s0, 0x92 -/* 07CD38 8007C138 24050100 */ li $a1, 256 -/* 07CD3C 8007C13C 46024180 */ add.s $f6, $f8, $f2 -/* 07CD40 8007C140 24060010 */ li $a2, 16 -/* 07CD44 8007C144 0C0103F6 */ jal s16_step_up_towards -/* 07CD48 8007C148 E6060000 */ swc1 $f6, ($s0) -/* 07CD4C 8007C14C 960B00BE */ lhu $t3, 0xbe($s0) -/* 07CD50 8007C150 860C0092 */ lh $t4, 0x92($s0) -/* 07CD54 8007C154 02202025 */ move $a0, $s1 -/* 07CD58 8007C158 24050035 */ li $a1, 53 -/* 07CD5C 8007C15C 016C6823 */ subu $t5, $t3, $t4 -/* 07CD60 8007C160 0C021C18 */ jal func_80087060 -/* 07CD64 8007C164 A60D00BE */ sh $t5, 0xbe($s0) -/* 07CD68 8007C168 10400003 */ beqz $v0, .L8007C178 -/* 07CD6C 8007C16C 00000000 */ nop -/* 07CD70 8007C170 0C021BF5 */ jal func_80086FD4 -/* 07CD74 8007C174 02202025 */ move $a0, $s1 -.L8007C178: -/* 07CD78 8007C178 10000029 */ b .L8007C220 -/* 07CD7C 8007C17C 860200AE */ lh $v0, 0xae($s0) -glabel L8007C180 -/* 07CD80 8007C180 02202025 */ move $a0, $s1 -/* 07CD84 8007C184 0C021C18 */ jal func_80087060 -/* 07CD88 8007C188 2405000F */ li $a1, 15 -/* 07CD8C 8007C18C 10400006 */ beqz $v0, .L8007C1A8 -/* 07CD90 8007C190 00000000 */ nop -/* 07CD94 8007C194 0C021BF5 */ jal func_80086FD4 -/* 07CD98 8007C198 02202025 */ move $a0, $s1 -/* 07CD9C 8007C19C 240E0001 */ li $t6, 1 -/* 07CDA0 8007C1A0 3C018016 */ lui $at, %hi(D_801658CE) # $at, 0x8016 -/* 07CDA4 8007C1A4 A02E58CE */ sb $t6, %lo(D_801658CE)($at) -.L8007C1A8: -/* 07CDA8 8007C1A8 1000001D */ b .L8007C220 -/* 07CDAC 8007C1AC 860200AE */ lh $v0, 0xae($s0) -glabel L8007C1B0 -/* 07CDB0 8007C1B0 C60A0000 */ lwc1 $f10, ($s0) -/* 07CDB4 8007C1B4 3C01800F */ lui $at, %hi(D_800EEE88) -/* 07CDB8 8007C1B8 D432EE88 */ ldc1 $f18, %lo(D_800EEE88)($at) -/* 07CDBC 8007C1BC 46005421 */ cvt.d.s $f16, $f10 -/* 07CDC0 8007C1C0 3C01800F */ lui $at, %hi(D_800EEE90) -/* 07CDC4 8007C1C4 46328101 */ sub.d $f4, $f16, $f18 -/* 07CDC8 8007C1C8 02202025 */ move $a0, $s1 -/* 07CDCC 8007C1CC 46202220 */ cvt.s.d $f8, $f4 -/* 07CDD0 8007C1D0 E6080000 */ swc1 $f8, ($s0) -/* 07CDD4 8007C1D4 C60A0000 */ lwc1 $f10, ($s0) -/* 07CDD8 8007C1D8 D426EE90 */ ldc1 $f6, %lo(D_800EEE90)($at) -/* 07CDDC 8007C1DC 46005421 */ cvt.d.s $f16, $f10 -/* 07CDE0 8007C1E0 4626803E */ c.le.d $f16, $f6 -/* 07CDE4 8007C1E4 00000000 */ nop -/* 07CDE8 8007C1E8 45000008 */ bc1f .L8007C20C -/* 07CDEC 8007C1EC 00000000 */ nop -/* 07CDF0 8007C1F0 0C01C87A */ jal func_800721E8 -/* 07CDF4 8007C1F4 24050010 */ li $a1, 16 -/* 07CDF8 8007C1F8 3C01800F */ lui $at, %hi(D_800EEE98) # $at, 0x800f -/* 07CDFC 8007C1FC C432EE98 */ lwc1 $f18, %lo(D_800EEE98)($at) -/* 07CE00 8007C200 02202025 */ move $a0, $s1 -/* 07CE04 8007C204 0C021BF5 */ jal func_80086FD4 -/* 07CE08 8007C208 E6120000 */ swc1 $f18, ($s0) -.L8007C20C: -/* 07CE0C 8007C20C 10000004 */ b .L8007C220 -/* 07CE10 8007C210 860200AE */ lh $v0, 0xae($s0) -glabel L8007C214 -/* 07CE14 8007C214 0C021BD8 */ jal func_80086F60 -/* 07CE18 8007C218 02202025 */ move $a0, $s1 -/* 07CE1C 8007C21C 860200AE */ lh $v0, 0xae($s0) -.L8007C220: -glabel L8007C220 -/* 07CE20 8007C220 2841000A */ slti $at, $v0, 0xa -/* 07CE24 8007C224 1020000D */ beqz $at, .L8007C25C -/* 07CE28 8007C228 02202025 */ move $a0, $s1 -/* 07CE2C 8007C22C 3C01800F */ lui $at, %hi(D_800EEE9C) # $at, 0x800f -/* 07CE30 8007C230 C424EE9C */ lwc1 $f4, %lo(D_800EEE9C)($at) -/* 07CE34 8007C234 3C063E4C */ lui $a2, (0x3E4CCCCD >> 16) # lui $a2, 0x3e4c -/* 07CE38 8007C238 3C073E57 */ lui $a3, (0x3E570A3D >> 16) # lui $a3, 0x3e57 -/* 07CE3C 8007C23C 240FFFFF */ li $t7, -1 -/* 07CE40 8007C240 AFAF0018 */ sw $t7, 0x18($sp) -/* 07CE44 8007C244 34E70A3D */ ori $a3, (0x3E570A3D & 0xFFFF) # ori $a3, $a3, 0xa3d -/* 07CE48 8007C248 34C6CCCD */ ori $a2, (0x3E4CCCCD & 0xFFFF) # ori $a2, $a2, 0xcccd -/* 07CE4C 8007C24C 02002825 */ move $a1, $s0 -/* 07CE50 8007C250 AFA00014 */ sw $zero, 0x14($sp) -/* 07CE54 8007C254 0C01D0D1 */ jal func_80074344 -/* 07CE58 8007C258 E7A40010 */ swc1 $f4, 0x10($sp) -.L8007C25C: -/* 07CE5C 8007C25C 0C021DF1 */ jal func_800877C4 -/* 07CE60 8007C260 02202025 */ move $a0, $s1 -/* 07CE64 8007C264 0C022FC6 */ jal func_8008BF18 -/* 07CE68 8007C268 02202025 */ move $a0, $s1 -/* 07CE6C 8007C26C 8FBF002C */ lw $ra, 0x2c($sp) -/* 07CE70 8007C270 8FB00024 */ lw $s0, 0x24($sp) -/* 07CE74 8007C274 8FB10028 */ lw $s1, 0x28($sp) -/* 07CE78 8007C278 03E00008 */ jr $ra -/* 07CE7C 8007C27C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/non_matchings/code_80071F00/func_8007C684.s b/asm/non_matchings/code_80071F00/func_8007C684.s deleted file mode 100644 index 2bf34ae01..000000000 --- a/asm/non_matchings/code_80071F00/func_8007C684.s +++ /dev/null @@ -1,94 +0,0 @@ -.section .late_rodata - -glabel jpt_800EEEA4 -.word L8007C798, L8007C704, L8007C734, L8007C764 -.word L8007C780 - -.section .text - -glabel func_8007C684 -/* 07D284 8007C684 000470C0 */ sll $t6, $a0, 3 -/* 07D288 8007C688 01C47023 */ subu $t6, $t6, $a0 -/* 07D28C 8007C68C 3C0F8016 */ lui $t7, %hi(D_80165C18) # $t7, 0x8016 -/* 07D290 8007C690 25EF5C18 */ addiu $t7, %lo(D_80165C18) # addiu $t7, $t7, 0x5c18 -/* 07D294 8007C694 000E7140 */ sll $t6, $t6, 5 -/* 07D298 8007C698 01CF1021 */ addu $v0, $t6, $t7 -/* 07D29C 8007C69C 844500A6 */ lh $a1, 0xa6($v0) -/* 07D2A0 8007C6A0 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 07D2A4 8007C6A4 AFB00028 */ sw $s0, 0x28($sp) -/* 07D2A8 8007C6A8 00808025 */ move $s0, $a0 -/* 07D2AC 8007C6AC AFBF002C */ sw $ra, 0x2c($sp) -/* 07D2B0 8007C6B0 10A00008 */ beqz $a1, .L8007C6D4 -/* 07D2B4 8007C6B4 00A01825 */ move $v1, $a1 -/* 07D2B8 8007C6B8 24010001 */ li $at, 1 -/* 07D2BC 8007C6BC 54610006 */ bnel $v1, $at, .L8007C6D8 -/* 07D2C0 8007C6C0 28A10002 */ slti $at, $a1, 2 -/* 07D2C4 8007C6C4 0C01F16D */ jal func_8007C5B4 -/* 07D2C8 8007C6C8 AFA20030 */ sw $v0, 0x30($sp) -/* 07D2CC 8007C6CC 8FA20030 */ lw $v0, 0x30($sp) -/* 07D2D0 8007C6D0 844500A6 */ lh $a1, 0xa6($v0) -.L8007C6D4: -/* 07D2D4 8007C6D4 28A10002 */ slti $at, $a1, 2 -.L8007C6D8: -/* 07D2D8 8007C6D8 54200032 */ bnel $at, $zero, .L8007C7A4 -/* 07D2DC 8007C6DC 8FBF002C */ lw $ra, 0x2c($sp) -/* 07D2E0 8007C6E0 905800DC */ lbu $t8, 0xdc($v0) -/* 07D2E4 8007C6E4 2F010005 */ sltiu $at, $t8, 5 -/* 07D2E8 8007C6E8 1020002B */ beqz $at, .L8007C798 -/* 07D2EC 8007C6EC 0018C080 */ sll $t8, $t8, 2 -/* 07D2F0 8007C6F0 3C01800F */ lui $at, %hi(jpt_800EEEA4) -/* 07D2F4 8007C6F4 00380821 */ addu $at, $at, $t8 -/* 07D2F8 8007C6F8 8C38EEA4 */ lw $t8, %lo(jpt_800EEEA4)($at) -/* 07D2FC 8007C6FC 03000008 */ jr $t8 -/* 07D300 8007C700 00000000 */ nop -glabel L8007C704 -/* 07D304 8007C704 24190002 */ li $t9, 2 -/* 07D308 8007C708 24080001 */ li $t0, 1 -/* 07D30C 8007C70C AFA80014 */ sw $t0, 0x14($sp) -/* 07D310 8007C710 AFB90010 */ sw $t9, 0x10($sp) -/* 07D314 8007C714 02002025 */ move $a0, $s0 -/* 07D318 8007C718 244500A0 */ addiu $a1, $v0, 0xa0 -/* 07D31C 8007C71C 00003025 */ move $a2, $zero -/* 07D320 8007C720 24070050 */ li $a3, 80 -/* 07D324 8007C724 0C01CE66 */ jal func_80073998 -/* 07D328 8007C728 AFA00018 */ sw $zero, 0x18($sp) -/* 07D32C 8007C72C 1000001A */ b .L8007C798 -/* 07D330 8007C730 00000000 */ nop -glabel L8007C734 -/* 07D334 8007C734 24090001 */ li $t1, 1 -/* 07D338 8007C738 240AFFFF */ li $t2, -1 -/* 07D33C 8007C73C AFAA0018 */ sw $t2, 0x18($sp) -/* 07D340 8007C740 AFA90010 */ sw $t1, 0x10($sp) -/* 07D344 8007C744 02002025 */ move $a0, $s0 -/* 07D348 8007C748 244500A0 */ addiu $a1, $v0, 0xa0 -/* 07D34C 8007C74C 24060050 */ li $a2, 80 -/* 07D350 8007C750 24070078 */ li $a3, 120 -/* 07D354 8007C754 0C01CF2C */ jal func_80073CB0 -/* 07D358 8007C758 AFA00014 */ sw $zero, 0x14($sp) -/* 07D35C 8007C75C 1000000E */ b .L8007C798 -/* 07D360 8007C760 00000000 */ nop -glabel L8007C764 -/* 07D364 8007C764 02002025 */ move $a0, $s0 -/* 07D368 8007C768 244500A0 */ addiu $a1, $v0, 0xa0 -/* 07D36C 8007C76C 00003025 */ move $a2, $zero -/* 07D370 8007C770 0C01CF70 */ jal func_80073DC0 -/* 07D374 8007C774 24070002 */ li $a3, 2 -/* 07D378 8007C778 10000007 */ b .L8007C798 -/* 07D37C 8007C77C 00000000 */ nop -glabel L8007C780 -/* 07D380 8007C780 0C01C90A */ jal func_80072428 -/* 07D384 8007C784 02002025 */ move $a0, $s0 -/* 07D388 8007C788 0C021BD8 */ jal func_80086F60 -/* 07D38C 8007C78C 02002025 */ move $a0, $s0 -/* 07D390 8007C790 0C01CE21 */ jal func_80073884 -/* 07D394 8007C794 02002025 */ move $a0, $s0 -.L8007C798: -glabel L8007C798 -/* 07D398 8007C798 0C01CD45 */ jal func_80073514 -/* 07D39C 8007C79C 02002025 */ move $a0, $s0 -/* 07D3A0 8007C7A0 8FBF002C */ lw $ra, 0x2c($sp) -.L8007C7A4: -/* 07D3A4 8007C7A4 8FB00028 */ lw $s0, 0x28($sp) -/* 07D3A8 8007C7A8 27BD0038 */ addiu $sp, $sp, 0x38 -/* 07D3AC 8007C7AC 03E00008 */ jr $ra -/* 07D3B0 8007C7B0 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_8007C9F8.s b/asm/non_matchings/code_80071F00/func_8007C9F8.s deleted file mode 100644 index 7e3c771f5..000000000 --- a/asm/non_matchings/code_80071F00/func_8007C9F8.s +++ /dev/null @@ -1,39 +0,0 @@ -glabel func_8007C9F8 -/* 07D5F8 8007C9F8 3C028019 */ lui $v0, %hi(D_8018EDF3) # $v0, 0x8019 -/* 07D5FC 8007C9FC 8042EDF3 */ lb $v0, %lo(D_8018EDF3)($v0) -/* 07D600 8007CA00 24010001 */ li $at, 1 -/* 07D604 8007CA04 54410004 */ bnel $v0, $at, .L8007CA18 -/* 07D608 8007CA08 24010002 */ li $at, 2 -/* 07D60C 8007CA0C 03E00008 */ jr $ra -/* 07D610 8007CA10 00001025 */ move $v0, $zero - -/* 07D614 8007CA14 24010002 */ li $at, 2 -.L8007CA18: -/* 07D618 8007CA18 14410012 */ bne $v0, $at, .L8007CA64 -/* 07D61C 8007CA1C 3C038016 */ lui $v1, %hi(gGPCurrentRacePlayerIdByRank) # 0x8016 -/* 07D620 8007CA20 3C0E800E */ lui $t6, %hi(gModeSelection) # $t6, 0x800e -/* 07D624 8007CA24 8DCEC53C */ lw $t6, %lo(gModeSelection)($t6) -/* 07D628 8007CA28 3C048016 */ lui $a0, %hi(gGPCurrentRaceRankByPlayerId) # $a0, 0x8016 -/* 07D62C 8007CA2C 248443B8 */ addiu $a0, %lo(gGPCurrentRaceRankByPlayerId) # addiu $a0, $a0, 0x43b8 -/* 07D630 8007CA30 15C0000A */ bnez $t6, .L8007CA5C -/* 07D634 8007CA34 3C038016 */ lui $v1, %hi(gGPCurrentRacePlayerIdByRank) # 0x8016 -/* 07D638 8007CA38 8C820000 */ lw $v0, ($a0) -/* 07D63C 8007CA3C 8C830004 */ lw $v1, 4($a0) -/* 07D640 8007CA40 0043082A */ slt $at, $v0, $v1 -/* 07D644 8007CA44 10200003 */ beqz $at, .L8007CA54 -/* 07D648 8007CA48 00000000 */ nop -/* 07D64C 8007CA4C 03E00008 */ jr $ra -/* 07D650 8007CA50 00001025 */ move $v0, $zero - -.L8007CA54: -/* 07D654 8007CA54 03E00008 */ jr $ra -/* 07D658 8007CA58 24020001 */ li $v0, 1 - -.L8007CA5C: -/* 07D65C 8007CA5C 03E00008 */ jr $ra -/* 07D660 8007CA60 84624360 */ lh $v0, %lo(gGPCurrentRacePlayerIdByRank)($v1) # 0x4360($v1) - -.L8007CA64: -/* 07D664 8007CA64 84634360 */ lh $v1, %lo(gGPCurrentRacePlayerIdByRank)($v1) # 0x4360($v1) -/* 07D668 8007CA68 03E00008 */ jr $ra -/* 07D66C 8007CA6C 00601025 */ move $v0, $v1 diff --git a/asm/non_matchings/code_80071F00/func_8007D794.s b/asm/non_matchings/code_80071F00/func_8007D794.s deleted file mode 100644 index 3be5b0ec9..000000000 --- a/asm/non_matchings/code_80071F00/func_8007D794.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_8007D794 -/* 07E394 8007D794 3C02800E */ lui $v0, %hi(gCCSelection) # $v0, 0x800e -/* 07E398 8007D798 8C42C548 */ lw $v0, %lo(gCCSelection)($v0) -/* 07E39C 8007D79C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 07E3A0 8007D7A0 AFBF0014 */ sw $ra, 0x14($sp) -/* 07E3A4 8007D7A4 14400007 */ bnez $v0, .L8007D7C4 -/* 07E3A8 8007D7A8 24010001 */ li $at, 1 -/* 07E3AC 8007D7AC 3C063E4C */ lui $a2, (0x3E4CCCCD >> 16) # lui $a2, 0x3e4c -/* 07E3B0 8007D7B0 34C6CCCD */ ori $a2, (0x3E4CCCCD & 0xFFFF) # ori $a2, $a2, 0xcccd -/* 07E3B4 8007D7B4 0C022681 */ jal func_80089A04 -/* 07E3B8 8007D7B8 3C053F00 */ lui $a1, 0x3f00 -/* 07E3BC 8007D7BC 1000000E */ b .L8007D7F8 -/* 07E3C0 8007D7C0 8FBF0014 */ lw $ra, 0x14($sp) -.L8007D7C4: -/* 07E3C4 8007D7C4 14410008 */ bne $v0, $at, .L8007D7E8 -/* 07E3C8 8007D7C8 3C053E80 */ lui $a1, 0x3e80 -/* 07E3CC 8007D7CC 3C053ECC */ lui $a1, (0x3ECCCCCD >> 16) # lui $a1, 0x3ecc -/* 07E3D0 8007D7D0 3C063E19 */ lui $a2, (0x3E19999A >> 16) # lui $a2, 0x3e19 -/* 07E3D4 8007D7D4 34C6999A */ ori $a2, (0x3E19999A & 0xFFFF) # ori $a2, $a2, 0x999a -/* 07E3D8 8007D7D8 0C022681 */ jal func_80089A04 -/* 07E3DC 8007D7DC 34A5CCCD */ ori $a1, (0x3ECCCCCD & 0xFFFF) # ori $a1, $a1, 0xcccd -/* 07E3E0 8007D7E0 10000005 */ b .L8007D7F8 -/* 07E3E4 8007D7E4 8FBF0014 */ lw $ra, 0x14($sp) -.L8007D7E8: -/* 07E3E8 8007D7E8 3C063DCC */ lui $a2, (0x3DCCCCCD >> 16) # lui $a2, 0x3dcc -/* 07E3EC 8007D7EC 0C022681 */ jal func_80089A04 -/* 07E3F0 8007D7F0 34C6CCCD */ ori $a2, (0x3DCCCCCD & 0xFFFF) # ori $a2, $a2, 0xcccd -/* 07E3F4 8007D7F4 8FBF0014 */ lw $ra, 0x14($sp) -.L8007D7F8: -/* 07E3F8 8007D7F8 27BD0018 */ addiu $sp, $sp, 0x18 -/* 07E3FC 8007D7FC 03E00008 */ jr $ra -/* 07E400 8007D800 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_8007DF20.s b/asm/non_matchings/code_80071F00/func_8007DF20.s deleted file mode 100644 index 3fa880f31..000000000 --- a/asm/non_matchings/code_80071F00/func_8007DF20.s +++ /dev/null @@ -1,72 +0,0 @@ -.section .late_rodata - -glabel D_800EEF44 -.float 1765.0 - -glabel D_800EEF48 -.float -1765.0 - -.section .text - -glabel func_8007DF20 -/* 07EB20 8007DF20 000470C0 */ sll $t6, $a0, 3 -/* 07EB24 8007DF24 01C47023 */ subu $t6, $t6, $a0 -/* 07EB28 8007DF28 3C0F8016 */ lui $t7, %hi(D_80165C18) # $t7, 0x8016 -/* 07EB2C 8007DF2C 25EF5C18 */ addiu $t7, %lo(D_80165C18) # addiu $t7, $t7, 0x5c18 -/* 07EB30 8007DF30 000E7140 */ sll $t6, $t6, 5 -/* 07EB34 8007DF34 01CF1021 */ addu $v0, $t6, $t7 -/* 07EB38 8007DF38 3C013F80 */ li $at, 0x3F800000 # 1.000000 -/* 07EB3C 8007DF3C 44812000 */ mtc1 $at, $f4 -/* 07EB40 8007DF40 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 07EB44 8007DF44 3C180601 */ lui $t8, %hi(d_course_banshee_boardwalk_dl_trash_bin) # $t8, 0x601 -/* 07EB48 8007DF48 AFBF0014 */ sw $ra, 0x14($sp) -/* 07EB4C 8007DF4C 2718A9D8 */ addiu $t8, %lo(d_course_banshee_boardwalk_dl_trash_bin) # addiu $t8, $t8, -0x5628 -/* 07EB50 8007DF50 AC580070 */ sw $t8, 0x70($v0) -/* 07EB54 8007DF54 AC40004C */ sw $zero, 0x4c($v0) -/* 07EB58 8007DF58 A4400092 */ sh $zero, 0x92($v0) -/* 07EB5C 8007DF5C AFA2001C */ sw $v0, 0x1c($sp) -/* 07EB60 8007DF60 AFA40020 */ sw $a0, 0x20($sp) -/* 07EB64 8007DF64 00002825 */ move $a1, $zero -/* 07EB68 8007DF68 00003025 */ move $a2, $zero -/* 07EB6C 8007DF6C 00003825 */ move $a3, $zero -/* 07EB70 8007DF70 0C022E2F */ jal func_8008B8BC -/* 07EB74 8007DF74 E4440000 */ swc1 $f4, ($v0) -/* 07EB78 8007DF78 3C19800E */ lui $t9, %hi(gIsMirrorMode) # $t9, 0x800e -/* 07EB7C 8007DF7C 8F39C604 */ lw $t9, %lo(gIsMirrorMode)($t9) -/* 07EB80 8007DF80 44800000 */ mtc1 $zero, $f0 -/* 07EB84 8007DF84 8FA2001C */ lw $v0, 0x1c($sp) -/* 07EB88 8007DF88 1320000A */ beqz $t9, .L8007DFB4 -/* 07EB8C 8007DF8C 3C01800F */ lui $at, %hi(D_800EEF48) # 0x800f -/* 07EB90 8007DF90 3C01800F */ lui $at, %hi(D_800EEF44) # $at, 0x800f -/* 07EB94 8007DF94 C426EF44 */ lwc1 $f6, %lo(D_800EEF44)($at) -/* 07EB98 8007DF98 3C014343 */ li $at, 0x43430000 # 195.000000 -/* 07EB9C 8007DF9C 44814000 */ mtc1 $at, $f8 -/* 07EBA0 8007DFA0 34088000 */ li $t0, 32768 -/* 07EBA4 8007DFA4 A44800B4 */ sh $t0, 0xb4($v0) -/* 07EBA8 8007DFA8 E4460004 */ swc1 $f6, 4($v0) -/* 07EBAC 8007DFAC 10000006 */ b .L8007DFC8 -/* 07EBB0 8007DFB0 E448000C */ swc1 $f8, 0xc($v0) -.L8007DFB4: -/* 07EBB4 8007DFB4 C42AEF48 */ lwc1 $f10, %lo(D_800EEF48)($at) -/* 07EBB8 8007DFB8 3C01428C */ li $at, 0x428C0000 # 70.000000 -/* 07EBBC 8007DFBC 44818000 */ mtc1 $at, $f16 -/* 07EBC0 8007DFC0 E44A0004 */ swc1 $f10, 4($v0) -/* 07EBC4 8007DFC4 E450000C */ swc1 $f16, 0xc($v0) -.L8007DFC8: -/* 07EBC8 8007DFC8 3C014234 */ li $at, 0x42340000 # 45.000000 -/* 07EBCC 8007DFCC 44819000 */ mtc1 $at, $f18 -/* 07EBD0 8007DFD0 44050000 */ mfc1 $a1, $f0 -/* 07EBD4 8007DFD4 44060000 */ mfc1 $a2, $f0 -/* 07EBD8 8007DFD8 44070000 */ mfc1 $a3, $f0 -/* 07EBDC 8007DFDC 8FA40020 */ lw $a0, 0x20($sp) -/* 07EBE0 8007DFE0 AFA2001C */ sw $v0, 0x1c($sp) -/* 07EBE4 8007DFE4 0C022E3C */ jal func_8008B8F0 -/* 07EBE8 8007DFE8 E4520008 */ swc1 $f18, 8($v0) -/* 07EBEC 8007DFEC 8FA2001C */ lw $v0, 0x1c($sp) -/* 07EBF0 8007DFF0 8FA40020 */ lw $a0, 0x20($sp) -/* 07EBF4 8007DFF4 0C01C922 */ jal func_80072488 -/* 07EBF8 8007DFF8 A44000A4 */ sh $zero, 0xa4($v0) -/* 07EBFC 8007DFFC 8FBF0014 */ lw $ra, 0x14($sp) -/* 07EC00 8007E000 27BD0020 */ addiu $sp, $sp, 0x20 -/* 07EC04 8007E004 03E00008 */ jr $ra -/* 07EC08 8007E008 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_8007E00C.s b/asm/non_matchings/code_80071F00/func_8007E00C.s index e22ebb512..9a1749254 100644 --- a/asm/non_matchings/code_80071F00/func_8007E00C.s +++ b/asm/non_matchings/code_80071F00/func_8007E00C.s @@ -27,7 +27,7 @@ glabel func_8007E00C /* 07EC50 8007E050 03000008 */ jr $t8 /* 07EC54 8007E054 00000000 */ nop glabel L8007E058 -/* 07EC58 8007E058 0C01F7C8 */ jal func_8007DF20 +/* 07EC58 8007E058 0C01F7C8 */ jal init_bb_trash_bin /* 07EC5C 8007E05C 00C02025 */ move $a0, $a2 /* 07EC60 8007E060 1000004E */ b .L8007E19C /* 07EC64 8007E064 8FBF002C */ lw $ra, 0x2c($sp) diff --git a/asm/non_matchings/code_80071F00/func_8007E63C.s b/asm/non_matchings/code_80071F00/func_8007E63C.s deleted file mode 100644 index 09d9a81ff..000000000 --- a/asm/non_matchings/code_80071F00/func_8007E63C.s +++ /dev/null @@ -1,429 +0,0 @@ -.section .late_rodata - -glabel jpt_800EEF84 -.word L8007E8CC, L8007E8F4 -.word L8007E908, L8007E930, L8007E98C, L8007E9B4 -.word L8007EA44, L8007EA80, L8007EB88 - -glabel jpt_800EEFA8 -.word L8007E6E0 -.word L8007E748, L8007E82C, L8007E844, L8007E85C - -.section .text - -glabel func_8007E63C -/* 07F23C 8007E63C 000470C0 */ sll $t6, $a0, 3 -/* 07F240 8007E640 01C47023 */ subu $t6, $t6, $a0 -/* 07F244 8007E644 3C0F8016 */ lui $t7, %hi(D_80165C18) # $t7, 0x8016 -/* 07F248 8007E648 25EF5C18 */ addiu $t7, %lo(D_80165C18) # addiu $t7, $t7, 0x5c18 -/* 07F24C 8007E64C 000E7140 */ sll $t6, $t6, 5 -/* 07F250 8007E650 01CF1821 */ addu $v1, $t6, $t7 -/* 07F254 8007E654 846200A6 */ lh $v0, 0xa6($v1) -/* 07F258 8007E658 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 07F25C 8007E65C AFB00020 */ sw $s0, 0x20($sp) -/* 07F260 8007E660 2841006D */ slti $at, $v0, 0x6d -/* 07F264 8007E664 00808025 */ move $s0, $a0 -/* 07F268 8007E668 14200009 */ bnez $at, .L8007E690 -/* 07F26C 8007E66C AFBF0024 */ sw $ra, 0x24($sp) -/* 07F270 8007E670 240100C8 */ li $at, 200 -/* 07F274 8007E674 10410152 */ beq $v0, $at, .L8007EBC0 -/* 07F278 8007E678 02002025 */ move $a0, $s0 -/* 07F27C 8007E67C 2401012C */ li $at, 300 -/* 07F280 8007E680 1041015C */ beq $v0, $at, .L8007EBF4 -/* 07F284 8007E684 02002025 */ move $a0, $s0 -/* 07F288 8007E688 10000165 */ b .L8007EC20 -/* 07F28C 8007E68C 8FBF0024 */ lw $ra, 0x24($sp) -.L8007E690: -/* 07F290 8007E690 28410037 */ slti $at, $v0, 0x37 -/* 07F294 8007E694 1420000A */ bnez $at, .L8007E6C0 -/* 07F298 8007E698 2459FFCE */ addiu $t9, $v0, -0x32 -/* 07F29C 8007E69C 2458FF9C */ addiu $t8, $v0, -0x64 -/* 07F2A0 8007E6A0 2F010009 */ sltiu $at, $t8, 9 -/* 07F2A4 8007E6A4 1020015D */ beqz $at, .L8007EC1C -/* 07F2A8 8007E6A8 0018C080 */ sll $t8, $t8, 2 -/* 07F2AC 8007E6AC 3C01800F */ lui $at, %hi(jpt_800EEF84) -/* 07F2B0 8007E6B0 00380821 */ addu $at, $at, $t8 -/* 07F2B4 8007E6B4 8C38EF84 */ lw $t8, %lo(jpt_800EEF84)($at) # -0x107c($at) -/* 07F2B8 8007E6B8 03000008 */ jr $t8 -/* 07F2BC 8007E6BC 00000000 */ nop -.L8007E6C0: -/* 07F2C0 8007E6C0 2F210005 */ sltiu $at, $t9, 5 -/* 07F2C4 8007E6C4 10200155 */ beqz $at, .L8007EC1C -/* 07F2C8 8007E6C8 0019C880 */ sll $t9, $t9, 2 -/* 07F2CC 8007E6CC 3C01800F */ lui $at, %hi(jpt_800EEFA8) -/* 07F2D0 8007E6D0 00390821 */ addu $at, $at, $t9 -/* 07F2D4 8007E6D4 8C39EFA8 */ lw $t9, %lo(jpt_800EEFA8)($at) # -0x1058($at) -/* 07F2D8 8007E6D8 03200008 */ jr $t9 -/* 07F2DC 8007E6DC 00000000 */ nop -glabel L8007E6E0 -/* 07F2E0 8007E6E0 C4640020 */ lwc1 $f4, 0x20($v1) -/* 07F2E4 8007E6E4 3C01402E */ li $at, 0x402E0000 # 2.718750 -/* 07F2E8 8007E6E8 44814800 */ mtc1 $at, $f9 -/* 07F2EC 8007E6EC 44804000 */ mtc1 $zero, $f8 -/* 07F2F0 8007E6F0 460021A1 */ cvt.d.s $f6, $f4 -/* 07F2F4 8007E6F4 2464002C */ addiu $a0, $v1, 0x2c -/* 07F2F8 8007E6F8 46283280 */ add.d $f10, $f6, $f8 -/* 07F2FC 8007E6FC 3C063FC0 */ lui $a2, 0x3fc0 -/* 07F300 8007E700 46205420 */ cvt.s.d $f16, $f10 -/* 07F304 8007E704 44058000 */ mfc1 $a1, $f16 -/* 07F308 8007E708 0C0103B8 */ jal f32_step_up_towards -/* 07F30C 8007E70C 00000000 */ nop -/* 07F310 8007E710 10400142 */ beqz $v0, .L8007EC1C -/* 07F314 8007E714 02002025 */ move $a0, $s0 -/* 07F318 8007E718 0C01C870 */ jal func_800721C0 -/* 07F31C 8007E71C 24050200 */ li $a1, 512 -/* 07F320 8007E720 02002025 */ move $a0, $s0 -/* 07F324 8007E724 0C01C8A9 */ jal func_800722A4 -/* 07F328 8007E728 24050001 */ li $a1, 1 -/* 07F32C 8007E72C 02002025 */ move $a0, $s0 -/* 07F330 8007E730 0C01C8B3 */ jal func_800722CC -/* 07F334 8007E734 24050002 */ li $a1, 2 -/* 07F338 8007E738 0C01C922 */ jal func_80072488 -/* 07F33C 8007E73C 02002025 */ move $a0, $s0 -/* 07F340 8007E740 10000137 */ b .L8007EC20 -/* 07F344 8007E744 8FBF0024 */ lw $ra, 0x24($sp) -glabel L8007E748 -/* 07F348 8007E748 2464002C */ addiu $a0, $v1, 0x2c -/* 07F34C 8007E74C 24050000 */ li $a1, 0 -/* 07F350 8007E750 3C064000 */ lui $a2, 0x4000 -/* 07F354 8007E754 0C0103CB */ jal f32_step_down_towards -/* 07F358 8007E758 AFA30028 */ sw $v1, 0x28($sp) -/* 07F35C 8007E75C 1040012F */ beqz $v0, .L8007EC1C -/* 07F360 8007E760 8FA30028 */ lw $v1, 0x28($sp) -/* 07F364 8007E764 3C014180 */ li $at, 0x41800000 # 16.000000 -/* 07F368 8007E768 44819000 */ mtc1 $at, $f18 -/* 07F36C 8007E76C C460002C */ lwc1 $f0, 0x2c($v1) -/* 07F370 8007E770 3C014100 */ li $at, 0x41000000 # 8.000000 -/* 07F374 8007E774 02002025 */ move $a0, $s0 -/* 07F378 8007E778 4600903E */ c.le.s $f18, $f0 -/* 07F37C 8007E77C 00000000 */ nop -/* 07F380 8007E780 45020004 */ bc1fl .L8007E794 -/* 07F384 8007E784 44812000 */ mtc1 $at, $f4 -/* 07F388 8007E788 1000000B */ b .L8007E7B8 -/* 07F38C 8007E78C A06000D2 */ sb $zero, 0xd2($v1) -/* 07F390 8007E790 44812000 */ mtc1 $at, $f4 -.L8007E794: -/* 07F394 8007E794 24080001 */ li $t0, 1 -/* 07F398 8007E798 24090002 */ li $t1, 2 -/* 07F39C 8007E79C 4600203E */ c.le.s $f4, $f0 -/* 07F3A0 8007E7A0 00000000 */ nop -/* 07F3A4 8007E7A4 45020004 */ bc1fl .L8007E7B8 -/* 07F3A8 8007E7A8 A06900D2 */ sb $t1, 0xd2($v1) -/* 07F3AC 8007E7AC 10000002 */ b .L8007E7B8 -/* 07F3B0 8007E7B0 A06800D2 */ sb $t0, 0xd2($v1) -/* 07F3B4 8007E7B4 A06900D2 */ sb $t1, 0xd2($v1) -.L8007E7B8: -/* 07F3B8 8007E7B8 0C01C8B3 */ jal func_800722CC -/* 07F3BC 8007E7BC 24050001 */ li $a1, 1 -/* 07F3C0 8007E7C0 02002025 */ move $a0, $s0 -/* 07F3C4 8007E7C4 0C01C88F */ jal func_8007223C -/* 07F3C8 8007E7C8 3C050001 */ lui $a1, 1 -/* 07F3CC 8007E7CC 1040000A */ beqz $v0, .L8007E7F8 -/* 07F3D0 8007E7D0 02002025 */ move $a0, $s0 -/* 07F3D4 8007E7D4 0C01C8A9 */ jal func_800722A4 -/* 07F3D8 8007E7D8 24050010 */ li $a1, 16 -/* 07F3DC 8007E7DC 02002025 */ move $a0, $s0 -/* 07F3E0 8007E7E0 0C01C88F */ jal func_8007223C -/* 07F3E4 8007E7E4 3C050004 */ lui $a1, 4 -/* 07F3E8 8007E7E8 10400003 */ beqz $v0, .L8007E7F8 -/* 07F3EC 8007E7EC 02002025 */ move $a0, $s0 -/* 07F3F0 8007E7F0 0C01C8A9 */ jal func_800722A4 -/* 07F3F4 8007E7F4 24050020 */ li $a1, 32 -.L8007E7F8: -/* 07F3F8 8007E7F8 02002025 */ move $a0, $s0 -/* 07F3FC 8007E7FC 0C01C8C8 */ jal func_80072320 -/* 07F400 8007E800 24050002 */ li $a1, 2 -/* 07F404 8007E804 10400005 */ beqz $v0, .L8007E81C -/* 07F408 8007E808 02002025 */ move $a0, $s0 -/* 07F40C 8007E80C 0C01C9B3 */ jal func_800726CC -/* 07F410 8007E810 24050064 */ li $a1, 100 -/* 07F414 8007E814 10000102 */ b .L8007EC20 -/* 07F418 8007E818 8FBF0024 */ lw $ra, 0x24($sp) -.L8007E81C: -/* 07F41C 8007E81C 0C01C922 */ jal func_80072488 -/* 07F420 8007E820 02002025 */ move $a0, $s0 -/* 07F424 8007E824 100000FE */ b .L8007EC20 -/* 07F428 8007E828 8FBF0024 */ lw $ra, 0x24($sp) -glabel L8007E82C -/* 07F42C 8007E82C 02002025 */ move $a0, $s0 -/* 07F430 8007E830 24050003 */ li $a1, 3 -/* 07F434 8007E834 0C01CAAB */ jal func_80072AAC -/* 07F438 8007E838 24060006 */ li $a2, 6 -/* 07F43C 8007E83C 100000F8 */ b .L8007EC20 -/* 07F440 8007E840 8FBF0024 */ lw $ra, 0x24($sp) -glabel L8007E844 -/* 07F444 8007E844 02002025 */ move $a0, $s0 -/* 07F448 8007E848 24050002 */ li $a1, 2 -/* 07F44C 8007E84C 0C01CAAB */ jal func_80072AAC -/* 07F450 8007E850 24060032 */ li $a2, 50 -/* 07F454 8007E854 100000F2 */ b .L8007EC20 -/* 07F458 8007E858 8FBF0024 */ lw $ra, 0x24($sp) -glabel L8007E85C -/* 07F45C 8007E85C 3C0141A0 */ li $at, 0x41A00000 # 20.000000 -/* 07F460 8007E860 44813000 */ mtc1 $at, $f6 -/* 07F464 8007E864 C460002C */ lwc1 $f0, 0x2c($v1) -/* 07F468 8007E868 3C014190 */ li $at, 0x41900000 # 18.000000 -/* 07F46C 8007E86C 2464002C */ addiu $a0, $v1, 0x2c -/* 07F470 8007E870 4600303E */ c.le.s $f6, $f0 -/* 07F474 8007E874 3C063F00 */ lui $a2, 0x3f00 -/* 07F478 8007E878 45020004 */ bc1fl .L8007E88C -/* 07F47C 8007E87C 44814000 */ mtc1 $at, $f8 -/* 07F480 8007E880 10000008 */ b .L8007E8A4 -/* 07F484 8007E884 A06000D2 */ sb $zero, 0xd2($v1) -/* 07F488 8007E888 44814000 */ mtc1 $at, $f8 -.L8007E88C: -/* 07F48C 8007E88C 240A0001 */ li $t2, 1 -/* 07F490 8007E890 4600403E */ c.le.s $f8, $f0 -/* 07F494 8007E894 00000000 */ nop -/* 07F498 8007E898 45000002 */ bc1f .L8007E8A4 -/* 07F49C 8007E89C 00000000 */ nop -/* 07F4A0 8007E8A0 A06A00D2 */ sb $t2, 0xd2($v1) -.L8007E8A4: -/* 07F4A4 8007E8A4 0C0103B8 */ jal f32_step_up_towards -/* 07F4A8 8007E8A8 8C650020 */ lw $a1, 0x20($v1) -/* 07F4AC 8007E8AC 104000DB */ beqz $v0, .L8007EC1C -/* 07F4B0 8007E8B0 02002025 */ move $a0, $s0 -/* 07F4B4 8007E8B4 0C01C87A */ jal func_800721E8 -/* 07F4B8 8007E8B8 24050200 */ li $a1, 512 -/* 07F4BC 8007E8BC 0C01C99B */ jal func_8007266C -/* 07F4C0 8007E8C0 02002025 */ move $a0, $s0 -/* 07F4C4 8007E8C4 100000D6 */ b .L8007EC20 -/* 07F4C8 8007E8C8 8FBF0024 */ lw $ra, 0x24($sp) -glabel L8007E8CC -/* 07F4CC 8007E8CC 240B0008 */ li $t3, 8 -/* 07F4D0 8007E8D0 AFAB0010 */ sw $t3, 0x10($sp) -/* 07F4D4 8007E8D4 02002025 */ move $a0, $s0 -/* 07F4D8 8007E8D8 24050003 */ li $a1, 3 -/* 07F4DC 8007E8DC 24060005 */ li $a2, 5 -/* 07F4E0 8007E8E0 24070001 */ li $a3, 1 -/* 07F4E4 8007E8E4 0C01CB95 */ jal func_80072E54 -/* 07F4E8 8007E8E8 AFA00014 */ sw $zero, 0x14($sp) -/* 07F4EC 8007E8EC 100000CC */ b .L8007EC20 -/* 07F4F0 8007E8F0 8FBF0024 */ lw $ra, 0x24($sp) -glabel L8007E8F4 -/* 07F4F4 8007E8F4 02002025 */ move $a0, $s0 -/* 07F4F8 8007E8F8 0C01C9E3 */ jal func_8007278C -/* 07F4FC 8007E8FC 2405001E */ li $a1, 30 -/* 07F500 8007E900 100000C7 */ b .L8007EC20 -/* 07F504 8007E904 8FBF0024 */ lw $ra, 0x24($sp) -glabel L8007E908 -/* 07F508 8007E908 2464002C */ addiu $a0, $v1, 0x2c -/* 07F50C 8007E90C 3C0541A0 */ lui $a1, 0x41a0 -/* 07F510 8007E910 0C0103B8 */ jal f32_step_up_towards -/* 07F514 8007E914 3C063FC0 */ lui $a2, 0x3fc0 -/* 07F518 8007E918 504000C1 */ beql $v0, $zero, .L8007EC20 -/* 07F51C 8007E91C 8FBF0024 */ lw $ra, 0x24($sp) -/* 07F520 8007E920 0C01C922 */ jal func_80072488 -/* 07F524 8007E924 02002025 */ move $a0, $s0 -/* 07F528 8007E928 100000BD */ b .L8007EC20 -/* 07F52C 8007E92C 8FBF0024 */ lw $ra, 0x24($sp) -glabel L8007E930 -/* 07F530 8007E930 2464002C */ addiu $a0, $v1, 0x2c -/* 07F534 8007E934 24050000 */ li $a1, 0 -/* 07F538 8007E938 0C0103CB */ jal f32_step_down_towards -/* 07F53C 8007E93C 3C063FC0 */ lui $a2, 0x3fc0 -/* 07F540 8007E940 104000B6 */ beqz $v0, .L8007EC1C -/* 07F544 8007E944 02002025 */ move $a0, $s0 -/* 07F548 8007E948 0C01C88F */ jal func_8007223C -/* 07F54C 8007E94C 3C050002 */ lui $a1, 2 -/* 07F550 8007E950 1040000A */ beqz $v0, .L8007E97C -/* 07F554 8007E954 02002025 */ move $a0, $s0 -/* 07F558 8007E958 0C01C8A9 */ jal func_800722A4 -/* 07F55C 8007E95C 24050010 */ li $a1, 16 -/* 07F560 8007E960 02002025 */ move $a0, $s0 -/* 07F564 8007E964 0C01C88F */ jal func_8007223C -/* 07F568 8007E968 3C050004 */ lui $a1, 4 -/* 07F56C 8007E96C 10400003 */ beqz $v0, .L8007E97C -/* 07F570 8007E970 02002025 */ move $a0, $s0 -/* 07F574 8007E974 0C01C8A9 */ jal func_800722A4 -/* 07F578 8007E978 24050020 */ li $a1, 32 -.L8007E97C: -/* 07F57C 8007E97C 0C01C922 */ jal func_80072488 -/* 07F580 8007E980 02002025 */ move $a0, $s0 -/* 07F584 8007E984 100000A6 */ b .L8007EC20 -/* 07F588 8007E988 8FBF0024 */ lw $ra, 0x24($sp) -glabel L8007E98C -/* 07F58C 8007E98C 2464002C */ addiu $a0, $v1, 0x2c -/* 07F590 8007E990 3C054140 */ lui $a1, 0x4140 -/* 07F594 8007E994 0C0103B8 */ jal f32_step_up_towards -/* 07F598 8007E998 3C063FC0 */ lui $a2, 0x3fc0 -/* 07F59C 8007E99C 504000A0 */ beql $v0, $zero, .L8007EC20 -/* 07F5A0 8007E9A0 8FBF0024 */ lw $ra, 0x24($sp) -/* 07F5A4 8007E9A4 0C01C922 */ jal func_80072488 -/* 07F5A8 8007E9A8 02002025 */ move $a0, $s0 -/* 07F5AC 8007E9AC 1000009C */ b .L8007EC20 -/* 07F5B0 8007E9B0 8FBF0024 */ lw $ra, 0x24($sp) -glabel L8007E9B4 -/* 07F5B4 8007E9B4 2464002C */ addiu $a0, $v1, 0x2c -/* 07F5B8 8007E9B8 24050000 */ li $a1, 0 -/* 07F5BC 8007E9BC 3C063FC0 */ lui $a2, 0x3fc0 -/* 07F5C0 8007E9C0 0C0103CB */ jal f32_step_down_towards -/* 07F5C4 8007E9C4 AFA30028 */ sw $v1, 0x28($sp) -/* 07F5C8 8007E9C8 10400094 */ beqz $v0, .L8007EC1C -/* 07F5CC 8007E9CC 8FA30028 */ lw $v1, 0x28($sp) -/* 07F5D0 8007E9D0 02002025 */ move $a0, $s0 -/* 07F5D4 8007E9D4 3C050002 */ lui $a1, 2 -/* 07F5D8 8007E9D8 0C01C88F */ jal func_8007223C -/* 07F5DC 8007E9DC AFA30028 */ sw $v1, 0x28($sp) -/* 07F5E0 8007E9E0 1040000F */ beqz $v0, .L8007EA20 -/* 07F5E4 8007E9E4 8FA30028 */ lw $v1, 0x28($sp) -/* 07F5E8 8007E9E8 02002025 */ move $a0, $s0 -/* 07F5EC 8007E9EC 24050010 */ li $a1, 16 -/* 07F5F0 8007E9F0 0C01C8A9 */ jal func_800722A4 -/* 07F5F4 8007E9F4 AFA30028 */ sw $v1, 0x28($sp) -/* 07F5F8 8007E9F8 02002025 */ move $a0, $s0 -/* 07F5FC 8007E9FC 0C01C88F */ jal func_8007223C -/* 07F600 8007EA00 3C050004 */ lui $a1, 4 -/* 07F604 8007EA04 10400006 */ beqz $v0, .L8007EA20 -/* 07F608 8007EA08 8FA30028 */ lw $v1, 0x28($sp) -/* 07F60C 8007EA0C 02002025 */ move $a0, $s0 -/* 07F610 8007EA10 24050020 */ li $a1, 32 -/* 07F614 8007EA14 0C01C8A9 */ jal func_800722A4 -/* 07F618 8007EA18 AFA30028 */ sw $v1, 0x28($sp) -/* 07F61C 8007EA1C 8FA30028 */ lw $v1, 0x28($sp) -.L8007EA20: -/* 07F620 8007EA20 3C061901 */ lui $a2, (0x19018045 >> 16) # lui $a2, 0x1901 -/* 07F624 8007EA24 34C68045 */ ori $a2, (0x19018045 & 0xFFFF) # ori $a2, $a2, 0x8045 -/* 07F628 8007EA28 24640004 */ addiu $a0, $v1, 4 -/* 07F62C 8007EA2C 0C03262E */ jal func_800C98B8 -/* 07F630 8007EA30 24650038 */ addiu $a1, $v1, 0x38 -/* 07F634 8007EA34 0C01C922 */ jal func_80072488 -/* 07F638 8007EA38 02002025 */ move $a0, $s0 -/* 07F63C 8007EA3C 10000078 */ b .L8007EC20 -/* 07F640 8007EA40 8FBF0024 */ lw $ra, 0x24($sp) -glabel L8007EA44 -/* 07F644 8007EA44 240C0006 */ li $t4, 6 -/* 07F648 8007EA48 240D0003 */ li $t5, 3 -/* 07F64C 8007EA4C AFAD0014 */ sw $t5, 0x14($sp) -/* 07F650 8007EA50 AFAC0010 */ sw $t4, 0x10($sp) -/* 07F654 8007EA54 02002025 */ move $a0, $s0 -/* 07F658 8007EA58 24050005 */ li $a1, 5 -/* 07F65C 8007EA5C 24060003 */ li $a2, 3 -/* 07F660 8007EA60 0C01CC9B */ jal func_8007326C -/* 07F664 8007EA64 24070001 */ li $a3, 1 -/* 07F668 8007EA68 5040006D */ beql $v0, $zero, .L8007EC20 -/* 07F66C 8007EA6C 8FBF0024 */ lw $ra, 0x24($sp) -/* 07F670 8007EA70 0C020379 */ jal func_80080DE4 -/* 07F674 8007EA74 02002025 */ move $a0, $s0 -/* 07F678 8007EA78 10000069 */ b .L8007EC20 -/* 07F67C 8007EA7C 8FBF0024 */ lw $ra, 0x24($sp) -glabel L8007EA80 -/* 07F680 8007EA80 3C0141B0 */ li $at, 0x41B00000 # 22.000000 -/* 07F684 8007EA84 44815000 */ mtc1 $at, $f10 -/* 07F688 8007EA88 C460002C */ lwc1 $f0, 0x2c($v1) -/* 07F68C 8007EA8C 3C0141A0 */ li $at, 0x41A00000 # 20.000000 -/* 07F690 8007EA90 4600503E */ c.le.s $f10, $f0 -/* 07F694 8007EA94 00000000 */ nop -/* 07F698 8007EA98 45020004 */ bc1fl .L8007EAAC -/* 07F69C 8007EA9C 44818000 */ mtc1 $at, $f16 -/* 07F6A0 8007EAA0 1000002D */ b .L8007EB58 -/* 07F6A4 8007EAA4 A06000D2 */ sb $zero, 0xd2($v1) -/* 07F6A8 8007EAA8 44818000 */ mtc1 $at, $f16 -.L8007EAAC: -/* 07F6AC 8007EAAC 240E0001 */ li $t6, 1 -/* 07F6B0 8007EAB0 3C014190 */ li $at, 0x41900000 # 18.000000 -/* 07F6B4 8007EAB4 4600803E */ c.le.s $f16, $f0 -/* 07F6B8 8007EAB8 00000000 */ nop -/* 07F6BC 8007EABC 45020004 */ bc1fl .L8007EAD0 -/* 07F6C0 8007EAC0 44819000 */ mtc1 $at, $f18 -/* 07F6C4 8007EAC4 10000024 */ b .L8007EB58 -/* 07F6C8 8007EAC8 A06E00D2 */ sb $t6, 0xd2($v1) -/* 07F6CC 8007EACC 44819000 */ mtc1 $at, $f18 -.L8007EAD0: -/* 07F6D0 8007EAD0 240F0002 */ li $t7, 2 -/* 07F6D4 8007EAD4 3C014180 */ li $at, 0x41800000 # 16.000000 -/* 07F6D8 8007EAD8 4600903E */ c.le.s $f18, $f0 -/* 07F6DC 8007EADC 00000000 */ nop -/* 07F6E0 8007EAE0 45020004 */ bc1fl .L8007EAF4 -/* 07F6E4 8007EAE4 44812000 */ mtc1 $at, $f4 -/* 07F6E8 8007EAE8 1000001B */ b .L8007EB58 -/* 07F6EC 8007EAEC A06F00D2 */ sb $t7, 0xd2($v1) -/* 07F6F0 8007EAF0 44812000 */ mtc1 $at, $f4 -.L8007EAF4: -/* 07F6F4 8007EAF4 24180003 */ li $t8, 3 -/* 07F6F8 8007EAF8 3C014160 */ li $at, 0x41600000 # 14.000000 -/* 07F6FC 8007EAFC 4600203E */ c.le.s $f4, $f0 -/* 07F700 8007EB00 00000000 */ nop -/* 07F704 8007EB04 45020004 */ bc1fl .L8007EB18 -/* 07F708 8007EB08 44813000 */ mtc1 $at, $f6 -/* 07F70C 8007EB0C 10000012 */ b .L8007EB58 -/* 07F710 8007EB10 A07800D2 */ sb $t8, 0xd2($v1) -/* 07F714 8007EB14 44813000 */ mtc1 $at, $f6 -.L8007EB18: -/* 07F718 8007EB18 02002025 */ move $a0, $s0 -/* 07F71C 8007EB1C 24050003 */ li $a1, 3 -/* 07F720 8007EB20 4600303E */ c.le.s $f6, $f0 -/* 07F724 8007EB24 24060005 */ li $a2, 5 -/* 07F728 8007EB28 24070001 */ li $a3, 1 -/* 07F72C 8007EB2C 24080006 */ li $t0, 6 -/* 07F730 8007EB30 45000004 */ bc1f .L8007EB44 -/* 07F734 8007EB34 2409FFFF */ li $t1, -1 -/* 07F738 8007EB38 24190004 */ li $t9, 4 -/* 07F73C 8007EB3C 10000006 */ b .L8007EB58 -/* 07F740 8007EB40 A07900D2 */ sb $t9, 0xd2($v1) -.L8007EB44: -/* 07F744 8007EB44 AFA80010 */ sw $t0, 0x10($sp) -/* 07F748 8007EB48 AFA90014 */ sw $t1, 0x14($sp) -/* 07F74C 8007EB4C 0C01CC2F */ jal func_800730BC -/* 07F750 8007EB50 AFA30028 */ sw $v1, 0x28($sp) -/* 07F754 8007EB54 8FA30028 */ lw $v1, 0x28($sp) -.L8007EB58: -/* 07F758 8007EB58 2464002C */ addiu $a0, $v1, 0x2c -/* 07F75C 8007EB5C 8C650020 */ lw $a1, 0x20($v1) -/* 07F760 8007EB60 0C0103B8 */ jal f32_step_up_towards -/* 07F764 8007EB64 3C063F00 */ lui $a2, 0x3f00 -/* 07F768 8007EB68 1040002C */ beqz $v0, .L8007EC1C -/* 07F76C 8007EB6C 02002025 */ move $a0, $s0 -/* 07F770 8007EB70 0C01C8E2 */ jal func_80072388 -/* 07F774 8007EB74 00002825 */ move $a1, $zero -/* 07F778 8007EB78 0C01C922 */ jal func_80072488 -/* 07F77C 8007EB7C 02002025 */ move $a0, $s0 -/* 07F780 8007EB80 10000027 */ b .L8007EC20 -/* 07F784 8007EB84 8FBF0024 */ lw $ra, 0x24($sp) -glabel L8007EB88 -/* 07F788 8007EB88 02002025 */ move $a0, $s0 -/* 07F78C 8007EB8C 0C01C9E3 */ jal func_8007278C -/* 07F790 8007EB90 24050064 */ li $a1, 100 -/* 07F794 8007EB94 10400021 */ beqz $v0, .L8007EC1C -/* 07F798 8007EB98 02002025 */ move $a0, $s0 -/* 07F79C 8007EB9C 0C01C8B3 */ jal func_800722CC -/* 07F7A0 8007EBA0 24050002 */ li $a1, 2 -/* 07F7A4 8007EBA4 02002025 */ move $a0, $s0 -/* 07F7A8 8007EBA8 0C01C87A */ jal func_800721E8 -/* 07F7AC 8007EBAC 24050200 */ li $a1, 512 -/* 07F7B0 8007EBB0 0C01C99B */ jal func_8007266C -/* 07F7B4 8007EBB4 02002025 */ move $a0, $s0 -/* 07F7B8 8007EBB8 10000019 */ b .L8007EC20 -/* 07F7BC 8007EBBC 8FBF0024 */ lw $ra, 0x24($sp) -.L8007EBC0: -/* 07F7C0 8007EBC0 0C01C9E3 */ jal func_8007278C -/* 07F7C4 8007EBC4 2405012C */ li $a1, 300 -/* 07F7C8 8007EBC8 10400014 */ beqz $v0, .L8007EC1C -/* 07F7CC 8007EBCC 02002025 */ move $a0, $s0 -/* 07F7D0 8007EBD0 0C01C8C8 */ jal func_80072320 -/* 07F7D4 8007EBD4 24050080 */ li $a1, 128 -/* 07F7D8 8007EBD8 0C01C90A */ jal func_80072428 -/* 07F7DC 8007EBDC 02002025 */ move $a0, $s0 -/* 07F7E0 8007EBE0 02002025 */ move $a0, $s0 -/* 07F7E4 8007EBE4 0C01C9B3 */ jal func_800726CC -/* 07F7E8 8007EBE8 24050001 */ li $a1, 1 -/* 07F7EC 8007EBEC 1000000C */ b .L8007EC20 -/* 07F7F0 8007EBF0 8FBF0024 */ lw $ra, 0x24($sp) -.L8007EBF4: -/* 07F7F4 8007EBF4 246500B4 */ addiu $a1, $v1, 0xb4 -/* 07F7F8 8007EBF8 24060400 */ li $a2, 1024 -/* 07F7FC 8007EBFC 0C01CF86 */ jal func_80073E18 -/* 07F800 8007EC00 34078000 */ li $a3, 32768 -/* 07F804 8007EC04 10400005 */ beqz $v0, .L8007EC1C -/* 07F808 8007EC08 02002025 */ move $a0, $s0 -/* 07F80C 8007EC0C 0C01C8B3 */ jal func_800722CC -/* 07F810 8007EC10 24050004 */ li $a1, 4 -/* 07F814 8007EC14 0C01C99B */ jal func_8007266C -/* 07F818 8007EC18 02002025 */ move $a0, $s0 -.L8007EC1C: -/* 07F81C 8007EC1C 8FBF0024 */ lw $ra, 0x24($sp) -.L8007EC20: -/* 07F820 8007EC20 8FB00020 */ lw $s0, 0x20($sp) -/* 07F824 8007EC24 27BD0030 */ addiu $sp, $sp, 0x30 -/* 07F828 8007EC28 03E00008 */ jr $ra -/* 07F82C 8007EC2C 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_8007EC30.s b/asm/non_matchings/code_80071F00/func_8007EC30.s deleted file mode 100644 index cc6daf976..000000000 --- a/asm/non_matchings/code_80071F00/func_8007EC30.s +++ /dev/null @@ -1,82 +0,0 @@ -glabel func_8007EC30 -/* 07F830 8007EC30 44800000 */ mtc1 $zero, $f0 -/* 07F834 8007EC34 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 07F838 8007EC38 000470C0 */ sll $t6, $a0, 3 -/* 07F83C 8007EC3C 01C47023 */ subu $t6, $t6, $a0 -/* 07F840 8007EC40 3C0F8016 */ lui $t7, %hi(D_80165C18) # $t7, 0x8016 -/* 07F844 8007EC44 AFB10020 */ sw $s1, 0x20($sp) -/* 07F848 8007EC48 25EF5C18 */ addiu $t7, %lo(D_80165C18) # addiu $t7, $t7, 0x5c18 -/* 07F84C 8007EC4C 000E7140 */ sll $t6, $t6, 5 -/* 07F850 8007EC50 AFBF0024 */ sw $ra, 0x24($sp) -/* 07F854 8007EC54 AFB0001C */ sw $s0, 0x1c($sp) -/* 07F858 8007EC58 01CF8821 */ addu $s1, $t6, $t7 -/* 07F85C 8007EC5C 44050000 */ mfc1 $a1, $f0 -/* 07F860 8007EC60 44060000 */ mfc1 $a2, $f0 -/* 07F864 8007EC64 44070000 */ mfc1 $a3, $f0 -/* 07F868 8007EC68 00808025 */ move $s0, $a0 -/* 07F86C 8007EC6C E6200044 */ swc1 $f0, 0x44($s1) -/* 07F870 8007EC70 0C022E03 */ jal func_8008B80C -/* 07F874 8007EC74 E6200014 */ swc1 $f0, 0x14($s1) -/* 07F878 8007EC78 3C18800E */ lui $t8, %hi(gIsMirrorMode) # $t8, 0x800e -/* 07F87C 8007EC7C 8F18C604 */ lw $t8, %lo(gIsMirrorMode)($t8) -/* 07F880 8007EC80 02002025 */ move $a0, $s0 -/* 07F884 8007EC84 00002825 */ move $a1, $zero -/* 07F888 8007EC88 1300000D */ beqz $t8, .L8007ECC0 -/* 07F88C 8007EC8C 3406C000 */ li $a2, 49152 -/* 07F890 8007EC90 02002025 */ move $a0, $s0 -/* 07F894 8007EC94 00002825 */ move $a1, $zero -/* 07F898 8007EC98 24064000 */ li $a2, 16384 -/* 07F89C 8007EC9C 0C022E22 */ jal func_8008B888 -/* 07F8A0 8007ECA0 00003825 */ move $a3, $zero -/* 07F8A4 8007ECA4 02002025 */ move $a0, $s0 -/* 07F8A8 8007ECA8 00002825 */ move $a1, $zero -/* 07F8AC 8007ECAC 24064000 */ li $a2, 16384 -/* 07F8B0 8007ECB0 0C022E2F */ jal func_8008B8BC -/* 07F8B4 8007ECB4 00003825 */ move $a3, $zero -/* 07F8B8 8007ECB8 10000008 */ b .L8007ECDC -/* 07F8BC 8007ECBC 00000000 */ nop -.L8007ECC0: -/* 07F8C0 8007ECC0 0C022E22 */ jal func_8008B888 -/* 07F8C4 8007ECC4 00003825 */ move $a3, $zero -/* 07F8C8 8007ECC8 02002025 */ move $a0, $s0 -/* 07F8CC 8007ECCC 00002825 */ move $a1, $zero -/* 07F8D0 8007ECD0 3406C000 */ li $a2, 49152 -/* 07F8D4 8007ECD4 0C022E2F */ jal func_8008B8BC -/* 07F8D8 8007ECD8 00003825 */ move $a3, $zero -.L8007ECDC: -/* 07F8DC 8007ECDC 3C050600 */ lui $a1, %hi(gTLUTWhomp) # $a1, 0x600 -/* 07F8E0 8007ECE0 3C060600 */ lui $a2, %hi(d_course_bowsers_castle_thwomp_faces) # $a2, 0x600 -/* 07F8E4 8007ECE4 24190040 */ li $t9, 64 -/* 07F8E8 8007ECE8 AFB90010 */ sw $t9, 0x10($sp) -/* 07F8EC 8007ECEC 24C67138 */ addiu $a2, %lo(d_course_bowsers_castle_thwomp_faces) # addiu $a2, $a2, 0x7138 -/* 07F8F0 8007ECF0 24A56F38 */ addiu $a1, %lo(gTLUTWhomp) # addiu $a1, $a1, 0x6f38 -/* 07F8F4 8007ECF4 02002025 */ move $a0, $s0 -/* 07F8F8 8007ECF8 0C01CD11 */ jal func_80073444 -/* 07F8FC 8007ECFC 24070010 */ li $a3, 16 -/* 07F900 8007ED00 3C013F80 */ li $at, 0x3F800000 # 1.000000 -/* 07F904 8007ED04 44812000 */ mtc1 $at, $f4 -/* 07F908 8007ED08 3C0141F0 */ li $at, 0x41F00000 # 30.000000 -/* 07F90C 8007ED0C 44813000 */ mtc1 $at, $f6 -/* 07F910 8007ED10 3C080601 */ lui $t0, %hi(d_course_bowsers_castle_dl_thwomp) # $t0, 0x601 -/* 07F914 8007ED14 25089088 */ addiu $t0, %lo(d_course_bowsers_castle_dl_thwomp) # addiu $t0, $t0, -0x6f78 -/* 07F918 8007ED18 2409000C */ li $t1, 12 -/* 07F91C 8007ED1C 3C050500 */ lui $a1, (0x05000220 >> 16) # lui $a1, 0x500 -/* 07F920 8007ED20 AE280070 */ sw $t0, 0x70($s1) -/* 07F924 8007ED24 A62900C8 */ sh $t1, 0xc8($s1) -/* 07F928 8007ED28 34A50220 */ ori $a1, (0x05000220 & 0xFFFF) # ori $a1, $a1, 0x220 -/* 07F92C 8007ED2C 02002025 */ move $a0, $s0 -/* 07F930 8007ED30 E6240000 */ swc1 $f4, ($s1) -/* 07F934 8007ED34 0C01C870 */ jal func_800721C0 -/* 07F938 8007ED38 E6260020 */ swc1 $f6, 0x20($s1) -/* 07F93C 8007ED3C 240A0006 */ li $t2, 6 -/* 07F940 8007ED40 A62000A4 */ sh $zero, 0xa4($s1) -/* 07F944 8007ED44 A22A00DF */ sb $t2, 0xdf($s1) -/* 07F948 8007ED48 0C01C937 */ jal func_800724DC -/* 07F94C 8007ED4C 02002025 */ move $a0, $s0 -/* 07F950 8007ED50 0C01C922 */ jal func_80072488 -/* 07F954 8007ED54 02002025 */ move $a0, $s0 -/* 07F958 8007ED58 8FBF0024 */ lw $ra, 0x24($sp) -/* 07F95C 8007ED5C 8FB0001C */ lw $s0, 0x1c($sp) -/* 07F960 8007ED60 8FB10020 */ lw $s1, 0x20($sp) -/* 07F964 8007ED64 03E00008 */ jr $ra -/* 07F968 8007ED68 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/non_matchings/code_80071F00/func_8007ED6C.s b/asm/non_matchings/code_80071F00/func_8007ED6C.s deleted file mode 100644 index 5d572e8b1..000000000 --- a/asm/non_matchings/code_80071F00/func_8007ED6C.s +++ /dev/null @@ -1,76 +0,0 @@ -.section .late_rodata - -glabel jpt_800EEFBC -.word L8007EE24, L8007EDBC, L8007EDCC, L8007EDE0 -.word L8007EDF4 - -.section .text - -glabel func_8007ED6C -/* 07F96C 8007ED6C 000470C0 */ sll $t6, $a0, 3 -/* 07F970 8007ED70 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 07F974 8007ED74 01C47023 */ subu $t6, $t6, $a0 -/* 07F978 8007ED78 3C0F8016 */ lui $t7, %hi(D_80165C18) # $t7, 0x8016 -/* 07F97C 8007ED7C 25EF5C18 */ addiu $t7, %lo(D_80165C18) # addiu $t7, $t7, 0x5c18 -/* 07F980 8007ED80 000E7140 */ sll $t6, $t6, 5 -/* 07F984 8007ED84 01CFC021 */ addu $t8, $t6, $t7 -/* 07F988 8007ED88 AFBF001C */ sw $ra, 0x1c($sp) -/* 07F98C 8007ED8C AFB00018 */ sw $s0, 0x18($sp) -/* 07F990 8007ED90 AFB80024 */ sw $t8, 0x24($sp) -/* 07F994 8007ED94 971900A6 */ lhu $t9, 0xa6($t8) -/* 07F998 8007ED98 00808025 */ move $s0, $a0 -/* 07F99C 8007ED9C 2F210005 */ sltiu $at, $t9, 5 -/* 07F9A0 8007EDA0 10200020 */ beqz $at, .L8007EE24 -/* 07F9A4 8007EDA4 0019C880 */ sll $t9, $t9, 2 -/* 07F9A8 8007EDA8 3C01800F */ lui $at, %hi(jpt_800EEFBC) # 0x800f -/* 07F9AC 8007EDAC 00390821 */ addu $at, $at, $t9 -/* 07F9B0 8007EDB0 8C39EFBC */ lw $t9, %lo(jpt_800EEFBC)($at) # -0x1044($at) -/* 07F9B4 8007EDB4 03200008 */ jr $t9 -/* 07F9B8 8007EDB8 00000000 */ nop -glabel L8007EDBC -/* 07F9BC 8007EDBC 0C01FB0C */ jal func_8007EC30 -/* 07F9C0 8007EDC0 02002025 */ move $a0, $s0 -/* 07F9C4 8007EDC4 10000017 */ b .L8007EE24 -/* 07F9C8 8007EDC8 00000000 */ nop -glabel L8007EDCC -/* 07F9CC 8007EDCC 02002025 */ move $a0, $s0 -/* 07F9D0 8007EDD0 0C01C9E3 */ jal func_8007278C -/* 07F9D4 8007EDD4 2405003C */ li $a1, 60 -/* 07F9D8 8007EDD8 10000012 */ b .L8007EE24 -/* 07F9DC 8007EDDC 00000000 */ nop -glabel L8007EDE0 -/* 07F9E0 8007EDE0 02002025 */ move $a0, $s0 -/* 07F9E4 8007EDE4 0C01C95A */ jal func_80072568 -/* 07F9E8 8007EDE8 24050032 */ li $a1, 50 -/* 07F9EC 8007EDEC 1000000D */ b .L8007EE24 -/* 07F9F0 8007EDF0 00000000 */ nop -glabel L8007EDF4 -/* 07F9F4 8007EDF4 0C01F967 */ jal func_8007E59C -/* 07F9F8 8007EDF8 02002025 */ move $a0, $s0 -/* 07F9FC 8007EDFC 10400007 */ beqz $v0, .L8007EE1C -/* 07FA00 8007EE00 02002025 */ move $a0, $s0 -/* 07FA04 8007EE04 02002025 */ move $a0, $s0 -/* 07FA08 8007EE08 2405012C */ li $a1, 300 -/* 07FA0C 8007EE0C 0C01C97A */ jal func_800725E8 -/* 07FA10 8007EE10 24060002 */ li $a2, 2 -/* 07FA14 8007EE14 10000003 */ b .L8007EE24 -/* 07FA18 8007EE18 00000000 */ nop -.L8007EE1C: -/* 07FA1C 8007EE1C 0C01C9B3 */ jal func_800726CC -/* 07FA20 8007EE20 24050002 */ li $a1, 2 -.L8007EE24: -glabel L8007EE24 -/* 07FA24 8007EE24 0C01F98F */ jal func_8007E63C -/* 07FA28 8007EE28 02002025 */ move $a0, $s0 -/* 07FA2C 8007EE2C 0C022FC6 */ jal func_8008BF18 -/* 07FA30 8007EE30 02002025 */ move $a0, $s0 -/* 07FA34 8007EE34 8FA80024 */ lw $t0, 0x24($sp) -/* 07FA38 8007EE38 02002025 */ move $a0, $s0 -/* 07FA3C 8007EE3C 950900B4 */ lhu $t1, 0xb4($t0) -/* 07FA40 8007EE40 0C01CD45 */ jal func_80073514 -/* 07FA44 8007EE44 A50900C0 */ sh $t1, 0xc0($t0) -/* 07FA48 8007EE48 8FBF001C */ lw $ra, 0x1c($sp) -/* 07FA4C 8007EE4C 8FB00018 */ lw $s0, 0x18($sp) -/* 07FA50 8007EE50 27BD0038 */ addiu $sp, $sp, 0x38 -/* 07FA54 8007EE54 03E00008 */ jr $ra -/* 07FA58 8007EE58 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_8007EE5C.s b/asm/non_matchings/code_80071F00/func_8007EE5C.s deleted file mode 100644 index 94b5b6983..000000000 --- a/asm/non_matchings/code_80071F00/func_8007EE5C.s +++ /dev/null @@ -1,93 +0,0 @@ -glabel func_8007EE5C -/* 07FA5C 8007EE5C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 07FA60 8007EE60 AFBF0024 */ sw $ra, 0x24($sp) -/* 07FA64 8007EE64 AFB10020 */ sw $s1, 0x20($sp) -/* 07FA68 8007EE68 3C050600 */ lui $a1, %hi(gTLUTWhomp) # $a1, 0x600 -/* 07FA6C 8007EE6C 3C060600 */ lui $a2, %hi(d_course_bowsers_castle_thwomp_faces) # $a2, 0x600 -/* 07FA70 8007EE70 240E0040 */ li $t6, 64 -/* 07FA74 8007EE74 00808825 */ move $s1, $a0 -/* 07FA78 8007EE78 AFB0001C */ sw $s0, 0x1c($sp) -/* 07FA7C 8007EE7C AFAE0010 */ sw $t6, 0x10($sp) -/* 07FA80 8007EE80 24C67138 */ addiu $a2, %lo(d_course_bowsers_castle_thwomp_faces) # addiu $a2, $a2, 0x7138 -/* 07FA84 8007EE84 24A56F38 */ addiu $a1, %lo(gTLUTWhomp) # addiu $a1, $a1, 0x6f38 -/* 07FA88 8007EE88 0C01CD11 */ jal func_80073444 -/* 07FA8C 8007EE8C 24070010 */ li $a3, 16 -/* 07FA90 8007EE90 001178C0 */ sll $t7, $s1, 3 -/* 07FA94 8007EE94 01F17823 */ subu $t7, $t7, $s1 -/* 07FA98 8007EE98 3C188016 */ lui $t8, %hi(D_80165C18) # $t8, 0x8016 -/* 07FA9C 8007EE9C 27185C18 */ addiu $t8, %lo(D_80165C18) # addiu $t8, $t8, 0x5c18 -/* 07FAA0 8007EEA0 000F7940 */ sll $t7, $t7, 5 -/* 07FAA4 8007EEA4 3C013F80 */ li $at, 0x3F800000 # 1.000000 -/* 07FAA8 8007EEA8 44812000 */ mtc1 $at, $f4 -/* 07FAAC 8007EEAC 01F88021 */ addu $s0, $t7, $t8 -/* 07FAB0 8007EEB0 3C190601 */ lui $t9, %hi(d_course_bowsers_castle_dl_thwomp) # $t9, 0x601 -/* 07FAB4 8007EEB4 27399088 */ addiu $t9, %lo(d_course_bowsers_castle_dl_thwomp) # addiu $t9, $t9, -0x6f78 -/* 07FAB8 8007EEB8 2408000C */ li $t0, 12 -/* 07FABC 8007EEBC 3C050400 */ lui $a1, (0x04000220 >> 16) # lui $a1, 0x400 -/* 07FAC0 8007EEC0 AE190070 */ sw $t9, 0x70($s0) -/* 07FAC4 8007EEC4 A60800C8 */ sh $t0, 0xc8($s0) -/* 07FAC8 8007EEC8 34A50220 */ ori $a1, (0x04000220 & 0xFFFF) # ori $a1, $a1, 0x220 -/* 07FACC 8007EECC 02202025 */ move $a0, $s1 -/* 07FAD0 8007EED0 0C01C870 */ jal func_800721C0 -/* 07FAD4 8007EED4 E6040000 */ swc1 $f4, ($s0) -/* 07FAD8 8007EED8 24090006 */ li $t1, 6 -/* 07FADC 8007EEDC A60000A4 */ sh $zero, 0xa4($s0) -/* 07FAE0 8007EEE0 A20900DF */ sb $t1, 0xdf($s0) -/* 07FAE4 8007EEE4 0C021B9C */ jal func_80086E70 -/* 07FAE8 8007EEE8 02202025 */ move $a0, $s1 -/* 07FAEC 8007EEEC 44800000 */ mtc1 $zero, $f0 -/* 07FAF0 8007EEF0 02202025 */ move $a0, $s1 -/* 07FAF4 8007EEF4 3C0641A0 */ lui $a2, 0x41a0 -/* 07FAF8 8007EEF8 44050000 */ mfc1 $a1, $f0 -/* 07FAFC 8007EEFC 44070000 */ mfc1 $a3, $f0 -/* 07FB00 8007EF00 E6000044 */ swc1 $f0, 0x44($s0) -/* 07FB04 8007EF04 0C022E03 */ jal func_8008B80C -/* 07FB08 8007EF08 E6000014 */ swc1 $f0, 0x14($s0) -/* 07FB0C 8007EF0C 3C0141A0 */ li $at, 0x41A00000 # 20.000000 -/* 07FB10 8007EF10 44813000 */ mtc1 $at, $f6 -/* 07FB14 8007EF14 3C0A800E */ lui $t2, %hi(gIsMirrorMode) # $t2, 0x800e -/* 07FB18 8007EF18 00003825 */ move $a3, $zero -/* 07FB1C 8007EF1C E6060020 */ swc1 $f6, 0x20($s0) -/* 07FB20 8007EF20 8D4AC604 */ lw $t2, %lo(gIsMirrorMode)($t2) -/* 07FB24 8007EF24 02202025 */ move $a0, $s1 -/* 07FB28 8007EF28 00002825 */ move $a1, $zero -/* 07FB2C 8007EF2C 1140000C */ beqz $t2, .L8007EF60 -/* 07FB30 8007EF30 3406C000 */ li $a2, 49152 -/* 07FB34 8007EF34 02202025 */ move $a0, $s1 -/* 07FB38 8007EF38 00002825 */ move $a1, $zero -/* 07FB3C 8007EF3C 0C022E22 */ jal func_8008B888 -/* 07FB40 8007EF40 24064000 */ li $a2, 16384 -/* 07FB44 8007EF44 02202025 */ move $a0, $s1 -/* 07FB48 8007EF48 00002825 */ move $a1, $zero -/* 07FB4C 8007EF4C 24064000 */ li $a2, 16384 -/* 07FB50 8007EF50 0C022E2F */ jal func_8008B8BC -/* 07FB54 8007EF54 00003825 */ move $a3, $zero -/* 07FB58 8007EF58 10000009 */ b .L8007EF80 -/* 07FB5C 8007EF5C 860C00A0 */ lh $t4, 0xa0($s0) -.L8007EF60: -/* 07FB60 8007EF60 0C022E22 */ jal func_8008B888 -/* 07FB64 8007EF64 00003825 */ move $a3, $zero -/* 07FB68 8007EF68 02202025 */ move $a0, $s1 -/* 07FB6C 8007EF6C 00002825 */ move $a1, $zero -/* 07FB70 8007EF70 3406C000 */ li $a2, 49152 -/* 07FB74 8007EF74 0C022E2F */ jal func_8008B8BC -/* 07FB78 8007EF78 00003825 */ move $a3, $zero -/* 07FB7C 8007EF7C 860C00A0 */ lh $t4, 0xa0($s0) -.L8007EF80: -/* 07FB80 8007EF80 240B0001 */ li $t3, 1 -/* 07FB84 8007EF84 A60B00AE */ sh $t3, 0xae($s0) -/* 07FB88 8007EF88 15800004 */ bnez $t4, .L8007EF9C -/* 07FB8C 8007EF8C 240E0002 */ li $t6, 2 -/* 07FB90 8007EF90 240D0001 */ li $t5, 1 -/* 07FB94 8007EF94 10000002 */ b .L8007EFA0 -/* 07FB98 8007EF98 A20D00DD */ sb $t5, 0xdd($s0) -.L8007EF9C: -/* 07FB9C 8007EF9C A20E00DD */ sb $t6, 0xdd($s0) -.L8007EFA0: -/* 07FBA0 8007EFA0 0C01C922 */ jal func_80072488 -/* 07FBA4 8007EFA4 02202025 */ move $a0, $s1 -/* 07FBA8 8007EFA8 8FBF0024 */ lw $ra, 0x24($sp) -/* 07FBAC 8007EFAC 8FB0001C */ lw $s0, 0x1c($sp) -/* 07FBB0 8007EFB0 8FB10020 */ lw $s1, 0x20($sp) -/* 07FBB4 8007EFB4 03E00008 */ jr $ra -/* 07FBB8 8007EFB8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/non_matchings/code_80071F00/func_8007F5A8.s b/asm/non_matchings/code_80071F00/func_8007F5A8.s deleted file mode 100644 index 7bda569ae..000000000 --- a/asm/non_matchings/code_80071F00/func_8007F5A8.s +++ /dev/null @@ -1,51 +0,0 @@ -glabel func_8007F5A8 -/* 0801A8 8007F5A8 000470C0 */ sll $t6, $a0, 3 -/* 0801AC 8007F5AC 01C47023 */ subu $t6, $t6, $a0 -/* 0801B0 8007F5B0 000E7140 */ sll $t6, $t6, 5 -/* 0801B4 8007F5B4 3C028016 */ lui $v0, %hi(D_80165CBE) # 0x8016 -/* 0801B8 8007F5B8 004E1021 */ addu $v0, $v0, $t6 -/* 0801BC 8007F5BC 84425CBE */ lh $v0, %lo(D_80165CBE)($v0) # 0x5cbe($v0) -/* 0801C0 8007F5C0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 0801C4 8007F5C4 AFB00018 */ sw $s0, 0x18($sp) -/* 0801C8 8007F5C8 00808025 */ move $s0, $a0 -/* 0801CC 8007F5CC 10400017 */ beqz $v0, .L8007F62C -/* 0801D0 8007F5D0 AFBF001C */ sw $ra, 0x1c($sp) -/* 0801D4 8007F5D4 24010001 */ li $at, 1 -/* 0801D8 8007F5D8 10410008 */ beq $v0, $at, .L8007F5FC -/* 0801DC 8007F5DC 24010003 */ li $at, 3 -/* 0801E0 8007F5E0 1041000A */ beq $v0, $at, .L8007F60C -/* 0801E4 8007F5E4 02002025 */ move $a0, $s0 -/* 0801E8 8007F5E8 24010004 */ li $at, 4 -/* 0801EC 8007F5EC 1041000B */ beq $v0, $at, .L8007F61C -/* 0801F0 8007F5F0 00000000 */ nop -/* 0801F4 8007F5F4 1000000D */ b .L8007F62C -/* 0801F8 8007F5F8 00000000 */ nop -.L8007F5FC: -/* 0801FC 8007F5FC 0C01FB97 */ jal func_8007EE5C -/* 080200 8007F600 02002025 */ move $a0, $s0 -/* 080204 8007F604 10000009 */ b .L8007F62C -/* 080208 8007F608 00000000 */ nop -.L8007F60C: -/* 08020C 8007F60C 0C01C95A */ jal func_80072568 -/* 080210 8007F610 24050032 */ li $a1, 50 -/* 080214 8007F614 10000005 */ b .L8007F62C -/* 080218 8007F618 00000000 */ nop -.L8007F61C: -/* 08021C 8007F61C 0C021BF5 */ jal func_80086FD4 -/* 080220 8007F620 02002025 */ move $a0, $s0 -/* 080224 8007F624 0C01C922 */ jal func_80072488 -/* 080228 8007F628 02002025 */ move $a0, $s0 -.L8007F62C: -/* 08022C 8007F62C 0C01F98F */ jal func_8007E63C -/* 080230 8007F630 02002025 */ move $a0, $s0 -/* 080234 8007F634 0C01FD51 */ jal func_8007F544 -/* 080238 8007F638 02002025 */ move $a0, $s0 -/* 08023C 8007F63C 0C022FC6 */ jal func_8008BF18 -/* 080240 8007F640 02002025 */ move $a0, $s0 -/* 080244 8007F644 0C01CD45 */ jal func_80073514 -/* 080248 8007F648 02002025 */ move $a0, $s0 -/* 08024C 8007F64C 8FBF001C */ lw $ra, 0x1c($sp) -/* 080250 8007F650 8FB00018 */ lw $s0, 0x18($sp) -/* 080254 8007F654 27BD0020 */ addiu $sp, $sp, 0x20 -/* 080258 8007F658 03E00008 */ jr $ra -/* 08025C 8007F65C 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_8007FA08.s b/asm/non_matchings/code_80071F00/func_8007FA08.s deleted file mode 100644 index 9532fcbbe..000000000 --- a/asm/non_matchings/code_80071F00/func_8007FA08.s +++ /dev/null @@ -1,83 +0,0 @@ -glabel func_8007FA08 -/* 080608 8007FA08 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 08060C 8007FA0C AFBF002C */ sw $ra, 0x2c($sp) -/* 080610 8007FA10 AFB10028 */ sw $s1, 0x28($sp) -/* 080614 8007FA14 3C050600 */ lui $a1, %hi(gTLUTWhomp) # $a1, 0x600 -/* 080618 8007FA18 3C060600 */ lui $a2, %hi(d_course_bowsers_castle_thwomp_faces) # $a2, 0x600 -/* 08061C 8007FA1C 240E0040 */ li $t6, 64 -/* 080620 8007FA20 00808825 */ move $s1, $a0 -/* 080624 8007FA24 AFB00024 */ sw $s0, 0x24($sp) -/* 080628 8007FA28 F7B40018 */ sdc1 $f20, 0x18($sp) -/* 08062C 8007FA2C AFAE0010 */ sw $t6, 0x10($sp) -/* 080630 8007FA30 24C67138 */ addiu $a2, %lo(d_course_bowsers_castle_thwomp_faces) # addiu $a2, $a2, 0x7138 -/* 080634 8007FA34 24A56F38 */ addiu $a1, %lo(gTLUTWhomp) # addiu $a1, $a1, 0x6f38 -/* 080638 8007FA38 0C01CD11 */ jal func_80073444 -/* 08063C 8007FA3C 24070010 */ li $a3, 16 -/* 080640 8007FA40 001178C0 */ sll $t7, $s1, 3 -/* 080644 8007FA44 01F17823 */ subu $t7, $t7, $s1 -/* 080648 8007FA48 3C188016 */ lui $t8, %hi(D_80165C18) # $t8, 0x8016 -/* 08064C 8007FA4C 27185C18 */ addiu $t8, %lo(D_80165C18) # addiu $t8, $t8, 0x5c18 -/* 080650 8007FA50 000F7940 */ sll $t7, $t7, 5 -/* 080654 8007FA54 3C013F80 */ li $at, 0x3F800000 # 1.000000 -/* 080658 8007FA58 44812000 */ mtc1 $at, $f4 -/* 08065C 8007FA5C 01F88021 */ addu $s0, $t7, $t8 -/* 080660 8007FA60 3C190601 */ lui $t9, %hi(d_course_bowsers_castle_dl_thwomp) # $t9, 0x601 -/* 080664 8007FA64 27399088 */ addiu $t9, %lo(d_course_bowsers_castle_dl_thwomp) # addiu $t9, $t9, -0x6f78 -/* 080668 8007FA68 2408000C */ li $t0, 12 -/* 08066C 8007FA6C 3C050400 */ lui $a1, (0x04000220 >> 16) # lui $a1, 0x400 -/* 080670 8007FA70 AE190070 */ sw $t9, 0x70($s0) -/* 080674 8007FA74 A60800C8 */ sh $t0, 0xc8($s0) -/* 080678 8007FA78 34A50220 */ ori $a1, (0x04000220 & 0xFFFF) # ori $a1, $a1, 0x220 -/* 08067C 8007FA7C 02202025 */ move $a0, $s1 -/* 080680 8007FA80 0C01C870 */ jal func_800721C0 -/* 080684 8007FA84 E6040000 */ swc1 $f4, ($s0) -/* 080688 8007FA88 4480A000 */ mtc1 $zero, $f20 -/* 08068C 8007FA8C A60000A4 */ sh $zero, 0xa4($s0) -/* 080690 8007FA90 02202025 */ move $a0, $s1 -/* 080694 8007FA94 4405A000 */ mfc1 $a1, $f20 -/* 080698 8007FA98 4406A000 */ mfc1 $a2, $f20 -/* 08069C 8007FA9C 4407A000 */ mfc1 $a3, $f20 -/* 0806A0 8007FAA0 E6140044 */ swc1 $f20, 0x44($s0) -/* 0806A4 8007FAA4 0C022E03 */ jal func_8008B80C -/* 0806A8 8007FAA8 E6140014 */ swc1 $f20, 0x14($s0) -/* 0806AC 8007FAAC 02202025 */ move $a0, $s1 -/* 0806B0 8007FAB0 00002825 */ move $a1, $zero -/* 0806B4 8007FAB4 00003025 */ move $a2, $zero -/* 0806B8 8007FAB8 0C022E22 */ jal func_8008B888 -/* 0806BC 8007FABC 00003825 */ move $a3, $zero -/* 0806C0 8007FAC0 3C09800E */ lui $t1, %hi(gIsMirrorMode) # $t1, 0x800e -/* 0806C4 8007FAC4 8D29C604 */ lw $t1, %lo(gIsMirrorMode)($t1) -/* 0806C8 8007FAC8 02202025 */ move $a0, $s1 -/* 0806CC 8007FACC 00002825 */ move $a1, $zero -/* 0806D0 8007FAD0 11200008 */ beqz $t1, .L8007FAF4 -/* 0806D4 8007FAD4 24064000 */ li $a2, 16384 -/* 0806D8 8007FAD8 02202025 */ move $a0, $s1 -/* 0806DC 8007FADC 00002825 */ move $a1, $zero -/* 0806E0 8007FAE0 3406C000 */ li $a2, 49152 -/* 0806E4 8007FAE4 0C022E2F */ jal func_8008B8BC -/* 0806E8 8007FAE8 00003825 */ move $a3, $zero -/* 0806EC 8007FAEC 10000004 */ b .L8007FB00 -/* 0806F0 8007FAF0 3C014170 */ lui $at, 0x4170 -.L8007FAF4: -/* 0806F4 8007FAF4 0C022E2F */ jal func_8008B8BC -/* 0806F8 8007FAF8 00003825 */ move $a3, $zero -/* 0806FC 8007FAFC 3C014170 */ li $at, 0x41700000 # 15.000000 -.L8007FB00: -/* 080700 8007FB00 44810000 */ mtc1 $at, $f0 -/* 080704 8007FB04 960A00B4 */ lhu $t2, 0xb4($s0) -/* 080708 8007FB08 240B0001 */ li $t3, 1 -/* 08070C 8007FB0C 240C0008 */ li $t4, 8 -/* 080710 8007FB10 E6140038 */ swc1 $f20, 0x38($s0) -/* 080714 8007FB14 A20B00DD */ sb $t3, 0xdd($s0) -/* 080718 8007FB18 A20C00DF */ sb $t4, 0xdf($s0) -/* 08071C 8007FB1C 02202025 */ move $a0, $s1 -/* 080720 8007FB20 A60A00C0 */ sh $t2, 0xc0($s0) -/* 080724 8007FB24 E600002C */ swc1 $f0, 0x2c($s0) -/* 080728 8007FB28 0C01C922 */ jal func_80072488 -/* 08072C 8007FB2C E6000020 */ swc1 $f0, 0x20($s0) -/* 080730 8007FB30 8FBF002C */ lw $ra, 0x2c($sp) -/* 080734 8007FB34 D7B40018 */ ldc1 $f20, 0x18($sp) -/* 080738 8007FB38 8FB00024 */ lw $s0, 0x24($sp) -/* 08073C 8007FB3C 8FB10028 */ lw $s1, 0x28($sp) -/* 080740 8007FB40 03E00008 */ jr $ra -/* 080744 8007FB44 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/non_matchings/code_80071F00/func_800801FC.s b/asm/non_matchings/code_80071F00/func_800801FC.s deleted file mode 100644 index 66b08b94b..000000000 --- a/asm/non_matchings/code_80071F00/func_800801FC.s +++ /dev/null @@ -1,64 +0,0 @@ -.section .late_rodata - -glabel jpt_800EF088 -.word L80080294, L80080248, L80080258, L8008026C -.word L80080280 - -.section .text - -glabel func_800801FC -/* 080DFC 800801FC 000470C0 */ sll $t6, $a0, 3 -/* 080E00 80080200 01C47023 */ subu $t6, $t6, $a0 -/* 080E04 80080204 3C0F8016 */ lui $t7, %hi(D_80165C18) # $t7, 0x8016 -/* 080E08 80080208 25EF5C18 */ addiu $t7, %lo(D_80165C18) # addiu $t7, $t7, 0x5c18 -/* 080E0C 8008020C 000E7140 */ sll $t6, $t6, 5 -/* 080E10 80080210 01CF1021 */ addu $v0, $t6, $t7 -/* 080E14 80080214 945800A6 */ lhu $t8, 0xa6($v0) -/* 080E18 80080218 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 080E1C 8008021C AFB00018 */ sw $s0, 0x18($sp) -/* 080E20 80080220 2F010005 */ sltiu $at, $t8, 5 -/* 080E24 80080224 00808025 */ move $s0, $a0 -/* 080E28 80080228 1020001A */ beqz $at, .L80080294 -/* 080E2C 8008022C AFBF001C */ sw $ra, 0x1c($sp) -/* 080E30 80080230 0018C080 */ sll $t8, $t8, 2 -/* 080E34 80080234 3C01800F */ lui $at, %hi(jpt_800EF088) -/* 080E38 80080238 00380821 */ addu $at, $at, $t8 -/* 080E3C 8008023C 8C38F088 */ lw $t8, %lo(jpt_800EF088)($at) -/* 080E40 80080240 03000008 */ jr $t8 -/* 080E44 80080244 00000000 */ nop -glabel L80080248 -/* 080E48 80080248 0C02001E */ jal func_80080078 -/* 080E4C 8008024C 02002025 */ move $a0, $s0 -/* 080E50 80080250 10000010 */ b .L80080294 -/* 080E54 80080254 00000000 */ nop -glabel L80080258 -/* 080E58 80080258 02002025 */ move $a0, $s0 -/* 080E5C 8008025C 0C01C9E3 */ jal func_8007278C -/* 080E60 80080260 8C450050 */ lw $a1, 0x50($v0) -/* 080E64 80080264 1000000B */ b .L80080294 -/* 080E68 80080268 00000000 */ nop -glabel L8008026C -/* 080E6C 8008026C 02002025 */ move $a0, $s0 -/* 080E70 80080270 0C01C95A */ jal func_80072568 -/* 080E74 80080274 24050032 */ li $a1, 50 -/* 080E78 80080278 10000006 */ b .L80080294 -/* 080E7C 8008027C 00000000 */ nop -glabel L80080280 -/* 080E80 80080280 2419003C */ li $t9, 60 -/* 080E84 80080284 AC590050 */ sw $t9, 0x50($v0) -/* 080E88 80080288 02002025 */ move $a0, $s0 -/* 080E8C 8008028C 0C01C9B3 */ jal func_800726CC -/* 080E90 80080290 24050002 */ li $a1, 2 -.L80080294: -glabel L80080294 -/* 080E94 80080294 0C01F98F */ jal func_8007E63C -/* 080E98 80080298 02002025 */ move $a0, $s0 -/* 080E9C 8008029C 0C022FC6 */ jal func_8008BF18 -/* 080EA0 800802A0 02002025 */ move $a0, $s0 -/* 080EA4 800802A4 0C01CD45 */ jal func_80073514 -/* 080EA8 800802A8 02002025 */ move $a0, $s0 -/* 080EAC 800802AC 8FBF001C */ lw $ra, 0x1c($sp) -/* 080EB0 800802B0 8FB00018 */ lw $s0, 0x18($sp) -/* 080EB4 800802B4 27BD0020 */ addiu $sp, $sp, 0x20 -/* 080EB8 800802B8 03E00008 */ jr $ra -/* 080EBC 800802BC 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_800802C0.s b/asm/non_matchings/code_80071F00/func_800802C0.s deleted file mode 100644 index 5ad51dd41..000000000 --- a/asm/non_matchings/code_80071F00/func_800802C0.s +++ /dev/null @@ -1,85 +0,0 @@ -glabel func_800802C0 -/* 080EC0 800802C0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 080EC4 800802C4 000470C0 */ sll $t6, $a0, 3 -/* 080EC8 800802C8 01C47023 */ subu $t6, $t6, $a0 -/* 080ECC 800802CC 3C0F8016 */ lui $t7, %hi(D_80165C18) # $t7, 0x8016 -/* 080ED0 800802D0 AFB00024 */ sw $s0, 0x24($sp) -/* 080ED4 800802D4 25EF5C18 */ addiu $t7, %lo(D_80165C18) # addiu $t7, $t7, 0x5c18 -/* 080ED8 800802D8 000E7140 */ sll $t6, $t6, 5 -/* 080EDC 800802DC AFBF002C */ sw $ra, 0x2c($sp) -/* 080EE0 800802E0 AFB10028 */ sw $s1, 0x28($sp) -/* 080EE4 800802E4 01CF8021 */ addu $s0, $t6, $t7 -/* 080EE8 800802E8 3C050600 */ lui $a1, %hi(gTLUTWhomp) # $a1, 0x600 -/* 080EEC 800802EC 3C060600 */ lui $a2, %hi(d_course_bowsers_castle_thwomp_faces) # $a2, 0x600 -/* 080EF0 800802F0 24180040 */ li $t8, 64 -/* 080EF4 800802F4 00808825 */ move $s1, $a0 -/* 080EF8 800802F8 F7B40018 */ sdc1 $f20, 0x18($sp) -/* 080EFC 800802FC A20000D8 */ sb $zero, 0xd8($s0) -/* 080F00 80080300 AFB80010 */ sw $t8, 0x10($sp) -/* 080F04 80080304 24C67138 */ addiu $a2, %lo(d_course_bowsers_castle_thwomp_faces) # addiu $a2, $a2, 0x7138 -/* 080F08 80080308 24A56F38 */ addiu $a1, %lo(gTLUTWhomp) # addiu $a1, $a1, 0x6f38 -/* 080F0C 8008030C 0C01CD11 */ jal func_80073444 -/* 080F10 80080310 24070010 */ li $a3, 16 -/* 080F14 80080314 3C013FC0 */ li $at, 0x3FC00000 # 1.500000 -/* 080F18 80080318 44812000 */ mtc1 $at, $f4 -/* 080F1C 8008031C 3C190601 */ lui $t9, %hi(d_course_bowsers_castle_dl_thwomp) # $t9, 0x601 -/* 080F20 80080320 27399088 */ addiu $t9, %lo(d_course_bowsers_castle_dl_thwomp) # addiu $t9, $t9, -0x6f78 -/* 080F24 80080324 2408000C */ li $t0, 12 -/* 080F28 80080328 3C050500 */ lui $a1, (0x05000220 >> 16) # lui $a1, 0x500 -/* 080F2C 8008032C AE190070 */ sw $t9, 0x70($s0) -/* 080F30 80080330 A20000D2 */ sb $zero, 0xd2($s0) -/* 080F34 80080334 A60800C8 */ sh $t0, 0xc8($s0) -/* 080F38 80080338 34A50220 */ ori $a1, (0x05000220 & 0xFFFF) # ori $a1, $a1, 0x220 -/* 080F3C 8008033C 02202025 */ move $a0, $s1 -/* 080F40 80080340 0C01C870 */ jal func_800721C0 -/* 080F44 80080344 E6040000 */ swc1 $f4, ($s0) -/* 080F48 80080348 4480A000 */ mtc1 $zero, $f20 -/* 080F4C 8008034C 24090001 */ li $t1, 1 -/* 080F50 80080350 240A0006 */ li $t2, 6 -/* 080F54 80080354 4405A000 */ mfc1 $a1, $f20 -/* 080F58 80080358 4406A000 */ mfc1 $a2, $f20 -/* 080F5C 8008035C 4407A000 */ mfc1 $a3, $f20 -/* 080F60 80080360 A60900A4 */ sh $t1, 0xa4($s0) -/* 080F64 80080364 A20A00DF */ sb $t2, 0xdf($s0) -/* 080F68 80080368 0C022E03 */ jal func_8008B80C -/* 080F6C 8008036C 02202025 */ move $a0, $s1 -/* 080F70 80080370 02202025 */ move $a0, $s1 -/* 080F74 80080374 00002825 */ move $a1, $zero -/* 080F78 80080378 00003025 */ move $a2, $zero -/* 080F7C 8008037C 0C022E22 */ jal func_8008B888 -/* 080F80 80080380 00003825 */ move $a3, $zero -/* 080F84 80080384 3C014120 */ li $at, 0x41200000 # 10.000000 -/* 080F88 80080388 44810000 */ mtc1 $at, $f0 -/* 080F8C 8008038C E6140044 */ swc1 $f20, 0x44($s0) -/* 080F90 80080390 E6140014 */ swc1 $f20, 0x14($s0) -/* 080F94 80080394 3C0B800E */ lui $t3, %hi(gIsMirrorMode) # $t3, 0x800e -/* 080F98 80080398 E600002C */ swc1 $f0, 0x2c($s0) -/* 080F9C 8008039C E6000020 */ swc1 $f0, 0x20($s0) -/* 080FA0 800803A0 8D6BC604 */ lw $t3, %lo(gIsMirrorMode)($t3) -/* 080FA4 800803A4 02202025 */ move $a0, $s1 -/* 080FA8 800803A8 00002825 */ move $a1, $zero -/* 080FAC 800803AC 11600008 */ beqz $t3, .L800803D0 -/* 080FB0 800803B0 3406C000 */ li $a2, 49152 -/* 080FB4 800803B4 02202025 */ move $a0, $s1 -/* 080FB8 800803B8 00002825 */ move $a1, $zero -/* 080FBC 800803BC 24064000 */ li $a2, 16384 -/* 080FC0 800803C0 0C022E2F */ jal func_8008B8BC -/* 080FC4 800803C4 00003825 */ move $a3, $zero -/* 080FC8 800803C8 10000004 */ b .L800803DC -/* 080FCC 800803CC E6140028 */ swc1 $f20, 0x28($s0) -.L800803D0: -/* 080FD0 800803D0 0C022E2F */ jal func_8008B8BC -/* 080FD4 800803D4 00003825 */ move $a3, $zero -/* 080FD8 800803D8 E6140028 */ swc1 $f20, 0x28($s0) -.L800803DC: -/* 080FDC 800803DC E6140030 */ swc1 $f20, 0x30($s0) -/* 080FE0 800803E0 0C01C937 */ jal func_800724DC -/* 080FE4 800803E4 02202025 */ move $a0, $s1 -/* 080FE8 800803E8 0C01C922 */ jal func_80072488 -/* 080FEC 800803EC 02202025 */ move $a0, $s1 -/* 080FF0 800803F0 8FBF002C */ lw $ra, 0x2c($sp) -/* 080FF4 800803F4 D7B40018 */ ldc1 $f20, 0x18($sp) -/* 080FF8 800803F8 8FB00024 */ lw $s0, 0x24($sp) -/* 080FFC 800803FC 8FB10028 */ lw $s1, 0x28($sp) -/* 081000 80080400 03E00008 */ jr $ra -/* 081004 80080404 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/non_matchings/code_80071F00/func_80080408.s b/asm/non_matchings/code_80071F00/func_80080408.s deleted file mode 100644 index 52cc8959b..000000000 --- a/asm/non_matchings/code_80071F00/func_80080408.s +++ /dev/null @@ -1,86 +0,0 @@ -.section .late_rodata - -glabel jpt_800EF09C -.word L80080500, L80080454, L80080464 -.word L800804AC, L800804E4 - -.section .text - -glabel func_80080408 -/* 081008 80080408 000470C0 */ sll $t6, $a0, 3 -/* 08100C 8008040C 01C47023 */ subu $t6, $t6, $a0 -/* 081010 80080410 3C0F8016 */ lui $t7, %hi(D_80165C18) # $t7, 0x8016 -/* 081014 80080414 25EF5C18 */ addiu $t7, %lo(D_80165C18) # addiu $t7, $t7, 0x5c18 -/* 081018 80080418 000E7140 */ sll $t6, $t6, 5 -/* 08101C 8008041C 01CF1821 */ addu $v1, $t6, $t7 -/* 081020 80080420 947800A6 */ lhu $t8, 0xa6($v1) -/* 081024 80080424 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 081028 80080428 AFB00020 */ sw $s0, 0x20($sp) -/* 08102C 8008042C 2F010005 */ sltiu $at, $t8, 5 -/* 081030 80080430 00808025 */ move $s0, $a0 -/* 081034 80080434 10200032 */ beqz $at, .L80080500 -/* 081038 80080438 AFBF0024 */ sw $ra, 0x24($sp) -/* 08103C 8008043C 0018C080 */ sll $t8, $t8, 2 -/* 081040 80080440 3C01800F */ lui $at, %hi(jpt_800EF09C) # 0x800f -/* 081044 80080444 00380821 */ addu $at, $at, $t8 -/* 081048 80080448 8C38F09C */ lw $t8, %lo(jpt_800EF09C)($at) # -0xf64($at) -/* 08104C 8008044C 03000008 */ jr $t8 -/* 081050 80080450 00000000 */ nop -glabel L80080454 -/* 081054 80080454 0C0200B0 */ jal func_800802C0 -/* 081058 80080458 02002025 */ move $a0, $s0 -/* 08105C 8008045C 10000028 */ b .L80080500 -/* 081060 80080460 00000000 */ nop -glabel L80080464 -/* 081064 80080464 02002025 */ move $a0, $s0 -/* 081068 80080468 3C0542C8 */ lui $a1, 0x42c8 -/* 08106C 8008046C 0C0229B7 */ jal func_8008A6DC -/* 081070 80080470 AFA3002C */ sw $v1, 0x2c($sp) -/* 081074 80080474 02002025 */ move $a0, $s0 -/* 081078 80080478 0C01C88F */ jal func_8007223C -/* 08107C 8008047C 3C050004 */ lui $a1, 4 -/* 081080 80080480 1040001F */ beqz $v0, .L80080500 -/* 081084 80080484 8FA3002C */ lw $v1, 0x2c($sp) -/* 081088 80080488 3C061901 */ lui $a2, (0x19018045 >> 16) # lui $a2, 0x1901 -/* 08108C 8008048C 34C68045 */ ori $a2, (0x19018045 & 0xFFFF) # ori $a2, $a2, 0x8045 -/* 081090 80080490 24640004 */ addiu $a0, $v1, 4 -/* 081094 80080494 0C03262E */ jal func_800C98B8 -/* 081098 80080498 24650038 */ addiu $a1, $v1, 0x38 -/* 08109C 8008049C 0C01C922 */ jal func_80072488 -/* 0810A0 800804A0 02002025 */ move $a0, $s0 -/* 0810A4 800804A4 10000016 */ b .L80080500 -/* 0810A8 800804A8 00000000 */ nop -glabel L800804AC -/* 0810AC 800804AC 24190006 */ li $t9, 6 -/* 0810B0 800804B0 24080006 */ li $t0, 6 -/* 0810B4 800804B4 AFA80014 */ sw $t0, 0x14($sp) -/* 0810B8 800804B8 AFB90010 */ sw $t9, 0x10($sp) -/* 0810BC 800804BC 02002025 */ move $a0, $s0 -/* 0810C0 800804C0 24050003 */ li $a1, 3 -/* 0810C4 800804C4 24060005 */ li $a2, 5 -/* 0810C8 800804C8 24070001 */ li $a3, 1 -/* 0810CC 800804CC 0C01CC2F */ jal func_800730BC -/* 0810D0 800804D0 AFA3002C */ sw $v1, 0x2c($sp) -/* 0810D4 800804D4 1040000A */ beqz $v0, .L80080500 -/* 0810D8 800804D8 8FA3002C */ lw $v1, 0x2c($sp) -/* 0810DC 800804DC 10000008 */ b .L80080500 -/* 0810E0 800804E0 A06000D2 */ sb $zero, 0xd2($v1) -glabel L800804E4 -/* 0810E4 800804E4 02002025 */ move $a0, $s0 -/* 0810E8 800804E8 0C01C9E3 */ jal func_8007278C -/* 0810EC 800804EC 2405012C */ li $a1, 300 -/* 0810F0 800804F0 10400003 */ beqz $v0, .L80080500 -/* 0810F4 800804F4 02002025 */ move $a0, $s0 -/* 0810F8 800804F8 0C01C9B3 */ jal func_800726CC -/* 0810FC 800804FC 24050002 */ li $a1, 2 -.L80080500: -glabel L80080500 -/* 081100 80080500 0C022FC6 */ jal func_8008BF18 -/* 081104 80080504 02002025 */ move $a0, $s0 -/* 081108 80080508 0C01CD45 */ jal func_80073514 -/* 08110C 8008050C 02002025 */ move $a0, $s0 -/* 081110 80080510 8FBF0024 */ lw $ra, 0x24($sp) -/* 081114 80080514 8FB00020 */ lw $s0, 0x20($sp) -/* 081118 80080518 27BD0030 */ addiu $sp, $sp, 0x30 -/* 08111C 8008051C 03E00008 */ jr $ra -/* 081120 80080520 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_80080524.s b/asm/non_matchings/code_80071F00/func_80080524.s deleted file mode 100644 index 42efc243f..000000000 --- a/asm/non_matchings/code_80071F00/func_80080524.s +++ /dev/null @@ -1,109 +0,0 @@ -glabel func_80080524 -/* 081124 80080524 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 081128 80080528 AFBF0024 */ sw $ra, 0x24($sp) -/* 08112C 8008052C AFB10020 */ sw $s1, 0x20($sp) -/* 081130 80080530 3C050600 */ lui $a1, %hi(gTLUTWhomp) # $a1, 0x600 -/* 081134 80080534 3C060600 */ lui $a2, %hi(d_course_bowsers_castle_thwomp_faces) # $a2, 0x600 -/* 081138 80080538 240E0040 */ li $t6, 64 -/* 08113C 8008053C 00808825 */ move $s1, $a0 -/* 081140 80080540 AFB0001C */ sw $s0, 0x1c($sp) -/* 081144 80080544 AFAE0010 */ sw $t6, 0x10($sp) -/* 081148 80080548 24C67138 */ addiu $a2, %lo(d_course_bowsers_castle_thwomp_faces) # addiu $a2, $a2, 0x7138 -/* 08114C 8008054C 24A56F38 */ addiu $a1, %lo(gTLUTWhomp) # addiu $a1, $a1, 0x6f38 -/* 081150 80080550 0C01CD11 */ jal func_80073444 -/* 081154 80080554 24070010 */ li $a3, 16 -/* 081158 80080558 001178C0 */ sll $t7, $s1, 3 -/* 08115C 8008055C 01F17823 */ subu $t7, $t7, $s1 -/* 081160 80080560 3C188016 */ lui $t8, %hi(D_80165C18) # $t8, 0x8016 -/* 081164 80080564 27185C18 */ addiu $t8, %lo(D_80165C18) # addiu $t8, $t8, 0x5c18 -/* 081168 80080568 000F7940 */ sll $t7, $t7, 5 -/* 08116C 8008056C 01F88021 */ addu $s0, $t7, $t8 -/* 081170 80080570 3C013F80 */ li $at, 0x3F800000 # 1.000000 -/* 081174 80080574 44812000 */ mtc1 $at, $f4 -/* 081178 80080578 3C190601 */ lui $t9, %hi(d_course_bowsers_castle_dl_thwomp) # $t9, 0x601 -/* 08117C 8008057C 27399088 */ addiu $t9, %lo(d_course_bowsers_castle_dl_thwomp) # addiu $t9, $t9, -0x6f78 -/* 081180 80080580 2408000C */ li $t0, 12 -/* 081184 80080584 3C050400 */ lui $a1, (0x04000220 >> 16) # lui $a1, 0x400 -/* 081188 80080588 AE190070 */ sw $t9, 0x70($s0) -/* 08118C 8008058C A60800C8 */ sh $t0, 0xc8($s0) -/* 081190 80080590 A20000D2 */ sb $zero, 0xd2($s0) -/* 081194 80080594 34A50220 */ ori $a1, (0x04000220 & 0xFFFF) # ori $a1, $a1, 0x220 -/* 081198 80080598 02202025 */ move $a0, $s1 -/* 08119C 8008059C 0C01C870 */ jal func_800721C0 -/* 0811A0 800805A0 E6040000 */ swc1 $f4, ($s0) -/* 0811A4 800805A4 2409000A */ li $t1, 10 -/* 0811A8 800805A8 A60000A4 */ sh $zero, 0xa4($s0) -/* 0811AC 800805AC A20900DF */ sb $t1, 0xdf($s0) -/* 0811B0 800805B0 0C021B9C */ jal func_80086E70 -/* 0811B4 800805B4 02202025 */ move $a0, $s1 -/* 0811B8 800805B8 44800000 */ mtc1 $zero, $f0 -/* 0811BC 800805BC 02202025 */ move $a0, $s1 -/* 0811C0 800805C0 44050000 */ mfc1 $a1, $f0 -/* 0811C4 800805C4 44060000 */ mfc1 $a2, $f0 -/* 0811C8 800805C8 44070000 */ mfc1 $a3, $f0 -/* 0811CC 800805CC 0C022E03 */ jal func_8008B80C -/* 0811D0 800805D0 00000000 */ nop -/* 0811D4 800805D4 3C01428C */ li $at, 0x428C0000 # 70.000000 -/* 0811D8 800805D8 44811000 */ mtc1 $at, $f2 -/* 0811DC 800805DC 44800000 */ mtc1 $zero, $f0 -/* 0811E0 800805E0 02202025 */ move $a0, $s1 -/* 0811E4 800805E4 00002825 */ move $a1, $zero -/* 0811E8 800805E8 00003025 */ move $a2, $zero -/* 0811EC 800805EC 00003825 */ move $a3, $zero -/* 0811F0 800805F0 E6020044 */ swc1 $f2, 0x44($s0) -/* 0811F4 800805F4 E6020014 */ swc1 $f2, 0x14($s0) -/* 0811F8 800805F8 0C022E22 */ jal func_8008B888 -/* 0811FC 800805FC E6000020 */ swc1 $f0, 0x20($s0) -/* 081200 80080600 3C0A800E */ lui $t2, %hi(gIsMirrorMode) # $t2, 0x800e -/* 081204 80080604 8D4AC604 */ lw $t2, %lo(gIsMirrorMode)($t2) -/* 081208 80080608 3C0B800E */ lui $t3, %hi(gGamestate) # $t3, 0x800e -/* 08120C 8008060C 02202025 */ move $a0, $s1 -/* 081210 80080610 15400006 */ bnez $t2, .L8008062C -/* 081214 80080614 00002825 */ move $a1, $zero -/* 081218 80080618 8D6BC50C */ lw $t3, %lo(gGamestate)($t3) -/* 08121C 8008061C 24010009 */ li $at, 9 -/* 081220 80080620 24064000 */ li $a2, 16384 -/* 081224 80080624 15610006 */ bne $t3, $at, .L80080640 -/* 081228 80080628 00003825 */ move $a3, $zero -.L8008062C: -/* 08122C 8008062C 3406C000 */ li $a2, 49152 -/* 081230 80080630 0C022E2F */ jal func_8008B8BC -/* 081234 80080634 00003825 */ move $a3, $zero -/* 081238 80080638 10000005 */ b .L80080650 -/* 08123C 8008063C 860200A0 */ lh $v0, 0xa0($s0) -.L80080640: -/* 081240 80080640 02202025 */ move $a0, $s1 -/* 081244 80080644 0C022E2F */ jal func_8008B8BC -/* 081248 80080648 00002825 */ move $a1, $zero -/* 08124C 8008064C 860200A0 */ lh $v0, 0xa0($s0) -.L80080650: -/* 081250 80080650 240C0002 */ li $t4, 2 -/* 081254 80080654 3C01BF80 */ lui $at, 0xbf80 -/* 081258 80080658 10400006 */ beqz $v0, .L80080674 -/* 08125C 8008065C 02202025 */ move $a0, $s1 -/* 081260 80080660 24010001 */ li $at, 1 -/* 081264 80080664 50410008 */ beql $v0, $at, .L80080688 -/* 081268 80080668 3C01BFC0 */ li $at, 0xBFC00000 # -1.500000 -/* 08126C 8008066C 1000000A */ b .L80080698 -/* 081270 80080670 00000000 */ nop -.L80080674: -/* 081274 80080674 44813000 */ mtc1 $at, $f6 -/* 081278 80080678 A20C00DD */ sb $t4, 0xdd($s0) -/* 08127C 8008067C 10000006 */ b .L80080698 -/* 081280 80080680 E6060040 */ swc1 $f6, 0x40($s0) -/* 081284 80080684 3C01BFC0 */ li $at, 0xBFC00000 # -1.500000 -.L80080688: -/* 081288 80080688 44814000 */ mtc1 $at, $f8 -/* 08128C 8008068C 240D0002 */ li $t5, 2 -/* 081290 80080690 A20D00DD */ sb $t5, 0xdd($s0) -/* 081294 80080694 E6080040 */ swc1 $f8, 0x40($s0) -.L80080698: -/* 081298 80080698 0C01C8A9 */ jal func_800722A4 -/* 08129C 8008069C 24050080 */ li $a1, 128 -/* 0812A0 800806A0 0C01C922 */ jal func_80072488 -/* 0812A4 800806A4 02202025 */ move $a0, $s1 -/* 0812A8 800806A8 8FBF0024 */ lw $ra, 0x24($sp) -/* 0812AC 800806AC 8FB0001C */ lw $s0, 0x1c($sp) -/* 0812B0 800806B0 8FB10020 */ lw $s1, 0x20($sp) -/* 0812B4 800806B4 03E00008 */ jr $ra -/* 0812B8 800806B8 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/non_matchings/code_80071F00/func_8008078C.s b/asm/non_matchings/code_80071F00/func_8008078C.s deleted file mode 100644 index e81821dd3..000000000 --- a/asm/non_matchings/code_80071F00/func_8008078C.s +++ /dev/null @@ -1,57 +0,0 @@ -glabel func_8008078C -/* 08138C 8008078C 000470C0 */ sll $t6, $a0, 3 -/* 081390 80080790 01C47023 */ subu $t6, $t6, $a0 -/* 081394 80080794 3C0F8016 */ lui $t7, %hi(D_80165C18) # $t7, 0x8016 -/* 081398 80080798 25EF5C18 */ addiu $t7, %lo(D_80165C18) # addiu $t7, $t7, 0x5c18 -/* 08139C 8008079C 000E7140 */ sll $t6, $t6, 5 -/* 0813A0 800807A0 01CF1821 */ addu $v1, $t6, $t7 -/* 0813A4 800807A4 846200AE */ lh $v0, 0xae($v1) -/* 0813A8 800807A8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 0813AC 800807AC AFBF0014 */ sw $ra, 0x14($sp) -/* 0813B0 800807B0 10400026 */ beqz $v0, .L8008084C -/* 0813B4 800807B4 00803825 */ move $a3, $a0 -/* 0813B8 800807B8 24010001 */ li $at, 1 -/* 0813BC 800807BC 10410006 */ beq $v0, $at, .L800807D8 -/* 0813C0 800807C0 24640030 */ addiu $a0, $v1, 0x30 -/* 0813C4 800807C4 24010002 */ li $at, 2 -/* 0813C8 800807C8 10410012 */ beq $v0, $at, .L80080814 -/* 0813CC 800807CC 24640030 */ addiu $a0, $v1, 0x30 -/* 0813D0 800807D0 1000001F */ b .L80080850 -/* 0813D4 800807D4 8FBF0014 */ lw $ra, 0x14($sp) -.L800807D8: -/* 0813D8 800807D8 3C05C37A */ lui $a1, 0xc37a -/* 0813DC 800807DC 8C660040 */ lw $a2, 0x40($v1) -/* 0813E0 800807E0 AFA30018 */ sw $v1, 0x18($sp) -/* 0813E4 800807E4 0C0104EE */ jal f32_step_towards -/* 0813E8 800807E8 AFA70020 */ sw $a3, 0x20($sp) -/* 0813EC 800807EC 8FA30018 */ lw $v1, 0x18($sp) -/* 0813F0 800807F0 10400016 */ beqz $v0, .L8008084C -/* 0813F4 800807F4 8FA70020 */ lw $a3, 0x20($sp) -/* 0813F8 800807F8 C4640040 */ lwc1 $f4, 0x40($v1) -/* 0813FC 800807FC 00E02025 */ move $a0, $a3 -/* 081400 80080800 46002187 */ neg.s $f6, $f4 -/* 081404 80080804 0C021BF5 */ jal func_80086FD4 -/* 081408 80080808 E4660040 */ swc1 $f6, 0x40($v1) -/* 08140C 8008080C 10000010 */ b .L80080850 -/* 081410 80080810 8FBF0014 */ lw $ra, 0x14($sp) -.L80080814: -/* 081414 80080814 24050000 */ li $a1, 0 -/* 081418 80080818 8C660040 */ lw $a2, 0x40($v1) -/* 08141C 8008081C AFA30018 */ sw $v1, 0x18($sp) -/* 081420 80080820 0C0104EE */ jal f32_step_towards -/* 081424 80080824 AFA70020 */ sw $a3, 0x20($sp) -/* 081428 80080828 8FA30018 */ lw $v1, 0x18($sp) -/* 08142C 8008082C 10400007 */ beqz $v0, .L8008084C -/* 081430 80080830 8FA70020 */ lw $a3, 0x20($sp) -/* 081434 80080834 C4680040 */ lwc1 $f8, 0x40($v1) -/* 081438 80080838 00E02025 */ move $a0, $a3 -/* 08143C 8008083C 24050001 */ li $a1, 1 -/* 081440 80080840 46004287 */ neg.s $f10, $f8 -/* 081444 80080844 0C021C07 */ jal func_8008701C -/* 081448 80080848 E46A0040 */ swc1 $f10, 0x40($v1) -.L8008084C: -/* 08144C 8008084C 8FBF0014 */ lw $ra, 0x14($sp) -.L80080850: -/* 081450 80080850 27BD0020 */ addiu $sp, $sp, 0x20 -/* 081454 80080854 03E00008 */ jr $ra -/* 081458 80080858 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_80080B28.s b/asm/non_matchings/code_80071F00/func_80080B28.s deleted file mode 100644 index 4e7ad253e..000000000 --- a/asm/non_matchings/code_80071F00/func_80080B28.s +++ /dev/null @@ -1,191 +0,0 @@ -.section .late_rodata - -glabel D_800EF0B0 -.double 17.5 - -.section .text - -glabel func_80080B28 -/* 081728 80080B28 000578C0 */ sll $t7, $a1, 3 -/* 08172C 80080B2C 01E57823 */ subu $t7, $t7, $a1 -/* 081730 80080B30 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 081734 80080B34 000F7900 */ sll $t7, $t7, 4 -/* 081738 80080B38 01E57823 */ subu $t7, $t7, $a1 -/* 08173C 80080B3C 000F7880 */ sll $t7, $t7, 2 -/* 081740 80080B40 3C18800E */ lui $t8, %hi(gPlayerOne) # $t8, 0x800e -/* 081744 80080B44 8F18C4DC */ lw $t8, %lo(gPlayerOne)($t8) -/* 081748 80080B48 01E57823 */ subu $t7, $t7, $a1 -/* 08174C 80080B4C AFBF0024 */ sw $ra, 0x24($sp) -/* 081750 80080B50 AFB10020 */ sw $s1, 0x20($sp) -/* 081754 80080B54 AFB0001C */ sw $s0, 0x1c($sp) -/* 081758 80080B58 AFA50034 */ sw $a1, 0x34($sp) -/* 08175C 80080B5C 000F78C0 */ sll $t7, $t7, 3 -/* 081760 80080B60 00808825 */ move $s1, $a0 -/* 081764 80080B64 24050200 */ li $a1, 512 -/* 081768 80080B68 0C01C88F */ jal func_8007223C -/* 08176C 80080B6C 01F88021 */ addu $s0, $t7, $t8 -/* 081770 80080B70 50400098 */ beql $v0, $zero, .L80080DD4 -/* 081774 80080B74 8FBF0024 */ lw $ra, 0x24($sp) -/* 081778 80080B78 8E19000C */ lw $t9, 0xc($s0) -/* 08177C 80080B7C 02202025 */ move $a0, $s1 -/* 081780 80080B80 33280100 */ andi $t0, $t9, 0x100 -/* 081784 80080B84 15000090 */ bnez $t0, .L80080DC8 -/* 081788 80080B88 00000000 */ nop -/* 08178C 80080B8C 0C0223D5 */ jal func_80088F54 -/* 081790 80080B90 02002825 */ move $a1, $s0 -/* 081794 80080B94 3C014022 */ li $at, 0x40220000 # 2.531250 -/* 081798 80080B98 44812800 */ mtc1 $at, $f5 -/* 08179C 80080B9C 44802000 */ mtc1 $zero, $f4 -/* 0817A0 80080BA0 460001A1 */ cvt.d.s $f6, $f0 -/* 0817A4 80080BA4 46000086 */ mov.s $f2, $f0 -/* 0817A8 80080BA8 4624303E */ c.le.d $f6, $f4 -/* 0817AC 80080BAC 00000000 */ nop -/* 0817B0 80080BB0 4500004E */ bc1f .L80080CEC -/* 0817B4 80080BB4 00000000 */ nop -/* 0817B8 80080BB8 8E0900BC */ lw $t1, 0xbc($s0) -/* 0817BC 80080BBC 02202025 */ move $a0, $s1 -/* 0817C0 80080BC0 02002825 */ move $a1, $s0 -/* 0817C4 80080BC4 00095140 */ sll $t2, $t1, 5 -/* 0817C8 80080BC8 05400048 */ bltz $t2, .L80080CEC -/* 0817CC 80080BCC 00000000 */ nop -/* 0817D0 80080BD0 0C022346 */ jal func_80088D18 -/* 0817D4 80080BD4 E7A2002C */ swc1 $f2, 0x2c($sp) -/* 0817D8 80080BD8 10400044 */ beqz $v0, .L80080CEC -/* 0817DC 80080BDC C7A2002C */ lwc1 $f2, 0x2c($sp) -/* 0817E0 80080BE0 96020000 */ lhu $v0, ($s0) -/* 0817E4 80080BE4 304B8000 */ andi $t3, $v0, 0x8000 -/* 0817E8 80080BE8 11600079 */ beqz $t3, .L80080DD0 -/* 0817EC 80080BEC 304C0100 */ andi $t4, $v0, 0x100 -/* 0817F0 80080BF0 55800078 */ bnel $t4, $zero, .L80080DD4 -/* 0817F4 80080BF4 8FBF0024 */ lw $ra, 0x24($sp) -/* 0817F8 80080BF8 8E0D00BC */ lw $t5, 0xbc($s0) -/* 0817FC 80080BFC 8FA50034 */ lw $a1, 0x34($sp) -/* 081800 80080C00 3C063FB3 */ lui $a2, (0x3FB33333 >> 16) # lui $a2, 0x3fb3 -/* 081804 80080C04 31AE0200 */ andi $t6, $t5, 0x200 -/* 081808 80080C08 15C0000B */ bnez $t6, .L80080C38 -/* 08180C 80080C0C 02202025 */ move $a0, $s1 -/* 081810 80080C10 3C0F1900 */ lui $t7, (0x1900A04C >> 16) # lui $t7, 0x1900 -/* 081814 80080C14 35EFA04C */ ori $t7, (0x1900A04C & 0xFFFF) # ori $t7, $t7, 0xa04c -/* 081818 80080C18 3C073F8C */ lui $a3, (0x3F8CCCCD >> 16) # lui $a3, 0x3f8c -/* 08181C 80080C1C 34E7CCCD */ ori $a3, (0x3F8CCCCD & 0xFFFF) # ori $a3, $a3, 0xcccd -/* 081820 80080C20 AFAF0010 */ sw $t7, 0x10($sp) -/* 081824 80080C24 02202025 */ move $a0, $s1 -/* 081828 80080C28 0C02251D */ jal func_80089474 -/* 08182C 80080C2C 34C63333 */ ori $a2, (0x3FB33333 & 0xFFFF) # ori $a2, $a2, 0x3333 -/* 081830 80080C30 10000068 */ b .L80080DD4 -/* 081834 80080C34 8FBF0024 */ lw $ra, 0x24($sp) -.L80080C38: -/* 081838 80080C38 0C01C8D5 */ jal func_80072354 -/* 08183C 80080C3C 24050040 */ li $a1, 64 -/* 081840 80080C40 50400064 */ beql $v0, $zero, .L80080DD4 -/* 081844 80080C44 8FBF0024 */ lw $ra, 0x24($sp) -/* 081848 80080C48 96180000 */ lhu $t8, ($s0) -/* 08184C 80080C4C 3C061901 */ lui $a2, (0x1901A24A >> 16) # lui $a2, 0x1901 -/* 081850 80080C50 93A40037 */ lbu $a0, 0x37($sp) -/* 081854 80080C54 33191000 */ andi $t9, $t8, 0x1000 -/* 081858 80080C58 13200007 */ beqz $t9, .L80080C78 -/* 08185C 80080C5C 3C051901 */ lui $a1, 0x1901 -/* 081860 80080C60 26040014 */ addiu $a0, $s0, 0x14 -/* 081864 80080C64 26050034 */ addiu $a1, $s0, 0x34 -/* 081868 80080C68 0C03262E */ jal func_800C98B8 -/* 08186C 80080C6C 34C6A24A */ ori $a2, (0x1901A24A & 0xFFFF) # ori $a2, $a2, 0xa24a -/* 081870 80080C70 10000003 */ b .L80080C80 -/* 081874 80080C74 00000000 */ nop -.L80080C78: -/* 081878 80080C78 0C032418 */ jal func_800C9060 -/* 08187C 80080C7C 34A5A24A */ ori $a1, $a1, 0xa24a -.L80080C80: -/* 081880 80080C80 0C020379 */ jal func_80080DE4 -/* 081884 80080C84 02202025 */ move $a0, $s1 -/* 081888 80080C88 001140C0 */ sll $t0, $s1, 3 -/* 08188C 80080C8C 01114023 */ subu $t0, $t0, $s1 -/* 081890 80080C90 00084140 */ sll $t0, $t0, 5 -/* 081894 80080C94 3C0A8016 */ lui $t2, %hi(D_80165C18) # $t2, 0x8016 -/* 081898 80080C98 254A5C18 */ addiu $t2, %lo(D_80165C18) # addiu $t2, $t2, 0x5c18 -/* 08189C 80080C9C 25090004 */ addiu $t1, $t0, 4 -/* 0818A0 80080CA0 3C078019 */ lui $a3, %hi(D_8018D3C4) # $a3, 0x8019 -/* 0818A4 80080CA4 8CE7D3C4 */ lw $a3, %lo(D_8018D3C4)($a3) -/* 0818A8 80080CA8 012A2021 */ addu $a0, $t1, $t2 -/* 0818AC 80080CAC 24050003 */ li $a1, 3 -/* 0818B0 80080CB0 0C01D4C1 */ jal func_80075304 -/* 0818B4 80080CB4 24060003 */ li $a2, 3 -/* 0818B8 80080CB8 02202025 */ move $a0, $s1 -/* 0818BC 80080CBC 0C01C87A */ jal func_800721E8 -/* 0818C0 80080CC0 24050200 */ li $a1, 512 -/* 0818C4 80080CC4 02202025 */ move $a0, $s1 -/* 0818C8 80080CC8 0C01C8A9 */ jal func_800722A4 -/* 0818CC 80080CCC 24050040 */ li $a1, 64 -/* 0818D0 80080CD0 0C021BD8 */ jal func_80086F60 -/* 0818D4 80080CD4 02202025 */ move $a0, $s1 -/* 0818D8 80080CD8 02202025 */ move $a0, $s1 -/* 0818DC 80080CDC 0C01C9B3 */ jal func_800726CC -/* 0818E0 80080CE0 240500C8 */ li $a1, 200 -/* 0818E4 80080CE4 1000003B */ b .L80080DD4 -/* 0818E8 80080CE8 8FBF0024 */ lw $ra, 0x24($sp) -.L80080CEC: -/* 0818EC 80080CEC 3C01800F */ lui $at, %hi(D_800EF0B0) -/* 0818F0 80080CF0 D428F0B0 */ ldc1 $f8, %lo(D_800EF0B0)($at) -/* 0818F4 80080CF4 460012A1 */ cvt.d.s $f10, $f2 -/* 0818F8 80080CF8 02202025 */ move $a0, $s1 -/* 0818FC 80080CFC 4628503E */ c.le.d $f10, $f8 -/* 081900 80080D00 00000000 */ nop -/* 081904 80080D04 45020033 */ bc1fl .L80080DD4 -/* 081908 80080D08 8FBF0024 */ lw $ra, 0x24($sp) -/* 08190C 80080D0C 0C01C8C8 */ jal func_80072320 -/* 081910 80080D10 24050001 */ li $a1, 1 -/* 081914 80080D14 1040002E */ beqz $v0, .L80080DD0 -/* 081918 80080D18 3C013FE0 */ li $at, 0x3FE00000 # 1.750000 -/* 08191C 80080D1C C6100094 */ lwc1 $f16, 0x94($s0) -/* 081920 80080D20 44812800 */ mtc1 $at, $f5 -/* 081924 80080D24 44802000 */ mtc1 $zero, $f4 -/* 081928 80080D28 460084A1 */ cvt.d.s $f18, $f16 -/* 08192C 80080D2C 3C01401C */ li $at, 0x401C0000 # 2.437500 -/* 081930 80080D30 46249182 */ mul.d $f6, $f18, $f4 -/* 081934 80080D34 44814800 */ mtc1 $at, $f9 -/* 081938 80080D38 44804000 */ mtc1 $zero, $f8 -/* 08193C 80080D3C 02202025 */ move $a0, $s1 -/* 081940 80080D40 02002825 */ move $a1, $s0 -/* 081944 80080D44 46283280 */ add.d $f10, $f6, $f8 -/* 081948 80080D48 46205420 */ cvt.s.d $f16, $f10 -/* 08194C 80080D4C 44068000 */ mfc1 $a2, $f16 -/* 081950 80080D50 0C022296 */ jal func_80088A58 -/* 081954 80080D54 00000000 */ nop -/* 081958 80080D58 5040001E */ beql $v0, $zero, .L80080DD4 -/* 08195C 80080D5C 8FBF0024 */ lw $ra, 0x24($sp) -/* 081960 80080D60 96020000 */ lhu $v0, ($s0) -/* 081964 80080D64 304B8000 */ andi $t3, $v0, 0x8000 -/* 081968 80080D68 11600019 */ beqz $t3, .L80080DD0 -/* 08196C 80080D6C 304C0100 */ andi $t4, $v0, 0x100 -/* 081970 80080D70 15800017 */ bnez $t4, .L80080DD0 -/* 081974 80080D74 02202025 */ move $a0, $s1 -/* 081978 80080D78 0C01C88F */ jal func_8007223C -/* 08197C 80080D7C 3C050400 */ lui $a1, 0x400 -/* 081980 80080D80 50400004 */ beql $v0, $zero, .L80080D94 -/* 081984 80080D84 02202025 */ move $a0, $s1 -/* 081988 80080D88 0C01C860 */ jal func_80072180 -/* 08198C 80080D8C 00000000 */ nop -/* 081990 80080D90 02202025 */ move $a0, $s1 -.L80080D94: -/* 081994 80080D94 0C01C8A9 */ jal func_800722A4 -/* 081998 80080D98 24050002 */ li $a1, 2 -/* 08199C 80080D9C 960D0046 */ lhu $t5, 0x46($s0) -/* 0819A0 80080DA0 8E0F000C */ lw $t7, 0xc($s0) -/* 0819A4 80080DA4 A6110040 */ sh $s1, 0x40($s0) -/* 0819A8 80080DA8 35AE0002 */ ori $t6, $t5, 2 -/* 0819AC 80080DAC 35F80100 */ ori $t8, $t7, 0x100 -/* 0819B0 80080DB0 A60E0046 */ sh $t6, 0x46($s0) -/* 0819B4 80080DB4 AE18000C */ sw $t8, 0xc($s0) -/* 0819B8 80080DB8 0C0223FC */ jal func_80088FF0 -/* 0819BC 80080DBC 02002025 */ move $a0, $s0 -/* 0819C0 80080DC0 10000004 */ b .L80080DD4 -/* 0819C4 80080DC4 8FBF0024 */ lw $ra, 0x24($sp) -.L80080DC8: -/* 0819C8 80080DC8 0C0223FC */ jal func_80088FF0 -/* 0819CC 80080DCC 02002025 */ move $a0, $s0 -.L80080DD0: -/* 0819D0 80080DD0 8FBF0024 */ lw $ra, 0x24($sp) -.L80080DD4: -/* 0819D4 80080DD4 8FB0001C */ lw $s0, 0x1c($sp) -/* 0819D8 80080DD8 8FB10020 */ lw $s1, 0x20($sp) -/* 0819DC 80080DDC 03E00008 */ jr $ra -/* 0819E0 80080DE0 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/non_matchings/code_80071F00/func_80080DE4.s b/asm/non_matchings/code_80071F00/func_80080DE4.s deleted file mode 100644 index b586c83a2..000000000 --- a/asm/non_matchings/code_80071F00/func_80080DE4.s +++ /dev/null @@ -1,48 +0,0 @@ -glabel func_80080DE4 -/* 0819E4 80080DE4 3C02800E */ lui $v0, %hi(gPlayerOne) # $v0, 0x800e -/* 0819E8 80080DE8 8C42C4DC */ lw $v0, %lo(gPlayerOne)($v0) -/* 0819EC 80080DEC 00001825 */ move $v1, $zero -/* 0819F0 80080DF0 24070008 */ li $a3, 8 -/* 0819F4 80080DF4 2406FFFF */ li $a2, -1 -/* 0819F8 80080DF8 2405FEFF */ li $a1, -257 -.L80080DFC: -/* 0819FC 80080DFC 844E0040 */ lh $t6, 0x40($v0) -/* 081A00 80080E00 24630004 */ addiu $v1, $v1, 4 -/* 081A04 80080E04 548E0006 */ bnel $a0, $t6, .L80080E20 -/* 081A08 80080E08 84590E18 */ lh $t9, 0xe18($v0) -/* 081A0C 80080E0C 8C4F000C */ lw $t7, 0xc($v0) -/* 081A10 80080E10 A4460040 */ sh $a2, 0x40($v0) -/* 081A14 80080E14 01E5C024 */ and $t8, $t7, $a1 -/* 081A18 80080E18 AC58000C */ sw $t8, 0xc($v0) -/* 081A1C 80080E1C 84590E18 */ lh $t9, 0xe18($v0) -.L80080E20: -/* 081A20 80080E20 24420DD8 */ addiu $v0, $v0, 0xdd8 -/* 081A24 80080E24 54990006 */ bnel $a0, $t9, .L80080E40 -/* 081A28 80080E28 844A0E18 */ lh $t2, 0xe18($v0) -/* 081A2C 80080E2C 8C48000C */ lw $t0, 0xc($v0) -/* 081A30 80080E30 A4460040 */ sh $a2, 0x40($v0) -/* 081A34 80080E34 01054824 */ and $t1, $t0, $a1 -/* 081A38 80080E38 AC49000C */ sw $t1, 0xc($v0) -/* 081A3C 80080E3C 844A0E18 */ lh $t2, 0xe18($v0) -.L80080E40: -/* 081A40 80080E40 24420DD8 */ addiu $v0, $v0, 0xdd8 -/* 081A44 80080E44 548A0006 */ bnel $a0, $t2, .L80080E60 -/* 081A48 80080E48 844D0E18 */ lh $t5, 0xe18($v0) -/* 081A4C 80080E4C 8C4B000C */ lw $t3, 0xc($v0) -/* 081A50 80080E50 A4460040 */ sh $a2, 0x40($v0) -/* 081A54 80080E54 01656024 */ and $t4, $t3, $a1 -/* 081A58 80080E58 AC4C000C */ sw $t4, 0xc($v0) -/* 081A5C 80080E5C 844D0E18 */ lh $t5, 0xe18($v0) -.L80080E60: -/* 081A60 80080E60 24420DD8 */ addiu $v0, $v0, 0xdd8 -/* 081A64 80080E64 148D0005 */ bne $a0, $t5, .L80080E7C -/* 081A68 80080E68 00000000 */ nop -/* 081A6C 80080E6C 8C4E000C */ lw $t6, 0xc($v0) -/* 081A70 80080E70 A4460040 */ sh $a2, 0x40($v0) -/* 081A74 80080E74 01C57824 */ and $t7, $t6, $a1 -/* 081A78 80080E78 AC4F000C */ sw $t7, 0xc($v0) -.L80080E7C: -/* 081A7C 80080E7C 1467FFDF */ bne $v1, $a3, .L80080DFC -/* 081A80 80080E80 24420DD8 */ addiu $v0, $v0, 0xdd8 -/* 081A84 80080E84 03E00008 */ jr $ra -/* 081A88 80080E88 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_80081080.s b/asm/non_matchings/code_80071F00/func_80081080.s deleted file mode 100644 index 3a2ec84ab..000000000 --- a/asm/non_matchings/code_80071F00/func_80081080.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel func_80081080 -/* 081C80 80081080 000470C0 */ sll $t6, $a0, 3 -/* 081C84 80081084 01C47023 */ subu $t6, $t6, $a0 -/* 081C88 80081088 3C0F8016 */ lui $t7, %hi(D_80165C18) # $t7, 0x8016 -/* 081C8C 8008108C 25EF5C18 */ addiu $t7, %lo(D_80165C18) # addiu $t7, $t7, 0x5c18 -/* 081C90 80081090 000E7140 */ sll $t6, $t6, 5 -/* 081C94 80081094 3C038019 */ lui $v1, %hi(D_8018D490) # $v1, 0x8019 -/* 081C98 80081098 8C63D490 */ lw $v1, %lo(D_8018D490)($v1) -/* 081C9C 8008109C 01CF1021 */ addu $v0, $t6, $t7 -/* 081CA0 800810A0 44800000 */ mtc1 $zero, $f0 -/* 081CA4 800810A4 3C013E80 */ li $at, 0x3E800000 # 0.250000 -/* 081CA8 800810A8 44812000 */ mtc1 $at, $f4 -/* 081CAC 800810AC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 081CB0 800810B0 AFBF0014 */ sw $ra, 0x14($sp) -/* 081CB4 800810B4 241800FF */ li $t8, 255 -/* 081CB8 800810B8 A45800A0 */ sh $t8, 0xa0($v0) -/* 081CBC 800810BC A44000C0 */ sh $zero, 0xc0($v0) -/* 081CC0 800810C0 A44000B2 */ sh $zero, 0xb2($v0) -/* 081CC4 800810C4 A44000B6 */ sh $zero, 0xb6($v0) -/* 081CC8 800810C8 AC430064 */ sw $v1, 0x64($v0) -/* 081CCC 800810CC AC43006C */ sw $v1, 0x6c($v0) -/* 081CD0 800810D0 E4400028 */ swc1 $f0, 0x28($v0) -/* 081CD4 800810D4 E440002C */ swc1 $f0, 0x2c($v0) -/* 081CD8 800810D8 E4400030 */ swc1 $f0, 0x30($v0) -/* 081CDC 800810DC 0C01C922 */ jal func_80072488 -/* 081CE0 800810E0 E4440000 */ swc1 $f4, ($v0) -/* 081CE4 800810E4 8FBF0014 */ lw $ra, 0x14($sp) -/* 081CE8 800810E8 27BD0018 */ addiu $sp, $sp, 0x18 -/* 081CEC 800810EC 03E00008 */ jr $ra -/* 081CF0 800810F0 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_800810F4.s b/asm/non_matchings/code_80071F00/func_800810F4.s deleted file mode 100644 index aefc8152f..000000000 --- a/asm/non_matchings/code_80071F00/func_800810F4.s +++ /dev/null @@ -1,81 +0,0 @@ -.section .late_rodata - -glabel D_800EF0C8 -.float 0.025 - -.section .text - -glabel func_800810F4 -/* 081CF4 800810F4 000470C0 */ sll $t6, $a0, 3 -/* 081CF8 800810F8 01C47023 */ subu $t6, $t6, $a0 -/* 081CFC 800810FC 3C0F8016 */ lui $t7, %hi(D_80165C18) # $t7, 0x8016 -/* 081D00 80081100 25EF5C18 */ addiu $t7, %lo(D_80165C18) # addiu $t7, $t7, 0x5c18 -/* 081D04 80081104 000E7140 */ sll $t6, $t6, 5 -/* 081D08 80081108 01CF1821 */ addu $v1, $t6, $t7 -/* 081D0C 8008110C 846200A6 */ lh $v0, 0xa6($v1) -/* 081D10 80081110 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 081D14 80081114 AFB00028 */ sw $s0, 0x28($sp) -/* 081D18 80081118 00808025 */ move $s0, $a0 -/* 081D1C 8008111C 10400033 */ beqz $v0, .L800811EC -/* 081D20 80081120 AFBF002C */ sw $ra, 0x2c($sp) -/* 081D24 80081124 24010001 */ li $at, 1 -/* 081D28 80081128 10410008 */ beq $v0, $at, .L8008114C -/* 081D2C 8008112C 24010002 */ li $at, 2 -/* 081D30 80081130 1041000A */ beq $v0, $at, .L8008115C -/* 081D34 80081134 02002025 */ move $a0, $s0 -/* 081D38 80081138 24010003 */ li $at, 3 -/* 081D3C 8008113C 10410029 */ beq $v0, $at, .L800811E4 -/* 081D40 80081140 00000000 */ nop -/* 081D44 80081144 10000029 */ b .L800811EC -/* 081D48 80081148 00000000 */ nop -.L8008114C: -/* 081D4C 8008114C 0C020420 */ jal func_80081080 -/* 081D50 80081150 02002025 */ move $a0, $s0 -/* 081D54 80081154 10000025 */ b .L800811EC -/* 081D58 80081158 00000000 */ nop -.L8008115C: -/* 081D5C 8008115C 0C021DD7 */ jal func_8008775C -/* 081D60 80081160 AFA30030 */ sw $v1, 0x30($sp) -/* 081D64 80081164 8FA40030 */ lw $a0, 0x30($sp) -/* 081D68 80081168 3C054160 */ lui $a1, 0x4160 -/* 081D6C 8008116C 3C063F00 */ lui $a2, 0x3f00 -/* 081D70 80081170 0C0103B8 */ jal f32_step_up_towards -/* 081D74 80081174 2484002C */ addiu $a0, $a0, 0x2c -/* 081D78 80081178 3C01800F */ lui $at, %hi(D_800EF0C8) # $at, 0x800f -/* 081D7C 8008117C C424F0C8 */ lwc1 $f4, %lo(D_800EF0C8)($at) -/* 081D80 80081180 24180001 */ li $t8, 1 -/* 081D84 80081184 AFB80014 */ sw $t8, 0x14($sp) -/* 081D88 80081188 02002025 */ move $a0, $s0 -/* 081D8C 8008118C 8FA50030 */ lw $a1, 0x30($sp) -/* 081D90 80081190 3C063E80 */ lui $a2, 0x3e80 -/* 081D94 80081194 3C073F40 */ lui $a3, 0x3f40 -/* 081D98 80081198 AFA00018 */ sw $zero, 0x18($sp) -/* 081D9C 8008119C 0C01D057 */ jal func_8007415C -/* 081DA0 800811A0 E7A40010 */ swc1 $f4, 0x10($sp) -/* 081DA4 800811A4 8FA50030 */ lw $a1, 0x30($sp) -/* 081DA8 800811A8 24190004 */ li $t9, 4 -/* 081DAC 800811AC AFB90010 */ sw $t9, 0x10($sp) -/* 081DB0 800811B0 02002025 */ move $a0, $s0 -/* 081DB4 800811B4 240600FF */ li $a2, 255 -/* 081DB8 800811B8 00003825 */ move $a3, $zero -/* 081DBC 800811BC AFA00014 */ sw $zero, 0x14($sp) -/* 081DC0 800811C0 AFA00018 */ sw $zero, 0x18($sp) -/* 081DC4 800811C4 0C01CEC0 */ jal func_80073B00 -/* 081DC8 800811C8 24A500A0 */ addiu $a1, $a1, 0xa0 -/* 081DCC 800811CC 10400007 */ beqz $v0, .L800811EC -/* 081DD0 800811D0 00000000 */ nop -/* 081DD4 800811D4 0C01C922 */ jal func_80072488 -/* 081DD8 800811D8 02002025 */ move $a0, $s0 -/* 081DDC 800811DC 10000003 */ b .L800811EC -/* 081DE0 800811E0 00000000 */ nop -.L800811E4: -/* 081DE4 800811E4 0C01C90A */ jal func_80072428 -/* 081DE8 800811E8 02002025 */ move $a0, $s0 -.L800811EC: -/* 081DEC 800811EC 0C022FC6 */ jal func_8008BF18 -/* 081DF0 800811F0 02002025 */ move $a0, $s0 -/* 081DF4 800811F4 8FBF002C */ lw $ra, 0x2c($sp) -/* 081DF8 800811F8 8FB00028 */ lw $s0, 0x28($sp) -/* 081DFC 800811FC 27BD0038 */ addiu $sp, $sp, 0x38 -/* 081E00 80081200 03E00008 */ jr $ra -/* 081E04 80081204 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_8008153C.s b/asm/non_matchings/code_80071F00/func_8008153C.s deleted file mode 100644 index 26849f108..000000000 --- a/asm/non_matchings/code_80071F00/func_8008153C.s +++ /dev/null @@ -1,180 +0,0 @@ -.section .late_rodata - -glabel D_800EF0E4 -.float 0.15 - -glabel D_800EF0E8 -.double 0.8 - -glabel D_800EF0F0 -.double 0.01 - -glabel D_800EF0F8 -.double 4.8 - -glabel D_800EF100 -.double 0.1 - -.section .text - -glabel func_8008153C -/* 08213C 8008153C 27BDFF80 */ addiu $sp, $sp, -0x80 -/* 082140 80081540 3C0E800E */ lui $t6, %hi(gPlayerCountSelection1) # $t6, 0x800e -/* 082144 80081544 8DCEC538 */ lw $t6, %lo(gPlayerCountSelection1)($t6) -/* 082148 80081548 24010001 */ li $at, 1 -/* 08214C 8008154C AFBF006C */ sw $ra, 0x6c($sp) -/* 082150 80081550 AFBE0068 */ sw $fp, 0x68($sp) -/* 082154 80081554 AFB70064 */ sw $s7, 0x64($sp) -/* 082158 80081558 AFB60060 */ sw $s6, 0x60($sp) -/* 08215C 8008155C AFB5005C */ sw $s5, 0x5c($sp) -/* 082160 80081560 AFB40058 */ sw $s4, 0x58($sp) -/* 082164 80081564 AFB30054 */ sw $s3, 0x54($sp) -/* 082168 80081568 AFB20050 */ sw $s2, 0x50($sp) -/* 08216C 8008156C AFB1004C */ sw $s1, 0x4c($sp) -/* 082170 80081570 AFB00048 */ sw $s0, 0x48($sp) -/* 082174 80081574 F7BE0040 */ sdc1 $f30, 0x40($sp) -/* 082178 80081578 F7BC0038 */ sdc1 $f28, 0x38($sp) -/* 08217C 8008157C F7BA0030 */ sdc1 $f26, 0x30($sp) -/* 082180 80081580 F7B80028 */ sdc1 $f24, 0x28($sp) -/* 082184 80081584 F7B60020 */ sdc1 $f22, 0x20($sp) -/* 082188 80081588 F7B40018 */ sdc1 $f20, 0x18($sp) -/* 08218C 8008158C 15C10004 */ bne $t6, $at, .L800815A0 -/* 082190 80081590 AFA40080 */ sw $a0, 0x80($sp) -/* 082194 80081594 240F0008 */ li $t7, 8 -/* 082198 80081598 10000003 */ b .L800815A8 -/* 08219C 8008159C AFAF0070 */ sw $t7, 0x70($sp) -.L800815A0: -/* 0821A0 800815A0 24180004 */ li $t8, 4 -/* 0821A4 800815A4 AFB80070 */ sw $t8, 0x70($sp) -.L800815A8: -/* 0821A8 800815A8 8FB90070 */ lw $t9, 0x70($sp) -/* 0821AC 800815AC 0000B825 */ move $s7, $zero -/* 0821B0 800815B0 3C01800F */ lui $at, %hi(D_800EF0E4) # $at, 0x800f -/* 0821B4 800815B4 1B200064 */ blez $t9, .L80081748 -/* 0821B8 800815B8 3C1E0601 */ lui $fp, %hi(D_06013670) # $fp, 0x601 -/* 0821BC 800815BC C43EF0E4 */ lwc1 $f30, %lo(D_800EF0E4)($at) -/* 0821C0 800815C0 3C01402A */ li $at, 0x402A0000 # 2.656250 -/* 0821C4 800815C4 4481E800 */ mtc1 $at, $f29 -/* 0821C8 800815C8 3C01800F */ lui $at, %hi(D_800EF0E8) -/* 0821CC 800815CC D43AF0E8 */ ldc1 $f26, %lo(D_800EF0E8)($at) -/* 0821D0 800815D0 3C01800F */ lui $at, %hi(D_800EF0F0) -/* 0821D4 800815D4 D438F0F0 */ ldc1 $f24, %lo(D_800EF0F0)($at) -/* 0821D8 800815D8 3C01800F */ lui $at, %hi(D_800EF0F8) -/* 0821DC 800815DC D436F0F8 */ ldc1 $f22, %lo(D_800EF0F8)($at) -/* 0821E0 800815E0 3C01800F */ lui $at, %hi(D_800EF100) -/* 0821E4 800815E4 3C128016 */ lui $s2, %hi(D_80165C18) # $s2, 0x8016 -/* 0821E8 800815E8 4480E000 */ mtc1 $zero, $f28 -/* 0821EC 800815EC 26525C18 */ addiu $s2, %lo(D_80165C18) # addiu $s2, $s2, 0x5c18 -/* 0821F0 800815F0 D434F100 */ ldc1 $f20, %lo(D_800EF100)($at) -/* 0821F4 800815F4 27DE3670 */ addiu $fp, %lo(D_06013670) # addiu $fp, $fp, 0x3670 -/* 0821F8 800815F8 24140080 */ li $s4, 128 -/* 0821FC 800815FC 241300E0 */ li $s3, 224 -.L80081600: -/* 082200 80081600 3C028019 */ lui $v0, %hi(D_8018C3F0) # $v0, 0x8019 -/* 082204 80081604 2442C3F0 */ addiu $v0, %lo(D_8018C3F0) # addiu $v0, $v0, -0x3c10 -/* 082208 80081608 00008825 */ move $s1, $zero -.L8008160C: -/* 08220C 8008160C 8C440000 */ lw $a0, ($v0) -/* 082210 80081610 00930019 */ multu $a0, $s3 -/* 082214 80081614 00004012 */ mflo $t0 -/* 082218 80081618 02488021 */ addu $s0, $s2, $t0 -/* 08221C 8008161C 860900A6 */ lh $t1, 0xa6($s0) -/* 082220 80081620 55200043 */ bnel $t1, $zero, .L80081730 -/* 082224 80081624 26310001 */ addiu $s1, $s1, 1 -/* 082228 80081628 8FAA0070 */ lw $t2, 0x70($sp) -/* 08222C 8008162C 3C0B0001 */ lui $t3, 1 -/* 082230 80081630 8FAC0080 */ lw $t4, 0x80($sp) -/* 082234 80081634 016A001A */ div $zero, $t3, $t2 -/* 082238 80081638 000C68C0 */ sll $t5, $t4, 3 -/* 08223C 8008163C 01AC6823 */ subu $t5, $t5, $t4 -/* 082240 80081640 000D6940 */ sll $t5, $t5, 5 -/* 082244 80081644 0000B012 */ mflo $s6 -/* 082248 80081648 024DA821 */ addu $s5, $s2, $t5 -/* 08224C 8008164C 00002825 */ move $a1, $zero -/* 082250 80081650 15400002 */ bnez $t2, .L8008165C -/* 082254 80081654 00000000 */ nop -/* 082258 80081658 0007000D */ break 7 -.L8008165C: -/* 08225C 8008165C 2401FFFF */ li $at, -1 -/* 082260 80081660 15410004 */ bne $t2, $at, .L80081674 -/* 082264 80081664 3C018000 */ lui $at, 0x8000 -/* 082268 80081668 15610002 */ bne $t3, $at, .L80081674 -/* 08226C 8008166C 00000000 */ nop -/* 082270 80081670 0006000D */ break 6 -.L80081674: -/* 082274 80081674 0C01C8E9 */ jal func_800723A4 -/* 082278 80081678 00000000 */ nop -/* 08227C 8008167C AE1E0060 */ sw $fp, 0x60($s0) -/* 082280 80081680 AE1E0068 */ sw $fp, 0x68($s0) -/* 082284 80081684 E61E0000 */ swc1 $f30, ($s0) -/* 082288 80081688 0C0ADF8D */ jal random_int -/* 08228C 8008168C 2404000A */ li $a0, 10 -/* 082290 80081690 44822000 */ mtc1 $v0, $f4 -/* 082294 80081694 3C014F80 */ li $at, 0x4F800000 # 4294967296.000000 -/* 082298 80081698 04410004 */ bgez $v0, .L800816AC -/* 08229C 8008169C 468021A0 */ cvt.s.w $f6, $f4 -/* 0822A0 800816A0 44814000 */ mtc1 $at, $f8 -/* 0822A4 800816A4 00000000 */ nop -/* 0822A8 800816A8 46083180 */ add.s $f6, $f6, $f8 -.L800816AC: -/* 0822AC 800816AC 460032A1 */ cvt.d.s $f10, $f6 -/* 0822B0 800816B0 24040005 */ li $a0, 5 -/* 0822B4 800816B4 46345402 */ mul.d $f16, $f10, $f20 -/* 0822B8 800816B8 46368480 */ add.d $f18, $f16, $f22 -/* 0822BC 800816BC 46209120 */ cvt.s.d $f4, $f18 -/* 0822C0 800816C0 0C0ADF8D */ jal random_int -/* 0822C4 800816C4 E604003C */ swc1 $f4, 0x3c($s0) -/* 0822C8 800816C8 44824000 */ mtc1 $v0, $f8 -/* 0822CC 800816CC 04410005 */ bgez $v0, .L800816E4 -/* 0822D0 800816D0 468041A0 */ cvt.s.w $f6, $f8 -/* 0822D4 800816D4 3C014F80 */ li $at, 0x4F800000 # 4294967296.000000 -/* 0822D8 800816D8 44815000 */ mtc1 $at, $f10 -/* 0822DC 800816DC 00000000 */ nop -/* 0822E0 800816E0 460A3180 */ add.s $f6, $f6, $f10 -.L800816E4: -/* 0822E4 800816E4 46003421 */ cvt.d.s $f16, $f6 -/* 0822E8 800816E8 02D10019 */ multu $s6, $s1 -/* 0822EC 800816EC 46388482 */ mul.d $f18, $f16, $f24 -/* 0822F0 800816F0 463A9100 */ add.d $f4, $f18, $f26 -/* 0822F4 800816F4 00007012 */ mflo $t6 -/* 0822F8 800816F8 A60E00B4 */ sh $t6, 0xb4($s0) -/* 0822FC 800816FC 46202220 */ cvt.s.d $f8, $f4 -/* 082300 80081700 E6080034 */ swc1 $f8, 0x34($s0) -/* 082304 80081704 C6AA0010 */ lwc1 $f10, 0x10($s5) -/* 082308 80081708 E60A0010 */ swc1 $f10, 0x10($s0) -/* 08230C 8008170C C6A60014 */ lwc1 $f6, 0x14($s5) -/* 082310 80081710 46003421 */ cvt.d.s $f16, $f6 -/* 082314 80081714 463C8481 */ sub.d $f18, $f16, $f28 -/* 082318 80081718 46209120 */ cvt.s.d $f4, $f18 -/* 08231C 8008171C E6040014 */ swc1 $f4, 0x14($s0) -/* 082320 80081720 C6A80018 */ lwc1 $f8, 0x18($s5) -/* 082324 80081724 10000004 */ b .L80081738 -/* 082328 80081728 E6080018 */ swc1 $f8, 0x18($s0) -/* 08232C 8008172C 26310001 */ addiu $s1, $s1, 1 -.L80081730: -/* 082330 80081730 1634FFB6 */ bne $s1, $s4, .L8008160C -/* 082334 80081734 24420004 */ addiu $v0, $v0, 4 -.L80081738: -/* 082338 80081738 8FAF0070 */ lw $t7, 0x70($sp) -/* 08233C 8008173C 26F70001 */ addiu $s7, $s7, 1 -/* 082340 80081740 16EFFFAF */ bne $s7, $t7, .L80081600 -/* 082344 80081744 00000000 */ nop -.L80081748: -/* 082348 80081748 8FBF006C */ lw $ra, 0x6c($sp) -/* 08234C 8008174C D7B40018 */ ldc1 $f20, 0x18($sp) -/* 082350 80081750 D7B60020 */ ldc1 $f22, 0x20($sp) -/* 082354 80081754 D7B80028 */ ldc1 $f24, 0x28($sp) -/* 082358 80081758 D7BA0030 */ ldc1 $f26, 0x30($sp) -/* 08235C 8008175C D7BC0038 */ ldc1 $f28, 0x38($sp) -/* 082360 80081760 D7BE0040 */ ldc1 $f30, 0x40($sp) -/* 082364 80081764 8FB00048 */ lw $s0, 0x48($sp) -/* 082368 80081768 8FB1004C */ lw $s1, 0x4c($sp) -/* 08236C 8008176C 8FB20050 */ lw $s2, 0x50($sp) -/* 082370 80081770 8FB30054 */ lw $s3, 0x54($sp) -/* 082374 80081774 8FB40058 */ lw $s4, 0x58($sp) -/* 082378 80081778 8FB5005C */ lw $s5, 0x5c($sp) -/* 08237C 8008177C 8FB60060 */ lw $s6, 0x60($sp) -/* 082380 80081780 8FB70064 */ lw $s7, 0x64($sp) -/* 082384 80081784 8FBE0068 */ lw $fp, 0x68($sp) -/* 082388 80081788 03E00008 */ jr $ra -/* 08238C 8008178C 27BD0080 */ addiu $sp, $sp, 0x80 diff --git a/asm/non_matchings/code_80071F00/func_80081848.s b/asm/non_matchings/code_80071F00/func_80081848.s deleted file mode 100644 index 7d56bd31c..000000000 --- a/asm/non_matchings/code_80071F00/func_80081848.s +++ /dev/null @@ -1,63 +0,0 @@ -.section .late_rodata - -glabel D_800EF108 -.float 0.15 - -.section .text - -glabel func_80081848 -/* 082448 80081848 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 08244C 8008184C AFBF0024 */ sw $ra, 0x24($sp) -/* 082450 80081850 AFB00020 */ sw $s0, 0x20($sp) -/* 082454 80081854 3C050601 */ lui $a1, %hi(d_course_moo_moo_farm_mole_tlut) # $a1, 0x601 -/* 082458 80081858 3C060601 */ lui $a2, %hi(d_course_moo_moo_farm_mole_frames) # $a2, 0x601 -/* 08245C 8008185C 240E0040 */ li $t6, 64 -/* 082460 80081860 00808025 */ move $s0, $a0 -/* 082464 80081864 AFAE0010 */ sw $t6, 0x10($sp) -/* 082468 80081868 24C6FE70 */ addiu $a2, %lo(d_course_moo_moo_farm_mole_frames) # addiu $a2, $a2, -0x190 -/* 08246C 8008186C 24A5FC70 */ addiu $a1, %lo(d_course_moo_moo_farm_mole_tlut) # addiu $a1, $a1, -0x390 -/* 082470 80081870 0C01CD11 */ jal func_80073444 -/* 082474 80081874 24070020 */ li $a3, 32 -/* 082478 80081878 44800000 */ mtc1 $zero, $f0 -/* 08247C 8008187C 001078C0 */ sll $t7, $s0, 3 -/* 082480 80081880 01F07823 */ subu $t7, $t7, $s0 -/* 082484 80081884 3C188016 */ lui $t8, %hi(D_80165C18) # $t8, 0x8016 -/* 082488 80081888 27185C18 */ addiu $t8, %lo(D_80165C18) # addiu $t8, $t8, 0x5c18 -/* 08248C 8008188C 000F7940 */ sll $t7, $t7, 5 -/* 082490 80081890 3C01800F */ lui $at, %hi(D_800EF108) # $at, 0x800f -/* 082494 80081894 C424F108 */ lwc1 $f4, %lo(D_800EF108)($at) -/* 082498 80081898 01F81021 */ addu $v0, $t7, $t8 -/* 08249C 8008189C 44050000 */ mfc1 $a1, $f0 -/* 0824A0 800818A0 44060000 */ mfc1 $a2, $f0 -/* 0824A4 800818A4 44070000 */ mfc1 $a3, $f0 -/* 0824A8 800818A8 A04000D2 */ sb $zero, 0xd2($v0) -/* 0824AC 800818AC AFA2002C */ sw $v0, 0x2c($sp) -/* 0824B0 800818B0 02002025 */ move $a0, $s0 -/* 0824B4 800818B4 0C022E03 */ jal func_8008B80C -/* 0824B8 800818B8 E4440000 */ swc1 $f4, ($v0) -/* 0824BC 800818BC 02002025 */ move $a0, $s0 -/* 0824C0 800818C0 00002825 */ move $a1, $zero -/* 0824C4 800818C4 00003025 */ move $a2, $zero -/* 0824C8 800818C8 0C022E22 */ jal func_8008B888 -/* 0824CC 800818CC 00003825 */ move $a3, $zero -/* 0824D0 800818D0 02002025 */ move $a0, $s0 -/* 0824D4 800818D4 00002825 */ move $a1, $zero -/* 0824D8 800818D8 00003025 */ move $a2, $zero -/* 0824DC 800818DC 0C022E2F */ jal func_8008B8BC -/* 0824E0 800818E0 34078000 */ li $a3, 32768 -/* 0824E4 800818E4 8FA2002C */ lw $v0, 0x2c($sp) -/* 0824E8 800818E8 3C014080 */ li $at, 0x40800000 # 4.000000 -/* 0824EC 800818EC 44813000 */ mtc1 $at, $f6 -/* 0824F0 800818F0 24190006 */ li $t9, 6 -/* 0824F4 800818F4 02002025 */ move $a0, $s0 -/* 0824F8 800818F8 3C050400 */ lui $a1, 0x400 -/* 0824FC 800818FC A45900C8 */ sh $t9, 0xc8($v0) -/* 082500 80081900 0C01C870 */ jal func_800721C0 -/* 082504 80081904 E446003C */ swc1 $f6, 0x3c($v0) -/* 082508 80081908 0C01C922 */ jal func_80072488 -/* 08250C 8008190C 02002025 */ move $a0, $s0 -/* 082510 80081910 8FBF0024 */ lw $ra, 0x24($sp) -/* 082514 80081914 8FB00020 */ lw $s0, 0x20($sp) -/* 082518 80081918 27BD0030 */ addiu $sp, $sp, 0x30 -/* 08251C 8008191C 03E00008 */ jr $ra -/* 082520 80081920 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_80081D34.s b/asm/non_matchings/code_80071F00/func_80081D34.s deleted file mode 100644 index bdf80ebcd..000000000 --- a/asm/non_matchings/code_80071F00/func_80081D34.s +++ /dev/null @@ -1,185 +0,0 @@ -glabel func_80081D34 -/* 082934 80081D34 27BDFF90 */ addiu $sp, $sp, -0x70 -/* 082938 80081D38 3C0E8019 */ lui $t6, %hi(D_8018D158) # $t6, 0x8019 -/* 08293C 80081D3C 8DCED158 */ lw $t6, %lo(D_8018D158)($t6) -/* 082940 80081D40 AFB40058 */ sw $s4, 0x58($sp) -/* 082944 80081D44 AFB1004C */ sw $s1, 0x4c($sp) -/* 082948 80081D48 AFB5005C */ sw $s5, 0x5c($sp) -/* 08294C 80081D4C AFB30054 */ sw $s3, 0x54($sp) -/* 082950 80081D50 AFB20050 */ sw $s2, 0x50($sp) -/* 082954 80081D54 3C11800E */ lui $s1, %hi(gPlayerOne) # $s1, 0x800e -/* 082958 80081D58 3C14800E */ lui $s4, %hi(camera1) # $s4, 0x800e -/* 08295C 80081D5C 00809825 */ move $s3, $a0 -/* 082960 80081D60 AFBF006C */ sw $ra, 0x6c($sp) -/* 082964 80081D64 AFBE0068 */ sw $fp, 0x68($sp) -/* 082968 80081D68 AFB70064 */ sw $s7, 0x64($sp) -/* 08296C 80081D6C AFB60060 */ sw $s6, 0x60($sp) -/* 082970 80081D70 AFB00048 */ sw $s0, 0x48($sp) -/* 082974 80081D74 F7BE0040 */ sdc1 $f30, 0x40($sp) -/* 082978 80081D78 F7BC0038 */ sdc1 $f28, 0x38($sp) -/* 08297C 80081D7C F7BA0030 */ sdc1 $f26, 0x30($sp) -/* 082980 80081D80 F7B80028 */ sdc1 $f24, 0x28($sp) -/* 082984 80081D84 F7B60020 */ sdc1 $f22, 0x20($sp) -/* 082988 80081D88 F7B40018 */ sdc1 $f20, 0x18($sp) -/* 08298C 80081D8C 0000A825 */ move $s5, $zero -/* 082990 80081D90 8E31C4DC */ lw $s1, %lo(gPlayerOne)($s1) -/* 082994 80081D94 8E94DB40 */ lw $s4, %lo(camera1)($s4) -/* 082998 80081D98 19C00065 */ blez $t6, .L80081F30 -/* 08299C 80081D9C 00009025 */ move $s2, $zero -/* 0829A0 80081DA0 3C0140A0 */ li $at, 0x40A00000 # 5.000000 -/* 0829A4 80081DA4 4481F000 */ mtc1 $at, $f30 -/* 0829A8 80081DA8 3C014000 */ li $at, 0x40000000 # 2.000000 -/* 0829AC 80081DAC 4481E000 */ mtc1 $at, $f28 -/* 0829B0 80081DB0 3C014010 */ li $at, 0x40100000 # 2.250000 -/* 0829B4 80081DB4 4481D800 */ mtc1 $at, $f27 -/* 0829B8 80081DB8 3C014014 */ li $at, 0x40140000 # 2.312500 -/* 0829BC 80081DBC 4481C800 */ mtc1 $at, $f25 -/* 0829C0 80081DC0 3C013FF0 */ li $at, 0x3FF00000 # 1.875000 -/* 0829C4 80081DC4 4481B800 */ mtc1 $at, $f23 -/* 0829C8 80081DC8 3C014008 */ li $at, 0x40080000 # 2.125000 -/* 0829CC 80081DCC 3C1E1900 */ lui $fp, (0x1900A046 >> 16) # lui $fp, 0x1900 -/* 0829D0 80081DD0 4481A800 */ mtc1 $at, $f21 -/* 0829D4 80081DD4 4480D000 */ mtc1 $zero, $f26 -/* 0829D8 80081DD8 4480C000 */ mtc1 $zero, $f24 -/* 0829DC 80081DDC 4480B000 */ mtc1 $zero, $f22 -/* 0829E0 80081DE0 4480A000 */ mtc1 $zero, $f20 -/* 0829E4 80081DE4 37DEA046 */ ori $fp, (0x1900A046 & 0xFFFF) # ori $fp, $fp, 0xa046 -/* 0829E8 80081DE8 3C170400 */ lui $s7, 0x400 -/* 0829EC 80081DEC 3C168000 */ lui $s6, 0x8000 -.L80081DF0: -/* 0829F0 80081DF0 02602025 */ move $a0, $s3 -/* 0829F4 80081DF4 0C01C88F */ jal func_8007223C -/* 0829F8 80081DF8 24050200 */ li $a1, 512 -/* 0829FC 80081DFC 10400045 */ beqz $v0, .L80081F14 -/* 082A00 80081E00 00000000 */ nop -/* 082A04 80081E04 8E2F00BC */ lw $t7, 0xbc($s1) -/* 082A08 80081E08 02602025 */ move $a0, $s3 -/* 082A0C 80081E0C 01F6C024 */ and $t8, $t7, $s6 -/* 082A10 80081E10 17000040 */ bnez $t8, .L80081F14 -/* 082A14 80081E14 00000000 */ nop -/* 082A18 80081E18 0C022369 */ jal func_80088DA4 -/* 082A1C 80081E1C 02202825 */ move $a1, $s1 -/* 082A20 80081E20 1040003C */ beqz $v0, .L80081F14 -/* 082A24 80081E24 00000000 */ nop -/* 082A28 80081E28 96220000 */ lhu $v0, ($s1) -/* 082A2C 80081E2C 30598000 */ andi $t9, $v0, 0x8000 -/* 082A30 80081E30 13200038 */ beqz $t9, .L80081F14 -/* 082A34 80081E34 30480100 */ andi $t0, $v0, 0x100 -/* 082A38 80081E38 15000036 */ bnez $t0, .L80081F14 -/* 082A3C 80081E3C 02602025 */ move $a0, $s3 -/* 082A40 80081E40 001348C0 */ sll $t1, $s3, 3 -/* 082A44 80081E44 01334823 */ subu $t1, $t1, $s3 -/* 082A48 80081E48 3C0A8016 */ lui $t2, %hi(D_80165C18) # $t2, 0x8016 -/* 082A4C 80081E4C 254A5C18 */ addiu $t2, %lo(D_80165C18) # addiu $t2, $t2, 0x5c18 -/* 082A50 80081E50 00094940 */ sll $t1, $t1, 5 -/* 082A54 80081E54 24150001 */ li $s5, 1 -/* 082A58 80081E58 012A8021 */ addu $s0, $t1, $t2 -/* 082A5C 80081E5C 0C01C88F */ jal func_8007223C -/* 082A60 80081E60 02E02825 */ move $a1, $s7 -/* 082A64 80081E64 50400004 */ beql $v0, $zero, .L80081E78 -/* 082A68 80081E68 8E2B00BC */ lw $t3, 0xbc($s1) -/* 082A6C 80081E6C 0C01C860 */ jal func_80072180 -/* 082A70 80081E70 00000000 */ nop -/* 082A74 80081E74 8E2B00BC */ lw $t3, 0xbc($s1) -.L80081E78: -/* 082A78 80081E78 324400FF */ andi $a0, $s2, 0xff -/* 082A7C 80081E7C 316C0200 */ andi $t4, $t3, 0x200 -/* 082A80 80081E80 51800006 */ beql $t4, $zero, .L80081E9C -/* 082A84 80081E84 8E2D000C */ lw $t5, 0xc($s1) -/* 082A88 80081E88 0C032418 */ jal func_800C9060 -/* 082A8C 80081E8C 03C02825 */ move $a1, $fp -/* 082A90 80081E90 10000005 */ b .L80081EA8 -/* 082A94 80081E94 868F0026 */ lh $t7, 0x26($s4) -/* 082A98 80081E98 8E2D000C */ lw $t5, 0xc($s1) -.L80081E9C: -/* 082A9C 80081E9C 35AE0002 */ ori $t6, $t5, 2 -/* 082AA0 80081EA0 AE2E000C */ sw $t6, 0xc($s1) -/* 082AA4 80081EA4 868F0026 */ lh $t7, 0x26($s4) -.L80081EA8: -/* 082AA8 80081EA8 3C014080 */ li $at, 0x40800000 # 4.000000 -/* 082AAC 80081EAC A60F00C0 */ sh $t7, 0xc0($s0) -/* 082AB0 80081EB0 C6240094 */ lwc1 $f4, 0x94($s1) -/* 082AB4 80081EB4 461C2183 */ div.s $f6, $f4, $f28 -/* 082AB8 80081EB8 46003221 */ cvt.d.s $f8, $f6 -/* 082ABC 80081EBC 46344280 */ add.d $f10, $f8, $f20 -/* 082AC0 80081EC0 46205420 */ cvt.s.d $f16, $f10 -/* 082AC4 80081EC4 E610003C */ swc1 $f16, 0x3c($s0) -/* 082AC8 80081EC8 C6320094 */ lwc1 $f18, 0x94($s1) -/* 082ACC 80081ECC C60A003C */ lwc1 $f10, 0x3c($s0) -/* 082AD0 80081ED0 46009121 */ cvt.d.s $f4, $f18 -/* 082AD4 80081ED4 46005421 */ cvt.d.s $f16, $f10 -/* 082AD8 80081ED8 46362180 */ add.d $f6, $f4, $f22 -/* 082ADC 80081EDC 4630C03E */ c.le.d $f24, $f16 -/* 082AE0 80081EE0 46203220 */ cvt.s.d $f8, $f6 -/* 082AE4 80081EE4 45000002 */ bc1f .L80081EF0 -/* 082AE8 80081EE8 E6080034 */ swc1 $f8, 0x34($s0) -/* 082AEC 80081EEC E61E003C */ swc1 $f30, 0x3c($s0) -.L80081EF0: -/* 082AF0 80081EF0 C6120034 */ lwc1 $f18, 0x34($s0) -/* 082AF4 80081EF4 46009121 */ cvt.d.s $f4, $f18 -/* 082AF8 80081EF8 4624D03E */ c.le.d $f26, $f4 -/* 082AFC 80081EFC 00000000 */ nop -/* 082B00 80081F00 45000004 */ bc1f .L80081F14 -/* 082B04 80081F04 00000000 */ nop -/* 082B08 80081F08 44813000 */ mtc1 $at, $f6 -/* 082B0C 80081F0C 00000000 */ nop -/* 082B10 80081F10 E606003C */ swc1 $f6, 0x3c($s0) -.L80081F14: -/* 082B14 80081F14 3C188019 */ lui $t8, %hi(D_8018D158) # $t8, 0x8019 -/* 082B18 80081F18 8F18D158 */ lw $t8, %lo(D_8018D158)($t8) -/* 082B1C 80081F1C 26520001 */ addiu $s2, $s2, 1 -/* 082B20 80081F20 26310DD8 */ addiu $s1, $s1, 0xdd8 -/* 082B24 80081F24 0258082A */ slt $at, $s2, $t8 -/* 082B28 80081F28 1420FFB1 */ bnez $at, .L80081DF0 -/* 082B2C 80081F2C 269400B8 */ addiu $s4, $s4, 0xb8 -.L80081F30: -/* 082B30 80081F30 12A0001E */ beqz $s5, .L80081FAC -/* 082B34 80081F34 02602025 */ move $a0, $s3 -/* 082B38 80081F38 0013C8C0 */ sll $t9, $s3, 3 -/* 082B3C 80081F3C 0333C823 */ subu $t9, $t9, $s3 -/* 082B40 80081F40 3C088016 */ lui $t0, %hi(D_80165C18) # $t0, 0x8016 -/* 082B44 80081F44 25085C18 */ addiu $t0, %lo(D_80165C18) # addiu $t0, $t0, 0x5c18 -/* 082B48 80081F48 0019C940 */ sll $t9, $t9, 5 -/* 082B4C 80081F4C 03288021 */ addu $s0, $t9, $t0 -/* 082B50 80081F50 0C01C87A */ jal func_800721E8 -/* 082B54 80081F54 24050200 */ li $a1, 512 -/* 082B58 80081F58 0C021BD8 */ jal func_80086F60 -/* 082B5C 80081F5C 02602025 */ move $a0, $s3 -/* 082B60 80081F60 02602025 */ move $a0, $s3 -/* 082B64 80081F64 8E050004 */ lw $a1, 4($s0) -/* 082B68 80081F68 8E060008 */ lw $a2, 8($s0) -/* 082B6C 80081F6C 0C022DF5 */ jal func_8008B7D4 -/* 082B70 80081F70 8E07000C */ lw $a3, 0xc($s0) -/* 082B74 80081F74 44800000 */ mtc1 $zero, $f0 -/* 082B78 80081F78 02602025 */ move $a0, $s3 -/* 082B7C 80081F7C 44050000 */ mfc1 $a1, $f0 -/* 082B80 80081F80 44060000 */ mfc1 $a2, $f0 -/* 082B84 80081F84 44070000 */ mfc1 $a3, $f0 -/* 082B88 80081F88 0C022E03 */ jal func_8008B80C -/* 082B8C 80081F8C 00000000 */ nop -/* 082B90 80081F90 02602025 */ move $a0, $s3 -/* 082B94 80081F94 24050002 */ li $a1, 2 -/* 082B98 80081F98 0C021BAB */ jal func_80086EAC -/* 082B9C 80081F9C 2406000A */ li $a2, 10 -/* 082BA0 80081FA0 02602025 */ move $a0, $s3 -/* 082BA4 80081FA4 0C01C9B3 */ jal func_800726CC -/* 082BA8 80081FA8 2405000A */ li $a1, 10 -.L80081FAC: -/* 082BAC 80081FAC 8FBF006C */ lw $ra, 0x6c($sp) -/* 082BB0 80081FB0 D7B40018 */ ldc1 $f20, 0x18($sp) -/* 082BB4 80081FB4 D7B60020 */ ldc1 $f22, 0x20($sp) -/* 082BB8 80081FB8 D7B80028 */ ldc1 $f24, 0x28($sp) -/* 082BBC 80081FBC D7BA0030 */ ldc1 $f26, 0x30($sp) -/* 082BC0 80081FC0 D7BC0038 */ ldc1 $f28, 0x38($sp) -/* 082BC4 80081FC4 D7BE0040 */ ldc1 $f30, 0x40($sp) -/* 082BC8 80081FC8 8FB00048 */ lw $s0, 0x48($sp) -/* 082BCC 80081FCC 8FB1004C */ lw $s1, 0x4c($sp) -/* 082BD0 80081FD0 8FB20050 */ lw $s2, 0x50($sp) -/* 082BD4 80081FD4 8FB30054 */ lw $s3, 0x54($sp) -/* 082BD8 80081FD8 8FB40058 */ lw $s4, 0x58($sp) -/* 082BDC 80081FDC 8FB5005C */ lw $s5, 0x5c($sp) -/* 082BE0 80081FE0 8FB60060 */ lw $s6, 0x60($sp) -/* 082BE4 80081FE4 8FB70064 */ lw $s7, 0x64($sp) -/* 082BE8 80081FE8 8FBE0068 */ lw $fp, 0x68($sp) -/* 082BEC 80081FEC 03E00008 */ jr $ra -/* 082BF0 80081FF0 27BD0070 */ addiu $sp, $sp, 0x70 diff --git a/asm/non_matchings/code_80071F00/func_8008275C.s b/asm/non_matchings/code_80071F00/func_8008275C.s deleted file mode 100644 index aba5794c3..000000000 --- a/asm/non_matchings/code_80071F00/func_8008275C.s +++ /dev/null @@ -1,73 +0,0 @@ -glabel func_8008275C -/* 08335C 8008275C 000470C0 */ sll $t6, $a0, 3 -/* 083360 80082760 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 083364 80082764 01C47023 */ subu $t6, $t6, $a0 -/* 083368 80082768 3C0F8016 */ lui $t7, %hi(D_80165C18) # $t7, 0x8016 -/* 08336C 8008276C AFB0001C */ sw $s0, 0x1c($sp) -/* 083370 80082770 25EF5C18 */ addiu $t7, %lo(D_80165C18) # addiu $t7, $t7, 0x5c18 -/* 083374 80082774 000E7140 */ sll $t6, $t6, 5 -/* 083378 80082778 01CF8021 */ addu $s0, $t6, $t7 -/* 08337C 8008277C 920200DD */ lbu $v0, 0xdd($s0) -/* 083380 80082780 AFB10020 */ sw $s1, 0x20($sp) -/* 083384 80082784 24010001 */ li $at, 1 -/* 083388 80082788 00808825 */ move $s1, $a0 -/* 08338C 8008278C 10410006 */ beq $v0, $at, .L800827A8 -/* 083390 80082790 AFBF0024 */ sw $ra, 0x24($sp) -/* 083394 80082794 24010002 */ li $at, 2 -/* 083398 80082798 10410009 */ beq $v0, $at, .L800827C0 -/* 08339C 8008279C 00000000 */ nop -/* 0833A0 800827A0 1000002C */ b .L80082854 -/* 0833A4 800827A4 00000000 */ nop -.L800827A8: -/* 0833A8 800827A8 0C022DE3 */ jal func_8008B78C -/* 0833AC 800827AC 02202025 */ move $a0, $s1 -/* 0833B0 800827B0 0C022FC6 */ jal func_8008BF18 -/* 0833B4 800827B4 02202025 */ move $a0, $s1 -/* 0833B8 800827B8 10000026 */ b .L80082854 -/* 0833BC 800827BC 00000000 */ nop -.L800827C0: -/* 0833C0 800827C0 0C022DE3 */ jal func_8008B78C -/* 0833C4 800827C4 02202025 */ move $a0, $s1 -/* 0833C8 800827C8 2604001C */ addiu $a0, $s0, 0x1c -/* 0833CC 800827CC 26050004 */ addiu $a1, $s0, 4 -/* 0833D0 800827D0 AFA5002C */ sw $a1, 0x2c($sp) -/* 0833D4 800827D4 0C0103B1 */ jal func_80040EC4 -/* 0833D8 800827D8 AFA40030 */ sw $a0, 0x30($sp) -/* 0833DC 800827DC 26040010 */ addiu $a0, $s0, 0x10 -/* 0833E0 800827E0 260500C6 */ addiu $a1, $s0, 0xc6 -/* 0833E4 800827E4 8E060034 */ lw $a2, 0x34($s0) -/* 0833E8 800827E8 24070000 */ li $a3, 0 -/* 0833EC 800827EC 0C003650 */ jal func_8000D940 -/* 0833F0 800827F0 AFA00010 */ sw $zero, 0x10($sp) -/* 0833F4 800827F4 C6040028 */ lwc1 $f4, 0x28($s0) -/* 0833F8 800827F8 C60A002C */ lwc1 $f10, 0x2c($s0) -/* 0833FC 800827FC 3C014004 */ li $at, 0x40040000 # 2.062500 -/* 083400 80082800 46002021 */ cvt.d.s $f0, $f4 -/* 083404 80082804 44819800 */ mtc1 $at, $f19 -/* 083408 80082808 46200180 */ add.d $f6, $f0, $f0 -/* 08340C 8008280C 44809000 */ mtc1 $zero, $f18 -/* 083410 80082810 02202025 */ move $a0, $s1 -/* 083414 80082814 46005421 */ cvt.d.s $f16, $f10 -/* 083418 80082818 46203220 */ cvt.s.d $f8, $f6 -/* 08341C 8008281C 46328102 */ mul.d $f4, $f16, $f18 -/* 083420 80082820 E6080028 */ swc1 $f8, 0x28($s0) -/* 083424 80082824 C6080030 */ lwc1 $f8, 0x30($s0) -/* 083428 80082828 460040A1 */ cvt.d.s $f2, $f8 -/* 08342C 8008282C 462021A0 */ cvt.s.d $f6, $f4 -/* 083430 80082830 46221280 */ add.d $f10, $f2, $f2 -/* 083434 80082834 E606002C */ swc1 $f6, 0x2c($s0) -/* 083438 80082838 46205420 */ cvt.s.d $f16, $f10 -/* 08343C 8008283C 0C022FC6 */ jal func_8008BF18 -/* 083440 80082840 E6100030 */ swc1 $f16, 0x30($s0) -/* 083444 80082844 8FA40030 */ lw $a0, 0x30($sp) -/* 083448 80082848 0C0AD489 */ jal func_802B5224 -/* 08344C 8008284C 8FA5002C */ lw $a1, 0x2c($sp) -/* 083450 80082850 A60200C0 */ sh $v0, 0xc0($s0) -.L80082854: -/* 083454 80082854 0C021CFD */ jal func_800873F4 -/* 083458 80082858 02202025 */ move $a0, $s1 -/* 08345C 8008285C 8FBF0024 */ lw $ra, 0x24($sp) -/* 083460 80082860 8FB0001C */ lw $s0, 0x1c($sp) -/* 083464 80082864 8FB10020 */ lw $s1, 0x20($sp) -/* 083468 80082868 03E00008 */ jr $ra -/* 08346C 8008286C 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/non_matchings/code_80071F00/func_80082A4C.s b/asm/non_matchings/code_80071F00/func_80082A4C.s deleted file mode 100644 index a1c46b4ab..000000000 --- a/asm/non_matchings/code_80071F00/func_80082A4C.s +++ /dev/null @@ -1,66 +0,0 @@ -.section .late_rodata - -glabel D_800EF1A0 -.float 0.15 - -.section .text - -glabel func_80082A4C -/* 08364C 80082A4C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 083650 80082A50 AFBF0024 */ sw $ra, 0x24($sp) -/* 083654 80082A54 AFB0001C */ sw $s0, 0x1c($sp) -/* 083658 80082A58 3C050601 */ lui $a1, %hi(d_course_koopa_troopa_beach_crab_tlut) # $a1, 0x601 -/* 08365C 80082A5C 3C060601 */ lui $a2, %hi(d_course_koopa_troopa_beach_crab_frames) # $a2, 0x601 -/* 083660 80082A60 240E0040 */ li $t6, 64 -/* 083664 80082A64 00808025 */ move $s0, $a0 -/* 083668 80082A68 AFB10020 */ sw $s1, 0x20($sp) -/* 08366C 80082A6C AFAE0010 */ sw $t6, 0x10($sp) -/* 083670 80082A70 24C6D828 */ addiu $a2, %lo(d_course_koopa_troopa_beach_crab_frames) # addiu $a2, $a2, -0x27d8 -/* 083674 80082A74 24A5D628 */ addiu $a1, %lo(d_course_koopa_troopa_beach_crab_tlut) # addiu $a1, $a1, -0x29d8 -/* 083678 80082A78 0C01CD11 */ jal func_80073444 -/* 08367C 80082A7C 24070040 */ li $a3, 64 -/* 083680 80082A80 001078C0 */ sll $t7, $s0, 3 -/* 083684 80082A84 01F07823 */ subu $t7, $t7, $s0 -/* 083688 80082A88 3C188016 */ lui $t8, %hi(D_80165C18) # $t8, 0x8016 -/* 08368C 80082A8C 3C01800F */ lui $at, %hi(D_800EF1A0) # $at, 0x800f -/* 083690 80082A90 C424F1A0 */ lwc1 $f4, %lo(D_800EF1A0)($at) -/* 083694 80082A94 27185C18 */ addiu $t8, %lo(D_80165C18) # addiu $t8, $t8, 0x5c18 -/* 083698 80082A98 000F7940 */ sll $t7, $t7, 5 -/* 08369C 80082A9C 01F88821 */ addu $s1, $t7, $t8 -/* 0836A0 80082AA0 A22000D2 */ sb $zero, 0xd2($s1) -/* 0836A4 80082AA4 02002025 */ move $a0, $s0 -/* 0836A8 80082AA8 0C01C922 */ jal func_80072488 -/* 0836AC 80082AAC E6240000 */ swc1 $f4, ($s1) -/* 0836B0 80082AB0 24190001 */ li $t9, 1 -/* 0836B4 80082AB4 3C050400 */ lui $a1, (0x04000420 >> 16) # lui $a1, 0x400 -/* 0836B8 80082AB8 A63900C8 */ sh $t9, 0xc8($s1) -/* 0836BC 80082ABC 34A50420 */ ori $a1, (0x04000420 & 0xFFFF) # ori $a1, $a1, 0x420 -/* 0836C0 80082AC0 0C01C870 */ jal func_800721C0 -/* 0836C4 80082AC4 02002025 */ move $a0, $s0 -/* 0836C8 80082AC8 02002025 */ move $a0, $s0 -/* 0836CC 80082ACC 00002825 */ move $a1, $zero -/* 0836D0 80082AD0 0C021BAB */ jal func_80086EAC -/* 0836D4 80082AD4 24060001 */ li $a2, 1 -/* 0836D8 80082AD8 44800000 */ mtc1 $zero, $f0 -/* 0836DC 80082ADC 02002025 */ move $a0, $s0 -/* 0836E0 80082AE0 44050000 */ mfc1 $a1, $f0 -/* 0836E4 80082AE4 44060000 */ mfc1 $a2, $f0 -/* 0836E8 80082AE8 44070000 */ mfc1 $a3, $f0 -/* 0836EC 80082AEC 0C022E03 */ jal func_8008B80C -/* 0836F0 80082AF0 00000000 */ nop -/* 0836F4 80082AF4 02002025 */ move $a0, $s0 -/* 0836F8 80082AF8 00002825 */ move $a1, $zero -/* 0836FC 80082AFC 00003025 */ move $a2, $zero -/* 083700 80082B00 0C022E2F */ jal func_8008B8BC -/* 083704 80082B04 34078000 */ li $a3, 32768 -/* 083708 80082B08 3C013FC0 */ li $at, 0x3FC00000 # 1.500000 -/* 08370C 80082B0C 44813000 */ mtc1 $at, $f6 -/* 083710 80082B10 02002025 */ move $a0, $s0 -/* 083714 80082B14 24050200 */ li $a1, 512 -/* 083718 80082B18 0C01C870 */ jal func_800721C0 -/* 08371C 80082B1C E6260034 */ swc1 $f6, 0x34($s1) -/* 083720 80082B20 8FBF0024 */ lw $ra, 0x24($sp) -/* 083724 80082B24 8FB0001C */ lw $s0, 0x1c($sp) -/* 083728 80082B28 8FB10020 */ lw $s1, 0x20($sp) -/* 08372C 80082B2C 03E00008 */ jr $ra -/* 083730 80082B30 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/non_matchings/code_80071F00/func_80082B34.s b/asm/non_matchings/code_80071F00/func_80082B34.s index 68d694e74..47016f173 100644 --- a/asm/non_matchings/code_80071F00/func_80082B34.s +++ b/asm/non_matchings/code_80071F00/func_80082B34.s @@ -25,7 +25,7 @@ glabel func_80082B34 /* 083790 80082B90 1000001E */ b .L80082C0C /* 083794 80082B94 28610002 */ slti $at, $v1, 2 .L80082B98: -/* 083798 80082B98 0C020A93 */ jal func_80082A4C +/* 083798 80082B98 0C020A93 */ jal init_ktb_crab /* 08379C 80082B9C AFA80028 */ sw $t0, 0x28($sp) /* 0837A0 80082BA0 8FA80028 */ lw $t0, 0x28($sp) /* 0837A4 80082BA4 10000018 */ b .L80082C08 diff --git a/asm/non_matchings/code_80071F00/func_80082E18.s b/asm/non_matchings/code_80071F00/func_80082E18.s deleted file mode 100644 index ab4f2ef80..000000000 --- a/asm/non_matchings/code_80071F00/func_80082E18.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80082E18 -/* 083A18 80082E18 000470C0 */ sll $t6, $a0, 3 -/* 083A1C 80082E1C 01C47023 */ subu $t6, $t6, $a0 -/* 083A20 80082E20 000E7140 */ sll $t6, $t6, 5 -/* 083A24 80082E24 3C0F8016 */ lui $t7, %hi(D_80165CBE) # 0x8016 -/* 083A28 80082E28 01EE7821 */ addu $t7, $t7, $t6 -/* 083A2C 80082E2C 85EF5CBE */ lh $t7, %lo(D_80165CBE)($t7) # 0x5cbe($t7) -/* 083A30 80082E30 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 083A34 80082E34 AFBF0014 */ sw $ra, 0x14($sp) -/* 083A38 80082E38 29E10002 */ slti $at, $t7, 2 -/* 083A3C 80082E3C 54200004 */ bnel $at, $zero, .L80082E50 -/* 083A40 80082E40 8FBF0014 */ lw $ra, 0x14($sp) -/* 083A44 80082E44 0C0227C9 */ jal func_80089F24 -/* 083A48 80082E48 00000000 */ nop -/* 083A4C 80082E4C 8FBF0014 */ lw $ra, 0x14($sp) -.L80082E50: -/* 083A50 80082E50 27BD0018 */ addiu $sp, $sp, 0x18 -/* 083A54 80082E54 03E00008 */ jr $ra -/* 083A58 80082E58 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_80082E5C.s b/asm/non_matchings/code_80071F00/func_80082E5C.s deleted file mode 100644 index f7aec00d1..000000000 --- a/asm/non_matchings/code_80071F00/func_80082E5C.s +++ /dev/null @@ -1,51 +0,0 @@ -glabel func_80082E5C -/* 083A5C 80082E5C 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 083A60 80082E60 AFB30028 */ sw $s3, 0x28($sp) -/* 083A64 80082E64 AFB20024 */ sw $s2, 0x24($sp) -/* 083A68 80082E68 F7B40010 */ sdc1 $f20, 0x10($sp) -/* 083A6C 80082E6C 3C0143FA */ li $at, 0x43FA0000 # 500.000000 -/* 083A70 80082E70 AFB50030 */ sw $s5, 0x30($sp) -/* 083A74 80082E74 AFB4002C */ sw $s4, 0x2c($sp) -/* 083A78 80082E78 AFB10020 */ sw $s1, 0x20($sp) -/* 083A7C 80082E7C 3C128018 */ lui $s2, %hi(D_80183EA0) # $s2, 0x8018 -/* 083A80 80082E80 3C138016 */ lui $s3, %hi(D_80165C18) # $s3, 0x8016 -/* 083A84 80082E84 4481A000 */ mtc1 $at, $f20 -/* 083A88 80082E88 AFBF0034 */ sw $ra, 0x34($sp) -/* 083A8C 80082E8C AFB0001C */ sw $s0, 0x1c($sp) -/* 083A90 80082E90 26735C18 */ addiu $s3, %lo(D_80165C18) # addiu $s3, $s3, 0x5c18 -/* 083A94 80082E94 26523EA0 */ addiu $s2, %lo(D_80183EA0) # addiu $s2, $s2, 0x3ea0 -/* 083A98 80082E98 00008825 */ move $s1, $zero -/* 083A9C 80082E9C 241400E0 */ li $s4, 224 -/* 083AA0 80082EA0 2415000A */ li $s5, 10 -.L80082EA4: -/* 083AA4 80082EA4 8E500000 */ lw $s0, ($s2) -/* 083AA8 80082EA8 02140019 */ multu $s0, $s4 -/* 083AAC 80082EAC 02002025 */ move $a0, $s0 -/* 083AB0 80082EB0 00007012 */ mflo $t6 -/* 083AB4 80082EB4 026E7821 */ addu $t7, $s3, $t6 -/* 083AB8 80082EB8 85F800A6 */ lh $t8, 0xa6($t7) -/* 083ABC 80082EBC 5300000B */ beql $t8, $zero, .L80082EEC -/* 083AC0 80082EC0 26310001 */ addiu $s1, $s1, 1 -/* 083AC4 80082EC4 0C020ACD */ jal func_80082B34 -/* 083AC8 80082EC8 02202825 */ move $a1, $s1 -/* 083ACC 80082ECC 4405A000 */ mfc1 $a1, $f20 -/* 083AD0 80082ED0 0C0229B7 */ jal func_8008A6DC -/* 083AD4 80082ED4 02002025 */ move $a0, $s0 -/* 083AD8 80082ED8 0C020B0C */ jal func_80082C30 -/* 083ADC 80082EDC 02002025 */ move $a0, $s0 -/* 083AE0 80082EE0 0C020B86 */ jal func_80082E18 -/* 083AE4 80082EE4 02002025 */ move $a0, $s0 -/* 083AE8 80082EE8 26310001 */ addiu $s1, $s1, 1 -.L80082EEC: -/* 083AEC 80082EEC 1635FFED */ bne $s1, $s5, .L80082EA4 -/* 083AF0 80082EF0 26520004 */ addiu $s2, $s2, 4 -/* 083AF4 80082EF4 8FBF0034 */ lw $ra, 0x34($sp) -/* 083AF8 80082EF8 D7B40010 */ ldc1 $f20, 0x10($sp) -/* 083AFC 80082EFC 8FB0001C */ lw $s0, 0x1c($sp) -/* 083B00 80082F00 8FB10020 */ lw $s1, 0x20($sp) -/* 083B04 80082F04 8FB20024 */ lw $s2, 0x24($sp) -/* 083B08 80082F08 8FB30028 */ lw $s3, 0x28($sp) -/* 083B0C 80082F0C 8FB4002C */ lw $s4, 0x2c($sp) -/* 083B10 80082F10 8FB50030 */ lw $s5, 0x30($sp) -/* 083B14 80082F14 03E00008 */ jr $ra -/* 083B18 80082F18 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/non_matchings/code_80071F00/func_8008311C.s b/asm/non_matchings/code_80071F00/func_8008311C.s deleted file mode 100644 index 30e7c873b..000000000 --- a/asm/non_matchings/code_80071F00/func_8008311C.s +++ /dev/null @@ -1,87 +0,0 @@ -.section .late_rodata - -glabel D_800EF1C0 -.float 0.2 -.word 0x00000000 - -glabel D_800EF1C8 -.double 0.1 - -.section .text - -glabel func_8008311C -/* 083D1C 8008311C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 083D20 80083120 AFA5002C */ sw $a1, 0x2c($sp) -/* 083D24 80083124 AFBF0024 */ sw $ra, 0x24($sp) -/* 083D28 80083128 AFB10020 */ sw $s1, 0x20($sp) -/* 083D2C 8008312C 3C050601 */ lui $a1, %hi(gTLUTHedgehog) # $a1, 0x601 -/* 083D30 80083130 3C060601 */ lui $a2, %hi(gTextureHedgehog) # $a2, 0x601 -/* 083D34 80083134 240E0040 */ li $t6, 64 -/* 083D38 80083138 00808825 */ move $s1, $a0 -/* 083D3C 8008313C AFB0001C */ sw $s0, 0x1c($sp) -/* 083D40 80083140 AFAE0010 */ sw $t6, 0x10($sp) -/* 083D44 80083144 24C64B08 */ addiu $a2, %lo(gTextureHedgehog) # addiu $a2, $a2, 0x4b08 -/* 083D48 80083148 24A54908 */ addiu $a1, %lo(gTLUTHedgehog) # addiu $a1, $a1, 0x4908 -/* 083D4C 8008314C 0C01CD11 */ jal func_80073444 -/* 083D50 80083150 24070040 */ li $a3, 64 -/* 083D54 80083154 001178C0 */ sll $t7, $s1, 3 -/* 083D58 80083158 01F17823 */ subu $t7, $t7, $s1 -/* 083D5C 8008315C 3C188016 */ lui $t8, %hi(D_80165C18) # $t8, 0x8016 -/* 083D60 80083160 27185C18 */ addiu $t8, %lo(D_80165C18) # addiu $t8, $t8, 0x5c18 -/* 083D64 80083164 000F7940 */ sll $t7, $t7, 5 -/* 083D68 80083168 01F88021 */ addu $s0, $t7, $t8 -/* 083D6C 8008316C 3C190601 */ lui $t9, %hi(gTLUTHedgehog) # $t9, 0x601 -/* 083D70 80083170 3C080601 */ lui $t0, %hi(gTextureHedgehog) # $t0, 0x601 -/* 083D74 80083174 3C090D00 */ lui $t1, %hi(D_0D0060B0) # $t1, 0xd00 -/* 083D78 80083178 27394908 */ addiu $t9, %lo(gTLUTHedgehog) # addiu $t9, $t9, 0x4908 -/* 083D7C 8008317C 25084B08 */ addiu $t0, %lo(gTextureHedgehog) # addiu $t0, $t0, 0x4b08 -/* 083D80 80083180 252960B0 */ addiu $t1, %lo(D_0D0060B0) # addiu $t1, $t1, 0x60b0 -/* 083D84 80083184 AE190060 */ sw $t9, 0x60($s0) -/* 083D88 80083188 AE080064 */ sw $t0, 0x64($s0) -/* 083D8C 8008318C AE090074 */ sw $t1, 0x74($s0) -/* 083D90 80083190 3C01800F */ lui $at, %hi(D_800EF1C0) # $at, 0x800f -/* 083D94 80083194 C424F1C0 */ lwc1 $f4, %lo(D_800EF1C0)($at) -/* 083D98 80083198 A20000D2 */ sb $zero, 0xd2($s0) -/* 083D9C 8008319C 02202025 */ move $a0, $s1 -/* 083DA0 800831A0 0C01C922 */ jal func_80072488 -/* 083DA4 800831A4 E6040000 */ swc1 $f4, ($s0) -/* 083DA8 800831A8 44800000 */ mtc1 $zero, $f0 -/* 083DAC 800831AC 02202025 */ move $a0, $s1 -/* 083DB0 800831B0 44050000 */ mfc1 $a1, $f0 -/* 083DB4 800831B4 44060000 */ mfc1 $a2, $f0 -/* 083DB8 800831B8 44070000 */ mfc1 $a3, $f0 -/* 083DBC 800831BC 0C022E03 */ jal func_8008B80C -/* 083DC0 800831C0 00000000 */ nop -/* 083DC4 800831C4 02202025 */ move $a0, $s1 -/* 083DC8 800831C8 00002825 */ move $a1, $zero -/* 083DCC 800831CC 00003025 */ move $a2, $zero -/* 083DD0 800831D0 0C022E2F */ jal func_8008B8BC -/* 083DD4 800831D4 34078000 */ li $a3, 32768 -/* 083DD8 800831D8 8FAA002C */ lw $t2, 0x2c($sp) -/* 083DDC 800831DC 24010006 */ li $at, 6 -/* 083DE0 800831E0 44809000 */ mtc1 $zero, $f18 -/* 083DE4 800831E4 0141001A */ div $zero, $t2, $at -/* 083DE8 800831E8 00005810 */ mfhi $t3 -/* 083DEC 800831EC 448B3000 */ mtc1 $t3, $f6 -/* 083DF0 800831F0 3C01800F */ lui $at, %hi(D_800EF1C8) -/* 083DF4 800831F4 D42AF1C8 */ ldc1 $f10, %lo(D_800EF1C8)($at) -/* 083DF8 800831F8 46803221 */ cvt.d.w $f8, $f6 -/* 083DFC 800831FC 3C013FE0 */ li $at, 0x3FE00000 # 1.750000 -/* 083E00 80083200 44819800 */ mtc1 $at, $f19 -/* 083E04 80083204 02202025 */ move $a0, $s1 -/* 083E08 80083208 462A4402 */ mul.d $f16, $f8, $f10 -/* 083E0C 8008320C 46328100 */ add.d $f4, $f16, $f18 -/* 083E10 80083210 462021A0 */ cvt.s.d $f6, $f4 -/* 083E14 80083214 0C021B9C */ jal func_80086E70 -/* 083E18 80083218 E6060034 */ swc1 $f6, 0x34($s0) -/* 083E1C 8008321C 3C050400 */ lui $a1, (0x04000600 >> 16) # lui $a1, 0x400 -/* 083E20 80083220 34A50600 */ ori $a1, (0x04000600 & 0xFFFF) # ori $a1, $a1, 0x600 -/* 083E24 80083224 0C01C870 */ jal func_800721C0 -/* 083E28 80083228 02202025 */ move $a0, $s1 -/* 083E2C 8008322C 8FBF0024 */ lw $ra, 0x24($sp) -/* 083E30 80083230 240C0002 */ li $t4, 2 -/* 083E34 80083234 A60C00C8 */ sh $t4, 0xc8($s0) -/* 083E38 80083238 8FB0001C */ lw $s0, 0x1c($sp) -/* 083E3C 8008323C 8FB10020 */ lw $s1, 0x20($sp) -/* 083E40 80083240 03E00008 */ jr $ra -/* 083E44 80083244 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/non_matchings/code_80071F00/func_800833D0.s b/asm/non_matchings/code_80071F00/func_800833D0.s deleted file mode 100644 index f553e7c73..000000000 --- a/asm/non_matchings/code_80071F00/func_800833D0.s +++ /dev/null @@ -1,48 +0,0 @@ -glabel func_800833D0 -/* 083FD0 800833D0 000470C0 */ sll $t6, $a0, 3 -/* 083FD4 800833D4 01C47023 */ subu $t6, $t6, $a0 -/* 083FD8 800833D8 3C0F8016 */ lui $t7, %hi(D_80165C18) # $t7, 0x8016 -/* 083FDC 800833DC 25EF5C18 */ addiu $t7, %lo(D_80165C18) # addiu $t7, $t7, 0x5c18 -/* 083FE0 800833E0 000E7140 */ sll $t6, $t6, 5 -/* 083FE4 800833E4 01CF1821 */ addu $v1, $t6, $t7 -/* 083FE8 800833E8 846200A6 */ lh $v0, 0xa6($v1) -/* 083FEC 800833EC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 083FF0 800833F0 AFBF001C */ sw $ra, 0x1c($sp) -/* 083FF4 800833F4 10400012 */ beqz $v0, .L80083440 -/* 083FF8 800833F8 24010001 */ li $at, 1 -/* 083FFC 800833FC 10410005 */ beq $v0, $at, .L80083414 -/* 084000 80083400 24010002 */ li $at, 2 -/* 084004 80083404 10410007 */ beq $v0, $at, .L80083424 -/* 084008 80083408 00002825 */ move $a1, $zero -/* 08400C 8008340C 1000000D */ b .L80083444 -/* 084010 80083410 807900D2 */ lb $t9, 0xd2($v1) -.L80083414: -/* 084014 80083414 0C020C47 */ jal func_8008311C -/* 084018 80083418 AFA30020 */ sw $v1, 0x20($sp) -/* 08401C 8008341C 10000008 */ b .L80083440 -/* 084020 80083420 8FA30020 */ lw $v1, 0x20($sp) -.L80083424: -/* 084024 80083424 2418FFFF */ li $t8, -1 -/* 084028 80083428 AFB80010 */ sw $t8, 0x10($sp) -/* 08402C 8008342C 24060001 */ li $a2, 1 -/* 084030 80083430 24070004 */ li $a3, 4 -/* 084034 80083434 0C01CB4F */ jal func_80072D3C -/* 084038 80083438 AFA30020 */ sw $v1, 0x20($sp) -/* 08403C 8008343C 8FA30020 */ lw $v1, 0x20($sp) -.L80083440: -/* 084040 80083440 807900D2 */ lb $t9, 0xd2($v1) -.L80083444: -/* 084044 80083444 3C090D00 */ lui $t1, %hi(D_0D006130) # $t1, 0xd00 -/* 084048 80083448 3C080D00 */ lui $t0, %hi(D_0D0060B0) # $t0, 0xd00 -/* 08404C 8008344C 17200004 */ bnez $t9, .L80083460 -/* 084050 80083450 25296130 */ addiu $t1, %lo(D_0D006130) # addiu $t1, $t1, 0x6130 -/* 084054 80083454 250860B0 */ addiu $t0, %lo(D_0D0060B0) # addiu $t0, $t0, 0x60b0 -/* 084058 80083458 10000002 */ b .L80083464 -/* 08405C 8008345C AC680074 */ sw $t0, 0x74($v1) -.L80083460: -/* 084060 80083460 AC690074 */ sw $t1, 0x74($v1) -.L80083464: -/* 084064 80083464 8FBF001C */ lw $ra, 0x1c($sp) -/* 084068 80083468 27BD0028 */ addiu $sp, $sp, 0x28 -/* 08406C 8008346C 03E00008 */ jr $ra -/* 084070 80083470 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_800834B8.s b/asm/non_matchings/code_80071F00/func_800834B8.s deleted file mode 100644 index 033e9618b..000000000 --- a/asm/non_matchings/code_80071F00/func_800834B8.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_800834B8 -/* 0840B8 800834B8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 0840BC 800834BC AFB2001C */ sw $s2, 0x1c($sp) -/* 0840C0 800834C0 AFB30020 */ sw $s3, 0x20($sp) -/* 0840C4 800834C4 AFB00014 */ sw $s0, 0x14($sp) -/* 0840C8 800834C8 3C128018 */ lui $s2, %hi(D_80183F28) # $s2, 0x8018 -/* 0840CC 800834CC AFBF0024 */ sw $ra, 0x24($sp) -/* 0840D0 800834D0 AFB10018 */ sw $s1, 0x18($sp) -/* 0840D4 800834D4 26523F28 */ addiu $s2, %lo(D_80183F28) # addiu $s2, $s2, 0x3f28 -/* 0840D8 800834D8 00008025 */ move $s0, $zero -/* 0840DC 800834DC 2413000F */ li $s3, 15 -.L800834E0: -/* 0840E0 800834E0 8E510000 */ lw $s1, ($s2) -/* 0840E4 800834E4 02002825 */ move $a1, $s0 -/* 0840E8 800834E8 0C020CF4 */ jal func_800833D0 -/* 0840EC 800834EC 02202025 */ move $a0, $s1 -/* 0840F0 800834F0 0C020C92 */ jal func_80083248 -/* 0840F4 800834F4 02202025 */ move $a0, $s1 -/* 0840F8 800834F8 0C020D1D */ jal func_80083474 -/* 0840FC 800834FC 02202025 */ move $a0, $s1 -/* 084100 80083500 26100001 */ addiu $s0, $s0, 1 -/* 084104 80083504 1613FFF6 */ bne $s0, $s3, .L800834E0 -/* 084108 80083508 26520004 */ addiu $s2, $s2, 4 -/* 08410C 8008350C 3C048018 */ lui $a0, %hi(D_80183F28) # $a0, 0x8018 -/* 084110 80083510 24843F28 */ addiu $a0, %lo(D_80183F28) # addiu $a0, $a0, 0x3f28 -/* 084114 80083514 0C01C848 */ jal func_80072120 -/* 084118 80083518 2405000F */ li $a1, 15 -/* 08411C 8008351C 8FBF0024 */ lw $ra, 0x24($sp) -/* 084120 80083520 8FB00014 */ lw $s0, 0x14($sp) -/* 084124 80083524 8FB10018 */ lw $s1, 0x18($sp) -/* 084128 80083528 8FB2001C */ lw $s2, 0x1c($sp) -/* 08412C 8008352C 8FB30020 */ lw $s3, 0x20($sp) -/* 084130 80083530 03E00008 */ jr $ra -/* 084134 80083534 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/non_matchings/code_80071F00/func_80083538.s b/asm/non_matchings/code_80071F00/func_80083538.s deleted file mode 100644 index ee3d801f0..000000000 --- a/asm/non_matchings/code_80071F00/func_80083538.s +++ /dev/null @@ -1,132 +0,0 @@ -.section .late_rodata - -glabel D_800EF1E8 -.double 0.001 - -glabel D_800EF1F0 -.double 0.05 - -glabel D_800EF1F8 -.double 2.6 - -glabel D_800EF200 -.double 0.1 - -.section .text - -glabel func_80083538 -/* 084138 80083538 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 08413C 8008353C AFBF001C */ sw $ra, 0x1c($sp) -/* 084140 80083540 AFA50024 */ sw $a1, 0x24($sp) -/* 084144 80083544 AFB00018 */ sw $s0, 0x18($sp) -/* 084148 80083548 AFA40020 */ sw $a0, 0x20($sp) -/* 08414C 8008354C AFA60028 */ sw $a2, 0x28($sp) -/* 084150 80083550 AFA7002C */ sw $a3, 0x2c($sp) -/* 084154 80083554 0C01C8E9 */ jal func_800723A4 -/* 084158 80083558 00002825 */ move $a1, $zero -/* 08415C 8008355C 8FAE0020 */ lw $t6, 0x20($sp) -/* 084160 80083560 3C188016 */ lui $t8, %hi(D_80165C18) # $t8, 0x8016 -/* 084164 80083564 27185C18 */ addiu $t8, %lo(D_80165C18) # addiu $t8, $t8, 0x5c18 -/* 084168 80083568 000E78C0 */ sll $t7, $t6, 3 -/* 08416C 8008356C 01EE7823 */ subu $t7, $t7, $t6 -/* 084170 80083570 000F7940 */ sll $t7, $t7, 5 -/* 084174 80083574 01F88021 */ addu $s0, $t7, $t8 -/* 084178 80083578 3C020600 */ lui $v0, %hi(d_course_frappe_snowland_snow) # $v0, 0x600 -/* 08417C 8008357C 3C030600 */ lui $v1, %hi(d_course_frappe_snowland_snow_tlut) # $v1, 0x600 -/* 084180 80083580 24636D20 */ addiu $v1, %lo(d_course_frappe_snowland_snow_tlut) # addiu $v1, $v1, 0x6d20 -/* 084184 80083584 24426F20 */ addiu $v0, %lo(d_course_frappe_snowland_snow) # addiu $v0, $v0, 0x6f20 -/* 084188 80083588 AE020064 */ sw $v0, 0x64($s0) -/* 08418C 8008358C AE02006C */ sw $v0, 0x6c($s0) -/* 084190 80083590 AE030060 */ sw $v1, 0x60($s0) -/* 084194 80083594 AE030068 */ sw $v1, 0x68($s0) -/* 084198 80083598 0C0ADF8D */ jal random_int -/* 08419C 8008359C 24040064 */ li $a0, 100 -/* 0841A0 800835A0 44822000 */ mtc1 $v0, $f4 -/* 0841A4 800835A4 3C014F80 */ li $at, 0x4F800000 # 4294967296.000000 -/* 0841A8 800835A8 04410004 */ bgez $v0, .L800835BC -/* 0841AC 800835AC 468021A0 */ cvt.s.w $f6, $f4 -/* 0841B0 800835B0 44814000 */ mtc1 $at, $f8 -/* 0841B4 800835B4 00000000 */ nop -/* 0841B8 800835B8 46083180 */ add.s $f6, $f6, $f8 -.L800835BC: -/* 0841BC 800835BC 3C01800F */ lui $at, %hi(D_800EF1E8) -/* 0841C0 800835C0 D430F1E8 */ ldc1 $f16, %lo(D_800EF1E8)($at) -/* 0841C4 800835C4 460032A1 */ cvt.d.s $f10, $f6 -/* 0841C8 800835C8 3C01800F */ lui $at, %hi(D_800EF1F0) -/* 0841CC 800835CC 46305482 */ mul.d $f18, $f10, $f16 -/* 0841D0 800835D0 D424F1F0 */ ldc1 $f4, %lo(D_800EF1F0)($at) -/* 0841D4 800835D4 24040014 */ li $a0, 20 -/* 0841D8 800835D8 46249200 */ add.d $f8, $f18, $f4 -/* 0841DC 800835DC 462041A0 */ cvt.s.d $f6, $f8 -/* 0841E0 800835E0 0C0ADF8D */ jal random_int -/* 0841E4 800835E4 E6060000 */ swc1 $f6, ($s0) -/* 0841E8 800835E8 44825000 */ mtc1 $v0, $f10 -/* 0841EC 800835EC 44804000 */ mtc1 $zero, $f8 -/* 0841F0 800835F0 04410005 */ bgez $v0, .L80083608 -/* 0841F4 800835F4 46805420 */ cvt.s.w $f16, $f10 -/* 0841F8 800835F8 3C014F80 */ li $at, 0x4F800000 # 4294967296.000000 -/* 0841FC 800835FC 44819000 */ mtc1 $at, $f18 -/* 084200 80083600 00000000 */ nop -/* 084204 80083604 46128400 */ add.s $f16, $f16, $f18 -.L80083608: -/* 084208 80083608 3C013FE0 */ li $at, 0x3FE00000 # 1.750000 -/* 08420C 8008360C 44814800 */ mtc1 $at, $f9 -/* 084210 80083610 46008121 */ cvt.d.s $f4, $f16 -/* 084214 80083614 3C01800F */ lui $at, %hi(D_800EF1F8) -/* 084218 80083618 46282182 */ mul.d $f6, $f4, $f8 -/* 08421C 8008361C D42AF1F8 */ ldc1 $f10, %lo(D_800EF1F8)($at) -/* 084220 80083620 2404000A */ li $a0, 10 -/* 084224 80083624 462A3480 */ add.d $f18, $f6, $f10 -/* 084228 80083628 46209420 */ cvt.s.d $f16, $f18 -/* 08422C 8008362C 0C0ADF8D */ jal random_int -/* 084230 80083630 E610003C */ swc1 $f16, 0x3c($s0) -/* 084234 80083634 44822000 */ mtc1 $v0, $f4 -/* 084238 80083638 8FA30024 */ lw $v1, 0x24($sp) -/* 08423C 8008363C 04410005 */ bgez $v0, .L80083654 -/* 084240 80083640 46802220 */ cvt.s.w $f8, $f4 -/* 084244 80083644 3C014F80 */ li $at, 0x4F800000 # 4294967296.000000 -/* 084248 80083648 44813000 */ mtc1 $at, $f6 -/* 08424C 8008364C 00000000 */ nop -/* 084250 80083650 46064200 */ add.s $f8, $f8, $f6 -.L80083654: -/* 084254 80083654 8FB90028 */ lw $t9, 0x28($sp) -/* 084258 80083658 8FA9002C */ lw $t1, 0x2c($sp) -/* 08425C 8008365C 3C01800F */ lui $at, %hi(D_800EF200) -/* 084260 80083660 00194400 */ sll $t0, $t9, 0x10 -/* 084264 80083664 0109001A */ div $zero, $t0, $t1 -/* 084268 80083668 D432F200 */ ldc1 $f18, %lo(D_800EF200)($at) -/* 08426C 8008366C 460042A1 */ cvt.d.s $f10, $f8 -/* 084270 80083670 3C014012 */ li $at, 0x40120000 # 2.281250 -/* 084274 80083674 46325402 */ mul.d $f16, $f10, $f18 -/* 084278 80083678 44812800 */ mtc1 $at, $f5 -/* 08427C 8008367C 44802000 */ mtc1 $zero, $f4 -/* 084280 80083680 00005012 */ mflo $t2 -/* 084284 80083684 A60A00C0 */ sh $t2, 0xc0($s0) -/* 084288 80083688 24044000 */ li $a0, 16384 -/* 08428C 8008368C 46248180 */ add.d $f6, $f16, $f4 -/* 084290 80083690 46203220 */ cvt.s.d $f8, $f6 -/* 084294 80083694 E6080034 */ swc1 $f8, 0x34($s0) -/* 084298 80083698 C46A0000 */ lwc1 $f10, ($v1) -/* 08429C 8008369C 15200002 */ bnez $t1, .L800836A8 -/* 0842A0 800836A0 00000000 */ nop -/* 0842A4 800836A4 0007000D */ break 7 -.L800836A8: -/* 0842A8 800836A8 2401FFFF */ li $at, -1 -/* 0842AC 800836AC 15210004 */ bne $t1, $at, .L800836C0 -/* 0842B0 800836B0 3C018000 */ lui $at, 0x8000 -/* 0842B4 800836B4 15010002 */ bne $t0, $at, .L800836C0 -/* 0842B8 800836B8 00000000 */ nop -/* 0842BC 800836BC 0006000D */ break 6 -.L800836C0: -/* 0842C0 800836C0 E60A0010 */ swc1 $f10, 0x10($s0) -/* 0842C4 800836C4 C4720004 */ lwc1 $f18, 4($v1) -/* 0842C8 800836C8 E6120014 */ swc1 $f18, 0x14($s0) -/* 0842CC 800836CC C4700008 */ lwc1 $f16, 8($v1) -/* 0842D0 800836D0 0C0ADF8D */ jal random_int -/* 0842D4 800836D4 E6100018 */ swc1 $f16, 0x18($s0) -/* 0842D8 800836D8 8FBF001C */ lw $ra, 0x1c($sp) -/* 0842DC 800836DC 244B1000 */ addiu $t3, $v0, 0x1000 -/* 0842E0 800836E0 A60B00A0 */ sh $t3, 0xa0($s0) -/* 0842E4 800836E4 8FB00018 */ lw $s0, 0x18($sp) -/* 0842E8 800836E8 03E00008 */ jr $ra -/* 0842EC 800836EC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/non_matchings/code_80071F00/func_80083868.s b/asm/non_matchings/code_80071F00/func_80083868.s deleted file mode 100644 index 85c7e72da..000000000 --- a/asm/non_matchings/code_80071F00/func_80083868.s +++ /dev/null @@ -1,64 +0,0 @@ -.section .late_rodata - -glabel D_800EF208 -.float 0.1 - -.section .text - -glabel func_80083868 -/* 084468 80083868 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 08446C 8008386C AFBF0024 */ sw $ra, 0x24($sp) -/* 084470 80083870 AFB10020 */ sw $s1, 0x20($sp) -/* 084474 80083874 3C050600 */ lui $a1, %hi(gTLUTSnowman) # $a1, 0x600 -/* 084478 80083878 3C060600 */ lui $a2, %hi(gTextureSnowmanHead) # $a2, 0x600 -/* 08447C 8008387C 240E0040 */ li $t6, 64 -/* 084480 80083880 00808825 */ move $s1, $a0 -/* 084484 80083884 AFB0001C */ sw $s0, 0x1c($sp) -/* 084488 80083888 AFAE0010 */ sw $t6, 0x10($sp) -/* 08448C 8008388C 24C64D20 */ addiu $a2, %lo(gTextureSnowmanHead) # addiu $a2, $a2, 0x4d20 -/* 084490 80083890 24A54B20 */ addiu $a1, %lo(gTLUTSnowman) # addiu $a1, $a1, 0x4b20 -/* 084494 80083894 0C01CD11 */ jal func_80073444 -/* 084498 80083898 24070040 */ li $a3, 64 -/* 08449C 8008389C 001178C0 */ sll $t7, $s1, 3 -/* 0844A0 800838A0 01F17823 */ subu $t7, $t7, $s1 -/* 0844A4 800838A4 3C188016 */ lui $t8, %hi(D_80165C18) # $t8, 0x8016 -/* 0844A8 800838A8 27185C18 */ addiu $t8, %lo(D_80165C18) # addiu $t8, $t8, 0x5c18 -/* 0844AC 800838AC 000F7940 */ sll $t7, $t7, 5 -/* 0844B0 800838B0 3C190D00 */ lui $t9, %hi(D_0D0061B0) # $t9, 0xd00 -/* 0844B4 800838B4 273961B0 */ addiu $t9, %lo(D_0D0061B0) # addiu $t9, $t9, 0x61b0 -/* 0844B8 800838B8 01F88021 */ addu $s0, $t7, $t8 -/* 0844BC 800838BC AE190074 */ sw $t9, 0x74($s0) -/* 0844C0 800838C0 3C01800F */ lui $at, %hi(D_800EF208) # $at, 0x800f -/* 0844C4 800838C4 C424F208 */ lwc1 $f4, %lo(D_800EF208)($at) -/* 0844C8 800838C8 A20000D2 */ sb $zero, 0xd2($s0) -/* 0844CC 800838CC 02202025 */ move $a0, $s1 -/* 0844D0 800838D0 0C01C922 */ jal func_80072488 -/* 0844D4 800838D4 E6040000 */ swc1 $f4, ($s0) -/* 0844D8 800838D8 44800000 */ mtc1 $zero, $f0 -/* 0844DC 800838DC 02202025 */ move $a0, $s1 -/* 0844E0 800838E0 44050000 */ mfc1 $a1, $f0 -/* 0844E4 800838E4 44060000 */ mfc1 $a2, $f0 -/* 0844E8 800838E8 44070000 */ mfc1 $a3, $f0 -/* 0844EC 800838EC 0C022E03 */ jal func_8008B80C -/* 0844F0 800838F0 00000000 */ nop -/* 0844F4 800838F4 34088000 */ li $t0, 32768 -/* 0844F8 800838F8 A60000B2 */ sh $zero, 0xb2($s0) -/* 0844FC 800838FC A60000B4 */ sh $zero, 0xb4($s0) -/* 084500 80083900 A60800B6 */ sh $t0, 0xb6($s0) -/* 084504 80083904 0C0ADF8D */ jal random_int -/* 084508 80083908 24042000 */ li $a0, 8192 -/* 08450C 8008390C 2449F000 */ addiu $t1, $v0, -0x1000 -/* 084510 80083910 A60900A0 */ sh $t1, 0xa0($s0) -/* 084514 80083914 0C021B9C */ jal func_80086E70 -/* 084518 80083918 02202025 */ move $a0, $s1 -/* 08451C 8008391C 3C013FC0 */ li $at, 0x3FC00000 # 1.500000 -/* 084520 80083920 44813000 */ mtc1 $at, $f6 -/* 084524 80083924 02202025 */ move $a0, $s1 -/* 084528 80083928 24050200 */ li $a1, 512 -/* 08452C 8008392C 0C01C870 */ jal func_800721C0 -/* 084530 80083930 E6060034 */ swc1 $f6, 0x34($s0) -/* 084534 80083934 8FBF0024 */ lw $ra, 0x24($sp) -/* 084538 80083938 8FB0001C */ lw $s0, 0x1c($sp) -/* 08453C 8008393C 8FB10020 */ lw $s1, 0x20($sp) -/* 084540 80083940 03E00008 */ jr $ra -/* 084544 80083944 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/non_matchings/code_80071F00/func_80083A94.s b/asm/non_matchings/code_80071F00/func_80083A94.s deleted file mode 100644 index bda55f2e2..000000000 --- a/asm/non_matchings/code_80071F00/func_80083A94.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_80083A94 -/* 084694 80083A94 000478C0 */ sll $t7, $a0, 3 -/* 084698 80083A98 01E47823 */ subu $t7, $t7, $a0 -/* 08469C 80083A9C 3C188016 */ lui $t8, %hi(D_80165C18) # $t8, 0x8016 -/* 0846A0 80083AA0 27185C18 */ addiu $t8, %lo(D_80165C18) # addiu $t8, $t8, 0x5c18 -/* 0846A4 80083AA4 000F7940 */ sll $t7, $t7, 5 -/* 0846A8 80083AA8 01F81821 */ addu $v1, $t7, $t8 -/* 0846AC 80083AAC 846500A6 */ lh $a1, 0xa6($v1) -/* 0846B0 80083AB0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 0846B4 80083AB4 AFBF0014 */ sw $ra, 0x14($sp) -/* 0846B8 80083AB8 AFA40020 */ sw $a0, 0x20($sp) -/* 0846BC 80083ABC 10A00008 */ beqz $a1, .L80083AE0 -/* 0846C0 80083AC0 00A01025 */ move $v0, $a1 -/* 0846C4 80083AC4 24010001 */ li $at, 1 -/* 0846C8 80083AC8 54410006 */ bnel $v0, $at, .L80083AE4 -/* 0846CC 80083ACC 28A10002 */ slti $at, $a1, 2 -/* 0846D0 80083AD0 0C020E1A */ jal func_80083868 -/* 0846D4 80083AD4 AFA30018 */ sw $v1, 0x18($sp) -/* 0846D8 80083AD8 8FA30018 */ lw $v1, 0x18($sp) -/* 0846DC 80083ADC 846500A6 */ lh $a1, 0xa6($v1) -.L80083AE0: -/* 0846E0 80083AE0 28A10002 */ slti $at, $a1, 2 -.L80083AE4: -/* 0846E4 80083AE4 14200003 */ bnez $at, .L80083AF4 -/* 0846E8 80083AE8 00000000 */ nop -/* 0846EC 80083AEC 0C01CD45 */ jal func_80073514 -/* 0846F0 80083AF0 8FA40020 */ lw $a0, 0x20($sp) -.L80083AF4: -/* 0846F4 80083AF4 0C020E52 */ jal func_80083948 -/* 0846F8 80083AF8 8FA40020 */ lw $a0, 0x20($sp) -/* 0846FC 80083AFC 8FBF0014 */ lw $ra, 0x14($sp) -/* 084700 80083B00 27BD0020 */ addiu $sp, $sp, 0x20 -/* 084704 80083B04 03E00008 */ jr $ra -/* 084708 80083B08 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_80083B0C.s b/asm/non_matchings/code_80071F00/func_80083B0C.s deleted file mode 100644 index 24e40c0c0..000000000 --- a/asm/non_matchings/code_80071F00/func_80083B0C.s +++ /dev/null @@ -1,62 +0,0 @@ -.section .late_rodata - -glabel D_800EF260 -.float 0.1 - -.section .text - -glabel func_80083B0C -/* 08470C 80083B0C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 084710 80083B10 AFBF0024 */ sw $ra, 0x24($sp) -/* 084714 80083B14 AFB00020 */ sw $s0, 0x20($sp) -/* 084718 80083B18 3C050600 */ lui $a1, %hi(gTLUTSnowman) # $a1, 0x600 -/* 08471C 80083B1C 3C060600 */ lui $a2, %hi(gTextureSnowmanBody) # $a2, 0x600 -/* 084720 80083B20 240E0040 */ li $t6, 64 -/* 084724 80083B24 00808025 */ move $s0, $a0 -/* 084728 80083B28 AFAE0010 */ sw $t6, 0x10($sp) -/* 08472C 80083B2C 24C65D20 */ addiu $a2, %lo(gTextureSnowmanBody) # addiu $a2, $a2, 0x5d20 -/* 084730 80083B30 24A54B20 */ addiu $a1, %lo(gTLUTSnowman) # addiu $a1, $a1, 0x4b20 -/* 084734 80083B34 0C01CD11 */ jal func_80073444 -/* 084738 80083B38 24070040 */ li $a3, 64 -/* 08473C 80083B3C 001078C0 */ sll $t7, $s0, 3 -/* 084740 80083B40 01F07823 */ subu $t7, $t7, $s0 -/* 084744 80083B44 3C188016 */ lui $t8, %hi(D_80165C18) # $t8, 0x8016 -/* 084748 80083B48 27185C18 */ addiu $t8, %lo(D_80165C18) # addiu $t8, $t8, 0x5c18 -/* 08474C 80083B4C 000F7940 */ sll $t7, $t7, 5 -/* 084750 80083B50 3C190D00 */ lui $t9, %hi(D_0D0060B0) # $t9, 0xd00 -/* 084754 80083B54 273960B0 */ addiu $t9, %lo(D_0D0060B0) # addiu $t9, $t9, 0x60b0 -/* 084758 80083B58 01F81021 */ addu $v0, $t7, $t8 -/* 08475C 80083B5C AC590074 */ sw $t9, 0x74($v0) -/* 084760 80083B60 3C01800F */ lui $at, %hi(D_800EF260) # $at, 0x800f -/* 084764 80083B64 C424F260 */ lwc1 $f4, %lo(D_800EF260)($at) -/* 084768 80083B68 A04000D2 */ sb $zero, 0xd2($v0) -/* 08476C 80083B6C AFA2002C */ sw $v0, 0x2c($sp) -/* 084770 80083B70 02002025 */ move $a0, $s0 -/* 084774 80083B74 0C01C922 */ jal func_80072488 -/* 084778 80083B78 E4440000 */ swc1 $f4, ($v0) -/* 08477C 80083B7C 44800000 */ mtc1 $zero, $f0 -/* 084780 80083B80 02002025 */ move $a0, $s0 -/* 084784 80083B84 44050000 */ mfc1 $a1, $f0 -/* 084788 80083B88 44060000 */ mfc1 $a2, $f0 -/* 08478C 80083B8C 44070000 */ mfc1 $a3, $f0 -/* 084790 80083B90 0C022E03 */ jal func_8008B80C -/* 084794 80083B94 00000000 */ nop -/* 084798 80083B98 8FA2002C */ lw $v0, 0x2c($sp) -/* 08479C 80083B9C 3C013FC0 */ li $at, 0x3FC00000 # 1.500000 -/* 0847A0 80083BA0 44813000 */ mtc1 $at, $f6 -/* 0847A4 80083BA4 34088000 */ li $t0, 32768 -/* 0847A8 80083BA8 24090002 */ li $t1, 2 -/* 0847AC 80083BAC 3C050400 */ lui $a1, (0x04000210 >> 16) # lui $a1, 0x400 -/* 0847B0 80083BB0 34A50210 */ ori $a1, (0x04000210 & 0xFFFF) # ori $a1, $a1, 0x210 -/* 0847B4 80083BB4 02002025 */ move $a0, $s0 -/* 0847B8 80083BB8 A44000B2 */ sh $zero, 0xb2($v0) -/* 0847BC 80083BBC A44000B4 */ sh $zero, 0xb4($v0) -/* 0847C0 80083BC0 A44800B6 */ sh $t0, 0xb6($v0) -/* 0847C4 80083BC4 A44900C8 */ sh $t1, 0xc8($v0) -/* 0847C8 80083BC8 0C01C870 */ jal func_800721C0 -/* 0847CC 80083BCC E4460034 */ swc1 $f6, 0x34($v0) -/* 0847D0 80083BD0 8FBF0024 */ lw $ra, 0x24($sp) -/* 0847D4 80083BD4 8FB00020 */ lw $s0, 0x20($sp) -/* 0847D8 80083BD8 27BD0030 */ addiu $sp, $sp, 0x30 -/* 0847DC 80083BDC 03E00008 */ jr $ra -/* 0847E0 80083BE0 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_80083C04.s b/asm/non_matchings/code_80071F00/func_80083C04.s deleted file mode 100644 index d1cd61552..000000000 --- a/asm/non_matchings/code_80071F00/func_80083C04.s +++ /dev/null @@ -1,117 +0,0 @@ -.section .late_rodata - -glabel jpt_800EF264 -.word L80083D30, L80083C54, L80083C64, L80083D30 -.word L80083D30, L80083D30, L80083D30, L80083D30 -.word L80083D30, L80083D30, L80083C78, L80083C9C -.word L80083CCC, L80083D14 - -glabel D_800EF29C -.float 0.001 - -glabel D_800EF2A0 -.float 0.0025 -.word 0x00000000 - -.section .text - -glabel func_80083C04 -/* 084804 80083C04 000470C0 */ sll $t6, $a0, 3 -/* 084808 80083C08 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 08480C 80083C0C 01C47023 */ subu $t6, $t6, $a0 -/* 084810 80083C10 3C0F8016 */ lui $t7, %hi(D_80165C18) # $t7, 0x8016 -/* 084814 80083C14 AFB10028 */ sw $s1, 0x28($sp) -/* 084818 80083C18 25EF5C18 */ addiu $t7, %lo(D_80165C18) # addiu $t7, $t7, 0x5c18 -/* 08481C 80083C1C 000E7140 */ sll $t6, $t6, 5 -/* 084820 80083C20 01CF8821 */ addu $s1, $t6, $t7 -/* 084824 80083C24 862300A6 */ lh $v1, 0xa6($s1) -/* 084828 80083C28 AFB00024 */ sw $s0, 0x24($sp) -/* 08482C 80083C2C 00808025 */ move $s0, $a0 -/* 084830 80083C30 2C61000E */ sltiu $at, $v1, 0xe -/* 084834 80083C34 1020003E */ beqz $at, .L80083D30 -/* 084838 80083C38 AFBF002C */ sw $ra, 0x2c($sp) -/* 08483C 80083C3C 0003C080 */ sll $t8, $v1, 2 -/* 084840 80083C40 3C01800F */ lui $at, %hi(jpt_800EF264) -/* 084844 80083C44 00380821 */ addu $at, $at, $t8 -/* 084848 80083C48 8C38F264 */ lw $t8, %lo(jpt_800EF264)($at) -/* 08484C 80083C4C 03000008 */ jr $t8 -/* 084850 80083C50 00000000 */ nop -glabel L80083C54 -/* 084854 80083C54 0C020EC3 */ jal func_80083B0C -/* 084858 80083C58 02002025 */ move $a0, $s0 -/* 08485C 80083C5C 10000034 */ b .L80083D30 -/* 084860 80083C60 862300A6 */ lh $v1, 0xa6($s1) -glabel L80083C64 -/* 084864 80083C64 02002025 */ move $a0, $s0 -/* 084868 80083C68 0C01C9E3 */ jal func_8007278C -/* 08486C 80083C6C 24050096 */ li $a1, 150 -/* 084870 80083C70 1000002F */ b .L80083D30 -/* 084874 80083C74 862300A6 */ lh $v1, 0xa6($s1) -glabel L80083C78 -/* 084878 80083C78 02002025 */ move $a0, $s0 -/* 08487C 80083C7C 0C01C9E3 */ jal func_8007278C -/* 084880 80083C80 2405012C */ li $a1, 300 -/* 084884 80083C84 10400003 */ beqz $v0, .L80083C94 -/* 084888 80083C88 02002025 */ move $a0, $s0 -/* 08488C 80083C8C 0C01C8A9 */ jal func_800722A4 -/* 084890 80083C90 24050002 */ li $a1, 2 -.L80083C94: -/* 084894 80083C94 10000026 */ b .L80083D30 -/* 084898 80083C98 862300A6 */ lh $v1, 0xa6($s1) -glabel L80083C9C -/* 08489C 80083C9C 02002025 */ move $a0, $s0 -/* 0848A0 80083CA0 0C01C9E3 */ jal func_8007278C -/* 0848A4 80083CA4 2405000A */ li $a1, 10 -/* 0848A8 80083CA8 10400006 */ beqz $v0, .L80083CC4 -/* 0848AC 80083CAC 02002025 */ move $a0, $s0 -/* 0848B0 80083CB0 0C01C870 */ jal func_800721C0 -/* 0848B4 80083CB4 24050010 */ li $a1, 16 -/* 0848B8 80083CB8 3C01800F */ lui $at, %hi(D_800EF29C) # $at, 0x800f -/* 0848BC 80083CBC C424F29C */ lwc1 $f4, %lo(D_800EF29C)($at) -/* 0848C0 80083CC0 E6240000 */ swc1 $f4, ($s1) -.L80083CC4: -/* 0848C4 80083CC4 1000001A */ b .L80083D30 -/* 0848C8 80083CC8 862300A6 */ lh $v1, 0xa6($s1) -glabel L80083CCC -/* 0848CC 80083CCC 3C01800F */ lui $at, %hi(D_800EF2A0) # $at, 0x800f -/* 0848D0 80083CD0 C426F2A0 */ lwc1 $f6, %lo(D_800EF2A0)($at) -/* 0848D4 80083CD4 3C063A83 */ lui $a2, (0x3A83126F >> 16) # lui $a2, 0x3a83 -/* 0848D8 80083CD8 3C073DCC */ lui $a3, (0x3DCCCCCD >> 16) # lui $a3, 0x3dcc -/* 0848DC 80083CDC 34E7CCCD */ ori $a3, (0x3DCCCCCD & 0xFFFF) # ori $a3, $a3, 0xcccd -/* 0848E0 80083CE0 34C6126F */ ori $a2, (0x3A83126F & 0xFFFF) # ori $a2, $a2, 0x126f -/* 0848E4 80083CE4 02002025 */ move $a0, $s0 -/* 0848E8 80083CE8 02202825 */ move $a1, $s1 -/* 0848EC 80083CEC AFA00014 */ sw $zero, 0x14($sp) -/* 0848F0 80083CF0 AFA00018 */ sw $zero, 0x18($sp) -/* 0848F4 80083CF4 0C01D046 */ jal func_80074118 -/* 0848F8 80083CF8 E7A60010 */ swc1 $f6, 0x10($sp) -/* 0848FC 80083CFC 10400003 */ beqz $v0, .L80083D0C -/* 084900 80083D00 00000000 */ nop -/* 084904 80083D04 0C01C922 */ jal func_80072488 -/* 084908 80083D08 02002025 */ move $a0, $s0 -.L80083D0C: -/* 08490C 80083D0C 10000008 */ b .L80083D30 -/* 084910 80083D10 862300A6 */ lh $v1, 0xa6($s1) -glabel L80083D14 -/* 084914 80083D14 02002025 */ move $a0, $s0 -/* 084918 80083D18 0C01C9B3 */ jal func_800726CC -/* 08491C 80083D1C 24050002 */ li $a1, 2 -/* 084920 80083D20 02002025 */ move $a0, $s0 -/* 084924 80083D24 0C01C87A */ jal func_800721E8 -/* 084928 80083D28 24051000 */ li $a1, 4096 -/* 08492C 80083D2C 862300A6 */ lh $v1, 0xa6($s1) -.L80083D30: -glabel L80083D30 -/* 084930 80083D30 28610002 */ slti $at, $v1, 2 -/* 084934 80083D34 14200003 */ bnez $at, .L80083D44 -/* 084938 80083D38 00000000 */ nop -/* 08493C 80083D3C 0C01CD45 */ jal func_80073514 -/* 084940 80083D40 02002025 */ move $a0, $s0 -.L80083D44: -/* 084944 80083D44 0C020EF9 */ jal func_80083BE4 -/* 084948 80083D48 02002025 */ move $a0, $s0 -/* 08494C 80083D4C 8FBF002C */ lw $ra, 0x2c($sp) -/* 084950 80083D50 8FB00024 */ lw $s0, 0x24($sp) -/* 084954 80083D54 8FB10028 */ lw $s1, 0x28($sp) -/* 084958 80083D58 03E00008 */ jr $ra -/* 08495C 80083D5C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/non_matchings/code_80071F00/func_800853DC.s b/asm/non_matchings/code_80071F00/func_800853DC.s deleted file mode 100644 index 2822806de..000000000 --- a/asm/non_matchings/code_80071F00/func_800853DC.s +++ /dev/null @@ -1,96 +0,0 @@ -.section .late_rodata - -glabel D_800EF3B0 -.double -1250.0 - -.section .text - -glabel func_800853DC -/* 085FDC 800853DC 000470C0 */ sll $t6, $a0, 3 -/* 085FE0 800853E0 01C47023 */ subu $t6, $t6, $a0 -/* 085FE4 800853E4 3C0F8016 */ lui $t7, %hi(D_80165C18) # $t7, 0x8016 -/* 085FE8 800853E8 3C013F80 */ li $at, 0x3F800000 # 1.000000 -/* 085FEC 800853EC 44812000 */ mtc1 $at, $f4 -/* 085FF0 800853F0 25EF5C18 */ addiu $t7, %lo(D_80165C18) # addiu $t7, $t7, 0x5c18 -/* 085FF4 800853F4 000E7140 */ sll $t6, $t6, 5 -/* 085FF8 800853F8 01CF1021 */ addu $v0, $t6, $t7 -/* 085FFC 800853FC 3C180601 */ lui $t8, %hi(D_0600F960) # $t8, 0x601 -/* 086000 80085400 2718F960 */ addiu $t8, %lo(D_0600F960) # addiu $t8, $t8, -0x6a0 -/* 086004 80085404 AC580070 */ sw $t8, 0x70($v0) -/* 086008 80085408 3C19800E */ lui $t9, %hi(gGamestate) # $t9, 0x800e -/* 08600C 8008540C E4440000 */ swc1 $f4, ($v0) -/* 086010 80085410 8F39C50C */ lw $t9, %lo(gGamestate)($t9) -/* 086014 80085414 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 086018 80085418 AFB00020 */ sw $s0, 0x20($sp) -/* 08601C 8008541C 24010009 */ li $at, 9 -/* 086020 80085420 00808025 */ move $s0, $a0 -/* 086024 80085424 AFBF0024 */ sw $ra, 0x24($sp) -/* 086028 80085428 13210018 */ beq $t9, $at, .L8008548C -/* 08602C 8008542C F7B40018 */ sdc1 $f20, 0x18($sp) -/* 086030 80085430 3C018019 */ lui $at, %hi(D_8018D01C) # $at, 0x8019 -/* 086034 80085434 C426D01C */ lwc1 $f6, %lo(D_8018D01C)($at) -/* 086038 80085438 3C01C066 */ li $at, 0xC0660000 # -3.593750 -/* 08603C 8008543C 44815800 */ mtc1 $at, $f11 -/* 086040 80085440 44805000 */ mtc1 $zero, $f10 -/* 086044 80085444 46003221 */ cvt.d.s $f8, $f6 -/* 086048 80085448 4480A000 */ mtc1 $zero, $f20 -/* 08604C 8008544C 462A4402 */ mul.d $f16, $f8, $f10 -/* 086050 80085450 3C07C511 */ lui $a3, (0xC5113000 >> 16) # lui $a3, 0xc511 -/* 086054 80085454 4406A000 */ mfc1 $a2, $f20 -/* 086058 80085458 34E73000 */ ori $a3, (0xC5113000 & 0xFFFF) # ori $a3, $a3, 0x3000 -/* 08605C 8008545C AFA2002C */ sw $v0, 0x2c($sp) -/* 086060 80085460 462084A0 */ cvt.s.d $f18, $f16 -/* 086064 80085464 44059000 */ mfc1 $a1, $f18 -/* 086068 80085468 0C022DF5 */ jal func_8008B7D4 -/* 08606C 8008546C 00000000 */ nop -/* 086070 80085470 4405A000 */ mfc1 $a1, $f20 -/* 086074 80085474 4407A000 */ mfc1 $a3, $f20 -/* 086078 80085478 02002025 */ move $a0, $s0 -/* 08607C 8008547C 0C022E03 */ jal func_8008B80C -/* 086080 80085480 3C064396 */ lui $a2, 0x4396 -/* 086084 80085484 10000016 */ b .L800854E0 -/* 086088 80085488 00000000 */ nop -.L8008548C: -/* 08608C 8008548C 3C018019 */ lui $at, %hi(D_8018D01C) # $at, 0x8019 -/* 086090 80085490 C424D01C */ lwc1 $f4, %lo(D_8018D01C)($at) -/* 086094 80085494 3C01800F */ lui $at, %hi(D_800EF3B0) -/* 086098 80085498 D428F3B0 */ ldc1 $f8, %lo(D_800EF3B0)($at) -/* 08609C 8008549C 460021A1 */ cvt.d.s $f6, $f4 -/* 0860A0 800854A0 4480A000 */ mtc1 $zero, $f20 -/* 0860A4 800854A4 46283282 */ mul.d $f10, $f6, $f8 -/* 0860A8 800854A8 3C07448A */ lui $a3, (0x448AC000 >> 16) # lui $a3, 0x448a -/* 0860AC 800854AC 4406A000 */ mfc1 $a2, $f20 -/* 0860B0 800854B0 34E7C000 */ ori $a3, (0x448AC000 & 0xFFFF) # ori $a3, $a3, 0xc000 -/* 0860B4 800854B4 02002025 */ move $a0, $s0 -/* 0860B8 800854B8 AFA2002C */ sw $v0, 0x2c($sp) -/* 0860BC 800854BC 46205420 */ cvt.s.d $f16, $f10 -/* 0860C0 800854C0 44058000 */ mfc1 $a1, $f16 -/* 0860C4 800854C4 0C022DF5 */ jal func_8008B7D4 -/* 0860C8 800854C8 00000000 */ nop -/* 0860CC 800854CC 4405A000 */ mfc1 $a1, $f20 -/* 0860D0 800854D0 4407A000 */ mfc1 $a3, $f20 -/* 0860D4 800854D4 02002025 */ move $a0, $s0 -/* 0860D8 800854D8 0C022E03 */ jal func_8008B80C -/* 0860DC 800854DC 3C064396 */ lui $a2, 0x4396 -.L800854E0: -/* 0860E0 800854E0 0C022E11 */ jal func_8008B844 -/* 0860E4 800854E4 02002025 */ move $a0, $s0 -/* 0860E8 800854E8 0C0221BD */ jal func_800886F4 -/* 0860EC 800854EC 02002025 */ move $a0, $s0 -/* 0860F0 800854F0 0C021BBC */ jal func_80086EF0 -/* 0860F4 800854F4 02002025 */ move $a0, $s0 -/* 0860F8 800854F8 3C01C000 */ li $at, 0xC0000000 # -2.000000 -/* 0860FC 800854FC 44819000 */ mtc1 $at, $f18 -/* 086100 80085500 8FA8002C */ lw $t0, 0x2c($sp) -/* 086104 80085504 4406A000 */ mfc1 $a2, $f20 -/* 086108 80085508 4600A306 */ mov.s $f12, $f20 -/* 08610C 8008550C 4600A386 */ mov.s $f14, $f20 -/* 086110 80085510 0C0A852F */ jal func_802A14BC -/* 086114 80085514 E512003C */ swc1 $f18, 0x3c($t0) -/* 086118 80085518 0C01C922 */ jal func_80072488 -/* 08611C 8008551C 02002025 */ move $a0, $s0 -/* 086120 80085520 8FBF0024 */ lw $ra, 0x24($sp) -/* 086124 80085524 D7B40018 */ ldc1 $f20, 0x18($sp) -/* 086128 80085528 8FB00020 */ lw $s0, 0x20($sp) -/* 08612C 8008552C 03E00008 */ jr $ra -/* 086130 80085530 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/non_matchings/code_80071F00/func_80085768.s b/asm/non_matchings/code_80071F00/func_80085768.s deleted file mode 100644 index 7a5452a88..000000000 --- a/asm/non_matchings/code_80071F00/func_80085768.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_80085768 -/* 086368 80085768 000470C0 */ sll $t6, $a0, 3 -/* 08636C 8008576C 01C47023 */ subu $t6, $t6, $a0 -/* 086370 80085770 000E7140 */ sll $t6, $t6, 5 -/* 086374 80085774 3C028016 */ lui $v0, %hi(D_80165CBE) # 0x8016 -/* 086378 80085778 004E1021 */ addu $v0, $v0, $t6 -/* 08637C 8008577C 84425CBE */ lh $v0, %lo(D_80165CBE)($v0) # 0x5cbe($v0) -/* 086380 80085780 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 086384 80085784 AFBF0014 */ sw $ra, 0x14($sp) -/* 086388 80085788 10400009 */ beqz $v0, .L800857B0 -/* 08638C 8008578C 24010001 */ li $at, 1 -/* 086390 80085790 10410005 */ beq $v0, $at, .L800857A8 -/* 086394 80085794 24010002 */ li $at, 2 -/* 086398 80085798 50410006 */ beql $v0, $at, .L800857B4 -/* 08639C 8008579C 8FBF0014 */ lw $ra, 0x14($sp) -/* 0863A0 800857A0 10000004 */ b .L800857B4 -/* 0863A4 800857A4 8FBF0014 */ lw $ra, 0x14($sp) -.L800857A8: -/* 0863A8 800857A8 0C0214F7 */ jal func_800853DC -/* 0863AC 800857AC 00000000 */ nop -.L800857B0: -/* 0863B0 800857B0 8FBF0014 */ lw $ra, 0x14($sp) -.L800857B4: -/* 0863B4 800857B4 27BD0018 */ addiu $sp, $sp, 0x18 -/* 0863B8 800857B8 03E00008 */ jr $ra -/* 0863BC 800857BC 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_800857C0.s b/asm/non_matchings/code_80071F00/func_800857C0.s deleted file mode 100644 index 2ad5176ff..000000000 --- a/asm/non_matchings/code_80071F00/func_800857C0.s +++ /dev/null @@ -1,48 +0,0 @@ -glabel func_800857C0 -/* 0863C0 800857C0 3C048018 */ lui $a0, %hi(D_80183EA0) # $a0, 0x8018 -/* 0863C4 800857C4 8C843EA0 */ lw $a0, %lo(D_80183EA0)($a0) -/* 0863C8 800857C8 3C0F8016 */ lui $t7, %hi(D_80165C18) # $t7, 0x8016 -/* 0863CC 800857CC 25EF5C18 */ addiu $t7, %lo(D_80165C18) # addiu $t7, $t7, 0x5c18 -/* 0863D0 800857D0 000470C0 */ sll $t6, $a0, 3 -/* 0863D4 800857D4 01C47023 */ subu $t6, $t6, $a0 -/* 0863D8 800857D8 000E7140 */ sll $t6, $t6, 5 -/* 0863DC 800857DC 01CF1021 */ addu $v0, $t6, $t7 -/* 0863E0 800857E0 845800A6 */ lh $t8, 0xa6($v0) -/* 0863E4 800857E4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 0863E8 800857E8 AFBF0014 */ sw $ra, 0x14($sp) -/* 0863EC 800857EC 5300001F */ beql $t8, $zero, .L8008586C -/* 0863F0 800857F0 8FBF0014 */ lw $ra, 0x14($sp) -/* 0863F4 800857F4 AFA20018 */ sw $v0, 0x18($sp) -/* 0863F8 800857F8 0C0215DA */ jal func_80085768 -/* 0863FC 800857FC AFA4001C */ sw $a0, 0x1c($sp) -/* 086400 80085800 0C02154D */ jal func_80085534 -/* 086404 80085804 8FA4001C */ lw $a0, 0x1c($sp) -/* 086408 80085808 0C022FC6 */ jal func_8008BF18 -/* 08640C 8008580C 8FA4001C */ lw $a0, 0x1c($sp) -/* 086410 80085810 8FA20018 */ lw $v0, 0x18($sp) -/* 086414 80085814 3C03802C */ lui $v1, %hi(D_802BA05C) # $v1, 0x802c -/* 086418 80085818 2463A05C */ addiu $v1, %lo(D_802BA05C) # addiu $v1, $v1, -0x5fa4 -/* 08641C 8008581C 845900A6 */ lh $t9, 0xa6($v0) -/* 086420 80085820 2B210002 */ slti $at, $t9, 2 -/* 086424 80085824 54200011 */ bnel $at, $zero, .L8008586C -/* 086428 80085828 8FBF0014 */ lw $ra, 0x14($sp) -/* 08642C 8008582C C4440004 */ lwc1 $f4, 4($v0) -/* 086430 80085830 8C680000 */ lw $t0, ($v1) -/* 086434 80085834 3C014024 */ li $at, 0x40240000 # 2.562500 -/* 086438 80085838 44815800 */ mtc1 $at, $f11 -/* 08643C 8008583C E5040018 */ swc1 $f4, 0x18($t0) -/* 086440 80085840 C4460008 */ lwc1 $f6, 8($v0) -/* 086444 80085844 44805000 */ mtc1 $zero, $f10 -/* 086448 80085848 8C690000 */ lw $t1, ($v1) -/* 08644C 8008584C 46003221 */ cvt.d.s $f8, $f6 -/* 086450 80085850 462A4401 */ sub.d $f16, $f8, $f10 -/* 086454 80085854 462084A0 */ cvt.s.d $f18, $f16 -/* 086458 80085858 E532001C */ swc1 $f18, 0x1c($t1) -/* 08645C 8008585C 8C6A0000 */ lw $t2, ($v1) -/* 086460 80085860 C444000C */ lwc1 $f4, 0xc($v0) -/* 086464 80085864 E5440020 */ swc1 $f4, 0x20($t2) -/* 086468 80085868 8FBF0014 */ lw $ra, 0x14($sp) -.L8008586C: -/* 08646C 8008586C 27BD0020 */ addiu $sp, $sp, 0x20 -/* 086470 80085870 03E00008 */ jr $ra -/* 086474 80085874 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_80085878.s b/asm/non_matchings/code_80071F00/func_80085878.s deleted file mode 100644 index ac4e4830d..000000000 --- a/asm/non_matchings/code_80071F00/func_80085878.s +++ /dev/null @@ -1,92 +0,0 @@ -.section .late_rodata - -glabel D_800EF3DC -.float 0.03 - -.section .text - -glabel func_80085878 -/* 086478 80085878 000470C0 */ sll $t6, $a0, 3 -/* 08647C 8008587C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 086480 80085880 01C47023 */ subu $t6, $t6, $a0 -/* 086484 80085884 3C0F8016 */ lui $t7, %hi(D_80165C18) # $t7, 0x8016 -/* 086488 80085888 AFB00014 */ sw $s0, 0x14($sp) -/* 08648C 8008588C 25EF5C18 */ addiu $t7, %lo(D_80165C18) # addiu $t7, $t7, 0x5c18 -/* 086490 80085890 000E7140 */ sll $t6, $t6, 5 -/* 086494 80085894 01CF8021 */ addu $s0, $t6, $t7 -/* 086498 80085898 3C190601 */ lui $t9, %hi(D_06016110) # $t9, 0x601 -/* 08649C 8008589C 3C080601 */ lui $t0, %hi(D_0601610C) # $t0, 0x601 -/* 0864A0 800858A0 24180001 */ li $t8, 1 -/* 0864A4 800858A4 27396110 */ addiu $t9, %lo(D_06016110) # addiu $t9, $t9, 0x6110 -/* 0864A8 800858A8 2508610C */ addiu $t0, %lo(D_0601610C) # addiu $t0, $t0, 0x610c -/* 0864AC 800858AC A21800D8 */ sb $t8, 0xd8($s0) -/* 0864B0 800858B0 AE190070 */ sw $t9, 0x70($s0) -/* 0864B4 800858B4 AE080074 */ sw $t0, 0x74($s0) -/* 0864B8 800858B8 3C01800F */ lui $at, %hi(D_800EF3DC) # $at, 0x800f -/* 0864BC 800858BC C424F3DC */ lwc1 $f4, %lo(D_800EF3DC)($at) -/* 0864C0 800858C0 AFA50024 */ sw $a1, 0x24($sp) -/* 0864C4 800858C4 AFBF001C */ sw $ra, 0x1c($sp) -/* 0864C8 800858C8 AFB10018 */ sw $s1, 0x18($sp) -/* 0864CC 800858CC 2409000A */ li $t1, 10 -/* 0864D0 800858D0 3C050400 */ lui $a1, (0x04000200 >> 16) # lui $a1, 0x400 -/* 0864D4 800858D4 00808825 */ move $s1, $a0 -/* 0864D8 800858D8 A60900C8 */ sh $t1, 0xc8($s0) -/* 0864DC 800858DC 34A50200 */ ori $a1, (0x04000200 & 0xFFFF) # ori $a1, $a1, 0x200 -/* 0864E0 800858E0 0C01C870 */ jal func_800721C0 -/* 0864E4 800858E4 E6040000 */ swc1 $f4, ($s0) -/* 0864E8 800858E8 8FAA0024 */ lw $t2, 0x24($sp) -/* 0864EC 800858EC 44800000 */ mtc1 $zero, $f0 -/* 0864F0 800858F0 02202025 */ move $a0, $s1 -/* 0864F4 800858F4 000A5880 */ sll $t3, $t2, 2 -/* 0864F8 800858F8 016A5821 */ addu $t3, $t3, $t2 -/* 0864FC 800858FC 000B5880 */ sll $t3, $t3, 2 -/* 086500 80085900 016A5823 */ subu $t3, $t3, $t2 -/* 086504 80085904 000B5880 */ sll $t3, $t3, 2 -/* 086508 80085908 016A5823 */ subu $t3, $t3, $t2 -/* 08650C 8008590C 000B5880 */ sll $t3, $t3, 2 -/* 086510 80085910 256C01F4 */ addiu $t4, $t3, 0x1f4 -/* 086514 80085914 44050000 */ mfc1 $a1, $f0 -/* 086518 80085918 44070000 */ mfc1 $a3, $f0 -/* 08651C 8008591C A60C0094 */ sh $t4, 0x94($s0) -/* 086520 80085920 0C022DF5 */ jal func_8008B7D4 -/* 086524 80085924 3C06C170 */ lui $a2, 0xc170 -/* 086528 80085928 960D0094 */ lhu $t5, 0x94($s0) -/* 08652C 8008592C 3C0F8016 */ lui $t7, %hi(D_80164490) # $t7, 0x8016 -/* 086530 80085930 8DEF4490 */ lw $t7, %lo(D_80164490)($t7) -/* 086534 80085934 000D70C0 */ sll $t6, $t5, 3 -/* 086538 80085938 02202025 */ move $a0, $s1 -/* 08653C 8008593C 01CF1021 */ addu $v0, $t6, $t7 -/* 086540 80085940 84580000 */ lh $t8, ($v0) -/* 086544 80085944 84590002 */ lh $t9, 2($v0) -/* 086548 80085948 84480004 */ lh $t0, 4($v0) -/* 08654C 8008594C 44983000 */ mtc1 $t8, $f6 -/* 086550 80085950 44994000 */ mtc1 $t9, $f8 -/* 086554 80085954 44885000 */ mtc1 $t0, $f10 -/* 086558 80085958 468031A0 */ cvt.s.w $f6, $f6 -/* 08655C 8008595C 46804220 */ cvt.s.w $f8, $f8 -/* 086560 80085960 44053000 */ mfc1 $a1, $f6 -/* 086564 80085964 468052A0 */ cvt.s.w $f10, $f10 -/* 086568 80085968 44064000 */ mfc1 $a2, $f8 -/* 08656C 8008596C 44075000 */ mfc1 $a3, $f10 -/* 086570 80085970 0C022E03 */ jal func_8008B80C -/* 086574 80085974 00000000 */ nop -/* 086578 80085978 02202025 */ move $a0, $s1 -/* 08657C 8008597C 00002825 */ move $a1, $zero -/* 086580 80085980 00003025 */ move $a2, $zero -/* 086584 80085984 0C022E22 */ jal func_8008B888 -/* 086588 80085988 00003825 */ move $a3, $zero -/* 08658C 8008598C 3C014080 */ li $at, 0x40800000 # 4.000000 -/* 086590 80085990 44818000 */ mtc1 $at, $f16 -/* 086594 80085994 3C040601 */ lui $a0, %hi(D_0601610C) # $a0, 0x601 -/* 086598 80085998 2484610C */ addiu $a0, %lo(D_0601610C) # addiu $a0, $a0, 0x610c -/* 08659C 8008599C 00002825 */ move $a1, $zero -/* 0865A0 800859A0 0C0013AB */ jal func_80004EAC -/* 0865A4 800859A4 E6100034 */ swc1 $f16, 0x34($s0) -/* 0865A8 800859A8 A60200A4 */ sh $v0, 0xa4($s0) -/* 0865AC 800859AC 0C01C922 */ jal func_80072488 -/* 0865B0 800859B0 02202025 */ move $a0, $s1 -/* 0865B4 800859B4 8FBF001C */ lw $ra, 0x1c($sp) -/* 0865B8 800859B8 8FB00014 */ lw $s0, 0x14($sp) -/* 0865BC 800859BC 8FB10018 */ lw $s1, 0x18($sp) -/* 0865C0 800859C0 03E00008 */ jr $ra -/* 0865C4 800859C4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/non_matchings/code_80071F00/func_80085C20.s b/asm/non_matchings/code_80071F00/func_80085C20.s deleted file mode 100644 index 6d7a4eb7f..000000000 --- a/asm/non_matchings/code_80071F00/func_80085C20.s +++ /dev/null @@ -1,40 +0,0 @@ -.section .late_rodata - -glabel D_800EF3E8 -.double -1431.0 - -.section .text - -glabel func_80085C20 -/* 086820 80085C20 3C018019 */ lui $at, %hi(D_8018D01C) # $at, 0x8019 -/* 086824 80085C24 C424D01C */ lwc1 $f4, %lo(D_8018D01C)($at) -/* 086828 80085C28 3C01800F */ lui $at, %hi(D_800EF3E8) -/* 08682C 80085C2C D428F3E8 */ ldc1 $f8, %lo(D_800EF3E8)($at) -/* 086830 80085C30 460021A1 */ cvt.d.s $f6, $f4 -/* 086834 80085C34 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 086838 80085C38 46283282 */ mul.d $f10, $f6, $f8 -/* 08683C 80085C3C AFBF001C */ sw $ra, 0x1c($sp) -/* 086840 80085C40 3C06444E */ lui $a2, (0x444EC000 >> 16) # lui $a2, 0x444e -/* 086844 80085C44 3C07C538 */ lui $a3, (0xC538D000 >> 16) # lui $a3, 0xc538 -/* 086848 80085C48 AFA40020 */ sw $a0, 0x20($sp) -/* 08684C 80085C4C 34E7D000 */ ori $a3, (0xC538D000 & 0xFFFF) # ori $a3, $a3, 0xd000 -/* 086850 80085C50 34C6C000 */ ori $a2, (0x444EC000 & 0xFFFF) # ori $a2, $a2, 0xc000 -/* 086854 80085C54 46205420 */ cvt.s.d $f16, $f10 -/* 086858 80085C58 44058000 */ mfc1 $a1, $f16 -/* 08685C 80085C5C 0C022DF5 */ jal func_8008B7D4 -/* 086860 80085C60 00000000 */ nop -/* 086864 80085C64 3C050600 */ lui $a1, %hi(d_course_rainbow_road_neon_mushroom_tlut_list) # $a1, 0x600 -/* 086868 80085C68 3C060601 */ lui $a2, %hi(d_course_rainbow_road_neon_mushroom) # $a2, 0x601 -/* 08686C 80085C6C 240E0040 */ li $t6, 64 -/* 086870 80085C70 AFAE0010 */ sw $t6, 0x10($sp) -/* 086874 80085C74 24C68000 */ addiu $a2, %lo(d_course_rainbow_road_neon_mushroom) # addiu $a2, $a2, -0x8000 -/* 086878 80085C78 24A55400 */ addiu $a1, %lo(d_course_rainbow_road_neon_mushroom_tlut_list) # addiu $a1, $a1, 0x5400 -/* 08687C 80085C7C 8FA40020 */ lw $a0, 0x20($sp) -/* 086880 80085C80 0C01CD11 */ jal func_80073444 -/* 086884 80085C84 24070040 */ li $a3, 64 -/* 086888 80085C88 0C0216ED */ jal func_80085BB4 -/* 08688C 80085C8C 8FA40020 */ lw $a0, 0x20($sp) -/* 086890 80085C90 8FBF001C */ lw $ra, 0x1c($sp) -/* 086894 80085C94 27BD0020 */ addiu $sp, $sp, 0x20 -/* 086898 80085C98 03E00008 */ jr $ra -/* 08689C 80085C9C 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_80085CA0.s b/asm/non_matchings/code_80071F00/func_80085CA0.s deleted file mode 100644 index beaec3f1b..000000000 --- a/asm/non_matchings/code_80071F00/func_80085CA0.s +++ /dev/null @@ -1,93 +0,0 @@ -.section .late_rodata - -glabel jpt_800EF3F0 -.word L80085DA8, L80085CE0, L80085CF0, L80085D18 -.word L80085D38, L80085D48, L80085D70, L80085D80 -.word L80085DA0 - -.word 0x00000000 - -.section .text - -glabel func_80085CA0 -/* 0868A0 80085CA0 000470C0 */ sll $t6, $a0, 3 -/* 0868A4 80085CA4 01C47023 */ subu $t6, $t6, $a0 -/* 0868A8 80085CA8 000E7140 */ sll $t6, $t6, 5 -/* 0868AC 80085CAC 3C0F8016 */ lui $t7, %hi(D_80165CBE) # 0x8016 -/* 0868B0 80085CB0 01EE7821 */ addu $t7, $t7, $t6 -/* 0868B4 80085CB4 95EF5CBE */ lhu $t7, %lo(D_80165CBE)($t7) # 0x5cbe($t7) -/* 0868B8 80085CB8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 0868BC 80085CBC AFBF001C */ sw $ra, 0x1c($sp) -/* 0868C0 80085CC0 2DE10009 */ sltiu $at, $t7, 9 -/* 0868C4 80085CC4 10200038 */ beqz $at, .L80085DA8 -/* 0868C8 80085CC8 000F7880 */ sll $t7, $t7, 2 -/* 0868CC 80085CCC 3C01800F */ lui $at, %hi(jpt_800EF3F0) -/* 0868D0 80085CD0 002F0821 */ addu $at, $at, $t7 -/* 0868D4 80085CD4 8C2FF3F0 */ lw $t7, %lo(jpt_800EF3F0)($at) -/* 0868D8 80085CD8 01E00008 */ jr $t7 -/* 0868DC 80085CDC 00000000 */ nop -glabel L80085CE0 -/* 0868E0 80085CE0 0C021708 */ jal func_80085C20 -/* 0868E4 80085CE4 00000000 */ nop -/* 0868E8 80085CE8 10000030 */ b .L80085DAC -/* 0868EC 80085CEC 8FBF001C */ lw $ra, 0x1c($sp) -glabel L80085CF0 -/* 0868F0 80085CF0 2418000C */ li $t8, 12 -/* 0868F4 80085CF4 24190005 */ li $t9, 5 -/* 0868F8 80085CF8 AFB90014 */ sw $t9, 0x14($sp) -/* 0868FC 80085CFC AFB80010 */ sw $t8, 0x10($sp) -/* 086900 80085D00 00002825 */ move $a1, $zero -/* 086904 80085D04 24060004 */ li $a2, 4 -/* 086908 80085D08 0C01CB95 */ jal func_80072E54 -/* 08690C 80085D0C 24070001 */ li $a3, 1 -/* 086910 80085D10 10000026 */ b .L80085DAC -/* 086914 80085D14 8FBF001C */ lw $ra, 0x1c($sp) -glabel L80085D18 -/* 086918 80085D18 2408000A */ li $t0, 10 -/* 08691C 80085D1C AFA80010 */ sw $t0, 0x10($sp) -/* 086920 80085D20 24050003 */ li $a1, 3 -/* 086924 80085D24 24060004 */ li $a2, 4 -/* 086928 80085D28 0C01CB4F */ jal func_80072D3C -/* 08692C 80085D2C 24070004 */ li $a3, 4 -/* 086930 80085D30 1000001E */ b .L80085DAC -/* 086934 80085D34 8FBF001C */ lw $ra, 0x1c($sp) -glabel L80085D38 -/* 086938 80085D38 0C01C9E3 */ jal func_8007278C -/* 08693C 80085D3C 24050014 */ li $a1, 20 -/* 086940 80085D40 1000001A */ b .L80085DAC -/* 086944 80085D44 8FBF001C */ lw $ra, 0x1c($sp) -glabel L80085D48 -/* 086948 80085D48 2409000C */ li $t1, 12 -/* 08694C 80085D4C 240A0005 */ li $t2, 5 -/* 086950 80085D50 AFAA0014 */ sw $t2, 0x14($sp) -/* 086954 80085D54 AFA90010 */ sw $t1, 0x10($sp) -/* 086958 80085D58 00002825 */ move $a1, $zero -/* 08695C 80085D5C 24060004 */ li $a2, 4 -/* 086960 80085D60 0C01CB95 */ jal func_80072E54 -/* 086964 80085D64 24070001 */ li $a3, 1 -/* 086968 80085D68 10000010 */ b .L80085DAC -/* 08696C 80085D6C 8FBF001C */ lw $ra, 0x1c($sp) -glabel L80085D70 -/* 086970 80085D70 0C01C9E3 */ jal func_8007278C -/* 086974 80085D74 24050014 */ li $a1, 20 -/* 086978 80085D78 1000000C */ b .L80085DAC -/* 08697C 80085D7C 8FBF001C */ lw $ra, 0x1c($sp) -glabel L80085D80 -/* 086980 80085D80 240B0014 */ li $t3, 20 -/* 086984 80085D84 AFAB0010 */ sw $t3, 0x10($sp) -/* 086988 80085D88 24050003 */ li $a1, 3 -/* 08698C 80085D8C 24060004 */ li $a2, 4 -/* 086990 80085D90 0C01CB4F */ jal func_80072D3C -/* 086994 80085D94 00003825 */ move $a3, $zero -/* 086998 80085D98 10000004 */ b .L80085DAC -/* 08699C 80085D9C 8FBF001C */ lw $ra, 0x1c($sp) -glabel L80085DA0 -/* 0869A0 80085DA0 0C01C9B3 */ jal func_800726CC -/* 0869A4 80085DA4 24050002 */ li $a1, 2 -.L80085DA8: -glabel L80085DA8 -/* 0869A8 80085DA8 8FBF001C */ lw $ra, 0x1c($sp) -.L80085DAC: -/* 0869AC 80085DAC 27BD0020 */ addiu $sp, $sp, 0x20 -/* 0869B0 80085DB0 03E00008 */ jr $ra -/* 0869B4 80085DB4 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_80085DB8.s b/asm/non_matchings/code_80071F00/func_80085DB8.s deleted file mode 100644 index b5014f7ca..000000000 --- a/asm/non_matchings/code_80071F00/func_80085DB8.s +++ /dev/null @@ -1,40 +0,0 @@ -.section .late_rodata - -glabel D_800EF418 -.double 799.0 - -.section .text - -glabel func_80085DB8 -/* 0869B8 80085DB8 3C018019 */ lui $at, %hi(D_8018D01C) # $at, 0x8019 -/* 0869BC 80085DBC C424D01C */ lwc1 $f4, %lo(D_8018D01C)($at) -/* 0869C0 80085DC0 3C01800F */ lui $at, %hi(D_800EF418) -/* 0869C4 80085DC4 D428F418 */ ldc1 $f8, %lo(D_800EF418)($at) -/* 0869C8 80085DC8 460021A1 */ cvt.d.s $f6, $f4 -/* 0869CC 80085DCC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 0869D0 80085DD0 46283282 */ mul.d $f10, $f6, $f8 -/* 0869D4 80085DD4 AFBF001C */ sw $ra, 0x1c($sp) -/* 0869D8 80085DD8 3C064495 */ lui $a2, (0x44952000 >> 16) # lui $a2, 0x4495 -/* 0869DC 80085DDC 3C07C5B8 */ lui $a3, (0xC5B81800 >> 16) # lui $a3, 0xc5b8 -/* 0869E0 80085DE0 AFA40020 */ sw $a0, 0x20($sp) -/* 0869E4 80085DE4 34E71800 */ ori $a3, (0xC5B81800 & 0xFFFF) # ori $a3, $a3, 0x1800 -/* 0869E8 80085DE8 34C62000 */ ori $a2, (0x44952000 & 0xFFFF) # ori $a2, $a2, 0x2000 -/* 0869EC 80085DEC 46205420 */ cvt.s.d $f16, $f10 -/* 0869F0 80085DF0 44058000 */ mfc1 $a1, $f16 -/* 0869F4 80085DF4 0C022DF5 */ jal func_8008B7D4 -/* 0869F8 80085DF8 00000000 */ nop -/* 0869FC 80085DFC 3C050600 */ lui $a1, %hi(d_course_rainbow_road_neon_mario_tlut_list) # $a1, 0x600 -/* 086A00 80085E00 3C060601 */ lui $a2, %hi(d_course_rainbow_road_neon_mario) # $a2, 0x601 -/* 086A04 80085E04 240E0040 */ li $t6, 64 -/* 086A08 80085E08 AFAE0010 */ sw $t6, 0x10($sp) -/* 086A0C 80085E0C 24C69000 */ addiu $a2, %lo(d_course_rainbow_road_neon_mario) # addiu $a2, $a2, -0x7000 -/* 086A10 80085E10 24A55E00 */ addiu $a1, %lo(d_course_rainbow_road_neon_mario_tlut_list) # addiu $a1, $a1, 0x5e00 -/* 086A14 80085E14 8FA40020 */ lw $a0, 0x20($sp) -/* 086A18 80085E18 0C01CD11 */ jal func_80073444 -/* 086A1C 80085E1C 24070040 */ li $a3, 64 -/* 086A20 80085E20 0C0216ED */ jal func_80085BB4 -/* 086A24 80085E24 8FA40020 */ lw $a0, 0x20($sp) -/* 086A28 80085E28 8FBF001C */ lw $ra, 0x1c($sp) -/* 086A2C 80085E2C 27BD0020 */ addiu $sp, $sp, 0x20 -/* 086A30 80085E30 03E00008 */ jr $ra -/* 086A34 80085E34 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_80085E38.s b/asm/non_matchings/code_80071F00/func_80085E38.s deleted file mode 100644 index 8ff5b3690..000000000 --- a/asm/non_matchings/code_80071F00/func_80085E38.s +++ /dev/null @@ -1,65 +0,0 @@ -.section .late_rodata - -glabel jpt_800EF420 -.word L80085EE8, L80085E78, L80085E88, L80085EB0 -.word L80085ED0, L80085EE0 - -.section .text - -glabel func_80085E38 -/* 086A38 80085E38 000470C0 */ sll $t6, $a0, 3 -/* 086A3C 80085E3C 01C47023 */ subu $t6, $t6, $a0 -/* 086A40 80085E40 000E7140 */ sll $t6, $t6, 5 -/* 086A44 80085E44 3C0F8016 */ lui $t7, %hi(D_80165CBE) # 0x8016 -/* 086A48 80085E48 01EE7821 */ addu $t7, $t7, $t6 -/* 086A4C 80085E4C 95EF5CBE */ lhu $t7, %lo(D_80165CBE)($t7) # 0x5cbe($t7) -/* 086A50 80085E50 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 086A54 80085E54 AFBF001C */ sw $ra, 0x1c($sp) -/* 086A58 80085E58 2DE10006 */ sltiu $at, $t7, 6 -/* 086A5C 80085E5C 10200022 */ beqz $at, .L80085EE8 -/* 086A60 80085E60 000F7880 */ sll $t7, $t7, 2 -/* 086A64 80085E64 3C01800F */ lui $at, %hi(jpt_800EF420) -/* 086A68 80085E68 002F0821 */ addu $at, $at, $t7 -/* 086A6C 80085E6C 8C2FF420 */ lw $t7, %lo(jpt_800EF420)($at) -/* 086A70 80085E70 01E00008 */ jr $t7 -/* 086A74 80085E74 00000000 */ nop -glabel L80085E78 -/* 086A78 80085E78 0C02176E */ jal func_80085DB8 -/* 086A7C 80085E7C 00000000 */ nop -/* 086A80 80085E80 1000001A */ b .L80085EEC -/* 086A84 80085E84 8FBF001C */ lw $ra, 0x1c($sp) -glabel L80085E88 -/* 086A88 80085E88 2418000C */ li $t8, 12 -/* 086A8C 80085E8C 24190001 */ li $t9, 1 -/* 086A90 80085E90 AFB90014 */ sw $t9, 0x14($sp) -/* 086A94 80085E94 AFB80010 */ sw $t8, 0x10($sp) -/* 086A98 80085E98 00002825 */ move $a1, $zero -/* 086A9C 80085E9C 24060004 */ li $a2, 4 -/* 086AA0 80085EA0 0C01CB95 */ jal func_80072E54 -/* 086AA4 80085EA4 24070001 */ li $a3, 1 -/* 086AA8 80085EA8 10000010 */ b .L80085EEC -/* 086AAC 80085EAC 8FBF001C */ lw $ra, 0x1c($sp) -glabel L80085EB0 -/* 086AB0 80085EB0 24080001 */ li $t0, 1 -/* 086AB4 80085EB4 AFA80010 */ sw $t0, 0x10($sp) -/* 086AB8 80085EB8 24050003 */ li $a1, 3 -/* 086ABC 80085EBC 24060004 */ li $a2, 4 -/* 086AC0 80085EC0 0C01CB4F */ jal func_80072D3C -/* 086AC4 80085EC4 2407000C */ li $a3, 12 -/* 086AC8 80085EC8 10000008 */ b .L80085EEC -/* 086ACC 80085ECC 8FBF001C */ lw $ra, 0x1c($sp) -glabel L80085ED0 -/* 086AD0 80085ED0 0C01CAD2 */ jal func_80072B48 -/* 086AD4 80085ED4 2405000C */ li $a1, 12 -/* 086AD8 80085ED8 10000004 */ b .L80085EEC -/* 086ADC 80085EDC 8FBF001C */ lw $ra, 0x1c($sp) -glabel L80085EE0 -/* 086AE0 80085EE0 0C01C9B3 */ jal func_800726CC -/* 086AE4 80085EE4 24050002 */ li $a1, 2 -.L80085EE8: -glabel L80085EE8 -/* 086AE8 80085EE8 8FBF001C */ lw $ra, 0x1c($sp) -.L80085EEC: -/* 086AEC 80085EEC 27BD0020 */ addiu $sp, $sp, 0x20 -/* 086AF0 80085EF0 03E00008 */ jr $ra -/* 086AF4 80085EF4 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_80085EF8.s b/asm/non_matchings/code_80071F00/func_80085EF8.s deleted file mode 100644 index 0a02e3b2a..000000000 --- a/asm/non_matchings/code_80071F00/func_80085EF8.s +++ /dev/null @@ -1,39 +0,0 @@ -.section .late_rodata - -glabel D_800EF438 -.double -2013.0 - -.section .text - -glabel func_80085EF8 -/* 086AF8 80085EF8 3C018019 */ lui $at, %hi(D_8018D01C) # $at, 0x8019 -/* 086AFC 80085EFC C424D01C */ lwc1 $f4, %lo(D_8018D01C)($at) -/* 086B00 80085F00 3C01800F */ lui $at, %hi(D_800EF438) -/* 086B04 80085F04 D428F438 */ ldc1 $f8, %lo(D_800EF438)($at) -/* 086B08 80085F08 460021A1 */ cvt.d.s $f6, $f4 -/* 086B0C 80085F0C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 086B10 80085F10 46283282 */ mul.d $f10, $f6, $f8 -/* 086B14 80085F14 AFBF001C */ sw $ra, 0x1c($sp) -/* 086B18 80085F18 3C06440A */ lui $a2, (0x440AC000 >> 16) # lui $a2, 0x440a -/* 086B1C 80085F1C AFA40020 */ sw $a0, 0x20($sp) -/* 086B20 80085F20 34C6C000 */ ori $a2, (0x440AC000 & 0xFFFF) # ori $a2, $a2, 0xc000 -/* 086B24 80085F24 24070000 */ li $a3, 0 -/* 086B28 80085F28 46205420 */ cvt.s.d $f16, $f10 -/* 086B2C 80085F2C 44058000 */ mfc1 $a1, $f16 -/* 086B30 80085F30 0C022DF5 */ jal func_8008B7D4 -/* 086B34 80085F34 00000000 */ nop -/* 086B38 80085F38 3C050600 */ lui $a1, %hi(d_course_rainbow_road_neon_boo_tlut_list) # $a1, 0x600 -/* 086B3C 80085F3C 3C060601 */ lui $a2, %hi(d_course_rainbow_road_neon_boo) # $a2, 0x601 -/* 086B40 80085F40 240E0040 */ li $t6, 64 -/* 086B44 80085F44 AFAE0010 */ sw $t6, 0x10($sp) -/* 086B48 80085F48 24C6A000 */ addiu $a2, %lo(d_course_rainbow_road_neon_boo) # addiu $a2, $a2, -0x6000 -/* 086B4C 80085F4C 24A56800 */ addiu $a1, %lo(d_course_rainbow_road_neon_boo_tlut_list) # addiu $a1, $a1, 0x6800 -/* 086B50 80085F50 8FA40020 */ lw $a0, 0x20($sp) -/* 086B54 80085F54 0C01CD11 */ jal func_80073444 -/* 086B58 80085F58 24070040 */ li $a3, 64 -/* 086B5C 80085F5C 0C0216ED */ jal func_80085BB4 -/* 086B60 80085F60 8FA40020 */ lw $a0, 0x20($sp) -/* 086B64 80085F64 8FBF001C */ lw $ra, 0x1c($sp) -/* 086B68 80085F68 27BD0020 */ addiu $sp, $sp, 0x20 -/* 086B6C 80085F6C 03E00008 */ jr $ra -/* 086B70 80085F70 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_80085F74.s b/asm/non_matchings/code_80071F00/func_80085F74.s deleted file mode 100644 index b1bac28e0..000000000 --- a/asm/non_matchings/code_80071F00/func_80085F74.s +++ /dev/null @@ -1,87 +0,0 @@ -.section .late_rodata - -glabel jpt_800EF440 -.word L80086064, L80085FB4, L80085FC4, L80085FEC -.word L80085FFC, L80086014, L80086024, L8008604C -.word L8008605C - -.word 0x00000000 - -.section .text - -glabel func_80085F74 -/* 086B74 80085F74 000470C0 */ sll $t6, $a0, 3 -/* 086B78 80085F78 01C47023 */ subu $t6, $t6, $a0 -/* 086B7C 80085F7C 000E7140 */ sll $t6, $t6, 5 -/* 086B80 80085F80 3C0F8016 */ lui $t7, %hi(D_80165CBE) # 0x8016 -/* 086B84 80085F84 01EE7821 */ addu $t7, $t7, $t6 -/* 086B88 80085F88 95EF5CBE */ lhu $t7, %lo(D_80165CBE)($t7) # 0x5cbe($t7) -/* 086B8C 80085F8C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 086B90 80085F90 AFBF001C */ sw $ra, 0x1c($sp) -/* 086B94 80085F94 2DE10009 */ sltiu $at, $t7, 9 -/* 086B98 80085F98 10200032 */ beqz $at, .L80086064 -/* 086B9C 80085F9C 000F7880 */ sll $t7, $t7, 2 -/* 086BA0 80085FA0 3C01800F */ lui $at, %hi(jpt_800EF440) -/* 086BA4 80085FA4 002F0821 */ addu $at, $at, $t7 -/* 086BA8 80085FA8 8C2FF440 */ lw $t7, %lo(jpt_800EF440)($at) -/* 086BAC 80085FAC 01E00008 */ jr $t7 -/* 086BB0 80085FB0 00000000 */ nop -glabel L80085FB4 -/* 086BB4 80085FB4 0C0217BE */ jal func_80085EF8 -/* 086BB8 80085FB8 00000000 */ nop -/* 086BBC 80085FBC 1000002A */ b .L80086068 -/* 086BC0 80085FC0 8FBF001C */ lw $ra, 0x1c($sp) -glabel L80085FC4 -/* 086BC4 80085FC4 24180005 */ li $t8, 5 -/* 086BC8 80085FC8 24190001 */ li $t9, 1 -/* 086BCC 80085FCC AFB90014 */ sw $t9, 0x14($sp) -/* 086BD0 80085FD0 AFB80010 */ sw $t8, 0x10($sp) -/* 086BD4 80085FD4 00002825 */ move $a1, $zero -/* 086BD8 80085FD8 24060004 */ li $a2, 4 -/* 086BDC 80085FDC 0C01CB95 */ jal func_80072E54 -/* 086BE0 80085FE0 24070001 */ li $a3, 1 -/* 086BE4 80085FE4 10000020 */ b .L80086068 -/* 086BE8 80085FE8 8FBF001C */ lw $ra, 0x1c($sp) -glabel L80085FEC -/* 086BEC 80085FEC 0C01C9E3 */ jal func_8007278C -/* 086BF0 80085FF0 2405001E */ li $a1, 30 -/* 086BF4 80085FF4 1000001C */ b .L80086068 -/* 086BF8 80085FF8 8FBF001C */ lw $ra, 0x1c($sp) -glabel L80085FFC -/* 086BFC 80085FFC 24050004 */ li $a1, 4 -/* 086C00 80086000 00003025 */ move $a2, $zero -/* 086C04 80086004 0C01CB00 */ jal func_80072C00 -/* 086C08 80086008 24070007 */ li $a3, 7 -/* 086C0C 8008600C 10000016 */ b .L80086068 -/* 086C10 80086010 8FBF001C */ lw $ra, 0x1c($sp) -glabel L80086014 -/* 086C14 80086014 0C01C9E3 */ jal func_8007278C -/* 086C18 80086018 2405001E */ li $a1, 30 -/* 086C1C 8008601C 10000012 */ b .L80086068 -/* 086C20 80086020 8FBF001C */ lw $ra, 0x1c($sp) -glabel L80086024 -/* 086C24 80086024 24080005 */ li $t0, 5 -/* 086C28 80086028 24090001 */ li $t1, 1 -/* 086C2C 8008602C AFA90014 */ sw $t1, 0x14($sp) -/* 086C30 80086030 AFA80010 */ sw $t0, 0x10($sp) -/* 086C34 80086034 24050003 */ li $a1, 3 -/* 086C38 80086038 00003025 */ move $a2, $zero -/* 086C3C 8008603C 0C01CBE2 */ jal func_80072F88 -/* 086C40 80086040 24070001 */ li $a3, 1 -/* 086C44 80086044 10000008 */ b .L80086068 -/* 086C48 80086048 8FBF001C */ lw $ra, 0x1c($sp) -glabel L8008604C -/* 086C4C 8008604C 0C01CAD2 */ jal func_80072B48 -/* 086C50 80086050 2405000F */ li $a1, 15 -/* 086C54 80086054 10000004 */ b .L80086068 -/* 086C58 80086058 8FBF001C */ lw $ra, 0x1c($sp) -glabel L8008605C -/* 086C5C 8008605C 0C01C9B3 */ jal func_800726CC -/* 086C60 80086060 24050002 */ li $a1, 2 -.L80086064: -glabel L80086064 -/* 086C64 80086064 8FBF001C */ lw $ra, 0x1c($sp) -.L80086068: -/* 086C68 80086068 27BD0020 */ addiu $sp, $sp, 0x20 -/* 086C6C 8008606C 03E00008 */ jr $ra -/* 086C70 80086070 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_80086110.s b/asm/non_matchings/code_80071F00/func_80086110.s deleted file mode 100644 index 9fc5530ac..000000000 --- a/asm/non_matchings/code_80071F00/func_80086110.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_80086110 -/* 086D10 80086110 000470C0 */ sll $t6, $a0, 3 -/* 086D14 80086114 01C47023 */ subu $t6, $t6, $a0 -/* 086D18 80086118 000E7140 */ sll $t6, $t6, 5 -/* 086D1C 8008611C 3C028016 */ lui $v0, %hi(D_80165CBE) # 0x8016 -/* 086D20 80086120 004E1021 */ addu $v0, $v0, $t6 -/* 086D24 80086124 84425CBE */ lh $v0, %lo(D_80165CBE)($v0) # 0x5cbe($v0) -/* 086D28 80086128 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 086D2C 8008612C AFBF0014 */ sw $ra, 0x14($sp) -/* 086D30 80086130 10400005 */ beqz $v0, .L80086148 -/* 086D34 80086134 24010001 */ li $at, 1 -/* 086D38 80086138 54410004 */ bnel $v0, $at, .L8008614C -/* 086D3C 8008613C 8FBF0014 */ lw $ra, 0x14($sp) -/* 086D40 80086140 0C02181D */ jal func_80086074 -/* 086D44 80086144 00000000 */ nop -.L80086148: -/* 086D48 80086148 8FBF0014 */ lw $ra, 0x14($sp) -.L8008614C: -/* 086D4C 8008614C 27BD0018 */ addiu $sp, $sp, 0x18 -/* 086D50 80086150 03E00008 */ jr $ra -/* 086D54 80086154 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_80086158.s b/asm/non_matchings/code_80071F00/func_80086158.s deleted file mode 100644 index 83630376a..000000000 --- a/asm/non_matchings/code_80071F00/func_80086158.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel func_80086158 -/* 086D58 80086158 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 086D5C 8008615C AFBF0014 */ sw $ra, 0x14($sp) -/* 086D60 80086160 AFA40018 */ sw $a0, 0x18($sp) -/* 086D64 80086164 10A00009 */ beqz $a1, .L8008618C -/* 086D68 80086168 00A03025 */ move $a2, $a1 -/* 086D6C 8008616C 24010001 */ li $at, 1 -/* 086D70 80086170 10A1000B */ beq $a1, $at, .L800861A0 -/* 086D74 80086174 8FA40018 */ lw $a0, 0x18($sp) -/* 086D78 80086178 24010002 */ li $at, 2 -/* 086D7C 8008617C 10A1000C */ beq $a1, $at, .L800861B0 -/* 086D80 80086180 8FA40018 */ lw $a0, 0x18($sp) -/* 086D84 80086184 1000000E */ b .L800861C0 -/* 086D88 80086188 28C10003 */ slti $at, $a2, 3 -.L8008618C: -/* 086D8C 8008618C 8FA40018 */ lw $a0, 0x18($sp) -/* 086D90 80086190 0C021728 */ jal func_80085CA0 -/* 086D94 80086194 AFA6001C */ sw $a2, 0x1c($sp) -/* 086D98 80086198 10000008 */ b .L800861BC -/* 086D9C 8008619C 8FA6001C */ lw $a2, 0x1c($sp) -.L800861A0: -/* 086DA0 800861A0 0C02178E */ jal func_80085E38 -/* 086DA4 800861A4 AFA6001C */ sw $a2, 0x1c($sp) -/* 086DA8 800861A8 10000004 */ b .L800861BC -/* 086DAC 800861AC 8FA6001C */ lw $a2, 0x1c($sp) -.L800861B0: -/* 086DB0 800861B0 0C0217DD */ jal func_80085F74 -/* 086DB4 800861B4 AFA6001C */ sw $a2, 0x1c($sp) -/* 086DB8 800861B8 8FA6001C */ lw $a2, 0x1c($sp) -.L800861BC: -/* 086DBC 800861BC 28C10003 */ slti $at, $a2, 3 -.L800861C0: -/* 086DC0 800861C0 14200003 */ bnez $at, .L800861D0 -/* 086DC4 800861C4 8FA40018 */ lw $a0, 0x18($sp) -/* 086DC8 800861C8 0C021844 */ jal func_80086110 -/* 086DCC 800861CC 24C5FFFD */ addiu $a1, $a2, -3 -.L800861D0: -/* 086DD0 800861D0 8FBF0014 */ lw $ra, 0x14($sp) -/* 086DD4 800861D4 27BD0018 */ addiu $sp, $sp, 0x18 -/* 086DD8 800861D8 03E00008 */ jr $ra -/* 086DDC 800861DC 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_800861E0.s b/asm/non_matchings/code_80071F00/func_800861E0.s deleted file mode 100644 index 45e837f5a..000000000 --- a/asm/non_matchings/code_80071F00/func_800861E0.s +++ /dev/null @@ -1,50 +0,0 @@ -glabel func_800861E0 -/* 086DE0 800861E0 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 086DE4 800861E4 AFB40028 */ sw $s4, 0x28($sp) -/* 086DE8 800861E8 AFB30024 */ sw $s3, 0x24($sp) -/* 086DEC 800861EC AFB60030 */ sw $s6, 0x30($sp) -/* 086DF0 800861F0 AFB5002C */ sw $s5, 0x2c($sp) -/* 086DF4 800861F4 AFB20020 */ sw $s2, 0x20($sp) -/* 086DF8 800861F8 3C138018 */ lui $s3, %hi(D_80183EA0) # $s3, 0x8018 -/* 086DFC 800861FC 3C148016 */ lui $s4, %hi(D_80165C18) # $s4, 0x8016 -/* 086E00 80086200 AFBF0034 */ sw $ra, 0x34($sp) -/* 086E04 80086204 AFB1001C */ sw $s1, 0x1c($sp) -/* 086E08 80086208 AFB00018 */ sw $s0, 0x18($sp) -/* 086E0C 8008620C 26945C18 */ addiu $s4, %lo(D_80165C18) # addiu $s4, $s4, 0x5c18 -/* 086E10 80086210 26733EA0 */ addiu $s3, %lo(D_80183EA0) # addiu $s3, $s3, 0x3ea0 -/* 086E14 80086214 00009025 */ move $s2, $zero -/* 086E18 80086218 241500E0 */ li $s5, 224 -/* 086E1C 8008621C 2416000A */ li $s6, 10 -.L80086220: -/* 086E20 80086220 8E700000 */ lw $s0, ($s3) -/* 086E24 80086224 02150019 */ multu $s0, $s5 -/* 086E28 80086228 02002025 */ move $a0, $s0 -/* 086E2C 8008622C 00007012 */ mflo $t6 -/* 086E30 80086230 028E8821 */ addu $s1, $s4, $t6 -/* 086E34 80086234 862F00A6 */ lh $t7, 0xa6($s1) -/* 086E38 80086238 51E0000C */ beql $t7, $zero, .L8008626C -/* 086E3C 8008623C 26520001 */ addiu $s2, $s2, 1 -/* 086E40 80086240 0C021856 */ jal func_80086158 -/* 086E44 80086244 02402825 */ move $a1, $s2 -/* 086E48 80086248 863800A6 */ lh $t8, 0xa6($s1) -/* 086E4C 8008624C 2B010002 */ slti $at, $t8, 2 -/* 086E50 80086250 54200006 */ bnel $at, $zero, .L8008626C -/* 086E54 80086254 26520001 */ addiu $s2, $s2, 1 -/* 086E58 80086258 0C01CD37 */ jal func_800734DC -/* 086E5C 8008625C 02002025 */ move $a0, $s0 -/* 086E60 80086260 0C022FC6 */ jal func_8008BF18 -/* 086E64 80086264 02002025 */ move $a0, $s0 -/* 086E68 80086268 26520001 */ addiu $s2, $s2, 1 -.L8008626C: -/* 086E6C 8008626C 1656FFEC */ bne $s2, $s6, .L80086220 -/* 086E70 80086270 26730004 */ addiu $s3, $s3, 4 -/* 086E74 80086274 8FBF0034 */ lw $ra, 0x34($sp) -/* 086E78 80086278 8FB00018 */ lw $s0, 0x18($sp) -/* 086E7C 8008627C 8FB1001C */ lw $s1, 0x1c($sp) -/* 086E80 80086280 8FB20020 */ lw $s2, 0x20($sp) -/* 086E84 80086284 8FB30024 */ lw $s3, 0x24($sp) -/* 086E88 80086288 8FB40028 */ lw $s4, 0x28($sp) -/* 086E8C 8008628C 8FB5002C */ lw $s5, 0x2c($sp) -/* 086E90 80086290 8FB60030 */ lw $s6, 0x30($sp) -/* 086E94 80086294 03E00008 */ jr $ra -/* 086E98 80086298 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/non_matchings/code_80071F00/func_80086C6C.s b/asm/non_matchings/code_80071F00/func_80086C6C.s deleted file mode 100644 index ef693a145..000000000 --- a/asm/non_matchings/code_80071F00/func_80086C6C.s +++ /dev/null @@ -1,74 +0,0 @@ -glabel func_80086C6C -/* 08786C 80086C6C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 087870 80086C70 AFBF0014 */ sw $ra, 0x14($sp) -/* 087874 80086C74 AFA40030 */ sw $a0, 0x30($sp) -/* 087878 80086C78 0C0ADF8D */ jal random_int -/* 08787C 80086C7C 2404000A */ li $a0, 10 -/* 087880 80086C80 8FAE0030 */ lw $t6, 0x30($sp) -/* 087884 80086C84 3C188016 */ lui $t8, %hi(D_80165C18) # $t8, 0x8016 -/* 087888 80086C88 27185C18 */ addiu $t8, %lo(D_80165C18) # addiu $t8, $t8, 0x5c18 -/* 08788C 80086C8C 000E78C0 */ sll $t7, $t6, 3 -/* 087890 80086C90 01EE7823 */ subu $t7, $t7, $t6 -/* 087894 80086C94 000F7940 */ sll $t7, $t7, 5 -/* 087898 80086C98 01F81821 */ addu $v1, $t7, $t8 -/* 08789C 80086C9C 3C0140A0 */ li $at, 0x40A00000 # 5.000000 -/* 0878A0 80086CA0 44813000 */ mtc1 $at, $f6 -/* 0878A4 80086CA4 C4640004 */ lwc1 $f4, 4($v1) -/* 0878A8 80086CA8 44825000 */ mtc1 $v0, $f10 -/* 0878AC 80086CAC 3C014F80 */ li $at, 0x4F800000 # 4294967296.000000 -/* 0878B0 80086CB0 46062201 */ sub.s $f8, $f4, $f6 -/* 0878B4 80086CB4 04410004 */ bgez $v0, .L80086CC8 -/* 0878B8 80086CB8 46805420 */ cvt.s.w $f16, $f10 -/* 0878BC 80086CBC 44819000 */ mtc1 $at, $f18 -/* 0878C0 80086CC0 00000000 */ nop -/* 0878C4 80086CC4 46128400 */ add.s $f16, $f16, $f18 -.L80086CC8: -/* 0878C8 80086CC8 46088100 */ add.s $f4, $f16, $f8 -/* 0878CC 80086CCC 2404000A */ li $a0, 10 -/* 0878D0 80086CD0 AFA30020 */ sw $v1, 0x20($sp) -/* 0878D4 80086CD4 0C0ADF8D */ jal random_int -/* 0878D8 80086CD8 E7A40024 */ swc1 $f4, 0x24($sp) -/* 0878DC 80086CDC 8FA30020 */ lw $v1, 0x20($sp) -/* 0878E0 80086CE0 3C0140A0 */ li $at, 0x40A00000 # 5.000000 -/* 0878E4 80086CE4 44815000 */ mtc1 $at, $f10 -/* 0878E8 80086CE8 44828000 */ mtc1 $v0, $f16 -/* 0878EC 80086CEC C466000C */ lwc1 $f6, 0xc($v1) -/* 0878F0 80086CF0 3C058016 */ lui $a1, %hi(D_801658F4) # $a1, 0x8016 -/* 0878F4 80086CF4 27A40024 */ addiu $a0, $sp, 0x24 -/* 0878F8 80086CF8 460A3481 */ sub.s $f18, $f6, $f10 -/* 0878FC 80086CFC 04410005 */ bgez $v0, .L80086D14 -/* 087900 80086D00 46808220 */ cvt.s.w $f8, $f16 -/* 087904 80086D04 3C014F80 */ li $at, 0x4F800000 # 4294967296.000000 -/* 087908 80086D08 44812000 */ mtc1 $at, $f4 -/* 08790C 80086D0C 00000000 */ nop -/* 087910 80086D10 46044200 */ add.s $f8, $f8, $f4 -.L80086D14: -/* 087914 80086D14 46124180 */ add.s $f6, $f8, $f18 -/* 087918 80086D18 80A558F4 */ lb $a1, %lo(D_801658F4)($a1) -/* 08791C 80086D1C 3C014000 */ li $at, 0x40000000 # 2.000000 -/* 087920 80086D20 10A0000A */ beqz $a1, .L80086D4C -/* 087924 80086D24 E7A6002C */ swc1 $f6, 0x2c($sp) -/* 087928 80086D28 C46A0008 */ lwc1 $f10, 8($v1) -/* 08792C 80086D2C 3C01402C */ li $at, 0x402C0000 # 2.687500 -/* 087930 80086D30 44812800 */ mtc1 $at, $f5 -/* 087934 80086D34 44802000 */ mtc1 $zero, $f4 -/* 087938 80086D38 46005421 */ cvt.d.s $f16, $f10 -/* 08793C 80086D3C 46248200 */ add.d $f8, $f16, $f4 -/* 087940 80086D40 462044A0 */ cvt.s.d $f18, $f8 -/* 087944 80086D44 10000008 */ b .L80086D68 -/* 087948 80086D48 E7B20028 */ swc1 $f18, 0x28($sp) -.L80086D4C: -/* 08794C 80086D4C C4660008 */ lwc1 $f6, 8($v1) -/* 087950 80086D50 44818800 */ mtc1 $at, $f17 -/* 087954 80086D54 44808000 */ mtc1 $zero, $f16 -/* 087958 80086D58 460032A1 */ cvt.d.s $f10, $f6 -/* 08795C 80086D5C 46305101 */ sub.d $f4, $f10, $f16 -/* 087960 80086D60 46202220 */ cvt.s.d $f8, $f4 -/* 087964 80086D64 E7A80028 */ swc1 $f8, 0x28($sp) -.L80086D68: -/* 087968 80086D68 0C01DCF6 */ jal func_800773D8 -/* 08796C 80086D6C 00000000 */ nop -/* 087970 80086D70 8FBF0014 */ lw $ra, 0x14($sp) -/* 087974 80086D74 27BD0030 */ addiu $sp, $sp, 0x30 -/* 087978 80086D78 03E00008 */ jr $ra -/* 08797C 80086D7C 00000000 */ nop diff --git a/asm/non_matchings/code_80086E70/func_80088364.s b/asm/non_matchings/code_80086E70/func_80088364.s index 328cdfb1a..51883896c 100644 --- a/asm/non_matchings/code_80086E70/func_80088364.s +++ b/asm/non_matchings/code_80086E70/func_80088364.s @@ -77,53 +77,3 @@ glabel func_80088364 /* 089070 80088470 27BD0018 */ addiu $sp, $sp, 0x18 /* 089074 80088474 03E00008 */ jr $ra /* 089078 80088478 00000000 */ nop - -/* 08907C 8008847C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 089080 80088480 AFBF0024 */ sw $ra, 0x24($sp) -/* 089084 80088484 AFB00020 */ sw $s0, 0x20($sp) -/* 089088 80088488 AFA40030 */ sw $a0, 0x30($sp) -/* 08908C 8008848C AFA0002C */ sw $zero, 0x2c($sp) -/* 089090 80088490 0C01C87A */ jal func_800721E8 -/* 089094 80088494 3C050080 */ lui $a1, 0x80 -/* 089098 80088498 8FA40030 */ lw $a0, 0x30($sp) -/* 08909C 8008849C 0C01C88F */ jal func_8007223C -/* 0890A0 800884A0 24050400 */ li $a1, 1024 -/* 0890A4 800884A4 1040001F */ beqz $v0, .L80088524 -/* 0890A8 800884A8 3C048019 */ lui $a0, %hi(D_8018C3B0) # $a0, 0x8019 -/* 0890AC 800884AC 8FAE0030 */ lw $t6, 0x30($sp) -/* 0890B0 800884B0 3C188016 */ lui $t8, %hi(D_80165C18) # $t8, 0x8016 -/* 0890B4 800884B4 27185C18 */ addiu $t8, %lo(D_80165C18) # addiu $t8, $t8, 0x5c18 -/* 0890B8 800884B8 000E78C0 */ sll $t7, $t6, 3 -/* 0890BC 800884BC 01EE7823 */ subu $t7, $t7, $t6 -/* 0890C0 800884C0 000F7940 */ sll $t7, $t7, 5 -/* 0890C4 800884C4 01F88021 */ addu $s0, $t7, $t8 -/* 0890C8 800884C8 C604000C */ lwc1 $f4, 0xc($s0) -/* 0890CC 800884CC 8E060004 */ lw $a2, 4($s0) -/* 0890D0 800884D0 2484C3B0 */ addiu $a0, %lo(D_8018C3B0) # addiu $a0, $a0, -0x3c50 -/* 0890D4 800884D4 3C054120 */ lui $a1, 0x4120 -/* 0890D8 800884D8 3C0741A0 */ lui $a3, 0x41a0 -/* 0890DC 800884DC 0C0AB772 */ jal func_802ADDC8 -/* 0890E0 800884E0 E7A40010 */ swc1 $f4, 0x10($sp) -/* 0890E4 800884E4 3C198019 */ lui $t9, %hi(D_8018C3B4) # $t9, 0x8019 -/* 0890E8 800884E8 9739C3B4 */ lhu $t9, %lo(D_8018C3B4)($t9) -/* 0890EC 800884EC 24010001 */ li $at, 1 -/* 0890F0 800884F0 24080001 */ li $t0, 1 -/* 0890F4 800884F4 17210004 */ bne $t9, $at, .L80088508 -/* 0890F8 800884F8 3C050080 */ lui $a1, 0x80 -/* 0890FC 800884FC AFA8002C */ sw $t0, 0x2c($sp) -/* 089100 80088500 0C01C870 */ jal func_800721C0 -/* 089104 80088504 8FA40030 */ lw $a0, 0x30($sp) -.L80088508: -/* 089108 80088508 44807000 */ mtc1 $zero, $f14 -/* 08910C 8008850C 3C078019 */ lui $a3, %hi(D_8018C3BA) # $a3, 0x8019 -/* 089110 80088510 94E7C3BA */ lhu $a3, %lo(D_8018C3BA)($a3) -/* 089114 80088514 C60C0004 */ lwc1 $f12, 4($s0) -/* 089118 80088518 0C0AAF8C */ jal func_802ABE30 -/* 08911C 8008851C 8E06000C */ lw $a2, 0xc($s0) -/* 089120 80088520 E6000044 */ swc1 $f0, 0x44($s0) -.L80088524: -/* 089124 80088524 8FBF0024 */ lw $ra, 0x24($sp) -/* 089128 80088528 8FA2002C */ lw $v0, 0x2c($sp) -/* 08912C 8008852C 8FB00020 */ lw $s0, 0x20($sp) -/* 089130 80088530 03E00008 */ jr $ra -/* 089134 80088534 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/non_matchings/code_80086E70/func_800892E0.s b/asm/non_matchings/code_80086E70/func_800892E0.s deleted file mode 100644 index 842dd4f30..000000000 --- a/asm/non_matchings/code_80086E70/func_800892E0.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_800892E0 -/* 089EE0 800892E0 3C0F8019 */ lui $t7, %hi(D_8018CE10) # $t7, 0x8019 -/* 089EE4 800892E4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 089EE8 800892E8 25EFCE10 */ addiu $t7, %lo(D_8018CE10) # addiu $t7, $t7, -0x31f0 -/* 089EEC 800892EC 00047140 */ sll $t6, $a0, 5 -/* 089EF0 800892F0 AFBF0014 */ sw $ra, 0x14($sp) -/* 089EF4 800892F4 01CF1021 */ addu $v0, $t6, $t7 -/* 089EF8 800892F8 24450004 */ addiu $a1, $v0, 4 -/* 089EFC 800892FC AFA2001C */ sw $v0, 0x1c($sp) -/* 089F00 80089300 0C022408 */ jal func_80089020 -/* 089F04 80089304 AFA40020 */ sw $a0, 0x20($sp) -/* 089F08 80089308 8FA2001C */ lw $v0, 0x1c($sp) -/* 089F0C 8008930C 8FA40020 */ lw $a0, 0x20($sp) -/* 089F10 80089310 0C022408 */ jal func_80089020 -/* 089F14 80089314 2445000C */ addiu $a1, $v0, 0xc -/* 089F18 80089318 8FA2001C */ lw $v0, 0x1c($sp) -/* 089F1C 8008931C 8043001E */ lb $v1, 0x1e($v0) -/* 089F20 80089320 18600002 */ blez $v1, .L8008932C -/* 089F24 80089324 2478FFFF */ addiu $t8, $v1, -1 -/* 089F28 80089328 A058001E */ sb $t8, 0x1e($v0) -.L8008932C: -/* 089F2C 8008932C 8FBF0014 */ lw $ra, 0x14($sp) -/* 089F30 80089330 27BD0020 */ addiu $sp, $sp, 0x20 -/* 089F34 80089334 03E00008 */ jr $ra -/* 089F38 80089338 00000000 */ nop diff --git a/asm/non_matchings/code_80086E70/func_8008933C.s b/asm/non_matchings/code_80086E70/func_8008933C.s deleted file mode 100644 index 479b60122..000000000 --- a/asm/non_matchings/code_80086E70/func_8008933C.s +++ /dev/null @@ -1,84 +0,0 @@ -glabel func_8008933C -/* 089F3C 8008933C 3C0E800E */ lui $t6, %hi(gPlayerOne) # $t6, 0x800e -/* 089F40 80089340 8DCEC4DC */ lw $t6, %lo(gPlayerOne)($t6) -/* 089F44 80089344 24010DD8 */ li $at, 3544 -/* 089F48 80089348 3C198019 */ lui $t9, %hi(D_8018CE10) # $t9, 0x8019 -/* 089F4C 8008934C 008E1023 */ subu $v0, $a0, $t6 -/* 089F50 80089350 0041001A */ div $zero, $v0, $at -/* 089F54 80089354 00007812 */ mflo $t7 -/* 089F58 80089358 000FC140 */ sll $t8, $t7, 5 -/* 089F5C 8008935C 2739CE10 */ addiu $t9, %lo(D_8018CE10) # addiu $t9, $t9, -0x31f0 -/* 089F60 80089360 03191821 */ addu $v1, $t8, $t9 -/* 089F64 80089364 8068001E */ lb $t0, 0x1e($v1) -/* 089F68 80089368 44808000 */ mtc1 $zero, $f16 -/* 089F6C 8008936C 44867000 */ mtc1 $a2, $f14 -/* 089F70 80089370 44876000 */ mtc1 $a3, $f12 -/* 089F74 80089374 1500003D */ bnez $t0, .L8008946C -/* 089F78 80089378 46008086 */ mov.s $f2, $f16 -/* 089F7C 8008937C 94890046 */ lhu $t1, 0x46($a0) -/* 089F80 80089380 8C8B00BC */ lw $t3, 0xbc($a0) -/* 089F84 80089384 000570C0 */ sll $t6, $a1, 3 -/* 089F88 80089388 01C57023 */ subu $t6, $t6, $a1 -/* 089F8C 8008938C 3C0F8016 */ lui $t7, %hi(D_80165C18) # $t7, 0x8016 -/* 089F90 80089390 352A0002 */ ori $t2, $t1, 2 -/* 089F94 80089394 356C8000 */ ori $t4, $t3, 0x8000 -/* 089F98 80089398 A48A0046 */ sh $t2, 0x46($a0) -/* 089F9C 8008939C AC8C00BC */ sw $t4, 0xbc($a0) -/* 089FA0 800893A0 240D0004 */ li $t5, 4 -/* 089FA4 800893A4 25EF5C18 */ addiu $t7, %lo(D_80165C18) # addiu $t7, $t7, 0x5c18 -/* 089FA8 800893A8 000E7140 */ sll $t6, $t6, 5 -/* 089FAC 800893AC A06D001E */ sb $t5, 0x1e($v1) -/* 089FB0 800893B0 01CF1021 */ addu $v0, $t6, $t7 -/* 089FB4 800893B4 C4460004 */ lwc1 $f6, 4($v0) -/* 089FB8 800893B8 C4840014 */ lwc1 $f4, 0x14($a0) -/* 089FBC 800893BC C4420038 */ lwc1 $f2, 0x38($v0) -/* 089FC0 800893C0 46062201 */ sub.s $f8, $f4, $f6 -/* 089FC4 800893C4 46081002 */ mul.s $f0, $f2, $f8 -/* 089FC8 800893C8 4600803E */ c.le.s $f16, $f0 -/* 089FCC 800893CC 00000000 */ nop -/* 089FD0 800893D0 45020009 */ bc1fl .L800893F8 -/* 089FD4 800893D4 C4920034 */ lwc1 $f18, 0x34($a0) -/* 089FD8 800893D8 C4920034 */ lwc1 $f18, 0x34($a0) -/* 089FDC 800893DC 460C1282 */ mul.s $f10, $f2, $f12 -/* 089FE0 800893E0 46009107 */ neg.s $f4, $f18 -/* 089FE4 800893E4 460E2182 */ mul.s $f6, $f4, $f14 -/* 089FE8 800893E8 46065200 */ add.s $f8, $f10, $f6 -/* 089FEC 800893EC 10000005 */ b .L80089404 -/* 089FF0 800893F0 E4680004 */ swc1 $f8, 4($v1) -/* 089FF4 800893F4 C4920034 */ lwc1 $f18, 0x34($a0) -.L800893F8: -/* 089FF8 800893F8 46009107 */ neg.s $f4, $f18 -/* 089FFC 800893FC 460E2282 */ mul.s $f10, $f4, $f14 -/* 08A000 80089400 E46A0004 */ swc1 $f10, 4($v1) -.L80089404: -/* 08A004 80089404 C486001C */ lwc1 $f6, 0x1c($a0) -/* 08A008 80089408 C448000C */ lwc1 $f8, 0xc($v0) -/* 08A00C 8008940C C4420040 */ lwc1 $f2, 0x40($v0) -/* 08A010 80089410 46083481 */ sub.s $f18, $f6, $f8 -/* 08A014 80089414 46121002 */ mul.s $f0, $f2, $f18 -/* 08A018 80089418 4600803E */ c.le.s $f16, $f0 -/* 08A01C 8008941C 00000000 */ nop -/* 08A020 80089420 45020009 */ bc1fl .L80089448 -/* 08A024 80089424 C48A003C */ lwc1 $f10, 0x3c($a0) -/* 08A028 80089428 C48A003C */ lwc1 $f10, 0x3c($a0) -/* 08A02C 8008942C 460C1102 */ mul.s $f4, $f2, $f12 -/* 08A030 80089430 46005187 */ neg.s $f6, $f10 -/* 08A034 80089434 460E3202 */ mul.s $f8, $f6, $f14 -/* 08A038 80089438 46082480 */ add.s $f18, $f4, $f8 -/* 08A03C 8008943C 10000005 */ b .L80089454 -/* 08A040 80089440 E472000C */ swc1 $f18, 0xc($v1) -/* 08A044 80089444 C48A003C */ lwc1 $f10, 0x3c($a0) -.L80089448: -/* 08A048 80089448 46005187 */ neg.s $f6, $f10 -/* 08A04C 8008944C 460E3102 */ mul.s $f4, $f6, $f14 -/* 08A050 80089450 E464000C */ swc1 $f4, 0xc($v1) -.L80089454: -/* 08A054 80089454 C460000C */ lwc1 $f0, 0xc($v1) -/* 08A058 80089458 C46C0004 */ lwc1 $f12, 4($v1) -/* 08A05C 8008945C 46000202 */ mul.s $f8, $f0, $f0 -/* 08A060 80089460 00000000 */ nop -/* 08A064 80089464 460C6482 */ mul.s $f18, $f12, $f12 -/* 08A068 80089468 46124080 */ add.s $f2, $f8, $f18 -.L8008946C: -/* 08A06C 8008946C 03E00008 */ jr $ra -/* 08A070 80089470 46001006 */ mov.s $f0, $f2 diff --git a/asm/non_matchings/code_80086E70/func_80089474.s b/asm/non_matchings/code_80086E70/func_80089474.s deleted file mode 100644 index 3e94b2cb4..000000000 --- a/asm/non_matchings/code_80086E70/func_80089474.s +++ /dev/null @@ -1,256 +0,0 @@ -.section .late_rodata - -glabel D_800EF4D8 -.double 1.1 - -.section .text - -glabel func_80089474 -/* 08A074 80089474 000578C0 */ sll $t7, $a1, 3 -/* 08A078 80089478 01E57823 */ subu $t7, $t7, $a1 -/* 08A07C 8008947C 000F7900 */ sll $t7, $t7, 4 -/* 08A080 80089480 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 08A084 80089484 01E57823 */ subu $t7, $t7, $a1 -/* 08A088 80089488 3C18800E */ lui $t8, %hi(gPlayerOne) # $t8, 0x800e -/* 08A08C 8008948C 8F18C4DC */ lw $t8, %lo(gPlayerOne)($t8) -/* 08A090 80089490 000F7880 */ sll $t7, $t7, 2 -/* 08A094 80089494 01E57823 */ subu $t7, $t7, $a1 -/* 08A098 80089498 000F78C0 */ sll $t7, $t7, 3 -/* 08A09C 8008949C AFBF0014 */ sw $ra, 0x14($sp) -/* 08A0A0 800894A0 AFA50024 */ sw $a1, 0x24($sp) -/* 08A0A4 800894A4 01F8C821 */ addu $t9, $t7, $t8 -/* 08A0A8 800894A8 AFA40020 */ sw $a0, 0x20($sp) -/* 08A0AC 800894AC AFA60028 */ sw $a2, 0x28($sp) -/* 08A0B0 800894B0 AFA7002C */ sw $a3, 0x2c($sp) -/* 08A0B4 800894B4 AFB90018 */ sw $t9, 0x18($sp) -/* 08A0B8 800894B8 0C01C88F */ jal func_8007223C -/* 08A0BC 800894BC 3C050400 */ lui $a1, 0x400 -/* 08A0C0 800894C0 50400004 */ beql $v0, $zero, .L800894D4 -/* 08A0C4 800894C4 8FA40018 */ lw $a0, 0x18($sp) -/* 08A0C8 800894C8 0C01C860 */ jal func_80072180 -/* 08A0CC 800894CC 00000000 */ nop -/* 08A0D0 800894D0 8FA40018 */ lw $a0, 0x18($sp) -.L800894D4: -/* 08A0D4 800894D4 8FA50020 */ lw $a1, 0x20($sp) -/* 08A0D8 800894D8 8FA60028 */ lw $a2, 0x28($sp) -/* 08A0DC 800894DC 0C0224CF */ jal func_8008933C -/* 08A0E0 800894E0 8FA7002C */ lw $a3, 0x2c($sp) -/* 08A0E4 800894E4 3C014010 */ li $at, 0x40100000 # 2.250000 -/* 08A0E8 800894E8 44813800 */ mtc1 $at, $f7 -/* 08A0EC 800894EC 44803000 */ mtc1 $zero, $f6 -/* 08A0F0 800894F0 46000121 */ cvt.d.s $f4, $f0 -/* 08A0F4 800894F4 8FA80018 */ lw $t0, 0x18($sp) -/* 08A0F8 800894F8 4624303E */ c.le.d $f6, $f4 -/* 08A0FC 800894FC 00000000 */ nop -/* 08A100 80089500 4502000A */ bc1fl .L8008952C -/* 08A104 80089504 8FBF0014 */ lw $ra, 0x14($sp) -/* 08A108 80089508 95090000 */ lhu $t1, ($t0) -/* 08A10C 8008950C 24011000 */ li $at, 4096 -/* 08A110 80089510 93A40027 */ lbu $a0, 0x27($sp) -/* 08A114 80089514 312A1000 */ andi $t2, $t1, 0x1000 -/* 08A118 80089518 51410004 */ beql $t2, $at, .L8008952C -/* 08A11C 8008951C 8FBF0014 */ lw $ra, 0x14($sp) -/* 08A120 80089520 0C032418 */ jal func_800C9060 -/* 08A124 80089524 8FA50030 */ lw $a1, 0x30($sp) -/* 08A128 80089528 8FBF0014 */ lw $ra, 0x14($sp) -.L8008952C: -/* 08A12C 8008952C 27BD0020 */ addiu $sp, $sp, 0x20 -/* 08A130 80089530 03E00008 */ jr $ra -/* 08A134 80089534 00000000 */ nop - -/* 08A138 80089538 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 08A13C 8008953C AFA50024 */ sw $a1, 0x24($sp) -/* 08A140 80089540 8FAE0024 */ lw $t6, 0x24($sp) -/* 08A144 80089544 3C18800E */ lui $t8, %hi(gPlayerOne) # $t8, 0x800e -/* 08A148 80089548 44866000 */ mtc1 $a2, $f12 -/* 08A14C 8008954C 000E78C0 */ sll $t7, $t6, 3 -/* 08A150 80089550 01EE7823 */ subu $t7, $t7, $t6 -/* 08A154 80089554 000F7900 */ sll $t7, $t7, 4 -/* 08A158 80089558 01EE7823 */ subu $t7, $t7, $t6 -/* 08A15C 8008955C 44877000 */ mtc1 $a3, $f14 -/* 08A160 80089560 8F18C4DC */ lw $t8, %lo(gPlayerOne)($t8) -/* 08A164 80089564 000F7880 */ sll $t7, $t7, 2 -/* 08A168 80089568 01EE7823 */ subu $t7, $t7, $t6 -/* 08A16C 8008956C 00802825 */ move $a1, $a0 -/* 08A170 80089570 AFA40020 */ sw $a0, 0x20($sp) -/* 08A174 80089574 000F78C0 */ sll $t7, $t7, 3 -/* 08A178 80089578 AFBF0014 */ sw $ra, 0x14($sp) -/* 08A17C 8008957C 44066000 */ mfc1 $a2, $f12 -/* 08A180 80089580 01F82021 */ addu $a0, $t7, $t8 -/* 08A184 80089584 44077000 */ mfc1 $a3, $f14 -/* 08A188 80089588 0C0224CF */ jal func_8008933C -/* 08A18C 8008958C AFA40018 */ sw $a0, 0x18($sp) -/* 08A190 80089590 3C014010 */ li $at, 0x40100000 # 2.250000 -/* 08A194 80089594 44813800 */ mtc1 $at, $f7 -/* 08A198 80089598 44803000 */ mtc1 $zero, $f6 -/* 08A19C 8008959C 46000121 */ cvt.d.s $f4, $f0 -/* 08A1A0 800895A0 8FA40018 */ lw $a0, 0x18($sp) -/* 08A1A4 800895A4 4624303E */ c.le.d $f6, $f4 -/* 08A1A8 800895A8 00000000 */ nop -/* 08A1AC 800895AC 4502000A */ bc1fl .L800895D8 -/* 08A1B0 800895B0 8FBF0014 */ lw $ra, 0x14($sp) -/* 08A1B4 800895B4 94990000 */ lhu $t9, ($a0) -/* 08A1B8 800895B8 24011000 */ li $at, 4096 -/* 08A1BC 800895BC 93A40027 */ lbu $a0, 0x27($sp) -/* 08A1C0 800895C0 33281000 */ andi $t0, $t9, 0x1000 -/* 08A1C4 800895C4 51010004 */ beql $t0, $at, .L800895D8 -/* 08A1C8 800895C8 8FBF0014 */ lw $ra, 0x14($sp) -/* 08A1CC 800895CC 0C032418 */ jal func_800C9060 -/* 08A1D0 800895D0 8FA50030 */ lw $a1, 0x30($sp) -/* 08A1D4 800895D4 8FBF0014 */ lw $ra, 0x14($sp) -.L800895D8: -/* 08A1D8 800895D8 27BD0020 */ addiu $sp, $sp, 0x20 -/* 08A1DC 800895DC 03E00008 */ jr $ra -/* 08A1E0 800895E0 00000000 */ nop - -/* 08A1E4 800895E4 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 08A1E8 800895E8 AFB00018 */ sw $s0, 0x18($sp) -/* 08A1EC 800895EC AFBF0034 */ sw $ra, 0x34($sp) -/* 08A1F0 800895F0 AFB60030 */ sw $s6, 0x30($sp) -/* 08A1F4 800895F4 AFB20020 */ sw $s2, 0x20($sp) -/* 08A1F8 800895F8 3C10800E */ lui $s0, %hi(gPlayerOne) # $s0, 0x800e -/* 08A1FC 800895FC 00809025 */ move $s2, $a0 -/* 08A200 80089600 AFB5002C */ sw $s5, 0x2c($sp) -/* 08A204 80089604 AFB40028 */ sw $s4, 0x28($sp) -/* 08A208 80089608 AFB30024 */ sw $s3, 0x24($sp) -/* 08A20C 8008960C AFB1001C */ sw $s1, 0x1c($sp) -/* 08A210 80089610 0000B025 */ move $s6, $zero -/* 08A214 80089614 8E10C4DC */ lw $s0, %lo(gPlayerOne)($s0) -/* 08A218 80089618 0C01C88F */ jal func_8007223C -/* 08A21C 8008961C 24050200 */ li $a1, 512 -/* 08A220 80089620 10400021 */ beqz $v0, .L800896A8 -/* 08A224 80089624 3C158019 */ lui $s5, %hi(D_8018D158) # $s5, 0x8019 -/* 08A228 80089628 26B5D158 */ addiu $s5, %lo(D_8018D158) # addiu $s5, $s5, -0x2ea8 -/* 08A22C 8008962C 8EAE0000 */ lw $t6, ($s5) -/* 08A230 80089630 001278C0 */ sll $t7, $s2, 3 -/* 08A234 80089634 01F27823 */ subu $t7, $t7, $s2 -/* 08A238 80089638 19C0001B */ blez $t6, .L800896A8 -/* 08A23C 8008963C 00008825 */ move $s1, $zero -/* 08A240 80089640 3C188016 */ lui $t8, %hi(D_80165C18) # $t8, 0x8016 -/* 08A244 80089644 27185C18 */ addiu $t8, %lo(D_80165C18) # addiu $t8, $t8, 0x5c18 -/* 08A248 80089648 000F7940 */ sll $t7, $t7, 5 -/* 08A24C 8008964C 01F8A021 */ addu $s4, $t7, $t8 -/* 08A250 80089650 3C130400 */ lui $s3, 0x400 -/* 08A254 80089654 869900A6 */ lh $t9, 0xa6($s4) -.L80089658: -/* 08A258 80089658 02402025 */ move $a0, $s2 -/* 08A25C 8008965C 5320000D */ beql $t9, $zero, .L80089694 -/* 08A260 80089660 8EA80000 */ lw $t0, ($s5) -/* 08A264 80089664 0C022346 */ jal func_80088D18 -/* 08A268 80089668 02002825 */ move $a1, $s0 -/* 08A26C 8008966C 10400008 */ beqz $v0, .L80089690 -/* 08A270 80089670 02402025 */ move $a0, $s2 -/* 08A274 80089674 02602825 */ move $a1, $s3 -/* 08A278 80089678 0C01C88F */ jal func_8007223C -/* 08A27C 8008967C 24160001 */ li $s6, 1 -/* 08A280 80089680 50400004 */ beql $v0, $zero, .L80089694 -/* 08A284 80089684 8EA80000 */ lw $t0, ($s5) -/* 08A288 80089688 0C01C860 */ jal func_80072180 -/* 08A28C 8008968C 00000000 */ nop -.L80089690: -/* 08A290 80089690 8EA80000 */ lw $t0, ($s5) -.L80089694: -/* 08A294 80089694 26310001 */ addiu $s1, $s1, 1 -/* 08A298 80089698 26100DD8 */ addiu $s0, $s0, 0xdd8 -/* 08A29C 8008969C 0228082A */ slt $at, $s1, $t0 -/* 08A2A0 800896A0 5420FFED */ bnel $at, $zero, .L80089658 -/* 08A2A4 800896A4 869900A6 */ lh $t9, 0xa6($s4) -.L800896A8: -/* 08A2A8 800896A8 8FBF0034 */ lw $ra, 0x34($sp) -/* 08A2AC 800896AC 02C01025 */ move $v0, $s6 -/* 08A2B0 800896B0 8FB60030 */ lw $s6, 0x30($sp) -/* 08A2B4 800896B4 8FB00018 */ lw $s0, 0x18($sp) -/* 08A2B8 800896B8 8FB1001C */ lw $s1, 0x1c($sp) -/* 08A2BC 800896BC 8FB20020 */ lw $s2, 0x20($sp) -/* 08A2C0 800896C0 8FB30024 */ lw $s3, 0x24($sp) -/* 08A2C4 800896C4 8FB40028 */ lw $s4, 0x28($sp) -/* 08A2C8 800896C8 8FB5002C */ lw $s5, 0x2c($sp) -/* 08A2CC 800896CC 03E00008 */ jr $ra -/* 08A2D0 800896D0 27BD0038 */ addiu $sp, $sp, 0x38 - -/* 08A2D4 800896D4 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 08A2D8 800896D8 AFB00030 */ sw $s0, 0x30($sp) -/* 08A2DC 800896DC F7B80028 */ sdc1 $f24, 0x28($sp) -/* 08A2E0 800896E0 F7B60020 */ sdc1 $f22, 0x20($sp) -/* 08A2E4 800896E4 4485B000 */ mtc1 $a1, $f22 -/* 08A2E8 800896E8 4486C000 */ mtc1 $a2, $f24 -/* 08A2EC 800896EC AFBF004C */ sw $ra, 0x4c($sp) -/* 08A2F0 800896F0 AFB20038 */ sw $s2, 0x38($sp) -/* 08A2F4 800896F4 3C10800E */ lui $s0, %hi(gPlayerOne) # $s0, 0x800e -/* 08A2F8 800896F8 00809025 */ move $s2, $a0 -/* 08A2FC 800896FC AFB60048 */ sw $s6, 0x48($sp) -/* 08A300 80089700 AFB50044 */ sw $s5, 0x44($sp) -/* 08A304 80089704 AFB40040 */ sw $s4, 0x40($sp) -/* 08A308 80089708 AFB3003C */ sw $s3, 0x3c($sp) -/* 08A30C 8008970C AFB10034 */ sw $s1, 0x34($sp) -/* 08A310 80089710 F7B40018 */ sdc1 $f20, 0x18($sp) -/* 08A314 80089714 8E10C4DC */ lw $s0, %lo(gPlayerOne)($s0) -/* 08A318 80089718 0C01C88F */ jal func_8007223C -/* 08A31C 8008971C 24050200 */ li $a1, 512 -/* 08A320 80089720 10400032 */ beqz $v0, .L800897EC -/* 08A324 80089724 3C148019 */ lui $s4, %hi(D_8018D158) # $s4, 0x8019 -/* 08A328 80089728 2694D158 */ addiu $s4, %lo(D_8018D158) # addiu $s4, $s4, -0x2ea8 -/* 08A32C 8008972C 8E8E0000 */ lw $t6, ($s4) -/* 08A330 80089730 001278C0 */ sll $t7, $s2, 3 -/* 08A334 80089734 01F27823 */ subu $t7, $t7, $s2 -/* 08A338 80089738 19C0002C */ blez $t6, .L800897EC -/* 08A33C 8008973C 00008825 */ move $s1, $zero -/* 08A340 80089740 3C188016 */ lui $t8, %hi(D_80165C18) # $t8, 0x8016 -/* 08A344 80089744 27185C18 */ addiu $t8, %lo(D_80165C18) # addiu $t8, $t8, 0x5c18 -/* 08A348 80089748 000F7940 */ sll $t7, $t7, 5 -/* 08A34C 8008974C 3C01800F */ lui $at, %hi(D_800EF4D8) -/* 08A350 80089750 3C158000 */ lui $s5, (0x80000200 >> 16) # lui $s5, 0x8000 -/* 08A354 80089754 36B50200 */ ori $s5, (0x80000200 & 0xFFFF) # ori $s5, $s5, 0x200 -/* 08A358 80089758 D434F4D8 */ ldc1 $f20, %lo(D_800EF4D8)($at) -/* 08A35C 8008975C 01F89821 */ addu $s3, $t7, $t8 -/* 08A360 80089760 3C160400 */ lui $s6, 0x400 -/* 08A364 80089764 867900A6 */ lh $t9, 0xa6($s3) -.L80089768: -/* 08A368 80089768 5320001B */ beql $t9, $zero, .L800897D8 -/* 08A36C 8008976C 8E8A0000 */ lw $t2, ($s4) -/* 08A370 80089770 8E0800BC */ lw $t0, 0xbc($s0) -/* 08A374 80089774 02402025 */ move $a0, $s2 -/* 08A378 80089778 01154824 */ and $t1, $t0, $s5 -/* 08A37C 8008977C 55200016 */ bnel $t1, $zero, .L800897D8 -/* 08A380 80089780 8E8A0000 */ lw $t2, ($s4) -/* 08A384 80089784 0C022346 */ jal func_80088D18 -/* 08A388 80089788 02002825 */ move $a1, $s0 -/* 08A38C 8008978C 50400012 */ beql $v0, $zero, .L800897D8 -/* 08A390 80089790 8E8A0000 */ lw $t2, ($s4) -/* 08A394 80089794 4600C121 */ cvt.d.s $f4, $f24 -/* 08A398 80089798 4406B000 */ mfc1 $a2, $f22 -/* 08A39C 8008979C 46342182 */ mul.d $f6, $f4, $f20 -/* 08A3A0 800897A0 02002025 */ move $a0, $s0 -/* 08A3A4 800897A4 02402825 */ move $a1, $s2 -/* 08A3A8 800897A8 46203220 */ cvt.s.d $f8, $f6 -/* 08A3AC 800897AC 44074000 */ mfc1 $a3, $f8 -/* 08A3B0 800897B0 0C0224CF */ jal func_8008933C -/* 08A3B4 800897B4 00000000 */ nop -/* 08A3B8 800897B8 02402025 */ move $a0, $s2 -/* 08A3BC 800897BC 0C01C88F */ jal func_8007223C -/* 08A3C0 800897C0 02C02825 */ move $a1, $s6 -/* 08A3C4 800897C4 50400004 */ beql $v0, $zero, .L800897D8 -/* 08A3C8 800897C8 8E8A0000 */ lw $t2, ($s4) -/* 08A3CC 800897CC 0C01C860 */ jal func_80072180 -/* 08A3D0 800897D0 00000000 */ nop -/* 08A3D4 800897D4 8E8A0000 */ lw $t2, ($s4) -.L800897D8: -/* 08A3D8 800897D8 26310001 */ addiu $s1, $s1, 1 -/* 08A3DC 800897DC 26100DD8 */ addiu $s0, $s0, 0xdd8 -/* 08A3E0 800897E0 022A082A */ slt $at, $s1, $t2 -/* 08A3E4 800897E4 5420FFE0 */ bnel $at, $zero, .L80089768 -/* 08A3E8 800897E8 867900A6 */ lh $t9, 0xa6($s3) -.L800897EC: -/* 08A3EC 800897EC 8FBF004C */ lw $ra, 0x4c($sp) -/* 08A3F0 800897F0 D7B40018 */ ldc1 $f20, 0x18($sp) -/* 08A3F4 800897F4 D7B60020 */ ldc1 $f22, 0x20($sp) -/* 08A3F8 800897F8 D7B80028 */ ldc1 $f24, 0x28($sp) -/* 08A3FC 800897FC 8FB00030 */ lw $s0, 0x30($sp) -/* 08A400 80089800 8FB10034 */ lw $s1, 0x34($sp) -/* 08A404 80089804 8FB20038 */ lw $s2, 0x38($sp) -/* 08A408 80089808 8FB3003C */ lw $s3, 0x3c($sp) -/* 08A40C 8008980C 8FB40040 */ lw $s4, 0x40($sp) -/* 08A410 80089810 8FB50044 */ lw $s5, 0x44($sp) -/* 08A414 80089814 8FB60048 */ lw $s6, 0x48($sp) -/* 08A418 80089818 03E00008 */ jr $ra -/* 08A41C 8008981C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/non_matchings/code_80086E70/func_80089820.s b/asm/non_matchings/code_80086E70/func_80089820.s deleted file mode 100644 index 21569b0d7..000000000 --- a/asm/non_matchings/code_80086E70/func_80089820.s +++ /dev/null @@ -1,135 +0,0 @@ -.section .late_rodata - -glabel D_800EF4E0 -.double 1.1 - -.section .text - -glabel func_80089820 -/* 08A420 80089820 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* 08A424 80089824 AFB00038 */ sw $s0, 0x38($sp) -/* 08A428 80089828 F7BA0030 */ sdc1 $f26, 0x30($sp) -/* 08A42C 8008982C F7B80028 */ sdc1 $f24, 0x28($sp) -/* 08A430 80089830 4485C000 */ mtc1 $a1, $f24 -/* 08A434 80089834 4486D000 */ mtc1 $a2, $f26 -/* 08A438 80089838 AFBF005C */ sw $ra, 0x5c($sp) -/* 08A43C 8008983C AFBE0058 */ sw $fp, 0x58($sp) -/* 08A440 80089840 AFB20040 */ sw $s2, 0x40($sp) -/* 08A444 80089844 3C10800E */ lui $s0, %hi(gPlayerOne) # $s0, 0x800e -/* 08A448 80089848 00809025 */ move $s2, $a0 -/* 08A44C 8008984C 00E0F025 */ move $fp, $a3 -/* 08A450 80089850 AFB70054 */ sw $s7, 0x54($sp) -/* 08A454 80089854 AFB60050 */ sw $s6, 0x50($sp) -/* 08A458 80089858 AFB5004C */ sw $s5, 0x4c($sp) -/* 08A45C 8008985C AFB40048 */ sw $s4, 0x48($sp) -/* 08A460 80089860 AFB30044 */ sw $s3, 0x44($sp) -/* 08A464 80089864 AFB1003C */ sw $s1, 0x3c($sp) -/* 08A468 80089868 F7B60020 */ sdc1 $f22, 0x20($sp) -/* 08A46C 8008986C F7B40018 */ sdc1 $f20, 0x18($sp) -/* 08A470 80089870 8E10C4DC */ lw $s0, %lo(gPlayerOne)($s0) -/* 08A474 80089874 0C01C87A */ jal func_800721E8 -/* 08A478 80089878 3C050200 */ lui $a1, 0x200 -/* 08A47C 8008987C 02402025 */ move $a0, $s2 -/* 08A480 80089880 0C01C88F */ jal func_8007223C -/* 08A484 80089884 24050200 */ li $a1, 512 -/* 08A488 80089888 1040004E */ beqz $v0, .L800899C4 -/* 08A48C 8008988C 3C148019 */ lui $s4, %hi(D_8018D158) # $s4, 0x8019 -/* 08A490 80089890 2694D158 */ addiu $s4, %lo(D_8018D158) # addiu $s4, $s4, -0x2ea8 -/* 08A494 80089894 8E8E0000 */ lw $t6, ($s4) -/* 08A498 80089898 001278C0 */ sll $t7, $s2, 3 -/* 08A49C 8008989C 01F27823 */ subu $t7, $t7, $s2 -/* 08A4A0 800898A0 19C00048 */ blez $t6, .L800899C4 -/* 08A4A4 800898A4 00008825 */ move $s1, $zero -/* 08A4A8 800898A8 3C188016 */ lui $t8, %hi(D_80165C18) # $t8, 0x8016 -/* 08A4AC 800898AC 3C014010 */ li $at, 0x40100000 # 2.250000 -/* 08A4B0 800898B0 27185C18 */ addiu $t8, %lo(D_80165C18) # addiu $t8, $t8, 0x5c18 -/* 08A4B4 800898B4 000F7940 */ sll $t7, $t7, 5 -/* 08A4B8 800898B8 4481B800 */ mtc1 $at, $f23 -/* 08A4BC 800898BC 4480B000 */ mtc1 $zero, $f22 -/* 08A4C0 800898C0 01F89821 */ addu $s3, $t7, $t8 -/* 08A4C4 800898C4 24171000 */ li $s7, 4096 -/* 08A4C8 800898C8 3C160400 */ lui $s6, 0x400 -/* 08A4CC 800898CC 3C158000 */ lui $s5, 0x8000 -/* 08A4D0 800898D0 867900A6 */ lh $t9, 0xa6($s3) -.L800898D4: -/* 08A4D4 800898D4 53200036 */ beql $t9, $zero, .L800899B0 -/* 08A4D8 800898D8 8E980000 */ lw $t8, ($s4) -/* 08A4DC 800898DC 8E0800BC */ lw $t0, 0xbc($s0) -/* 08A4E0 800898E0 01154824 */ and $t1, $t0, $s5 -/* 08A4E4 800898E4 55200032 */ bnel $t1, $zero, .L800899B0 -/* 08A4E8 800898E8 8E980000 */ lw $t8, ($s4) -/* 08A4EC 800898EC 96020000 */ lhu $v0, ($s0) -/* 08A4F0 800898F0 304A8000 */ andi $t2, $v0, 0x8000 -/* 08A4F4 800898F4 1140002D */ beqz $t2, .L800899AC -/* 08A4F8 800898F8 304B0100 */ andi $t3, $v0, 0x100 -/* 08A4FC 800898FC 1560002B */ bnez $t3, .L800899AC -/* 08A500 80089900 02402025 */ move $a0, $s2 -/* 08A504 80089904 0C022346 */ jal func_80088D18 -/* 08A508 80089908 02002825 */ move $a1, $s0 -/* 08A50C 8008990C 50400028 */ beql $v0, $zero, .L800899B0 -/* 08A510 80089910 8E980000 */ lw $t8, ($s4) -/* 08A514 80089914 8E0C00BC */ lw $t4, 0xbc($s0) -/* 08A518 80089918 02402025 */ move $a0, $s2 -/* 08A51C 8008991C 3C01800F */ lui $at, %hi(D_800EF4E0) -/* 08A520 80089920 318D0200 */ andi $t5, $t4, 0x200 -/* 08A524 80089924 11A00005 */ beqz $t5, .L8008993C -/* 08A528 80089928 00000000 */ nop -/* 08A52C 8008992C 0C01C870 */ jal func_800721C0 -/* 08A530 80089930 3C050200 */ lui $a1, 0x200 -/* 08A534 80089934 1000001E */ b .L800899B0 -/* 08A538 80089938 8E980000 */ lw $t8, ($s4) -.L8008993C: -/* 08A53C 8008993C D426F4E0 */ ldc1 $f6, %lo(D_800EF4E0)($at) -/* 08A540 80089940 4600D121 */ cvt.d.s $f4, $f26 -/* 08A544 80089944 02402025 */ move $a0, $s2 -/* 08A548 80089948 46262202 */ mul.d $f8, $f4, $f6 -/* 08A54C 8008994C 02C02825 */ move $a1, $s6 -/* 08A550 80089950 0C01C88F */ jal func_8007223C -/* 08A554 80089954 46204520 */ cvt.s.d $f20, $f8 -/* 08A558 80089958 50400004 */ beql $v0, $zero, .L8008996C -/* 08A55C 8008995C 4406C000 */ mfc1 $a2, $f24 -/* 08A560 80089960 0C01C860 */ jal func_80072180 -/* 08A564 80089964 00000000 */ nop -/* 08A568 80089968 4406C000 */ mfc1 $a2, $f24 -.L8008996C: -/* 08A56C 8008996C 4407A000 */ mfc1 $a3, $f20 -/* 08A570 80089970 02002025 */ move $a0, $s0 -/* 08A574 80089974 0C0224CF */ jal func_8008933C -/* 08A578 80089978 02402825 */ move $a1, $s2 -/* 08A57C 8008997C 460002A1 */ cvt.d.s $f10, $f0 -/* 08A580 80089980 462AB03E */ c.le.d $f22, $f10 -/* 08A584 80089984 00000000 */ nop -/* 08A588 80089988 45020009 */ bc1fl .L800899B0 -/* 08A58C 8008998C 8E980000 */ lw $t8, ($s4) -/* 08A590 80089990 960E0000 */ lhu $t6, ($s0) -/* 08A594 80089994 322400FF */ andi $a0, $s1, 0xff -/* 08A598 80089998 31CF1000 */ andi $t7, $t6, 0x1000 -/* 08A59C 8008999C 52EF0004 */ beql $s7, $t7, .L800899B0 -/* 08A5A0 800899A0 8E980000 */ lw $t8, ($s4) -/* 08A5A4 800899A4 0C032418 */ jal func_800C9060 -/* 08A5A8 800899A8 03C02825 */ move $a1, $fp -.L800899AC: -/* 08A5AC 800899AC 8E980000 */ lw $t8, ($s4) -.L800899B0: -/* 08A5B0 800899B0 26310001 */ addiu $s1, $s1, 1 -/* 08A5B4 800899B4 26100DD8 */ addiu $s0, $s0, 0xdd8 -/* 08A5B8 800899B8 0238082A */ slt $at, $s1, $t8 -/* 08A5BC 800899BC 5420FFC5 */ bnel $at, $zero, .L800898D4 -/* 08A5C0 800899C0 867900A6 */ lh $t9, 0xa6($s3) -.L800899C4: -/* 08A5C4 800899C4 8FBF005C */ lw $ra, 0x5c($sp) -/* 08A5C8 800899C8 D7B40018 */ ldc1 $f20, 0x18($sp) -/* 08A5CC 800899CC D7B60020 */ ldc1 $f22, 0x20($sp) -/* 08A5D0 800899D0 D7B80028 */ ldc1 $f24, 0x28($sp) -/* 08A5D4 800899D4 D7BA0030 */ ldc1 $f26, 0x30($sp) -/* 08A5D8 800899D8 8FB00038 */ lw $s0, 0x38($sp) -/* 08A5DC 800899DC 8FB1003C */ lw $s1, 0x3c($sp) -/* 08A5E0 800899E0 8FB20040 */ lw $s2, 0x40($sp) -/* 08A5E4 800899E4 8FB30044 */ lw $s3, 0x44($sp) -/* 08A5E8 800899E8 8FB40048 */ lw $s4, 0x48($sp) -/* 08A5EC 800899EC 8FB5004C */ lw $s5, 0x4c($sp) -/* 08A5F0 800899F0 8FB60050 */ lw $s6, 0x50($sp) -/* 08A5F4 800899F4 8FB70054 */ lw $s7, 0x54($sp) -/* 08A5F8 800899F8 8FBE0058 */ lw $fp, 0x58($sp) -/* 08A5FC 800899FC 03E00008 */ jr $ra -/* 08A600 80089A00 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/non_matchings/code_80086E70/func_80089A04.s b/asm/non_matchings/code_80086E70/func_80089A04.s deleted file mode 100644 index 5641c130d..000000000 --- a/asm/non_matchings/code_80086E70/func_80089A04.s +++ /dev/null @@ -1,94 +0,0 @@ -.section .late_rodata - -glabel D_800EF4E8 -.double 1.1 - -.section .text - -glabel func_80089A04 -/* 08A604 80089A04 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 08A608 80089A08 AFB00030 */ sw $s0, 0x30($sp) -/* 08A60C 80089A0C F7B80028 */ sdc1 $f24, 0x28($sp) -/* 08A610 80089A10 F7B60020 */ sdc1 $f22, 0x20($sp) -/* 08A614 80089A14 4485B000 */ mtc1 $a1, $f22 -/* 08A618 80089A18 4486C000 */ mtc1 $a2, $f24 -/* 08A61C 80089A1C AFBF004C */ sw $ra, 0x4c($sp) -/* 08A620 80089A20 AFB20038 */ sw $s2, 0x38($sp) -/* 08A624 80089A24 3C10800E */ lui $s0, %hi(gPlayerOne) # $s0, 0x800e -/* 08A628 80089A28 00809025 */ move $s2, $a0 -/* 08A62C 80089A2C AFB60048 */ sw $s6, 0x48($sp) -/* 08A630 80089A30 AFB50044 */ sw $s5, 0x44($sp) -/* 08A634 80089A34 AFB40040 */ sw $s4, 0x40($sp) -/* 08A638 80089A38 AFB3003C */ sw $s3, 0x3c($sp) -/* 08A63C 80089A3C AFB10034 */ sw $s1, 0x34($sp) -/* 08A640 80089A40 F7B40018 */ sdc1 $f20, 0x18($sp) -/* 08A644 80089A44 8E10C4DC */ lw $s0, %lo(gPlayerOne)($s0) -/* 08A648 80089A48 0C01C88F */ jal func_8007223C -/* 08A64C 80089A4C 24050200 */ li $a1, 512 -/* 08A650 80089A50 10400032 */ beqz $v0, .L80089B1C -/* 08A654 80089A54 3C148019 */ lui $s4, %hi(D_8018D158) # $s4, 0x8019 -/* 08A658 80089A58 2694D158 */ addiu $s4, %lo(D_8018D158) # addiu $s4, $s4, -0x2ea8 -/* 08A65C 80089A5C 8E8E0000 */ lw $t6, ($s4) -/* 08A660 80089A60 001278C0 */ sll $t7, $s2, 3 -/* 08A664 80089A64 01F27823 */ subu $t7, $t7, $s2 -/* 08A668 80089A68 19C0002C */ blez $t6, .L80089B1C -/* 08A66C 80089A6C 00008825 */ move $s1, $zero -/* 08A670 80089A70 3C188016 */ lui $t8, %hi(D_80165C18) # $t8, 0x8016 -/* 08A674 80089A74 27185C18 */ addiu $t8, %lo(D_80165C18) # addiu $t8, $t8, 0x5c18 -/* 08A678 80089A78 000F7940 */ sll $t7, $t7, 5 -/* 08A67C 80089A7C 3C01800F */ lui $at, %hi(D_800EF4E8) -/* 08A680 80089A80 3C158000 */ lui $s5, (0x80000200 >> 16) # lui $s5, 0x8000 -/* 08A684 80089A84 36B50200 */ ori $s5, (0x80000200 & 0xFFFF) # ori $s5, $s5, 0x200 -/* 08A688 80089A88 D434F4E8 */ ldc1 $f20, %lo(D_800EF4E8)($at) -/* 08A68C 80089A8C 01F89821 */ addu $s3, $t7, $t8 -/* 08A690 80089A90 3C160400 */ lui $s6, 0x400 -/* 08A694 80089A94 867900A6 */ lh $t9, 0xa6($s3) -.L80089A98: -/* 08A698 80089A98 5320001B */ beql $t9, $zero, .L80089B08 -/* 08A69C 80089A9C 8E8A0000 */ lw $t2, ($s4) -/* 08A6A0 80089AA0 8E0800BC */ lw $t0, 0xbc($s0) -/* 08A6A4 80089AA4 02402025 */ move $a0, $s2 -/* 08A6A8 80089AA8 01154824 */ and $t1, $t0, $s5 -/* 08A6AC 80089AAC 55200016 */ bnel $t1, $zero, .L80089B08 -/* 08A6B0 80089AB0 8E8A0000 */ lw $t2, ($s4) -/* 08A6B4 80089AB4 0C022369 */ jal func_80088DA4 -/* 08A6B8 80089AB8 02002825 */ move $a1, $s0 -/* 08A6BC 80089ABC 50400012 */ beql $v0, $zero, .L80089B08 -/* 08A6C0 80089AC0 8E8A0000 */ lw $t2, ($s4) -/* 08A6C4 80089AC4 4600C121 */ cvt.d.s $f4, $f24 -/* 08A6C8 80089AC8 4406B000 */ mfc1 $a2, $f22 -/* 08A6CC 80089ACC 46342182 */ mul.d $f6, $f4, $f20 -/* 08A6D0 80089AD0 02002025 */ move $a0, $s0 -/* 08A6D4 80089AD4 02402825 */ move $a1, $s2 -/* 08A6D8 80089AD8 46203220 */ cvt.s.d $f8, $f6 -/* 08A6DC 80089ADC 44074000 */ mfc1 $a3, $f8 -/* 08A6E0 80089AE0 0C0224CF */ jal func_8008933C -/* 08A6E4 80089AE4 00000000 */ nop -/* 08A6E8 80089AE8 02402025 */ move $a0, $s2 -/* 08A6EC 80089AEC 0C01C88F */ jal func_8007223C -/* 08A6F0 80089AF0 02C02825 */ move $a1, $s6 -/* 08A6F4 80089AF4 50400004 */ beql $v0, $zero, .L80089B08 -/* 08A6F8 80089AF8 8E8A0000 */ lw $t2, ($s4) -/* 08A6FC 80089AFC 0C01C860 */ jal func_80072180 -/* 08A700 80089B00 00000000 */ nop -/* 08A704 80089B04 8E8A0000 */ lw $t2, ($s4) -.L80089B08: -/* 08A708 80089B08 26310001 */ addiu $s1, $s1, 1 -/* 08A70C 80089B0C 26100DD8 */ addiu $s0, $s0, 0xdd8 -/* 08A710 80089B10 022A082A */ slt $at, $s1, $t2 -/* 08A714 80089B14 5420FFE0 */ bnel $at, $zero, .L80089A98 -/* 08A718 80089B18 867900A6 */ lh $t9, 0xa6($s3) -.L80089B1C: -/* 08A71C 80089B1C 8FBF004C */ lw $ra, 0x4c($sp) -/* 08A720 80089B20 D7B40018 */ ldc1 $f20, 0x18($sp) -/* 08A724 80089B24 D7B60020 */ ldc1 $f22, 0x20($sp) -/* 08A728 80089B28 D7B80028 */ ldc1 $f24, 0x28($sp) -/* 08A72C 80089B2C 8FB00030 */ lw $s0, 0x30($sp) -/* 08A730 80089B30 8FB10034 */ lw $s1, 0x34($sp) -/* 08A734 80089B34 8FB20038 */ lw $s2, 0x38($sp) -/* 08A738 80089B38 8FB3003C */ lw $s3, 0x3c($sp) -/* 08A73C 80089B3C 8FB40040 */ lw $s4, 0x40($sp) -/* 08A740 80089B40 8FB50044 */ lw $s5, 0x44($sp) -/* 08A744 80089B44 8FB60048 */ lw $s6, 0x48($sp) -/* 08A748 80089B48 03E00008 */ jr $ra -/* 08A74C 80089B4C 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/non_matchings/code_80086E70/func_80089B50.s b/asm/non_matchings/code_80086E70/func_80089B50.s deleted file mode 100644 index e2e1d4226..000000000 --- a/asm/non_matchings/code_80086E70/func_80089B50.s +++ /dev/null @@ -1,96 +0,0 @@ -glabel func_80089B50 -/* 08A750 80089B50 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 08A754 80089B54 AFB00018 */ sw $s0, 0x18($sp) -/* 08A758 80089B58 AFBF003C */ sw $ra, 0x3c($sp) -/* 08A75C 80089B5C AFB30024 */ sw $s3, 0x24($sp) -/* 08A760 80089B60 AFB1001C */ sw $s1, 0x1c($sp) -/* 08A764 80089B64 3C10800E */ lui $s0, %hi(gPlayerOne) # $s0, 0x800e -/* 08A768 80089B68 00809825 */ move $s3, $a0 -/* 08A76C 80089B6C AFBE0038 */ sw $fp, 0x38($sp) -/* 08A770 80089B70 AFB70034 */ sw $s7, 0x34($sp) -/* 08A774 80089B74 AFB60030 */ sw $s6, 0x30($sp) -/* 08A778 80089B78 AFB5002C */ sw $s5, 0x2c($sp) -/* 08A77C 80089B7C AFB40028 */ sw $s4, 0x28($sp) -/* 08A780 80089B80 AFB20020 */ sw $s2, 0x20($sp) -/* 08A784 80089B84 00008825 */ move $s1, $zero -/* 08A788 80089B88 AFA00040 */ sw $zero, 0x40($sp) -/* 08A78C 80089B8C 8E10C4DC */ lw $s0, %lo(gPlayerOne)($s0) -/* 08A790 80089B90 0C01C88F */ jal func_8007223C -/* 08A794 80089B94 24050200 */ li $a1, 512 -/* 08A798 80089B98 1040003B */ beqz $v0, .L80089C88 -/* 08A79C 80089B9C 3C0E8019 */ lui $t6, %hi(D_8018D158) # $t6, 0x8019 -/* 08A7A0 80089BA0 8DCED158 */ lw $t6, %lo(D_8018D158)($t6) -/* 08A7A4 80089BA4 001378C0 */ sll $t7, $s3, 3 -/* 08A7A8 80089BA8 01F37823 */ subu $t7, $t7, $s3 -/* 08A7AC 80089BAC 19C00036 */ blez $t6, .L80089C88 -/* 08A7B0 80089BB0 00009025 */ move $s2, $zero -/* 08A7B4 80089BB4 3C188016 */ lui $t8, %hi(D_80165C18) # $t8, 0x8016 -/* 08A7B8 80089BB8 27185C18 */ addiu $t8, %lo(D_80165C18) # addiu $t8, $t8, 0x5c18 -/* 08A7BC 80089BBC 000F7940 */ sll $t7, $t7, 5 -/* 08A7C0 80089BC0 3C1E1901 */ lui $fp, (0x19018010 >> 16) # lui $fp, 0x1901 -/* 08A7C4 80089BC4 37DE8010 */ ori $fp, (0x19018010 & 0xFFFF) # ori $fp, $fp, 0x8010 -/* 08A7C8 80089BC8 01F8A021 */ addu $s4, $t7, $t8 -/* 08A7CC 80089BCC 3C170400 */ lui $s7, 0x400 -/* 08A7D0 80089BD0 3C160040 */ lui $s6, 0x40 -/* 08A7D4 80089BD4 3C158100 */ lui $s5, 0x8100 -.L80089BD8: -/* 08A7D8 80089BD8 869900A6 */ lh $t9, 0xa6($s4) -/* 08A7DC 80089BDC 13200023 */ beqz $t9, .L80089C6C -/* 08A7E0 80089BE0 00000000 */ nop -/* 08A7E4 80089BE4 8E0800BC */ lw $t0, 0xbc($s0) -/* 08A7E8 80089BE8 01154824 */ and $t1, $t0, $s5 -/* 08A7EC 80089BEC 1520001F */ bnez $t1, .L80089C6C -/* 08A7F0 80089BF0 00000000 */ nop -/* 08A7F4 80089BF4 96020000 */ lhu $v0, ($s0) -/* 08A7F8 80089BF8 304A8000 */ andi $t2, $v0, 0x8000 -/* 08A7FC 80089BFC 1140001B */ beqz $t2, .L80089C6C -/* 08A800 80089C00 304B0100 */ andi $t3, $v0, 0x100 -/* 08A804 80089C04 15600019 */ bnez $t3, .L80089C6C -/* 08A808 80089C08 02602025 */ move $a0, $s3 -/* 08A80C 80089C0C 0C022346 */ jal func_80088D18 -/* 08A810 80089C10 02002825 */ move $a1, $s0 -/* 08A814 80089C14 10400015 */ beqz $v0, .L80089C6C -/* 08A818 80089C18 240C0001 */ li $t4, 1 -/* 08A81C 80089C1C AFAC0040 */ sw $t4, 0x40($sp) -/* 08A820 80089C20 8E0D00BC */ lw $t5, 0xbc($s0) -/* 08A824 80089C24 322400FF */ andi $a0, $s1, 0xff -/* 08A828 80089C28 31AE0200 */ andi $t6, $t5, 0x200 -/* 08A82C 80089C2C 15C0000D */ bnez $t6, .L80089C64 -/* 08A830 80089C30 00000000 */ nop -/* 08A834 80089C34 8E0F000C */ lw $t7, 0xc($s0) -/* 08A838 80089C38 02602025 */ move $a0, $s3 -/* 08A83C 80089C3C 02E02825 */ move $a1, $s7 -/* 08A840 80089C40 01F6C025 */ or $t8, $t7, $s6 -/* 08A844 80089C44 0C01C88F */ jal func_8007223C -/* 08A848 80089C48 AE18000C */ sw $t8, 0xc($s0) -/* 08A84C 80089C4C 10400007 */ beqz $v0, .L80089C6C -/* 08A850 80089C50 00000000 */ nop -/* 08A854 80089C54 0C01C860 */ jal func_80072180 -/* 08A858 80089C58 00000000 */ nop -/* 08A85C 80089C5C 10000003 */ b .L80089C6C -/* 08A860 80089C60 00000000 */ nop -.L80089C64: -/* 08A864 80089C64 0C032418 */ jal func_800C9060 -/* 08A868 80089C68 03C02825 */ move $a1, $fp -.L80089C6C: -/* 08A86C 80089C6C 3C198019 */ lui $t9, %hi(D_8018D158) # $t9, 0x8019 -/* 08A870 80089C70 8F39D158 */ lw $t9, %lo(D_8018D158)($t9) -/* 08A874 80089C74 26520001 */ addiu $s2, $s2, 1 -/* 08A878 80089C78 26100DD8 */ addiu $s0, $s0, 0xdd8 -/* 08A87C 80089C7C 0259082A */ slt $at, $s2, $t9 -/* 08A880 80089C80 1420FFD5 */ bnez $at, .L80089BD8 -/* 08A884 80089C84 26310001 */ addiu $s1, $s1, 1 -.L80089C88: -/* 08A888 80089C88 8FBF003C */ lw $ra, 0x3c($sp) -/* 08A88C 80089C8C 8FA20040 */ lw $v0, 0x40($sp) -/* 08A890 80089C90 8FB00018 */ lw $s0, 0x18($sp) -/* 08A894 80089C94 8FB1001C */ lw $s1, 0x1c($sp) -/* 08A898 80089C98 8FB20020 */ lw $s2, 0x20($sp) -/* 08A89C 80089C9C 8FB30024 */ lw $s3, 0x24($sp) -/* 08A8A0 80089CA0 8FB40028 */ lw $s4, 0x28($sp) -/* 08A8A4 80089CA4 8FB5002C */ lw $s5, 0x2c($sp) -/* 08A8A8 80089CA8 8FB60030 */ lw $s6, 0x30($sp) -/* 08A8AC 80089CAC 8FB70034 */ lw $s7, 0x34($sp) -/* 08A8B0 80089CB0 8FBE0038 */ lw $fp, 0x38($sp) -/* 08A8B4 80089CB4 03E00008 */ jr $ra -/* 08A8B8 80089CB8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/non_matchings/code_80086E70/func_80089CBC.s b/asm/non_matchings/code_80086E70/func_80089CBC.s deleted file mode 100644 index bf4c8038d..000000000 --- a/asm/non_matchings/code_80086E70/func_80089CBC.s +++ /dev/null @@ -1,165 +0,0 @@ -glabel func_80089CBC -/* 08A8BC 80089CBC 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 08A8C0 80089CC0 AFB00020 */ sw $s0, 0x20($sp) -/* 08A8C4 80089CC4 F7B40018 */ sdc1 $f20, 0x18($sp) -/* 08A8C8 80089CC8 4485A000 */ mtc1 $a1, $f20 -/* 08A8CC 80089CCC AFBF0044 */ sw $ra, 0x44($sp) -/* 08A8D0 80089CD0 AFB7003C */ sw $s7, 0x3c($sp) -/* 08A8D4 80089CD4 AFB20028 */ sw $s2, 0x28($sp) -/* 08A8D8 80089CD8 3C10800E */ lui $s0, %hi(gPlayerOne) # $s0, 0x800e -/* 08A8DC 80089CDC 00809025 */ move $s2, $a0 -/* 08A8E0 80089CE0 AFBE0040 */ sw $fp, 0x40($sp) -/* 08A8E4 80089CE4 AFB60038 */ sw $s6, 0x38($sp) -/* 08A8E8 80089CE8 AFB50034 */ sw $s5, 0x34($sp) -/* 08A8EC 80089CEC AFB40030 */ sw $s4, 0x30($sp) -/* 08A8F0 80089CF0 AFB3002C */ sw $s3, 0x2c($sp) -/* 08A8F4 80089CF4 AFB10024 */ sw $s1, 0x24($sp) -/* 08A8F8 80089CF8 0000B825 */ move $s7, $zero -/* 08A8FC 80089CFC 8E10C4DC */ lw $s0, %lo(gPlayerOne)($s0) -/* 08A900 80089D00 0C01C88F */ jal func_8007223C -/* 08A904 80089D04 24050200 */ li $a1, 512 -/* 08A908 80089D08 10400035 */ beqz $v0, .L80089DE0 -/* 08A90C 80089D0C 3C1E8019 */ lui $fp, %hi(D_8018D158) # $fp, 0x8019 -/* 08A910 80089D10 27DED158 */ addiu $fp, %lo(D_8018D158) # addiu $fp, $fp, -0x2ea8 -/* 08A914 80089D14 8FCE0000 */ lw $t6, ($fp) -/* 08A918 80089D18 001278C0 */ sll $t7, $s2, 3 -/* 08A91C 80089D1C 01F27823 */ subu $t7, $t7, $s2 -/* 08A920 80089D20 19C0002F */ blez $t6, .L80089DE0 -/* 08A924 80089D24 00008825 */ move $s1, $zero -/* 08A928 80089D28 3C188016 */ lui $t8, %hi(D_80165C18) # $t8, 0x8016 -/* 08A92C 80089D2C 27185C18 */ addiu $t8, %lo(D_80165C18) # addiu $t8, $t8, 0x5c18 -/* 08A930 80089D30 000F7940 */ sll $t7, $t7, 5 -/* 08A934 80089D34 01F8B021 */ addu $s6, $t7, $t8 -/* 08A938 80089D38 3C150400 */ lui $s5, 0x400 -/* 08A93C 80089D3C 3C140040 */ lui $s4, 0x40 -/* 08A940 80089D40 3C138100 */ lui $s3, 0x8100 -/* 08A944 80089D44 86D900A6 */ lh $t9, 0xa6($s6) -.L80089D48: -/* 08A948 80089D48 53200020 */ beql $t9, $zero, .L80089DCC -/* 08A94C 80089D4C 8FD80000 */ lw $t8, ($fp) -/* 08A950 80089D50 8E0800BC */ lw $t0, 0xbc($s0) -/* 08A954 80089D54 01134824 */ and $t1, $t0, $s3 -/* 08A958 80089D58 5520001C */ bnel $t1, $zero, .L80089DCC -/* 08A95C 80089D5C 8FD80000 */ lw $t8, ($fp) -/* 08A960 80089D60 96020000 */ lhu $v0, ($s0) -/* 08A964 80089D64 304A8000 */ andi $t2, $v0, 0x8000 -/* 08A968 80089D68 11400017 */ beqz $t2, .L80089DC8 -/* 08A96C 80089D6C 304B0100 */ andi $t3, $v0, 0x100 -/* 08A970 80089D70 15600015 */ bnez $t3, .L80089DC8 -/* 08A974 80089D74 02402025 */ move $a0, $s2 -/* 08A978 80089D78 4406A000 */ mfc1 $a2, $f20 -/* 08A97C 80089D7C 0C0223A6 */ jal func_80088E98 -/* 08A980 80089D80 02002825 */ move $a1, $s0 -/* 08A984 80089D84 50400011 */ beql $v0, $zero, .L80089DCC -/* 08A988 80089D88 8FD80000 */ lw $t8, ($fp) -/* 08A98C 80089D8C 8E0C00BC */ lw $t4, 0xbc($s0) -/* 08A990 80089D90 24170001 */ li $s7, 1 -/* 08A994 80089D94 318D0200 */ andi $t5, $t4, 0x200 -/* 08A998 80089D98 55A0000C */ bnel $t5, $zero, .L80089DCC -/* 08A99C 80089D9C 8FD80000 */ lw $t8, ($fp) -/* 08A9A0 80089DA0 8E0E000C */ lw $t6, 0xc($s0) -/* 08A9A4 80089DA4 02402025 */ move $a0, $s2 -/* 08A9A8 80089DA8 02A02825 */ move $a1, $s5 -/* 08A9AC 80089DAC 01D47825 */ or $t7, $t6, $s4 -/* 08A9B0 80089DB0 0C01C88F */ jal func_8007223C -/* 08A9B4 80089DB4 AE0F000C */ sw $t7, 0xc($s0) -/* 08A9B8 80089DB8 50400004 */ beql $v0, $zero, .L80089DCC -/* 08A9BC 80089DBC 8FD80000 */ lw $t8, ($fp) -/* 08A9C0 80089DC0 0C01C860 */ jal func_80072180 -/* 08A9C4 80089DC4 00000000 */ nop -.L80089DC8: -/* 08A9C8 80089DC8 8FD80000 */ lw $t8, ($fp) -.L80089DCC: -/* 08A9CC 80089DCC 26310001 */ addiu $s1, $s1, 1 -/* 08A9D0 80089DD0 26100DD8 */ addiu $s0, $s0, 0xdd8 -/* 08A9D4 80089DD4 0238082A */ slt $at, $s1, $t8 -/* 08A9D8 80089DD8 5420FFDB */ bnel $at, $zero, .L80089D48 -/* 08A9DC 80089DDC 86D900A6 */ lh $t9, 0xa6($s6) -.L80089DE0: -/* 08A9E0 80089DE0 8FBF0044 */ lw $ra, 0x44($sp) -/* 08A9E4 80089DE4 02E01025 */ move $v0, $s7 -/* 08A9E8 80089DE8 8FB7003C */ lw $s7, 0x3c($sp) -/* 08A9EC 80089DEC D7B40018 */ ldc1 $f20, 0x18($sp) -/* 08A9F0 80089DF0 8FB00020 */ lw $s0, 0x20($sp) -/* 08A9F4 80089DF4 8FB10024 */ lw $s1, 0x24($sp) -/* 08A9F8 80089DF8 8FB20028 */ lw $s2, 0x28($sp) -/* 08A9FC 80089DFC 8FB3002C */ lw $s3, 0x2c($sp) -/* 08AA00 80089E00 8FB40030 */ lw $s4, 0x30($sp) -/* 08AA04 80089E04 8FB50034 */ lw $s5, 0x34($sp) -/* 08AA08 80089E08 8FB60038 */ lw $s6, 0x38($sp) -/* 08AA0C 80089E0C 8FBE0040 */ lw $fp, 0x40($sp) -/* 08AA10 80089E10 03E00008 */ jr $ra -/* 08AA14 80089E14 27BD0048 */ addiu $sp, $sp, 0x48 - -/* 08AA18 80089E18 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 08AA1C 80089E1C AFB00018 */ sw $s0, 0x18($sp) -/* 08AA20 80089E20 AFBF0034 */ sw $ra, 0x34($sp) -/* 08AA24 80089E24 AFB60030 */ sw $s6, 0x30($sp) -/* 08AA28 80089E28 AFB40028 */ sw $s4, 0x28($sp) -/* 08AA2C 80089E2C 3C10800E */ lui $s0, %hi(gPlayerOne) # $s0, 0x800e -/* 08AA30 80089E30 0080A025 */ move $s4, $a0 -/* 08AA34 80089E34 AFB5002C */ sw $s5, 0x2c($sp) -/* 08AA38 80089E38 AFB30024 */ sw $s3, 0x24($sp) -/* 08AA3C 80089E3C AFB20020 */ sw $s2, 0x20($sp) -/* 08AA40 80089E40 AFB1001C */ sw $s1, 0x1c($sp) -/* 08AA44 80089E44 0000B025 */ move $s6, $zero -/* 08AA48 80089E48 8E10C4DC */ lw $s0, %lo(gPlayerOne)($s0) -/* 08AA4C 80089E4C 0C01C88F */ jal func_8007223C -/* 08AA50 80089E50 24050200 */ li $a1, 512 -/* 08AA54 80089E54 10400028 */ beqz $v0, .L80089EF8 -/* 08AA58 80089E58 3C158019 */ lui $s5, %hi(D_8018D158) # $s5, 0x8019 -/* 08AA5C 80089E5C 26B5D158 */ addiu $s5, %lo(D_8018D158) # addiu $s5, $s5, -0x2ea8 -/* 08AA60 80089E60 8EAE0000 */ lw $t6, ($s5) -/* 08AA64 80089E64 001478C0 */ sll $t7, $s4, 3 -/* 08AA68 80089E68 01F47823 */ subu $t7, $t7, $s4 -/* 08AA6C 80089E6C 19C00022 */ blez $t6, .L80089EF8 -/* 08AA70 80089E70 00008825 */ move $s1, $zero -/* 08AA74 80089E74 3C188016 */ lui $t8, %hi(D_80165C18) # $t8, 0x8016 -/* 08AA78 80089E78 27185C18 */ addiu $t8, %lo(D_80165C18) # addiu $t8, $t8, 0x5c18 -/* 08AA7C 80089E7C 000F7940 */ sll $t7, $t7, 5 -/* 08AA80 80089E80 3C138000 */ lui $s3, (0x800000C0 >> 16) # lui $s3, 0x8000 -/* 08AA84 80089E84 367300C0 */ ori $s3, (0x800000C0 & 0xFFFF) # ori $s3, $s3, 0xc0 -/* 08AA88 80089E88 01F89021 */ addu $s2, $t7, $t8 -/* 08AA8C 80089E8C 865900A6 */ lh $t9, 0xa6($s2) -.L80089E90: -/* 08AA90 80089E90 53200014 */ beql $t9, $zero, .L80089EE4 -/* 08AA94 80089E94 8EAE0000 */ lw $t6, ($s5) -/* 08AA98 80089E98 8E0800BC */ lw $t0, 0xbc($s0) -/* 08AA9C 80089E9C 02802025 */ move $a0, $s4 -/* 08AAA0 80089EA0 01134824 */ and $t1, $t0, $s3 -/* 08AAA4 80089EA4 5520000F */ bnel $t1, $zero, .L80089EE4 -/* 08AAA8 80089EA8 8EAE0000 */ lw $t6, ($s5) -/* 08AAAC 80089EAC 0C022346 */ jal func_80088D18 -/* 08AAB0 80089EB0 02002825 */ move $a1, $s0 -/* 08AAB4 80089EB4 5040000B */ beql $v0, $zero, .L80089EE4 -/* 08AAB8 80089EB8 8EAE0000 */ lw $t6, ($s5) -/* 08AABC 80089EBC 8E0A00BC */ lw $t2, 0xbc($s0) -/* 08AAC0 80089EC0 314B0200 */ andi $t3, $t2, 0x200 -/* 08AAC4 80089EC4 51600004 */ beql $t3, $zero, .L80089ED8 -/* 08AAC8 80089EC8 8E0C000C */ lw $t4, 0xc($s0) -/* 08AACC 80089ECC 10000004 */ b .L80089EE0 -/* 08AAD0 80089ED0 24160001 */ li $s6, 1 -/* 08AAD4 80089ED4 8E0C000C */ lw $t4, 0xc($s0) -.L80089ED8: -/* 08AAD8 80089ED8 358D0001 */ ori $t5, $t4, 1 -/* 08AADC 80089EDC AE0D000C */ sw $t5, 0xc($s0) -.L80089EE0: -/* 08AAE0 80089EE0 8EAE0000 */ lw $t6, ($s5) -.L80089EE4: -/* 08AAE4 80089EE4 26310001 */ addiu $s1, $s1, 1 -/* 08AAE8 80089EE8 26100DD8 */ addiu $s0, $s0, 0xdd8 -/* 08AAEC 80089EEC 022E082A */ slt $at, $s1, $t6 -/* 08AAF0 80089EF0 5420FFE7 */ bnel $at, $zero, .L80089E90 -/* 08AAF4 80089EF4 865900A6 */ lh $t9, 0xa6($s2) -.L80089EF8: -/* 08AAF8 80089EF8 8FBF0034 */ lw $ra, 0x34($sp) -/* 08AAFC 80089EFC 02C01025 */ move $v0, $s6 -/* 08AB00 80089F00 8FB60030 */ lw $s6, 0x30($sp) -/* 08AB04 80089F04 8FB00018 */ lw $s0, 0x18($sp) -/* 08AB08 80089F08 8FB1001C */ lw $s1, 0x1c($sp) -/* 08AB0C 80089F0C 8FB20020 */ lw $s2, 0x20($sp) -/* 08AB10 80089F10 8FB30024 */ lw $s3, 0x24($sp) -/* 08AB14 80089F14 8FB40028 */ lw $s4, 0x28($sp) -/* 08AB18 80089F18 8FB5002C */ lw $s5, 0x2c($sp) -/* 08AB1C 80089F1C 03E00008 */ jr $ra -/* 08AB20 80089F20 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/non_matchings/code_80086E70/func_80089F24.s b/asm/non_matchings/code_80086E70/func_80089F24.s deleted file mode 100644 index eacef77f0..000000000 --- a/asm/non_matchings/code_80086E70/func_80089F24.s +++ /dev/null @@ -1,85 +0,0 @@ -glabel func_80089F24 -/* 08AB24 80089F24 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 08AB28 80089F28 AFB00018 */ sw $s0, 0x18($sp) -/* 08AB2C 80089F2C AFBF003C */ sw $ra, 0x3c($sp) -/* 08AB30 80089F30 AFB70034 */ sw $s7, 0x34($sp) -/* 08AB34 80089F34 AFB20020 */ sw $s2, 0x20($sp) -/* 08AB38 80089F38 3C10800E */ lui $s0, %hi(gPlayerOne) # $s0, 0x800e -/* 08AB3C 80089F3C 00809025 */ move $s2, $a0 -/* 08AB40 80089F40 AFBE0038 */ sw $fp, 0x38($sp) -/* 08AB44 80089F44 AFB60030 */ sw $s6, 0x30($sp) -/* 08AB48 80089F48 AFB5002C */ sw $s5, 0x2c($sp) -/* 08AB4C 80089F4C AFB40028 */ sw $s4, 0x28($sp) -/* 08AB50 80089F50 AFB30024 */ sw $s3, 0x24($sp) -/* 08AB54 80089F54 AFB1001C */ sw $s1, 0x1c($sp) -/* 08AB58 80089F58 0000B825 */ move $s7, $zero -/* 08AB5C 80089F5C 8E10C4DC */ lw $s0, %lo(gPlayerOne)($s0) -/* 08AB60 80089F60 0C01C88F */ jal func_8007223C -/* 08AB64 80089F64 24050200 */ li $a1, 512 -/* 08AB68 80089F68 10400030 */ beqz $v0, .L8008A02C -/* 08AB6C 80089F6C 3C1E8019 */ lui $fp, %hi(D_8018D158) # $fp, 0x8019 -/* 08AB70 80089F70 27DED158 */ addiu $fp, %lo(D_8018D158) # addiu $fp, $fp, -0x2ea8 -/* 08AB74 80089F74 8FCE0000 */ lw $t6, ($fp) -/* 08AB78 80089F78 001278C0 */ sll $t7, $s2, 3 -/* 08AB7C 80089F7C 01F27823 */ subu $t7, $t7, $s2 -/* 08AB80 80089F80 19C0002A */ blez $t6, .L8008A02C -/* 08AB84 80089F84 00008825 */ move $s1, $zero -/* 08AB88 80089F88 3C188016 */ lui $t8, %hi(D_80165C18) # $t8, 0x8016 -/* 08AB8C 80089F8C 27185C18 */ addiu $t8, %lo(D_80165C18) # addiu $t8, $t8, 0x5c18 -/* 08AB90 80089F90 000F7940 */ sll $t7, $t7, 5 -/* 08AB94 80089F94 3C148000 */ lui $s4, (0x800002C0 >> 16) # lui $s4, 0x8000 -/* 08AB98 80089F98 369402C0 */ ori $s4, (0x800002C0 & 0xFFFF) # ori $s4, $s4, 0x2c0 -/* 08AB9C 80089F9C 01F89821 */ addu $s3, $t7, $t8 -/* 08ABA0 80089FA0 3C160020 */ lui $s6, 0x20 -/* 08ABA4 80089FA4 3C150400 */ lui $s5, 0x400 -/* 08ABA8 80089FA8 867900A6 */ lh $t9, 0xa6($s3) -.L80089FAC: -/* 08ABAC 80089FAC 5320001A */ beql $t9, $zero, .L8008A018 -/* 08ABB0 80089FB0 8FCE0000 */ lw $t6, ($fp) -/* 08ABB4 80089FB4 8E0800BC */ lw $t0, 0xbc($s0) -/* 08ABB8 80089FB8 01144824 */ and $t1, $t0, $s4 -/* 08ABBC 80089FBC 55200016 */ bnel $t1, $zero, .L8008A018 -/* 08ABC0 80089FC0 8FCE0000 */ lw $t6, ($fp) -/* 08ABC4 80089FC4 96020000 */ lhu $v0, ($s0) -/* 08ABC8 80089FC8 304A8000 */ andi $t2, $v0, 0x8000 -/* 08ABCC 80089FCC 11400011 */ beqz $t2, .L8008A014 -/* 08ABD0 80089FD0 304B0100 */ andi $t3, $v0, 0x100 -/* 08ABD4 80089FD4 1560000F */ bnez $t3, .L8008A014 -/* 08ABD8 80089FD8 02402025 */ move $a0, $s2 -/* 08ABDC 80089FDC 0C022346 */ jal func_80088D18 -/* 08ABE0 80089FE0 02002825 */ move $a1, $s0 -/* 08ABE4 80089FE4 1040000B */ beqz $v0, .L8008A014 -/* 08ABE8 80089FE8 02402025 */ move $a0, $s2 -/* 08ABEC 80089FEC 24170001 */ li $s7, 1 -/* 08ABF0 80089FF0 0C01C88F */ jal func_8007223C -/* 08ABF4 80089FF4 02A02825 */ move $a1, $s5 -/* 08ABF8 80089FF8 50400004 */ beql $v0, $zero, .L8008A00C -/* 08ABFC 80089FFC 8E0C000C */ lw $t4, 0xc($s0) -/* 08AC00 8008A000 0C01C860 */ jal func_80072180 -/* 08AC04 8008A004 00000000 */ nop -/* 08AC08 8008A008 8E0C000C */ lw $t4, 0xc($s0) -.L8008A00C: -/* 08AC0C 8008A00C 01966825 */ or $t5, $t4, $s6 -/* 08AC10 8008A010 AE0D000C */ sw $t5, 0xc($s0) -.L8008A014: -/* 08AC14 8008A014 8FCE0000 */ lw $t6, ($fp) -.L8008A018: -/* 08AC18 8008A018 26310001 */ addiu $s1, $s1, 1 -/* 08AC1C 8008A01C 26100DD8 */ addiu $s0, $s0, 0xdd8 -/* 08AC20 8008A020 022E082A */ slt $at, $s1, $t6 -/* 08AC24 8008A024 5420FFE1 */ bnel $at, $zero, .L80089FAC -/* 08AC28 8008A028 867900A6 */ lh $t9, 0xa6($s3) -.L8008A02C: -/* 08AC2C 8008A02C 8FBF003C */ lw $ra, 0x3c($sp) -/* 08AC30 8008A030 02E01025 */ move $v0, $s7 -/* 08AC34 8008A034 8FB70034 */ lw $s7, 0x34($sp) -/* 08AC38 8008A038 8FB00018 */ lw $s0, 0x18($sp) -/* 08AC3C 8008A03C 8FB1001C */ lw $s1, 0x1c($sp) -/* 08AC40 8008A040 8FB20020 */ lw $s2, 0x20($sp) -/* 08AC44 8008A044 8FB30024 */ lw $s3, 0x24($sp) -/* 08AC48 8008A048 8FB40028 */ lw $s4, 0x28($sp) -/* 08AC4C 8008A04C 8FB5002C */ lw $s5, 0x2c($sp) -/* 08AC50 8008A050 8FB60030 */ lw $s6, 0x30($sp) -/* 08AC54 8008A054 8FBE0038 */ lw $fp, 0x38($sp) -/* 08AC58 8008A058 03E00008 */ jr $ra -/* 08AC5C 8008A05C 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/non_matchings/code_80086E70/func_8008B928.s b/asm/non_matchings/code_80086E70/func_8008B928.s deleted file mode 100644 index ec8b5d42a..000000000 --- a/asm/non_matchings/code_80086E70/func_8008B928.s +++ /dev/null @@ -1,71 +0,0 @@ -glabel func_8008B928 -/* 08C528 8008B928 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 08C52C 8008B92C AFA50024 */ sw $a1, 0x24($sp) -/* 08C530 8008B930 AFA60028 */ sw $a2, 0x28($sp) -/* 08C534 8008B934 AFA7002C */ sw $a3, 0x2c($sp) -/* 08C538 8008B938 00057400 */ sll $t6, $a1, 0x10 -/* 08C53C 8008B93C 0006C400 */ sll $t8, $a2, 0x10 -/* 08C540 8008B940 00074400 */ sll $t0, $a3, 0x10 -/* 08C544 8008B944 00083C03 */ sra $a3, $t0, 0x10 -/* 08C548 8008B948 00183403 */ sra $a2, $t8, 0x10 -/* 08C54C 8008B94C 000E2C03 */ sra $a1, $t6, 0x10 -/* 08C550 8008B950 44852000 */ mtc1 $a1, $f4 -/* 08C554 8008B954 44864000 */ mtc1 $a2, $f8 -/* 08C558 8008B958 44878000 */ mtc1 $a3, $f16 -/* 08C55C 8008B95C 000450C0 */ sll $t2, $a0, 3 -/* 08C560 8008B960 468021A0 */ cvt.s.w $f6, $f4 -/* 08C564 8008B964 01445023 */ subu $t2, $t2, $a0 -/* 08C568 8008B968 3C0B8016 */ lui $t3, %hi(D_80165C18) # $t3, 0x8016 -/* 08C56C 8008B96C AFB00014 */ sw $s0, 0x14($sp) -/* 08C570 8008B970 256B5C18 */ addiu $t3, %lo(D_80165C18) # addiu $t3, $t3, 0x5c18 -/* 08C574 8008B974 468042A0 */ cvt.s.w $f10, $f8 -/* 08C578 8008B978 000A5140 */ sll $t2, $t2, 5 -/* 08C57C 8008B97C AFB10018 */ sw $s1, 0x18($sp) -/* 08C580 8008B980 014B8021 */ addu $s0, $t2, $t3 -/* 08C584 8008B984 8FB10030 */ lw $s1, 0x30($sp) -/* 08C588 8008B988 468084A0 */ cvt.s.w $f18, $f16 -/* 08C58C 8008B98C AFBF001C */ sw $ra, 0x1c($sp) -/* 08C590 8008B990 E6060010 */ swc1 $f6, 0x10($s0) -/* 08C594 8008B994 E60A0014 */ swc1 $f10, 0x14($s0) -/* 08C598 8008B998 AE110080 */ sw $s1, 0x80($s0) -/* 08C59C 8008B99C E6120018 */ swc1 $f18, 0x18($s0) -/* 08C5A0 8008B9A0 862D0002 */ lh $t5, 2($s1) -/* 08C5A4 8008B9A4 862C000A */ lh $t4, 0xa($s1) -/* 08C5A8 8008B9A8 018D7023 */ subu $t6, $t4, $t5 -/* 08C5AC 8008B9AC 448E2000 */ mtc1 $t6, $f4 -/* 08C5B0 8008B9B0 00000000 */ nop -/* 08C5B4 8008B9B4 468021A0 */ cvt.s.w $f6, $f4 -/* 08C5B8 8008B9B8 E6060038 */ swc1 $f6, 0x38($s0) -/* 08C5BC 8008B9BC 86380004 */ lh $t8, 4($s1) -/* 08C5C0 8008B9C0 862F000C */ lh $t7, 0xc($s1) -/* 08C5C4 8008B9C4 01F8C823 */ subu $t9, $t7, $t8 -/* 08C5C8 8008B9C8 44994000 */ mtc1 $t9, $f8 -/* 08C5CC 8008B9CC 00000000 */ nop -/* 08C5D0 8008B9D0 468042A0 */ cvt.s.w $f10, $f8 -/* 08C5D4 8008B9D4 E60A003C */ swc1 $f10, 0x3c($s0) -/* 08C5D8 8008B9D8 86290006 */ lh $t1, 6($s1) -/* 08C5DC 8008B9DC 8628000E */ lh $t0, 0xe($s1) -/* 08C5E0 8008B9E0 AFA40020 */ sw $a0, 0x20($sp) -/* 08C5E4 8008B9E4 01095023 */ subu $t2, $t0, $t1 -/* 08C5E8 8008B9E8 448A8000 */ mtc1 $t2, $f16 -/* 08C5EC 8008B9EC 00000000 */ nop -/* 08C5F0 8008B9F0 468084A0 */ cvt.s.w $f18, $f16 -/* 08C5F4 8008B9F4 0C021CDA */ jal func_80087368 -/* 08C5F8 8008B9F8 E6120040 */ swc1 $f18, 0x40($s0) -/* 08C5FC 8008B9FC 00403025 */ move $a2, $v0 -/* 08C600 8008BA00 00063023 */ negu $a2, $a2 -/* 08C604 8008BA04 30CBFFFF */ andi $t3, $a2, 0xffff -/* 08C608 8008BA08 A60200C0 */ sh $v0, 0xc0($s0) -/* 08C60C 8008BA0C 01603025 */ move $a2, $t3 -/* 08C610 8008BA10 C60C0040 */ lwc1 $f12, 0x40($s0) -/* 08C614 8008BA14 0C0105B6 */ jal func_800416D8 -/* 08C618 8008BA18 C60E0038 */ lwc1 $f14, 0x38($s0) -/* 08C61C 8008BA1C E6000040 */ swc1 $f0, 0x40($s0) -/* 08C620 8008BA20 0C021CC9 */ jal func_80087324 -/* 08C624 8008BA24 8FA40020 */ lw $a0, 0x20($sp) -/* 08C628 8008BA28 8FBF001C */ lw $ra, 0x1c($sp) -/* 08C62C 8008BA2C A60200BE */ sh $v0, 0xbe($s0) -/* 08C630 8008BA30 8FB00014 */ lw $s0, 0x14($sp) -/* 08C634 8008BA34 8FB10018 */ lw $s1, 0x18($sp) -/* 08C638 8008BA38 03E00008 */ jr $ra -/* 08C63C 8008BA3C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/non_matchings/hud_renderer/func_80050E34.s b/asm/non_matchings/hud_renderer/func_80050E34.s index da42f30e5..646b93861 100644 --- a/asm/non_matchings/hud_renderer/func_80050E34.s +++ b/asm/non_matchings/hud_renderer/func_80050E34.s @@ -16,7 +16,7 @@ glabel func_80050E34 /* 051A6C 80050E6C 3C108016 */ lui $s0, %hi(gLapCountByPlayerId) # 0x8016 /* 051A70 80050E70 0004C080 */ sll $t8, $a0, 2 /* 051A74 80050E74 0004C940 */ sll $t9, $a0, 5 -/* 051A78 80050E78 3C0D8019 */ lui $t5, %hi(D_8018CE24) # 0x8019 +/* 051A78 80050E78 3C0D8019 */ lui $t5, %hi(D_8018CE10) # 0x8019 /* 051A7C 80050E7C AFBF002C */ sw $ra, 0x2c($sp) /* 051A80 80050E80 AFB10028 */ sw $s1, 0x28($sp) /* 051A84 80050E84 AFA500DC */ sw $a1, 0xdc($sp) @@ -28,7 +28,7 @@ glabel func_80050E34 /* 051A9C 80050E9C 8E104390 */ lw $s0, %lo(gLapCountByPlayerId)($s0) # 0x4390($s0) /* 051AA0 80050EA0 94510254 */ lhu $s1, 0x254($v0) /* 051AA4 80050EA4 15C10004 */ bne $t6, $at, .L80050EB8 -/* 051AA8 80050EA8 8DADCE24 */ lw $t5, %lo(D_8018CE24)($t5) # -0x31dc($t5) +/* 051AA8 80050EA8 8DADCE24 */ lw $t5, %lo(D_8018CE10 + 0x14)($t5) # -0x31dc($t5) /* 051AAC 80050EAC 240F0012 */ li $t7, 18 /* 051AB0 80050EB0 10000003 */ b .L80050EC0 /* 051AB4 80050EB4 AFAF00C4 */ sw $t7, 0xc4($sp) diff --git a/asm/non_matchings/hud_renderer/func_800527D8.s b/asm/non_matchings/hud_renderer/func_800527D8.s deleted file mode 100644 index 60a9e6347..000000000 --- a/asm/non_matchings/hud_renderer/func_800527D8.s +++ /dev/null @@ -1,36 +0,0 @@ -glabel func_800527D8 -/* 0533D8 800527D8 00802825 */ move $a1, $a0 -/* 0533DC 800527DC 3C048018 */ lui $a0, %hi(D_80183EA4) # $a0, 0x8018 -/* 0533E0 800527E0 8C843EA4 */ lw $a0, %lo(D_80183EA4)($a0) -/* 0533E4 800527E4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 0533E8 800527E8 AFBF0014 */ sw $ra, 0x14($sp) -/* 0533EC 800527EC 24065555 */ li $a2, 21845 -/* 0533F0 800527F0 24070320 */ li $a3, 800 -/* 0533F4 800527F4 0C0228D9 */ jal func_8008A364 -/* 0533F8 800527F8 AFA4001C */ sw $a0, 0x1c($sp) -/* 0533FC 800527FC 8FA4001C */ lw $a0, 0x1c($sp) -/* 053400 80052800 0C01C88F */ jal func_8007223C -/* 053404 80052804 3C050004 */ lui $a1, 4 -/* 053408 80052808 10400010 */ beqz $v0, .L8005284C -/* 05340C 8005280C 8FAE001C */ lw $t6, 0x1c($sp) -/* 053410 80052810 000E78C0 */ sll $t7, $t6, 3 -/* 053414 80052814 01EE7823 */ subu $t7, $t7, $t6 -/* 053418 80052818 3C188016 */ lui $t8, %hi(D_80165C18) # $t8, 0x8016 -/* 05341C 8005281C 27185C18 */ addiu $t8, %lo(D_80165C18) # addiu $t8, $t8, 0x5c18 -/* 053420 80052820 000F7940 */ sll $t7, $t7, 5 -/* 053424 80052824 01F81021 */ addu $v0, $t7, $t8 -/* 053428 80052828 845900A6 */ lh $t9, 0xa6($v0) -/* 05342C 8005282C 24440004 */ addiu $a0, $v0, 4 -/* 053430 80052830 244500B2 */ addiu $a1, $v0, 0xb2 -/* 053434 80052834 2B210002 */ slti $at, $t9, 2 -/* 053438 80052838 54200005 */ bnel $at, $zero, .L80052850 -/* 05343C 8005283C 8FBF0014 */ lw $ra, 0x14($sp) -/* 053440 80052840 8C460000 */ lw $a2, ($v0) -/* 053444 80052844 0C010C88 */ jal func_80043220 -/* 053448 80052848 8C470070 */ lw $a3, 0x70($v0) -.L8005284C: -/* 05344C 8005284C 8FBF0014 */ lw $ra, 0x14($sp) -.L80052850: -/* 053450 80052850 27BD0020 */ addiu $sp, $sp, 0x20 -/* 053454 80052854 03E00008 */ jr $ra -/* 053458 80052858 00000000 */ nop diff --git a/asm/non_matchings/hud_renderer/func_80052F20.s b/asm/non_matchings/hud_renderer/func_80052F20.s deleted file mode 100644 index 73580d9b0..000000000 --- a/asm/non_matchings/hud_renderer/func_80052F20.s +++ /dev/null @@ -1,98 +0,0 @@ -glabel func_80052F20 -/* 053B20 80052F20 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 053B24 80052F24 00047880 */ sll $t7, $a0, 2 -/* 053B28 80052F28 01E47823 */ subu $t7, $t7, $a0 -/* 053B2C 80052F2C 3C18800E */ lui $t8, %hi(camera1) # $t8, 0x800e -/* 053B30 80052F30 8F18DB40 */ lw $t8, %lo(camera1)($t8) -/* 053B34 80052F34 000F78C0 */ sll $t7, $t7, 3 -/* 053B38 80052F38 01E47823 */ subu $t7, $t7, $a0 -/* 053B3C 80052F3C AFA40050 */ sw $a0, 0x50($sp) -/* 053B40 80052F40 000F78C0 */ sll $t7, $t7, 3 -/* 053B44 80052F44 AFBF003C */ sw $ra, 0x3c($sp) -/* 053B48 80052F48 3C040600 */ lui $a0, %hi(d_course_frappe_snowland_snow_tlut) # $a0, 0x600 -/* 053B4C 80052F4C 3C050600 */ lui $a1, %hi(d_course_frappe_snowland_snow) # $a1, 0x600 -/* 053B50 80052F50 01F8C821 */ addu $t9, $t7, $t8 -/* 053B54 80052F54 AFBE0038 */ sw $fp, 0x38($sp) -/* 053B58 80052F58 AFB70034 */ sw $s7, 0x34($sp) -/* 053B5C 80052F5C AFB60030 */ sw $s6, 0x30($sp) -/* 053B60 80052F60 AFB5002C */ sw $s5, 0x2c($sp) -/* 053B64 80052F64 AFB40028 */ sw $s4, 0x28($sp) -/* 053B68 80052F68 AFB30024 */ sw $s3, 0x24($sp) -/* 053B6C 80052F6C AFB20020 */ sw $s2, 0x20($sp) -/* 053B70 80052F70 AFB1001C */ sw $s1, 0x1c($sp) -/* 053B74 80052F74 AFB00018 */ sw $s0, 0x18($sp) -/* 053B78 80052F78 AFB90044 */ sw $t9, 0x44($sp) -/* 053B7C 80052F7C 24A56F20 */ addiu $a1, %lo(d_course_frappe_snowland_snow) # addiu $a1, $a1, 0x6f20 -/* 053B80 80052F80 24846D20 */ addiu $a0, %lo(d_course_frappe_snowland_snow_tlut) # addiu $a0, $a0, 0x6d20 -/* 053B84 80052F84 24060020 */ li $a2, 32 -/* 053B88 80052F88 0C011B98 */ jal func_80046E60 -/* 053B8C 80052F8C 24070020 */ li $a3, 32 -/* 053B90 80052F90 3C128019 */ lui $s2, %hi(D_8018C3F0) # $s2, 0x8019 -/* 053B94 80052F94 3C168016 */ lui $s6, %hi(D_80165C18) # $s6, 0x8016 -/* 053B98 80052F98 3C148015 */ lui $s4, %hi(gDisplayListHead) # $s4, 0x8015 -/* 053B9C 80052F9C 26940298 */ addiu $s4, %lo(gDisplayListHead) # addiu $s4, $s4, 0x298 -/* 053BA0 80052FA0 26D65C18 */ addiu $s6, %lo(D_80165C18) # addiu $s6, $s6, 0x5c18 -/* 053BA4 80052FA4 2652C3F0 */ addiu $s2, %lo(D_8018C3F0) # addiu $s2, $s2, -0x3c10 -/* 053BA8 80052FA8 3C1E0004 */ lui $fp, 4 -/* 053BAC 80052FAC 241700E0 */ li $s7, 224 -/* 053BB0 80052FB0 2415FFFF */ li $s5, -1 -/* 053BB4 80052FB4 8E500000 */ lw $s0, ($s2) -.L80052FB8: -/* 053BB8 80052FB8 1215001F */ beq $s0, $s5, .L80053038 -/* 053BBC 80052FBC 00000000 */ nop -/* 053BC0 80052FC0 02170019 */ multu $s0, $s7 -/* 053BC4 80052FC4 02002025 */ move $a0, $s0 -/* 053BC8 80052FC8 8FA50050 */ lw $a1, 0x50($sp) -/* 053BCC 80052FCC 24062AAB */ li $a2, 10923 -/* 053BD0 80052FD0 00004012 */ mflo $t0 -/* 053BD4 80052FD4 02C88821 */ addu $s1, $s6, $t0 -/* 053BD8 80052FD8 862900A6 */ lh $t1, 0xa6($s1) -/* 053BDC 80052FDC 19200016 */ blez $t1, .L80053038 -/* 053BE0 80052FE0 00000000 */ nop -/* 053BE4 80052FE4 0C0228D9 */ jal func_8008A364 -/* 053BE8 80052FE8 240701F4 */ li $a3, 500 -/* 053BEC 80052FEC 02002025 */ move $a0, $s0 -/* 053BF0 80052FF0 0C01C88F */ jal func_8007223C -/* 053BF4 80052FF4 03C02825 */ move $a1, $fp -/* 053BF8 80052FF8 1040000F */ beqz $v0, .L80053038 -/* 053BFC 80052FFC 8FA60044 */ lw $a2, 0x44($sp) -/* 053C00 80053000 3C130D00 */ lui $s3, %hi(D_0D0069E0) # $s3, 0xd00 -/* 053C04 80053004 267369E0 */ addiu $s3, %lo(D_0D0069E0) # addiu $s3, $s3, 0x69e0 -/* 053C08 80053008 C62C0004 */ lwc1 $f12, 4($s1) -/* 053C0C 8005300C 0C01062B */ jal func_800418AC -/* 053C10 80053010 C62E000C */ lwc1 $f14, 0xc($s1) -/* 053C14 80053014 A62200B4 */ sh $v0, 0xb4($s1) -/* 053C18 80053018 0C010C41 */ jal func_80043104 -/* 053C1C 8005301C 02002025 */ move $a0, $s0 -/* 053C20 80053020 8E830000 */ lw $v1, ($s4) -/* 053C24 80053024 3C0B0600 */ lui $t3, 0x600 -/* 053C28 80053028 246A0008 */ addiu $t2, $v1, 8 -/* 053C2C 8005302C AE8A0000 */ sw $t2, ($s4) -/* 053C30 80053030 AC730004 */ sw $s3, 4($v1) -/* 053C34 80053034 AC6B0000 */ sw $t3, ($v1) -.L80053038: -/* 053C38 80053038 3C0C8019 */ lui $t4, %hi(D_8018C5F0) # $t4, 0x8019 -/* 053C3C 8005303C 258CC5F0 */ addiu $t4, %lo(D_8018C5F0) # addiu $t4, $t4, -0x3a10 -/* 053C40 80053040 26520004 */ addiu $s2, $s2, 4 -/* 053C44 80053044 564CFFDC */ bnel $s2, $t4, .L80052FB8 -/* 053C48 80053048 8E500000 */ lw $s0, ($s2) -/* 053C4C 8005304C 8E830000 */ lw $v1, ($s4) -/* 053C50 80053050 3C0F0001 */ lui $t7, (0x00010001 >> 16) # lui $t7, 1 -/* 053C54 80053054 35EF0001 */ ori $t7, (0x00010001 & 0xFFFF) # ori $t7, $t7, 1 -/* 053C58 80053058 246D0008 */ addiu $t5, $v1, 8 -/* 053C5C 8005305C AE8D0000 */ sw $t5, ($s4) -/* 053C60 80053060 3C0EBB00 */ lui $t6, 0xbb00 -/* 053C64 80053064 AC6E0000 */ sw $t6, ($v1) -/* 053C68 80053068 AC6F0004 */ sw $t7, 4($v1) -/* 053C6C 8005306C 8FBF003C */ lw $ra, 0x3c($sp) -/* 053C70 80053070 8FBE0038 */ lw $fp, 0x38($sp) -/* 053C74 80053074 8FB70034 */ lw $s7, 0x34($sp) -/* 053C78 80053078 8FB60030 */ lw $s6, 0x30($sp) -/* 053C7C 8005307C 8FB5002C */ lw $s5, 0x2c($sp) -/* 053C80 80053080 8FB40028 */ lw $s4, 0x28($sp) -/* 053C84 80053084 8FB30024 */ lw $s3, 0x24($sp) -/* 053C88 80053088 8FB20020 */ lw $s2, 0x20($sp) -/* 053C8C 8005308C 8FB1001C */ lw $s1, 0x1c($sp) -/* 053C90 80053090 8FB00018 */ lw $s0, 0x18($sp) -/* 053C94 80053094 03E00008 */ jr $ra -/* 053C98 80053098 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/non_matchings/hud_renderer/func_800532A4.s b/asm/non_matchings/hud_renderer/func_800532A4.s deleted file mode 100644 index f3ff671d1..000000000 --- a/asm/non_matchings/hud_renderer/func_800532A4.s +++ /dev/null @@ -1,137 +0,0 @@ -glabel func_800532A4 -/* 053EA4 800532A4 00803025 */ move $a2, $a0 -/* 053EA8 800532A8 00047080 */ sll $t6, $a0, 2 -/* 053EAC 800532AC 00067880 */ sll $t7, $a2, 2 -/* 053EB0 800532B0 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* 053EB4 800532B4 3C048018 */ lui $a0, %hi(D_80183DB8) # 0x8018 -/* 053EB8 800532B8 01E67823 */ subu $t7, $t7, $a2 -/* 053EBC 800532BC 008E2021 */ addu $a0, $a0, $t6 -/* 053EC0 800532C0 000F78C0 */ sll $t7, $t7, 3 -/* 053EC4 800532C4 3C18800E */ lui $t8, %hi(camera1) # $t8, 0x800e -/* 053EC8 800532C8 8C843DB8 */ lw $a0, %lo(D_80183DB8)($a0) # 0x3db8($a0) -/* 053ECC 800532CC 8F18DB40 */ lw $t8, %lo(camera1)($t8) -/* 053ED0 800532D0 01E67823 */ subu $t7, $t7, $a2 -/* 053ED4 800532D4 AFBF003C */ sw $ra, 0x3c($sp) -/* 053ED8 800532D8 AFB10038 */ sw $s1, 0x38($sp) -/* 053EDC 800532DC 000F78C0 */ sll $t7, $t7, 3 -/* 053EE0 800532E0 AFB00034 */ sw $s0, 0x34($sp) -/* 053EE4 800532E4 AFA60058 */ sw $a2, 0x58($sp) -/* 053EE8 800532E8 24050010 */ li $a1, 16 -/* 053EEC 800532EC AFA40044 */ sw $a0, 0x44($sp) -/* 053EF0 800532F0 0C01C88F */ jal func_8007223C -/* 053EF4 800532F4 01F88821 */ addu $s1, $t7, $t8 -/* 053EF8 800532F8 10400065 */ beqz $v0, .L80053490 -/* 053EFC 800532FC 8FB90044 */ lw $t9, 0x44($sp) -/* 053F00 80053300 001940C0 */ sll $t0, $t9, 3 -/* 053F04 80053304 01194023 */ subu $t0, $t0, $t9 -/* 053F08 80053308 3C098016 */ lui $t1, %hi(D_80165C18) # $t1, 0x8016 -/* 053F0C 8005330C 25295C18 */ addiu $t1, %lo(D_80165C18) # addiu $t1, $t1, 0x5c18 -/* 053F10 80053310 00084140 */ sll $t0, $t0, 5 -/* 053F14 80053314 01098021 */ addu $s0, $t0, $t1 -/* 053F18 80053318 A60000B2 */ sh $zero, 0xb2($s0) -/* 053F1C 8005331C C60C0004 */ lwc1 $f12, 4($s0) -/* 053F20 80053320 C60E000C */ lwc1 $f14, 0xc($s0) -/* 053F24 80053324 0C01062B */ jal func_800418AC -/* 053F28 80053328 02203025 */ move $a2, $s1 -/* 053F2C 8005332C 340A8000 */ li $t2, 32768 -/* 053F30 80053330 A60200B4 */ sh $v0, 0xb4($s0) -/* 053F34 80053334 A60A00B6 */ sh $t2, 0xb6($s0) -/* 053F38 80053338 8FA40044 */ lw $a0, 0x44($sp) -/* 053F3C 8005333C 0C01C8D5 */ jal func_80072354 -/* 053F40 80053340 24050002 */ li $a1, 2 -/* 053F44 80053344 10400017 */ beqz $v0, .L800533A4 -/* 053F48 80053348 26110004 */ addiu $s1, $s0, 4 -/* 053F4C 8005334C 920300DA */ lbu $v1, 0xda($s0) -/* 053F50 80053350 920200D9 */ lbu $v0, 0xd9($s0) -/* 053F54 80053354 8E0B0064 */ lw $t3, 0x64($s0) -/* 053F58 80053358 8E0C0074 */ lw $t4, 0x74($s0) -/* 053F5C 8005335C 26110004 */ addiu $s1, $s0, 4 -/* 053F60 80053360 02202025 */ move $a0, $s1 -/* 053F64 80053364 260500B2 */ addiu $a1, $s0, 0xb2 -/* 053F68 80053368 8E060000 */ lw $a2, ($s0) -/* 053F6C 8005336C 8E070060 */ lw $a3, 0x60($s0) -/* 053F70 80053370 AFA3001C */ sw $v1, 0x1c($sp) -/* 053F74 80053374 AFA20018 */ sw $v0, 0x18($sp) -/* 053F78 80053378 AFA20020 */ sw $v0, 0x20($sp) -/* 053F7C 8005337C AFAB0010 */ sw $t3, 0x10($sp) -/* 053F80 80053380 AFAC0014 */ sw $t4, 0x14($sp) -/* 053F84 80053384 04610003 */ bgez $v1, .L80053394 -/* 053F88 80053388 00036843 */ sra $t5, $v1, 1 -/* 053F8C 8005338C 24610001 */ addiu $at, $v1, 1 -/* 053F90 80053390 00016843 */ sra $t5, $at, 1 -.L80053394: -/* 053F94 80053394 0C01202D */ jal func_800480B4 -/* 053F98 80053398 AFAD0024 */ sw $t5, 0x24($sp) -/* 053F9C 8005339C 10000016 */ b .L800533F8 -/* 053FA0 800533A0 00000000 */ nop -.L800533A4: -/* 053FA4 800533A4 920300DA */ lbu $v1, 0xda($s0) -/* 053FA8 800533A8 920200D9 */ lbu $v0, 0xd9($s0) -/* 053FAC 800533AC 8E0E0060 */ lw $t6, 0x60($s0) -/* 053FB0 800533B0 8E0F0064 */ lw $t7, 0x64($s0) -/* 053FB4 800533B4 8E180074 */ lw $t8, 0x74($s0) -/* 053FB8 800533B8 02202025 */ move $a0, $s1 -/* 053FBC 800533BC 260500B2 */ addiu $a1, $s0, 0xb2 -/* 053FC0 800533C0 8E060000 */ lw $a2, ($s0) -/* 053FC4 800533C4 860700A0 */ lh $a3, 0xa0($s0) -/* 053FC8 800533C8 AFA30020 */ sw $v1, 0x20($sp) -/* 053FCC 800533CC AFA2001C */ sw $v0, 0x1c($sp) -/* 053FD0 800533D0 AFA20024 */ sw $v0, 0x24($sp) -/* 053FD4 800533D4 AFAE0010 */ sw $t6, 0x10($sp) -/* 053FD8 800533D8 AFAF0014 */ sw $t7, 0x14($sp) -/* 053FDC 800533DC AFB80018 */ sw $t8, 0x18($sp) -/* 053FE0 800533E0 04610003 */ bgez $v1, .L800533F0 -/* 053FE4 800533E4 0003C843 */ sra $t9, $v1, 1 -/* 053FE8 800533E8 24610001 */ addiu $at, $v1, 1 -/* 053FEC 800533EC 0001C843 */ sra $t9, $at, 1 -.L800533F0: -/* 053FF0 800533F0 0C012171 */ jal func_800485C4 -/* 053FF4 800533F4 AFB90028 */ sw $t9, 0x28($sp) -.L800533F8: -/* 053FF8 800533F8 3C08800E */ lui $t0, %hi(gScreenModeSelection) # $t0, 0x800e -/* 053FFC 800533FC 8D08C530 */ lw $t0, %lo(gScreenModeSelection)($t0) -/* 054000 80053400 3C028019 */ lui $v0, %hi(D_8018CF14) # $v0, 0x8019 -/* 054004 80053404 55000023 */ bnel $t0, $zero, .L80053494 -/* 054008 80053408 8FBF003C */ lw $ra, 0x3c($sp) -/* 05400C 8005340C 8C42CF14 */ lw $v0, %lo(D_8018CF14)($v0) -/* 054010 80053410 C6040004 */ lwc1 $f4, 4($s0) -/* 054014 80053414 44806000 */ mtc1 $zero, $f12 -/* 054018 80053418 C4460000 */ lwc1 $f6, ($v0) -/* 05401C 8005341C 8FA90058 */ lw $t1, 0x58($sp) -/* 054020 80053420 C608000C */ lwc1 $f8, 0xc($s0) -/* 054024 80053424 46062001 */ sub.s $f0, $f4, $f6 -/* 054028 80053428 C44A0008 */ lwc1 $f10, 8($v0) -/* 05402C 8005342C 3C0B8019 */ lui $t3, %hi(D_8018C0B0) # $t3, 0x8019 -/* 054030 80053430 256BC0B0 */ addiu $t3, %lo(D_8018C0B0) # addiu $t3, $t3, -0x3f50 -/* 054034 80053434 460C003C */ c.lt.s $f0, $f12 -/* 054038 80053438 00095180 */ sll $t2, $t1, 6 -/* 05403C 8005343C 014B2021 */ addu $a0, $t2, $t3 -/* 054040 80053440 02202825 */ move $a1, $s1 -/* 054044 80053444 45000002 */ bc1f .L80053450 -/* 054048 80053448 460A4081 */ sub.s $f2, $f8, $f10 -/* 05404C 8005344C 46000007 */ neg.s $f0, $f0 -.L80053450: -/* 054050 80053450 460C103C */ c.lt.s $f2, $f12 -/* 054054 80053454 3C063EB3 */ lui $a2, (0x3EB33333 >> 16) # lui $a2, 0x3eb3 -/* 054058 80053458 45020003 */ bc1fl .L80053468 -/* 05405C 8005345C 46020480 */ add.s $f18, $f0, $f2 -/* 054060 80053460 46001087 */ neg.s $f2, $f2 -/* 054064 80053464 46020480 */ add.s $f18, $f0, $f2 -.L80053468: -/* 054068 80053468 3C014069 */ li $at, 0x40690000 # 3.640625 -/* 05406C 8005346C 44818800 */ mtc1 $at, $f17 -/* 054070 80053470 44808000 */ mtc1 $zero, $f16 -/* 054074 80053474 46009121 */ cvt.d.s $f4, $f18 -/* 054078 80053478 4630203E */ c.le.d $f4, $f16 -/* 05407C 8005347C 00000000 */ nop -/* 054080 80053480 45020004 */ bc1fl .L80053494 -/* 054084 80053484 8FBF003C */ lw $ra, 0x3c($sp) -/* 054088 80053488 0C01298C */ jal func_8004A630 -/* 05408C 8005348C 34C63333 */ ori $a2, (0x3EB33333 & 0xFFFF) # ori $a2, $a2, 0x3333 -.L80053490: -/* 054090 80053490 8FBF003C */ lw $ra, 0x3c($sp) -.L80053494: -/* 054094 80053494 8FB00034 */ lw $s0, 0x34($sp) -/* 054098 80053498 8FB10038 */ lw $s1, 0x38($sp) -/* 05409C 8005349C 03E00008 */ jr $ra -/* 0540A0 800534A0 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/non_matchings/hud_renderer/func_80054664.s b/asm/non_matchings/hud_renderer/func_80054664.s deleted file mode 100644 index 4f23c8654..000000000 --- a/asm/non_matchings/hud_renderer/func_80054664.s +++ /dev/null @@ -1,73 +0,0 @@ -glabel func_80054664 -/* 055264 80054664 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 055268 80054668 3C078015 */ lui $a3, %hi(gDisplayListHead) # $a3, 0x8015 -/* 05526C 8005466C 24E70298 */ addiu $a3, %lo(gDisplayListHead) # addiu $a3, $a3, 0x298 -/* 055270 80054670 8CE30000 */ lw $v1, ($a3) -/* 055274 80054674 AFBF002C */ sw $ra, 0x2c($sp) -/* 055278 80054678 AFB50028 */ sw $s5, 0x28($sp) -/* 05527C 8005467C 246E0008 */ addiu $t6, $v1, 8 -/* 055280 80054680 AFB40024 */ sw $s4, 0x24($sp) -/* 055284 80054684 AFB30020 */ sw $s3, 0x20($sp) -/* 055288 80054688 AFB2001C */ sw $s2, 0x1c($sp) -/* 05528C 8005468C AFB10018 */ sw $s1, 0x18($sp) -/* 055290 80054690 AFB00014 */ sw $s0, 0x14($sp) -/* 055294 80054694 ACEE0000 */ sw $t6, ($a3) -/* 055298 80054698 3C180D00 */ lui $t8, %hi(D_0D007AE0) # $t8, 0xd00 -/* 05529C 8005469C 27187AE0 */ addiu $t8, %lo(D_0D007AE0) # addiu $t8, $t8, 0x7ae0 -/* 0552A0 800546A0 3C0F0600 */ lui $t7, 0x600 -/* 0552A4 800546A4 3C198016 */ lui $t9, %hi(D_80165598) # $t9, 0x8016 -/* 0552A8 800546A8 AC6F0000 */ sw $t7, ($v1) -/* 0552AC 800546AC AC780004 */ sw $t8, 4($v1) -/* 0552B0 800546B0 8F395598 */ lw $t9, %lo(D_80165598)($t9) -/* 0552B4 800546B4 3C090D03 */ lui $t1, %hi(D_0D02BC58) # $t1, 0xd03 -/* 0552B8 800546B8 0080A825 */ move $s5, $a0 -/* 0552BC 800546BC 2529BC58 */ addiu $t1, %lo(D_0D02BC58) # addiu $t1, $t1, -0x43a8 -/* 0552C0 800546C0 00194280 */ sll $t0, $t9, 0xa -/* 0552C4 800546C4 01092021 */ addu $a0, $t0, $t1 -/* 0552C8 800546C8 24050020 */ li $a1, 32 -/* 0552CC 800546CC 0C0111DF */ jal func_8004477C -/* 0552D0 800546D0 24060020 */ li $a2, 32 -/* 0552D4 800546D4 00002025 */ move $a0, $zero -/* 0552D8 800546D8 00002825 */ move $a1, $zero -/* 0552DC 800546DC 00003025 */ move $a2, $zero -/* 0552E0 800546E0 0C012D05 */ jal func_8004B414 -/* 0552E4 800546E4 240700FF */ li $a3, 255 -/* 0552E8 800546E8 3C038018 */ lui $v1, %hi(D_80183E80) # $v1, 0x8018 -/* 0552EC 800546EC 24633E80 */ addiu $v1, %lo(D_80183E80) # addiu $v1, $v1, 0x3e80 -/* 0552F0 800546F0 340A8000 */ li $t2, 32768 -/* 0552F4 800546F4 3C108019 */ lui $s0, %hi(D_8018C1B0) # $s0, 0x8019 -/* 0552F8 800546F8 3C148019 */ lui $s4, %hi(D_8018C3B0) # $s4, 0x8019 -/* 0552FC 800546FC 3C128016 */ lui $s2, %hi(D_80165C18) # $s2, 0x8016 -/* 055300 80054700 A4600000 */ sh $zero, ($v1) -/* 055304 80054704 A46A0004 */ sh $t2, 4($v1) -/* 055308 80054708 26525C18 */ addiu $s2, %lo(D_80165C18) # addiu $s2, $s2, 0x5c18 -/* 05530C 8005470C 2694C3B0 */ addiu $s4, %lo(D_8018C3B0) # addiu $s4, $s4, -0x3c50 -/* 055310 80054710 2610C1B0 */ addiu $s0, %lo(D_8018C1B0) # addiu $s0, $s0, -0x3e50 -/* 055314 80054714 241300E0 */ li $s3, 224 -/* 055318 80054718 2411FFFF */ li $s1, -1 -/* 05531C 8005471C 8E040000 */ lw $a0, ($s0) -.L80054720: -/* 055320 80054720 5091000B */ beql $a0, $s1, .L80054750 -/* 055324 80054724 26100004 */ addiu $s0, $s0, 4 -/* 055328 80054728 00930019 */ multu $a0, $s3 -/* 05532C 8005472C 00005812 */ mflo $t3 -/* 055330 80054730 024B6021 */ addu $t4, $s2, $t3 -/* 055334 80054734 858D00A6 */ lh $t5, 0xa6($t4) -/* 055338 80054738 29A10003 */ slti $at, $t5, 3 -/* 05533C 8005473C 54200004 */ bnel $at, $zero, .L80054750 -/* 055340 80054740 26100004 */ addiu $s0, $s0, 4 -/* 055344 80054744 0C01515F */ jal func_8005457C -/* 055348 80054748 02A02825 */ move $a1, $s5 -/* 05534C 8005474C 26100004 */ addiu $s0, $s0, 4 -.L80054750: -/* 055350 80054750 5614FFF3 */ bnel $s0, $s4, .L80054720 -/* 055354 80054754 8E040000 */ lw $a0, ($s0) -/* 055358 80054758 8FBF002C */ lw $ra, 0x2c($sp) -/* 05535C 8005475C 8FB00014 */ lw $s0, 0x14($sp) -/* 055360 80054760 8FB10018 */ lw $s1, 0x18($sp) -/* 055364 80054764 8FB2001C */ lw $s2, 0x1c($sp) -/* 055368 80054768 8FB30020 */ lw $s3, 0x20($sp) -/* 05536C 8005476C 8FB40024 */ lw $s4, 0x24($sp) -/* 055370 80054770 8FB50028 */ lw $s5, 0x28($sp) -/* 055374 80054774 03E00008 */ jr $ra -/* 055378 80054778 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/non_matchings/hud_renderer/func_80054938.s b/asm/non_matchings/hud_renderer/func_80054938.s deleted file mode 100644 index 1485b1c88..000000000 --- a/asm/non_matchings/hud_renderer/func_80054938.s +++ /dev/null @@ -1,118 +0,0 @@ -glabel func_80054938 -/* 055538 80054938 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* 05553C 8005493C 3C078015 */ lui $a3, %hi(gDisplayListHead) # $a3, 0x8015 -/* 055540 80054940 00047080 */ sll $t6, $a0, 2 -/* 055544 80054944 24E70298 */ addiu $a3, %lo(gDisplayListHead) # addiu $a3, $a3, 0x298 -/* 055548 80054948 01C47023 */ subu $t6, $t6, $a0 -/* 05554C 8005494C 3C0F800E */ lui $t7, %hi(camera1) # $t7, 0x800e -/* 055550 80054950 8DEFDB40 */ lw $t7, %lo(camera1)($t7) -/* 055554 80054954 8CE30000 */ lw $v1, ($a3) -/* 055558 80054958 000E70C0 */ sll $t6, $t6, 3 -/* 05555C 8005495C 01C47023 */ subu $t6, $t6, $a0 -/* 055560 80054960 000E70C0 */ sll $t6, $t6, 3 -/* 055564 80054964 01CFC021 */ addu $t8, $t6, $t7 -/* 055568 80054968 24790008 */ addiu $t9, $v1, 8 -/* 05556C 8005496C AFBF004C */ sw $ra, 0x4c($sp) -/* 055570 80054970 AFBE0048 */ sw $fp, 0x48($sp) -/* 055574 80054974 AFB70044 */ sw $s7, 0x44($sp) -/* 055578 80054978 AFB60040 */ sw $s6, 0x40($sp) -/* 05557C 8005497C AFB5003C */ sw $s5, 0x3c($sp) -/* 055580 80054980 AFB40038 */ sw $s4, 0x38($sp) -/* 055584 80054984 AFB30034 */ sw $s3, 0x34($sp) -/* 055588 80054988 AFB20030 */ sw $s2, 0x30($sp) -/* 05558C 8005498C AFB1002C */ sw $s1, 0x2c($sp) -/* 055590 80054990 AFB00028 */ sw $s0, 0x28($sp) -/* 055594 80054994 AFB80054 */ sw $t8, 0x54($sp) -/* 055598 80054998 ACF90000 */ sw $t9, ($a3) -/* 05559C 8005499C 3C090D00 */ lui $t1, %hi(D_0D007AE0) # $t1, 0xd00 -/* 0555A0 800549A0 25297AE0 */ addiu $t1, %lo(D_0D007AE0) # addiu $t1, $t1, 0x7ae0 -/* 0555A4 800549A4 3C080600 */ lui $t0, 0x600 -/* 0555A8 800549A8 3C0A8016 */ lui $t2, %hi(D_80165598) # $t2, 0x8016 -/* 0555AC 800549AC AC680000 */ sw $t0, ($v1) -/* 0555B0 800549B0 AC690004 */ sw $t1, 4($v1) -/* 0555B4 800549B4 8D4A5598 */ lw $t2, %lo(D_80165598)($t2) -/* 0555B8 800549B8 3C0C0D03 */ lui $t4, %hi(D_0D02BC58) # $t4, 0xd03 -/* 0555BC 800549BC 00809825 */ move $s3, $a0 -/* 0555C0 800549C0 258CBC58 */ addiu $t4, %lo(D_0D02BC58) # addiu $t4, $t4, -0x43a8 -/* 0555C4 800549C4 000A5A80 */ sll $t3, $t2, 0xa -/* 0555C8 800549C8 016C2021 */ addu $a0, $t3, $t4 -/* 0555CC 800549CC 24050020 */ li $a1, 32 -/* 0555D0 800549D0 0C0111DF */ jal func_8004477C -/* 0555D4 800549D4 24060020 */ li $a2, 32 -/* 0555D8 800549D8 240D00FF */ li $t5, 255 -/* 0555DC 800549DC 240E00FF */ li $t6, 255 -/* 0555E0 800549E0 240F00FF */ li $t7, 255 -/* 0555E4 800549E4 AFAF0018 */ sw $t7, 0x18($sp) -/* 0555E8 800549E8 AFAE0014 */ sw $t6, 0x14($sp) -/* 0555EC 800549EC AFAD0010 */ sw $t5, 0x10($sp) -/* 0555F0 800549F0 240400FF */ li $a0, 255 -/* 0555F4 800549F4 240500FF */ li $a1, 255 -/* 0555F8 800549F8 240600FF */ li $a2, 255 -/* 0555FC 800549FC 0C012DCB */ jal func_8004B72C -/* 055600 80054A00 240700FF */ li $a3, 255 -/* 055604 80054A04 3C038018 */ lui $v1, %hi(D_80183E80) # $v1, 0x8018 -/* 055608 80054A08 24633E80 */ addiu $v1, %lo(D_80183E80) # addiu $v1, $v1, 0x3e80 -/* 05560C 80054A0C 34188000 */ li $t8, 32768 -/* 055610 80054A10 3C128019 */ lui $s2, %hi(D_8018C870) # $s2, 0x8019 -/* 055614 80054A14 3C158016 */ lui $s5, %hi(D_80165C18) # $s5, 0x8016 -/* 055618 80054A18 A4600000 */ sh $zero, ($v1) -/* 05561C 80054A1C A4780004 */ sh $t8, 4($v1) -/* 055620 80054A20 26B55C18 */ addiu $s5, %lo(D_80165C18) # addiu $s5, $s5, 0x5c18 -/* 055624 80054A24 2652C870 */ addiu $s2, %lo(D_8018C870) # addiu $s2, $s2, -0x3790 -/* 055628 80054A28 3C1E0004 */ lui $fp, 4 -/* 05562C 80054A2C 24170003 */ li $s7, 3 -/* 055630 80054A30 241600E0 */ li $s6, 224 -/* 055634 80054A34 2414FFFF */ li $s4, -1 -/* 055638 80054A38 8E500000 */ lw $s0, ($s2) -.L80054A3C: -/* 05563C 80054A3C 1214001E */ beq $s0, $s4, .L80054AB8 -/* 055640 80054A40 00000000 */ nop -/* 055644 80054A44 02160019 */ multu $s0, $s6 -/* 055648 80054A48 0000C812 */ mflo $t9 -/* 05564C 80054A4C 02B98821 */ addu $s1, $s5, $t9 -/* 055650 80054A50 862800A6 */ lh $t0, 0xa6($s1) -/* 055654 80054A54 29010002 */ slti $at, $t0, 2 -/* 055658 80054A58 14200017 */ bnez $at, .L80054AB8 -/* 05565C 80054A5C 00000000 */ nop -/* 055660 80054A60 922900D8 */ lbu $t1, 0xd8($s1) -/* 055664 80054A64 02002025 */ move $a0, $s0 -/* 055668 80054A68 02602825 */ move $a1, $s3 -/* 05566C 80054A6C 16E90008 */ bne $s7, $t1, .L80054A90 -/* 055670 80054A70 24064000 */ li $a2, 16384 -/* 055674 80054A74 02002025 */ move $a0, $s0 -/* 055678 80054A78 02602825 */ move $a1, $s3 -/* 05567C 80054A7C 24064000 */ li $a2, 16384 -/* 055680 80054A80 0C0228D9 */ jal func_8008A364 -/* 055684 80054A84 24070514 */ li $a3, 1300 -/* 055688 80054A88 10000004 */ b .L80054A9C -/* 05568C 80054A8C 02002025 */ move $a0, $s0 -.L80054A90: -/* 055690 80054A90 0C0228D9 */ jal func_8008A364 -/* 055694 80054A94 240701F4 */ li $a3, 500 -/* 055698 80054A98 02002025 */ move $a0, $s0 -.L80054A9C: -/* 05569C 80054A9C 0C01C88F */ jal func_8007223C -/* 0556A0 80054AA0 03C02825 */ move $a1, $fp -/* 0556A4 80054AA4 10400004 */ beqz $v0, .L80054AB8 -/* 0556A8 80054AA8 02002025 */ move $a0, $s0 -/* 0556AC 80054AAC 922500D8 */ lbu $a1, 0xd8($s1) -/* 0556B0 80054AB0 0C0151DF */ jal func_8005477C -/* 0556B4 80054AB4 8FA60054 */ lw $a2, 0x54($sp) -.L80054AB8: -/* 0556B8 80054AB8 3C0A8019 */ lui $t2, %hi(D_8018C970) # $t2, 0x8019 -/* 0556BC 80054ABC 254AC970 */ addiu $t2, %lo(D_8018C970) # addiu $t2, $t2, -0x3690 -/* 0556C0 80054AC0 26520004 */ addiu $s2, $s2, 4 -/* 0556C4 80054AC4 564AFFDD */ bnel $s2, $t2, .L80054A3C -/* 0556C8 80054AC8 8E500000 */ lw $s0, ($s2) -/* 0556CC 80054ACC 8FBF004C */ lw $ra, 0x4c($sp) -/* 0556D0 80054AD0 8FB00028 */ lw $s0, 0x28($sp) -/* 0556D4 80054AD4 8FB1002C */ lw $s1, 0x2c($sp) -/* 0556D8 80054AD8 8FB20030 */ lw $s2, 0x30($sp) -/* 0556DC 80054ADC 8FB30034 */ lw $s3, 0x34($sp) -/* 0556E0 80054AE0 8FB40038 */ lw $s4, 0x38($sp) -/* 0556E4 80054AE4 8FB5003C */ lw $s5, 0x3c($sp) -/* 0556E8 80054AE8 8FB60040 */ lw $s6, 0x40($sp) -/* 0556EC 80054AEC 8FB70044 */ lw $s7, 0x44($sp) -/* 0556F0 80054AF0 8FBE0048 */ lw $fp, 0x48($sp) -/* 0556F4 80054AF4 03E00008 */ jr $ra -/* 0556F8 80054AF8 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/non_matchings/hud_renderer/func_80055164.s b/asm/non_matchings/hud_renderer/func_80055164.s deleted file mode 100644 index 4f1022b6d..000000000 --- a/asm/non_matchings/hud_renderer/func_80055164.s +++ /dev/null @@ -1,52 +0,0 @@ -glabel func_80055164 -/* 055D64 80055164 000470C0 */ sll $t6, $a0, 3 -/* 055D68 80055168 01C47023 */ subu $t6, $t6, $a0 -/* 055D6C 8005516C 3C0F8016 */ lui $t7, %hi(D_80165C18) # $t7, 0x8016 -/* 055D70 80055170 25EF5C18 */ addiu $t7, %lo(D_80165C18) # addiu $t7, $t7, 0x5c18 -/* 055D74 80055174 000E7140 */ sll $t6, $t6, 5 -/* 055D78 80055178 01CF1821 */ addu $v1, $t6, $t7 -/* 055D7C 8005517C 847800A6 */ lh $t8, 0xa6($v1) -/* 055D80 80055180 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 055D84 80055184 AFBF0014 */ sw $ra, 0x14($sp) -/* 055D88 80055188 2B010002 */ slti $at, $t8, 2 -/* 055D8C 8005518C 14200022 */ bnez $at, .L80055218 -/* 055D90 80055190 3C088015 */ lui $t0, %hi(gDisplayListHead) # $t0, 0x8015 -/* 055D94 80055194 25080298 */ addiu $t0, %lo(gDisplayListHead) # addiu $t0, $t0, 0x298 -/* 055D98 80055198 8D070000 */ lw $a3, ($t0) -/* 055D9C 8005519C 3C0A0D00 */ lui $t2, %hi(D_0D0077A0) # $t2, 0xd00 -/* 055DA0 800551A0 254A77A0 */ addiu $t2, %lo(D_0D0077A0) # addiu $t2, $t2, 0x77a0 -/* 055DA4 800551A4 24F90008 */ addiu $t9, $a3, 8 -/* 055DA8 800551A8 AD190000 */ sw $t9, ($t0) -/* 055DAC 800551AC 3C090600 */ lui $t1, 0x600 -/* 055DB0 800551B0 ACE90000 */ sw $t1, ($a3) -/* 055DB4 800551B4 ACEA0004 */ sw $t2, 4($a3) -/* 055DB8 800551B8 AFA30018 */ sw $v1, 0x18($sp) -/* 055DBC 800551BC 8C660000 */ lw $a2, ($v1) -/* 055DC0 800551C0 24640004 */ addiu $a0, $v1, 4 -/* 055DC4 800551C4 0C010B80 */ jal func_80042E00 -/* 055DC8 800551C8 246500BE */ addiu $a1, $v1, 0xbe -/* 055DCC 800551CC 3C0B800E */ lui $t3, %hi(gIsGamePaused) # $t3, 0x800e -/* 055DD0 800551D0 956BC5FC */ lhu $t3, %lo(gIsGamePaused)($t3) -/* 055DD4 800551D4 8FA30018 */ lw $v1, 0x18($sp) -/* 055DD8 800551D8 00003025 */ move $a2, $zero -/* 055DDC 800551DC 5560000B */ bnel $t3, $zero, .L8005520C -/* 055DE0 800551E0 8C640070 */ lw $a0, 0x70($v1) -/* 055DE4 800551E4 8C640070 */ lw $a0, 0x70($v1) -/* 055DE8 800551E8 8C650074 */ lw $a1, 0x74($v1) -/* 055DEC 800551EC 00003025 */ move $a2, $zero -/* 055DF0 800551F0 846700A2 */ lh $a3, 0xa2($v1) -/* 055DF4 800551F4 0C00137F */ jal func_80004DFC -/* 055DF8 800551F8 AFA30018 */ sw $v1, 0x18($sp) -/* 055DFC 800551FC 8FA30018 */ lw $v1, 0x18($sp) -/* 055E00 80055200 10000005 */ b .L80055218 -/* 055E04 80055204 A46200A2 */ sh $v0, 0xa2($v1) -/* 055E08 80055208 8C640070 */ lw $a0, 0x70($v1) -.L8005520C: -/* 055E0C 8005520C 8C650074 */ lw $a1, 0x74($v1) -/* 055E10 80055210 0C00137F */ jal func_80004DFC -/* 055E14 80055214 846700A2 */ lh $a3, 0xa2($v1) -.L80055218: -/* 055E18 80055218 8FBF0014 */ lw $ra, 0x14($sp) -/* 055E1C 8005521C 27BD0020 */ addiu $sp, $sp, 0x20 -/* 055E20 80055220 03E00008 */ jr $ra -/* 055E24 80055224 00000000 */ nop diff --git a/asm/non_matchings/hud_renderer/func_80055228.s b/asm/non_matchings/hud_renderer/func_80055228.s deleted file mode 100644 index 451c3848a..000000000 --- a/asm/non_matchings/hud_renderer/func_80055228.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_80055228 -/* 055E28 80055228 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 055E2C 8005522C AFB40028 */ sw $s4, 0x28($sp) -/* 055E30 80055230 AFB1001C */ sw $s1, 0x1c($sp) -/* 055E34 80055234 AFB30024 */ sw $s3, 0x24($sp) -/* 055E38 80055238 AFB20020 */ sw $s2, 0x20($sp) -/* 055E3C 8005523C 3C118018 */ lui $s1, %hi(D_80183EA0) # $s1, 0x8018 -/* 055E40 80055240 3C148018 */ lui $s4, %hi(D_80183EB0) # $s4, 0x8018 -/* 055E44 80055244 00809025 */ move $s2, $a0 -/* 055E48 80055248 AFBF002C */ sw $ra, 0x2c($sp) -/* 055E4C 8005524C AFB00018 */ sw $s0, 0x18($sp) -/* 055E50 80055250 26943EB0 */ addiu $s4, %lo(D_80183EB0) # addiu $s4, $s4, 0x3eb0 -/* 055E54 80055254 26313EA0 */ addiu $s1, %lo(D_80183EA0) # addiu $s1, $s1, 0x3ea0 -/* 055E58 80055258 3C130004 */ lui $s3, 4 -/* 055E5C 8005525C 8E300000 */ lw $s0, ($s1) -.L80055260: -/* 055E60 80055260 02402825 */ move $a1, $s2 -/* 055E64 80055264 24064000 */ li $a2, 16384 -/* 055E68 80055268 240705DC */ li $a3, 1500 -/* 055E6C 8005526C 0C0228D9 */ jal func_8008A364 -/* 055E70 80055270 02002025 */ move $a0, $s0 -/* 055E74 80055274 02002025 */ move $a0, $s0 -/* 055E78 80055278 0C01C88F */ jal func_8007223C -/* 055E7C 8005527C 02602825 */ move $a1, $s3 -/* 055E80 80055280 50400004 */ beql $v0, $zero, .L80055294 -/* 055E84 80055284 26310004 */ addiu $s1, $s1, 4 -/* 055E88 80055288 0C015459 */ jal func_80055164 -/* 055E8C 8005528C 02002025 */ move $a0, $s0 -/* 055E90 80055290 26310004 */ addiu $s1, $s1, 4 -.L80055294: -/* 055E94 80055294 5634FFF2 */ bnel $s1, $s4, .L80055260 -/* 055E98 80055298 8E300000 */ lw $s0, ($s1) -/* 055E9C 8005529C 8FBF002C */ lw $ra, 0x2c($sp) -/* 055EA0 800552A0 8FB00018 */ lw $s0, 0x18($sp) -/* 055EA4 800552A4 8FB1001C */ lw $s1, 0x1c($sp) -/* 055EA8 800552A8 8FB20020 */ lw $s2, 0x20($sp) -/* 055EAC 800552AC 8FB30024 */ lw $s3, 0x24($sp) -/* 055EB0 800552B0 8FB40028 */ lw $s4, 0x28($sp) -/* 055EB4 800552B4 03E00008 */ jr $ra -/* 055EB8 800552B8 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/non_matchings/hud_renderer/func_800552BC.s b/asm/non_matchings/hud_renderer/func_800552BC.s deleted file mode 100644 index 2f82f1c7b..000000000 --- a/asm/non_matchings/hud_renderer/func_800552BC.s +++ /dev/null @@ -1,52 +0,0 @@ -glabel func_800552BC -/* 055EBC 800552BC 000470C0 */ sll $t6, $a0, 3 -/* 055EC0 800552C0 01C47023 */ subu $t6, $t6, $a0 -/* 055EC4 800552C4 3C0F8016 */ lui $t7, %hi(D_80165C18) # $t7, 0x8016 -/* 055EC8 800552C8 25EF5C18 */ addiu $t7, %lo(D_80165C18) # addiu $t7, $t7, 0x5c18 -/* 055ECC 800552CC 000E7140 */ sll $t6, $t6, 5 -/* 055ED0 800552D0 01CF1821 */ addu $v1, $t6, $t7 -/* 055ED4 800552D4 847800A6 */ lh $t8, 0xa6($v1) -/* 055ED8 800552D8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 055EDC 800552DC AFBF0014 */ sw $ra, 0x14($sp) -/* 055EE0 800552E0 2B010002 */ slti $at, $t8, 2 -/* 055EE4 800552E4 14200022 */ bnez $at, .L80055370 -/* 055EE8 800552E8 24640004 */ addiu $a0, $v1, 4 -/* 055EEC 800552EC 246500BE */ addiu $a1, $v1, 0xbe -/* 055EF0 800552F0 8C660000 */ lw $a2, ($v1) -/* 055EF4 800552F4 0C010B80 */ jal func_80042E00 -/* 055EF8 800552F8 AFA30018 */ sw $v1, 0x18($sp) -/* 055EFC 800552FC 3C058015 */ lui $a1, %hi(gDisplayListHead) # $a1, 0x8015 -/* 055F00 80055300 24A50298 */ addiu $a1, %lo(gDisplayListHead) # addiu $a1, $a1, 0x298 -/* 055F04 80055304 8CA40000 */ lw $a0, ($a1) -/* 055F08 80055308 8FA30018 */ lw $v1, 0x18($sp) -/* 055F0C 8005530C 3C090D00 */ lui $t1, %hi(D_0D0077D0) # $t1, 0xd00 -/* 055F10 80055310 24990008 */ addiu $t9, $a0, 8 -/* 055F14 80055314 ACB90000 */ sw $t9, ($a1) -/* 055F18 80055318 252977D0 */ addiu $t1, %lo(D_0D0077D0) # addiu $t1, $t1, 0x77d0 -/* 055F1C 8005531C 3C080600 */ lui $t0, 0x600 -/* 055F20 80055320 3C0A800E */ lui $t2, %hi(gIsGamePaused) # $t2, 0x800e -/* 055F24 80055324 AC880000 */ sw $t0, ($a0) -/* 055F28 80055328 AC890004 */ sw $t1, 4($a0) -/* 055F2C 8005532C 954AC5FC */ lhu $t2, %lo(gIsGamePaused)($t2) -/* 055F30 80055330 00003025 */ move $a2, $zero -/* 055F34 80055334 5540000B */ bnel $t2, $zero, .L80055364 -/* 055F38 80055338 8C640070 */ lw $a0, 0x70($v1) -/* 055F3C 8005533C 8C640070 */ lw $a0, 0x70($v1) -/* 055F40 80055340 8C650074 */ lw $a1, 0x74($v1) -/* 055F44 80055344 00003025 */ move $a2, $zero -/* 055F48 80055348 846700A2 */ lh $a3, 0xa2($v1) -/* 055F4C 8005534C 0C00137F */ jal func_80004DFC -/* 055F50 80055350 AFA30018 */ sw $v1, 0x18($sp) -/* 055F54 80055354 8FA30018 */ lw $v1, 0x18($sp) -/* 055F58 80055358 10000005 */ b .L80055370 -/* 055F5C 8005535C A46200A2 */ sh $v0, 0xa2($v1) -/* 055F60 80055360 8C640070 */ lw $a0, 0x70($v1) -.L80055364: -/* 055F64 80055364 8C650074 */ lw $a1, 0x74($v1) -/* 055F68 80055368 0C00137F */ jal func_80004DFC -/* 055F6C 8005536C 846700A2 */ lh $a3, 0xa2($v1) -.L80055370: -/* 055F70 80055370 8FBF0014 */ lw $ra, 0x14($sp) -/* 055F74 80055374 27BD0020 */ addiu $sp, $sp, 0x20 -/* 055F78 80055378 03E00008 */ jr $ra -/* 055F7C 8005537C 00000000 */ nop diff --git a/asm/non_matchings/hud_renderer/func_800557B4.s b/asm/non_matchings/hud_renderer/func_800557B4.s deleted file mode 100644 index f9cecd8f9..000000000 --- a/asm/non_matchings/hud_renderer/func_800557B4.s +++ /dev/null @@ -1,98 +0,0 @@ -glabel func_800557B4 -/* 0563B4 800557B4 000470C0 */ sll $t6, $a0, 3 -/* 0563B8 800557B8 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 0563BC 800557BC 01C47023 */ subu $t6, $t6, $a0 -/* 0563C0 800557C0 3C0F8016 */ lui $t7, %hi(D_80165C18) # $t7, 0x8016 -/* 0563C4 800557C4 AFB00018 */ sw $s0, 0x18($sp) -/* 0563C8 800557C8 25EF5C18 */ addiu $t7, %lo(D_80165C18) # addiu $t7, $t7, 0x5c18 -/* 0563CC 800557CC 000E7140 */ sll $t6, $t6, 5 -/* 0563D0 800557D0 01CF8021 */ addu $s0, $t6, $t7 -/* 0563D4 800557D4 861800A6 */ lh $t8, 0xa6($s0) -/* 0563D8 800557D8 AFBF001C */ sw $ra, 0x1c($sp) -/* 0563DC 800557DC AFA50044 */ sw $a1, 0x44($sp) -/* 0563E0 800557E0 2B010002 */ slti $at, $t8, 2 -/* 0563E4 800557E4 1420004C */ bnez $at, .L80055918 -/* 0563E8 800557E8 AFA60048 */ sw $a2, 0x48($sp) -/* 0563EC 800557EC 24050020 */ li $a1, 32 -/* 0563F0 800557F0 0C01C88F */ jal func_8007223C -/* 0563F4 800557F4 AFA40040 */ sw $a0, 0x40($sp) -/* 0563F8 800557F8 10400032 */ beqz $v0, .L800558C4 -/* 0563FC 800557FC 8FA40040 */ lw $a0, 0x40($sp) -/* 056400 80055800 0C01C8C8 */ jal func_80072320 -/* 056404 80055804 24050004 */ li $a1, 4 -/* 056408 80055808 10400027 */ beqz $v0, .L800558A8 -/* 05640C 8005580C 8FAD0044 */ lw $t5, 0x44($sp) -/* 056410 80055810 8FB90048 */ lw $t9, 0x48($sp) -/* 056414 80055814 8FA90044 */ lw $t1, 0x44($sp) -/* 056418 80055818 27A40034 */ addiu $a0, $sp, 0x34 -/* 05641C 8005581C 0329082B */ sltu $at, $t9, $t1 -/* 056420 80055820 14200028 */ bnez $at, .L800558C4 -/* 056424 80055824 00000000 */ nop -/* 056428 80055828 C6060008 */ lwc1 $f6, 8($s0) -/* 05642C 8005582C 3C013FF0 */ li $at, 0x3FF00000 # 1.875000 -/* 056430 80055830 44815800 */ mtc1 $at, $f11 -/* 056434 80055834 44805000 */ mtc1 $zero, $f10 -/* 056438 80055838 46003221 */ cvt.d.s $f8, $f6 -/* 05643C 8005583C C6040004 */ lwc1 $f4, 4($s0) -/* 056440 80055840 462A4401 */ sub.d $f16, $f8, $f10 -/* 056444 80055844 260500B2 */ addiu $a1, $s0, 0xb2 -/* 056448 80055848 E7A40034 */ swc1 $f4, 0x34($sp) -/* 05644C 8005584C C604000C */ lwc1 $f4, 0xc($s0) -/* 056450 80055850 462084A0 */ cvt.s.d $f18, $f16 -/* 056454 80055854 8E060000 */ lw $a2, ($s0) -/* 056458 80055858 E7A4003C */ swc1 $f4, 0x3c($sp) -/* 05645C 8005585C 0C010BDC */ jal func_80042F70 -/* 056460 80055860 E7B20038 */ swc1 $f18, 0x38($sp) -/* 056464 80055864 3C088015 */ lui $t0, %hi(gDisplayListHead) # $t0, 0x8015 -/* 056468 80055868 25080298 */ addiu $t0, %lo(gDisplayListHead) # addiu $t0, $t0, 0x298 -/* 05646C 8005586C 8D030000 */ lw $v1, ($t0) -/* 056470 80055870 3C0C0D00 */ lui $t4, %hi(D_0D0077D0) # $t4, 0xd00 -/* 056474 80055874 258C77D0 */ addiu $t4, %lo(D_0D0077D0) # addiu $t4, $t4, 0x77d0 -/* 056478 80055878 246A0008 */ addiu $t2, $v1, 8 -/* 05647C 8005587C AD0A0000 */ sw $t2, ($t0) -/* 056480 80055880 3C0B0600 */ lui $t3, 0x600 -/* 056484 80055884 AC6B0000 */ sw $t3, ($v1) -/* 056488 80055888 AC6C0004 */ sw $t4, 4($v1) -/* 05648C 8005588C 820700D2 */ lb $a3, 0xd2($s0) -/* 056490 80055890 920600D8 */ lbu $a2, 0xd8($s0) -/* 056494 80055894 8E050074 */ lw $a1, 0x74($s0) -/* 056498 80055898 0C00137F */ jal func_80004DFC -/* 05649C 8005589C 8E040070 */ lw $a0, 0x70($s0) -/* 0564A0 800558A0 10000008 */ b .L800558C4 -/* 0564A4 800558A4 00000000 */ nop -.L800558A8: -/* 0564A8 800558A8 3C010001 */ lui $at, (0x00015F91 >> 16) # lui $at, 1 -/* 0564AC 800558AC 34215F91 */ ori $at, (0x00015F91 & 0xFFFF) # ori $at, $at, 0x5f91 -/* 0564B0 800558B0 01A1082B */ sltu $at, $t5, $at -/* 0564B4 800558B4 10200003 */ beqz $at, .L800558C4 -/* 0564B8 800558B8 8FA40040 */ lw $a0, 0x40($sp) -/* 0564BC 800558BC 0C0129EB */ jal func_8004A7AC -/* 0564C0 800558C0 3C053FC0 */ lui $a1, 0x3fc0 -.L800558C4: -/* 0564C4 800558C4 3C0E0D00 */ lui $t6, %hi(D_0D0077D0) # $t6, 0xd00 -/* 0564C8 800558C8 25CE77D0 */ addiu $t6, %lo(D_0D0077D0) # addiu $t6, $t6, 0x77d0 -/* 0564CC 800558CC AFAE0020 */ sw $t6, 0x20($sp) -/* 0564D0 800558D0 26040004 */ addiu $a0, $s0, 4 -/* 0564D4 800558D4 260500B2 */ addiu $a1, $s0, 0xb2 -/* 0564D8 800558D8 0C010B80 */ jal func_80042E00 -/* 0564DC 800558DC 8E060000 */ lw $a2, ($s0) -/* 0564E0 800558E0 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 0564E4 800558E4 8C630298 */ lw $v1, %lo(gDisplayListHead)($v1) -/* 0564E8 800558E8 3C018015 */ lui $at, %hi(gDisplayListHead) # $at, 0x8015 -/* 0564EC 800558EC 3C180600 */ lui $t8, 0x600 -/* 0564F0 800558F0 246F0008 */ addiu $t7, $v1, 8 -/* 0564F4 800558F4 AC2F0298 */ sw $t7, %lo(gDisplayListHead)($at) -/* 0564F8 800558F8 AC780000 */ sw $t8, ($v1) -/* 0564FC 800558FC 8FB90020 */ lw $t9, 0x20($sp) -/* 056500 80055900 AC790004 */ sw $t9, 4($v1) -/* 056504 80055904 820700D2 */ lb $a3, 0xd2($s0) -/* 056508 80055908 920600D8 */ lbu $a2, 0xd8($s0) -/* 05650C 8005590C 8E050074 */ lw $a1, 0x74($s0) -/* 056510 80055910 0C00137F */ jal func_80004DFC -/* 056514 80055914 8E040070 */ lw $a0, 0x70($s0) -.L80055918: -/* 056518 80055918 8FBF001C */ lw $ra, 0x1c($sp) -/* 05651C 8005591C 8FB00018 */ lw $s0, 0x18($sp) -/* 056520 80055920 27BD0040 */ addiu $sp, $sp, 0x40 -/* 056524 80055924 03E00008 */ jr $ra -/* 056528 80055928 00000000 */ nop diff --git a/asm/non_matchings/hud_renderer/func_8005592C.s b/asm/non_matchings/hud_renderer/func_8005592C.s deleted file mode 100644 index ee37342d8..000000000 --- a/asm/non_matchings/hud_renderer/func_8005592C.s +++ /dev/null @@ -1,111 +0,0 @@ -glabel func_8005592C -/* 05652C 8005592C 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 056530 80055930 3C02800E */ lui $v0, %hi(gPlayerCountSelection1) # $v0, 0x800e -/* 056534 80055934 8C42C538 */ lw $v0, %lo(gPlayerCountSelection1)($v0) -/* 056538 80055938 24010001 */ li $at, 1 -/* 05653C 8005593C AFBF003C */ sw $ra, 0x3c($sp) -/* 056540 80055940 AFBE0038 */ sw $fp, 0x38($sp) -/* 056544 80055944 AFB70034 */ sw $s7, 0x34($sp) -/* 056548 80055948 AFB60030 */ sw $s6, 0x30($sp) -/* 05654C 8005594C AFB5002C */ sw $s5, 0x2c($sp) -/* 056550 80055950 AFB40028 */ sw $s4, 0x28($sp) -/* 056554 80055954 AFB30024 */ sw $s3, 0x24($sp) -/* 056558 80055958 AFB20020 */ sw $s2, 0x20($sp) -/* 05655C 8005595C AFB1001C */ sw $s1, 0x1c($sp) -/* 056560 80055960 AFB00018 */ sw $s0, 0x18($sp) -/* 056564 80055964 14410004 */ bne $v0, $at, .L80055978 -/* 056568 80055968 AFA40040 */ sw $a0, 0x40($sp) -/* 05656C 8005596C 3C130003 */ lui $s3, (0x0003D090 >> 16) # lui $s3, 3 -/* 056570 80055970 10000008 */ b .L80055994 -/* 056574 80055974 3673D090 */ ori $s3, (0x0003D090 & 0xFFFF) # ori $s3, $s3, 0xd090 -.L80055978: -/* 056578 80055978 24010002 */ li $at, 2 -/* 05657C 8005597C 14410004 */ bne $v0, $at, .L80055990 -/* 056580 80055980 3C130001 */ lui $s3, 1 -/* 056584 80055984 3C130002 */ lui $s3, (0x00025F90 >> 16) # lui $s3, 2 -/* 056588 80055988 10000002 */ b .L80055994 -/* 05658C 8005598C 36737100 */ ori $s3, (0x00027100 & 0xFFFF) # ori $s3, $s3, 0x7100 -.L80055990: -/* 056590 80055990 36735F90 */ ori $s3, (0x00025F90 & 0xFFFF) # ori $s3, $s3, 0x5f90 -.L80055994: -/* 056594 80055994 3C128018 */ lui $s2, %hi(D_80183EA0) # $s2, 0x8018 -/* 056598 80055998 3C1E8018 */ lui $fp, %hi(D_80183EDC) # $fp, 0x8018 -/* 05659C 8005599C 3C168018 */ lui $s6, %hi(D_80183EA0) # $s6, 0x8018 -/* 0565A0 800559A0 3C148016 */ lui $s4, %hi(D_80165C18) # $s4, 0x8016 -/* 0565A4 800559A4 26945C18 */ addiu $s4, %lo(D_80165C18) # addiu $s4, $s4, 0x5c18 -/* 0565A8 800559A8 26D63EA0 */ addiu $s6, %lo(D_80183EA0) # addiu $s6, $s6, 0x3ea0 -/* 0565AC 800559AC 27DE3EDC */ addiu $fp, %lo(D_80183EDC) # addiu $fp, $fp, 0x3edc -/* 0565B0 800559B0 26523EA0 */ addiu $s2, %lo(D_80183EA0) # addiu $s2, $s2, 0x3ea0 -/* 0565B4 800559B4 3C170004 */ lui $s7, 4 -/* 0565B8 800559B8 241500E0 */ li $s5, 224 -/* 0565BC 800559BC 8E500000 */ lw $s0, ($s2) -.L800559C0: -/* 0565C0 800559C0 3C19800E */ lui $t9, %hi(gPlayerCountSelection1) # $t9, 0x800e -/* 0565C4 800559C4 02150019 */ multu $s0, $s5 -/* 0565C8 800559C8 00007012 */ mflo $t6 -/* 0565CC 800559CC 028E7821 */ addu $t7, $s4, $t6 -/* 0565D0 800559D0 85F800A6 */ lh $t8, 0xa6($t7) -/* 0565D4 800559D4 2B010002 */ slti $at, $t8, 2 -/* 0565D8 800559D8 54200029 */ bnel $at, $zero, .L80055A80 -/* 0565DC 800559DC 26520004 */ addiu $s2, $s2, 4 -/* 0565E0 800559E0 8F39C538 */ lw $t9, %lo(gPlayerCountSelection1)($t9) -/* 0565E4 800559E4 24010001 */ li $at, 1 -/* 0565E8 800559E8 02002025 */ move $a0, $s0 -/* 0565EC 800559EC 1721000E */ bne $t9, $at, .L80055A28 -/* 0565F0 800559F0 00000000 */ nop -/* 0565F4 800559F4 16560003 */ bne $s2, $s6, .L80055A04 -/* 0565F8 800559F8 24114000 */ li $s1, 16384 -/* 0565FC 800559FC 10000012 */ b .L80055A48 -/* 056600 80055A00 240705DC */ li $a3, 1500 -.L80055A04: -/* 056604 80055A04 02002025 */ move $a0, $s0 -/* 056608 80055A08 0C01C8C8 */ jal func_80072320 -/* 05660C 80055A0C 24050008 */ li $a1, 8 -/* 056610 80055A10 10400003 */ beqz $v0, .L80055A20 -/* 056614 80055A14 00000000 */ nop -/* 056618 80055A18 1000000B */ b .L80055A48 -/* 05661C 80055A1C 24070320 */ li $a3, 800 -.L80055A20: -/* 056620 80055A20 10000009 */ b .L80055A48 -/* 056624 80055A24 240703E8 */ li $a3, 1000 -.L80055A28: -/* 056628 80055A28 0C01C8C8 */ jal func_80072320 -/* 05662C 80055A2C 24050008 */ li $a1, 8 -/* 056630 80055A30 10400004 */ beqz $v0, .L80055A44 -/* 056634 80055A34 24070258 */ li $a3, 600 -/* 056638 80055A38 240701F4 */ li $a3, 500 -/* 05663C 80055A3C 10000002 */ b .L80055A48 -/* 056640 80055A40 24114000 */ li $s1, 16384 -.L80055A44: -/* 056644 80055A44 24115555 */ li $s1, 21845 -.L80055A48: -/* 056648 80055A48 02002025 */ move $a0, $s0 -/* 05664C 80055A4C 8FA50040 */ lw $a1, 0x40($sp) -/* 056650 80055A50 0C0228D9 */ jal func_8008A364 -/* 056654 80055A54 3226FFFF */ andi $a2, $s1, 0xffff -/* 056658 80055A58 00408825 */ move $s1, $v0 -/* 05665C 80055A5C 02002025 */ move $a0, $s0 -/* 056660 80055A60 0C01C88F */ jal func_8007223C -/* 056664 80055A64 02E02825 */ move $a1, $s7 -/* 056668 80055A68 10400004 */ beqz $v0, .L80055A7C -/* 05666C 80055A6C 02002025 */ move $a0, $s0 -/* 056670 80055A70 02202825 */ move $a1, $s1 -/* 056674 80055A74 0C0155ED */ jal func_800557B4 -/* 056678 80055A78 02603025 */ move $a2, $s3 -.L80055A7C: -/* 05667C 80055A7C 26520004 */ addiu $s2, $s2, 4 -.L80055A80: -/* 056680 80055A80 565EFFCF */ bnel $s2, $fp, .L800559C0 -/* 056684 80055A84 8E500000 */ lw $s0, ($s2) -/* 056688 80055A88 8FBF003C */ lw $ra, 0x3c($sp) -/* 05668C 80055A8C 8FB00018 */ lw $s0, 0x18($sp) -/* 056690 80055A90 8FB1001C */ lw $s1, 0x1c($sp) -/* 056694 80055A94 8FB20020 */ lw $s2, 0x20($sp) -/* 056698 80055A98 8FB30024 */ lw $s3, 0x24($sp) -/* 05669C 80055A9C 8FB40028 */ lw $s4, 0x28($sp) -/* 0566A0 80055AA0 8FB5002C */ lw $s5, 0x2c($sp) -/* 0566A4 80055AA4 8FB60030 */ lw $s6, 0x30($sp) -/* 0566A8 80055AA8 8FB70034 */ lw $s7, 0x34($sp) -/* 0566AC 80055AAC 8FBE0038 */ lw $fp, 0x38($sp) -/* 0566B0 80055AB0 03E00008 */ jr $ra -/* 0566B4 80055AB4 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/non_matchings/hud_renderer/func_80055AB8.s b/asm/non_matchings/hud_renderer/func_80055AB8.s deleted file mode 100644 index ef26f7bdf..000000000 --- a/asm/non_matchings/hud_renderer/func_80055AB8.s +++ /dev/null @@ -1,100 +0,0 @@ -glabel func_80055AB8 -/* 0566B8 80055AB8 0004C0C0 */ sll $t8, $a0, 3 -/* 0566BC 80055ABC 0304C023 */ subu $t8, $t8, $a0 -/* 0566C0 80055AC0 3C198016 */ lui $t9, %hi(D_80165C18) # $t9, 0x8016 -/* 0566C4 80055AC4 27395C18 */ addiu $t9, %lo(D_80165C18) # addiu $t9, $t9, 0x5c18 -/* 0566C8 80055AC8 0018C140 */ sll $t8, $t8, 5 -/* 0566CC 80055ACC 00057080 */ sll $t6, $a1, 2 -/* 0566D0 80055AD0 03191821 */ addu $v1, $t8, $t9 -/* 0566D4 80055AD4 846A00A6 */ lh $t2, 0xa6($v1) -/* 0566D8 80055AD8 01C57023 */ subu $t6, $t6, $a1 -/* 0566DC 80055ADC 000E70C0 */ sll $t6, $t6, 3 -/* 0566E0 80055AE0 3C0F800E */ lui $t7, %hi(camera1) # $t7, 0x800e -/* 0566E4 80055AE4 8DEFDB40 */ lw $t7, %lo(camera1)($t7) -/* 0566E8 80055AE8 01C57023 */ subu $t6, $t6, $a1 -/* 0566EC 80055AEC 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 0566F0 80055AF0 000E70C0 */ sll $t6, $t6, 3 -/* 0566F4 80055AF4 29410002 */ slti $at, $t2, 2 -/* 0566F8 80055AF8 AFBF002C */ sw $ra, 0x2c($sp) -/* 0566FC 80055AFC 1420004A */ bnez $at, .L80055C28 -/* 056700 80055B00 01CF3021 */ addu $a2, $t6, $t7 -/* 056704 80055B04 3C050010 */ lui $a1, 0x10 -/* 056708 80055B08 AFA30034 */ sw $v1, 0x34($sp) -/* 05670C 80055B0C 0C01C88F */ jal func_8007223C -/* 056710 80055B10 AFA6003C */ sw $a2, 0x3c($sp) -/* 056714 80055B14 8FA30034 */ lw $v1, 0x34($sp) -/* 056718 80055B18 1040002E */ beqz $v0, .L80055BD4 -/* 05671C 80055B1C 8FA6003C */ lw $a2, 0x3c($sp) -/* 056720 80055B20 C4640008 */ lwc1 $f4, 8($v1) -/* 056724 80055B24 3C014030 */ li $at, 0x40300000 # 2.750000 -/* 056728 80055B28 44814800 */ mtc1 $at, $f9 -/* 05672C 80055B2C 44804000 */ mtc1 $zero, $f8 -/* 056730 80055B30 460021A1 */ cvt.d.s $f6, $f4 -/* 056734 80055B34 3C048018 */ lui $a0, %hi(D_80183E40) # $a0, 0x8018 -/* 056738 80055B38 46283280 */ add.d $f10, $f6, $f8 -/* 05673C 80055B3C C46C0004 */ lwc1 $f12, 4($v1) -/* 056740 80055B40 C46E000C */ lwc1 $f14, 0xc($v1) -/* 056744 80055B44 24843E40 */ addiu $a0, %lo(D_80183E40) # addiu $a0, $a0, 0x3e40 -/* 056748 80055B48 46205420 */ cvt.s.d $f16, $f10 -/* 05674C 80055B4C 3C058018 */ lui $a1, %hi(D_80183E80) # $a1, 0x8018 -/* 056750 80055B50 24A53E80 */ addiu $a1, %lo(D_80183E80) # addiu $a1, $a1, 0x3e80 -/* 056754 80055B54 A4A00000 */ sh $zero, ($a1) -/* 056758 80055B58 E4900004 */ swc1 $f16, 4($a0) -/* 05675C 80055B5C E48C0000 */ swc1 $f12, ($a0) -/* 056760 80055B60 0C01062B */ jal func_800418AC -/* 056764 80055B64 E48E0008 */ swc1 $f14, 8($a0) -/* 056768 80055B68 3C058018 */ lui $a1, %hi(D_80183E80) # $a1, 0x8018 -/* 05676C 80055B6C 3C0C0D00 */ lui $t4, %hi(D_0D0062B0) # $t4, 0xd00 -/* 056770 80055B70 24A53E80 */ addiu $a1, %lo(D_80183E80) # addiu $a1, $a1, 0x3e80 -/* 056774 80055B74 3C048018 */ lui $a0, %hi(D_80183E40) # $a0, 0x8018 -/* 056778 80055B78 340B8000 */ li $t3, 32768 -/* 05677C 80055B7C 258C62B0 */ addiu $t4, %lo(D_0D0062B0) # addiu $t4, $t4, 0x62b0 -/* 056780 80055B80 3C063F0A */ lui $a2, (0x3F0A3D71 >> 16) # lui $a2, 0x3f0a -/* 056784 80055B84 3C070601 */ lui $a3, %hi(d_course_rainbow_road_sphere) # $a3, 0x601 -/* 056788 80055B88 240D0020 */ li $t5, 32 -/* 05678C 80055B8C 240E0040 */ li $t6, 64 -/* 056790 80055B90 240F0020 */ li $t7, 32 -/* 056794 80055B94 24180040 */ li $t8, 64 -/* 056798 80055B98 24190005 */ li $t9, 5 -/* 05679C 80055B9C 24843E40 */ addiu $a0, %lo(D_80183E40) # addiu $a0, $a0, 0x3e40 -/* 0567A0 80055BA0 A4A20002 */ sh $v0, 2($a1) -/* 0567A4 80055BA4 A4AB0004 */ sh $t3, 4($a1) -/* 0567A8 80055BA8 AFB90024 */ sw $t9, 0x24($sp) -/* 0567AC 80055BAC AFB80020 */ sw $t8, 0x20($sp) -/* 0567B0 80055BB0 AFAF001C */ sw $t7, 0x1c($sp) -/* 0567B4 80055BB4 AFAE0018 */ sw $t6, 0x18($sp) -/* 0567B8 80055BB8 AFAD0014 */ sw $t5, 0x14($sp) -/* 0567BC 80055BBC 24E72028 */ addiu $a3, %lo(d_course_rainbow_road_sphere) # addiu $a3, $a3, 0x2028 -/* 0567C0 80055BC0 34C63D71 */ ori $a2, (0x3F0A3D71 & 0xFFFF) # ori $a2, $a2, 0x3d71 -/* 0567C4 80055BC4 0C011A38 */ jal func_800468E0 -/* 0567C8 80055BC8 AFAC0010 */ sw $t4, 0x10($sp) -/* 0567CC 80055BCC 10000017 */ b .L80055C2C -/* 0567D0 80055BD0 8FBF002C */ lw $ra, 0x2c($sp) -.L80055BD4: -/* 0567D4 80055BD4 24640004 */ addiu $a0, $v1, 4 -/* 0567D8 80055BD8 246500BE */ addiu $a1, $v1, 0xbe -/* 0567DC 80055BDC 8C660000 */ lw $a2, ($v1) -/* 0567E0 80055BE0 0C010B80 */ jal func_80042E00 -/* 0567E4 80055BE4 AFA30034 */ sw $v1, 0x34($sp) -/* 0567E8 80055BE8 3C098015 */ lui $t1, %hi(gDisplayListHead) # $t1, 0x8015 -/* 0567EC 80055BEC 25290298 */ addiu $t1, %lo(gDisplayListHead) # addiu $t1, $t1, 0x298 -/* 0567F0 80055BF0 8D280000 */ lw $t0, ($t1) -/* 0567F4 80055BF4 8FA30034 */ lw $v1, 0x34($sp) -/* 0567F8 80055BF8 3C0C0D00 */ lui $t4, %hi(D_0D0077D0) # $t4, 0xd00 -/* 0567FC 80055BFC 250A0008 */ addiu $t2, $t0, 8 -/* 056800 80055C00 AD2A0000 */ sw $t2, ($t1) -/* 056804 80055C04 258C77D0 */ addiu $t4, %lo(D_0D0077D0) # addiu $t4, $t4, 0x77d0 -/* 056808 80055C08 3C0B0600 */ lui $t3, 0x600 -/* 05680C 80055C0C AD0B0000 */ sw $t3, ($t0) -/* 056810 80055C10 AD0C0004 */ sw $t4, 4($t0) -/* 056814 80055C14 00003025 */ move $a2, $zero -/* 056818 80055C18 806700D2 */ lb $a3, 0xd2($v1) -/* 05681C 80055C1C 8C650074 */ lw $a1, 0x74($v1) -/* 056820 80055C20 0C00137F */ jal func_80004DFC -/* 056824 80055C24 8C640070 */ lw $a0, 0x70($v1) -.L80055C28: -/* 056828 80055C28 8FBF002C */ lw $ra, 0x2c($sp) -.L80055C2C: -/* 05682C 80055C2C 27BD0040 */ addiu $sp, $sp, 0x40 -/* 056830 80055C30 03E00008 */ jr $ra -/* 056834 80055C34 00000000 */ nop diff --git a/asm/non_matchings/hud_renderer/func_80055C38.s b/asm/non_matchings/hud_renderer/func_80055C38.s deleted file mode 100644 index 323c5800e..000000000 --- a/asm/non_matchings/hud_renderer/func_80055C38.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_80055C38 -/* 056838 80055C38 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 05683C 80055C3C AFB40028 */ sw $s4, 0x28($sp) -/* 056840 80055C40 AFB1001C */ sw $s1, 0x1c($sp) -/* 056844 80055C44 AFB30024 */ sw $s3, 0x24($sp) -/* 056848 80055C48 AFB20020 */ sw $s2, 0x20($sp) -/* 05684C 80055C4C 3C118018 */ lui $s1, %hi(D_80183F28) # $s1, 0x8018 -/* 056850 80055C50 3C148018 */ lui $s4, %hi(D_80183F34) # $s4, 0x8018 -/* 056854 80055C54 00809025 */ move $s2, $a0 -/* 056858 80055C58 AFBF002C */ sw $ra, 0x2c($sp) -/* 05685C 80055C5C AFB00018 */ sw $s0, 0x18($sp) -/* 056860 80055C60 26943F34 */ addiu $s4, %lo(D_80183F34) # addiu $s4, $s4, 0x3f34 -/* 056864 80055C64 26313F28 */ addiu $s1, %lo(D_80183F28) # addiu $s1, $s1, 0x3f28 -/* 056868 80055C68 3C130004 */ lui $s3, 4 -/* 05686C 80055C6C 8E300000 */ lw $s0, ($s1) -.L80055C70: -/* 056870 80055C70 02402825 */ move $a1, $s2 -/* 056874 80055C74 240605DC */ li $a2, 1500 -/* 056878 80055C78 240709C4 */ li $a3, 2500 -/* 05687C 80055C7C 0C022874 */ jal func_8008A1D0 -/* 056880 80055C80 02002025 */ move $a0, $s0 -/* 056884 80055C84 02002025 */ move $a0, $s0 -/* 056888 80055C88 0C01C88F */ jal func_8007223C -/* 05688C 80055C8C 02602825 */ move $a1, $s3 -/* 056890 80055C90 10400003 */ beqz $v0, .L80055CA0 -/* 056894 80055C94 02002025 */ move $a0, $s0 -/* 056898 80055C98 0C0156AE */ jal func_80055AB8 -/* 05689C 80055C9C 02402825 */ move $a1, $s2 -.L80055CA0: -/* 0568A0 80055CA0 26310004 */ addiu $s1, $s1, 4 -/* 0568A4 80055CA4 5634FFF2 */ bnel $s1, $s4, .L80055C70 -/* 0568A8 80055CA8 8E300000 */ lw $s0, ($s1) -/* 0568AC 80055CAC 8FBF002C */ lw $ra, 0x2c($sp) -/* 0568B0 80055CB0 8FB00018 */ lw $s0, 0x18($sp) -/* 0568B4 80055CB4 8FB1001C */ lw $s1, 0x1c($sp) -/* 0568B8 80055CB8 8FB20020 */ lw $s2, 0x20($sp) -/* 0568BC 80055CBC 8FB30024 */ lw $s3, 0x24($sp) -/* 0568C0 80055CC0 8FB40028 */ lw $s4, 0x28($sp) -/* 0568C4 80055CC4 03E00008 */ jr $ra -/* 0568C8 80055CC8 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/data/data_code_80071F00.s b/data/data_code_80071F00.s index 29f0746ae..d53c7a80a 100644 --- a/data/data_code_80071F00.s +++ b/data/data_code_80071F00.s @@ -874,13 +874,16 @@ glabel D_800E6724 glabel D_800E672C .word D_800E659C, D_800E6668 +# These should be floats, really +# I believe they're the positions of the static neon signs in rainbow road glabel D_800E6734 -.hword 0x44b4, 0x6000, 0x4482, 0x8000, 0xc5ab, 0x3000, 0x44d1, 0xc000 -.hword 0x447d, 0x0000, 0xc597, 0x4000, 0xc575, 0x4000, 0x4466, 0x4000 -.hword 0x4520, 0x6000, 0xc54e, 0xf000, 0x4445, 0x8000, 0x455c, 0x4000 -.hword 0xc4a0, 0x8000, 0x44a7, 0xa000, 0x458d, 0x7800, 0x450d, 0xc000 -.hword 0x4482, 0x2000, 0x458b, 0x4000, 0x4530, 0x4000, 0x448a, 0xa000 -.hword 0x44f8, 0x2000 +.hword 0x44b4, 0x6000, 0x4482, 0x8000, 0xc5ab, 0x3000 +.hword 0x44d1, 0xc000, 0x447d, 0x0000, 0xc597, 0x4000 +.hword 0xc575, 0x4000, 0x4466, 0x4000, 0x4520, 0x6000 +.hword 0xc54e, 0xf000, 0x4445, 0x8000, 0x455c, 0x4000 +.hword 0xc4a0, 0x8000, 0x44a7, 0xa000, 0x458d, 0x7800 +.hword 0x450d, 0xc000, 0x4482, 0x2000, 0x458b, 0x4000 +.hword 0x4530, 0x4000, 0x448a, 0xa000, 0x44f8, 0x2000 glabel D_800E6788 .hword 0xfda6, 0xffa0, 0x0068, 0xfd1f, 0xffa1, 0x0136, 0xfcb0, 0xffa6 diff --git a/include/common_structs.h b/include/common_structs.h index 28e1111c9..a7a66c44f 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -424,9 +424,7 @@ typedef struct { typedef struct { char unk_00[0x4]; - f32 unk_04; - char unk_08[0x4]; - f32 unk_0C; + Vec3f unk_04; char unk_10[0x4]; s32 objectIndex; char unk_18[0x8]; diff --git a/include/objects.h b/include/objects.h index c60a26c2a..8ac986147 100644 --- a/include/objects.h +++ b/include/objects.h @@ -9,8 +9,8 @@ typedef struct { - /* 0x00 */ f32 unk_000; - /* 0x04 */ Vec3f unk_004; + /* 0x00 */ f32 sizeScaling; + /* 0x04 */ Vec3f pos; /* 0x10 */ Vec3f unk_010; /* 0x1C */ Vec3f unk_01C; /* 0x28 */ Vec3f unk_028; @@ -23,13 +23,17 @@ typedef struct /* 0x54 */ s32 unk_054; /* 0x58 */ s32 unk_058; /* 0x5C */ s32 unk_05C; - /* 0x60 */ u32 *unk_060; - /* 0x64 */ u8 *unk_064; // ptr to a texture - /* 0x68 */ u32 *unk_068; - /* 0x6C */ u8 *unk_06C; // ptr to a texture + /* 0x60 */ u8 *activeTLUT; + /* 0x64 */ u8 *activeTexture; + /** + * "list" is something of a misnomer for the names here + * they can be pointers to just 1 tlut/texture, but it is common for one or the other + * to be a pointer to an array of tluts/textures. + **/ + /* 0x68 */ u8 *tlutList; // I feel like this should actually be `u8 (*tlutList)[512]`, but that causes mismatches + /* 0x6C */ u8 *textureList; /* 0x70 */ Gfx *unk_070; - // For at least 1 object type this is meant to be a Vtx*. See func_800555BC - /* 0x74 */ Vtx *unk_074; + /* 0x74 */ Vtx *unk_074; // For at least 1 object type this is meant to be a Vtx*. See func_800555BC /* 0x78 */ s8 unk_078[0x04]; /* 0x7C */ s32 unk_07C; /* 0x80 */ u16 *unk_080; // unk_080[][4]? @@ -41,13 +45,13 @@ typedef struct /* 0xA0 */ s16 unk_0A0; /* 0xA2 */ s16 unk_0A2; /* 0xA4 */ s16 unk_0A4; - /* 0xA6 */ s16 unk_0A6; + /* 0xA6 */ s16 unk_0A6; // Usually a state tracker /* 0xA8 */ s16 unk_0A8; /* 0xAA */ s16 unk_0AA; /* 0xAC */ s16 unk_0AC; /* 0xAE */ s16 unk_0AE; /* 0xB0 */ s16 unk_0B0; - /* 0xB2 */ Vec3su unk_0B2; + /* 0xB2 */ Vec3su unk_0B2; // rotation, I think /* 0xB8 */ Vec3su unk_0B8; /* 0xBE */ Vec3su unk_0BE; /* 0xC4 */ u16 unk_0C4; @@ -67,9 +71,9 @@ typedef struct /* 0xD5 */ u8 unk_0D5; /* 0xD6 */ u8 unk_0D6; /* 0xD7 */ u8 unk_0D7; - /* 0xD8 */ s8 unk_0D8; - /* 0xD9 */ u8 unk_0D9; - /* 0xDA */ u8 unk_0DA; + /* 0xD8 */ u8 unk_0D8; + /* 0xD9 */ u8 textureWidth; + /* 0xDA */ u8 textureHeight; /* 0xDB */ u8 unk_0DB; /* 0xDC */ u8 unk_0DC; /* 0xDD */ u8 unk_0DD; @@ -90,6 +94,8 @@ extern s32 gItemWindowObjectByPlayerId[]; // Used for loop bounds when accessing D_80183EA0 extern s16 D_80165750; +extern UnkActorInner D_8018C0B0[]; + /** * D_80183EA0, D_80183F28, D_8018BFA8, and D_8018C030 are all lists of indices in D_80165C18. * func_80070190 initializes them in such a way that the indicies in each list are not adjacent. @@ -98,6 +104,15 @@ extern s16 D_80165750; * The objects found at the indices in each list appears to be course dependent **/ +#define NUM_CRABS 0xA +#define NUM_NEON_SIGNS 0xA + +/** + * Crabs in Koopa Troopa Beach + * Hot air balloon in Luigi Raceway? + * Neon signs in Rainbow Road? + * Thwomps in Bower's Castle? +**/ extern s32 D_80183EA0[]; /** * Snowmen in Frappe Snowlad @@ -159,8 +174,17 @@ extern s32 D_8018C970[]; // Next free spot in D_8018C970? Wraps back around to 0 if it gets bigger than D_8018C970_SIZE extern s32 D_80183E7C; +#define D_8018CC80_SIZE 0x64 // List of object list indices used by the clouds and stars in some stages // Also used for snowflakes like D_8018C1B0? Not sure what's up with that extern s32 D_8018CC80[]; +// Number of used spots in D_8018CC80? +extern s32 D_8018D1F0; +// Next free spot in D_8018CC80? +extern s32 D_8018D1F8; +// Something related to the display of the clouds/stars? +extern s8 D_8018D230; +// Some sort of limiter on how many of some object type can spawn +extern s32 D_8018D3C4; #endif diff --git a/permuter_settings.toml b/permuter_settings.toml index e4dd63c79..680765c58 100644 --- a/permuter_settings.toml +++ b/permuter_settings.toml @@ -1,6 +1,8 @@ # Optional configuration file for import.py. Put it in the root or in tools/ # of the repo you are importing from. +compiler_type = "ido" + [decompme.compilers] "tools/ido5.3_recomp/cc" = "ido5.3" diff --git a/src/ceremony_and_credits.c b/src/ceremony_and_credits.c index 51b491251..3241c79bf 100644 --- a/src/ceremony_and_credits.c +++ b/src/ceremony_and_credits.c @@ -946,13 +946,10 @@ void func_80284154(struct CinematicCamera *camera) { func_80282D90(camera, (struct struct_80286A04 *) D_80285910, (struct struct_80286A04 *) D_80285928, 0); } -extern struct_80165C18_entry D_80165C20[]; -extern s32 D_80183EAC; - void func_80284184(struct CinematicCamera *camera) { f32 trophy; - trophy = ((D_80165C20[D_80183EAC].unk_000 - camera->lookAt[1]) * 0.9f) + camera->lookAt[1]; + trophy = ((D_80165C18[D_80183EA0[3]].pos[1] - camera->lookAt[1]) * 0.9f) + camera->lookAt[1]; f32_lerp(&camera->pos[1], trophy, 0.5); } diff --git a/src/code_80004740.h b/src/code_80004740.h index ed20c95fe..0d29dab39 100644 --- a/src/code_80004740.h +++ b/src/code_80004740.h @@ -197,4 +197,4 @@ void func_80004A1C(animation_type_1*, s16*, animation_type_3_triplet, s32); void func_80004C30(u32*, animation_type_2*, s16); s16 func_80004DFC(animation_type_1*, animation_type_2**, s16, s16); -#endif \ No newline at end of file +#endif diff --git a/src/code_8001F980.c b/src/code_8001F980.c index f65bd3695..6cd5d2e45 100644 --- a/src/code_8001F980.c +++ b/src/code_8001F980.c @@ -1491,7 +1491,7 @@ void func_80024374(Player *player, s8 arg1, s8 arg2) { spCC[0] = player->pos[0] + ((spB0 * sins(spC0)) + (spAC * coss(spC0))); spCC[2] = player->pos[2] + ((spB0 * coss(spC0)) - (spAC * sins(spC0))); - spCC[1] = D_80165C18[D_80183EA0[arg1]].unk_004[1] + sp94[arg1]; + spCC[1] = D_80165C18[D_80183EA0[arg1]].pos[1] + sp94[arg1]; func_80021E10(sp118, spCC, spC4); func_80021F84(sp118, D_800DDBD4[player->characterId] * player->unk_224); @@ -2619,44 +2619,15 @@ void func_80026A48(Player *player, s8 arg1) { } #ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -static ? *D_800DDE34[8] = { - &gKartMarioWheels0, - &gKartLuigiWheels0, - &gKartYoshiWheels0, - &gKartToadWheels0, - &gKartDKWheels0, - &gKartWarioWheels0, - &gKartPeachWheels0, - &gKartBowserWheels0, -}; -static ? *D_800DDE54[8] = { - &gKartMarioWheels1, - &gKartLuigiWheels1, - &gKartYoshiWheels1, - &gKartToadWheels1, - &gKartDKWheels1, - &gKartWarioWheels1, - &gKartPeachWheels1, - &gKartBowserWheels1, -}; -static ? gKartBowserWheels0; /* unable to generate initializer */ -static ? gKartBowserWheels1; /* unable to generate initializer */ -static ? gKartDKWheels0; /* unable to generate initializer */ -static ? gKartDKWheels1; /* unable to generate initializer */ -static ? gKartLuigiWheels0; /* unable to generate initializer */ -static ? gKartLuigiWheels1; /* unable to generate initializer */ -static ? gKartMarioWheels0; /* unable to generate initializer */ -static ? gKartMarioWheels1; /* unable to generate initializer */ -static ? gKartPeachWheels0; /* unable to generate initializer */ -static ? gKartPeachWheels1; /* unable to generate initializer */ -static ? gKartToadWheels0; /* unable to generate initializer */ -static ? gKartToadWheels1; /* unable to generate initializer */ -static ? gKartWarioWheels0; /* unable to generate initializer */ -static ? gKartWarioWheels1; /* unable to generate initializer */ -static ? gKartYoshiWheels0; /* unable to generate initializer */ -static ? gKartYoshiWheels1; /* unable to generate initializer */ +//generated by m2c commit b52d92c2340f6f4ba1aafb464188bb698752fbb0 on Jul-30-2023 +typedef u8 wheels[4][128]; +extern wheels gKartMario168Wheel0; + +extern wheels *gKartMarioWheels0[]; + +extern wheels **D_800DDE34[]; +extern wheels **D_800DDE54[]; void func_80026B4C(Player *player, s8 arg1, s8 arg2, s8 arg3) { s16 temp_t0; s16 temp_t1; @@ -2672,32 +2643,32 @@ void func_80026B4C(Player *player, s8 arg1, s8 arg2, s8 arg3) { if (((temp_v1 & 0x4000) == 0x4000) && !(player->unk_000 & 0x2000)) { if (((temp_v1 & 0x80) != 0x80) && ((temp_v1 & 0x40) != 0x40) && ((temp_v1 & 0x20000) != 0x20000) && ((temp_v1 & 0x80000) != 0x80000) && ((temp_v1 & 0x800000) != 0x800000) && !(player->unk_044 & 0x800)) { if (temp_t0 < 0x15) { - func_80027C74(player, *(D_800DDE34[player->characterId] + (temp_t1 * 4)) + (temp_t0 << 9) + ((temp_t2 >> 8) << 7), (arg3 << 0xE) + (arg2 << 0xC) + (arg1 << 9) + 0x180 + D_802F1F80, 0x0080U); + func_80027C74(player, (s32) D_800DDE34[player->characterId][temp_t1][temp_t0][temp_t2 >> 8], (arg3 << 0xE) + (arg2 << 0xC) + (arg1 << 9) + 0x180 + D_802F1F80, 0x0080U); return; } - func_80027C74(player, *(D_800DDE54[player->characterId] + (temp_t1 * 4)) + (((temp_t0 << 8) - 0x1500) * 2) + ((temp_t2 >> 8) << 7) + 0xC00, (arg3 << 0xE) + (arg2 << 0xC) + (arg1 << 9) + 0x180 + D_802F1F80, 0x0080U); + func_80027C74(player, (s32) (D_800DDE54[player->characterId][temp_t1] + (((temp_t0 << 8) - 0x1500) * 2) + ((temp_t2 >> 8) << 7) + 0xC00), (arg3 << 0xE) + (arg2 << 0xC) + (arg1 << 9) + 0x180 + D_802F1F80, 0x0080U); return; } if (temp_t0 == 0) { - func_80027C74(player, *(D_800DDE34[player->characterId] + (temp_t1 * 4)) + (temp_t0 << 9) + ((temp_t2 >> 8) << 7), (arg3 << 0xE) + (arg2 << 0xC) + (arg1 << 9) + 0x180 + D_802F1F80, 0x0080U); + func_80027C74(player, (s32) D_800DDE34[player->characterId][temp_t1][temp_t0][temp_t2 >> 8], (arg3 << 0xE) + (arg2 << 0xC) + (arg1 << 9) + 0x180 + D_802F1F80, 0x0080U); return; } - func_80027C74(player, *(D_800DDE54[player->characterId] + (temp_t1 * 4)) + (temp_t0 << 9) + ((temp_t2 >> 8) << 7), (arg3 << 0xE) + (arg2 << 0xC) + (arg1 << 9) + 0x180 + D_802F1F80, 0x0080U); + func_80027C74(player, (s32) D_800DDE54[player->characterId][temp_t1][temp_t0][temp_t2 >> 8], (arg3 << 0xE) + (arg2 << 0xC) + (arg1 << 9) + 0x180 + D_802F1F80, 0x0080U); return; } if (((temp_v1 & 0x80) != 0x80) && ((temp_v1 & 0x40) != 0x40) && ((temp_v1 & 0x80000) != 0x80000) && ((temp_v1 & 0x800000) != 0x800000) && ((temp_v1 & 0x20000) != 0x20000) && !(player->unk_044 & 0x800)) { if (temp_t0 < 0x15) { - func_80027C74(player, *(D_800DDE34[player->characterId] + (temp_t1 * 4)) + (temp_t0 << 9) + ((temp_t2 >> 8) << 7), (arg3 << 0xE) + (arg2 << 0xC) + (arg1 << 9) + 0x180 + D_802F1F80, 0x0080U); + func_80027C74(player, (s32) D_800DDE34[player->characterId][temp_t1][temp_t0][temp_t2 >> 8], (arg3 << 0xE) + (arg2 << 0xC) + (arg1 << 9) + 0x180 + D_802F1F80, 0x0080U); return; } - func_80027C74(player, *(D_800DDE54[player->characterId] + (temp_t1 * 4)) + (((temp_t0 << 8) - 0x1500) * 2) + ((temp_t2 >> 8) << 7) + 0xC00, (arg3 << 0xE) + (arg2 << 0xC) + (arg1 << 9) + 0x180 + D_802F1F80, 0x0080U); + func_80027C74(player, (s32) (D_800DDE54[player->characterId][temp_t1] + (((temp_t0 << 8) - 0x1500) * 2) + ((temp_t2 >> 8) << 7) + 0xC00), (arg3 << 0xE) + (arg2 << 0xC) + (arg1 << 9) + 0x180 + D_802F1F80, 0x0080U); return; } if (temp_t0 == 0) { - func_80027C74(player, *(D_800DDE34[player->characterId] + (temp_t1 * 4)) + (temp_t0 << 9) + ((temp_t2 >> 8) << 7), (arg3 << 0xE) + (arg2 << 0xC) + (arg1 << 9) + 0x180 + D_802F1F80, 0x0080U); + func_80027C74(player, (s32) D_800DDE34[player->characterId][temp_t1][temp_t0][temp_t2 >> 8], (arg3 << 0xE) + (arg2 << 0xC) + (arg1 << 9) + 0x180 + D_802F1F80, 0x0080U); return; } - func_80027C74(player, *(D_800DDE54[player->characterId] + (temp_t1 * 4)) + (temp_t0 << 9) + ((temp_t2 >> 8) << 7), (arg3 << 0xE) + (arg2 << 0xC) + (arg1 << 9) + 0x180 + D_802F1F80, 0x0080U); + func_80027C74(player, (s32) D_800DDE54[player->characterId][temp_t1][temp_t0][temp_t2 >> 8], (arg3 << 0xE) + (arg2 << 0xC) + (arg1 << 9) + 0x180 + D_802F1F80, 0x0080U); } #else GLOBAL_ASM("asm/non_matchings/code_8001F980/func_80026B4C.s") diff --git a/src/code_80027D00.c b/src/code_80027D00.c index 044563507..b2c2a2536 100644 --- a/src/code_80027D00.c +++ b/src/code_80027D00.c @@ -1733,9 +1733,9 @@ void func_8002B9CC(Player *player, s8 arg1, UNUSED s32 arg2) { f32 temp_f14; if ((player->unk_046 & 2) == 2) { - temp_f0 = D_8018CE10[arg1].unk_04; + temp_f0 = D_8018CE10[arg1].unk_04[0]; temp_f2 = 0; - temp_f14 = D_8018CE10[arg1].unk_0C; + temp_f14 = D_8018CE10[arg1].unk_04[2]; if (sqrtf((temp_f0 * temp_f0) + (temp_f2 * temp_f2) + (temp_f14 * temp_f14)) >= 6.5) { player->unk_08C /= 4; player->unk_09C /= 4; diff --git a/src/code_80057C60.c b/src/code_80057C60.c index c35cad19f..0bc5be715 100644 --- a/src/code_80057C60.c +++ b/src/code_80057C60.c @@ -1101,77 +1101,55 @@ void func_8005A070(void) { func_8008C1E0(&D_80165678, (s32)&D_801655F0); } -#ifdef MIPS_TO_C -//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b -extern ? D_8018CE24; - void func_8005A14C(s32 playerId) { - s32 sp2C; - s32 sp28; - Player *sp24; - Player *temp_t0; - s32 temp_a3; - struct_80165C18_entry *temp_s0; - struct_80165C18_entry *temp_s0_2; - u16 temp_v1; + s32 objectIndex; + s32 lapCount; + Player *player; + s32 stackPadding; - temp_t0 = &gPlayerOne[playerId]; - sp28 = gLapCountByPlayerId[playerId]; - temp_a3 = *(&D_8018CE24 + (playerId << 5)); - if (temp_t0->unk_000 & 0x8000) { - if (temp_t0->unk_0BC & 0x204C0) { - temp_s0 = &D_80165C18[temp_a3]; - temp_s0->unk_0BE[2] += 0x1000; + player = &gPlayerOne[playerId]; + objectIndex = D_8018CE10[playerId].objectIndex; + lapCount = gLapCountByPlayerId[playerId]; + if (player->unk_000 & 0x8000) { + if (player->unk_0BC & 0x204C0) { + D_80165C18[objectIndex].unk_0BE[2] += 0x1000; } else { - temp_s0_2 = &D_80165C18[temp_a3]; - temp_v1 = temp_s0_2->unk_0BE[2]; - if (temp_v1 != 0) { - temp_s0_2->unk_0BE[2] = temp_v1 + 0x1000; + if (D_80165C18[objectIndex].unk_0BE[2] != 0) { + D_80165C18[objectIndex].unk_0BE[2] += 0x1000; } } - if (temp_t0->unk_0BC & 0x40000000) { - sp2C = temp_a3; - sp24 = temp_t0; - f32_step_towards(&D_80165C18[temp_a3].unk_000, 0.3f, 0.02f); + if (player->unk_0BC & 0x40000000) { + f32_step_towards(&D_80165C18[objectIndex].sizeScaling, 0.3f, 0.02f); } else { - sp2C = temp_a3; - sp24 = temp_t0; - f32_step_towards(&D_80165C18[temp_a3].unk_000, 0.6f, 0.02f); + f32_step_towards(&D_80165C18[objectIndex].sizeScaling, 0.6f, 0.02f); } - if (sp24->unk_0BC & 0x04000000) { - sp24 = sp24; - u16_step_up_towards(&D_80165C18[temp_a3].unk_000 + 0xBE, 0x0C00U, 0x0100U); + if (player->unk_0BC & 0x04000000) { + u16_step_up_towards(&D_80165C18[objectIndex].unk_0BE[0], 0x0C00U, 0x0100U); } else { - sp24 = sp24; - u16_step_down_towards(&D_80165C18[temp_a3].unk_000 + 0xBE, 0, 0x00000100); + u16_step_down_towards(&D_80165C18[objectIndex].unk_0BE[0], 0, 0x00000100); } - if (sp24->unk_0BC & 0x03000000) { - sp24 = sp24; - func_80087D24(sp2C, 6.0f, 1.5f, 0.0f); + if (player->unk_0BC & 0x03000000) { + func_80087D24(objectIndex, 6.0f, 1.5f, 0.0f); } else { - sp24 = sp24; - f32_step_towards(&D_80165C18[temp_a3].unk_000 + 0x2C, 0.0f, 1.0f); + f32_step_towards(&D_80165C18[objectIndex].unk_028[1], 0.0f, 1.0f); } - if ((sp24->unk_000 & 0x100) || (sp24->unk_0BC & 0x80000000)) { - D_80165C18[temp_a3].unk_000.unkA0 = 0x0050; + if ((player->unk_000 & 0x100) || (player->unk_0BC & 0x80000000)) { + D_80165C18[objectIndex].unk_0A0 = 0x0050; } else { - D_80165C18[temp_a3].unk_000.unkA0 = 0x00FF; + D_80165C18[objectIndex].unk_0A0 = 0x00FF; } - if (sp28 >= 3) { - D_80165C18[temp_a3].unk_000.unkC2 = 0; - D_80165C18[temp_a3].unk_000.unkC0 = 0; - D_80165C18[temp_a3].unk_000.unkBE = 0; - D_80165C18[temp_a3].unk_000.unk30 = 0.0f; - D_80165C18[temp_a3].unk_000.unk2C = 0.0f; - D_80165C18[temp_a3].unk_000.unk28 = 0.0f; - D_80165C18[temp_a3].unk_000.unkA0 = 0x00FF; - D_80165C18[temp_a3].unk_000 = 0.6f; + if (lapCount >= 3) { + D_80165C18[objectIndex].unk_0BE[2] = 0; + D_80165C18[objectIndex].unk_0BE[1] = 0; + D_80165C18[objectIndex].unk_0BE[0] = 0; + D_80165C18[objectIndex].unk_028[2] = 0.0f; + D_80165C18[objectIndex].unk_028[1] = 0.0f; + D_80165C18[objectIndex].unk_028[0] = 0.0f; + D_80165C18[objectIndex].sizeScaling = 0.6f; + D_80165C18[objectIndex].unk_0A0 = 0x00FF; } } } -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8005A14C.s") -#endif void func_8005A380(void) { s32 temp_s0; diff --git a/src/code_8006E9C0.c b/src/code_8006E9C0.c index f53d2ab47..26b2b3af9 100644 --- a/src/code_8006E9C0.c +++ b/src/code_8006E9C0.c @@ -5,20 +5,12 @@ #include "code_8006E9C0.h" #include "code_80071F00.h" #include "objects.h" +#include "variables.h" #include "common_textures.h" #include #include #include "audio/external.h" -void func_8006FA94(void); -void func_80071428(void); -void func_80071818(void); -void func_80071C28(void); -void func_80070148(void); -void func_8006EB10(void); -void func_80071A20(void); - - void func_8006E9C0(void) { func_8006EA5C(); @@ -42,6 +34,7 @@ void func_8006E9C0(void) { } void func_8006EA5C(void) { + s32 thing; func_8006EB10(); func_8006ED60(); bzero(D_8018CA70, D_8018CA70_SIZE * sizeof(struct_8018CA70_entry)); @@ -61,6 +54,7 @@ void func_8006EA5C(void) { D_8018CB64 = 0; D_8018CBE8 = 0; D_8018CC6C = 0; + /** D_8018CA70[0].lapCount = 0; D_8018CA70[0].alsoLapCount = 0; @@ -78,6 +72,15 @@ void func_8006EA5C(void) { D_8018CA70[1].raceCompleteBool = 0; D_8018CA70[2].raceCompleteBool = 0; D_8018CA70[3].raceCompleteBool = 0; + + // This is close but it puts the raceCompletedBool stuff in the wrong place + // Which makes sense, but its still annoying + for (thing = 0; thing < D_8018CA70_SIZE; thing++) { + D_8018CA70[thing].lapCount = 0; + D_8018CA70[thing].alsoLapCount = 0; + D_8018CA70[thing].unk_81 = 0; + D_8018CA70[thing].raceCompleteBool = 0; + } **/ } @@ -216,14 +219,14 @@ void func_8006EE7C(s32 objectIndex) { temp_v0 = &D_80165C18[objectIndex]; temp_v0->unk_0A4 = 0; temp_v0->unk_0D2 = temp_v0->unk_0A4; - temp_v0->unk_068 = (s32 *) gTLUTItemWindowNone; - temp_v0->unk_060 = (s32 *) gTLUTItemWindowNone; - temp_v0->unk_06C = gTextureItemWindowNone; - temp_v0->unk_064 = gTextureItemWindowNone; + temp_v0->tlutList = (s32 *) gTLUTItemWindowNone; + temp_v0->activeTLUT = (s32 *) gTLUTItemWindowNone; + temp_v0->textureList = gTextureItemWindowNone; + temp_v0->activeTexture = gTextureItemWindowNone; temp_v0->unk_04C = -1; temp_v0->unk_09C = 0x00A0; // Screen X position temp_v0->unk_09E = -0x0020; // Screen Y position - temp_v0->unk_000 = 1.0f; + temp_v0->sizeScaling = 1.0f; } #ifdef MIPS_TO_C @@ -1033,23 +1036,13 @@ void func_8006FA94(void) { GLOBAL_ASM("asm/non_matchings/code_8006E9C0/func_8006FA94.s") #endif -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -extern s32 D_8018CE24; -extern ? D_8018CF24; - void func_80070148(void) { - s32 *var_s0; + s32 var_s0; - var_s0 = &D_8018CE24; - do { - find_unused_obj_index(var_s0); - var_s0 += 0x20; - } while (var_s0 != &D_8018CF24); + for (var_s0 = 0; var_s0 < 8; var_s0++) { + find_unused_obj_index(&D_8018CE10[var_s0].objectIndex); + } } -#else -GLOBAL_ASM("asm/non_matchings/code_8006E9C0/func_80070148.s") -#endif void func_80070190(void) { s32 loopIndex; @@ -1066,67 +1059,34 @@ void func_80070190(void) { } } -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -extern Vtx D_0D005FB0; -extern s32 D_8018D220; - -void func_80070250(s32 objectIndex, s32 arg1, void *arg2) { - struct_80165C18_entry *sp20; - f32 var_f6; +void func_80070250(s32 objectIndex, s32 arg1, StarSpawn *arg2) { struct_80165C18_entry *temp_v0; - u16 temp_t1; func_800723A4(objectIndex, arg1); temp_v0 = &D_80165C18[objectIndex]; + temp_v0->unk_0D5 = arg2->id; temp_v0->unk_0A4 = 0; - temp_v0->unk_0D5 = (u8) arg2->unk6; - temp_v0->unk_0C0 = arg2->unk0; - temp_v0->unk_09E = (s16) arg2->unk2; - temp_t1 = arg2->unk4; - var_f6 = (f32) temp_t1; - if ((s32) temp_t1 < 0) { - var_f6 += 4294967296.0f; - } - temp_v0->unk_000 = (f32) ((f64) var_f6 / 100.0); - sp20 = temp_v0; - temp_v0->unk_064 = (arg2->unk6 << 0xA) + D_8018D220; - func_80073404(objectIndex, 0x40U, 0x20U, (s32) &D_0D005FB0); + temp_v0->unk_0BE[1] = arg2->pos[0]; + temp_v0->unk_09E = arg2->pos[1]; + temp_v0->sizeScaling = (f32) arg2->pos[2] / 100.0; + temp_v0->activeTexture = &D_8018D220[arg2->id]; + func_80073404(objectIndex, 0x40U, 0x20U, D_0D005FB0); temp_v0->unk_0A0 = 0x00FF; } -#else -GLOBAL_ASM("asm/non_matchings/code_8006E9C0/func_80070250.s") -#endif -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -void func_80070250(s32, ?, void *); /* extern */ -extern ? D_8018CC80; -extern s32 D_8018D1F0; -extern s32 D_8018D1F8; -extern s8 D_8018D230; - -void func_80070328(void *arg0) { - s32 var_s1; - s32 var_s2; - void *var_s0; - - var_s2 = 0; - var_s0 = arg0; - var_s1 = 0; +void func_80070328(StarSpawn *arg0) { + s32 var_s0 = 0; + StarSpawn *test = arg0; do { - func_80070250(find_unused_obj_index(&D_8018CC80 + (D_8018D1F8 * 4) + var_s1), 1, var_s0); - var_s2 += 1; - var_s1 += 4; - var_s0 += 8; - } while (var_s0->unk8 != 0xFFFF); - D_8018D1F8 += var_s2; - D_8018D1F0 = var_s2; + if(1) {} + func_80070250(find_unused_obj_index(&D_8018CC80[D_8018D1F8 + var_s0]), 1, test); + var_s0++; + test++; + } while (test->pos[0] != 0xFFFF); + D_8018D1F8 += var_s0; + D_8018D1F0 = var_s0; D_8018D230 = 0; } -#else -GLOBAL_ASM("asm/non_matchings/code_8006E9C0/func_80070328.s") -#endif /** * This function is part of the spawning for the "stars" in some stages @@ -1139,76 +1099,42 @@ GLOBAL_ASM("asm/non_matchings/code_8006E9C0/func_80070328.s") * They have no true x/y/z position, instead they seem to be kept in a position relative to the * player they hang around. There is however an x/y position for where they should be on screen * when they are visbile (unk_09E[0] and [1]). - * unk_000 is some sort of size scaling on the start texture. + * sizeScaling is some sort of size scaling on the start texture. * unk_0A2 is an alpha value, used to make the star twinkle. **/ -void func_800703E0(s32 objectIndex, s32 arg1, u16 *arg2) { +void func_800703E0(s32 objectIndex, s32 arg1, StarSpawn *arg2) { struct_80165C18_entry *temp_v0; func_800723A4(objectIndex, arg1); temp_v0 = &D_80165C18[objectIndex]; - temp_v0->unk_0D5 = arg2[3]; // No idea, all 0's for stars + temp_v0->unk_0D5 = arg2->id; // No idea, all 0's for stars temp_v0->unk_0A4 = 1; - temp_v0->unk_0BE[1] = arg2[0]; // No idea - temp_v0->unk_09E = arg2[1]; // screen Y position - temp_v0->unk_000 = (f32)arg2[2] / 100.0; // some type of scaling on the texture - temp_v0->unk_064 = D_0D0293D8; + temp_v0->unk_0BE[1] = arg2->pos[0]; // No idea + temp_v0->unk_09E = arg2->pos[1]; // screen Y position + temp_v0->sizeScaling = (f32)arg2->pos[2] / 100.0; // some type of scaling on the texture + temp_v0->activeTexture = D_0D0293D8; func_80073404(objectIndex, 0x10U, 0x10U, D_0D005770); } -#ifdef MIPS_TO_C -//generated by m2c commit 44f261a363c51a295be8efe3d7ca7f4d2c967e9b on Dec-31-2022 -extern ? D_8018CC80; -extern s32 D_8018D1F8; -extern s8 D_8018D230; - -void func_800704A0(u16 *arg0) { - s32 var_s1; - s32 var_s2; - u16 *var_s0; - - var_s2 = 0; - var_s0 = arg0; - var_s1 = 0; +void func_800704A0(StarSpawn *arg0) { + s32 var_s0 = 0; + StarSpawn *test = arg0; do { - func_800703E0(find_unused_obj_index(&D_8018CC80 + (D_8018D1F8 * 4) + var_s1), 1, var_s0); - var_s2 += 1; - var_s1 += 4; - var_s0 += 8; - } while (var_s0->unk8 != 0xFFFF); - D_8018D1F8 += var_s2; - D_8018D1F0 = var_s2; + if(1) {} + func_800703E0(find_unused_obj_index(&D_8018CC80[D_8018D1F8 + var_s0]), 1, test); + var_s0++; + test++; + } while (test->pos[0] != 0xFFFF); + D_8018D1F8 += var_s0; + D_8018D1F0 = var_s0; D_8018D230 = 1; } -#else -GLOBAL_ASM("asm/non_matchings/code_8006E9C0/func_800704A0.s") -#endif - -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -void func_80070328(? *); /* extern */ -void func_800704A0(? *); /* extern */ -extern ? D_8018CC80; -extern s32 D_8018D1F0; -extern s32 D_8018D1F8; -static ? D_800E6A38; /* unable to generate initializer */ -static ? D_800E6AA8; /* unable to generate initializer */ -static ? D_800E6B00; /* unable to generate initializer */ -static ? D_800E6B38; /* unable to generate initializer */ -static ? D_800E6BA8; /* unable to generate initializer */ -static ? D_800E6C10; /* unable to generate initializer */ -static ? D_800E6C80; /* unable to generate initializer */ -static ? D_800E6DE0; /* unable to generate initializer */ -s16 gCurrentCourseId; /* unable to generate initializer */ void func_8007055C(void) { s32 var_s0; - s32 var_s1; s32 var_s4; - u16 temp_t6; - temp_t6 = (u16) gCurrentCourseId; - switch (temp_t6) { + switch (gCurrentCourseId) { case 0: func_80070328(&D_800E6C10); break; @@ -1216,55 +1142,47 @@ void func_8007055C(void) { func_80070328(&D_800E6AA8); break; case 5: - var_s4 = 0x19; - var_s0 = 0; if (D_8018EDF3 == 1) { var_s4 = 0x32; + } else { + var_s4 = 0x19; } - var_s1 = 0; - if (var_s4 > 0) { - do { - find_unused_obj_index(&D_8018CC80 + (D_8018D1F8 * 4) + var_s0); - var_s1 += 1; - var_s0 += 4; - } while (var_s1 != var_s4); + for (var_s0 = 0; var_s0 < var_s4; var_s0++) { + find_unused_obj_index(&D_8018CC80[D_8018D1F8 + var_s0]); } - D_8018D1F8 += var_s1; - D_8018D1F0 = var_s1; + D_8018D1F8 += var_s0; + D_8018D1F0 = var_s0; break; case 6: - func_80070328(&D_800E6B00); + func_80070328(D_800E6B00); break; case 7: - func_80070328(&D_800E6B38); + func_80070328(D_800E6B38); break; case 8: - func_80070328(&D_800E6A38); + func_80070328(D_800E6A38); break; case 9: - func_80070328(&D_800E6AA8); + func_80070328(D_800E6AA8); break; case 10: - func_800704A0(&D_800E6C80); + func_800704A0(D_800E6C80); break; case 11: - func_80070328(&D_800E6C10); + func_80070328(D_800E6C10); break; case 12: - func_80070328(&D_800E6BA8); + func_80070328(D_800E6BA8); break; case 13: - func_800704A0(&D_800E6C80); + func_800704A0(D_800E6C80); break; case 14: - func_800704A0(&D_800E6DE0); + func_800704A0(D_800E6DE0); break; } func_8008C23C(); } -#else -GLOBAL_ASM("asm/non_matchings/code_8006E9C0/func_8007055C.s") -#endif void func_80070714(void) { D_80165730 = 1; @@ -1280,39 +1198,30 @@ void func_80070714(void) { } #ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -void func_800770F0(s32); /* extern */ -extern s32 gTLUTBat; -extern s32 D_06007DB8; -extern s16 D_80165750; +//generated by m2c commit b52d92c2340f6f4ba1aafb464188bb698752fbb0 on Jul-28-2023 +extern u8 D_06007DB8; extern ? *D_80165758; -extern s8 D_80165898; extern ? D_80183EB0; extern ? D_80183EC8; extern ? D_80183EDC; extern ? D_80183F34; extern ? D_80183F3C; extern ? D_80183F50; -extern ? D_8018C0B0; -extern s32 D_8018C1B0; extern ? D_8018C278; -extern s32 D_8018C3F0; extern ? D_8018C404; extern ? D_8018C5F0; -extern s32 D_8018C630; extern ? D_8018C6B0; extern s32 D_8018CF10; -extern f32 D_8018D01C; extern s8 D_8018D198; -extern s32 D_8018D1A0; extern s8 D_8018D1A8; extern ? D_8018D1B3; extern s8 D_8018D1B8; -extern s32 D_8018D1C4; +extern ? D_8018D1C4; extern s32 D_8018D1C8; extern s32 D_8018D1D0; extern s32 D_8018D1D8; -extern s32 gGamestate; +extern u8 gTLUTBat; +s16 gCurrentCourseId; /* unable to generate initializer */ static ? D_800E5728; /* unable to generate initializer */ static ? D_800E5854; /* unable to generate initializer */ static ? D_800E5894; /* unable to generate initializer */ @@ -1325,7 +1234,6 @@ static ? D_800E5F80; /* unable to generate initia static ? D_800E5FD0; /* unable to generate initializer */ static ? D_800E6360; /* unable to generate initializer */ static ? D_800E641A; /* unable to generate initializer */ -s16 gCurrentCourseId; /* unable to generate initializer */ void func_80070780(void) { struct_80165C18_entry *sp4C; @@ -1343,8 +1251,6 @@ void func_80070780(void) { f32 temp_f0_4; f32 temp_f0_5; f32 temp_f18; - f32 temp_f2; - f32 temp_f2_2; f32 temp_f4; f32 temp_f4_2; f32 temp_f6; @@ -1392,8 +1298,6 @@ void func_80070780(void) { s32 temp_s0_8; s32 temp_s0_9; s32 temp_t9; - s32 temp_v0; - s32 temp_v0_11; s32 var_s2; s32 var_s3; s32 var_s3_2; @@ -1403,8 +1307,7 @@ void func_80070780(void) { s8 *var_s0_5; s8 *var_s0_6; s8 *var_s0_7; - s8 temp_v0_10; - struct_80165C18_entry *temp_v0_12; + struct_80165C18_entry *temp_v0; struct_80165C18_entry *temp_v0_2; struct_80165C18_entry *temp_v0_3; struct_80165C18_entry *temp_v0_4; @@ -1413,16 +1316,14 @@ void func_80070780(void) { struct_80165C18_entry *temp_v0_7; struct_80165C18_entry *temp_v0_8; struct_80165C18_entry *temp_v0_9; - u16 temp_t6; - temp_t6 = (u16) gCurrentCourseId; - switch (temp_t6) { + switch ((u16) gCurrentCourseId) { case 0: if (gGamestate != 9) { - if (gModeSelection == GRAND_PRIX) { + if (gModeSelection == 0) { func_80070714(); } - var_s0 = &D_8018C630; + var_s0 = D_8018C630; var_s3 = 0; if (D_80165738 > 0) { do { @@ -1441,15 +1342,15 @@ void func_80070780(void) { case 2: D_80165750 = 0x000B; D_80165758 = &D_800E5894; - switch (gCCSelection) { /* switch 1; irregular */ - case CC_100: /* switch 1 */ - case CC_EXTRA: /* switch 1 */ + switch (gCCSelection) { /* switch 1; irregular */ + case 1: /* switch 1 */ + case 3: /* switch 1 */ break; - case CC_50: /* switch 1 */ + case 0: /* switch 1 */ D_80165750 = 8; D_80165758 = &D_800E5854; break; - case CC_150: /* switch 1 */ + case 2: /* switch 1 */ D_80165750 = 0x000C; D_80165758 = &D_800E58EC; break; @@ -1464,54 +1365,54 @@ void func_80070780(void) { temp_v1 = D_80165758 + var_s2; var_s3_2 += 1; temp_f6 = (f32) temp_v1->unk0; - temp_v0_2 = &D_80165C18[temp_s0]; + temp_v0 = &D_80165C18[temp_s0]; var_s2 += 8; var_s1 += 4; - temp_v0_2->unk_010[0] = temp_f6 * D_8018D01C; - temp_v0_2->unk_010[2] = (f32) temp_v1->unk2; - temp_v0_2->unk_0D5 = (u8) temp_v1->unk4; - temp_v0_2->unk_0A0 = temp_v1->unk6; + temp_v0->unk_010[0] = temp_f6 * D_8018D01C; + temp_v0->unk_010[2] = (f32) temp_v1->unk2; + temp_v0->unk_0D5 = (u8) temp_v1->unk4; + temp_v0->unk_0A0 = temp_v1->unk6; } while (var_s3_2 < D_80165750); var_s3_2 = 0; } temp_s0_2 = *D_80183F28; func_800723A4(temp_s0_2, 0); var_s1_2 = &D_800E5728; - temp_v0_3 = &D_80165C18[temp_s0_2]; + temp_v0_2 = &D_80165C18[temp_s0_2]; var_s2_2 = D_8018BFA8; - temp_v0_3->unk_004[1] = 80.0f; - temp_v0_3->unk_004[0] = (f32) ((f64) D_8018D01C * -68.0); - temp_v0_3->unk_004[2] = -1840.0f; + temp_v0_2->pos[1] = 80.0f; + temp_v0_2->pos[0] = (f32) ((f64) D_8018D01C * -68.0); + temp_v0_2->pos[2] = -1840.0f; do { temp_s0_3 = *var_s2_2; func_800723A4(temp_s0_3, 0); temp_t9 = var_s3_2 & 1; - temp_v0_4 = &D_80165C18[temp_s0_3]; + temp_v0_3 = &D_80165C18[temp_s0_3]; var_s3_2 += 1; var_s2_2 += 4; - temp_v0_4->unk_004[1] = (f32) var_s1_2->unk2; - temp_v0_4->unk_004[0] = (f32) var_s1_2->unk0 * D_8018D01C; - temp_v0_4->unk_0C0 = 0; - temp_v0_4->unk_004[2] = (f32) var_s1_2->unk4; + temp_v0_3->pos[1] = (f32) var_s1_2->unk2; + temp_v0_3->pos[0] = (f32) var_s1_2->unk0 * D_8018D01C; + temp_v0_3->unk_0BE[1] = 0; + temp_v0_3->pos[2] = (f32) var_s1_2->unk4; if (temp_t9 != 0) { - temp_v0_4->unk_0C0 = 0x8000; + temp_v0_3->unk_0BE[1] = 0x8000; } var_s1_2 += 6; } while (var_s3_2 < 4); var_s0_2 = D_8018C030; do { - func_80071F6C((s32) var_s0_2); + func_80071F6C(var_s0_2); var_s0_2 += 4; - } while (var_s0_2 != &D_8018C0B0); + } while (var_s0_2 != D_8018C0B0); return; case 3: if (gGamestate != 9) { temp_s0_4 = D_80183EA0->unk0; func_80073444(temp_s0_4, &gTLUTBat, &D_06007DB8, 0x20U, (u16) 0x00000040); - temp_v0_5 = &D_80165C18[temp_s0_4]; - temp_v0_5->unk_0B2[0] = 0; - temp_v0_5->unk_0B2[1] = 0; - temp_v0_5->unk_0B2[2] = 0x8000; + temp_v0_4 = &D_80165C18[temp_s0_4]; + temp_v0_4->unk_0B2[0] = 0; + temp_v0_4->unk_0B2[1] = 0; + temp_v0_4->unk_0B2[2] = 0x8000; func_800723A4(D_80183EA0->unk4, 0); func_800723A4(D_80183EA0->unk8, 0); return; @@ -1531,33 +1432,32 @@ void func_80070780(void) { temp_s0_5 = *var_s2_3; sp44 = var_v1; func_800723A4(temp_s0_5, 0); - temp_f2 = D_8018D01C; - temp_f0 = (f32) var_s1_4->unk0 * temp_f2; - temp_v0_6 = &D_80165C18[temp_s0_5]; - temp_v0_6->unk_010[0] = temp_f0; - temp_v0_6->unk_004[0] = temp_f0; + temp_f0 = (f32) var_s1_4->unk0 * D_8018D01C; + temp_v0_5 = &D_80165C18[temp_s0_5]; + temp_v0_5->unk_010[0] = temp_f0; + temp_v0_5->pos[0] = temp_f0; temp_f10 = var_s1_4->unk4; temp_t1 = var_s1_4->unk6; temp_t5 = var_v1->unk4; temp_f0_2 = (f32) ((f64) var_s1_4->unk2 + 6.0); - temp_f4 = (f32) var_v1->unk0 * temp_f2; + temp_f4 = (f32) var_v1->unk0 * D_8018D01C; var_v1 += 6; var_s2_3 += 4; - temp_v0_6->unk_044 = temp_f0_2; - temp_v0_6->unk_004[1] = temp_f0_2; + temp_v0_5->unk_044 = temp_f0_2; + temp_v0_5->pos[1] = temp_f0_2; var_s1_4 += 8; temp_f0_3 = (f32) temp_f10; - temp_v0_6->unk_0D5 = (u8) temp_t1; - temp_v0_6->unk_09E = temp_t5; - temp_v0_6->unk_010[2] = temp_f0_3; - temp_v0_6->unk_004[2] = temp_f0_3; - temp_v0_6->unk_09C = (s16) (s32) temp_f4; + temp_v0_5->unk_0D5 = (u8) temp_t1; + temp_v0_5->unk_09E = temp_t5; + temp_v0_5->unk_010[2] = temp_f0_3; + temp_v0_5->pos[2] = temp_f0_3; + temp_v0_5->unk_09C = (s16) (s32) temp_f4; } while (var_v1 != &D_800E5EE6); return; } break; case 5: - var_s1_5 = &D_8018C1B0; + var_s1_5 = D_8018C1B0; do { find_unused_obj_index(var_s1_5); var_s1_5 += 4; @@ -1570,24 +1470,24 @@ void func_80070780(void) { temp_s0_6 = *var_s2_4; sp44 = var_v1_2; func_800723A4(temp_s0_6, 0); - temp_v0_7 = &D_80165C18[temp_s0_6]; + temp_v0_6 = &D_80165C18[temp_s0_6]; temp_s0_7 = *var_s1_6; - temp_v0_7->unk_010[0] = (f32) var_v1_2->unk0 * D_8018D01C; - temp_v0_7->unk_010[2] = (f32) var_v1_2->unk4; - temp_v0_7->unk_010[1] = (f32) ((f64) var_v1_2->unk2 + 5.0 + 3.0); + temp_v0_6->unk_010[0] = (f32) var_v1_2->unk0 * D_8018D01C; + temp_v0_6->unk_010[2] = (f32) var_v1_2->unk4; + temp_v0_6->unk_010[1] = (f32) ((f64) var_v1_2->unk2 + 5.0 + 3.0); func_800723A4(temp_s0_7, 0); temp_t4 = var_v1_2->unk4; - temp_v0_8 = &D_80165C18[temp_s0_7]; + temp_v0_7 = &D_80165C18[temp_s0_7]; temp_f8 = (f64) var_v1_2->unk2; temp_f4_2 = (f32) var_v1_2->unk0 * D_8018D01C; temp_t5_2 = var_v1_2->unk6; var_v1_2 += 8; var_s1_6 += 4; var_s2_4 += 4; - temp_v0_8->unk_0D5 = (u8) temp_t5_2; - temp_v0_8->unk_010[0] = temp_f4_2; - temp_v0_8->unk_010[1] = (f32) (temp_f8 + 3.0); - temp_v0_8->unk_010[2] = (f32) temp_t4; + temp_v0_7->unk_0D5 = (u8) temp_t5_2; + temp_v0_7->unk_010[0] = temp_f4_2; + temp_v0_7->unk_010[1] = (f32) (temp_f8 + 3.0); + temp_v0_7->unk_010[2] = (f32) temp_t4; } while (var_v1_2 != &D_800E5F80); return; } @@ -1600,21 +1500,20 @@ void func_80070780(void) { temp_s0_8 = *var_s1_7; sp48 = var_v1_3; func_800723A4(temp_s0_8, 0); - temp_f2_2 = D_8018D01C; temp_f6_2 = var_v1_3->unk4; - temp_v0_9 = &D_80165C18[temp_s0_8]; + temp_v0_8 = &D_80165C18[temp_s0_8]; temp_f8_2 = var_v1_3->unk6; temp_f18 = (f32) var_v1_3->unk2; - temp_f0_4 = (f32) var_v1_3->unk0 * temp_f2_2; + temp_f0_4 = (f32) var_v1_3->unk0 * D_8018D01C; var_v1_3 += 8; var_s1_7 += 4; - temp_v0_9->unk_010[0] = temp_f0_4; - temp_v0_9->unk_004[0] = temp_f0_4; + temp_v0_8->unk_010[0] = temp_f0_4; + temp_v0_8->pos[0] = temp_f0_4; temp_f0_5 = (f32) temp_f6_2; - temp_v0_9->unk_01C[0] = temp_f18 * temp_f2_2; - temp_v0_9->unk_010[2] = temp_f0_5; - temp_v0_9->unk_004[2] = temp_f0_5; - temp_v0_9->unk_01C[2] = (f32) temp_f8_2; + temp_v0_8->unk_01C[0] = temp_f18 * D_8018D01C; + temp_v0_8->unk_010[2] = temp_f0_5; + temp_v0_8->pos[2] = temp_f0_5; + temp_v0_8->unk_01C[2] = (f32) temp_f8_2; } while (var_v1_3 != &D_800E5FD0); } var_s2_5 = D_80183F28; @@ -1631,10 +1530,10 @@ void func_80070780(void) { return; case 7: if (gGamestate != 9) { - if (gModeSelection == GRAND_PRIX) { + if (gModeSelection == 0) { func_80070714(); } - var_s0_3 = &D_8018C630; + var_s0_3 = D_8018C630; var_s3_3 = 0; if (D_80165738 > 0) { do { @@ -1649,12 +1548,12 @@ void func_80070780(void) { break; case 8: if (gGamestate != 9) { - if (gModeSelection == GRAND_PRIX) { + if (gModeSelection == 0) { func_80070714(); } D_80165898 = 0; func_800723A4(D_80183EA0->unk0, 0); - var_s0_4 = &D_8018C630; + var_s0_4 = D_8018C630; var_s3_4 = 0; if (D_80165738 > 0) { do { @@ -1669,25 +1568,24 @@ void func_80070780(void) { break; case 9: if (gGamestate != 9) { - temp_v0_10 = D_8018EDF3; var_s1_8 = D_80183EA0; - if ((temp_v0_10 == 1) || ((temp_v0_10 == 2) && (gModeSelection == (s32) VERSUS))) { - switch (gCCSelection) { /* switch 2; irregular */ - case CC_50: /* switch 2 */ + if ((D_8018EDF3 == 1) || ((D_8018EDF3 == 2) && (gModeSelection == (s32) 2))) { + switch (gCCSelection) { /* switch 2; irregular */ + case 0: /* switch 2 */ D_8018D1C8 = 4; D_8018D1D0 = 6; goto block_75; - case CC_100: /* switch 2 */ + case 1: /* switch 2 */ D_8018D1C8 = 5; D_8018D1D0 = 8; D_8018D1D8 = 8; break; - case CC_150: /* switch 2 */ + case 2: /* switch 2 */ D_8018D1C8 = 5; D_8018D1D0 = 8; D_8018D1D8 = 0x0000000A; break; - case CC_EXTRA: /* switch 2 */ + case 3: /* switch 2 */ D_8018D1C8 = 5; D_8018D1D0 = 8; D_8018D1D8 = 8; @@ -1723,21 +1621,21 @@ block_75: var_s1_10 += 4; } while ((u32) var_s0_7 < (u32) &D_8018D1C4); var_s2_6 = &D_800E6360; - var_s1_11 = &D_8018C1B0; + var_s1_11 = D_8018C1B0; do { find_unused_obj_index(var_s1_11); temp_s0_10 = *var_s1_11; func_800723A4(temp_s0_10, 0); - temp_v0_12 = &D_80165C18[temp_s0_10]; - sp4C = temp_v0_12; - temp_v0_12->unk_004[2] = (f32) var_s2_6->unk4; - temp_v0_12->unk_004[0] = (f32) var_s2_6->unk0 * D_8018D01C; + temp_v0_9 = &D_80165C18[temp_s0_10]; + sp4C = temp_v0_9; + temp_v0_9->pos[2] = (f32) var_s2_6->unk4; + temp_v0_9->pos[0] = (f32) var_s2_6->unk0 * D_8018D01C; func_800887C0(temp_s0_10); var_s2_6 += 6; var_s1_11 += 4; - temp_v0_12->unk_000 = 0.7f; + temp_v0_9->sizeScaling = 0.7f; } while ((u32) var_s2_6 < (u32) &D_800E641A); - var_s0_8 = &D_8018C3F0; + var_s0_8 = D_8018C3F0; do { find_unused_obj_index(var_s0_8); var_s0_8 += 4; @@ -1749,17 +1647,17 @@ block_75: if (gGamestate != 9) { find_unused_obj_index(&D_8018CF10); func_800723A4(D_8018CF10, 0); - var_s1_12 = &D_8018C1B0; + var_s1_12 = D_8018C1B0; do { find_unused_obj_index(var_s1_12); var_s1_12 += 4; } while ((u32) var_s1_12 < (u32) &D_8018C278); - var_s0_9 = &D_8018C3F0; + var_s0_9 = D_8018C3F0; do { find_unused_obj_index(var_s0_9); var_s0_9 += 4; } while ((u32) var_s0_9 < (u32) &D_8018C404); - var_s0_10 = &D_8018C630; + var_s0_10 = D_8018C630; do { find_unused_obj_index(var_s0_10); var_s0_10 += 4; @@ -1803,8 +1701,7 @@ GLOBAL_ASM("asm/non_matchings/code_8006E9C0/func_80070780.s") #endif #ifdef MIPS_TO_C -//generated by m2c commit 44f261a363c51a295be8efe3d7ca7f4d2c967e9b on Dec-30-2022 -? func_8007055C(); /* extern */ +//generated by m2c commit b52d92c2340f6f4ba1aafb464188bb698752fbb0 on Jul-28-2023 ? func_80070780(); /* extern */ extern s32 D_80165638; extern s32 D_80165648; @@ -1829,7 +1726,6 @@ extern ? D_8018D0A0; extern ? D_8018D0C8; extern ? D_8018D0F0; extern s32 D_8018D150; -extern s32 D_8018D158; extern s32 D_8018D380; extern s32 D_8018D384; extern s32 D_8018D388; @@ -1839,10 +1735,6 @@ extern s32 D_8018D3C4; extern s32 D_8018D3D4; extern s32 D_8018D3D8; extern s32 D_8018D3DC; -extern s32 D_8018D3E0; -extern s32 D_8018D3E4; -extern s32 D_8018D3E8; -extern s32 D_8018D3EC; extern s32 D_8018D3F0; extern s32 D_8018D3F4; diff --git a/src/code_8006E9C0.h b/src/code_8006E9C0.h index 9ac71a36f..ea282a977 100644 --- a/src/code_8006E9C0.h +++ b/src/code_8006E9C0.h @@ -2,16 +2,28 @@ #define CODE_8006E9C0_H #include "common_structs.h" +#include "code_80071F00.h" void func_8006E9C0(); void func_8006EA5C(); +void func_8006EB10(void); void func_8006ED60(); -u8 *func_8006ED94(u8 *devAddr, u8* baseAddress, u32 size, u32 offset); +u8 *func_8006ED94(u8*, u8*, u32, u32); void func_8006EE44(); void func_8006EE7C(s32); +void func_8006FA94(void); +void func_80070148(void); void func_80070190(); -void func_800703E0(s32, s32, u16*); +void func_80070250(s32, s32, StarSpawn*); +void func_80070328(StarSpawn*); +void func_800703E0(s32, s32, StarSpawn*); +void func_800704A0(StarSpawn*); +void func_8007055C(void); void func_80070714(); +void func_80071428(void); +void func_80071818(void); +void func_80071C28(void); +void func_80071A20(void); extern s32 gScreenModeSelection; extern s8 *gTextureLogoMarioKart64; @@ -23,6 +35,10 @@ extern s8 D_8018EDF3; extern u8 *D_8018D1E0; extern intptr_t D_8018D9B0; +// Destination for decompressed exhaust textures (I think) +// I'm not how much I like this "pointer to an array" setup, but if it matches it matches +extern u8 (*D_8018D220)[1024]; + extern struct_8018CA70_entry D_8018CA70[]; // These are all *technically* hardcoded references to spots in D_8018CA70, but there's something weird // going on match wise in func_8006EA5C that means we have to (for now) leave them as separate variables @@ -43,4 +59,14 @@ extern s8 D_8018CC6D; extern s8 D_8018CC6E; extern s8 D_8018CC7D; +// These are found in data_code_80071F00 +extern StarSpawn D_800E6A38[]; /* unable to generate initializer */ +extern StarSpawn D_800E6AA8[]; /* unable to generate initializer */ +extern StarSpawn D_800E6B00[]; /* unable to generate initializer */ +extern StarSpawn D_800E6B38[]; /* unable to generate initializer */ +extern StarSpawn D_800E6BA8[]; /* unable to generate initializer */ +extern StarSpawn D_800E6C10[]; /* unable to generate initializer */ +extern StarSpawn D_800E6C80[]; /* unable to generate initializer */ +extern StarSpawn D_800E6DE0[]; /* unable to generate initializer */ + #endif diff --git a/src/code_80071F00.c b/src/code_80071F00.c index ed858b4b7..942ff81a9 100644 --- a/src/code_80071F00.c +++ b/src/code_80071F00.c @@ -9,6 +9,7 @@ #include "objects.h" #include "waypoints.h" #include "variables.h" +#include "code_80005FD0.h" #include "code_80057C60.h" #include "code_80071F00.h" #include "code_80086E70.h" @@ -21,32 +22,6 @@ #include "code_8008C1D0.h" #include "code_80091440.h" -extern s32 D_8018D1F0; - -typedef struct { - s16 unk[0x70]; -} UnkStruct_80165CBE; - -extern UnkStruct_80165CBE D_80165CBE[]; - -typedef struct { - u8 unk[0xE0]; -} UnkStruct_80165CF5; - -extern UnkStruct_80165CF5 D_80165CF5[]; - -typedef struct { - f32 unk[0x38]; -} UnkStruct_80165C40; - -extern UnkStruct_80165C40 D_80165C40[]; - -typedef struct { - s16 unk[0x70]; -} UnkStruct_80165CB4; - -extern UnkStruct_80165CB4 D_80165CB4[]; - s32 find_unused_obj_index(s32* arg0) { s32 temp_v0; @@ -673,28 +648,28 @@ s32 func_8007326C(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5) { void func_80073404(s32 arg0, u8 arg1, u8 arg2, Vtx *arg3) { D_80165C18[arg0].unk_074 = arg3; - D_80165C18[arg0].unk_0D9 = arg1; - D_80165C18[arg0].unk_0DA = arg2; + D_80165C18[arg0].textureWidth = arg1; + D_80165C18[arg0].textureHeight = arg2; D_80165C18[arg0].unk_0D2 = 0; D_80165C18[arg0].unk_0D3 = -1; D_80165C18[arg0].unk_054 = 0; } void func_80073444(s32 arg0, u8 *texture, u8* arg2, u8 arg3, u16 arg4) { - D_80165C18[arg0].unk_068 = (u32 *)texture; - D_80165C18[arg0].unk_06C = arg2; - D_80165C18[arg0].unk_0D9 = arg3; - D_80165C18[arg0].unk_0DA = arg4; + D_80165C18[arg0].tlutList = texture; + D_80165C18[arg0].textureList = arg2; + D_80165C18[arg0].textureWidth = arg3; + D_80165C18[arg0].textureHeight = arg4; D_80165C18[arg0].unk_0D2 = 0; D_80165C18[arg0].unk_0D3 = -1; D_80165C18[arg0].unk_054 = 0; } -UNUSED void func_8007348C(s32 arg0, u32* arg1, u8 arg2, u8 arg3, Vtx *arg4) { - D_80165C18[arg0].unk_060 = arg1; - D_80165C18[arg0].unk_068 = arg1; - D_80165C18[arg0].unk_0D9 = arg2; - D_80165C18[arg0].unk_0DA = arg3; +UNUSED void func_8007348C(s32 arg0, u8 *arg1, u8 arg2, u8 arg3, Vtx *arg4) { + D_80165C18[arg0].activeTLUT = arg1; + D_80165C18[arg0].tlutList = arg1; + D_80165C18[arg0].textureWidth = arg2; + D_80165C18[arg0].textureHeight = arg3; D_80165C18[arg0].unk_074 = arg4; D_80165C18[arg0].unk_0D2 = 0; D_80165C18[arg0].unk_0D3 = -1; @@ -705,39 +680,33 @@ UNUSED void func_800734D4() { } void func_800734DC(s32 arg0) { - D_80165C18[arg0].unk_060 = D_80165C18[arg0].unk_068 + (D_80165C18[arg0].unk_0D2 << 7); - D_80165C18[arg0].unk_064 = D_80165C18[arg0].unk_06C; + // I have no idea why this typecast works + D_80165C18[arg0].activeTLUT = (u32*)D_80165C18[arg0].tlutList + (D_80165C18[arg0].unk_0D2 << 7); + D_80165C18[arg0].activeTexture = D_80165C18[arg0].textureList; } void func_80073514(s32 arg0) { - D_80165C18[arg0].unk_060 = D_80165C18[arg0].unk_068; - D_80165C18[arg0].unk_064 = D_80165C18[arg0].unk_06C + (D_80165C18[arg0].unk_0D9 * D_80165C18[arg0].unk_0DA * D_80165C18[arg0].unk_0D2); + D_80165C18[arg0].activeTLUT = D_80165C18[arg0].tlutList; + D_80165C18[arg0].activeTexture = D_80165C18[arg0].textureList + (D_80165C18[arg0].textureWidth * D_80165C18[arg0].textureHeight * D_80165C18[arg0].unk_0D2); } UNUSED void func_80073568() { } -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -//extern struct struct_E0 D_80165C18[]; -extern s32 D_8018D1EC; +UNUSED void func_80073570(s32 objectIndex) { + s16 *test = &D_80165C18[objectIndex].unk_0A6; -// separated from asm in code_80071F00/func_80073514.s -UNUSED void func_80073570(s32 arg0) { D_8018D1EC++; if (D_8018D1EC == 5) { D_8018D1EC = 0; } - D_80165C18[arg0].unk_0A6++; -} -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80073570.s") -#endif + (*test)++; +} void func_800735BC(s32 arg0, Gfx *arg1, f32 arg2) { D_80165C18[arg0].unk_054 = 0; D_80165C18[arg0].unk_070 = arg1; - D_80165C18[arg0].unk_000 = arg2; + D_80165C18[arg0].sizeScaling = arg2; func_80072488(arg0); } @@ -1173,8 +1142,8 @@ void func_800745C8(s32 objectIndex, s32 arg1) { if ((D_80165C18[objectIndex].unk_054 & 1) != 0) { phi_a1 = 0; - if (D_80165C18[objectIndex].unk_068 != D_80165C18[objectIndex].unk_060) { - D_80165C18[objectIndex].unk_060 = D_80165C18[objectIndex].unk_068; + if (D_80165C18[objectIndex].tlutList != D_80165C18[objectIndex].activeTLUT) { + D_80165C18[objectIndex].activeTLUT = D_80165C18[objectIndex].tlutList; } D_80165C18[objectIndex].unk_054 ^= 2; @@ -1182,7 +1151,7 @@ void func_800745C8(s32 objectIndex, s32 arg1) { phi_a1 = 1; } - D_80165C18[objectIndex].unk_064 = (u8 *) (D_80165C18[objectIndex].unk_0D9 * D_80165C18[objectIndex].unk_0DA * phi_a1) + arg1; + D_80165C18[objectIndex].activeTexture = (u8 *) (D_80165C18[objectIndex].textureWidth * D_80165C18[objectIndex].textureHeight * phi_a1) + arg1; func_800744A0(objectIndex); } } @@ -1191,13 +1160,14 @@ void func_8007466C(s32 arg0, s32 arg1) { s32 phi_a1; if ((D_80165C18[arg0].unk_054 & 1) != 0) { - D_80165C18[arg0].unk_060 = D_80165C18[arg0].unk_068 + (D_80165C18[arg0].unk_0D3 << 7) ; + // I have no idea why this typecase works + D_80165C18[arg0].activeTLUT = (u32*)D_80165C18[arg0].tlutList + (D_80165C18[arg0].unk_0D3 << 7) ; D_80165C18[arg0].unk_054 ^= 2; phi_a1 = 0; if ((D_80165C18[arg0].unk_054 & 2) != 0) { phi_a1 = 1; } - D_80165C18[arg0].unk_064 = (u8 *) (D_80165C18[arg0].unk_0D9 * D_80165C18[arg0].unk_0DA * phi_a1) + arg1; + D_80165C18[arg0].activeTexture = (u8 *) (D_80165C18[arg0].textureWidth * D_80165C18[arg0].textureHeight * phi_a1) + arg1; func_800744A0(arg0); } } @@ -1206,13 +1176,13 @@ void func_80074704(s32 arg0, s32 arg1) { s32 phi_a1; if ((D_80165C18[arg0].unk_054 & 1) != 0) { - D_80165C18[arg0].unk_060 = D_80165C18[arg0].unk_068; + D_80165C18[arg0].activeTLUT = D_80165C18[arg0].tlutList; D_80165C18[arg0].unk_054 ^= 2; phi_a1 = 0; if ((D_80165C18[arg0].unk_054 & 2) != 0) { phi_a1 = 1; } - D_80165C18[arg0].unk_064 = (u8 *) (D_80165C18[arg0].unk_0D9 * D_80165C18[arg0].unk_0DA * phi_a1) + arg1; + D_80165C18[arg0].activeTexture = (u8 *) (D_80165C18[arg0].textureWidth * D_80165C18[arg0].textureHeight * phi_a1) + arg1; func_800744A0(arg0); } } @@ -1225,14 +1195,14 @@ u8 *func_80074790(s32 arg0, u8 *arg1) { if ((D_80165C18[arg0].unk_054 & 4) != 0) { phi_a2 = 1; } - return (D_80165C18[arg0].unk_0D9 * D_80165C18[arg0].unk_0DA * phi_a2) + arg1; + return (D_80165C18[arg0].textureWidth * D_80165C18[arg0].textureHeight * phi_a2) + arg1; } void func_800747F0(s32 objectIndex, u8 *arg1) { u8 *sp24; if (D_80165C18[objectIndex].unk_0D2 != D_80165C18[objectIndex].unk_0D3) { - sp24 = D_80165C18[objectIndex].unk_06C + (D_80165C18[objectIndex].unk_0D9 * D_80165C18[objectIndex].unk_0DA * D_80165C18[objectIndex].unk_0D2); - func_80074574(sp24, (void *) func_80074790(objectIndex, arg1), D_80165C18[objectIndex].unk_0D9, D_80165C18[objectIndex].unk_0DA); + sp24 = D_80165C18[objectIndex].textureList + (D_80165C18[objectIndex].textureWidth * D_80165C18[objectIndex].textureHeight * D_80165C18[objectIndex].unk_0D2); + func_80074574(sp24, (void *) func_80074790(objectIndex, arg1), D_80165C18[objectIndex].textureWidth, D_80165C18[objectIndex].textureHeight); D_80165C18[objectIndex].unk_0D3 = D_80165C18[objectIndex].unk_0D2; func_80074478(objectIndex); } @@ -1308,7 +1278,7 @@ void func_80074924(s32 objectIndex) { struct_80165C18_entry *temp_s0; temp_s0 = &D_80165C18[objectIndex]; - temp_s0->unk_000 = 0.15f; + temp_s0->sizeScaling = 0.15f; temp_v0 = gCurrentCourseId; switch (temp_v0) { /* irregular */ case 0: @@ -1451,7 +1421,7 @@ void func_800750D8(s32 objectIndex, s32 arg1, Vec3f arg2, s32 arg3, s32 arg4) { temp_v0 = random_int(0x0032U); temp_v1 = &D_80165C18[objectIndex]; temp_v1->unk_0D5 = arg3; - temp_v1->unk_000 = ((f64) (f32) sp24 * 0.0005) + 0.05; + temp_v1->sizeScaling = ((f64) (f32) sp24 * 0.0005) + 0.05; // ALL HAIL THE FAKE MATCH GODS!!!!! temp_v1->unk_038[1] = ((f64) (f32) temp_v0 * (0.05 * 1.0)) + 2.0; temp_v1->unk_034 = ((f64) (f32)(temp_v0 % 5) * 0.1) + 1.0; @@ -1552,8 +1522,8 @@ s32 func_800755FC(s32 arg0, Vec3f arg1, f32 arg2) { void func_80075698(s32 arg0) { D_80165C18[arg0].unk_0D5 = 1; - D_80165C18[arg0].unk_064 = D_8018D490; - D_80165C18[arg0].unk_06C = D_8018D490; + D_80165C18[arg0].activeTexture = D_8018D490; + D_80165C18[arg0].textureList = D_8018D490; D_80165C18[arg0].unk_0A0 = 0xFF; D_80165C18[arg0].unk_0BE[1] = 0; D_80165C18[arg0].unk_0B2[0] = 0; @@ -1561,7 +1531,7 @@ void func_80075698(s32 arg0) { D_80165C18[arg0].unk_028[0] = 0.0f; D_80165C18[arg0].unk_028[1] = 0.0f; D_80165C18[arg0].unk_028[2] = 0.0f; - D_80165C18[arg0].unk_000 = 0.5f; + D_80165C18[arg0].sizeScaling = 0.5f; func_80072488(arg0); } @@ -1573,7 +1543,7 @@ void func_80075714(s32 objectIndex) { case 2: D_80165C18[objectIndex].unk_038[1] -= 0.03; f32_step_up_towards(&D_80165C18[objectIndex].unk_028[1], 100.0f, D_80165C18[objectIndex].unk_038[1]); - func_8007415C(objectIndex, &D_80165C18[objectIndex].unk_000, 0.55f, 1.0f, 0.1f, 1, 0); + func_8007415C(objectIndex, &D_80165C18[objectIndex].sizeScaling, 0.55f, 1.0f, 0.1f, 1, 0); if (func_80073B00(objectIndex, &D_80165C18[objectIndex].unk_0A0, 0xFF, 0x1E, 7, 0, 0) != 0) { func_80072488(objectIndex); } @@ -1692,8 +1662,8 @@ s32 func_80075A6C(s32 arg0, Vec3f arg1, f32 arg2) { void func_80075B08(s32 arg0) { D_80165C18[arg0].unk_0D5 = 6; - D_80165C18[arg0].unk_064 = D_8018D490; - D_80165C18[arg0].unk_06C = D_8018D490; + D_80165C18[arg0].activeTexture = D_8018D490; + D_80165C18[arg0].textureList = D_8018D490; D_80165C18[arg0].unk_0A0 = 0xFF; D_80165C18[arg0].unk_0BE[1] = 0; D_80165C18[arg0].unk_0B2[0] = 0; @@ -1701,7 +1671,7 @@ void func_80075B08(s32 arg0) { D_80165C18[arg0].unk_028[0] = 0.0f; D_80165C18[arg0].unk_028[1] = 0.0f; D_80165C18[arg0].unk_028[2] = 0.0f; - D_80165C18[arg0].unk_000 = 0.5f; + D_80165C18[arg0].sizeScaling = 0.5f; func_80072488(arg0); } @@ -1713,7 +1683,7 @@ void func_80075B84(s32 arg0) { case 2: D_80165C18[arg0].unk_038[1] -= 0.03; f32_step_up_towards(&D_80165C18[arg0].unk_028[1], 100.0f, D_80165C18[arg0].unk_038[1]); - func_8007415C(arg0, &D_80165C18[arg0].unk_000, 0.55f, 1.0f, 0.1f, 1, 0); + func_8007415C(arg0, &D_80165C18[arg0].sizeScaling, 0.55f, 1.0f, 0.1f, 1, 0); if (func_80073B00(arg0, &D_80165C18[arg0].unk_0A0, 0xFF, 0x1E, 7, 0, 0) != 0) { func_80072488(arg0); } @@ -1804,7 +1774,7 @@ void func_80075E5C(s32 objectIndex, Vec3f arg1, u16 arg2, f32 arg3, s32 arg4) { func_800723A4(objectIndex, 0); temp_v0 = &D_80165C18[objectIndex]; - temp_v0->unk_000 = 0.5f; + temp_v0->sizeScaling = 0.5f; temp_v0->unk_0D5 = 5; temp_v0->unk_010[0] = arg1[0]; temp_v0->unk_010[1] = arg1[1]; @@ -1847,7 +1817,7 @@ void func_8007601C(s32 arg0) { if (D_80165C18[arg0].unk_048 > 0) { D_80165C18[arg0].unk_048--; if (D_80165C18[arg0].unk_048 == 0) { - func_800C9EF4(D_80165C18[arg0].unk_004, 0x5102800A); + func_800C9EF4(D_80165C18[arg0].pos, 0x5102800A); } } @@ -1855,8 +1825,8 @@ void func_8007601C(s32 arg0) { func_8008A6DC(arg0, 300.0f); if ((func_8007223C(arg0, 0x40000) != 0) && (func_80072354(arg0, 1) != 0)) { func_800722A4(arg0, 1); - func_80075F98(D_80165C18[arg0].unk_004, (u16) D_80165C18[arg0].unk_0BE[1], 1.0f); - func_800C9D80(D_80165C18[arg0].unk_004, D_80165C18[arg0].unk_038, 0x5102800A); + func_80075F98(D_80165C18[arg0].pos, (u16) D_80165C18[arg0].unk_0BE[1], 1.0f); + func_800C9D80(D_80165C18[arg0].pos, D_80165C18[arg0].unk_038, 0x5102800A); if (D_80165C18[arg0].unk_0A4 > 0) { D_80165C18[arg0].unk_0A4--; D_80165C18[arg0].unk_04C = 0x5A; @@ -1887,7 +1857,7 @@ void func_80076194(s32 objectIndex, Vec3f arg1, f32 arg2, s32 arg3) { func_800723A4(objectIndex, 0); temp_v0 = &D_80165C18[objectIndex]; temp_v0->unk_0D5 = 4; - temp_v0->unk_000 = 1.0f; + temp_v0->sizeScaling = 1.0f; temp_v0->unk_010[0] = arg1[0]; temp_v0->unk_010[1] = arg1[1]; temp_v0->unk_010[2] = arg1[2]; @@ -1925,8 +1895,8 @@ void func_8007634C(s32 objectIndex) { struct_80165C18_entry *temp_v0; temp_v0 = &D_80165C18[objectIndex]; - temp_v0->unk_064 = D_0D02BC58; - temp_v0->unk_06C = D_0D02BC58; + temp_v0->activeTexture = D_0D02BC58; + temp_v0->textureList = D_0D02BC58; temp_v0->unk_0A0 = 0x00FF; func_8008B8BC(objectIndex, 0U, 0U, 0U); func_8008B80C(objectIndex, 0.0f, 0.0f, 0.0f); @@ -1949,11 +1919,11 @@ void func_800763CC(s32 objectIndex) { break; case 3: if (temp_s0->unk_0D5 == 4) { - f32_step_towards(&temp_s0->unk_000, 4.0f, 0.1f); + f32_step_towards(&temp_s0->sizeScaling, 4.0f, 0.1f); s16_step_towards(&temp_s0->unk_0A4, 0, 0x0018); s16_step_towards(&temp_s0->unk_0A2, 0x0080, 0x000C); } else { - f32_step_towards(&temp_s0->unk_000, 1.0f, 0.1f); + f32_step_towards(&temp_s0->sizeScaling, 1.0f, 0.1f); s16_step_towards(&temp_s0->unk_0A4, 0, 0x0018); s16_step_towards(&temp_s0->unk_0A2, 0x0080, 0x000C); } @@ -2007,15 +1977,15 @@ void func_8007661C(void) { if (D_80165C18[objectIndex].unk_048 > 0) { D_80165C18[objectIndex].unk_048--; if (D_80165C18[objectIndex].unk_048 == 0) { - func_800C9EF4(D_80165C18[objectIndex].unk_004, 0x51038009U); + func_800C9EF4(D_80165C18[objectIndex].pos, 0x51038009U); } } if (D_80165C18[objectIndex].unk_04C == 0) { func_8008A6DC(objectIndex, 750.0f); if ((func_8007223C(objectIndex, 0x00040000) != 0) && (func_80072354(objectIndex, 1) != 0)) { func_800722A4(objectIndex, 1); - func_800762DC(D_80165C18[objectIndex].unk_004, 1.0f); - func_800C9D80(D_80165C18[objectIndex].unk_004, D_80165C18[objectIndex].unk_038, 0x51038009U); + func_800762DC(D_80165C18[objectIndex].pos, 1.0f); + func_800C9D80(D_80165C18[objectIndex].pos, D_80165C18[objectIndex].unk_038, 0x51038009U); if (D_80165C18[objectIndex].unk_0A4 > 0) { D_80165C18[objectIndex].unk_0A4--; D_80165C18[objectIndex].unk_04C = 0x0000005A; @@ -2036,7 +2006,7 @@ void func_8007675C(s32 objectIndex, Vec3s arg1, s32 arg2) { func_800723A4(objectIndex, 0); temp_v0 = &D_80165C18[objectIndex]; temp_v0->unk_0D5 = 9; - temp_v0->unk_000 = 1.0f; + temp_v0->sizeScaling = 1.0f; temp_v0->unk_010[0] = arg1[0]; temp_v0->unk_010[1] = arg1[1]; temp_v0->unk_010[2] = arg1[2]; @@ -2099,8 +2069,8 @@ void func_80076958(s32 objectIndex) { struct_80165C18_entry *temp_v0; temp_v0 = &D_80165C18[objectIndex]; - temp_v0->unk_064 = D_0D02BC58; - temp_v0->unk_06C = D_0D02BC58; + temp_v0->activeTexture = D_0D02BC58; + temp_v0->textureList = D_0D02BC58; temp_v0->unk_0A0 = 0x00FF; func_8008B8BC(objectIndex, 0U, 0U, 0U); func_8008B80C(objectIndex, 0.0f, 0.0f, 0.0f); @@ -2123,7 +2093,7 @@ void func_800769D8(s32 objectIndex) { } break; case 3: - f32_step_towards(&temp_s0->unk_000, 2.0f, 0.05f); + f32_step_towards(&temp_s0->sizeScaling, 2.0f, 0.05f); s16_step_towards(&temp_s0->unk_0A4, 0, 0x0018); if ((temp_s0->unk_0AE >= 2) && (func_80073B00(objectIndex, &temp_s0->unk_0A0, 0x000000FF, 0x00000050, 0x00000020, 0, 0) != 0)) { func_80072488(objectIndex); @@ -2192,9 +2162,9 @@ void func_80076C9C(s32 objectIndex, Vec3f arg1, s16 arg2) { func_800723A4(objectIndex, (s32) arg2); temp_v0 = &D_80165C18[objectIndex]; temp_v0->unk_0D5 = 0x0A; - temp_v0->unk_064 = D_0D02BC58; - temp_v0->unk_06C = D_0D02BC58; - temp_v0->unk_000 = 0.3f; + temp_v0->activeTexture = D_0D02BC58; + temp_v0->textureList = D_0D02BC58; + temp_v0->sizeScaling = 0.3f; func_8008B7D4(objectIndex, arg1[0], arg1[1], arg1[2]); temp_v0->unk_0A4 = 0x00FF; temp_v0->unk_034 = 0.0f; @@ -2269,9 +2239,9 @@ void func_80076FEC(s32 objectIndex, s32 flameIndex) { func_800723A4(objectIndex, 3); D_80165C18[objectIndex].unk_0D5 = 0xB; - D_80165C18[objectIndex].unk_064 = D_0D02BC58; - D_80165C18[objectIndex].unk_06C = D_0D02BC58; - D_80165C18[objectIndex].unk_000 = 0.8f; + D_80165C18[objectIndex].activeTexture = D_0D02BC58; + D_80165C18[objectIndex].textureList = D_0D02BC58; + D_80165C18[objectIndex].sizeScaling = 0.8f; // Mixing arr + offset and array access... Why? // todo: ifdef this to proper array access. @@ -2301,7 +2271,7 @@ void func_80077138(s32 objectIndex, Vec3f arg1, s32 arg2) { func_800723A4(objectIndex, arg2); D_80165C18[objectIndex].unk_0D5 = 0x0C; - D_80165C18[objectIndex].unk_000 = 0.05f; + D_80165C18[objectIndex].sizeScaling = 0.05f; func_8008B7D4(objectIndex, arg1[0], arg1[1], arg1[2]); func_8008B8BC(objectIndex, 0U, 0U, 0U); func_8008B80C(objectIndex, 0.0f, 0.0f, 0.0f); @@ -2369,8 +2339,8 @@ void func_80077450(s32 objectIndex) { func_80077428(objectIndex); break; case 2: - f32_step_up_towards(&D_80165C18[objectIndex].unk_000, 0.1f, 0.01f); - if ((D_80165C18[objectIndex].unk_004[1] <= D_80165C18[objectIndex].unk_084[5]) && (func_80073B00(objectIndex, &D_80165C18[objectIndex].unk_0A0, 0x000000FF, 0, 0x00000010, 0, 0) != 0)) { + f32_step_up_towards(&D_80165C18[objectIndex].sizeScaling, 0.1f, 0.01f); + if ((D_80165C18[objectIndex].pos[1] <= D_80165C18[objectIndex].unk_084[5]) && (func_80073B00(objectIndex, &D_80165C18[objectIndex].unk_0A0, 0x000000FF, 0, 0x00000010, 0, 0) != 0)) { func_80086F60(objectIndex); func_80072428(objectIndex); } @@ -2431,9 +2401,9 @@ void func_80077700(s32 objectIndex, Vec3f arg1, s32 arg2) { func_800723A4(objectIndex, 0); D_80165C18[objectIndex].unk_0D5 = 7; - D_80165C18[objectIndex].unk_060 = (u32 *) D_0D028DD8; - D_80165C18[objectIndex].unk_068 = (u32 *) D_0D028DD8; - D_80165C18[objectIndex].unk_000 = 0.1f; + D_80165C18[objectIndex].activeTLUT = (u32 *) D_0D028DD8; + D_80165C18[objectIndex].tlutList = (u32 *) D_0D028DD8; + D_80165C18[objectIndex].sizeScaling = 0.1f; D_80165C18[objectIndex].unk_044 = arg1[1]; switch (gCurrentCourseId) { case COURSE_MARIO_RACEWAY: @@ -2583,13 +2553,13 @@ void func_80077E20(s32 objectIndex) { struct_80165C18_entry *temp_v0; temp_v0 = &D_80165C18[objectIndex]; - temp_v0->unk_064 = D_0D0293D8; - temp_v0->unk_06C = D_0D0293D8; + temp_v0->activeTexture = D_0D0293D8; + temp_v0->textureList = D_0D0293D8; // There's something up with the handling of D_0D005770 and the loading of 0x10 right here temp_v0->unk_074 = D_0D005770; - temp_v0->unk_0DA = 0x10; - temp_v0->unk_0D9 = temp_v0->unk_0DA; - temp_v0->unk_000 = 0.15f; + temp_v0->textureHeight = 0x10; + temp_v0->textureWidth = temp_v0->textureHeight; + temp_v0->sizeScaling = 0.15f; func_800721C0(objectIndex, 0x00000010); func_80086EF0(objectIndex); temp_v0->unk_0A0 = 0x00FF; @@ -2608,7 +2578,7 @@ void func_80077EB8(s32 objectIndex, u16 arg1, Camera *camera) { temp_v0 = camera->rot[1] - arg1; if ((temp_v0 >= D_8018D210) || (D_8018D208 >= temp_v0)) { - D_80165C40[objectIndex].unk[0] = D_8018D218 + (D_8018D1E8 * (f32) temp_v0); + D_80165C18[objectIndex].unk_028[0] = D_8018D218 + (D_8018D1E8 * (f32) temp_v0); func_800721C0(objectIndex, 0x00000010); return; } @@ -2635,7 +2605,7 @@ void func_80077F64(s32 objectIndex, Camera *camera) { func_800877C4(objectIndex); func_8008BF18(objectIndex); func_8008BFC0(objectIndex); - if (D_80165C18[objectIndex].unk_004[1] <= 0.0f) { + if (D_80165C18[objectIndex].pos[1] <= 0.0f) { func_80086FD4(objectIndex); return; } @@ -2666,17 +2636,15 @@ void func_800780CC(s32 objectIndex, Camera *camera) { } } -extern s32 D_8018D1F0; - void func_80078170(s32 arg0, Camera *arg1) { - s32 *objectIndex; + s32 objectIndex; s32 i; func_80077D5C(arg0); for (i = 0; i < D_8018D1F0; i++) { - objectIndex = &D_8018CC80[arg0 + i]; - if (D_80165C18[*objectIndex].unk_0A6 != 0) { - func_800780CC(*objectIndex, arg1); + objectIndex = D_8018CC80[arg0 + i]; + if (D_80165C18[objectIndex].unk_0A6 != 0) { + func_800780CC(objectIndex, arg1); } } } @@ -2685,10 +2653,10 @@ void func_80078220(s32 objectIndex) { struct_80165C18_entry *temp_v0; temp_v0 = &D_80165C18[objectIndex]; - temp_v0->unk_064 = D_0D0293D8; - temp_v0->unk_06C = D_0D0293D8; + temp_v0->activeTexture = D_0D0293D8; + temp_v0->textureList = D_0D0293D8; temp_v0->unk_074 = D_0D005770; - temp_v0->unk_000 = 0.15f; + temp_v0->sizeScaling = 0.15f; func_80086EF0(objectIndex); func_80072488(objectIndex); } @@ -2737,7 +2705,7 @@ void func_80078288(s32 objectIndex) { D_80165C18[objectIndex].unk_0BE[0] += D_80165C18[objectIndex].unk_0C4; D_80165C18[objectIndex].unk_028[0] = sins(D_80165C18[objectIndex].unk_0BE[0]) * D_80165C18[objectIndex].unk_01C[0]; func_8008BF18(objectIndex); - if ((f64) D_80165C18[objectIndex].unk_004[1] <= 0.0) { + if ((f64) D_80165C18[objectIndex].pos[1] <= 0.0) { func_80086FD4(objectIndex); } D_80165C18[objectIndex].unk_0B2[1] = func_800872D8(objectIndex, camera1); @@ -2812,7 +2780,7 @@ void func_800788F8(s32 objectIndex, u16 rot, Camera *camera) { temp_v0 = camera->rot[1] + rot; if ((temp_v0 >= D_8018D210) && (D_8018D208 >= temp_v0)) { - D_80165CB4[objectIndex].unk[0] = (D_8018D218 + (D_8018D1E8 * temp_v0)); + D_80165C18[objectIndex].unk_09C = (D_8018D218 + (D_8018D1E8 * temp_v0)); func_800721C0(objectIndex, 0x00000010); return; } @@ -2902,7 +2870,6 @@ extern u16 D_800E6C80[][4]; /* unable to generate extern u16 D_800E6DE0[][4]; /* unable to generate initializer; const */ extern s16 D_8018D200; -extern s32 D_8018D1F0; extern s16 D_8018D208; extern s16 D_8018D210; extern f32 D_8018D1E8; @@ -3035,8 +3002,8 @@ void func_80079114(s32 objectIndex, s32 arg1, s32 arg2) { return; } a = D_80183DB8[0]; - D_80165C18[objectIndex].unk_060 = D_80165C18[a].unk_060; - D_80165C18[objectIndex].unk_064 = D_80165C18[a].unk_064; + D_80165C18[objectIndex].activeTLUT = D_80165C18[a].activeTLUT; + D_80165C18[objectIndex].activeTexture = D_80165C18[a].activeTexture; if (0) { } return; } @@ -3054,39 +3021,23 @@ void func_80079114(s32 objectIndex, s32 arg1, s32 arg2) { } } -extern UnkStruct_80165CF5 D_80165CF0[]; +void func_800791F0(s32 objectIndex, s32 playerId) { + Player *temp_v1 = &gPlayerOne[playerId]; -#ifdef NON_MATCHING - -void func_800791F0(s32 objectIndex, u8 playerId) { - //Player *sp1C; - Player *player = &gPlayerOne[playerId]; - //s16 var_v0; - //struct_80165C18_entry *temp_v0; - - //temp_v0 = &D_80165CF0[objectIndex]; - if ((D_80165CF0[objectIndex].unk[0] != 3) && (D_80165CF0[objectIndex].unk[0] != 7)) { - //sp1C = temp_v1; + if ((D_80165C18[objectIndex].unk_0D8 != 3) && (D_80165C18[objectIndex].unk_0D8 != 7)) { func_800722CC(objectIndex, 1); - //var_v0 = gCurrentCourseId; if (gCurrentCourseId == 0x000C) { - player->unk_0CA &= 0xFFEF; - //goto block_5; + temp_v1->unk_0CA &= 0xFFEF; } } else { -//block_5: - //var_v0 = gCurrentCourseId; + // ????? } if (gCurrentCourseId == 0x000C) { - //temp_v1 = temp_v1; func_800722CC(objectIndex, 0x00000010); - player->unk_0CA &= 0xFFDF; + temp_v1->unk_0CA &= 0xFFDF; } func_800C9018(playerId, 0x0100FA28); } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_800791F0.s") -#endif extern u8 *D_0F05EB50; extern s16 D_801656F0; @@ -3100,7 +3051,7 @@ void func_800792D8(s32 objectIndex, s32 arg1) { } func_80073444(objectIndex, (u8 *) gTLUTLakituCountdown, (u8 *) &D_0F05EB50, 0x38U, (u16) 0x00000048); D_80165C18[objectIndex].unk_074 = (Vtx *) &D_0D005EB0; - D_80165C18[objectIndex].unk_000 = 0.15f; + D_80165C18[objectIndex].sizeScaling = 0.15f; func_800721E8(objectIndex, 0x00000010); func_80072488(objectIndex); D_80165C18[objectIndex].unk_048 = D_8018D180; @@ -3143,7 +3094,7 @@ void func_80079380(s32 objectIndex, s32 arg1) { break; case 7: if (func_8007278C(objectIndex, 0x00000014) != 0) { - D_80165C18[objectIndex].unk_068 += 0x80; + D_80165C18[objectIndex].tlutList += 0x200; if (arg1 == 0) { play_sound2(SOUND_ACTION_COUNTDOWN_LIGHT); } @@ -3164,7 +3115,7 @@ void func_80079380(s32 objectIndex, s32 arg1) { break; case 11: if (func_8007278C(objectIndex, 8) != 0) { - D_80165C18[objectIndex].unk_068 += 0x80; + D_80165C18[objectIndex].tlutList += 0x200; if (arg1 == 0) { play_sound2(SOUND_ACTION_GREEN_LIGHT); } @@ -3200,19 +3151,19 @@ void func_8007963C(s32 objectIndex, s32 playerIndex) { func_800791F0(objectIndex, playerIndex); func_80073444(objectIndex, gTLUTLakituCheckeredFlag, (u8 *) &D_0F07E350, 0x48U, (u16) 0x00000038); temp_v0 = &D_80165C18[objectIndex]; - temp_v0->unk_064 = D_8018C028; + temp_v0->activeTexture = D_8018C028; temp_v0->unk_074 = D_0D006730; - temp_v0->unk_004[2] = 5000.0f; - temp_v0->unk_004[1] = 5000.0f; - temp_v0->unk_004[0] = 5000.0f; - temp_v0->unk_000 = 0.15f; + temp_v0->pos[2] = 5000.0f; + temp_v0->pos[1] = 5000.0f; + temp_v0->pos[0] = 5000.0f; + temp_v0->sizeScaling = 0.15f; func_80086F10(objectIndex, 2, D_800E6834); func_800721E8(objectIndex, 0x00000010); func_80072488(objectIndex); } void func_80079700(s32 objectIndex, s32 playerIndex) { - switch (D_80165CBE[objectIndex].unk[0]) { + switch (D_80165C18[objectIndex].unk_0A6) { case 0: break; case 1: @@ -3280,7 +3231,7 @@ void func_800799A8(s32 objectIndex, s32 arg1) { func_800791F0(objectIndex, arg1); func_80073444(objectIndex, gTLUTLakituFishing, &D_0F0CCF50, 0x38U, (u16) 0x00000048); D_80165C18[objectIndex].unk_074 = D_0D005F30; - D_80165C18[objectIndex].unk_000 = 0.15f; + D_80165C18[objectIndex].sizeScaling = 0.15f; func_80086E70(objectIndex); func_800721E8(objectIndex, 0x00000010); func_80073720(objectIndex); @@ -3456,12 +3407,12 @@ void func_8007A060(s32 objectIndex, s32 playerIndex) { func_800791F0(objectIndex, playerIndex); func_80073444(objectIndex, gTLUTLakituSecondLap, (u8 *) D_0F09DB50, 0x48U, (u16) 0x00000038); temp_v0 = &D_80165C18[objectIndex]; - temp_v0->unk_064 = D_8018C028; + temp_v0->activeTexture = D_8018C028; temp_v0->unk_074 = D_0D006730; - temp_v0->unk_004[2] = 5000.0f; - temp_v0->unk_004[1] = 5000.0f; - temp_v0->unk_004[0] = 5000.0f; - temp_v0->unk_000 = 0.15f; + temp_v0->pos[2] = 5000.0f; + temp_v0->pos[1] = 5000.0f; + temp_v0->pos[0] = 5000.0f; + temp_v0->sizeScaling = 0.15f; func_800721E8(objectIndex, 0x00000010); func_80086F10(objectIndex, 5, &D_800E694C); func_80072488(objectIndex); @@ -3506,12 +3457,12 @@ void func_8007A228(s32 objectIndex, s32 playerIndex) { func_800791F0(objectIndex, playerIndex); func_80073444(objectIndex, gTLUTLakituFinalLap, (u8 *)&D_0F0AD750, 0x48U, (u16) 0x00000038); temp_v0 = &D_80165C18[objectIndex]; - temp_v0->unk_064 = D_8018C028; + temp_v0->activeTexture = D_8018C028; temp_v0->unk_074 = D_0D006730; - temp_v0->unk_004[2] = 5000.0f; - temp_v0->unk_004[1] = 5000.0f; - temp_v0->unk_004[0] = 5000.0f; - temp_v0->unk_000 = 0.15f; + temp_v0->pos[2] = 5000.0f; + temp_v0->pos[1] = 5000.0f; + temp_v0->pos[0] = 5000.0f; + temp_v0->sizeScaling = 0.15f; func_800721E8(objectIndex, 0x00000010); func_80086F10(objectIndex, 5, &D_800E694C); func_80072488(objectIndex); @@ -3555,12 +3506,12 @@ void func_8007A3F0(s32 objectIndex, s32 arg1) { f32 var = 5000.0f; func_800791F0(objectIndex, arg1); func_80073444(objectIndex, gTLUTLakituReverse, D_0F0BD350, 0x48U, (u16) 0x00000038); - D_80165C18[objectIndex].unk_064 = D_8018C028; + D_80165C18[objectIndex].activeTexture = D_8018C028; D_80165C18[objectIndex].unk_074 = D_0D006730; - D_80165C18[objectIndex].unk_004[2] = var; - D_80165C18[objectIndex].unk_004[1] = var; - D_80165C18[objectIndex].unk_004[0] = var; - D_80165C18[objectIndex].unk_000 = 0.15f; + D_80165C18[objectIndex].pos[2] = var; + D_80165C18[objectIndex].pos[1] = var; + D_80165C18[objectIndex].pos[0] = var; + D_80165C18[objectIndex].sizeScaling = 0.15f; func_800721E8(objectIndex, 0x00000010); func_80086F10(objectIndex, 6, D_800E69B0); D_80165C18[objectIndex].unk_0D6 = 0; @@ -3615,18 +3566,18 @@ void func_8007A66C(s32 objectIndex, Player *player, Camera *camera) { u16 temp_t8; temp_t8 = 0x8000 - camera->rot[1]; - D_80165C18[objectIndex].unk_004[0] = (player->pos[0] + (coss(temp_t8) * (D_80165C18[objectIndex].unk_010[0] + D_80165C18[objectIndex].unk_028[0]))) - (sins(temp_t8) * (D_80165C18[objectIndex].unk_010[2] + D_80165C18[objectIndex].unk_028[2])); - D_80165C18[objectIndex].unk_004[1] = player->unk_074 + D_80165C18[objectIndex].unk_010[1] + D_80165C18[objectIndex].unk_028[1]; - D_80165C18[objectIndex].unk_004[2] = (player->pos[2] + (sins(temp_t8) * (D_80165C18[objectIndex].unk_010[0] + D_80165C18[objectIndex].unk_028[0]))) + (coss(temp_t8) * (D_80165C18[objectIndex].unk_010[2] + D_80165C18[objectIndex].unk_028[2])); + D_80165C18[objectIndex].pos[0] = (player->pos[0] + (coss(temp_t8) * (D_80165C18[objectIndex].unk_010[0] + D_80165C18[objectIndex].unk_028[0]))) - (sins(temp_t8) * (D_80165C18[objectIndex].unk_010[2] + D_80165C18[objectIndex].unk_028[2])); + D_80165C18[objectIndex].pos[1] = player->unk_074 + D_80165C18[objectIndex].unk_010[1] + D_80165C18[objectIndex].unk_028[1]; + D_80165C18[objectIndex].pos[2] = (player->pos[2] + (sins(temp_t8) * (D_80165C18[objectIndex].unk_010[0] + D_80165C18[objectIndex].unk_028[0]))) + (coss(temp_t8) * (D_80165C18[objectIndex].unk_010[2] + D_80165C18[objectIndex].unk_028[2])); } void func_8007A778(s32 objectIndex, Player *player, Camera *camera) { u16 temp_t8; temp_t8 = 0x8000 - camera->rot[1]; - D_80165C18[objectIndex].unk_004[0] = (player->pos[0] + (coss(temp_t8) * (D_80165C18[objectIndex].unk_010[0] + D_80165C18[objectIndex].unk_028[0]))) - (sins(temp_t8) * (D_80165C18[objectIndex].unk_010[2] + D_80165C18[objectIndex].unk_028[2])); - D_80165C18[objectIndex].unk_004[1] = player->pos[1] + D_80165C18[objectIndex].unk_010[1] + D_80165C18[objectIndex].unk_028[1]; - D_80165C18[objectIndex].unk_004[2] = (player->pos[2] + (sins(temp_t8) * (D_80165C18[objectIndex].unk_010[0] + D_80165C18[objectIndex].unk_028[0]))) + (coss(temp_t8) * (D_80165C18[objectIndex].unk_010[2] + D_80165C18[objectIndex].unk_028[2])); + D_80165C18[objectIndex].pos[0] = (player->pos[0] + (coss(temp_t8) * (D_80165C18[objectIndex].unk_010[0] + D_80165C18[objectIndex].unk_028[0]))) - (sins(temp_t8) * (D_80165C18[objectIndex].unk_010[2] + D_80165C18[objectIndex].unk_028[2])); + D_80165C18[objectIndex].pos[1] = player->pos[1] + D_80165C18[objectIndex].unk_010[1] + D_80165C18[objectIndex].unk_028[1]; + D_80165C18[objectIndex].pos[2] = (player->pos[2] + (sins(temp_t8) * (D_80165C18[objectIndex].unk_010[0] + D_80165C18[objectIndex].unk_028[0]))) + (coss(temp_t8) * (D_80165C18[objectIndex].unk_010[2] + D_80165C18[objectIndex].unk_028[2])); } UNUSED void func_8007A884(void) { @@ -3655,7 +3606,7 @@ void func_8007A910(s32 arg0) { void func_8007A948(s32 arg0) { s32 temp_s0 = D_80183DB8[arg0]; - switch (D_80165CF0[temp_s0].unk[0]) { + switch (D_80165C18[temp_s0].unk_0D8) { case 0: break; case 1: @@ -3785,7 +3736,6 @@ void func_8007AC9C(s32 playerId) { } } -//#ifdef MIPS_TO_C extern u8 sRandomItemIndex; extern u8 gControllerRandom; extern s32 gRaceFrameCounter; @@ -3837,10 +3787,6 @@ u8 func_8007AF78(UNUSED s32 arg0, s16 arg1) { return gen_random_item(arg1, 1); } -//#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc - - /** * todo: verify that these two variables are fake ptrs. * As seen below, they were replaced with gLapCountByPlayerId and gGPCurrentRaceRankByPlayerId @@ -3974,10 +3920,10 @@ void func_8007B254(s32 objectIndex, u8 arg1) { temp_v0 = &D_80165C18[objectIndex]; temp_v0->unk_0A6 = 2; temp_v0->unk_0A4 = 0; - temp_v0->unk_068 = &gTLUTItemWindowNone; - temp_v0->unk_06C = (s32) &gTextureItemWindowNone; - temp_v0->unk_0D9 = 0x28; - temp_v0->unk_0DA = 0x20; + temp_v0->tlutList = &gTLUTItemWindowNone; + temp_v0->textureList = (s32) &gTextureItemWindowNone; + temp_v0->textureWidth = 0x28; + temp_v0->textureHeight = 0x20; temp_v0->unk_04C = 0x00000032; temp_v0->unk_0D6 = 1; temp_v0->unk_098 = 0; @@ -4270,8 +4216,8 @@ void func_8007B34C(s32 playerId) { } } temp_v0_5 = sp2C->unk_0D2; - sp2C->unk_060 = gItemWindowTLUTs[temp_v0_5]; - sp2C->unk_064 = gItemWindowTextures[temp_v0_5]; + sp2C->activeTLUT = gItemWindowTLUTs[temp_v0_5]; + sp2C->activeTexture = gItemWindowTextures[temp_v0_5]; sp38->unk_010 = sp2C->unk_0A4; } #else @@ -4282,49 +4228,38 @@ void func_8007BB9C(s32 arg0) { func_8007B34C(arg0); } -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -extern ? d_course_banshee_boardwalk_dl_cheep_cheep; - void func_8007BBBC(s32 objectIndex) { - f32 temp_f0; f32 var_f14; - s16 temp_v0; struct_80165C18_entry *temp_s1; temp_s1 = &D_80165C18[objectIndex]; - temp_v0 = temp_s1->unk_0A6; - switch (temp_v0) { /* irregular */ + switch (temp_s1->unk_0A6) { /* irregular */ case 1: - func_800735BC(objectIndex, (s32) &d_course_banshee_boardwalk_dl_cheep_cheep, 2.0f); + func_800735BC(objectIndex, d_course_banshee_boardwalk_dl_cheep_cheep, 2.0f); func_800721C0(objectIndex, 0x00000010); temp_s1->unk_0D5 = 0; - return; + break; case 2: if (gIsMirrorMode != 0) { func_80087E08(objectIndex, 18.0f, 0.7f, 25.0f, (s16) -0x00005800, 0x0000012C); } else { func_80087E08(objectIndex, 18.0f, 0.7f, 25.0f, (s16) 0x00005800, 0x0000012C); } - temp_f0 = temp_s1->unk_038[2]; - if (temp_f0 < 0.0f) { - var_f14 = -temp_f0; + if (temp_s1->unk_038[2] < 0.0f) { + var_f14 = -temp_s1->unk_038[2]; } else { - var_f14 = temp_f0; + var_f14 = temp_s1->unk_038[2]; } temp_s1->unk_0BE[0] = func_80041658(temp_s1->unk_038[1], var_f14); func_8007278C(objectIndex, 0x00000046); - return; + break; case 3: func_80072428(objectIndex); - /* fallthrough */ + break; case 0: - return; + break; } } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007BBBC.s") -#endif void func_8007BD04(s32 playerId) { s32 objectIndex; @@ -4348,7 +4283,6 @@ void func_8007BDA8(void) { func_8008BF18(temp_a0); } -extern Gfx d_course_banshee_boardwalk_dl_cheep_cheep[]; // This is either 3 Vec3s as separate variables or an array of s16's or an array of vec3s. // The other entries appear to be unused. extern Vec3s D_800E634C[3]; // static? @@ -4368,45 +4302,35 @@ void func_8007BDE0(s32 objectIndex) { temp_v0->unk_0D5 = 1; temp_v0->unk_054 = 0; temp_v0->unk_070 = d_course_banshee_boardwalk_dl_cheep_cheep; - temp_v0->unk_000 = 0.2f; + temp_v0->sizeScaling = 0.2f; func_80072488(objectIndex); func_8008B7D4(objectIndex, (f32) D_800E634C[0][0], (f32) ((f64) D_800E634C[0][1] + 55.0), (f32) D_800E634C[0][2]); func_8008B80C(objectIndex, 0.0f, 30.0f, 0.0f); func_8008B888(objectIndex, 0U, 0x3800U, 0U); } -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -void func_8007BDE0(); /* extern */ - void func_8007BEC8(s32 objectIndex) { struct_80165C18_entry *temp_v0; - u16 temp_t8; temp_v0 = &D_80165C18[objectIndex]; - temp_t8 = (u16) temp_v0->unk_0A6; - switch (temp_t8) { + switch (temp_v0->unk_0A6) { case 1: - func_8007BDE0(); - return; + func_8007BDE0(objectIndex); + break; case 2: if (func_8007278C(objectIndex, 0x0000003C) != 0) { func_800721C0(objectIndex, 0x00000010); func_80086E70(objectIndex); - return; } - default: - return; + break; case 3: if (temp_v0->unk_0AE == 0) { func_80072488(objectIndex); - return; } break; case 4: if (func_8007278C(objectIndex, 0x0000000A) != 0) { func_8008701C(objectIndex, 2); - return; } break; case 5: @@ -4414,24 +4338,19 @@ void func_8007BEC8(s32 objectIndex) { func_80072428(objectIndex); } break; + case 0: + default: + break; } } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007BEC8.s") -#endif - -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -extern s8 D_801658CE; void func_8007BFB0(s32 objectIndex) { - f64 temp_f0; - s16 temp_v0; struct_80165C18_entry *temp_s0; temp_s0 = &D_80165C18[objectIndex]; - temp_v0 = temp_s0->unk_0AE; - switch (temp_v0) { + switch (temp_s0->unk_0AE) { + case 0: + break; case 1: temp_s0->unk_038[1] = -0.2f; if ((f64) temp_s0->unk_028[1] <= 0.0) { @@ -4446,26 +4365,25 @@ void func_8007BFB0(s32 objectIndex) { } break; case 3: - temp_s0->unk_000 = (f32) ((f64) temp_s0->unk_000 - 0.0015); + temp_s0->sizeScaling = (f32) ((f64) temp_s0->sizeScaling - 0.0015); if ((s32) temp_s0->unk_0BE[0] >= 0xA01) { temp_s0->unk_084[7] -= 4; } - if (u16_step_up_towards(&temp_s0->unk_0BE[0], 0x0C00U, (u16) temp_s0->unk_084[7]) != 0) { + if (u16_step_up_towards(temp_s0->unk_0BE, 0x0C00U, (u16) temp_s0->unk_084[7]) != 0) { func_80086FD4(objectIndex); } break; case 4: - temp_s0->unk_000 = (f32) ((f64) temp_s0->unk_000 - 0.0015); + temp_s0->sizeScaling = (f32) ((f64) temp_s0->sizeScaling - 0.0015); temp_s0->unk_034 = 0.001f; func_80086FD4(objectIndex); temp_s0->unk_084[7] = 0; break; case 5: - temp_f0 = (f64) temp_s0->unk_034; - if (temp_f0 <= 0.004) { - temp_s0->unk_034 = (f32) (temp_f0 + 0.0002); + if (temp_s0->unk_034 <= 0.004) { + temp_s0->unk_034 += 0.0002; } - temp_s0->unk_000 += temp_s0->unk_034; + temp_s0->sizeScaling += temp_s0->unk_034; s16_step_up_towards(&temp_s0->unk_084[7], 0x0100, 0x0010); temp_s0->unk_0BE[0] -= temp_s0->unk_084[7]; if (func_80087060(objectIndex, 0x00000035) != 0) { @@ -4479,10 +4397,10 @@ void func_8007BFB0(s32 objectIndex) { } break; case 7: - temp_s0->unk_000 = (f32) ((f64) temp_s0->unk_000 - 0.05); - if ((f64) temp_s0->unk_000 <= 0.01) { + temp_s0->sizeScaling = (f32) ((f64) temp_s0->sizeScaling - 0.05); + if ((f64) temp_s0->sizeScaling <= 0.01) { func_800721E8(objectIndex, 0x00000010); - temp_s0->unk_000 = 0.000001f; + temp_s0->sizeScaling = 0.000001f; func_80086FD4(objectIndex); } break; @@ -4491,35 +4409,25 @@ void func_8007BFB0(s32 objectIndex) { break; } if (temp_s0->unk_0AE < 0xA) { - func_80074344(objectIndex, &temp_s0->unk_000, 0.2f, 0.21f, 0.001f, 0, -1); + func_80074344(objectIndex, &temp_s0->sizeScaling, 0.2f, 0.21f, 0.001f, 0, -1); } func_800877C4(objectIndex); func_8008BF18(objectIndex); } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007BFB0.s") -#endif - -#ifdef NON_MATCHING -void func_800723A4(s32, s32); // extern -void func_8007BEC8(s32); // extern -void func_8007BFB0(s32); // extern -extern s8 D_801658BC; void func_8007C280(void) { + s32 objectIndex; + + objectIndex = D_80183F28[0]; if (D_801658BC == 1) { D_801658BC = 0; - func_800723A4((s32)D_80183F28, 0); + func_800723A4(objectIndex, 0); } - - if (D_80165CBE[D_80183F28[0]].unk[0]) { - func_8007BEC8((s32)D_80183F28); - func_8007BFB0((s32)D_80183F28); + if (D_80165C18[objectIndex].unk_0A6 != 0) { + func_8007BEC8(objectIndex); + func_8007BFB0(objectIndex); } } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007C280.s") -#endif void func_8007C2F8(s32 arg0) { switch (arg0) { @@ -4573,8 +4481,8 @@ void func_8007C420(s32 objectIndex, Player *player, Camera *camera) { f32 x; f32 z; - x = player->pos[0] - D_80165C18[objectIndex].unk_004[0]; - z = player->pos[2] - D_80165C18[objectIndex].unk_004[2]; + x = player->pos[0] - D_80165C18[objectIndex].pos[0]; + z = player->pos[2] - D_80165C18[objectIndex].pos[2]; D_80165C18[objectIndex].unk_0BE[1] = func_800417B4(D_80165C18[objectIndex].unk_0BE[1], atan2s(x, z)); func_8007C360(objectIndex, camera); } @@ -4629,14 +4537,14 @@ void func_8007C5B4(s32 objectIndex) { func_80073444(objectIndex, gTLUTBoo, D_80165880, 48, 40); temp_s0 = &D_80165C18[objectIndex]; - temp_s0->unk_004[0] = 0.0f; - temp_s0->unk_004[1] = 0.0f; - temp_s0->unk_004[2] = 0.0f; + temp_s0->pos[0] = 0.0f; + temp_s0->pos[1] = 0.0f; + temp_s0->pos[2] = 0.0f; func_800721C0(objectIndex, 0x00000020); func_80072488(objectIndex); temp_s0->unk_0A0 = 0; func_80073844(objectIndex); - temp_s0->unk_000 = 0.15f; + temp_s0->sizeScaling = 0.15f; temp_s0->unk_034 = 1.0f; func_80073FD4(objectIndex); func_80086EF0(objectIndex); @@ -4645,37 +4553,26 @@ void func_8007C5B4(s32 objectIndex) { temp_s0->unk_0B2[2] = 0x8000; } -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -void func_8007C5B4(s16); /* extern */ -void func_80086F60(s32); /* extern */ - void func_8007C684(s32 objectIndex) { - struct_80165C18_entry *sp30; - s16 var_a1; - struct_80165C18_entry *temp_v0; - u8 temp_t8; - - temp_v0 = &D_80165C18[objectIndex]; - var_a1 = temp_v0->unk_0A6; - if ((var_a1 != 0) && (var_a1 == 1)) { - sp30 = temp_v0; - func_8007C5B4(var_a1); - var_a1 = temp_v0->unk_0A6; + switch(D_80165C18[objectIndex].unk_0A6) { + case 0: + break; + case 1: + func_8007C5B4(objectIndex); + break; } - if (var_a1 >= 2) { - temp_t8 = temp_v0->unk_0DC; - switch (temp_t8) { + if (D_80165C18[objectIndex].unk_0A6 >= 2) { + switch (D_80165C18[objectIndex].unk_0DC) { case 0: break; case 1: - func_80073998(objectIndex, &temp_v0->unk_0A0, 0, 0x00000050, 2, 1, 0); + func_80073998(objectIndex, &D_80165C18[objectIndex].unk_0A0, 0, 0x00000050, 2, 1, 0); break; case 2: - func_80073CB0(objectIndex, &temp_v0->unk_0A0, 0x00000050, 0x00000078, 1, 0, -1); + func_80073CB0(objectIndex, &D_80165C18[objectIndex].unk_0A0, 0x00000050, 0x00000078, 1, 0, -1); break; case 3: - func_80073DC0(objectIndex, &temp_v0->unk_0A0, 0, 2); + func_80073DC0(objectIndex, &D_80165C18[objectIndex].unk_0A0, 0, 2); break; case 4: func_80072428(objectIndex); @@ -4686,9 +4583,6 @@ void func_8007C684(s32 objectIndex) { func_80073514(objectIndex); } } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007C684.s") -#endif #ifdef NON_MATCHING //generated by m2c commit 9841ff34ca242f5f14b2eab2b54a7a65ac47d80f @@ -4793,34 +4687,30 @@ void func_8007C91C(s32 objectIndex) { GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007C91C.s") #endif -// Something looks wonky about the asm. I suspect this a function was accidentally split in half. -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -s16 func_8007C9F8(void) { - //s8 temp_v0; - - //temp_v0 = D_8018EDF3; - - - +s32 func_8007C9F8(void) { + s32 ret; + s32 first, second; if (D_8018EDF3 == 1) { - return 0; - } - - if (D_8018EDF3 == 2) { - if (gModeSelection == GRAND_PRIX) { - if (gGPCurrentRaceRankByPlayerId[0] < gGPCurrentRaceRankByPlayerId[1]) { - return 0; + ret = 0; + } else { + if (D_8018EDF3 == 2) { + if (gModeSelection == 0) { + first = gGPCurrentRaceRankByPlayerId[0]; + second = gGPCurrentRaceRankByPlayerId[1]; + if (first < second) { + ret = 0; + } else { + ret = 1; + } + } else { + ret = gGPCurrentRacePlayerIdByRank[0]; } - return 1; + } else { + ret = gGPCurrentRacePlayerIdByRank[0]; } - //return gGPCurrentRacePlayerIdByRank[0]; } - return gGPCurrentRacePlayerIdByRank[0]; + return ret; } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007C9F8.s") -#endif #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc @@ -4924,10 +4814,10 @@ void func_8007CC00(void) { temp_t4 = (0x8000 - camera1[temp_v0].rot[1]) & 0xFFFF; temp_s3 = &gPlayerOne[temp_v0]; temp_f20 = coss(temp_t4 & 0xFFFF); - temp_s0->unk_004[0] = (temp_s3->pos[0] + (temp_f20 * (temp_s0->unk_010[0] + temp_s0->unk_028[0]))) - ((temp_s0->unk_028[2] + temp_s0->unk_010[2]) * sins(temp_t4 & 0xFFFF)); - temp_s0->unk_004[1] = (f32) ((f64) temp_s0->unk_028[1] + (6.5 + (f64) temp_s3->unk_074 + (f64) temp_s0->unk_010[1])); + temp_s0->pos[0] = (temp_s3->pos[0] + (temp_f20 * (temp_s0->unk_010[0] + temp_s0->unk_028[0]))) - ((temp_s0->unk_028[2] + temp_s0->unk_010[2]) * sins(temp_t4 & 0xFFFF)); + temp_s0->pos[1] = (f32) ((f64) temp_s0->unk_028[1] + (6.5 + (f64) temp_s3->unk_074 + (f64) temp_s0->unk_010[1])); temp_f20_2 = sins(temp_t4 & 0xFFFF); - temp_s0->unk_004[2] = ((temp_s0->unk_028[2] + temp_s0->unk_010[2]) * coss(temp_t4 & 0xFFFF)) + (temp_s3->pos[2] + (temp_f20_2 * (temp_s0->unk_010[0] + temp_s0->unk_028[0]))); + temp_s0->pos[2] = ((temp_s0->unk_028[2] + temp_s0->unk_010[2]) * coss(temp_t4 & 0xFFFF)) + (temp_s3->pos[2] + (temp_f20_2 * (temp_s0->unk_010[0] + temp_s0->unk_028[0]))); func_8007C550(temp_s2); if (func_8007223C(temp_s2, 0x00000080) != 0) { temp_s0->unk_074 = (s32) &D_800E44B0; @@ -4954,10 +4844,10 @@ void func_8007CE0C(s32 objectIndex) { func_80073444(objectIndex, &gTLUTBoo, &D_0F0D0E50, 0x30U, (u16) 0x00000028); temp_s0 = &D_80165C18[objectIndex]; temp_s0->unk_0D2 = 0x1C; - temp_s0->unk_004[0] = 0.0f; - temp_s0->unk_004[1] = 0.0f; - temp_s0->unk_004[2] = 0.0f; - temp_s0->unk_000 = 0.15f; + temp_s0->pos[0] = 0.0f; + temp_s0->pos[1] = 0.0f; + temp_s0->pos[2] = 0.0f; + temp_s0->sizeScaling = 0.15f; func_80072488(objectIndex); temp_s0->unk_0A0 = 0; func_80073844(objectIndex); @@ -5096,9 +4986,9 @@ loop_5: if (temp_s0_2->unk_0A6 != 0) { func_8007CEDC(temp_s1_2); func_8008B724(temp_s1_2); - temp_s0_2->unk_004[0] = temp_s0_2->unk_028[0] + temp_s0_2->unk_010[0]; - temp_s0_2->unk_004[1] = temp_s0_2->unk_028[1] + (D_8018CF1C->unk_074 + temp_s0_2->unk_010[1]); - temp_s0_2->unk_004[2] = temp_s0_2->unk_028[2] + temp_s0_2->unk_010[2]; + temp_s0_2->pos[0] = temp_s0_2->unk_028[0] + temp_s0_2->unk_010[0]; + temp_s0_2->pos[1] = temp_s0_2->unk_028[1] + (D_8018CF1C->unk_074 + temp_s0_2->unk_010[1]); + temp_s0_2->pos[2] = temp_s0_2->unk_028[2] + temp_s0_2->unk_010[2]; func_8007C420(temp_s1_2, D_8018CF1C, D_8018CF14); if (func_8007223C(temp_s1_2, 0x00000080) != 0) { temp_s0_2->unk_074 = &D_800E44B0; @@ -5152,7 +5042,7 @@ void func_8007D6A8(s32 objectIndex, s32 arg1) { temp_v0 = &D_80165C18[objectIndex]; temp_v0->unk_0D5 = 0x0D; func_8007D360(objectIndex, arg1); - temp_v0->unk_000 = 0.1f; + temp_v0->sizeScaling = 0.1f; func_800721C0(objectIndex, 0x00000200); temp_v0->unk_0C8 = 3; } @@ -5171,27 +5061,15 @@ void func_8007D714(s32 arg0) { } } -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -void func_80089A04(?, ?); // extern - -void func_8007D794(void) { - s32 temp_v0; - - temp_v0 = gCCSelection; - if (temp_v0 == CC_50) { - func_80089A04(0x3F000000, 0x3E4CCCCD); - return; +void func_8007D794(s32 objectIndex) { + if (gCCSelection == CC_50) { + func_80089A04(objectIndex, 0.5f, 0.2f); + } else if (gCCSelection == CC_100) { + func_80089A04(objectIndex, 0.4f, 0.15f); + } else { + func_80089A04(objectIndex, 0.25f, 0.1f); } - if (temp_v0 == CC_100) { - func_80089A04(0x3ECCCCCD, 0x3E19999A); - return; - } - func_80089A04(0x3E800000, 0x3DCCCCCD); } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007D794.s") -#endif s32 func_8007D804(s32 objectIndex) { s32 loopIndex; @@ -5222,18 +5100,18 @@ void func_8007D8D4(s32 objectIndex, s32 arg1) { } if (arg1 == 1) { if (gIsMirrorMode != 0) { - if (D_80165C18[objectIndex].unk_004[0] >= 2540.0) { + if (D_80165C18[objectIndex].pos[0] >= 2540.0) { func_80072428(objectIndex); } - } else if (D_80165C18[objectIndex].unk_004[0] <= -2540.0) { + } else if (D_80165C18[objectIndex].pos[0] <= -2540.0) { func_80072428(objectIndex); } } else if (gIsMirrorMode != 0) { - if (D_80165C18[objectIndex].unk_004[0] >= 2150.0) { + if (D_80165C18[objectIndex].pos[0] >= 2150.0) { func_80072428(objectIndex); } } else { - if (D_80165C18[objectIndex].unk_004[0] <= -2150.0) { + if (D_80165C18[objectIndex].pos[0] <= -2150.0) { func_80072428(objectIndex); } } @@ -5374,7 +5252,7 @@ void func_8007DDC0(s32 objectIndex) { if (temp_s0->unk_048 > 0) { temp_s0->unk_048--; if (temp_s0->unk_048 == 0) { - func_800C9EF4(temp_s0->unk_004, 0x51028006U); + func_800C9EF4(temp_s0->pos, 0x51028006U); } } if (temp_s0->unk_04C == 0) { @@ -5384,7 +5262,7 @@ void func_8007DDC0(s32 objectIndex) { func_8008A6DC(objectIndex, sp2C); if ((func_8007223C(objectIndex, 0x00040000) != 0) && (func_80072354(objectIndex, 1) != 0)) { func_800722A4(objectIndex, 1); - func_800C9D80(temp_s0->unk_004, temp_s0->unk_038, 0x51028006U); + func_800C9D80(temp_s0->pos, temp_s0->unk_038, 0x51028006U); func_800726CC(objectIndex, 3); if (temp_s0->unk_0A4 > 0) { temp_s0->unk_0A4--; @@ -5400,57 +5278,42 @@ void func_8007DDC0(s32 objectIndex) { } } -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -extern ? d_course_banshee_boardwalk_dl_trash_bin; - -void func_8007DF20(s32 objectIndex) { - struct_80165C18_entry *sp1C; - struct_80165C18_entry *temp_v0; - - temp_v0 = &D_80165C18[objectIndex]; - temp_v0->unk_070 = (s32) &d_course_banshee_boardwalk_dl_trash_bin; - temp_v0->unk_04C = 0; - temp_v0->unk_084[7] = 0; - sp1C = temp_v0; - temp_v0->unk_000 = 1.0f; +void init_bb_trash_bin(s32 objectIndex) { + D_80165C18[objectIndex].sizeScaling = 1.0f; + D_80165C18[objectIndex].unk_070 = d_course_banshee_boardwalk_dl_trash_bin; + D_80165C18[objectIndex].unk_04C = 0; + D_80165C18[objectIndex].unk_084[7] = 0; func_8008B8BC(objectIndex, 0U, 0U, 0U); if (gIsMirrorMode != 0) { - temp_v0->unk_0B2[1] = 0x8000; - temp_v0->unk_004[0] = 1765.0f; - temp_v0->unk_004[2] = 195.0f; + D_80165C18[objectIndex].pos[0] = 1765.0f; + D_80165C18[objectIndex].pos[2] = 195.0f; + D_80165C18[objectIndex].unk_0B2[1] = 0x8000; } else { - temp_v0->unk_004[0] = -1765.0f; - temp_v0->unk_004[2] = 70.0f; + D_80165C18[objectIndex].pos[0] = -1765.0f; + D_80165C18[objectIndex].pos[2] = 70.0f; } - sp1C = temp_v0; - temp_v0->unk_004[1] = 45.0f; + D_80165C18[objectIndex].pos[1] = 45.0f; func_8008B8F0(objectIndex, 0.0f, 0.0f, 0.0f); - temp_v0->unk_0A4 = 0; + D_80165C18[objectIndex].unk_0A4 = 0; func_80072488(objectIndex); } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007DF20.s") -#endif #ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -void func_8007D714(?); /* extern */ -void func_8007DF20(s32); /* extern */ +//generated by m2c commit b52d92c2340f6f4ba1aafb464188bb698752fbb0 on Jul-29-2023 extern s32 D_80165594; extern s16 D_8018CFB0; void func_8007E00C(s32 objectIndex) { - s16 temp_v0; s16 temp_v1; struct_80165C18_entry *temp_s0; u16 temp_t8; + u16 temp_v0; temp_s0 = &D_80165C18[objectIndex]; temp_t8 = (u16) temp_s0->unk_0A6; switch (temp_t8) { case 1: - func_8007DF20(objectIndex); + init_bb_trash_bin(objectIndex); return; case 3: D_8018CFB0 = 1; @@ -5471,16 +5334,16 @@ void func_8007E00C(s32 objectIndex) { } func_80073CB0(objectIndex, &temp_s0->unk_0A0, -0x00002000, 0, 0x00000400, 0, -1); temp_v1 = temp_s0->unk_084[7]; - temp_s0->unk_0B2[2] = temp_s0->unk_0A0; + temp_s0->unk_0B2[2] = (u16) temp_s0->unk_0A0; if (temp_v1 == 0) { - func_800C98B8(temp_s0->unk_004, temp_s0->unk_038, 0x1901904EU); + func_800C98B8(temp_s0->pos, temp_s0->unk_038, 0x1901904EU); temp_s0->unk_084[7] = 0x0014; return; } temp_s0->unk_084[7] = temp_v1 - 1; return; case 5: - temp_v0 = func_800417B4((u16) temp_s0->unk_0B2[2], 0U); + temp_v0 = func_800417B4(temp_s0->unk_0B2[2], 0U); temp_s0->unk_0B2[2] = temp_v0; if (!(temp_v0 & 0xFFFF)) { func_80072488(objectIndex); @@ -5535,7 +5398,7 @@ void func_8007E1F4(s32 objectIndex) { if (temp_s0->unk_048 > 0) { temp_s0->unk_048--; if (temp_s0->unk_048 == 0) { - func_800C9EF4(temp_s0->unk_004, 0x51028006U); + func_800C9EF4(temp_s0->pos, 0x51028006U); } } if (temp_s0->unk_04C == 0) { @@ -5545,7 +5408,7 @@ void func_8007E1F4(s32 objectIndex) { func_8008A6DC(objectIndex, sp2C); if ((func_8007223C(objectIndex, 0x00040000) != 0) && (func_80072354(objectIndex, 1) != 0)) { func_800722A4(objectIndex, 1); - func_800C9D80(temp_s0->unk_004, temp_s0->unk_038, 0x51028006U); + func_800C9D80(temp_s0->pos, temp_s0->unk_038, 0x51028006U); func_800726CC(objectIndex, 3); if (temp_s0->unk_0A4 > 0) { temp_s0->unk_0A4--; @@ -5562,9 +5425,9 @@ void func_8007E1F4(s32 objectIndex) { } void func_8007E358(s32 objectIndex) { - D_80165C18[objectIndex].unk_004[0] = -1371.0f * D_8018D01C; - D_80165C18[objectIndex].unk_004[1] = 31.0f; - D_80165C18[objectIndex].unk_004[2] = -217.0f; + D_80165C18[objectIndex].pos[0] = -1371.0f * D_8018D01C; + D_80165C18[objectIndex].pos[1] = 31.0f; + D_80165C18[objectIndex].pos[2] = -217.0f; func_8008B8F0(objectIndex, 0.0f, 0.0f, 0.0f); D_80165C18[objectIndex].unk_0A4 = 0; D_80165C18[objectIndex].unk_04C = 0; @@ -5605,7 +5468,7 @@ void func_8007E3EC(s32 objectIndex) { } void func_8007E4C4(void) { - s32 objectIndex = D_80183EA8; + s32 objectIndex = D_80183EA0[2]; func_8007E3EC(objectIndex); if (gModeSelection != TIME_TRIALS) { func_8007E1F4(objectIndex); @@ -5639,41 +5502,24 @@ s32 func_8007E59C(s32 objectIndex) { return temp_v0; } -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -s32 func_80072AAC(s32, ?, ?); /* extern */ -void func_80080DE4(s32); /* extern */ - void func_8007E63C(s32 objectIndex) { - struct_80165C18_entry *sp28; - f32 temp_f0; - f32 temp_f0_2; - f32 temp_f0_3; - s16 temp_v0; - struct_80165C18_entry *temp_v1; - - temp_v1 = &D_80165C18[objectIndex]; - temp_v0 = temp_v1->unk_0A6; - switch (temp_v0) { /* irregular */ + switch (D_80165C18[objectIndex].unk_0A6) { /* irregular */ case 0x32: - if (f32_step_up_towards(&temp_v1->unk_028[1], (f32) ((f64) temp_v1->unk20 + 15.0), 1.5f) != 0) { + if (f32_step_up_towards(&D_80165C18[objectIndex].unk_028[1], D_80165C18[objectIndex].unk_01C[1] + 15.0, 1.5f) != 0) { func_800721C0(objectIndex, 0x00000200); func_800722A4(objectIndex, 1); func_800722CC(objectIndex, 2); func_80072488(objectIndex); - return; } - return; + break; case 0x33: - sp28 = temp_v1; - if (f32_step_down_towards(&temp_v1->unk_028[1], 0.0f, 2.0f) != 0) { - temp_f0 = temp_v1->unk_028[1]; - if (temp_f0 >= 16.0f) { - temp_v1->unk_0D2 = 0; - } else if (temp_f0 >= 8.0f) { - temp_v1->unk_0D2 = 1; + if (f32_step_down_towards(&D_80165C18[objectIndex].unk_028[1], 0.0f, 2.0f) != 0) { + if (D_80165C18[objectIndex].unk_028[1] >= 16.0f) { + D_80165C18[objectIndex].unk_0D2 = 0; + } else if (D_80165C18[objectIndex].unk_028[1] >= 8.0f) { + D_80165C18[objectIndex].unk_0D2 = 1; } else { - temp_v1->unk_0D2 = 2; + D_80165C18[objectIndex].unk_0D2 = 2; } func_800722CC(objectIndex, 1); if (func_8007223C(objectIndex, 0x00010000) != 0) { @@ -5684,45 +5530,41 @@ void func_8007E63C(s32 objectIndex) { } if (func_80072320(objectIndex, 2) != 0) { func_800726CC(objectIndex, 0x00000064); - return; + } else { + func_80072488(objectIndex); } - func_80072488(objectIndex); - return; } break; case 0x34: func_80072AAC(objectIndex, 3, 6); - return; + break; case 0x35: - func_80072AAC(objectIndex, 2, 0x32); - return; + func_80072AAC(objectIndex, 2, 0x00000032); + break; case 0x36: - temp_f0_2 = temp_v1->unk_028[1]; - if (temp_f0_2 >= 20.0f) { - temp_v1->unk_0D2 = 0; - } else if (temp_f0_2 >= 18.0f) { - temp_v1->unk_0D2 = 1; + if (D_80165C18[objectIndex].unk_028[1] >= 20.0f) { + D_80165C18[objectIndex].unk_0D2 = 0; + } else if (D_80165C18[objectIndex].unk_028[1] >= 18.0f) { + D_80165C18[objectIndex].unk_0D2 = 1; } - if (f32_step_up_towards(&temp_v1->unk_028[1], temp_v1->unk20, 0.5f) != 0) { + if (f32_step_up_towards(&D_80165C18[objectIndex].unk_028[1], D_80165C18[objectIndex].unk_01C[1], 0.5f) != 0) { func_800721E8(objectIndex, 0x00000200); func_8007266C(objectIndex); - return; } break; case 0x64: func_80072E54(objectIndex, 3, 5, 1, 8, 0); - return; + break; case 0x65: func_8007278C(objectIndex, 0x0000001E); - return; + break; case 0x66: - if (f32_step_up_towards(&temp_v1->unk_028[1], 20.0f, 1.5f) != 0) { + if (f32_step_up_towards(&D_80165C18[objectIndex].unk_028[1], 20.0f, 1.5f) != 0) { func_80072488(objectIndex); - return; } break; case 0x67: - if (f32_step_down_towards(&temp_v1->unk_028[1], 0.0f, 1.5f) != 0) { + if (f32_step_down_towards(&D_80165C18[objectIndex].unk_028[1], 0.0f, 1.5f) != 0) { if (func_8007223C(objectIndex, 0x00020000) != 0) { func_800722A4(objectIndex, 0x00000010); if (func_8007223C(objectIndex, 0x00040000) != 0) { @@ -5730,58 +5572,47 @@ void func_8007E63C(s32 objectIndex) { } } func_80072488(objectIndex); - return; } break; case 0x68: - if (f32_step_up_towards(&temp_v1->unk_028[1], 12.0f, 1.5f) != 0) { + if (f32_step_up_towards(&D_80165C18[objectIndex].unk_028[1], 12.0f, 1.5f) != 0) { func_80072488(objectIndex); - return; } break; case 0x69: - sp28 = temp_v1; - if (f32_step_down_towards(&temp_v1->unk_028[1], 0.0f, 1.5f) != 0) { - sp28 = temp_v1; + if (f32_step_down_towards(&D_80165C18[objectIndex].unk_028[1], 0.0f, 1.5f) != 0) { if (func_8007223C(objectIndex, 0x00020000) != 0) { - sp28 = temp_v1; func_800722A4(objectIndex, 0x00000010); if (func_8007223C(objectIndex, 0x00040000) != 0) { - sp28 = temp_v1; func_800722A4(objectIndex, 0x00000020); } } - func_800C98B8(temp_v1->unk_004, &temp_v1->unk_038, 0x19018045U); + func_800C98B8(D_80165C18[objectIndex].pos, D_80165C18[objectIndex].unk_038, 0x19018045U); func_80072488(objectIndex); - return; } break; case 0x6A: if (func_8007326C(objectIndex, 5, 3, 1, 6, 3) != 0) { func_80080DE4(objectIndex); - return; } break; case 0x6B: - temp_f0_3 = temp_v1->unk_028[1]; - if (temp_f0_3 >= 22.0f) { - temp_v1->unk_0D2 = 0; - } else if (temp_f0_3 >= 20.0f) { - temp_v1->unk_0D2 = 1; - } else if (temp_f0_3 >= 18.0f) { - temp_v1->unk_0D2 = 2; - } else if (temp_f0_3 >= 16.0f) { - temp_v1->unk_0D2 = 3; - } else if (temp_f0_3 >= 14.0f) { - temp_v1->unk_0D2 = 4; + if (D_80165C18[objectIndex].unk_028[1] >= 22.0f) { + D_80165C18[objectIndex].unk_0D2 = 0; + } else if (D_80165C18[objectIndex].unk_028[1] >= 20.0f) { + D_80165C18[objectIndex].unk_0D2 = 1; + } else if (D_80165C18[objectIndex].unk_028[1] >= 18.0f) { + D_80165C18[objectIndex].unk_0D2 = 2; + } else if (D_80165C18[objectIndex].unk_028[1] >= 16.0f) { + D_80165C18[objectIndex].unk_0D2 = 3; + } else if (D_80165C18[objectIndex].unk_028[1] >= 14.0f) { + D_80165C18[objectIndex].unk_0D2 = 4; } else { - sp28 = temp_v1; func_800730BC(objectIndex, 3, 5, 1, 6, -1); } - if (f32_step_up_towards(&temp_v1->unk_028[1], temp_v1->unk20, 0.5f) != 0) { + if (f32_step_up_towards(&D_80165C18[objectIndex].unk_028[1], D_80165C18[objectIndex].unk_01C[1], 0.5f) != 0) { func_80072388(objectIndex, 0); func_80072488(objectIndex); - return; } break; case 0x6C: @@ -5789,7 +5620,6 @@ void func_8007E63C(s32 objectIndex) { func_800722CC(objectIndex, 2); func_800721E8(objectIndex, 0x00000200); func_8007266C(objectIndex); - return; } break; case 0xC8: @@ -5797,34 +5627,24 @@ void func_8007E63C(s32 objectIndex) { func_80072320(objectIndex, 0x00000080); func_80072428(objectIndex); func_800726CC(objectIndex, 1); - return; } break; case 0x12C: - if (func_80073E18(objectIndex, (u16 *) &temp_v1->unk_0B2[1], 0x0400U, 0x00008000) != 0) { + if (func_80073E18(objectIndex, &D_80165C18[objectIndex].unk_0B2[1], 0x0400U, 0x00008000) != 0) { func_800722CC(objectIndex, 4); func_8007266C(objectIndex); } break; } } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007E63C.s") -#endif - -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -extern s32 gTLUTWhomp; -extern s32 d_course_bowsers_castle_thwomp_faces; -extern ? d_course_bowsers_castle_dl_thwomp; void func_8007EC30(s32 objectIndex) { struct_80165C18_entry *temp_s1; temp_s1 = &D_80165C18[objectIndex]; - temp_s1->unk_044 = 0; - temp_s1->unk_010[1] = (bitwise f32) 0; - func_8008B80C(objectIndex, (bitwise f32) 0, (bitwise f32) 0, (bitwise f32) 0); + temp_s1->unk_044 = 0.0f; + temp_s1->unk_010[1] = 0.0f; + func_8008B80C(objectIndex, 0.0f, 0.0f, 0.0f); if (gIsMirrorMode != 0) { func_8008B888(objectIndex, 0U, 0x4000U, 0U); func_8008B8BC(objectIndex, 0U, 0x4000U, 0U); @@ -5832,37 +5652,21 @@ void func_8007EC30(s32 objectIndex) { func_8008B888(objectIndex, 0U, 0xC000U, 0U); func_8008B8BC(objectIndex, 0U, 0xC000U, 0U); } - func_80073444(objectIndex, &gTLUTWhomp, &d_course_bowsers_castle_thwomp_faces, 0x10U, (u16) 0x00000040); - temp_s1->unk_070 = (s32) &d_course_bowsers_castle_dl_thwomp; - temp_s1->unkC8 = 0x000C; - temp_s1->unk_000 = 1.0f; - temp_s1->unk20 = 30.0f; + func_80073444(objectIndex, gTLUTWhomp, d_course_bowsers_castle_thwomp_faces, 0x10U, (u16) 0x00000040); + temp_s1->unk_070 = d_course_bowsers_castle_dl_thwomp; + temp_s1->unk_0C8 = 0x000C; + temp_s1->sizeScaling = 1.0f; + temp_s1->unk_01C[1] = 30.0f; func_800721C0(objectIndex, 0x05000220); temp_s1->unk_0A4 = 0; temp_s1->unk_0DF = 6; func_800724DC(objectIndex); func_80072488(objectIndex); } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007EC30.s") -#endif - -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -s32 func_8007E59C(s32); /* extern */ -void func_8007E63C(s32); /* extern */ -void func_8007EC30(s32); /* extern */ -void func_8008BF18(s32); /* extern */ void func_8007ED6C(s32 objectIndex) { - struct_80165C18_entry *sp24; - struct_80165C18_entry *temp_t8; - u16 temp_t9; - - temp_t8 = &D_80165C18[objectIndex]; - sp24 = temp_t8; - temp_t9 = (u16) temp_t8->unk_0A6; - switch (temp_t9) { + s32 stackPadding[4]; + switch (D_80165C18[objectIndex].unk_0A6) { case 0: break; case 1: @@ -5884,35 +5688,26 @@ void func_8007ED6C(s32 objectIndex) { } func_8007E63C(objectIndex); func_8008BF18(objectIndex); - sp24->unk_0BE[1] = (u16) sp24->unk_0B2[1]; + D_80165C18[objectIndex].unk_0BE[1] = D_80165C18[objectIndex].unk_0B2[1]; func_80073514(objectIndex); } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007ED6C.s") -#endif - -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -extern s32 gTLUTWhomp; -extern s32 d_course_bowsers_castle_thwomp_faces; -extern ? d_course_bowsers_castle_dl_thwomp; void func_8007EE5C(s32 objectIndex) { struct_80165C18_entry *temp_s0; - func_80073444(objectIndex, &gTLUTWhomp, &d_course_bowsers_castle_thwomp_faces, 0x10U, (u16) 0x00000040); + func_80073444(objectIndex, gTLUTWhomp, d_course_bowsers_castle_thwomp_faces, 0x10U, (u16) 0x00000040); temp_s0 = &D_80165C18[objectIndex]; - temp_s0->unk_070 = (s32) &d_course_bowsers_castle_dl_thwomp; - temp_s0->unkC8 = 0x000C; - temp_s0->unk_000 = 1.0f; + temp_s0->sizeScaling = 1.0f; + temp_s0->unk_070 = d_course_bowsers_castle_dl_thwomp; + temp_s0->unk_0C8 = 0x000C; func_800721C0(objectIndex, 0x04000220); temp_s0->unk_0A4 = 0; temp_s0->unk_0DF = 6; func_80086E70(objectIndex); - temp_s0->unk_044 = 0; - temp_s0->unk_010[1] = (bitwise f32) 0; - func_8008B80C(objectIndex, (bitwise f32) 0, 20.0f, (bitwise f32) 0); - temp_s0->unk20 = 20.0f; + temp_s0->unk_044 = 0.0f; + temp_s0->unk_010[1] = 0.0f; + func_8008B80C(objectIndex, 0.0f, 20.0f, 0.0f); + temp_s0->unk_01C[1] = 20.0f; if (gIsMirrorMode != 0) { func_8008B888(objectIndex, 0U, 0x4000U, 0U); func_8008B8BC(objectIndex, 0U, 0x4000U, 0U); @@ -5928,9 +5723,6 @@ void func_8007EE5C(s32 objectIndex) { } func_80072488(objectIndex); } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007EE5C.s") -#endif void func_8007EFBC(s32 objectIndex) { switch (D_80165C18[objectIndex].unk_0AE) { @@ -6095,18 +5887,9 @@ void func_8007F544(s32 objectIndex) { } } -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -void func_8007E63C(s32); /* extern */ -void func_8007EE5C(s32); /* extern */ -void func_8007F544(s32); /* extern */ -extern ? D_80165CBE; - void func_8007F5A8(s32 objectIndex) { - s16 temp_v0; - temp_v0 = *(&D_80165CBE + (objectIndex * 0xE0)); - switch (temp_v0) { /* irregular */ + switch (D_80165C18[objectIndex].unk_0A6) { /* irregular */ case 0: break; case 1: @@ -6125,9 +5908,6 @@ void func_8007F5A8(s32 objectIndex) { func_8008BF18(objectIndex); func_80073514(objectIndex); } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007F5A8.s") -#endif void func_8007F660(s32 objectIndex, s32 arg1, s32 arg2) { struct_80165C18_entry *temp_v0; @@ -6211,42 +5991,33 @@ void func_8007F8D8(void) { } } -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -extern s32 gTLUTWhomp; -extern s32 d_course_bowsers_castle_thwomp_faces; -extern ? d_course_bowsers_castle_dl_thwomp; - void func_8007FA08(s32 objectIndex) { struct_80165C18_entry *temp_s0; - func_80073444(objectIndex, &gTLUTWhomp, &d_course_bowsers_castle_thwomp_faces, 0x10U, (u16) 0x00000040); + func_80073444(objectIndex, gTLUTWhomp, d_course_bowsers_castle_thwomp_faces, 0x10U, (u16) 0x00000040); temp_s0 = &D_80165C18[objectIndex]; - temp_s0->unk_070 = (s32) &d_course_bowsers_castle_dl_thwomp; - temp_s0->unkC8 = 0x000C; - temp_s0->unk_000 = 1.0f; + temp_s0->unk_070 = d_course_bowsers_castle_dl_thwomp; + temp_s0->unk_0C8 = 0x000C; + temp_s0->sizeScaling = 1.0f; func_800721C0(objectIndex, 0x04000220); temp_s0->unk_0A4 = 0; - temp_s0->unk_044 = 0; - temp_s0->unk_010[1] = (bitwise f32) 0; - func_8008B80C(objectIndex, (bitwise f32) 0, (bitwise f32) 0, (bitwise f32) 0); + temp_s0->unk_044 = 0.0f; + temp_s0->unk_010[1] = 0.0f; + func_8008B80C(objectIndex, 0.0f, 0.0f, 0.0f); func_8008B888(objectIndex, 0U, 0U, 0U); if (gIsMirrorMode != 0) { func_8008B8BC(objectIndex, 0U, 0xC000U, 0U); } else { func_8008B8BC(objectIndex, 0U, 0x4000U, 0U); } - temp_s0->unk_038 = (bitwise f32) 0; + temp_s0->unk_038[0] = 0.0f; + temp_s0->unk_0BE[1] = temp_s0->unk_0B2[1]; temp_s0->unk_0DD = 1; temp_s0->unk_0DF = 8; - temp_s0->unk_0BE[1] = (u16) temp_s0->unk_0B2[1]; temp_s0->unk_028[1] = 15.0f; - temp_s0->unk20 = 15.0f; + temp_s0->unk_01C[1] = 15.0f; func_80072488(objectIndex); } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007FA08.s") -#endif #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc @@ -6372,20 +6143,20 @@ void func_8007FEA4(s32 objectIndex) { } } -void func_8007FF5C(s32 arg0) +void func_8007FF5C(s32 objectIndex) { - switch(D_80165CF5[arg0].unk[0]) { + switch(D_80165C18[objectIndex].unk_0DD) { case 1: - func_8007FB48(arg0); + func_8007FB48(objectIndex); break; case 2: - func_8007FEA4(arg0); + func_8007FEA4(objectIndex); break; } } void func_8007FFC0(s32 objectIndex) { - switch (D_80165CBE[objectIndex].unk[0]) { /* irregular */ + switch (D_80165C18[objectIndex].unk_0A6) { /* irregular */ case 0: break; case 1: @@ -6405,36 +6176,28 @@ void func_8007FFC0(s32 objectIndex) { func_80073514(objectIndex); } -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -extern s32 gTLUTWhomp; -extern s32 d_course_bowsers_castle_thwomp_faces; -extern ? d_course_bowsers_castle_dl_thwomp; - void func_80080078(s32 objectIndex) { - s16 temp_v0; struct_80165C18_entry *temp_s0; - func_80073444(objectIndex, &gTLUTWhomp, &d_course_bowsers_castle_thwomp_faces, 0x10U, (u16) 0x00000040); + func_80073444(objectIndex, gTLUTWhomp, d_course_bowsers_castle_thwomp_faces, 0x10U, (u16) 0x00000040); temp_s0 = &D_80165C18[objectIndex]; - temp_s0->unk_070 = (s32) &d_course_bowsers_castle_dl_thwomp; - temp_s0->unkC8 = 0x000C; - temp_s0->unk_000 = 1.0f; + temp_s0->unk_070 = d_course_bowsers_castle_dl_thwomp; + temp_s0->unk_0C8 = 0x000C; + temp_s0->sizeScaling = 1.0f; func_800721C0(objectIndex, 0x04000220); temp_s0->unk_0A4 = 2; temp_s0->unk_0DF = 8; func_8008B888(objectIndex, 0U, 0U, 0U); - temp_s0->unk_044 = 0; - temp_s0->unk_010[1] = (bitwise f32) 0; - func_8008B80C(objectIndex, (bitwise f32) 0, (bitwise f32) 0, (bitwise f32) 0); + temp_s0->unk_044 = 0.0f; + temp_s0->unk_010[1] = 0.0f; + func_8008B80C(objectIndex, 0.0f, 0.0f, 0.0f); temp_s0->unk_01C[1] = 30.0f; if (gIsMirrorMode != 0) { func_8008B8BC(objectIndex, 0U, 0x4000U, 0U); } else { func_8008B8BC(objectIndex, 0U, 0xC000U, 0U); } - temp_v0 = temp_s0->unk_0A0; - switch (temp_v0) { /* irregular */ + switch (temp_s0->unk_0A0) { /* irregular */ case 0: temp_s0->unk_050 = 2; break; @@ -6451,23 +6214,12 @@ void func_80080078(s32 objectIndex) { func_800724DC(objectIndex); func_80072488(objectIndex); } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80080078.s") -#endif - -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -void func_8007E63C(s32); /* extern */ -void func_80080078(s32); /* extern */ -void func_8008BF18(s32); /* extern */ void func_800801FC(s32 objectIndex) { struct_80165C18_entry *temp_v0; - u16 temp_t8; temp_v0 = &D_80165C18[objectIndex]; - temp_t8 = (u16) temp_v0->unk_0A6; - switch (temp_t8) { + switch (temp_v0->unk_0A6) { case 0: break; case 1: @@ -6488,32 +6240,23 @@ void func_800801FC(s32 objectIndex) { func_8008BF18(objectIndex); func_80073514(objectIndex); } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_800801FC.s") -#endif - -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -extern s32 gTLUTWhomp; -extern s32 d_course_bowsers_castle_thwomp_faces; -extern ? d_course_bowsers_castle_dl_thwomp; void func_800802C0(s32 objectIndex) { struct_80165C18_entry *temp_s0; temp_s0 = &D_80165C18[objectIndex]; temp_s0->unk_0D8 = 0; - func_80073444(objectIndex, &gTLUTWhomp, &d_course_bowsers_castle_thwomp_faces, 0x10U, (u16) 0x00000040); - temp_s0->unk_070 = (s32) &d_course_bowsers_castle_dl_thwomp; + func_80073444(objectIndex, gTLUTWhomp, d_course_bowsers_castle_thwomp_faces, 0x10U, (u16) 0x00000040); + temp_s0->unk_070 = d_course_bowsers_castle_dl_thwomp; temp_s0->unk_0D2 = 0; - temp_s0->unkC8 = 0x000C; - temp_s0->unk_000 = 1.5f; + temp_s0->unk_0C8 = 0x000C; + temp_s0->sizeScaling = 1.5f; func_800721C0(objectIndex, 0x05000220); temp_s0->unk_0A4 = 1; temp_s0->unk_0DF = 6; func_8008B80C(objectIndex, 0.0f, 0.0f, 0.0f); func_8008B888(objectIndex, 0U, 0U, 0U); - temp_s0->unk_044 = (bitwise s32) 0.0f; + temp_s0->unk_044 = 0.0f; temp_s0->unk_010[1] = 0.0f; temp_s0->unk_028[1] = 10.0f; temp_s0->unk_01C[1] = 10.0f; @@ -6527,40 +6270,24 @@ void func_800802C0(s32 objectIndex) { func_800724DC(objectIndex); func_80072488(objectIndex); } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_800802C0.s") -#endif - -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -void func_800802C0(s32); /* extern */ -void func_8008BF18(s32); /* extern */ void func_80080408(s32 objectIndex) { - struct_80165C18_entry *sp2C; - struct_80165C18_entry *temp_v1; - u16 temp_t8; - - temp_v1 = &D_80165C18[objectIndex]; - temp_t8 = (u16) temp_v1->unk_0A6; - switch (temp_t8) { + switch (D_80165C18[objectIndex].unk_0A6) { case 0: break; case 1: func_800802C0(objectIndex); break; case 2: - sp2C = temp_v1; func_8008A6DC(objectIndex, 100.0f); if (func_8007223C(objectIndex, 0x00040000) != 0) { - func_800C98B8(temp_v1->unk_004, &temp_v1->unk_038, 0x19018045U); + func_800C98B8(D_80165C18[objectIndex].pos, D_80165C18[objectIndex].unk_038, 0x19018045U); func_80072488(objectIndex); } break; case 3: - sp2C = temp_v1; if (func_800730BC(objectIndex, 3, 5, 1, 6, 6) != 0) { - temp_v1->unk_0D2 = 0; + D_80165C18[objectIndex].unk_0D2 = 0; } break; case 4: @@ -6572,34 +6299,23 @@ void func_80080408(s32 objectIndex) { func_8008BF18(objectIndex); func_80073514(objectIndex); } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80080408.s") -#endif - -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -extern s32 gTLUTWhomp; -extern s32 d_course_bowsers_castle_thwomp_faces; -extern ? d_course_bowsers_castle_dl_thwomp; -extern s32 gGamestate; void func_80080524(s32 objectIndex) { - s16 temp_v0; struct_80165C18_entry *temp_s0; - func_80073444(objectIndex, &gTLUTWhomp, &d_course_bowsers_castle_thwomp_faces, 0x10U, (u16) 0x00000040); + func_80073444(objectIndex, gTLUTWhomp, d_course_bowsers_castle_thwomp_faces, 0x10U, (u16) 0x00000040); temp_s0 = &D_80165C18[objectIndex]; - temp_s0->unk_070 = (s32) &d_course_bowsers_castle_dl_thwomp; - temp_s0->unkC8 = 0x000C; + temp_s0->unk_070 = d_course_bowsers_castle_dl_thwomp; + temp_s0->unk_0C8 = 0x000C; temp_s0->unk_0D2 = 0; - temp_s0->unk_000 = 1.0f; + temp_s0->sizeScaling = 1.0f; func_800721C0(objectIndex, 0x04000220); temp_s0->unk_0A4 = 0; temp_s0->unk_0DF = 0x0A; func_80086E70(objectIndex); func_8008B80C(objectIndex, 0.0f, 0.0f, 0.0f); - temp_s0->unk_044 = 0x428C0000; - temp_s0->unk_010[1] = (bitwise f32) 0x428C0000; + temp_s0->unk_044 = 70.0f; + temp_s0->unk_010[1] = 70.0f; temp_s0->unk_01C[1] = 0.0f; func_8008B888(objectIndex, 0U, 0U, 0U); if ((gIsMirrorMode != 0) || (gGamestate == 9)) { @@ -6607,23 +6323,19 @@ void func_80080524(s32 objectIndex) { } else { func_8008B8BC(objectIndex, 0U, 0x4000U, 0U); } - temp_v0 = temp_s0->unk_0A0; - switch (temp_v0) { /* irregular */ + switch (temp_s0->unk_0A0) { /* irregular */ case 0: temp_s0->unk_0DD = 2; - temp_s0->unk_040 = -1.0f; + temp_s0->unk_038[2] = -1.0f; break; case 1: temp_s0->unk_0DD = 2; - temp_s0->unk_040 = -1.5f; + temp_s0->unk_038[2] = -1.5f; break; } func_800722A4(objectIndex, 0x00000080); func_80072488(objectIndex); } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80080524.s") -#endif void func_800806BC(s32 objectIndex) { switch (D_80165C18[objectIndex].unk_0AE) { @@ -6711,12 +6423,12 @@ block_6: func_80073514(objectIndex); if (gGamestate != 9) { if ((D_8018D40C == 0) && (temp_t0->unk_0A6 == 2)) { - func_800C98B8(temp_t0->unk_004, &temp_t0->unk_038, 0x19036045U); + func_800C98B8(temp_t0->pos, &temp_t0->unk_038, 0x19036045U); } } else { temp_v0 = gCutsceneShotTimer; if ((temp_v0 < 0xBF) && ((temp_v0 % 88) == 0x0000001E)) { - func_800C98B8(temp_t0->unk_004, &temp_t0->unk_038, 0x19036045U); + func_800C98B8(temp_t0->pos, &temp_t0->unk_038, 0x19036045U); } } } @@ -6738,54 +6450,39 @@ void func_80080A4C(s32 objectIndex, s32 cameraPlayerId) { if (gScreenModeSelection != 3) { if ((func_80072320(objectIndex, 0x00000010) != 0) && (func_80088A58(objectIndex, player, 500.0f) != 0)) { func_8001CA10(camera); - func_800C98B8(D_80165C18[objectIndex].unk_004, D_80165C18[objectIndex].unk_038, 0x1900800FU); + func_800C98B8(D_80165C18[objectIndex].pos, D_80165C18[objectIndex].unk_038, 0x1900800FU); } } } -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -void func_80072180(); /* extern */ -void func_80075304(void *, ?, ?, s32); /* extern */ -void func_80080DE4(s32); /* extern */ -void func_80089474(s32, s32, ?, ?, s32); /* extern */ -extern s32 D_8018D3C4; - void func_80080B28(s32 objectIndex, s32 playerId) { - f32 sp2C; - Player *temp_s0; f32 temp_f0; - u16 temp_v0; - u16 temp_v0_2; + Player *temp_s0; temp_s0 = &gPlayerOne[playerId]; if (func_8007223C(objectIndex, 0x00000200) != 0) { if (!(temp_s0->statusEffects & 0x100)) { temp_f0 = func_80088F54(objectIndex, temp_s0); - if (((f64) temp_f0 <= 9.0) && ((temp_s0->unk_0BC << 5) >= 0) && (sp2C = temp_f0, (func_80088D18(objectIndex, temp_s0) != 0))) { - temp_v0 = temp_s0->unk_000; - if ((temp_v0 & 0x8000) && !(temp_v0 & 0x100)) { + if ((temp_f0 <= 9.0) && !(temp_s0->unk_0BC & 0x04000000) && (func_80088D18(objectIndex, temp_s0) != 0)) { + if ((temp_s0->unk_000 & 0x8000) && !(temp_s0->unk_000 & 0x100)) { if (!(temp_s0->unk_0BC & 0x200)) { - func_80089474(objectIndex, playerId, 0x3FB33333, 0x3F8CCCCD, 0x1900A04C); - return; - } - if (func_80072354(objectIndex, 0x00000040) != 0) { + func_80089474(objectIndex, playerId, 1.4f, 1.1f, 0x1900A04CU); + } else if (func_80072354(objectIndex, 0x00000040) != 0) { if (temp_s0->unk_000 & 0x1000) { func_800C98B8(temp_s0->pos, temp_s0->unk_034, 0x1901A24AU); } else { func_800C9060((u8) playerId, 0x1901A24AU); } func_80080DE4(objectIndex); - func_80075304((objectIndex * 0xE0) + 4 + D_80165C18, 3, 3, D_8018D3C4); + func_80075304(D_80165C18[objectIndex].pos, 3, 3, D_8018D3C4); func_800721E8(objectIndex, 0x00000200); func_800722A4(objectIndex, 0x00000040); func_80086F60(objectIndex); func_800726CC(objectIndex, 0x000000C8); } } - } else if (((f64) temp_f0 <= 17.5) && (func_80072320(objectIndex, 1) != 0) && (func_80088A58(objectIndex, temp_s0, (f32) (((f64) temp_s0->unk_094 * 0.5) + 7.0)) != 0)) { - temp_v0_2 = temp_s0->unk_000; - if ((temp_v0_2 & 0x8000) && !(temp_v0_2 & 0x100)) { + } else if ((temp_f0 <= 17.5) && (func_80072320(objectIndex, 1) != 0) && (func_80088A58(objectIndex, temp_s0, (temp_s0->unk_094 * 0.5) + 7.0) != 0)) { + if ((temp_s0->unk_000 & 0x8000) && !(temp_s0->unk_000 & 0x100)) { if (func_8007223C(objectIndex, 0x04000000) != 0) { func_80072180(); } @@ -6801,48 +6498,19 @@ void func_80080B28(s32 objectIndex, s32 playerId) { } } } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80080B28.s") -#endif -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc void func_80080DE4(s32 arg0) { - Player *temp_v0; - Player *temp_v0_2; - Player *temp_v0_3; - Player *var_v0; + Player *player; s32 var_v1; - var_v0 = gPlayerOne; - var_v1 = 0; - do { - var_v1 += 4; - if (arg0 == var_v0->unk_040) { - var_v0->unk_040 = -1; - var_v0->statusEffects &= ~0x100; + player = gPlayerOne; + for (var_v1 = 0; var_v1 < 8; var_v1++, player++) { + if (arg0 == player->unk_040) { + player->statusEffects &= ~0x100; + player->unk_040 = -1; } - temp_v0 = var_v0 + 0xDD8; - if (arg0 == var_v0->unkE18) { - temp_v0->unk_040 = -1; - temp_v0->statusEffects &= ~0x100; - } - temp_v0_2 = temp_v0 + 0xDD8; - if (arg0 == temp_v0->unkE18) { - temp_v0_2->unk_040 = -1; - temp_v0_2->statusEffects &= ~0x100; - } - temp_v0_3 = temp_v0_2 + 0xDD8; - if (arg0 == temp_v0_2->unkE18) { - temp_v0_3->unk_040 = -1; - temp_v0_3->statusEffects &= ~0x100; - } - var_v0 = temp_v0_3 + 0xDD8; - } while (var_v1 != 8); + } } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80080DE4.s") -#endif #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc @@ -6872,9 +6540,9 @@ void func_80080E8C(s32 objectIndex1, s32 objectIndex2, s32 arg2) { temp_s1 = temp_v0->unk_0BE[1]; sp2C = temp_v0; sp38 = func_800416D8(temp_v1->unk4, temp_v1->unk0, temp_s1); - temp_s0->unk_010[0] = temp_v0->unk_004[0] + func_80041724(temp_v1->unk4, temp_v1->unk0, temp_s1 & 0xFFFF); + temp_s0->unk_010[0] = temp_v0->pos[0] + func_80041724(temp_v1->unk4, temp_v1->unk0, temp_s1 & 0xFFFF); temp_s0->unk_010[1] = (f32) ((f64) temp_v0->unk_044 - 9.0); - temp_s0->unk_010[2] = temp_v0->unk_004[2] + sp38; + temp_s0->unk_010[2] = temp_v0->pos[2] + sp38; temp_t7 = (*(&D_800E597C + sp28) + temp_v0->unk_0BE[1]) & 0xFFFF; temp_s0->unk_038 = (f32) ((f64) sins(temp_t7 & 0xFFFF) * 0.6); temp_s0->unk_040 = (f32) ((f64) coss(temp_t7 & 0xFFFF) * 0.6); @@ -6906,56 +6574,35 @@ loop_1: GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80080FEC.s") #endif -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -extern s32 *D_8018D490; - void func_80081080(s32 objectIndex) { - s32 *temp_v1; struct_80165C18_entry *temp_v0; - temp_v1 = D_8018D490; temp_v0 = &D_80165C18[objectIndex]; + temp_v0->activeTexture = D_8018D490; + temp_v0->textureList = D_8018D490; temp_v0->unk_0A0 = 0x00FF; temp_v0->unk_0BE[1] = 0; temp_v0->unk_0B2[0] = 0; temp_v0->unk_0B2[2] = 0; - temp_v0->unk_064 = temp_v1; - temp_v0->unk_06C = (s32) temp_v1; temp_v0->unk_028[0] = 0.0f; temp_v0->unk_028[1] = 0.0f; temp_v0->unk_028[2] = 0.0f; - temp_v0->unk_000 = 0.25f; + temp_v0->sizeScaling = 0.25f; func_80072488(objectIndex); } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80081080.s") -#endif - -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -void func_80081080(s32); /* extern */ -void func_8008775C(s32); /* extern */ void func_800810F4(s32 objectIndex) { - struct_80165C18_entry *sp30; - s16 temp_v0; - struct_80165C18_entry *temp_v1; - - temp_v1 = &D_80165C18[objectIndex]; - temp_v0 = temp_v1->unk_0A6; - switch (temp_v0) { /* irregular */ + switch (D_80165C18[objectIndex].unk_0A6) { /* irregular */ case 0: break; case 1: func_80081080(objectIndex); break; case 2: - sp30 = temp_v1; func_8008775C(objectIndex); - f32_step_up_towards(&sp30->unk_028[1], 14.0f, 0.5f); - func_8007415C(objectIndex, &sp30->unk_000, 0.25f, 0.75f, 0.025f, 1, 0); - if (func_80073B00(objectIndex, &sp30->unk_0A0, 0x000000FF, 0, 4, 0, 0) != 0) { + f32_step_up_towards(&D_80165C18[objectIndex].unk_028[1], 14.0f, 0.5f); + func_8007415C(objectIndex, &D_80165C18[objectIndex].sizeScaling, 0.25f, 0.75f, 0.025f, 1, 0); + if (func_80073B00(objectIndex, &D_80165C18[objectIndex].unk_0A0, 0x000000FF, 0, 4, 0, 0) != 0) { func_80072488(objectIndex); } break; @@ -6965,27 +6612,15 @@ void func_800810F4(s32 objectIndex) { } func_8008BF18(objectIndex); } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_800810F4.s") -#endif void func_80081208(void) { } #ifdef MIPS_TO_C -//generated by m2c commit d9d3d6575355663122de59f6b2882d8f174e2355 on Dec-28-2022 -? func_8007ED6C(s32); /* extern */ -? func_8007F5A8(s32); /* extern */ -? func_8007F8D8(); /* extern */ -? func_8007FFC0(s32); /* extern */ -? func_800801FC(s32); /* extern */ -? func_80080408(s32); /* extern */ +//generated by m2c commit b52d92c2340f6f4ba1aafb464188bb698752fbb0 on Jul-30-2023 ? func_800808CC(s32); /* extern */ -? func_80080B28(s32, s32); /* extern */ ? func_80080FEC(s32); /* extern */ -? func_800810F4(s32); /* extern */ -extern s16 D_80165750; extern ? D_8018C5F0; void func_80081210(void) { @@ -7113,68 +6748,41 @@ void func_80081210(void) { GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80081210.s") #endif -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -extern s32 D_06013670; -extern s32 D_8018C3F0; - void func_8008153C(s32 objectIndex) { + s32 stackPadding[3]; s32 sp70; - f32 var_f6; - f64 temp_f4; - s32 *var_v0; - s32 temp_a0; - s32 temp_v0; s32 var_s1; s32 var_s7; - struct_80165C18_entry *temp_s0; - struct_80165C18_entry *temp_s5; + s32 loopObjectIndex; if (gPlayerCountSelection1 == 1) { sp70 = 8; } else { sp70 = 4; } - var_s7 = 0; - if (sp70 > 0) { - do { - var_v0 = &D_8018C3F0; - var_s1 = 0; -loop_6: - temp_a0 = *var_v0; - temp_s0 = &D_80165C18[temp_a0]; - if (temp_s0->unk_0A6 == 0) { - temp_s5 = &D_80165C18[objectIndex]; - func_800723A4(temp_a0, 0); - temp_s0->unk_060 = &D_06013670; - temp_s0->unk_068 = &D_06013670; - temp_s0->unk_000 = 0.15f; - temp_v0 = random_int(0x000AU); - var_f6 = (f32) temp_v0; - if (temp_v0 < 0) { - var_f6 += 4294967296.0f; - } - temp_s0->unk_03C = (f32) (((f64) var_f6 * 0.1) + 4.8); - temp_f4 = ((f64) (f32) random_int(5U) * 0.01) + 0.8; - temp_s0->unk_0B2[1] = (0x10000 / sp70) * var_s1; - temp_s0->unk_034 = (f32) temp_f4; - temp_s0->unk_010[0] = temp_s5->unk_010[0]; - temp_s0->unk_010[1] = (f32) ((f64) temp_s5->unk_010[1] - 13.0); - temp_s0->unk_010[2] = temp_s5->unk_010[2]; - } else { - var_s1 += 1; - var_v0 += 4; - if (var_s1 != 0x80) { - goto loop_6; - } - } - var_s7 += 1; - } while (var_s7 != sp70); + + for (var_s7 = 0; var_s7 < sp70; var_s7++) { + for (var_s1 = 0; var_s1 < D_8018C3F0_SIZE; var_s1++) { + loopObjectIndex = D_8018C3F0[var_s1]; + + if (D_80165C18[loopObjectIndex].unk_0A6 != 0) continue; + + func_800723A4(loopObjectIndex, 0); + D_80165C18[loopObjectIndex].activeTLUT = D_06013670; + D_80165C18[loopObjectIndex].tlutList = D_06013670; + D_80165C18[loopObjectIndex].sizeScaling = 0.15f; + D_80165C18[loopObjectIndex].unk_038[1] = random_int(0x000AU); + D_80165C18[loopObjectIndex].unk_038[1] = (D_80165C18[loopObjectIndex].unk_038[1] * 0.1) + 4.8; + D_80165C18[loopObjectIndex].unk_034 = random_int(5U); + D_80165C18[loopObjectIndex].unk_034 = (D_80165C18[loopObjectIndex].unk_034 * 0.01) + 0.8; + D_80165C18[loopObjectIndex].unk_0B2[1] = (0x10000 / sp70) * var_s1; + D_80165C18[loopObjectIndex].unk_010[0] = D_80165C18[objectIndex].unk_010[0]; + D_80165C18[loopObjectIndex].unk_010[1] = D_80165C18[objectIndex].unk_010[1] - 13.0; + D_80165C18[loopObjectIndex].unk_010[2] = D_80165C18[objectIndex].unk_010[2]; + break; + } } } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8008153C.s") -#endif void func_80081790(s32 objectIndex) { switch (D_80165C18[objectIndex].unk_0A6) { @@ -7193,30 +6801,18 @@ void func_80081790(s32 objectIndex) { } } -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -extern s32 d_course_moo_moo_farm_mole_frames; - void func_80081848(s32 objectIndex) { - struct_80165C18_entry *sp2C; - struct_80165C18_entry *temp_v0; - func_80073444(objectIndex, d_course_moo_moo_farm_mole_tlut, d_course_moo_moo_farm_mole_frames, 0x20U, (u16) 0x00000040); - temp_v0 = &D_80165C18[objectIndex]; - temp_v0->unk_0D2 = 0; - sp2C = temp_v0; - temp_v0->unk_000 = 0.15f; + D_80165C18[objectIndex].sizeScaling = 0.15f; + D_80165C18[objectIndex].unk_0D2 = 0; func_8008B80C(objectIndex, 0.0f, 0.0f, 0.0f); func_8008B888(objectIndex, 0U, 0U, 0U); func_8008B8BC(objectIndex, 0U, 0U, 0x8000U); - temp_v0->unkC8 = 6; - temp_v0->unk_03C = 4.0f; + D_80165C18[objectIndex].unk_0C8 = 6; + D_80165C18[objectIndex].unk_038[1] = 4.0f; func_800721C0(objectIndex, 0x04000000); func_80072488(objectIndex); } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80081848.s") -#endif void func_80081924(s32 objectIndex) { switch (D_80165C18[objectIndex].unk_0AE) { @@ -7244,7 +6840,7 @@ void func_80081924(s32 objectIndex) { D_80165C18[objectIndex].unk_038[1] -= 0.184; func_8008751C(objectIndex); func_80087710(objectIndex); - if (D_80165C18[objectIndex].unk_004[1] <= -10.0) { + if (D_80165C18[objectIndex].pos[1] <= -10.0) { func_80086F60(objectIndex); } break; @@ -7280,12 +6876,10 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80081A88.s") #endif #ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -void func_8008153C(s32); /* extern */ -void func_80081848(s32, s32); /* extern */ -extern s8 D_8018D198; -extern s8 D_8018D1A8; -extern s8 D_8018D1B8; +//generated by m2c commit b52d92c2340f6f4ba1aafb464188bb698752fbb0 on Jul-25-2023 +extern ? D_8018D198; +extern ? D_8018D1A8; +extern ? D_8018D1B8; void func_80081AFC(s32 objectIndex, s32 arg1) { ? *sp2C; @@ -7297,7 +6891,7 @@ void func_80081AFC(s32 objectIndex, s32 arg1) { temp_v1 = temp_s0->unk_0A6; switch (temp_v1) { /* irregular */ case 0x1: - func_80081848(objectIndex, arg1); + func_80081848(objectIndex); break; case 0x2: temp_v0 = temp_s0->unk_04C; @@ -7314,7 +6908,7 @@ void func_80081AFC(s32 objectIndex, s32 arg1) { func_80086EAC(objectIndex, 2, 4); func_8008153C(objectIndex); func_80072488(objectIndex); - func_800C98B8(temp_s0->unk_004, &temp_s0->unk_038, 0x19018007U); + func_800C98B8(temp_s0->pos, temp_s0->unk_038, 0x19018007U); } break; case 0x4: @@ -7355,69 +6949,51 @@ void func_80081AFC(s32 objectIndex, s32 arg1) { GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80081AFC.s") #endif -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -void func_80072180(); /* extern */ -s32 func_80088DA4(s32, Player *); /* extern */ -extern s32 D_8018D158; - void func_80081D34(s32 objectIndex) { - Camera *var_s4; Player *var_s1; + Camera *var_s4; s32 var_s2; s32 var_s5; struct_80165C18_entry *temp_s0; - struct_80165C18_entry *temp_s0_2; - u16 temp_v0; var_s5 = 0; var_s1 = gPlayerOne; var_s4 = camera1; - var_s2 = 0; - if (D_8018D158 > 0) { - do { - if ((func_8007223C(objectIndex, 0x00000200) != 0) && !(var_s1->unk_0BC & 0x80000000) && (func_80088DA4(objectIndex, var_s1) != 0)) { - temp_v0 = var_s1->unk_000; - if ((temp_v0 & 0x8000) && !(temp_v0 & 0x100)) { - var_s5 = 1; - temp_s0 = &D_80165C18[objectIndex]; - if (func_8007223C(objectIndex, 0x04000000) != 0) { - func_80072180(); - } - if (var_s1->unk_0BC & 0x200) { - func_800C9060(var_s2 & 0xFF, 0x1900A046U); - } else { - var_s1->statusEffects |= 2; - } - temp_s0->unk_0BE[1] = (u16) var_s4->rot[1]; - temp_s0->unk_03C = (f32) ((f64) (var_s1->unk_094 / 2.0f) + 3.0); - temp_s0->unk_034 = (f32) ((f64) var_s1->unk_094 + 1.0); - if ((f64) temp_s0->unk_03C >= 5.0) { - temp_s0->unk_03C = 5.0f; - } - if ((f64) temp_s0->unk_034 >= 4.0) { - temp_s0->unk_03C = 4.0f; - } + for (var_s2 = 0; var_s2 < D_8018D158; var_s2++, var_s1++, var_s4++) { + if ((func_8007223C(objectIndex, 0x00000200) != 0) && !(var_s1->unk_0BC & 0x80000000) && (func_80088DA4(objectIndex, var_s1) != 0)) { + if ((var_s1->unk_000 & 0x8000) && !(var_s1->unk_000 & 0x100)) { + var_s5 = 1; + temp_s0 = &D_80165C18[objectIndex]; + if (func_8007223C(objectIndex, 0x04000000) != 0) { + func_80072180(); + } + if (var_s1->unk_0BC & 0x200) { + func_800C9060(var_s2, 0x1900A046U); + } else { + var_s1->statusEffects |= 2; + } + temp_s0->unk_0BE[1] = var_s4->rot[1]; + temp_s0->unk_038[1] = (var_s1->unk_094 / 2) + 3.0; + temp_s0->unk_034 = var_s1->unk_094 + 1.0; + if (temp_s0->unk_038[1] >= 5.0) { + temp_s0->unk_038[1] = 5.0f; + } + if (temp_s0->unk_034 >= 4.0) { + temp_s0->unk_038[1] = 4.0f; } } - var_s2 += 1; - var_s1 += 0xDD8; - var_s4 += 0xB8; - } while (var_s2 < D_8018D158); + } } if (var_s5 != 0) { - temp_s0_2 = &D_80165C18[objectIndex]; + temp_s0 = &D_80165C18[objectIndex]; func_800721E8(objectIndex, 0x00000200); func_80086F60(objectIndex); - func_8008B7D4(objectIndex, temp_s0_2->unk_004[0], temp_s0_2->unk_004[1], temp_s0_2->unk_004[2]); + func_8008B7D4(objectIndex, temp_s0->pos[0], temp_s0->pos[1], temp_s0->pos[2]); func_8008B80C(objectIndex, 0.0f, 0.0f, 0.0f); func_80086EAC(objectIndex, 2, 0x000A); func_800726CC(objectIndex, 0x0000000A); } } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80081D34.s") -#endif #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc @@ -7620,7 +7196,7 @@ void func_8008241C(s32 objectIndex, s32 arg1) { temp_s0->unk_070 = (s32) &D_060169B0; temp_s0->unk_074 = (s32) &D_06016B60; temp_s0->unk_0DD = 1; - temp_s0->unk_000 = 0.2f; + temp_s0->sizeScaling = 0.2f; temp_v0 = random_int(0x00C8U); var_f8 = (f64) temp_v0; if (temp_v0 < 0) { @@ -7668,46 +7244,26 @@ void func_80082714(s32 arg0) { GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80082714.s") #endif -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -void func_800873F4(s32); /* extern */ -void func_8008B78C(s32); /* extern */ - void func_8008275C(s32 objectIndex) { - f32 *sp30; - f32 *sp2C; - f32 *temp_a0; - f32 *temp_a1; - struct_80165C18_entry *temp_s0; - u8 temp_v0; - - temp_s0 = &D_80165C18[objectIndex]; - temp_v0 = (u8) temp_s0->unk_0DD; - switch (temp_v0) { /* irregular */ + s32 stackPadding; + switch (D_80165C18[objectIndex].unk_0DD) { /* irregular */ case 1: func_8008B78C(objectIndex); func_8008BF18(objectIndex); break; case 2: func_8008B78C(objectIndex); - temp_a0 = temp_s0->unk_01C; - temp_a1 = temp_s0->unk_004; - sp2C = temp_a1; - sp30 = temp_a0; - func_80040EC4(temp_a0, temp_a1); - func_8000D940(temp_s0->unk_010, (s16 *) &temp_s0->unk_0C6, temp_s0->unk_034, 0.0f, 0); - temp_s0->unk_028[0] = (f32) (2.0 * (f64) temp_s0->unk_028[0]); - temp_s0->unk_028[1] = (f32) ((f64) temp_s0->unk_028[1] * 2.5); - temp_s0->unk_028[2] = (f32) (2.0 * (f64) temp_s0->unk_028[2]); + func_80040EC4(D_80165C18[objectIndex].unk_01C, D_80165C18[objectIndex].pos); + func_8000D940(D_80165C18[objectIndex].unk_010, &D_80165C18[objectIndex].unk_0C6, D_80165C18[objectIndex].unk_034, 0.0f, 0); + D_80165C18[objectIndex].unk_028[0] *= 2.0; + D_80165C18[objectIndex].unk_028[1] *= 2.5; + D_80165C18[objectIndex].unk_028[2] *= 2.0; func_8008BF18(objectIndex); - temp_s0->unk_0BE[1] = func_802B5224(temp_a0, temp_a1); + D_80165C18[objectIndex].unk_0BE[1] = func_802B5224(D_80165C18[objectIndex].unk_01C, D_80165C18[objectIndex].pos); break; } func_800873F4(objectIndex); } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8008275C.s") -#endif #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc @@ -7743,9 +7299,9 @@ void func_80082870(void) { D_80183E40.unk4 = 0.0f; D_80183E40.unk8 = 0.0f; if (gGamestate != 9) { - func_800C98B8(temp_s1->unk_004, &D_80183E40, 0x19017043U); + func_800C98B8(temp_s1->pos, &D_80183E40, 0x19017043U); } else if (gCutsceneShotTimer < 0x97) { - func_800C98B8(D_80165C18[D_80183F2C].unk_004, &D_80183E40, 0x19017043U); + func_800C98B8(D_80165C18[D_80183F2C].pos, &D_80183E40, 0x19017043U); } } } @@ -7772,67 +7328,41 @@ void func_80082870(void) { GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80082870.s") #endif -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -extern s32 d_course_koopa_troopa_beach_crab_tlut; -extern s32 d_course_koopa_troopa_beach_crab_frames; +void init_ktb_crab(s32 objectIndex) { + struct_80165C18_entry *object; -void func_80082A4C(s32 objectIndex) { - struct_80165C18_entry *temp_s1; - - func_80073444(objectIndex, &d_course_koopa_troopa_beach_crab_tlut, &d_course_koopa_troopa_beach_crab_frames, 0x40U, (u16) 0x00000040); - temp_s1 = &D_80165C18[objectIndex]; - temp_s1->unk_0D2 = 0; - temp_s1->unk_000 = 0.15f; + func_80073444(objectIndex, d_course_koopa_troopa_beach_crab_tlut, d_course_koopa_troopa_beach_crab_frames, 0x40U, (u16) 0x00000040); + object = &D_80165C18[objectIndex]; + object->sizeScaling = 0.15f; + object->unk_0D2 = 0; func_80072488(objectIndex); - temp_s1->unkC8 = 1; + object->unk_0C8 = 1; func_800721C0(objectIndex, 0x04000420); func_80086EAC(objectIndex, 0, 1); func_8008B80C(objectIndex, 0.0f, 0.0f, 0.0f); func_8008B8BC(objectIndex, 0U, 0U, 0x8000U); - temp_s1->unk_034 = 1.5f; + object->unk_034 = 1.5f; func_800721C0(objectIndex, 0x00000200); } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80082A4C.s") -#endif -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -void func_80082A4C(s32); /* extern */ - -void func_80082B34(s32 objectIndex, s32 arg1) { - struct_80165C18_entry *sp28; - s16 var_v1; - struct_80165C18_entry *temp_t0; - - temp_t0 = &D_80165C18[objectIndex]; - var_v1 = temp_t0->unk_0A6; - switch (var_v1) { /* irregular */ +void func_80082B34(s32 objectIndex, s32 unused) { + switch (D_80165C18[objectIndex].unk_0A6) { /* irregular */ case 0: break; case 1: - sp28 = temp_t0; - func_80082A4C(objectIndex); -block_8: - var_v1 = temp_t0->unk_0A6; + init_ktb_crab(objectIndex); break; case 2: - sp28 = temp_t0; func_80072E54(objectIndex, 0, 3, 1, 2, -1); - goto block_8; + break; case 3: - sp28 = temp_t0; func_80072E54(objectIndex, 4, 6, 1, 2, -1); - goto block_8; + break; } - if (var_v1 >= 2) { + if (D_80165C18[objectIndex].unk_0A6 >= 2) { func_80073514(objectIndex); } } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80082B34.s") -#endif void func_80082C30(s32 objectIndex) { switch (D_80165C18[objectIndex].unk_0AE) { @@ -7871,52 +7401,30 @@ void func_80082C30(s32 objectIndex) { func_8008BF18(objectIndex); if (func_8007223C(objectIndex, 0x00040000) != 0) { func_80088538(objectIndex); - D_80165C18[objectIndex].unk_004[1] = (f32) (D_80165C18[objectIndex].unk_044 + 2.5); + D_80165C18[objectIndex].pos[1] = (f32) (D_80165C18[objectIndex].unk_044 + 2.5); } } -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -s32 func_80089F24(); // extern -extern ? D_80165CBE; - -void func_80082E18(s32 arg0) { - if (*(&D_80165CBE + (arg0 * 0xE0)) >= 2) { - func_80089F24(); +void func_80082E18(s32 objectIndex) { + if (D_80165C18[objectIndex].unk_0A6 >= 2) { + func_80089F24(objectIndex); } } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80082E18.s") -#endif - -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -void func_80082B34(s32, s32); /* extern */ -void func_80082C30(s32); /* extern */ -void func_80082E18(s32); /* extern */ void func_80082E5C(void) { - s32 *var_s2; s32 temp_s0; s32 var_s1; - var_s2 = D_80183EA0; - var_s1 = 0; - do { - temp_s0 = *var_s2; + for (var_s1 = 0; var_s1 < NUM_CRABS; var_s1++) { + temp_s0 = D_80183EA0[var_s1]; if (D_80165C18[temp_s0].unk_0A6 != 0) { func_80082B34(temp_s0, var_s1); func_8008A6DC(temp_s0, 500.0f); func_80082C30(temp_s0); func_80082E18(temp_s0); } - var_s1 += 1; - var_s2 += 4; - } while (var_s1 != 0xA); + } } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80082E5C.s") -#endif #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc @@ -7940,7 +7448,7 @@ void func_80082F1C(s32 objectIndex, s32 arg1) { temp_v0 = &D_80165C18[objectIndex]; temp_v0->unk_070 = (s32) &D_06014798; temp_v0->unk_074 = (s32) &D_06014794; - temp_v0->unk_000 = 0.027f; + temp_v0->sizeScaling = 0.027f; func_80072488(objectIndex); temp_v0_2 = &D_800E5DF4[arg1]; sp24 = temp_v0_2; @@ -7998,33 +7506,24 @@ void func_80083080(void) { GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80083080.s") #endif -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -extern s32 gTLUTHedgehog; -extern s32 gTextureHedgehog; -extern Vtx D_0D0060B0; - void func_8008311C(s32 objectIndex, s32 arg1) { struct_80165C18_entry *temp_s0; - func_80073444(objectIndex, &gTLUTHedgehog, &gTextureHedgehog, 0x40U, (u16) 0x00000040); + func_80073444(objectIndex, gTLUTHedgehog, gTextureHedgehog, 0x40U, (u16) 0x00000040); temp_s0 = &D_80165C18[objectIndex]; - temp_s0->unk_060 = &gTLUTHedgehog; - temp_s0->unk_064 = &gTextureHedgehog; - temp_s0->unk_074 = (s32) &D_0D0060B0; + temp_s0->activeTLUT = gTLUTHedgehog; + temp_s0->activeTexture = gTextureHedgehog; + temp_s0->unk_074 = D_0D0060B0; + temp_s0->sizeScaling = 0.2f; temp_s0->unk_0D2 = 0; - temp_s0->unk_000 = 0.2f; func_80072488(objectIndex); func_8008B80C(objectIndex, 0.0f, 0.0f, 0.0f); func_8008B8BC(objectIndex, 0U, 0U, 0x8000U); - temp_s0->unk_034 = (f32) (((f64) (arg1 % 6) * 0.1) + 0.5); + temp_s0->unk_034 = ((arg1 % 6) * 0.1) + 0.5; func_80086E70(objectIndex); func_800721C0(objectIndex, 0x04000600); - temp_s0->unkC8 = 2; + temp_s0->unk_0C8 = 2; } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8008311C.s") -#endif void func_80083248(s32 objectIndex) { switch (D_80165C18[objectIndex].unk_0AE) { @@ -8054,116 +7553,68 @@ void func_80083248(s32 objectIndex) { if (func_8007223C(objectIndex, 0x00400000) != 0) { func_8008861C(objectIndex); } - D_80165C18[objectIndex].unk_004[1] = D_80165C18[objectIndex].unk_044 + 6.0; + D_80165C18[objectIndex].pos[1] = D_80165C18[objectIndex].unk_044 + 6.0; } } -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -void func_8008311C(); /* extern */ -extern Vtx D_0D0060B0; -extern Vtx D_0D006130; - -void func_800833D0(s32 objectIndex) { - struct_80165C18_entry *sp20; - s16 temp_v0; - struct_80165C18_entry *var_v1; - - var_v1 = &D_80165C18[objectIndex]; - temp_v0 = var_v1->unk_0A6; - switch (temp_v0) { /* irregular */ +void func_800833D0(s32 objectIndex, s32 arg1) { + switch (D_80165C18[objectIndex].unk_0A6) { /* irregular */ case 0: break; case 1: - sp20 = var_v1; - func_8008311C(); -block_6: - var_v1 = sp20; + func_8008311C(objectIndex, arg1); break; case 2: - sp20 = var_v1; func_80072D3C(objectIndex, 0, 1, 4, -1); - goto block_6; + break; } - if (var_v1->unk_0D2 == 0) { - var_v1->unk_074 = (s32) &D_0D0060B0; - return; - } - var_v1->unk_074 = (s32) &D_0D006130; -} -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_800833D0.s") -#endif - -extern UnkStruct_80165CBE D_80165CBE[]; - -void func_80083474(s32 arg0) { - if (D_80165CBE[arg0].unk[0] >= 2) { - func_80089F24(arg0); + if (D_80165C18[objectIndex].unk_0D2 == 0) { + D_80165C18[objectIndex].unk_074 = D_0D0060B0; + } else { + D_80165C18[objectIndex].unk_074 = D_0D006130; } } -#ifdef MIPS_TO_C -//generated by m2c commit d9d3d6575355663122de59f6b2882d8f174e2355 on Dec-28-2022 -? func_800833D0(s32, s32); /* extern */ -? func_80083474(s32); /* extern */ +void func_80083474(s32 objectIndex) { + if (D_80165C18[objectIndex].unk_0A6 >= 2) { + func_80089F24(objectIndex); + } +} void func_800834B8(void) { - s32 *var_s2; s32 temp_s1; s32 var_s0; - var_s2 = D_80183F28; - var_s0 = 0; - do { - temp_s1 = *var_s2; + for (var_s0 = 0; var_s0 < 0xF; var_s0++) { + temp_s1 = D_80183F28[var_s0]; func_800833D0(temp_s1, var_s0); func_80083248(temp_s1); func_80083474(temp_s1); - var_s0 += 1; - var_s2 += 4; - } while (var_s0 != 0xF); + } func_80072120(D_80183F28, 0x0000000F); } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_800834B8.s") -#endif -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -extern s32 d_course_frappe_snowland_snow_tlut; -extern s32 d_course_frappe_snowland_snow; - -void func_80083538(s32 objectIndex, f32 *arg1, s32 arg2, s32 arg3) { - f32 var_f6; - f64 temp_f16; - s32 temp_v0; +void func_80083538(s32 objectIndex, Vec3f arg1, s32 arg2, s32 arg3) { struct_80165C18_entry *temp_s0; func_800723A4(objectIndex, 0); temp_s0 = &D_80165C18[objectIndex]; - temp_s0->unk_064 = &d_course_frappe_snowland_snow; - temp_s0->unk_06C = (s32) &d_course_frappe_snowland_snow; - temp_s0->unk_060 = &d_course_frappe_snowland_snow_tlut; - temp_s0->unk_068 = &d_course_frappe_snowland_snow_tlut; - temp_v0 = random_int(0x0064U); - var_f6 = (f32) temp_v0; - if (temp_v0 < 0) { - var_f6 += 4294967296.0f; - } - temp_s0->unk_000 = (f32) (((f64) var_f6 * 0.001) + 0.05); - temp_s0->unk_03C = (f32) (((f64) (f32) random_int(0x0014U) * 0.5) + 2.6); - temp_f16 = (f64) (f32) random_int(0x000AU) * 0.1; - temp_s0->unk_0BE[1] = (u16) ((s32) (arg2 << 0x10) / arg3); - temp_s0->unk_034 = (f32) (temp_f16 + 4.5); - temp_s0->unk_010[0] = arg1->unk0; - temp_s0->unk_010[1] = arg1->unk4; - temp_s0->unk_010[2] = arg1->unk8; + temp_s0->activeTexture = d_course_frappe_snowland_snow; + temp_s0->textureList = d_course_frappe_snowland_snow; + temp_s0->activeTLUT = d_course_frappe_snowland_snow_tlut; + temp_s0->tlutList = d_course_frappe_snowland_snow_tlut; + temp_s0->sizeScaling = random_int(0x0064U); + temp_s0->sizeScaling = (temp_s0->sizeScaling * 0.001) + 0.05; + temp_s0->unk_038[1] = random_int(0x0014U); + temp_s0->unk_038[1] = (temp_s0->unk_038[1] * 0.5) + 2.6; + temp_s0->unk_034 = random_int(0x000AU); + temp_s0->unk_034 = (temp_s0->unk_034 *0.1) + 4.5; + temp_s0->unk_0BE[1] = (arg2 << 0x10) / arg3; + temp_s0->unk_010[0] = arg1[0]; + temp_s0->unk_010[1] = arg1[1]; + temp_s0->unk_010[2] = arg1[2]; temp_s0->unk_0A0 = random_int(0x4000U) + 0x1000; } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80083538.s") -#endif #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 @@ -8214,20 +7665,14 @@ void func_8008379C(s32 objectIndex) { D_80165C18[objectIndex].unk_0B2[2] += D_80165C18[objectIndex].unk_0A0; } -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -extern s32 gTLUTSnowman; -extern s32 gTextureSnowmanHead; -extern Vtx D_0D0061B0; - void func_80083868(s32 objectIndex) { struct_80165C18_entry *temp_s0; - func_80073444(objectIndex, &gTLUTSnowman, &gTextureSnowmanHead, 0x40U, (u16) 0x00000040); + func_80073444(objectIndex, gTLUTSnowman, gTextureSnowmanHead, 0x40U, (u16) 0x00000040); temp_s0 = &D_80165C18[objectIndex]; - temp_s0->unk_074 = (s32) &D_0D0061B0; + temp_s0->unk_074 = D_0D0061B0; + temp_s0->sizeScaling = 0.1f; temp_s0->unk_0D2 = 0; - temp_s0->unk_000 = 0.1f; func_80072488(objectIndex); func_8008B80C(objectIndex, 0.0f, 0.0f, 0.0f); temp_s0->unk_0B2[0] = 0; @@ -8238,9 +7683,6 @@ void func_80083868(s32 objectIndex) { temp_s0->unk_034 = 1.5f; func_800721C0(objectIndex, 0x00000200); } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80083868.s") -#endif void func_80083948(s32 objectIndex) { switch (D_80165C18[objectIndex].unk_0AE) { @@ -8274,76 +7716,46 @@ void func_80083948(s32 objectIndex) { D_80165C18[objectIndex].unk_0B2[2] = D_80165C18[objectIndex].unk_0A0 + 0x8000; } -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -void func_80083868(s16); /* extern */ -void func_80083948(s32); /* extern */ - void func_80083A94(s32 objectIndex) { - struct_80165C18_entry *sp18; - s16 var_a1; - struct_80165C18_entry *temp_v1; - - temp_v1 = &D_80165C18[objectIndex]; - var_a1 = temp_v1->unk_0A6; - if ((var_a1 != 0) && (var_a1 == 1)) { - sp18 = temp_v1; - func_80083868(var_a1); - var_a1 = temp_v1->unk_0A6; + switch (D_80165C18[objectIndex].unk_0A6) { + case 0: + break; + case 1: + func_80083868(objectIndex); + break; } - if (var_a1 >= 2) { + if (D_80165C18[objectIndex].unk_0A6 >= 2) { func_80073514(objectIndex); } func_80083948(objectIndex); } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80083A94.s") -#endif - -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -extern s32 gTLUTSnowman; -extern s32 gTextureSnowmanBody; -extern Vtx D_0D0060B0; void func_80083B0C(s32 objectIndex) { - struct_80165C18_entry *sp2C; - struct_80165C18_entry *temp_v0; - - func_80073444(objectIndex, &gTLUTSnowman, &gTextureSnowmanBody, 0x40U, (u16) 0x00000040); - temp_v0 = &D_80165C18[objectIndex]; - temp_v0->unk_074 = (s32) &D_0D0060B0; - temp_v0->unk_0D2 = 0; - sp2C = temp_v0; - temp_v0->unk_000 = 0.1f; + func_80073444(objectIndex, gTLUTSnowman, gTextureSnowmanBody, 0x40U, (u16) 0x00000040); + D_80165C18[objectIndex].unk_074 = D_0D0060B0; + D_80165C18[objectIndex].sizeScaling = 0.1f; + D_80165C18[objectIndex].unk_0D2 = 0; func_80072488(objectIndex); func_8008B80C(objectIndex, 0.0f, 0.0f, 0.0f); - temp_v0->unk_0B2[0] = 0; - temp_v0->unk_0B2[1] = 0; - temp_v0->unk_0B2[2] = 0x8000; - temp_v0->unkC8 = 2; - temp_v0->unk_034 = 1.5f; + D_80165C18[objectIndex].unk_0B2[0] = 0; + D_80165C18[objectIndex].unk_0B2[1] = 0; + D_80165C18[objectIndex].unk_0B2[2] = 0x8000; + D_80165C18[objectIndex].unk_0C8 = 2; + D_80165C18[objectIndex].unk_034 = 1.5f; func_800721C0(objectIndex, 0x04000210); } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80083B0C.s") -#endif void func_80083BE4(s32 arg0) { func_8008BF18(arg0); } -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -void func_80083B0C(s32); /* extern */ - void func_80083C04(s32 objectIndex) { - s16 temp_v1; struct_80165C18_entry *temp_s1; temp_s1 = &D_80165C18[objectIndex]; - temp_v1 = temp_s1->unk_0A6; - switch (temp_v1) { + switch (temp_s1->unk_0A6) { + case 0: + break; case 1: func_80083B0C(objectIndex); break; @@ -8358,11 +7770,11 @@ void func_80083C04(s32 objectIndex) { case 11: if (func_8007278C(objectIndex, 0x0000000A) != 0) { func_800721C0(objectIndex, 0x00000010); - temp_s1->unk_000 = 0.001f; + temp_s1->sizeScaling = 0.001f; } break; case 12: - if (func_80074118(objectIndex, &temp_s1->unk_000, 0.001f, 0.1f, 0.0025f, 0, 0) != 0) { + if (func_80074118(objectIndex, &temp_s1->sizeScaling, 0.001f, 0.1f, 0.0025f, 0, 0) != 0) { func_80072488(objectIndex); } break; @@ -8376,19 +7788,12 @@ void func_80083C04(s32 objectIndex) { } func_80083BE4(objectIndex); } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80083C04.s") -#endif #ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -void func_800836F0(f32 *); /* extern */ -void func_8008379C(s32); /* extern */ -void func_80083A94(s32); /* extern */ -void func_80083C04(s32); /* extern */ +//generated by m2c commit b52d92c2340f6f4ba1aafb464188bb698752fbb0 on Jul-25-2023 +? func_800836F0(f32 *); /* extern */ s32 func_80089B50(s32); /* extern */ extern ? D_80183F74; -extern s32 D_8018C3F0; extern ? D_8018C5F0; void func_80083D60(void) { @@ -8402,7 +7807,7 @@ void func_80083D60(void) { struct_80165C18_entry *temp_s1_2; u8 temp_v0; - var_s0 = &D_8018C3F0; + var_s0 = D_8018C3F0; do { temp_a0 = *var_s0; if (temp_a0 != -1) { @@ -8410,7 +7815,7 @@ void func_80083D60(void) { if (temp_s1->unk_0A6 != 0) { func_8008379C(temp_a0); if (temp_s1->unk_0A6 == 0) { - func_80072100((s32) var_s0); + func_80072100(var_s0); } } } @@ -8425,13 +7830,13 @@ void func_80083D60(void) { func_80083C04(temp_s0); if (func_80072270(temp_s0, 0x00001000) != 0) { temp_s1_2 = &D_80165C18[temp_s0]; - temp_v0 = (u8) temp_s1_2->unk_0D5; + temp_v0 = temp_s1_2->unk_0D5; if ((func_8008A8B0((s16) (temp_v0 - 1), (s16) (temp_v0 + 1)) != 0) && (func_80089B50(temp_s0) != 0)) { func_800721C0(temp_s0, 0x00001000); func_800721E8(temp_s0, 0x00000010); func_800726CC(temp_s0, 0x0000000A); func_8008701C(temp_s2, 0x0000000A); - func_800836F0(temp_s1_2->unk_004); + func_800836F0(temp_s1_2->pos); } } else if (func_80072320(temp_s0, 2) != 0) { func_800722CC(temp_s0, 2); @@ -8481,9 +7886,9 @@ void func_80083FD0(s32 objectIndex, s32 arg1, s16 playerId) { sp20 = &gPlayerOne[playerId]; temp_s0->unk_084[7] = playerId; func_800723A4(objectIndex, 0); - temp_s0->unk_060 = &d_course_sherbet_land_ice; - temp_s0->unk_068 = &d_course_sherbet_land_ice; - temp_s0->unk_000 = (f32) (((f64) (f32) random_int(0x01F4U) * 0.0002) + 0.04); + temp_s0->activeTLUT = &d_course_sherbet_land_ice; + temp_s0->tlutList = &d_course_sherbet_land_ice; + temp_s0->sizeScaling = (f32) (((f64) (f32) random_int(0x01F4U) * 0.0002) + 0.04); temp_v0 = random_int(0x0032U); var_f16 = (f32) temp_v0; if (temp_v0 < 0) { @@ -8616,7 +8021,7 @@ void func_80084430(s32 objectIndex, s32 arg1) { temp_s0->unk_074 = (s32) &D_06009AC8; temp_s0->unkC8 = 0x000C; temp_s0->unk9C = 1; - temp_s0->unk_000 = 0.2f; + temp_s0->sizeScaling = 0.2f; func_8008B7D4(objectIndex, (f32) ((f64) D_8018D01C * -383.0), 2.0f, -690.0f); func_8008B888(objectIndex, 0U, 0U, 0U); temp_s0->unk_0DD = 1; @@ -8707,7 +8112,7 @@ block_14: temp_s0->unkC4 = (s16) (arg1 << 0xF); temp_s0->unk_044 = -0x3D600000; temp_s0->unk_0DD = 2; - temp_s0->unk_000 = 0.08f; + temp_s0->sizeScaling = 0.08f; func_800722A4(objectIndex, 8); } else { switch (arg1) { /* irregular */ @@ -8716,7 +8121,7 @@ block_14: func_8008B7D4(objectIndex, (f32) ((f64) D_8018D01C * 146.0), 0.0f, -380.0f); } else { func_8008B7D4(objectIndex, (f32) ((f64) D_8018D01C * 380.0), 0.0f, -535.0f); - temp_s0->unk_000 = 0.15f; + temp_s0->sizeScaling = 0.15f; } temp_s0->unkC6 = 0x9000U; if (gIsMirrorMode != 0) { @@ -8727,7 +8132,7 @@ block_14: block_37: func_8008B888(objectIndex, 0U, (temp_s0->unkC6 + 0x8000) & 0xFFFF, 0U); temp_s0->unk_044 = 0x40A00000; - temp_s0->unk_000 = 0.04f; + temp_s0->sizeScaling = 0.04f; func_800722A4(objectIndex, 0x00000014); break; case 10: @@ -8834,10 +8239,10 @@ void func_80084B7C(s32 objectIndex) { if (func_80072320(objectIndex, 0x00000080) != 0) { func_800722CC(objectIndex, 0x00000080); if (func_80072320(objectIndex, 0x00000010) != 0) { - func_800C98B8(temp_s0->unk_004, &temp_s0->unk_038, 0x19007049U); + func_800C98B8(temp_s0->pos, &temp_s0->unk_038, 0x19007049U); return; } - func_800C98B8(temp_s0->unk_004, &temp_s0->unk_038, 0x19007017U); + func_800C98B8(temp_s0->pos, &temp_s0->unk_038, 0x19007017U); } } #else @@ -8845,10 +8250,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80084B7C.s") #endif #ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -s16 func_80004EAC(? *, s32); /* extern */ -u16 func_800417B4(u16, u16); /* extern */ -s32 func_80087060(s32, ?); /* extern */ +//generated by m2c commit b52d92c2340f6f4ba1aafb464188bb698752fbb0 on Jul-25-2023 extern ? D_06009AC8; void func_80084D2C(s32 objectIndex, s32 arg1) { @@ -8861,23 +8263,23 @@ void func_80084D2C(s32 objectIndex, s32 arg1) { temp_t8 = (u16) temp_s0->unk_0AE; switch (temp_t8) { case 1: - temp_v0 = func_800417B4(temp_s0->unk_0BE[1], temp_s0->unkC6); + temp_v0 = func_800417B4(temp_s0->unk_0BE[1], temp_s0->unk_0C6); temp_s0->unk_0BE[1] = temp_v0; - if ((temp_v0 & 0xFFFF) == temp_s0->unkC6) { - temp_s0->unk9C = 4; + if ((temp_v0 & 0xFFFF) == temp_s0->unk_0C6) { + temp_s0->unk_09C = 4; temp_s0->unk_034 = 0.4f; func_80086FD4(objectIndex); } break; case 2: f32_step_towards(&temp_s0->unk_034, 0.8f, 0.02f); - if (func_80087060(objectIndex, 0xF) != 0) { + if (func_80087060(objectIndex, 0x0000000F) != 0) { func_800722A4(objectIndex, 1); func_800722A4(objectIndex, 2); - temp_s0->unk9C = 1; + temp_s0->unk_09C = 1; temp_s0->unk_0D8 = 1; temp_s0->unk_0D2 = 0; - temp_s0->unk_0A4 = func_80004EAC(&D_06009AC8, 1 & 0xFF); + temp_s0->unk_0A4 = func_80004EAC(&D_06009AC8, 1U & 0xFF); func_800726CC(objectIndex, 3); func_80086FD4(objectIndex); if (func_80072354(objectIndex, 0x00000020) != 0) { @@ -8906,18 +8308,18 @@ void func_80084D2C(s32 objectIndex, s32 arg1) { } break; case 4: - if (func_80087060(objectIndex, 0x1E) != 0) { + if (func_80087060(objectIndex, 0x0000001E) != 0) { func_800722CC(objectIndex, 1); func_80086FD4(objectIndex); } break; case 5: f32_step_towards(&temp_s0->unk_034, 0.4f, 0.2f); - if (func_80087060(objectIndex, 0xA) != 0) { + if (func_80087060(objectIndex, 0x0000000A) != 0) { func_800722A4(objectIndex, 2); temp_s0->unk_0D8 = 2; temp_s0->unk_0D2 = 0; - temp_s0->unk_0A4 = func_80004EAC(&D_06009AC8, 2 & 0xFF); + temp_s0->unk_0A4 = func_80004EAC(&D_06009AC8, 2U & 0xFF); func_800726CC(objectIndex, 3); func_80086FD4(objectIndex); } @@ -8927,7 +8329,7 @@ void func_80084D2C(s32 objectIndex, s32 arg1) { temp_s0->unk_0D8 = 0; temp_s0->unk_0D2 = 0; temp_s0->unk_0A4 = func_80004EAC(&D_06009AC8, 0 & 0xFF); - temp_s0->unkC6 = (u16) (temp_s0->unkC6 + 0x8000); + temp_s0->unk_0C6 += 0x8000; func_800726CC(objectIndex, 2); func_8008701C(objectIndex, 1); } @@ -9056,38 +8458,23 @@ void func_80085214(void) { GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80085214.s") #endif -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -extern ? D_0600F960; -extern f32 D_8018D01C; -extern s32 gGamestate; - void func_800853DC(s32 objectIndex) { - struct_80165C18_entry *sp2C; - struct_80165C18_entry *temp_v0; - - temp_v0 = &D_80165C18[objectIndex]; - temp_v0->unk_070 = (s32) &D_0600F960; - temp_v0->unk_000 = 1.0f; + D_80165C18[objectIndex].sizeScaling = 1.0f; + D_80165C18[objectIndex].unk_070 = D_0600F960; if (gGamestate != 9) { - sp2C = temp_v0; - func_8008B7D4(objectIndex, (f32) ((f64) D_8018D01C * -176.0), 0.0f, -2323.0f); + func_8008B7D4(objectIndex, D_8018D01C * -176.0, 0.0f, -2323.0f); func_8008B80C(objectIndex, 0.0f, 300.0f, 0.0f); } else { - sp2C = temp_v0; - func_8008B7D4(objectIndex, (f32) ((f64) D_8018D01C * -1250.0), 0.0f, 1110.0f); + func_8008B7D4(objectIndex, D_8018D01C * -1250.0, 0.0f, 1110.0f); func_8008B80C(objectIndex, 0.0f, 300.0f, 0.0f); } func_8008B844(objectIndex); func_800886F4(objectIndex); func_80086EF0(objectIndex); - sp2C->unk_038[1] = -2.0f; + D_80165C18[objectIndex].unk_038[1] = -2.0f; func_802A14BC(0.0f, 0.0f, 0.0f); func_80072488(objectIndex); } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_800853DC.s") -#endif void func_80085534(s32 objectIndex) { switch (D_80165C18[objectIndex].unk_0AE) { @@ -9140,67 +8527,32 @@ void func_80085534(s32 objectIndex) { D_80165C18[objectIndex].unk_0BE[1] += 0x100; } -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -void func_800853DC(); // extern -extern ? D_80165CBE; - -void func_80085768(s32 arg0) { - s16 temp_v0; - - temp_v0 = *(&D_80165CBE + (arg0 * 0xE0)); - if (temp_v0 != 0) { - if (temp_v0 != 1) { - if (temp_v0 != 2) { - return; - } - // Duplicate return node #5. Try simplifying control flow for better match - return; - } - func_800853DC(); - // Duplicate return node #5. Try simplifying control flow for better match +void func_80085768(s32 objectIndex) { + switch (D_80165C18[objectIndex].unk_0A6) { /* irregular */ + case 1: + func_800853DC(objectIndex); + break; + case 0: + case 2: + break; } } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80085768.s") -#endif - -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -void func_80085534(s32); /* extern */ -void func_80085768(s32); /* extern */ -extern void *D_802BA05C; void func_800857C0(void) { - s32 sp1C; - struct_80165C18_entry *sp18; - s32 temp_a0; - struct_80165C18_entry *temp_v0; + s32 objectIndex; - temp_a0 = *D_80183EA0; - temp_v0 = &D_80165C18[temp_a0]; - if (temp_v0->unk_0A6 != 0) { - sp18 = temp_v0; - sp1C = temp_a0; - func_80085768(temp_a0); - func_80085534(temp_a0); - func_8008BF18(temp_a0); - if (temp_v0->unk_0A6 >= 2) { - D_802BA05C->unk18 = (f32) temp_v0->unk_004[0]; - D_802BA05C->unk1C = (f32) ((f64) temp_v0->unk_004[1] - 10.0); - D_802BA05C->unk20 = (f32) temp_v0->unk_004[2]; + objectIndex = D_80183EA0[0]; + if (D_80165C18[objectIndex].unk_0A6 != 0) { + func_80085768(objectIndex); + func_80085534(objectIndex); + func_8008BF18(objectIndex); + if (D_80165C18[objectIndex].unk_0A6 >= 2) { + D_802BA05C->pos[0] = D_80165C18[objectIndex].pos[0]; + D_802BA05C->pos[1] = D_80165C18[objectIndex].pos[1] - 10.0; + D_802BA05C->pos[2] = D_80165C18[objectIndex].pos[2]; } } } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_800857C0.s") -#endif - -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -s16 func_80004EAC(? *, ?); /* extern */ -extern ? D_0601610C; -extern ? D_06016110; void func_80085878(s32 objectIndex, s32 arg1) { struct TrackWayPoint *temp_v0; @@ -9208,23 +8560,20 @@ void func_80085878(s32 objectIndex, s32 arg1) { temp_s0 = &D_80165C18[objectIndex]; temp_s0->unk_0D8 = 1; - temp_s0->unk_070 = (s32) &D_06016110; - temp_s0->unk_074 = (s32) &D_0601610C; - temp_s0->unkC8 = 0x000A; - temp_s0->unk_000 = 0.03f; + temp_s0->unk_070 = D_06016110; + temp_s0->unk_074 = D_0601610C; + temp_s0->sizeScaling = 0.03f; + temp_s0->unk_0C8 = 0x000A; func_800721C0(objectIndex, 0x04000200); temp_s0->unk_084[8] = (arg1 * 0x12C) + 0x1F4; func_8008B7D4(objectIndex, 0.0f, -15.0f, 0.0f); - temp_v0 = &D_80164490[(u16) temp_s0->unk_084[8]]; - func_8008B80C(objectIndex, (f32) temp_v0->wayPointX, (f32) temp_v0->wayPointY, (f32) temp_v0->wayPointZ); + temp_v0 = &D_80164490[(u16)temp_s0->unk_084[8]]; + func_8008B80C(objectIndex, temp_v0->wayPointX, temp_v0->wayPointY, temp_v0->wayPointZ); func_8008B888(objectIndex, 0U, 0U, 0U); temp_s0->unk_034 = 4.0f; - temp_s0->unk_0A4 = func_80004EAC(&D_0601610C, 0); + temp_s0->unk_0A4 = func_80004EAC(D_0601610C, 0); func_80072488(objectIndex); } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80085878.s") -#endif #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc @@ -9248,7 +8597,7 @@ void func_800859C8(s32 objectIndex) { break; } if (D_8018D40C == 0) { - func_800C98B8(temp_s0->unk_004, &temp_s0->unk_038, 0x19018057U); + func_800C98B8(temp_s0->pos, &temp_s0->unk_038, 0x19018057U); } func_80074344(objectIndex, (f32 *) &temp_s0->unk_044, -0.8f, 0.8f, 0.03f, 0, -1); } @@ -9293,266 +8642,176 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80085AA8.s") #endif void func_80085BB4(s32 objectIndex) { - D_80165C18[objectIndex].unk_000 = 8.0f; + D_80165C18[objectIndex].sizeScaling = 8.0f; func_8008B80C(objectIndex, 0.0f, 0.0f, 0.0f); func_8008B8BC(objectIndex, 0U, 0U, 0x8000U); func_80072488(objectIndex); } -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -extern s32 d_course_rainbow_road_neon_mushroom_tlut_list; -extern s32 d_course_rainbow_road_neon_mushroom; -extern f32 D_8018D01C; - void func_80085C20(s32 objectIndex) { - func_8008B7D4(objectIndex, (f32) ((f64) D_8018D01C * -1431.0), 827.0f, -2957.0f); - func_80073444(objectIndex, &d_course_rainbow_road_neon_mushroom_tlut_list, &d_course_rainbow_road_neon_mushroom, 0x40U, (u16) 0x00000040); + func_8008B7D4(objectIndex, D_8018D01C * -1431.0, 827.0f, -2957.0f); + func_80073444(objectIndex, d_course_rainbow_road_neon_mushroom_tlut_list, d_course_rainbow_road_neon_mushroom, 0x40U, (u16) 0x00000040); func_80085BB4(objectIndex); } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80085C20.s") -#endif - -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -void func_80085C20(); /* extern */ -extern ? D_80165CBE; void func_80085CA0(s32 objectIndex) { - u16 temp_t7; - - temp_t7 = *(&D_80165CBE + (objectIndex * 0xE0)); - switch (temp_t7) { + switch (D_80165C18[objectIndex].unk_0A6) { case 1: - func_80085C20(); - return; + func_80085C20(objectIndex); + break; case 2: func_80072E54(objectIndex, 0, 4, 1, 0x0000000C, 5); - return; + break; case 3: func_80072D3C(objectIndex, 3, 4, 4, 0x0000000A); - return; + break; case 4: func_8007278C(objectIndex, 0x00000014); - return; + break; case 5: func_80072E54(objectIndex, 0, 4, 1, 0x0000000C, 5); - return; + break; case 6: func_8007278C(objectIndex, 0x00000014); - return; + break; case 7: func_80072D3C(objectIndex, 3, 4, 0, 0x00000014); - return; + break; case 8: func_800726CC(objectIndex, 2); - /* fallthrough */ + break; + case 0: default: - return; + break; } } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80085CA0.s") -#endif - -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -extern s32 d_course_rainbow_road_neon_mario_tlut_list; -extern s32 d_course_rainbow_road_neon_mario; -extern f32 D_8018D01C; void func_80085DB8(s32 objectIndex) { - func_8008B7D4(objectIndex, (f32) ((f64) D_8018D01C * 799.0), 1193.0f, -5891.0f); - func_80073444(objectIndex, &d_course_rainbow_road_neon_mario_tlut_list, &d_course_rainbow_road_neon_mario, 0x40U, (u16) 0x00000040); + func_8008B7D4(objectIndex, D_8018D01C * 799.0, 1193.0f, -5891.0f); + func_80073444(objectIndex, d_course_rainbow_road_neon_mario_tlut_list, d_course_rainbow_road_neon_mario, 0x40U, (u16) 0x00000040); func_80085BB4(objectIndex); } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80085DB8.s") -#endif - -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -void func_80085DB8(); /* extern */ -extern ? D_80165CBE; void func_80085E38(s32 objectIndex) { - u16 temp_t7; - - temp_t7 = *(&D_80165CBE + (objectIndex * 0xE0)); - switch (temp_t7) { + switch (D_80165C18[objectIndex].unk_0A6) { case 1: - func_80085DB8(); - return; + func_80085DB8(objectIndex); + break; case 2: func_80072E54(objectIndex, 0, 4, 1, 0x0000000C, 1); - return; + break; case 3: func_80072D3C(objectIndex, 3, 4, 0x0000000C, 1); - return; + break; case 4: func_80072B48(objectIndex, 0x0000000C); - return; + break; case 5: func_800726CC(objectIndex, 2); - /* fallthrough */ + break; + case 0: default: - return; + break; } } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80085E38.s") -#endif - -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -extern s32 d_course_rainbow_road_neon_boo_tlut_list; -extern s32 d_course_rainbow_road_neon_boo; -extern f32 D_8018D01C; void func_80085EF8(s32 objectIndex) { - func_8008B7D4(objectIndex, (f32) ((f64) D_8018D01C * -2013.0), 555.0f, 0.0f); - func_80073444(objectIndex, &d_course_rainbow_road_neon_boo_tlut_list, &d_course_rainbow_road_neon_boo, 0x40U, (u16) 0x00000040); + func_8008B7D4(objectIndex, D_8018D01C * -2013.0, 555.0f, 0.0f); + func_80073444(objectIndex, d_course_rainbow_road_neon_boo_tlut_list, d_course_rainbow_road_neon_boo, 0x40U, (u16) 0x00000040); func_80085BB4(objectIndex); } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80085EF8.s") -#endif - -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -void func_80085EF8(); /* extern */ -extern ? D_80165CBE; void func_80085F74(s32 objectIndex) { - u16 temp_t7; - - temp_t7 = *(&D_80165CBE + (objectIndex * 0xE0)); - switch (temp_t7) { + switch (D_80165C18[objectIndex].unk_0A6) { case 1: - func_80085EF8(); - return; + func_80085EF8(objectIndex); + break; case 2: func_80072E54(objectIndex, 0, 4, 1, 5, 1); - return; + break; case 3: func_8007278C(objectIndex, 0x0000001E); - return; + break; case 4: func_80072C00(objectIndex, 4, 0, 7); - return; + break; case 5: func_8007278C(objectIndex, 0x0000001E); - return; + break; case 6: func_80072F88(objectIndex, 3, 0, 1, 5, 1); - return; + break; case 7: func_80072B48(objectIndex, 0x0000000F); - return; + break; case 8: func_800726CC(objectIndex, 2); - /* fallthrough */ + break; + case 0: default: - return; + break; } } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80085F74.s") -#endif -#ifdef MIPS_TO_C -//generated by m2c commit 0927f17aac197848d4ebdf0c6bbad74b01f0851c -extern ? d_course_rainbow_road_static_tluts; -extern ? d_course_rainbow_road_static_textures; -extern f32 D_8018D01C; -f32 D_800E6734[0][3]; /* unable to generate initializer */ +#ifdef NON_MATCHING +/** + * arg1 is pushed onto the stack prior to func_8008B7D4, which is correct. + * But then it get popped back into v0 when its supposed to be popped into t0. + * I really, really don't get why that's happening and the permuter hasn't found anything +**/ +extern Vec3f D_800E6734[]; /* unable to generate initializer */ -void func_80086074(s32 arg0, s32 arg1) { - f32 *temp_v0; - - temp_v0 = D_800E6734[arg1]; - func_8008B7D4(arg0, temp_v0->unk0 * D_8018D01C, temp_v0->unk4, temp_v0->unk8); - func_80073444(arg0, (arg1 << 9) + &d_course_rainbow_road_static_tluts, (arg1 << 0xC) + &d_course_rainbow_road_static_textures, 0x40U, (u16) 0x00000040); - func_80085BB4(arg0); +void func_80086074(s32 objectIndex, s32 arg1) { + func_8008B7D4(objectIndex, D_800E6734[arg1][0] * D_8018D01C, D_800E6734[arg1][1], D_800E6734[arg1][2]); + func_80073444(objectIndex, d_course_rainbow_road_static_tluts[arg1], d_course_rainbow_road_static_textures[arg1], 64, 64); + func_80085BB4(objectIndex); } #else GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80086074.s") #endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -void func_80086074(); // extern -extern ? D_80165CBE; - -void func_80086110(s32 arg0) { - s16 temp_v0; - - temp_v0 = *(&D_80165CBE + (arg0 * 0xE0)); - if ((temp_v0 != 0) && (temp_v0 == 1)) { - func_80086074(); +void func_80086110(s32 objectIndex, s32 arg1) { + switch (D_80165C18[objectIndex].unk_0A6) { + case 1: + func_80086074(objectIndex, arg1); + break; + case 0: + break; } } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80086110.s") -#endif -#ifdef MIPS_TO_C -//generated by m2c commit 0927f17aac197848d4ebdf0c6bbad74b01f0851c -? func_80085CA0(s32, s32); /* extern */ -? func_80085E38(s32, s32); /* extern */ -? func_80085F74(s32, s32); /* extern */ -? func_80086110(s32, s32, s32); /* extern */ - -void func_80086158(s32 arg0, s32 arg1) { +void func_80086158(s32 objectIndex, s32 arg1) { switch (arg1) { /* irregular */ case 0: - func_80085CA0(arg0, arg1); + func_80085CA0(objectIndex); break; case 1: - func_80085E38(arg0, arg1); + func_80085E38(objectIndex); break; case 2: - func_80085F74(arg0, arg1); + func_80085F74(objectIndex); break; } if (arg1 >= 3) { - func_80086110(arg0, arg1 - 3, arg1); + func_80086110(objectIndex, arg1 - 3); } } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80086158.s") -#endif - -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -void func_80086158(s32, s32); /* extern */ void func_800861E0(void) { - s32 *var_s3; s32 temp_s0; s32 var_s2; - struct_80165C18_entry *temp_s1; - var_s3 = D_80183EA0; - var_s2 = 0; - do { - temp_s0 = *var_s3; - temp_s1 = &D_80165C18[temp_s0]; - if (temp_s1->unk_0A6 != 0) { + for (var_s2 = 0; var_s2 < NUM_NEON_SIGNS; var_s2++) { + temp_s0 = D_80183EA0[var_s2]; + if (D_80165C18[temp_s0].unk_0A6 != 0) { func_80086158(temp_s0, var_s2); - if (temp_s1->unk_0A6 >= 2) { + if (D_80165C18[temp_s0].unk_0A6 >= 2) { func_800734DC(temp_s0); func_8008BF18(temp_s0); } } - var_s2 += 1; - var_s3 += 4; - } while (var_s2 != 0xA); + } } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_800861E0.s") -#endif #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc @@ -9585,7 +8844,7 @@ void func_8008629C(s32 objectIndex, s32 arg1) { var_v0->unk_04C = 0x0000001E; break; } - var_v0->unk_000 = 1.0f; + var_v0->sizeScaling = 1.0f; sp20 = var_v0; func_8008B7D4(objectIndex, (f32) ((f64) D_800E634C.unk0 - 1.5), (f32) D_800E634C.unk2, (f32) D_800E634C.unk4); func_8008B80C(objectIndex, 0.0f, -10.0f, 0.0f); @@ -9750,10 +9009,10 @@ void func_80086700(s32 objectIndex) { break; } } - var_v0->unk_000 = 0.005f; + var_v0->sizeScaling = 0.005f; temp_v1 = &D_80165C18[*D_80183F28]; sp20 = var_v0; - func_8008B7D4(objectIndex, temp_v1->unk_004[0], (f32) ((f64) temp_v1->unk_004[1] + 16.0), temp_v1->unk_004[2]); + func_8008B7D4(objectIndex, temp_v1->pos[0], (f32) ((f64) temp_v1->pos[1] + 16.0), temp_v1->pos[2]); func_8008B80C(objectIndex, 0.0f, 0.0f, 0.0f); func_8008B888(objectIndex, 0U, 0U, 0U); var_v0->unk_084[1] = 0x0200; @@ -9781,7 +9040,7 @@ void func_80086940(s32 objectIndex) { func_80086FD4(objectIndex); break; case 2: - f32_step_towards(&temp_s0->unk_000, 0.025f, 0.001f); + f32_step_towards(&temp_s0->sizeScaling, 0.025f, 0.001f); func_80087C48(objectIndex, 6.0f, 0.1f, 0x000000C8); if ((f64) temp_s0->unk_038[1] <= 0.0) { func_8008701C(objectIndex, 3); @@ -9868,40 +9127,18 @@ void func_80086C14(s32 arg0) { GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80086C14.s") #endif -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -extern s8 D_801658F4; - void func_80086C6C(s32 objectIndex) { - f32 sp2C; - f32 sp28; - f32 sp24; - struct_80165C18_entry *sp20; - f32 var_f16; - s32 temp_v0; - s8 temp_a1; - struct_80165C18_entry *temp_v1; + Vec3f sp24; - temp_v0 = random_int(0x000AU); - temp_v1 = &D_80165C18[objectIndex]; - var_f16 = (f32) temp_v0; - if (temp_v0 < 0) { - var_f16 += 4294967296.0f; - } - sp20 = temp_v1; - sp24 = var_f16 + (temp_v1->unk_004[0] - 5.0f); - temp_a1 = D_801658F4; - sp2C = (f32) random_int(0x000AU) + (temp_v1->unk_004[2] - 5.0f); - if (temp_a1 != 0) { - sp28 = (f32) ((f64) temp_v1->unk_004[1] + 14.0); + sp24[0] = (D_80165C18[objectIndex].pos[0] - 5.0f) + random_int(0x000AU); + sp24[2] = (D_80165C18[objectIndex].pos[2] - 5.0f) + random_int(0x000AU); + if (D_801658F4 != 0) { + sp24[1] = D_80165C18[objectIndex].pos[1] + 14.0; } else { - sp28 = (f32) ((f64) temp_v1->unk_004[1] - 2.0); + sp24[1] = D_80165C18[objectIndex].pos[1] - 2.0; } - func_800773D8((s32) &sp24, (s32) temp_a1); + func_800773D8(sp24, (s32) D_801658F4); } -#else -GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80086C6C.s") -#endif #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 diff --git a/src/code_80071F00.h b/src/code_80071F00.h index 86a3d1f3b..2a7970c7f 100644 --- a/src/code_80071F00.h +++ b/src/code_80071F00.h @@ -1,12 +1,17 @@ #ifndef CODE_80071F00_H #define CODE_80071F00_H +#include "code_80004740.h" #include "common_structs.h" #include "camera.h" -void func_8007BBBC(s32); -void func_8007B34C(s32); -void func_800789AC(s32, Camera*, u16*); +// This struct is used by a lot of different objects +// Stars, clouds, exahust smoke (I think?) +typedef struct { + Vec3su pos; + u16 id; +} StarSpawn; + void func_80077D5C(s32); s32 find_unused_obj_index(s32*); void func_80071F6C(s32*); @@ -27,10 +32,6 @@ s32 func_80072320(s32, s32); s32 func_80072354(s32, s32); void func_80072388(s32, s32); void func_800723A4(s32, s32); -void func_8007CC00(void); -void func_8007FB48(s32); -void func_8007FA08(s32); -void func_8007E63C(s32); void func_80072408(s32); void func_80072428(s32); void func_80072488(s32); @@ -53,6 +54,7 @@ void func_80072998(s32); void func_800729B4(s32, s32); void func_800729D0(s32, s32); void func_80072A78(s32, s32); +s32 func_80072AAC(s32, s32, s32); s32 func_80072B48(s32, s32); void func_80072C00(s32, s32, s32, s32); void func_80072D3C(s32, s32, s32, s32, s32); @@ -62,7 +64,7 @@ s32 func_800730BC(s32, s32, s32, s32, s32, s32); s32 func_8007326C(s32, s32, s32, s32, s32, s32); void func_80073404(s32, u8, u8, Vtx*); void func_80073444(s32, u8*, u8*, u8, u16); -void func_8007348C(s32, u32*, u8, u8, Vtx *); +void func_8007348C(s32, u8*, u8, u8, Vtx *); void func_800734D4(); void func_800734DC(s32); void func_80073514(s32); @@ -175,6 +177,8 @@ void func_80078288(s32); void func_800786EC(s32); void func_80078790(); void func_80078838(); +void func_800788F8(s32, u16, Camera*); +void func_800789AC(s32, Camera*, Vec4s*); void func_80078C68(); void func_80078C70(s32); void func_80078F64(); @@ -182,6 +186,8 @@ void func_80079054(s32); void func_80079084(s32); void func_800790B4(s32); void func_800790E4(s32); +void func_80079114(s32, s32, s32); +void func_800791F0(s32, s32); void func_800797AC(s32); void func_80079860(s32); void func_8007993C(s32, Player*); @@ -198,19 +204,30 @@ void func_8007AC9C(s32); u8 gen_random_item(s16, s16); u8 func_8007AF40(s16, s16); u8 func_8007AF78(s32, s16); +void func_8007B34C(s32); void func_8007BB9C(); +void func_8007BBBC(s32); void func_8007BD04(s32); void func_8007BDA8(); +void func_8007BDE0(s32); +void func_8007BEC8(s32); +void func_8007BFB0(s32); +void func_8007CC00(); +void func_8007C280(); void func_8007C2F8(s32); void func_8007C340(); void func_8007C360(s32, Camera*); void func_8007C420(s32, Player*, Camera*); void func_8007C4A4(s32); void func_8007C550(s32); +void func_8007C5B4(s32); +void func_8007C684(s32); void func_8007C49C(); +s32 func_8007C9F8(); void func_8007D360(s32, s32); void func_8007D6A8(s32, s32); void func_8007D714(s32); +void func_8007D794(s32); s32 func_8007D804(s32); void func_8007D8AC(s32); void func_8007D8D4(s32, s32); @@ -218,43 +235,94 @@ void func_8007DA4C(s32); void func_8007DA74(s32); void func_8007DAF8(s32, s32); void func_8007DDC0(s32); +void init_bb_trash_bin(s32); void func_8007E1F4(s32); void func_8007E358(s32); void func_8007E3EC(s32); void func_8007E4C4(); s32 func_8007E50C(s32, Player*, Camera*); s32 func_8007E59C(s32); +void func_8007E63C(s32); +void func_8007EC30(s32); +void func_8007ED6C(s32); +void func_8007EE5C(s32); void func_8007EFBC(s32); void func_8007F280(s32); void func_8007F544(s32); +void func_8007F5A8(s32); void func_8007F660(s32, s32, s32); void func_8007F6C4(s32, s32); s32 func_8007F75C(s32); void func_8007F8D8(); +void func_8007FA08(s32); +void func_8007FB48(s32); void func_8007FEA4(s32); +void func_8007FF5C(s32); +void func_8007FFC0(s32); +void func_80080078(s32); +void func_800801FC(s32); +void func_800802C0(s32); +void func_80080408(s32); +void func_80080524(s32); void func_800806BC(s32); void func_8008078C(s32); void func_8008085C(s32); void func_80080A14(s32, Player*); void func_80080A4C(s32, s32); +void func_80080B28(s32, s32); +void func_80080DE4(s32); +void func_80081080(s32); +void func_800810F4(s32); void func_80081208(); void func_80081210(); +void func_8008153C(s32); void func_80081790(s32); +void func_80081848(s32); void func_80081924(s32); +void func_80081D34(s32); +void func_8008275C(s32); +void init_ktb_crab(s32); +void func_80082B34(s32, s32); void func_80082C30(s32); +void func_80082E18(s32); +void func_80082E5C(); void func_80083060(s32); +void func_8008311C(s32, s32); void func_80083248(s32); +void func_800833D0(s32, s32); +void func_80083474(s32); +void func_800834B8(); +void func_80083538(s32, Vec3f, s32, s32); void func_8008379C(s32); +void func_80083868(s32); void func_80083948(s32); +void func_80083A94(s32); +void func_80083B0C(s32); void func_80083BE4(s32); +void func_80083C04(s32); void func_80083F18(s32); void func_80085024(); void func_8008502C(s32, s32); void func_80085080(s32); +void func_800853DC(s32); void func_80085534(s32); +void func_80085768(s32); +void func_800857C0(); +void func_80085878(s32, s32); void func_80085BB4(s32); +void func_80085C20(s32); +void func_80085CA0(s32); +void func_80085DB8(s32); +void func_80085E38(s32); +void func_80085EF8(s32); +void func_80085F74(s32); +void func_80086074(s32, s32); +void func_80086110(s32, s32); +void func_80086158(s32, s32); +void func_800861E0(); void func_80086424(s32); void func_80086604(); +void func_80086C6C(s32); void func_80086D80(); s32 osPiStartDma(OSIoMesg *mb, s32 priority, s32 direction, uintptr_t devAddr, void *vAddr, size_t nbytes, OSMesgQueue *mq); @@ -266,16 +334,63 @@ extern OSMesgQueue gDmaMesgQueue; extern OSMesg gMainReceivedMesg; extern OSIoMesg gDmaIoMesg; +// From Luigi Raceway course data, haven't created a .h file for it yet +extern Gfx D_0600F960[]; // d_course_luigi_raceway_dl_F960 + +// From Bowser's Castle course data, haven't created a .h file for it yet +extern Gfx d_course_bowsers_castle_dl_thwomp[]; +extern u8 d_course_bowsers_castle_thwomp_faces[]; +extern u8 gTLUTWhomp[]; + +// From Koopa Troopa Beach course data, haven't created a .h file for it yet +extern u8 d_course_koopa_troopa_beach_crab_frames[]; +extern u8 d_course_koopa_troopa_beach_crab_tlut[]; + +// From Banshee Boardwalk course data, haven't created a .h file for it yet +extern Gfx d_course_banshee_boardwalk_dl_cheep_cheep[]; +extern Gfx d_course_banshee_boardwalk_dl_trash_bin[]; + +// From Moo Moo Farm course data, haven't created a .h file for it yet +extern u8 D_06013670[]; // d_course_moo_moo_farm_mole_dirt +extern u8 d_course_moo_moo_farm_mole_frames[][2048]; + +// From Yoshi Valley course data, haven't created a .h file for it yet +extern u8 gTLUTHedgehog[]; +extern u8 gTextureHedgehog[]; + +// From Frappe Snowland course data, haven't created a .h file for it yet +extern u8 d_course_frappe_snowland_snow_tlut[]; +extern u8 d_course_frappe_snowland_snow[]; +extern u8 gTLUTSnowman[]; +extern u8 gTextureSnowmanHead[]; +extern u8 gTextureSnowmanBody[]; + +// From Rainbow Road course data, haven't created a .h file for it yet +extern u8 d_course_rainbow_road_neon_mushroom_tlut_list[]; +extern u8 d_course_rainbow_road_neon_mushroom[]; +extern u8 d_course_rainbow_road_neon_mario_tlut_list[]; +extern u8 d_course_rainbow_road_neon_mario[]; +extern u8 d_course_rainbow_road_neon_boo_tlut_list[]; +extern u8 d_course_rainbow_road_neon_boo[]; +extern u8 d_course_rainbow_road_static_tluts[][512]; +extern u8 d_course_rainbow_road_static_textures[][4096]; +extern u8 d_course_rainbow_road_sphere[]; +extern animation_type_2 *D_0601610C[]; // d_rainbow_road_unk3 +extern u32 D_06016110[]; // d_rainbow_road_unk4 + +extern s8 D_801658CE; extern s32 D_80162DF8; extern s32 D_80165598; extern s16 D_80165740; extern s8 D_801657B4; extern Vec3su D_8016582C; +extern s8 D_801658F4; extern s32 D_80183D5C; -extern s32 D_80183EA8; extern s16 D_8018CFE8; extern f32 D_8018D01C; extern s32 D_8018D140; +extern s32 D_8018D158; +extern s32 D_8018D1EC; extern s32 D_8018D224; extern u8* D_8018D490; diff --git a/src/code_80086E70.c b/src/code_80086E70.c index 95fbd077f..b6cd7d9f9 100644 --- a/src/code_80086E70.c +++ b/src/code_80086E70.c @@ -10,6 +10,8 @@ #include "code_80071F00.h" #include "code_80086E70.h" #include "code_802AAA70.h" +#include "audio/external.h" +#include "variables.h" void func_80086E70(s32 arg0) { D_80165C18[arg0].unk_0AE = 1;// * 0xE0)) = 1; @@ -112,11 +114,11 @@ UNUSED void func_80087258(s32 objectIndex, UNUSED s32 arg1, f32 arg2) { } UNUSED s32 func_80087294(s32 objectIndex, Player *player) { - return func_80041770(player->pos[0], D_80165C18[objectIndex].unk_004[0], player->pos[2], D_80165C18[objectIndex].unk_004[2]); + return func_80041770(player->pos[0], D_80165C18[objectIndex].pos[0], player->pos[2], D_80165C18[objectIndex].pos[2]); } s32 func_800872D8(s32 objectIndex, Camera *camera) { - return atan2s(D_80165C18[objectIndex].unk_004[0] - camera->pos[0], D_80165C18[objectIndex].unk_004[2] - camera->pos[2]); + return atan2s(D_80165C18[objectIndex].pos[0] - camera->pos[0], D_80165C18[objectIndex].pos[2] - camera->pos[2]); } u16 func_80087324(s32 objectIndex) { @@ -283,7 +285,7 @@ s32 func_80087B84(s32 objectIndex, f32 arg1, f32 arg2) { D_80165C18[objectIndex].unk_038[1] = -arg1; } func_800877C4(objectIndex); - if (D_80165C18[objectIndex].unk_004[1] <= arg2) { + if (D_80165C18[objectIndex].pos[1] <= arg2) { func_800721E8(objectIndex, 8); func_80086FD4(objectIndex); sp24 = 1; @@ -548,18 +550,34 @@ void func_80088364(s32 objectIndex) { GLOBAL_ASM("asm/non_matchings/code_80086E70/func_80088364.s") #endif +s32 func_8008847C(s32 objectIndex) { + s32 sp2C; + + sp2C = 0; + func_800721E8(objectIndex, 0x00800000); + if (func_8007223C(objectIndex, 0x00000400) != 0) { + func_802ADDC8(&D_8018C3B0, 10.0f, D_80165C18[objectIndex].pos[0], 20.0f, D_80165C18[objectIndex].pos[2]); + if (D_8018C3B0.unk34 == 1) { + sp2C = 1; + func_800721C0(objectIndex, 0x00800000); + } + D_80165C18[objectIndex].unk_044 = func_802ABE30(D_80165C18[objectIndex].pos[0], 0.0f, D_80165C18[objectIndex].pos[2], D_8018C3B0.unk3A); + } + return sp2C; +} + s32 func_80088538(s32 objectIndex) { s32 sp2C; sp2C = 0; func_800721E8(objectIndex, 0x00800000); if (func_8007223C(objectIndex, 0x00000400) != 0) { - func_802ADDC8(&D_8018C3B0, 10.0f, D_80165C18[objectIndex].unk_004[0], 20.0f, D_80165C18[objectIndex].unk_004[2]); + func_802ADDC8(&D_8018C3B0, 10.0f, D_80165C18[objectIndex].pos[0], 20.0f, D_80165C18[objectIndex].pos[2]); if (D_8018C3B0.unk34 == 1) { sp2C = 1; func_800721C0(objectIndex, 0x00800000); } - D_80165C18[objectIndex].unk_044 = func_802ABE30(D_80165C18[objectIndex].unk_004[0], 0.0f, D_80165C18[objectIndex].unk_004[2], D_8018C3B0.unk3A); + D_80165C18[objectIndex].unk_044 = func_802ABE30(D_80165C18[objectIndex].pos[0], 0.0f, D_80165C18[objectIndex].pos[2], D_8018C3B0.unk3A); D_80165C18[objectIndex].unk_0B8[0] = atan2s(D_8018C3B0.unk60[2], D_8018C3B0.unk60[1]) + 0x4000; D_80165C18[objectIndex].unk_0B8[2] = atan2s(D_8018C3B0.unk60[0], D_8018C3B0.unk60[1]); } @@ -572,12 +590,12 @@ s32 func_8008861C(s32 objectIndex) { sp2C = 0; func_800721E8(objectIndex, 0x00800000); if (func_8007223C(objectIndex, 0x00000400) != 0) { - func_802ADDC8(&D_8018C3B0, 10.0f, D_80165C18[objectIndex].unk_004[0], 20.0f, D_80165C18[objectIndex].unk_004[2]); + func_802ADDC8(&D_8018C3B0, 10.0f, D_80165C18[objectIndex].pos[0], 20.0f, D_80165C18[objectIndex].pos[2]); if (D_8018C3B0.unk34 == 1) { sp2C = 1; func_800721C0(objectIndex, 0x00800000); } - D_80165C18[objectIndex].unk_044 = func_802ABE30(D_80165C18[objectIndex].unk_004[0], 0.0f, D_80165C18[objectIndex].unk_004[2], D_8018C3B0.unk3A); + D_80165C18[objectIndex].unk_044 = func_802ABE30(D_80165C18[objectIndex].pos[0], 0.0f, D_80165C18[objectIndex].pos[2], D_8018C3B0.unk3A); D_80165C18[objectIndex].unk_01C[0] = D_8018C3B0.unk60[0]; D_80165C18[objectIndex].unk_01C[1] = D_8018C3B0.unk60[1]; D_80165C18[objectIndex].unk_01C[2] = D_8018C3B0.unk60[2]; @@ -586,10 +604,10 @@ s32 func_8008861C(s32 objectIndex) { } void func_800886F4(s32 objectIndex) { - func_802ADDC8(&D_8018C3B0, 10.0f, D_80165C18[objectIndex].unk_004[0], 20.0f, D_80165C18[objectIndex].unk_004[2]); + func_802ADDC8(&D_8018C3B0, 10.0f, D_80165C18[objectIndex].pos[0], 20.0f, D_80165C18[objectIndex].pos[2]); if (D_8018C3B0.unk34 == 1) { func_800721C0(objectIndex, 0x00800000); - D_80165C18[objectIndex].unk_044 = func_802ABE30(D_80165C18[objectIndex].unk_004[0], 0.0f, D_80165C18[objectIndex].unk_004[2], D_8018C3B0.unk3A); + D_80165C18[objectIndex].unk_044 = func_802ABE30(D_80165C18[objectIndex].pos[0], 0.0f, D_80165C18[objectIndex].pos[2], D_8018C3B0.unk3A); D_80165C18[objectIndex].unk_0B8[0] = atan2s(D_8018C3B0.unk60[2], D_8018C3B0.unk60[1]) + 0x4000; D_80165C18[objectIndex].unk_0B8[2] = atan2s(D_8018C3B0.unk60[0], D_8018C3B0.unk60[1]); return; @@ -598,10 +616,10 @@ void func_800886F4(s32 objectIndex) { } void func_800887C0(s32 objectIndex) { - func_802ADDC8(&D_8018C3B0, 10.0f, D_80165C18[objectIndex].unk_004[0], 20.0f, D_80165C18[objectIndex].unk_004[2]); + func_802ADDC8(&D_8018C3B0, 10.0f, D_80165C18[objectIndex].pos[0], 20.0f, D_80165C18[objectIndex].pos[2]); if (D_8018C3B0.unk34 == 1) { func_800721C0(objectIndex, 0x00800000); - D_80165C18[objectIndex].unk_044 = func_802ABE30(D_80165C18[objectIndex].unk_004[0], 0.0f, D_80165C18[objectIndex].unk_004[2], D_8018C3B0.unk3A); + D_80165C18[objectIndex].unk_044 = func_802ABE30(D_80165C18[objectIndex].pos[0], 0.0f, D_80165C18[objectIndex].pos[2], D_8018C3B0.unk3A); D_80165C18[objectIndex].unk_038[0] = D_8018C3B0.unk60[0]; D_80165C18[objectIndex].unk_038[1] = D_8018C3B0.unk60[1]; D_80165C18[objectIndex].unk_038[2] = D_8018C3B0.unk60[2]; @@ -614,8 +632,8 @@ UNUSED s32 func_80088880(s32 objectIndex, Player *player) { s32 temp_f10; s32 temp_f6; - temp_f10 = D_80165C18[objectIndex].unk_004[0] - player->pos[0]; - temp_f6 = D_80165C18[objectIndex].unk_004[2] - player->pos[2]; + temp_f10 = D_80165C18[objectIndex].pos[0] - player->pos[0]; + temp_f6 = D_80165C18[objectIndex].pos[2] - player->pos[2]; return (temp_f10 * temp_f10) + (temp_f6 * temp_f6); } @@ -624,9 +642,9 @@ UNUSED s32 func_800888E8(s32 objectIndex, Player *player) { s32 temp_f18; s32 temp_f6; - temp_f10 = D_80165C18[objectIndex].unk_004[0] - player->pos[0]; - temp_f6 = D_80165C18[objectIndex].unk_004[1] - player->pos[1]; - temp_f18 = D_80165C18[objectIndex].unk_004[2] - player->pos[2]; + temp_f10 = D_80165C18[objectIndex].pos[0] - player->pos[0]; + temp_f6 = D_80165C18[objectIndex].pos[1] - player->pos[1]; + temp_f18 = D_80165C18[objectIndex].pos[2] - player->pos[2]; return (temp_f10 * temp_f10) + (temp_f6 * temp_f6) + (temp_f18 * temp_f18); } @@ -634,8 +652,8 @@ u32 func_8008896C(s32 objectIndex, Camera *camera) { s32 temp_f10; s32 temp_f6; - temp_f10 = D_80165C18[objectIndex].unk_004[0] - camera->pos[0]; - temp_f6 = D_80165C18[objectIndex].unk_004[2] - camera->pos[2]; + temp_f10 = D_80165C18[objectIndex].pos[0] - camera->pos[0]; + temp_f6 = D_80165C18[objectIndex].pos[2] - camera->pos[2]; return (temp_f10 * temp_f10) + (temp_f6 * temp_f6); } @@ -644,9 +662,9 @@ UNUSED s32 func_800889D4(s32 objectIndex, Camera *camera) { s32 temp_f18; s32 temp_f6; - temp_f10 = D_80165C18[objectIndex].unk_004[0] - camera->pos[0]; - temp_f6 = D_80165C18[objectIndex].unk_004[1] - camera->pos[1]; - temp_f18 = D_80165C18[objectIndex].unk_004[2] - camera->pos[2]; + temp_f10 = D_80165C18[objectIndex].pos[0] - camera->pos[0]; + temp_f6 = D_80165C18[objectIndex].pos[1] - camera->pos[1]; + temp_f18 = D_80165C18[objectIndex].pos[2] - camera->pos[2]; return (temp_f10 * temp_f10) + (temp_f6 * temp_f6) + (temp_f18 * temp_f18); } @@ -656,8 +674,8 @@ s32 func_80088A58(s32 objectIndex, Player *player, f32 arg2) { s32 var_v1; var_v1 = 0; - temp_f0 = D_80165C18[objectIndex].unk_004[0] - player->pos[0]; - temp_f2 = D_80165C18[objectIndex].unk_004[2] - player->pos[2]; + temp_f0 = D_80165C18[objectIndex].pos[0] - player->pos[0]; + temp_f2 = D_80165C18[objectIndex].pos[2] - player->pos[2]; if (((temp_f0 * temp_f0) + (temp_f2 * temp_f2)) <= (arg2 * arg2)) { var_v1 = 1; } @@ -671,8 +689,8 @@ s32 func_80088AC0(s32 objectIndex, Player *player, f32 arg2, f32 arg3) { s32 var_v1; var_v1 = 0; - temp_f0 = D_80165C18[objectIndex].unk_004[0] - player->pos[0]; - temp_f2 = D_80165C18[objectIndex].unk_004[2] - player->pos[2]; + temp_f0 = D_80165C18[objectIndex].pos[0] - player->pos[0]; + temp_f2 = D_80165C18[objectIndex].pos[2] - player->pos[2]; temp_f12 = (temp_f0 * temp_f0) + (temp_f2 * temp_f2); if (((arg2 * arg2) <= temp_f12) && (temp_f12 <= (arg3 * arg3))) { var_v1 = 1; @@ -687,9 +705,9 @@ s32 func_80088B40(s32 objectIndex, Player *player, f32 arg2) { s32 var_v1; var_v1 = 0; - temp_f0 = D_80165C18[objectIndex].unk_004[0] - player->pos[0]; - temp_f2 = D_80165C18[objectIndex].unk_004[1] - player->pos[1]; - temp_f12 = D_80165C18[objectIndex].unk_004[2] - player->pos[2]; + temp_f0 = D_80165C18[objectIndex].pos[0] - player->pos[0]; + temp_f2 = D_80165C18[objectIndex].pos[1] - player->pos[1]; + temp_f12 = D_80165C18[objectIndex].pos[2] - player->pos[2]; if (((temp_f0 * temp_f0) + (temp_f2 * temp_f2) + (temp_f12 * temp_f12)) <= (arg2 * arg2)) { var_v1 = 1; } @@ -702,8 +720,8 @@ s32 func_80088BB8(s32 objectIndex, Camera *camera, f32 arg2) { s32 var_v1; var_v1 = 0; - temp_f0 = D_80165C18[objectIndex].unk_004[0] - camera->pos[0]; - temp_f2 = D_80165C18[objectIndex].unk_004[2] - camera->pos[2]; + temp_f0 = D_80165C18[objectIndex].pos[0] - camera->pos[0]; + temp_f2 = D_80165C18[objectIndex].pos[2] - camera->pos[2]; if (((temp_f0 * temp_f0) + (temp_f2 * temp_f2)) <= (arg2 * arg2)) { var_v1 = 1; } @@ -717,8 +735,8 @@ UNUSED s32 func_80088C20(s32 objectIndex, Camera *camera, f32 arg2, f32 arg3) { s32 var_v1; var_v1 = 0; - temp_f0 = D_80165C18[objectIndex].unk_004[0] - camera->pos[0]; - temp_f2 = D_80165C18[objectIndex].unk_004[2] - camera->pos[2]; + temp_f0 = D_80165C18[objectIndex].pos[0] - camera->pos[0]; + temp_f2 = D_80165C18[objectIndex].pos[2] - camera->pos[2]; temp_f12 = (temp_f0 * temp_f0) + (temp_f2 * temp_f2); if (((arg2 * arg2) <= temp_f12) && (temp_f12 <= (arg3 * arg3))) { var_v1 = 1; @@ -733,9 +751,9 @@ UNUSED s32 func_80088CA0(s32 objectIndex, Camera *camera, f32 arg2) { s32 var_v1; var_v1 = 0; - temp_f0 = D_80165C18[objectIndex].unk_004[0] - camera->pos[0]; - temp_f2 = D_80165C18[objectIndex].unk_004[1] - camera->pos[1]; - temp_f12 = D_80165C18[objectIndex].unk_004[2] - camera->pos[2]; + temp_f0 = D_80165C18[objectIndex].pos[0] - camera->pos[0]; + temp_f2 = D_80165C18[objectIndex].pos[1] - camera->pos[1]; + temp_f12 = D_80165C18[objectIndex].pos[2] - camera->pos[2]; if (((temp_f0 * temp_f0) + (temp_f2 * temp_f2) + (temp_f12 * temp_f12)) <= (arg2 * arg2)) { var_v1 = 1; } @@ -749,8 +767,8 @@ s32 func_80088D18(s32 objectIndex, Player *player) { s32 var_v1; var_v1 = 0; - temp_f0 = D_80165C18[objectIndex].unk_004[0] - player->pos[0]; - temp_f2 = D_80165C18[objectIndex].unk_004[2] - player->pos[2]; + temp_f0 = D_80165C18[objectIndex].pos[0] - player->pos[0]; + temp_f2 = D_80165C18[objectIndex].pos[2] - player->pos[2]; temp_f12 = D_80165C18[objectIndex].unk_0C8 + player->boundingBoxSize; if (((temp_f0 * temp_f0) + (temp_f2 * temp_f2)) <= (temp_f12 * temp_f12)) { var_v1 = 1; @@ -766,9 +784,9 @@ s32 func_80088DA4(s32 objectIndex, Player *player) { s32 var_v1; var_v1 = 0; - temp_f0 = D_80165C18[objectIndex].unk_004[0] - player->pos[0]; - temp_f2 = D_80165C18[objectIndex].unk_004[1] - player->pos[1]; - temp_f12 = D_80165C18[objectIndex].unk_004[2] - player->pos[2]; + temp_f0 = D_80165C18[objectIndex].pos[0] - player->pos[0]; + temp_f2 = D_80165C18[objectIndex].pos[1] - player->pos[1]; + temp_f12 = D_80165C18[objectIndex].pos[2] - player->pos[2]; temp_f14 = D_80165C18[objectIndex].unk_0C8 + player->boundingBoxSize; if (((temp_f0 * temp_f0) + (temp_f2 * temp_f2) + (temp_f12 * temp_f12)) <= (temp_f14 * temp_f14)) { var_v1 = 1; @@ -781,7 +799,7 @@ UNUSED s32 func_80088E48(s32 objectIndex, Player *player, f32 arg2) { s32 var_v1; var_v1 = 0; - temp_f0 = D_80165C18[objectIndex].unk_004[1] - player->pos[1]; + temp_f0 = D_80165C18[objectIndex].pos[1] - player->pos[1]; if ((temp_f0 * temp_f0) <= (arg2 * arg2)) { var_v1 = 1; } @@ -796,9 +814,9 @@ s32 func_80088E98(s32 objectIndex, Player *player, f32 arg2) { s32 var_v1; var_v1 = 0; - temp_f0 = D_80165C18[objectIndex].unk_004[0] - player->pos[0]; - var_f2 = D_80165C18[objectIndex].unk_004[1] - player->pos[1]; - temp_f12 = D_80165C18[objectIndex].unk_004[2] - player->pos[2]; + temp_f0 = D_80165C18[objectIndex].pos[0] - player->pos[0]; + var_f2 = D_80165C18[objectIndex].pos[1] - player->pos[1]; + temp_f12 = D_80165C18[objectIndex].pos[2] - player->pos[2]; temp_f14 = D_80165C18[objectIndex].unk_0C8 + player->boundingBoxSize; if (var_f2 < 0.0f) { var_f2 = -var_f2; @@ -812,7 +830,7 @@ s32 func_80088E98(s32 objectIndex, Player *player, f32 arg2) { f32 func_80088F54(s32 objectIndex, Player *player) { f32 var_f2; - var_f2 = D_80165C18[objectIndex].unk_004[1] - player->unk_074; + var_f2 = D_80165C18[objectIndex].pos[1] - player->unk_074; if (var_f2 < 0.0f) { var_f2 = -var_f2; } @@ -823,7 +841,7 @@ UNUSED s32 func_80088F94(s32 objectIndex, Player *player, f32 arg2) { f32 var_f0; s32 var_v1; - var_f0 = D_80165C18[objectIndex].unk_004[1] - player->unk_074; + var_f0 = D_80165C18[objectIndex].pos[1] - player->unk_074; var_v1 = 0; if (var_f0 < 0.0f) { var_f0 = -var_f0; @@ -902,291 +920,244 @@ void func_80089020(s32 playerId, f32 *arg1) { f32_step_towards(arg1, 0.0f, var_f0); } -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -typedef struct { - /* 0x00 */ char pad0[4]; - /* 0x04 */ f32 unk_04; - /* 0x08 */ char pad8[4]; - /* 0x0C */ f32 unk_0C; - /* 0x10 */ char pad10[0xE]; /* maybe part of unk_0C[4]? */ - /* 0x1E */ s8 unk1E; /* inferred */ - /* 0x1F */ char pad1F[1]; -} struct_D_8018CE10; /* size = 0x20 */ - -void func_800892E0(s32 objectIndex) { - struct_D_8018CE10 *sp1C; - s8 temp_v1; - struct_D_8018CE10 *temp_v0; - - temp_v0 = &D_8018CE10[objectIndex]; - sp1C = temp_v0; - func_80089020(objectIndex, &temp_v0->unk_04); - func_80089020(objectIndex, &temp_v0->unk_0C); - temp_v1 = temp_v0->unk1E; - if (temp_v1 > 0) { - temp_v0->unk1E = temp_v1 - 1; +void func_800892E0(s32 playerId) { + func_80089020(playerId, &D_8018CE10[playerId].unk_04[0]); + func_80089020(playerId, &D_8018CE10[playerId].unk_04[2]); + if (D_8018CE10[playerId].unk_18[6] > 0) { + D_8018CE10[playerId].unk_18[6]--; } } -#else -GLOBAL_ASM("asm/non_matchings/code_80086E70/func_800892E0.s") -#endif - -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc f32 func_8008933C(Player *player, s32 objectIndex, f32 arg2, f32 arg3) { - f32 temp_f0; - f32 temp_f12; - f32 temp_f2; - f32 temp_f2_2; f32 var_f2; + f32 something; + s32 playerId; struct_80165C18_entry *temp_v0; struct_D_8018CE10 *temp_v1; - temp_v1 = &D_8018CE10[(s32) (player - gPlayerOne) / 3544]; + playerId = player - gPlayerOne; + temp_v1 = &D_8018CE10[playerId]; var_f2 = 0.0f; - if (temp_v1->unk1E == 0) { + if (temp_v1->unk_18[6] == 0) { + temp_v0 = &D_80165C18[objectIndex]; player->unk_046 |= 2; player->unk_0BC |= 0x8000; - temp_v1->unk1E = 4; - temp_v0 = &D_80165C18[objectIndex]; - temp_f2 = temp_v0->unk_038[0]; - if ((temp_f2 * (player->pos[0] - temp_v0->unk_004[0])) >= 0.0f) { - temp_v1->unk_04 = (temp_f2 * arg3) + (-player->unk_034[0] * arg2); + temp_v1->unk_18[6] = 4; + something = (player->pos[0] - temp_v0->pos[0]) * temp_v0->unk_038[0]; + if (something >= 0.0f) { + temp_v1->unk_04[0] = (-player->unk_034[0] * arg2) + (temp_v0->unk_038[0] * arg3); } else { - temp_v1->unk_04 = -player->unk_034[0] * arg2; + temp_v1->unk_04[0] = -player->unk_034[0] * arg2; } - temp_f2_2 = temp_v0->unk_038[2]; - if ((temp_f2_2 * (player->pos[2] - temp_v0->unk_004[2])) >= 0.0f) { - temp_v1->unk_0C = (temp_f2_2 * arg3) + (-player->unk_034[2] * arg2); + something = (player->pos[2] - temp_v0->pos[2]) * temp_v0->unk_038[2]; + if (something >= 0.0f) { + temp_v1->unk_04[2] = (-player->unk_034[2] * arg2) + (temp_v0->unk_038[2] * arg3); } else { - temp_v1->unk_0C = -player->unk_034[2] * arg2; + temp_v1->unk_04[2] = -player->unk_034[2] * arg2; } - temp_f0 = temp_v1->unk_0C; - temp_f12 = temp_v1->unk_04; - var_f2 = (temp_f0 * temp_f0) + (temp_f12 * temp_f12); + var_f2 = (temp_v1->unk_04[0] * temp_v1->unk_04[0]) + (temp_v1->unk_04[2] * temp_v1->unk_04[2]); } return var_f2; } -#else -GLOBAL_ASM("asm/non_matchings/code_80086E70/func_8008933C.s") -#endif -#ifdef MIPS_TO_C -//generated by m2c commit d9d3d6575355663122de59f6b2882d8f174e2355 on Dec-21-2022 -f32 func_8008933C(Player *, s32, s32, s32); /* extern */ +void func_80089474(s32 objectIndex, s32 playerId, f32 arg2, f32 arg3, u32 arg4) { + s32 stackPadding; + Player *player; -void func_80089474(s32 arg0, u8 arg1, s32 arg2, s32 arg3, u32 arg4) { - Player *sp18; - - sp18 = &gPlayerOne[arg1]; - if (func_8007223C(arg0, 0x04000000) != 0) { + player = &gPlayerOne[playerId]; + if (func_8007223C(objectIndex, 0x04000000) != 0) { func_80072180(); } - if (((f64) func_8008933C(sp18, arg0, arg2, arg3) >= 4.0) && ((sp18->unk_000 & 0x1000) != 0x1000)) { - func_800C9060(arg1, arg4); + if ((func_8008933C(player, objectIndex, arg2, arg3) >= 4.0) && ((player->unk_000 & 0x1000) != 0x1000)) { + func_800C9060(playerId, arg4); } } -#else -GLOBAL_ASM("asm/non_matchings/code_80086E70/func_80089474.s") -#endif -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -void func_80072180(); /* extern */ -f32 func_8008933C(Player *, s32, s32, f32); /* extern */ -extern s32 D_8018D158; +void func_80089538(s32 objectIndex, s32 playerId, f32 arg2, f32 arg3, u32 arg4) { + s32 stackPadding; + Player *player; -void func_80089820(s32 objectIndex, s32 arg1, f32 arg2, u32 arg3) { - Player *var_s0; + player = &gPlayerOne[playerId]; + if ((func_8008933C(player, objectIndex, arg2, arg3) >= 4.0) && ((player->unk_000 & 0x1000) != 0x1000)) { + func_800C9060((u8) playerId, arg4); + } +} + +s32 func_800895E4(s32 objectIndex) { + Player *player; s32 var_s1; - u16 temp_v0; + s32 var_s6; - var_s0 = gPlayerOne; - func_800721E8(objectIndex, 0x02000000); + var_s6 = 0; + player = gPlayerOne; if (func_8007223C(objectIndex, 0x00000200) != 0) { - var_s1 = 0; - if (D_8018D158 > 0) { - do { - if ((D_80165C18[objectIndex].unk_0A6 != 0) && !(var_s0->unk_0BC & 0x80000000)) { - temp_v0 = var_s0->unk_000; - if ((temp_v0 & 0x8000) && !(temp_v0 & 0x100) && (func_80088D18(objectIndex, var_s0) != 0)) { - if (var_s0->unk_0BC & 0x200) { - func_800721C0(objectIndex, 0x02000000); - } else { - if (func_8007223C(objectIndex, 0x04000000) != 0) { - func_80072180(); - } - if (((f64) func_8008933C(var_s0, objectIndex, arg1, (f32) ((f64) arg2 * 1.1)) >= 4.0) && ((var_s0->unk_000 & 0x1000) != 0x1000)) { - func_800C9060(var_s1 & 0xFF, arg3); - } - } - } + for (var_s1 = 0; var_s1 < D_8018D158; var_s1++, player++) { + if ((D_80165C18[objectIndex].unk_0A6 != 0) && (func_80088D18(objectIndex, player) != 0)) { + if (func_8007223C(objectIndex, 0x04000000) != 0) { + func_80072180(); } - var_s1 += 1; - var_s0 += 0xDD8; - } while (var_s1 < D_8018D158); + var_s6 = 1; + } + } + } + return var_s6; +} + +void func_800896D4(s32 objectIndex, f32 arg1, f32 arg2) { + Player *player; + s32 var_s1; + + player = gPlayerOne; + if (func_8007223C(objectIndex, 0x00000200) != 0) { + for (var_s1 = 0; var_s1 < D_8018D158; var_s1++, player++) { + if ((D_80165C18[objectIndex].unk_0A6 != 0) && !(player->unk_0BC & 0x80000200) && (func_80088D18(objectIndex, player) != 0)) { + func_8008933C(player, objectIndex, arg1, arg2 * 1.1); + if (func_8007223C(objectIndex, 0x04000000) != 0) { + func_80072180(); + } + } } } } -#else -GLOBAL_ASM("asm/non_matchings/code_80086E70/func_80089820.s") -#endif -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -void func_80072180(); /* extern */ -f32 func_8008933C(Player *, s32, s32, f32); /* extern */ -extern s32 D_8018D158; - -void func_80089A04(s32 objectIndex, s32 arg1, f32 arg2) { - Player *var_s0; +void func_80089820(s32 objectIndex, f32 arg1, f32 arg2, u32 arg3) { + Player *player; s32 var_s1; - var_s0 = gPlayerOne; + player = gPlayerOne; + func_800721E8(objectIndex, 0x02000000); if (func_8007223C(objectIndex, 0x00000200) != 0) { - var_s1 = 0; - if (D_8018D158 > 0) { - do { - if ((D_80165C18[objectIndex].unk_0A6 != 0) && !(var_s0->unk_0BC & 0x80000200) && (func_80088DA4(objectIndex, var_s0) != 0)) { - func_8008933C(var_s0, objectIndex, arg1, (f32) ((f64) arg2 * 1.1)); + for (var_s1 = 0; var_s1 < D_8018D158; var_s1++, player++) { + if ((D_80165C18[objectIndex].unk_0A6 != 0) && !(player->unk_0BC & 0x80000000)) { + if ((player->unk_000 & 0x8000) && !(player->unk_000 & 0x100) && (func_80088D18(objectIndex, player) != 0)) { + if (player->unk_0BC & 0x200) { + func_800721C0(objectIndex, 0x02000000); + } else { + if (func_8007223C(objectIndex, 0x04000000) != 0) { + func_80072180(); + } + if ((func_8008933C(player, objectIndex, arg1, arg2 * 1.1) >= 4.0) && ((player->unk_000 & 0x1000) != 0x1000)) { + func_800C9060(var_s1, arg3); + } + } + } + } + } + } +} + +void func_80089A04(s32 objectIndex, f32 arg1, f32 arg2) { + Player *player; + s32 var_s1; + + player = gPlayerOne; + if (func_8007223C(objectIndex, 0x00000200) != 0) { + for (var_s1 = 0; var_s1 < D_8018D158; var_s1++, player++) { + if ((D_80165C18[objectIndex].unk_0A6 != 0) && !(player->unk_0BC & 0x80000200) && (func_80088DA4(objectIndex, player) != 0)) { + func_8008933C(player, objectIndex, arg1, arg2 * 1.1); + if (func_8007223C(objectIndex, 0x04000000) != 0) { + func_80072180(); + } + } + } + } +} + +s32 func_80089B50(s32 objectIndex) { + Player *player; + s32 sp40; + s32 var_s1; + s32 test; + + test = 0; + sp40 = 0; + player = gPlayerOne; + if (func_8007223C(objectIndex, 0x00000200) != 0) { + for (var_s1 = 0; var_s1 < D_8018D158; var_s1++, player++, test++) { + if ((D_80165C18[objectIndex].unk_0A6 != 0) && !(player->unk_0BC & 0x81000000) && (player->unk_000 & 0x8000) && !(player->unk_000 & 0x100) && (func_80088D18(objectIndex, player) != 0)) { + if (!(player->unk_0BC & 0x200)) { + player->statusEffects |= 0x400000; if (func_8007223C(objectIndex, 0x04000000) != 0) { func_80072180(); } + } else { + func_800C9060(test, 0x19018010U); } - var_s1 += 1; - var_s0 += 0xDD8; - } while (var_s1 < D_8018D158); - } - } -} -#else -GLOBAL_ASM("asm/non_matchings/code_80086E70/func_80089A04.s") -#endif - -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -void func_80072180(); /* extern */ -extern s32 D_8018D158; - -s32 func_80089B50(s32 objectIndex) { - s32 sp40; - Player *var_s0; - s32 var_s1; - s32 var_s2; - u16 temp_v0; - - var_s1 = 0; - sp40 = 0; - var_s0 = gPlayerOne; - if (func_8007223C(objectIndex, 0x00000200) != 0) { - var_s2 = 0; - if (D_8018D158 > 0) { - do { - if ((D_80165C18[objectIndex].unk_0A6 != 0) && !(var_s0->unk_0BC & 0x81000000)) { - temp_v0 = var_s0->unk_000; - if ((temp_v0 & 0x8000) && !(temp_v0 & 0x100) && (func_80088D18(objectIndex, var_s0) != 0)) { - sp40 = 1; - if (!(var_s0->unk_0BC & 0x200)) { - var_s0->statusEffects |= 0x400000; - if (func_8007223C(objectIndex, 0x04000000) != 0) { - func_80072180(); - } - } else { - func_800C9060(var_s1 & 0xFF, 0x19018010U); - } - } - } - var_s2 += 1; - var_s0 += 0xDD8; - var_s1 += 1; - } while (var_s2 < D_8018D158); + sp40 = 1; + } } } return sp40; } -#else -GLOBAL_ASM("asm/non_matchings/code_80086E70/func_80089B50.s") -#endif - -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -void func_80072180(); /* extern */ -extern s32 D_8018D158; s32 func_80089CBC(s32 objectIndex, f32 arg1) { - Player *var_s0; + Player *player; s32 var_s1; s32 var_s7; - u16 temp_v0; var_s7 = 0; - var_s0 = gPlayerOne; + player = gPlayerOne; if (func_8007223C(objectIndex, 0x00000200) != 0) { - var_s1 = 0; - if (D_8018D158 > 0) { - do { - if ((D_80165C18[objectIndex].unk_0A6 != 0) && !(var_s0->unk_0BC & 0x81000000)) { - temp_v0 = var_s0->unk_000; - if ((temp_v0 & 0x8000) && !(temp_v0 & 0x100) && (func_80088E98(objectIndex, var_s0, arg1) != 0)) { - var_s7 = 1; - if (!(var_s0->unk_0BC & 0x200)) { - var_s0->statusEffects |= 0x400000; - if (func_8007223C(objectIndex, 0x04000000) != 0) { - func_80072180(); - } - } - } - } - var_s1 += 1; - var_s0 += 0xDD8; - } while (var_s1 < D_8018D158); - } - } - return var_s7; -} -#else -GLOBAL_ASM("asm/non_matchings/code_80086E70/func_80089CBC.s") -#endif - -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -void func_80072180(); /* extern */ -extern s32 D_8018D158; - -s32 func_80089F24(s32 objectIndex) { - Player *var_s0; - s32 var_s1; - s32 var_s7; - u16 temp_v0; - - var_s7 = 0; - var_s0 = gPlayerOne; - if (func_8007223C(objectIndex, 0x00000200) != 0) { - var_s1 = 0; - if (D_8018D158 > 0) { - do { - if ((D_80165C18[objectIndex].unk_0A6 != 0) && !(var_s0->unk_0BC & 0x800002C0)) { - temp_v0 = var_s0->unk_000; - if ((temp_v0 & 0x8000) && !(temp_v0 & 0x100) && (func_80088D18(objectIndex, var_s0) != 0)) { - var_s7 = 1; + for (var_s1 = 0; var_s1 < D_8018D158; var_s1++, player++) { + if ((D_80165C18[objectIndex].unk_0A6 != 0) && !(player->unk_0BC & 0x81000000)) { + if ((player->unk_000 & 0x8000) && !(player->unk_000 & 0x100) && (func_80088E98(objectIndex, player, arg1) != 0)) { + if (!(player->unk_0BC & 0x200)) { + player->statusEffects |= 0x400000; if (func_8007223C(objectIndex, 0x04000000) != 0) { func_80072180(); } - var_s0->statusEffects |= 0x200000; } + var_s7 = 1; } - var_s1 += 1; - var_s0 += 0xDD8; - } while (var_s1 < D_8018D158); + } + } + } + return var_s7; +} + +s32 func_80089E18(s32 objectIndex) { + Player *player; + s32 var_s1; + s32 var_s6; + + var_s6 = 0; + player = gPlayerOne; + if (func_8007223C(objectIndex, 0x00000200) != 0) { + for (var_s1 = 0; var_s1 < D_8018D158; var_s1++, player++) { + if ((D_80165C18[objectIndex].unk_0A6 != 0) && !(player->unk_0BC & 0x800000C0) && (func_80088D18(objectIndex, player) != 0)) { + if (player->unk_0BC & 0x200) { + var_s6 = 1; + } else { + player->statusEffects |= 1; + } + } + } + } + return var_s6; +} + +s32 func_80089F24(s32 objectIndex) { + Player *player; + s32 var_s1; + s32 var_s7; + + var_s7 = 0; + player = gPlayerOne; + if (func_8007223C(objectIndex, 0x00000200) != 0) { + for (var_s1 = 0; var_s1 < D_8018D158; var_s1++, player++) { + if ((D_80165C18[objectIndex].unk_0A6 != 0) && !(player->unk_0BC & 0x800002C0)) { + if ((player->unk_000 & 0x8000) && !(player->unk_000 & 0x100) && (func_80088D18(objectIndex, player) != 0)) { + var_s7 = 1; + if (func_8007223C(objectIndex, 0x04000000) != 0) { + func_80072180(); + } + player->statusEffects |= 0x200000; + } + } } } return var_s7; } -#else -GLOBAL_ASM("asm/non_matchings/code_80086E70/func_80089F24.s") -#endif s32 func_8008A060(s32 objectIndex, Camera *camera, u16 arg2) { u16 temp_t3; @@ -1209,8 +1180,8 @@ s32 func_8008A0B4(s32 objectIndex, Player *player, Camera *camera, u16 arg3) { s32 var_t0; var_t0 = 0; - x_diff = D_80165C18[objectIndex].unk_004[0] - player->pos[0]; - z_diff = D_80165C18[objectIndex].unk_004[2] - player->pos[2]; + x_diff = D_80165C18[objectIndex].pos[0] - player->pos[0]; + z_diff = D_80165C18[objectIndex].pos[2] - player->pos[2]; temp_t3 = ((u16) camera->rot[1] - atan2s(x_diff, z_diff)) + (arg3 >> 1); if ((temp_t3 >= 0) && (arg3 >= temp_t3)) { var_t0 = 1; @@ -1223,7 +1194,7 @@ s32 func_8008A140(s32 objectIndex, Camera *camera, u16 arg2) { s32 var_t0; var_t0 = 0; - temp_t2 = (func_80041770(camera->pos[0], D_80165C18[objectIndex].unk_004[0], camera->pos[2], D_80165C18[objectIndex].unk_004[2]) + ((s32) arg2 / 2)) - camera->rot[1]; + temp_t2 = (func_80041770(camera->pos[0], D_80165C18[objectIndex].pos[0], camera->pos[2], D_80165C18[objectIndex].pos[2]) + ((s32) arg2 / 2)) - camera->rot[1]; if ((temp_t2 >= 0) && (arg2 >= temp_t2)) { var_t0 = 1; } @@ -1979,9 +1950,9 @@ void func_8008B80C(s32 arg0, f32 arg1, f32 arg2, f32 arg3) { void func_8008B844(s32 arg0) { f32 temp_f0 = D_80165C18[arg0].unk_010[0]; - D_80165C18[arg0].unk_004[0] = D_80165C18[arg0].unk_028[0] + temp_f0; - D_80165C18[arg0].unk_004[1] = D_80165C18[arg0].unk_028[1] + temp_f0; - D_80165C18[arg0].unk_004[2] = D_80165C18[arg0].unk_028[2] + temp_f0; + D_80165C18[arg0].pos[0] = D_80165C18[arg0].unk_028[0] + temp_f0; + D_80165C18[arg0].pos[1] = D_80165C18[arg0].unk_028[1] + temp_f0; + D_80165C18[arg0].pos[2] = D_80165C18[arg0].unk_028[2] + temp_f0; } void func_8008B888(s32 arg0, u16 arg1, u16 arg2, u16 arg3) { @@ -2002,12 +1973,7 @@ void func_8008B8F0(s32 arg0, f32 arg1, f32 arg2, f32 arg3) { D_80165C18[arg0].unk_038[2] = arg3; } -#ifdef MIPS_TO_C -//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -extern ? D_80165C28; - -void func_8008B928(s32 objectIndex, s16 arg1, s16 arg2, s16 arg3, s32 arg4) { - s32 temp_v0; +void func_8008B928(s32 objectIndex, s16 arg1, s16 arg2, s16 arg3, s16 arg4[][4]) { struct_80165C18_entry *temp_s0; temp_s0 = &D_80165C18[objectIndex]; @@ -2015,17 +1981,13 @@ void func_8008B928(s32 objectIndex, s16 arg1, s16 arg2, s16 arg3, s32 arg4) { temp_s0->unk_010[1] = (f32) arg2; temp_s0->unk_080 = arg4; temp_s0->unk_010[2] = (f32) arg3; - temp_s0->unk_038[0] = (f32) (arg4->unkA - arg4->unk2); - temp_s0->unk_038[1] = (f32) (arg4->unkC - arg4->unk4); - temp_s0->unk_038[2] = (f32) (arg4->unkE - arg4->unk6); - temp_v0 = func_80087368(objectIndex); - temp_s0->unk_0BE[1] = (u16) temp_v0; - temp_s0->unk_038[2] = func_800416D8(temp_s0->unk_038[2], temp_s0->unk_038[0], -temp_v0 & 0xFFFF); + temp_s0->unk_038[0] = (f32) (arg4[1][1] - arg4[0][1]); + temp_s0->unk_038[1] = (f32) (arg4[1][2] - arg4[0][2]); + temp_s0->unk_038[2] = (f32) (arg4[1][3] - arg4[0][3]); + temp_s0->unk_0BE[1] = func_80087368(objectIndex); + temp_s0->unk_038[2] = func_800416D8(temp_s0->unk_038[2], temp_s0->unk_038[0], -temp_s0->unk_0BE[1]); temp_s0->unk_0BE[0] = func_80087324(objectIndex); } -#else -GLOBAL_ASM("asm/non_matchings/code_80086E70/func_8008B928.s") -#endif UNUSED void func_8008BA40(s32 objectIndex, s16 arg1, u16 arg2) { s16 test; @@ -2096,9 +2058,9 @@ void func_8008BEA4(s32 objectIndex, u16 arg1, u16 arg2) { } void func_8008BF18(s32 objectIndex) { - D_80165C18[objectIndex].unk_004[0] = D_80165C18[objectIndex].unk_010[0] + D_80165C18[objectIndex].unk_028[0]; - D_80165C18[objectIndex].unk_004[1] = D_80165C18[objectIndex].unk_010[1] + D_80165C18[objectIndex].unk_028[1]; - D_80165C18[objectIndex].unk_004[2] = D_80165C18[objectIndex].unk_010[2] + D_80165C18[objectIndex].unk_028[2]; + D_80165C18[objectIndex].pos[0] = D_80165C18[objectIndex].unk_010[0] + D_80165C18[objectIndex].unk_028[0]; + D_80165C18[objectIndex].pos[1] = D_80165C18[objectIndex].unk_010[1] + D_80165C18[objectIndex].unk_028[1]; + D_80165C18[objectIndex].pos[2] = D_80165C18[objectIndex].unk_010[2] + D_80165C18[objectIndex].unk_028[2]; } #ifdef MIPS_TO_C @@ -2110,9 +2072,9 @@ void func_8008BF64(s32 objectIndex) { struct_80165C18_entry *temp_v0; temp_v0 = &D_80165C18[objectIndex]; - D_80183E40.unk0 = (f32) temp_v0->unk_004[0]; - D_80183E40.unk4 = (f32) temp_v0->unk_004[1]; - D_80183E40.unk8 = (f32) temp_v0->unk_004[2]; + D_80183E40.unk0 = (f32) temp_v0->pos[0]; + D_80183E40.unk4 = (f32) temp_v0->pos[1]; + D_80183E40.unk8 = (f32) temp_v0->pos[2]; D_80183E80.unk0 = (u16) temp_v0->unk_0BE[0]; D_80183E80.unk2 = (u16) temp_v0->unk_0BE[1]; D_80183E80.unk4 = (u16) temp_v0->unk_0BE[2]; @@ -2122,8 +2084,8 @@ GLOBAL_ASM("asm/non_matchings/code_80086E70/func_8008BF64.s") #endif void func_8008BFC0(s32 objectIndex) { - D_80165C18[objectIndex].unk_09C = D_80165C18[objectIndex].unk_004[0]; - D_80165C18[objectIndex].unk_09E = D_80165C18[objectIndex].unk_004[1]; + D_80165C18[objectIndex].unk_09C = D_80165C18[objectIndex].pos[0]; + D_80165C18[objectIndex].unk_09E = D_80165C18[objectIndex].pos[1]; } #ifdef MIPS_TO_C diff --git a/src/code_80086E70.h b/src/code_80086E70.h index 97639eed6..6da01b40c 100644 --- a/src/code_80086E70.h +++ b/src/code_80086E70.h @@ -16,7 +16,6 @@ void func_80086F10(s32, s32, u16[][4]); void func_80086F60(s32); s32 func_80086FA4(s32); void func_80086FD4(s32); -void func_80089F24(s32); void func_8008B78C(s32); void func_8008701C(s32, s32); s32 func_80087060(s32, s32); @@ -55,6 +54,7 @@ s32 func_80087F14(s32, f32, f32, f32, s16, s32); void func_80088038(s32, f32, u16); void func_800880DC(); void func_80088150(s32); +s32 func_8008847C(s32); s32 func_80088538(s32); s32 func_8008861C(s32); void func_800886F4(s32); @@ -79,6 +79,17 @@ void func_80088FF0(Player*); void func_8008900C(Player*); void func_80089020(s32, f32*); void func_800892E0(s32); +f32 func_8008933C(Player*, s32, f32, f32); +void func_80089474(s32, s32, f32, f32, u32); +void func_80089538(s32, s32, f32, f32, u32); +s32 func_800895E4(s32); +void func_800896D4(s32, f32, f32); +void func_80089820(s32, f32, f32, u32); +void func_80089A04(s32, f32, f32); +s32 func_80089B50(s32); +s32 func_80089CBC(s32, f32); +s32 func_80089E18(s32); +s32 func_80089F24(s32); s32 func_8008A060(s32, Camera*, u16); s32 func_8008A0B4(s32, Player*, Camera*, u16); s32 func_8008A140(s32, Camera*, u16); @@ -124,6 +135,7 @@ void func_8008B844(s32); void func_8008B888(s32, u16, u16, u16); void func_8008B8BC(s32, u16, u16, u16); void func_8008B8F0(s32, f32, f32, f32); +void func_8008B928(s32, s16, s16, s16, s16[][4]); void func_8008BA40(s32, s16, u16); void func_8008BAB4(s32, s16, u16); void func_8008BB28(s32, s16, u16); diff --git a/src/common_textures.h b/src/common_textures.h index 2cba175b8..f0321e34a 100644 --- a/src/common_textures.h +++ b/src/common_textures.h @@ -326,14 +326,8 @@ extern s8 D_0D02A058[]; extern s8 D_0D02A458[]; extern s8 D_0D02A858[]; extern u8 D_0D02AA58[]; -extern s8 D_0D02AC58[]; -extern s8 D_0D02B058[]; -extern s8 D_0D02B458[]; -extern s8 D_0D02B858[]; -extern u8 D_0D02BC58[]; -extern s8 D_0D02C058[]; -extern s8 D_0D02C458[]; -extern s8 D_0D02C858[]; +extern u8 D_0D02AC58[][1024]; +extern u8 D_0D02BC58[][1024]; extern s8 gTextureMiniMapFinishLine[]; extern s8 gMiniMapKartTextures[][128]; extern s8 gTextureMiniMapProgressDot[]; diff --git a/src/common_textures.inc.c b/src/common_textures.inc.c index 56600a1bf..77d093320 100644 --- a/src/common_textures.inc.c +++ b/src/common_textures.inc.c @@ -3004,36 +3004,34 @@ u8 D_0D02AA58[] = { #include "textures/common/132B50_2AA58.rgba16.inc.c" }; -s8 D_0D02AC58[] = { - #include "textures/common/132B50_2AC58.i8.inc.c" +u8 D_0D02AC58[][1024] = { + { + #include "textures/common/132B50_2AC58.i8.inc.c" + }, + { + #include "textures/common/132B50_2B058.i8.inc.c" + }, + { + #include "textures/common/132B50_2B458.i8.inc.c" + }, + { + #include "textures/common/132B50_2B858.i8.inc.c" + }, }; -s8 D_0D02B058[] = { - #include "textures/common/132B50_2B058.i8.inc.c" -}; - -s8 D_0D02B458[] = { - #include "textures/common/132B50_2B458.i8.inc.c" -}; - -s8 D_0D02B858[] = { - #include "textures/common/132B50_2B858.i8.inc.c" -}; - -u8 D_0D02BC58[] = { - #include "textures/common/132B50_2BC58.i8.inc.c" -}; - -s8 D_0D02C058[] = { - #include "textures/common/132B50_2C058.i8.inc.c" -}; - -s8 D_0D02C458[] = { - #include "textures/common/132B50_2C458.i8.inc.c" -}; - -s8 D_0D02C858[] = { - #include "textures/common/132B50_2C858.i8.inc.c" +u8 D_0D02BC58[][1024] = { + { + #include "textures/common/132B50_2BC58.i8.inc.c" + }, + { + #include "textures/common/132B50_2C058.i8.inc.c" + }, + { + #include "textures/common/132B50_2C458.i8.inc.c" + }, + { + #include "textures/common/132B50_2C858.i8.inc.c" + }, }; // minimap cars diff --git a/src/hud_renderer.c b/src/hud_renderer.c index cd5961a10..328f584cc 100644 --- a/src/hud_renderer.c +++ b/src/hud_renderer.c @@ -17,6 +17,7 @@ #include "variables.h" #include "common_textures.h" #include "code_8001F980.h" +#include "code_80004740.h" #include "hud_renderer.h" #include "code_80071F00.h" #include "code_80091750.h" @@ -1497,9 +1498,9 @@ void func_8004A6EC(s32 objectIndex, f32 arg1) { if ((func_8007223C(objectIndex, 0x00000020) != 0) && (func_8007223C(objectIndex, 0x00800000) != 0)) { temp_v0 = &D_80165C18[objectIndex]; - D_80183E50[0] = temp_v0->unk_004[0]; + D_80183E50[0] = temp_v0->pos[0]; D_80183E50[1] = temp_v0->unk_044 + 0.8; - D_80183E50[2] = temp_v0->unk_004[2]; + D_80183E50[2] = temp_v0->pos[2]; func_80042E00(D_80183E50, temp_v0->unk_0B8, arg1); gSPDisplayList(gDisplayListHead++, D_0D007B20); } @@ -1510,9 +1511,9 @@ void func_8004A7AC(s32 objectIndex, f32 arg1) { if (func_8007223C(objectIndex, 0x00000020) != 0) { temp_v0 = &D_80165C18[objectIndex]; - D_80183E50[0] = temp_v0->unk_004[0]; + D_80183E50[0] = temp_v0->pos[0]; D_80183E50[1] = temp_v0->unk_044 + 0.8; - D_80183E50[2] = temp_v0->unk_004[2]; + D_80183E50[2] = temp_v0->pos[2]; D_80183E98[0] = 0x4000; D_80183E98[1] = 0; D_80183E98[2] = 0; @@ -1527,9 +1528,9 @@ void func_8004A870(s32 objectIndex, f32 arg1) { if ((func_8007223C(objectIndex, 0x00000020) != 0) && (func_8007223C(objectIndex, 0x00800000) != 0)) { temp_v0 = &D_80165C18[objectIndex]; - D_80183E50[0] = temp_v0->unk_004[0]; + D_80183E50[0] = temp_v0->pos[0]; D_80183E50[1] = temp_v0->unk_044 + 0.8; - D_80183E50[2] = temp_v0->unk_004[2]; + D_80183E50[2] = temp_v0->pos[2]; func_80042A20(sp30, temp_v0->unk_01C, D_80183E50, 0U, arg1); func_80022180(&gGfxPool->mtxPool[D_8018D120 + 0xB], sp30); gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->mtxPool[D_8018D120 + 0xB]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); @@ -2552,7 +2553,7 @@ void func_8004E638(s32 playerId) { temp_v1 = &D_80165C18[objectIndex]; if (temp_v1->unk_0A6 >= 2) { temp_v0 = &D_8018CA70[playerId]; - func_8004E4CC(temp_v0->slideItemBoxX + temp_v0->itemBoxX, temp_v0->slideItemBoxY + temp_v0->itemBoxY, (u8 *) temp_v1->unk_060, temp_v1->unk_064); + func_8004E4CC(temp_v0->slideItemBoxX + temp_v0->itemBoxX, temp_v0->slideItemBoxY + temp_v0->itemBoxY, (u8 *) temp_v1->activeTLUT, temp_v1->activeTexture); } } @@ -2565,7 +2566,7 @@ void func_8004E6C4(s32 playerId) { temp_v1 = &D_80165C18[objectIndex]; if (temp_v1->unk_0A6 >= 2) { temp_v0 = &D_8018CA70[playerId]; - func_80047910(temp_v0->slideItemBoxX + temp_v0->itemBoxX, temp_v0->slideItemBoxY + temp_v0->itemBoxY, 0U, temp_v0->unknownScaling, (u8 *) temp_v1->unk_060, (u8 *) temp_v1->unk_064, D_0D005C30, 0x00000028, 0x00000020, 0x00000028, 0x00000020); + func_80047910(temp_v0->slideItemBoxX + temp_v0->itemBoxX, temp_v0->slideItemBoxY + temp_v0->itemBoxY, 0U, temp_v0->unknownScaling, (u8 *) temp_v1->activeTLUT, (u8 *) temp_v1->activeTexture, D_0D005C30, 0x00000028, 0x00000020, 0x00000028, 0x00000020); } } @@ -2802,7 +2803,7 @@ void func_8004F168(s32 arg0, s32 arg1, s32 arg2) { temp_v1 = &gPlayerOne[arg1]; temp_t0 = arg0 * 2; - if (temp_v1->unk_000 & 0x8000) { + if (temp_v1->sizeScaling & 0x8000) { temp_a0 = ((*(&D_8018D2C0 + temp_t0) + D_8018D2F0) - ((s16) D_8018D2B0 / 2)) + D_8018D2E0 + (s16) (s32) (temp_v1->pos[0] * D_8018D2A0); temp_a1 = ((*(&D_8018D2D8 + temp_t0) + D_8018D2F8) - ((s16) D_8018D2B8 / 2)) + D_8018D2E8 + (s32) (temp_v1->pos[2] * D_8018D2A0); if (arg2 != 8) { @@ -2894,7 +2895,7 @@ void func_8004F3E4(s32 arg0) { var_s0_4 = &gGPCurrentRacePlayerIdByRank[var_s1_3]; do { temp_a1_2 = *var_s0_4; - if (gPlayerOne[temp_a1_2].unk_000 & 0x1000) { + if (gPlayerOne[temp_a1_2].sizeScaling & 0x1000) { func_8004F168(arg0, temp_a1_2, 8U); } var_s0_4 -= 2; @@ -2906,7 +2907,7 @@ void func_8004F3E4(s32 arg0) { do { temp_a1_3 = *var_s0_5; temp_v0_3 = &gPlayerOne[temp_a1_3]; - if ((temp_v0_3->unk_000 & 0x1000) != 0x1000) { + if ((temp_v0_3->sizeScaling & 0x1000) != 0x1000) { func_8004F168(arg0, temp_a1_3, temp_v0_3->characterId); } var_s0_5 -= 2; @@ -3119,14 +3120,11 @@ void func_8004FDB4(f32 arg0, f32 arg1, s16 arg2, s16 arg3, s16 arg4, s32 arg5, s } #ifdef MIPS_TO_C -//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b -? func_8004FDB4(f32, f32, s32, s32, s16, s16, s32, s32, s32, s32, s32); /* extern */ +//generated by m2c commit b52d92c2340f6f4ba1aafb464188bb698752fbb0 on Jul-27-2023 extern s8 D_801657E2; extern ? D_8018D028; extern f32 D_8018D050; extern ? D_8018D078; -extern s32 D_8018D3E0; -extern ? gGPCurrentRaceCharacterIdByRank; void func_80050320(void) { Gfx *temp_v1_3; @@ -3160,12 +3158,12 @@ void func_80050320(void) { if ((f64) *(&D_8018D078 + var_s1) < 0.0) { var_a0 = 1; } - temp_v1 = *((var_s0 * 2) + &gGPCurrentRaceCharacterIdByRank); + temp_v1 = gGPCurrentRaceCharacterIdByRank[var_s0]; temp_a1 = gLapCountByPlayerId[gGPCurrentRacePlayerIdByRank[var_s0]]; if (temp_v1 == gPlayerOne->characterId) { - func_8004FDB4(*temp_t0, temp_f14, var_a0, temp_a1, var_s0, (s16) temp_a1, (s32) temp_v1, 0x000000FF, 1, var_a0, 0); + func_8004FDB4(*temp_t0, temp_f14, var_s0, (s16) temp_a1, (s16) (s32) temp_v1, 0x000000FF, 1, var_a0, 0); } else { - func_8004FDB4(*temp_t0, temp_f14, var_a0, temp_a1, var_s0, (s16) temp_a1, (s32) temp_v1, D_8018D3E0, 0, var_a0, 0); + func_8004FDB4(*temp_t0, temp_f14, var_s0, (s16) temp_a1, (s16) (s32) temp_v1, D_8018D3E0, 0, var_a0, 0); } } var_s0 += 1; @@ -3188,9 +3186,9 @@ void func_80050320(void) { temp_a1_2 = gLapCountByPlayerId[temp_v0]; temp_v1_2 = (s16) gPlayerOne[temp_v0].characterId; if (temp_v0 == 0) { - func_8004FDB4(*temp_t0_2, temp_f14_2, var_a0_2, temp_a1_2, var_s0_2, (s16) temp_a1_2, (s32) temp_v1_2, 0x000000FF, 1, var_a0_2, 1); + func_8004FDB4(*temp_t0_2, temp_f14_2, var_s0_2, (s16) temp_a1_2, (s16) (s32) temp_v1_2, 0x000000FF, 1, var_a0_2, 1); } else { - func_8004FDB4(*temp_t0_2, temp_f14_2, var_a0_2, temp_a1_2, var_s0_2, (s16) temp_a1_2, (s32) temp_v1_2, 0x000000FF, 0, var_a0_2, 1); + func_8004FDB4(*temp_t0_2, temp_f14_2, var_s0_2, (s16) temp_a1_2, (s16) (s32) temp_v1_2, 0x000000FF, 0, var_a0_2, 1); } } var_s0_2 += 1; @@ -3460,10 +3458,9 @@ GLOBAL_ASM("asm/non_matchings/hud_renderer/func_80050C68.s") #endif #ifdef NON_MATCHING -extern struct_D_8018CE10 D_8018CE10[]; // Something about the handling of the `player` variable is weird. -// All commands are preset and correct, 2 of them are out of position +// All commands are present and correct, 2 of them are out of position void func_80050E34(s32 playerId, s32 arg1) { s32 objectIndex; s32 spD0; @@ -3500,10 +3497,10 @@ void func_80050E34(s32 playerId, s32 arg1) { gDPLoadTLUT_pal256(gDisplayListHead++, gTLUTPortraitBombKartAndQuestionMark); func_800452A4(gTexturePortraitQuestionMark, 0x00000020, 0x00000020); object = &D_80165C18[objectIndex]; - object->unk_004[0] = object->unk_028[0] + ((f32) (spD0 + 0x20)); - object->unk_004[1] = object->unk_028[1] + ((f32) (spC4 + spCC)); - object->unk_004[2] = object->unk_028[2]; - func_80042E00(object->unk_004, object->unk_0BE, object->unk_000); + object->pos[0] = object->unk_028[0] + ((f32) (spD0 + 0x20)); + object->pos[1] = object->unk_028[1] + ((f32) (spC4 + spCC)); + object->pos[2] = object->unk_028[2]; + func_80042E00(object->pos, object->unk_0BE, object->sizeScaling); gSPDisplayList(gDisplayListHead++, D_0D0069E0); } else { gDPLoadTLUT_pal256(gDisplayListHead++, gPortraitTLUTs[characterId]); @@ -3515,10 +3512,10 @@ void func_80050E34(s32 playerId, s32 arg1) { } func_800452A4(gPortraitTextures[characterId], 0x00000020, 0x00000020); object = &D_80165C18[objectIndex]; - object->unk_004[0] = object->unk_028[0] + ((f32) (spD0 + 0x20)); - object->unk_004[1] = object->unk_028[1] + ((f32) (spC4 + spCC)); - object->unk_004[2] = object->unk_028[2]; - func_80042E00(object->unk_004, object->unk_0BE, object->unk_000); + object->pos[0] = object->unk_028[0] + ((f32) (spD0 + 0x20)); + object->pos[1] = object->unk_028[1] + ((f32) (spC4 + spCC)); + object->pos[2] = object->unk_028[2]; + func_80042E00(object->pos, object->unk_0BE, object->sizeScaling); if (spB8 != 0) { gSPDisplayList(gDisplayListHead++, D_0D0069F8); } else { @@ -3536,7 +3533,7 @@ void func_80050E34(s32 playerId, s32 arg1) { gSPDisplayList(gDisplayListHead++, D_0D007A40); func_8004B35C(D_8018D3E4, D_8018D3E8, D_8018D3EC, 0x000000FF); func_80044924(gTextureCharacterPortraitBorder, 0x00000020, 0x00000020); - func_80042E00(object->unk_004, object->unk_0BE, object->unk_000); + func_80042E00(object->pos, object->unk_0BE, object->sizeScaling); gSPDisplayList(gDisplayListHead++, D_0D0069E0); } } @@ -3572,7 +3569,7 @@ void func_800514BC(void) { var_s2 = &gGPCurrentRacePlayerIdByRank[var_s0]; do { temp_a0 = *var_s2; - if ((gPlayerOne[temp_a0].unk_000 & 0x8000) && ((temp_a0 != 0) || (gPlayerCountSelection1 != 1))) { + if ((gPlayerOne[temp_a0].sizeScaling & 0x8000) && ((temp_a0 != 0) || (gPlayerCountSelection1 != 1))) { func_80050E34(temp_a0, var_s0); } var_s1 += 1; @@ -3651,10 +3648,10 @@ void func_800518F8(s32 arg0, s16 arg1, s16 arg2) { if (D_8018D228 != temp_v0) { D_8018D228 = temp_v0; sp18 = temp_t0; - func_80044DA0(temp_t0->unk_064, temp_t0->unk_0D9, temp_t0->unk_0DA); + func_80044DA0(temp_t0->activeTexture, temp_t0->textureWidth, temp_t0->textureHeight); } sp18 = temp_t0; - func_80042330((s32) arg1, (s32) arg2, 0U, temp_t0->unk_000); + func_80042330((s32) arg1, (s32) arg2, 0U, temp_t0->sizeScaling); temp_v0_2 = gDisplayListHead; gDisplayListHead = temp_v0_2 + 8; temp_v0_2->words.w0 = 0x0400103F; @@ -3685,10 +3682,10 @@ void func_800519D4(s32 arg0, s16 arg1, s16 arg2) { temp_v0 = temp_s0->unk_0D5; if (D_8018D228 != temp_v0) { D_8018D228 = temp_v0; - func_80044DA0(temp_s0->unk_064, temp_s0->unk_0D9, temp_s0->unk_0DA); + func_80044DA0(temp_s0->activeTexture, temp_s0->textureWidth, temp_s0->textureHeight); } func_8004B138(0x000000FF, 0x000000FF, 0x000000FF, (s32) temp_s0->unk_0A0); - func_80042330((s32) arg1, (s32) arg2, 0U, temp_s0->unk_000); + func_80042330((s32) arg1, (s32) arg2, 0U, temp_s0->sizeScaling); temp_v0_2 = gDisplayListHead; gDisplayListHead = temp_v0_2 + 8; temp_v0_2->words.w0 = 0x0400103F; @@ -3964,7 +3961,7 @@ void func_8005217C(s32 arg0) { sp50 = temp_a3; if (func_8007223C(temp_a3, 0x00000010) != 0) { sp50 = temp_a3; - func_80042E00(temp_v1->unk_004, (s16 *) temp_v1->unk_0BE, temp_v1->unk_000); + func_80042E00(temp_v1->pos, (s16 *) temp_v1->unk_0BE, temp_v1->sizeScaling); func_800520C0(sp50); gSPDisplayList(gDisplayListHead++, D_0D007828); @@ -4046,10 +4043,10 @@ void func_800523B8(s32 arg0, s32 arg1, u32 arg2) { Camera *camera = &camera1[arg1]; temp_v1 = &D_80165C18[arg0]; - temp_v1->unk_0B2[1] = func_800418AC(temp_v1->unk_004[0], temp_v1->unk_004[2], camera->pos); - func_800484BC(temp_v1->unk_004, temp_v1->unk_0B2, temp_v1->unk_000, temp_v1->unk_0A0, (u8 *) temp_v1->unk_060, temp_v1->unk_064, temp_v1->unk_074, 0x00000030, 0x00000028, 0x00000030, 0x00000028); + temp_v1->unk_0B2[1] = func_800418AC(temp_v1->pos[0], temp_v1->pos[2], camera->pos); + func_800484BC(temp_v1->pos, temp_v1->unk_0B2, temp_v1->sizeScaling, temp_v1->unk_0A0, (u8 *) temp_v1->activeTLUT, temp_v1->activeTexture, temp_v1->unk_074, 0x00000030, 0x00000028, 0x00000030, 0x00000028); if ((func_8007223C(arg0, 0x00000020) != 0) && (arg2 < 0x15F91U)) { - func_8004A630(&D_8018C830, temp_v1->unk_004, 0.4f); + func_8004A630(&D_8018C830, temp_v1->pos, 0.4f); } } @@ -4094,7 +4091,7 @@ void func_80052590(s32 cameraId) { temp_s0 = &D_80165C18[*D_80183EA0]; temp_s7 = &camera1[cameraId]; - func_80046F60((s32) temp_s0->unk_060, (s32) temp_s0->unk_064, 0x00000020, 0x00000040, 5); + func_80046F60((s32) temp_s0->activeTLUT, (s32) temp_s0->activeTexture, 0x00000020, 0x00000040, 5); D_80183E80.unk0 = (s16) temp_s0->unk_0B2[0]; D_80183E80.unk4 = (u16) temp_s0->unk_0B2[2]; var_s1 = &D_8018C3F0; @@ -4104,8 +4101,8 @@ void func_80052590(s32 cameraId) { if (temp_v0 != -1) { temp_s0_2 = &D_80165C18[temp_v0]; if ((temp_s0_2->unk_0A6 >= 2) && (D_8018D120 < 0x2EF)) { - D_80183E80.unk2 = func_800418AC(temp_s0_2->unk_004[0], temp_s0_2->unk_004[2], temp_s7->pos); - func_800431B0(temp_s0_2->unk_004, &D_80183E80, temp_s0_2->unk_000, D_0D0062B0); + D_80183E80.unk2 = func_800418AC(temp_s0_2->pos[0], temp_s0_2->pos[2], temp_s7->pos); + func_800431B0(temp_s0_2->pos, &D_80183E80, temp_s0_2->sizeScaling, D_0D0062B0); } } var_s1 += 4; @@ -4118,8 +4115,8 @@ void func_80052590(s32 cameraId) { if (temp_v0_2 != -1) { temp_s0_3 = &D_80165C18[temp_v0_2]; if ((temp_s0_3->unk_0A6 >= 2) && (D_8018D120 < 0x2EF)) { - D_80183E80.unk2 = func_800418AC(temp_s0_3->unk_004[0], temp_s0_3->unk_004[2], temp_s7->pos); - func_800431B0(temp_s0_3->unk_004, &D_80183E80, temp_s0_3->unk_000, D_0D0062B0); + D_80183E80.unk2 = func_800418AC(temp_s0_3->pos[0], temp_s0_3->pos[2], temp_s7->pos); + func_800431B0(temp_s0_3->pos, &D_80183E80, temp_s0_3->sizeScaling, D_0D0062B0); } } var_s1_2 += 4; @@ -4134,28 +4131,19 @@ void func_80052590(s32 cameraId) { GLOBAL_ASM("asm/non_matchings/hud_renderer/func_80052590.s") #endif -#ifdef MIPS_TO_C -//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b -extern s32 D_80183EA4; +void func_800527D8(s32 cameraId) { + s32 objectIndex; + struct_80165C18_entry *object; -void func_800527D8(s32 arg0) { - s32 sp1C; - s32 temp_a0; - struct_80165C18_entry *temp_v0; - - temp_a0 = D_80183EA4; - sp1C = temp_a0; - func_8008A364(temp_a0, arg0, 0x5555U, 0x00000320); - if (func_8007223C(temp_a0, 0x00040000) != 0) { - temp_v0 = &D_80165C18[sp1C]; - if (temp_v0->unk_0A6 >= 2) { - func_80043220(temp_v0->unk_004, (s16 *) &temp_v0->unk_0B2, temp_v0->unk_000, (Gfx *) temp_v0->unk_070); + objectIndex = D_80183EA0[1]; + func_8008A364(objectIndex, cameraId, 0x5555U, 0x00000320); + if (func_8007223C(objectIndex, 0x00040000) != 0) { + object = &D_80165C18[objectIndex]; + if (object->unk_0A6 >= 2) { + func_80043220(object->pos, object->unk_0B2, object->sizeScaling, object->unk_070); } } } -#else -GLOBAL_ASM("asm/non_matchings/hud_renderer/func_800527D8.s") -#endif void func_8005285C(s32 arg0) { Player *temp_v0; @@ -4242,7 +4230,7 @@ void func_800528EC(s32 arg0) { if (temp_v0_8 != -1) { temp_v1 = &D_80165C18[temp_v0_8]; if (temp_v1->unk_0A6 > 0) { - func_80042E00(temp_v1->unk_004, &D_80183E80, temp_v1->unk_000); + func_80042E00(temp_v1->pos, &D_80183E80, temp_v1->sizeScaling); temp_v0_9 = gDisplayListHead; gDisplayListHead = temp_v0_9 + 8; temp_v0_9->words.w1 = (u32) D_0D005BD0; @@ -4261,7 +4249,7 @@ void func_800528EC(s32 arg0) { if (temp_v0_11 != -1) { temp_v1_2 = &D_80165C18[temp_v0_11]; if ((temp_v1_2->unk_0A6 > 0) && (arg0 == temp_v1_2->unk_084[7]) && (D_8018D120 < 0x2EF)) { - func_80042E00(temp_v1_2->unk_004, &D_80183E80, temp_v1_2->unk_000); + func_80042E00(temp_v1_2->pos, &D_80183E80, temp_v1_2->sizeScaling); temp_v0_12 = gDisplayListHead; gDisplayListHead = temp_v0_12 + 8; temp_v0_12->words.w1 = (u32) D_0D005BD0; @@ -4390,49 +4378,31 @@ void func_80052E30(s32 arg0) { GLOBAL_ASM("asm/non_matchings/hud_renderer/func_80052E30.s") #endif -#ifdef MIPS_TO_C -//generated by m2c commit d9d3d6575355663122de59f6b2882d8f174e2355 on Dec-28-2022 -extern ? d_course_frappe_snowland_snow_tlut; -extern ? d_course_frappe_snowland_snow; -extern ? D_8018C5F0; - -void func_80052F20(s32 arg0) { +void func_80052F20(s32 cameraId) { + s32 stackPadding[2]; Camera *sp44; - Gfx *temp_v1; - Gfx *temp_v1_2; - s32 *var_s2; - s32 temp_s0; + s32 someIndex; + s32 objectIndex; struct_80165C18_entry *temp_s1; - sp44 = &camera1[arg0]; - func_80046E60((s32) &d_course_frappe_snowland_snow_tlut, (s32) &d_course_frappe_snowland_snow, 0x00000020, 0x00000020); - var_s2 = D_8018C3F0; - do { - temp_s0 = *var_s2; - if (temp_s0 != -1) { - temp_s1 = &D_80165C18[temp_s0]; + sp44 = &camera1[cameraId]; + func_80046E60(d_course_frappe_snowland_snow_tlut, d_course_frappe_snowland_snow, 0x00000020, 0x00000020); + for (someIndex = 0; someIndex < D_8018C3F0_SIZE; someIndex++) { + objectIndex = D_8018C3F0[someIndex]; + if (objectIndex != -1) { + temp_s1 = &D_80165C18[objectIndex]; if (temp_s1->unk_0A6 > 0) { - func_8008A364(temp_s0, arg0, 0x2AABU, 0x000001F4); - if (func_8007223C(temp_s0, 0x00040000) != 0) { - temp_s1->unk_0B2[1] = func_800418AC(temp_s1->unk_004[0], temp_s1->unk_004[2], sp44->pos); - func_80043104(temp_s0); - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; - temp_v1->words.w1 = (u32) D_0D0069E0; - temp_v1->words.w0 = 0x06000000; + func_8008A364(objectIndex, cameraId, 0x2AABU, 0x000001F4); + if (func_8007223C(objectIndex, 0x00040000) != 0) { + temp_s1->unk_0B2[1] = func_800418AC(temp_s1->pos[0], temp_s1->pos[2], sp44->pos); + func_80043104(objectIndex); + gSPDisplayList(gDisplayListHead++, D_0D0069E0); } } } - var_s2 += 4; - } while (var_s2 != &D_8018C5F0); - temp_v1_2 = gDisplayListHead; - gDisplayListHead = temp_v1_2 + 8; - temp_v1_2->words.w0 = 0xBB000000; - temp_v1_2->words.w1 = 0x00010001; + } + gSPTexture(gDisplayListHead++, 1, 1, 0, G_TX_RENDERTILE, G_OFF); } -#else -GLOBAL_ASM("asm/non_matchings/hud_renderer/func_80052F20.s") -#endif void func_8005309C(s32 cameraId) { s32 var_s4; @@ -4446,15 +4416,15 @@ void func_8005309C(s32 cameraId) { func_8008A364(temp_s1, cameraId, 0x2AABU, 0x00000258); if (func_8007223C(temp_s1, 0x00040000) != 0) { D_80183E80[0] = (s16) D_80165C18[temp_s1].unk_0B2[0]; - D_80183E80[1] = func_800418AC(D_80165C18[temp_s1].unk_004[0], D_80165C18[temp_s1].unk_004[2], camera->pos); + D_80183E80[1] = func_800418AC(D_80165C18[temp_s1].pos[0], D_80165C18[temp_s1].pos[2], camera->pos); D_80183E80[2] = (u16) D_80165C18[temp_s1].unk_0B2[2]; if (func_8007223C(temp_s1, 0x00000010) != 0) { - func_800480B4(D_80165C18[temp_s1].unk_004, (u16 *) D_80183E80, D_80165C18[temp_s1].unk_000, (u8 *) D_80165C18[temp_s1].unk_060, D_80165C18[temp_s1].unk_064, D_80165C18[temp_s1].unk_074, 0x00000040, 0x00000040, 0x00000040, 0x00000020); + func_800480B4(D_80165C18[temp_s1].pos, (u16 *) D_80183E80, D_80165C18[temp_s1].sizeScaling, (u8 *) D_80165C18[temp_s1].activeTLUT, D_80165C18[temp_s1].activeTexture, D_80165C18[temp_s1].unk_074, 0x00000040, 0x00000040, 0x00000040, 0x00000020); } temp_s1 = D_80183F28[var_s4]; D_80183E80[0] = (s16) D_80165C18[temp_s1].unk_0B2[0]; D_80183E80[2] = (u16) D_80165C18[temp_s1].unk_0B2[2]; - func_800480B4(D_80165C18[temp_s1].unk_004, (u16 *) D_80183E80, D_80165C18[temp_s1].unk_000, (u8 *) D_80165C18[temp_s1].unk_060, D_80165C18[temp_s1].unk_064, D_80165C18[temp_s1].unk_074, 0x00000040, 0x00000040, 0x00000040, 0x00000020); + func_800480B4(D_80165C18[temp_s1].pos, (u16 *) D_80183E80, D_80165C18[temp_s1].sizeScaling, (u8 *) D_80165C18[temp_s1].activeTLUT, D_80165C18[temp_s1].activeTexture, D_80165C18[temp_s1].unk_074, 0x00000040, 0x00000040, 0x00000040, 0x00000020); } } } @@ -4465,61 +4435,41 @@ void func_8005327C(s32 arg0) { func_80052F20(arg0); } -#ifdef MIPS_TO_C -//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b -extern ? D_80183DB8; -extern ? D_8018C0B0; -extern void *D_8018CF14; - void func_800532A4(s32 cameraId) { - s32 sp44; - Camera *temp_s1; + s32 stackPadding; + Camera *camera; f32 var_f0; f32 var_f2; - s32 temp_a0; - struct_80165C18_entry *temp_s0; - u8 temp_v0; - u8 temp_v0_2; - u8 temp_v1; - u8 temp_v1_2; - void *temp_v0_3; + s32 objectIndex; + struct_80165C18_entry *object; - temp_a0 = *(&D_80183DB8 + (cameraId * 4)); - sp44 = temp_a0; - temp_s1 = &camera1[cameraId]; - if (func_8007223C(temp_a0, 0x00000010) != 0) { - temp_s0 = &D_80165C18[sp44]; - temp_s0->unk_0B2 = 0; - temp_s0->unk_0B4 = func_800418AC(temp_s0->unk_004[0], temp_s0->unk_004[2], temp_s1->pos); - temp_s0->unk_0B6 = 0x8000; - if (func_80072354(sp44, 2) != 0) { - temp_v1 = temp_s0->unk_0DA; - temp_v0 = temp_s0->unk_0D9; - func_800480B4((s32) temp_s0->unk_004, (s32) &temp_s0->unk_0B2, temp_s0->unk_000, (s32) temp_s0->unk_060, (s32) temp_s0->unk_064, (Vtx *) temp_s0->unk_074, (s32) temp_v0, (s32) temp_v1, (s32) temp_v0, (s32) temp_v1 / 2); + objectIndex = D_80183DB8[cameraId]; + camera = &camera1[cameraId]; + if (func_8007223C(objectIndex, 0x00000010) != 0) { + object = &D_80165C18[objectIndex]; + object->unk_0B2[0] = 0; + object->unk_0B2[1] = func_800418AC(object->pos[0], object->pos[2], camera->pos); + object->unk_0B2[2] = 0x8000; + if (func_80072354(objectIndex, 2) != 0) { + func_800480B4(object->pos, object->unk_0B2, object->sizeScaling, (u8 *) object->activeTLUT, object->activeTexture, object->unk_074, (s32) object->textureWidth, (s32) object->textureHeight, (s32) object->textureWidth, (s32) object->textureHeight / 2); } else { - temp_v1_2 = temp_s0->unk_0DA; - temp_v0_2 = temp_s0->unk_0D9; - func_800485C4((s32) temp_s0->unk_004, (s32) &temp_s0->unk_0B2, temp_s0->unk_000, (s32) temp_s0->unk_0A0, (s32) temp_s0->unk_060, (s32) temp_s0->unk_064, (Vtx *) temp_s0->unk_074, (s32) temp_v0_2, (s32) temp_v1_2, (s32) temp_v0_2, (s32) temp_v1_2 / 2); + func_800485C4(object->pos, object->unk_0B2, object->sizeScaling, (s32) object->unk_0A0, (u8 *) object->activeTLUT, object->activeTexture, object->unk_074, (s32) object->textureWidth, (s32) object->textureHeight, (s32) object->textureWidth, (s32) object->textureHeight / 2); } if (gScreenModeSelection == 0) { - temp_v0_3 = D_8018CF14; - var_f0 = temp_s0->unk_004[0] - temp_v0_3->unk0; - var_f2 = temp_s0->unk_004[2] - temp_v0_3->unk8; + var_f0 = object->pos[0] - D_8018CF14->pos[0]; + var_f2 = object->pos[2] - D_8018CF14->pos[2]; if (var_f0 < 0.0f) { var_f0 = -var_f0; } if (var_f2 < 0.0f) { var_f2 = -var_f2; } - if ((f64) (var_f0 + var_f2) <= 200.0) { - func_8004A630((cameraId << 6) + &D_8018C0B0, temp_s0->unk_004, 0.35f); + if ((var_f0 + var_f2) <= 200.0) { + func_8004A630(&D_8018C0B0[cameraId], object->pos, 0.35f); } } } } -#else -GLOBAL_ASM("asm/non_matchings/hud_renderer/func_800532A4.s") -#endif #ifdef MIPS_TO_C //generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b @@ -4574,29 +4524,22 @@ GLOBAL_ASM("asm/non_matchings/hud_renderer/func_800534E8.s") void func_800536C8(s32 objectIndex) { if ((D_80165C18[objectIndex].unk_0A6 >= 2) && (func_80072354(objectIndex, 0x00000040) != 0)) { func_8004A7AC(objectIndex, 1.75f); - func_80042E00(D_80165C18[objectIndex].unk_004, D_80165C18[objectIndex].unk_0B2, D_80165C18[objectIndex].unk_000); + func_80042E00(D_80165C18[objectIndex].pos, D_80165C18[objectIndex].unk_0B2, D_80165C18[objectIndex].sizeScaling); func_800534E8(objectIndex); gSPDisplayList(gDisplayListHead++, D_0D007828); gDPSetTextureLUT(gDisplayListHead++, G_TT_RGBA16); gDPLoadTLUT_pal256(gDisplayListHead++, gTLUTWhomp); - func_8004544C(D_80165C18[objectIndex].unk_064, 0x00000010, 0x00000040, 4); + func_8004544C(D_80165C18[objectIndex].activeTexture, 0x00000010, 0x00000040, 4); gSPDisplayList(gDisplayListHead++, D_80165C18[objectIndex].unk_070); } } #ifdef MIPS_TO_C -//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b +//generated by m2c commit b52d92c2340f6f4ba1aafb464188bb698752fbb0 on Jul-27-2023 ? func_800534A4(s32); /* extern */ -? func_800536C8(s32); /* extern */ -extern s8 d_course_bowsers_castle_thwomp_side; -extern s16 D_80165750; -extern s16 D_80183E80; -extern s32 D_8018C3F0; extern ? D_8018C5F0; -extern s32 D_8018C630; -extern ? D_8018C830; -extern s32 gGamestate; -static ? D_800E4668; /* unable to generate initializer */ +extern u8 d_course_bowsers_castle_thwomp_side; +Lights1 D_800E4668; /* unable to generate initializer */ static ? D_800E4670; /* unable to generate initializer */ void func_80053870(s32 cameraId) { @@ -4694,14 +4637,14 @@ void func_80053870(s32 cameraId) { temp_v0_9->words.w0 = 0xB7000000; temp_v0_9->words.w1 = 0x00020204; func_80043D50(&d_course_bowsers_castle_thwomp_side, 0x00000020, 0x00000020); - var_a3 = &D_8018C630; + var_a3 = D_8018C630; do { temp_s1_3 = *var_a3; if (temp_s1_3 != -1) { temp_s0 = &D_80165C18[temp_s1_3]; if ((temp_s0->unk_0A6 > 0) && (temp_s0->unk_0D5 == 3) && (D_8018D120 < 0x2EF)) { sp44 = var_a3; - func_80042E00(temp_s0->unk_004, (s16 *) &temp_s0->unk_0B2, temp_s0->unk_000); + func_80042E00(temp_s0->pos, temp_s0->unk_0B2, temp_s0->sizeScaling); temp_v0_10 = gDisplayListHead; gDisplayListHead = temp_v0_10 + 8; temp_v0_10->words.w0 = 0x04000C2F; @@ -4732,17 +4675,17 @@ void func_80053870(s32 cameraId) { temp_v0_15->words.w1 = (u32) D_0D007AE0; func_800444B0(D_8018D490, 0x00000020, 0x00000020); func_8004B3C8(0); - D_80183E80.unk0 = 0; - D_80183E80.unk4 = 0x8000; - var_s3 = &D_8018C3F0; + D_80183E80->unk0 = 0; + D_80183E80->unk4 = 0x8000; + var_s3 = D_8018C3F0; do { temp_s1_4 = *var_s3; if (temp_s1_4 != -1) { temp_s0_2 = &D_80165C18[temp_s1_4]; if ((temp_s0_2->unk_0A6 >= 2) && (temp_s0_2->unk_0D5 == 2) && (D_8018D120 < 0x2EF)) { func_8004B138(0x000000FF, 0x000000FF, 0x000000FF, (s32) temp_s0_2->unk_0A0); - D_80183E80.unk2 = func_800418AC(temp_s0_2->unk_004[0], temp_s0_2->unk_004[2], sp84->pos); - func_800431B0(temp_s0_2->unk_004, &D_80183E80, temp_s0_2->unk_000, D_0D005AE0); + D_80183E80->unk2 = func_800418AC(temp_s0_2->pos[0], temp_s0_2->pos[2], sp84->pos); + func_800431B0(temp_s0_2->pos, D_80183E80, temp_s0_2->sizeScaling, D_0D005AE0); } } var_s3 += 4; @@ -4758,7 +4701,7 @@ void func_80053D74(s32 objectIndex, UNUSED s32 arg1, s32 vertexIndex) { if (D_8018D120 < 0x2EF) { temp_v0 = &D_80165C18[objectIndex]; D_80183E80[2] = (s16) (temp_v0->unk_084[6] + 0x8000); - func_80042E00(temp_v0->unk_004, (u16 *) D_80183E80, temp_v0->unk_000); + func_80042E00(temp_v0->pos, (u16 *) D_80183E80, temp_v0->sizeScaling); func_8004B1C8((s32) temp_v0->unk_084[0], (s32) temp_v0->unk_084[1], (s32) temp_v0->unk_084[2], (s32) temp_v0->unk_084[3], (s32) temp_v0->unk_084[4], (s32) temp_v0->unk_084[5], (s32) temp_v0->unk_0A0); gSPVertex(gDisplayListHead++, &D_0D0060B0[vertexIndex], 4, 0); gSPDisplayList(gDisplayListHead++, D_0D006940); @@ -4854,8 +4797,8 @@ void func_800540CC(s32 objectIndex, s32 cameraId) { if (objectIndex != -1) { if ((D_80165C18[objectIndex].unk_0A6 >= 2) && (D_80165C18[objectIndex].unk_0D5 == 1) && (D_8018D120 < 0x2EF)) { func_8004B1C8((s32) D_80165C18[objectIndex].unk_0A4, (s32) D_80165C18[objectIndex].unk_0A4, (s32) D_80165C18[objectIndex].unk_0A4, 0, 0, 0, (s32) D_80165C18[objectIndex].unk_0A0); - D_80183E80[1] = func_800418AC(D_80165C18[objectIndex].unk_004[0], D_80165C18[objectIndex].unk_004[2], camera->pos); - func_800431B0(D_80165C18[objectIndex].unk_004, D_80183E80, D_80165C18[objectIndex].unk_000, D_0D005AE0); + D_80183E80[1] = func_800418AC(D_80165C18[objectIndex].pos[0], D_80165C18[objectIndex].pos[2], camera->pos); + func_800431B0(D_80165C18[objectIndex].pos, D_80183E80, D_80165C18[objectIndex].sizeScaling, D_0D005AE0); } } } @@ -4909,8 +4852,8 @@ void func_80054324(s32 objectIndex, s32 cameraId) { if (objectIndex != -1) { if ((D_80165C18[objectIndex].unk_0A6 >= 2) && (D_80165C18[objectIndex].unk_0D5 == 6) && (D_8018D120 < 0x2EF)) { func_8004B1C8((s32) D_80165C18[objectIndex].unk_0A4, (s32) D_80165C18[objectIndex].unk_0A4, (s32) D_80165C18[objectIndex].unk_0A4, D_80165C18[objectIndex].unk_0A2, D_80165C18[objectIndex].unk_0A2, D_80165C18[objectIndex].unk_0A2, (s32) D_80165C18[objectIndex].unk_0A0); - D_80183E80[1] = func_800418AC(D_80165C18[objectIndex].unk_004[0], D_80165C18[objectIndex].unk_004[2], camera->pos); - func_800431B0(D_80165C18[objectIndex].unk_004, D_80183E80, D_80165C18[objectIndex].unk_000, D_0D005AE0); + D_80183E80[1] = func_800418AC(D_80165C18[objectIndex].pos[0], D_80165C18[objectIndex].pos[2], camera->pos); + func_800431B0(D_80165C18[objectIndex].pos, D_80183E80, D_80165C18[objectIndex].sizeScaling, D_0D005AE0); } } } @@ -4969,38 +4912,27 @@ void func_8005457C(s32 objectIndex, s32 cameraId) { } else { func_8004B138(0x000000FF, (s32) temp_s0->unk_0A4, 0, (s32) temp_s0->unk_0A0); } - D_80183E80[1] = func_800418AC(temp_s0->unk_004[0], temp_s0->unk_004[2], camera->pos); - func_800431B0(temp_s0->unk_004, D_80183E80, temp_s0->unk_000, D_0D005AE0); + D_80183E80[1] = func_800418AC(temp_s0->pos[0], temp_s0->pos[2], camera->pos); + func_800431B0(temp_s0->pos, D_80183E80, temp_s0->sizeScaling, D_0D005AE0); } } -#ifdef MIPS_TO_C -//generated by m2c commit d9d3d6575355663122de59f6b2882d8f174e2355 on Dec-28-2022 -void func_80054664(s32 arg0) { - Gfx *temp_v1; - s32 *var_s0; - s32 temp_a0; +void func_80054664(s32 cameraId) { + s32 var_s0; + s32 objectIndex; - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; - temp_v1->words.w0 = 0x06000000; - temp_v1->words.w1 = (u32) D_0D007AE0; - func_8004477C((D_80165598 << 0xA) + D_0D02BC58, 0x00000020, 0x00000020); + gSPDisplayList(gDisplayListHead++, D_0D007AE0); + func_8004477C(D_0D02BC58[D_80165598], 0x00000020, 0x00000020); func_8004B414(0, 0, 0, 0x000000FF); - D_80183E80->unk0 = 0; - D_80183E80->unk4 = 0x8000; - var_s0 = D_8018C1B0; - do { - temp_a0 = *var_s0; - if ((temp_a0 != -1) && (D_80165C18[temp_a0].unk_0A6 >= 3)) { - func_8005457C(temp_a0, arg0); + D_80183E80[0] = 0; + D_80183E80[2] = 0x8000; + for (var_s0 = 0; var_s0 < D_8018C1B0_SIZE; var_s0++) { + objectIndex = D_8018C1B0[var_s0]; + if ((objectIndex != -1) && (D_80165C18[objectIndex].unk_0A6 >= 3)) { + func_8005457C(objectIndex, cameraId); } - var_s0 += 4; - } while (var_s0 != &D_8018C3B0); + } } -#else -GLOBAL_ASM("asm/non_matchings/hud_renderer/func_80054664.s") -#endif void func_8005477C(s32 objectIndex, u8 arg1, Vec3f arg2) { if (D_8018D120 < 0x2EF) { @@ -5020,58 +4952,48 @@ void func_8005477C(s32 objectIndex, u8 arg1, Vec3f arg2) { default: break; } - D_80183E80[1] = func_800418AC(D_80165C18[objectIndex].unk_004[0], D_80165C18[objectIndex].unk_004[2], arg2); - func_800431B0(D_80165C18[objectIndex].unk_004, D_80183E80, D_80165C18[objectIndex].unk_000, D_0D005AE0); + D_80183E80[1] = func_800418AC(D_80165C18[objectIndex].pos[0], D_80165C18[objectIndex].pos[2], arg2); + func_800431B0(D_80165C18[objectIndex].pos, D_80183E80, D_80165C18[objectIndex].sizeScaling, D_0D005AE0); } } -#ifdef MIPS_TO_C -//generated by m2c commit d9d3d6575355663122de59f6b2882d8f174e2355 on Dec-28-2022 void func_80054938(s32 cameraId) { + s32 stackPadding[2]; Camera *sp54; - Gfx *temp_v1; - s32 *var_s2; - s32 temp_s0; - struct_80165C18_entry *temp_s1; + s32 var_s0; + s32 objectIndex; + struct_80165C18_entry *object; - temp_v1 = gDisplayListHead; sp54 = &camera1[cameraId]; - gDisplayListHead = temp_v1 + 8; - temp_v1->words.w0 = 0x06000000; - temp_v1->words.w1 = (u32) D_0D007AE0; - func_8004477C((D_80165598 << 0xA) + D_0D02BC58, 0x00000020, 0x00000020); + gSPDisplayList(gDisplayListHead++, D_0D007AE0); + func_8004477C(D_0D02BC58[D_80165598], 0x00000020, 0x00000020); func_8004B72C(0x000000FF, 0x000000FF, 0x000000FF, 0x000000FF, 0x000000FF, 0x000000FF, 0x000000FF); - D_80183E80->unk0 = 0; - D_80183E80->unk4 = 0x8000; - var_s2 = D_8018C870; - do { - temp_s0 = *var_s2; - if (temp_s0 != -1) { - temp_s1 = &D_80165C18[temp_s0]; - if (temp_s1->unk_0A6 >= 2) { - if ((u8) temp_s1->unk_0D8 == 3) { - func_8008A364(temp_s0, cameraId, 0x4000U, 0x00000514); + D_80183E80[0] = 0; + D_80183E80[2] = 0x8000; + for (var_s0 = 0; var_s0 < D_8018C870_SIZE; var_s0++) { + objectIndex = D_8018C870[var_s0]; + if (objectIndex != -1) { + object = &D_80165C18[objectIndex]; + if (object->unk_0A6 >= 2) { + if (object->unk_0D8 == 3) { + func_8008A364(objectIndex, cameraId, 0x4000U, 0x00000514); } else { - func_8008A364(temp_s0, cameraId, 0x4000U, 0x000001F4); + func_8008A364(objectIndex, cameraId, 0x4000U, 0x000001F4); } - if (func_8007223C(temp_s0, 0x00040000) != 0) { - func_8005477C(temp_s0, (u8) temp_s1->unk_0D8, sp54->pos); + if (func_8007223C(objectIndex, 0x00040000) != 0) { + func_8005477C(objectIndex, object->unk_0D8, sp54->pos); } } } - var_s2 += 4; - } while (var_s2 != D_8018C970); + } } -#else -GLOBAL_ASM("asm/non_matchings/hud_renderer/func_80054938.s") -#endif void func_80054AFC(s32 objectIndex, Vec3f arg1) { - D_80183E80[0] = func_800418E8(D_80165C18[objectIndex].unk_004[2], D_80165C18[objectIndex].unk_004[1], arg1); - D_80183E80[1] = func_800418AC(D_80165C18[objectIndex].unk_004[0], D_80165C18[objectIndex].unk_004[2], arg1); + D_80183E80[0] = func_800418E8(D_80165C18[objectIndex].pos[2], D_80165C18[objectIndex].pos[1], arg1); + D_80183E80[1] = func_800418AC(D_80165C18[objectIndex].pos[0], D_80165C18[objectIndex].pos[2], arg1); D_80183E80[2] = (u16) D_80165C18[objectIndex].unk_0B2[2]; func_8004B138((s32) D_80165C18[objectIndex].unk_084[0], (s32) D_80165C18[objectIndex].unk_084[1], (s32) D_80165C18[objectIndex].unk_084[2], (s32) D_80165C18[objectIndex].unk_0A0); - func_80042E00(D_80165C18[objectIndex].unk_004, (u16 *) D_80183E80, D_80165C18[objectIndex].unk_000); + func_80042E00(D_80165C18[objectIndex].pos, (u16 *) D_80183E80, D_80165C18[objectIndex].sizeScaling); gSPVertex(gDisplayListHead++, D_0D005AE0, 4, 0); gSPDisplayList(gDisplayListHead++, D_0D006940); } @@ -5115,9 +5037,9 @@ void func_80054D00(s32 objectIndex, s32 cameraId) { func_8008A364(objectIndex, cameraId, 0x2AABU, 0x0000012C); if (func_8007223C(objectIndex, 0x00040000) != 0) { D_80183E80[0] = (s16) D_80165C18[objectIndex].unk_0B2[0]; - D_80183E80[1] = func_800418AC(D_80165C18[objectIndex].unk_004[0], D_80165C18[objectIndex].unk_004[2], camera->pos); + D_80183E80[1] = func_800418AC(D_80165C18[objectIndex].pos[0], D_80165C18[objectIndex].pos[2], camera->pos); D_80183E80[2] = (u16) D_80165C18[objectIndex].unk_0B2[2]; - func_80048130(D_80165C18[objectIndex].unk_004, (u16 *) D_80183E80, D_80165C18[objectIndex].unk_000, (u8 *) D_80165C18[objectIndex].unk_060, D_80165C18[objectIndex].unk_064, D_0D0062B0, 0x00000020, 0x00000040, 0x00000020, 0x00000040, 5); + func_80048130(D_80165C18[objectIndex].pos, (u16 *) D_80183E80, D_80165C18[objectIndex].sizeScaling, (u8 *) D_80165C18[objectIndex].activeTLUT, D_80165C18[objectIndex].activeTexture, D_0D0062B0, 0x00000020, 0x00000040, 0x00000020, 0x00000040, 5); } } } @@ -5125,13 +5047,13 @@ void func_80054D00(s32 objectIndex, s32 cameraId) { void func_80054E10(s32 objectIndex) { if (D_80165C18[objectIndex].unk_0A6 > 0) { if (func_8007223C(objectIndex, 0x00800000) != 0) { - D_80183E50[0] = D_80165C18[objectIndex].unk_004[0]; + D_80183E50[0] = D_80165C18[objectIndex].pos[0]; D_80183E50[1] = D_80165C18[objectIndex].unk_044 + 0.8; - D_80183E50[2] = D_80165C18[objectIndex].unk_004[2]; + D_80183E50[2] = D_80165C18[objectIndex].pos[2]; D_80183E70[0] = D_80165C18[objectIndex].unk_038[0]; D_80183E70[1] = D_80165C18[objectIndex].unk_038[1]; D_80183E70[2] = D_80165C18[objectIndex].unk_038[2]; - func_8004A9B8(D_80165C18[objectIndex].unk_000); + func_8004A9B8(D_80165C18[objectIndex].sizeScaling); } } } @@ -5160,7 +5082,7 @@ void func_80054F04(s32 cameraId) { if (object->unk_0A6 > 0) { func_8008A364(objectIndex, cameraId, 0x2AABU, 0x000000C8); if ((func_8007223C(objectIndex, 0x00040000) != 0) && (D_8018D120 < 0x2EF)) { - object->unk_0B2[1] = func_800418AC(object->unk_004[0], object->unk_004[2], sp44->pos); + object->unk_0B2[1] = func_800418AC(object->pos[0], object->pos[2], sp44->pos); func_80043104(objectIndex); gSPDisplayList(gDisplayListHead++, D_0D006980); } @@ -5185,86 +5107,42 @@ void func_800550A4(s32 arg0) { func_80054F04(arg0); } -#ifdef MIPS_TO_C -//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b -s16 func_80004DFC(s32, s32, ?, s16); /* extern */ - void func_80055164(s32 objectIndex) { - struct_80165C18_entry *sp18; - Gfx *temp_a3; - struct_80165C18_entry *temp_v1; - - temp_v1 = &D_80165C18[objectIndex]; - if (temp_v1->unk_0A6 >= 2) { - temp_a3 = gDisplayListHead; - gDisplayListHead = temp_a3 + 8; - temp_a3->words.w0 = 0x06000000; - temp_a3->words.w1 = (u32) D_0D0077A0; - sp18 = temp_v1; - func_80042E00(temp_v1->unk_004, (s16 *) temp_v1->unk_0BE, temp_v1->unk_000); + if (D_80165C18[objectIndex].unk_0A6 >= 2) { + gSPDisplayList(gDisplayListHead++, D_0D0077A0); + func_80042E00(D_80165C18[objectIndex].pos, D_80165C18[objectIndex].unk_0BE, D_80165C18[objectIndex].sizeScaling); if (gIsGamePaused == 0) { - sp18 = temp_v1; - temp_v1->unk_0A2 = func_80004DFC(temp_v1->unk_070, temp_v1->unk_074, 0, temp_v1->unk_0A2); - return; + D_80165C18[objectIndex].unk_0A2 = func_80004DFC((animation_type_1 *) D_80165C18[objectIndex].unk_070, (animation_type_2 **) D_80165C18[objectIndex].unk_074, 0, D_80165C18[objectIndex].unk_0A2); + } else { + func_80004DFC((animation_type_1 *) D_80165C18[objectIndex].unk_070, (animation_type_2 **) D_80165C18[objectIndex].unk_074, 0, D_80165C18[objectIndex].unk_0A2); } - func_80004DFC(temp_v1->unk_070, temp_v1->unk_074, 0, temp_v1->unk_0A2); } } -#else -GLOBAL_ASM("asm/non_matchings/hud_renderer/func_80055164.s") -#endif -#ifdef MIPS_TO_C -//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b -? func_80055164(s32); /* extern */ -extern ? D_80183EB0; - -void func_80055228(s32 arg0) { - s32 *var_s1; +void func_80055228(s32 cameraId) { + s32 var_s1; s32 temp_s0; - var_s1 = D_80183EA0; - do { - temp_s0 = *var_s1; - func_8008A364(temp_s0, arg0, 0x4000U, 0x000005DC); + for (var_s1 = 0; var_s1 < 4; var_s1++) { + temp_s0 = D_80183EA0[var_s1]; + func_8008A364(temp_s0, cameraId, 0x4000U, 0x000005DC); if (func_8007223C(temp_s0, 0x00040000) != 0) { func_80055164(temp_s0); } - var_s1 += 4; - } while (var_s1 != &D_80183EB0); -} -#else -GLOBAL_ASM("asm/non_matchings/hud_renderer/func_80055228.s") -#endif - -#ifdef MIPS_TO_C -//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b -s16 func_80004DFC(s32, s32, ?, s16); /* extern */ - -void func_800552BC(s32 objectIndex) { - struct_80165C18_entry *sp18; - Gfx *temp_a0; - struct_80165C18_entry *temp_v1; - - temp_v1 = &D_80165C18[objectIndex]; - if (temp_v1->unk_0A6 >= 2) { - sp18 = temp_v1; - func_80042E00(temp_v1->unk_004, (s16 *) temp_v1->unk_0BE, temp_v1->unk_000); - temp_a0 = gDisplayListHead; - gDisplayListHead = temp_a0 + 8; - temp_a0->words.w0 = 0x06000000; - temp_a0->words.w1 = (u32) D_0D0077D0; - if (gIsGamePaused == 0) { - sp18 = temp_v1; - temp_v1->unk_0A2 = func_80004DFC(temp_v1->unk_070, temp_v1->unk_074, 0, temp_v1->unk_0A2); - return; - } - func_80004DFC(temp_v1->unk_070, temp_v1->unk_074, 0, temp_v1->unk_0A2); } } -#else -GLOBAL_ASM("asm/non_matchings/hud_renderer/func_800552BC.s") -#endif + +void func_800552BC(s32 objectIndex) { + if (D_80165C18[objectIndex].unk_0A6 >= 2) { + func_80042E00(D_80165C18[objectIndex].pos, D_80165C18[objectIndex].unk_0BE, D_80165C18[objectIndex].sizeScaling); + gSPDisplayList(gDisplayListHead++, D_0D0077D0); + if (gIsGamePaused == 0) { + D_80165C18[objectIndex].unk_0A2 = func_80004DFC((animation_type_1 *) D_80165C18[objectIndex].unk_070, (animation_type_2 **) D_80165C18[objectIndex].unk_074, 0, D_80165C18[objectIndex].unk_0A2); + } else { + func_80004DFC((animation_type_1 *) D_80165C18[objectIndex].unk_070, (animation_type_2 **) D_80165C18[objectIndex].unk_074, 0, D_80165C18[objectIndex].unk_0A2); + } + } +} extern s8 D_80165908; @@ -5290,8 +5168,8 @@ void func_80055458(s32 objectIndex, s32 cameraId) { if (D_80165C18[objectIndex].unk_0A6 >= 2) { camera = &camera1[cameraId]; func_8004A6EC(objectIndex, 0.5f); - D_80165C18[objectIndex].unk_0B2[1] = func_800418AC(D_80165C18[objectIndex].unk_004[0], D_80165C18[objectIndex].unk_004[2], camera->pos); - func_800480B4(D_80165C18[objectIndex].unk_004, D_80165C18[objectIndex].unk_0B2, D_80165C18[objectIndex].unk_000, (u8 *) D_80165C18[objectIndex].unk_060, D_80165C18[objectIndex].unk_064, D_0D0060B0, 0x00000040, 0x00000040, 0x00000040, 0x00000020); + D_80165C18[objectIndex].unk_0B2[1] = func_800418AC(D_80165C18[objectIndex].pos[0], D_80165C18[objectIndex].pos[2], camera->pos); + func_800480B4(D_80165C18[objectIndex].pos, D_80165C18[objectIndex].unk_0B2, D_80165C18[objectIndex].sizeScaling, (u8 *) D_80165C18[objectIndex].activeTLUT, D_80165C18[objectIndex].activeTexture, D_0D0060B0, 0x00000040, 0x00000040, 0x00000040, 0x00000020); } } @@ -5314,8 +5192,8 @@ void func_800555BC(s32 objectIndex, s32 cameraId) { if (D_80165C18[objectIndex].unk_0A6 >= 2) { camera = &camera1[cameraId]; func_8004A870(objectIndex, 0.7f); - D_80165C18[objectIndex].unk_0B2[1] = func_800418AC(D_80165C18[objectIndex].unk_004[0], D_80165C18[objectIndex].unk_004[2], camera->pos); - func_800480B4(D_80165C18[objectIndex].unk_004, D_80165C18[objectIndex].unk_0B2, D_80165C18[objectIndex].unk_000, (u8 *) D_80165C18[objectIndex].unk_060, D_80165C18[objectIndex].unk_064, (Vtx *) D_80165C18[objectIndex].unk_074, 64, 64, 64, 32); + D_80165C18[objectIndex].unk_0B2[1] = func_800418AC(D_80165C18[objectIndex].pos[0], D_80165C18[objectIndex].pos[2], camera->pos); + func_800480B4(D_80165C18[objectIndex].pos, D_80165C18[objectIndex].unk_0B2, D_80165C18[objectIndex].sizeScaling, (u8 *) D_80165C18[objectIndex].activeTLUT, D_80165C18[objectIndex].activeTexture, (Vtx *) D_80165C18[objectIndex].unk_074, 64, 64, 64, 32); } } @@ -5348,17 +5226,8 @@ UNUSED void func_800557AC() { } -#ifdef MIPS_TO_C -//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b -? func_80004DFC(s32, s32, u8, s8); /* extern */ - void func_800557B4(s32 objectIndex, u32 arg1, u32 arg2) { - f32 sp3C; - f32 sp38; - f32 sp34; - Gfx *sp20; - Gfx *temp_v1; - Gfx *temp_v1_2; + Vec3f sp34; struct_80165C18_entry *temp_s0; temp_s0 = &D_80165C18[objectIndex]; @@ -5366,159 +5235,100 @@ void func_800557B4(s32 objectIndex, u32 arg1, u32 arg2) { if (func_8007223C(objectIndex, 0x00000020) != 0) { if (func_80072320(objectIndex, 4) != 0) { if (arg2 >= arg1) { - sp34 = temp_s0->unk_004[0]; - sp3C = temp_s0->unk_004[2]; - sp38 = (f32) ((f64) temp_s0->unk_004[1] - 1.0); - func_80042F70(&sp34, &temp_s0->unk_0B2, temp_s0->unk_000); - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; - temp_v1->words.w0 = 0x06000000; - temp_v1->words.w1 = (u32) D_0D0077D0; - func_80004DFC(temp_s0->unk_070, temp_s0->unk_074, (u8) temp_s0->unk_0D8, temp_s0->unk_0D2); + sp34[0] = temp_s0->pos[0]; + sp34[1] = temp_s0->pos[1] - 1.0; + sp34[2] = temp_s0->pos[2]; + func_80042F70(sp34, temp_s0->unk_0B2, temp_s0->sizeScaling); + gSPDisplayList(gDisplayListHead++, D_0D0077D0); + func_80004DFC((animation_type_1 *) temp_s0->unk_070, (animation_type_2 **) temp_s0->unk_074, (s16) temp_s0->unk_0D8, (s16) temp_s0->unk_0D2); } } else if (arg1 < 0x15F91U) { func_8004A7AC(objectIndex, 1.5f); } } - sp20 = D_0D0077D0; - func_80042E00(temp_s0->unk_004, (s16 *) &temp_s0->unk_0B2, temp_s0->unk_000); - temp_v1_2 = gDisplayListHead; - gDisplayListHead = temp_v1_2 + 8; - temp_v1_2->words.w0 = 0x06000000; - temp_v1_2->words.w1 = (u32) sp20; - func_80004DFC(temp_s0->unk_070, temp_s0->unk_074, (u8) temp_s0->unk_0D8, temp_s0->unk_0D2); + func_80042E00(temp_s0->pos, temp_s0->unk_0B2, temp_s0->sizeScaling); + gSPDisplayList(gDisplayListHead++, D_0D0077D0); + func_80004DFC((animation_type_1 *) temp_s0->unk_070, (animation_type_2 **) temp_s0->unk_074, (s16) temp_s0->unk_0D8, (s16) temp_s0->unk_0D2); } } -#else -GLOBAL_ASM("asm/non_matchings/hud_renderer/func_800557B4.s") -#endif -#ifdef MIPS_TO_C -//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b -? func_800557B4(s32, u32, ?); /* extern */ -extern ? D_80183EDC; - -void func_8005592C(s32 arg0) { - ? var_s3; - s32 *var_s2; - s32 temp_s0; - s32 temp_v0; +void func_8005592C(s32 cameraId) { + s32 var_s2; + s32 objectIndex; + s32 temp_s1; s32 var_a3; - s32 var_s1; - u32 temp_s1; + u16 var_s1; + u32 var_s3; - temp_v0 = gPlayerCountSelection1; - if (temp_v0 == 1) { - var_s3 = 0x3D090; - } else if (temp_v0 == 2) { - var_s3 = 0x27100; + if (gPlayerCountSelection1 == 1) { + var_s3 = 0x0003D090; + } else if (gPlayerCountSelection1 == 2) { + var_s3 = 0x00027100; } else { - var_s3 = 0x15F90; + var_s3 = 0x00015F90; } - var_s2 = D_80183EA0; - do { - temp_s0 = *var_s2; - if (D_80165C18[temp_s0].unk_0A6 >= 2) { + for (var_s2 = 0; var_s2 < 15; var_s2++) { + objectIndex = D_80183EA0[var_s2]; + if (D_80165C18[objectIndex].unk_0A6 >= 2) { if (gPlayerCountSelection1 == 1) { var_s1 = 0x4000; - if (var_s2 == D_80183EA0) { + if (var_s2 == 0) { var_a3 = 0x000005DC; - } else if (func_80072320(temp_s0, 8) != 0) { + } else if (func_80072320(objectIndex, 8) != 0) { var_a3 = 0x00000320; } else { var_a3 = 0x000003E8; } } else { - var_a3 = 0x00000258; - if (func_80072320(temp_s0, 8) != 0) { + if (func_80072320(objectIndex, 8) != 0) { var_a3 = 0x000001F4; var_s1 = 0x4000; } else { + var_a3 = 0x00000258; var_s1 = 0x5555; } } - temp_s1 = func_8008A364(temp_s0, arg0, var_s1 & 0xFFFF, var_a3); - if (func_8007223C(temp_s0, 0x00040000) != 0) { - func_800557B4(temp_s0, temp_s1, var_s3); + temp_s1 = func_8008A364(objectIndex, cameraId, var_s1, var_a3); + if (func_8007223C(objectIndex, 0x00040000) != 0) { + func_800557B4(objectIndex, (u32) temp_s1, var_s3); } } - var_s2 += 4; - } while (var_s2 != &D_80183EDC); -} -#else -GLOBAL_ASM("asm/non_matchings/hud_renderer/func_8005592C.s") -#endif - -#ifdef MIPS_TO_C -//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b -? func_80004DFC(s32, s32, ?, s8); /* extern */ -extern ? d_course_rainbow_road_sphere; -extern ? D_0D0062B0; -extern ? D_0D0077D0; -extern f32 D_80183E40; -extern s16 D_80183E80; - -void func_80055AB8(s32 objectIndex, s32 cameraId) { - Camera *sp3C; - struct_80165C18_entry *sp34; - Camera *temp_a2; - Gfx *temp_t0; - f32 temp_f12; - f32 temp_f14; - struct_80165C18_entry *temp_v1; - - temp_v1 = &D_80165C18[objectIndex]; - temp_a2 = &camera1[cameraId]; - if (temp_v1->unk_0A6 >= 2) { - sp34 = temp_v1; - sp3C = temp_a2; - if (func_8007223C(objectIndex, 0x00100000) != 0) { - temp_f12 = temp_v1->unk_004[0]; - temp_f14 = temp_v1->unk_004[2]; - D_80183E80.unk0 = 0; - D_80183E40.unk4 = (f32) ((f64) temp_v1->unk_004[1] + 16.0); - D_80183E40.unk0 = temp_f12; - D_80183E40.unk8 = temp_f14; - D_80183E80.unk2 = func_800418AC(temp_f12, temp_f14, temp_a2->pos); - D_80183E80.unk4 = 0x8000; - func_800468E0(&D_80183E40, &D_80183E80, 0.54f, (s32) &d_course_rainbow_road_sphere, (s32) &D_0D0062B0, 0x00000020, 0x00000040, 0x00000020, 0x00000040, 5); - return; - } - sp34 = temp_v1; - func_80042E00(temp_v1->unk_004, (s16 *) temp_v1->unk_0BE, temp_v1->unk_000); - temp_t0 = gDisplayListHead; - gDisplayListHead = temp_t0 + 8; - temp_t0->words.w0 = 0x06000000; - temp_t0->words.w1 = (u32) &D_0D0077D0; - func_80004DFC(temp_v1->unk_070, temp_v1->unk_074, 0, temp_v1->unk_0D2); } } -#else -GLOBAL_ASM("asm/non_matchings/hud_renderer/func_80055AB8.s") -#endif -#ifdef MIPS_TO_C -//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b -? func_80055AB8(s32, s32); /* extern */ -extern ? D_80183F34; +void func_80055AB8(s32 objectIndex, s32 cameraId) { + Camera *camera; -void func_80055C38(s32 arg0) { - s32 *var_s1; - s32 temp_s0; - - var_s1 = D_80183F28; - do { - temp_s0 = *var_s1; - func_8008A1D0(temp_s0, arg0, 0x000005DC, 0x000009C4); - if (func_8007223C(temp_s0, 0x00040000) != 0) { - func_80055AB8(temp_s0, arg0); + camera = &camera1[cameraId]; + if (D_80165C18[objectIndex].unk_0A6 >= 2) { + if (func_8007223C(objectIndex, 0x00100000) != 0) { + D_80183E40[0] = D_80165C18[objectIndex].pos[0]; + D_80183E40[1] = D_80165C18[objectIndex].pos[1] + 16.0; + D_80183E40[2] = D_80165C18[objectIndex].pos[2]; + D_80183E80[0] = 0; + D_80183E80[1] = func_800418AC(D_80165C18[objectIndex].pos[0], D_80165C18[objectIndex].pos[2], camera->pos); + D_80183E80[2] = 0x8000; + func_800468E0(D_80183E40, D_80183E80, 0.54f, d_course_rainbow_road_sphere, D_0D0062B0, 0x00000020, 0x00000040, 0x00000020, 0x00000040, 5); + } else { + func_80042E00(D_80165C18[objectIndex].pos, D_80165C18[objectIndex].unk_0BE, D_80165C18[objectIndex].sizeScaling); + gSPDisplayList(gDisplayListHead++, D_0D0077D0); + func_80004DFC((animation_type_1 *) D_80165C18[objectIndex].unk_070, (animation_type_2 **) D_80165C18[objectIndex].unk_074, 0, (s16) D_80165C18[objectIndex].unk_0D2); } - var_s1 += 4; - } while (var_s1 != &D_80183F34); + } +} + +void func_80055C38(s32 cameraId) { + s32 var_s1; + s32 objectIndex; + + for (var_s1 = 0; var_s1 < 3; var_s1++) { + objectIndex = D_80183F28[var_s1]; + func_8008A1D0(objectIndex, cameraId, 0x000005DC, 0x000009C4); + if (func_8007223C(objectIndex, 0x00040000) != 0) { + func_80055AB8(objectIndex, cameraId); + } + } } -#else -GLOBAL_ASM("asm/non_matchings/hud_renderer/func_80055C38.s") -#endif void func_80055CCC(s32 objectIndex, s32 cameraId) { UNUSED s32 pad; @@ -5528,16 +5338,16 @@ void func_80055CCC(s32 objectIndex, s32 cameraId) { camera = &camera1[cameraId]; if (D_80165C18[objectIndex].unk_0A6 >= 2) { func_8008A454(objectIndex, cameraId, 0x0000012C); - test = D_80165C18[objectIndex].unk_004[1] - D_80165C18[objectIndex].unk_044; + test = D_80165C18[objectIndex].pos[1] - D_80165C18[objectIndex].unk_044; func_8004A6EC(objectIndex, (20.0 / test) + 0.5); if (func_80072270(objectIndex, 0x00100000) != 0) { - func_80043328(D_80165C18[objectIndex].unk_004, (u16 *) D_80165C18[objectIndex].unk_0BE, D_80165C18[objectIndex].unk_000, D_0600F960); + func_80043328(D_80165C18[objectIndex].pos, (u16 *) D_80165C18[objectIndex].unk_0BE, D_80165C18[objectIndex].sizeScaling, D_0600F960); gSPDisplayList(gDisplayListHead++, D_0600F650); } else { D_80183E80[0] = (s16) D_80165C18[objectIndex].unk_0BE[0]; - D_80183E80[1] = (s16) (func_800418AC(D_80165C18[objectIndex].unk_004[0], D_80165C18[objectIndex].unk_004[2], camera->pos) + 0x8000); + D_80183E80[1] = (s16) (func_800418AC(D_80165C18[objectIndex].pos[0], D_80165C18[objectIndex].pos[2], camera->pos) + 0x8000); D_80183E80[2] = (u16) D_80165C18[objectIndex].unk_0BE[2]; - func_80043328(D_80165C18[objectIndex].unk_004, D_80183E80, D_80165C18[objectIndex].unk_000, D_0600FBE0); + func_80043328(D_80165C18[objectIndex].pos, D_80183E80, D_80165C18[objectIndex].sizeScaling, D_0600FBE0); gSPDisplayList(gDisplayListHead++, D_0600FA20); if (gPlayerCountSelection1 == 1) { D_80165C18[objectIndex].unk_0BE[1] = 0; @@ -5565,7 +5375,7 @@ void func_80055EF4(s32 objectIndex, UNUSED s32 arg1) { object = &D_80165C18[objectIndex]; if (object->unk_0A6 >= 2) { - func_80043220(object->unk_004, object->unk_0BE, object->unk_000, object->unk_070); + func_80043220(object->pos, object->unk_0BE, object->sizeScaling, object->unk_070); } } @@ -5586,7 +5396,7 @@ void func_80055FA0(s32 objectIndex, UNUSED s32 arg1) { if (object->unk_0A6 >= 2) { gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->mtxPool[1]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->mtxPool[7]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - func_800425D0(someMatrix1,object->unk_004, object->unk_0BE, object->unk_000); + func_800425D0(someMatrix1,object->pos, object->unk_0BE, object->sizeScaling); func_80022180(&gGfxPool->mtxPool[D_8018D120 + 0xB], someMatrix1); gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->mtxPool[D_8018D120 + 0xB]), G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); D_8018D120++; @@ -5599,7 +5409,7 @@ void func_80055FA0(s32 objectIndex, UNUSED s32 arg1) { } void func_80056160(s32 arg0) { - func_80055FA0(D_80183EAC, arg0); + func_80055FA0(D_80183EA0[3], arg0); } void func_80056188(s32 cameraId) { @@ -5615,7 +5425,7 @@ void func_80056188(s32 cameraId) { object = &D_80165C18[objectIndex]; if ((object->unk_0A6 >= 2) && (func_80072270(objectIndex, 0x00080000) != 0) && (func_8008A140(objectIndex, camera, 0x2AABU) != 0)) { object->unk_0B2[1] = func_800872D8(objectIndex, camera); - func_800480B4(object->unk_004, object->unk_0B2, object->unk_000, (u8 *) object->unk_060, object->unk_064, D_0D0060B0, 0x00000040, 0x00000040, 0x00000040, 0x00000020); + func_800480B4(object->pos, object->unk_0B2, object->sizeScaling, (u8 *) object->activeTLUT, object->activeTexture, D_0D0060B0, 0x00000040, 0x00000040, 0x00000040, 0x00000020); } } } @@ -5692,10 +5502,10 @@ void func_800563DC(s32 objectIndex, s32 cameraId, s32 arg2) { struct_80165C18_entry *temp_v0; temp_v0 = &D_80165C18[objectIndex]; - temp_f12 = temp_v0->unk_004[0]; - temp_f14 = temp_v0->unk_004[2]; + temp_f12 = temp_v0->pos[0]; + temp_f14 = temp_v0->pos[2]; temp_s0 = D_801655CC & 3; - D_80183E40.unk4 = (f32) ((f64) temp_v0->unk_004[1] + 1.0); + D_80183E40.unk4 = (f32) ((f64) temp_v0->pos[1] + 1.0); D_80183E80.unk0 = 0; D_80183E40.unk0 = temp_f12; D_80183E40.unk8 = temp_f14; @@ -5736,18 +5546,18 @@ void func_8005669C(s32 objectIndex, UNUSED s32 arg1, s32 arg2) { gSPDisplayList(gDisplayListHead++, D_0D0079E8); func_8004B310(arg2); func_80043D50(D_0D02AA58, 0x00000010, 0x00000010); - D_80183E40[1] = D_80165C18[objectIndex].unk_004[1] - 2.0; - D_80183E40[0] = D_80165C18[objectIndex].unk_004[0] + 2.0; - D_80183E40[2] = D_80165C18[objectIndex].unk_004[2] + 2.0; + D_80183E40[1] = D_80165C18[objectIndex].pos[1] - 2.0; + D_80183E40[0] = D_80165C18[objectIndex].pos[0] + 2.0; + D_80183E40[2] = D_80165C18[objectIndex].pos[2] + 2.0; func_800431B0(D_80183E40, D_80183E80, 0.15f, D_0D005770); - D_80183E40[0] = D_80165C18[objectIndex].unk_004[0] + 2.0; - D_80183E40[2] = D_80165C18[objectIndex].unk_004[2] - 2.0; + D_80183E40[0] = D_80165C18[objectIndex].pos[0] + 2.0; + D_80183E40[2] = D_80165C18[objectIndex].pos[2] - 2.0; func_800431B0(D_80183E40, D_80183E80, 0.15f, D_0D005770); - D_80183E40[0] = D_80165C18[objectIndex].unk_004[0] - 2.0; - D_80183E40[2] = D_80165C18[objectIndex].unk_004[2] - 2.0; + D_80183E40[0] = D_80165C18[objectIndex].pos[0] - 2.0; + D_80183E40[2] = D_80165C18[objectIndex].pos[2] - 2.0; func_800431B0(D_80183E40, D_80183E80, 0.15f, D_0D005770); - D_80183E40[0] = D_80165C18[objectIndex].unk_004[0] - 2.0; - D_80183E40[2] = D_80165C18[objectIndex].unk_004[2] + 2.0; + D_80183E40[0] = D_80165C18[objectIndex].pos[0] - 2.0; + D_80183E40[2] = D_80165C18[objectIndex].pos[2] + 2.0; func_800431B0(D_80183E40, D_80183E80, 0.15f, D_0D005770); gSPTexture(gDisplayListHead++, 1, 1, 0, G_TX_RENDERTILE, G_OFF); } @@ -5757,9 +5567,9 @@ void func_800568A0(s32 objectIndex, s32 playerId) { Player *player; player = &gPlayerOne[playerId]; - D_80183E50[0] = D_80165C18[objectIndex].unk_004[0]; + D_80183E50[0] = D_80165C18[objectIndex].pos[0]; D_80183E50[1] = D_80165C18[objectIndex].unk_044 + 0.8; - D_80183E50[2] = D_80165C18[objectIndex].unk_004[2]; + D_80183E50[2] = D_80165C18[objectIndex].pos[2]; func_80042A20(sp30, player->unk_110.unk60, D_80183E50, 0U, 0.5f); func_80022180(&gGfxPool->mtxPool[D_8018D120 + 0xB], sp30); gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->mtxPool[D_8018D120 + 0xB]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); @@ -5808,9 +5618,9 @@ void func_80056AC0(s32 arg0) { if (temp_v1->unk_0A6 != 0) { temp_s1 = temp_v1->unk_0A0; temp_v0 = &gPlayerOne[var_s2]; - temp_v1->unk_004[0] = temp_v0->pos[0]; - temp_v1->unk_004[1] = (f32) ((f64) temp_v0->pos[1] - 2.0); - temp_v1->unk_004[2] = temp_v0->pos[2]; + temp_v1->pos[0] = temp_v0->pos[0]; + temp_v1->pos[1] = (f32) ((f64) temp_v0->pos[1] - 2.0); + temp_v1->pos[2] = temp_v0->pos[2]; temp_v1->unk_044 = temp_v0->unk_074; func_800563DC(temp_s0, arg0, temp_s1); func_8005669C(temp_s0, arg0, temp_s1); @@ -5962,9 +5772,9 @@ void func_80056FCC(s32 arg0) { struct_80165C18_entry *tmp2 = &D_80163DE8[arg0]; //temp_v0 = D_80163DE8[arg0]; - D_80183E50[0] = tmp2->unk_000 ;// unk_004[0]; + D_80183E50[0] = tmp2->sizeScaling ;// pos[0]; D_80183E50[1] = tmp2->unk_050 + 1.0; - D_80183E50[2] = tmp2->unk_000; + D_80183E50[2] = tmp2->sizeScaling; func_80042A20(mtx, tmp->u30, D_80183E50, 0U, 0.5f); func_80022180(&gGfxPool->mtxPool[D_8018D120 + 0xB], mtx); gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->mtxPool[D_8018D120 + 0xB]), G_MTX_LOAD | G_MTX_NOPUSH| G_MTX_MODELVIEW); @@ -6033,9 +5843,9 @@ void func_80057114(s32 cameraId) { if (temp_s5 != 0) { temp_s0_2 = D_80183DD8[var_s2_2]; temp_v0 = &D_80165C18[temp_s0_2]; - temp_v0->unk_004[0] = var_s1_2->unk0; - temp_v0->unk_004[1] = var_s1_2->unk4; - temp_v0->unk_004[2] = var_s1_2->unk8; + temp_v0->pos[0] = var_s1_2->unk0; + temp_v0->pos[1] = var_s1_2->unk4; + temp_v0->pos[2] = var_s1_2->unk8; temp_s4 = func_8008A364(temp_s0_2, var_fp, 0x31C4U, 0x000001F4); if (func_8007223C(temp_s0_2, 0x00040000) != 0) { func_800721C0(temp_s0_2, 0x00200000); diff --git a/src/hud_renderer.h b/src/hud_renderer.h index 0f43233f4..649a3df28 100644 --- a/src/hud_renderer.h +++ b/src/hud_renderer.h @@ -96,7 +96,6 @@ void func_80047EC4(Vec3f, Vec3su, f32, u8*, u8*, Vtx*, s32, s32, s32, s32); void func_80047F40(Vec3f, Vec3su, f32, u8*, u8*, Vtx*, s32, s32, s32, s32); void func_80047FBC(Vec3f, Vec3su, f32, u8*, u8*, Vtx*, s32, s32, s32, s32); -void func_80052F20(s32); void func_80048038(Vec3f, Vec3su, f32, u8*, u8*, Vtx*, s32, s32, s32, s32); void func_800480B4(Vec3f, Vec3su, f32, u8*, u8*, Vtx*, s32, s32, s32, s32); void func_80048130(Vec3f, Vec3su, f32, u8*, u8*, Vtx*, s32, s32, s32, s32, s32); @@ -325,6 +324,7 @@ void func_80052590(s32); void func_80052C60(); void func_80052D70(s32); void func_80052E30(s32); +void func_80052F20(s32); void func_8005309C(s32); void func_8005327C(s32); @@ -351,14 +351,18 @@ void func_80054EB8(s32); void func_80054F04(s32); void func_800550A4(s32); +void func_80055164(s32); void func_80055228(s32); +void func_800552BC(s32); void func_80055380(s32); void func_80055458(s32, s32); void func_80055528(s32); void func_800555BC(s32, s32); void func_8005568C(s32); void func_800557AC(); +void func_800557B4(s32, u32, u32); void func_8005592C(s32); +void func_80055AB8(s32, s32); void func_80055C38(s32); void func_80055CCC(s32, s32); void func_80055E68(s32); @@ -404,21 +408,19 @@ extern s32 D_80165860; extern s32 D_8016586C; extern s32 D_80165878; extern s32 D_8016589C; -extern s16 D_80165CB8[8]; extern u16 D_801656C0; extern u16 D_801656D0; extern u16 D_801656E0; +extern Camera *D_8018CF14; extern s32 D_80183DD8[]; extern Vec3f D_80183E40; extern Vec3f D_80183E50; extern Vec3f D_80183E70; extern Vec3su D_80183E80; extern Vec3su D_80183E98; -extern s32 D_80183EAC; extern UnkActorInner D_8018C830; extern u8 *D_8018D1E0; -extern s32 D_8018D1F0; extern s32 D_8018D3E0; // some alpha extern s32 D_8018D3E4; // some red diff --git a/src/math_util_2.c b/src/math_util_2.c index d873eb1b2..b05fb5857 100644 --- a/src/math_util_2.c +++ b/src/math_util_2.c @@ -817,18 +817,18 @@ void func_800427DC(s32 arg0, Mat4 arg1) { sp2C = sins(temp_s0->unk_0B2[2]); temp_f0 = coss(temp_s0->unk_0B2[2]); - arg1[0][0] = temp_s0->unk_000 * ((sp30 * temp_f0) + (sp3C * sp34 * sp2C)); - arg1[1][0] = temp_s0->unk_000 * ((-sp30 * sp2C) + sp3C * sp34 * temp_f0); - arg1[2][0] = temp_s0->unk_000 * (temp_f20 * sp34); - arg1[3][0] = temp_s0->unk_004[0]; - arg1[0][1] = temp_s0->unk_000 * (temp_f20 * sp2C); - arg1[1][1] = temp_s0->unk_000 * (temp_f20 * temp_f0); - arg1[2][1] = temp_s0->unk_000 * -sp3C; - arg1[3][1] = temp_s0->unk_004[1]; - arg1[0][2] = temp_s0->unk_000 * ((-sp34 * temp_f0) + (sp3C * sp30 * sp2C)); - arg1[1][2] = temp_s0->unk_000 * ((sp34 * sp2C) + (sp3C * sp30 * temp_f0)); - arg1[2][2] = temp_s0->unk_000 * (temp_f20 * sp30); - arg1[3][2] = temp_s0->unk_004[2]; + arg1[0][0] = temp_s0->sizeScaling * ((sp30 * temp_f0) + (sp3C * sp34 * sp2C)); + arg1[1][0] = temp_s0->sizeScaling * ((-sp30 * sp2C) + sp3C * sp34 * temp_f0); + arg1[2][0] = temp_s0->sizeScaling * (temp_f20 * sp34); + arg1[3][0] = temp_s0->pos[0]; + arg1[0][1] = temp_s0->sizeScaling * (temp_f20 * sp2C); + arg1[1][1] = temp_s0->sizeScaling * (temp_f20 * temp_f0); + arg1[2][1] = temp_s0->sizeScaling * -sp3C; + arg1[3][1] = temp_s0->pos[1]; + arg1[0][2] = temp_s0->sizeScaling * ((-sp34 * temp_f0) + (sp3C * sp30 * sp2C)); + arg1[1][2] = temp_s0->sizeScaling * ((sp34 * sp2C) + (sp3C * sp30 * temp_f0)); + arg1[2][2] = temp_s0->sizeScaling * (temp_f20 * sp30); + arg1[3][2] = temp_s0->pos[2]; arg1[0][3] = 0.0f; arg1[1][3] = 0.0f; arg1[2][3] = 0.0f; diff --git a/src/spawn_players.c b/src/spawn_players.c index 2d8d2d37a..da4137fe8 100644 --- a/src/spawn_players.c +++ b/src/spawn_players.c @@ -296,8 +296,8 @@ void spawn_player(Player *player, s8 playerIndex, f32 startingRow, f32 startingC player->unk_110.unk60[2] = 0.0f; D_80165300[playerIndex] = 0; - D_8018CE10[playerIndex].unk_04 = 0.0f; - D_8018CE10[playerIndex].unk_0C = 0.0f; + D_8018CE10[playerIndex].unk_04[0] = 0.0f; + D_8018CE10[playerIndex].unk_04[2] = 0.0f; func_80295BF8(playerIndex); func_8005D6C0(player); func_8006B87C(player, playerIndex);