diff --git a/asm/non_matchings/code_80091750/func_800A7258.s b/asm/non_matchings/code_80091750/func_800A7258.s deleted file mode 100644 index d5acf0dba..000000000 --- a/asm/non_matchings/code_80091750/func_800A7258.s +++ /dev/null @@ -1,44 +0,0 @@ -glabel func_800A7258 -/* 0A7E58 800A7258 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 0A7E5C 800A725C AFBF002C */ sw $ra, 0x2c($sp) -/* 0A7E60 800A7260 AFA40030 */ sw $a0, 0x30($sp) -/* 0A7E64 800A7264 8C8F0004 */ lw $t7, 4($a0) -/* 0A7E68 800A7268 00807025 */ move $t6, $a0 -/* 0A7E6C 800A726C 3C048015 */ lui $a0, %hi(gDisplayListHead) # 0x8015 -/* 0A7E70 800A7270 15E00011 */ bnez $t7, .L800A72B8 -/* 0A7E74 800A7274 00002825 */ move $a1, $zero -/* 0A7E78 800A7278 241800EF */ li $t8, 239 -/* 0A7E7C 800A727C AFB80010 */ sw $t8, 0x10($sp) -/* 0A7E80 800A7280 AFA00014 */ sw $zero, 0x14($sp) -/* 0A7E84 800A7284 AFA00018 */ sw $zero, 0x18($sp) -/* 0A7E88 800A7288 AFA0001C */ sw $zero, 0x1c($sp) -/* 0A7E8C 800A728C 8DD9001C */ lw $t9, 0x1c($t6) -/* 0A7E90 800A7290 3C048015 */ lui $a0, %hi(gDisplayListHead) # $a0, 0x8015 -/* 0A7E94 800A7294 8C840298 */ lw $a0, %lo(gDisplayListHead)($a0) -/* 0A7E98 800A7298 00002825 */ move $a1, $zero -/* 0A7E9C 800A729C 00003025 */ move $a2, $zero -/* 0A7EA0 800A72A0 2407013F */ li $a3, 319 -/* 0A7EA4 800A72A4 0C02637E */ jal draw_box -/* 0A7EA8 800A72A8 AFB90020 */ sw $t9, 0x20($sp) -/* 0A7EAC 800A72AC 3C018015 */ lui $at, %hi(gDisplayListHead) # $at, 0x8015 -/* 0A7EB0 800A72B0 1000000E */ b .L800A72EC -/* 0A7EB4 800A72B4 AC220298 */ sw $v0, %lo(gDisplayListHead)($at) -.L800A72B8: -/* 0A7EB8 800A72B8 240800EF */ li $t0, 239 -/* 0A7EBC 800A72BC 24090064 */ li $t1, 100 -/* 0A7EC0 800A72C0 AFA90020 */ sw $t1, 0x20($sp) -/* 0A7EC4 800A72C4 AFA80010 */ sw $t0, 0x10($sp) -/* 0A7EC8 800A72C8 8C840298 */ lw $a0, %lo(gDisplayListHead)($a0) # 0x298($a0) -/* 0A7ECC 800A72CC 00003025 */ move $a2, $zero -/* 0A7ED0 800A72D0 2407013F */ li $a3, 319 -/* 0A7ED4 800A72D4 AFA00014 */ sw $zero, 0x14($sp) -/* 0A7ED8 800A72D8 AFA00018 */ sw $zero, 0x18($sp) -/* 0A7EDC 800A72DC 0C02637E */ jal draw_box -/* 0A7EE0 800A72E0 AFA0001C */ sw $zero, 0x1c($sp) -/* 0A7EE4 800A72E4 3C018015 */ lui $at, %hi(gDisplayListHead) # $at, 0x8015 -/* 0A7EE8 800A72E8 AC220298 */ sw $v0, %lo(gDisplayListHead)($at) -.L800A72EC: -/* 0A7EEC 800A72EC 8FBF002C */ lw $ra, 0x2c($sp) -/* 0A7EF0 800A72F0 27BD0030 */ addiu $sp, $sp, 0x30 -/* 0A7EF4 800A72F4 03E00008 */ jr $ra -/* 0A7EF8 800A72F8 00000000 */ nop diff --git a/asm/non_matchings/code_80091750/func_800A72FC.s b/asm/non_matchings/code_80091750/func_800A72FC.s deleted file mode 100644 index aaa547cfa..000000000 --- a/asm/non_matchings/code_80091750/func_800A72FC.s +++ /dev/null @@ -1,84 +0,0 @@ -glabel func_800A72FC -/* 0A7EFC 800A72FC 3C0E8019 */ lui $t6, %hi(gCupSelection) # $t6, 0x8019 -/* 0A7F00 800A7300 81CEEE09 */ lb $t6, %lo(gCupSelection)($t6) -/* 0A7F04 800A7304 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 0A7F08 800A7308 AFA40038 */ sw $a0, 0x38($sp) -/* 0A7F0C 800A730C 3C04800E */ lui $a0, %hi(D_800E7500) -/* 0A7F10 800A7310 000E7880 */ sll $t7, $t6, 2 -/* 0A7F14 800A7314 AFBF0024 */ sw $ra, 0x24($sp) -/* 0A7F18 800A7318 008F2021 */ addu $a0, $a0, $t7 -/* 0A7F1C 800A731C F7B40018 */ sdc1 $f20, 0x18($sp) -/* 0A7F20 800A7320 0C024C0D */ jal get_string_width -/* 0A7F24 800A7324 8C847500 */ lw $a0, %lo(D_800E7500)($a0) -/* 0A7F28 800A7328 44822000 */ mtc1 $v0, $f4 -/* 0A7F2C 800A732C 3C013F80 */ li $at, 0x3F800000 # 1.000000 -/* 0A7F30 800A7330 4481A000 */ mtc1 $at, $f20 -/* 0A7F34 800A7334 468021A0 */ cvt.s.w $f6, $f4 -/* 0A7F38 800A7338 3C014120 */ li $at, 0x41200000 # 10.000000 -/* 0A7F3C 800A733C 44815000 */ mtc1 $at, $f10 -/* 0A7F40 800A7340 3C014000 */ li $at, 0x40000000 # 2.000000 -/* 0A7F44 800A7344 44819000 */ mtc1 $at, $f18 -/* 0A7F48 800A7348 3C08800E */ lui $t0, %hi(gCCSelection) # $t0, 0x800e -/* 0A7F4C 800A734C 46143202 */ mul.s $f8, $f6, $f20 -/* 0A7F50 800A7350 8D08C548 */ lw $t0, %lo(gCCSelection)($t0) -/* 0A7F54 800A7354 3C04800E */ lui $a0, %hi(D_800E76CC) -/* 0A7F58 800A7358 00084880 */ sll $t1, $t0, 2 -/* 0A7F5C 800A735C 00892021 */ addu $a0, $a0, $t1 -/* 0A7F60 800A7360 8C8476CC */ lw $a0, %lo(D_800E76CC)($a0) -/* 0A7F64 800A7364 460A4400 */ add.s $f16, $f8, $f10 -/* 0A7F68 800A7368 46128103 */ div.s $f4, $f16, $f18 -/* 0A7F6C 800A736C 4600218D */ trunc.w.s $f6, $f4 -/* 0A7F70 800A7370 44193000 */ mfc1 $t9, $f6 -/* 0A7F74 800A7374 0C024C0D */ jal get_string_width -/* 0A7F78 800A7378 AFB90030 */ sw $t9, 0x30($sp) -/* 0A7F7C 800A737C 44824000 */ mtc1 $v0, $f8 -/* 0A7F80 800A7380 3C014120 */ li $at, 0x41200000 # 10.000000 -/* 0A7F84 800A7384 44819000 */ mtc1 $at, $f18 -/* 0A7F88 800A7388 468042A0 */ cvt.s.w $f10, $f8 -/* 0A7F8C 800A738C 3C014000 */ li $at, 0x40000000 # 2.000000 -/* 0A7F90 800A7390 44813000 */ mtc1 $at, $f6 -/* 0A7F94 800A7394 24040003 */ li $a0, 3 -/* 0A7F98 800A7398 46145402 */ mul.s $f16, $f10, $f20 -/* 0A7F9C 800A739C 46128100 */ add.s $f4, $f16, $f18 -/* 0A7FA0 800A73A0 46062203 */ div.s $f8, $f4, $f6 -/* 0A7FA4 800A73A4 4600428D */ trunc.w.s $f10, $f8 -/* 0A7FA8 800A73A8 440B5000 */ mfc1 $t3, $f10 -/* 0A7FAC 800A73AC 0C024C36 */ jal set_text_color -/* 0A7FB0 800A73B0 AFAB002C */ sw $t3, 0x2c($sp) -/* 0A7FB4 800A73B4 3C0E8019 */ lui $t6, %hi(gCupSelection) # $t6, 0x8019 -/* 0A7FB8 800A73B8 8FA20038 */ lw $v0, 0x38($sp) -/* 0A7FBC 800A73BC 81CEEE09 */ lb $t6, %lo(gCupSelection)($t6) -/* 0A7FC0 800A73C0 8FAD002C */ lw $t5, 0x2c($sp) -/* 0A7FC4 800A73C4 8C4C000C */ lw $t4, 0xc($v0) -/* 0A7FC8 800A73C8 3C06800E */ lui $a2, %hi(D_800E7500) -/* 0A7FCC 800A73CC 000E7880 */ sll $t7, $t6, 2 -/* 0A7FD0 800A73D0 00CF3021 */ addu $a2, $a2, $t7 -/* 0A7FD4 800A73D4 8C450010 */ lw $a1, 0x10($v0) -/* 0A7FD8 800A73D8 E7B40014 */ swc1 $f20, 0x14($sp) -/* 0A7FDC 800A73DC E7B40010 */ swc1 $f20, 0x10($sp) -/* 0A7FE0 800A73E0 8CC67500 */ lw $a2, %lo(D_800E7500)($a2) -/* 0A7FE4 800A73E4 00003825 */ move $a3, $zero -/* 0A7FE8 800A73E8 0C024DBB */ jal draw_text -/* 0A7FEC 800A73EC 018D2023 */ subu $a0, $t4, $t5 -/* 0A7FF0 800A73F0 0C024C36 */ jal set_text_color -/* 0A7FF4 800A73F4 24040003 */ li $a0, 3 -/* 0A7FF8 800A73F8 3C09800E */ lui $t1, %hi(gCCSelection) # $t1, 0x800e -/* 0A7FFC 800A73FC 8D29C548 */ lw $t1, %lo(gCCSelection)($t1) -/* 0A8000 800A7400 8FB80038 */ lw $t8, 0x38($sp) -/* 0A8004 800A7404 8FA80030 */ lw $t0, 0x30($sp) -/* 0A8008 800A7408 3C06800E */ lui $a2, %hi(D_800E76DC) -/* 0A800C 800A740C 8F19000C */ lw $t9, 0xc($t8) -/* 0A8010 800A7410 00095080 */ sll $t2, $t1, 2 -/* 0A8014 800A7414 00CA3021 */ addu $a2, $a2, $t2 -/* 0A8018 800A7418 8F050010 */ lw $a1, 0x10($t8) -/* 0A801C 800A741C E7B40014 */ swc1 $f20, 0x14($sp) -/* 0A8020 800A7420 E7B40010 */ swc1 $f20, 0x10($sp) -/* 0A8024 800A7424 8CC676DC */ lw $a2, %lo(D_800E76DC)($a2) -/* 0A8028 800A7428 00003825 */ move $a3, $zero -/* 0A802C 800A742C 0C024DBB */ jal draw_text -/* 0A8030 800A7430 03282021 */ addu $a0, $t9, $t0 -/* 0A8034 800A7434 8FBF0024 */ lw $ra, 0x24($sp) -/* 0A8038 800A7438 D7B40018 */ ldc1 $f20, 0x18($sp) -/* 0A803C 800A743C 27BD0038 */ addiu $sp, $sp, 0x38 -/* 0A8040 800A7440 03E00008 */ jr $ra -/* 0A8044 800A7444 00000000 */ nop diff --git a/asm/non_matchings/code_80091750/func_800A7448.s b/asm/non_matchings/code_80091750/func_800A7448.s deleted file mode 100644 index 038a20bc9..000000000 --- a/asm/non_matchings/code_80091750/func_800A7448.s +++ /dev/null @@ -1,89 +0,0 @@ -glabel func_800A7448 -/* 0A8048 800A7448 3C038028 */ lui $v1, %hi(D_802874F5) # $v1, 0x8028 -/* 0A804C 800A744C 806374F5 */ lb $v1, %lo(D_802874F5)($v1) -/* 0A8050 800A7450 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 0A8054 800A7454 AFB00028 */ sw $s0, 0x28($sp) -/* 0A8058 800A7458 28610003 */ slti $at, $v1, 3 -/* 0A805C 800A745C 00808025 */ move $s0, $a0 -/* 0A8060 800A7460 AFBF002C */ sw $ra, 0x2c($sp) -/* 0A8064 800A7464 1420000F */ bnez $at, .L800A74A4 -/* 0A8068 800A7468 F7B40020 */ sdc1 $f20, 0x20($sp) -/* 0A806C 800A746C 0C024C36 */ jal set_text_color -/* 0A8070 800A7470 24040003 */ li $a0, 3 -/* 0A8074 800A7474 3C013F40 */ li $at, 0x3F400000 # 0.750000 -/* 0A8078 800A7478 4481A000 */ mtc1 $at, $f20 -/* 0A807C 800A747C 8E04000C */ lw $a0, 0xc($s0) -/* 0A8080 800A7480 8E050010 */ lw $a1, 0x10($s0) -/* 0A8084 800A7484 3C06800E */ lui $a2, %hi(D_800E7A98) # $a2, 0x800e -/* 0A8088 800A7488 8CC67A98 */ lw $a2, %lo(D_800E7A98)($a2) -/* 0A808C 800A748C 00003825 */ move $a3, $zero -/* 0A8090 800A7490 E7B40014 */ swc1 $f20, 0x14($sp) -/* 0A8094 800A7494 0C024DBB */ jal draw_text -/* 0A8098 800A7498 E7B40010 */ swc1 $f20, 0x10($sp) -/* 0A809C 800A749C 1000003C */ b .L800A7590 -/* 0A80A0 800A74A0 8FBF002C */ lw $ra, 0x2c($sp) -.L800A74A4: -/* 0A80A4 800A74A4 3C04800E */ lui $a0, %hi(D_800E7A88) # $a0, 0x800e -/* 0A80A8 800A74A8 8C847A88 */ lw $a0, %lo(D_800E7A88)($a0) -/* 0A80AC 800A74AC 0C024C0D */ jal get_string_width -/* 0A80B0 800A74B0 AFA30038 */ sw $v1, 0x38($sp) -/* 0A80B4 800A74B4 244E0005 */ addiu $t6, $v0, 5 -/* 0A80B8 800A74B8 448E2000 */ mtc1 $t6, $f4 -/* 0A80BC 800A74BC 3C013F40 */ li $at, 0x3F400000 # 0.750000 -/* 0A80C0 800A74C0 4481A000 */ mtc1 $at, $f20 -/* 0A80C4 800A74C4 468021A0 */ cvt.s.w $f6, $f4 -/* 0A80C8 800A74C8 3C014000 */ li $at, 0x40000000 # 2.000000 -/* 0A80CC 800A74CC 44815000 */ mtc1 $at, $f10 -/* 0A80D0 800A74D0 8FA30038 */ lw $v1, 0x38($sp) -/* 0A80D4 800A74D4 3C08800E */ lui $t0, %hi(D_800E7A88) # $t0, 0x800e -/* 0A80D8 800A74D8 25087A88 */ addiu $t0, %lo(D_800E7A88) # addiu $t0, $t0, 0x7a88 -/* 0A80DC 800A74DC 46143202 */ mul.s $f8, $f6, $f20 -/* 0A80E0 800A74E0 0003C880 */ sll $t9, $v1, 2 -/* 0A80E4 800A74E4 03282821 */ addu $a1, $t9, $t0 -/* 0A80E8 800A74E8 8CA40004 */ lw $a0, 4($a1) -/* 0A80EC 800A74EC AFA50034 */ sw $a1, 0x34($sp) -/* 0A80F0 800A74F0 460A4403 */ div.s $f16, $f8, $f10 -/* 0A80F4 800A74F4 4600848D */ trunc.w.s $f18, $f16 -/* 0A80F8 800A74F8 44189000 */ mfc1 $t8, $f18 -/* 0A80FC 800A74FC 0C024C0D */ jal get_string_width -/* 0A8100 800A7500 AFB80040 */ sw $t8, 0x40($sp) -/* 0A8104 800A7504 24490005 */ addiu $t1, $v0, 5 -/* 0A8108 800A7508 44892000 */ mtc1 $t1, $f4 -/* 0A810C 800A750C 3C014000 */ li $at, 0x40000000 # 2.000000 -/* 0A8110 800A7510 44815000 */ mtc1 $at, $f10 -/* 0A8114 800A7514 468021A0 */ cvt.s.w $f6, $f4 -/* 0A8118 800A7518 24040003 */ li $a0, 3 -/* 0A811C 800A751C 46143202 */ mul.s $f8, $f6, $f20 -/* 0A8120 800A7520 460A4403 */ div.s $f16, $f8, $f10 -/* 0A8124 800A7524 4600848D */ trunc.w.s $f18, $f16 -/* 0A8128 800A7528 440B9000 */ mfc1 $t3, $f18 -/* 0A812C 800A752C 0C024C36 */ jal set_text_color -/* 0A8130 800A7530 AFAB003C */ sw $t3, 0x3c($sp) -/* 0A8134 800A7534 8E0C000C */ lw $t4, 0xc($s0) -/* 0A8138 800A7538 8FAD003C */ lw $t5, 0x3c($sp) -/* 0A813C 800A753C 8E050010 */ lw $a1, 0x10($s0) -/* 0A8140 800A7540 3C06800E */ lui $a2, %hi(D_800E7A88) # $a2, 0x800e -/* 0A8144 800A7544 8CC67A88 */ lw $a2, %lo(D_800E7A88)($a2) -/* 0A8148 800A7548 E7B40014 */ swc1 $f20, 0x14($sp) -/* 0A814C 800A754C E7B40010 */ swc1 $f20, 0x10($sp) -/* 0A8150 800A7550 00003825 */ move $a3, $zero -/* 0A8154 800A7554 0C024DBB */ jal draw_text -/* 0A8158 800A7558 018D2023 */ subu $a0, $t4, $t5 -/* 0A815C 800A755C 0C024C36 */ jal set_text_color -/* 0A8160 800A7560 24040003 */ li $a0, 3 -/* 0A8164 800A7564 8FB80034 */ lw $t8, 0x34($sp) -/* 0A8168 800A7568 8E0E000C */ lw $t6, 0xc($s0) -/* 0A816C 800A756C 8FAF0040 */ lw $t7, 0x40($sp) -/* 0A8170 800A7570 8E050010 */ lw $a1, 0x10($s0) -/* 0A8174 800A7574 8F060004 */ lw $a2, 4($t8) -/* 0A8178 800A7578 E7B40014 */ swc1 $f20, 0x14($sp) -/* 0A817C 800A757C E7B40010 */ swc1 $f20, 0x10($sp) -/* 0A8180 800A7580 00003825 */ move $a3, $zero -/* 0A8184 800A7584 0C024DBB */ jal draw_text -/* 0A8188 800A7588 01CF2021 */ addu $a0, $t6, $t7 -/* 0A818C 800A758C 8FBF002C */ lw $ra, 0x2c($sp) -.L800A7590: -/* 0A8190 800A7590 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 0A8194 800A7594 8FB00028 */ lw $s0, 0x28($sp) -/* 0A8198 800A7598 03E00008 */ jr $ra -/* 0A819C 800A759C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/non_matchings/code_80091750/func_800A75A0.s b/asm/non_matchings/code_80091750/func_800A75A0.s deleted file mode 100644 index b4fac29e6..000000000 --- a/asm/non_matchings/code_80091750/func_800A75A0.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_800A75A0 -/* 0A81A0 800A75A0 3C0E8028 */ lui $t6, %hi(D_802874F5) # $t6, 0x8028 -/* 0A81A4 800A75A4 81CE74F5 */ lb $t6, %lo(D_802874F5)($t6) -/* 0A81A8 800A75A8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 0A81AC 800A75AC AFBF001C */ sw $ra, 0x1c($sp) -/* 0A81B0 800A75B0 29C10003 */ slti $at, $t6, 3 -/* 0A81B4 800A75B4 10200003 */ beqz $at, .L800A75C4 -/* 0A81B8 800A75B8 AFA40028 */ sw $a0, 0x28($sp) -/* 0A81BC 800A75BC 10000002 */ b .L800A75C8 -/* 0A81C0 800A75C0 00001025 */ move $v0, $zero -.L800A75C4: -/* 0A81C4 800A75C4 24020001 */ li $v0, 1 -.L800A75C8: -/* 0A81C8 800A75C8 24040004 */ li $a0, 4 -/* 0A81CC 800A75CC 0C024C36 */ jal set_text_color -/* 0A81D0 800A75D0 AFA20020 */ sw $v0, 0x20($sp) -/* 0A81D4 800A75D4 8FA20020 */ lw $v0, 0x20($sp) -/* 0A81D8 800A75D8 8FA30028 */ lw $v1, 0x28($sp) -/* 0A81DC 800A75DC 3C01800F */ lui $at, %hi(D_800F1F30) # $at, 0x800f -/* 0A81E0 800A75E0 C4201F30 */ lwc1 $f0, %lo(D_800F1F30)($at) -/* 0A81E4 800A75E4 3C06800E */ lui $a2, %hi(D_800E7A9C) -/* 0A81E8 800A75E8 00027880 */ sll $t7, $v0, 2 -/* 0A81EC 800A75EC 00CF3021 */ addu $a2, $a2, $t7 -/* 0A81F0 800A75F0 8C64000C */ lw $a0, 0xc($v1) -/* 0A81F4 800A75F4 8C650010 */ lw $a1, 0x10($v1) -/* 0A81F8 800A75F8 8CC67A9C */ lw $a2, %lo(D_800E7A9C)($a2) -/* 0A81FC 800A75FC 00003825 */ move $a3, $zero -/* 0A8200 800A7600 E7A00014 */ swc1 $f0, 0x14($sp) -/* 0A8204 800A7604 0C024DBB */ jal draw_text -/* 0A8208 800A7608 E7A00010 */ swc1 $f0, 0x10($sp) -/* 0A820C 800A760C 8FBF001C */ lw $ra, 0x1c($sp) -/* 0A8210 800A7610 27BD0028 */ addiu $sp, $sp, 0x28 -/* 0A8214 800A7614 03E00008 */ jr $ra -/* 0A8218 800A7618 00000000 */ nop diff --git a/src/code_80091750.c b/src/code_80091750.c index b055e2c02..ec4efc0f1 100644 --- a/src/code_80091750.c +++ b/src/code_80091750.c @@ -12581,156 +12581,116 @@ void func_800A70E8(void *arg0) { GLOBAL_ASM("asm/non_matchings/code_80091750/func_800A70E8.s") #endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -s32 draw_box(s32, ?, ?, ?, s32, s32, s32, s32, s32); // extern -extern s32 gDisplayListHead; - -void func_800A7258(void *arg0) { - s32 phi_v0; - +// Shading layer of the grand prix podium result screen +void func_800A7258(struct_8018D9E0_entry *arg0) { if (arg0->unk4 == 0) { - phi_v0 = draw_box(gDisplayListHead, 0, 0, 0x13F, 0xEF, 0, 0, 0, arg0->unk1C); + // If shading layer is fading in + gDisplayListHead = draw_box(gDisplayListHead, 0, 0, 0x13F, 0xEF, 0, 0, 0, arg0->unk1C); } else { - phi_v0 = draw_box(gDisplayListHead, 0, 0, 0x13F, 0xEF, 0, 0, 0, 0x64); + // All other stages of the podium scene + gDisplayListHead = draw_box(gDisplayListHead, 0, 0, 0x13F, 0xEF, 0, 0, 0, 0x64); } - gDisplayListHead = phi_v0; } -#else -GLOBAL_ASM("asm/non_matchings/code_80091750/func_800A7258.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? draw_text(s32, s32, s32, ?, f32, f32); // extern -s32 get_string_width(s32); // extern -? set_text_color(?); // extern -extern ? D_800E7500; -extern ? D_800E76CC; -extern ? D_800E76DC; -extern s8 gCupSelection; +extern char *D_800E76CC[4]; +extern char *D_800E76DC[4]; +extern char *D_800E7500[9]; -void func_800A72FC(void *arg0) { - s32 sp30; - s32 sp2C; +// Podium scene, top line +void func_800A72FC(struct_8018D9E0_entry *arg0) { + s32 pad; + s32 cupNameLength = (((f32) get_string_width(D_800E7500[gCupSelection]) * 1) + 10) / 2; + s32 ccNameLength = (((f32) get_string_width(D_800E76CC[gCCSelection]) * 1) + 10) / 2; - sp30 = ((get_string_width(*(&D_800E7500 + (gCupSelection * 4))) * 1.0f) + 10.0f) / 2.0f; - sp2C = ((get_string_width(*(&D_800E76CC + (gCCSelection * 4))) * 1.0f) + 10.0f) / 2.0f; set_text_color(TEXT_YELLOW); - draw_text(arg0->unkC - sp2C, arg0->unk10, *(&D_800E7500 + (gCupSelection * 4)), 0, 1.0f, 1.0f); + draw_text(arg0->column - ccNameLength, arg0->row, D_800E7500[gCupSelection], 0, 1, 1); set_text_color(TEXT_YELLOW); - draw_text(arg0->unkC + sp30, arg0->unk10, *(&D_800E76DC + (gCCSelection * 4)), 0, 1.0f, 1.0f); + draw_text(arg0->column + cupNameLength, arg0->row, D_800E76DC[gCCSelection], 0, 1, 1); } -#else -GLOBAL_ASM("asm/non_matchings/code_80091750/func_800A72FC.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? draw_text(s32, s32, s32, ?, f32, f32); // extern -s32 get_string_width(s32, void *); // extern -? set_text_color(?); // extern -extern s32 D_800E7A88; -extern s32 D_800E7A98; extern s8 D_802874F5; +extern char *D_800E7A88[4]; +extern char *D_800E7A98; -void func_800A7448(void *arg0) { +void func_800A7448(struct_8018D9E0_entry *arg0) { + s32 pad; s32 sp40; s32 sp3C; - s32 sp38; - void *sp34; - f32 temp_f8; - s8 temp_v1; - void *temp_a1; - - temp_v1 = D_802874F5; - if (temp_v1 >= 3) { + s32 thing = D_802874F5; + if (thing >= 3) { set_text_color(TEXT_YELLOW); - draw_text(arg0->unkC, arg0->unk10, D_800E7A98, 0, 0.75f, 0.75f); - return; + draw_text(arg0->column, arg0->row, D_800E7A98, 0, 0.75f, 0.75f); + } else { + sp40 = (s32) (((f32) (get_string_width(D_800E7A88[0]) + 5) * 0.75f) / 2); + sp3C = (s32) (((f32) (get_string_width(D_800E7A88[thing + 1]) + 5) * 0.75f) / 2); + set_text_color(TEXT_YELLOW); + draw_text(arg0->column - sp3C, arg0->row, D_800E7A88[0], 0, 0.75f, 0.75f); + set_text_color(TEXT_YELLOW); + draw_text(arg0->column + sp40, arg0->row, D_800E7A88[thing + 1], 0, 0.75f, 0.75f); } - sp38 = temp_v1; - temp_f8 = (get_string_width(D_800E7A88) + 5) * 0.75f; - temp_a1 = (temp_v1 * 4) + &D_800E7A88; - sp34 = temp_a1; - sp40 = temp_f8 / 2.0f; - sp3C = ((get_string_width(temp_a1->unk4, temp_a1) + 5) * 0.75f) / 2.0f; - set_text_color(TEXT_YELLOW); - draw_text(arg0->unkC - sp3C, arg0->unk10, D_800E7A88, 0, 0.75f, 0.75f); - set_text_color(TEXT_YELLOW); - draw_text(arg0->unkC + sp40, arg0->unk10, sp34->unk4, 0, 0.75f, 0.75f); } -#else -GLOBAL_ASM("asm/non_matchings/code_80091750/func_800A7448.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? draw_text(s32, s32, s32, ?, f32, f32); // extern -? set_text_color(?); // extern -extern ? D_800E7A9C; +extern char *D_800E7A9C[2]; extern f32 D_800F1F30; -extern s8 D_802874F5; -void func_800A75A0(void *arg0) { - s32 sp20; - f32 temp_f0; - s32 phi_v0; +void func_800A75A0(struct_8018D9E0_entry *arg0) { + s32 pad; + s32 topThree; if (D_802874F5 < 3) { - phi_v0 = 0; + topThree = 0; } else { - phi_v0 = 1; + topThree = 1; } - sp20 = phi_v0; + set_text_color(TEXT_BLUE_GREEN_RED_CYCLE_1); - temp_f0 = D_800F1F30; - draw_text(arg0->unkC, arg0->unk10, *(&D_800E7A9C + (phi_v0 * 4)), 0, temp_f0, temp_f0); + draw_text(arg0->column, arg0->row, D_800E7A9C[topThree], 0, D_800F1F30, D_800F1F30); } -#else -GLOBAL_ASM("asm/non_matchings/code_80091750/func_800A75A0.s") -#endif #ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? draw_text(s32, s32, s32, ?, f32, f32); // extern -s32 get_string_width(s32); // extern -? func_800939C8(s32, s32, ? *, ?, f32, f32); // extern -? convert_number_to_ascii(s32, ? *); // extern -? func_800A79F4(s32, ? *); // extern -? set_text_color(s32); // extern -extern s32 D_800E7AA4; -extern f32 D_800F1F34; +//generated by mips_to_c commit dacbf209f1bb5d4acaecaf1fefff331d60ffd80c +? convert_number_to_ascii(s32, s8 *); /* extern */ +? draw_text(s32, s32, s8 *, ?, f32, f32); /* extern */ +s32 get_string_width(s8 *); /* extern */ +? set_text_color(s32); /* extern */ extern s8 D_802874F5; -extern s32 gGlobalTimer; +static s8 *D_800E7AA4[9] = { + "YOU PLACED", + " st", + " nd", + " rd", + " th", + " th", + " th", + " th", + " th", +}; /* const */ -void func_800A761C(void *arg0) { +void func_800A761C(struct_8018D9E0_entry *arg0) { s32 sp48; s32 sp44; - ? sp3D; - ? sp3C; - s32 sp38; - s32 *sp34; - f32 temp_f20; + s8 sp3D; + s8 sp3C; + s8 sp38; + s8 **sp34; f32 temp_f8; - s32 *temp_v1; s32 temp_a0; + s8 **temp_v1; temp_a0 = D_802874F5 + 1; sp38 = temp_a0; func_800A79F4(temp_a0, &sp3C); - temp_f20 = D_800F1F34; - temp_f8 = (get_string_width(D_800E7AA4) + 5) * temp_f20; - temp_v1 = (sp38 * 4) + &D_800E7AA4; + temp_f8 = (f32) (get_string_width(*D_800E7AA4) + 5) * 1.2f; + temp_v1 = &D_800E7AA4[(s32) sp38]; sp34 = temp_v1; - sp48 = temp_f8 / 2.0f; - sp44 = ((get_string_width(*temp_v1) + 5) * temp_f20) / 2.0f; + sp48 = (s32) (temp_f8 / 2.0f); + sp44 = (s32) (((f32) (get_string_width(*temp_v1) + 5) * 1.2f) / 2.0f); set_text_color(TEXT_BLUE_GREEN_RED_CYCLE_2); - draw_text(arg0->unkC - sp44, arg0->unk10, D_800E7AA4, 0, temp_f20, temp_f20); - set_text_color(gGlobalTimer % 3); - draw_text(arg0->unkC + sp48, arg0->unk10, *sp34, 0, temp_f20, temp_f20); - convert_number_to_ascii(temp_a0, &sp3C); - func_800939C8((arg0->unkC + sp48) - 0x18, arg0->unk10, &sp3D, 0, 2.0f, 2.0f); + draw_text(arg0->column - sp44, arg0->row, *D_800E7AA4, 0, 1.2f, 1.2f); + set_text_color((s32) gGlobalTimer % 3); + draw_text(arg0->column + sp48, arg0->row, *sp34, 0, 1.2f, 1.2f); + convert_number_to_ascii((s32) sp38, &sp3C); + func_800939C8((arg0->column + sp48) - 0x18, arg0->row, &sp3D, 0, 2.0f, 2.0f); } #else GLOBAL_ASM("asm/non_matchings/code_80091750/func_800A761C.s")