diff --git a/asm/non_matchings/audio/external/func_800C8F80.s b/asm/non_matchings/audio/external/func_800C8F80.s deleted file mode 100644 index 4c7279a9d..000000000 --- a/asm/non_matchings/audio/external/func_800C8F80.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel func_800C8F80 -/* 0C9B80 800C8F80 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 0C9B84 800C8F84 3C0E800F */ lui $t6, %hi(D_800EA108) # $t6, 0x800f -/* 0C9B88 800C8F88 91CEA108 */ lbu $t6, %lo(D_800EA108)($t6) -/* 0C9B8C 800C8F8C AFBE0030 */ sw $fp, 0x30($sp) -/* 0C9B90 800C8F90 03A0F025 */ move $fp, $sp -/* 0C9B94 800C8F94 AFBF0034 */ sw $ra, 0x34($sp) -/* 0C9B98 800C8F98 AFA40038 */ sw $a0, 0x38($sp) -/* 0C9B9C 800C8F9C AFA5003C */ sw $a1, 0x3c($sp) -/* 0C9BA0 800C8FA0 15C00018 */ bnez $t6, .L800C9004 -/* 0C9BA4 800C8FA4 308600FF */ andi $a2, $a0, 0xff -/* 0C9BA8 800C8FA8 3C0F800F */ lui $t7, %hi(D_800EA0EC) # $t7, 0x800f -/* 0C9BAC 800C8FAC 25EFA0EC */ addiu $t7, %lo(D_800EA0EC) # addiu $t7, $t7, -0x5f14 -/* 0C9BB0 800C8FB0 00CF1821 */ addu $v1, $a2, $t7 -/* 0C9BB4 800C8FB4 90620000 */ lbu $v0, ($v1) -/* 0C9BB8 800C8FB8 3C07800F */ lui $a3, %hi(D_800EA1D4) # $a3, 0x800f -/* 0C9BBC 800C8FBC 24010002 */ li $at, 2 -/* 0C9BC0 800C8FC0 10400004 */ beqz $v0, .L800C8FD4 -/* 0C9BC4 800C8FC4 24E7A1D4 */ addiu $a3, %lo(D_800EA1D4) # addiu $a3, $a3, -0x5e2c -/* 0C9BC8 800C8FC8 1441000E */ bne $v0, $at, .L800C9004 -/* 0C9BCC 800C8FCC 24180001 */ li $t8, 1 -/* 0C9BD0 800C8FD0 A0780000 */ sb $t8, ($v1) -.L800C8FD4: -/* 0C9BD4 800C8FD4 0006C900 */ sll $t9, $a2, 4 -/* 0C9BD8 800C8FD8 0326C823 */ subu $t9, $t9, $a2 -/* 0C9BDC 800C8FDC 3C08800F */ lui $t0, %hi(D_800E9F7C) # $t0, 0x800f -/* 0C9BE0 800C8FE0 3C09800F */ lui $t1, %hi(D_800EA1DC) # $t1, 0x800f -/* 0C9BE4 800C8FE4 2529A1DC */ addiu $t1, %lo(D_800EA1DC) # addiu $t1, $t1, -0x5e24 -/* 0C9BE8 800C8FE8 25089F7C */ addiu $t0, %lo(D_800E9F7C) # addiu $t0, $t0, -0x6084 -/* 0C9BEC 800C8FEC 0019C880 */ sll $t9, $t9, 2 -/* 0C9BF0 800C8FF0 8FC4003C */ lw $a0, 0x3c($fp) -/* 0C9BF4 800C8FF4 AFA90014 */ sw $t1, 0x14($sp) -/* 0C9BF8 800C8FF8 AFA70010 */ sw $a3, 0x10($sp) -/* 0C9BFC 800C8FFC 0C031052 */ jal play_sound -/* 0C9C00 800C9000 03282821 */ addu $a1, $t9, $t0 -.L800C9004: -/* 0C9C04 800C9004 8FDF0034 */ lw $ra, 0x34($fp) -/* 0C9C08 800C9008 03C0E825 */ move $sp, $fp -/* 0C9C0C 800C900C 8FDE0030 */ lw $fp, 0x30($fp) -/* 0C9C10 800C9010 03E00008 */ jr $ra -/* 0C9C14 800C9014 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/non_matchings/code_8006E9C0/func_80071818.s b/asm/non_matchings/code_8006E9C0/func_80071818.s deleted file mode 100644 index 54ae548c5..000000000 --- a/asm/non_matchings/code_8006E9C0/func_80071818.s +++ /dev/null @@ -1,136 +0,0 @@ -glabel func_80071818 -/* 072418 80071818 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 07241C 8007181C AFBF0014 */ sw $ra, 0x14($sp) -/* 072420 80071820 3C048018 */ lui $a0, %hi(D_80183DA0) # $a0, 0x8018 -/* 072424 80071824 0C01C7C0 */ jal find_unused_obj_index -/* 072428 80071828 24843DA0 */ addiu $a0, %lo(D_80183DA0) # addiu $a0, $a0, 0x3da0 -/* 07242C 8007182C 3C048018 */ lui $a0, %hi(D_80183DB8) # $a0, 0x8018 -/* 072430 80071830 0C01C7C0 */ jal find_unused_obj_index -/* 072434 80071834 24843DB8 */ addiu $a0, %lo(D_80183DB8) # addiu $a0, $a0, 0x3db8 -/* 072438 80071838 3C048018 */ lui $a0, %hi(D_80183DBC) # $a0, 0x8018 -/* 07243C 8007183C 0C01C7C0 */ jal find_unused_obj_index -/* 072440 80071840 24843DBC */ addiu $a0, %lo(D_80183DBC) # addiu $a0, $a0, 0x3dbc -/* 072444 80071844 3C048018 */ lui $a0, %hi(gItemWindowObjectByPlayerId) # $a0, 0x8018 -/* 072448 80071848 0C01C7C0 */ jal find_unused_obj_index -/* 07244C 8007184C 24843E88 */ addiu $a0, %lo(gItemWindowObjectByPlayerId) # addiu $a0, $a0, 0x3e88 -/* 072450 80071850 3C048018 */ lui $a0, %hi(gItemWindowObjectByPlayerId + 4) # $a0, 0x8018 -/* 072454 80071854 0C01C7C0 */ jal find_unused_obj_index -/* 072458 80071858 24843E8C */ addiu $a0, %lo(gItemWindowObjectByPlayerId + 4) # addiu $a0, $a0, 0x3e8c -/* 07245C 8007185C 0C01C064 */ jal func_80070190 -/* 072460 80071860 00000000 */ nop -/* 072464 80071864 0C01C157 */ jal func_8007055C -/* 072468 80071868 00000000 */ nop -/* 07246C 8007186C 0C01C157 */ jal func_8007055C -/* 072470 80071870 00000000 */ nop -/* 072474 80071874 0C01C1E0 */ jal func_80070780 -/* 072478 80071878 00000000 */ nop -/* 07247C 8007187C 3C028019 */ lui $v0, %hi(D_8018CA70) # $v0, 0x8019 -/* 072480 80071880 2442CA70 */ addiu $v0, %lo(D_8018CA70) # addiu $v0, $v0, -0x3590 -/* 072484 80071884 24030032 */ li $v1, 50 -/* 072488 80071888 240EFFAE */ li $t6, -82 -/* 07248C 8007188C 240F0050 */ li $t7, 80 -/* 072490 80071890 24180078 */ li $t8, 120 -/* 072494 80071894 241900D2 */ li $t9, 210 -/* 072498 80071898 2408004B */ li $t0, 75 -/* 07249C 8007189C 24090010 */ li $t1, 16 -/* 0724A0 800718A0 240A0067 */ li $t2, 103 -/* 0724A4 800718A4 240B0028 */ li $t3, 40 -/* 0724A8 800718A8 A44E0042 */ sh $t6, 0x42($v0) -/* 0724AC 800718AC A4430044 */ sh $v1, 0x44($v0) -/* 0724B0 800718B0 A4400046 */ sh $zero, 0x46($v0) -/* 0724B4 800718B4 A4400048 */ sh $zero, 0x48($v0) -/* 0724B8 800718B8 A44F004A */ sh $t7, 0x4a($v0) -/* 0724BC 800718BC A458004C */ sh $t8, 0x4c($v0) -/* 0724C0 800718C0 A4430062 */ sh $v1, 0x62($v0) -/* 0724C4 800718C4 A4590064 */ sh $t9, 0x64($v0) -/* 0724C8 800718C8 A4400066 */ sh $zero, 0x66($v0) -/* 0724CC 800718CC A4400068 */ sh $zero, 0x68($v0) -/* 0724D0 800718D0 A448004E */ sh $t0, 0x4e($v0) -/* 0724D4 800718D4 A4490058 */ sh $t1, 0x58($v0) -/* 0724D8 800718D8 A44A005A */ sh $t2, 0x5a($v0) -/* 0724DC 800718DC A44B0060 */ sh $t3, 0x60($v0) -/* 0724E0 800718E0 3C048018 */ lui $a0, %hi(gItemWindowObjectByPlayerId) # $a0, 0x8018 -/* 0724E4 800718E4 0C01BB9F */ jal func_8006EE7C -/* 0724E8 800718E8 8C843E88 */ lw $a0, %lo(gItemWindowObjectByPlayerId)($a0) -/* 0724EC 800718EC 3C028019 */ lui $v0, %hi(D_8018CA70) # $v0, 0x8019 -/* 0724F0 800718F0 2442CA70 */ addiu $v0, %lo(D_8018CA70) # addiu $v0, $v0, -0x3590 -/* 0724F4 800718F4 240C0043 */ li $t4, 67 -/* 0724F8 800718F8 240D0032 */ li $t5, 50 -/* 0724FC 800718FC 240E00F0 */ li $t6, 240 -/* 072500 80071900 240F0078 */ li $t7, 120 -/* 072504 80071904 241800C8 */ li $t8, 200 -/* 072508 80071908 241900D2 */ li $t9, 210 -/* 07250C 8007190C 240800DC */ li $t0, 220 -/* 072510 80071910 24090010 */ li $t1, 16 -/* 072514 80071914 240A00F7 */ li $t2, 247 -/* 072518 80071918 240B0028 */ li $t3, 40 -/* 07251C 8007191C A44C00C6 */ sh $t4, 0xc6($v0) -/* 072520 80071920 A44D00C8 */ sh $t5, 0xc8($v0) -/* 072524 80071924 A44000CA */ sh $zero, 0xca($v0) -/* 072528 80071928 A44000CC */ sh $zero, 0xcc($v0) -/* 07252C 8007192C A44E00CE */ sh $t6, 0xce($v0) -/* 072530 80071930 A44F00D0 */ sh $t7, 0xd0($v0) -/* 072534 80071934 A45800E6 */ sh $t8, 0xe6($v0) -/* 072538 80071938 A45900E8 */ sh $t9, 0xe8($v0) -/* 07253C 8007193C A44000EA */ sh $zero, 0xea($v0) -/* 072540 80071940 A44000EC */ sh $zero, 0xec($v0) -/* 072544 80071944 A44800D2 */ sh $t0, 0xd2($v0) -/* 072548 80071948 A44900DC */ sh $t1, 0xdc($v0) -/* 07254C 8007194C A44A00DE */ sh $t2, 0xde($v0) -/* 072550 80071950 A44B00E4 */ sh $t3, 0xe4($v0) -/* 072554 80071954 3C048018 */ lui $a0, %hi(gItemWindowObjectByPlayerId + 4) # $a0, 0x8018 -/* 072558 80071958 0C01BB9F */ jal func_8006EE7C -/* 07255C 8007195C 8C843E8C */ lw $a0, %lo(gItemWindowObjectByPlayerId + 4)($a0) -/* 072560 80071960 3C013F00 */ li $at, 0x3F000000 # 0.500000 -/* 072564 80071964 44812000 */ mtc1 $at, $f4 -/* 072568 80071968 3C028019 */ lui $v0, %hi(D_8018CA70) # $v0, 0x8019 -/* 07256C 8007196C 3C048016 */ lui $a0, %hi(gGPCurrentRaceRankByPlayerId) # $a0, 0x8016 -/* 072570 80071970 248443B8 */ addiu $a0, %lo(gGPCurrentRaceRankByPlayerId) # addiu $a0, $a0, 0x43b8 -/* 072574 80071974 2442CA70 */ addiu $v0, %lo(D_8018CA70) # addiu $v0, $v0, -0x3590 -/* 072578 80071978 E4440088 */ swc1 $f4, 0x88($v0) -/* 07257C 8007197C 8C8C0000 */ lw $t4, ($a0) -/* 072580 80071980 8C8D0004 */ lw $t5, 4($a0) -/* 072584 80071984 C4460088 */ lwc1 $f6, 0x88($v0) -/* 072588 80071988 3C018019 */ lui $at, %hi(D_8018D3C4) # $at, 0x8019 -/* 07258C 8007198C 240E001E */ li $t6, 30 -/* 072590 80071990 A44C006A */ sh $t4, 0x6a($v0) -/* 072594 80071994 A44D00EE */ sh $t5, 0xee($v0) -/* 072598 80071998 E4460004 */ swc1 $f6, 4($v0) -/* 07259C 8007199C AC2ED3C4 */ sw $t6, %lo(D_8018D3C4)($at) -/* 0725A0 800719A0 3C018019 */ lui $at, %hi(D_8018D3BC) # $at, 0x8019 -/* 0725A4 800719A4 240F0018 */ li $t7, 24 -/* 0725A8 800719A8 AC2FD3BC */ sw $t7, %lo(D_8018D3BC)($at) -/* 0725AC 800719AC 3C03800E */ lui $v1, %hi(gModeSelection) # $v1, 0x800e -/* 0725B0 800719B0 8C63C53C */ lw $v1, %lo(gModeSelection)($v1) -/* 0725B4 800719B4 3C018019 */ lui $at, %hi(D_8018D3C0) # $at, 0x8019 -/* 0725B8 800719B8 24180028 */ li $t8, 40 -/* 0725BC 800719BC AC38D3C0 */ sw $t8, %lo(D_8018D3C0)($at) -/* 0725C0 800719C0 3C018016 */ lui $at, %hi(D_801657A2) # $at, 0x8016 -/* 0725C4 800719C4 24190666 */ li $t9, 1638 -/* 0725C8 800719C8 10600009 */ beqz $v1, .L800719F0 -/* 0725CC 800719CC A43957A2 */ sh $t9, %lo(D_801657A2)($at) -/* 0725D0 800719D0 24020002 */ li $v0, 2 -/* 0725D4 800719D4 1062000A */ beq $v1, $v0, .L80071A00 -/* 0725D8 800719D8 3C018019 */ lui $at, %hi(D_8018D158) # 0x8019 -/* 0725DC 800719DC 24010003 */ li $at, 3 -/* 0725E0 800719E0 10610009 */ beq $v1, $at, .L80071A08 -/* 0725E4 800719E4 00000000 */ nop -/* 0725E8 800719E8 1000000A */ b .L80071A14 -/* 0725EC 800719EC 8FBF0014 */ lw $ra, 0x14($sp) -.L800719F0: -/* 0725F0 800719F0 24080008 */ li $t0, 8 -/* 0725F4 800719F4 3C018019 */ lui $at, %hi(D_8018D158) # $at, 0x8019 -/* 0725F8 800719F8 10000005 */ b .L80071A10 -/* 0725FC 800719FC AC28D158 */ sw $t0, %lo(D_8018D158)($at) -.L80071A00: -/* 072600 80071A00 10000003 */ b .L80071A10 -/* 072604 80071A04 AC22D158 */ sw $v0, %lo(D_8018D158)($at) -.L80071A08: -/* 072608 80071A08 3C018019 */ lui $at, %hi(D_8018D158) # $at, 0x8019 -/* 07260C 80071A0C AC22D158 */ sw $v0, %lo(D_8018D158)($at) -.L80071A10: -/* 072610 80071A10 8FBF0014 */ lw $ra, 0x14($sp) -.L80071A14: -/* 072614 80071A14 27BD0018 */ addiu $sp, $sp, 0x18 -/* 072618 80071A18 03E00008 */ jr $ra -/* 07261C 80071A1C 00000000 */ nop diff --git a/asm/non_matchings/code_80091750/func_800917B0.s b/asm/non_matchings/code_80091750/func_800917B0.s deleted file mode 100644 index 44d3225c0..000000000 --- a/asm/non_matchings/code_80091750/func_800917B0.s +++ /dev/null @@ -1,61 +0,0 @@ -.section .late_rodata - -glabel D_800F0CB0 -.double 2147483647.0 - -glabel D_800F0CB8 -.double -2147483647.0 - -.section .text - -glabel func_800917B0 -/* 0923B0 800917B0 3C01800F */ lui $at, %hi(D_800F0CB0) -/* 0923B4 800917B4 D4240CB0 */ ldc1 $f4, %lo(D_800F0CB0)($at) -/* 0923B8 800917B8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 0923BC 800917BC AFBF0014 */ sw $ra, 0x14($sp) -/* 0923C0 800917C0 4624703E */ c.le.d $f14, $f4 -/* 0923C4 800917C4 3C01800F */ lui $at, %hi(D_800F0CB8) -/* 0923C8 800917C8 45020015 */ bc1fl .L80091820 -/* 0923CC 800917CC 44801800 */ mtc1 $zero, $f3 -/* 0923D0 800917D0 D4260CB8 */ ldc1 $f6, %lo(D_800F0CB8)($at) -/* 0923D4 800917D4 462E303E */ c.le.d $f6, $f14 -/* 0923D8 800917D8 00000000 */ nop -/* 0923DC 800917DC 45020010 */ bc1fl .L80091820 -/* 0923E0 800917E0 44801800 */ mtc1 $zero, $f3 -/* 0923E4 800917E4 4620720D */ trunc.w.d $f8, $f14 -/* 0923E8 800917E8 44064000 */ mfc1 $a2, $f8 -/* 0923EC 800917EC 00000000 */ nop -/* 0923F0 800917F0 44865000 */ mtc1 $a2, $f10 -/* 0923F4 800917F4 00000000 */ nop -/* 0923F8 800917F8 46805421 */ cvt.d.w $f16, $f10 -/* 0923FC 800917FC 46307032 */ c.eq.d $f14, $f16 -/* 092400 80091800 00000000 */ nop -/* 092404 80091804 45020006 */ bc1fl .L80091820 -/* 092408 80091808 44801800 */ mtc1 $zero, $f3 -/* 09240C 8009180C 0C0245D4 */ jal exponent_by_squaring -/* 092410 80091810 00000000 */ nop -/* 092414 80091814 10000012 */ b .L80091860 -/* 092418 80091818 8FBF0014 */ lw $ra, 0x14($sp) -/* 09241C 8009181C 44801800 */ mtc1 $zero, $f3 -.L80091820: -/* 092420 80091820 44801000 */ mtc1 $zero, $f2 -/* 092424 80091824 00000000 */ nop -/* 092428 80091828 462C103C */ c.lt.d $f2, $f12 -/* 09242C 8009182C 00000000 */ nop -/* 092430 80091830 4502000A */ bc1fl .L8009185C -/* 092434 80091834 46201006 */ mov.d $f0, $f2 -/* 092438 80091838 0C02461B */ jal func_8009186C -/* 09243C 8009183C F7AE0020 */ sdc1 $f14, 0x20($sp) -/* 092440 80091840 D7AE0020 */ ldc1 $f14, 0x20($sp) -/* 092444 80091844 462E0302 */ mul.d $f12, $f0, $f14 -/* 092448 80091848 0C024657 */ jal func_8009195C -/* 09244C 8009184C 00000000 */ nop -/* 092450 80091850 10000003 */ b .L80091860 -/* 092454 80091854 8FBF0014 */ lw $ra, 0x14($sp) -/* 092458 80091858 46201006 */ mov.d $f0, $f2 -.L8009185C: -/* 09245C 8009185C 8FBF0014 */ lw $ra, 0x14($sp) -.L80091860: -/* 092460 80091860 27BD0018 */ addiu $sp, $sp, 0x18 -/* 092464 80091864 03E00008 */ jr $ra -/* 092468 80091868 00000000 */ nop diff --git a/asm/non_matchings/code_80091750/func_800AEF14.s b/asm/non_matchings/code_80091750/func_800AEF14.s deleted file mode 100644 index b39dfb9ba..000000000 --- a/asm/non_matchings/code_80091750/func_800AEF14.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel func_800AEF14 -/* 0AFB14 800AEF14 3C0E8019 */ lui $t6, %hi(D_8018CAE0) # $t6, 0x8019 -/* 0AFB18 800AEF18 81CECAE0 */ lb $t6, %lo(D_8018CAE0)($t6) -/* 0AFB1C 800AEF1C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 0AFB20 800AEF20 AFBF0014 */ sw $ra, 0x14($sp) -/* 0AFB24 800AEF24 11C0000F */ beqz $t6, .L800AEF64 -/* 0AFB28 800AEF28 AFA40018 */ sw $a0, 0x18($sp) -/* 0AFB2C 800AEF2C 0C02D389 */ jal func_800B4E24 -/* 0AFB30 800AEF30 24040004 */ li $a0, 4 -/* 0AFB34 800AEF34 3C0F8019 */ lui $t7, %hi(D_8018CA78) # $t7, 0x8019 -/* 0AFB38 800AEF38 8DEFCA78 */ lw $t7, %lo(D_8018CA78)($t7) -/* 0AFB3C 800AEF3C 3C01000F */ lui $at, (0x000FFFFF >> 16) # lui $at, 0xf -/* 0AFB40 800AEF40 3421FFFF */ ori $at, (0x000FFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* 0AFB44 800AEF44 0041C024 */ and $t8, $v0, $at -/* 0AFB48 800AEF48 01F8082B */ sltu $at, $t7, $t8 -/* 0AFB4C 800AEF4C 10200003 */ beqz $at, .L800AEF5C -/* 0AFB50 800AEF50 24190001 */ li $t9, 1 -/* 0AFB54 800AEF54 3C018019 */ lui $at, %hi(D_8018ED90) # $at, 0x8019 -/* 0AFB58 800AEF58 A039ED90 */ sb $t9, %lo(D_8018ED90)($at) -.L800AEF5C: -/* 0AFB5C 800AEF5C 8FA80018 */ lw $t0, 0x18($sp) -/* 0AFB60 800AEF60 AD000000 */ sw $zero, ($t0) -.L800AEF64: -/* 0AFB64 800AEF64 8FBF0014 */ lw $ra, 0x14($sp) -/* 0AFB68 800AEF68 27BD0018 */ addiu $sp, $sp, 0x18 -/* 0AFB6C 800AEF6C 03E00008 */ jr $ra -/* 0AFB70 800AEF70 00000000 */ nop diff --git a/src/audio/external.c b/src/audio/external.c index a92103741..7834317e7 100644 --- a/src/audio/external.c +++ b/src/audio/external.c @@ -3996,39 +3996,26 @@ void func_800C8F44(u8 arg0) { func_800C36C4(0, 0, arg0, 1); } -#ifdef MIPS_TO_C -//generated by m2c commit eefca95b040d7ee0c617bc58f9ac6cd1cf7bce87 on Aug-14-2023 -static ? D_800E9F7C; /* unable to generate initializer */ -u8 D_800EA0EC[1] = { 0 }; -u8 D_800EA108 = 0; -f32 D_800EA1D4[3]; /* unable to generate initializer */ -u8 D_800EA1DC = 0; +extern struct Unk_8018EFD8 D_800E9F7C[]; void func_800C8F80(u8 arg0, s32 arg1) { - u8 *temp_v1; - u8 temp_a2; u8 temp_v0; + u8* temp_v1; - temp_a2 = arg0 & 0xFF; if (D_800EA108 == 0) { - temp_v1 = &D_800EA0EC[temp_a2]; + temp_v1 = &D_800EA0EC[arg0]; temp_v0 = *temp_v1; - if (temp_v0 != 0) { - if (temp_v0 == 2) { + switch(temp_v0) { + case 2: *temp_v1 = 1; - goto block_4; - } - } else { -block_4: - play_sound((u32) arg1, (temp_a2 * 0x3C) + &D_800E9F7C, temp_a2, D_800EA1D4, D_800EA1D4, &D_800EA1DC); + case 0: + play_sound((u32) arg1, (f32* ) &D_800E9F7C[arg0], arg0, D_800EA1D4, D_800EA1D4, &D_800EA1DC); + break; } } } -#else -GLOBAL_ASM("asm/non_matchings/audio/external/func_800C8F80.s") -#endif -extern struct Unk_8018EFD8 D_800E9F7C[]; + void func_800C9018(u8 arg0, s32 arg1) { func_800C5578((f32*) &D_800E9F7C[arg0], arg1); } diff --git a/src/code_8006E9C0.c b/src/code_8006E9C0.c index b1ecbf306..1308e6d94 100644 --- a/src/code_8006E9C0.c +++ b/src/code_8006E9C0.c @@ -1851,81 +1851,74 @@ void func_80071428(void) { GLOBAL_ASM("asm/non_matchings/code_8006E9C0/func_80071428.s") #endif -#ifdef MIPS_TO_C -//generated by m2c commit 44f261a363c51a295be8efe3d7ca7f4d2c967e9b on Dec-31-2022 -? func_8007055C(); /* extern */ -? func_80070780(); /* extern */ -extern s16 D_801657A2; +extern void func_8006EE7C(s32); /* extern */ +extern void func_80070190(); /* extern */ +extern void func_8007055C(); /* extern */ +extern void func_80070780(); /* extern */ extern s32 D_80183DA0; extern s32 D_80183DBC; -extern s32 D_8018D158; -extern s32 D_8018D3BC; -extern s32 D_8018D3C0; -extern s32 D_8018D3C4; void func_80071818(void) { find_unused_obj_index(&D_80183DA0); find_unused_obj_index(D_80183DB8); find_unused_obj_index(&D_80183DBC); find_unused_obj_index(gItemWindowObjectByPlayerId); - find_unused_obj_index(gItemWindowObjectByPlayerId + 4); + find_unused_obj_index(&gItemWindowObjectByPlayerId[1]); func_80070190(); func_8007055C(); func_8007055C(); func_80070780(); - D_8018CA70->itemBoxX = -0x0052; - D_8018CA70->itemBoxY = 0x0032; - D_8018CA70->slideItemBoxX = 0; - D_8018CA70->slideItemBoxY = 0; - D_8018CA70->unk_4A = 0x0050; - D_8018CA70->unk_4C = 0x0078; - D_8018CA70->rankX = 0x0032; - D_8018CA70->rankY = 0x00D2; - D_8018CA70->slideRankX = 0; - D_8018CA70->slideRankY = 0; - D_8018CA70->timerX = 0x004B; - D_8018CA70->timerY = 0x0010; - D_8018CA70->lapX = 0x0067; - D_8018CA70->lapY = 0x0028; + D_8018CA70[0].itemBoxX = -0x52; + D_8018CA70[0].itemBoxY = 0x32; + D_8018CA70[0].slideItemBoxX = 0; + D_8018CA70[0].slideItemBoxY = 0; + D_8018CA70[0].unk_4A = 0x50; + D_8018CA70[0].unk_4C = 0x78; + D_8018CA70[0].rankX = 0x32; + D_8018CA70[0].rankY = 0xD2; + D_8018CA70[0].slideRankX = 0; + D_8018CA70[0].slideRankY = 0; + D_8018CA70[0].timerX = 0x4B; + D_8018CA70[0].timerY = 0x10; + D_8018CA70[0].lapX = 0x67; + D_8018CA70[0].lapY = 0x28; func_8006EE7C(*gItemWindowObjectByPlayerId); - D_8018CA70->unkC6 = 0x0043; - D_8018CA70->unkC8 = 0x0032; - D_8018CA70->unkCA = 0; - D_8018CA70->unkCC = 0; - D_8018CA70->unkCE = 0x00F0; - D_8018CA70->unkD0 = 0x0078; - D_8018CA70->unkE6 = 0x00C8; - D_8018CA70->unkE8 = 0x00D2; - D_8018CA70->unkEA = 0; - D_8018CA70->unkEC = 0; - D_8018CA70->unkD2 = 0x00DC; - D_8018CA70->unkDC = 0x0010; - D_8018CA70->unkDE = 0x00F7; - D_8018CA70->unkE4 = 0x0028; - func_8006EE7C(*(gItemWindowObjectByPlayerId + 4)); - D_8018CA70->unk88 = 0.5f; - D_8018CA70->stagingPosition = (s16) gGPCurrentRaceRankByPlayerId->unk0; - D_8018CA70->unkEE = (s16) gGPCurrentRaceRankByPlayerId->unk4; - D_8018CA70->rankScaling = D_8018CA70->unk88; - D_8018D3C4 = 0x0000001E; - D_8018D3BC = 0x00000018; - D_8018D3C0 = 0x00000028; - D_801657A2 = 0x0666; + D_8018CA70[1].itemBoxX = 0x43; + D_8018CA70[1].itemBoxY = 0x32; + D_8018CA70[1].slideItemBoxX = 0; + D_8018CA70[1].slideItemBoxY = 0; + D_8018CA70[1].unk_4A = 0xF0; + D_8018CA70[1].unk_4C = 0x78; + D_8018CA70[1].rankX = 0xC8; + D_8018CA70[1].rankY = 0xD2; + D_8018CA70[1].slideRankX = 0; + D_8018CA70[1].slideRankY = 0; + D_8018CA70[1].timerX = 0xDC; + D_8018CA70[1].timerY = 0x10; + D_8018CA70[1].lapX = 0xF7; + D_8018CA70[1].lapY = 0x28; + func_8006EE7C((gItemWindowObjectByPlayerId[1])); + D_8018CA70[1].rankScaling = 0.5f; + D_8018CA70[0].stagingPosition = (s16) gGPCurrentRaceRankByPlayerId[0]; + D_8018CA70[1].stagingPosition = (s16) gGPCurrentRaceRankByPlayerId[1]; + D_8018CA70[0].rankScaling = D_8018CA70[1].rankScaling; + D_8018D3C4 = 0x1E; + D_8018D3BC = 0x18; + D_8018D3C0 = 0x28; + D_801657A2 = 0x666; switch (gModeSelection) { /* irregular */ case 0: D_8018D158 = 8; - return; + break; case 2: -block_7: D_8018D158 = 2; - return; + break; case 3: - goto block_7; + D_8018D158 = 2; + break; } } -#else -GLOBAL_ASM("asm/non_matchings/code_8006E9C0/func_80071818.s") -#endif + void func_80071A20() { diff --git a/src/code_80091750.c b/src/code_80091750.c index eb8428765..82678c33e 100644 --- a/src/code_80091750.c +++ b/src/code_80091750.c @@ -1332,28 +1332,21 @@ f64 exponent_by_squaring(f64 base, s32 exponent) { return 1.0 / result; } -#ifdef MIPS_TO_C -//generated by m2c commit eefca95b040d7ee0c617bc58f9ac6cd1cf7bce87 on Sep-01-2023 -f64 func_8009186C(); /* extern */ -f64 func_8009195C(f64, f64); /* extern */ +f64 func_8009186C(f64); /* extern */ +f64 func_8009195C(f64); /* extern */ -f64 func_800917B0(f64 arg0, ? arg0_lo, f64 arg1, ? arg1_lo, s32 arg2) { - s32 temp_f8; - - if ((arg1 <= 2147483647.0) && (arg1 >= -2147483647.0)) { - temp_f8 = (s32) arg1; - if (arg1 == (f64) temp_f8) { - return exponent_by_squaring(arg0, temp_f8); +f64 func_800917B0(f64 arg0, f64 arg1) { + if ((arg1 <= 2147483647.0) && (-2147483647.0 <= arg1)) { + if (arg1 == (s32) arg1) { + return exponent_by_squaring(arg0, arg1); } } if (arg0 > 0.0) { - return func_8009195C(func_8009186C() * arg1, arg1); + return func_8009195C(func_8009186C(arg0) * arg1); } return 0.0; } -#else -GLOBAL_ASM("asm/non_matchings/code_80091750/func_800917B0.s") -#endif + #ifdef MIPS_TO_C //generated by m2c commit eefca95b040d7ee0c617bc58f9ac6cd1cf7bce87 on Sep-01-2023 @@ -14114,22 +14107,18 @@ void func_800AEEE8(struct_8018D9E0_entry *arg0) { } } -#ifdef MIPS_TO_C -//generated by m2c commit eefca95b040d7ee0c617bc58f9ac6cd1cf7bce87 on Aug-28-2023 extern u32 D_8018CA78; extern s8 D_8018ED90; -void func_800AEF14(struct_8018D9E0_entry *arg0) { +void func_800AEF14(s32* arg0) { if (D_8018CAE0 != 0) { if ((u32) D_8018CA78 < (u32) (func_800B4E24(4) & 0xFFFFF)) { D_8018ED90 = 1; } - arg0->type = 0; + *arg0 = 0; } } -#else -GLOBAL_ASM("asm/non_matchings/code_80091750/func_800AEF14.s") -#endif + void func_800AEF74(struct_8018D9E0_entry *arg0) { switch (arg0->unk4) { /* irregular */