diff --git a/asm/non_matchings/code_80027D00/func_8002AB70.s b/asm/non_matchings/code_80027D00/func_8002AB70.s deleted file mode 100644 index 20e61d044..000000000 --- a/asm/non_matchings/code_80027D00/func_8002AB70.s +++ /dev/null @@ -1,196 +0,0 @@ -glabel func_8002AB70 -/* 02B770 8002AB70 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 02B774 8002AB74 AFBF001C */ sw $ra, 0x1c($sp) -/* 02B778 8002AB78 AFB00018 */ sw $s0, 0x18($sp) -/* 02B77C 8002AB7C 8C8E00BC */ lw $t6, 0xbc($a0) -/* 02B780 8002AB80 24010008 */ li $at, 8 -/* 02B784 8002AB84 00808025 */ move $s0, $a0 -/* 02B788 8002AB88 31CF0008 */ andi $t7, $t6, 8 -/* 02B78C 8002AB8C 51E1003A */ beql $t7, $at, .L8002AC78 -/* 02B790 8002AB90 3C014248 */ lui $at, 0x4248 -/* 02B794 8002AB94 44802000 */ mtc1 $zero, $f4 -/* 02B798 8002AB98 C486008C */ lwc1 $f6, 0x8c($a0) -/* 02B79C 8002AB9C 4606203C */ c.lt.s $f4, $f6 -/* 02B7A0 8002ABA0 00000000 */ nop -/* 02B7A4 8002ABA4 45020034 */ bc1fl .L8002AC78 -/* 02B7A8 8002ABA8 3C014248 */ lui $at, 0x4248 -/* 02B7AC 8002ABAC 848200C4 */ lh $v0, 0xc4($a0) -/* 02B7B0 8002ABB0 240100B6 */ li $at, 182 -/* 02B7B4 8002ABB4 3C05800E */ lui $a1, %hi(gKartGravityTable) # 0x800e -/* 02B7B8 8002ABB8 0041001A */ div $zero, $v0, $at -/* 02B7BC 8002ABBC 0000C012 */ mflo $t8 -/* 02B7C0 8002ABC0 2B01FFFF */ slti $at, $t8, -1 -/* 02B7C4 8002ABC4 1020001C */ beqz $at, .L8002AC38 -/* 02B7C8 8002ABC8 3C063DCC */ lui $a2, 0x3dcc -/* 02B7CC 8002ABCC 2B01FFEC */ slti $at, $t8, -0x14 -/* 02B7D0 8002ABD0 14200019 */ bnez $at, .L8002AC38 -/* 02B7D4 8002ABD4 3C014190 */ li $at, 0x41900000 # 18.000000 -/* 02B7D8 8002ABD8 44815000 */ mtc1 $at, $f10 -/* 02B7DC 8002ABDC C4880094 */ lwc1 $f8, 0x94($a0) -/* 02B7E0 8002ABE0 3C014358 */ li $at, 0x43580000 # 216.000000 -/* 02B7E4 8002ABE4 44819000 */ mtc1 $at, $f18 -/* 02B7E8 8002ABE8 460A4403 */ div.s $f16, $f8, $f10 -/* 02B7EC 8002ABEC 3C0141A0 */ li $at, 0x41A00000 # 20.000000 -/* 02B7F0 8002ABF0 44813000 */ mtc1 $at, $f6 -/* 02B7F4 8002ABF4 24840100 */ addiu $a0, $a0, 0x100 -/* 02B7F8 8002ABF8 46128102 */ mul.s $f4, $f16, $f18 -/* 02B7FC 8002ABFC 4604303E */ c.le.s $f6, $f4 -/* 02B800 8002AC00 00000000 */ nop -/* 02B804 8002AC04 4502000D */ bc1fl .L8002AC3C -/* 02B808 8002AC08 96190254 */ lhu $t9, 0x254($s0) -/* 02B80C 8002AC0C 3C0543FA */ lui $a1, 0x43fa -/* 02B810 8002AC10 0C008973 */ jal move_f32_towards -/* 02B814 8002AC14 3C063F80 */ lui $a2, 0x3f80 -/* 02B818 8002AC18 26040DAC */ addiu $a0, $s0, 0xdac -/* 02B81C 8002AC1C 3C063D4C */ lui $a2, (0x3D4CCCCD >> 16) # lui $a2, 0x3d4c -/* 02B820 8002AC20 34C6CCCD */ ori $a2, (0x3D4CCCCD & 0xFFFF) # ori $a2, $a2, 0xcccd -/* 02B824 8002AC24 AFA40020 */ sw $a0, 0x20($sp) -/* 02B828 8002AC28 0C008973 */ jal move_f32_towards -/* 02B82C 8002AC2C 3C054040 */ lui $a1, 0x4040 -/* 02B830 8002AC30 10000036 */ b .L8002AD0C -/* 02B834 8002AC34 8E0200BC */ lw $v0, 0xbc($s0) -.L8002AC38: -/* 02B838 8002AC38 96190254 */ lhu $t9, 0x254($s0) -.L8002AC3C: -/* 02B83C 8002AC3C 26040100 */ addiu $a0, $s0, 0x100 -/* 02B840 8002AC40 34C6CCCD */ ori $a2, (0x3D4CCCCD & 0xFFFF) # ori $a2, $a2, 0xcccd -/* 02B844 8002AC44 00194080 */ sll $t0, $t9, 2 -/* 02B848 8002AC48 00A82821 */ addu $a1, $a1, $t0 -/* 02B84C 8002AC4C 0C008973 */ jal move_f32_towards -/* 02B850 8002AC50 8CA52650 */ lw $a1, %lo(gKartGravityTable)($a1) # 0x2650($a1) -/* 02B854 8002AC54 26040DAC */ addiu $a0, $s0, 0xdac -/* 02B858 8002AC58 3C063D8F */ lui $a2, (0x3D8F5C29 >> 16) # lui $a2, 0x3d8f -/* 02B85C 8002AC5C 34C65C29 */ ori $a2, (0x3D8F5C29 & 0xFFFF) # ori $a2, $a2, 0x5c29 -/* 02B860 8002AC60 AFA40020 */ sw $a0, 0x20($sp) -/* 02B864 8002AC64 0C008973 */ jal move_f32_towards -/* 02B868 8002AC68 3C053F80 */ lui $a1, 0x3f80 -/* 02B86C 8002AC6C 10000027 */ b .L8002AD0C -/* 02B870 8002AC70 8E0200BC */ lw $v0, 0xbc($s0) -/* 02B874 8002AC74 3C014248 */ li $at, 0x42480000 # 50.000000 -.L8002AC78: -/* 02B878 8002AC78 44815000 */ mtc1 $at, $f10 -/* 02B87C 8002AC7C C6080124 */ lwc1 $f8, 0x124($s0) -/* 02B880 8002AC80 3C014000 */ li $at, 0x40000000 # 2.000000 -/* 02B884 8002AC84 26040100 */ addiu $a0, $s0, 0x100 -/* 02B888 8002AC88 4608503E */ c.le.s $f10, $f8 -/* 02B88C 8002AC8C 3C05800E */ lui $a1, %hi(gKartGravityTable) # 0x800e -/* 02B890 8002AC90 45020005 */ bc1fl .L8002ACA8 -/* 02B894 8002AC94 96090254 */ lhu $t1, 0x254($s0) -/* 02B898 8002AC98 44818000 */ mtc1 $at, $f16 -/* 02B89C 8002AC9C 00000000 */ nop -/* 02B8A0 8002ACA0 E6100DAC */ swc1 $f16, 0xdac($s0) -/* 02B8A4 8002ACA4 96090254 */ lhu $t1, 0x254($s0) -.L8002ACA8: -/* 02B8A8 8002ACA8 3C063CA3 */ lui $a2, (0x3CA3D70A >> 16) # lui $a2, 0x3ca3 -/* 02B8AC 8002ACAC 34C6D70A */ ori $a2, (0x3CA3D70A & 0xFFFF) # ori $a2, $a2, 0xd70a -/* 02B8B0 8002ACB0 00095080 */ sll $t2, $t1, 2 -/* 02B8B4 8002ACB4 00AA2821 */ addu $a1, $a1, $t2 -/* 02B8B8 8002ACB8 0C008973 */ jal move_f32_towards -/* 02B8BC 8002ACBC 8CA52650 */ lw $a1, %lo(gKartGravityTable)($a1) # 0x2650($a1) -/* 02B8C0 8002ACC0 8E0B00BC */ lw $t3, 0xbc($s0) -/* 02B8C4 8002ACC4 24010002 */ li $at, 2 -/* 02B8C8 8002ACC8 26040DAC */ addiu $a0, $s0, 0xdac -/* 02B8CC 8002ACCC 316C0002 */ andi $t4, $t3, 2 -/* 02B8D0 8002ACD0 15810009 */ bne $t4, $at, .L8002ACF8 -/* 02B8D4 8002ACD4 3C053F80 */ lui $a1, 0x3f80 -/* 02B8D8 8002ACD8 26040DAC */ addiu $a0, $s0, 0xdac -/* 02B8DC 8002ACDC 3C063D8F */ lui $a2, (0x3D8F5C29 >> 16) # lui $a2, 0x3d8f -/* 02B8E0 8002ACE0 34C65C29 */ ori $a2, (0x3D8F5C29 & 0xFFFF) # ori $a2, $a2, 0x5c29 -/* 02B8E4 8002ACE4 AFA40020 */ sw $a0, 0x20($sp) -/* 02B8E8 8002ACE8 0C008973 */ jal move_f32_towards -/* 02B8EC 8002ACEC 3C053F80 */ lui $a1, 0x3f80 -/* 02B8F0 8002ACF0 10000006 */ b .L8002AD0C -/* 02B8F4 8002ACF4 8E0200BC */ lw $v0, 0xbc($s0) -.L8002ACF8: -/* 02B8F8 8002ACF8 3C063D8F */ lui $a2, (0x3D8F5C29 >> 16) # lui $a2, 0x3d8f -/* 02B8FC 8002ACFC 34C65C29 */ ori $a2, (0x3D8F5C29 & 0xFFFF) # ori $a2, $a2, 0x5c29 -/* 02B900 8002AD00 0C008973 */ jal move_f32_towards -/* 02B904 8002AD04 AFA40020 */ sw $a0, 0x20($sp) -/* 02B908 8002AD08 8E0200BC */ lw $v0, 0xbc($s0) -.L8002AD0C: -/* 02B90C 8002AD0C 3C030010 */ lui $v1, 0x10 -/* 02B910 8002AD10 8FA40020 */ lw $a0, 0x20($sp) -/* 02B914 8002AD14 00436824 */ and $t5, $v0, $v1 -/* 02B918 8002AD18 146D0007 */ bne $v1, $t5, .L8002AD38 -/* 02B91C 8002AD1C 3C0541A0 */ lui $a1, 0x41a0 -/* 02B920 8002AD20 0C008973 */ jal move_f32_towards -/* 02B924 8002AD24 3C063F80 */ lui $a2, 0x3f80 -/* 02B928 8002AD28 3C01800F */ lui $at, %hi(D_800ED7B8) # $at, 0x800f -/* 02B92C 8002AD2C C432D7B8 */ lwc1 $f18, %lo(D_800ED7B8)($at) -/* 02B930 8002AD30 8E0200BC */ lw $v0, 0xbc($s0) -/* 02B934 8002AD34 E6120100 */ swc1 $f18, 0x100($s0) -.L8002AD38: -/* 02B938 8002AD38 304E0004 */ andi $t6, $v0, 4 -/* 02B93C 8002AD3C 24010004 */ li $at, 4 -/* 02B940 8002AD40 15C10008 */ bne $t6, $at, .L8002AD64 -/* 02B944 8002AD44 8FA40020 */ lw $a0, 0x20($sp) -/* 02B948 8002AD48 3C0541C8 */ lui $a1, 0x41c8 -/* 02B94C 8002AD4C 0C008973 */ jal move_f32_towards -/* 02B950 8002AD50 3C063F80 */ lui $a2, 0x3f80 -/* 02B954 8002AD54 3C0144E1 */ li $at, 0x44E10000 # 1800.000000 -/* 02B958 8002AD58 44812000 */ mtc1 $at, $f4 -/* 02B95C 8002AD5C 8E0200BC */ lw $v0, 0xbc($s0) -/* 02B960 8002AD60 E6040100 */ swc1 $f4, 0x100($s0) -.L8002AD64: -/* 02B964 8002AD64 304F0400 */ andi $t7, $v0, 0x400 -/* 02B968 8002AD68 24010400 */ li $at, 1024 -/* 02B96C 8002AD6C 15E10004 */ bne $t7, $at, .L8002AD80 -/* 02B970 8002AD70 3C01800F */ lui $at, %hi(D_800ED7BC) # $at, 0x800f -/* 02B974 8002AD74 C426D7BC */ lwc1 $f6, %lo(D_800ED7BC)($at) -/* 02B978 8002AD78 8E0200BC */ lw $v0, 0xbc($s0) -/* 02B97C 8002AD7C E6060100 */ swc1 $f6, 0x100($s0) -.L8002AD80: -/* 02B980 8002AD80 0002C300 */ sll $t8, $v0, 0xc -/* 02B984 8002AD84 07010003 */ bgez $t8, .L8002AD94 -/* 02B988 8002AD88 3C01800F */ lui $at, %hi(D_800ED7C0) # $at, 0x800f -/* 02B98C 8002AD8C C428D7C0 */ lwc1 $f8, %lo(D_800ED7C0)($at) -/* 02B990 8002AD90 E6080100 */ swc1 $f8, 0x100($s0) -.L8002AD94: -/* 02B994 8002AD94 86190044 */ lh $t9, 0x44($s0) -/* 02B998 8002AD98 3C01800F */ lui $at, %hi(D_800ED7C4) # $at, 0x800f -/* 02B99C 8002AD9C 33280800 */ andi $t0, $t9, 0x800 -/* 02B9A0 8002ADA0 51000004 */ beql $t0, $zero, .L8002ADB4 -/* 02B9A4 8002ADA4 8E0200BC */ lw $v0, 0xbc($s0) -/* 02B9A8 8002ADA8 C42AD7C4 */ lwc1 $f10, %lo(D_800ED7C4)($at) -/* 02B9AC 8002ADAC E60A0100 */ swc1 $f10, 0x100($s0) -/* 02B9B0 8002ADB0 8E0200BC */ lw $v0, 0xbc($s0) -.L8002ADB4: -/* 02B9B4 8002ADB4 3C030080 */ lui $v1, 0x80 -/* 02B9B8 8002ADB8 3C014396 */ li $at, 0x43960000 # 300.000000 -/* 02B9BC 8002ADBC 00434824 */ and $t1, $v0, $v1 -/* 02B9C0 8002ADC0 54690005 */ bnel $v1, $t1, .L8002ADD8 -/* 02B9C4 8002ADC4 3C030100 */ lui $v1, 0x100 -/* 02B9C8 8002ADC8 44818000 */ mtc1 $at, $f16 -/* 02B9CC 8002ADCC 8E0200BC */ lw $v0, 0xbc($s0) -/* 02B9D0 8002ADD0 E6100100 */ swc1 $f16, 0x100($s0) -/* 02B9D4 8002ADD4 3C030100 */ lui $v1, 0x100 -.L8002ADD8: -/* 02B9D8 8002ADD8 00435024 */ and $t2, $v0, $v1 -/* 02B9DC 8002ADDC 146A0004 */ bne $v1, $t2, .L8002ADF0 -/* 02B9E0 8002ADE0 3C01800F */ lui $at, %hi(D_800ED7C8) # $at, 0x800f -/* 02B9E4 8002ADE4 C432D7C8 */ lwc1 $f18, %lo(D_800ED7C8)($at) -/* 02B9E8 8002ADE8 8E0200BC */ lw $v0, 0xbc($s0) -/* 02B9EC 8002ADEC E6120100 */ swc1 $f18, 0x100($s0) -.L8002ADF0: -/* 02B9F0 8002ADF0 3C030200 */ lui $v1, 0x200 -/* 02B9F4 8002ADF4 00435824 */ and $t3, $v0, $v1 -/* 02B9F8 8002ADF8 146B0004 */ bne $v1, $t3, .L8002AE0C -/* 02B9FC 8002ADFC 3C014448 */ li $at, 0x44480000 # 800.000000 -/* 02BA00 8002AE00 44812000 */ mtc1 $at, $f4 -/* 02BA04 8002AE04 00000000 */ nop -/* 02BA08 8002AE08 E6040100 */ swc1 $f4, 0x100($s0) -.L8002AE0C: -/* 02BA0C 8002AE0C 8FBF001C */ lw $ra, 0x1c($sp) -/* 02BA10 8002AE10 8FB00018 */ lw $s0, 0x18($sp) -/* 02BA14 8002AE14 27BD0030 */ addiu $sp, $sp, 0x30 -/* 02BA18 8002AE18 03E00008 */ jr $ra -/* 02BA1C 8002AE1C 00000000 */ nop - -/* 02BA20 8002AE20 03E00008 */ jr $ra -/* 02BA24 8002AE24 00000000 */ nop - -/* 02BA28 8002AE28 03E00008 */ jr $ra -/* 02BA2C 8002AE2C 00000000 */ nop - -/* 02BA30 8002AE30 03E00008 */ jr $ra -/* 02BA34 8002AE34 00000000 */ nop diff --git a/asm/non_matchings/code_80027D00/func_8002B5C0.s b/asm/non_matchings/code_80027D00/func_8002B5C0.s deleted file mode 100644 index c3845d40b..000000000 --- a/asm/non_matchings/code_80027D00/func_8002B5C0.s +++ /dev/null @@ -1,176 +0,0 @@ -glabel func_8002B5C0 -/* 02C1C0 8002B5C0 AFA50004 */ sw $a1, 4($sp) -/* 02C1C4 8002B5C4 AFA60008 */ sw $a2, 8($sp) -/* 02C1C8 8002B5C8 848200CA */ lh $v0, 0xca($a0) -/* 02C1CC 8002B5CC 3C060080 */ lui $a2, 0x80 -/* 02C1D0 8002B5D0 304E0008 */ andi $t6, $v0, 8 -/* 02C1D4 8002B5D4 15C00003 */ bnez $t6, .L8002B5E4 -/* 02C1D8 8002B5D8 304F0002 */ andi $t7, $v0, 2 -/* 02C1DC 8002B5DC 51E00007 */ beql $t7, $zero, .L8002B5FC -/* 02C1E0 8002B5E0 8C8200BC */ lw $v0, 0xbc($a0) -.L8002B5E4: -/* 02C1E4 8002B5E4 8C98000C */ lw $t8, 0xc($a0) -/* 02C1E8 8002B5E8 3C03FE1D */ lui $v1, (0xFE1D0478 >> 16) # lui $v1, 0xfe1d -/* 02C1EC 8002B5EC 34630478 */ ori $v1, (0xFE1D0478 & 0xFFFF) # ori $v1, $v1, 0x478 -/* 02C1F0 8002B5F0 0303C824 */ and $t9, $t8, $v1 -/* 02C1F4 8002B5F4 AC99000C */ sw $t9, 0xc($a0) -/* 02C1F8 8002B5F8 8C8200BC */ lw $v0, 0xbc($a0) -.L8002B5FC: -/* 02C1FC 8002B5FC 3C03FE1D */ lui $v1, (0xFE1D0478 >> 16) # lui $v1, 0xfe1d -/* 02C200 8002B600 24010400 */ li $at, 1024 -/* 02C204 8002B604 30480400 */ andi $t0, $v0, 0x400 -/* 02C208 8002B608 15010007 */ bne $t0, $at, .L8002B628 -/* 02C20C 8002B60C 34630478 */ ori $v1, (0xFE1D0478 & 0xFFFF) # ori $v1, $v1, 0x478 -/* 02C210 8002B610 8C89000C */ lw $t1, 0xc($a0) -/* 02C214 8002B614 3C05FF5D */ lui $a1, (0xFF5D457E >> 16) # lui $a1, 0xff5d -/* 02C218 8002B618 34A5457E */ ori $a1, (0xFF5D457E & 0xFFFF) # ori $a1, $a1, 0x457e -/* 02C21C 8002B61C 01255024 */ and $t2, $t1, $a1 -/* 02C220 8002B620 AC8A000C */ sw $t2, 0xc($a0) -/* 02C224 8002B624 8C8200BC */ lw $v0, 0xbc($a0) -.L8002B628: -/* 02C228 8002B628 3C05FF5D */ lui $a1, (0xFF5D457E >> 16) # lui $a1, 0xff5d -/* 02C22C 8002B62C 304B0080 */ andi $t3, $v0, 0x80 -/* 02C230 8002B630 24010080 */ li $at, 128 -/* 02C234 8002B634 11610005 */ beq $t3, $at, .L8002B64C -/* 02C238 8002B638 34A5457E */ ori $a1, (0xFF5D457E & 0xFFFF) # ori $a1, $a1, 0x457e -/* 02C23C 8002B63C 304C0040 */ andi $t4, $v0, 0x40 -/* 02C240 8002B640 24010040 */ li $at, 64 -/* 02C244 8002B644 55810008 */ bnel $t4, $at, .L8002B668 -/* 02C248 8002B648 304F0800 */ andi $t7, $v0, 0x800 -.L8002B64C: -/* 02C24C 8002B64C 8C8D000C */ lw $t5, 0xc($a0) -/* 02C250 8002B650 3C01FF5F */ lui $at, (0xFF5F457E >> 16) # lui $at, 0xff5f -/* 02C254 8002B654 3421457E */ ori $at, (0xFF5F457E & 0xFFFF) # ori $at, $at, 0x457e -/* 02C258 8002B658 01A17024 */ and $t6, $t5, $at -/* 02C25C 8002B65C AC8E000C */ sw $t6, 0xc($a0) -/* 02C260 8002B660 8C8200BC */ lw $v0, 0xbc($a0) -/* 02C264 8002B664 304F0800 */ andi $t7, $v0, 0x800 -.L8002B668: -/* 02C268 8002B668 24010800 */ li $at, 2048 -/* 02C26C 8002B66C 55E10005 */ bnel $t7, $at, .L8002B684 -/* 02C270 8002B670 84880044 */ lh $t0, 0x44($a0) -/* 02C274 8002B674 8C98000C */ lw $t8, 0xc($a0) -/* 02C278 8002B678 0305C824 */ and $t9, $t8, $a1 -/* 02C27C 8002B67C AC99000C */ sw $t9, 0xc($a0) -/* 02C280 8002B680 84880044 */ lh $t0, 0x44($a0) -.L8002B684: -/* 02C284 8002B684 31094000 */ andi $t1, $t0, 0x4000 -/* 02C288 8002B688 51200005 */ beql $t1, $zero, .L8002B6A0 -/* 02C28C 8002B68C 8C8200BC */ lw $v0, 0xbc($a0) -/* 02C290 8002B690 8C8A000C */ lw $t2, 0xc($a0) -/* 02C294 8002B694 01455824 */ and $t3, $t2, $a1 -/* 02C298 8002B698 AC8B000C */ sw $t3, 0xc($a0) -/* 02C29C 8002B69C 8C8200BC */ lw $v0, 0xbc($a0) -.L8002B6A0: -/* 02C2A0 8002B6A0 3C050008 */ lui $a1, 8 -/* 02C2A4 8002B6A4 00456024 */ and $t4, $v0, $a1 -/* 02C2A8 8002B6A8 54AC0008 */ bnel $a1, $t4, .L8002B6CC -/* 02C2AC 8002B6AC 3C05FE1D */ lui $a1, 0xfe1d -/* 02C2B0 8002B6B0 8C8D000C */ lw $t5, 0xc($a0) -/* 02C2B4 8002B6B4 3C05FE1D */ lui $a1, (0xFE1D4478 >> 16) # lui $a1, 0xfe1d -/* 02C2B8 8002B6B8 34A54478 */ ori $a1, (0xFE1D4478 & 0xFFFF) # ori $a1, $a1, 0x4478 -/* 02C2BC 8002B6BC 01A57024 */ and $t6, $t5, $a1 -/* 02C2C0 8002B6C0 AC8E000C */ sw $t6, 0xc($a0) -/* 02C2C4 8002B6C4 8C8200BC */ lw $v0, 0xbc($a0) -/* 02C2C8 8002B6C8 3C05FE1D */ lui $a1, (0xFE1D4478 >> 16) # lui $a1, 0xfe1d -.L8002B6CC: -/* 02C2CC 8002B6CC 00467824 */ and $t7, $v0, $a2 -/* 02C2D0 8002B6D0 14CF0005 */ bne $a2, $t7, .L8002B6E8 -/* 02C2D4 8002B6D4 34A54478 */ ori $a1, (0xFE1D4478 & 0xFFFF) # ori $a1, $a1, 0x4478 -/* 02C2D8 8002B6D8 8C98000C */ lw $t8, 0xc($a0) -/* 02C2DC 8002B6DC 8C8200BC */ lw $v0, 0xbc($a0) -/* 02C2E0 8002B6E0 0303C824 */ and $t9, $t8, $v1 -/* 02C2E4 8002B6E4 AC99000C */ sw $t9, 0xc($a0) -.L8002B6E8: -/* 02C2E8 8002B6E8 3C060400 */ lui $a2, 0x400 -/* 02C2EC 8002B6EC 00464024 */ and $t0, $v0, $a2 -/* 02C2F0 8002B6F0 14C80006 */ bne $a2, $t0, .L8002B70C -/* 02C2F4 8002B6F4 3C01FE1D */ lui $at, (0xFE1D0578 >> 16) # lui $at, 0xfe1d -/* 02C2F8 8002B6F8 8C89000C */ lw $t1, 0xc($a0) -/* 02C2FC 8002B6FC 34210578 */ ori $at, (0xFE1D0578 & 0xFFFF) # ori $at, $at, 0x578 -/* 02C300 8002B700 8C8200BC */ lw $v0, 0xbc($a0) -/* 02C304 8002B704 01215024 */ and $t2, $t1, $at -/* 02C308 8002B708 AC8A000C */ sw $t2, 0xc($a0) -.L8002B70C: -/* 02C30C 8002B70C 3C060100 */ lui $a2, 0x100 -/* 02C310 8002B710 00465824 */ and $t3, $v0, $a2 -/* 02C314 8002B714 14CB0005 */ bne $a2, $t3, .L8002B72C -/* 02C318 8002B718 24010004 */ li $at, 4 -/* 02C31C 8002B71C 8C8C000C */ lw $t4, 0xc($a0) -/* 02C320 8002B720 8C8200BC */ lw $v0, 0xbc($a0) -/* 02C324 8002B724 01856824 */ and $t5, $t4, $a1 -/* 02C328 8002B728 AC8D000C */ sw $t5, 0xc($a0) -.L8002B72C: -/* 02C32C 8002B72C 3C060200 */ lui $a2, 0x200 -/* 02C330 8002B730 00467024 */ and $t6, $v0, $a2 -/* 02C334 8002B734 54CE0006 */ bnel $a2, $t6, .L8002B750 -/* 02C338 8002B738 3C050010 */ lui $a1, 0x10 -/* 02C33C 8002B73C 8C8F000C */ lw $t7, 0xc($a0) -/* 02C340 8002B740 8C8200BC */ lw $v0, 0xbc($a0) -/* 02C344 8002B744 01E5C024 */ and $t8, $t7, $a1 -/* 02C348 8002B748 AC98000C */ sw $t8, 0xc($a0) -/* 02C34C 8002B74C 3C050010 */ lui $a1, 0x10 -.L8002B750: -/* 02C350 8002B750 0045C824 */ and $t9, $v0, $a1 -/* 02C354 8002B754 54B90006 */ bnel $a1, $t9, .L8002B770 -/* 02C358 8002B758 304A0004 */ andi $t2, $v0, 4 -/* 02C35C 8002B75C 8C88000C */ lw $t0, 0xc($a0) -/* 02C360 8002B760 8C8200BC */ lw $v0, 0xbc($a0) -/* 02C364 8002B764 01034824 */ and $t1, $t0, $v1 -/* 02C368 8002B768 AC89000C */ sw $t1, 0xc($a0) -/* 02C36C 8002B76C 304A0004 */ andi $t2, $v0, 4 -.L8002B770: -/* 02C370 8002B770 15410005 */ bne $t2, $at, .L8002B788 -/* 02C374 8002B774 3C050001 */ lui $a1, 1 -/* 02C378 8002B778 8C8B000C */ lw $t3, 0xc($a0) -/* 02C37C 8002B77C 8C8200BC */ lw $v0, 0xbc($a0) -/* 02C380 8002B780 01636024 */ and $t4, $t3, $v1 -/* 02C384 8002B784 AC8C000C */ sw $t4, 0xc($a0) -.L8002B788: -/* 02C388 8002B788 00456824 */ and $t5, $v0, $a1 -/* 02C38C 8002B78C 14AD0005 */ bne $a1, $t5, .L8002B7A4 -/* 02C390 8002B790 24010200 */ li $at, 512 -/* 02C394 8002B794 8C8E000C */ lw $t6, 0xc($a0) -/* 02C398 8002B798 8C8200BC */ lw $v0, 0xbc($a0) -/* 02C39C 8002B79C 01C37824 */ and $t7, $t6, $v1 -/* 02C3A0 8002B7A0 AC8F000C */ sw $t7, 0xc($a0) -.L8002B7A4: -/* 02C3A4 8002B7A4 30580200 */ andi $t8, $v0, 0x200 -/* 02C3A8 8002B7A8 17010007 */ bne $t8, $at, .L8002B7C8 -/* 02C3AC 8002B7AC 3C058000 */ lui $a1, 0x8000 -/* 02C3B0 8002B7B0 8C99000C */ lw $t9, 0xc($a0) -/* 02C3B4 8002B7B4 3C01FE9D */ lui $at, (0xFE9D8478 >> 16) # lui $at, 0xfe9d -/* 02C3B8 8002B7B8 34218478 */ ori $at, (0xFE9D8478 & 0xFFFF) # ori $at, $at, 0x8478 -/* 02C3BC 8002B7BC 03214024 */ and $t0, $t9, $at -/* 02C3C0 8002B7C0 AC88000C */ sw $t0, 0xc($a0) -/* 02C3C4 8002B7C4 8C8200BC */ lw $v0, 0xbc($a0) -.L8002B7C8: -/* 02C3C8 8002B7C8 00454824 */ and $t1, $v0, $a1 -/* 02C3CC 8002B7CC 14A90006 */ bne $a1, $t1, .L8002B7E8 -/* 02C3D0 8002B7D0 3C01FE9D */ lui $at, (0xFE9D8678 >> 16) # lui $at, 0xfe9d -/* 02C3D4 8002B7D4 8C8A000C */ lw $t2, 0xc($a0) -/* 02C3D8 8002B7D8 34218678 */ ori $at, (0xFE9D8678 & 0xFFFF) # ori $at, $at, 0x8678 -/* 02C3DC 8002B7DC 8C8200BC */ lw $v0, 0xbc($a0) -/* 02C3E0 8002B7E0 01415824 */ and $t3, $t2, $at -/* 02C3E4 8002B7E4 AC8B000C */ sw $t3, 0xc($a0) -.L8002B7E8: -/* 02C3E8 8002B7E8 304C4000 */ andi $t4, $v0, 0x4000 -/* 02C3EC 8002B7EC 24014000 */ li $at, 16384 -/* 02C3F0 8002B7F0 15810007 */ bne $t4, $at, .L8002B810 -/* 02C3F4 8002B7F4 3C050002 */ lui $a1, 2 -/* 02C3F8 8002B7F8 8C8D000C */ lw $t5, 0xc($a0) -/* 02C3FC 8002B7FC 3C01FF5D */ lui $at, (0xFF5D45FF >> 16) # lui $at, 0xff5d -/* 02C400 8002B800 342145FF */ ori $at, (0xFF5D45FF & 0xFFFF) # ori $at, $at, 0x45ff -/* 02C404 8002B804 01A17024 */ and $t6, $t5, $at -/* 02C408 8002B808 AC8E000C */ sw $t6, 0xc($a0) -/* 02C40C 8002B80C 8C8200BC */ lw $v0, 0xbc($a0) -.L8002B810: -/* 02C410 8002B810 00457824 */ and $t7, $v0, $a1 -/* 02C414 8002B814 14AF0004 */ bne $a1, $t7, .L8002B828 -/* 02C418 8002B818 00000000 */ nop -/* 02C41C 8002B81C 8C98000C */ lw $t8, 0xc($a0) -/* 02C420 8002B820 0303C824 */ and $t9, $t8, $v1 -/* 02C424 8002B824 AC99000C */ sw $t9, 0xc($a0) -.L8002B828: -/* 02C428 8002B828 03E00008 */ jr $ra -/* 02C42C 8002B82C 00000000 */ nop diff --git a/asm/non_matchings/code_80027D00/func_8002B830.s b/asm/non_matchings/code_80027D00/func_8002B8A4.s similarity index 73% rename from asm/non_matchings/code_80027D00/func_8002B830.s rename to asm/non_matchings/code_80027D00/func_8002B8A4.s index dd9517e28..754ea7b72 100644 --- a/asm/non_matchings/code_80027D00/func_8002B830.s +++ b/asm/non_matchings/code_80027D00/func_8002B8A4.s @@ -1,124 +1,91 @@ -glabel func_8002B830 -/* 02C430 8002B830 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 02C434 8002B834 AFBF0014 */ sw $ra, 0x14($sp) -/* 02C438 8002B838 AFA5001C */ sw $a1, 0x1c($sp) -/* 02C43C 8002B83C AFA60020 */ sw $a2, 0x20($sp) -/* 02C440 8002B840 8C82000C */ lw $v0, 0xc($a0) -/* 02C444 8002B844 83A60023 */ lb $a2, 0x23($sp) -/* 02C448 8002B848 83A5001F */ lb $a1, 0x1f($sp) -/* 02C44C 8002B84C 10400005 */ beqz $v0, .L8002B864 -/* 02C450 8002B850 00000000 */ nop -/* 02C454 8002B854 0C00AD70 */ jal func_8002B5C0 -/* 02C458 8002B858 AFA40018 */ sw $a0, 0x18($sp) -/* 02C45C 8002B85C 8FA40018 */ lw $a0, 0x18($sp) -/* 02C460 8002B860 8C82000C */ lw $v0, 0xc($a0) -.L8002B864: -/* 02C464 8002B864 10400005 */ beqz $v0, .L8002B87C -/* 02C468 8002B868 83A5001F */ lb $a1, 0x1f($sp) -/* 02C46C 8002B86C 83A60023 */ lb $a2, 0x23($sp) -/* 02C470 8002B870 0C00ACC2 */ jal func_8002B308 -/* 02C474 8002B874 AFA40018 */ sw $a0, 0x18($sp) -/* 02C478 8002B878 8FA40018 */ lw $a0, 0x18($sp) -.L8002B87C: -/* 02C47C 8002B87C 848E0044 */ lh $t6, 0x44($a0) -/* 02C480 8002B880 31CF0400 */ andi $t7, $t6, 0x400 -/* 02C484 8002B884 51E00004 */ beql $t7, $zero, .L8002B898 -/* 02C488 8002B888 8FBF0014 */ lw $ra, 0x14($sp) -/* 02C48C 8002B88C 0C02446D */ jal func_800911B4 -/* 02C490 8002B890 83A5001F */ lb $a1, 0x1f($sp) -/* 02C494 8002B894 8FBF0014 */ lw $ra, 0x14($sp) -.L8002B898: -/* 02C498 8002B898 27BD0018 */ addiu $sp, $sp, 0x18 -/* 02C49C 8002B89C 03E00008 */ jr $ra -/* 02C4A0 8002B8A0 00000000 */ nop - -/* 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(gPlayerTwo) # $a1, 0x800e -/* 02C4C4 8002B8C4 8CA5C4E0 */ lw $a1, %lo(gPlayerTwo)($a1) -/* 02C4C8 8002B8C8 8FA3000C */ lw $v1, 0xc($sp) -/* 02C4CC 8002B8CC 3C06800E */ lui $a2, %hi(gPlayerThree) # $a2, 0x800e -/* 02C4D0 8002B8D0 14850002 */ bne $a0, $a1, .L8002B8DC -/* 02C4D4 8002B8D4 3C07800E */ lui $a3, %hi(gPlayerFour) # $a3, 0x800e -/* 02C4D8 8002B8D8 24030001 */ li $v1, 1 -.L8002B8DC: -/* 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(gPlayerSeven) # $t2, 0x800e -/* 02C4F0 8002B8F0 24030002 */ li $v1, 2 -.L8002B8F4: -/* 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(gPlayerEight) # $t3, 0x800e -/* 02C508 8002B908 24030003 */ li $v1, 3 -.L8002B90C: -/* 02C50C 8002B90C 8D08C4EC */ lw $t0, %lo(gPlayerFive)($t0) -/* 02C510 8002B910 14880002 */ bne $a0, $t0, .L8002B91C -/* 02C514 8002B914 00000000 */ nop -/* 02C518 8002B918 24030004 */ li $v1, 4 -.L8002B91C: -/* 02C51C 8002B91C 8D29C4F0 */ lw $t1, %lo(gPlayerSix)($t1) -/* 02C520 8002B920 14890002 */ bne $a0, $t1, .L8002B92C -/* 02C524 8002B924 00000000 */ nop -/* 02C528 8002B928 24030005 */ li $v1, 5 -.L8002B92C: -/* 02C52C 8002B92C 8D4AC4F4 */ lw $t2, %lo(gPlayerSeven)($t2) -/* 02C530 8002B930 148A0002 */ bne $a0, $t2, .L8002B93C -/* 02C534 8002B934 00000000 */ nop -/* 02C538 8002B938 24030006 */ li $v1, 6 -.L8002B93C: -/* 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 -/* 02C54C 8002B94C 00037080 */ sll $t6, $v1, 2 -.L8002B950: -/* 02C550 8002B950 018E7821 */ addu $t7, $t4, $t6 -/* 02C554 8002B954 16020002 */ bne $s0, $v0, .L8002B960 -/* 02C558 8002B958 ADF00000 */ sw $s0, ($t7) -/* 02C55C 8002B95C 00001825 */ move $v1, $zero -.L8002B960: -/* 02C560 8002B960 16050002 */ bne $s0, $a1, .L8002B96C -/* 02C564 8002B964 00000000 */ nop -/* 02C568 8002B968 24030001 */ li $v1, 1 -.L8002B96C: -/* 02C56C 8002B96C 16060002 */ bne $s0, $a2, .L8002B978 -/* 02C570 8002B970 00000000 */ nop -/* 02C574 8002B974 24030002 */ li $v1, 2 -.L8002B978: -/* 02C578 8002B978 16070002 */ bne $s0, $a3, .L8002B984 -/* 02C57C 8002B97C 00000000 */ nop -/* 02C580 8002B980 24030003 */ li $v1, 3 -.L8002B984: -/* 02C584 8002B984 16080002 */ bne $s0, $t0, .L8002B990 -/* 02C588 8002B988 00000000 */ nop -/* 02C58C 8002B98C 24030004 */ li $v1, 4 -.L8002B990: -/* 02C590 8002B990 16090002 */ bne $s0, $t1, .L8002B99C -/* 02C594 8002B994 00000000 */ nop -/* 02C598 8002B998 24030005 */ li $v1, 5 -.L8002B99C: -/* 02C59C 8002B99C 160A0002 */ bne $s0, $t2, .L8002B9A8 -/* 02C5A0 8002B9A0 00000000 */ nop -/* 02C5A4 8002B9A4 24030006 */ li $v1, 6 -.L8002B9A8: -/* 02C5A8 8002B9A8 560B0003 */ bnel $s0, $t3, .L8002B9B8 -/* 02C5AC 8002B9AC 0003C080 */ sll $t8, $v1, 2 -/* 02C5B0 8002B9B0 24030007 */ li $v1, 7 -/* 02C5B4 8002B9B4 0003C080 */ sll $t8, $v1, 2 -.L8002B9B8: -/* 02C5B8 8002B9B8 0198C821 */ addu $t9, $t4, $t8 -/* 02C5BC 8002B9BC AF240000 */ sw $a0, ($t9) -/* 02C5C0 8002B9C0 8FB00004 */ lw $s0, 4($sp) -/* 02C5C4 8002B9C4 03E00008 */ jr $ra -/* 02C5C8 8002B9C8 27BD0010 */ addiu $sp, $sp, 0x10 +glabel func_8002B8A4 +/* 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(gPlayerTwo) # $a1, 0x800e +/* 02C4C4 8002B8C4 8CA5C4E0 */ lw $a1, %lo(gPlayerTwo)($a1) +/* 02C4C8 8002B8C8 8FA3000C */ lw $v1, 0xc($sp) +/* 02C4CC 8002B8CC 3C06800E */ lui $a2, %hi(gPlayerThree) # $a2, 0x800e +/* 02C4D0 8002B8D0 14850002 */ bne $a0, $a1, .L8002B8DC +/* 02C4D4 8002B8D4 3C07800E */ lui $a3, %hi(gPlayerFour) # $a3, 0x800e +/* 02C4D8 8002B8D8 24030001 */ li $v1, 1 +.L8002B8DC: +/* 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(gPlayerSeven) # $t2, 0x800e +/* 02C4F0 8002B8F0 24030002 */ li $v1, 2 +.L8002B8F4: +/* 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(gPlayerEight) # $t3, 0x800e +/* 02C508 8002B908 24030003 */ li $v1, 3 +.L8002B90C: +/* 02C50C 8002B90C 8D08C4EC */ lw $t0, %lo(gPlayerFive)($t0) +/* 02C510 8002B910 14880002 */ bne $a0, $t0, .L8002B91C +/* 02C514 8002B914 00000000 */ nop +/* 02C518 8002B918 24030004 */ li $v1, 4 +.L8002B91C: +/* 02C51C 8002B91C 8D29C4F0 */ lw $t1, %lo(gPlayerSix)($t1) +/* 02C520 8002B920 14890002 */ bne $a0, $t1, .L8002B92C +/* 02C524 8002B924 00000000 */ nop +/* 02C528 8002B928 24030005 */ li $v1, 5 +.L8002B92C: +/* 02C52C 8002B92C 8D4AC4F4 */ lw $t2, %lo(gPlayerSeven)($t2) +/* 02C530 8002B930 148A0002 */ bne $a0, $t2, .L8002B93C +/* 02C534 8002B934 00000000 */ nop +/* 02C538 8002B938 24030006 */ li $v1, 6 +.L8002B93C: +/* 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 +/* 02C54C 8002B94C 00037080 */ sll $t6, $v1, 2 +.L8002B950: +/* 02C550 8002B950 018E7821 */ addu $t7, $t4, $t6 +/* 02C554 8002B954 16020002 */ bne $s0, $v0, .L8002B960 +/* 02C558 8002B958 ADF00000 */ sw $s0, ($t7) +/* 02C55C 8002B95C 00001825 */ move $v1, $zero +.L8002B960: +/* 02C560 8002B960 16050002 */ bne $s0, $a1, .L8002B96C +/* 02C564 8002B964 00000000 */ nop +/* 02C568 8002B968 24030001 */ li $v1, 1 +.L8002B96C: +/* 02C56C 8002B96C 16060002 */ bne $s0, $a2, .L8002B978 +/* 02C570 8002B970 00000000 */ nop +/* 02C574 8002B974 24030002 */ li $v1, 2 +.L8002B978: +/* 02C578 8002B978 16070002 */ bne $s0, $a3, .L8002B984 +/* 02C57C 8002B97C 00000000 */ nop +/* 02C580 8002B980 24030003 */ li $v1, 3 +.L8002B984: +/* 02C584 8002B984 16080002 */ bne $s0, $t0, .L8002B990 +/* 02C588 8002B988 00000000 */ nop +/* 02C58C 8002B98C 24030004 */ li $v1, 4 +.L8002B990: +/* 02C590 8002B990 16090002 */ bne $s0, $t1, .L8002B99C +/* 02C594 8002B994 00000000 */ nop +/* 02C598 8002B998 24030005 */ li $v1, 5 +.L8002B99C: +/* 02C59C 8002B99C 160A0002 */ bne $s0, $t2, .L8002B9A8 +/* 02C5A0 8002B9A0 00000000 */ nop +/* 02C5A4 8002B9A4 24030006 */ li $v1, 6 +.L8002B9A8: +/* 02C5A8 8002B9A8 560B0003 */ bnel $s0, $t3, .L8002B9B8 +/* 02C5AC 8002B9AC 0003C080 */ sll $t8, $v1, 2 +/* 02C5B0 8002B9B0 24030007 */ li $v1, 7 +/* 02C5B4 8002B9B4 0003C080 */ sll $t8, $v1, 2 +.L8002B9B8: +/* 02C5B8 8002B9B8 0198C821 */ addu $t9, $t4, $t8 +/* 02C5BC 8002B9BC AF240000 */ sw $a0, ($t9) +/* 02C5C0 8002B9C0 8FB00004 */ lw $s0, 4($sp) +/* 02C5C4 8002B9C4 03E00008 */ jr $ra +/* 02C5C8 8002B9C8 27BD0010 */ addiu $sp, $sp, 0x10 diff --git a/src/code_8001F980.c b/src/code_8001F980.c index 93216fadf..e1dcfd3fe 100644 --- a/src/code_8001F980.c +++ b/src/code_8001F980.c @@ -2,47 +2,13 @@ #include #include #include -#include "framebuffers.h" - -extern s32 D_800ED600, D_800ED608, D_800ED610, D_800ED618, D_800ED620, D_800ED628, D_800ED630; -extern s32 gActiveScreenMode; -extern s32 D_800DDB58[]; -extern s32 D_800ED638; -extern s32 D_80164A28; -extern u16 D_800DC51C; -extern u16 D_8015F894; -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 *camera2; -extern Camera *camera4; - - -extern void func_80020000(Player *, Camera *, u8, u8); -extern void func_8002088C(); -extern void func_80020F1C(); -extern void func_80021244(Player *, u8, u8); -extern void func_80022BC4(Player*, s8, s32); -extern void func_80022DB4(Player*, s8, s32); -extern void func_800235AC(Player*, s8); -extern void func_80026A48(Player*, s8); -extern void func_80030A34(Player*); -extern void func_8006E634(Player*, u8, u8); -extern void func_8006E744(Player *, u8, u8); -extern void func_8006E848(Player *, u8, u8); -extern void func_8006E8C4(Player *, u8, u8); -extern void func_8006E940(s32, u8, u8); - +#include "variables.h" +#include "code_8001F980.h" +#include "code_80057C60.h" // Not yet implemented. Needs more work to match. // Remove ifdef when matching. -#ifdef NON_MATCHING +#ifdef NEEDS_RODATA s8 D_800DDB50[] = { 0x00, 0x02, 0x00, 0x01, 0x00, 0x01, 0x00, 0x02 }; @@ -1039,9 +1005,6 @@ void move_s32_towards(s32 *startingValue, s32 targetValue, f32 somePercent) { *startingValue -= ((*startingValue - targetValue) * somePercent); } -extern f64 D_800ED680; -extern f64 D_800ED688; - /** * Function: move_f32_towards diff --git a/src/code_8001F980.h b/src/code_8001F980.h new file mode 100644 index 000000000..48dcd83d4 --- /dev/null +++ b/src/code_8001F980.h @@ -0,0 +1,38 @@ +#ifndef CODE_8001F980_H +#define CODE_8001F980_H + +#include "common_structs.h" + +/* Function Prototypes */ + +void func_8001F980(s32*, s32*); +void func_80020000(Player*, struct Camera*, u8, u8); +void func_8002088C(); +void func_80020F1C(); +void func_80021244(Player*, u8, u8); +void func_800215DC(); +void func_800219BC(); +void func_80021C78(); +void func_80021D40(); +void func_80021DA8(); +void move_s32_towards(s32*, s32, f32); +void move_f32_towards(f32*, f32, f32); +void move_s16_towards(s16*, s16, f32); +void move_u16_towards(u16*, s16, f32); +void func_80022A98(Player*, s8); +void func_80022BC4(Player*, s8, s32); +void func_80022DB4(Player*, s8, s32); +void func_800235AC(Player*, s8); +void func_80026A48(Player*, s8); +void func_80030A34(Player*); + +/* This is where I'd put my static data, if I had any */ + +extern u16 D_800DC51C; +extern s32 D_800DDB58[]; +extern f64 D_800ED680; +extern f64 D_800ED688; +extern s32 D_80164A28; +extern u16 D_8015F894; + +#endif diff --git a/src/code_80027D00.c b/src/code_80027D00.c index 1282c87ec..659918666 100644 --- a/src/code_80027D00.c +++ b/src/code_80027D00.c @@ -1608,90 +1608,66 @@ void func_8002AAC0(Player *player) { } } -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? move_f32_towards(void *, f32, ?); // extern -extern f32 D_800ED7B8; -extern f32 D_800ED7BC; -extern f32 D_800ED7C0; -extern f32 D_800ED7C4; -extern f32 D_800ED7C8; - -void func_8002AB70(void *arg0) { - void *sp20; - s32 temp_lo; - void *temp_a0; - void *temp_a0_2; - void *temp_a0_3; - void *temp_a0_4; - s32 phi_v0; - s32 phi_v0_2; - s32 phi_v0_3; - - if (((arg0->unkBC & 8) != 8) && (arg0->unk8C > 0.0f)) { - temp_lo = arg0->unkC4 / 0xB6; - if ((temp_lo < -1) && (temp_lo >= -0x14) && (((arg0->unk94 / 18.0f) * 216.0f) >= 20.0f)) { - move_f32_towards(arg0 + 0x100, 500.0f, 0x3F800000); - temp_a0 = arg0 + 0xDAC; - sp20 = temp_a0; - move_f32_towards(temp_a0, 3.0f, 0x3D4CCCCD); +void func_8002AB70(Player *player) { + f64 pad; + if (((player->unk_0BC & 8) != 8) && (player->unk_08C > 0.0f)) { + if (((player->unk_0C4 / 182) < -1) && ((player->unk_0C4 / 182) >= -0x14) && (((player->unk_094 / 18.0f) * 216.0f) >= 20.0f)) { + move_f32_towards(&player->unk_100, 500.0f, 1.0f); + move_f32_towards(&player->unk_DAC, 3.0f, 0.05f); } else { - move_f32_towards(arg0 + 0x100, gKartGravityTable[arg0->unk254], 0x3DCCCCCD); - temp_a0_2 = arg0 + 0xDAC; - sp20 = temp_a0_2; - move_f32_towards(temp_a0_2, 1.0f, 0x3D8F5C29); + move_f32_towards(&player->unk_100, gKartGravityTable[player->characterId], 0.1f); + move_f32_towards(&player->unk_DAC, 1.0f, 0.07f); } } else { - if (arg0->unk124 >= 50.0f) { - arg0->unkDAC = 2.0f; + if (player->unk_124 >= 50.0f) { + player->unk_DAC = 2.0f; } - move_f32_towards(arg0 + 0x100, gKartGravityTable[arg0->unk254], 0x3CA3D70A); - temp_a0_3 = arg0 + 0xDAC; - if ((arg0->unkBC & 2) == 2) { - temp_a0_4 = arg0 + 0xDAC; - sp20 = temp_a0_4; - move_f32_towards(temp_a0_4, 1.0f, 0x3D8F5C29); + move_f32_towards(&player->unk_100, gKartGravityTable[player->characterId], 0.02f); + if ((player->unk_0BC & 2) == 2) { + move_f32_towards(&player->unk_DAC, 1.0f, 0.07f); } else { - sp20 = temp_a0_3; - move_f32_towards(temp_a0_3, 1.0f, 0x3D8F5C29); + move_f32_towards(&player->unk_DAC, 1.0f, 0.07f); } } - if ((arg0->unkBC & 0x100000) == 0x100000) { - move_f32_towards(sp20, 20.0f, 0x3F800000); - arg0->unk100 = D_800ED7B8; + if ((player->unk_0BC & 0x100000) == 0x100000) { + move_f32_towards(&player->unk_DAC, 20.0f, 1.0f); + player->unk_100 = D_800ED7B8; } - phi_v0 = arg0->unkBC; - if ((arg0->unkBC & 4) == 4) { - move_f32_towards(sp20, 25.0f, 0x3F800000); - arg0->unk100 = 1800.0f; - phi_v0 = arg0->unkBC; + if ((player->unk_0BC & 4) == 4) { + move_f32_towards(&player->unk_DAC, 25.0f, 1.0f); + player->unk_100 = 1800.0f; } - phi_v0_2 = phi_v0; - if ((phi_v0 & 0x400) == 0x400) { - arg0->unk100 = D_800ED7BC; - phi_v0_2 = arg0->unkBC; + if ((player->unk_0BC & 0x400) == 0x400) { + player->unk_100 = D_800ED7BC; } - if (phi_v0_2 & 0x80000) { - arg0->unk100 = D_800ED7C0; + if (player->unk_0BC & 0x80000) { + player->unk_100 = D_800ED7C0; } - if ((arg0->unk44 & 0x800) != 0) { - arg0->unk100 = D_800ED7C4; + if ((player->unk_044 & 0x800) != 0) { + player->unk_100 = D_800ED7C4; } - if ((arg0->unkBC & 0x800000) == 0x800000) { - arg0->unk100 = 300.0f; + if ((player->unk_0BC & 0x800000) == 0x800000) { + player->unk_100 = 300.0f; } - phi_v0_3 = arg0->unkBC; - if ((arg0->unkBC & 0x1000000) == 0x1000000) { - arg0->unk100 = D_800ED7C8; - phi_v0_3 = arg0->unkBC; + if ((player->unk_0BC & 0x01000000) == 0x01000000) { + player->unk_100 = D_800ED7C8; } - if ((phi_v0_3 & 0x2000000) == 0x2000000) { - arg0->unk100 = 800.0f; + if ((player->unk_0BC & 0x02000000) == 0x02000000) { + player->unk_100 = 800.0f; } } -#else -GLOBAL_ASM("asm/non_matchings/code_80027D00/func_8002AB70.s") -#endif + +UNUSED void func_8002AE20(void) { + +} + +UNUSED void func_8002AE28(void) { + +} + +UNUSED void func_8002AE30(void) { + +} #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 @@ -1794,25 +1770,10 @@ GLOBAL_ASM("asm/non_matchings/code_80027D00/func_8002AE38.s") #endif #ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8002A704(void *, s8); // extern -? func_8008C528(void *, s8); // extern -? func_8008C73C(void *, s8); // extern -? func_8008CDC0(void *, s8); // extern -? func_8008D0FC(void *, s8); // extern -? func_8008D3C4(void *, s8); // extern -? func_8008D570(void *, s8); // extern -? func_8008D7B0(void *, s8); // extern -? func_8008DABC(void *, s8); // extern -? func_8008DF98(void *, s8); // extern -? func_8008E6C0(void *, s8); // extern -? func_8008EAE0(s8, s8); // extern -? func_8008EC88(void *, s8); // extern -? func_8008EEE4(void *, s8); // extern -? func_8008F778(void *, s8); // extern -? func_8008FA38(void *, s8); // extern +//generated by mips_to_c commit 90e635335cb052c4324a3aa7478e4761db19dfaf +? func_8002A704(Player *, s8); /* extern */ -void func_8002B308(void *arg0, s8 arg1, ? arg2) { +void func_8002B308(Player *player, s8 arg1, s8 arg2) { s32 temp_v0; s32 phi_v0; s32 phi_v0_2; @@ -1832,224 +1793,246 @@ void func_8002B308(void *arg0, s8 arg1, ? arg2) { s32 phi_v0_16; s32 phi_v0_17; - temp_v0 = arg0->unkC; + temp_v0 = player->unk_00C; phi_v0 = temp_v0; if ((temp_v0 & 2) == 2) { - func_8008EAE0(arg1); - phi_v0 = arg0->unkC; + func_8008EAE0(player, arg1); + phi_v0 = player->unk_00C; } phi_v0_2 = phi_v0; if ((phi_v0 & 4) == 4) { - func_8008C528(arg0, arg1); - phi_v0_2 = arg0->unkC; + func_8008C528(player, arg1); + phi_v0_2 = player->unk_00C; } phi_v0_3 = phi_v0_2; if ((phi_v0_2 & 1) == 1) { - func_8008CDC0(arg0, arg1); - phi_v0_3 = arg0->unkC; + func_8008CDC0(player, arg1); + phi_v0_3 = player->unk_00C; } phi_v0_4 = phi_v0_3; if ((phi_v0_3 & 0x200) == 0x200) { - func_8008D3C4(arg0, arg1); - phi_v0_4 = arg0->unkC; + func_8008D3C4(player, arg1); + phi_v0_4 = player->unk_00C; } phi_v0_5 = phi_v0_4; - if ((phi_v0_4 & 0x2000000) == 0x2000000) { - func_8002A704(arg0, arg1); - phi_v0_5 = arg0->unkC; + if ((phi_v0_4 & 0x02000000) == 0x02000000) { + func_8002A704(player, arg1); + phi_v0_5 = player->unk_00C; } phi_v0_6 = phi_v0_5; if ((phi_v0_5 & 0x1000) == 0x1000) { - func_8008D570(arg0, arg1); - phi_v0_6 = arg0->unkC; + func_8008D570(player, arg1); + phi_v0_6 = player->unk_00C; } phi_v0_7 = phi_v0_6; if ((phi_v0_6 & 0x20000) == 0x20000) { - func_8008D7B0(arg0, arg1); - phi_v0_7 = arg0->unkC; + func_8008D7B0(player, arg1); + phi_v0_7 = player->unk_00C; } phi_v0_8 = phi_v0_7; if ((phi_v0_7 & 0x100) == 0x100) { - func_8008DABC(arg0, arg1); - phi_v0_8 = arg0->unkC; + func_8008DABC(player, arg1); + phi_v0_8 = player->unk_00C; } phi_v0_9 = phi_v0_8; if ((phi_v0_8 & 0x4000) == 0x4000) { - func_8008DF98(arg0, arg1); - phi_v0_9 = arg0->unkC; + func_8008DF98(player, arg1); + phi_v0_9 = player->unk_00C; } phi_v0_10 = phi_v0_9; if ((phi_v0_9 & 0x200000) == 0x200000) { - func_8008C73C(arg0, arg1); - phi_v0_10 = arg0->unkC; + func_8008C73C(player, arg1); + phi_v0_10 = player->unk_00C; } phi_v0_11 = phi_v0_10; if ((phi_v0_10 & 0x400000) == 0x400000) { - func_8008E6C0(arg0, arg1); - phi_v0_11 = arg0->unkC; + func_8008E6C0(player, arg1); + phi_v0_11 = player->unk_00C; } phi_v0_12 = phi_v0_11; - if ((phi_v0_11 & 0x1000000) == 0x1000000) { - func_8008EAE0(arg0, arg1); - phi_v0_12 = arg0->unkC; + if ((phi_v0_11 & 0x01000000) == 0x01000000) { + func_8008EAE0(player, arg1); + phi_v0_12 = player->unk_00C; } phi_v0_13 = phi_v0_12; if ((phi_v0_12 & 0x800000) == 0x800000) { - func_8008EC88(arg0, arg1); - phi_v0_13 = arg0->unkC; + func_8008EC88(player, arg1); + phi_v0_13 = player->unk_00C; } phi_v0_14 = phi_v0_13; if ((phi_v0_13 & 0x8000) == 0x8000) { - func_8008EEE4(arg0, arg1); - phi_v0_14 = arg0->unkC; + func_8008EEE4(player, arg1); + phi_v0_14 = player->unk_00C; } phi_v0_15 = phi_v0_14; if ((phi_v0_14 & 0x2000) == 0x2000) { - func_8008F778(arg0, arg1); - phi_v0_15 = arg0->unkC; + func_8008F778(player, arg1); + phi_v0_15 = player->unk_00C; } phi_v0_16 = phi_v0_15; if ((phi_v0_15 & 0x800) == 0x800) { - func_8008FA38(arg0, arg1); - phi_v0_16 = arg0->unkC; + func_8008FA38(player, arg1); + phi_v0_16 = player->unk_00C; } phi_v0_17 = phi_v0_16; if ((phi_v0_16 & 0x80) != 0) { - func_8008D0FC(arg0, arg1); - phi_v0_17 = arg0->unkC; + func_8008D0FC(player, arg1); + phi_v0_17 = player->unk_00C; } if (phi_v0_17 & 0x80000) { - func_8008E6C0(arg0, arg1); + func_8008E6C0(player, arg1); } } #else GLOBAL_ASM("asm/non_matchings/code_80027D00/func_8002B308.s") #endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -void func_8002B5C0(void *arg0, ? arg1, ? arg2) { - s16 temp_v0; - s32 phi_v0; - s32 phi_v0_2; - s32 phi_v0_3; - s32 phi_v0_4; - s32 phi_v0_5; - s32 phi_v0_6; - s32 phi_v0_7; - s32 phi_v0_8; - s32 phi_v0_9; - s32 phi_v0_10; - s32 phi_v0_11; - - temp_v0 = arg0->unkCA; - if (((temp_v0 & 8) != 0) || ((temp_v0 & 2) != 0)) { - arg0->unkC = arg0->unkC & 0xFE1D0478; +void func_8002B5C0(Player *player, s8 arg1, s8 arg2) { + if (((player->unk_0CA & 8) != 0) || ((player->unk_0CA & 2) != 0)) { + player->unk_00C &= 0xFE1D0478; } - if ((arg0->unkBC & 0x400) == 0x400) { - arg0->unkC = arg0->unkC & 0xFF5D457E; + if ((player->unk_0BC & 0x400) == 0x400) { + player->unk_00C &= 0xFF5D457E; } - phi_v0 = arg0->unkBC; - if (((arg0->unkBC & 0x80) == 0x80) || ((arg0->unkBC & 0x40) == 0x40)) { - arg0->unkC = arg0->unkC & 0xFF5F457E; - phi_v0 = arg0->unkBC; + if (((player->unk_0BC & 0x80) == 0x80) || ((player->unk_0BC & 0x40) == 0x40)) { + player->unk_00C &= 0xFF5F457E; } - if ((phi_v0 & 0x800) == 0x800) { - arg0->unkC = arg0->unkC & 0xFF5D457E; + if ((player->unk_0BC & 0x800) == 0x800) { + player->unk_00C &= 0xFF5D457E; } - if ((arg0->unk44 & 0x4000) != 0) { - arg0->unkC = arg0->unkC & 0xFF5D457E; + if ((player->unk_044 & 0x4000) != 0) { + player->unk_00C &= 0xFF5D457E; } - if ((arg0->unkBC & 0x80000) == 0x80000) { - arg0->unkC = arg0->unkC & 0xFE1D4478; + if ((player->unk_0BC & 0x80000) == 0x80000) { + player->unk_00C &= 0xFE1D4478; } - phi_v0_2 = arg0->unkBC; - if ((arg0->unkBC & 0x800000) == 0x800000) { - arg0->unkC = arg0->unkC & 0xFE1D0478; - phi_v0_2 = arg0->unkBC; + if ((player->unk_0BC & 0x800000) == 0x800000) { + player->unk_00C &= 0xFE1D0478; } - phi_v0_3 = phi_v0_2; - if ((phi_v0_2 & 0x4000000) == 0x4000000) { - arg0->unkC = arg0->unkC & 0xFE1D0578; - phi_v0_3 = arg0->unkBC; + if ((player->unk_0BC & 0x04000000) == 0x04000000) { + player->unk_00C &= 0xFE1D0578; } - phi_v0_4 = phi_v0_3; - if ((phi_v0_3 & 0x1000000) == 0x1000000) { - arg0->unkC = arg0->unkC & 0xFE1D4478; - phi_v0_4 = arg0->unkBC; + if ((player->unk_0BC & 0x01000000) == 0x01000000) { + player->unk_00C &= 0xFE1D4478; } - phi_v0_5 = phi_v0_4; - if ((phi_v0_4 & 0x2000000) == 0x2000000) { - arg0->unkC = arg0->unkC & 0xFE1D4478; - phi_v0_5 = arg0->unkBC; + if ((player->unk_0BC & 0x02000000) == 0x02000000) { + player->unk_00C &= 0xFE1D4478; } - phi_v0_6 = phi_v0_5; - if ((phi_v0_5 & 0x100000) == 0x100000) { - arg0->unkC = arg0->unkC & 0xFE1D0478; - phi_v0_6 = arg0->unkBC; + if ((player->unk_0BC & 0x100000) == 0x100000) { + player->unk_00C &= 0xFE1D0478; } - phi_v0_7 = phi_v0_6; - if ((phi_v0_6 & 4) == 4) { - arg0->unkC = arg0->unkC & 0xFE1D0478; - phi_v0_7 = arg0->unkBC; + if ((player->unk_0BC & 4) == 4) { + player->unk_00C &= 0xFE1D0478; } - phi_v0_8 = phi_v0_7; - if ((phi_v0_7 & 0x10000) == 0x10000) { - arg0->unkC = arg0->unkC & 0xFE1D0478; - phi_v0_8 = arg0->unkBC; + if ((player->unk_0BC & 0x10000) == 0x10000) { + player->unk_00C &= 0xFE1D0478; } - phi_v0_9 = phi_v0_8; - if ((phi_v0_8 & 0x200) == 0x200) { - arg0->unkC = arg0->unkC & 0xFE9D8478; - phi_v0_9 = arg0->unkBC; + if ((player->unk_0BC & 0x200) == 0x200) { + player->unk_00C &= 0xFE9D8478; } - phi_v0_10 = phi_v0_9; - if ((phi_v0_9 & 0x80000000) == 0x80000000) { - arg0->unkC = arg0->unkC & 0xFE9D8678; - phi_v0_10 = arg0->unkBC; + if ((player->unk_0BC & 0x80000000) == 0x80000000) { + player->unk_00C &= 0xFE9D8678; } - phi_v0_11 = phi_v0_10; - if ((phi_v0_10 & 0x4000) == 0x4000) { - arg0->unkC = arg0->unkC & 0xFF5D45FF; - phi_v0_11 = arg0->unkBC; + if ((player->unk_0BC & 0x4000) == 0x4000) { + player->unk_00C &= 0xFF5D45FF; } - if ((phi_v0_11 & 0x20000) == 0x20000) { - arg0->unkC = arg0->unkC & 0xFE1D0478; + if ((player->unk_0BC & 0x20000) == 0x20000) { + player->unk_00C &= 0xFE1D0478; } } -#else -GLOBAL_ASM("asm/non_matchings/code_80027D00/func_8002B5C0.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8002B308(void *, s8, s8); // extern -? func_8002B5C0(s8, s8); // extern -? func_800911B4(void *, s8); // extern - -void func_8002B830(void *arg0, s8 arg1, s8 arg2) { - s32 temp_v0; - s32 phi_v0; - void *phi_a0; - - temp_v0 = arg0->unkC; - phi_v0 = temp_v0; - if (temp_v0 != 0) { - func_8002B5C0(arg1, arg2); - phi_v0 = arg0->unkC; +void func_8002B830(Player *player, s8 arg1, s8 arg2) { + if (player->unk_00C != 0) { + func_8002B5C0(player, arg1, arg2); } - phi_a0 = arg0; - if (phi_v0 != 0) { - arg0 = arg0; - func_8002B308(arg0, arg1, arg2); - phi_a0 = arg0; + if (player->unk_00C != 0) { + func_8002B308(player, arg1, arg2); } - if ((phi_a0->unk44 & 0x400) != 0) { - func_800911B4(phi_a0, arg1); + if ((player->unk_044 & 0x400) != 0) { + func_800911B4(player, arg1); } } + +#ifdef MIPS_TO_C +//generated by mips_to_c commit 90e635335cb052c4324a3aa7478e4761db19dfaf +extern ? D_801653C0; + +UNUSED void func_8002B8A4(Player *player_one, Player *player_two) { + s32 spC; + Player *temp_a1; + Player *temp_a2; + Player *temp_a3; + Player *temp_t0; + Player *temp_t1; + Player *temp_t2; + Player *temp_t3; + Player *temp_v0; + s32 phi_v1; + s32 phi_v1_2; + + temp_v0 = gPlayerOne; + if (player_one == temp_v0) { + spC = 0; + } + temp_a1 = gPlayerTwo; + phi_v1 = spC; + if (player_one == temp_a1) { + phi_v1 = 1; + } + temp_a2 = gPlayerThree; + if (player_one == temp_a2) { + phi_v1 = 2; + } + temp_a3 = gPlayerFour; + if (player_one == temp_a3) { + phi_v1 = 3; + } + temp_t0 = gPlayerFive; + if (player_one == temp_t0) { + phi_v1 = 4; + } + temp_t1 = gPlayerSix; + if (player_one == temp_t1) { + phi_v1 = 5; + } + temp_t2 = gPlayerSeven; + if (player_one == temp_t2) { + phi_v1 = 6; + } + temp_t3 = gPlayerEight; + if (player_one == temp_t3) { + phi_v1 = 7; + } + *(&D_801653C0 + (phi_v1 * 4)) = player_two; + phi_v1_2 = phi_v1; + if (player_two == temp_v0) { + phi_v1_2 = 0; + } + if (player_two == temp_a1) { + phi_v1_2 = 1; + } + if (player_two == temp_a2) { + phi_v1_2 = 2; + } + if (player_two == temp_a3) { + phi_v1_2 = 3; + } + if (player_two == temp_t0) { + phi_v1_2 = 4; + } + if (player_two == temp_t1) { + phi_v1_2 = 5; + } + if (player_two == temp_t2) { + phi_v1_2 = 6; + } + if (player_two == temp_t3) { + phi_v1_2 = 7; + } + *(&D_801653C0 + (phi_v1_2 * 4)) = player_one; +} #else -GLOBAL_ASM("asm/non_matchings/code_80027D00/func_8002B830.s") +GLOBAL_ASM("asm/non_matchings/code_80027D00/func_8002B8A4.s") #endif #ifdef MIPS_TO_C diff --git a/src/code_80027D00.h b/src/code_80027D00.h index 378e0bbd8..c5227b11d 100644 --- a/src/code_80027D00.h +++ b/src/code_80027D00.h @@ -14,8 +14,15 @@ void func_800291E8(); void func_800291F0(); void func_800291F8(); void func_80029200(Player*, s8); -void func_8002C11C(Player*); void func_8002AAC0(Player*); +void func_8002AB70(Player*); +void func_8002AE20(); +void func_8002AE28(); +void func_8002AE30(); +void func_8002B308(Player*, s8, s8); +void func_8002B5C0(Player*, s8, s8); +void func_8002B830(Player*, s8, s8); +void func_8002C11C(Player*); void func_8002E4C4(Player*); void func_80030FC8(Player*); void func_80031F48(Player*, f32); @@ -30,6 +37,12 @@ void func_80038BE4(Player*, s16); extern s16 D_80164AF0; +extern f32 D_800ED7B8; +extern f32 D_800ED7BC; +extern f32 D_800ED7C0; +extern f32 D_800ED7C4; +extern f32 D_800ED7C8; + extern f64 D_800ED9D8; extern f64 D_800ED9E0; extern f64 D_800ED9E8; diff --git a/src/framebuffers.h b/src/framebuffers.h index 4dac3aa9a..c09ce3b62 100644 --- a/src/framebuffers.h +++ b/src/framebuffers.h @@ -31,4 +31,4 @@ extern u16 gFramebuffer1[SCREEN_WIDTH * SCREEN_HEIGHT]; extern u16 gFramebuffer2[SCREEN_WIDTH * SCREEN_HEIGHT]; #endif -#endif // FRAMEBUFFERS_H \ No newline at end of file +#endif // FRAMEBUFFERS_H