diff --git a/asm/non_matchings/code_80005FD0/func_800061DC.s b/asm/non_matchings/code_80005FD0/func_800061DC.s index 34b9f721d..59e8e67b0 100644 --- a/asm/non_matchings/code_80005FD0/func_800061DC.s +++ b/asm/non_matchings/code_80005FD0/func_800061DC.s @@ -13,7 +13,7 @@ glabel func_800061DC /* 006E08 80006208 10410007 */ beq $v0, $at, .L80006228 /* 006E0C 8000620C 24010003 */ li $at, 3 /* 006E10 80006210 10410007 */ beq $v0, $at, .L80006230 -/* 006E14 80006214 00000000 */ nop +/* 006E14 80006214 00000000 */ nop /* 006E18 80006218 10000007 */ b .L80006238 /* 006E1C 8000621C 24020001 */ li $v0, 1 .L80006220: @@ -34,8 +34,8 @@ glabel func_800061DC /* 006E4C 8000624C 00002825 */ move $a1, $zero /* 006E50 80006250 3C028019 */ lui $v0, %hi(D_8018EDF3) # $v0, 0x8019 /* 006E54 80006254 8042EDF3 */ lb $v0, %lo(D_8018EDF3)($v0) -/* 006E58 80006258 3C04800E */ lui $a0, %hi(D_800DC4DC) -/* 006E5C 8000625C 8C84C4DC */ lw $a0, %lo(D_800DC4DC)($a0) +/* 006E58 80006258 3C04800E */ lui $a0, %hi(gPlayerOne) +/* 006E5C 8000625C 8C84C4DC */ lw $a0, %lo(gPlayerOne)($a0) /* 006E60 80006260 184000D7 */ blez $v0, .L800065C0 /* 006E64 80006264 00002825 */ move $a1, $zero .L80006268: @@ -52,24 +52,24 @@ glabel func_800061DC /* 006E90 80006290 C48E001C */ lwc1 $f14, 0x1c($a0) /* 006E94 80006294 01405827 */ not $t3, $t2 /* 006E98 80006298 4600203C */ c.lt.s $f4, $f0 -/* 006E9C 8000629C 00000000 */ nop +/* 006E9C 8000629C 00000000 */ nop /* 006EA0 800062A0 45020015 */ bc1fl .L800062F8 /* 006EA4 800062A4 006B1824 */ and $v1, $v1, $t3 /* 006EA8 800062A8 46146180 */ add.s $f6, $f12, $f20 /* 006EAC 800062AC 4606003C */ c.lt.s $f0, $f6 -/* 006EB0 800062B0 00000000 */ nop +/* 006EB0 800062B0 00000000 */ nop /* 006EB4 800062B4 45020010 */ bc1fl .L800062F8 /* 006EB8 800062B8 006B1824 */ and $v1, $v1, $t3 /* 006EBC 800062BC 46147201 */ sub.s $f8, $f14, $f20 /* 006EC0 800062C0 4602403C */ c.lt.s $f8, $f2 -/* 006EC4 800062C4 00000000 */ nop +/* 006EC4 800062C4 00000000 */ nop /* 006EC8 800062C8 4502000B */ bc1fl .L800062F8 /* 006ECC 800062CC 006B1824 */ and $v1, $v1, $t3 /* 006ED0 800062D0 46147280 */ add.s $f10, $f14, $f20 /* 006ED4 800062D4 24190001 */ li $t9, 1 /* 006ED8 800062D8 00B94004 */ sllv $t0, $t9, $a1 /* 006EDC 800062DC 460A103C */ c.lt.s $f2, $f10 -/* 006EE0 800062E0 00000000 */ nop +/* 006EE0 800062E0 00000000 */ nop /* 006EE4 800062E4 45020004 */ bc1fl .L800062F8 /* 006EE8 800062E8 006B1824 */ and $v1, $v1, $t3 /* 006EEC 800062EC 10000002 */ b .L800062F8 @@ -96,25 +96,25 @@ glabel func_800061DC /* 006F30 80006330 46147401 */ sub.s $f16, $f14, $f20 /* 006F34 80006334 01E0C027 */ not $t8, $t7 /* 006F38 80006338 4600803C */ c.lt.s $f16, $f0 -/* 006F3C 8000633C 00000000 */ nop +/* 006F3C 8000633C 00000000 */ nop /* 006F40 80006340 45020016 */ bc1fl .L8000639C /* 006F44 80006344 00781824 */ and $v1, $v1, $t8 /* 006F48 80006348 46147480 */ add.s $f18, $f14, $f20 /* 006F4C 8000634C 4612003C */ c.lt.s $f0, $f18 -/* 006F50 80006350 00000000 */ nop +/* 006F50 80006350 00000000 */ nop /* 006F54 80006354 45020011 */ bc1fl .L8000639C /* 006F58 80006358 00781824 */ and $v1, $v1, $t8 /* 006F5C 8000635C C48C0008 */ lwc1 $f12, 8($a0) /* 006F60 80006360 46146101 */ sub.s $f4, $f12, $f20 /* 006F64 80006364 4602203C */ c.lt.s $f4, $f2 -/* 006F68 80006368 00000000 */ nop +/* 006F68 80006368 00000000 */ nop /* 006F6C 8000636C 4502000B */ bc1fl .L8000639C /* 006F70 80006370 00781824 */ and $v1, $v1, $t8 /* 006F74 80006374 46146180 */ add.s $f6, $f12, $f20 /* 006F78 80006378 240C0001 */ li $t4, 1 /* 006F7C 8000637C 00AC6804 */ sllv $t5, $t4, $a1 /* 006F80 80006380 4606103C */ c.lt.s $f2, $f6 -/* 006F84 80006384 00000000 */ nop +/* 006F84 80006384 00000000 */ nop /* 006F88 80006388 45020004 */ bc1fl .L8000639C /* 006F8C 8000638C 00781824 */ and $v1, $v1, $t8 /* 006F90 80006390 10000002 */ b .L8000639C @@ -135,25 +135,25 @@ glabel func_800061DC /* 006FC4 800063C4 24180001 */ li $t8, 1 /* 006FC8 800063C8 01405827 */ not $t3, $t2 /* 006FCC 800063CC 4600403C */ c.lt.s $f8, $f0 -/* 006FD0 800063D0 00000000 */ nop +/* 006FD0 800063D0 00000000 */ nop /* 006FD4 800063D4 45020016 */ bc1fl .L80006430 /* 006FD8 800063D8 006B1824 */ and $v1, $v1, $t3 /* 006FDC 800063DC 46147280 */ add.s $f10, $f14, $f20 /* 006FE0 800063E0 460A003C */ c.lt.s $f0, $f10 -/* 006FE4 800063E4 00000000 */ nop +/* 006FE4 800063E4 00000000 */ nop /* 006FE8 800063E8 45020011 */ bc1fl .L80006430 /* 006FEC 800063EC 006B1824 */ and $v1, $v1, $t3 /* 006FF0 800063F0 C48C0008 */ lwc1 $f12, 8($a0) /* 006FF4 800063F4 46146401 */ sub.s $f16, $f12, $f20 /* 006FF8 800063F8 4602803C */ c.lt.s $f16, $f2 -/* 006FFC 800063FC 00000000 */ nop +/* 006FFC 800063FC 00000000 */ nop /* 007000 80006400 4502000B */ bc1fl .L80006430 /* 007004 80006404 006B1824 */ and $v1, $v1, $t3 /* 007008 80006408 46146480 */ add.s $f18, $f12, $f20 /* 00700C 8000640C 24190001 */ li $t9, 1 /* 007010 80006410 00B94004 */ sllv $t0, $t9, $a1 /* 007014 80006414 4612103C */ c.lt.s $f2, $f18 -/* 007018 80006418 00000000 */ nop +/* 007018 80006418 00000000 */ nop /* 00701C 8000641C 45020004 */ bc1fl .L80006430 /* 007020 80006420 006B1824 */ and $v1, $v1, $t3 /* 007024 80006424 10000002 */ b .L80006430 @@ -166,18 +166,18 @@ glabel func_800061DC /* 00703C 8000643C 46147101 */ sub.s $f4, $f14, $f20 /* 007040 80006440 248400B8 */ addiu $a0, $a0, 0xb8 /* 007044 80006444 4600203C */ c.lt.s $f4, $f0 -/* 007048 80006448 00000000 */ nop +/* 007048 80006448 00000000 */ nop /* 00704C 8000644C 45020017 */ bc1fl .L800064AC /* 007050 80006450 00681824 */ and $v1, $v1, $t0 /* 007054 80006454 46147180 */ add.s $f6, $f14, $f20 /* 007058 80006458 4606003C */ c.lt.s $f0, $f6 -/* 00705C 8000645C 00000000 */ nop +/* 00705C 8000645C 00000000 */ nop /* 007060 80006460 45020012 */ bc1fl .L800064AC /* 007064 80006464 00681824 */ and $v1, $v1, $t0 /* 007068 80006468 C48C0008 */ lwc1 $f12, 8($a0) /* 00706C 8000646C 46146201 */ sub.s $f8, $f12, $f20 /* 007070 80006470 4602403C */ c.lt.s $f8, $f2 -/* 007074 80006474 00000000 */ nop +/* 007074 80006474 00000000 */ nop /* 007078 80006478 4502000C */ bc1fl .L800064AC /* 00707C 8000647C 00681824 */ and $v1, $v1, $t0 /* 007080 80006480 46146280 */ add.s $f10, $f12, $f20 @@ -185,7 +185,7 @@ glabel func_800061DC /* 007088 80006488 240D0001 */ li $t5, 1 /* 00708C 8000648C 018D7004 */ sllv $t6, $t5, $t4 /* 007090 80006490 460A103C */ c.lt.s $f2, $f10 -/* 007094 80006494 00000000 */ nop +/* 007094 80006494 00000000 */ nop /* 007098 80006498 45020004 */ bc1fl .L800064AC /* 00709C 8000649C 00681824 */ and $v1, $v1, $t0 /* 0070A0 800064A0 10000002 */ b .L800064AC @@ -200,18 +200,18 @@ glabel func_800061DC /* 0070C0 800064C0 01C0C027 */ not $t8, $t6 /* 0070C4 800064C4 248400B8 */ addiu $a0, $a0, 0xb8 /* 0070C8 800064C8 4600803C */ c.lt.s $f16, $f0 -/* 0070CC 800064CC 00000000 */ nop +/* 0070CC 800064CC 00000000 */ nop /* 0070D0 800064D0 45020017 */ bc1fl .L80006530 /* 0070D4 800064D4 00781824 */ and $v1, $v1, $t8 /* 0070D8 800064D8 46147480 */ add.s $f18, $f14, $f20 /* 0070DC 800064DC 4612003C */ c.lt.s $f0, $f18 -/* 0070E0 800064E0 00000000 */ nop +/* 0070E0 800064E0 00000000 */ nop /* 0070E4 800064E4 45020012 */ bc1fl .L80006530 /* 0070E8 800064E8 00781824 */ and $v1, $v1, $t8 /* 0070EC 800064EC C48C0008 */ lwc1 $f12, 8($a0) /* 0070F0 800064F0 46146101 */ sub.s $f4, $f12, $f20 /* 0070F4 800064F4 4602203C */ c.lt.s $f4, $f2 -/* 0070F8 800064F8 00000000 */ nop +/* 0070F8 800064F8 00000000 */ nop /* 0070FC 800064FC 4502000C */ bc1fl .L80006530 /* 007100 80006500 00781824 */ and $v1, $v1, $t8 /* 007104 80006504 46146180 */ add.s $f6, $f12, $f20 @@ -219,7 +219,7 @@ glabel func_800061DC /* 00710C 8000650C 240A0001 */ li $t2, 1 /* 007110 80006510 012A5804 */ sllv $t3, $t2, $t1 /* 007114 80006514 4606103C */ c.lt.s $f2, $f6 -/* 007118 80006518 00000000 */ nop +/* 007118 80006518 00000000 */ nop /* 00711C 8000651C 45020004 */ bc1fl .L80006530 /* 007120 80006520 00781824 */ and $v1, $v1, $t8 /* 007124 80006524 10000002 */ b .L80006530 @@ -234,18 +234,18 @@ glabel func_800061DC /* 007144 80006544 01606027 */ not $t4, $t3 /* 007148 80006548 248400B8 */ addiu $a0, $a0, 0xb8 /* 00714C 8000654C 4600403C */ c.lt.s $f8, $f0 -/* 007150 80006550 00000000 */ nop +/* 007150 80006550 00000000 */ nop /* 007154 80006554 45020017 */ bc1fl .L800065B4 /* 007158 80006558 006C1824 */ and $v1, $v1, $t4 /* 00715C 8000655C 46147280 */ add.s $f10, $f14, $f20 /* 007160 80006560 460A003C */ c.lt.s $f0, $f10 -/* 007164 80006564 00000000 */ nop +/* 007164 80006564 00000000 */ nop /* 007168 80006568 45020012 */ bc1fl .L800065B4 /* 00716C 8000656C 006C1824 */ and $v1, $v1, $t4 /* 007170 80006570 C48C0008 */ lwc1 $f12, 8($a0) /* 007174 80006574 46146401 */ sub.s $f16, $f12, $f20 /* 007178 80006578 4602803C */ c.lt.s $f16, $f2 -/* 00717C 8000657C 00000000 */ nop +/* 00717C 8000657C 00000000 */ nop /* 007180 80006580 4502000C */ bc1fl .L800065B4 /* 007184 80006584 006C1824 */ and $v1, $v1, $t4 /* 007188 80006588 46146480 */ add.s $f18, $f12, $f20 @@ -253,7 +253,7 @@ glabel func_800061DC /* 007190 80006590 24190001 */ li $t9, 1 /* 007194 80006594 01F94004 */ sllv $t0, $t9, $t7 /* 007198 80006598 4612103C */ c.lt.s $f2, $f18 -/* 00719C 8000659C 00000000 */ nop +/* 00719C 8000659C 00000000 */ nop /* 0071A0 800065A0 45020004 */ bc1fl .L800065B4 /* 0071A4 800065A4 006C1824 */ and $v1, $v1, $t4 /* 0071A8 800065A8 10000002 */ b .L800065B4 diff --git a/asm/non_matchings/code_80005FD0/func_8000DF8C.s b/asm/non_matchings/code_80005FD0/func_8000DF8C.s index a7342e8a1..4e8af9a78 100644 --- a/asm/non_matchings/code_80005FD0/func_8000DF8C.s +++ b/asm/non_matchings/code_80005FD0/func_8000DF8C.s @@ -53,12 +53,12 @@ glabel func_8000DF8C /* 00EC54 8000E054 24010014 */ li $at, 20 /* 00EC58 8000E058 3C198016 */ lui $t9, %hi(D_8016347E) # $t9, 0x8016 /* 00EC5C 8000E05C 14410025 */ bne $v0, $at, .L8000E0F4 -/* 00EC60 8000E060 00000000 */ nop +/* 00EC60 8000E060 00000000 */ nop /* 00EC64 8000E064 8739347E */ lh $t9, %lo(D_8016347E)($t9) /* 00EC68 8000E068 54790059 */ bnel $v1, $t9, .L8000E1D0 /* 00EC6C 8000E06C 8FB9004C */ lw $t9, 0x4c($sp) -/* 00EC70 8000E070 3C02800E */ lui $v0, %hi(D_800DC4E8) -/* 00EC74 8000E074 8C42C4E8 */ lw $v0, %lo(D_800DC4E8)($v0) +/* 00EC70 8000E070 3C02800E */ lui $v0, %hi(gPlayerFour) +/* 00EC74 8000E074 8C42C4E8 */ lw $v0, %lo(gPlayerFour)($v0) /* 00EC78 8000E078 3C0141C8 */ li $at, 0x41C80000 # 25.000000 /* 00EC7C 8000E07C 44817000 */ mtc1 $at, $f14 /* 00EC80 8000E080 C4460014 */ lwc1 $f6, 0x14($v0) @@ -75,7 +75,7 @@ glabel func_8000DF8C /* 00ECAC 8000E0AC 460C6282 */ mul.s $f10, $f12, $f12 /* 00ECB0 8000E0B0 460A4100 */ add.s $f4, $f8, $f10 /* 00ECB4 8000E0B4 460E203C */ c.lt.s $f4, $f14 -/* 00ECB8 8000E0B8 00000000 */ nop +/* 00ECB8 8000E0B8 00000000 */ nop /* 00ECBC 8000E0BC 45020044 */ bc1fl .L8000E1D0 /* 00ECC0 8000E0C0 8FB9004C */ lw $t9, 0x4c($sp) /* 00ECC4 8000E0C4 A7AA007E */ sh $t2, 0x7e($sp) @@ -122,7 +122,7 @@ glabel func_8000DF8C /* 00ED60 8000E160 460C6282 */ mul.s $f10, $f12, $f12 /* 00ED64 8000E164 460A4100 */ add.s $f4, $f8, $f10 /* 00ED68 8000E168 460E203C */ c.lt.s $f4, $f14 -/* 00ED6C 8000E16C 00000000 */ nop +/* 00ED6C 8000E16C 00000000 */ nop /* 00ED70 8000E170 45020012 */ bc1fl .L8000E1BC /* 00ED74 8000E174 0083082A */ slt $at, $a0, $v1 /* 00ED78 8000E178 852B0000 */ lh $t3, ($t1) @@ -160,7 +160,7 @@ glabel func_8000DF8C /* 00EDE4 8000E1E4 002A0821 */ addu $at, $at, $t2 /* 00EDE8 8000E1E8 8C2AD008 */ lw $t2, %lo(jpt_800ED008)($at) /* 00EDEC 8000E1EC 01400008 */ jr $t2 -/* 00EDF0 8000E1F0 00000000 */ nop +/* 00EDF0 8000E1F0 00000000 */ nop glabel L8000E1F4 /* 00EDF4 8000E1F4 24030168 */ li $v1, 360 /* 00EDF8 8000E1F8 262B0164 */ addiu $t3, $s1, 0x164 @@ -171,14 +171,14 @@ glabel L8000E1F4 /* 00EE0C 8000E20C 01AC6823 */ subu $t5, $t5, $t4 /* 00EE10 8000E210 01A3001A */ div $zero, $t5, $v1 /* 00EE14 8000E214 14600002 */ bnez $v1, .L8000E220 -/* 00EE18 8000E218 00000000 */ nop +/* 00EE18 8000E218 00000000 */ nop /* 00EE1C 8000E21C 0007000D */ break 7 .L8000E220: /* 00EE20 8000E220 2401FFFF */ li $at, -1 /* 00EE24 8000E224 14610004 */ bne $v1, $at, .L8000E238 /* 00EE28 8000E228 3C018000 */ lui $at, 0x8000 /* 00EE2C 8000E22C 15610002 */ bne $t3, $at, .L8000E238 -/* 00EE30 8000E230 00000000 */ nop +/* 00EE30 8000E230 00000000 */ nop /* 00EE34 8000E234 0006000D */ break 6 .L8000E238: /* 00EE38 8000E238 00002012 */ mflo $a0 @@ -186,14 +186,14 @@ glabel L8000E1F4 /* 00EE40 8000E240 01801025 */ move $v0, $t4 /* 00EE44 8000E244 01808825 */ move $s1, $t4 /* 00EE48 8000E248 14600002 */ bnez $v1, .L8000E254 -/* 00EE4C 8000E24C 00000000 */ nop +/* 00EE4C 8000E24C 00000000 */ nop /* 00EE50 8000E250 0007000D */ break 7 .L8000E254: /* 00EE54 8000E254 2401FFFF */ li $at, -1 /* 00EE58 8000E258 14610004 */ bne $v1, $at, .L8000E26C /* 00EE5C 8000E25C 3C018000 */ lui $at, 0x8000 /* 00EE60 8000E260 15A10002 */ bne $t5, $at, .L8000E26C -/* 00EE64 8000E264 00000000 */ nop +/* 00EE64 8000E264 00000000 */ nop /* 00EE68 8000E268 0006000D */ break 6 .L8000E26C: /* 00EE6C 8000E26C AFA20048 */ sw $v0, 0x48($sp) @@ -252,29 +252,29 @@ glabel L8000E1F4 /* 00EF40 8000E340 46065600 */ add.s $f24, $f10, $f6 /* 00EF44 8000E344 E4D80008 */ swc1 $f24, 8($a2) /* 00EF48 8000E348 14600002 */ bnez $v1, .L8000E354 -/* 00EF4C 8000E34C 00000000 */ nop +/* 00EF4C 8000E34C 00000000 */ nop /* 00EF50 8000E350 0007000D */ break 7 .L8000E354: /* 00EF54 8000E354 2401FFFF */ li $at, -1 /* 00EF58 8000E358 14610004 */ bne $v1, $at, .L8000E36C /* 00EF5C 8000E35C 3C018000 */ lui $at, 0x8000 /* 00EF60 8000E360 15A10002 */ bne $t5, $at, .L8000E36C -/* 00EF64 8000E364 00000000 */ nop +/* 00EF64 8000E364 00000000 */ nop /* 00EF68 8000E368 0006000D */ break 6 .L8000E36C: /* 00EF6C 8000E36C 14600002 */ bnez $v1, .L8000E378 -/* 00EF70 8000E370 00000000 */ nop +/* 00EF70 8000E370 00000000 */ nop /* 00EF74 8000E374 0007000D */ break 7 .L8000E378: /* 00EF78 8000E378 2401FFFF */ li $at, -1 /* 00EF7C 8000E37C 14610004 */ bne $v1, $at, .L8000E390 /* 00EF80 8000E380 3C018000 */ lui $at, 0x8000 /* 00EF84 8000E384 17010002 */ bne $t8, $at, .L8000E390 -/* 00EF88 8000E388 00000000 */ nop +/* 00EF88 8000E388 00000000 */ nop /* 00EF8C 8000E38C 0006000D */ break 6 .L8000E390: /* 00EF90 8000E390 0C0AE00E */ jal coss -/* 00EF94 8000E394 00000000 */ nop +/* 00EF94 8000E394 00000000 */ nop /* 00EF98 8000E398 3C014039 */ li $at, 0x40390000 # 2.890625 /* 00EF9C 8000E39C 44814800 */ mtc1 $at, $f9 /* 00EFA0 8000E3A0 44804000 */ mtc1 $zero, $f8 @@ -301,14 +301,14 @@ glabel L8000E1F4 /* 00EFF4 8000E3F4 844A0002 */ lh $t2, 2($v0) /* 00EFF8 8000E3F8 44803000 */ mtc1 $zero, $f6 /* 00EFFC 8000E3FC 448A2000 */ mtc1 $t2, $f4 -/* 00F000 8000E400 00000000 */ nop +/* 00F000 8000E400 00000000 */ nop /* 00F004 8000E404 46802220 */ cvt.s.w $f8, $f4 /* 00F008 8000E408 46265102 */ mul.d $f4, $f10, $f6 /* 00F00C 8000E40C E4A80004 */ swc1 $f8, 4($a1) /* 00F010 8000E410 844B0004 */ lh $t3, 4($v0) /* 00F014 8000E414 46202220 */ cvt.s.d $f8, $f4 /* 00F018 8000E418 448B5000 */ mtc1 $t3, $f10 -/* 00F01C 8000E41C 00000000 */ nop +/* 00F01C 8000E41C 00000000 */ nop /* 00F020 8000E420 468051A0 */ cvt.s.w $f6, $f10 /* 00F024 8000E424 46083100 */ add.s $f4, $f6, $f8 /* 00F028 8000E428 0C0AD489 */ jal func_802B5224 @@ -317,8 +317,8 @@ glabel L8000E1F4 /* 00F034 8000E434 00430019 */ multu $v0, $v1 /* 00F038 8000E438 3401FFF0 */ li $at, 65520 /* 00F03C 8000E43C 00006012 */ mflo $t4 -/* 00F040 8000E440 00000000 */ nop -/* 00F044 8000E444 00000000 */ nop +/* 00F040 8000E440 00000000 */ nop +/* 00F044 8000E444 00000000 */ nop /* 00F048 8000E448 0181001A */ div $zero, $t4, $at /* 00F04C 8000E44C 00006812 */ mflo $t5 /* 00F050 8000E450 A7AD00C2 */ sh $t5, 0xc2($sp) @@ -416,14 +416,14 @@ glabel L8000E45C /* 00F1BC 8000E5BC 844C0002 */ lh $t4, 2($v0) /* 00F1C0 8000E5C0 44805000 */ mtc1 $zero, $f10 /* 00F1C4 8000E5C4 448C2000 */ mtc1 $t4, $f4 -/* 00F1C8 8000E5C8 00000000 */ nop +/* 00F1C8 8000E5C8 00000000 */ nop /* 00F1CC 8000E5CC 468021A0 */ cvt.s.w $f6, $f4 /* 00F1D0 8000E5D0 462A4102 */ mul.d $f4, $f8, $f10 /* 00F1D4 8000E5D4 E4A60004 */ swc1 $f6, 4($a1) /* 00F1D8 8000E5D8 844D0004 */ lh $t5, 4($v0) /* 00F1DC 8000E5DC 462021A0 */ cvt.s.d $f6, $f4 /* 00F1E0 8000E5E0 448D4000 */ mtc1 $t5, $f8 -/* 00F1E4 8000E5E4 00000000 */ nop +/* 00F1E4 8000E5E4 00000000 */ nop /* 00F1E8 8000E5E8 468042A0 */ cvt.s.w $f10, $f8 /* 00F1EC 8000E5EC 46065100 */ add.s $f4, $f10, $f6 /* 00F1F0 8000E5F0 0C0AD489 */ jal func_802B5224 @@ -449,7 +449,7 @@ glabel L8000E634 /* 00F238 8000E638 85EF347C */ lh $t7, %lo(D_8016347C)($t7) /* 00F23C 8000E63C 3C198016 */ lui $t9, %hi(D_8016443E) # $t9, 0x8016 /* 00F240 8000E640 11E00007 */ beqz $t7, .L8000E660 -/* 00F244 8000E644 00000000 */ nop +/* 00F244 8000E644 00000000 */ nop /* 00F248 8000E648 9739443E */ lhu $t9, %lo(D_8016443E)($t9) /* 00F24C 8000E64C 87A700CA */ lh $a3, 0xca($sp) /* 00F250 8000E650 240B0003 */ li $t3, 3 @@ -503,14 +503,14 @@ glabel L8000E634 /* 00F300 8000E700 46803120 */ cvt.s.w $f4, $f6 /* 00F304 8000E704 24A52FC0 */ addiu $a1, %lo(D_80162FC0) # addiu $a1, $a1, 0x2fc0 /* 00F308 8000E708 14E00002 */ bnez $a3, .L8000E714 -/* 00F30C 8000E70C 00000000 */ nop +/* 00F30C 8000E70C 00000000 */ nop /* 00F310 8000E710 0007000D */ break 7 .L8000E714: /* 00F314 8000E714 2401FFFF */ li $at, -1 /* 00F318 8000E718 14E10004 */ bne $a3, $at, .L8000E72C /* 00F31C 8000E71C 3C018000 */ lui $at, 0x8000 /* 00F320 8000E720 15810002 */ bne $t4, $at, .L8000E72C -/* 00F324 8000E724 00000000 */ nop +/* 00F324 8000E724 00000000 */ nop /* 00F328 8000E728 0006000D */ break 6 .L8000E72C: /* 00F32C 8000E72C E4C40000 */ swc1 $f4, ($a2) @@ -523,33 +523,33 @@ glabel L8000E634 /* 00F348 8000E748 E4CA0004 */ swc1 $f10, 4($a2) /* 00F34C 8000E74C 84590004 */ lh $t9, 4($v0) /* 00F350 8000E750 44993000 */ mtc1 $t9, $f6 -/* 00F354 8000E754 00000000 */ nop +/* 00F354 8000E754 00000000 */ nop /* 00F358 8000E758 46803120 */ cvt.s.w $f4, $f6 /* 00F35C 8000E75C E4C40008 */ swc1 $f4, 8($a2) /* 00F360 8000E760 846D0000 */ lh $t5, ($v1) /* 00F364 8000E764 14E00002 */ bnez $a3, .L8000E770 -/* 00F368 8000E768 00000000 */ nop +/* 00F368 8000E768 00000000 */ nop /* 00F36C 8000E76C 0007000D */ break 7 .L8000E770: /* 00F370 8000E770 2401FFFF */ li $at, -1 /* 00F374 8000E774 14E10004 */ bne $a3, $at, .L8000E788 /* 00F378 8000E778 3C018000 */ lui $at, 0x8000 /* 00F37C 8000E77C 15610002 */ bne $t3, $at, .L8000E788 -/* 00F380 8000E780 00000000 */ nop +/* 00F380 8000E780 00000000 */ nop /* 00F384 8000E784 0006000D */ break 6 .L8000E788: /* 00F388 8000E788 448D4000 */ mtc1 $t5, $f8 -/* 00F38C 8000E78C 00000000 */ nop +/* 00F38C 8000E78C 00000000 */ nop /* 00F390 8000E790 468042A0 */ cvt.s.w $f10, $f8 /* 00F394 8000E794 E4AA0000 */ swc1 $f10, ($a1) /* 00F398 8000E798 846E0002 */ lh $t6, 2($v1) /* 00F39C 8000E79C 448E3000 */ mtc1 $t6, $f6 -/* 00F3A0 8000E7A0 00000000 */ nop +/* 00F3A0 8000E7A0 00000000 */ nop /* 00F3A4 8000E7A4 46803120 */ cvt.s.w $f4, $f6 /* 00F3A8 8000E7A8 E4A40004 */ swc1 $f4, 4($a1) /* 00F3AC 8000E7AC 84780004 */ lh $t8, 4($v1) /* 00F3B0 8000E7B0 44984000 */ mtc1 $t8, $f8 -/* 00F3B4 8000E7B4 00000000 */ nop +/* 00F3B4 8000E7B4 00000000 */ nop /* 00F3B8 8000E7B8 468042A0 */ cvt.s.w $f10, $f8 /* 00F3BC 8000E7BC 0C0AD489 */ jal func_802B5224 /* 00F3C0 8000E7C0 E4AA0008 */ swc1 $f10, 8($a1) @@ -619,7 +619,7 @@ glabel L8000E634 /* 00F4B8 8000E8B8 000C6980 */ sll $t5, $t4, 6 /* 00F4BC 8000E8BC C602003C */ lwc1 $f2, 0x3c($s0) /* 00F4C0 8000E8C0 460E1202 */ mul.s $f8, $f2, $f14 -/* 00F4C4 8000E8C4 00000000 */ nop +/* 00F4C4 8000E8C4 00000000 */ nop /* 00F4C8 8000E8C8 46101182 */ mul.s $f6, $f2, $f16 /* 00F4CC 8000E8CC 46004283 */ div.s $f10, $f8, $f0 /* 00F4D0 8000E8D0 46003103 */ div.s $f4, $f6, $f0 @@ -629,7 +629,7 @@ glabel L8000E634 .L8000E8E0: /* 00F4E0 8000E8E0 3C0140A0 */ li $at, 0x40A00000 # 5.000000 /* 00F4E4 8000E8E4 44810000 */ mtc1 $at, $f0 -/* 00F4E8 8000E8E8 00000000 */ nop +/* 00F4E8 8000E8E8 00000000 */ nop /* 00F4EC 8000E8EC 46007203 */ div.s $f8, $f14, $f0 /* 00F4F0 8000E8F0 46008283 */ div.s $f10, $f16, $f0 /* 00F4F4 8000E8F4 4608B580 */ add.s $f22, $f22, $f8 @@ -653,7 +653,7 @@ glabel L8000E634 /* 00F538 8000E938 3C054120 */ lui $a1, 0x4120 /* 00F53C 8000E93C 4600A121 */ cvt.d.s $f4, $f20 /* 00F540 8000E940 4628203C */ c.lt.d $f4, $f8 -/* 00F544 8000E944 00000000 */ nop +/* 00F544 8000E944 00000000 */ nop /* 00F548 8000E948 45020003 */ bc1fl .L8000E958 /* 00F54C 8000E94C 4407A000 */ mfc1 $a3, $f20 /* 00F550 8000E950 C6140004 */ lwc1 $f20, 4($s0) @@ -682,12 +682,12 @@ glabel L8000E968 /* 00F5A4 8000E9A4 E4C60000 */ swc1 $f6, ($a2) /* 00F5A8 8000E9A8 844B0002 */ lh $t3, 2($v0) /* 00F5AC 8000E9AC 448B2000 */ mtc1 $t3, $f4 -/* 00F5B0 8000E9B0 00000000 */ nop +/* 00F5B0 8000E9B0 00000000 */ nop /* 00F5B4 8000E9B4 46802220 */ cvt.s.w $f8, $f4 /* 00F5B8 8000E9B8 E4C80004 */ swc1 $f8, 4($a2) /* 00F5BC 8000E9BC 844A0004 */ lh $t2, 4($v0) /* 00F5C0 8000E9C0 448A5000 */ mtc1 $t2, $f10 -/* 00F5C4 8000E9C4 00000000 */ nop +/* 00F5C4 8000E9C4 00000000 */ nop /* 00F5C8 8000E9C8 468051A0 */ cvt.s.w $f6, $f10 /* 00F5CC 8000E9CC E4C60008 */ swc1 $f6, 8($a2) /* 00F5D0 8000E9D0 95CE45C8 */ lhu $t6, %lo(D_801645C8)($t6) @@ -697,14 +697,14 @@ glabel L8000E968 /* 00F5E0 8000E9E0 01E71821 */ addu $v1, $t7, $a3 /* 00F5E4 8000E9E4 84790000 */ lh $t9, ($v1) /* 00F5E8 8000E9E8 15C00002 */ bnez $t6, .L8000E9F4 -/* 00F5EC 8000E9EC 00000000 */ nop +/* 00F5EC 8000E9EC 00000000 */ nop /* 00F5F0 8000E9F0 0007000D */ break 7 .L8000E9F4: /* 00F5F4 8000E9F4 2401FFFF */ li $at, -1 /* 00F5F8 8000E9F8 15C10004 */ bne $t6, $at, .L8000EA0C /* 00F5FC 8000E9FC 3C018000 */ lui $at, 0x8000 /* 00F600 8000EA00 15A10002 */ bne $t5, $at, .L8000EA0C -/* 00F604 8000EA04 00000000 */ nop +/* 00F604 8000EA04 00000000 */ nop /* 00F608 8000EA08 0006000D */ break 6 .L8000EA0C: /* 00F60C 8000EA0C 44992000 */ mtc1 $t9, $f4 @@ -713,19 +713,19 @@ glabel L8000E968 /* 00F618 8000EA18 E4A80000 */ swc1 $f8, ($a1) /* 00F61C 8000EA1C 846B0002 */ lh $t3, 2($v1) /* 00F620 8000EA20 448B5000 */ mtc1 $t3, $f10 -/* 00F624 8000EA24 00000000 */ nop +/* 00F624 8000EA24 00000000 */ nop /* 00F628 8000EA28 468051A0 */ cvt.s.w $f6, $f10 /* 00F62C 8000EA2C 44915000 */ mtc1 $s1, $f10 /* 00F630 8000EA30 E4A60004 */ swc1 $f6, 4($a1) /* 00F634 8000EA34 846A0004 */ lh $t2, 4($v1) /* 00F638 8000EA38 468051A0 */ cvt.s.w $f6, $f10 /* 00F63C 8000EA3C 448A2000 */ mtc1 $t2, $f4 -/* 00F640 8000EA40 00000000 */ nop +/* 00F640 8000EA40 00000000 */ nop /* 00F644 8000EA44 46802220 */ cvt.s.w $f8, $f4 /* 00F648 8000EA48 06210004 */ bgez $s1, .L8000EA5C /* 00F64C 8000EA4C E4A80008 */ swc1 $f8, 8($a1) /* 00F650 8000EA50 44812000 */ mtc1 $at, $f4 -/* 00F654 8000EA54 00000000 */ nop +/* 00F654 8000EA54 00000000 */ nop /* 00F658 8000EA58 46043180 */ add.s $f6, $f6, $f4 .L8000EA5C: /* 00F65C 8000EA5C 3C01800F */ lui $at, %hi(D_800ED030) # $at, 0x800f @@ -759,7 +759,7 @@ glabel L8000E968 /* 00F6C0 8000EAC0 06210004 */ bgez $s1, .L8000EAD4 /* 00F6C4 8000EAC4 46804320 */ cvt.s.w $f12, $f8 /* 00F6C8 8000EAC8 44812000 */ mtc1 $at, $f4 -/* 00F6CC 8000EACC 00000000 */ nop +/* 00F6CC 8000EACC 00000000 */ nop /* 00F6D0 8000EAD0 46046300 */ add.s $f12, $f12, $f4 .L8000EAD4: /* 00F6D4 8000EAD4 97B800C2 */ lhu $t8, 0xc2($sp) diff --git a/asm/non_matchings/code_80005FD0/func_8000F628.s b/asm/non_matchings/code_80005FD0/func_8000F628.s index 195833f85..d4369e459 100644 --- a/asm/non_matchings/code_80005FD0/func_8000F628.s +++ b/asm/non_matchings/code_80005FD0/func_8000F628.s @@ -132,8 +132,8 @@ glabel func_8000F628 /* 010430 8000F830 0000B825 */ move $s7, $zero /* 010434 8000F834 0000F025 */ move $fp, $zero .L8000F838: -/* 010438 8000F838 3C18800E */ lui $t8, %hi(D_800DC4DC) -/* 01043C 8000F83C 8F18C4DC */ lw $t8, %lo(D_800DC4DC)($t8) +/* 010438 8000F838 3C18800E */ lui $t8, %hi(gPlayerOne) +/* 01043C 8000F83C 8F18C4DC */ lw $t8, %lo(gPlayerOne)($t8) /* 010440 8000F840 A4E00000 */ sh $zero, ($a3) /* 010444 8000F844 A5000000 */ sh $zero, ($t0) /* 010448 8000F848 A5200000 */ sh $zero, ($t1) @@ -143,7 +143,7 @@ glabel func_8000F628 /* 010458 8000F858 AFB90104 */ sw $t9, 0x104($sp) /* 01045C 8000F85C 28410014 */ slti $at, $v0, 0x14 /* 010460 8000F860 10200017 */ beqz $at, .L8000F8C0 -/* 010464 8000F864 00000000 */ nop +/* 010464 8000F864 00000000 */ nop /* 010468 8000F868 AFBF00D8 */ sw $ra, 0xd8($sp) /* 01046C 8000F86C 02002025 */ move $a0, $s0 /* 010470 8000F870 00002825 */ move $a1, $zero @@ -618,7 +618,7 @@ glabel func_8000F628 /* 010B90 8000FF90 87190004 */ lh $t9, 4($t8) /* 010B94 8000FF94 3C018016 */ lui $at, %hi(D_8016344C) # $at, 0x8016 /* 010B98 8000FF98 44994000 */ mtc1 $t9, $f8 -/* 010B9C 8000FF9C 00000000 */ nop +/* 010B9C 8000FF9C 00000000 */ nop /* 010BA0 8000FFA0 468041A0 */ cvt.s.w $f6, $f8 /* 010BA4 8000FFA4 E426344C */ swc1 $f6, %lo(D_8016344C)($at) /* 010BA8 8000FFA8 3C018016 */ lui $at, %hi(D_801634F0) # $at, 0x8016 @@ -634,7 +634,7 @@ glabel func_8000F628 /* 010BD0 8000FFD0 A42034EC */ sh $zero, %lo(D_801634EC)($at) /* 010BD4 8000FFD4 826F0000 */ lb $t7, ($s3) /* 010BD8 8000FFD8 162F0036 */ bne $s1, $t7, .L800100B4 -/* 010BDC 8000FFDC 00000000 */ nop +/* 010BDC 8000FFDC 00000000 */ nop /* 010BE0 8000FFE0 96AE0000 */ lhu $t6, ($s5) /* 010BE4 8000FFE4 3C128016 */ lui $s2, %hi(D_80163330) # $s2, 0x8016 /* 010BE8 8000FFE8 26523330 */ addiu $s2, %lo(D_80163330) # addiu $s2, $s2, 0x3330 @@ -695,7 +695,7 @@ glabel func_8000F628 /* 010CB0 800100B0 26520008 */ addiu $s2, $s2, 8 .L800100B4: /* 010CB4 800100B4 0C004697 */ jal func_80011A5C -/* 010CB8 800100B8 00000000 */ nop +/* 010CB8 800100B8 00000000 */ nop /* 010CBC 800100BC 8FBF0044 */ lw $ra, 0x44($sp) /* 010CC0 800100C0 D7B40018 */ ldc1 $f20, 0x18($sp) /* 010CC4 800100C4 8FB00020 */ lw $s0, 0x20($sp) diff --git a/asm/non_matchings/code_80005FD0/func_80011E38.s b/asm/non_matchings/code_80005FD0/func_80011E38.s index ddc274b14..66707b9e2 100644 --- a/asm/non_matchings/code_80005FD0/func_80011E38.s +++ b/asm/non_matchings/code_80005FD0/func_80011E38.s @@ -8,8 +8,8 @@ glabel func_80011E38 /* 012A50 80011E50 00581021 */ addu $v0, $v0, $t8 /* 012A54 80011E54 944232E8 */ lhu $v0, %lo(D_801632E8)($v0) # 0x32e8($v0) /* 012A58 80011E58 000E7080 */ sll $t6, $t6, 2 -/* 012A5C 80011E5C 3C0F800E */ lui $t7, %hi(D_800DC4DC) -/* 012A60 80011E60 8DEFC4DC */ lw $t7, %lo(D_800DC4DC)($t7) +/* 012A5C 80011E5C 3C0F800E */ lui $t7, %hi(gPlayerOne) +/* 012A60 80011E60 8DEFC4DC */ lw $t7, %lo(gPlayerOne)($t7) /* 012A64 80011E64 01C47023 */ subu $t6, $t6, $a0 /* 012A68 80011E68 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 012A6C 80011E6C 000E70C0 */ sll $t6, $t6, 3 @@ -20,20 +20,20 @@ glabel func_80011E38 /* 012A80 80011E80 10410005 */ beq $v0, $at, .L80011E98 /* 012A84 80011E84 24010002 */ li $at, 2 /* 012A88 80011E88 10410007 */ beq $v0, $at, .L80011EA8 -/* 012A8C 80011E8C 00000000 */ nop +/* 012A8C 80011E8C 00000000 */ nop /* 012A90 80011E90 10000008 */ b .L80011EB4 /* 012A94 80011E94 8FBF0014 */ lw $ra, 0x14($sp) .L80011E98: /* 012A98 80011E98 0C0046C5 */ jal func_80011B14 -/* 012A9C 80011E9C 00000000 */ nop +/* 012A9C 80011E9C 00000000 */ nop /* 012AA0 80011EA0 10000004 */ b .L80011EB4 /* 012AA4 80011EA4 8FBF0014 */ lw $ra, 0x14($sp) .L80011EA8: /* 012AA8 80011EA8 0C004752 */ jal func_80011D48 -/* 012AAC 80011EAC 00000000 */ nop +/* 012AAC 80011EAC 00000000 */ nop .L80011EB0: /* 012AB0 80011EB0 8FBF0014 */ lw $ra, 0x14($sp) .L80011EB4: /* 012AB4 80011EB4 27BD0018 */ addiu $sp, $sp, 0x18 /* 012AB8 80011EB8 03E00008 */ jr $ra -/* 012ABC 80011EBC 00000000 */ nop +/* 012ABC 80011EBC 00000000 */ nop diff --git a/asm/non_matchings/code_80005FD0/func_80015314.s b/asm/non_matchings/code_80005FD0/func_80015314.s index e40ec450d..4056281f4 100644 --- a/asm/non_matchings/code_80005FD0/func_80015314.s +++ b/asm/non_matchings/code_80005FD0/func_80015314.s @@ -5,9 +5,9 @@ glabel func_80015314 /* 015F20 80015320 01C77023 */ subu $t6, $t6, $a3 /* 015F24 80015324 AFA5001C */ sw $a1, 0x1c($sp) /* 015F28 80015328 000E7100 */ sll $t6, $t6, 4 -/* 015F2C 8001532C 3C05800E */ lui $a1, %hi(D_800DC4DC) +/* 015F2C 8001532C 3C05800E */ lui $a1, %hi(gPlayerOne) /* 015F30 80015330 01C77023 */ subu $t6, $t6, $a3 -/* 015F34 80015334 8CA5C4DC */ lw $a1, %lo(D_800DC4DC)($a1) +/* 015F34 80015334 8CA5C4DC */ lw $a1, %lo(gPlayerOne)($a1) /* 015F38 80015338 000E7080 */ sll $t6, $t6, 2 /* 015F3C 8001533C 0006C080 */ sll $t8, $a2, 2 /* 015F40 80015340 3C04800E */ lui $a0, %hi(camera1) @@ -29,4 +29,4 @@ glabel func_80015314 /* 015F80 80015380 8FBF0014 */ lw $ra, 0x14($sp) /* 015F84 80015384 27BD0018 */ addiu $sp, $sp, 0x18 /* 015F88 80015388 03E00008 */ jr $ra -/* 015F8C 8001538C 00000000 */ nop +/* 015F8C 8001538C 00000000 */ nop diff --git a/asm/non_matchings/code_80005FD0/func_80015390.s b/asm/non_matchings/code_80005FD0/func_80015390.s index edac80e2d..b05976eed 100644 --- a/asm/non_matchings/code_80005FD0/func_80015390.s +++ b/asm/non_matchings/code_80005FD0/func_80015390.s @@ -6,8 +6,8 @@ glabel func_80015390 /* 015FA0 800153A0 AFA500B4 */ sw $a1, 0xb4($sp) /* 015FA4 800153A4 AFA600B8 */ sw $a2, 0xb8($sp) /* 015FA8 800153A8 848E00AE */ lh $t6, 0xae($a0) -/* 015FAC 800153AC 3C11800E */ lui $s1, %hi(D_800DC4DC) -/* 015FB0 800153B0 8E31C4DC */ lw $s1, %lo(D_800DC4DC)($s1) +/* 015FAC 800153AC 3C11800E */ lui $s1, %hi(gPlayerOne) +/* 015FB0 800153B0 8E31C4DC */ lw $s1, %lo(gPlayerOne)($s1) /* 015FB4 800153B4 000E78C0 */ sll $t7, $t6, 3 /* 015FB8 800153B8 01EE7823 */ subu $t7, $t7, $t6 /* 015FBC 800153BC 000F7900 */ sll $t7, $t7, 4 @@ -19,7 +19,7 @@ glabel func_80015390 /* 015FD4 800153D4 86220078 */ lh $v0, 0x78($s1) /* 015FD8 800153D8 00808025 */ move $s0, $a0 /* 015FDC 800153DC 14400003 */ bnez $v0, .L800153EC -/* 015FE0 800153E0 00000000 */ nop +/* 015FE0 800153E0 00000000 */ nop /* 015FE4 800153E4 10000012 */ b .L80015430 /* 015FE8 800153E8 24060064 */ li $a2, 100 .L800153EC: @@ -100,7 +100,7 @@ glabel func_80015390 /* 016100 80015500 C7AE008C */ lwc1 $f14, 0x8c($sp) /* 016104 80015504 A6020026 */ sh $v0, 0x26($s0) /* 016108 80015508 46000202 */ mul.s $f8, $f0, $f0 -/* 01610C 8001550C 00000000 */ nop +/* 01610C 8001550C 00000000 */ nop /* 016110 80015510 460E7282 */ mul.s $f10, $f14, $f14 /* 016114 80015514 0C033850 */ jal sqrtf /* 016118 80015518 460A4300 */ add.s $f12, $f8, $f10 diff --git a/asm/non_matchings/code_80005FD0/func_8001577C.s b/asm/non_matchings/code_80005FD0/func_8001577C.s index a860b586f..7ca35b458 100644 --- a/asm/non_matchings/code_80005FD0/func_8001577C.s +++ b/asm/non_matchings/code_80005FD0/func_8001577C.s @@ -18,10 +18,10 @@ glabel func_8001577C /* 0163BC 800157BC 00A92821 */ addu $a1, $a1, $t1 /* 0163C0 800157C0 01C37023 */ subu $t6, $t6, $v1 /* 0163C4 800157C4 94A545B0 */ lhu $a1, %lo(D_801645B0)($a1) # 0x45b0($a1) -/* 0163C8 800157C8 3C12800E */ lui $s2, %hi(D_800DC4DC) +/* 0163C8 800157C8 3C12800E */ lui $s2, %hi(gPlayerOne) /* 0163CC 800157CC 000E7080 */ sll $t6, $t6, 2 /* 0163D0 800157D0 3C0F8016 */ lui $t7, %hi(D_80164668) # $t7, 0x8016 -/* 0163D4 800157D4 8E52C4DC */ lw $s2, %lo(D_800DC4DC)($s2) +/* 0163D4 800157D4 8E52C4DC */ lw $s2, %lo(gPlayerOne)($s2) /* 0163D8 800157D8 25EF4668 */ addiu $t7, %lo(D_80164668) # addiu $t7, $t7, 0x4668 /* 0163DC 800157DC 00071040 */ sll $v0, $a3, 1 /* 0163E0 800157E0 01C37023 */ subu $t6, $t6, $v1 @@ -88,7 +88,7 @@ glabel func_8001577C /* 0164D0 800158D0 00111880 */ sll $v1, $s1, 2 /* 0164D4 800158D4 00230821 */ addu $at, $at, $v1 /* 0164D8 800158D8 45000017 */ bc1f .L80015938 -/* 0164DC 800158DC 00000000 */ nop +/* 0164DC 800158DC 00000000 */ nop /* 0164E0 800158E0 C4284688 */ lwc1 $f8, %lo(D_80164688)($at) /* 0164E4 800158E4 3C01BFE0 */ li $at, 0xBFE00000 # -1.750000 /* 0164E8 800158E8 44818800 */ mtc1 $at, $f17 @@ -96,9 +96,9 @@ glabel func_8001577C /* 0164F0 800158F0 460042A1 */ cvt.d.s $f10, $f8 /* 0164F4 800158F4 014B1023 */ subu $v0, $t2, $t3 /* 0164F8 800158F8 4630503C */ c.lt.d $f10, $f16 -/* 0164FC 800158FC 00000000 */ nop +/* 0164FC 800158FC 00000000 */ nop /* 016500 80015900 4500000D */ bc1f .L80015938 -/* 016504 80015904 00000000 */ nop +/* 016504 80015904 00000000 */ nop /* 016508 80015908 00420019 */ multu $v0, $v0 /* 01650C 8001590C 02202025 */ move $a0, $s1 /* 016510 80015910 3C053F80 */ lui $a1, 0x3f80 @@ -106,7 +106,7 @@ glabel func_8001577C /* 016518 80015918 00007812 */ mflo $t7 /* 01651C 8001591C 29E10005 */ slti $at, $t7, 5 /* 016520 80015920 10200005 */ beqz $at, .L80015938 -/* 016524 80015924 00000000 */ nop +/* 016524 80015924 00000000 */ nop /* 016528 80015928 0C0068D2 */ jal func_8001A348 /* 01652C 8001592C AFA3003C */ sw $v1, 0x3c($sp) /* 016530 80015930 1000001F */ b .L800159B0 @@ -117,9 +117,9 @@ glabel func_8001577C /* 016540 80015940 3C013FE0 */ li $at, 0x3FE00000 # 1.750000 /* 016544 80015944 00111880 */ sll $v1, $s1, 2 /* 016548 80015948 4620903C */ c.lt.d $f18, $f0 -/* 01654C 8001594C 00000000 */ nop +/* 01654C 8001594C 00000000 */ nop /* 016550 80015950 45000017 */ bc1f .L800159B0 -/* 016554 80015954 00000000 */ nop +/* 016554 80015954 00000000 */ nop /* 016558 80015958 44812800 */ mtc1 $at, $f5 /* 01655C 8001595C 3C018016 */ lui $at, %hi(D_80164688) /* 016560 80015960 00230821 */ addu $at, $at, $v1 @@ -128,9 +128,9 @@ glabel func_8001577C /* 01656C 8001596C 014B1023 */ subu $v0, $t2, $t3 /* 016570 80015970 46003221 */ cvt.d.s $f8, $f6 /* 016574 80015974 4628203C */ c.lt.d $f4, $f8 -/* 016578 80015978 00000000 */ nop +/* 016578 80015978 00000000 */ nop /* 01657C 8001597C 4500000C */ bc1f .L800159B0 -/* 016580 80015980 00000000 */ nop +/* 016580 80015980 00000000 */ nop /* 016584 80015984 00420019 */ multu $v0, $v0 /* 016588 80015988 02202025 */ move $a0, $s1 /* 01658C 8001598C 3C05BF80 */ lui $a1, 0xbf80 @@ -138,7 +138,7 @@ glabel func_8001577C /* 016594 80015994 0000C012 */ mflo $t8 /* 016598 80015998 2B010005 */ slti $at, $t8, 5 /* 01659C 8001599C 10200004 */ beqz $at, .L800159B0 -/* 0165A0 800159A0 00000000 */ nop +/* 0165A0 800159A0 00000000 */ nop /* 0165A4 800159A4 0C0068D2 */ jal func_8001A348 /* 0165A8 800159A8 AFA3003C */ sw $v1, 0x3c($sp) /* 0165AC 800159AC 8FA3003C */ lw $v1, 0x3c($sp) @@ -187,7 +187,7 @@ glabel func_8001577C /* 016654 80015A54 C7AE007C */ lwc1 $f14, 0x7c($sp) /* 016658 80015A58 A6020026 */ sh $v0, 0x26($s0) /* 01665C 80015A5C 46000202 */ mul.s $f8, $f0, $f0 -/* 016660 80015A60 00000000 */ nop +/* 016660 80015A60 00000000 */ nop /* 016664 80015A64 460E7282 */ mul.s $f10, $f14, $f14 /* 016668 80015A68 0C033850 */ jal sqrtf /* 01666C 80015A6C 460A4300 */ add.s $f12, $f8, $f10 diff --git a/asm/non_matchings/code_80005FD0/func_80015C94.s b/asm/non_matchings/code_80005FD0/func_80015C94.s index 382aedca6..8d00b38aa 100644 --- a/asm/non_matchings/code_80005FD0/func_80015C94.s +++ b/asm/non_matchings/code_80005FD0/func_80015C94.s @@ -9,7 +9,7 @@ glabel func_80015C94 /* 0168B0 80015CB0 AFA600C0 */ sw $a2, 0xc0($sp) /* 0168B4 80015CB4 848300AE */ lh $v1, 0xae($a0) /* 0168B8 80015CB8 3C018016 */ lui $at, %hi(D_80163238) # $at, 0x8016 -/* 0168BC 80015CBC 3C08800E */ lui $t0, %hi(D_800DC4DC) +/* 0168BC 80015CBC 3C08800E */ lui $t0, %hi(gPlayerOne) /* 0168C0 80015CC0 000370C0 */ sll $t6, $v1, 3 /* 0168C4 80015CC4 AC233238 */ sw $v1, %lo(D_80163238)($at) /* 0168C8 80015CC8 01C37023 */ subu $t6, $t6, $v1 @@ -20,7 +20,7 @@ glabel func_80015C94 /* 0168DC 80015CDC C48C0000 */ lwc1 $f12, ($a0) /* 0168E0 80015CE0 01C37023 */ subu $t6, $t6, $v1 /* 0168E4 80015CE4 00038840 */ sll $s1, $v1, 1 -/* 0168E8 80015CE8 8D08C4DC */ lw $t0, %lo(D_800DC4DC)($t0) +/* 0168E8 80015CE8 8D08C4DC */ lw $t0, %lo(gPlayerOne)($t0) /* 0168EC 80015CEC 000E7080 */ sll $t6, $t6, 2 /* 0168F0 80015CF0 01314821 */ addu $t1, $t1, $s1 /* 0168F4 80015CF4 952945B0 */ lhu $t1, %lo(D_801645B0)($t1) # 0x45b0($t1) @@ -90,7 +90,7 @@ glabel func_80015C94 /* 0169F0 80015DF0 44801000 */ mtc1 $zero, $f2 /* 0169F4 80015DF4 46002021 */ cvt.d.s $f0, $f4 /* 0169F8 80015DF8 4622003C */ c.lt.d $f0, $f2 -/* 0169FC 80015DFC 00000000 */ nop +/* 0169FC 80015DFC 00000000 */ nop /* 016A00 80015E00 45020017 */ bc1fl .L80015E60 /* 016A04 80015E04 3C013FE0 */ lui $at, 0x3fe0 /* 016A08 80015E08 3C198016 */ lui $t9, %hi(D_80164688) # $t9, 0x8016 @@ -100,7 +100,7 @@ glabel func_80015C94 /* 016A18 80015E18 C4E60000 */ lwc1 $f6, ($a3) /* 016A1C 80015E1C 46003221 */ cvt.d.s $f8, $f6 /* 016A20 80015E20 4622403C */ c.lt.d $f8, $f2 -/* 016A24 80015E24 00000000 */ nop +/* 016A24 80015E24 00000000 */ nop /* 016A28 80015E28 4502000D */ bc1fl .L80015E60 /* 016A2C 80015E2C 3C013FE0 */ lui $at, 0x3fe0 /* 016A30 80015E30 02402025 */ move $a0, $s2 @@ -128,7 +128,7 @@ glabel func_80015C94 /* 016A84 80015E84 8FAE0054 */ lw $t6, 0x54($sp) /* 016A88 80015E88 460062A1 */ cvt.d.s $f10, $f12 /* 016A8C 80015E8C 462A103C */ c.lt.d $f2, $f10 -/* 016A90 80015E90 00000000 */ nop +/* 016A90 80015E90 00000000 */ nop /* 016A94 80015E94 4502000C */ bc1fl .L80015EC8 /* 016A98 80015E98 8FAE0054 */ lw $t6, 0x54($sp) /* 016A9C 80015E9C 02402025 */ move $a0, $s2 @@ -156,14 +156,14 @@ glabel func_80015C94 /* 016AEC 80015EEC 00004010 */ mfhi $t0 /* 016AF0 80015EF0 0008C400 */ sll $t8, $t0, 0x10 /* 016AF4 80015EF4 14600002 */ bnez $v1, .L80015F00 -/* 016AF8 80015EF8 00000000 */ nop +/* 016AF8 80015EF8 00000000 */ nop /* 016AFC 80015EFC 0007000D */ break 7 .L80015F00: /* 016B00 80015F00 2401FFFF */ li $at, -1 /* 016B04 80015F04 14610004 */ bne $v1, $at, .L80015F18 /* 016B08 80015F08 3C018000 */ lui $at, 0x8000 /* 016B0C 80015F0C 15E10002 */ bne $t7, $at, .L80015F18 -/* 016B10 80015F10 00000000 */ nop +/* 016B10 80015F10 00000000 */ nop /* 016B14 80015F14 0006000D */ break 6 .L80015F18: /* 016B18 80015F18 0183001A */ div $zero, $t4, $v1 @@ -172,14 +172,14 @@ glabel func_80015C94 /* 016B24 80015F24 00006810 */ mfhi $t5 /* 016B28 80015F28 A7AD0078 */ sh $t5, 0x78($sp) /* 016B2C 80015F2C 14600002 */ bnez $v1, .L80015F38 -/* 016B30 80015F30 00000000 */ nop +/* 016B30 80015F30 00000000 */ nop /* 016B34 80015F34 0007000D */ break 7 .L80015F38: /* 016B38 80015F38 2401FFFF */ li $at, -1 /* 016B3C 80015F3C 14610004 */ bne $v1, $at, .L80015F50 /* 016B40 80015F40 3C018000 */ li $at, 0x80000000 # -0.000000 /* 016B44 80015F44 15810002 */ bne $t4, $at, .L80015F50 -/* 016B48 80015F48 00000000 */ nop +/* 016B48 80015F48 00000000 */ nop /* 016B4C 80015F4C 0006000D */ break 6 .L80015F50: /* 016B50 80015F50 3104FFFF */ andi $a0, $t0, 0xffff @@ -339,14 +339,14 @@ glabel func_80015C94 /* 016DB0 800161B0 D428D230 */ ldc1 $f8, %lo(D_800ED230)($at) /* 016DB4 800161B4 3C014020 */ li $at, 0x40200000 # 2.500000 /* 016DB8 800161B8 4622403E */ c.le.d $f8, $f2 -/* 016DBC 800161BC 00000000 */ nop +/* 016DBC 800161BC 00000000 */ nop /* 016DC0 800161C0 4502000A */ bc1fl .L800161EC /* 016DC4 800161C4 44814800 */ mtc1 $at, $f9 /* 016DC8 800161C8 3C014024 */ li $at, 0x40240000 # 2.562500 .L800161CC: /* 016DCC 800161CC 44812800 */ mtc1 $at, $f5 /* 016DD0 800161D0 44802000 */ mtc1 $zero, $f4 -/* 016DD4 800161D4 00000000 */ nop +/* 016DD4 800161D4 00000000 */ nop /* 016DD8 800161D8 46248180 */ add.d $f6, $f16, $f4 /* 016DDC 800161DC 462032A0 */ cvt.s.d $f10, $f6 /* 016DE0 800161E0 10000007 */ b .L80016200 @@ -354,7 +354,7 @@ glabel func_80015C94 /* 016DE8 800161E8 44814800 */ mtc1 $at, $f9 .L800161EC: /* 016DEC 800161EC 44804000 */ mtc1 $zero, $f8 -/* 016DF0 800161F0 00000000 */ nop +/* 016DF0 800161F0 00000000 */ nop /* 016DF4 800161F4 46281100 */ add.d $f4, $f2, $f8 /* 016DF8 800161F8 462021A0 */ cvt.s.d $f6, $f4 /* 016DFC 800161FC E6060004 */ swc1 $f6, 4($s0) diff --git a/asm/non_matchings/code_80005FD0/func_80016494.s b/asm/non_matchings/code_80005FD0/func_80016494.s index 2b9ca67d5..5aaeac7b6 100644 --- a/asm/non_matchings/code_80005FD0/func_80016494.s +++ b/asm/non_matchings/code_80005FD0/func_80016494.s @@ -19,8 +19,8 @@ glabel func_80016494 /* 0170D8 800164D8 46083282 */ mul.s $f10, $f6, $f8 /* 0170DC 800164DC AFA700C4 */ sw $a3, 0xc4($sp) /* 0170E0 800164E0 848300AE */ lh $v1, 0xae($a0) -/* 0170E4 800164E4 3C0A800E */ lui $t2, %hi(D_800DC4DC) -/* 0170E8 800164E8 8D4AC4DC */ lw $t2, %lo(D_800DC4DC)($t2) +/* 0170E4 800164E4 3C0A800E */ lui $t2, %hi(gPlayerOne) +/* 0170E8 800164E8 8D4AC4DC */ lw $t2, %lo(gPlayerOne)($t2) /* 0170EC 800164EC 3C018016 */ lui $at, %hi(D_80163238) # $at, 0x8016 /* 0170F0 800164F0 0003F8C0 */ sll $ra, $v1, 3 /* 0170F4 800164F4 460A1100 */ add.s $f4, $f2, $f10 @@ -123,20 +123,20 @@ glabel func_80016494 /* 017274 80016674 44807000 */ mtc1 $zero, $f14 /* 017278 80016678 46005021 */ cvt.d.s $f0, $f10 /* 01727C 8001667C 462E003C */ c.lt.d $f0, $f14 -/* 017280 80016680 00000000 */ nop +/* 017280 80016680 00000000 */ nop /* 017284 80016684 45020019 */ bc1fl .L800166EC /* 017288 80016688 4620703C */ c.lt.d $f14, $f0 /* 01728C 8001668C C5A40000 */ lwc1 $f4, ($t5) /* 017290 80016690 3C01800F */ lui $at, %hi(D_800ED238) /* 017294 80016694 460021A1 */ cvt.d.s $f6, $f4 /* 017298 80016698 462E303C */ c.lt.d $f6, $f14 -/* 01729C 8001669C 00000000 */ nop +/* 01729C 8001669C 00000000 */ nop /* 0172A0 800166A0 45020012 */ bc1fl .L800166EC /* 0172A4 800166A4 4620703C */ c.lt.d $f14, $f0 /* 0172A8 800166A8 D42AD238 */ ldc1 $f10, %lo(D_800ED238)($at) /* 0172AC 800166AC 46001221 */ cvt.d.s $f8, $f2 /* 0172B0 800166B0 462A403C */ c.lt.d $f8, $f10 -/* 0172B4 800166B4 00000000 */ nop +/* 0172B4 800166B4 00000000 */ nop /* 0172B8 800166B8 4502000C */ bc1fl .L800166EC /* 0172BC 800166BC 4620703C */ c.lt.d $f14, $f0 /* 0172C0 800166C0 8FA400C4 */ lw $a0, 0xc4($sp) @@ -157,13 +157,13 @@ glabel func_80016494 /* 0172F8 800166F8 46006121 */ cvt.d.s $f4, $f12 /* 0172FC 800166FC 3C01800F */ lui $at, %hi(D_800ED240) /* 017300 80016700 4624703C */ c.lt.d $f14, $f4 -/* 017304 80016704 00000000 */ nop +/* 017304 80016704 00000000 */ nop /* 017308 80016708 45020012 */ bc1fl .L80016754 /* 01730C 8001670C 016A082A */ slt $at, $t3, $t2 /* 017310 80016710 D428D240 */ ldc1 $f8, %lo(D_800ED240)($at) /* 017314 80016714 460011A1 */ cvt.d.s $f6, $f2 /* 017318 80016718 4628303C */ c.lt.d $f6, $f8 -/* 01731C 8001671C 00000000 */ nop +/* 01731C 8001671C 00000000 */ nop /* 017320 80016720 4502000C */ bc1fl .L80016754 /* 017324 80016724 016A082A */ slt $at, $t3, $t2 /* 017328 80016728 8FA400C4 */ lw $a0, 0xc4($sp) @@ -215,22 +215,22 @@ glabel func_80016494 /* 0173D0 800167D0 44804000 */ mtc1 $zero, $f8 /* 0173D4 800167D4 46003021 */ cvt.d.s $f0, $f6 /* 0173D8 800167D8 4620403C */ c.lt.d $f8, $f0 -/* 0173DC 800167DC 00000000 */ nop +/* 0173DC 800167DC 00000000 */ nop /* 0173E0 800167E0 45020008 */ bc1fl .L80016804 /* 0173E4 800167E4 462E003C */ c.lt.d $f0, $f14 /* 0173E8 800167E8 3C014120 */ li $at, 0x41200000 # 10.000000 /* 0173EC 800167EC 44815000 */ mtc1 $at, $f10 -/* 0173F0 800167F0 00000000 */ nop +/* 0173F0 800167F0 00000000 */ nop /* 0173F4 800167F4 E58A0000 */ swc1 $f10, ($t4) /* 0173F8 800167F8 C5840000 */ lwc1 $f4, ($t4) /* 0173FC 800167FC 46002021 */ cvt.d.s $f0, $f4 /* 017400 80016800 462E003C */ c.lt.d $f0, $f14 .L80016804: -/* 017404 80016804 00000000 */ nop +/* 017404 80016804 00000000 */ nop /* 017408 80016808 45020005 */ bc1fl .L80016820 /* 01740C 8001680C 8FAE0038 */ lw $t6, 0x38($sp) /* 017410 80016810 44803000 */ mtc1 $zero, $f6 -/* 017414 80016814 00000000 */ nop +/* 017414 80016814 00000000 */ nop /* 017418 80016818 E5860000 */ swc1 $f6, ($t4) .L8001681C: /* 01741C 8001681C 8FAE0038 */ lw $t6, 0x38($sp) @@ -247,14 +247,14 @@ glabel func_80016494 /* 017444 80016844 00003810 */ mfhi $a3 /* 017448 80016848 00077C00 */ sll $t7, $a3, 0x10 /* 01744C 8001684C 14600002 */ bnez $v1, .L80016858 -/* 017450 80016850 00000000 */ nop +/* 017450 80016850 00000000 */ nop /* 017454 80016854 0007000D */ break 7 .L80016858: /* 017458 80016858 2401FFFF */ li $at, -1 /* 01745C 8001685C 14610004 */ bne $v1, $at, .L80016870 /* 017460 80016860 3C018000 */ lui $at, 0x8000 /* 017464 80016864 17010002 */ bne $t8, $at, .L80016870 -/* 017468 80016868 00000000 */ nop +/* 017468 80016868 00000000 */ nop /* 01746C 8001686C 0006000D */ break 6 .L80016870: /* 017470 80016870 01C3001A */ div $zero, $t6, $v1 @@ -263,14 +263,14 @@ glabel func_80016494 /* 01747C 8001687C 0000C010 */ mfhi $t8 /* 017480 80016880 A7B80078 */ sh $t8, 0x78($sp) /* 017484 80016884 14600002 */ bnez $v1, .L80016890 -/* 017488 80016888 00000000 */ nop +/* 017488 80016888 00000000 */ nop /* 01748C 8001688C 0007000D */ break 7 .L80016890: /* 017490 80016890 2401FFFF */ li $at, -1 /* 017494 80016894 14610004 */ bne $v1, $at, .L800168A8 /* 017498 80016898 3C018000 */ li $at, 0x80000000 # -0.000000 /* 01749C 8001689C 15C10002 */ bne $t6, $at, .L800168A8 -/* 0174A0 800168A0 00000000 */ nop +/* 0174A0 800168A0 00000000 */ nop /* 0174A4 800168A4 0006000D */ break 6 .L800168A8: /* 0174A8 800168A8 30E4FFFF */ andi $a0, $a3, 0xffff @@ -435,14 +435,14 @@ glabel func_80016494 /* 01771C 80016B1C D42AD258 */ ldc1 $f10, %lo(D_800ED258)($at) /* 017720 80016B20 3C014024 */ li $at, 0x40240000 # 2.562500 /* 017724 80016B24 4622503E */ c.le.d $f10, $f2 -/* 017728 80016B28 00000000 */ nop +/* 017728 80016B28 00000000 */ nop /* 01772C 80016B2C 4502000A */ bc1fl .L80016B58 /* 017730 80016B30 44815800 */ mtc1 $at, $f11 /* 017734 80016B34 3C014024 */ li $at, 0x40240000 # 2.562500 .L80016B38: /* 017738 80016B38 44813800 */ mtc1 $at, $f7 /* 01773C 80016B3C 44803000 */ mtc1 $zero, $f6 -/* 017740 80016B40 00000000 */ nop +/* 017740 80016B40 00000000 */ nop /* 017744 80016B44 46268200 */ add.d $f8, $f16, $f6 /* 017748 80016B48 46204120 */ cvt.s.d $f4, $f8 /* 01774C 80016B4C 10000007 */ b .L80016B6C @@ -450,7 +450,7 @@ glabel func_80016494 /* 017754 80016B54 44815800 */ mtc1 $at, $f11 .L80016B58: /* 017758 80016B58 44805000 */ mtc1 $zero, $f10 -/* 01775C 80016B5C 00000000 */ nop +/* 01775C 80016B5C 00000000 */ nop /* 017760 80016B60 462A1180 */ add.d $f6, $f2, $f10 /* 017764 80016B64 46203220 */ cvt.s.d $f8, $f6 /* 017768 80016B68 E6080004 */ swc1 $f8, 4($s0) @@ -493,7 +493,7 @@ glabel func_80016494 /* 0177F8 80016BF8 C7AE00A4 */ lwc1 $f14, 0xa4($sp) /* 0177FC 80016BFC A6020026 */ sh $v0, 0x26($s0) /* 017800 80016C00 46000102 */ mul.s $f4, $f0, $f0 -/* 017804 80016C04 00000000 */ nop +/* 017804 80016C04 00000000 */ nop /* 017808 80016C08 460E7282 */ mul.s $f10, $f14, $f14 /* 01780C 80016C0C 0C033850 */ jal sqrtf /* 017810 80016C10 460A2300 */ add.s $f12, $f4, $f10 @@ -506,4 +506,4 @@ glabel func_80016494 /* 01782C 80016C2C 8FB00020 */ lw $s0, 0x20($sp) /* 017830 80016C30 27BD00B8 */ addiu $sp, $sp, 0xb8 /* 017834 80016C34 03E00008 */ jr $ra -/* 017838 80016C38 00000000 */ nop +/* 017838 80016C38 00000000 */ nop diff --git a/asm/non_matchings/code_80005FD0/func_800178F4.s b/asm/non_matchings/code_80005FD0/func_800178F4.s index 9ba1a377d..6275c4a7a 100644 --- a/asm/non_matchings/code_80005FD0/func_800178F4.s +++ b/asm/non_matchings/code_80005FD0/func_800178F4.s @@ -13,11 +13,11 @@ glabel func_800178F4 /* 018520 80017920 C4243068 */ lwc1 $f4, %lo(D_80163068)($at) /* 018524 80017924 3C0F8016 */ lui $t7, %hi(D_80164688) # $t7, 0x8016 /* 018528 80017928 3C198016 */ lui $t9, %hi(D_80164648) # $t9, 0x8016 -/* 01852C 8001792C 3C0D800E */ lui $t5, %hi(D_800DC4DC) +/* 01852C 8001792C 3C0D800E */ lui $t5, %hi(gPlayerOne) /* 018530 80017930 25EF4688 */ addiu $t7, %lo(D_80164688) # addiu $t7, $t7, 0x4688 /* 018534 80017934 27394648 */ addiu $t9, %lo(D_80164648) # addiu $t9, $t9, 0x4648 /* 018538 80017938 3C188016 */ lui $t8, %hi(D_80164658) # $t8, 0x8016 -/* 01853C 8001793C 8DADC4DC */ lw $t5, %lo(D_800DC4DC)($t5) +/* 01853C 8001793C 8DADC4DC */ lw $t5, %lo(gPlayerOne)($t5) /* 018540 80017940 018F2821 */ addu $a1, $t4, $t7 /* 018544 80017944 27184658 */ addiu $t8, %lo(D_80164658) # addiu $t8, $t8, 0x4658 /* 018548 80017948 01997021 */ addu $t6, $t4, $t9 @@ -88,14 +88,14 @@ glabel func_800178F4 /* 01864C 80017A4C 8FAB0030 */ lw $t3, 0x30($sp) /* 018650 80017A50 8FAC0044 */ lw $t4, 0x44($sp) /* 018654 80017A54 15A00002 */ bnez $t5, .L80017A60 -/* 018658 80017A58 00000000 */ nop +/* 018658 80017A58 00000000 */ nop /* 01865C 80017A5C 0007000D */ break 7 .L80017A60: /* 018660 80017A60 2401FFFF */ li $at, -1 /* 018664 80017A64 15A10004 */ bne $t5, $at, .L80017A78 /* 018668 80017A68 3C018000 */ lui $at, 0x8000 /* 01866C 80017A6C 15C10002 */ bne $t6, $at, .L80017A78 -/* 018670 80017A70 00000000 */ nop +/* 018670 80017A70 00000000 */ nop /* 018674 80017A74 0006000D */ break 6 .L80017A78: /* 018678 80017A78 31E4FFFF */ andi $a0, $t7, 0xffff @@ -170,17 +170,17 @@ glabel func_800178F4 /* 018778 80017B78 4624003C */ c.lt.d $f0, $f4 /* 01877C 80017B7C 3C014120 */ li $at, 0x41200000 # 10.000000 /* 018780 80017B80 44814000 */ mtc1 $at, $f8 -/* 018784 80017B84 00000000 */ nop +/* 018784 80017B84 00000000 */ nop /* 018788 80017B88 E4680000 */ swc1 $f8, ($v1) /* 01878C 80017B8C C46A0000 */ lwc1 $f10, ($v1) /* 018790 80017B90 46005021 */ cvt.d.s $f0, $f10 /* 018794 80017B94 4624003C */ c.lt.d $f0, $f4 .L80017B98: -/* 018798 80017B98 00000000 */ nop +/* 018798 80017B98 00000000 */ nop /* 01879C 80017B9C 45020005 */ bc1fl .L80017BB4 /* 0187A0 80017BA0 8FA7004C */ lw $a3, 0x4c($sp) /* 0187A4 80017BA4 44803000 */ mtc1 $zero, $f6 -/* 0187A8 80017BA8 00000000 */ nop +/* 0187A8 80017BA8 00000000 */ nop /* 0187AC 80017BAC E4660000 */ swc1 $f6, ($v1) .L80017BB0: /* 0187B0 80017BB0 8FA7004C */ lw $a3, 0x4c($sp) @@ -193,14 +193,14 @@ glabel func_800178F4 /* 0187C8 80017BC8 00001810 */ mfhi $v1 /* 0187CC 80017BCC 24590002 */ addiu $t9, $v0, 2 /* 0187D0 80017BD0 14E00002 */ bnez $a3, .L80017BDC -/* 0187D4 80017BD4 00000000 */ nop +/* 0187D4 80017BD4 00000000 */ nop /* 0187D8 80017BD8 0007000D */ break 7 .L80017BDC: /* 0187DC 80017BDC 2401FFFF */ li $at, -1 /* 0187E0 80017BE0 14E10004 */ bne $a3, $at, .L80017BF4 /* 0187E4 80017BE4 3C018000 */ lui $at, 0x8000 /* 0187E8 80017BE8 15C10002 */ bne $t6, $at, .L80017BF4 -/* 0187EC 80017BEC 00000000 */ nop +/* 0187EC 80017BEC 00000000 */ nop /* 0187F0 80017BF0 0006000D */ break 6 .L80017BF4: /* 0187F4 80017BF4 0327001A */ div $zero, $t9, $a3 @@ -212,14 +212,14 @@ glabel func_800178F4 /* 01880C 80017C0C 8F050000 */ lw $a1, ($t8) /* 018810 80017C10 01E01825 */ move $v1, $t7 /* 018814 80017C14 14E00002 */ bnez $a3, .L80017C20 -/* 018818 80017C18 00000000 */ nop +/* 018818 80017C18 00000000 */ nop /* 01881C 80017C1C 0007000D */ break 7 .L80017C20: /* 018820 80017C20 2401FFFF */ li $at, -1 /* 018824 80017C24 14E10004 */ bne $a3, $at, .L80017C38 /* 018828 80017C28 3C018000 */ li $at, 0x80000000 # -0.000000 /* 01882C 80017C2C 17210002 */ bne $t9, $at, .L80017C38 -/* 018830 80017C30 00000000 */ nop +/* 018830 80017C30 00000000 */ nop /* 018834 80017C34 0006000D */ break 6 .L80017C38: /* 018838 80017C38 3064FFFF */ andi $a0, $v1, 0xffff @@ -392,7 +392,7 @@ glabel func_800178F4 /* 018ACC 80017ECC C7AE008C */ lwc1 $f14, 0x8c($sp) /* 018AD0 80017ED0 A6020026 */ sh $v0, 0x26($s0) /* 018AD4 80017ED4 46000182 */ mul.s $f6, $f0, $f0 -/* 018AD8 80017ED8 00000000 */ nop +/* 018AD8 80017ED8 00000000 */ nop /* 018ADC 80017EDC 460E7202 */ mul.s $f8, $f14, $f14 /* 018AE0 80017EE0 0C033850 */ jal sqrtf /* 018AE4 80017EE4 46083300 */ add.s $f12, $f6, $f8 @@ -405,4 +405,4 @@ glabel func_800178F4 /* 018B00 80017F00 8FB00020 */ lw $s0, 0x20($sp) /* 018B04 80017F04 27BD00A0 */ addiu $sp, $sp, 0xa0 /* 018B08 80017F08 03E00008 */ jr $ra -/* 018B0C 80017F0C 00000000 */ nop +/* 018B0C 80017F0C 00000000 */ nop diff --git a/asm/non_matchings/code_80005FD0/func_800180F0.s b/asm/non_matchings/code_80005FD0/func_800180F0.s index b45ea3526..0ee77cdd6 100644 --- a/asm/non_matchings/code_80005FD0/func_800180F0.s +++ b/asm/non_matchings/code_80005FD0/func_800180F0.s @@ -14,11 +14,11 @@ glabel func_800180F0 /* 018D20 80018120 C4243068 */ lwc1 $f4, %lo(D_80163068)($at) /* 018D24 80018124 3C0F8016 */ lui $t7, %hi(D_80164688) # $t7, 0x8016 /* 018D28 80018128 3C198016 */ lui $t9, %hi(D_80164648) # $t9, 0x8016 -/* 018D2C 8001812C 3C11800E */ lui $s1, %hi(D_800DC4DC) +/* 018D2C 8001812C 3C11800E */ lui $s1, %hi(gPlayerOne) /* 018D30 80018130 25EF4688 */ addiu $t7, %lo(D_80164688) # addiu $t7, $t7, 0x4688 /* 018D34 80018134 27394648 */ addiu $t9, %lo(D_80164648) # addiu $t9, $t9, 0x4648 /* 018D38 80018138 3C188016 */ lui $t8, %hi(D_80164658) # $t8, 0x8016 -/* 018D3C 8001813C 8E31C4DC */ lw $s1, %lo(D_800DC4DC)($s1) +/* 018D3C 8001813C 8E31C4DC */ lw $s1, %lo(gPlayerOne)($s1) /* 018D40 80018140 01AF2821 */ addu $a1, $t5, $t7 /* 018D44 80018144 27184658 */ addiu $t8, %lo(D_80164658) # addiu $t8, $t8, 0x4658 /* 018D48 80018148 01B97021 */ addu $t6, $t5, $t9 @@ -89,14 +89,14 @@ glabel func_800180F0 /* 018E4C 8001824C 8FAB0030 */ lw $t3, 0x30($sp) /* 018E50 80018250 8FAD0044 */ lw $t5, 0x44($sp) /* 018E54 80018254 15800002 */ bnez $t4, .L80018260 -/* 018E58 80018258 00000000 */ nop +/* 018E58 80018258 00000000 */ nop /* 018E5C 8001825C 0007000D */ break 7 .L80018260: /* 018E60 80018260 2401FFFF */ li $at, -1 /* 018E64 80018264 15810004 */ bne $t4, $at, .L80018278 /* 018E68 80018268 3C018000 */ lui $at, 0x8000 /* 018E6C 8001826C 15C10002 */ bne $t6, $at, .L80018278 -/* 018E70 80018270 00000000 */ nop +/* 018E70 80018270 00000000 */ nop /* 018E74 80018274 0006000D */ break 6 .L80018278: /* 018E78 80018278 31E4FFFF */ andi $a0, $t7, 0xffff @@ -174,17 +174,17 @@ glabel func_800180F0 /* 018F84 80018384 4624003C */ c.lt.d $f0, $f4 /* 018F88 80018388 3C014120 */ li $at, 0x41200000 # 10.000000 /* 018F8C 8001838C 44814000 */ mtc1 $at, $f8 -/* 018F90 80018390 00000000 */ nop +/* 018F90 80018390 00000000 */ nop /* 018F94 80018394 E4680000 */ swc1 $f8, ($v1) /* 018F98 80018398 C46A0000 */ lwc1 $f10, ($v1) /* 018F9C 8001839C 46005021 */ cvt.d.s $f0, $f10 /* 018FA0 800183A0 4624003C */ c.lt.d $f0, $f4 .L800183A4: -/* 018FA4 800183A4 00000000 */ nop +/* 018FA4 800183A4 00000000 */ nop /* 018FA8 800183A8 45020005 */ bc1fl .L800183C0 /* 018FAC 800183AC 8FB90028 */ lw $t9, 0x28($sp) /* 018FB0 800183B0 44803000 */ mtc1 $zero, $f6 -/* 018FB4 800183B4 00000000 */ nop +/* 018FB4 800183B4 00000000 */ nop /* 018FB8 800183B8 E4660000 */ swc1 $f6, ($v1) .L800183BC: /* 018FBC 800183BC 8FB90028 */ lw $t9, 0x28($sp) @@ -196,14 +196,14 @@ glabel func_800180F0 /* 018FD0 800183D0 00001810 */ mfhi $v1 /* 018FD4 800183D4 24590002 */ addiu $t9, $v0, 2 /* 018FD8 800183D8 15800002 */ bnez $t4, .L800183E4 -/* 018FDC 800183DC 00000000 */ nop +/* 018FDC 800183DC 00000000 */ nop /* 018FE0 800183E0 0007000D */ break 7 .L800183E4: /* 018FE4 800183E4 2401FFFF */ li $at, -1 /* 018FE8 800183E8 15810004 */ bne $t4, $at, .L800183FC /* 018FEC 800183EC 3C018000 */ lui $at, 0x8000 /* 018FF0 800183F0 15C10002 */ bne $t6, $at, .L800183FC -/* 018FF4 800183F4 00000000 */ nop +/* 018FF4 800183F4 00000000 */ nop /* 018FF8 800183F8 0006000D */ break 6 .L800183FC: /* 018FFC 800183FC 032C001A */ div $zero, $t9, $t4 @@ -215,14 +215,14 @@ glabel func_800180F0 /* 019014 80018414 8F050000 */ lw $a1, ($t8) /* 019018 80018418 01E01825 */ move $v1, $t7 /* 01901C 8001841C 15800002 */ bnez $t4, .L80018428 -/* 019020 80018420 00000000 */ nop +/* 019020 80018420 00000000 */ nop /* 019024 80018424 0007000D */ break 7 .L80018428: /* 019028 80018428 2401FFFF */ li $at, -1 /* 01902C 8001842C 15810004 */ bne $t4, $at, .L80018440 /* 019030 80018430 3C018000 */ li $at, 0x80000000 # -0.000000 /* 019034 80018434 17210002 */ bne $t9, $at, .L80018440 -/* 019038 80018438 00000000 */ nop +/* 019038 80018438 00000000 */ nop /* 01903C 8001843C 0006000D */ break 6 .L80018440: /* 019040 80018440 3064FFFF */ andi $a0, $v1, 0xffff @@ -395,7 +395,7 @@ glabel func_800180F0 /* 0192D4 800186D4 C7AE008C */ lwc1 $f14, 0x8c($sp) /* 0192D8 800186D8 A6020026 */ sh $v0, 0x26($s0) /* 0192DC 800186DC 46000202 */ mul.s $f8, $f0, $f0 -/* 0192E0 800186E0 00000000 */ nop +/* 0192E0 800186E0 00000000 */ nop /* 0192E4 800186E4 460E7282 */ mul.s $f10, $f14, $f14 /* 0192E8 800186E8 0C033850 */ jal sqrtf /* 0192EC 800186EC 460A4300 */ add.s $f12, $f8, $f10 diff --git a/asm/non_matchings/code_80005FD0/func_800188F4.s b/asm/non_matchings/code_80005FD0/func_800188F4.s index a07b3d4cb..e5a0b3831 100644 --- a/asm/non_matchings/code_80005FD0/func_800188F4.s +++ b/asm/non_matchings/code_80005FD0/func_800188F4.s @@ -1,7 +1,7 @@ glabel func_800188F4 /* 0194F4 800188F4 27BDFF48 */ addiu $sp, $sp, -0xb8 -/* 0194F8 800188F8 3C0E800E */ lui $t6, %hi(D_800DC4DC) -/* 0194FC 800188FC 8DCEC4DC */ lw $t6, %lo(D_800DC4DC)($t6) +/* 0194F8 800188F8 3C0E800E */ lui $t6, %hi(gPlayerOne) +/* 0194FC 800188FC 8DCEC4DC */ lw $t6, %lo(gPlayerOne)($t6) /* 019500 80018900 AFBF0024 */ sw $ra, 0x24($sp) /* 019504 80018904 AFB00020 */ sw $s0, 0x20($sp) /* 019508 80018908 AFA500BC */ sw $a1, 0xbc($sp) @@ -54,14 +54,14 @@ glabel func_800188F4 /* 0195C4 800189C4 030A001A */ div $zero, $t8, $t2 /* 0195C8 800189C8 85670000 */ lh $a3, ($t3) /* 0195CC 800189CC 15400002 */ bnez $t2, .L800189D8 -/* 0195D0 800189D0 00000000 */ nop +/* 0195D0 800189D0 00000000 */ nop /* 0195D4 800189D4 0007000D */ break 7 .L800189D8: /* 0195D8 800189D8 2401FFFF */ li $at, -1 /* 0195DC 800189DC 15410004 */ bne $t2, $at, .L800189F0 /* 0195E0 800189E0 3C018000 */ lui $at, 0x8000 /* 0195E4 800189E4 17010002 */ bne $t8, $at, .L800189F0 -/* 0195E8 800189E8 00000000 */ nop +/* 0195E8 800189E8 00000000 */ nop /* 0195EC 800189EC 0006000D */ break 6 .L800189F0: /* 0195F0 800189F0 0000C810 */ mfhi $t9 @@ -84,7 +84,7 @@ glabel func_800188F4 /* 019630 80018A30 3C01800F */ lui $at, %hi(D_800ED2B0) /* 019634 80018A34 46002021 */ cvt.d.s $f0, $f4 /* 019638 80018A38 462A003C */ c.lt.d $f0, $f10 -/* 01963C 80018A3C 00000000 */ nop +/* 01963C 80018A3C 00000000 */ nop /* 019640 80018A40 45020007 */ bc1fl .L80018A60 /* 019644 80018A44 3C013FE0 */ lui $at, 0x3fe0 /* 019648 80018A48 D426D2B0 */ ldc1 $f6, %lo(D_800ED2B0)($at) @@ -99,9 +99,9 @@ glabel func_800188F4 /* 019668 80018A68 3C01800F */ lui $at, %hi(D_800ED2B8) /* 01966C 80018A6C 46241181 */ sub.d $f6, $f2, $f4 /* 019670 80018A70 4620303C */ c.lt.d $f6, $f0 -/* 019674 80018A74 00000000 */ nop +/* 019674 80018A74 00000000 */ nop /* 019678 80018A78 45000007 */ bc1f .L80018A98 -/* 01967C 80018A7C 00000000 */ nop +/* 01967C 80018A7C 00000000 */ nop /* 019680 80018A80 D428D2B8 */ ldc1 $f8, %lo(D_800ED2B8)($at) /* 019684 80018A84 46280281 */ sub.d $f10, $f0, $f8 /* 019688 80018A88 46205120 */ cvt.s.d $f4, $f10 @@ -113,9 +113,9 @@ glabel func_800188F4 /* 01969C 80018A9C D428D2C0 */ ldc1 $f8, %lo(D_800ED2C0)($at) /* 0196A0 80018AA0 3C01800F */ lui $at, %hi(D_800ED2C8) # $at, 0x800f /* 0196A4 80018AA4 4628003C */ c.lt.d $f0, $f8 -/* 0196A8 80018AA8 00000000 */ nop +/* 0196A8 80018AA8 00000000 */ nop /* 0196AC 80018AAC 45000009 */ bc1f .L80018AD4 -/* 0196B0 80018AB0 00000000 */ nop +/* 0196B0 80018AB0 00000000 */ nop /* 0196B4 80018AB4 C42AD2C8 */ lwc1 $f10, %lo(D_800ED2C8)($at) /* 0196B8 80018AB8 3C01800F */ lui $at, %hi(D_800ED2D0) /* 0196BC 80018ABC 46006121 */ cvt.d.s $f4, $f12 @@ -144,14 +144,14 @@ glabel func_800188F4 /* 019710 80018B10 01EA001A */ div $zero, $t7, $t2 /* 019714 80018B14 0300C825 */ move $t9, $t8 /* 019718 80018B18 15400002 */ bnez $t2, .L80018B24 -/* 01971C 80018B1C 00000000 */ nop +/* 01971C 80018B1C 00000000 */ nop /* 019720 80018B20 0007000D */ break 7 .L80018B24: /* 019724 80018B24 2401FFFF */ li $at, -1 /* 019728 80018B28 15410004 */ bne $t2, $at, .L80018B3C /* 01972C 80018B2C 3C018000 */ lui $at, 0x8000 /* 019730 80018B30 15E10002 */ bne $t7, $at, .L80018B3C -/* 019734 80018B34 00000000 */ nop +/* 019734 80018B34 00000000 */ nop /* 019738 80018B38 0006000D */ break 6 .L80018B3C: /* 01973C 80018B3C 0000C010 */ mfhi $t8 @@ -172,7 +172,7 @@ glabel func_800188F4 /* 019774 80018B74 46281280 */ add.d $f10, $f2, $f8 /* 019778 80018B78 46003021 */ cvt.d.s $f0, $f6 /* 01977C 80018B7C 4620503C */ c.lt.d $f10, $f0 -/* 019780 80018B80 00000000 */ nop +/* 019780 80018B80 00000000 */ nop /* 019784 80018B84 45000006 */ bc1f .L80018BA0 /* 019788 80018B88 3C01800F */ lui $at, %hi(D_800ED2E0) /* 01978C 80018B8C D426D2E0 */ ldc1 $f6, %lo(D_800ED2E0)($at) @@ -184,10 +184,10 @@ glabel func_800188F4 /* 0197A0 80018BA0 3C013FE0 */ li $at, 0x3FE00000 # 1.750000 /* 0197A4 80018BA4 44812800 */ mtc1 $at, $f5 /* 0197A8 80018BA8 44802000 */ mtc1 $zero, $f4 -/* 0197AC 80018BAC 00000000 */ nop +/* 0197AC 80018BAC 00000000 */ nop /* 0197B0 80018BB0 46241180 */ add.d $f6, $f2, $f4 /* 0197B4 80018BB4 4626003C */ c.lt.d $f0, $f6 -/* 0197B8 80018BB8 00000000 */ nop +/* 0197B8 80018BB8 00000000 */ nop /* 0197BC 80018BBC 45000007 */ bc1f .L80018BDC /* 0197C0 80018BC0 3C01800F */ lui $at, %hi(D_800ED2E8) /* 0197C4 80018BC4 D428D2E8 */ ldc1 $f8, %lo(D_800ED2E8)($at) @@ -201,7 +201,7 @@ glabel func_800188F4 /* 0197E0 80018BE0 D428D2F0 */ ldc1 $f8, %lo(D_800ED2F0)($at) /* 0197E4 80018BE4 AFA80040 */ sw $t0, 0x40($sp) /* 0197E8 80018BE8 4620403C */ c.lt.d $f8, $f0 -/* 0197EC 80018BEC 00000000 */ nop +/* 0197EC 80018BEC 00000000 */ nop /* 0197F0 80018BF0 4500000A */ bc1f .L80018C1C /* 0197F4 80018BF4 3C01800F */ lui $at, %hi(D_800ED2F8) # $at, 0x800f /* 0197F8 80018BF8 C42AD2F8 */ lwc1 $f10, %lo(D_800ED2F8)($at) @@ -277,28 +277,28 @@ glabel func_800188F4 /* 019908 80018D08 00001010 */ mfhi $v0 /* 01990C 80018D0C 0002C400 */ sll $t8, $v0, 0x10 /* 019910 80018D10 15400002 */ bnez $t2, .L80018D1C -/* 019914 80018D14 00000000 */ nop +/* 019914 80018D14 00000000 */ nop /* 019918 80018D18 0007000D */ break 7 .L80018D1C: /* 01991C 80018D1C 2401FFFF */ li $at, -1 /* 019920 80018D20 15410004 */ bne $t2, $at, .L80018D34 /* 019924 80018D24 3C018000 */ li $at, 0x80000000 # -0.000000 /* 019928 80018D28 15E10002 */ bne $t7, $at, .L80018D34 -/* 01992C 80018D2C 00000000 */ nop +/* 01992C 80018D2C 00000000 */ nop /* 019930 80018D30 0006000D */ break 6 .L80018D34: /* 019934 80018D34 01CA001A */ div $zero, $t6, $t2 /* 019938 80018D38 0018CC03 */ sra $t9, $t8, 0x10 /* 01993C 80018D3C 03201025 */ move $v0, $t9 /* 019940 80018D40 15400002 */ bnez $t2, .L80018D4C -/* 019944 80018D44 00000000 */ nop +/* 019944 80018D44 00000000 */ nop /* 019948 80018D48 0007000D */ break 7 .L80018D4C: /* 01994C 80018D4C 2401FFFF */ li $at, -1 /* 019950 80018D50 15410004 */ bne $t2, $at, .L80018D64 /* 019954 80018D54 3C018000 */ li $at, 0x80000000 # -0.000000 /* 019958 80018D58 15C10002 */ bne $t6, $at, .L80018D64 -/* 01995C 80018D5C 00000000 */ nop +/* 01995C 80018D5C 00000000 */ nop /* 019960 80018D60 0006000D */ break 6 .L80018D64: /* 019964 80018D64 00007810 */ mfhi $t7 @@ -465,20 +465,20 @@ glabel func_800188F4 /* 019BE0 80018FE0 8FA9004C */ lw $t1, 0x4c($sp) /* 019BE4 80018FE4 C7B20090 */ lwc1 $f18, 0x90($sp) /* 019BE8 80018FE8 4628103C */ c.lt.d $f2, $f8 -/* 019BEC 80018FEC 00000000 */ nop +/* 019BEC 80018FEC 00000000 */ nop /* 019BF0 80018FF0 45010007 */ bc1t .L80019010 /* 019BF4 80018FF4 3C01800F */ lui $at, %hi(D_800ED308) /* 019BF8 80018FF8 D42AD308 */ ldc1 $f10, %lo(D_800ED308)($at) /* 019BFC 80018FFC 3C014020 */ li $at, 0x40200000 # 2.500000 /* 019C00 80019000 4622503E */ c.le.d $f10, $f2 -/* 019C04 80019004 00000000 */ nop +/* 019C04 80019004 00000000 */ nop /* 019C08 80019008 4502000A */ bc1fl .L80019034 /* 019C0C 8001900C 44815800 */ mtc1 $at, $f11 .L80019010: /* 019C10 80019010 3C014024 */ li $at, 0x40240000 # 2.562500 /* 019C14 80019014 44812800 */ mtc1 $at, $f5 /* 019C18 80019018 44802000 */ mtc1 $zero, $f4 -/* 019C1C 8001901C 00000000 */ nop +/* 019C1C 8001901C 00000000 */ nop /* 019C20 80019020 46248180 */ add.d $f6, $f16, $f4 /* 019C24 80019024 46203220 */ cvt.s.d $f8, $f6 /* 019C28 80019028 10000007 */ b .L80019048 @@ -486,7 +486,7 @@ glabel func_800188F4 /* 019C30 80019030 44815800 */ mtc1 $at, $f11 .L80019034: /* 019C34 80019034 44805000 */ mtc1 $zero, $f10 -/* 019C38 80019038 00000000 */ nop +/* 019C38 80019038 00000000 */ nop /* 019C3C 8001903C 462A1100 */ add.d $f4, $f2, $f10 /* 019C40 80019040 462021A0 */ cvt.s.d $f6, $f4 /* 019C44 80019044 E6060004 */ swc1 $f6, 4($s0) @@ -529,7 +529,7 @@ glabel func_800188F4 /* 019CD4 800190D4 C7AE00A4 */ lwc1 $f14, 0xa4($sp) /* 019CD8 800190D8 A6020026 */ sh $v0, 0x26($s0) /* 019CDC 800190DC 46000202 */ mul.s $f8, $f0, $f0 -/* 019CE0 800190E0 00000000 */ nop +/* 019CE0 800190E0 00000000 */ nop /* 019CE4 800190E4 460E7282 */ mul.s $f10, $f14, $f14 /* 019CE8 800190E8 0C033850 */ jal sqrtf /* 019CEC 800190EC 460A4300 */ add.s $f12, $f8, $f10 @@ -542,4 +542,4 @@ glabel func_800188F4 /* 019D08 80019108 8FB00020 */ lw $s0, 0x20($sp) /* 019D0C 8001910C 27BD00B8 */ addiu $sp, $sp, 0xb8 /* 019D10 80019110 03E00008 */ jr $ra -/* 019D14 80019114 00000000 */ nop +/* 019D14 80019114 00000000 */ nop diff --git a/asm/non_matchings/code_80005FD0/func_8001933C.s b/asm/non_matchings/code_80005FD0/func_8001933C.s index 10f83fbf5..799b770b7 100644 --- a/asm/non_matchings/code_80005FD0/func_8001933C.s +++ b/asm/non_matchings/code_80005FD0/func_8001933C.s @@ -23,10 +23,10 @@ glabel func_8001933C /* 019F90 80019390 8C860008 */ lw $a2, 8($a0) /* 019F94 80019394 C48E0004 */ lwc1 $f14, 4($a0) /* 019F98 80019398 C48C0000 */ lwc1 $f12, ($a0) -/* 019F9C 8001939C 3C12800E */ lui $s2, %hi(D_800DC4DC) +/* 019F9C 8001939C 3C12800E */ lui $s2, %hi(gPlayerOne) /* 019FA0 800193A0 000E7080 */ sll $t6, $t6, 2 /* 019FA4 800193A4 3C198016 */ lui $t9, %hi(D_80164668) # $t9, 0x8016 -/* 019FA8 800193A8 8E52C4DC */ lw $s2, %lo(D_800DC4DC)($s2) +/* 019FA8 800193A8 8E52C4DC */ lw $s2, %lo(gPlayerOne)($s2) /* 019FAC 800193AC 27394668 */ addiu $t9, %lo(D_80164668) # addiu $t9, $t9, 0x4668 /* 019FB0 800193B0 00071040 */ sll $v0, $a3, 1 /* 019FB4 800193B4 01C37023 */ subu $t6, $t6, $v1 @@ -94,7 +94,7 @@ glabel func_8001933C /* 01A0A8 800194A8 46003221 */ cvt.d.s $f8, $f6 /* 01A0AC 800194AC 2406000D */ li $a2, 13 /* 01A0B0 800194B0 4622403C */ c.lt.d $f8, $f2 -/* 01A0B4 800194B4 00000000 */ nop +/* 01A0B4 800194B4 00000000 */ nop /* 01A0B8 800194B8 45020006 */ bc1fl .L800194D4 /* 01A0BC 800194BC 3C013FE0 */ lui $at, 0x3fe0 # 1.75 /* 01A0C0 800194C0 0C0068D2 */ jal func_8001A348 @@ -110,16 +110,16 @@ glabel func_8001933C /* 01A0E4 800194E4 4620103C */ c.lt.d $f2, $f0 /* 01A0E8 800194E8 00230821 */ addu $at, $at, $v1 /* 01A0EC 800194EC 4500000D */ bc1f .L80019524 -/* 01A0F0 800194F0 00000000 */ nop +/* 01A0F0 800194F0 00000000 */ nop /* 01A0F4 800194F4 C42A4688 */ lwc1 $f10, %lo(D_80164688)($at) /* 01A0F8 800194F8 02202025 */ move $a0, $s1 /* 01A0FC 800194FC 3C05BF80 */ lui $a1, 0xbf80 /* 01A100 80019500 46005421 */ cvt.d.s $f16, $f10 /* 01A104 80019504 2406000C */ li $a2, 12 /* 01A108 80019508 4630103C */ c.lt.d $f2, $f16 -/* 01A10C 8001950C 00000000 */ nop +/* 01A10C 8001950C 00000000 */ nop /* 01A110 80019510 45000004 */ bc1f .L80019524 -/* 01A114 80019514 00000000 */ nop +/* 01A114 80019514 00000000 */ nop /* 01A118 80019518 0C0068D2 */ jal func_8001A348 /* 01A11C 8001951C AFA3003C */ sw $v1, 0x3c($sp) /* 01A120 80019520 8FA3003C */ lw $v1, 0x3c($sp) @@ -165,7 +165,7 @@ glabel func_8001933C /* 01A1BC 800195BC 46009121 */ cvt.d.s $f4, $f18 /* 01A1C0 800195C0 46803221 */ cvt.d.w $f8, $f6 /* 01A1C4 800195C4 46202402 */ mul.d $f16, $f4, $f0 -/* 01A1C8 800195C8 00000000 */ nop +/* 01A1C8 800195C8 00000000 */ nop /* 01A1CC 800195CC 46281282 */ mul.d $f10, $f2, $f8 /* 01A1D0 800195D0 462A8480 */ add.d $f18, $f16, $f10 /* 01A1D4 800195D4 46209120 */ cvt.s.d $f4, $f18 @@ -176,7 +176,7 @@ glabel func_8001933C /* 01A1E8 800195E8 46003221 */ cvt.d.s $f8, $f6 /* 01A1EC 800195EC 468054A1 */ cvt.d.w $f18, $f10 /* 01A1F0 800195F0 46204402 */ mul.d $f16, $f8, $f0 -/* 01A1F4 800195F4 00000000 */ nop +/* 01A1F4 800195F4 00000000 */ nop /* 01A1F8 800195F8 46321102 */ mul.d $f4, $f2, $f18 /* 01A1FC 800195FC 46248180 */ add.d $f6, $f16, $f4 /* 01A200 80019600 46203220 */ cvt.s.d $f8, $f6 @@ -199,7 +199,7 @@ glabel func_8001933C /* 01A244 80019644 C7AE0084 */ lwc1 $f14, 0x84($sp) /* 01A248 80019648 A6020026 */ sh $v0, 0x26($s0) /* 01A24C 8001964C 46000482 */ mul.s $f18, $f0, $f0 -/* 01A250 80019650 00000000 */ nop +/* 01A250 80019650 00000000 */ nop /* 01A254 80019654 460E7402 */ mul.s $f16, $f14, $f14 /* 01A258 80019658 0C033850 */ jal sqrtf /* 01A25C 8001965C 46109300 */ add.s $f12, $f18, $f16 diff --git a/asm/non_matchings/code_80005FD0/func_80019FB4.s b/asm/non_matchings/code_80005FD0/func_80019FB4.s index 211da0c51..924ed2625 100644 --- a/asm/non_matchings/code_80005FD0/func_80019FB4.s +++ b/asm/non_matchings/code_80005FD0/func_80019FB4.s @@ -1,6 +1,6 @@ glabel func_80019FB4 -/* 01ABB4 80019FB4 3C0F800E */ lui $t7, %hi(D_800DC4BC) -/* 01ABB8 80019FB8 8DEFC4BC */ lw $t7, %lo(D_800DC4BC)($t7) +/* 01ABB4 80019FB4 3C0F800E */ lui $t7, %hi(gControllerOne) +/* 01ABB8 80019FB8 8DEFC4BC */ lw $t7, %lo(gControllerOne)($t7) /* 01ABBC 80019FBC 00047100 */ sll $t6, $a0, 4 /* 01ABC0 80019FC0 3C088016 */ lui $t0, %hi(D_801645D0) # $t0, 0x8016 /* 01ABC4 80019FC4 01CF1021 */ addu $v0, $t6, $t7 @@ -66,4 +66,4 @@ glabel func_80019FB4 /* 01AC94 8001A094 00230821 */ addu $at, $at, $v1 /* 01AC98 8001A098 AC204628 */ sw $zero, %lo(D_80164628)($at) # 0x4628($at) /* 01AC9C 8001A09C 03E00008 */ jr $ra -/* 01ACA0 8001A0A0 00000000 */ nop +/* 01ACA0 8001A0A0 00000000 */ nop diff --git a/asm/non_matchings/code_80005FD0/func_8001AC10.s b/asm/non_matchings/code_80005FD0/func_8001AC10.s index 30492e1bc..a54013911 100644 --- a/asm/non_matchings/code_80005FD0/func_8001AC10.s +++ b/asm/non_matchings/code_80005FD0/func_8001AC10.s @@ -3,8 +3,8 @@ glabel func_8001AC10 /* 01B814 8001AC14 01E47823 */ subu $t7, $t7, $a0 /* 01B818 8001AC18 000F7900 */ sll $t7, $t7, 4 /* 01B81C 8001AC1C 01E47823 */ subu $t7, $t7, $a0 -/* 01B820 8001AC20 3C18800E */ lui $t8, %hi(D_800DC4DC) -/* 01B824 8001AC24 8F18C4DC */ lw $t8, %lo(D_800DC4DC)($t8) +/* 01B820 8001AC20 3C18800E */ lui $t8, %hi(gPlayerOne) +/* 01B824 8001AC24 8F18C4DC */ lw $t8, %lo(gPlayerOne)($t8) /* 01B828 8001AC28 000F7880 */ sll $t7, $t7, 2 /* 01B82C 8001AC2C 3C0B800E */ lui $t3, %hi(gModeSelection) /* 01B830 8001AC30 8D6BC53C */ lw $t3, %lo(gModeSelection)($t3) @@ -37,7 +37,7 @@ glabel func_8001AC10 /* 01B89C 8001AC9C 002C0821 */ addu $at, $at, $t4 /* 01B8A0 8001ACA0 8C2CD404 */ lw $t4, %lo(jpt_800ED404)($at) # -0x2bfc($at) /* 01B8A4 8001ACA4 01800008 */ jr $t4 -/* 01B8A8 8001ACA8 00000000 */ nop +/* 01B8A8 8001ACA8 00000000 */ nop glabel L8001ACAC /* 01B8AC 8001ACAC 2405FFFF */ li $a1, -1 /* 01B8B0 8001ACB0 A6050002 */ sh $a1, 2($s0) @@ -53,17 +53,17 @@ glabel L8001ACAC /* 01B8D8 8001ACD8 25F80064 */ addiu $t8, $t7, 0x64 /* 01B8DC 8001ACDC 030E082A */ slt $at, $t8, $t6 /* 01B8E0 8001ACE0 1020001C */ beqz $at, .L8001AD54 -/* 01B8E4 8001ACE4 00000000 */ nop +/* 01B8E4 8001ACE4 00000000 */ nop /* 01B8E8 8001ACE8 86190004 */ lh $t9, 4($s0) /* 01B8EC 8001ACEC 2B210259 */ slti $at, $t9, 0x259 /* 01B8F0 8001ACF0 14200018 */ bnez $at, .L8001AD54 -/* 01B8F4 8001ACF4 00000000 */ nop +/* 01B8F4 8001ACF4 00000000 */ nop /* 01B8F8 8001ACF8 860B0006 */ lh $t3, 6($s0) /* 01B8FC 8001ACFC 3C038016 */ lui $v1, %hi(lapCount) # 0x8016 /* 01B900 8001AD00 00621821 */ addu $v1, $v1, $v0 /* 01B904 8001AD04 29610003 */ slti $at, $t3, 3 /* 01B908 8001AD08 10200012 */ beqz $at, .L8001AD54 -/* 01B90C 8001AD0C 00000000 */ nop +/* 01B90C 8001AD0C 00000000 */ nop /* 01B910 8001AD10 8C634390 */ lw $v1, %lo(lapCount)($v1) # 0x4390($v1) /* 01B914 8001AD14 3C068016 */ lui $a2, %hi(D_801643B8) # $a2, 0x8016 /* 01B918 8001AD18 24C643B8 */ addiu $a2, %lo(D_801643B8) # addiu $a2, $a2, 0x43b8 @@ -80,7 +80,7 @@ glabel L8001ACAC /* 01B944 8001AD44 0C006ADD */ jal func_8001AB74 /* 01B948 8001AD48 00403025 */ move $a2, $v0 /* 01B94C 8001AD4C 10000003 */ b .L8001AD5C -/* 01B950 8001AD50 00000000 */ nop +/* 01B950 8001AD50 00000000 */ nop .L8001AD54: /* 01B954 8001AD54 0C006AF8 */ jal func_8001ABE0 /* 01B958 8001AD58 02002825 */ move $a1, $s0 @@ -97,7 +97,7 @@ glabel L8001AD64 /* 01B97C 8001AD7C 24C643B8 */ addiu $a2, %lo(D_801643B8) # addiu $a2, $a2, 0x43b8 /* 01B980 8001AD80 3C038016 */ lui $v1, %hi(D_80163478) # $v1, 0x8016 /* 01B984 8001AD84 19C0004B */ blez $t6, .L8001AEB4 -/* 01B988 8001AD88 00000000 */ nop +/* 01B988 8001AD88 00000000 */ nop /* 01B98C 8001AD8C 84633478 */ lh $v1, %lo(D_80163478)($v1) /* 01B990 8001AD90 00CF5821 */ addu $t3, $a2, $t7 /* 01B994 8001AD94 8D6C0000 */ lw $t4, ($t3) @@ -106,7 +106,7 @@ glabel L8001AD64 /* 01B9A0 8001ADA0 8F240000 */ lw $a0, ($t9) /* 01B9A4 8001ADA4 008C082A */ slt $at, $a0, $t4 /* 01B9A8 8001ADA8 10200042 */ beqz $at, .L8001AEB4 -/* 01B9AC 8001ADAC 00000000 */ nop +/* 01B9AC 8001ADAC 00000000 */ nop /* 01B9B0 8001ADB0 14800040 */ bnez $a0, .L8001AEB4 /* 01B9B4 8001ADB4 8FAD002C */ lw $t5, 0x2c($sp) /* 01B9B8 8001ADB8 95A20254 */ lhu $v0, 0x254($t5) @@ -177,7 +177,7 @@ glabel L8001AD64 /* 01BAB0 8001AEB0 A60D0000 */ sh $t5, ($s0) .L8001AEB4: /* 01BAB4 8001AEB4 1505001D */ bne $t0, $a1, .L8001AF2C -/* 01BAB8 8001AEB8 00000000 */ nop +/* 01BAB8 8001AEB8 00000000 */ nop /* 01BABC 8001AEBC 0C0ACB5C */ jal func_802B2D70 /* 01BAC0 8001AEC0 8FA4002C */ lw $a0, 0x2c($sp) /* 01BAC4 8001AEC4 A6020002 */ sh $v0, 2($s0) @@ -385,14 +385,14 @@ glabel L8001B0EC /* 01BDC4 8001B1C4 030B1021 */ addu $v0, $t8, $t3 /* 01BDC8 8001B1C8 44800000 */ mtc1 $zero, $f0 /* 01BDCC 8001B1CC 15E00002 */ bnez $t7, .L8001B1D8 -/* 01BDD0 8001B1D0 00000000 */ nop +/* 01BDD0 8001B1D0 00000000 */ nop /* 01BDD4 8001B1D4 0007000D */ break 7 .L8001B1D8: /* 01BDD8 8001B1D8 2401FFFF */ li $at, -1 /* 01BDDC 8001B1DC 15E10004 */ bne $t7, $at, .L8001B1F0 /* 01BDE0 8001B1E0 3C018000 */ lui $at, 0x8000 /* 01BDE4 8001B1E4 15810002 */ bne $t4, $at, .L8001B1F0 -/* 01BDE8 8001B1E8 00000000 */ nop +/* 01BDE8 8001B1E8 00000000 */ nop /* 01BDEC 8001B1EC 0006000D */ break 6 .L8001B1F0: /* 01BDF0 8001B1F0 844C0000 */ lh $t4, ($v0) @@ -443,7 +443,7 @@ glabel L8001B0EC /* 01BEA4 8001B2A4 0C03262E */ jal func_800C98B8 /* 01BEA8 8001B2A8 25850034 */ addiu $a1, $t4, 0x34 /* 01BEAC 8001B2AC 10000003 */ b .L8001B2BC -/* 01BEB0 8001B2B0 00000000 */ nop +/* 01BEB0 8001B2B0 00000000 */ nop .L8001B2B4: /* 01BEB4 8001B2B4 A6000004 */ sh $zero, 4($s0) /* 01BEB8 8001B2B8 A6000000 */ sh $zero, ($s0) @@ -840,7 +840,7 @@ glabel L8001B838 /* 01C454 8001B854 84E40006 */ lh $a0, 6($a3) /* 01C458 8001B858 24060006 */ li $a2, 6 /* 01C45C 8001B85C 14C40029 */ bne $a2, $a0, .L8001B904 -/* 01C460 8001B860 00000000 */ nop +/* 01C460 8001B860 00000000 */ nop /* 01C464 8001B864 84EF001A */ lh $t7, 0x1a($a3) /* 01C468 8001B868 2405FFFF */ li $a1, -1 /* 01C46C 8001B86C 00001825 */ move $v1, $zero @@ -884,7 +884,7 @@ glabel L8001B838 /* 01C4E8 8001B8E8 240F000C */ li $t7, 12 /* 01C4EC 8001B8EC 01B9082A */ slt $at, $t5, $t9 /* 01C4F0 8001B8F0 10200004 */ beqz $at, .L8001B904 -/* 01C4F4 8001B8F4 00000000 */ nop +/* 01C4F4 8001B8F4 00000000 */ nop /* 01C4F8 8001B8F8 A60F0000 */ sh $t7, ($s0) /* 01C4FC 8001B8FC A6000008 */ sh $zero, 8($s0) /* 01C500 8001B900 A6000004 */ sh $zero, 4($s0) @@ -916,7 +916,7 @@ glabel L8001B90C /* 01C560 8001B960 002D0821 */ addu $at, $at, $t5 /* 01C564 8001B964 8C2DD4A0 */ lw $t5, %lo(jpt_800ED4A0)($at) /* 01C568 8001B968 01A00008 */ jr $t5 -/* 01C56C 8001B96C 00000000 */ nop +/* 01C56C 8001B96C 00000000 */ nop glabel L8001B970 /* 01C570 8001B970 84F9001A */ lh $t9, 0x1a($a3) /* 01C574 8001B974 2405FFFF */ li $a1, -1 @@ -1026,7 +1026,7 @@ glabel L8001BA98 /* 01C6E4 8001BAE4 8FAB0030 */ lw $t3, 0x30($sp) /* 01C6E8 8001BAE8 4600218D */ trunc.w.s $f6, $f4 /* 01C6EC 8001BAEC 440D3000 */ mfc1 $t5, $f6 -/* 01C6F0 8001BAF0 00000000 */ nop +/* 01C6F0 8001BAF0 00000000 */ nop /* 01C6F4 8001BAF4 516D0006 */ beql $t3, $t5, .L8001BB10 /* 01C6F8 8001BAF8 86020004 */ lh $v0, 4($s0) /* 01C6FC 8001BAFC A6000004 */ sh $zero, 4($s0) @@ -1069,9 +1069,9 @@ glabel L8001BB30 /* 01C784 8001BB84 00E02025 */ move $a0, $a3 /* 01C788 8001BB88 4600428D */ trunc.w.s $f10, $f8 /* 01C78C 8001BB8C 44185000 */ mfc1 $t8, $f10 -/* 01C790 8001BB90 00000000 */ nop +/* 01C790 8001BB90 00000000 */ nop /* 01C794 8001BB94 11F80006 */ beq $t7, $t8, .L8001BBB0 -/* 01C798 8001BB98 00000000 */ nop +/* 01C798 8001BB98 00000000 */ nop /* 01C79C 8001BB9C 84EB0010 */ lh $t3, 0x10($a3) .L8001BBA0: /* 01C7A0 8001BBA0 518B001E */ beql $t4, $t3, .L8001BC1C @@ -1117,7 +1117,7 @@ glabel L8001BC28 /* 01C834 8001BC34 0C032B18 */ jal func_800CAC60 /* 01C838 8001BC38 314400FF */ andi $a0, $t2, 0xff /* 01C83C 8001BC3C 0C02796F */ jal func_8009E5BC -/* 01C840 8001BC40 00000000 */ nop +/* 01C840 8001BC40 00000000 */ nop /* 01C844 8001BC44 860F0006 */ lh $t7, 6($s0) /* 01C848 8001BC48 240E0017 */ li $t6, 23 /* 01C84C 8001BC4C A6000004 */ sh $zero, 4($s0) @@ -1277,4 +1277,4 @@ glabel L8001BE30 /* 01CA68 8001BE68 8FB00020 */ lw $s0, 0x20($sp) /* 01CA6C 8001BE6C 27BD0030 */ addiu $sp, $sp, 0x30 /* 01CA70 8001BE70 03E00008 */ jr $ra -/* 01CA74 8001BE74 00000000 */ nop +/* 01CA74 8001BE74 00000000 */ nop diff --git a/asm/non_matchings/code_80005FD0/func_8001BE78.s b/asm/non_matchings/code_80005FD0/func_8001BE78.s index bd09f9329..cd02c52f1 100644 --- a/asm/non_matchings/code_80005FD0/func_8001BE78.s +++ b/asm/non_matchings/code_80005FD0/func_8001BE78.s @@ -31,8 +31,8 @@ glabel func_8001BE78 /* 01CAEC 8001BEEC 00009025 */ move $s2, $zero /* 01CAF0 8001BEF0 0000A825 */ move $s5, $zero .L8001BEF4: -/* 01CAF4 8001BEF4 3C0E800E */ lui $t6, %hi(D_800DC4DC) -/* 01CAF8 8001BEF8 8DCEC4DC */ lw $t6, %lo(D_800DC4DC)($t6) +/* 01CAF4 8001BEF4 3C0E800E */ lui $t6, %hi(gPlayerOne) +/* 01CAF8 8001BEF8 8DCEC4DC */ lw $t6, %lo(gPlayerOne)($t6) /* 01CAFC 8001BEFC 24010001 */ li $at, 1 /* 01CB00 8001BF00 24190006 */ li $t9, 6 /* 01CB04 8001BF04 02AE8821 */ addu $s1, $s5, $t6 @@ -74,7 +74,7 @@ glabel func_8001BE78 /* 01CB7C 8001BF7C 018D8021 */ addu $s0, $t4, $t5 /* 01CB80 8001BF80 860E0000 */ lh $t6, ($s0) /* 01CB84 8001BF84 448E2000 */ mtc1 $t6, $f4 -/* 01CB88 8001BF88 00000000 */ nop +/* 01CB88 8001BF88 00000000 */ nop /* 01CB8C 8001BF8C 468021A0 */ cvt.s.w $f6, $f4 /* 01CB90 8001BF90 E6260014 */ swc1 $f6, 0x14($s1) /* 01CB94 8001BF94 86180004 */ lh $t8, 4($s0) @@ -86,7 +86,7 @@ glabel func_8001BE78 /* 01CBAC 8001BFAC 46804320 */ cvt.s.w $f12, $f8 /* 01CBB0 8001BFB0 44065000 */ mfc1 $a2, $f10 /* 01CBB4 8001BFB4 0C0AB870 */ jal func_802AE1C0 -/* 01CBB8 8001BFB8 00000000 */ nop +/* 01CBB8 8001BFB8 00000000 */ nop /* 01CBBC 8001BFBC C6300070 */ lwc1 $f16, 0x70($s1) /* 01CBC0 8001BFC0 02202025 */ move $a0, $s1 /* 01CBC4 8001BFC4 00002825 */ move $a1, $zero @@ -94,7 +94,7 @@ glabel func_8001BE78 /* 01CBCC 8001BFCC E6320018 */ swc1 $f18, 0x18($s1) /* 01CBD0 8001BFD0 86190004 */ lh $t9, 4($s0) /* 01CBD4 8001BFD4 44992000 */ mtc1 $t9, $f4 -/* 01CBD8 8001BFD8 00000000 */ nop +/* 01CBD8 8001BFD8 00000000 */ nop /* 01CBDC 8001BFDC 468021A0 */ cvt.s.w $f6, $f4 /* 01CBE0 8001BFE0 E626001C */ swc1 $f6, 0x1c($s1) /* 01CBE4 8001BFE4 8FC80000 */ lw $t0, ($fp) diff --git a/asm/non_matchings/code_80005FD0/func_8001C14C.s b/asm/non_matchings/code_80005FD0/func_8001C14C.s index 17231c22e..e83b72467 100644 --- a/asm/non_matchings/code_80005FD0/func_8001C14C.s +++ b/asm/non_matchings/code_80005FD0/func_8001C14C.s @@ -51,11 +51,11 @@ glabel func_8001C14C /* 01CE08 8001C208 3C013FF0 */ li $at, 0x3FF00000 # 1.875000 .L8001C20C: /* 01CE0C 8001C20C 3C1E8016 */ lui $fp, %hi(D_80163484) # $fp, 0x8016 -/* 01CE10 8001C210 3C14800E */ lui $s4, %hi(D_800DC4DC) +/* 01CE10 8001C210 3C14800E */ lui $s4, %hi(gPlayerOne) /* 01CE14 8001C214 4481A800 */ mtc1 $at, $f21 /* 01CE18 8001C218 4480A000 */ mtc1 $zero, $f20 /* 01CE1C 8001C21C 27DE3484 */ addiu $fp, %lo(D_80163484) # addiu $fp, $fp, 0x3484 -/* 01CE20 8001C220 2694C4DC */ addiu $s4, %lo(D_800DC4DC) # addiu $s4, $s4, -0x3b24 +/* 01CE20 8001C220 2694C4DC */ addiu $s4, %lo(gPlayerOne) # addiu $s4, $s4, -0x3b24 /* 01CE24 8001C224 00008825 */ move $s1, $zero /* 01CE28 8001C228 3C150100 */ lui $s5, 0x100 /* 01CE2C 8001C22C 24130003 */ li $s3, 3 @@ -94,7 +94,7 @@ glabel func_8001C14C /* 01CEA8 8001C2A8 46128100 */ add.s $f4, $f16, $f18 /* 01CEAC 8001C2AC 460021A1 */ cvt.d.s $f6, $f4 /* 01CEB0 8001C2B0 4634303C */ c.lt.d $f6, $f20 -/* 01CEB4 8001C2B4 00000000 */ nop +/* 01CEB4 8001C2B4 00000000 */ nop /* 01CEB8 8001C2B8 45020032 */ bc1fl .L8001C384 /* 01CEBC 8001C2BC 26310001 */ addiu $s1, $s1, 1 /* 01CEC0 8001C2C0 5233001E */ beql $s1, $s3, .L8001C33C @@ -103,7 +103,7 @@ glabel func_8001C14C /* 01CECC 8001C2CC 306ADFFF */ andi $t2, $v1, 0xdfff /* 01CED0 8001C2D0 34692000 */ ori $t1, $v1, 0x2000 /* 01CED4 8001C2D4 15000003 */ bnez $t0, .L8001C2E4 -/* 01CED8 8001C2D8 3C0E800E */ lui $t6, %hi(D_800DC4E0) +/* 01CED8 8001C2D8 3C0E800E */ lui $t6, %hi(gPlayerTwo) /* 01CEDC 8001C2DC 10000002 */ b .L8001C2E8 /* 01CEE0 8001C2E0 A6090000 */ sh $t1, ($s0) .L8001C2E4: @@ -114,13 +114,13 @@ glabel func_8001C14C /* 01CEF0 8001C2F0 318D2000 */ andi $t5, $t4, 0x2000 /* 01CEF4 8001C2F4 51A00023 */ beql $t5, $zero, .L8001C384 /* 01CEF8 8001C2F8 26310001 */ addiu $s1, $s1, 1 -/* 01CEFC 8001C2FC 8DCEC4E0 */ lw $t6, %lo(D_800DC4E0)($t6) -/* 01CF00 8001C300 3C19800E */ lui $t9, %hi(D_800DC4E4) +/* 01CEFC 8001C2FC 8DCEC4E0 */ lw $t6, %lo(gPlayerTwo)($t6) +/* 01CF00 8001C300 3C19800E */ lui $t9, %hi(gPlayerThree) /* 01CF04 8001C304 95CF0000 */ lhu $t7, ($t6) /* 01CF08 8001C308 31F82000 */ andi $t8, $t7, 0x2000 /* 01CF0C 8001C30C 5300001D */ beql $t8, $zero, .L8001C384 /* 01CF10 8001C310 26310001 */ addiu $s1, $s1, 1 -/* 01CF14 8001C314 8F39C4E4 */ lw $t9, %lo(D_800DC4E4)($t9) +/* 01CF14 8001C314 8F39C4E4 */ lw $t9, %lo(gPlayerThree)($t9) /* 01CF18 8001C318 3C018016 */ lui $at, %hi(D_80163480) # $at, 0x8016 /* 01CF1C 8001C31C 97280000 */ lhu $t0, ($t9) /* 01CF20 8001C320 31092000 */ andi $t1, $t0, 0x2000 @@ -155,7 +155,7 @@ glabel func_8001C14C .L8001C384: /* 01CF84 8001C384 24010004 */ li $at, 4 /* 01CF88 8001C388 1621FFA9 */ bne $s1, $at, .L8001C230 -/* 01CF8C 8001C38C 00000000 */ nop +/* 01CF8C 8001C38C 00000000 */ nop .L8001C390: /* 01CF90 8001C390 8FBF0044 */ lw $ra, 0x44($sp) /* 01CF94 8001C394 D7B40018 */ ldc1 $f20, 0x18($sp) diff --git a/asm/non_matchings/code_80005FD0/func_8001C3C4.s b/asm/non_matchings/code_80005FD0/func_8001C3C4.s index 1bd31df48..5c409fc7c 100644 --- a/asm/non_matchings/code_80005FD0/func_8001C3C4.s +++ b/asm/non_matchings/code_80005FD0/func_8001C3C4.s @@ -21,12 +21,12 @@ glabel func_8001C3C4 /* 01D00C 8001C40C 57010004 */ bnel $t8, $at, .L8001C420 /* 01D010 8001C410 8FBF0014 */ lw $ra, 0x14($sp) /* 01D014 8001C414 0C015C45 */ jal func_80057114 -/* 01D018 8001C418 00000000 */ nop +/* 01D018 8001C418 00000000 */ nop /* 01D01C 8001C41C 8FBF0014 */ lw $ra, 0x14($sp) .L8001C420: /* 01D020 8001C420 27BD0018 */ addiu $sp, $sp, 0x18 /* 01D024 8001C424 03E00008 */ jr $ra -/* 01D028 8001C428 00000000 */ nop +/* 01D028 8001C428 00000000 */ nop /* 01D02C 8001C42C 3C02800E */ lui $v0, %hi(D_800DDB20) /* 01D030 8001C430 2442DB20 */ addiu $v0, %lo(D_800DDB20) # addiu $v0, $v0, -0x24e0 @@ -34,9 +34,9 @@ glabel func_8001C3C4 /* 01D038 8001C438 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 01D03C 8001C43C AFBF0014 */ sw $ra, 0x14($sp) /* 01D040 8001C440 15C0000A */ bnez $t6, .L8001C46C -/* 01D044 8001C444 3C09800E */ lui $t1, %hi(D_800DC4C4) -/* 01D048 8001C448 3C0F800E */ lui $t7, %hi(D_800DC4C4) -/* 01D04C 8001C44C 8DEFC4C4 */ lw $t7, %lo(D_800DC4C4)($t7) +/* 01D044 8001C444 3C09800E */ lui $t1, %hi(gControllerThree) +/* 01D048 8001C448 3C0F800E */ lui $t7, %hi(gControllerThree) +/* 01D04C 8001C44C 8DEFC4C4 */ lw $t7, %lo(gControllerThree)($t7) /* 01D050 8001C450 24080001 */ li $t0, 1 /* 01D054 8001C454 95F80006 */ lhu $t8, 6($t7) /* 01D058 8001C458 33190020 */ andi $t9, $t8, 0x20 @@ -45,15 +45,15 @@ glabel func_8001C3C4 /* 01D064 8001C464 10000014 */ b .L8001C4B8 /* 01D068 8001C468 AC480000 */ sw $t0, ($v0) .L8001C46C: -/* 01D06C 8001C46C 8D29C4C4 */ lw $t1, %lo(D_800DC4C4)($t1) +/* 01D06C 8001C46C 8D29C4C4 */ lw $t1, %lo(gControllerThree)($t1) /* 01D070 8001C470 952A0006 */ lhu $t2, 6($t1) /* 01D074 8001C474 314B0020 */ andi $t3, $t2, 0x20 /* 01D078 8001C478 11600002 */ beqz $t3, .L8001C484 -/* 01D07C 8001C47C 00000000 */ nop +/* 01D07C 8001C47C 00000000 */ nop /* 01D080 8001C480 AC400000 */ sw $zero, ($v0) .L8001C484: /* 01D084 8001C484 0C015F18 */ jal func_80057C60 -/* 01D088 8001C488 00000000 */ nop +/* 01D088 8001C488 00000000 */ nop /* 01D08C 8001C48C 3C048015 */ lui $a0, %hi(gDisplayListHead) # $a0, 0x8015 /* 01D090 8001C490 24840298 */ addiu $a0, %lo(gDisplayListHead) # addiu $a0, $a0, 0x298 /* 01D094 8001C494 8C830000 */ lw $v1, ($a0) @@ -70,6 +70,6 @@ glabel func_8001C3C4 .L8001C4BC: /* 01D0BC 8001C4BC 27BD0018 */ addiu $sp, $sp, 0x18 /* 01D0C0 8001C4C0 03E00008 */ jr $ra -/* 01D0C4 8001C4C4 00000000 */ nop +/* 01D0C4 8001C4C4 00000000 */ nop -/* 01D0C8 8001C4C8 00000000 */ nop +/* 01D0C8 8001C4C8 00000000 */ nop diff --git a/asm/non_matchings/code_8001C4D0/func_8001C4D0.s b/asm/non_matchings/code_8001C4D0/func_8001C4D0.s index 086706950..144478fc3 100644 --- a/asm/non_matchings/code_8001C4D0/func_8001C4D0.s +++ b/asm/non_matchings/code_8001C4D0/func_8001C4D0.s @@ -7,11 +7,11 @@ glabel func_8001C4D0 /* 01D0E4 8001C4E4 00067040 */ sll $t6, $a2, 1 /* 01D0E8 8001C4E8 002E0821 */ addu $at, $at, $t6 /* 01D0EC 8001C4EC A4242300 */ sh $a0, %lo(D_80152300)($at) # 0x2300 -/* 01D0F0 8001C4F0 3C03800E */ lui $v1, %hi(D_800DC4DC) # $v1, 0x800e +/* 01D0F0 8001C4F0 3C03800E */ lui $v1, %hi(gPlayerOne) # $v1, 0x800e /* 01D0F4 8001C4F4 2C81000B */ sltiu $at, $a0, 0xb /* 01D0F8 8001C4F8 AFBF0014 */ sw $ra, 0x14($sp) /* 01D0FC 8001C4FC AFA7004C */ sw $a3, 0x4c($sp) -/* 01D100 8001C500 8C63C4DC */ lw $v1, %lo(D_800DC4DC)($v1) +/* 01D100 8001C500 8C63C4DC */ lw $v1, %lo(gPlayerOne)($v1) /* 01D104 8001C504 10200131 */ beqz $at, .L8001C9CC /* 01D108 8001C508 01C03025 */ move $a2, $t6 /* 01D10C 8001C50C 00047880 */ sll $t7, $a0, 2 @@ -19,7 +19,7 @@ glabel func_8001C4D0 /* 01D114 8001C514 002F0821 */ addu $at, $at, $t7 /* 01D118 8001C518 8C2FD4E0 */ lw $t7, %lo(jpt_800ED4E0)($at) /* 01D11C 8001C51C 01E00008 */ jr $t7 -/* 01D120 8001C520 00000000 */ nop +/* 01D120 8001C520 00000000 */ nop glabel L8001C524 /* 01D124 8001C524 8FB80054 */ lw $t8, 0x54($sp) /* 01D128 8001C528 3C018016 */ lui $at, %hi(D_80164A89) # $at, 0x8016 @@ -135,7 +135,7 @@ glabel L8001C524 /* 01D2E0 8001C6E0 A4F900AC */ sh $t9, 0xac($a3) /* 01D2E4 8001C6E4 8C820000 */ lw $v0, ($a0) /* 01D2E8 8001C6E8 1040000A */ beqz $v0, .L8001C714 -/* 01D2EC 8001C6EC 00000000 */ nop +/* 01D2EC 8001C6EC 00000000 */ nop /* 01D2F0 8001C6F0 10480028 */ beq $v0, $t0, .L8001C794 /* 01D2F4 8001C6F4 3C0D800E */ lui $t5, %hi(gModeSelection) # $t5, 0x800e /* 01D2F8 8001C6F8 24010002 */ li $at, 2 @@ -299,7 +299,7 @@ glabel L8001C524 .L8001C944: /* 01D544 8001C944 3C014270 */ li $at, 0x42700000 # 60.000000 /* 01D548 8001C948 44814000 */ mtc1 $at, $f8 -/* 01D54C 8001C94C 00000000 */ nop +/* 01D54C 8001C94C 00000000 */ nop /* 01D550 8001C950 E4480000 */ swc1 $f8, ($v0) .L8001C954: /* 01D554 8001C954 C44A0000 */ lwc1 $f10, ($v0) @@ -321,7 +321,7 @@ glabel L8001C524 .L8001C990: /* 01D590 8001C990 3C014270 */ li $at, 0x42700000 # 60.000000 /* 01D594 8001C994 44819000 */ mtc1 $at, $f18 -/* 01D598 8001C998 00000000 */ nop +/* 01D598 8001C998 00000000 */ nop /* 01D59C 8001C99C E4520000 */ swc1 $f18, ($v0) .L8001C9A0: /* 01D5A0 8001C9A0 3C0141A0 */ li $at, 0x41A00000 # 20.000000 @@ -354,4 +354,4 @@ glabel L8001C9CC /* 01D600 8001CA00 8FBF0014 */ lw $ra, 0x14($sp) /* 01D604 8001CA04 27BD0040 */ addiu $sp, $sp, 0x40 /* 01D608 8001CA08 03E00008 */ jr $ra -/* 01D60C 8001CA0C 00000000 */ nop +/* 01D60C 8001CA0C 00000000 */ nop diff --git a/asm/non_matchings/code_8001C4D0/func_8001EE98.s b/asm/non_matchings/code_8001C4D0/func_8001EE98.s index 1ed89d128..02a5129aa 100644 --- a/asm/non_matchings/code_8001C4D0/func_8001EE98.s +++ b/asm/non_matchings/code_8001C4D0/func_8001EE98.s @@ -30,14 +30,14 @@ glabel func_8001EE98 /* 01FAFC 8001EEFC 24030001 */ li $v1, 1 /* 01FB00 8001EF00 8FAC0038 */ lw $t4, 0x38($sp) /* 01FB04 8001EF04 154B0002 */ bne $t2, $t3, .L8001EF10 -/* 01FB08 8001EF08 00000000 */ nop +/* 01FB08 8001EF08 00000000 */ nop /* 01FB0C 8001EF0C 24100003 */ li $s0, 3 .L8001EF10: /* 01FB10 8001EF10 8C42C53C */ lw $v0, %lo(gModeSelection)($v0) /* 01FB14 8001EF14 5040000C */ beql $v0, $zero, .L8001EF48 /* 01FB18 8001EF18 958D0000 */ lhu $t5, ($t4) /* 01FB1C 8001EF1C 10430070 */ beq $v0, $v1, .L8001F0E0 -/* 01FB20 8001EF20 3C0C800E */ lui $t4, %hi(D_800DC4DC) # 0x800e +/* 01FB20 8001EF20 3C0C800E */ lui $t4, %hi(gPlayerOne) # 0x800e /* 01FB24 8001EF24 24010002 */ li $at, 2 /* 01FB28 8001EF28 104100A0 */ beq $v0, $at, .L8001F1AC /* 01FB2C 8001EF2C 8FAC0038 */ lw $t4, 0x38($sp) # 0x38($sp) @@ -45,7 +45,7 @@ glabel func_8001EE98 /* 01FB34 8001EF34 1041002C */ beq $v0, $at, .L8001EFE8 /* 01FB38 8001EF38 3C0C800E */ lui $t4, %hi(D_800DC51C) # 0x800e # Possible red herring. Not a pointer. /* 01FB3C 8001EF3C 100000CB */ b .L8001F26C -/* 01FB40 8001EF40 00000000 */ nop +/* 01FB40 8001EF40 00000000 */ nop /* 01FB44 8001EF44 958D0000 */ lhu $t5, ($t4) .L8001EF48: /* 01FB48 8001EF48 24010800 */ li $at, 2048 @@ -90,27 +90,27 @@ glabel func_8001EE98 /* 01FBD8 8001EFD8 AFB00010 */ sw $s0, 0x10($sp) /* 01FBDC 8001EFDC 24030001 */ li $v1, 1 /* 01FBE0 8001EFE0 100000A2 */ b .L8001F26C -/* 01FBE4 8001EFE4 00000000 */ nop +/* 01FBE4 8001EFE4 00000000 */ nop .L8001EFE8: /* 01FBE8 8001EFE8 958CC51C */ lhu $t4, %lo(D_800DC51C)($t4) /* 01FBEC 8001EFEC 3C0D8016 */ lui $t5, %hi(D_8015F894) # $t5, 0x8016 /* 01FBF0 8001EFF0 3C0F8016 */ lui $t7, %hi(D_80164A88) # $t7, 0x8016 /* 01FBF4 8001EFF4 106C0009 */ beq $v1, $t4, .L8001F01C -/* 01FBF8 8001EFF8 00000000 */ nop +/* 01FBF8 8001EFF8 00000000 */ nop /* 01FBFC 8001EFFC 95ADF894 */ lhu $t5, %lo(D_8015F894)($t5) /* 01FC00 8001F000 24010002 */ li $at, 2 /* 01FC04 8001F004 3C0E8016 */ lui $t6, %hi(D_80164A89) # $t6, 0x8016 /* 01FC08 8001F008 15A10014 */ bne $t5, $at, .L8001F05C -/* 01FC0C 8001F00C 00000000 */ nop +/* 01FC0C 8001F00C 00000000 */ nop /* 01FC10 8001F010 81CE4A89 */ lb $t6, %lo(D_80164A89)($t6) /* 01FC14 8001F014 146E0011 */ bne $v1, $t6, .L8001F05C -/* 01FC18 8001F018 00000000 */ nop +/* 01FC18 8001F018 00000000 */ nop .L8001F01C: /* 01FC1C 8001F01C 81EF4A88 */ lb $t7, %lo(D_80164A88)($t7) /* 01FC20 8001F020 15E00004 */ bnez $t7, .L8001F034 -/* 01FC24 8001F024 00000000 */ nop +/* 01FC24 8001F024 00000000 */ nop /* 01FC28 8001F028 0C0067B4 */ jal func_80019ED0 -/* 01FC2C 8001F02C 00000000 */ nop +/* 01FC2C 8001F02C 00000000 */ nop /* 01FC30 8001F030 24030001 */ li $v1, 1 .L8001F034: /* 01FC34 8001F034 3C048015 */ lui $a0, %hi(D_80152300) # $a0, 0x8015 @@ -160,14 +160,14 @@ glabel func_8001EE98 /* 01FCD8 8001F0D8 10000064 */ b .L8001F26C /* 01FCDC 8001F0DC A48B0000 */ sh $t3, ($a0) .L8001F0E0: -/* 01FCE0 8001F0E0 8D8CC4DC */ lw $t4, %lo(D_800DC4DC)($t4) +/* 01FCE0 8001F0E0 8D8CC4DC */ lw $t4, %lo(gPlayerOne)($t4) /* 01FCE4 8001F0E4 24010800 */ li $at, 2048 /* 01FCE8 8001F0E8 3C0F800E */ lui $t7, %hi(D_800DC51C) # $t7, 0x800e /* 01FCEC 8001F0EC 958D0000 */ lhu $t5, ($t4) /* 01FCF0 8001F0F0 24020003 */ li $v0, 3 /* 01FCF4 8001F0F4 31AE0800 */ andi $t6, $t5, 0x800 /* 01FCF8 8001F0F8 11C10004 */ beq $t6, $at, .L8001F10C -/* 01FCFC 8001F0FC 00000000 */ nop +/* 01FCFC 8001F0FC 00000000 */ nop /* 01FD00 8001F100 95EFC51C */ lhu $t7, %lo(D_800DC51C)($t7) /* 01FD04 8001F104 3C18800E */ lui $t8, %hi(D_800DC5FC) # $t8, 0x800e /* 01FD08 8001F108 146F0009 */ bne $v1, $t7, .L8001F130 @@ -214,7 +214,7 @@ glabel func_8001EE98 /* 01FD9C 8001F19C 240B0001 */ li $t3, 1 /* 01FDA0 8001F1A0 A48B0000 */ sh $t3, ($a0) /* 01FDA4 8001F1A4 10000031 */ b .L8001F26C -/* 01FDA8 8001F1A8 00000000 */ nop +/* 01FDA8 8001F1A8 00000000 */ nop .L8001F1AC: /* 01FDAC 8001F1AC 958D0000 */ lhu $t5, ($t4) /* 01FDB0 8001F1B0 24010800 */ li $at, 2048 @@ -353,4 +353,4 @@ glabel func_8001EE98 /* 01FF84 8001F384 8FB00020 */ lw $s0, 0x20($sp) /* 01FF88 8001F388 27BD0038 */ addiu $sp, $sp, 0x38 /* 01FF8C 8001F38C 03E00008 */ jr $ra -/* 01FF90 8001F390 00000000 */ nop +/* 01FF90 8001F390 00000000 */ nop diff --git a/asm/non_matchings/code_8001C4D0/func_8001F394.s b/asm/non_matchings/code_8001C4D0/func_8001F394.s index 62364cb8c..23e9aa65d 100644 --- a/asm/non_matchings/code_8001C4D0/func_8001F394.s +++ b/asm/non_matchings/code_8001C4D0/func_8001F394.s @@ -1,6 +1,6 @@ glabel func_8001F394 -/* 01FF94 8001F394 3C0E800E */ lui $t6, %hi(D_800DC4DC) # $t6, 0x800e -/* 01FF98 8001F398 8DCEC4DC */ lw $t6, %lo(D_800DC4DC)($t6) +/* 01FF94 8001F394 3C0E800E */ lui $t6, %hi(gPlayerOne) # $t6, 0x800e +/* 01FF98 8001F398 8DCEC4DC */ lw $t6, %lo(gPlayerOne)($t6) /* 01FF9C 8001F39C 27BDFFC8 */ addiu $sp, $sp, -0x38 /* 01FFA0 8001F3A0 AFBF0014 */ sw $ra, 0x14($sp) /* 01FFA4 8001F3A4 AFA5003C */ sw $a1, 0x3c($sp) @@ -8,22 +8,22 @@ glabel func_8001F394 /* 01FFAC 8001F3AC 00803025 */ move $a2, $a0 /* 01FFB0 8001F3B0 AFA0002C */ sw $zero, 0x2c($sp) .L8001F3B4: -/* 01FFB4 8001F3B4 3C0F800E */ lui $t7, %hi(D_800DC4E0) # $t7, 0x800e -/* 01FFB8 8001F3B8 8DEFC4E0 */ lw $t7, %lo(D_800DC4E0)($t7) +/* 01FFB4 8001F3B4 3C0F800E */ lui $t7, %hi(gPlayerTwo) # $t7, 0x800e +/* 01FFB8 8001F3B8 8DEFC4E0 */ lw $t7, %lo(gPlayerTwo)($t7) /* 01FFBC 8001F3BC 24180001 */ li $t8, 1 -/* 01FFC0 8001F3C0 3C19800E */ lui $t9, %hi(D_800DC4E4) # $t9, 0x800e +/* 01FFC0 8001F3C0 3C19800E */ lui $t9, %hi(gPlayerThree) # $t9, 0x800e /* 01FFC4 8001F3C4 14CF0002 */ bne $a2, $t7, .L8001F3D0 -/* 01FFC8 8001F3C8 3C09800E */ lui $t1, %hi(D_800DC4E8) # $t1, 0x800e +/* 01FFC8 8001F3C8 3C09800E */ lui $t1, %hi(gPlayerFour) # $t1, 0x800e /* 01FFCC 8001F3CC AFB8002C */ sw $t8, 0x2c($sp) .L8001F3D0: -/* 01FFD0 8001F3D0 8F39C4E4 */ lw $t9, %lo(D_800DC4E4)($t9) +/* 01FFD0 8001F3D0 8F39C4E4 */ lw $t9, %lo(gPlayerThree)($t9) /* 01FFD4 8001F3D4 24080002 */ li $t0, 2 /* 01FFD8 8001F3D8 240A0003 */ li $t2, 3 /* 01FFDC 8001F3DC 14D90002 */ bne $a2, $t9, .L8001F3E8 /* 01FFE0 8001F3E0 3C050010 */ lui $a1, 0x10 /* 01FFE4 8001F3E4 AFA8002C */ sw $t0, 0x2c($sp) .L8001F3E8: -/* 01FFE8 8001F3E8 8D29C4E8 */ lw $t1, %lo(D_800DC4E8)($t1) +/* 01FFE8 8001F3E8 8D29C4E8 */ lw $t1, %lo(gPlayerFour)($t1) /* 01FFEC 8001F3EC 54C90003 */ bnel $a2, $t1, .L8001F3FC /* 01FFF0 8001F3F0 8FA7002C */ lw $a3, 0x2c($sp) /* 01FFF4 8001F3F4 AFAA002C */ sw $t2, 0x2c($sp) @@ -73,7 +73,7 @@ glabel func_8001F394 /* 020090 8001F490 304E0040 */ andi $t6, $v0, 0x40 /* 020094 8001F494 24010040 */ li $at, 64 /* 020098 8001F498 15C10002 */ bne $t6, $at, .L8001F4A4 -/* 02009C 8001F49C 00000000 */ nop +/* 02009C 8001F49C 00000000 */ nop .L8001F4A0: /* 0200A0 8001F4A0 AC6F0000 */ sw $t7, ($v1) .L8001F4A4: @@ -92,7 +92,7 @@ glabel func_8001F394 /* 0200D0 8001F4D0 00380821 */ addu $at, $at, $t8 /* 0200D4 8001F4D4 8C38D5D8 */ lw $t8, %lo(jpt_800ED5D8)($at) /* 0200D8 8001F4D8 03000008 */ jr $t8 -/* 0200DC 8001F4DC 00000000 */ nop +/* 0200DC 8001F4DC 00000000 */ nop glabel L8001F4E0 /* 0200E0 8001F4E0 8CC8000C */ lw $t0, 0xc($a2) /* 0200E4 8001F4E4 3C198016 */ lui $t9, %hi(D_80164498) # $t9, 0x8016 @@ -113,7 +113,7 @@ glabel L8001F4E0 /* 02011C 8001F51C 44811000 */ mtc1 $at, $f2 /* 020120 8001F520 C4800000 */ lwc1 $f0, ($a0) /* 020124 8001F524 4600103C */ c.lt.s $f2, $f0 -/* 020128 8001F528 00000000 */ nop +/* 020128 8001F528 00000000 */ nop /* 02012C 8001F52C 45020005 */ bc1fl .L8001F544 /* 020130 8001F530 AC600000 */ sw $zero, ($v1) /* 020134 8001F534 46020101 */ sub.s $f4, $f0, $f2 @@ -150,11 +150,11 @@ glabel L8001F54C /* 0201A4 8001F5A4 C4800000 */ lwc1 $f0, ($a0) /* 0201A8 8001F5A8 3C014000 */ li $at, 0x40000000 # 2.000000 /* 0201AC 8001F5AC 4600103C */ c.lt.s $f2, $f0 -/* 0201B0 8001F5B0 00000000 */ nop +/* 0201B0 8001F5B0 00000000 */ nop /* 0201B4 8001F5B4 45020007 */ bc1fl .L8001F5D4 /* 0201B8 8001F5B8 AC600000 */ sw $zero, ($v1) /* 0201BC 8001F5BC 44813000 */ mtc1 $at, $f6 -/* 0201C0 8001F5C0 00000000 */ nop +/* 0201C0 8001F5C0 00000000 */ nop /* 0201C4 8001F5C4 46060201 */ sub.s $f8, $f0, $f6 /* 0201C8 8001F5C8 10000064 */ b .L8001F75C /* 0201CC 8001F5CC E4880000 */ swc1 $f8, ($a0) @@ -185,7 +185,7 @@ glabel L8001F5DC /* 020224 8001F624 44811000 */ mtc1 $at, $f2 /* 020228 8001F628 C4800000 */ lwc1 $f0, ($a0) /* 02022C 8001F62C 4600103C */ c.lt.s $f2, $f0 -/* 020230 8001F630 00000000 */ nop +/* 020230 8001F630 00000000 */ nop /* 020234 8001F634 45020005 */ bc1fl .L8001F64C /* 020238 8001F638 AC600000 */ sw $zero, ($v1) /* 02023C 8001F63C 46020281 */ sub.s $f10, $f0, $f2 @@ -209,7 +209,7 @@ glabel L8001F654 /* 02027C 8001F67C AFA7001C */ sw $a3, 0x1c($sp) /* 020280 8001F680 44061000 */ mfc1 $a2, $f2 /* 020284 8001F684 0C008973 */ jal func_800225CC -/* 020288 8001F688 00000000 */ nop +/* 020288 8001F688 00000000 */ nop /* 02028C 8001F68C 44806000 */ mtc1 $zero, $f12 /* 020290 8001F690 10000032 */ b .L8001F75C /* 020294 8001F694 8FA7001C */ lw $a3, 0x1c($sp) @@ -219,11 +219,11 @@ glabel L8001F654 /* 0202A0 8001F6A0 C4800000 */ lwc1 $f0, ($a0) /* 0202A4 8001F6A4 3C014000 */ li $at, 0x40000000 # 2.000000 /* 0202A8 8001F6A8 4600103C */ c.lt.s $f2, $f0 -/* 0202AC 8001F6AC 00000000 */ nop +/* 0202AC 8001F6AC 00000000 */ nop /* 0202B0 8001F6B0 45020007 */ bc1fl .L8001F6D0 /* 0202B4 8001F6B4 AC600000 */ sw $zero, ($v1) /* 0202B8 8001F6B8 44818000 */ mtc1 $at, $f16 -/* 0202BC 8001F6BC 00000000 */ nop +/* 0202BC 8001F6BC 00000000 */ nop /* 0202C0 8001F6C0 46100481 */ sub.s $f18, $f0, $f16 /* 0202C4 8001F6C4 10000025 */ b .L8001F75C /* 0202C8 8001F6C8 E4920000 */ swc1 $f18, ($a0) @@ -257,11 +257,11 @@ glabel L8001F6D8 /* 020328 8001F728 C4800000 */ lwc1 $f0, ($a0) /* 02032C 8001F72C 3C014000 */ li $at, 0x40000000 # 2.000000 /* 020330 8001F730 4600103C */ c.lt.s $f2, $f0 -/* 020334 8001F734 00000000 */ nop +/* 020334 8001F734 00000000 */ nop /* 020338 8001F738 45020007 */ bc1fl .L8001F758 /* 02033C 8001F73C AC600000 */ sw $zero, ($v1) /* 020340 8001F740 44812000 */ mtc1 $at, $f4 -/* 020344 8001F744 00000000 */ nop +/* 020344 8001F744 00000000 */ nop /* 020348 8001F748 46040181 */ sub.s $f6, $f0, $f4 /* 02034C 8001F74C 10000003 */ b .L8001F75C /* 020350 8001F750 E4860000 */ swc1 $f6, ($a0) @@ -302,7 +302,7 @@ glabel L8001F6D8 /* 0203CC 8001F7CC C4800000 */ lwc1 $f0, ($a0) /* 0203D0 8001F7D0 3C01800F */ lui $at, %hi(D_800ED5F0) /* 0203D4 8001F7D4 4600603E */ c.le.s $f12, $f0 -/* 0203D8 8001F7D8 00000000 */ nop +/* 0203D8 8001F7D8 00000000 */ nop /* 0203DC 8001F7DC 45020008 */ bc1fl .L8001F800 /* 0203E0 8001F7E0 460C003E */ c.le.s $f0, $f12 /* 0203E4 8001F7E4 D430D5F0 */ ldc1 $f16, %lo(D_800ED5F0)($at) @@ -313,7 +313,7 @@ glabel L8001F6D8 /* 0203F8 8001F7F8 C4800000 */ lwc1 $f0, ($a0) /* 0203FC 8001F7FC 460C003E */ c.le.s $f0, $f12 .L8001F800: -/* 020400 8001F800 00000000 */ nop +/* 020400 8001F800 00000000 */ nop /* 020404 8001F804 45020004 */ bc1fl .L8001F818 /* 020408 8001F808 8FAF003C */ lw $t7, 0x3c($sp) /* 02040C 8001F80C AC600000 */ sw $zero, ($v1) @@ -348,4 +348,4 @@ glabel L8001F6D8 /* 02046C 8001F86C 8FBF0014 */ lw $ra, 0x14($sp) /* 020470 8001F870 27BD0038 */ addiu $sp, $sp, 0x38 /* 020474 8001F874 03E00008 */ jr $ra -/* 020478 8001F878 00000000 */ nop +/* 020478 8001F878 00000000 */ nop diff --git a/asm/non_matchings/code_8001C4D0/func_8001F87C.s b/asm/non_matchings/code_8001C4D0/func_8001F87C.s index 8cc863abf..2c211d896 100644 --- a/asm/non_matchings/code_8001C4D0/func_8001F87C.s +++ b/asm/non_matchings/code_8001C4D0/func_8001F87C.s @@ -2,12 +2,12 @@ glabel func_8001F87C /* 02047C 8001F87C 3C0E800E */ lui $t6, %hi(D_800DC52C) # $t6, 0x800e /* 020480 8001F880 8DCEC52C */ lw $t6, %lo(D_800DC52C)($t6) /* 020484 8001F884 27BDFFF0 */ addiu $sp, $sp, -0x10 -/* 020488 8001F888 3C02800E */ lui $v0, %hi(D_800DC4DC) # $v0, 0x800e +/* 020488 8001F888 3C02800E */ lui $v0, %hi(gPlayerOne) # $v0, 0x800e /* 02048C 8001F88C AFB2000C */ sw $s2, 0xc($sp) /* 020490 8001F890 AFB10008 */ sw $s1, 8($sp) /* 020494 8001F894 AFB00004 */ sw $s0, 4($sp) /* 020498 8001F898 15C00033 */ bnez $t6, .L8001F968 -/* 02049C 8001F89C 8C42C4DC */ lw $v0, %lo(D_800DC4DC)($v0) +/* 02049C 8001F89C 8C42C4DC */ lw $v0, %lo(gPlayerOne)($v0) /* 0204A0 8001F8A0 3C0F800E */ lui $t7, %hi(gModeSelection) # $t7, 0x800e /* 0204A4 8001F8A4 8DEFC53C */ lw $t7, %lo(gModeSelection)($t7) /* 0204A8 8001F8A8 00002825 */ move $a1, $zero @@ -36,7 +36,7 @@ glabel func_8001F87C /* 020500 8001F900 5720001A */ bnel $t9, $zero, .L8001F96C /* 020504 8001F904 8FB00004 */ lw $s0, 4($sp) /* 020508 8001F908 14A30004 */ bne $a1, $v1, .L8001F91C -/* 02050C 8001F90C 00000000 */ nop +/* 02050C 8001F90C 00000000 */ nop /* 020510 8001F910 8CEE0000 */ lw $t6, ($a3) /* 020514 8001F914 25CF0001 */ addiu $t7, $t6, 1 /* 020518 8001F918 ACEF0000 */ sw $t7, ($a3) diff --git a/asm/non_matchings/code_8001F980/func_8001F9E4.s b/asm/non_matchings/code_8001F980/func_8001F9E4.s index 36606fc4a..a64b2b38e 100644 --- a/asm/non_matchings/code_8001F980/func_8001F9E4.s +++ b/asm/non_matchings/code_8001F980/func_8001F9E4.s @@ -4,7 +4,7 @@ glabel func_8001F9E4 /* 0205EC 8001F9EC AFB00018 */ sw $s0, 0x18($sp) /* 0205F0 8001F9F0 00808025 */ move $s0, $a0 /* 0205F4 8001F9F4 AFA5003C */ sw $a1, 0x3c($sp) -/* 0205F8 8001F9F8 0C009F40 */ jal func_80027D00 +/* 0205F8 8001F9F8 0C009F40 */ jal get_player_index_for_player /* 0205FC 8001F9FC AFA60040 */ sw $a2, 0x40($sp) /* 020600 8001FA00 27A40030 */ addiu $a0, $sp, 0x30 /* 020604 8001FA04 0C007E60 */ jal func_8001F980 @@ -41,7 +41,7 @@ glabel func_8001F9E4 /* 020680 8001FA80 44062000 */ mfc1 $a2, $f4 /* 020684 8001FA84 44073000 */ mfc1 $a3, $f6 /* 020688 8001FA88 0C007EC3 */ jal func_8001FB0C -/* 02068C 8001FA8C 00000000 */ nop +/* 02068C 8001FA8C 00000000 */ nop /* 020690 8001FA90 24010001 */ li $at, 1 /* 020694 8001FA94 14410004 */ bne $v0, $at, .L8001FAA8 /* 020698 8001FA98 8FA30024 */ lw $v1, 0x24($sp) @@ -62,7 +62,7 @@ glabel func_8001F9E4 /* 0206D0 8001FAD0 44075000 */ mfc1 $a3, $f10 /* 0206D4 8001FAD4 44064000 */ mfc1 $a2, $f8 /* 0206D8 8001FAD8 0C007EC3 */ jal func_8001FB0C -/* 0206DC 8001FADC 00000000 */ nop +/* 0206DC 8001FADC 00000000 */ nop /* 0206E0 8001FAE0 24010001 */ li $at, 1 /* 0206E4 8001FAE4 14410004 */ bne $v0, $at, .L8001FAF8 /* 0206E8 8001FAE8 8FB80020 */ lw $t8, 0x20($sp) @@ -74,4 +74,4 @@ glabel func_8001F9E4 /* 0206FC 8001FAFC 8FB00018 */ lw $s0, 0x18($sp) /* 020700 8001FB00 27BD0038 */ addiu $sp, $sp, 0x38 /* 020704 8001FB04 03E00008 */ jr $ra -/* 020708 8001FB08 00000000 */ nop +/* 020708 8001FB08 00000000 */ nop diff --git a/asm/non_matchings/code_8001F980/func_80020524.s b/asm/non_matchings/code_8001F980/func_80020524.s index e522c138b..8b568fb0a 100644 --- a/asm/non_matchings/code_8001F980/func_80020524.s +++ b/asm/non_matchings/code_8001F980/func_80020524.s @@ -34,47 +34,47 @@ glabel func_80020524 /* 0211A4 800205A4 01E03025 */ move $a2, $t7 /* 0211A8 800205A8 0C009D58 */ jal func_80027560 /* 0211AC 800205AC AFAC0010 */ sw $t4, 0x10($sp) -/* 0211B0 800205B0 3C04800E */ lui $a0, %hi(D_800DC4FC) # $a0, 0x800e -/* 0211B4 800205B4 8C84C4FC */ lw $a0, %lo(D_800DC4FC)($a0) +/* 0211B0 800205B0 3C04800E */ lui $a0, %hi(gPlayerOneCopy) # $a0, 0x800e +/* 0211B4 800205B4 8C84C4FC */ lw $a0, %lo(gPlayerOneCopy)($a0) /* 0211B8 800205B8 00002825 */ move $a1, $zero /* 0211BC 800205BC 0C01B96B */ jal func_8006E5AC /* 0211C0 800205C0 00003025 */ move $a2, $zero -/* 0211C4 800205C4 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e -/* 0211C8 800205C8 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) +/* 0211C4 800205C4 3C04800E */ lui $a0, %hi(gPlayerTwo) # $a0, 0x800e +/* 0211C8 800205C8 8C84C4E0 */ lw $a0, %lo(gPlayerTwo)($a0) /* 0211CC 800205CC 24050001 */ li $a1, 1 /* 0211D0 800205D0 0C01B96B */ jal func_8006E5AC /* 0211D4 800205D4 00003025 */ move $a2, $zero -/* 0211D8 800205D8 3C04800E */ lui $a0, %hi(D_800DC4E4) # $a0, 0x800e -/* 0211DC 800205DC 8C84C4E4 */ lw $a0, %lo(D_800DC4E4)($a0) +/* 0211D8 800205D8 3C04800E */ lui $a0, %hi(gPlayerThree) # $a0, 0x800e +/* 0211DC 800205DC 8C84C4E4 */ lw $a0, %lo(gPlayerThree)($a0) /* 0211E0 800205E0 24050002 */ li $a1, 2 /* 0211E4 800205E4 0C01B96B */ jal func_8006E5AC /* 0211E8 800205E8 00003025 */ move $a2, $zero -/* 0211EC 800205EC 3C04800E */ lui $a0, %hi(D_800DC4E8) # $a0, 0x800e -/* 0211F0 800205F0 8C84C4E8 */ lw $a0, %lo(D_800DC4E8)($a0) +/* 0211EC 800205EC 3C04800E */ lui $a0, %hi(gPlayerFour) # $a0, 0x800e +/* 0211F0 800205F0 8C84C4E8 */ lw $a0, %lo(gPlayerFour)($a0) /* 0211F4 800205F4 24050003 */ li $a1, 3 /* 0211F8 800205F8 0C01B96B */ jal func_8006E5AC /* 0211FC 800205FC 00003025 */ move $a2, $zero /* 021200 80020600 3C0D800E */ lui $t5, %hi(D_800DC52C) # $t5, 0x800e /* 021204 80020604 8DADC52C */ lw $t5, %lo(D_800DC52C)($t5) /* 021208 80020608 24010003 */ li $at, 3 -/* 02120C 8002060C 3C04800E */ lui $a0, %hi(D_800DC4EC) # $a0, 0x800e +/* 02120C 8002060C 3C04800E */ lui $a0, %hi(gPlayerFive) # $a0, 0x800e /* 021210 80020610 11A10013 */ beq $t5, $at, .L80020660 /* 021214 80020614 24050004 */ li $a1, 4 -/* 021218 80020618 8C84C4EC */ lw $a0, %lo(D_800DC4EC)($a0) +/* 021218 80020618 8C84C4EC */ lw $a0, %lo(gPlayerFive)($a0) /* 02121C 8002061C 0C01B96B */ jal func_8006E5AC /* 021220 80020620 00003025 */ move $a2, $zero -/* 021224 80020624 3C04800E */ lui $a0, %hi(D_800DC4F0) # $a0, 0x800e -/* 021228 80020628 8C84C4F0 */ lw $a0, %lo(D_800DC4F0)($a0) +/* 021224 80020624 3C04800E */ lui $a0, %hi(gPlayerSix) # $a0, 0x800e +/* 021228 80020628 8C84C4F0 */ lw $a0, %lo(gPlayerSix)($a0) /* 02122C 8002062C 24050005 */ li $a1, 5 /* 021230 80020630 0C01B96B */ jal func_8006E5AC /* 021234 80020634 00003025 */ move $a2, $zero -/* 021238 80020638 3C04800E */ lui $a0, %hi(D_800DC4F4) # $a0, 0x800e -/* 02123C 8002063C 8C84C4F4 */ lw $a0, %lo(D_800DC4F4)($a0) +/* 021238 80020638 3C04800E */ lui $a0, %hi(gPlayerSeven) # $a0, 0x800e +/* 02123C 8002063C 8C84C4F4 */ lw $a0, %lo(gPlayerSeven)($a0) /* 021240 80020640 24050006 */ li $a1, 6 /* 021244 80020644 0C01B96B */ jal func_8006E5AC /* 021248 80020648 00003025 */ move $a2, $zero -/* 02124C 8002064C 3C04800E */ lui $a0, %hi(D_800DC4F8) # $a0, 0x800e -/* 021250 80020650 8C84C4F8 */ lw $a0, %lo(D_800DC4F8)($a0) +/* 02124C 8002064C 3C04800E */ lui $a0, %hi(gPlayerEight) # $a0, 0x800e +/* 021250 80020650 8C84C4F8 */ lw $a0, %lo(gPlayerEight)($a0) /* 021254 80020654 24050007 */ li $a1, 7 /* 021258 80020658 0C01B96B */ jal func_8006E5AC /* 02125C 8002065C 00003025 */ move $a2, $zero @@ -167,7 +167,7 @@ glabel func_80020524 /* 0213B0 800207B0 000D8403 */ sra $s0, $t5, 0x10 /* 0213B4 800207B4 0202082A */ slt $at, $s0, $v0 /* 0213B8 800207B8 1420FFBA */ bnez $at, .L800206A4 -/* 0213BC 800207BC 00000000 */ nop +/* 0213BC 800207BC 00000000 */ nop .L800207C0: /* 0213C0 800207C0 00023840 */ sll $a3, $v0, 1 /* 0213C4 800207C4 3C038016 */ lui $v1, %hi(D_80164ABE) # 0x8016 diff --git a/asm/non_matchings/code_8001F980/func_8002088C.s b/asm/non_matchings/code_8001F980/func_8002088C.s index c65549b93..f9548da11 100644 --- a/asm/non_matchings/code_8001F980/func_8002088C.s +++ b/asm/non_matchings/code_8001F980/func_8002088C.s @@ -34,47 +34,47 @@ glabel func_8002088C /* 02150C 8002090C 01E03025 */ move $a2, $t7 /* 021510 80020910 0C009D58 */ jal func_80027560 /* 021514 80020914 AFAC0010 */ sw $t4, 0x10($sp) -/* 021518 80020918 3C04800E */ lui $a0, %hi(D_800DC4FC) # $a0, 0x800e -/* 02151C 8002091C 8C84C4FC */ lw $a0, %lo(D_800DC4FC)($a0) +/* 021518 80020918 3C04800E */ lui $a0, %hi(gPlayerOneCopy) # $a0, 0x800e +/* 02151C 8002091C 8C84C4FC */ lw $a0, %lo(gPlayerOneCopy)($a0) /* 021520 80020920 00002825 */ move $a1, $zero /* 021524 80020924 0C01B98D */ jal func_8006E634 /* 021528 80020928 24060001 */ li $a2, 1 -/* 02152C 8002092C 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e -/* 021530 80020930 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) +/* 02152C 8002092C 3C04800E */ lui $a0, %hi(gPlayerTwo) # $a0, 0x800e +/* 021530 80020930 8C84C4E0 */ lw $a0, %lo(gPlayerTwo)($a0) /* 021534 80020934 24050001 */ li $a1, 1 /* 021538 80020938 0C01B98D */ jal func_8006E634 /* 02153C 8002093C 24060001 */ li $a2, 1 -/* 021540 80020940 3C04800E */ lui $a0, %hi(D_800DC4E4) # $a0, 0x800e -/* 021544 80020944 8C84C4E4 */ lw $a0, %lo(D_800DC4E4)($a0) +/* 021540 80020940 3C04800E */ lui $a0, %hi(gPlayerThree) # $a0, 0x800e +/* 021544 80020944 8C84C4E4 */ lw $a0, %lo(gPlayerThree)($a0) /* 021548 80020948 24050002 */ li $a1, 2 /* 02154C 8002094C 0C01B98D */ jal func_8006E634 /* 021550 80020950 24060001 */ li $a2, 1 -/* 021554 80020954 3C04800E */ lui $a0, %hi(D_800DC4E8) # $a0, 0x800e -/* 021558 80020958 8C84C4E8 */ lw $a0, %lo(D_800DC4E8)($a0) +/* 021554 80020954 3C04800E */ lui $a0, %hi(gPlayerFour) # $a0, 0x800e +/* 021558 80020958 8C84C4E8 */ lw $a0, %lo(gPlayerFour)($a0) /* 02155C 8002095C 24050003 */ li $a1, 3 /* 021560 80020960 0C01B98D */ jal func_8006E634 /* 021564 80020964 24060001 */ li $a2, 1 /* 021568 80020968 3C0D800E */ lui $t5, %hi(D_800DC52C) # $t5, 0x800e /* 02156C 8002096C 8DADC52C */ lw $t5, %lo(D_800DC52C)($t5) /* 021570 80020970 24010003 */ li $at, 3 -/* 021574 80020974 3C04800E */ lui $a0, %hi(D_800DC4EC) # $a0, 0x800e +/* 021574 80020974 3C04800E */ lui $a0, %hi(gPlayerFive) # $a0, 0x800e /* 021578 80020978 11A10013 */ beq $t5, $at, .L800209C8 /* 02157C 8002097C 24050004 */ li $a1, 4 -/* 021580 80020980 8C84C4EC */ lw $a0, %lo(D_800DC4EC)($a0) +/* 021580 80020980 8C84C4EC */ lw $a0, %lo(gPlayerFive)($a0) /* 021584 80020984 0C01B98D */ jal func_8006E634 /* 021588 80020988 24060001 */ li $a2, 1 -/* 02158C 8002098C 3C04800E */ lui $a0, %hi(D_800DC4F0) # $a0, 0x800e -/* 021590 80020990 8C84C4F0 */ lw $a0, %lo(D_800DC4F0)($a0) +/* 02158C 8002098C 3C04800E */ lui $a0, %hi(gPlayerSix) # $a0, 0x800e +/* 021590 80020990 8C84C4F0 */ lw $a0, %lo(gPlayerSix)($a0) /* 021594 80020994 24050005 */ li $a1, 5 /* 021598 80020998 0C01B98D */ jal func_8006E634 /* 02159C 8002099C 24060001 */ li $a2, 1 -/* 0215A0 800209A0 3C04800E */ lui $a0, %hi(D_800DC4F4) # $a0, 0x800e -/* 0215A4 800209A4 8C84C4F4 */ lw $a0, %lo(D_800DC4F4)($a0) +/* 0215A0 800209A0 3C04800E */ lui $a0, %hi(gPlayerSeven) # $a0, 0x800e +/* 0215A4 800209A4 8C84C4F4 */ lw $a0, %lo(gPlayerSeven)($a0) /* 0215A8 800209A8 24050006 */ li $a1, 6 /* 0215AC 800209AC 0C01B98D */ jal func_8006E634 /* 0215B0 800209B0 24060001 */ li $a2, 1 -/* 0215B4 800209B4 3C04800E */ lui $a0, %hi(D_800DC4F8) # $a0, 0x800e -/* 0215B8 800209B8 8C84C4F8 */ lw $a0, %lo(D_800DC4F8)($a0) +/* 0215B4 800209B4 3C04800E */ lui $a0, %hi(gPlayerEight) # $a0, 0x800e +/* 0215B8 800209B8 8C84C4F8 */ lw $a0, %lo(gPlayerEight)($a0) /* 0215BC 800209BC 24050007 */ li $a1, 7 /* 0215C0 800209C0 0C01B98D */ jal func_8006E634 /* 0215C4 800209C4 24060001 */ li $a2, 1 @@ -167,7 +167,7 @@ glabel func_8002088C /* 021718 80020B18 000D8403 */ sra $s0, $t5, 0x10 /* 02171C 80020B1C 0202082A */ slt $at, $s0, $v0 /* 021720 80020B20 1420FFBA */ bnez $at, .L80020A0C -/* 021724 80020B24 00000000 */ nop +/* 021724 80020B24 00000000 */ nop .L80020B28: /* 021728 80020B28 00023840 */ sll $a3, $v0, 1 /* 02172C 80020B2C 3C038016 */ lui $v1, %hi(D_80164ABE) # 0x8016 diff --git a/asm/non_matchings/code_8001F980/func_80020BF4.s b/asm/non_matchings/code_8001F980/func_80020BF4.s index 1a95d1950..7bc26a861 100644 --- a/asm/non_matchings/code_8001F980/func_80020BF4.s +++ b/asm/non_matchings/code_8001F980/func_80020BF4.s @@ -34,23 +34,23 @@ glabel func_80020BF4 /* 021874 80020C74 00193E03 */ sra $a3, $t9, 0x18 /* 021878 80020C78 0C009D58 */ jal func_80027560 /* 02187C 80020C7C AFAE0010 */ sw $t6, 0x10($sp) -/* 021880 80020C80 3C04800E */ lui $a0, %hi(D_800DC4FC) # $a0, 0x800e -/* 021884 80020C84 8C84C4FC */ lw $a0, %lo(D_800DC4FC)($a0) +/* 021880 80020C80 3C04800E */ lui $a0, %hi(gPlayerOneCopy) # $a0, 0x800e +/* 021884 80020C84 8C84C4FC */ lw $a0, %lo(gPlayerOneCopy)($a0) /* 021888 80020C88 00002825 */ move $a1, $zero /* 02188C 80020C8C 0C01B9AF */ jal func_8006E6BC /* 021890 80020C90 24060002 */ li $a2, 2 -/* 021894 80020C94 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e -/* 021898 80020C98 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) +/* 021894 80020C94 3C04800E */ lui $a0, %hi(gPlayerTwo) # $a0, 0x800e +/* 021898 80020C98 8C84C4E0 */ lw $a0, %lo(gPlayerTwo)($a0) /* 02189C 80020C9C 24050001 */ li $a1, 1 /* 0218A0 80020CA0 0C01B9AF */ jal func_8006E6BC /* 0218A4 80020CA4 24060002 */ li $a2, 2 -/* 0218A8 80020CA8 3C04800E */ lui $a0, %hi(D_800DC4E4) # $a0, 0x800e -/* 0218AC 80020CAC 8C84C4E4 */ lw $a0, %lo(D_800DC4E4)($a0) +/* 0218A8 80020CA8 3C04800E */ lui $a0, %hi(gPlayerThree) # $a0, 0x800e +/* 0218AC 80020CAC 8C84C4E4 */ lw $a0, %lo(gPlayerThree)($a0) /* 0218B0 80020CB0 24050002 */ li $a1, 2 /* 0218B4 80020CB4 0C01B9AF */ jal func_8006E6BC /* 0218B8 80020CB8 24060002 */ li $a2, 2 -/* 0218BC 80020CBC 3C04800E */ lui $a0, %hi(D_800DC4E8) # $a0, 0x800e -/* 0218C0 80020CC0 8C84C4E8 */ lw $a0, %lo(D_800DC4E8)($a0) +/* 0218BC 80020CBC 3C04800E */ lui $a0, %hi(gPlayerFour) # $a0, 0x800e +/* 0218C0 80020CC0 8C84C4E8 */ lw $a0, %lo(gPlayerFour)($a0) /* 0218C4 80020CC4 24050003 */ li $a1, 3 /* 0218C8 80020CC8 0C01B9AF */ jal func_8006E6BC /* 0218CC 80020CCC 24060002 */ li $a2, 2 @@ -146,7 +146,7 @@ glabel func_80020BF4 /* 021A30 80020E30 00198403 */ sra $s0, $t9, 0x10 /* 021A34 80020E34 0202082A */ slt $at, $s0, $v0 /* 021A38 80020E38 1420FFB6 */ bnez $at, .L80020D14 -/* 021A3C 80020E3C 00000000 */ nop +/* 021A3C 80020E3C 00000000 */ nop .L80020E40: /* 021A40 80020E40 00023840 */ sll $a3, $v0, 1 /* 021A44 80020E44 3C038016 */ lui $v1, %hi(D_80164ABE) # 0x8016 diff --git a/asm/non_matchings/code_8001F980/func_80020F1C.s b/asm/non_matchings/code_8001F980/func_80020F1C.s index e411c37ee..545dfd517 100644 --- a/asm/non_matchings/code_8001F980/func_80020F1C.s +++ b/asm/non_matchings/code_8001F980/func_80020F1C.s @@ -34,23 +34,23 @@ glabel func_80020F1C /* 021B9C 80020F9C 00193E03 */ sra $a3, $t9, 0x18 /* 021BA0 80020FA0 0C009D58 */ jal func_80027560 /* 021BA4 80020FA4 AFAE0010 */ sw $t6, 0x10($sp) -/* 021BA8 80020FA8 3C04800E */ lui $a0, %hi(D_800DC4FC) # $a0, 0x800e -/* 021BAC 80020FAC 8C84C4FC */ lw $a0, %lo(D_800DC4FC)($a0) +/* 021BA8 80020FA8 3C04800E */ lui $a0, %hi(gPlayerOneCopy) # $a0, 0x800e +/* 021BAC 80020FAC 8C84C4FC */ lw $a0, %lo(gPlayerOneCopy)($a0) /* 021BB0 80020FB0 00002825 */ move $a1, $zero /* 021BB4 80020FB4 0C01B9D1 */ jal func_8006E744 /* 021BB8 80020FB8 24060003 */ li $a2, 3 -/* 021BBC 80020FBC 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e -/* 021BC0 80020FC0 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) +/* 021BBC 80020FBC 3C04800E */ lui $a0, %hi(gPlayerTwo) # $a0, 0x800e +/* 021BC0 80020FC0 8C84C4E0 */ lw $a0, %lo(gPlayerTwo)($a0) /* 021BC4 80020FC4 24050001 */ li $a1, 1 /* 021BC8 80020FC8 0C01B9D1 */ jal func_8006E744 /* 021BCC 80020FCC 24060003 */ li $a2, 3 -/* 021BD0 80020FD0 3C04800E */ lui $a0, %hi(D_800DC4E4) # $a0, 0x800e -/* 021BD4 80020FD4 8C84C4E4 */ lw $a0, %lo(D_800DC4E4)($a0) +/* 021BD0 80020FD0 3C04800E */ lui $a0, %hi(gPlayerThree) # $a0, 0x800e +/* 021BD4 80020FD4 8C84C4E4 */ lw $a0, %lo(gPlayerThree)($a0) /* 021BD8 80020FD8 24050002 */ li $a1, 2 /* 021BDC 80020FDC 0C01B9D1 */ jal func_8006E744 /* 021BE0 80020FE0 24060003 */ li $a2, 3 -/* 021BE4 80020FE4 3C04800E */ lui $a0, %hi(D_800DC4E8) # $a0, 0x800e -/* 021BE8 80020FE8 8C84C4E8 */ lw $a0, %lo(D_800DC4E8)($a0) +/* 021BE4 80020FE4 3C04800E */ lui $a0, %hi(gPlayerFour) # $a0, 0x800e +/* 021BE8 80020FE8 8C84C4E8 */ lw $a0, %lo(gPlayerFour)($a0) /* 021BEC 80020FEC 24050003 */ li $a1, 3 /* 021BF0 80020FF0 0C01B9D1 */ jal func_8006E744 /* 021BF4 80020FF4 24060003 */ li $a2, 3 @@ -146,7 +146,7 @@ glabel func_80020F1C /* 021D58 80021158 00198403 */ sra $s0, $t9, 0x10 /* 021D5C 8002115C 0202082A */ slt $at, $s0, $v0 /* 021D60 80021160 1420FFB6 */ bnez $at, .L8002103C -/* 021D64 80021164 00000000 */ nop +/* 021D64 80021164 00000000 */ nop .L80021168: /* 021D68 80021168 00023840 */ sll $a3, $v0, 1 /* 021D6C 8002116C 3C038016 */ lui $v1, %hi(D_80164ABE) # 0x8016 diff --git a/asm/non_matchings/code_8001F980/func_800212B4.s b/asm/non_matchings/code_8001F980/func_800212B4.s index bddee2542..663db1e7e 100644 --- a/asm/non_matchings/code_8001F980/func_800212B4.s +++ b/asm/non_matchings/code_8001F980/func_800212B4.s @@ -25,7 +25,7 @@ glabel func_800212B4 /* 021F10 80021310 ADC10018 */ sw $at, 0x18($t6) /* 021F14 80021314 8D410000 */ lw $at, ($t2) /* 021F18 80021318 8D4D0004 */ lw $t5, 4($t2) -/* 021F1C 8002131C 3C04800E */ lui $a0, %hi(D_800DC4FC) # $a0, 0x800e +/* 021F1C 8002131C 3C04800E */ lui $a0, %hi(gPlayerOneCopy) # $a0, 0x800e /* 021F20 80021320 AD210000 */ sw $at, ($t1) /* 021F24 80021324 8D410008 */ lw $at, 8($t2) /* 021F28 80021328 AD2D0004 */ sw $t5, 4($t1) @@ -44,158 +44,158 @@ glabel func_800212B4 /* 021F5C 8002135C 3C05800E */ lui $a1, %hi(camera1) # $a1, 0x800e /* 021F60 80021360 AC20DB58 */ sw $zero, %lo(D_800DDB58)($at) /* 021F64 80021364 8CA5DB40 */ lw $a1, %lo(camera1)($a1) -/* 021F68 80021368 8C84C4FC */ lw $a0, %lo(D_800DC4FC)($a0) +/* 021F68 80021368 8C84C4FC */ lw $a0, %lo(gPlayerOneCopy)($a0) /* 021F6C 8002136C 00003025 */ move $a2, $zero /* 021F70 80021370 0C008000 */ jal func_80020000 /* 021F74 80021374 00003825 */ move $a3, $zero -/* 021F78 80021378 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e +/* 021F78 80021378 3C04800E */ lui $a0, %hi(gPlayerTwo) # $a0, 0x800e /* 021F7C 8002137C 3C05800E */ lui $a1, %hi(camera1) # $a1, 0x800e /* 021F80 80021380 8CA5DB40 */ lw $a1, %lo(camera1)($a1) -/* 021F84 80021384 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) +/* 021F84 80021384 8C84C4E0 */ lw $a0, %lo(gPlayerTwo)($a0) /* 021F88 80021388 24060001 */ li $a2, 1 /* 021F8C 8002138C 0C008000 */ jal func_80020000 /* 021F90 80021390 00003825 */ move $a3, $zero -/* 021F94 80021394 3C04800E */ lui $a0, %hi(D_800DC4E4) # $a0, 0x800e +/* 021F94 80021394 3C04800E */ lui $a0, %hi(gPlayerThree) # $a0, 0x800e /* 021F98 80021398 3C05800E */ lui $a1, %hi(camera1) # $a1, 0x800e /* 021F9C 8002139C 8CA5DB40 */ lw $a1, %lo(camera1)($a1) -/* 021FA0 800213A0 8C84C4E4 */ lw $a0, %lo(D_800DC4E4)($a0) +/* 021FA0 800213A0 8C84C4E4 */ lw $a0, %lo(gPlayerThree)($a0) /* 021FA4 800213A4 24060002 */ li $a2, 2 /* 021FA8 800213A8 0C008000 */ jal func_80020000 /* 021FAC 800213AC 00003825 */ move $a3, $zero -/* 021FB0 800213B0 3C04800E */ lui $a0, %hi(D_800DC4E8) # $a0, 0x800e +/* 021FB0 800213B0 3C04800E */ lui $a0, %hi(gPlayerFour) # $a0, 0x800e /* 021FB4 800213B4 3C05800E */ lui $a1, %hi(camera1) # $a1, 0x800e /* 021FB8 800213B8 8CA5DB40 */ lw $a1, %lo(camera1)($a1) -/* 021FBC 800213BC 8C84C4E8 */ lw $a0, %lo(D_800DC4E8)($a0) +/* 021FBC 800213BC 8C84C4E8 */ lw $a0, %lo(gPlayerFour)($a0) /* 021FC0 800213C0 24060003 */ li $a2, 3 /* 021FC4 800213C4 0C008000 */ jal func_80020000 /* 021FC8 800213C8 00003825 */ move $a3, $zero /* 021FCC 800213CC 3C19800E */ lui $t9, %hi(D_800DC52C) # $t9, 0x800e /* 021FD0 800213D0 8F39C52C */ lw $t9, %lo(D_800DC52C)($t9) /* 021FD4 800213D4 24010003 */ li $at, 3 -/* 021FD8 800213D8 3C04800E */ lui $a0, %hi(D_800DC4EC) # $a0, 0x800e +/* 021FD8 800213D8 3C04800E */ lui $a0, %hi(gPlayerFive) # $a0, 0x800e /* 021FDC 800213DC 1321001B */ beq $t9, $at, .L8002144C /* 021FE0 800213E0 3C05800E */ lui $a1, %hi(camera1) # $a1, 0x800e -/* 021FE4 800213E4 8C84C4EC */ lw $a0, %lo(D_800DC4EC)($a0) +/* 021FE4 800213E4 8C84C4EC */ lw $a0, %lo(gPlayerFive)($a0) /* 021FE8 800213E8 8CA5DB40 */ lw $a1, %lo(camera1)($a1) /* 021FEC 800213EC 24060004 */ li $a2, 4 /* 021FF0 800213F0 0C008000 */ jal func_80020000 /* 021FF4 800213F4 00003825 */ move $a3, $zero -/* 021FF8 800213F8 3C04800E */ lui $a0, %hi(D_800DC4F0) # $a0, 0x800e +/* 021FF8 800213F8 3C04800E */ lui $a0, %hi(gPlayerSix) # $a0, 0x800e /* 021FFC 800213FC 3C05800E */ lui $a1, %hi(camera1) # $a1, 0x800e /* 022000 80021400 8CA5DB40 */ lw $a1, %lo(camera1)($a1) -/* 022004 80021404 8C84C4F0 */ lw $a0, %lo(D_800DC4F0)($a0) +/* 022004 80021404 8C84C4F0 */ lw $a0, %lo(gPlayerSix)($a0) /* 022008 80021408 24060005 */ li $a2, 5 /* 02200C 8002140C 0C008000 */ jal func_80020000 /* 022010 80021410 00003825 */ move $a3, $zero -/* 022014 80021414 3C04800E */ lui $a0, %hi(D_800DC4F4) # $a0, 0x800e +/* 022014 80021414 3C04800E */ lui $a0, %hi(gPlayerSeven) # $a0, 0x800e /* 022018 80021418 3C05800E */ lui $a1, %hi(camera1) # $a1, 0x800e /* 02201C 8002141C 8CA5DB40 */ lw $a1, %lo(camera1)($a1) -/* 022020 80021420 8C84C4F4 */ lw $a0, %lo(D_800DC4F4)($a0) +/* 022020 80021420 8C84C4F4 */ lw $a0, %lo(gPlayerSeven)($a0) /* 022024 80021424 24060006 */ li $a2, 6 /* 022028 80021428 0C008000 */ jal func_80020000 /* 02202C 8002142C 00003825 */ move $a3, $zero -/* 022030 80021430 3C04800E */ lui $a0, %hi(D_800DC4F8) # $a0, 0x800e +/* 022030 80021430 3C04800E */ lui $a0, %hi(gPlayerEight) # $a0, 0x800e /* 022034 80021434 3C05800E */ lui $a1, %hi(camera1) # $a1, 0x800e /* 022038 80021438 8CA5DB40 */ lw $a1, %lo(camera1)($a1) -/* 02203C 8002143C 8C84C4F8 */ lw $a0, %lo(D_800DC4F8)($a0) +/* 02203C 8002143C 8C84C4F8 */ lw $a0, %lo(gPlayerEight)($a0) /* 022040 80021440 24060007 */ li $a2, 7 /* 022044 80021444 0C008000 */ jal func_80020000 /* 022048 80021448 00003825 */ move $a3, $zero .L8002144C: -/* 02204C 8002144C 3C04800E */ lui $a0, %hi(D_800DC4DC) # $a0, 0x800e -/* 022050 80021450 8C84C4DC */ lw $a0, %lo(D_800DC4DC)($a0) +/* 02204C 8002144C 3C04800E */ lui $a0, %hi(gPlayerOne) # $a0, 0x800e +/* 022050 80021450 8C84C4DC */ lw $a0, %lo(gPlayerOne)($a0) /* 022054 80021454 00002825 */ move $a1, $zero /* 022058 80021458 0C008491 */ jal func_80021244 /* 02205C 8002145C 00003025 */ move $a2, $zero -/* 022060 80021460 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e -/* 022064 80021464 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) +/* 022060 80021460 3C04800E */ lui $a0, %hi(gPlayerTwo) # $a0, 0x800e +/* 022064 80021464 8C84C4E0 */ lw $a0, %lo(gPlayerTwo)($a0) /* 022068 80021468 24050001 */ li $a1, 1 /* 02206C 8002146C 0C008491 */ jal func_80021244 /* 022070 80021470 00003025 */ move $a2, $zero -/* 022074 80021474 3C04800E */ lui $a0, %hi(D_800DC4E4) # $a0, 0x800e -/* 022078 80021478 8C84C4E4 */ lw $a0, %lo(D_800DC4E4)($a0) +/* 022074 80021474 3C04800E */ lui $a0, %hi(gPlayerThree) # $a0, 0x800e +/* 022078 80021478 8C84C4E4 */ lw $a0, %lo(gPlayerThree)($a0) /* 02207C 8002147C 24050002 */ li $a1, 2 /* 022080 80021480 0C008491 */ jal func_80021244 /* 022084 80021484 00003025 */ move $a2, $zero -/* 022088 80021488 3C04800E */ lui $a0, %hi(D_800DC4E8) # $a0, 0x800e -/* 02208C 8002148C 8C84C4E8 */ lw $a0, %lo(D_800DC4E8)($a0) +/* 022088 80021488 3C04800E */ lui $a0, %hi(gPlayerFour) # $a0, 0x800e +/* 02208C 8002148C 8C84C4E8 */ lw $a0, %lo(gPlayerFour)($a0) /* 022090 80021490 24050003 */ li $a1, 3 /* 022094 80021494 0C008491 */ jal func_80021244 /* 022098 80021498 00003025 */ move $a2, $zero /* 02209C 8002149C 3C18800E */ lui $t8, %hi(D_800DC52C) # $t8, 0x800e /* 0220A0 800214A0 8F18C52C */ lw $t8, %lo(D_800DC52C)($t8) /* 0220A4 800214A4 24010003 */ li $at, 3 -/* 0220A8 800214A8 3C04800E */ lui $a0, %hi(D_800DC4EC) # $a0, 0x800e +/* 0220A8 800214A8 3C04800E */ lui $a0, %hi(gPlayerFive) # $a0, 0x800e /* 0220AC 800214AC 13010013 */ beq $t8, $at, .L800214FC /* 0220B0 800214B0 24050004 */ li $a1, 4 -/* 0220B4 800214B4 8C84C4EC */ lw $a0, %lo(D_800DC4EC)($a0) +/* 0220B4 800214B4 8C84C4EC */ lw $a0, %lo(gPlayerFive)($a0) /* 0220B8 800214B8 0C008491 */ jal func_80021244 /* 0220BC 800214BC 00003025 */ move $a2, $zero -/* 0220C0 800214C0 3C04800E */ lui $a0, %hi(D_800DC4F0) # $a0, 0x800e -/* 0220C4 800214C4 8C84C4F0 */ lw $a0, %lo(D_800DC4F0)($a0) +/* 0220C0 800214C0 3C04800E */ lui $a0, %hi(gPlayerSix) # $a0, 0x800e +/* 0220C4 800214C4 8C84C4F0 */ lw $a0, %lo(gPlayerSix)($a0) /* 0220C8 800214C8 24050005 */ li $a1, 5 /* 0220CC 800214CC 0C008491 */ jal func_80021244 /* 0220D0 800214D0 00003025 */ move $a2, $zero -/* 0220D4 800214D4 3C04800E */ lui $a0, %hi(D_800DC4F4) # $a0, 0x800e -/* 0220D8 800214D8 8C84C4F4 */ lw $a0, %lo(D_800DC4F4)($a0) +/* 0220D4 800214D4 3C04800E */ lui $a0, %hi(gPlayerSeven) # $a0, 0x800e +/* 0220D8 800214D8 8C84C4F4 */ lw $a0, %lo(gPlayerSeven)($a0) /* 0220DC 800214DC 24050006 */ li $a1, 6 /* 0220E0 800214E0 0C008491 */ jal func_80021244 /* 0220E4 800214E4 00003025 */ move $a2, $zero -/* 0220E8 800214E8 3C04800E */ lui $a0, %hi(D_800DC4F8) # $a0, 0x800e -/* 0220EC 800214EC 8C84C4F8 */ lw $a0, %lo(D_800DC4F8)($a0) +/* 0220E8 800214E8 3C04800E */ lui $a0, %hi(gPlayerEight) # $a0, 0x800e +/* 0220EC 800214EC 8C84C4F8 */ lw $a0, %lo(gPlayerEight)($a0) /* 0220F0 800214F0 24050007 */ li $a1, 7 /* 0220F4 800214F4 0C008491 */ jal func_80021244 /* 0220F8 800214F8 00003025 */ move $a2, $zero .L800214FC: /* 0220FC 800214FC 3C0E800E */ lui $t6, %hi(D_800DDB58) # $t6, 0x800e /* 022100 80021500 8DCEDB58 */ lw $t6, %lo(D_800DDB58)($t6) -/* 022104 80021504 3C04800E */ lui $a0, %hi(D_800DC4FC) # $a0, 0x800e +/* 022104 80021504 3C04800E */ lui $a0, %hi(gPlayerOneCopy) # $a0, 0x800e /* 022108 80021508 00002825 */ move $a1, $zero /* 02210C 8002150C 11C00005 */ beqz $t6, .L80021524 /* 022110 80021510 00003025 */ move $a2, $zero /* 022114 80021514 0C008149 */ jal func_80020524 -/* 022118 80021518 00000000 */ nop +/* 022118 80021518 00000000 */ nop /* 02211C 8002151C 1000002B */ b .L800215CC /* 022120 80021520 8FBF0014 */ lw $ra, 0x14($sp) .L80021524: /* 022124 80021524 0C01B96B */ jal func_8006E5AC -/* 022128 80021528 8C84C4FC */ lw $a0, %lo(D_800DC4FC)($a0) -/* 02212C 8002152C 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e -/* 022130 80021530 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) +/* 022128 80021528 8C84C4FC */ lw $a0, %lo(gPlayerOneCopy)($a0) +/* 02212C 8002152C 3C04800E */ lui $a0, %hi(gPlayerTwo) # $a0, 0x800e +/* 022130 80021530 8C84C4E0 */ lw $a0, %lo(gPlayerTwo)($a0) /* 022134 80021534 24050001 */ li $a1, 1 /* 022138 80021538 0C01B96B */ jal func_8006E5AC /* 02213C 8002153C 00003025 */ move $a2, $zero -/* 022140 80021540 3C04800E */ lui $a0, %hi(D_800DC4E4) # $a0, 0x800e -/* 022144 80021544 8C84C4E4 */ lw $a0, %lo(D_800DC4E4)($a0) +/* 022140 80021540 3C04800E */ lui $a0, %hi(gPlayerThree) # $a0, 0x800e +/* 022144 80021544 8C84C4E4 */ lw $a0, %lo(gPlayerThree)($a0) /* 022148 80021548 24050002 */ li $a1, 2 /* 02214C 8002154C 0C01B96B */ jal func_8006E5AC /* 022150 80021550 00003025 */ move $a2, $zero -/* 022154 80021554 3C04800E */ lui $a0, %hi(D_800DC4E8) # $a0, 0x800e -/* 022158 80021558 8C84C4E8 */ lw $a0, %lo(D_800DC4E8)($a0) +/* 022154 80021554 3C04800E */ lui $a0, %hi(gPlayerFour) # $a0, 0x800e +/* 022158 80021558 8C84C4E8 */ lw $a0, %lo(gPlayerFour)($a0) /* 02215C 8002155C 24050003 */ li $a1, 3 /* 022160 80021560 0C01B96B */ jal func_8006E5AC /* 022164 80021564 00003025 */ move $a2, $zero /* 022168 80021568 3C0F800E */ lui $t7, %hi(D_800DC52C) # $t7, 0x800e /* 02216C 8002156C 8DEFC52C */ lw $t7, %lo(D_800DC52C)($t7) /* 022170 80021570 24010003 */ li $at, 3 -/* 022174 80021574 3C04800E */ lui $a0, %hi(D_800DC4EC) # $a0, 0x800e +/* 022174 80021574 3C04800E */ lui $a0, %hi(gPlayerFive) # $a0, 0x800e /* 022178 80021578 11E10013 */ beq $t7, $at, .L800215C8 /* 02217C 8002157C 24050004 */ li $a1, 4 -/* 022180 80021580 8C84C4EC */ lw $a0, %lo(D_800DC4EC)($a0) +/* 022180 80021580 8C84C4EC */ lw $a0, %lo(gPlayerFive)($a0) /* 022184 80021584 0C01B96B */ jal func_8006E5AC /* 022188 80021588 00003025 */ move $a2, $zero -/* 02218C 8002158C 3C04800E */ lui $a0, %hi(D_800DC4F0) # $a0, 0x800e -/* 022190 80021590 8C84C4F0 */ lw $a0, %lo(D_800DC4F0)($a0) +/* 02218C 8002158C 3C04800E */ lui $a0, %hi(gPlayerSix) # $a0, 0x800e +/* 022190 80021590 8C84C4F0 */ lw $a0, %lo(gPlayerSix)($a0) /* 022194 80021594 24050005 */ li $a1, 5 /* 022198 80021598 0C01B96B */ jal func_8006E5AC /* 02219C 8002159C 00003025 */ move $a2, $zero -/* 0221A0 800215A0 3C04800E */ lui $a0, %hi(D_800DC4F4) # $a0, 0x800e -/* 0221A4 800215A4 8C84C4F4 */ lw $a0, %lo(D_800DC4F4)($a0) +/* 0221A0 800215A0 3C04800E */ lui $a0, %hi(gPlayerSeven) # $a0, 0x800e +/* 0221A4 800215A4 8C84C4F4 */ lw $a0, %lo(gPlayerSeven)($a0) /* 0221A8 800215A8 24050006 */ li $a1, 6 /* 0221AC 800215AC 0C01B96B */ jal func_8006E5AC /* 0221B0 800215B0 00003025 */ move $a2, $zero -/* 0221B4 800215B4 3C04800E */ lui $a0, %hi(D_800DC4F8) # $a0, 0x800e -/* 0221B8 800215B8 8C84C4F8 */ lw $a0, %lo(D_800DC4F8)($a0) +/* 0221B4 800215B4 3C04800E */ lui $a0, %hi(gPlayerEight) # $a0, 0x800e +/* 0221B8 800215B8 8C84C4F8 */ lw $a0, %lo(gPlayerEight)($a0) /* 0221BC 800215BC 24050007 */ li $a1, 7 /* 0221C0 800215C0 0C01B96B */ jal func_8006E5AC /* 0221C4 800215C4 00003025 */ move $a2, $zero diff --git a/asm/non_matchings/code_8001F980/func_800215DC.s b/asm/non_matchings/code_8001F980/func_800215DC.s index afcebab9d..ff8cd2928 100644 --- a/asm/non_matchings/code_8001F980/func_800215DC.s +++ b/asm/non_matchings/code_8001F980/func_800215DC.s @@ -2,162 +2,162 @@ glabel func_800215DC /* 0221DC 800215DC 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 0221E0 800215E0 AFBF0014 */ sw $ra, 0x14($sp) /* 0221E4 800215E4 3C01800E */ lui $at, %hi(D_800DDB58) # $at, 0x800e -/* 0221E8 800215E8 3C04800E */ lui $a0, %hi(D_800DC4FC) # $a0, 0x800e +/* 0221E8 800215E8 3C04800E */ lui $a0, %hi(gPlayerOneCopy) # $a0, 0x800e /* 0221EC 800215EC 3C05800E */ lui $a1, %hi(camera2) # $a1, 0x800e /* 0221F0 800215F0 AC20DB58 */ sw $zero, %lo(D_800DDB58)($at) /* 0221F4 800215F4 8CA5DB44 */ lw $a1, %lo(camera2)($a1) -/* 0221F8 800215F8 8C84C4FC */ lw $a0, %lo(D_800DC4FC)($a0) +/* 0221F8 800215F8 8C84C4FC */ lw $a0, %lo(gPlayerOneCopy)($a0) /* 0221FC 800215FC 00003025 */ move $a2, $zero /* 022200 80021600 0C008000 */ jal func_80020000 /* 022204 80021604 24070001 */ li $a3, 1 -/* 022208 80021608 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e +/* 022208 80021608 3C04800E */ lui $a0, %hi(gPlayerTwo) # $a0, 0x800e /* 02220C 8002160C 3C05800E */ lui $a1, %hi(camera2) # $a1, 0x800e /* 022210 80021610 8CA5DB44 */ lw $a1, %lo(camera2)($a1) -/* 022214 80021614 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) +/* 022214 80021614 8C84C4E0 */ lw $a0, %lo(gPlayerTwo)($a0) /* 022218 80021618 24060001 */ li $a2, 1 /* 02221C 8002161C 0C008000 */ jal func_80020000 /* 022220 80021620 24070001 */ li $a3, 1 -/* 022224 80021624 3C04800E */ lui $a0, %hi(D_800DC4E4) # $a0, 0x800e +/* 022224 80021624 3C04800E */ lui $a0, %hi(gPlayerThree) # $a0, 0x800e /* 022228 80021628 3C05800E */ lui $a1, %hi(camera2) # $a1, 0x800e /* 02222C 8002162C 8CA5DB44 */ lw $a1, %lo(camera2)($a1) -/* 022230 80021630 8C84C4E4 */ lw $a0, %lo(D_800DC4E4)($a0) +/* 022230 80021630 8C84C4E4 */ lw $a0, %lo(gPlayerThree)($a0) /* 022234 80021634 24060002 */ li $a2, 2 /* 022238 80021638 0C008000 */ jal func_80020000 /* 02223C 8002163C 24070001 */ li $a3, 1 -/* 022240 80021640 3C04800E */ lui $a0, %hi(D_800DC4E8) # $a0, 0x800e +/* 022240 80021640 3C04800E */ lui $a0, %hi(gPlayerFour) # $a0, 0x800e /* 022244 80021644 3C05800E */ lui $a1, %hi(camera2) # $a1, 0x800e /* 022248 80021648 8CA5DB44 */ lw $a1, %lo(camera2)($a1) -/* 02224C 8002164C 8C84C4E8 */ lw $a0, %lo(D_800DC4E8)($a0) +/* 02224C 8002164C 8C84C4E8 */ lw $a0, %lo(gPlayerFour)($a0) /* 022250 80021650 24060003 */ li $a2, 3 /* 022254 80021654 0C008000 */ jal func_80020000 /* 022258 80021658 24070001 */ li $a3, 1 /* 02225C 8002165C 3C0E800E */ lui $t6, %hi(D_800DC52C) # $t6, 0x800e /* 022260 80021660 8DCEC52C */ lw $t6, %lo(D_800DC52C)($t6) /* 022264 80021664 24010003 */ li $at, 3 -/* 022268 80021668 3C04800E */ lui $a0, %hi(D_800DC4EC) # $a0, 0x800e +/* 022268 80021668 3C04800E */ lui $a0, %hi(gPlayerFive) # $a0, 0x800e /* 02226C 8002166C 11C1001B */ beq $t6, $at, .L800216DC /* 022270 80021670 3C05800E */ lui $a1, %hi(camera2) # $a1, 0x800e -/* 022274 80021674 8C84C4EC */ lw $a0, %lo(D_800DC4EC)($a0) +/* 022274 80021674 8C84C4EC */ lw $a0, %lo(gPlayerFive)($a0) /* 022278 80021678 8CA5DB44 */ lw $a1, %lo(camera2)($a1) /* 02227C 8002167C 24060004 */ li $a2, 4 /* 022280 80021680 0C008000 */ jal func_80020000 /* 022284 80021684 24070001 */ li $a3, 1 -/* 022288 80021688 3C04800E */ lui $a0, %hi(D_800DC4F0) # $a0, 0x800e +/* 022288 80021688 3C04800E */ lui $a0, %hi(gPlayerSix) # $a0, 0x800e /* 02228C 8002168C 3C05800E */ lui $a1, %hi(camera2) # $a1, 0x800e /* 022290 80021690 8CA5DB44 */ lw $a1, %lo(camera2)($a1) -/* 022294 80021694 8C84C4F0 */ lw $a0, %lo(D_800DC4F0)($a0) +/* 022294 80021694 8C84C4F0 */ lw $a0, %lo(gPlayerSix)($a0) /* 022298 80021698 24060005 */ li $a2, 5 /* 02229C 8002169C 0C008000 */ jal func_80020000 /* 0222A0 800216A0 24070001 */ li $a3, 1 -/* 0222A4 800216A4 3C04800E */ lui $a0, %hi(D_800DC4F4) # $a0, 0x800e +/* 0222A4 800216A4 3C04800E */ lui $a0, %hi(gPlayerSeven) # $a0, 0x800e /* 0222A8 800216A8 3C05800E */ lui $a1, %hi(camera2) # $a1, 0x800e /* 0222AC 800216AC 8CA5DB44 */ lw $a1, %lo(camera2)($a1) -/* 0222B0 800216B0 8C84C4F4 */ lw $a0, %lo(D_800DC4F4)($a0) +/* 0222B0 800216B0 8C84C4F4 */ lw $a0, %lo(gPlayerSeven)($a0) /* 0222B4 800216B4 24060006 */ li $a2, 6 /* 0222B8 800216B8 0C008000 */ jal func_80020000 /* 0222BC 800216BC 24070001 */ li $a3, 1 -/* 0222C0 800216C0 3C04800E */ lui $a0, %hi(D_800DC4F8) # $a0, 0x800e +/* 0222C0 800216C0 3C04800E */ lui $a0, %hi(gPlayerEight) # $a0, 0x800e /* 0222C4 800216C4 3C05800E */ lui $a1, %hi(camera2) # $a1, 0x800e /* 0222C8 800216C8 8CA5DB44 */ lw $a1, %lo(camera2)($a1) -/* 0222CC 800216CC 8C84C4F8 */ lw $a0, %lo(D_800DC4F8)($a0) +/* 0222CC 800216CC 8C84C4F8 */ lw $a0, %lo(gPlayerEight)($a0) /* 0222D0 800216D0 24060007 */ li $a2, 7 /* 0222D4 800216D4 0C008000 */ jal func_80020000 /* 0222D8 800216D8 24070001 */ li $a3, 1 .L800216DC: -/* 0222DC 800216DC 3C04800E */ lui $a0, %hi(D_800DC4DC) # $a0, 0x800e -/* 0222E0 800216E0 8C84C4DC */ lw $a0, %lo(D_800DC4DC)($a0) +/* 0222DC 800216DC 3C04800E */ lui $a0, %hi(gPlayerOne) # $a0, 0x800e +/* 0222E0 800216E0 8C84C4DC */ lw $a0, %lo(gPlayerOne)($a0) /* 0222E4 800216E4 00002825 */ move $a1, $zero /* 0222E8 800216E8 0C008491 */ jal func_80021244 /* 0222EC 800216EC 24060001 */ li $a2, 1 -/* 0222F0 800216F0 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e -/* 0222F4 800216F4 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) +/* 0222F0 800216F0 3C04800E */ lui $a0, %hi(gPlayerTwo) # $a0, 0x800e +/* 0222F4 800216F4 8C84C4E0 */ lw $a0, %lo(gPlayerTwo)($a0) /* 0222F8 800216F8 24050001 */ li $a1, 1 /* 0222FC 800216FC 0C008491 */ jal func_80021244 /* 022300 80021700 24060001 */ li $a2, 1 -/* 022304 80021704 3C04800E */ lui $a0, %hi(D_800DC4E4) # $a0, 0x800e -/* 022308 80021708 8C84C4E4 */ lw $a0, %lo(D_800DC4E4)($a0) +/* 022304 80021704 3C04800E */ lui $a0, %hi(gPlayerThree) # $a0, 0x800e +/* 022308 80021708 8C84C4E4 */ lw $a0, %lo(gPlayerThree)($a0) /* 02230C 8002170C 24050002 */ li $a1, 2 /* 022310 80021710 0C008491 */ jal func_80021244 /* 022314 80021714 24060001 */ li $a2, 1 -/* 022318 80021718 3C04800E */ lui $a0, %hi(D_800DC4E8) # $a0, 0x800e -/* 02231C 8002171C 8C84C4E8 */ lw $a0, %lo(D_800DC4E8)($a0) +/* 022318 80021718 3C04800E */ lui $a0, %hi(gPlayerFour) # $a0, 0x800e +/* 02231C 8002171C 8C84C4E8 */ lw $a0, %lo(gPlayerFour)($a0) /* 022320 80021720 24050003 */ li $a1, 3 /* 022324 80021724 0C008491 */ jal func_80021244 /* 022328 80021728 24060001 */ li $a2, 1 /* 02232C 8002172C 3C0F800E */ lui $t7, %hi(D_800DC52C) # $t7, 0x800e /* 022330 80021730 8DEFC52C */ lw $t7, %lo(D_800DC52C)($t7) /* 022334 80021734 24010003 */ li $at, 3 -/* 022338 80021738 3C04800E */ lui $a0, %hi(D_800DC4EC) # $a0, 0x800e +/* 022338 80021738 3C04800E */ lui $a0, %hi(gPlayerFive) # $a0, 0x800e /* 02233C 8002173C 11E10013 */ beq $t7, $at, .L8002178C /* 022340 80021740 24050004 */ li $a1, 4 -/* 022344 80021744 8C84C4EC */ lw $a0, %lo(D_800DC4EC)($a0) +/* 022344 80021744 8C84C4EC */ lw $a0, %lo(gPlayerFive)($a0) /* 022348 80021748 0C008491 */ jal func_80021244 /* 02234C 8002174C 24060001 */ li $a2, 1 -/* 022350 80021750 3C04800E */ lui $a0, %hi(D_800DC4F0) # $a0, 0x800e -/* 022354 80021754 8C84C4F0 */ lw $a0, %lo(D_800DC4F0)($a0) +/* 022350 80021750 3C04800E */ lui $a0, %hi(gPlayerSix) # $a0, 0x800e +/* 022354 80021754 8C84C4F0 */ lw $a0, %lo(gPlayerSix)($a0) /* 022358 80021758 24050005 */ li $a1, 5 /* 02235C 8002175C 0C008491 */ jal func_80021244 /* 022360 80021760 24060001 */ li $a2, 1 -/* 022364 80021764 3C04800E */ lui $a0, %hi(D_800DC4F4) # $a0, 0x800e -/* 022368 80021768 8C84C4F4 */ lw $a0, %lo(D_800DC4F4)($a0) +/* 022364 80021764 3C04800E */ lui $a0, %hi(gPlayerSeven) # $a0, 0x800e +/* 022368 80021768 8C84C4F4 */ lw $a0, %lo(gPlayerSeven)($a0) /* 02236C 8002176C 24050006 */ li $a1, 6 /* 022370 80021770 0C008491 */ jal func_80021244 /* 022374 80021774 24060001 */ li $a2, 1 -/* 022378 80021778 3C04800E */ lui $a0, %hi(D_800DC4F8) # $a0, 0x800e -/* 02237C 8002177C 8C84C4F8 */ lw $a0, %lo(D_800DC4F8)($a0) +/* 022378 80021778 3C04800E */ lui $a0, %hi(gPlayerEight) # $a0, 0x800e +/* 02237C 8002177C 8C84C4F8 */ lw $a0, %lo(gPlayerEight)($a0) /* 022380 80021780 24050007 */ li $a1, 7 /* 022384 80021784 0C008491 */ jal func_80021244 /* 022388 80021788 24060001 */ li $a2, 1 .L8002178C: /* 02238C 8002178C 3C18800E */ lui $t8, %hi(D_800DDB58) # $t8, 0x800e /* 022390 80021790 8F18DB58 */ lw $t8, %lo(D_800DDB58)($t8) -/* 022394 80021794 3C04800E */ lui $a0, %hi(D_800DC4FC) # $a0, 0x800e +/* 022394 80021794 3C04800E */ lui $a0, %hi(gPlayerOneCopy) # $a0, 0x800e /* 022398 80021798 00002825 */ move $a1, $zero /* 02239C 8002179C 13000005 */ beqz $t8, .L800217B4 /* 0223A0 800217A0 24060001 */ li $a2, 1 /* 0223A4 800217A4 0C008223 */ jal func_8002088C -/* 0223A8 800217A8 00000000 */ nop +/* 0223A8 800217A8 00000000 */ nop /* 0223AC 800217AC 1000002B */ b .L8002185C /* 0223B0 800217B0 8FBF0014 */ lw $ra, 0x14($sp) .L800217B4: /* 0223B4 800217B4 0C01B98D */ jal func_8006E634 -/* 0223B8 800217B8 8C84C4FC */ lw $a0, %lo(D_800DC4FC)($a0) -/* 0223BC 800217BC 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e -/* 0223C0 800217C0 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) +/* 0223B8 800217B8 8C84C4FC */ lw $a0, %lo(gPlayerOneCopy)($a0) +/* 0223BC 800217BC 3C04800E */ lui $a0, %hi(gPlayerTwo) # $a0, 0x800e +/* 0223C0 800217C0 8C84C4E0 */ lw $a0, %lo(gPlayerTwo)($a0) /* 0223C4 800217C4 24050001 */ li $a1, 1 /* 0223C8 800217C8 0C01B98D */ jal func_8006E634 /* 0223CC 800217CC 24060001 */ li $a2, 1 -/* 0223D0 800217D0 3C04800E */ lui $a0, %hi(D_800DC4E4) # $a0, 0x800e -/* 0223D4 800217D4 8C84C4E4 */ lw $a0, %lo(D_800DC4E4)($a0) +/* 0223D0 800217D0 3C04800E */ lui $a0, %hi(gPlayerThree) # $a0, 0x800e +/* 0223D4 800217D4 8C84C4E4 */ lw $a0, %lo(gPlayerThree)($a0) /* 0223D8 800217D8 24050002 */ li $a1, 2 /* 0223DC 800217DC 0C01B98D */ jal func_8006E634 /* 0223E0 800217E0 24060001 */ li $a2, 1 -/* 0223E4 800217E4 3C04800E */ lui $a0, %hi(D_800DC4E8) # $a0, 0x800e -/* 0223E8 800217E8 8C84C4E8 */ lw $a0, %lo(D_800DC4E8)($a0) +/* 0223E4 800217E4 3C04800E */ lui $a0, %hi(gPlayerFour) # $a0, 0x800e +/* 0223E8 800217E8 8C84C4E8 */ lw $a0, %lo(gPlayerFour)($a0) /* 0223EC 800217EC 24050003 */ li $a1, 3 /* 0223F0 800217F0 0C01B98D */ jal func_8006E634 /* 0223F4 800217F4 24060001 */ li $a2, 1 /* 0223F8 800217F8 3C19800E */ lui $t9, %hi(D_800DC52C) # $t9, 0x800e /* 0223FC 800217FC 8F39C52C */ lw $t9, %lo(D_800DC52C)($t9) /* 022400 80021800 24010003 */ li $at, 3 -/* 022404 80021804 3C04800E */ lui $a0, %hi(D_800DC4EC) # $a0, 0x800e +/* 022404 80021804 3C04800E */ lui $a0, %hi(gPlayerFive) # $a0, 0x800e /* 022408 80021808 13210013 */ beq $t9, $at, .L80021858 /* 02240C 8002180C 24050004 */ li $a1, 4 -/* 022410 80021810 8C84C4EC */ lw $a0, %lo(D_800DC4EC)($a0) +/* 022410 80021810 8C84C4EC */ lw $a0, %lo(gPlayerFive)($a0) /* 022414 80021814 0C01B98D */ jal func_8006E634 /* 022418 80021818 24060001 */ li $a2, 1 -/* 02241C 8002181C 3C04800E */ lui $a0, %hi(D_800DC4F0) # $a0, 0x800e -/* 022420 80021820 8C84C4F0 */ lw $a0, %lo(D_800DC4F0)($a0) +/* 02241C 8002181C 3C04800E */ lui $a0, %hi(gPlayerSix) # $a0, 0x800e +/* 022420 80021820 8C84C4F0 */ lw $a0, %lo(gPlayerSix)($a0) /* 022424 80021824 24050005 */ li $a1, 5 /* 022428 80021828 0C01B98D */ jal func_8006E634 /* 02242C 8002182C 24060001 */ li $a2, 1 -/* 022430 80021830 3C04800E */ lui $a0, %hi(D_800DC4F4) # $a0, 0x800e -/* 022434 80021834 8C84C4F4 */ lw $a0, %lo(D_800DC4F4)($a0) +/* 022430 80021830 3C04800E */ lui $a0, %hi(gPlayerSeven) # $a0, 0x800e +/* 022434 80021834 8C84C4F4 */ lw $a0, %lo(gPlayerSeven)($a0) /* 022438 80021838 24050006 */ li $a1, 6 /* 02243C 8002183C 0C01B98D */ jal func_8006E634 /* 022440 80021840 24060001 */ li $a2, 1 -/* 022444 80021844 3C04800E */ lui $a0, %hi(D_800DC4F8) # $a0, 0x800e -/* 022448 80021848 8C84C4F8 */ lw $a0, %lo(D_800DC4F8)($a0) +/* 022444 80021844 3C04800E */ lui $a0, %hi(gPlayerEight) # $a0, 0x800e +/* 022448 80021848 8C84C4F8 */ lw $a0, %lo(gPlayerEight)($a0) /* 02244C 8002184C 24050007 */ li $a1, 7 /* 022450 80021850 0C01B98D */ jal func_8006E634 /* 022454 80021854 24060001 */ li $a2, 1 diff --git a/asm/non_matchings/code_8001F980/func_8002186C.s b/asm/non_matchings/code_8001F980/func_8002186C.s index 713d6c853..acaa2e1ae 100644 --- a/asm/non_matchings/code_8001F980/func_8002186C.s +++ b/asm/non_matchings/code_8001F980/func_8002186C.s @@ -2,80 +2,80 @@ glabel func_8002186C /* 02246C 8002186C 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 022470 80021870 AFBF0014 */ sw $ra, 0x14($sp) /* 022474 80021874 3C01800E */ lui $at, %hi(D_800DDB58) # $at, 0x800e -/* 022478 80021878 3C04800E */ lui $a0, %hi(D_800DC4FC) # $a0, 0x800e +/* 022478 80021878 3C04800E */ lui $a0, %hi(gPlayerOneCopy) # $a0, 0x800e /* 02247C 8002187C 3C05800E */ lui $a1, %hi(camera3) # $a1, 0x800e /* 022480 80021880 AC20DB58 */ sw $zero, %lo(D_800DDB58)($at) /* 022484 80021884 8CA5DB48 */ lw $a1, %lo(camera3)($a1) -/* 022488 80021888 8C84C4FC */ lw $a0, %lo(D_800DC4FC)($a0) +/* 022488 80021888 8C84C4FC */ lw $a0, %lo(gPlayerOneCopy)($a0) /* 02248C 8002188C 00003025 */ move $a2, $zero /* 022490 80021890 0C008000 */ jal func_80020000 /* 022494 80021894 24070002 */ li $a3, 2 -/* 022498 80021898 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e +/* 022498 80021898 3C04800E */ lui $a0, %hi(gPlayerTwo) # $a0, 0x800e /* 02249C 8002189C 3C05800E */ lui $a1, %hi(camera3) # $a1, 0x800e /* 0224A0 800218A0 8CA5DB48 */ lw $a1, %lo(camera3)($a1) -/* 0224A4 800218A4 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) +/* 0224A4 800218A4 8C84C4E0 */ lw $a0, %lo(gPlayerTwo)($a0) /* 0224A8 800218A8 24060001 */ li $a2, 1 /* 0224AC 800218AC 0C008000 */ jal func_80020000 /* 0224B0 800218B0 24070002 */ li $a3, 2 -/* 0224B4 800218B4 3C04800E */ lui $a0, %hi(D_800DC4E4) # $a0, 0x800e +/* 0224B4 800218B4 3C04800E */ lui $a0, %hi(gPlayerThree) # $a0, 0x800e /* 0224B8 800218B8 3C05800E */ lui $a1, %hi(camera3) # $a1, 0x800e /* 0224BC 800218BC 8CA5DB48 */ lw $a1, %lo(camera3)($a1) -/* 0224C0 800218C0 8C84C4E4 */ lw $a0, %lo(D_800DC4E4)($a0) +/* 0224C0 800218C0 8C84C4E4 */ lw $a0, %lo(gPlayerThree)($a0) /* 0224C4 800218C4 24060002 */ li $a2, 2 /* 0224C8 800218C8 0C008000 */ jal func_80020000 /* 0224CC 800218CC 24070002 */ li $a3, 2 -/* 0224D0 800218D0 3C04800E */ lui $a0, %hi(D_800DC4E8) # $a0, 0x800e +/* 0224D0 800218D0 3C04800E */ lui $a0, %hi(gPlayerFour) # $a0, 0x800e /* 0224D4 800218D4 3C05800E */ lui $a1, %hi(camera3) # $a1, 0x800e /* 0224D8 800218D8 8CA5DB48 */ lw $a1, %lo(camera3)($a1) -/* 0224DC 800218DC 8C84C4E8 */ lw $a0, %lo(D_800DC4E8)($a0) +/* 0224DC 800218DC 8C84C4E8 */ lw $a0, %lo(gPlayerFour)($a0) /* 0224E0 800218E0 24060003 */ li $a2, 3 /* 0224E4 800218E4 0C008000 */ jal func_80020000 /* 0224E8 800218E8 24070002 */ li $a3, 2 -/* 0224EC 800218EC 3C04800E */ lui $a0, %hi(D_800DC4DC) # $a0, 0x800e -/* 0224F0 800218F0 8C84C4DC */ lw $a0, %lo(D_800DC4DC)($a0) +/* 0224EC 800218EC 3C04800E */ lui $a0, %hi(gPlayerOne) # $a0, 0x800e +/* 0224F0 800218F0 8C84C4DC */ lw $a0, %lo(gPlayerOne)($a0) /* 0224F4 800218F4 00002825 */ move $a1, $zero /* 0224F8 800218F8 0C008491 */ jal func_80021244 /* 0224FC 800218FC 24060002 */ li $a2, 2 -/* 022500 80021900 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e -/* 022504 80021904 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) +/* 022500 80021900 3C04800E */ lui $a0, %hi(gPlayerTwo) # $a0, 0x800e +/* 022504 80021904 8C84C4E0 */ lw $a0, %lo(gPlayerTwo)($a0) /* 022508 80021908 24050001 */ li $a1, 1 /* 02250C 8002190C 0C008491 */ jal func_80021244 /* 022510 80021910 24060002 */ li $a2, 2 -/* 022514 80021914 3C04800E */ lui $a0, %hi(D_800DC4E4) # $a0, 0x800e -/* 022518 80021918 8C84C4E4 */ lw $a0, %lo(D_800DC4E4)($a0) +/* 022514 80021914 3C04800E */ lui $a0, %hi(gPlayerThree) # $a0, 0x800e +/* 022518 80021918 8C84C4E4 */ lw $a0, %lo(gPlayerThree)($a0) /* 02251C 8002191C 24050002 */ li $a1, 2 /* 022520 80021920 0C008491 */ jal func_80021244 /* 022524 80021924 24060002 */ li $a2, 2 -/* 022528 80021928 3C04800E */ lui $a0, %hi(D_800DC4E8) # $a0, 0x800e -/* 02252C 8002192C 8C84C4E8 */ lw $a0, %lo(D_800DC4E8)($a0) +/* 022528 80021928 3C04800E */ lui $a0, %hi(gPlayerFour) # $a0, 0x800e +/* 02252C 8002192C 8C84C4E8 */ lw $a0, %lo(gPlayerFour)($a0) /* 022530 80021930 24050003 */ li $a1, 3 /* 022534 80021934 0C008491 */ jal func_80021244 /* 022538 80021938 24060002 */ li $a2, 2 /* 02253C 8002193C 3C0E800E */ lui $t6, %hi(D_800DDB58) # $t6, 0x800e /* 022540 80021940 8DCEDB58 */ lw $t6, %lo(D_800DDB58)($t6) -/* 022544 80021944 3C04800E */ lui $a0, %hi(D_800DC4FC) # $a0, 0x800e +/* 022544 80021944 3C04800E */ lui $a0, %hi(gPlayerOneCopy) # $a0, 0x800e /* 022548 80021948 00002825 */ move $a1, $zero /* 02254C 8002194C 11C00005 */ beqz $t6, .L80021964 /* 022550 80021950 24060002 */ li $a2, 2 /* 022554 80021954 0C0082FD */ jal func_80020BF4 -/* 022558 80021958 00000000 */ nop +/* 022558 80021958 00000000 */ nop /* 02255C 8002195C 10000013 */ b .L800219AC /* 022560 80021960 8FBF0014 */ lw $ra, 0x14($sp) .L80021964: /* 022564 80021964 0C01B9AF */ jal func_8006E6BC -/* 022568 80021968 8C84C4FC */ lw $a0, %lo(D_800DC4FC)($a0) -/* 02256C 8002196C 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e -/* 022570 80021970 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) +/* 022568 80021968 8C84C4FC */ lw $a0, %lo(gPlayerOneCopy)($a0) +/* 02256C 8002196C 3C04800E */ lui $a0, %hi(gPlayerTwo) # $a0, 0x800e +/* 022570 80021970 8C84C4E0 */ lw $a0, %lo(gPlayerTwo)($a0) /* 022574 80021974 24050001 */ li $a1, 1 /* 022578 80021978 0C01B9AF */ jal func_8006E6BC /* 02257C 8002197C 24060002 */ li $a2, 2 -/* 022580 80021980 3C04800E */ lui $a0, %hi(D_800DC4E4) # $a0, 0x800e -/* 022584 80021984 8C84C4E4 */ lw $a0, %lo(D_800DC4E4)($a0) +/* 022580 80021980 3C04800E */ lui $a0, %hi(gPlayerThree) # $a0, 0x800e +/* 022584 80021984 8C84C4E4 */ lw $a0, %lo(gPlayerThree)($a0) /* 022588 80021988 24050002 */ li $a1, 2 /* 02258C 8002198C 0C01B9AF */ jal func_8006E6BC /* 022590 80021990 24060002 */ li $a2, 2 -/* 022594 80021994 3C04800E */ lui $a0, %hi(D_800DC4E8) # $a0, 0x800e -/* 022598 80021998 8C84C4E8 */ lw $a0, %lo(D_800DC4E8)($a0) +/* 022594 80021994 3C04800E */ lui $a0, %hi(gPlayerFour) # $a0, 0x800e +/* 022598 80021998 8C84C4E8 */ lw $a0, %lo(gPlayerFour)($a0) /* 02259C 8002199C 24050003 */ li $a1, 3 /* 0225A0 800219A0 0C01B9AF */ jal func_8006E6BC /* 0225A4 800219A4 24060002 */ li $a2, 2 diff --git a/asm/non_matchings/code_8001F980/func_800219BC.s b/asm/non_matchings/code_8001F980/func_800219BC.s index 72700d470..95e14f722 100644 --- a/asm/non_matchings/code_8001F980/func_800219BC.s +++ b/asm/non_matchings/code_8001F980/func_800219BC.s @@ -2,80 +2,80 @@ glabel func_800219BC /* 0225BC 800219BC 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 0225C0 800219C0 AFBF0014 */ sw $ra, 0x14($sp) /* 0225C4 800219C4 3C01800E */ lui $at, %hi(D_800DDB58) # $at, 0x800e -/* 0225C8 800219C8 3C04800E */ lui $a0, %hi(D_800DC4FC) # $a0, 0x800e +/* 0225C8 800219C8 3C04800E */ lui $a0, %hi(gPlayerOneCopy) # $a0, 0x800e /* 0225CC 800219CC 3C05800E */ lui $a1, %hi(camera4) # $a1, 0x800e /* 0225D0 800219D0 AC20DB58 */ sw $zero, %lo(D_800DDB58)($at) /* 0225D4 800219D4 8CA5DB4C */ lw $a1, %lo(camera4)($a1) -/* 0225D8 800219D8 8C84C4FC */ lw $a0, %lo(D_800DC4FC)($a0) +/* 0225D8 800219D8 8C84C4FC */ lw $a0, %lo(gPlayerOneCopy)($a0) /* 0225DC 800219DC 00003025 */ move $a2, $zero /* 0225E0 800219E0 0C008000 */ jal func_80020000 /* 0225E4 800219E4 24070003 */ li $a3, 3 -/* 0225E8 800219E8 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e +/* 0225E8 800219E8 3C04800E */ lui $a0, %hi(gPlayerTwo) # $a0, 0x800e /* 0225EC 800219EC 3C05800E */ lui $a1, %hi(camera4) # $a1, 0x800e /* 0225F0 800219F0 8CA5DB4C */ lw $a1, %lo(camera4)($a1) -/* 0225F4 800219F4 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) +/* 0225F4 800219F4 8C84C4E0 */ lw $a0, %lo(gPlayerTwo)($a0) /* 0225F8 800219F8 24060001 */ li $a2, 1 /* 0225FC 800219FC 0C008000 */ jal func_80020000 /* 022600 80021A00 24070003 */ li $a3, 3 -/* 022604 80021A04 3C04800E */ lui $a0, %hi(D_800DC4E4) # $a0, 0x800e +/* 022604 80021A04 3C04800E */ lui $a0, %hi(gPlayerThree) # $a0, 0x800e /* 022608 80021A08 3C05800E */ lui $a1, %hi(camera4) # $a1, 0x800e /* 02260C 80021A0C 8CA5DB4C */ lw $a1, %lo(camera4)($a1) -/* 022610 80021A10 8C84C4E4 */ lw $a0, %lo(D_800DC4E4)($a0) +/* 022610 80021A10 8C84C4E4 */ lw $a0, %lo(gPlayerThree)($a0) /* 022614 80021A14 24060002 */ li $a2, 2 /* 022618 80021A18 0C008000 */ jal func_80020000 /* 02261C 80021A1C 24070003 */ li $a3, 3 -/* 022620 80021A20 3C04800E */ lui $a0, %hi(D_800DC4E8) # $a0, 0x800e +/* 022620 80021A20 3C04800E */ lui $a0, %hi(gPlayerFour) # $a0, 0x800e /* 022624 80021A24 3C05800E */ lui $a1, %hi(camera4) # $a1, 0x800e /* 022628 80021A28 8CA5DB4C */ lw $a1, %lo(camera4)($a1) -/* 02262C 80021A2C 8C84C4E8 */ lw $a0, %lo(D_800DC4E8)($a0) +/* 02262C 80021A2C 8C84C4E8 */ lw $a0, %lo(gPlayerFour)($a0) /* 022630 80021A30 24060003 */ li $a2, 3 /* 022634 80021A34 0C008000 */ jal func_80020000 /* 022638 80021A38 24070003 */ li $a3, 3 -/* 02263C 80021A3C 3C04800E */ lui $a0, %hi(D_800DC4DC) # $a0, 0x800e -/* 022640 80021A40 8C84C4DC */ lw $a0, %lo(D_800DC4DC)($a0) +/* 02263C 80021A3C 3C04800E */ lui $a0, %hi(gPlayerOne) # $a0, 0x800e +/* 022640 80021A40 8C84C4DC */ lw $a0, %lo(gPlayerOne)($a0) /* 022644 80021A44 00002825 */ move $a1, $zero /* 022648 80021A48 0C008491 */ jal func_80021244 /* 02264C 80021A4C 24060003 */ li $a2, 3 -/* 022650 80021A50 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e -/* 022654 80021A54 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) +/* 022650 80021A50 3C04800E */ lui $a0, %hi(gPlayerTwo) # $a0, 0x800e +/* 022654 80021A54 8C84C4E0 */ lw $a0, %lo(gPlayerTwo)($a0) /* 022658 80021A58 24050001 */ li $a1, 1 /* 02265C 80021A5C 0C008491 */ jal func_80021244 /* 022660 80021A60 24060003 */ li $a2, 3 -/* 022664 80021A64 3C04800E */ lui $a0, %hi(D_800DC4E4) # $a0, 0x800e -/* 022668 80021A68 8C84C4E4 */ lw $a0, %lo(D_800DC4E4)($a0) +/* 022664 80021A64 3C04800E */ lui $a0, %hi(gPlayerThree) # $a0, 0x800e +/* 022668 80021A68 8C84C4E4 */ lw $a0, %lo(gPlayerThree)($a0) /* 02266C 80021A6C 24050002 */ li $a1, 2 /* 022670 80021A70 0C008491 */ jal func_80021244 /* 022674 80021A74 24060003 */ li $a2, 3 -/* 022678 80021A78 3C04800E */ lui $a0, %hi(D_800DC4E8) # $a0, 0x800e -/* 02267C 80021A7C 8C84C4E8 */ lw $a0, %lo(D_800DC4E8)($a0) +/* 022678 80021A78 3C04800E */ lui $a0, %hi(gPlayerFour) # $a0, 0x800e +/* 02267C 80021A7C 8C84C4E8 */ lw $a0, %lo(gPlayerFour)($a0) /* 022680 80021A80 24050003 */ li $a1, 3 /* 022684 80021A84 0C008491 */ jal func_80021244 /* 022688 80021A88 24060003 */ li $a2, 3 /* 02268C 80021A8C 3C0E800E */ lui $t6, %hi(D_800DDB58) # $t6, 0x800e /* 022690 80021A90 8DCEDB58 */ lw $t6, %lo(D_800DDB58)($t6) -/* 022694 80021A94 3C04800E */ lui $a0, %hi(D_800DC4FC) # $a0, 0x800e +/* 022694 80021A94 3C04800E */ lui $a0, %hi(gPlayerOneCopy) # $a0, 0x800e /* 022698 80021A98 00002825 */ move $a1, $zero /* 02269C 80021A9C 11C00005 */ beqz $t6, .L80021AB4 /* 0226A0 80021AA0 24060003 */ li $a2, 3 /* 0226A4 80021AA4 0C0083C7 */ jal func_80020F1C -/* 0226A8 80021AA8 00000000 */ nop +/* 0226A8 80021AA8 00000000 */ nop /* 0226AC 80021AAC 10000013 */ b .L80021AFC /* 0226B0 80021AB0 8FBF0014 */ lw $ra, 0x14($sp) .L80021AB4: /* 0226B4 80021AB4 0C01B9D1 */ jal func_8006E744 -/* 0226B8 80021AB8 8C84C4FC */ lw $a0, %lo(D_800DC4FC)($a0) -/* 0226BC 80021ABC 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e -/* 0226C0 80021AC0 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) +/* 0226B8 80021AB8 8C84C4FC */ lw $a0, %lo(gPlayerOneCopy)($a0) +/* 0226BC 80021ABC 3C04800E */ lui $a0, %hi(gPlayerTwo) # $a0, 0x800e +/* 0226C0 80021AC0 8C84C4E0 */ lw $a0, %lo(gPlayerTwo)($a0) /* 0226C4 80021AC4 24050001 */ li $a1, 1 /* 0226C8 80021AC8 0C01B9D1 */ jal func_8006E744 /* 0226CC 80021ACC 24060003 */ li $a2, 3 -/* 0226D0 80021AD0 3C04800E */ lui $a0, %hi(D_800DC4E4) # $a0, 0x800e -/* 0226D4 80021AD4 8C84C4E4 */ lw $a0, %lo(D_800DC4E4)($a0) +/* 0226D0 80021AD0 3C04800E */ lui $a0, %hi(gPlayerThree) # $a0, 0x800e +/* 0226D4 80021AD4 8C84C4E4 */ lw $a0, %lo(gPlayerThree)($a0) /* 0226D8 80021AD8 24050002 */ li $a1, 2 /* 0226DC 80021ADC 0C01B9D1 */ jal func_8006E744 /* 0226E0 80021AE0 24060003 */ li $a2, 3 -/* 0226E4 80021AE4 3C04800E */ lui $a0, %hi(D_800DC4E8) # $a0, 0x800e -/* 0226E8 80021AE8 8C84C4E8 */ lw $a0, %lo(D_800DC4E8)($a0) +/* 0226E4 80021AE4 3C04800E */ lui $a0, %hi(gPlayerFour) # $a0, 0x800e +/* 0226E8 80021AE8 8C84C4E8 */ lw $a0, %lo(gPlayerFour)($a0) /* 0226EC 80021AEC 24050003 */ li $a1, 3 /* 0226F0 80021AF0 0C01B9D1 */ jal func_8006E744 /* 0226F4 80021AF4 24060003 */ li $a2, 3 diff --git a/asm/non_matchings/code_8001F980/func_80021B0C.s b/asm/non_matchings/code_8001F980/func_80021B0C.s index 9bc2e1f31..91e45eb15 100644 --- a/asm/non_matchings/code_8001F980/func_80021B0C.s +++ b/asm/non_matchings/code_8001F980/func_80021B0C.s @@ -1,47 +1,47 @@ glabel func_80021B0C /* 02270C 80021B0C 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 022710 80021B10 AFBF0014 */ sw $ra, 0x14($sp) -/* 022714 80021B14 3C04800E */ lui $a0, %hi(D_800DC4FC) # $a0, 0x800e -/* 022718 80021B18 8C84C4FC */ lw $a0, %lo(D_800DC4FC)($a0) +/* 022714 80021B14 3C04800E */ lui $a0, %hi(gPlayerOneCopy) # $a0, 0x800e +/* 022718 80021B18 8C84C4FC */ lw $a0, %lo(gPlayerOneCopy)($a0) /* 02271C 80021B1C 00002825 */ move $a1, $zero /* 022720 80021B20 0C01B9F3 */ jal func_8006E7CC /* 022724 80021B24 00003025 */ move $a2, $zero -/* 022728 80021B28 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e -/* 02272C 80021B2C 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) +/* 022728 80021B28 3C04800E */ lui $a0, %hi(gPlayerTwo) # $a0, 0x800e +/* 02272C 80021B2C 8C84C4E0 */ lw $a0, %lo(gPlayerTwo)($a0) /* 022730 80021B30 24050001 */ li $a1, 1 /* 022734 80021B34 0C01B9F3 */ jal func_8006E7CC /* 022738 80021B38 00003025 */ move $a2, $zero -/* 02273C 80021B3C 3C04800E */ lui $a0, %hi(D_800DC4E4) # $a0, 0x800e -/* 022740 80021B40 8C84C4E4 */ lw $a0, %lo(D_800DC4E4)($a0) +/* 02273C 80021B3C 3C04800E */ lui $a0, %hi(gPlayerThree) # $a0, 0x800e +/* 022740 80021B40 8C84C4E4 */ lw $a0, %lo(gPlayerThree)($a0) /* 022744 80021B44 24050002 */ li $a1, 2 /* 022748 80021B48 0C01B9F3 */ jal func_8006E7CC /* 02274C 80021B4C 00003025 */ move $a2, $zero -/* 022750 80021B50 3C04800E */ lui $a0, %hi(D_800DC4E8) # $a0, 0x800e -/* 022754 80021B54 8C84C4E8 */ lw $a0, %lo(D_800DC4E8)($a0) +/* 022750 80021B50 3C04800E */ lui $a0, %hi(gPlayerFour) # $a0, 0x800e +/* 022754 80021B54 8C84C4E8 */ lw $a0, %lo(gPlayerFour)($a0) /* 022758 80021B58 24050003 */ li $a1, 3 /* 02275C 80021B5C 0C01B9F3 */ jal func_8006E7CC /* 022760 80021B60 00003025 */ move $a2, $zero /* 022764 80021B64 3C0E800E */ lui $t6, %hi(D_800DC52C) # $t6, 0x800e /* 022768 80021B68 8DCEC52C */ lw $t6, %lo(D_800DC52C)($t6) /* 02276C 80021B6C 24010003 */ li $at, 3 -/* 022770 80021B70 3C04800E */ lui $a0, %hi(D_800DC4EC) # $a0, 0x800e +/* 022770 80021B70 3C04800E */ lui $a0, %hi(gPlayerFive) # $a0, 0x800e /* 022774 80021B74 11C10013 */ beq $t6, $at, .L80021BC4 /* 022778 80021B78 24050004 */ li $a1, 4 -/* 02277C 80021B7C 8C84C4EC */ lw $a0, %lo(D_800DC4EC)($a0) +/* 02277C 80021B7C 8C84C4EC */ lw $a0, %lo(gPlayerFive)($a0) /* 022780 80021B80 0C01B9F3 */ jal func_8006E7CC /* 022784 80021B84 00003025 */ move $a2, $zero -/* 022788 80021B88 3C04800E */ lui $a0, %hi(D_800DC4F0) # $a0, 0x800e -/* 02278C 80021B8C 8C84C4F0 */ lw $a0, %lo(D_800DC4F0)($a0) +/* 022788 80021B88 3C04800E */ lui $a0, %hi(gPlayerSix) # $a0, 0x800e +/* 02278C 80021B8C 8C84C4F0 */ lw $a0, %lo(gPlayerSix)($a0) /* 022790 80021B90 24050005 */ li $a1, 5 /* 022794 80021B94 0C01B9F3 */ jal func_8006E7CC /* 022798 80021B98 00003025 */ move $a2, $zero -/* 02279C 80021B9C 3C04800E */ lui $a0, %hi(D_800DC4F4) # $a0, 0x800e -/* 0227A0 80021BA0 8C84C4F4 */ lw $a0, %lo(D_800DC4F4)($a0) +/* 02279C 80021B9C 3C04800E */ lui $a0, %hi(gPlayerSeven) # $a0, 0x800e +/* 0227A0 80021BA0 8C84C4F4 */ lw $a0, %lo(gPlayerSeven)($a0) /* 0227A4 80021BA4 24050006 */ li $a1, 6 /* 0227A8 80021BA8 0C01B9F3 */ jal func_8006E7CC /* 0227AC 80021BAC 00003025 */ move $a2, $zero -/* 0227B0 80021BB0 3C04800E */ lui $a0, %hi(D_800DC4F8) # $a0, 0x800e -/* 0227B4 80021BB4 8C84C4F8 */ lw $a0, %lo(D_800DC4F8)($a0) +/* 0227B0 80021BB0 3C04800E */ lui $a0, %hi(gPlayerEight) # $a0, 0x800e +/* 0227B4 80021BB4 8C84C4F8 */ lw $a0, %lo(gPlayerEight)($a0) /* 0227B8 80021BB8 24050007 */ li $a1, 7 /* 0227BC 80021BBC 0C01B9F3 */ jal func_8006E7CC /* 0227C0 80021BC0 00003025 */ move $a2, $zero @@ -49,40 +49,40 @@ glabel func_80021B0C /* 0227C4 80021BC4 3C0F800E */ lui $t7, %hi(D_800DC50C) # $t7, 0x800e /* 0227C8 80021BC8 8DEFC50C */ lw $t7, %lo(D_800DC50C)($t7) /* 0227CC 80021BCC 24010005 */ li $at, 5 -/* 0227D0 80021BD0 3C04800E */ lui $a0, %hi(D_800DC4DC) # $a0, 0x800e +/* 0227D0 80021BD0 3C04800E */ lui $a0, %hi(gPlayerOne) # $a0, 0x800e /* 0227D4 80021BD4 55E10025 */ bnel $t7, $at, .L80021C6C /* 0227D8 80021BD8 8FBF0014 */ lw $ra, 0x14($sp) -/* 0227DC 80021BDC 8C84C4DC */ lw $a0, %lo(D_800DC4DC)($a0) +/* 0227DC 80021BDC 8C84C4DC */ lw $a0, %lo(gPlayerOne)($a0) /* 0227E0 80021BE0 00002825 */ move $a1, $zero /* 0227E4 80021BE4 84980044 */ lh $t8, 0x44($a0) /* 0227E8 80021BE8 33192000 */ andi $t9, $t8, 0x2000 /* 0227EC 80021BEC 13200003 */ beqz $t9, .L80021BFC -/* 0227F0 80021BF0 00000000 */ nop +/* 0227F0 80021BF0 00000000 */ nop /* 0227F4 80021BF4 0C0090DD */ jal func_80024374 /* 0227F8 80021BF8 00003025 */ move $a2, $zero .L80021BFC: -/* 0227FC 80021BFC 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e -/* 022800 80021C00 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) +/* 0227FC 80021BFC 3C04800E */ lui $a0, %hi(gPlayerTwo) # $a0, 0x800e +/* 022800 80021C00 8C84C4E0 */ lw $a0, %lo(gPlayerTwo)($a0) /* 022804 80021C04 24050001 */ li $a1, 1 /* 022808 80021C08 84880044 */ lh $t0, 0x44($a0) /* 02280C 80021C0C 31092000 */ andi $t1, $t0, 0x2000 /* 022810 80021C10 11200003 */ beqz $t1, .L80021C20 -/* 022814 80021C14 00000000 */ nop +/* 022814 80021C14 00000000 */ nop /* 022818 80021C18 0C0090DD */ jal func_80024374 /* 02281C 80021C1C 00003025 */ move $a2, $zero .L80021C20: -/* 022820 80021C20 3C04800E */ lui $a0, %hi(D_800DC4E4) # $a0, 0x800e -/* 022824 80021C24 8C84C4E4 */ lw $a0, %lo(D_800DC4E4)($a0) +/* 022820 80021C20 3C04800E */ lui $a0, %hi(gPlayerThree) # $a0, 0x800e +/* 022824 80021C24 8C84C4E4 */ lw $a0, %lo(gPlayerThree)($a0) /* 022828 80021C28 24050002 */ li $a1, 2 /* 02282C 80021C2C 848A0044 */ lh $t2, 0x44($a0) /* 022830 80021C30 314B2000 */ andi $t3, $t2, 0x2000 /* 022834 80021C34 11600003 */ beqz $t3, .L80021C44 -/* 022838 80021C38 00000000 */ nop +/* 022838 80021C38 00000000 */ nop /* 02283C 80021C3C 0C0090DD */ jal func_80024374 /* 022840 80021C40 00003025 */ move $a2, $zero .L80021C44: -/* 022844 80021C44 3C04800E */ lui $a0, %hi(D_800DC4E8) # $a0, 0x800e -/* 022848 80021C48 8C84C4E8 */ lw $a0, %lo(D_800DC4E8)($a0) +/* 022844 80021C44 3C04800E */ lui $a0, %hi(gPlayerFour) # $a0, 0x800e +/* 022848 80021C48 8C84C4E8 */ lw $a0, %lo(gPlayerFour)($a0) /* 02284C 80021C4C 24050003 */ li $a1, 3 /* 022850 80021C50 848C0044 */ lh $t4, 0x44($a0) /* 022854 80021C54 318D2000 */ andi $t5, $t4, 0x2000 @@ -94,4 +94,4 @@ glabel func_80021B0C .L80021C6C: /* 02286C 80021C6C 27BD0018 */ addiu $sp, $sp, 0x18 /* 022870 80021C70 03E00008 */ jr $ra -/* 022874 80021C74 00000000 */ nop +/* 022874 80021C74 00000000 */ nop diff --git a/asm/non_matchings/code_8001F980/func_80021C78.s b/asm/non_matchings/code_8001F980/func_80021C78.s index a0d073c7b..cdf048e40 100644 --- a/asm/non_matchings/code_8001F980/func_80021C78.s +++ b/asm/non_matchings/code_8001F980/func_80021C78.s @@ -1,47 +1,47 @@ glabel func_80021C78 /* 022878 80021C78 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 02287C 80021C7C AFBF0014 */ sw $ra, 0x14($sp) -/* 022880 80021C80 3C04800E */ lui $a0, %hi(D_800DC4FC) # $a0, 0x800e -/* 022884 80021C84 8C84C4FC */ lw $a0, %lo(D_800DC4FC)($a0) +/* 022880 80021C80 3C04800E */ lui $a0, %hi(gPlayerOneCopy) # $a0, 0x800e +/* 022884 80021C84 8C84C4FC */ lw $a0, %lo(gPlayerOneCopy)($a0) /* 022888 80021C88 00002825 */ move $a1, $zero /* 02288C 80021C8C 0C01BA12 */ jal func_8006E848 /* 022890 80021C90 24060001 */ li $a2, 1 -/* 022894 80021C94 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e -/* 022898 80021C98 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) +/* 022894 80021C94 3C04800E */ lui $a0, %hi(gPlayerTwo) # $a0, 0x800e +/* 022898 80021C98 8C84C4E0 */ lw $a0, %lo(gPlayerTwo)($a0) /* 02289C 80021C9C 24050001 */ li $a1, 1 /* 0228A0 80021CA0 0C01BA12 */ jal func_8006E848 /* 0228A4 80021CA4 24060001 */ li $a2, 1 -/* 0228A8 80021CA8 3C04800E */ lui $a0, %hi(D_800DC4E4) # $a0, 0x800e -/* 0228AC 80021CAC 8C84C4E4 */ lw $a0, %lo(D_800DC4E4)($a0) +/* 0228A8 80021CA8 3C04800E */ lui $a0, %hi(gPlayerThree) # $a0, 0x800e +/* 0228AC 80021CAC 8C84C4E4 */ lw $a0, %lo(gPlayerThree)($a0) /* 0228B0 80021CB0 24050002 */ li $a1, 2 /* 0228B4 80021CB4 0C01BA12 */ jal func_8006E848 /* 0228B8 80021CB8 24060001 */ li $a2, 1 -/* 0228BC 80021CBC 3C04800E */ lui $a0, %hi(D_800DC4E8) # $a0, 0x800e -/* 0228C0 80021CC0 8C84C4E8 */ lw $a0, %lo(D_800DC4E8)($a0) +/* 0228BC 80021CBC 3C04800E */ lui $a0, %hi(gPlayerFour) # $a0, 0x800e +/* 0228C0 80021CC0 8C84C4E8 */ lw $a0, %lo(gPlayerFour)($a0) /* 0228C4 80021CC4 24050003 */ li $a1, 3 /* 0228C8 80021CC8 0C01BA12 */ jal func_8006E848 /* 0228CC 80021CCC 24060001 */ li $a2, 1 /* 0228D0 80021CD0 3C0E800E */ lui $t6, %hi(D_800DC52C) # $t6, 0x800e /* 0228D4 80021CD4 8DCEC52C */ lw $t6, %lo(D_800DC52C)($t6) /* 0228D8 80021CD8 24010003 */ li $at, 3 -/* 0228DC 80021CDC 3C04800E */ lui $a0, %hi(D_800DC4EC) # $a0, 0x800e +/* 0228DC 80021CDC 3C04800E */ lui $a0, %hi(gPlayerFive) # $a0, 0x800e /* 0228E0 80021CE0 11C10013 */ beq $t6, $at, .L80021D30 /* 0228E4 80021CE4 24050004 */ li $a1, 4 -/* 0228E8 80021CE8 8C84C4EC */ lw $a0, %lo(D_800DC4EC)($a0) +/* 0228E8 80021CE8 8C84C4EC */ lw $a0, %lo(gPlayerFive)($a0) /* 0228EC 80021CEC 0C01BA12 */ jal func_8006E848 /* 0228F0 80021CF0 24060001 */ li $a2, 1 -/* 0228F4 80021CF4 3C04800E */ lui $a0, %hi(D_800DC4F0) # $a0, 0x800e -/* 0228F8 80021CF8 8C84C4F0 */ lw $a0, %lo(D_800DC4F0)($a0) +/* 0228F4 80021CF4 3C04800E */ lui $a0, %hi(gPlayerSix) # $a0, 0x800e +/* 0228F8 80021CF8 8C84C4F0 */ lw $a0, %lo(gPlayerSix)($a0) /* 0228FC 80021CFC 24050005 */ li $a1, 5 /* 022900 80021D00 0C01BA12 */ jal func_8006E848 /* 022904 80021D04 24060001 */ li $a2, 1 -/* 022908 80021D08 3C04800E */ lui $a0, %hi(D_800DC4F4) # $a0, 0x800e -/* 02290C 80021D0C 8C84C4F4 */ lw $a0, %lo(D_800DC4F4)($a0) +/* 022908 80021D08 3C04800E */ lui $a0, %hi(gPlayerSeven) # $a0, 0x800e +/* 02290C 80021D0C 8C84C4F4 */ lw $a0, %lo(gPlayerSeven)($a0) /* 022910 80021D10 24050006 */ li $a1, 6 /* 022914 80021D14 0C01BA12 */ jal func_8006E848 /* 022918 80021D18 24060001 */ li $a2, 1 -/* 02291C 80021D1C 3C04800E */ lui $a0, %hi(D_800DC4F8) # $a0, 0x800e -/* 022920 80021D20 8C84C4F8 */ lw $a0, %lo(D_800DC4F8)($a0) +/* 02291C 80021D1C 3C04800E */ lui $a0, %hi(gPlayerEight) # $a0, 0x800e +/* 022920 80021D20 8C84C4F8 */ lw $a0, %lo(gPlayerEight)($a0) /* 022924 80021D24 24050007 */ li $a1, 7 /* 022928 80021D28 0C01BA12 */ jal func_8006E848 /* 02292C 80021D2C 24060001 */ li $a2, 1 @@ -49,4 +49,4 @@ glabel func_80021C78 /* 022930 80021D30 8FBF0014 */ lw $ra, 0x14($sp) /* 022934 80021D34 27BD0018 */ addiu $sp, $sp, 0x18 /* 022938 80021D38 03E00008 */ jr $ra -/* 02293C 80021D3C 00000000 */ nop +/* 02293C 80021D3C 00000000 */ nop diff --git a/asm/non_matchings/code_8001F980/func_80021D40.s b/asm/non_matchings/code_8001F980/func_80021D40.s index 397b4b552..373be0036 100644 --- a/asm/non_matchings/code_8001F980/func_80021D40.s +++ b/asm/non_matchings/code_8001F980/func_80021D40.s @@ -1,27 +1,27 @@ glabel func_80021D40 /* 022940 80021D40 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 022944 80021D44 AFBF0014 */ sw $ra, 0x14($sp) -/* 022948 80021D48 3C04800E */ lui $a0, %hi(D_800DC4FC) # $a0, 0x800e -/* 02294C 80021D4C 8C84C4FC */ lw $a0, %lo(D_800DC4FC)($a0) +/* 022948 80021D48 3C04800E */ lui $a0, %hi(gPlayerOneCopy) # $a0, 0x800e +/* 02294C 80021D4C 8C84C4FC */ lw $a0, %lo(gPlayerOneCopy)($a0) /* 022950 80021D50 00002825 */ move $a1, $zero /* 022954 80021D54 0C01BA31 */ jal func_8006E8C4 /* 022958 80021D58 24060002 */ li $a2, 2 -/* 02295C 80021D5C 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e -/* 022960 80021D60 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) +/* 02295C 80021D5C 3C04800E */ lui $a0, %hi(gPlayerTwo) # $a0, 0x800e +/* 022960 80021D60 8C84C4E0 */ lw $a0, %lo(gPlayerTwo)($a0) /* 022964 80021D64 24050001 */ li $a1, 1 /* 022968 80021D68 0C01BA31 */ jal func_8006E8C4 /* 02296C 80021D6C 24060002 */ li $a2, 2 -/* 022970 80021D70 3C04800E */ lui $a0, %hi(D_800DC4E4) # $a0, 0x800e -/* 022974 80021D74 8C84C4E4 */ lw $a0, %lo(D_800DC4E4)($a0) +/* 022970 80021D70 3C04800E */ lui $a0, %hi(gPlayerThree) # $a0, 0x800e +/* 022974 80021D74 8C84C4E4 */ lw $a0, %lo(gPlayerThree)($a0) /* 022978 80021D78 24050002 */ li $a1, 2 /* 02297C 80021D7C 0C01BA31 */ jal func_8006E8C4 /* 022980 80021D80 24060002 */ li $a2, 2 -/* 022984 80021D84 3C04800E */ lui $a0, %hi(D_800DC4E8) # $a0, 0x800e -/* 022988 80021D88 8C84C4E8 */ lw $a0, %lo(D_800DC4E8)($a0) +/* 022984 80021D84 3C04800E */ lui $a0, %hi(gPlayerFour) # $a0, 0x800e +/* 022988 80021D88 8C84C4E8 */ lw $a0, %lo(gPlayerFour)($a0) /* 02298C 80021D8C 24050003 */ li $a1, 3 /* 022990 80021D90 0C01BA31 */ jal func_8006E8C4 /* 022994 80021D94 24060002 */ li $a2, 2 /* 022998 80021D98 8FBF0014 */ lw $ra, 0x14($sp) /* 02299C 80021D9C 27BD0018 */ addiu $sp, $sp, 0x18 /* 0229A0 80021DA0 03E00008 */ jr $ra -/* 0229A4 80021DA4 00000000 */ nop +/* 0229A4 80021DA4 00000000 */ nop diff --git a/asm/non_matchings/code_8001F980/func_80021DA8.s b/asm/non_matchings/code_8001F980/func_80021DA8.s index 055c73e5b..c9595908e 100644 --- a/asm/non_matchings/code_8001F980/func_80021DA8.s +++ b/asm/non_matchings/code_8001F980/func_80021DA8.s @@ -1,27 +1,27 @@ glabel func_80021DA8 /* 0229A8 80021DA8 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 0229AC 80021DAC AFBF0014 */ sw $ra, 0x14($sp) -/* 0229B0 80021DB0 3C04800E */ lui $a0, %hi(D_800DC4FC) # $a0, 0x800e -/* 0229B4 80021DB4 8C84C4FC */ lw $a0, %lo(D_800DC4FC)($a0) +/* 0229B0 80021DB0 3C04800E */ lui $a0, %hi(gPlayerOneCopy) # $a0, 0x800e +/* 0229B4 80021DB4 8C84C4FC */ lw $a0, %lo(gPlayerOneCopy)($a0) /* 0229B8 80021DB8 00002825 */ move $a1, $zero /* 0229BC 80021DBC 0C01BA50 */ jal func_8006E940 /* 0229C0 80021DC0 24060003 */ li $a2, 3 -/* 0229C4 80021DC4 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e -/* 0229C8 80021DC8 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) +/* 0229C4 80021DC4 3C04800E */ lui $a0, %hi(gPlayerTwo) # $a0, 0x800e +/* 0229C8 80021DC8 8C84C4E0 */ lw $a0, %lo(gPlayerTwo)($a0) /* 0229CC 80021DCC 24050001 */ li $a1, 1 /* 0229D0 80021DD0 0C01BA50 */ jal func_8006E940 /* 0229D4 80021DD4 24060003 */ li $a2, 3 -/* 0229D8 80021DD8 3C04800E */ lui $a0, %hi(D_800DC4E4) # $a0, 0x800e -/* 0229DC 80021DDC 8C84C4E4 */ lw $a0, %lo(D_800DC4E4)($a0) +/* 0229D8 80021DD8 3C04800E */ lui $a0, %hi(gPlayerThree) # $a0, 0x800e +/* 0229DC 80021DDC 8C84C4E4 */ lw $a0, %lo(gPlayerThree)($a0) /* 0229E0 80021DE0 24050002 */ li $a1, 2 /* 0229E4 80021DE4 0C01BA50 */ jal func_8006E940 /* 0229E8 80021DE8 24060003 */ li $a2, 3 -/* 0229EC 80021DEC 3C04800E */ lui $a0, %hi(D_800DC4E8) # $a0, 0x800e -/* 0229F0 80021DF0 8C84C4E8 */ lw $a0, %lo(D_800DC4E8)($a0) +/* 0229EC 80021DEC 3C04800E */ lui $a0, %hi(gPlayerFour) # $a0, 0x800e +/* 0229F0 80021DF0 8C84C4E8 */ lw $a0, %lo(gPlayerFour)($a0) /* 0229F4 80021DF4 24050003 */ li $a1, 3 /* 0229F8 80021DF8 0C01BA50 */ jal func_8006E940 /* 0229FC 80021DFC 24060003 */ li $a2, 3 /* 022A00 80021E00 8FBF0014 */ lw $ra, 0x14($sp) /* 022A04 80021E04 27BD0018 */ addiu $sp, $sp, 0x18 /* 022A08 80021E08 03E00008 */ jr $ra -/* 022A0C 80021E0C 00000000 */ nop +/* 022A0C 80021E0C 00000000 */ nop diff --git a/asm/non_matchings/code_8001F980/func_8002276C.s b/asm/non_matchings/code_8001F980/func_8002276C.s index cadb6b8fc..db36ae306 100644 --- a/asm/non_matchings/code_8001F980/func_8002276C.s +++ b/asm/non_matchings/code_8001F980/func_8002276C.s @@ -9,77 +9,77 @@ glabel func_8002276C /* 023388 80022788 24040002 */ li $a0, 2 /* 02338C 8002278C 24040002 */ li $a0, 2 /* 023390 80022790 10440067 */ beq $v0, $a0, .L80022930 -/* 023394 80022794 00000000 */ nop +/* 023394 80022794 00000000 */ nop /* 023398 80022798 24030003 */ li $v1, 3 /* 02339C 8002279C 104300A1 */ beq $v0, $v1, .L80022A24 -/* 0233A0 800227A0 00000000 */ nop +/* 0233A0 800227A0 00000000 */ nop /* 0233A4 800227A4 100000B9 */ b .L80022A8C /* 0233A8 800227A8 8FBF0014 */ lw $ra, 0x14($sp) .L800227AC: /* 0233AC 800227AC 3C02800E */ lui $v0, %hi(gModeSelection) # $v0, 0x800e /* 0233B0 800227B0 8C42C53C */ lw $v0, %lo(gModeSelection)($v0) /* 0233B4 800227B4 24030001 */ li $v1, 1 -/* 0233B8 800227B8 3C04800E */ lui $a0, %hi(D_800DC4DC) # 0x800e +/* 0233B8 800227B8 3C04800E */ lui $a0, %hi(gPlayerOne) # 0x800e /* 0233BC 800227BC 1040000A */ beqz $v0, .L800227E8 /* 0233C0 800227C0 00002825 */ move $a1, $zero /* 0233C4 800227C4 10430028 */ beq $v0, $v1, .L80022868 -/* 0233C8 800227C8 3C04800E */ lui $a0, %hi(D_800DC4DC) # $a0, 0x800e +/* 0233C8 800227C8 3C04800E */ lui $a0, %hi(gPlayerOne) # $a0, 0x800e /* 0233CC 800227CC 24040002 */ li $a0, 2 /* 0233D0 800227D0 1044003C */ beq $v0, $a0, .L800228C4 /* 0233D4 800227D4 24030003 */ li $v1, 3 /* 0233D8 800227D8 1043003A */ beq $v0, $v1, .L800228C4 -/* 0233DC 800227DC 00000000 */ nop +/* 0233DC 800227DC 00000000 */ nop /* 0233E0 800227E0 100000AA */ b .L80022A8C /* 0233E4 800227E4 8FBF0014 */ lw $ra, 0x14($sp) .L800227E8: /* 0233E8 800227E8 0C008AA6 */ jal func_80022A98 -/* 0233EC 800227EC 8C84C4DC */ lw $a0, %lo(D_800DC4DC)($a0) -/* 0233F0 800227F0 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e -/* 0233F4 800227F4 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) +/* 0233EC 800227EC 8C84C4DC */ lw $a0, %lo(gPlayerOne)($a0) +/* 0233F0 800227F0 3C04800E */ lui $a0, %hi(gPlayerTwo) # $a0, 0x800e +/* 0233F4 800227F4 8C84C4E0 */ lw $a0, %lo(gPlayerTwo)($a0) /* 0233F8 800227F8 0C008AA6 */ jal func_80022A98 /* 0233FC 800227FC 24050001 */ li $a1, 1 -/* 023400 80022800 3C04800E */ lui $a0, %hi(D_800DC4E4) # $a0, 0x800e -/* 023404 80022804 8C84C4E4 */ lw $a0, %lo(D_800DC4E4)($a0) +/* 023400 80022800 3C04800E */ lui $a0, %hi(gPlayerThree) # $a0, 0x800e +/* 023404 80022804 8C84C4E4 */ lw $a0, %lo(gPlayerThree)($a0) /* 023408 80022808 0C008AA6 */ jal func_80022A98 /* 02340C 8002280C 24050002 */ li $a1, 2 -/* 023410 80022810 3C04800E */ lui $a0, %hi(D_800DC4E8) # $a0, 0x800e -/* 023414 80022814 8C84C4E8 */ lw $a0, %lo(D_800DC4E8)($a0) +/* 023410 80022810 3C04800E */ lui $a0, %hi(gPlayerFour) # $a0, 0x800e +/* 023414 80022814 8C84C4E8 */ lw $a0, %lo(gPlayerFour)($a0) /* 023418 80022818 0C008AA6 */ jal func_80022A98 /* 02341C 8002281C 24050003 */ li $a1, 3 -/* 023420 80022820 3C04800E */ lui $a0, %hi(D_800DC4EC) # $a0, 0x800e -/* 023424 80022824 8C84C4EC */ lw $a0, %lo(D_800DC4EC)($a0) +/* 023420 80022820 3C04800E */ lui $a0, %hi(gPlayerFive) # $a0, 0x800e +/* 023424 80022824 8C84C4EC */ lw $a0, %lo(gPlayerFive)($a0) /* 023428 80022828 0C008AA6 */ jal func_80022A98 /* 02342C 8002282C 24050004 */ li $a1, 4 -/* 023430 80022830 3C04800E */ lui $a0, %hi(D_800DC4F0) # $a0, 0x800e -/* 023434 80022834 8C84C4F0 */ lw $a0, %lo(D_800DC4F0)($a0) +/* 023430 80022830 3C04800E */ lui $a0, %hi(gPlayerSix) # $a0, 0x800e +/* 023434 80022834 8C84C4F0 */ lw $a0, %lo(gPlayerSix)($a0) /* 023438 80022838 0C008AA6 */ jal func_80022A98 /* 02343C 8002283C 24050005 */ li $a1, 5 -/* 023440 80022840 3C04800E */ lui $a0, %hi(D_800DC4F4) # $a0, 0x800e -/* 023444 80022844 8C84C4F4 */ lw $a0, %lo(D_800DC4F4)($a0) +/* 023440 80022840 3C04800E */ lui $a0, %hi(gPlayerSeven) # $a0, 0x800e +/* 023444 80022844 8C84C4F4 */ lw $a0, %lo(gPlayerSeven)($a0) /* 023448 80022848 0C008AA6 */ jal func_80022A98 /* 02344C 8002284C 24050006 */ li $a1, 6 -/* 023450 80022850 3C04800E */ lui $a0, %hi(D_800DC4F8) # $a0, 0x800e -/* 023454 80022854 8C84C4F8 */ lw $a0, %lo(D_800DC4F8)($a0) +/* 023450 80022850 3C04800E */ lui $a0, %hi(gPlayerEight) # $a0, 0x800e +/* 023454 80022854 8C84C4F8 */ lw $a0, %lo(gPlayerEight)($a0) /* 023458 80022858 0C008AA6 */ jal func_80022A98 /* 02345C 8002285C 24050007 */ li $a1, 7 /* 023460 80022860 1000008A */ b .L80022A8C /* 023464 80022864 8FBF0014 */ lw $ra, 0x14($sp) .L80022868: -/* 023468 80022868 8C84C4DC */ lw $a0, %lo(D_800DC4DC)($a0) # -0x3b24($a0) +/* 023468 80022868 8C84C4DC */ lw $a0, %lo(gPlayerOne)($a0) # -0x3b24($a0) /* 02346C 8002286C 0C008AA6 */ jal func_80022A98 /* 023470 80022870 00002825 */ move $a1, $zero -/* 023474 80022874 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e -/* 023478 80022878 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) +/* 023474 80022874 3C04800E */ lui $a0, %hi(gPlayerTwo) # $a0, 0x800e +/* 023478 80022878 8C84C4E0 */ lw $a0, %lo(gPlayerTwo)($a0) /* 02347C 8002287C 24010100 */ li $at, 256 /* 023480 80022880 948E0000 */ lhu $t6, ($a0) /* 023484 80022884 31CF0100 */ andi $t7, $t6, 0x100 /* 023488 80022888 15E10003 */ bne $t7, $at, .L80022898 -/* 02348C 8002288C 00000000 */ nop +/* 02348C 8002288C 00000000 */ nop /* 023490 80022890 0C008AA6 */ jal func_80022A98 /* 023494 80022894 24050001 */ li $a1, 1 .L80022898: -/* 023498 80022898 3C04800E */ lui $a0, %hi(D_800DC4E4) # $a0, 0x800e -/* 02349C 8002289C 8C84C4E4 */ lw $a0, %lo(D_800DC4E4)($a0) +/* 023498 80022898 3C04800E */ lui $a0, %hi(gPlayerThree) # $a0, 0x800e +/* 02349C 8002289C 8C84C4E4 */ lw $a0, %lo(gPlayerThree)($a0) /* 0234A0 800228A0 24010100 */ li $at, 256 /* 0234A4 800228A4 94980000 */ lhu $t8, ($a0) /* 0234A8 800228A8 33190100 */ andi $t9, $t8, 0x100 @@ -90,30 +90,30 @@ glabel func_8002276C /* 0234BC 800228BC 10000073 */ b .L80022A8C /* 0234C0 800228C0 8FBF0014 */ lw $ra, 0x14($sp) .L800228C4: -/* 0234C4 800228C4 3C04800E */ lui $a0, %hi(D_800DC4DC) # $a0, 0x800e -/* 0234C8 800228C8 8C84C4DC */ lw $a0, %lo(D_800DC4DC)($a0) +/* 0234C4 800228C4 3C04800E */ lui $a0, %hi(gPlayerOne) # $a0, 0x800e +/* 0234C8 800228C8 8C84C4DC */ lw $a0, %lo(gPlayerOne)($a0) /* 0234CC 800228CC 0C008AA6 */ jal func_80022A98 /* 0234D0 800228D0 00002825 */ move $a1, $zero -/* 0234D4 800228D4 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e -/* 0234D8 800228D8 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) +/* 0234D4 800228D4 3C04800E */ lui $a0, %hi(gPlayerTwo) # $a0, 0x800e +/* 0234D8 800228D8 8C84C4E0 */ lw $a0, %lo(gPlayerTwo)($a0) /* 0234DC 800228DC 0C008AA6 */ jal func_80022A98 /* 0234E0 800228E0 24050001 */ li $a1, 1 /* 0234E4 800228E4 3C02800E */ lui $v0, %hi(gPlayerCountSelection1) # $v0, 0x800e /* 0234E8 800228E8 8C42C538 */ lw $v0, %lo(gPlayerCountSelection1)($v0) -/* 0234EC 800228EC 3C04800E */ lui $a0, %hi(D_800DC4E4) # $a0, 0x800e +/* 0234EC 800228EC 3C04800E */ lui $a0, %hi(gPlayerThree) # $a0, 0x800e /* 0234F0 800228F0 24050002 */ li $a1, 2 /* 0234F4 800228F4 28410003 */ slti $at, $v0, 3 /* 0234F8 800228F8 54200006 */ bnel $at, $zero, .L80022914 /* 0234FC 800228FC 24010004 */ li $at, 4 /* 023500 80022900 0C008AA6 */ jal func_80022A98 -/* 023504 80022904 8C84C4E4 */ lw $a0, %lo(D_800DC4E4)($a0) +/* 023504 80022904 8C84C4E4 */ lw $a0, %lo(gPlayerThree)($a0) /* 023508 80022908 3C02800E */ lui $v0, %hi(gPlayerCountSelection1) # $v0, 0x800e /* 02350C 8002290C 8C42C538 */ lw $v0, %lo(gPlayerCountSelection1)($v0) /* 023510 80022910 24010004 */ li $at, 4 .L80022914: /* 023514 80022914 1441005C */ bne $v0, $at, .L80022A88 -/* 023518 80022918 3C04800E */ lui $a0, %hi(D_800DC4E8) # $a0, 0x800e -/* 02351C 8002291C 8C84C4E8 */ lw $a0, %lo(D_800DC4E8)($a0) +/* 023518 80022918 3C04800E */ lui $a0, %hi(gPlayerFour) # $a0, 0x800e +/* 02351C 8002291C 8C84C4E8 */ lw $a0, %lo(gPlayerFour)($a0) /* 023520 80022920 0C008AA6 */ jal func_80022A98 /* 023524 80022924 24050003 */ li $a1, 3 /* 023528 80022928 10000058 */ b .L80022A8C @@ -123,64 +123,64 @@ glabel func_8002276C /* 023534 80022934 8C42C53C */ lw $v0, %lo(gModeSelection)($v0) /* 023538 80022938 00002825 */ move $a1, $zero /* 02353C 8002293C 10400009 */ beqz $v0, .L80022964 -/* 023540 80022940 00000000 */ nop +/* 023540 80022940 00000000 */ nop /* 023544 80022944 10430032 */ beq $v0, $v1, .L80022A10 /* 023548 80022948 00002825 */ move $a1, $zero /* 02354C 8002294C 10440026 */ beq $v0, $a0, .L800229E8 /* 023550 80022950 24030003 */ li $v1, 3 /* 023554 80022954 10430024 */ beq $v0, $v1, .L800229E8 -/* 023558 80022958 00000000 */ nop +/* 023558 80022958 00000000 */ nop /* 02355C 8002295C 1000004B */ b .L80022A8C /* 023560 80022960 8FBF0014 */ lw $ra, 0x14($sp) .L80022964: -/* 023564 80022964 3C04800E */ lui $a0, %hi(D_800DC4DC) # $a0, 0x800e +/* 023564 80022964 3C04800E */ lui $a0, %hi(gPlayerOne) # $a0, 0x800e /* 023568 80022968 0C008AA6 */ jal func_80022A98 -/* 02356C 8002296C 8C84C4DC */ lw $a0, %lo(D_800DC4DC)($a0) -/* 023570 80022970 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e -/* 023574 80022974 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) +/* 02356C 8002296C 8C84C4DC */ lw $a0, %lo(gPlayerOne)($a0) +/* 023570 80022970 3C04800E */ lui $a0, %hi(gPlayerTwo) # $a0, 0x800e +/* 023574 80022974 8C84C4E0 */ lw $a0, %lo(gPlayerTwo)($a0) /* 023578 80022978 0C008AA6 */ jal func_80022A98 /* 02357C 8002297C 24050001 */ li $a1, 1 -/* 023580 80022980 3C04800E */ lui $a0, %hi(D_800DC4E4) # $a0, 0x800e -/* 023584 80022984 8C84C4E4 */ lw $a0, %lo(D_800DC4E4)($a0) +/* 023580 80022980 3C04800E */ lui $a0, %hi(gPlayerThree) # $a0, 0x800e +/* 023584 80022984 8C84C4E4 */ lw $a0, %lo(gPlayerThree)($a0) /* 023588 80022988 0C008AA6 */ jal func_80022A98 /* 02358C 8002298C 24050002 */ li $a1, 2 -/* 023590 80022990 3C04800E */ lui $a0, %hi(D_800DC4E8) # $a0, 0x800e -/* 023594 80022994 8C84C4E8 */ lw $a0, %lo(D_800DC4E8)($a0) +/* 023590 80022990 3C04800E */ lui $a0, %hi(gPlayerFour) # $a0, 0x800e +/* 023594 80022994 8C84C4E8 */ lw $a0, %lo(gPlayerFour)($a0) /* 023598 80022998 0C008AA6 */ jal func_80022A98 /* 02359C 8002299C 24050003 */ li $a1, 3 -/* 0235A0 800229A0 3C04800E */ lui $a0, %hi(D_800DC4EC) # $a0, 0x800e -/* 0235A4 800229A4 8C84C4EC */ lw $a0, %lo(D_800DC4EC)($a0) +/* 0235A0 800229A0 3C04800E */ lui $a0, %hi(gPlayerFive) # $a0, 0x800e +/* 0235A4 800229A4 8C84C4EC */ lw $a0, %lo(gPlayerFive)($a0) /* 0235A8 800229A8 0C008AA6 */ jal func_80022A98 /* 0235AC 800229AC 24050004 */ li $a1, 4 -/* 0235B0 800229B0 3C04800E */ lui $a0, %hi(D_800DC4F0) # $a0, 0x800e -/* 0235B4 800229B4 8C84C4F0 */ lw $a0, %lo(D_800DC4F0)($a0) +/* 0235B0 800229B0 3C04800E */ lui $a0, %hi(gPlayerSix) # $a0, 0x800e +/* 0235B4 800229B4 8C84C4F0 */ lw $a0, %lo(gPlayerSix)($a0) /* 0235B8 800229B8 0C008AA6 */ jal func_80022A98 /* 0235BC 800229BC 24050005 */ li $a1, 5 -/* 0235C0 800229C0 3C04800E */ lui $a0, %hi(D_800DC4F4) # $a0, 0x800e -/* 0235C4 800229C4 8C84C4F4 */ lw $a0, %lo(D_800DC4F4)($a0) +/* 0235C0 800229C0 3C04800E */ lui $a0, %hi(gPlayerSeven) # $a0, 0x800e +/* 0235C4 800229C4 8C84C4F4 */ lw $a0, %lo(gPlayerSeven)($a0) /* 0235C8 800229C8 0C008AA6 */ jal func_80022A98 /* 0235CC 800229CC 24050006 */ li $a1, 6 -/* 0235D0 800229D0 3C04800E */ lui $a0, %hi(D_800DC4F8) # $a0, 0x800e -/* 0235D4 800229D4 8C84C4F8 */ lw $a0, %lo(D_800DC4F8)($a0) +/* 0235D0 800229D0 3C04800E */ lui $a0, %hi(gPlayerEight) # $a0, 0x800e +/* 0235D4 800229D4 8C84C4F8 */ lw $a0, %lo(gPlayerEight)($a0) /* 0235D8 800229D8 0C008AA6 */ jal func_80022A98 /* 0235DC 800229DC 24050007 */ li $a1, 7 /* 0235E0 800229E0 1000002A */ b .L80022A8C /* 0235E4 800229E4 8FBF0014 */ lw $ra, 0x14($sp) .L800229E8: -/* 0235E8 800229E8 3C04800E */ lui $a0, %hi(D_800DC4DC) # $a0, 0x800e -/* 0235EC 800229EC 8C84C4DC */ lw $a0, %lo(D_800DC4DC)($a0) +/* 0235E8 800229E8 3C04800E */ lui $a0, %hi(gPlayerOne) # $a0, 0x800e +/* 0235EC 800229EC 8C84C4DC */ lw $a0, %lo(gPlayerOne)($a0) /* 0235F0 800229F0 0C008AA6 */ jal func_80022A98 /* 0235F4 800229F4 00002825 */ move $a1, $zero -/* 0235F8 800229F8 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e -/* 0235FC 800229FC 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) +/* 0235F8 800229F8 3C04800E */ lui $a0, %hi(gPlayerTwo) # $a0, 0x800e +/* 0235FC 800229FC 8C84C4E0 */ lw $a0, %lo(gPlayerTwo)($a0) /* 023600 80022A00 0C008AA6 */ jal func_80022A98 /* 023604 80022A04 24050001 */ li $a1, 1 /* 023608 80022A08 10000020 */ b .L80022A8C /* 02360C 80022A0C 8FBF0014 */ lw $ra, 0x14($sp) .L80022A10: -/* 023610 80022A10 3C04800E */ lui $a0, %hi(D_800DC4DC) # $a0, 0x800e +/* 023610 80022A10 3C04800E */ lui $a0, %hi(gPlayerOne) # $a0, 0x800e /* 023614 80022A14 0C008AA6 */ jal func_80022A98 -/* 023618 80022A18 8C84C4DC */ lw $a0, %lo(D_800DC4DC)($a0) +/* 023618 80022A18 8C84C4DC */ lw $a0, %lo(gPlayerOne)($a0) /* 02361C 80022A1C 1000001B */ b .L80022A8C /* 023620 80022A20 8FBF0014 */ lw $ra, 0x14($sp) .L80022A24: @@ -188,31 +188,31 @@ glabel func_8002276C /* 023628 80022A28 8C42C53C */ lw $v0, %lo(gModeSelection)($v0) /* 02362C 80022A2C 00002825 */ move $a1, $zero /* 023630 80022A30 10440002 */ beq $v0, $a0, .L80022A3C -/* 023634 80022A34 00000000 */ nop +/* 023634 80022A34 00000000 */ nop /* 023638 80022A38 14430013 */ bne $v0, $v1, .L80022A88 .L80022A3C: -/* 02363C 80022A3C 3C04800E */ lui $a0, %hi(D_800DC4DC) # $a0, 0x800e +/* 02363C 80022A3C 3C04800E */ lui $a0, %hi(gPlayerOne) # $a0, 0x800e /* 023640 80022A40 0C008AA6 */ jal func_80022A98 -/* 023644 80022A44 8C84C4DC */ lw $a0, %lo(D_800DC4DC)($a0) -/* 023648 80022A48 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e -/* 02364C 80022A4C 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) +/* 023644 80022A44 8C84C4DC */ lw $a0, %lo(gPlayerOne)($a0) +/* 023648 80022A48 3C04800E */ lui $a0, %hi(gPlayerTwo) # $a0, 0x800e +/* 02364C 80022A4C 8C84C4E0 */ lw $a0, %lo(gPlayerTwo)($a0) /* 023650 80022A50 0C008AA6 */ jal func_80022A98 /* 023654 80022A54 24050001 */ li $a1, 1 -/* 023658 80022A58 3C04800E */ lui $a0, %hi(D_800DC4E4) # $a0, 0x800e -/* 02365C 80022A5C 8C84C4E4 */ lw $a0, %lo(D_800DC4E4)($a0) +/* 023658 80022A58 3C04800E */ lui $a0, %hi(gPlayerThree) # $a0, 0x800e +/* 02365C 80022A5C 8C84C4E4 */ lw $a0, %lo(gPlayerThree)($a0) /* 023660 80022A60 0C008AA6 */ jal func_80022A98 /* 023664 80022A64 24050002 */ li $a1, 2 /* 023668 80022A68 3C08800E */ lui $t0, %hi(gPlayerCountSelection1) # $t0, 0x800e /* 02366C 80022A6C 8D08C538 */ lw $t0, %lo(gPlayerCountSelection1)($t0) /* 023670 80022A70 24010004 */ li $at, 4 -/* 023674 80022A74 3C04800E */ lui $a0, %hi(D_800DC4E8) # $a0, 0x800e +/* 023674 80022A74 3C04800E */ lui $a0, %hi(gPlayerFour) # $a0, 0x800e /* 023678 80022A78 15010003 */ bne $t0, $at, .L80022A88 /* 02367C 80022A7C 24050003 */ li $a1, 3 /* 023680 80022A80 0C008AA6 */ jal func_80022A98 -/* 023684 80022A84 8C84C4E8 */ lw $a0, %lo(D_800DC4E8)($a0) +/* 023684 80022A84 8C84C4E8 */ lw $a0, %lo(gPlayerFour)($a0) .L80022A88: /* 023688 80022A88 8FBF0014 */ lw $ra, 0x14($sp) .L80022A8C: /* 02368C 80022A8C 27BD0018 */ addiu $sp, $sp, 0x18 /* 023690 80022A90 03E00008 */ jr $ra -/* 023694 80022A94 00000000 */ nop +/* 023694 80022A94 00000000 */ nop diff --git a/asm/non_matchings/code_8001F980/func_800235AC.s b/asm/non_matchings/code_8001F980/func_800235AC.s index 24d4a9488..0ae9516d2 100644 --- a/asm/non_matchings/code_8001F980/func_800235AC.s +++ b/asm/non_matchings/code_8001F980/func_800235AC.s @@ -12,8 +12,8 @@ glabel func_800235AC /* 0241D4 800235D4 01C08825 */ move $s1, $t6 /* 0241D8 800235D8 17010018 */ bne $t8, $at, .L8002363C /* 0241DC 800235DC 00808025 */ move $s0, $a0 -/* 0241E0 800235E0 3C19800E */ lui $t9, %hi(D_800DC4E4) # $t9, 0x800e -/* 0241E4 800235E4 8F39C4E4 */ lw $t9, %lo(D_800DC4E4)($t9) +/* 0241E0 800235E0 3C19800E */ lui $t9, %hi(gPlayerThree) # $t9, 0x800e +/* 0241E4 800235E4 8F39C4E4 */ lw $t9, %lo(gPlayerThree)($t9) /* 0241E8 800235E8 000E2E00 */ sll $a1, $t6, 0x18 /* 0241EC 800235EC 00054603 */ sra $t0, $a1, 0x18 /* 0241F0 800235F0 14990012 */ bne $a0, $t9, .L8002363C @@ -134,7 +134,7 @@ glabel func_800235AC /* 0243A8 800237A8 25EF4B80 */ addiu $t7, %lo(D_80164B80) # addiu $t7, $t7, 0x4b80 /* 0243AC 800237AC 29A10078 */ slti $at, $t5, 0x78 /* 0243B0 800237B0 1020004F */ beqz $at, .L800238F0 -/* 0243B4 800237B4 00000000 */ nop +/* 0243B4 800237B4 00000000 */ nop /* 0243B8 800237B8 00117080 */ sll $t6, $s1, 2 /* 0243BC 800237BC 01CF1821 */ addu $v1, $t6, $t7 /* 0243C0 800237C0 8C780000 */ lw $t8, ($v1) @@ -226,7 +226,7 @@ glabel func_800235AC /* 024508 80023908 0322C821 */ addu $t9, $t9, $v0 /* 02450C 8002390C 8F39D930 */ lw $t9, %lo(D_8018D930)($t9) # -0x26d0 /* 024510 80023910 44183000 */ mfc1 $t8, $f6 -/* 024514 80023914 00000000 */ nop +/* 024514 80023914 00000000 */ nop /* 024518 80023918 03191823 */ subu $v1, $t8, $t9 /* 02451C 8002391C 28610009 */ slti $at, $v1, 9 /* 024520 80023920 1020006E */ beqz $at, .L80023ADC @@ -250,7 +250,7 @@ glabel func_800235AC /* 024560 80023960 8C620000 */ lw $v0, ($v1) /* 024564 80023964 28410028 */ slti $at, $v0, 0x28 /* 024568 80023968 14200003 */ bnez $at, .L80023978 -/* 02456C 8002396C 00000000 */ nop +/* 02456C 8002396C 00000000 */ nop /* 024570 80023970 AC600000 */ sw $zero, ($v1) /* 024574 80023974 00001025 */ move $v0, $zero .L80023978: diff --git a/asm/non_matchings/code_80027D00/func_80027DA8.s b/asm/non_matchings/code_80027D00/func_80027DA8.s index fcb7e18a9..db7200e81 100644 --- a/asm/non_matchings/code_80027D00/func_80027DA8.s +++ b/asm/non_matchings/code_80027D00/func_80027DA8.s @@ -51,14 +51,14 @@ glabel func_80027DA8 /* 028A64 80027E64 5301001A */ beql $t8, $at, .L80027ED0 /* 028A68 80027E68 8FBF0014 */ lw $ra, 0x14($sp) /* 028A6C 80027E6C 8F39D168 */ lw $t9, %lo(D_8018D168)($t9) -/* 028A70 80027E70 3C08800E */ lui $t0, %hi(D_800DC4DC) # $t0, 0x800e +/* 028A70 80027E70 3C08800E */ lui $t0, %hi(gPlayerOne) # $t0, 0x800e /* 028A74 80027E74 304B2000 */ andi $t3, $v0, 0x2000 /* 028A78 80027E78 1479000C */ bne $v1, $t9, .L80027EAC -/* 028A7C 80027E7C 00000000 */ nop -/* 028A80 80027E80 8D08C4DC */ lw $t0, %lo(D_800DC4DC)($t0) +/* 028A7C 80027E7C 00000000 */ nop +/* 028A80 80027E80 8D08C4DC */ lw $t0, %lo(gPlayerOne)($t0) /* 028A84 80027E84 30A400FF */ andi $a0, $a1, 0xff /* 028A88 80027E88 14C80008 */ bne $a2, $t0, .L80027EAC -/* 028A8C 80027E8C 00000000 */ nop +/* 028A8C 80027E8C 00000000 */ nop /* 028A90 80027E90 0C032529 */ jal func_800C94A4 /* 028A94 80027E94 AFA60018 */ sw $a2, 0x18($sp) /* 028A98 80027E98 8FA60018 */ lw $a2, 0x18($sp) @@ -80,4 +80,4 @@ glabel func_80027DA8 .L80027ED0: /* 028AD0 80027ED0 27BD0018 */ addiu $sp, $sp, 0x18 /* 028AD4 80027ED4 03E00008 */ jr $ra -/* 028AD8 80027ED8 00000000 */ nop +/* 028AD8 80027ED8 00000000 */ nop diff --git a/asm/non_matchings/code_80027D00/func_8002A79C.s b/asm/non_matchings/code_80027D00/func_8002A79C.s index 49580bb0f..259e60924 100644 --- a/asm/non_matchings/code_80027D00/func_8002A79C.s +++ b/asm/non_matchings/code_80027D00/func_8002A79C.s @@ -12,22 +12,22 @@ glabel func_8002A79C /* 02B3C4 8002A7C4 30580010 */ andi $t8, $v0, 0x10 /* 02B3C8 8002A7C8 24010010 */ li $at, 16 /* 02B3CC 8002A7CC 13010021 */ beq $t8, $at, .L8002A854 -/* 02B3D0 8002A7D0 00000000 */ nop +/* 02B3D0 8002A7D0 00000000 */ nop /* 02B3D4 8002A7D4 8499022A */ lh $t9, 0x22a($a0) /* 02B3D8 8002A7D8 34480100 */ ori $t0, $v0, 0x100 /* 02B3DC 8002A7DC 3C098016 */ lui $t1, %hi(D_8015F890) # $t1, 0x8016 /* 02B3E0 8002A7E0 2B210002 */ slti $at, $t9, 2 /* 02B3E4 8002A7E4 1420001B */ bnez $at, .L8002A854 -/* 02B3E8 8002A7E8 00000000 */ nop +/* 02B3E8 8002A7E8 00000000 */ nop /* 02B3EC 8002A7EC AC8800BC */ sw $t0, 0xbc($a0) /* 02B3F0 8002A7F0 A480023A */ sh $zero, 0x23a($a0) /* 02B3F4 8002A7F4 A480022A */ sh $zero, 0x22a($a0) /* 02B3F8 8002A7F8 A4800228 */ sh $zero, 0x228($a0) /* 02B3FC 8002A7FC 9529F890 */ lhu $t1, %lo(D_8015F890)($t1) /* 02B400 8002A800 24010001 */ li $at, 1 -/* 02B404 8002A804 3C0C800E */ lui $t4, %hi(D_800DC4DC) # $t4, 0x800e +/* 02B404 8002A804 3C0C800E */ lui $t4, %hi(gPlayerOne) # $t4, 0x800e /* 02B408 8002A808 1121000B */ beq $t1, $at, .L8002A838 -/* 02B40C 8002A80C 00000000 */ nop +/* 02B40C 8002A80C 00000000 */ nop /* 02B410 8002A810 94820000 */ lhu $v0, ($a0) /* 02B414 8002A814 304A4000 */ andi $t2, $v0, 0x4000 /* 02B418 8002A818 1140001E */ beqz $t2, .L8002A894 @@ -39,7 +39,7 @@ glabel func_8002A79C /* 02B430 8002A830 10000019 */ b .L8002A898 /* 02B434 8002A834 8FBF0014 */ lw $ra, 0x14($sp) .L8002A838: -/* 02B438 8002A838 8D8CC4DC */ lw $t4, %lo(D_800DC4DC)($t4) +/* 02B438 8002A838 8D8CC4DC */ lw $t4, %lo(gPlayerOne)($t4) /* 02B43C 8002A83C 548C0016 */ bnel $a0, $t4, .L8002A898 /* 02B440 8002A840 8FBF0014 */ lw $ra, 0x14($sp) /* 02B444 8002A844 0C032494 */ jal func_800C9250 @@ -68,4 +68,4 @@ glabel func_8002A79C .L8002A898: /* 02B498 8002A898 27BD0018 */ addiu $sp, $sp, 0x18 /* 02B49C 8002A89C 03E00008 */ jr $ra -/* 02B4A0 8002A8A0 00000000 */ nop +/* 02B4A0 8002A8A0 00000000 */ nop diff --git a/asm/non_matchings/code_80027D00/func_8002B830.s b/asm/non_matchings/code_80027D00/func_8002B830.s index 9e7792375..dd9517e28 100644 --- a/asm/non_matchings/code_80027D00/func_8002B830.s +++ b/asm/non_matchings/code_80027D00/func_8002B830.s @@ -7,7 +7,7 @@ glabel func_8002B830 /* 02C444 8002B844 83A60023 */ lb $a2, 0x23($sp) /* 02C448 8002B848 83A5001F */ lb $a1, 0x1f($sp) /* 02C44C 8002B84C 10400005 */ beqz $v0, .L8002B864 -/* 02C450 8002B850 00000000 */ nop +/* 02C450 8002B850 00000000 */ nop /* 02C454 8002B854 0C00AD70 */ jal func_8002B5C0 /* 02C458 8002B858 AFA40018 */ sw $a0, 0x18($sp) /* 02C45C 8002B85C 8FA40018 */ lw $a0, 0x18($sp) @@ -30,54 +30,54 @@ glabel func_8002B830 .L8002B898: /* 02C498 8002B898 27BD0018 */ addiu $sp, $sp, 0x18 /* 02C49C 8002B89C 03E00008 */ jr $ra -/* 02C4A0 8002B8A0 00000000 */ nop +/* 02C4A0 8002B8A0 00000000 */ nop -/* 02C4A4 8002B8A4 3C02800E */ lui $v0, %hi(D_800DC4DC) # $v0, 0x800e -/* 02C4A8 8002B8A8 8C42C4DC */ lw $v0, %lo(D_800DC4DC)($v0) +/* 02C4A4 8002B8A4 3C02800E */ lui $v0, %hi(gPlayerOne) # $v0, 0x800e +/* 02C4A8 8002B8A8 8C42C4DC */ lw $v0, %lo(gPlayerOne)($v0) /* 02C4AC 8002B8AC 27BDFFF0 */ addiu $sp, $sp, -0x10 /* 02C4B0 8002B8B0 AFB00004 */ sw $s0, 4($sp) /* 02C4B4 8002B8B4 14820002 */ bne $a0, $v0, .L8002B8C0 /* 02C4B8 8002B8B8 00A08025 */ move $s0, $a1 /* 02C4BC 8002B8BC AFA0000C */ sw $zero, 0xc($sp) .L8002B8C0: -/* 02C4C0 8002B8C0 3C05800E */ lui $a1, %hi(D_800DC4E0) # $a1, 0x800e -/* 02C4C4 8002B8C4 8CA5C4E0 */ lw $a1, %lo(D_800DC4E0)($a1) +/* 02C4C0 8002B8C0 3C05800E */ lui $a1, %hi(gPlayerTwo) # $a1, 0x800e +/* 02C4C4 8002B8C4 8CA5C4E0 */ lw $a1, %lo(gPlayerTwo)($a1) /* 02C4C8 8002B8C8 8FA3000C */ lw $v1, 0xc($sp) -/* 02C4CC 8002B8CC 3C06800E */ lui $a2, %hi(D_800DC4E4) # $a2, 0x800e +/* 02C4CC 8002B8CC 3C06800E */ lui $a2, %hi(gPlayerThree) # $a2, 0x800e /* 02C4D0 8002B8D0 14850002 */ bne $a0, $a1, .L8002B8DC -/* 02C4D4 8002B8D4 3C07800E */ lui $a3, %hi(D_800DC4E8) # $a3, 0x800e +/* 02C4D4 8002B8D4 3C07800E */ lui $a3, %hi(gPlayerFour) # $a3, 0x800e /* 02C4D8 8002B8D8 24030001 */ li $v1, 1 .L8002B8DC: -/* 02C4DC 8002B8DC 8CC6C4E4 */ lw $a2, %lo(D_800DC4E4)($a2) -/* 02C4E0 8002B8E0 3C08800E */ lui $t0, %hi(D_800DC4EC) # $t0, 0x800e -/* 02C4E4 8002B8E4 3C09800E */ lui $t1, %hi(D_800DC4F0) # $t1, 0x800e +/* 02C4DC 8002B8DC 8CC6C4E4 */ lw $a2, %lo(gPlayerThree)($a2) +/* 02C4E0 8002B8E0 3C08800E */ lui $t0, %hi(gPlayerFive) # $t0, 0x800e +/* 02C4E4 8002B8E4 3C09800E */ lui $t1, %hi(gPlayerSix) # $t1, 0x800e /* 02C4E8 8002B8E8 14860002 */ bne $a0, $a2, .L8002B8F4 -/* 02C4EC 8002B8EC 3C0A800E */ lui $t2, %hi(D_800DC4F4) # $t2, 0x800e +/* 02C4EC 8002B8EC 3C0A800E */ lui $t2, %hi(gPlayerSeven) # $t2, 0x800e /* 02C4F0 8002B8F0 24030002 */ li $v1, 2 .L8002B8F4: -/* 02C4F4 8002B8F4 8CE7C4E8 */ lw $a3, %lo(D_800DC4E8)($a3) +/* 02C4F4 8002B8F4 8CE7C4E8 */ lw $a3, %lo(gPlayerFour)($a3) /* 02C4F8 8002B8F8 3C0C8016 */ lui $t4, %hi(D_801653C0) # $t4, 0x8016 /* 02C4FC 8002B8FC 258C53C0 */ addiu $t4, %lo(D_801653C0) # addiu $t4, $t4, 0x53c0 /* 02C500 8002B900 14870002 */ bne $a0, $a3, .L8002B90C -/* 02C504 8002B904 3C0B800E */ lui $t3, %hi(D_800DC4F8) # $t3, 0x800e +/* 02C504 8002B904 3C0B800E */ lui $t3, %hi(gPlayerEight) # $t3, 0x800e /* 02C508 8002B908 24030003 */ li $v1, 3 .L8002B90C: -/* 02C50C 8002B90C 8D08C4EC */ lw $t0, %lo(D_800DC4EC)($t0) +/* 02C50C 8002B90C 8D08C4EC */ lw $t0, %lo(gPlayerFive)($t0) /* 02C510 8002B910 14880002 */ bne $a0, $t0, .L8002B91C -/* 02C514 8002B914 00000000 */ nop +/* 02C514 8002B914 00000000 */ nop /* 02C518 8002B918 24030004 */ li $v1, 4 .L8002B91C: -/* 02C51C 8002B91C 8D29C4F0 */ lw $t1, %lo(D_800DC4F0)($t1) +/* 02C51C 8002B91C 8D29C4F0 */ lw $t1, %lo(gPlayerSix)($t1) /* 02C520 8002B920 14890002 */ bne $a0, $t1, .L8002B92C -/* 02C524 8002B924 00000000 */ nop +/* 02C524 8002B924 00000000 */ nop /* 02C528 8002B928 24030005 */ li $v1, 5 .L8002B92C: -/* 02C52C 8002B92C 8D4AC4F4 */ lw $t2, %lo(D_800DC4F4)($t2) +/* 02C52C 8002B92C 8D4AC4F4 */ lw $t2, %lo(gPlayerSeven)($t2) /* 02C530 8002B930 148A0002 */ bne $a0, $t2, .L8002B93C -/* 02C534 8002B934 00000000 */ nop +/* 02C534 8002B934 00000000 */ nop /* 02C538 8002B938 24030006 */ li $v1, 6 .L8002B93C: -/* 02C53C 8002B93C 8D6BC4F8 */ lw $t3, %lo(D_800DC4F8)($t3) +/* 02C53C 8002B93C 8D6BC4F8 */ lw $t3, %lo(gPlayerEight)($t3) /* 02C540 8002B940 548B0003 */ bnel $a0, $t3, .L8002B950 /* 02C544 8002B944 00037080 */ sll $t6, $v1, 2 /* 02C548 8002B948 24030007 */ li $v1, 7 @@ -89,27 +89,27 @@ glabel func_8002B830 /* 02C55C 8002B95C 00001825 */ move $v1, $zero .L8002B960: /* 02C560 8002B960 16050002 */ bne $s0, $a1, .L8002B96C -/* 02C564 8002B964 00000000 */ nop +/* 02C564 8002B964 00000000 */ nop /* 02C568 8002B968 24030001 */ li $v1, 1 .L8002B96C: /* 02C56C 8002B96C 16060002 */ bne $s0, $a2, .L8002B978 -/* 02C570 8002B970 00000000 */ nop +/* 02C570 8002B970 00000000 */ nop /* 02C574 8002B974 24030002 */ li $v1, 2 .L8002B978: /* 02C578 8002B978 16070002 */ bne $s0, $a3, .L8002B984 -/* 02C57C 8002B97C 00000000 */ nop +/* 02C57C 8002B97C 00000000 */ nop /* 02C580 8002B980 24030003 */ li $v1, 3 .L8002B984: /* 02C584 8002B984 16080002 */ bne $s0, $t0, .L8002B990 -/* 02C588 8002B988 00000000 */ nop +/* 02C588 8002B988 00000000 */ nop /* 02C58C 8002B98C 24030004 */ li $v1, 4 .L8002B990: /* 02C590 8002B990 16090002 */ bne $s0, $t1, .L8002B99C -/* 02C594 8002B994 00000000 */ nop +/* 02C594 8002B994 00000000 */ nop /* 02C598 8002B998 24030005 */ li $v1, 5 .L8002B99C: /* 02C59C 8002B99C 160A0002 */ bne $s0, $t2, .L8002B9A8 -/* 02C5A0 8002B9A0 00000000 */ nop +/* 02C5A0 8002B9A0 00000000 */ nop /* 02C5A4 8002B9A4 24030006 */ li $v1, 6 .L8002B9A8: /* 02C5A8 8002B9A8 560B0003 */ bnel $s0, $t3, .L8002B9B8 diff --git a/asm/non_matchings/code_80027D00/func_8002BF4C.s b/asm/non_matchings/code_80027D00/func_8002BF4C.s index bd07b91b4..916099a96 100644 --- a/asm/non_matchings/code_80027D00/func_8002BF4C.s +++ b/asm/non_matchings/code_80027D00/func_8002BF4C.s @@ -15,14 +15,14 @@ glabel func_8002BF4C /* 02CB80 8002BF80 46062203 */ div.s $f8, $f4, $f6 /* 02CB84 8002BF84 3C014248 */ li $at, 0x42480000 # 50.000000 /* 02CB88 8002BF88 44819000 */ mtc1 $at, $f18 -/* 02CB8C 8002BF8C 3C02800E */ lui $v0, %hi(D_800DC4DC) # $v0, 0x800e +/* 02CB8C 8002BF8C 3C02800E */ lui $v0, %hi(gPlayerOne) # $v0, 0x800e /* 02CB90 8002BF90 00809025 */ move $s2, $a0 -/* 02CB94 8002BF94 8C42C4DC */ lw $v0, %lo(D_800DC4DC)($v0) +/* 02CB94 8002BF94 8C42C4DC */ lw $v0, %lo(gPlayerOne)($v0) /* 02CB98 8002BF98 00003025 */ move $a2, $zero /* 02CB9C 8002BF9C 3C01FFDF */ lui $at, (0xFFDFFFFF >> 16) # lui $at, 0xffdf /* 02CBA0 8002BFA0 460A4402 */ mul.s $f16, $f8, $f10 /* 02CBA4 8002BFA4 4612803C */ c.lt.s $f16, $f18 -/* 02CBA8 8002BFA8 00000000 */ nop +/* 02CBA8 8002BFA8 00000000 */ nop /* 02CBAC 8002BFAC 45020008 */ bc1fl .L8002BFD0 /* 02CBB0 8002BFB0 8E5800BC */ lw $t8, 0xbc($s2) /* 02CBB4 8002BFB4 8C8E00BC */ lw $t6, 0xbc($a0) @@ -75,7 +75,7 @@ glabel func_8002BF4C /* 02CC64 8002C064 865900E2 */ lh $t9, 0xe2($s2) /* 02CC68 8002C068 2B21003D */ slti $at, $t9, 0x3d /* 02CC6C 8002C06C 14200020 */ bnez $at, .L8002C0F0 -/* 02CC70 8002C070 00000000 */ nop +/* 02CC70 8002C070 00000000 */ nop /* 02CC74 8002C074 8E4800BC */ lw $t0, 0xbc($s2) /* 02CC78 8002C078 96420000 */ lhu $v0, ($s2) /* 02CC7C 8002C07C 3C010020 */ lui $at, 0x20 diff --git a/asm/non_matchings/code_80027D00/func_8002E4C4.s b/asm/non_matchings/code_80027D00/func_8002E4C4.s index 363d704a8..069e1d932 100644 --- a/asm/non_matchings/code_80027D00/func_8002E4C4.s +++ b/asm/non_matchings/code_80027D00/func_8002E4C4.s @@ -1,7 +1,7 @@ glabel func_8002E4C4 /* 02F0C4 8002E4C4 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 02F0C8 8002E4C8 AFBF0014 */ sw $ra, 0x14($sp) -/* 02F0CC 8002E4CC 0C009F40 */ jal func_80027D00 +/* 02F0CC 8002E4CC 0C009F40 */ jal get_player_index_for_player /* 02F0D0 8002E4D0 AFA40020 */ sw $a0, 0x20($sp) /* 02F0D4 8002E4D4 8FA40020 */ lw $a0, 0x20($sp) /* 02F0D8 8002E4D8 44808000 */ mtc1 $zero, $f16 @@ -33,7 +33,7 @@ glabel func_8002E4C4 /* 02F140 8002E540 44815000 */ mtc1 $at, $f10 /* 02F144 8002E544 460C1481 */ sub.s $f18, $f2, $f12 /* 02F148 8002E548 4612503C */ c.lt.s $f10, $f18 -/* 02F14C 8002E54C 00000000 */ nop +/* 02F14C 8002E54C 00000000 */ nop /* 02F150 8002E550 4503000A */ bc1tl .L8002E57C /* 02F154 8002E554 C48A0024 */ lwc1 $f10, 0x24($a0) /* 02F158 8002E558 C4840018 */ lwc1 $f4, 0x18($a0) @@ -41,7 +41,7 @@ glabel func_8002E4C4 /* 02F160 8002E560 44814000 */ mtc1 $at, $f8 /* 02F164 8002E564 460C2181 */ sub.s $f6, $f4, $f12 /* 02F168 8002E568 4608303C */ c.lt.s $f6, $f8 -/* 02F16C 8002E56C 00000000 */ nop +/* 02F16C 8002E56C 00000000 */ nop /* 02F170 8002E570 45020004 */ bc1fl .L8002E584 /* 02F174 8002E574 E4900038 */ swc1 $f16, 0x38($a0) /* 02F178 8002E578 C48A0024 */ lwc1 $f10, 0x24($a0) @@ -52,4 +52,4 @@ glabel func_8002E4C4 /* 02F184 8002E584 8FBF0014 */ lw $ra, 0x14($sp) /* 02F188 8002E588 27BD0020 */ addiu $sp, $sp, 0x20 /* 02F18C 8002E58C 03E00008 */ jr $ra -/* 02F190 8002E590 00000000 */ nop +/* 02F190 8002E590 00000000 */ nop diff --git a/asm/non_matchings/code_80027D00/func_80030C34.s b/asm/non_matchings/code_80027D00/func_80030C34.s index 0daa95ab8..00faab6c3 100644 --- a/asm/non_matchings/code_80027D00/func_80030C34.s +++ b/asm/non_matchings/code_80027D00/func_80030C34.s @@ -1,53 +1,53 @@ glabel func_80030C34 -/* 031834 80030C34 3C0E800E */ lui $t6, %hi(D_800DC4DC) # $t6, 0x800e -/* 031838 80030C38 8DCEC4DC */ lw $t6, %lo(D_800DC4DC)($t6) +/* 031834 80030C34 3C0E800E */ lui $t6, %hi(gPlayerOne) # $t6, 0x800e +/* 031838 80030C38 8DCEC4DC */ lw $t6, %lo(gPlayerOne)($t6) /* 03183C 80030C3C 27BDFFF8 */ addiu $sp, $sp, -8 -/* 031840 80030C40 3C0F800E */ lui $t7, %hi(D_800DC4E0) # $t7, 0x800e +/* 031840 80030C40 3C0F800E */ lui $t7, %hi(gPlayerTwo) # $t7, 0x800e /* 031844 80030C44 148E0002 */ bne $a0, $t6, .L80030C50 -/* 031848 80030C48 3C18800E */ lui $t8, %hi(D_800DC4E4) # $t8, 0x800e +/* 031848 80030C48 3C18800E */ lui $t8, %hi(gPlayerThree) # $t8, 0x800e /* 03184C 80030C4C AFA00004 */ sw $zero, 4($sp) .L80030C50: -/* 031850 80030C50 8DEFC4E0 */ lw $t7, %lo(D_800DC4E0)($t7) +/* 031850 80030C50 8DEFC4E0 */ lw $t7, %lo(gPlayerTwo)($t7) /* 031854 80030C54 8FA20004 */ lw $v0, 4($sp) -/* 031858 80030C58 3C19800E */ lui $t9, %hi(D_800DC4E8) # $t9, 0x800e +/* 031858 80030C58 3C19800E */ lui $t9, %hi(gPlayerFour) # $t9, 0x800e /* 03185C 80030C5C 148F0002 */ bne $a0, $t7, .L80030C68 -/* 031860 80030C60 3C09800E */ lui $t1, %hi(D_800DC4EC) # $t1, 0x800e +/* 031860 80030C60 3C09800E */ lui $t1, %hi(gPlayerFive) # $t1, 0x800e /* 031864 80030C64 24020001 */ li $v0, 1 .L80030C68: -/* 031868 80030C68 8F18C4E4 */ lw $t8, %lo(D_800DC4E4)($t8) -/* 03186C 80030C6C 3C0A800E */ lui $t2, %hi(D_800DC4F0) # $t2, 0x800e -/* 031870 80030C70 3C0B800E */ lui $t3, %hi(D_800DC4F4) # $t3, 0x800e +/* 031868 80030C68 8F18C4E4 */ lw $t8, %lo(gPlayerThree)($t8) +/* 03186C 80030C6C 3C0A800E */ lui $t2, %hi(gPlayerSix) # $t2, 0x800e +/* 031870 80030C70 3C0B800E */ lui $t3, %hi(gPlayerSeven) # $t3, 0x800e /* 031874 80030C74 14980002 */ bne $a0, $t8, .L80030C80 -/* 031878 80030C78 3C0C800E */ lui $t4, %hi(D_800DC4F8) # $t4, 0x800e +/* 031878 80030C78 3C0C800E */ lui $t4, %hi(gPlayerEight) # $t4, 0x800e /* 03187C 80030C7C 24020002 */ li $v0, 2 .L80030C80: -/* 031880 80030C80 8F39C4E8 */ lw $t9, %lo(D_800DC4E8)($t9) +/* 031880 80030C80 8F39C4E8 */ lw $t9, %lo(gPlayerFour)($t9) /* 031884 80030C84 3C0D8016 */ lui $t5, %hi(D_80165460) # $t5, 0x8016 /* 031888 80030C88 25AD5460 */ addiu $t5, %lo(D_80165460) # addiu $t5, $t5, 0x5460 /* 03188C 80030C8C 14990002 */ bne $a0, $t9, .L80030C98 /* 031890 80030C90 00000000 */ nop /* 031894 80030C94 24020003 */ li $v0, 3 .L80030C98: -/* 031898 80030C98 8D29C4EC */ lw $t1, %lo(D_800DC4EC)($t1) +/* 031898 80030C98 8D29C4EC */ lw $t1, %lo(gPlayerFive)($t1) /* 03189C 80030C9C 3C0F8016 */ lui $t7, %hi(gPlayerIsThrottleActive) # $t7, 0x8016 /* 0318A0 80030CA0 25EF53E0 */ addiu $t7, %lo(gPlayerIsThrottleActive) # addiu $t7, $t7, 0x53e0 /* 0318A4 80030CA4 14890002 */ bne $a0, $t1, .L80030CB0 /* 0318A8 80030CA8 00000000 */ nop /* 0318AC 80030CAC 24020004 */ li $v0, 4 .L80030CB0: -/* 0318B0 80030CB0 8D4AC4F0 */ lw $t2, %lo(D_800DC4F0)($t2) +/* 0318B0 80030CB0 8D4AC4F0 */ lw $t2, %lo(gPlayerSix)($t2) /* 0318B4 80030CB4 3C098016 */ lui $t1, %hi(D_80165420) # $t1, 0x8016 /* 0318B8 80030CB8 25295420 */ addiu $t1, %lo(D_80165420) # addiu $t1, $t1, 0x5420 /* 0318BC 80030CBC 148A0002 */ bne $a0, $t2, .L80030CC8 /* 0318C0 80030CC0 00000000 */ nop /* 0318C4 80030CC4 24020005 */ li $v0, 5 .L80030CC8: -/* 0318C8 80030CC8 8D6BC4F4 */ lw $t3, %lo(D_800DC4F4)($t3) +/* 0318C8 80030CC8 8D6BC4F4 */ lw $t3, %lo(gPlayerSeven)($t3) /* 0318CC 80030CCC 148B0002 */ bne $a0, $t3, .L80030CD8 /* 0318D0 80030CD0 00000000 */ nop /* 0318D4 80030CD4 24020006 */ li $v0, 6 .L80030CD8: -/* 0318D8 80030CD8 8D8CC4F8 */ lw $t4, %lo(D_800DC4F8)($t4) +/* 0318D8 80030CD8 8D8CC4F8 */ lw $t4, %lo(gPlayerEight)($t4) /* 0318DC 80030CDC 3C0B8016 */ lui $t3, %hi(D_80165480) # $t3, 0x8016 /* 0318E0 80030CE0 256B5480 */ addiu $t3, %lo(D_80165480) # addiu $t3, $t3, 0x5480 /* 0318E4 80030CE4 548C0003 */ bnel $a0, $t4, .L80030CF4 diff --git a/asm/non_matchings/code_80027D00/func_80030E00.s b/asm/non_matchings/code_80027D00/func_80030E00.s index 923a649c7..40de0d1a6 100644 --- a/asm/non_matchings/code_80027D00/func_80030E00.s +++ b/asm/non_matchings/code_80027D00/func_80030E00.s @@ -1,53 +1,53 @@ glabel func_80030E00 -/* 031A00 80030E00 3C0E800E */ lui $t6, %hi(D_800DC4DC) # $t6, 0x800e -/* 031A04 80030E04 8DCEC4DC */ lw $t6, %lo(D_800DC4DC)($t6) +/* 031A00 80030E00 3C0E800E */ lui $t6, %hi(gPlayerOne) # $t6, 0x800e +/* 031A04 80030E04 8DCEC4DC */ lw $t6, %lo(gPlayerOne)($t6) /* 031A08 80030E08 27BDFFF8 */ addiu $sp, $sp, -8 -/* 031A0C 80030E0C 3C0F800E */ lui $t7, %hi(D_800DC4E0) # $t7, 0x800e +/* 031A0C 80030E0C 3C0F800E */ lui $t7, %hi(gPlayerTwo) # $t7, 0x800e /* 031A10 80030E10 148E0002 */ bne $a0, $t6, .L80030E1C -/* 031A14 80030E14 3C18800E */ lui $t8, %hi(D_800DC4E4) # $t8, 0x800e +/* 031A14 80030E14 3C18800E */ lui $t8, %hi(gPlayerThree) # $t8, 0x800e /* 031A18 80030E18 AFA00004 */ sw $zero, 4($sp) .L80030E1C: -/* 031A1C 80030E1C 8DEFC4E0 */ lw $t7, %lo(D_800DC4E0)($t7) +/* 031A1C 80030E1C 8DEFC4E0 */ lw $t7, %lo(gPlayerTwo)($t7) /* 031A20 80030E20 8FA20004 */ lw $v0, 4($sp) -/* 031A24 80030E24 3C19800E */ lui $t9, %hi(D_800DC4E8) # $t9, 0x800e +/* 031A24 80030E24 3C19800E */ lui $t9, %hi(gPlayerFour) # $t9, 0x800e /* 031A28 80030E28 148F0002 */ bne $a0, $t7, .L80030E34 -/* 031A2C 80030E2C 3C09800E */ lui $t1, %hi(D_800DC4EC) # $t1, 0x800e +/* 031A2C 80030E2C 3C09800E */ lui $t1, %hi(gPlayerFive) # $t1, 0x800e /* 031A30 80030E30 24020001 */ li $v0, 1 .L80030E34: -/* 031A34 80030E34 8F18C4E4 */ lw $t8, %lo(D_800DC4E4)($t8) -/* 031A38 80030E38 3C0A800E */ lui $t2, %hi(D_800DC4F0) # $t2, 0x800e -/* 031A3C 80030E3C 3C0B800E */ lui $t3, %hi(D_800DC4F4) # $t3, 0x800e +/* 031A34 80030E34 8F18C4E4 */ lw $t8, %lo(gPlayerThree)($t8) +/* 031A38 80030E38 3C0A800E */ lui $t2, %hi(gPlayerSix) # $t2, 0x800e +/* 031A3C 80030E3C 3C0B800E */ lui $t3, %hi(gPlayerSeven) # $t3, 0x800e /* 031A40 80030E40 14980002 */ bne $a0, $t8, .L80030E4C -/* 031A44 80030E44 3C0C800E */ lui $t4, %hi(D_800DC4F8) # $t4, 0x800e +/* 031A44 80030E44 3C0C800E */ lui $t4, %hi(gPlayerEight) # $t4, 0x800e /* 031A48 80030E48 24020002 */ li $v0, 2 .L80030E4C: -/* 031A4C 80030E4C 8F39C4E8 */ lw $t9, %lo(D_800DC4E8)($t9) +/* 031A4C 80030E4C 8F39C4E8 */ lw $t9, %lo(gPlayerFour)($t9) /* 031A50 80030E50 3C0D8016 */ lui $t5, %hi(D_80165460) # $t5, 0x8016 /* 031A54 80030E54 25AD5460 */ addiu $t5, %lo(D_80165460) # addiu $t5, $t5, 0x5460 /* 031A58 80030E58 14990002 */ bne $a0, $t9, .L80030E64 /* 031A5C 80030E5C 00000000 */ nop /* 031A60 80030E60 24020003 */ li $v0, 3 .L80030E64: -/* 031A64 80030E64 8D29C4EC */ lw $t1, %lo(D_800DC4EC)($t1) +/* 031A64 80030E64 8D29C4EC */ lw $t1, %lo(gPlayerFive)($t1) /* 031A68 80030E68 3C0F8016 */ lui $t7, %hi(gPlayerIsThrottleActive) # $t7, 0x8016 /* 031A6C 80030E6C 25EF53E0 */ addiu $t7, %lo(gPlayerIsThrottleActive) # addiu $t7, $t7, 0x53e0 /* 031A70 80030E70 14890002 */ bne $a0, $t1, .L80030E7C /* 031A74 80030E74 00000000 */ nop /* 031A78 80030E78 24020004 */ li $v0, 4 .L80030E7C: -/* 031A7C 80030E7C 8D4AC4F0 */ lw $t2, %lo(D_800DC4F0)($t2) +/* 031A7C 80030E7C 8D4AC4F0 */ lw $t2, %lo(gPlayerSix)($t2) /* 031A80 80030E80 3C098016 */ lui $t1, %hi(D_80165420) # $t1, 0x8016 /* 031A84 80030E84 24080001 */ li $t0, 1 /* 031A88 80030E88 148A0002 */ bne $a0, $t2, .L80030E94 /* 031A8C 80030E8C 25295420 */ addiu $t1, %lo(D_80165420) # addiu $t1, $t1, 0x5420 /* 031A90 80030E90 24020005 */ li $v0, 5 .L80030E94: -/* 031A94 80030E94 8D6BC4F4 */ lw $t3, %lo(D_800DC4F4)($t3) +/* 031A94 80030E94 8D6BC4F4 */ lw $t3, %lo(gPlayerSeven)($t3) /* 031A98 80030E98 148B0002 */ bne $a0, $t3, .L80030EA4 /* 031A9C 80030E9C 00000000 */ nop /* 031AA0 80030EA0 24020006 */ li $v0, 6 .L80030EA4: -/* 031AA4 80030EA4 8D8CC4F8 */ lw $t4, %lo(D_800DC4F8)($t4) +/* 031AA4 80030EA4 8D8CC4F8 */ lw $t4, %lo(gPlayerEight)($t4) /* 031AA8 80030EA8 3C0B8016 */ lui $t3, %hi(D_80165480) # $t3, 0x8016 /* 031AAC 80030EAC 256B5480 */ addiu $t3, %lo(D_80165480) # addiu $t3, $t3, 0x5480 /* 031AB0 80030EB0 548C0003 */ bnel $a0, $t4, .L80030EC0 diff --git a/asm/non_matchings/code_80027D00/func_80030FC8.s b/asm/non_matchings/code_80027D00/func_80030FC8.s index 53fd9b35a..e304e970c 100644 --- a/asm/non_matchings/code_80027D00/func_80030FC8.s +++ b/asm/non_matchings/code_80027D00/func_80030FC8.s @@ -1,7 +1,7 @@ glabel func_80030FC8 /* 031BC8 80030FC8 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 031BCC 80030FCC AFBF0014 */ sw $ra, 0x14($sp) -/* 031BD0 80030FD0 0C009F40 */ jal func_80027D00 +/* 031BD0 80030FD0 0C009F40 */ jal get_player_index_for_player /* 031BD4 80030FD4 AFA40018 */ sw $a0, 0x18($sp) /* 031BD8 80030FD8 00027080 */ sll $t6, $v0, 2 /* 031BDC 80030FDC 3C0F8016 */ lui $t7, %hi(D_80165460) # 0x8016 @@ -16,9 +16,9 @@ glabel func_80030FC8 /* 031C00 80031000 44802000 */ mtc1 $zero, $f4 /* 031C04 80031004 46006021 */ cvt.d.s $f0, $f12 /* 031C08 80031008 4620203E */ c.le.d $f4, $f0 -/* 031C0C 8003100C 00000000 */ nop +/* 031C0C 8003100C 00000000 */ nop /* 031C10 80031010 4500002A */ bc1f .L800310BC -/* 031C14 80031014 00000000 */ nop +/* 031C14 80031014 00000000 */ nop /* 031C18 80031018 C4860214 */ lwc1 $f6, 0x214($a0) /* 031C1C 8003101C 3C01800F */ lui $at, %hi(D_800ED9D8) /* 031C20 80031020 D42AD9D8 */ ldc1 $f10, %lo(D_800ED9D8)($at) @@ -27,9 +27,9 @@ glabel func_80030FC8 /* 031C2C 8003102C 462A4402 */ mul.d $f16, $f8, $f10 /* 031C30 80031030 24633010 */ addiu $v1, %lo(gKartAccelerationTables) # addiu $v1, $v1, 0x3010 /* 031C34 80031034 4630003C */ c.lt.d $f0, $f16 -/* 031C38 80031038 00000000 */ nop +/* 031C38 80031038 00000000 */ nop /* 031C3C 8003103C 4500001F */ bc1f .L800310BC -/* 031C40 80031040 00000000 */ nop +/* 031C40 80031040 00000000 */ nop /* 031C44 80031044 848A00C4 */ lh $t2, 0xc4($a0) /* 031C48 80031048 240500B6 */ li $a1, 182 /* 031C4C 8003104C 94980254 */ lhu $t8, 0x254($a0) @@ -46,14 +46,14 @@ glabel func_80030FC8 /* 031C78 80031078 C5320000 */ lwc1 $f18, ($t1) /* 031C7C 8003107C 46009121 */ cvt.d.s $f4, $f18 /* 031C80 80031080 14A00002 */ bnez $a1, .L8003108C -/* 031C84 80031084 00000000 */ nop +/* 031C84 80031084 00000000 */ nop /* 031C88 80031088 0007000D */ break 7 .L8003108C: /* 031C8C 8003108C 2401FFFF */ li $at, -1 /* 031C90 80031090 14A10004 */ bne $a1, $at, .L800310A4 /* 031C94 80031094 3C018000 */ lui $at, 0x8000 /* 031C98 80031098 15410002 */ bne $t2, $at, .L800310A4 -/* 031C9C 8003109C 00000000 */ nop +/* 031C9C 8003109C 00000000 */ nop /* 031CA0 800310A0 0006000D */ break 6 .L800310A4: /* 031CA4 800310A4 462A2400 */ add.d $f16, $f4, $f10 @@ -75,15 +75,15 @@ glabel func_80030FC8 /* 031CE0 800310E0 240500B6 */ li $a1, 182 /* 031CE4 800310E4 3C01800F */ lui $at, %hi(D_800ED9F8) /* 031CE8 800310E8 4620503E */ c.le.d $f10, $f0 -/* 031CEC 800310EC 00000000 */ nop +/* 031CEC 800310EC 00000000 */ nop /* 031CF0 800310F0 45000024 */ bc1f .L80031184 -/* 031CF4 800310F4 00000000 */ nop +/* 031CF4 800310F4 00000000 */ nop /* 031CF8 800310F8 D430D9F8 */ ldc1 $f16, %lo(D_800ED9F8)($at) /* 031CFC 800310FC 46301482 */ mul.d $f18, $f2, $f16 /* 031D00 80031100 4632003C */ c.lt.d $f0, $f18 -/* 031D04 80031104 00000000 */ nop +/* 031D04 80031104 00000000 */ nop /* 031D08 80031108 4500001E */ bc1f .L80031184 -/* 031D0C 8003110C 00000000 */ nop +/* 031D0C 8003110C 00000000 */ nop /* 031D10 80031110 849800C4 */ lh $t8, 0xc4($a0) /* 031D14 80031114 948C0254 */ lhu $t4, 0x254($a0) /* 031D18 80031118 0305001A */ div $zero, $t8, $a1 @@ -98,14 +98,14 @@ glabel func_80030FC8 /* 031D3C 8003113C C48A0214 */ lwc1 $f10, 0x214($a0) /* 031D40 80031140 46003221 */ cvt.d.s $f8, $f6 /* 031D44 80031144 14A00002 */ bnez $a1, .L80031150 -/* 031D48 80031148 00000000 */ nop +/* 031D48 80031148 00000000 */ nop /* 031D4C 8003114C 0007000D */ break 7 .L80031150: /* 031D50 80031150 2401FFFF */ li $at, -1 /* 031D54 80031154 14A10004 */ bne $a1, $at, .L80031168 /* 031D58 80031158 3C018000 */ lui $at, 0x8000 /* 031D5C 8003115C 17010002 */ bne $t8, $at, .L80031168 -/* 031D60 80031160 00000000 */ nop +/* 031D60 80031160 00000000 */ nop /* 031D64 80031164 0006000D */ break 6 .L80031168: /* 031D68 80031168 46304480 */ add.d $f18, $f8, $f16 @@ -121,15 +121,15 @@ glabel func_80030FC8 /* 031D8C 8003118C 3C01800F */ lui $at, %hi(D_800EDA08) /* 031D90 80031190 46281402 */ mul.d $f16, $f2, $f8 /* 031D94 80031194 4620803E */ c.le.d $f16, $f0 -/* 031D98 80031198 00000000 */ nop +/* 031D98 80031198 00000000 */ nop /* 031D9C 8003119C 45000024 */ bc1f .L80031230 -/* 031DA0 800311A0 00000000 */ nop +/* 031DA0 800311A0 00000000 */ nop /* 031DA4 800311A4 D432DA08 */ ldc1 $f18, %lo(D_800EDA08)($at) /* 031DA8 800311A8 46321182 */ mul.d $f6, $f2, $f18 /* 031DAC 800311AC 4626003C */ c.lt.d $f0, $f6 -/* 031DB0 800311B0 00000000 */ nop +/* 031DB0 800311B0 00000000 */ nop /* 031DB4 800311B4 4500001E */ bc1f .L80031230 -/* 031DB8 800311B8 00000000 */ nop +/* 031DB8 800311B8 00000000 */ nop /* 031DBC 800311BC 848C00C4 */ lh $t4, 0xc4($a0) /* 031DC0 800311C0 94880254 */ lhu $t0, 0x254($a0) /* 031DC4 800311C4 0185001A */ div $zero, $t4, $a1 @@ -144,14 +144,14 @@ glabel func_80030FC8 /* 031DE8 800311E8 C4900214 */ lwc1 $f16, 0x214($a0) /* 031DEC 800311EC 460022A1 */ cvt.d.s $f10, $f4 /* 031DF0 800311F0 14A00002 */ bnez $a1, .L800311FC -/* 031DF4 800311F4 00000000 */ nop +/* 031DF4 800311F4 00000000 */ nop /* 031DF8 800311F8 0007000D */ break 7 .L800311FC: /* 031DFC 800311FC 2401FFFF */ li $at, -1 /* 031E00 80031200 14A10004 */ bne $a1, $at, .L80031214 /* 031E04 80031204 3C018000 */ lui $at, 0x8000 /* 031E08 80031208 15810002 */ bne $t4, $at, .L80031214 -/* 031E0C 8003120C 00000000 */ nop +/* 031E0C 8003120C 00000000 */ nop /* 031E10 80031210 0006000D */ break 6 .L80031214: /* 031E14 80031214 46325180 */ add.d $f6, $f10, $f18 @@ -167,15 +167,15 @@ glabel func_80030FC8 /* 031E38 80031238 3C01800F */ lui $at, %hi(D_800EDA18) /* 031E3C 8003123C 462A1482 */ mul.d $f18, $f2, $f10 /* 031E40 80031240 4620903E */ c.le.d $f18, $f0 -/* 031E44 80031244 00000000 */ nop +/* 031E44 80031244 00000000 */ nop /* 031E48 80031248 45000024 */ bc1f .L800312DC -/* 031E4C 8003124C 00000000 */ nop +/* 031E4C 8003124C 00000000 */ nop /* 031E50 80031250 D426DA18 */ ldc1 $f6, %lo(D_800EDA18)($at) /* 031E54 80031254 46261102 */ mul.d $f4, $f2, $f6 /* 031E58 80031258 4624003C */ c.lt.d $f0, $f4 -/* 031E5C 8003125C 00000000 */ nop +/* 031E5C 8003125C 00000000 */ nop /* 031E60 80031260 4500001E */ bc1f .L800312DC -/* 031E64 80031264 00000000 */ nop +/* 031E64 80031264 00000000 */ nop /* 031E68 80031268 848800C4 */ lh $t0, 0xc4($a0) /* 031E6C 8003126C 948E0254 */ lhu $t6, 0x254($a0) /* 031E70 80031270 0105001A */ div $zero, $t0, $a1 @@ -190,14 +190,14 @@ glabel func_80030FC8 /* 031E94 80031294 C4920214 */ lwc1 $f18, 0x214($a0) /* 031E98 80031298 46004421 */ cvt.d.s $f16, $f8 /* 031E9C 8003129C 14A00002 */ bnez $a1, .L800312A8 -/* 031EA0 800312A0 00000000 */ nop +/* 031EA0 800312A0 00000000 */ nop /* 031EA4 800312A4 0007000D */ break 7 .L800312A8: /* 031EA8 800312A8 2401FFFF */ li $at, -1 /* 031EAC 800312AC 14A10004 */ bne $a1, $at, .L800312C0 /* 031EB0 800312B0 3C018000 */ lui $at, 0x8000 /* 031EB4 800312B4 15010002 */ bne $t0, $at, .L800312C0 -/* 031EB8 800312B8 00000000 */ nop +/* 031EB8 800312B8 00000000 */ nop /* 031EBC 800312BC 0006000D */ break 6 .L800312C0: /* 031EC0 800312C0 46268100 */ add.d $f4, $f16, $f6 @@ -213,15 +213,15 @@ glabel func_80030FC8 /* 031EE4 800312E4 3C013FE0 */ lui $at, 0x3fe0 /* 031EE8 800312E8 46301182 */ mul.d $f6, $f2, $f16 /* 031EEC 800312EC 4620303E */ c.le.d $f6, $f0 -/* 031EF0 800312F0 00000000 */ nop +/* 031EF0 800312F0 00000000 */ nop /* 031EF4 800312F4 45020027 */ bc1fl .L80031394 /* 031EF8 800312F8 3C013FE0 */ li $at, 0x3FE00000 # 1.750000 /* 031EFC 800312FC 44812800 */ mtc1 $at, $f5 /* 031F00 80031300 44802000 */ mtc1 $zero, $f4 -/* 031F04 80031304 00000000 */ nop +/* 031F04 80031304 00000000 */ nop /* 031F08 80031308 46241202 */ mul.d $f8, $f2, $f4 /* 031F0C 8003130C 4628003C */ c.lt.d $f0, $f8 -/* 031F10 80031310 00000000 */ nop +/* 031F10 80031310 00000000 */ nop /* 031F14 80031314 4502001F */ bc1fl .L80031394 /* 031F18 80031318 3C013FE0 */ lui $at, 0x3fe0 /* 031F1C 8003131C 848E00C4 */ lh $t6, 0xc4($a0) @@ -238,14 +238,14 @@ glabel func_80030FC8 /* 031F48 80031348 C4860214 */ lwc1 $f6, 0x214($a0) /* 031F4C 8003134C 460054A1 */ cvt.d.s $f18, $f10 /* 031F50 80031350 14A00002 */ bnez $a1, .L8003135C -/* 031F54 80031354 00000000 */ nop +/* 031F54 80031354 00000000 */ nop /* 031F58 80031358 0007000D */ break 7 .L8003135C: /* 031F5C 8003135C 2401FFFF */ li $at, -1 /* 031F60 80031360 14A10004 */ bne $a1, $at, .L80031374 /* 031F64 80031364 3C018000 */ lui $at, 0x8000 /* 031F68 80031368 15C10002 */ bne $t6, $at, .L80031374 -/* 031F6C 8003136C 00000000 */ nop +/* 031F6C 8003136C 00000000 */ nop /* 031F70 80031370 0006000D */ break 6 .L80031374: /* 031F74 80031374 46249200 */ add.d $f8, $f18, $f4 @@ -262,15 +262,15 @@ glabel func_80030FC8 /* 031F9C 8003139C 3C01800F */ lui $at, %hi(D_800EDA28) /* 031FA0 800313A0 46321102 */ mul.d $f4, $f2, $f18 /* 031FA4 800313A4 4620203E */ c.le.d $f4, $f0 -/* 031FA8 800313A8 00000000 */ nop +/* 031FA8 800313A8 00000000 */ nop /* 031FAC 800313AC 45000024 */ bc1f .L80031440 -/* 031FB0 800313B0 00000000 */ nop +/* 031FB0 800313B0 00000000 */ nop /* 031FB4 800313B4 D428DA28 */ ldc1 $f8, %lo(D_800EDA28)($at) /* 031FB8 800313B8 46281282 */ mul.d $f10, $f2, $f8 /* 031FBC 800313BC 462A003C */ c.lt.d $f0, $f10 -/* 031FC0 800313C0 00000000 */ nop +/* 031FC0 800313C0 00000000 */ nop /* 031FC4 800313C4 4500001E */ bc1f .L80031440 -/* 031FC8 800313C8 00000000 */ nop +/* 031FC8 800313C8 00000000 */ nop /* 031FCC 800313CC 848A00C4 */ lh $t2, 0xc4($a0) /* 031FD0 800313D0 94980254 */ lhu $t8, 0x254($a0) /* 031FD4 800313D4 0145001A */ div $zero, $t2, $a1 @@ -285,14 +285,14 @@ glabel func_80030FC8 /* 031FF8 800313F8 C4840214 */ lwc1 $f4, 0x214($a0) /* 031FFC 800313FC 460081A1 */ cvt.d.s $f6, $f16 /* 032000 80031400 14A00002 */ bnez $a1, .L8003140C -/* 032004 80031404 00000000 */ nop +/* 032004 80031404 00000000 */ nop /* 032008 80031408 0007000D */ break 7 .L8003140C: /* 03200C 8003140C 2401FFFF */ li $at, -1 /* 032010 80031410 14A10004 */ bne $a1, $at, .L80031424 /* 032014 80031414 3C018000 */ lui $at, 0x8000 /* 032018 80031418 15410002 */ bne $t2, $at, .L80031424 -/* 03201C 8003141C 00000000 */ nop +/* 03201C 8003141C 00000000 */ nop /* 032020 80031420 0006000D */ break 6 .L80031424: /* 032024 80031424 46283280 */ add.d $f10, $f6, $f8 @@ -308,15 +308,15 @@ glabel func_80030FC8 /* 032048 80031448 3C01800F */ lui $at, %hi(D_800EDA38) /* 03204C 8003144C 46261202 */ mul.d $f8, $f2, $f6 /* 032050 80031450 4620403E */ c.le.d $f8, $f0 -/* 032054 80031454 00000000 */ nop +/* 032054 80031454 00000000 */ nop /* 032058 80031458 45000024 */ bc1f .L800314EC -/* 03205C 8003145C 00000000 */ nop +/* 03205C 8003145C 00000000 */ nop /* 032060 80031460 D42ADA38 */ ldc1 $f10, %lo(D_800EDA38)($at) /* 032064 80031464 462A1402 */ mul.d $f16, $f2, $f10 /* 032068 80031468 4630003C */ c.lt.d $f0, $f16 -/* 03206C 8003146C 00000000 */ nop +/* 03206C 8003146C 00000000 */ nop /* 032070 80031470 4500001E */ bc1f .L800314EC -/* 032074 80031474 00000000 */ nop +/* 032074 80031474 00000000 */ nop /* 032078 80031478 849800C4 */ lh $t8, 0xc4($a0) /* 03207C 8003147C 948C0254 */ lhu $t4, 0x254($a0) /* 032080 80031480 0305001A */ div $zero, $t8, $a1 @@ -331,14 +331,14 @@ glabel func_80030FC8 /* 0320A4 800314A4 C4880214 */ lwc1 $f8, 0x214($a0) /* 0320A8 800314A8 46009121 */ cvt.d.s $f4, $f18 /* 0320AC 800314AC 14A00002 */ bnez $a1, .L800314B8 -/* 0320B0 800314B0 00000000 */ nop +/* 0320B0 800314B0 00000000 */ nop /* 0320B4 800314B4 0007000D */ break 7 .L800314B8: /* 0320B8 800314B8 2401FFFF */ li $at, -1 /* 0320BC 800314BC 14A10004 */ bne $a1, $at, .L800314D0 /* 0320C0 800314C0 3C018000 */ lui $at, 0x8000 /* 0320C4 800314C4 17010002 */ bne $t8, $at, .L800314D0 -/* 0320C8 800314C8 00000000 */ nop +/* 0320C8 800314C8 00000000 */ nop /* 0320CC 800314CC 0006000D */ break 6 .L800314D0: /* 0320D0 800314D0 462A2400 */ add.d $f16, $f4, $f10 @@ -354,15 +354,15 @@ glabel func_80030FC8 /* 0320F4 800314F4 3C01800F */ lui $at, %hi(D_800EDA48) /* 0320F8 800314F8 46241282 */ mul.d $f10, $f2, $f4 /* 0320FC 800314FC 4620503E */ c.le.d $f10, $f0 -/* 032100 80031500 00000000 */ nop +/* 032100 80031500 00000000 */ nop /* 032104 80031504 45000024 */ bc1f .L80031598 -/* 032108 80031508 00000000 */ nop +/* 032108 80031508 00000000 */ nop /* 03210C 8003150C D430DA48 */ ldc1 $f16, %lo(D_800EDA48)($at) /* 032110 80031510 46301482 */ mul.d $f18, $f2, $f16 /* 032114 80031514 4632003C */ c.lt.d $f0, $f18 -/* 032118 80031518 00000000 */ nop +/* 032118 80031518 00000000 */ nop /* 03211C 8003151C 4500001E */ bc1f .L80031598 -/* 032120 80031520 00000000 */ nop +/* 032120 80031520 00000000 */ nop /* 032124 80031524 848C00C4 */ lh $t4, 0xc4($a0) /* 032128 80031528 94880254 */ lhu $t0, 0x254($a0) /* 03212C 8003152C 0185001A */ div $zero, $t4, $a1 @@ -377,14 +377,14 @@ glabel func_80030FC8 /* 032150 80031550 C48A0214 */ lwc1 $f10, 0x214($a0) /* 032154 80031554 46003221 */ cvt.d.s $f8, $f6 /* 032158 80031558 14A00002 */ bnez $a1, .L80031564 -/* 03215C 8003155C 00000000 */ nop +/* 03215C 8003155C 00000000 */ nop /* 032160 80031560 0007000D */ break 7 .L80031564: /* 032164 80031564 2401FFFF */ li $at, -1 /* 032168 80031568 14A10004 */ bne $a1, $at, .L8003157C /* 03216C 8003156C 3C018000 */ lui $at, 0x8000 /* 032170 80031570 15810002 */ bne $t4, $at, .L8003157C -/* 032174 80031574 00000000 */ nop +/* 032174 80031574 00000000 */ nop /* 032178 80031578 0006000D */ break 6 .L8003157C: /* 03217C 8003157C 46304480 */ add.d $f18, $f8, $f16 @@ -400,15 +400,15 @@ glabel func_80030FC8 /* 0321A0 800315A0 3C01800F */ lui $at, %hi(D_800EDA58) /* 0321A4 800315A4 46281402 */ mul.d $f16, $f2, $f8 /* 0321A8 800315A8 4620803E */ c.le.d $f16, $f0 -/* 0321AC 800315AC 00000000 */ nop +/* 0321AC 800315AC 00000000 */ nop /* 0321B0 800315B0 45000024 */ bc1f .L80031644 -/* 0321B4 800315B4 00000000 */ nop +/* 0321B4 800315B4 00000000 */ nop /* 0321B8 800315B8 D432DA58 */ ldc1 $f18, %lo(D_800EDA58)($at) /* 0321BC 800315BC 46321182 */ mul.d $f6, $f2, $f18 /* 0321C0 800315C0 4626003C */ c.lt.d $f0, $f6 -/* 0321C4 800315C4 00000000 */ nop +/* 0321C4 800315C4 00000000 */ nop /* 0321C8 800315C8 4500001E */ bc1f .L80031644 -/* 0321CC 800315CC 00000000 */ nop +/* 0321CC 800315CC 00000000 */ nop /* 0321D0 800315D0 848800C4 */ lh $t0, 0xc4($a0) /* 0321D4 800315D4 948E0254 */ lhu $t6, 0x254($a0) /* 0321D8 800315D8 0105001A */ div $zero, $t0, $a1 @@ -423,14 +423,14 @@ glabel func_80030FC8 /* 0321FC 800315FC C4900214 */ lwc1 $f16, 0x214($a0) /* 032200 80031600 460022A1 */ cvt.d.s $f10, $f4 /* 032204 80031604 14A00002 */ bnez $a1, .L80031610 -/* 032208 80031608 00000000 */ nop +/* 032208 80031608 00000000 */ nop /* 03220C 8003160C 0007000D */ break 7 .L80031610: /* 032210 80031610 2401FFFF */ li $at, -1 /* 032214 80031614 14A10004 */ bne $a1, $at, .L80031628 /* 032218 80031618 3C018000 */ lui $at, 0x8000 /* 03221C 8003161C 15010002 */ bne $t0, $at, .L80031628 -/* 032220 80031620 00000000 */ nop +/* 032220 80031620 00000000 */ nop /* 032224 80031624 0006000D */ break 6 .L80031628: /* 032228 80031628 46325180 */ add.d $f6, $f10, $f18 @@ -445,11 +445,11 @@ glabel func_80030FC8 /* 032248 80031648 D42ADA60 */ ldc1 $f10, %lo(D_800EDA60)($at) /* 03224C 8003164C 462A1482 */ mul.d $f18, $f2, $f10 /* 032250 80031650 4620903E */ c.le.d $f18, $f0 -/* 032254 80031654 00000000 */ nop +/* 032254 80031654 00000000 */ nop /* 032258 80031658 4502020F */ bc1fl .L80031E98 /* 03225C 8003165C 44800000 */ mtc1 $zero, $f0 /* 032260 80031660 4622003E */ c.le.d $f0, $f2 -/* 032264 80031664 00000000 */ nop +/* 032264 80031664 00000000 */ nop /* 032268 80031668 4502020B */ bc1fl .L80031E98 /* 03226C 8003166C 44800000 */ mtc1 $zero, $f0 /* 032270 80031670 848E00C4 */ lh $t6, 0xc4($a0) @@ -465,14 +465,14 @@ glabel func_80030FC8 /* 032298 80031698 46307282 */ mul.d $f10, $f14, $f16 /* 03229C 8003169C 46003121 */ cvt.d.s $f4, $f6 /* 0322A0 800316A0 14A00002 */ bnez $a1, .L800316AC -/* 0322A4 800316A4 00000000 */ nop +/* 0322A4 800316A4 00000000 */ nop /* 0322A8 800316A8 0007000D */ break 7 .L800316AC: /* 0322AC 800316AC 2401FFFF */ li $at, -1 /* 0322B0 800316B0 14A10004 */ bne $a1, $at, .L800316C4 /* 0322B4 800316B4 3C018000 */ lui $at, 0x8000 /* 0322B8 800316B8 15C10002 */ bne $t6, $at, .L800316C4 -/* 0322BC 800316BC 00000000 */ nop +/* 0322BC 800316BC 00000000 */ nop /* 0322C0 800316C0 0006000D */ break 6 .L800316C4: /* 0322C4 800316C4 462A2480 */ add.d $f18, $f4, $f10 @@ -487,9 +487,9 @@ glabel func_80030FC8 /* 0322E4 800316E4 44808000 */ mtc1 $zero, $f16 /* 0322E8 800316E8 46006021 */ cvt.d.s $f0, $f12 /* 0322EC 800316EC 4620803E */ c.le.d $f16, $f0 -/* 0322F0 800316F0 00000000 */ nop +/* 0322F0 800316F0 00000000 */ nop /* 0322F4 800316F4 45000031 */ bc1f .L800317BC -/* 0322F8 800316F8 00000000 */ nop +/* 0322F8 800316F8 00000000 */ nop /* 0322FC 800316FC C4840214 */ lwc1 $f4, 0x214($a0) /* 032300 80031700 3C01800F */ lui $at, %hi(D_800EDA68) /* 032304 80031704 D432DA68 */ ldc1 $f18, %lo(D_800EDA68)($at) @@ -497,9 +497,9 @@ glabel func_80030FC8 /* 03230C 8003170C 3C03800E */ lui $v1, %hi(gKartAccelerationTables) # $v1, 0x800e /* 032310 80031710 46325182 */ mul.d $f6, $f10, $f18 /* 032314 80031714 4626003C */ c.lt.d $f0, $f6 -/* 032318 80031718 00000000 */ nop +/* 032318 80031718 00000000 */ nop /* 03231C 8003171C 45000027 */ bc1f .L800317BC -/* 032320 80031720 00000000 */ nop +/* 032320 80031720 00000000 */ nop /* 032324 80031724 848900C4 */ lh $t1, 0xc4($a0) /* 032328 80031728 240500B6 */ li $a1, 182 /* 03232C 8003172C 94820254 */ lhu $v0, 0x254($a0) @@ -523,14 +523,14 @@ glabel func_80030FC8 /* 032374 80031774 C5680000 */ lwc1 $f8, ($t3) /* 032378 80031778 46328180 */ add.d $f6, $f16, $f18 /* 03237C 8003177C 14A00002 */ bnez $a1, .L80031788 -/* 032380 80031780 00000000 */ nop +/* 032380 80031780 00000000 */ nop /* 032384 80031784 0007000D */ break 7 .L80031788: /* 032388 80031788 2401FFFF */ li $at, -1 /* 03238C 8003178C 14A10004 */ bne $a1, $at, .L800317A0 /* 032390 80031790 3C018000 */ lui $at, 0x8000 /* 032394 80031794 15210002 */ bne $t1, $at, .L800317A0 -/* 032398 80031798 00000000 */ nop +/* 032398 80031798 00000000 */ nop /* 03239C 8003179C 0006000D */ break 6 .L800317A0: /* 0323A0 800317A0 46004121 */ cvt.d.s $f4, $f8 @@ -555,15 +555,15 @@ glabel func_80030FC8 /* 0323E8 800317E8 240500B6 */ li $a1, 182 /* 0323EC 800317EC 3C01800F */ lui $at, %hi(D_800EDA88) /* 0323F0 800317F0 4620203E */ c.le.d $f4, $f0 -/* 0323F4 800317F4 00000000 */ nop +/* 0323F4 800317F4 00000000 */ nop /* 0323F8 800317F8 45000029 */ bc1f .L800318A0 -/* 0323FC 800317FC 00000000 */ nop +/* 0323FC 800317FC 00000000 */ nop /* 032400 80031800 D42ADA88 */ ldc1 $f10, %lo(D_800EDA88)($at) /* 032404 80031804 462A1402 */ mul.d $f16, $f2, $f10 /* 032408 80031808 4630003C */ c.lt.d $f0, $f16 -/* 03240C 8003180C 00000000 */ nop +/* 03240C 8003180C 00000000 */ nop /* 032410 80031810 45000023 */ bc1f .L800318A0 -/* 032414 80031814 00000000 */ nop +/* 032414 80031814 00000000 */ nop /* 032418 80031818 848F00C4 */ lh $t7, 0xc4($a0) /* 03241C 8003181C 94820254 */ lhu $v0, 0x254($a0) /* 032420 80031820 01E5001A */ div $zero, $t7, $a1 @@ -580,14 +580,14 @@ glabel func_80030FC8 /* 03244C 8003184C 46009221 */ cvt.d.s $f8, $f18 /* 032450 80031850 C7320000 */ lwc1 $f18, ($t9) /* 032454 80031854 14A00002 */ bnez $a1, .L80031860 -/* 032458 80031858 00000000 */ nop +/* 032458 80031858 00000000 */ nop /* 03245C 8003185C 0007000D */ break 7 .L80031860: /* 032460 80031860 2401FFFF */ li $at, -1 /* 032464 80031864 14A10004 */ bne $a1, $at, .L80031878 /* 032468 80031868 3C018000 */ lui $at, 0x8000 /* 03246C 8003186C 15E10002 */ bne $t7, $at, .L80031878 -/* 032470 80031870 00000000 */ nop +/* 032470 80031870 00000000 */ nop /* 032474 80031874 0006000D */ break 6 .L80031878: /* 032478 80031878 462A4400 */ add.d $f16, $f8, $f10 @@ -606,15 +606,15 @@ glabel func_80030FC8 /* 0324A8 800318A8 3C01800F */ lui $at, %hi(D_800EDA98) /* 0324AC 800318AC 46301182 */ mul.d $f6, $f2, $f16 /* 0324B0 800318B0 4620303E */ c.le.d $f6, $f0 -/* 0324B4 800318B4 00000000 */ nop +/* 0324B4 800318B4 00000000 */ nop /* 0324B8 800318B8 45000029 */ bc1f .L80031960 -/* 0324BC 800318BC 00000000 */ nop +/* 0324BC 800318BC 00000000 */ nop /* 0324C0 800318C0 D424DA98 */ ldc1 $f4, %lo(D_800EDA98)($at) /* 0324C4 800318C4 46241202 */ mul.d $f8, $f2, $f4 /* 0324C8 800318C8 4628003C */ c.lt.d $f0, $f8 -/* 0324CC 800318CC 00000000 */ nop +/* 0324CC 800318CC 00000000 */ nop /* 0324D0 800318D0 45000023 */ bc1f .L80031960 -/* 0324D4 800318D4 00000000 */ nop +/* 0324D4 800318D4 00000000 */ nop /* 0324D8 800318D8 848B00C4 */ lh $t3, 0xc4($a0) /* 0324DC 800318DC 94820254 */ lhu $v0, 0x254($a0) /* 0324E0 800318E0 0165001A */ div $zero, $t3, $a1 @@ -631,14 +631,14 @@ glabel func_80030FC8 /* 03250C 8003190C 460054A1 */ cvt.d.s $f18, $f10 /* 032510 80031910 C5AA0000 */ lwc1 $f10, ($t5) /* 032514 80031914 14A00002 */ bnez $a1, .L80031920 -/* 032518 80031918 00000000 */ nop +/* 032518 80031918 00000000 */ nop /* 03251C 8003191C 0007000D */ break 7 .L80031920: /* 032520 80031920 2401FFFF */ li $at, -1 /* 032524 80031924 14A10004 */ bne $a1, $at, .L80031938 /* 032528 80031928 3C018000 */ lui $at, 0x8000 /* 03252C 8003192C 15610002 */ bne $t3, $at, .L80031938 -/* 032530 80031930 00000000 */ nop +/* 032530 80031930 00000000 */ nop /* 032534 80031934 0006000D */ break 6 .L80031938: /* 032538 80031938 46249200 */ add.d $f8, $f18, $f4 @@ -657,15 +657,15 @@ glabel func_80030FC8 /* 032568 80031968 3C01800F */ lui $at, %hi(D_800EDAA8) /* 03256C 8003196C 46281402 */ mul.d $f16, $f2, $f8 /* 032570 80031970 4620803E */ c.le.d $f16, $f0 -/* 032574 80031974 00000000 */ nop +/* 032574 80031974 00000000 */ nop /* 032578 80031978 45000029 */ bc1f .L80031A20 -/* 03257C 8003197C 00000000 */ nop +/* 03257C 8003197C 00000000 */ nop /* 032580 80031980 D426DAA8 */ ldc1 $f6, %lo(D_800EDAA8)($at) /* 032584 80031984 46261482 */ mul.d $f18, $f2, $f6 /* 032588 80031988 4632003C */ c.lt.d $f0, $f18 -/* 03258C 8003198C 00000000 */ nop +/* 03258C 8003198C 00000000 */ nop /* 032590 80031990 45000023 */ bc1f .L80031A20 -/* 032594 80031994 00000000 */ nop +/* 032594 80031994 00000000 */ nop /* 032598 80031998 849900C4 */ lh $t9, 0xc4($a0) /* 03259C 8003199C 94820254 */ lhu $v0, 0x254($a0) /* 0325A0 800319A0 0325001A */ div $zero, $t9, $a1 @@ -682,14 +682,14 @@ glabel func_80030FC8 /* 0325CC 800319CC 460022A1 */ cvt.d.s $f10, $f4 /* 0325D0 800319D0 C5240000 */ lwc1 $f4, ($t1) /* 0325D4 800319D4 14A00002 */ bnez $a1, .L800319E0 -/* 0325D8 800319D8 00000000 */ nop +/* 0325D8 800319D8 00000000 */ nop /* 0325DC 800319DC 0007000D */ break 7 .L800319E0: /* 0325E0 800319E0 2401FFFF */ li $at, -1 /* 0325E4 800319E4 14A10004 */ bne $a1, $at, .L800319F8 /* 0325E8 800319E8 3C018000 */ lui $at, 0x8000 /* 0325EC 800319EC 17210002 */ bne $t9, $at, .L800319F8 -/* 0325F0 800319F0 00000000 */ nop +/* 0325F0 800319F0 00000000 */ nop /* 0325F4 800319F4 0006000D */ break 6 .L800319F8: /* 0325F8 800319F8 46265480 */ add.d $f18, $f10, $f6 @@ -708,15 +708,15 @@ glabel func_80030FC8 /* 032628 80031A28 3C013FE0 */ lui $at, 0x3fe0 /* 03262C 80031A2C 46321202 */ mul.d $f8, $f2, $f18 /* 032630 80031A30 4620403E */ c.le.d $f8, $f0 -/* 032634 80031A34 00000000 */ nop +/* 032634 80031A34 00000000 */ nop /* 032638 80031A38 4502002C */ bc1fl .L80031AEC /* 03263C 80031A3C 3C013FE0 */ li $at, 0x3FE00000 # 1.750000 /* 032640 80031A40 44818800 */ mtc1 $at, $f17 /* 032644 80031A44 44808000 */ mtc1 $zero, $f16 -/* 032648 80031A48 00000000 */ nop +/* 032648 80031A48 00000000 */ nop /* 03264C 80031A4C 46301282 */ mul.d $f10, $f2, $f16 /* 032650 80031A50 462A003C */ c.lt.d $f0, $f10 -/* 032654 80031A54 00000000 */ nop +/* 032654 80031A54 00000000 */ nop /* 032658 80031A58 45020024 */ bc1fl .L80031AEC /* 03265C 80031A5C 3C013FE0 */ lui $at, 0x3fe0 /* 032660 80031A60 848D00C4 */ lh $t5, 0xc4($a0) @@ -735,14 +735,14 @@ glabel func_80030FC8 /* 032694 80031A94 46003121 */ cvt.d.s $f4, $f6 /* 032698 80031A98 C5E60000 */ lwc1 $f6, ($t7) /* 03269C 80031A9C 14A00002 */ bnez $a1, .L80031AA8 -/* 0326A0 80031AA0 00000000 */ nop +/* 0326A0 80031AA0 00000000 */ nop /* 0326A4 80031AA4 0007000D */ break 7 .L80031AA8: /* 0326A8 80031AA8 2401FFFF */ li $at, -1 /* 0326AC 80031AAC 14A10004 */ bne $a1, $at, .L80031AC0 /* 0326B0 80031AB0 3C018000 */ lui $at, 0x8000 /* 0326B4 80031AB4 15A10002 */ bne $t5, $at, .L80031AC0 -/* 0326B8 80031AB8 00000000 */ nop +/* 0326B8 80031AB8 00000000 */ nop /* 0326BC 80031ABC 0006000D */ break 6 .L80031AC0: /* 0326C0 80031AC0 46302280 */ add.d $f10, $f4, $f16 @@ -762,15 +762,15 @@ glabel func_80030FC8 /* 0326F4 80031AF4 3C01800F */ lui $at, %hi(D_800EDAB8) /* 0326F8 80031AF8 462A1482 */ mul.d $f18, $f2, $f10 /* 0326FC 80031AFC 4620903E */ c.le.d $f18, $f0 -/* 032700 80031B00 00000000 */ nop +/* 032700 80031B00 00000000 */ nop /* 032704 80031B04 45000029 */ bc1f .L80031BAC -/* 032708 80031B08 00000000 */ nop +/* 032708 80031B08 00000000 */ nop /* 03270C 80031B0C D428DAB8 */ ldc1 $f8, %lo(D_800EDAB8)($at) /* 032710 80031B10 46281102 */ mul.d $f4, $f2, $f8 /* 032714 80031B14 4624003C */ c.lt.d $f0, $f4 -/* 032718 80031B18 00000000 */ nop +/* 032718 80031B18 00000000 */ nop /* 03271C 80031B1C 45000023 */ bc1f .L80031BAC -/* 032720 80031B20 00000000 */ nop +/* 032720 80031B20 00000000 */ nop /* 032724 80031B24 848900C4 */ lh $t1, 0xc4($a0) /* 032728 80031B28 94820254 */ lhu $v0, 0x254($a0) /* 03272C 80031B2C 0125001A */ div $zero, $t1, $a1 @@ -787,14 +787,14 @@ glabel func_80030FC8 /* 032758 80031B58 460081A1 */ cvt.d.s $f6, $f16 /* 03275C 80031B5C C5700000 */ lwc1 $f16, ($t3) /* 032760 80031B60 14A00002 */ bnez $a1, .L80031B6C -/* 032764 80031B64 00000000 */ nop +/* 032764 80031B64 00000000 */ nop /* 032768 80031B68 0007000D */ break 7 .L80031B6C: /* 03276C 80031B6C 2401FFFF */ li $at, -1 /* 032770 80031B70 14A10004 */ bne $a1, $at, .L80031B84 /* 032774 80031B74 3C018000 */ lui $at, 0x8000 /* 032778 80031B78 15210002 */ bne $t1, $at, .L80031B84 -/* 03277C 80031B7C 00000000 */ nop +/* 03277C 80031B7C 00000000 */ nop /* 032780 80031B80 0006000D */ break 6 .L80031B84: /* 032784 80031B84 46283100 */ add.d $f4, $f6, $f8 @@ -813,15 +813,15 @@ glabel func_80030FC8 /* 0327B4 80031BB4 3C01800F */ lui $at, %hi(D_800EDAC8) /* 0327B8 80031BB8 46241282 */ mul.d $f10, $f2, $f4 /* 0327BC 80031BBC 4620503E */ c.le.d $f10, $f0 -/* 0327C0 80031BC0 00000000 */ nop +/* 0327C0 80031BC0 00000000 */ nop /* 0327C4 80031BC4 45000029 */ bc1f .L80031C6C -/* 0327C8 80031BC8 00000000 */ nop +/* 0327C8 80031BC8 00000000 */ nop /* 0327CC 80031BCC D432DAC8 */ ldc1 $f18, %lo(D_800EDAC8)($at) /* 0327D0 80031BD0 46321182 */ mul.d $f6, $f2, $f18 /* 0327D4 80031BD4 4626003C */ c.lt.d $f0, $f6 -/* 0327D8 80031BD8 00000000 */ nop +/* 0327D8 80031BD8 00000000 */ nop /* 0327DC 80031BDC 45000023 */ bc1f .L80031C6C -/* 0327E0 80031BE0 00000000 */ nop +/* 0327E0 80031BE0 00000000 */ nop /* 0327E4 80031BE4 848F00C4 */ lh $t7, 0xc4($a0) /* 0327E8 80031BE8 94820254 */ lhu $v0, 0x254($a0) /* 0327EC 80031BEC 01E5001A */ div $zero, $t7, $a1 @@ -838,14 +838,14 @@ glabel func_80030FC8 /* 032818 80031C18 46004421 */ cvt.d.s $f16, $f8 /* 03281C 80031C1C C7280000 */ lwc1 $f8, ($t9) /* 032820 80031C20 14A00002 */ bnez $a1, .L80031C2C -/* 032824 80031C24 00000000 */ nop +/* 032824 80031C24 00000000 */ nop /* 032828 80031C28 0007000D */ break 7 .L80031C2C: /* 03282C 80031C2C 2401FFFF */ li $at, -1 /* 032830 80031C30 14A10004 */ bne $a1, $at, .L80031C44 /* 032834 80031C34 3C018000 */ lui $at, 0x8000 /* 032838 80031C38 15E10002 */ bne $t7, $at, .L80031C44 -/* 03283C 80031C3C 00000000 */ nop +/* 03283C 80031C3C 00000000 */ nop /* 032840 80031C40 0006000D */ break 6 .L80031C44: /* 032844 80031C44 46328180 */ add.d $f6, $f16, $f18 @@ -864,15 +864,15 @@ glabel func_80030FC8 /* 032874 80031C74 3C01800F */ lui $at, %hi(D_800EDAD8) /* 032878 80031C78 46261102 */ mul.d $f4, $f2, $f6 /* 03287C 80031C7C 4620203E */ c.le.d $f4, $f0 -/* 032880 80031C80 00000000 */ nop +/* 032880 80031C80 00000000 */ nop /* 032884 80031C84 45000029 */ bc1f .L80031D2C -/* 032888 80031C88 00000000 */ nop +/* 032888 80031C88 00000000 */ nop /* 03288C 80031C8C D42ADAD8 */ ldc1 $f10, %lo(D_800EDAD8)($at) /* 032890 80031C90 462A1402 */ mul.d $f16, $f2, $f10 /* 032894 80031C94 4630003C */ c.lt.d $f0, $f16 -/* 032898 80031C98 00000000 */ nop +/* 032898 80031C98 00000000 */ nop /* 03289C 80031C9C 45000023 */ bc1f .L80031D2C -/* 0328A0 80031CA0 00000000 */ nop +/* 0328A0 80031CA0 00000000 */ nop /* 0328A4 80031CA4 848B00C4 */ lh $t3, 0xc4($a0) /* 0328A8 80031CA8 94820254 */ lhu $v0, 0x254($a0) /* 0328AC 80031CAC 0165001A */ div $zero, $t3, $a1 @@ -889,14 +889,14 @@ glabel func_80030FC8 /* 0328D8 80031CD8 46009221 */ cvt.d.s $f8, $f18 /* 0328DC 80031CDC C5B20000 */ lwc1 $f18, ($t5) /* 0328E0 80031CE0 14A00002 */ bnez $a1, .L80031CEC -/* 0328E4 80031CE4 00000000 */ nop +/* 0328E4 80031CE4 00000000 */ nop /* 0328E8 80031CE8 0007000D */ break 7 .L80031CEC: /* 0328EC 80031CEC 2401FFFF */ li $at, -1 /* 0328F0 80031CF0 14A10004 */ bne $a1, $at, .L80031D04 /* 0328F4 80031CF4 3C018000 */ lui $at, 0x8000 /* 0328F8 80031CF8 15610002 */ bne $t3, $at, .L80031D04 -/* 0328FC 80031CFC 00000000 */ nop +/* 0328FC 80031CFC 00000000 */ nop /* 032900 80031D00 0006000D */ break 6 .L80031D04: /* 032904 80031D04 462A4400 */ add.d $f16, $f8, $f10 @@ -915,15 +915,15 @@ glabel func_80030FC8 /* 032934 80031D34 3C01800F */ lui $at, %hi(D_800EDAE8) /* 032938 80031D38 46301182 */ mul.d $f6, $f2, $f16 /* 03293C 80031D3C 4620303E */ c.le.d $f6, $f0 -/* 032940 80031D40 00000000 */ nop +/* 032940 80031D40 00000000 */ nop /* 032944 80031D44 45000029 */ bc1f .L80031DEC -/* 032948 80031D48 00000000 */ nop +/* 032948 80031D48 00000000 */ nop /* 03294C 80031D4C D424DAE8 */ ldc1 $f4, %lo(D_800EDAE8)($at) /* 032950 80031D50 46241202 */ mul.d $f8, $f2, $f4 /* 032954 80031D54 4628003C */ c.lt.d $f0, $f8 -/* 032958 80031D58 00000000 */ nop +/* 032958 80031D58 00000000 */ nop /* 03295C 80031D5C 45000023 */ bc1f .L80031DEC -/* 032960 80031D60 00000000 */ nop +/* 032960 80031D60 00000000 */ nop /* 032964 80031D64 849900C4 */ lh $t9, 0xc4($a0) /* 032968 80031D68 94820254 */ lhu $v0, 0x254($a0) /* 03296C 80031D6C 0325001A */ div $zero, $t9, $a1 @@ -940,14 +940,14 @@ glabel func_80030FC8 /* 032998 80031D98 460054A1 */ cvt.d.s $f18, $f10 /* 03299C 80031D9C C52A0000 */ lwc1 $f10, ($t1) /* 0329A0 80031DA0 14A00002 */ bnez $a1, .L80031DAC -/* 0329A4 80031DA4 00000000 */ nop +/* 0329A4 80031DA4 00000000 */ nop /* 0329A8 80031DA8 0007000D */ break 7 .L80031DAC: /* 0329AC 80031DAC 2401FFFF */ li $at, -1 /* 0329B0 80031DB0 14A10004 */ bne $a1, $at, .L80031DC4 /* 0329B4 80031DB4 3C018000 */ lui $at, 0x8000 /* 0329B8 80031DB8 17210002 */ bne $t9, $at, .L80031DC4 -/* 0329BC 80031DBC 00000000 */ nop +/* 0329BC 80031DBC 00000000 */ nop /* 0329C0 80031DC0 0006000D */ break 6 .L80031DC4: /* 0329C4 80031DC4 46249200 */ add.d $f8, $f18, $f4 @@ -965,11 +965,11 @@ glabel func_80030FC8 /* 0329F0 80031DF0 D428DAF0 */ ldc1 $f8, %lo(D_800EDAF0)($at) /* 0329F4 80031DF4 46281402 */ mul.d $f16, $f2, $f8 /* 0329F8 80031DF8 4620803E */ c.le.d $f16, $f0 -/* 0329FC 80031DFC 00000000 */ nop +/* 0329FC 80031DFC 00000000 */ nop /* 032A00 80031E00 45020025 */ bc1fl .L80031E98 /* 032A04 80031E04 44800000 */ mtc1 $zero, $f0 /* 032A08 80031E08 4622003E */ c.le.d $f0, $f2 -/* 032A0C 80031E0C 00000000 */ nop +/* 032A0C 80031E0C 00000000 */ nop /* 032A10 80031E10 45020021 */ bc1fl .L80031E98 /* 032A14 80031E14 44800000 */ mtc1 $zero, $f0 /* 032A18 80031E18 848D00C4 */ lh $t5, 0xc4($a0) @@ -988,14 +988,14 @@ glabel func_80030FC8 /* 032A4C 80031E4C 460034A1 */ cvt.d.s $f18, $f6 /* 032A50 80031E50 C5E60000 */ lwc1 $f6, ($t7) /* 032A54 80031E54 14A00002 */ bnez $a1, .L80031E60 -/* 032A58 80031E58 00000000 */ nop +/* 032A58 80031E58 00000000 */ nop /* 032A5C 80031E5C 0007000D */ break 7 .L80031E60: /* 032A60 80031E60 2401FFFF */ li $at, -1 /* 032A64 80031E64 14A10004 */ bne $a1, $at, .L80031E78 /* 032A68 80031E68 3C018000 */ lui $at, 0x8000 /* 032A6C 80031E6C 15A10002 */ bne $t5, $at, .L80031E78 -/* 032A70 80031E70 00000000 */ nop +/* 032A70 80031E70 00000000 */ nop /* 032A74 80031E74 0006000D */ break 6 .L80031E78: /* 032A78 80031E78 46289400 */ add.d $f16, $f18, $f8 @@ -1019,7 +1019,7 @@ glabel func_80030FC8 /* 032AB8 80031EB8 C4800214 */ lwc1 $f0, 0x214($a0) .L80031EBC: /* 032ABC 80031EBC 460C003E */ c.le.s $f0, $f12 -/* 032AC0 80031EC0 00000000 */ nop +/* 032AC0 80031EC0 00000000 */ nop /* 032AC4 80031EC4 45020003 */ bc1fl .L80031ED4 /* 032AC8 80031EC8 8C8200BC */ lw $v0, 0xbc($a0) /* 032ACC 80031ECC E480009C */ swc1 $f0, 0x9c($a0) @@ -1056,4 +1056,4 @@ glabel func_80030FC8 /* 032B38 80031F38 8FBF0014 */ lw $ra, 0x14($sp) /* 032B3C 80031F3C 27BD0018 */ addiu $sp, $sp, 0x18 /* 032B40 80031F40 03E00008 */ jr $ra -/* 032B44 80031F44 00000000 */ nop +/* 032B44 80031F44 00000000 */ nop diff --git a/asm/non_matchings/code_80027D00/func_80031F48.s b/asm/non_matchings/code_80027D00/func_80031F48.s index e16ebd0d9..194075a22 100644 --- a/asm/non_matchings/code_80027D00/func_80031F48.s +++ b/asm/non_matchings/code_80027D00/func_80031F48.s @@ -2,7 +2,7 @@ glabel func_80031F48 /* 032B48 80031F48 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 032B4C 80031F4C AFBF0014 */ sw $ra, 0x14($sp) /* 032B50 80031F50 AFA5001C */ sw $a1, 0x1c($sp) -/* 032B54 80031F54 0C009F40 */ jal func_80027D00 +/* 032B54 80031F54 0C009F40 */ jal get_player_index_for_player /* 032B58 80031F58 AFA40018 */ sw $a0, 0x18($sp) /* 032B5C 80031F5C 8FA40018 */ lw $a0, 0x18($sp) /* 032B60 80031F60 C7A6001C */ lwc1 $f6, 0x1c($sp) @@ -16,7 +16,7 @@ glabel func_80031F48 /* 032B80 80031F80 E488009C */ swc1 $f8, 0x9c($a0) /* 032B84 80031F84 C48A009C */ lwc1 $f10, 0x9c($a0) /* 032B88 80031F88 4600503E */ c.le.s $f10, $f0 -/* 032B8C 80031F8C 00000000 */ nop +/* 032B8C 80031F8C 00000000 */ nop /* 032B90 80031F90 45020003 */ bc1fl .L80031FA0 /* 032B94 80031F94 C4900094 */ lwc1 $f16, 0x94($a0) /* 032B98 80031F98 E480009C */ swc1 $f0, 0x9c($a0) @@ -26,7 +26,7 @@ glabel func_80031F48 /* 032BA4 80031FA4 D424DAF8 */ ldc1 $f4, %lo(D_800EDAF8)($at) /* 032BA8 80031FA8 460084A1 */ cvt.d.s $f18, $f16 /* 032BAC 80031FAC 4624903C */ c.lt.d $f18, $f4 -/* 032BB0 80031FB0 00000000 */ nop +/* 032BB0 80031FB0 00000000 */ nop /* 032BB4 80031FB4 45020003 */ bc1fl .L80031FC4 /* 032BB8 80031FB8 C4800214 */ lwc1 $f0, 0x214($a0) /* 032BBC 80031FBC E480008C */ swc1 $f0, 0x8c($a0) @@ -34,7 +34,7 @@ glabel func_80031F48 .L80031FC4: /* 032BC4 80031FC4 C486009C */ lwc1 $f6, 0x9c($a0) /* 032BC8 80031FC8 4606003E */ c.le.s $f0, $f6 -/* 032BCC 80031FCC 00000000 */ nop +/* 032BCC 80031FCC 00000000 */ nop /* 032BD0 80031FD0 45020003 */ bc1fl .L80031FE0 /* 032BD4 80031FD4 8C8E00BC */ lw $t6, 0xbc($a0) /* 032BD8 80031FD8 E480009C */ swc1 $f0, 0x9c($a0) @@ -69,4 +69,4 @@ glabel func_80031F48 /* 032C40 80032040 8FBF0014 */ lw $ra, 0x14($sp) /* 032C44 80032044 27BD0018 */ addiu $sp, $sp, 0x18 /* 032C48 80032048 03E00008 */ jr $ra -/* 032C4C 8003204C 00000000 */ nop +/* 032C4C 8003204C 00000000 */ nop diff --git a/asm/non_matchings/code_80027D00/func_80032050.s b/asm/non_matchings/code_80027D00/func_80032050.s index d9564dc1d..11fef0558 100644 --- a/asm/non_matchings/code_80027D00/func_80032050.s +++ b/asm/non_matchings/code_80027D00/func_80032050.s @@ -1,53 +1,53 @@ glabel func_80032050 -/* 032C50 80032050 3C0E800E */ lui $t6, %hi(D_800DC4DC) # $t6, 0x800e -/* 032C54 80032054 8DCEC4DC */ lw $t6, %lo(D_800DC4DC)($t6) +/* 032C50 80032050 3C0E800E */ lui $t6, %hi(gPlayerOne) # $t6, 0x800e +/* 032C54 80032054 8DCEC4DC */ lw $t6, %lo(gPlayerOne)($t6) /* 032C58 80032058 27BDFFF8 */ addiu $sp, $sp, -8 -/* 032C5C 8003205C 3C0F800E */ lui $t7, %hi(D_800DC4E0) # $t7, 0x800e +/* 032C5C 8003205C 3C0F800E */ lui $t7, %hi(gPlayerTwo) # $t7, 0x800e /* 032C60 80032060 148E0002 */ bne $a0, $t6, .L8003206C -/* 032C64 80032064 3C18800E */ lui $t8, %hi(D_800DC4E4) # $t8, 0x800e +/* 032C64 80032064 3C18800E */ lui $t8, %hi(gPlayerThree) # $t8, 0x800e /* 032C68 80032068 AFA00004 */ sw $zero, 4($sp) .L8003206C: -/* 032C6C 8003206C 8DEFC4E0 */ lw $t7, %lo(D_800DC4E0)($t7) +/* 032C6C 8003206C 8DEFC4E0 */ lw $t7, %lo(gPlayerTwo)($t7) /* 032C70 80032070 8FA20004 */ lw $v0, 4($sp) -/* 032C74 80032074 3C19800E */ lui $t9, %hi(D_800DC4E8) # $t9, 0x800e +/* 032C74 80032074 3C19800E */ lui $t9, %hi(gPlayerFour) # $t9, 0x800e /* 032C78 80032078 148F0002 */ bne $a0, $t7, .L80032084 -/* 032C7C 8003207C 3C09800E */ lui $t1, %hi(D_800DC4EC) # $t1, 0x800e +/* 032C7C 8003207C 3C09800E */ lui $t1, %hi(gPlayerFive) # $t1, 0x800e /* 032C80 80032080 24020001 */ li $v0, 1 .L80032084: -/* 032C84 80032084 8F18C4E4 */ lw $t8, %lo(D_800DC4E4)($t8) -/* 032C88 80032088 3C0A800E */ lui $t2, %hi(D_800DC4F0) # $t2, 0x800e -/* 032C8C 8003208C 3C0B800E */ lui $t3, %hi(D_800DC4F4) # $t3, 0x800e +/* 032C84 80032084 8F18C4E4 */ lw $t8, %lo(gPlayerThree)($t8) +/* 032C88 80032088 3C0A800E */ lui $t2, %hi(gPlayerSix) # $t2, 0x800e +/* 032C8C 8003208C 3C0B800E */ lui $t3, %hi(gPlayerSeven) # $t3, 0x800e /* 032C90 80032090 14980002 */ bne $a0, $t8, .L8003209C -/* 032C94 80032094 3C0C800E */ lui $t4, %hi(D_800DC4F8) # $t4, 0x800e +/* 032C94 80032094 3C0C800E */ lui $t4, %hi(gPlayerEight) # $t4, 0x800e /* 032C98 80032098 24020002 */ li $v0, 2 .L8003209C: -/* 032C9C 8003209C 8F39C4E8 */ lw $t9, %lo(D_800DC4E8)($t9) +/* 032C9C 8003209C 8F39C4E8 */ lw $t9, %lo(gPlayerFour)($t9) /* 032CA0 800320A0 3C0D8016 */ lui $t5, %hi(D_80165520) # $t5, 0x8016 /* 032CA4 800320A4 25AD5520 */ addiu $t5, %lo(D_80165520) # addiu $t5, $t5, 0x5520 /* 032CA8 800320A8 14990002 */ bne $a0, $t9, .L800320B4 -/* 032CAC 800320AC 00000000 */ nop +/* 032CAC 800320AC 00000000 */ nop /* 032CB0 800320B0 24020003 */ li $v0, 3 .L800320B4: -/* 032CB4 800320B4 8D29C4EC */ lw $t1, %lo(D_800DC4EC)($t1) +/* 032CB4 800320B4 8D29C4EC */ lw $t1, %lo(gPlayerFive)($t1) /* 032CB8 800320B8 3C0F8016 */ lui $t7, %hi(D_801654A0) # $t7, 0x8016 /* 032CBC 800320BC 25EF54A0 */ addiu $t7, %lo(D_801654A0) # addiu $t7, $t7, 0x54a0 /* 032CC0 800320C0 14890002 */ bne $a0, $t1, .L800320CC -/* 032CC4 800320C4 00000000 */ nop +/* 032CC4 800320C4 00000000 */ nop /* 032CC8 800320C8 24020004 */ li $v0, 4 .L800320CC: -/* 032CCC 800320CC 8D4AC4F0 */ lw $t2, %lo(D_800DC4F0)($t2) +/* 032CCC 800320CC 8D4AC4F0 */ lw $t2, %lo(gPlayerSix)($t2) /* 032CD0 800320D0 3C098016 */ lui $t1, %hi(D_801654E0) # $t1, 0x8016 /* 032CD4 800320D4 252954E0 */ addiu $t1, %lo(D_801654E0) # addiu $t1, $t1, 0x54e0 /* 032CD8 800320D8 148A0002 */ bne $a0, $t2, .L800320E4 -/* 032CDC 800320DC 00000000 */ nop +/* 032CDC 800320DC 00000000 */ nop /* 032CE0 800320E0 24020005 */ li $v0, 5 .L800320E4: -/* 032CE4 800320E4 8D6BC4F4 */ lw $t3, %lo(D_800DC4F4)($t3) +/* 032CE4 800320E4 8D6BC4F4 */ lw $t3, %lo(gPlayerSeven)($t3) /* 032CE8 800320E8 148B0002 */ bne $a0, $t3, .L800320F4 -/* 032CEC 800320EC 00000000 */ nop +/* 032CEC 800320EC 00000000 */ nop /* 032CF0 800320F0 24020006 */ li $v0, 6 .L800320F4: -/* 032CF4 800320F4 8D8CC4F8 */ lw $t4, %lo(D_800DC4F8)($t4) +/* 032CF4 800320F4 8D8CC4F8 */ lw $t4, %lo(gPlayerEight)($t4) /* 032CF8 800320F8 3C0B8016 */ lui $t3, %hi(D_80165540) # $t3, 0x8016 /* 032CFC 800320FC 256B5540 */ addiu $t3, %lo(D_80165540) # addiu $t3, $t3, 0x5540 /* 032D00 80032100 548C0003 */ bnel $a0, $t4, .L80032110 diff --git a/asm/non_matchings/code_80027D00/func_8003221C.s b/asm/non_matchings/code_80027D00/func_8003221C.s index 5ead54386..27aa070a5 100644 --- a/asm/non_matchings/code_80027D00/func_8003221C.s +++ b/asm/non_matchings/code_80027D00/func_8003221C.s @@ -1,53 +1,53 @@ glabel func_8003221C -/* 032E1C 8003221C 3C0E800E */ lui $t6, %hi(D_800DC4DC) # $t6, 0x800e -/* 032E20 80032220 8DCEC4DC */ lw $t6, %lo(D_800DC4DC)($t6) +/* 032E1C 8003221C 3C0E800E */ lui $t6, %hi(gPlayerOne) # $t6, 0x800e +/* 032E20 80032220 8DCEC4DC */ lw $t6, %lo(gPlayerOne)($t6) /* 032E24 80032224 27BDFFF8 */ addiu $sp, $sp, -8 -/* 032E28 80032228 3C0F800E */ lui $t7, %hi(D_800DC4E0) # $t7, 0x800e +/* 032E28 80032228 3C0F800E */ lui $t7, %hi(gPlayerTwo) # $t7, 0x800e /* 032E2C 8003222C 148E0002 */ bne $a0, $t6, .L80032238 -/* 032E30 80032230 3C18800E */ lui $t8, %hi(D_800DC4E4) # $t8, 0x800e +/* 032E30 80032230 3C18800E */ lui $t8, %hi(gPlayerThree) # $t8, 0x800e /* 032E34 80032234 AFA00004 */ sw $zero, 4($sp) .L80032238: -/* 032E38 80032238 8DEFC4E0 */ lw $t7, %lo(D_800DC4E0)($t7) +/* 032E38 80032238 8DEFC4E0 */ lw $t7, %lo(gPlayerTwo)($t7) /* 032E3C 8003223C 8FA20004 */ lw $v0, 4($sp) -/* 032E40 80032240 3C19800E */ lui $t9, %hi(D_800DC4E8) # $t9, 0x800e +/* 032E40 80032240 3C19800E */ lui $t9, %hi(gPlayerFour) # $t9, 0x800e /* 032E44 80032244 148F0002 */ bne $a0, $t7, .L80032250 -/* 032E48 80032248 3C09800E */ lui $t1, %hi(D_800DC4EC) # $t1, 0x800e +/* 032E48 80032248 3C09800E */ lui $t1, %hi(gPlayerFive) # $t1, 0x800e /* 032E4C 8003224C 24020001 */ li $v0, 1 .L80032250: -/* 032E50 80032250 8F18C4E4 */ lw $t8, %lo(D_800DC4E4)($t8) -/* 032E54 80032254 3C0A800E */ lui $t2, %hi(D_800DC4F0) # $t2, 0x800e -/* 032E58 80032258 3C0B800E */ lui $t3, %hi(D_800DC4F4) # $t3, 0x800e +/* 032E50 80032250 8F18C4E4 */ lw $t8, %lo(gPlayerThree)($t8) +/* 032E54 80032254 3C0A800E */ lui $t2, %hi(gPlayerSix) # $t2, 0x800e +/* 032E58 80032258 3C0B800E */ lui $t3, %hi(gPlayerSeven) # $t3, 0x800e /* 032E5C 8003225C 14980002 */ bne $a0, $t8, .L80032268 -/* 032E60 80032260 3C0C800E */ lui $t4, %hi(D_800DC4F8) # $t4, 0x800e +/* 032E60 80032260 3C0C800E */ lui $t4, %hi(gPlayerEight) # $t4, 0x800e /* 032E64 80032264 24020002 */ li $v0, 2 .L80032268: -/* 032E68 80032268 8F39C4E8 */ lw $t9, %lo(D_800DC4E8)($t9) +/* 032E68 80032268 8F39C4E8 */ lw $t9, %lo(gPlayerFour)($t9) /* 032E6C 8003226C 3C0D8016 */ lui $t5, %hi(D_80165520) # $t5, 0x8016 /* 032E70 80032270 25AD5520 */ addiu $t5, %lo(D_80165520) # addiu $t5, $t5, 0x5520 /* 032E74 80032274 14990002 */ bne $a0, $t9, .L80032280 -/* 032E78 80032278 00000000 */ nop +/* 032E78 80032278 00000000 */ nop /* 032E7C 8003227C 24020003 */ li $v0, 3 .L80032280: -/* 032E80 80032280 8D29C4EC */ lw $t1, %lo(D_800DC4EC)($t1) +/* 032E80 80032280 8D29C4EC */ lw $t1, %lo(gPlayerFive)($t1) /* 032E84 80032284 3C0F8016 */ lui $t7, %hi(D_801654A0) # $t7, 0x8016 /* 032E88 80032288 25EF54A0 */ addiu $t7, %lo(D_801654A0) # addiu $t7, $t7, 0x54a0 /* 032E8C 8003228C 14890002 */ bne $a0, $t1, .L80032298 -/* 032E90 80032290 00000000 */ nop +/* 032E90 80032290 00000000 */ nop /* 032E94 80032294 24020004 */ li $v0, 4 .L80032298: -/* 032E98 80032298 8D4AC4F0 */ lw $t2, %lo(D_800DC4F0)($t2) +/* 032E98 80032298 8D4AC4F0 */ lw $t2, %lo(gPlayerSix)($t2) /* 032E9C 8003229C 3C098016 */ lui $t1, %hi(D_801654E0) # $t1, 0x8016 /* 032EA0 800322A0 24080001 */ li $t0, 1 /* 032EA4 800322A4 148A0002 */ bne $a0, $t2, .L800322B0 /* 032EA8 800322A8 252954E0 */ addiu $t1, %lo(D_801654E0) # addiu $t1, $t1, 0x54e0 /* 032EAC 800322AC 24020005 */ li $v0, 5 .L800322B0: -/* 032EB0 800322B0 8D6BC4F4 */ lw $t3, %lo(D_800DC4F4)($t3) +/* 032EB0 800322B0 8D6BC4F4 */ lw $t3, %lo(gPlayerSeven)($t3) /* 032EB4 800322B4 148B0002 */ bne $a0, $t3, .L800322C0 -/* 032EB8 800322B8 00000000 */ nop +/* 032EB8 800322B8 00000000 */ nop /* 032EBC 800322BC 24020006 */ li $v0, 6 .L800322C0: -/* 032EC0 800322C0 8D8CC4F8 */ lw $t4, %lo(D_800DC4F8)($t4) +/* 032EC0 800322C0 8D8CC4F8 */ lw $t4, %lo(gPlayerEight)($t4) /* 032EC4 800322C4 3C0B8016 */ lui $t3, %hi(D_80165540) # $t3, 0x8016 /* 032EC8 800322C8 256B5540 */ addiu $t3, %lo(D_80165540) # addiu $t3, $t3, 0x5540 /* 032ECC 800322CC 548C0003 */ bnel $a0, $t4, .L800322DC diff --git a/asm/non_matchings/code_80027D00/func_800323E4.s b/asm/non_matchings/code_80027D00/func_800323E4.s index 37ab68074..e7665629f 100644 --- a/asm/non_matchings/code_80027D00/func_800323E4.s +++ b/asm/non_matchings/code_80027D00/func_800323E4.s @@ -1,6 +1,6 @@ glabel func_800323E4 -/* 032FE4 800323E4 3C0E800E */ lui $t6, %hi(D_800DC4DC) # $t6, 0x800e -/* 032FE8 800323E8 8DCEC4DC */ lw $t6, %lo(D_800DC4DC)($t6) +/* 032FE4 800323E4 3C0E800E */ lui $t6, %hi(gPlayerOne) # $t6, 0x800e +/* 032FE8 800323E8 8DCEC4DC */ lw $t6, %lo(gPlayerOne)($t6) /* 032FEC 800323EC 44806000 */ mtc1 $zero, $f12 /* 032FF0 800323F0 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 032FF4 800323F4 AFBF0014 */ sw $ra, 0x14($sp) @@ -8,44 +8,44 @@ glabel func_800323E4 /* 032FFC 800323FC 46006086 */ mov.s $f2, $f12 /* 033000 80032400 AFA00024 */ sw $zero, 0x24($sp) .L80032404: -/* 033004 80032404 3C0F800E */ lui $t7, %hi(D_800DC4E0) # $t7, 0x800e -/* 033008 80032408 8DEFC4E0 */ lw $t7, %lo(D_800DC4E0)($t7) +/* 033004 80032404 3C0F800E */ lui $t7, %hi(gPlayerTwo) # $t7, 0x800e +/* 033008 80032408 8DEFC4E0 */ lw $t7, %lo(gPlayerTwo)($t7) /* 03300C 8003240C 8FA30024 */ lw $v1, 0x24($sp) -/* 033010 80032410 3C18800E */ lui $t8, %hi(D_800DC4E4) # $t8, 0x800e +/* 033010 80032410 3C18800E */ lui $t8, %hi(gPlayerThree) # $t8, 0x800e /* 033014 80032414 148F0002 */ bne $a0, $t7, .L80032420 -/* 033018 80032418 3C19800E */ lui $t9, %hi(D_800DC4E8) # $t9, 0x800e +/* 033018 80032418 3C19800E */ lui $t9, %hi(gPlayerFour) # $t9, 0x800e /* 03301C 8003241C 24030001 */ li $v1, 1 .L80032420: -/* 033020 80032420 8F18C4E4 */ lw $t8, %lo(D_800DC4E4)($t8) -/* 033024 80032424 3C08800E */ lui $t0, %hi(D_800DC4EC) # $t0, 0x800e -/* 033028 80032428 3C09800E */ lui $t1, %hi(D_800DC4F0) # $t1, 0x800e +/* 033020 80032420 8F18C4E4 */ lw $t8, %lo(gPlayerThree)($t8) +/* 033024 80032424 3C08800E */ lui $t0, %hi(gPlayerFive) # $t0, 0x800e +/* 033028 80032428 3C09800E */ lui $t1, %hi(gPlayerSix) # $t1, 0x800e /* 03302C 8003242C 14980002 */ bne $a0, $t8, .L80032438 -/* 033030 80032430 3C0A800E */ lui $t2, %hi(D_800DC4F4) # $t2, 0x800e +/* 033030 80032430 3C0A800E */ lui $t2, %hi(gPlayerSeven) # $t2, 0x800e /* 033034 80032434 24030002 */ li $v1, 2 .L80032438: -/* 033038 80032438 8F39C4E8 */ lw $t9, %lo(D_800DC4E8)($t9) -/* 03303C 8003243C 3C0B800E */ lui $t3, %hi(D_800DC4F8) # $t3, 0x800e +/* 033038 80032438 8F39C4E8 */ lw $t9, %lo(gPlayerFour)($t9) +/* 03303C 8003243C 3C0B800E */ lui $t3, %hi(gPlayerEight) # $t3, 0x800e /* 033040 80032440 14990002 */ bne $a0, $t9, .L8003244C -/* 033044 80032444 00000000 */ nop +/* 033044 80032444 00000000 */ nop /* 033048 80032448 24030003 */ li $v1, 3 .L8003244C: -/* 03304C 8003244C 8D08C4EC */ lw $t0, %lo(D_800DC4EC)($t0) +/* 03304C 8003244C 8D08C4EC */ lw $t0, %lo(gPlayerFive)($t0) /* 033050 80032450 14880002 */ bne $a0, $t0, .L8003245C -/* 033054 80032454 00000000 */ nop +/* 033054 80032454 00000000 */ nop /* 033058 80032458 24030004 */ li $v1, 4 .L8003245C: -/* 03305C 8003245C 8D29C4F0 */ lw $t1, %lo(D_800DC4F0)($t1) +/* 03305C 8003245C 8D29C4F0 */ lw $t1, %lo(gPlayerSix)($t1) /* 033060 80032460 14890002 */ bne $a0, $t1, .L8003246C -/* 033064 80032464 00000000 */ nop +/* 033064 80032464 00000000 */ nop /* 033068 80032468 24030005 */ li $v1, 5 .L8003246C: -/* 03306C 8003246C 8D4AC4F4 */ lw $t2, %lo(D_800DC4F4)($t2) +/* 03306C 8003246C 8D4AC4F4 */ lw $t2, %lo(gPlayerSeven)($t2) /* 033070 80032470 3C053F80 */ lui $a1, 0x3f80 /* 033074 80032474 148A0002 */ bne $a0, $t2, .L80032480 -/* 033078 80032478 00000000 */ nop +/* 033078 80032478 00000000 */ nop /* 03307C 8003247C 24030006 */ li $v1, 6 .L80032480: -/* 033080 80032480 8D6BC4F8 */ lw $t3, %lo(D_800DC4F8)($t3) +/* 033080 80032480 8D6BC4F8 */ lw $t3, %lo(gPlayerEight)($t3) /* 033084 80032484 548B0003 */ bnel $a0, $t3, .L80032494 /* 033088 80032488 8C8C00BC */ lw $t4, 0xbc($a0) /* 03308C 8003248C 24030007 */ li $v1, 7 @@ -98,14 +98,14 @@ glabel func_800323E4 /* 033138 80032538 3C014000 */ li $at, 0x40000000 # 2.000000 /* 03313C 8003253C 460A4001 */ sub.s $f0, $f8, $f10 /* 033140 80032540 460C003E */ c.le.s $f0, $f12 -/* 033144 80032544 00000000 */ nop +/* 033144 80032544 00000000 */ nop /* 033148 80032548 45020007 */ bc1fl .L80032568 /* 03314C 8003254C 44816000 */ mtc1 $at, $f12 /* 033150 80032550 E48C020C */ swc1 $f12, 0x20c($a0) /* 033154 80032554 3C014000 */ li $at, 0x40000000 # 2.000000 /* 033158 80032558 44816000 */ mtc1 $at, $f12 /* 03315C 8003255C 1000000F */ b .L8003259C -/* 033160 80032560 00000000 */ nop +/* 033160 80032560 00000000 */ nop /* 033164 80032564 44816000 */ mtc1 $at, $f12 .L80032568: /* 033168 80032568 C490020C */ lwc1 $f16, 0x20c($a0) @@ -117,9 +117,9 @@ glabel func_800323E4 /* 033180 80032580 E488020C */ swc1 $f8, 0x20c($a0) /* 033184 80032584 C48A020C */ lwc1 $f10, 0x20c($a0) /* 033188 80032588 460A603E */ c.le.s $f12, $f10 -/* 03318C 8003258C 00000000 */ nop +/* 03318C 8003258C 00000000 */ nop /* 033190 80032590 45000002 */ bc1f .L8003259C -/* 033194 80032594 00000000 */ nop +/* 033194 80032594 00000000 */ nop /* 033198 80032598 E48C020C */ swc1 $f12, 0x20c($a0) .L8003259C: /* 03319C 8003259C 8F395520 */ lw $t9, %lo(D_80165520)($t9) # x5520($t9) @@ -129,7 +129,7 @@ glabel func_800323E4 /* 0331AC 800325AC C490020C */ lwc1 $f16, 0x20c($a0) /* 0331B0 800325B0 3C013F80 */ li $at, 0x3F800000 # 1.000000 /* 0331B4 800325B4 4610603E */ c.le.s $f12, $f16 -/* 0331B8 800325B8 00000000 */ nop +/* 0331B8 800325B8 00000000 */ nop /* 0331BC 800325BC 4502000D */ bc1fl .L800325F4 /* 0331C0 800325C0 44815000 */ mtc1 $at, $f10 /* 0331C4 800325C4 3C013F80 */ li $at, 0x3F800000 # 1.000000 @@ -140,7 +140,7 @@ glabel func_800323E4 /* 0331D8 800325D8 46062202 */ mul.s $f8, $f4, $f6 /* 0331DC 800325DC 44054000 */ mfc1 $a1, $f8 /* 0331E0 800325E0 0C00C7D2 */ jal func_80031F48 -/* 0331E4 800325E4 00000000 */ nop +/* 0331E4 800325E4 00000000 */ nop /* 0331E8 800325E8 10000042 */ b .L800326F4 /* 0331EC 800325EC 8FBF0014 */ lw $ra, 0x14($sp) /* 0331F0 800325F0 44815000 */ mtc1 $at, $f10 @@ -151,7 +151,7 @@ glabel func_800323E4 /* 033200 80032600 46128102 */ mul.s $f4, $f16, $f18 /* 033204 80032604 44052000 */ mfc1 $a1, $f4 /* 033208 80032608 0C00C7D2 */ jal func_80031F48 -/* 03320C 8003260C 00000000 */ nop +/* 03320C 8003260C 00000000 */ nop /* 033210 80032610 10000038 */ b .L800326F4 /* 033214 80032614 8FBF0014 */ lw $ra, 0x14($sp) /* 033218 80032618 3C0141A0 */ li $at, 0x41A00000 # 20.000000 @@ -166,7 +166,7 @@ glabel func_800323E4 /* 033238 80032638 3C013F80 */ li $at, 0x3F800000 # 1.000000 /* 03323C 8003263C 46128102 */ mul.s $f4, $f16, $f18 /* 033240 80032640 4606203E */ c.le.s $f4, $f6 -/* 033244 80032644 00000000 */ nop +/* 033244 80032644 00000000 */ nop /* 033248 80032648 45020010 */ bc1fl .L8003268C /* 03324C 8003264C C484020C */ lwc1 $f4, 0x20c($a0) /* 033250 80032650 44814000 */ mtc1 $at, $f8 @@ -178,7 +178,7 @@ glabel func_800323E4 /* 033268 80032668 46105482 */ mul.s $f18, $f10, $f16 /* 03326C 8003266C 44059000 */ mfc1 $a1, $f18 /* 033270 80032670 0C00C7D2 */ jal func_80031F48 -/* 033274 80032674 00000000 */ nop +/* 033274 80032674 00000000 */ nop /* 033278 80032678 3C014000 */ li $at, 0x40000000 # 2.000000 /* 03327C 8003267C 44816000 */ mtc1 $at, $f12 /* 033280 80032680 8FA40028 */ lw $a0, 0x28($sp) @@ -191,7 +191,7 @@ glabel func_800323E4 /* 033298 80032698 3C01800F */ lui $at, %hi(D_800EDB08) /* 03329C 8003269C 46023001 */ sub.s $f0, $f6, $f2 /* 0332A0 800326A0 4500000C */ bc1f .L800326D4 -/* 0332A4 800326A4 00000000 */ nop +/* 0332A4 800326A4 00000000 */ nop /* 0332A8 800326A8 3C014004 */ li $at, 0x40040000 # 2.062500 /* 0332AC 800326AC 44815800 */ mtc1 $at, $f11 /* 0332B0 800326B0 44805000 */ mtc1 $zero, $f10 @@ -200,7 +200,7 @@ glabel func_800323E4 /* 0332BC 800326BC 462084A0 */ cvt.s.d $f18, $f16 /* 0332C0 800326C0 44059000 */ mfc1 $a1, $f18 /* 0332C4 800326C4 0C00C7D2 */ jal func_80031F48 -/* 0332C8 800326C8 00000000 */ nop +/* 0332C8 800326C8 00000000 */ nop /* 0332CC 800326CC 10000009 */ b .L800326F4 /* 0332D0 800326D0 8FBF0014 */ lw $ra, 0x14($sp) .L800326D4: @@ -210,10 +210,10 @@ glabel func_800323E4 /* 0332E0 800326E0 462042A0 */ cvt.s.d $f10, $f8 /* 0332E4 800326E4 44055000 */ mfc1 $a1, $f10 /* 0332E8 800326E8 0C00C7D2 */ jal func_80031F48 -/* 0332EC 800326EC 00000000 */ nop +/* 0332EC 800326EC 00000000 */ nop .L800326F0: /* 0332F0 800326F0 8FBF0014 */ lw $ra, 0x14($sp) .L800326F4: /* 0332F4 800326F4 27BD0028 */ addiu $sp, $sp, 0x28 /* 0332F8 800326F8 03E00008 */ jr $ra -/* 0332FC 800326FC 00000000 */ nop +/* 0332FC 800326FC 00000000 */ nop diff --git a/asm/non_matchings/code_80027D00/func_80032700.s b/asm/non_matchings/code_80027D00/func_80032700.s index 6423cc911..717e1a15d 100644 --- a/asm/non_matchings/code_80027D00/func_80032700.s +++ b/asm/non_matchings/code_80027D00/func_80032700.s @@ -1,7 +1,7 @@ glabel func_80032700 /* 033300 80032700 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 033304 80032704 AFBF0014 */ sw $ra, 0x14($sp) -/* 033308 80032708 0C009F40 */ jal func_80027D00 +/* 033308 80032708 0C009F40 */ jal get_player_index_for_player /* 03330C 8003270C AFA40018 */ sw $a0, 0x18($sp) /* 033310 80032710 8FA40018 */ lw $a0, 0x18($sp) /* 033314 80032714 44803800 */ mtc1 $zero, $f7 @@ -9,7 +9,7 @@ glabel func_80032700 /* 03331C 8003271C C484009C */ lwc1 $f4, 0x9c($a0) /* 033320 80032720 46002021 */ cvt.d.s $f0, $f4 /* 033324 80032724 4620303E */ c.le.d $f6, $f0 -/* 033328 80032728 00000000 */ nop +/* 033328 80032728 00000000 */ nop /* 03332C 8003272C 4502001C */ bc1fl .L800327A0 /* 033330 80032730 3C014008 */ lui $at, 0x4008 /* 033334 80032734 C4880214 */ lwc1 $f8, 0x214($a0) @@ -18,7 +18,7 @@ glabel func_80032700 /* 033340 80032740 460042A1 */ cvt.d.s $f10, $f8 /* 033344 80032744 46305482 */ mul.d $f18, $f10, $f16 /* 033348 80032748 4632003C */ c.lt.d $f0, $f18 -/* 03334C 8003274C 00000000 */ nop +/* 03334C 8003274C 00000000 */ nop /* 033350 80032750 45020013 */ bc1fl .L800327A0 /* 033354 80032754 3C014008 */ lui $at, 0x4008 /* 033358 80032758 948E0254 */ lhu $t6, 0x254($a0) @@ -51,15 +51,15 @@ glabel func_80032700 /* 0333C0 800327C0 24633010 */ addiu $v1, %lo(gKartAccelerationTables) # addiu $v1, $v1, 0x3010 /* 0333C4 800327C4 3C01800F */ lui $at, %hi(D_800EDB20) /* 0333C8 800327C8 4620403E */ c.le.d $f8, $f0 -/* 0333CC 800327CC 00000000 */ nop +/* 0333CC 800327CC 00000000 */ nop /* 0333D0 800327D0 45000015 */ bc1f .L80032828 -/* 0333D4 800327D4 00000000 */ nop +/* 0333D4 800327D4 00000000 */ nop /* 0333D8 800327D8 D42ADB20 */ ldc1 $f10, %lo(D_800EDB20)($at) /* 0333DC 800327DC 462A1402 */ mul.d $f16, $f2, $f10 /* 0333E0 800327E0 4630003C */ c.lt.d $f0, $f16 -/* 0333E4 800327E4 00000000 */ nop +/* 0333E4 800327E4 00000000 */ nop /* 0333E8 800327E8 4500000F */ bc1f .L80032828 -/* 0333EC 800327EC 00000000 */ nop +/* 0333EC 800327EC 00000000 */ nop /* 0333F0 800327F0 94880254 */ lhu $t0, 0x254($a0) /* 0333F4 800327F4 00084880 */ sll $t1, $t0, 2 /* 0333F8 800327F8 00695021 */ addu $t2, $v1, $t1 @@ -80,15 +80,15 @@ glabel func_80032700 /* 033430 80032830 3C01800F */ lui $at, %hi(D_800EDB30) /* 033434 80032834 46241182 */ mul.d $f6, $f2, $f4 /* 033438 80032838 4620303E */ c.le.d $f6, $f0 -/* 03343C 8003283C 00000000 */ nop +/* 03343C 8003283C 00000000 */ nop /* 033440 80032840 45000015 */ bc1f .L80032898 -/* 033444 80032844 00000000 */ nop +/* 033444 80032844 00000000 */ nop /* 033448 80032848 D428DB30 */ ldc1 $f8, %lo(D_800EDB30)($at) /* 03344C 8003284C 46281282 */ mul.d $f10, $f2, $f8 /* 033450 80032850 462A003C */ c.lt.d $f0, $f10 -/* 033454 80032854 00000000 */ nop +/* 033454 80032854 00000000 */ nop /* 033458 80032858 4500000F */ bc1f .L80032898 -/* 03345C 8003285C 00000000 */ nop +/* 03345C 8003285C 00000000 */ nop /* 033460 80032860 948C0254 */ lhu $t4, 0x254($a0) /* 033464 80032864 000C6880 */ sll $t5, $t4, 2 /* 033468 80032868 006D7021 */ addu $t6, $v1, $t5 @@ -109,15 +109,15 @@ glabel func_80032700 /* 0334A0 800328A0 3C01800F */ lui $at, %hi(D_800EDB40) /* 0334A4 800328A4 46321102 */ mul.d $f4, $f2, $f18 /* 0334A8 800328A8 4620203E */ c.le.d $f4, $f0 -/* 0334AC 800328AC 00000000 */ nop +/* 0334AC 800328AC 00000000 */ nop /* 0334B0 800328B0 45000015 */ bc1f .L80032908 -/* 0334B4 800328B4 00000000 */ nop +/* 0334B4 800328B4 00000000 */ nop /* 0334B8 800328B8 D426DB40 */ ldc1 $f6, %lo(D_800EDB40)($at) /* 0334BC 800328BC 46261202 */ mul.d $f8, $f2, $f6 /* 0334C0 800328C0 4628003C */ c.lt.d $f0, $f8 -/* 0334C4 800328C4 00000000 */ nop +/* 0334C4 800328C4 00000000 */ nop /* 0334C8 800328C8 4500000F */ bc1f .L80032908 -/* 0334CC 800328CC 00000000 */ nop +/* 0334CC 800328CC 00000000 */ nop /* 0334D0 800328D0 94980254 */ lhu $t8, 0x254($a0) /* 0334D4 800328D4 0018C880 */ sll $t9, $t8, 2 /* 0334D8 800328D8 00794021 */ addu $t0, $v1, $t9 @@ -138,15 +138,15 @@ glabel func_80032700 /* 033510 80032910 3C013FE0 */ lui $at, 0x3fe0 /* 033514 80032914 46301482 */ mul.d $f18, $f2, $f16 /* 033518 80032918 4620903E */ c.le.d $f18, $f0 -/* 03351C 8003291C 00000000 */ nop +/* 03351C 8003291C 00000000 */ nop /* 033520 80032920 45020018 */ bc1fl .L80032984 /* 033524 80032924 3C013FE0 */ li $at, 0x3FE00000 # 1.750000 /* 033528 80032928 44812800 */ mtc1 $at, $f5 /* 03352C 8003292C 44802000 */ mtc1 $zero, $f4 -/* 033530 80032930 00000000 */ nop +/* 033530 80032930 00000000 */ nop /* 033534 80032934 46241182 */ mul.d $f6, $f2, $f4 /* 033538 80032938 4626003C */ c.lt.d $f0, $f6 -/* 03353C 8003293C 00000000 */ nop +/* 03353C 8003293C 00000000 */ nop /* 033540 80032940 45020010 */ bc1fl .L80032984 /* 033544 80032944 3C013FE0 */ lui $at, 0x3fe0 /* 033548 80032948 948A0254 */ lhu $t2, 0x254($a0) @@ -170,15 +170,15 @@ glabel func_80032700 /* 03358C 8003298C 3C01800F */ lui $at, %hi(D_800EDB50) /* 033590 80032990 462A1402 */ mul.d $f16, $f2, $f10 /* 033594 80032994 4620803E */ c.le.d $f16, $f0 -/* 033598 80032998 00000000 */ nop +/* 033598 80032998 00000000 */ nop /* 03359C 8003299C 45000015 */ bc1f .L800329F4 -/* 0335A0 800329A0 00000000 */ nop +/* 0335A0 800329A0 00000000 */ nop /* 0335A4 800329A4 D432DB50 */ ldc1 $f18, %lo(D_800EDB50)($at) /* 0335A8 800329A8 46321102 */ mul.d $f4, $f2, $f18 /* 0335AC 800329AC 4624003C */ c.lt.d $f0, $f4 -/* 0335B0 800329B0 00000000 */ nop +/* 0335B0 800329B0 00000000 */ nop /* 0335B4 800329B4 4500000F */ bc1f .L800329F4 -/* 0335B8 800329B8 00000000 */ nop +/* 0335B8 800329B8 00000000 */ nop /* 0335BC 800329BC 948E0254 */ lhu $t6, 0x254($a0) /* 0335C0 800329C0 000E7880 */ sll $t7, $t6, 2 /* 0335C4 800329C4 006FC021 */ addu $t8, $v1, $t7 @@ -199,13 +199,13 @@ glabel func_80032700 /* 0335FC 800329FC 3C01800F */ lui $at, %hi(D_800EDB60) /* 033600 80032A00 46281282 */ mul.d $f10, $f2, $f8 /* 033604 80032A04 4620503E */ c.le.d $f10, $f0 -/* 033608 80032A08 00000000 */ nop +/* 033608 80032A08 00000000 */ nop /* 03360C 80032A0C 45020019 */ bc1fl .L80032A74 /* 033610 80032A10 3C014004 */ lui $at, 0x4004 # 2.0625 /* 033614 80032A14 D430DB60 */ ldc1 $f16, %lo(D_800EDB60)($at) /* 033618 80032A18 46301482 */ mul.d $f18, $f2, $f16 /* 03361C 80032A1C 4632003C */ c.lt.d $f0, $f18 -/* 033620 80032A20 00000000 */ nop +/* 033620 80032A20 00000000 */ nop /* 033624 80032A24 45020013 */ bc1fl .L80032A74 /* 033628 80032A28 3C014004 */ lui $at, 0x4004 # 2.0625 /* 03362C 80032A2C 94880254 */ lhu $t0, 0x254($a0) @@ -234,15 +234,15 @@ glabel func_80032700 /* 033684 80032A84 3C01800F */ lui $at, %hi(D_800EDB70) /* 033688 80032A88 46261202 */ mul.d $f8, $f2, $f6 /* 03368C 80032A8C 4620403E */ c.le.d $f8, $f0 -/* 033690 80032A90 00000000 */ nop +/* 033690 80032A90 00000000 */ nop /* 033694 80032A94 45000015 */ bc1f .L80032AEC -/* 033698 80032A98 00000000 */ nop +/* 033698 80032A98 00000000 */ nop /* 03369C 80032A9C D42ADB70 */ ldc1 $f10, %lo(D_800EDB70)($at) /* 0336A0 80032AA0 462A1402 */ mul.d $f16, $f2, $f10 /* 0336A4 80032AA4 4630003C */ c.lt.d $f0, $f16 -/* 0336A8 80032AA8 00000000 */ nop +/* 0336A8 80032AA8 00000000 */ nop /* 0336AC 80032AAC 4500000F */ bc1f .L80032AEC -/* 0336B0 80032AB0 00000000 */ nop +/* 0336B0 80032AB0 00000000 */ nop /* 0336B4 80032AB4 948C0254 */ lhu $t4, 0x254($a0) /* 0336B8 80032AB8 000C6880 */ sll $t5, $t4, 2 /* 0336BC 80032ABC 006D7021 */ addu $t6, $v1, $t5 @@ -265,15 +265,15 @@ glabel func_80032700 /* 0336FC 80032AFC 46241182 */ mul.d $f6, $f2, $f4 /* 033700 80032B00 3C0F8019 */ lui $t7, %hi(gRaceFrameCounter) # $t7, 0x8019 /* 033704 80032B04 4620303E */ c.le.d $f6, $f0 -/* 033708 80032B08 00000000 */ nop +/* 033708 80032B08 00000000 */ nop /* 03370C 80032B0C 45000015 */ bc1f .L80032B64 -/* 033710 80032B10 00000000 */ nop +/* 033710 80032B10 00000000 */ nop /* 033714 80032B14 D428DB80 */ ldc1 $f8, %lo(D_800EDB80)($at) /* 033718 80032B18 46281282 */ mul.d $f10, $f2, $f8 /* 03371C 80032B1C 462A003C */ c.lt.d $f0, $f10 -/* 033720 80032B20 00000000 */ nop +/* 033720 80032B20 00000000 */ nop /* 033724 80032B24 4500000F */ bc1f .L80032B64 -/* 033728 80032B28 00000000 */ nop +/* 033728 80032B28 00000000 */ nop /* 03372C 80032B2C 94980254 */ lhu $t8, 0x254($a0) /* 033730 80032B30 0018C880 */ sll $t9, $t8, 2 /* 033734 80032B34 00794021 */ addu $t0, $v1, $t9 @@ -297,13 +297,13 @@ glabel func_80032700 /* 033778 80032B78 0338C821 */ addu $t9, $t9, $t8 /* 03377C 80032B7C 3C08800E */ lui $t0, %hi(gModeSelection) # $t0, 0x800e /* 033780 80032B80 4620203E */ c.le.d $f4, $f0 -/* 033784 80032B84 00000000 */ nop +/* 033784 80032B84 00000000 */ nop /* 033788 80032B88 4500000F */ bc1f .L80032BC8 -/* 03378C 80032B8C 00000000 */ nop +/* 03378C 80032B8C 00000000 */ nop /* 033790 80032B90 4622003E */ c.le.d $f0, $f2 -/* 033794 80032B94 00000000 */ nop +/* 033794 80032B94 00000000 */ nop /* 033798 80032B98 4500000B */ bc1f .L80032BC8 -/* 03379C 80032B9C 00000000 */ nop +/* 03379C 80032B9C 00000000 */ nop /* 0337A0 80032BA0 948A0254 */ lhu $t2, 0x254($a0) /* 0337A4 80032BA4 000A5880 */ sll $t3, $t2, 2 /* 0337A8 80032BA8 006B6021 */ addu $t4, $v1, $t3 @@ -330,12 +330,12 @@ glabel func_80032700 .L80032BF8: /* 0337F8 80032BF8 0062082A */ slt $at, $v1, $v0 /* 0337FC 80032BFC 1020000B */ beqz $at, .L80032C2C -/* 033800 80032C00 00000000 */ nop +/* 033800 80032C00 00000000 */ nop /* 033804 80032C04 84890044 */ lh $t1, 0x44($a0) /* 033808 80032C08 24010020 */ li $at, 32 /* 03380C 80032C0C 312A0020 */ andi $t2, $t1, 0x20 /* 033810 80032C10 11410006 */ beq $t2, $at, .L80032C2C -/* 033814 80032C14 00000000 */ nop +/* 033814 80032C14 00000000 */ nop /* 033818 80032C18 8C8B000C */ lw $t3, 0xc($a0) /* 03381C 80032C1C 3C030200 */ lui $v1, 0x200 /* 033820 80032C20 01636025 */ or $t4, $t3, $v1 @@ -348,7 +348,7 @@ glabel func_80032700 /* 033838 80032C38 C484009C */ lwc1 $f4, 0x9c($a0) /* 03383C 80032C3C 46083282 */ mul.s $f10, $f6, $f8 /* 033840 80032C40 4604503E */ c.le.s $f10, $f4 -/* 033844 80032C44 00000000 */ nop +/* 033844 80032C44 00000000 */ nop /* 033848 80032C48 4502000D */ bc1fl .L80032C80 /* 03384C 80032C4C C480009C */ lwc1 $f0, 0x9c($a0) /* 033850 80032C50 8C82000C */ lw $v0, 0xc($a0) @@ -376,4 +376,4 @@ glabel func_80032700 /* 0338A0 80032CA0 8FBF0014 */ lw $ra, 0x14($sp) /* 0338A4 80032CA4 27BD0018 */ addiu $sp, $sp, 0x18 /* 0338A8 80032CA8 03E00008 */ jr $ra -/* 0338AC 80032CAC 00000000 */ nop +/* 0338AC 80032CAC 00000000 */ nop diff --git a/asm/non_matchings/code_80027D00/func_80032D94.s b/asm/non_matchings/code_80027D00/func_80032D94.s index 5848190cf..58dc4dc83 100644 --- a/asm/non_matchings/code_80027D00/func_80032D94.s +++ b/asm/non_matchings/code_80027D00/func_80032D94.s @@ -1,7 +1,7 @@ glabel func_80032D94 /* 033994 80032D94 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 033998 80032D98 AFBF0014 */ sw $ra, 0x14($sp) -/* 03399C 80032D9C 0C009F40 */ jal func_80027D00 +/* 03399C 80032D9C 0C009F40 */ jal get_player_index_for_player /* 0339A0 80032DA0 AFA40018 */ sw $a0, 0x18($sp) /* 0339A4 80032DA4 8FA40018 */ lw $a0, 0x18($sp) /* 0339A8 80032DA8 44802800 */ mtc1 $zero, $f5 @@ -9,18 +9,18 @@ glabel func_80032D94 /* 0339B0 80032DB0 C48C009C */ lwc1 $f12, 0x9c($a0) /* 0339B4 80032DB4 46006021 */ cvt.d.s $f0, $f12 /* 0339B8 80032DB8 4620203E */ c.le.d $f4, $f0 -/* 0339BC 80032DBC 00000000 */ nop +/* 0339BC 80032DBC 00000000 */ nop /* 0339C0 80032DC0 4500001A */ bc1f .L80032E2C -/* 0339C4 80032DC4 00000000 */ nop +/* 0339C4 80032DC4 00000000 */ nop /* 0339C8 80032DC8 C4860214 */ lwc1 $f6, 0x214($a0) /* 0339CC 80032DCC 3C01800F */ lui $at, %hi(D_800EDBA8) /* 0339D0 80032DD0 D42ADBA8 */ ldc1 $f10, %lo(D_800EDBA8)($at) /* 0339D4 80032DD4 46003221 */ cvt.d.s $f8, $f6 /* 0339D8 80032DD8 462A4402 */ mul.d $f16, $f8, $f10 /* 0339DC 80032DDC 4630003C */ c.lt.d $f0, $f16 -/* 0339E0 80032DE0 00000000 */ nop +/* 0339E0 80032DE0 00000000 */ nop /* 0339E4 80032DE4 45000011 */ bc1f .L80032E2C -/* 0339E8 80032DE8 00000000 */ nop +/* 0339E8 80032DE8 00000000 */ nop /* 0339EC 80032DEC 948E0254 */ lhu $t6, 0x254($a0) /* 0339F0 80032DF0 3C02800E */ lui $v0, %hi(gKartAccelerationTables) # $v0, 0x800e /* 0339F4 80032DF4 24423010 */ addiu $v0, %lo(gKartAccelerationTables) # addiu $v0, $v0, 0x3010 @@ -49,15 +49,15 @@ glabel func_80032D94 /* 033A4C 80032E4C 24423010 */ addiu $v0, %lo(gKartAccelerationTables) # addiu $v0, $v0, 0x3010 /* 033A50 80032E50 3C01800F */ lui $at, %hi(D_800EDBC8) /* 033A54 80032E54 4620203E */ c.le.d $f4, $f0 -/* 033A58 80032E58 00000000 */ nop +/* 033A58 80032E58 00000000 */ nop /* 033A5C 80032E5C 45000015 */ bc1f .L80032EB4 -/* 033A60 80032E60 00000000 */ nop +/* 033A60 80032E60 00000000 */ nop /* 033A64 80032E64 D426DBC8 */ ldc1 $f6, %lo(D_800EDBC8)($at) /* 033A68 80032E68 46261202 */ mul.d $f8, $f2, $f6 /* 033A6C 80032E6C 4628003C */ c.lt.d $f0, $f8 -/* 033A70 80032E70 00000000 */ nop +/* 033A70 80032E70 00000000 */ nop /* 033A74 80032E74 4500000F */ bc1f .L80032EB4 -/* 033A78 80032E78 00000000 */ nop +/* 033A78 80032E78 00000000 */ nop /* 033A7C 80032E7C 94880254 */ lhu $t0, 0x254($a0) /* 033A80 80032E80 C4880214 */ lwc1 $f8, 0x214($a0) /* 033A84 80032E84 00084880 */ sll $t1, $t0, 2 @@ -78,15 +78,15 @@ glabel func_80032D94 /* 033ABC 80032EBC 3C01800F */ lui $at, %hi(D_800EDBD8) /* 033AC0 80032EC0 462A1402 */ mul.d $f16, $f2, $f10 /* 033AC4 80032EC4 4620803E */ c.le.d $f16, $f0 -/* 033AC8 80032EC8 00000000 */ nop +/* 033AC8 80032EC8 00000000 */ nop /* 033ACC 80032ECC 45000015 */ bc1f .L80032F24 -/* 033AD0 80032ED0 00000000 */ nop +/* 033AD0 80032ED0 00000000 */ nop /* 033AD4 80032ED4 D432DBD8 */ ldc1 $f18, %lo(D_800EDBD8)($at) /* 033AD8 80032ED8 46321102 */ mul.d $f4, $f2, $f18 /* 033ADC 80032EDC 4624003C */ c.lt.d $f0, $f4 -/* 033AE0 80032EE0 00000000 */ nop +/* 033AE0 80032EE0 00000000 */ nop /* 033AE4 80032EE4 4500000F */ bc1f .L80032F24 -/* 033AE8 80032EE8 00000000 */ nop +/* 033AE8 80032EE8 00000000 */ nop /* 033AEC 80032EEC 948C0254 */ lhu $t4, 0x254($a0) /* 033AF0 80032EF0 C4840214 */ lwc1 $f4, 0x214($a0) /* 033AF4 80032EF4 000C6880 */ sll $t5, $t4, 2 @@ -107,15 +107,15 @@ glabel func_80032D94 /* 033B2C 80032F2C 3C01800F */ lui $at, %hi(D_800EDBE8) /* 033B30 80032F30 46261202 */ mul.d $f8, $f2, $f6 /* 033B34 80032F34 4620403E */ c.le.d $f8, $f0 -/* 033B38 80032F38 00000000 */ nop +/* 033B38 80032F38 00000000 */ nop /* 033B3C 80032F3C 45000015 */ bc1f .L80032F94 -/* 033B40 80032F40 00000000 */ nop +/* 033B40 80032F40 00000000 */ nop /* 033B44 80032F44 D42ADBE8 */ ldc1 $f10, %lo(D_800EDBE8)($at) /* 033B48 80032F48 462A1402 */ mul.d $f16, $f2, $f10 /* 033B4C 80032F4C 4630003C */ c.lt.d $f0, $f16 -/* 033B50 80032F50 00000000 */ nop +/* 033B50 80032F50 00000000 */ nop /* 033B54 80032F54 4500000F */ bc1f .L80032F94 -/* 033B58 80032F58 00000000 */ nop +/* 033B58 80032F58 00000000 */ nop /* 033B5C 80032F5C 94980254 */ lhu $t8, 0x254($a0) /* 033B60 80032F60 C4900214 */ lwc1 $f16, 0x214($a0) /* 033B64 80032F64 0018C880 */ sll $t9, $t8, 2 @@ -136,15 +136,15 @@ glabel func_80032D94 /* 033B9C 80032F9C 3C013FE0 */ lui $at, 0x3fe0 /* 033BA0 80032FA0 46321102 */ mul.d $f4, $f2, $f18 /* 033BA4 80032FA4 4620203E */ c.le.d $f4, $f0 -/* 033BA8 80032FA8 00000000 */ nop +/* 033BA8 80032FA8 00000000 */ nop /* 033BAC 80032FAC 45020018 */ bc1fl .L80033010 /* 033BB0 80032FB0 3C013FE0 */ li $at, 0x3FE00000 # 1.750000 /* 033BB4 80032FB4 44813800 */ mtc1 $at, $f7 /* 033BB8 80032FB8 44803000 */ mtc1 $zero, $f6 -/* 033BBC 80032FBC 00000000 */ nop +/* 033BBC 80032FBC 00000000 */ nop /* 033BC0 80032FC0 46261202 */ mul.d $f8, $f2, $f6 /* 033BC4 80032FC4 4628003C */ c.lt.d $f0, $f8 -/* 033BC8 80032FC8 00000000 */ nop +/* 033BC8 80032FC8 00000000 */ nop /* 033BCC 80032FCC 45020010 */ bc1fl .L80033010 /* 033BD0 80032FD0 3C013FE0 */ lui $at, 0x3fe0 /* 033BD4 80032FD4 948A0254 */ lhu $t2, 0x254($a0) @@ -168,15 +168,15 @@ glabel func_80032D94 /* 033C18 80033018 3C01800F */ lui $at, %hi(D_800EDBF8) /* 033C1C 8003301C 462A1402 */ mul.d $f16, $f2, $f10 /* 033C20 80033020 4620803E */ c.le.d $f16, $f0 -/* 033C24 80033024 00000000 */ nop +/* 033C24 80033024 00000000 */ nop /* 033C28 80033028 45000015 */ bc1f .L80033080 -/* 033C2C 8003302C 00000000 */ nop +/* 033C2C 8003302C 00000000 */ nop /* 033C30 80033030 D432DBF8 */ ldc1 $f18, %lo(D_800EDBF8)($at) /* 033C34 80033034 46321102 */ mul.d $f4, $f2, $f18 /* 033C38 80033038 4624003C */ c.lt.d $f0, $f4 -/* 033C3C 8003303C 00000000 */ nop +/* 033C3C 8003303C 00000000 */ nop /* 033C40 80033040 4500000F */ bc1f .L80033080 -/* 033C44 80033044 00000000 */ nop +/* 033C44 80033044 00000000 */ nop /* 033C48 80033048 948E0254 */ lhu $t6, 0x254($a0) /* 033C4C 8003304C C4840214 */ lwc1 $f4, 0x214($a0) /* 033C50 80033050 000E7880 */ sll $t7, $t6, 2 @@ -197,15 +197,15 @@ glabel func_80032D94 /* 033C88 80033088 3C01800F */ lui $at, %hi(D_800EDC08) /* 033C8C 8003308C 46261202 */ mul.d $f8, $f2, $f6 /* 033C90 80033090 4620403E */ c.le.d $f8, $f0 -/* 033C94 80033094 00000000 */ nop +/* 033C94 80033094 00000000 */ nop /* 033C98 80033098 45000015 */ bc1f .L800330F0 -/* 033C9C 8003309C 00000000 */ nop +/* 033C9C 8003309C 00000000 */ nop /* 033CA0 800330A0 D42ADC08 */ ldc1 $f10, %lo(D_800EDC08)($at) /* 033CA4 800330A4 462A1402 */ mul.d $f16, $f2, $f10 /* 033CA8 800330A8 4630003C */ c.lt.d $f0, $f16 -/* 033CAC 800330AC 00000000 */ nop +/* 033CAC 800330AC 00000000 */ nop /* 033CB0 800330B0 4500000F */ bc1f .L800330F0 -/* 033CB4 800330B4 00000000 */ nop +/* 033CB4 800330B4 00000000 */ nop /* 033CB8 800330B8 94880254 */ lhu $t0, 0x254($a0) /* 033CBC 800330BC C4900214 */ lwc1 $f16, 0x214($a0) /* 033CC0 800330C0 00084880 */ sll $t1, $t0, 2 @@ -226,15 +226,15 @@ glabel func_80032D94 /* 033CF8 800330F8 3C01800F */ lui $at, %hi(D_800EDC18) /* 033CFC 800330FC 46321102 */ mul.d $f4, $f2, $f18 /* 033D00 80033100 4620203E */ c.le.d $f4, $f0 -/* 033D04 80033104 00000000 */ nop +/* 033D04 80033104 00000000 */ nop /* 033D08 80033108 45000017 */ bc1f .L80033168 -/* 033D0C 8003310C 00000000 */ nop +/* 033D0C 8003310C 00000000 */ nop /* 033D10 80033110 D426DC18 */ ldc1 $f6, %lo(D_800EDC18)($at) /* 033D14 80033114 46261202 */ mul.d $f8, $f2, $f6 /* 033D18 80033118 4628003C */ c.lt.d $f0, $f8 -/* 033D1C 8003311C 00000000 */ nop +/* 033D1C 8003311C 00000000 */ nop /* 033D20 80033120 45000011 */ bc1f .L80033168 -/* 033D24 80033124 00000000 */ nop +/* 033D24 80033124 00000000 */ nop /* 033D28 80033128 948C0254 */ lhu $t4, 0x254($a0) /* 033D2C 8003312C 3C01800F */ lui $at, %hi(D_800EDC20) /* 033D30 80033130 D42EDC20 */ ldc1 $f14, %lo(D_800EDC20)($at) @@ -259,15 +259,15 @@ glabel func_80032D94 /* 033D78 80033178 3C01800F */ lui $at, %hi(D_800EDC38) /* 033D7C 8003317C 462A1402 */ mul.d $f16, $f2, $f10 /* 033D80 80033180 4620803E */ c.le.d $f16, $f0 -/* 033D84 80033184 00000000 */ nop +/* 033D84 80033184 00000000 */ nop /* 033D88 80033188 45000015 */ bc1f .L800331E0 -/* 033D8C 8003318C 00000000 */ nop +/* 033D8C 8003318C 00000000 */ nop /* 033D90 80033190 D432DC38 */ ldc1 $f18, %lo(D_800EDC38)($at) /* 033D94 80033194 46321102 */ mul.d $f4, $f2, $f18 /* 033D98 80033198 4624003C */ c.lt.d $f0, $f4 -/* 033D9C 8003319C 00000000 */ nop +/* 033D9C 8003319C 00000000 */ nop /* 033DA0 800331A0 4500000F */ bc1f .L800331E0 -/* 033DA4 800331A4 00000000 */ nop +/* 033DA4 800331A4 00000000 */ nop /* 033DA8 800331A8 94980254 */ lhu $t8, 0x254($a0) /* 033DAC 800331AC C4840214 */ lwc1 $f4, 0x214($a0) /* 033DB0 800331B0 0018C880 */ sll $t9, $t8, 2 @@ -287,11 +287,11 @@ glabel func_80032D94 /* 033DE4 800331E4 D426DC40 */ ldc1 $f6, %lo(D_800EDC40)($at) /* 033DE8 800331E8 46261202 */ mul.d $f8, $f2, $f6 /* 033DEC 800331EC 4620403E */ c.le.d $f8, $f0 -/* 033DF0 800331F0 00000000 */ nop +/* 033DF0 800331F0 00000000 */ nop /* 033DF4 800331F4 45020011 */ bc1fl .L8003323C /* 033DF8 800331F8 44800000 */ mtc1 $zero, $f0 /* 033DFC 800331FC 4622003E */ c.le.d $f0, $f2 -/* 033E00 80033200 00000000 */ nop +/* 033E00 80033200 00000000 */ nop /* 033E04 80033204 4502000D */ bc1fl .L8003323C /* 033E08 80033208 44800000 */ mtc1 $zero, $f0 /* 033E0C 8003320C 948A0254 */ lhu $t2, 0x254($a0) @@ -307,21 +307,21 @@ glabel func_80032D94 /* 033E34 80033234 C48C009C */ lwc1 $f12, 0x9c($a0) /* 033E38 80033238 44800000 */ mtc1 $zero, $f0 .L8003323C: -/* 033E3C 8003323C 00000000 */ nop +/* 033E3C 8003323C 00000000 */ nop /* 033E40 80033240 4600603C */ c.lt.s $f12, $f0 -/* 033E44 80033244 00000000 */ nop +/* 033E44 80033244 00000000 */ nop /* 033E48 80033248 45000003 */ bc1f .L80033258 -/* 033E4C 8003324C 00000000 */ nop +/* 033E4C 8003324C 00000000 */ nop /* 033E50 80033250 E480009C */ swc1 $f0, 0x9c($a0) /* 033E54 80033254 C48C009C */ lwc1 $f12, 0x9c($a0) .L80033258: /* 033E58 80033258 460C6202 */ mul.s $f8, $f12, $f12 /* 033E5C 8003325C 3C0141C8 */ li $at, 0x41C80000 # 25.000000 /* 033E60 80033260 44815000 */ mtc1 $at, $f10 -/* 033E64 80033264 00000000 */ nop +/* 033E64 80033264 00000000 */ nop /* 033E68 80033268 460A4403 */ div.s $f16, $f8, $f10 /* 033E6C 8003326C E4900098 */ swc1 $f16, 0x98($a0) /* 033E70 80033270 8FBF0014 */ lw $ra, 0x14($sp) /* 033E74 80033274 27BD0018 */ addiu $sp, $sp, 0x18 /* 033E78 80033278 03E00008 */ jr $ra -/* 033E7C 8003327C 00000000 */ nop +/* 033E7C 8003327C 00000000 */ nop diff --git a/asm/non_matchings/code_80027D00/func_800382DC.s b/asm/non_matchings/code_80027D00/func_800382DC.s index accd424ca..062e8697f 100644 --- a/asm/non_matchings/code_80027D00/func_800382DC.s +++ b/asm/non_matchings/code_80027D00/func_800382DC.s @@ -10,14 +10,14 @@ glabel func_800382DC /* 038EFC 800382FC 10410060 */ beq $v0, $at, .L80038480 /* 038F00 80038300 24010003 */ li $at, 3 /* 038F04 80038304 1041006C */ beq $v0, $at, .L800384B8 -/* 038F08 80038308 3C04800E */ lui $a0, %hi(D_800DC4DC) # 0x800e +/* 038F08 80038308 3C04800E */ lui $a0, %hi(gPlayerOne) # 0x800e /* 038F0C 8003830C 10000086 */ b .L80038528 /* 038F10 80038310 8FBF0014 */ lw $ra, 0x14($sp) .L80038314: /* 038F14 80038314 3C02800E */ lui $v0, %hi(gModeSelection) # $v0, 0x800e /* 038F18 80038318 8C42C53C */ lw $v0, %lo(gModeSelection)($v0) -/* 038F1C 8003831C 3C04800E */ lui $a0, %hi(D_800DC4DC) # $a0, 0x800e -/* 038F20 80038320 3C05800E */ lui $a1, %hi(D_800DC4BC) # $a1, 0x800e +/* 038F1C 8003831C 3C04800E */ lui $a0, %hi(gPlayerOne) # $a0, 0x800e +/* 038F20 80038320 3C05800E */ lui $a1, %hi(gControllerOne) # $a1, 0x800e /* 038F24 80038324 10400006 */ beqz $v0, .L80038340 /* 038F28 80038328 00003025 */ move $a2, $zero /* 038F2C 8003832C 24030001 */ li $v1, 1 @@ -26,23 +26,23 @@ glabel func_800382DC /* 038F38 80038338 1000007B */ b .L80038528 /* 038F3C 8003833C 8FBF0014 */ lw $ra, 0x14($sp) .L80038340: -/* 038F40 80038340 8C84C4DC */ lw $a0, %lo(D_800DC4DC)($a0) +/* 038F40 80038340 8C84C4DC */ lw $a0, %lo(gPlayerOne)($a0) /* 038F44 80038344 0C00E06B */ jal func_800381AC -/* 038F48 80038348 8CA5C4BC */ lw $a1, %lo(D_800DC4BC)($a1) +/* 038F48 80038348 8CA5C4BC */ lw $a1, %lo(gControllerOne)($a1) /* 038F4C 8003834C 10000076 */ b .L80038528 /* 038F50 80038350 8FBF0014 */ lw $ra, 0x14($sp) .L80038354: /* 038F54 80038354 95CEF890 */ lhu $t6, %lo(D_8015F890)($t6) -/* 038F58 80038358 3C05800E */ lui $a1, %hi(D_800DC4BC) # $a1, 0x800e +/* 038F58 80038358 3C05800E */ lui $a1, %hi(gControllerOne) # $a1, 0x800e /* 038F5C 8003835C 00003025 */ move $a2, $zero /* 038F60 80038360 106E0021 */ beq $v1, $t6, .L800383E8 -/* 038F64 80038364 3C04800E */ lui $a0, %hi(D_800DC4DC) # 0x800e -/* 038F68 80038368 3C04800E */ lui $a0, %hi(D_800DC4DC) # $a0, 0x800e -/* 038F6C 8003836C 8C84C4DC */ lw $a0, %lo(D_800DC4DC)($a0) +/* 038F64 80038364 3C04800E */ lui $a0, %hi(gPlayerOne) # 0x800e +/* 038F68 80038368 3C04800E */ lui $a0, %hi(gPlayerOne) # $a0, 0x800e +/* 038F6C 8003836C 8C84C4DC */ lw $a0, %lo(gPlayerOne)($a0) /* 038F70 80038370 0C00E06B */ jal func_800381AC -/* 038F74 80038374 8CA5C4BC */ lw $a1, %lo(D_800DC4BC)($a1) -/* 038F78 80038378 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e -/* 038F7C 8003837C 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) +/* 038F74 80038374 8CA5C4BC */ lw $a1, %lo(gControllerOne)($a1) +/* 038F78 80038378 3C04800E */ lui $a0, %hi(gPlayerTwo) # $a0, 0x800e +/* 038F7C 8003837C 8C84C4E0 */ lw $a0, %lo(gPlayerTwo)($a0) /* 038F80 80038380 24010100 */ li $at, 256 /* 038F84 80038384 94820000 */ lhu $v0, ($a0) /* 038F88 80038388 304F0100 */ andi $t7, $v0, 0x100 @@ -50,13 +50,13 @@ glabel func_800382DC /* 038F90 80038390 30580800 */ andi $t8, $v0, 0x800 /* 038F94 80038394 24010800 */ li $at, 2048 /* 038F98 80038398 13010004 */ beq $t8, $at, .L800383AC -/* 038F9C 8003839C 3C05800E */ lui $a1, %hi(D_800DC4D0) # $a1, 0x800e -/* 038FA0 800383A0 8CA5C4D0 */ lw $a1, %lo(D_800DC4D0)($a1) +/* 038F9C 8003839C 3C05800E */ lui $a1, %hi(gControllerSix) # $a1, 0x800e +/* 038FA0 800383A0 8CA5C4D0 */ lw $a1, %lo(gControllerSix)($a1) /* 038FA4 800383A4 0C00E06B */ jal func_800381AC /* 038FA8 800383A8 24060001 */ li $a2, 1 .L800383AC: -/* 038FAC 800383AC 3C04800E */ lui $a0, %hi(D_800DC4E4) # $a0, 0x800e -/* 038FB0 800383B0 8C84C4E4 */ lw $a0, %lo(D_800DC4E4)($a0) +/* 038FAC 800383AC 3C04800E */ lui $a0, %hi(gPlayerThree) # $a0, 0x800e +/* 038FB0 800383B0 8C84C4E4 */ lw $a0, %lo(gPlayerThree)($a0) /* 038FB4 800383B4 24010100 */ li $at, 256 /* 038FB8 800383B8 94820000 */ lhu $v0, ($a0) /* 038FBC 800383BC 30590100 */ andi $t9, $v0, 0x100 @@ -64,26 +64,26 @@ glabel func_800382DC /* 038FC4 800383C4 30480800 */ andi $t0, $v0, 0x800 /* 038FC8 800383C8 24010800 */ li $at, 2048 /* 038FCC 800383CC 11010055 */ beq $t0, $at, .L80038524 -/* 038FD0 800383D0 3C05800E */ lui $a1, %hi(D_800DC4D4) # $a1, 0x800e -/* 038FD4 800383D4 8CA5C4D4 */ lw $a1, %lo(D_800DC4D4)($a1) +/* 038FD0 800383D0 3C05800E */ lui $a1, %hi(gControllerSeven) # $a1, 0x800e +/* 038FD4 800383D4 8CA5C4D4 */ lw $a1, %lo(gControllerSeven)($a1) /* 038FD8 800383D8 0C00E06B */ jal func_800381AC /* 038FDC 800383DC 24060002 */ li $a2, 2 /* 038FE0 800383E0 10000051 */ b .L80038528 /* 038FE4 800383E4 8FBF0014 */ lw $ra, 0x14($sp) .L800383E8: -/* 038FE8 800383E8 8C84C4DC */ lw $a0, %lo(D_800DC4DC)($a0) # -0x3b24($a0) +/* 038FE8 800383E8 8C84C4DC */ lw $a0, %lo(gPlayerOne)($a0) # -0x3b24($a0) /* 038FEC 800383EC 24010800 */ li $at, 2048 -/* 038FF0 800383F0 3C05800E */ lui $a1, %hi(D_800DC4D8) # $a1, 0x800e +/* 038FF0 800383F0 3C05800E */ lui $a1, %hi(gControllerEight) # $a1, 0x800e /* 038FF4 800383F4 94890000 */ lhu $t1, ($a0) /* 038FF8 800383F8 00003025 */ move $a2, $zero /* 038FFC 800383FC 312A0800 */ andi $t2, $t1, 0x800 /* 039000 80038400 11410003 */ beq $t2, $at, .L80038410 -/* 039004 80038404 00000000 */ nop +/* 039004 80038404 00000000 */ nop /* 039008 80038408 0C00E06B */ jal func_800381AC -/* 03900C 8003840C 8CA5C4D8 */ lw $a1, %lo(D_800DC4D8)($a1) +/* 03900C 8003840C 8CA5C4D8 */ lw $a1, %lo(gControllerEight)($a1) .L80038410: -/* 039010 80038410 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e -/* 039014 80038414 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) +/* 039010 80038410 3C04800E */ lui $a0, %hi(gPlayerTwo) # $a0, 0x800e +/* 039014 80038414 8C84C4E0 */ lw $a0, %lo(gPlayerTwo)($a0) /* 039018 80038418 24010100 */ li $at, 256 /* 03901C 8003841C 94820000 */ lhu $v0, ($a0) /* 039020 80038420 304B0100 */ andi $t3, $v0, 0x100 @@ -91,13 +91,13 @@ glabel func_800382DC /* 039028 80038428 304C0800 */ andi $t4, $v0, 0x800 /* 03902C 8003842C 24010800 */ li $at, 2048 /* 039030 80038430 11810004 */ beq $t4, $at, .L80038444 -/* 039034 80038434 3C05800E */ lui $a1, %hi(D_800DC4D0) # $a1, 0x800e -/* 039038 80038438 8CA5C4D0 */ lw $a1, %lo(D_800DC4D0)($a1) +/* 039034 80038434 3C05800E */ lui $a1, %hi(gControllerSix) # $a1, 0x800e +/* 039038 80038438 8CA5C4D0 */ lw $a1, %lo(gControllerSix)($a1) /* 03903C 8003843C 0C00E06B */ jal func_800381AC /* 039040 80038440 24060001 */ li $a2, 1 .L80038444: -/* 039044 80038444 3C04800E */ lui $a0, %hi(D_800DC4E4) # $a0, 0x800e -/* 039048 80038448 8C84C4E4 */ lw $a0, %lo(D_800DC4E4)($a0) +/* 039044 80038444 3C04800E */ lui $a0, %hi(gPlayerThree) # $a0, 0x800e +/* 039048 80038448 8C84C4E4 */ lw $a0, %lo(gPlayerThree)($a0) /* 03904C 8003844C 24010100 */ li $at, 256 /* 039050 80038450 94820000 */ lhu $v0, ($a0) /* 039054 80038454 304D0100 */ andi $t5, $v0, 0x100 @@ -105,53 +105,53 @@ glabel func_800382DC /* 03905C 8003845C 304E0800 */ andi $t6, $v0, 0x800 /* 039060 80038460 24010800 */ li $at, 2048 /* 039064 80038464 11C1002F */ beq $t6, $at, .L80038524 -/* 039068 80038468 3C05800E */ lui $a1, %hi(D_800DC4D4) # $a1, 0x800e -/* 03906C 8003846C 8CA5C4D4 */ lw $a1, %lo(D_800DC4D4)($a1) +/* 039068 80038468 3C05800E */ lui $a1, %hi(gControllerSeven) # $a1, 0x800e +/* 03906C 8003846C 8CA5C4D4 */ lw $a1, %lo(gControllerSeven)($a1) /* 039070 80038470 0C00E06B */ jal func_800381AC /* 039074 80038474 24060002 */ li $a2, 2 /* 039078 80038478 1000002B */ b .L80038528 /* 03907C 8003847C 8FBF0014 */ lw $ra, 0x14($sp) .L80038480: -/* 039080 80038480 3C04800E */ lui $a0, %hi(D_800DC4DC) # $a0, 0x800e -/* 039084 80038484 3C05800E */ lui $a1, %hi(D_800DC4BC) # $a1, 0x800e -/* 039088 80038488 8CA5C4BC */ lw $a1, %lo(D_800DC4BC)($a1) -/* 03908C 8003848C 8C84C4DC */ lw $a0, %lo(D_800DC4DC)($a0) +/* 039080 80038480 3C04800E */ lui $a0, %hi(gPlayerOne) # $a0, 0x800e +/* 039084 80038484 3C05800E */ lui $a1, %hi(gControllerOne) # $a1, 0x800e +/* 039088 80038488 8CA5C4BC */ lw $a1, %lo(gControllerOne)($a1) +/* 03908C 8003848C 8C84C4DC */ lw $a0, %lo(gPlayerOne)($a0) /* 039090 80038490 0C00E06B */ jal func_800381AC /* 039094 80038494 00003025 */ move $a2, $zero -/* 039098 80038498 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e -/* 03909C 8003849C 3C05800E */ lui $a1, %hi(D_800DC4C0) # $a1, 0x800e -/* 0390A0 800384A0 8CA5C4C0 */ lw $a1, %lo(D_800DC4C0)($a1) -/* 0390A4 800384A4 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) +/* 039098 80038498 3C04800E */ lui $a0, %hi(gPlayerTwo) # $a0, 0x800e +/* 03909C 8003849C 3C05800E */ lui $a1, %hi(gControllerTwo) # $a1, 0x800e +/* 0390A0 800384A0 8CA5C4C0 */ lw $a1, %lo(gControllerTwo)($a1) +/* 0390A4 800384A4 8C84C4E0 */ lw $a0, %lo(gPlayerTwo)($a0) /* 0390A8 800384A8 0C00E06B */ jal func_800381AC /* 0390AC 800384AC 24060001 */ li $a2, 1 /* 0390B0 800384B0 1000001D */ b .L80038528 /* 0390B4 800384B4 8FBF0014 */ lw $ra, 0x14($sp) .L800384B8: -/* 0390B8 800384B8 3C05800E */ lui $a1, %hi(D_800DC4BC) # $a1, 0x800e -/* 0390BC 800384BC 8CA5C4BC */ lw $a1, %lo(D_800DC4BC)($a1) -/* 0390C0 800384C0 8C84C4DC */ lw $a0, %lo(D_800DC4DC)($a0) # -0x3b24($a0) +/* 0390B8 800384B8 3C05800E */ lui $a1, %hi(gControllerOne) # $a1, 0x800e +/* 0390BC 800384BC 8CA5C4BC */ lw $a1, %lo(gControllerOne)($a1) +/* 0390C0 800384C0 8C84C4DC */ lw $a0, %lo(gPlayerOne)($a0) # -0x3b24($a0) /* 0390C4 800384C4 0C00E06B */ jal func_800381AC /* 0390C8 800384C8 00003025 */ move $a2, $zero -/* 0390CC 800384CC 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e -/* 0390D0 800384D0 3C05800E */ lui $a1, %hi(D_800DC4C0) # $a1, 0x800e -/* 0390D4 800384D4 8CA5C4C0 */ lw $a1, %lo(D_800DC4C0)($a1) -/* 0390D8 800384D8 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) +/* 0390CC 800384CC 3C04800E */ lui $a0, %hi(gPlayerTwo) # $a0, 0x800e +/* 0390D0 800384D0 3C05800E */ lui $a1, %hi(gControllerTwo) # $a1, 0x800e +/* 0390D4 800384D4 8CA5C4C0 */ lw $a1, %lo(gControllerTwo)($a1) +/* 0390D8 800384D8 8C84C4E0 */ lw $a0, %lo(gPlayerTwo)($a0) /* 0390DC 800384DC 0C00E06B */ jal func_800381AC /* 0390E0 800384E0 24060001 */ li $a2, 1 -/* 0390E4 800384E4 3C04800E */ lui $a0, %hi(D_800DC4E4) # $a0, 0x800e -/* 0390E8 800384E8 3C05800E */ lui $a1, %hi(D_800DC4C4) # $a1, 0x800e -/* 0390EC 800384EC 8CA5C4C4 */ lw $a1, %lo(D_800DC4C4)($a1) -/* 0390F0 800384F0 8C84C4E4 */ lw $a0, %lo(D_800DC4E4)($a0) +/* 0390E4 800384E4 3C04800E */ lui $a0, %hi(gPlayerThree) # $a0, 0x800e +/* 0390E8 800384E8 3C05800E */ lui $a1, %hi(gControllerThree) # $a1, 0x800e +/* 0390EC 800384EC 8CA5C4C4 */ lw $a1, %lo(gControllerThree)($a1) +/* 0390F0 800384F0 8C84C4E4 */ lw $a0, %lo(gPlayerThree)($a0) /* 0390F4 800384F4 0C00E06B */ jal func_800381AC /* 0390F8 800384F8 24060002 */ li $a2, 2 /* 0390FC 800384FC 3C0F800E */ lui $t7, %hi(gPlayerCountSelection1) # $t7, 0x800e /* 039100 80038500 8DEFC538 */ lw $t7, %lo(gPlayerCountSelection1)($t7) /* 039104 80038504 24010004 */ li $at, 4 -/* 039108 80038508 3C04800E */ lui $a0, %hi(D_800DC4E8) # $a0, 0x800e +/* 039108 80038508 3C04800E */ lui $a0, %hi(gPlayerFour) # $a0, 0x800e /* 03910C 8003850C 15E10005 */ bne $t7, $at, .L80038524 -/* 039110 80038510 3C05800E */ lui $a1, %hi(D_800DC4C8) # $a1, 0x800e -/* 039114 80038514 8C84C4E8 */ lw $a0, %lo(D_800DC4E8)($a0) -/* 039118 80038518 8CA5C4C8 */ lw $a1, %lo(D_800DC4C8)($a1) +/* 039110 80038510 3C05800E */ lui $a1, %hi(gControllerFour) # $a1, 0x800e +/* 039114 80038514 8C84C4E8 */ lw $a0, %lo(gPlayerFour)($a0) +/* 039118 80038518 8CA5C4C8 */ lw $a1, %lo(gControllerFour)($a1) /* 03911C 8003851C 0C00E06B */ jal func_800381AC /* 039120 80038520 24060003 */ li $a2, 3 .L80038524: @@ -159,4 +159,4 @@ glabel func_800382DC .L80038528: /* 039128 80038528 27BD0018 */ addiu $sp, $sp, 0x18 /* 03912C 8003852C 03E00008 */ jr $ra -/* 039130 80038530 00000000 */ nop +/* 039130 80038530 00000000 */ nop diff --git a/asm/non_matchings/code_800393C0/func_8003A9F0.s b/asm/non_matchings/code_800393C0/func_8003A9F0.s index cc7f66dba..3646ca501 100644 --- a/asm/non_matchings/code_800393C0/func_8003A9F0.s +++ b/asm/non_matchings/code_800393C0/func_8003A9F0.s @@ -16,12 +16,12 @@ glabel func_8003A9F0 /* 03B628 8003AA28 81CEEE0B */ lb $t6, %lo(gCupCourseSelection)($t6) /* 03B62C 8003AA2C 3C0F800E */ lui $t7, %hi(D_800DC51C) # $t7, 0x800e /* 03B630 8003AA30 11C00009 */ beqz $t6, .L8003AA58 -/* 03B634 8003AA34 00000000 */ nop +/* 03B634 8003AA34 00000000 */ nop /* 03B638 8003AA38 95EFC51C */ lhu $t7, %lo(D_800DC51C)($t7) /* 03B63C 8003AA3C 24010001 */ li $at, 1 /* 03B640 8003AA40 3C188019 */ lui $t8, %hi(gDebugMenuSelection) # $t8, 0x8019 /* 03B644 8003AA44 11E10004 */ beq $t7, $at, .L8003AA58 -/* 03B648 8003AA48 00000000 */ nop +/* 03B648 8003AA48 00000000 */ nop /* 03B64C 8003AA4C 8318EDEF */ lb $t8, %lo(gDebugMenuSelection)($t8) /* 03B650 8003AA50 24010040 */ li $at, 64 /* 03B654 8003AA54 17010028 */ bne $t8, $at, .L8003AAF8 @@ -38,7 +38,7 @@ glabel func_8003A9F0 /* 03B678 8003AA78 03203025 */ move $a2, $t9 /* 03B67C 8003AA7C 82240001 */ lb $a0, 1($s1) /* 03B680 8003AA80 1324FFF7 */ beq $t9, $a0, .L8003AA60 -/* 03B684 8003AA84 00000000 */ nop +/* 03B684 8003AA84 00000000 */ nop /* 03B688 8003AA88 00034080 */ sll $t0, $v1, 2 /* 03B68C 8003AA8C 3C09800E */ lui $t1, %hi(D_800E3C50) /* 03B690 8003AA90 01284821 */ addu $t1, $t1, $t0 @@ -85,11 +85,11 @@ glabel func_8003A9F0 /* 03B724 8003AB24 4481A000 */ mtc1 $at, $f20 /* 03B728 8003AB28 860A0000 */ lh $t2, ($s0) /* 03B72C 8003AB2C 3C11800F */ lui $s1, %hi(D_800E86A8) # $s1, 0x800f -/* 03B730 8003AB30 3C04800E */ lui $a0, %hi(D_800DC4E4) # $a0, 0x800e +/* 03B730 8003AB30 3C04800E */ lui $a0, %hi(gPlayerThree) # $a0, 0x800e /* 03B734 8003AB34 240BB000 */ li $t3, -20480 /* 03B738 8003AB38 263186A8 */ addiu $s1, %lo(D_800E86A8) # addiu $s1, $s1, -0x7958 /* 03B73C 8003AB3C AFAB001C */ sw $t3, 0x1c($sp) -/* 03B740 8003AB40 8C84C4E4 */ lw $a0, %lo(D_800DC4E4)($a0) +/* 03B740 8003AB40 8C84C4E4 */ lw $a0, %lo(gPlayerThree)($a0) /* 03B744 8003AB44 E7B60010 */ swc1 $f22, 0x10($sp) /* 03B748 8003AB48 03201025 */ move $v0, $t9 /* 03B74C 8003AB4C 24050002 */ li $a1, 2 @@ -98,7 +98,7 @@ glabel func_8003A9F0 /* 03B758 8003AB58 E7B40014 */ swc1 $f20, 0x14($sp) /* 03B75C 8003AB5C 86420006 */ lh $v0, 6($s2) /* 03B760 8003AB60 860F0002 */ lh $t7, 2($s0) -/* 03B764 8003AB64 3C04800E */ lui $a0, %hi(D_800DC4E8) # $a0, 0x800e +/* 03B764 8003AB64 3C04800E */ lui $a0, %hi(gPlayerFour) # $a0, 0x800e /* 03B768 8003AB68 00026080 */ sll $t4, $v0, 2 /* 03B76C 8003AB6C 026C6821 */ addu $t5, $s3, $t4 /* 03B770 8003AB70 028C7021 */ addu $t6, $s4, $t4 @@ -109,13 +109,13 @@ glabel func_8003A9F0 /* 03B784 8003AB84 E7B40014 */ swc1 $f20, 0x14($sp) /* 03B788 8003AB88 E7B60010 */ swc1 $f22, 0x10($sp) /* 03B78C 8003AB8C 01801025 */ move $v0, $t4 -/* 03B790 8003AB90 8C84C4E8 */ lw $a0, %lo(D_800DC4E8)($a0) +/* 03B790 8003AB90 8C84C4E8 */ lw $a0, %lo(gPlayerFour)($a0) /* 03B794 8003AB94 24050003 */ li $a1, 3 /* 03B798 8003AB98 0C00E4F0 */ jal spawn_player /* 03B79C 8003AB9C AFAF0018 */ sw $t7, 0x18($sp) /* 03B7A0 8003ABA0 86420008 */ lh $v0, 8($s2) /* 03B7A4 8003ABA4 860A0004 */ lh $t2, 4($s0) -/* 03B7A8 8003ABA8 3C04800E */ lui $a0, %hi(D_800DC4EC) # $a0, 0x800e +/* 03B7A8 8003ABA8 3C04800E */ lui $a0, %hi(gPlayerFive) # $a0, 0x800e /* 03B7AC 8003ABAC 0002C880 */ sll $t9, $v0, 2 /* 03B7B0 8003ABB0 02794021 */ addu $t0, $s3, $t9 /* 03B7B4 8003ABB4 02994821 */ addu $t1, $s4, $t9 @@ -126,13 +126,13 @@ glabel func_8003A9F0 /* 03B7C8 8003ABC8 E7B40014 */ swc1 $f20, 0x14($sp) /* 03B7CC 8003ABCC E7B60010 */ swc1 $f22, 0x10($sp) /* 03B7D0 8003ABD0 03201025 */ move $v0, $t9 -/* 03B7D4 8003ABD4 8C84C4EC */ lw $a0, %lo(D_800DC4EC)($a0) +/* 03B7D4 8003ABD4 8C84C4EC */ lw $a0, %lo(gPlayerFive)($a0) /* 03B7D8 8003ABD8 24050004 */ li $a1, 4 /* 03B7DC 8003ABDC 0C00E4F0 */ jal spawn_player /* 03B7E0 8003ABE0 AFAA0018 */ sw $t2, 0x18($sp) /* 03B7E4 8003ABE4 8642000A */ lh $v0, 0xa($s2) /* 03B7E8 8003ABE8 860F0006 */ lh $t7, 6($s0) -/* 03B7EC 8003ABEC 3C04800E */ lui $a0, %hi(D_800DC4F0) # $a0, 0x800e +/* 03B7EC 8003ABEC 3C04800E */ lui $a0, %hi(gPlayerSix) # $a0, 0x800e /* 03B7F0 8003ABF0 00026080 */ sll $t4, $v0, 2 /* 03B7F4 8003ABF4 026C6821 */ addu $t5, $s3, $t4 /* 03B7F8 8003ABF8 028C7021 */ addu $t6, $s4, $t4 @@ -143,13 +143,13 @@ glabel func_8003A9F0 /* 03B80C 8003AC0C E7B40014 */ swc1 $f20, 0x14($sp) /* 03B810 8003AC10 E7B60010 */ swc1 $f22, 0x10($sp) /* 03B814 8003AC14 01801025 */ move $v0, $t4 -/* 03B818 8003AC18 8C84C4F0 */ lw $a0, %lo(D_800DC4F0)($a0) +/* 03B818 8003AC18 8C84C4F0 */ lw $a0, %lo(gPlayerSix)($a0) /* 03B81C 8003AC1C 24050005 */ li $a1, 5 /* 03B820 8003AC20 0C00E4F0 */ jal spawn_player /* 03B824 8003AC24 AFAF0018 */ sw $t7, 0x18($sp) /* 03B828 8003AC28 8642000C */ lh $v0, 0xc($s2) /* 03B82C 8003AC2C 860A0008 */ lh $t2, 8($s0) -/* 03B830 8003AC30 3C04800E */ lui $a0, %hi(D_800DC4F4) # $a0, 0x800e +/* 03B830 8003AC30 3C04800E */ lui $a0, %hi(gPlayerSeven) # $a0, 0x800e /* 03B834 8003AC34 0002C880 */ sll $t9, $v0, 2 /* 03B838 8003AC38 02794021 */ addu $t0, $s3, $t9 /* 03B83C 8003AC3C 02994821 */ addu $t1, $s4, $t9 @@ -160,13 +160,13 @@ glabel func_8003A9F0 /* 03B850 8003AC50 E7B40014 */ swc1 $f20, 0x14($sp) /* 03B854 8003AC54 E7B60010 */ swc1 $f22, 0x10($sp) /* 03B858 8003AC58 03201025 */ move $v0, $t9 -/* 03B85C 8003AC5C 8C84C4F4 */ lw $a0, %lo(D_800DC4F4)($a0) +/* 03B85C 8003AC5C 8C84C4F4 */ lw $a0, %lo(gPlayerSeven)($a0) /* 03B860 8003AC60 24050006 */ li $a1, 6 /* 03B864 8003AC64 0C00E4F0 */ jal spawn_player /* 03B868 8003AC68 AFAA0018 */ sw $t2, 0x18($sp) /* 03B86C 8003AC6C 8642000E */ lh $v0, 0xe($s2) /* 03B870 8003AC70 860F000A */ lh $t7, 0xa($s0) -/* 03B874 8003AC74 3C04800E */ lui $a0, %hi(D_800DC4F8) # $a0, 0x800e +/* 03B874 8003AC74 3C04800E */ lui $a0, %hi(gPlayerEight) # $a0, 0x800e /* 03B878 8003AC78 00026080 */ sll $t4, $v0, 2 /* 03B87C 8003AC7C 026C6821 */ addu $t5, $s3, $t4 /* 03B880 8003AC80 028C7021 */ addu $t6, $s4, $t4 @@ -177,19 +177,19 @@ glabel func_8003A9F0 /* 03B894 8003AC94 E7B40014 */ swc1 $f20, 0x14($sp) /* 03B898 8003AC98 E7B60010 */ swc1 $f22, 0x10($sp) /* 03B89C 8003AC9C 01801025 */ move $v0, $t4 -/* 03B8A0 8003ACA0 8C84C4F8 */ lw $a0, %lo(D_800DC4F8)($a0) +/* 03B8A0 8003ACA0 8C84C4F8 */ lw $a0, %lo(gPlayerEight)($a0) /* 03B8A4 8003ACA4 24050007 */ li $a1, 7 /* 03B8A8 8003ACA8 0C00E4F0 */ jal spawn_player /* 03B8AC 8003ACAC AFAF0018 */ sw $t7, 0x18($sp) /* 03B8B0 8003ACB0 3C19800E */ lui $t9, %hi(D_800DC51C) # $t9, 0x800e /* 03B8B4 8003ACB4 9739C51C */ lhu $t9, %lo(D_800DC51C)($t9) /* 03B8B8 8003ACB8 24010001 */ li $at, 1 -/* 03B8BC 8003ACBC 3C04800E */ lui $a0, %hi(D_800DC4FC) # 0x800e +/* 03B8BC 8003ACBC 3C04800E */ lui $a0, %hi(gPlayerOneCopy) # 0x800e /* 03B8C0 8003ACC0 17210014 */ bne $t9, $at, .L8003AD14 /* 03B8C4 8003ACC4 00002825 */ move $a1, $zero /* 03B8C8 8003ACC8 86420000 */ lh $v0, ($s2) /* 03B8CC 8003ACCC 822B0000 */ lb $t3, ($s1) -/* 03B8D0 8003ACD0 3C04800E */ lui $a0, %hi(D_800DC4FC) # $a0, 0x800e +/* 03B8D0 8003ACD0 3C04800E */ lui $a0, %hi(gPlayerOneCopy) # $a0, 0x800e /* 03B8D4 8003ACD4 00024080 */ sll $t0, $v0, 2 /* 03B8D8 8003ACD8 02684821 */ addu $t1, $s3, $t0 /* 03B8DC 8003ACDC 02885021 */ addu $t2, $s4, $t0 @@ -200,12 +200,12 @@ glabel func_8003A9F0 /* 03B8F0 8003ACF0 E7B40014 */ swc1 $f20, 0x14($sp) /* 03B8F4 8003ACF4 E7B60010 */ swc1 $f22, 0x10($sp) /* 03B8F8 8003ACF8 01001025 */ move $v0, $t0 -/* 03B8FC 8003ACFC 8C84C4FC */ lw $a0, %lo(D_800DC4FC)($a0) +/* 03B8FC 8003ACFC 8C84C4FC */ lw $a0, %lo(gPlayerOneCopy)($a0) /* 03B900 8003AD00 00002825 */ move $a1, $zero /* 03B904 8003AD04 0C00E4F0 */ jal spawn_player /* 03B908 8003AD08 AFAB0018 */ sw $t3, 0x18($sp) /* 03B90C 8003AD0C 10000010 */ b .L8003AD50 -/* 03B910 8003AD10 00000000 */ nop +/* 03B910 8003AD10 00000000 */ nop .L8003AD14: /* 03B914 8003AD14 86420000 */ lh $v0, ($s2) /* 03B918 8003AD18 82380000 */ lb $t8, ($s1) @@ -219,19 +219,19 @@ glabel func_8003A9F0 /* 03B938 8003AD38 E7B40014 */ swc1 $f20, 0x14($sp) /* 03B93C 8003AD3C E7B60010 */ swc1 $f22, 0x10($sp) /* 03B940 8003AD40 01A01025 */ move $v0, $t5 -/* 03B944 8003AD44 8C84C4FC */ lw $a0, %lo(D_800DC4FC)-0x3b04($a0) +/* 03B944 8003AD44 8C84C4FC */ lw $a0, %lo(gPlayerOneCopy)-0x3b04($a0) /* 03B948 8003AD48 0C00E4F0 */ jal spawn_player /* 03B94C 8003AD4C AFB80018 */ sw $t8, 0x18($sp) .L8003AD50: /* 03B950 8003AD50 3C08800E */ lui $t0, %hi(D_800DC51C) # $t0, 0x800e /* 03B954 8003AD54 9508C51C */ lhu $t0, %lo(D_800DC51C)($t0) /* 03B958 8003AD58 24010001 */ li $at, 1 -/* 03B95C 8003AD5C 3C04800E */ lui $a0, %hi(D_800DC4E0) # 0x800e +/* 03B95C 8003AD5C 3C04800E */ lui $a0, %hi(gPlayerTwo) # 0x800e /* 03B960 8003AD60 15010014 */ bne $t0, $at, .L8003ADB4 /* 03B964 8003AD64 24050001 */ li $a1, 1 /* 03B968 8003AD68 86420002 */ lh $v0, 2($s2) /* 03B96C 8003AD6C 822C0001 */ lb $t4, 1($s1) -/* 03B970 8003AD70 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e +/* 03B970 8003AD70 3C04800E */ lui $a0, %hi(gPlayerTwo) # $a0, 0x800e /* 03B974 8003AD74 00024880 */ sll $t1, $v0, 2 /* 03B978 8003AD78 02695021 */ addu $t2, $s3, $t1 /* 03B97C 8003AD7C 02895821 */ addu $t3, $s4, $t1 @@ -242,12 +242,12 @@ glabel func_8003A9F0 /* 03B990 8003AD90 E7B40014 */ swc1 $f20, 0x14($sp) /* 03B994 8003AD94 E7B60010 */ swc1 $f22, 0x10($sp) /* 03B998 8003AD98 01201025 */ move $v0, $t1 -/* 03B99C 8003AD9C 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) +/* 03B99C 8003AD9C 8C84C4E0 */ lw $a0, %lo(gPlayerTwo)($a0) /* 03B9A0 8003ADA0 24050001 */ li $a1, 1 /* 03B9A4 8003ADA4 0C00E4F0 */ jal spawn_player /* 03B9A8 8003ADA8 AFAC0018 */ sw $t4, 0x18($sp) /* 03B9AC 8003ADAC 10000010 */ b .L8003ADF0 -/* 03B9B0 8003ADB0 00000000 */ nop +/* 03B9B0 8003ADB0 00000000 */ nop .L8003ADB4: /* 03B9B4 8003ADB4 86420002 */ lh $v0, 2($s2) /* 03B9B8 8003ADB8 82390001 */ lb $t9, 1($s1) @@ -261,7 +261,7 @@ glabel func_8003A9F0 /* 03B9D8 8003ADD8 E7B40014 */ swc1 $f20, 0x14($sp) /* 03B9DC 8003ADDC E7B60010 */ swc1 $f22, 0x10($sp) /* 03B9E0 8003ADE0 01C01025 */ move $v0, $t6 -/* 03B9E4 8003ADE4 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) # -0x3b20($a0) +/* 03B9E4 8003ADE4 8C84C4E0 */ lw $a0, %lo(gPlayerTwo)($a0) # -0x3b20($a0) /* 03B9E8 8003ADE8 0C00E4F0 */ jal spawn_player /* 03B9EC 8003ADEC AFB90018 */ sw $t9, 0x18($sp) .L8003ADF0: diff --git a/asm/non_matchings/code_800393C0/func_8003C0F0.s b/asm/non_matchings/code_800393C0/func_8003C0F0.s index 4001bad69..9d038744b 100644 --- a/asm/non_matchings/code_800393C0/func_8003C0F0.s +++ b/asm/non_matchings/code_800393C0/func_8003C0F0.s @@ -13,10 +13,10 @@ glabel func_8003C0F0 /* 03CD1C 8003C11C 002E0821 */ addu $at, $at, $t6 /* 03CD20 8003C120 8C2EDE60 */ lw $t6, %lo(jpt_800EDE60)($at) /* 03CD24 8003C124 01C00008 */ jr $t6 -/* 03CD28 8003C128 00000000 */ nop +/* 03CD28 8003C128 00000000 */ nop glabel L8003C12C /* 03CD2C 8003C12C 0C003CB7 */ jal func_8000F2DC -/* 03CD30 8003C130 00000000 */ nop +/* 03CD30 8003C130 00000000 */ nop /* 03CD34 8003C134 3C028016 */ lui $v0, %hi(D_80164550) # $v0, 0x8016 /* 03CD38 8003C138 8C424550 */ lw $v0, %lo(D_80164550)($v0) /* 03CD3C 8003C13C 86030000 */ lh $v1, ($s0) @@ -32,7 +32,7 @@ glabel L8003C12C /* 03CD64 8003C164 4600320D */ trunc.w.s $f8, $f6 /* 03CD68 8003C168 468021A0 */ cvt.s.w $f6, $f4 /* 03CD6C 8003C16C 44084000 */ mfc1 $t0, $f8 -/* 03CD70 8003C170 00000000 */ nop +/* 03CD70 8003C170 00000000 */ nop /* 03CD74 8003C174 0008CC00 */ sll $t9, $t0, 0x10 /* 03CD78 8003C178 4600848D */ trunc.w.s $f18, $f16 /* 03CD7C 8003C17C 00194403 */ sra $t0, $t9, 0x10 @@ -52,7 +52,7 @@ glabel L8003C12C /* 03CDB0 8003C1B0 A7A9005A */ sh $t1, 0x5a($sp) glabel L8003C1B4 /* 03CDB4 8003C1B4 0C003BB7 */ jal func_8000EEDC -/* 03CDB8 8003C1B8 00000000 */ nop +/* 03CDB8 8003C1B8 00000000 */ nop /* 03CDBC 8003C1BC 3C03800E */ lui $v1, %hi(gCurrentCourseId) # $v1, 0x800e /* 03CDC0 8003C1C0 8463C5A0 */ lh $v1, %lo(gCurrentCourseId)($v1) .L8003C1C4: @@ -66,14 +66,14 @@ glabel L8003C1B4 /* 03CDE0 8003C1E0 002B0821 */ addu $at, $at, $t3 /* 03CDE4 8003C1E4 8C2BDEB0 */ lw $t3, %lo(jpt_800EDE80)($at) /* 03CDE8 8003C1E8 01600008 */ jr $t3 -/* 03CDEC 8003C1EC 00000000 */ nop +/* 03CDEC 8003C1EC 00000000 */ nop glabel L8003C1F0 /* 03CDF0 8003C1F0 3C02800E */ lui $v0, %hi(D_800DC52C) # $v0, 0x800e /* 03CDF4 8003C1F4 8C42C52C */ lw $v0, %lo(D_800DC52C)($v0) /* 03CDF8 8003C1F8 24010001 */ li $at, 1 /* 03CDFC 8003C1FC 3C03800E */ lui $v1, %hi(gModeSelection) # 0x800e /* 03CE00 8003C200 1040000B */ beqz $v0, .L8003C230 -/* 03CE04 8003C204 00000000 */ nop +/* 03CE04 8003C204 00000000 */ nop /* 03CE08 8003C208 10410068 */ beq $v0, $at, .L8003C3AC /* 03CE0C 8003C20C 3C03800E */ lui $v1, %hi(gModeSelection) # 0x800e /* 03CE10 8003C210 24040002 */ li $a0, 2 @@ -334,9 +334,9 @@ glabel L8003C1F0 /* 03D1EC 8003C5EC 468031A0 */ cvt.s.w $f6, $f6 /* 03D1F0 8003C5F0 44063000 */ mfc1 $a2, $f6 /* 03D1F4 8003C5F4 0C00EE1C */ jal func_8003B870 -/* 03D1F8 8003C5F8 00000000 */ nop +/* 03D1F8 8003C5F8 00000000 */ nop /* 03D1FC 8003C5FC 10000008 */ b .L8003C620 -/* 03D200 8003C600 00000000 */ nop +/* 03D200 8003C600 00000000 */ nop /* 03D204 8003C604 44894000 */ mtc1 $t1, $f8 .L8003C608: /* 03D208 8003C608 02002025 */ move $a0, $s0 @@ -344,7 +344,7 @@ glabel L8003C1F0 /* 03D210 8003C610 46804220 */ cvt.s.w $f8, $f8 /* 03D214 8003C614 44064000 */ mfc1 $a2, $f8 /* 03D218 8003C618 0C00ECC6 */ jal func_8003B318 -/* 03D21C 8003C61C 00000000 */ nop +/* 03D21C 8003C61C 00000000 */ nop .L8003C620: /* 03D220 8003C620 3C03800E */ lui $v1, %hi(gModeSelection) # $v1, 0x800e /* 03D224 8003C624 100001CA */ b .L8003CD50 @@ -361,7 +361,7 @@ glabel L8003C62C /* 03D24C 8003C64C 10410016 */ beq $v0, $at, .L8003C6A8 /* 03D250 8003C650 3C108016 */ lui $s0, %hi(D_80165210) # $s0, 0x8016 /* 03D254 8003C654 1000003A */ b .L8003C740 -/* 03D258 8003C658 00000000 */ nop +/* 03D258 8003C658 00000000 */ nop .L8003C65C: /* 03D25C 8003C65C 240A0005 */ li $t2, 5 /* 03D260 8003C660 448A5000 */ mtc1 $t2, $f10 @@ -381,7 +381,7 @@ glabel L8003C62C /* 03D298 8003C698 0C00EC26 */ jal spawn_players_2p_battle /* 03D29C 8003C69C E4AC0000 */ swc1 $f12, ($a1) /* 03D2A0 8003C6A0 10000027 */ b .L8003C740 -/* 03D2A4 8003C6A4 00000000 */ nop +/* 03D2A4 8003C6A4 00000000 */ nop .L8003C6A8: /* 03D2A8 8003C6A8 3C01C348 */ li $at, 0xC3480000 # -200.000000 /* 03D2AC 8003C6AC 44811000 */ mtc1 $at, $f2 @@ -411,9 +411,9 @@ glabel L8003C62C /* 03D30C 8003C70C 46808420 */ cvt.s.w $f16, $f16 /* 03D310 8003C710 44068000 */ mfc1 $a2, $f16 /* 03D314 8003C714 0C00EEC9 */ jal spawn_players_4p_battle -/* 03D318 8003C718 00000000 */ nop +/* 03D318 8003C718 00000000 */ nop /* 03D31C 8003C71C 10000008 */ b .L8003C740 -/* 03D320 8003C720 00000000 */ nop +/* 03D320 8003C720 00000000 */ nop .L8003C724: /* 03D324 8003C724 448D9000 */ mtc1 $t5, $f18 /* 03D328 8003C728 02002025 */ move $a0, $s0 @@ -421,7 +421,7 @@ glabel L8003C62C /* 03D330 8003C730 468094A0 */ cvt.s.w $f18, $f18 /* 03D334 8003C734 44069000 */ mfc1 $a2, $f18 /* 03D338 8003C738 0C00ED67 */ jal spawn_players_3p_battle -/* 03D33C 8003C73C 00000000 */ nop +/* 03D33C 8003C73C 00000000 */ nop .L8003C740: /* 03D340 8003C740 3C03800E */ lui $v1, %hi(gModeSelection) # $v1, 0x800e /* 03D344 8003C744 10000182 */ b .L8003CD50 @@ -438,7 +438,7 @@ glabel L8003C74C /* 03D36C 8003C76C 10410016 */ beq $v0, $at, .L8003C7C8 /* 03D370 8003C770 3C108016 */ lui $s0, %hi(D_80165210) # $s0, 0x8016 /* 03D374 8003C774 1000003A */ b .L8003C860 -/* 03D378 8003C778 00000000 */ nop +/* 03D378 8003C778 00000000 */ nop .L8003C77C: /* 03D37C 8003C77C 240E01E0 */ li $t6, 480 /* 03D380 8003C780 448E2000 */ mtc1 $t6, $f4 @@ -458,7 +458,7 @@ glabel L8003C74C /* 03D3B8 8003C7B8 0C00EC26 */ jal spawn_players_2p_battle /* 03D3BC 8003C7BC E4AC0000 */ swc1 $f12, ($a1) /* 03D3C0 8003C7C0 10000027 */ b .L8003C860 -/* 03D3C4 8003C7C4 00000000 */ nop +/* 03D3C4 8003C7C4 00000000 */ nop .L8003C7C8: /* 03D3C8 8003C7C8 3C01C3C8 */ li $at, 0xC3C80000 # -400.000000 /* 03D3CC 8003C7CC 44811000 */ mtc1 $at, $f2 @@ -488,9 +488,9 @@ glabel L8003C74C /* 03D42C 8003C82C 468031A0 */ cvt.s.w $f6, $f6 /* 03D430 8003C830 44063000 */ mfc1 $a2, $f6 /* 03D434 8003C834 0C00EEC9 */ jal spawn_players_4p_battle -/* 03D438 8003C838 00000000 */ nop +/* 03D438 8003C838 00000000 */ nop /* 03D43C 8003C83C 10000008 */ b .L8003C860 -/* 03D440 8003C840 00000000 */ nop +/* 03D440 8003C840 00000000 */ nop .L8003C844: /* 03D444 8003C844 44994000 */ mtc1 $t9, $f8 /* 03D448 8003C848 02002025 */ move $a0, $s0 @@ -498,7 +498,7 @@ glabel L8003C74C /* 03D450 8003C850 46804220 */ cvt.s.w $f8, $f8 /* 03D454 8003C854 44064000 */ mfc1 $a2, $f8 /* 03D458 8003C858 0C00ED67 */ jal spawn_players_3p_battle -/* 03D45C 8003C85C 00000000 */ nop +/* 03D45C 8003C85C 00000000 */ nop .L8003C860: /* 03D460 8003C860 3C03800E */ lui $v1, %hi(gModeSelection) # $v1, 0x800e /* 03D464 8003C864 1000013A */ b .L8003CD50 @@ -515,7 +515,7 @@ glabel L8003C86C /* 03D48C 8003C88C 10410016 */ beq $v0, $at, .L8003C8E8 /* 03D490 8003C890 3C108016 */ lui $s0, %hi(D_80165210) # $s0, 0x8016 /* 03D494 8003C894 1000003A */ b .L8003C980 -/* 03D498 8003C898 00000000 */ nop +/* 03D498 8003C898 00000000 */ nop .L8003C89C: /* 03D49C 8003C89C 240A0037 */ li $t2, 55 /* 03D4A0 8003C8A0 448A5000 */ mtc1 $t2, $f10 @@ -535,7 +535,7 @@ glabel L8003C86C /* 03D4D8 8003C8D8 0C00EC26 */ jal spawn_players_2p_battle /* 03D4DC 8003C8DC E4AC0000 */ swc1 $f12, ($a1) /* 03D4E0 8003C8E0 10000027 */ b .L8003C980 -/* 03D4E4 8003C8E4 00000000 */ nop +/* 03D4E4 8003C8E4 00000000 */ nop .L8003C8E8: /* 03D4E8 8003C8E8 3C01C320 */ li $at, 0xC3200000 # -160.000000 /* 03D4EC 8003C8EC 44811000 */ mtc1 $at, $f2 @@ -565,9 +565,9 @@ glabel L8003C86C /* 03D54C 8003C94C 46808420 */ cvt.s.w $f16, $f16 /* 03D550 8003C950 44068000 */ mfc1 $a2, $f16 /* 03D554 8003C954 0C00EEC9 */ jal spawn_players_4p_battle -/* 03D558 8003C958 00000000 */ nop +/* 03D558 8003C958 00000000 */ nop /* 03D55C 8003C95C 10000008 */ b .L8003C980 -/* 03D560 8003C960 00000000 */ nop +/* 03D560 8003C960 00000000 */ nop .L8003C964: /* 03D564 8003C964 448D9000 */ mtc1 $t5, $f18 /* 03D568 8003C968 02002025 */ move $a0, $s0 @@ -575,7 +575,7 @@ glabel L8003C86C /* 03D570 8003C970 468094A0 */ cvt.s.w $f18, $f18 /* 03D574 8003C974 44069000 */ mfc1 $a2, $f18 /* 03D578 8003C978 0C00ED67 */ jal spawn_players_3p_battle -/* 03D57C 8003C97C 00000000 */ nop +/* 03D57C 8003C97C 00000000 */ nop .L8003C980: /* 03D580 8003C980 3C03800E */ lui $v1, %hi(gModeSelection) # $v1, 0x800e /* 03D584 8003C984 100000F2 */ b .L8003CD50 @@ -592,7 +592,7 @@ glabel L8003C98C /* 03D5AC 8003C9AC 10410016 */ beq $v0, $at, .L8003CA08 /* 03D5B0 8003C9B0 3C108016 */ lui $s0, %hi(D_80165210) # $s0, 0x8016 /* 03D5B4 8003C9B4 1000003A */ b .L8003CAA0 -/* 03D5B8 8003C9B8 00000000 */ nop +/* 03D5B8 8003C9B8 00000000 */ nop .L8003C9BC: /* 03D5BC 8003C9BC 240E00C8 */ li $t6, 200 /* 03D5C0 8003C9C0 448E2000 */ mtc1 $t6, $f4 @@ -612,7 +612,7 @@ glabel L8003C98C /* 03D5F8 8003C9F8 0C00EC26 */ jal spawn_players_2p_battle /* 03D5FC 8003C9FC E4AC0000 */ swc1 $f12, ($a1) /* 03D600 8003CA00 10000027 */ b .L8003CAA0 -/* 03D604 8003CA04 00000000 */ nop +/* 03D604 8003CA04 00000000 */ nop .L8003CA08: /* 03D608 8003CA08 3C01800F */ lui $at, %hi(D_800EDF08) # $at, 0x800f /* 03D60C 8003CA0C C422DF08 */ lwc1 $f2, %lo(D_800EDF08)($at) @@ -642,9 +642,9 @@ glabel L8003C98C /* 03D66C 8003CA6C 468031A0 */ cvt.s.w $f6, $f6 /* 03D670 8003CA70 44063000 */ mfc1 $a2, $f6 /* 03D674 8003CA74 0C00EEC9 */ jal spawn_players_4p_battle -/* 03D678 8003CA78 00000000 */ nop +/* 03D678 8003CA78 00000000 */ nop /* 03D67C 8003CA7C 10000008 */ b .L8003CAA0 -/* 03D680 8003CA80 00000000 */ nop +/* 03D680 8003CA80 00000000 */ nop .L8003CA84: /* 03D684 8003CA84 44994000 */ mtc1 $t9, $f8 /* 03D688 8003CA88 02002025 */ move $a0, $s0 @@ -652,7 +652,7 @@ glabel L8003C98C /* 03D690 8003CA90 46804220 */ cvt.s.w $f8, $f8 /* 03D694 8003CA94 44064000 */ mfc1 $a2, $f8 /* 03D698 8003CA98 0C00ED67 */ jal spawn_players_3p_battle -/* 03D69C 8003CA9C 00000000 */ nop +/* 03D69C 8003CA9C 00000000 */ nop .L8003CAA0: /* 03D6A0 8003CAA0 3C03800E */ lui $v1, %hi(gModeSelection) # $v1, 0x800e /* 03D6A4 8003CAA4 100000AA */ b .L8003CD50 @@ -706,10 +706,10 @@ glabel L8003C98C /* 03D760 8003CB60 E624001C */ swc1 $f4, 0x1c($s1) /* 03D764 8003CB64 814A86A8 */ lb $t2, %lo(D_800E86A8)($t2) /* 03D768 8003CB68 44814000 */ mtc1 $at, $f8 -/* 03D76C 8003CB6C 3C04800E */ lui $a0, %hi(D_800DC4FC) # $a0, 0x800e +/* 03D76C 8003CB6C 3C04800E */ lui $a0, %hi(gPlayerOneCopy) # $a0, 0x800e /* 03D770 8003CB70 240BE000 */ li $t3, -8192 /* 03D774 8003CB74 AFAB001C */ sw $t3, 0x1c($sp) -/* 03D778 8003CB78 8C84C4FC */ lw $a0, %lo(D_800DC4FC)($a0) +/* 03D778 8003CB78 8C84C4FC */ lw $a0, %lo(gPlayerOneCopy)($a0) /* 03D77C 8003CB7C E7A20010 */ swc1 $f2, 0x10($sp) /* 03D780 8003CB80 E7A20030 */ swc1 $f2, 0x30($sp) /* 03D784 8003CB84 8E060000 */ lw $a2, ($s0) @@ -721,12 +721,12 @@ glabel L8003C98C /* 03D79C 8003CB9C 3C014700 */ li $at, 0x47000000 # 32768.000000 /* 03D7A0 8003CBA0 44818000 */ mtc1 $at, $f16 /* 03D7A4 8003CBA4 C7AA0030 */ lwc1 $f10, 0x30($sp) -/* 03D7A8 8003CBA8 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e +/* 03D7A8 8003CBA8 3C04800E */ lui $a0, %hi(gPlayerTwo) # $a0, 0x800e /* 03D7AC 8003CBAC 240C0001 */ li $t4, 1 /* 03D7B0 8003CBB0 240DB000 */ li $t5, -20480 /* 03D7B4 8003CBB4 AFAD001C */ sw $t5, 0x1c($sp) /* 03D7B8 8003CBB8 AFAC0018 */ sw $t4, 0x18($sp) -/* 03D7BC 8003CBBC 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) +/* 03D7BC 8003CBBC 8C84C4E0 */ lw $a0, %lo(gPlayerTwo)($a0) /* 03D7C0 8003CBC0 24050001 */ li $a1, 1 /* 03D7C4 8003CBC4 8E060004 */ lw $a2, 4($s0) /* 03D7C8 8003CBC8 8E270004 */ lw $a3, 4($s1) @@ -736,12 +736,12 @@ glabel L8003C98C /* 03D7D8 8003CBD8 3C014700 */ li $at, 0x47000000 # 32768.000000 /* 03D7DC 8003CBDC 44812000 */ mtc1 $at, $f4 /* 03D7E0 8003CBE0 C7B20030 */ lwc1 $f18, 0x30($sp) -/* 03D7E4 8003CBE4 3C04800E */ lui $a0, %hi(D_800DC4E4) # $a0, 0x800e +/* 03D7E4 8003CBE4 3C04800E */ lui $a0, %hi(gPlayerThree) # $a0, 0x800e /* 03D7E8 8003CBE8 240E0002 */ li $t6, 2 /* 03D7EC 8003CBEC 240FB000 */ li $t7, -20480 /* 03D7F0 8003CBF0 AFAF001C */ sw $t7, 0x1c($sp) /* 03D7F4 8003CBF4 AFAE0018 */ sw $t6, 0x18($sp) -/* 03D7F8 8003CBF8 8C84C4E4 */ lw $a0, %lo(D_800DC4E4)($a0) +/* 03D7F8 8003CBF8 8C84C4E4 */ lw $a0, %lo(gPlayerThree)($a0) /* 03D7FC 8003CBFC 24050002 */ li $a1, 2 /* 03D800 8003CC00 8E060008 */ lw $a2, 8($s0) /* 03D804 8003CC04 8E270008 */ lw $a3, 8($s1) @@ -751,12 +751,12 @@ glabel L8003C98C /* 03D814 8003CC14 3C014700 */ li $at, 0x47000000 # 32768.000000 /* 03D818 8003CC18 44814000 */ mtc1 $at, $f8 /* 03D81C 8003CC1C C7A60030 */ lwc1 $f6, 0x30($sp) -/* 03D820 8003CC20 3C04800E */ lui $a0, %hi(D_800DC4E8) # $a0, 0x800e +/* 03D820 8003CC20 3C04800E */ lui $a0, %hi(gPlayerFour) # $a0, 0x800e /* 03D824 8003CC24 24180003 */ li $t8, 3 /* 03D828 8003CC28 2419B000 */ li $t9, -20480 /* 03D82C 8003CC2C AFB9001C */ sw $t9, 0x1c($sp) /* 03D830 8003CC30 AFB80018 */ sw $t8, 0x18($sp) -/* 03D834 8003CC34 8C84C4E8 */ lw $a0, %lo(D_800DC4E8)($a0) +/* 03D834 8003CC34 8C84C4E8 */ lw $a0, %lo(gPlayerFour)($a0) /* 03D838 8003CC38 24050003 */ li $a1, 3 /* 03D83C 8003CC3C 8E06000C */ lw $a2, 0xc($s0) /* 03D840 8003CC40 8E27000C */ lw $a3, 0xc($s1) @@ -766,12 +766,12 @@ glabel L8003C98C /* 03D850 8003CC50 3C014700 */ li $at, 0x47000000 # 32768.000000 /* 03D854 8003CC54 44818000 */ mtc1 $at, $f16 /* 03D858 8003CC58 C7AA0030 */ lwc1 $f10, 0x30($sp) -/* 03D85C 8003CC5C 3C04800E */ lui $a0, %hi(D_800DC4EC) # $a0, 0x800e +/* 03D85C 8003CC5C 3C04800E */ lui $a0, %hi(gPlayerFive) # $a0, 0x800e /* 03D860 8003CC60 240A0004 */ li $t2, 4 /* 03D864 8003CC64 240BB000 */ li $t3, -20480 /* 03D868 8003CC68 AFAB001C */ sw $t3, 0x1c($sp) /* 03D86C 8003CC6C AFAA0018 */ sw $t2, 0x18($sp) -/* 03D870 8003CC70 8C84C4EC */ lw $a0, %lo(D_800DC4EC)($a0) +/* 03D870 8003CC70 8C84C4EC */ lw $a0, %lo(gPlayerFive)($a0) /* 03D874 8003CC74 24050004 */ li $a1, 4 /* 03D878 8003CC78 8E060010 */ lw $a2, 0x10($s0) /* 03D87C 8003CC7C 8E270010 */ lw $a3, 0x10($s1) @@ -781,12 +781,12 @@ glabel L8003C98C /* 03D88C 8003CC8C 3C014700 */ li $at, 0x47000000 # 32768.000000 /* 03D890 8003CC90 44812000 */ mtc1 $at, $f4 /* 03D894 8003CC94 C7B20030 */ lwc1 $f18, 0x30($sp) -/* 03D898 8003CC98 3C04800E */ lui $a0, %hi(D_800DC4F0) # $a0, 0x800e +/* 03D898 8003CC98 3C04800E */ lui $a0, %hi(gPlayerSix) # $a0, 0x800e /* 03D89C 8003CC9C 240C0005 */ li $t4, 5 /* 03D8A0 8003CCA0 240DB000 */ li $t5, -20480 /* 03D8A4 8003CCA4 AFAD001C */ sw $t5, 0x1c($sp) /* 03D8A8 8003CCA8 AFAC0018 */ sw $t4, 0x18($sp) -/* 03D8AC 8003CCAC 8C84C4F0 */ lw $a0, %lo(D_800DC4F0)($a0) +/* 03D8AC 8003CCAC 8C84C4F0 */ lw $a0, %lo(gPlayerSix)($a0) /* 03D8B0 8003CCB0 24050005 */ li $a1, 5 /* 03D8B4 8003CCB4 8E060014 */ lw $a2, 0x14($s0) /* 03D8B8 8003CCB8 8E270014 */ lw $a3, 0x14($s1) @@ -796,12 +796,12 @@ glabel L8003C98C /* 03D8C8 8003CCC8 3C014700 */ li $at, 0x47000000 # 32768.000000 /* 03D8CC 8003CCCC 44814000 */ mtc1 $at, $f8 /* 03D8D0 8003CCD0 C7A60030 */ lwc1 $f6, 0x30($sp) -/* 03D8D4 8003CCD4 3C04800E */ lui $a0, %hi(D_800DC4F4) # $a0, 0x800e +/* 03D8D4 8003CCD4 3C04800E */ lui $a0, %hi(gPlayerSeven) # $a0, 0x800e /* 03D8D8 8003CCD8 240E0006 */ li $t6, 6 /* 03D8DC 8003CCDC 240FB000 */ li $t7, -20480 /* 03D8E0 8003CCE0 AFAF001C */ sw $t7, 0x1c($sp) /* 03D8E4 8003CCE4 AFAE0018 */ sw $t6, 0x18($sp) -/* 03D8E8 8003CCE8 8C84C4F4 */ lw $a0, %lo(D_800DC4F4)($a0) +/* 03D8E8 8003CCE8 8C84C4F4 */ lw $a0, %lo(gPlayerSeven)($a0) /* 03D8EC 8003CCEC 24050006 */ li $a1, 6 /* 03D8F0 8003CCF0 8E060018 */ lw $a2, 0x18($s0) /* 03D8F4 8003CCF4 8E270018 */ lw $a3, 0x18($s1) @@ -811,12 +811,12 @@ glabel L8003C98C /* 03D904 8003CD04 3C014700 */ li $at, 0x47000000 # 32768.000000 /* 03D908 8003CD08 44818000 */ mtc1 $at, $f16 /* 03D90C 8003CD0C C7AA0030 */ lwc1 $f10, 0x30($sp) -/* 03D910 8003CD10 3C04800E */ lui $a0, %hi(D_800DC4F8) # $a0, 0x800e +/* 03D910 8003CD10 3C04800E */ lui $a0, %hi(gPlayerEight) # $a0, 0x800e /* 03D914 8003CD14 24180007 */ li $t8, 7 /* 03D918 8003CD18 2419B000 */ li $t9, -20480 /* 03D91C 8003CD1C AFB9001C */ sw $t9, 0x1c($sp) /* 03D920 8003CD20 AFB80018 */ sw $t8, 0x18($sp) -/* 03D924 8003CD24 8C84C4F8 */ lw $a0, %lo(D_800DC4F8)($a0) +/* 03D924 8003CD24 8C84C4F8 */ lw $a0, %lo(gPlayerEight)($a0) /* 03D928 8003CD28 24050007 */ li $a1, 7 /* 03D92C 8003CD2C 8E06001C */ lw $a2, 0x1c($s0) /* 03D930 8003CD30 8E27001C */ lw $a3, 0x1c($s1) @@ -833,7 +833,7 @@ glabel L8003C98C /* 03D954 8003CD54 50610004 */ beql $v1, $at, .L8003CD68 /* 03D958 8003CD58 8FBF002C */ lw $ra, 0x2c($sp) /* 03D95C 8003CD5C 0C003D8A */ jal func_8000F628 -/* 03D960 8003CD60 00000000 */ nop +/* 03D960 8003CD60 00000000 */ nop /* 03D964 8003CD64 8FBF002C */ lw $ra, 0x2c($sp) .L8003CD68: /* 03D968 8003CD68 8FB00024 */ lw $s0, 0x24($sp) diff --git a/asm/non_matchings/code_800393C0/func_8003D080.s b/asm/non_matchings/code_800393C0/func_8003D080.s index b015705dc..dbc917a52 100644 --- a/asm/non_matchings/code_800393C0/func_8003D080.s +++ b/asm/non_matchings/code_800393C0/func_8003D080.s @@ -2,30 +2,30 @@ glabel func_8003D080 /* 03DC80 8003D080 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 03DC84 8003D084 AFBF001C */ sw $ra, 0x1c($sp) /* 03DC88 8003D088 0C0174A4 */ jal func_8005D290 -/* 03DC8C 8003D08C 00000000 */ nop +/* 03DC8C 8003D08C 00000000 */ nop /* 03DC90 8003D090 3C0E800E */ lui $t6, %hi(D_800DC50C) # $t6, 0x800e /* 03DC94 8003D094 8DCEC50C */ lw $t6, %lo(D_800DC50C)($t6) /* 03DC98 8003D098 24010005 */ li $at, 5 /* 03DC9C 8003D09C 15C10005 */ bne $t6, $at, .L8003D0B4 -/* 03DCA0 8003D0A0 00000000 */ nop +/* 03DCA0 8003D0A0 00000000 */ nop /* 03DCA4 8003D0A4 0C00F35E */ jal func_8003CD78 -/* 03DCA8 8003D0A8 00000000 */ nop +/* 03DCA8 8003D0A8 00000000 */ nop /* 03DCAC 8003D0AC 10000003 */ b .L8003D0BC -/* 03DCB0 8003D0B0 00000000 */ nop +/* 03DCB0 8003D0B0 00000000 */ nop .L8003D0B4: /* 03DCB4 8003D0B4 0C00F03C */ jal func_8003C0F0 -/* 03DCB8 8003D0B8 00000000 */ nop +/* 03DCB8 8003D0B8 00000000 */ nop .L8003D0BC: /* 03DCBC 8003D0BC 3C0F800E */ lui $t7, %hi(D_800DC51C) # $t7, 0x800e /* 03DCC0 8003D0C0 95EFC51C */ lhu $t7, %lo(D_800DC51C)($t7) /* 03DCC4 8003D0C4 3C02800E */ lui $v0, %hi(D_800DC52C) # 0x800e /* 03DCC8 8003D0C8 15E00117 */ bnez $t7, .L8003D528 -/* 03DCCC 8003D0CC 00000000 */ nop +/* 03DCCC 8003D0CC 00000000 */ nop /* 03DCD0 8003D0D0 3C02800E */ lui $v0, %hi(D_800DC52C) # $v0, 0x800e /* 03DCD4 8003D0D4 8C42C52C */ lw $v0, %lo(D_800DC52C)($v0) /* 03DCD8 8003D0D8 24010001 */ li $at, 1 /* 03DCDC 8003D0DC 10400009 */ beqz $v0, .L8003D104 -/* 03DCE0 8003D0E0 00000000 */ nop +/* 03DCE0 8003D0E0 00000000 */ nop /* 03DCE4 8003D0E4 10410050 */ beq $v0, $at, .L8003D228 /* 03DCE8 8003D0E8 24010002 */ li $at, 2 /* 03DCEC 8003D0EC 1041004E */ beq $v0, $at, .L8003D228 @@ -33,14 +33,14 @@ glabel func_8003D080 /* 03DCF4 8003D0F4 1041009E */ beq $v0, $at, .L8003D370 /* 03DCF8 8003D0F8 3C0A800E */ lui $t2, %hi(gModeSelection) # 0x800e /* 03DCFC 8003D0FC 1000016E */ b .L8003D6B8 -/* 03DD00 8003D100 00000000 */ nop +/* 03DD00 8003D100 00000000 */ nop .L8003D104: /* 03DD04 8003D104 3C02800E */ lui $v0, %hi(gModeSelection) # $v0, 0x800e /* 03DD08 8003D108 8C42C53C */ lw $v0, %lo(gModeSelection)($v0) /* 03DD0C 8003D10C 24010001 */ li $at, 1 /* 03DD10 8003D110 3C18800E */ lui $t8, %hi(gCurrentCourseId) # $t8, 0x800e /* 03DD14 8003D114 10400005 */ beqz $v0, .L8003D12C -/* 03DD18 8003D118 00000000 */ nop +/* 03DD18 8003D118 00000000 */ nop /* 03DD1C 8003D11C 10410027 */ beq $v0, $at, .L8003D1BC /* 03DD20 8003D120 3C06800F */ lui $a2, %hi(gPlayers+0x1C) # 0x800f /* 03DD24 8003D124 10000032 */ b .L8003D1F0 @@ -63,7 +63,7 @@ glabel func_8003D080 /* 03DD64 8003D164 0C007134 */ jal func_8001C4D0 /* 03DD68 8003D168 AFA00014 */ sw $zero, 0x14($sp) /* 03DD6C 8003D16C 1000002B */ b .L8003D21C -/* 03DD70 8003D170 00000000 */ nop +/* 03DD70 8003D170 00000000 */ nop .L8003D174: /* 03DD74 8003D174 C4440018 */ lwc1 $f4, 0x18($v0) /* 03DD78 8003D178 C446001C */ lwc1 $f6, 0x1c($v0) @@ -82,7 +82,7 @@ glabel func_8003D080 /* 03DDAC 8003D1AC 0C007134 */ jal func_8001C4D0 /* 03DDB0 8003D1B0 460A4303 */ div.s $f12, $f8, $f10 /* 03DDB4 8003D1B4 10000019 */ b .L8003D21C -/* 03DDB8 8003D1B8 00000000 */ nop +/* 03DDB8 8003D1B8 00000000 */ nop .L8003D1BC: /* 03DDBC 8003D1BC 3C01800F */ lui $at, %hi(gPlayers+0x14) # $at, 0x800f /* 03DDC0 8003D1C0 C42C69A4 */ lwc1 $f12, %lo(gPlayers+0x14)($at) @@ -96,7 +96,7 @@ glabel func_8003D080 /* 03DDE0 8003D1E0 0C007134 */ jal func_8001C4D0 /* 03DDE4 8003D1E4 AFA00014 */ sw $zero, 0x14($sp) /* 03DDE8 8003D1E8 1000000C */ b .L8003D21C -/* 03DDEC 8003D1EC 00000000 */ nop +/* 03DDEC 8003D1EC 00000000 */ nop .L8003D1F0: /* 03DDF0 8003D1F0 C42C69A4 */ lwc1 $f12, %lo(gPlayers+0x14)($at) /* 03DDF4 8003D1F4 3C01800F */ lui $at, %hi(gPlayers+0x18) # $at, 0x800f @@ -147,7 +147,7 @@ glabel func_8003D080 /* 03DE9C 8003D29C 0C007134 */ jal func_8001C4D0 /* 03DEA0 8003D2A0 AFAC0010 */ sw $t4, 0x10($sp) /* 03DEA4 8003D2A4 1000002F */ b .L8003D364 -/* 03DEA8 8003D2A8 00000000 */ nop +/* 03DEA8 8003D2A8 00000000 */ nop .L8003D2AC: /* 03DEAC 8003D2AC 3C01800F */ lui $at, %hi(gPlayers+0x14) # $at, 0x800f /* 03DEB0 8003D2B0 C42C69A4 */ lwc1 $f12, %lo(gPlayers+0x14)($at) @@ -172,7 +172,7 @@ glabel func_8003D080 /* 03DEFC 8003D2FC 0C007134 */ jal func_8001C4D0 /* 03DF00 8003D300 AFAF0010 */ sw $t7, 0x10($sp) /* 03DF04 8003D304 10000017 */ b .L8003D364 -/* 03DF08 8003D308 00000000 */ nop +/* 03DF08 8003D308 00000000 */ nop .L8003D30C: /* 03DF0C 8003D30C C42C69A4 */ lwc1 $f12, %lo(gPlayers+0x14)($at) /* 03DF10 8003D310 3C01800F */ lui $at, %hi(gPlayers+0x18) # $at, 0x800f @@ -258,7 +258,7 @@ glabel func_8003D080 /* 03E048 8003D448 0C007134 */ jal func_8001C4D0 /* 03E04C 8003D44C AFB90010 */ sw $t9, 0x10($sp) /* 03E050 8003D450 10000032 */ b .L8003D51C -/* 03E054 8003D454 00000000 */ nop +/* 03E054 8003D454 00000000 */ nop .L8003D458: /* 03E058 8003D458 3C01800F */ lui $at, %hi(gPlayers+0x14) # $at, 0x800f /* 03E05C 8003D45C C42C69A4 */ lwc1 $f12, %lo(gPlayers+0x14)($at) @@ -328,7 +328,7 @@ glabel func_8003D080 /* 03E154 8003D554 10410028 */ beq $v0, $at, .L8003D5F8 /* 03E158 8003D558 3C06800F */ lui $a2, %hi(gPlayers+0x1C) # $a2, 0x800f /* 03E15C 8003D55C 10000056 */ b .L8003D6B8 -/* 03E160 8003D560 00000000 */ nop +/* 03E160 8003D560 00000000 */ nop .L8003D564: /* 03E164 8003D564 C42C69A4 */ lwc1 $f12, %lo(gPlayers+0x14)($at) /* 03E168 8003D568 3C01800F */ lui $at, %hi(gPlayers+0x18) # $at, 0x800f @@ -419,70 +419,70 @@ glabel func_8003D080 /* 03E2B4 8003D6B4 8C42C52C */ lw $v0, %lo(D_800DC52C)($v0) .L8003D6B8: /* 03E2B8 8003D6B8 1040000B */ beqz $v0, .L8003D6E8 -/* 03E2BC 8003D6BC 3C04800E */ lui $a0, %hi(D_800DC4FC) # 0x800e +/* 03E2BC 8003D6BC 3C04800E */ lui $a0, %hi(gPlayerOneCopy) # 0x800e /* 03E2C0 8003D6C0 24010001 */ li $at, 1 /* 03E2C4 8003D6C4 10410041 */ beq $v0, $at, .L8003D7CC -/* 03E2C8 8003D6C8 3C04800E */ lui $a0, %hi(D_800DC4FC) # 0x800e +/* 03E2C8 8003D6C8 3C04800E */ lui $a0, %hi(gPlayerOneCopy) # 0x800e /* 03E2CC 8003D6CC 24010002 */ li $at, 2 /* 03E2D0 8003D6D0 1041003E */ beq $v0, $at, .L8003D7CC /* 03E2D4 8003D6D4 24010003 */ li $at, 3 /* 03E2D8 8003D6D8 104100AD */ beq $v0, $at, .L8003D990 -/* 03E2DC 8003D6DC 3C04800E */ lui $a0, %hi(D_800DC4FC) # $a0, 0x800e +/* 03E2DC 8003D6DC 3C04800E */ lui $a0, %hi(gPlayerOneCopy) # $a0, 0x800e /* 03E2E0 8003D6E0 1000011B */ b .L8003DB50 /* 03E2E4 8003D6E4 8FBF001C */ lw $ra, 0x1c($sp) .L8003D6E8: /* 03E2E8 8003D6E8 3C05800E */ lui $a1, %hi(camera1) # $a1, 0x800e /* 03E2EC 8003D6EC 8CA5DB40 */ lw $a1, %lo(camera1)($a1) -/* 03E2F0 8003D6F0 8C84C4FC */ lw $a0, %lo(D_800DC4FC)($a0) +/* 03E2F0 8003D6F0 8C84C4FC */ lw $a0, %lo(gPlayerOneCopy)($a0) /* 03E2F4 8003D6F4 00003025 */ move $a2, $zero /* 03E2F8 8003D6F8 0C00F366 */ jal func_8003CD98 /* 03E2FC 8003D6FC 00003825 */ move $a3, $zero -/* 03E300 8003D700 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e +/* 03E300 8003D700 3C04800E */ lui $a0, %hi(gPlayerTwo) # $a0, 0x800e /* 03E304 8003D704 3C05800E */ lui $a1, %hi(camera1) # $a1, 0x800e /* 03E308 8003D708 8CA5DB40 */ lw $a1, %lo(camera1)($a1) -/* 03E30C 8003D70C 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) +/* 03E30C 8003D70C 8C84C4E0 */ lw $a0, %lo(gPlayerTwo)($a0) /* 03E310 8003D710 24060001 */ li $a2, 1 /* 03E314 8003D714 0C00F366 */ jal func_8003CD98 /* 03E318 8003D718 00003825 */ move $a3, $zero -/* 03E31C 8003D71C 3C04800E */ lui $a0, %hi(D_800DC4E4) # $a0, 0x800e +/* 03E31C 8003D71C 3C04800E */ lui $a0, %hi(gPlayerThree) # $a0, 0x800e /* 03E320 8003D720 3C05800E */ lui $a1, %hi(camera1) # $a1, 0x800e /* 03E324 8003D724 8CA5DB40 */ lw $a1, %lo(camera1)($a1) -/* 03E328 8003D728 8C84C4E4 */ lw $a0, %lo(D_800DC4E4)($a0) +/* 03E328 8003D728 8C84C4E4 */ lw $a0, %lo(gPlayerThree)($a0) /* 03E32C 8003D72C 24060002 */ li $a2, 2 /* 03E330 8003D730 0C00F366 */ jal func_8003CD98 /* 03E334 8003D734 00003825 */ move $a3, $zero -/* 03E338 8003D738 3C04800E */ lui $a0, %hi(D_800DC4E8) # $a0, 0x800e +/* 03E338 8003D738 3C04800E */ lui $a0, %hi(gPlayerFour) # $a0, 0x800e /* 03E33C 8003D73C 3C05800E */ lui $a1, %hi(camera1) # $a1, 0x800e /* 03E340 8003D740 8CA5DB40 */ lw $a1, %lo(camera1)($a1) -/* 03E344 8003D744 8C84C4E8 */ lw $a0, %lo(D_800DC4E8)($a0) +/* 03E344 8003D744 8C84C4E8 */ lw $a0, %lo(gPlayerFour)($a0) /* 03E348 8003D748 24060003 */ li $a2, 3 /* 03E34C 8003D74C 0C00F366 */ jal func_8003CD98 /* 03E350 8003D750 00003825 */ move $a3, $zero -/* 03E354 8003D754 3C04800E */ lui $a0, %hi(D_800DC4EC) # $a0, 0x800e +/* 03E354 8003D754 3C04800E */ lui $a0, %hi(gPlayerFive) # $a0, 0x800e /* 03E358 8003D758 3C05800E */ lui $a1, %hi(camera1) # $a1, 0x800e /* 03E35C 8003D75C 8CA5DB40 */ lw $a1, %lo(camera1)($a1) -/* 03E360 8003D760 8C84C4EC */ lw $a0, %lo(D_800DC4EC)($a0) +/* 03E360 8003D760 8C84C4EC */ lw $a0, %lo(gPlayerFive)($a0) /* 03E364 8003D764 24060004 */ li $a2, 4 /* 03E368 8003D768 0C00F366 */ jal func_8003CD98 /* 03E36C 8003D76C 00003825 */ move $a3, $zero -/* 03E370 8003D770 3C04800E */ lui $a0, %hi(D_800DC4F0) # $a0, 0x800e +/* 03E370 8003D770 3C04800E */ lui $a0, %hi(gPlayerSix) # $a0, 0x800e /* 03E374 8003D774 3C05800E */ lui $a1, %hi(camera1) # $a1, 0x800e /* 03E378 8003D778 8CA5DB40 */ lw $a1, %lo(camera1)($a1) -/* 03E37C 8003D77C 8C84C4F0 */ lw $a0, %lo(D_800DC4F0)($a0) +/* 03E37C 8003D77C 8C84C4F0 */ lw $a0, %lo(gPlayerSix)($a0) /* 03E380 8003D780 24060005 */ li $a2, 5 /* 03E384 8003D784 0C00F366 */ jal func_8003CD98 /* 03E388 8003D788 00003825 */ move $a3, $zero -/* 03E38C 8003D78C 3C04800E */ lui $a0, %hi(D_800DC4F4) # $a0, 0x800e +/* 03E38C 8003D78C 3C04800E */ lui $a0, %hi(gPlayerSeven) # $a0, 0x800e /* 03E390 8003D790 3C05800E */ lui $a1, %hi(camera1) # $a1, 0x800e /* 03E394 8003D794 8CA5DB40 */ lw $a1, %lo(camera1)($a1) -/* 03E398 8003D798 8C84C4F4 */ lw $a0, %lo(D_800DC4F4)($a0) +/* 03E398 8003D798 8C84C4F4 */ lw $a0, %lo(gPlayerSeven)($a0) /* 03E39C 8003D79C 24060006 */ li $a2, 6 /* 03E3A0 8003D7A0 0C00F366 */ jal func_8003CD98 /* 03E3A4 8003D7A4 00003825 */ move $a3, $zero -/* 03E3A8 8003D7A8 3C04800E */ lui $a0, %hi(D_800DC4F8) # $a0, 0x800e +/* 03E3A8 8003D7A8 3C04800E */ lui $a0, %hi(gPlayerEight) # $a0, 0x800e /* 03E3AC 8003D7AC 3C05800E */ lui $a1, %hi(camera1) # $a1, 0x800e /* 03E3B0 8003D7B0 8CA5DB40 */ lw $a1, %lo(camera1)($a1) -/* 03E3B4 8003D7B4 8C84C4F8 */ lw $a0, %lo(D_800DC4F8)($a0) +/* 03E3B4 8003D7B4 8C84C4F8 */ lw $a0, %lo(gPlayerEight)($a0) /* 03E3B8 8003D7B8 24060007 */ li $a2, 7 /* 03E3BC 8003D7BC 0C00F366 */ jal func_8003CD98 /* 03E3C0 8003D7C0 00003825 */ move $a3, $zero @@ -491,112 +491,112 @@ glabel func_8003D080 .L8003D7CC: /* 03E3CC 8003D7CC 3C05800E */ lui $a1, %hi(camera1) # $a1, 0x800e /* 03E3D0 8003D7D0 8CA5DB40 */ lw $a1, %lo(camera1)($a1) -/* 03E3D4 8003D7D4 8C84C4FC */ lw $a0, %lo(D_800DC4FC)($a0) # -0x3b04($a0) +/* 03E3D4 8003D7D4 8C84C4FC */ lw $a0, %lo(gPlayerOneCopy)($a0) # -0x3b04($a0) /* 03E3D8 8003D7D8 00003025 */ move $a2, $zero /* 03E3DC 8003D7DC 0C00F366 */ jal func_8003CD98 /* 03E3E0 8003D7E0 00003825 */ move $a3, $zero -/* 03E3E4 8003D7E4 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e +/* 03E3E4 8003D7E4 3C04800E */ lui $a0, %hi(gPlayerTwo) # $a0, 0x800e /* 03E3E8 8003D7E8 3C05800E */ lui $a1, %hi(camera1) # $a1, 0x800e /* 03E3EC 8003D7EC 8CA5DB40 */ lw $a1, %lo(camera1)($a1) -/* 03E3F0 8003D7F0 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) +/* 03E3F0 8003D7F0 8C84C4E0 */ lw $a0, %lo(gPlayerTwo)($a0) /* 03E3F4 8003D7F4 24060001 */ li $a2, 1 /* 03E3F8 8003D7F8 0C00F366 */ jal func_8003CD98 /* 03E3FC 8003D7FC 00003825 */ move $a3, $zero -/* 03E400 8003D800 3C04800E */ lui $a0, %hi(D_800DC4E4) # $a0, 0x800e +/* 03E400 8003D800 3C04800E */ lui $a0, %hi(gPlayerThree) # $a0, 0x800e /* 03E404 8003D804 3C05800E */ lui $a1, %hi(camera1) # $a1, 0x800e /* 03E408 8003D808 8CA5DB40 */ lw $a1, %lo(camera1)($a1) -/* 03E40C 8003D80C 8C84C4E4 */ lw $a0, %lo(D_800DC4E4)($a0) +/* 03E40C 8003D80C 8C84C4E4 */ lw $a0, %lo(gPlayerThree)($a0) /* 03E410 8003D810 24060002 */ li $a2, 2 /* 03E414 8003D814 0C00F366 */ jal func_8003CD98 /* 03E418 8003D818 00003825 */ move $a3, $zero -/* 03E41C 8003D81C 3C04800E */ lui $a0, %hi(D_800DC4E8) # $a0, 0x800e +/* 03E41C 8003D81C 3C04800E */ lui $a0, %hi(gPlayerFour) # $a0, 0x800e /* 03E420 8003D820 3C05800E */ lui $a1, %hi(camera1) # $a1, 0x800e /* 03E424 8003D824 8CA5DB40 */ lw $a1, %lo(camera1)($a1) -/* 03E428 8003D828 8C84C4E8 */ lw $a0, %lo(D_800DC4E8)($a0) +/* 03E428 8003D828 8C84C4E8 */ lw $a0, %lo(gPlayerFour)($a0) /* 03E42C 8003D82C 24060003 */ li $a2, 3 /* 03E430 8003D830 0C00F366 */ jal func_8003CD98 /* 03E434 8003D834 00003825 */ move $a3, $zero -/* 03E438 8003D838 3C04800E */ lui $a0, %hi(D_800DC4EC) # $a0, 0x800e +/* 03E438 8003D838 3C04800E */ lui $a0, %hi(gPlayerFive) # $a0, 0x800e /* 03E43C 8003D83C 3C05800E */ lui $a1, %hi(camera1) # $a1, 0x800e /* 03E440 8003D840 8CA5DB40 */ lw $a1, %lo(camera1)($a1) -/* 03E444 8003D844 8C84C4EC */ lw $a0, %lo(D_800DC4EC)($a0) +/* 03E444 8003D844 8C84C4EC */ lw $a0, %lo(gPlayerFive)($a0) /* 03E448 8003D848 24060004 */ li $a2, 4 /* 03E44C 8003D84C 0C00F366 */ jal func_8003CD98 /* 03E450 8003D850 00003825 */ move $a3, $zero -/* 03E454 8003D854 3C04800E */ lui $a0, %hi(D_800DC4F0) # $a0, 0x800e +/* 03E454 8003D854 3C04800E */ lui $a0, %hi(gPlayerSix) # $a0, 0x800e /* 03E458 8003D858 3C05800E */ lui $a1, %hi(camera1) # $a1, 0x800e /* 03E45C 8003D85C 8CA5DB40 */ lw $a1, %lo(camera1)($a1) -/* 03E460 8003D860 8C84C4F0 */ lw $a0, %lo(D_800DC4F0)($a0) +/* 03E460 8003D860 8C84C4F0 */ lw $a0, %lo(gPlayerSix)($a0) /* 03E464 8003D864 24060005 */ li $a2, 5 /* 03E468 8003D868 0C00F366 */ jal func_8003CD98 /* 03E46C 8003D86C 00003825 */ move $a3, $zero -/* 03E470 8003D870 3C04800E */ lui $a0, %hi(D_800DC4F4) # $a0, 0x800e +/* 03E470 8003D870 3C04800E */ lui $a0, %hi(gPlayerSeven) # $a0, 0x800e /* 03E474 8003D874 3C05800E */ lui $a1, %hi(camera1) # $a1, 0x800e /* 03E478 8003D878 8CA5DB40 */ lw $a1, %lo(camera1)($a1) -/* 03E47C 8003D87C 8C84C4F4 */ lw $a0, %lo(D_800DC4F4)($a0) +/* 03E47C 8003D87C 8C84C4F4 */ lw $a0, %lo(gPlayerSeven)($a0) /* 03E480 8003D880 24060006 */ li $a2, 6 /* 03E484 8003D884 0C00F366 */ jal func_8003CD98 /* 03E488 8003D888 00003825 */ move $a3, $zero -/* 03E48C 8003D88C 3C04800E */ lui $a0, %hi(D_800DC4F8) # $a0, 0x800e +/* 03E48C 8003D88C 3C04800E */ lui $a0, %hi(gPlayerEight) # $a0, 0x800e /* 03E490 8003D890 3C05800E */ lui $a1, %hi(camera1) # $a1, 0x800e /* 03E494 8003D894 8CA5DB40 */ lw $a1, %lo(camera1)($a1) -/* 03E498 8003D898 8C84C4F8 */ lw $a0, %lo(D_800DC4F8)($a0) +/* 03E498 8003D898 8C84C4F8 */ lw $a0, %lo(gPlayerEight)($a0) /* 03E49C 8003D89C 24060007 */ li $a2, 7 /* 03E4A0 8003D8A0 0C00F366 */ jal func_8003CD98 /* 03E4A4 8003D8A4 00003825 */ move $a3, $zero -/* 03E4A8 8003D8A8 3C04800E */ lui $a0, %hi(D_800DC4FC) # $a0, 0x800e +/* 03E4A8 8003D8A8 3C04800E */ lui $a0, %hi(gPlayerOneCopy) # $a0, 0x800e /* 03E4AC 8003D8AC 3C05800E */ lui $a1, %hi(camera2) # $a1, 0x800e /* 03E4B0 8003D8B0 8CA5DB44 */ lw $a1, %lo(camera2)($a1) -/* 03E4B4 8003D8B4 8C84C4FC */ lw $a0, %lo(D_800DC4FC)($a0) +/* 03E4B4 8003D8B4 8C84C4FC */ lw $a0, %lo(gPlayerOneCopy)($a0) /* 03E4B8 8003D8B8 00003025 */ move $a2, $zero /* 03E4BC 8003D8BC 0C00F366 */ jal func_8003CD98 /* 03E4C0 8003D8C0 24070001 */ li $a3, 1 -/* 03E4C4 8003D8C4 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e +/* 03E4C4 8003D8C4 3C04800E */ lui $a0, %hi(gPlayerTwo) # $a0, 0x800e /* 03E4C8 8003D8C8 3C05800E */ lui $a1, %hi(camera2) # $a1, 0x800e /* 03E4CC 8003D8CC 8CA5DB44 */ lw $a1, %lo(camera2)($a1) -/* 03E4D0 8003D8D0 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) +/* 03E4D0 8003D8D0 8C84C4E0 */ lw $a0, %lo(gPlayerTwo)($a0) /* 03E4D4 8003D8D4 24060001 */ li $a2, 1 /* 03E4D8 8003D8D8 0C00F366 */ jal func_8003CD98 /* 03E4DC 8003D8DC 24070001 */ li $a3, 1 -/* 03E4E0 8003D8E0 3C04800E */ lui $a0, %hi(D_800DC4E4) # $a0, 0x800e +/* 03E4E0 8003D8E0 3C04800E */ lui $a0, %hi(gPlayerThree) # $a0, 0x800e /* 03E4E4 8003D8E4 3C05800E */ lui $a1, %hi(camera2) # $a1, 0x800e /* 03E4E8 8003D8E8 8CA5DB44 */ lw $a1, %lo(camera2)($a1) -/* 03E4EC 8003D8EC 8C84C4E4 */ lw $a0, %lo(D_800DC4E4)($a0) +/* 03E4EC 8003D8EC 8C84C4E4 */ lw $a0, %lo(gPlayerThree)($a0) /* 03E4F0 8003D8F0 24060002 */ li $a2, 2 /* 03E4F4 8003D8F4 0C00F366 */ jal func_8003CD98 /* 03E4F8 8003D8F8 24070001 */ li $a3, 1 -/* 03E4FC 8003D8FC 3C04800E */ lui $a0, %hi(D_800DC4E8) # $a0, 0x800e +/* 03E4FC 8003D8FC 3C04800E */ lui $a0, %hi(gPlayerFour) # $a0, 0x800e /* 03E500 8003D900 3C05800E */ lui $a1, %hi(camera2) # $a1, 0x800e /* 03E504 8003D904 8CA5DB44 */ lw $a1, %lo(camera2)($a1) -/* 03E508 8003D908 8C84C4E8 */ lw $a0, %lo(D_800DC4E8)($a0) +/* 03E508 8003D908 8C84C4E8 */ lw $a0, %lo(gPlayerFour)($a0) /* 03E50C 8003D90C 24060003 */ li $a2, 3 /* 03E510 8003D910 0C00F366 */ jal func_8003CD98 /* 03E514 8003D914 24070001 */ li $a3, 1 -/* 03E518 8003D918 3C04800E */ lui $a0, %hi(D_800DC4EC) # $a0, 0x800e +/* 03E518 8003D918 3C04800E */ lui $a0, %hi(gPlayerFive) # $a0, 0x800e /* 03E51C 8003D91C 3C05800E */ lui $a1, %hi(camera2) # $a1, 0x800e /* 03E520 8003D920 8CA5DB44 */ lw $a1, %lo(camera2)($a1) -/* 03E524 8003D924 8C84C4EC */ lw $a0, %lo(D_800DC4EC)($a0) +/* 03E524 8003D924 8C84C4EC */ lw $a0, %lo(gPlayerFive)($a0) /* 03E528 8003D928 24060004 */ li $a2, 4 /* 03E52C 8003D92C 0C00F366 */ jal func_8003CD98 /* 03E530 8003D930 24070001 */ li $a3, 1 -/* 03E534 8003D934 3C04800E */ lui $a0, %hi(D_800DC4F0) # $a0, 0x800e +/* 03E534 8003D934 3C04800E */ lui $a0, %hi(gPlayerSix) # $a0, 0x800e /* 03E538 8003D938 3C05800E */ lui $a1, %hi(camera2) # $a1, 0x800e /* 03E53C 8003D93C 8CA5DB44 */ lw $a1, %lo(camera2)($a1) -/* 03E540 8003D940 8C84C4F0 */ lw $a0, %lo(D_800DC4F0)($a0) +/* 03E540 8003D940 8C84C4F0 */ lw $a0, %lo(gPlayerSix)($a0) /* 03E544 8003D944 24060005 */ li $a2, 5 /* 03E548 8003D948 0C00F366 */ jal func_8003CD98 /* 03E54C 8003D94C 24070001 */ li $a3, 1 -/* 03E550 8003D950 3C04800E */ lui $a0, %hi(D_800DC4F4) # $a0, 0x800e +/* 03E550 8003D950 3C04800E */ lui $a0, %hi(gPlayerSeven) # $a0, 0x800e /* 03E554 8003D954 3C05800E */ lui $a1, %hi(camera2) # $a1, 0x800e /* 03E558 8003D958 8CA5DB44 */ lw $a1, %lo(camera2)($a1) -/* 03E55C 8003D95C 8C84C4F4 */ lw $a0, %lo(D_800DC4F4)($a0) +/* 03E55C 8003D95C 8C84C4F4 */ lw $a0, %lo(gPlayerSeven)($a0) /* 03E560 8003D960 24060006 */ li $a2, 6 /* 03E564 8003D964 0C00F366 */ jal func_8003CD98 /* 03E568 8003D968 24070001 */ li $a3, 1 -/* 03E56C 8003D96C 3C04800E */ lui $a0, %hi(D_800DC4F8) # $a0, 0x800e +/* 03E56C 8003D96C 3C04800E */ lui $a0, %hi(gPlayerEight) # $a0, 0x800e /* 03E570 8003D970 3C05800E */ lui $a1, %hi(camera2) # $a1, 0x800e /* 03E574 8003D974 8CA5DB44 */ lw $a1, %lo(camera2)($a1) -/* 03E578 8003D978 8C84C4F8 */ lw $a0, %lo(D_800DC4F8)($a0) +/* 03E578 8003D978 8C84C4F8 */ lw $a0, %lo(gPlayerEight)($a0) /* 03E57C 8003D97C 24060007 */ li $a2, 7 /* 03E580 8003D980 0C00F366 */ jal func_8003CD98 /* 03E584 8003D984 24070001 */ li $a3, 1 @@ -605,112 +605,112 @@ glabel func_8003D080 .L8003D990: /* 03E590 8003D990 3C05800E */ lui $a1, %hi(camera1) # $a1, 0x800e /* 03E594 8003D994 8CA5DB40 */ lw $a1, %lo(camera1)($a1) -/* 03E598 8003D998 8C84C4FC */ lw $a0, %lo(D_800DC4FC)($a0) # -0x3b04($a0) +/* 03E598 8003D998 8C84C4FC */ lw $a0, %lo(gPlayerOneCopy)($a0) # -0x3b04($a0) /* 03E59C 8003D99C 00003025 */ move $a2, $zero /* 03E5A0 8003D9A0 0C00F366 */ jal func_8003CD98 /* 03E5A4 8003D9A4 00003825 */ move $a3, $zero -/* 03E5A8 8003D9A8 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e +/* 03E5A8 8003D9A8 3C04800E */ lui $a0, %hi(gPlayerTwo) # $a0, 0x800e /* 03E5AC 8003D9AC 3C05800E */ lui $a1, %hi(camera1) # $a1, 0x800e /* 03E5B0 8003D9B0 8CA5DB40 */ lw $a1, %lo(camera1)($a1) -/* 03E5B4 8003D9B4 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) +/* 03E5B4 8003D9B4 8C84C4E0 */ lw $a0, %lo(gPlayerTwo)($a0) /* 03E5B8 8003D9B8 24060001 */ li $a2, 1 /* 03E5BC 8003D9BC 0C00F366 */ jal func_8003CD98 /* 03E5C0 8003D9C0 00003825 */ move $a3, $zero -/* 03E5C4 8003D9C4 3C04800E */ lui $a0, %hi(D_800DC4E4) # $a0, 0x800e +/* 03E5C4 8003D9C4 3C04800E */ lui $a0, %hi(gPlayerThree) # $a0, 0x800e /* 03E5C8 8003D9C8 3C05800E */ lui $a1, %hi(camera1) # $a1, 0x800e /* 03E5CC 8003D9CC 8CA5DB40 */ lw $a1, %lo(camera1)($a1) -/* 03E5D0 8003D9D0 8C84C4E4 */ lw $a0, %lo(D_800DC4E4)($a0) +/* 03E5D0 8003D9D0 8C84C4E4 */ lw $a0, %lo(gPlayerThree)($a0) /* 03E5D4 8003D9D4 24060002 */ li $a2, 2 /* 03E5D8 8003D9D8 0C00F366 */ jal func_8003CD98 /* 03E5DC 8003D9DC 00003825 */ move $a3, $zero -/* 03E5E0 8003D9E0 3C04800E */ lui $a0, %hi(D_800DC4E8) # $a0, 0x800e +/* 03E5E0 8003D9E0 3C04800E */ lui $a0, %hi(gPlayerFour) # $a0, 0x800e /* 03E5E4 8003D9E4 3C05800E */ lui $a1, %hi(camera1) # $a1, 0x800e /* 03E5E8 8003D9E8 8CA5DB40 */ lw $a1, %lo(camera1)($a1) -/* 03E5EC 8003D9EC 8C84C4E8 */ lw $a0, %lo(D_800DC4E8)($a0) +/* 03E5EC 8003D9EC 8C84C4E8 */ lw $a0, %lo(gPlayerFour)($a0) /* 03E5F0 8003D9F0 24060003 */ li $a2, 3 /* 03E5F4 8003D9F4 0C00F366 */ jal func_8003CD98 /* 03E5F8 8003D9F8 00003825 */ move $a3, $zero -/* 03E5FC 8003D9FC 3C04800E */ lui $a0, %hi(D_800DC4FC) # $a0, 0x800e +/* 03E5FC 8003D9FC 3C04800E */ lui $a0, %hi(gPlayerOneCopy) # $a0, 0x800e /* 03E600 8003DA00 3C05800E */ lui $a1, %hi(camera2) # $a1, 0x800e /* 03E604 8003DA04 8CA5DB44 */ lw $a1, %lo(camera2)($a1) -/* 03E608 8003DA08 8C84C4FC */ lw $a0, %lo(D_800DC4FC)($a0) +/* 03E608 8003DA08 8C84C4FC */ lw $a0, %lo(gPlayerOneCopy)($a0) /* 03E60C 8003DA0C 00003025 */ move $a2, $zero /* 03E610 8003DA10 0C00F366 */ jal func_8003CD98 /* 03E614 8003DA14 24070001 */ li $a3, 1 -/* 03E618 8003DA18 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e +/* 03E618 8003DA18 3C04800E */ lui $a0, %hi(gPlayerTwo) # $a0, 0x800e /* 03E61C 8003DA1C 3C05800E */ lui $a1, %hi(camera2) # $a1, 0x800e /* 03E620 8003DA20 8CA5DB44 */ lw $a1, %lo(camera2)($a1) -/* 03E624 8003DA24 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) +/* 03E624 8003DA24 8C84C4E0 */ lw $a0, %lo(gPlayerTwo)($a0) /* 03E628 8003DA28 24060001 */ li $a2, 1 /* 03E62C 8003DA2C 0C00F366 */ jal func_8003CD98 /* 03E630 8003DA30 24070001 */ li $a3, 1 -/* 03E634 8003DA34 3C04800E */ lui $a0, %hi(D_800DC4E4) # $a0, 0x800e +/* 03E634 8003DA34 3C04800E */ lui $a0, %hi(gPlayerThree) # $a0, 0x800e /* 03E638 8003DA38 3C05800E */ lui $a1, %hi(camera2) # $a1, 0x800e /* 03E63C 8003DA3C 8CA5DB44 */ lw $a1, %lo(camera2)($a1) -/* 03E640 8003DA40 8C84C4E4 */ lw $a0, %lo(D_800DC4E4)($a0) +/* 03E640 8003DA40 8C84C4E4 */ lw $a0, %lo(gPlayerThree)($a0) /* 03E644 8003DA44 24060002 */ li $a2, 2 /* 03E648 8003DA48 0C00F366 */ jal func_8003CD98 /* 03E64C 8003DA4C 24070001 */ li $a3, 1 -/* 03E650 8003DA50 3C04800E */ lui $a0, %hi(D_800DC4E8) # $a0, 0x800e +/* 03E650 8003DA50 3C04800E */ lui $a0, %hi(gPlayerFour) # $a0, 0x800e /* 03E654 8003DA54 3C05800E */ lui $a1, %hi(camera2) # $a1, 0x800e /* 03E658 8003DA58 8CA5DB44 */ lw $a1, %lo(camera2)($a1) -/* 03E65C 8003DA5C 8C84C4E8 */ lw $a0, %lo(D_800DC4E8)($a0) +/* 03E65C 8003DA5C 8C84C4E8 */ lw $a0, %lo(gPlayerFour)($a0) /* 03E660 8003DA60 24060003 */ li $a2, 3 /* 03E664 8003DA64 0C00F366 */ jal func_8003CD98 /* 03E668 8003DA68 24070001 */ li $a3, 1 -/* 03E66C 8003DA6C 3C04800E */ lui $a0, %hi(D_800DC4FC) # $a0, 0x800e +/* 03E66C 8003DA6C 3C04800E */ lui $a0, %hi(gPlayerOneCopy) # $a0, 0x800e /* 03E670 8003DA70 3C05800E */ lui $a1, %hi(camera3) # $a1, 0x800e /* 03E674 8003DA74 8CA5DB48 */ lw $a1, %lo(camera3)($a1) -/* 03E678 8003DA78 8C84C4FC */ lw $a0, %lo(D_800DC4FC)($a0) +/* 03E678 8003DA78 8C84C4FC */ lw $a0, %lo(gPlayerOneCopy)($a0) /* 03E67C 8003DA7C 00003025 */ move $a2, $zero /* 03E680 8003DA80 0C00F366 */ jal func_8003CD98 /* 03E684 8003DA84 24070002 */ li $a3, 2 -/* 03E688 8003DA88 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e +/* 03E688 8003DA88 3C04800E */ lui $a0, %hi(gPlayerTwo) # $a0, 0x800e /* 03E68C 8003DA8C 3C05800E */ lui $a1, %hi(camera3) # $a1, 0x800e /* 03E690 8003DA90 8CA5DB48 */ lw $a1, %lo(camera3)($a1) -/* 03E694 8003DA94 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) +/* 03E694 8003DA94 8C84C4E0 */ lw $a0, %lo(gPlayerTwo)($a0) /* 03E698 8003DA98 24060001 */ li $a2, 1 /* 03E69C 8003DA9C 0C00F366 */ jal func_8003CD98 /* 03E6A0 8003DAA0 24070002 */ li $a3, 2 -/* 03E6A4 8003DAA4 3C04800E */ lui $a0, %hi(D_800DC4E4) # $a0, 0x800e +/* 03E6A4 8003DAA4 3C04800E */ lui $a0, %hi(gPlayerThree) # $a0, 0x800e /* 03E6A8 8003DAA8 3C05800E */ lui $a1, %hi(camera3) # $a1, 0x800e /* 03E6AC 8003DAAC 8CA5DB48 */ lw $a1, %lo(camera3)($a1) -/* 03E6B0 8003DAB0 8C84C4E4 */ lw $a0, %lo(D_800DC4E4)($a0) +/* 03E6B0 8003DAB0 8C84C4E4 */ lw $a0, %lo(gPlayerThree)($a0) /* 03E6B4 8003DAB4 24060002 */ li $a2, 2 /* 03E6B8 8003DAB8 0C00F366 */ jal func_8003CD98 /* 03E6BC 8003DABC 24070002 */ li $a3, 2 -/* 03E6C0 8003DAC0 3C04800E */ lui $a0, %hi(D_800DC4E8) # $a0, 0x800e +/* 03E6C0 8003DAC0 3C04800E */ lui $a0, %hi(gPlayerFour) # $a0, 0x800e /* 03E6C4 8003DAC4 3C05800E */ lui $a1, %hi(camera3) # $a1, 0x800e /* 03E6C8 8003DAC8 8CA5DB48 */ lw $a1, %lo(camera3)($a1) -/* 03E6CC 8003DACC 8C84C4E8 */ lw $a0, %lo(D_800DC4E8)($a0) +/* 03E6CC 8003DACC 8C84C4E8 */ lw $a0, %lo(gPlayerFour)($a0) /* 03E6D0 8003DAD0 24060003 */ li $a2, 3 /* 03E6D4 8003DAD4 0C00F366 */ jal func_8003CD98 /* 03E6D8 8003DAD8 24070002 */ li $a3, 2 -/* 03E6DC 8003DADC 3C04800E */ lui $a0, %hi(D_800DC4FC) # $a0, 0x800e +/* 03E6DC 8003DADC 3C04800E */ lui $a0, %hi(gPlayerOneCopy) # $a0, 0x800e /* 03E6E0 8003DAE0 3C05800E */ lui $a1, %hi(camera4) # $a1, 0x800e /* 03E6E4 8003DAE4 8CA5DB4C */ lw $a1, %lo(camera4)($a1) -/* 03E6E8 8003DAE8 8C84C4FC */ lw $a0, %lo(D_800DC4FC)($a0) +/* 03E6E8 8003DAE8 8C84C4FC */ lw $a0, %lo(gPlayerOneCopy)($a0) /* 03E6EC 8003DAEC 00003025 */ move $a2, $zero /* 03E6F0 8003DAF0 0C00F366 */ jal func_8003CD98 /* 03E6F4 8003DAF4 24070003 */ li $a3, 3 -/* 03E6F8 8003DAF8 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e +/* 03E6F8 8003DAF8 3C04800E */ lui $a0, %hi(gPlayerTwo) # $a0, 0x800e /* 03E6FC 8003DAFC 3C05800E */ lui $a1, %hi(camera4) # $a1, 0x800e /* 03E700 8003DB00 8CA5DB4C */ lw $a1, %lo(camera4)($a1) -/* 03E704 8003DB04 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) +/* 03E704 8003DB04 8C84C4E0 */ lw $a0, %lo(gPlayerTwo)($a0) /* 03E708 8003DB08 24060001 */ li $a2, 1 /* 03E70C 8003DB0C 0C00F366 */ jal func_8003CD98 /* 03E710 8003DB10 24070003 */ li $a3, 3 -/* 03E714 8003DB14 3C04800E */ lui $a0, %hi(D_800DC4E4) # $a0, 0x800e +/* 03E714 8003DB14 3C04800E */ lui $a0, %hi(gPlayerThree) # $a0, 0x800e /* 03E718 8003DB18 3C05800E */ lui $a1, %hi(camera4) # $a1, 0x800e /* 03E71C 8003DB1C 8CA5DB4C */ lw $a1, %lo(camera4)($a1) -/* 03E720 8003DB20 8C84C4E4 */ lw $a0, %lo(D_800DC4E4)($a0) +/* 03E720 8003DB20 8C84C4E4 */ lw $a0, %lo(gPlayerThree)($a0) /* 03E724 8003DB24 24060002 */ li $a2, 2 /* 03E728 8003DB28 0C00F366 */ jal func_8003CD98 /* 03E72C 8003DB2C 24070003 */ li $a3, 3 -/* 03E730 8003DB30 3C04800E */ lui $a0, %hi(D_800DC4E8) # $a0, 0x800e +/* 03E730 8003DB30 3C04800E */ lui $a0, %hi(gPlayerFour) # $a0, 0x800e /* 03E734 8003DB34 3C05800E */ lui $a1, %hi(camera4) # $a1, 0x800e /* 03E738 8003DB38 8CA5DB4C */ lw $a1, %lo(camera4)($a1) -/* 03E73C 8003DB3C 8C84C4E8 */ lw $a0, %lo(D_800DC4E8)($a0) +/* 03E73C 8003DB3C 8C84C4E8 */ lw $a0, %lo(gPlayerFour)($a0) /* 03E740 8003DB40 24060003 */ li $a2, 3 /* 03E744 8003DB44 0C00F366 */ jal func_8003CD98 /* 03E748 8003DB48 24070003 */ li $a3, 3 @@ -718,4 +718,4 @@ glabel func_8003D080 .L8003DB50: /* 03E750 8003DB50 27BD0028 */ addiu $sp, $sp, 0x28 /* 03E754 8003DB54 03E00008 */ jr $ra -/* 03E758 8003DB58 00000000 */ nop +/* 03E758 8003DB58 00000000 */ nop diff --git a/asm/non_matchings/code_800431B0/func_8004F168.s b/asm/non_matchings/code_800431B0/func_8004F168.s index 7b003fe62..ef8d64bf6 100644 --- a/asm/non_matchings/code_800431B0/func_8004F168.s +++ b/asm/non_matchings/code_800431B0/func_8004F168.s @@ -3,8 +3,8 @@ glabel func_8004F168 /* 04FD6C 8004F16C 01C57023 */ subu $t6, $t6, $a1 /* 04FD70 8004F170 000E7100 */ sll $t6, $t6, 4 /* 04FD74 8004F174 01C57023 */ subu $t6, $t6, $a1 -/* 04FD78 8004F178 3C0F800E */ lui $t7, %hi(D_800DC4DC) # $t7, 0x800e -/* 04FD7C 8004F17C 8DEFC4DC */ lw $t7, %lo(D_800DC4DC)($t7) +/* 04FD78 8004F178 3C0F800E */ lui $t7, %hi(gPlayerOne) # $t7, 0x800e +/* 04FD7C 8004F17C 8DEFC4DC */ lw $t7, %lo(gPlayerOne)($t7) /* 04FD80 8004F180 27BDFFD0 */ addiu $sp, $sp, -0x30 /* 04FD84 8004F184 000E7080 */ sll $t6, $t6, 2 /* 04FD88 8004F188 01C57023 */ subu $t6, $t6, $a1 @@ -164,4 +164,4 @@ glabel func_8004F168 .L8004F3D8: /* 04FFD8 8004F3D8 27BD0030 */ addiu $sp, $sp, 0x30 /* 04FFDC 8004F3DC 03E00008 */ jr $ra -/* 04FFE0 8004F3E0 00000000 */ nop +/* 04FFE0 8004F3E0 00000000 */ nop diff --git a/asm/non_matchings/code_800431B0/func_8004F3E4.s b/asm/non_matchings/code_800431B0/func_8004F3E4.s index 2f4f3fe45..f8e323026 100644 --- a/asm/non_matchings/code_800431B0/func_8004F3E4.s +++ b/asm/non_matchings/code_800431B0/func_8004F3E4.s @@ -29,10 +29,10 @@ glabel func_8004F3E4 /* 05004C 8004F44C 2631FFFF */ addiu $s1, $s1, -1 /* 050050 8004F450 0620001A */ bltz $s1, .L8004F4BC /* 050054 8004F454 00117040 */ sll $t6, $s1, 1 -/* 050058 8004F458 3C12800E */ lui $s2, %hi(D_800DC4DC) # $s2, 0x800e +/* 050058 8004F458 3C12800E */ lui $s2, %hi(gPlayerOne) # $s2, 0x800e /* 05005C 8004F45C 3C118016 */ lui $s1, %hi(D_80164360) # $s1, 0x8016 /* 050060 8004F460 26314360 */ addiu $s1, %lo(D_80164360) # addiu $s1, $s1, 0x4360 -/* 050064 8004F464 2652C4DC */ addiu $s2, %lo(D_800DC4DC) # addiu $s2, $s2, -0x3b24 +/* 050064 8004F464 2652C4DC */ addiu $s2, %lo(gPlayerOne) # addiu $s2, $s2, -0x3b24 /* 050068 8004F468 01CF8021 */ addu $s0, $t6, $t7 /* 05006C 8004F46C 24130DD8 */ li $s3, 3544 /* 050070 8004F470 86050000 */ lh $a1, ($s0) @@ -57,8 +57,8 @@ glabel func_8004F3E4 /* 0500B4 8004F4B4 8E31D158 */ lw $s1, %lo(D_8018D158)($s1) /* 0500B8 8004F4B8 2631FFFF */ addiu $s1, $s1, -1 .L8004F4BC: -/* 0500BC 8004F4BC 3C12800E */ lui $s2, %hi(D_800DC4DC) # $s2, 0x800e -/* 0500C0 8004F4C0 2652C4DC */ addiu $s2, %lo(D_800DC4DC) # addiu $s2, $s2, -0x3b24 +/* 0500BC 8004F4BC 3C12800E */ lui $s2, %hi(gPlayerOne) # $s2, 0x800e +/* 0500C0 8004F4C0 2652C4DC */ addiu $s2, %lo(gPlayerOne) # addiu $s2, $s2, -0x3b24 /* 0500C4 8004F4C4 06200063 */ bltz $s1, .L8004F654 /* 0500C8 8004F4C8 24130DD8 */ li $s3, 3544 /* 0500CC 8004F4CC 00115840 */ sll $t3, $s1, 1 @@ -76,7 +76,7 @@ glabel func_8004F3E4 /* 0500F8 8004F4F8 944F0000 */ lhu $t7, ($v0) /* 0500FC 8004F4FC 31F81000 */ andi $t8, $t7, 0x1000 /* 050100 8004F500 12380003 */ beq $s1, $t8, .L8004F510 -/* 050104 8004F504 00000000 */ nop +/* 050104 8004F504 00000000 */ nop /* 050108 8004F508 0C013C5A */ jal func_8004F168 /* 05010C 8004F50C 94460254 */ lhu $a2, 0x254($v0) .L8004F510: @@ -89,8 +89,8 @@ glabel func_8004F3E4 /* 050128 8004F528 1000004B */ b .L8004F658 /* 05012C 8004F52C 8FBF002C */ lw $ra, 0x2c($sp) .L8004F530: -/* 050130 8004F530 3C02800E */ lui $v0, %hi(D_800DC4DC) # $v0, 0x800e -/* 050134 8004F534 8C42C4DC */ lw $v0, %lo(D_800DC4DC)($v0) +/* 050130 8004F530 3C02800E */ lui $v0, %hi(gPlayerOne) # $v0, 0x800e +/* 050134 8004F534 8C42C4DC */ lw $v0, %lo(gPlayerOne)($v0) /* 050138 8004F538 00008025 */ move $s0, $zero /* 05013C 8004F53C 24130008 */ li $s3, 8 /* 050140 8004F540 24120100 */ li $s2, 256 @@ -104,8 +104,8 @@ glabel func_8004F3E4 /* 05015C 8004F55C 26310001 */ addiu $s1, $s1, 1 /* 050160 8004F560 0C013C5A */ jal func_8004F168 /* 050164 8004F564 02603025 */ move $a2, $s3 -/* 050168 8004F568 3C02800E */ lui $v0, %hi(D_800DC4DC) # $v0, 0x800e -/* 05016C 8004F56C 8C42C4DC */ lw $v0, %lo(D_800DC4DC)($v0) +/* 050168 8004F568 3C02800E */ lui $v0, %hi(gPlayerOne) # $v0, 0x800e +/* 05016C 8004F56C 8C42C4DC */ lw $v0, %lo(gPlayerOne)($v0) /* 050170 8004F570 26310001 */ addiu $s1, $s1, 1 .L8004F574: /* 050174 8004F574 1633FFF3 */ bne $s1, $s3, .L8004F544 @@ -123,10 +123,10 @@ glabel func_8004F3E4 /* 0501A0 8004F5A0 2631FFFF */ addiu $s1, $s1, -1 /* 0501A4 8004F5A4 0620002B */ bltz $s1, .L8004F654 /* 0501A8 8004F5A8 00115840 */ sll $t3, $s1, 1 -/* 0501AC 8004F5AC 3C12800E */ lui $s2, %hi(D_800DC4DC) # $s2, 0x800e +/* 0501AC 8004F5AC 3C12800E */ lui $s2, %hi(gPlayerOne) # $s2, 0x800e /* 0501B0 8004F5B0 3C118016 */ lui $s1, %hi(D_80164360) # $s1, 0x8016 /* 0501B4 8004F5B4 26314360 */ addiu $s1, %lo(D_80164360) # addiu $s1, $s1, 0x4360 -/* 0501B8 8004F5B8 2652C4DC */ addiu $s2, %lo(D_800DC4DC) # addiu $s2, $s2, -0x3b24 +/* 0501B8 8004F5B8 2652C4DC */ addiu $s2, %lo(gPlayerOne) # addiu $s2, $s2, -0x3b24 /* 0501BC 8004F5BC 016C8021 */ addu $s0, $t3, $t4 /* 0501C0 8004F5C0 24130DD8 */ li $s3, 3544 /* 0501C4 8004F5C4 86050000 */ lh $a1, ($s0) @@ -149,8 +149,8 @@ glabel func_8004F3E4 /* 050200 8004F600 00008825 */ move $s1, $zero /* 050204 8004F604 00008025 */ move $s0, $zero /* 050208 8004F608 18600012 */ blez $v1, .L8004F654 -/* 05020C 8004F60C 3C12800E */ lui $s2, %hi(D_800DC4DC) # $s2, 0x800e -/* 050210 8004F610 2652C4DC */ addiu $s2, %lo(D_800DC4DC) # addiu $s2, $s2, -0x3b24 +/* 05020C 8004F60C 3C12800E */ lui $s2, %hi(gPlayerOne) # $s2, 0x800e +/* 050210 8004F610 2652C4DC */ addiu $s2, %lo(gPlayerOne) # addiu $s2, $s2, -0x3b24 .L8004F614: /* 050214 8004F614 8E580000 */ lw $t8, ($s2) /* 050218 8004F618 02802025 */ move $a0, $s4 diff --git a/asm/non_matchings/code_800431B0/func_80050320.s b/asm/non_matchings/code_800431B0/func_80050320.s index 413b5f074..e486efa6f 100644 --- a/asm/non_matchings/code_800431B0/func_80050320.s +++ b/asm/non_matchings/code_800431B0/func_80050320.s @@ -16,7 +16,7 @@ glabel func_80050320 /* 050F58 80050358 F7B40028 */ sdc1 $f20, 0x28($sp) /* 050F5C 8005035C 3C128019 */ lui $s2, %hi(D_8018D050) # $s2, 0x8019 /* 050F60 80050360 3C178019 */ lui $s7, %hi(D_8018D3E0) # $s7, 0x8019 -/* 050F64 80050364 3C15800E */ lui $s5, %hi(D_800DC4DC) # $s5, 0x800e +/* 050F64 80050364 3C15800E */ lui $s5, %hi(gPlayerOne) # $s5, 0x800e /* 050F68 80050368 3C148016 */ lui $s4, %hi(lapCount) # $s4, 0x8016 /* 050F6C 8005036C 3C138019 */ lui $s3, %hi(D_8018D078) # $s3, 0x8019 /* 050F70 80050370 4480B000 */ mtc1 $zero, $f22 @@ -24,7 +24,7 @@ glabel func_80050320 /* 050F78 80050378 4480A000 */ mtc1 $zero, $f20 /* 050F7C 8005037C 2673D078 */ addiu $s3, %lo(D_8018D078) # addiu $s3, $s3, -0x2f88 /* 050F80 80050380 26944390 */ addiu $s4, %lo(lapCount) # addiu $s4, $s4, 0x4390 -/* 050F84 80050384 26B5C4DC */ addiu $s5, %lo(D_800DC4DC) # addiu $s5, $s5, -0x3b24 +/* 050F84 80050384 26B5C4DC */ addiu $s5, %lo(gPlayerOne) # addiu $s5, $s5, -0x3b24 /* 050F88 80050388 26F7D3E0 */ addiu $s7, %lo(D_8018D3E0) # addiu $s7, $s7, -0x2c20 /* 050F8C 8005038C 2652D050 */ addiu $s2, %lo(D_8018D050) # addiu $s2, $s2, -0x2fb0 /* 050F90 80050390 00008025 */ move $s0, $zero @@ -99,10 +99,10 @@ glabel func_80050320 /* 051094 80050494 1616FFC1 */ bne $s0, $s6, .L8005039C /* 051098 80050498 26520004 */ addiu $s2, $s2, 4 /* 05109C 8005049C 10000052 */ b .L800505E8 -/* 0510A0 800504A0 00000000 */ nop +/* 0510A0 800504A0 00000000 */ nop .L800504A4: /* 0510A4 800504A4 3C128019 */ lui $s2, %hi(D_8018D050) # $s2, 0x8019 -/* 0510A8 800504A8 3C15800E */ lui $s5, %hi(D_800DC4DC) # $s5, 0x800e +/* 0510A8 800504A8 3C15800E */ lui $s5, %hi(gPlayerOne) # $s5, 0x800e /* 0510AC 800504AC 3C148016 */ lui $s4, %hi(lapCount) # $s4, 0x8016 /* 0510B0 800504B0 3C138019 */ lui $s3, %hi(D_8018D078) # $s3, 0x8019 /* 0510B4 800504B4 4480B000 */ mtc1 $zero, $f22 @@ -110,7 +110,7 @@ glabel func_80050320 /* 0510BC 800504BC 4480A000 */ mtc1 $zero, $f20 /* 0510C0 800504C0 2673D078 */ addiu $s3, %lo(D_8018D078) # addiu $s3, $s3, -0x2f88 /* 0510C4 800504C4 26944390 */ addiu $s4, %lo(lapCount) # addiu $s4, $s4, 0x4390 -/* 0510C8 800504C8 26B5C4DC */ addiu $s5, %lo(D_800DC4DC) # addiu $s5, $s5, -0x3b24 +/* 0510C8 800504C8 26B5C4DC */ addiu $s5, %lo(gPlayerOne) # addiu $s5, $s5, -0x3b24 /* 0510CC 800504CC 2652D050 */ addiu $s2, %lo(D_8018D050) # addiu $s2, $s2, -0x2fb0 /* 0510D0 800504D0 00008025 */ move $s0, $zero /* 0510D4 800504D4 00008825 */ move $s1, $zero @@ -121,7 +121,7 @@ glabel func_80050320 /* 0510E4 800504E4 00002025 */ move $a0, $zero /* 0510E8 800504E8 02717821 */ addu $t7, $s3, $s1 /* 0510EC 800504EC 460EB03E */ c.le.s $f22, $f14 -/* 0510F0 800504F0 00000000 */ nop +/* 0510F0 800504F0 00000000 */ nop /* 0510F4 800504F4 45020039 */ bc1fl .L800505DC /* 0510F8 800504F8 26100001 */ addiu $s0, $s0, 1 /* 0510FC 800504FC C5E80000 */ lwc1 $f8, ($t7) diff --git a/asm/non_matchings/code_800431B0/func_80050E34.s b/asm/non_matchings/code_800431B0/func_80050E34.s index c0277c6d4..3a6d54946 100644 --- a/asm/non_matchings/code_800431B0/func_80050E34.s +++ b/asm/non_matchings/code_800431B0/func_80050E34.s @@ -3,8 +3,8 @@ glabel func_80050E34 /* 051A38 80050E38 01C47023 */ subu $t6, $t6, $a0 /* 051A3C 80050E3C 000E7100 */ sll $t6, $t6, 4 /* 051A40 80050E40 01C47023 */ subu $t6, $t6, $a0 -/* 051A44 80050E44 3C0F800E */ lui $t7, %hi(D_800DC4DC) # $t7, 0x800e -/* 051A48 80050E48 8DEFC4DC */ lw $t7, %lo(D_800DC4DC)($t7) +/* 051A44 80050E44 3C0F800E */ lui $t7, %hi(gPlayerOne) # $t7, 0x800e +/* 051A48 80050E48 8DEFC4DC */ lw $t7, %lo(gPlayerOne)($t7) /* 051A4C 80050E4C 000E7080 */ sll $t6, $t6, 2 /* 051A50 80050E50 01C47023 */ subu $t6, $t6, $a0 /* 051A54 80050E54 27BDFF28 */ addiu $sp, $sp, -0xd8 @@ -381,8 +381,8 @@ glabel func_80050E34 /* 051FF0 800513F0 3C180600 */ lui $t8, 0x600 /* 051FF4 800513F4 AC580000 */ sw $t8, ($v0) /* 051FF8 800513F8 AC590004 */ sw $t9, 4($v0) -/* 051FFC 800513FC 3C0F800E */ lui $t7, %hi(D_800DC4DC) # $t7, 0x800e -/* 052000 80051400 8DEFC4DC */ lw $t7, %lo(D_800DC4DC)($t7) +/* 051FFC 800513FC 3C0F800E */ lui $t7, %hi(gPlayerOne) # $t7, 0x800e +/* 052000 80051400 8DEFC4DC */ lw $t7, %lo(gPlayerOne)($t7) /* 052004 80051404 8FAE00AC */ lw $t6, 0xac($sp) /* 052008 80051408 3C18800E */ lui $t8, %hi(gScreenModeSelection) # $t8, 0x800e /* 05200C 8005140C 55CF0027 */ bnel $t6, $t7, .L800514AC diff --git a/asm/non_matchings/code_800431B0/func_800514BC.s b/asm/non_matchings/code_800431B0/func_800514BC.s index ec53a2cf9..11be1b037 100644 --- a/asm/non_matchings/code_800431B0/func_800514BC.s +++ b/asm/non_matchings/code_800431B0/func_800514BC.s @@ -13,7 +13,7 @@ glabel func_800514BC /* 0520E8 800514E8 15C00003 */ bnez $t6, .L800514F8 /* 0520EC 800514EC AFB00014 */ sw $s0, 0x14($sp) /* 0520F0 800514F0 0C014230 */ jal func_800508C0 -/* 0520F4 800514F4 00000000 */ nop +/* 0520F4 800514F4 00000000 */ nop .L800514F8: /* 0520F8 800514F8 3C17800E */ lui $s7, %hi(gPlayerCountSelection1) # $s7, 0x800e /* 0520FC 800514FC 26F7C538 */ addiu $s7, %lo(gPlayerCountSelection1) # addiu $s7, $s7, -0x3ac8 @@ -25,7 +25,7 @@ glabel func_800514BC /* 052114 80051514 3C18800E */ lui $t8, %hi(D_800DC52C) # $t8, 0x800e /* 052118 80051518 8F18C52C */ lw $t8, %lo(D_800DC52C)($t8) /* 05211C 8005151C 14580002 */ bne $v0, $t8, .L80051528 -/* 052120 80051520 00000000 */ nop +/* 052120 80051520 00000000 */ nop /* 052124 80051524 00009825 */ move $s3, $zero .L80051528: /* 052128 80051528 1A60001D */ blez $s3, .L800515A0 @@ -33,8 +33,8 @@ glabel func_800514BC /* 052130 80051530 3C088016 */ lui $t0, %hi(D_80164360) # $t0, 0x8016 /* 052134 80051534 25084360 */ addiu $t0, %lo(D_80164360) # addiu $t0, $t0, 0x4360 /* 052138 80051538 0010C840 */ sll $t9, $s0, 1 -/* 05213C 8005153C 3C15800E */ lui $s5, %hi(D_800DC4DC) # $s5, 0x800e -/* 052140 80051540 26B5C4DC */ addiu $s5, %lo(D_800DC4DC) # addiu $s5, $s5, -0x3b24 +/* 05213C 8005153C 3C15800E */ lui $s5, %hi(gPlayerOne) # $s5, 0x800e +/* 052140 80051540 26B5C4DC */ addiu $s5, %lo(gPlayerOne) # addiu $s5, $s5, -0x3b24 /* 052144 80051544 03289021 */ addu $s2, $t9, $t0 /* 052148 80051548 24160001 */ li $s6, 1 /* 05214C 8005154C 24140DD8 */ li $s4, 3544 @@ -49,7 +49,7 @@ glabel func_800514BC /* 05216C 8005156C 51800009 */ beql $t4, $zero, .L80051594 /* 052170 80051570 26310001 */ addiu $s1, $s1, 1 /* 052174 80051574 14800004 */ bnez $a0, .L80051588 -/* 052178 80051578 00000000 */ nop +/* 052178 80051578 00000000 */ nop /* 05217C 8005157C 8EED0000 */ lw $t5, ($s7) /* 052180 80051580 52CD0004 */ beql $s6, $t5, .L80051594 /* 052184 80051584 26310001 */ addiu $s1, $s1, 1 @@ -71,13 +71,13 @@ glabel func_800514BC /* 0521B8 800515B8 0C01438D */ jal func_80050E34 /* 0521BC 800515BC 8CA54408 */ lw $a1, %lo(D_80164408)($a1) /* 0521C0 800515C0 10000008 */ b .L800515E4 -/* 0521C4 800515C4 00000000 */ nop +/* 0521C4 800515C4 00000000 */ nop .L800515C8: /* 0521C8 800515C8 8EEF0000 */ lw $t7, ($s7) /* 0521CC 800515CC 00002025 */ move $a0, $zero /* 0521D0 800515D0 3C058016 */ lui $a1, %hi(D_801643B8) # $a1, 0x8016 /* 0521D4 800515D4 16CF0003 */ bne $s6, $t7, .L800515E4 -/* 0521D8 800515D8 00000000 */ nop +/* 0521D8 800515D8 00000000 */ nop /* 0521DC 800515DC 0C01438D */ jal func_80050E34 /* 0521E0 800515E0 8CA543B8 */ lw $a1, %lo(D_801643B8)($a1) .L800515E4: diff --git a/asm/non_matchings/code_800431B0/func_8005285C.s b/asm/non_matchings/code_800431B0/func_8005285C.s index 39cae01cc..47928aa9b 100644 --- a/asm/non_matchings/code_800431B0/func_8005285C.s +++ b/asm/non_matchings/code_800431B0/func_8005285C.s @@ -2,8 +2,8 @@ glabel func_8005285C /* 05345C 8005285C 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 053460 80052860 AFA40018 */ sw $a0, 0x18($sp) /* 053464 80052864 8FAE0018 */ lw $t6, 0x18($sp) -/* 053468 80052868 3C18800E */ lui $t8, %hi(D_800DC4DC) # $t8, 0x800e -/* 05346C 8005286C 8F18C4DC */ lw $t8, %lo(D_800DC4DC)($t8) +/* 053468 80052868 3C18800E */ lui $t8, %hi(gPlayerOne) # $t8, 0x800e +/* 05346C 8005286C 8F18C4DC */ lw $t8, %lo(gPlayerOne)($t8) /* 053470 80052870 000E78C0 */ sll $t7, $t6, 3 /* 053474 80052874 01EE7823 */ subu $t7, $t7, $t6 /* 053478 80052878 000F7900 */ sll $t7, $t7, 4 @@ -34,4 +34,4 @@ glabel func_8005285C /* 0534DC 800528DC 8FBF0014 */ lw $ra, 0x14($sp) /* 0534E0 800528E0 27BD0018 */ addiu $sp, $sp, 0x18 /* 0534E4 800528E4 03E00008 */ jr $ra -/* 0534E8 800528E8 00000000 */ nop +/* 0534E8 800528E8 00000000 */ nop diff --git a/asm/non_matchings/code_800431B0/func_80052D70.s b/asm/non_matchings/code_800431B0/func_80052D70.s index a15b494c0..bf818e6ad 100644 --- a/asm/non_matchings/code_800431B0/func_80052D70.s +++ b/asm/non_matchings/code_800431B0/func_80052D70.s @@ -4,8 +4,8 @@ glabel func_80052D70 /* 053978 80052D78 000E7100 */ sll $t6, $t6, 4 /* 05397C 80052D7C 01C47023 */ subu $t6, $t6, $a0 /* 053980 80052D80 000E7080 */ sll $t6, $t6, 2 -/* 053984 80052D84 3C0F800E */ lui $t7, %hi(D_800DC4DC) # $t7, 0x800e -/* 053988 80052D88 8DEFC4DC */ lw $t7, %lo(D_800DC4DC)($t7) +/* 053984 80052D84 3C0F800E */ lui $t7, %hi(gPlayerOne) # $t7, 0x800e +/* 053988 80052D88 8DEFC4DC */ lw $t7, %lo(gPlayerOne)($t7) /* 05398C 80052D8C 01C47023 */ subu $t6, $t6, $a0 /* 053990 80052D90 0004C080 */ sll $t8, $a0, 2 /* 053994 80052D94 27BDFFD8 */ addiu $sp, $sp, -0x28 @@ -47,4 +47,4 @@ glabel func_80052D70 /* 053A20 80052E20 8FBF001C */ lw $ra, 0x1c($sp) /* 053A24 80052E24 27BD0028 */ addiu $sp, $sp, 0x28 /* 053A28 80052E28 03E00008 */ jr $ra -/* 053A2C 80052E2C 00000000 */ nop +/* 053A2C 80052E2C 00000000 */ nop diff --git a/asm/non_matchings/code_800431B0/func_800568A0.s b/asm/non_matchings/code_800431B0/func_800568A0.s index 0a086209c..98c38c793 100644 --- a/asm/non_matchings/code_800431B0/func_800568A0.s +++ b/asm/non_matchings/code_800431B0/func_800568A0.s @@ -7,8 +7,8 @@ glabel func_800568A0 /* 0574B4 800568B4 01091021 */ addu $v0, $t0, $t1 /* 0574B8 800568B8 C4440004 */ lwc1 $f4, 4($v0) /* 0574BC 800568BC 3C068018 */ lui $a2, %hi(D_80183E50) # $a2, 0x8018 -/* 0574C0 800568C0 3C18800E */ lui $t8, %hi(D_800DC4DC) # $t8, 0x800e -/* 0574C4 800568C4 8F18C4DC */ lw $t8, %lo(D_800DC4DC)($t8) +/* 0574C0 800568C0 3C18800E */ lui $t8, %hi(gPlayerOne) # $t8, 0x800e +/* 0574C4 800568C4 8F18C4DC */ lw $t8, %lo(gPlayerOne)($t8) /* 0574C8 800568C8 C4460044 */ lwc1 $f6, 0x44($v0) /* 0574CC 800568CC 24C63E50 */ addiu $a2, %lo(D_80183E50) # addiu $a2, $a2, 0x3e50 /* 0574D0 800568D0 3C01800F */ lui $at, %hi(D_800EE088) @@ -83,4 +83,4 @@ glabel func_800568A0 /* 0575E4 800569E4 8FBF001C */ lw $ra, 0x1c($sp) /* 0575E8 800569E8 27BD0070 */ addiu $sp, $sp, 0x70 /* 0575EC 800569EC 03E00008 */ jr $ra -/* 0575F0 800569F0 00000000 */ nop +/* 0575F0 800569F0 00000000 */ nop diff --git a/asm/non_matchings/code_800431B0/func_80056AC0.s b/asm/non_matchings/code_800431B0/func_80056AC0.s index a87766c27..0b2f6cb7d 100644 --- a/asm/non_matchings/code_800431B0/func_80056AC0.s +++ b/asm/non_matchings/code_800431B0/func_80056AC0.s @@ -11,14 +11,14 @@ glabel func_80056AC0 /* 0576E4 80056AE4 AFB20028 */ sw $s2, 0x28($sp) /* 0576E8 80056AE8 3C138018 */ lui $s3, %hi(D_80183DD8) # $s3, 0x8018 /* 0576EC 80056AEC 3C158016 */ lui $s5, %hi(D_80165C18) # $s5, 0x8016 -/* 0576F0 80056AF0 3C1E800E */ lui $fp, %hi(D_800DC4DC) # $fp, 0x800e +/* 0576F0 80056AF0 3C1E800E */ lui $fp, %hi(gPlayerOne) # $fp, 0x800e /* 0576F4 80056AF4 4481A800 */ mtc1 $at, $f21 /* 0576F8 80056AF8 4480A000 */ mtc1 $zero, $f20 /* 0576FC 80056AFC 0080A025 */ move $s4, $a0 /* 057700 80056B00 AFBF0044 */ sw $ra, 0x44($sp) /* 057704 80056B04 AFB10024 */ sw $s1, 0x24($sp) /* 057708 80056B08 AFB00020 */ sw $s0, 0x20($sp) -/* 05770C 80056B0C 27DEC4DC */ addiu $fp, %lo(D_800DC4DC) # addiu $fp, $fp, -0x3b24 +/* 05770C 80056B0C 27DEC4DC */ addiu $fp, %lo(gPlayerOne) # addiu $fp, $fp, -0x3b24 /* 057710 80056B10 26B55C18 */ addiu $s5, %lo(D_80165C18) # addiu $s5, $s5, 0x5c18 /* 057714 80056B14 26733DD8 */ addiu $s3, %lo(D_80183DD8) # addiu $s3, $s3, 0x3dd8 /* 057718 80056B18 00009025 */ move $s2, $zero @@ -181,11 +181,11 @@ glabel func_80056AC0 /* 05797C 80056D7C 06010004 */ bgez $s0, .L80056D90 /* 057980 80056D80 32050003 */ andi $a1, $s0, 3 /* 057984 80056D84 10A00002 */ beqz $a1, .L80056D90 -/* 057988 80056D88 00000000 */ nop +/* 057988 80056D88 00000000 */ nop /* 05798C 80056D8C 24A5FFFC */ addiu $a1, $a1, -4 .L80056D90: /* 057990 80056D90 0C0158B9 */ jal func_800562E4 -/* 057994 80056D94 00000000 */ nop +/* 057994 80056D94 00000000 */ nop /* 057998 80056D98 24186000 */ li $t8, 24576 /* 05799C 80056D9C 3C018018 */ lui $at, %hi(D_80183E84) # $at, 0x8018 /* 0579A0 80056DA0 26020001 */ addiu $v0, $s0, 1 @@ -197,11 +197,11 @@ glabel func_80056AC0 /* 0579B8 80056DB8 04410004 */ bgez $v0, .L80056DCC /* 0579BC 80056DBC 30450003 */ andi $a1, $v0, 3 /* 0579C0 80056DC0 10A00002 */ beqz $a1, .L80056DCC -/* 0579C4 80056DC4 00000000 */ nop +/* 0579C4 80056DC4 00000000 */ nop /* 0579C8 80056DC8 24A5FFFC */ addiu $a1, $a1, -4 .L80056DCC: /* 0579CC 80056DCC 0C0158B9 */ jal func_800562E4 -/* 0579D0 80056DD0 00000000 */ nop +/* 0579D0 80056DD0 00000000 */ nop /* 0579D4 80056DD4 340AA000 */ li $t2, 40960 /* 0579D8 80056DD8 3C018018 */ lui $at, %hi(D_80183E84) # $at, 0x8018 /* 0579DC 80056DDC 26020002 */ addiu $v0, $s0, 2 @@ -213,13 +213,13 @@ glabel func_80056AC0 /* 0579F4 80056DF4 04410004 */ bgez $v0, .L80056E08 /* 0579F8 80056DF8 30450003 */ andi $a1, $v0, 3 /* 0579FC 80056DFC 10A00002 */ beqz $a1, .L80056E08 -/* 057A00 80056E00 00000000 */ nop +/* 057A00 80056E00 00000000 */ nop /* 057A04 80056E04 24A5FFFC */ addiu $a1, $a1, -4 .L80056E08: /* 057A08 80056E08 0C0158B9 */ jal func_800562E4 -/* 057A0C 80056E0C 00000000 */ nop +/* 057A0C 80056E0C 00000000 */ nop /* 057A10 80056E10 8FBF0034 */ lw $ra, 0x34($sp) /* 057A14 80056E14 8FB00030 */ lw $s0, 0x30($sp) /* 057A18 80056E18 27BD00A8 */ addiu $sp, $sp, 0xa8 /* 057A1C 80056E1C 03E00008 */ jr $ra -/* 057A20 80056E20 00000000 */ nop +/* 057A20 80056E20 00000000 */ nop diff --git a/asm/non_matchings/code_80057C60/func_80059820.s b/asm/non_matchings/code_80057C60/func_80059820.s index 9b1e790f6..fb3a8d664 100644 --- a/asm/non_matchings/code_80057C60/func_80059820.s +++ b/asm/non_matchings/code_80057C60/func_80059820.s @@ -3,8 +3,8 @@ glabel func_80059820 /* 05A424 80059824 01C47023 */ subu $t6, $t6, $a0 /* 05A428 80059828 000E7100 */ sll $t6, $t6, 4 /* 05A42C 8005982C 01C47023 */ subu $t6, $t6, $a0 -/* 05A430 80059830 3C0F800E */ lui $t7, %hi(D_800DC4DC) # $t7, 0x800e -/* 05A434 80059834 8DEFC4DC */ lw $t7, %lo(D_800DC4DC)($t7) +/* 05A430 80059830 3C0F800E */ lui $t7, %hi(gPlayerOne) # $t7, 0x800e +/* 05A434 80059834 8DEFC4DC */ lw $t7, %lo(gPlayerOne)($t7) /* 05A438 80059838 000E7080 */ sll $t6, $t6, 2 /* 05A43C 8005983C 01C47023 */ subu $t6, $t6, $a0 /* 05A440 80059840 3C058019 */ lui $a1, %hi(D_8018CF1C) # $a1, 0x8019 @@ -32,12 +32,12 @@ glabel func_80059820 /* 05A498 80059898 000A5080 */ sll $t2, $t2, 2 /* 05A49C 8005989C 014B1021 */ addu $v0, $t2, $t3 /* 05A4A0 800598A0 440D3000 */ mfc1 $t5, $f6 -/* 05A4A4 800598A4 00000000 */ nop +/* 05A4A4 800598A4 00000000 */ nop /* 05A4A8 800598A8 AC4D002C */ sw $t5, 0x2c($v0) /* 05A4AC 800598AC C4680018 */ lwc1 $f8, 0x18($v1) /* 05A4B0 800598B0 4600428D */ trunc.w.s $f10, $f8 /* 05A4B4 800598B4 440F5000 */ mfc1 $t7, $f10 -/* 05A4B8 800598B8 00000000 */ nop +/* 05A4B8 800598B8 00000000 */ nop /* 05A4BC 800598BC AC4F0030 */ sw $t7, 0x30($v0) /* 05A4C0 800598C0 C470001C */ lwc1 $f16, 0x1c($v1) /* 05A4C4 800598C4 4600848D */ trunc.w.s $f18, $f16 diff --git a/asm/non_matchings/code_80057C60/func_8005995C.s b/asm/non_matchings/code_80057C60/func_8005995C.s index 6a44d6a34..38f88c880 100644 --- a/asm/non_matchings/code_80057C60/func_8005995C.s +++ b/asm/non_matchings/code_80057C60/func_8005995C.s @@ -1,8 +1,8 @@ glabel func_8005995C -/* 05A55C 8005995C 3C02800E */ lui $v0, %hi(D_800DC4DC) # $v0, 0x800e +/* 05A55C 8005995C 3C02800E */ lui $v0, %hi(gPlayerOne) # $v0, 0x800e /* 05A560 80059960 3C078019 */ lui $a3, %hi(D_8018CA70) # $a3, 0x8019 /* 05A564 80059964 3C058016 */ lui $a1, %hi(D_80165890) # $a1, 0x8016 -/* 05A568 80059968 8C42C4DC */ lw $v0, %lo(D_800DC4DC)($v0) +/* 05A568 80059968 8C42C4DC */ lw $v0, %lo(gPlayerOne)($v0) /* 05A56C 8005996C 24A55890 */ addiu $a1, %lo(D_80165890) # addiu $a1, $a1, 0x5890 /* 05A570 80059970 24E7CA70 */ addiu $a3, %lo(D_8018CA70) # addiu $a3, $a3, -0x3590 /* 05A574 80059974 00001825 */ move $v1, $zero diff --git a/asm/non_matchings/code_80057C60/func_80059C50.s b/asm/non_matchings/code_80057C60/func_80059C50.s index ef96d620a..d58ca2ce2 100644 --- a/asm/non_matchings/code_80057C60/func_80059C50.s +++ b/asm/non_matchings/code_80057C60/func_80059C50.s @@ -2,13 +2,13 @@ glabel func_80059C50 /* 05A850 80059C50 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 05A854 80059C54 AFBF0014 */ sw $ra, 0x14($sp) /* 05A858 80059C58 0C0168F0 */ jal func_8005A3C0 -/* 05A85C 80059C5C 00000000 */ nop +/* 05A85C 80059C5C 00000000 */ nop /* 05A860 80059C60 3C048016 */ lui $a0, %hi(D_80164360) # $a0, 0x8016 /* 05A864 80059C64 3C028019 */ lui $v0, %hi(gGPCurrentRaceRanks) # $v0, 0x8019 -/* 05A868 80059C68 3C07800E */ lui $a3, %hi(D_800DC4DC) # $a3, 0x800e +/* 05A868 80059C68 3C07800E */ lui $a3, %hi(gPlayerOne) # $a3, 0x800e /* 05A86C 80059C6C 3C068019 */ lui $a2, %hi(D_8018CF90) # $a2, 0x8019 /* 05A870 80059C70 24C6CF90 */ addiu $a2, %lo(D_8018CF90) # addiu $a2, $a2, -0x3070 -/* 05A874 80059C74 8CE7C4DC */ lw $a3, %lo(D_800DC4DC)($a3) +/* 05A874 80059C74 8CE7C4DC */ lw $a3, %lo(gPlayerOne)($a3) /* 05A878 80059C78 2442CF80 */ addiu $v0, %lo(gGPCurrentRaceRanks) # addiu $v0, $v0, -0x3080 /* 05A87C 80059C7C 24844360 */ addiu $a0, %lo(D_80164360) # addiu $a0, $a0, 0x4360 /* 05A880 80059C80 24050DD8 */ li $a1, 3544 @@ -44,4 +44,4 @@ glabel func_80059C50 /* 05A8F0 80059CF0 8FBF0014 */ lw $ra, 0x14($sp) /* 05A8F4 80059CF4 27BD0018 */ addiu $sp, $sp, 0x18 /* 05A8F8 80059CF8 03E00008 */ jr $ra -/* 05A8FC 80059CFC 00000000 */ nop +/* 05A8FC 80059CFC 00000000 */ nop diff --git a/asm/non_matchings/code_80057C60/func_80059D00.s b/asm/non_matchings/code_80057C60/func_80059D00.s index 07b01f206..e3fea51c7 100644 --- a/asm/non_matchings/code_80057C60/func_80059D00.s +++ b/asm/non_matchings/code_80057C60/func_80059D00.s @@ -2,11 +2,11 @@ glabel func_80059D00 /* 05A900 80059D00 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 05A904 80059D04 AFBF0014 */ sw $ra, 0x14($sp) /* 05A908 80059D08 0C016A67 */ jal func_8005A99C -/* 05A90C 80059D0C 00000000 */ nop +/* 05A90C 80059D0C 00000000 */ nop /* 05A910 80059D10 0C0168F0 */ jal func_8005A3C0 -/* 05A914 80059D14 00000000 */ nop +/* 05A914 80059D14 00000000 */ nop /* 05A918 80059D18 0C0168E0 */ jal func_8005A380 -/* 05A91C 80059D1C 00000000 */ nop +/* 05A91C 80059D1C 00000000 */ nop /* 05A920 80059D20 3C0E8016 */ lui $t6, %hi(D_801657AE) # $t6, 0x8016 /* 05A924 80059D24 81CE57AE */ lb $t6, %lo(D_801657AE)($t6) /* 05A928 80059D28 3C02800E */ lui $v0, %hi(gScreenModeSelection) # $v0, 0x800e @@ -15,30 +15,30 @@ glabel func_80059D00 /* 05A934 80059D34 8C42C530 */ lw $v0, %lo(gScreenModeSelection)($v0) /* 05A938 80059D38 24010001 */ li $at, 1 /* 05A93C 80059D3C 10400009 */ beqz $v0, .L80059D64 -/* 05A940 80059D40 00000000 */ nop +/* 05A940 80059D40 00000000 */ nop /* 05A944 80059D44 1041005C */ beq $v0, $at, .L80059EB8 /* 05A948 80059D48 24010002 */ li $at, 2 /* 05A94C 80059D4C 10410036 */ beq $v0, $at, .L80059E28 /* 05A950 80059D50 24010003 */ li $at, 3 /* 05A954 80059D54 1041007C */ beq $v0, $at, .L80059F48 -/* 05A958 80059D58 00000000 */ nop +/* 05A958 80059D58 00000000 */ nop /* 05A95C 80059D5C 100000BE */ b .L8005A058 -/* 05A960 80059D60 00000000 */ nop +/* 05A960 80059D60 00000000 */ nop .L80059D64: /* 05A964 80059D64 0C016635 */ jal func_800598D4 /* 05A968 80059D68 00002025 */ move $a0, $zero /* 05A96C 80059D6C 3C0F8019 */ lui $t7, %hi(D_8018D214) # $t7, 0x8019 /* 05A970 80059D70 8DEFD214 */ lw $t7, %lo(D_8018D214)($t7) /* 05A974 80059D74 15E00020 */ bnez $t7, .L80059DF8 -/* 05A978 80059D78 00000000 */ nop +/* 05A978 80059D78 00000000 */ nop /* 05A97C 80059D7C 0C016608 */ jal func_80059820 /* 05A980 80059D80 00002025 */ move $a0, $zero /* 05A984 80059D84 0C016E45 */ jal func_8005B914 -/* 05A988 80059D88 00000000 */ nop +/* 05A988 80059D88 00000000 */ nop /* 05A98C 80059D8C 3C18800E */ lui $t8, %hi(D_800DC51C) # $t8, 0x800e /* 05A990 80059D90 9718C51C */ lhu $t8, %lo(D_800DC51C)($t8) /* 05A994 80059D94 17000003 */ bnez $t8, .L80059DA4 -/* 05A998 80059D98 00000000 */ nop +/* 05A998 80059D98 00000000 */ nop /* 05A99C 80059D9C 0C01EA91 */ jal func_8007AA44 /* 05A9A0 80059DA0 00002025 */ move $a0, $zero .L80059DA4: @@ -46,10 +46,10 @@ glabel func_80059D00 /* 05A9A8 80059DA8 00002025 */ move $a0, $zero /* 05A9AC 80059DAC 3C198019 */ lui $t9, %hi(D_8018CAE0) # $t9, 0x8019 /* 05A9B0 80059DB0 8339CAE0 */ lb $t9, %lo(D_8018CAE0)($t9) -/* 05A9B4 80059DB4 3C08800E */ lui $t0, %hi(D_800DC4FC) # $t0, 0x800e +/* 05A9B4 80059DB4 3C08800E */ lui $t0, %hi(gPlayerOneCopy) # $t0, 0x800e /* 05A9B8 80059DB8 1720000B */ bnez $t9, .L80059DE8 -/* 05A9BC 80059DBC 00000000 */ nop -/* 05A9C0 80059DC0 8D08C4FC */ lw $t0, %lo(D_800DC4FC)($t0) +/* 05A9BC 80059DBC 00000000 */ nop +/* 05A9C0 80059DC0 8D08C4FC */ lw $t0, %lo(gPlayerOneCopy)($t0) /* 05A9C4 80059DC4 3C014190 */ li $at, 0x41900000 # 18.000000 /* 05A9C8 80059DC8 44813000 */ mtc1 $at, $f6 /* 05A9CC 80059DCC C5040094 */ lwc1 $f4, 0x94($t0) @@ -58,12 +58,12 @@ glabel func_80059D00 /* 05A9D8 80059DD8 46062203 */ div.s $f8, $f4, $f6 /* 05A9DC 80059DDC 460A4302 */ mul.s $f12, $f8, $f10 /* 05A9E0 80059DE0 0C0170D8 */ jal func_8005C360 -/* 05A9E4 80059DE4 00000000 */ nop +/* 05A9E4 80059DE4 00000000 */ nop .L80059DE8: /* 05A9E8 80059DE8 0C01743F */ jal func_8005D0FC /* 05A9EC 80059DEC 00002025 */ move $a0, $zero /* 05A9F0 80059DF0 10000009 */ b .L80059E18 -/* 05A9F4 80059DF4 00000000 */ nop +/* 05A9F4 80059DF4 00000000 */ nop .L80059DF8: /* 05A9F8 80059DF8 0C016608 */ jal func_80059820 /* 05A9FC 80059DFC 00002025 */ move $a0, $zero @@ -75,9 +75,9 @@ glabel func_80059D00 /* 05AA14 80059E14 24040002 */ li $a0, 2 .L80059E18: /* 05AA18 80059E18 0C0169D3 */ jal func_8005A74C -/* 05AA1C 80059E1C 00000000 */ nop +/* 05AA1C 80059E1C 00000000 */ nop /* 05AA20 80059E20 1000008D */ b .L8005A058 -/* 05AA24 80059E24 00000000 */ nop +/* 05AA24 80059E24 00000000 */ nop .L80059E28: /* 05AA28 80059E28 0C016635 */ jal func_800598D4 /* 05AA2C 80059E2C 00002025 */ move $a0, $zero @@ -90,7 +90,7 @@ glabel func_80059D00 /* 05AA48 80059E48 3C09800E */ lui $t1, %hi(D_800DC51C) # $t1, 0x800e /* 05AA4C 80059E4C 9529C51C */ lhu $t1, %lo(D_800DC51C)($t1) /* 05AA50 80059E50 15200003 */ bnez $t1, .L80059E60 -/* 05AA54 80059E54 00000000 */ nop +/* 05AA54 80059E54 00000000 */ nop /* 05AA58 80059E58 0C01EA91 */ jal func_8007AA44 /* 05AA5C 80059E5C 00002025 */ move $a0, $zero .L80059E60: @@ -105,7 +105,7 @@ glabel func_80059D00 /* 05AA80 80059E80 3C0A800E */ lui $t2, %hi(D_800DC51C) # $t2, 0x800e /* 05AA84 80059E84 954AC51C */ lhu $t2, %lo(D_800DC51C)($t2) /* 05AA88 80059E88 15400003 */ bnez $t2, .L80059E98 -/* 05AA8C 80059E8C 00000000 */ nop +/* 05AA8C 80059E8C 00000000 */ nop /* 05AA90 80059E90 0C01EA91 */ jal func_8007AA44 /* 05AA94 80059E94 24040001 */ li $a0, 1 .L80059E98: @@ -114,9 +114,9 @@ glabel func_80059D00 /* 05AAA0 80059EA0 0C01747D */ jal func_8005D1F4 /* 05AAA4 80059EA4 24040001 */ li $a0, 1 /* 05AAA8 80059EA8 0C0169D3 */ jal func_8005A74C -/* 05AAAC 80059EAC 00000000 */ nop +/* 05AAAC 80059EAC 00000000 */ nop /* 05AAB0 80059EB0 10000069 */ b .L8005A058 -/* 05AAB4 80059EB4 00000000 */ nop +/* 05AAB4 80059EB4 00000000 */ nop .L80059EB8: /* 05AAB8 80059EB8 0C016635 */ jal func_800598D4 /* 05AABC 80059EBC 00002025 */ move $a0, $zero @@ -129,7 +129,7 @@ glabel func_80059D00 /* 05AAD8 80059ED8 3C0B800E */ lui $t3, %hi(D_800DC51C) # $t3, 0x800e /* 05AADC 80059EDC 956BC51C */ lhu $t3, %lo(D_800DC51C)($t3) /* 05AAE0 80059EE0 15600003 */ bnez $t3, .L80059EF0 -/* 05AAE4 80059EE4 00000000 */ nop +/* 05AAE4 80059EE4 00000000 */ nop /* 05AAE8 80059EE8 0C01EA91 */ jal func_8007AA44 /* 05AAEC 80059EEC 00002025 */ move $a0, $zero .L80059EF0: @@ -144,7 +144,7 @@ glabel func_80059D00 /* 05AB10 80059F10 3C0C800E */ lui $t4, %hi(D_800DC51C) # $t4, 0x800e /* 05AB14 80059F14 958CC51C */ lhu $t4, %lo(D_800DC51C)($t4) /* 05AB18 80059F18 15800003 */ bnez $t4, .L80059F28 -/* 05AB1C 80059F1C 00000000 */ nop +/* 05AB1C 80059F1C 00000000 */ nop /* 05AB20 80059F20 0C01EA91 */ jal func_8007AA44 /* 05AB24 80059F24 24040001 */ li $a0, 1 .L80059F28: @@ -153,9 +153,9 @@ glabel func_80059D00 /* 05AB30 80059F30 0C01747D */ jal func_8005D1F4 /* 05AB34 80059F34 24040001 */ li $a0, 1 /* 05AB38 80059F38 0C0169D3 */ jal func_8005A74C -/* 05AB3C 80059F3C 00000000 */ nop +/* 05AB3C 80059F3C 00000000 */ nop /* 05AB40 80059F40 10000045 */ b .L8005A058 -/* 05AB44 80059F44 00000000 */ nop +/* 05AB44 80059F44 00000000 */ nop .L80059F48: /* 05AB48 80059F48 0C016635 */ jal func_800598D4 /* 05AB4C 80059F4C 00002025 */ move $a0, $zero @@ -172,7 +172,7 @@ glabel func_80059D00 /* 05AB78 80059F78 3C0D800E */ lui $t5, %hi(D_800DC51C) # $t5, 0x800e /* 05AB7C 80059F7C 95ADC51C */ lhu $t5, %lo(D_800DC51C)($t5) /* 05AB80 80059F80 15A00003 */ bnez $t5, .L80059F90 -/* 05AB84 80059F84 00000000 */ nop +/* 05AB84 80059F84 00000000 */ nop /* 05AB88 80059F88 0C01EA91 */ jal func_8007AA44 /* 05AB8C 80059F8C 00002025 */ move $a0, $zero .L80059F90: @@ -185,7 +185,7 @@ glabel func_80059D00 /* 05ABA8 80059FA8 3C0E800E */ lui $t6, %hi(D_800DC51C) # $t6, 0x800e /* 05ABAC 80059FAC 95CEC51C */ lhu $t6, %lo(D_800DC51C)($t6) /* 05ABB0 80059FB0 15C00003 */ bnez $t6, .L80059FC0 -/* 05ABB4 80059FB4 00000000 */ nop +/* 05ABB4 80059FB4 00000000 */ nop /* 05ABB8 80059FB8 0C01EA91 */ jal func_8007AA44 /* 05ABBC 80059FBC 24040001 */ li $a0, 1 .L80059FC0: @@ -198,7 +198,7 @@ glabel func_80059D00 /* 05ABD8 80059FD8 3C0F800E */ lui $t7, %hi(D_800DC51C) # $t7, 0x800e /* 05ABDC 80059FDC 95EFC51C */ lhu $t7, %lo(D_800DC51C)($t7) /* 05ABE0 80059FE0 15E00003 */ bnez $t7, .L80059FF0 -/* 05ABE4 80059FE4 00000000 */ nop +/* 05ABE4 80059FE4 00000000 */ nop /* 05ABE8 80059FE8 0C01EA91 */ jal func_8007AA44 /* 05ABEC 80059FEC 24040002 */ li $a0, 2 .L80059FF0: @@ -208,7 +208,7 @@ glabel func_80059D00 /* 05ABFC 80059FFC 8F18C538 */ lw $t8, %lo(gPlayerCountSelection1)($t8) /* 05AC00 8005A000 24010004 */ li $at, 4 /* 05AC04 8005A004 17010012 */ bne $t8, $at, .L8005A050 -/* 05AC08 8005A008 00000000 */ nop +/* 05AC08 8005A008 00000000 */ nop /* 05AC0C 8005A00C 0C016608 */ jal func_80059820 /* 05AC10 8005A010 24040003 */ li $a0, 3 /* 05AC14 8005A014 0C01743F */ jal func_8005D0FC @@ -217,11 +217,11 @@ glabel func_80059D00 /* 05AC20 8005A020 9739C51C */ lhu $t9, %lo(D_800DC51C)($t9) /* 05AC24 8005A024 3C08800E */ lui $t0, %hi(gPlayerCountSelection1) # $t0, 0x800e /* 05AC28 8005A028 17200007 */ bnez $t9, .L8005A048 -/* 05AC2C 8005A02C 00000000 */ nop +/* 05AC2C 8005A02C 00000000 */ nop /* 05AC30 8005A030 8D08C538 */ lw $t0, %lo(gPlayerCountSelection1)($t0) /* 05AC34 8005A034 24010004 */ li $at, 4 /* 05AC38 8005A038 15010003 */ bne $t0, $at, .L8005A048 -/* 05AC3C 8005A03C 00000000 */ nop +/* 05AC3C 8005A03C 00000000 */ nop /* 05AC40 8005A040 0C01EA91 */ jal func_8007AA44 /* 05AC44 8005A044 24040003 */ li $a0, 3 .L8005A048: @@ -229,12 +229,12 @@ glabel func_80059D00 /* 05AC4C 8005A04C 24040003 */ li $a0, 3 .L8005A050: /* 05AC50 8005A050 0C0169D3 */ jal func_8005A74C -/* 05AC54 8005A054 00000000 */ nop +/* 05AC54 8005A054 00000000 */ nop .L8005A058: /* 05AC58 8005A058 0C01D133 */ jal func_800744CC -/* 05AC5C 8005A05C 00000000 */ nop +/* 05AC5C 8005A05C 00000000 */ nop /* 05AC60 8005A060 8FBF0014 */ lw $ra, 0x14($sp) .L8005A064: /* 05AC64 8005A064 27BD0018 */ addiu $sp, $sp, 0x18 /* 05AC68 8005A068 03E00008 */ jr $ra -/* 05AC6C 8005A06C 00000000 */ nop +/* 05AC6C 8005A06C 00000000 */ nop diff --git a/asm/non_matchings/code_80057C60/func_8005A14C.s b/asm/non_matchings/code_80057C60/func_8005A14C.s index 04a092694..aa3f29607 100644 --- a/asm/non_matchings/code_80057C60/func_8005A14C.s +++ b/asm/non_matchings/code_80057C60/func_8005A14C.s @@ -5,9 +5,9 @@ glabel func_8005A14C /* 05AD58 8005A158 0004C880 */ sll $t9, $a0, 2 /* 05AD5C 8005A15C 3C098016 */ lui $t1, %hi(lapCount) /* 05AD60 8005A160 01C47023 */ subu $t6, $t6, $a0 -/* 05AD64 8005A164 3C0F800E */ lui $t7, %hi(D_800DC4DC) # $t7, 0x800e +/* 05AD64 8005A164 3C0F800E */ lui $t7, %hi(gPlayerOne) # $t7, 0x800e /* 05AD68 8005A168 01394821 */ addu $t1, $t1, $t9 -/* 05AD6C 8005A16C 8DEFC4DC */ lw $t7, %lo(D_800DC4DC)($t7) +/* 05AD6C 8005A16C 8DEFC4DC */ lw $t7, %lo(gPlayerOne)($t7) /* 05AD70 8005A170 8D294390 */ lw $t1, %lo(lapCount)($t1) /* 05AD74 8005A174 27BDFFD0 */ addiu $sp, $sp, -0x30 /* 05AD78 8005A178 000E7080 */ sll $t6, $t6, 2 @@ -118,7 +118,7 @@ glabel func_8005A14C /* 05AEFC 8005A2FC 240B0050 */ li $t3, 80 /* 05AF00 8005A300 33190100 */ andi $t9, $t8, 0x100 /* 05AF04 8005A304 17200006 */ bnez $t9, .L8005A320 -/* 05AF08 8005A308 00000000 */ nop +/* 05AF08 8005A308 00000000 */ nop /* 05AF0C 8005A30C 8D0900BC */ lw $t1, 0xbc($t0) /* 05AF10 8005A310 240C00FF */ li $t4, 255 /* 05AF14 8005A314 00095000 */ sll $t2, $t1, 0 @@ -151,4 +151,4 @@ glabel func_8005A14C /* 05AF70 8005A370 8FB00018 */ lw $s0, 0x18($sp) /* 05AF74 8005A374 27BD0030 */ addiu $sp, $sp, 0x30 /* 05AF78 8005A378 03E00008 */ jr $ra -/* 05AF7C 8005A37C 00000000 */ nop +/* 05AF7C 8005A37C 00000000 */ nop diff --git a/asm/non_matchings/code_80057C60/func_8005A3C0.s b/asm/non_matchings/code_80057C60/func_8005A3C0.s index a640157b6..a2c120303 100644 --- a/asm/non_matchings/code_80057C60/func_8005A3C0.s +++ b/asm/non_matchings/code_80057C60/func_8005A3C0.s @@ -17,25 +17,25 @@ glabel func_8005A3C0 /* 05AFFC 8005A3FC 24040001 */ li $a0, 1 /* 05B000 8005A400 24010002 */ li $at, 2 /* 05B004 8005A404 1044000B */ beq $v0, $a0, .L8005A434 -/* 05B008 8005A408 3C0F800E */ lui $t7, %hi(D_800DC4BC) # $t7, 0x800e +/* 05B008 8005A408 3C0F800E */ lui $t7, %hi(gControllerOne) # $t7, 0x800e /* 05B00C 8005A40C 10410037 */ beq $v0, $at, .L8005A4EC /* 05B010 8005A410 3C0A800E */ lui $t2, %hi(gModeSelection) # $t2, 0x800e /* 05B014 8005A414 24060003 */ li $a2, 3 /* 05B018 8005A418 10460064 */ beq $v0, $a2, .L8005A5AC -/* 05B01C 8005A41C 3C18800E */ lui $t8, %hi(D_800DC4BC) # $t8, 0x800e +/* 05B01C 8005A41C 3C18800E */ lui $t8, %hi(gControllerOne) # $t8, 0x800e /* 05B020 8005A420 24010004 */ li $at, 4 /* 05B024 8005A424 10410084 */ beq $v0, $at, .L8005A638 -/* 05B028 8005A428 3C0C800E */ lui $t4, %hi(D_800DC4BC) +/* 05B028 8005A428 3C0C800E */ lui $t4, %hi(gControllerOne) /* 05B02C 8005A42C 100000B3 */ b .L8005A6FC -/* 05B030 8005A430 00000000 */ nop +/* 05B030 8005A430 00000000 */ nop .L8005A434: -/* 05B034 8005A434 8DEFC4BC */ lw $t7, %lo(D_800DC4BC)($t7) +/* 05B034 8005A434 8DEFC4BC */ lw $t7, %lo(gControllerOne)($t7) /* 05B038 8005A438 3C038016 */ lui $v1, %hi(D_801657E4) # $v1, 0x8016 /* 05B03C 8005A43C 246357E4 */ addiu $v1, %lo(D_801657E4) # addiu $v1, $v1, 0x57e4 /* 05B040 8005A440 95F80006 */ lhu $t8, 6($t7) /* 05B044 8005A444 33190001 */ andi $t9, $t8, 1 /* 05B048 8005A448 132000AC */ beqz $t9, .L8005A6FC -/* 05B04C 8005A44C 00000000 */ nop +/* 05B04C 8005A44C 00000000 */ nop /* 05B050 8005A450 80680000 */ lb $t0, ($v1) /* 05B054 8005A454 24050001 */ li $a1, 1 /* 05B058 8005A458 25090001 */ addiu $t1, $t0, 1 @@ -81,23 +81,23 @@ glabel func_8005A3C0 .L8005A4EC: /* 05B0EC 8005A4EC 8D4AC53C */ lw $t2, %lo(gModeSelection)($t2) /* 05B0F0 8005A4F0 24060003 */ li $a2, 3 -/* 05B0F4 8005A4F4 3C0B800E */ lui $t3, %hi(D_800DC4BC) # $t3, 0x800e +/* 05B0F4 8005A4F4 3C0B800E */ lui $t3, %hi(gControllerOne) # $t3, 0x800e /* 05B0F8 8005A4F8 10CA0080 */ beq $a2, $t2, .L8005A6FC -/* 05B0FC 8005A4FC 3C19800E */ lui $t9, %hi(D_800DC4C0) # $t9, 0x800e -/* 05B100 8005A500 8D6BC4BC */ lw $t3, %lo(D_800DC4BC)($t3) +/* 05B0FC 8005A4FC 3C19800E */ lui $t9, %hi(gControllerTwo) # $t9, 0x800e +/* 05B100 8005A500 8D6BC4BC */ lw $t3, %lo(gControllerOne)($t3) /* 05B104 8005A504 3C028016 */ lui $v0, %hi(D_80165800) # $v0, 0x8016 /* 05B108 8005A508 24425800 */ addiu $v0, %lo(D_80165800) # addiu $v0, $v0, 0x5800 /* 05B10C 8005A50C 956C0006 */ lhu $t4, 6($t3) /* 05B110 8005A510 318D0001 */ andi $t5, $t4, 1 /* 05B114 8005A514 11A00006 */ beqz $t5, .L8005A530 -/* 05B118 8005A518 00000000 */ nop +/* 05B118 8005A518 00000000 */ nop /* 05B11C 8005A51C 804E0000 */ lb $t6, ($v0) /* 05B120 8005A520 00802825 */ move $a1, $a0 /* 05B124 8005A524 25CF0001 */ addiu $t7, $t6, 1 /* 05B128 8005A528 31F80001 */ andi $t8, $t7, 1 /* 05B12C 8005A52C A0580000 */ sb $t8, ($v0) .L8005A530: -/* 05B130 8005A530 8F39C4C0 */ lw $t9, %lo(D_800DC4C0)($t9) +/* 05B130 8005A530 8F39C4C0 */ lw $t9, %lo(gControllerTwo)($t9) /* 05B134 8005A534 3C028016 */ lui $v0, %hi(D_80165800) # $v0, 0x8016 /* 05B138 8005A538 24425800 */ addiu $v0, %lo(D_80165800) # addiu $v0, $v0, 0x5800 /* 05B13C 8005A53C 97280006 */ lhu $t0, 6($t9) @@ -113,12 +113,12 @@ glabel func_8005A3C0 /* 05B164 8005A564 804D0000 */ lb $t5, ($v0) .L8005A568: /* 05B168 8005A568 11A00008 */ beqz $t5, .L8005A58C -/* 05B16C 8005A56C 00000000 */ nop +/* 05B16C 8005A56C 00000000 */ nop /* 05B170 8005A570 804E0001 */ lb $t6, 1($v0) /* 05B174 8005A574 3C028016 */ lui $v0, %hi(D_801657F0) # $v0, 0x8016 /* 05B178 8005A578 244257F0 */ addiu $v0, %lo(D_801657F0) # addiu $v0, $v0, 0x57f0 /* 05B17C 8005A57C 11C00003 */ beqz $t6, .L8005A58C -/* 05B180 8005A580 00000000 */ nop +/* 05B180 8005A580 00000000 */ nop /* 05B184 8005A584 10000004 */ b .L8005A598 /* 05B188 8005A588 A0400000 */ sb $zero, ($v0) .L8005A58C: @@ -128,30 +128,30 @@ glabel func_8005A3C0 .L8005A598: /* 05B198 8005A598 95EFC51C */ lhu $t7, %lo(D_800DC51C)($t7) /* 05B19C 8005A59C 11E00057 */ beqz $t7, .L8005A6FC -/* 05B1A0 8005A5A0 00000000 */ nop +/* 05B1A0 8005A5A0 00000000 */ nop /* 05B1A4 8005A5A4 10000055 */ b .L8005A6FC /* 05B1A8 8005A5A8 A0400000 */ sb $zero, ($v0) .L8005A5AC: -/* 05B1AC 8005A5AC 8F18C4BC */ lw $t8, %lo(D_800DC4BC)($t8) +/* 05B1AC 8005A5AC 8F18C4BC */ lw $t8, %lo(gControllerOne)($t8) /* 05B1B0 8005A5B0 3C038016 */ lui $v1, %hi(D_801657E4) # $v1, 0x8016 -/* 05B1B4 8005A5B4 3C09800E */ lui $t1, %hi(D_800DC4C0) # $t1, 0x800e +/* 05B1B4 8005A5B4 3C09800E */ lui $t1, %hi(gControllerTwo) # $t1, 0x800e /* 05B1B8 8005A5B8 97190006 */ lhu $t9, 6($t8) /* 05B1BC 8005A5BC 3C0F800E */ lui $t7, %hi(gModeSelection) # $t7, 0x800e /* 05B1C0 8005A5C0 246357E4 */ addiu $v1, %lo(D_801657E4) # addiu $v1, $v1, 0x57e4 /* 05B1C4 8005A5C4 33280001 */ andi $t0, $t9, 1 /* 05B1C8 8005A5C8 1500000C */ bnez $t0, .L8005A5FC -/* 05B1CC 8005A5CC 00000000 */ nop -/* 05B1D0 8005A5D0 8D29C4C0 */ lw $t1, %lo(D_800DC4C0)($t1) -/* 05B1D4 8005A5D4 3C0C800E */ lui $t4, %hi(D_800DC4C4) # $t4, 0x800e +/* 05B1CC 8005A5CC 00000000 */ nop +/* 05B1D0 8005A5D0 8D29C4C0 */ lw $t1, %lo(gControllerTwo)($t1) +/* 05B1D4 8005A5D4 3C0C800E */ lui $t4, %hi(gControllerThree) # $t4, 0x800e /* 05B1D8 8005A5D8 952A0006 */ lhu $t2, 6($t1) /* 05B1DC 8005A5DC 314B0001 */ andi $t3, $t2, 1 /* 05B1E0 8005A5E0 15600006 */ bnez $t3, .L8005A5FC -/* 05B1E4 8005A5E4 00000000 */ nop -/* 05B1E8 8005A5E8 8D8CC4C4 */ lw $t4, %lo(D_800DC4C4)($t4) +/* 05B1E4 8005A5E4 00000000 */ nop +/* 05B1E8 8005A5E8 8D8CC4C4 */ lw $t4, %lo(gControllerThree)($t4) /* 05B1EC 8005A5EC 958D0006 */ lhu $t5, 6($t4) /* 05B1F0 8005A5F0 31AE0001 */ andi $t6, $t5, 1 /* 05B1F4 8005A5F4 11C00041 */ beqz $t6, .L8005A6FC -/* 05B1F8 8005A5F8 00000000 */ nop +/* 05B1F8 8005A5F8 00000000 */ nop .L8005A5FC: /* 05B1FC 8005A5FC 8DEFC53C */ lw $t7, %lo(gModeSelection)($t7) /* 05B200 8005A600 3C028016 */ lui $v0, %hi(D_801657F0) # $v0, 0x8016 @@ -170,7 +170,7 @@ glabel func_8005A3C0 /* 05B230 8005A630 10000032 */ b .L8005A6FC /* 05B234 8005A634 A06B0000 */ sb $t3, ($v1) .L8005A638: -/* 05B238 8005A638 8D8CC4BC */ lw $t4, %lo(D_800DC4BC)($t4) +/* 05B238 8005A638 8D8CC4BC */ lw $t4, %lo(gControllerOne)($t4) /* 05B23C 8005A63C 3C028016 */ lui $v0, %hi(D_80165800) # $v0, 0x8016 /* 05B240 8005A640 3C038016 */ lui $v1, %hi(D_801657E4) # $v1, 0x8016 /* 05B244 8005A644 958D0006 */ lhu $t5, 6($t4) @@ -178,20 +178,20 @@ glabel func_8005A3C0 /* 05B24C 8005A64C 24425800 */ addiu $v0, %lo(D_80165800) # addiu $v0, $v0, 0x5800 /* 05B250 8005A650 31AE0001 */ andi $t6, $t5, 1 /* 05B254 8005A654 15C00011 */ bnez $t6, .L8005A69C -/* 05B258 8005A658 3C0F800E */ lui $t7, %hi(D_800DC4C0) # $t7, 0x800e -/* 05B25C 8005A65C 8DEFC4C0 */ lw $t7, %lo(D_800DC4C0)($t7) -/* 05B260 8005A660 3C08800E */ lui $t0, %hi(D_800DC4C4) # $t0, 0x800e +/* 05B258 8005A658 3C0F800E */ lui $t7, %hi(gControllerTwo) # $t7, 0x800e +/* 05B25C 8005A65C 8DEFC4C0 */ lw $t7, %lo(gControllerTwo)($t7) +/* 05B260 8005A660 3C08800E */ lui $t0, %hi(gControllerThree) # $t0, 0x800e /* 05B264 8005A664 95F80006 */ lhu $t8, 6($t7) /* 05B268 8005A668 33190001 */ andi $t9, $t8, 1 /* 05B26C 8005A66C 1720000B */ bnez $t9, .L8005A69C -/* 05B270 8005A670 00000000 */ nop -/* 05B274 8005A674 8D08C4C4 */ lw $t0, %lo(D_800DC4C4)($t0) -/* 05B278 8005A678 3C0B800E */ lui $t3, %hi(D_800DC4C8) # $t3, 0x800e +/* 05B270 8005A670 00000000 */ nop +/* 05B274 8005A674 8D08C4C4 */ lw $t0, %lo(gControllerThree)($t0) +/* 05B278 8005A678 3C0B800E */ lui $t3, %hi(gControllerFour) # $t3, 0x800e /* 05B27C 8005A67C 95090006 */ lhu $t1, 6($t0) /* 05B280 8005A680 312A0001 */ andi $t2, $t1, 1 /* 05B284 8005A684 15400005 */ bnez $t2, .L8005A69C -/* 05B288 8005A688 00000000 */ nop -/* 05B28C 8005A68C 8D6BC4C8 */ lw $t3, %lo(D_800DC4C8)($t3) +/* 05B288 8005A688 00000000 */ nop +/* 05B28C 8005A68C 8D6BC4C8 */ lw $t3, %lo(gControllerFour)($t3) /* 05B290 8005A690 956C0006 */ lhu $t4, 6($t3) /* 05B294 8005A694 318D0001 */ andi $t5, $t4, 1 /* 05B298 8005A698 11A00018 */ beqz $t5, .L8005A6FC @@ -230,4 +230,4 @@ glabel func_8005A3C0 .L8005A710: /* 05B310 8005A710 27BD0018 */ addiu $sp, $sp, 0x18 /* 05B314 8005A714 03E00008 */ jr $ra -/* 05B318 8005A718 00000000 */ nop +/* 05B318 8005A718 00000000 */ nop diff --git a/asm/non_matchings/code_80057C60/func_8005C980.s b/asm/non_matchings/code_80057C60/func_8005C980.s index 8d6abbf88..232a7ca8c 100644 --- a/asm/non_matchings/code_80057C60/func_8005C980.s +++ b/asm/non_matchings/code_80057C60/func_8005C980.s @@ -1,8 +1,8 @@ glabel func_8005C980 /* 05D580 8005C980 27BDFFF8 */ addiu $sp, $sp, -8 /* 05D584 8005C984 8FA60000 */ lw $a2, ($sp) -/* 05D588 8005C988 3C07800E */ lui $a3, %hi(D_800DC4DC) # $a3, 0x800e -/* 05D58C 8005C98C 8CE7C4DC */ lw $a3, %lo(D_800DC4DC)($a3) +/* 05D588 8005C988 3C07800E */ lui $a3, %hi(gPlayerOne) # $a3, 0x800e +/* 05D58C 8005C98C 8CE7C4DC */ lw $a3, %lo(gPlayerOne)($a3) /* 05D590 8005C990 000670C0 */ sll $t6, $a2, 3 /* 05D594 8005C994 01C67023 */ subu $t6, $t6, $a2 /* 05D598 8005C998 000E7100 */ sll $t6, $t6, 4 diff --git a/asm/non_matchings/code_80057C60/func_8005CB60.s b/asm/non_matchings/code_80057C60/func_8005CB60.s index b9e137de6..9184b10fe 100644 --- a/asm/non_matchings/code_80057C60/func_8005CB60.s +++ b/asm/non_matchings/code_80057C60/func_8005CB60.s @@ -15,8 +15,8 @@ glabel func_8005CB60 /* 05D794 8005CB94 82190071 */ lb $t9, 0x71($s0) /* 05D798 8005CB98 01C47023 */ subu $t6, $t6, $a0 /* 05D79C 8005CB9C 000E7080 */ sll $t6, $t6, 2 -/* 05D7A0 8005CBA0 3C0F800E */ lui $t7, %hi(D_800DC4DC) # $t7, 0x800e -/* 05D7A4 8005CBA4 8DEFC4DC */ lw $t7, %lo(D_800DC4DC)($t7) +/* 05D7A0 8005CBA0 3C0F800E */ lui $t7, %hi(gPlayerOne) # $t7, 0x800e +/* 05D7A4 8005CBA4 8DEFC4DC */ lw $t7, %lo(gPlayerOne)($t7) /* 05D7A8 8005CBA8 01C47023 */ subu $t6, $t6, $a0 /* 05D7AC 8005CBAC 000E70C0 */ sll $t6, $t6, 3 /* 05D7B0 8005CBB0 032A082A */ slt $at, $t9, $t2 @@ -35,7 +35,7 @@ glabel func_8005CB60 /* 05D7E4 8005CBE4 24090003 */ li $t1, 3 /* 05D7E8 8005CBE8 4600320D */ trunc.w.s $f8, $f6 /* 05D7EC 8005CBEC 440C4000 */ mfc1 $t4, $f8 -/* 05D7F0 8005CBF0 00000000 */ nop +/* 05D7F0 8005CBF0 00000000 */ nop /* 05D7F4 8005CBF4 AE0C0008 */ sw $t4, 8($s0) /* 05D7F8 8005CBF8 806D0000 */ lb $t5, ($v1) /* 05D7FC 8005CBFC 01A5082A */ slt $at, $t5, $a1 @@ -50,7 +50,7 @@ glabel func_8005CB60 /* 05D820 8005CC20 00CFC021 */ addu $t8, $a2, $t7 /* 05D824 8005CC24 4600848D */ trunc.w.s $f18, $f16 /* 05D828 8005CC28 44029000 */ mfc1 $v0, $f18 -/* 05D82C 8005CC2C 00000000 */ nop +/* 05D82C 8005CC2C 00000000 */ nop /* 05D830 8005CC30 AE020010 */ sw $v0, 0x10($s0) /* 05D834 8005CC34 80790000 */ lb $t9, ($v1) /* 05D838 8005CC38 00195080 */ sll $t2, $t9, 2 @@ -161,7 +161,7 @@ glabel func_8005CB60 /* 05D9BC 8005CDBC 00E02025 */ move $a0, $a3 /* 05D9C0 8005CDC0 24040002 */ li $a0, 2 /* 05D9C4 8005CDC4 1044001C */ beq $v0, $a0, .L8005CE38 -/* 05D9C8 8005CDC8 00000000 */ nop +/* 05D9C8 8005CDC8 00000000 */ nop /* 05D9CC 8005CDCC 1049001E */ beq $v0, $t1, .L8005CE48 /* 05D9D0 8005CDD0 3C0D800E */ lui $t5, %hi(gCurrentCourseId) # $t5, 0x800e /* 05D9D4 8005CDD4 100000AC */ b .L8005D088 @@ -356,7 +356,7 @@ glabel func_8005CB60 .L8005D088: /* 05DC88 8005D088 3C0F8016 */ lui $t7, %hi(D_80165594) # $t7, 0x8016 /* 05DC8C 8005D08C 14400006 */ bnez $v0, .L8005D0A8 -/* 05DC90 8005D090 00000000 */ nop +/* 05DC90 8005D090 00000000 */ nop /* 05DC94 8005D094 8E0E0008 */ lw $t6, 8($s0) /* 05DC98 8005D098 3C018016 */ lui $at, %hi(D_801657E3) # $at, 0x8016 /* 05DC9C 8005D09C AE0E000C */ sw $t6, 0xc($s0) @@ -386,4 +386,4 @@ glabel func_8005CB60 /* 05DCEC 8005D0EC 8FB00018 */ lw $s0, 0x18($sp) /* 05DCF0 8005D0F0 27BD0040 */ addiu $sp, $sp, 0x40 /* 05DCF4 8005D0F4 03E00008 */ jr $ra -/* 05DCF8 8005D0F8 00000000 */ nop +/* 05DCF8 8005D0F8 00000000 */ nop diff --git a/asm/non_matchings/code_80057C60/func_80060BCC.s b/asm/non_matchings/code_80057C60/func_80060BCC.s index bc348bbfb..62133c0be 100644 --- a/asm/non_matchings/code_80057C60/func_80060BCC.s +++ b/asm/non_matchings/code_80057C60/func_80060BCC.s @@ -30,21 +30,21 @@ glabel func_80060BCC /* 06183C 80060C3C 468021A0 */ cvt.s.w $f6, $f4 /* 061840 80060C40 3C014F80 */ li $at, 0x4F800000 # 4294967296.000000 /* 061844 80060C44 44814000 */ mtc1 $at, $f8 -/* 061848 80060C48 00000000 */ nop +/* 061848 80060C48 00000000 */ nop /* 06184C 80060C4C 46083180 */ add.s $f6, $f6, $f8 .L80060C50: /* 061850 80060C50 0C0ADF8D */ jal random_int /* 061854 80060C54 E7A60044 */ swc1 $f6, 0x44($sp) /* 061858 80060C58 44825000 */ mtc1 $v0, $f10 -/* 06185C 80060C5C 3C0F800E */ lui $t7, %hi(D_800DC4DC) # $t7, 0x800e +/* 06185C 80060C5C 3C0F800E */ lui $t7, %hi(gPlayerOne) # $t7, 0x800e /* 061860 80060C60 04410005 */ bgez $v0, .L80060C78 /* 061864 80060C64 46805420 */ cvt.s.w $f16, $f10 /* 061868 80060C68 3C014F80 */ li $at, 0x4F800000 # 4294967296.000000 /* 06186C 80060C6C 44819000 */ mtc1 $at, $f18 -/* 061870 80060C70 00000000 */ nop +/* 061870 80060C70 00000000 */ nop /* 061874 80060C74 46128400 */ add.s $f16, $f16, $f18 .L80060C78: -/* 061878 80060C78 8DEFC4DC */ lw $t7, %lo(D_800DC4DC)($t7) +/* 061878 80060C78 8DEFC4DC */ lw $t7, %lo(gPlayerOne)($t7) /* 06187C 80060C7C E7B00048 */ swc1 $f16, 0x48($sp) /* 061880 80060C80 87A8005E */ lh $t0, 0x5e($sp) /* 061884 80060C84 564F00AD */ bnel $s2, $t7, .L80060F3C @@ -56,7 +56,7 @@ glabel func_80060BCC /* 06189C 80060C9C 02581021 */ addu $v0, $s2, $t8 /* 0618A0 80060CA0 84590546 */ lh $t9, 0x546($v0) /* 0618A4 80060CA4 1F200004 */ bgtz $t9, .L80060CB8 -/* 0618A8 80060CA8 00000000 */ nop +/* 0618A8 80060CA8 00000000 */ nop /* 0618AC 80060CAC 84490544 */ lh $t1, 0x544($v0) /* 0618B0 80060CB0 5520004F */ bnel $t1, $zero, .L80060DF0 /* 0618B4 80060CB4 24030048 */ li $v1, 72 diff --git a/asm/non_matchings/code_80057C60/func_8006E058.s b/asm/non_matchings/code_80057C60/func_8006E058.s index c6346d363..6a2f3171d 100644 --- a/asm/non_matchings/code_80057C60/func_8006E058.s +++ b/asm/non_matchings/code_80057C60/func_8006E058.s @@ -9,87 +9,87 @@ glabel func_8006E058 /* 06EC74 8006E074 24040002 */ li $a0, 2 /* 06EC78 8006E078 24040002 */ li $a0, 2 /* 06EC7C 8006E07C 10440075 */ beq $v0, $a0, .L8006E254 -/* 06EC80 8006E080 00000000 */ nop +/* 06EC80 8006E080 00000000 */ nop /* 06EC84 8006E084 24030003 */ li $v1, 3 /* 06EC88 8006E088 104300C4 */ beq $v0, $v1, .L8006E39C -/* 06EC8C 8006E08C 00000000 */ nop +/* 06EC8C 8006E08C 00000000 */ nop /* 06EC90 8006E090 100000E0 */ b .L8006E414 /* 06EC94 8006E094 8FBF0014 */ lw $ra, 0x14($sp) .L8006E098: /* 06EC98 8006E098 3C02800E */ lui $v0, %hi(gModeSelection) # $v0, 0x800e /* 06EC9C 8006E09C 8C42C53C */ lw $v0, %lo(gModeSelection)($v0) -/* 06ECA0 8006E0A0 3C04800E */ lui $a0, %hi(D_800DC4DC) +/* 06ECA0 8006E0A0 3C04800E */ lui $a0, %hi(gPlayerOne) /* 06ECA4 8006E0A4 00002825 */ move $a1, $zero /* 06ECA8 8006E0A8 1040000B */ beqz $v0, .L8006E0D8 /* 06ECAC 8006E0AC 00003025 */ move $a2, $zero /* 06ECB0 8006E0B0 24030001 */ li $v1, 1 /* 06ECB4 8006E0B4 1043002F */ beq $v0, $v1, .L8006E174 -/* 06ECB8 8006E0B8 3C04800E */ lui $a0, %hi(D_800DC4DC) # $a0, 0x800e +/* 06ECB8 8006E0B8 3C04800E */ lui $a0, %hi(gPlayerOne) # $a0, 0x800e /* 06ECBC 8006E0BC 24040002 */ li $a0, 2 /* 06ECC0 8006E0C0 10440046 */ beq $v0, $a0, .L8006E1DC /* 06ECC4 8006E0C4 24030003 */ li $v1, 3 /* 06ECC8 8006E0C8 10430044 */ beq $v0, $v1, .L8006E1DC -/* 06ECCC 8006E0CC 00000000 */ nop +/* 06ECCC 8006E0CC 00000000 */ nop /* 06ECD0 8006E0D0 100000D0 */ b .L8006E414 /* 06ECD4 8006E0D4 8FBF0014 */ lw $ra, 0x14($sp) .L8006E0D8: /* 06ECD8 8006E0D8 0C01B908 */ jal func_8006E420 -/* 06ECDC 8006E0DC 8C84C4DC */ lw $a0, %lo(D_800DC4DC)($a0) -/* 06ECE0 8006E0E0 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e -/* 06ECE4 8006E0E4 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) +/* 06ECDC 8006E0DC 8C84C4DC */ lw $a0, %lo(gPlayerOne)($a0) +/* 06ECE0 8006E0E0 3C04800E */ lui $a0, %hi(gPlayerTwo) # $a0, 0x800e +/* 06ECE4 8006E0E4 8C84C4E0 */ lw $a0, %lo(gPlayerTwo)($a0) /* 06ECE8 8006E0E8 24050001 */ li $a1, 1 /* 06ECEC 8006E0EC 0C01B908 */ jal func_8006E420 /* 06ECF0 8006E0F0 00003025 */ move $a2, $zero -/* 06ECF4 8006E0F4 3C04800E */ lui $a0, %hi(D_800DC4E4) # $a0, 0x800e -/* 06ECF8 8006E0F8 8C84C4E4 */ lw $a0, %lo(D_800DC4E4)($a0) +/* 06ECF4 8006E0F4 3C04800E */ lui $a0, %hi(gPlayerThree) # $a0, 0x800e +/* 06ECF8 8006E0F8 8C84C4E4 */ lw $a0, %lo(gPlayerThree)($a0) /* 06ECFC 8006E0FC 24050002 */ li $a1, 2 /* 06ED00 8006E100 0C01B908 */ jal func_8006E420 /* 06ED04 8006E104 00003025 */ move $a2, $zero -/* 06ED08 8006E108 3C04800E */ lui $a0, %hi(D_800DC4E8) # $a0, 0x800e -/* 06ED0C 8006E10C 8C84C4E8 */ lw $a0, %lo(D_800DC4E8)($a0) +/* 06ED08 8006E108 3C04800E */ lui $a0, %hi(gPlayerFour) # $a0, 0x800e +/* 06ED0C 8006E10C 8C84C4E8 */ lw $a0, %lo(gPlayerFour)($a0) /* 06ED10 8006E110 24050003 */ li $a1, 3 /* 06ED14 8006E114 0C01B908 */ jal func_8006E420 /* 06ED18 8006E118 00003025 */ move $a2, $zero -/* 06ED1C 8006E11C 3C04800E */ lui $a0, %hi(D_800DC4EC) # $a0, 0x800e -/* 06ED20 8006E120 8C84C4EC */ lw $a0, %lo(D_800DC4EC)($a0) +/* 06ED1C 8006E11C 3C04800E */ lui $a0, %hi(gPlayerFive) # $a0, 0x800e +/* 06ED20 8006E120 8C84C4EC */ lw $a0, %lo(gPlayerFive)($a0) /* 06ED24 8006E124 24050004 */ li $a1, 4 /* 06ED28 8006E128 0C01B908 */ jal func_8006E420 /* 06ED2C 8006E12C 00003025 */ move $a2, $zero -/* 06ED30 8006E130 3C04800E */ lui $a0, %hi(D_800DC4F0) # $a0, 0x800e -/* 06ED34 8006E134 8C84C4F0 */ lw $a0, %lo(D_800DC4F0)($a0) +/* 06ED30 8006E130 3C04800E */ lui $a0, %hi(gPlayerSix) # $a0, 0x800e +/* 06ED34 8006E134 8C84C4F0 */ lw $a0, %lo(gPlayerSix)($a0) /* 06ED38 8006E138 24050005 */ li $a1, 5 /* 06ED3C 8006E13C 0C01B908 */ jal func_8006E420 /* 06ED40 8006E140 00003025 */ move $a2, $zero -/* 06ED44 8006E144 3C04800E */ lui $a0, %hi(D_800DC4F4) # $a0, 0x800e -/* 06ED48 8006E148 8C84C4F4 */ lw $a0, %lo(D_800DC4F4)($a0) +/* 06ED44 8006E144 3C04800E */ lui $a0, %hi(gPlayerSeven) # $a0, 0x800e +/* 06ED48 8006E148 8C84C4F4 */ lw $a0, %lo(gPlayerSeven)($a0) /* 06ED4C 8006E14C 24050006 */ li $a1, 6 /* 06ED50 8006E150 0C01B908 */ jal func_8006E420 /* 06ED54 8006E154 00003025 */ move $a2, $zero -/* 06ED58 8006E158 3C04800E */ lui $a0, %hi(D_800DC4F8) # $a0, 0x800e -/* 06ED5C 8006E15C 8C84C4F8 */ lw $a0, %lo(D_800DC4F8)($a0) +/* 06ED58 8006E158 3C04800E */ lui $a0, %hi(gPlayerEight) # $a0, 0x800e +/* 06ED5C 8006E15C 8C84C4F8 */ lw $a0, %lo(gPlayerEight)($a0) /* 06ED60 8006E160 24050007 */ li $a1, 7 /* 06ED64 8006E164 0C01B908 */ jal func_8006E420 /* 06ED68 8006E168 00003025 */ move $a2, $zero /* 06ED6C 8006E16C 100000A9 */ b .L8006E414 /* 06ED70 8006E170 8FBF0014 */ lw $ra, 0x14($sp) .L8006E174: -/* 06ED74 8006E174 8C84C4DC */ lw $a0, %lo(D_800DC4DC)($a0) +/* 06ED74 8006E174 8C84C4DC */ lw $a0, %lo(gPlayerOne)($a0) /* 06ED78 8006E178 00002825 */ move $a1, $zero /* 06ED7C 8006E17C 0C01B908 */ jal func_8006E420 /* 06ED80 8006E180 00003025 */ move $a2, $zero -/* 06ED84 8006E184 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e -/* 06ED88 8006E188 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) +/* 06ED84 8006E184 3C04800E */ lui $a0, %hi(gPlayerTwo) # $a0, 0x800e +/* 06ED88 8006E188 8C84C4E0 */ lw $a0, %lo(gPlayerTwo)($a0) /* 06ED8C 8006E18C 24010100 */ li $at, 256 /* 06ED90 8006E190 24050001 */ li $a1, 1 /* 06ED94 8006E194 948E0000 */ lhu $t6, ($a0) /* 06ED98 8006E198 31CF0100 */ andi $t7, $t6, 0x100 /* 06ED9C 8006E19C 15E10003 */ bne $t7, $at, .L8006E1AC -/* 06EDA0 8006E1A0 00000000 */ nop +/* 06EDA0 8006E1A0 00000000 */ nop /* 06EDA4 8006E1A4 0C01B908 */ jal func_8006E420 /* 06EDA8 8006E1A8 00003025 */ move $a2, $zero .L8006E1AC: -/* 06EDAC 8006E1AC 3C04800E */ lui $a0, %hi(D_800DC4E4) # $a0, 0x800e -/* 06EDB0 8006E1B0 8C84C4E4 */ lw $a0, %lo(D_800DC4E4)($a0) +/* 06EDAC 8006E1AC 3C04800E */ lui $a0, %hi(gPlayerThree) # $a0, 0x800e +/* 06EDB0 8006E1B0 8C84C4E4 */ lw $a0, %lo(gPlayerThree)($a0) /* 06EDB4 8006E1B4 24010100 */ li $at, 256 /* 06EDB8 8006E1B8 24050002 */ li $a1, 2 /* 06EDBC 8006E1BC 94980000 */ lhu $t8, ($a0) @@ -101,32 +101,32 @@ glabel func_8006E058 /* 06EDD4 8006E1D4 1000008F */ b .L8006E414 /* 06EDD8 8006E1D8 8FBF0014 */ lw $ra, 0x14($sp) .L8006E1DC: -/* 06EDDC 8006E1DC 3C04800E */ lui $a0, %hi(D_800DC4DC) # $a0, 0x800e -/* 06EDE0 8006E1E0 8C84C4DC */ lw $a0, %lo(D_800DC4DC)($a0) +/* 06EDDC 8006E1DC 3C04800E */ lui $a0, %hi(gPlayerOne) # $a0, 0x800e +/* 06EDE0 8006E1E0 8C84C4DC */ lw $a0, %lo(gPlayerOne)($a0) /* 06EDE4 8006E1E4 00002825 */ move $a1, $zero /* 06EDE8 8006E1E8 0C01B908 */ jal func_8006E420 /* 06EDEC 8006E1EC 00003025 */ move $a2, $zero -/* 06EDF0 8006E1F0 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e -/* 06EDF4 8006E1F4 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) +/* 06EDF0 8006E1F0 3C04800E */ lui $a0, %hi(gPlayerTwo) # $a0, 0x800e +/* 06EDF4 8006E1F4 8C84C4E0 */ lw $a0, %lo(gPlayerTwo)($a0) /* 06EDF8 8006E1F8 24050001 */ li $a1, 1 /* 06EDFC 8006E1FC 0C01B908 */ jal func_8006E420 /* 06EE00 8006E200 00003025 */ move $a2, $zero /* 06EE04 8006E204 3C02800E */ lui $v0, %hi(gPlayerCountSelection1) # $v0, 0x800e /* 06EE08 8006E208 8C42C538 */ lw $v0, %lo(gPlayerCountSelection1)($v0) -/* 06EE0C 8006E20C 3C04800E */ lui $a0, %hi(D_800DC4E4) # $a0, 0x800e +/* 06EE0C 8006E20C 3C04800E */ lui $a0, %hi(gPlayerThree) # $a0, 0x800e /* 06EE10 8006E210 24050002 */ li $a1, 2 /* 06EE14 8006E214 28410003 */ slti $at, $v0, 3 /* 06EE18 8006E218 14200005 */ bnez $at, .L8006E230 /* 06EE1C 8006E21C 00003025 */ move $a2, $zero /* 06EE20 8006E220 0C01B908 */ jal func_8006E420 -/* 06EE24 8006E224 8C84C4E4 */ lw $a0, %lo(D_800DC4E4)($a0) +/* 06EE24 8006E224 8C84C4E4 */ lw $a0, %lo(gPlayerThree)($a0) /* 06EE28 8006E228 3C02800E */ lui $v0, %hi(gPlayerCountSelection1) # $v0, 0x800e /* 06EE2C 8006E22C 8C42C538 */ lw $v0, %lo(gPlayerCountSelection1)($v0) .L8006E230: /* 06EE30 8006E230 24010004 */ li $at, 4 /* 06EE34 8006E234 14410076 */ bne $v0, $at, .L8006E410 -/* 06EE38 8006E238 3C04800E */ lui $a0, %hi(D_800DC4E8) # $a0, 0x800e -/* 06EE3C 8006E23C 8C84C4E8 */ lw $a0, %lo(D_800DC4E8)($a0) +/* 06EE38 8006E238 3C04800E */ lui $a0, %hi(gPlayerFour) # $a0, 0x800e +/* 06EE3C 8006E23C 8C84C4E8 */ lw $a0, %lo(gPlayerFour)($a0) /* 06EE40 8006E240 24050003 */ li $a1, 3 /* 06EE44 8006E244 0C01B908 */ jal func_8006E420 /* 06EE48 8006E248 00003025 */ move $a2, $zero @@ -138,76 +138,76 @@ glabel func_8006E058 /* 06EE5C 8006E25C 00002825 */ move $a1, $zero /* 06EE60 8006E260 00003025 */ move $a2, $zero /* 06EE64 8006E264 10400009 */ beqz $v0, .L8006E28C -/* 06EE68 8006E268 00000000 */ nop +/* 06EE68 8006E268 00000000 */ nop /* 06EE6C 8006E26C 1043003B */ beq $v0, $v1, .L8006E35C /* 06EE70 8006E270 00002825 */ move $a1, $zero /* 06EE74 8006E274 1044002D */ beq $v0, $a0, .L8006E32C /* 06EE78 8006E278 24030003 */ li $v1, 3 /* 06EE7C 8006E27C 1043002B */ beq $v0, $v1, .L8006E32C -/* 06EE80 8006E280 00000000 */ nop +/* 06EE80 8006E280 00000000 */ nop /* 06EE84 8006E284 10000063 */ b .L8006E414 /* 06EE88 8006E288 8FBF0014 */ lw $ra, 0x14($sp) .L8006E28C: -/* 06EE8C 8006E28C 3C04800E */ lui $a0, %hi(D_800DC4DC) # $a0, 0x800e +/* 06EE8C 8006E28C 3C04800E */ lui $a0, %hi(gPlayerOne) # $a0, 0x800e /* 06EE90 8006E290 0C01B908 */ jal func_8006E420 -/* 06EE94 8006E294 8C84C4DC */ lw $a0, %lo(D_800DC4DC)($a0) -/* 06EE98 8006E298 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e -/* 06EE9C 8006E29C 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) +/* 06EE94 8006E294 8C84C4DC */ lw $a0, %lo(gPlayerOne)($a0) +/* 06EE98 8006E298 3C04800E */ lui $a0, %hi(gPlayerTwo) # $a0, 0x800e +/* 06EE9C 8006E29C 8C84C4E0 */ lw $a0, %lo(gPlayerTwo)($a0) /* 06EEA0 8006E2A0 24050001 */ li $a1, 1 /* 06EEA4 8006E2A4 0C01B908 */ jal func_8006E420 /* 06EEA8 8006E2A8 00003025 */ move $a2, $zero -/* 06EEAC 8006E2AC 3C04800E */ lui $a0, %hi(D_800DC4E4) # $a0, 0x800e -/* 06EEB0 8006E2B0 8C84C4E4 */ lw $a0, %lo(D_800DC4E4)($a0) +/* 06EEAC 8006E2AC 3C04800E */ lui $a0, %hi(gPlayerThree) # $a0, 0x800e +/* 06EEB0 8006E2B0 8C84C4E4 */ lw $a0, %lo(gPlayerThree)($a0) /* 06EEB4 8006E2B4 24050002 */ li $a1, 2 /* 06EEB8 8006E2B8 0C01B908 */ jal func_8006E420 /* 06EEBC 8006E2BC 00003025 */ move $a2, $zero -/* 06EEC0 8006E2C0 3C04800E */ lui $a0, %hi(D_800DC4E8) # $a0, 0x800e -/* 06EEC4 8006E2C4 8C84C4E8 */ lw $a0, %lo(D_800DC4E8)($a0) +/* 06EEC0 8006E2C0 3C04800E */ lui $a0, %hi(gPlayerFour) # $a0, 0x800e +/* 06EEC4 8006E2C4 8C84C4E8 */ lw $a0, %lo(gPlayerFour)($a0) /* 06EEC8 8006E2C8 24050003 */ li $a1, 3 /* 06EECC 8006E2CC 0C01B908 */ jal func_8006E420 /* 06EED0 8006E2D0 00003025 */ move $a2, $zero -/* 06EED4 8006E2D4 3C04800E */ lui $a0, %hi(D_800DC4EC) # $a0, 0x800e -/* 06EED8 8006E2D8 8C84C4EC */ lw $a0, %lo(D_800DC4EC)($a0) +/* 06EED4 8006E2D4 3C04800E */ lui $a0, %hi(gPlayerFive) # $a0, 0x800e +/* 06EED8 8006E2D8 8C84C4EC */ lw $a0, %lo(gPlayerFive)($a0) /* 06EEDC 8006E2DC 24050004 */ li $a1, 4 /* 06EEE0 8006E2E0 0C01B908 */ jal func_8006E420 /* 06EEE4 8006E2E4 00003025 */ move $a2, $zero -/* 06EEE8 8006E2E8 3C04800E */ lui $a0, %hi(D_800DC4F0) # $a0, 0x800e -/* 06EEEC 8006E2EC 8C84C4F0 */ lw $a0, %lo(D_800DC4F0)($a0) +/* 06EEE8 8006E2E8 3C04800E */ lui $a0, %hi(gPlayerSix) # $a0, 0x800e +/* 06EEEC 8006E2EC 8C84C4F0 */ lw $a0, %lo(gPlayerSix)($a0) /* 06EEF0 8006E2F0 24050005 */ li $a1, 5 /* 06EEF4 8006E2F4 0C01B908 */ jal func_8006E420 /* 06EEF8 8006E2F8 00003025 */ move $a2, $zero -/* 06EEFC 8006E2FC 3C04800E */ lui $a0, %hi(D_800DC4F4) # $a0, 0x800e -/* 06EF00 8006E300 8C84C4F4 */ lw $a0, %lo(D_800DC4F4)($a0) +/* 06EEFC 8006E2FC 3C04800E */ lui $a0, %hi(gPlayerSeven) # $a0, 0x800e +/* 06EF00 8006E300 8C84C4F4 */ lw $a0, %lo(gPlayerSeven)($a0) /* 06EF04 8006E304 24050006 */ li $a1, 6 /* 06EF08 8006E308 0C01B908 */ jal func_8006E420 /* 06EF0C 8006E30C 00003025 */ move $a2, $zero -/* 06EF10 8006E310 3C04800E */ lui $a0, %hi(D_800DC4F8) # $a0, 0x800e -/* 06EF14 8006E314 8C84C4F8 */ lw $a0, %lo(D_800DC4F8)($a0) +/* 06EF10 8006E310 3C04800E */ lui $a0, %hi(gPlayerEight) # $a0, 0x800e +/* 06EF14 8006E314 8C84C4F8 */ lw $a0, %lo(gPlayerEight)($a0) /* 06EF18 8006E318 24050007 */ li $a1, 7 /* 06EF1C 8006E31C 0C01B908 */ jal func_8006E420 /* 06EF20 8006E320 00003025 */ move $a2, $zero /* 06EF24 8006E324 1000003B */ b .L8006E414 /* 06EF28 8006E328 8FBF0014 */ lw $ra, 0x14($sp) .L8006E32C: -/* 06EF2C 8006E32C 3C04800E */ lui $a0, %hi(D_800DC4DC) # $a0, 0x800e -/* 06EF30 8006E330 8C84C4DC */ lw $a0, %lo(D_800DC4DC)($a0) +/* 06EF2C 8006E32C 3C04800E */ lui $a0, %hi(gPlayerOne) # $a0, 0x800e +/* 06EF30 8006E330 8C84C4DC */ lw $a0, %lo(gPlayerOne)($a0) /* 06EF34 8006E334 00002825 */ move $a1, $zero /* 06EF38 8006E338 0C01B908 */ jal func_8006E420 /* 06EF3C 8006E33C 00003025 */ move $a2, $zero -/* 06EF40 8006E340 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e -/* 06EF44 8006E344 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) +/* 06EF40 8006E340 3C04800E */ lui $a0, %hi(gPlayerTwo) # $a0, 0x800e +/* 06EF44 8006E344 8C84C4E0 */ lw $a0, %lo(gPlayerTwo)($a0) /* 06EF48 8006E348 24050001 */ li $a1, 1 /* 06EF4C 8006E34C 0C01B908 */ jal func_8006E420 /* 06EF50 8006E350 00003025 */ move $a2, $zero /* 06EF54 8006E354 1000002F */ b .L8006E414 /* 06EF58 8006E358 8FBF0014 */ lw $ra, 0x14($sp) .L8006E35C: -/* 06EF5C 8006E35C 3C04800E */ lui $a0, %hi(D_800DC4DC) # $a0, 0x800e -/* 06EF60 8006E360 8C84C4DC */ lw $a0, %lo(D_800DC4DC)($a0) +/* 06EF5C 8006E35C 3C04800E */ lui $a0, %hi(gPlayerOne) # $a0, 0x800e +/* 06EF60 8006E360 8C84C4DC */ lw $a0, %lo(gPlayerOne)($a0) /* 06EF64 8006E364 0C01B908 */ jal func_8006E420 /* 06EF68 8006E368 00003025 */ move $a2, $zero -/* 06EF6C 8006E36C 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e -/* 06EF70 8006E370 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) +/* 06EF6C 8006E36C 3C04800E */ lui $a0, %hi(gPlayerTwo) # $a0, 0x800e +/* 06EF70 8006E370 8C84C4E0 */ lw $a0, %lo(gPlayerTwo)($a0) /* 06EF74 8006E374 34018000 */ li $at, 32768 /* 06EF78 8006E378 24050001 */ li $a1, 1 /* 06EF7C 8006E37C 94880000 */ lhu $t0, ($a0) @@ -224,29 +224,29 @@ glabel func_8006E058 /* 06EFA4 8006E3A4 00002825 */ move $a1, $zero /* 06EFA8 8006E3A8 00003025 */ move $a2, $zero /* 06EFAC 8006E3AC 10440002 */ beq $v0, $a0, .L8006E3B8 -/* 06EFB0 8006E3B0 00000000 */ nop +/* 06EFB0 8006E3B0 00000000 */ nop /* 06EFB4 8006E3B4 14430016 */ bne $v0, $v1, .L8006E410 .L8006E3B8: -/* 06EFB8 8006E3B8 3C04800E */ lui $a0, %hi(D_800DC4DC) # $a0, 0x800e +/* 06EFB8 8006E3B8 3C04800E */ lui $a0, %hi(gPlayerOne) # $a0, 0x800e /* 06EFBC 8006E3BC 0C01B908 */ jal func_8006E420 -/* 06EFC0 8006E3C0 8C84C4DC */ lw $a0, %lo(D_800DC4DC)($a0) -/* 06EFC4 8006E3C4 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e -/* 06EFC8 8006E3C8 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) +/* 06EFC0 8006E3C0 8C84C4DC */ lw $a0, %lo(gPlayerOne)($a0) +/* 06EFC4 8006E3C4 3C04800E */ lui $a0, %hi(gPlayerTwo) # $a0, 0x800e +/* 06EFC8 8006E3C8 8C84C4E0 */ lw $a0, %lo(gPlayerTwo)($a0) /* 06EFCC 8006E3CC 24050001 */ li $a1, 1 /* 06EFD0 8006E3D0 0C01B908 */ jal func_8006E420 /* 06EFD4 8006E3D4 00003025 */ move $a2, $zero -/* 06EFD8 8006E3D8 3C04800E */ lui $a0, %hi(D_800DC4E4) # $a0, 0x800e -/* 06EFDC 8006E3DC 8C84C4E4 */ lw $a0, %lo(D_800DC4E4)($a0) +/* 06EFD8 8006E3D8 3C04800E */ lui $a0, %hi(gPlayerThree) # $a0, 0x800e +/* 06EFDC 8006E3DC 8C84C4E4 */ lw $a0, %lo(gPlayerThree)($a0) /* 06EFE0 8006E3E0 24050002 */ li $a1, 2 /* 06EFE4 8006E3E4 0C01B908 */ jal func_8006E420 /* 06EFE8 8006E3E8 00003025 */ move $a2, $zero /* 06EFEC 8006E3EC 3C0A800E */ lui $t2, %hi(gPlayerCountSelection1) # $t2, 0x800e /* 06EFF0 8006E3F0 8D4AC538 */ lw $t2, %lo(gPlayerCountSelection1)($t2) /* 06EFF4 8006E3F4 24010004 */ li $at, 4 -/* 06EFF8 8006E3F8 3C04800E */ lui $a0, %hi(D_800DC4E8) # $a0, 0x800e +/* 06EFF8 8006E3F8 3C04800E */ lui $a0, %hi(gPlayerFour) # $a0, 0x800e /* 06EFFC 8006E3FC 15410004 */ bne $t2, $at, .L8006E410 /* 06F000 8006E400 24050003 */ li $a1, 3 -/* 06F004 8006E404 8C84C4E8 */ lw $a0, %lo(D_800DC4E8)($a0) +/* 06F004 8006E404 8C84C4E8 */ lw $a0, %lo(gPlayerFour)($a0) /* 06F008 8006E408 0C01B908 */ jal func_8006E420 /* 06F00C 8006E40C 00003025 */ move $a2, $zero .L8006E410: @@ -254,4 +254,4 @@ glabel func_8006E058 .L8006E414: /* 06F014 8006E414 27BD0018 */ addiu $sp, $sp, 0x18 /* 06F018 8006E418 03E00008 */ jr $ra -/* 06F01C 8006E41C 00000000 */ nop +/* 06F01C 8006E41C 00000000 */ nop diff --git a/asm/non_matchings/code_8006E9C0/func_8006FA94.s b/asm/non_matchings/code_8006E9C0/func_8006FA94.s index 5e8eb7424..0b4da05d0 100644 --- a/asm/non_matchings/code_8006E9C0/func_8006FA94.s +++ b/asm/non_matchings/code_8006E9C0/func_8006FA94.s @@ -2,9 +2,9 @@ glabel func_8006FA94 /* 070694 8006FA94 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 070698 8006FA98 AFBF0014 */ sw $ra, 0x14($sp) /* 07069C 8006FA9C 0C01BE33 */ jal func_8006F8CC -/* 0706A0 8006FAA0 00000000 */ nop +/* 0706A0 8006FAA0 00000000 */ nop /* 0706A4 8006FAA4 0C01BC02 */ jal func_8006F008 -/* 0706A8 8006FAA8 00000000 */ nop +/* 0706A8 8006FAA8 00000000 */ nop /* 0706AC 8006FAAC 24040000 */ li $a0, 0 /* 0706B0 8006FAB0 0C0338C4 */ jal osSetTime /* 0706B4 8006FAB4 24050000 */ li $a1, 0 @@ -114,7 +114,7 @@ glabel func_8006FA94 /* 070848 8006FC48 24010001 */ li $at, 1 /* 07084C 8006FC4C 3C02800E */ lui $v0, %hi(gModeSelection) # 0x800e /* 070850 8006FC50 15E10029 */ bne $t7, $at, .L8006FCF8 -/* 070854 8006FC54 00000000 */ nop +/* 070854 8006FC54 00000000 */ nop /* 070858 8006FC58 3C02800E */ lui $v0, %hi(gModeSelection) # $v0, 0x800e /* 07085C 8006FC5C 8C42C53C */ lw $v0, %lo(gModeSelection)($v0) /* 070860 8006FC60 3C018019 */ lui $at, %hi(D_8018D114) # $at, 0x8019 @@ -372,7 +372,7 @@ glabel func_8006FA94 /* 070C1C 8007001C A429D18C */ sh $t1, %lo(D_8018D18C)($at) /* 070C20 80070020 85EFD18C */ lh $t7, %lo(D_8018D18C)($t7) /* 070C24 80070024 3C018019 */ lui $at, %hi(D_8018D184) # $at, 0x8019 -/* 070C28 80070028 3C02800E */ lui $v0, %hi(D_800DC4DC) # $v0, 0x800e +/* 070C28 80070028 3C02800E */ lui $v0, %hi(gPlayerOne) # $v0, 0x800e /* 070C2C 8007002C A42FD184 */ sh $t7, %lo(D_8018D184)($at) /* 070C30 80070030 3C018019 */ lui $at, %hi(D_8018D16C) # $at, 0x8019 /* 070C34 80070034 A42FD16C */ sh $t7, %lo(D_8018D16C)($at) @@ -388,7 +388,7 @@ glabel func_8006FA94 /* 070C5C 8007005C 3C088019 */ lui $t0, %hi(D_8018CF28) # $t0, 0x8019 /* 070C60 80070060 44811000 */ mtc1 $at, $f2 /* 070C64 80070064 44800000 */ mtc1 $zero, $f0 -/* 070C68 80070068 8C42C4DC */ lw $v0, %lo(D_800DC4DC)($v0) +/* 070C68 80070068 8C42C4DC */ lw $v0, %lo(gPlayerOne)($v0) /* 070C6C 8007006C 2508CF28 */ addiu $t0, %lo(D_8018CF28) # addiu $t0, $t0, -0x30d8 /* 070C70 80070070 24E7CF50 */ addiu $a3, %lo(D_8018CF50) # addiu $a3, $a3, -0x30b0 /* 070C74 80070074 2463CE10 */ addiu $v1, %lo(D_8018CE10) # addiu $v1, $v1, -0x31f0 @@ -444,4 +444,4 @@ glabel func_8006FA94 /* 070D38 80070138 8FBF0014 */ lw $ra, 0x14($sp) /* 070D3C 8007013C 27BD0018 */ addiu $sp, $sp, 0x18 /* 070D40 80070140 03E00008 */ jr $ra -/* 070D44 80070144 00000000 */ nop +/* 070D44 80070144 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_80072180.s b/asm/non_matchings/code_80071F00/func_80072180.s index 018b00b08..6a81b83ac 100644 --- a/asm/non_matchings/code_80071F00/func_80072180.s +++ b/asm/non_matchings/code_80071F00/func_80072180.s @@ -2,10 +2,10 @@ glabel func_80072180 /* 072D80 80072180 3C0E800E */ lui $t6, %hi(gModeSelection) # $t6, 0x800e /* 072D84 80072184 8DCEC53C */ lw $t6, %lo(gModeSelection)($t6) /* 072D88 80072188 24030001 */ li $v1, 1 -/* 072D8C 8007218C 3C0F800E */ lui $t7, %hi(D_800DC4DC) # $t7, 0x800e +/* 072D8C 8007218C 3C0F800E */ lui $t7, %hi(gPlayerOne) # $t7, 0x800e /* 072D90 80072190 146E0009 */ bne $v1, $t6, .L800721B8 -/* 072D94 80072194 00000000 */ nop -/* 072D98 80072198 8DEFC4DC */ lw $t7, %lo(D_800DC4DC)($t7) +/* 072D94 80072194 00000000 */ nop +/* 072D98 80072198 8DEFC4DC */ lw $t7, %lo(gPlayerOne)($t7) /* 072D9C 8007219C 95E20000 */ lhu $v0, ($t7) /* 072DA0 800721A0 30588000 */ andi $t8, $v0, 0x8000 /* 072DA4 800721A4 13000004 */ beqz $t8, .L800721B8 @@ -15,4 +15,4 @@ glabel func_80072180 /* 072DB4 800721B4 AC232DF8 */ sw $v1, %lo(D_80162DF8)($at) .L800721B8: /* 072DB8 800721B8 03E00008 */ jr $ra -/* 072DBC 800721BC 00000000 */ nop +/* 072DBC 800721BC 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_80078288.s b/asm/non_matchings/code_80071F00/func_80078288.s index ac5326efe..b62d87b3e 100644 --- a/asm/non_matchings/code_80071F00/func_80078288.s +++ b/asm/non_matchings/code_80071F00/func_80078288.s @@ -18,15 +18,15 @@ glabel func_80078288 /* 078EC8 800782C8 104100E4 */ beq $v0, $at, .L8007865C /* 078ECC 800782CC 24010003 */ li $at, 3 /* 078ED0 800782D0 104100FF */ beq $v0, $at, .L800786D0 -/* 078ED4 800782D4 00000000 */ nop +/* 078ED4 800782D4 00000000 */ nop /* 078ED8 800782D8 10000100 */ b .L800786DC /* 078EDC 800782DC 8FBF001C */ lw $ra, 0x1c($sp) .L800782E0: /* 078EE0 800782E0 8F39C50C */ lw $t9, %lo(D_800DC50C)($t9) /* 078EE4 800782E4 24010009 */ li $at, 9 /* 078EE8 800782E8 13210081 */ beq $t9, $at, .L800784F0 -/* 078EEC 800782EC 3C08800E */ lui $t0, %hi(D_800DC4FC) # $t0, 0x800e -/* 078EF0 800782F0 8D08C4FC */ lw $t0, %lo(D_800DC4FC)($t0) +/* 078EEC 800782EC 3C08800E */ lui $t0, %hi(gPlayerOneCopy) # $t0, 0x800e +/* 078EF0 800782F0 8D08C4FC */ lw $t0, %lo(gPlayerOneCopy)($t0) /* 078EF4 800782F4 3C014190 */ li $at, 0x41900000 # 18.000000 /* 078EF8 800782F8 44813000 */ mtc1 $at, $f6 /* 078EFC 800782FC C5040094 */ lwc1 $f4, 0x94($t0) @@ -66,14 +66,14 @@ glabel func_80078288 /* 078F84 80078384 00005812 */ mflo $t3 /* 078F88 80078388 858D0026 */ lh $t5, 0x26($t4) /* 078F8C 8007838C 15400002 */ bnez $t2, .L80078398 -/* 078F90 80078390 00000000 */ nop +/* 078F90 80078390 00000000 */ nop /* 078F94 80078394 0007000D */ break 7 .L80078398: /* 078F98 80078398 2401FFFF */ li $at, -1 /* 078F9C 8007839C 15410004 */ bne $t2, $at, .L800783B0 /* 078FA0 800783A0 3C018000 */ lui $at, 0x8000 /* 078FA4 800783A4 15E10002 */ bne $t7, $at, .L800783B0 -/* 078FA8 800783A8 00000000 */ nop +/* 078FA8 800783A8 00000000 */ nop /* 078FAC 800783AC 0006000D */ break 6 .L800783B0: /* 078FB0 800783B0 016D2021 */ addu $a0, $t3, $t5 @@ -82,8 +82,8 @@ glabel func_80078288 /* 078FBC 800783BC 0C0AE006 */ jal sins /* 078FC0 800783C0 A7AE0036 */ sh $t6, 0x36($sp) /* 078FC4 800783C4 87B8003C */ lh $t8, 0x3c($sp) -/* 078FC8 800783C8 3C02800E */ lui $v0, %hi(D_800DC4FC) # $v0, 0x800e -/* 078FCC 800783CC 8C42C4FC */ lw $v0, %lo(D_800DC4FC)($v0) +/* 078FC8 800783C8 3C02800E */ lui $v0, %hi(gPlayerOneCopy) # $v0, 0x800e +/* 078FCC 800783CC 8C42C4FC */ lw $v0, %lo(gPlayerOneCopy)($v0) /* 078FD0 800783D0 44984000 */ mtc1 $t8, $f8 /* 078FD4 800783D4 87B9003E */ lh $t9, 0x3e($sp) /* 078FD8 800783D8 C4500014 */ lwc1 $f16, 0x14($v0) @@ -100,8 +100,8 @@ glabel func_80078288 /* 079004 80078404 0C0AE00E */ jal coss /* 079008 80078408 E60A0014 */ swc1 $f10, 0x14($s0) /* 07900C 8007840C C7A20024 */ lwc1 $f2, 0x24($sp) -/* 079010 80078410 3C08800E */ lui $t0, %hi(D_800DC4FC) # $t0, 0x800e -/* 079014 80078414 8D08C4FC */ lw $t0, %lo(D_800DC4FC)($t0) +/* 079010 80078410 3C08800E */ lui $t0, %hi(gPlayerOneCopy) # $t0, 0x800e +/* 079014 80078414 8D08C4FC */ lw $t0, %lo(gPlayerOneCopy)($t0) /* 079018 80078418 46020402 */ mul.s $f16, $f0, $f2 /* 07901C 8007841C 24040400 */ li $a0, 1024 /* 079020 80078420 C512001C */ lwc1 $f18, 0x1c($t0) @@ -117,7 +117,7 @@ glabel func_80078288 /* 079048 80078448 04410004 */ bgez $v0, .L8007845C /* 07904C 8007844C 46803220 */ cvt.s.w $f8, $f6 /* 079050 80078450 44815000 */ mtc1 $at, $f10 -/* 079054 80078454 00000000 */ nop +/* 079054 80078454 00000000 */ nop /* 079058 80078458 460A4200 */ add.s $f8, $f8, $f10 .L8007845C: /* 07905C 8007845C 3C01800F */ lui $at, %hi(D_800EEB50) @@ -139,7 +139,7 @@ glabel func_80078288 /* 07909C 8007849C 3C0141F0 */ li $at, 0x41F00000 # 30.000000 /* 0790A0 800784A0 44812800 */ mtc1 $at, $f5 /* 0790A4 800784A4 44802000 */ mtc1 $zero, $f4 -/* 0790A8 800784A8 00000000 */ nop +/* 0790A8 800784A8 00000000 */ nop /* 0790AC 800784AC 46249480 */ add.d $f18, $f18, $f4 .L800784B0: /* 0790B0 800784B0 3C01800F */ lui $at, %hi(D_800EEB58) @@ -211,7 +211,7 @@ glabel func_80078288 /* 0791B4 800785B4 04410004 */ bgez $v0, .L800785C8 /* 0791B8 800785B8 46805220 */ cvt.s.w $f8, $f10 /* 0791BC 800785BC 44812000 */ mtc1 $at, $f4 -/* 0791C0 800785C0 00000000 */ nop +/* 0791C0 800785C0 00000000 */ nop /* 0791C4 800785C4 46044200 */ add.s $f8, $f8, $f4 .L800785C8: /* 0791C8 800785C8 3C01800F */ lui $at, %hi(D_800EEB70) @@ -233,7 +233,7 @@ glabel func_80078288 /* 079208 80078608 3C0141F0 */ li $at, 0x41F00000 # 30.000000 /* 07920C 8007860C 44813800 */ mtc1 $at, $f7 /* 079210 80078610 44803000 */ mtc1 $zero, $f6 -/* 079214 80078614 00000000 */ nop +/* 079214 80078614 00000000 */ nop /* 079218 80078618 46269480 */ add.d $f18, $f18, $f6 .L8007861C: /* 07921C 8007861C 3C01800F */ lui $at, %hi(D_800EEB78) @@ -271,9 +271,9 @@ glabel func_80078288 /* 079298 80078698 44803000 */ mtc1 $zero, $f6 /* 07929C 8007869C 460084A1 */ cvt.d.s $f18, $f16 /* 0792A0 800786A0 4626903E */ c.le.d $f18, $f6 -/* 0792A4 800786A4 00000000 */ nop +/* 0792A4 800786A4 00000000 */ nop /* 0792A8 800786A8 45000003 */ bc1f .L800786B8 -/* 0792AC 800786AC 00000000 */ nop +/* 0792AC 800786AC 00000000 */ nop /* 0792B0 800786B0 0C021BF5 */ jal func_80086FD4 /* 0792B4 800786B4 8FA40040 */ lw $a0, 0x40($sp) .L800786B8: @@ -292,4 +292,4 @@ glabel func_80078288 /* 0792DC 800786DC 8FB00018 */ lw $s0, 0x18($sp) /* 0792E0 800786E0 27BD0040 */ addiu $sp, $sp, 0x40 /* 0792E4 800786E4 03E00008 */ jr $ra -/* 0792E8 800786E8 00000000 */ nop +/* 0792E8 800786E8 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_800791F0.s b/asm/non_matchings/code_80071F00/func_800791F0.s index 675d9b520..04b499dc3 100644 --- a/asm/non_matchings/code_80071F00/func_800791F0.s +++ b/asm/non_matchings/code_80071F00/func_800791F0.s @@ -10,8 +10,8 @@ glabel func_800791F0 /* 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(D_800DC4DC) # $t8, 0x800e -/* 079E20 80079220 8F18C4DC */ lw $t8, %lo(D_800DC4DC)($t8) +/* 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 @@ -59,4 +59,4 @@ glabel func_800791F0 /* 079EC8 800792C8 8FBF0014 */ lw $ra, 0x14($sp) /* 079ECC 800792CC 27BD0020 */ addiu $sp, $sp, 0x20 /* 079ED0 800792D0 03E00008 */ jr $ra -/* 079ED4 800792D4 00000000 */ nop +/* 079ED4 800792D4 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_800797AC.s b/asm/non_matchings/code_80071F00/func_800797AC.s index d89ab08e3..d414283f3 100644 --- a/asm/non_matchings/code_80071F00/func_800797AC.s +++ b/asm/non_matchings/code_80071F00/func_800797AC.s @@ -6,8 +6,8 @@ glabel func_800797AC /* 07A3BC 800797BC 3C19800E */ lui $t9, %hi(gCurrentCourseId) # $t9, 0x800e /* 07A3C0 800797C0 8739C5A0 */ lh $t9, %lo(gCurrentCourseId)($t9) /* 07A3C4 800797C4 000F7880 */ sll $t7, $t7, 2 -/* 07A3C8 800797C8 3C18800E */ lui $t8, %hi(D_800DC4DC) # $t8, 0x800e -/* 07A3CC 800797CC 8F18C4DC */ lw $t8, %lo(D_800DC4DC)($t8) +/* 07A3C8 800797C8 3C18800E */ lui $t8, %hi(gPlayerOne) # $t8, 0x800e +/* 07A3CC 800797CC 8F18C4DC */ lw $t8, %lo(gPlayerOne)($t8) /* 07A3D0 800797D0 00047080 */ sll $t6, $a0, 2 /* 07A3D4 800797D4 3C068018 */ lui $a2, %hi(D_80183DB8) # 0x8018 /* 07A3D8 800797D8 01E47823 */ subu $t7, $t7, $a0 @@ -46,4 +46,4 @@ glabel func_800797AC /* 07A450 80079850 8FBF0014 */ lw $ra, 0x14($sp) /* 07A454 80079854 27BD0020 */ addiu $sp, $sp, 0x20 /* 07A458 80079858 03E00008 */ jr $ra -/* 07A45C 8007985C 00000000 */ nop +/* 07A45C 8007985C 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_80079860.s b/asm/non_matchings/code_80071F00/func_80079860.s index 7d1486a59..297dd4873 100644 --- a/asm/non_matchings/code_80071F00/func_80079860.s +++ b/asm/non_matchings/code_80071F00/func_80079860.s @@ -4,8 +4,8 @@ glabel func_80079860 /* 07A468 80079868 01E77823 */ subu $t7, $t7, $a3 /* 07A46C 8007986C 000F7900 */ sll $t7, $t7, 4 /* 07A470 80079870 01E77823 */ subu $t7, $t7, $a3 -/* 07A474 80079874 3C18800E */ lui $t8, %hi(D_800DC4DC) # $t8, 0x800e -/* 07A478 80079878 8F18C4DC */ lw $t8, %lo(D_800DC4DC)($t8) +/* 07A474 80079874 3C18800E */ lui $t8, %hi(gPlayerOne) # $t8, 0x800e +/* 07A478 80079878 8F18C4DC */ lw $t8, %lo(gPlayerOne)($t8) /* 07A47C 8007987C 000F7880 */ sll $t7, $t7, 2 /* 07A480 80079880 00047080 */ sll $t6, $a0, 2 /* 07A484 80079884 01E77823 */ subu $t7, $t7, $a3 @@ -31,14 +31,14 @@ glabel func_80079860 /* 07A4D4 800798D4 44812000 */ mtc1 $at, $f4 /* 07A4D8 800798D8 C4C60124 */ lwc1 $f6, 0x124($a2) /* 07A4DC 800798DC 4604303E */ c.le.s $f6, $f4 -/* 07A4E0 800798E0 00000000 */ nop +/* 07A4E0 800798E0 00000000 */ nop /* 07A4E4 800798E4 4501000D */ bc1t .L8007991C -/* 07A4E8 800798E8 00000000 */ nop +/* 07A4E8 800798E8 00000000 */ nop .L800798EC: /* 07A4EC 800798EC 84D900CA */ lh $t9, 0xca($a2) /* 07A4F0 800798F0 33280001 */ andi $t0, $t9, 1 /* 07A4F4 800798F4 15000009 */ bnez $t0, .L8007991C -/* 07A4F8 800798F8 00000000 */ nop +/* 07A4F8 800798F8 00000000 */ nop /* 07A4FC 800798FC 94C900F8 */ lhu $t1, 0xf8($a2) /* 07A500 80079900 240100FD */ li $at, 253 /* 07A504 80079904 5521000A */ bnel $t1, $at, .L80079930 @@ -57,4 +57,4 @@ glabel func_80079860 .L80079930: /* 07A530 80079930 27BD0020 */ addiu $sp, $sp, 0x20 /* 07A534 80079934 03E00008 */ jr $ra -/* 07A538 80079938 00000000 */ nop +/* 07A538 80079938 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_80079B40.s b/asm/non_matchings/code_80071F00/func_80079B40.s index 5a84c033a..1b982c4e1 100644 --- a/asm/non_matchings/code_80071F00/func_80079B40.s +++ b/asm/non_matchings/code_80071F00/func_80079B40.s @@ -4,8 +4,8 @@ glabel func_80079B40 /* 07A748 80079B48 000F7900 */ sll $t7, $t7, 4 /* 07A74C 80079B4C 27BDFFC8 */ addiu $sp, $sp, -0x38 /* 07A750 80079B50 01E57823 */ subu $t7, $t7, $a1 -/* 07A754 80079B54 3C18800E */ lui $t8, %hi(D_800DC4DC) # $t8, 0x800e -/* 07A758 80079B58 8F18C4DC */ lw $t8, %lo(D_800DC4DC)($t8) +/* 07A754 80079B54 3C18800E */ lui $t8, %hi(gPlayerOne) # $t8, 0x800e +/* 07A758 80079B58 8F18C4DC */ lw $t8, %lo(gPlayerOne)($t8) /* 07A75C 80079B5C 000F7880 */ sll $t7, $t7, 2 /* 07A760 80079B60 000440C0 */ sll $t0, $a0, 3 /* 07A764 80079B64 01E57823 */ subu $t7, $t7, $a1 @@ -69,7 +69,7 @@ glabel func_80079B40 /* 07A83C 80079C3C 002E0821 */ addu $at, $at, $t6 /* 07A840 80079C40 8C2EEC58 */ lw $t6, %lo(jpt_800EEC58)($at) /* 07A844 80079C44 01C00008 */ jr $t6 -/* 07A848 80079C48 00000000 */ nop +/* 07A848 80079C48 00000000 */ nop glabel L80079C4C /* 07A84C 80079C4C 0C021BE9 */ jal func_80086FA4 /* 07A850 80079C50 02002025 */ move $a0, $s0 @@ -140,4 +140,4 @@ glabel L80079D04 /* 07A934 80079D34 8FB00020 */ lw $s0, 0x20($sp) /* 07A938 80079D38 27BD0038 */ addiu $sp, $sp, 0x38 /* 07A93C 80079D3C 03E00008 */ jr $ra -/* 07A940 80079D40 00000000 */ nop +/* 07A940 80079D40 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_80079D44.s b/asm/non_matchings/code_80071F00/func_80079D44.s index d4c79e3c1..4819f751f 100644 --- a/asm/non_matchings/code_80071F00/func_80079D44.s +++ b/asm/non_matchings/code_80071F00/func_80079D44.s @@ -17,8 +17,8 @@ glabel func_80079D44 /* 07A980 80079D80 AFA9002C */ sw $t1, 0x2c($sp) /* 07A984 80079D84 852200A6 */ lh $v0, 0xa6($t1) /* 07A988 80079D88 000F7880 */ sll $t7, $t7, 2 -/* 07A98C 80079D8C 3C18800E */ lui $t8, %hi(D_800DC4DC) # $t8, 0x800e -/* 07A990 80079D90 8F18C4DC */ lw $t8, %lo(D_800DC4DC)($t8) +/* 07A98C 80079D8C 3C18800E */ lui $t8, %hi(gPlayerOne) # $t8, 0x800e +/* 07A990 80079D90 8F18C4DC */ lw $t8, %lo(gPlayerOne)($t8) /* 07A994 80079D94 01E57823 */ subu $t7, $t7, $a1 /* 07A998 80079D98 000F78C0 */ sll $t7, $t7, 3 /* 07A99C 80079D9C 00808025 */ move $s0, $a0 @@ -73,7 +73,7 @@ glabel func_80079D44 /* 07AA4C 80079E4C 00380821 */ addu $at, $at, $t8 /* 07AA50 80079E50 8C38EC70 */ lw $t8, %lo(jpt_800EEC70)($at) # -0x1390($at) /* 07AA54 80079E54 03000008 */ jr $t8 -/* 07AA58 80079E58 00000000 */ nop +/* 07AA58 80079E58 00000000 */ nop glabel L80079E5C /* 07AA5C 80079E5C 0C021BE9 */ jal func_80086FA4 /* 07AA60 80079E60 02002025 */ move $a0, $s0 @@ -112,7 +112,7 @@ glabel L80079EAC /* 07AADC 80079EDC 46003221 */ cvt.d.s $f8, $f6 /* 07AAE0 80079EE0 02002025 */ move $a0, $s0 /* 07AAE4 80079EE4 4624403E */ c.le.d $f8, $f4 -/* 07AAE8 80079EE8 00000000 */ nop +/* 07AAE8 80079EE8 00000000 */ nop /* 07AAEC 80079EEC 45020004 */ bc1fl .L80079F00 /* 07AAF0 80079EF0 862A00CA */ lh $t2, 0xca($s1) /* 07AAF4 80079EF4 0C01C8A9 */ jal func_800722A4 diff --git a/asm/non_matchings/code_80071F00/func_8007A4D4.s b/asm/non_matchings/code_80071F00/func_8007A4D4.s index db9724c03..ed617da6b 100644 --- a/asm/non_matchings/code_80071F00/func_8007A4D4.s +++ b/asm/non_matchings/code_80071F00/func_8007A4D4.s @@ -10,9 +10,9 @@ glabel func_8007A4D4 /* 07B0F4 8007A4F4 25295C18 */ addiu $t1, %lo(D_80165C18) # addiu $t1, $t1, 0x5c18 /* 07B0F8 8007A4F8 00084140 */ sll $t0, $t0, 5 /* 07B0FC 8007A4FC 01E57823 */ subu $t7, $t7, $a1 -/* 07B100 8007A500 3C18800E */ lui $t8, %hi(D_800DC4DC) # $t8, 0x800e +/* 07B100 8007A500 3C18800E */ lui $t8, %hi(gPlayerOne) # $t8, 0x800e /* 07B104 8007A504 01098021 */ addu $s0, $t0, $t1 -/* 07B108 8007A508 8F18C4DC */ lw $t8, %lo(D_800DC4DC)($t8) +/* 07B108 8007A508 8F18C4DC */ lw $t8, %lo(gPlayerOne)($t8) /* 07B10C 8007A50C 960A00A6 */ lhu $t2, 0xa6($s0) /* 07B110 8007A510 000F7880 */ sll $t7, $t7, 2 /* 07B114 8007A514 01E57823 */ subu $t7, $t7, $a1 @@ -30,7 +30,7 @@ glabel func_8007A4D4 /* 07B144 8007A544 002A0821 */ addu $at, $at, $t2 /* 07B148 8007A548 8C2AECE8 */ lw $t2, %lo(jpt_800EECE8)($at) /* 07B14C 8007A54C 01400008 */ jr $t2 -/* 07B150 8007A550 00000000 */ nop +/* 07B150 8007A550 00000000 */ nop glabel L8007A554 /* 07B154 8007A554 02202025 */ move $a0, $s1 /* 07B158 8007A558 0C01E8FC */ jal func_8007A3F0 diff --git a/asm/non_matchings/code_80071F00/func_8007A88C.s b/asm/non_matchings/code_80071F00/func_8007A88C.s index 878da6d78..d88662aee 100644 --- a/asm/non_matchings/code_80071F00/func_8007A88C.s +++ b/asm/non_matchings/code_80071F00/func_8007A88C.s @@ -14,8 +14,8 @@ glabel func_8007A88C /* 07B4BC 8007A8BC 01194021 */ addu $t0, $t0, $t9 /* 07B4C0 8007A8C0 85085CBE */ lh $t0, %lo(D_80165CBE)($t0) # 0x5cbe($t0) /* 07B4C4 8007A8C4 000F7880 */ sll $t7, $t7, 2 -/* 07B4C8 8007A8C8 3C18800E */ lui $t8, %hi(D_800DC4DC) # $t8, 0x800e -/* 07B4CC 8007A8CC 8F18C4DC */ lw $t8, %lo(D_800DC4DC)($t8) +/* 07B4C8 8007A8C8 3C18800E */ lui $t8, %hi(gPlayerOne) # $t8, 0x800e +/* 07B4CC 8007A8CC 8F18C4DC */ lw $t8, %lo(gPlayerOne)($t8) /* 07B4D0 8007A8D0 01E47823 */ subu $t7, $t7, $a0 /* 07B4D4 8007A8D4 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 07B4D8 8007A8D8 000F78C0 */ sll $t7, $t7, 3 @@ -27,10 +27,10 @@ glabel func_8007A88C /* 07B4F0 8007A8F0 05430004 */ bgezl $t2, .L8007A904 /* 07B4F4 8007A8F4 8FBF0014 */ lw $ra, 0x14($sp) /* 07B4F8 8007A8F8 0C01E439 */ jal func_800790E4 -/* 07B4FC 8007A8FC 00000000 */ nop +/* 07B4FC 8007A8FC 00000000 */ nop .L8007A900: /* 07B500 8007A900 8FBF0014 */ lw $ra, 0x14($sp) .L8007A904: /* 07B504 8007A904 27BD0018 */ addiu $sp, $sp, 0x18 /* 07B508 8007A908 03E00008 */ jr $ra -/* 07B50C 8007A90C 00000000 */ nop +/* 07B50C 8007A90C 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_8007AC9C.s b/asm/non_matchings/code_80071F00/func_8007AC9C.s index d30a4d2d7..356052f05 100644 --- a/asm/non_matchings/code_80071F00/func_8007AC9C.s +++ b/asm/non_matchings/code_80071F00/func_8007AC9C.s @@ -18,8 +18,8 @@ glabel func_8007AC9C /* 07B8DC 8007ACDC 03288821 */ addu $s1, $t9, $t0 /* 07B8E0 8007ACE0 862900A4 */ lh $t1, 0xa4($s1) /* 07B8E4 8007ACE4 000E7080 */ sll $t6, $t6, 2 -/* 07B8E8 8007ACE8 3C0F800E */ lui $t7, %hi(D_800DC4DC) # $t7, 0x800e -/* 07B8EC 8007ACEC 8DEFC4DC */ lw $t7, %lo(D_800DC4DC)($t7) +/* 07B8E8 8007ACE8 3C0F800E */ lui $t7, %hi(gPlayerOne) # $t7, 0x800e +/* 07B8EC 8007ACEC 8DEFC4DC */ lw $t7, %lo(gPlayerOne)($t7) /* 07B8F0 8007ACF0 01C47023 */ subu $t6, $t6, $a0 /* 07B8F4 8007ACF4 000E70C0 */ sll $t6, $t6, 3 /* 07B8F8 8007ACF8 2401000F */ li $at, 15 diff --git a/asm/non_matchings/code_80071F00/func_8007B040.s b/asm/non_matchings/code_80071F00/func_8007B040.s index 2fbedbaeb..e1cab46b3 100644 --- a/asm/non_matchings/code_80071F00/func_8007B040.s +++ b/asm/non_matchings/code_80071F00/func_8007B040.s @@ -97,12 +97,12 @@ glabel func_8007B040 /* 07BDA0 8007B1A0 01993821 */ addu $a3, $t4, $t9 /* 07BDA4 8007B1A4 0303C023 */ subu $t8, $t8, $v1 /* 07BDA8 8007B1A8 0018C100 */ sll $t8, $t8, 4 -/* 07BDAC 8007B1AC 3C19800E */ lui $t9, %hi(D_800DC4DC) # $t9, 0x800e +/* 07BDAC 8007B1AC 3C19800E */ lui $t9, %hi(gPlayerOne) # $t9, 0x800e /* 07BDB0 8007B1B0 A0E300D1 */ sb $v1, 0xd1($a3) /* 07BDB4 8007B1B4 0303C023 */ subu $t8, $t8, $v1 /* 07BDB8 8007B1B8 A4E800A2 */ sh $t0, 0xa2($a3) /* 07BDBC 8007B1BC A0E800D2 */ sb $t0, 0xd2($a3) -/* 07BDC0 8007B1C0 8F39C4DC */ lw $t9, %lo(D_800DC4DC)($t9) +/* 07BDC0 8007B1C0 8F39C4DC */ lw $t9, %lo(gPlayerOne)($t9) /* 07BDC4 8007B1C4 3C068018 */ lui $a2, %hi(D_80183E88) # 0x8018 /* 07BDC8 8007B1C8 0018C080 */ sll $t8, $t8, 2 /* 07BDCC 8007B1CC 00037880 */ sll $t7, $v1, 2 diff --git a/asm/non_matchings/code_80071F00/func_8007B34C.s b/asm/non_matchings/code_80071F00/func_8007B34C.s index 52667bf2d..ad280e129 100644 --- a/asm/non_matchings/code_80071F00/func_8007B34C.s +++ b/asm/non_matchings/code_80071F00/func_8007B34C.s @@ -4,11 +4,11 @@ glabel func_8007B34C /* 07BF54 8007B354 0018C100 */ sll $t8, $t8, 4 /* 07BF58 8007B358 27BDFFB8 */ addiu $sp, $sp, -0x48 /* 07BF5C 8007B35C 0304C023 */ subu $t8, $t8, $a0 -/* 07BF60 8007B360 3C19800E */ lui $t9, %hi(D_800DC4DC) # $t9, 0x800e -/* 07BF64 8007B364 8F39C4DC */ lw $t9, %lo(D_800DC4DC)($t9) +/* 07BF60 8007B360 3C19800E */ lui $t9, %hi(gPlayerOne) # $t9, 0x800e +/* 07BF64 8007B364 8F39C4DC */ lw $t9, %lo(gPlayerOne)($t9) /* 07BF68 8007B368 0018C080 */ sll $t8, $t8, 2 -/* 07BF6C 8007B36C 3C0A800E */ lui $t2, %hi(D_800DC4BC) # $t2, 0x800e -/* 07BF70 8007B370 8D4AC4BC */ lw $t2, %lo(D_800DC4BC)($t2) +/* 07BF6C 8007B36C 3C0A800E */ lui $t2, %hi(gControllerOne) # $t2, 0x800e +/* 07BF70 8007B370 8D4AC4BC */ lw $t2, %lo(gControllerOne)($t2) /* 07BF74 8007B374 0304C023 */ subu $t8, $t8, $a0 /* 07BF78 8007B378 0018C0C0 */ sll $t8, $t8, 3 /* 07BF7C 8007B37C 00044900 */ sll $t1, $a0, 4 @@ -52,7 +52,7 @@ glabel func_8007B34C /* 07C00C 8007B40C 002E0821 */ addu $at, $at, $t6 /* 07C010 8007B410 8C2EED3C */ lw $t6, %lo(jpt_800EED3C)($at) # -0x12c4($at) /* 07C014 8007B414 01C00008 */ jr $t6 -/* 07C018 8007B418 00000000 */ nop +/* 07C018 8007B418 00000000 */ nop glabel L8007B41C /* 07C01C 8007B41C 02002025 */ move $a0, $s0 /* 07C020 8007B420 0C01EC95 */ jal func_8007B254 @@ -578,4 +578,4 @@ glabel L8007B998 /* 07C78C 8007BB8C 8FB00020 */ lw $s0, 0x20($sp) /* 07C790 8007BB90 27BD0048 */ addiu $sp, $sp, 0x48 /* 07C794 8007BB94 03E00008 */ jr $ra -/* 07C798 8007BB98 00000000 */ nop +/* 07C798 8007BB98 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_8007CC00.s b/asm/non_matchings/code_80071F00/func_8007CC00.s index 4b2d857a5..5c2808882 100644 --- a/asm/non_matchings/code_80071F00/func_8007CC00.s +++ b/asm/non_matchings/code_80071F00/func_8007CC00.s @@ -15,12 +15,12 @@ glabel func_8007CC00 /* 07D834 8007CC34 F7B40018 */ sdc1 $f20, 0x18($sp) /* 07D838 8007CC38 3C01401A */ li $at, 0x401A0000 # 2.406250 /* 07D83C 8007CC3C 3C148019 */ lui $s4, %hi(D_8018BFA8) # $s4, 0x8019 -/* 07D840 8007CC40 3C1E800E */ lui $fp, %hi(D_800DC4DC) # $fp, 0x800e +/* 07D840 8007CC40 3C1E800E */ lui $fp, %hi(gPlayerOne) # $fp, 0x800e /* 07D844 8007CC44 3C158016 */ lui $s5, %hi(D_80165C18) # $s5, 0x8016 /* 07D848 8007CC48 4481B800 */ mtc1 $at, $f23 /* 07D84C 8007CC4C 4480B000 */ mtc1 $zero, $f22 /* 07D850 8007CC50 26B55C18 */ addiu $s5, %lo(D_80165C18) # addiu $s5, $s5, 0x5c18 -/* 07D854 8007CC54 27DEC4DC */ addiu $fp, %lo(D_800DC4DC) # addiu $fp, $fp, -0x3b24 +/* 07D854 8007CC54 27DEC4DC */ addiu $fp, %lo(gPlayerOne) # addiu $fp, $fp, -0x3b24 /* 07D858 8007CC58 2694BFA8 */ addiu $s4, %lo(D_8018BFA8) # addiu $s4, $s4, -0x4058 /* 07D85C 8007CC5C 24170DD8 */ li $s7, 3544 /* 07D860 8007CC60 241600E0 */ li $s6, 224 @@ -31,7 +31,7 @@ glabel func_8007CC00 /* 07D870 8007CC70 02AE8021 */ addu $s0, $s5, $t6 /* 07D874 8007CC74 860F00A6 */ lh $t7, 0xa6($s0) /* 07D878 8007CC78 11E00051 */ beqz $t7, .L8007CDC0 -/* 07D87C 8007CC7C 00000000 */ nop +/* 07D87C 8007CC7C 00000000 */ nop /* 07D880 8007CC80 0C01F1A1 */ jal func_8007C684 /* 07D884 8007CC84 02402025 */ move $a0, $s2 /* 07D888 8007CC88 0C022DE3 */ jal func_8008B78C diff --git a/asm/non_matchings/code_80071F00/func_8007E59C.s b/asm/non_matchings/code_80071F00/func_8007E59C.s index 85d210bb2..cf6dd289f 100644 --- a/asm/non_matchings/code_80071F00/func_8007E59C.s +++ b/asm/non_matchings/code_80071F00/func_8007E59C.s @@ -8,12 +8,12 @@ glabel func_8007E59C /* 07F1B4 8007E5B4 AFB00018 */ sw $s0, 0x18($sp) /* 07F1B8 8007E5B8 AFB30024 */ sw $s3, 0x24($sp) /* 07F1BC 8007E5BC AFB20020 */ sw $s2, 0x20($sp) -/* 07F1C0 8007E5C0 3C10800E */ lui $s0, %hi(D_800DC4DC) # $s0, 0x800e +/* 07F1C0 8007E5C0 3C10800E */ lui $s0, %hi(gPlayerOne) # $s0, 0x800e /* 07F1C4 8007E5C4 3C11800E */ lui $s1, %hi(camera1) # $s1, 0x800e /* 07F1C8 8007E5C8 00809825 */ move $s3, $a0 /* 07F1CC 8007E5CC AFBF002C */ sw $ra, 0x2c($sp) /* 07F1D0 8007E5D0 00001825 */ move $v1, $zero -/* 07F1D4 8007E5D4 8E10C4DC */ lw $s0, %lo(D_800DC4DC)($s0) +/* 07F1D4 8007E5D4 8E10C4DC */ lw $s0, %lo(gPlayerOne)($s0) /* 07F1D8 8007E5D8 8E31DB40 */ lw $s1, %lo(camera1)($s1) /* 07F1DC 8007E5DC 19C0000E */ blez $t6, .L8007E618 /* 07F1E0 8007E5E0 00009025 */ move $s2, $zero diff --git a/asm/non_matchings/code_80071F00/func_8007F6C4.s b/asm/non_matchings/code_80071F00/func_8007F6C4.s index f667e7131..7bea3624d 100644 --- a/asm/non_matchings/code_80071F00/func_8007F6C4.s +++ b/asm/non_matchings/code_80071F00/func_8007F6C4.s @@ -3,8 +3,8 @@ glabel func_8007F6C4 /* 0802C8 8007F6C8 01E57823 */ subu $t7, $t7, $a1 /* 0802CC 8007F6CC 000F7900 */ sll $t7, $t7, 4 /* 0802D0 8007F6D0 01E57823 */ subu $t7, $t7, $a1 -/* 0802D4 8007F6D4 3C18800E */ lui $t8, %hi(D_800DC4DC) # $t8, 0x800e -/* 0802D8 8007F6D8 8F18C4DC */ lw $t8, %lo(D_800DC4DC)($t8) +/* 0802D4 8007F6D4 3C18800E */ lui $t8, %hi(gPlayerOne) # $t8, 0x800e +/* 0802D8 8007F6D8 8F18C4DC */ lw $t8, %lo(gPlayerOne)($t8) /* 0802DC 8007F6DC 000F7880 */ sll $t7, $t7, 2 /* 0802E0 8007F6E0 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 0802E4 8007F6E4 01E57823 */ subu $t7, $t7, $a1 diff --git a/asm/non_matchings/code_80071F00/func_8007F8D8.s b/asm/non_matchings/code_80071F00/func_8007F8D8.s index 1c8f73d8d..71163c1a7 100644 --- a/asm/non_matchings/code_80071F00/func_8007F8D8.s +++ b/asm/non_matchings/code_80071F00/func_8007F8D8.s @@ -5,14 +5,14 @@ glabel func_8007F8D8 /* 0804E4 8007F8E4 AFB30020 */ sw $s3, 0x20($sp) /* 0804E8 8007F8E8 AFB40024 */ sw $s4, 0x24($sp) /* 0804EC 8007F8EC AFB10018 */ sw $s1, 0x18($sp) -/* 0804F0 8007F8F0 3C13800E */ lui $s3, %hi(D_800DC4DC) # $s3, 0x800e +/* 0804F0 8007F8F0 3C13800E */ lui $s3, %hi(gPlayerOne) # $s3, 0x800e /* 0804F4 8007F8F4 AFBF0034 */ sw $ra, 0x34($sp) /* 0804F8 8007F8F8 AFB70030 */ sw $s7, 0x30($sp) /* 0804FC 8007F8FC AFB6002C */ sw $s6, 0x2c($sp) /* 080500 8007F900 AFB50028 */ sw $s5, 0x28($sp) /* 080504 8007F904 AFB2001C */ sw $s2, 0x1c($sp) /* 080508 8007F908 AFB00014 */ sw $s0, 0x14($sp) -/* 08050C 8007F90C 8E73C4DC */ lw $s3, %lo(D_800DC4DC)($s3) +/* 08050C 8007F90C 8E73C4DC */ lw $s3, %lo(gPlayerOne)($s3) /* 080510 8007F910 24140001 */ li $s4, 1 /* 080514 8007F914 18600022 */ blez $v1, .L8007F9A0 /* 080518 8007F918 00008825 */ move $s1, $zero @@ -34,19 +34,19 @@ glabel func_8007F8D8 /* 080554 8007F954 00008025 */ move $s0, $zero /* 080558 8007F958 2B010002 */ slti $at, $t8, 2 /* 08055C 8007F95C 14200006 */ bnez $at, .L8007F978 -/* 080560 8007F960 00000000 */ nop +/* 080560 8007F960 00000000 */ nop /* 080564 8007F964 0C01C8D5 */ jal func_80072354 /* 080568 8007F968 24050008 */ li $a1, 8 /* 08056C 8007F96C 10400002 */ beqz $v0, .L8007F978 -/* 080570 8007F970 00000000 */ nop +/* 080570 8007F970 00000000 */ nop /* 080574 8007F974 24100001 */ li $s0, 1 .L8007F978: /* 080578 8007F978 02900019 */ multu $s4, $s0 /* 08057C 8007F97C 3C038016 */ lui $v1, %hi(D_80165750) # $v1, 0x8016 /* 080580 8007F980 84635750 */ lh $v1, %lo(D_80165750)($v1) /* 080584 8007F984 0000A012 */ mflo $s4 -/* 080588 8007F988 00000000 */ nop -/* 08058C 8007F98C 00000000 */ nop +/* 080588 8007F988 00000000 */ nop +/* 08058C 8007F98C 00000000 */ nop /* 080590 8007F990 26310001 */ addiu $s1, $s1, 1 .L8007F994: /* 080594 8007F994 0223082A */ slt $at, $s1, $v1 diff --git a/asm/non_matchings/code_80071F00/func_8007FB48.s b/asm/non_matchings/code_80071F00/func_8007FB48.s index c83567415..91ca41cc4 100644 --- a/asm/non_matchings/code_80071F00/func_8007FB48.s +++ b/asm/non_matchings/code_80071F00/func_8007FB48.s @@ -7,13 +7,13 @@ glabel func_8007FB48 /* 08075C 8007FB5C 01F81821 */ addu $v1, $t7, $t8 /* 080760 8007FB60 807900D1 */ lb $t9, 0xd1($v1) /* 080764 8007FB64 946A00AE */ lhu $t2, 0xae($v1) -/* 080768 8007FB68 3C09800E */ lui $t1, %hi(D_800DC4DC) # $t1, 0x800e +/* 080768 8007FB68 3C09800E */ lui $t1, %hi(gPlayerOne) # $t1, 0x800e /* 08076C 8007FB6C 001940C0 */ sll $t0, $t9, 3 /* 080770 8007FB70 01194023 */ subu $t0, $t0, $t9 /* 080774 8007FB74 00084100 */ sll $t0, $t0, 4 /* 080778 8007FB78 01194023 */ subu $t0, $t0, $t9 /* 08077C 8007FB7C 00084080 */ sll $t0, $t0, 2 -/* 080780 8007FB80 8D29C4DC */ lw $t1, %lo(D_800DC4DC)($t1) +/* 080780 8007FB80 8D29C4DC */ lw $t1, %lo(gPlayerOne)($t1) /* 080784 8007FB84 01194023 */ subu $t0, $t0, $t9 /* 080788 8007FB88 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 08078C 8007FB8C 000840C0 */ sll $t0, $t0, 3 @@ -27,7 +27,7 @@ glabel func_8007FB48 /* 0807AC 8007FBAC 002A0821 */ addu $at, $at, $t2 /* 0807B0 8007FBB0 8C2AF060 */ lw $t2, %lo(jpt_800EF060)($at) # -0xfa0($at) /* 0807B4 8007FBB4 01400008 */ jr $t2 -/* 0807B8 8007FBB8 00000000 */ nop +/* 0807B8 8007FBB8 00000000 */ nop glabel L8007FBBC /* 0807BC 8007FBBC 44800000 */ mtc1 $zero, $f0 /* 0807C0 8007FBC0 240B00A0 */ li $t3, 160 @@ -68,7 +68,7 @@ glabel L8007FBE4 /* 080848 8007FC48 E4660040 */ swc1 $f6, 0x40($v1) /* 08084C 8007FC4C 44814000 */ mtc1 $at, $f8 .L8007FC50: -/* 080850 8007FC50 00000000 */ nop +/* 080850 8007FC50 00000000 */ nop /* 080854 8007FC54 E4680040 */ swc1 $f8, 0x40($v1) .L8007FC58: /* 080858 8007FC58 C46A0040 */ lwc1 $f10, 0x40($v1) @@ -77,7 +77,7 @@ glabel L8007FBE4 /* 080864 8007FC64 46005421 */ cvt.d.s $f16, $f10 /* 080868 8007FC68 3C01C044 */ li $at, 0xC0440000 # -3.062500 /* 08086C 8007FC6C 4630903E */ c.le.d $f18, $f16 -/* 080870 8007FC70 00000000 */ nop +/* 080870 8007FC70 00000000 */ nop /* 080874 8007FC74 4502000F */ bc1fl .L8007FCB4 /* 080878 8007FC78 C4720030 */ lwc1 $f18, 0x30($v1) /* 08087C 8007FC7C C4640030 */ lwc1 $f4, 0x30($v1) @@ -87,7 +87,7 @@ glabel L8007FBE4 /* 08088C 8007FC8C 460021A1 */ cvt.d.s $f6, $f4 /* 080890 8007FC90 3C01BFC0 */ li $at, 0xBFC00000 # -1.500000 /* 080894 8007FC94 4626403E */ c.le.d $f8, $f6 -/* 080898 8007FC98 00000000 */ nop +/* 080898 8007FC98 00000000 */ nop /* 08089C 8007FC9C 45020011 */ bc1fl .L8007FCE4 /* 0808A0 8007FCA0 8FA40028 */ lw $a0, 0x28($sp) /* 0808A4 8007FCA4 44815000 */ mtc1 $at, $f10 @@ -100,11 +100,11 @@ glabel L8007FBE4 /* 0808BC 8007FCBC 46009121 */ cvt.d.s $f4, $f18 /* 0808C0 8007FCC0 3C013FC0 */ li $at, 0x3FC00000 # 1.500000 /* 0808C4 8007FCC4 4630203E */ c.le.d $f4, $f16 -/* 0808C8 8007FCC8 00000000 */ nop +/* 0808C8 8007FCC8 00000000 */ nop /* 0808CC 8007FCCC 45020005 */ bc1fl .L8007FCE4 /* 0808D0 8007FCD0 8FA40028 */ lw $a0, 0x28($sp) /* 0808D4 8007FCD4 44813000 */ mtc1 $at, $f6 -/* 0808D8 8007FCD8 00000000 */ nop +/* 0808D8 8007FCD8 00000000 */ nop /* 0808DC 8007FCDC E4660040 */ swc1 $f6, 0x40($v1) .L8007FCE0: /* 0808E0 8007FCE0 8FA40028 */ lw $a0, 0x28($sp) @@ -115,7 +115,7 @@ glabel L8007FBE4 /* 0808F0 8007FCF0 846400B0 */ lh $a0, 0xb0($v1) /* 0808F4 8007FCF4 28810065 */ slti $at, $a0, 0x65 /* 0808F8 8007FCF8 10200012 */ beqz $at, .L8007FD44 -/* 0808FC 8007FCFC 00000000 */ nop +/* 0808FC 8007FCFC 00000000 */ nop /* 080900 8007FD00 946500C0 */ lhu $a1, 0xc0($v1) /* 080904 8007FD04 34018000 */ li $at, 32768 /* 080908 8007FD08 946400B4 */ lhu $a0, 0xb4($v1) @@ -130,7 +130,7 @@ glabel L8007FBE4 /* 08092C 8007FD2C 846400B0 */ lh $a0, 0xb0($v1) /* 080930 8007FD30 A46200B4 */ sh $v0, 0xb4($v1) /* 080934 8007FD34 14810003 */ bne $a0, $at, .L8007FD44 -/* 080938 8007FD38 00000000 */ nop +/* 080938 8007FD38 00000000 */ nop /* 08093C 8007FD3C A06F00D2 */ sb $t7, 0xd2($v1) /* 080940 8007FD40 846400B0 */ lh $a0, 0xb0($v1) .L8007FD44: @@ -145,7 +145,7 @@ glabel L8007FBE4 /* 080964 8007FD64 D428F078 */ ldc1 $f8, %lo(D_800EF078)($at) /* 080968 8007FD68 460054A1 */ cvt.d.s $f18, $f10 /* 08096C 8007FD6C 4628903E */ c.le.d $f18, $f8 -/* 080970 8007FD70 00000000 */ nop +/* 080970 8007FD70 00000000 */ nop /* 080974 8007FD74 4502000D */ bc1fl .L8007FDAC /* 080978 8007FD78 A47900B0 */ sh $t9, 0xb0($v1) /* 08097C 8007FD7C 1000000A */ b .L8007FDA8 @@ -156,7 +156,7 @@ glabel L8007FBE4 /* 08098C 8007FD8C D426F080 */ ldc1 $f6, %lo(D_800EF080)($at) /* 080990 8007FD90 46008121 */ cvt.d.s $f4, $f16 /* 080994 8007FD94 4624303E */ c.le.d $f6, $f4 -/* 080998 8007FD98 00000000 */ nop +/* 080998 8007FD98 00000000 */ nop /* 08099C 8007FD9C 45020003 */ bc1fl .L8007FDAC /* 0809A0 8007FDA0 A47900B0 */ sh $t9, 0xb0($v1) /* 0809A4 8007FDA4 24020001 */ li $v0, 1 @@ -198,7 +198,7 @@ glabel L8007FDE0 /* 080A24 8007FE24 46124400 */ add.s $f16, $f8, $f18 /* 080A28 8007FE28 46008121 */ cvt.d.s $f4, $f16 /* 080A2C 8007FE2C 46245032 */ c.eq.d $f10, $f4 -/* 080A30 8007FE30 00000000 */ nop +/* 080A30 8007FE30 00000000 */ nop /* 080A34 8007FE34 45020018 */ bc1fl .L8007FE98 /* 080A38 8007FE38 8FBF0014 */ lw $ra, 0x14($sp) /* 080A3C 8007FE3C 0C021BF5 */ jal func_80086FD4 @@ -230,4 +230,4 @@ glabel L8007FE94 .L8007FE98: /* 080A98 8007FE98 27BD0028 */ addiu $sp, $sp, 0x28 /* 080A9C 8007FE9C 03E00008 */ jr $ra -/* 080AA0 8007FEA0 00000000 */ nop +/* 080AA0 8007FEA0 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_80080A4C.s b/asm/non_matchings/code_80071F00/func_80080A4C.s index 79f90c2e0..9822a8ff5 100644 --- a/asm/non_matchings/code_80071F00/func_80080A4C.s +++ b/asm/non_matchings/code_80071F00/func_80080A4C.s @@ -12,8 +12,8 @@ glabel func_80080A4C /* 081674 80080A74 8D29C530 */ lw $t1, %lo(gScreenModeSelection)($t1) /* 081678 80080A78 01C57023 */ subu $t6, $t6, $a1 /* 08167C 80080A7C 0019C880 */ sll $t9, $t9, 2 -/* 081680 80080A80 3C08800E */ lui $t0, %hi(D_800DC4DC) # $t0, 0x800e -/* 081684 80080A84 8D08C4DC */ lw $t0, %lo(D_800DC4DC)($t0) +/* 081680 80080A80 3C08800E */ lui $t0, %hi(gPlayerOne) # $t0, 0x800e +/* 081684 80080A84 8D08C4DC */ lw $t0, %lo(gPlayerOne)($t0) /* 081688 80080A88 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 08168C 80080A8C 000E70C0 */ sll $t6, $t6, 3 /* 081690 80080A90 0325C823 */ subu $t9, $t9, $a1 @@ -55,4 +55,4 @@ glabel func_80080A4C .L80080B1C: /* 08171C 80080B1C 27BD0020 */ addiu $sp, $sp, 0x20 /* 081720 80080B20 03E00008 */ jr $ra -/* 081724 80080B24 00000000 */ nop +/* 081724 80080B24 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_80080B28.s b/asm/non_matchings/code_80071F00/func_80080B28.s index bb1371122..dda471faa 100644 --- a/asm/non_matchings/code_80071F00/func_80080B28.s +++ b/asm/non_matchings/code_80071F00/func_80080B28.s @@ -5,8 +5,8 @@ glabel func_80080B28 /* 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(D_800DC4DC) # $t8, 0x800e -/* 081744 80080B44 8F18C4DC */ lw $t8, %lo(D_800DC4DC)($t8) +/* 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) @@ -23,7 +23,7 @@ glabel func_80080B28 /* 08177C 80080B7C 02202025 */ move $a0, $s1 /* 081780 80080B80 33280100 */ andi $t0, $t9, 0x100 /* 081784 80080B84 15000090 */ bnez $t0, .L80080DC8 -/* 081788 80080B88 00000000 */ nop +/* 081788 80080B88 00000000 */ nop /* 08178C 80080B8C 0C0223D5 */ jal func_80088F54 /* 081790 80080B90 02002825 */ move $a1, $s0 /* 081794 80080B94 3C014022 */ li $at, 0x40220000 # 2.531250 @@ -32,15 +32,15 @@ glabel func_80080B28 /* 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 +/* 0817AC 80080BAC 00000000 */ nop /* 0817B0 80080BB0 4500004E */ bc1f .L80080CEC -/* 0817B4 80080BB4 00000000 */ nop +/* 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 +/* 0817CC 80080BCC 00000000 */ nop /* 0817D0 80080BD0 0C022346 */ jal func_80088D18 /* 0817D4 80080BD4 E7A2002C */ swc1 $f2, 0x2c($sp) /* 0817D8 80080BD8 10400044 */ beqz $v0, .L80080CEC @@ -83,7 +83,7 @@ glabel func_80080B28 /* 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 +/* 081874 80080C74 00000000 */ nop .L80080C78: /* 081878 80080C78 0C032418 */ jal func_800C9060 /* 08187C 80080C7C 34A5A24A */ ori $a1, $a1, 0xa24a @@ -121,7 +121,7 @@ glabel func_80080B28 /* 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 +/* 081900 80080D00 00000000 */ nop /* 081904 80080D04 45020033 */ bc1fl .L80080DD4 /* 081908 80080D08 8FBF0024 */ lw $ra, 0x24($sp) /* 08190C 80080D0C 0C01C8C8 */ jal func_80072320 @@ -142,7 +142,7 @@ glabel func_80080B28 /* 081948 80080D48 46205420 */ cvt.s.d $f16, $f10 /* 08194C 80080D4C 44068000 */ mfc1 $a2, $f16 /* 081950 80080D50 0C022296 */ jal func_80088A58 -/* 081954 80080D54 00000000 */ nop +/* 081954 80080D54 00000000 */ nop /* 081958 80080D58 5040001E */ beql $v0, $zero, .L80080DD4 /* 08195C 80080D5C 8FBF0024 */ lw $ra, 0x24($sp) /* 081960 80080D60 96020000 */ lhu $v0, ($s0) @@ -156,7 +156,7 @@ glabel func_80080B28 /* 081980 80080D80 50400004 */ beql $v0, $zero, .L80080D94 /* 081984 80080D84 02202025 */ move $a0, $s1 /* 081988 80080D88 0C01C860 */ jal func_80072180 -/* 08198C 80080D8C 00000000 */ nop +/* 08198C 80080D8C 00000000 */ nop /* 081990 80080D90 02202025 */ move $a0, $s1 .L80080D94: /* 081994 80080D94 0C01C8A9 */ jal func_800722A4 diff --git a/asm/non_matchings/code_80071F00/func_80080DE4.s b/asm/non_matchings/code_80071F00/func_80080DE4.s index 10a6027cb..b586c83a2 100644 --- a/asm/non_matchings/code_80071F00/func_80080DE4.s +++ b/asm/non_matchings/code_80071F00/func_80080DE4.s @@ -1,6 +1,6 @@ glabel func_80080DE4 -/* 0819E4 80080DE4 3C02800E */ lui $v0, %hi(D_800DC4DC) # $v0, 0x800e -/* 0819E8 80080DE8 8C42C4DC */ lw $v0, %lo(D_800DC4DC)($v0) +/* 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 @@ -36,7 +36,7 @@ glabel func_80080DE4 .L80080E60: /* 081A60 80080E60 24420DD8 */ addiu $v0, $v0, 0xdd8 /* 081A64 80080E64 148D0005 */ bne $a0, $t5, .L80080E7C -/* 081A68 80080E68 00000000 */ nop +/* 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 @@ -45,4 +45,4 @@ glabel func_80080DE4 /* 081A7C 80080E7C 1467FFDF */ bne $v1, $a3, .L80080DFC /* 081A80 80080E80 24420DD8 */ addiu $v0, $v0, 0xdd8 /* 081A84 80080E84 03E00008 */ jr $ra -/* 081A88 80080E88 00000000 */ nop +/* 081A88 80080E88 00000000 */ nop diff --git a/asm/non_matchings/code_80071F00/func_80081210.s b/asm/non_matchings/code_80071F00/func_80081210.s index d9a34c28e..e2465dc35 100644 --- a/asm/non_matchings/code_80071F00/func_80081210.s +++ b/asm/non_matchings/code_80071F00/func_80081210.s @@ -41,12 +41,12 @@ glabel func_80081210 /* 081EA8 800812A8 0000A025 */ move $s4, $zero .L800812AC: /* 081EAC 800812AC 0C01FE36 */ jal func_8007F8D8 -/* 081EB0 800812B0 00000000 */ nop +/* 081EB0 800812B0 00000000 */ nop /* 081EB4 800812B4 87C20000 */ lh $v0, ($fp) /* 081EB8 800812B8 3C128018 */ lui $s2, %hi(D_80183EA0) # $s2, 0x8018 /* 081EBC 800812BC 26523EA0 */ addiu $s2, %lo(D_80183EA0) # addiu $s2, $s2, 0x3ea0 /* 081EC0 800812C0 18400031 */ blez $v0, .L80081388 -/* 081EC4 800812C4 00000000 */ nop +/* 081EC4 800812C4 00000000 */ nop .L800812C8: /* 081EC8 800812C8 8E500000 */ lw $s0, ($s2) /* 081ECC 800812CC 3C0B8016 */ lui $t3, %hi(D_80165C18) # $t3, 0x8016 @@ -67,7 +67,7 @@ glabel func_80081210 /* 081F08 80081308 002E0821 */ addu $at, $at, $t6 /* 081F0C 8008130C 8C2EF0CC */ lw $t6, %lo(jpt_800EF0CC)($at) /* 081F10 80081310 01C00008 */ jr $t6 -/* 081F14 80081314 00000000 */ nop +/* 081F14 80081314 00000000 */ nop glabel L80081318 /* 081F18 80081318 0C01FB5B */ jal func_8007ED6C /* 081F1C 8008131C 02002025 */ move $a0, $s0 @@ -105,8 +105,8 @@ glabel L80081368 /* 081F80 80081380 26520004 */ addiu $s2, $s2, 4 /* 081F84 80081384 0000A025 */ move $s4, $zero .L80081388: -/* 081F88 80081388 3C13800E */ lui $s3, %hi(D_800DC4DC) # $s3, 0x800e -/* 081F8C 8008138C 8E73C4DC */ lw $s3, %lo(D_800DC4DC)($s3) +/* 081F88 80081388 3C13800E */ lui $s3, %hi(gPlayerOne) # $s3, 0x800e +/* 081F8C 8008138C 8E73C4DC */ lw $s3, %lo(gPlayerOne)($s3) /* 081F90 80081390 3C170001 */ lui $s7, 1 /* 081F94 80081394 3C160002 */ lui $s6, 2 /* 081F98 80081398 3C158000 */ lui $s5, 0x8000 diff --git a/asm/non_matchings/code_80071F00/func_80081D34.s b/asm/non_matchings/code_80071F00/func_80081D34.s index 4ffee6c07..bdf80ebcd 100644 --- a/asm/non_matchings/code_80071F00/func_80081D34.s +++ b/asm/non_matchings/code_80071F00/func_80081D34.s @@ -7,7 +7,7 @@ glabel func_80081D34 /* 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(D_800DC4DC) # $s1, 0x800e +/* 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) @@ -22,7 +22,7 @@ glabel func_80081D34 /* 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(D_800DC4DC)($s1) +/* 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 @@ -51,16 +51,16 @@ glabel func_80081D34 /* 0829F4 80081DF4 0C01C88F */ jal func_8007223C /* 0829F8 80081DF8 24050200 */ li $a1, 512 /* 0829FC 80081DFC 10400045 */ beqz $v0, .L80081F14 -/* 082A00 80081E00 00000000 */ nop +/* 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 +/* 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 +/* 082A24 80081E24 00000000 */ nop /* 082A28 80081E28 96220000 */ lhu $v0, ($s1) /* 082A2C 80081E2C 30598000 */ andi $t9, $v0, 0x8000 /* 082A30 80081E30 13200038 */ beqz $t9, .L80081F14 @@ -79,7 +79,7 @@ glabel func_80081D34 /* 082A64 80081E64 50400004 */ beql $v0, $zero, .L80081E78 /* 082A68 80081E68 8E2B00BC */ lw $t3, 0xbc($s1) /* 082A6C 80081E6C 0C01C860 */ jal func_80072180 -/* 082A70 80081E70 00000000 */ nop +/* 082A70 80081E70 00000000 */ nop /* 082A74 80081E74 8E2B00BC */ lw $t3, 0xbc($s1) .L80081E78: /* 082A78 80081E78 324400FF */ andi $a0, $s2, 0xff @@ -118,11 +118,11 @@ glabel func_80081D34 /* 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 +/* 082AFC 80081EFC 00000000 */ nop /* 082B00 80081F00 45000004 */ bc1f .L80081F14 -/* 082B04 80081F04 00000000 */ nop +/* 082B04 80081F04 00000000 */ nop /* 082B08 80081F08 44813000 */ mtc1 $at, $f6 -/* 082B0C 80081F0C 00000000 */ nop +/* 082B0C 80081F0C 00000000 */ nop /* 082B10 80081F10 E606003C */ swc1 $f6, 0x3c($s0) .L80081F14: /* 082B14 80081F14 3C188019 */ lui $t8, %hi(D_8018D158) # $t8, 0x8019 @@ -156,7 +156,7 @@ glabel func_80081D34 /* 082B80 80081F80 44060000 */ mfc1 $a2, $f0 /* 082B84 80081F84 44070000 */ mfc1 $a3, $f0 /* 082B88 80081F88 0C022E03 */ jal func_8008B80C -/* 082B8C 80081F8C 00000000 */ nop +/* 082B8C 80081F8C 00000000 */ nop /* 082B90 80081F90 02602025 */ move $a0, $s3 /* 082B94 80081F94 24050002 */ li $a1, 2 /* 082B98 80081F98 0C021BAB */ jal func_80086EAC diff --git a/asm/non_matchings/code_80071F00/func_80083FD0.s b/asm/non_matchings/code_80071F00/func_80083FD0.s index 5465d2d26..fa84258be 100644 --- a/asm/non_matchings/code_80071F00/func_80083FD0.s +++ b/asm/non_matchings/code_80071F00/func_80083FD0.s @@ -3,8 +3,8 @@ glabel func_80083FD0 /* 084BD4 80083FD4 01C67023 */ subu $t6, $t6, $a2 /* 084BD8 80083FD8 000E7100 */ sll $t6, $t6, 4 /* 084BDC 80083FDC 01C67023 */ subu $t6, $t6, $a2 -/* 084BE0 80083FE0 3C0F800E */ lui $t7, %hi(D_800DC4DC) # $t7, 0x800e -/* 084BE4 80083FE4 8DEFC4DC */ lw $t7, %lo(D_800DC4DC)($t7) +/* 084BE0 80083FE0 3C0F800E */ lui $t7, %hi(gPlayerOne) # $t7, 0x800e +/* 084BE4 80083FE4 8DEFC4DC */ lw $t7, %lo(gPlayerOne)($t7) /* 084BE8 80083FE8 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 084BEC 80083FEC 000E7080 */ sll $t6, $t6, 2 /* 084BF0 80083FF0 0004C8C0 */ sll $t9, $a0, 3 @@ -34,7 +34,7 @@ glabel func_80083FD0 /* 084C50 80084050 468021A0 */ cvt.s.w $f6, $f4 /* 084C54 80084054 3C014F80 */ li $at, 0x4F800000 # 4294967296.000000 /* 084C58 80084058 44814000 */ mtc1 $at, $f8 -/* 084C5C 8008405C 00000000 */ nop +/* 084C5C 8008405C 00000000 */ nop /* 084C60 80084060 46083180 */ add.s $f6, $f6, $f8 .L80084064: /* 084C64 80084064 3C01800F */ lui $at, %hi(D_800EF2A8) @@ -53,7 +53,7 @@ glabel func_80083FD0 /* 084C98 80084098 04410004 */ bgez $v0, .L800840AC /* 084C9C 8008409C 46805420 */ cvt.s.w $f16, $f10 /* 084CA0 800840A0 44819000 */ mtc1 $at, $f18 -/* 084CA4 800840A4 00000000 */ nop +/* 084CA4 800840A4 00000000 */ nop /* 084CA8 800840A8 46128400 */ add.s $f16, $f16, $f18 .L800840AC: /* 084CAC 800840AC 3C01800F */ lui $at, %hi(D_800EF2B8) @@ -73,7 +73,7 @@ glabel func_80083FD0 /* 084CE4 800840E4 04410004 */ bgez $v0, .L800840F8 /* 084CE8 800840E8 46802220 */ cvt.s.w $f8, $f4 /* 084CEC 800840EC 44813000 */ mtc1 $at, $f6 -/* 084CF0 800840F0 00000000 */ nop +/* 084CF0 800840F0 00000000 */ nop /* 084CF4 800840F4 46064200 */ add.s $f8, $f8, $f6 .L800840F8: /* 084CF8 800840F8 3C01800F */ lui $at, %hi(D_800EF2C0) @@ -94,14 +94,14 @@ glabel func_80083FD0 /* 084D34 80084134 00005812 */ mflo $t3 /* 084D38 80084138 A60B00C0 */ sh $t3, 0xc0($s0) /* 084D3C 8008413C 0C0ADF8D */ jal random_int -/* 084D40 80084140 00000000 */ nop +/* 084D40 80084140 00000000 */ nop /* 084D44 80084144 44825000 */ mtc1 $v0, $f10 /* 084D48 80084148 8FAC0020 */ lw $t4, 0x20($sp) /* 084D4C 8008414C 04410005 */ bgez $v0, .L80084164 /* 084D50 80084150 468054A0 */ cvt.s.w $f18, $f10 /* 084D54 80084154 3C014F80 */ li $at, 0x4F800000 # 4294967296.000000 /* 084D58 80084158 44818000 */ mtc1 $at, $f16 -/* 084D5C 8008415C 00000000 */ nop +/* 084D5C 8008415C 00000000 */ nop /* 084D60 80084160 46109480 */ add.s $f18, $f18, $f16 .L80084164: /* 084D64 80084164 C5840014 */ lwc1 $f4, 0x14($t4) @@ -125,7 +125,7 @@ glabel func_80083FD0 /* 084DAC 800841AC 468042A1 */ cvt.d.w $f10, $f8 /* 084DB0 800841B0 44818800 */ mtc1 $at, $f17 /* 084DB4 800841B4 44808000 */ mtc1 $zero, $f16 -/* 084DB8 800841B8 00000000 */ nop +/* 084DB8 800841B8 00000000 */ nop /* 084DBC 800841BC 46305280 */ add.d $f10, $f10, $f16 .L800841C0: /* 084DC0 800841C0 46265480 */ add.d $f18, $f10, $f6 @@ -139,7 +139,7 @@ glabel func_80083FD0 /* 084DE0 800841E0 46804420 */ cvt.s.w $f16, $f8 /* 084DE4 800841E4 3C014F80 */ li $at, 0x4F800000 # 4294967296.000000 /* 084DE8 800841E8 44815000 */ mtc1 $at, $f10 -/* 084DEC 800841EC 00000000 */ nop +/* 084DEC 800841EC 00000000 */ nop /* 084DF0 800841F0 460A8400 */ add.s $f16, $f16, $f10 .L800841F4: /* 084DF4 800841F4 C5C6001C */ lwc1 $f6, 0x1c($t6) diff --git a/asm/non_matchings/code_80086E70/func_80089020.s b/asm/non_matchings/code_80086E70/func_80089020.s index c6e61a074..cedfa736e 100644 --- a/asm/non_matchings/code_80086E70/func_80089020.s +++ b/asm/non_matchings/code_80086E70/func_80089020.s @@ -9,8 +9,8 @@ glabel func_80089020 /* 089C3C 8008903C 4600603E */ c.le.s $f12, $f0 /* 089C40 80089040 01C47023 */ subu $t6, $t6, $a0 /* 089C44 80089044 000E7080 */ sll $t6, $t6, 2 -/* 089C48 80089048 3C0F800E */ lui $t7, %hi(D_800DC4DC) # $t7, 0x800e -/* 089C4C 8008904C 8DEFC4DC */ lw $t7, %lo(D_800DC4DC)($t7) +/* 089C48 80089048 3C0F800E */ lui $t7, %hi(gPlayerOne) # $t7, 0x800e +/* 089C4C 8008904C 8DEFC4DC */ lw $t7, %lo(gPlayerOne)($t7) /* 089C50 80089050 01C47023 */ subu $t6, $t6, $a0 /* 089C54 80089054 000E70C0 */ sll $t6, $t6, 3 /* 089C58 80089058 00A03825 */ move $a3, $a1 @@ -36,7 +36,7 @@ glabel func_80089020 /* 089CA0 800890A0 46001021 */ cvt.d.s $f0, $f2 /* 089CA4 800890A4 3C014000 */ li $at, 0x40000000 # 2.000000 /* 089CA8 800890A8 4624003E */ c.le.d $f0, $f4 -/* 089CAC 800890AC 00000000 */ nop +/* 089CAC 800890AC 00000000 */ nop /* 089CB0 800890B0 45020005 */ bc1fl .L800890C8 /* 089CB4 800890B4 44813800 */ mtc1 $at, $f7 /* 089CB8 800890B8 3C01800F */ lui $at, %hi(D_800EF4A0) # 0x800F0000 # -0.000000 @@ -47,7 +47,7 @@ glabel func_80089020 /* 089CC8 800890C8 44803000 */ mtc1 $zero, $f6 /* 089CCC 800890CC 3C014010 */ li $at, 0x40100000 # 2.250000 /* 089CD0 800890D0 4626003E */ c.le.d $f0, $f6 -/* 089CD4 800890D4 00000000 */ nop +/* 089CD4 800890D4 00000000 */ nop /* 089CD8 800890D8 45020005 */ bc1fl .L800890F0 /* 089CDC 800890DC 44814800 */ mtc1 $at, $f9 /* 089CE0 800890E0 3C01800F */ lui $at, %hi(D_800EF4A4) # 0x800F0000 # -0.000000 @@ -58,7 +58,7 @@ glabel func_80089020 /* 089CF0 800890F0 44804000 */ mtc1 $zero, $f8 /* 089CF4 800890F4 3C013E80 */ li $at, 0x3E800000 # 0.250000 /* 089CF8 800890F8 4628003E */ c.le.d $f0, $f8 -/* 089CFC 800890FC 00000000 */ nop +/* 089CFC 800890FC 00000000 */ nop /* 089D00 80089100 45020005 */ bc1fl .L80089118 /* 089D04 80089104 44810000 */ mtc1 $at, $f0 /* 089D08 80089108 3C01800F */ lui $at, %hi(D_800EF4A8) # 0x800F0000 # -0.000000 @@ -75,7 +75,7 @@ glabel func_80089020 /* 089D2C 8008912C 46001021 */ cvt.d.s $f0, $f2 /* 089D30 80089130 3C014008 */ li $at, 0x40080000 # 2.125000 /* 089D34 80089134 462A003E */ c.le.d $f0, $f10 -/* 089D38 80089138 00000000 */ nop +/* 089D38 80089138 00000000 */ nop /* 089D3C 8008913C 45020005 */ bc1fl .L80089154 /* 089D40 80089140 44818800 */ mtc1 $at, $f17 /* 089D44 80089144 3C01800F */ lui $at, %hi(D_800EF4AC) # 0x800F0000 # -0.000000 @@ -86,7 +86,7 @@ glabel func_80089020 /* 089D54 80089154 44808000 */ mtc1 $zero, $f16 /* 089D58 80089158 3C014010 */ li $at, 0x40100000 # 2.250000 /* 089D5C 8008915C 4630003E */ c.le.d $f0, $f16 -/* 089D60 80089160 00000000 */ nop +/* 089D60 80089160 00000000 */ nop /* 089D64 80089164 45020005 */ bc1fl .L8008917C /* 089D68 80089168 44819800 */ mtc1 $at, $f19 /* 089D6C 8008916C 3C01800F */ lui $at, %hi(D_800EF4B0) # 0x800F0000 # -0.000000 @@ -97,7 +97,7 @@ glabel func_80089020 /* 089D7C 8008917C 44809000 */ mtc1 $zero, $f18 /* 089D80 80089180 3C013E80 */ li $at, 0x3E800000 # 0.250000 /* 089D84 80089184 4632003E */ c.le.d $f0, $f18 -/* 089D88 80089188 00000000 */ nop +/* 089D88 80089188 00000000 */ nop /* 089D8C 8008918C 45020005 */ bc1fl .L800891A4 /* 089D90 80089190 44810000 */ mtc1 $at, $f0 /* 089D94 80089194 3C01800F */ lui $at, %hi(D_800EF4B4) # 0x800F0000 # -0.000000 @@ -117,7 +117,7 @@ glabel func_80089020 /* 089DC4 800891C4 46001021 */ cvt.d.s $f0, $f2 /* 089DC8 800891C8 3C014000 */ li $at, 0x40000000 # 2.000000 /* 089DCC 800891CC 4624003E */ c.le.d $f0, $f4 -/* 089DD0 800891D0 00000000 */ nop +/* 089DD0 800891D0 00000000 */ nop /* 089DD4 800891D4 45020005 */ bc1fl .L800891EC /* 089DD8 800891D8 44813800 */ mtc1 $at, $f7 /* 089DDC 800891DC 3C01800F */ lui $at, %hi(D_800EF4B8) # 0x800F0000 # -0.000000 @@ -128,7 +128,7 @@ glabel func_80089020 /* 089DEC 800891EC 44803000 */ mtc1 $zero, $f6 /* 089DF0 800891F0 3C014010 */ li $at, 0x40100000 # 2.250000 /* 089DF4 800891F4 4626003E */ c.le.d $f0, $f6 -/* 089DF8 800891F8 00000000 */ nop +/* 089DF8 800891F8 00000000 */ nop /* 089DFC 800891FC 45020005 */ bc1fl .L80089214 /* 089E00 80089200 44814800 */ mtc1 $at, $f9 /* 089E04 80089204 3C01800F */ lui $at, %hi(D_800EF4BC) # 0x800F0000 # -0.000000 @@ -139,9 +139,9 @@ glabel func_80089020 /* 089E14 80089214 44804000 */ mtc1 $zero, $f8 /* 089E18 80089218 3C01800F */ lui $at, %hi(D_800EF4C4) /* 089E1C 8008921C 4628003E */ c.le.d $f0, $f8 -/* 089E20 80089220 00000000 */ nop +/* 089E20 80089220 00000000 */ nop /* 089E24 80089224 45000004 */ bc1f .L80089238 -/* 089E28 80089228 00000000 */ nop +/* 089E28 80089228 00000000 */ nop /* 089E2C 8008922C 3C01800F */ lui $at, %hi(D_800EF4C0) # $at, 0x800f /* 089E30 80089230 10000024 */ b .L800892C4 /* 089E34 80089234 C420F4C0 */ lwc1 $f0, %lo(D_800EF4C0)($at) @@ -155,7 +155,7 @@ glabel func_80089020 /* 089E4C 8008924C 46001021 */ cvt.d.s $f0, $f2 /* 089E50 80089250 3C014008 */ li $at, 0x40080000 # 2.125000 /* 089E54 80089254 462A003E */ c.le.d $f0, $f10 -/* 089E58 80089258 00000000 */ nop +/* 089E58 80089258 00000000 */ nop /* 089E5C 8008925C 45020005 */ bc1fl .L80089274 /* 089E60 80089260 44818800 */ mtc1 $at, $f17 /* 089E64 80089264 3C01800F */ lui $at, %hi(D_800EF4C8) # 0x800F0000 # -0.000000 @@ -166,7 +166,7 @@ glabel func_80089020 /* 089E74 80089274 44808000 */ mtc1 $zero, $f16 /* 089E78 80089278 3C014010 */ li $at, 0x40100000 # 2.250000 /* 089E7C 8008927C 4630003E */ c.le.d $f0, $f16 -/* 089E80 80089280 00000000 */ nop +/* 089E80 80089280 00000000 */ nop /* 089E84 80089284 45020005 */ bc1fl .L8008929C /* 089E88 80089288 44819800 */ mtc1 $at, $f19 /* 089E8C 8008928C 3C01800F */ lui $at, %hi(D_800EF4CC) # 0x800F0000 # -0.000000 @@ -177,9 +177,9 @@ glabel func_80089020 /* 089E9C 8008929C 44809000 */ mtc1 $zero, $f18 /* 089EA0 800892A0 3C01800F */ lui $at, %hi(D_800EF4D0) # 0x800f /* 089EA4 800892A4 4632003E */ c.le.d $f0, $f18 -/* 089EA8 800892A8 00000000 */ nop +/* 089EA8 800892A8 00000000 */ nop /* 089EAC 800892AC 45000004 */ bc1f .L800892C0 -/* 089EB0 800892B0 00000000 */ nop +/* 089EB0 800892B0 00000000 */ nop /* 089EB4 800892B4 3C01800F */ lui $at, %hi(D_800EF4D4) # $at, 0x800f /* 089EB8 800892B8 10000002 */ b .L800892C4 /* 089EBC 800892BC C420F4D0 */ lwc1 $f0, %lo(D_800EF4D0)($at) @@ -193,4 +193,4 @@ glabel func_80089020 /* 089ED0 800892D0 8FBF0014 */ lw $ra, 0x14($sp) /* 089ED4 800892D4 27BD0018 */ addiu $sp, $sp, 0x18 /* 089ED8 800892D8 03E00008 */ jr $ra -/* 089EDC 800892DC 00000000 */ nop +/* 089EDC 800892DC 00000000 */ nop diff --git a/asm/non_matchings/code_80086E70/func_8008933C.s b/asm/non_matchings/code_80086E70/func_8008933C.s index 9beabf3d1..479b60122 100644 --- a/asm/non_matchings/code_80086E70/func_8008933C.s +++ b/asm/non_matchings/code_80086E70/func_8008933C.s @@ -1,6 +1,6 @@ glabel func_8008933C -/* 089F3C 8008933C 3C0E800E */ lui $t6, %hi(D_800DC4DC) # $t6, 0x800e -/* 089F40 80089340 8DCEC4DC */ lw $t6, %lo(D_800DC4DC)($t6) +/* 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 @@ -35,7 +35,7 @@ glabel func_8008933C /* 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 +/* 089FCC 800893CC 00000000 */ nop /* 089FD0 800893D0 45020009 */ bc1fl .L800893F8 /* 089FD4 800893D4 C4920034 */ lwc1 $f18, 0x34($a0) /* 089FD8 800893D8 C4920034 */ lwc1 $f18, 0x34($a0) @@ -57,7 +57,7 @@ glabel func_8008933C /* 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 +/* 08A01C 8008941C 00000000 */ nop /* 08A020 80089420 45020009 */ bc1fl .L80089448 /* 08A024 80089424 C48A003C */ lwc1 $f10, 0x3c($a0) /* 08A028 80089428 C48A003C */ lwc1 $f10, 0x3c($a0) @@ -76,7 +76,7 @@ glabel func_8008933C /* 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 +/* 08A060 80089460 00000000 */ nop /* 08A064 80089464 460C6482 */ mul.s $f18, $f12, $f12 /* 08A068 80089468 46124080 */ add.s $f2, $f8, $f18 .L8008946C: diff --git a/asm/non_matchings/code_80086E70/func_80089474.s b/asm/non_matchings/code_80086E70/func_80089474.s index d54a3bb9d..44b4ba2bb 100644 --- a/asm/non_matchings/code_80086E70/func_80089474.s +++ b/asm/non_matchings/code_80086E70/func_80089474.s @@ -4,8 +4,8 @@ glabel func_80089474 /* 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(D_800DC4DC) # $t8, 0x800e -/* 08A08C 8008948C 8F18C4DC */ lw $t8, %lo(D_800DC4DC)($t8) +/* 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 @@ -21,7 +21,7 @@ glabel func_80089474 /* 08A0C0 800894C0 50400004 */ beql $v0, $zero, .L800894D4 /* 08A0C4 800894C4 8FA40018 */ lw $a0, 0x18($sp) /* 08A0C8 800894C8 0C01C860 */ jal func_80072180 -/* 08A0CC 800894CC 00000000 */ nop +/* 08A0CC 800894CC 00000000 */ nop /* 08A0D0 800894D0 8FA40018 */ lw $a0, 0x18($sp) .L800894D4: /* 08A0D4 800894D4 8FA50020 */ lw $a1, 0x20($sp) @@ -34,7 +34,7 @@ glabel func_80089474 /* 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 +/* 08A0FC 800894FC 00000000 */ nop /* 08A100 80089500 4502000A */ bc1fl .L8008952C /* 08A104 80089504 8FBF0014 */ lw $ra, 0x14($sp) /* 08A108 80089508 95090000 */ lhu $t1, ($t0) @@ -49,19 +49,19 @@ glabel func_80089474 .L8008952C: /* 08A12C 8008952C 27BD0020 */ addiu $sp, $sp, 0x20 /* 08A130 80089530 03E00008 */ jr $ra -/* 08A134 80089534 00000000 */ nop +/* 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(D_800DC4DC) # $t8, 0x800e +/* 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(D_800DC4DC)($t8) +/* 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 @@ -79,7 +79,7 @@ glabel func_80089474 /* 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 +/* 08A1A8 800895A8 00000000 */ nop /* 08A1AC 800895AC 4502000A */ bc1fl .L800895D8 /* 08A1B0 800895B0 8FBF0014 */ lw $ra, 0x14($sp) /* 08A1B4 800895B4 94990000 */ lhu $t9, ($a0) @@ -94,21 +94,21 @@ glabel func_80089474 .L800895D8: /* 08A1D8 800895D8 27BD0020 */ addiu $sp, $sp, 0x20 /* 08A1DC 800895DC 03E00008 */ jr $ra -/* 08A1E0 800895E0 00000000 */ nop +/* 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(D_800DC4DC) # $s0, 0x800e +/* 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(D_800DC4DC)($s0) +/* 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 @@ -139,7 +139,7 @@ glabel func_80089474 /* 08A280 80089680 50400004 */ beql $v0, $zero, .L80089694 /* 08A284 80089684 8EA80000 */ lw $t0, ($s5) /* 08A288 80089688 0C01C860 */ jal func_80072180 -/* 08A28C 8008968C 00000000 */ nop +/* 08A28C 8008968C 00000000 */ nop .L80089690: /* 08A290 80089690 8EA80000 */ lw $t0, ($s5) .L80089694: @@ -169,7 +169,7 @@ glabel func_80089474 /* 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(D_800DC4DC) # $s0, 0x800e +/* 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) @@ -177,7 +177,7 @@ glabel func_80089474 /* 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(D_800DC4DC)($s0) +/* 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 @@ -218,14 +218,14 @@ glabel func_80089474 /* 08A3A8 800897A8 46203220 */ cvt.s.d $f8, $f6 /* 08A3AC 800897AC 44074000 */ mfc1 $a3, $f8 /* 08A3B0 800897B0 0C0224CF */ jal func_8008933C -/* 08A3B4 800897B4 00000000 */ nop +/* 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 +/* 08A3D0 800897D0 00000000 */ nop /* 08A3D4 800897D4 8E8A0000 */ lw $t2, ($s4) .L800897D8: /* 08A3D8 800897D8 26310001 */ addiu $s1, $s1, 1 diff --git a/asm/non_matchings/code_80086E70/func_80089820.s b/asm/non_matchings/code_80086E70/func_80089820.s index e66900eb2..ad3408a57 100644 --- a/asm/non_matchings/code_80086E70/func_80089820.s +++ b/asm/non_matchings/code_80086E70/func_80089820.s @@ -8,7 +8,7 @@ glabel func_80089820 /* 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(D_800DC4DC) # $s0, 0x800e +/* 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) @@ -19,7 +19,7 @@ glabel func_80089820 /* 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(D_800DC4DC)($s0) +/* 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 @@ -66,7 +66,7 @@ glabel func_80089820 /* 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 +/* 08A528 80089928 00000000 */ nop /* 08A52C 8008992C 0C01C870 */ jal func_800721C0 /* 08A530 80089930 3C050200 */ lui $a1, 0x200 /* 08A534 80089934 1000001E */ b .L800899B0 @@ -82,7 +82,7 @@ glabel func_80089820 /* 08A558 80089958 50400004 */ beql $v0, $zero, .L8008996C /* 08A55C 8008995C 4406C000 */ mfc1 $a2, $f24 /* 08A560 80089960 0C01C860 */ jal func_80072180 -/* 08A564 80089964 00000000 */ nop +/* 08A564 80089964 00000000 */ nop /* 08A568 80089968 4406C000 */ mfc1 $a2, $f24 .L8008996C: /* 08A56C 8008996C 4407A000 */ mfc1 $a3, $f20 @@ -91,7 +91,7 @@ glabel func_80089820 /* 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 +/* 08A584 80089984 00000000 */ nop /* 08A588 80089988 45020009 */ bc1fl .L800899B0 /* 08A58C 8008998C 8E980000 */ lw $t8, ($s4) /* 08A590 80089990 960E0000 */ lhu $t6, ($s0) diff --git a/asm/non_matchings/code_80086E70/func_80089A04.s b/asm/non_matchings/code_80086E70/func_80089A04.s index d16e6ddeb..d0acab209 100644 --- a/asm/non_matchings/code_80086E70/func_80089A04.s +++ b/asm/non_matchings/code_80086E70/func_80089A04.s @@ -7,7 +7,7 @@ glabel func_80089A04 /* 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(D_800DC4DC) # $s0, 0x800e +/* 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) @@ -15,7 +15,7 @@ glabel func_80089A04 /* 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(D_800DC4DC)($s0) +/* 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 @@ -56,14 +56,14 @@ glabel func_80089A04 /* 08A6D8 80089AD8 46203220 */ cvt.s.d $f8, $f6 /* 08A6DC 80089ADC 44074000 */ mfc1 $a3, $f8 /* 08A6E0 80089AE0 0C0224CF */ jal func_8008933C -/* 08A6E4 80089AE4 00000000 */ nop +/* 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 +/* 08A700 80089B00 00000000 */ nop /* 08A704 80089B04 8E8A0000 */ lw $t2, ($s4) .L80089B08: /* 08A708 80089B08 26310001 */ addiu $s1, $s1, 1 diff --git a/asm/non_matchings/code_80086E70/func_80089B50.s b/asm/non_matchings/code_80086E70/func_80089B50.s index 479d26b8f..e2e1d4226 100644 --- a/asm/non_matchings/code_80086E70/func_80089B50.s +++ b/asm/non_matchings/code_80086E70/func_80089B50.s @@ -4,7 +4,7 @@ glabel func_80089B50 /* 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(D_800DC4DC) # $s0, 0x800e +/* 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) @@ -14,7 +14,7 @@ glabel func_80089B50 /* 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(D_800DC4DC)($s0) +/* 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 @@ -36,11 +36,11 @@ glabel func_80089B50 .L80089BD8: /* 08A7D8 80089BD8 869900A6 */ lh $t9, 0xa6($s4) /* 08A7DC 80089BDC 13200023 */ beqz $t9, .L80089C6C -/* 08A7E0 80089BE0 00000000 */ nop +/* 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 +/* 08A7F0 80089BF0 00000000 */ nop /* 08A7F4 80089BF4 96020000 */ lhu $v0, ($s0) /* 08A7F8 80089BF8 304A8000 */ andi $t2, $v0, 0x8000 /* 08A7FC 80089BFC 1140001B */ beqz $t2, .L80089C6C @@ -56,7 +56,7 @@ glabel func_80089B50 /* 08A824 80089C24 322400FF */ andi $a0, $s1, 0xff /* 08A828 80089C28 31AE0200 */ andi $t6, $t5, 0x200 /* 08A82C 80089C2C 15C0000D */ bnez $t6, .L80089C64 -/* 08A830 80089C30 00000000 */ nop +/* 08A830 80089C30 00000000 */ nop /* 08A834 80089C34 8E0F000C */ lw $t7, 0xc($s0) /* 08A838 80089C38 02602025 */ move $a0, $s3 /* 08A83C 80089C3C 02E02825 */ move $a1, $s7 @@ -64,11 +64,11 @@ glabel func_80089B50 /* 08A844 80089C44 0C01C88F */ jal func_8007223C /* 08A848 80089C48 AE18000C */ sw $t8, 0xc($s0) /* 08A84C 80089C4C 10400007 */ beqz $v0, .L80089C6C -/* 08A850 80089C50 00000000 */ nop +/* 08A850 80089C50 00000000 */ nop /* 08A854 80089C54 0C01C860 */ jal func_80072180 -/* 08A858 80089C58 00000000 */ nop +/* 08A858 80089C58 00000000 */ nop /* 08A85C 80089C5C 10000003 */ b .L80089C6C -/* 08A860 80089C60 00000000 */ nop +/* 08A860 80089C60 00000000 */ nop .L80089C64: /* 08A864 80089C64 0C032418 */ jal func_800C9060 /* 08A868 80089C68 03C02825 */ move $a1, $fp diff --git a/asm/non_matchings/code_80086E70/func_80089CBC.s b/asm/non_matchings/code_80086E70/func_80089CBC.s index 59d670fd1..bf4c8038d 100644 --- a/asm/non_matchings/code_80086E70/func_80089CBC.s +++ b/asm/non_matchings/code_80086E70/func_80089CBC.s @@ -6,7 +6,7 @@ glabel func_80089CBC /* 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(D_800DC4DC) # $s0, 0x800e +/* 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) @@ -15,7 +15,7 @@ glabel func_80089CBC /* 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(D_800DC4DC)($s0) +/* 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 @@ -66,7 +66,7 @@ glabel func_80089CBC /* 08A9B8 80089DB8 50400004 */ beql $v0, $zero, .L80089DCC /* 08A9BC 80089DBC 8FD80000 */ lw $t8, ($fp) /* 08A9C0 80089DC0 0C01C860 */ jal func_80072180 -/* 08A9C4 80089DC4 00000000 */ nop +/* 08A9C4 80089DC4 00000000 */ nop .L80089DC8: /* 08A9C8 80089DC8 8FD80000 */ lw $t8, ($fp) .L80089DCC: @@ -96,14 +96,14 @@ glabel func_80089CBC /* 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(D_800DC4DC) # $s0, 0x800e +/* 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(D_800DC4DC)($s0) +/* 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 diff --git a/asm/non_matchings/code_80086E70/func_80089F24.s b/asm/non_matchings/code_80086E70/func_80089F24.s index 35bc14357..eacef77f0 100644 --- a/asm/non_matchings/code_80086E70/func_80089F24.s +++ b/asm/non_matchings/code_80086E70/func_80089F24.s @@ -4,7 +4,7 @@ glabel func_80089F24 /* 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(D_800DC4DC) # $s0, 0x800e +/* 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) @@ -13,7 +13,7 @@ glabel func_80089F24 /* 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(D_800DC4DC)($s0) +/* 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 @@ -56,7 +56,7 @@ glabel func_80089F24 /* 08ABF8 80089FF8 50400004 */ beql $v0, $zero, .L8008A00C /* 08ABFC 80089FFC 8E0C000C */ lw $t4, 0xc($s0) /* 08AC00 8008A000 0C01C860 */ jal func_80072180 -/* 08AC04 8008A004 00000000 */ nop +/* 08AC04 8008A004 00000000 */ nop /* 08AC08 8008A008 8E0C000C */ lw $t4, 0xc($s0) .L8008A00C: /* 08AC0C 8008A00C 01966825 */ or $t5, $t4, $s6 diff --git a/asm/non_matchings/code_80086E70/func_8008BE0C.s b/asm/non_matchings/code_80086E70/func_8008BE0C.s index 449e29664..58eadb83c 100644 --- a/asm/non_matchings/code_80086E70/func_8008BE0C.s +++ b/asm/non_matchings/code_80086E70/func_8008BE0C.s @@ -7,8 +7,8 @@ glabel func_8008BE0C /* 08CA20 8008BE20 0C0AE006 */ jal sins /* 08CA24 8008BE24 97A4002A */ lhu $a0, 0x2a($sp) /* 08CA28 8008BE28 87B90026 */ lh $t9, 0x26($sp) -/* 08CA2C 8008BE2C 3C08800E */ lui $t0, %hi(D_800DC4FC) # $t0, 0x800e -/* 08CA30 8008BE30 8D08C4FC */ lw $t0, %lo(D_800DC4FC)($t0) +/* 08CA2C 8008BE2C 3C08800E */ lui $t0, %hi(gPlayerOneCopy) # $t0, 0x800e +/* 08CA30 8008BE30 8D08C4FC */ lw $t0, %lo(gPlayerOneCopy)($t0) /* 08CA34 8008BE34 44992000 */ mtc1 $t9, $f4 /* 08CA38 8008BE38 8FAE0020 */ lw $t6, 0x20($sp) /* 08CA3C 8008BE3C C5080014 */ lwc1 $f8, 0x14($t0) @@ -27,8 +27,8 @@ glabel func_8008BE0C /* 08CA70 8008BE70 0C0AE00E */ jal coss /* 08CA74 8008BE74 E44A0010 */ swc1 $f10, 0x10($v0) /* 08CA78 8008BE78 C7A20018 */ lwc1 $f2, 0x18($sp) -/* 08CA7C 8008BE7C 3C09800E */ lui $t1, %hi(D_800DC4FC) # $t1, 0x800e -/* 08CA80 8008BE80 8D29C4FC */ lw $t1, %lo(D_800DC4FC)($t1) +/* 08CA7C 8008BE7C 3C09800E */ lui $t1, %hi(gPlayerOneCopy) # $t1, 0x800e +/* 08CA80 8008BE80 8D29C4FC */ lw $t1, %lo(gPlayerOneCopy)($t1) /* 08CA84 8008BE84 46020402 */ mul.s $f16, $f0, $f2 /* 08CA88 8008BE88 8FBF0014 */ lw $ra, 0x14($sp) /* 08CA8C 8008BE8C C532001C */ lwc1 $f18, 0x1c($t1) @@ -67,4 +67,4 @@ glabel func_8008BE0C /* 08CB08 8008BF08 8FBF0014 */ lw $ra, 0x14($sp) /* 08CB0C 8008BF0C 27BD0020 */ addiu $sp, $sp, 0x20 /* 08CB10 8008BF10 03E00008 */ jr $ra -/* 08CB14 8008BF14 00000000 */ nop +/* 08CB14 8008BF14 00000000 */ nop diff --git a/asm/non_matchings/code_8008C1D0/code_8008C1D0.s b/asm/non_matchings/code_8008C1D0/code_8008C1D0.s index caf551bbc..750c90649 100644 --- a/asm/non_matchings/code_8008C1D0/code_8008C1D0.s +++ b/asm/non_matchings/code_8008C1D0/code_8008C1D0.s @@ -79,32 +79,32 @@ glabel func_8008C9EC /* 08D710 8008CB10 246AFFFF */ addiu $t2, $v1, -1 /* 08D714 8008CB14 0161001A */ div $zero, $t3, $at /* 08D718 8008CB18 00006012 */ mflo $t4 -/* 08D71C 8008CB1C 00000000 */ nop -/* 08D720 8008CB20 00000000 */ nop +/* 08D71C 8008CB1C 00000000 */ nop +/* 08D720 8008CB20 00000000 */ nop /* 08D724 8008CB24 01AC001A */ div $zero, $t5, $t4 /* 08D728 8008CB28 0000C812 */ mflo $t9 /* 08D72C 8008CB2C 15800002 */ bnez $t4, .L8008CB38 -/* 08D730 8008CB30 00000000 */ nop +/* 08D730 8008CB30 00000000 */ nop /* 08D734 8008CB34 0007000D */ break 7 .L8008CB38: /* 08D738 8008CB38 2401FFFF */ li $at, -1 /* 08D73C 8008CB3C 15810004 */ bne $t4, $at, .L8008CB50 /* 08D740 8008CB40 3C018000 */ lui $at, 0x8000 /* 08D744 8008CB44 15A10002 */ bne $t5, $at, .L8008CB50 -/* 08D748 8008CB48 00000000 */ nop +/* 08D748 8008CB48 00000000 */ nop /* 08D74C 8008CB4C 0006000D */ break 6 .L8008CB50: /* 08D750 8008CB50 0319001A */ div $zero, $t8, $t9 /* 08D754 8008CB54 00007012 */ mflo $t6 /* 08D758 8008CB58 17200002 */ bnez $t9, .L8008CB64 -/* 08D75C 8008CB5C 00000000 */ nop +/* 08D75C 8008CB5C 00000000 */ nop /* 08D760 8008CB60 0007000D */ break 7 .L8008CB64: /* 08D764 8008CB64 2401FFFF */ li $at, -1 /* 08D768 8008CB68 17210004 */ bne $t9, $at, .L8008CB7C /* 08D76C 8008CB6C 3C018000 */ lui $at, 0x8000 /* 08D770 8008CB70 17010002 */ bne $t8, $at, .L8008CB7C -/* 08D774 8008CB74 00000000 */ nop +/* 08D774 8008CB74 00000000 */ nop /* 08D778 8008CB78 0006000D */ break 6 .L8008CB7C: /* 08D77C 8008CB7C 010E001A */ div $zero, $t0, $t6 @@ -112,14 +112,14 @@ glabel func_8008C9EC /* 08D784 8008CB84 00057C00 */ sll $t7, $a1, 0x10 /* 08D788 8008CB88 000F4C03 */ sra $t1, $t7, 0x10 /* 08D78C 8008CB8C 15C00002 */ bnez $t6, .L8008CB98 -/* 08D790 8008CB90 00000000 */ nop +/* 08D790 8008CB90 00000000 */ nop /* 08D794 8008CB94 0007000D */ break 7 .L8008CB98: /* 08D798 8008CB98 2401FFFF */ li $at, -1 /* 08D79C 8008CB9C 15C10004 */ bne $t6, $at, .L8008CBB0 /* 08D7A0 8008CBA0 3C018000 */ lui $at, 0x8000 /* 08D7A4 8008CBA4 15010002 */ bne $t0, $at, .L8008CBB0 -/* 08D7A8 8008CBA8 00000000 */ nop +/* 08D7A8 8008CBA8 00000000 */ nop /* 08D7AC 8008CBAC 0006000D */ break 6 .L8008CBB0: /* 08D7B0 8008CBB0 01202825 */ move $a1, $t1 @@ -172,32 +172,32 @@ glabel func_8008C9EC /* 08D864 8008CC64 2468FFFF */ addiu $t0, $v1, -1 /* 08D868 8008CC68 01C1001A */ div $zero, $t6, $at /* 08D86C 8008CC6C 00007812 */ mflo $t7 -/* 08D870 8008CC70 00000000 */ nop -/* 08D874 8008CC74 00000000 */ nop +/* 08D870 8008CC70 00000000 */ nop +/* 08D874 8008CC74 00000000 */ nop /* 08D878 8008CC78 012F001A */ div $zero, $t1, $t7 /* 08D87C 8008CC7C 00005012 */ mflo $t2 /* 08D880 8008CC80 15E00002 */ bnez $t7, .L8008CC8C -/* 08D884 8008CC84 00000000 */ nop +/* 08D884 8008CC84 00000000 */ nop /* 08D888 8008CC88 0007000D */ break 7 .L8008CC8C: /* 08D88C 8008CC8C 2401FFFF */ li $at, -1 /* 08D890 8008CC90 15E10004 */ bne $t7, $at, .L8008CCA4 /* 08D894 8008CC94 3C018000 */ lui $at, 0x8000 /* 08D898 8008CC98 15210002 */ bne $t1, $at, .L8008CCA4 -/* 08D89C 8008CC9C 00000000 */ nop +/* 08D89C 8008CC9C 00000000 */ nop /* 08D8A0 8008CCA0 0006000D */ break 6 .L8008CCA4: /* 08D8A4 8008CCA4 016A001A */ div $zero, $t3, $t2 /* 08D8A8 8008CCA8 00006812 */ mflo $t5 /* 08D8AC 8008CCAC 15400002 */ bnez $t2, .L8008CCB8 -/* 08D8B0 8008CCB0 00000000 */ nop +/* 08D8B0 8008CCB0 00000000 */ nop /* 08D8B4 8008CCB4 0007000D */ break 7 .L8008CCB8: /* 08D8B8 8008CCB8 2401FFFF */ li $at, -1 /* 08D8BC 8008CCBC 15410004 */ bne $t2, $at, .L8008CCD0 /* 08D8C0 8008CCC0 3C018000 */ lui $at, 0x8000 /* 08D8C4 8008CCC4 15610002 */ bne $t3, $at, .L8008CCD0 -/* 08D8C8 8008CCC8 00000000 */ nop +/* 08D8C8 8008CCC8 00000000 */ nop /* 08D8CC 8008CCCC 0006000D */ break 6 .L8008CCD0: /* 08D8D0 8008CCD0 032D001A */ div $zero, $t9, $t5 @@ -205,14 +205,14 @@ glabel func_8008C9EC /* 08D8D8 8008CCD8 00056400 */ sll $t4, $a1, 0x10 /* 08D8DC 8008CCDC 000CC403 */ sra $t8, $t4, 0x10 /* 08D8E0 8008CCE0 15A00002 */ bnez $t5, .L8008CCEC -/* 08D8E4 8008CCE4 00000000 */ nop +/* 08D8E4 8008CCE4 00000000 */ nop /* 08D8E8 8008CCE8 0007000D */ break 7 .L8008CCEC: /* 08D8EC 8008CCEC 2401FFFF */ li $at, -1 /* 08D8F0 8008CCF0 15A10004 */ bne $t5, $at, .L8008CD04 /* 08D8F4 8008CCF4 3C018000 */ lui $at, 0x8000 /* 08D8F8 8008CCF8 17210002 */ bne $t9, $at, .L8008CD04 -/* 08D8FC 8008CCFC 00000000 */ nop +/* 08D8FC 8008CCFC 00000000 */ nop /* 08D900 8008CD00 0006000D */ break 6 .L8008CD04: /* 08D904 8008CD04 03002825 */ move $a1, $t8 @@ -254,7 +254,7 @@ glabel func_8008C9EC /* 08D990 8008CD90 AC2D5480 */ sw $t5, %lo(D_80165480)($at) # 0x5480($at) /* 08D994 8008CD94 C604009C */ lwc1 $f4, 0x9c($s0) /* 08D998 8008CD98 4600203E */ c.le.s $f4, $f0 -/* 08D99C 8008CD9C 00000000 */ nop +/* 08D99C 8008CD9C 00000000 */ nop /* 08D9A0 8008CDA0 45020003 */ bc1fl .L8008CDB0 /* 08D9A4 8008CDA4 8FBF001C */ lw $ra, 0x1c($sp) /* 08D9A8 8008CDA8 E600009C */ swc1 $f0, 0x9c($s0) @@ -264,7 +264,7 @@ glabel func_8008C9EC /* 08D9B0 8008CDB0 8FB00018 */ lw $s0, 0x18($sp) /* 08D9B4 8008CDB4 27BD0040 */ addiu $sp, $sp, 0x40 /* 08D9B8 8008CDB8 03E00008 */ jr $ra -/* 08D9BC 8008CDBC 00000000 */ nop +/* 08D9BC 8008CDBC 00000000 */ nop glabel func_8008CDC0 /* 08D9C0 8008CDC0 27BDFFE8 */ addiu $sp, $sp, -0x18 @@ -305,9 +305,9 @@ glabel func_8008CDC0 /* 08DA4C 8008CE4C 310A0008 */ andi $t2, $t0, 8 /* 08DA50 8008CE50 46128102 */ mul.s $f4, $f16, $f18 /* 08DA54 8008CE54 4606203E */ c.le.s $f4, $f6 -/* 08DA58 8008CE58 00000000 */ nop +/* 08DA58 8008CE58 00000000 */ nop /* 08DA5C 8008CE5C 4501000B */ bc1t .L8008CE8C -/* 08DA60 8008CE60 00000000 */ nop +/* 08DA60 8008CE60 00000000 */ nop /* 08DA64 8008CE64 15400009 */ bnez $t2, .L8008CE8C /* 08DA68 8008CE68 01001025 */ move $v0, $t0 /* 08DA6C 8008CE6C 948B0000 */ lhu $t3, ($a0) @@ -329,7 +329,7 @@ glabel func_8008CDC0 .L8008CEA4: /* 08DAA4 8008CEA4 27BD0018 */ addiu $sp, $sp, 0x18 /* 08DAA8 8008CEA8 03E00008 */ jr $ra -/* 08DAAC 8008CEAC 00000000 */ nop +/* 08DAAC 8008CEAC 00000000 */ nop glabel func_8008CEB0 /* 08DAB0 8008CEB0 27BDFFD0 */ addiu $sp, $sp, -0x30 @@ -350,16 +350,16 @@ glabel func_8008CEB0 /* 08DAEC 8008CEEC 848700AC */ lh $a3, 0xac($a0) /* 08DAF0 8008CEF0 0000C012 */ mflo $t8 /* 08DAF4 8008CEF4 44983000 */ mtc1 $t8, $f6 -/* 08DAF8 8008CEF8 00000000 */ nop +/* 08DAF8 8008CEF8 00000000 */ nop /* 08DAFC 8008CEFC 46803221 */ cvt.d.w $f8, $f6 /* 08DB00 8008CF00 46282282 */ mul.d $f10, $f4, $f8 -/* 08DB04 8008CF04 00000000 */ nop +/* 08DB04 8008CF04 00000000 */ nop /* 08DB08 8008CF08 46009182 */ mul.s $f6, $f18, $f0 /* 08DB0C 8008CF0C 46003121 */ cvt.d.s $f4, $f6 /* 08DB10 8008CF10 462A2201 */ sub.d $f8, $f4, $f10 /* 08DB14 8008CF14 4620440D */ trunc.w.d $f16, $f8 /* 08DB18 8008CF18 44028000 */ mfc1 $v0, $f16 -/* 08DB1C 8008CF1C 00000000 */ nop +/* 08DB1C 8008CF1C 00000000 */ nop /* 08DB20 8008CF20 00023400 */ sll $a2, $v0, 0x10 /* 08DB24 8008CF24 00064403 */ sra $t0, $a2, 0x10 /* 08DB28 8008CF28 10600047 */ beqz $v1, .L8008D048 @@ -388,9 +388,9 @@ glabel func_8008CEB0 /* 08DB80 8008CF80 44815000 */ mtc1 $at, $f10 /* 08DB84 8008CF84 3C040004 */ lui $a0, 4 /* 08DB88 8008CF88 460A003E */ c.le.s $f0, $f10 -/* 08DB8C 8008CF8C 00000000 */ nop +/* 08DB8C 8008CF8C 00000000 */ nop /* 08DB90 8008CF90 4500002D */ bc1f .L8008D048 -/* 08DB94 8008CF94 00000000 */ nop +/* 08DB94 8008CF94 00000000 */ nop /* 08DB98 8008CF98 8E0F00BC */ lw $t7, 0xbc($s0) /* 08DB9C 8008CF9C 2401F7FF */ li $at, -2049 /* 08DBA0 8008CFA0 01E11024 */ and $v0, $t7, $at @@ -446,9 +446,9 @@ glabel func_8008CEB0 /* 08DC60 8008D060 00067400 */ sll $t6, $a2, 0x10 /* 08DC64 8008D064 000E3403 */ sra $a2, $t6, 0x10 /* 08DC68 8008D068 1CC00004 */ bgtz $a2, .L8008D07C -/* 08DC6C 8008D06C 00000000 */ nop +/* 08DC6C 8008D06C 00000000 */ nop /* 08DC70 8008D070 14E10002 */ bne $a3, $at, .L8008D07C -/* 08DC74 8008D074 00000000 */ nop +/* 08DC74 8008D074 00000000 */ nop /* 08DC78 8008D078 00003025 */ move $a2, $zero .L8008D07C: /* 08DC7C 8008D07C 04C00004 */ bltz $a2, .L8008D090 @@ -479,7 +479,7 @@ glabel func_8008CEB0 /* 08DCD4 8008D0D4 8FB00018 */ lw $s0, 0x18($sp) /* 08DCD8 8008D0D8 27BD0030 */ addiu $sp, $sp, 0x30 /* 08DCDC 8008D0DC 03E00008 */ jr $ra -/* 08DCE0 8008D0E0 00000000 */ nop +/* 08DCE0 8008D0E0 00000000 */ nop glabel func_8008D0E4 /* 08DCE4 8008D0E4 AFA50004 */ sw $a1, 4($sp) @@ -518,7 +518,7 @@ glabel func_8008D0FC /* 08DD60 8008D160 8FBF0014 */ lw $ra, 0x14($sp) /* 08DD64 8008D164 27BD0018 */ addiu $sp, $sp, 0x18 /* 08DD68 8008D168 03E00008 */ jr $ra -/* 08DD6C 8008D16C 00000000 */ nop +/* 08DD6C 8008D16C 00000000 */ nop glabel func_8008D170 /* 08DD70 8008D170 27BDFFD0 */ addiu $sp, $sp, -0x30 @@ -539,16 +539,16 @@ glabel func_8008D170 /* 08DDAC 8008D1AC 848700AC */ lh $a3, 0xac($a0) /* 08DDB0 8008D1B0 0000C012 */ mflo $t8 /* 08DDB4 8008D1B4 44983000 */ mtc1 $t8, $f6 -/* 08DDB8 8008D1B8 00000000 */ nop +/* 08DDB8 8008D1B8 00000000 */ nop /* 08DDBC 8008D1BC 46803221 */ cvt.d.w $f8, $f6 /* 08DDC0 8008D1C0 46282282 */ mul.d $f10, $f4, $f8 -/* 08DDC4 8008D1C4 00000000 */ nop +/* 08DDC4 8008D1C4 00000000 */ nop /* 08DDC8 8008D1C8 46009182 */ mul.s $f6, $f18, $f0 /* 08DDCC 8008D1CC 46003121 */ cvt.d.s $f4, $f6 /* 08DDD0 8008D1D0 462A2201 */ sub.d $f8, $f4, $f10 /* 08DDD4 8008D1D4 4620440D */ trunc.w.d $f16, $f8 /* 08DDD8 8008D1D8 44028000 */ mfc1 $v0, $f16 -/* 08DDDC 8008D1DC 00000000 */ nop +/* 08DDDC 8008D1DC 00000000 */ nop /* 08DDE0 8008D1E0 00023400 */ sll $a2, $v0, 0x10 /* 08DDE4 8008D1E4 00064403 */ sra $t0, $a2, 0x10 /* 08DDE8 8008D1E8 1060004B */ beqz $v1, .L8008D318 @@ -582,9 +582,9 @@ glabel func_8008D170 /* 08DE50 8008D250 46000221 */ cvt.d.s $f8, $f0 /* 08DE54 8008D254 3C040004 */ lui $a0, 4 /* 08DE58 8008D258 462A403E */ c.le.d $f8, $f10 -/* 08DE5C 8008D25C 00000000 */ nop +/* 08DE5C 8008D25C 00000000 */ nop /* 08DE60 8008D260 4500002D */ bc1f .L8008D318 -/* 08DE64 8008D264 00000000 */ nop +/* 08DE64 8008D264 00000000 */ nop /* 08DE68 8008D268 86190044 */ lh $t9, 0x44($s0) /* 08DE6C 8008D26C 8E0200BC */ lw $v0, 0xbc($s0) /* 08DE70 8008D270 3C01FFFB */ lui $at, (0xFFFBFFFF >> 16) # lui $at, 0xfffb @@ -640,9 +640,9 @@ glabel func_8008D170 /* 08DF30 8008D330 0006C400 */ sll $t8, $a2, 0x10 /* 08DF34 8008D334 00183403 */ sra $a2, $t8, 0x10 /* 08DF38 8008D338 1CC00004 */ bgtz $a2, .L8008D34C -/* 08DF3C 8008D33C 00000000 */ nop +/* 08DF3C 8008D33C 00000000 */ nop /* 08DF40 8008D340 14E10002 */ bne $a3, $at, .L8008D34C -/* 08DF44 8008D344 00000000 */ nop +/* 08DF44 8008D344 00000000 */ nop /* 08DF48 8008D348 00003025 */ move $a2, $zero .L8008D34C: /* 08DF4C 8008D34C 04C00004 */ bltz $a2, .L8008D360 @@ -672,7 +672,7 @@ glabel func_8008D170 /* 08DFA0 8008D3A0 8FB00018 */ lw $s0, 0x18($sp) /* 08DFA4 8008D3A4 27BD0030 */ addiu $sp, $sp, 0x30 /* 08DFA8 8008D3A8 03E00008 */ jr $ra -/* 08DFAC 8008D3AC 00000000 */ nop +/* 08DFAC 8008D3AC 00000000 */ nop glabel func_8008D3B0 /* 08DFB0 8008D3B0 AFA50004 */ sw $a1, 4($sp) @@ -706,9 +706,9 @@ glabel func_8008D3C4 /* 08E018 8008D418 E6040DBC */ swc1 $f4, 0xdbc($s0) /* 08E01C 8008D41C 954AF890 */ lhu $t2, %lo(D_8015F890)($t2) /* 08E020 8008D420 24010001 */ li $at, 1 -/* 08E024 8008D424 3C0D800E */ lui $t5, %hi(D_800DC4DC) # $t5, 0x800e +/* 08E024 8008D424 3C0D800E */ lui $t5, %hi(gPlayerOne) # $t5, 0x800e /* 08E028 8008D428 11410011 */ beq $t2, $at, .L8008D470 -/* 08E02C 8008D42C 00000000 */ nop +/* 08E02C 8008D42C 00000000 */ nop /* 08E030 8008D430 96020000 */ lhu $v0, ($s0) /* 08E034 8008D434 24014000 */ li $at, 16384 /* 08E038 8008D438 304B4000 */ andi $t3, $v0, 0x4000 @@ -726,7 +726,7 @@ glabel func_8008D3C4 /* 08E068 8008D468 1000000C */ b .L8008D49C /* 08E06C 8008D46C 240E0050 */ li $t6, 80 .L8008D470: -/* 08E070 8008D470 8DADC4DC */ lw $t5, %lo(D_800DC4DC)($t5) +/* 08E070 8008D470 8DADC4DC */ lw $t5, %lo(gPlayerOne)($t5) /* 08E074 8008D474 30A400FF */ andi $a0, $a1, 0xff /* 08E078 8008D478 560D0008 */ bnel $s0, $t5, .L8008D49C /* 08E07C 8008D47C 240E0050 */ li $t6, 80 @@ -744,7 +744,7 @@ glabel func_8008D3C4 /* 08E0A4 8008D4A4 8FB00018 */ lw $s0, 0x18($sp) /* 08E0A8 8008D4A8 27BD0028 */ addiu $sp, $sp, 0x28 /* 08E0AC 8008D4AC 03E00008 */ jr $ra -/* 08E0B0 8008D4B0 00000000 */ nop +/* 08E0B0 8008D4B0 00000000 */ nop glabel func_8008D4B4 /* 08E0B4 8008D4B4 27BDFFE8 */ addiu $sp, $sp, -0x18 @@ -779,7 +779,7 @@ glabel func_8008D4B4 /* 08E11C 8008D51C 44813000 */ mtc1 $at, $f6 /* 08E120 8008D520 C4E80080 */ lwc1 $f8, 0x80($a3) /* 08E124 8008D524 4606403E */ c.le.s $f8, $f6 -/* 08E128 8008D528 00000000 */ nop +/* 08E128 8008D528 00000000 */ nop /* 08E12C 8008D52C 45020006 */ bc1fl .L8008D548 /* 08E130 8008D530 8FBF0014 */ lw $ra, 0x14($sp) /* 08E134 8008D534 8CEF00BC */ lw $t7, 0xbc($a3) @@ -790,7 +790,7 @@ glabel func_8008D4B4 .L8008D548: /* 08E148 8008D548 27BD0018 */ addiu $sp, $sp, 0x18 /* 08E14C 8008D54C 03E00008 */ jr $ra -/* 08E150 8008D550 00000000 */ nop +/* 08E150 8008D550 00000000 */ nop glabel func_8008D554 /* 08E154 8008D554 8C8E00BC */ lw $t6, 0xbc($a0) @@ -877,7 +877,7 @@ glabel func_8008D570 /* 08E288 8008D688 8FBF0014 */ lw $ra, 0x14($sp) /* 08E28C 8008D68C 27BD0018 */ addiu $sp, $sp, 0x18 /* 08E290 8008D690 03E00008 */ jr $ra -/* 08E294 8008D694 00000000 */ nop +/* 08E294 8008D694 00000000 */ nop glabel func_8008D698 /* 08E298 8008D698 27BDFFE8 */ addiu $sp, $sp, -0x18 @@ -916,7 +916,7 @@ glabel func_8008D698 /* 08E314 8008D714 A48800B2 */ sh $t0, 0xb2($a0) /* 08E318 8008D718 848200B2 */ lh $v0, 0xb2($a0) /* 08E31C 8008D71C 1C400003 */ bgtz $v0, .L8008D72C -/* 08E320 8008D720 00000000 */ nop +/* 08E320 8008D720 00000000 */ nop /* 08E324 8008D724 A48000B2 */ sh $zero, 0xb2($a0) /* 08E328 8008D728 848200B2 */ lh $v0, 0xb2($a0) .L8008D72C: @@ -928,12 +928,12 @@ glabel func_8008D698 /* 08E340 8008D740 51410004 */ beql $t2, $at, .L8008D754 /* 08E344 8008D744 8FBF0014 */ lw $ra, 0x14($sp) /* 08E348 8008D748 0C0235D8 */ jal func_8008D760 -/* 08E34C 8008D74C 00000000 */ nop +/* 08E34C 8008D74C 00000000 */ nop /* 08E350 8008D750 8FBF0014 */ lw $ra, 0x14($sp) .L8008D754: /* 08E354 8008D754 27BD0018 */ addiu $sp, $sp, 0x18 /* 08E358 8008D758 03E00008 */ jr $ra -/* 08E35C 8008D75C 00000000 */ nop +/* 08E35C 8008D75C 00000000 */ nop glabel func_8008D760 /* 08E360 8008D760 8C8F00BC */ lw $t7, 0xbc($a0) @@ -1023,7 +1023,7 @@ glabel func_8008D7B0 /* 08E4A4 8008D8A4 8FBF0014 */ lw $ra, 0x14($sp) /* 08E4A8 8008D8A8 27BD0018 */ addiu $sp, $sp, 0x18 /* 08E4AC 8008D8AC 03E00008 */ jr $ra -/* 08E4B0 8008D8B0 00000000 */ nop +/* 08E4B0 8008D8B0 00000000 */ nop glabel func_8008D8B4 /* 08E4B4 8008D8B4 27BDFFE8 */ addiu $sp, $sp, -0x18 @@ -1062,7 +1062,7 @@ glabel func_8008D8B4 /* 08E530 8008D930 A48800B2 */ sh $t0, 0xb2($a0) /* 08E534 8008D934 848200B2 */ lh $v0, 0xb2($a0) /* 08E538 8008D938 1C400003 */ bgtz $v0, .L8008D948 -/* 08E53C 8008D93C 00000000 */ nop +/* 08E53C 8008D93C 00000000 */ nop /* 08E540 8008D940 A48000B2 */ sh $zero, 0xb2($a0) /* 08E544 8008D944 848200B2 */ lh $v0, 0xb2($a0) .L8008D948: @@ -1074,12 +1074,12 @@ glabel func_8008D8B4 /* 08E55C 8008D95C 51410004 */ beql $t2, $at, .L8008D970 /* 08E560 8008D960 8FBF0014 */ lw $ra, 0x14($sp) /* 08E564 8008D964 0C02365F */ jal func_8008D97C -/* 08E568 8008D968 00000000 */ nop +/* 08E568 8008D968 00000000 */ nop /* 08E56C 8008D96C 8FBF0014 */ lw $ra, 0x14($sp) .L8008D970: /* 08E570 8008D970 27BD0018 */ addiu $sp, $sp, 0x18 /* 08E574 8008D974 03E00008 */ jr $ra -/* 08E578 8008D978 00000000 */ nop +/* 08E578 8008D978 00000000 */ nop glabel func_8008D97C /* 08E57C 8008D97C 8C8F00BC */ lw $t7, 0xbc($a0) @@ -1110,7 +1110,7 @@ glabel func_8008D9C0 /* 08E5D8 8008D9D8 E4880DA0 */ swc1 $f8, 0xda0($a0) /* 08E5DC 8008D9DC C48A0DA0 */ lwc1 $f10, 0xda0($a0) /* 08E5E0 8008D9E0 460A003E */ c.le.s $f0, $f10 -/* 08E5E4 8008D9E4 00000000 */ nop +/* 08E5E4 8008D9E4 00000000 */ nop /* 08E5E8 8008D9E8 45020003 */ bc1fl .L8008D9F8 /* 08E5EC 8008D9EC 848E0D98 */ lh $t6, 0xd98($a0) /* 08E5F0 8008D9F0 E4800DA0 */ swc1 $f0, 0xda0($a0) @@ -1127,7 +1127,7 @@ glabel func_8008D9C0 /* 08E618 8008DA18 C428F568 */ lwc1 $f8, %lo(D_800EF568)($at) /* 08E61C 8008DA1C C4860D9C */ lwc1 $f6, 0xd9c($a0) /* 08E620 8008DA20 4606403E */ c.le.s $f8, $f6 -/* 08E624 8008DA24 00000000 */ nop +/* 08E624 8008DA24 00000000 */ nop /* 08E628 8008DA28 4502000C */ bc1fl .L8008DA5C /* 08E62C 8008DA2C 84990D98 */ lh $t9, 0xd98($a0) /* 08E630 8008DA30 848F0D98 */ lh $t7, 0xd98($a0) @@ -1135,16 +1135,16 @@ glabel func_8008D9C0 /* 08E638 8008DA38 3C014120 */ li $at, 0x41200000 # 10.000000 /* 08E63C 8008DA3C 01E20019 */ multu $t7, $v0 /* 08E640 8008DA40 44815000 */ mtc1 $at, $f10 -/* 08E644 8008DA44 00000000 */ nop +/* 08E644 8008DA44 00000000 */ nop /* 08E648 8008DA48 E48A0DA0 */ swc1 $f10, 0xda0($a0) /* 08E64C 8008DA4C 0000C012 */ mflo $t8 /* 08E650 8008DA50 A4980D98 */ sh $t8, 0xd98($a0) -/* 08E654 8008DA54 00000000 */ nop +/* 08E654 8008DA54 00000000 */ nop /* 08E658 8008DA58 84990D98 */ lh $t9, 0xd98($a0) .L8008DA5C: /* 08E65C 8008DA5C 2402FFFF */ li $v0, -1 /* 08E660 8008DA60 14590014 */ bne $v0, $t9, .L8008DAB4 -/* 08E664 8008DA64 00000000 */ nop +/* 08E664 8008DA64 00000000 */ nop /* 08E668 8008DA68 C4900D9C */ lwc1 $f16, 0xd9c($a0) /* 08E66C 8008DA6C C4920DA0 */ lwc1 $f18, 0xda0($a0) /* 08E670 8008DA70 3C01800F */ lui $at, %hi(D_800EF56C) # $at, 0x800f @@ -1153,9 +1153,9 @@ glabel func_8008D9C0 /* 08E67C 8008DA7C C4880D9C */ lwc1 $f8, 0xd9c($a0) /* 08E680 8008DA80 C426F56C */ lwc1 $f6, %lo(D_800EF56C)($at) /* 08E684 8008DA84 4606403E */ c.le.s $f8, $f6 -/* 08E688 8008DA88 00000000 */ nop +/* 08E688 8008DA88 00000000 */ nop /* 08E68C 8008DA8C 45000009 */ bc1f .L8008DAB4 -/* 08E690 8008DA90 00000000 */ nop +/* 08E690 8008DA90 00000000 */ nop /* 08E694 8008DA94 84880D98 */ lh $t0, 0xd98($a0) /* 08E698 8008DA98 3C014120 */ li $at, 0x41200000 # 10.000000 /* 08E69C 8008DA9C 44815000 */ mtc1 $at, $f10 @@ -1163,10 +1163,10 @@ glabel func_8008D9C0 /* 08E6A4 8008DAA4 E48A0DA0 */ swc1 $f10, 0xda0($a0) /* 08E6A8 8008DAA8 00004812 */ mflo $t1 /* 08E6AC 8008DAAC A4890D98 */ sh $t1, 0xd98($a0) -/* 08E6B0 8008DAB0 00000000 */ nop +/* 08E6B0 8008DAB0 00000000 */ nop .L8008DAB4: /* 08E6B4 8008DAB4 03E00008 */ jr $ra -/* 08E6B8 8008DAB8 00000000 */ nop +/* 08E6B8 8008DAB8 00000000 */ nop glabel func_8008DABC /* 08E6BC 8008DABC 27BDFFE8 */ addiu $sp, $sp, -0x18 @@ -1255,7 +1255,7 @@ glabel func_8008DABC /* 08E7F8 8008DBF8 8FBF0014 */ lw $ra, 0x14($sp) /* 08E7FC 8008DBFC 27BD0018 */ addiu $sp, $sp, 0x18 /* 08E800 8008DC00 03E00008 */ jr $ra -/* 08E804 8008DC04 00000000 */ nop +/* 08E804 8008DC04 00000000 */ nop glabel func_8008DC08 /* 08E808 8008DC08 27BDFFE8 */ addiu $sp, $sp, -0x18 @@ -1401,7 +1401,7 @@ glabel func_8008DC08 /* 08EA14 8008DE14 E4D00DA0 */ swc1 $f16, 0xda0($a2) /* 08EA18 8008DE18 C4C00DA0 */ lwc1 $f0, 0xda0($a2) /* 08EA1C 8008DE1C 4600103E */ c.le.s $f2, $f0 -/* 08EA20 8008DE20 00000000 */ nop +/* 08EA20 8008DE20 00000000 */ nop /* 08EA24 8008DE24 45020004 */ bc1fl .L8008DE38 /* 08EA28 8008DE28 C4D20D9C */ lwc1 $f18, 0xd9c($a2) /* 08EA2C 8008DE2C E4C20DA0 */ swc1 $f2, 0xda0($a2) @@ -1414,7 +1414,7 @@ glabel func_8008DC08 /* 08EA44 8008DE44 C428F578 */ lwc1 $f8, %lo(D_800EF578)($at) /* 08EA48 8008DE48 C4C60D9C */ lwc1 $f6, 0xd9c($a2) /* 08EA4C 8008DE4C 4606403E */ c.le.s $f8, $f6 -/* 08EA50 8008DE50 00000000 */ nop +/* 08EA50 8008DE50 00000000 */ nop /* 08EA54 8008DE54 4502004D */ bc1fl .L8008DF8C /* 08EA58 8008DE58 8FBF0014 */ lw $ra, 0x14($sp) /* 08EA5C 8008DE5C 1000004A */ b .L8008DF88 @@ -1502,7 +1502,7 @@ glabel func_8008DC08 .L8008DF8C: /* 08EB8C 8008DF8C 27BD0018 */ addiu $sp, $sp, 0x18 /* 08EB90 8008DF90 03E00008 */ jr $ra -/* 08EB94 8008DF94 00000000 */ nop +/* 08EB94 8008DF94 00000000 */ nop glabel func_8008DF98 /* 08EB98 8008DF98 27BDFFE0 */ addiu $sp, $sp, -0x20 @@ -1553,7 +1553,7 @@ glabel func_8008DF98 /* 08EC4C 8008E04C 4600218D */ trunc.w.s $f6, $f4 /* 08EC50 8008E050 00791021 */ addu $v0, $v1, $t9 /* 08EC54 8008E054 440D3000 */ mfc1 $t5, $f6 -/* 08EC58 8008E058 00000000 */ nop +/* 08EC58 8008E058 00000000 */ nop /* 08EC5C 8008E05C AC2DD930 */ sw $t5, %lo(D_8018D930)($at) # -0x26d0($at) /* 08EC60 8008E060 860F002E */ lh $t7, 0x2e($s0) /* 08EC64 8008E064 A61800B2 */ sh $t8, 0xb2($s0) @@ -1584,7 +1584,7 @@ glabel func_8008DF98 /* 08ECC8 8008E0C8 0C03243D */ jal func_800C90F4 /* 08ECCC 8008E0CC 01412821 */ addu $a1, $t2, $at /* 08ECD0 8008E0D0 10000003 */ b .L8008E0E0 -/* 08ECD4 8008E0D4 00000000 */ nop +/* 08ECD4 8008E0D4 00000000 */ nop .L8008E0D8: /* 08ECD8 8008E0D8 0C00263F */ jal func_800098FC /* 08ECDC 8008E0DC 02202025 */ move $a0, $s1 @@ -1721,7 +1721,7 @@ glabel func_8008E118 /* 08EECC 8008E2CC 3C012900 */ lui $at, (0x29008005 >> 16) # lui $at, 0x2900 /* 08EED0 8008E2D0 316C4000 */ andi $t4, $t3, 0x4000 /* 08EED4 8008E2D4 11800009 */ beqz $t4, .L8008E2FC -/* 08EED8 8008E2D8 00000000 */ nop +/* 08EED8 8008E2D8 00000000 */ nop /* 08EEDC 8008E2DC 96050254 */ lhu $a1, 0x254($s0) /* 08EEE0 8008E2E0 34218005 */ ori $at, (0x29008005 & 0xFFFF) # ori $at, $at, 0x8005 /* 08EEE4 8008E2E4 A3A60027 */ sb $a2, 0x27($sp) @@ -1755,7 +1755,7 @@ glabel func_8008E118 /* 08EF50 8008E350 462042A0 */ cvt.s.d $f10, $f8 /* 08EF54 8008E354 44055000 */ mfc1 $a1, $f10 /* 08EF58 8008E358 0C008973 */ jal func_800225CC -/* 08EF5C 8008E35C 00000000 */ nop +/* 08EF5C 8008E35C 00000000 */ nop /* 08EF60 8008E360 10000013 */ b .L8008E3B0 /* 08EF64 8008E364 8FBF001C */ lw $ra, 0x1c($sp) .L8008E368: @@ -1782,7 +1782,7 @@ glabel func_8008E118 /* 08EFB0 8008E3B0 8FB00018 */ lw $s0, 0x18($sp) /* 08EFB4 8008E3B4 27BD0020 */ addiu $sp, $sp, 0x20 /* 08EFB8 8008E3B8 03E00008 */ jr $ra -/* 08EFBC 8008E3BC 00000000 */ nop +/* 08EFBC 8008E3BC 00000000 */ nop glabel func_8008E3C0 /* 08EFC0 8008E3C0 27BDFFE8 */ addiu $sp, $sp, -0x18 @@ -1842,7 +1842,7 @@ glabel func_8008E3C0 /* 08F094 8008E494 8FBF0014 */ lw $ra, 0x14($sp) /* 08F098 8008E498 27BD0018 */ addiu $sp, $sp, 0x18 /* 08F09C 8008E49C 03E00008 */ jr $ra -/* 08F0A0 8008E4A0 00000000 */ nop +/* 08F0A0 8008E4A0 00000000 */ nop glabel func_8008E4A4 /* 08F0A4 8008E4A4 27BDFFE8 */ addiu $sp, $sp, -0x18 @@ -1918,7 +1918,7 @@ glabel func_8008E4A4 /* 08F1B4 8008E5B4 54D8003F */ bnel $a2, $t8, .L8008E6B4 /* 08F1B8 8008E5B8 8FBF0014 */ lw $ra, 0x14($sp) /* 08F1BC 8008E5BC 0C01AE2D */ jal func_8006B8B4 -/* 08F1C0 8008E5C0 00000000 */ nop +/* 08F1C0 8008E5C0 00000000 */ nop /* 08F1C4 8008E5C4 1000003B */ b .L8008E6B4 /* 08F1C8 8008E5C8 8FBF0014 */ lw $ra, 0x14($sp) .L8008E5CC: @@ -1987,7 +1987,7 @@ glabel func_8008E4A4 .L8008E6B4: /* 08F2B4 8008E6B4 27BD0018 */ addiu $sp, $sp, 0x18 /* 08F2B8 8008E6B8 03E00008 */ jr $ra -/* 08F2BC 8008E6BC 00000000 */ nop +/* 08F2BC 8008E6BC 00000000 */ nop glabel func_8008E6C0 /* 08F2C0 8008E6C0 27BDFFD8 */ addiu $sp, $sp, -0x28 @@ -2191,7 +2191,7 @@ glabel func_8008E8D8 /* 08F5B0 8008E9B0 8D6B5460 */ lw $t3, %lo(D_80165460)($t3) # 0x5460($t3) /* 08F5B4 8008E9B4 3C0E800E */ lui $t6, %hi(gModeSelection) # $t6, 0x800e /* 08F5B8 8008E9B8 146B000A */ bne $v1, $t3, .L8008E9E4 -/* 08F5BC 8008E9BC 00000000 */ nop +/* 08F5BC 8008E9BC 00000000 */ nop /* 08F5C0 8008E9C0 948C0000 */ lhu $t4, ($a0) /* 08F5C4 8008E9C4 24014000 */ li $at, 16384 /* 08F5C8 8008E9C8 318D4000 */ andi $t5, $t4, 0x4000 @@ -2207,7 +2207,7 @@ glabel func_8008E8D8 /* 08F5EC 8008E9EC 55C10039 */ bnel $t6, $at, .L8008EAD4 /* 08F5F0 8008E9F0 8FBF0014 */ lw $ra, 0x14($sp) /* 08F5F4 8008E9F4 0C01AE2D */ jal func_8006B8B4 -/* 08F5F8 8008E9F8 00000000 */ nop +/* 08F5F8 8008E9F8 00000000 */ nop /* 08F5FC 8008E9FC 10000035 */ b .L8008EAD4 /* 08F600 8008EA00 8FBF0014 */ lw $ra, 0x14($sp) .L8008EA04: @@ -2246,7 +2246,7 @@ glabel func_8008E8D8 /* 08F684 8008EA84 8F185460 */ lw $t8, %lo(D_80165460)($t8) # 0x5460($t8) /* 08F688 8008EA88 3C09800E */ lui $t1, %hi(gModeSelection) # $t1, 0x800e /* 08F68C 8008EA8C 1478000A */ bne $v1, $t8, .L8008EAB8 -/* 08F690 8008EA90 00000000 */ nop +/* 08F690 8008EA90 00000000 */ nop /* 08F694 8008EA94 94990000 */ lhu $t9, ($a0) /* 08F698 8008EA98 24014000 */ li $at, 16384 /* 08F69C 8008EA9C 33284000 */ andi $t0, $t9, 0x4000 @@ -2262,13 +2262,13 @@ glabel func_8008E8D8 /* 08F6C0 8008EAC0 55210004 */ bnel $t1, $at, .L8008EAD4 /* 08F6C4 8008EAC4 8FBF0014 */ lw $ra, 0x14($sp) /* 08F6C8 8008EAC8 0C01AE2D */ jal func_8006B8B4 -/* 08F6CC 8008EACC 00000000 */ nop +/* 08F6CC 8008EACC 00000000 */ nop .L8008EAD0: /* 08F6D0 8008EAD0 8FBF0014 */ lw $ra, 0x14($sp) .L8008EAD4: /* 08F6D4 8008EAD4 27BD0018 */ addiu $sp, $sp, 0x18 /* 08F6D8 8008EAD8 03E00008 */ jr $ra -/* 08F6DC 8008EADC 00000000 */ nop +/* 08F6DC 8008EADC 00000000 */ nop glabel func_8008EAE0 /* 08F6E0 8008EAE0 27BDFFD8 */ addiu $sp, $sp, -0x28 @@ -2411,9 +2411,9 @@ glabel func_8008EC88 /* 08F8EC 8008ECEC E6040DBC */ swc1 $f4, 0xdbc($s0) /* 08F8F0 8008ECF0 954AF890 */ lhu $t2, %lo(D_8015F890)($t2) /* 08F8F4 8008ECF4 24010001 */ li $at, 1 -/* 08F8F8 8008ECF8 3C0E800E */ lui $t6, %hi(D_800DC4DC) # $t6, 0x800e +/* 08F8F8 8008ECF8 3C0E800E */ lui $t6, %hi(gPlayerOne) # $t6, 0x800e /* 08F8FC 8008ECFC 11410015 */ beq $t2, $at, .L8008ED54 -/* 08F900 8008ED00 00000000 */ nop +/* 08F900 8008ED00 00000000 */ nop /* 08F904 8008ED04 96020000 */ lhu $v0, ($s0) /* 08F908 8008ED08 24014000 */ li $at, 16384 /* 08F90C 8008ED0C 304B4000 */ andi $t3, $v0, 0x4000 @@ -2435,7 +2435,7 @@ glabel func_8008EC88 /* 08F94C 8008ED4C 10000011 */ b .L8008ED94 /* 08F950 8008ED50 86180044 */ lh $t8, 0x44($s0) .L8008ED54: -/* 08F954 8008ED54 8DCEC4DC */ lw $t6, %lo(D_800DC4DC)($t6) +/* 08F954 8008ED54 8DCEC4DC */ lw $t6, %lo(gPlayerOne)($t6) /* 08F958 8008ED58 30C400FF */ andi $a0, $a2, 0xff /* 08F95C 8008ED5C 3C012900 */ lui $at, (0x29008001 >> 16) # lui $at, 0x2900 /* 08F960 8008ED60 560E000C */ bnel $s0, $t6, .L8008ED94 @@ -2463,7 +2463,7 @@ glabel func_8008EC88 /* 08F9B0 8008EDB0 8FB00018 */ lw $s0, 0x18($sp) /* 08F9B4 8008EDB4 27BD0028 */ addiu $sp, $sp, 0x28 /* 08F9B8 8008EDB8 03E00008 */ jr $ra -/* 08F9BC 8008EDBC 00000000 */ nop +/* 08F9BC 8008EDBC 00000000 */ nop glabel func_8008EDC0 /* 08F9C0 8008EDC0 27BDFFE8 */ addiu $sp, $sp, -0x18 @@ -2474,7 +2474,7 @@ glabel func_8008EDC0 /* 08F9D4 8008EDD4 19C00004 */ blez $t6, .L8008EDE8 /* 08F9D8 8008EDD8 E484009C */ swc1 $f4, 0x9c($a0) /* 08F9DC 8008EDDC 44803000 */ mtc1 $zero, $f6 -/* 08F9E0 8008EDE0 00000000 */ nop +/* 08F9E0 8008EDE0 00000000 */ nop /* 08F9E4 8008EDE4 E486009C */ swc1 $f6, 0x9c($a0) .L8008EDE8: /* 08F9E8 8008EDE8 94EF00F8 */ lhu $t7, 0xf8($a3) @@ -2508,7 +2508,7 @@ glabel func_8008EDC0 /* 08FA4C 8008EE4C 3C01FFEF */ lui $at, (0xFFEFFFFF >> 16) # lui $at, 0xffef /* 08FA50 8008EE50 3421FFFF */ ori $at, (0xFFEFFFFF & 0xFFFF) # ori $at, $at, 0xffff /* 08FA54 8008EE54 4608503E */ c.le.s $f10, $f8 -/* 08FA58 8008EE58 00000000 */ nop +/* 08FA58 8008EE58 00000000 */ nop /* 08FA5C 8008EE5C 45020016 */ bc1fl .L8008EEB8 /* 08FA60 8008EE60 8FBF0014 */ lw $ra, 0x14($sp) /* 08FA64 8008EE64 8CE800BC */ lw $t0, 0xbc($a3) @@ -2536,7 +2536,7 @@ glabel func_8008EDC0 .L8008EEB8: /* 08FAB8 8008EEB8 27BD0018 */ addiu $sp, $sp, 0x18 /* 08FABC 8008EEBC 03E00008 */ jr $ra -/* 08FAC0 8008EEC0 00000000 */ nop +/* 08FAC0 8008EEC0 00000000 */ nop glabel func_8008EEC4 /* 08FAC4 8008EEC4 8C8E00BC */ lw $t6, 0xbc($a0) @@ -2572,9 +2572,9 @@ glabel func_8008EEE4 /* 08FB34 8008EF34 3C0A8016 */ lui $t2, %hi(D_8015F890) # $t2, 0x8016 /* 08FB38 8008EF38 954AF890 */ lhu $t2, %lo(D_8015F890)($t2) /* 08FB3C 8008EF3C 24010001 */ li $at, 1 -/* 08FB40 8008EF40 3C0E800E */ lui $t6, %hi(D_800DC4DC) # $t6, 0x800e +/* 08FB40 8008EF40 3C0E800E */ lui $t6, %hi(gPlayerOne) # $t6, 0x800e /* 08FB44 8008EF44 11410015 */ beq $t2, $at, .L8008EF9C -/* 08FB48 8008EF48 00000000 */ nop +/* 08FB48 8008EF48 00000000 */ nop /* 08FB4C 8008EF4C 96020000 */ lhu $v0, ($s0) /* 08FB50 8008EF50 24014000 */ li $at, 16384 /* 08FB54 8008EF54 304B4000 */ andi $t3, $v0, 0x4000 @@ -2596,7 +2596,7 @@ glabel func_8008EEE4 /* 08FB94 8008EF94 10000011 */ b .L8008EFDC /* 08FB98 8008EF98 86180044 */ lh $t8, 0x44($s0) .L8008EF9C: -/* 08FB9C 8008EF9C 8DCEC4DC */ lw $t6, %lo(D_800DC4DC)($t6) +/* 08FB9C 8008EF9C 8DCEC4DC */ lw $t6, %lo(gPlayerOne)($t6) /* 08FBA0 8008EFA0 30C400FF */ andi $a0, $a2, 0xff /* 08FBA4 8008EFA4 3C012900 */ lui $at, (0x29008001 >> 16) # lui $at, 0x2900 /* 08FBA8 8008EFA8 560E000C */ bnel $s0, $t6, .L8008EFDC @@ -2624,7 +2624,7 @@ glabel func_8008EEE4 /* 08FBF8 8008EFF8 8FB00018 */ lw $s0, 0x18($sp) /* 08FBFC 8008EFFC 27BD0028 */ addiu $sp, $sp, 0x28 /* 08FC00 8008F000 03E00008 */ jr $ra -/* 08FC04 8008F004 00000000 */ nop +/* 08FC04 8008F004 00000000 */ nop glabel func_8008F008 /* 08FC08 8008F008 27BDFFE8 */ addiu $sp, $sp, -0x18 @@ -2665,7 +2665,7 @@ glabel func_8008F008 /* 08FC8C 8008F08C C4E80080 */ lwc1 $f8, 0x80($a3) /* 08FC90 8008F090 3C014000 */ li $at, 0x40000000 # 2.000000 /* 08FC94 8008F094 4606403E */ c.le.s $f8, $f6 -/* 08FC98 8008F098 00000000 */ nop +/* 08FC98 8008F098 00000000 */ nop /* 08FC9C 8008F09C 4502000F */ bc1fl .L8008F0DC /* 08FCA0 8008F0A0 8FBF0014 */ lw $ra, 0x14($sp) /* 08FCA4 8008F0A4 44810000 */ mtc1 $at, $f0 @@ -2685,7 +2685,7 @@ glabel func_8008F008 .L8008F0DC: /* 08FCDC 8008F0DC 27BD0018 */ addiu $sp, $sp, 0x18 /* 08FCE0 8008F0E0 03E00008 */ jr $ra -/* 08FCE4 8008F0E4 00000000 */ nop +/* 08FCE4 8008F0E4 00000000 */ nop glabel func_8008F0E8 /* 08FCE8 8008F0E8 8C8E00BC */ lw $t6, 0xbc($a0) @@ -2742,7 +2742,7 @@ glabel func_8008F104 /* 08FDA8 8008F1A8 8FBF0014 */ lw $ra, 0x14($sp) /* 08FDAC 8008F1AC 27BD0018 */ addiu $sp, $sp, 0x18 /* 08FDB0 8008F1B0 03E00008 */ jr $ra -/* 08FDB4 8008F1B4 00000000 */ nop +/* 08FDB4 8008F1B4 00000000 */ nop glabel func_8008F1B8 /* 08FDB8 8008F1B8 AFA50004 */ sw $a1, 4($sp) @@ -2891,7 +2891,7 @@ glabel func_8008F1B8 /* 08FFD4 8008F3D4 A48E0044 */ sh $t6, 0x44($a0) .L8008F3D8: /* 08FFD8 8008F3D8 03E00008 */ jr $ra -/* 08FFDC 8008F3DC 00000000 */ nop +/* 08FFDC 8008F3DC 00000000 */ nop glabel func_8008F3E0 /* 08FFE0 8008F3E0 8C8E00BC */ lw $t6, 0xbc($a0) @@ -2942,7 +2942,7 @@ glabel func_8008F3F4 .L8008F488: /* 090088 8008F488 27BD0018 */ addiu $sp, $sp, 0x18 /* 09008C 8008F48C 03E00008 */ jr $ra -/* 090090 8008F490 00000000 */ nop +/* 090090 8008F490 00000000 */ nop glabel func_8008F494 /* 090094 8008F494 27BDFFE8 */ addiu $sp, $sp, -0x18 @@ -3017,7 +3017,7 @@ glabel func_8008F494 .L8008F598: /* 090198 8008F598 27BD0018 */ addiu $sp, $sp, 0x18 /* 09019C 8008F59C 03E00008 */ jr $ra -/* 0901A0 8008F5A0 00000000 */ nop +/* 0901A0 8008F5A0 00000000 */ nop glabel func_8008F5A4 /* 0901A4 8008F5A4 27BDFFE8 */ addiu $sp, $sp, -0x18 @@ -3063,7 +3063,7 @@ glabel func_8008F5A4 /* 090240 8008F640 8FBF0014 */ lw $ra, 0x14($sp) /* 090244 8008F644 27BD0018 */ addiu $sp, $sp, 0x18 /* 090248 8008F648 03E00008 */ jr $ra -/* 09024C 8008F64C 00000000 */ nop +/* 09024C 8008F64C 00000000 */ nop glabel func_8008F650 /* 090250 8008F650 3C01800E */ lui $at, %hi(gCourseTimer) # $at, 0x800e @@ -3129,7 +3129,7 @@ glabel func_8008F650 /* 090338 8008F738 8CED0000 */ lw $t5, ($a3) /* 09033C 8008F73C 4600848D */ trunc.w.s $f18, $f16 /* 090340 8008F740 440C9000 */ mfc1 $t4, $f18 -/* 090344 8008F744 00000000 */ nop +/* 090344 8008F744 00000000 */ nop /* 090348 8008F748 018D1823 */ subu $v1, $t4, $t5 .L8008F74C: /* 09034C 8008F74C 2861000A */ slti $at, $v1, 0xa @@ -3144,7 +3144,7 @@ glabel func_8008F650 /* 090368 8008F768 8FBF0014 */ lw $ra, 0x14($sp) /* 09036C 8008F76C 27BD0028 */ addiu $sp, $sp, 0x28 /* 090370 8008F770 03E00008 */ jr $ra -/* 090374 8008F774 00000000 */ nop +/* 090374 8008F774 00000000 */ nop glabel func_8008F778 /* 090378 8008F778 27BDFFE0 */ addiu $sp, $sp, -0x20 @@ -3211,7 +3211,7 @@ glabel func_8008F778 .L8008F860: /* 090460 8008F860 27BD0020 */ addiu $sp, $sp, 0x20 /* 090464 8008F864 03E00008 */ jr $ra -/* 090468 8008F868 00000000 */ nop +/* 090468 8008F868 00000000 */ nop glabel func_8008F86C /* 09046C 8008F86C 27BDFFE8 */ addiu $sp, $sp, -0x18 @@ -3231,7 +3231,7 @@ glabel func_8008F86C /* 0904A4 8008F8A4 30490100 */ andi $t1, $v0, 0x100 /* 0904A8 8008F8A8 24010100 */ li $at, 256 /* 0904AC 8008F8AC 11210005 */ beq $t1, $at, .L8008F8C4 -/* 0904B0 8008F8B0 00000000 */ nop +/* 0904B0 8008F8B0 00000000 */ nop /* 0904B4 8008F8B4 0C0329CC */ jal func_800CA730 /* 0904B8 8008F8B8 31E400FF */ andi $a0, $t7, 0xff /* 0904BC 8008F8BC 10000004 */ b .L8008F8D0 @@ -3243,7 +3243,7 @@ glabel func_8008F86C .L8008F8D0: /* 0904D0 8008F8D0 27BD0018 */ addiu $sp, $sp, 0x18 /* 0904D4 8008F8D4 03E00008 */ jr $ra -/* 0904D8 8008F8D8 00000000 */ nop +/* 0904D8 8008F8D8 00000000 */ nop glabel func_8008F8DC /* 0904DC 8008F8DC 3C01800E */ lui $at, %hi(gCourseTimer) # $at, 0x800e @@ -3336,7 +3336,7 @@ glabel func_8008F8DC /* 090628 8008FA28 8FBF0014 */ lw $ra, 0x14($sp) /* 09062C 8008FA2C 27BD0020 */ addiu $sp, $sp, 0x20 /* 090630 8008FA30 03E00008 */ jr $ra -/* 090634 8008FA34 00000000 */ nop +/* 090634 8008FA34 00000000 */ nop glabel func_8008FA38 /* 090638 8008FA38 27BDFFE8 */ addiu $sp, $sp, -0x18 @@ -3388,7 +3388,7 @@ glabel func_8008FA38 /* 0906E8 8008FAE8 4600218D */ trunc.w.s $f6, $f4 /* 0906EC 8008FAEC 240900FF */ li $t1, 255 /* 0906F0 8008FAF0 44083000 */ mfc1 $t0, $f6 -/* 0906F4 8008FAF4 00000000 */ nop +/* 0906F4 8008FAF4 00000000 */ nop /* 0906F8 8008FAF8 AC28D950 */ sw $t0, %lo(D_8018D950)($at) # -0x26b0($at) /* 0906FC 8008FAFC 3C018019 */ lui $at, %hi(D_8018D970) # 0x8019 /* 090700 8008FB00 00220821 */ addu $at, $at, $v0 @@ -3403,7 +3403,7 @@ glabel func_8008FA38 .L8008FB24: /* 090724 8008FB24 27BD0018 */ addiu $sp, $sp, 0x18 /* 090728 8008FB28 03E00008 */ jr $ra -/* 09072C 8008FB2C 00000000 */ nop +/* 09072C 8008FB2C 00000000 */ nop glabel func_8008FB30 /* 090730 8008FB30 27BDFFE8 */ addiu $sp, $sp, -0x18 @@ -3466,7 +3466,7 @@ glabel func_8008FB30 /* 09080C 8008FC0C 8FBF0014 */ lw $ra, 0x14($sp) /* 090810 8008FC10 27BD0018 */ addiu $sp, $sp, 0x18 /* 090814 8008FC14 03E00008 */ jr $ra -/* 090818 8008FC18 00000000 */ nop +/* 090818 8008FC18 00000000 */ nop glabel func_8008FC1C /* 09081C 8008FC1C 27BDFFE8 */ addiu $sp, $sp, -0x18 @@ -3476,7 +3476,7 @@ glabel func_8008FC1C /* 09082C 8008FC2C 31CF0040 */ andi $t7, $t6, 0x40 /* 090830 8008FC30 51E00009 */ beql $t7, $zero, .L8008FC58 /* 090834 8008FC34 8FBF0014 */ lw $ra, 0x14($sp) -/* 090838 8008FC38 0C009F40 */ jal func_80027D00 +/* 090838 8008FC38 0C009F40 */ jal get_player_index_for_player /* 09083C 8008FC3C AFA50018 */ sw $a1, 0x18($sp) /* 090840 8008FC40 8FA50018 */ lw $a1, 0x18($sp) /* 090844 8008FC44 24187000 */ li $t8, 28672 @@ -3487,7 +3487,7 @@ glabel func_8008FC1C .L8008FC58: /* 090858 8008FC58 27BD0018 */ addiu $sp, $sp, 0x18 /* 09085C 8008FC5C 03E00008 */ jr $ra -/* 090860 8008FC60 00000000 */ nop +/* 090860 8008FC60 00000000 */ nop glabel func_8008FC64 /* 090864 8008FC64 27BDFFE8 */ addiu $sp, $sp, -0x18 @@ -3520,7 +3520,7 @@ glabel func_8008FC64 .L8008FCD0: /* 0908D0 8008FCD0 27BD0018 */ addiu $sp, $sp, 0x18 /* 0908D4 8008FCD4 03E00008 */ jr $ra -/* 0908D8 8008FCD8 00000000 */ nop +/* 0908D8 8008FCD8 00000000 */ nop glabel func_8008FCDC /* 0908DC 8008FCDC 27BDFFE8 */ addiu $sp, $sp, -0x18 @@ -3551,7 +3551,7 @@ glabel func_8008FCDC /* 09093C 8008FD3C 8FBF0014 */ lw $ra, 0x14($sp) /* 090940 8008FD40 27BD0018 */ addiu $sp, $sp, 0x18 /* 090944 8008FD44 03E00008 */ jr $ra -/* 090948 8008FD48 00000000 */ nop +/* 090948 8008FD48 00000000 */ nop glabel func_8008FD4C /* 09094C 8008FD4C AFA50004 */ sw $a1, 4($sp) @@ -3577,7 +3577,7 @@ glabel func_8008FD4C /* 090998 8008FD98 1420FFF6 */ bnez $at, .L8008FD74 /* 09099C 8008FD9C A460026A */ sh $zero, 0x26a($v1) /* 0909A0 8008FDA0 03E00008 */ jr $ra -/* 0909A4 8008FDA4 00000000 */ nop +/* 0909A4 8008FDA4 00000000 */ nop glabel func_8008FDA8 /* 0909A8 8008FDA8 AFA50004 */ sw $a1, 4($sp) @@ -3599,7 +3599,7 @@ glabel func_8008FDA8 /* 0909E4 8008FDE4 1420FFF6 */ bnez $at, .L8008FDC0 /* 0909E8 8008FDE8 A460026A */ sh $zero, 0x26a($v1) /* 0909EC 8008FDEC 03E00008 */ jr $ra -/* 0909F0 8008FDF0 00000000 */ nop +/* 0909F0 8008FDF0 00000000 */ nop /* 0909F4 8008FDF4 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 0909F8 8008FDF8 AFBF0014 */ sw $ra, 0x14($sp) @@ -3636,7 +3636,7 @@ glabel func_8008FDA8 /* 090A74 8008FE74 8FBF0014 */ lw $ra, 0x14($sp) /* 090A78 8008FE78 27BD0018 */ addiu $sp, $sp, 0x18 /* 090A7C 8008FE7C 03E00008 */ jr $ra -/* 090A80 8008FE80 00000000 */ nop +/* 090A80 8008FE80 00000000 */ nop /* 090A84 8008FE84 AFA50004 */ sw $a1, 4($sp) /* 090A88 8008FE88 8C8E00BC */ lw $t6, 0xbc($a0) @@ -3660,7 +3660,7 @@ glabel func_8008FDA8 /* 090AD0 8008FED0 E48A008C */ swc1 $f10, 0x8c($a0) .L8008FED4: /* 090AD4 8008FED4 03E00008 */ jr $ra -/* 090AD8 8008FED8 00000000 */ nop +/* 090AD8 8008FED8 00000000 */ nop glabel func_8008FEDC /* 090ADC 8008FEDC AFA50004 */ sw $a1, 4($sp) @@ -3689,7 +3689,7 @@ glabel func_8008FF08 /* 090B30 8008FF30 00390821 */ addu $at, $at, $t9 /* 090B34 8008FF34 8C39F5B0 */ lw $t9, %lo(jpt_800EF5B0)($at) /* 090B38 8008FF38 03200008 */ jr $t9 -/* 090B3C 8008FF3C 00000000 */ nop +/* 090B3C 8008FF3C 00000000 */ nop glabel L8008FF40 /* 090B40 8008FF40 00054040 */ sll $t0, $a1, 1 /* 090B44 8008FF44 3C038016 */ lui $v1, %hi(D_80164438) # 0x8016 @@ -3720,7 +3720,7 @@ glabel L8008FF40 /* 090B98 8008FF98 84820220 */ lh $v0, 0x220($a0) /* 090B9C 8008FF9C 3C0C8016 */ lui $t4, %hi(D_801645C8) # $t4, 0x8016 /* 090BA0 8008FFA0 04410073 */ bgez $v0, .L80090170 -/* 090BA4 8008FFA4 00000000 */ nop +/* 090BA4 8008FFA4 00000000 */ nop /* 090BA8 8008FFA8 958C45C8 */ lhu $t4, %lo(D_801645C8)($t4) /* 090BAC 8008FFAC 01826821 */ addu $t5, $t4, $v0 /* 090BB0 8008FFB0 03E00008 */ jr $ra @@ -3746,7 +3746,7 @@ glabel L8008FFB8 /* 090BF0 8008FFF0 84820220 */ lh $v0, 0x220($a0) /* 090BF4 8008FFF4 3C198016 */ lui $t9, %hi(D_801645C8) # $t9, 0x8016 /* 090BF8 8008FFF8 0441005D */ bgez $v0, .L80090170 -/* 090BFC 8008FFFC 00000000 */ nop +/* 090BFC 8008FFFC 00000000 */ nop /* 090C00 80090000 973945C8 */ lhu $t9, %lo(D_801645C8)($t9) /* 090C04 80090004 03224021 */ addu $t0, $t9, $v0 /* 090C08 80090008 03E00008 */ jr $ra @@ -3781,7 +3781,7 @@ glabel L80090028 /* 090C64 80090064 A48C0220 */ sh $t4, 0x220($a0) /* 090C68 80090068 84820220 */ lh $v0, 0x220($a0) /* 090C6C 8009006C 04410040 */ bgez $v0, .L80090170 -/* 090C70 80090070 00000000 */ nop +/* 090C70 80090070 00000000 */ nop /* 090C74 80090074 95AD45C8 */ lhu $t5, %lo(D_801645C8)($t5) /* 090C78 80090078 01A27021 */ addu $t6, $t5, $v0 /* 090C7C 8009007C 03E00008 */ jr $ra @@ -3808,7 +3808,7 @@ glabel L80090084 /* 090CC0 800900C0 A4980220 */ sh $t8, 0x220($a0) /* 090CC4 800900C4 84820220 */ lh $v0, 0x220($a0) /* 090CC8 800900C8 04410029 */ bgez $v0, .L80090170 -/* 090CCC 800900CC 00000000 */ nop +/* 090CCC 800900CC 00000000 */ nop /* 090CD0 800900D0 973945C8 */ lhu $t9, %lo(D_801645C8)($t9) /* 090CD4 800900D4 03224021 */ addu $t0, $t9, $v0 /* 090CD8 800900D8 03E00008 */ jr $ra @@ -3834,7 +3834,7 @@ glabel L800900E0 /* 090D18 80090118 84820220 */ lh $v0, 0x220($a0) /* 090D1C 8009011C 3C0C8016 */ lui $t4, %hi(D_801645C8) # $t4, 0x8016 /* 090D20 80090120 04410013 */ bgez $v0, .L80090170 -/* 090D24 80090124 00000000 */ nop +/* 090D24 80090124 00000000 */ nop /* 090D28 80090128 958C45C8 */ lhu $t4, %lo(D_801645C8)($t4) /* 090D2C 8009012C 01826821 */ addu $t5, $t4, $v0 /* 090D30 80090130 03E00008 */ jr $ra @@ -3854,13 +3854,13 @@ glabel L80090140 /* 090D54 80090154 A48F0220 */ sh $t7, 0x220($a0) /* 090D58 80090158 84820220 */ lh $v0, 0x220($a0) /* 090D5C 8009015C 04410004 */ bgez $v0, .L80090170 -/* 090D60 80090160 00000000 */ nop +/* 090D60 80090160 00000000 */ nop /* 090D64 80090164 971845C8 */ lhu $t8, %lo(D_801645C8)($t8) /* 090D68 80090168 0302C821 */ addu $t9, $t8, $v0 /* 090D6C 8009016C A4990220 */ sh $t9, 0x220($a0) .L80090170: /* 090D70 80090170 03E00008 */ jr $ra -/* 090D74 80090174 00000000 */ nop +/* 090D74 80090174 00000000 */ nop glabel func_80090178 /* 090D78 80090178 27BDFEF0 */ addiu $sp, $sp, -0x110 @@ -4053,7 +4053,7 @@ glabel func_80090178 /* 091064 80090464 002E0821 */ addu $at, $at, $t6 /* 091068 80090468 8C2EF5F8 */ lw $t6, %lo(jpt_800EF5F8)($at) /* 09106C 8009046C 01C00008 */ jr $t6 -/* 091070 80090470 00000000 */ nop +/* 091070 80090470 00000000 */ nop glabel L80090474 /* 091074 80090474 3C0F8016 */ lui $t7, %hi(D_80165310) # $t7, 0x8016 /* 091078 80090478 25EF5310 */ addiu $t7, %lo(D_80165310) # addiu $t7, $t7, 0x5310 @@ -4070,12 +4070,12 @@ glabel L80090474 /* 0910A4 800904A4 01F91821 */ addu $v1, $t7, $t9 /* 0910A8 800904A8 846E0000 */ lh $t6, ($v1) /* 0910AC 800904AC 448E2000 */ mtc1 $t6, $f4 -/* 0910B0 800904B0 00000000 */ nop +/* 0910B0 800904B0 00000000 */ nop /* 0910B4 800904B4 468021A0 */ cvt.s.w $f6, $f4 /* 0910B8 800904B8 E4C60000 */ swc1 $f6, ($a2) /* 0910BC 800904BC 84780002 */ lh $t8, 2($v1) /* 0910C0 800904C0 44984000 */ mtc1 $t8, $f8 -/* 0910C4 800904C4 00000000 */ nop +/* 0910C4 800904C4 00000000 */ nop /* 0910C8 800904C8 468042A0 */ cvt.s.w $f10, $f8 /* 0910CC 800904CC E4CA0004 */ swc1 $f10, 4($a2) /* 0910D0 800904D0 846F0004 */ lh $t7, 4($v1) @@ -4092,14 +4092,14 @@ glabel L80090474 /* 0910FC 800904FC 25F90001 */ addiu $t9, $t7, 1 /* 091100 80090500 01D9001A */ div $zero, $t6, $t9 /* 091104 80090504 17200002 */ bnez $t9, .L80090510 -/* 091108 80090508 00000000 */ nop +/* 091108 80090508 00000000 */ nop /* 09110C 8009050C 0007000D */ break 7 .L80090510: /* 091110 80090510 2401FFFF */ li $at, -1 /* 091114 80090514 17210004 */ bne $t9, $at, .L80090528 /* 091118 80090518 3C018000 */ lui $at, 0x8000 /* 09111C 8009051C 15C10002 */ bne $t6, $at, .L80090528 -/* 091120 80090520 00000000 */ nop +/* 091120 80090520 00000000 */ nop /* 091124 80090524 0006000D */ break 6 .L80090528: /* 091128 80090528 0000C010 */ mfhi $t8 @@ -4110,17 +4110,17 @@ glabel L80090474 /* 09113C 8009053C 01F81821 */ addu $v1, $t7, $t8 /* 091140 80090540 846E0000 */ lh $t6, ($v1) /* 091144 80090544 448E2000 */ mtc1 $t6, $f4 -/* 091148 80090548 00000000 */ nop +/* 091148 80090548 00000000 */ nop /* 09114C 8009054C 468021A0 */ cvt.s.w $f6, $f4 /* 091150 80090550 E4E60000 */ swc1 $f6, ($a3) /* 091154 80090554 84790002 */ lh $t9, 2($v1) /* 091158 80090558 44994000 */ mtc1 $t9, $f8 -/* 09115C 8009055C 00000000 */ nop +/* 09115C 8009055C 00000000 */ nop /* 091160 80090560 468042A0 */ cvt.s.w $f10, $f8 /* 091164 80090564 E4EA0004 */ swc1 $f10, 4($a3) /* 091168 80090568 846F0004 */ lh $t7, 4($v1) /* 09116C 8009056C 448F8000 */ mtc1 $t7, $f16 -/* 091170 80090570 00000000 */ nop +/* 091170 80090570 00000000 */ nop /* 091174 80090574 468084A0 */ cvt.s.w $f18, $f16 /* 091178 80090578 1000007D */ b .L80090770 /* 09117C 8009057C E4F20008 */ swc1 $f18, 8($a3) @@ -4208,7 +4208,7 @@ glabel L80090698 /* 0912AC 800906AC 030E1821 */ addu $v1, $t8, $t6 /* 0912B0 800906B0 84790000 */ lh $t9, ($v1) /* 0912B4 800906B4 44998000 */ mtc1 $t9, $f16 -/* 0912B8 800906B8 00000000 */ nop +/* 0912B8 800906B8 00000000 */ nop /* 0912BC 800906BC 468084A0 */ cvt.s.w $f18, $f16 /* 0912C0 800906C0 E4D20000 */ swc1 $f18, ($a2) /* 0912C4 800906C4 846F0002 */ lh $t7, 2($v1) @@ -4218,7 +4218,7 @@ glabel L80090698 /* 0912D4 800906D4 E4C60004 */ swc1 $f6, 4($a2) /* 0912D8 800906D8 84780004 */ lh $t8, 4($v1) /* 0912DC 800906DC 44984000 */ mtc1 $t8, $f8 -/* 0912E0 800906E0 00000000 */ nop +/* 0912E0 800906E0 00000000 */ nop /* 0912E4 800906E4 468042A0 */ cvt.s.w $f10, $f8 /* 0912E8 800906E8 E4CA0008 */ swc1 $f10, 8($a2) /* 0912EC 800906EC 848E0220 */ lh $t6, 0x220($a0) @@ -4227,14 +4227,14 @@ glabel L80090698 /* 0912F8 800906F8 25F80001 */ addiu $t8, $t7, 1 /* 0912FC 800906FC 0338001A */ div $zero, $t9, $t8 /* 091300 80090700 17000002 */ bnez $t8, .L8009070C -/* 091304 80090704 00000000 */ nop +/* 091304 80090704 00000000 */ nop /* 091308 80090708 0007000D */ break 7 .L8009070C: /* 09130C 8009070C 2401FFFF */ li $at, -1 /* 091310 80090710 17010004 */ bne $t8, $at, .L80090724 /* 091314 80090714 3C018000 */ lui $at, 0x8000 /* 091318 80090718 17210002 */ bne $t9, $at, .L80090724 -/* 09131C 8009071C 00000000 */ nop +/* 09131C 8009071C 00000000 */ nop /* 091320 80090720 0006000D */ break 6 .L80090724: /* 091324 80090724 8D590000 */ lw $t9, ($t2) @@ -4243,17 +4243,17 @@ glabel L80090698 /* 091330 80090730 01F91821 */ addu $v1, $t7, $t9 /* 091334 80090734 84780000 */ lh $t8, ($v1) /* 091338 80090738 44988000 */ mtc1 $t8, $f16 -/* 09133C 8009073C 00000000 */ nop +/* 09133C 8009073C 00000000 */ nop /* 091340 80090740 468084A0 */ cvt.s.w $f18, $f16 /* 091344 80090744 E4F20000 */ swc1 $f18, ($a3) /* 091348 80090748 846E0002 */ lh $t6, 2($v1) /* 09134C 8009074C 448E2000 */ mtc1 $t6, $f4 -/* 091350 80090750 00000000 */ nop +/* 091350 80090750 00000000 */ nop /* 091354 80090754 468021A0 */ cvt.s.w $f6, $f4 /* 091358 80090758 E4E60004 */ swc1 $f6, 4($a3) /* 09135C 8009075C 846F0004 */ lh $t7, 4($v1) /* 091360 80090760 448F4000 */ mtc1 $t7, $f8 -/* 091364 80090764 00000000 */ nop +/* 091364 80090764 00000000 */ nop /* 091368 80090768 468042A0 */ cvt.s.w $f10, $f8 /* 09136C 8009076C E4EA0008 */ swc1 $f10, 8($a3) .L80090770: @@ -4264,7 +4264,7 @@ glabel func_80090778 /* 091378 80090778 27BDFFD0 */ addiu $sp, $sp, -0x30 /* 09137C 8009077C AFBF001C */ sw $ra, 0x1c($sp) /* 091380 80090780 AFB00018 */ sw $s0, 0x18($sp) -/* 091384 80090784 0C009F40 */ jal func_80027D00 +/* 091384 80090784 0C009F40 */ jal get_player_index_for_player /* 091388 80090788 00808025 */ move $s0, $a0 /* 09138C 8009078C AFA2002C */ sw $v0, 0x2c($sp) /* 091390 80090790 860E00CA */ lh $t6, 0xca($s0) @@ -4322,7 +4322,7 @@ glabel func_80090778 /* 091458 80090858 8FB00018 */ lw $s0, 0x18($sp) /* 09145C 8009085C 27BD0030 */ addiu $sp, $sp, 0x30 /* 091460 80090860 03E00008 */ jr $ra -/* 091464 80090864 00000000 */ nop +/* 091464 80090864 00000000 */ nop glabel func_80090868 /* 091468 80090868 27BDFFE8 */ addiu $sp, $sp, -0x18 @@ -4332,7 +4332,7 @@ glabel func_80090868 /* 091478 80090878 AC80007C */ sw $zero, 0x7c($a0) /* 09147C 8009087C A48000C0 */ sh $zero, 0xc0($a0) /* 091480 80090880 E484008C */ swc1 $f4, 0x8c($a0) -/* 091484 80090884 0C009F40 */ jal func_80027D00 +/* 091484 80090884 0C009F40 */ jal get_player_index_for_player /* 091488 80090888 AFA40018 */ sw $a0, 0x18($sp) /* 09148C 8009088C 8FA40018 */ lw $a0, 0x18($sp) /* 091490 80090890 00022E00 */ sll $a1, $v0, 0x18 @@ -4396,7 +4396,7 @@ glabel func_80090868 .L80090964: /* 091564 80090964 27BD0018 */ addiu $sp, $sp, 0x18 /* 091568 80090968 03E00008 */ jr $ra -/* 09156C 8009096C 00000000 */ nop +/* 09156C 8009096C 00000000 */ nop glabel func_80090970 /* 091570 80090970 27BDFFA8 */ addiu $sp, $sp, -0x58 @@ -4422,7 +4422,7 @@ glabel func_80090970 /* 0915C0 800909C0 002F0821 */ addu $at, $at, $t7 /* 0915C4 800909C4 8C2FF638 */ lw $t7, %lo(jpt_800EF638)($at) # -0x9c8($at) /* 0915C8 800909C8 01E00008 */ jr $t7 -/* 0915CC 800909CC 00000000 */ nop +/* 0915CC 800909CC 00000000 */ nop glabel L800909D0 /* 0915D0 800909D0 860300CA */ lh $v1, 0xca($s0) /* 0915D4 800909D4 24010001 */ li $at, 1 @@ -4461,7 +4461,7 @@ glabel L800909D0 /* 091650 80090A50 26040018 */ addiu $a0, $s0, 0x18 /* 091654 80090A54 44055000 */ mfc1 $a1, $f10 /* 091658 80090A58 0C008973 */ jal func_800225CC -/* 09165C 80090A5C 00000000 */ nop +/* 09165C 80090A5C 00000000 */ nop /* 091660 80090A60 83AE0063 */ lb $t6, 0x63($sp) /* 091664 80090A64 3C063E4C */ lui $a2, (0x3E4CCCCD >> 16) # lui $a2, 0x3e4c /* 091668 80090A68 34C6CCCD */ ori $a2, (0x3E4CCCCD & 0xFFFF) # ori $a2, $a2, 0xcccd @@ -4479,7 +4479,7 @@ glabel L800909D0 /* 091698 80090A98 46049180 */ add.s $f6, $f18, $f4 /* 09169C 80090A9C 240A00FF */ li $t2, 255 /* 0916A0 80090AA0 4610303E */ c.le.s $f6, $f16 -/* 0916A4 80090AA4 00000000 */ nop +/* 0916A4 80090AA4 00000000 */ nop /* 0916A8 80090AA8 4502002C */ bc1fl .L80090B5C /* 0916AC 80090AAC 8E0800BC */ lw $t0, 0xbc($s0) /* 0916B0 80090AB0 860800CA */ lh $t0, 0xca($s0) @@ -4500,7 +4500,7 @@ glabel L800909D0 /* 0916E8 80090AE8 26040018 */ addiu $a0, $s0, 0x18 /* 0916EC 80090AEC 44059000 */ mfc1 $a1, $f18 /* 0916F0 80090AF0 0C008973 */ jal func_800225CC -/* 0916F4 80090AF4 00000000 */ nop +/* 0916F4 80090AF4 00000000 */ nop /* 0916F8 80090AF8 83AC0063 */ lb $t4, 0x63($sp) /* 0916FC 80090AFC 3C063E4C */ lui $a2, (0x3E4CCCCD >> 16) # lui $a2, 0x3e4c /* 091700 80090B00 34C6CCCD */ ori $a2, (0x3E4CCCCD & 0xFFFF) # ori $a2, $a2, 0xcccd @@ -4517,7 +4517,7 @@ glabel L800909D0 /* 09172C 80090B2C 46068200 */ add.s $f8, $f16, $f6 /* 091730 80090B30 241900FF */ li $t9, 255 /* 091734 80090B34 4604403E */ c.le.s $f8, $f4 -/* 091738 80090B38 00000000 */ nop +/* 091738 80090B38 00000000 */ nop /* 09173C 80090B3C 45020007 */ bc1fl .L80090B5C /* 091740 80090B40 8E0800BC */ lw $t0, 0xbc($s0) /* 091744 80090B44 860F00CA */ lh $t7, 0xca($s0) @@ -4565,7 +4565,7 @@ glabel L80090B80 /* 0917DC 80090BDC 26040018 */ addiu $a0, $s0, 0x18 /* 0917E0 80090BE0 44058000 */ mfc1 $a1, $f16 /* 0917E4 80090BE4 0C008973 */ jal func_800225CC -/* 0917E8 80090BE8 00000000 */ nop +/* 0917E8 80090BE8 00000000 */ nop /* 0917EC 80090BEC 861800C6 */ lh $t8, 0xc6($s0) /* 0917F0 80090BF0 24090002 */ li $t1, 2 /* 0917F4 80090BF4 2719FFF8 */ addiu $t9, $t8, -8 @@ -4590,7 +4590,7 @@ glabel L80090B80 /* 09183C 80090C3C 26040018 */ addiu $a0, $s0, 0x18 /* 091840 80090C40 44054000 */ mfc1 $a1, $f8 /* 091844 80090C44 0C008973 */ jal func_800225CC -/* 091848 80090C48 00000000 */ nop +/* 091848 80090C48 00000000 */ nop /* 09184C 80090C4C 860C00C6 */ lh $t4, 0xc6($s0) /* 091850 80090C50 240F0002 */ li $t7, 2 /* 091854 80090C54 258DFFF8 */ addiu $t5, $t4, -8 @@ -4747,17 +4747,17 @@ glabel L80090E08 /* 091A90 80090E90 8C424550 */ lw $v0, %lo(D_80164550)($v0) /* 091A94 80090E94 844A0000 */ lh $t2, ($v0) /* 091A98 80090E98 448A8000 */ mtc1 $t2, $f16 -/* 091A9C 80090E9C 00000000 */ nop +/* 091A9C 80090E9C 00000000 */ nop /* 091AA0 80090EA0 468081A0 */ cvt.s.w $f6, $f16 /* 091AA4 80090EA4 E6060014 */ swc1 $f6, 0x14($s0) /* 091AA8 80090EA8 844B0002 */ lh $t3, 2($v0) /* 091AAC 80090EAC 448B2000 */ mtc1 $t3, $f4 -/* 091AB0 80090EB0 00000000 */ nop +/* 091AB0 80090EB0 00000000 */ nop /* 091AB4 80090EB4 46802220 */ cvt.s.w $f8, $f4 /* 091AB8 80090EB8 E6080018 */ swc1 $f8, 0x18($s0) /* 091ABC 80090EBC 844D0004 */ lh $t5, 4($v0) /* 091AC0 80090EC0 448D5000 */ mtc1 $t5, $f10 -/* 091AC4 80090EC4 00000000 */ nop +/* 091AC4 80090EC4 00000000 */ nop /* 091AC8 80090EC8 468054A0 */ cvt.s.w $f18, $f10 /* 091ACC 80090ECC E612001C */ swc1 $f18, 0x1c($s0) .L80090ED0: @@ -4772,7 +4772,7 @@ glabel L80090E08 /* 091AF0 80090EF0 46082281 */ sub.s $f10, $f4, $f8 /* 091AF4 80090EF4 44055000 */ mfc1 $a1, $f10 /* 091AF8 80090EF8 0C008973 */ jal func_800225CC -/* 091AFC 80090EFC 00000000 */ nop +/* 091AFC 80090EFC 00000000 */ nop /* 091B00 80090F00 860E00C8 */ lh $t6, 0xc8($s0) /* 091B04 80090F04 8E0200BC */ lw $v0, 0xbc($s0) /* 091B08 80090F08 24010008 */ li $at, 8 @@ -4795,7 +4795,7 @@ glabel L80090E08 /* 091B48 80090F48 3C050100 */ lui $a1, (0x0100FA28 >> 16) # lui $a1, 0x100 /* 091B4C 80090F4C 314B4000 */ andi $t3, $t2, 0x4000 /* 091B50 80090F50 11600003 */ beqz $t3, .L80090F60 -/* 091B54 80090F54 00000000 */ nop +/* 091B54 80090F54 00000000 */ nop /* 091B58 80090F58 0C032406 */ jal func_800C9018 /* 091B5C 80090F5C 34A5FA28 */ ori $a1, (0x0100FA28 & 0xFFFF) # ori $a1, $a1, 0xfa28 .L80090F60: @@ -4829,7 +4829,7 @@ glabel L80090E08 /* 091BC8 80090FC8 02002025 */ move $a0, $s0 /* 091BCC 80090FCC 46009421 */ cvt.d.s $f16, $f18 /* 091BD0 80090FD0 4630503E */ c.le.d $f10, $f16 -/* 091BD4 80090FD4 00000000 */ nop +/* 091BD4 80090FD4 00000000 */ nop /* 091BD8 80090FD8 45020004 */ bc1fl .L80090FEC /* 091BDC 80090FDC 3C014334 */ lui $at, 0x4334 /* 091BE0 80090FE0 0C023C41 */ jal func_8008F104 @@ -4845,7 +4845,7 @@ glabel L80090E08 /* 091C00 80091000 E6040DA0 */ swc1 $f4, 0xda0($s0) /* 091C04 80091004 C6080DA0 */ lwc1 $f8, 0xda0($s0) /* 091C08 80091008 4608003E */ c.le.s $f0, $f8 -/* 091C0C 8009100C 00000000 */ nop +/* 091C0C 8009100C 00000000 */ nop /* 091C10 80091010 45020003 */ bc1fl .L80091020 /* 091C14 80091014 86090D98 */ lh $t1, 0xd98($s0) /* 091C18 80091018 E6000DA0 */ swc1 $f0, 0xda0($s0) @@ -4862,7 +4862,7 @@ glabel L80090E08 /* 091C40 80091040 C424F658 */ lwc1 $f4, %lo(D_800EF658)($at) /* 091C44 80091044 C6060D9C */ lwc1 $f6, 0xd9c($s0) /* 091C48 80091048 4606203E */ c.le.s $f4, $f6 -/* 091C4C 8009104C 00000000 */ nop +/* 091C4C 8009104C 00000000 */ nop /* 091C50 80091050 4502000A */ bc1fl .L8009107C /* 091C54 80091054 860D0D98 */ lh $t5, 0xd98($s0) /* 091C58 80091058 860A0D98 */ lh $t2, 0xd98($s0) @@ -4872,7 +4872,7 @@ glabel L80090E08 /* 091C68 80091068 E6080DA0 */ swc1 $f8, 0xda0($s0) /* 091C6C 8009106C 00005812 */ mflo $t3 /* 091C70 80091070 A60B0D98 */ sh $t3, 0xd98($s0) -/* 091C74 80091074 00000000 */ nop +/* 091C74 80091074 00000000 */ nop /* 091C78 80091078 860D0D98 */ lh $t5, 0xd98($s0) .L8009107C: /* 091C7C 8009107C 2402FFFF */ li $v0, -1 @@ -4886,7 +4886,7 @@ glabel L80090E08 /* 091C9C 8009109C C6040D9C */ lwc1 $f4, 0xd9c($s0) /* 091CA0 800910A0 C426F65C */ lwc1 $f6, %lo(D_800EF65C)($at) /* 091CA4 800910A4 4606203E */ c.le.s $f4, $f6 -/* 091CA8 800910A8 00000000 */ nop +/* 091CA8 800910A8 00000000 */ nop /* 091CAC 800910AC 45020009 */ bc1fl .L800910D4 /* 091CB0 800910B0 8FBF001C */ lw $ra, 0x1c($sp) /* 091CB4 800910B4 860E0D98 */ lh $t6, 0xd98($s0) @@ -4895,13 +4895,13 @@ glabel L80090E08 /* 091CC0 800910C0 E6080DA0 */ swc1 $f8, 0xda0($s0) /* 091CC4 800910C4 00007812 */ mflo $t7 /* 091CC8 800910C8 A60F0D98 */ sh $t7, 0xd98($s0) -/* 091CCC 800910CC 00000000 */ nop +/* 091CCC 800910CC 00000000 */ nop /* 091CD0 800910D0 8FBF001C */ lw $ra, 0x1c($sp) .L800910D4: /* 091CD4 800910D4 8FB00018 */ lw $s0, 0x18($sp) /* 091CD8 800910D8 27BD0058 */ addiu $sp, $sp, 0x58 /* 091CDC 800910DC 03E00008 */ jr $ra -/* 091CE0 800910E0 00000000 */ nop +/* 091CE0 800910E0 00000000 */ nop glabel func_800910E4 /* 091CE4 800910E4 848300CA */ lh $v1, 0xca($a0) @@ -4912,7 +4912,7 @@ glabel func_800910E4 /* 091CF8 800910F8 306F0008 */ andi $t7, $v1, 8 /* 091CFC 800910FC 24010008 */ li $at, 8 /* 091D00 80091100 11E10009 */ beq $t7, $at, .L80091128 -/* 091D04 80091104 00000000 */ nop +/* 091D04 80091104 00000000 */ nop /* 091D08 80091108 94830000 */ lhu $v1, ($a0) /* 091D0C 8009110C 30780040 */ andi $t8, $v1, 0x40 /* 091D10 80091110 17000005 */ bnez $t8, .L80091128 @@ -4935,13 +4935,13 @@ glabel func_800910E4 /* 091D48 80091148 002A0821 */ addu $at, $at, $t2 /* 091D4C 8009114C 8C2AF660 */ lw $t2, %lo(jpt_800EF660)($at) /* 091D50 80091150 01400008 */ jr $t2 -/* 091D54 80091154 00000000 */ nop +/* 091D54 80091154 00000000 */ nop glabel L80091158 /* 091D58 80091158 8C8B00BC */ lw $t3, 0xbc($a0) /* 091D5C 8009115C 3C025F93 */ lui $v0, 0x5f93 /* 091D60 80091160 316C0008 */ andi $t4, $t3, 8 /* 091D64 80091164 11800003 */ beqz $t4, .L80091174 -/* 091D68 80091168 00000000 */ nop +/* 091D68 80091168 00000000 */ nop /* 091D6C 8009116C 03E00008 */ jr $ra /* 091D70 80091170 24020001 */ li $v0, 1 @@ -4966,7 +4966,7 @@ glabel L80091184 .L800911AC: /* 091DAC 800911AC 03E00008 */ jr $ra -/* 091DB0 800911B0 00000000 */ nop +/* 091DB0 800911B0 00000000 */ nop glabel func_800911B4 /* 091DB4 800911B4 AFA50004 */ sw $a1, 4($sp) @@ -5026,7 +5026,7 @@ glabel func_800911B4 /* 091E88 80091288 1444FFF2 */ bne $v0, $a0, .L80091254 /* 091E8C 8009128C A46009BA */ sh $zero, 0x9ba($v1) /* 091E90 80091290 03E00008 */ jr $ra -/* 091E94 80091294 00000000 */ nop +/* 091E94 80091294 00000000 */ nop glabel func_80091298 /* 091E98 80091298 27BDFFE0 */ addiu $sp, $sp, -0x20 @@ -5086,12 +5086,12 @@ glabel func_80091298 /* 091F5C 8009135C 848200B2 */ lh $v0, 0xb2($a0) /* 091F60 80091360 3C013F80 */ li $at, 0x3F800000 # 1.000000 /* 091F64 80091364 1C400003 */ bgtz $v0, .L80091374 -/* 091F68 80091368 00000000 */ nop +/* 091F68 80091368 00000000 */ nop /* 091F6C 8009136C A48000B2 */ sh $zero, 0xb2($a0) /* 091F70 80091370 848200B2 */ lh $v0, 0xb2($a0) .L80091374: /* 091F74 80091374 14400030 */ bnez $v0, .L80091438 -/* 091F78 80091378 00000000 */ nop +/* 091F78 80091378 00000000 */ nop /* 091F7C 8009137C C4820070 */ lwc1 $f2, 0x70($a0) /* 091F80 80091380 44813000 */ mtc1 $at, $f6 /* 091F84 80091384 C4840018 */ lwc1 $f4, 0x18($a0) @@ -5102,9 +5102,9 @@ glabel func_80091298 /* 091F98 80091398 3C01800F */ lui $at, %hi(D_800EF680) /* 091F9C 8009139C 46082281 */ sub.s $f10, $f4, $f8 /* 091FA0 800913A0 4600503E */ c.le.s $f10, $f0 -/* 091FA4 800913A4 00000000 */ nop +/* 091FA4 800913A4 00000000 */ nop /* 091FA8 800913A8 45000023 */ bc1f .L80091438 -/* 091FAC 800913AC 00000000 */ nop +/* 091FAC 800913AC 00000000 */ nop /* 091FB0 800913B0 46020400 */ add.s $f16, $f0, $f2 /* 091FB4 800913B4 D426F680 */ ldc1 $f6, %lo(D_800EF680)($at) /* 091FB8 800913B8 848E0044 */ lh $t6, 0x44($a0) @@ -5160,7 +5160,7 @@ glabel func_80091440 /* 092074 80091474 AFA40000 */ sw $a0, ($sp) /* 092078 80091478 30680800 */ andi $t0, $v1, 0x800 /* 09207C 8009147C 15000006 */ bnez $t0, .L80091498 -/* 092080 80091480 00000000 */ nop +/* 092080 80091480 00000000 */ nop /* 092084 80091484 944A0000 */ lhu $t2, ($v0) /* 092088 80091488 34692400 */ ori $t1, $v1, 0x2400 /* 09208C 8009148C A4490044 */ sh $t1, 0x44($v0) @@ -5168,11 +5168,11 @@ glabel func_80091440 /* 092094 80091494 A44B0000 */ sh $t3, ($v0) .L80091498: /* 092098 80091498 03E00008 */ jr $ra -/* 09209C 8009149C 00000000 */ nop +/* 09209C 8009149C 00000000 */ nop glabel func_800914A0 -/* 0920A0 800914A0 3C0E800E */ lui $t6, %hi(D_800DC4FC) # $t6, 0x800e -/* 0920A4 800914A4 8DCEC4FC */ lw $t6, %lo(D_800DC4FC)($t6) +/* 0920A0 800914A0 3C0E800E */ lui $t6, %hi(gPlayerOneCopy) # $t6, 0x800e +/* 0920A4 800914A4 8DCEC4FC */ lw $t6, %lo(gPlayerOneCopy)($t6) /* 0920A8 800914A8 3C048015 */ lui $a0, %hi(D_80152308) # $a0, 0x8015 /* 0920AC 800914AC 24842308 */ addiu $a0, %lo(D_80152308) # addiu $a0, $a0, 0x2308 /* 0920B0 800914B0 95CF0006 */ lhu $t7, 6($t6) @@ -5187,7 +5187,7 @@ glabel func_800914A0 /* 0920D4 800914D4 A4990000 */ sh $t9, ($a0) .L800914D8: /* 0920D8 800914D8 03E00008 */ jr $ra -/* 0920DC 800914DC 00000000 */ nop +/* 0920DC 800914DC 00000000 */ nop /* 0920E0 800914E0 27BDFF90 */ addiu $sp, $sp, -0x70 /* 0920E4 800914E4 3C0F800E */ lui $t7, %hi(D_800E7080) # $t7, 0x800e @@ -5218,9 +5218,9 @@ glabel func_800914A0 /* 092148 80091548 01EE7821 */ addu $t7, $t7, $t6 /* 09214C 8009154C 8DEF0258 */ lw $t7, %lo(gSegmentTable)($t7) /* 092150 80091550 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 092154 80091554 3C09800E */ lui $t1, %hi(D_800DC4FC) # $t1, 0x800e +/* 092154 80091554 3C09800E */ lui $t1, %hi(gPlayerOneCopy) # $t1, 0x800e /* 092158 80091558 00412024 */ and $a0, $v0, $at -/* 09215C 8009155C 2529C4FC */ addiu $t1, %lo(D_800DC4FC) # addiu $t1, $t1, -0x3b04 +/* 09215C 8009155C 2529C4FC */ addiu $t1, %lo(gPlayerOneCopy) # addiu $t1, $t1, -0x3b04 /* 092160 80091560 8D2B0000 */ lw $t3, ($t1) /* 092164 80091564 3C018000 */ lui $at, 0x8000 /* 092168 80091568 01E45021 */ addu $t2, $t7, $a0 @@ -5244,12 +5244,12 @@ glabel func_800914A0 /* 0921B0 800915B0 14B80008 */ bne $a1, $t8, .L800915D4 /* 0921B4 800915B4 03001825 */ move $v1, $t8 /* 0921B8 800915B8 0C024528 */ jal func_800914A0 -/* 0921BC 800915BC 00000000 */ nop -/* 0921C0 800915C0 3C09800E */ lui $t1, %hi(D_800DC4FC) # $t1, 0x800e +/* 0921BC 800915BC 00000000 */ nop +/* 0921C0 800915C0 3C09800E */ lui $t1, %hi(gPlayerOneCopy) # $t1, 0x800e /* 0921C4 800915C4 3C088015 */ lui $t0, %hi(D_80152308) # $t0, 0x8015 /* 0921C8 800915C8 95082308 */ lhu $t0, %lo(D_80152308)($t0) /* 0921CC 800915CC 10000010 */ b .L80091610 -/* 0921D0 800915D0 2529C4FC */ addiu $t1, %lo(D_800DC4FC) # addiu $t1, $t1, -0x3b04 +/* 0921D0 800915D0 2529C4FC */ addiu $t1, %lo(gPlayerOneCopy) # addiu $t1, $t1, -0x3b04 .L800915D4: /* 0921D4 800915D4 2861000E */ slti $at, $v1, 0xe /* 0921D8 800915D8 1020000D */ beqz $at, .L80091610 @@ -5261,11 +5261,11 @@ glabel func_800914A0 /* 0921F0 800915F0 55450008 */ bnel $t2, $a1, .L80091614 /* 0921F4 800915F4 8FAD0048 */ lw $t5, 0x48($sp) /* 0921F8 800915F8 0C024528 */ jal func_800914A0 -/* 0921FC 800915FC 00000000 */ nop -/* 092200 80091600 3C09800E */ lui $t1, %hi(D_800DC4FC) # $t1, 0x800e +/* 0921FC 800915FC 00000000 */ nop +/* 092200 80091600 3C09800E */ lui $t1, %hi(gPlayerOneCopy) # $t1, 0x800e /* 092204 80091604 3C088015 */ lui $t0, %hi(D_80152308) # $t0, 0x8015 /* 092208 80091608 95082308 */ lhu $t0, %lo(D_80152308)($t0) -/* 09220C 8009160C 2529C4FC */ addiu $t1, %lo(D_800DC4FC) # addiu $t1, $t1, -0x3b04 +/* 09220C 8009160C 2529C4FC */ addiu $t1, %lo(gPlayerOneCopy) # addiu $t1, $t1, -0x3b04 .L80091610: /* 092210 80091610 8FAD0048 */ lw $t5, 0x48($sp) .L80091614: @@ -5285,7 +5285,7 @@ glabel func_800914A0 /* 092248 80091648 44064000 */ mfc1 $a2, $f8 /* 09224C 8009164C 270E0007 */ addiu $t6, $t8, 7 /* 092250 80091650 448E5000 */ mtc1 $t6, $f10 -/* 092254 80091654 00000000 */ nop +/* 092254 80091654 00000000 */ nop /* 092258 80091658 46805420 */ cvt.s.w $f16, $f10 /* 09225C 8009165C E43046F4 */ swc1 $f16, %lo(cameras+0x4)($at) /* 092260 80091660 844F0004 */ lh $t7, 4($v0) @@ -5293,7 +5293,7 @@ glabel func_800914A0 /* 092268 80091668 44078000 */ mfc1 $a3, $f16 /* 09226C 8009166C 25EAFFEC */ addiu $t2, $t7, -0x14 /* 092270 80091670 448A9000 */ mtc1 $t2, $f18 -/* 092274 80091674 00000000 */ nop +/* 092274 80091674 00000000 */ nop /* 092278 80091678 46809120 */ cvt.s.w $f4, $f18 /* 09227C 8009167C E42446F8 */ swc1 $f4, %lo(cameras+0x8)($at) /* 092280 80091680 8D390000 */ lw $t9, ($t1) @@ -5348,4 +5348,4 @@ glabel func_800914A0 /* 092344 80091744 03E00008 */ jr $ra /* 092348 80091748 27BD0070 */ addiu $sp, $sp, 0x70 -/* 09234C 8009174C 00000000 */ nop +/* 09234C 8009174C 00000000 */ nop diff --git a/asm/non_matchings/code_8008C1D0/func_8008D3C4.s b/asm/non_matchings/code_8008C1D0/func_8008D3C4.s index 8c7d1d82b..41fcfa64e 100644 --- a/asm/non_matchings/code_8008C1D0/func_8008D3C4.s +++ b/asm/non_matchings/code_8008C1D0/func_8008D3C4.s @@ -23,9 +23,9 @@ glabel func_8008D3C4 /* 08E018 8008D418 E6040DBC */ swc1 $f4, 0xdbc($s0) /* 08E01C 8008D41C 954AF890 */ lhu $t2, %lo(D_8015F890)($t2) /* 08E020 8008D420 24010001 */ li $at, 1 -/* 08E024 8008D424 3C0D800E */ lui $t5, %hi(D_800DC4DC) # $t5, 0x800e +/* 08E024 8008D424 3C0D800E */ lui $t5, %hi(gPlayerOne) # $t5, 0x800e /* 08E028 8008D428 11410011 */ beq $t2, $at, .L8008D470 -/* 08E02C 8008D42C 00000000 */ nop +/* 08E02C 8008D42C 00000000 */ nop /* 08E030 8008D430 96020000 */ lhu $v0, ($s0) /* 08E034 8008D434 24014000 */ li $at, 16384 /* 08E038 8008D438 304B4000 */ andi $t3, $v0, 0x4000 @@ -43,7 +43,7 @@ glabel func_8008D3C4 /* 08E068 8008D468 1000000C */ b .L8008D49C /* 08E06C 8008D46C 240E0050 */ li $t6, 80 .L8008D470: -/* 08E070 8008D470 8DADC4DC */ lw $t5, %lo(D_800DC4DC)($t5) +/* 08E070 8008D470 8DADC4DC */ lw $t5, %lo(gPlayerOne)($t5) /* 08E074 8008D474 30A400FF */ andi $a0, $a1, 0xff /* 08E078 8008D478 560D0008 */ bnel $s0, $t5, .L8008D49C /* 08E07C 8008D47C 240E0050 */ li $t6, 80 @@ -61,4 +61,4 @@ glabel func_8008D3C4 /* 08E0A4 8008D4A4 8FB00018 */ lw $s0, 0x18($sp) /* 08E0A8 8008D4A8 27BD0028 */ addiu $sp, $sp, 0x28 /* 08E0AC 8008D4AC 03E00008 */ jr $ra -/* 08E0B0 8008D4B0 00000000 */ nop +/* 08E0B0 8008D4B0 00000000 */ nop diff --git a/asm/non_matchings/code_8008C1D0/func_8008EC88.s b/asm/non_matchings/code_8008C1D0/func_8008EC88.s index b0f3f0952..88f42fdd1 100644 --- a/asm/non_matchings/code_8008C1D0/func_8008EC88.s +++ b/asm/non_matchings/code_8008C1D0/func_8008EC88.s @@ -27,9 +27,9 @@ glabel func_8008EC88 /* 08F8EC 8008ECEC E6040DBC */ swc1 $f4, 0xdbc($s0) /* 08F8F0 8008ECF0 954AF890 */ lhu $t2, %lo(D_8015F890)($t2) /* 08F8F4 8008ECF4 24010001 */ li $at, 1 -/* 08F8F8 8008ECF8 3C0E800E */ lui $t6, %hi(D_800DC4DC) # $t6, 0x800e +/* 08F8F8 8008ECF8 3C0E800E */ lui $t6, %hi(gPlayerOne) # $t6, 0x800e /* 08F8FC 8008ECFC 11410015 */ beq $t2, $at, .L8008ED54 -/* 08F900 8008ED00 00000000 */ nop +/* 08F900 8008ED00 00000000 */ nop /* 08F904 8008ED04 96020000 */ lhu $v0, ($s0) /* 08F908 8008ED08 24014000 */ li $at, 16384 /* 08F90C 8008ED0C 304B4000 */ andi $t3, $v0, 0x4000 @@ -51,7 +51,7 @@ glabel func_8008EC88 /* 08F94C 8008ED4C 10000011 */ b .L8008ED94 /* 08F950 8008ED50 86180044 */ lh $t8, 0x44($s0) .L8008ED54: -/* 08F954 8008ED54 8DCEC4DC */ lw $t6, %lo(D_800DC4DC)($t6) +/* 08F954 8008ED54 8DCEC4DC */ lw $t6, %lo(gPlayerOne)($t6) /* 08F958 8008ED58 30C400FF */ andi $a0, $a2, 0xff /* 08F95C 8008ED5C 3C012900 */ lui $at, (0x29008001 >> 16) # lui $at, 0x2900 /* 08F960 8008ED60 560E000C */ bnel $s0, $t6, .L8008ED94 @@ -79,4 +79,4 @@ glabel func_8008EC88 /* 08F9B0 8008EDB0 8FB00018 */ lw $s0, 0x18($sp) /* 08F9B4 8008EDB4 27BD0028 */ addiu $sp, $sp, 0x28 /* 08F9B8 8008EDB8 03E00008 */ jr $ra -/* 08F9BC 8008EDBC 00000000 */ nop +/* 08F9BC 8008EDBC 00000000 */ nop diff --git a/asm/non_matchings/code_8008C1D0/func_8008EEE4.s b/asm/non_matchings/code_8008C1D0/func_8008EEE4.s index 7cecdb9f0..9acf0488e 100644 --- a/asm/non_matchings/code_8008C1D0/func_8008EEE4.s +++ b/asm/non_matchings/code_8008C1D0/func_8008EEE4.s @@ -22,9 +22,9 @@ glabel func_8008EEE4 /* 08FB34 8008EF34 3C0A8016 */ lui $t2, %hi(D_8015F890) # $t2, 0x8016 /* 08FB38 8008EF38 954AF890 */ lhu $t2, %lo(D_8015F890)($t2) /* 08FB3C 8008EF3C 24010001 */ li $at, 1 -/* 08FB40 8008EF40 3C0E800E */ lui $t6, %hi(D_800DC4DC) # $t6, 0x800e +/* 08FB40 8008EF40 3C0E800E */ lui $t6, %hi(gPlayerOne) # $t6, 0x800e /* 08FB44 8008EF44 11410015 */ beq $t2, $at, .L8008EF9C -/* 08FB48 8008EF48 00000000 */ nop +/* 08FB48 8008EF48 00000000 */ nop /* 08FB4C 8008EF4C 96020000 */ lhu $v0, ($s0) /* 08FB50 8008EF50 24014000 */ li $at, 16384 /* 08FB54 8008EF54 304B4000 */ andi $t3, $v0, 0x4000 @@ -46,7 +46,7 @@ glabel func_8008EEE4 /* 08FB94 8008EF94 10000011 */ b .L8008EFDC /* 08FB98 8008EF98 86180044 */ lh $t8, 0x44($s0) .L8008EF9C: -/* 08FB9C 8008EF9C 8DCEC4DC */ lw $t6, %lo(D_800DC4DC)($t6) +/* 08FB9C 8008EF9C 8DCEC4DC */ lw $t6, %lo(gPlayerOne)($t6) /* 08FBA0 8008EFA0 30C400FF */ andi $a0, $a2, 0xff /* 08FBA4 8008EFA4 3C012900 */ lui $at, (0x29008001 >> 16) # lui $at, 0x2900 /* 08FBA8 8008EFA8 560E000C */ bnel $s0, $t6, .L8008EFDC @@ -74,4 +74,4 @@ glabel func_8008EEE4 /* 08FBF8 8008EFF8 8FB00018 */ lw $s0, 0x18($sp) /* 08FBFC 8008EFFC 27BD0028 */ addiu $sp, $sp, 0x28 /* 08FC00 8008F000 03E00008 */ jr $ra -/* 08FC04 8008F004 00000000 */ nop +/* 08FC04 8008F004 00000000 */ nop diff --git a/asm/non_matchings/code_8008C1D0/func_8008FC1C.s b/asm/non_matchings/code_8008C1D0/func_8008FC1C.s index 071f74a22..a6a6a95b6 100644 --- a/asm/non_matchings/code_8008C1D0/func_8008FC1C.s +++ b/asm/non_matchings/code_8008C1D0/func_8008FC1C.s @@ -6,7 +6,7 @@ glabel func_8008FC1C /* 09082C 8008FC2C 31CF0040 */ andi $t7, $t6, 0x40 /* 090830 8008FC30 51E00009 */ beql $t7, $zero, .L8008FC58 /* 090834 8008FC34 8FBF0014 */ lw $ra, 0x14($sp) -/* 090838 8008FC38 0C009F40 */ jal func_80027D00 +/* 090838 8008FC38 0C009F40 */ jal get_player_index_for_player /* 09083C 8008FC3C AFA50018 */ sw $a1, 0x18($sp) /* 090840 8008FC40 8FA50018 */ lw $a1, 0x18($sp) /* 090844 8008FC44 24187000 */ li $t8, 28672 @@ -17,4 +17,4 @@ glabel func_8008FC1C .L8008FC58: /* 090858 8008FC58 27BD0018 */ addiu $sp, $sp, 0x18 /* 09085C 8008FC5C 03E00008 */ jr $ra -/* 090860 8008FC60 00000000 */ nop +/* 090860 8008FC60 00000000 */ nop diff --git a/asm/non_matchings/code_8008C1D0/func_80090778.s b/asm/non_matchings/code_8008C1D0/func_80090778.s index 71ad3a57e..6d35195e5 100644 --- a/asm/non_matchings/code_8008C1D0/func_80090778.s +++ b/asm/non_matchings/code_8008C1D0/func_80090778.s @@ -2,7 +2,7 @@ glabel func_80090778 /* 091378 80090778 27BDFFD0 */ addiu $sp, $sp, -0x30 /* 09137C 8009077C AFBF001C */ sw $ra, 0x1c($sp) /* 091380 80090780 AFB00018 */ sw $s0, 0x18($sp) -/* 091384 80090784 0C009F40 */ jal func_80027D00 +/* 091384 80090784 0C009F40 */ jal get_player_index_for_player /* 091388 80090788 00808025 */ move $s0, $a0 /* 09138C 8009078C AFA2002C */ sw $v0, 0x2c($sp) /* 091390 80090790 860E00CA */ lh $t6, 0xca($s0) @@ -60,4 +60,4 @@ glabel func_80090778 /* 091458 80090858 8FB00018 */ lw $s0, 0x18($sp) /* 09145C 8009085C 27BD0030 */ addiu $sp, $sp, 0x30 /* 091460 80090860 03E00008 */ jr $ra -/* 091464 80090864 00000000 */ nop +/* 091464 80090864 00000000 */ nop diff --git a/asm/non_matchings/code_8008C1D0/func_80090868.s b/asm/non_matchings/code_8008C1D0/func_80090868.s index ef430e4e8..35444461b 100644 --- a/asm/non_matchings/code_8008C1D0/func_80090868.s +++ b/asm/non_matchings/code_8008C1D0/func_80090868.s @@ -6,7 +6,7 @@ glabel func_80090868 /* 091478 80090878 AC80007C */ sw $zero, 0x7c($a0) /* 09147C 8009087C A48000C0 */ sh $zero, 0xc0($a0) /* 091480 80090880 E484008C */ swc1 $f4, 0x8c($a0) -/* 091484 80090884 0C009F40 */ jal func_80027D00 +/* 091484 80090884 0C009F40 */ jal get_player_index_for_player /* 091488 80090888 AFA40018 */ sw $a0, 0x18($sp) /* 09148C 8009088C 8FA40018 */ lw $a0, 0x18($sp) /* 091490 80090890 00022E00 */ sll $a1, $v0, 0x18 @@ -70,4 +70,4 @@ glabel func_80090868 .L80090964: /* 091564 80090964 27BD0018 */ addiu $sp, $sp, 0x18 /* 091568 80090968 03E00008 */ jr $ra -/* 09156C 8009096C 00000000 */ nop +/* 09156C 8009096C 00000000 */ nop diff --git a/asm/non_matchings/code_8008C1D0/func_800914A0.s b/asm/non_matchings/code_8008C1D0/func_800914A0.s index d8dd2dd33..2f800038e 100644 --- a/asm/non_matchings/code_8008C1D0/func_800914A0.s +++ b/asm/non_matchings/code_8008C1D0/func_800914A0.s @@ -1,6 +1,6 @@ glabel func_800914A0 -/* 0920A0 800914A0 3C0E800E */ lui $t6, %hi(D_800DC4FC) # $t6, 0x800e -/* 0920A4 800914A4 8DCEC4FC */ lw $t6, %lo(D_800DC4FC)($t6) +/* 0920A0 800914A0 3C0E800E */ lui $t6, %hi(gPlayerOneCopy) # $t6, 0x800e +/* 0920A4 800914A4 8DCEC4FC */ lw $t6, %lo(gPlayerOneCopy)($t6) /* 0920A8 800914A8 3C048015 */ lui $a0, %hi(D_80152308) # $a0, 0x8015 /* 0920AC 800914AC 24842308 */ addiu $a0, %lo(D_80152308) # addiu $a0, $a0, 0x2308 /* 0920B0 800914B0 95CF0006 */ lhu $t7, 6($t6) @@ -15,4 +15,4 @@ glabel func_800914A0 /* 0920D4 800914D4 A4990000 */ sh $t9, ($a0) .L800914D8: /* 0920D8 800914D8 03E00008 */ jr $ra -/* 0920DC 800914DC 00000000 */ nop +/* 0920DC 800914DC 00000000 */ nop diff --git a/asm/non_matchings/code_8008C1D0/func_800914E0.s b/asm/non_matchings/code_8008C1D0/func_800914E0.s index f988dfd7a..8a444d5ba 100644 --- a/asm/non_matchings/code_8008C1D0/func_800914E0.s +++ b/asm/non_matchings/code_8008C1D0/func_800914E0.s @@ -28,9 +28,9 @@ glabel func_800914E0 /* 092148 80091548 01EE7821 */ addu $t7, $t7, $t6 /* 09214C 8009154C 8DEF0258 */ lw $t7, %lo(gSegmentTable)($t7) /* 092150 80091550 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 092154 80091554 3C09800E */ lui $t1, %hi(D_800DC4FC) # $t1, 0x800e +/* 092154 80091554 3C09800E */ lui $t1, %hi(gPlayerOneCopy) # $t1, 0x800e /* 092158 80091558 00412024 */ and $a0, $v0, $at -/* 09215C 8009155C 2529C4FC */ addiu $t1, %lo(D_800DC4FC) # addiu $t1, $t1, -0x3b04 +/* 09215C 8009155C 2529C4FC */ addiu $t1, %lo(gPlayerOneCopy) # addiu $t1, $t1, -0x3b04 /* 092160 80091560 8D2B0000 */ lw $t3, ($t1) /* 092164 80091564 3C018000 */ lui $at, 0x8000 /* 092168 80091568 01E45021 */ addu $t2, $t7, $a0 @@ -54,12 +54,12 @@ glabel func_800914E0 /* 0921B0 800915B0 14B80008 */ bne $a1, $t8, .L800915D4 /* 0921B4 800915B4 03001825 */ move $v1, $t8 /* 0921B8 800915B8 0C024528 */ jal func_800914A0 -/* 0921BC 800915BC 00000000 */ nop -/* 0921C0 800915C0 3C09800E */ lui $t1, %hi(D_800DC4FC) # $t1, 0x800e +/* 0921BC 800915BC 00000000 */ nop +/* 0921C0 800915C0 3C09800E */ lui $t1, %hi(gPlayerOneCopy) # $t1, 0x800e /* 0921C4 800915C4 3C088015 */ lui $t0, %hi(D_80152308) # $t0, 0x8015 /* 0921C8 800915C8 95082308 */ lhu $t0, %lo(D_80152308)($t0) /* 0921CC 800915CC 10000010 */ b .L80091610 -/* 0921D0 800915D0 2529C4FC */ addiu $t1, %lo(D_800DC4FC) # addiu $t1, $t1, -0x3b04 +/* 0921D0 800915D0 2529C4FC */ addiu $t1, %lo(gPlayerOneCopy) # addiu $t1, $t1, -0x3b04 .L800915D4: /* 0921D4 800915D4 2861000E */ slti $at, $v1, 0xe /* 0921D8 800915D8 1020000D */ beqz $at, .L80091610 @@ -71,11 +71,11 @@ glabel func_800914E0 /* 0921F0 800915F0 55450008 */ bnel $t2, $a1, .L80091614 /* 0921F4 800915F4 8FAD0048 */ lw $t5, 0x48($sp) /* 0921F8 800915F8 0C024528 */ jal func_800914A0 -/* 0921FC 800915FC 00000000 */ nop -/* 092200 80091600 3C09800E */ lui $t1, %hi(D_800DC4FC) # $t1, 0x800e +/* 0921FC 800915FC 00000000 */ nop +/* 092200 80091600 3C09800E */ lui $t1, %hi(gPlayerOneCopy) # $t1, 0x800e /* 092204 80091604 3C088015 */ lui $t0, %hi(D_80152308) # $t0, 0x8015 /* 092208 80091608 95082308 */ lhu $t0, %lo(D_80152308)($t0) -/* 09220C 8009160C 2529C4FC */ addiu $t1, %lo(D_800DC4FC) # addiu $t1, $t1, -0x3b04 +/* 09220C 8009160C 2529C4FC */ addiu $t1, %lo(gPlayerOneCopy) # addiu $t1, $t1, -0x3b04 .L80091610: /* 092210 80091610 8FAD0048 */ lw $t5, 0x48($sp) .L80091614: @@ -95,7 +95,7 @@ glabel func_800914E0 /* 092248 80091648 44064000 */ mfc1 $a2, $f8 /* 09224C 8009164C 270E0007 */ addiu $t6, $t8, 7 /* 092250 80091650 448E5000 */ mtc1 $t6, $f10 -/* 092254 80091654 00000000 */ nop +/* 092254 80091654 00000000 */ nop /* 092258 80091658 46805420 */ cvt.s.w $f16, $f10 /* 09225C 8009165C E43046F4 */ swc1 $f16, %lo(cameras+0x4)($at) /* 092260 80091660 844F0004 */ lh $t7, 4($v0) @@ -103,7 +103,7 @@ glabel func_800914E0 /* 092268 80091668 44078000 */ mfc1 $a3, $f16 /* 09226C 8009166C 25EAFFEC */ addiu $t2, $t7, -0x14 /* 092270 80091670 448A9000 */ mtc1 $t2, $f18 -/* 092274 80091674 00000000 */ nop +/* 092274 80091674 00000000 */ nop /* 092278 80091678 46809120 */ cvt.s.w $f4, $f18 /* 09227C 8009167C E42446F8 */ swc1 $f4, %lo(cameras+0x8)($at) /* 092280 80091680 8D390000 */ lw $t9, ($t1) diff --git a/asm/non_matchings/code_80091750/func_80091D74.s b/asm/non_matchings/code_80091750/func_80091D74.s index 8c324fae0..b17b9684f 100644 --- a/asm/non_matchings/code_80091750/func_80091D74.s +++ b/asm/non_matchings/code_80091750/func_80091D74.s @@ -14,22 +14,22 @@ glabel func_80091D74 .L80091DA4: /* 0929A4 80091DA4 3C028015 */ lui $v0, %hi(gControllerStatuses+0x2) # $v0, 0x8015 /* 0929A8 80091DA8 9042F0E2 */ lbu $v0, %lo(gControllerStatuses+0x2)($v0) -/* 0929AC 80091DAC 3C19800E */ lui $t9, %hi(D_800DC4BC) # $t9, 0x800e +/* 0929AC 80091DAC 3C19800E */ lui $t9, %hi(gControllerOne) # $t9, 0x800e /* 0929B0 80091DB0 2C4F0001 */ sltiu $t7, $v0, 1 /* 0929B4 80091DB4 31F80001 */ andi $t8, $t7, 1 /* 0929B8 80091DB8 13000003 */ beqz $t8, .L80091DC8 -/* 0929BC 80091DBC 00000000 */ nop +/* 0929BC 80091DBC 00000000 */ nop /* 0929C0 80091DC0 10000040 */ b .L80091EC4 /* 0929C4 80091DC4 00001025 */ move $v0, $zero .L80091DC8: -/* 0929C8 80091DC8 8F39C4BC */ lw $t9, %lo(D_800DC4BC)($t9) +/* 0929C8 80091DC8 8F39C4BC */ lw $t9, %lo(gControllerOne)($t9) /* 0929CC 80091DCC 3C108015 */ lui $s0, %hi(gSIEventMesgQueue) # $s0, 0x8015 /* 0929D0 80091DD0 2610F0B8 */ addiu $s0, %lo(gSIEventMesgQueue) # addiu $s0, $s0, -0xf48 /* 0929D4 80091DD4 97280004 */ lhu $t0, 4($t9) /* 0929D8 80091DD8 02002025 */ move $a0, $s0 /* 0929DC 80091DDC 31091000 */ andi $t1, $t0, 0x1000 /* 0929E0 80091DE0 15200003 */ bnez $t1, .L80091DF0 -/* 0929E4 80091DE4 00000000 */ nop +/* 0929E4 80091DE4 00000000 */ nop /* 0929E8 80091DE8 10000036 */ b .L80091EC4 /* 0929EC 80091DEC 00001025 */ move $v0, $zero .L80091DF0: diff --git a/asm/non_matchings/code_80091750/func_80092148.s b/asm/non_matchings/code_80091750/func_80092148.s index 21878a8d5..b47aabd2f 100644 --- a/asm/non_matchings/code_80091750/func_80092148.s +++ b/asm/non_matchings/code_80091750/func_80092148.s @@ -1,19 +1,19 @@ glabel func_80092148 -/* 092D48 80092148 3C02800E */ lui $v0, %hi(D_800DC4CC) # $v0, 0x800e -/* 092D4C 8009214C 8C42C4CC */ lw $v0, %lo(D_800DC4CC)($v0) +/* 092D48 80092148 3C02800E */ lui $v0, %hi(gControllerFive) # $v0, 0x800e +/* 092D4C 8009214C 8C42C4CC */ lw $v0, %lo(gControllerFive)($v0) /* 092D50 80092150 00001825 */ move $v1, $zero /* 092D54 80092154 24180001 */ li $t8, 1 /* 092D58 80092158 944E0004 */ lhu $t6, 4($v0) /* 092D5C 8009215C 3C018019 */ lui $at, %hi(D_8018D9D9) # $at, 0x8019 /* 092D60 80092160 3C198019 */ lui $t9, %hi(D_8018D9D9) # $t9, 0x8019 /* 092D64 80092164 11C00003 */ beqz $t6, .L80092174 -/* 092D68 80092168 00000000 */ nop +/* 092D68 80092168 00000000 */ nop /* 092D6C 8009216C 10000001 */ b .L80092174 /* 092D70 80092170 24030001 */ li $v1, 1 .L80092174: /* 092D74 80092174 944F0006 */ lhu $t7, 6($v0) /* 092D78 80092178 11E00002 */ beqz $t7, .L80092184 -/* 092D7C 8009217C 00000000 */ nop +/* 092D7C 8009217C 00000000 */ nop /* 092D80 80092180 A038D9D9 */ sb $t8, %lo(D_8018D9D9)($at) .L80092184: /* 092D84 80092184 10600008 */ beqz $v1, .L800921A8 @@ -21,11 +21,11 @@ glabel func_80092148 /* 092D8C 8009218C 8339D9D9 */ lb $t9, %lo(D_8018D9D9)($t9) /* 092D90 80092190 24080001 */ li $t0, 1 /* 092D94 80092194 13200004 */ beqz $t9, .L800921A8 -/* 092D98 80092198 00000000 */ nop +/* 092D98 80092198 00000000 */ nop /* 092D9C 8009219C 3C018019 */ lui $at, %hi(D_8018D9D8) /* 092DA0 800921A0 03E00008 */ jr $ra /* 092DA4 800921A4 A028D9D8 */ sb $t0, %lo(D_8018D9D8)($at) .L800921A8: /* 092DA8 800921A8 A020D9D8 */ sb $zero, %lo(D_8018D9D8)($at) /* 092DAC 800921AC 03E00008 */ jr $ra -/* 092DB0 800921B0 00000000 */ nop +/* 092DB0 800921B0 00000000 */ nop diff --git a/asm/non_matchings/code_80091750/func_800A7A4C.s b/asm/non_matchings/code_80091750/func_800A7A4C.s index 042c6aa83..a0bf1de1f 100644 --- a/asm/non_matchings/code_80091750/func_800A7A4C.s +++ b/asm/non_matchings/code_80091750/func_800A7A4C.s @@ -23,21 +23,21 @@ glabel func_800A7A4C /* 0A869C 800A7A9C 10540005 */ beq $v0, $s4, .L800A7AB4 /* 0A86A0 800A7AA0 2841010F */ slti $at, $v0, 0x10f /* 0A86A4 800A7AA4 10550003 */ beq $v0, $s5, .L800A7AB4 -/* 0A86A8 800A7AA8 00000000 */ nop +/* 0A86A8 800A7AA8 00000000 */ nop /* 0A86AC 800A7AAC 14560005 */ bne $v0, $s6, .L800A7AC4 -/* 0A86B0 800A7AB0 00000000 */ nop +/* 0A86B0 800A7AB0 00000000 */ nop .L800A7AB4: /* 0A86B4 800A7AB4 12600006 */ beqz $s3, .L800A7AD0 -/* 0A86B8 800A7AB8 00000000 */ nop +/* 0A86B8 800A7AB8 00000000 */ nop /* 0A86BC 800A7ABC 10000004 */ b .L800A7AD0 /* 0A86C0 800A7AC0 02401825 */ move $v1, $s2 .L800A7AC4: /* 0A86C4 800A7AC4 16600002 */ bnez $s3, .L800A7AD0 -/* 0A86C8 800A7AC8 00000000 */ nop +/* 0A86C8 800A7AC8 00000000 */ nop /* 0A86CC 800A7ACC 02401825 */ move $v1, $s2 .L800A7AD0: /* 0A86D0 800A7AD0 106001A6 */ beqz $v1, .L800A816C -/* 0A86D4 800A7AD4 00000000 */ nop +/* 0A86D4 800A7AD4 00000000 */ nop /* 0A86D8 800A7AD8 14200014 */ bnez $at, .L800A7B2C /* 0A86DC 800A7ADC 28410131 */ slti $at, $v0, 0x131 /* 0A86E0 800A7AE0 1420000A */ bnez $at, .L800A7B0C @@ -50,7 +50,7 @@ glabel func_800A7A4C /* 0A86FC 800A7AFC 002E0821 */ addu $at, $at, $t6 /* 0A8700 800A7B00 8C2E1F38 */ lw $t6, %lo(jpt_800F1F38)($at) /* 0A8704 800A7B04 01C00008 */ jr $t6 -/* 0A8708 800A7B08 00000000 */ nop +/* 0A8708 800A7B08 00000000 */ nop .L800A7B0C: /* 0A870C 800A7B0C 2DE10006 */ sltiu $at, $t7, 6 /* 0A8710 800A7B10 10200196 */ beqz $at, .L800A816C @@ -59,7 +59,7 @@ glabel func_800A7A4C /* 0A871C 800A7B1C 002F0821 */ addu $at, $at, $t7 /* 0A8720 800A7B20 8C2F2034 */ lw $t7, %lo(jpt_800F2034)($at) /* 0A8724 800A7B24 01E00008 */ jr $t7 -/* 0A8728 800A7B28 00000000 */ nop +/* 0A8728 800A7B28 00000000 */ nop .L800A7B2C: /* 0A872C 800A7B2C 28410038 */ slti $at, $v0, 0x38 /* 0A8730 800A7B30 14200009 */ bnez $at, .L800A7B58 @@ -71,7 +71,7 @@ glabel func_800A7A4C /* 0A8748 800A7B48 00380821 */ addu $at, $at, $t8 /* 0A874C 800A7B4C 8C38204C */ lw $t8, %lo(jpt_800F204C)($at) /* 0A8750 800A7B50 03000008 */ jr $t8 -/* 0A8754 800A7B54 00000000 */ nop +/* 0A8754 800A7B54 00000000 */ nop .L800A7B58: /* 0A8758 800A7B58 2C410038 */ sltiu $at, $v0, 0x38 /* 0A875C 800A7B5C 10200183 */ beqz $at, .L800A816C @@ -80,7 +80,7 @@ glabel func_800A7A4C /* 0A8768 800A7B68 00390821 */ addu $at, $at, $t9 /* 0A876C 800A7B6C 8C39233C */ lw $t9, %lo(jpt_800F233C)($at) /* 0A8770 800A7B70 03200008 */ jr $t9 -/* 0A8774 800A7B74 00000000 */ nop +/* 0A8774 800A7B74 00000000 */ nop glabel L800A7B78 /* 0A8778 800A7B78 3C028019 */ lui $v0, %hi(D_8018ED94) # $v0, 0x8019 /* 0A877C 800A7B7C 8C42ED94 */ lw $v0, %lo(D_8018ED94)($v0) @@ -101,7 +101,7 @@ glabel L800A7B78 /* 0A87B4 800A7BB4 46003021 */ cvt.d.s $f0, $f6 /* 0A87B8 800A7BB8 3C01800F */ lui $at, %hi(D_800F2420) /* 0A87BC 800A7BBC 4628003C */ c.lt.d $f0, $f8 -/* 0A87C0 800A7BC0 00000000 */ nop +/* 0A87C0 800A7BC0 00000000 */ nop /* 0A87C4 800A7BC4 45020007 */ bc1fl .L800A7BE4 /* 0A87C8 800A7BC8 C6040000 */ lwc1 $f4, ($s0) /* 0A87CC 800A7BCC D42A2420 */ ldc1 $f10, %lo(D_800F2420)($at) @@ -133,7 +133,7 @@ glabel L800A7B78 /* 0A882C 800A7C2C 28410190 */ slti $at, $v0, 0x190 .L800A7C30: /* 0A8830 800A7C30 10200008 */ beqz $at, .L800A7C54 -/* 0A8834 800A7C34 00000000 */ nop +/* 0A8834 800A7C34 00000000 */ nop /* 0A8838 800A7C38 C6100000 */ lwc1 $f16, ($s0) /* 0A883C 800A7C3C 3C01800F */ lui $at, %hi(D_800F2438) /* 0A8840 800A7C40 D4242438 */ ldc1 $f4, %lo(D_800F2438)($at) @@ -154,7 +154,7 @@ glabel L800A7B78 /* 0A8878 800A7C78 44812000 */ mtc1 $at, $f4 /* 0A887C 800A7C7C 3C0143B4 */ li $at, 0x43B40000 # 360.000000 /* 0A8880 800A7C80 4604903C */ c.lt.s $f18, $f4 -/* 0A8884 800A7C84 00000000 */ nop +/* 0A8884 800A7C84 00000000 */ nop /* 0A8888 800A7C88 45020006 */ bc1fl .L800A7CA4 /* 0A888C 800A7C8C 8E29001C */ lw $t1, 0x1c($s1) /* 0A8890 800A7C90 44813000 */ mtc1 $at, $f6 @@ -176,53 +176,53 @@ glabel L800A7B78 .L800A7CCC: /* 0A88CC 800A7CCC 8E2C0020 */ lw $t4, 0x20($s1) /* 0A88D0 800A7CD0 11800126 */ beqz $t4, .L800A816C -/* 0A88D4 800A7CD4 00000000 */ nop +/* 0A88D4 800A7CD4 00000000 */ nop /* 0A88D8 800A7CD8 8E2D001C */ lw $t5, 0x1c($s1) /* 0A88DC 800A7CDC 3C044901 */ lui $a0, (0x49018008 >> 16) # lui $a0, 0x4901 /* 0A88E0 800A7CE0 34848008 */ ori $a0, (0x49018008 & 0xFFFF) # ori $a0, $a0, 0x8008 /* 0A88E4 800A7CE4 29A10003 */ slti $at, $t5, 3 /* 0A88E8 800A7CE8 14200120 */ bnez $at, .L800A816C -/* 0A88EC 800A7CEC 00000000 */ nop +/* 0A88EC 800A7CEC 00000000 */ nop /* 0A88F0 800A7CF0 0C032384 */ jal play_sound2 /* 0A88F4 800A7CF4 AE200020 */ sw $zero, 0x20($s1) /* 0A88F8 800A7CF8 1000011C */ b .L800A816C -/* 0A88FC 800A7CFC 00000000 */ nop +/* 0A88FC 800A7CFC 00000000 */ nop glabel L800A7D00 /* 0A8900 800A7D00 0C02A553 */ jal func_800A954C /* 0A8904 800A7D04 02202025 */ move $a0, $s1 /* 0A8908 800A7D08 10000118 */ b .L800A816C -/* 0A890C 800A7D0C 00000000 */ nop +/* 0A890C 800A7D0C 00000000 */ nop glabel L800A7D10 /* 0A8910 800A7D10 0C02A5C4 */ jal func_800A9710 /* 0A8914 800A7D14 02202025 */ move $a0, $s1 /* 0A8918 800A7D18 10000114 */ b .L800A816C -/* 0A891C 800A7D1C 00000000 */ nop +/* 0A891C 800A7D1C 00000000 */ nop glabel L800A7D20 /* 0A8920 800A7D20 0C02A5EF */ jal func_800A97BC /* 0A8924 800A7D24 02202025 */ move $a0, $s1 /* 0A8928 800A7D28 10000110 */ b .L800A816C -/* 0A892C 800A7D2C 00000000 */ nop +/* 0A892C 800A7D2C 00000000 */ nop glabel L800A7D30 /* 0A8930 800A7D30 8E220004 */ lw $v0, 4($s1) -/* 0A8934 800A7D34 3C0E800E */ lui $t6, %hi(D_800DC4CC) # $t6, 0x800e +/* 0A8934 800A7D34 3C0E800E */ lui $t6, %hi(gControllerFive) # $t6, 0x800e /* 0A8938 800A7D38 10400005 */ beqz $v0, .L800A7D50 -/* 0A893C 800A7D3C 00000000 */ nop +/* 0A893C 800A7D3C 00000000 */ nop /* 0A8940 800A7D40 10520010 */ beq $v0, $s2, .L800A7D84 -/* 0A8944 800A7D44 00000000 */ nop +/* 0A8944 800A7D44 00000000 */ nop /* 0A8948 800A7D48 1000000E */ b .L800A7D84 -/* 0A894C 800A7D4C 00000000 */ nop +/* 0A894C 800A7D4C 00000000 */ nop .L800A7D50: -/* 0A8950 800A7D50 8DCEC4CC */ lw $t6, %lo(D_800DC4CC)($t6) +/* 0A8950 800A7D50 8DCEC4CC */ lw $t6, %lo(gControllerFive)($t6) /* 0A8954 800A7D54 3C044900 */ lui $a0, (0x4900801C >> 16) # lui $a0, 0x4900 /* 0A8958 800A7D58 3484801C */ ori $a0, (0x4900801C & 0xFFFF) # ori $a0, $a0, 0x801c /* 0A895C 800A7D5C 95CF0004 */ lhu $t7, 4($t6) /* 0A8960 800A7D60 31F80010 */ andi $t8, $t7, 0x10 /* 0A8964 800A7D64 13000005 */ beqz $t8, .L800A7D7C -/* 0A8968 800A7D68 00000000 */ nop +/* 0A8968 800A7D68 00000000 */ nop /* 0A896C 800A7D6C 0C032384 */ jal play_sound2 /* 0A8970 800A7D70 AE320004 */ sw $s2, 4($s1) /* 0A8974 800A7D74 100000FD */ b .L800A816C -/* 0A8978 800A7D78 00000000 */ nop +/* 0A8978 800A7D78 00000000 */ nop .L800A7D7C: /* 0A897C 800A7D7C 100000FB */ b .L800A816C /* 0A8980 800A7D80 A2200015 */ sb $zero, 0x15($s1) @@ -233,7 +233,7 @@ glabel L800A7D8C /* 0A898C 800A7D8C 0C02A8A0 */ jal func_800AA280 /* 0A8990 800A7D90 02202025 */ move $a0, $s1 /* 0A8994 800A7D94 100000F5 */ b .L800A816C -/* 0A8998 800A7D98 00000000 */ nop +/* 0A8998 800A7D98 00000000 */ nop glabel L800A7D9C /* 0A899C 800A7D9C 3C198019 */ lui $t9, %hi(gMainMenuSelectionDepth) # $t9, 0x8019 /* 0A89A0 800A7DA0 8339EDED */ lb $t9, %lo(gMainMenuSelectionDepth)($t9) @@ -245,24 +245,24 @@ glabel L800A7D9C /* 0A89B8 800A7DB8 00280821 */ addu $at, $at, $t0 /* 0A89BC 800A7DBC 8C282440 */ lw $t0, %lo(jpt_800F2440)($at) /* 0A89C0 800A7DC0 01000008 */ jr $t0 -/* 0A89C4 800A7DC4 00000000 */ nop +/* 0A89C4 800A7DC4 00000000 */ nop glabel L800A7DC8 /* 0A89C8 800A7DC8 0C02A6E7 */ jal func_800A9B9C /* 0A89CC 800A7DCC 02202025 */ move $a0, $s1 /* 0A89D0 800A7DD0 100000E6 */ b .L800A816C -/* 0A89D4 800A7DD4 00000000 */ nop +/* 0A89D4 800A7DD4 00000000 */ nop glabel L800A7DD8 /* 0A89D8 800A7DD8 0C02A710 */ jal func_800A9C40 /* 0A89DC 800A7DDC 02202025 */ move $a0, $s1 /* 0A89E0 800A7DE0 100000E2 */ b .L800A816C -/* 0A89E4 800A7DE4 00000000 */ nop +/* 0A89E4 800A7DE4 00000000 */ nop glabel L800A7DE8 /* 0A89E8 800A7DE8 0C02A8A0 */ jal func_800AA280 /* 0A89EC 800A7DEC 02202025 */ move $a0, $s1 /* 0A89F0 800A7DF0 0C02A6A6 */ jal func_800A9A98 /* 0A89F4 800A7DF4 02202025 */ move $a0, $s1 /* 0A89F8 800A7DF8 100000DC */ b .L800A816C -/* 0A89FC 800A7DFC 00000000 */ nop +/* 0A89FC 800A7DFC 00000000 */ nop glabel L800A7E00 /* 0A8A00 800A7E00 3C098019 */ lui $t1, %hi(gMainMenuSelectionDepth) # $t1, 0x8019 /* 0A8A04 800A7E04 8129EDED */ lb $t1, %lo(gMainMenuSelectionDepth)($t1) @@ -274,12 +274,12 @@ glabel L800A7E00 /* 0A8A1C 800A7E1C 002A0821 */ addu $at, $at, $t2 /* 0A8A20 800A7E20 8C2A2460 */ lw $t2, %lo(jpt_800F2460)($at) /* 0A8A24 800A7E24 01400008 */ jr $t2 -/* 0A8A28 800A7E28 00000000 */ nop +/* 0A8A28 800A7E28 00000000 */ nop glabel L800A7E2C /* 0A8A2C 800A7E2C 0C02A6E7 */ jal func_800A9B9C /* 0A8A30 800A7E30 02202025 */ move $a0, $s1 /* 0A8A34 800A7E34 10000003 */ b .L800A7E44 -/* 0A8A38 800A7E38 00000000 */ nop +/* 0A8A38 800A7E38 00000000 */ nop glabel L800A7E3C /* 0A8A3C 800A7E3C 0C02A710 */ jal func_800A9C40 /* 0A8A40 800A7E40 02202025 */ move $a0, $s1 @@ -287,22 +287,22 @@ glabel L800A7E3C /* 0A8A44 800A7E44 0C02A757 */ jal func_800A9D5C /* 0A8A48 800A7E48 02202025 */ move $a0, $s1 /* 0A8A4C 800A7E4C 100000C7 */ b .L800A816C -/* 0A8A50 800A7E50 00000000 */ nop +/* 0A8A50 800A7E50 00000000 */ nop glabel L800A7E54 /* 0A8A54 800A7E54 0C02A796 */ jal func_800A9E58 /* 0A8A58 800A7E58 02202025 */ move $a0, $s1 /* 0A8A5C 800A7E5C 100000C3 */ b .L800A816C -/* 0A8A60 800A7E60 00000000 */ nop +/* 0A8A60 800A7E60 00000000 */ nop glabel L800A7E64 /* 0A8A64 800A7E64 0C02A8BB */ jal func_800AA2EC /* 0A8A68 800A7E68 02202025 */ move $a0, $s1 /* 0A8A6C 800A7E6C 100000BF */ b .L800A816C -/* 0A8A70 800A7E70 00000000 */ nop +/* 0A8A70 800A7E70 00000000 */ nop glabel L800A7E74 /* 0A8A74 800A7E74 0C02AB75 */ jal func_800AADD4 /* 0A8A78 800A7E78 02202025 */ move $a0, $s1 /* 0A8A7C 800A7E7C 100000BB */ b .L800A816C -/* 0A8A80 800A7E80 00000000 */ nop +/* 0A8A80 800A7E80 00000000 */ nop glabel L800A7E84 /* 0A8A84 800A7E84 0C02AB06 */ jal func_800AAC18 /* 0A8A88 800A7E88 02202025 */ move $a0, $s1 @@ -315,7 +315,7 @@ glabel L800A7E84 /* 0A8AA4 800A7EA4 002C0821 */ addu $at, $at, $t4 /* 0A8AA8 800A7EA8 8C2C2480 */ lw $t4, %lo(jpt_800F2480)($at) /* 0A8AAC 800A7EAC 01800008 */ jr $t4 -/* 0A8AB0 800A7EB0 00000000 */ nop +/* 0A8AB0 800A7EB0 00000000 */ nop glabel L800A7EB4 /* 0A8AB4 800A7EB4 0C02A9A7 */ jal func_800AA69C /* 0A8AB8 800A7EB8 02202025 */ move $a0, $s1 @@ -324,18 +324,18 @@ glabel L800A7EB4 /* 0A8AC0 800A7EC0 8042EDEE */ lb $v0, %lo(D_8018EDEE)($v0) /* 0A8AC4 800A7EC4 24010002 */ li $at, 2 /* 0A8AC8 800A7EC8 10520007 */ beq $v0, $s2, .L800A7EE8 -/* 0A8ACC 800A7ECC 00000000 */ nop +/* 0A8ACC 800A7ECC 00000000 */ nop /* 0A8AD0 800A7ED0 10410009 */ beq $v0, $at, .L800A7EF8 /* 0A8AD4 800A7ED4 24010003 */ li $at, 3 /* 0A8AD8 800A7ED8 10410007 */ beq $v0, $at, .L800A7EF8 -/* 0A8ADC 800A7EDC 00000000 */ nop +/* 0A8ADC 800A7EDC 00000000 */ nop /* 0A8AE0 800A7EE0 10000007 */ b .L800A7F00 -/* 0A8AE4 800A7EE4 00000000 */ nop +/* 0A8AE4 800A7EE4 00000000 */ nop .L800A7EE8: /* 0A8AE8 800A7EE8 0C02AAE4 */ jal func_800AAB90 /* 0A8AEC 800A7EEC 02202025 */ move $a0, $s1 /* 0A8AF0 800A7EF0 10000003 */ b .L800A7F00 -/* 0A8AF4 800A7EF4 00000000 */ nop +/* 0A8AF4 800A7EF4 00000000 */ nop .L800A7EF8: /* 0A8AF8 800A7EF8 0C02AAA7 */ jal func_800AAA9C /* 0A8AFC 800A7EFC 02202025 */ move $a0, $s1 @@ -343,12 +343,12 @@ glabel L800A7EB4 /* 0A8B00 800A7F00 0C02AB86 */ jal func_800AAE18 /* 0A8B04 800A7F04 02202025 */ move $a0, $s1 /* 0A8B08 800A7F08 10000098 */ b .L800A816C -/* 0A8B0C 800A7F0C 00000000 */ nop +/* 0A8B0C 800A7F0C 00000000 */ nop glabel L800A7F10 /* 0A8B10 800A7F10 0C02A6A6 */ jal func_800A9A98 /* 0A8B14 800A7F14 02202025 */ move $a0, $s1 /* 0A8B18 800A7F18 10000094 */ b .L800A816C -/* 0A8B1C 800A7F1C 00000000 */ nop +/* 0A8B1C 800A7F1C 00000000 */ nop glabel L800A7F20 /* 0A8B20 800A7F20 0C02AC59 */ jal func_800AB164 /* 0A8B24 800A7F24 02202025 */ move $a0, $s1 @@ -356,178 +356,178 @@ glabel L800A7F20 /* 0A8B2C 800A7F2C 8042EDEC */ lb $v0, %lo(D_8018EDEC)($v0) /* 0A8B30 800A7F30 24010002 */ li $at, 2 /* 0A8B34 800A7F34 10520007 */ beq $v0, $s2, .L800A7F54 -/* 0A8B38 800A7F38 00000000 */ nop +/* 0A8B38 800A7F38 00000000 */ nop /* 0A8B3C 800A7F3C 10410009 */ beq $v0, $at, .L800A7F64 /* 0A8B40 800A7F40 24010003 */ li $at, 3 /* 0A8B44 800A7F44 10410007 */ beq $v0, $at, .L800A7F64 -/* 0A8B48 800A7F48 00000000 */ nop +/* 0A8B48 800A7F48 00000000 */ nop /* 0A8B4C 800A7F4C 10000087 */ b .L800A816C -/* 0A8B50 800A7F50 00000000 */ nop +/* 0A8B50 800A7F50 00000000 */ nop .L800A7F54: /* 0A8B54 800A7F54 0C02AC08 */ jal func_800AB020 /* 0A8B58 800A7F58 02202025 */ move $a0, $s1 /* 0A8B5C 800A7F5C 10000083 */ b .L800A816C -/* 0A8B60 800A7F60 00000000 */ nop +/* 0A8B60 800A7F60 00000000 */ nop .L800A7F64: /* 0A8B64 800A7F64 0C02AC26 */ jal func_800AB098 /* 0A8B68 800A7F68 02202025 */ move $a0, $s1 /* 0A8B6C 800A7F6C 1000007F */ b .L800A816C -/* 0A8B70 800A7F70 00000000 */ nop +/* 0A8B70 800A7F70 00000000 */ nop glabel L800A7F74 /* 0A8B74 800A7F74 0C02AC98 */ jal func_800AB260 /* 0A8B78 800A7F78 02202025 */ move $a0, $s1 /* 0A8B7C 800A7F7C 1000007B */ b .L800A816C -/* 0A8B80 800A7F80 00000000 */ nop +/* 0A8B80 800A7F80 00000000 */ nop glabel L800A7F84 /* 0A8B84 800A7F84 0C02ACC5 */ jal func_800AB314 /* 0A8B88 800A7F88 02202025 */ move $a0, $s1 /* 0A8B8C 800A7F8C 10000077 */ b .L800A816C -/* 0A8B90 800A7F90 00000000 */ nop +/* 0A8B90 800A7F90 00000000 */ nop glabel L800A7F94 /* 0A8B94 800A7F94 0C02ACA4 */ jal func_800AB290 /* 0A8B98 800A7F98 02202025 */ move $a0, $s1 /* 0A8B9C 800A7F9C 10000073 */ b .L800A816C -/* 0A8BA0 800A7FA0 00000000 */ nop +/* 0A8BA0 800A7FA0 00000000 */ nop glabel L800A7FA4 /* 0A8BA4 800A7FA4 0C02AE41 */ jal func_800AB904 /* 0A8BA8 800A7FA8 02202025 */ move $a0, $s1 /* 0A8BAC 800A7FAC 1000006F */ b .L800A816C -/* 0A8BB0 800A7FB0 00000000 */ nop +/* 0A8BB0 800A7FB0 00000000 */ nop glabel L800A7FB4 /* 0A8BB4 800A7FB4 0C02AE6C */ jal func_800AB9B0 /* 0A8BB8 800A7FB8 02202025 */ move $a0, $s1 /* 0A8BBC 800A7FBC 1000006B */ b .L800A816C -/* 0A8BC0 800A7FC0 00000000 */ nop +/* 0A8BC0 800A7FC0 00000000 */ nop glabel L800A7FC4 /* 0A8BC4 800A7FC4 0C02AEBA */ jal func_800ABAE8 /* 0A8BC8 800A7FC8 02202025 */ move $a0, $s1 /* 0A8BCC 800A7FCC 10000067 */ b .L800A816C -/* 0A8BD0 800A7FD0 00000000 */ nop +/* 0A8BD0 800A7FD0 00000000 */ nop glabel L800A7FD4 /* 0A8BD4 800A7FD4 0C02AEC9 */ jal func_800ABB24 /* 0A8BD8 800A7FD8 02202025 */ move $a0, $s1 /* 0A8BDC 800A7FDC 10000063 */ b .L800A816C -/* 0A8BE0 800A7FE0 00000000 */ nop +/* 0A8BE0 800A7FE0 00000000 */ nop glabel L800A7FE4 /* 0A8BE4 800A7FE4 0C02AEF3 */ jal func_800ABBCC /* 0A8BE8 800A7FE8 02202025 */ move $a0, $s1 /* 0A8BEC 800A7FEC 1000005F */ b .L800A816C -/* 0A8BF0 800A7FF0 00000000 */ nop +/* 0A8BF0 800A7FF0 00000000 */ nop glabel L800A7FF4 /* 0A8BF4 800A7FF4 0C02AF0E */ jal func_800ABC38 /* 0A8BF8 800A7FF8 02202025 */ move $a0, $s1 /* 0A8BFC 800A7FFC 1000005B */ b .L800A816C -/* 0A8C00 800A8000 00000000 */ nop +/* 0A8C00 800A8000 00000000 */ nop glabel L800A8004 /* 0A8C04 800A8004 0C02AFAB */ jal func_800ABEAC /* 0A8C08 800A8008 02202025 */ move $a0, $s1 /* 0A8C0C 800A800C 10000057 */ b .L800A816C -/* 0A8C10 800A8010 00000000 */ nop +/* 0A8C10 800A8010 00000000 */ nop glabel L800A8014 /* 0A8C14 800A8014 0C02B0C0 */ jal func_800AC300 /* 0A8C18 800A8018 02202025 */ move $a0, $s1 /* 0A8C1C 800A801C 10000053 */ b .L800A816C -/* 0A8C20 800A8020 00000000 */ nop +/* 0A8C20 800A8020 00000000 */ nop glabel L800A8024 /* 0A8C24 800A8024 0C02B0C9 */ jal func_800AC324 /* 0A8C28 800A8028 02202025 */ move $a0, $s1 /* 0A8C2C 800A802C 1000004F */ b .L800A816C -/* 0A8C30 800A8030 00000000 */ nop +/* 0A8C30 800A8030 00000000 */ nop glabel L800A8034 /* 0A8C34 800A8034 0C02B116 */ jal func_800AC458 /* 0A8C38 800A8038 02202025 */ move $a0, $s1 /* 0A8C3C 800A803C 1000004B */ b .L800A816C -/* 0A8C40 800A8040 00000000 */ nop +/* 0A8C40 800A8040 00000000 */ nop glabel L800A8044 /* 0A8C44 800A8044 0C02B285 */ jal func_800ACA14 /* 0A8C48 800A8048 02202025 */ move $a0, $s1 /* 0A8C4C 800A804C 10000047 */ b .L800A816C -/* 0A8C50 800A8050 00000000 */ nop +/* 0A8C50 800A8050 00000000 */ nop glabel L800A8054 /* 0A8C54 800A8054 0C02B25E */ jal func_800AC978 /* 0A8C58 800A8058 02202025 */ move $a0, $s1 /* 0A8C5C 800A805C 10000043 */ b .L800A816C -/* 0A8C60 800A8060 00000000 */ nop +/* 0A8C60 800A8060 00000000 */ nop glabel L800A8064 /* 0A8C64 800A8064 0C02B314 */ jal func_800ACC50 /* 0A8C68 800A8068 02202025 */ move $a0, $s1 /* 0A8C6C 800A806C 1000003F */ b .L800A816C -/* 0A8C70 800A8070 00000000 */ nop +/* 0A8C70 800A8070 00000000 */ nop glabel L800A8074 /* 0A8C74 800A8074 0C02B3D0 */ jal func_800ACF40 /* 0A8C78 800A8078 02202025 */ move $a0, $s1 /* 0A8C7C 800A807C 1000003B */ b .L800A816C -/* 0A8C80 800A8080 00000000 */ nop +/* 0A8C80 800A8080 00000000 */ nop glabel L800A8084 /* 0A8C84 800A8084 0C02B469 */ jal func_800AD1A4 /* 0A8C88 800A8088 02202025 */ move $a0, $s1 /* 0A8C8C 800A808C 10000037 */ b .L800A816C -/* 0A8C90 800A8090 00000000 */ nop +/* 0A8C90 800A8090 00000000 */ nop glabel L800A8094 /* 0A8C94 800A8094 0C02B4BA */ jal func_800AD2E8 /* 0A8C98 800A8098 02202025 */ move $a0, $s1 /* 0A8C9C 800A809C 10000033 */ b .L800A816C -/* 0A8CA0 800A80A0 00000000 */ nop +/* 0A8CA0 800A80A0 00000000 */ nop glabel L800A80A4 /* 0A8CA4 800A80A4 0C02BB15 */ jal func_800AEC54 /* 0A8CA8 800A80A8 02202025 */ move $a0, $s1 /* 0A8CAC 800A80AC 1000002F */ b .L800A816C -/* 0A8CB0 800A80B0 00000000 */ nop +/* 0A8CB0 800A80B0 00000000 */ nop glabel L800A80B4 /* 0A8CB4 800A80B4 0C02B7D2 */ jal func_800ADF48 /* 0A8CB8 800A80B8 02202025 */ move $a0, $s1 /* 0A8CBC 800A80BC 1000002B */ b .L800A816C -/* 0A8CC0 800A80C0 00000000 */ nop +/* 0A8CC0 800A80C0 00000000 */ nop glabel L800A80C4 /* 0A8CC4 800A80C4 0C02B886 */ jal func_800AE218 /* 0A8CC8 800A80C8 02202025 */ move $a0, $s1 /* 0A8CCC 800A80CC 10000027 */ b .L800A816C -/* 0A8CD0 800A80D0 00000000 */ nop +/* 0A8CD0 800A80D0 00000000 */ nop glabel L800A80D4 /* 0A8CD4 800A80D4 0C02BB6F */ jal func_800AEDBC /* 0A8CD8 800A80D8 02202025 */ move $a0, $s1 /* 0A8CDC 800A80DC 10000023 */ b .L800A816C -/* 0A8CE0 800A80E0 00000000 */ nop +/* 0A8CE0 800A80E0 00000000 */ nop glabel L800A80E4 /* 0A8CE4 800A80E4 0C02BBA4 */ jal func_800AEE90 /* 0A8CE8 800A80E8 02202025 */ move $a0, $s1 /* 0A8CEC 800A80EC 1000001F */ b .L800A816C -/* 0A8CF0 800A80F0 00000000 */ nop +/* 0A8CF0 800A80F0 00000000 */ nop glabel L800A80F4 /* 0A8CF4 800A80F4 0C02BBAF */ jal func_800AEEBC /* 0A8CF8 800A80F8 02202025 */ move $a0, $s1 /* 0A8CFC 800A80FC 1000001B */ b .L800A816C -/* 0A8D00 800A8100 00000000 */ nop +/* 0A8D00 800A8100 00000000 */ nop glabel L800A8104 /* 0A8D04 800A8104 0C02BBBA */ jal func_800AEEE8 /* 0A8D08 800A8108 02202025 */ move $a0, $s1 /* 0A8D0C 800A810C 10000017 */ b .L800A816C -/* 0A8D10 800A8110 00000000 */ nop +/* 0A8D10 800A8110 00000000 */ nop glabel L800A8114 /* 0A8D14 800A8114 0C02BBC5 */ jal func_800AEF14 /* 0A8D18 800A8118 02202025 */ move $a0, $s1 /* 0A8D1C 800A811C 10000013 */ b .L800A816C -/* 0A8D20 800A8120 00000000 */ nop +/* 0A8D20 800A8120 00000000 */ nop glabel L800A8124 /* 0A8D24 800A8124 0C02BBDD */ jal func_800AEF74 /* 0A8D28 800A8128 02202025 */ move $a0, $s1 /* 0A8D2C 800A812C 1000000F */ b .L800A816C -/* 0A8D30 800A8130 00000000 */ nop +/* 0A8D30 800A8130 00000000 */ nop glabel L800A8134 /* 0A8D34 800A8134 0C02BC01 */ jal func_800AF004 /* 0A8D38 800A8138 02202025 */ move $a0, $s1 /* 0A8D3C 800A813C 1000000B */ b .L800A816C -/* 0A8D40 800A8140 00000000 */ nop +/* 0A8D40 800A8140 00000000 */ nop glabel L800A8144 /* 0A8D44 800A8144 0C02BC6B */ jal func_800AF1AC /* 0A8D48 800A8148 02202025 */ move $a0, $s1 /* 0A8D4C 800A814C 10000007 */ b .L800A816C -/* 0A8D50 800A8150 00000000 */ nop +/* 0A8D50 800A8150 00000000 */ nop glabel L800A8154 /* 0A8D54 800A8154 0C02BC9C */ jal func_800AF270 /* 0A8D58 800A8158 02202025 */ move $a0, $s1 /* 0A8D5C 800A815C 10000003 */ b .L800A816C -/* 0A8D60 800A8160 00000000 */ nop +/* 0A8D60 800A8160 00000000 */ nop glabel L800A8164 /* 0A8D64 800A8164 0C02BD20 */ jal func_800AF480 /* 0A8D68 800A8168 02202025 */ move $a0, $s1 @@ -548,19 +548,19 @@ glabel L800A816C .L800A8198: /* 0A8D98 800A8198 00001825 */ move $v1, $zero /* 0A8D9C 800A819C 10540005 */ beq $v0, $s4, .L800A81B4 -/* 0A8DA0 800A81A0 00000000 */ nop +/* 0A8DA0 800A81A0 00000000 */ nop /* 0A8DA4 800A81A4 10550003 */ beq $v0, $s5, .L800A81B4 -/* 0A8DA8 800A81A8 00000000 */ nop +/* 0A8DA8 800A81A8 00000000 */ nop /* 0A8DAC 800A81AC 14560005 */ bne $v0, $s6, .L800A81C4 -/* 0A8DB0 800A81B0 00000000 */ nop +/* 0A8DB0 800A81B0 00000000 */ nop .L800A81B4: /* 0A8DB4 800A81B4 12600006 */ beqz $s3, .L800A81D0 -/* 0A8DB8 800A81B8 00000000 */ nop +/* 0A8DB8 800A81B8 00000000 */ nop /* 0A8DBC 800A81BC 10000004 */ b .L800A81D0 /* 0A8DC0 800A81C0 24030001 */ li $v1, 1 .L800A81C4: /* 0A8DC4 800A81C4 16600002 */ bnez $s3, .L800A81D0 -/* 0A8DC8 800A81C8 00000000 */ nop +/* 0A8DC8 800A81C8 00000000 */ nop /* 0A8DCC 800A81CC 24030001 */ li $v1, 1 .L800A81D0: /* 0A8DD0 800A81D0 50600007 */ beql $v1, $zero, .L800A81F0 @@ -577,7 +577,7 @@ glabel L800A816C /* 0A8DF8 800A81F8 26100001 */ addiu $s0, $s0, 1 /* 0A8DFC 800A81FC 24010010 */ li $at, 16 /* 0A8E00 800A8200 1601FFE2 */ bne $s0, $at, .L800A818C -/* 0A8E04 800A8204 00000000 */ nop +/* 0A8E04 800A8204 00000000 */ nop /* 0A8E08 800A8208 8FBF0034 */ lw $ra, 0x34($sp) /* 0A8E0C 800A820C 8FB00018 */ lw $s0, 0x18($sp) /* 0A8E10 800A8210 8FB1001C */ lw $s1, 0x1c($sp) diff --git a/asm/non_matchings/code_80091750/func_800ACA14.s b/asm/non_matchings/code_80091750/func_800ACA14.s index e1dc03b36..330870de5 100644 --- a/asm/non_matchings/code_80091750/func_800ACA14.s +++ b/asm/non_matchings/code_80091750/func_800ACA14.s @@ -9,7 +9,7 @@ glabel func_800ACA14 /* 0AD630 800ACA30 10410015 */ beq $v0, $at, .L800ACA88 /* 0AD634 800ACA34 2401000C */ li $at, 12 /* 0AD638 800ACA38 10410013 */ beq $v0, $at, .L800ACA88 -/* 0AD63C 800ACA3C 00000000 */ nop +/* 0AD63C 800ACA3C 00000000 */ nop /* 0AD640 800ACA40 1000007B */ b .L800ACC30 /* 0AD644 800ACA44 8C820020 */ lw $v0, 0x20($a0) /* 0AD648 800ACA48 8CAE0020 */ lw $t6, 0x20($a1) @@ -25,7 +25,7 @@ glabel func_800ACA14 .L800ACA6C: /* 0AD66C 800ACA6C 2B210065 */ slti $at, $t9, 0x65 /* 0AD670 800ACA70 14200003 */ bnez $at, .L800ACA80 -/* 0AD674 800ACA74 00000000 */ nop +/* 0AD674 800ACA74 00000000 */ nop /* 0AD678 800ACA78 ACA80004 */ sw $t0, 4($a1) /* 0AD67C 800ACA7C ACA0001C */ sw $zero, 0x1c($a1) .L800ACA80: @@ -39,8 +39,8 @@ glabel func_800ACA14 /* 0AD698 800ACA98 10000065 */ b .L800ACC30 /* 0AD69C 800ACA9C 8CA20020 */ lw $v0, 0x20($a1) .L800ACAA0: -/* 0AD6A0 800ACAA0 3C02800E */ lui $v0, %hi(D_800DC4CC) # $v0, 0x800e -/* 0AD6A4 800ACAA4 8C42C4CC */ lw $v0, %lo(D_800DC4CC)($v0) +/* 0AD6A0 800ACAA0 3C02800E */ lui $v0, %hi(gControllerFive) # $v0, 0x800e +/* 0AD6A4 800ACAA4 8C42C4CC */ lw $v0, %lo(gControllerFive)($v0) /* 0AD6A8 800ACAA8 94430006 */ lhu $v1, 6($v0) /* 0AD6AC 800ACAAC 9449000C */ lhu $t1, 0xc($v0) /* 0AD6B0 800ACAB0 00692025 */ or $a0, $v1, $t1 @@ -63,20 +63,20 @@ glabel func_800ACA14 /* 0AD6F4 800ACAF4 3C014010 */ li $at, 0x40100000 # 2.250000 /* 0AD6F8 800ACAF8 240CFFFF */ li $t4, -1 /* 0AD6FC 800ACAFC 46002021 */ cvt.d.s $f0, $f4 -/* 0AD700 800ACB00 3C0D800E */ lui $t5, %hi(D_800DC4CC) # $t5, 0x800e +/* 0AD700 800ACB00 3C0D800E */ lui $t5, %hi(gControllerFive) # $t5, 0x800e /* 0AD704 800ACB04 4626003C */ c.lt.d $f0, $f6 -/* 0AD708 800ACB08 00000000 */ nop +/* 0AD708 800ACB08 00000000 */ nop /* 0AD70C 800ACB0C 45020008 */ bc1fl .L800ACB30 /* 0AD710 800ACB10 ACAC0008 */ sw $t4, 8($a1) /* 0AD714 800ACB14 44814800 */ mtc1 $at, $f9 /* 0AD718 800ACB18 44804000 */ mtc1 $zero, $f8 -/* 0AD71C 800ACB1C 00000000 */ nop +/* 0AD71C 800ACB1C 00000000 */ nop /* 0AD720 800ACB20 46280280 */ add.d $f10, $f0, $f8 /* 0AD724 800ACB24 46205420 */ cvt.s.d $f16, $f10 /* 0AD728 800ACB28 E4B00024 */ swc1 $f16, 0x24($a1) /* 0AD72C 800ACB2C ACAC0008 */ sw $t4, 8($a1) .L800ACB30: -/* 0AD730 800ACB30 8DADC4CC */ lw $t5, %lo(D_800DC4CC)($t5) +/* 0AD730 800ACB30 8DADC4CC */ lw $t5, %lo(gControllerFive)($t5) /* 0AD734 800ACB34 95A30006 */ lhu $v1, 6($t5) /* 0AD738 800ACB38 95AE000C */ lhu $t6, 0xc($t5) /* 0AD73C 800ACB3C 006E2025 */ or $a0, $v1, $t6 @@ -101,20 +101,20 @@ glabel func_800ACA14 /* 0AD780 800ACB80 3C014010 */ li $at, 0x40100000 # 2.250000 /* 0AD784 800ACB84 24190001 */ li $t9, 1 /* 0AD788 800ACB88 46009021 */ cvt.d.s $f0, $f18 -/* 0AD78C 800ACB8C 3C08800E */ lui $t0, %hi(D_800DC4CC) # $t0, 0x800e +/* 0AD78C 800ACB8C 3C08800E */ lui $t0, %hi(gControllerFive) # $t0, 0x800e /* 0AD790 800ACB90 4624003C */ c.lt.d $f0, $f4 -/* 0AD794 800ACB94 00000000 */ nop +/* 0AD794 800ACB94 00000000 */ nop /* 0AD798 800ACB98 45020008 */ bc1fl .L800ACBBC /* 0AD79C 800ACB9C ACB90008 */ sw $t9, 8($a1) /* 0AD7A0 800ACBA0 44813800 */ mtc1 $at, $f7 /* 0AD7A4 800ACBA4 44803000 */ mtc1 $zero, $f6 -/* 0AD7A8 800ACBA8 00000000 */ nop +/* 0AD7A8 800ACBA8 00000000 */ nop /* 0AD7AC 800ACBAC 46260200 */ add.d $f8, $f0, $f6 /* 0AD7B0 800ACBB0 462042A0 */ cvt.s.d $f10, $f8 /* 0AD7B4 800ACBB4 E4AA0024 */ swc1 $f10, 0x24($a1) /* 0AD7B8 800ACBB8 ACB90008 */ sw $t9, 8($a1) .L800ACBBC: -/* 0AD7BC 800ACBBC 8D08C4CC */ lw $t0, %lo(D_800DC4CC)($t0) +/* 0AD7BC 800ACBBC 8D08C4CC */ lw $t0, %lo(gControllerFive)($t0) /* 0AD7C0 800ACBC0 95030006 */ lhu $v1, 6($t0) .L800ACBC4: /* 0AD7C4 800ACBC4 30699000 */ andi $t1, $v1, 0x9000 @@ -135,12 +135,12 @@ glabel func_800ACA14 /* 0AD7FC 800ACBFC 3C014010 */ li $at, 0x40100000 # 2.250000 /* 0AD800 800ACC00 46008021 */ cvt.d.s $f0, $f16 /* 0AD804 800ACC04 4632003C */ c.lt.d $f0, $f18 -/* 0AD808 800ACC08 00000000 */ nop +/* 0AD808 800ACC08 00000000 */ nop /* 0AD80C 800ACC0C 45020008 */ bc1fl .L800ACC30 /* 0AD810 800ACC10 8CA20020 */ lw $v0, 0x20($a1) /* 0AD814 800ACC14 44812800 */ mtc1 $at, $f5 /* 0AD818 800ACC18 44802000 */ mtc1 $zero, $f4 -/* 0AD81C 800ACC1C 00000000 */ nop +/* 0AD81C 800ACC1C 00000000 */ nop /* 0AD820 800ACC20 46240180 */ add.d $f6, $f0, $f4 /* 0AD824 800ACC24 46203220 */ cvt.s.d $f8, $f6 /* 0AD828 800ACC28 E4A80024 */ swc1 $f8, 0x24($a1) @@ -155,4 +155,4 @@ glabel func_800ACA14 /* 0AD840 800ACC40 8FBF0014 */ lw $ra, 0x14($sp) /* 0AD844 800ACC44 27BD0018 */ addiu $sp, $sp, 0x18 /* 0AD848 800ACC48 03E00008 */ jr $ra -/* 0AD84C 800ACC4C 00000000 */ nop +/* 0AD84C 800ACC4C 00000000 */ nop diff --git a/asm/non_matchings/code_80091750/func_800ACC50.s b/asm/non_matchings/code_80091750/func_800ACC50.s index b32ae7c9d..e3b00a8fd 100644 --- a/asm/non_matchings/code_80091750/func_800ACC50.s +++ b/asm/non_matchings/code_80091750/func_800ACC50.s @@ -11,7 +11,7 @@ glabel func_800ACC50 /* 0AD874 800ACC74 002E0821 */ addu $at, $at, $t6 /* 0AD878 800ACC78 8C2E26D8 */ lw $t6, %lo(jpt_800F26D8)($at) /* 0AD87C 800ACC7C 01C00008 */ jr $t6 -/* 0AD880 800ACC80 00000000 */ nop +/* 0AD880 800ACC80 00000000 */ nop glabel L800ACC84 /* 0AD884 800ACC84 8CAF001C */ lw $t7, 0x1c($a1) /* 0AD888 800ACC88 24080001 */ li $t0, 1 @@ -80,8 +80,8 @@ glabel L800ACD68 /* 0AD96C 800ACD6C AFA50020 */ sw $a1, 0x20($sp) /* 0AD970 800ACD70 1440006E */ bnez $v0, .L800ACF2C /* 0AD974 800ACD74 8FA50020 */ lw $a1, 0x20($sp) -/* 0AD978 800ACD78 3C02800E */ lui $v0, %hi(D_800DC4CC) # $v0, 0x800e -/* 0AD97C 800ACD7C 8C42C4CC */ lw $v0, %lo(D_800DC4CC)($v0) +/* 0AD978 800ACD78 3C02800E */ lui $v0, %hi(gControllerFive) # $v0, 0x800e +/* 0AD97C 800ACD7C 8C42C4CC */ lw $v0, %lo(gControllerFive)($v0) /* 0AD980 800ACD80 94430006 */ lhu $v1, 6($v0) /* 0AD984 800ACD84 944C000C */ lhu $t4, 0xc($v0) /* 0AD988 800ACD88 006C2025 */ or $a0, $v1, $t4 @@ -104,20 +104,20 @@ glabel L800ACD68 /* 0AD9CC 800ACDCC 3C014010 */ li $at, 0x40100000 # 2.250000 /* 0AD9D0 800ACDD0 240FFFFF */ li $t7, -1 /* 0AD9D4 800ACDD4 46002021 */ cvt.d.s $f0, $f4 -/* 0AD9D8 800ACDD8 3C18800E */ lui $t8, %hi(D_800DC4CC) # $t8, 0x800e +/* 0AD9D8 800ACDD8 3C18800E */ lui $t8, %hi(gControllerFive) # $t8, 0x800e /* 0AD9DC 800ACDDC 4626003C */ c.lt.d $f0, $f6 -/* 0AD9E0 800ACDE0 00000000 */ nop +/* 0AD9E0 800ACDE0 00000000 */ nop /* 0AD9E4 800ACDE4 45020008 */ bc1fl .L800ACE08 /* 0AD9E8 800ACDE8 ACAF0008 */ sw $t7, 8($a1) /* 0AD9EC 800ACDEC 44814800 */ mtc1 $at, $f9 /* 0AD9F0 800ACDF0 44804000 */ mtc1 $zero, $f8 -/* 0AD9F4 800ACDF4 00000000 */ nop +/* 0AD9F4 800ACDF4 00000000 */ nop /* 0AD9F8 800ACDF8 46280280 */ add.d $f10, $f0, $f8 /* 0AD9FC 800ACDFC 46205420 */ cvt.s.d $f16, $f10 /* 0ADA00 800ACE00 E4B00024 */ swc1 $f16, 0x24($a1) /* 0ADA04 800ACE04 ACAF0008 */ sw $t7, 8($a1) .L800ACE08: -/* 0ADA08 800ACE08 8F18C4CC */ lw $t8, %lo(D_800DC4CC)($t8) +/* 0ADA08 800ACE08 8F18C4CC */ lw $t8, %lo(gControllerFive)($t8) /* 0ADA0C 800ACE0C 97030006 */ lhu $v1, 6($t8) /* 0ADA10 800ACE10 9719000C */ lhu $t9, 0xc($t8) /* 0ADA14 800ACE14 00792025 */ or $a0, $v1, $t9 @@ -142,20 +142,20 @@ glabel L800ACD68 /* 0ADA58 800ACE58 3C014010 */ li $at, 0x40100000 # 2.250000 /* 0ADA5C 800ACE5C 240A0001 */ li $t2, 1 /* 0ADA60 800ACE60 46009021 */ cvt.d.s $f0, $f18 -/* 0ADA64 800ACE64 3C0B800E */ lui $t3, %hi(D_800DC4CC) # $t3, 0x800e +/* 0ADA64 800ACE64 3C0B800E */ lui $t3, %hi(gControllerFive) # $t3, 0x800e /* 0ADA68 800ACE68 4624003C */ c.lt.d $f0, $f4 -/* 0ADA6C 800ACE6C 00000000 */ nop +/* 0ADA6C 800ACE6C 00000000 */ nop /* 0ADA70 800ACE70 45020008 */ bc1fl .L800ACE94 /* 0ADA74 800ACE74 ACAA0008 */ sw $t2, 8($a1) /* 0ADA78 800ACE78 44813800 */ mtc1 $at, $f7 /* 0ADA7C 800ACE7C 44803000 */ mtc1 $zero, $f6 -/* 0ADA80 800ACE80 00000000 */ nop +/* 0ADA80 800ACE80 00000000 */ nop /* 0ADA84 800ACE84 46260200 */ add.d $f8, $f0, $f6 /* 0ADA88 800ACE88 462042A0 */ cvt.s.d $f10, $f8 /* 0ADA8C 800ACE8C E4AA0024 */ swc1 $f10, 0x24($a1) /* 0ADA90 800ACE90 ACAA0008 */ sw $t2, 8($a1) .L800ACE94: -/* 0ADA94 800ACE94 8D6BC4CC */ lw $t3, %lo(D_800DC4CC)($t3) +/* 0ADA94 800ACE94 8D6BC4CC */ lw $t3, %lo(gControllerFive)($t3) /* 0ADA98 800ACE98 95630006 */ lhu $v1, 6($t3) .L800ACE9C: /* 0ADA9C 800ACE9C 306C9000 */ andi $t4, $v1, 0x9000 @@ -188,12 +188,12 @@ glabel L800ACD68 /* 0ADAFC 800ACEFC 46008021 */ cvt.d.s $f0, $f16 /* 0ADB00 800ACF00 3C014010 */ li $at, 0x40100000 # 2.250000 /* 0ADB04 800ACF04 4632003C */ c.lt.d $f0, $f18 -/* 0ADB08 800ACF08 00000000 */ nop +/* 0ADB08 800ACF08 00000000 */ nop /* 0ADB0C 800ACF0C 45020008 */ bc1fl .L800ACF30 /* 0ADB10 800ACF10 8FBF001C */ lw $ra, 0x1c($sp) /* 0ADB14 800ACF14 44812800 */ mtc1 $at, $f5 /* 0ADB18 800ACF18 44802000 */ mtc1 $zero, $f4 -/* 0ADB1C 800ACF1C 00000000 */ nop +/* 0ADB1C 800ACF1C 00000000 */ nop /* 0ADB20 800ACF20 46240180 */ add.d $f6, $f0, $f4 /* 0ADB24 800ACF24 46203220 */ cvt.s.d $f8, $f6 /* 0ADB28 800ACF28 E4A80024 */ swc1 $f8, 0x24($a1) @@ -204,4 +204,4 @@ glabel L800ACF2C /* 0ADB30 800ACF30 8FB00018 */ lw $s0, 0x18($sp) /* 0ADB34 800ACF34 27BD0020 */ addiu $sp, $sp, 0x20 /* 0ADB38 800ACF38 03E00008 */ jr $ra -/* 0ADB3C 800ACF3C 00000000 */ nop +/* 0ADB3C 800ACF3C 00000000 */ nop diff --git a/asm/non_matchings/code_80091750/func_800AD2E8.s b/asm/non_matchings/code_80091750/func_800AD2E8.s index cc5af1666..5ff57f744 100644 --- a/asm/non_matchings/code_80091750/func_800AD2E8.s +++ b/asm/non_matchings/code_80091750/func_800AD2E8.s @@ -11,7 +11,7 @@ glabel func_800AD2E8 /* 0ADF0C 800AD30C 002E0821 */ addu $at, $at, $t6 /* 0ADF10 800AD310 8C2E2750 */ lw $t6, %lo(jpt_800F2750)($at) /* 0ADF14 800AD314 01C00008 */ jr $t6 -/* 0ADF18 800AD318 00000000 */ nop +/* 0ADF18 800AD318 00000000 */ nop glabel L800AD31C /* 0ADF1C 800AD31C 240FFF60 */ li $t7, -160 /* 0ADF20 800AD320 24180001 */ li $t8, 1 @@ -77,7 +77,7 @@ glabel L800AD380 /* 0AE004 800AD404 24010001 */ li $at, 1 /* 0AE008 800AD408 256DFFFF */ addiu $t5, $t3, -1 /* 0AE00C 800AD40C 15810002 */ bne $t4, $at, .L800AD418 -/* 0AE010 800AD410 00000000 */ nop +/* 0AE010 800AD410 00000000 */ nop /* 0AE014 800AD414 AE0D0004 */ sw $t5, 4($s0) .L800AD418: /* 0AE018 800AD418 8DEFC5EC */ lw $t7, %lo(D_800DC5EC)($t7) @@ -90,10 +90,10 @@ glabel L800AD380 /* 0AE034 800AD434 A7380030 */ sh $t8, 0x30($t9) glabel L800AD438 /* 0AE038 800AD438 0C02D148 */ jal func_800B4520 -/* 0AE03C 800AD43C 00000000 */ nop +/* 0AE03C 800AD43C 00000000 */ nop /* 0AE040 800AD440 144002BC */ bnez $v0, .L800ADF34 -/* 0AE044 800AD444 3C03800E */ lui $v1, %hi(D_800DC4BC) # $v1, 0x800e -/* 0AE048 800AD448 8C63C4BC */ lw $v1, %lo(D_800DC4BC)($v1) +/* 0AE044 800AD444 3C03800E */ lui $v1, %hi(gControllerOne) # $v1, 0x800e +/* 0AE048 800AD448 8C63C4BC */ lw $v1, %lo(gControllerOne)($v1) /* 0AE04C 800AD44C 94650006 */ lhu $a1, 6($v1) /* 0AE050 800AD450 9468000C */ lhu $t0, 0xc($v1) /* 0AE054 800AD454 00A82025 */ or $a0, $a1, $t0 @@ -124,18 +124,18 @@ glabel L800AD438 /* 0AE0B4 800AD4B4 3C014010 */ li $at, 0x40100000 # 2.250000 /* 0AE0B8 800AD4B8 4626003C */ c.lt.d $f0, $f6 /* 0AE0BC 800AD4BC 240DFFFF */ li $t5, -1 -/* 0AE0C0 800AD4C0 3C0E800E */ lui $t6, %hi(D_800DC4BC) # $t6, 0x800e +/* 0AE0C0 800AD4C0 3C0E800E */ lui $t6, %hi(gControllerOne) # $t6, 0x800e /* 0AE0C4 800AD4C4 45020008 */ bc1fl .L800AD4E8 /* 0AE0C8 800AD4C8 AE0D0008 */ sw $t5, 8($s0) /* 0AE0CC 800AD4CC 44814800 */ mtc1 $at, $f9 /* 0AE0D0 800AD4D0 44804000 */ mtc1 $zero, $f8 -/* 0AE0D4 800AD4D4 00000000 */ nop +/* 0AE0D4 800AD4D4 00000000 */ nop /* 0AE0D8 800AD4D8 46280280 */ add.d $f10, $f0, $f8 /* 0AE0DC 800AD4DC 46205420 */ cvt.s.d $f16, $f10 /* 0AE0E0 800AD4E0 E6100024 */ swc1 $f16, 0x24($s0) /* 0AE0E4 800AD4E4 AE0D0008 */ sw $t5, 8($s0) .L800AD4E8: -/* 0AE0E8 800AD4E8 8DCEC4BC */ lw $t6, %lo(D_800DC4BC)($t6) +/* 0AE0E8 800AD4E8 8DCEC4BC */ lw $t6, %lo(gControllerOne)($t6) /* 0AE0EC 800AD4EC 95C50006 */ lhu $a1, 6($t6) /* 0AE0F0 800AD4F0 95CF000C */ lhu $t7, 0xc($t6) /* 0AE0F4 800AD4F4 00AF2025 */ or $a0, $a1, $t7 @@ -163,14 +163,14 @@ glabel L800AD438 /* 0AE140 800AD540 8E020004 */ lw $v0, 4($s0) /* 0AE144 800AD544 2401000A */ li $at, 10 /* 0AE148 800AD548 1441000A */ bne $v0, $at, .L800AD574 -/* 0AE14C 800AD54C 00000000 */ nop +/* 0AE14C 800AD54C 00000000 */ nop /* 0AE150 800AD550 954A2DD4 */ lhu $t2, %lo(D_80162DD4)($t2) /* 0AE154 800AD554 244BFFFE */ addiu $t3, $v0, -2 -/* 0AE158 800AD558 3C0C800E */ lui $t4, %hi(D_800DC4BC) # $t4, 0x800e +/* 0AE158 800AD558 3C0C800E */ lui $t4, %hi(gControllerOne) # $t4, 0x800e /* 0AE15C 800AD55C 11400005 */ beqz $t2, .L800AD574 -/* 0AE160 800AD560 00000000 */ nop +/* 0AE160 800AD560 00000000 */ nop /* 0AE164 800AD564 AE0B0004 */ sw $t3, 4($s0) -/* 0AE168 800AD568 8D8CC4BC */ lw $t4, %lo(D_800DC4BC)($t4) +/* 0AE168 800AD568 8D8CC4BC */ lw $t4, %lo(gControllerOne)($t4) /* 0AE16C 800AD56C 10000016 */ b .L800AD5C8 /* 0AE170 800AD570 95850006 */ lhu $a1, 6($t4) .L800AD574: @@ -183,18 +183,18 @@ glabel L800AD438 /* 0AE18C 800AD58C 3C014010 */ li $at, 0x40100000 # 2.250000 /* 0AE190 800AD590 4624003C */ c.lt.d $f0, $f4 /* 0AE194 800AD594 240D0001 */ li $t5, 1 -/* 0AE198 800AD598 3C0E800E */ lui $t6, %hi(D_800DC4BC) # $t6, 0x800e +/* 0AE198 800AD598 3C0E800E */ lui $t6, %hi(gControllerOne) # $t6, 0x800e /* 0AE19C 800AD59C 45020008 */ bc1fl .L800AD5C0 /* 0AE1A0 800AD5A0 AE0D0008 */ sw $t5, 8($s0) /* 0AE1A4 800AD5A4 44813800 */ mtc1 $at, $f7 /* 0AE1A8 800AD5A8 44803000 */ mtc1 $zero, $f6 -/* 0AE1AC 800AD5AC 00000000 */ nop +/* 0AE1AC 800AD5AC 00000000 */ nop /* 0AE1B0 800AD5B0 46260200 */ add.d $f8, $f0, $f6 /* 0AE1B4 800AD5B4 462042A0 */ cvt.s.d $f10, $f8 /* 0AE1B8 800AD5B8 E60A0024 */ swc1 $f10, 0x24($s0) /* 0AE1BC 800AD5BC AE0D0008 */ sw $t5, 8($s0) .L800AD5C0: -/* 0AE1C0 800AD5C0 8DCEC4BC */ lw $t6, %lo(D_800DC4BC)($t6) +/* 0AE1C0 800AD5C0 8DCEC4BC */ lw $t6, %lo(gControllerOne)($t6) /* 0AE1C4 800AD5C4 95C50006 */ lhu $a1, 6($t6) .L800AD5C8: /* 0AE1C8 800AD5C8 30AF9000 */ andi $t7, $a1, 0x9000 @@ -219,7 +219,7 @@ glabel L800AD438 /* 0AE210 800AD610 3C07800F */ lui $a3, %hi(D_800F2E64) # $a3, 0x800f /* 0AE214 800AD614 44812800 */ mtc1 $at, $f5 /* 0AE218 800AD618 44802000 */ mtc1 $zero, $f4 -/* 0AE21C 800AD61C 00000000 */ nop +/* 0AE21C 800AD61C 00000000 */ nop /* 0AE220 800AD620 46240180 */ add.d $f6, $f0, $f4 /* 0AE224 800AD624 46203220 */ cvt.s.d $f8, $f6 /* 0AE228 800AD628 E6080024 */ swc1 $f8, 0x24($s0) @@ -248,7 +248,7 @@ glabel L800AD438 /* 0AE280 800AD680 A02086F8 */ sb $zero, %lo(D_800E86F8)($at) .L800AD684: /* 0AE284 800AD684 0C02D9C2 */ jal func_800B6708 -/* 0AE288 800AD688 00000000 */ nop +/* 0AE288 800AD688 00000000 */ nop /* 0AE28C 800AD68C 3C098019 */ lui $t1, %hi(gCupSelection) # $t1, 0x8019 /* 0AE290 800AD690 8129EE09 */ lb $t1, %lo(gCupSelection)($t1) /* 0AE294 800AD694 3C0B8019 */ lui $t3, %hi(gCupCourseSelection) # $t3, 0x8019 @@ -273,7 +273,7 @@ glabel L800AD438 /* 0AE2D8 800AD6D8 3C0D800F */ lui $t5, %hi(D_800E86F8) # $t5, 0x800f /* 0AE2DC 800AD6DC 81AD86F8 */ lb $t5, %lo(D_800E86F8)($t5) /* 0AE2E0 800AD6E0 15A00047 */ bnez $t5, .L800AD800 -/* 0AE2E4 800AD6E4 00000000 */ nop +/* 0AE2E4 800AD6E4 00000000 */ nop /* 0AE2E8 800AD6E8 0C02D7CC */ jal func_800B5F30 /* 0AE2EC 800AD6EC AFA30028 */ sw $v1, 0x28($sp) /* 0AE2F0 800AD6F0 244E0003 */ addiu $t6, $v0, 3 @@ -285,7 +285,7 @@ glabel L800AD438 /* 0AE308 800AD708 002E0821 */ addu $at, $at, $t6 /* 0AE30C 800AD70C 8C2E27E8 */ lw $t6, %lo(jpt_800F27E8)($at) /* 0AE310 800AD710 01C00008 */ jr $t6 -/* 0AE314 800AD714 00000000 */ nop +/* 0AE314 800AD714 00000000 */ nop glabel L800AD718 /* 0AE318 800AD718 240F000B */ li $t7, 11 /* 0AE31C 800AD71C AE0F0004 */ sw $t7, 4($s0) @@ -336,9 +336,9 @@ glabel L800AD764 /* 0AE3B0 800AD7B0 0C033E20 */ jal osPfsFindFile /* 0AE3B4 800AD7B4 2484E868 */ addiu $a0, %lo(D_8018E868) # addiu $a0, $a0, -0x1798 /* 0AE3B8 800AD7B8 14400011 */ bnez $v0, .L800AD800 -/* 0AE3BC 800AD7BC 00000000 */ nop +/* 0AE3BC 800AD7BC 00000000 */ nop /* 0AE3C0 800AD7C0 0C02D9C2 */ jal func_800B6708 -/* 0AE3C4 800AD7C4 00000000 */ nop +/* 0AE3C4 800AD7C4 00000000 */ nop /* 0AE3C8 800AD7C8 3C0C8019 */ lui $t4, %hi(gCupSelection) # $t4, 0x8019 /* 0AE3CC 800AD7CC 818CEE09 */ lb $t4, %lo(gCupSelection)($t4) /* 0AE3D0 800AD7D0 3C0E8019 */ lui $t6, %hi(gCupCourseSelection) # $t6, 0x8019 @@ -405,19 +405,19 @@ glabel L800AD764 /* 0AE4B4 800AD8B4 46005021 */ cvt.d.s $f0, $f10 /* 0AE4B8 800AD8B8 3C014010 */ li $at, 0x40100000 # 2.250000 /* 0AE4BC 800AD8BC 4630003C */ c.lt.d $f0, $f16 -/* 0AE4C0 800AD8C0 00000000 */ nop +/* 0AE4C0 800AD8C0 00000000 */ nop /* 0AE4C4 800AD8C4 4502019C */ bc1fl .L800ADF38 /* 0AE4C8 800AD8C8 8FBF0024 */ lw $ra, 0x24($sp) /* 0AE4CC 800AD8CC 44819800 */ mtc1 $at, $f19 /* 0AE4D0 800AD8D0 44809000 */ mtc1 $zero, $f18 -/* 0AE4D4 800AD8D4 00000000 */ nop +/* 0AE4D4 800AD8D4 00000000 */ nop /* 0AE4D8 800AD8D8 46320100 */ add.d $f4, $f0, $f18 /* 0AE4DC 800AD8DC 462021A0 */ cvt.s.d $f6, $f4 /* 0AE4E0 800AD8E0 10000194 */ b .L800ADF34 /* 0AE4E4 800AD8E4 E6060024 */ swc1 $f6, 0x24($s0) glabel L800AD8E8 -/* 0AE4E8 800AD8E8 3C0E800E */ lui $t6, %hi(D_800DC4BC) # $t6, 0x800e -/* 0AE4EC 800AD8EC 8DCEC4BC */ lw $t6, %lo(D_800DC4BC)($t6) +/* 0AE4E8 800AD8E8 3C0E800E */ lui $t6, %hi(gControllerOne) # $t6, 0x800e +/* 0AE4EC 800AD8EC 8DCEC4BC */ lw $t6, %lo(gControllerOne)($t6) /* 0AE4F0 800AD8F0 3C044900 */ lui $a0, (0x49008002 >> 16) # lui $a0, 0x4900 /* 0AE4F4 800AD8F4 2419000A */ li $t9, 10 /* 0AE4F8 800AD8F8 95CF0006 */ lhu $t7, 6($t6) @@ -433,12 +433,12 @@ glabel L800AD8E8 /* 0AE520 800AD920 46004021 */ cvt.d.s $f0, $f8 /* 0AE524 800AD924 3C014010 */ li $at, 0x40100000 # 2.250000 /* 0AE528 800AD928 462A003C */ c.lt.d $f0, $f10 -/* 0AE52C 800AD92C 00000000 */ nop +/* 0AE52C 800AD92C 00000000 */ nop /* 0AE530 800AD930 45020181 */ bc1fl .L800ADF38 /* 0AE534 800AD934 8FBF0024 */ lw $ra, 0x24($sp) /* 0AE538 800AD938 44818800 */ mtc1 $at, $f17 /* 0AE53C 800AD93C 44808000 */ mtc1 $zero, $f16 -/* 0AE540 800AD940 00000000 */ nop +/* 0AE540 800AD940 00000000 */ nop /* 0AE544 800AD944 46300480 */ add.d $f18, $f0, $f16 /* 0AE548 800AD948 46209120 */ cvt.s.d $f4, $f18 /* 0AE54C 800AD94C 10000179 */ b .L800ADF34 @@ -454,10 +454,10 @@ glabel L800AD954 /* 0AE570 800AD970 0C02D8E7 */ jal func_800B639C /* 0AE574 800AD974 014B2021 */ addu $a0, $t2, $t3 /* 0AE578 800AD978 8E0C0020 */ lw $t4, 0x20($s0) -/* 0AE57C 800AD97C 3C03800E */ lui $v1, %hi(D_800DC4BC) # $v1, 0x800e +/* 0AE57C 800AD97C 3C03800E */ lui $v1, %hi(gControllerOne) # $v1, 0x800e /* 0AE580 800AD980 104C0040 */ beq $v0, $t4, .L800ADA84 -/* 0AE584 800AD984 00000000 */ nop -/* 0AE588 800AD988 8C63C4BC */ lw $v1, %lo(D_800DC4BC)($v1) +/* 0AE584 800AD984 00000000 */ nop +/* 0AE588 800AD988 8C63C4BC */ lw $v1, %lo(gControllerOne)($v1) /* 0AE58C 800AD98C 946D0006 */ lhu $t5, 6($v1) /* 0AE590 800AD990 946E000C */ lhu $t6, 0xc($v1) /* 0AE594 800AD994 01AE2025 */ or $a0, $t5, $t6 @@ -479,18 +479,18 @@ glabel L800AD954 /* 0AE5D4 800AD9D4 3C014010 */ li $at, 0x40100000 # 2.250000 /* 0AE5D8 800AD9D8 4628003C */ c.lt.d $f0, $f8 /* 0AE5DC 800AD9DC 2419FFFF */ li $t9, -1 -/* 0AE5E0 800AD9E0 3C08800E */ lui $t0, %hi(D_800DC4BC) # $t0, 0x800e +/* 0AE5E0 800AD9E0 3C08800E */ lui $t0, %hi(gControllerOne) # $t0, 0x800e /* 0AE5E4 800AD9E4 45020008 */ bc1fl .L800ADA08 /* 0AE5E8 800AD9E8 AE190008 */ sw $t9, 8($s0) /* 0AE5EC 800AD9EC 44815800 */ mtc1 $at, $f11 /* 0AE5F0 800AD9F0 44805000 */ mtc1 $zero, $f10 -/* 0AE5F4 800AD9F4 00000000 */ nop +/* 0AE5F4 800AD9F4 00000000 */ nop /* 0AE5F8 800AD9F8 462A0400 */ add.d $f16, $f0, $f10 /* 0AE5FC 800AD9FC 462084A0 */ cvt.s.d $f18, $f16 /* 0AE600 800ADA00 E6120024 */ swc1 $f18, 0x24($s0) /* 0AE604 800ADA04 AE190008 */ sw $t9, 8($s0) .L800ADA08: -/* 0AE608 800ADA08 8D08C4BC */ lw $t0, %lo(D_800DC4BC)($t0) +/* 0AE608 800ADA08 8D08C4BC */ lw $t0, %lo(gControllerOne)($t0) /* 0AE60C 800ADA0C 95090006 */ lhu $t1, 6($t0) /* 0AE610 800ADA10 950A000C */ lhu $t2, 0xc($t0) /* 0AE614 800ADA14 012A2025 */ or $a0, $t1, $t2 @@ -498,7 +498,7 @@ glabel L800AD954 /* 0AE618 800ADA18 308B0400 */ andi $t3, $a0, 0x400 .L800ADA1C: /* 0AE61C 800ADA1C 11600019 */ beqz $t3, .L800ADA84 -/* 0AE620 800ADA20 00000000 */ nop +/* 0AE620 800ADA20 00000000 */ nop /* 0AE624 800ADA24 8E020004 */ lw $v0, 4($s0) /* 0AE628 800ADA28 3C044900 */ lui $a0, (0x49008000 >> 16) # lui $a0, 0x4900 /* 0AE62C 800ADA2C 34848000 */ ori $a0, (0x49008000 & 0xFFFF) # ori $a0, $a0, 0x8000 @@ -518,14 +518,14 @@ glabel L800AD954 /* 0AE664 800ADA64 AE0D0008 */ sw $t5, 8($s0) /* 0AE668 800ADA68 44814800 */ mtc1 $at, $f9 /* 0AE66C 800ADA6C 44804000 */ mtc1 $zero, $f8 -/* 0AE670 800ADA70 00000000 */ nop +/* 0AE670 800ADA70 00000000 */ nop /* 0AE674 800ADA74 46280280 */ add.d $f10, $f0, $f8 /* 0AE678 800ADA78 46205420 */ cvt.s.d $f16, $f10 /* 0AE67C 800ADA7C E6100024 */ swc1 $f16, 0x24($s0) /* 0AE680 800ADA80 AE0D0008 */ sw $t5, 8($s0) .L800ADA84: -/* 0AE684 800ADA84 3C0E800E */ lui $t6, %hi(D_800DC4BC) # $t6, 0x800e -/* 0AE688 800ADA88 8DCEC4BC */ lw $t6, %lo(D_800DC4BC)($t6) +/* 0AE684 800ADA84 3C0E800E */ lui $t6, %hi(gControllerOne) # $t6, 0x800e +/* 0AE688 800ADA88 8DCEC4BC */ lw $t6, %lo(gControllerOne)($t6) /* 0AE68C 800ADA8C 3C044900 */ lui $a0, (0x49008002 >> 16) # lui $a0, 0x4900 /* 0AE690 800ADA90 2418000A */ li $t8, 10 /* 0AE694 800ADA94 95C50006 */ lhu $a1, 6($t6) @@ -548,13 +548,13 @@ glabel L800AD954 /* 0AE6D4 800ADAD4 904A0004 */ lbu $t2, 4($v0) /* 0AE6D8 800ADAD8 240B0019 */ li $t3, 25 /* 0AE6DC 800ADADC 15400004 */ bnez $t2, .L800ADAF0 -/* 0AE6E0 800ADAE0 00000000 */ nop +/* 0AE6E0 800ADAE0 00000000 */ nop /* 0AE6E4 800ADAE4 AE0B0004 */ sw $t3, 4($s0) /* 0AE6E8 800ADAE8 10000009 */ b .L800ADB10 /* 0AE6EC 800ADAEC AE00001C */ sw $zero, 0x1c($s0) .L800ADAF0: /* 0AE6F0 800ADAF0 0C02D8FC */ jal func_800B63F0 -/* 0AE6F4 800ADAF4 00000000 */ nop +/* 0AE6F4 800ADAF4 00000000 */ nop /* 0AE6F8 800ADAF8 14400004 */ bnez $v0, .L800ADB0C /* 0AE6FC 800ADAFC 240D0014 */ li $t5, 20 /* 0AE700 800ADB00 240C0010 */ li $t4, 16 @@ -572,12 +572,12 @@ glabel L800AD954 /* 0AE728 800ADB28 46009021 */ cvt.d.s $f0, $f18 /* 0AE72C 800ADB2C 3C014010 */ li $at, 0x40100000 # 2.250000 /* 0AE730 800ADB30 4624003C */ c.lt.d $f0, $f4 -/* 0AE734 800ADB34 00000000 */ nop +/* 0AE734 800ADB34 00000000 */ nop /* 0AE738 800ADB38 450200FF */ bc1fl .L800ADF38 /* 0AE73C 800ADB3C 8FBF0024 */ lw $ra, 0x24($sp) /* 0AE740 800ADB40 44813800 */ mtc1 $at, $f7 /* 0AE744 800ADB44 44803000 */ mtc1 $zero, $f6 -/* 0AE748 800ADB48 00000000 */ nop +/* 0AE748 800ADB48 00000000 */ nop /* 0AE74C 800ADB4C 46260200 */ add.d $f8, $f0, $f6 /* 0AE750 800ADB50 462042A0 */ cvt.s.d $f10, $f8 /* 0AE754 800ADB54 100000F7 */ b .L800ADF34 @@ -588,7 +588,7 @@ glabel L800ADB5C /* 0AE764 800ADB64 55C10008 */ bnel $t6, $at, .L800ADB88 /* 0AE768 800ADB68 8E18001C */ lw $t8, 0x1c($s0) /* 0AE76C 800ADB6C 0C02DA9A */ jal func_800B6A68 -/* 0AE770 800ADB70 00000000 */ nop +/* 0AE770 800ADB70 00000000 */ nop /* 0AE774 800ADB74 10400003 */ beqz $v0, .L800ADB84 /* 0AE778 800ADB78 240F000F */ li $t7, 15 /* 0AE77C 800ADB7C 100000ED */ b .L800ADF34 @@ -604,8 +604,8 @@ glabel L800ADB5C /* 0AE79C 800ADB9C 100000E5 */ b .L800ADF34 /* 0AE7A0 800ADBA0 AE090004 */ sw $t1, 4($s0) glabel L800ADBA4 -/* 0AE7A4 800ADBA4 3C03800E */ lui $v1, %hi(D_800DC4BC) # $v1, 0x800e -/* 0AE7A8 800ADBA8 8C63C4BC */ lw $v1, %lo(D_800DC4BC)($v1) +/* 0AE7A4 800ADBA4 3C03800E */ lui $v1, %hi(gControllerOne) # $v1, 0x800e +/* 0AE7A8 800ADBA8 8C63C4BC */ lw $v1, %lo(gControllerOne)($v1) /* 0AE7AC 800ADBAC 28410015 */ slti $at, $v0, 0x15 /* 0AE7B0 800ADBB0 94650006 */ lhu $a1, 6($v1) /* 0AE7B4 800ADBB4 946A000C */ lhu $t2, 0xc($v1) @@ -626,18 +626,18 @@ glabel L800ADBA4 /* 0AE7F0 800ADBF0 3C014010 */ li $at, 0x40100000 # 2.250000 /* 0AE7F4 800ADBF4 4632003C */ c.lt.d $f0, $f18 /* 0AE7F8 800ADBF8 240DFFFF */ li $t5, -1 -/* 0AE7FC 800ADBFC 3C0E800E */ lui $t6, %hi(D_800DC4BC) # $t6, 0x800e +/* 0AE7FC 800ADBFC 3C0E800E */ lui $t6, %hi(gControllerOne) # $t6, 0x800e /* 0AE800 800ADC00 45020008 */ bc1fl .L800ADC24 /* 0AE804 800ADC04 AE0D0008 */ sw $t5, 8($s0) /* 0AE808 800ADC08 44812800 */ mtc1 $at, $f5 /* 0AE80C 800ADC0C 44802000 */ mtc1 $zero, $f4 -/* 0AE810 800ADC10 00000000 */ nop +/* 0AE810 800ADC10 00000000 */ nop /* 0AE814 800ADC14 46240180 */ add.d $f6, $f0, $f4 /* 0AE818 800ADC18 46203220 */ cvt.s.d $f8, $f6 /* 0AE81C 800ADC1C E6080024 */ swc1 $f8, 0x24($s0) /* 0AE820 800ADC20 AE0D0008 */ sw $t5, 8($s0) .L800ADC24: -/* 0AE824 800ADC24 8DCEC4BC */ lw $t6, %lo(D_800DC4BC)($t6) +/* 0AE824 800ADC24 8DCEC4BC */ lw $t6, %lo(gControllerOne)($t6) /* 0AE828 800ADC28 95C50006 */ lhu $a1, 6($t6) /* 0AE82C 800ADC2C 95CF000C */ lhu $t7, 0xc($t6) /* 0AE830 800ADC30 00AF2025 */ or $a0, $a1, $t7 @@ -661,18 +661,18 @@ glabel L800ADBA4 /* 0AE870 800ADC70 3C014010 */ li $at, 0x40100000 # 2.250000 /* 0AE874 800ADC74 4630003C */ c.lt.d $f0, $f16 /* 0AE878 800ADC78 24080001 */ li $t0, 1 -/* 0AE87C 800ADC7C 3C09800E */ lui $t1, %hi(D_800DC4BC) # $t1, 0x800e +/* 0AE87C 800ADC7C 3C09800E */ lui $t1, %hi(gControllerOne) # $t1, 0x800e /* 0AE880 800ADC80 45020008 */ bc1fl .L800ADCA4 /* 0AE884 800ADC84 AE080008 */ sw $t0, 8($s0) /* 0AE888 800ADC88 44819800 */ mtc1 $at, $f19 /* 0AE88C 800ADC8C 44809000 */ mtc1 $zero, $f18 -/* 0AE890 800ADC90 00000000 */ nop +/* 0AE890 800ADC90 00000000 */ nop /* 0AE894 800ADC94 46320100 */ add.d $f4, $f0, $f18 /* 0AE898 800ADC98 462021A0 */ cvt.s.d $f6, $f4 /* 0AE89C 800ADC9C E6060024 */ swc1 $f6, 0x24($s0) /* 0AE8A0 800ADCA0 AE080008 */ sw $t0, 8($s0) .L800ADCA4: -/* 0AE8A4 800ADCA4 8D29C4BC */ lw $t1, %lo(D_800DC4BC)($t1) +/* 0AE8A4 800ADCA4 8D29C4BC */ lw $t1, %lo(gControllerOne)($t1) /* 0AE8A8 800ADCA8 95250006 */ lhu $a1, 6($t1) .L800ADCAC: /* 0AE8AC 800ADCAC 30AA4000 */ andi $t2, $a1, 0x4000 @@ -705,12 +705,12 @@ glabel L800ADBA4 /* 0AE910 800ADD10 46004021 */ cvt.d.s $f0, $f8 /* 0AE914 800ADD14 3C014010 */ li $at, 0x40100000 # 2.250000 /* 0AE918 800ADD18 462A003C */ c.lt.d $f0, $f10 -/* 0AE91C 800ADD1C 00000000 */ nop +/* 0AE91C 800ADD1C 00000000 */ nop /* 0AE920 800ADD20 45020085 */ bc1fl .L800ADF38 /* 0AE924 800ADD24 8FBF0024 */ lw $ra, 0x24($sp) /* 0AE928 800ADD28 44818800 */ mtc1 $at, $f17 /* 0AE92C 800ADD2C 44808000 */ mtc1 $zero, $f16 -/* 0AE930 800ADD30 00000000 */ nop +/* 0AE930 800ADD30 00000000 */ nop /* 0AE934 800ADD34 46300480 */ add.d $f18, $f0, $f16 /* 0AE938 800ADD38 46209120 */ cvt.s.d $f4, $f18 /* 0AE93C 800ADD3C 1000007D */ b .L800ADF34 @@ -799,7 +799,7 @@ glabel L800ADE14 /* 0AEA70 800ADE70 002D0821 */ addu $at, $at, $t5 /* 0AEA74 800ADE74 8C2D2868 */ lw $t5, %lo(jpt_800F2868)($at) /* 0AEA78 800ADE78 01A00008 */ jr $t5 -/* 0AEA7C 800ADE7C 00000000 */ nop +/* 0AEA7C 800ADE7C 00000000 */ nop glabel L800ADE80 /* 0AEA80 800ADE80 3C018016 */ lui $at, %hi(D_8015F890) # $at, 0x8016 /* 0AEA84 800ADE84 A420F890 */ sh $zero, %lo(D_8015F890)($at) @@ -811,17 +811,17 @@ glabel L800ADE80 /* 0AEA9C 800ADE9C 2418001F */ li $t8, 31 glabel L800ADEA0 /* 0AEAA0 800ADEA0 0C0A40E2 */ jal func_80290388 -/* 0AEAA4 800ADEA4 00000000 */ nop +/* 0AEAA4 800ADEA4 00000000 */ nop /* 0AEAA8 800ADEA8 10000010 */ b .L800ADEEC /* 0AEAAC 800ADEAC 2418001F */ li $t8, 31 glabel L800ADEB0 /* 0AEAB0 800ADEB0 0C0A40D8 */ jal func_80290360 -/* 0AEAB4 800ADEB4 00000000 */ nop +/* 0AEAB4 800ADEB4 00000000 */ nop /* 0AEAB8 800ADEB8 1000000C */ b .L800ADEEC /* 0AEABC 800ADEBC 2418001F */ li $t8, 31 glabel L800ADEC0 /* 0AEAC0 800ADEC0 0C0A40CE */ jal func_80290338 -/* 0AEAC4 800ADEC4 00000000 */ nop +/* 0AEAC4 800ADEC4 00000000 */ nop /* 0AEAC8 800ADEC8 10000008 */ b .L800ADEEC /* 0AEACC 800ADECC 2418001F */ li $t8, 31 glabel L800ADED0 @@ -860,4 +860,4 @@ glabel L800ADF34 /* 0AEB38 800ADF38 8FB00020 */ lw $s0, 0x20($sp) /* 0AEB3C 800ADF3C 27BD0030 */ addiu $sp, $sp, 0x30 /* 0AEB40 800ADF40 03E00008 */ jr $ra -/* 0AEB44 800ADF44 00000000 */ nop +/* 0AEB44 800ADF44 00000000 */ nop diff --git a/asm/non_matchings/code_80091750/func_800AE218.s b/asm/non_matchings/code_80091750/func_800AE218.s index 21a1132d3..e8775dca8 100644 --- a/asm/non_matchings/code_80091750/func_800AE218.s +++ b/asm/non_matchings/code_80091750/func_800AE218.s @@ -17,24 +17,24 @@ glabel func_800AE218 /* 0AEE50 800AE250 002E0821 */ addu $at, $at, $t6 /* 0AEE54 800AE254 8C2E2948 */ lw $t6, %lo(jpt_800F2948)($at) /* 0AEE58 800AE258 01C00008 */ jr $t6 -/* 0AEE5C 800AE25C 00000000 */ nop +/* 0AEE5C 800AE25C 00000000 */ nop glabel L800AE260 /* 0AEE60 800AE260 8E02001C */ lw $v0, 0x1c($s0) -/* 0AEE64 800AE264 3C18800E */ lui $t8, %hi(D_800DC4BC) # $t8, 0x800e +/* 0AEE64 800AE264 3C18800E */ lui $t8, %hi(gControllerOne) # $t8, 0x800e /* 0AEE68 800AE268 3C0A8019 */ lui $t2, %hi(D_8018CAE0) # $t2, 0x8019 /* 0AEE6C 800AE26C 2841001E */ slti $at, $v0, 0x1e /* 0AEE70 800AE270 10200002 */ beqz $at, .L800AE27C /* 0AEE74 800AE274 244F0001 */ addiu $t7, $v0, 1 /* 0AEE78 800AE278 AE0F001C */ sw $t7, 0x1c($s0) .L800AE27C: -/* 0AEE7C 800AE27C 8F18C4BC */ lw $t8, %lo(D_800DC4BC)($t8) +/* 0AEE7C 800AE27C 8F18C4BC */ lw $t8, %lo(gControllerOne)($t8) /* 0AEE80 800AE280 3C044900 */ lui $a0, (0x49008005 >> 16) # lui $a0, 0x4900 /* 0AEE84 800AE284 2409000F */ li $t1, 15 /* 0AEE88 800AE288 97190006 */ lhu $t9, 6($t8) /* 0AEE8C 800AE28C 34848005 */ ori $a0, (0x49008005 & 0xFFFF) # ori $a0, $a0, 0x8005 /* 0AEE90 800AE290 33281000 */ andi $t0, $t9, 0x1000 /* 0AEE94 800AE294 11000005 */ beqz $t0, .L800AE2AC -/* 0AEE98 800AE298 00000000 */ nop +/* 0AEE98 800AE298 00000000 */ nop /* 0AEE9C 800AE29C 0C032384 */ jal play_sound2 /* 0AEEA0 800AE2A0 AE090004 */ sw $t1, 4($s0) /* 0AEEA4 800AE2A4 10000267 */ b .L800AEC44 @@ -58,10 +58,10 @@ glabel L800AE2C8 /* 0AEEE4 800AE2E4 AE0F0004 */ sw $t7, 4($s0) glabel L800AE2E8 /* 0AEEE8 800AE2E8 0C02D148 */ jal func_800B4520 -/* 0AEEEC 800AE2EC 00000000 */ nop +/* 0AEEEC 800AE2EC 00000000 */ nop /* 0AEEF0 800AE2F0 14400253 */ bnez $v0, .L800AEC40 -/* 0AEEF4 800AE2F4 3C02800E */ lui $v0, %hi(D_800DC4BC) # $v0, 0x800e -/* 0AEEF8 800AE2F8 8C42C4BC */ lw $v0, %lo(D_800DC4BC)($v0) +/* 0AEEF4 800AE2F4 3C02800E */ lui $v0, %hi(gControllerOne) # $v0, 0x800e +/* 0AEEF8 800AE2F8 8C42C4BC */ lw $v0, %lo(gControllerOne)($v0) /* 0AEEFC 800AE2FC 94440006 */ lhu $a0, 6($v0) /* 0AEF00 800AE300 9458000C */ lhu $t8, 0xc($v0) /* 0AEF04 800AE304 00982825 */ or $a1, $a0, $t8 @@ -83,18 +83,18 @@ glabel L800AE2E8 /* 0AEF44 800AE344 3C014010 */ li $at, 0x40100000 # 2.250000 /* 0AEF48 800AE348 4626003C */ c.lt.d $f0, $f6 /* 0AEF4C 800AE34C 2409FFFF */ li $t1, -1 -/* 0AEF50 800AE350 3C0A800E */ lui $t2, %hi(D_800DC4BC) # $t2, 0x800e +/* 0AEF50 800AE350 3C0A800E */ lui $t2, %hi(gControllerOne) # $t2, 0x800e /* 0AEF54 800AE354 45020008 */ bc1fl .L800AE378 /* 0AEF58 800AE358 AE090008 */ sw $t1, 8($s0) /* 0AEF5C 800AE35C 44814800 */ mtc1 $at, $f9 /* 0AEF60 800AE360 44804000 */ mtc1 $zero, $f8 -/* 0AEF64 800AE364 00000000 */ nop +/* 0AEF64 800AE364 00000000 */ nop /* 0AEF68 800AE368 46280280 */ add.d $f10, $f0, $f8 /* 0AEF6C 800AE36C 46205420 */ cvt.s.d $f16, $f10 /* 0AEF70 800AE370 E6100024 */ swc1 $f16, 0x24($s0) /* 0AEF74 800AE374 AE090008 */ sw $t1, 8($s0) .L800AE378: -/* 0AEF78 800AE378 8D4AC4BC */ lw $t2, %lo(D_800DC4BC)($t2) +/* 0AEF78 800AE378 8D4AC4BC */ lw $t2, %lo(gControllerOne)($t2) /* 0AEF7C 800AE37C 95440006 */ lhu $a0, 6($t2) /* 0AEF80 800AE380 954B000C */ lhu $t3, 0xc($t2) /* 0AEF84 800AE384 008B2825 */ or $a1, $a0, $t3 @@ -118,18 +118,18 @@ glabel L800AE2E8 /* 0AEFC4 800AE3C4 3C014010 */ li $at, 0x40100000 # 2.250000 /* 0AEFC8 800AE3C8 4624003C */ c.lt.d $f0, $f4 /* 0AEFCC 800AE3CC 240E0001 */ li $t6, 1 -/* 0AEFD0 800AE3D0 3C0F800E */ lui $t7, %hi(D_800DC4BC) # $t7, 0x800e +/* 0AEFD0 800AE3D0 3C0F800E */ lui $t7, %hi(gControllerOne) # $t7, 0x800e /* 0AEFD4 800AE3D4 45020008 */ bc1fl .L800AE3F8 /* 0AEFD8 800AE3D8 AE0E0008 */ sw $t6, 8($s0) /* 0AEFDC 800AE3DC 44813800 */ mtc1 $at, $f7 /* 0AEFE0 800AE3E0 44803000 */ mtc1 $zero, $f6 -/* 0AEFE4 800AE3E4 00000000 */ nop +/* 0AEFE4 800AE3E4 00000000 */ nop /* 0AEFE8 800AE3E8 46260200 */ add.d $f8, $f0, $f6 /* 0AEFEC 800AE3EC 462042A0 */ cvt.s.d $f10, $f8 /* 0AEFF0 800AE3F0 E60A0024 */ swc1 $f10, 0x24($s0) /* 0AEFF4 800AE3F4 AE0E0008 */ sw $t6, 8($s0) .L800AE3F8: -/* 0AEFF8 800AE3F8 8DEFC4BC */ lw $t7, %lo(D_800DC4BC)($t7) +/* 0AEFF8 800AE3F8 8DEFC4BC */ lw $t7, %lo(gControllerOne)($t7) /* 0AEFFC 800AE3FC 95E40006 */ lhu $a0, 6($t7) .L800AE400: /* 0AF000 800AE400 30989000 */ andi $t8, $a0, 0x9000 @@ -154,7 +154,7 @@ glabel L800AE2E8 /* 0AF048 800AE448 3C07800F */ lui $a3, %hi(D_800F2E64) # $a3, 0x800f /* 0AF04C 800AE44C 44812800 */ mtc1 $at, $f5 /* 0AF050 800AE450 44802000 */ mtc1 $zero, $f4 -/* 0AF054 800AE454 00000000 */ nop +/* 0AF054 800AE454 00000000 */ nop /* 0AF058 800AE458 46240180 */ add.d $f6, $f0, $f4 /* 0AF05C 800AE45C 46203220 */ cvt.s.d $f8, $f6 /* 0AF060 800AE460 E6080024 */ swc1 $f8, 0x24($s0) @@ -183,7 +183,7 @@ glabel L800AE2E8 /* 0AF0B8 800AE4B8 A02086F8 */ sb $zero, %lo(D_800E86F8)($at) .L800AE4BC: /* 0AF0BC 800AE4BC 0C02D9C2 */ jal func_800B6708 -/* 0AF0C0 800AE4C0 00000000 */ nop +/* 0AF0C0 800AE4C0 00000000 */ nop /* 0AF0C4 800AE4C4 3C0B8019 */ lui $t3, %hi(gCupSelection) # $t3, 0x8019 /* 0AF0C8 800AE4C8 816BEE09 */ lb $t3, %lo(gCupSelection)($t3) /* 0AF0CC 800AE4CC 3C0D8019 */ lui $t5, %hi(gCupCourseSelection) # $t5, 0x8019 @@ -209,7 +209,7 @@ glabel L800AE2E8 .L800AE514: /* 0AF114 800AE514 81EF86F8 */ lb $t7, %lo(D_800E86F8)($t7) /* 0AF118 800AE518 15E00047 */ bnez $t7, .L800AE638 -/* 0AF11C 800AE51C 00000000 */ nop +/* 0AF11C 800AE51C 00000000 */ nop /* 0AF120 800AE520 0C02D7CC */ jal func_800B5F30 /* 0AF124 800AE524 AFA30028 */ sw $v1, 0x28($sp) /* 0AF128 800AE528 24580003 */ addiu $t8, $v0, 3 @@ -221,7 +221,7 @@ glabel L800AE2E8 /* 0AF140 800AE540 00380821 */ addu $at, $at, $t8 /* 0AF144 800AE544 8C382A08 */ lw $t8, %lo(jpt_800F2A08)($at) /* 0AF148 800AE548 03000008 */ jr $t8 -/* 0AF14C 800AE54C 00000000 */ nop +/* 0AF14C 800AE54C 00000000 */ nop glabel L800AE550 /* 0AF150 800AE550 24190015 */ li $t9, 21 /* 0AF154 800AE554 AE190004 */ sw $t9, 4($s0) @@ -272,9 +272,9 @@ glabel L800AE59C /* 0AF1E8 800AE5E8 0C033E20 */ jal osPfsFindFile /* 0AF1EC 800AE5EC 2484E868 */ addiu $a0, %lo(D_8018E868) # addiu $a0, $a0, -0x1798 /* 0AF1F0 800AE5F0 14400011 */ bnez $v0, .L800AE638 -/* 0AF1F4 800AE5F4 00000000 */ nop +/* 0AF1F4 800AE5F4 00000000 */ nop /* 0AF1F8 800AE5F8 0C02D9C2 */ jal func_800B6708 -/* 0AF1FC 800AE5FC 00000000 */ nop +/* 0AF1FC 800AE5FC 00000000 */ nop /* 0AF200 800AE600 3C0E8019 */ lui $t6, %hi(gCupSelection) # $t6, 0x8019 /* 0AF204 800AE604 81CEEE09 */ lb $t6, %lo(gCupSelection)($t6) /* 0AF208 800AE608 3C188019 */ lui $t8, %hi(gCupCourseSelection) # $t8, 0x8019 @@ -340,19 +340,19 @@ glabel L800AE59C /* 0AF2E8 800AE6E8 46005021 */ cvt.d.s $f0, $f10 /* 0AF2EC 800AE6EC 3C014010 */ li $at, 0x40100000 # 2.250000 /* 0AF2F0 800AE6F0 4630003C */ c.lt.d $f0, $f16 -/* 0AF2F4 800AE6F4 00000000 */ nop +/* 0AF2F4 800AE6F4 00000000 */ nop /* 0AF2F8 800AE6F8 45020152 */ bc1fl .L800AEC44 /* 0AF2FC 800AE6FC 8FBF0024 */ lw $ra, 0x24($sp) /* 0AF300 800AE700 44819800 */ mtc1 $at, $f19 /* 0AF304 800AE704 44809000 */ mtc1 $zero, $f18 -/* 0AF308 800AE708 00000000 */ nop +/* 0AF308 800AE708 00000000 */ nop /* 0AF30C 800AE70C 46320100 */ add.d $f4, $f0, $f18 /* 0AF310 800AE710 462021A0 */ cvt.s.d $f6, $f4 /* 0AF314 800AE714 1000014A */ b .L800AEC40 /* 0AF318 800AE718 E6060024 */ swc1 $f6, 0x24($s0) glabel L800AE71C -/* 0AF31C 800AE71C 3C0E800E */ lui $t6, %hi(D_800DC4BC) # $t6, 0x800e -/* 0AF320 800AE720 8DCEC4BC */ lw $t6, %lo(D_800DC4BC)($t6) +/* 0AF31C 800AE71C 3C0E800E */ lui $t6, %hi(gControllerOne) # $t6, 0x800e +/* 0AF320 800AE720 8DCEC4BC */ lw $t6, %lo(gControllerOne)($t6) /* 0AF324 800AE724 3C044900 */ lui $a0, (0x49008002 >> 16) # lui $a0, 0x4900 /* 0AF328 800AE728 24190010 */ li $t9, 16 /* 0AF32C 800AE72C 95CF0006 */ lhu $t7, 6($t6) @@ -368,12 +368,12 @@ glabel L800AE71C /* 0AF354 800AE754 46004021 */ cvt.d.s $f0, $f8 /* 0AF358 800AE758 3C014010 */ li $at, 0x40100000 # 2.250000 /* 0AF35C 800AE75C 462A003C */ c.lt.d $f0, $f10 -/* 0AF360 800AE760 00000000 */ nop +/* 0AF360 800AE760 00000000 */ nop /* 0AF364 800AE764 45020137 */ bc1fl .L800AEC44 /* 0AF368 800AE768 8FBF0024 */ lw $ra, 0x24($sp) /* 0AF36C 800AE76C 44818800 */ mtc1 $at, $f17 /* 0AF370 800AE770 44808000 */ mtc1 $zero, $f16 -/* 0AF374 800AE774 00000000 */ nop +/* 0AF374 800AE774 00000000 */ nop /* 0AF378 800AE778 46300480 */ add.d $f18, $f0, $f16 /* 0AF37C 800AE77C 46209120 */ cvt.s.d $f4, $f18 /* 0AF380 800AE780 1000012F */ b .L800AEC40 @@ -390,8 +390,8 @@ glabel L800AE788 /* 0AF3A8 800AE7A8 014B2021 */ addu $a0, $t2, $t3 /* 0AF3AC 800AE7AC 8E0C0020 */ lw $t4, 0x20($s0) /* 0AF3B0 800AE7B0 104C0040 */ beq $v0, $t4, .L800AE8B4 -/* 0AF3B4 800AE7B4 3C02800E */ lui $v0, %hi(D_800DC4BC) # $v0, 0x800e -/* 0AF3B8 800AE7B8 8C42C4BC */ lw $v0, %lo(D_800DC4BC)($v0) +/* 0AF3B4 800AE7B4 3C02800E */ lui $v0, %hi(gControllerOne) # $v0, 0x800e +/* 0AF3B8 800AE7B8 8C42C4BC */ lw $v0, %lo(gControllerOne)($v0) /* 0AF3BC 800AE7BC 944D0006 */ lhu $t5, 6($v0) /* 0AF3C0 800AE7C0 944E000C */ lhu $t6, 0xc($v0) /* 0AF3C4 800AE7C4 01AE2825 */ or $a1, $t5, $t6 @@ -413,18 +413,18 @@ glabel L800AE788 /* 0AF404 800AE804 3C014010 */ li $at, 0x40100000 # 2.250000 /* 0AF408 800AE808 4628003C */ c.lt.d $f0, $f8 /* 0AF40C 800AE80C 2419FFFF */ li $t9, -1 -/* 0AF410 800AE810 3C08800E */ lui $t0, %hi(D_800DC4BC) # $t0, 0x800e +/* 0AF410 800AE810 3C08800E */ lui $t0, %hi(gControllerOne) # $t0, 0x800e /* 0AF414 800AE814 45020008 */ bc1fl .L800AE838 /* 0AF418 800AE818 AE190008 */ sw $t9, 8($s0) /* 0AF41C 800AE81C 44815800 */ mtc1 $at, $f11 /* 0AF420 800AE820 44805000 */ mtc1 $zero, $f10 -/* 0AF424 800AE824 00000000 */ nop +/* 0AF424 800AE824 00000000 */ nop /* 0AF428 800AE828 462A0400 */ add.d $f16, $f0, $f10 /* 0AF42C 800AE82C 462084A0 */ cvt.s.d $f18, $f16 /* 0AF430 800AE830 E6120024 */ swc1 $f18, 0x24($s0) /* 0AF434 800AE834 AE190008 */ sw $t9, 8($s0) .L800AE838: -/* 0AF438 800AE838 8D08C4BC */ lw $t0, %lo(D_800DC4BC)($t0) +/* 0AF438 800AE838 8D08C4BC */ lw $t0, %lo(gControllerOne)($t0) /* 0AF43C 800AE83C 95090006 */ lhu $t1, 6($t0) /* 0AF440 800AE840 950A000C */ lhu $t2, 0xc($t0) /* 0AF444 800AE844 012A2825 */ or $a1, $t1, $t2 @@ -432,7 +432,7 @@ glabel L800AE788 /* 0AF448 800AE848 30AB0400 */ andi $t3, $a1, 0x400 .L800AE84C: /* 0AF44C 800AE84C 11600019 */ beqz $t3, .L800AE8B4 -/* 0AF450 800AE850 00000000 */ nop +/* 0AF450 800AE850 00000000 */ nop /* 0AF454 800AE854 8E030004 */ lw $v1, 4($s0) /* 0AF458 800AE858 3C044900 */ lui $a0, (0x49008000 >> 16) # lui $a0, 0x4900 /* 0AF45C 800AE85C 34848000 */ ori $a0, (0x49008000 & 0xFFFF) # ori $a0, $a0, 0x8000 @@ -452,14 +452,14 @@ glabel L800AE788 /* 0AF494 800AE894 AE0D0008 */ sw $t5, 8($s0) /* 0AF498 800AE898 44814800 */ mtc1 $at, $f9 /* 0AF49C 800AE89C 44804000 */ mtc1 $zero, $f8 -/* 0AF4A0 800AE8A0 00000000 */ nop +/* 0AF4A0 800AE8A0 00000000 */ nop /* 0AF4A4 800AE8A4 46280280 */ add.d $f10, $f0, $f8 /* 0AF4A8 800AE8A8 46205420 */ cvt.s.d $f16, $f10 /* 0AF4AC 800AE8AC E6100024 */ swc1 $f16, 0x24($s0) /* 0AF4B0 800AE8B0 AE0D0008 */ sw $t5, 8($s0) .L800AE8B4: -/* 0AF4B4 800AE8B4 3C0E800E */ lui $t6, %hi(D_800DC4BC) # $t6, 0x800e -/* 0AF4B8 800AE8B8 8DCEC4BC */ lw $t6, %lo(D_800DC4BC)($t6) +/* 0AF4B4 800AE8B4 3C0E800E */ lui $t6, %hi(gControllerOne) # $t6, 0x800e +/* 0AF4B8 800AE8B8 8DCEC4BC */ lw $t6, %lo(gControllerOne)($t6) /* 0AF4BC 800AE8BC 24180010 */ li $t8, 16 /* 0AF4C0 800AE8C0 95C40006 */ lhu $a0, 6($t6) /* 0AF4C4 800AE8C4 308F4000 */ andi $t7, $a0, 0x4000 @@ -482,13 +482,13 @@ glabel L800AE788 /* 0AF504 800AE904 904A0004 */ lbu $t2, 4($v0) /* 0AF508 800AE908 240B0028 */ li $t3, 40 /* 0AF50C 800AE90C 15400004 */ bnez $t2, .L800AE920 -/* 0AF510 800AE910 00000000 */ nop +/* 0AF510 800AE910 00000000 */ nop /* 0AF514 800AE914 AE0B0004 */ sw $t3, 4($s0) /* 0AF518 800AE918 10000009 */ b .L800AE940 /* 0AF51C 800AE91C AE00001C */ sw $zero, 0x1c($s0) .L800AE920: /* 0AF520 800AE920 0C02D8FC */ jal func_800B63F0 -/* 0AF524 800AE924 00000000 */ nop +/* 0AF524 800AE924 00000000 */ nop /* 0AF528 800AE928 14400004 */ bnez $v0, .L800AE93C /* 0AF52C 800AE92C 240D0023 */ li $t5, 35 /* 0AF530 800AE930 240C001A */ li $t4, 26 @@ -506,12 +506,12 @@ glabel L800AE788 /* 0AF558 800AE958 46009021 */ cvt.d.s $f0, $f18 /* 0AF55C 800AE95C 3C014010 */ li $at, 0x40100000 # 2.250000 /* 0AF560 800AE960 4624003C */ c.lt.d $f0, $f4 -/* 0AF564 800AE964 00000000 */ nop +/* 0AF564 800AE964 00000000 */ nop /* 0AF568 800AE968 450200B6 */ bc1fl .L800AEC44 /* 0AF56C 800AE96C 8FBF0024 */ lw $ra, 0x24($sp) /* 0AF570 800AE970 44813800 */ mtc1 $at, $f7 /* 0AF574 800AE974 44803000 */ mtc1 $zero, $f6 -/* 0AF578 800AE978 00000000 */ nop +/* 0AF578 800AE978 00000000 */ nop /* 0AF57C 800AE97C 46260200 */ add.d $f8, $f0, $f6 /* 0AF580 800AE980 462042A0 */ cvt.s.d $f10, $f8 /* 0AF584 800AE984 100000AE */ b .L800AEC40 @@ -522,7 +522,7 @@ glabel L800AE98C /* 0AF594 800AE994 55C10008 */ bnel $t6, $at, .L800AE9B8 /* 0AF598 800AE998 8E18001C */ lw $t8, 0x1c($s0) /* 0AF59C 800AE99C 0C02DA9A */ jal func_800B6A68 -/* 0AF5A0 800AE9A0 00000000 */ nop +/* 0AF5A0 800AE9A0 00000000 */ nop /* 0AF5A4 800AE9A4 10400003 */ beqz $v0, .L800AE9B4 /* 0AF5A8 800AE9A8 240F0019 */ li $t7, 25 /* 0AF5AC 800AE9AC 100000A4 */ b .L800AEC40 @@ -538,8 +538,8 @@ glabel L800AE98C /* 0AF5CC 800AE9CC 1000009C */ b .L800AEC40 /* 0AF5D0 800AE9D0 AE090004 */ sw $t1, 4($s0) glabel L800AE9D4 -/* 0AF5D4 800AE9D4 3C02800E */ lui $v0, %hi(D_800DC4BC) # $v0, 0x800e -/* 0AF5D8 800AE9D8 8C42C4BC */ lw $v0, %lo(D_800DC4BC)($v0) +/* 0AF5D4 800AE9D4 3C02800E */ lui $v0, %hi(gControllerOne) # $v0, 0x800e +/* 0AF5D8 800AE9D8 8C42C4BC */ lw $v0, %lo(gControllerOne)($v0) /* 0AF5DC 800AE9DC 28610024 */ slti $at, $v1, 0x24 /* 0AF5E0 800AE9E0 94440006 */ lhu $a0, 6($v0) /* 0AF5E4 800AE9E4 944A000C */ lhu $t2, 0xc($v0) @@ -560,18 +560,18 @@ glabel L800AE9D4 /* 0AF620 800AEA20 3C014010 */ li $at, 0x40100000 # 2.250000 /* 0AF624 800AEA24 4632003C */ c.lt.d $f0, $f18 /* 0AF628 800AEA28 240DFFFF */ li $t5, -1 -/* 0AF62C 800AEA2C 3C0E800E */ lui $t6, %hi(D_800DC4BC) # $t6, 0x800e +/* 0AF62C 800AEA2C 3C0E800E */ lui $t6, %hi(gControllerOne) # $t6, 0x800e /* 0AF630 800AEA30 45020008 */ bc1fl .L800AEA54 /* 0AF634 800AEA34 AE0D0008 */ sw $t5, 8($s0) /* 0AF638 800AEA38 44812800 */ mtc1 $at, $f5 /* 0AF63C 800AEA3C 44802000 */ mtc1 $zero, $f4 -/* 0AF640 800AEA40 00000000 */ nop +/* 0AF640 800AEA40 00000000 */ nop /* 0AF644 800AEA44 46240180 */ add.d $f6, $f0, $f4 /* 0AF648 800AEA48 46203220 */ cvt.s.d $f8, $f6 /* 0AF64C 800AEA4C E6080024 */ swc1 $f8, 0x24($s0) /* 0AF650 800AEA50 AE0D0008 */ sw $t5, 8($s0) .L800AEA54: -/* 0AF654 800AEA54 8DCEC4BC */ lw $t6, %lo(D_800DC4BC)($t6) +/* 0AF654 800AEA54 8DCEC4BC */ lw $t6, %lo(gControllerOne)($t6) /* 0AF658 800AEA58 95C40006 */ lhu $a0, 6($t6) /* 0AF65C 800AEA5C 95CF000C */ lhu $t7, 0xc($t6) /* 0AF660 800AEA60 008F2825 */ or $a1, $a0, $t7 @@ -595,18 +595,18 @@ glabel L800AE9D4 /* 0AF6A0 800AEAA0 3C014010 */ li $at, 0x40100000 # 2.250000 /* 0AF6A4 800AEAA4 4630003C */ c.lt.d $f0, $f16 /* 0AF6A8 800AEAA8 24080001 */ li $t0, 1 -/* 0AF6AC 800AEAAC 3C09800E */ lui $t1, %hi(D_800DC4BC) # $t1, 0x800e +/* 0AF6AC 800AEAAC 3C09800E */ lui $t1, %hi(gControllerOne) # $t1, 0x800e /* 0AF6B0 800AEAB0 45020008 */ bc1fl .L800AEAD4 /* 0AF6B4 800AEAB4 AE080008 */ sw $t0, 8($s0) /* 0AF6B8 800AEAB8 44819800 */ mtc1 $at, $f19 /* 0AF6BC 800AEABC 44809000 */ mtc1 $zero, $f18 -/* 0AF6C0 800AEAC0 00000000 */ nop +/* 0AF6C0 800AEAC0 00000000 */ nop /* 0AF6C4 800AEAC4 46320100 */ add.d $f4, $f0, $f18 /* 0AF6C8 800AEAC8 462021A0 */ cvt.s.d $f6, $f4 /* 0AF6CC 800AEACC E6060024 */ swc1 $f6, 0x24($s0) /* 0AF6D0 800AEAD0 AE080008 */ sw $t0, 8($s0) .L800AEAD4: -/* 0AF6D4 800AEAD4 8D29C4BC */ lw $t1, %lo(D_800DC4BC)($t1) +/* 0AF6D4 800AEAD4 8D29C4BC */ lw $t1, %lo(gControllerOne)($t1) /* 0AF6D8 800AEAD8 95240006 */ lhu $a0, 6($t1) .L800AEADC: /* 0AF6DC 800AEADC 308A4000 */ andi $t2, $a0, 0x4000 @@ -639,12 +639,12 @@ glabel L800AE9D4 /* 0AF740 800AEB40 46004021 */ cvt.d.s $f0, $f8 /* 0AF744 800AEB44 3C014010 */ li $at, 0x40100000 # 2.250000 /* 0AF748 800AEB48 462A003C */ c.lt.d $f0, $f10 -/* 0AF74C 800AEB4C 00000000 */ nop +/* 0AF74C 800AEB4C 00000000 */ nop /* 0AF750 800AEB50 4502003C */ bc1fl .L800AEC44 /* 0AF754 800AEB54 8FBF0024 */ lw $ra, 0x24($sp) /* 0AF758 800AEB58 44818800 */ mtc1 $at, $f17 /* 0AF75C 800AEB5C 44808000 */ mtc1 $zero, $f16 -/* 0AF760 800AEB60 00000000 */ nop +/* 0AF760 800AEB60 00000000 */ nop /* 0AF764 800AEB64 46300480 */ add.d $f18, $f0, $f16 /* 0AF768 800AEB68 46209120 */ cvt.s.d $f4, $f18 /* 0AF76C 800AEB6C 10000034 */ b .L800AEC40 @@ -711,4 +711,4 @@ glabel L800AEC40 /* 0AF844 800AEC44 8FB00020 */ lw $s0, 0x20($sp) /* 0AF848 800AEC48 27BD0030 */ addiu $sp, $sp, 0x30 /* 0AF84C 800AEC4C 03E00008 */ jr $ra -/* 0AF850 800AEC50 00000000 */ nop +/* 0AF850 800AEC50 00000000 */ nop diff --git a/asm/non_matchings/code_80091750/func_800AF004.s b/asm/non_matchings/code_80091750/func_800AF004.s index d2443e384..f6bcc52c2 100644 --- a/asm/non_matchings/code_80091750/func_800AF004.s +++ b/asm/non_matchings/code_80091750/func_800AF004.s @@ -11,7 +11,7 @@ glabel func_800AF004 /* 0AFC28 800AF028 002E0821 */ addu $at, $at, $t6 /* 0AFC2C 800AF02C 8C2E2A9C */ lw $t6, %lo(jpt_800F2A9C)($at) /* 0AFC30 800AF030 01C00008 */ jr $t6 -/* 0AFC34 800AF034 00000000 */ nop +/* 0AFC34 800AF034 00000000 */ nop glabel L800AF038 /* 0AFC38 800AF038 8E0F001C */ lw $t7, 0x1c($s0) /* 0AFC3C 800AF03C 3C028019 */ lui $v0, %hi(gCupSelection) # $v0, 0x8019 @@ -31,14 +31,14 @@ glabel L800AF038 /* 0AFC74 800AF074 05210004 */ bgez $t1, .L800AF088 /* 0AFC78 800AF078 312A0003 */ andi $t2, $t1, 3 /* 0AFC7C 800AF07C 11400002 */ beqz $t2, .L800AF088 -/* 0AFC80 800AF080 00000000 */ nop +/* 0AFC80 800AF080 00000000 */ nop /* 0AFC84 800AF084 254AFFFC */ addiu $t2, $t2, -4 .L800AF088: /* 0AFC88 800AF088 A04A0000 */ sb $t2, ($v0) /* 0AFC8C 800AF08C 05610004 */ bgez $t3, .L800AF0A0 /* 0AFC90 800AF090 316C0003 */ andi $t4, $t3, 3 /* 0AFC94 800AF094 11800002 */ beqz $t4, .L800AF0A0 -/* 0AFC98 800AF098 00000000 */ nop +/* 0AFC98 800AF098 00000000 */ nop /* 0AFC9C 800AF09C 258CFFFC */ addiu $t4, $t4, -4 .L800AF0A0: /* 0AFCA0 800AF0A0 AC6C0000 */ sw $t4, ($v1) @@ -67,12 +67,12 @@ glabel L800AF0BC /* 0AFCF8 800AF0F8 8FBF001C */ lw $ra, 0x1c($sp) glabel L800AF0FC /* 0AFCFC 800AF0FC 8E08001C */ lw $t0, 0x1c($s0) -/* 0AFD00 800AF100 3C02800E */ lui $v0, %hi(D_800DC4CC) # $v0, 0x800e +/* 0AFD00 800AF100 3C02800E */ lui $v0, %hi(gControllerFive) # $v0, 0x800e /* 0AFD04 800AF104 25090001 */ addiu $t1, $t0, 1 /* 0AFD08 800AF108 29210065 */ slti $at, $t1, 0x65 /* 0AFD0C 800AF10C 14200022 */ bnez $at, .L800AF198 /* 0AFD10 800AF110 AE09001C */ sw $t1, 0x1c($s0) -/* 0AFD14 800AF114 8C42C4CC */ lw $v0, %lo(D_800DC4CC)($v0) +/* 0AFD14 800AF114 8C42C4CC */ lw $v0, %lo(gControllerFive)($v0) /* 0AFD18 800AF118 240D0006 */ li $t5, 6 /* 0AFD1C 800AF11C 3C0E8028 */ lui $t6, %hi(D_802874F5) # $t6, 0x8028 /* 0AFD20 800AF120 944B0006 */ lhu $t3, 6($v0) @@ -88,7 +88,7 @@ glabel L800AF0FC /* 0AFD44 800AF144 3C044900 */ lui $a0, 0x4900 /* 0AFD48 800AF148 29C10003 */ slti $at, $t6, 3 /* 0AFD4C 800AF14C 10200006 */ beqz $at, .L800AF168 -/* 0AFD50 800AF150 00000000 */ nop +/* 0AFD50 800AF150 00000000 */ nop /* 0AFD54 800AF154 3C044900 */ lui $a0, (0x4900801B >> 16) # lui $a0, 0x4900 /* 0AFD58 800AF158 0C032384 */ jal play_sound2 /* 0AFD5C 800AF15C 34848016 */ ori $a0, (0x49008016 & 0xFFFF) # ori $a0, $a0, 0x8016 @@ -115,4 +115,4 @@ glabel L800AF198 /* 0AFD9C 800AF19C 8FB00018 */ lw $s0, 0x18($sp) /* 0AFDA0 800AF1A0 27BD0020 */ addiu $sp, $sp, 0x20 /* 0AFDA4 800AF1A4 03E00008 */ jr $ra -/* 0AFDA8 800AF1A8 00000000 */ nop +/* 0AFDA8 800AF1A8 00000000 */ nop diff --git a/asm/non_matchings/code_800AF9B0/func_800B63F0.s b/asm/non_matchings/code_800AF9B0/func_800B63F0.s index de89b6bf1..1de8ac71a 100644 --- a/asm/non_matchings/code_800AF9B0/func_800B63F0.s +++ b/asm/non_matchings/code_800AF9B0/func_800B63F0.s @@ -9,10 +9,10 @@ glabel func_800B63F0 /* 0B700C 800B640C AFB10018 */ sw $s1, 0x18($sp) /* 0B7010 800B6410 240E0001 */ li $t6, 1 /* 0B7014 800B6414 3C018016 */ lui $at, %hi(D_80162DD6) # $at, 0x8016 -/* 0B7018 800B6418 3C04800E */ lui $a0, %hi(D_800DC4E4) # $a0, 0x800e +/* 0B7018 800B6418 3C04800E */ lui $a0, %hi(gPlayerThree) # $a0, 0x800e /* 0B701C 800B641C A42E2DD6 */ sh $t6, %lo(D_80162DD6)($at) /* 0B7020 800B6420 0C0016BA */ jal func_80005AE8 -/* 0B7024 800B6424 8C84C4E4 */ lw $a0, %lo(D_800DC4E4)($a0) +/* 0B7024 800B6424 8C84C4E4 */ lw $a0, %lo(gPlayerThree)($a0) /* 0B7028 800B6428 3C188019 */ lui $t8, %hi(D_8018EE10) # $t8, 0x8019 /* 0B702C 800B642C 3C198019 */ lui $t9, %hi(gCupSelection) # $t9, 0x8019 /* 0B7030 800B6430 8339EE09 */ lb $t9, %lo(gCupSelection)($t9) @@ -34,7 +34,7 @@ glabel func_800B63F0 /* 0B706C 800B646C 8C4D0000 */ lw $t5, ($v0) /* 0B7070 800B6470 3C0E8016 */ lui $t6, %hi(D_80162DE0) # $t6, 0x8016 /* 0B7074 800B6474 118D0003 */ beq $t4, $t5, .L800B6484 -/* 0B7078 800B6478 00000000 */ nop +/* 0B7078 800B6478 00000000 */ nop /* 0B707C 800B647C 10000013 */ b .L800B64CC /* 0B7080 800B6480 24130003 */ li $s3, 3 .L800B6484: @@ -52,7 +52,7 @@ glabel func_800B63F0 /* 0B70AC 800B64AC 92380007 */ lbu $t8, 7($s1) /* 0B70B0 800B64B0 26100001 */ addiu $s0, $s0, 1 /* 0B70B4 800B64B4 13020003 */ beq $t8, $v0, .L800B64C4 -/* 0B70B8 800B64B8 00000000 */ nop +/* 0B70B8 800B64B8 00000000 */ nop /* 0B70BC 800B64BC 10000003 */ b .L800B64CC /* 0B70C0 800B64C0 24130001 */ li $s3, 1 .L800B64C4: diff --git a/asm/non_matchings/code_80281FA0/func_80283EF8.s b/asm/non_matchings/code_80281FA0/func_80283EF8.s index 6dfb83aff..029f599bc 100644 --- a/asm/non_matchings/code_80281FA0/func_80283EF8.s +++ b/asm/non_matchings/code_80281FA0/func_80283EF8.s @@ -1,23 +1,23 @@ glabel func_80283EF8 /* 127538 80283EF8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 12753C 80283EFC 3C0E800E */ lui $t6, %hi(D_800DC4E0) # $t6, 0x800e -/* 127540 80283F00 8DCEC4E0 */ lw $t6, %lo(D_800DC4E0)($t6) +/* 12753C 80283EFC 3C0E800E */ lui $t6, %hi(gPlayerTwo) # $t6, 0x800e +/* 127540 80283F00 8DCEC4E0 */ lw $t6, %lo(gPlayerTwo)($t6) /* 127544 80283F04 AFBF0014 */ sw $ra, 0x14($sp) /* 127548 80283F08 AFA40018 */ sw $a0, 0x18($sp) /* 12754C 80283F0C 3C063DF5 */ lui $a2, (0x3DF5C28F >> 16) # lui $a2, 0x3df5 /* 127550 80283F10 34C6C28F */ ori $a2, (0x3DF5C28F & 0xFFFF) # ori $a2, $a2, 0xc28f /* 127554 80283F14 0C0A0868 */ jal func_802821A0 /* 127558 80283F18 8DC50014 */ lw $a1, 0x14($t6) -/* 12755C 80283F1C 3C0F800E */ lui $t7, %hi(D_800DC4E0) # $t7, 0x800e -/* 127560 80283F20 8DEFC4E0 */ lw $t7, %lo(D_800DC4E0)($t7) +/* 12755C 80283F1C 3C0F800E */ lui $t7, %hi(gPlayerTwo) # $t7, 0x800e +/* 127560 80283F20 8DEFC4E0 */ lw $t7, %lo(gPlayerTwo)($t7) /* 127564 80283F24 8FA40018 */ lw $a0, 0x18($sp) /* 127568 80283F28 3C063DF5 */ lui $a2, (0x3DF5C28F >> 16) # lui $a2, 0x3df5 /* 12756C 80283F2C 34C6C28F */ ori $a2, (0x3DF5C28F & 0xFFFF) # ori $a2, $a2, 0xc28f /* 127570 80283F30 8DE50018 */ lw $a1, 0x18($t7) /* 127574 80283F34 0C0A0868 */ jal func_802821A0 /* 127578 80283F38 24840004 */ addiu $a0, $a0, 4 -/* 12757C 80283F3C 3C18800E */ lui $t8, %hi(D_800DC4E0) # $t8, 0x800e -/* 127580 80283F40 8F18C4E0 */ lw $t8, %lo(D_800DC4E0)($t8) +/* 12757C 80283F3C 3C18800E */ lui $t8, %hi(gPlayerTwo) # $t8, 0x800e +/* 127580 80283F40 8F18C4E0 */ lw $t8, %lo(gPlayerTwo)($t8) /* 127584 80283F44 8FA40018 */ lw $a0, 0x18($sp) /* 127588 80283F48 3C063DF5 */ lui $a2, (0x3DF5C28F >> 16) # lui $a2, 0x3df5 /* 12758C 80283F4C 34C6C28F */ ori $a2, (0x3DF5C28F & 0xFFFF) # ori $a2, $a2, 0xc28f @@ -27,4 +27,4 @@ glabel func_80283EF8 /* 12759C 80283F5C 8FBF0014 */ lw $ra, 0x14($sp) /* 1275A0 80283F60 27BD0018 */ addiu $sp, $sp, 0x18 /* 1275A4 80283F64 03E00008 */ jr $ra -/* 1275A8 80283F68 00000000 */ nop +/* 1275A8 80283F68 00000000 */ nop diff --git a/asm/non_matchings/code_80281FA0/func_80283FF4.s b/asm/non_matchings/code_80281FA0/func_80283FF4.s index cfd45b558..921d73c90 100644 --- a/asm/non_matchings/code_80281FA0/func_80283FF4.s +++ b/asm/non_matchings/code_80281FA0/func_80283FF4.s @@ -1,23 +1,23 @@ glabel func_80283FF4 /* 127634 80283FF4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 127638 80283FF8 3C0E800E */ lui $t6, %hi(D_800DC4E4) # $t6, 0x800e -/* 12763C 80283FFC 8DCEC4E4 */ lw $t6, %lo(D_800DC4E4)($t6) +/* 127638 80283FF8 3C0E800E */ lui $t6, %hi(gPlayerThree) # $t6, 0x800e +/* 12763C 80283FFC 8DCEC4E4 */ lw $t6, %lo(gPlayerThree)($t6) /* 127640 80284000 AFBF0014 */ sw $ra, 0x14($sp) /* 127644 80284004 AFA40018 */ sw $a0, 0x18($sp) /* 127648 80284008 3C063DF5 */ lui $a2, (0x3DF5C28F >> 16) # lui $a2, 0x3df5 /* 12764C 8028400C 34C6C28F */ ori $a2, (0x3DF5C28F & 0xFFFF) # ori $a2, $a2, 0xc28f /* 127650 80284010 0C0A0868 */ jal func_802821A0 /* 127654 80284014 8DC50014 */ lw $a1, 0x14($t6) -/* 127658 80284018 3C0F800E */ lui $t7, %hi(D_800DC4E4) # $t7, 0x800e -/* 12765C 8028401C 8DEFC4E4 */ lw $t7, %lo(D_800DC4E4)($t7) +/* 127658 80284018 3C0F800E */ lui $t7, %hi(gPlayerThree) # $t7, 0x800e +/* 12765C 8028401C 8DEFC4E4 */ lw $t7, %lo(gPlayerThree)($t7) /* 127660 80284020 8FA40018 */ lw $a0, 0x18($sp) /* 127664 80284024 3C063DF5 */ lui $a2, (0x3DF5C28F >> 16) # lui $a2, 0x3df5 /* 127668 80284028 34C6C28F */ ori $a2, (0x3DF5C28F & 0xFFFF) # ori $a2, $a2, 0xc28f /* 12766C 8028402C 8DE50018 */ lw $a1, 0x18($t7) /* 127670 80284030 0C0A0868 */ jal func_802821A0 /* 127674 80284034 24840004 */ addiu $a0, $a0, 4 -/* 127678 80284038 3C18800E */ lui $t8, %hi(D_800DC4E4) # $t8, 0x800e -/* 12767C 8028403C 8F18C4E4 */ lw $t8, %lo(D_800DC4E4)($t8) +/* 127678 80284038 3C18800E */ lui $t8, %hi(gPlayerThree) # $t8, 0x800e +/* 12767C 8028403C 8F18C4E4 */ lw $t8, %lo(gPlayerThree)($t8) /* 127680 80284040 8FA40018 */ lw $a0, 0x18($sp) /* 127684 80284044 3C063DF5 */ lui $a2, (0x3DF5C28F >> 16) # lui $a2, 0x3df5 /* 127688 80284048 34C6C28F */ ori $a2, (0x3DF5C28F & 0xFFFF) # ori $a2, $a2, 0xc28f @@ -27,4 +27,4 @@ glabel func_80283FF4 /* 127698 80284058 8FBF0014 */ lw $ra, 0x14($sp) /* 12769C 8028405C 27BD0018 */ addiu $sp, $sp, 0x18 /* 1276A0 80284060 03E00008 */ jr $ra -/* 1276A4 80284064 00000000 */ nop +/* 1276A4 80284064 00000000 */ nop diff --git a/asm/non_matchings/code_80281FA0/func_80284308.s b/asm/non_matchings/code_80281FA0/func_80284308.s index c497e2faa..c0340c61f 100644 --- a/asm/non_matchings/code_80281FA0/func_80284308.s +++ b/asm/non_matchings/code_80281FA0/func_80284308.s @@ -30,11 +30,11 @@ glabel func_80284308 /* 1279B8 80284378 3C0A8028 */ lui $t2, %hi(D_802874F5) # $t2, 0x8028 /* 1279BC 8028437C 814A74F5 */ lb $t2, %lo(D_802874F5)($t2) /* 1279C0 80284380 8FA90030 */ lw $t1, 0x30($sp) -/* 1279C4 80284384 3C03800E */ lui $v1, %hi(D_800DC4DC) # $v1, 0x800e +/* 1279C4 80284384 3C03800E */ lui $v1, %hi(gPlayerOne) # $v1, 0x800e /* 1279C8 80284388 000A5880 */ sll $t3, $t2, 2 /* 1279CC 8028438C 012B6021 */ addu $t4, $t1, $t3 /* 1279D0 80284390 8D820000 */ lw $v0, ($t4) -/* 1279D4 80284394 8C63C4DC */ lw $v1, %lo(D_800DC4DC)($v1) +/* 1279D4 80284394 8C63C4DC */ lw $v1, %lo(gPlayerOne)($v1) /* 1279D8 80284398 C4440014 */ lwc1 $f4, 0x14($v0) /* 1279DC 8028439C C4660014 */ lwc1 $f6, 0x14($v1) /* 1279E0 802843A0 C450001C */ lwc1 $f16, 0x1c($v0) @@ -66,4 +66,4 @@ glabel func_80284308 /* 127A48 80284408 8FB00018 */ lw $s0, 0x18($sp) /* 127A4C 8028440C 27BD0040 */ addiu $sp, $sp, 0x40 /* 127A50 80284410 03E00008 */ jr $ra -/* 127A54 80284414 00000000 */ nop +/* 127A54 80284414 00000000 */ nop diff --git a/asm/non_matchings/code_80281FA0/func_802846E4.s b/asm/non_matchings/code_80281FA0/func_802846E4.s index a87d766d0..93f347d09 100644 --- a/asm/non_matchings/code_80281FA0/func_802846E4.s +++ b/asm/non_matchings/code_80281FA0/func_802846E4.s @@ -8,8 +8,8 @@ glabel func_802846E4 /* 127D3C 802846FC AFA40018 */ sw $a0, 0x18($sp) /* 127D40 80284700 0C0A0B64 */ jal func_80282D90 /* 127D44 80284704 00003825 */ move $a3, $zero -/* 127D48 80284708 3C02800E */ lui $v0, %hi(D_800DC4E8) # $v0, 0x800e -/* 127D4C 8028470C 2442C4E8 */ addiu $v0, %lo(D_800DC4E8) # addiu $v0, $v0, -0x3b18 +/* 127D48 80284708 3C02800E */ lui $v0, %hi(gPlayerFour) # $v0, 0x800e +/* 127D4C 8028470C 2442C4E8 */ addiu $v0, %lo(gPlayerFour) # addiu $v0, $v0, -0x3b18 /* 127D50 80284710 8C4E0000 */ lw $t6, ($v0) /* 127D54 80284714 3C018028 */ lui $at, %hi(D_8028747C) # $at, 0x8028 /* 127D58 80284718 C420747C */ lwc1 $f0, %lo(D_8028747C)($at) @@ -56,4 +56,4 @@ glabel func_802846E4 /* 127DFC 802847BC 8FBF0014 */ lw $ra, 0x14($sp) /* 127E00 802847C0 27BD0018 */ addiu $sp, $sp, 0x18 /* 127E04 802847C4 03E00008 */ jr $ra -/* 127E08 802847C8 00000000 */ nop +/* 127E08 802847C8 00000000 */ nop diff --git a/asm/non_matchings/code_8028DF00/func_8028F970.s b/asm/non_matchings/code_8028DF00/func_8028F970.s index ac43fde83..d10266d4f 100644 --- a/asm/non_matchings/code_8028DF00/func_8028F970.s +++ b/asm/non_matchings/code_8028DF00/func_8028F970.s @@ -49,7 +49,7 @@ glabel func_8028F970 /* 0F9034 8028FA24 0C032384 */ jal play_sound2 /* 0F9038 8028FA28 3484801C */ ori $a0, (0x4900801C & 0xFFFF) # ori $a0, $a0, 0x801c /* 0F903C 8028FA2C 0C000A6C */ jal func_800029B0 -/* 0F9040 8028FA30 00000000 */ nop +/* 0F9040 8028FA30 00000000 */ nop .L8028FA34: /* 0F9044 8028FA34 96190006 */ lhu $t9, 6($s0) .L8028FA38: @@ -63,9 +63,9 @@ glabel func_8028F970 /* 0F9064 8028FA54 5540002E */ bnel $t2, $zero, .L8028FB10 /* 0F9068 8028FA58 26520001 */ addiu $s2, $s2, 1 /* 0F906C 8028FA5C 0C0A37C0 */ jal func_8028DF00 -/* 0F9070 8028FA60 00000000 */ nop -/* 0F9074 8028FA64 3C0B800E */ lui $t3, %hi(D_800DC4BC) # $t3, 0x800e -/* 0F9078 8028FA68 8D6BC4BC */ lw $t3, %lo(D_800DC4BC)($t3) +/* 0F9070 8028FA60 00000000 */ nop +/* 0F9074 8028FA64 3C0B800E */ lui $t3, %hi(gControllerOne) # $t3, 0x800e +/* 0F9078 8028FA68 8D6BC4BC */ lw $t3, %lo(gControllerOne)($t3) /* 0F907C 8028FA6C 3C01800E */ lui $at, %hi(D_800DC5FC) # $at, 0x800e /* 0F9080 8028FA70 24040001 */ li $a0, 1 /* 0F9084 8028FA74 020B6023 */ subu $t4, $s0, $t3 @@ -80,32 +80,32 @@ glabel func_8028F970 /* 0F90A8 8028FA98 3C018016 */ lui $at, %hi(D_80162DF0) # $at, 0x8016 /* 0F90AC 8028FA9C 144F0046 */ bne $v0, $t7, .L8028FBB8 /* 0F90B0 8028FAA0 AC222DF0 */ sw $v0, %lo(D_80162DF0)($at) -/* 0F90B4 8028FAA4 3C04800E */ lui $a0, %hi(D_800DC4DC) # $a0, 0x800e -/* 0F90B8 8028FAA8 8C84C4DC */ lw $a0, %lo(D_800DC4DC)($a0) +/* 0F90B4 8028FAA4 3C04800E */ lui $a0, %hi(gPlayerOne) # $a0, 0x800e +/* 0F90B8 8028FAA8 8C84C4DC */ lw $a0, %lo(gPlayerOne)($a0) /* 0F90BC 8028FAAC 94980000 */ lhu $t8, ($a0) /* 0F90C0 8028FAB0 33198100 */ andi $t9, $t8, 0x8100 /* 0F90C4 8028FAB4 13200003 */ beqz $t9, .L8028FAC4 -/* 0F90C8 8028FAB8 00000000 */ nop +/* 0F90C8 8028FAB8 00000000 */ nop /* 0F90CC 8028FABC 0C0016BA */ jal func_80005AE8 -/* 0F90D0 8028FAC0 00000000 */ nop +/* 0F90D0 8028FAC0 00000000 */ nop .L8028FAC4: -/* 0F90D4 8028FAC4 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e -/* 0F90D8 8028FAC8 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) +/* 0F90D4 8028FAC4 3C04800E */ lui $a0, %hi(gPlayerTwo) # $a0, 0x800e +/* 0F90D8 8028FAC8 8C84C4E0 */ lw $a0, %lo(gPlayerTwo)($a0) /* 0F90DC 8028FACC 94880000 */ lhu $t0, ($a0) /* 0F90E0 8028FAD0 31098100 */ andi $t1, $t0, 0x8100 /* 0F90E4 8028FAD4 11200003 */ beqz $t1, .L8028FAE4 -/* 0F90E8 8028FAD8 00000000 */ nop +/* 0F90E8 8028FAD8 00000000 */ nop /* 0F90EC 8028FADC 0C0016BA */ jal func_80005AE8 -/* 0F90F0 8028FAE0 00000000 */ nop +/* 0F90F0 8028FAE0 00000000 */ nop .L8028FAE4: -/* 0F90F4 8028FAE4 3C04800E */ lui $a0, %hi(D_800DC4E4) # $a0, 0x800e -/* 0F90F8 8028FAE8 8C84C4E4 */ lw $a0, %lo(D_800DC4E4)($a0) +/* 0F90F4 8028FAE4 3C04800E */ lui $a0, %hi(gPlayerThree) # $a0, 0x800e +/* 0F90F8 8028FAE8 8C84C4E4 */ lw $a0, %lo(gPlayerThree)($a0) /* 0F90FC 8028FAEC 948A0000 */ lhu $t2, ($a0) /* 0F9100 8028FAF0 314B8100 */ andi $t3, $t2, 0x8100 /* 0F9104 8028FAF4 51600031 */ beql $t3, $zero, .L8028FBBC /* 0F9108 8028FAF8 8FBF0024 */ lw $ra, 0x24($sp) /* 0F910C 8028FAFC 0C0016BA */ jal func_80005AE8 -/* 0F9110 8028FB00 00000000 */ nop +/* 0F9110 8028FB00 00000000 */ nop /* 0F9114 8028FB04 1000002D */ b .L8028FBBC /* 0F9118 8028FB08 8FBF0024 */ lw $ra, 0x24($sp) .L8028FB0C: @@ -121,17 +121,17 @@ glabel func_8028F970 /* 0F913C 8028FB2C 8FBF0024 */ lw $ra, 0x24($sp) /* 0F9140 8028FB30 8DADC53C */ lw $t5, %lo(gModeSelection)($t5) /* 0F9144 8028FB34 24010003 */ li $at, 3 -/* 0F9148 8028FB38 3C05800E */ lui $a1, %hi(D_800DC4BC) # $a1, 0x800e +/* 0F9148 8028FB38 3C05800E */ lui $a1, %hi(gControllerOne) # $a1, 0x800e /* 0F914C 8028FB3C 51A1001F */ beql $t5, $at, .L8028FBBC /* 0F9150 8028FB40 8FBF0024 */ lw $ra, 0x24($sp) -/* 0F9154 8028FB44 8CA5C4BC */ lw $a1, %lo(D_800DC4BC)($a1) +/* 0F9154 8028FB44 8CA5C4BC */ lw $a1, %lo(gControllerOne)($a1) /* 0F9158 8028FB48 3C028016 */ lui $v0, %hi(lapCount) # $v0, 0x8016 /* 0F915C 8028FB4C 24424390 */ addiu $v0, %lo(lapCount) # addiu $v0, $v0, 0x4390 /* 0F9160 8028FB50 94A40006 */ lhu $a0, 6($a1) /* 0F9164 8028FB54 24030002 */ li $v1, 2 /* 0F9168 8028FB58 308E0800 */ andi $t6, $a0, 0x800 /* 0F916C 8028FB5C 11C00003 */ beqz $t6, .L8028FB6C -/* 0F9170 8028FB60 00000000 */ nop +/* 0F9170 8028FB60 00000000 */ nop /* 0F9174 8028FB64 AC430000 */ sw $v1, ($v0) /* 0F9178 8028FB68 94A40006 */ lhu $a0, 6($a1) .L8028FB6C: diff --git a/asm/non_matchings/code_8028DF00/func_802903D8.s b/asm/non_matchings/code_8028DF00/func_802903D8.s index 78ecca3cb..ef372a085 100644 --- a/asm/non_matchings/code_8028DF00/func_802903D8.s +++ b/asm/non_matchings/code_8028DF00/func_802903D8.s @@ -83,7 +83,7 @@ glabel func_802903D8 /* 0F9B2C 8029051C 45030131 */ bc1tl .L802909E4 /* 0F9B30 80290520 8FBF0014 */ lw $ra, 0x14($sp) /* 0F9B34 80290524 4600203C */ c.lt.s $f4, $f0 -/* 0F9B38 80290528 00000000 */ nop +/* 0F9B38 80290528 00000000 */ nop /* 0F9B3C 8029052C 4503012D */ bc1tl .L802909E4 /* 0F9B40 80290530 8FBF0014 */ lw $ra, 0x14($sp) /* 0F9B44 80290534 94980000 */ lhu $t8, ($a0) @@ -98,9 +98,9 @@ glabel func_802903D8 /* 0F9B68 80290558 AFA5007C */ sw $a1, 0x7c($sp) /* 0F9B6C 8029055C 0C023F07 */ jal func_8008FC1C /* 0F9B70 80290560 8FA4007C */ lw $a0, 0x7c($sp) -/* 0F9B74 80290564 3C08800E */ lui $t0, %hi(D_800DC4DC) # $t0, 0x800e +/* 0F9B74 80290564 3C08800E */ lui $t0, %hi(gPlayerOne) # $t0, 0x800e /* 0F9B78 80290568 8FA6007C */ lw $a2, 0x7c($sp) -/* 0F9B7C 8029056C 8D08C4DC */ lw $t0, %lo(D_800DC4DC)($t0) +/* 0F9B7C 8029056C 8D08C4DC */ lw $t0, %lo(gPlayerOne)($t0) /* 0F9B80 80290570 24010DD8 */ li $at, 3544 /* 0F9B84 80290574 3C051900 */ lui $a1, (0x19008001 >> 16) # lui $a1, 0x1900 /* 0F9B88 80290578 00C82023 */ subu $a0, $a2, $t0 @@ -121,9 +121,9 @@ glabel func_802903D8 /* 0F9BC0 802905B0 AFA70078 */ sw $a3, 0x78($sp) /* 0F9BC4 802905B4 0C023F07 */ jal func_8008FC1C /* 0F9BC8 802905B8 AFA6007C */ sw $a2, 0x7c($sp) -/* 0F9BCC 802905BC 3C0D800E */ lui $t5, %hi(D_800DC4DC) # $t5, 0x800e +/* 0F9BCC 802905BC 3C0D800E */ lui $t5, %hi(gPlayerOne) # $t5, 0x800e /* 0F9BD0 802905C0 8FA6007C */ lw $a2, 0x7c($sp) -/* 0F9BD4 802905C4 8DADC4DC */ lw $t5, %lo(D_800DC4DC)($t5) +/* 0F9BD4 802905C4 8DADC4DC */ lw $t5, %lo(gPlayerOne)($t5) /* 0F9BD8 802905C8 24010DD8 */ li $at, 3544 /* 0F9BDC 802905CC 3C051900 */ lui $a1, (0x19008001 >> 16) # lui $a1, 0x1900 /* 0F9BE0 802905D0 00CD2023 */ subu $a0, $a2, $t5 @@ -148,9 +148,9 @@ glabel func_802903D8 /* 0F9C28 80290618 ACE9000C */ sw $t1, 0xc($a3) /* 0F9C2C 8029061C 0C023F07 */ jal func_8008FC1C /* 0F9C30 80290620 AFA70078 */ sw $a3, 0x78($sp) -/* 0F9C34 80290624 3C0A800E */ lui $t2, %hi(D_800DC4DC) # $t2, 0x800e +/* 0F9C34 80290624 3C0A800E */ lui $t2, %hi(gPlayerOne) # $t2, 0x800e /* 0F9C38 80290628 8FA70078 */ lw $a3, 0x78($sp) -/* 0F9C3C 8029062C 8D4AC4DC */ lw $t2, %lo(D_800DC4DC)($t2) +/* 0F9C3C 8029062C 8D4AC4DC */ lw $t2, %lo(gPlayerOne)($t2) /* 0F9C40 80290630 24010DD8 */ li $at, 3544 /* 0F9C44 80290634 3C051900 */ lui $a1, (0x19008001 >> 16) # lui $a1, 0x1900 /* 0F9C48 80290638 00EA2023 */ subu $a0, $a3, $t2 @@ -214,7 +214,7 @@ glabel func_802903D8 /* 0F9D18 80290708 E7A80064 */ swc1 $f8, 0x64($sp) /* 0F9D1C 8029070C C42892A4 */ lwc1 $f8, %lo(D_802B92A4)($at) /* 0F9D20 80290710 4608003C */ c.lt.s $f0, $f8 -/* 0F9D24 80290714 00000000 */ nop +/* 0F9D24 80290714 00000000 */ nop /* 0F9D28 80290718 45000025 */ bc1f .L802907B0 /* 0F9D2C 8029071C E7A40068 */ swc1 $f4, 0x68($sp) /* 0F9D30 80290720 C4EA0070 */ lwc1 $f10, 0x70($a3) @@ -263,7 +263,7 @@ glabel func_802903D8 /* 0F9DD8 802907C8 460C4282 */ mul.s $f10, $f8, $f12 /* 0F9DDC 802907CC C7A80068 */ lwc1 $f8, 0x68($sp) /* 0F9DE0 802907D0 31EE0200 */ andi $t6, $t7, 0x200 -/* 0F9DE4 802907D4 3C0B800E */ lui $t3, %hi(D_800DC4DC) # $t3, 0x800e +/* 0F9DE4 802907D4 3C0B800E */ lui $t3, %hi(gPlayerOne) # $t3, 0x800e /* 0F9DE8 802907D8 460A3100 */ add.s $f4, $f6, $f10 /* 0F9DEC 802907DC 46088182 */ mul.s $f6, $f16, $f8 /* 0F9DF0 802907E0 46043280 */ add.s $f10, $f6, $f4 @@ -300,21 +300,21 @@ glabel func_802903D8 /* 0F9E6C 8029085C C7A60060 */ lwc1 $f6, 0x60($sp) /* 0F9E70 80290860 46087001 */ sub.s $f0, $f14, $f8 /* 0F9E74 80290864 46003102 */ mul.s $f4, $f6, $f0 -/* 0F9E78 80290868 00000000 */ nop +/* 0F9E78 80290868 00000000 */ nop /* 0F9E7C 8029086C 460C2202 */ mul.s $f8, $f4, $f12 /* 0F9E80 80290870 C4E40018 */ lwc1 $f4, 0x18($a3) /* 0F9E84 80290874 46085181 */ sub.s $f6, $f10, $f8 /* 0F9E88 80290878 E4E60014 */ swc1 $f6, 0x14($a3) /* 0F9E8C 8029087C C7AA0064 */ lwc1 $f10, 0x64($sp) /* 0F9E90 80290880 46005202 */ mul.s $f8, $f10, $f0 -/* 0F9E94 80290884 00000000 */ nop +/* 0F9E94 80290884 00000000 */ nop /* 0F9E98 80290888 460C4182 */ mul.s $f6, $f8, $f12 /* 0F9E9C 8029088C C4E8001C */ lwc1 $f8, 0x1c($a3) /* 0F9EA0 80290890 46062281 */ sub.s $f10, $f4, $f6 /* 0F9EA4 80290894 E4EA0018 */ swc1 $f10, 0x18($a3) /* 0F9EA8 80290898 C7A40068 */ lwc1 $f4, 0x68($sp) /* 0F9EAC 8029089C 46002182 */ mul.s $f6, $f4, $f0 -/* 0F9EB0 802908A0 00000000 */ nop +/* 0F9EB0 802908A0 00000000 */ nop /* 0F9EB4 802908A4 460C3282 */ mul.s $f10, $f6, $f12 /* 0F9EB8 802908A8 460A4101 */ sub.s $f4, $f8, $f10 /* 0F9EBC 802908AC E4E4001C */ swc1 $f4, 0x1c($a3) @@ -348,21 +348,21 @@ glabel func_802903D8 /* 0F9F28 80290918 C7A80060 */ lwc1 $f8, 0x60($sp) /* 0F9F2C 8029091C 46067001 */ sub.s $f0, $f14, $f6 /* 0F9F30 80290920 46004282 */ mul.s $f10, $f8, $f0 -/* 0F9F34 80290924 00000000 */ nop +/* 0F9F34 80290924 00000000 */ nop /* 0F9F38 80290928 460C5182 */ mul.s $f6, $f10, $f12 /* 0F9F3C 8029092C C4CA0018 */ lwc1 $f10, 0x18($a2) /* 0F9F40 80290930 46062200 */ add.s $f8, $f4, $f6 /* 0F9F44 80290934 E4C80014 */ swc1 $f8, 0x14($a2) /* 0F9F48 80290938 C7A40064 */ lwc1 $f4, 0x64($sp) /* 0F9F4C 8029093C 46002182 */ mul.s $f6, $f4, $f0 -/* 0F9F50 80290940 00000000 */ nop +/* 0F9F50 80290940 00000000 */ nop /* 0F9F54 80290944 460C3202 */ mul.s $f8, $f6, $f12 /* 0F9F58 80290948 C4C6001C */ lwc1 $f6, 0x1c($a2) /* 0F9F5C 8029094C 46085100 */ add.s $f4, $f10, $f8 /* 0F9F60 80290950 E4C40018 */ swc1 $f4, 0x18($a2) /* 0F9F64 80290954 C7AA0068 */ lwc1 $f10, 0x68($sp) /* 0F9F68 80290958 46005202 */ mul.s $f8, $f10, $f0 -/* 0F9F6C 8029095C 00000000 */ nop +/* 0F9F6C 8029095C 00000000 */ nop /* 0F9F70 80290960 460C4102 */ mul.s $f4, $f8, $f12 /* 0F9F74 80290964 46043280 */ add.s $f10, $f6, $f4 /* 0F9F78 80290968 E4CA001C */ swc1 $f10, 0x1c($a2) @@ -371,7 +371,7 @@ glabel func_802903D8 /* 0F9F80 80290970 312A4000 */ andi $t2, $t1, 0x4000 /* 0F9F84 80290974 5140000D */ beql $t2, $zero, .L802909AC /* 0F9F88 80290978 94D80000 */ lhu $t8, ($a2) -/* 0F9F8C 8029097C 8D6BC4DC */ lw $t3, %lo(D_800DC4DC)($t3) +/* 0F9F8C 8029097C 8D6BC4DC */ lw $t3, %lo(gPlayerOne)($t3) /* 0F9F90 80290980 24010DD8 */ li $at, 3544 /* 0F9F94 80290984 3C051900 */ lui $a1, (0x19008001 >> 16) # lui $a1, 0x1900 /* 0F9F98 80290988 00EB2023 */ subu $a0, $a3, $t3 @@ -384,11 +384,11 @@ glabel func_802903D8 /* 0F9FB4 802909A4 8FBF0014 */ lw $ra, 0x14($sp) /* 0F9FB8 802909A8 94D80000 */ lhu $t8, ($a2) .L802909AC: -/* 0F9FBC 802909AC 3C0E800E */ lui $t6, %hi(D_800DC4DC) # $t6, 0x800e +/* 0F9FBC 802909AC 3C0E800E */ lui $t6, %hi(gPlayerOne) # $t6, 0x800e /* 0F9FC0 802909B0 330F4000 */ andi $t7, $t8, 0x4000 /* 0F9FC4 802909B4 51E0000B */ beql $t7, $zero, .L802909E4 /* 0F9FC8 802909B8 8FBF0014 */ lw $ra, 0x14($sp) -/* 0F9FCC 802909BC 8DCEC4DC */ lw $t6, %lo(D_800DC4DC)($t6) +/* 0F9FCC 802909BC 8DCEC4DC */ lw $t6, %lo(gPlayerOne)($t6) /* 0F9FD0 802909C0 24010DD8 */ li $at, 3544 /* 0F9FD4 802909C4 3C051900 */ lui $a1, (0x19008001 >> 16) # lui $a1, 0x1900 /* 0F9FD8 802909C8 00CE2023 */ subu $a0, $a2, $t6 @@ -402,4 +402,4 @@ glabel func_802903D8 .L802909E4: /* 0F9FF4 802909E4 27BD0078 */ addiu $sp, $sp, 0x78 /* 0F9FF8 802909E8 03E00008 */ jr $ra -/* 0F9FFC 802909EC 00000000 */ nop +/* 0F9FFC 802909EC 00000000 */ nop diff --git a/asm/non_matchings/code_802B0210/func_802B17F4.s b/asm/non_matchings/code_802B0210/func_802B17F4.s index 104d8d586..0e6af0ac0 100644 --- a/asm/non_matchings/code_802B0210/func_802B17F4.s +++ b/asm/non_matchings/code_802B0210/func_802B17F4.s @@ -44,8 +44,8 @@ glabel func_802B17F4 /* 11AEA8 802B1898 0019C900 */ sll $t9, $t9, 4 /* 11AEAC 802B189C 032A1821 */ addu $v1, $t9, $t2 /* 11AEB0 802B18A0 A4600006 */ sh $zero, 6($v1) -/* 11AEB4 802B18A4 3C09800E */ lui $t1, %hi(D_800DC4DC) # $t1, 0x800e -/* 11AEB8 802B18A8 8D29C4DC */ lw $t1, %lo(D_800DC4DC)($t1) +/* 11AEB4 802B18A4 3C09800E */ lui $t1, %hi(gPlayerOne) # $t1, 0x800e +/* 11AEB8 802B18A8 8D29C4DC */ lw $t1, %lo(gPlayerOne)($t1) /* 11AEBC 802B18AC 24010DD8 */ li $at, 3544 /* 11AEC0 802B18B0 00801025 */ move $v0, $a0 /* 11AEC4 802B18B4 00A94023 */ subu $t0, $a1, $t1 @@ -60,4 +60,4 @@ glabel func_802B17F4 /* 11AEE4 802B18D4 8FBF0014 */ lw $ra, 0x14($sp) /* 11AEE8 802B18D8 27BD0040 */ addiu $sp, $sp, 0x40 /* 11AEEC 802B18DC 03E00008 */ jr $ra -/* 11AEF0 802B18E0 00000000 */ nop +/* 11AEF0 802B18E0 00000000 */ nop diff --git a/asm/non_matchings/code_802B0210/func_802B18E4.s b/asm/non_matchings/code_802B0210/func_802B18E4.s index 8120b69de..2f169e0c3 100644 --- a/asm/non_matchings/code_802B0210/func_802B18E4.s +++ b/asm/non_matchings/code_802B0210/func_802B18E4.s @@ -50,8 +50,8 @@ glabel func_802B18E4 /* 11AFB0 802B19A0 A4600006 */ sh $zero, 6($v1) /* 11AFB4 802B19A4 A46A0010 */ sh $t2, 0x10($v1) /* 11AFB8 802B19A8 A4690012 */ sh $t1, 0x12($v1) -/* 11AFBC 802B19AC 3C19800E */ lui $t9, %hi(D_800DC4DC) # $t9, 0x800e -/* 11AFC0 802B19B0 8F39C4DC */ lw $t9, %lo(D_800DC4DC)($t9) +/* 11AFBC 802B19AC 3C19800E */ lui $t9, %hi(gPlayerOne) # $t9, 0x800e +/* 11AFC0 802B19B0 8F39C4DC */ lw $t9, %lo(gPlayerOne)($t9) /* 11AFC4 802B19B4 8FAC0040 */ lw $t4, 0x40($sp) /* 11AFC8 802B19B8 24010DD8 */ li $at, 3544 /* 11AFCC 802B19BC 44802000 */ mtc1 $zero, $f4 @@ -66,4 +66,4 @@ glabel func_802B18E4 /* 11AFEC 802B19DC 8FBF0014 */ lw $ra, 0x14($sp) /* 11AFF0 802B19E0 27BD0040 */ addiu $sp, $sp, 0x40 /* 11AFF4 802B19E4 03E00008 */ jr $ra -/* 11AFF8 802B19E8 00000000 */ nop +/* 11AFF8 802B19E8 00000000 */ nop diff --git a/asm/non_matchings/code_802B0210/func_802B19EC.s b/asm/non_matchings/code_802B0210/func_802B19EC.s index 3ad0b412d..dd6d1f016 100644 --- a/asm/non_matchings/code_802B0210/func_802B19EC.s +++ b/asm/non_matchings/code_802B0210/func_802B19EC.s @@ -120,8 +120,8 @@ glabel func_802B19EC .L802B1BB4: /* 11B1C4 802B1BB4 A6000010 */ sh $zero, 0x10($s0) /* 11B1C8 802B1BB8 A60D0012 */ sh $t5, 0x12($s0) -/* 11B1CC 802B1BBC 3C0F800E */ lui $t7, %hi(D_800DC4DC) # $t7, 0x800e -/* 11B1D0 802B1BC0 8DEFC4DC */ lw $t7, %lo(D_800DC4DC)($t7) +/* 11B1CC 802B1BBC 3C0F800E */ lui $t7, %hi(gPlayerOne) # $t7, 0x800e +/* 11B1D0 802B1BC0 8DEFC4DC */ lw $t7, %lo(gPlayerOne)($t7) /* 11B1D4 802B1BC4 24010DD8 */ li $at, 3544 /* 11B1D8 802B1BC8 8FA50060 */ lw $a1, 0x60($sp) /* 11B1DC 802B1BCC 022FC023 */ subu $t8, $s1, $t7 @@ -138,14 +138,14 @@ glabel func_802B19EC /* 11B208 802B1BF8 00005812 */ mflo $t3 /* 11B20C 802B1BFC A60B0004 */ sh $t3, 4($s0) /* 11B210 802B1C00 14600002 */ bnez $v1, .L802B1C0C -/* 11B214 802B1C04 00000000 */ nop +/* 11B214 802B1C04 00000000 */ nop /* 11B218 802B1C08 0007000D */ break 7 .L802B1C0C: /* 11B21C 802B1C0C 2401FFFF */ li $at, -1 /* 11B220 802B1C10 14610004 */ bne $v1, $at, .L802B1C24 /* 11B224 802B1C14 3C018000 */ lui $at, 0x8000 /* 11B228 802B1C18 17210002 */ bne $t9, $at, .L802B1C24 -/* 11B22C 802B1C1C 00000000 */ nop +/* 11B22C 802B1C1C 00000000 */ nop /* 11B230 802B1C20 0006000D */ break 6 .L802B1C24: /* 11B234 802B1C24 02045023 */ subu $t2, $s0, $a0 @@ -153,7 +153,7 @@ glabel func_802B19EC /* 11B23C 802B1C2C 468042A0 */ cvt.s.w $f10, $f8 /* 11B240 802B1C30 3C014F80 */ li $at, 0x4F800000 # 4294967296.000000 /* 11B244 802B1C34 44818000 */ mtc1 $at, $f16 -/* 11B248 802B1C38 00000000 */ nop +/* 11B248 802B1C38 00000000 */ nop /* 11B24C 802B1C3C 46105280 */ add.s $f10, $f10, $f16 .L802B1C40: /* 11B250 802B1C40 0143001A */ div $zero, $t2, $v1 @@ -164,14 +164,14 @@ glabel func_802B19EC /* 11B264 802B1C54 46809120 */ cvt.s.w $f4, $f18 /* 11B268 802B1C58 00A96021 */ addu $t4, $a1, $t1 /* 11B26C 802B1C5C 14600002 */ bnez $v1, .L802B1C68 -/* 11B270 802B1C60 00000000 */ nop +/* 11B270 802B1C60 00000000 */ nop /* 11B274 802B1C64 0007000D */ break 7 .L802B1C68: /* 11B278 802B1C68 2401FFFF */ li $at, -1 /* 11B27C 802B1C6C 14610004 */ bne $v1, $at, .L802B1C80 /* 11B280 802B1C70 3C018000 */ lui $at, 0x8000 /* 11B284 802B1C74 15410002 */ bne $t2, $at, .L802B1C80 -/* 11B288 802B1C78 00000000 */ nop +/* 11B288 802B1C78 00000000 */ nop /* 11B28C 802B1C7C 0006000D */ break 6 .L802B1C80: /* 11B290 802B1C80 E5840024 */ swc1 $f4, 0x24($t4) diff --git a/asm/non_matchings/code_802B0210/func_802B1C9C.s b/asm/non_matchings/code_802B0210/func_802B1C9C.s index 0d9abb3b0..67590b59c 100644 --- a/asm/non_matchings/code_802B0210/func_802B1C9C.s +++ b/asm/non_matchings/code_802B0210/func_802B1C9C.s @@ -93,15 +93,15 @@ glabel func_802B1C9C /* 11B414 802B1E04 A6000006 */ sh $zero, 6($s0) /* 11B418 802B1E08 A6000010 */ sh $zero, 0x10($s0) /* 11B41C 802B1E0C A60E0012 */ sh $t6, 0x12($s0) -/* 11B420 802B1E10 3C19800E */ lui $t9, %hi(D_800DC4DC) # $t9, 0x800e -/* 11B424 802B1E14 8F39C4DC */ lw $t9, %lo(D_800DC4DC)($t9) +/* 11B420 802B1E10 3C19800E */ lui $t9, %hi(gPlayerOne) # $t9, 0x800e +/* 11B424 802B1E14 8F39C4DC */ lw $t9, %lo(gPlayerOne)($t9) /* 11B428 802B1E18 24010DD8 */ li $at, 3544 /* 11B42C 802B1E1C 87A2003E */ lh $v0, 0x3e($sp) /* 11B430 802B1E20 02395823 */ subu $t3, $s1, $t9 /* 11B434 802B1E24 0161001A */ div $zero, $t3, $at /* 11B438 802B1E28 00005012 */ mflo $t2 /* 11B43C 802B1E2C A60A0014 */ sh $t2, 0x14($s0) -/* 11B440 802B1E30 00000000 */ nop +/* 11B440 802B1E30 00000000 */ nop .L802B1E34: /* 11B444 802B1E34 8FBF002C */ lw $ra, 0x2c($sp) /* 11B448 802B1E38 8FB00024 */ lw $s0, 0x24($sp) diff --git a/asm/non_matchings/code_802B0210/func_802B1E48.s b/asm/non_matchings/code_802B0210/func_802B1E48.s index a7fe98cd0..2d1f3f4bf 100644 --- a/asm/non_matchings/code_802B0210/func_802B1E48.s +++ b/asm/non_matchings/code_802B0210/func_802B1E48.s @@ -93,17 +93,17 @@ glabel func_802B1E48 /* 11B5C0 802B1FB0 A6000010 */ sh $zero, 0x10($s0) /* 11B5C4 802B1FB4 862E002E */ lh $t6, 0x2e($s1) /* 11B5C8 802B1FB8 24018000 */ li $at, -32768 -/* 11B5CC 802B1FBC 3C0B800E */ lui $t3, %hi(D_800DC4DC) # $t3, 0x800e +/* 11B5CC 802B1FBC 3C0B800E */ lui $t3, %hi(gPlayerOne) # $t3, 0x800e /* 11B5D0 802B1FC0 01C1C821 */ addu $t9, $t6, $at /* 11B5D4 802B1FC4 A6190012 */ sh $t9, 0x12($s0) -/* 11B5D8 802B1FC8 8D6BC4DC */ lw $t3, %lo(D_800DC4DC)($t3) +/* 11B5D8 802B1FC8 8D6BC4DC */ lw $t3, %lo(gPlayerOne)($t3) /* 11B5DC 802B1FCC 24010DD8 */ li $at, 3544 /* 11B5E0 802B1FD0 87A2003E */ lh $v0, 0x3e($sp) /* 11B5E4 802B1FD4 022B5023 */ subu $t2, $s1, $t3 /* 11B5E8 802B1FD8 0141001A */ div $zero, $t2, $at /* 11B5EC 802B1FDC 00004012 */ mflo $t0 /* 11B5F0 802B1FE0 A6080014 */ sh $t0, 0x14($s0) -/* 11B5F4 802B1FE4 00000000 */ nop +/* 11B5F4 802B1FE4 00000000 */ nop .L802B1FE8: /* 11B5F8 802B1FE8 8FBF002C */ lw $ra, 0x2c($sp) /* 11B5FC 802B1FEC 8FB00024 */ lw $s0, 0x24($sp) diff --git a/asm/non_matchings/code_802B0210/func_802B2914.s b/asm/non_matchings/code_802B0210/func_802B2914.s index e04fdd362..0c23885a8 100644 --- a/asm/non_matchings/code_802B0210/func_802B2914.s +++ b/asm/non_matchings/code_802B0210/func_802B2914.s @@ -83,8 +83,8 @@ glabel func_802B2914 /* 11C068 802B2A58 E7A80014 */ swc1 $f8, 0x14($sp) /* 11C06C 802B2A5C 0C0AD38C */ jal func_802B4E30 /* 11C070 802B2A60 02002025 */ move $a0, $s0 -/* 11C074 802B2A64 3C06800E */ lui $a2, %hi(D_800DC4DC) # $a2, 0x800e -/* 11C078 802B2A68 24C6C4DC */ addiu $a2, %lo(D_800DC4DC) # addiu $a2, $a2, -0x3b24 +/* 11C074 802B2A64 3C06800E */ lui $a2, %hi(gPlayerOne) # $a2, 0x800e +/* 11C078 802B2A68 24C6C4DC */ addiu $a2, %lo(gPlayerOne) # addiu $a2, $a2, -0x3b24 /* 11C07C 802B2A6C 8CD90000 */ lw $t9, ($a2) /* 11C080 802B2A70 24070DD8 */ li $a3, 3544 /* 11C084 802B2A74 3C088016 */ lui $t0, %hi(D_8015F9B8) # $t0, 0x8016 @@ -101,14 +101,14 @@ glabel func_802B2914 /* 11C0B0 802B2AA0 24090070 */ li $t1, 112 /* 11C0B4 802B2AA4 A6180002 */ sh $t8, 2($s0) /* 11C0B8 802B2AA8 14E00002 */ bnez $a3, .L802B2AB4 -/* 11C0BC 802B2AAC 00000000 */ nop +/* 11C0BC 802B2AAC 00000000 */ nop /* 11C0C0 802B2AB0 0007000D */ break 7 .L802B2AB4: /* 11C0C4 802B2AB4 2401FFFF */ li $at, -1 /* 11C0C8 802B2AB8 14E10004 */ bne $a3, $at, .L802B2ACC /* 11C0CC 802B2ABC 3C018000 */ lui $at, 0x8000 /* 11C0D0 802B2AC0 15410002 */ bne $t2, $at, .L802B2ACC -/* 11C0D4 802B2AC4 00000000 */ nop +/* 11C0D4 802B2AC4 00000000 */ nop /* 11C0D8 802B2AC8 0006000D */ break 6 .L802B2ACC: /* 11C0DC 802B2ACC 24010070 */ li $at, 112 @@ -126,7 +126,7 @@ glabel func_802B2914 /* 11C10C 802B2AFC 002F0821 */ addu $at, $at, $t7 /* 11C110 802B2B00 8C2F9EF4 */ lw $t7, %lo(jpt_802B9EF4)($at) /* 11C114 802B2B04 01E00008 */ jr $t7 -/* 11C118 802B2B08 00000000 */ nop +/* 11C118 802B2B08 00000000 */ nop glabel L802B2B0C /* 11C11C 802B2B0C 24180002 */ li $t8, 2 /* 11C120 802B2B10 A6180006 */ sh $t8, 6($s0) @@ -193,19 +193,19 @@ glabel L802B2BA4 /* 11C200 802B2BF0 00002012 */ mflo $a0 /* 11C204 802B2BF4 308D00FF */ andi $t5, $a0, 0xff /* 11C208 802B2BF8 14E00002 */ bnez $a3, .L802B2C04 -/* 11C20C 802B2BFC 00000000 */ nop +/* 11C20C 802B2BFC 00000000 */ nop /* 11C210 802B2C00 0007000D */ break 7 .L802B2C04: /* 11C214 802B2C04 2401FFFF */ li $at, -1 /* 11C218 802B2C08 14E10004 */ bne $a3, $at, .L802B2C1C /* 11C21C 802B2C0C 3C018000 */ lui $at, 0x8000 /* 11C220 802B2C10 15810002 */ bne $t4, $at, .L802B2C1C -/* 11C224 802B2C14 00000000 */ nop +/* 11C224 802B2C14 00000000 */ nop /* 11C228 802B2C18 0006000D */ break 6 .L802B2C1C: /* 11C22C 802B2C1C 01A02025 */ move $a0, $t5 /* 11C230 802B2C20 0C032418 */ jal func_800C9060 -/* 11C234 802B2C24 00000000 */ nop +/* 11C234 802B2C24 00000000 */ nop .L802B2C28: /* 11C238 802B2C28 8FBF0034 */ lw $ra, 0x34($sp) .L802B2C2C: diff --git a/asm/non_matchings/code_802B0210/func_802B2C40.s b/asm/non_matchings/code_802B0210/func_802B2C40.s index 675356085..1a4806e5e 100644 --- a/asm/non_matchings/code_802B0210/func_802B2C40.s +++ b/asm/non_matchings/code_802B0210/func_802B2C40.s @@ -50,8 +50,8 @@ glabel func_802B2C40 /* 11C310 802B2D00 10000016 */ b .L802B2D5C /* 11C314 802B2D04 01C01025 */ move $v0, $t6 .L802B2D08: -/* 11C318 802B2D08 3C19800E */ lui $t9, %hi(D_800DC4DC) # $t9, 0x800e -/* 11C31C 802B2D0C 8F39C4DC */ lw $t9, %lo(D_800DC4DC)($t9) +/* 11C318 802B2D08 3C19800E */ lui $t9, %hi(gPlayerOne) # $t9, 0x800e +/* 11C31C 802B2D0C 8F39C4DC */ lw $t9, %lo(gPlayerOne)($t9) /* 11C320 802B2D10 24010DD8 */ li $at, 3544 /* 11C324 802B2D14 000478C0 */ sll $t7, $a0, 3 /* 11C328 802B2D18 02194023 */ subu $t0, $s0, $t9 @@ -76,4 +76,4 @@ glabel func_802B2C40 /* 11C370 802B2D60 8FB00018 */ lw $s0, 0x18($sp) /* 11C374 802B2D64 27BD0060 */ addiu $sp, $sp, 0x60 /* 11C378 802B2D68 03E00008 */ jr $ra -/* 11C37C 802B2D6C 00000000 */ nop +/* 11C37C 802B2D6C 00000000 */ nop diff --git a/asm/non_matchings/code_802B0210/func_802B2D70.s b/asm/non_matchings/code_802B0210/func_802B2D70.s index 8aab75939..bd2c179e1 100644 --- a/asm/non_matchings/code_802B0210/func_802B2D70.s +++ b/asm/non_matchings/code_802B0210/func_802B2D70.s @@ -1,6 +1,6 @@ glabel func_802B2D70 -/* 11C380 802B2D70 3C0E800E */ lui $t6, %hi(D_800DC4DC) # $t6, 0x800e -/* 11C384 802B2D74 8DCEC4DC */ lw $t6, %lo(D_800DC4DC)($t6) +/* 11C380 802B2D70 3C0E800E */ lui $t6, %hi(gPlayerOne) # $t6, 0x800e +/* 11C384 802B2D74 8DCEC4DC */ lw $t6, %lo(gPlayerOne)($t6) /* 11C388 802B2D78 24010DD8 */ li $at, 3544 /* 11C38C 802B2D7C 27BDFF98 */ addiu $sp, $sp, -0x68 /* 11C390 802B2D80 008E1023 */ subu $v0, $a0, $t6 @@ -84,4 +84,4 @@ glabel func_802B2D70 /* 11C4BC 802B2EAC 8FB00018 */ lw $s0, 0x18($sp) /* 11C4C0 802B2EB0 27BD0068 */ addiu $sp, $sp, 0x68 /* 11C4C4 802B2EB4 03E00008 */ jr $ra -/* 11C4C8 802B2EB8 00000000 */ nop +/* 11C4C8 802B2EB8 00000000 */ nop diff --git a/asm/non_matchings/code_802B0210/func_802B2EBC.s b/asm/non_matchings/code_802B0210/func_802B2EBC.s index 1fd61d08a..7c43a74da 100644 --- a/asm/non_matchings/code_802B0210/func_802B2EBC.s +++ b/asm/non_matchings/code_802B0210/func_802B2EBC.s @@ -4,12 +4,12 @@ glabel func_802B2EBC /* 11C4D4 802B2EC4 0C02796F */ jal func_8009E5BC /* 11C4D8 802B2EC8 AFA40018 */ sw $a0, 0x18($sp) /* 11C4DC 802B2ECC 8FA60018 */ lw $a2, 0x18($sp) -/* 11C4E0 802B2ED0 3C18800E */ lui $t8, %hi(D_800DC4DC) # $t8, 0x800e +/* 11C4E0 802B2ED0 3C18800E */ lui $t8, %hi(gPlayerOne) # $t8, 0x800e /* 11C4E4 802B2ED4 94CE0000 */ lhu $t6, ($a2) /* 11C4E8 802B2ED8 31CF4000 */ andi $t7, $t6, 0x4000 /* 11C4EC 802B2EDC 11E0000B */ beqz $t7, .L802B2F0C -/* 11C4F0 802B2EE0 00000000 */ nop -/* 11C4F4 802B2EE4 8F18C4DC */ lw $t8, %lo(D_800DC4DC)($t8) +/* 11C4F0 802B2EE0 00000000 */ nop +/* 11C4F4 802B2EE4 8F18C4DC */ lw $t8, %lo(gPlayerOne)($t8) /* 11C4F8 802B2EE8 24010DD8 */ li $at, 3544 /* 11C4FC 802B2EEC AFA60018 */ sw $a2, 0x18($sp) /* 11C500 802B2EF0 00D82023 */ subu $a0, $a2, $t8 @@ -17,7 +17,7 @@ glabel func_802B2EBC /* 11C508 802B2EF8 0000C812 */ mflo $t9 /* 11C50C 802B2EFC 332400FF */ andi $a0, $t9, 0xff /* 11C510 802B2F00 0C032AD3 */ jal func_800CAB4C -/* 11C514 802B2F04 00000000 */ nop +/* 11C514 802B2F04 00000000 */ nop /* 11C518 802B2F08 8FA60018 */ lw $a2, 0x18($sp) .L802B2F0C: /* 11C51C 802B2F0C 3C03800F */ lui $v1, %hi(gPlayers) # $v1, 0x800f @@ -32,7 +32,7 @@ glabel func_802B2EBC /* 11C540 802B2F30 24636990 */ addiu $v1, %lo(gPlayers) # addiu $v1, $v1, 0x6990 .L802B2F34: /* 11C544 802B2F34 10C30004 */ beq $a2, $v1, .L802B2F48 -/* 11C548 802B2F38 00000000 */ nop +/* 11C548 802B2F38 00000000 */ nop /* 11C54C 802B2F3C 8C69000C */ lw $t1, 0xc($v1) /* 11C550 802B2F40 352A4000 */ ori $t2, $t1, 0x4000 /* 11C554 802B2F44 AC6A000C */ sw $t2, 0xc($v1) @@ -61,4 +61,4 @@ glabel func_802B2EBC /* 11C5A0 802B2F90 8FBF0014 */ lw $ra, 0x14($sp) /* 11C5A4 802B2F94 27BD0018 */ addiu $sp, $sp, 0x18 /* 11C5A8 802B2F98 03E00008 */ jr $ra -/* 11C5AC 802B2F9C 00000000 */ nop +/* 11C5AC 802B2F9C 00000000 */ nop diff --git a/asm/non_matchings/code_802B0210/func_802B2FA0.s b/asm/non_matchings/code_802B0210/func_802B2FA0.s index 2551bc822..00d7133ac 100644 --- a/asm/non_matchings/code_802B0210/func_802B2FA0.s +++ b/asm/non_matchings/code_802B0210/func_802B2FA0.s @@ -1,6 +1,6 @@ glabel func_802B2FA0 -/* 11C5B0 802B2FA0 3C0E800E */ lui $t6, %hi(D_800DC4DC) # $t6, 0x800e -/* 11C5B4 802B2FA4 8DCEC4DC */ lw $t6, %lo(D_800DC4DC)($t6) +/* 11C5B0 802B2FA0 3C0E800E */ lui $t6, %hi(gPlayerOne) # $t6, 0x800e +/* 11C5B4 802B2FA4 8DCEC4DC */ lw $t6, %lo(gPlayerOne)($t6) /* 11C5B8 802B2FA8 24010DD8 */ li $at, 3544 /* 11C5BC 802B2FAC 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 11C5C0 802B2FB0 008E7823 */ subu $t7, $a0, $t6 @@ -17,32 +17,32 @@ glabel func_802B2FA0 /* 11C5EC 802B2FDC 00280821 */ addu $at, $at, $t0 /* 11C5F0 802B2FE0 8C289F08 */ lw $t0, %lo(jpt_802B9F08)($at) /* 11C5F4 802B2FE4 01000008 */ jr $t0 -/* 11C5F8 802B2FE8 00000000 */ nop +/* 11C5F8 802B2FE8 00000000 */ nop glabel L802B2FEC /* 11C5FC 802B2FEC 0C0AC727 */ jal func_802B1C9C -/* 11C600 802B2FF0 00000000 */ nop +/* 11C600 802B2FF0 00000000 */ nop /* 11C604 802B2FF4 10000037 */ b .L802B30D4 -/* 11C608 802B2FF8 00000000 */ nop +/* 11C608 802B2FF8 00000000 */ nop glabel L802B2FFC /* 11C60C 802B2FFC 0C0AC792 */ jal func_802B1E48 -/* 11C610 802B3000 00000000 */ nop +/* 11C610 802B3000 00000000 */ nop /* 11C614 802B3004 10000033 */ b .L802B30D4 -/* 11C618 802B3008 00000000 */ nop +/* 11C618 802B3008 00000000 */ nop glabel L802B300C /* 11C61C 802B300C 0C0AC7FF */ jal func_802B1FFC -/* 11C620 802B3010 00000000 */ nop +/* 11C620 802B3010 00000000 */ nop /* 11C624 802B3014 1000002F */ b .L802B30D4 -/* 11C628 802B3018 00000000 */ nop +/* 11C628 802B3018 00000000 */ nop glabel L802B301C /* 11C62C 802B301C 0C0ACB5C */ jal func_802B2D70 -/* 11C630 802B3020 00000000 */ nop +/* 11C630 802B3020 00000000 */ nop /* 11C634 802B3024 1000002B */ b .L802B30D4 -/* 11C638 802B3028 00000000 */ nop +/* 11C638 802B3028 00000000 */ nop glabel L802B302C /* 11C63C 802B302C 0C0AC5FD */ jal func_802B17F4 -/* 11C640 802B3030 00000000 */ nop +/* 11C640 802B3030 00000000 */ nop /* 11C644 802B3034 10000027 */ b .L802B30D4 -/* 11C648 802B3038 00000000 */ nop +/* 11C648 802B3038 00000000 */ nop glabel L802B303C /* 11C64C 802B303C 8C89000C */ lw $t1, 0xc($a0) /* 11C650 802B3040 352A0200 */ ori $t2, $t1, 0x200 @@ -75,19 +75,19 @@ glabel L802B308C /* 11C6A8 802B3098 AC8A000C */ sw $t2, 0xc($a0) glabel L802B309C /* 11C6AC 802B309C 0C0ACBAF */ jal func_802B2EBC -/* 11C6B0 802B30A0 00000000 */ nop +/* 11C6B0 802B30A0 00000000 */ nop /* 11C6B4 802B30A4 1000000B */ b .L802B30D4 -/* 11C6B8 802B30A8 00000000 */ nop +/* 11C6B8 802B30A8 00000000 */ nop glabel L802B30AC /* 11C6BC 802B30AC 0C0ACB10 */ jal func_802B2C40 -/* 11C6C0 802B30B0 00000000 */ nop +/* 11C6C0 802B30B0 00000000 */ nop /* 11C6C4 802B30B4 10000007 */ b .L802B30D4 -/* 11C6C8 802B30B8 00000000 */ nop +/* 11C6C8 802B30B8 00000000 */ nop glabel L802B30BC /* 11C6CC 802B30BC 0C0AC639 */ jal func_802B18E4 /* 11C6D0 802B30C0 24050015 */ li $a1, 21 /* 11C6D4 802B30C4 10000003 */ b .L802B30D4 -/* 11C6D8 802B30C8 00000000 */ nop +/* 11C6D8 802B30C8 00000000 */ nop glabel L802B30CC /* 11C6DC 802B30CC 0C0AC639 */ jal func_802B18E4 /* 11C6E0 802B30D0 24050016 */ li $a1, 22 @@ -97,4 +97,4 @@ glabel L802B30CC /* 11C6EC 802B30DC 8FBF0014 */ lw $ra, 0x14($sp) /* 11C6F0 802B30E0 27BD0020 */ addiu $sp, $sp, 0x20 /* 11C6F4 802B30E4 03E00008 */ jr $ra -/* 11C6F8 802B30E8 00000000 */ nop +/* 11C6F8 802B30E8 00000000 */ nop diff --git a/asm/non_matchings/code_802B0210/func_802B30EC.s b/asm/non_matchings/code_802B0210/func_802B30EC.s index b87321122..7f244725d 100644 --- a/asm/non_matchings/code_802B0210/func_802B30EC.s +++ b/asm/non_matchings/code_802B0210/func_802B30EC.s @@ -11,14 +11,14 @@ glabel func_802B30EC /* 11C720 802B3110 3C10800F */ lui $s0, %hi(gPlayers) # $s0, 0x800f /* 11C724 802B3114 3C12800F */ lui $s2, %hi(gControllers) # $s2, 0x800f /* 11C728 802B3118 3C14800F */ lui $s4, %hi(gControllers+0x40) # $s4, 0x800f -/* 11C72C 802B311C 3C15800E */ lui $s5, %hi(D_800DC4E0) # $s5, 0x800e -/* 11C730 802B3120 3C16800E */ lui $s6, %hi(D_800DC4D0) # $s6, 0x800e -/* 11C734 802B3124 3C1E800E */ lui $fp, %hi(D_800DC4E4) # $fp, 0x800e +/* 11C72C 802B311C 3C15800E */ lui $s5, %hi(gPlayerTwo) # $s5, 0x800e +/* 11C730 802B3120 3C16800E */ lui $s6, %hi(gControllerSix) # $s6, 0x800e +/* 11C734 802B3124 3C1E800E */ lui $fp, %hi(gPlayerThree) # $fp, 0x800e /* 11C738 802B3128 AFBF003C */ sw $ra, 0x3c($sp) /* 11C73C 802B312C AFB1001C */ sw $s1, 0x1c($sp) -/* 11C740 802B3130 27DEC4E4 */ addiu $fp, %lo(D_800DC4E4) # addiu $fp, $fp, -0x3b1c -/* 11C744 802B3134 26D6C4D0 */ addiu $s6, %lo(D_800DC4D0) # addiu $s6, $s6, -0x3b30 -/* 11C748 802B3138 26B5C4E0 */ addiu $s5, %lo(D_800DC4E0) # addiu $s5, $s5, -0x3b20 +/* 11C740 802B3130 27DEC4E4 */ addiu $fp, %lo(gPlayerThree) # addiu $fp, $fp, -0x3b1c +/* 11C744 802B3134 26D6C4D0 */ addiu $s6, %lo(gControllerSix) # addiu $s6, $s6, -0x3b30 +/* 11C748 802B3138 26B5C4E0 */ addiu $s5, %lo(gPlayerTwo) # addiu $s5, $s5, -0x3b20 /* 11C74C 802B313C 26946950 */ addiu $s4, %lo(gControllers+0x40) # addiu $s4, $s4, 0x6950 /* 11C750 802B3140 26526910 */ addiu $s2, %lo(gControllers) # addiu $s2, $s2, 0x6910 /* 11C754 802B3144 26106990 */ addiu $s0, %lo(gPlayers) # addiu $s0, $s0, 0x6990 @@ -39,14 +39,14 @@ glabel func_802B30EC /* 11C78C 802B317C 0313001A */ div $zero, $t8, $s3 /* 11C790 802B3180 0000C812 */ mflo $t9 /* 11C794 802B3184 16600002 */ bnez $s3, .L802B3190 -/* 11C798 802B3188 00000000 */ nop +/* 11C798 802B3188 00000000 */ nop /* 11C79C 802B318C 0007000D */ break 7 .L802B3190: /* 11C7A0 802B3190 2401FFFF */ li $at, -1 /* 11C7A4 802B3194 16610004 */ bne $s3, $at, .L802B31A8 /* 11C7A8 802B3198 3C018000 */ lui $at, 0x8000 /* 11C7AC 802B319C 17010002 */ bne $t8, $at, .L802B31A8 -/* 11C7B0 802B31A0 00000000 */ nop +/* 11C7B0 802B31A0 00000000 */ nop /* 11C7B4 802B31A4 0006000D */ break 6 .L802B31A8: /* 11C7B8 802B31A8 57200004 */ bnel $t9, $zero, .L802B31BC @@ -55,46 +55,46 @@ glabel func_802B30EC /* 11C7C4 802B31B4 8ED10000 */ lw $s1, ($s6) /* 11C7C8 802B31B8 8FC80000 */ lw $t0, ($fp) .L802B31BC: -/* 11C7CC 802B31BC 3C0B800E */ lui $t3, %hi(D_800DC4DC) # $t3, 0x800e +/* 11C7CC 802B31BC 3C0B800E */ lui $t3, %hi(gPlayerOne) # $t3, 0x800e /* 11C7D0 802B31C0 02084823 */ subu $t1, $s0, $t0 /* 11C7D4 802B31C4 0133001A */ div $zero, $t1, $s3 /* 11C7D8 802B31C8 00005012 */ mflo $t2 /* 11C7DC 802B31CC 16600002 */ bnez $s3, .L802B31D8 -/* 11C7E0 802B31D0 00000000 */ nop +/* 11C7E0 802B31D0 00000000 */ nop /* 11C7E4 802B31D4 0007000D */ break 7 .L802B31D8: /* 11C7E8 802B31D8 2401FFFF */ li $at, -1 /* 11C7EC 802B31DC 16610004 */ bne $s3, $at, .L802B31F0 /* 11C7F0 802B31E0 3C018000 */ lui $at, 0x8000 /* 11C7F4 802B31E4 15210002 */ bne $t1, $at, .L802B31F0 -/* 11C7F8 802B31E8 00000000 */ nop +/* 11C7F8 802B31E8 00000000 */ nop /* 11C7FC 802B31EC 0006000D */ break 6 .L802B31F0: /* 11C800 802B31F0 15400004 */ bnez $t2, .L802B3204 -/* 11C804 802B31F4 00000000 */ nop -/* 11C808 802B31F8 3C11800E */ lui $s1, %hi(D_800DC4D4) # $s1, 0x800e +/* 11C804 802B31F4 00000000 */ nop +/* 11C808 802B31F8 3C11800E */ lui $s1, %hi(gControllerSeven) # $s1, 0x800e /* 11C80C 802B31FC 10000012 */ b .L802B3248 -/* 11C810 802B3200 8E31C4D4 */ lw $s1, %lo(D_800DC4D4)($s1) +/* 11C810 802B3200 8E31C4D4 */ lw $s1, %lo(gControllerSeven)($s1) .L802B3204: -/* 11C814 802B3204 8D6BC4DC */ lw $t3, %lo(D_800DC4DC)($t3) +/* 11C814 802B3204 8D6BC4DC */ lw $t3, %lo(gPlayerOne)($t3) /* 11C818 802B3208 020B6023 */ subu $t4, $s0, $t3 /* 11C81C 802B320C 0193001A */ div $zero, $t4, $s3 /* 11C820 802B3210 00006812 */ mflo $t5 /* 11C824 802B3214 16600002 */ bnez $s3, .L802B3220 -/* 11C828 802B3218 00000000 */ nop +/* 11C828 802B3218 00000000 */ nop /* 11C82C 802B321C 0007000D */ break 7 .L802B3220: /* 11C830 802B3220 2401FFFF */ li $at, -1 /* 11C834 802B3224 16610004 */ bne $s3, $at, .L802B3238 /* 11C838 802B3228 3C018000 */ lui $at, 0x8000 /* 11C83C 802B322C 15810002 */ bne $t4, $at, .L802B3238 -/* 11C840 802B3230 00000000 */ nop +/* 11C840 802B3230 00000000 */ nop /* 11C844 802B3234 0006000D */ break 6 .L802B3238: /* 11C848 802B3238 55A00004 */ bnel $t5, $zero, .L802B324C /* 11C84C 802B323C 304E4000 */ andi $t6, $v0, 0x4000 -/* 11C850 802B3240 3C11800E */ lui $s1, %hi(D_800DC4D8) # $s1, 0x800e -/* 11C854 802B3244 8E31C4D8 */ lw $s1, %lo(D_800DC4D8)($s1) +/* 11C850 802B3240 3C11800E */ lui $s1, %hi(gControllerEight) # $s1, 0x800e +/* 11C854 802B3244 8E31C4D8 */ lw $s1, %lo(gControllerEight)($s1) .L802B3248: /* 11C858 802B3248 304E4000 */ andi $t6, $v0, 0x4000 .L802B324C: diff --git a/asm/non_matchings/code_802B0210/func_802B3FD0.s b/asm/non_matchings/code_802B0210/func_802B3FD0.s index 388ae49c0..7c7891488 100644 --- a/asm/non_matchings/code_802B0210/func_802B3FD0.s +++ b/asm/non_matchings/code_802B0210/func_802B3FD0.s @@ -13,13 +13,13 @@ glabel func_802B3FD0 /* 11D60C 802B3FFC 3C01802C */ lui $at, %hi(D_802B9F68) # $at, 0x802c /* 11D610 802B4000 3C10800F */ lui $s0, %hi(gPlayers) # $s0, 0x800f /* 11D614 802B4004 3C158019 */ lui $s5, %hi(gPlayerBalloonCount) # $s5, 0x8019 -/* 11D618 802B4008 3C16800E */ lui $s6, %hi(D_800DC4DC) # $s6, 0x800e +/* 11D618 802B4008 3C16800E */ lui $s6, %hi(gPlayerOne) # $s6, 0x800e /* 11D61C 802B400C 00809025 */ move $s2, $a0 /* 11D620 802B4010 00A09825 */ move $s3, $a1 /* 11D624 802B4014 AFBF0044 */ sw $ra, 0x44($sp) /* 11D628 802B4018 241EFFFF */ li $fp, -1 /* 11D62C 802B401C C4349F68 */ lwc1 $f20, %lo(D_802B9F68)($at) -/* 11D630 802B4020 26D6C4DC */ addiu $s6, %lo(D_800DC4DC) # addiu $s6, $s6, -0x3b24 +/* 11D630 802B4020 26D6C4DC */ addiu $s6, %lo(gPlayerOne) # addiu $s6, $s6, -0x3b24 /* 11D634 802B4024 26B5D8C0 */ addiu $s5, %lo(gPlayerBalloonCount) # addiu $s5, $s5, -0x2740 /* 11D638 802B4028 26106990 */ addiu $s0, %lo(gPlayers) # addiu $s0, $s0, 0x6990 /* 11D63C 802B402C 00008825 */ move $s1, $zero diff --git a/asm/non_matchings/code_802B0210/update_obj_banana.s b/asm/non_matchings/code_802B0210/update_obj_banana.s index 8e5e81319..4d6497c88 100644 --- a/asm/non_matchings/code_802B0210/update_obj_banana.s +++ b/asm/non_matchings/code_802B0210/update_obj_banana.s @@ -22,7 +22,7 @@ glabel update_obj_banana /* 11B694 802B2084 00390821 */ addu $at, $at, $t9 /* 11B698 802B2088 8C399EC8 */ lw $t9, %lo(jpt_802B9EC8)($at) /* 11B69C 802B208C 03200008 */ jr $t9 -/* 11B6A0 802B2090 00000000 */ nop +/* 11B6A0 802B2090 00000000 */ nop glabel L802B2094 /* 11B6A4 802B2094 C4440014 */ lwc1 $f4, 0x14($v0) /* 11B6A8 802B2098 C6060018 */ lwc1 $f6, 0x18($s0) @@ -53,7 +53,7 @@ glabel L802B2094 /* 11B70C 802B20FC C7B00040 */ lwc1 $f16, 0x40($sp) /* 11B710 802B2100 3C01802C */ lui $at, %hi(D_802B9EE0) # $at, 0x802c /* 11B714 802B2104 460C5032 */ c.eq.s $f10, $f12 -/* 11B718 802B2108 00000000 */ nop +/* 11B718 802B2108 00000000 */ nop /* 11B71C 802B210C 4502000D */ bc1fl .L802B2144 /* 11B720 802B2110 460C1083 */ div.s $f2, $f2, $f12 /* 11B724 802B2114 C4209EE0 */ lwc1 $f0, %lo(D_802B9EE0)($at) @@ -105,12 +105,12 @@ glabel L802B2094 /* 11B7D4 802B21C4 512001CF */ beql $t1, $zero, .L802B2904 /* 11B7D8 802B21C8 8FBF0024 */ lw $ra, 0x24($sp) /* 11B7DC 802B21CC 954AC51C */ lhu $t2, %lo(D_800DC51C)($t2) -/* 11B7E0 802B21D0 3C03800E */ lui $v1, %hi(D_800DC4BC) # $v1, 0x800e +/* 11B7E0 802B21D0 3C03800E */ lui $v1, %hi(gControllerOne) # $v1, 0x800e /* 11B7E4 802B21D4 24180001 */ li $t8, 1 /* 11B7E8 802B21D8 11400003 */ beqz $t2, .L802B21E8 /* 11B7EC 802B21DC 241900B4 */ li $t9, 180 /* 11B7F0 802B21E0 10000006 */ b .L802B21FC -/* 11B7F4 802B21E4 8C63C4BC */ lw $v1, %lo(D_800DC4BC)($v1) +/* 11B7F4 802B21E4 8C63C4BC */ lw $v1, %lo(gControllerOne)($v1) .L802B21E8: /* 11B7F8 802B21E8 860B0010 */ lh $t3, 0x10($s0) /* 11B7FC 802B21EC 3C0D800F */ lui $t5, %hi(gControllers) # $t5, 0x800f @@ -128,11 +128,11 @@ glabel L802B2094 /* 11B828 802B2218 A6180006 */ sh $t8, 6($s0) /* 11B82C 802B221C A6190004 */ sh $t9, 4($s0) /* 11B830 802B2220 8C48000C */ lw $t0, 0xc($v0) -/* 11B834 802B2224 3C0A800E */ lui $t2, %hi(D_800DC4DC) # $t2, 0x800e +/* 11B834 802B2224 3C0A800E */ lui $t2, %hi(gPlayerOne) # $t2, 0x800e /* 11B838 802B2228 3C051900 */ lui $a1, (0x19008012 >> 16) # lui $a1, 0x1900 /* 11B83C 802B222C 01014824 */ and $t1, $t0, $at /* 11B840 802B2230 AC49000C */ sw $t1, 0xc($v0) -/* 11B844 802B2234 8D4AC4DC */ lw $t2, %lo(D_800DC4DC)($t2) +/* 11B844 802B2234 8D4AC4DC */ lw $t2, %lo(gPlayerOne)($t2) /* 11B848 802B2238 24010DD8 */ li $at, 3544 /* 11B84C 802B223C AFA30080 */ sw $v1, 0x80($sp) /* 11B850 802B2240 004A2023 */ subu $a0, $v0, $t2 @@ -148,10 +148,10 @@ glabel L802B2094 /* 11B878 802B2268 846D0002 */ lh $t5, 2($v1) /* 11B87C 802B226C 8FA20088 */ lw $v0, 0x88($sp) /* 11B880 802B2270 448D4000 */ mtc1 $t5, $f8 -/* 11B884 802B2274 00000000 */ nop +/* 11B884 802B2274 00000000 */ nop /* 11B888 802B2278 46804020 */ cvt.s.w $f0, $f8 /* 11B88C 802B227C 4600503C */ c.lt.s $f10, $f0 -/* 11B890 802B2280 00000000 */ nop +/* 11B890 802B2280 00000000 */ nop /* 11B894 802B2284 45020037 */ bc1fl .L802B2364 /* 11B898 802B2288 44801000 */ mtc1 $zero, $f2 /* 11B89C 802B228C 84640000 */ lh $a0, ($v1) @@ -173,7 +173,7 @@ glabel L802B2094 /* 11B8DC 802B22CC C4420094 */ lwc1 $f2, 0x94($v0) /* 11B8E0 802B22D0 3C013F40 */ li $at, 0x3F400000 # 0.750000 /* 11B8E4 802B22D4 4604103C */ c.lt.s $f2, $f4 -/* 11B8E8 802B22D8 00000000 */ nop +/* 11B8E8 802B22D8 00000000 */ nop /* 11B8EC 802B22DC 45000005 */ bc1f .L802B22F4 /* 11B8F0 802B22E0 460A4000 */ add.s $f0, $f8, $f10 /* 11B8F4 802B22E4 3C014080 */ li $at, 0x40800000 # 4.000000 @@ -259,48 +259,48 @@ glabel L802B237C /* 11BA14 802B2404 E60A001C */ swc1 $f10, 0x1c($s0) /* 11BA18 802B2408 858CF6F2 */ lh $t4, %lo(D_8015F6F2)($t4) /* 11BA1C 802B240C 448C2000 */ mtc1 $t4, $f4 -/* 11BA20 802B2410 00000000 */ nop +/* 11BA20 802B2410 00000000 */ nop /* 11BA24 802B2414 468021A0 */ cvt.s.w $f6, $f4 /* 11BA28 802B2418 4606603C */ c.lt.s $f12, $f6 -/* 11BA2C 802B241C 00000000 */ nop +/* 11BA2C 802B241C 00000000 */ nop /* 11BA30 802B2420 45010027 */ bc1t .L802B24C0 -/* 11BA34 802B2424 00000000 */ nop +/* 11BA34 802B2424 00000000 */ nop /* 11BA38 802B2428 85ADF6F0 */ lh $t5, %lo(D_8015F6F0)($t5) /* 11BA3C 802B242C 3C0E8016 */ lui $t6, %hi(D_8015F6EA) # $t6, 0x8016 /* 11BA40 802B2430 448D4000 */ mtc1 $t5, $f8 -/* 11BA44 802B2434 00000000 */ nop +/* 11BA44 802B2434 00000000 */ nop /* 11BA48 802B2438 468042A0 */ cvt.s.w $f10, $f8 /* 11BA4C 802B243C 460C503C */ c.lt.s $f10, $f12 -/* 11BA50 802B2440 00000000 */ nop +/* 11BA50 802B2440 00000000 */ nop /* 11BA54 802B2444 4501001E */ bc1t .L802B24C0 -/* 11BA58 802B2448 00000000 */ nop +/* 11BA58 802B2448 00000000 */ nop /* 11BA5C 802B244C 85CEF6EA */ lh $t6, %lo(D_8015F6EA)($t6) /* 11BA60 802B2450 C6000018 */ lwc1 $f0, 0x18($s0) /* 11BA64 802B2454 3C0F8016 */ lui $t7, %hi(D_8015F6E8) # $t7, 0x8016 /* 11BA68 802B2458 448E2000 */ mtc1 $t6, $f4 -/* 11BA6C 802B245C 00000000 */ nop +/* 11BA6C 802B245C 00000000 */ nop /* 11BA70 802B2460 468021A0 */ cvt.s.w $f6, $f4 /* 11BA74 802B2464 4606003C */ c.lt.s $f0, $f6 -/* 11BA78 802B2468 00000000 */ nop +/* 11BA78 802B2468 00000000 */ nop /* 11BA7C 802B246C 45010014 */ bc1t .L802B24C0 -/* 11BA80 802B2470 00000000 */ nop +/* 11BA80 802B2470 00000000 */ nop /* 11BA84 802B2474 85EFF6E8 */ lh $t7, %lo(D_8015F6E8)($t7) /* 11BA88 802B2478 3C188016 */ lui $t8, %hi(D_8015F6EE) # $t8, 0x8016 /* 11BA8C 802B247C 448F4000 */ mtc1 $t7, $f8 -/* 11BA90 802B2480 00000000 */ nop +/* 11BA90 802B2480 00000000 */ nop /* 11BA94 802B2484 468042A0 */ cvt.s.w $f10, $f8 /* 11BA98 802B2488 4600503C */ c.lt.s $f10, $f0 -/* 11BA9C 802B248C 00000000 */ nop +/* 11BA9C 802B248C 00000000 */ nop /* 11BAA0 802B2490 4501000B */ bc1t .L802B24C0 -/* 11BAA4 802B2494 00000000 */ nop +/* 11BAA4 802B2494 00000000 */ nop /* 11BAA8 802B2498 8718F6EE */ lh $t8, %lo(D_8015F6EE)($t8) /* 11BAAC 802B249C C602001C */ lwc1 $f2, 0x1c($s0) /* 11BAB0 802B24A0 3C013F80 */ li $at, 0x3F800000 # 1.000000 /* 11BAB4 802B24A4 44982000 */ mtc1 $t8, $f4 -/* 11BAB8 802B24A8 00000000 */ nop +/* 11BAB8 802B24A8 00000000 */ nop /* 11BABC 802B24AC 468021A0 */ cvt.s.w $f6, $f4 /* 11BAC0 802B24B0 4606103C */ c.lt.s $f2, $f6 -/* 11BAC4 802B24B4 00000000 */ nop +/* 11BAC4 802B24B4 00000000 */ nop /* 11BAC8 802B24B8 45020006 */ bc1fl .L802B24D4 /* 11BACC 802B24BC C608000C */ lwc1 $f8, 0xc($s0) .L802B24C0: @@ -318,16 +318,16 @@ glabel L802B237C /* 11BAF8 802B24E8 26040030 */ addiu $a0, $s0, 0x30 /* 11BAFC 802B24EC 44052000 */ mfc1 $a1, $f4 /* 11BB00 802B24F0 0C0AB772 */ jal func_802ADDC8 -/* 11BB04 802B24F4 00000000 */ nop +/* 11BB04 802B24F4 00000000 */ nop /* 11BB08 802B24F8 24190001 */ li $t9, 1 /* 11BB0C 802B24FC 3328FFFF */ andi $t0, $t9, 0xffff /* 11BB10 802B2500 110000FF */ beqz $t0, .L802B2900 /* 11BB14 802B2504 A6190034 */ sh $t9, 0x34($s0) /* 11BB18 802B2508 C6060044 */ lwc1 $f6, 0x44($s0) /* 11BB1C 802B250C 44804000 */ mtc1 $zero, $f8 -/* 11BB20 802B2510 00000000 */ nop +/* 11BB20 802B2510 00000000 */ nop /* 11BB24 802B2514 4608303C */ c.lt.s $f6, $f8 -/* 11BB28 802B2518 00000000 */ nop +/* 11BB28 802B2518 00000000 */ nop /* 11BB2C 802B251C 450200F9 */ bc1fl .L802B2904 /* 11BB30 802B2520 8FBF0024 */ lw $ra, 0x24($sp) /* 11BB34 802B2524 C60A0060 */ lwc1 $f10, 0x60($s0) @@ -453,7 +453,7 @@ glabel L802B25A0 /* 11BD08 802B26F8 E7A60010 */ swc1 $f6, 0x10($sp) /* 11BD0C 802B26FC 44055000 */ mfc1 $a1, $f10 /* 11BD10 802B2700 0C0AB772 */ jal func_802ADDC8 -/* 11BD14 802B2704 00000000 */ nop +/* 11BD14 802B2704 00000000 */ nop /* 11BD18 802B2708 0C0AD38C */ jal func_802B4E30 /* 11BD1C 802B270C 02002025 */ move $a0, $s0 /* 11BD20 802B2710 1000007C */ b .L802B2904 @@ -495,7 +495,7 @@ glabel L802B2718 /* 11BDAC 802B279C C7B00040 */ lwc1 $f16, 0x40($sp) /* 11BDB0 802B27A0 3C01802C */ lui $at, %hi(D_802B9EEC) # $at, 0x802c /* 11BDB4 802B27A4 460C3032 */ c.eq.s $f6, $f12 -/* 11BDB8 802B27A8 00000000 */ nop +/* 11BDB8 802B27A8 00000000 */ nop /* 11BDBC 802B27AC 4502000D */ bc1fl .L802B27E4 /* 11BDC0 802B27B0 460C1083 */ div.s $f2, $f2, $f12 /* 11BDC4 802B27B4 C4209EEC */ lwc1 $f0, %lo(D_802B9EEC)($at) @@ -537,7 +537,7 @@ glabel L802B2718 /* 11BE4C 802B283C E7A80010 */ swc1 $f8, 0x10($sp) /* 11BE50 802B2840 44052000 */ mfc1 $a1, $f4 /* 11BE54 802B2844 0C0AB772 */ jal func_802ADDC8 -/* 11BE58 802B2848 00000000 */ nop +/* 11BE58 802B2848 00000000 */ nop /* 11BE5C 802B284C 0C0AD38C */ jal func_802B4E30 /* 11BE60 802B2850 02002025 */ move $a0, $s0 /* 11BE64 802B2854 1000002B */ b .L802B2904 @@ -552,7 +552,7 @@ glabel L802B285C /* 11BE84 802B2874 E6040028 */ swc1 $f4, 0x28($s0) /* 11BE88 802B2878 C6000028 */ lwc1 $f0, 0x28($s0) /* 11BE8C 802B287C 4602003C */ c.lt.s $f0, $f2 -/* 11BE90 802B2880 00000000 */ nop +/* 11BE90 802B2880 00000000 */ nop /* 11BE94 802B2884 45020004 */ bc1fl .L802B2898 /* 11BE98 802B2888 860F0004 */ lh $t7, 4($s0) /* 11BE9C 802B288C E6020028 */ swc1 $f2, 0x28($s0) @@ -592,4 +592,4 @@ glabel L802B28E8 /* 11BF14 802B2904 8FB00020 */ lw $s0, 0x20($sp) /* 11BF18 802B2908 27BD0090 */ addiu $sp, $sp, 0x90 /* 11BF1C 802B290C 03E00008 */ jr $ra -/* 11BF20 802B2910 00000000 */ nop +/* 11BF20 802B2910 00000000 */ nop diff --git a/asm/non_matchings/code_802B0210/update_obj_banana_bunch.s b/asm/non_matchings/code_802B0210/update_obj_banana_bunch.s index 125840736..424bfb45f 100644 --- a/asm/non_matchings/code_802B0210/update_obj_banana_bunch.s +++ b/asm/non_matchings/code_802B0210/update_obj_banana_bunch.s @@ -22,7 +22,7 @@ glabel update_obj_banana_bunch /* 11A088 802B0A78 00390821 */ addu $at, $at, $t9 /* 11A08C 802B0A7C 8C399E98 */ lw $t9, %lo(jpt_802B9E98)($at) /* 11A090 802B0A80 03200008 */ jr $t9 -/* 11A094 802B0A84 00000000 */ nop +/* 11A094 802B0A84 00000000 */ nop glabel L802B0A88 /* 11A098 802B0A88 02002025 */ move $a0, $s0 /* 11A09C 802B0A8C 00E02825 */ move $a1, $a3 @@ -224,13 +224,13 @@ glabel L802B0C70 /* 11A37C 802B0D6C 000C6900 */ sll $t5, $t4, 4 /* 11A380 802B0D70 01AE1021 */ addu $v0, $t5, $t6 /* 11A384 802B0D74 94430006 */ lhu $v1, 6($v0) -/* 11A388 802B0D78 3C19800E */ lui $t9, %hi(D_800DC4DC) # $t9, 0x800e +/* 11A388 802B0D78 3C19800E */ lui $t9, %hi(gPlayerOne) # $t9, 0x800e /* 11A38C 802B0D7C 24010DD8 */ li $at, 3544 /* 11A390 802B0D80 306F2000 */ andi $t7, $v1, 0x2000 /* 11A394 802B0D84 11E0001E */ beqz $t7, .L802B0E00 /* 11A398 802B0D88 3078DFFF */ andi $t8, $v1, 0xdfff /* 11A39C 802B0D8C A4580006 */ sh $t8, 6($v0) -/* 11A3A0 802B0D90 8F39C4DC */ lw $t9, %lo(D_800DC4DC)($t9) +/* 11A3A0 802B0D90 8F39C4DC */ lw $t9, %lo(gPlayerOne)($t9) /* 11A3A4 802B0D94 3C051900 */ lui $a1, (0x19008012 >> 16) # lui $a1, 0x1900 /* 11A3A8 802B0D98 34A58012 */ ori $a1, (0x19008012 & 0xFFFF) # ori $a1, $a1, 0x8012 /* 11A3AC 802B0D9C 00F92023 */ subu $a0, $a3, $t9 @@ -245,7 +245,7 @@ glabel L802B0C70 /* 11A3D0 802B0DC0 84440002 */ lh $a0, 2($v0) /* 11A3D4 802B0DC4 2881001F */ slti $at, $a0, 0x1f /* 11A3D8 802B0DC8 1420000B */ bnez $at, .L802B0DF8 -/* 11A3DC 802B0DCC 00000000 */ nop +/* 11A3DC 802B0DCC 00000000 */ nop /* 11A3E0 802B0DD0 84430000 */ lh $v1, ($v0) /* 11A3E4 802B0DD4 28610028 */ slti $at, $v1, 0x28 /* 11A3E8 802B0DD8 10200007 */ beqz $at, .L802B0DF8 @@ -265,4 +265,4 @@ glabel L802B0C70 /* 11A414 802B0E04 8FB00018 */ lw $s0, 0x18($sp) /* 11A418 802B0E08 27BD0038 */ addiu $sp, $sp, 0x38 /* 11A41C 802B0E0C 03E00008 */ jr $ra -/* 11A420 802B0E10 00000000 */ nop +/* 11A420 802B0E10 00000000 */ nop diff --git a/asm/non_matchings/code_802B0210/update_obj_red_blue_shell.s b/asm/non_matchings/code_802B0210/update_obj_red_blue_shell.s index 5ff13b4aa..53ddb66b1 100644 --- a/asm/non_matchings/code_802B0210/update_obj_red_blue_shell.s +++ b/asm/non_matchings/code_802B0210/update_obj_red_blue_shell.s @@ -16,40 +16,40 @@ glabel update_obj_red_blue_shell /* 11D860 802B4250 3C188016 */ lui $t8, %hi(D_8015F6F0) # $t8, 0x8016 /* 11D864 802B4254 A7AE0056 */ sh $t6, 0x56($sp) /* 11D868 802B4258 45010024 */ bc1t .L802B42EC -/* 11D86C 802B425C 00000000 */ nop +/* 11D86C 802B425C 00000000 */ nop /* 11D870 802B4260 8718F6F0 */ lh $t8, %lo(D_8015F6F0)($t8) /* 11D874 802B4264 3C198016 */ lui $t9, %hi(D_8015F6EA) # $t9, 0x8016 /* 11D878 802B4268 44984000 */ mtc1 $t8, $f8 -/* 11D87C 802B426C 00000000 */ nop +/* 11D87C 802B426C 00000000 */ nop /* 11D880 802B4270 468042A0 */ cvt.s.w $f10, $f8 /* 11D884 802B4274 4602503C */ c.lt.s $f10, $f2 -/* 11D888 802B4278 00000000 */ nop +/* 11D888 802B4278 00000000 */ nop /* 11D88C 802B427C 4501001B */ bc1t .L802B42EC -/* 11D890 802B4280 00000000 */ nop +/* 11D890 802B4280 00000000 */ nop /* 11D894 802B4284 8739F6EA */ lh $t9, %lo(D_8015F6EA)($t9) /* 11D898 802B4288 3C088016 */ lui $t0, %hi(D_8015F6E8) # $t0, 0x8016 /* 11D89C 802B428C 44998000 */ mtc1 $t9, $f16 -/* 11D8A0 802B4290 00000000 */ nop +/* 11D8A0 802B4290 00000000 */ nop /* 11D8A4 802B4294 468084A0 */ cvt.s.w $f18, $f16 /* 11D8A8 802B4298 4612003C */ c.lt.s $f0, $f18 -/* 11D8AC 802B429C 00000000 */ nop +/* 11D8AC 802B429C 00000000 */ nop /* 11D8B0 802B42A0 45010012 */ bc1t .L802B42EC -/* 11D8B4 802B42A4 00000000 */ nop +/* 11D8B4 802B42A4 00000000 */ nop /* 11D8B8 802B42A8 8508F6E8 */ lh $t0, %lo(D_8015F6E8)($t0) /* 11D8BC 802B42AC 3C098016 */ lui $t1, %hi(D_8015F6EE) # $t1, 0x8016 /* 11D8C0 802B42B0 44882000 */ mtc1 $t0, $f4 -/* 11D8C4 802B42B4 00000000 */ nop +/* 11D8C4 802B42B4 00000000 */ nop /* 11D8C8 802B42B8 468021A0 */ cvt.s.w $f6, $f4 /* 11D8CC 802B42BC 4600303C */ c.lt.s $f6, $f0 -/* 11D8D0 802B42C0 00000000 */ nop +/* 11D8D0 802B42C0 00000000 */ nop /* 11D8D4 802B42C4 45010009 */ bc1t .L802B42EC -/* 11D8D8 802B42C8 00000000 */ nop +/* 11D8D8 802B42C8 00000000 */ nop /* 11D8DC 802B42CC 8529F6EE */ lh $t1, %lo(D_8015F6EE)($t1) /* 11D8E0 802B42D0 44894000 */ mtc1 $t1, $f8 -/* 11D8E4 802B42D4 00000000 */ nop +/* 11D8E4 802B42D4 00000000 */ nop /* 11D8E8 802B42D8 468042A0 */ cvt.s.w $f10, $f8 /* 11D8EC 802B42DC 460A603C */ c.lt.s $f12, $f10 -/* 11D8F0 802B42E0 00000000 */ nop +/* 11D8F0 802B42E0 00000000 */ nop /* 11D8F4 802B42E4 45020004 */ bc1fl .L802B42F8 /* 11D8F8 802B42E8 860A0010 */ lh $t2, 0x10($s0) .L802B42EC: @@ -67,7 +67,7 @@ glabel update_obj_red_blue_shell /* 11D924 802B4314 002C0821 */ addu $at, $at, $t4 /* 11D928 802B4318 8C2C9F6C */ lw $t4, %lo(jpt_802B9F6C)($at) /* 11D92C 802B431C 01800008 */ jr $t4 -/* 11D930 802B4320 00000000 */ nop +/* 11D930 802B4320 00000000 */ nop glabel L802B4324 /* 11D934 802B4324 860D0014 */ lh $t5, 0x14($s0) /* 11D938 802B4328 3C0F800F */ lui $t7, %hi(gPlayers) # $t7, 0x800f @@ -120,15 +120,15 @@ glabel L802B4324 /* 11D9F4 802B43E4 46007081 */ sub.s $f2, $f14, $f0 /* 11D9F8 802B43E8 3C01C0A0 */ li $at, 0xC0A00000 # -5.000000 /* 11D9FC 802B43EC 3C08800E */ lui $t0, %hi(D_800DC51C) # $t0, 0x800e -/* 11DA00 802B43F0 3C02800E */ lui $v0, %hi(D_800DC4BC) # 0x800e +/* 11DA00 802B43F0 3C02800E */ lui $v0, %hi(gControllerOne) # 0x800e /* 11DA04 802B43F4 4606103C */ c.lt.s $f2, $f6 /* 11DA08 802B43F8 240E0001 */ li $t6, 1 /* 11DA0C 802B43FC 4502000C */ bc1fl .L802B4430 /* 11DA10 802B4400 E60E001C */ swc1 $f14, 0x1c($s0) /* 11DA14 802B4404 44816000 */ mtc1 $at, $f12 -/* 11DA18 802B4408 00000000 */ nop +/* 11DA18 802B4408 00000000 */ nop /* 11DA1C 802B440C 4602603C */ c.lt.s $f12, $f2 -/* 11DA20 802B4410 00000000 */ nop +/* 11DA20 802B4410 00000000 */ nop /* 11DA24 802B4414 45020006 */ bc1fl .L802B4430 /* 11DA28 802B4418 E60E001C */ swc1 $f14, 0x1c($s0) /* 11DA2C 802B441C C608000C */ lwc1 $f8, 0xc($s0) @@ -140,13 +140,13 @@ glabel L802B4324 /* 11DA40 802B4430 96380000 */ lhu $t8, ($s1) /* 11DA44 802B4434 33194000 */ andi $t9, $t8, 0x4000 /* 11DA48 802B4438 1320000D */ beqz $t9, .L802B4470 -/* 11DA4C 802B443C 00000000 */ nop +/* 11DA4C 802B443C 00000000 */ nop /* 11DA50 802B4440 9508C51C */ lhu $t0, %lo(D_800DC51C)($t0) -/* 11DA54 802B4444 3C02800E */ lui $v0, %hi(D_800DC4BC) # $v0, 0x800e +/* 11DA54 802B4444 3C02800E */ lui $v0, %hi(gControllerOne) # $v0, 0x800e /* 11DA58 802B4448 51000004 */ beql $t0, $zero, .L802B445C /* 11DA5C 802B444C 86090014 */ lh $t1, 0x14($s0) /* 11DA60 802B4450 10000008 */ b .L802B4474 -/* 11DA64 802B4454 8C42C4BC */ lw $v0, %lo(D_800DC4BC)($v0) +/* 11DA64 802B4454 8C42C4BC */ lw $v0, %lo(gControllerOne)($v0) /* 11DA68 802B4458 86090014 */ lh $t1, 0x14($s0) .L802B445C: /* 11DA6C 802B445C 3C0B800F */ lui $t3, %hi(gControllers) # $t3, 0x800f @@ -155,7 +155,7 @@ glabel L802B4324 /* 11DA78 802B4468 10000002 */ b .L802B4474 /* 11DA7C 802B446C 014B1021 */ addu $v0, $t2, $t3 .L802B4470: -/* 11DA80 802B4470 8C42C4BC */ lw $v0, %lo(D_800DC4BC)($v0) # -0x3b44($v0) +/* 11DA80 802B4470 8C42C4BC */ lw $v0, %lo(gControllerOne)($v0) # -0x3b44($v0) .L802B4474: /* 11DA84 802B4474 94430008 */ lhu $v1, 8($v0) /* 11DA88 802B4478 306C2000 */ andi $t4, $v1, 0x2000 @@ -167,7 +167,7 @@ glabel L802B4324 /* 11DAA0 802B4490 241878E3 */ li $t8, 30947 /* 11DAA4 802B4494 2419871C */ li $t9, -30948 /* 11DAA8 802B4498 19E00003 */ blez $t7, .L802B44A8 -/* 11DAAC 802B449C 00000000 */ nop +/* 11DAAC 802B449C 00000000 */ nop /* 11DAB0 802B44A0 1000025E */ b .L802B4E1C /* 11DAB4 802B44A4 A6180012 */ sh $t8, 0x12($s0) .L802B44A8: @@ -216,7 +216,7 @@ glabel L802B44B0 /* 11DB5C 802B454C 0081001A */ div $zero, $a0, $at /* 11DB60 802B4550 00002012 */ mflo $a0 /* 11DB64 802B4554 0C003B60 */ jal func_8000ED80 -/* 11DB68 802B4558 00000000 */ nop +/* 11DB68 802B4558 00000000 */ nop /* 11DB6C 802B455C 1000003A */ b .L802B4648 /* 11DB70 802B4560 86090006 */ lh $t1, 6($s0) .L802B4564: @@ -225,7 +225,7 @@ glabel L802B44B0 /* 11DB7C 802B456C 0081001A */ div $zero, $a0, $at /* 11DB80 802B4570 00002012 */ mflo $a0 /* 11DB84 802B4574 0C003B84 */ jal func_8000EE10 -/* 11DB88 802B4578 00000000 */ nop +/* 11DB88 802B4578 00000000 */ nop /* 11DB8C 802B457C 3C065101 */ lui $a2, (0x51018008 >> 16) # lui $a2, 0x5101 /* 11DB90 802B4580 34C68008 */ ori $a2, (0x51018008 & 0xFFFF) # ori $a2, $a2, 0x8008 /* 11DB94 802B4584 26040018 */ addiu $a0, $s0, 0x18 @@ -263,7 +263,7 @@ glabel L802B44B0 /* 11DC10 802B4600 0081001A */ div $zero, $a0, $at /* 11DC14 802B4604 00002012 */ mflo $a0 /* 11DC18 802B4608 0C003B60 */ jal func_8000ED80 -/* 11DC1C 802B460C 00000000 */ nop +/* 11DC1C 802B460C 00000000 */ nop /* 11DC20 802B4610 1000000D */ b .L802B4648 /* 11DC24 802B4614 86090006 */ lh $t1, 6($s0) .L802B4618: @@ -272,7 +272,7 @@ glabel L802B44B0 /* 11DC30 802B4620 0081001A */ div $zero, $a0, $at /* 11DC34 802B4624 00002012 */ mflo $a0 /* 11DC38 802B4628 0C003B84 */ jal func_8000EE10 -/* 11DC3C 802B462C 00000000 */ nop +/* 11DC3C 802B462C 00000000 */ nop /* 11DC40 802B4630 3C065101 */ lui $a2, (0x51018008 >> 16) # lui $a2, 0x5101 /* 11DC44 802B4634 34C68008 */ ori $a2, (0x51018008 & 0xFFFF) # ori $a2, $a2, 0x8008 /* 11DC48 802B4638 26040018 */ addiu $a0, $s0, 0x18 @@ -290,12 +290,12 @@ glabel L802B44B0 /* 11DC70 802B4660 C6220094 */ lwc1 $f2, 0x94($s1) /* 11DC74 802B4664 3C01802C */ lui $at, %hi(D_802B9F94) # $at, 0x802c /* 11DC78 802B4668 4602003C */ c.lt.s $f0, $f2 -/* 11DC7C 802B466C 00000000 */ nop +/* 11DC7C 802B466C 00000000 */ nop /* 11DC80 802B4670 45020005 */ bc1fl .L802B4688 /* 11DC84 802B4674 44801000 */ mtc1 $zero, $f2 /* 11DC88 802B4678 C4309F94 */ lwc1 $f16, %lo(D_802B9F94)($at) /* 11DC8C 802B467C 46101002 */ mul.s $f0, $f2, $f16 -/* 11DC90 802B4680 00000000 */ nop +/* 11DC90 802B4680 00000000 */ nop /* 11DC94 802B4684 44801000 */ mtc1 $zero, $f2 .L802B4688: /* 11DC98 802B4688 E7A00094 */ swc1 $f0, 0x94($sp) @@ -320,7 +320,7 @@ glabel L802B44B0 /* 11DCE0 802B46D0 96040012 */ lhu $a0, 0x12($s0) /* 11DCE4 802B46D4 3C014100 */ li $at, 0x41000000 # 8.000000 /* 11DCE8 802B46D8 44814000 */ mtc1 $at, $f8 -/* 11DCEC 802B46DC 00000000 */ nop +/* 11DCEC 802B46DC 00000000 */ nop /* 11DCF0 802B46E0 46080282 */ mul.s $f10, $f0, $f8 /* 11DCF4 802B46E4 E7AA008C */ swc1 $f10, 0x8c($sp) /* 11DCF8 802B46E8 C6320070 */ lwc1 $f18, 0x70($s1) @@ -379,10 +379,10 @@ glabel L802B4750 /* 11DDC8 802B47B8 44812000 */ mtc1 $at, $f4 /* 11DDCC 802B47BC 240F0008 */ li $t7, 8 /* 11DDD0 802B47C0 A60F0006 */ sh $t7, 6($s0) -/* 11DDD4 802B47C4 3C18800E */ lui $t8, %hi(D_800DC4DC) # $t8, 0x800e +/* 11DDD4 802B47C4 3C18800E */ lui $t8, %hi(gPlayerOne) # $t8, 0x800e /* 11DDD8 802B47C8 A60E0004 */ sh $t6, 4($s0) /* 11DDDC 802B47CC E6040008 */ swc1 $f4, 8($s0) -/* 11DDE0 802B47D0 8F18C4DC */ lw $t8, %lo(D_800DC4DC)($t8) +/* 11DDE0 802B47D0 8F18C4DC */ lw $t8, %lo(gPlayerOne)($t8) /* 11DDE4 802B47D4 24010DD8 */ li $at, 3544 /* 11DDE8 802B47D8 3C028016 */ lui $v0, %hi(D_80164438) # 0x8016 /* 11DDEC 802B47DC 0238C823 */ subu $t9, $s1, $t8 @@ -442,8 +442,8 @@ glabel L802B4750 /* 11DEB4 802B48A4 28410005 */ slti $at, $v0, 5 /* 11DEB8 802B48A8 A6090006 */ sh $t1, 6($s0) /* 11DEBC 802B48AC A60A0004 */ sh $t2, 4($s0) -/* 11DEC0 802B48B0 3C0B800E */ lui $t3, %hi(D_800DC4DC) # $t3, 0x800e -/* 11DEC4 802B48B4 8D6BC4DC */ lw $t3, %lo(D_800DC4DC)($t3) +/* 11DEC0 802B48B0 3C0B800E */ lui $t3, %hi(gPlayerOne) # $t3, 0x800e +/* 11DEC4 802B48B4 8D6BC4DC */ lw $t3, %lo(gPlayerOne)($t3) /* 11DEC8 802B48B8 24010DD8 */ li $at, 3544 /* 11DECC 802B48BC 3C028016 */ lui $v0, %hi(D_80164438) # 0x8016 /* 11DED0 802B48C0 022B6023 */ subu $t4, $s1, $t3 @@ -472,9 +472,9 @@ glabel L802B4750 /* 11DF24 802B4914 3C01447A */ li $at, 0x447A0000 # 1000.000000 /* 11DF28 802B4918 44815000 */ mtc1 $at, $f10 /* 11DF2C 802B491C A6090006 */ sh $t1, 6($s0) -/* 11DF30 802B4920 3C0A800E */ lui $t2, %hi(D_800DC4DC) # $t2, 0x800e +/* 11DF30 802B4920 3C0A800E */ lui $t2, %hi(gPlayerOne) # $t2, 0x800e /* 11DF34 802B4924 E60A0008 */ swc1 $f10, 8($s0) -/* 11DF38 802B4928 8D4AC4DC */ lw $t2, %lo(D_800DC4DC)($t2) +/* 11DF38 802B4928 8D4AC4DC */ lw $t2, %lo(gPlayerOne)($t2) /* 11DF3C 802B492C 24010DD8 */ li $at, 3544 /* 11DF40 802B4930 3C028016 */ lui $v0, %hi(D_80164438) # 0x8016 /* 11DF44 802B4934 022A5823 */ subu $t3, $s1, $t2 @@ -529,7 +529,7 @@ glabel L802B4750 /* 11DFFC 802B49EC E60A0028 */ swc1 $f10, 0x28($s0) /* 11E000 802B49F0 C6100028 */ lwc1 $f16, 0x28($s0) /* 11E004 802B49F4 4600803C */ c.lt.s $f16, $f0 -/* 11E008 802B49F8 00000000 */ nop +/* 11E008 802B49F8 00000000 */ nop /* 11E00C 802B49FC 45020003 */ bc1fl .L802B4A0C /* 11E010 802B4A00 C6120018 */ lwc1 $f18, 0x18($s0) /* 11E014 802B4A04 E6000028 */ swc1 $f0, 0x28($s0) @@ -597,7 +597,7 @@ glabel L802B4AD8 /* 11E100 802B4AF0 244BFFFF */ addiu $t3, $v0, -1 /* 11E104 802B4AF4 312A000F */ andi $t2, $t1, 0xf /* 11E108 802B4AF8 15400005 */ bnez $t2, .L802B4B10 -/* 11E10C 802B4AFC 00000000 */ nop +/* 11E10C 802B4AFC 00000000 */ nop /* 11E110 802B4B00 0C0A7F72 */ jal func_8029FDC8 /* 11E114 802B4B04 02002025 */ move $a0, $s0 /* 11E118 802B4B08 100000C5 */ b .L802B4E20 @@ -632,7 +632,7 @@ glabel L802B4B18 /* 11E184 802B4B74 46021102 */ mul.s $f4, $f2, $f2 /* 11E188 802B4B78 46049180 */ add.s $f6, $f18, $f4 /* 11E18C 802B4B7C 4608303C */ c.lt.s $f6, $f8 -/* 11E190 802B4B80 00000000 */ nop +/* 11E190 802B4B80 00000000 */ nop /* 11E194 802B4B84 450200A6 */ bc1fl .L802B4E20 /* 11E198 802B4B88 8FBF002C */ lw $ra, 0x2c($sp) /* 11E19C 802B4B8C 100000A3 */ b .L802B4E1C @@ -672,7 +672,7 @@ glabel L802B4B94 /* 11E21C 802B4C0C 31C4FFFF */ andi $a0, $t6, 0xffff /* 11E220 802B4C10 3C014100 */ li $at, 0x41000000 # 8.000000 /* 11E224 802B4C14 44815000 */ mtc1 $at, $f10 -/* 11E228 802B4C18 00000000 */ nop +/* 11E228 802B4C18 00000000 */ nop /* 11E22C 802B4C1C 460A0402 */ mul.s $f16, $f0, $f10 /* 11E230 802B4C20 E7B0008C */ swc1 $f16, 0x8c($sp) /* 11E234 802B4C24 C6240070 */ lwc1 $f4, 0x70($s1) @@ -733,7 +733,7 @@ glabel L802B4CE4 /* 11E30C 802B4CFC E6100028 */ swc1 $f16, 0x28($s0) /* 11E310 802B4D00 C6000028 */ lwc1 $f0, 0x28($s0) /* 11E314 802B4D04 460C003C */ c.lt.s $f0, $f12 -/* 11E318 802B4D08 00000000 */ nop +/* 11E318 802B4D08 00000000 */ nop /* 11E31C 802B4D0C 45020004 */ bc1fl .L802B4D20 /* 11E320 802B4D10 86190004 */ lh $t9, 4($s0) /* 11E324 802B4D14 E60C0028 */ swc1 $f12, 0x28($s0) @@ -782,13 +782,13 @@ glabel L802B4D58 /* 11E3C8 802B4DB8 240E0009 */ li $t6, 9 /* 11E3CC 802B4DBC 46081081 */ sub.s $f2, $f2, $f8 /* 11E3D0 802B4DC0 46000282 */ mul.s $f10, $f0, $f0 -/* 11E3D4 802B4DC4 00000000 */ nop +/* 11E3D4 802B4DC4 00000000 */ nop /* 11E3D8 802B4DC8 46021402 */ mul.s $f16, $f2, $f2 /* 11E3DC 802B4DCC 46105480 */ add.s $f18, $f10, $f16 /* 11E3E0 802B4DD0 4604903C */ c.lt.s $f18, $f4 -/* 11E3E4 802B4DD4 00000000 */ nop +/* 11E3E4 802B4DD4 00000000 */ nop /* 11E3E8 802B4DD8 45000010 */ bc1f .L802B4E1C -/* 11E3EC 802B4DDC 00000000 */ nop +/* 11E3EC 802B4DDC 00000000 */ nop /* 11E3F0 802B4DE0 1000000E */ b .L802B4E1C /* 11E3F4 802B4DE4 A60E0006 */ sh $t6, 6($s0) glabel L802B4DE8 diff --git a/asm/non_matchings/code_actors/func_80298AC0.s b/asm/non_matchings/code_actors/func_80298AC0.s index 0541c2583..fe119e820 100644 --- a/asm/non_matchings/code_actors/func_80298AC0.s +++ b/asm/non_matchings/code_actors/func_80298AC0.s @@ -49,13 +49,13 @@ glabel func_80298AC0 /* 102188 80298B78 E7AA0064 */ swc1 $f10, 0x64($sp) /* 10218C 80298B7C 86080002 */ lh $t0, 2($s0) /* 102190 80298B80 44888000 */ mtc1 $t0, $f16 -/* 102194 80298B84 00000000 */ nop +/* 102194 80298B84 00000000 */ nop /* 102198 80298B88 468084A0 */ cvt.s.w $f18, $f16 /* 10219C 80298B8C E7B20068 */ swc1 $f18, 0x68($sp) /* 1021A0 80298B90 86090004 */ lh $t1, 4($s0) /* 1021A4 80298B94 E7B80010 */ swc1 $f24, 0x10($sp) /* 1021A8 80298B98 44892000 */ mtc1 $t1, $f4 -/* 1021AC 80298B9C 00000000 */ nop +/* 1021AC 80298B9C 00000000 */ nop /* 1021B0 80298BA0 468021A0 */ cvt.s.w $f6, $f4 /* 1021B4 80298BA4 0C0A7BAE */ jal func_8029EEB8 /* 1021B8 80298BA8 E7A6006C */ swc1 $f6, 0x6c($sp) @@ -69,8 +69,8 @@ glabel func_80298AC0 /* 1021D8 80298BC8 3C061901 */ lui $a2, (0x19018010 >> 16) # lui $a2, 0x1901 /* 1021DC 80298BCC 0C03262E */ jal func_800C98B8 /* 1021E0 80298BD0 34C68010 */ ori $a2, (0x19018010 & 0xFFFF) # ori $a2, $a2, 0x8010 -/* 1021E4 80298BD4 3C0C800E */ lui $t4, %hi(D_800DC4DC) # $t4, 0x800e -/* 1021E8 80298BD8 8D8CC4DC */ lw $t4, %lo(D_800DC4DC)($t4) +/* 1021E4 80298BD4 3C0C800E */ lui $t4, %hi(gPlayerOne) # $t4, 0x800e +/* 1021E8 80298BD8 8D8CC4DC */ lw $t4, %lo(gPlayerOne)($t4) /* 1021EC 80298BDC 24010DD8 */ li $at, 3544 /* 1021F0 80298BE0 96A50254 */ lhu $a1, 0x254($s5) /* 1021F4 80298BE4 02AC2023 */ subu $a0, $s5, $t4 @@ -87,11 +87,11 @@ glabel func_80298AC0 /* 102220 80298C10 A6190006 */ sh $t9, 6($s0) .L80298C14: /* 102224 80298C14 96A80000 */ lhu $t0, ($s5) -/* 102228 80298C18 3C0A800E */ lui $t2, %hi(D_800DC4DC) # $t2, 0x800e +/* 102228 80298C18 3C0A800E */ lui $t2, %hi(gPlayerOne) # $t2, 0x800e /* 10222C 80298C1C 31090100 */ andi $t1, $t0, 0x100 /* 102230 80298C20 55200011 */ bnel $t1, $zero, .L80298C68 /* 102234 80298C24 8FBF004C */ lw $ra, 0x4c($sp) -/* 102238 80298C28 8D4AC4DC */ lw $t2, %lo(D_800DC4DC)($t2) +/* 102238 80298C28 8D4AC4DC */ lw $t2, %lo(gPlayerOne)($t2) /* 10223C 80298C2C 24010DD8 */ li $at, 3544 /* 102240 80298C30 3C051900 */ lui $a1, (0x19007018 >> 16) # lui $a1, 0x1900 /* 102244 80298C34 02AA2023 */ subu $a0, $s5, $t2 diff --git a/asm/non_matchings/code_actors/func_8029F1F8.s b/asm/non_matchings/code_actors/func_8029F1F8.s index b15d5f574..d9f4c61ea 100644 --- a/asm/non_matchings/code_actors/func_8029F1F8.s +++ b/asm/non_matchings/code_actors/func_8029F1F8.s @@ -17,7 +17,7 @@ glabel func_8029F1F8 /* 108844 8029F234 96020000 */ lhu $v0, ($s0) /* 108848 8029F238 304E4000 */ andi $t6, $v0, 0x4000 /* 10884C 8029F23C 11C00027 */ beqz $t6, .L8029F2DC -/* 108850 8029F240 00000000 */ nop +/* 108850 8029F240 00000000 */ nop /* 108854 8029F244 8E0F00BC */ lw $t7, 0xbc($s0) /* 108858 8029F248 26040014 */ addiu $a0, $s0, 0x14 /* 10885C 8029F24C 26050034 */ addiu $a1, $s0, 0x34 @@ -30,8 +30,8 @@ glabel func_8029F1F8 /* 108878 8029F268 37280400 */ ori $t0, $t9, 0x400 /* 10887C 8029F26C 0C03262E */ jal func_800C98B8 /* 108880 8029F270 A4680002 */ sh $t0, 2($v1) -/* 108884 8029F274 3C09800E */ lui $t1, %hi(D_800DC4DC) # $t1, 0x800e -/* 108888 8029F278 8D29C4DC */ lw $t1, %lo(D_800DC4DC)($t1) +/* 108884 8029F274 3C09800E */ lui $t1, %hi(gPlayerOne) # $t1, 0x800e +/* 108888 8029F278 8D29C4DC */ lw $t1, %lo(gPlayerOne)($t1) /* 10888C 8029F27C 24010DD8 */ li $at, 3544 /* 108890 8029F280 96050254 */ lhu $a1, 0x254($s0) /* 108894 8029F284 02092023 */ subu $a0, $s0, $t1 @@ -47,8 +47,8 @@ glabel func_8029F1F8 /* 1088BC 8029F2AC 24020001 */ li $v0, 1 .L8029F2B0: /* 1088C0 8029F2B0 15A0000A */ bnez $t5, .L8029F2DC -/* 1088C4 8029F2B4 3C0E800E */ lui $t6, %hi(D_800DC4DC) # $t6, 0x800e -/* 1088C8 8029F2B8 8DCEC4DC */ lw $t6, %lo(D_800DC4DC)($t6) +/* 1088C4 8029F2B4 3C0E800E */ lui $t6, %hi(gPlayerOne) # $t6, 0x800e +/* 1088C8 8029F2B8 8DCEC4DC */ lw $t6, %lo(gPlayerOne)($t6) /* 1088CC 8029F2BC 24010DD8 */ li $at, 3544 /* 1088D0 8029F2C0 3C051900 */ lui $a1, (0x1900701A >> 16) # lui $a1, 0x1900 /* 1088D4 8029F2C4 020E2023 */ subu $a0, $s0, $t6 @@ -67,4 +67,4 @@ glabel func_8029F1F8 /* 1088FC 8029F2EC 8FB00020 */ lw $s0, 0x20($sp) /* 108900 8029F2F0 27BD0028 */ addiu $sp, $sp, 0x28 /* 108904 8029F2F4 03E00008 */ jr $ra -/* 108908 8029F2F8 00000000 */ nop +/* 108908 8029F2F8 00000000 */ nop diff --git a/asm/non_matchings/code_actors/func_8029F2FC.s b/asm/non_matchings/code_actors/func_8029F2FC.s index 5b702bd35..b47d5dc1c 100644 --- a/asm/non_matchings/code_actors/func_8029F2FC.s +++ b/asm/non_matchings/code_actors/func_8029F2FC.s @@ -19,7 +19,7 @@ glabel func_8029F2FC /* 108950 8029F340 96020000 */ lhu $v0, ($s0) /* 108954 8029F344 304F4000 */ andi $t7, $v0, 0x4000 /* 108958 8029F348 11E00027 */ beqz $t7, .L8029F3E8 -/* 10895C 8029F34C 00000000 */ nop +/* 10895C 8029F34C 00000000 */ nop /* 108960 8029F350 8E1800BC */ lw $t8, 0xbc($s0) /* 108964 8029F354 26040014 */ addiu $a0, $s0, 0x14 /* 108968 8029F358 26050034 */ addiu $a1, $s0, 0x34 @@ -32,8 +32,8 @@ glabel func_8029F2FC /* 108984 8029F374 35090400 */ ori $t1, $t0, 0x400 /* 108988 8029F378 0C03262E */ jal func_800C98B8 /* 10898C 8029F37C A4690002 */ sh $t1, 2($v1) -/* 108990 8029F380 3C0A800E */ lui $t2, %hi(D_800DC4DC) # $t2, 0x800e -/* 108994 8029F384 8D4AC4DC */ lw $t2, %lo(D_800DC4DC)($t2) +/* 108990 8029F380 3C0A800E */ lui $t2, %hi(gPlayerOne) # $t2, 0x800e +/* 108994 8029F384 8D4AC4DC */ lw $t2, %lo(gPlayerOne)($t2) /* 108998 8029F388 24010DD8 */ li $at, 3544 /* 10899C 8029F38C 96050254 */ lhu $a1, 0x254($s0) /* 1089A0 8029F390 020A2023 */ subu $a0, $s0, $t2 @@ -49,8 +49,8 @@ glabel func_8029F2FC /* 1089C8 8029F3B8 24020001 */ li $v0, 1 .L8029F3BC: /* 1089CC 8029F3BC 15C0000A */ bnez $t6, .L8029F3E8 -/* 1089D0 8029F3C0 3C0F800E */ lui $t7, %hi(D_800DC4DC) # $t7, 0x800e -/* 1089D4 8029F3C4 8DEFC4DC */ lw $t7, %lo(D_800DC4DC)($t7) +/* 1089D0 8029F3C0 3C0F800E */ lui $t7, %hi(gPlayerOne) # $t7, 0x800e +/* 1089D4 8029F3C4 8DEFC4DC */ lw $t7, %lo(gPlayerOne)($t7) /* 1089D8 8029F3C8 24010DD8 */ li $at, 3544 /* 1089DC 8029F3CC 3C051900 */ lui $a1, (0x1900A052 >> 16) # lui $a1, 0x1900 /* 1089E0 8029F3D0 020F2023 */ subu $a0, $s0, $t7 @@ -69,4 +69,4 @@ glabel func_8029F2FC /* 108A08 8029F3F8 8FB00020 */ lw $s0, 0x20($sp) /* 108A0C 8029F3FC 27BD0028 */ addiu $sp, $sp, 0x28 /* 108A10 8029F400 03E00008 */ jr $ra -/* 108A14 8029F404 00000000 */ nop +/* 108A14 8029F404 00000000 */ nop diff --git a/asm/non_matchings/code_actors/func_8029F408.s b/asm/non_matchings/code_actors/func_8029F408.s index 7261ce79e..d226d3f94 100644 --- a/asm/non_matchings/code_actors/func_8029F408.s +++ b/asm/non_matchings/code_actors/func_8029F408.s @@ -8,14 +8,14 @@ glabel func_8029F408 /* 108A30 8029F420 46062081 */ sub.s $f2, $f4, $f6 /* 108A34 8029F424 3C014270 */ lui $at, 0x4270 /* 108A38 8029F428 4610103C */ c.lt.s $f2, $f16 -/* 108A3C 8029F42C 00000000 */ nop +/* 108A3C 8029F42C 00000000 */ nop /* 108A40 8029F430 4502000B */ bc1fl .L8029F460 /* 108A44 8029F434 3C014270 */ li $at, 0x42700000 # 60.000000 /* 108A48 8029F438 44817000 */ mtc1 $at, $f14 -/* 108A4C 8029F43C 00000000 */ nop +/* 108A4C 8029F43C 00000000 */ nop /* 108A50 8029F440 46007207 */ neg.s $f8, $f14 /* 108A54 8029F444 4608103C */ c.lt.s $f2, $f8 -/* 108A58 8029F448 00000000 */ nop +/* 108A58 8029F448 00000000 */ nop /* 108A5C 8029F44C 45020004 */ bc1fl .L8029F460 /* 108A60 8029F450 3C014270 */ lui $at, 0x4270 /* 108A64 8029F454 1000008D */ b .L8029F68C @@ -23,9 +23,9 @@ glabel func_8029F408 /* 108A6C 8029F45C 3C014270 */ li $at, 0x42700000 # 60.000000 .L8029F460: /* 108A70 8029F460 44817000 */ mtc1 $at, $f14 -/* 108A74 8029F464 00000000 */ nop +/* 108A74 8029F464 00000000 */ nop /* 108A78 8029F468 4602703C */ c.lt.s $f14, $f2 -/* 108A7C 8029F46C 00000000 */ nop +/* 108A7C 8029F46C 00000000 */ nop /* 108A80 8029F470 45020004 */ bc1fl .L8029F484 /* 108A84 8029F474 C4AA0020 */ lwc1 $f10, 0x20($a1) /* 108A88 8029F478 10000084 */ b .L8029F68C @@ -35,21 +35,21 @@ glabel func_8029F408 /* 108A94 8029F484 C4F2001C */ lwc1 $f18, 0x1c($a3) /* 108A98 8029F488 46125001 */ sub.s $f0, $f10, $f18 /* 108A9C 8029F48C 4610003C */ c.lt.s $f0, $f16 -/* 108AA0 8029F490 00000000 */ nop +/* 108AA0 8029F490 00000000 */ nop /* 108AA4 8029F494 45020009 */ bc1fl .L8029F4BC /* 108AA8 8029F498 4600703C */ c.lt.s $f14, $f0 /* 108AAC 8029F49C 46007107 */ neg.s $f4, $f14 /* 108AB0 8029F4A0 4604003C */ c.lt.s $f0, $f4 -/* 108AB4 8029F4A4 00000000 */ nop +/* 108AB4 8029F4A4 00000000 */ nop /* 108AB8 8029F4A8 45020004 */ bc1fl .L8029F4BC /* 108ABC 8029F4AC 4600703C */ c.lt.s $f14, $f0 /* 108AC0 8029F4B0 10000076 */ b .L8029F68C /* 108AC4 8029F4B4 00001025 */ move $v0, $zero /* 108AC8 8029F4B8 4600703C */ c.lt.s $f14, $f0 .L8029F4BC: -/* 108ACC 8029F4BC 00000000 */ nop +/* 108ACC 8029F4BC 00000000 */ nop /* 108AD0 8029F4C0 45000003 */ bc1f .L8029F4D0 -/* 108AD4 8029F4C4 00000000 */ nop +/* 108AD4 8029F4C4 00000000 */ nop /* 108AD8 8029F4C8 10000070 */ b .L8029F68C /* 108ADC 8029F4CC 00001025 */ move $v0, $zero .L8029F4D0: @@ -81,7 +81,7 @@ glabel func_8029F408 /* 108B40 8029F530 C7A2001C */ lwc1 $f2, 0x1c($sp) /* 108B44 8029F534 46125001 */ sub.s $f0, $f10, $f18 /* 108B48 8029F538 4604003C */ c.lt.s $f0, $f4 -/* 108B4C 8029F53C 00000000 */ nop +/* 108B4C 8029F53C 00000000 */ nop /* 108B50 8029F540 45020004 */ bc1fl .L8029F554 /* 108B54 8029F544 C4E60070 */ lwc1 $f6, 0x70($a3) /* 108B58 8029F548 10000050 */ b .L8029F68C @@ -91,23 +91,23 @@ glabel func_8029F408 /* 108B64 8029F554 C448000C */ lwc1 $f8, 0xc($v0) /* 108B68 8029F558 46083000 */ add.s $f0, $f6, $f8 /* 108B6C 8029F55C 4602003C */ c.lt.s $f0, $f2 -/* 108B70 8029F560 00000000 */ nop +/* 108B70 8029F560 00000000 */ nop /* 108B74 8029F564 45020004 */ bc1fl .L8029F578 /* 108B78 8029F568 94EE0000 */ lhu $t6, ($a3) /* 108B7C 8029F56C 10000047 */ b .L8029F68C /* 108B80 8029F570 00001025 */ move $v0, $zero /* 108B84 8029F574 94EE0000 */ lhu $t6, ($a3) .L8029F578: -/* 108B88 8029F578 3C0B800E */ lui $t3, %hi(D_800DC4DC) # $t3, 0x800e +/* 108B88 8029F578 3C0B800E */ lui $t3, %hi(gPlayerOne) # $t3, 0x800e /* 108B8C 8029F57C 31CF4000 */ andi $t7, $t6, 0x4000 /* 108B90 8029F580 11E00038 */ beqz $t7, .L8029F664 -/* 108B94 8029F584 00000000 */ nop +/* 108B94 8029F584 00000000 */ nop /* 108B98 8029F588 8CF800BC */ lw $t8, 0xbc($a3) /* 108B9C 8029F58C 3C014100 */ li $at, 0x41000000 # 8.000000 /* 108BA0 8029F590 00E02025 */ move $a0, $a3 /* 108BA4 8029F594 33190200 */ andi $t9, $t8, 0x200 /* 108BA8 8029F598 1320001C */ beqz $t9, .L8029F60C -/* 108BAC 8029F59C 3C0E800E */ lui $t6, %hi(D_800DC4DC) # $t6, 0x800e +/* 108BAC 8029F59C 3C0E800E */ lui $t6, %hi(gPlayerOne) # $t6, 0x800e /* 108BB0 8029F5A0 84480002 */ lh $t0, 2($v0) /* 108BB4 8029F5A4 44815000 */ mtc1 $at, $f10 /* 108BB8 8029F5A8 3C061901 */ lui $a2, (0x19018010 >> 16) # lui $a2, 0x1901 @@ -119,9 +119,9 @@ glabel func_8029F408 /* 108BD0 8029F5C0 24E40014 */ addiu $a0, $a3, 0x14 /* 108BD4 8029F5C4 0C03262E */ jal func_800C98B8 /* 108BD8 8029F5C8 24E50034 */ addiu $a1, $a3, 0x34 -/* 108BDC 8029F5CC 3C0A800E */ lui $t2, %hi(D_800DC4DC) # $t2, 0x800e +/* 108BDC 8029F5CC 3C0A800E */ lui $t2, %hi(gPlayerOne) # $t2, 0x800e /* 108BE0 8029F5D0 8FA70038 */ lw $a3, 0x38($sp) -/* 108BE4 8029F5D4 8D4AC4DC */ lw $t2, %lo(D_800DC4DC)($t2) +/* 108BE4 8029F5D4 8D4AC4DC */ lw $t2, %lo(gPlayerOne)($t2) /* 108BE8 8029F5D8 24010DD8 */ li $at, 3544 /* 108BEC 8029F5DC 94E50254 */ lhu $a1, 0x254($a3) /* 108BF0 8029F5E0 00EA2023 */ subu $a0, $a3, $t2 @@ -136,7 +136,7 @@ glabel func_8029F408 /* 108C14 8029F604 10000021 */ b .L8029F68C /* 108C18 8029F608 24020001 */ li $v0, 1 .L8029F60C: -/* 108C1C 8029F60C 8DCEC4DC */ lw $t6, %lo(D_800DC4DC)($t6) +/* 108C1C 8029F60C 8DCEC4DC */ lw $t6, %lo(gPlayerOne)($t6) /* 108C20 8029F610 24010DD8 */ li $at, 3544 /* 108C24 8029F614 AFA70038 */ sw $a3, 0x38($sp) /* 108C28 8029F618 00EE2823 */ subu $a1, $a3, $t6 @@ -159,7 +159,7 @@ glabel func_8029F408 /* 108C6C 8029F65C 1000000A */ b .L8029F688 /* 108C70 8029F660 AC222DF8 */ sw $v0, %lo(D_80162DF8)($at) .L8029F664: -/* 108C74 8029F664 8D6BC4DC */ lw $t3, %lo(D_800DC4DC)($t3) +/* 108C74 8029F664 8D6BC4DC */ lw $t3, %lo(gPlayerOne)($t3) /* 108C78 8029F668 24010DD8 */ li $at, 3544 /* 108C7C 8029F66C 00E02025 */ move $a0, $a3 /* 108C80 8029F670 00EB2823 */ subu $a1, $a3, $t3 @@ -174,4 +174,4 @@ glabel func_8029F408 /* 108C9C 8029F68C 8FBF0014 */ lw $ra, 0x14($sp) /* 108CA0 8029F690 27BD0038 */ addiu $sp, $sp, 0x38 /* 108CA4 8029F694 03E00008 */ jr $ra -/* 108CA8 8029F698 00000000 */ nop +/* 108CA8 8029F698 00000000 */ nop diff --git a/asm/non_matchings/code_actors/func_8029F69C.s b/asm/non_matchings/code_actors/func_8029F69C.s index 1963eaf2d..711c00989 100644 --- a/asm/non_matchings/code_actors/func_8029F69C.s +++ b/asm/non_matchings/code_actors/func_8029F69C.s @@ -8,19 +8,19 @@ glabel func_8029F69C /* 108CC4 8029F6B4 46062481 */ sub.s $f18, $f4, $f6 /* 108CC8 8029F6B8 C4B00008 */ lwc1 $f16, 8($a1) /* 108CCC 8029F6BC 4602903C */ c.lt.s $f18, $f2 -/* 108CD0 8029F6C0 00000000 */ nop +/* 108CD0 8029F6C0 00000000 */ nop /* 108CD4 8029F6C4 45020009 */ bc1fl .L8029F6EC /* 108CD8 8029F6C8 4612803C */ c.lt.s $f16, $f18 /* 108CDC 8029F6CC 46008207 */ neg.s $f8, $f16 /* 108CE0 8029F6D0 4608903C */ c.lt.s $f18, $f8 -/* 108CE4 8029F6D4 00000000 */ nop +/* 108CE4 8029F6D4 00000000 */ nop /* 108CE8 8029F6D8 45020004 */ bc1fl .L8029F6EC /* 108CEC 8029F6DC 4612803C */ c.lt.s $f16, $f18 /* 108CF0 8029F6E0 10000123 */ b .L8029FB70 /* 108CF4 8029F6E4 00001025 */ move $v0, $zero /* 108CF8 8029F6E8 4612803C */ c.lt.s $f16, $f18 .L8029F6EC: -/* 108CFC 8029F6EC 00000000 */ nop +/* 108CFC 8029F6EC 00000000 */ nop /* 108D00 8029F6F0 45020004 */ bc1fl .L8029F704 /* 108D04 8029F6F4 C4AA0020 */ lwc1 $f10, 0x20($a1) /* 108D08 8029F6F8 1000011D */ b .L8029FB70 @@ -30,19 +30,19 @@ glabel func_8029F69C /* 108D14 8029F704 C4E4001C */ lwc1 $f4, 0x1c($a3) /* 108D18 8029F708 46045381 */ sub.s $f14, $f10, $f4 /* 108D1C 8029F70C 4602703C */ c.lt.s $f14, $f2 -/* 108D20 8029F710 00000000 */ nop +/* 108D20 8029F710 00000000 */ nop /* 108D24 8029F714 45020009 */ bc1fl .L8029F73C /* 108D28 8029F718 460E803C */ c.lt.s $f16, $f14 /* 108D2C 8029F71C 46008187 */ neg.s $f6, $f16 /* 108D30 8029F720 4606703C */ c.lt.s $f14, $f6 -/* 108D34 8029F724 00000000 */ nop +/* 108D34 8029F724 00000000 */ nop /* 108D38 8029F728 45020004 */ bc1fl .L8029F73C /* 108D3C 8029F72C 460E803C */ c.lt.s $f16, $f14 /* 108D40 8029F730 1000010F */ b .L8029FB70 /* 108D44 8029F734 00001025 */ move $v0, $zero /* 108D48 8029F738 460E803C */ c.lt.s $f16, $f14 .L8029F73C: -/* 108D4C 8029F73C 00000000 */ nop +/* 108D4C 8029F73C 00000000 */ nop /* 108D50 8029F740 45020004 */ bc1fl .L8029F754 /* 108D54 8029F744 C4E80018 */ lwc1 $f8, 0x18($a3) /* 108D58 8029F748 10000109 */ b .L8029FB70 @@ -52,7 +52,7 @@ glabel func_8029F69C /* 108D64 8029F754 C4AA001C */ lwc1 $f10, 0x1c($a1) /* 108D68 8029F758 460A4001 */ sub.s $f0, $f8, $f10 /* 108D6C 8029F75C 4602003C */ c.lt.s $f0, $f2 -/* 108D70 8029F760 00000000 */ nop +/* 108D70 8029F760 00000000 */ nop /* 108D74 8029F764 45020004 */ bc1fl .L8029F778 /* 108D78 8029F768 84AE0006 */ lh $t6, 6($a1) /* 108D7C 8029F76C 10000100 */ b .L8029FB70 @@ -60,12 +60,12 @@ glabel func_8029F69C /* 108D84 8029F774 84AE0006 */ lh $t6, 6($a1) .L8029F778: /* 108D88 8029F778 448E2000 */ mtc1 $t6, $f4 -/* 108D8C 8029F77C 00000000 */ nop +/* 108D8C 8029F77C 00000000 */ nop /* 108D90 8029F780 468021A0 */ cvt.s.w $f6, $f4 /* 108D94 8029F784 4600303C */ c.lt.s $f6, $f0 -/* 108D98 8029F788 00000000 */ nop +/* 108D98 8029F788 00000000 */ nop /* 108D9C 8029F78C 45000003 */ bc1f .L8029F79C -/* 108DA0 8029F790 00000000 */ nop +/* 108DA0 8029F790 00000000 */ nop /* 108DA4 8029F794 100000F6 */ b .L8029FB70 /* 108DA8 8029F798 00001025 */ move $v0, $zero .L8029F79C: @@ -103,7 +103,7 @@ glabel func_8029F69C /* 108E24 8029F814 C7B20054 */ lwc1 $f18, 0x54($sp) /* 108E28 8029F818 46062400 */ add.s $f16, $f4, $f6 /* 108E2C 8029F81C 4608803C */ c.lt.s $f16, $f8 -/* 108E30 8029F820 00000000 */ nop +/* 108E30 8029F820 00000000 */ nop /* 108E34 8029F824 45020004 */ bc1fl .L8029F838 /* 108E38 8029F828 C4EA0034 */ lwc1 $f10, 0x34($a3) /* 108E3C 8029F82C 100000D0 */ b .L8029FB70 @@ -130,9 +130,9 @@ glabel func_8029F69C /* 108E8C 8029F87C A4690002 */ sh $t1, 2($v1) /* 108E90 8029F880 0C03262E */ jal func_800C98B8 /* 108E94 8029F884 AFA70058 */ sw $a3, 0x58($sp) -/* 108E98 8029F888 3C0A800E */ lui $t2, %hi(D_800DC4DC) # $t2, 0x800e +/* 108E98 8029F888 3C0A800E */ lui $t2, %hi(gPlayerOne) # $t2, 0x800e /* 108E9C 8029F88C 8FA70058 */ lw $a3, 0x58($sp) -/* 108EA0 8029F890 8D4AC4DC */ lw $t2, %lo(D_800DC4DC)($t2) +/* 108EA0 8029F890 8D4AC4DC */ lw $t2, %lo(gPlayerOne)($t2) /* 108EA4 8029F894 24010DD8 */ li $at, 3544 /* 108EA8 8029F898 94E50254 */ lhu $a1, 0x254($a3) /* 108EAC 8029F89C 00EA2023 */ subu $a0, $a3, $t2 @@ -148,8 +148,8 @@ glabel func_8029F69C /* 108ED4 8029F8C4 24020001 */ li $v0, 1 .L8029F8C8: /* 108ED8 8029F8C8 15C00013 */ bnez $t6, .L8029F918 -/* 108EDC 8029F8CC 3C0F800E */ lui $t7, %hi(D_800DC4DC) # $t7, 0x800e -/* 108EE0 8029F8D0 8DEFC4DC */ lw $t7, %lo(D_800DC4DC)($t7) +/* 108EDC 8029F8CC 3C0F800E */ lui $t7, %hi(gPlayerOne) # $t7, 0x800e +/* 108EE0 8029F8D0 8DEFC4DC */ lw $t7, %lo(gPlayerOne)($t7) /* 108EE4 8029F8D4 24010DD8 */ li $at, 3544 /* 108EE8 8029F8D8 3C051900 */ lui $a1, (0x19007018 >> 16) # lui $a1, 0x1900 /* 108EEC 8029F8DC 00EF2023 */ subu $a0, $a3, $t7 @@ -197,9 +197,9 @@ glabel func_8029F69C /* 108F84 8029F974 27A40020 */ addiu $a0, $sp, 0x20 /* 108F88 8029F978 00002825 */ move $a1, $zero /* 108F8C 8029F97C 4606203C */ c.lt.s $f4, $f6 -/* 108F90 8029F980 00000000 */ nop +/* 108F90 8029F980 00000000 */ nop /* 108F94 8029F984 4500000A */ bc1f .L8029F9B0 -/* 108F98 8029F988 00000000 */ nop +/* 108F98 8029F988 00000000 */ nop /* 108F9C 8029F98C AFA70058 */ sw $a3, 0x58($sp) /* 108FA0 8029F990 E7AE004C */ swc1 $f14, 0x4c($sp) /* 108FA4 8029F994 E7B00040 */ swc1 $f16, 0x40($sp) @@ -216,9 +216,9 @@ glabel func_8029F69C /* 108FCC 8029F9BC C7A40048 */ lwc1 $f4, 0x48($sp) /* 108FD0 8029F9C0 C7A60044 */ lwc1 $f6, 0x44($sp) /* 108FD4 8029F9C4 460A403C */ c.lt.s $f8, $f10 -/* 108FD8 8029F9C8 00000000 */ nop +/* 108FD8 8029F9C8 00000000 */ nop /* 108FDC 8029F9CC 4500001F */ bc1f .L8029FA4C -/* 108FE0 8029F9D0 00000000 */ nop +/* 108FE0 8029F9D0 00000000 */ nop /* 108FE4 8029F9D4 C7A40048 */ lwc1 $f4, 0x48($sp) /* 108FE8 8029F9D8 C7A80044 */ lwc1 $f8, 0x44($sp) /* 108FEC 8029F9DC AFA70058 */ sw $a3, 0x58($sp) @@ -291,7 +291,7 @@ glabel func_8029F69C /* 1090F0 8029FAE0 C7A40044 */ lwc1 $f4, 0x44($sp) /* 1090F4 8029FAE4 3C013FC0 */ li $at, 0x3FC00000 # 1.500000 /* 1090F8 8029FAE8 46089282 */ mul.s $f10, $f18, $f8 -/* 1090FC 8029FAEC 00000000 */ nop +/* 1090FC 8029FAEC 00000000 */ nop /* 109100 8029FAF0 46047182 */ mul.s $f6, $f14, $f4 /* 109104 8029FAF4 46065200 */ add.s $f8, $f10, $f6 /* 109108 8029FAF8 44813000 */ mtc1 $at, $f6 @@ -299,7 +299,7 @@ glabel func_8029F69C /* 109110 8029FB00 46004103 */ div.s $f4, $f8, $f0 /* 109114 8029FB04 C4E80034 */ lwc1 $f8, 0x34($a3) /* 109118 8029FB08 46040282 */ mul.s $f10, $f0, $f4 -/* 10911C 8029FB0C 00000000 */ nop +/* 10911C 8029FB0C 00000000 */ nop /* 109120 8029FB10 46065302 */ mul.s $f12, $f10, $f6 /* 109124 8029FB14 C4E6003C */ lwc1 $f6, 0x3c($a3) /* 109128 8029FB18 460C9102 */ mul.s $f4, $f18, $f12 @@ -313,7 +313,7 @@ glabel func_8029F69C /* 109148 8029FB38 46105081 */ sub.s $f2, $f10, $f16 /* 10914C 8029FB3C C4EA0014 */ lwc1 $f10, 0x14($a3) /* 109150 8029FB40 46029182 */ mul.s $f6, $f18, $f2 -/* 109154 8029FB44 00000000 */ nop +/* 109154 8029FB44 00000000 */ nop /* 109158 8029FB48 46083102 */ mul.s $f4, $f6, $f8 /* 10915C 8029FB4C 46045180 */ add.s $f6, $f10, $f4 /* 109160 8029FB50 46027202 */ mul.s $f8, $f14, $f2 @@ -329,4 +329,4 @@ glabel func_8029F69C /* 109180 8029FB70 8FBF0014 */ lw $ra, 0x14($sp) /* 109184 8029FB74 27BD0058 */ addiu $sp, $sp, 0x58 /* 109188 8029FB78 03E00008 */ jr $ra -/* 10918C 8029FB7C 00000000 */ nop +/* 10918C 8029FB7C 00000000 */ nop diff --git a/asm/non_matchings/code_actors/func_802A0450.s b/asm/non_matchings/code_actors/func_802A0450.s index 75af82bed..41b3a3cb5 100644 --- a/asm/non_matchings/code_actors/func_802A0450.s +++ b/asm/non_matchings/code_actors/func_802A0450.s @@ -1,6 +1,6 @@ glabel func_802A0450 -/* 109A60 802A0450 3C0E800E */ lui $t6, %hi(D_800DC4DC) # $t6, 0x800e -/* 109A64 802A0454 8DCEC4DC */ lw $t6, %lo(D_800DC4DC)($t6) +/* 109A60 802A0450 3C0E800E */ lui $t6, %hi(gPlayerOne) # $t6, 0x800e +/* 109A64 802A0454 8DCEC4DC */ lw $t6, %lo(gPlayerOne)($t6) /* 109A68 802A0458 24010DD8 */ li $at, 3544 /* 109A6C 802A045C 27BDFFB8 */ addiu $sp, $sp, -0x48 /* 109A70 802A0460 008E4023 */ subu $t0, $a0, $t6 @@ -21,7 +21,7 @@ glabel func_802A0450 /* 109AAC 802A049C 002B0821 */ addu $at, $at, $t3 /* 109AB0 802A04A0 8C2B991C */ lw $t3, %lo(jpt_802B991C)($at) /* 109AB4 802A04A4 01600008 */ jr $t3 -/* 109AB8 802A04A8 00000000 */ nop +/* 109AB8 802A04A8 00000000 */ nop glabel L802A04AC /* 109ABC 802A04AC 8CEC00BC */ lw $t4, 0xbc($a3) /* 109AC0 802A04B0 000C6800 */ sll $t5, $t4, 0 @@ -82,7 +82,7 @@ glabel L802A04E0 /* 109B94 802A0584 944A0000 */ lhu $t2, ($v0) /* 109B98 802A0588 314B4000 */ andi $t3, $t2, 0x4000 /* 109B9C 802A058C 11600027 */ beqz $t3, .L802A062C -/* 109BA0 802A0590 00000000 */ nop +/* 109BA0 802A0590 00000000 */ nop /* 109BA4 802A0594 860C0002 */ lh $t4, 2($s0) /* 109BA8 802A0598 318D000F */ andi $t5, $t4, 0xf /* 109BAC 802A059C 51A0000C */ beql $t5, $zero, .L802A05D0 @@ -96,7 +96,7 @@ glabel L802A04E0 /* 109BCC 802A05BC 0C03243D */ jal func_800C90F4 /* 109BD0 802A05C0 01C12821 */ addu $a1, $t6, $at /* 109BD4 802A05C4 10000019 */ b .L802A062C -/* 109BD8 802A05C8 00000000 */ nop +/* 109BD8 802A05C8 00000000 */ nop /* 109BDC 802A05CC C6040018 */ lwc1 $f4, 0x18($s0) .L802A05D0: /* 109BE0 802A05D0 C4460014 */ lwc1 $f6, 0x14($v0) @@ -107,13 +107,13 @@ glabel L802A04E0 /* 109BF4 802A05E4 C42699C4 */ lwc1 $f6, %lo(D_802B99C4)($at) /* 109BF8 802A05E8 460A4081 */ sub.s $f2, $f8, $f10 /* 109BFC 802A05EC 46000402 */ mul.s $f16, $f0, $f0 -/* 109C00 802A05F0 00000000 */ nop +/* 109C00 802A05F0 00000000 */ nop /* 109C04 802A05F4 46021482 */ mul.s $f18, $f2, $f2 /* 109C08 802A05F8 46128100 */ add.s $f4, $f16, $f18 /* 109C0C 802A05FC 4606203C */ c.lt.s $f4, $f6 -/* 109C10 802A0600 00000000 */ nop +/* 109C10 802A0600 00000000 */ nop /* 109C14 802A0604 45000009 */ bc1f .L802A062C -/* 109C18 802A0608 00000000 */ nop +/* 109C18 802A0608 00000000 */ nop /* 109C1C 802A060C 11030007 */ beq $t0, $v1, .L802A062C /* 109C20 802A0610 306400FF */ andi $a0, $v1, 0xff /* 109C24 802A0614 94450254 */ lhu $a1, 0x254($v0) @@ -182,7 +182,7 @@ glabel L802A063C /* 109D14 802A0704 87A80042 */ lh $t0, 0x42($sp) /* 109D18 802A0708 314B4000 */ andi $t3, $t2, 0x4000 /* 109D1C 802A070C 11600009 */ beqz $t3, .L802A0734 -/* 109D20 802A0710 00000000 */ nop +/* 109D20 802A0710 00000000 */ nop /* 109D24 802A0714 11030007 */ beq $t0, $v1, .L802A0734 /* 109D28 802A0718 306400FF */ andi $a0, $v1, 0xff /* 109D2C 802A071C 94450254 */ lhu $a1, 0x254($v0) @@ -328,7 +328,7 @@ glabel L802A0858 /* 109F38 802A0928 944F0000 */ lhu $t7, ($v0) /* 109F3C 802A092C 31F84000 */ andi $t8, $t7, 0x4000 /* 109F40 802A0930 13000009 */ beqz $t8, .L802A0958 -/* 109F44 802A0934 00000000 */ nop +/* 109F44 802A0934 00000000 */ nop /* 109F48 802A0938 11030007 */ beq $t0, $v1, .L802A0958 /* 109F4C 802A093C 306400FF */ andi $a0, $v1, 0xff /* 109F50 802A0940 94450254 */ lhu $a1, 0x254($v0) @@ -399,7 +399,7 @@ glabel L802A09D4 /* 10A040 802A0A30 24090001 */ li $t1, 1 /* 10A044 802A0A34 8FA70048 */ lw $a3, 0x48($sp) /* 10A048 802A0A38 152C0007 */ bne $t1, $t4, .L802A0A58 -/* 10A04C 802A0A3C 3C19800E */ lui $t9, %hi(D_800DC4DC) # $t9, 0x800e +/* 10A04C 802A0A3C 3C19800E */ lui $t9, %hi(gPlayerOne) # $t9, 0x800e /* 10A050 802A0A40 94ED0000 */ lhu $t5, ($a3) /* 10A054 802A0A44 3C018016 */ lui $at, %hi(D_80162DF8) # $at, 0x8016 /* 10A058 802A0A48 31AE1000 */ andi $t6, $t5, 0x1000 @@ -412,12 +412,12 @@ glabel L802A09D4 /* 10A06C 802A0A5C 3C014120 */ li $at, 0x41200000 # 10.000000 /* 10A070 802A0A60 31F80200 */ andi $t8, $t7, 0x200 /* 10A074 802A0A64 13000004 */ beqz $t8, .L802A0A78 -/* 10A078 802A0A68 00000000 */ nop +/* 10A078 802A0A68 00000000 */ nop /* 10A07C 802A0A6C 44814000 */ mtc1 $at, $f8 /* 10A080 802A0A70 100000B3 */ b .L802A0D40 /* 10A084 802A0A74 E6080028 */ swc1 $f8, 0x28($s0) .L802A0A78: -/* 10A088 802A0A78 8F39C4DC */ lw $t9, %lo(D_800DC4DC)($t9) +/* 10A088 802A0A78 8F39C4DC */ lw $t9, %lo(gPlayerOne)($t9) /* 10A08C 802A0A7C 24010DD8 */ li $at, 3544 /* 10A090 802A0A80 00E02025 */ move $a0, $a3 /* 10A094 802A0A84 00F92823 */ subu $a1, $a3, $t9 @@ -438,7 +438,7 @@ glabel L802A0AA4 /* 10A0CC 802A0ABC 02002825 */ move $a1, $s0 /* 10A0D0 802A0AC0 4600540D */ trunc.w.s $f16, $f10 /* 10A0D4 802A0AC4 44038000 */ mfc1 $v1, $f16 -/* 10A0D8 802A0AC8 00000000 */ nop +/* 10A0D8 802A0AC8 00000000 */ nop /* 10A0DC 802A0ACC 0003C400 */ sll $t8, $v1, 0x10 /* 10A0E0 802A0AD0 00181C03 */ sra $v1, $t8, 0x10 /* 10A0E4 802A0AD4 55030006 */ bnel $t0, $v1, .L802A0AF0 @@ -500,13 +500,13 @@ glabel L802A0AA4 /* 10A1BC 802A0BAC C42499C8 */ lwc1 $f4, %lo(D_802B99C8)($at) /* 10A1C0 802A0BB0 46083081 */ sub.s $f2, $f6, $f8 /* 10A1C4 802A0BB4 46000282 */ mul.s $f10, $f0, $f0 -/* 10A1C8 802A0BB8 00000000 */ nop +/* 10A1C8 802A0BB8 00000000 */ nop /* 10A1CC 802A0BBC 46021402 */ mul.s $f16, $f2, $f2 /* 10A1D0 802A0BC0 46105480 */ add.s $f18, $f10, $f16 /* 10A1D4 802A0BC4 4604903C */ c.lt.s $f18, $f4 -/* 10A1D8 802A0BC8 00000000 */ nop +/* 10A1D8 802A0BC8 00000000 */ nop /* 10A1DC 802A0BCC 4500000B */ bc1f .L802A0BFC -/* 10A1E0 802A0BD0 00000000 */ nop +/* 10A1E0 802A0BD0 00000000 */ nop /* 10A1E4 802A0BD4 11030009 */ beq $t0, $v1, .L802A0BFC /* 10A1E8 802A0BD8 306400FF */ andi $a0, $v1, 0xff /* 10A1EC 802A0BDC 94450254 */ lhu $a1, 0x254($v0) @@ -547,18 +547,18 @@ glabel L802A0C34 /* 10A26C 802A0C5C A60C0002 */ sh $t4, 2($s0) /* 10A270 802A0C60 A6000004 */ sh $zero, 4($s0) /* 10A274 802A0C64 94ED0000 */ lhu $t5, ($a3) -/* 10A278 802A0C68 3C0F800E */ lui $t7, %hi(D_800DC4DC) # $t7, 0x800e +/* 10A278 802A0C68 3C0F800E */ lui $t7, %hi(gPlayerOne) # $t7, 0x800e /* 10A27C 802A0C6C 31AE4000 */ andi $t6, $t5, 0x4000 /* 10A280 802A0C70 51C00034 */ beql $t6, $zero, .L802A0D44 /* 10A284 802A0C74 8FBF001C */ lw $ra, 0x1c($sp) -/* 10A288 802A0C78 8DEFC4DC */ lw $t7, %lo(D_800DC4DC)($t7) +/* 10A288 802A0C78 8DEFC4DC */ lw $t7, %lo(gPlayerOne)($t7) /* 10A28C 802A0C7C 24010DD8 */ li $at, 3544 /* 10A290 802A0C80 24050007 */ li $a1, 7 /* 10A294 802A0C84 00EF2023 */ subu $a0, $a3, $t7 /* 10A298 802A0C88 0081001A */ div $zero, $a0, $at /* 10A29C 802A0C8C 00002012 */ mflo $a0 /* 10A2A0 802A0C90 0C01EAFF */ jal func_8007ABFC -/* 10A2A4 802A0C94 00000000 */ nop +/* 10A2A4 802A0C94 00000000 */ nop /* 10A2A8 802A0C98 1000002A */ b .L802A0D44 /* 10A2AC 802A0C9C 8FBF001C */ lw $ra, 0x1c($sp) .L802A0CA0: @@ -583,18 +583,18 @@ glabel L802A0CBC /* 10A2F4 802A0CE4 A60C0002 */ sh $t4, 2($s0) /* 10A2F8 802A0CE8 A6000004 */ sh $zero, 4($s0) /* 10A2FC 802A0CEC 94ED0000 */ lhu $t5, ($a3) -/* 10A300 802A0CF0 3C0F800E */ lui $t7, %hi(D_800DC4DC) # $t7, 0x800e +/* 10A300 802A0CF0 3C0F800E */ lui $t7, %hi(gPlayerOne) # $t7, 0x800e /* 10A304 802A0CF4 31AE4000 */ andi $t6, $t5, 0x4000 /* 10A308 802A0CF8 51C00012 */ beql $t6, $zero, .L802A0D44 /* 10A30C 802A0CFC 8FBF001C */ lw $ra, 0x1c($sp) -/* 10A310 802A0D00 8DEFC4DC */ lw $t7, %lo(D_800DC4DC)($t7) +/* 10A310 802A0D00 8DEFC4DC */ lw $t7, %lo(gPlayerOne)($t7) /* 10A314 802A0D04 24010DD8 */ li $at, 3544 /* 10A318 802A0D08 00002825 */ move $a1, $zero /* 10A31C 802A0D0C 00EF2023 */ subu $a0, $a3, $t7 /* 10A320 802A0D10 0081001A */ div $zero, $a0, $at /* 10A324 802A0D14 00002012 */ mflo $a0 /* 10A328 802A0D18 0C01EAFF */ jal func_8007ABFC -/* 10A32C 802A0D1C 00000000 */ nop +/* 10A32C 802A0D1C 00000000 */ nop /* 10A330 802A0D20 10000008 */ b .L802A0D44 /* 10A334 802A0D24 8FBF001C */ lw $ra, 0x1c($sp) .L802A0D28: @@ -611,4 +611,4 @@ glabel L802A0D40 /* 10A354 802A0D44 8FB00018 */ lw $s0, 0x18($sp) /* 10A358 802A0D48 27BD0048 */ addiu $sp, $sp, 0x48 /* 10A35C 802A0D4C 03E00008 */ jr $ra -/* 10A360 802A0D50 00000000 */ nop +/* 10A360 802A0D50 00000000 */ nop diff --git a/asm/non_matchings/code_actors/update_obj_fake_item_box.s b/asm/non_matchings/code_actors/update_obj_fake_item_box.s index 69849c779..852e2bcd2 100644 --- a/asm/non_matchings/code_actors/update_obj_fake_item_box.s +++ b/asm/non_matchings/code_actors/update_obj_fake_item_box.s @@ -12,7 +12,7 @@ glabel update_obj_fake_item_box /* 10A728 802A1118 3C014F00 */ li $at, 0x4F000000 # 2147483648.000000 /* 10A72C 802A111C 258C6990 */ addiu $t4, %lo(gPlayers) # addiu $t4, $t4, 0x6990 /* 10A730 802A1120 4443F800 */ cfc1 $v1, $31 -/* 10A734 802A1124 00000000 */ nop +/* 10A734 802A1124 00000000 */ nop /* 10A738 802A1128 30630078 */ andi $v1, $v1, 0x78 /* 10A73C 802A112C 50600013 */ beql $v1, $zero, .L802A117C /* 10A740 802A1130 44033000 */ mfc1 $v1, $f6 @@ -20,13 +20,13 @@ glabel update_obj_fake_item_box /* 10A748 802A1138 24030001 */ li $v1, 1 /* 10A74C 802A113C 46062181 */ sub.s $f6, $f4, $f6 /* 10A750 802A1140 44C3F800 */ ctc1 $v1, $31 -/* 10A754 802A1144 00000000 */ nop +/* 10A754 802A1144 00000000 */ nop /* 10A758 802A1148 460031A4 */ cvt.w.s $f6, $f6 /* 10A75C 802A114C 4443F800 */ cfc1 $v1, $31 -/* 10A760 802A1150 00000000 */ nop +/* 10A760 802A1150 00000000 */ nop /* 10A764 802A1154 30630078 */ andi $v1, $v1, 0x78 /* 10A768 802A1158 14600005 */ bnez $v1, .L802A1170 -/* 10A76C 802A115C 00000000 */ nop +/* 10A76C 802A115C 00000000 */ nop /* 10A770 802A1160 44033000 */ mfc1 $v1, $f6 /* 10A774 802A1164 3C018000 */ lui $at, 0x8000 /* 10A778 802A1168 10000007 */ b .L802A1188 @@ -36,9 +36,9 @@ glabel update_obj_fake_item_box /* 10A784 802A1174 2403FFFF */ li $v1, -1 /* 10A788 802A1178 44033000 */ mfc1 $v1, $f6 .L802A117C: -/* 10A78C 802A117C 00000000 */ nop +/* 10A78C 802A117C 00000000 */ nop /* 10A790 802A1180 0460FFFB */ bltz $v1, .L802A1170 -/* 10A794 802A1184 00000000 */ nop +/* 10A794 802A1184 00000000 */ nop .L802A1188: /* 10A798 802A1188 86020006 */ lh $v0, 6($s0) /* 10A79C 802A118C 44CEF800 */ ctc1 $t6, $31 @@ -51,7 +51,7 @@ glabel update_obj_fake_item_box /* 10A7B8 802A11A8 504100A9 */ beql $v0, $at, .L802A1450 /* 10A7BC 802A11AC 86020004 */ lh $v0, 4($s0) /* 10A7C0 802A11B0 100000BB */ b .L802A14A0 -/* 10A7C4 802A11B4 00000000 */ nop +/* 10A7C4 802A11B4 00000000 */ nop .L802A11B8: /* 10A7C8 802A11B8 C6080008 */ lwc1 $f8, 8($s0) /* 10A7CC 802A11BC 44815000 */ mtc1 $at, $f10 @@ -145,11 +145,11 @@ glabel update_obj_fake_item_box /* 10A92C 802A131C 3C01FFFB */ lui $at, (0xFFFBFFFF >> 16) # lui $at, 0xfffb /* 10A930 802A1320 3421FFFF */ ori $at, (0xFFFBFFFF & 0xFFFF) # ori $at, $at, 0xffff /* 10A934 802A1324 8C4A000C */ lw $t2, 0xc($v0) -/* 10A938 802A1328 3C0C800E */ lui $t4, %hi(D_800DC4DC) # $t4, 0x800e +/* 10A938 802A1328 3C0C800E */ lui $t4, %hi(gPlayerOne) # $t4, 0x800e /* 10A93C 802A132C 3C051900 */ lui $a1, (0x19008012 >> 16) # lui $a1, 0x1900 /* 10A940 802A1330 01415824 */ and $t3, $t2, $at /* 10A944 802A1334 AC4B000C */ sw $t3, 0xc($v0) -/* 10A948 802A1338 8D8CC4DC */ lw $t4, %lo(D_800DC4DC)($t4) +/* 10A948 802A1338 8D8CC4DC */ lw $t4, %lo(gPlayerOne)($t4) /* 10A94C 802A133C 24010DD8 */ li $at, 3544 /* 10A950 802A1340 34A58012 */ ori $a1, (0x19008012 & 0xFFFF) # ori $a1, $a1, 0x8012 /* 10A954 802A1344 004C2023 */ subu $a0, $v0, $t4 @@ -157,7 +157,7 @@ glabel update_obj_fake_item_box /* 10A95C 802A134C 00006812 */ mflo $t5 /* 10A960 802A1350 31A400FF */ andi $a0, $t5, 0xff /* 10A964 802A1354 0C032418 */ jal func_800C9060 -/* 10A968 802A1358 00000000 */ nop +/* 10A968 802A1358 00000000 */ nop /* 10A96C 802A135C 10000053 */ b .L802A14AC /* 10A970 802A1360 8FBF0024 */ lw $ra, 0x24($sp) .L802A1364: @@ -166,7 +166,7 @@ glabel update_obj_fake_item_box /* 10A97C 802A136C C6000008 */ lwc1 $f0, 8($s0) /* 10A980 802A1370 3C01802C */ lui $at, %hi(D_802B99D0) # $at, 0x802c /* 10A984 802A1374 460C003C */ c.lt.s $f0, $f12 -/* 10A988 802A1378 00000000 */ nop +/* 10A988 802A1378 00000000 */ nop /* 10A98C 802A137C 45020007 */ bc1fl .L802A139C /* 10A990 802A1380 4600603E */ c.le.s $f12, $f0 /* 10A994 802A1384 C42499D0 */ lwc1 $f4, %lo(D_802B99D0)($at) @@ -176,7 +176,7 @@ glabel update_obj_fake_item_box /* 10A9A4 802A1394 C6000008 */ lwc1 $f0, 8($s0) /* 10A9A8 802A1398 4600603E */ c.le.s $f12, $f0 .L802A139C: -/* 10A9AC 802A139C 00000000 */ nop +/* 10A9AC 802A139C 00000000 */ nop /* 10A9B0 802A13A0 45020004 */ bc1fl .L802A13B4 /* 10A9B4 802A13A4 3C0140B0 */ lui $at, 0x40b0 /* 10A9B8 802A13A8 E60C0008 */ swc1 $f12, 8($s0) @@ -190,7 +190,7 @@ glabel update_obj_fake_item_box /* 10A9D0 802A13C0 46080282 */ mul.s $f10, $f0, $f8 /* 10A9D4 802A13C4 3C01802C */ lui $at, %hi(D_802B99D4) # $at, 0x802c /* 10A9D8 802A13C8 4602603E */ c.le.s $f12, $f2 -/* 10A9DC 802A13CC 00000000 */ nop +/* 10A9DC 802A13CC 00000000 */ nop /* 10A9E0 802A13D0 45000003 */ bc1f .L802A13E0 /* 10A9E4 802A13D4 E60A000C */ swc1 $f10, 0xc($s0) /* 10A9E8 802A13D8 10000004 */ b .L802A13EC @@ -232,7 +232,7 @@ glabel update_obj_fake_item_box .L802A1450: /* 10AA60 802A1450 28410014 */ slti $at, $v0, 0x14 /* 10AA64 802A1454 10200003 */ beqz $at, .L802A1464 -/* 10AA68 802A1458 00000000 */ nop +/* 10AA68 802A1458 00000000 */ nop /* 10AA6C 802A145C 04410005 */ bgez $v0, .L802A1474 /* 10AA70 802A1460 244E0001 */ addiu $t6, $v0, 1 .L802A1464: @@ -261,4 +261,4 @@ glabel update_obj_fake_item_box /* 10AABC 802A14AC 8FB00020 */ lw $s0, 0x20($sp) /* 10AAC0 802A14B0 27BD0078 */ addiu $sp, $sp, 0x78 /* 10AAC4 802A14B4 03E00008 */ jr $ra -/* 10AAC8 802A14B8 00000000 */ nop +/* 10AAC8 802A14B8 00000000 */ nop diff --git a/asm/non_matchings/code_actors/update_obj_kiwano_fruit.s b/asm/non_matchings/code_actors/update_obj_kiwano_fruit.s index ac2632e0b..0257edd18 100644 --- a/asm/non_matchings/code_actors/update_obj_kiwano_fruit.s +++ b/asm/non_matchings/code_actors/update_obj_kiwano_fruit.s @@ -16,7 +16,7 @@ glabel update_obj_kiwano_fruit /* 1013A4 80297D94 00803025 */ move $a2, $a0 /* 1013A8 80297D98 33291000 */ andi $t1, $t9, 0x1000 /* 1013AC 80297D9C 15200004 */ bnez $t1, .L80297DB0 -/* 1013B0 80297DA0 00000000 */ nop +/* 1013B0 80297DA0 00000000 */ nop /* 1013B4 80297DA4 946A0114 */ lhu $t2, 0x114($v1) /* 1013B8 80297DA8 55400004 */ bnel $t2, $zero, .L80297DBC /* 1013BC 80297DAC 84C40006 */ lh $a0, 6($a2) @@ -31,9 +31,9 @@ glabel update_obj_kiwano_fruit /* 1013D8 80297DC8 10810013 */ beq $a0, $at, .L80297E18 /* 1013DC 80297DCC 24010002 */ li $at, 2 /* 1013E0 80297DD0 108100B2 */ beq $a0, $at, .L8029809C -/* 1013E4 80297DD4 00000000 */ nop +/* 1013E4 80297DD4 00000000 */ nop /* 1013E8 80297DD8 100000CE */ b .L80298114 -/* 1013EC 80297DDC 00000000 */ nop +/* 1013EC 80297DDC 00000000 */ nop /* 1013F0 80297DE0 9464011A */ lhu $a0, 0x11a($v1) .L80297DE4: /* 1013F4 80297DE4 AFA60028 */ sw $a2, 0x28($sp) @@ -50,8 +50,8 @@ glabel update_obj_kiwano_fruit /* 101420 80297E10 A4CC0006 */ sh $t4, 6($a2) /* 101424 80297E14 E4C40024 */ swc1 $f4, 0x24($a2) .L80297E18: -/* 101428 80297E18 3C0D800E */ lui $t5, %hi(D_800DC4DC) # $t5, 0x800e -/* 10142C 80297E1C 8DADC4DC */ lw $t5, %lo(D_800DC4DC)($t5) +/* 101428 80297E18 3C0D800E */ lui $t5, %hi(gPlayerOne) # $t5, 0x800e +/* 10142C 80297E1C 8DADC4DC */ lw $t5, %lo(gPlayerOne)($t5) /* 101430 80297E20 24010DD8 */ li $at, 3544 /* 101434 80297E24 3C048016 */ lui $a0, %hi(D_80164438) # 0x8016 /* 101438 80297E28 006D7023 */ subu $t6, $v1, $t5 @@ -100,8 +100,8 @@ glabel update_obj_kiwano_fruit /* 1014E4 80297ED4 46009303 */ div.s $f12, $f18, $f0 /* 1014E8 80297ED8 C7AE0018 */ lwc1 $f14, 0x18($sp) /* 1014EC 80297EDC 3C014000 */ li $at, 0x40000000 # 2.000000 -/* 1014F0 80297EE0 3C07800E */ lui $a3, %hi(D_800DC4DC) # $a3, 0x800e -/* 1014F4 80297EE4 24E7C4DC */ addiu $a3, %lo(D_800DC4DC) # addiu $a3, $a3, -0x3b24 +/* 1014F0 80297EE0 3C07800E */ lui $a3, %hi(gPlayerOne) # $a3, 0x800e +/* 1014F4 80297EE4 24E7C4DC */ addiu $a3, %lo(gPlayerOne) # addiu $a3, $a3, -0x3b24 /* 1014F8 80297EE8 24080DD8 */ li $t0, 3544 /* 1014FC 80297EEC 240E0002 */ li $t6, 2 /* 101500 80297EF0 460C1082 */ mul.s $f2, $f2, $f12 @@ -122,9 +122,9 @@ glabel update_obj_kiwano_fruit /* 10153C 80297F2C E4C80020 */ swc1 $f8, 0x20($a2) /* 101540 80297F30 C4C80024 */ lwc1 $f8, 0x24($a2) /* 101544 80297F34 4606403E */ c.le.s $f8, $f6 -/* 101548 80297F38 00000000 */ nop +/* 101548 80297F38 00000000 */ nop /* 10154C 80297F3C 45000055 */ bc1f .L80298094 -/* 101550 80297F40 00000000 */ nop +/* 101550 80297F40 00000000 */ nop /* 101554 80297F44 44815000 */ mtc1 $at, $f10 /* 101558 80297F48 44802000 */ mtc1 $zero, $f4 /* 10155C 80297F4C A4CE0006 */ sh $t6, 6($a2) @@ -147,14 +147,14 @@ glabel update_obj_kiwano_fruit /* 1015A0 80297F90 00002012 */ mflo $a0 /* 1015A4 80297F94 308900FF */ andi $t1, $a0, 0xff /* 1015A8 80297F98 15000002 */ bnez $t0, .L80297FA4 -/* 1015AC 80297F9C 00000000 */ nop +/* 1015AC 80297F9C 00000000 */ nop /* 1015B0 80297FA0 0007000D */ break 7 .L80297FA4: /* 1015B4 80297FA4 2401FFFF */ li $at, -1 /* 1015B8 80297FA8 15010004 */ bne $t0, $at, .L80297FBC /* 1015BC 80297FAC 3C018000 */ lui $at, 0x8000 /* 1015C0 80297FB0 17210002 */ bne $t9, $at, .L80297FBC -/* 1015C4 80297FB4 00000000 */ nop +/* 1015C4 80297FB4 00000000 */ nop /* 1015C8 80297FB8 0006000D */ break 6 .L80297FBC: /* 1015CC 80297FBC 01202025 */ move $a0, $t1 @@ -194,19 +194,19 @@ glabel update_obj_kiwano_fruit /* 101650 80298040 00002012 */ mflo $a0 /* 101654 80298044 308D00FF */ andi $t5, $a0, 0xff /* 101658 80298048 15000002 */ bnez $t0, .L80298054 -/* 10165C 8029804C 00000000 */ nop +/* 10165C 8029804C 00000000 */ nop /* 101660 80298050 0007000D */ break 7 .L80298054: /* 101664 80298054 2401FFFF */ li $at, -1 /* 101668 80298058 15010004 */ bne $t0, $at, .L8029806C /* 10166C 8029805C 3C018000 */ lui $at, 0x8000 /* 101670 80298060 15810002 */ bne $t4, $at, .L8029806C -/* 101674 80298064 00000000 */ nop +/* 101674 80298064 00000000 */ nop /* 101678 80298068 0006000D */ break 6 .L8029806C: /* 10167C 8029806C 01A02025 */ move $a0, $t5 /* 101680 80298070 0C032418 */ jal func_800C9060 -/* 101684 80298074 00000000 */ nop +/* 101684 80298074 00000000 */ nop /* 101688 80298078 3C0E800E */ lui $t6, %hi(gModeSelection) # $t6, 0x800e /* 10168C 8029807C 8DCEC53C */ lw $t6, %lo(gModeSelection)($t6) /* 101690 80298080 8FA60028 */ lw $a2, 0x28($sp) @@ -243,7 +243,7 @@ glabel update_obj_kiwano_fruit /* 101704 802980F4 E4C60008 */ swc1 $f6, 8($a2) /* 101708 802980F8 C4C80008 */ lwc1 $f8, 8($a2) /* 10170C 802980FC 460A403C */ c.lt.s $f8, $f10 -/* 101710 80298100 00000000 */ nop +/* 101710 80298100 00000000 */ nop /* 101714 80298104 45020003 */ bc1fl .L80298114 /* 101718 80298108 84C40006 */ lh $a0, 6($a2) /* 10171C 8029810C A4C00006 */ sh $zero, 6($a2) @@ -272,4 +272,4 @@ glabel update_obj_kiwano_fruit .L80298160: /* 101770 80298160 27BD0028 */ addiu $sp, $sp, 0x28 /* 101774 80298164 03E00008 */ jr $ra -/* 101778 80298168 00000000 */ nop +/* 101778 80298168 00000000 */ nop diff --git a/asm/non_matchings/crash_screen/thread9_crash_screen.s b/asm/non_matchings/crash_screen/thread9_crash_screen.s index 144d00be5..53d31514f 100644 --- a/asm/non_matchings/crash_screen/thread9_crash_screen.s +++ b/asm/non_matchings/crash_screen/thread9_crash_screen.s @@ -24,11 +24,11 @@ glabel thread9_crash_screen /* 005188 80004588 26102D60 */ addiu $s0, %lo(D_80162D60) # addiu $s0, $s0, 0x2d60 /* 00518C 8000458C 3C158016 */ lui $s5, %hi(pFramebuffer) # $s5, 0x8016 /* 005190 80004590 3C14800E */ lui $s4, %hi(D_800DC670) # $s4, 0x800e -/* 005194 80004594 3C12800E */ lui $s2, %hi(D_800DC4BC) # $s2, 0x800e +/* 005194 80004594 3C12800E */ lui $s2, %hi(gControllerOne) # $s2, 0x800e /* 005198 80004598 3C11800E */ lui $s1, %hi(D_800DC6FC) # $s1, 0x800e /* 00519C 8000459C AE000000 */ sw $zero, ($s0) /* 0051A0 800045A0 2631C6FC */ addiu $s1, %lo(D_800DC6FC) # addiu $s1, $s1, -0x3904 -/* 0051A4 800045A4 2652C4BC */ addiu $s2, %lo(D_800DC4BC) # addiu $s2, $s2, -0x3b44 +/* 0051A4 800045A4 2652C4BC */ addiu $s2, %lo(gControllerOne) # addiu $s2, $s2, -0x3b44 /* 0051A8 800045A8 2694C670 */ addiu $s4, %lo(D_800DC670) # addiu $s4, $s4, -0x3990 /* 0051AC 800045AC 26B52D5C */ addiu $s5, %lo(pFramebuffer) # addiu $s5, $s5, 0x2d5c /* 0051B0 800045B0 27B60044 */ addiu $s6, $sp, 0x44 @@ -40,7 +40,7 @@ glabel thread9_crash_screen /* 0051C0 800045C0 0C0335D4 */ jal osRecvMesg /* 0051C4 800045C4 24060001 */ li $a2, 1 /* 0051C8 800045C8 0C001131 */ jal get_faulted_thread -/* 0051CC 800045CC 00000000 */ nop +/* 0051CC 800045CC 00000000 */ nop /* 0051D0 800045D0 3C018016 */ lui $at, %hi(D_80162D64) # $at, 0x8016 /* 0051D4 800045D4 1040FFF8 */ beqz $v0, .L800045B8 /* 0051D8 800045D8 AC222D64 */ sw $v0, %lo(D_80162D64)($at) @@ -51,11 +51,11 @@ glabel thread9_crash_screen /* 0051EC 800045EC 8EA40000 */ lw $a0, ($s5) .L800045F0: /* 0051F0 800045F0 0C00028A */ jal read_controllers -/* 0051F4 800045F4 00000000 */ nop +/* 0051F4 800045F4 00000000 */ nop /* 0051F8 800045F8 8E4E0000 */ lw $t6, ($s2) /* 0051FC 800045FC 95C20006 */ lhu $v0, 6($t6) /* 005200 80004600 1040FFFB */ beqz $v0, .L800045F0 -/* 005204 80004604 00000000 */ nop +/* 005204 80004604 00000000 */ nop /* 005208 80004608 8E030000 */ lw $v1, ($s0) /* 00520C 8000460C 00037840 */ sll $t7, $v1, 1 /* 005210 80004610 022FC021 */ addu $t8, $s1, $t7 @@ -72,7 +72,7 @@ glabel thread9_crash_screen /* 005238 80004638 022A5821 */ addu $t3, $s1, $t2 /* 00523C 8000463C 956C0000 */ lhu $t4, ($t3) /* 005240 80004640 166CFFEB */ bne $s3, $t4, .L800045F0 -/* 005244 80004644 00000000 */ nop +/* 005244 80004644 00000000 */ nop /* 005248 80004648 3C058016 */ lui $a1, %hi(D_80162D64) # $a1, 0x8016 /* 00524C 8000464C 8CA52D64 */ lw $a1, %lo(D_80162D64)($a1) /* 005250 80004650 0C0010A6 */ jal crash_screen_draw_info @@ -85,9 +85,9 @@ glabel thread9_crash_screen /* 005268 80004668 244D0001 */ addiu $t5, $v0, 1 /* 00526C 8000466C 1000FFD2 */ b .L800045B8 /* 005270 80004670 AE8D0000 */ sw $t5, ($s4) -/* 005274 80004674 00000000 */ nop -/* 005278 80004678 00000000 */ nop -/* 00527C 8000467C 00000000 */ nop +/* 005274 80004674 00000000 */ nop +/* 005278 80004678 00000000 */ nop +/* 00527C 8000467C 00000000 */ nop /* 005280 80004680 8FBF0034 */ lw $ra, 0x34($sp) /* 005284 80004684 8FB00014 */ lw $s0, 0x14($sp) /* 005288 80004688 8FB10018 */ lw $s1, 0x18($sp) diff --git a/asm/non_matchings/staff_ghosts/func_8000599C.s b/asm/non_matchings/staff_ghosts/func_8000599C.s index c801d3f54..7a25b95ba 100644 --- a/asm/non_matchings/staff_ghosts/func_8000599C.s +++ b/asm/non_matchings/staff_ghosts/func_8000599C.s @@ -2,25 +2,25 @@ glabel func_8000599C /* 00659C 8000599C 3C098016 */ lui $t1, %hi(D_80162DB8) # $t1, 0x8016 /* 0065A0 800059A0 25292DB8 */ addiu $t1, %lo(D_80162DB8) # addiu $t1, $t1, 0x2db8 /* 0065A4 800059A4 85220000 */ lh $v0, ($t1) -/* 0065A8 800059A8 3C0E800E */ lui $t6, %hi(D_800DC4DC) # $t6, 0x800e +/* 0065A8 800059A8 3C0E800E */ lui $t6, %hi(gPlayerOne) # $t6, 0x800e /* 0065AC 800059AC 24190001 */ li $t9, 1 /* 0065B0 800059B0 28411000 */ slti $at, $v0, 0x1000 /* 0065B4 800059B4 10200008 */ beqz $at, .L800059D8 -/* 0065B8 800059B8 00000000 */ nop -/* 0065BC 800059BC 8DCEC4DC */ lw $t6, %lo(D_800DC4DC)($t6) +/* 0065B8 800059B8 00000000 */ nop +/* 0065BC 800059BC 8DCEC4DC */ lw $t6, %lo(gPlayerOne)($t6) /* 0065C0 800059C0 85C300CA */ lh $v1, 0xca($t6) /* 0065C4 800059C4 306F0002 */ andi $t7, $v1, 2 /* 0065C8 800059C8 15E00003 */ bnez $t7, .L800059D8 /* 0065CC 800059CC 30780008 */ andi $t8, $v1, 8 /* 0065D0 800059D0 13000004 */ beqz $t8, .L800059E4 -/* 0065D4 800059D4 3C04800E */ lui $a0, %hi(D_800DC4BC) # 0x800e +/* 0065D4 800059D4 3C04800E */ lui $a0, %hi(gControllerOne) # 0x800e .L800059D8: /* 0065D8 800059D8 3C018016 */ lui $at, %hi(D_80162DF8) # 0x8016 /* 0065DC 800059DC 03E00008 */ jr $ra /* 0065E0 800059E0 AC392DF8 */ sw $t9, %lo(D_80162DF8)($at) # 0x2df8($at) .L800059E4: -/* 0065E4 800059E4 8C84C4BC */ lw $a0, %lo(D_800DC4BC)($a0) # -0x3b44($a0) +/* 0065E4 800059E4 8C84C4BC */ lw $a0, %lo(gControllerOne)($a0) # -0x3b44($a0) /* 0065E8 800059E8 00003825 */ move $a3, $zero /* 0065EC 800059EC 00026080 */ sll $t4, $v0, 2 /* 0065F0 800059F0 84830000 */ lh $v1, ($a0) @@ -94,4 +94,4 @@ glabel func_8000599C /* 0066D8 80005AD8 00CE7821 */ addu $t7, $a2, $t6 /* 0066DC 80005ADC ADE70000 */ sw $a3, ($t7) /* 0066E0 80005AE0 03E00008 */ jr $ra -/* 0066E4 80005AE4 00000000 */ nop +/* 0066E4 80005AE4 00000000 */ nop diff --git a/asm/non_matchings/staff_ghosts/func_80005B18.s b/asm/non_matchings/staff_ghosts/func_80005B18.s index 8fdea790f..8798b4b3c 100644 --- a/asm/non_matchings/staff_ghosts/func_80005B18.s +++ b/asm/non_matchings/staff_ghosts/func_80005B18.s @@ -15,12 +15,12 @@ glabel func_80005B18 /* 00674C 80005B4C 8CAE0000 */ lw $t6, ($a1) /* 006750 80005B50 3C0F8016 */ lui $t7, %hi(D_80162DF8) # $t7, 0x8016 /* 006754 80005B54 15C0006E */ bnez $t6, .L80005D10 -/* 006758 80005B58 00000000 */ nop +/* 006758 80005B58 00000000 */ nop /* 00675C 80005B5C 8DEF2DF8 */ lw $t7, %lo(D_80162DF8)($t7) /* 006760 80005B60 3C078016 */ lui $a3, %hi(D_80162DD4) # $a3, 0x8016 /* 006764 80005B64 24E72DD4 */ addiu $a3, %lo(D_80162DD4) # addiu $a3, $a3, 0x2dd4 /* 006768 80005B68 106F0069 */ beq $v1, $t7, .L80005D10 -/* 00676C 80005B6C 00000000 */ nop +/* 00676C 80005B6C 00000000 */ nop /* 006770 80005B70 94F80000 */ lhu $t8, ($a3) /* 006774 80005B74 3C198016 */ lui $t9, %hi(D_80162DCC) # $t9, 0x8016 /* 006778 80005B78 54780023 */ bnel $v1, $t8, .L80005C08 @@ -36,26 +36,26 @@ glabel func_80005B18 /* 0067A0 80005BA0 24030001 */ li $v1, 1 /* 0067A4 80005BA4 A4E00000 */ sh $zero, ($a3) /* 0067A8 80005BA8 ACA30000 */ sw $v1, ($a1) -/* 0067AC 80005BAC 3C02800E */ lui $v0, %hi(D_800DC4DC) # $v0, 0x800e -/* 0067B0 80005BB0 8C42C4DC */ lw $v0, %lo(D_800DC4DC)($v0) +/* 0067AC 80005BAC 3C02800E */ lui $v0, %hi(gPlayerOne) # $v0, 0x800e +/* 0067B0 80005BB0 8C42C4DC */ lw $v0, %lo(gPlayerOne)($v0) /* 0067B4 80005BB4 3C018016 */ lui $at, %hi(D_80162DE0) # $at, 0x8016 /* 0067B8 80005BB8 3C0B8019 */ lui $t3, %hi(D_8018CA78) # $t3, 0x8019 /* 0067BC 80005BBC 94490254 */ lhu $t1, 0x254($v0) /* 0067C0 80005BC0 8D6BCA78 */ lw $t3, %lo(D_8018CA78)($t3) -/* 0067C4 80005BC4 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e +/* 0067C4 80005BC4 3C04800E */ lui $a0, %hi(gPlayerTwo) # $a0, 0x800e /* 0067C8 80005BC8 AC292DE0 */ sw $t1, %lo(D_80162DE0)($at) /* 0067CC 80005BCC 944A0254 */ lhu $t2, 0x254($v0) /* 0067D0 80005BD0 3C018016 */ lui $at, %hi(D_80162DE8) # $at, 0x8016 -/* 0067D4 80005BD4 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) +/* 0067D4 80005BD4 8C84C4E0 */ lw $a0, %lo(gPlayerTwo)($a0) /* 0067D8 80005BD8 AC2A2DE8 */ sw $t2, %lo(D_80162DE8)($at) /* 0067DC 80005BDC 3C018016 */ lui $at, %hi(D_80162E00) # $at, 0x8016 /* 0067E0 80005BE0 AC202E00 */ sw $zero, %lo(D_80162E00)($at) /* 0067E4 80005BE4 3C018016 */ lui $at, %hi(D_80162DFC) # $at, 0x8016 /* 0067E8 80005BE8 0C0016BA */ jal func_80005AE8 /* 0067EC 80005BEC AC2B2DFC */ sw $t3, %lo(D_80162DFC)($at) -/* 0067F0 80005BF0 3C04800E */ lui $a0, %hi(D_800DC4E4) # $a0, 0x800e +/* 0067F0 80005BF0 3C04800E */ lui $a0, %hi(gPlayerThree) # $a0, 0x800e /* 0067F4 80005BF4 0C0016BA */ jal func_80005AE8 -/* 0067F8 80005BF8 8C84C4E4 */ lw $a0, %lo(D_800DC4E4)($a0) +/* 0067F8 80005BF8 8C84C4E4 */ lw $a0, %lo(gPlayerThree)($a0) /* 0067FC 80005BFC 10000098 */ b .L80005E60 /* 006800 80005C00 8FBF0014 */ lw $ra, 0x14($sp) /* 006804 80005C04 8D0C0004 */ lw $t4, 4($t0) @@ -73,13 +73,13 @@ glabel func_80005B18 /* 006830 80005C30 24A52DDC */ addiu $a1, %lo(D_80162DDC) # addiu $a1, $a1, 0x2ddc /* 006834 80005C34 24030001 */ li $v1, 1 /* 006838 80005C38 ACA30000 */ sw $v1, ($a1) -/* 00683C 80005C3C 3C02800E */ lui $v0, %hi(D_800DC4DC) # $v0, 0x800e -/* 006840 80005C40 8C42C4DC */ lw $v0, %lo(D_800DC4DC)($v0) +/* 00683C 80005C3C 3C02800E */ lui $v0, %hi(gPlayerOne) # $v0, 0x800e +/* 006840 80005C40 8C42C4DC */ lw $v0, %lo(gPlayerOne)($v0) /* 006844 80005C44 3C0F8019 */ lui $t7, %hi(D_8018CA78) # $t7, 0x8019 /* 006848 80005C48 8DEFCA78 */ lw $t7, %lo(D_8018CA78)($t7) /* 00684C 80005C4C 944E0254 */ lhu $t6, 0x254($v0) /* 006850 80005C50 3C018016 */ lui $at, %hi(D_80162DE0) # $at, 0x8016 -/* 006854 80005C54 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e +/* 006854 80005C54 3C04800E */ lui $a0, %hi(gPlayerTwo) # $a0, 0x800e /* 006858 80005C58 AC2E2DE0 */ sw $t6, %lo(D_80162DE0)($at) /* 00685C 80005C5C 3C018016 */ lui $at, %hi(D_80162DFC) # $at, 0x8016 /* 006860 80005C60 AC2F2DFC */ sw $t7, %lo(D_80162DFC)($at) @@ -87,12 +87,12 @@ glabel func_80005B18 /* 006868 80005C68 AC202E00 */ sw $zero, %lo(D_80162E00)($at) /* 00686C 80005C6C 94580254 */ lhu $t8, 0x254($v0) /* 006870 80005C70 3C018016 */ lui $at, %hi(D_80162DE8) # $at, 0x8016 -/* 006874 80005C74 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) +/* 006874 80005C74 8C84C4E0 */ lw $a0, %lo(gPlayerTwo)($a0) /* 006878 80005C78 0C0016BA */ jal func_80005AE8 /* 00687C 80005C7C AC382DE8 */ sw $t8, %lo(D_80162DE8)($at) -/* 006880 80005C80 3C04800E */ lui $a0, %hi(D_800DC4E4) # $a0, 0x800e +/* 006880 80005C80 3C04800E */ lui $a0, %hi(gPlayerThree) # $a0, 0x800e /* 006884 80005C84 0C0016BA */ jal func_80005AE8 -/* 006888 80005C88 8C84C4E4 */ lw $a0, %lo(D_800DC4E4)($a0) +/* 006888 80005C88 8C84C4E4 */ lw $a0, %lo(gPlayerThree)($a0) /* 00688C 80005C8C 10000074 */ b .L80005E60 /* 006890 80005C90 8FBF0014 */ lw $ra, 0x14($sp) .L80005C94: @@ -107,24 +107,24 @@ glabel func_80005B18 /* 0068B4 80005CB4 3C0E8016 */ lui $t6, %hi(D_80162DCC) # $t6, 0x8016 /* 0068B8 80005CB8 8DCE2DCC */ lw $t6, %lo(D_80162DCC)($t6) /* 0068BC 80005CBC 3C018016 */ lui $at, %hi(D_80162D84) # $at, 0x8016 -/* 0068C0 80005CC0 3C0F800E */ lui $t7, %hi(D_800DC4DC) # $t7, 0x800e -/* 0068C4 80005CC4 8DEFC4DC */ lw $t7, %lo(D_800DC4DC)($t7) +/* 0068C0 80005CC0 3C0F800E */ lui $t7, %hi(gPlayerOne) # $t7, 0x800e +/* 0068C4 80005CC4 8DEFC4DC */ lw $t7, %lo(gPlayerOne)($t7) /* 0068C8 80005CC8 A42D2D84 */ sh $t5, %lo(D_80162D84)($at) /* 0068CC 80005CCC 3C018016 */ lui $at, %hi(D_80162DD0) # $at, 0x8016 /* 0068D0 80005CD0 AC2E2DD0 */ sw $t6, %lo(D_80162DD0)($at) /* 0068D4 80005CD4 95F80254 */ lhu $t8, 0x254($t7) /* 0068D8 80005CD8 3C018016 */ lui $at, %hi(D_80162DE8) # $at, 0x8016 -/* 0068DC 80005CDC 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e +/* 0068DC 80005CDC 3C04800E */ lui $a0, %hi(gPlayerTwo) # $a0, 0x800e /* 0068E0 80005CE0 AC382DE8 */ sw $t8, %lo(D_80162DE8)($at) /* 0068E4 80005CE4 3C018016 */ lui $at, %hi(D_80162DD8) # $at, 0x8016 /* 0068E8 80005CE8 A4202DD8 */ sh $zero, %lo(D_80162DD8)($at) /* 0068EC 80005CEC A4E00000 */ sh $zero, ($a3) /* 0068F0 80005CF0 ACA30000 */ sw $v1, ($a1) /* 0068F4 80005CF4 0C0016BA */ jal func_80005AE8 -/* 0068F8 80005CF8 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) -/* 0068FC 80005CFC 3C04800E */ lui $a0, %hi(D_800DC4E4) # $a0, 0x800e +/* 0068F8 80005CF8 8C84C4E0 */ lw $a0, %lo(gPlayerTwo)($a0) +/* 0068FC 80005CFC 3C04800E */ lui $a0, %hi(gPlayerThree) # $a0, 0x800e /* 006900 80005D00 0C0016BA */ jal func_80005AE8 -/* 006904 80005D04 8C84C4E4 */ lw $a0, %lo(D_800DC4E4)($a0) +/* 006904 80005D04 8C84C4E4 */ lw $a0, %lo(gPlayerThree)($a0) /* 006908 80005D08 10000055 */ b .L80005E60 /* 00690C 80005D0C 8FBF0014 */ lw $ra, 0x14($sp) .L80005D10: @@ -134,7 +134,7 @@ glabel func_80005B18 /* 00691C 80005D1C 8CB90000 */ lw $t9, ($a1) /* 006920 80005D20 3C098016 */ lui $t1, %hi(D_80162DF8) # $t1, 0x8016 /* 006924 80005D24 17200011 */ bnez $t9, .L80005D6C -/* 006928 80005D28 00000000 */ nop +/* 006928 80005D28 00000000 */ nop /* 00692C 80005D2C 8D292DF8 */ lw $t1, %lo(D_80162DF8)($t1) /* 006930 80005D30 3C0D802C */ lui $t5, %hi(D_802BFB80) # $t5, 0x802c /* 006934 80005D34 25ADFB80 */ addiu $t5, %lo(D_802BFB80) # addiu $t5, $t5, -0x480 @@ -152,8 +152,8 @@ glabel func_80005B18 /* 006964 80005D64 A42F2D84 */ sh $t7, %lo(D_80162D84)($at) /* 006968 80005D68 ACA30000 */ sw $v1, ($a1) .L80005D6C: -/* 00696C 80005D6C 3C18800E */ lui $t8, %hi(D_800DC4DC) # $t8, 0x800e -/* 006970 80005D70 8F18C4DC */ lw $t8, %lo(D_800DC4DC)($t8) +/* 00696C 80005D6C 3C18800E */ lui $t8, %hi(gPlayerOne) # $t8, 0x800e +/* 006970 80005D70 8F18C4DC */ lw $t8, %lo(gPlayerOne)($t8) /* 006974 80005D74 24010800 */ li $at, 2048 /* 006978 80005D78 3C028016 */ lui $v0, %hi(D_80162DEC) # $v0, 0x8016 /* 00697C 80005D7C 97190000 */ lhu $t9, ($t8) @@ -161,12 +161,12 @@ glabel func_80005B18 /* 006984 80005D84 33290800 */ andi $t1, $t9, 0x800 /* 006988 80005D88 5521000A */ bnel $t1, $at, .L80005DB4 /* 00698C 80005D8C 8C4A0000 */ lw $t2, ($v0) -/* 006990 80005D90 3C04800E */ lui $a0, %hi(D_800DC4E0) # $a0, 0x800e +/* 006990 80005D90 3C04800E */ lui $a0, %hi(gPlayerTwo) # $a0, 0x800e /* 006994 80005D94 0C0016BA */ jal func_80005AE8 -/* 006998 80005D98 8C84C4E0 */ lw $a0, %lo(D_800DC4E0)($a0) -/* 00699C 80005D9C 3C04800E */ lui $a0, %hi(D_800DC4E4) # $a0, 0x800e +/* 006998 80005D98 8C84C4E0 */ lw $a0, %lo(gPlayerTwo)($a0) +/* 00699C 80005D9C 3C04800E */ lui $a0, %hi(gPlayerThree) # $a0, 0x800e /* 0069A0 80005DA0 0C0016BA */ jal func_80005AE8 -/* 0069A4 80005DA4 8C84C4E4 */ lw $a0, %lo(D_800DC4E4)($a0) +/* 0069A4 80005DA4 8C84C4E4 */ lw $a0, %lo(gPlayerThree)($a0) /* 0069A8 80005DA8 1000002D */ b .L80005E60 /* 0069AC 80005DAC 8FBF0014 */ lw $ra, 0x14($sp) /* 0069B0 80005DB0 8C4A0000 */ lw $t2, ($v0) @@ -188,12 +188,12 @@ glabel func_80005B18 /* 0069E8 80005DE8 8FBF0014 */ lw $ra, 0x14($sp) /* 0069EC 80005DEC 94EF0000 */ lhu $t7, ($a3) /* 0069F0 80005DF0 15E00009 */ bnez $t7, .L80005E18 -/* 0069F4 80005DF4 00000000 */ nop +/* 0069F4 80005DF4 00000000 */ nop /* 0069F8 80005DF8 8D180004 */ lw $t8, 4($t0) /* 0069FC 80005DFC 10D80006 */ beq $a2, $t8, .L80005E18 -/* 006A00 80005E00 00000000 */ nop +/* 006A00 80005E00 00000000 */ nop /* 006A04 80005E04 0C0015F7 */ jal func_800057DC -/* 006A08 80005E08 00000000 */ nop +/* 006A08 80005E08 00000000 */ nop /* 006A0C 80005E0C 3C088016 */ lui $t0, %hi(lapCount) # $t0, 0x8016 /* 006A10 80005E10 25084390 */ addiu $t0, %lo(lapCount) # addiu $t0, $t0, 0x4390 /* 006A14 80005E14 24060003 */ li $a2, 3 @@ -201,24 +201,24 @@ glabel func_80005B18 /* 006A18 80005E18 3C198016 */ lui $t9, %hi(D_80162DD4+0x2) # $t9, 0x8016 /* 006A1C 80005E1C 97392DD6 */ lhu $t9, %lo(D_80162DD4+0x2)($t9) /* 006A20 80005E20 17200006 */ bnez $t9, .L80005E3C -/* 006A24 80005E24 00000000 */ nop +/* 006A24 80005E24 00000000 */ nop /* 006A28 80005E28 8D090008 */ lw $t1, 8($t0) /* 006A2C 80005E2C 10C90003 */ beq $a2, $t1, .L80005E3C -/* 006A30 80005E30 00000000 */ nop +/* 006A30 80005E30 00000000 */ nop /* 006A34 80005E34 0C001587 */ jal func_8000561C -/* 006A38 80005E38 00000000 */ nop +/* 006A38 80005E38 00000000 */ nop .L80005E3C: -/* 006A3C 80005E3C 3C0A800E */ lui $t2, %hi(D_800DC4DC) # $t2, 0x800e -/* 006A40 80005E40 8D4AC4DC */ lw $t2, %lo(D_800DC4DC)($t2) +/* 006A3C 80005E3C 3C0A800E */ lui $t2, %hi(gPlayerOne) # $t2, 0x800e +/* 006A40 80005E40 8D4AC4DC */ lw $t2, %lo(gPlayerOne)($t2) /* 006A44 80005E44 954B0000 */ lhu $t3, ($t2) /* 006A48 80005E48 316C0800 */ andi $t4, $t3, 0x800 /* 006A4C 80005E4C 55800004 */ bnel $t4, $zero, .L80005E60 /* 006A50 80005E50 8FBF0014 */ lw $ra, 0x14($sp) /* 006A54 80005E54 0C001667 */ jal func_8000599C -/* 006A58 80005E58 00000000 */ nop +/* 006A58 80005E58 00000000 */ nop .L80005E5C: /* 006A5C 80005E5C 8FBF0014 */ lw $ra, 0x14($sp) .L80005E60: /* 006A60 80005E60 27BD0018 */ addiu $sp, $sp, 0x18 /* 006A64 80005E64 03E00008 */ jr $ra -/* 006A68 80005E68 00000000 */ nop +/* 006A68 80005E68 00000000 */ nop diff --git a/data/data_credits_128480.s b/data/data_credits_128480.s index 09734860e..fa87ff11f 100644 --- a/data/data_credits_128480.s +++ b/data/data_credits_128480.s @@ -394,7 +394,7 @@ glabel D_80285940 .word 0x000AFE71, 0xFF00001E, 0x0000F1E0, 0x000CFE71 glabel D_80285A00 -.word D_800DC4DC, D_800DC4E0, D_800DC4E4, D_800DC4E8 +.word gPlayerOne, gPlayerTwo, gPlayerThree, gPlayerFour glabel D_80285A10 .word 0x00000000, 0x0000F33D, 0x002FFE5A, 0x00000000 diff --git a/include/variables.h b/include/variables.h index 6f4f243ef..4ab43e008 100644 --- a/include/variables.h +++ b/include/variables.h @@ -66,15 +66,15 @@ extern s16 D_80165580; extern s16 D_80165582; extern s8 D_800E86A8[4]; extern s16 D_80165270[8]; -extern Player* D_800DC4DC; -extern Player* D_800DC4E0; -extern Player* D_800DC4E4; -extern Player* D_800DC4E8; -extern Player* D_800DC4EC; -extern Player* D_800DC4F0; -extern Player* D_800DC4F4; -extern Player* D_800DC4F8; -extern Player* D_800DC4FC; +extern Player* gPlayerOne; +extern Player* gPlayerTwo; +extern Player* gPlayerThree; +extern Player* gPlayerFour; +extern Player* gPlayerFive; +extern Player* gPlayerSix; +extern Player* gPlayerSeven; +extern Player* gPlayerEight; +extern Player* gPlayerOneCopy; extern u16 D_800DC51C; extern s8 gDebugMenuSelection; //D_8018EDEF extern s32 D_80164A28; diff --git a/src/code_800029B0.c b/src/code_800029B0.c index e13fda595..07748f8a5 100644 --- a/src/code_800029B0.c +++ b/src/code_800029B0.c @@ -23,7 +23,7 @@ struct UnkStruct8015F8D0 { extern struct UnkStruct8015F8D0 D_8015F8D0; -extern struct Controller *D_800DC4BC[]; +extern struct Controller *gControllerOne[]; extern s32 D_800DC510; extern s16 D_8015F6FE; @@ -99,12 +99,12 @@ s32 gIsMirrorMode = 0; f32 D_800DC608 = 1.0f; Lights1 D_800DC610[] = { { - {175, 175, 175, 0, 175, 175, 175, 0}, + {175, 175, 175, 0, 175, 175, 175, 0}, {255, 255, 255, 0, 255, 255, 255, 0, 0, 0, 120, 0}, }, { - {115, 115, 115, 0, 115, 115, 115, 0}, + {115, 115, 115, 0, 115, 115, 115, 0}, {255, 255, 255, 0, 255, 255, 255, 0, 0, 0, 120, 0}, }, @@ -128,7 +128,7 @@ void func_800029B0(void) { } void func_80002A18(void) { - struct Controller *temp_v0; + struct Controller *controller; int tmp; gPlayerCountSelection1 = D_8018EDF3; @@ -189,14 +189,14 @@ void func_80002A18(void) { func_800CB2C4(); } - temp_v0 = *D_800DC4BC; + controller = *gControllerOne; - for (tmp = 0; tmp < 7; tmp++, temp_v0++){ - temp_v0->rawStickX = 0; - temp_v0->rawStickY = 0; - temp_v0->buttonPressed = 0; - temp_v0->buttonDepressed = 0; - temp_v0->button = 0; + for (tmp = 0; tmp < 7; tmp++, controller++){ + controller->rawStickX = 0; + controller->rawStickY = 0; + controller->buttonPressed = 0; + controller->buttonDepressed = 0; + controller->button = 0; } } diff --git a/src/code_80005FD0.c b/src/code_80005FD0.c index 4caa337fc..5c1a9b377 100644 --- a/src/code_80005FD0.c +++ b/src/code_80005FD0.c @@ -163,7 +163,7 @@ s32 func_800061DC(void *arg0, f32 arg1, s32 arg2) { phi_v1_10 = arg2; if (D_800DC51C == 0) { temp_v0_2 = D_8018EDF3; - phi_a0 = D_800DC4DC; + phi_a0 = gPlayerOne; if (temp_v0_2 > 0) { do { temp_a2 = phi_a0->unk_000; @@ -5488,7 +5488,7 @@ void func_8000DF8C(s32 arg0, f32 arg1, s32 arg2, s32 arg3) { if ((sp4C != 0) && (sp4C != 4)) { if (gCurrentCourseId == 0x14) { if (D_8016347E == 1) { - temp_v0 = D_800DC4E8; + temp_v0 = gPlayerFour; temp_f0 = temp_f22 - temp_v0->unk14; temp_f2 = temp_f20 - temp_v0->unk18; temp_f12 = temp_f24 - temp_v0->unk1C; @@ -6533,7 +6533,7 @@ void func_8000F628(void) { *phi_t0 = 0; *phi_t1 = 0; temp_v0 = gCurrentCourseId; - sp104 = phi_s7 + D_800DC4DC; + sp104 = phi_s7 + gPlayerOne; phi_v0 = temp_v0; if (temp_v0 < 0x14) { spD8 = phi_ra; @@ -8042,7 +8042,7 @@ void func_80011E38(s32 arg0) { u16 temp_v0; temp_v0 = *(&D_801632E8 + (arg0 * 2)); - temp_a1 = &D_800DC4DC[arg0]; + temp_a1 = &gPlayerOne[arg0]; if (temp_v0 != 0) { if (temp_v0 != 1) { if (temp_v0 != 2) { @@ -10170,7 +10170,7 @@ void func_80015314(s32 arg0, ? arg1, s32 arg2) { Player *temp_a1; void *temp_a0; - temp_a1 = &D_800DC4DC[arg0]; + temp_a1 = &gPlayerOne[arg0]; temp_a0 = camera1 + (arg2 * 0xB8); temp_a0->unk2C = temp_a1->unk_02E; func_80015390(temp_a0, temp_a1, 0, arg0); @@ -10201,7 +10201,7 @@ void func_80015390(void *arg0, ? arg1, ? arg2) { s32 temp_v0_2; s16 phi_a2; - temp_s1 = &D_800DC4DC[arg0->unkAE]; + temp_s1 = &gPlayerOne[arg0->unkAE]; temp_v0 = temp_s1->unk_078; if (temp_v0 == 0) { phi_a2 = 0x64; @@ -10367,7 +10367,7 @@ void func_8001577C(void *arg0, ? arg1, ? arg2, s32 arg3) { sp3C = temp_t1; sp74 = temp_v1; sp44 = temp_a1; - temp_s2 = &D_800DC4DC[temp_v1]; + temp_s2 = &gPlayerOne[temp_v1]; *temp_t0 = func_8000D33C(arg0->unk0, arg0->unk4, temp_a1, arg0->unk8, *temp_t0, temp_a1); temp_t2 = *(&D_80164438 + temp_t1); temp_t3 = *temp_t0; @@ -10568,7 +10568,7 @@ void func_80015C94(void *arg0, ? arg1, ? arg2, s32 arg3) { temp_t1 = *(&D_801645B0 + temp_s1); temp_v0 = arg3 * 2; temp_a1 = temp_v0 + &D_80164668; - spA0 = &D_800DC4DC[temp_v1]; + spA0 = &gPlayerOne[temp_v1]; sp58 = temp_a1; sp5C = temp_v0; sp9C = temp_v1; @@ -11359,7 +11359,7 @@ void func_800188F4(void *arg0, ? arg1, ? arg2, s32 arg3) { f32 *phi_v1; f32 phi_f18; - spA0 = D_800DC4DC; + spA0 = gPlayerOne; temp_a1 = arg0->unkAE; temp_v0 = temp_a1 * 2; temp_t7 = *(&D_801645B0 + temp_v0); @@ -11653,7 +11653,7 @@ void func_8001933C(void *arg0, ? arg1, ? arg2, s32 arg3) { sp3C = temp_t2; sp7C = temp_v1; sp48 = temp_a1; - temp_s2 = &D_800DC4DC[temp_v1]; + temp_s2 = &gPlayerOne[temp_v1]; *temp_t0 = func_8000D33C(arg0->unk0, arg0->unk4, temp_a1, arg0->unk8, *temp_t0, 0); temp_t3 = *temp_t0; sp96 = temp_t3; @@ -12141,7 +12141,7 @@ void func_80019FB4(s32 arg0) { struct Controller *temp_v0; s32 phi_v1; - temp_v0 = &D_800DC4BC[arg0]; + temp_v0 = &gControllerOne[arg0]; temp_v1 = arg0 * 4; temp_a1 = temp_v1 + &D_801645D0; phi_v1 = temp_v1; @@ -12765,7 +12765,7 @@ void func_8001AC10(s32 playerId, s32 *arg2) { s32 phi_v1; s16 phi_v0; - temp_t9 = (playerId * 0xDD8) + D_800DC4DC; + temp_t9 = (playerId * 0xDD8) + gPlayerOne; sp2C = temp_t9; if ((gModeSelection != TIME_TRIALS) && (D_801646CC != 1) && ((*temp_t9 & 0x800) == 0)) { temp_s0 = (playerId * 0x10) + &D_801642D8; @@ -13242,7 +13242,7 @@ void func_8001BE78(void) { phi_v0 = &D_80163410; phi_fp = &D_80164590; do { - temp_s1 = phi_s5 + D_800DC4DC; + temp_s1 = phi_s5 + gPlayerOne; temp_s1->unk0 = temp_s1->unk0 & 0xDFFF; *phi_s6 = phi_s2; phi_s4->unkC = 0.0f; diff --git a/src/code_8001C4D0.c b/src/code_8001C4D0.c index af8aa649d..cc098b1b3 100644 --- a/src/code_8001C4D0.c +++ b/src/code_8001C4D0.c @@ -17,9 +17,9 @@ Camera *camera4 = &cameras[3]; //s32 test; -extern Player *D_800DC4E0; -extern Player *D_800DC4E4; -extern Player *D_800DC4E8; +extern Player *gPlayerTwo; +extern Player *gPlayerThree; +extern Player *gPlayerFour; #ifdef MIPS_TO_C @@ -113,7 +113,7 @@ void func_8001C4D0(f32 x, f32 y, f32 z, s16 rot, u32 arg4, s32 cameraId) { *(&D_80164498 + temp_t6_2) = 0.0f; cameras[cameraId].unk24_and_a_half = 0; cameras[cameraId].unk22 = 0.0f; - temp_v1 = D_800DC4DC + (cameraId * 0xDD8); + temp_v1 = gPlayerOne + (cameraId * 0xDD8); cameras[cameraId].unk2C = temp_v1->unk2E; cameras[cameraId].unk28 = temp_v1->unk2E; temp_v0 = D_800DC52C; @@ -233,13 +233,13 @@ void func_8001CA10(Camera *camera) { void func_8001CA24(Player *arg0, f32 arg1) { Camera *camera = &cameras[0]; - if (arg0 == D_800DC4E0) { + if (arg0 == gPlayerTwo) { camera += 1; } - if (arg0 == D_800DC4E4) { + if (arg0 == gPlayerThree) { camera += 2; } - if (arg0 == D_800DC4E8) { + if (arg0 == gPlayerFour) { camera += 3; } camera->unk24_and_a_half = 0; @@ -1318,7 +1318,7 @@ void func_8001EE98(void *arg0, s32 arg1, s8 arg2) { *sp2C = 1; phi_v1 = 1; } - } else if (((D_800DC4DC->unk_000 & PLAYER_CINEMATIC_MODE) == PLAYER_CINEMATIC_MODE) || (D_800DC51C == 1)) { + } else if (((gPlayerOne->unk_000 & PLAYER_CINEMATIC_MODE) == PLAYER_CINEMATIC_MODE) || (D_800DC51C == 1)) { D_80152300.unk0 = 3; *(&D_80152300 + 2) = 3; *(&D_80152300 + 4) = 3; @@ -1412,16 +1412,16 @@ void func_8001F394(Player *player, f32 *arg1) { f32 phi_f2; f32 phi_f0; - if (player == D_800DC4DC) { + if (player == gPlayerOne) { playerId = 0; } - if (player == D_800DC4E0) { + if (player == gPlayerTwo) { playerId = 1; } - if (player == D_800DC4E4) { + if (player == gPlayerThree) { playerId = 2; } - if (player == D_800DC4E8) { + if (player == gPlayerFour) { playerId = 3; } temp_t3 = playerId * 4; @@ -1581,7 +1581,7 @@ void func_8001F87C(s32 arg0) { s32 phi_a1; if (D_800DC52C == 0) { - phi_a2 = D_800DC4DC; + phi_a2 = gPlayerOne; phi_a1 = 0; if (gModeSelection == GRAND_PRIX) { loop_3: diff --git a/src/code_8001F980.c b/src/code_8001F980.c index 1298bd10a..cc479a7dd 100644 --- a/src/code_8001F980.c +++ b/src/code_8001F980.c @@ -42,7 +42,7 @@ GLOBAL_ASM("asm/non_matchings/code_8001F980/func_8001F980.s") //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 ? func_8001F980(s32 *, s32 *); // extern s32 func_8001FB0C(void *, s32, f32, f32); // extern -? func_80027D00(); // extern +? get_player_index_for_player(); // extern void func_8001F9E4(void *arg0, s32 arg1, s8 arg2) { s32 sp30; @@ -54,7 +54,7 @@ void func_8001F9E4(void *arg0, s32 arg1, s8 arg2) { s32 temp_v1; u16 temp_t3; - func_80027D00(); + get_player_index_for_player(); func_8001F980(&sp30, &sp2C); temp_t6 = arg2 * 4; temp_v1 = 2 << temp_t6; @@ -384,15 +384,15 @@ void func_80020524(void) { temp_v1 = D_80164AC0; temp_v0 = D_80164AB0; func_80027560(D_80164AD0, temp_v0, temp_v1, temp_v1, *(&D_801651D0[temp_v1] + (temp_v0 * 2))); - func_8006E5AC(D_800DC4FC, 0, 0); - func_8006E5AC(D_800DC4E0, 1, 0); - func_8006E5AC(D_800DC4E4, 2, 0); - func_8006E5AC(D_800DC4E8, 3, 0); + func_8006E5AC(gPlayerOneCopy, 0, 0); + func_8006E5AC(gPlayerTwo, 1, 0); + func_8006E5AC(gPlayerThree, 2, 0); + func_8006E5AC(gPlayerFour, 3, 0); if (D_800DC52C != 3) { - func_8006E5AC(D_800DC4EC, 4, 0); - func_8006E5AC(D_800DC4F0, 5, 0); - func_8006E5AC(D_800DC4F4, 6, 0); - func_8006E5AC(D_800DC4F8, 7, 0); + func_8006E5AC(gPlayerFive, 4, 0); + func_8006E5AC(gPlayerSix, 5, 0); + func_8006E5AC(gPlayerSeven, 6, 0); + func_8006E5AC(gPlayerEight, 7, 0); } osRecvMesg(&gDmaMesgQueue, &gMainReceivedMesg, 1); phi_s0 = 1; @@ -457,15 +457,15 @@ void func_8002088C(void) { temp_v1 = D_80164AC0; temp_v0 = D_80164AB0; func_80027560(D_80164AD0, temp_v0, temp_v1, temp_v1, *(&D_801651D0[temp_v1] + (temp_v0 * 2))); - func_8006E634(D_800DC4FC, 0, 1); - func_8006E634(D_800DC4E0, 1, 1); - func_8006E634(D_800DC4E4, 2, 1); - func_8006E634(D_800DC4E8, 3, 1); + func_8006E634(gPlayerOneCopy, 0, 1); + func_8006E634(gPlayerTwo, 1, 1); + func_8006E634(gPlayerThree, 2, 1); + func_8006E634(gPlayerFour, 3, 1); if (D_800DC52C != 3) { - func_8006E634(D_800DC4EC, 4, 1); - func_8006E634(D_800DC4F0, 5, 1); - func_8006E634(D_800DC4F4, 6, 1); - func_8006E634(D_800DC4F8, 7, 1); + func_8006E634(gPlayerFive, 4, 1); + func_8006E634(gPlayerSix, 5, 1); + func_8006E634(gPlayerSeven, 6, 1); + func_8006E634(gPlayerEight, 7, 1); } osRecvMesg(&gDmaMesgQueue, &gMainReceivedMesg, 1); phi_s0 = 1; @@ -530,10 +530,10 @@ void func_80020BF4(void) { temp_v0 = D_80164AC0; temp_v1 = D_80164AB0; func_80027560(D_80164AD0, temp_v1 + 4, temp_v0, temp_v0 - 2, *(&D_801651D0[temp_v0] + (temp_v1 * 2))); - func_8006E6BC(D_800DC4FC, 0, 2); - func_8006E6BC(D_800DC4E0, 1, 2); - func_8006E6BC(D_800DC4E4, 2, 2); - func_8006E6BC(D_800DC4E8, 3, 2); + func_8006E6BC(gPlayerOneCopy, 0, 2); + func_8006E6BC(gPlayerTwo, 1, 2); + func_8006E6BC(gPlayerThree, 2, 2); + func_8006E6BC(gPlayerFour, 3, 2); osRecvMesg(&gDmaMesgQueue, &gMainReceivedMesg, 1); phi_s0 = 1; if (D_800DDB58 >= 2) { @@ -597,10 +597,10 @@ void func_80020F1C(void) { temp_v0 = D_80164AC0; temp_v1 = D_80164AB0; func_80027560(D_80164AD0, temp_v1 + 4, temp_v0, temp_v0 - 2, *(&D_801651D0[temp_v0] + (temp_v1 * 2))); - func_8006E744(D_800DC4FC, 0, 3); - func_8006E744(D_800DC4E0, 1, 3); - func_8006E744(D_800DC4E4, 2, 3); - func_8006E744(D_800DC4E8, 3, 3); + func_8006E744(gPlayerOneCopy, 0, 3); + func_8006E744(gPlayerTwo, 1, 3); + func_8006E744(gPlayerThree, 2, 3); + func_8006E744(gPlayerFour, 3, 3); osRecvMesg(&gDmaMesgQueue, &gMainReceivedMesg, 1); phi_s0 = 1; if (D_800DDB58 >= 2) { @@ -679,38 +679,38 @@ void func_800212B4(void) { sp1C.unk18 = D_800DDB88.unk18; sp1C.unk1C = D_800DDB88.unk1C; D_800DDB58 = 0; - func_80020000(D_800DC4FC, camera1, 0, 0); - func_80020000(D_800DC4E0, camera1, 1, 0); - func_80020000(D_800DC4E4, camera1, 2, 0); - func_80020000(D_800DC4E8, camera1, 3, 0); + func_80020000(gPlayerOneCopy, camera1, 0, 0); + func_80020000(gPlayerTwo, camera1, 1, 0); + func_80020000(gPlayerThree, camera1, 2, 0); + func_80020000(gPlayerFour, camera1, 3, 0); if (D_800DC52C != 3) { - func_80020000(D_800DC4EC, camera1, 4, 0); - func_80020000(D_800DC4F0, camera1, 5, 0); - func_80020000(D_800DC4F4, camera1, 6, 0); - func_80020000(D_800DC4F8, camera1, 7, 0); + func_80020000(gPlayerFive, camera1, 4, 0); + func_80020000(gPlayerSix, camera1, 5, 0); + func_80020000(gPlayerSeven, camera1, 6, 0); + func_80020000(gPlayerEight, camera1, 7, 0); } - func_80021244(D_800DC4DC, 0, 0); - func_80021244(D_800DC4E0, 1, 0); - func_80021244(D_800DC4E4, 2, 0); - func_80021244(D_800DC4E8, 3, 0); + func_80021244(gPlayerOne, 0, 0); + func_80021244(gPlayerTwo, 1, 0); + func_80021244(gPlayerThree, 2, 0); + func_80021244(gPlayerFour, 3, 0); if (D_800DC52C != 3) { - func_80021244(D_800DC4EC, 4, 0); - func_80021244(D_800DC4F0, 5, 0); - func_80021244(D_800DC4F4, 6, 0); - func_80021244(D_800DC4F8, 7, 0); + func_80021244(gPlayerFive, 4, 0); + func_80021244(gPlayerSix, 5, 0); + func_80021244(gPlayerSeven, 6, 0); + func_80021244(gPlayerEight, 7, 0); } if (D_800DDB58 != 0) { - func_80020524(&D_800DC4FC, 0, 0); + func_80020524(&gPlayerOneCopy, 0, 0); } else { - func_8006E5AC(D_800DC4FC, 0, 0); - func_8006E5AC(D_800DC4E0, 1, 0); - func_8006E5AC(D_800DC4E4, 2, 0); - func_8006E5AC(D_800DC4E8, 3, 0); + func_8006E5AC(gPlayerOneCopy, 0, 0); + func_8006E5AC(gPlayerTwo, 1, 0); + func_8006E5AC(gPlayerThree, 2, 0); + func_8006E5AC(gPlayerFour, 3, 0); if (D_800DC52C != 3) { - func_8006E5AC(D_800DC4EC, 4, 0); - func_8006E5AC(D_800DC4F0, 5, 0); - func_8006E5AC(D_800DC4F4, 6, 0); - func_8006E5AC(D_800DC4F8, 7, 0); + func_8006E5AC(gPlayerFive, 4, 0); + func_8006E5AC(gPlayerSix, 5, 0); + func_8006E5AC(gPlayerSeven, 6, 0); + func_8006E5AC(gPlayerEight, 7, 0); } } D_800DDB58 = 0; @@ -729,38 +729,38 @@ extern s32 D_800DDB58; void func_800215DC(void) { D_800DDB58 = 0; - func_80020000(D_800DC4FC, camera2, 0, 1); - func_80020000(D_800DC4E0, camera2, 1, 1); - func_80020000(D_800DC4E4, camera2, 2, 1); - func_80020000(D_800DC4E8, camera2, 3, 1); + func_80020000(gPlayerOneCopy, camera2, 0, 1); + func_80020000(gPlayerTwo, camera2, 1, 1); + func_80020000(gPlayerThree, camera2, 2, 1); + func_80020000(gPlayerFour, camera2, 3, 1); if (D_800DC52C != 3) { - func_80020000(D_800DC4EC, camera2, 4, 1); - func_80020000(D_800DC4F0, camera2, 5, 1); - func_80020000(D_800DC4F4, camera2, 6, 1); - func_80020000(D_800DC4F8, camera2, 7, 1); + func_80020000(gPlayerFive, camera2, 4, 1); + func_80020000(gPlayerSix, camera2, 5, 1); + func_80020000(gPlayerSeven, camera2, 6, 1); + func_80020000(gPlayerEight, camera2, 7, 1); } - func_80021244(D_800DC4DC, 0, 1); - func_80021244(D_800DC4E0, 1, 1); - func_80021244(D_800DC4E4, 2, 1); - func_80021244(D_800DC4E8, 3, 1); + func_80021244(gPlayerOne, 0, 1); + func_80021244(gPlayerTwo, 1, 1); + func_80021244(gPlayerThree, 2, 1); + func_80021244(gPlayerFour, 3, 1); if (D_800DC52C != 3) { - func_80021244(D_800DC4EC, 4, 1); - func_80021244(D_800DC4F0, 5, 1); - func_80021244(D_800DC4F4, 6, 1); - func_80021244(D_800DC4F8, 7, 1); + func_80021244(gPlayerFive, 4, 1); + func_80021244(gPlayerSix, 5, 1); + func_80021244(gPlayerSeven, 6, 1); + func_80021244(gPlayerEight, 7, 1); } if (D_800DDB58 != 0) { - func_8002088C(&D_800DC4FC, 0, 1); + func_8002088C(&gPlayerOneCopy, 0, 1); } else { - func_8006E634(D_800DC4FC, 0, 1); - func_8006E634(D_800DC4E0, 1, 1); - func_8006E634(D_800DC4E4, 2, 1); - func_8006E634(D_800DC4E8, 3, 1); + func_8006E634(gPlayerOneCopy, 0, 1); + func_8006E634(gPlayerTwo, 1, 1); + func_8006E634(gPlayerThree, 2, 1); + func_8006E634(gPlayerFour, 3, 1); if (D_800DC52C != 3) { - func_8006E634(D_800DC4EC, 4, 1); - func_8006E634(D_800DC4F0, 5, 1); - func_8006E634(D_800DC4F4, 6, 1); - func_8006E634(D_800DC4F8, 7, 1); + func_8006E634(gPlayerFive, 4, 1); + func_8006E634(gPlayerSix, 5, 1); + func_8006E634(gPlayerSeven, 6, 1); + func_8006E634(gPlayerEight, 7, 1); } } D_800DDB58 = 0; @@ -779,21 +779,21 @@ extern s32 D_800DDB58; void func_8002186C(void) { D_800DDB58 = 0; - func_80020000(D_800DC4FC, camera3, 0, 2); - func_80020000(D_800DC4E0, camera3, 1, 2); - func_80020000(D_800DC4E4, camera3, 2, 2); - func_80020000(D_800DC4E8, camera3, 3, 2); - func_80021244(D_800DC4DC, 0, 2); - func_80021244(D_800DC4E0, 1, 2); - func_80021244(D_800DC4E4, 2, 2); - func_80021244(D_800DC4E8, 3, 2); + func_80020000(gPlayerOneCopy, camera3, 0, 2); + func_80020000(gPlayerTwo, camera3, 1, 2); + func_80020000(gPlayerThree, camera3, 2, 2); + func_80020000(gPlayerFour, camera3, 3, 2); + func_80021244(gPlayerOne, 0, 2); + func_80021244(gPlayerTwo, 1, 2); + func_80021244(gPlayerThree, 2, 2); + func_80021244(gPlayerFour, 3, 2); if (D_800DDB58 != 0) { - func_80020BF4(&D_800DC4FC, 0, 2); + func_80020BF4(&gPlayerOneCopy, 0, 2); } else { - func_8006E6BC(D_800DC4FC, 0, 2); - func_8006E6BC(D_800DC4E0, 1, 2); - func_8006E6BC(D_800DC4E4, 2, 2); - func_8006E6BC(D_800DC4E8, 3, 2); + func_8006E6BC(gPlayerOneCopy, 0, 2); + func_8006E6BC(gPlayerTwo, 1, 2); + func_8006E6BC(gPlayerThree, 2, 2); + func_8006E6BC(gPlayerFour, 3, 2); } D_800DDB58 = 0; } @@ -811,21 +811,21 @@ extern s32 D_800DDB58; void func_800219BC(void) { D_800DDB58 = 0; - func_80020000(D_800DC4FC, camera4, 0, 3); - func_80020000(D_800DC4E0, camera4, 1, 3); - func_80020000(D_800DC4E4, camera4, 2, 3); - func_80020000(D_800DC4E8, camera4, 3, 3); - func_80021244(D_800DC4DC, 0, 3); - func_80021244(D_800DC4E0, 1, 3); - func_80021244(D_800DC4E4, 2, 3); - func_80021244(D_800DC4E8, 3, 3); + func_80020000(gPlayerOneCopy, camera4, 0, 3); + func_80020000(gPlayerTwo, camera4, 1, 3); + func_80020000(gPlayerThree, camera4, 2, 3); + func_80020000(gPlayerFour, camera4, 3, 3); + func_80021244(gPlayerOne, 0, 3); + func_80021244(gPlayerTwo, 1, 3); + func_80021244(gPlayerThree, 2, 3); + func_80021244(gPlayerFour, 3, 3); if (D_800DDB58 != 0) { - func_80020F1C(&D_800DC4FC, 0, 3); + func_80020F1C(&gPlayerOneCopy, 0, 3); } else { - func_8006E744(D_800DC4FC, 0, 3); - func_8006E744(D_800DC4E0, 1, 3); - func_8006E744(D_800DC4E4, 2, 3); - func_8006E744(D_800DC4E8, 3, 3); + func_8006E744(gPlayerOneCopy, 0, 3); + func_8006E744(gPlayerTwo, 1, 3); + func_8006E744(gPlayerThree, 2, 3); + func_8006E744(gPlayerFour, 3, 3); } D_800DDB58 = 0; } @@ -844,30 +844,30 @@ void func_80021B0C(void) { Player *temp_a0_3; Player *temp_a0_4; - func_8006E7CC(D_800DC4FC, 0, 0); - func_8006E7CC(D_800DC4E0, 1, 0); - func_8006E7CC(D_800DC4E4, 2, 0); - func_8006E7CC(D_800DC4E8, 3, 0); + func_8006E7CC(gPlayerOneCopy, 0, 0); + func_8006E7CC(gPlayerTwo, 1, 0); + func_8006E7CC(gPlayerThree, 2, 0); + func_8006E7CC(gPlayerFour, 3, 0); if (D_800DC52C != 3) { - func_8006E7CC(D_800DC4EC, 4, 0); - func_8006E7CC(D_800DC4F0, 5, 0); - func_8006E7CC(D_800DC4F4, 6, 0); - func_8006E7CC(D_800DC4F8, 7, 0); + func_8006E7CC(gPlayerFive, 4, 0); + func_8006E7CC(gPlayerSix, 5, 0); + func_8006E7CC(gPlayerSeven, 6, 0); + func_8006E7CC(gPlayerEight, 7, 0); } if (D_800DC50C == ENDING_SEQUENCE) { - temp_a0 = D_800DC4DC; + temp_a0 = gPlayerOne; if ((temp_a0->unk_044 & 0x2000) != 0) { func_80024374(temp_a0, 0, 0); } - temp_a0_2 = D_800DC4E0; + temp_a0_2 = gPlayerTwo; if ((temp_a0_2->unk_044 & 0x2000) != 0) { func_80024374(temp_a0_2, 1, 0); } - temp_a0_3 = D_800DC4E4; + temp_a0_3 = gPlayerThree; if ((temp_a0_3->unk_044 & 0x2000) != 0) { func_80024374(temp_a0_3, 2, 0); } - temp_a0_4 = D_800DC4E8; + temp_a0_4 = gPlayerFour; if ((temp_a0_4->unk_044 & 0x2000) != 0) { func_80024374(temp_a0_4, 3, 0); } @@ -882,15 +882,15 @@ GLOBAL_ASM("asm/non_matchings/code_8001F980/func_80021B0C.s") ? func_8006E848(Player *, ?, ?); // extern void func_80021C78(void) { - func_8006E848(D_800DC4FC, 0, 1); - func_8006E848(D_800DC4E0, 1, 1); - func_8006E848(D_800DC4E4, 2, 1); - func_8006E848(D_800DC4E8, 3, 1); + func_8006E848(gPlayerOneCopy, 0, 1); + func_8006E848(gPlayerTwo, 1, 1); + func_8006E848(gPlayerThree, 2, 1); + func_8006E848(gPlayerFour, 3, 1); if (D_800DC52C != 3) { - func_8006E848(D_800DC4EC, 4, 1); - func_8006E848(D_800DC4F0, 5, 1); - func_8006E848(D_800DC4F4, 6, 1); - func_8006E848(D_800DC4F8, 7, 1); + func_8006E848(gPlayerFive, 4, 1); + func_8006E848(gPlayerSix, 5, 1); + func_8006E848(gPlayerSeven, 6, 1); + func_8006E848(gPlayerEight, 7, 1); } } #else @@ -902,10 +902,10 @@ GLOBAL_ASM("asm/non_matchings/code_8001F980/func_80021C78.s") ? func_8006E8C4(Player *, ?, ?); // extern void func_80021D40(void) { - func_8006E8C4(D_800DC4FC, 0, 2); - func_8006E8C4(D_800DC4E0, 1, 2); - func_8006E8C4(D_800DC4E4, 2, 2); - func_8006E8C4(D_800DC4E8, 3, 2); + func_8006E8C4(gPlayerOneCopy, 0, 2); + func_8006E8C4(gPlayerTwo, 1, 2); + func_8006E8C4(gPlayerThree, 2, 2); + func_8006E8C4(gPlayerFour, 3, 2); } #else GLOBAL_ASM("asm/non_matchings/code_8001F980/func_80021D40.s") @@ -916,10 +916,10 @@ GLOBAL_ASM("asm/non_matchings/code_8001F980/func_80021D40.s") ? func_8006E940(Player *, ?, ?); // extern void func_80021DA8(void) { - func_8006E940(D_800DC4FC, 0, 3); - func_8006E940(D_800DC4E0, 1, 3); - func_8006E940(D_800DC4E4, 2, 3); - func_8006E940(D_800DC4E8, 3, 3); + func_8006E940(gPlayerOneCopy, 0, 3); + func_8006E940(gPlayerTwo, 1, 3); + func_8006E940(gPlayerThree, 2, 3); + func_8006E940(gPlayerFour, 3, 3); } #else GLOBAL_ASM("asm/non_matchings/code_8001F980/func_80021DA8.s") @@ -1154,11 +1154,11 @@ void func_8002276C(void) { } temp_v0_2 = gModeSelection; if ((temp_v0_2 == VERSUS) || (temp_v0_2 == BATTLE)) { - func_80022A98(D_800DC4DC, 0); - func_80022A98(D_800DC4E0, 1); - func_80022A98(D_800DC4E4, 2); + func_80022A98(gPlayerOne, 0); + func_80022A98(gPlayerTwo, 1); + func_80022A98(gPlayerThree, 2); if (gPlayerCountSelection1 == 4) { - func_80022A98(D_800DC4E8, 3); + func_80022A98(gPlayerFour, 3); } } // Duplicate return node #31. Try simplifying control flow for better match @@ -1170,21 +1170,21 @@ void func_8002276C(void) { if ((temp_v0_3 != VERSUS) && (temp_v0_3 != BATTLE)) { return; } - func_80022A98(D_800DC4DC, 0); - func_80022A98(D_800DC4E0, 1); + func_80022A98(gPlayerOne, 0); + func_80022A98(gPlayerTwo, 1); return; } - func_80022A98(D_800DC4DC, 0); + func_80022A98(gPlayerOne, 0); return; } - func_80022A98(D_800DC4DC, 0); - func_80022A98(D_800DC4E0, 1); - func_80022A98(D_800DC4E4, 2); - func_80022A98(D_800DC4E8, 3); - func_80022A98(D_800DC4EC, 4); - func_80022A98(D_800DC4F0, 5); - func_80022A98(D_800DC4F4, 6); - func_80022A98(D_800DC4F8, 7); + func_80022A98(gPlayerOne, 0); + func_80022A98(gPlayerTwo, 1); + func_80022A98(gPlayerThree, 2); + func_80022A98(gPlayerFour, 3); + func_80022A98(gPlayerFive, 4); + func_80022A98(gPlayerSix, 5); + func_80022A98(gPlayerSeven, 6); + func_80022A98(gPlayerEight, 7); return; } temp_v0_4 = gModeSelection; @@ -1193,41 +1193,41 @@ void func_8002276C(void) { if ((temp_v0_4 != VERSUS) && (temp_v0_4 != BATTLE)) { return; } - func_80022A98(D_800DC4DC, 0); - func_80022A98(D_800DC4E0, 1); + func_80022A98(gPlayerOne, 0); + func_80022A98(gPlayerTwo, 1); temp_v0_5 = gPlayerCountSelection1; phi_v0 = temp_v0_5; if (temp_v0_5 >= 3) { - func_80022A98(D_800DC4E4, 2); + func_80022A98(gPlayerThree, 2); phi_v0 = gPlayerCountSelection1; } if (phi_v0 == 4) { - func_80022A98(D_800DC4E8, 3); + func_80022A98(gPlayerFour, 3); return; } // Duplicate return node #31. Try simplifying control flow for better match return; } - func_80022A98(D_800DC4DC, 0); - temp_a0 = D_800DC4E0; + func_80022A98(gPlayerOne, 0); + temp_a0 = gPlayerTwo; if ((temp_a0->unk_000 & PLAYER_INVISIBLE_OR_BOMB) == PLAYER_INVISIBLE_OR_BOMB) { func_80022A98(temp_a0, 1); } - temp_a0_2 = D_800DC4E4; + temp_a0_2 = gPlayerThree; if ((temp_a0_2->unk_000 & PLAYER_INVISIBLE_OR_BOMB) == PLAYER_INVISIBLE_OR_BOMB) { func_80022A98(temp_a0_2, 2); return; } return; } - func_80022A98(D_800DC4DC, 0); - func_80022A98(D_800DC4E0, 1); - func_80022A98(D_800DC4E4, 2); - func_80022A98(D_800DC4E8, 3); - func_80022A98(D_800DC4EC, 4); - func_80022A98(D_800DC4F0, 5); - func_80022A98(D_800DC4F4, 6); - func_80022A98(D_800DC4F8, 7); + func_80022A98(gPlayerOne, 0); + func_80022A98(gPlayerTwo, 1); + func_80022A98(gPlayerThree, 2); + func_80022A98(gPlayerFour, 3); + func_80022A98(gPlayerFive, 4); + func_80022A98(gPlayerSix, 5); + func_80022A98(gPlayerSeven, 6); + func_80022A98(gPlayerEight, 7); } #else GLOBAL_ASM("asm/non_matchings/code_8001F980/func_8002276C.s") @@ -1632,7 +1632,7 @@ void func_800235AC(void *arg0, s8 arg1) { s32 phi_v0_6; s32 phi_v0_7; - if (((arg0->unk0 & 0x100) == 0x100) && (arg0 == D_800DC4E4)) { + if (((arg0->unk0 & 0x100) == 0x100) && (arg0 == gPlayerThree)) { func_80022F14(arg1, 0x1C0000, 0x3E99999A); func_80023038(arg0, arg1, 0xE0, 0x3E99999A); *(&D_80164B80 + (arg1 * 4)) = 0; diff --git a/src/code_80027D00.c b/src/code_80027D00.c index 53ad862dd..ea6d34d2f 100644 --- a/src/code_80027D00.c +++ b/src/code_80027D00.c @@ -3,46 +3,47 @@ #include #include -extern Player *D_800DC4DC; -extern Player *D_800DC4E0; -extern Player *D_800DC4E4; -extern Player *D_800DC4E8; -extern Player *D_800DC4EC; -extern Player *D_800DC4F0; -extern Player *D_800DC4F4; -extern Player *D_800DC4F8; -extern Player *D_800DC4FC; +extern Player *gPlayerOne; +extern Player *gPlayerTwo; +extern Player *gPlayerThree; +extern Player *gPlayerFour; +extern Player *gPlayerFive; +extern Player *gPlayerSix; +extern Player *gPlayerSeven; +extern Player *gPlayerEight; +extern Player *gPlayerOneCopy; extern Camera *camera1; -s32 func_80027D00(Player *arg0) { - s32 phi_v1; +// func_80027D00 +s32 get_player_index_for_player(Player *player) { + s32 index; - if (arg0 == D_800DC4DC) { - phi_v1 = 0; + if (player == gPlayerOne) { + index = 0; } - if (arg0 == D_800DC4E0) { - phi_v1 = 1; + if (player == gPlayerTwo) { + index = 1; } - if (arg0 == D_800DC4E4) { - phi_v1 = 2; + if (player == gPlayerThree) { + index = 2; } - if (arg0 == D_800DC4E8) { - phi_v1 = 3; + if (player == gPlayerFour) { + index = 3; } - if (arg0 == D_800DC4EC) { - phi_v1 = 4; + if (player == gPlayerFive) { + index = 4; } - if (arg0 == D_800DC4F0) { - phi_v1 = 5; + if (player == gPlayerSix) { + index = 5; } - if (arg0 == D_800DC4F4) { - phi_v1 = 6; + if (player == gPlayerSeven) { + index = 6; } - if (arg0 == D_800DC4F8) { - phi_v1 = 7; + if (player == gPlayerEight) { + index = 7; } - return phi_v1; + return index; } #ifdef MIPS_TO_C @@ -80,7 +81,7 @@ void func_80027DA8(u16 *arg0, s8 arg1) { } temp_v0_2 = *temp_a2; if ((temp_v0_2 & 0x10) != 0x10) { - if ((D_8018D168 == 1) && (temp_a2 == D_800DC4DC)) { + if ((D_8018D168 == 1) && (temp_a2 == gPlayerOne)) { arg0 = temp_a2; func_800C94A4(arg1 & 0xFF, arg1, temp_a2); *arg0 = *arg0 | 0x10; @@ -767,26 +768,26 @@ extern s16 D_80164AF0; void func_80028F70(void) { D_80164AF0 = 0; - func_80028E70(D_800DC4FC, camera1, 0, 0); - func_80028E70(D_800DC4E0, camera1, 1, 0); - func_80028E70(D_800DC4E4, camera1, 2, 0); - func_80028E70(D_800DC4E8, camera1, 3, 0); - func_80028E70(D_800DC4EC, camera1, 4, 0); - func_80028E70(D_800DC4F0, camera1, 5, 0); - func_80028E70(D_800DC4F4, camera1, 6, 0); - func_80028E70(D_800DC4F8, camera1, 7, 0); + func_80028E70(gPlayerOneCopy, camera1, 0, 0); + func_80028E70(gPlayerTwo, camera1, 1, 0); + func_80028E70(gPlayerThree, camera1, 2, 0); + func_80028E70(gPlayerFour, camera1, 3, 0); + func_80028E70(gPlayerFive, camera1, 4, 0); + func_80028E70(gPlayerSix, camera1, 5, 0); + func_80028E70(gPlayerSeven, camera1, 6, 0); + func_80028E70(gPlayerEight, camera1, 7, 0); } void func_80029060(void) { D_80164AF0 = 0; - func_80028E70(D_800DC4FC, camera1, 0, 0); - func_80028E70(D_800DC4E0, camera1, 1, 0); - func_80028E70(D_800DC4E4, camera1, 2, 0); - func_80028E70(D_800DC4E8, camera1, 3, 0); - func_80028E70(D_800DC4EC, camera1, 4, 0); - func_80028E70(D_800DC4F0, camera1, 5, 0); - func_80028E70(D_800DC4F4, camera1, 6, 0); - func_80028E70(D_800DC4F8, camera1, 7, 0); + func_80028E70(gPlayerOneCopy, camera1, 0, 0); + func_80028E70(gPlayerTwo, camera1, 1, 0); + func_80028E70(gPlayerThree, camera1, 2, 0); + func_80028E70(gPlayerFour, camera1, 3, 0); + func_80028E70(gPlayerFive, camera1, 4, 0); + func_80028E70(gPlayerSix, camera1, 5, 0); + func_80028E70(gPlayerSeven, camera1, 6, 0); + func_80028E70(gPlayerEight, camera1, 7, 0); } void func_80029150(void) { @@ -795,10 +796,10 @@ void func_80029150(void) { void func_80029158(void) { D_80164AF0 = 0; - func_80028E70(D_800DC4FC, camera1, 0, 0); - func_80028E70(D_800DC4E0, camera1, 1, 0); - func_80028E70(D_800DC4E4, camera1, 2, 0); - func_80028E70(D_800DC4E8, camera1, 3, 0); + func_80028E70(gPlayerOneCopy, camera1, 0, 0); + func_80028E70(gPlayerTwo, camera1, 1, 0); + func_80028E70(gPlayerThree, camera1, 2, 0); + func_80028E70(gPlayerFour, camera1, 3, 0); } void func_800291E8(void) { @@ -1425,7 +1426,7 @@ void func_8002A79C(void *arg0, s8 arg1) { // Duplicate return node #12. Try simplifying control flow for better match return; } - if (arg0 == D_800DC4DC) { + if (arg0 == gPlayerOne) { func_800C9250(arg1 & 0xFF, arg1, 0x100); return; } @@ -2233,7 +2234,7 @@ void func_8002BF4C(void *arg0, u8 arg1) { arg0->unkBC = arg0->unkBC & 0xFFDFFFFF; return; } - phi_s0 = D_800DC4DC; + phi_s0 = gPlayerOne; phi_s1 = 0; if ((arg0->unkBC & 0x200000) == 0x200000) { arg0->unkE2 = arg0->unkE2 - 1; @@ -3410,7 +3411,7 @@ GLOBAL_ASM("asm/non_matchings/code_80027D00/func_8002D268.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -s32 func_80027D00(); // extern +s32 get_player_index_for_player(); // extern void func_8002E4C4(void *arg0) { s32 sp1C; @@ -3418,7 +3419,7 @@ void func_8002E4C4(void *arg0) { f32 temp_f2; s32 temp_v0; - temp_v0 = func_80027D00(); + temp_v0 = get_player_index_for_player(); sp1C = temp_v0; arg0->unkF0 = 0.0f; arg0->unkF4 = 0.0f; @@ -4655,29 +4656,29 @@ void func_80030C34(s32 arg0) { s32 phi_v0; s32 phi_a2; - if (arg0 == D_800DC4DC) { + if (arg0 == gPlayerOne) { sp4 = 0; } phi_v0 = sp4; - if (arg0 == D_800DC4E0) { + if (arg0 == gPlayerTwo) { phi_v0 = 1; } - if (arg0 == D_800DC4E4) { + if (arg0 == gPlayerThree) { phi_v0 = 2; } - if (arg0 == D_800DC4E8) { + if (arg0 == gPlayerFour) { phi_v0 = 3; } - if (arg0 == D_800DC4EC) { + if (arg0 == gPlayerFive) { phi_v0 = 4; } - if (arg0 == D_800DC4F0) { + if (arg0 == gPlayerSix) { phi_v0 = 5; } - if (arg0 == D_800DC4F4) { + if (arg0 == gPlayerSeven) { phi_v0 = 6; } - if (arg0 == D_800DC4F8) { + if (arg0 == gPlayerEight) { phi_v0 = 7; } temp_a0 = &D_80165460[phi_v0]; @@ -4747,29 +4748,29 @@ void func_80030E00(s32 arg0) { s32 phi_v0; s32 phi_a2; - if (arg0 == D_800DC4DC) { + if (arg0 == gPlayerOne) { sp4 = 0; } phi_v0 = sp4; - if (arg0 == D_800DC4E0) { + if (arg0 == gPlayerTwo) { phi_v0 = 1; } - if (arg0 == D_800DC4E4) { + if (arg0 == gPlayerThree) { phi_v0 = 2; } - if (arg0 == D_800DC4E8) { + if (arg0 == gPlayerFour) { phi_v0 = 3; } - if (arg0 == D_800DC4EC) { + if (arg0 == gPlayerFive) { phi_v0 = 4; } - if (arg0 == D_800DC4F0) { + if (arg0 == gPlayerSix) { phi_v0 = 5; } - if (arg0 == D_800DC4F4) { + if (arg0 == gPlayerSeven) { phi_v0 = 6; } - if (arg0 == D_800DC4F8) { + if (arg0 == gPlayerEight) { phi_v0 = 7; } temp_a0 = &D_80165460[phi_v0]; @@ -4824,7 +4825,7 @@ GLOBAL_ASM("asm/non_matchings/code_80027D00/func_80030E00.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -s8 func_80027D00(); // extern +s8 get_player_index_for_player(); // extern ? func_8008F104(f32, f64, void *, s8); // extern extern f64 D_800ED9D8; extern f64 D_800ED9E0; @@ -4943,7 +4944,7 @@ void func_80030FC8(void *arg0) { f32 phi_f12_3; f64 phi_f14; - temp_v0 = func_80027D00(); + temp_v0 = get_player_index_for_player(); temp_a0 = arg0; if (D_80165460[temp_v0] == 0) { temp_f0 = temp_a0->unk9C; @@ -5163,7 +5164,7 @@ GLOBAL_ASM("asm/non_matchings/code_80027D00/func_80030FC8.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -s8 func_80027D00(); // extern +s8 get_player_index_for_player(); // extern ? func_8008F104(void *, s8); // extern extern f64 D_800EDAF8; @@ -5174,7 +5175,7 @@ void func_80031F48(void *arg0, f32 arg1) { void *temp_a0; temp_a0 = arg0; - temp_a1 = func_80027D00(); + temp_a1 = get_player_index_for_player(); temp_a0->unk9C = temp_a0->unk9C - arg1; if (temp_a0->unk9C <= 0.0f) { temp_a0->unk9C = 0.0f; @@ -5218,29 +5219,29 @@ void func_80032050(s32 arg0) { s32 phi_v0; s32 phi_a2; - if (arg0 == D_800DC4DC) { + if (arg0 == gPlayerOne) { sp4 = 0; } phi_v0 = sp4; - if (arg0 == D_800DC4E0) { + if (arg0 == gPlayerTwo) { phi_v0 = 1; } - if (arg0 == D_800DC4E4) { + if (arg0 == gPlayerThree) { phi_v0 = 2; } - if (arg0 == D_800DC4E8) { + if (arg0 == gPlayerFour) { phi_v0 = 3; } - if (arg0 == D_800DC4EC) { + if (arg0 == gPlayerFive) { phi_v0 = 4; } - if (arg0 == D_800DC4F0) { + if (arg0 == gPlayerSix) { phi_v0 = 5; } - if (arg0 == D_800DC4F4) { + if (arg0 == gPlayerSeven) { phi_v0 = 6; } - if (arg0 == D_800DC4F8) { + if (arg0 == gPlayerEight) { phi_v0 = 7; } temp_a0 = &D_80165520[phi_v0]; @@ -5310,29 +5311,29 @@ void func_8003221C(s32 arg0) { s32 phi_v0; s32 phi_a2; - if (arg0 == D_800DC4DC) { + if (arg0 == gPlayerOne) { sp4 = 0; } phi_v0 = sp4; - if (arg0 == D_800DC4E0) { + if (arg0 == gPlayerTwo) { phi_v0 = 1; } - if (arg0 == D_800DC4E4) { + if (arg0 == gPlayerThree) { phi_v0 = 2; } - if (arg0 == D_800DC4E8) { + if (arg0 == gPlayerFour) { phi_v0 = 3; } - if (arg0 == D_800DC4EC) { + if (arg0 == gPlayerFive) { phi_v0 = 4; } - if (arg0 == D_800DC4F0) { + if (arg0 == gPlayerSix) { phi_v0 = 5; } - if (arg0 == D_800DC4F4) { + if (arg0 == gPlayerSeven) { phi_v0 = 6; } - if (arg0 == D_800DC4F8) { + if (arg0 == gPlayerEight) { phi_v0 = 7; } temp_a0 = &D_80165520[phi_v0]; @@ -5405,29 +5406,29 @@ void func_800323E4(void *arg0) { f32 phi_f2_2; phi_f2_2 = 0.0f; - if (arg0 == D_800DC4DC) { + if (arg0 == gPlayerOne) { sp24 = 0; } phi_v1 = sp24; - if (arg0 == D_800DC4E0) { + if (arg0 == gPlayerTwo) { phi_v1 = 1; } - if (arg0 == D_800DC4E4) { + if (arg0 == gPlayerThree) { phi_v1 = 2; } - if (arg0 == D_800DC4E8) { + if (arg0 == gPlayerFour) { phi_v1 = 3; } - if (arg0 == D_800DC4EC) { + if (arg0 == gPlayerFive) { phi_v1 = 4; } - if (arg0 == D_800DC4F0) { + if (arg0 == gPlayerSix) { phi_v1 = 5; } - if (arg0 == D_800DC4F4) { + if (arg0 == gPlayerSeven) { phi_v1 = 6; } - if (arg0 == D_800DC4F8) { + if (arg0 == gPlayerEight) { phi_v1 = 7; } temp_t5 = arg0->unkBC | 1; @@ -5481,7 +5482,7 @@ GLOBAL_ASM("asm/non_matchings/code_80027D00/func_800323E4.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -s32 func_80027D00(); // extern +s32 get_player_index_for_player(); // extern extern f64 D_800EDB10; extern f64 D_800EDB18; extern f64 D_800EDB20; @@ -5599,7 +5600,7 @@ void func_80032700(void *arg0) { if (gModeSelection == TIME_TRIALS) { phi_v0 = 0x14; } - if (((gRaceFrameCounter - D_801652E0[func_80027D00()]) < phi_v0) && ((arg0->unk44 & 0x20) != 0x20)) { + if (((gRaceFrameCounter - D_801652E0[get_player_index_for_player()]) < phi_v0) && ((arg0->unk44 & 0x20) != 0x20)) { arg0->unkC = arg0->unkC | 0x2000000; } else if ((arg0->unk214 * D_800EDB90) <= arg0->unk9C) { temp_v0 = arg0->unkC; @@ -5653,7 +5654,7 @@ GLOBAL_ASM("asm/non_matchings/code_80027D00/func_80032CB0.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80027D00(); // extern +? get_player_index_for_player(); // extern extern f64 D_800EDBA8; extern f64 D_800EDBB0; extern f64 D_800EDBB8; @@ -5709,7 +5710,7 @@ void func_80032D94(void *arg0) { f32 phi_f12; f32 phi_f12_2; - func_80027D00(); + get_player_index_for_player(); temp_f0 = arg0->unk9C; phi_f0 = temp_f0; if ((temp_f0 >= 0.0) && (temp_f0 < (arg0->unk214 * D_800EDBA8))) { @@ -7460,12 +7461,12 @@ GLOBAL_ASM("asm/non_matchings/code_80027D00/func_800381AC.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 ? func_800381AC(Player *, struct Controller *, ?); // extern -extern struct Controller *D_800DC4C0; -extern struct Controller *D_800DC4C4; -extern struct Controller *D_800DC4C8; -extern struct Controller *D_800DC4D0; -extern struct Controller *D_800DC4D4; -extern struct Controller *D_800DC4D8; +extern struct Controller *gControllerTwo; +extern struct Controller *gControllerThree; +extern struct Controller *gControllerFour; +extern struct Controller *gControllerSix; +extern struct Controller *gControllerSeven; +extern struct Controller *gControllerEight; void func_800382DC(void) { Player *temp_a0; @@ -7486,17 +7487,17 @@ void func_800382DC(void) { if (temp_v0 != 3) { return; } - func_800381AC(D_800DC4DC, D_800DC4BC, 0); - func_800381AC(D_800DC4E0, D_800DC4C0, 1); - func_800381AC(D_800DC4E4, D_800DC4C4, 2); + func_800381AC(gPlayerOne, gControllerOne, 0); + func_800381AC(gPlayerTwo, gControllerTwo, 1); + func_800381AC(gPlayerThree, gControllerThree, 2); if (gPlayerCountSelection1 == 4) { - func_800381AC(D_800DC4E8, D_800DC4C8, 3); + func_800381AC(gPlayerFour, gControllerFour, 3); } // Duplicate return node #27. Try simplifying control flow for better match return; } - func_800381AC(D_800DC4DC, D_800DC4BC, 0); - func_800381AC(D_800DC4E0, D_800DC4C0, 1); + func_800381AC(gPlayerOne, gControllerOne, 0); + func_800381AC(gPlayerTwo, gControllerTwo, 1); return; } temp_v0_2 = gModeSelection; @@ -7505,39 +7506,39 @@ void func_800382DC(void) { return; } if (D_8015F890 != 1) { - func_800381AC(D_800DC4DC, D_800DC4BC, 0); - temp_a0 = D_800DC4E0; + func_800381AC(gPlayerOne, gControllerOne, 0); + temp_a0 = gPlayerTwo; temp_v0_3 = temp_a0->unk_000; if (((temp_v0_3 & 0x100) == 0x100) && ((temp_v0_3 & 0x800) != 0x800)) { - func_800381AC(temp_a0, D_800DC4D0, 1); + func_800381AC(temp_a0, gControllerSix, 1); } - temp_a0_2 = D_800DC4E4; + temp_a0_2 = gPlayerThree; temp_v0_4 = temp_a0_2->unk_000; if (((temp_v0_4 & 0x100) == 0x100) && ((temp_v0_4 & 0x800) != 0x800)) { - func_800381AC(temp_a0_2, D_800DC4D4, 2); + func_800381AC(temp_a0_2, gControllerSeven, 2); return; } // Duplicate return node #27. Try simplifying control flow for better match return; } - temp_a0_3 = D_800DC4DC; + temp_a0_3 = gPlayerOne; if ((temp_a0_3->unk_000 & 0x800) != 0x800) { - func_800381AC(temp_a0_3, D_800DC4D8, 0); + func_800381AC(temp_a0_3, gControllerEight, 0); } - temp_a0_4 = D_800DC4E0; + temp_a0_4 = gPlayerTwo; temp_v0_5 = temp_a0_4->unk_000; if (((temp_v0_5 & 0x100) == 0x100) && ((temp_v0_5 & 0x800) != 0x800)) { - func_800381AC(temp_a0_4, D_800DC4D0, 1); + func_800381AC(temp_a0_4, gControllerSix, 1); } - temp_a0_5 = D_800DC4E4; + temp_a0_5 = gPlayerThree; temp_v0_6 = temp_a0_5->unk_000; if (((temp_v0_6 & 0x100) == 0x100) && ((temp_v0_6 & 0x800) != 0x800)) { - func_800381AC(temp_a0_5, D_800DC4D4, 2); + func_800381AC(temp_a0_5, gControllerSeven, 2); return; } return; } - func_800381AC(D_800DC4DC, D_800DC4BC, 0); + func_800381AC(gPlayerOne, gControllerOne, 0); } #else GLOBAL_ASM("asm/non_matchings/code_80027D00/func_800382DC.s") diff --git a/src/code_800393C0.c b/src/code_800393C0.c index 340a4b2d7..704ffb24c 100644 --- a/src/code_800393C0.c +++ b/src/code_800393C0.c @@ -445,62 +445,62 @@ void func_80039F44(f32 *arg0, f32 *arg1, f32 arg2) { D_8016556E = 0; if (D_800DC51C == 1) { - spawn_player(D_800DC4FC, 0, arg0[D_80165270[0]], arg1[D_80165270[0]], arg2, 32768.0f, D_800E86A8[0], PLAYER_HUMAN_AND_CPU); - spawn_player(D_800DC4E0, 1, arg0[D_80165270[1]], arg1[D_80165270[1]], arg2, 32768.0f, D_80165560[0], PLAYER_EXISTS | PLAYER_CPU | PLAYER_START_SEQUENCE); - spawn_player(D_800DC4E4, 2, arg0[D_80165270[2]], arg1[D_80165270[2]], arg2, 32768.0f, D_80165560[1], PLAYER_EXISTS | PLAYER_CPU | PLAYER_START_SEQUENCE); - spawn_player(D_800DC4E8, 3, arg0[D_80165270[3]], arg1[D_80165270[3]], arg2, 32768.0f, D_80165560[2], PLAYER_EXISTS | PLAYER_CPU | PLAYER_START_SEQUENCE); - spawn_player(D_800DC4EC, 4, arg0[D_80165270[4]], arg1[D_80165270[4]], arg2, 32768.0f, D_80165560[3], PLAYER_EXISTS | PLAYER_CPU | PLAYER_START_SEQUENCE); - spawn_player(D_800DC4F0, 5, arg0[D_80165270[5]], arg1[D_80165270[5]], arg2, 32768.0f, D_80165560[4], PLAYER_EXISTS | PLAYER_CPU | PLAYER_START_SEQUENCE); - spawn_player(D_800DC4F4, 6, arg0[D_80165270[6]], arg1[D_80165270[6]], arg2, 32768.0f, D_80165560[5], PLAYER_EXISTS | PLAYER_CPU | PLAYER_START_SEQUENCE); - spawn_player(D_800DC4F8, 7, arg0[D_80165270[7]], arg1[D_80165270[7]], arg2, 32768.0f, D_80165560[6], PLAYER_EXISTS | PLAYER_CPU | PLAYER_START_SEQUENCE); + spawn_player(gPlayerOneCopy, 0, arg0[D_80165270[0]], arg1[D_80165270[0]], arg2, 32768.0f, D_800E86A8[0], PLAYER_HUMAN_AND_CPU); + spawn_player(gPlayerTwo, 1, arg0[D_80165270[1]], arg1[D_80165270[1]], arg2, 32768.0f, D_80165560[0], PLAYER_EXISTS | PLAYER_CPU | PLAYER_START_SEQUENCE); + spawn_player(gPlayerThree, 2, arg0[D_80165270[2]], arg1[D_80165270[2]], arg2, 32768.0f, D_80165560[1], PLAYER_EXISTS | PLAYER_CPU | PLAYER_START_SEQUENCE); + spawn_player(gPlayerFour, 3, arg0[D_80165270[3]], arg1[D_80165270[3]], arg2, 32768.0f, D_80165560[2], PLAYER_EXISTS | PLAYER_CPU | PLAYER_START_SEQUENCE); + spawn_player(gPlayerFive, 4, arg0[D_80165270[4]], arg1[D_80165270[4]], arg2, 32768.0f, D_80165560[3], PLAYER_EXISTS | PLAYER_CPU | PLAYER_START_SEQUENCE); + spawn_player(gPlayerSix, 5, arg0[D_80165270[5]], arg1[D_80165270[5]], arg2, 32768.0f, D_80165560[4], PLAYER_EXISTS | PLAYER_CPU | PLAYER_START_SEQUENCE); + spawn_player(gPlayerSeven, 6, arg0[D_80165270[6]], arg1[D_80165270[6]], arg2, 32768.0f, D_80165560[5], PLAYER_EXISTS | PLAYER_CPU | PLAYER_START_SEQUENCE); + spawn_player(gPlayerEight, 7, arg0[D_80165270[7]], arg1[D_80165270[7]], arg2, 32768.0f, D_80165560[6], PLAYER_EXISTS | PLAYER_CPU | PLAYER_START_SEQUENCE); D_80164A28 = 0; } else { - spawn_player(D_800DC4FC, 0, arg0[D_80165270[0]], arg1[D_80165270[0]] + 250.0f, arg2, 32768.0f, D_800E86A8[0], PLAYER_EXISTS | PLAYER_STAGING | PLAYER_START_SEQUENCE | PLAYER_HUMAN); - spawn_player(D_800DC4E0, 1, arg0[D_80165270[1]], arg1[D_80165270[1]] + 250.0f, arg2, 32768.0f, D_80165560[0], PLAYER_EXISTS | PLAYER_STAGING | PLAYER_START_SEQUENCE | PLAYER_CPU); - spawn_player(D_800DC4E4, 2, arg0[D_80165270[3]], arg1[D_80165270[2]] + 250.0f, arg2, 32768.0f, D_80165560[1], PLAYER_EXISTS | PLAYER_STAGING | PLAYER_START_SEQUENCE | PLAYER_CPU); - spawn_player(D_800DC4E8, 3, arg0[D_80165270[2]], arg1[D_80165270[3]] + 250.0f, arg2, 32768.0f, D_80165560[2], PLAYER_EXISTS | PLAYER_STAGING | PLAYER_START_SEQUENCE | PLAYER_CPU); - spawn_player(D_800DC4EC, 4, arg0[D_80165270[5]], arg1[D_80165270[4]] + 250.0f, arg2, 32768.0f, D_80165560[3], PLAYER_EXISTS | PLAYER_STAGING | PLAYER_START_SEQUENCE | PLAYER_CPU); - spawn_player(D_800DC4F0, 5, arg0[D_80165270[4]], arg1[D_80165270[5]] + 250.0f, arg2, 32768.0f, D_80165560[4], PLAYER_EXISTS | PLAYER_STAGING | PLAYER_START_SEQUENCE | PLAYER_CPU); - spawn_player(D_800DC4F4, 6, arg0[D_80165270[7]], arg1[D_80165270[6]] + 250.0f, arg2, 32768.0f, D_80165560[5], PLAYER_EXISTS | PLAYER_STAGING | PLAYER_START_SEQUENCE | PLAYER_CPU); - spawn_player(D_800DC4F8, 7, arg0[D_80165270[6]], arg1[D_80165270[7]] + 250.0f, arg2, 32768.0f, D_80165560[6], PLAYER_EXISTS | PLAYER_STAGING | PLAYER_START_SEQUENCE | PLAYER_CPU); + spawn_player(gPlayerOneCopy, 0, arg0[D_80165270[0]], arg1[D_80165270[0]] + 250.0f, arg2, 32768.0f, D_800E86A8[0], PLAYER_EXISTS | PLAYER_STAGING | PLAYER_START_SEQUENCE | PLAYER_HUMAN); + spawn_player(gPlayerTwo, 1, arg0[D_80165270[1]], arg1[D_80165270[1]] + 250.0f, arg2, 32768.0f, D_80165560[0], PLAYER_EXISTS | PLAYER_STAGING | PLAYER_START_SEQUENCE | PLAYER_CPU); + spawn_player(gPlayerThree, 2, arg0[D_80165270[3]], arg1[D_80165270[2]] + 250.0f, arg2, 32768.0f, D_80165560[1], PLAYER_EXISTS | PLAYER_STAGING | PLAYER_START_SEQUENCE | PLAYER_CPU); + spawn_player(gPlayerFour, 3, arg0[D_80165270[2]], arg1[D_80165270[3]] + 250.0f, arg2, 32768.0f, D_80165560[2], PLAYER_EXISTS | PLAYER_STAGING | PLAYER_START_SEQUENCE | PLAYER_CPU); + spawn_player(gPlayerFive, 4, arg0[D_80165270[5]], arg1[D_80165270[4]] + 250.0f, arg2, 32768.0f, D_80165560[3], PLAYER_EXISTS | PLAYER_STAGING | PLAYER_START_SEQUENCE | PLAYER_CPU); + spawn_player(gPlayerSix, 5, arg0[D_80165270[4]], arg1[D_80165270[5]] + 250.0f, arg2, 32768.0f, D_80165560[4], PLAYER_EXISTS | PLAYER_STAGING | PLAYER_START_SEQUENCE | PLAYER_CPU); + spawn_player(gPlayerSeven, 6, arg0[D_80165270[7]], arg1[D_80165270[6]] + 250.0f, arg2, 32768.0f, D_80165560[5], PLAYER_EXISTS | PLAYER_STAGING | PLAYER_START_SEQUENCE | PLAYER_CPU); + spawn_player(gPlayerEight, 7, arg0[D_80165270[6]], arg1[D_80165270[7]] + 250.0f, arg2, 32768.0f, D_80165560[6], PLAYER_EXISTS | PLAYER_STAGING | PLAYER_START_SEQUENCE | PLAYER_CPU); D_80164A28 = 1; } func_80039AE4(); } void func_8003A59C(f32 *arg0, f32 *arg1, f32 arg2) { - spawn_player(D_800DC4E8, 3, arg0[2], arg1[2], arg2, 32768.0f, D_800E86A8[0], PLAYER_START_SEQUENCE | PLAYER_CPU); - spawn_player(D_800DC4EC, 4, arg0[3], arg1[3], arg2, 32768.0f, D_800E86A8[0], PLAYER_START_SEQUENCE | PLAYER_CPU); - spawn_player(D_800DC4F0, 5, arg0[4], arg1[4], arg2, 32768.0f, D_800E86A8[0], PLAYER_START_SEQUENCE | PLAYER_CPU); - spawn_player(D_800DC4F4, 6, arg0[5], arg1[5], arg2, 32768.0f, D_800E86A8[0], PLAYER_START_SEQUENCE | PLAYER_CPU); - spawn_player(D_800DC4F8, 7, arg0[6], arg1[6], arg2, 32768.0f, D_800E86A8[0], PLAYER_START_SEQUENCE | PLAYER_CPU); + spawn_player(gPlayerFour, 3, arg0[2], arg1[2], arg2, 32768.0f, D_800E86A8[0], PLAYER_START_SEQUENCE | PLAYER_CPU); + spawn_player(gPlayerFive, 4, arg0[3], arg1[3], arg2, 32768.0f, D_800E86A8[0], PLAYER_START_SEQUENCE | PLAYER_CPU); + spawn_player(gPlayerSix, 5, arg0[4], arg1[4], arg2, 32768.0f, D_800E86A8[0], PLAYER_START_SEQUENCE | PLAYER_CPU); + spawn_player(gPlayerSeven, 6, arg0[5], arg1[5], arg2, 32768.0f, D_800E86A8[0], PLAYER_START_SEQUENCE | PLAYER_CPU); + spawn_player(gPlayerEight, 7, arg0[6], arg1[6], arg2, 32768.0f, D_800E86A8[0], PLAYER_START_SEQUENCE | PLAYER_CPU); if (D_800DC51C == 1) { - spawn_player(D_800DC4FC, 0, arg0[0], arg1[0], arg2, 32768.0f, D_800E86A8[0], PLAYER_HUMAN_AND_CPU); - spawn_player(D_800DC4E0, 1, arg0[0], arg1[0], arg2, 32768.0f, D_800E86A8[0], PLAYER_START_SEQUENCE | PLAYER_CPU); - spawn_player(D_800DC4E4, 2, arg0[1], arg1[1], arg2, 32768.0f, D_800E86A8[0], PLAYER_START_SEQUENCE | PLAYER_CPU); + spawn_player(gPlayerOneCopy, 0, arg0[0], arg1[0], arg2, 32768.0f, D_800E86A8[0], PLAYER_HUMAN_AND_CPU); + spawn_player(gPlayerTwo, 1, arg0[0], arg1[0], arg2, 32768.0f, D_800E86A8[0], PLAYER_START_SEQUENCE | PLAYER_CPU); + spawn_player(gPlayerThree, 2, arg0[1], arg1[1], arg2, 32768.0f, D_800E86A8[0], PLAYER_START_SEQUENCE | PLAYER_CPU); } else if (D_8015F890 != 1) { - spawn_player(D_800DC4FC, 0, arg0[0], arg1[0], arg2, 32768.0f, D_800E86A8[0], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN); + spawn_player(gPlayerOneCopy, 0, arg0[0], arg1[0], arg2, 32768.0f, D_800E86A8[0], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN); if (D_80162DD4[0] == 0) { - spawn_player(D_800DC4E0, 1, arg0[0], arg1[0], arg2, 32768.0f, D_80162DE0, PLAYER_EXISTS | PLAYER_HUMAN | PLAYER_START_SEQUENCE | PLAYER_INVISIBLE_OR_BOMB); + spawn_player(gPlayerTwo, 1, arg0[0], arg1[0], arg2, 32768.0f, D_80162DE0, PLAYER_EXISTS | PLAYER_HUMAN | PLAYER_START_SEQUENCE | PLAYER_INVISIBLE_OR_BOMB); } else { - spawn_player(D_800DC4E0, 1, arg0[0], arg1[0], arg2, 32768.0f, D_800E86A8[0], PLAYER_START_SEQUENCE | PLAYER_CPU); + spawn_player(gPlayerTwo, 1, arg0[0], arg1[0], arg2, 32768.0f, D_800E86A8[0], PLAYER_START_SEQUENCE | PLAYER_CPU); } if (D_80162DD4[1] == 0) { - spawn_player(D_800DC4E4, 2, arg0[0], arg1[0], arg2, 32768.0f, D_80162DE4, PLAYER_EXISTS | PLAYER_HUMAN | PLAYER_START_SEQUENCE | PLAYER_INVISIBLE_OR_BOMB); + spawn_player(gPlayerThree, 2, arg0[0], arg1[0], arg2, 32768.0f, D_80162DE4, PLAYER_EXISTS | PLAYER_HUMAN | PLAYER_START_SEQUENCE | PLAYER_INVISIBLE_OR_BOMB); } else { - spawn_player(D_800DC4E4, 2, arg0[1], arg1[1], arg2, 32768.0f, D_800E86A8[0], PLAYER_START_SEQUENCE | PLAYER_CPU); + spawn_player(gPlayerThree, 2, arg0[1], arg1[1], arg2, 32768.0f, D_800E86A8[0], PLAYER_START_SEQUENCE | PLAYER_CPU); } } else { - spawn_player(D_800DC4FC, 0, arg0[0], arg1[0], arg2, 32768.0f, D_80162DE8, PLAYER_EXISTS | PLAYER_HUMAN | PLAYER_START_SEQUENCE | PLAYER_INVISIBLE_OR_BOMB); + spawn_player(gPlayerOneCopy, 0, arg0[0], arg1[0], arg2, 32768.0f, D_80162DE8, PLAYER_EXISTS | PLAYER_HUMAN | PLAYER_START_SEQUENCE | PLAYER_INVISIBLE_OR_BOMB); if (D_80162DD8 == 0) { - spawn_player(D_800DC4E0, 1, arg0[0], arg1[0], arg2, 32768.0f, D_80162DE0, PLAYER_EXISTS | PLAYER_HUMAN | PLAYER_START_SEQUENCE | PLAYER_INVISIBLE_OR_BOMB); + spawn_player(gPlayerTwo, 1, arg0[0], arg1[0], arg2, 32768.0f, D_80162DE0, PLAYER_EXISTS | PLAYER_HUMAN | PLAYER_START_SEQUENCE | PLAYER_INVISIBLE_OR_BOMB); } else { - spawn_player(D_800DC4E0, 1, arg0[0], arg1[0], arg2, 32768.0f, D_800E86A8[0], PLAYER_START_SEQUENCE | PLAYER_CPU); + spawn_player(gPlayerTwo, 1, arg0[0], arg1[0], arg2, 32768.0f, D_800E86A8[0], PLAYER_START_SEQUENCE | PLAYER_CPU); } if (D_80162DD4[1] == 0) { - spawn_player(D_800DC4E4, 2, arg0[0], arg1[0], arg2, 32768.0f, D_80162DE4, PLAYER_EXISTS | PLAYER_HUMAN | PLAYER_START_SEQUENCE | PLAYER_INVISIBLE_OR_BOMB); + spawn_player(gPlayerThree, 2, arg0[0], arg1[0], arg2, 32768.0f, D_80162DE4, PLAYER_EXISTS | PLAYER_HUMAN | PLAYER_START_SEQUENCE | PLAYER_INVISIBLE_OR_BOMB); } else { - spawn_player(D_800DC4E4, 2, arg0[1], arg1[1], arg2, 32768.0f, D_800E86A8[0], PLAYER_START_SEQUENCE | PLAYER_CPU); + spawn_player(gPlayerThree, 2, arg0[1], arg1[1], arg2, 32768.0f, D_800E86A8[0], PLAYER_START_SEQUENCE | PLAYER_CPU); } } D_80164A28 = 0; @@ -532,22 +532,22 @@ getRand: } } - spawn_player(D_800DC4E4, 2, arg0[D_80165270[2]], arg1[D_80165270[2]], arg2, 32768.0f, D_80165560[0], PLAYER_EXISTS | PLAYER_CPU | PLAYER_START_SEQUENCE); - spawn_player(D_800DC4E8, 3, arg0[D_80165270[3]], arg1[D_80165270[3]], arg2, 32768.0f, D_80165560[1], PLAYER_EXISTS | PLAYER_CPU | PLAYER_START_SEQUENCE); - spawn_player(D_800DC4EC, 4, arg0[D_80165270[4]], arg1[D_80165270[4]], arg2, 32768.0f, D_80165560[2], PLAYER_EXISTS | PLAYER_CPU | PLAYER_START_SEQUENCE); - spawn_player(D_800DC4F0, 5, arg0[D_80165270[5]], arg1[D_80165270[5]], arg2, 32768.0f, D_80165560[3], PLAYER_EXISTS | PLAYER_CPU | PLAYER_START_SEQUENCE); - spawn_player(D_800DC4F4, 6, arg0[D_80165270[6]], arg1[D_80165270[6]], arg2, 32768.0f, D_80165560[4], PLAYER_EXISTS | PLAYER_CPU | PLAYER_START_SEQUENCE); - spawn_player(D_800DC4F8, 7, arg0[D_80165270[7]], arg1[D_80165270[7]], arg2, 32768.0f, D_80165560[5], PLAYER_EXISTS | PLAYER_CPU | PLAYER_START_SEQUENCE); + spawn_player(gPlayerThree, 2, arg0[D_80165270[2]], arg1[D_80165270[2]], arg2, 32768.0f, D_80165560[0], PLAYER_EXISTS | PLAYER_CPU | PLAYER_START_SEQUENCE); + spawn_player(gPlayerFour, 3, arg0[D_80165270[3]], arg1[D_80165270[3]], arg2, 32768.0f, D_80165560[1], PLAYER_EXISTS | PLAYER_CPU | PLAYER_START_SEQUENCE); + spawn_player(gPlayerFive, 4, arg0[D_80165270[4]], arg1[D_80165270[4]], arg2, 32768.0f, D_80165560[2], PLAYER_EXISTS | PLAYER_CPU | PLAYER_START_SEQUENCE); + spawn_player(gPlayerSix, 5, arg0[D_80165270[5]], arg1[D_80165270[5]], arg2, 32768.0f, D_80165560[3], PLAYER_EXISTS | PLAYER_CPU | PLAYER_START_SEQUENCE); + spawn_player(gPlayerSeven, 6, arg0[D_80165270[6]], arg1[D_80165270[6]], arg2, 32768.0f, D_80165560[4], PLAYER_EXISTS | PLAYER_CPU | PLAYER_START_SEQUENCE); + spawn_player(gPlayerEight, 7, arg0[D_80165270[7]], arg1[D_80165270[7]], arg2, 32768.0f, D_80165560[5], PLAYER_EXISTS | PLAYER_CPU | PLAYER_START_SEQUENCE); if (D_800DC51C == 1) { - spawn_player(D_800DC4FC, 0, arg0[D_80165270[0]], arg1[D_80165270[0]], arg2, 32768.0f, D_800E86A8[0], PLAYER_HUMAN_AND_CPU); + spawn_player(gPlayerOneCopy, 0, arg0[D_80165270[0]], arg1[D_80165270[0]], arg2, 32768.0f, D_800E86A8[0], PLAYER_HUMAN_AND_CPU); } else { - spawn_player(D_800DC4FC, 0, arg0[D_80165270[0]], arg1[D_80165270[0]], arg2, 32768.0f, D_800E86A8[0], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN); + spawn_player(gPlayerOneCopy, 0, arg0[D_80165270[0]], arg1[D_80165270[0]], arg2, 32768.0f, D_800E86A8[0], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN); } if (D_800DC51C == 1) { - spawn_player(D_800DC4E0, 1, arg0[D_80165270[1]], arg1[D_80165270[1]], arg2, 32768.0f, D_800E86A8[1], PLAYER_EXISTS | PLAYER_CPU | PLAYER_START_SEQUENCE); + spawn_player(gPlayerTwo, 1, arg0[D_80165270[1]], arg1[D_80165270[1]], arg2, 32768.0f, D_800E86A8[1], PLAYER_EXISTS | PLAYER_CPU | PLAYER_START_SEQUENCE); } else { - spawn_player(D_800DC4E0, 1, arg0[D_80165270[1]], arg1[D_80165270[1]], arg2, 32768.0f, D_800E86A8[1], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN); + spawn_player(gPlayerTwo, 1, arg0[D_80165270[1]], arg1[D_80165270[1]], arg2, 32768.0f, D_800E86A8[1], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN); } D_80164A28 = 0; @@ -555,21 +555,21 @@ getRand: } void func_8003AE24(f32 *arg0, f32 *arg1, f32 arg2) { - spawn_player(D_800DC4E4, 2, arg0[1], arg1[1], arg2, 32768.0f, D_800E86A8[0], PLAYER_START_SEQUENCE | PLAYER_CPU); - spawn_player(D_800DC4E8, 3, arg0[2], arg1[2], arg2, 32768.0f, D_800E86A8[0], PLAYER_START_SEQUENCE | PLAYER_CPU); - spawn_player(D_800DC4EC, 4, arg0[3], arg1[3], arg2, 32768.0f, D_800E86A8[0], PLAYER_START_SEQUENCE | PLAYER_CPU); - spawn_player(D_800DC4F0, 5, arg0[4], arg1[4], arg2, 32768.0f, D_800E86A8[0], PLAYER_START_SEQUENCE | PLAYER_CPU); - spawn_player(D_800DC4F4, 6, arg0[5], arg1[5], arg2, 32768.0f, D_800E86A8[0], PLAYER_START_SEQUENCE | PLAYER_CPU); - spawn_player(D_800DC4F8, 7, arg0[6], arg1[6], arg2, 32768.0f, D_800E86A8[0], PLAYER_START_SEQUENCE | PLAYER_CPU); + spawn_player(gPlayerThree, 2, arg0[1], arg1[1], arg2, 32768.0f, D_800E86A8[0], PLAYER_START_SEQUENCE | PLAYER_CPU); + spawn_player(gPlayerFour, 3, arg0[2], arg1[2], arg2, 32768.0f, D_800E86A8[0], PLAYER_START_SEQUENCE | PLAYER_CPU); + spawn_player(gPlayerFive, 4, arg0[3], arg1[3], arg2, 32768.0f, D_800E86A8[0], PLAYER_START_SEQUENCE | PLAYER_CPU); + spawn_player(gPlayerSix, 5, arg0[4], arg1[4], arg2, 32768.0f, D_800E86A8[0], PLAYER_START_SEQUENCE | PLAYER_CPU); + spawn_player(gPlayerSeven, 6, arg0[5], arg1[5], arg2, 32768.0f, D_800E86A8[0], PLAYER_START_SEQUENCE | PLAYER_CPU); + spawn_player(gPlayerEight, 7, arg0[6], arg1[6], arg2, 32768.0f, D_800E86A8[0], PLAYER_START_SEQUENCE | PLAYER_CPU); if (D_800DC51C == 1) { - spawn_player(D_800DC4FC, 0, arg0[0], arg1[0], arg2, 32768.0f, D_800E86A8[0], PLAYER_HUMAN_AND_CPU); + spawn_player(gPlayerOneCopy, 0, arg0[0], arg1[0], arg2, 32768.0f, D_800E86A8[0], PLAYER_HUMAN_AND_CPU); } else { - spawn_player(D_800DC4FC, 0, arg0[0], arg1[0], arg2, 32768.0f, D_800E86A8[0], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN); + spawn_player(gPlayerOneCopy, 0, arg0[0], arg1[0], arg2, 32768.0f, D_800E86A8[0], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN); } if (D_800DC51C == 1) { - spawn_player(D_800DC4E0, 1, arg0[1], arg1[1], arg2, 32768.0f, D_800E86A8[1], PLAYER_HUMAN_AND_CPU); + spawn_player(gPlayerTwo, 1, arg0[1], arg1[1], arg2, 32768.0f, D_800E86A8[1], PLAYER_HUMAN_AND_CPU); } else { - spawn_player(D_800DC4E0, 1, arg0[1], arg1[1], arg2, 32768.0f, D_800E86A8[1], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN); + spawn_player(gPlayerTwo, 1, arg0[1], arg1[1], arg2, 32768.0f, D_800E86A8[1], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN); } D_80164A28 = 0; func_80039AE4(); @@ -577,95 +577,95 @@ void func_8003AE24(f32 *arg0, f32 *arg1, f32 arg2) { void spawn_players_2p_battle(f32 *arg0, f32 *arg1, f32 arg2) { if (gCurrentCourseId == COURSE_BIG_DONUT) { - spawn_player(D_800DC4DC, 0, arg0[0], arg1[0], arg2, -16384.0f, D_800E86A8[0], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN); - spawn_player(D_800DC4E0, 1, arg0[1], arg1[1], arg2, 16384.0f, D_800E86A8[1], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN); + spawn_player(gPlayerOne, 0, arg0[0], arg1[0], arg2, -16384.0f, D_800E86A8[0], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN); + spawn_player(gPlayerTwo, 1, arg0[1], arg1[1], arg2, 16384.0f, D_800E86A8[1], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN); } else { - spawn_player(D_800DC4DC, 0, arg0[0], arg1[0], arg2, 32768.0f, D_800E86A8[0], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN); - spawn_player(D_800DC4E0, 1, arg0[1], arg1[1], arg2, 0.0f, D_800E86A8[1], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN); + spawn_player(gPlayerOne, 0, arg0[0], arg1[0], arg2, 32768.0f, D_800E86A8[0], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN); + spawn_player(gPlayerTwo, 1, arg0[1], arg1[1], arg2, 0.0f, D_800E86A8[1], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN); } - spawn_player(D_800DC4E4, 2, arg0[2], arg1[2], arg2, 32768.0f, D_800E86A8[2], PLAYER_START_SEQUENCE | PLAYER_HUMAN); - spawn_player(D_800DC4E8, 3, arg0[3], arg1[3], arg2, 32768.0f, D_800E86A8[3], PLAYER_START_SEQUENCE | PLAYER_HUMAN); - spawn_player(D_800DC4EC, 4, arg0[4], arg1[4], arg2, 32768.0f, 4, PLAYER_START_SEQUENCE | PLAYER_CPU); - spawn_player(D_800DC4F0, 5, arg0[5], arg1[5], arg2, 32768.0f, 5, PLAYER_START_SEQUENCE | PLAYER_CPU); - spawn_player(D_800DC4F4, 6, arg0[6], arg1[6], arg2, 32768.0f, 6, PLAYER_START_SEQUENCE | PLAYER_CPU); - spawn_player(D_800DC4F8, 7, arg0[0], arg1[0], arg2, 32768.0f, 7, PLAYER_START_SEQUENCE | PLAYER_CPU); + spawn_player(gPlayerThree, 2, arg0[2], arg1[2], arg2, 32768.0f, D_800E86A8[2], PLAYER_START_SEQUENCE | PLAYER_HUMAN); + spawn_player(gPlayerFour, 3, arg0[3], arg1[3], arg2, 32768.0f, D_800E86A8[3], PLAYER_START_SEQUENCE | PLAYER_HUMAN); + spawn_player(gPlayerFive, 4, arg0[4], arg1[4], arg2, 32768.0f, 4, PLAYER_START_SEQUENCE | PLAYER_CPU); + spawn_player(gPlayerSix, 5, arg0[5], arg1[5], arg2, 32768.0f, 5, PLAYER_START_SEQUENCE | PLAYER_CPU); + spawn_player(gPlayerSeven, 6, arg0[6], arg1[6], arg2, 32768.0f, 6, PLAYER_START_SEQUENCE | PLAYER_CPU); + spawn_player(gPlayerEight, 7, arg0[0], arg1[0], arg2, 32768.0f, 7, PLAYER_START_SEQUENCE | PLAYER_CPU); D_80164A28 = 0; func_80039AE4(); } void func_8003B318(f32 *arg0, f32 *arg1, f32 arg2) { - spawn_player(D_800DC4DC, 0, arg0[0], arg1[0], arg2, 32768.0f, D_800E86A8[0], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN); - spawn_player(D_800DC4E0, 1, arg0[1], arg1[1], arg2, 32768.0f, D_800E86A8[1], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN); - spawn_player(D_800DC4E4, 2, arg0[2], arg1[2], arg2, 32768.0f, D_800E86A8[2], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN); + spawn_player(gPlayerOne, 0, arg0[0], arg1[0], arg2, 32768.0f, D_800E86A8[0], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN); + spawn_player(gPlayerTwo, 1, arg0[1], arg1[1], arg2, 32768.0f, D_800E86A8[1], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN); + spawn_player(gPlayerThree, 2, arg0[2], arg1[2], arg2, 32768.0f, D_800E86A8[2], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN); if (D_800DC51C == 1) { - spawn_player(D_800DC4DC, 0, arg0[0], arg1[0], arg2, 32768.0f, D_800E86A8[0], PLAYER_HUMAN_AND_CPU); - spawn_player(D_800DC4E0, 1, arg0[1], arg1[1], arg2, 32768.0f, D_800E86A8[1], PLAYER_HUMAN_AND_CPU); - spawn_player(D_800DC4E4, 2, arg0[2], arg1[2], arg2, 32768.0f, D_800E86A8[2], PLAYER_HUMAN_AND_CPU); + spawn_player(gPlayerOne, 0, arg0[0], arg1[0], arg2, 32768.0f, D_800E86A8[0], PLAYER_HUMAN_AND_CPU); + spawn_player(gPlayerTwo, 1, arg0[1], arg1[1], arg2, 32768.0f, D_800E86A8[1], PLAYER_HUMAN_AND_CPU); + spawn_player(gPlayerThree, 2, arg0[2], arg1[2], arg2, 32768.0f, D_800E86A8[2], PLAYER_HUMAN_AND_CPU); } - spawn_player(D_800DC4E8, 3, arg0[3], arg1[3], arg2, 32768.0f, 3, PLAYER_START_SEQUENCE | PLAYER_CPU); - spawn_player(D_800DC4EC, 4, arg0[4], arg1[4], arg2, 32768.0f, 4, PLAYER_START_SEQUENCE | PLAYER_CPU); - spawn_player(D_800DC4F0, 5, arg0[5], arg1[5], arg2, 32768.0f, 5, PLAYER_START_SEQUENCE | PLAYER_CPU); - spawn_player(D_800DC4F4, 6, arg0[6], arg1[6], arg2, 32768.0f, 6, PLAYER_START_SEQUENCE | PLAYER_CPU); - spawn_player(D_800DC4F8, 7, arg0[0], arg1[0], arg2, 32768.0f, 7, PLAYER_START_SEQUENCE | PLAYER_CPU); + spawn_player(gPlayerFour, 3, arg0[3], arg1[3], arg2, 32768.0f, 3, PLAYER_START_SEQUENCE | PLAYER_CPU); + spawn_player(gPlayerFive, 4, arg0[4], arg1[4], arg2, 32768.0f, 4, PLAYER_START_SEQUENCE | PLAYER_CPU); + spawn_player(gPlayerSix, 5, arg0[5], arg1[5], arg2, 32768.0f, 5, PLAYER_START_SEQUENCE | PLAYER_CPU); + spawn_player(gPlayerSeven, 6, arg0[6], arg1[6], arg2, 32768.0f, 6, PLAYER_START_SEQUENCE | PLAYER_CPU); + spawn_player(gPlayerEight, 7, arg0[0], arg1[0], arg2, 32768.0f, 7, PLAYER_START_SEQUENCE | PLAYER_CPU); D_80164A28 = 0; func_80039AE4(); } void spawn_players_3p_battle(f32 *arg0, f32 *arg1, f32 arg2) { if (gCurrentCourseId == COURSE_BIG_DONUT) { - spawn_player(D_800DC4DC, 0, arg0[0], arg1[0], arg2, -16384.0f, D_800E86A8[0], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN); - spawn_player(D_800DC4E0, 1, arg0[1], arg1[1], arg2, 16384.0f, D_800E86A8[1], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN); - spawn_player(D_800DC4E4, 2, arg0[2], arg1[2], arg2, 0.0f, D_800E86A8[2], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN); + spawn_player(gPlayerOne, 0, arg0[0], arg1[0], arg2, -16384.0f, D_800E86A8[0], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN); + spawn_player(gPlayerTwo, 1, arg0[1], arg1[1], arg2, 16384.0f, D_800E86A8[1], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN); + spawn_player(gPlayerThree, 2, arg0[2], arg1[2], arg2, 0.0f, D_800E86A8[2], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN); } else { - spawn_player(D_800DC4DC, 0, arg0[0], arg1[0], arg2, 32768.0f, D_800E86A8[0], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN); - spawn_player(D_800DC4E0, 1, arg0[1], arg1[1], arg2, 0.0f, D_800E86A8[1], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN); - spawn_player(D_800DC4E4, 2, arg0[2], arg1[2], arg2, -16384.0f, D_800E86A8[2], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN); + spawn_player(gPlayerOne, 0, arg0[0], arg1[0], arg2, 32768.0f, D_800E86A8[0], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN); + spawn_player(gPlayerTwo, 1, arg0[1], arg1[1], arg2, 0.0f, D_800E86A8[1], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN); + spawn_player(gPlayerThree, 2, arg0[2], arg1[2], arg2, -16384.0f, D_800E86A8[2], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN); } - spawn_player(D_800DC4E8, 3, arg0[3], arg1[3], arg2, 32768.0f, 3, PLAYER_START_SEQUENCE | PLAYER_CPU); - spawn_player(D_800DC4EC, 4, arg0[4], arg1[4], arg2, 32768.0f, 4, PLAYER_START_SEQUENCE | PLAYER_CPU); - spawn_player(D_800DC4F0, 5, arg0[5], arg1[5], arg2, 32768.0f, 5, PLAYER_START_SEQUENCE | PLAYER_CPU); - spawn_player(D_800DC4F4, 6, arg0[6], arg1[6], arg2, 32768.0f, 6, PLAYER_START_SEQUENCE | PLAYER_CPU); - spawn_player(D_800DC4F8, 7, arg0[0], arg1[0], arg2, 32768.0f, 7, PLAYER_START_SEQUENCE | PLAYER_CPU); + spawn_player(gPlayerFour, 3, arg0[3], arg1[3], arg2, 32768.0f, 3, PLAYER_START_SEQUENCE | PLAYER_CPU); + spawn_player(gPlayerFive, 4, arg0[4], arg1[4], arg2, 32768.0f, 4, PLAYER_START_SEQUENCE | PLAYER_CPU); + spawn_player(gPlayerSix, 5, arg0[5], arg1[5], arg2, 32768.0f, 5, PLAYER_START_SEQUENCE | PLAYER_CPU); + spawn_player(gPlayerSeven, 6, arg0[6], arg1[6], arg2, 32768.0f, 6, PLAYER_START_SEQUENCE | PLAYER_CPU); + spawn_player(gPlayerEight, 7, arg0[0], arg1[0], arg2, 32768.0f, 7, PLAYER_START_SEQUENCE | PLAYER_CPU); D_80164A28 = 0; func_80039AE4(); } void func_8003B870(f32 *arg0, f32 *arg1, f32 arg2) { - spawn_player(D_800DC4DC, 0, arg0[0], arg1[0], arg2, 32768.0f, D_800E86A8[0], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN); - spawn_player(D_800DC4E0, 1, arg0[1], arg1[1], arg2, 32768.0f, D_800E86A8[1], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN); - spawn_player(D_800DC4E4, 2, arg0[2], arg1[2], arg2, 32768.0f, D_800E86A8[2], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN); - spawn_player(D_800DC4E8, 3, arg0[3], arg1[3], arg2, 32768.0f, D_800E86A8[3], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN); + spawn_player(gPlayerOne, 0, arg0[0], arg1[0], arg2, 32768.0f, D_800E86A8[0], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN); + spawn_player(gPlayerTwo, 1, arg0[1], arg1[1], arg2, 32768.0f, D_800E86A8[1], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN); + spawn_player(gPlayerThree, 2, arg0[2], arg1[2], arg2, 32768.0f, D_800E86A8[2], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN); + spawn_player(gPlayerFour, 3, arg0[3], arg1[3], arg2, 32768.0f, D_800E86A8[3], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN); if (D_800DC51C == 1) { - spawn_player(D_800DC4DC, 0, arg0[0], arg1[0], arg2, 32768.0f, D_800E86A8[0], PLAYER_HUMAN_AND_CPU); - spawn_player(D_800DC4E0, 1, arg0[1], arg1[1], arg2, 32768.0f, D_800E86A8[1], PLAYER_HUMAN_AND_CPU); - spawn_player(D_800DC4E4, 2, arg0[2], arg1[2], arg2, 32768.0f, D_800E86A8[2], PLAYER_HUMAN_AND_CPU); - spawn_player(D_800DC4E8, 3, arg0[3], arg1[3], arg2, 32768.0f, D_800E86A8[3], PLAYER_HUMAN_AND_CPU); + spawn_player(gPlayerOne, 0, arg0[0], arg1[0], arg2, 32768.0f, D_800E86A8[0], PLAYER_HUMAN_AND_CPU); + spawn_player(gPlayerTwo, 1, arg0[1], arg1[1], arg2, 32768.0f, D_800E86A8[1], PLAYER_HUMAN_AND_CPU); + spawn_player(gPlayerThree, 2, arg0[2], arg1[2], arg2, 32768.0f, D_800E86A8[2], PLAYER_HUMAN_AND_CPU); + spawn_player(gPlayerFour, 3, arg0[3], arg1[3], arg2, 32768.0f, D_800E86A8[3], PLAYER_HUMAN_AND_CPU); } - spawn_player(D_800DC4EC, 4, arg0[4], arg1[4], arg2, 32768.0f, 4, PLAYER_START_SEQUENCE | PLAYER_CPU); - spawn_player(D_800DC4F0, 5, arg0[5], arg1[5], arg2, 32768.0f, 5, PLAYER_START_SEQUENCE | PLAYER_CPU); - spawn_player(D_800DC4F4, 6, arg0[6], arg1[6], arg2, 32768.0f, 6, PLAYER_START_SEQUENCE | PLAYER_CPU); - spawn_player(D_800DC4F8, 7, arg0[0], arg1[0], arg2, 32768.0f, 7, PLAYER_START_SEQUENCE | PLAYER_CPU); + spawn_player(gPlayerFive, 4, arg0[4], arg1[4], arg2, 32768.0f, 4, PLAYER_START_SEQUENCE | PLAYER_CPU); + spawn_player(gPlayerSix, 5, arg0[5], arg1[5], arg2, 32768.0f, 5, PLAYER_START_SEQUENCE | PLAYER_CPU); + spawn_player(gPlayerSeven, 6, arg0[6], arg1[6], arg2, 32768.0f, 6, PLAYER_START_SEQUENCE | PLAYER_CPU); + spawn_player(gPlayerEight, 7, arg0[0], arg1[0], arg2, 32768.0f, 7, PLAYER_START_SEQUENCE | PLAYER_CPU); D_80164A28 = 0; func_80039AE4(); } void spawn_players_4p_battle(f32 *arg0, f32 *arg1, f32 arg2) { if (gCurrentCourseId == COURSE_BIG_DONUT) { - spawn_player(D_800DC4DC, 0, arg0[0], arg1[0], arg2, -16384.0f, D_800E86A8[0], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN); - spawn_player(D_800DC4E0, 1, arg0[1], arg1[1], arg2, 16384.0f, D_800E86A8[1], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN); - spawn_player(D_800DC4E4, 2, arg0[2], arg1[2], arg2, 0.0f, D_800E86A8[2], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN); - spawn_player(D_800DC4E8, 3, arg0[3], arg1[3], arg2, 32768.0f, D_800E86A8[3], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN); + spawn_player(gPlayerOne, 0, arg0[0], arg1[0], arg2, -16384.0f, D_800E86A8[0], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN); + spawn_player(gPlayerTwo, 1, arg0[1], arg1[1], arg2, 16384.0f, D_800E86A8[1], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN); + spawn_player(gPlayerThree, 2, arg0[2], arg1[2], arg2, 0.0f, D_800E86A8[2], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN); + spawn_player(gPlayerFour, 3, arg0[3], arg1[3], arg2, 32768.0f, D_800E86A8[3], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN); } else { - spawn_player(D_800DC4DC, 0, arg0[0], arg1[0], arg2, 32768.0f, D_800E86A8[0], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN); - spawn_player(D_800DC4E0, 1, arg0[1], arg1[1], arg2, 0.0f, D_800E86A8[1], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN); - spawn_player(D_800DC4E4, 2, arg0[2], arg1[2], arg2, -16384.0f, D_800E86A8[2], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN); - spawn_player(D_800DC4E8, 3, arg0[3], arg1[3], arg2, 16384.0f, D_800E86A8[3], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN); + spawn_player(gPlayerOne, 0, arg0[0], arg1[0], arg2, 32768.0f, D_800E86A8[0], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN); + spawn_player(gPlayerTwo, 1, arg0[1], arg1[1], arg2, 0.0f, D_800E86A8[1], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN); + spawn_player(gPlayerThree, 2, arg0[2], arg1[2], arg2, -16384.0f, D_800E86A8[2], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN); + spawn_player(gPlayerFour, 3, arg0[3], arg1[3], arg2, 16384.0f, D_800E86A8[3], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN); } - spawn_player(D_800DC4EC, 4, arg0[4], arg1[4], arg2, 32768.0f, 4, PLAYER_START_SEQUENCE | PLAYER_CPU); - spawn_player(D_800DC4F0, 5, arg0[5], arg1[5], arg2, 32768.0f, 5, PLAYER_START_SEQUENCE | PLAYER_CPU); - spawn_player(D_800DC4F4, 6, arg0[6], arg1[6], arg2, 32768.0f, 6, PLAYER_START_SEQUENCE | PLAYER_CPU); - spawn_player(D_800DC4F8, 7, arg0[0], arg1[0], arg2, 32768.0f, 7, PLAYER_START_SEQUENCE | PLAYER_CPU); + spawn_player(gPlayerFive, 4, arg0[4], arg1[4], arg2, 32768.0f, 4, PLAYER_START_SEQUENCE | PLAYER_CPU); + spawn_player(gPlayerSix, 5, arg0[5], arg1[5], arg2, 32768.0f, 5, PLAYER_START_SEQUENCE | PLAYER_CPU); + spawn_player(gPlayerSeven, 6, arg0[6], arg1[6], arg2, 32768.0f, 6, PLAYER_START_SEQUENCE | PLAYER_CPU); + spawn_player(gPlayerEight, 7, arg0[0], arg1[0], arg2, 32768.0f, 7, PLAYER_START_SEQUENCE | PLAYER_CPU); D_80164A28 = 0; func_80039AE4(); } @@ -689,18 +689,18 @@ extern f32 D_800EDE58; extern f32 D_800EDE5C; void func_8003BE30(void) { - spawn_player(D_800DC4DC, 0, -2770.774f, -345.187f, D_800EDE20, 0.0f, gCharacterIdByGPOverallRank[0], PLAYER_EXISTS | PLAYER_CPU | PLAYER_START_SEQUENCE); - spawn_player(D_800DC4E0, 1, -3691.506f, -6.822f, D_800EDE24, D_800EDE28, gCharacterIdByGPOverallRank[1], PLAYER_EXISTS | PLAYER_CPU | PLAYER_START_SEQUENCE); - spawn_player(D_800DC4E4, 2, -3475.028f, -998.485f, D_800EDE2C, D_800EDE30, gCharacterIdByGPOverallRank[2], PLAYER_EXISTS | PLAYER_CPU | PLAYER_START_SEQUENCE); + spawn_player(gPlayerOne, 0, -2770.774f, -345.187f, D_800EDE20, 0.0f, gCharacterIdByGPOverallRank[0], PLAYER_EXISTS | PLAYER_CPU | PLAYER_START_SEQUENCE); + spawn_player(gPlayerTwo, 1, -3691.506f, -6.822f, D_800EDE24, D_800EDE28, gCharacterIdByGPOverallRank[1], PLAYER_EXISTS | PLAYER_CPU | PLAYER_START_SEQUENCE); + spawn_player(gPlayerThree, 2, -3475.028f, -998.485f, D_800EDE2C, D_800EDE30, gCharacterIdByGPOverallRank[2], PLAYER_EXISTS | PLAYER_CPU | PLAYER_START_SEQUENCE); if (D_802874D8.unk_1D >= 3) { - spawn_player(D_800DC4E8, 3, -3025.772f, 110.039f, D_800EDE34, D_800EDE38, D_802874D8.unk_1E, PLAYER_EXISTS | PLAYER_CPU | PLAYER_START_SEQUENCE); + spawn_player(gPlayerFour, 3, -3025.772f, 110.039f, D_800EDE34, D_800EDE38, D_802874D8.unk_1E, PLAYER_EXISTS | PLAYER_CPU | PLAYER_START_SEQUENCE); } else { - spawn_player(D_800DC4E8, 3, -3025.772f, 110.039f, D_800EDE3C, D_800EDE40, gCharacterIdByGPOverallRank[3], PLAYER_EXISTS | PLAYER_CPU | PLAYER_START_SEQUENCE); + spawn_player(gPlayerFour, 3, -3025.772f, 110.039f, D_800EDE3C, D_800EDE40, gCharacterIdByGPOverallRank[3], PLAYER_EXISTS | PLAYER_CPU | PLAYER_START_SEQUENCE); } - spawn_player(D_800DC4EC, 4, -2770.774f, -345.187f, D_800EDE44, 0.0f, 0, 0x7000); - spawn_player(D_800DC4F0, 5, -3691.506f, -6.822f, D_800EDE48, D_800EDE4C, 0, 0x7000); - spawn_player(D_800DC4F4, 6, -3475.028f, -998.485f, D_800EDE50, D_800EDE54, 0, 0x7000); - spawn_player(D_800DC4F8, 7, -3025.772f, 110.039f, D_800EDE58, D_800EDE5C, 0, 0x7000); + spawn_player(gPlayerFive, 4, -2770.774f, -345.187f, D_800EDE44, 0.0f, 0, 0x7000); + spawn_player(gPlayerSix, 5, -3691.506f, -6.822f, D_800EDE48, D_800EDE4C, 0, 0x7000); + spawn_player(gPlayerSeven, 6, -3475.028f, -998.485f, D_800EDE50, D_800EDE54, 0, 0x7000); + spawn_player(gPlayerEight, 7, -3025.772f, 110.039f, D_800EDE58, D_800EDE5C, 0, 0x7000); D_80164A28 = 0; func_80039AE4(); } @@ -1017,14 +1017,14 @@ void func_8003C0F0(void) { D_80165230[5] = 130.0f; D_80165230[6] = 150.0f; D_80165230[7] = 170.0f; - spawn_player(D_800DC4FC, 0, D_80165210[0], D_80165230[0], sp5A, 32768.0f, D_800E86A8[0], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN); - spawn_player(D_800DC4E0, 1, D_80165210[1], D_80165230[1], sp5A, 32768.0f, 1, PLAYER_EXISTS | PLAYER_CPU | PLAYER_START_SEQUENCE); - spawn_player(D_800DC4E4, 2, D_80165210[2], D_80165230[2], sp5A, 32768.0f, 2, PLAYER_EXISTS | PLAYER_CPU | PLAYER_START_SEQUENCE); - spawn_player(D_800DC4E8, 3, D_80165210[3], D_80165230[3], sp5A, 32768.0f, 3, PLAYER_EXISTS | PLAYER_CPU | PLAYER_START_SEQUENCE); - spawn_player(D_800DC4EC, 4, D_80165210[4], D_80165230[4], sp5A, 32768.0f, 4, PLAYER_EXISTS | PLAYER_CPU | PLAYER_START_SEQUENCE); - spawn_player(D_800DC4F0, 5, D_80165210[5], D_80165230[5], sp5A, 32768.0f, 5, PLAYER_EXISTS | PLAYER_CPU | PLAYER_START_SEQUENCE); - spawn_player(D_800DC4F4, 6, D_80165210[6], D_80165230[6], sp5A, 32768.0f, 6, PLAYER_EXISTS | PLAYER_CPU | PLAYER_START_SEQUENCE); - spawn_player(D_800DC4F8, 7, D_80165210[7], D_80165230[7], sp5A, 32768.0f, 7, PLAYER_EXISTS | PLAYER_CPU | PLAYER_START_SEQUENCE); + spawn_player(gPlayerOneCopy, 0, D_80165210[0], D_80165230[0], sp5A, 32768.0f, D_800E86A8[0], PLAYER_EXISTS | PLAYER_START_SEQUENCE | PLAYER_HUMAN); + spawn_player(gPlayerTwo, 1, D_80165210[1], D_80165230[1], sp5A, 32768.0f, 1, PLAYER_EXISTS | PLAYER_CPU | PLAYER_START_SEQUENCE); + spawn_player(gPlayerThree, 2, D_80165210[2], D_80165230[2], sp5A, 32768.0f, 2, PLAYER_EXISTS | PLAYER_CPU | PLAYER_START_SEQUENCE); + spawn_player(gPlayerFour, 3, D_80165210[3], D_80165230[3], sp5A, 32768.0f, 3, PLAYER_EXISTS | PLAYER_CPU | PLAYER_START_SEQUENCE); + spawn_player(gPlayerFive, 4, D_80165210[4], D_80165230[4], sp5A, 32768.0f, 4, PLAYER_EXISTS | PLAYER_CPU | PLAYER_START_SEQUENCE); + spawn_player(gPlayerSix, 5, D_80165210[5], D_80165230[5], sp5A, 32768.0f, 5, PLAYER_EXISTS | PLAYER_CPU | PLAYER_START_SEQUENCE); + spawn_player(gPlayerSeven, 6, D_80165210[6], D_80165230[6], sp5A, 32768.0f, 6, PLAYER_EXISTS | PLAYER_CPU | PLAYER_START_SEQUENCE); + spawn_player(gPlayerEight, 7, D_80165210[7], D_80165230[7], sp5A, 32768.0f, 7, PLAYER_EXISTS | PLAYER_CPU | PLAYER_START_SEQUENCE); D_80164A28 = 0; break; } @@ -1089,18 +1089,18 @@ void func_8003D080(void) { switch (gModeSelection) { case GRAND_PRIX: if (gCurrentCourseId == COURSE_TOADS_TURNPIKE) { - func_8001C4D0(0.0f, D_800DC4DC->unk_0A8, D_8016524C, D_800DC4DC->unk_0BC, 8, 0); + func_8001C4D0(0.0f, gPlayerOne->unk_0A8, D_8016524C, gPlayerOne->unk_0BC, 8, 0); } else { - func_8001C4D0((D_80165210[6] + D_80165210[7]) / 2, D_800DC4DC->unk_0A8, D_8016524C, D_800DC4DC->unk_0BC, 8, 0); + func_8001C4D0((D_80165210[6] + D_80165210[7]) / 2, gPlayerOne->unk_0A8, D_8016524C, gPlayerOne->unk_0BC, 8, 0); } break; case TIME_TRIALS: - func_8001C4D0(D_800DC4DC->unk_0A4, D_800DC4DC->unk_0A8, D_8016524C, D_800DC4DC->unk_0BC, 1, 0); + func_8001C4D0(gPlayerOne->unk_0A4, gPlayerOne->unk_0A8, D_8016524C, gPlayerOne->unk_0BC, 1, 0); break; default: - func_8001C4D0(D_800DC4DC->unk_0A4, D_800DC4DC->unk_0A8, D_800DC4DC->unk_0AC, D_800DC4DC->unk_0BC, 10, 0); + func_8001C4D0(gPlayerOne->unk_0A4, gPlayerOne->unk_0A8, gPlayerOne->unk_0AC, gPlayerOne->unk_0BC, 10, 0); break; } break; @@ -1109,27 +1109,27 @@ void func_8003D080(void) { case 2: switch (gModeSelection) { case GRAND_PRIX: - func_8001C4D0(D_800DC4DC->unk_0A4, D_800DC4DC->unk_0A8, D_800DC4DC->unk_0AC, D_800DC4DC->unk_0BC, 1, 0); - func_8001C4D0(D_800DC4E0->posX, D_800DC4E0->posY, D_800DC4E0->posZ, D_800DC4E0->unk_02E, 1, 1); + func_8001C4D0(gPlayerOne->unk_0A4, gPlayerOne->unk_0A8, gPlayerOne->unk_0AC, gPlayerOne->unk_0BC, 1, 0); + func_8001C4D0(gPlayerTwo->posX, gPlayerTwo->posY, gPlayerTwo->posZ, gPlayerTwo->unk_02E, 1, 1); break; case BATTLE: - func_8001C4D0(D_800DC4DC->unk_0A4, D_800DC4DC->unk_0A8, D_800DC4DC->unk_0AC, D_800DC4DC->unk_0BC, 9, 0); - func_8001C4D0(D_800DC4E0->posX, D_800DC4E0->posY, D_800DC4E0->posZ, D_800DC4E0->unk_02E, 9, 1); + func_8001C4D0(gPlayerOne->unk_0A4, gPlayerOne->unk_0A8, gPlayerOne->unk_0AC, gPlayerOne->unk_0BC, 9, 0); + func_8001C4D0(gPlayerTwo->posX, gPlayerTwo->posY, gPlayerTwo->posZ, gPlayerTwo->unk_02E, 9, 1); break; default: - func_8001C4D0(D_800DC4DC->unk_0A4, D_800DC4DC->unk_0A8, D_800DC4DC->unk_0AC, D_800DC4DC->unk_0BC, 1, 0); - func_8001C4D0(D_800DC4E0->posX, D_800DC4E0->posY, D_800DC4E0->posZ, D_800DC4E0->unk_02E, 1, 1); + func_8001C4D0(gPlayerOne->unk_0A4, gPlayerOne->unk_0A8, gPlayerOne->unk_0AC, gPlayerOne->unk_0BC, 1, 0); + func_8001C4D0(gPlayerTwo->posX, gPlayerTwo->posY, gPlayerTwo->posZ, gPlayerTwo->unk_02E, 1, 1); break; } break; case 3: if (gModeSelection == BATTLE) { - ptr = &D_800DC4E4; - func_8001C4D0(D_800DC4DC->unk_0A4, D_800DC4DC->unk_0A8, D_800DC4DC->unk_0AC, D_800DC4DC->unk_0BC, 9, 0); - func_8001C4D0(D_800DC4E0->posX, D_800DC4E0->posY, D_800DC4E0->posZ, D_800DC4E0->unk_02E, 9, 1); + ptr = &gPlayerThree; + func_8001C4D0(gPlayerOne->unk_0A4, gPlayerOne->unk_0A8, gPlayerOne->unk_0AC, gPlayerOne->unk_0BC, 9, 0); + func_8001C4D0(gPlayerTwo->posX, gPlayerTwo->posY, gPlayerTwo->posZ, gPlayerTwo->unk_02E, 9, 1); ptr++; func_8001C4D0(ptr->posX, ptr->posY, ptr->posZ, ptr->unk_02E, 9, 2); ptr++; @@ -1137,9 +1137,9 @@ void func_8003D080(void) { func_8001C4D0(ptr->posX, ptr->posY, ptr->posZ, ptr->unk_02E, 9, 3); } } else { - ptr = &D_800DC4E4; - func_8001C4D0(D_800DC4DC->unk_0A4, D_800DC4DC->unk_0A8, D_800DC4DC->unk_0AC, D_800DC4DC->unk_0BC, 1, 0); - func_8001C4D0(D_800DC4E0->posX, D_800DC4E0->posY, D_800DC4E0->posZ, D_800DC4E0->unk_02E, 1, 1); + ptr = &gPlayerThree; + func_8001C4D0(gPlayerOne->unk_0A4, gPlayerOne->unk_0A8, gPlayerOne->unk_0AC, gPlayerOne->unk_0BC, 1, 0); + func_8001C4D0(gPlayerTwo->posX, gPlayerTwo->posY, gPlayerTwo->posZ, gPlayerTwo->unk_02E, 1, 1); ptr++; func_8001C4D0(ptr->posX, ptr->posY, ptr->posZ, ptr->unk_02E, 1, 2); ptr++; @@ -1152,19 +1152,19 @@ void func_8003D080(void) { } else { switch (D_800DC52C) { case 0: - func_8001C4D0(D_800DC4DC->unk_0A4, D_800DC4DC->unk_0A8, D_800DC4DC->unk_0AC, D_800DC4DC->unk_0BC, 3, 0); + func_8001C4D0(gPlayerOne->unk_0A4, gPlayerOne->unk_0A8, gPlayerOne->unk_0AC, gPlayerOne->unk_0BC, 3, 0); break; case 1: case 2: - func_8001C4D0(D_800DC4DC->unk_0A4, D_800DC4DC->unk_0A8, D_800DC4DC->unk_0AC, D_800DC4DC->unk_0BC, 3, 0); - func_8001C4D0(D_800DC4E0->posX, D_800DC4E0->posY, D_800DC4E0->posZ, D_800DC4E0->unk_02E, 3, 1); + func_8001C4D0(gPlayerOne->unk_0A4, gPlayerOne->unk_0A8, gPlayerOne->unk_0AC, gPlayerOne->unk_0BC, 3, 0); + func_8001C4D0(gPlayerTwo->posX, gPlayerTwo->posY, gPlayerTwo->posZ, gPlayerTwo->unk_02E, 3, 1); break; case 3: - ptr = &D_800DC4E4; - func_8001C4D0(D_800DC4DC->unk_0A4, D_800DC4DC->unk_0A8, D_800DC4DC->unk_0AC, D_800DC4DC->unk_0BC, 3, 0); - func_8001C4D0(D_800DC4E0->posX, D_800DC4E0->posY, D_800DC4E0->posZ, D_800DC4E0->unk_02E, 3, 1); + ptr = &gPlayerThree; + func_8001C4D0(gPlayerOne->unk_0A4, gPlayerOne->unk_0A8, gPlayerOne->unk_0AC, gPlayerOne->unk_0BC, 3, 0); + func_8001C4D0(gPlayerTwo->posX, gPlayerTwo->posY, gPlayerTwo->posZ, gPlayerTwo->unk_02E, 3, 1); ptr++; func_8001C4D0(ptr->posX, ptr->posY, ptr->posZ, ptr->unk_02E, 3, 2); ptr++; @@ -1175,53 +1175,53 @@ void func_8003D080(void) { switch (D_800DC52C) { case 0: - func_8003CD98(D_800DC4E0, camera1, 0, 0); - func_8003CD98(D_800DC4E0, camera1, 1, 0); - func_8003CD98(D_800DC4E4, camera1, 2, 0); - func_8003CD98(D_800DC4E8, camera1, 3, 0); - func_8003CD98(D_800DC4EC, camera1, 4, 0); - func_8003CD98(D_800DC4F0, camera1, 5, 0); - func_8003CD98(D_800DC4F4, camera1, 6, 0); - func_8003CD98(D_800DC4F8, camera1, 7, 0); + func_8003CD98(gPlayerTwo, camera1, 0, 0); // sic + func_8003CD98(gPlayerTwo, camera1, 1, 0); + func_8003CD98(gPlayerThree, camera1, 2, 0); + func_8003CD98(gPlayerFour, camera1, 3, 0); + func_8003CD98(gPlayerFive, camera1, 4, 0); + func_8003CD98(gPlayerSix, camera1, 5, 0); + func_8003CD98(gPlayerSeven, camera1, 6, 0); + func_8003CD98(gPlayerEight, camera1, 7, 0); break; case 1: case 2: - func_8003CD98(D_800DC4FC, camera1, 0, 0); - func_8003CD98(D_800DC4E0, camera1, 1, 0); - func_8003CD98(D_800DC4E4, camera1, 2, 0); - func_8003CD98(D_800DC4E8, camera1, 3, 0); - func_8003CD98(D_800DC4EC, camera1, 4, 0); - func_8003CD98(D_800DC4F0, camera1, 5, 0); - func_8003CD98(D_800DC4F4, camera1, 6, 0); - func_8003CD98(D_800DC4F8, camera1, 7, 0); - func_8003CD98(D_800DC4FC, camera2, 0, 1); - func_8003CD98(D_800DC4E0, camera2, 1, 1); - func_8003CD98(D_800DC4E4, camera2, 2, 1); - func_8003CD98(D_800DC4E8, camera2, 3, 1); - func_8003CD98(D_800DC4EC, camera2, 4, 1); - func_8003CD98(D_800DC4F0, camera2, 5, 1); - func_8003CD98(D_800DC4F4, camera2, 6, 1); - func_8003CD98(D_800DC4F8, camera2, 7, 1); + func_8003CD98(gPlayerOneCopy, camera1, 0, 0); + func_8003CD98(gPlayerTwo, camera1, 1, 0); + func_8003CD98(gPlayerThree, camera1, 2, 0); + func_8003CD98(gPlayerFour, camera1, 3, 0); + func_8003CD98(gPlayerFive, camera1, 4, 0); + func_8003CD98(gPlayerSix, camera1, 5, 0); + func_8003CD98(gPlayerSeven, camera1, 6, 0); + func_8003CD98(gPlayerEight, camera1, 7, 0); + func_8003CD98(gPlayerOneCopy, camera2, 0, 1); + func_8003CD98(gPlayerTwo, camera2, 1, 1); + func_8003CD98(gPlayerThree, camera2, 2, 1); + func_8003CD98(gPlayerFour, camera2, 3, 1); + func_8003CD98(gPlayerFive, camera2, 4, 1); + func_8003CD98(gPlayerSix, camera2, 5, 1); + func_8003CD98(gPlayerSeven, camera2, 6, 1); + func_8003CD98(gPlayerEight, camera2, 7, 1); break; case 3: - func_8003CD98(D_800DC4FC, camera1, 0, 0); - func_8003CD98(D_800DC4E0, camera1, 1, 0); - func_8003CD98(D_800DC4E4, camera1, 2, 0); - func_8003CD98(D_800DC4E8, camera1, 3, 0); - func_8003CD98(D_800DC4FC, camera2, 0, 1); - func_8003CD98(D_800DC4E0, camera2, 1, 1); - func_8003CD98(D_800DC4E4, camera2, 2, 1); - func_8003CD98(D_800DC4E8, camera2, 3, 1); - func_8003CD98(D_800DC4FC, camera3, 0, 2); - func_8003CD98(D_800DC4E0, camera3, 1, 2); - func_8003CD98(D_800DC4E4, camera3, 2, 2); - func_8003CD98(D_800DC4E8, camera3, 3, 2); - func_8003CD98(D_800DC4FC, camera4, 0, 3); - func_8003CD98(D_800DC4E0, camera4, 1, 3); - func_8003CD98(D_800DC4E4, camera4, 2, 3); - func_8003CD98(D_800DC4E8, camera4, 3, 3); + func_8003CD98(gPlayerOneCopy, camera1, 0, 0); + func_8003CD98(gPlayerTwo, camera1, 1, 0); + func_8003CD98(gPlayerThree, camera1, 2, 0); + func_8003CD98(gPlayerFour, camera1, 3, 0); + func_8003CD98(gPlayerOneCopy, camera2, 0, 1); + func_8003CD98(gPlayerTwo, camera2, 1, 1); + func_8003CD98(gPlayerThree, camera2, 2, 1); + func_8003CD98(gPlayerFour, camera2, 3, 1); + func_8003CD98(gPlayerOneCopy, camera3, 0, 2); + func_8003CD98(gPlayerTwo, camera3, 1, 2); + func_8003CD98(gPlayerThree, camera3, 2, 2); + func_8003CD98(gPlayerFour, camera3, 3, 2); + func_8003CD98(gPlayerOneCopy, camera4, 0, 3); + func_8003CD98(gPlayerTwo, camera4, 1, 3); + func_8003CD98(gPlayerThree, camera4, 2, 3); + func_8003CD98(gPlayerFour, camera4, 3, 3); break; } } @@ -1234,7 +1234,7 @@ GLOBAL_ASM("asm/non_matchings//code_800393C0/func_8003D080.s") // if 1C is typed as s32 it matches, but spawn_player saves it as a float // it's z pos so it should be a float, m2c detects it as f32 in func_8001C4D0 void func_8003DB5C(void) { - Player *player = D_800DC4DC; + Player *player = gPlayerOne; s32 i; func_8001C4D0(player->posX, player->posY, player->posZ, player->unk_02E, 3, 0); diff --git a/src/code_800431B0.c b/src/code_800431B0.c index 738fce04d..6d7694533 100644 --- a/src/code_800431B0.c +++ b/src/code_800431B0.c @@ -4119,7 +4119,7 @@ extern Gfx D_0D007EB8[]; extern Gfx D_0D008108[]; void func_8004C364(s32 arg0, s32 arg1, u32 arg2, u32 arg3, s32 arg4) { - + gSPDisplayList(gDisplayListHead++, D_0D008108); gSPDisplayList(gDisplayListHead++, D_0D007EF8); gDPSetAlphaCompare(gDisplayListHead++, G_AC_THRESHOLD); @@ -5220,7 +5220,7 @@ void func_8004F168(s32 arg0, s32 arg1, s32 arg2) { s32 temp_t0; s32 temp_v0; - temp_v1 = &D_800DC4DC[arg1]; + temp_v1 = &gPlayerOne[arg1]; temp_t0 = arg0 * 2; if ((temp_v1->unk_000 & PLAYER_EXISTS) != 0) { temp_f0 = D_8018D2A0; @@ -5294,7 +5294,7 @@ void func_8004F3E4(s32 arg0) { phi_v1 = temp_v1; if (temp_v1 > 0) { do { - temp_v0_2 = phi_s0 + D_800DC4DC; + temp_v0_2 = phi_s0 + gPlayerOne; if ((temp_v0_2->unk0 & 0x40) == 0) { func_8004F168(arg0, phi_s1, temp_v0_2->unk254); phi_v1 = gPlayerCountSelection1; @@ -5312,7 +5312,7 @@ void func_8004F3E4(s32 arg0) { phi_s0_2 = (temp_s1_2 * 2) + &D_80164360; do { temp_a1 = *phi_s0_2; - func_8004F168(arg0, temp_a1, D_800DC4DC[temp_a1].characterId); + func_8004F168(arg0, temp_a1, gPlayerOne[temp_a1].characterId); temp_s0 = phi_s0_2 - 2; phi_s0_2 = temp_s0; } while (temp_s0 >= &D_80164360); @@ -5322,12 +5322,12 @@ void func_8004F3E4(s32 arg0) { return; } phi_s0_3 = 0; - phi_v0 = D_800DC4DC; + phi_v0 = gPlayerOne; do { phi_v0_2 = phi_v0; if ((*(phi_s0_3 + phi_v0) & 0x100) == 0x100) { func_8004F168(arg0, phi_s1_2, 8); - phi_v0_2 = D_800DC4DC; + phi_v0_2 = gPlayerOne; } temp_s1_3 = phi_s1_2 + 1; phi_s0_3 += 0xDD8; @@ -5343,7 +5343,7 @@ void func_8004F3E4(s32 arg0) { phi_s0_4 = (temp_s1_4 * 2) + &D_80164360; do { temp_a1_2 = *phi_s0_4; - if ((D_800DC4DC[temp_a1_2].unk_000 & 0x1000) != 0) { + if ((gPlayerOne[temp_a1_2].unk_000 & 0x1000) != 0) { func_8004F168(arg0, temp_a1_2, 8); } temp_s0_2 = phi_s0_4 - 2; @@ -5355,7 +5355,7 @@ void func_8004F3E4(s32 arg0) { phi_s0_5 = (phi_s1_3 * 2) + &D_80164360; do { temp_a1_3 = *phi_s0_5; - temp_v0_3 = &D_800DC4DC[temp_a1_3]; + temp_v0_3 = &gPlayerOne[temp_a1_3]; if ((temp_v0_3->unk_000 & 0x1000) != 0x1000) { func_8004F168(arg0, temp_a1_3, temp_v0_3->characterId); } @@ -5929,7 +5929,7 @@ void func_80050320(void) { } temp_v1 = gGPCurrentRaceRanks[phi_s0]; temp_a1 = lapCount[*((phi_s0 * 2) + &D_80164360)]; - if (temp_v1 == D_800DC4DC->characterId) { + if (temp_v1 == gPlayerOne->characterId) { func_8004FDB4(*temp_t0, temp_f14, phi_a0, temp_a1, phi_s0, temp_a1, temp_v1, 0xFF, 1, phi_a0, 0); } else { func_8004FDB4(*temp_t0, temp_f14, phi_a0, temp_a1, phi_s0, temp_a1, temp_v1, D_8018D3E0, 0, phi_a0, 0); @@ -5954,7 +5954,7 @@ void func_80050320(void) { } temp_v0 = *((phi_s0_2 * 2) + &D_80164360); temp_a1_2 = lapCount[temp_v0]; - temp_v1_2 = D_800DC4DC[temp_v0].characterId; + temp_v1_2 = gPlayerOne[temp_v0].characterId; if (temp_v0 == 0) { func_8004FDB4(*temp_t0_2, temp_f14_2, phi_a0_2, temp_a1_2, phi_s0_2, temp_a1_2, temp_v1_2, 0xFF, 1, phi_a0_2, 1); } else { @@ -6259,7 +6259,7 @@ void func_80050E34(s32 arg0, s32 arg1) { void *temp_v0_9; void *phi_s1; - temp_v0 = &D_800DC4DC[arg0]; + temp_v0 = &gPlayerOne[arg0]; spAC = temp_v0; temp_s0 = *(&lapCount + (arg0 * 4)); temp_s1 = temp_v0->characterId; @@ -6412,7 +6412,7 @@ void func_80050E34(s32 arg0, s32 arg1) { gDisplayListHead = temp_v0_26 + 8; temp_v0_26->unk0 = 0x6000000; temp_v0_26->unk4 = &D_0D006950; - if ((spAC == D_800DC4DC) && (gScreenModeSelection == SCREEN_MODE_1P)) { + if ((spAC == gPlayerOne) && (gScreenModeSelection == SCREEN_MODE_1P)) { temp_v0_27 = gDisplayListHead; gDisplayListHead = temp_v0_27 + 8; temp_v0_27->unk4 = &D_0D007A40; @@ -6463,7 +6463,7 @@ void func_800514BC(void) { phi_s2 = (temp_s0 * 2) + &D_80164360; do { temp_a0 = *phi_s2; - if (((D_800DC4DC[temp_a0].unk_000 & 0x8000) != 0) && ((temp_a0 != 0) || (gPlayerCountSelection1 != 1))) { + if (((gPlayerOne[temp_a0].unk_000 & 0x8000) != 0) && ((temp_a0 != 0) || (gPlayerCountSelection1 != 1))) { func_80050E34(temp_a0, phi_s0); } temp_s1 = phi_s1 + 1; @@ -7262,7 +7262,7 @@ extern ? D_80183E80; void func_8005285C(s32 arg0) { Player *temp_v0; - temp_v0 = &D_800DC4DC[arg0]; + temp_v0 = &gPlayerOne[arg0]; D_80183E40.unk0 = temp_v0->posX; D_80183E40.unk4 = temp_v0->posY; D_80183E80.unk0 = 0; @@ -7472,7 +7472,7 @@ void func_80052D70(s32 arg0) { Player *sp20; Player *temp_v1; - temp_v1 = &D_800DC4DC[arg0]; + temp_v1 = &gPlayerOne[arg0]; sp20 = temp_v1; if (func_80072320(*(&D_80183DB8 + (arg0 * 4)), 8) != 0) { D_80183E40.unk0 = temp_v1->posX; @@ -9747,7 +9747,7 @@ void func_800568A0(s32 arg0, s32 arg1) { D_80183E50.unk0 = temp_v0->unk4; D_80183E50.unk4 = temp_v0->unk44 + D_800EE088; D_80183E50.unk8 = temp_v0->unkC; - func_80042A20(&sp30, &D_800DC4DC[arg1].unk_140, &D_80183E50, 0, 0.5f); + func_80042A20(&sp30, &gPlayerOne[arg1].unk_140, &D_80183E50, 0, 0.5f); func_80022180(gGfxPool + (D_8018D120 << 6) + 0x2C0, &sp30, &D_8018D120); temp_v0_2 = gDisplayListHead; gDisplayListHead = temp_v0_2 + 8; @@ -9837,7 +9837,7 @@ void func_80056AC0(s32 arg0) { temp_v1 = &D_80165C18 + (temp_s0 * 0xE0); if (temp_v1->unkA6 != 0) { temp_s1 = temp_v1->unkA0; - temp_v0 = &D_800DC4DC[phi_s2]; + temp_v0 = &gPlayerOne[phi_s2]; temp_v1->unk4 = temp_v0->posX; temp_v1->unk8 = temp_v0->posY - 2.0; temp_v1->unkC = temp_v0->posZ; diff --git a/src/code_80057C60.c b/src/code_80057C60.c index a1538cc6a..e863a3dde 100644 --- a/src/code_80057C60.c +++ b/src/code_80057C60.c @@ -97,7 +97,7 @@ void func_80057FC4(u32 arg0) { if ((D_801657C8 != 0)){ return; } - + switch (arg0) { case 0: func_80051EBC(); @@ -115,7 +115,7 @@ void func_80057FC4(u32 arg0) { func_80052080(); break; } - + } extern s32 D_8018D22C; @@ -130,14 +130,14 @@ void func_80058090(u32 arg0) { if (D_801657B0 != 0) { return; } - + gSPDisplayList(gDisplayListHead++, &D_0D0076F8); - + if (D_8018D22C != 0) { return; } - - + + switch (arg0) { case 0: func_800581C8(); @@ -248,9 +248,9 @@ void func_80058538(u32 arg0) { if (D_801657B0 != 0) { return; } - + gSPDisplayList(gDisplayListHead++, &D_0D0076F8); - + if (D_8018D22C != 0) { return; } @@ -380,7 +380,7 @@ void func_800588F4(s32 arg0) { func_80055528(arg0); } if (D_800DC50C != CREDITS_SEQUENCE) { - + if ((D_8018EDF3 == 1) || (D_8018EDF3 == 2)) { func_80055380(arg0); } @@ -431,7 +431,7 @@ void func_800588F4(s32 arg0) { } break; } - + func_80054938(arg0); func_80051638(arg0); @@ -493,49 +493,49 @@ void func_80058C20(u32 arg0) { func_80059358(); break; } - + break; case 2: if (D_800DC51C == 0) { func_800593F0(); break; } - + break; case 3: if (D_800DC51C == 0) { func_800594F0(); break; } - + break; case 4: if (D_800DC51C == 0) { func_80059528(); break; } - + break; case 8: if (D_800DC51C == 0) { func_800596A8(); break; } - + break; case 9: if (D_800DC51C == 0) { func_80059710(); break; } - + break; case 10: if (D_800DC51C == 0) { func_80059750(); break; } - + break; case 11: if ((D_800DC51C == 0) && (gPlayerCountSelection1 == 4)) { @@ -569,49 +569,49 @@ void func_80058DB4(u32 arg0) { func_80059360(); break; } - + break; case 2: if (D_800DC51C == 0) { func_800593F8(); break; } - + break; case 3: if (D_800DC51C == 0) { func_800594F8(); break; } - + break; case 4: if (D_800DC51C == 0) { func_80059530(); break; } - + break; case 8: if (D_800DC51C == 0) { func_800596D8(); break; } - + break; case 9: if (D_800DC51C == 0) { func_80059718(); break; } - + break; case 10: if (D_800DC51C == 0) { func_80059780(); break; } - + break; case 11: if ((D_800DC51C == 0) && (gPlayerCountSelection1 == 4)) { @@ -957,7 +957,7 @@ void func_800597E8(void) { //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 //extern ? D_8018CA70; extern s32 D_8018CF14; -extern Player *D_800DC4DC; +extern Player *gPlayerOne; extern Player *D_8018CF1C; extern Camera *camera1; extern s8 D_8018CA70; @@ -966,7 +966,7 @@ void func_80059820(s32 arg0) { Player *temp_v1; Camera *temp_v0; - D_8018CF1C = D_800DC4DC; //&D_800DC4DC[arg0]; + D_8018CF1C = gPlayerOne; //&gPlayerOne[arg0]; D_8018CF14 = camera1->unk27 * arg0; //(arg0 * 0xB8) + camera1; temp_v1 = D_8018CF1C; temp_v0 = (arg0 * 0x84) + &D_8018CA70; @@ -979,9 +979,9 @@ GLOBAL_ASM("asm/non_matchings/code_80057C60/func_80059820.s") #endif extern u8 D_801658FF; -extern struct Controller *D_800DC4BC; +extern struct Controller *gControllerOne; void func_800598D4(s32 arg0) { - struct Controller *controller = &D_800DC4BC[arg0]; + struct Controller *controller = &gControllerOne[arg0]; if ((controller->button & 0x8000) != 0) { D_801658FF++; @@ -1013,7 +1013,7 @@ void func_8005995C(void) { Player *phi_v0; s32 phi_v1; - phi_v0 = D_800DC4DC; + phi_v0 = gPlayerOne; phi_v1 = 0; do { if ((D_80165890 != 0) && ((phi_v0->unk_000 & 0x100) != 0)) { @@ -1093,7 +1093,7 @@ void func_80059AC8(void) { phi_s2 += 2; phi_s0++; } //while (phi_s0 != 8); - + switch (gScreenModeSelection) { case SCREEN_MODE_1P: if (D_800DC50C != 9) { @@ -1150,7 +1150,7 @@ void func_80059C50(void) { phi_v0 = gGPCurrentRaceRanks; do { temp_v0 = phi_v0 + 2; - temp_v0->unk-2 = D_800DC4DC[*phi_a0].characterId; + temp_v0->unk-2 = gPlayerOne[*phi_a0].characterId; phi_a0 += 2; phi_v0 = temp_v0; } while (temp_v0 < &D_8018CF90); @@ -1284,7 +1284,7 @@ void func_80059D00(void) { } func_80078C70(0); if (D_8018CAE0 == 0) { - func_8005C360((D_800DC4FC->unk_094 / 18.0f) * 216.0f); + func_8005C360((gPlayerOneCopy->unk_094 / 18.0f) * 216.0f); } func_8005D0FC(0); } else { @@ -1375,7 +1375,7 @@ void func_8005A14C(s32 arg0) { void *temp_s0_2; void *phi_s0; - temp_t0 = &D_800DC4DC[arg0]; + temp_t0 = &gPlayerOne[arg0]; sp28 = *(&lapCount + (arg0 * 4)); temp_a3 = *(&D_8018CE24 + (arg0 << 5)); if ((temp_t0->unk_000 & 0x8000) != 0) { @@ -1486,7 +1486,7 @@ void func_8005A3C0(s32 arg2) { if (temp_v0_2 != 3) { if (temp_v0_2 != 4) { phi_a2 = 3; - } else if (((D_800DC4BC->buttonPressed & 1) != 0) || ((D_800DC4C0->buttonPressed & 1) != 0) || ((D_800DC4C4->buttonPressed & 1) != 0) || (phi_a2 = 3, ((D_800DC4C8->buttonPressed & 1) != 0))) { + } else if (((gControllerOne->buttonPressed & 1) != 0) || ((gControllerTwo->buttonPressed & 1) != 0) || ((gControllerThree->buttonPressed & 1) != 0) || (phi_a2 = 3, ((gControllerFour->buttonPressed & 1) != 0))) { D_801657E4 = (D_801657E4 + 1) & 1; D_801657F8 = (D_801657F8 + 1) & 1; D_80165800.unk0 = (D_80165800.unk0 + 1) & 1; @@ -1498,7 +1498,7 @@ void func_8005A3C0(s32 arg2) { phi_a2 = 3; } } - } else if (((D_800DC4BC->buttonPressed & 1) != 0) || ((D_800DC4C0->buttonPressed & 1) != 0) || (phi_a2 = 3, ((D_800DC4C4->buttonPressed & 1) != 0))) { + } else if (((gControllerOne->buttonPressed & 1) != 0) || ((gControllerTwo->buttonPressed & 1) != 0) || (phi_a2 = 3, ((gControllerThree->buttonPressed & 1) != 0))) { if (gModeSelection != BATTLE) { D_801657F0 = (D_801657F0 + 1) & 1; } @@ -1509,11 +1509,11 @@ void func_8005A3C0(s32 arg2) { } else { phi_a2 = 3; if (gModeSelection != BATTLE) { - if ((D_800DC4BC->buttonPressed & 1) != 0) { + if ((gControllerOne->buttonPressed & 1) != 0) { D_80165800.unk0 = (D_80165800.unk0 + 1) & 1; phi_a1 = 1; } - if ((D_800DC4C0->buttonPressed & 1) != 0) { + if ((gControllerTwo->buttonPressed & 1) != 0) { D_80165800.unk1 = (D_80165800.unk1 + 1) & 1; phi_a1 = 1; } @@ -1529,7 +1529,7 @@ void func_8005A3C0(s32 arg2) { } } } - } else if ((D_800DC4BC->buttonPressed & 1) != 0) { + } else if ((gControllerOne->buttonPressed & 1) != 0) { D_801657E4 += 1; if (D_801657E4 >= 3) { D_801657E4 = 0; @@ -2866,7 +2866,7 @@ void func_8005C980(void) { ? *phi_t0; s32 phi_v1; - temp_a3 = D_800DC4DC; + temp_a3 = gPlayerOne; temp_a1 = D_80165590; phi_a0 = &D_801643B8; phi_v0 = 0; @@ -3020,7 +3020,7 @@ void func_8005CB60(s32 arg0, s32 arg1) { D_80165658.unk4 = 0; D_80165658.unk0 = 0; } - temp_a1 = D_800DC4DC[arg0].characterId; + temp_a1 = gPlayerOne[arg0].characterId; arg0 = temp_a3; sp20 = temp_v1; func_800C90F4(0, (temp_a1 * 0x10) + 0x2900800D, 1, temp_a3); @@ -4943,7 +4943,7 @@ void func_80060BCC(void *arg0, s16 arg1, s32 arg2, ? arg3) { void *temp_v0_2; temp_v0 = gCurrentCourseId; - if ((temp_v0 != 0x10) && (temp_v0 != 0xD) && (sp54 = random_int(0x168) - 0xB4, sp4C = random_int(6), sp44 = random_int(6), sp48 = random_int(3), (arg0 == D_800DC4DC))) { + if ((temp_v0 != 0x10) && (temp_v0 != 0xD) && (sp54 = random_int(0x168) - 0xB4, sp4C = random_int(6), sp44 = random_int(6), sp48 = random_int(3), (arg0 == gPlayerOne))) { if ((arg1 == 0) && ((temp_v0_2 = arg0 + (arg2 * 0x48), (temp_v0_2->unk546 > 0)) || (temp_v0_2->unk544 == 0))) { temp_s0 = arg0 + (arg1 * 0x48); temp_s1 = temp_s0 + 0x528; @@ -11895,11 +11895,11 @@ void func_8006E058(void) { } temp_v0_2 = gModeSelection; if ((temp_v0_2 == VERSUS) || (temp_v0_2 == BATTLE)) { - func_8006E420(D_800DC4DC, 0, 0); - func_8006E420(D_800DC4E0, 1, 0); - func_8006E420(D_800DC4E4, 2, 0); + func_8006E420(gPlayerOne, 0, 0); + func_8006E420(gPlayerTwo, 1, 0); + func_8006E420(gPlayerThree, 2, 0); if (gPlayerCountSelection1 == 4) { - func_8006E420(D_800DC4E8, 3, 0); + func_8006E420(gPlayerFour, 3, 0); } } // Duplicate return node #32. Try simplifying control flow for better match @@ -11911,12 +11911,12 @@ void func_8006E058(void) { if ((temp_v0_3 != VERSUS) && (temp_v0_3 != BATTLE)) { return; } - func_8006E420(D_800DC4DC, 0, 0); - func_8006E420(D_800DC4E0, 1, 0); + func_8006E420(gPlayerOne, 0, 0); + func_8006E420(gPlayerTwo, 1, 0); return; } - func_8006E420(D_800DC4DC, 0, 0); - temp_a0 = D_800DC4E0; + func_8006E420(gPlayerOne, 0, 0); + temp_a0 = gPlayerTwo; if ((temp_a0->unk_000 & 0x8000) == 0x8000) { func_8006E420(temp_a0, 1, 0); return; @@ -11924,14 +11924,14 @@ void func_8006E058(void) { // Duplicate return node #32. Try simplifying control flow for better match return; } - func_8006E420(D_800DC4DC, 0, 0); - func_8006E420(D_800DC4E0, 1, 0); - func_8006E420(D_800DC4E4, 2, 0); - func_8006E420(D_800DC4E8, 3, 0); - func_8006E420(D_800DC4EC, 4, 0); - func_8006E420(D_800DC4F0, 5, 0); - func_8006E420(D_800DC4F4, 6, 0); - func_8006E420(D_800DC4F8, 7, 0); + func_8006E420(gPlayerOne, 0, 0); + func_8006E420(gPlayerTwo, 1, 0); + func_8006E420(gPlayerThree, 2, 0); + func_8006E420(gPlayerFour, 3, 0); + func_8006E420(gPlayerFive, 4, 0); + func_8006E420(gPlayerSix, 5, 0); + func_8006E420(gPlayerSeven, 6, 0); + func_8006E420(gPlayerEight, 7, 0); return; } temp_v0_4 = gModeSelection; @@ -11940,41 +11940,41 @@ void func_8006E058(void) { if ((temp_v0_4 != VERSUS) && (temp_v0_4 != BATTLE)) { return; } - func_8006E420(D_800DC4DC, 0, 0); - func_8006E420(D_800DC4E0, 1, 0); + func_8006E420(gPlayerOne, 0, 0); + func_8006E420(gPlayerTwo, 1, 0); temp_v0_5 = gPlayerCountSelection1; phi_v0 = temp_v0_5; if (temp_v0_5 >= 3) { - func_8006E420(D_800DC4E4, 2, 0); + func_8006E420(gPlayerThree, 2, 0); phi_v0 = gPlayerCountSelection1; } if (phi_v0 == 4) { - func_8006E420(D_800DC4E8, 3, 0); + func_8006E420(gPlayerFour, 3, 0); return; } // Duplicate return node #32. Try simplifying control flow for better match return; } - func_8006E420(D_800DC4DC, 0, 0); - temp_a0_2 = D_800DC4E0; + func_8006E420(gPlayerOne, 0, 0); + temp_a0_2 = gPlayerTwo; if ((temp_a0_2->unk_000 & 0x100) == 0x100) { func_8006E420(temp_a0_2, 1, 0); } - temp_a0_3 = D_800DC4E4; + temp_a0_3 = gPlayerThree; if ((temp_a0_3->unk_000 & 0x100) == 0x100) { func_8006E420(temp_a0_3, 2, 0); return; } return; } - func_8006E420(D_800DC4DC, 0, 0); - func_8006E420(D_800DC4E0, 1, 0); - func_8006E420(D_800DC4E4, 2, 0); - func_8006E420(D_800DC4E8, 3, 0); - func_8006E420(D_800DC4EC, 4, 0); - func_8006E420(D_800DC4F0, 5, 0); - func_8006E420(D_800DC4F4, 6, 0); - func_8006E420(D_800DC4F8, 7, 0); + func_8006E420(gPlayerOne, 0, 0); + func_8006E420(gPlayerTwo, 1, 0); + func_8006E420(gPlayerThree, 2, 0); + func_8006E420(gPlayerFour, 3, 0); + func_8006E420(gPlayerFive, 4, 0); + func_8006E420(gPlayerSix, 5, 0); + func_8006E420(gPlayerSeven, 6, 0); + func_8006E420(gPlayerEight, 7, 0); } #else GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8006E058.s") diff --git a/src/code_8006E9C0.c b/src/code_8006E9C0.c index 648b9f0cb..bc1248afc 100644 --- a/src/code_8006E9C0.c +++ b/src/code_8006E9C0.c @@ -951,7 +951,7 @@ void func_8006FA94(void) { phi_v1_2 = D_8018CE10; phi_a0_2 = 0; phi_a3 = &D_8018CF50; - phi_v0 = D_800DC4DC; + phi_v0 = gPlayerOne; phi_t0 = &D_8018CF28; do { phi_a1_2->unk0 = -32.0f; diff --git a/src/code_80071F00.c b/src/code_80071F00.c index 92277779c..87a7b8bdf 100644 --- a/src/code_80071F00.c +++ b/src/code_80071F00.c @@ -162,7 +162,7 @@ void func_80072180(void) { u16 temp_v0; if (gModeSelection == TIME_TRIALS) { - temp_v0 = D_800DC4DC->unk_000; + temp_v0 = gPlayerOne->unk_000; if (((temp_v0 & 0x8000) != 0) && ((temp_v0 & 0x1100) == 0)) { D_80162DF8 = 1; } @@ -4552,18 +4552,18 @@ void func_80078288(s32 arg0) { return; } if (D_800DC50C != CREDITS_SEQUENCE) { - sp3A = ((D_800DC4FC->unk_094 / 18.0f) * 216.0f) / 2.0f; + sp3A = ((gPlayerOneCopy->unk_094 / 18.0f) * 216.0f) / 2.0f; sp3E = (random_int(0xF) - sp3A) + 0x2D; sp3C = random_int(0x12C) + 0x1E; temp_t6 = (((random_int(0x3000) - 0x1800) / ((sp3A / 0xF) + 1)) + camera1->unk26) & 0xFFFF; temp_a0 = temp_t6; sp36 = temp_t6; - temp_v0_2 = D_800DC4FC; + temp_v0_2 = gPlayerOneCopy; temp_f2 = sp3C; temp_s0->unk10 = (sins(temp_a0) * temp_f2) + temp_v0_2->posX; sp24 = temp_f2; temp_s0->unk14 = sp3E + temp_v0_2->unk_074; - temp_s0->unk18 = (coss(sp36) * temp_f2) + D_800DC4FC->posZ; + temp_s0->unk18 = (coss(sp36) * temp_f2) + gPlayerOneCopy->posZ; temp_s0->unkC4 = random_int(0x400) + 0x100; temp_v0_3 = random_int(0x64); temp_f8 = temp_v0_3; @@ -5078,7 +5078,7 @@ void func_800791F0(s32 arg0, u8 arg1) { s32 phi_a0; temp_v0 = *(&D_80165CF0 + (arg0 * 0xE0)); - temp_t8 = D_800DC4DC; + temp_t8 = gPlayerOne; temp_v1 = &temp_t8[arg1]; if ((temp_v0 != 3) && (temp_v0 != 7)) { sp1C = temp_v1; @@ -5337,7 +5337,7 @@ void func_800797AC(s32 arg0) { s32 temp_a2; temp_a2 = *(&D_80183DB8 + (arg0 * 4)); - temp_v0 = &D_800DC4DC[arg0]; + temp_v0 = &gPlayerOne[arg0]; if ((gCurrentCourseId == 0xC) && ((temp_v0->unk_0CA & 1) != 0)) { sp18 = temp_v0; sp1C = temp_a2; @@ -5368,7 +5368,7 @@ void func_80079860(s32 arg0) { s32 temp_a3; temp_a3 = arg0; - temp_a2 = &D_800DC4DC[temp_a3]; + temp_a2 = &gPlayerOne[temp_a3]; temp_a0 = *(&D_80183DB8 + (arg0 * 4)); sp18 = temp_a2; arg0 = temp_a3; @@ -5514,7 +5514,7 @@ void func_80079B40(s32 arg0, s32 playerId) { void *temp_t2; temp_t2 = (arg0 * 0xE0) + &D_80165C18; - sp34 = (playerId * 0xDD8) + D_800DC4DC; + sp34 = (playerId * 0xDD8) + gPlayerOne; sp2C = temp_t2; temp_v0 = temp_t2->unkA6; if (temp_v0 != 0) { @@ -5603,7 +5603,7 @@ void func_80079D44(s32 arg0, s32 playerId) { temp_t1 = (arg0 * 0xE0) + &D_80165C18; sp2C = temp_t1; temp_v0 = temp_t1->unkA6; - temp_s1 = (playerId * 0xDD8) + D_800DC4DC; + temp_s1 = (playerId * 0xDD8) + gPlayerOne; if (temp_v0 != 0) { if (temp_v0 != 1) { if (temp_v0 != 2) { @@ -5923,7 +5923,7 @@ void func_8007A4D4(s32 arg0, s32 playerId) { temp_s0 = (arg0 * 0xE0) + &D_80165C18; temp_t2 = temp_s0->unkA6; - sp2C = (playerId * 0xDD8) + D_800DC4DC; + sp2C = (playerId * 0xDD8) + gPlayerOne; switch (temp_t2) { case 1: func_8007A3F0(arg0, playerId); @@ -6026,7 +6026,7 @@ extern ? D_80165CBE; extern ? D_80183DB8; void func_8007A88C(s32 arg0) { - if ((*(&D_80165CBE + (*(&D_80183DB8 + (arg0 * 4)) * 0xE0)) == 0) && (D_800DC4DC[arg0].unk_0BC & 0x400000)) { + if ((*(&D_80165CBE + (*(&D_80183DB8 + (arg0 * 4)) * 0xE0)) == 0) && (gPlayerOne[arg0].unk_0BC & 0x400000)) { func_800790E4(); } } @@ -6213,7 +6213,7 @@ void func_8007AC9C(s32 arg0) { temp_s0 = *(&D_80183E88 + (arg0 * 4)); temp_s1 = (temp_s0 * 0xE0) + &D_80165C18; - temp_v0 = &D_800DC4DC[arg0]; + temp_v0 = &gPlayerOne[arg0]; if (temp_s1->unkA4 == 0xF) { sp20 = temp_v0; if (func_80072354(temp_s0, 2) != 0) { @@ -6441,7 +6441,7 @@ extern s32 D_80183E88; temp_a3_2->unkD2 = temp_t0_2; temp_a2 = &D_80183E88 + (temp_v1_2 * 4); temp_a0 = *temp_a2; - sp38 = ((((temp_t8 - temp_v1_2) * 4) - temp_v1_2) * 8) + D_800DC4DC; + sp38 = ((((temp_t8 - temp_v1_2) * 4) - temp_v1_2) * 8) + gPlayerOne; sp64 = temp_a0; func_800722A4(temp_a0, 1, temp_a2, temp_a3_2); temp_s0 = &D_80165C18 + (temp_a0 * 0xE0); @@ -6559,10 +6559,10 @@ void func_8007B34C(s32 playerId) { void *temp_v1_5; void *temp_v1_6; - sp38 = (playerId * 0xDD8) + D_800DC4DC; + sp38 = (playerId * 0xDD8) + gPlayerOne; sp40 = 0; temp_s0 = *(&D_80183E88 + (playerId * 4)); - if ((((playerId * 0x10) + D_800DC4BC)->unk6 & 0x2000) != 0) { + if ((((playerId * 0x10) + gControllerOne)->unk6 & 0x2000) != 0) { sp40 = 1; } if (D_80165888 != 0) { @@ -7555,7 +7555,7 @@ void func_8007CC00(void) { temp_v0 = temp_s0->unkD1; temp_t4 = (0x8000 - ((temp_v0 * 0xB8) + camera1)->unk26) & 0xFFFF; temp_s1 = temp_t4; - temp_s3 = &D_800DC4DC[temp_v0]; + temp_s3 = &gPlayerOne[temp_v0]; temp_f20 = coss(temp_t4 & 0xFFFF); temp_s0->unk4 = (temp_s3->posX + (temp_f20 * (temp_s0->unk10 + temp_s0->unk28))) - ((temp_s0->unk30 + temp_s0->unk18) * sins(temp_s1 & 0xFFFF)); temp_s0->unk8 = temp_s0->unk2C + (6.5 + temp_s3->unk_074 + temp_s0->unk14); @@ -8474,7 +8474,7 @@ s32 func_8007E59C(s32 arg0) { s32 phi_s2; s32 phi_v1; - phi_s0 = D_800DC4DC; + phi_s0 = gPlayerOne; phi_s1 = camera1; phi_s2 = 0; phi_v1 = 0; @@ -9187,7 +9187,7 @@ void func_8007F6C4(s32 arg0, s32 arg1) { Player *sp1C; void *temp_v0; - sp1C = &D_800DC4DC[arg1]; + sp1C = &gPlayerOne[arg1]; func_800722A4(8); func_80086E70(arg0); temp_v0 = (arg0 * 0xE0) + &D_80165C18; @@ -9359,7 +9359,7 @@ void func_8007FB48(s32 arg0) { temp_t7 = arg0 * 0xE0; temp_v1 = temp_t7 + &D_80165C18; temp_t2 = temp_v1->unkAE; - temp_a1 = (temp_v1->unkD1 * 0xDD8) + D_800DC4DC; + temp_a1 = (temp_v1->unkD1 * 0xDD8) + gPlayerOne; switch (temp_t2) { case 1: temp_v1->unkB0 = 0xA0; @@ -10022,7 +10022,8 @@ void func_80080A4C(s32 arg0, s32 arg1) { void *temp_v0; sp1C = (arg1 * 0xB8) + camera1; - temp_a3 = &D_800DC4DC[arg1]; + + temp_a3 = &gPlayerOne[arg1]; if (gScreenModeSelection != 3) { sp18 = temp_a3; if ((func_80072320(0x10, temp_a3) != 0) && (func_80088A58(arg0, temp_a3, 0x43FA0000, temp_a3) != 0)) { @@ -10067,7 +10068,7 @@ void func_80080B28(s16 arg0, s32 arg1) { u16 temp_v0; u16 temp_v0_2; - temp_s0 = &D_800DC4DC[arg1]; + temp_s0 = &gPlayerOne[arg1]; if (func_8007223C(0x200) != 0) { if ((temp_s0->unk_00C & 0x100) == 0) { temp_ret = func_80088F54(arg0, temp_s0); @@ -10131,7 +10132,7 @@ void func_80080DE4(s32 arg0) { Player *phi_v0; s32 phi_v1; - phi_v0 = D_800DC4DC; + phi_v0 = gPlayerOne; phi_v1 = 0; do { temp_v1 = phi_v1 + 4; @@ -10432,7 +10433,7 @@ block_14: phi_s4_2 = temp_s4_2; } while (temp_s4_2 < phi_v0); } - phi_s3 = D_800DC4DC; + phi_s3 = gPlayerOne; do { phi_s3->unk1AC = phi_s3->unk1AC & ~3; phi_s3->unk46 = phi_s3->unk46 & 0xFFF9; @@ -10859,7 +10860,7 @@ void func_80081D34(s32 arg0) { s32 phi_s5; s32 phi_s5_2; - phi_s1 = D_800DC4DC; + phi_s1 = gPlayerOne; phi_s2 = 0; phi_s4 = camera1; phi_s5 = 0; @@ -12251,7 +12252,7 @@ void func_80083FD0(s32 arg0, s32 arg1, s16 arg2) { f64 phi_f10; temp_s0 = (arg0 * 0xE0) + &D_80165C18; - sp20 = &D_800DC4DC[arg2]; + sp20 = &gPlayerOne[arg2]; temp_s0->unk92 = arg2; func_800723A4(0); temp_s0->unk60 = &D_060068E8; diff --git a/src/code_80086E70.c b/src/code_80086E70.c index 5a2c588b5..e3ec1b918 100644 --- a/src/code_80086E70.c +++ b/src/code_80086E70.c @@ -1254,7 +1254,7 @@ void func_80089020(s32 arg0, f32 *arg1) { } else { phi_f2 = -temp_f0; } - if ((D_800DC4DC[arg0].unk_0BC & 0xC0) != 0) { + if ((gPlayerOne[arg0].unk_0BC & 0xC0) != 0) { if (gCurrentCourseId == 0xC) { temp_f0_2 = phi_f2; if (temp_f0_2 <= 0.5) { @@ -1342,7 +1342,7 @@ f32 func_8008933C(void *arg0, s32 arg1, f32 arg2, f32 arg3) { void *temp_v0; f32 phi_f2; - temp_v1 = &D_8018CE10[(arg0 - D_800DC4DC) / 0xDD8]; + temp_v1 = &D_8018CE10[(arg0 - gPlayerOne) / 0xDD8]; phi_f2 = 0.0f; if (temp_v1->unk1E == 0) { arg0->unk46 = arg0->unk46 | 2; @@ -1381,7 +1381,7 @@ f32 func_8008933C(Player *, s32, s32, s32); // extern void func_80089474(s32 arg0, u8 arg1, s32 arg2, s32 arg3, s32 arg4) { Player *sp18; - sp18 = &D_800DC4DC[arg1]; + sp18 = &gPlayerOne[arg1]; if (func_8007223C(0x4000000) != 0) { func_80072180(); } @@ -1414,7 +1414,7 @@ void func_80089820(s32 arg0, ? arg1, f32 arg2, ? arg3) { Player *phi_s0; s32 phi_s1; - temp_s0 = D_800DC4DC; + temp_s0 = gPlayerOne; func_800721E8(0x2000000); if (func_8007223C(arg0, 0x200) != 0) { phi_s1 = 0; @@ -1465,7 +1465,7 @@ void func_80089A04(s32 arg0, ? arg1, f32 arg2) { Player *phi_s0; s32 phi_s1; - temp_s0 = D_800DC4DC; + temp_s0 = gPlayerOne; if (func_8007223C(0x200) != 0) { phi_s1 = 0; if (D_8018D158 > 0) { @@ -1508,7 +1508,7 @@ s32 func_80089B50(s32 arg0) { s32 phi_s2; sp40 = 0; - temp_s0 = D_800DC4DC; + temp_s0 = gPlayerOne; phi_s1 = 0; if (func_8007223C(0x200) != 0) { phi_s2 = 0; @@ -1559,7 +1559,7 @@ extern s32 D_8018D158; ? phi_s7; ? phi_s7_2; - temp_s0 = D_800DC4DC; + temp_s0 = gPlayerOne; phi_s7 = 0; phi_s7_2 = 0; if (func_8007223C(0x200) != 0) { @@ -1609,7 +1609,7 @@ extern s32 D_8018D158; ? phi_s7; ? phi_s7_2; - temp_s0 = D_800DC4DC; + temp_s0 = gPlayerOne; phi_s7 = 0; phi_s7_2 = 0; if (func_8007223C(0x200) != 0) { @@ -2614,8 +2614,8 @@ void func_8008BE0C(s32 arg0, s16 arg1, u16 arg2) { temp_v0 = (arg0 * 0xE0) + &D_80165C18; sp1C = temp_v0; sp18 = temp_f2; - temp_v0->unk10 = temp_f6 + D_800DC4FC->posX; - temp_v0->unk18 = (coss(arg2) * temp_f2) + D_800DC4FC->posZ; + temp_v0->unk10 = temp_f6 + gPlayerOneCopy->posX; + temp_v0->unk18 = (coss(arg2) * temp_f2) + gPlayerOneCopy->posZ; } #else GLOBAL_ASM("asm/non_matchings/code_80086E70/func_8008BE0C.s") diff --git a/src/code_8008C1D0.c b/src/code_8008C1D0.c index e2733e147..f5a414318 100644 --- a/src/code_8008C1D0.c +++ b/src/code_8008C1D0.c @@ -757,7 +757,7 @@ GLOBAL_ASM("asm/non_matchings/code_8008C1D0/func_8008D3B0.s") ? func_8008C354(s8); /* extern */ ? func_800C9060(s32, ?); /* extern */ ? func_800C9250(s32, s8); /* extern */ -extern s32 D_800DC4DC; +extern s32 gPlayerOne; extern u16 D_8015F890; void func_8008D3C4(void *arg0, s8 arg1) { @@ -786,7 +786,7 @@ void func_8008D3C4(void *arg0, s8 arg1) { } } else { temp_a0_2 = arg1 & 0xFF; - if (arg0 == D_800DC4DC) { + if (arg0 == gPlayerOne) { sp24 = temp_a0_2; func_800C9250(temp_a0_2, arg1); func_800C9060(temp_a0_2, 0x1900A40B); @@ -1760,7 +1760,7 @@ GLOBAL_ASM("asm/non_matchings/code_8008C1D0/func_8008EC34.s") ? func_8008C354(s8); /* extern */ ? func_800C9060(s32, ?); /* extern */ ? func_800C90F4(s32, s32, s8); /* extern */ -extern s32 D_800DC4DC; +extern s32 gPlayerOne; extern u16 D_8015F890; void func_8008EC88(void *arg0, s8 arg1) { @@ -1789,7 +1789,7 @@ void func_8008EC88(void *arg0, s8 arg1) { } } else { temp_a0_2 = arg1 & 0xFF; - if (arg0 == D_800DC4DC) { + if (arg0 == gPlayerOne) { sp24 = temp_a0_2; func_800C90F4(temp_a0_2, (arg0->unk254 * 0x10) + 0x29008001, arg1); func_800C9060(temp_a0_2, 0x1900A40B); @@ -1851,7 +1851,7 @@ GLOBAL_ASM("asm/non_matchings/code_8008C1D0/func_8008EEC4.s") ? func_8008C354(s8); /* extern */ ? func_800C9060(s32, ?); /* extern */ ? func_800C90F4(s32, s32, s8); /* extern */ -extern s32 D_800DC4DC; +extern s32 gPlayerOne; extern u16 D_8015F890; void func_8008EEE4(void *arg0, s8 arg1) { @@ -1878,7 +1878,7 @@ void func_8008EEE4(void *arg0, s8 arg1) { } } else { temp_a0_2 = arg1 & 0xFF; - if (arg0 == D_800DC4DC) { + if (arg0 == gPlayerOne) { sp24 = temp_a0_2; func_800C90F4(temp_a0_2, (arg0->unk254 * 0x10) + 0x29008001, arg1); func_800C9060(temp_a0_2, 0x1900A40B); @@ -2425,7 +2425,7 @@ GLOBAL_ASM("asm/non_matchings/code_8008C1D0/func_8008FB30.s") #ifdef MIPS_TO_C //generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909 -s32 func_80027D00(u16 *); /* extern */ +s32 get_player_index_for_player(u16 *); /* extern */ ? func_80056A94(s32, u16 *); /* extern */ void func_8008FC1C(u16 *arg0) { @@ -2435,7 +2435,7 @@ void func_8008FC1C(u16 *arg0) { temp_a1 = arg0; if ((*arg0 & 0x40) != 0) { arg0 = temp_a1; - temp_a0 = func_80027D00(temp_a1); + temp_a0 = get_player_index_for_player(temp_a1); *arg0 = 0x7000; func_80056A94(temp_a0, arg0); } @@ -2896,7 +2896,7 @@ GLOBAL_ASM("asm/non_matchings/code_8008C1D0/func_80090178.s") #ifdef MIPS_TO_C //generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909 -s32 func_80027D00(); /* extern */ +s32 get_player_index_for_player(); /* extern */ ? func_8008C354(void *, s8); /* extern */ ? func_8008E3C0(void *, s8); /* extern */ ? func_8008F86C(void *, s8); /* extern */ @@ -2907,7 +2907,7 @@ void func_80090778(void *arg0) { s32 temp_v0; s32 temp_v0_2; - temp_v0 = func_80027D00(); + temp_v0 = get_player_index_for_player(); sp2C = temp_v0; arg0->unk78 = 0; arg0->unk7C = 0; @@ -2941,7 +2941,7 @@ GLOBAL_ASM("asm/non_matchings/code_8008C1D0/func_80090778.s") #ifdef MIPS_TO_C //generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909 -s8 func_80027D00(); /* extern */ +s8 get_player_index_for_player(); /* extern */ ? func_8008FF08(void *, s8); /* extern */ static s16 gCurrentCourseId; /* type too large by 2; unable to generate initializer */ @@ -2956,7 +2956,7 @@ void func_80090868(void *arg0) { arg0->unkC0 = 0; arg0->unk8C = 0.0f; temp_a0 = arg0; - temp_a1 = func_80027D00(); + temp_a1 = get_player_index_for_player(); if ((temp_a0->unkCA & 2) != 2) { temp_a0->unkD98 = 1; temp_a0->unkD9C = 0.0f; @@ -3387,7 +3387,7 @@ GLOBAL_ASM("asm/non_matchings/code_8008C1D0/func_80091440.s") #ifdef MIPS_TO_C //generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909 -extern void *D_800DC4FC; +extern void *gPlayerOneCopy; extern s16 D_80152308; extern u16 D_8015F6F8; @@ -3396,7 +3396,7 @@ void func_800914A0(void) { s32 temp_v1; u16 temp_v0; - temp_t8 = D_800DC4FC->unk6 + 7; + temp_t8 = gPlayerOneCopy->unk6 + 7; D_80152308 = temp_t8; temp_v0 = D_8015F6F8; temp_v1 = temp_t8 & 0xFFFF; @@ -3416,7 +3416,7 @@ GLOBAL_ASM("asm/non_matchings/code_8008C1D0/func_800914A0.s") ? func_802ADDC8(void *, ?, f32, f32, f32); /* extern */ s16 func_802B7830(f32, f32); /* extern */ f32 sqrtf(f32, f32); /* extern */ -extern void *D_800DC4FC; +extern void *gPlayerOneCopy; extern u16 D_80152308; extern s16 D_8015F6F8; extern u32 D_8015F718; @@ -3457,13 +3457,13 @@ void func_800914E0(void) { temp_a0 = temp_v0 & 0xFFFFFF; sp48 = *(&gSegmentTable + ((temp_v0 >> 0x18) * 4)) + temp_a0 + 0x80000000; temp_t0 = D_80152308; - temp_a3 = D_800DC4FC->unk6; + temp_a3 = gPlayerOneCopy->unk6; temp_v0_2 = temp_a3 - temp_t0; cameras.unk18 = 0.0f; cameras.unk20 = 0.0f; cameras.unk1C = 1.0f; phi_t0 = temp_t0; - phi_t1 = &D_800DC4FC; + phi_t1 = &gPlayerOneCopy; if (temp_v0_2 == 7) { func_800914A0(temp_a0, 7, temp_a3); phi_t0 = D_80152308; @@ -3475,7 +3475,7 @@ void func_800914E0(void) { func_800914A0(temp_a0_2, 7, temp_a3); phi_t0 = D_80152308; block_5: - phi_t1 = &D_800DC4FC; + phi_t1 = &gPlayerOneCopy; } } temp_v0_3 = (phi_t0 * 8) + sp48; diff --git a/src/code_80091750.c b/src/code_80091750.c index 21b65702d..92ee28c80 100644 --- a/src/code_80091750.c +++ b/src/code_80091750.c @@ -337,7 +337,7 @@ extern OSMesgQueue gSIEventMesgQueue; if (((*(&gControllerStatuses + 2) == 0) & 1) != 0) { return 0; } - if ((D_800DC4BC->button & 0x1000) == 0) { + if ((gControllerOne->button & 0x1000) == 0) { return 0; } osPfsIsPlug(&gSIEventMesgQueue, &sp67); @@ -470,7 +470,7 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_80091FA4.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern void *D_800DC4CC; +extern void *gControllerFive; extern s8 D_8018D9D8; extern s8 D_8018D9D9; @@ -478,7 +478,7 @@ void func_80092148(void) { void *temp_v0; s32 phi_v1; - temp_v0 = D_800DC4CC; + temp_v0 = gControllerFive; phi_v1 = 0; if (temp_v0->unk4 != 0) { phi_v1 = 1; @@ -13064,7 +13064,7 @@ block_7: } phi_s1->unk15 = 1; - } else if ((D_800DC4CC->button & 0x10) != 0) { + } else if ((gControllerFive->button & 0x10) != 0) { phi_s1->unk4 = 1; play_sound2(0x4900801C); } else { @@ -16286,7 +16286,7 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_800AC978.s") s32 func_800B4520(void *); // extern ? func_800CA330(?); // extern ? play_sound2(?, void *); // extern -extern void *D_800DC4CC; +extern void *gControllerFive; extern f64 D_800F26C0; extern f64 D_800F26C8; extern f64 D_800F26D0; @@ -16328,7 +16328,7 @@ void func_800ACA14(void *arg0) { if (func_800B4520(temp_a1) != 0) { } else { - temp_v0_2 = D_800DC4CC; + temp_v0_2 = gControllerFive; temp_v1 = temp_v0_2->unk6; temp_a0 = temp_v1 | temp_v0_2->unkC; phi_a0 = temp_a0; @@ -16345,7 +16345,7 @@ void func_800ACA14(void *arg0) { arg0->unk24 = temp_f0 + 4.0; } arg0->unk8 = -1; - temp_t5 = D_800DC4CC; + temp_t5 = gControllerFive; temp_v1_2 = temp_t5->unk6; phi_a0 = temp_v1_2 | temp_t5->unkC; phi_v1 = temp_v1_2; @@ -16364,7 +16364,7 @@ void func_800ACA14(void *arg0) { arg0->unk24 = temp_f0_2 + 4.0; } arg0->unk8 = 1; - phi_v1 = D_800DC4CC->unk6; + phi_v1 = gControllerFive->unk6; } } phi_a1_4 = phi_a1_2; @@ -16477,7 +16477,7 @@ void func_800ACC50(void *arg0) { temp_a1_2 = arg0; phi_a1 = temp_a1_2; if (func_800B4520(arg0) == 0) { - temp_v0 = D_800DC4CC; + temp_v0 = gControllerFive; temp_v1 = temp_v0->unk6; temp_a0 = temp_v1 | temp_v0->unkC; phi_a0 = temp_a0; @@ -16494,7 +16494,7 @@ void func_800ACC50(void *arg0) { arg0->unk24 = temp_f0 + 4.0; } arg0->unk8 = -1; - temp_t8_2 = D_800DC4CC; + temp_t8_2 = gControllerFive; temp_v1_2 = temp_t8_2->unk6; phi_a0 = temp_v1_2 | temp_t8_2->unkC; phi_v1 = temp_v1_2; @@ -16513,7 +16513,7 @@ void func_800ACC50(void *arg0) { arg0->unk24 = temp_f0_2 + 4.0; } arg0->unk8 = 1; - phi_v1 = D_800DC4CC->unk6; + phi_v1 = gControllerFive->unk6; } } if ((phi_v1 & 0x9000) != 0) { @@ -16806,7 +16806,7 @@ void func_800AD2E8(void *arg0) { case 9: /* switch 1 */ case 10: /* switch 1 */ if (func_800B4520() == 0) { - temp_v1_2 = D_800DC4BC; + temp_v1_2 = gControllerOne; temp_a1 = temp_v1_2->buttonPressed; temp_a0_2 = temp_a1 | temp_v1_2->stickPressed; phi_a0 = temp_a0_2; @@ -16825,7 +16825,7 @@ void func_800AD2E8(void *arg0) { arg0->unk24 = temp_f0 + 4.0; } arg0->unk8 = -1; - temp_t6 = D_800DC4BC; + temp_t6 = gControllerOne; temp_a1_2 = temp_t6->buttonPressed; phi_a0 = temp_a1_2 | temp_t6->stickPressed; phi_a1_2 = temp_a1_2; @@ -16843,7 +16843,7 @@ void func_800AD2E8(void *arg0) { temp_v0_5 = arg0->unk4; if ((temp_v0_5 == 0xA) && (D_80162DD4 != 0)) { arg0->unk4 = temp_v0_5 - 2; - phi_a1_3 = D_800DC4BC->buttonPressed; + phi_a1_3 = gControllerOne->buttonPressed; } else { play_sound2(0x49008000, phi_a1_2); temp_f0_2 = arg0->unk24; @@ -16851,7 +16851,7 @@ void func_800AD2E8(void *arg0) { arg0->unk24 = temp_f0_2 + 4.0; } arg0->unk8 = 1; - phi_a1_3 = D_800DC4BC->buttonPressed; + phi_a1_3 = gControllerOne->buttonPressed; } } } @@ -17179,7 +17179,7 @@ void func_800AE218(void *arg0) { if (temp_v0 < 0x1E) { arg0->unk1C = temp_v0 + 1; } - if ((D_800DC4BC->unk6 & 0x1000) != 0) { + if ((gControllerOne->unk6 & 0x1000) != 0) { arg0->unk4 = 0xF; play_sound2(0x49008005); return; @@ -17207,7 +17207,7 @@ void func_800AE218(void *arg0) { case 15: /* switch 1 */ case 16: /* switch 1 */ if (func_800B4520() == 0) { - temp_v0_2 = D_800DC4BC; + temp_v0_2 = gControllerOne; temp_a0 = temp_v0_2->unk6; temp_a1 = temp_a0 | temp_v0_2->unkC; phi_a1 = temp_a1; @@ -17222,7 +17222,7 @@ void func_800AE218(void *arg0) { arg0->unk24 = temp_f0 + 4.0; } arg0->unk8 = -1; - temp_t2 = D_800DC4BC; + temp_t2 = gControllerOne; temp_a0_2 = temp_t2->unk6; phi_a1 = temp_a0_2 | temp_t2->unkC; phi_a0 = temp_a0_2; @@ -17238,7 +17238,7 @@ void func_800AE218(void *arg0) { arg0->unk24 = temp_f0_2 + 4.0; } arg0->unk8 = 1; - phi_a0 = D_800DC4BC->unk6; + phi_a0 = gControllerOne->unk6; } } if ((phi_a0 & 0x9000) != 0) { @@ -17350,7 +17350,7 @@ block_49: case 25: /* switch 1 */ case 26: /* switch 1 */ case 41: /* switch 1 */ - if (((D_800DC4BC->unk6 & 0xD000) != 0) && (arg0->unk4 = 0x10, play_sound2(0x49008002), temp_f0_5 = arg0->unk24, (temp_f0_5 < 4.2))) { + if (((gControllerOne->unk6 & 0xD000) != 0) && (arg0->unk4 = 0x10, play_sound2(0x49008002), temp_f0_5 = arg0->unk24, (temp_f0_5 < 4.2))) { arg0->unk24 = temp_f0_5 + 4.0; return; } @@ -17360,7 +17360,7 @@ block_49: case 31: /* switch 1 */ arg0->unk20 = arg0->unk4 - 0x1E; if (func_800B639C((gCupSelection * 4) + gCupCourseSelection) != arg0->unk20) { - temp_v0_5 = D_800DC4BC; + temp_v0_5 = gControllerOne; temp_a1_2 = temp_v0_5->unk6 | temp_v0_5->unkC; phi_a1_2 = temp_a1_2; if ((temp_a1_2 & 0x800) != 0) { @@ -17373,7 +17373,7 @@ block_49: arg0->unk24 = temp_f0_6 + 4.0; } arg0->unk8 = -1; - temp_t0 = D_800DC4BC; + temp_t0 = gControllerOne; phi_a1_2 = temp_t0->unk6 | temp_t0->unkC; } } @@ -17390,7 +17390,7 @@ block_49: } } } - temp_a0_3 = D_800DC4BC->unk6; + temp_a0_3 = gControllerOne->unk6; if ((temp_a0_3 & 0x4000) != 0) { arg0->unk4 = 0x10; play_sound2(0x49008002); @@ -17432,7 +17432,7 @@ block_49: return; case 35: /* switch 1 */ case 36: /* switch 1 */ - temp_v0_6 = D_800DC4BC; + temp_v0_6 = gControllerOne; temp_a0_5 = temp_v0_6->unk6; temp_a1_3 = temp_a0_5 | temp_v0_6->unkC; phi_a1_3 = temp_a1_3; @@ -17445,7 +17445,7 @@ block_49: arg0->unk24 = temp_f0_9 + 4.0; } arg0->unk8 = -1; - temp_t6 = D_800DC4BC; + temp_t6 = gControllerOne; temp_a0_6 = temp_t6->unk6; phi_a1_3 = temp_a0_6 | temp_t6->unkC; phi_a0_2 = temp_a0_6; @@ -17460,7 +17460,7 @@ block_49: arg0->unk24 = temp_f0_10 + 4.0; } arg0->unk8 = 1; - phi_a0_2 = D_800DC4BC->unk6; + phi_a0_2 = gControllerOne->unk6; } } if ((phi_a0_2 & 0x4000) != 0) { @@ -17760,7 +17760,7 @@ void func_800AF004(void *arg0) { case 5: temp_t1 = arg0->unk1C + 1; arg0->unk1C = temp_t1; - if ((temp_t1 >= 0x65) && ((temp_v0 = D_800DC4CC, (temp_v0->unk6 != 0)) || (temp_v0->unkC != 0))) { + if ((temp_t1 >= 0x65) && ((temp_v0 = gControllerFive, (temp_v0->unk6 != 0)) || (temp_v0->unkC != 0))) { arg0->unk4 = 6; arg0->unk1C = 0; if (D_802874F5 < 3) { diff --git a/src/code_800AF9B0.c b/src/code_800AF9B0.c index 7fa4fbea8..fe7ad840c 100644 --- a/src/code_800AF9B0.c +++ b/src/code_800AF9B0.c @@ -1889,7 +1889,7 @@ void func_800B20F4(void *arg0, s32 arg1) { D_800DC51C = 0; } if ((arg0->unk4 & 0x2000) != 0) { // Z is held - if ((sp2E & 0x8000) != 0) { + if ((sp2E & 0x8000) != 0) { gDebugGotoScene = DEBUG_GOTO_ENDING_SEQUENCE; // Go to ending ceremony if A is not pressed } else { gDebugGotoScene = DEBUG_GOTO_CREDITS_SEQUENCE_CC_EXTRA; // Go to credits, set gCCSelection to CC_EXTRA @@ -4136,7 +4136,7 @@ extern s8 gCupSelection; func_800051C4(); D_80162DD6 = 1; - func_80005AE8(D_800DC4E4); + func_80005AE8(gPlayerThree); temp_v0 = (arg0 << 7) + &D_8018EE10; phi_s3 = 0; if (((gCupSelection * 4) + gCupCourseSelection) != temp_v0->unk5) { diff --git a/src/code_80281780.c b/src/code_80281780.c index 25e031bd9..13f343cee 100644 --- a/src/code_80281780.c +++ b/src/code_80281780.c @@ -13,26 +13,26 @@ extern s32 gPrevLoadedAddress; // unk4 is buttonDown? void func_80281780(void) { if (gEnableDebugMode != 0) { - if (D_800DC4BC->button & 0x0F0F) { - if (D_800DC4BC->button & 8) { + if (gControllerOne->button & 0x0F0F) { + if (gControllerOne->button & 8) { D_800E86A8[0] = 1; } - else if (D_800DC4BC->button & 2) { + else if (gControllerOne->button & 2) { D_800E86A8[0] = 2; } - else if (D_800DC4BC->button & 1) { + else if (gControllerOne->button & 1) { D_800E86A8[0] = 3; } - else if (D_800DC4BC->button & 4) { + else if (gControllerOne->button & 4) { D_800E86A8[0] = 4; } - else if (D_800DC4BC->button & 0x800) { + else if (gControllerOne->button & 0x800) { D_800E86A8[0] = 5; } - else if (D_800DC4BC->button & 0x200) { + else if (gControllerOne->button & 0x200) { D_800E86A8[0] = 6; } - else if (D_800DC4BC->button & 0x100) { + else if (gControllerOne->button & 0x100) { D_800E86A8[0] = 7; } else { D_800E86A8[0] = 0; diff --git a/src/code_80281780.h b/src/code_80281780.h index 24c52d729..ecba2c063 100644 --- a/src/code_80281780.h +++ b/src/code_80281780.h @@ -62,7 +62,7 @@ extern s32 D_00835BA0; extern s32 D_801625F8; extern f32 D_801625FC; -extern struct Controller *D_800DC4BC; +extern struct Controller *gControllerOne; extern s8 D_800E86A8[]; extern u16 gEnableDebugMode; diff --git a/src/code_80281FA0.c b/src/code_80281FA0.c index 7b50e2fa3..fc9205e9d 100644 --- a/src/code_80281FA0.c +++ b/src/code_80281FA0.c @@ -3,10 +3,10 @@ #include #include -extern Player *D_800DC4DC; -extern Player *D_800DC4E0; -extern Player *D_800DC4E4; -extern Player *D_800DC4E8; +extern Player *gPlayerOne; +extern Player *gPlayerTwo; +extern Player *gPlayerThree; +extern Player *gPlayerFour; s32 func_802832C4(s32, s32, s16, s16); @@ -541,7 +541,7 @@ s32 func_80282D90(s32 arg0, s32 arg1, s32 arg2, s32 arg3) { if (0) {}; // debug stub? - res = func_802828C8(arg0 + 0xC, arg0 + 0x18, &D_80287818, &D_80287B1C, &D_80287B18) | + res = func_802828C8(arg0 + 0xC, arg0 + 0x18, &D_80287818, &D_80287B1C, &D_80287B18) | func_802828C8(arg0, arg0 + 0x18, &D_80287998, &D_80287B1C, &D_80287B18); return res; } @@ -1033,7 +1033,7 @@ void func_80283B6C(s32 arg0) { void func_80283BA4(s32 arg0) { func_800CA0B8(); - func_800C90F4(0, (D_800DC4E8->characterId * 0x10) + 0x29008004); + func_800C90F4(0, (gPlayerFour->characterId * 0x10) + 0x29008004); func_800CA0A0(); } @@ -1107,7 +1107,7 @@ void func_80283EA0(s32 arg0) { } void func_80283ED0(Vec3f arg0) { - func_80282008(arg0, &D_800DC4E0->posX); + func_80282008(arg0, &gPlayerTwo->posX); } #ifdef MIPS_TO_C @@ -1115,9 +1115,9 @@ void func_80283ED0(Vec3f arg0) { ? func_802821A0(f32, f32, ?); // extern void func_80283EF8(s32 arg0) { - func_802821A0(D_800DC4E0->posX, 0.12f); - func_802821A0((bitwise f32) (arg0 + 4), D_800DC4E0->posY, 0x3DF5C28F); - func_802821A0((bitwise f32) (arg0 + 8), D_800DC4E0->posZ, 0x3DF5C28F); + func_802821A0(gPlayerTwo->posX, 0.12f); + func_802821A0((bitwise f32) (arg0 + 4), gPlayerTwo->posY, 0x3DF5C28F); + func_802821A0((bitwise f32) (arg0 + 8), gPlayerTwo->posZ, 0x3DF5C28F); } #else GLOBAL_ASM("asm/non_matchings/code_80281FA0/func_80283EF8.s") @@ -1132,7 +1132,7 @@ void func_80283F6C(s32 arg0) { } void func_80283FCC(Vec3f arg0) { - func_80282008(arg0, &D_800DC4E4->posX); + func_80282008(arg0, &gPlayerThree->posX); } #ifdef MIPS_TO_C @@ -1140,9 +1140,9 @@ void func_80283FCC(Vec3f arg0) { //? func_802821A0(f32, f32, ?); // extern void func_80283FF4(f32 arg0) { - func_802821A0(D_800DC4E4->posX, 0.12f); - func_802821A0(arg0 + 4, D_800DC4E4->posY, 0x3DF5C28F); - func_802821A0(arg0 + 8, D_800DC4E4->posZ, 0x3DF5C28F); + func_802821A0(gPlayerThree->posX, 0.12f); + func_802821A0(arg0 + 4, gPlayerThree->posY, 0x3DF5C28F); + func_802821A0(arg0 + 8, gPlayerThree->posZ, 0x3DF5C28F); } #else GLOBAL_ASM("asm/non_matchings/code_80281FA0/func_80283FF4.s") @@ -1242,7 +1242,7 @@ extern s8 D_802874F5; void func_80284308(void *arg0) { s32 sp30; - Player *player = &D_800DC4DC; + Player *player = &gPlayerOne; f32 temp_f0; f32 temp_f12; f32 temp_f2; @@ -1255,7 +1255,7 @@ void func_80284308(void *arg0) { func_802832C4(&func_80283A54, arg0, 0x8C, 0x8C); func_80282D90(arg0, &D_802858E0, &D_802858F8, 0); temp_v0 = *(sp30 + (D_802874F5 * 4)); - //player = D_800DC4DC; + //player = gPlayerOne; temp_f0 = temp_v0->unk14 - player->posX; temp_f12 = temp_v0->unk1C - player->posZ; temp_f2 = temp_v0->unk18 - player->posY; @@ -1349,12 +1349,12 @@ void func_802846E4(void *arg0) { func_80282D90(arg0, &D_80285CB0, &D_80285CE0, 0); temp_f0 = D_8028747C; - arg0->unkC = arg0->unkC + (D_800DC4E8->posX - temp_f0); - arg0->unk10 = arg0->unk10 + (D_800DC4E8->posY - -29.0f); - arg0->unk14 = arg0->unk14 + (D_800DC4E8->posZ - -97.0f); - arg0->unk0 = arg0->unk0 + (D_800DC4E8->posX - temp_f0); - arg0->unk4 = arg0->unk4 + (D_800DC4E8->posY - -29.0f); - arg0->unk8 = arg0->unk8 + (D_800DC4E8->posZ - -97.0f); + arg0->unkC = arg0->unkC + (gPlayerFour->posX - temp_f0); + arg0->unk10 = arg0->unk10 + (gPlayerFour->posY - -29.0f); + arg0->unk14 = arg0->unk14 + (gPlayerFour->posZ - -97.0f); + arg0->unk0 = arg0->unk0 + (gPlayerFour->posX - temp_f0); + arg0->unk4 = arg0->unk4 + (gPlayerFour->posY - -29.0f); + arg0->unk8 = arg0->unk8 + (gPlayerFour->posZ - -97.0f); } #else GLOBAL_ASM("asm/non_matchings/code_80281FA0/func_802846E4.s") diff --git a/src/code_8028DF00.c b/src/code_8028DF00.c index fa77a4bfb..9796f3c4b 100644 --- a/src/code_8028DF00.c +++ b/src/code_8028DF00.c @@ -5,11 +5,11 @@ #include #include -extern Player *D_800DC4E0; -extern Player *D_800DC4E4; -extern Player *D_800DC4E8; -extern Player *D_800DC4FC; -extern Player *D_800DC500; +extern Player *gPlayerTwo; +extern Player *gPlayerThree; +extern Player *gPlayerFour; +extern Player *gPlayerOneCopy; +extern Player *gPlayerTwoCopy; extern struct Camera *camera1; extern struct Camera *camera2; @@ -17,12 +17,12 @@ extern struct Camera *camera3; extern struct Camera *camera4; extern struct Controller gControllers[]; -extern struct Controller *D_800DC4BC; -extern struct Controller *D_800DC4C4; -extern struct Controller *D_800DC4C8; -extern struct Controller *D_800DC4CC; -extern struct Controller *D_800DC4D0; -extern struct Controller *D_800DC4D4; +extern struct Controller *gControllerOne; +extern struct Controller *gControllerThree; +extern struct Controller *gControllerFour; +extern struct Controller *gControllerFive; +extern struct Controller *gControllerSix; +extern struct Controller *gControllerSeven; extern struct UnkStruct_800DC5EC D_8015F480[]; extern struct UnkStruct_800DC5EC *D_800DC5EC; @@ -43,8 +43,8 @@ extern s8 gCupCourseSelection; extern s32 D_800DC544; extern Player gPlayers[]; -extern Player *D_800DC4E0; -extern Player *D_800DC4DC; +extern Player *gPlayerTwo; +extern Player *gPlayerOne; extern s32 lapCount[]; extern s32 D_80150120; extern s32 gModeSelection; @@ -186,11 +186,11 @@ void func_8028E0F0(void) { // If player has no balloons left if (gPlayerBalloonCount[playerIndex] < 0) { ply->unk_000 |= PLAYER_CINEMATIC_MODE; - unk_arr[phi_s2] = (s16) (ply - D_800DC4DC); + unk_arr[phi_s2] = (s16) (ply - gPlayerOne); phi_s2++; func_800CA118((u8) playerIndex); } else { - unk_arr2[phi_s1] = (s16) (ply - D_800DC4DC); + unk_arr2[phi_s1] = (s16) (ply - gPlayerOne); phi_s1++; } } @@ -765,10 +765,10 @@ void func_8028F474(void) { void func_8028F4E8(void) { if (gEnableDebugMode != 0) { - if (((D_800DC4CC->button & 0x10) != 0) && - ((D_800DC4CC->button & 0x20) != 0) && - ((D_800DC4CC->button & 0x8000) != 0) && - ((D_800DC4CC->button & 0x4000) != 0)) { + if (((gControllerFive->button & 0x10) != 0) && + ((gControllerFive->button & 0x20) != 0) && + ((gControllerFive->button & 0x8000) != 0) && + ((gControllerFive->button & 0x4000) != 0)) { func_800CA330(0x19); func_800CA388(0x19); @@ -956,20 +956,20 @@ loop_2: } if (((temp_s0->buttonPressed & 0x1000) != 0) && (temp_v0_3 = temp_s0->button, ((temp_v0_3 & 0x10) == 0)) && ((temp_v0_3 & 0x20) == 0)) { func_8028DF00(); - D_800DC5FC = (s16) (((s32) (temp_s0 - D_800DC4BC) >> 4) + 1); + D_800DC5FC = (s16) (((s32) (temp_s0 - gControllerOne) >> 4) + 1); temp_s0->buttonPressed = 0; func_800C9F90(1); D_80162DF0 = 1; if (gModeSelection == TIME_TRIALS) { - temp_a0 = D_800DC4DC; + temp_a0 = gPlayerOne; if ((temp_a0->unk_000 & 0x8100) != 0) { func_80005AE8(temp_a0); } - temp_a0_2 = D_800DC4E0; + temp_a0_2 = gPlayerTwo; if ((temp_a0_2->unk_000 & 0x8100) != 0) { func_80005AE8(temp_a0_2); } - temp_a0_3 = D_800DC4E4; + temp_a0_3 = gPlayerThree; if ((temp_a0_3->unk_000 & 0x8100) != 0) { func_80005AE8(temp_a0_3); return; @@ -988,7 +988,7 @@ block_20: phi_s2 = temp_s2; if (temp_s2 == 4) { if ((gEnableDebugMode != 0) && (gModeSelection != BATTLE)) { - temp_a1 = D_800DC4BC; + temp_a1 = gControllerOne; if ((temp_a1->buttonPressed & 0x800) != 0) { lapCount->unk0 = 2; } @@ -1036,7 +1036,7 @@ void func_8028FC34(void) { return; } D_802BA038--; - if (D_800DC4CC->buttonPressed != 0) { + if (gControllerFive->buttonPressed != 0) { func_8028FBD4(); gMenuSelection = START_MENU; return; @@ -1125,7 +1125,7 @@ void func_8028FCBC(void) { if (D_800DC51C != 0) { func_8028EDA8(); } - if ((gEnableDebugMode != 0) && ((D_800DC4CC->buttonPressed & 0x2000) != 0)) { + if ((gEnableDebugMode != 0) && ((gControllerFive->buttonPressed & 0x2000) != 0)) { func_8028EDA8(); } func_8028F4E8(); @@ -1157,9 +1157,10 @@ void func_8028FCBC(void) { break; case SCREEN_MODE_2P_SPLITSCREEN_HORIZONTAL: case SCREEN_MODE_2P_SPLITSCREEN_VERTICAL: - if (((D_800DC4DC->unk_000 & PLAYER_CINEMATIC_MODE) != 0) && ((D_800DC4E0->unk_000 & PLAYER_CINEMATIC_MODE) != 0)) { + if (((gPlayerOne->unk_000 & PLAYER_CINEMATIC_MODE) != 0) && ((gPlayerTwo->unk_000 & PLAYER_CINEMATIC_MODE) != 0)) { - if (D_800DC4DC->unk_004 < D_800DC4E0->unk_004) { + + if (gPlayerOne->unk_004 < gPlayerTwo->unk_004) { D_800DC5E8 = 1; } else { D_800DC5E8 = 0; @@ -1316,7 +1317,7 @@ void func_802903D8(u16 *arg0, u16 *arg1) { if ((arg1->unk0 & 0x40) != 0) { func_8008FC1C(temp_f0_2, temp_a2, temp_a3); func_8008FC1C((bitwise f32) arg1); - func_800C9060(((s32) (arg1 - D_800DC4DC) / 0xDD8) & 0xFF, 6.643295e-24f, arg1); + func_800C9060(((s32) (arg1 - gPlayerOne) / 0xDD8) & 0xFF, 6.643295e-24f, arg1); return; } temp_a0 = temp_a3; @@ -1325,7 +1326,7 @@ void func_802903D8(u16 *arg0, u16 *arg1) { arg0 = temp_a3; arg1 = temp_a2; func_8008FC1C(temp_f0_2, temp_a0, temp_a2, temp_a3); - func_800C9060(((s32) (arg1 - D_800DC4DC) / 0xDD8) & 0xFF, 6.643295e-24f, arg1); + func_800C9060(((s32) (arg1 - gPlayerOne) / 0xDD8) & 0xFF, 6.643295e-24f, arg1); phi_a3 = arg0; phi_a2 = arg1; goto block_8; @@ -1336,7 +1337,7 @@ void func_802903D8(u16 *arg0, u16 *arg1) { temp_a3->unkC = (s32) (temp_a3->unkC | 0x400000); arg0 = temp_a3; func_8008FC1C(temp_f0_2, temp_a2, temp_a2, temp_a3); - func_800C9060(((s32) (arg0 - D_800DC4DC) / 0xDD8) & 0xFF, 6.643295e-24f); + func_800C9060(((s32) (arg0 - gPlayerOne) / 0xDD8) & 0xFF, 6.643295e-24f); return; } block_8: @@ -1388,11 +1389,11 @@ block_8: phi_a2->unk1C = (f32) (phi_a2->unk1C + (sp68 * temp_f0_5 * 0.5f)); } if ((phi_a3->unk0 & 0x4000) != 0) { - func_800C9060((bitwise s32) 0.5f, sqrtf(temp_f0), (u16 *) (((s32) (phi_a3 - D_800DC4DC) / 0xDD8) & 0xFF), 0x19008001, phi_a2, phi_a3); + func_800C9060((bitwise s32) 0.5f, sqrtf(temp_f0), (u16 *) (((s32) (phi_a3 - gPlayerOne) / 0xDD8) & 0xFF), 0x19008001, phi_a2, phi_a3); return; } if ((phi_a2->unk0 & 0x4000) != 0) { - func_800C9060((bitwise s32) 0.5f, sqrtf(temp_f0), (u16 *) (((s32) (phi_a2 - D_800DC4DC) / 0xDD8) & 0xFF), 0x19008001, phi_a2, phi_a3); + func_800C9060((bitwise s32) 0.5f, sqrtf(temp_f0), (u16 *) (((s32) (phi_a2 - gPlayerOne) / 0xDD8) & 0xFF), 0x19008001, phi_a2, phi_a3); } // Duplicate return node #24. Try simplifying control flow for better match } @@ -1436,18 +1437,18 @@ void func_80290B14(void) { switch(D_800DC52C) { case 0: - func_8001EE98(D_800DC4FC, camera1, 0); + func_8001EE98(gPlayerOneCopy, camera1, 0); break; case 1: case 2: - func_8001EE98(D_800DC4FC, camera1, 0); - func_8001EE98(D_800DC500, camera2, 1); + func_8001EE98(gPlayerOneCopy, camera1, 0); + func_8001EE98(gPlayerTwoCopy, camera2, 1); break; case 3: - func_8001EE98(D_800DC4FC, camera1, 0); - func_8001EE98(D_800DC4E0, camera2, 1); - func_8001EE98(D_800DC4E4, camera3, 2); - func_8001EE98(D_800DC4E8, camera4, 3); + func_8001EE98(gPlayerOneCopy, camera1, 0); + func_8001EE98(gPlayerTwo, camera2, 1); + func_8001EE98(gPlayerThree, camera3, 2); + func_8001EE98(gPlayerFour, camera4, 3); break; } } diff --git a/src/code_80296A50.c b/src/code_80296A50.c index 642922da7..8b4515cfa 100644 --- a/src/code_80296A50.c +++ b/src/code_80296A50.c @@ -815,7 +815,7 @@ void update_obj_kiwano_fruit(void *arg0) { arg0->unk6 = 1; arg0->unk24 = 80.0f; block_9: - temp_v0 = D_80164490 + (*(&D_80164438 + (((((temp_t7 + &gPlayers) - D_800DC4DC) / 0xDD8) & 0xFFFF) * 2)) * 8); + temp_v0 = D_80164490 + (*(&D_80164438 + (((((temp_t7 + &gPlayers) - gPlayerOne) / 0xDD8) & 0xFFFF) * 2)) * 8); temp_f2 = (temp_t7 + &gPlayers)->unk14 - temp_v0->unk0; arg0 = phi_a2; sp20 = temp_f2; @@ -844,7 +844,7 @@ block_9: temp_v0_2 = (temp_t7 + &gPlayers)->unkBC; if ((temp_v0_2 & 0x200) != 0) { arg0 = temp_a2_2; - func_800C9060(temp_f12, temp_f14_2, (((temp_t7 + &gPlayers) - D_800DC4DC) / 0xDD8) & 0xFF, 0x1900A052, temp_a2_2, &D_800DC4DC); + func_800C9060(temp_f12, temp_f14_2, (((temp_t7 + &gPlayers) - gPlayerOne) / 0xDD8) & 0xFF, 0x1900A052, temp_a2_2, &gPlayerOne); phi_a2_3 = arg0; } else { temp_f12_2 = D_802B961C; @@ -854,7 +854,7 @@ block_9: (temp_t7 + &gPlayers)->unk34 = (temp_t7 + &gPlayers)->unk34 - (temp_f2_2 * temp_f12_2); (temp_t7 + &gPlayers)->unk3C = (temp_t7 + &gPlayers)->unk3C - (temp_f14_2 * temp_f12_2); arg0 = temp_a2_2; - func_800C9060(temp_f12_2, temp_f14_2, (((temp_t7 + &gPlayers) - D_800DC4DC) / 0xDD8) & 0xFF, 0x19007018, temp_a2_2, &D_800DC4DC); + func_800C9060(temp_f12_2, temp_f14_2, (((temp_t7 + &gPlayers) - gPlayerOne) / 0xDD8) & 0xFF, 0x19007018, temp_a2_2, &gPlayerOne); phi_a2_3 = arg0; if (gModeSelection != GRAND_PRIX) { D_80162DF8 = 1; @@ -889,7 +889,7 @@ extern void func_800C9D80(f32 *arg0, f32 *arg1, s32 arg2); // extern void update_obj_train_engine(struct choochooTrain *arg0) { arg0->unk6 -= 0x666; - + if (arg0->unk8 != 0.0f) { arg0->unk8 = 0.0f; func_800C9D80(&arg0->unk18, &arg0->unk24, 0x51018000); @@ -1323,11 +1323,11 @@ loop_2: if (func_8029EEB8(arg0, temp_a1, 0x40A00000, 0x42200000, D_802B964C) == 1) { if ((arg0->unkBC & 0x200) != 0) { func_800C98B8(arg0 + 0x14, arg0 + 0x34, 0x19018010); - func_800C90F4(((arg0 - D_800DC4DC) / 0xDD8) & 0xFF, (arg0->unk254 * 0x10) + 0x2900800D); + func_800C90F4(((arg0 - gPlayerOne) / 0xDD8) & 0xFF, (arg0->unk254 * 0x10) + 0x2900800D); phi_s0->unk6 = phi_s0->unk6 | 0x400; } if ((arg0->unk0 & 0x100) == 0) { - func_800C9060(((arg0 - D_800DC4DC) / 0xDD8) & 0xFF, 0x19007018); + func_800C9060(((arg0 - gPlayerOne) / 0xDD8) & 0xFF, 0x19007018); return; } // Duplicate return node #8. Try simplifying control flow for better match @@ -5277,11 +5277,11 @@ extern f32 D_802B989C; if ((arg0->unkBC & 0x200) != 0) { arg1->unk2 = arg1->unk2 | 0x400; func_800C98B8(arg0 + 0x14, arg0 + 0x34, 0x19018010); - func_800C90F4(((arg0 - D_800DC4DC) / 0xDD8) & 0xFF, (arg0->unk254 * 0x10) + 0x2900800D); + func_800C90F4(((arg0 - gPlayerOne) / 0xDD8) & 0xFF, (arg0->unk254 * 0x10) + 0x2900800D); return 1; } if ((temp_v0 & 0x100) == 0) { - func_800C9060(((arg0 - D_800DC4DC) / 0xDD8) & 0xFF, 0x1900701A); + func_800C9060(((arg0 - gPlayerOne) / 0xDD8) & 0xFF, 0x1900701A); } goto block_6; } @@ -5312,11 +5312,11 @@ s32 func_8029EEB8(void *, f32, f32, f32); // extern if ((arg0->unkBC & 0x200) != 0) { arg1->unk2 = arg1->unk2 | 0x400; func_800C98B8(arg0 + 0x14, arg0 + 0x34, 0x1901A24A); - func_800C90F4(((arg0 - D_800DC4DC) / 0xDD8) & 0xFF, (arg0->unk254 * 0x10) + 0x2900800D); + func_800C90F4(((arg0 - gPlayerOne) / 0xDD8) & 0xFF, (arg0->unk254 * 0x10) + 0x2900800D); return 1; } if ((temp_v0 & 0x100) == 0) { - func_800C9060(((arg0 - D_800DC4DC) / 0xDD8) & 0xFF, 0x1900A052); + func_800C9060(((arg0 - gPlayerOne) / 0xDD8) & 0xFF, 0x1900A052); } goto block_6; } @@ -5383,16 +5383,16 @@ extern s32 D_80162DF8; arg1->unk28 = 8.0f; arg0 = temp_a3; func_800C98B8(temp_a3 + 0x14, temp_a3 + 0x34, 0x19018010, temp_a3); - func_800C90F4(((arg0 - D_800DC4DC) / 0xDD8) & 0xFF, (arg0->unk254 * 0x10) + 0x2900800D); + func_800C90F4(((arg0 - gPlayerOne) / 0xDD8) & 0xFF, (arg0->unk254 * 0x10) + 0x2900800D); } else { arg0 = temp_a3; - func_8008DABC(temp_a3, (temp_a3 - D_800DC4DC) / 0xDD8); + func_8008DABC(temp_a3, (temp_a3 - gPlayerOne) / 0xDD8); if ((gModeSelection == TIME_TRIALS) && ((arg0->unk0 & 0x1000) == 0)) { D_80162DF8 = 1; } } } else { - func_8008DABC(temp_a3, (temp_a3 - D_800DC4DC) / 0xDD8); + func_8008DABC(temp_a3, (temp_a3 - gPlayerOne) / 0xDD8); } return 1; } @@ -5510,7 +5510,7 @@ extern f32 D_802B98A8; arg1->unk2 = arg1->unk2 | 0x400; arg0 = temp_a3; func_800C98B8(temp_a0_2, temp_a1, 0x19018010, temp_a3); - func_800C90F4(((arg0 - D_800DC4DC) / 0xDD8) & 0xFF, (arg0->unk254 * 0x10) + 0x2900800D); + func_800C90F4(((arg0 - gPlayerOne) / 0xDD8) & 0xFF, (arg0->unk254 * 0x10) + 0x2900800D); goto block_36; } if ((temp_v0 & 0x100) == 0) { @@ -5518,7 +5518,7 @@ extern f32 D_802B98A8; sp4C = temp_f14; sp40 = temp_f16_2; sp54 = temp_f18; - func_800C9060(((temp_a3 - D_800DC4DC) / 0xDD8) & 0xFF, 0x19007018); + func_800C9060(((temp_a3 - gPlayerOne) / 0xDD8) & 0xFF, 0x19007018); phi_a3 = arg0; } goto block_23; @@ -6007,7 +6007,7 @@ void func_802A0450(Player *player, void *arg1) { Player *phi_v0; temp_t2 = arg1->unk0; - temp_t0 = (player - D_800DC4DC) / 3544; + temp_t0 = (player - gPlayerOne) / 3544; switch (temp_t2) { case 9: if (((player->unk_0BC << 0) >= 0) && ((player->unk_000 & 0x100) == 0)) { @@ -6131,7 +6131,7 @@ void func_802A0450(Player *player, void *arg1) { arg1->unk28 = 10.0f; return; } - func_8008DABC(player, (player - D_800DC4DC) / 3544); + func_8008DABC(player, (player - gPlayerOne) / 3544); return; } /* Duplicate return node #90. Try simplifying control flow for better match */ @@ -6176,7 +6176,7 @@ block_75: arg1->unk2 = -0x8000; arg1->unk4 = 0; if ((player->unk_000 & 0x4000) != 0) { - func_8007ABFC((player - D_800DC4DC) / 3544, 7); + func_8007ABFC((player - gPlayerOne) / 3544, 7); return; } /* Duplicate return node #90. Try simplifying control flow for better match */ @@ -6197,7 +6197,7 @@ block_89: arg1->unk2 = -0x8000; arg1->unk4 = 0; if ((player->unk_000 & 0x4000) != 0) { - func_8007ABFC((player - D_800DC4DC) / 3544, 0); + func_8007ABFC((player - gPlayerOne) / 3544, 0); return; } /* Duplicate return node #90. Try simplifying control flow for better match */ @@ -6479,7 +6479,7 @@ block_11: sp2C = temp_v0_4; func_802A1064(arg0, temp_a1); temp_v0_4->unkC = temp_v0_4->unkC & 0xFFFBFFFF; - func_800C9060(((temp_v0_4 - D_800DC4DC) / 0xDD8) & 0xFF, 0x19008012); + func_800C9060(((temp_v0_4 - gPlayerOne) / 0xDD8) & 0xFF, 0x19008012); } } #else diff --git a/src/code_802A3730.c b/src/code_802A3730.c index 70c4c3e3d..88e06db69 100644 --- a/src/code_802A3730.c +++ b/src/code_802A3730.c @@ -104,10 +104,10 @@ void func_802A3730(struct UnkStruct_800DC5EC *arg0) { screenWidth /= 4; screenHeight /= 4; - + screenStartX /= 4; screenStartY /= 4; - + lrx = screenStartX + screenWidth; if (lrx > SCREEN_WIDTH) { lrx = SCREEN_WIDTH; @@ -119,7 +119,7 @@ void func_802A3730(struct UnkStruct_800DC5EC *arg0) { } ulx = 0; uly = 0; - + gDPSetScissor(gDisplayListHead++, G_SC_NON_INTERLACE, ulx, uly, lrx, lry); } @@ -200,7 +200,7 @@ void func_802A39E0(struct UnkStruct_800DC5EC *arg0) { gDPSetScissor(gDisplayListHead++, G_SC_NON_INTERLACE, ulx, uly, lrx, lry); gDPFillRectangle(gDisplayListHead++, ulx, uly, lrx - 1, lry -1); - + gDPPipeSync(gDisplayListHead++); gDPSetColorImage(gDisplayListHead++, G_IM_FMT_RGBA, G_IM_SIZ_16b, SCREEN_WIDTH, VIRTUAL_TO_PHYSICAL(gPhysicalFramebuffers[sRenderingFramebuffer])); // 0x1FFFFFFF gDPSetCycleType(gDisplayListHead++, G_CYC_1CYCLE); @@ -256,7 +256,7 @@ UNUSED void func_802A40DC(void) {} UNUSED s32 func_802A40E4(void) { gSPViewport(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&D_800DC5EC->viewport)); gSPClearGeometryMode(gDisplayListHead++, 0xFFFFFFFF); - gSPSetGeometryMode(gDisplayListHead++, G_ZBUFFER | G_SHADE | + gSPSetGeometryMode(gDisplayListHead++, G_ZBUFFER | G_SHADE | G_CULL_BACK | G_LIGHTING | G_SHADING_SMOOTH | G_CLIPPING); } @@ -287,7 +287,7 @@ void func_802A4300(void) { if ( D_800DC52C == 0) { return; - } + } if (D_800DC5B0 != 0) { return; } @@ -314,7 +314,7 @@ void func_802A4300(void) { } gDPPipeSync(gDisplayListHead++); gDPSetCycleType(gDisplayListHead++, G_CYC_1CYCLE); - + } extern s32 D_801625EC; @@ -570,7 +570,7 @@ void func_802A4A0C(Vtx *arg0, struct UnkStruct_800DC5EC *arg1, s32 arg2, s32 arg /* temp_v0_8->unk4 = arg0 + 0x40; temp_v0_8->unk0 = 0x400103F; - + temp_v0_9->unk4 = 0x20604; temp_v0_9->unk0 = 0xB1000602; */ @@ -763,22 +763,22 @@ extern f32 D_80150130; void func_802A4EF4(void) { switch(D_800DC52C) { case 0: - func_8001F394(D_800DC4DC, &D_80150130); + func_8001F394(gPlayerOne, &D_80150130); break; - + case 2: - func_8001F394(D_800DC4DC, &D_80150130); - func_8001F394(D_800DC4E0, &D_80150134); + func_8001F394(gPlayerOne, &D_80150130); + func_8001F394(gPlayerTwo, &D_80150134); break; case 1: - func_8001F394(D_800DC4DC, &D_80150130); - func_8001F394(D_800DC4E0, &D_80150134); + func_8001F394(gPlayerOne, &D_80150130); + func_8001F394(gPlayerTwo, &D_80150134); break; case 3: - func_8001F394(D_800DC4DC, &D_80150130); - func_8001F394(D_800DC4E0, &D_80150134); - func_8001F394(D_800DC4E4, &D_80150138); - func_8001F394(D_800DC4E8, &D_8015013C); + func_8001F394(gPlayerOne, &D_80150130); + func_8001F394(gPlayerTwo, &D_80150134); + func_8001F394(gPlayerThree, &D_80150138); + func_8001F394(gPlayerFour, &D_8015013C); break; } } @@ -810,7 +810,7 @@ void func_802A50EC(void) { gSPClearGeometryMode(gDisplayListHead++, 0xFFFFFFFF); gSPSetGeometryMode(gDisplayListHead++, G_SHADE | G_SHADING_SMOOTH | G_CLIPPING); - + func_802A39E0(D_800DC5EC); if (D_800DC5B4 != 0) { func_802A4A0C(&D_802B8890, D_800DC5EC, SCREEN_WIDTH, SCREEN_HEIGHT, &D_80150130); @@ -828,7 +828,7 @@ void func_802A51D4(void) { gSPClearGeometryMode(gDisplayListHead++, 0xFFFFFFFF); gSPSetGeometryMode(gDisplayListHead++, G_SHADE | G_SHADING_SMOOTH | G_CLIPPING); - + if (D_800DC5B4 != 0) { func_802A4A0C(&D_802B8890, D_800DC5EC, SCREEN_WIDTH, SCREEN_HEIGHT, &D_80150130); func_80057FC4(3); @@ -949,11 +949,11 @@ void func_802A5760(void) { gDPSetCycleType(gDisplayListHead++, G_CYC_1CYCLE); func_802A3730(D_800DC5F8); - + } else { func_802A3730(D_800DC5F8); func_802A39E0(D_800DC5F8); - + if (D_800DC5B4 != 0) { func_802A4A0C(&D_802B8A10, D_800DC5F8, SCREEN_WIDTH, SCREEN_HEIGHT, &D_8015013C); func_80057FC4(11); @@ -987,8 +987,8 @@ void func_802A59A4(void) { gDPHalf1(gDisplayListHead++, spAA[23]); gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->buffer[8]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); - guLookAt(&gGfxPool->buffer[56], camera->pos[0], camera->pos[1], camera->pos[2], - camera->unk, camera->unk1, camera->unk2, camera->angleX, + guLookAt(&gGfxPool->buffer[56], camera->pos[0], camera->pos[1], camera->pos[2], + camera->unk, camera->unk1, camera->unk2, camera->angleX, camera->angleY, camera->angleZ); if (D_800DC5C8 == 0) { gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->buffer[56]), G_MTX_NOPUSH | G_MTX_MUL | G_MTX_PROJECTION); @@ -1048,7 +1048,7 @@ void func_802A5CB4(void) { } func_80295A38(D_800DC5EC); if (D_800DC5C8 == 1) { - + gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->buffer[56]), G_MTX_NOPUSH | G_MTX_MUL | G_MTX_PROJECTION); mtxf_identity(sp58); @@ -1086,9 +1086,9 @@ void func_802A5FAC(void) { gDPHalf1(gDisplayListHead++, sp9A[17]); gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->buffer[16]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); guLookAt(&gGfxPool->buffer[64], camera->pos[0], camera->pos[1], camera->pos[2], camera->unk, camera->unk1, camera->unk2, camera->angleX, camera->angleY, camera->angleZ); - + //D_801647A8, D_801647AC, D_801647B0, D_801647B4, D_801647B8, D_801647BC, D_801647C0, D_801647C4, D_801647C8); - + if (D_800DC5C8 == 0) { gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->buffer[64]), G_MTX_NOPUSH | G_MTX_MUL | G_MTX_PROJECTION); mtxf_identity(sp58); @@ -1134,7 +1134,7 @@ void func_802A62A4(void) { gDPHalf1(gDisplayListHead++, sp9A[17]); gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->buffer[8]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); guLookAt(&gGfxPool->buffer[56], camera->pos[0], camera->pos[1], camera->pos[2], camera->unk, camera->unk1, camera->unk2, camera->angleX, camera->angleY, camera->angleZ); - + if (D_800DC5C8 == 0) { gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->buffer[56]), G_MTX_NOPUSH | G_MTX_MUL | G_MTX_PROJECTION); @@ -1182,7 +1182,7 @@ void func_802A65B8(void) { gDPHalf1(gDisplayListHead++, sp9A[17]); gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->buffer[16]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); guLookAt(&gGfxPool->buffer[64], camera->pos[0], camera->pos[1], camera->pos[2], camera->unk, camera->unk1, camera->unk2, camera->angleX, camera->angleY, camera->angleZ); - + if (D_800DC5C8 == 0) { gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->buffer[64]), G_MTX_NOPUSH | G_MTX_MUL | G_MTX_PROJECTION); mtxf_identity(sp58); @@ -1228,7 +1228,7 @@ void func_802A68CC(void) { gDPHalf1(gDisplayListHead++, sp9A[17]); gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->buffer[8]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); guLookAt(&gGfxPool->buffer[56], camera->pos[0], camera->pos[1], camera->pos[2], camera->unk, camera->unk1, camera->unk2, camera->angleX, camera->angleY, camera->angleZ); - + if (D_800DC5C8 == 0) { gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->buffer[56]), G_MTX_NOPUSH | G_MTX_MUL | G_MTX_PROJECTION); mtxf_identity(&sp58); @@ -1273,7 +1273,7 @@ void func_802A6BB0(void) { guPerspective(&gGfxPool->buffer[16], &sp9A[17], D_80150134, D_80150148, D_80150150, D_8015014C, 1.0f); gDPHalf1(gDisplayListHead++, sp9A[17]); gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->buffer[16]), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); - + guLookAt(&gGfxPool->buffer[64], camera->pos[0], camera->pos[1], camera->pos[2], camera->unk, camera->unk1, camera->unk2, camera->angleX, camera->angleY, camera->angleZ); if (D_800DC5C8 == 0) { gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->buffer[64]), G_MTX_NOPUSH | G_MTX_MUL | G_MTX_PROJECTION); @@ -1417,7 +1417,7 @@ void func_802A74BC(void) { Camera *camera = &cameras[0]; struct Controller *controller = &gControllers[0]; - // struct? size = 0x10. unk++ doesn't work cause s32 too small. + // struct? size = 0x10. unk++ doesn't work cause s32 too small. s32 *unk = &D_8015F790[0]; s32 i; @@ -1429,7 +1429,7 @@ void func_802A74BC(void) { wrapper->screenWidth = 4; wrapper->screenHeight = 4; wrapper->pathCounter = 1; - + switch(D_800DC52C) { case 0: diff --git a/src/code_802B0210.c b/src/code_802B0210.c index 1740fe2a6..64d175f9c 100644 --- a/src/code_802B0210.c +++ b/src/code_802B0210.c @@ -498,7 +498,7 @@ void update_obj_banana_bunch(void *arg0) { gControllers[temp_t4].buttonPressed = temp_v1 & 0xDFFF; sp2C = &gPlayers[temp_t6]; sp28 = &gControllers[temp_t4]; - func_800C9060(((&gPlayers[temp_t6] - D_800DC4DC) / 3544) & 0xFF, 0x19008012); + func_800C9060(((&gPlayers[temp_t6] - gPlayerOne) / 3544) & 0xFF, 0x19008012); temp_a0_2 = gControllers[temp_t4].rawStickY; if ((temp_a0_2 >= 0x1F) && (temp_v1_2 = gControllers[temp_t4].rawStickX, ((temp_v1_2 < 0x28) != 0)) && (temp_v1_2 >= -0x27)) { func_802B0788(temp_a0_2, arg0, &gPlayers[temp_t6], &gPlayers[temp_t6]); @@ -808,7 +808,7 @@ s16 func_802B17F4(void *arg0) { } temp_v1 = (temp_v0 * 0x70) + &D_8015F9B8; temp_v1->unk6 = 0; - temp_v1->unk10 = (arg0 - D_800DC4DC) / 0xDD8; + temp_v1->unk10 = (arg0 - gPlayerOne) / 0xDD8; arg0->unkC = arg0->unkC | 0x40000; return temp_v0; } @@ -847,7 +847,7 @@ s16 func_802B18E4(s32 arg0, s16 arg1) { temp_v1->unk6 = 0; temp_v1->unk10 = 0x5B0; temp_v1->unk12 = -0x8000; - temp_v1->unk14 = (arg0 - D_800DC4DC) / 0xDD8; + temp_v1->unk14 = (arg0 - gPlayerOne) / 0xDD8; temp_v1->unk4 = 0; temp_v1->unk8 = 0.0f; return temp_v0; @@ -918,7 +918,7 @@ extern ? D_802B918C; } temp_s0->unk10 = 0; temp_s0->unk12 = -0x8000; - temp_s0->unk14 = (arg1 - D_800DC4DC) / 0xDD8; + temp_s0->unk14 = (arg1 - gPlayerOne) / 0xDD8; temp_s0->unk4 = (arg0 - &D_8015F9B8) / 0x70; temp_s0->unk8 = arg3; (arg0 + (arg3 * 4))->unk24 = (temp_s0 - &D_8015F9B8) / 0x70; @@ -980,7 +980,7 @@ s16 func_802B1C9C(void *arg0) { temp_s0->unk6 = 0; temp_s0->unk10 = 0; temp_s0->unk12 = -0x8000; - temp_s0->unk14 = (arg0 - D_800DC4DC) / 0xDD8; + temp_s0->unk14 = (arg0 - gPlayerOne) / 0xDD8; return sp3E; } #else @@ -1039,7 +1039,7 @@ s16 func_802B1E48(void *arg0) { temp_s0->unk6 = 0; temp_s0->unk10 = 0; temp_s0->unk12 = arg0->unk2E - 0x8000; - temp_s0->unk14 = (arg0 - D_800DC4DC) / 0xDD8; + temp_s0->unk14 = (arg0 - gPlayerOne) / 0xDD8; return sp3E; } #else @@ -1157,7 +1157,7 @@ void update_obj_banana(void *arg0) { func_802B4E30(arg0); if ((gPlayers[temp_t6].unk_000 & PLAYER_HUMAN) != 0) { if (D_800DC51C != 0) { - phi_v1 = D_800DC4BC; + phi_v1 = gControllerOne; } else { phi_v1 = &gControllers[arg0->unk10]; } @@ -1169,7 +1169,7 @@ void update_obj_banana(void *arg0) { gPlayers[temp_t6].unk_00C &= 0xFFFBFFFF; sp80 = phi_v1; sp88 = &gPlayers[temp_t6]; - func_800C9060(((&gPlayers[temp_t6] - D_800DC4DC) / 3544) & 0xFF, 0x19008012, temp_a2); + func_800C9060(((&gPlayers[temp_t6] - gPlayerOne) / 3544) & 0xFF, 0x19008012, temp_a2); temp_f0_2 = phi_v1->unk2; if ((temp_f0_2 > 30.0f) && (temp_a0 = phi_v1->unk0, ((temp_a0 < 0xA) != 0)) && (temp_a0 >= -9)) { temp_f2_2 = gPlayers[temp_t6].unk_094; @@ -1376,7 +1376,7 @@ void func_802B2914(void *arg0, Player *player, s16 arg2) { func_802AD950(temp_s0 + 0x30, temp_s0->unkC + 1.0f, temp_s0->unk18, temp_s0->unk1C, temp_s0->unk20, sp4C, sp50, sp54); func_802B4E30(temp_s0); temp_s0->unk2 = -0x7000; - temp_s0->unk10 = (player - D_800DC4DC) / 3544; + temp_s0->unk10 = (player - gPlayerOne) / 3544; temp_s0->unk8 = (arg0 - &D_8015F9B8) / 112; temp_s0->unk14 = -1; temp_s0->unk4 = 0x14; @@ -1415,7 +1415,7 @@ block_8: goto block_8; } if ((player->unk_000 & PLAYER_HUMAN) != 0) { - func_800C9060(((player - D_800DC4DC) / 3544) & 0xFF, 0x19008012, &D_800DC4DC, 0xDD8); + func_800C9060(((player - gPlayerOne) / 3544) & 0xFF, 0x19008012, &gPlayerOne, 0xDD8); } } } @@ -1467,7 +1467,7 @@ s16 func_802B2C40(void *arg0) { } temp_v1 = (temp_v0 * 0x70) + &D_8015F9B8; temp_v1->unk6 = 0; - temp_v1->unk24 = (arg0 - D_800DC4DC) / 0xDD8; + temp_v1->unk24 = (arg0 - gPlayerOne) / 0xDD8; arg0->unkC = arg0->unkC | 0x40000; return temp_v0; } @@ -1499,7 +1499,7 @@ s16 func_802B2D70(void *arg0) { s32 temp_t0; void *temp_v1; - temp_t0 = ((arg0 - D_800DC4DC) / 0xDD8) & 0xFFFF; + temp_t0 = ((arg0 - gPlayerOne) / 0xDD8) & 0xFFFF; if (temp_t0 >= 8) { return -1; } @@ -1556,7 +1556,7 @@ void func_802B2EBC(u16 *arg0) { phi_a2 = temp_a2; if ((*temp_a2 & 0x4000) != 0) { arg0 = temp_a2; - func_800CAB4C(((temp_a2 - D_800DC4DC) / 0xDD8) & 0xFF); + func_800CAB4C(((temp_a2 - gPlayerOne) / 0xDD8) & 0xFF); phi_a2 = arg0; } phi_v1 = &gPlayers; @@ -1603,7 +1603,7 @@ void func_802B2FA0(Player *player) { s32 sp1C; s16 temp_t9; - sp1C = (player - D_800DC4DC) / 3544; + sp1C = (player - gPlayerOne) / 3544; temp_t9 = player->unk10; switch (temp_t9) { case 3: @@ -1662,9 +1662,9 @@ GLOBAL_ASM("asm/non_matchings/code_802B0210/func_802B2FA0.s") //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 s32 func_800910E4(? *); // extern ? func_802B2FA0(? *); // extern -extern ? *D_800DC4D0; -extern ? *D_800DC4D4; -extern ? *D_800DC4D8; +extern ? *gControllerSix; +extern ? *gControllerSeven; +extern ? *gControllerEight; extern ? gControllers; extern ? gPlayers; @@ -1683,12 +1683,12 @@ void func_802B30EC(void) { if (func_800910E4(phi_s0) == 0) { temp_v0 = phi_s0->unk0; if ((temp_v0 & 0x100) != 0) { - if (((phi_s0 - D_800DC4E0) / 0xDD8) == 0) { - phi_s1 = D_800DC4D0; - } else if (((phi_s0 - D_800DC4E4) / 0xDD8) == 0) { - phi_s1 = D_800DC4D4; - } else if (((phi_s0 - D_800DC4DC) / 0xDD8) == 0) { - phi_s1 = D_800DC4D8; + if (((phi_s0 - gPlayerTwo) / 0xDD8) == 0) { + phi_s1 = gControllerSix; + } else if (((phi_s0 - gPlayerThree) / 0xDD8) == 0) { + phi_s1 = gControllerSeven; + } else if (((phi_s0 - gPlayerOne) / 0xDD8) == 0) { + phi_s1 = gControllerEight; } } if (((temp_v0 & 0x4000) != 0) && (phi_s0->unk10 != 0) && ((temp_v0 & 0x2000) == 0)) { @@ -2148,7 +2148,7 @@ s16 func_802B3FD0(s32 arg0, s32 arg1) { if (((*phi_s0 & 0x8000) != 0) && (phi_s0 != arg0) && (*(&gPlayerBalloonCount + (phi_s1 * 2)) >= 0)) { temp_f0 = func_802B51E8(phi_s0 + 0x14, arg1 + 0x18); if (temp_f0 < phi_f20) { - phi_fp = (phi_s0 - D_800DC4DC) / 0xDD8; + phi_fp = (phi_s0 - gPlayerOne) / 0xDD8; phi_f20 = temp_f0; } } @@ -2292,7 +2292,7 @@ void update_obj_red_blue_shell(void *arg0) { phi_v0 = &gControllers[arg0->unk14]; } else { block_16: - phi_v0 = D_800DC4BC; + phi_v0 = gControllerOne; } temp_v1 = phi_v0->buttonDepressed; if ((temp_v1 & 0x2000) != 0) { @@ -2374,7 +2374,7 @@ block_16: arg0->unk4 = D_8015F8F0; arg0->unk8 = 1000.0f; temp_v1_2 = D_80164430; - temp_v0_2 = *(&D_80164438 + (((&gPlayers[temp_t7] - D_800DC4DC) / 3544) * 2)) + 8; + temp_v0_2 = *(&D_80164438 + (((&gPlayers[temp_t7] - gPlayerOne) / 3544) * 2)) + 8; phi_v0_2 = temp_v0_2; if (temp_v1_2 < temp_v0_2) { phi_v0_2 = temp_v0_2 - temp_v1_2; @@ -2398,7 +2398,7 @@ block_16: arg0->unk6 = 4; arg0->unk4 = 0x258; temp_v1_3 = D_80164430; - temp_v0_4 = *(&D_80164438 + (((&gPlayers[temp_t7] - D_800DC4DC) / 3544) * 2)) + 8; + temp_v0_4 = *(&D_80164438 + (((&gPlayers[temp_t7] - gPlayerOne) / 3544) * 2)) + 8; phi_v0_3 = temp_v0_4; if (temp_v1_3 < temp_v0_4) { phi_v0_3 = temp_v0_4 - temp_v1_3; @@ -2408,7 +2408,7 @@ block_16: arg0->unk6 = 5; arg0->unk8 = 1000.0f; temp_v1_4 = D_80164430; - temp_v0_5 = *(&D_80164438 + (((&gPlayers[temp_t7] - D_800DC4DC) / 3544) * 2)) + 8; + temp_v0_5 = *(&D_80164438 + (((&gPlayers[temp_t7] - gPlayerOne) / 3544) * 2)) + 8; phi_v0_4 = temp_v0_5; if (temp_v1_4 < temp_v0_5) { phi_v0_4 = temp_v0_5 - temp_v1_4; diff --git a/src/crash_screen.c b/src/crash_screen.c index e2e8b3238..d903ed284 100644 --- a/src/crash_screen.c +++ b/src/crash_screen.c @@ -19,7 +19,7 @@ void crash_screen_set_framebuffer(s32 arg0); // static void *get_faulted_thread(); // static void start_debug_thread(); // static void thread9_crash_screen(s32 arg0); // static -extern void *D_800DC4BC; +extern void *gControllerOne; extern s32 D_800DC670; extern ? D_800DC6FC; @@ -45,7 +45,7 @@ extern void osSetEventMesg(OSEvent, OSMesgQueue *, OSMesg); extern s32 osRecvMesg(OSMesgQueue *, OSMesg *, s32); extern void read_controllers(); -extern struct Controller *D_800DC4BC; +extern struct Controller *gControllerOne; u32 D_800DC670 = 0; @@ -67,7 +67,7 @@ void crash_screen_draw_glyph(u16 *framebuffer, s32 x, s32 y, s32 glyph) { for(i = 0; i < 8; i++) { data = crashScreenFont[glyph][i]; - + for (j = 5; j >= 0; j--) { ptr = (y + i) * 320 + (x + j); @@ -341,7 +341,7 @@ void thread9_crash_screen(UNUSED s32 arg0) { if (D_800DC670 == 0) { crash_screen_draw_square(pFramebuffer, D_80162D64); do { - //temp_v0_2 = D_800DC4BC->buttonPressed; + //temp_v0_2 = gControllerOne->buttonPressed; //loop_4: do { read_controllers(); @@ -384,7 +384,7 @@ loop_1: do { loop_4: read_controllers(); - temp_v0_2 = D_800DC4BC->unk6; + temp_v0_2 = gControllerOne->unk6; if (temp_v0_2 == 0) { goto loop_4; } diff --git a/src/main.c b/src/main.c index 006f9760b..a539711ba 100644 --- a/src/main.c +++ b/src/main.c @@ -55,29 +55,29 @@ struct SPTask* sNextDisplaySPTask = NULL; struct Controller gControllers[8]; -struct Controller *D_800DC4BC = &gControllers[0]; -struct Controller *D_800DC4C0 = &gControllers[1]; -struct Controller *D_800DC4C4 = &gControllers[2]; -struct Controller *D_800DC4C8 = &gControllers[3]; -struct Controller *D_800DC4CC = &gControllers[4]; -struct Controller *D_800DC4D0 = &gControllers[5]; -struct Controller *D_800DC4D4 = &gControllers[6]; -struct Controller *D_800DC4D8 = &gControllers[7]; +struct Controller *gControllerOne = &gControllers[0]; // 0x800DC4BC +struct Controller *gControllerTwo = &gControllers[1]; // 0x800DC4C0 +struct Controller *gControllerThree = &gControllers[2]; // 0x800DC4C4 +struct Controller *gControllerFour = &gControllers[3]; // 0x800DC4C8 +struct Controller *gControllerFive = &gControllers[4]; // 0x800DC4CC +struct Controller *gControllerSix = &gControllers[5]; // 0x800DC4D0 +struct Controller *gControllerSeven = &gControllers[6]; // 0x800DC4D4 +struct Controller *gControllerEight = &gControllers[7]; // 0x800DC4D8 Player gPlayers[8]; -Player *D_800DC4DC = &gPlayers[0]; -Player *D_800DC4E0 = &gPlayers[1]; -Player *D_800DC4E4 = &gPlayers[2]; -Player *D_800DC4E8 = &gPlayers[3]; -Player *D_800DC4EC = &gPlayers[4]; -Player *D_800DC4F0 = &gPlayers[5]; -Player *D_800DC4F4 = &gPlayers[6]; -Player *D_800DC4F8 = &gPlayers[7]; +Player *gPlayerOne = &gPlayers[0]; // 0x800DC4DC +Player *gPlayerTwo = &gPlayers[1]; // 0x800DC4E0 +Player *gPlayerThree = &gPlayers[2]; // 0x800DC4E4 +Player *gPlayerFour = &gPlayers[3]; // 0x800DC4E8 +Player *gPlayerFive = &gPlayers[4]; // 0x800DC4EC +Player *gPlayerSix = &gPlayers[5]; // 0x800DC4F0 +Player *gPlayerSeven = &gPlayers[6]; // 0x800DC4F4 +Player *gPlayerEight = &gPlayers[7]; // 0x800DC4F8 -Player *D_800DC4FC = &gPlayers[0]; -Player *D_800DC500 = &gPlayers[1]; -Player *D_800DC504 = &gPlayers[2]; -Player *D_800DC508 = &gPlayers[3]; +Player *gPlayerOneCopy = &gPlayers[0]; // 0x800DC4FC +Player *gPlayerTwoCopy = &gPlayers[1]; // 0x800DC500 +Player *gPlayerThreeCopy = &gPlayers[2]; // 0x800DC504 +Player *gPlayerFourCopy = &gPlayers[3]; // 0x800DC508 s32 D_800FD850[3]; struct GfxPool gGfxPools[2]; @@ -135,7 +135,7 @@ s32 D_801502A4; uintptr_t gPhysicalFramebuffers[3]; u32 D_801502B4; UNUSED u32 D_801502B8; -UNUSED u32 D_801502BC; +UNUSED u32 D_801502BC; s32 D_801502C0[2064]; u16 D_80152300[4]; @@ -168,7 +168,7 @@ u16 D_800DC514 = 0; u16 D_800DC518 = 0; u16 D_800DC51C = 0; u16 gEnableDebugMode = 0; -s32 D_800DC524 = 7; // = COURSE_DATA_MENU?; +s32 D_800DC524 = 7; // = COURSE_DATA_MENU?; UNUSED s32 D_800DC528 = 1; s32 D_800DC52C = 0; @@ -399,12 +399,12 @@ void read_controllers(void) { func_80000934(1); func_80000934(2); func_80000934(3); - D_800DC4CC->button = (s16) (((D_800DC4BC->button | D_800DC4C0->button) | D_800DC4C4->button) | D_800DC4C8->button); - D_800DC4CC->buttonPressed = (s16) (((D_800DC4BC->buttonPressed | D_800DC4C0->buttonPressed) | D_800DC4C4->buttonPressed) | D_800DC4C8->buttonPressed); - D_800DC4CC->buttonDepressed = (s16) (((D_800DC4BC->buttonDepressed | D_800DC4C0->buttonDepressed) | D_800DC4C4->buttonDepressed) | D_800DC4C8->buttonDepressed); - D_800DC4CC->stickDirection = (s16) (((D_800DC4BC->stickDirection | D_800DC4C0->stickDirection) | D_800DC4C4->stickDirection) | D_800DC4C8->stickDirection); - D_800DC4CC->stickPressed = (s16) (((D_800DC4BC->stickPressed | D_800DC4C0->stickPressed) | D_800DC4C4->stickPressed) | D_800DC4C8->stickPressed); - D_800DC4CC->stickDepressed = (s16) (((D_800DC4BC->stickDepressed | D_800DC4C0->stickDepressed) | D_800DC4C4->stickDepressed) | D_800DC4C8->stickDepressed); + gControllerFive->button = (s16) (((gControllerOne->button | gControllerTwo->button) | gControllerThree->button) | gControllerFour->button); + gControllerFive->buttonPressed = (s16) (((gControllerOne->buttonPressed | gControllerTwo->buttonPressed) | gControllerThree->buttonPressed) | gControllerFour->buttonPressed); + gControllerFive->buttonDepressed = (s16) (((gControllerOne->buttonDepressed | gControllerTwo->buttonDepressed) | gControllerThree->buttonDepressed) | gControllerFour->buttonDepressed); + gControllerFive->stickDirection = (s16) (((gControllerOne->stickDirection | gControllerTwo->stickDirection) | gControllerThree->stickDirection) | gControllerFour->stickDirection); + gControllerFive->stickPressed = (s16) (((gControllerOne->stickPressed | gControllerTwo->stickPressed) | gControllerThree->stickPressed) | gControllerFour->stickPressed); + gControllerFive->stickDepressed = (s16) (((gControllerOne->stickDepressed | gControllerTwo->stickDepressed) | gControllerThree->stickDepressed) | gControllerFour->stickDepressed); } void func_80000BEC(void) { @@ -543,7 +543,7 @@ void init_game(void) { s32 texture_seg; s32 sp38; UNUSED s32 unknown_padding; - + func_800010CC(); gHeapEndPtr = SEG_8028DF00; set_segment_base_addr(0, 0x80000000); @@ -558,13 +558,13 @@ void init_game(void) { texture_seg = SEG_8028DF00-sp2C; osPiStartDma(&gDmaIoMesg, 0, 0, &_common_texturesSegmentRomStart, texture_seg, sp2C, &gDmaMesgQueue); osRecvMesg(&gDmaMesgQueue, &gMainReceivedMesg, 1); - + sp40 = *(u32 *)(texture_seg + 4); sp40 = ALIGN16(sp40); sp38 = gPrevLoadedAddress; mio0decode(texture_seg, sp38); set_segment_base_addr(0xD, sp38); - + gPrevLoadedAddress += sp40; D_8015F734 = gPrevLoadedAddress; } @@ -610,14 +610,14 @@ void func_8000142C(void) { func_802909F0(); func_802A0D54(); func_800382DC(); - func_8001EE98(D_800DC4FC, camera1, 0); + func_8001EE98(gPlayerOneCopy, camera1, 0); func_80028F70(); func_8028F474(); func_80059AC8(); update_simple_objects(); func_802966A0(); func_8028FCBC(); - + } func_80022744(); } @@ -631,12 +631,12 @@ void func_8000142C(void) { } else { if (D_800DC514 != 0) { - if ((D_800DC4BC->buttonPressed & R_TRIG) && - (D_800DC4BC->button & A_BUTTON) && - (D_800DC4BC->button & B_BUTTON)) { + if ((gControllerOne->buttonPressed & R_TRIG) && + (gControllerOne->button & A_BUTTON) && + (gControllerOne->button & B_BUTTON)) { D_800DC514 = 0; } - + temp_v0 = camera1->rotX2; D_801625E8 = D_800DC5EC->pathCounter; if (temp_v0 < 0x2000) { @@ -650,11 +650,11 @@ void func_8000142C(void) { } else { func_80057A50(40, 100, "SOUTH ", D_801625E8); } - + } else { - if ((D_800DC4BC->buttonPressed & L_TRIG) && - (D_800DC4BC->button & A_BUTTON) && - (D_800DC4BC->button & B_BUTTON)) { + if ((gControllerOne->buttonPressed & L_TRIG) && + (gControllerOne->button & A_BUTTON) && + (gControllerOne->button & B_BUTTON)) { D_800DC514 = 1; } } @@ -675,9 +675,9 @@ void func_8000142C(void) { func_802909F0(); func_802A0D54(); func_800382DC(); - func_8001EE98(D_800DC4FC, camera1, 0); + func_8001EE98(gPlayerOneCopy, camera1, 0); func_80029060(); - func_8001EE98(D_800DC500, camera2, 1); + func_8001EE98(gPlayerTwoCopy, camera2, 1); func_80029150(); func_8028F474(); func_80059AC8(); @@ -721,9 +721,9 @@ void func_8000142C(void) { func_802909F0(); func_802A0D54(); func_800382DC(); - func_8001EE98(D_800DC4FC, camera1, 0); + func_8001EE98(gPlayerOneCopy, camera1, 0); func_80029060(); - func_8001EE98(D_800DC500, camera2, 1); + func_8001EE98(gPlayerTwoCopy, camera2, 1); func_80029150(); func_8028F474(); func_80059AC8(); @@ -788,13 +788,13 @@ void func_8000142C(void) { func_802909F0(); func_802A0D54(); func_800382DC(); - func_8001EE98(D_800DC4FC, camera1, 0); + func_8001EE98(gPlayerOneCopy, camera1, 0); func_80029158(); - func_8001EE98(D_800DC4E0, camera2, 1); + func_8001EE98(gPlayerTwo, camera2, 1); func_800291E8(); - func_8001EE98(D_800DC4E4, camera3, 2); + func_8001EE98(gPlayerThree, camera3, 2); func_800291F0(); - func_8001EE98(D_800DC4E8, camera4, 3); + func_8001EE98(gPlayerFour, camera4, 3); func_800291F8(); func_8028F474(); func_80059AC8(); @@ -842,15 +842,15 @@ void func_8000142C(void) { } else { if (gEnableResourceMeters != 0) { resource_display(); - if ((!(D_800DC4BC->button & L_TRIG)) && - (D_800DC4BC->button & R_TRIG) && - (D_800DC4BC->buttonPressed & B_BUTTON)) { + if ((!(gControllerOne->button & L_TRIG)) && + (gControllerOne->button & R_TRIG) && + (gControllerOne->buttonPressed & B_BUTTON)) { gEnableResourceMeters = 0; } } else { - if ((!(D_800DC4BC->button & L_TRIG)) && - (D_800DC4BC->button & R_TRIG) && - (D_800DC4BC->buttonPressed & B_BUTTON)) { + if ((!(gControllerOne->button & L_TRIG)) && + (gControllerOne->button & R_TRIG) && + (gControllerOne->buttonPressed & B_BUTTON)) { gEnableResourceMeters = 1; } } @@ -863,7 +863,7 @@ void func_8000142C(void) { } void func_80001ECC(void) { - + switch (D_800DC50C) { case 7: func_80001404(); @@ -906,7 +906,7 @@ void func_80001FAC(void) { case 2: D_800DC4B4 = sp40; break; - case 1: + case 1: sNextDisplaySPTask = sp40; break; } @@ -1025,7 +1025,7 @@ void thread3_video(UNUSED void *arg0) { u64 *temp_v0; s32 i; s32 pad2[2]; - + gPhysicalFramebuffers[0] = (uintptr_t *) &gFramebuffer0; gPhysicalFramebuffers[1] = (uintptr_t *) &gFramebuffer1; gPhysicalFramebuffers[2] = (uintptr_t *) &gFramebuffer2; diff --git a/src/profiler.c b/src/profiler.c index 3b8f00728..c3d5cc636 100644 --- a/src/profiler.c +++ b/src/profiler.c @@ -221,7 +221,7 @@ void draw_profiler_mode_0(void) { draw_reference_profiler_bars(); } -extern struct Controller *D_800DC4BC; +extern struct Controller *gControllerOne; // Similar to draw_screen_borders from SM64, with a hint of draw_profiler void resource_display(void) { @@ -231,7 +231,7 @@ void resource_display(void) { gDPSetCycleType(gDisplayListHead++, G_CYC_FILL); gDPSetFillColor(gDisplayListHead++, GPACK_RGBA5551(0, 0, 0, 0) << 16 | GPACK_RGBA5551(0, 0, 0, 0)); - if ((D_800DC4BC->buttonPressed & 0x20) != 0) { + if ((gControllerOne->buttonPressed & 0x20) != 0) { D_800DC664 ^= 1; } draw_profiler_mode_0(); diff --git a/src/staff_ghosts.c b/src/staff_ghosts.c index 890d252b1..7d06b4507 100644 --- a/src/staff_ghosts.c +++ b/src/staff_ghosts.c @@ -70,14 +70,14 @@ extern u16 D_8015F890; extern s32 lapCount[]; extern s32 D_8018CA78; -extern Player *D_800DC4DC; -extern Player* D_800DC4E0; -extern Player *D_800DC4E4; +extern Player *gPlayerOne; +extern Player* gPlayerTwo; +extern Player *gPlayerThree; -extern struct Controller *D_800DC4D0; -extern struct Controller *D_800DC4D4; -extern struct Controller *D_800DC4D8; -extern struct Controller *D_800DC4BC; +extern struct Controller *gControllerSix; +extern struct Controller *gControllerSeven; +extern struct Controller *gControllerEight; +extern struct Controller *gControllerOne; extern StaffGhost *d_mario_raceway_staff_ghost; extern StaffGhost *d_royal_raceway_staff_ghost; @@ -108,7 +108,7 @@ void func_80004FF8(void) { } /** * Activates staff ghost if time trial lap time is lower enough - * + * */ void set_staff_ghost(void) { u32 temp_v0; // Appears to be player total lap time. @@ -164,7 +164,7 @@ s32 func_800051C4(void) { // func_80040174 in mio0_decode.s func_80040174(D_80162D80, (D_80162D84 * 4) + 0x20, D_800DC710); phi_v0 = mio0encode(D_800DC710, (D_80162D84 * 4) + 0x20, D_800DC714); - return phi_v0 + 0x1e; + return phi_v0 + 0x1e; } } @@ -202,7 +202,7 @@ void func_80005310(void) { if (D_80162DC0 != gCurrentCourseId) { D_80162DD4 = 1; } - + D_80162DC0 = (u16) gCurrentCourseId; D_80162DF0 = 0; D_80162DEC = 0; @@ -246,7 +246,7 @@ s32 func_8000546C(void) { s16 phi_v0 = 0; if (D_80162DB0 >= 0x1000) { - D_800DC4DC->unk_000 = PLAYER_CINEMATIC_MODE | PLAYER_START_SEQUENCE | PLAYER_CPU; + gPlayerOne->unk_000 = PLAYER_CINEMATIC_MODE | PLAYER_START_SEQUENCE | PLAYER_CPU; return; } @@ -260,14 +260,14 @@ s32 func_8000546C(void) { } temp_a1 = (u32) (temp_a0 & 0xFF00) >> 8; - D_800DC4D8->rawStickX = phi_v1; - + gControllerEight->rawStickX = phi_v1; + if (temp_a1 < 0x80U) { phi_v1 = (s16) (temp_a1 & 0xFF); } else { phi_v1 = (s16) (temp_a1 | (~0xFF)); } - D_800DC4D8->rawStickY = phi_v1; + gControllerEight->rawStickY = phi_v1; if (temp_a0 & 0x80000000) { phi_v0 |= A_BUTTON; } @@ -280,12 +280,12 @@ s32 func_8000546C(void) { if (temp_a0 & 0x10000000) { phi_v0 |= R_TRIG; } - temp_v1 = D_800DC4D8->buttonPressed & 0x1F0F; - D_800DC4D8->buttonPressed = (phi_v0 & (phi_v0 ^ D_80162DA8)) | temp_v1; - temp_v1 = D_800DC4D8->buttonDepressed & 0x1F0F; - D_800DC4D8->buttonDepressed = (D_80162DA8 & (phi_v0 ^ D_80162DA8)) | temp_v1; + temp_v1 = gControllerEight->buttonPressed & 0x1F0F; + gControllerEight->buttonPressed = (phi_v0 & (phi_v0 ^ D_80162DA8)) | temp_v1; + temp_v1 = gControllerEight->buttonDepressed & 0x1F0F; + gControllerEight->buttonDepressed = (D_80162DA8 & (phi_v0 ^ D_80162DA8)) | temp_v1; D_80162DA8 = phi_v0; - D_800DC4D8->button = phi_v0; + gControllerEight->button = phi_v0; if (D_80162DAC == 0) { D_80162DB0++; @@ -304,7 +304,7 @@ void func_8000561C(void) { s16 phi_a2 = 0; if (D_80162DA0 >= 0x1000) { - func_80005AE8(D_800DC4E4); + func_80005AE8(gPlayerThree); return; } temp_a0 = D_80162DA4[D_80162DA0]; @@ -316,14 +316,14 @@ void func_8000561C(void) { } temp_v0 = (u32) (temp_a0 & 0xFF00) >> 8; - D_800DC4D4->rawStickX = phi_v1; + gControllerSeven->rawStickX = phi_v1; if (temp_v0 < 0x80U) { phi_v1 = (s16) (temp_v0 & 0xFF); } else { phi_v1 = (s16) (temp_v0 | (~0xFF)); } - D_800DC4D4->rawStickY = phi_v1; + gControllerSeven->rawStickY = phi_v1; if (temp_a0 & 0x80000000) { phi_a2 = A_BUTTON; @@ -338,12 +338,12 @@ void func_8000561C(void) { phi_a2 |= R_TRIG; } - temp_v1 = D_800DC4D4->buttonPressed & 0x1F0F; - D_800DC4D4->buttonPressed = (phi_a2 & (phi_a2 ^ D_80162D98)) | temp_v1; - temp_v1 = D_800DC4D4->buttonDepressed & 0x1F0F; - D_800DC4D4->buttonDepressed = (D_80162D98 & (phi_a2 ^ D_80162D98)) | temp_v1; + temp_v1 = gControllerSeven->buttonPressed & 0x1F0F; + gControllerSeven->buttonPressed = (phi_a2 & (phi_a2 ^ D_80162D98)) | temp_v1; + temp_v1 = gControllerSeven->buttonDepressed & 0x1F0F; + gControllerSeven->buttonDepressed = (D_80162D98 & (phi_a2 ^ D_80162D98)) | temp_v1; D_80162D98 = phi_a2; - D_800DC4D4->button = phi_a2; + gControllerSeven->button = phi_a2; if (D_80162D9C == 0) { D_80162DA0++; D_80162D9C = (s32) (D_80162DA4[D_80162DA0] & 0xFF0000); @@ -361,7 +361,7 @@ void func_800057DC(void) { s16 phi_a2 = 0; if (D_80162D90 >= 0x1000) { - func_80005AE8(D_800DC4E0); + func_80005AE8(gPlayerTwo); return; } temp_a0 = D_80162D94[D_80162D90]; @@ -374,7 +374,7 @@ void func_800057DC(void) { temp_v0 = (u32) (temp_a0 & 0xFF00) >> 8; - D_800DC4D0->rawStickX = phi_v1; + gControllerSix->rawStickX = phi_v1; if (temp_v0 < 0x80U) { phi_v1 = (s16) (temp_v0 & 0xFF); @@ -382,7 +382,7 @@ void func_800057DC(void) { phi_v1 = (s16) (temp_v0 | (~0xFF)); } - D_800DC4D0->rawStickY = phi_v1; + gControllerSix->rawStickY = phi_v1; if (temp_a0 & 0x80000000) { phi_a2 |= A_BUTTON; @@ -396,13 +396,13 @@ void func_800057DC(void) { if (temp_a0 & 0x10000000) { phi_a2 |= R_TRIG; } - temp_v1 = D_800DC4D0->buttonPressed & 0x1F0F; - D_800DC4D0->buttonPressed = (phi_a2 & (phi_a2 ^ D_80162D88)) | temp_v1; + temp_v1 = gControllerSix->buttonPressed & 0x1F0F; + gControllerSix->buttonPressed = (phi_a2 & (phi_a2 ^ D_80162D88)) | temp_v1; - temp_v1 = D_800DC4D0->buttonDepressed & 0x1F0F; - D_800DC4D0->buttonDepressed = (D_80162D88 & (phi_a2 ^ D_80162D88)) | temp_v1; + temp_v1 = gControllerSix->buttonDepressed & 0x1F0F; + gControllerSix->buttonDepressed = (D_80162D88 & (phi_a2 ^ D_80162D88)) | temp_v1; D_80162D88 = phi_a2; - D_800DC4D0->button = phi_a2; + gControllerSix->button = phi_a2; if (D_80162D8C == 0) { D_80162D90++; @@ -429,13 +429,13 @@ void func_8000599C(void) { } temp_v1 &= 0xff; temp_v2 &= 0xff << 8; - //temp_v1 = D_800DC4DC->unk_0CA; - - + //temp_v1 = gPlayerOne->unk_0CA; + + //if (((temp_v1 & 2) != 0) || ((temp_v1 & 8) != 0)) { //} - temp_a2 = D_800DC4BC->button; + temp_a2 = gControllerOne->button; phi_a3 = 0; if (temp_a2 & A_BUTTON) { phi_a3 |= 0x80000000; @@ -451,8 +451,8 @@ void func_8000599C(void) { } phi_a3 |= temp_v1; phi_a3 |= temp_v2; - temp_v0 = (D_800DC4BC->rawStickY & 0xFF) << 8; - temp_a3 = phi_a3 | (D_800DC4BC->rawStickX & 0xFF) | temp_v0; + temp_v0 = (gControllerOne->rawStickY & 0xFF) << 8; + temp_a3 = phi_a3 | (gControllerOne->rawStickX & 0xFF) | temp_v0; temp_a0_2 = &D_80162DBC[D_80162DB8];; if (*D_80162DBC == -1) { *temp_t0 = temp_a3; @@ -475,7 +475,7 @@ GLOBAL_ASM("asm/non_matchings/staff_ghosts/func_8000599C.s") // sets player to AI? (unconfirmed) void func_80005AE8(Player *ply) { - if (((ply->unk_000 & PLAYER_INVISIBLE_OR_BOMB) != 0) && (ply != D_800DC4DC)) { + if (((ply->unk_000 & PLAYER_INVISIBLE_OR_BOMB) != 0) && (ply != gPlayerOne)) { ply->unk_000 = PLAYER_CINEMATIC_MODE | PLAYER_START_SEQUENCE | PLAYER_CPU; } } @@ -499,39 +499,39 @@ void func_80005B18(void) { func_800052A4(); //gModeSelection, &D_80162DDC, 3, &D_80162DD4); D_80162DD4 = 0; D_80162DDC = 1; - D_80162DE0 = D_800DC4DC->characterId; - D_80162DE8 = D_800DC4DC->characterId; + D_80162DE0 = gPlayerOne->characterId; + D_80162DE8 = gPlayerOne->characterId; D_80162E00 = 0; D_80162DFC = D_8018CA78; - func_80005AE8(D_800DC4E0); // (u16) &D_80162DDC); - func_80005AE8(D_800DC4E4); - + func_80005AE8(gPlayerTwo); // (u16) &D_80162DDC); + func_80005AE8(gPlayerThree); + } else { if (lapCount[4] != 3) { D_80162DD0 = D_80162DCC; func_800052A4(); // gModeSelection, &D_80162DDC, 3, &D_80162DD4); D_80162DDC = 1; - D_80162DE0 = D_800DC4DC->characterId; + D_80162DE0 = gPlayerOne->characterId; D_80162DFC = D_8018CA78; D_80162E00 = 0; - D_80162DE8 = D_800DC4DC->characterId; - func_80005AE8(D_800DC4E0); // (u16) &D_80162DDC); - func_80005AE8(D_800DC4E4); + D_80162DE8 = gPlayerOne->characterId; + func_80005AE8(gPlayerTwo); // (u16) &D_80162DDC); + func_80005AE8(gPlayerThree); return; - + } } D_80162D80 = (void *) ((D_80162DC8 << 0xF) + 0x3000 + &D_802BFB80); D_80162D84 = D_80162D86; D_80162DD0 = D_80162DCC; - D_80162DE8 = D_800DC4DC->characterId; + D_80162DE8 = gPlayerOne->characterId; D_80162DD8 = 0; D_80162DD4 = 0; D_80162DDC = 1; - func_80005AE8(D_800DC4E0); // (u16) &D_80162DDC, 3, &D_80162DD4); - func_80005AE8(D_800DC4E4); - - + func_80005AE8(gPlayerTwo); // (u16) &D_80162DDC, 3, &D_80162DD4); + func_80005AE8(gPlayerThree); + + return; } if ((lapCount[0] == 3) && (D_80162DDC == 0) && (D_80162DF8 == 1)) { @@ -539,9 +539,9 @@ void func_80005B18(void) { D_80162D84 = D_80162D86; D_80162DDC = 1; } - if (( D_800DC4DC->unk_000 & PLAYER_CINEMATIC_MODE) == PLAYER_CINEMATIC_MODE) { - func_80005AE8(D_800DC4E0); // (u16) &D_80162DDC, 3, phi_a3); - func_80005AE8(D_800DC4E4); + if (( gPlayerOne->unk_000 & PLAYER_CINEMATIC_MODE) == PLAYER_CINEMATIC_MODE) { + func_80005AE8(gPlayerTwo); // (u16) &D_80162DDC, 3, phi_a3); + func_80005AE8(gPlayerThree); return; }; D_80162DEC++; @@ -555,7 +555,7 @@ void func_80005B18(void) { if ((D_80162DD6 == 0) && (3 != lapCount[8])) { func_8000561C(); } - if (( D_800DC4DC->unk_000 & PLAYER_CINEMATIC_MODE) == 0) { + if (( gPlayerOne->unk_000 & PLAYER_CINEMATIC_MODE) == 0) { func_8000599C(); } } @@ -574,12 +574,12 @@ void func_80005E6C(void) { if ((D_80162DD6 == 0) && (D_80164398 != 3)) { func_8000561C(); //2 } - if ((D_800DC4DC->unk_000 & PLAYER_CINEMATIC_MODE) != PLAYER_CINEMATIC_MODE) { + if ((gPlayerOne->unk_000 & PLAYER_CINEMATIC_MODE) != PLAYER_CINEMATIC_MODE) { func_8000546C(); //1 return; } - func_80005AE8(D_800DC4E0); - func_80005AE8(D_800DC4E4); + func_80005AE8(gPlayerTwo); + func_80005AE8(gPlayerThree); } }