diff --git a/asm/bss_8001C4D0.s b/asm/bss_8001C4D0.s index 95dfc24506..6134b5cf80 100644 --- a/asm/bss_8001C4D0.s +++ b/asm/bss_8001C4D0.s @@ -589,21 +589,8 @@ glabel D_80165908 glabel D_80165A90 .skip 392 -# object list begin -# gObjectList should be of size 123,200 (0xE0 * 0x226) -# D_80165CBC, D_80165CBE, and D_80165CED are all fake variables glabel gObjectList -.skip 164 - -glabel D_80165CBC -.skip 2 - -glabel D_80165CBE -.skip 47 - -glabel D_80165CED -.skip 122987 -# object list end +.skip 123200 glabel D_80183D58 .skip 4 diff --git a/asm/non_matchings/hud_renderer/func_80044924.s b/asm/non_matchings/hud_renderer/func_80044924.s deleted file mode 100644 index 9b5d4417aa..0000000000 --- a/asm/non_matchings/hud_renderer/func_80044924.s +++ /dev/null @@ -1,107 +0,0 @@ -glabel func_80044924 -/* 045524 80044924 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 045528 80044928 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 04552C 8004492C 8C620000 */ lw $v0, ($v1) -/* 045530 80044930 3C0FFD70 */ lui $t7, 0xfd70 -/* 045534 80044934 3C0C0708 */ lui $t4, (0x07080200 >> 16) # lui $t4, 0x708 -/* 045538 80044938 244E0008 */ addiu $t6, $v0, 8 -/* 04553C 8004493C AC6E0000 */ sw $t6, ($v1) -/* 045540 80044940 AC4F0000 */ sw $t7, ($v0) -/* 045544 80044944 AC440004 */ sw $a0, 4($v0) -/* 045548 80044948 8C620000 */ lw $v0, ($v1) -/* 04554C 8004494C 00A60019 */ multu $a1, $a2 -/* 045550 80044950 358C0200 */ ori $t4, (0x07080200 & 0xFFFF) # ori $t4, $t4, 0x200 -/* 045554 80044954 24580008 */ addiu $t8, $v0, 8 -/* 045558 80044958 AC780000 */ sw $t8, ($v1) -/* 04555C 8004495C 3C19F570 */ lui $t9, 0xf570 -/* 045560 80044960 AC590000 */ sw $t9, ($v0) -/* 045564 80044964 AC4C0004 */ sw $t4, 4($v0) -/* 045568 80044968 00404825 */ move $t1, $v0 -/* 04556C 8004496C 8C620000 */ lw $v0, ($v1) -/* 045570 80044970 3C0EE600 */ lui $t6, 0xe600 -/* 045574 80044974 00005812 */ mflo $t3 -/* 045578 80044978 244D0008 */ addiu $t5, $v0, 8 -/* 04557C 8004497C AC6D0000 */ sw $t5, ($v1) -/* 045580 80044980 AC4E0000 */ sw $t6, ($v0) -/* 045584 80044984 AC400004 */ sw $zero, 4($v0) -/* 045588 80044988 00405025 */ move $t2, $v0 -/* 04558C 8004498C 8C620000 */ lw $v0, ($v1) -/* 045590 80044990 256B0003 */ addiu $t3, $t3, 3 -/* 045594 80044994 000BC883 */ sra $t9, $t3, 2 -/* 045598 80044998 272BFFFF */ addiu $t3, $t9, -1 -/* 04559C 8004499C 244F0008 */ addiu $t7, $v0, 8 -/* 0455A0 800449A0 AC6F0000 */ sw $t7, ($v1) -/* 0455A4 800449A4 296107FF */ slti $at, $t3, 0x7ff -/* 0455A8 800449A8 3C18F300 */ lui $t8, 0xf300 -/* 0455AC 800449AC AC580000 */ sw $t8, ($v0) -/* 0455B0 800449B0 10200003 */ beqz $at, .L800449C0 -/* 0455B4 800449B4 00403825 */ move $a3, $v0 -/* 0455B8 800449B8 10000002 */ b .L800449C4 -/* 0455BC 800449BC 01602025 */ move $a0, $t3 -.L800449C0: -/* 0455C0 800449C0 240407FF */ li $a0, 2047 -.L800449C4: -/* 0455C4 800449C4 04A10003 */ bgez $a1, .L800449D4 -/* 0455C8 800449C8 00054103 */ sra $t0, $a1, 4 -/* 0455CC 800449CC 24A1000F */ addiu $at, $a1, 0xf -/* 0455D0 800449D0 00014103 */ sra $t0, $at, 4 -.L800449D4: -/* 0455D4 800449D4 250F07FF */ addiu $t7, $t0, 0x7ff -/* 0455D8 800449D8 01E8001A */ div $zero, $t7, $t0 -/* 0455DC 800449DC 308C0FFF */ andi $t4, $a0, 0xfff -/* 0455E0 800449E0 000C6B00 */ sll $t5, $t4, 0xc -/* 0455E4 800449E4 0000C012 */ mflo $t8 -/* 0455E8 800449E8 3C010700 */ lui $at, 0x700 -/* 0455EC 800449EC 01A17025 */ or $t6, $t5, $at -/* 0455F0 800449F0 33190FFF */ andi $t9, $t8, 0xfff -/* 0455F4 800449F4 01D96025 */ or $t4, $t6, $t9 -/* 0455F8 800449F8 ACEC0004 */ sw $t4, 4($a3) -/* 0455FC 800449FC 8C620000 */ lw $v0, ($v1) -/* 045600 80044A00 15000002 */ bnez $t0, .L80044A0C -/* 045604 80044A04 00000000 */ nop -/* 045608 80044A08 0007000D */ break 7 -.L80044A0C: -/* 04560C 80044A0C 2401FFFF */ li $at, -1 -/* 045610 80044A10 15010004 */ bne $t0, $at, .L80044A24 -/* 045614 80044A14 3C018000 */ lui $at, 0x8000 -/* 045618 80044A18 15E10002 */ bne $t7, $at, .L80044A24 -/* 04561C 80044A1C 00000000 */ nop -/* 045620 80044A20 0006000D */ break 6 -.L80044A24: -/* 045624 80044A24 244D0008 */ addiu $t5, $v0, 8 -/* 045628 80044A28 AC6D0000 */ sw $t5, ($v1) -/* 04562C 80044A2C 3C0FE700 */ lui $t7, 0xe700 -/* 045630 80044A30 AC4F0000 */ sw $t7, ($v0) -/* 045634 80044A34 AC400004 */ sw $zero, 4($v0) -/* 045638 80044A38 00404825 */ move $t1, $v0 -/* 04563C 80044A3C 8C620000 */ lw $v0, ($v1) -/* 045640 80044A40 00057043 */ sra $t6, $a1, 1 -/* 045644 80044A44 25D90007 */ addiu $t9, $t6, 7 -/* 045648 80044A48 001960C3 */ sra $t4, $t9, 3 -/* 04564C 80044A4C 24580008 */ addiu $t8, $v0, 8 -/* 045650 80044A50 AC780000 */ sw $t8, ($v1) -/* 045654 80044A54 318D01FF */ andi $t5, $t4, 0x1ff -/* 045658 80044A58 000D7A40 */ sll $t7, $t5, 9 -/* 04565C 80044A5C 3C0E0008 */ lui $t6, (0x00080200 >> 16) # lui $t6, 8 -/* 045660 80044A60 3C01F560 */ lui $at, 0xf560 -/* 045664 80044A64 01E1C025 */ or $t8, $t7, $at -/* 045668 80044A68 35CE0200 */ ori $t6, (0x00080200 & 0xFFFF) # ori $t6, $t6, 0x200 -/* 04566C 80044A6C AC4E0004 */ sw $t6, 4($v0) -/* 045670 80044A70 AC580000 */ sw $t8, ($v0) -/* 045674 80044A74 00405025 */ move $t2, $v0 -/* 045678 80044A78 8C620000 */ lw $v0, ($v1) -/* 04567C 80044A7C 24ADFFFF */ addiu $t5, $a1, -1 -/* 045680 80044A80 3C0CF200 */ lui $t4, 0xf200 -/* 045684 80044A84 24590008 */ addiu $t9, $v0, 8 -/* 045688 80044A88 AC790000 */ sw $t9, ($v1) -/* 04568C 80044A8C 24D9FFFF */ addiu $t9, $a2, -1 -/* 045690 80044A90 000D7880 */ sll $t7, $t5, 2 -/* 045694 80044A94 AC4C0000 */ sw $t4, ($v0) -/* 045698 80044A98 00196080 */ sll $t4, $t9, 2 -/* 04569C 80044A9C 31F80FFF */ andi $t8, $t7, 0xfff -/* 0456A0 80044AA0 00187300 */ sll $t6, $t8, 0xc -/* 0456A4 80044AA4 318D0FFF */ andi $t5, $t4, 0xfff -/* 0456A8 80044AA8 01CD7825 */ or $t7, $t6, $t5 -/* 0456AC 80044AAC AC4F0004 */ sw $t7, 4($v0) -/* 0456B0 80044AB0 03E00008 */ jr $ra -/* 0456B4 80044AB4 00405825 */ move $t3, $v0 diff --git a/asm/non_matchings/hud_renderer/func_80044DA0.s b/asm/non_matchings/hud_renderer/func_80044DA0.s deleted file mode 100644 index 17816110c5..0000000000 --- a/asm/non_matchings/hud_renderer/func_80044DA0.s +++ /dev/null @@ -1,107 +0,0 @@ -glabel func_80044DA0 -/* 0459A0 80044DA0 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 0459A4 80044DA4 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 0459A8 80044DA8 8C620000 */ lw $v0, ($v1) -/* 0459AC 80044DAC 3C0FFD90 */ lui $t7, 0xfd90 -/* 0459B0 80044DB0 3C0C0708 */ lui $t4, (0x07080200 >> 16) # lui $t4, 0x708 -/* 0459B4 80044DB4 244E0008 */ addiu $t6, $v0, 8 -/* 0459B8 80044DB8 AC6E0000 */ sw $t6, ($v1) -/* 0459BC 80044DBC AC4F0000 */ sw $t7, ($v0) -/* 0459C0 80044DC0 AC440004 */ sw $a0, 4($v0) -/* 0459C4 80044DC4 8C620000 */ lw $v0, ($v1) -/* 0459C8 80044DC8 00A60019 */ multu $a1, $a2 -/* 0459CC 80044DCC 358C0200 */ ori $t4, (0x07080200 & 0xFFFF) # ori $t4, $t4, 0x200 -/* 0459D0 80044DD0 24580008 */ addiu $t8, $v0, 8 -/* 0459D4 80044DD4 AC780000 */ sw $t8, ($v1) -/* 0459D8 80044DD8 3C19F590 */ lui $t9, 0xf590 -/* 0459DC 80044DDC AC590000 */ sw $t9, ($v0) -/* 0459E0 80044DE0 AC4C0004 */ sw $t4, 4($v0) -/* 0459E4 80044DE4 00404825 */ move $t1, $v0 -/* 0459E8 80044DE8 8C620000 */ lw $v0, ($v1) -/* 0459EC 80044DEC 3C0EE600 */ lui $t6, 0xe600 -/* 0459F0 80044DF0 00005812 */ mflo $t3 -/* 0459F4 80044DF4 244D0008 */ addiu $t5, $v0, 8 -/* 0459F8 80044DF8 AC6D0000 */ sw $t5, ($v1) -/* 0459FC 80044DFC AC4E0000 */ sw $t6, ($v0) -/* 045A00 80044E00 AC400004 */ sw $zero, 4($v0) -/* 045A04 80044E04 00405025 */ move $t2, $v0 -/* 045A08 80044E08 8C620000 */ lw $v0, ($v1) -/* 045A0C 80044E0C 256B0003 */ addiu $t3, $t3, 3 -/* 045A10 80044E10 000BC883 */ sra $t9, $t3, 2 -/* 045A14 80044E14 272BFFFF */ addiu $t3, $t9, -1 -/* 045A18 80044E18 244F0008 */ addiu $t7, $v0, 8 -/* 045A1C 80044E1C AC6F0000 */ sw $t7, ($v1) -/* 045A20 80044E20 296107FF */ slti $at, $t3, 0x7ff -/* 045A24 80044E24 3C18F300 */ lui $t8, 0xf300 -/* 045A28 80044E28 AC580000 */ sw $t8, ($v0) -/* 045A2C 80044E2C 10200003 */ beqz $at, .L80044E3C -/* 045A30 80044E30 00403825 */ move $a3, $v0 -/* 045A34 80044E34 10000002 */ b .L80044E40 -/* 045A38 80044E38 01602025 */ move $a0, $t3 -.L80044E3C: -/* 045A3C 80044E3C 240407FF */ li $a0, 2047 -.L80044E40: -/* 045A40 80044E40 04A10003 */ bgez $a1, .L80044E50 -/* 045A44 80044E44 00054103 */ sra $t0, $a1, 4 -/* 045A48 80044E48 24A1000F */ addiu $at, $a1, 0xf -/* 045A4C 80044E4C 00014103 */ sra $t0, $at, 4 -.L80044E50: -/* 045A50 80044E50 250F07FF */ addiu $t7, $t0, 0x7ff -/* 045A54 80044E54 01E8001A */ div $zero, $t7, $t0 -/* 045A58 80044E58 308C0FFF */ andi $t4, $a0, 0xfff -/* 045A5C 80044E5C 000C6B00 */ sll $t5, $t4, 0xc -/* 045A60 80044E60 0000C012 */ mflo $t8 -/* 045A64 80044E64 3C010700 */ lui $at, 0x700 -/* 045A68 80044E68 01A17025 */ or $t6, $t5, $at -/* 045A6C 80044E6C 33190FFF */ andi $t9, $t8, 0xfff -/* 045A70 80044E70 01D96025 */ or $t4, $t6, $t9 -/* 045A74 80044E74 ACEC0004 */ sw $t4, 4($a3) -/* 045A78 80044E78 8C620000 */ lw $v0, ($v1) -/* 045A7C 80044E7C 15000002 */ bnez $t0, .L80044E88 -/* 045A80 80044E80 00000000 */ nop -/* 045A84 80044E84 0007000D */ break 7 -.L80044E88: -/* 045A88 80044E88 2401FFFF */ li $at, -1 -/* 045A8C 80044E8C 15010004 */ bne $t0, $at, .L80044EA0 -/* 045A90 80044E90 3C018000 */ lui $at, 0x8000 -/* 045A94 80044E94 15E10002 */ bne $t7, $at, .L80044EA0 -/* 045A98 80044E98 00000000 */ nop -/* 045A9C 80044E9C 0006000D */ break 6 -.L80044EA0: -/* 045AA0 80044EA0 244D0008 */ addiu $t5, $v0, 8 -/* 045AA4 80044EA4 AC6D0000 */ sw $t5, ($v1) -/* 045AA8 80044EA8 3C0FE700 */ lui $t7, 0xe700 -/* 045AAC 80044EAC AC4F0000 */ sw $t7, ($v0) -/* 045AB0 80044EB0 AC400004 */ sw $zero, 4($v0) -/* 045AB4 80044EB4 00404825 */ move $t1, $v0 -/* 045AB8 80044EB8 8C620000 */ lw $v0, ($v1) -/* 045ABC 80044EBC 00057043 */ sra $t6, $a1, 1 -/* 045AC0 80044EC0 25D90007 */ addiu $t9, $t6, 7 -/* 045AC4 80044EC4 001960C3 */ sra $t4, $t9, 3 -/* 045AC8 80044EC8 24580008 */ addiu $t8, $v0, 8 -/* 045ACC 80044ECC AC780000 */ sw $t8, ($v1) -/* 045AD0 80044ED0 318D01FF */ andi $t5, $t4, 0x1ff -/* 045AD4 80044ED4 000D7A40 */ sll $t7, $t5, 9 -/* 045AD8 80044ED8 3C0E0008 */ lui $t6, (0x00080200 >> 16) # lui $t6, 8 -/* 045ADC 80044EDC 3C01F580 */ lui $at, 0xf580 -/* 045AE0 80044EE0 01E1C025 */ or $t8, $t7, $at -/* 045AE4 80044EE4 35CE0200 */ ori $t6, (0x00080200 & 0xFFFF) # ori $t6, $t6, 0x200 -/* 045AE8 80044EE8 AC4E0004 */ sw $t6, 4($v0) -/* 045AEC 80044EEC AC580000 */ sw $t8, ($v0) -/* 045AF0 80044EF0 00405025 */ move $t2, $v0 -/* 045AF4 80044EF4 8C620000 */ lw $v0, ($v1) -/* 045AF8 80044EF8 24ADFFFF */ addiu $t5, $a1, -1 -/* 045AFC 80044EFC 3C0CF200 */ lui $t4, 0xf200 -/* 045B00 80044F00 24590008 */ addiu $t9, $v0, 8 -/* 045B04 80044F04 AC790000 */ sw $t9, ($v1) -/* 045B08 80044F08 24D9FFFF */ addiu $t9, $a2, -1 -/* 045B0C 80044F0C 000D7880 */ sll $t7, $t5, 2 -/* 045B10 80044F10 AC4C0000 */ sw $t4, ($v0) -/* 045B14 80044F14 00196080 */ sll $t4, $t9, 2 -/* 045B18 80044F18 31F80FFF */ andi $t8, $t7, 0xfff -/* 045B1C 80044F1C 00187300 */ sll $t6, $t8, 0xc -/* 045B20 80044F20 318D0FFF */ andi $t5, $t4, 0xfff -/* 045B24 80044F24 01CD7825 */ or $t7, $t6, $t5 -/* 045B28 80044F28 AC4F0004 */ sw $t7, 4($v0) -/* 045B2C 80044F2C 03E00008 */ jr $ra -/* 045B30 80044F30 00405825 */ move $t3, $v0 diff --git a/asm/non_matchings/hud_renderer/func_80044F34.s b/asm/non_matchings/hud_renderer/func_80044F34.s deleted file mode 100644 index adf8706935..0000000000 --- a/asm/non_matchings/hud_renderer/func_80044F34.s +++ /dev/null @@ -1,107 +0,0 @@ -glabel func_80044F34 -/* 045B34 80044F34 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 045B38 80044F38 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 045B3C 80044F3C 8C620000 */ lw $v0, ($v1) -/* 045B40 80044F40 3C0FFD90 */ lui $t7, 0xfd90 -/* 045B44 80044F44 3C0C0708 */ lui $t4, (0x07080200 >> 16) # lui $t4, 0x708 -/* 045B48 80044F48 244E0008 */ addiu $t6, $v0, 8 -/* 045B4C 80044F4C AC6E0000 */ sw $t6, ($v1) -/* 045B50 80044F50 AC4F0000 */ sw $t7, ($v0) -/* 045B54 80044F54 AC440004 */ sw $a0, 4($v0) -/* 045B58 80044F58 8C620000 */ lw $v0, ($v1) -/* 045B5C 80044F5C 00A60019 */ multu $a1, $a2 -/* 045B60 80044F60 358C0200 */ ori $t4, (0x07080200 & 0xFFFF) # ori $t4, $t4, 0x200 -/* 045B64 80044F64 24580008 */ addiu $t8, $v0, 8 -/* 045B68 80044F68 AC780000 */ sw $t8, ($v1) -/* 045B6C 80044F6C 3C19F590 */ lui $t9, 0xf590 -/* 045B70 80044F70 AC590000 */ sw $t9, ($v0) -/* 045B74 80044F74 AC4C0004 */ sw $t4, 4($v0) -/* 045B78 80044F78 00404825 */ move $t1, $v0 -/* 045B7C 80044F7C 8C620000 */ lw $v0, ($v1) -/* 045B80 80044F80 3C0EE600 */ lui $t6, 0xe600 -/* 045B84 80044F84 00005812 */ mflo $t3 -/* 045B88 80044F88 244D0008 */ addiu $t5, $v0, 8 -/* 045B8C 80044F8C AC6D0000 */ sw $t5, ($v1) -/* 045B90 80044F90 AC4E0000 */ sw $t6, ($v0) -/* 045B94 80044F94 AC400004 */ sw $zero, 4($v0) -/* 045B98 80044F98 00405025 */ move $t2, $v0 -/* 045B9C 80044F9C 8C620000 */ lw $v0, ($v1) -/* 045BA0 80044FA0 256B0003 */ addiu $t3, $t3, 3 -/* 045BA4 80044FA4 000BC883 */ sra $t9, $t3, 2 -/* 045BA8 80044FA8 272BFFFF */ addiu $t3, $t9, -1 -/* 045BAC 80044FAC 244F0008 */ addiu $t7, $v0, 8 -/* 045BB0 80044FB0 AC6F0000 */ sw $t7, ($v1) -/* 045BB4 80044FB4 296107FF */ slti $at, $t3, 0x7ff -/* 045BB8 80044FB8 3C18F300 */ lui $t8, 0xf300 -/* 045BBC 80044FBC AC580000 */ sw $t8, ($v0) -/* 045BC0 80044FC0 10200003 */ beqz $at, .L80044FD0 -/* 045BC4 80044FC4 00403825 */ move $a3, $v0 -/* 045BC8 80044FC8 10000002 */ b .L80044FD4 -/* 045BCC 80044FCC 01602025 */ move $a0, $t3 -.L80044FD0: -/* 045BD0 80044FD0 240407FF */ li $a0, 2047 -.L80044FD4: -/* 045BD4 80044FD4 04A10003 */ bgez $a1, .L80044FE4 -/* 045BD8 80044FD8 00054103 */ sra $t0, $a1, 4 -/* 045BDC 80044FDC 24A1000F */ addiu $at, $a1, 0xf -/* 045BE0 80044FE0 00014103 */ sra $t0, $at, 4 -.L80044FE4: -/* 045BE4 80044FE4 250F07FF */ addiu $t7, $t0, 0x7ff -/* 045BE8 80044FE8 01E8001A */ div $zero, $t7, $t0 -/* 045BEC 80044FEC 308C0FFF */ andi $t4, $a0, 0xfff -/* 045BF0 80044FF0 000C6B00 */ sll $t5, $t4, 0xc -/* 045BF4 80044FF4 0000C012 */ mflo $t8 -/* 045BF8 80044FF8 3C010700 */ lui $at, 0x700 -/* 045BFC 80044FFC 01A17025 */ or $t6, $t5, $at -/* 045C00 80045000 33190FFF */ andi $t9, $t8, 0xfff -/* 045C04 80045004 01D96025 */ or $t4, $t6, $t9 -/* 045C08 80045008 ACEC0004 */ sw $t4, 4($a3) -/* 045C0C 8004500C 8C620000 */ lw $v0, ($v1) -/* 045C10 80045010 15000002 */ bnez $t0, .L8004501C -/* 045C14 80045014 00000000 */ nop -/* 045C18 80045018 0007000D */ break 7 -.L8004501C: -/* 045C1C 8004501C 2401FFFF */ li $at, -1 -/* 045C20 80045020 15010004 */ bne $t0, $at, .L80045034 -/* 045C24 80045024 3C018000 */ lui $at, 0x8000 -/* 045C28 80045028 15E10002 */ bne $t7, $at, .L80045034 -/* 045C2C 8004502C 00000000 */ nop -/* 045C30 80045030 0006000D */ break 6 -.L80045034: -/* 045C34 80045034 244D0008 */ addiu $t5, $v0, 8 -/* 045C38 80045038 AC6D0000 */ sw $t5, ($v1) -/* 045C3C 8004503C 3C0FE700 */ lui $t7, 0xe700 -/* 045C40 80045040 AC4F0000 */ sw $t7, ($v0) -/* 045C44 80045044 AC400004 */ sw $zero, 4($v0) -/* 045C48 80045048 00404825 */ move $t1, $v0 -/* 045C4C 8004504C 8C620000 */ lw $v0, ($v1) -/* 045C50 80045050 00057043 */ sra $t6, $a1, 1 -/* 045C54 80045054 25D90007 */ addiu $t9, $t6, 7 -/* 045C58 80045058 001960C3 */ sra $t4, $t9, 3 -/* 045C5C 8004505C 24580008 */ addiu $t8, $v0, 8 -/* 045C60 80045060 AC780000 */ sw $t8, ($v1) -/* 045C64 80045064 318D01FF */ andi $t5, $t4, 0x1ff -/* 045C68 80045068 000D7A40 */ sll $t7, $t5, 9 -/* 045C6C 8004506C 3C0E0008 */ lui $t6, (0x00080200 >> 16) # lui $t6, 8 -/* 045C70 80045070 3C01F580 */ lui $at, 0xf580 -/* 045C74 80045074 01E1C025 */ or $t8, $t7, $at -/* 045C78 80045078 35CE0200 */ ori $t6, (0x00080200 & 0xFFFF) # ori $t6, $t6, 0x200 -/* 045C7C 8004507C AC4E0004 */ sw $t6, 4($v0) -/* 045C80 80045080 AC580000 */ sw $t8, ($v0) -/* 045C84 80045084 00405025 */ move $t2, $v0 -/* 045C88 80045088 8C620000 */ lw $v0, ($v1) -/* 045C8C 8004508C 24ADFFFF */ addiu $t5, $a1, -1 -/* 045C90 80045090 3C0CF200 */ lui $t4, 0xf200 -/* 045C94 80045094 24590008 */ addiu $t9, $v0, 8 -/* 045C98 80045098 AC790000 */ sw $t9, ($v1) -/* 045C9C 8004509C 24D9FFFF */ addiu $t9, $a2, -1 -/* 045CA0 800450A0 000D7880 */ sll $t7, $t5, 2 -/* 045CA4 800450A4 AC4C0000 */ sw $t4, ($v0) -/* 045CA8 800450A8 00196080 */ sll $t4, $t9, 2 -/* 045CAC 800450AC 31F80FFF */ andi $t8, $t7, 0xfff -/* 045CB0 800450B0 00187300 */ sll $t6, $t8, 0xc -/* 045CB4 800450B4 318D0FFF */ andi $t5, $t4, 0xfff -/* 045CB8 800450B8 01CD7825 */ or $t7, $t6, $t5 -/* 045CBC 800450BC AC4F0004 */ sw $t7, 4($v0) -/* 045CC0 800450C0 03E00008 */ jr $ra -/* 045CC4 800450C4 00405825 */ move $t3, $v0 diff --git a/asm/non_matchings/hud_renderer/func_800450C8.s b/asm/non_matchings/hud_renderer/func_800450C8.s deleted file mode 100644 index 43c6f348aa..0000000000 --- a/asm/non_matchings/hud_renderer/func_800450C8.s +++ /dev/null @@ -1,125 +0,0 @@ -glabel func_800450C8 -/* 045CC8 800450C8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 045CCC 800450CC AFBF001C */ sw $ra, 0x1c($sp) -/* 045CD0 800450D0 AFB00018 */ sw $s0, 0x18($sp) -/* 045CD4 800450D4 AFA40020 */ sw $a0, 0x20($sp) -/* 045CD8 800450D8 00A08025 */ move $s0, $a1 -/* 045CDC 800450DC AFA60028 */ sw $a2, 0x28($sp) -/* 045CE0 800450E0 0C010E95 */ jal func_80043A54 -/* 045CE4 800450E4 00A02025 */ move $a0, $a1 -/* 045CE8 800450E8 3C048015 */ lui $a0, %hi(gDisplayListHead) # $a0, 0x8015 -/* 045CEC 800450EC 24840298 */ addiu $a0, %lo(gDisplayListHead) # addiu $a0, $a0, 0x298 -/* 045CF0 800450F0 8C830000 */ lw $v1, ($a0) -/* 045CF4 800450F4 8FAC0028 */ lw $t4, 0x28($sp) -/* 045CF8 800450F8 3C0FFD90 */ lui $t7, 0xfd90 -/* 045CFC 800450FC 246E0008 */ addiu $t6, $v1, 8 -/* 045D00 80045100 AC8E0000 */ sw $t6, ($a0) -/* 045D04 80045104 AC6F0000 */ sw $t7, ($v1) -/* 045D08 80045108 8FB80020 */ lw $t8, 0x20($sp) -/* 045D0C 8004510C 3049000F */ andi $t1, $v0, 0xf -/* 045D10 80045110 3C010708 */ lui $at, (0x07080100 >> 16) # lui $at, 0x708 -/* 045D14 80045114 AC780004 */ sw $t8, 4($v1) -/* 045D18 80045118 8C830000 */ lw $v1, ($a0) -/* 045D1C 8004511C 34210100 */ ori $at, (0x07080100 & 0xFFFF) # ori $at, $at, 0x100 -/* 045D20 80045120 00097100 */ sll $t6, $t1, 4 -/* 045D24 80045124 24790008 */ addiu $t9, $v1, 8 -/* 045D28 80045128 AC990000 */ sw $t9, ($a0) -/* 045D2C 8004512C 020C0019 */ multu $s0, $t4 -/* 045D30 80045130 01C17825 */ or $t7, $t6, $at -/* 045D34 80045134 3C0DF590 */ lui $t5, 0xf590 -/* 045D38 80045138 AC6D0000 */ sw $t5, ($v1) -/* 045D3C 8004513C AC6F0004 */ sw $t7, 4($v1) -/* 045D40 80045140 00603025 */ move $a2, $v1 -/* 045D44 80045144 8C830000 */ lw $v1, ($a0) -/* 045D48 80045148 3C19E600 */ lui $t9, 0xe600 -/* 045D4C 8004514C 01C04825 */ move $t1, $t6 -/* 045D50 80045150 24780008 */ addiu $t8, $v1, 8 -/* 045D54 80045154 AC980000 */ sw $t8, ($a0) -/* 045D58 80045158 AC790000 */ sw $t9, ($v1) -/* 045D5C 8004515C AC600004 */ sw $zero, 4($v1) -/* 045D60 80045160 00603825 */ move $a3, $v1 -/* 045D64 80045164 8C830000 */ lw $v1, ($a0) -/* 045D68 80045168 00004012 */ mflo $t0 -/* 045D6C 8004516C 25080003 */ addiu $t0, $t0, 3 -/* 045D70 80045170 00087883 */ sra $t7, $t0, 2 -/* 045D74 80045174 25E8FFFF */ addiu $t0, $t7, -1 -/* 045D78 80045178 246D0008 */ addiu $t5, $v1, 8 -/* 045D7C 8004517C AC8D0000 */ sw $t5, ($a0) -/* 045D80 80045180 290107FF */ slti $at, $t0, 0x7ff -/* 045D84 80045184 3C0EF300 */ lui $t6, 0xf300 -/* 045D88 80045188 AC6E0000 */ sw $t6, ($v1) -/* 045D8C 8004518C 10200003 */ beqz $at, .L8004519C -/* 045D90 80045190 00605025 */ move $t2, $v1 -/* 045D94 80045194 10000002 */ b .L800451A0 -/* 045D98 80045198 01005825 */ move $t3, $t0 -.L8004519C: -/* 045D9C 8004519C 240B07FF */ li $t3, 2047 -.L800451A0: -/* 045DA0 800451A0 06010003 */ bgez $s0, .L800451B0 -/* 045DA4 800451A4 00102903 */ sra $a1, $s0, 4 -/* 045DA8 800451A8 2601000F */ addiu $at, $s0, 0xf -/* 045DAC 800451AC 00012903 */ sra $a1, $at, 4 -.L800451B0: -/* 045DB0 800451B0 24AE07FF */ addiu $t6, $a1, 0x7ff -/* 045DB4 800451B4 01C5001A */ div $zero, $t6, $a1 -/* 045DB8 800451B8 31780FFF */ andi $t8, $t3, 0xfff -/* 045DBC 800451BC 0018CB00 */ sll $t9, $t8, 0xc -/* 045DC0 800451C0 00007812 */ mflo $t7 -/* 045DC4 800451C4 3C010700 */ lui $at, 0x700 -/* 045DC8 800451C8 03216825 */ or $t5, $t9, $at -/* 045DCC 800451CC 31F80FFF */ andi $t8, $t7, 0xfff -/* 045DD0 800451D0 01B8C825 */ or $t9, $t5, $t8 -/* 045DD4 800451D4 AD590004 */ sw $t9, 4($t2) -/* 045DD8 800451D8 8C830000 */ lw $v1, ($a0) -/* 045DDC 800451DC 14A00002 */ bnez $a1, .L800451E8 -/* 045DE0 800451E0 00000000 */ nop -/* 045DE4 800451E4 0007000D */ break 7 -.L800451E8: -/* 045DE8 800451E8 2401FFFF */ li $at, -1 -/* 045DEC 800451EC 14A10004 */ bne $a1, $at, .L80045200 -/* 045DF0 800451F0 3C018000 */ lui $at, 0x8000 -/* 045DF4 800451F4 15C10002 */ bne $t6, $at, .L80045200 -/* 045DF8 800451F8 00000000 */ nop -/* 045DFC 800451FC 0006000D */ break 6 -.L80045200: -/* 045E00 80045200 246E0008 */ addiu $t6, $v1, 8 -/* 045E04 80045204 AC8E0000 */ sw $t6, ($a0) -/* 045E08 80045208 3C0FE700 */ lui $t7, 0xe700 -/* 045E0C 8004520C AC6F0000 */ sw $t7, ($v1) -/* 045E10 80045210 AC600004 */ sw $zero, 4($v1) -/* 045E14 80045214 00603025 */ move $a2, $v1 -/* 045E18 80045218 8C830000 */ lw $v1, ($a0) -/* 045E1C 8004521C 0010C043 */ sra $t8, $s0, 1 -/* 045E20 80045220 27190007 */ addiu $t9, $t8, 7 -/* 045E24 80045224 001970C3 */ sra $t6, $t9, 3 -/* 045E28 80045228 246D0008 */ addiu $t5, $v1, 8 -/* 045E2C 8004522C AC8D0000 */ sw $t5, ($a0) -/* 045E30 80045230 31CF01FF */ andi $t7, $t6, 0x1ff -/* 045E34 80045234 000F6A40 */ sll $t5, $t7, 9 -/* 045E38 80045238 3C01F580 */ lui $at, 0xf580 -/* 045E3C 8004523C 01A1C025 */ or $t8, $t5, $at -/* 045E40 80045240 3C010008 */ lui $at, (0x00080100 >> 16) # lui $at, 8 -/* 045E44 80045244 34210100 */ ori $at, (0x00080100 & 0xFFFF) # ori $at, $at, 0x100 -/* 045E48 80045248 0121C825 */ or $t9, $t1, $at -/* 045E4C 8004524C AC790004 */ sw $t9, 4($v1) -/* 045E50 80045250 AC780000 */ sw $t8, ($v1) -/* 045E54 80045254 00603825 */ move $a3, $v1 -/* 045E58 80045258 8C830000 */ lw $v1, ($a0) -/* 045E5C 8004525C 260DFFFF */ addiu $t5, $s0, -1 -/* 045E60 80045260 3C0FF200 */ lui $t7, 0xf200 -/* 045E64 80045264 246E0008 */ addiu $t6, $v1, 8 -/* 045E68 80045268 AC8E0000 */ sw $t6, ($a0) -/* 045E6C 8004526C 000DC080 */ sll $t8, $t5, 2 -/* 045E70 80045270 AC6F0000 */ sw $t7, ($v1) -/* 045E74 80045274 258FFFFF */ addiu $t7, $t4, -1 -/* 045E78 80045278 33190FFF */ andi $t9, $t8, 0xfff -/* 045E7C 8004527C 000F6880 */ sll $t5, $t7, 2 -/* 045E80 80045280 31B80FFF */ andi $t8, $t5, 0xfff -/* 045E84 80045284 00197300 */ sll $t6, $t9, 0xc -/* 045E88 80045288 01D8C825 */ or $t9, $t6, $t8 -/* 045E8C 8004528C AC790004 */ sw $t9, 4($v1) -/* 045E90 80045290 8FBF001C */ lw $ra, 0x1c($sp) -/* 045E94 80045294 8FB00018 */ lw $s0, 0x18($sp) -/* 045E98 80045298 27BD0020 */ addiu $sp, $sp, 0x20 -/* 045E9C 8004529C 03E00008 */ jr $ra -/* 045EA0 800452A0 00604025 */ move $t0, $v1 diff --git a/asm/non_matchings/hud_renderer/func_80045738.s b/asm/non_matchings/hud_renderer/func_80045738.s deleted file mode 100644 index 57029ca0cf..0000000000 --- a/asm/non_matchings/hud_renderer/func_80045738.s +++ /dev/null @@ -1,268 +0,0 @@ -glabel func_80045738 -/* 046338 80045738 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 04633C 8004573C 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 046340 80045740 8C680000 */ lw $t0, ($v1) -/* 046344 80045744 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* 046348 80045748 AFA40060 */ sw $a0, 0x60($sp) -/* 04634C 8004574C 250E0008 */ addiu $t6, $t0, 8 -/* 046350 80045750 AFA60068 */ sw $a2, 0x68($sp) -/* 046354 80045754 AFA7006C */ sw $a3, 0x6c($sp) -/* 046358 80045758 AC6E0000 */ sw $t6, ($v1) -/* 04635C 8004575C 3C0FFCFF */ lui $t7, (0xFCFFFFFF >> 16) # lui $t7, 0xfcff -/* 046360 80045760 3C18FFFC */ lui $t8, (0xFFFCF438 >> 16) # lui $t8, 0xfffc -/* 046364 80045764 3718F438 */ ori $t8, (0xFFFCF438 & 0xFFFF) # ori $t8, $t8, 0xf438 -/* 046368 80045768 35EFFFFF */ ori $t7, (0xFCFFFFFF & 0xFFFF) # ori $t7, $t7, 0xffff -/* 04636C 8004576C AD0F0000 */ sw $t7, ($t0) -/* 046370 80045770 AD180004 */ sw $t8, 4($t0) -/* 046374 80045774 8C690000 */ lw $t1, ($v1) -/* 046378 80045778 3C0EFD90 */ lui $t6, 0xfd90 -/* 04637C 8004577C 3C18F590 */ lui $t8, (0xF5900100 >> 16) # lui $t8, 0xf590 -/* 046380 80045780 25390008 */ addiu $t9, $t1, 8 -/* 046384 80045784 AC790000 */ sw $t9, ($v1) -/* 046388 80045788 AD250004 */ sw $a1, 4($t1) -/* 04638C 8004578C AD2E0000 */ sw $t6, ($t1) -/* 046390 80045790 8C620000 */ lw $v0, ($v1) -/* 046394 80045794 3C19070C */ lui $t9, (0x070C0300 >> 16) # lui $t9, 0x70c -/* 046398 80045798 37390300 */ ori $t9, (0x070C0300 & 0xFFFF) # ori $t9, $t9, 0x300 -/* 04639C 8004579C 244F0008 */ addiu $t7, $v0, 8 -/* 0463A0 800457A0 AC6F0000 */ sw $t7, ($v1) -/* 0463A4 800457A4 37180100 */ ori $t8, (0xF5900100 & 0xFFFF) # ori $t8, $t8, 0x100 -/* 0463A8 800457A8 AC580000 */ sw $t8, ($v0) -/* 0463AC 800457AC AC590004 */ sw $t9, 4($v0) -/* 0463B0 800457B0 8C620000 */ lw $v0, ($v1) -/* 0463B4 800457B4 3C0FE600 */ lui $t7, 0xe600 -/* 0463B8 800457B8 3C19F300 */ lui $t9, 0xf300 -/* 0463BC 800457BC 244E0008 */ addiu $t6, $v0, 8 -/* 0463C0 800457C0 AC6E0000 */ sw $t6, ($v1) -/* 0463C4 800457C4 AC4F0000 */ sw $t7, ($v0) -/* 0463C8 800457C8 AC400004 */ sw $zero, 4($v0) -/* 0463CC 800457CC 8C620000 */ lw $v0, ($v1) -/* 0463D0 800457D0 240C07FF */ li $t4, 2047 -/* 0463D4 800457D4 24580008 */ addiu $t8, $v0, 8 -/* 0463D8 800457D8 AC780000 */ sw $t8, ($v1) -/* 0463DC 800457DC AFA2004C */ sw $v0, 0x4c($sp) -/* 0463E0 800457E0 AC590000 */ sw $t9, ($v0) -/* 0463E4 800457E4 8FB8006C */ lw $t8, 0x6c($sp) -/* 0463E8 800457E8 8FAF0068 */ lw $t7, 0x68($sp) -/* 0463EC 800457EC 01F80019 */ multu $t7, $t8 -/* 0463F0 800457F0 0000C812 */ mflo $t9 -/* 0463F4 800457F4 272D0001 */ addiu $t5, $t9, 1 -/* 0463F8 800457F8 000D7043 */ sra $t6, $t5, 1 -/* 0463FC 800457FC 25CDFFFF */ addiu $t5, $t6, -1 -/* 046400 80045800 29A107FF */ slti $at, $t5, 0x7ff -/* 046404 80045804 10200003 */ beqz $at, .L80045814 -/* 046408 80045808 AFB9000C */ sw $t9, 0xc($sp) -/* 04640C 8004580C 10000001 */ b .L80045814 -/* 046410 80045810 01A06025 */ move $t4, $t5 -.L80045814: -/* 046414 80045814 8FAD0068 */ lw $t5, 0x68($sp) -/* 046418 80045818 05A10003 */ bgez $t5, .L80045828 -/* 04641C 8004581C 000D10C3 */ sra $v0, $t5, 3 -/* 046420 80045820 25A10007 */ addiu $at, $t5, 7 -/* 046424 80045824 000110C3 */ sra $v0, $at, 3 -.L80045828: -/* 046428 80045828 1C400003 */ bgtz $v0, .L80045838 -/* 04642C 8004582C 00405825 */ move $t3, $v0 -/* 046430 80045830 10000001 */ b .L80045838 -/* 046434 80045834 240B0001 */ li $t3, 1 -.L80045838: -/* 046438 80045838 1C400003 */ bgtz $v0, .L80045848 -/* 04643C 8004583C 256F07FF */ addiu $t7, $t3, 0x7ff -/* 046440 80045840 10000002 */ b .L8004584C -/* 046444 80045844 240A0001 */ li $t2, 1 -.L80045848: -/* 046448 80045848 00405025 */ move $t2, $v0 -.L8004584C: -/* 04644C 8004584C 01EA001A */ div $zero, $t7, $t2 -/* 046450 80045850 15400002 */ bnez $t2, .L8004585C -/* 046454 80045854 00000000 */ nop -/* 046458 80045858 0007000D */ break 7 -.L8004585C: -/* 04645C 8004585C 2401FFFF */ li $at, -1 -/* 046460 80045860 15410004 */ bne $t2, $at, .L80045874 -/* 046464 80045864 3C018000 */ lui $at, 0x8000 -/* 046468 80045868 15E10002 */ bne $t7, $at, .L80045874 -/* 04646C 8004586C 00000000 */ nop -/* 046470 80045870 0006000D */ break 6 -.L80045874: -/* 046474 80045874 0000C012 */ mflo $t8 -/* 046478 80045878 33190FFF */ andi $t9, $t8, 0xfff -/* 04647C 8004587C 318F0FFF */ andi $t7, $t4, 0xfff -/* 046480 80045880 000FC300 */ sll $t8, $t7, 0xc -/* 046484 80045884 8FAF004C */ lw $t7, 0x4c($sp) -/* 046488 80045888 3C010700 */ lui $at, 0x700 -/* 04648C 8004588C 03217025 */ or $t6, $t9, $at -/* 046490 80045890 01D8C825 */ or $t9, $t6, $t8 -/* 046494 80045894 ADF90004 */ sw $t9, 4($t7) -/* 046498 80045898 8C620000 */ lw $v0, ($v1) -/* 04649C 8004589C 3C18E700 */ lui $t8, 0xe700 -/* 0464A0 800458A0 25AF0007 */ addiu $t7, $t5, 7 -/* 0464A4 800458A4 244E0008 */ addiu $t6, $v0, 8 -/* 0464A8 800458A8 AC6E0000 */ sw $t6, ($v1) -/* 0464AC 800458AC AC580000 */ sw $t8, ($v0) -/* 0464B0 800458B0 AC400004 */ sw $zero, 4($v0) -/* 0464B4 800458B4 8C620000 */ lw $v0, ($v1) -/* 0464B8 800458B8 000F70C3 */ sra $t6, $t7, 3 -/* 0464BC 800458BC 31D801FF */ andi $t8, $t6, 0x1ff -/* 0464C0 800458C0 24590008 */ addiu $t9, $v0, 8 -/* 0464C4 800458C4 AC790000 */ sw $t9, ($v1) -/* 0464C8 800458C8 0018CA40 */ sll $t9, $t8, 9 -/* 0464CC 800458CC 3C01F588 */ lui $at, 0xf588 -/* 0464D0 800458D0 03217825 */ or $t7, $t9, $at -/* 0464D4 800458D4 3C18000C */ lui $t8, (0x000C0300 >> 16) # lui $t8, 0xc -/* 0464D8 800458D8 37180300 */ ori $t8, (0x000C0300 & 0xFFFF) # ori $t8, $t8, 0x300 -/* 0464DC 800458DC 35EE0100 */ ori $t6, $t7, 0x100 -/* 0464E0 800458E0 AC4E0000 */ sw $t6, ($v0) -/* 0464E4 800458E4 AC580004 */ sw $t8, 4($v0) -/* 0464E8 800458E8 8C620000 */ lw $v0, ($v1) -/* 0464EC 800458EC 3C0FF200 */ lui $t7, 0xf200 -/* 0464F0 800458F0 240C07FF */ li $t4, 2047 -/* 0464F4 800458F4 24590008 */ addiu $t9, $v0, 8 -/* 0464F8 800458F8 AC790000 */ sw $t9, ($v1) -/* 0464FC 800458FC AC4F0000 */ sw $t7, ($v0) -/* 046500 80045900 8FAE0068 */ lw $t6, 0x68($sp) -/* 046504 80045904 3C08F200 */ lui $t0, 0xf200 -/* 046508 80045908 25D8FFFF */ addiu $t8, $t6, -1 -/* 04650C 8004590C 0018C880 */ sll $t9, $t8, 2 -/* 046510 80045910 8FB8006C */ lw $t8, 0x6c($sp) -/* 046514 80045914 332F0FFF */ andi $t7, $t9, 0xfff -/* 046518 80045918 000F7300 */ sll $t6, $t7, 0xc -/* 04651C 8004591C 2719FFFF */ addiu $t9, $t8, -1 -/* 046520 80045920 00197880 */ sll $t7, $t9, 2 -/* 046524 80045924 31F80FFF */ andi $t8, $t7, 0xfff -/* 046528 80045928 AFB80000 */ sw $t8, ($sp) -/* 04652C 8004592C 01D8C825 */ or $t9, $t6, $t8 -/* 046530 80045930 AFAE0004 */ sw $t6, 4($sp) -/* 046534 80045934 AC590004 */ sw $t9, 4($v0) -/* 046538 80045938 8C620000 */ lw $v0, ($v1) -/* 04653C 8004593C 3C0EFD10 */ lui $t6, 0xfd10 -/* 046540 80045940 244F0008 */ addiu $t7, $v0, 8 -/* 046544 80045944 AC6F0000 */ sw $t7, ($v1) -/* 046548 80045948 AC4E0000 */ sw $t6, ($v0) -/* 04654C 8004594C 8FB80060 */ lw $t8, 0x60($sp) -/* 046550 80045950 3C0E070C */ lui $t6, (0x070C0300 >> 16) # lui $t6, 0x70c -/* 046554 80045954 35CE0300 */ ori $t6, (0x070C0300 & 0xFFFF) # ori $t6, $t6, 0x300 -/* 046558 80045958 AC580004 */ sw $t8, 4($v0) -/* 04655C 8004595C 8C620000 */ lw $v0, ($v1) -/* 046560 80045960 3C0FF510 */ lui $t7, 0xf510 -/* 046564 80045964 24590008 */ addiu $t9, $v0, 8 -/* 046568 80045968 AC790000 */ sw $t9, ($v1) -/* 04656C 8004596C AC4F0000 */ sw $t7, ($v0) -/* 046570 80045970 AC4E0004 */ sw $t6, 4($v0) -/* 046574 80045974 8C620000 */ lw $v0, ($v1) -/* 046578 80045978 3C19E600 */ lui $t9, 0xe600 -/* 04657C 8004597C 3C0EF300 */ lui $t6, 0xf300 -/* 046580 80045980 24580008 */ addiu $t8, $v0, 8 -/* 046584 80045984 AC780000 */ sw $t8, ($v1) -/* 046588 80045988 AC590000 */ sw $t9, ($v0) -/* 04658C 8004598C AC400004 */ sw $zero, 4($v0) -/* 046590 80045990 8C620000 */ lw $v0, ($v1) -/* 046594 80045994 8FA90068 */ lw $t1, 0x68($sp) -/* 046598 80045998 8FA70000 */ lw $a3, ($sp) -/* 04659C 8004599C 244F0008 */ addiu $t7, $v0, 8 -/* 0465A0 800459A0 AC6F0000 */ sw $t7, ($v1) -/* 0465A4 800459A4 8FA60004 */ lw $a2, 4($sp) -/* 0465A8 800459A8 AC4E0000 */ sw $t6, ($v0) -/* 0465AC 800459AC 8FA4000C */ lw $a0, 0xc($sp) -/* 0465B0 800459B0 00402825 */ move $a1, $v0 -/* 0465B4 800459B4 2484FFFF */ addiu $a0, $a0, -1 -/* 0465B8 800459B8 288107FF */ slti $at, $a0, 0x7ff -/* 0465BC 800459BC 10200003 */ beqz $at, .L800459CC -/* 0465C0 800459C0 00000000 */ nop -/* 0465C4 800459C4 10000001 */ b .L800459CC -/* 0465C8 800459C8 00806025 */ move $t4, $a0 -.L800459CC: -/* 0465CC 800459CC 00092040 */ sll $a0, $t1, 1 -/* 0465D0 800459D0 04810003 */ bgez $a0, .L800459E0 -/* 0465D4 800459D4 000410C3 */ sra $v0, $a0, 3 -/* 0465D8 800459D8 24810007 */ addiu $at, $a0, 7 -/* 0465DC 800459DC 000110C3 */ sra $v0, $at, 3 -.L800459E0: -/* 0465E0 800459E0 1C400003 */ bgtz $v0, .L800459F0 -/* 0465E4 800459E4 00405825 */ move $t3, $v0 -/* 0465E8 800459E8 10000001 */ b .L800459F0 -/* 0465EC 800459EC 240B0001 */ li $t3, 1 -.L800459F0: -/* 0465F0 800459F0 1C400003 */ bgtz $v0, .L80045A00 -/* 0465F4 800459F4 257807FF */ addiu $t8, $t3, 0x7ff -/* 0465F8 800459F8 10000002 */ b .L80045A04 -/* 0465FC 800459FC 240A0001 */ li $t2, 1 -.L80045A00: -/* 046600 80045A00 00405025 */ move $t2, $v0 -.L80045A04: -/* 046604 80045A04 030A001A */ div $zero, $t8, $t2 -/* 046608 80045A08 15400002 */ bnez $t2, .L80045A14 -/* 04660C 80045A0C 00000000 */ nop -/* 046610 80045A10 0007000D */ break 7 -.L80045A14: -/* 046614 80045A14 2401FFFF */ li $at, -1 -/* 046618 80045A18 15410004 */ bne $t2, $at, .L80045A2C -/* 04661C 80045A1C 3C018000 */ lui $at, 0x8000 -/* 046620 80045A20 17010002 */ bne $t8, $at, .L80045A2C -/* 046624 80045A24 00000000 */ nop -/* 046628 80045A28 0006000D */ break 6 -.L80045A2C: -/* 04662C 80045A2C 0000C812 */ mflo $t9 -/* 046630 80045A30 332F0FFF */ andi $t7, $t9, 0xfff -/* 046634 80045A34 3C010700 */ lui $at, 0x700 -/* 046638 80045A38 31980FFF */ andi $t8, $t4, 0xfff -/* 04663C 80045A3C 0018CB00 */ sll $t9, $t8, 0xc -/* 046640 80045A40 01E17025 */ or $t6, $t7, $at -/* 046644 80045A44 01D97825 */ or $t7, $t6, $t9 -/* 046648 80045A48 ACAF0004 */ sw $t7, 4($a1) -/* 04664C 80045A4C 8C620000 */ lw $v0, ($v1) -/* 046650 80045A50 3C0EE700 */ lui $t6, 0xe700 -/* 046654 80045A54 248F0007 */ addiu $t7, $a0, 7 -/* 046658 80045A58 24580008 */ addiu $t8, $v0, 8 -/* 04665C 80045A5C AC780000 */ sw $t8, ($v1) -/* 046660 80045A60 AC4E0000 */ sw $t6, ($v0) -/* 046664 80045A64 AC400004 */ sw $zero, 4($v0) -/* 046668 80045A68 00406825 */ move $t5, $v0 -/* 04666C 80045A6C 8C620000 */ lw $v0, ($v1) -/* 046670 80045A70 000FC0C3 */ sra $t8, $t7, 3 -/* 046674 80045A74 330E01FF */ andi $t6, $t8, 0x1ff -/* 046678 80045A78 24590008 */ addiu $t9, $v0, 8 -/* 04667C 80045A7C AC790000 */ sw $t9, ($v1) -/* 046680 80045A80 000ECA40 */ sll $t9, $t6, 9 -/* 046684 80045A84 3C0E000C */ lui $t6, (0x000C0300 >> 16) # lui $t6, 0xc -/* 046688 80045A88 3C01F510 */ lui $at, 0xf510 -/* 04668C 80045A8C AFA20028 */ sw $v0, 0x28($sp) -/* 046690 80045A90 03217825 */ or $t7, $t9, $at -/* 046694 80045A94 35CE0300 */ ori $t6, (0x000C0300 & 0xFFFF) # ori $t6, $t6, 0x300 -/* 046698 80045A98 AC4E0004 */ sw $t6, 4($v0) -/* 04669C 80045A9C AC4F0000 */ sw $t7, ($v0) -/* 0466A0 80045AA0 8C620000 */ lw $v0, ($v1) -/* 0466A4 80045AA4 00C77025 */ or $t6, $a2, $a3 -/* 0466A8 80045AA8 3C01F588 */ lui $at, 0xf588 -/* 0466AC 80045AAC 24590008 */ addiu $t9, $v0, 8 -/* 0466B0 80045AB0 AC790000 */ sw $t9, ($v1) -/* 0466B4 80045AB4 AFA20024 */ sw $v0, 0x24($sp) -/* 0466B8 80045AB8 AC480000 */ sw $t0, ($v0) -/* 0466BC 80045ABC AC4E0004 */ sw $t6, 4($v0) -/* 0466C0 80045AC0 8C620000 */ lw $v0, ($v1) -/* 0466C4 80045AC4 25390007 */ addiu $t9, $t1, 7 -/* 0466C8 80045AC8 001970C3 */ sra $t6, $t9, 3 -/* 0466CC 80045ACC 24580008 */ addiu $t8, $v0, 8 -/* 0466D0 80045AD0 AC780000 */ sw $t8, ($v1) -/* 0466D4 80045AD4 31CF01FF */ andi $t7, $t6, 0x1ff -/* 0466D8 80045AD8 000FC240 */ sll $t8, $t7, 9 -/* 0466DC 80045ADC 0301C825 */ or $t9, $t8, $at -/* 0466E0 80045AE0 372E0100 */ ori $t6, $t9, 0x100 -/* 0466E4 80045AE4 AFA20020 */ sw $v0, 0x20($sp) -/* 0466E8 80045AE8 AC4E0000 */ sw $t6, ($v0) -/* 0466EC 80045AEC 8FB90020 */ lw $t9, 0x20($sp) -/* 0466F0 80045AF0 3C180100 */ lui $t8, 0x100 -/* 0466F4 80045AF4 3C010100 */ lui $at, 0x100 -/* 0466F8 80045AF8 AF380004 */ sw $t8, 4($t9) -/* 0466FC 80045AFC 8C620000 */ lw $v0, ($v1) -/* 046700 80045B00 00C1C025 */ or $t8, $a2, $at -/* 046704 80045B04 0307C825 */ or $t9, $t8, $a3 -/* 046708 80045B08 244E0008 */ addiu $t6, $v0, 8 -/* 04670C 80045B0C AC6E0000 */ sw $t6, ($v1) -/* 046710 80045B10 AFA2001C */ sw $v0, 0x1c($sp) -/* 046714 80045B14 AC480000 */ sw $t0, ($v0) -/* 046718 80045B18 8FAE001C */ lw $t6, 0x1c($sp) -/* 04671C 80045B1C 27BD0060 */ addiu $sp, $sp, 0x60 -/* 046720 80045B20 00407825 */ move $t7, $v0 -/* 046724 80045B24 03E00008 */ jr $ra -/* 046728 80045B28 ADD90004 */ sw $t9, 4($t6) diff --git a/asm/non_matchings/hud_renderer/func_8004BB3C.s b/asm/non_matchings/hud_renderer/func_8004BB3C.s deleted file mode 100644 index 5308803d48..0000000000 --- a/asm/non_matchings/hud_renderer/func_8004BB3C.s +++ /dev/null @@ -1,124 +0,0 @@ -glabel func_8004BB3C -/* 04C73C 8004BB3C 00067080 */ sll $t6, $a2, 2 -/* 04C740 8004BB40 448E2000 */ mtc1 $t6, $f4 -/* 04C744 8004BB44 C7AC0010 */ lwc1 $f12, 0x10($sp) -/* 04C748 8004BB48 0007C080 */ sll $t8, $a3, 2 -/* 04C74C 8004BB4C 468021A0 */ cvt.s.w $f6, $f4 -/* 04C750 8004BB50 44982000 */ mtc1 $t8, $f4 -/* 04C754 8004BB54 3C013FE0 */ li $at, 0x3FE00000 # 1.750000 -/* 04C758 8004BB58 44810800 */ mtc1 $at, $f1 -/* 04C75C 8004BB5C 44800000 */ mtc1 $zero, $f0 -/* 04C760 8004BB60 00047080 */ sll $t6, $a0, 2 -/* 04C764 8004BB64 460C3202 */ mul.s $f8, $f6, $f12 -/* 04C768 8004BB68 0005C080 */ sll $t8, $a1, 2 -/* 04C76C 8004BB6C 468021A0 */ cvt.s.w $f6, $f4 -/* 04C770 8004BB70 460042A1 */ cvt.d.s $f10, $f8 -/* 04C774 8004BB74 460C3202 */ mul.s $f8, $f6, $f12 -/* 04C778 8004BB78 46205400 */ add.d $f16, $f10, $f0 -/* 04C77C 8004BB7C 4620848D */ trunc.w.d $f18, $f16 -/* 04C780 8004BB80 460042A1 */ cvt.d.s $f10, $f8 -/* 04C784 8004BB84 440A9000 */ mfc1 $t2, $f18 -/* 04C788 8004BB88 46205400 */ add.d $f16, $f10, $f0 -/* 04C78C 8004BB8C 01404025 */ move $t0, $t2 -/* 04C790 8004BB90 4620848D */ trunc.w.d $f18, $f16 -/* 04C794 8004BB94 440B9000 */ mfc1 $t3, $f18 -/* 04C798 8004BB98 00000000 */ nop -/* 04C79C 8004BB9C 01604825 */ move $t1, $t3 -/* 04C7A0 8004BBA0 05410003 */ bgez $t2, .L8004BBB0 -/* 04C7A4 8004BBA4 000A7843 */ sra $t7, $t2, 1 -/* 04C7A8 8004BBA8 25410001 */ addiu $at, $t2, 1 -/* 04C7AC 8004BBAC 00017843 */ sra $t7, $at, 1 -.L8004BBB0: -/* 04C7B0 8004BBB0 01CF6023 */ subu $t4, $t6, $t7 -/* 04C7B4 8004BBB4 000A7023 */ negu $t6, $t2 -/* 04C7B8 8004BBB8 01801025 */ move $v0, $t4 -/* 04C7BC 8004BBBC 05610003 */ bgez $t3, .L8004BBCC -/* 04C7C0 8004BBC0 000BC843 */ sra $t9, $t3, 1 -/* 04C7C4 8004BBC4 25610001 */ addiu $at, $t3, 1 -/* 04C7C8 8004BBC8 0001C843 */ sra $t9, $at, 1 -.L8004BBCC: -/* 04C7CC 8004BBCC 03196823 */ subu $t5, $t8, $t9 -/* 04C7D0 8004BBD0 01CC082A */ slt $at, $t6, $t4 -/* 04C7D4 8004BBD4 1020004D */ beqz $at, .L8004BD0C -/* 04C7D8 8004BBD8 01A01825 */ move $v1, $t5 -/* 04C7DC 8004BBDC 000B7823 */ negu $t7, $t3 -/* 04C7E0 8004BBE0 01ED082A */ slt $at, $t7, $t5 -/* 04C7E4 8004BBE4 10200049 */ beqz $at, .L8004BD0C -/* 04C7E8 8004BBE8 00002025 */ move $a0, $zero -/* 04C7EC 8004BBEC 0581000D */ bgez $t4, .L8004BC24 -/* 04C7F0 8004BBF0 00002825 */ move $a1, $zero -/* 04C7F4 8004BBF4 000CC023 */ negu $t8, $t4 -/* 04C7F8 8004BBF8 0018C8C0 */ sll $t9, $t8, 3 -/* 04C7FC 8004BBFC 44992000 */ mtc1 $t9, $f4 -/* 04C800 8004BC00 014C4021 */ addu $t0, $t2, $t4 -/* 04C804 8004BC04 00001025 */ move $v0, $zero -/* 04C808 8004BC08 468021A0 */ cvt.s.w $f6, $f4 -/* 04C80C 8004BC0C 460C3203 */ div.s $f8, $f6, $f12 -/* 04C810 8004BC10 4600428D */ trunc.w.s $f10, $f8 -/* 04C814 8004BC14 44055000 */ mfc1 $a1, $f10 -/* 04C818 8004BC18 00000000 */ nop -/* 04C81C 8004BC1C 00057C00 */ sll $t7, $a1, 0x10 -/* 04C820 8004BC20 000F2C03 */ sra $a1, $t7, 0x10 -.L8004BC24: -/* 04C824 8004BC24 05A1000D */ bgez $t5, .L8004BC5C -/* 04C828 8004BC28 00487821 */ addu $t7, $v0, $t0 -/* 04C82C 8004BC2C 000DC823 */ negu $t9, $t5 -/* 04C830 8004BC30 001970C0 */ sll $t6, $t9, 3 -/* 04C834 8004BC34 448E8000 */ mtc1 $t6, $f16 -/* 04C838 8004BC38 016D4821 */ addu $t1, $t3, $t5 -/* 04C83C 8004BC3C 00001825 */ move $v1, $zero -/* 04C840 8004BC40 468084A0 */ cvt.s.w $f18, $f16 -/* 04C844 8004BC44 460C9103 */ div.s $f4, $f18, $f12 -/* 04C848 8004BC48 4600218D */ trunc.w.s $f6, $f4 -/* 04C84C 8004BC4C 44043000 */ mfc1 $a0, $f6 -/* 04C850 8004BC50 00000000 */ nop -/* 04C854 8004BC54 0004C400 */ sll $t8, $a0, 0x10 -/* 04C858 8004BC58 00182403 */ sra $a0, $t8, 0x10 -.L8004BC5C: -/* 04C85C 8004BC5C 3C0D8015 */ lui $t5, %hi(gDisplayListHead) # $t5, 0x8015 -/* 04C860 8004BC60 25AD0298 */ addiu $t5, %lo(gDisplayListHead) # addiu $t5, $t5, 0x298 -/* 04C864 8004BC64 8DA70000 */ lw $a3, ($t5) -/* 04C868 8004BC68 31F80FFF */ andi $t8, $t7, 0xfff -/* 04C86C 8004BC6C 0018CB00 */ sll $t9, $t8, 0xc -/* 04C870 8004BC70 24EE0008 */ addiu $t6, $a3, 8 -/* 04C874 8004BC74 ADAE0000 */ sw $t6, ($t5) -/* 04C878 8004BC78 3C01E400 */ lui $at, 0xe400 -/* 04C87C 8004BC7C 03217025 */ or $t6, $t9, $at -/* 04C880 8004BC80 3C014480 */ li $at, 0x44800000 # 1024.000000 -/* 04C884 8004BC84 44814000 */ mtc1 $at, $f8 -/* 04C888 8004BC88 00697821 */ addu $t7, $v1, $t1 -/* 04C88C 8004BC8C 31F80FFF */ andi $t8, $t7, 0xfff -/* 04C890 8004BC90 460C4283 */ div.s $f10, $f8, $f12 -/* 04C894 8004BC94 01D8C825 */ or $t9, $t6, $t8 -/* 04C898 8004BC98 304F0FFF */ andi $t7, $v0, 0xfff -/* 04C89C 8004BC9C 000F7300 */ sll $t6, $t7, 0xc -/* 04C8A0 8004BCA0 30780FFF */ andi $t8, $v1, 0xfff -/* 04C8A4 8004BCA4 ACF90000 */ sw $t9, ($a3) -/* 04C8A8 8004BCA8 01D8C825 */ or $t9, $t6, $t8 -/* 04C8AC 8004BCAC ACF90004 */ sw $t9, 4($a3) -/* 04C8B0 8004BCB0 8DA70000 */ lw $a3, ($t5) -/* 04C8B4 8004BCB4 3C0EB300 */ lui $t6, 0xb300 -/* 04C8B8 8004BCB8 0005CC00 */ sll $t9, $a1, 0x10 -/* 04C8BC 8004BCBC 24EF0008 */ addiu $t7, $a3, 8 -/* 04C8C0 8004BCC0 ADAF0000 */ sw $t7, ($t5) -/* 04C8C4 8004BCC4 308FFFFF */ andi $t7, $a0, 0xffff -/* 04C8C8 8004BCC8 ACEE0000 */ sw $t6, ($a3) -/* 04C8CC 8004BCCC 032F7025 */ or $t6, $t9, $t7 -/* 04C8D0 8004BCD0 ACEE0004 */ sw $t6, 4($a3) -/* 04C8D4 8004BCD4 8DA70000 */ lw $a3, ($t5) -/* 04C8D8 8004BCD8 3C19B200 */ lui $t9, 0xb200 -/* 04C8DC 8004BCDC 24F80008 */ addiu $t8, $a3, 8 -/* 04C8E0 8004BCE0 ADB80000 */ sw $t8, ($t5) -/* 04C8E4 8004BCE4 ACF90000 */ sw $t9, ($a3) -/* 04C8E8 8004BCE8 46005421 */ cvt.d.s $f16, $f10 -/* 04C8EC 8004BCEC 46208480 */ add.d $f18, $f16, $f0 -/* 04C8F0 8004BCF0 4620910D */ trunc.w.d $f4, $f18 -/* 04C8F4 8004BCF4 44182000 */ mfc1 $t8, $f4 -/* 04C8F8 8004BCF8 00000000 */ nop -/* 04C8FC 8004BCFC 3319FFFF */ andi $t9, $t8, 0xffff -/* 04C900 8004BD00 00197C00 */ sll $t7, $t9, 0x10 -/* 04C904 8004BD04 01F97025 */ or $t6, $t7, $t9 -/* 04C908 8004BD08 ACEE0004 */ sw $t6, 4($a3) -.L8004BD0C: -/* 04C90C 8004BD0C 03E00008 */ jr $ra -/* 04C910 8004BD10 00000000 */ nop diff --git a/asm/non_matchings/hud_renderer/func_8004E800.s b/asm/non_matchings/hud_renderer/func_8004E800.s deleted file mode 100644 index 9b5a01ed04..0000000000 --- a/asm/non_matchings/hud_renderer/func_8004E800.s +++ /dev/null @@ -1,106 +0,0 @@ -glabel func_8004E800 -/* 04F400 8004E800 00047940 */ sll $t7, $a0, 5 -/* 04F404 8004E804 01E47821 */ addu $t7, $t7, $a0 -/* 04F408 8004E808 3C188019 */ lui $t8, %hi(D_8018CA70) # $t8, 0x8019 -/* 04F40C 8004E80C 2718CA70 */ addiu $t8, %lo(D_8018CA70) # addiu $t8, $t8, -0x3590 -/* 04F410 8004E810 000F7880 */ sll $t7, $t7, 2 -/* 04F414 8004E814 01F81021 */ addu $v0, $t7, $t8 -/* 04F418 8004E818 90590081 */ lbu $t9, 0x81($v0) -/* 04F41C 8004E81C 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 04F420 8004E820 AFBF003C */ sw $ra, 0x3c($sp) -/* 04F424 8004E824 AFA40040 */ sw $a0, 0x40($sp) -/* 04F428 8004E828 13200057 */ beqz $t9, .L8004E988 -/* 04F42C 8004E82C 00807025 */ move $t6, $a0 -/* 04F430 8004E830 80480071 */ lb $t0, 0x71($v0) -/* 04F434 8004E834 24010003 */ li $at, 3 -/* 04F438 8004E838 00003025 */ move $a2, $zero -/* 04F43C 8004E83C 1101002A */ beq $t0, $at, .L8004E8E8 -/* 04F440 8004E840 240B00FF */ li $t3, 255 -/* 04F444 8004E844 000E7840 */ sll $t7, $t6, 1 -/* 04F448 8004E848 3C038019 */ lui $v1, %hi(D_8018CF98) # 0x8019 -/* 04F44C 8004E84C 006F1821 */ addu $v1, $v1, $t7 -/* 04F450 8004E850 8463CF98 */ lh $v1, %lo(D_8018CF98)($v1) # -0x3068($v1) -/* 04F454 8004E854 84490066 */ lh $t1, 0x66($v0) -/* 04F458 8004E858 844A0062 */ lh $t2, 0x62($v0) -/* 04F45C 8004E85C 844B0068 */ lh $t3, 0x68($v0) -/* 04F460 8004E860 844C0064 */ lh $t4, 0x64($v0) -/* 04F464 8004E864 3C19800E */ lui $t9, %hi(D_800E55F8) # 0x800e -/* 04F468 8004E868 0003C080 */ sll $t8, $v1, 2 -/* 04F46C 8004E86C 012A2021 */ addu $a0, $t1, $t2 -/* 04F470 8004E870 3C0A0D01 */ lui $t2, %hi(D_0D00D258) # $t2, 0xd01 -/* 04F474 8004E874 0338C821 */ addu $t9, $t9, $t8 -/* 04F478 8004E878 240D00FF */ li $t5, 255 -/* 04F47C 8004E87C 016C2821 */ addu $a1, $t3, $t4 -/* 04F480 8004E880 8F3955F8 */ lw $t9, %lo(D_800E55F8)($t9) # 0x55f8($t9) -/* 04F484 8004E884 3C0C0D00 */ lui $t4, %hi(D_0D0068F0) # $t4, 0xd00 -/* 04F488 8004E888 AFAD0010 */ sw $t5, 0x10($sp) -/* 04F48C 8004E88C 254AD258 */ addiu $t2, %lo(D_0D00D258) # addiu $t2, $t2, -0x2da8 -/* 04F490 8004E890 00034B00 */ sll $t1, $v1, 0xc -/* 04F494 8004E894 012A5821 */ addu $t3, $t1, $t2 -/* 04F498 8004E898 240D0080 */ li $t5, 128 -/* 04F49C 8004E89C 258C68F0 */ addiu $t4, %lo(D_0D0068F0) # addiu $t4, $t4, 0x68f0 -/* 04F4A0 8004E8A0 24180040 */ li $t8, 64 -/* 04F4A4 8004E8A4 240F0080 */ li $t7, 128 -/* 04F4A8 8004E8A8 240E0040 */ li $t6, 64 -/* 04F4AC 8004E8AC 240800FF */ li $t0, 255 -/* 04F4B0 8004E8B0 AFA8001C */ sw $t0, 0x1c($sp) -/* 04F4B4 8004E8B4 AFAE002C */ sw $t6, 0x2c($sp) -/* 04F4B8 8004E8B8 AFAF0030 */ sw $t7, 0x30($sp) -/* 04F4BC 8004E8BC AFB80034 */ sw $t8, 0x34($sp) -/* 04F4C0 8004E8C0 AFAC0024 */ sw $t4, 0x24($sp) -/* 04F4C4 8004E8C4 AFAD0028 */ sw $t5, 0x28($sp) -/* 04F4C8 8004E8C8 AFAB0020 */ sw $t3, 0x20($sp) -/* 04F4CC 8004E8CC 00003025 */ move $a2, $zero -/* 04F4D0 8004E8D0 8C470004 */ lw $a3, 4($v0) -/* 04F4D4 8004E8D4 AFA00018 */ sw $zero, 0x18($sp) -/* 04F4D8 8004E8D8 0C0128E1 */ jal func_8004A384 -/* 04F4DC 8004E8DC AFB90014 */ sw $t9, 0x14($sp) -/* 04F4E0 8004E8E0 1000002A */ b .L8004E98C -/* 04F4E4 8004E8E4 8FBF003C */ lw $ra, 0x3c($sp) -.L8004E8E8: -/* 04F4E8 8004E8E8 84590066 */ lh $t9, 0x66($v0) -/* 04F4EC 8004E8EC 84480062 */ lh $t0, 0x62($v0) -/* 04F4F0 8004E8F0 3C0C8016 */ lui $t4, %hi(D_80165594) # $t4, 0x8016 -/* 04F4F4 8004E8F4 8D8C5594 */ lw $t4, %lo(D_80165594)($t4) -/* 04F4F8 8004E8F8 8FB80040 */ lw $t8, 0x40($sp) -/* 04F4FC 8004E8FC 03282021 */ addu $a0, $t9, $t0 -/* 04F500 8004E900 84490068 */ lh $t1, 0x68($v0) -/* 04F504 8004E904 844A0064 */ lh $t2, 0x64($v0) -/* 04F508 8004E908 3C088016 */ lui $t0, %hi(gGPCurrentRaceRankByPlayerId) -/* 04F50C 8004E90C 3C0E800E */ lui $t6, %hi(D_800E55F8) # 0x800e -/* 04F510 8004E910 000C6880 */ sll $t5, $t4, 2 -/* 04F514 8004E914 0018C880 */ sll $t9, $t8, 2 -/* 04F518 8004E918 01194021 */ addu $t0, $t0, $t9 -/* 04F51C 8004E91C 01CD7021 */ addu $t6, $t6, $t5 -/* 04F520 8004E920 8DCE55F8 */ lw $t6, %lo(D_800E55F8)($t6) # 0x55f8($t6) -/* 04F524 8004E924 8D0843B8 */ lw $t0, %lo(gGPCurrentRaceRankByPlayerId)($t0) -/* 04F528 8004E928 012A2821 */ addu $a1, $t1, $t2 -/* 04F52C 8004E92C 3C0A0D01 */ lui $t2, %hi(D_0D00D258) # $t2, 0xd01 -/* 04F530 8004E930 240F00FF */ li $t7, 255 -/* 04F534 8004E934 AFAF001C */ sw $t7, 0x1c($sp) -/* 04F538 8004E938 254AD258 */ addiu $t2, %lo(D_0D00D258) # addiu $t2, $t2, -0x2da8 -/* 04F53C 8004E93C 3C0C0D00 */ lui $t4, %hi(D_0D0068F0) # $t4, 0xd00 -/* 04F540 8004E940 AFAB0010 */ sw $t3, 0x10($sp) -/* 04F544 8004E944 AFAE0014 */ sw $t6, 0x14($sp) -/* 04F548 8004E948 00084B00 */ sll $t1, $t0, 0xc -/* 04F54C 8004E94C 012A5821 */ addu $t3, $t1, $t2 -/* 04F550 8004E950 240E0040 */ li $t6, 64 -/* 04F554 8004E954 258C68F0 */ addiu $t4, %lo(D_0D0068F0) # addiu $t4, $t4, 0x68f0 -/* 04F558 8004E958 240F0080 */ li $t7, 128 -/* 04F55C 8004E95C 240D0080 */ li $t5, 128 -/* 04F560 8004E960 24180040 */ li $t8, 64 -/* 04F564 8004E964 AFB80034 */ sw $t8, 0x34($sp) -/* 04F568 8004E968 AFAD0028 */ sw $t5, 0x28($sp) -/* 04F56C 8004E96C AFAF0030 */ sw $t7, 0x30($sp) -/* 04F570 8004E970 AFAC0024 */ sw $t4, 0x24($sp) -/* 04F574 8004E974 AFAE002C */ sw $t6, 0x2c($sp) -/* 04F578 8004E978 AFAB0020 */ sw $t3, 0x20($sp) -/* 04F57C 8004E97C 8C470004 */ lw $a3, 4($v0) -/* 04F580 8004E980 0C0128E1 */ jal func_8004A384 -/* 04F584 8004E984 AFA00018 */ sw $zero, 0x18($sp) -.L8004E988: -/* 04F588 8004E988 8FBF003C */ lw $ra, 0x3c($sp) -.L8004E98C: -/* 04F58C 8004E98C 27BD0040 */ addiu $sp, $sp, 0x40 -/* 04F590 8004E990 03E00008 */ jr $ra -/* 04F594 8004E994 00000000 */ nop diff --git a/asm/non_matchings/hud_renderer/func_8004E998.s b/asm/non_matchings/hud_renderer/func_8004E998.s deleted file mode 100644 index ac545aeae3..0000000000 --- a/asm/non_matchings/hud_renderer/func_8004E998.s +++ /dev/null @@ -1,106 +0,0 @@ -glabel func_8004E998 -/* 04F598 8004E998 00047940 */ sll $t7, $a0, 5 -/* 04F59C 8004E99C 01E47821 */ addu $t7, $t7, $a0 -/* 04F5A0 8004E9A0 3C188019 */ lui $t8, %hi(D_8018CA70) # $t8, 0x8019 -/* 04F5A4 8004E9A4 2718CA70 */ addiu $t8, %lo(D_8018CA70) # addiu $t8, $t8, -0x3590 -/* 04F5A8 8004E9A8 000F7880 */ sll $t7, $t7, 2 -/* 04F5AC 8004E9AC 01F81021 */ addu $v0, $t7, $t8 -/* 04F5B0 8004E9B0 90590081 */ lbu $t9, 0x81($v0) -/* 04F5B4 8004E9B4 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 04F5B8 8004E9B8 AFBF003C */ sw $ra, 0x3c($sp) -/* 04F5BC 8004E9BC AFA40040 */ sw $a0, 0x40($sp) -/* 04F5C0 8004E9C0 13200057 */ beqz $t9, .L8004EB20 -/* 04F5C4 8004E9C4 00807025 */ move $t6, $a0 -/* 04F5C8 8004E9C8 80480071 */ lb $t0, 0x71($v0) -/* 04F5CC 8004E9CC 24010003 */ li $at, 3 -/* 04F5D0 8004E9D0 00003025 */ move $a2, $zero -/* 04F5D4 8004E9D4 1101002A */ beq $t0, $at, .L8004EA80 -/* 04F5D8 8004E9D8 240B00FF */ li $t3, 255 -/* 04F5DC 8004E9DC 000E7880 */ sll $t7, $t6, 2 -/* 04F5E0 8004E9E0 3C038016 */ lui $v1, %hi(gGPCurrentRaceRankByPlayerId) -/* 04F5E4 8004E9E4 006F1821 */ addu $v1, $v1, $t7 -/* 04F5E8 8004E9E8 8C6343B8 */ lw $v1, %lo(gGPCurrentRaceRankByPlayerId)($v1) -/* 04F5EC 8004E9EC 84490066 */ lh $t1, 0x66($v0) -/* 04F5F0 8004E9F0 844A0062 */ lh $t2, 0x62($v0) -/* 04F5F4 8004E9F4 844B0068 */ lh $t3, 0x68($v0) -/* 04F5F8 8004E9F8 844C0064 */ lh $t4, 0x64($v0) -/* 04F5FC 8004E9FC 3C19800E */ lui $t9, %hi(D_800E5618) -/* 04F600 8004EA00 0003C080 */ sll $t8, $v1, 2 -/* 04F604 8004EA04 012A2021 */ addu $a0, $t1, $t2 -/* 04F608 8004EA08 3C0A0D01 */ lui $t2, %hi(D_0D015258) # $t2, 0xd01 -/* 04F60C 8004EA0C 0338C821 */ addu $t9, $t9, $t8 -/* 04F610 8004EA10 240D00FF */ li $t5, 255 -/* 04F614 8004EA14 016C2821 */ addu $a1, $t3, $t4 -/* 04F618 8004EA18 8F395618 */ lw $t9, %lo(D_800E5618)($t9) -/* 04F61C 8004EA1C 3C0C0D00 */ lui $t4, %hi(D_0D006030) # $t4, 0xd00 -/* 04F620 8004EA20 AFAD0010 */ sw $t5, 0x10($sp) -/* 04F624 8004EA24 254A5258 */ addiu $t2, %lo(D_0D015258) # addiu $t2, $t2, 0x5258 -/* 04F628 8004EA28 00034AC0 */ sll $t1, $v1, 0xb -/* 04F62C 8004EA2C 012A5821 */ addu $t3, $t1, $t2 -/* 04F630 8004EA30 240D0040 */ li $t5, 64 -/* 04F634 8004EA34 258C6030 */ addiu $t4, %lo(D_0D006030) # addiu $t4, $t4, 0x6030 -/* 04F638 8004EA38 24180040 */ li $t8, 64 -/* 04F63C 8004EA3C 240F0040 */ li $t7, 64 -/* 04F640 8004EA40 240E0040 */ li $t6, 64 -/* 04F644 8004EA44 240800FF */ li $t0, 255 -/* 04F648 8004EA48 AFA8001C */ sw $t0, 0x1c($sp) -/* 04F64C 8004EA4C AFAE002C */ sw $t6, 0x2c($sp) -/* 04F650 8004EA50 AFAF0030 */ sw $t7, 0x30($sp) -/* 04F654 8004EA54 AFB80034 */ sw $t8, 0x34($sp) -/* 04F658 8004EA58 AFAC0024 */ sw $t4, 0x24($sp) -/* 04F65C 8004EA5C AFAD0028 */ sw $t5, 0x28($sp) -/* 04F660 8004EA60 AFAB0020 */ sw $t3, 0x20($sp) -/* 04F664 8004EA64 00003025 */ move $a2, $zero -/* 04F668 8004EA68 8C470004 */ lw $a3, 4($v0) -/* 04F66C 8004EA6C AFA00018 */ sw $zero, 0x18($sp) -/* 04F670 8004EA70 0C0128E1 */ jal func_8004A384 -/* 04F674 8004EA74 AFB90014 */ sw $t9, 0x14($sp) -/* 04F678 8004EA78 1000002A */ b .L8004EB24 -/* 04F67C 8004EA7C 8FBF003C */ lw $ra, 0x3c($sp) -.L8004EA80: -/* 04F680 8004EA80 84590066 */ lh $t9, 0x66($v0) -/* 04F684 8004EA84 84480062 */ lh $t0, 0x62($v0) -/* 04F688 8004EA88 3C0C8016 */ lui $t4, %hi(D_80165598) # $t4, 0x8016 -/* 04F68C 8004EA8C 8D8C5598 */ lw $t4, %lo(D_80165598)($t4) -/* 04F690 8004EA90 8FB80040 */ lw $t8, 0x40($sp) -/* 04F694 8004EA94 03282021 */ addu $a0, $t9, $t0 -/* 04F698 8004EA98 84490068 */ lh $t1, 0x68($v0) -/* 04F69C 8004EA9C 844A0064 */ lh $t2, 0x64($v0) -/* 04F6A0 8004EAA0 3C088016 */ lui $t0, %hi(gGPCurrentRaceRankByPlayerId) -/* 04F6A4 8004EAA4 3C0E800E */ lui $t6, %hi(D_800E5618) # 0x800e -/* 04F6A8 8004EAA8 000C6880 */ sll $t5, $t4, 2 -/* 04F6AC 8004EAAC 0018C880 */ sll $t9, $t8, 2 -/* 04F6B0 8004EAB0 01194021 */ addu $t0, $t0, $t9 -/* 04F6B4 8004EAB4 01CD7021 */ addu $t6, $t6, $t5 -/* 04F6B8 8004EAB8 8DCE5618 */ lw $t6, %lo(D_800E5618)($t6) # 0x5618($t6) -/* 04F6BC 8004EABC 8D0843B8 */ lw $t0, %lo(gGPCurrentRaceRankByPlayerId)($t0) -/* 04F6C0 8004EAC0 012A2821 */ addu $a1, $t1, $t2 -/* 04F6C4 8004EAC4 3C0A0D01 */ lui $t2, %hi(D_0D015258) # $t2, 0xd01 -/* 04F6C8 8004EAC8 240F00FF */ li $t7, 255 -/* 04F6CC 8004EACC AFAF001C */ sw $t7, 0x1c($sp) -/* 04F6D0 8004EAD0 254A5258 */ addiu $t2, %lo(D_0D015258) # addiu $t2, $t2, 0x5258 -/* 04F6D4 8004EAD4 3C0C0D00 */ lui $t4, %hi(D_0D006030) # $t4, 0xd00 -/* 04F6D8 8004EAD8 AFAB0010 */ sw $t3, 0x10($sp) -/* 04F6DC 8004EADC AFAE0014 */ sw $t6, 0x14($sp) -/* 04F6E0 8004EAE0 00084AC0 */ sll $t1, $t0, 0xb -/* 04F6E4 8004EAE4 012A5821 */ addu $t3, $t1, $t2 -/* 04F6E8 8004EAE8 240E0040 */ li $t6, 64 -/* 04F6EC 8004EAEC 258C6030 */ addiu $t4, %lo(D_0D006030) # addiu $t4, $t4, 0x6030 -/* 04F6F0 8004EAF0 240F0040 */ li $t7, 64 -/* 04F6F4 8004EAF4 240D0040 */ li $t5, 64 -/* 04F6F8 8004EAF8 24180040 */ li $t8, 64 -/* 04F6FC 8004EAFC AFB80034 */ sw $t8, 0x34($sp) -/* 04F700 8004EB00 AFAD0028 */ sw $t5, 0x28($sp) -/* 04F704 8004EB04 AFAF0030 */ sw $t7, 0x30($sp) -/* 04F708 8004EB08 AFAC0024 */ sw $t4, 0x24($sp) -/* 04F70C 8004EB0C AFAE002C */ sw $t6, 0x2c($sp) -/* 04F710 8004EB10 AFAB0020 */ sw $t3, 0x20($sp) -/* 04F714 8004EB14 8C470004 */ lw $a3, 4($v0) -/* 04F718 8004EB18 0C0128E1 */ jal func_8004A384 -/* 04F71C 8004EB1C AFA00018 */ sw $zero, 0x18($sp) -.L8004EB20: -/* 04F720 8004EB20 8FBF003C */ lw $ra, 0x3c($sp) -.L8004EB24: -/* 04F724 8004EB24 27BD0040 */ addiu $sp, $sp, 0x40 -/* 04F728 8004EB28 03E00008 */ jr $ra -/* 04F72C 8004EB2C 00000000 */ nop diff --git a/asm/non_matchings/hud_renderer/func_8004EE54.s b/asm/non_matchings/hud_renderer/func_8004EE54.s deleted file mode 100644 index 93622aadec..0000000000 --- a/asm/non_matchings/hud_renderer/func_8004EE54.s +++ /dev/null @@ -1,85 +0,0 @@ -glabel func_8004EE54 -/* 04FA54 8004EE54 3C0E800E */ lui $t6, %hi(gIsMirrorMode) # $t6, 0x800e -/* 04FA58 8004EE58 8DCEC604 */ lw $t6, %lo(gIsMirrorMode)($t6) -/* 04FA5C 8004EE5C 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 04FA60 8004EE60 AFBF0034 */ sw $ra, 0x34($sp) -/* 04FA64 8004EE64 11C00025 */ beqz $t6, .L8004EEFC -/* 04FA68 8004EE68 AFA40038 */ sw $a0, 0x38($sp) -/* 04FA6C 8004EE6C 00041040 */ sll $v0, $a0, 1 -/* 04FA70 8004EE70 3C188019 */ lui $t8, %hi(D_8018D2C0) # 0x8019 -/* 04FA74 8004EE74 3C098019 */ lui $t1, %hi(D_8018D2D8) # 0x8019 -/* 04FA78 8004EE78 3C038019 */ lui $v1, %hi(D_8018D2B0) # $v1, 0x8019 -/* 04FA7C 8004EE7C 3C088019 */ lui $t0, %hi(D_8018D2B8) # $t0, 0x8019 -/* 04FA80 8004EE80 8508D2B8 */ lh $t0, %lo(D_8018D2B8)($t0) -/* 04FA84 8004EE84 8463D2B0 */ lh $v1, %lo(D_8018D2B0)($v1) -/* 04FA88 8004EE88 01224821 */ addu $t1, $t1, $v0 -/* 04FA8C 8004EE8C 0302C021 */ addu $t8, $t8, $v0 -/* 04FA90 8004EE90 3C198019 */ lui $t9, %hi(D_8018D2F0) # $t9, 0x8019 -/* 04FA94 8004EE94 3C0A8019 */ lui $t2, %hi(D_8018D2F8) # $t2, 0x8019 -/* 04FA98 8004EE98 3C0B8019 */ lui $t3, %hi(D_8018D308) # $t3, 0x8019 -/* 04FA9C 8004EE9C 3C0C8019 */ lui $t4, %hi(D_8018D310) # $t4, 0x8019 -/* 04FAA0 8004EEA0 958CD310 */ lhu $t4, %lo(D_8018D310)($t4) -/* 04FAA4 8004EEA4 956BD308 */ lhu $t3, %lo(D_8018D308)($t3) -/* 04FAA8 8004EEA8 854AD2F8 */ lh $t2, %lo(D_8018D2F8)($t2) -/* 04FAAC 8004EEAC 8739D2F0 */ lh $t9, %lo(D_8018D2F0)($t9) -/* 04FAB0 8004EEB0 8718D2C0 */ lh $t8, %lo(D_8018D2C0)($t8) # -0x2d40($t8) -/* 04FAB4 8004EEB4 8529D2D8 */ lh $t1, %lo(D_8018D2D8)($t1) # -0x2d28($t1) -/* 04FAB8 8004EEB8 3C068019 */ lui $a2, %hi(D_8018D240) # $a2, 0x8019 -/* 04FABC 8004EEBC 3C078019 */ lui $a3, %hi(D_8018D300) # $a3, 0x8019 -/* 04FAC0 8004EEC0 240D00FF */ li $t5, 255 -/* 04FAC4 8004EEC4 AFAD0018 */ sw $t5, 0x18($sp) -/* 04FAC8 8004EEC8 94E7D300 */ lhu $a3, %lo(D_8018D300)($a3) -/* 04FACC 8004EECC 8CC6D240 */ lw $a2, %lo(D_8018D240)($a2) -/* 04FAD0 8004EED0 AFA80020 */ sw $t0, 0x20($sp) -/* 04FAD4 8004EED4 AFA80028 */ sw $t0, 0x28($sp) -/* 04FAD8 8004EED8 AFA3001C */ sw $v1, 0x1c($sp) -/* 04FADC 8004EEDC AFA30024 */ sw $v1, 0x24($sp) -/* 04FAE0 8004EEE0 AFAC0014 */ sw $t4, 0x14($sp) -/* 04FAE4 8004EEE4 AFAB0010 */ sw $t3, 0x10($sp) -/* 04FAE8 8004EEE8 03192021 */ addu $a0, $t8, $t9 -/* 04FAEC 8004EEEC 0C01353A */ jal func_8004D4E8 -/* 04FAF0 8004EEF0 012A2821 */ addu $a1, $t1, $t2 -/* 04FAF4 8004EEF4 10000026 */ b .L8004EF90 -/* 04FAF8 8004EEF8 8FBF0034 */ lw $ra, 0x34($sp) -.L8004EEFC: -/* 04FAFC 8004EEFC 8FA20038 */ lw $v0, 0x38($sp) -/* 04FB00 8004EF00 3C0F8019 */ lui $t7, %hi(D_8018D2C0) # 0x8019 -/* 04FB04 8004EF04 3C198019 */ lui $t9, %hi(D_8018D2D8) # 0x8019 -/* 04FB08 8004EF08 00027040 */ sll $t6, $v0, 1 -/* 04FB0C 8004EF0C 3C038019 */ lui $v1, %hi(D_8018D2B0) # $v1, 0x8019 -/* 04FB10 8004EF10 3C088019 */ lui $t0, %hi(D_8018D2B8) # $t0, 0x8019 -/* 04FB14 8004EF14 8508D2B8 */ lh $t0, %lo(D_8018D2B8)($t0) -/* 04FB18 8004EF18 8463D2B0 */ lh $v1, %lo(D_8018D2B0)($v1) -/* 04FB1C 8004EF1C 01EE7821 */ addu $t7, $t7, $t6 -/* 04FB20 8004EF20 032EC821 */ addu $t9, $t9, $t6 -/* 04FB24 8004EF24 3C188019 */ lui $t8, %hi(D_8018D2F0) # $t8, 0x8019 -/* 04FB28 8004EF28 3C098019 */ lui $t1, %hi(D_8018D2F8) # $t1, 0x8019 -/* 04FB2C 8004EF2C 3C0A8019 */ lui $t2, %hi(D_8018D308) # $t2, 0x8019 -/* 04FB30 8004EF30 3C0B8019 */ lui $t3, %hi(D_8018D310) # $t3, 0x8019 -/* 04FB34 8004EF34 956BD310 */ lhu $t3, %lo(D_8018D310)($t3) -/* 04FB38 8004EF38 954AD308 */ lhu $t2, %lo(D_8018D308)($t2) -/* 04FB3C 8004EF3C 8529D2F8 */ lh $t1, %lo(D_8018D2F8)($t1) -/* 04FB40 8004EF40 8718D2F0 */ lh $t8, %lo(D_8018D2F0)($t8) -/* 04FB44 8004EF44 8739D2D8 */ lh $t9, %lo(D_8018D2D8)($t9) # -0x2d28($t9) -/* 04FB48 8004EF48 85EFD2C0 */ lh $t7, %lo(D_8018D2C0)($t7) # -0x2d40($t7) -/* 04FB4C 8004EF4C 3C068019 */ lui $a2, %hi(D_8018D240) # $a2, 0x8019 -/* 04FB50 8004EF50 3C078019 */ lui $a3, %hi(D_8018D300) # $a3, 0x8019 -/* 04FB54 8004EF54 240C00FF */ li $t4, 255 -/* 04FB58 8004EF58 AFAC0018 */ sw $t4, 0x18($sp) -/* 04FB5C 8004EF5C 94E7D300 */ lhu $a3, %lo(D_8018D300)($a3) -/* 04FB60 8004EF60 8CC6D240 */ lw $a2, %lo(D_8018D240)($a2) -/* 04FB64 8004EF64 01C01025 */ move $v0, $t6 -/* 04FB68 8004EF68 AFA80020 */ sw $t0, 0x20($sp) -/* 04FB6C 8004EF6C AFA80028 */ sw $t0, 0x28($sp) -/* 04FB70 8004EF70 AFA3001C */ sw $v1, 0x1c($sp) -/* 04FB74 8004EF74 AFA30024 */ sw $v1, 0x24($sp) -/* 04FB78 8004EF78 AFAB0014 */ sw $t3, 0x14($sp) -/* 04FB7C 8004EF7C AFAA0010 */ sw $t2, 0x10($sp) -/* 04FB80 8004EF80 03292821 */ addu $a1, $t9, $t1 -/* 04FB84 8004EF84 0C0134DF */ jal func_8004D37C -/* 04FB88 8004EF88 01F82021 */ addu $a0, $t7, $t8 -/* 04FB8C 8004EF8C 8FBF0034 */ lw $ra, 0x34($sp) -.L8004EF90: -/* 04FB90 8004EF90 27BD0038 */ addiu $sp, $sp, 0x38 -/* 04FB94 8004EF94 03E00008 */ jr $ra -/* 04FB98 8004EF98 00000000 */ nop diff --git a/asm/non_matchings/hud_renderer/func_8004EF9C.s b/asm/non_matchings/hud_renderer/func_8004EF9C.s deleted file mode 100644 index 23a86008ee..0000000000 --- a/asm/non_matchings/hud_renderer/func_8004EF9C.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_8004EF9C -/* 04FB9C 8004EF9C 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 04FBA0 8004EFA0 00807825 */ move $t7, $a0 -/* 04FBA4 8004EFA4 3C19800E */ lui $t9, %hi(D_800E5548) # $t9, 0x800e -/* 04FBA8 8004EFA8 27395548 */ addiu $t9, %lo(D_800E5548) # addiu $t9, $t9, 0x5548 -/* 04FBAC 8004EFAC 000FC080 */ sll $t8, $t7, 2 -/* 04FBB0 8004EFB0 03191821 */ addu $v1, $t8, $t9 -/* 04FBB4 8004EFB4 84620000 */ lh $v0, ($v1) -/* 04FBB8 8004EFB8 84680002 */ lh $t0, 2($v1) -/* 04FBBC 8004EFBC 00807025 */ move $t6, $a0 -/* 04FBC0 8004EFC0 000E4880 */ sll $t1, $t6, 2 -/* 04FBC4 8004EFC4 3C068019 */ lui $a2, %hi(D_8018D248) # 0x8019 -/* 04FBC8 8004EFC8 AFBF0034 */ sw $ra, 0x34($sp) -/* 04FBCC 8004EFCC AFA40038 */ sw $a0, 0x38($sp) -/* 04FBD0 8004EFD0 00C93021 */ addu $a2, $a2, $t1 -/* 04FBD4 8004EFD4 240A00FF */ li $t2, 255 -/* 04FBD8 8004EFD8 240B00FF */ li $t3, 255 -/* 04FBDC 8004EFDC 240C00FF */ li $t4, 255 -/* 04FBE0 8004EFE0 AFAC0018 */ sw $t4, 0x18($sp) -/* 04FBE4 8004EFE4 AFAB0014 */ sw $t3, 0x14($sp) -/* 04FBE8 8004EFE8 AFAA0010 */ sw $t2, 0x10($sp) -/* 04FBEC 8004EFEC 8CC6D248 */ lw $a2, %lo(D_8018D248)($a2) # -0x2db8($a2) -/* 04FBF0 8004EFF0 24040104 */ li $a0, 260 -/* 04FBF4 8004EFF4 2405003C */ li $a1, 60 -/* 04FBF8 8004EFF8 240700FF */ li $a3, 255 -/* 04FBFC 8004EFFC AFA2001C */ sw $v0, 0x1c($sp) -/* 04FC00 8004F000 AFA20024 */ sw $v0, 0x24($sp) -/* 04FC04 8004F004 AFA80020 */ sw $t0, 0x20($sp) -/* 04FC08 8004F008 0C0134DF */ jal func_8004D37C -/* 04FC0C 8004F00C AFA80028 */ sw $t0, 0x28($sp) -/* 04FC10 8004F010 8FBF0034 */ lw $ra, 0x34($sp) -/* 04FC14 8004F014 27BD0038 */ addiu $sp, $sp, 0x38 -/* 04FC18 8004F018 03E00008 */ jr $ra -/* 04FC1C 8004F01C 00000000 */ nop diff --git a/asm/non_matchings/hud_renderer/func_8004F020.s b/asm/non_matchings/hud_renderer/func_8004F020.s deleted file mode 100644 index 70c335e1bc..0000000000 --- a/asm/non_matchings/hud_renderer/func_8004F020.s +++ /dev/null @@ -1,90 +0,0 @@ -glabel func_8004F020 -/* 04FC20 8004F020 00041040 */ sll $v0, $a0, 1 -/* 04FC24 8004F024 3C0E8019 */ lui $t6, %hi(D_8018D2C0) # 0x8019 -/* 04FC28 8004F028 01C27021 */ addu $t6, $t6, $v0 -/* 04FC2C 8004F02C 3C0F8019 */ lui $t7, %hi(D_8018D2F0) # $t7, 0x8019 -/* 04FC30 8004F030 85EFD2F0 */ lh $t7, %lo(D_8018D2F0)($t7) -/* 04FC34 8004F034 85CED2C0 */ lh $t6, %lo(D_8018D2C0)($t6) # -0x2d40($t6) -/* 04FC38 8004F038 3C198019 */ lui $t9, %hi(D_8018D2B0) # $t9, 0x8019 -/* 04FC3C 8004F03C 8739D2B0 */ lh $t9, %lo(D_8018D2B0)($t9) -/* 04FC40 8004F040 3C0C8019 */ lui $t4, %hi(D_8018D2D8) # 0x8019 -/* 04FC44 8004F044 01CFC021 */ addu $t8, $t6, $t7 -/* 04FC48 8004F048 3C0A8019 */ lui $t2, %hi(D_8018D2E0) # $t2, 0x8019 -/* 04FC4C 8004F04C 3C0F8019 */ lui $t7, %hi(D_8018D2B8) # $t7, 0x8019 -/* 04FC50 8004F050 01826021 */ addu $t4, $t4, $v0 -/* 04FC54 8004F054 3C0D8019 */ lui $t5, %hi(D_8018D2F8) # $t5, 0x8019 -/* 04FC58 8004F058 854AD2E0 */ lh $t2, %lo(D_8018D2E0)($t2) -/* 04FC5C 8004F05C 85ADD2F8 */ lh $t5, %lo(D_8018D2F8)($t5) -/* 04FC60 8004F060 858CD2D8 */ lh $t4, %lo(D_8018D2D8)($t4) # -0x2d28($t4) -/* 04FC64 8004F064 85EFD2B8 */ lh $t7, %lo(D_8018D2B8)($t7) -/* 04FC68 8004F068 3C03800E */ lui $v1, %hi(gCurrentCourseId) # $v1, 0x800e -/* 04FC6C 8004F06C 018D7021 */ addu $t6, $t4, $t5 -/* 04FC70 8004F070 8463C5A0 */ lh $v1, %lo(gCurrentCourseId)($v1) -/* 04FC74 8004F074 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 04FC78 8004F078 AFBF0014 */ sw $ra, 0x14($sp) -/* 04FC7C 8004F07C 07210003 */ bgez $t9, .L8004F08C -/* 04FC80 8004F080 00194043 */ sra $t0, $t9, 1 -/* 04FC84 8004F084 27210001 */ addiu $at, $t9, 1 -/* 04FC88 8004F088 00014043 */ sra $t0, $at, 1 -.L8004F08C: -/* 04FC8C 8004F08C 03084823 */ subu $t1, $t8, $t0 -/* 04FC90 8004F090 3C088019 */ lui $t0, %hi(D_8018D2E8) # $t0, 0x8019 -/* 04FC94 8004F094 8508D2E8 */ lh $t0, %lo(D_8018D2E8)($t0) -/* 04FC98 8004F098 012A5821 */ addu $t3, $t1, $t2 -/* 04FC9C 8004F09C 448B2000 */ mtc1 $t3, $f4 -/* 04FCA0 8004F0A0 00000000 */ nop -/* 04FCA4 8004F0A4 468020A0 */ cvt.s.w $f2, $f4 -/* 04FCA8 8004F0A8 05E10003 */ bgez $t7, .L8004F0B8 -/* 04FCAC 8004F0AC 000FC843 */ sra $t9, $t7, 1 -/* 04FCB0 8004F0B0 25E10001 */ addiu $at, $t7, 1 -/* 04FCB4 8004F0B4 0001C843 */ sra $t9, $at, 1 -.L8004F0B8: -/* 04FCB8 8004F0B8 01D9C023 */ subu $t8, $t6, $t9 -/* 04FCBC 8004F0BC 03084821 */ addu $t1, $t8, $t0 -/* 04FCC0 8004F0C0 44893000 */ mtc1 $t1, $f6 -/* 04FCC4 8004F0C4 3C014000 */ lui $at, 0x4000 -/* 04FCC8 8004F0C8 10600008 */ beqz $v1, .L8004F0EC -/* 04FCCC 8004F0CC 46803020 */ cvt.s.w $f0, $f6 -/* 04FCD0 8004F0D0 24010001 */ li $at, 1 -/* 04FCD4 8004F0D4 1061000B */ beq $v1, $at, .L8004F104 -/* 04FCD8 8004F0D8 2401000B */ li $at, 11 -/* 04FCDC 8004F0DC 50610011 */ beql $v1, $at, .L8004F124 -/* 04FCE0 8004F0E0 3C014010 */ li $at, 0x40100000 # 2.250000 -/* 04FCE4 8004F0E4 10000015 */ b .L8004F13C -/* 04FCE8 8004F0E8 4600148D */ trunc.w.s $f18, $f2 -.L8004F0EC: -/* 04FCEC 8004F0EC 44815800 */ mtc1 $at, $f11 -/* 04FCF0 8004F0F0 44805000 */ mtc1 $zero, $f10 -/* 04FCF4 8004F0F4 46000221 */ cvt.d.s $f8, $f0 -/* 04FCF8 8004F0F8 462A4401 */ sub.d $f16, $f8, $f10 -/* 04FCFC 8004F0FC 1000000E */ b .L8004F138 -/* 04FD00 8004F100 46208020 */ cvt.s.d $f0, $f16 -.L8004F104: -/* 04FD04 8004F104 3C014030 */ li $at, 0x40300000 # 2.750000 -/* 04FD08 8004F108 44812800 */ mtc1 $at, $f5 -/* 04FD0C 8004F10C 44802000 */ mtc1 $zero, $f4 -/* 04FD10 8004F110 460004A1 */ cvt.d.s $f18, $f0 -/* 04FD14 8004F114 46249181 */ sub.d $f6, $f18, $f4 -/* 04FD18 8004F118 10000007 */ b .L8004F138 -/* 04FD1C 8004F11C 46203020 */ cvt.s.d $f0, $f6 -/* 04FD20 8004F120 3C014010 */ li $at, 0x40100000 # 2.250000 -.L8004F124: -/* 04FD24 8004F124 44815800 */ mtc1 $at, $f11 -/* 04FD28 8004F128 44805000 */ mtc1 $zero, $f10 -/* 04FD2C 8004F12C 46000221 */ cvt.d.s $f8, $f0 -/* 04FD30 8004F130 462A4400 */ add.d $f16, $f8, $f10 -/* 04FD34 8004F134 46208020 */ cvt.s.d $f0, $f16 -.L8004F138: -/* 04FD38 8004F138 4600148D */ trunc.w.s $f18, $f2 -.L8004F13C: -/* 04FD3C 8004F13C 3C060D03 */ lui $a2, %hi(gTextureMiniMapFinishLine) # $a2, 0xd03 -/* 04FD40 8004F140 24C6CC58 */ addiu $a2, %lo(gTextureMiniMapFinishLine) # addiu $a2, $a2, -0x33a8 -/* 04FD44 8004F144 4600010D */ trunc.w.s $f4, $f0 -/* 04FD48 8004F148 44049000 */ mfc1 $a0, $f18 -/* 04FD4C 8004F14C 44052000 */ mfc1 $a1, $f4 -/* 04FD50 8004F150 0C0132B4 */ jal func_8004CAD0 -/* 04FD54 8004F154 00000000 */ nop -/* 04FD58 8004F158 8FBF0014 */ lw $ra, 0x14($sp) -/* 04FD5C 8004F15C 27BD0018 */ addiu $sp, $sp, 0x18 -/* 04FD60 8004F160 03E00008 */ jr $ra -/* 04FD64 8004F164 00000000 */ nop diff --git a/asm/non_matchings/hud_renderer/func_8004F3E4.s b/asm/non_matchings/hud_renderer/func_8004F3E4.s deleted file mode 100644 index e4d13a6e4c..0000000000 --- a/asm/non_matchings/hud_renderer/func_8004F3E4.s +++ /dev/null @@ -1,181 +0,0 @@ -glabel func_8004F3E4 -/* 04FFE4 8004F3E4 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 04FFE8 8004F3E8 3C02800E */ lui $v0, %hi(gModeSelection) # $v0, 0x800e -/* 04FFEC 8004F3EC 8C42C53C */ lw $v0, %lo(gModeSelection)($v0) -/* 04FFF0 8004F3F0 AFB40028 */ sw $s4, 0x28($sp) -/* 04FFF4 8004F3F4 0080A025 */ move $s4, $a0 -/* 04FFF8 8004F3F8 AFBF002C */ sw $ra, 0x2c($sp) -/* 04FFFC 8004F3FC AFB30024 */ sw $s3, 0x24($sp) -/* 050000 8004F400 AFB20020 */ sw $s2, 0x20($sp) -/* 050004 8004F404 AFB1001C */ sw $s1, 0x1c($sp) -/* 050008 8004F408 1040000C */ beqz $v0, .L8004F43C -/* 05000C 8004F40C AFB00018 */ sw $s0, 0x18($sp) -/* 050010 8004F410 24010001 */ li $at, 1 -/* 050014 8004F414 10410046 */ beq $v0, $at, .L8004F530 -/* 050018 8004F418 00008825 */ move $s1, $zero -/* 05001C 8004F41C 24010002 */ li $at, 2 -/* 050020 8004F420 1041005C */ beq $v0, $at, .L8004F594 -/* 050024 8004F424 3C11800E */ lui $s1, %hi(gPlayerCountSelection1) # 0x800e -/* 050028 8004F428 24010003 */ li $at, 3 -/* 05002C 8004F42C 10410073 */ beq $v0, $at, .L8004F5FC -/* 050030 8004F430 3C03800E */ lui $v1, %hi(gPlayerCountSelection1) # $v1, 0x800e -/* 050034 8004F434 10000088 */ b .L8004F658 -/* 050038 8004F438 8FBF002C */ lw $ra, 0x2c($sp) -.L8004F43C: -/* 05003C 8004F43C 3C118019 */ lui $s1, %hi(D_8018D158) # $s1, 0x8019 -/* 050040 8004F440 8E31D158 */ lw $s1, %lo(D_8018D158)($s1) -/* 050044 8004F444 3C0F8016 */ lui $t7, %hi(gGPCurrentRacePlayerIdByRank) # $t7, 0x8016 -/* 050048 8004F448 25EF4360 */ addiu $t7, %lo(gGPCurrentRacePlayerIdByRank) # addiu $t7, $t7, 0x4360 -/* 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(gPlayerOne) # $s2, 0x800e -/* 05005C 8004F45C 3C118016 */ lui $s1, %hi(gGPCurrentRacePlayerIdByRank) # $s1, 0x8016 -/* 050060 8004F460 26314360 */ addiu $s1, %lo(gGPCurrentRacePlayerIdByRank) # addiu $s1, $s1, 0x4360 -/* 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) -.L8004F474: -/* 050074 8004F474 8E590000 */ lw $t9, ($s2) -/* 050078 8004F478 02802025 */ move $a0, $s4 -/* 05007C 8004F47C 00B30019 */ multu $a1, $s3 -/* 050080 8004F480 0000C012 */ mflo $t8 -/* 050084 8004F484 03194021 */ addu $t0, $t8, $t9 -/* 050088 8004F488 95090000 */ lhu $t1, ($t0) -/* 05008C 8004F48C 312A1000 */ andi $t2, $t1, 0x1000 -/* 050090 8004F490 51400004 */ beql $t2, $zero, .L8004F4A4 -/* 050094 8004F494 2610FFFE */ addiu $s0, $s0, -2 -/* 050098 8004F498 0C013C5A */ jal func_8004F168 -/* 05009C 8004F49C 24060008 */ li $a2, 8 -/* 0500A0 8004F4A0 2610FFFE */ addiu $s0, $s0, -2 -.L8004F4A4: -/* 0500A4 8004F4A4 0211082B */ sltu $at, $s0, $s1 -/* 0500A8 8004F4A8 5020FFF2 */ beql $at, $zero, .L8004F474 -/* 0500AC 8004F4AC 86050000 */ lh $a1, ($s0) -/* 0500B0 8004F4B0 3C118019 */ lui $s1, %hi(D_8018D158) # $s1, 0x8019 -/* 0500B4 8004F4B4 8E31D158 */ lw $s1, %lo(D_8018D158)($s1) -/* 0500B8 8004F4B8 2631FFFF */ addiu $s1, $s1, -1 -.L8004F4BC: -/* 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 -/* 0500D0 8004F4D0 3C0C8016 */ lui $t4, %hi(gGPCurrentRacePlayerIdByRank) # $t4, 0x8016 -/* 0500D4 8004F4D4 258C4360 */ addiu $t4, %lo(gGPCurrentRacePlayerIdByRank) # addiu $t4, $t4, 0x4360 -/* 0500D8 8004F4D8 016C8021 */ addu $s0, $t3, $t4 -/* 0500DC 8004F4DC 24111000 */ li $s1, 4096 -/* 0500E0 8004F4E0 86050000 */ lh $a1, ($s0) -.L8004F4E4: -/* 0500E4 8004F4E4 8E4E0000 */ lw $t6, ($s2) -/* 0500E8 8004F4E8 02802025 */ move $a0, $s4 -/* 0500EC 8004F4EC 00B30019 */ multu $a1, $s3 -/* 0500F0 8004F4F0 00006812 */ mflo $t5 -/* 0500F4 8004F4F4 01AE1021 */ addu $v0, $t5, $t6 -/* 0500F8 8004F4F8 944F0000 */ lhu $t7, ($v0) -/* 0500FC 8004F4FC 31F81000 */ andi $t8, $t7, 0x1000 -/* 050100 8004F500 12380003 */ beq $s1, $t8, .L8004F510 -/* 050104 8004F504 00000000 */ nop -/* 050108 8004F508 0C013C5A */ jal func_8004F168 -/* 05010C 8004F50C 94460254 */ lhu $a2, 0x254($v0) -.L8004F510: -/* 050110 8004F510 3C198016 */ lui $t9, %hi(gGPCurrentRacePlayerIdByRank) # $t9, 0x8016 -/* 050114 8004F514 27394360 */ addiu $t9, %lo(gGPCurrentRacePlayerIdByRank) # addiu $t9, $t9, 0x4360 -/* 050118 8004F518 2610FFFE */ addiu $s0, $s0, -2 -/* 05011C 8004F51C 0219082B */ sltu $at, $s0, $t9 -/* 050120 8004F520 5020FFF0 */ beql $at, $zero, .L8004F4E4 -/* 050124 8004F524 86050000 */ lh $a1, ($s0) -/* 050128 8004F528 1000004B */ b .L8004F658 -/* 05012C 8004F52C 8FBF002C */ lw $ra, 0x2c($sp) -.L8004F530: -/* 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 -.L8004F544: -/* 050144 8004F544 02024021 */ addu $t0, $s0, $v0 -/* 050148 8004F548 95090000 */ lhu $t1, ($t0) -/* 05014C 8004F54C 02802025 */ move $a0, $s4 -/* 050150 8004F550 02202825 */ move $a1, $s1 -/* 050154 8004F554 312A0100 */ andi $t2, $t1, 0x100 -/* 050158 8004F558 564A0006 */ bnel $s2, $t2, .L8004F574 -/* 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(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 -/* 050178 8004F578 26100DD8 */ addiu $s0, $s0, 0xdd8 -/* 05017C 8004F57C 02802025 */ move $a0, $s4 -/* 050180 8004F580 00002825 */ move $a1, $zero -/* 050184 8004F584 0C013C5A */ jal func_8004F168 -/* 050188 8004F588 94460254 */ lhu $a2, 0x254($v0) -/* 05018C 8004F58C 10000032 */ b .L8004F658 -/* 050190 8004F590 8FBF002C */ lw $ra, 0x2c($sp) -.L8004F594: -/* 050194 8004F594 8E31C538 */ lw $s1, %lo(gPlayerCountSelection1)($s1) # -0x3ac8($s1) -/* 050198 8004F598 3C0C8016 */ lui $t4, %hi(gGPCurrentRacePlayerIdByRank) # $t4, 0x8016 -/* 05019C 8004F59C 258C4360 */ addiu $t4, %lo(gGPCurrentRacePlayerIdByRank) # addiu $t4, $t4, 0x4360 -/* 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(gPlayerOne) # $s2, 0x800e -/* 0501B0 8004F5B0 3C118016 */ lui $s1, %hi(gGPCurrentRacePlayerIdByRank) # $s1, 0x8016 -/* 0501B4 8004F5B4 26314360 */ addiu $s1, %lo(gGPCurrentRacePlayerIdByRank) # addiu $s1, $s1, 0x4360 -/* 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) -.L8004F5C8: -/* 0501C8 8004F5C8 8E4E0000 */ lw $t6, ($s2) -/* 0501CC 8004F5CC 02802025 */ move $a0, $s4 -/* 0501D0 8004F5D0 00B30019 */ multu $a1, $s3 -/* 0501D4 8004F5D4 00006812 */ mflo $t5 -/* 0501D8 8004F5D8 01AE7821 */ addu $t7, $t5, $t6 -/* 0501DC 8004F5DC 0C013C5A */ jal func_8004F168 -/* 0501E0 8004F5E0 95E60254 */ lhu $a2, 0x254($t7) -/* 0501E4 8004F5E4 2610FFFE */ addiu $s0, $s0, -2 -/* 0501E8 8004F5E8 0211082B */ sltu $at, $s0, $s1 -/* 0501EC 8004F5EC 5020FFF6 */ beql $at, $zero, .L8004F5C8 -/* 0501F0 8004F5F0 86050000 */ lh $a1, ($s0) -/* 0501F4 8004F5F4 10000018 */ b .L8004F658 -/* 0501F8 8004F5F8 8FBF002C */ lw $ra, 0x2c($sp) -.L8004F5FC: -/* 0501FC 8004F5FC 8C63C538 */ lw $v1, %lo(gPlayerCountSelection1)($v1) -/* 050200 8004F600 00008825 */ move $s1, $zero -/* 050204 8004F604 00008025 */ move $s0, $zero -/* 050208 8004F608 18600012 */ blez $v1, .L8004F654 -/* 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 -/* 05021C 8004F61C 02202825 */ move $a1, $s1 -/* 050220 8004F620 02181021 */ addu $v0, $s0, $t8 -/* 050224 8004F624 94590000 */ lhu $t9, ($v0) -/* 050228 8004F628 33280040 */ andi $t0, $t9, 0x40 -/* 05022C 8004F62C 55000006 */ bnel $t0, $zero, .L8004F648 -/* 050230 8004F630 26310001 */ addiu $s1, $s1, 1 -/* 050234 8004F634 0C013C5A */ jal func_8004F168 -/* 050238 8004F638 94460254 */ lhu $a2, 0x254($v0) -/* 05023C 8004F63C 3C03800E */ lui $v1, %hi(gPlayerCountSelection1) # $v1, 0x800e -/* 050240 8004F640 8C63C538 */ lw $v1, %lo(gPlayerCountSelection1)($v1) -/* 050244 8004F644 26310001 */ addiu $s1, $s1, 1 -.L8004F648: -/* 050248 8004F648 0223082A */ slt $at, $s1, $v1 -/* 05024C 8004F64C 1420FFF1 */ bnez $at, .L8004F614 -/* 050250 8004F650 26100DD8 */ addiu $s0, $s0, 0xdd8 -.L8004F654: -/* 050254 8004F654 8FBF002C */ lw $ra, 0x2c($sp) -.L8004F658: -/* 050258 8004F658 8FB00018 */ lw $s0, 0x18($sp) -/* 05025C 8004F65C 8FB1001C */ lw $s1, 0x1c($sp) -/* 050260 8004F660 8FB20020 */ lw $s2, 0x20($sp) -/* 050264 8004F664 8FB30024 */ lw $s3, 0x24($sp) -/* 050268 8004F668 8FB40028 */ lw $s4, 0x28($sp) -/* 05026C 8004F66C 03E00008 */ jr $ra -/* 050270 8004F670 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/non_matchings/hud_renderer/func_8004F6D0.s b/asm/non_matchings/hud_renderer/func_8004F6D0.s deleted file mode 100644 index b21f8f1679..0000000000 --- a/asm/non_matchings/hud_renderer/func_8004F6D0.s +++ /dev/null @@ -1,43 +0,0 @@ -glabel func_8004F6D0 -/* 0502D0 8004F6D0 3C020009 */ lui $v0, (0x000927BF >> 16) # lui $v0, 9 -/* 0502D4 8004F6D4 344227BF */ ori $v0, (0x000927BF & 0xFFFF) # ori $v0, $v0, 0x27bf -/* 0502D8 8004F6D8 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 0502DC 8004F6DC 0082082A */ slt $at, $a0, $v0 -/* 0502E0 8004F6E0 AFBF001C */ sw $ra, 0x1c($sp) -/* 0502E4 8004F6E4 AFB00018 */ sw $s0, 0x18($sp) -/* 0502E8 8004F6E8 14200002 */ bnez $at, .L8004F6F4 -/* 0502EC 8004F6EC AFA40024 */ sw $a0, 0x24($sp) -/* 0502F0 8004F6F0 AFA20024 */ sw $v0, 0x24($sp) -.L8004F6F4: -/* 0502F4 8004F6F4 27A40024 */ addiu $a0, $sp, 0x24 -/* 0502F8 8004F6F8 0C013D9D */ jal func_8004F674 -/* 0502FC 8004F6FC 3405EA60 */ li $a1, 60000 -/* 050300 8004F700 3C108016 */ lui $s0, %hi(D_801657D0) # $s0, 0x8016 -/* 050304 8004F704 261057D0 */ addiu $s0, %lo(D_801657D0) # addiu $s0, $s0, 0x57d0 -/* 050308 8004F708 A2020000 */ sb $v0, ($s0) -/* 05030C 8004F70C 27A40024 */ addiu $a0, $sp, 0x24 -/* 050310 8004F710 0C013D9D */ jal func_8004F674 -/* 050314 8004F714 24051770 */ li $a1, 6000 -/* 050318 8004F718 A2020001 */ sb $v0, 1($s0) -/* 05031C 8004F71C 27A40024 */ addiu $a0, $sp, 0x24 -/* 050320 8004F720 0C013D9D */ jal func_8004F674 -/* 050324 8004F724 240503E8 */ li $a1, 1000 -/* 050328 8004F728 A2020003 */ sb $v0, 3($s0) -/* 05032C 8004F72C 27A40024 */ addiu $a0, $sp, 0x24 -/* 050330 8004F730 0C013D9D */ jal func_8004F674 -/* 050334 8004F734 24050064 */ li $a1, 100 -/* 050338 8004F738 A2020004 */ sb $v0, 4($s0) -/* 05033C 8004F73C 27A40024 */ addiu $a0, $sp, 0x24 -/* 050340 8004F740 0C013D9D */ jal func_8004F674 -/* 050344 8004F744 2405000A */ li $a1, 10 -/* 050348 8004F748 8FAE0024 */ lw $t6, 0x24($sp) -/* 05034C 8004F74C 8FBF001C */ lw $ra, 0x1c($sp) -/* 050350 8004F750 240F000A */ li $t7, 10 -/* 050354 8004F754 2418000B */ li $t8, 11 -/* 050358 8004F758 A2020006 */ sb $v0, 6($s0) -/* 05035C 8004F75C A20F0002 */ sb $t7, 2($s0) -/* 050360 8004F760 A2180005 */ sb $t8, 5($s0) -/* 050364 8004F764 A20E0007 */ sb $t6, 7($s0) -/* 050368 8004F768 8FB00018 */ lw $s0, 0x18($sp) -/* 05036C 8004F76C 03E00008 */ jr $ra -/* 050370 8004F770 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/non_matchings/hud_renderer/func_800508C0.s b/asm/non_matchings/hud_renderer/func_800508C0.s deleted file mode 100644 index 63274ba677..0000000000 --- a/asm/non_matchings/hud_renderer/func_800508C0.s +++ /dev/null @@ -1,261 +0,0 @@ -.section .late_rodata - -glabel jpt_800EE050 -.word L80050C50, L80050A88, L80050AC0, L80050B1C -.word L80050BA8 - -.section .text - -glabel func_800508C0 -/* 0514C0 800508C0 3C0E800E */ lui $t6, %hi(gModeSelection) # $t6, 0x800e -/* 0514C4 800508C4 8DCEC53C */ lw $t6, %lo(gModeSelection)($t6) -/* 0514C8 800508C8 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* 0514CC 800508CC 24010001 */ li $at, 1 -/* 0514D0 800508D0 AFBF0034 */ sw $ra, 0x34($sp) -/* 0514D4 800508D4 AFB20030 */ sw $s2, 0x30($sp) -/* 0514D8 800508D8 AFB1002C */ sw $s1, 0x2c($sp) -/* 0514DC 800508DC 15C10004 */ bne $t6, $at, .L800508F0 -/* 0514E0 800508E0 AFB00028 */ sw $s0, 0x28($sp) -/* 0514E4 800508E4 3C108016 */ lui $s0, %hi(D_80164378) # $s0, 0x8016 -/* 0514E8 800508E8 10000003 */ b .L800508F8 -/* 0514EC 800508EC 86104378 */ lh $s0, %lo(D_80164378)($s0) -.L800508F0: -/* 0514F0 800508F0 3C108016 */ lui $s0, %hi(gGPCurrentRacePlayerIdByRank) # $s0, 0x8016 -/* 0514F4 800508F4 86104360 */ lh $s0, %lo(gGPCurrentRacePlayerIdByRank)($s0) -.L800508F8: -/* 0514F8 800508F8 3204FFFF */ andi $a0, $s0, 0xffff -/* 0514FC 800508FC 27A50054 */ addiu $a1, $sp, 0x54 -/* 051500 80050900 0C014191 */ jal func_80050644 -/* 051504 80050904 27A60050 */ addiu $a2, $sp, 0x50 -/* 051508 80050908 00107880 */ sll $t7, $s0, 2 -/* 05150C 8005090C 3C038016 */ lui $v1, %hi(gLapCountByPlayerId) # 0x8016 -/* 051510 80050910 006F1821 */ addu $v1, $v1, $t7 -/* 051514 80050914 8C634390 */ lw $v1, %lo(gLapCountByPlayerId)($v1) # 0x4390($v1) -/* 051518 80050918 AFA2004C */ sw $v0, 0x4c($sp) -/* 05151C 8005091C 24010001 */ li $at, 1 -/* 051520 80050920 18600037 */ blez $v1, .L80050A00 -/* 051524 80050924 24040020 */ li $a0, 32 -/* 051528 80050928 14610005 */ bne $v1, $at, .L80050940 -/* 05152C 8005092C 24050012 */ li $a1, 18 -/* 051530 80050930 00008025 */ move $s0, $zero -/* 051534 80050934 00008825 */ move $s1, $zero -/* 051538 80050938 1000000A */ b .L80050964 -/* 05153C 8005093C 241200FF */ li $s2, 255 -.L80050940: -/* 051540 80050940 24010002 */ li $at, 2 -/* 051544 80050944 14610005 */ bne $v1, $at, .L8005095C -/* 051548 80050948 241000FF */ li $s0, 255 -/* 05154C 8005094C 241000FF */ li $s0, 255 -/* 051550 80050950 241100FF */ li $s1, 255 -/* 051554 80050954 10000003 */ b .L80050964 -/* 051558 80050958 00009025 */ move $s2, $zero -.L8005095C: -/* 05155C 8005095C 00008825 */ move $s1, $zero -/* 051560 80050960 00009025 */ move $s2, $zero -.L80050964: -/* 051564 80050964 241800FF */ li $t8, 255 -/* 051568 80050968 AFB80018 */ sw $t8, 0x18($sp) -/* 05156C 8005096C 24060104 */ li $a2, 260 -/* 051570 80050970 3207FFFF */ andi $a3, $s0, 0xffff -/* 051574 80050974 AFB10010 */ sw $s1, 0x10($sp) -/* 051578 80050978 AFB20014 */ sw $s2, 0x14($sp) -/* 05157C 8005097C 0C013009 */ jal func_8004C024 -/* 051580 80050980 AFA30048 */ sw $v1, 0x48($sp) -/* 051584 80050984 241900FF */ li $t9, 255 -/* 051588 80050988 AFB90018 */ sw $t9, 0x18($sp) -/* 05158C 8005098C 24040124 */ li $a0, 292 -/* 051590 80050990 24050012 */ li $a1, 18 -/* 051594 80050994 240600CC */ li $a2, 204 -/* 051598 80050998 3207FFFF */ andi $a3, $s0, 0xffff -/* 05159C 8005099C AFB10010 */ sw $s1, 0x10($sp) -/* 0515A0 800509A0 0C013052 */ jal func_8004C148 -/* 0515A4 800509A4 AFB20014 */ sw $s2, 0x14($sp) -/* 0515A8 800509A8 240800FF */ li $t0, 255 -/* 0515AC 800509AC AFA80018 */ sw $t0, 0x18($sp) -/* 0515B0 800509B0 24040020 */ li $a0, 32 -/* 0515B4 800509B4 240500DE */ li $a1, 222 -/* 0515B8 800509B8 24060104 */ li $a2, 260 -/* 0515BC 800509BC 3207FFFF */ andi $a3, $s0, 0xffff -/* 0515C0 800509C0 AFB10010 */ sw $s1, 0x10($sp) -/* 0515C4 800509C4 0C013009 */ jal func_8004C024 -/* 0515C8 800509C8 AFB20014 */ sw $s2, 0x14($sp) -/* 0515CC 800509CC 240900FF */ li $t1, 255 -/* 0515D0 800509D0 AFA90018 */ sw $t1, 0x18($sp) -/* 0515D4 800509D4 24040020 */ li $a0, 32 -/* 0515D8 800509D8 24050012 */ li $a1, 18 -/* 0515DC 800509DC 240600CC */ li $a2, 204 -/* 0515E0 800509E0 3207FFFF */ andi $a3, $s0, 0xffff -/* 0515E4 800509E4 AFB10010 */ sw $s1, 0x10($sp) -/* 0515E8 800509E8 0C013052 */ jal func_8004C148 -/* 0515EC 800509EC AFB20014 */ sw $s2, 0x14($sp) -/* 0515F0 800509F0 8FA30048 */ lw $v1, 0x48($sp) -/* 0515F4 800509F4 A7B00042 */ sh $s0, 0x42($sp) -/* 0515F8 800509F8 A7B10040 */ sh $s1, 0x40($sp) -/* 0515FC 800509FC A7B2003E */ sh $s2, 0x3e($sp) -.L80050A00: -/* 051600 80050A00 97B00042 */ lhu $s0, 0x42($sp) -/* 051604 80050A04 97B10040 */ lhu $s1, 0x40($sp) -/* 051608 80050A08 04600091 */ bltz $v1, .L80050C50 -/* 05160C 80050A0C 97B2003E */ lhu $s2, 0x3e($sp) -/* 051610 80050A10 28610003 */ slti $at, $v1, 3 -/* 051614 80050A14 1020008E */ beqz $at, .L80050C50 -/* 051618 80050A18 8FAA004C */ lw $t2, 0x4c($sp) -/* 05161C 80050A1C 10600007 */ beqz $v1, .L80050A3C -/* 051620 80050A20 24010001 */ li $at, 1 -/* 051624 80050A24 10610009 */ beq $v1, $at, .L80050A4C -/* 051628 80050A28 24010002 */ li $at, 2 -/* 05162C 80050A2C 5061000C */ beql $v1, $at, .L80050A60 -/* 051630 80050A30 241000FF */ li $s0, 255 -/* 051634 80050A34 1000000D */ b .L80050A6C -/* 051638 80050A38 2D410005 */ sltiu $at, $t2, 5 -.L80050A3C: -/* 05163C 80050A3C 00008025 */ move $s0, $zero -/* 051640 80050A40 00008825 */ move $s1, $zero -/* 051644 80050A44 10000008 */ b .L80050A68 -/* 051648 80050A48 241200FF */ li $s2, 255 -.L80050A4C: -/* 05164C 80050A4C 241000FF */ li $s0, 255 -/* 051650 80050A50 241100FF */ li $s1, 255 -/* 051654 80050A54 10000004 */ b .L80050A68 -/* 051658 80050A58 00009025 */ move $s2, $zero -/* 05165C 80050A5C 241000FF */ li $s0, 255 -.L80050A60: -/* 051660 80050A60 00008825 */ move $s1, $zero -/* 051664 80050A64 00009025 */ move $s2, $zero -.L80050A68: -/* 051668 80050A68 2D410005 */ sltiu $at, $t2, 5 -.L80050A6C: -/* 05166C 80050A6C 10200078 */ beqz $at, .L80050C50 -/* 051670 80050A70 000A5080 */ sll $t2, $t2, 2 -/* 051674 80050A74 3C01800F */ lui $at, %hi(jpt_800EE050) -/* 051678 80050A78 002A0821 */ addu $at, $at, $t2 -/* 05167C 80050A7C 8C2AE050 */ lw $t2, %lo(jpt_800EE050)($at) -/* 051680 80050A80 01400008 */ jr $t2 -/* 051684 80050A84 00000000 */ nop -glabel L80050A88 -/* 051688 80050A88 8FA20054 */ lw $v0, 0x54($sp) -/* 05168C 80050A8C 240C00FF */ li $t4, 255 -/* 051690 80050A90 AFAC0018 */ sw $t4, 0x18($sp) -/* 051694 80050A94 00023400 */ sll $a2, $v0, 0x10 -/* 051698 80050A98 00065C03 */ sra $t3, $a2, 0x10 -/* 05169C 80050A9C 01603025 */ move $a2, $t3 -/* 0516A0 80050AA0 24040020 */ li $a0, 32 -/* 0516A4 80050AA4 24050012 */ li $a1, 18 -/* 0516A8 80050AA8 3207FFFF */ andi $a3, $s0, 0xffff -/* 0516AC 80050AAC AFB10010 */ sw $s1, 0x10($sp) -/* 0516B0 80050AB0 0C013009 */ jal func_8004C024 -/* 0516B4 80050AB4 AFB20014 */ sw $s2, 0x14($sp) -/* 0516B8 80050AB8 10000066 */ b .L80050C54 -/* 0516BC 80050ABC 8FBF0034 */ lw $ra, 0x34($sp) -glabel L80050AC0 -/* 0516C0 80050AC0 240D00FF */ li $t5, 255 -/* 0516C4 80050AC4 AFAD0018 */ sw $t5, 0x18($sp) -/* 0516C8 80050AC8 24040020 */ li $a0, 32 -/* 0516CC 80050ACC 24050012 */ li $a1, 18 -/* 0516D0 80050AD0 24060104 */ li $a2, 260 -/* 0516D4 80050AD4 3207FFFF */ andi $a3, $s0, 0xffff -/* 0516D8 80050AD8 AFB10010 */ sw $s1, 0x10($sp) -/* 0516DC 80050ADC 0C013009 */ jal func_8004C024 -/* 0516E0 80050AE0 AFB20014 */ sw $s2, 0x14($sp) -/* 0516E4 80050AE4 8FA20050 */ lw $v0, 0x50($sp) -/* 0516E8 80050AE8 240F00FF */ li $t7, 255 -/* 0516EC 80050AEC AFAF0018 */ sw $t7, 0x18($sp) -/* 0516F0 80050AF0 00023400 */ sll $a2, $v0, 0x10 -/* 0516F4 80050AF4 00067403 */ sra $t6, $a2, 0x10 -/* 0516F8 80050AF8 01C03025 */ move $a2, $t6 -/* 0516FC 80050AFC 24040124 */ li $a0, 292 -/* 051700 80050B00 24050012 */ li $a1, 18 -/* 051704 80050B04 3207FFFF */ andi $a3, $s0, 0xffff -/* 051708 80050B08 AFB10010 */ sw $s1, 0x10($sp) -/* 05170C 80050B0C 0C013052 */ jal func_8004C148 -/* 051710 80050B10 AFB20014 */ sw $s2, 0x14($sp) -/* 051714 80050B14 1000004F */ b .L80050C54 -/* 051718 80050B18 8FBF0034 */ lw $ra, 0x34($sp) -glabel L80050B1C -/* 05171C 80050B1C 241800FF */ li $t8, 255 -/* 051720 80050B20 AFB80018 */ sw $t8, 0x18($sp) -/* 051724 80050B24 24040020 */ li $a0, 32 -/* 051728 80050B28 24050012 */ li $a1, 18 -/* 05172C 80050B2C 24060104 */ li $a2, 260 -/* 051730 80050B30 3207FFFF */ andi $a3, $s0, 0xffff -/* 051734 80050B34 AFB10010 */ sw $s1, 0x10($sp) -/* 051738 80050B38 0C013009 */ jal func_8004C024 -/* 05173C 80050B3C AFB20014 */ sw $s2, 0x14($sp) -/* 051740 80050B40 241900FF */ li $t9, 255 -/* 051744 80050B44 AFB90018 */ sw $t9, 0x18($sp) -/* 051748 80050B48 24040124 */ li $a0, 292 -/* 05174C 80050B4C 24050012 */ li $a1, 18 -/* 051750 80050B50 240600CC */ li $a2, 204 -/* 051754 80050B54 3207FFFF */ andi $a3, $s0, 0xffff -/* 051758 80050B58 AFB10010 */ sw $s1, 0x10($sp) -/* 05175C 80050B5C 0C013052 */ jal func_8004C148 -/* 051760 80050B60 AFB20014 */ sw $s2, 0x14($sp) -/* 051764 80050B64 8FA20054 */ lw $v0, 0x54($sp) -/* 051768 80050B68 240A0104 */ li $t2, 260 -/* 05176C 80050B6C 240D00FF */ li $t5, 255 -/* 051770 80050B70 01423023 */ subu $a2, $t2, $v0 -/* 051774 80050B74 24440020 */ addiu $a0, $v0, 0x20 -/* 051778 80050B78 00044400 */ sll $t0, $a0, 0x10 -/* 05177C 80050B7C 00065C00 */ sll $t3, $a2, 0x10 -/* 051780 80050B80 000B3403 */ sra $a2, $t3, 0x10 -/* 051784 80050B84 00082403 */ sra $a0, $t0, 0x10 -/* 051788 80050B88 AFAD0018 */ sw $t5, 0x18($sp) -/* 05178C 80050B8C 240500DE */ li $a1, 222 -/* 051790 80050B90 3207FFFF */ andi $a3, $s0, 0xffff -/* 051794 80050B94 AFB10010 */ sw $s1, 0x10($sp) -/* 051798 80050B98 0C013009 */ jal func_8004C024 -/* 05179C 80050B9C AFB20014 */ sw $s2, 0x14($sp) -/* 0517A0 80050BA0 1000002C */ b .L80050C54 -/* 0517A4 80050BA4 8FBF0034 */ lw $ra, 0x34($sp) -glabel L80050BA8 -/* 0517A8 80050BA8 240E00FF */ li $t6, 255 -/* 0517AC 80050BAC AFAE0018 */ sw $t6, 0x18($sp) -/* 0517B0 80050BB0 24040020 */ li $a0, 32 -/* 0517B4 80050BB4 24050012 */ li $a1, 18 -/* 0517B8 80050BB8 24060104 */ li $a2, 260 -/* 0517BC 80050BBC 3207FFFF */ andi $a3, $s0, 0xffff -/* 0517C0 80050BC0 AFB10010 */ sw $s1, 0x10($sp) -/* 0517C4 80050BC4 0C013009 */ jal func_8004C024 -/* 0517C8 80050BC8 AFB20014 */ sw $s2, 0x14($sp) -/* 0517CC 80050BCC 240F00FF */ li $t7, 255 -/* 0517D0 80050BD0 AFAF0018 */ sw $t7, 0x18($sp) -/* 0517D4 80050BD4 24040124 */ li $a0, 292 -/* 0517D8 80050BD8 24050012 */ li $a1, 18 -/* 0517DC 80050BDC 240600CC */ li $a2, 204 -/* 0517E0 80050BE0 3207FFFF */ andi $a3, $s0, 0xffff -/* 0517E4 80050BE4 AFB10010 */ sw $s1, 0x10($sp) -/* 0517E8 80050BE8 0C013052 */ jal func_8004C148 -/* 0517EC 80050BEC AFB20014 */ sw $s2, 0x14($sp) -/* 0517F0 80050BF0 241800FF */ li $t8, 255 -/* 0517F4 80050BF4 AFB80018 */ sw $t8, 0x18($sp) -/* 0517F8 80050BF8 24040020 */ li $a0, 32 -/* 0517FC 80050BFC 240500DE */ li $a1, 222 -/* 051800 80050C00 24060104 */ li $a2, 260 -/* 051804 80050C04 3207FFFF */ andi $a3, $s0, 0xffff -/* 051808 80050C08 AFB10010 */ sw $s1, 0x10($sp) -/* 05180C 80050C0C 0C013009 */ jal func_8004C024 -/* 051810 80050C10 AFB20014 */ sw $s2, 0x14($sp) -/* 051814 80050C14 8FA20050 */ lw $v0, 0x50($sp) -/* 051818 80050C18 240900CC */ li $t1, 204 -/* 05181C 80050C1C 240C00FF */ li $t4, 255 -/* 051820 80050C20 01223023 */ subu $a2, $t1, $v0 -/* 051824 80050C24 24450012 */ addiu $a1, $v0, 0x12 -/* 051828 80050C28 0005CC00 */ sll $t9, $a1, 0x10 -/* 05182C 80050C2C 00065400 */ sll $t2, $a2, 0x10 -/* 051830 80050C30 000A3403 */ sra $a2, $t2, 0x10 -/* 051834 80050C34 00192C03 */ sra $a1, $t9, 0x10 -/* 051838 80050C38 AFAC0018 */ sw $t4, 0x18($sp) -/* 05183C 80050C3C 24040020 */ li $a0, 32 -/* 051840 80050C40 3207FFFF */ andi $a3, $s0, 0xffff -/* 051844 80050C44 AFB10010 */ sw $s1, 0x10($sp) -/* 051848 80050C48 0C013052 */ jal func_8004C148 -/* 05184C 80050C4C AFB20014 */ sw $s2, 0x14($sp) -.L80050C50: -glabel L80050C50 -/* 051850 80050C50 8FBF0034 */ lw $ra, 0x34($sp) -.L80050C54: -/* 051854 80050C54 8FB00028 */ lw $s0, 0x28($sp) -/* 051858 80050C58 8FB1002C */ lw $s1, 0x2c($sp) -/* 05185C 80050C5C 8FB20030 */ lw $s2, 0x30($sp) -/* 051860 80050C60 03E00008 */ jr $ra -/* 051864 80050C64 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/non_matchings/hud_renderer/func_800519D4.s b/asm/non_matchings/hud_renderer/func_800519D4.s deleted file mode 100644 index a7557d32a4..0000000000 --- a/asm/non_matchings/hud_renderer/func_800519D4.s +++ /dev/null @@ -1,61 +0,0 @@ -glabel func_800519D4 -/* 0525D4 800519D4 000470C0 */ sll $t6, $a0, 3 -/* 0525D8 800519D8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 0525DC 800519DC 01C47023 */ subu $t6, $t6, $a0 -/* 0525E0 800519E0 3C0F8016 */ lui $t7, %hi(gObjectList) # $t7, 0x8016 -/* 0525E4 800519E4 AFB00018 */ sw $s0, 0x18($sp) -/* 0525E8 800519E8 25EF5C18 */ addiu $t7, %lo(gObjectList) # addiu $t7, $t7, 0x5c18 -/* 0525EC 800519EC 000E7140 */ sll $t6, $t6, 5 -/* 0525F0 800519F0 01CF8021 */ addu $s0, $t6, $t7 -/* 0525F4 800519F4 8E180054 */ lw $t8, 0x54($s0) -/* 0525F8 800519F8 AFBF001C */ sw $ra, 0x1c($sp) -/* 0525FC 800519FC AFA50024 */ sw $a1, 0x24($sp) -/* 052600 80051A00 33190010 */ andi $t9, $t8, 0x10 -/* 052604 80051A04 13200028 */ beqz $t9, .L80051AA8 -/* 052608 80051A08 AFA60028 */ sw $a2, 0x28($sp) -/* 05260C 80051A0C 3C038019 */ lui $v1, %hi(D_8018D228) # $v1, 0x8019 -/* 052610 80051A10 2463D228 */ addiu $v1, %lo(D_8018D228) # addiu $v1, $v1, -0x2dd8 -/* 052614 80051A14 90680000 */ lbu $t0, ($v1) -/* 052618 80051A18 920200D5 */ lbu $v0, 0xd5($s0) -/* 05261C 80051A1C 51020007 */ beql $t0, $v0, .L80051A3C -/* 052620 80051A20 240400FF */ li $a0, 255 -/* 052624 80051A24 A0620000 */ sb $v0, ($v1) -/* 052628 80051A28 8E040064 */ lw $a0, 0x64($s0) -/* 05262C 80051A2C 920500D9 */ lbu $a1, 0xd9($s0) -/* 052630 80051A30 0C011368 */ jal func_80044DA0 -/* 052634 80051A34 920600DA */ lbu $a2, 0xda($s0) -/* 052638 80051A38 240400FF */ li $a0, 255 -.L80051A3C: -/* 05263C 80051A3C 240500FF */ li $a1, 255 -/* 052640 80051A40 240600FF */ li $a2, 255 -/* 052644 80051A44 0C012C4E */ jal func_8004B138 -/* 052648 80051A48 860700A0 */ lh $a3, 0xa0($s0) -/* 05264C 80051A4C 87A40026 */ lh $a0, 0x26($sp) -/* 052650 80051A50 87A5002A */ lh $a1, 0x2a($sp) -/* 052654 80051A54 00003025 */ move $a2, $zero -/* 052658 80051A58 0C0108CC */ jal func_80042330 -/* 05265C 80051A5C 8E070000 */ lw $a3, ($s0) -/* 052660 80051A60 3C058015 */ lui $a1, %hi(gDisplayListHead) # $a1, 0x8015 -/* 052664 80051A64 24A50298 */ addiu $a1, %lo(gDisplayListHead) # addiu $a1, $a1, 0x298 -/* 052668 80051A68 8CA20000 */ lw $v0, ($a1) -/* 05266C 80051A6C 3C0A0400 */ lui $t2, (0x0400103F >> 16) # lui $t2, 0x400 -/* 052670 80051A70 354A103F */ ori $t2, (0x0400103F & 0xFFFF) # ori $t2, $t2, 0x103f -/* 052674 80051A74 24490008 */ addiu $t1, $v0, 8 -/* 052678 80051A78 ACA90000 */ sw $t1, ($a1) -/* 05267C 80051A7C AC4A0000 */ sw $t2, ($v0) -/* 052680 80051A80 8E0B0074 */ lw $t3, 0x74($s0) -/* 052684 80051A84 3C0E0D00 */ lui $t6, %hi(common_rectangle_display) # $t6, 0xd00 -/* 052688 80051A88 25CE6940 */ addiu $t6, %lo(common_rectangle_display) # addiu $t6, $t6, 0x6940 -/* 05268C 80051A8C AC4B0004 */ sw $t3, 4($v0) -/* 052690 80051A90 8CA20000 */ lw $v0, ($a1) -/* 052694 80051A94 3C0D0600 */ lui $t5, 0x600 -/* 052698 80051A98 244C0008 */ addiu $t4, $v0, 8 -/* 05269C 80051A9C ACAC0000 */ sw $t4, ($a1) -/* 0526A0 80051AA0 AC4E0004 */ sw $t6, 4($v0) -/* 0526A4 80051AA4 AC4D0000 */ sw $t5, ($v0) -.L80051AA8: -/* 0526A8 80051AA8 8FBF001C */ lw $ra, 0x1c($sp) -/* 0526AC 80051AAC 8FB00018 */ lw $s0, 0x18($sp) -/* 0526B0 80051AB0 27BD0020 */ addiu $sp, $sp, 0x20 -/* 0526B4 80051AB4 03E00008 */ jr $ra -/* 0526B8 80051AB8 00000000 */ nop diff --git a/asm/non_matchings/hud_renderer/func_80051ABC.s b/asm/non_matchings/hud_renderer/func_80051ABC.s deleted file mode 100644 index ef0bba0d84..0000000000 --- a/asm/non_matchings/hud_renderer/func_80051ABC.s +++ /dev/null @@ -1,111 +0,0 @@ -glabel func_80051ABC -/* 0526BC 80051ABC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 0526C0 80051AC0 3C068015 */ lui $a2, %hi(gDisplayListHead) # $a2, 0x8015 -/* 0526C4 80051AC4 240F00FF */ li $t7, 255 -/* 0526C8 80051AC8 3C018019 */ lui $at, %hi(D_8018D228) # $at, 0x8019 -/* 0526CC 80051ACC 24C60298 */ addiu $a2, %lo(gDisplayListHead) # addiu $a2, $a2, 0x298 -/* 0526D0 80051AD0 A02FD228 */ sb $t7, %lo(D_8018D228)($at) -/* 0526D4 80051AD4 8CC30000 */ lw $v1, ($a2) -/* 0526D8 80051AD8 AFBF002C */ sw $ra, 0x2c($sp) -/* 0526DC 80051ADC AFB50028 */ sw $s5, 0x28($sp) -/* 0526E0 80051AE0 24780008 */ addiu $t8, $v1, 8 -/* 0526E4 80051AE4 AFB40024 */ sw $s4, 0x24($sp) -/* 0526E8 80051AE8 AFB30020 */ sw $s3, 0x20($sp) -/* 0526EC 80051AEC AFB2001C */ sw $s2, 0x1c($sp) -/* 0526F0 80051AF0 AFB10018 */ sw $s1, 0x18($sp) -/* 0526F4 80051AF4 AFB00014 */ sw $s0, 0x14($sp) -/* 0526F8 80051AF8 AFA40030 */ sw $a0, 0x30($sp) -/* 0526FC 80051AFC ACD80000 */ sw $t8, ($a2) -/* 052700 80051B00 3C080D00 */ lui $t0, %hi(D_0D007A60) # $t0, 0xd00 -/* 052704 80051B04 25087A60 */ addiu $t0, %lo(D_0D007A60) # addiu $t0, $t0, 0x7a60 -/* 052708 80051B08 3C190600 */ lui $t9, 0x600 -/* 05270C 80051B0C 3C098019 */ lui $t1, %hi(D_8018D230) # $t1, 0x8019 -/* 052710 80051B10 AC790000 */ sw $t9, ($v1) -/* 052714 80051B14 AC680004 */ sw $t0, 4($v1) -/* 052718 80051B18 9129D230 */ lbu $t1, %lo(D_8018D230)($t1) -/* 05271C 80051B1C 0004AC00 */ sll $s5, $a0, 0x10 -/* 052720 80051B20 00157403 */ sra $t6, $s5, 0x10 -/* 052724 80051B24 01C0A825 */ move $s5, $t6 -/* 052728 80051B28 11200024 */ beqz $t1, .L80051BBC -/* 05272C 80051B2C 00A09025 */ move $s2, $a1 -/* 052730 80051B30 240400FF */ li $a0, 255 -/* 052734 80051B34 240500FF */ li $a1, 255 -/* 052738 80051B38 240600FF */ li $a2, 255 -/* 05273C 80051B3C 0C012D05 */ jal func_8004B414 -/* 052740 80051B40 240700FF */ li $a3, 255 -/* 052744 80051B44 3C148019 */ lui $s4, %hi(D_8018D1F0) # $s4, 0x8019 -/* 052748 80051B48 2694D1F0 */ addiu $s4, %lo(D_8018D1F0) # addiu $s4, $s4, -0x2e10 -/* 05274C 80051B4C 8E8A0000 */ lw $t2, ($s4) -/* 052750 80051B50 00008025 */ move $s0, $zero -/* 052754 80051B54 00125880 */ sll $t3, $s2, 2 -/* 052758 80051B58 19400038 */ blez $t2, .L80051C3C -/* 05275C 80051B5C 3C0C8019 */ lui $t4, %hi(D_8018CC80) # $t4, 0x8019 -/* 052760 80051B60 258CCC80 */ addiu $t4, %lo(D_8018CC80) # addiu $t4, $t4, -0x3380 -/* 052764 80051B64 3C128016 */ lui $s2, %hi(gObjectList) # $s2, 0x8016 -/* 052768 80051B68 26525C18 */ addiu $s2, %lo(gObjectList) # addiu $s2, $s2, 0x5c18 -/* 05276C 80051B6C 016C8821 */ addu $s1, $t3, $t4 -/* 052770 80051B70 241300E0 */ li $s3, 224 -/* 052774 80051B74 8E240000 */ lw $a0, ($s1) -.L80051B78: -/* 052778 80051B78 00930019 */ multu $a0, $s3 -/* 05277C 80051B7C 00006812 */ mflo $t5 -/* 052780 80051B80 024D1021 */ addu $v0, $s2, $t5 -/* 052784 80051B84 844E009E */ lh $t6, 0x9e($v0) -/* 052788 80051B88 8445009C */ lh $a1, 0x9c($v0) -/* 05278C 80051B8C 02AE3023 */ subu $a2, $s5, $t6 -/* 052790 80051B90 00067C00 */ sll $t7, $a2, 0x10 -/* 052794 80051B94 0C014675 */ jal func_800519D4 -/* 052798 80051B98 000F3403 */ sra $a2, $t7, 0x10 -/* 05279C 80051B9C 8E990000 */ lw $t9, ($s4) -/* 0527A0 80051BA0 26100001 */ addiu $s0, $s0, 1 -/* 0527A4 80051BA4 26310004 */ addiu $s1, $s1, 4 -/* 0527A8 80051BA8 0219082A */ slt $at, $s0, $t9 -/* 0527AC 80051BAC 5420FFF2 */ bnel $at, $zero, .L80051B78 -/* 0527B0 80051BB0 8E240000 */ lw $a0, ($s1) -/* 0527B4 80051BB4 10000022 */ b .L80051C40 -/* 0527B8 80051BB8 8FBF002C */ lw $ra, 0x2c($sp) -.L80051BBC: -/* 0527BC 80051BBC 240400FF */ li $a0, 255 -/* 0527C0 80051BC0 240500FF */ li $a1, 255 -/* 0527C4 80051BC4 0C012DB1 */ jal func_8004B6C4 -/* 0527C8 80051BC8 240600FF */ li $a2, 255 -/* 0527CC 80051BCC 3C148019 */ lui $s4, %hi(D_8018D1F0) # $s4, 0x8019 -/* 0527D0 80051BD0 2694D1F0 */ addiu $s4, %lo(D_8018D1F0) # addiu $s4, $s4, -0x2e10 -/* 0527D4 80051BD4 8E880000 */ lw $t0, ($s4) -/* 0527D8 80051BD8 00008025 */ move $s0, $zero -/* 0527DC 80051BDC 00124880 */ sll $t1, $s2, 2 -/* 0527E0 80051BE0 19000016 */ blez $t0, .L80051C3C -/* 0527E4 80051BE4 3C0A8019 */ lui $t2, %hi(D_8018CC80) # $t2, 0x8019 -/* 0527E8 80051BE8 254ACC80 */ addiu $t2, %lo(D_8018CC80) # addiu $t2, $t2, -0x3380 -/* 0527EC 80051BEC 3C128016 */ lui $s2, %hi(gObjectList) # $s2, 0x8016 -/* 0527F0 80051BF0 26525C18 */ addiu $s2, %lo(gObjectList) # addiu $s2, $s2, 0x5c18 -/* 0527F4 80051BF4 012A8821 */ addu $s1, $t1, $t2 -/* 0527F8 80051BF8 241300E0 */ li $s3, 224 -/* 0527FC 80051BFC 8E240000 */ lw $a0, ($s1) -.L80051C00: -/* 052800 80051C00 00930019 */ multu $a0, $s3 -/* 052804 80051C04 00005812 */ mflo $t3 -/* 052808 80051C08 024B1021 */ addu $v0, $s2, $t3 -/* 05280C 80051C0C 844C009E */ lh $t4, 0x9e($v0) -/* 052810 80051C10 8445009C */ lh $a1, 0x9c($v0) -/* 052814 80051C14 02AC3023 */ subu $a2, $s5, $t4 -/* 052818 80051C18 00066C00 */ sll $t5, $a2, 0x10 -/* 05281C 80051C1C 0C01463E */ jal func_800518F8 -/* 052820 80051C20 000D3403 */ sra $a2, $t5, 0x10 -/* 052824 80051C24 8E8F0000 */ lw $t7, ($s4) -/* 052828 80051C28 26100001 */ addiu $s0, $s0, 1 -/* 05282C 80051C2C 26310004 */ addiu $s1, $s1, 4 -/* 052830 80051C30 020F082A */ slt $at, $s0, $t7 -/* 052834 80051C34 5420FFF2 */ bnel $at, $zero, .L80051C00 -/* 052838 80051C38 8E240000 */ lw $a0, ($s1) -.L80051C3C: -/* 05283C 80051C3C 8FBF002C */ lw $ra, 0x2c($sp) -.L80051C40: -/* 052840 80051C40 8FB00014 */ lw $s0, 0x14($sp) -/* 052844 80051C44 8FB10018 */ lw $s1, 0x18($sp) -/* 052848 80051C48 8FB2001C */ lw $s2, 0x1c($sp) -/* 05284C 80051C4C 8FB30020 */ lw $s3, 0x20($sp) -/* 052850 80051C50 8FB40024 */ lw $s4, 0x24($sp) -/* 052854 80051C54 8FB50028 */ lw $s5, 0x28($sp) -/* 052858 80051C58 03E00008 */ jr $ra -/* 05285C 80051C5C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/non_matchings/hud_renderer/func_80051C60.s b/asm/non_matchings/hud_renderer/func_80051C60.s deleted file mode 100644 index 6356ab1deb..0000000000 --- a/asm/non_matchings/hud_renderer/func_80051C60.s +++ /dev/null @@ -1,165 +0,0 @@ -glabel func_80051C60 -/* 052860 80051C60 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 052864 80051C64 3C188016 */ lui $t8, %hi(D_801658FE) # $t8, 0x8016 -/* 052868 80051C68 831858FE */ lb $t8, %lo(D_801658FE)($t8) -/* 05286C 80051C6C 00047400 */ sll $t6, $a0, 0x10 -/* 052870 80051C70 000E7C03 */ sra $t7, $t6, 0x10 -/* 052874 80051C74 AFB2001C */ sw $s2, 0x1c($sp) -/* 052878 80051C78 AFA40030 */ sw $a0, 0x30($sp) -/* 05287C 80051C7C 01E02025 */ move $a0, $t7 -/* 052880 80051C80 00A09025 */ move $s2, $a1 -/* 052884 80051C84 AFBF002C */ sw $ra, 0x2c($sp) -/* 052888 80051C88 AFB50028 */ sw $s5, 0x28($sp) -/* 05288C 80051C8C AFB40024 */ sw $s4, 0x24($sp) -/* 052890 80051C90 AFB30020 */ sw $s3, 0x20($sp) -/* 052894 80051C94 AFB10018 */ sw $s1, 0x18($sp) -/* 052898 80051C98 17000019 */ bnez $t8, .L80051D00 -/* 05289C 80051C9C AFB00014 */ sw $s0, 0x14($sp) -/* 0528A0 80051CA0 3C02800E */ lui $v0, %hi(gCurrentCourseId) # $v0, 0x800e -/* 0528A4 80051CA4 8442C5A0 */ lh $v0, %lo(gCurrentCourseId)($v0) -/* 0528A8 80051CA8 24010006 */ li $at, 6 -/* 0528AC 80051CAC 000FAC00 */ sll $s5, $t7, 0x10 -/* 0528B0 80051CB0 14410003 */ bne $v0, $at, .L80051CC0 -/* 0528B4 80051CB4 0015CC03 */ sra $t9, $s5, 0x10 -/* 0528B8 80051CB8 1000001C */ b .L80051D2C -/* 0528BC 80051CBC 0320A825 */ move $s5, $t9 -.L80051CC0: -/* 0528C0 80051CC0 24010009 */ li $at, 9 -/* 0528C4 80051CC4 14410004 */ bne $v0, $at, .L80051CD8 -/* 0528C8 80051CC8 2495FFF0 */ addiu $s5, $a0, -0x10 -/* 0528CC 80051CCC 00154400 */ sll $t0, $s5, 0x10 -/* 0528D0 80051CD0 10000016 */ b .L80051D2C -/* 0528D4 80051CD4 0008AC03 */ sra $s5, $t0, 0x10 -.L80051CD8: -/* 0528D8 80051CD8 24010004 */ li $at, 4 -/* 0528DC 80051CDC 14410005 */ bne $v0, $at, .L80051CF4 -/* 0528E0 80051CE0 24950010 */ addiu $s5, $a0, 0x10 -/* 0528E4 80051CE4 2495FFF0 */ addiu $s5, $a0, -0x10 -/* 0528E8 80051CE8 00155400 */ sll $t2, $s5, 0x10 -/* 0528EC 80051CEC 1000000F */ b .L80051D2C -/* 0528F0 80051CF0 000AAC03 */ sra $s5, $t2, 0x10 -.L80051CF4: -/* 0528F4 80051CF4 00156400 */ sll $t4, $s5, 0x10 -/* 0528F8 80051CF8 1000000C */ b .L80051D2C -/* 0528FC 80051CFC 000CAC03 */ sra $s5, $t4, 0x10 -.L80051D00: -/* 052900 80051D00 3C0E800E */ lui $t6, %hi(gCurrentCourseId) # $t6, 0x800e -/* 052904 80051D04 85CEC5A0 */ lh $t6, %lo(gCurrentCourseId)($t6) -/* 052908 80051D08 24010006 */ li $at, 6 -/* 05290C 80051D0C 24950020 */ addiu $s5, $a0, 0x20 -/* 052910 80051D10 15C10005 */ bne $t6, $at, .L80051D28 -/* 052914 80051D14 0015CC00 */ sll $t9, $s5, 0x10 -/* 052918 80051D18 0080A825 */ move $s5, $a0 -/* 05291C 80051D1C 00157C40 */ sll $t7, $s5, 0x11 -/* 052920 80051D20 10000002 */ b .L80051D2C -/* 052924 80051D24 000FAC03 */ sra $s5, $t7, 0x10 -.L80051D28: -/* 052928 80051D28 0019AC03 */ sra $s5, $t9, 0x10 -.L80051D2C: -/* 05292C 80051D2C 3C048015 */ lui $a0, %hi(gDisplayListHead) # $a0, 0x8015 -/* 052930 80051D30 240900FF */ li $t1, 255 -/* 052934 80051D34 3C018019 */ lui $at, %hi(D_8018D228) # $at, 0x8019 -/* 052938 80051D38 24840298 */ addiu $a0, %lo(gDisplayListHead) # addiu $a0, $a0, 0x298 -/* 05293C 80051D3C A029D228 */ sb $t1, %lo(D_8018D228)($at) -/* 052940 80051D40 8C830000 */ lw $v1, ($a0) -/* 052944 80051D44 3C0C0D00 */ lui $t4, %hi(D_0D007A60) # $t4, 0xd00 -/* 052948 80051D48 258C7A60 */ addiu $t4, %lo(D_0D007A60) # addiu $t4, $t4, 0x7a60 -/* 05294C 80051D4C 246A0008 */ addiu $t2, $v1, 8 -/* 052950 80051D50 AC8A0000 */ sw $t2, ($a0) -/* 052954 80051D54 3C0B0600 */ lui $t3, 0x600 -/* 052958 80051D58 3C0D8019 */ lui $t5, %hi(D_8018D230) # $t5, 0x8019 -/* 05295C 80051D5C AC6B0000 */ sw $t3, ($v1) -/* 052960 80051D60 AC6C0004 */ sw $t4, 4($v1) -/* 052964 80051D64 91ADD230 */ lbu $t5, %lo(D_8018D230)($t5) -/* 052968 80051D68 240600FF */ li $a2, 255 -/* 05296C 80051D6C 240400FF */ li $a0, 255 -/* 052970 80051D70 11A00027 */ beqz $t5, .L80051E10 -/* 052974 80051D74 240500FF */ li $a1, 255 -/* 052978 80051D78 240400FF */ li $a0, 255 -/* 05297C 80051D7C 240500FF */ li $a1, 255 -/* 052980 80051D80 0C012D05 */ jal func_8004B414 -/* 052984 80051D84 240700FF */ li $a3, 255 -/* 052988 80051D88 3C148019 */ lui $s4, %hi(D_8018D1F0) # $s4, 0x8019 -/* 05298C 80051D8C 2694D1F0 */ addiu $s4, %lo(D_8018D1F0) # addiu $s4, $s4, -0x2e10 -/* 052990 80051D90 8E8E0000 */ lw $t6, ($s4) -/* 052994 80051D94 00008025 */ move $s0, $zero -/* 052998 80051D98 00127880 */ sll $t7, $s2, 2 -/* 05299C 80051D9C 19C0003E */ blez $t6, .L80051E98 -/* 0529A0 80051DA0 3C188019 */ lui $t8, %hi(D_8018CC80) # $t8, 0x8019 -/* 0529A4 80051DA4 2718CC80 */ addiu $t8, %lo(D_8018CC80) # addiu $t8, $t8, -0x3380 -/* 0529A8 80051DA8 3C128016 */ lui $s2, %hi(gObjectList) # $s2, 0x8016 -/* 0529AC 80051DAC 26525C18 */ addiu $s2, %lo(gObjectList) # addiu $s2, $s2, 0x5c18 -/* 0529B0 80051DB0 01F88821 */ addu $s1, $t7, $t8 -/* 0529B4 80051DB4 241300E0 */ li $s3, 224 -/* 0529B8 80051DB8 8E240000 */ lw $a0, ($s1) -.L80051DBC: -/* 0529BC 80051DBC 00930019 */ multu $a0, $s3 -/* 0529C0 80051DC0 0000C812 */ mflo $t9 -/* 0529C4 80051DC4 02591021 */ addu $v0, $s2, $t9 -/* 0529C8 80051DC8 8448009E */ lh $t0, 0x9e($v0) -/* 0529CC 80051DCC 8445009C */ lh $a1, 0x9c($v0) -/* 0529D0 80051DD0 02A83023 */ subu $a2, $s5, $t0 -/* 0529D4 80051DD4 04C10003 */ bgez $a2, .L80051DE4 -/* 0529D8 80051DD8 00064843 */ sra $t1, $a2, 1 -/* 0529DC 80051DDC 24C10001 */ addiu $at, $a2, 1 -/* 0529E0 80051DE0 00014843 */ sra $t1, $at, 1 -.L80051DE4: -/* 0529E4 80051DE4 00095400 */ sll $t2, $t1, 0x10 -/* 0529E8 80051DE8 0C014675 */ jal func_800519D4 -/* 0529EC 80051DEC 000A3403 */ sra $a2, $t2, 0x10 -/* 0529F0 80051DF0 8E8C0000 */ lw $t4, ($s4) -/* 0529F4 80051DF4 26100001 */ addiu $s0, $s0, 1 -/* 0529F8 80051DF8 26310004 */ addiu $s1, $s1, 4 -/* 0529FC 80051DFC 020C082A */ slt $at, $s0, $t4 -/* 052A00 80051E00 5420FFEE */ bnel $at, $zero, .L80051DBC -/* 052A04 80051E04 8E240000 */ lw $a0, ($s1) -/* 052A08 80051E08 10000024 */ b .L80051E9C -/* 052A0C 80051E0C 8FBF002C */ lw $ra, 0x2c($sp) -.L80051E10: -/* 052A10 80051E10 0C012DB1 */ jal func_8004B6C4 -/* 052A14 80051E14 240600FF */ li $a2, 255 -/* 052A18 80051E18 3C148019 */ lui $s4, %hi(D_8018D1F0) # $s4, 0x8019 -/* 052A1C 80051E1C 2694D1F0 */ addiu $s4, %lo(D_8018D1F0) # addiu $s4, $s4, -0x2e10 -/* 052A20 80051E20 8E8D0000 */ lw $t5, ($s4) -/* 052A24 80051E24 00008025 */ move $s0, $zero -/* 052A28 80051E28 00127080 */ sll $t6, $s2, 2 -/* 052A2C 80051E2C 19A0001A */ blez $t5, .L80051E98 -/* 052A30 80051E30 3C0F8019 */ lui $t7, %hi(D_8018CC80) # $t7, 0x8019 -/* 052A34 80051E34 25EFCC80 */ addiu $t7, %lo(D_8018CC80) # addiu $t7, $t7, -0x3380 -/* 052A38 80051E38 3C128016 */ lui $s2, %hi(gObjectList) # $s2, 0x8016 -/* 052A3C 80051E3C 26525C18 */ addiu $s2, %lo(gObjectList) # addiu $s2, $s2, 0x5c18 -/* 052A40 80051E40 01CF8821 */ addu $s1, $t6, $t7 -/* 052A44 80051E44 241300E0 */ li $s3, 224 -/* 052A48 80051E48 8E240000 */ lw $a0, ($s1) -.L80051E4C: -/* 052A4C 80051E4C 00930019 */ multu $a0, $s3 -/* 052A50 80051E50 0000C012 */ mflo $t8 -/* 052A54 80051E54 02581021 */ addu $v0, $s2, $t8 -/* 052A58 80051E58 8459009E */ lh $t9, 0x9e($v0) -/* 052A5C 80051E5C 8445009C */ lh $a1, 0x9c($v0) -/* 052A60 80051E60 02B93023 */ subu $a2, $s5, $t9 -/* 052A64 80051E64 04C10003 */ bgez $a2, .L80051E74 -/* 052A68 80051E68 00064043 */ sra $t0, $a2, 1 -/* 052A6C 80051E6C 24C10001 */ addiu $at, $a2, 1 -/* 052A70 80051E70 00014043 */ sra $t0, $at, 1 -.L80051E74: -/* 052A74 80051E74 00084C00 */ sll $t1, $t0, 0x10 -/* 052A78 80051E78 0C01463E */ jal func_800518F8 -/* 052A7C 80051E7C 00093403 */ sra $a2, $t1, 0x10 -/* 052A80 80051E80 8E8B0000 */ lw $t3, ($s4) -/* 052A84 80051E84 26100001 */ addiu $s0, $s0, 1 -/* 052A88 80051E88 26310004 */ addiu $s1, $s1, 4 -/* 052A8C 80051E8C 020B082A */ slt $at, $s0, $t3 -/* 052A90 80051E90 5420FFEE */ bnel $at, $zero, .L80051E4C -/* 052A94 80051E94 8E240000 */ lw $a0, ($s1) -.L80051E98: -/* 052A98 80051E98 8FBF002C */ lw $ra, 0x2c($sp) -.L80051E9C: -/* 052A9C 80051E9C 8FB00014 */ lw $s0, 0x14($sp) -/* 052AA0 80051EA0 8FB10018 */ lw $s1, 0x18($sp) -/* 052AA4 80051EA4 8FB2001C */ lw $s2, 0x1c($sp) -/* 052AA8 80051EA8 8FB30020 */ lw $s3, 0x20($sp) -/* 052AAC 80051EAC 8FB40024 */ lw $s4, 0x24($sp) -/* 052AB0 80051EB0 8FB50028 */ lw $s5, 0x28($sp) -/* 052AB4 80051EB4 03E00008 */ jr $ra -/* 052AB8 80051EB8 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/non_matchings/hud_renderer/func_800520C0.s b/asm/non_matchings/hud_renderer/func_800520C0.s deleted file mode 100644 index d423319d93..0000000000 --- a/asm/non_matchings/hud_renderer/func_800520C0.s +++ /dev/null @@ -1,49 +0,0 @@ -glabel func_800520C0 -/* 052CC0 800520C0 000470C0 */ sll $t6, $a0, 3 -/* 052CC4 800520C4 01C47023 */ subu $t6, $t6, $a0 -/* 052CC8 800520C8 000E7140 */ sll $t6, $t6, 5 -/* 052CCC 800520CC 3C0F8016 */ lui $t7, %hi(D_80165CED) -/* 052CD0 800520D0 01EE7821 */ addu $t7, $t7, $t6 -/* 052CD4 800520D4 91EF5CED */ lbu $t7, %lo(D_80165CED)($t7) -/* 052CD8 800520D8 3C03800E */ lui $v1, %hi(D_800E45C0) # $v1, 0x800e -/* 052CDC 800520DC 246345C0 */ addiu $v1, %lo(D_800E45C0) # addiu $v1, $v1, 0x45c0 -/* 052CE0 800520E0 15E00014 */ bnez $t7, .L80052134 -/* 052CE4 800520E4 24190063 */ li $t9, 99 -/* 052CE8 800520E8 3C03800E */ lui $v1, %hi(D_800E45C0) # $v1, 0x800e -/* 052CEC 800520EC 246345C0 */ addiu $v1, %lo(D_800E45C0) # addiu $v1, $v1, 0x45c0 -/* 052CF0 800520F0 A0600058 */ sb $zero, 0x58($v1) -/* 052CF4 800520F4 80620058 */ lb $v0, 0x58($v1) -/* 052CF8 800520F8 2418FF88 */ li $t8, -120 -/* 052CFC 800520FC A0780059 */ sb $t8, 0x59($v1) -/* 052D00 80052100 A0620040 */ sb $v0, 0x40($v1) -/* 052D04 80052104 A0620028 */ sb $v0, 0x28($v1) -/* 052D08 80052108 A0620010 */ sb $v0, 0x10($v1) -/* 052D0C 8005210C 80620059 */ lb $v0, 0x59($v1) -/* 052D10 80052110 A060005A */ sb $zero, 0x5a($v1) -/* 052D14 80052114 A0620041 */ sb $v0, 0x41($v1) -/* 052D18 80052118 A0620029 */ sb $v0, 0x29($v1) -/* 052D1C 8005211C A0620011 */ sb $v0, 0x11($v1) -/* 052D20 80052120 8062005A */ lb $v0, 0x5a($v1) -/* 052D24 80052124 A0620042 */ sb $v0, 0x42($v1) -/* 052D28 80052128 A062002A */ sb $v0, 0x2a($v1) -/* 052D2C 8005212C 03E00008 */ jr $ra -/* 052D30 80052130 A0620012 */ sb $v0, 0x12($v1) -.L80052134: -/* 052D34 80052134 A0790058 */ sb $t9, 0x58($v1) -/* 052D38 80052138 80620058 */ lb $v0, 0x58($v1) -/* 052D3C 8005213C 24080042 */ li $t0, 66 -/* 052D40 80052140 A0680059 */ sb $t0, 0x59($v1) -/* 052D44 80052144 A0620040 */ sb $v0, 0x40($v1) -/* 052D48 80052148 A0620028 */ sb $v0, 0x28($v1) -/* 052D4C 8005214C A0620010 */ sb $v0, 0x10($v1) -/* 052D50 80052150 80620059 */ lb $v0, 0x59($v1) -/* 052D54 80052154 A060005A */ sb $zero, 0x5a($v1) -/* 052D58 80052158 A0620041 */ sb $v0, 0x41($v1) -/* 052D5C 8005215C A0620029 */ sb $v0, 0x29($v1) -/* 052D60 80052160 A0620011 */ sb $v0, 0x11($v1) -/* 052D64 80052164 8062005A */ lb $v0, 0x5a($v1) -/* 052D68 80052168 A0620042 */ sb $v0, 0x42($v1) -/* 052D6C 8005216C A062002A */ sb $v0, 0x2a($v1) -/* 052D70 80052170 A0620012 */ sb $v0, 0x12($v1) -/* 052D74 80052174 03E00008 */ jr $ra -/* 052D78 80052178 00000000 */ nop diff --git a/asm/non_matchings/hud_renderer/func_8005217C.s b/asm/non_matchings/hud_renderer/func_8005217C.s deleted file mode 100644 index ab76311b95..0000000000 --- a/asm/non_matchings/hud_renderer/func_8005217C.s +++ /dev/null @@ -1,145 +0,0 @@ -glabel func_8005217C -/* 052D7C 8005217C 3C078018 */ lui $a3, %hi(D_80183F28) # $a3, 0x8018 -/* 052D80 80052180 8CE73F28 */ lw $a3, %lo(D_80183F28)($a3) -/* 052D84 80052184 3C0F8016 */ lui $t7, %hi(gObjectList) # $t7, 0x8016 -/* 052D88 80052188 25EF5C18 */ addiu $t7, %lo(gObjectList) # addiu $t7, $t7, 0x5c18 -/* 052D8C 8005218C 000770C0 */ sll $t6, $a3, 3 -/* 052D90 80052190 01C77023 */ subu $t6, $t6, $a3 -/* 052D94 80052194 000E7140 */ sll $t6, $t6, 5 -/* 052D98 80052198 01CF1821 */ addu $v1, $t6, $t7 -/* 052D9C 8005219C 847800A6 */ lh $t8, 0xa6($v1) -/* 052DA0 800521A0 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* 052DA4 800521A4 AFBF0014 */ sw $ra, 0x14($sp) -/* 052DA8 800521A8 2B010002 */ slti $at, $t8, 2 -/* 052DAC 800521AC 1420007E */ bnez $at, .L800523A8 -/* 052DB0 800521B0 AFA40058 */ sw $a0, 0x58($sp) -/* 052DB4 800521B4 00E02025 */ move $a0, $a3 -/* 052DB8 800521B8 24050010 */ li $a1, 16 -/* 052DBC 800521BC AFA30018 */ sw $v1, 0x18($sp) -/* 052DC0 800521C0 0C01C88F */ jal is_obj_index_flag_unk_054_active -/* 052DC4 800521C4 AFA70050 */ sw $a3, 0x50($sp) -/* 052DC8 800521C8 8FA30018 */ lw $v1, 0x18($sp) -/* 052DCC 800521CC 10400076 */ beqz $v0, .L800523A8 -/* 052DD0 800521D0 8FA70050 */ lw $a3, 0x50($sp) -/* 052DD4 800521D4 24640004 */ addiu $a0, $v1, 4 -/* 052DD8 800521D8 246500BE */ addiu $a1, $v1, 0xbe -/* 052DDC 800521DC 8C660000 */ lw $a2, ($v1) -/* 052DE0 800521E0 0C010B80 */ jal rsp_set_matrix_transformation -/* 052DE4 800521E4 AFA70050 */ sw $a3, 0x50($sp) -/* 052DE8 800521E8 0C014830 */ jal func_800520C0 -/* 052DEC 800521EC 8FA40050 */ lw $a0, 0x50($sp) -/* 052DF0 800521F0 3C038015 */ lui $v1, %hi(gDisplayListHead) # $v1, 0x8015 -/* 052DF4 800521F4 24630298 */ addiu $v1, %lo(gDisplayListHead) # addiu $v1, $v1, 0x298 -/* 052DF8 800521F8 8C620000 */ lw $v0, ($v1) -/* 052DFC 800521FC 3C0E0D00 */ lui $t6, %hi(D_0D007828) # $t6, 0xd00 -/* 052E00 80052200 3C1F0600 */ lui $ra, 0x600 -/* 052E04 80052204 24590008 */ addiu $t9, $v0, 8 -/* 052E08 80052208 AC790000 */ sw $t9, ($v1) -/* 052E0C 8005220C 25CE7828 */ addiu $t6, %lo(D_0D007828) # addiu $t6, $t6, 0x7828 -/* 052E10 80052210 AC4E0004 */ sw $t6, 4($v0) -/* 052E14 80052214 AC5F0000 */ sw $ra, ($v0) -/* 052E18 80052218 8C620000 */ lw $v0, ($v1) -/* 052E1C 8005221C 3C19800E */ lui $t9, %hi(D_800E45C0 + 0x8) # $t9, 0x800e -/* 052E20 80052220 3C180386 */ lui $t8, (0x03860010 >> 16) # lui $t8, 0x386 -/* 052E24 80052224 244F0008 */ addiu $t7, $v0, 8 -/* 052E28 80052228 AC6F0000 */ sw $t7, ($v1) -/* 052E2C 8005222C 37180010 */ ori $t8, (0x03860010 & 0xFFFF) # ori $t8, $t8, 0x10 -/* 052E30 80052230 273945C8 */ addiu $t9, %lo(D_800E45C0 + 0x8) # addiu $t9, $t9, 0x45c8 -/* 052E34 80052234 AC590004 */ sw $t9, 4($v0) -/* 052E38 80052238 AC580000 */ sw $t8, ($v0) -/* 052E3C 8005223C 8C620000 */ lw $v0, ($v1) -/* 052E40 80052240 3C18800E */ lui $t8, %hi(D_800E45C0) # $t8, 0x800e -/* 052E44 80052244 3C0F0388 */ lui $t7, (0x03880010 >> 16) # lui $t7, 0x388 -/* 052E48 80052248 244E0008 */ addiu $t6, $v0, 8 -/* 052E4C 8005224C AC6E0000 */ sw $t6, ($v1) -/* 052E50 80052250 35EF0010 */ ori $t7, (0x03880010 & 0xFFFF) # ori $t7, $t7, 0x10 -/* 052E54 80052254 271845C0 */ addiu $t8, %lo(D_800E45C0) # addiu $t8, $t8, 0x45c0 -/* 052E58 80052258 AC580004 */ sw $t8, 4($v0) -/* 052E5C 8005225C AC4F0000 */ sw $t7, ($v0) -/* 052E60 80052260 8C620000 */ lw $v0, ($v1) -/* 052E64 80052264 3C0E0600 */ lui $t6, %hi(d_course_banshee_boardwalk_dl_7B38) # $t6, 0x600 -/* 052E68 80052268 25CE7B38 */ addiu $t6, %lo(d_course_banshee_boardwalk_dl_7B38) # addiu $t6, $t6, 0x7b38 -/* 052E6C 8005226C 24590008 */ addiu $t9, $v0, 8 -/* 052E70 80052270 AC790000 */ sw $t9, ($v1) -/* 052E74 80052274 AC4E0004 */ sw $t6, 4($v0) -/* 052E78 80052278 AC5F0000 */ sw $ra, ($v0) -/* 052E7C 8005227C 8C620000 */ lw $v0, ($v1) -/* 052E80 80052280 3C19800E */ lui $t9, %hi(D_800E45D8 + 0x8) # $t9, 0x800e -/* 052E84 80052284 3C180386 */ lui $t8, (0x03860010 >> 16) # lui $t8, 0x386 -/* 052E88 80052288 244F0008 */ addiu $t7, $v0, 8 -/* 052E8C 8005228C AC6F0000 */ sw $t7, ($v1) -/* 052E90 80052290 37180010 */ ori $t8, (0x03860010 & 0xFFFF) # ori $t8, $t8, 0x10 -/* 052E94 80052294 273945E0 */ addiu $t9, %lo(D_800E45D8 + 0x8) # addiu $t9, $t9, 0x45e0 -/* 052E98 80052298 AC590004 */ sw $t9, 4($v0) -/* 052E9C 8005229C AC580000 */ sw $t8, ($v0) -/* 052EA0 800522A0 8C620000 */ lw $v0, ($v1) -/* 052EA4 800522A4 3C18800E */ lui $t8, %hi(D_800E45D8) # $t8, 0x800e -/* 052EA8 800522A8 3C0F0388 */ lui $t7, (0x03880010 >> 16) # lui $t7, 0x388 -/* 052EAC 800522AC 244E0008 */ addiu $t6, $v0, 8 -/* 052EB0 800522B0 AC6E0000 */ sw $t6, ($v1) -/* 052EB4 800522B4 35EF0010 */ ori $t7, (0x03880010 & 0xFFFF) # ori $t7, $t7, 0x10 -/* 052EB8 800522B8 271845D8 */ addiu $t8, %lo(D_800E45D8) # addiu $t8, $t8, 0x45d8 -/* 052EBC 800522BC AC580004 */ sw $t8, 4($v0) -/* 052EC0 800522C0 AC4F0000 */ sw $t7, ($v0) -/* 052EC4 800522C4 8C620000 */ lw $v0, ($v1) -/* 052EC8 800522C8 3C0E0600 */ lui $t6, %hi(d_course_banshee_boardwalk_dl_7978) # $t6, 0x600 -/* 052ECC 800522CC 25CE7978 */ addiu $t6, %lo(d_course_banshee_boardwalk_dl_7978) # addiu $t6, $t6, 0x7978 -/* 052ED0 800522D0 24590008 */ addiu $t9, $v0, 8 -/* 052ED4 800522D4 AC790000 */ sw $t9, ($v1) -/* 052ED8 800522D8 AC4E0004 */ sw $t6, 4($v0) -/* 052EDC 800522DC AC5F0000 */ sw $ra, ($v0) -/* 052EE0 800522E0 8C620000 */ lw $v0, ($v1) -/* 052EE4 800522E4 3C19800E */ lui $t9, %hi(D_800E45F0 + 0x8) # $t9, 0x800e -/* 052EE8 800522E8 3C180386 */ lui $t8, (0x03860010 >> 16) # lui $t8, 0x386 -/* 052EEC 800522EC 244F0008 */ addiu $t7, $v0, 8 -/* 052EF0 800522F0 AC6F0000 */ sw $t7, ($v1) -/* 052EF4 800522F4 37180010 */ ori $t8, (0x03860010 & 0xFFFF) # ori $t8, $t8, 0x10 -/* 052EF8 800522F8 273945F8 */ addiu $t9, %lo(D_800E45F0 + 0x8) # addiu $t9, $t9, 0x45f8 -/* 052EFC 800522FC AC590004 */ sw $t9, 4($v0) -/* 052F00 80052300 AC580000 */ sw $t8, ($v0) -/* 052F04 80052304 8C620000 */ lw $v0, ($v1) -/* 052F08 80052308 3C18800E */ lui $t8, %hi(D_800E45F0) # $t8, 0x800e -/* 052F0C 8005230C 3C0F0388 */ lui $t7, (0x03880010 >> 16) # lui $t7, 0x388 -/* 052F10 80052310 244E0008 */ addiu $t6, $v0, 8 -/* 052F14 80052314 AC6E0000 */ sw $t6, ($v1) -/* 052F18 80052318 35EF0010 */ ori $t7, (0x03880010 & 0xFFFF) # ori $t7, $t7, 0x10 -/* 052F1C 8005231C 271845F0 */ addiu $t8, %lo(D_800E45F0) # addiu $t8, $t8, 0x45f0 -/* 052F20 80052320 AC580004 */ sw $t8, 4($v0) -/* 052F24 80052324 AC4F0000 */ sw $t7, ($v0) -/* 052F28 80052328 8C620000 */ lw $v0, ($v1) -/* 052F2C 8005232C 3C0E0600 */ lui $t6, %hi(d_course_banshee_boardwalk_dl_78C0) # $t6, 0x600 -/* 052F30 80052330 25CE78C0 */ addiu $t6, %lo(d_course_banshee_boardwalk_dl_78C0) # addiu $t6, $t6, 0x78c0 -/* 052F34 80052334 24590008 */ addiu $t9, $v0, 8 -/* 052F38 80052338 AC790000 */ sw $t9, ($v1) -/* 052F3C 8005233C AC4E0004 */ sw $t6, 4($v0) -/* 052F40 80052340 AC5F0000 */ sw $ra, ($v0) -/* 052F44 80052344 8C620000 */ lw $v0, ($v1) -/* 052F48 80052348 3C19800E */ lui $t9, %hi(D_800E4608 + 0x8) # $t9, 0x800e -/* 052F4C 8005234C 3C180386 */ lui $t8, (0x03860010 >> 16) # lui $t8, 0x386 -/* 052F50 80052350 244F0008 */ addiu $t7, $v0, 8 -/* 052F54 80052354 AC6F0000 */ sw $t7, ($v1) -/* 052F58 80052358 37180010 */ ori $t8, (0x03860010 & 0xFFFF) # ori $t8, $t8, 0x10 -/* 052F5C 8005235C 27394610 */ addiu $t9, %lo(D_800E4608 + 0x8) # addiu $t9, $t9, 0x4610 -/* 052F60 80052360 AC590004 */ sw $t9, 4($v0) -/* 052F64 80052364 AC580000 */ sw $t8, ($v0) -/* 052F68 80052368 8C620000 */ lw $v0, ($v1) -/* 052F6C 8005236C 3C18800E */ lui $t8, %hi(D_800E4608) # $t8, 0x800e -/* 052F70 80052370 3C0F0388 */ lui $t7, (0x03880010 >> 16) # lui $t7, 0x388 -/* 052F74 80052374 244E0008 */ addiu $t6, $v0, 8 -/* 052F78 80052378 AC6E0000 */ sw $t6, ($v1) -/* 052F7C 8005237C 35EF0010 */ ori $t7, (0x03880010 & 0xFFFF) # ori $t7, $t7, 0x10 -/* 052F80 80052380 27184608 */ addiu $t8, %lo(D_800E4608) # addiu $t8, $t8, 0x4608 -/* 052F84 80052384 AC580004 */ sw $t8, 4($v0) -/* 052F88 80052388 AC4F0000 */ sw $t7, ($v0) -/* 052F8C 8005238C 8C620000 */ lw $v0, ($v1) -/* 052F90 80052390 3C0E0600 */ lui $t6, %hi(d_course_banshee_boardwalk_dl_7650) # $t6, 0x600 -/* 052F94 80052394 25CE7650 */ addiu $t6, %lo(d_course_banshee_boardwalk_dl_7650) # addiu $t6, $t6, 0x7650 -/* 052F98 80052398 24590008 */ addiu $t9, $v0, 8 -/* 052F9C 8005239C AC790000 */ sw $t9, ($v1) -/* 052FA0 800523A0 AC4E0004 */ sw $t6, 4($v0) -/* 052FA4 800523A4 AC5F0000 */ sw $ra, ($v0) -.L800523A8: -/* 052FA8 800523A8 8FBF0014 */ lw $ra, 0x14($sp) -/* 052FAC 800523AC 27BD0058 */ addiu $sp, $sp, 0x58 -/* 052FB0 800523B0 03E00008 */ jr $ra -/* 052FB4 800523B4 00000000 */ nop diff --git a/asm/non_matchings/hud_renderer/func_800528EC.s b/asm/non_matchings/hud_renderer/func_800528EC.s deleted file mode 100644 index cfcd88c6fc..0000000000 --- a/asm/non_matchings/hud_renderer/func_800528EC.s +++ /dev/null @@ -1,228 +0,0 @@ -glabel func_800528EC -/* 0534EC 800528EC 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 0534F0 800528F0 AFBF003C */ sw $ra, 0x3c($sp) -/* 0534F4 800528F4 3C1F8016 */ lui $ra, %hi(D_8016582C) # $ra, 0x8016 -/* 0534F8 800528F8 AFB20020 */ sw $s2, 0x20($sp) -/* 0534FC 800528FC 3C128015 */ lui $s2, %hi(gDisplayListHead) # $s2, 0x8015 -/* 053500 80052900 27FF582C */ addiu $ra, %lo(D_8016582C) # addiu $ra, $ra, 0x582c -/* 053504 80052904 26520298 */ addiu $s2, %lo(gDisplayListHead) # addiu $s2, $s2, 0x298 -/* 053508 80052908 97EE0000 */ lhu $t6, ($ra) -/* 05350C 8005290C 97EF0002 */ lhu $t7, 2($ra) -/* 053510 80052910 8E420000 */ lw $v0, ($s2) -/* 053514 80052914 3C0D8018 */ lui $t5, %hi(D_80183E80) # $t5, 0x8018 -/* 053518 80052918 97F80004 */ lhu $t8, 4($ra) -/* 05351C 8005291C 25AD3E80 */ addiu $t5, %lo(D_80183E80) # addiu $t5, $t5, 0x3e80 -/* 053520 80052920 A5AE0000 */ sh $t6, ($t5) -/* 053524 80052924 A5AF0002 */ sh $t7, 2($t5) -/* 053528 80052928 24590008 */ addiu $t9, $v0, 8 -/* 05352C 8005292C AFBE0038 */ sw $fp, 0x38($sp) -/* 053530 80052930 AFB70034 */ sw $s7, 0x34($sp) -/* 053534 80052934 AFB60030 */ sw $s6, 0x30($sp) -/* 053538 80052938 AFB5002C */ sw $s5, 0x2c($sp) -/* 05353C 8005293C AFB40028 */ sw $s4, 0x28($sp) -/* 053540 80052940 AFB30024 */ sw $s3, 0x24($sp) -/* 053544 80052944 AFB1001C */ sw $s1, 0x1c($sp) -/* 053548 80052948 AFB00018 */ sw $s0, 0x18($sp) -/* 05354C 8005294C AFA40040 */ sw $a0, 0x40($sp) -/* 053550 80052950 AE590000 */ sw $t9, ($s2) -/* 053554 80052954 3C0F0D00 */ lui $t7, %hi(D_0D007B00) # $t7, 0xd00 -/* 053558 80052958 A5B80004 */ sh $t8, 4($t5) -/* 05355C 8005295C 25EF7B00 */ addiu $t7, %lo(D_0D007B00) # addiu $t7, $t7, 0x7b00 -/* 053560 80052960 3C0E0600 */ lui $t6, 0x600 -/* 053564 80052964 AC4E0000 */ sw $t6, ($v0) -/* 053568 80052968 AC4F0004 */ sw $t7, 4($v0) -/* 05356C 8005296C 8E420000 */ lw $v0, ($s2) -/* 053570 80052970 3C0E8000 */ lui $t6, (0x80000040 >> 16) # lui $t6, 0x8000 -/* 053574 80052974 3C19BC00 */ lui $t9, (0xBC000002 >> 16) # lui $t9, 0xbc00 -/* 053578 80052978 24580008 */ addiu $t8, $v0, 8 -/* 05357C 8005297C AE580000 */ sw $t8, ($s2) -/* 053580 80052980 37390002 */ ori $t9, (0xBC000002 & 0xFFFF) # ori $t9, $t9, 2 -/* 053584 80052984 35CE0040 */ ori $t6, (0x80000040 & 0xFFFF) # ori $t6, $t6, 0x40 -/* 053588 80052988 AC4E0004 */ sw $t6, 4($v0) -/* 05358C 8005298C AC590000 */ sw $t9, ($v0) -/* 053590 80052990 8E420000 */ lw $v0, ($s2) -/* 053594 80052994 3C19800E */ lui $t9, %hi(D_800E4620 + 0x8) # $t9, 0x800e -/* 053598 80052998 3C180386 */ lui $t8, (0x03860010 >> 16) # lui $t8, 0x386 -/* 05359C 8005299C 244F0008 */ addiu $t7, $v0, 8 -/* 0535A0 800529A0 AE4F0000 */ sw $t7, ($s2) -/* 0535A4 800529A4 37180010 */ ori $t8, (0x03860010 & 0xFFFF) # ori $t8, $t8, 0x10 -/* 0535A8 800529A8 27394628 */ addiu $t9, %lo(D_800E4620 + 0x8) # addiu $t9, $t9, 0x4628 -/* 0535AC 800529AC AC590004 */ sw $t9, 4($v0) -/* 0535B0 800529B0 AC580000 */ sw $t8, ($v0) -/* 0535B4 800529B4 8E420000 */ lw $v0, ($s2) -/* 0535B8 800529B8 3C18800E */ lui $t8, %hi(D_800E4620) # $t8, 0x800e -/* 0535BC 800529BC 3C0F0388 */ lui $t7, (0x03880010 >> 16) # lui $t7, 0x388 -/* 0535C0 800529C0 244E0008 */ addiu $t6, $v0, 8 -/* 0535C4 800529C4 AE4E0000 */ sw $t6, ($s2) -/* 0535C8 800529C8 35EF0010 */ ori $t7, (0x03880010 & 0xFFFF) # ori $t7, $t7, 0x10 -/* 0535CC 800529CC 27184620 */ addiu $t8, %lo(D_800E4620) # addiu $t8, $t8, 0x4620 -/* 0535D0 800529D0 AC580004 */ sw $t8, 4($v0) -/* 0535D4 800529D4 AC4F0000 */ sw $t7, ($v0) -/* 0535D8 800529D8 8E420000 */ lw $v0, ($s2) -/* 0535DC 800529DC 3C0FFF33 */ lui $t7, (0xFF33FFFF >> 16) # lui $t7, 0xff33 -/* 0535E0 800529E0 3C0EFC12 */ lui $t6, (0xFC121824 >> 16) # lui $t6, 0xfc12 -/* 0535E4 800529E4 24590008 */ addiu $t9, $v0, 8 -/* 0535E8 800529E8 AE590000 */ sw $t9, ($s2) -/* 0535EC 800529EC 35CE1824 */ ori $t6, (0xFC121824 & 0xFFFF) # ori $t6, $t6, 0x1824 -/* 0535F0 800529F0 35EFFFFF */ ori $t7, (0xFF33FFFF & 0xFFFF) # ori $t7, $t7, 0xffff -/* 0535F4 800529F4 AC4F0004 */ sw $t7, 4($v0) -/* 0535F8 800529F8 AC4E0000 */ sw $t6, ($v0) -/* 0535FC 800529FC 8E420000 */ lw $v0, ($s2) -/* 053600 80052A00 240E3000 */ li $t6, 12288 -/* 053604 80052A04 3C19B600 */ lui $t9, 0xb600 -/* 053608 80052A08 24580008 */ addiu $t8, $v0, 8 -/* 05360C 80052A0C AE580000 */ sw $t8, ($s2) -/* 053610 80052A10 AC4E0004 */ sw $t6, 4($v0) -/* 053614 80052A14 AC590000 */ sw $t9, ($v0) -/* 053618 80052A18 8E420000 */ lw $v0, ($s2) -/* 05361C 80052A1C 3C190002 */ lui $t9, (0x00020204 >> 16) # lui $t9, 2 -/* 053620 80052A20 37390204 */ ori $t9, (0x00020204 & 0xFFFF) # ori $t9, $t9, 0x204 -/* 053624 80052A24 244F0008 */ addiu $t7, $v0, 8 -/* 053628 80052A28 AE4F0000 */ sw $t7, ($s2) -/* 05362C 80052A2C 3C18B700 */ lui $t8, 0xb700 -/* 053630 80052A30 3C040600 */ lui $a0, %hi(d_course_sherbet_land_ice) # $a0, 0x600 -/* 053634 80052A34 248468E8 */ addiu $a0, %lo(d_course_sherbet_land_ice) # addiu $a0, $a0, 0x68e8 -/* 053638 80052A38 24050020 */ li $a1, 32 -/* 05363C 80052A3C 24060020 */ li $a2, 32 -/* 053640 80052A40 AC580000 */ sw $t8, ($v0) -/* 053644 80052A44 0C011078 */ jal func_800441E0 -/* 053648 80052A48 AC590004 */ sw $t9, 4($v0) -/* 05364C 80052A4C 3C0E800E */ lui $t6, %hi(gPlayerCountSelection1) # $t6, 0x800e -/* 053650 80052A50 8DCEC538 */ lw $t6, %lo(gPlayerCountSelection1)($t6) -/* 053654 80052A54 3C138019 */ lui $s3, %hi(D_8018C3F0) # $s3, 0x8019 -/* 053658 80052A58 2673C3F0 */ addiu $s3, %lo(D_8018C3F0) # addiu $s3, $s3, -0x3c10 -/* 05365C 80052A5C 29C10003 */ slti $at, $t6, 3 -/* 053660 80052A60 1020002D */ beqz $at, .L80052B18 -/* 053664 80052A64 3C1E8019 */ lui $fp, %hi(gMatrixHudCount) # 0x8019 -/* 053668 80052A68 3C138019 */ lui $s3, %hi(D_8018C3F0) # $s3, 0x8019 -/* 05366C 80052A6C 3C1E8019 */ lui $fp, %hi(D_8018C5F0) # $fp, 0x8019 -/* 053670 80052A70 3C170400 */ lui $s7, (0x04000C2F >> 16) # lui $s7, 0x400 -/* 053674 80052A74 3C158016 */ lui $s5, %hi(gObjectList) # $s5, 0x8016 -/* 053678 80052A78 26B55C18 */ addiu $s5, %lo(gObjectList) # addiu $s5, $s5, 0x5c18 -/* 05367C 80052A7C 36F70C2F */ ori $s7, (0x04000C2F & 0xFFFF) # ori $s7, $s7, 0xc2f -/* 053680 80052A80 27DEC5F0 */ addiu $fp, %lo(D_8018C5F0) # addiu $fp, $fp, -0x3a10 -/* 053684 80052A84 2673C3F0 */ addiu $s3, %lo(D_8018C3F0) # addiu $s3, $s3, -0x3c10 -/* 053688 80052A88 241600E0 */ li $s6, 224 -/* 05368C 80052A8C 2414FFFF */ li $s4, -1 -/* 053690 80052A90 8E620000 */ lw $v0, ($s3) -.L80052A94: -/* 053694 80052A94 5054001C */ beql $v0, $s4, .L80052B08 -/* 053698 80052A98 26730004 */ addiu $s3, $s3, 4 -/* 05369C 80052A9C 00560019 */ multu $v0, $s6 -/* 0536A0 80052AA0 3C058018 */ lui $a1, %hi(D_80183E80) # $a1, 0x8018 -/* 0536A4 80052AA4 3C100D00 */ lui $s0, %hi(D_0D005BD0) # $s0, 0xd00 -/* 0536A8 80052AA8 3C110D00 */ lui $s1, %hi(D_0D006930) # $s1, 0xd00 -/* 0536AC 80052AAC 26316930 */ addiu $s1, %lo(D_0D006930) # addiu $s1, $s1, 0x6930 -/* 0536B0 80052AB0 26105BD0 */ addiu $s0, %lo(D_0D005BD0) # addiu $s0, $s0, 0x5bd0 -/* 0536B4 80052AB4 24A53E80 */ addiu $a1, %lo(D_80183E80) # addiu $a1, $a1, 0x3e80 -/* 0536B8 80052AB8 00007812 */ mflo $t7 -/* 0536BC 80052ABC 02AF1821 */ addu $v1, $s5, $t7 -/* 0536C0 80052AC0 847800A6 */ lh $t8, 0xa6($v1) -/* 0536C4 80052AC4 24640004 */ addiu $a0, $v1, 4 -/* 0536C8 80052AC8 5B00000F */ blezl $t8, .L80052B08 -/* 0536CC 80052ACC 26730004 */ addiu $s3, $s3, 4 -/* 0536D0 80052AD0 0C010B80 */ jal rsp_set_matrix_transformation -/* 0536D4 80052AD4 8C660000 */ lw $a2, ($v1) -/* 0536D8 80052AD8 8E420000 */ lw $v0, ($s2) -/* 0536DC 80052ADC 3C0F0600 */ lui $t7, 0x600 -/* 0536E0 80052AE0 24590008 */ addiu $t9, $v0, 8 -/* 0536E4 80052AE4 AE590000 */ sw $t9, ($s2) -/* 0536E8 80052AE8 AC500004 */ sw $s0, 4($v0) -/* 0536EC 80052AEC AC570000 */ sw $s7, ($v0) -/* 0536F0 80052AF0 8E420000 */ lw $v0, ($s2) -/* 0536F4 80052AF4 244E0008 */ addiu $t6, $v0, 8 -/* 0536F8 80052AF8 AE4E0000 */ sw $t6, ($s2) -/* 0536FC 80052AFC AC510004 */ sw $s1, 4($v0) -/* 053700 80052B00 AC4F0000 */ sw $t7, ($v0) -/* 053704 80052B04 26730004 */ addiu $s3, $s3, 4 -.L80052B08: -/* 053708 80052B08 567EFFE2 */ bnel $s3, $fp, .L80052A94 -/* 05370C 80052B0C 8E620000 */ lw $v0, ($s3) -/* 053710 80052B10 10000032 */ b .L80052BDC -/* 053714 80052B14 8E420000 */ lw $v0, ($s2) -.L80052B18: -/* 053718 80052B18 3C170400 */ lui $s7, (0x04000C2F >> 16) # lui $s7, 0x400 -/* 05371C 80052B1C 3C158016 */ lui $s5, %hi(gObjectList) # $s5, 0x8016 -/* 053720 80052B20 26B55C18 */ addiu $s5, %lo(gObjectList) # addiu $s5, $s5, 0x5c18 -/* 053724 80052B24 36F70C2F */ ori $s7, (0x04000C2F & 0xFFFF) # ori $s7, $s7, 0xc2f -/* 053728 80052B28 27DED120 */ addiu $fp, $fp, %lo(gMatrixHudCount) # -0x2ee0 -/* 05372C 80052B2C 241600E0 */ li $s6, 224 -/* 053730 80052B30 2414FFFF */ li $s4, -1 -/* 053734 80052B34 8E620000 */ lw $v0, ($s3) -.L80052B38: -/* 053738 80052B38 10540022 */ beq $v0, $s4, .L80052BC4 -/* 05373C 80052B3C 00000000 */ nop -/* 053740 80052B40 00560019 */ multu $v0, $s6 -/* 053744 80052B44 8FAE0040 */ lw $t6, 0x40($sp) -/* 053748 80052B48 0000C012 */ mflo $t8 -/* 05374C 80052B4C 02B81821 */ addu $v1, $s5, $t8 -/* 053750 80052B50 847900A6 */ lh $t9, 0xa6($v1) -/* 053754 80052B54 1B20001B */ blez $t9, .L80052BC4 -/* 053758 80052B58 00000000 */ nop -/* 05375C 80052B5C 846F0092 */ lh $t7, 0x92($v1) -/* 053760 80052B60 15CF0018 */ bne $t6, $t7, .L80052BC4 -/* 053764 80052B64 00000000 */ nop -/* 053768 80052B68 8FD80000 */ lw $t8, ($fp) -/* 05376C 80052B6C 3C058018 */ lui $a1, %hi(D_80183E80) # $a1, 0x8018 -/* 053770 80052B70 24A53E80 */ addiu $a1, %lo(D_80183E80) # addiu $a1, $a1, 0x3e80 -/* 053774 80052B74 2B0102EF */ slti $at, $t8, 0x2ef -/* 053778 80052B78 10200012 */ beqz $at, .L80052BC4 -/* 05377C 80052B7C 24640004 */ addiu $a0, $v1, 4 -/* 053780 80052B80 3C100D00 */ lui $s0, %hi(D_0D005BD0) # $s0, 0xd00 -/* 053784 80052B84 3C110D00 */ lui $s1, %hi(D_0D006930) # $s1, 0xd00 -/* 053788 80052B88 26316930 */ addiu $s1, %lo(D_0D006930) # addiu $s1, $s1, 0x6930 -/* 05378C 80052B8C 26105BD0 */ addiu $s0, %lo(D_0D005BD0) # addiu $s0, $s0, 0x5bd0 -/* 053790 80052B90 0C010B80 */ jal rsp_set_matrix_transformation -/* 053794 80052B94 8C660000 */ lw $a2, ($v1) -/* 053798 80052B98 8E420000 */ lw $v0, ($s2) -/* 05379C 80052B9C 3C0F0600 */ lui $t7, 0x600 -/* 0537A0 80052BA0 24590008 */ addiu $t9, $v0, 8 -/* 0537A4 80052BA4 AE590000 */ sw $t9, ($s2) -/* 0537A8 80052BA8 AC500004 */ sw $s0, 4($v0) -/* 0537AC 80052BAC AC570000 */ sw $s7, ($v0) -/* 0537B0 80052BB0 8E420000 */ lw $v0, ($s2) -/* 0537B4 80052BB4 244E0008 */ addiu $t6, $v0, 8 -/* 0537B8 80052BB8 AE4E0000 */ sw $t6, ($s2) -/* 0537BC 80052BBC AC510004 */ sw $s1, 4($v0) -/* 0537C0 80052BC0 AC4F0000 */ sw $t7, ($v0) -.L80052BC4: -/* 0537C4 80052BC4 3C188019 */ lui $t8, %hi(D_8018C5F0) # $t8, 0x8019 -/* 0537C8 80052BC8 2718C5F0 */ addiu $t8, %lo(D_8018C5F0) # addiu $t8, $t8, -0x3a10 -/* 0537CC 80052BCC 26730004 */ addiu $s3, $s3, 4 -/* 0537D0 80052BD0 5678FFD9 */ bnel $s3, $t8, .L80052B38 -/* 0537D4 80052BD4 8E620000 */ lw $v0, ($s3) -/* 0537D8 80052BD8 8E420000 */ lw $v0, ($s2) -.L80052BDC: -/* 0537DC 80052BDC 3C0EB700 */ lui $t6, 0xb700 -/* 0537E0 80052BE0 240F2000 */ li $t7, 8192 -/* 0537E4 80052BE4 24590008 */ addiu $t9, $v0, 8 -/* 0537E8 80052BE8 AE590000 */ sw $t9, ($s2) -/* 0537EC 80052BEC AC4F0004 */ sw $t7, 4($v0) -/* 0537F0 80052BF0 AC4E0000 */ sw $t6, ($v0) -/* 0537F4 80052BF4 8E420000 */ lw $v0, ($s2) -/* 0537F8 80052BF8 3C0E0002 */ lui $t6, 2 -/* 0537FC 80052BFC 3C19B600 */ lui $t9, 0xb600 -/* 053800 80052C00 24580008 */ addiu $t8, $v0, 8 -/* 053804 80052C04 AE580000 */ sw $t8, ($s2) -/* 053808 80052C08 AC4E0004 */ sw $t6, 4($v0) -/* 05380C 80052C0C AC590000 */ sw $t9, ($v0) -/* 053810 80052C10 8E420000 */ lw $v0, ($s2) -/* 053814 80052C14 3C190001 */ lui $t9, (0x00010001 >> 16) # lui $t9, 1 -/* 053818 80052C18 37390001 */ ori $t9, (0x00010001 & 0xFFFF) # ori $t9, $t9, 1 -/* 05381C 80052C1C 244F0008 */ addiu $t7, $v0, 8 -/* 053820 80052C20 AE4F0000 */ sw $t7, ($s2) -/* 053824 80052C24 3C18BB00 */ lui $t8, 0xbb00 -/* 053828 80052C28 AC580000 */ sw $t8, ($v0) -/* 05382C 80052C2C AC590004 */ sw $t9, 4($v0) -/* 053830 80052C30 8FBF003C */ lw $ra, 0x3c($sp) -/* 053834 80052C34 8FBE0038 */ lw $fp, 0x38($sp) -/* 053838 80052C38 8FB70034 */ lw $s7, 0x34($sp) -/* 05383C 80052C3C 8FB60030 */ lw $s6, 0x30($sp) -/* 053840 80052C40 8FB5002C */ lw $s5, 0x2c($sp) -/* 053844 80052C44 8FB40028 */ lw $s4, 0x28($sp) -/* 053848 80052C48 8FB30024 */ lw $s3, 0x24($sp) -/* 05384C 80052C4C 8FB20020 */ lw $s2, 0x20($sp) -/* 053850 80052C50 8FB1001C */ lw $s1, 0x1c($sp) -/* 053854 80052C54 8FB00018 */ lw $s0, 0x18($sp) -/* 053858 80052C58 03E00008 */ jr $ra -/* 05385C 80052C5C 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/non_matchings/hud_renderer/func_80052C60.s b/asm/non_matchings/hud_renderer/func_80052C60.s deleted file mode 100644 index df0c715f9f..0000000000 --- a/asm/non_matchings/hud_renderer/func_80052C60.s +++ /dev/null @@ -1,72 +0,0 @@ -glabel func_80052C60 -/* 053860 80052C60 3C088016 */ lui $t0, %hi(D_80165840) # $t0, 0x8016 -/* 053864 80052C64 25085840 */ addiu $t0, %lo(D_80165840) # addiu $t0, $t0, 0x5840 -/* 053868 80052C68 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 05386C 80052C6C 3C078015 */ lui $a3, %hi(gDisplayListHead) # $a3, 0x8015 -/* 053870 80052C70 24E70298 */ addiu $a3, %lo(gDisplayListHead) # addiu $a3, $a3, 0x298 -/* 053874 80052C74 8CE20000 */ lw $v0, ($a3) -/* 053878 80052C78 3C06800E */ lui $a2, %hi(D_800E4620) # $a2, 0x800e -/* 05387C 80052C7C 810E0000 */ lb $t6, ($t0) -/* 053880 80052C80 810F0001 */ lb $t7, 1($t0) -/* 053884 80052C84 81180002 */ lb $t8, 2($t0) -/* 053888 80052C88 24C64620 */ addiu $a2, %lo(D_800E4620) # addiu $a2, $a2, 0x4620 -/* 05388C 80052C8C 24590008 */ addiu $t9, $v0, 8 -/* 053890 80052C90 AFBF0024 */ sw $ra, 0x24($sp) -/* 053894 80052C94 AFB30020 */ sw $s3, 0x20($sp) -/* 053898 80052C98 AFB2001C */ sw $s2, 0x1c($sp) -/* 05389C 80052C9C AFB10018 */ sw $s1, 0x18($sp) -/* 0538A0 80052CA0 AFB00014 */ sw $s0, 0x14($sp) -/* 0538A4 80052CA4 AFA40028 */ sw $a0, 0x28($sp) -/* 0538A8 80052CA8 ACF90000 */ sw $t9, ($a3) -/* 0538AC 80052CAC 3C090386 */ lui $t1, (0x03860010 >> 16) # lui $t1, 0x386 -/* 0538B0 80052CB0 3C0A800E */ lui $t2, %hi(D_800E4620 + 0x8) # $t2, 0x800e -/* 0538B4 80052CB4 A0CE0010 */ sb $t6, 0x10($a2) -/* 0538B8 80052CB8 A0CF0011 */ sb $t7, 0x11($a2) -/* 0538BC 80052CBC A0D80012 */ sb $t8, 0x12($a2) -/* 0538C0 80052CC0 254A4628 */ addiu $t2, %lo(D_800E4620 + 0x8) # addiu $t2, $t2, 0x4628 -/* 0538C4 80052CC4 35290010 */ ori $t1, (0x03860010 & 0xFFFF) # ori $t1, $t1, 0x10 -/* 0538C8 80052CC8 AC490000 */ sw $t1, ($v0) -/* 0538CC 80052CCC AC4A0004 */ sw $t2, 4($v0) -/* 0538D0 80052CD0 8CE20000 */ lw $v0, ($a3) -/* 0538D4 80052CD4 3C0C0388 */ lui $t4, (0x03880010 >> 16) # lui $t4, 0x388 -/* 0538D8 80052CD8 3C13800E */ lui $s3, %hi(gPlayerCountSelection1) # $s3, 0x800e -/* 0538DC 80052CDC 244B0008 */ addiu $t3, $v0, 8 -/* 0538E0 80052CE0 ACEB0000 */ sw $t3, ($a3) -/* 0538E4 80052CE4 358C0010 */ ori $t4, (0x03880010 & 0xFFFF) # ori $t4, $t4, 0x10 -/* 0538E8 80052CE8 2673C538 */ addiu $s3, %lo(gPlayerCountSelection1) # addiu $s3, $s3, -0x3ac8 -/* 0538EC 80052CEC AC4C0000 */ sw $t4, ($v0) -/* 0538F0 80052CF0 AC460004 */ sw $a2, 4($v0) -/* 0538F4 80052CF4 8E6D0000 */ lw $t5, ($s3) -/* 0538F8 80052CF8 3C118018 */ lui $s1, %hi(D_80183DB8) # $s1, 0x8018 -/* 0538FC 80052CFC 26313DB8 */ addiu $s1, %lo(D_80183DB8) # addiu $s1, $s1, 0x3db8 -/* 053900 80052D00 19A00012 */ blez $t5, .L80052D4C -/* 053904 80052D04 00009025 */ move $s2, $zero -/* 053908 80052D08 8E300000 */ lw $s0, ($s1) -.L80052D0C: -/* 05390C 80052D0C 24050004 */ li $a1, 4 -/* 053910 80052D10 0C01C8C8 */ jal func_80072320 -/* 053914 80052D14 02002025 */ move $a0, $s0 -/* 053918 80052D18 50400004 */ beql $v0, $zero, .L80052D2C -/* 05391C 80052D1C 02002025 */ move $a0, $s0 -/* 053920 80052D20 0C014A17 */ jal func_8005285C -/* 053924 80052D24 02402025 */ move $a0, $s2 -/* 053928 80052D28 02002025 */ move $a0, $s0 -.L80052D2C: -/* 05392C 80052D2C 0C01C8C8 */ jal func_80072320 -/* 053930 80052D30 24050010 */ li $a1, 16 -/* 053934 80052D34 8E6E0000 */ lw $t6, ($s3) -/* 053938 80052D38 26520001 */ addiu $s2, $s2, 1 -/* 05393C 80052D3C 26310004 */ addiu $s1, $s1, 4 -/* 053940 80052D40 024E082A */ slt $at, $s2, $t6 -/* 053944 80052D44 5420FFF1 */ bnel $at, $zero, .L80052D0C -/* 053948 80052D48 8E300000 */ lw $s0, ($s1) -.L80052D4C: -/* 05394C 80052D4C 0C014A3B */ jal func_800528EC -/* 053950 80052D50 8FA40028 */ lw $a0, 0x28($sp) -/* 053954 80052D54 8FBF0024 */ lw $ra, 0x24($sp) -/* 053958 80052D58 8FB00014 */ lw $s0, 0x14($sp) -/* 05395C 80052D5C 8FB10018 */ lw $s1, 0x18($sp) -/* 053960 80052D60 8FB2001C */ lw $s2, 0x1c($sp) -/* 053964 80052D64 8FB30020 */ lw $s3, 0x20($sp) -/* 053968 80052D68 03E00008 */ jr $ra -/* 05396C 80052D6C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/non_matchings/hud_renderer/func_80052E30.s b/asm/non_matchings/hud_renderer/func_80052E30.s deleted file mode 100644 index eea4ccedcc..0000000000 --- a/asm/non_matchings/hud_renderer/func_80052E30.s +++ /dev/null @@ -1,64 +0,0 @@ -glabel func_80052E30 -/* 053A30 80052E30 3C078016 */ lui $a3, %hi(D_80165840) # $a3, 0x8016 -/* 053A34 80052E34 24E75840 */ addiu $a3, %lo(D_80165840) # addiu $a3, $a3, 0x5840 -/* 053A38 80052E38 3C068015 */ lui $a2, %hi(gDisplayListHead) # $a2, 0x8015 -/* 053A3C 80052E3C 24C60298 */ addiu $a2, %lo(gDisplayListHead) # addiu $a2, $a2, 0x298 -/* 053A40 80052E40 8CC20000 */ lw $v0, ($a2) -/* 053A44 80052E44 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 053A48 80052E48 3C05800E */ lui $a1, %hi(D_800E4620) # $a1, 0x800e -/* 053A4C 80052E4C 80EE0000 */ lb $t6, ($a3) -/* 053A50 80052E50 80EF0001 */ lb $t7, 1($a3) -/* 053A54 80052E54 80F80002 */ lb $t8, 2($a3) -/* 053A58 80052E58 24A54620 */ addiu $a1, %lo(D_800E4620) # addiu $a1, $a1, 0x4620 -/* 053A5C 80052E5C 24590008 */ addiu $t9, $v0, 8 -/* 053A60 80052E60 AFBF001C */ sw $ra, 0x1c($sp) -/* 053A64 80052E64 AFB10018 */ sw $s1, 0x18($sp) -/* 053A68 80052E68 AFB00014 */ sw $s0, 0x14($sp) -/* 053A6C 80052E6C AFA40020 */ sw $a0, 0x20($sp) -/* 053A70 80052E70 ACD90000 */ sw $t9, ($a2) -/* 053A74 80052E74 3C090386 */ lui $t1, (0x03860010 >> 16) # lui $t1, 0x386 -/* 053A78 80052E78 3C0A800E */ lui $t2, %hi(D_800E4620 + 0x8) # $t2, 0x800e -/* 053A7C 80052E7C A0AE0010 */ sb $t6, 0x10($a1) -/* 053A80 80052E80 A0AF0011 */ sb $t7, 0x11($a1) -/* 053A84 80052E84 A0B80012 */ sb $t8, 0x12($a1) -/* 053A88 80052E88 254A4628 */ addiu $t2, %lo(D_800E4620 + 0x8) # addiu $t2, $t2, 0x4628 -/* 053A8C 80052E8C 35290010 */ ori $t1, (0x03860010 & 0xFFFF) # ori $t1, $t1, 0x10 -/* 053A90 80052E90 AC490000 */ sw $t1, ($v0) -/* 053A94 80052E94 AC4A0004 */ sw $t2, 4($v0) -/* 053A98 80052E98 8CC20000 */ lw $v0, ($a2) -/* 053A9C 80052E9C 3C0C0388 */ lui $t4, (0x03880010 >> 16) # lui $t4, 0x388 -/* 053AA0 80052EA0 3C088018 */ lui $t0, %hi(D_80183E80) # $t0, 0x8018 -/* 053AA4 80052EA4 244B0008 */ addiu $t3, $v0, 8 -/* 053AA8 80052EA8 ACCB0000 */ sw $t3, ($a2) -/* 053AAC 80052EAC 358C0010 */ ori $t4, (0x03880010 & 0xFFFF) # ori $t4, $t4, 0x10 -/* 053AB0 80052EB0 25083E80 */ addiu $t0, %lo(D_80183E80) # addiu $t0, $t0, 0x3e80 -/* 053AB4 80052EB4 AC4C0000 */ sw $t4, ($v0) -/* 053AB8 80052EB8 AC450004 */ sw $a1, 4($v0) -/* 053ABC 80052EBC A5000000 */ sh $zero, ($t0) -/* 053AC0 80052EC0 A5000002 */ sh $zero, 2($t0) -/* 053AC4 80052EC4 A5000004 */ sh $zero, 4($t0) -/* 053AC8 80052EC8 3C0D8019 */ lui $t5, %hi(gPlayerCount) # $t5, 0x8019 -/* 053ACC 80052ECC 81ADEDF3 */ lb $t5, %lo(gPlayerCount)($t5) -/* 053AD0 80052ED0 3C11800E */ lui $s1, %hi(gPlayerCountSelection1) # $s1, 0x800e -/* 053AD4 80052ED4 24010001 */ li $at, 1 -/* 053AD8 80052ED8 15A1000C */ bne $t5, $at, .L80052F0C -/* 053ADC 80052EDC 2631C538 */ addiu $s1, %lo(gPlayerCountSelection1) # addiu $s1, $s1, -0x3ac8 -/* 053AE0 80052EE0 8E2E0000 */ lw $t6, ($s1) -/* 053AE4 80052EE4 00008025 */ move $s0, $zero -/* 053AE8 80052EE8 59C00009 */ blezl $t6, .L80052F10 -/* 053AEC 80052EEC 8FBF001C */ lw $ra, 0x1c($sp) -.L80052EF0: -/* 053AF0 80052EF0 0C014B5C */ jal func_80052D70 -/* 053AF4 80052EF4 02002025 */ move $a0, $s0 -/* 053AF8 80052EF8 8E2F0000 */ lw $t7, ($s1) -/* 053AFC 80052EFC 26100001 */ addiu $s0, $s0, 1 -/* 053B00 80052F00 020F082A */ slt $at, $s0, $t7 -/* 053B04 80052F04 1420FFFA */ bnez $at, .L80052EF0 -/* 053B08 80052F08 00000000 */ nop -.L80052F0C: -/* 053B0C 80052F0C 8FBF001C */ lw $ra, 0x1c($sp) -.L80052F10: -/* 053B10 80052F10 8FB00014 */ lw $s0, 0x14($sp) -/* 053B14 80052F14 8FB10018 */ lw $s1, 0x18($sp) -/* 053B18 80052F18 03E00008 */ jr $ra -/* 053B1C 80052F1C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/non_matchings/hud_renderer/func_80053870.s b/asm/non_matchings/hud_renderer/func_80053870.s deleted file mode 100644 index 4e94b8a10a..0000000000 --- a/asm/non_matchings/hud_renderer/func_80053870.s +++ /dev/null @@ -1,333 +0,0 @@ -glabel func_80053870 -/* 054470 80053870 27BDFF68 */ addiu $sp, $sp, -0x98 -/* 054474 80053874 00047080 */ sll $t6, $a0, 2 -/* 054478 80053878 01C47023 */ subu $t6, $t6, $a0 -/* 05447C 8005387C 3C0F800E */ lui $t7, %hi(camera1) # $t7, 0x800e -/* 054480 80053880 8DEFDB40 */ lw $t7, %lo(camera1)($t7) -/* 054484 80053884 000E70C0 */ sll $t6, $t6, 3 -/* 054488 80053888 01C47023 */ subu $t6, $t6, $a0 -/* 05448C 8005388C 000E70C0 */ sll $t6, $t6, 3 -/* 054490 80053890 AFB5002C */ sw $s5, 0x2c($sp) -/* 054494 80053894 01CFC021 */ addu $t8, $t6, $t7 -/* 054498 80053898 0080A825 */ move $s5, $a0 -/* 05449C 8005389C AFBF003C */ sw $ra, 0x3c($sp) -/* 0544A0 800538A0 AFBE0038 */ sw $fp, 0x38($sp) -/* 0544A4 800538A4 AFB70034 */ sw $s7, 0x34($sp) -/* 0544A8 800538A8 AFB60030 */ sw $s6, 0x30($sp) -/* 0544AC 800538AC AFB40028 */ sw $s4, 0x28($sp) -/* 0544B0 800538B0 AFB30024 */ sw $s3, 0x24($sp) -/* 0544B4 800538B4 AFB20020 */ sw $s2, 0x20($sp) -/* 0544B8 800538B8 AFB1001C */ sw $s1, 0x1c($sp) -/* 0544BC 800538BC AFB00018 */ sw $s0, 0x18($sp) -/* 0544C0 800538C0 14800017 */ bnez $a0, .L80053920 -/* 0544C4 800538C4 AFB80084 */ sw $t8, 0x84($sp) -/* 0544C8 800538C8 3C148016 */ lui $s4, %hi(gNumActiveThwomps) # $s4, 0x8016 -/* 0544CC 800538CC 26945750 */ addiu $s4, %lo(gNumActiveThwomps) # addiu $s4, $s4, 0x5750 -/* 0544D0 800538D0 86990000 */ lh $t9, ($s4) -/* 0544D4 800538D4 3C108018 */ lui $s0, %hi(D_80183EA0) # $s0, 0x8018 -/* 0544D8 800538D8 26103EA0 */ addiu $s0, %lo(D_80183EA0) # addiu $s0, $s0, 0x3ea0 -/* 0544DC 800538DC 1B200010 */ blez $t9, .L80053920 -/* 0544E0 800538E0 00009025 */ move $s2, $zero -/* 0544E4 800538E4 3C130007 */ lui $s3, 7 -/* 0544E8 800538E8 8E110000 */ lw $s1, ($s0) -.L800538EC: -/* 0544EC 800538EC 02602825 */ move $a1, $s3 -/* 0544F0 800538F0 0C01C87A */ jal set_object_flag_unk_054_false -/* 0544F4 800538F4 02202025 */ move $a0, $s1 -/* 0544F8 800538F8 02202025 */ move $a0, $s1 -/* 0544FC 800538FC 0C01C8B3 */ jal func_800722CC -/* 054500 80053900 24050110 */ li $a1, 272 -/* 054504 80053904 868D0000 */ lh $t5, ($s4) -/* 054508 80053908 26520001 */ addiu $s2, $s2, 1 -/* 05450C 8005390C 26100004 */ addiu $s0, $s0, 4 -/* 054510 80053910 024D082A */ slt $at, $s2, $t5 -/* 054514 80053914 5420FFF5 */ bnel $at, $zero, .L800538EC -/* 054518 80053918 8E110000 */ lw $s1, ($s0) -/* 05451C 8005391C AFB10094 */ sw $s1, 0x94($sp) -.L80053920: -/* 054520 80053920 3C148016 */ lui $s4, %hi(gNumActiveThwomps) # $s4, 0x8016 -/* 054524 80053924 26945750 */ addiu $s4, %lo(gNumActiveThwomps) # addiu $s4, $s4, 0x5750 -/* 054528 80053928 8FA40094 */ lw $a0, 0x94($sp) -/* 05452C 8005392C 0C014D29 */ jal func_800534A4 -/* 054530 80053930 00009025 */ move $s2, $zero -/* 054534 80053934 868E0000 */ lh $t6, ($s4) -/* 054538 80053938 3C108018 */ lui $s0, %hi(D_80183EA0) # $s0, 0x8018 -/* 05453C 8005393C 26103EA0 */ addiu $s0, %lo(D_80183EA0) # addiu $s0, $s0, 0x3ea0 -/* 054540 80053940 19C00037 */ blez $t6, .L80053A20 -/* 054544 80053944 241E00E0 */ li $fp, 224 -/* 054548 80053948 3C178016 */ lui $s7, %hi(gObjectList) # $s7, 0x8016 -/* 05454C 8005394C 3C148019 */ lui $s4, %hi(D_8018CF68) # $s4, 0x8019 -/* 054550 80053950 3C13800E */ lui $s3, %hi(gGamestate) # $s3, 0x800e -/* 054554 80053954 2673C50C */ addiu $s3, %lo(gGamestate) # addiu $s3, $s3, -0x3af4 -/* 054558 80053958 2694CF68 */ addiu $s4, %lo(D_8018CF68) # addiu $s4, $s4, -0x3098 -/* 05455C 8005395C 26F75C18 */ addiu $s7, %lo(gObjectList) # addiu $s7, $s7, 0x5c18 -/* 054560 80053960 24120009 */ li $s2, 9 -/* 054564 80053964 8E110000 */ lw $s1, ($s0) -.L80053968: -/* 054568 80053968 023E0019 */ multu $s1, $fp -/* 05456C 8005396C 00007812 */ mflo $t7 -/* 054570 80053970 02EFC021 */ addu $t8, $s7, $t7 -/* 054574 80053974 930200DF */ lbu $v0, 0xdf($t8) -/* 054578 80053978 8E780000 */ lw $t8, ($s3) -/* 05457C 8005397C 2443FFFF */ addiu $v1, $v0, -1 -/* 054580 80053980 24440001 */ addiu $a0, $v0, 1 -/* 054584 80053984 0003CC00 */ sll $t9, $v1, 0x10 -/* 054588 80053988 00047400 */ sll $t6, $a0, 0x10 -/* 05458C 8005398C 00191C03 */ sra $v1, $t9, 0x10 -/* 054590 80053990 12580017 */ beq $s2, $t8, .L800539F0 -/* 054594 80053994 000E7C03 */ sra $t7, $t6, 0x10 -/* 054598 80053998 0015C840 */ sll $t9, $s5, 1 -/* 05459C 8005399C 02996821 */ addu $t5, $s4, $t9 -/* 0545A0 800539A0 85A20000 */ lh $v0, ($t5) -/* 0545A4 800539A4 0043082A */ slt $at, $v0, $v1 -/* 0545A8 800539A8 1420000A */ bnez $at, .L800539D4 -/* 0545AC 800539AC 01E2082A */ slt $at, $t7, $v0 -/* 0545B0 800539B0 14200008 */ bnez $at, .L800539D4 -/* 0545B4 800539B4 02202025 */ move $a0, $s1 -/* 0545B8 800539B8 8FA50084 */ lw $a1, 0x84($sp) -/* 0545BC 800539BC 0C022850 */ jal func_8008A140 -/* 0545C0 800539C0 34068000 */ li $a2, 32768 -/* 0545C4 800539C4 10400003 */ beqz $v0, .L800539D4 -/* 0545C8 800539C8 00000000 */ nop -/* 0545CC 800539CC 0C014DB2 */ jal func_800536C8 -/* 0545D0 800539D0 02202025 */ move $a0, $s1 -.L800539D4: -/* 0545D4 800539D4 3C028016 */ lui $v0, %hi(gNumActiveThwomps) # $v0, 0x8016 -/* 0545D8 800539D8 84425750 */ lh $v0, %lo(gNumActiveThwomps)($v0) -/* 0545DC 800539DC 3C0F8018 */ lui $t7, %hi(D_80183EA0) # $t7, 0x8018 -/* 0545E0 800539E0 25EF3EA0 */ addiu $t7, %lo(D_80183EA0) # addiu $t7, $t7, 0x3ea0 -/* 0545E4 800539E4 00027080 */ sll $t6, $v0, 2 -/* 0545E8 800539E8 10000009 */ b .L80053A10 -/* 0545EC 800539EC 01CF1821 */ addu $v1, $t6, $t7 -.L800539F0: -/* 0545F0 800539F0 0C014DB2 */ jal func_800536C8 -/* 0545F4 800539F4 02202025 */ move $a0, $s1 -/* 0545F8 800539F8 3C028016 */ lui $v0, %hi(gNumActiveThwomps) # $v0, 0x8016 -/* 0545FC 800539FC 84425750 */ lh $v0, %lo(gNumActiveThwomps)($v0) -/* 054600 80053A00 3C198018 */ lui $t9, %hi(D_80183EA0) # $t9, 0x8018 -/* 054604 80053A04 27393EA0 */ addiu $t9, %lo(D_80183EA0) # addiu $t9, $t9, 0x3ea0 -/* 054608 80053A08 0002C080 */ sll $t8, $v0, 2 -/* 05460C 80053A0C 03191821 */ addu $v1, $t8, $t9 -.L80053A10: -/* 054610 80053A10 26100004 */ addiu $s0, $s0, 4 -/* 054614 80053A14 0203082B */ sltu $at, $s0, $v1 -/* 054618 80053A18 5420FFD3 */ bnel $at, $zero, .L80053968 -/* 05461C 80053A1C 8E110000 */ lw $s1, ($s0) -.L80053A20: -/* 054620 80053A20 3C128015 */ lui $s2, %hi(gDisplayListHead) # $s2, 0x8015 -/* 054624 80053A24 26520298 */ addiu $s2, %lo(gDisplayListHead) # addiu $s2, $s2, 0x298 -/* 054628 80053A28 8E420000 */ lw $v0, ($s2) -/* 05462C 80053A2C 3C0F0D00 */ lui $t7, %hi(D_0D0079C8) # $t7, 0xd00 -/* 054630 80053A30 25EF79C8 */ addiu $t7, %lo(D_0D0079C8) # addiu $t7, $t7, 0x79c8 -/* 054634 80053A34 244D0008 */ addiu $t5, $v0, 8 -/* 054638 80053A38 AE4D0000 */ sw $t5, ($s2) -/* 05463C 80053A3C 3C0E0600 */ lui $t6, 0x600 -/* 054640 80053A40 AC4E0000 */ sw $t6, ($v0) -/* 054644 80053A44 AC4F0004 */ sw $t7, 4($v0) -/* 054648 80053A48 8E420000 */ lw $v0, ($s2) -/* 05464C 80053A4C 3C0DFF33 */ lui $t5, (0xFF33FFFF >> 16) # lui $t5, 0xff33 -/* 054650 80053A50 3C19FC12 */ lui $t9, (0xFC121824 >> 16) # lui $t9, 0xfc12 -/* 054654 80053A54 24580008 */ addiu $t8, $v0, 8 -/* 054658 80053A58 AE580000 */ sw $t8, ($s2) -/* 05465C 80053A5C 37391824 */ ori $t9, (0xFC121824 & 0xFFFF) # ori $t9, $t9, 0x1824 -/* 054660 80053A60 35ADFFFF */ ori $t5, (0xFF33FFFF & 0xFFFF) # ori $t5, $t5, 0xffff -/* 054664 80053A64 AC4D0004 */ sw $t5, 4($v0) -/* 054668 80053A68 AC590000 */ sw $t9, ($v0) -/* 05466C 80053A6C 8E420000 */ lw $v0, ($s2) -/* 054670 80053A70 3C188000 */ lui $t8, (0x80000040 >> 16) # lui $t8, 0x8000 -/* 054674 80053A74 3C0FBC00 */ lui $t7, (0xBC000002 >> 16) # lui $t7, 0xbc00 -/* 054678 80053A78 244E0008 */ addiu $t6, $v0, 8 -/* 05467C 80053A7C AE4E0000 */ sw $t6, ($s2) -/* 054680 80053A80 35EF0002 */ ori $t7, (0xBC000002 & 0xFFFF) # ori $t7, $t7, 2 -/* 054684 80053A84 37180040 */ ori $t8, (0x80000040 & 0xFFFF) # ori $t8, $t8, 0x40 -/* 054688 80053A88 AC580004 */ sw $t8, 4($v0) -/* 05468C 80053A8C AC4F0000 */ sw $t7, ($v0) -/* 054690 80053A90 8E420000 */ lw $v0, ($s2) -/* 054694 80053A94 3C0E800E */ lui $t6, %hi(D_800E4668 + 0x8) # $t6, 0x800e -/* 054698 80053A98 3C0D0386 */ lui $t5, (0x03860010 >> 16) # lui $t5, 0x386 -/* 05469C 80053A9C 24590008 */ addiu $t9, $v0, 8 -/* 0546A0 80053AA0 AE590000 */ sw $t9, ($s2) -/* 0546A4 80053AA4 35AD0010 */ ori $t5, (0x03860010 & 0xFFFF) # ori $t5, $t5, 0x10 -/* 0546A8 80053AA8 25CE4670 */ addiu $t6, %lo(D_800E4668 + 0x8) # addiu $t6, $t6, 0x4670 -/* 0546AC 80053AAC AC4E0004 */ sw $t6, 4($v0) -/* 0546B0 80053AB0 AC4D0000 */ sw $t5, ($v0) -/* 0546B4 80053AB4 8E420000 */ lw $v0, ($s2) -/* 0546B8 80053AB8 3C19800E */ lui $t9, %hi(D_800E4668) # $t9, 0x800e -/* 0546BC 80053ABC 3C180388 */ lui $t8, (0x03880010 >> 16) # lui $t8, 0x388 -/* 0546C0 80053AC0 244F0008 */ addiu $t7, $v0, 8 -/* 0546C4 80053AC4 AE4F0000 */ sw $t7, ($s2) -/* 0546C8 80053AC8 37180010 */ ori $t8, (0x03880010 & 0xFFFF) # ori $t8, $t8, 0x10 -/* 0546CC 80053ACC 27394668 */ addiu $t9, %lo(D_800E4668) # addiu $t9, $t9, 0x4668 -/* 0546D0 80053AD0 AC590004 */ sw $t9, 4($v0) -/* 0546D4 80053AD4 AC580000 */ sw $t8, ($v0) -/* 0546D8 80053AD8 8E420000 */ lw $v0, ($s2) -/* 0546DC 80053ADC 240F3000 */ li $t7, 12288 -/* 0546E0 80053AE0 3C0EB600 */ lui $t6, 0xb600 -/* 0546E4 80053AE4 244D0008 */ addiu $t5, $v0, 8 -/* 0546E8 80053AE8 AE4D0000 */ sw $t5, ($s2) -/* 0546EC 80053AEC AC4F0004 */ sw $t7, 4($v0) -/* 0546F0 80053AF0 AC4E0000 */ sw $t6, ($v0) -/* 0546F4 80053AF4 8E420000 */ lw $v0, ($s2) -/* 0546F8 80053AF8 3C0D0002 */ lui $t5, (0x00020204 >> 16) # lui $t5, 2 -/* 0546FC 80053AFC 3C178016 */ lui $s7, %hi(gObjectList) # $s7, 0x8016 -/* 054700 80053B00 24580008 */ addiu $t8, $v0, 8 -/* 054704 80053B04 AE580000 */ sw $t8, ($s2) -/* 054708 80053B08 35AD0204 */ ori $t5, (0x00020204 & 0xFFFF) # ori $t5, $t5, 0x204 -/* 05470C 80053B0C 3C19B700 */ lui $t9, 0xb700 -/* 054710 80053B10 3C040600 */ lui $a0, %hi(d_course_bowsers_castle_thwomp_side) # $a0, 0x600 -/* 054714 80053B14 26F75C18 */ addiu $s7, %lo(gObjectList) # addiu $s7, $s7, 0x5c18 -/* 054718 80053B18 241E00E0 */ li $fp, 224 -/* 05471C 80053B1C 24846738 */ addiu $a0, %lo(d_course_bowsers_castle_thwomp_side) # addiu $a0, $a0, 0x6738 -/* 054720 80053B20 24050020 */ li $a1, 32 -/* 054724 80053B24 24060020 */ li $a2, 32 -/* 054728 80053B28 AC590000 */ sw $t9, ($v0) -/* 05472C 80053B2C 0C010F54 */ jal func_80043D50 -/* 054730 80053B30 AC4D0004 */ sw $t5, 4($v0) -/* 054734 80053B34 3C078019 */ lui $a3, %hi(D_8018C630) # $a3, 0x8019 -/* 054738 80053B38 3C168019 */ lui $s6, %hi(gMatrixHudCount) # $s6, 0x8019 -/* 05473C 80053B3C 26D6D120 */ addiu $s6, %lo(gMatrixHudCount) # addiu $s6, $s6, -0x2ee0 -/* 054740 80053B40 24E7C630 */ addiu $a3, %lo(D_8018C630) # addiu $a3, $a3, -0x39d0 -/* 054744 80053B44 2415FFFF */ li $s5, -1 -/* 054748 80053B48 24140003 */ li $s4, 3 -/* 05474C 80053B4C 8CF10000 */ lw $s1, ($a3) -.L80053B50: -/* 054750 80053B50 12350024 */ beq $s1, $s5, .L80053BE4 -/* 054754 80053B54 00000000 */ nop -/* 054758 80053B58 023E0019 */ multu $s1, $fp -/* 05475C 80053B5C 00007012 */ mflo $t6 -/* 054760 80053B60 02EE8021 */ addu $s0, $s7, $t6 -/* 054764 80053B64 860F00A6 */ lh $t7, 0xa6($s0) -/* 054768 80053B68 19E0001E */ blez $t7, .L80053BE4 -/* 05476C 80053B6C 00000000 */ nop -/* 054770 80053B70 921800D5 */ lbu $t8, 0xd5($s0) -/* 054774 80053B74 1698001B */ bne $s4, $t8, .L80053BE4 -/* 054778 80053B78 00000000 */ nop -/* 05477C 80053B7C 8ED90000 */ lw $t9, ($s6) -/* 054780 80053B80 26040004 */ addiu $a0, $s0, 4 -/* 054784 80053B84 260500B2 */ addiu $a1, $s0, 0xb2 -/* 054788 80053B88 2B2102EF */ slti $at, $t9, 0x2ef -/* 05478C 80053B8C 10200015 */ beqz $at, .L80053BE4 -/* 054790 80053B90 3C110D00 */ lui $s1, %hi(D_0D005C00) # $s1, 0xd00 -/* 054794 80053B94 3C130D00 */ lui $s3, %hi(D_0D006930) # $s3, 0xd00 -/* 054798 80053B98 26736930 */ addiu $s3, %lo(D_0D006930) # addiu $s3, $s3, 0x6930 -/* 05479C 80053B9C 8E060000 */ lw $a2, ($s0) -/* 0547A0 80053BA0 26315C00 */ addiu $s1, %lo(D_0D005C00) # addiu $s1, $s1, 0x5c00 -/* 0547A4 80053BA4 0C010B80 */ jal rsp_set_matrix_transformation -/* 0547A8 80053BA8 AFA70044 */ sw $a3, 0x44($sp) -/* 0547AC 80053BAC 8E420000 */ lw $v0, ($s2) -/* 0547B0 80053BB0 8FA70044 */ lw $a3, 0x44($sp) -/* 0547B4 80053BB4 3C0E0400 */ lui $t6, (0x04000C2F >> 16) # lui $t6, 0x400 -/* 0547B8 80053BB8 244D0008 */ addiu $t5, $v0, 8 -/* 0547BC 80053BBC AE4D0000 */ sw $t5, ($s2) -/* 0547C0 80053BC0 35CE0C2F */ ori $t6, (0x04000C2F & 0xFFFF) # ori $t6, $t6, 0xc2f -/* 0547C4 80053BC4 AC4E0000 */ sw $t6, ($v0) -/* 0547C8 80053BC8 AC510004 */ sw $s1, 4($v0) -/* 0547CC 80053BCC 8E420000 */ lw $v0, ($s2) -/* 0547D0 80053BD0 3C180600 */ lui $t8, 0x600 -/* 0547D4 80053BD4 244F0008 */ addiu $t7, $v0, 8 -/* 0547D8 80053BD8 AE4F0000 */ sw $t7, ($s2) -/* 0547DC 80053BDC AC530004 */ sw $s3, 4($v0) -/* 0547E0 80053BE0 AC580000 */ sw $t8, ($v0) -.L80053BE4: -/* 0547E4 80053BE4 3C198019 */ lui $t9, %hi(D_8018C830) # $t9, 0x8019 -/* 0547E8 80053BE8 2739C830 */ addiu $t9, %lo(D_8018C830) # addiu $t9, $t9, -0x37d0 -/* 0547EC 80053BEC 24E70004 */ addiu $a3, $a3, 4 -/* 0547F0 80053BF0 00F9082B */ sltu $at, $a3, $t9 -/* 0547F4 80053BF4 5420FFD6 */ bnel $at, $zero, .L80053B50 -/* 0547F8 80053BF8 8CF10000 */ lw $s1, ($a3) -/* 0547FC 80053BFC 8E420000 */ lw $v0, ($s2) -/* 054800 80053C00 3C0EB700 */ lui $t6, 0xb700 -/* 054804 80053C04 240F2000 */ li $t7, 8192 -/* 054808 80053C08 244D0008 */ addiu $t5, $v0, 8 -/* 05480C 80053C0C AE4D0000 */ sw $t5, ($s2) -/* 054810 80053C10 AC4F0004 */ sw $t7, 4($v0) -/* 054814 80053C14 AC4E0000 */ sw $t6, ($v0) -/* 054818 80053C18 8E420000 */ lw $v0, ($s2) -/* 05481C 80053C1C 3C0D0002 */ lui $t5, 2 -/* 054820 80053C20 3C19B600 */ lui $t9, 0xb600 -/* 054824 80053C24 24580008 */ addiu $t8, $v0, 8 -/* 054828 80053C28 AE580000 */ sw $t8, ($s2) -/* 05482C 80053C2C AC4D0004 */ sw $t5, 4($v0) -/* 054830 80053C30 AC590000 */ sw $t9, ($v0) -/* 054834 80053C34 8E420000 */ lw $v0, ($s2) -/* 054838 80053C38 3C180001 */ lui $t8, (0x00010001 >> 16) # lui $t8, 1 -/* 05483C 80053C3C 37180001 */ ori $t8, (0x00010001 & 0xFFFF) # ori $t8, $t8, 1 -/* 054840 80053C40 244E0008 */ addiu $t6, $v0, 8 -/* 054844 80053C44 AE4E0000 */ sw $t6, ($s2) -/* 054848 80053C48 3C0FBB00 */ lui $t7, 0xbb00 -/* 05484C 80053C4C AC4F0000 */ sw $t7, ($v0) -/* 054850 80053C50 AC580004 */ sw $t8, 4($v0) -/* 054854 80053C54 8E420000 */ lw $v0, ($s2) -/* 054858 80053C58 3C0E0D00 */ lui $t6, %hi(D_0D007AE0) # $t6, 0xd00 -/* 05485C 80053C5C 25CE7AE0 */ addiu $t6, %lo(D_0D007AE0) # addiu $t6, $t6, 0x7ae0 -/* 054860 80053C60 24590008 */ addiu $t9, $v0, 8 -/* 054864 80053C64 AE590000 */ sw $t9, ($s2) -/* 054868 80053C68 3C0D0600 */ lui $t5, 0x600 -/* 05486C 80053C6C 3C048019 */ lui $a0, %hi(D_8018D490) # $a0, 0x8019 -/* 054870 80053C70 AC4D0000 */ sw $t5, ($v0) -/* 054874 80053C74 AC4E0004 */ sw $t6, 4($v0) -/* 054878 80053C78 8C84D490 */ lw $a0, %lo(D_8018D490)($a0) -/* 05487C 80053C7C 24050020 */ li $a1, 32 -/* 054880 80053C80 0C01112C */ jal func_800444B0 -/* 054884 80053C84 24060020 */ li $a2, 32 -/* 054888 80053C88 0C012CF2 */ jal func_8004B3C8 -/* 05488C 80053C8C 00002025 */ move $a0, $zero -/* 054890 80053C90 3C148018 */ lui $s4, %hi(D_80183E80) # $s4, 0x8018 -/* 054894 80053C94 26943E80 */ addiu $s4, %lo(D_80183E80) # addiu $s4, $s4, 0x3e80 -/* 054898 80053C98 340F8000 */ li $t7, 32768 -/* 05489C 80053C9C 3C138019 */ lui $s3, %hi(D_8018C3F0) # $s3, 0x8019 -/* 0548A0 80053CA0 A6800000 */ sh $zero, ($s4) -/* 0548A4 80053CA4 A68F0004 */ sh $t7, 4($s4) -/* 0548A8 80053CA8 2673C3F0 */ addiu $s3, %lo(D_8018C3F0) # addiu $s3, $s3, -0x3c10 -/* 0548AC 80053CAC 24120002 */ li $s2, 2 -/* 0548B0 80053CB0 8E710000 */ lw $s1, ($s3) -.L80053CB4: -/* 0548B4 80053CB4 1235001E */ beq $s1, $s5, .L80053D30 -/* 0548B8 80053CB8 00000000 */ nop -/* 0548BC 80053CBC 023E0019 */ multu $s1, $fp -/* 0548C0 80053CC0 0000C012 */ mflo $t8 -/* 0548C4 80053CC4 02F88021 */ addu $s0, $s7, $t8 -/* 0548C8 80053CC8 861900A6 */ lh $t9, 0xa6($s0) -/* 0548CC 80053CCC 2B210002 */ slti $at, $t9, 2 -/* 0548D0 80053CD0 14200017 */ bnez $at, .L80053D30 -/* 0548D4 80053CD4 00000000 */ nop -/* 0548D8 80053CD8 920D00D5 */ lbu $t5, 0xd5($s0) -/* 0548DC 80053CDC 164D0014 */ bne $s2, $t5, .L80053D30 -/* 0548E0 80053CE0 00000000 */ nop -/* 0548E4 80053CE4 8ECE0000 */ lw $t6, ($s6) -/* 0548E8 80053CE8 240400FF */ li $a0, 255 -/* 0548EC 80053CEC 240500FF */ li $a1, 255 -/* 0548F0 80053CF0 29C102EF */ slti $at, $t6, 0x2ef -/* 0548F4 80053CF4 1020000E */ beqz $at, .L80053D30 -/* 0548F8 80053CF8 240600FF */ li $a2, 255 -/* 0548FC 80053CFC 0C012C4E */ jal func_8004B138 -/* 054900 80053D00 860700A0 */ lh $a3, 0xa0($s0) -/* 054904 80053D04 C60C0004 */ lwc1 $f12, 4($s0) -/* 054908 80053D08 C60E000C */ lwc1 $f14, 0xc($s0) -/* 05490C 80053D0C 0C01062B */ jal func_800418AC -/* 054910 80053D10 8FA60084 */ lw $a2, 0x84($sp) -/* 054914 80053D14 3C070D00 */ lui $a3, %hi(D_0D005AE0) # $a3, 0xd00 -/* 054918 80053D18 A6820002 */ sh $v0, 2($s4) -/* 05491C 80053D1C 24E75AE0 */ addiu $a3, %lo(D_0D005AE0) # addiu $a3, $a3, 0x5ae0 -/* 054920 80053D20 26040004 */ addiu $a0, $s0, 4 -/* 054924 80053D24 02802825 */ move $a1, $s4 -/* 054928 80053D28 0C010C6C */ jal func_800431B0 -/* 05492C 80053D2C 8E060000 */ lw $a2, ($s0) -.L80053D30: -/* 054930 80053D30 3C0F8019 */ lui $t7, %hi(D_8018C5F0) # $t7, 0x8019 -/* 054934 80053D34 25EFC5F0 */ addiu $t7, %lo(D_8018C5F0) # addiu $t7, $t7, -0x3a10 -/* 054938 80053D38 26730004 */ addiu $s3, $s3, 4 -/* 05493C 80053D3C 566FFFDD */ bnel $s3, $t7, .L80053CB4 -/* 054940 80053D40 8E710000 */ lw $s1, ($s3) -/* 054944 80053D44 8FBF003C */ lw $ra, 0x3c($sp) -/* 054948 80053D48 8FB00018 */ lw $s0, 0x18($sp) -/* 05494C 80053D4C 8FB1001C */ lw $s1, 0x1c($sp) -/* 054950 80053D50 8FB20020 */ lw $s2, 0x20($sp) -/* 054954 80053D54 8FB30024 */ lw $s3, 0x24($sp) -/* 054958 80053D58 8FB40028 */ lw $s4, 0x28($sp) -/* 05495C 80053D5C 8FB5002C */ lw $s5, 0x2c($sp) -/* 054960 80053D60 8FB60030 */ lw $s6, 0x30($sp) -/* 054964 80053D64 8FB70034 */ lw $s7, 0x34($sp) -/* 054968 80053D68 8FBE0038 */ lw $fp, 0x38($sp) -/* 05496C 80053D6C 03E00008 */ jr $ra -/* 054970 80053D70 27BD0098 */ addiu $sp, $sp, 0x98 diff --git a/asm/non_matchings/hud_renderer/func_80054BE8.s b/asm/non_matchings/hud_renderer/func_80054BE8.s deleted file mode 100644 index 44b7e8a03d..0000000000 --- a/asm/non_matchings/hud_renderer/func_80054BE8.s +++ /dev/null @@ -1,73 +0,0 @@ -glabel func_80054BE8 -/* 0557E8 80054BE8 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 0557EC 80054BEC 3C088015 */ lui $t0, %hi(gDisplayListHead) # $t0, 0x8015 -/* 0557F0 80054BF0 25080298 */ addiu $t0, %lo(gDisplayListHead) # addiu $t0, $t0, 0x298 -/* 0557F4 80054BF4 8D030000 */ lw $v1, ($t0) -/* 0557F8 80054BF8 00047080 */ sll $t6, $a0, 2 -/* 0557FC 80054BFC 3C0F800E */ lui $t7, %hi(camera1) # $t7, 0x800e -/* 055800 80054C00 8DEFDB40 */ lw $t7, %lo(camera1)($t7) -/* 055804 80054C04 01C47023 */ subu $t6, $t6, $a0 -/* 055808 80054C08 000E70C0 */ sll $t6, $t6, 3 -/* 05580C 80054C0C 24780008 */ addiu $t8, $v1, 8 -/* 055810 80054C10 AFBF002C */ sw $ra, 0x2c($sp) -/* 055814 80054C14 AFB50028 */ sw $s5, 0x28($sp) -/* 055818 80054C18 AFB40024 */ sw $s4, 0x24($sp) -/* 05581C 80054C1C AFB30020 */ sw $s3, 0x20($sp) -/* 055820 80054C20 AFB2001C */ sw $s2, 0x1c($sp) -/* 055824 80054C24 AFB10018 */ sw $s1, 0x18($sp) -/* 055828 80054C28 AFB00014 */ sw $s0, 0x14($sp) -/* 05582C 80054C2C 01C47023 */ subu $t6, $t6, $a0 -/* 055830 80054C30 AD180000 */ sw $t8, ($t0) -/* 055834 80054C34 3C090D00 */ lui $t1, %hi(D_0D007AE0) # $t1, 0xd00 -/* 055838 80054C38 25297AE0 */ addiu $t1, %lo(D_0D007AE0) # addiu $t1, $t1, 0x7ae0 -/* 05583C 80054C3C 3C190600 */ lui $t9, 0x600 -/* 055840 80054C40 000E70C0 */ sll $t6, $t6, 3 -/* 055844 80054C44 3C048019 */ lui $a0, %hi(D_8018D488) # $a0, 0x8019 -/* 055848 80054C48 AC790000 */ sw $t9, ($v1) -/* 05584C 80054C4C AC690004 */ sw $t1, 4($v1) -/* 055850 80054C50 8C84D488 */ lw $a0, %lo(D_8018D488)($a0) -/* 055854 80054C54 24050020 */ li $a1, 32 -/* 055858 80054C58 24060020 */ li $a2, 32 -/* 05585C 80054C5C 0C01112C */ jal func_800444B0 -/* 055860 80054C60 01CFA821 */ addu $s5, $t6, $t7 -/* 055864 80054C64 240400FF */ li $a0, 255 -/* 055868 80054C68 240500FF */ li $a1, 255 -/* 05586C 80054C6C 00003025 */ move $a2, $zero -/* 055870 80054C70 0C012CD7 */ jal func_8004B35C -/* 055874 80054C74 240700FF */ li $a3, 255 -/* 055878 80054C78 3C018018 */ lui $at, %hi(D_80183E80) # $at, 0x8018 -/* 05587C 80054C7C 3C108019 */ lui $s0, %hi(D_8018C630) # $s0, 0x8019 -/* 055880 80054C80 3C148019 */ lui $s4, %hi(D_8018C830) # $s4, 0x8019 -/* 055884 80054C84 3C128016 */ lui $s2, %hi(gObjectList) # $s2, 0x8016 -/* 055888 80054C88 A4203E80 */ sh $zero, %lo(D_80183E80)($at) -/* 05588C 80054C8C 26525C18 */ addiu $s2, %lo(gObjectList) # addiu $s2, $s2, 0x5c18 -/* 055890 80054C90 2694C830 */ addiu $s4, %lo(D_8018C830) # addiu $s4, $s4, -0x37d0 -/* 055894 80054C94 2610C630 */ addiu $s0, %lo(D_8018C630) # addiu $s0, $s0, -0x39d0 -/* 055898 80054C98 241300E0 */ li $s3, 224 -/* 05589C 80054C9C 2411FFFF */ li $s1, -1 -/* 0558A0 80054CA0 8E040000 */ lw $a0, ($s0) -.L80054CA4: -/* 0558A4 80054CA4 5091000B */ beql $a0, $s1, .L80054CD4 -/* 0558A8 80054CA8 26100004 */ addiu $s0, $s0, 4 -/* 0558AC 80054CAC 00930019 */ multu $a0, $s3 -/* 0558B0 80054CB0 00005012 */ mflo $t2 -/* 0558B4 80054CB4 024A5821 */ addu $t3, $s2, $t2 -/* 0558B8 80054CB8 856C00A6 */ lh $t4, 0xa6($t3) -/* 0558BC 80054CBC 29810002 */ slti $at, $t4, 2 -/* 0558C0 80054CC0 54200004 */ bnel $at, $zero, .L80054CD4 -/* 0558C4 80054CC4 26100004 */ addiu $s0, $s0, 4 -/* 0558C8 80054CC8 0C0152BF */ jal func_80054AFC -/* 0558CC 80054CCC 02A02825 */ move $a1, $s5 -/* 0558D0 80054CD0 26100004 */ addiu $s0, $s0, 4 -.L80054CD4: -/* 0558D4 80054CD4 5614FFF3 */ bnel $s0, $s4, .L80054CA4 -/* 0558D8 80054CD8 8E040000 */ lw $a0, ($s0) -/* 0558DC 80054CDC 8FBF002C */ lw $ra, 0x2c($sp) -/* 0558E0 80054CE0 8FB00014 */ lw $s0, 0x14($sp) -/* 0558E4 80054CE4 8FB10018 */ lw $s1, 0x18($sp) -/* 0558E8 80054CE8 8FB2001C */ lw $s2, 0x1c($sp) -/* 0558EC 80054CEC 8FB30020 */ lw $s3, 0x20($sp) -/* 0558F0 80054CF0 8FB40024 */ lw $s4, 0x24($sp) -/* 0558F4 80054CF4 8FB50028 */ lw $s5, 0x28($sp) -/* 0558F8 80054CF8 03E00008 */ jr $ra -/* 0558FC 80054CFC 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/non_matchings/hud_renderer/func_800562E4.s b/asm/non_matchings/hud_renderer/func_800562E4.s deleted file mode 100644 index cac41bc04f..0000000000 --- a/asm/non_matchings/hud_renderer/func_800562E4.s +++ /dev/null @@ -1,63 +0,0 @@ -glabel func_800562E4 -/* 056EE4 800562E4 00047880 */ sll $t7, $a0, 2 -/* 056EE8 800562E8 01E47823 */ subu $t7, $t7, $a0 -/* 056EEC 800562EC 3C18800E */ lui $t8, %hi(D_800E46F8) # $t8, 0x800e -/* 056EF0 800562F0 271846F8 */ addiu $t8, %lo(D_800E46F8) # addiu $t8, $t8, 0x46f8 -/* 056EF4 800562F4 000F7880 */ sll $t7, $t7, 2 -/* 056EF8 800562F8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 056EFC 800562FC 01F81021 */ addu $v0, $t7, $t8 -/* 056F00 80056300 AFA40018 */ sw $a0, 0x18($sp) -/* 056F04 80056304 AFA5001C */ sw $a1, 0x1c($sp) -/* 056F08 80056308 00C03825 */ move $a3, $a2 -/* 056F0C 8005630C 8C440000 */ lw $a0, ($v0) -/* 056F10 80056310 8C450004 */ lw $a1, 4($v0) -/* 056F14 80056314 8C460008 */ lw $a2, 8($v0) -/* 056F18 80056318 3C038016 */ lui $v1, %hi(D_80165860) # $v1, 0x8016 -/* 056F1C 8005631C 3C088016 */ lui $t0, %hi(D_8016586C) # $t0, 0x8016 -/* 056F20 80056320 3C098016 */ lui $t1, %hi(D_80165878) # $t1, 0x8016 -/* 056F24 80056324 25295878 */ addiu $t1, %lo(D_80165878) # addiu $t1, $t1, 0x5878 -/* 056F28 80056328 2508586C */ addiu $t0, %lo(D_8016586C) # addiu $t0, $t0, 0x586c -/* 056F2C 8005632C 24635860 */ addiu $v1, %lo(D_80165860) # addiu $v1, $v1, 0x5860 -/* 056F30 80056330 AFBF0014 */ sw $ra, 0x14($sp) -/* 056F34 80056334 AC640000 */ sw $a0, ($v1) -/* 056F38 80056338 AD050000 */ sw $a1, ($t0) -/* 056F3C 8005633C 0C012C4E */ jal func_8004B138 -/* 056F40 80056340 AD260000 */ sw $a2, ($t1) -/* 056F44 80056344 3C048018 */ lui $a0, %hi(D_80183E40) # $a0, 0x8018 -/* 056F48 80056348 3C058018 */ lui $a1, %hi(D_80183E80) # $a1, 0x8018 -/* 056F4C 8005634C 3C063E4C */ lui $a2, (0x3E4CCCCD >> 16) # lui $a2, 0x3e4c -/* 056F50 80056350 34C6CCCD */ ori $a2, (0x3E4CCCCD & 0xFFFF) # ori $a2, $a2, 0xcccd -/* 056F54 80056354 24A53E80 */ addiu $a1, %lo(D_80183E80) # addiu $a1, $a1, 0x3e80 -/* 056F58 80056358 0C010B80 */ jal rsp_set_matrix_transformation -/* 056F5C 8005635C 24843E40 */ addiu $a0, %lo(D_80183E40) # addiu $a0, $a0, 0x3e40 -/* 056F60 80056360 8FAC001C */ lw $t4, 0x1c($sp) -/* 056F64 80056364 3C0E0D03 */ lui $t6, %hi(D_0D02AC58) # $t6, 0xd03 -/* 056F68 80056368 25CEAC58 */ addiu $t6, %lo(D_0D02AC58) # addiu $t6, $t6, -0x53a8 -/* 056F6C 8005636C 000C6A80 */ sll $t5, $t4, 0xa -/* 056F70 80056370 01AE2021 */ addu $a0, $t5, $t6 -/* 056F74 80056374 24050020 */ li $a1, 32 -/* 056F78 80056378 0C0112FE */ jal func_80044BF8 -/* 056F7C 8005637C 24060020 */ li $a2, 32 -/* 056F80 80056380 3C058015 */ lui $a1, %hi(gDisplayListHead) # $a1, 0x8015 -/* 056F84 80056384 24A50298 */ addiu $a1, %lo(gDisplayListHead) # addiu $a1, $a1, 0x298 -/* 056F88 80056388 8CA20000 */ lw $v0, ($a1) -/* 056F8C 8005638C 3C180400 */ lui $t8, (0x0400103F >> 16) # lui $t8, 0x400 -/* 056F90 80056390 3C190D00 */ lui $t9, %hi(D_0D005AE0) # $t9, 0xd00 -/* 056F94 80056394 244F0008 */ addiu $t7, $v0, 8 -/* 056F98 80056398 ACAF0000 */ sw $t7, ($a1) -/* 056F9C 8005639C 27395AE0 */ addiu $t9, %lo(D_0D005AE0) # addiu $t9, $t9, 0x5ae0 -/* 056FA0 800563A0 3718103F */ ori $t8, (0x0400103F & 0xFFFF) # ori $t8, $t8, 0x103f -/* 056FA4 800563A4 AC580000 */ sw $t8, ($v0) -/* 056FA8 800563A8 AC590004 */ sw $t9, 4($v0) -/* 056FAC 800563AC 8CA20000 */ lw $v0, ($a1) -/* 056FB0 800563B0 3C0C0D00 */ lui $t4, %hi(common_rectangle_display) # $t4, 0xd00 -/* 056FB4 800563B4 258C6940 */ addiu $t4, %lo(common_rectangle_display) # addiu $t4, $t4, 0x6940 -/* 056FB8 800563B8 244A0008 */ addiu $t2, $v0, 8 -/* 056FBC 800563BC ACAA0000 */ sw $t2, ($a1) -/* 056FC0 800563C0 3C0B0600 */ lui $t3, 0x600 -/* 056FC4 800563C4 AC4B0000 */ sw $t3, ($v0) -/* 056FC8 800563C8 AC4C0004 */ sw $t4, 4($v0) -/* 056FCC 800563CC 8FBF0014 */ lw $ra, 0x14($sp) -/* 056FD0 800563D0 27BD0018 */ addiu $sp, $sp, 0x18 -/* 056FD4 800563D4 03E00008 */ jr $ra -/* 056FD8 800563D8 00000000 */ nop diff --git a/asm/non_matchings/hud_renderer/func_800563DC.s b/asm/non_matchings/hud_renderer/func_800563DC.s deleted file mode 100644 index 4a9bad4c30..0000000000 --- a/asm/non_matchings/hud_renderer/func_800563DC.s +++ /dev/null @@ -1,184 +0,0 @@ -glabel func_800563DC -/* 056FDC 800563DC 0004C8C0 */ sll $t9, $a0, 3 -/* 056FE0 800563E0 0324C823 */ subu $t9, $t9, $a0 -/* 056FE4 800563E4 3C088016 */ lui $t0, %hi(gObjectList) # $t0, 0x8016 -/* 056FE8 800563E8 25085C18 */ addiu $t0, %lo(gObjectList) # addiu $t0, $t0, 0x5c18 -/* 056FEC 800563EC 0019C940 */ sll $t9, $t9, 5 -/* 056FF0 800563F0 03281021 */ addu $v0, $t9, $t0 -/* 056FF4 800563F4 C4440008 */ lwc1 $f4, 8($v0) -/* 056FF8 800563F8 3C013FF0 */ li $at, 0x3FF00000 # 1.875000 -/* 056FFC 800563FC 44814800 */ mtc1 $at, $f9 -/* 057000 80056400 44804000 */ mtc1 $zero, $f8 -/* 057004 80056404 460021A1 */ cvt.d.s $f6, $f4 -/* 057008 80056408 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 05700C 8005640C 46283280 */ add.d $f10, $f6, $f8 -/* 057010 80056410 AFB00028 */ sw $s0, 0x28($sp) -/* 057014 80056414 3C108016 */ lui $s0, %hi(D_801655CC) # $s0, 0x8016 -/* 057018 80056418 8E1055CC */ lw $s0, %lo(D_801655CC)($s0) -/* 05701C 8005641C 00057080 */ sll $t6, $a1, 2 -/* 057020 80056420 3C0F800E */ lui $t7, %hi(camera1) # $t7, 0x800e -/* 057024 80056424 8DEFDB40 */ lw $t7, %lo(camera1)($t7) -/* 057028 80056428 AFB30034 */ sw $s3, 0x34($sp) -/* 05702C 8005642C 01C57023 */ subu $t6, $t6, $a1 -/* 057030 80056430 46205420 */ cvt.s.d $f16, $f10 -/* 057034 80056434 3C138018 */ lui $s3, %hi(D_80183E40) # $s3, 0x8018 -/* 057038 80056438 AFB1002C */ sw $s1, 0x2c($sp) -/* 05703C 8005643C 000E70C0 */ sll $t6, $t6, 3 -/* 057040 80056440 C44C0004 */ lwc1 $f12, 4($v0) -/* 057044 80056444 C44E000C */ lwc1 $f14, 0xc($v0) -/* 057048 80056448 3C118018 */ lui $s1, %hi(D_80183E80) # $s1, 0x8018 -/* 05704C 8005644C 26733E40 */ addiu $s3, %lo(D_80183E40) # addiu $s3, $s3, 0x3e40 -/* 057050 80056450 AFB20030 */ sw $s2, 0x30($sp) -/* 057054 80056454 01C57023 */ subu $t6, $t6, $a1 -/* 057058 80056458 00C09025 */ move $s2, $a2 -/* 05705C 8005645C 26313E80 */ addiu $s1, %lo(D_80183E80) # addiu $s1, $s1, 0x3e80 -/* 057060 80056460 AFBF003C */ sw $ra, 0x3c($sp) -/* 057064 80056464 000E70C0 */ sll $t6, $t6, 3 -/* 057068 80056468 32180003 */ andi $t8, $s0, 3 -/* 05706C 8005646C AFB40038 */ sw $s4, 0x38($sp) -/* 057070 80056470 03008025 */ move $s0, $t8 -/* 057074 80056474 E6700004 */ swc1 $f16, 4($s3) -/* 057078 80056478 A6200000 */ sh $zero, ($s1) -/* 05707C 8005647C 01CF3021 */ addu $a2, $t6, $t7 -/* 057080 80056480 E66C0000 */ swc1 $f12, ($s3) -/* 057084 80056484 0C01062B */ jal func_800418AC -/* 057088 80056488 E66E0008 */ swc1 $f14, 8($s3) -/* 05708C 8005648C 34098000 */ li $t1, 32768 -/* 057090 80056490 3C063E4C */ lui $a2, (0x3E4CCCCD >> 16) # lui $a2, 0x3e4c -/* 057094 80056494 A6220002 */ sh $v0, 2($s1) -/* 057098 80056498 A6290004 */ sh $t1, 4($s1) -/* 05709C 8005649C 34C6CCCD */ ori $a2, (0x3E4CCCCD & 0xFFFF) # ori $a2, $a2, 0xcccd -/* 0570A0 800564A0 02602025 */ move $a0, $s3 -/* 0570A4 800564A4 0C010B80 */ jal rsp_set_matrix_transformation -/* 0570A8 800564A8 02202825 */ move $a1, $s1 -/* 0570AC 800564AC 3C148015 */ lui $s4, %hi(gDisplayListHead) # $s4, 0x8015 -/* 0570B0 800564B0 26940298 */ addiu $s4, %lo(gDisplayListHead) # addiu $s4, $s4, 0x298 -/* 0570B4 800564B4 8E820000 */ lw $v0, ($s4) -/* 0570B8 800564B8 3C0C0D00 */ lui $t4, %hi(D_0D007E98) # $t4, 0xd00 -/* 0570BC 800564BC 258C7E98 */ addiu $t4, %lo(D_0D007E98) # addiu $t4, $t4, 0x7e98 -/* 0570C0 800564C0 244A0008 */ addiu $t2, $v0, 8 -/* 0570C4 800564C4 AE8A0000 */ sw $t2, ($s4) -/* 0570C8 800564C8 3C0B0600 */ lui $t3, 0x600 -/* 0570CC 800564CC 02402025 */ move $a0, $s2 -/* 0570D0 800564D0 AC4B0000 */ sw $t3, ($v0) -/* 0570D4 800564D4 0C012CC4 */ jal func_8004B310 -/* 0570D8 800564D8 AC4C0004 */ sw $t4, 4($v0) -/* 0570DC 800564DC 3C0E0D03 */ lui $t6, %hi(D_0D029858) # $t6, 0xd03 -/* 0570E0 800564E0 25CE9858 */ addiu $t6, %lo(D_0D029858) # addiu $t6, $t6, -0x67a8 -/* 0570E4 800564E4 3C040D03 */ lui $a0, %hi(D_0D02A858) # $a0, 0xd03 -/* 0570E8 800564E8 00106A80 */ sll $t5, $s0, 0xa -/* 0570EC 800564EC 3C060D00 */ lui $a2, %hi(D_0D005AE0) # $a2, 0xd00 -/* 0570F0 800564F0 240F0020 */ li $t7, 32 -/* 0570F4 800564F4 24180020 */ li $t8, 32 -/* 0570F8 800564F8 24190020 */ li $t9, 32 -/* 0570FC 800564FC AFB90018 */ sw $t9, 0x18($sp) -/* 057100 80056500 AFB80014 */ sw $t8, 0x14($sp) -/* 057104 80056504 AFAF0010 */ sw $t7, 0x10($sp) -/* 057108 80056508 24C65AE0 */ addiu $a2, %lo(D_0D005AE0) # addiu $a2, $a2, 0x5ae0 -/* 05710C 8005650C 01AE2821 */ addu $a1, $t5, $t6 -/* 057110 80056510 2484A858 */ addiu $a0, %lo(D_0D02A858) # addiu $a0, $a0, -0x57a8 -/* 057114 80056514 0C011C9C */ jal draw_rectangle_texture_overlap -/* 057118 80056518 24070020 */ li $a3, 32 -/* 05711C 8005651C 8E820000 */ lw $v0, ($s4) -/* 057120 80056520 3C108019 */ lui $s0, %hi(D_8018D400) # $s0, 0x8019 -/* 057124 80056524 8E10D400 */ lw $s0, %lo(D_8018D400)($s0) -/* 057128 80056528 3C0A0D00 */ lui $t2, %hi(D_0D007B00) # $t2, 0xd00 -/* 05712C 8005652C 24480008 */ addiu $t0, $v0, 8 -/* 057130 80056530 AE880000 */ sw $t0, ($s4) -/* 057134 80056534 254A7B00 */ addiu $t2, %lo(D_0D007B00) # addiu $t2, $t2, 0x7b00 -/* 057138 80056538 3C090600 */ lui $t1, 0x600 -/* 05713C 8005653C 00002025 */ move $a0, $zero -/* 057140 80056540 00002825 */ move $a1, $zero -/* 057144 80056544 00003025 */ move $a2, $zero -/* 057148 80056548 02403825 */ move $a3, $s2 -/* 05714C 8005654C AC490000 */ sw $t1, ($v0) -/* 057150 80056550 0C012D05 */ jal func_8004B414 -/* 057154 80056554 AC4A0004 */ sw $t2, 4($v0) -/* 057158 80056558 3C014010 */ li $at, 0x40100000 # 2.250000 -/* 05715C 8005655C 44813800 */ mtc1 $at, $f7 -/* 057160 80056560 24010003 */ li $at, 3 -/* 057164 80056564 0201001A */ div $zero, $s0, $at -/* 057168 80056568 C6720004 */ lwc1 $f18, 4($s3) -/* 05716C 8005656C 44803000 */ mtc1 $zero, $f6 -/* 057170 80056570 00002010 */ mfhi $a0 -/* 057174 80056574 46009121 */ cvt.d.s $f4, $f18 -/* 057178 80056578 A6200004 */ sh $zero, 4($s1) -/* 05717C 8005657C 46262200 */ add.d $f8, $f4, $f6 -/* 057180 80056580 02403025 */ move $a2, $s2 -/* 057184 80056584 462042A0 */ cvt.s.d $f10, $f8 -/* 057188 80056588 E66A0004 */ swc1 $f10, 4($s3) -/* 05718C 8005658C 06010004 */ bgez $s0, .L800565A0 -/* 057190 80056590 32050003 */ andi $a1, $s0, 3 -/* 057194 80056594 10A00002 */ beqz $a1, .L800565A0 -/* 057198 80056598 00000000 */ nop -/* 05719C 8005659C 24A5FFFC */ addiu $a1, $a1, -4 -.L800565A0: -/* 0571A0 800565A0 0C0158B9 */ jal func_800562E4 -/* 0571A4 800565A4 00000000 */ nop -/* 0571A8 800565A8 26020001 */ addiu $v0, $s0, 1 -/* 0571AC 800565AC 24130003 */ li $s3, 3 -/* 0571B0 800565B0 0053001A */ div $zero, $v0, $s3 -/* 0571B4 800565B4 240B6000 */ li $t3, 24576 -/* 0571B8 800565B8 00002010 */ mfhi $a0 -/* 0571BC 800565BC A62B0004 */ sh $t3, 4($s1) -/* 0571C0 800565C0 16600002 */ bnez $s3, .L800565CC -/* 0571C4 800565C4 00000000 */ nop -/* 0571C8 800565C8 0007000D */ break 7 -.L800565CC: -/* 0571CC 800565CC 2401FFFF */ li $at, -1 -/* 0571D0 800565D0 16610004 */ bne $s3, $at, .L800565E4 -/* 0571D4 800565D4 3C018000 */ lui $at, 0x8000 -/* 0571D8 800565D8 14410002 */ bne $v0, $at, .L800565E4 -/* 0571DC 800565DC 00000000 */ nop -/* 0571E0 800565E0 0006000D */ break 6 -.L800565E4: -/* 0571E4 800565E4 02403025 */ move $a2, $s2 -/* 0571E8 800565E8 04410004 */ bgez $v0, .L800565FC -/* 0571EC 800565EC 30450003 */ andi $a1, $v0, 3 -/* 0571F0 800565F0 10A00002 */ beqz $a1, .L800565FC -/* 0571F4 800565F4 00000000 */ nop -/* 0571F8 800565F8 24A5FFFC */ addiu $a1, $a1, -4 -.L800565FC: -/* 0571FC 800565FC 0C0158B9 */ jal func_800562E4 -/* 057200 80056600 00000000 */ nop -/* 057204 80056604 26020002 */ addiu $v0, $s0, 2 -/* 057208 80056608 0053001A */ div $zero, $v0, $s3 -/* 05720C 8005660C 340CA000 */ li $t4, 40960 -/* 057210 80056610 00002010 */ mfhi $a0 -/* 057214 80056614 A62C0004 */ sh $t4, 4($s1) -/* 057218 80056618 16600002 */ bnez $s3, .L80056624 -/* 05721C 8005661C 00000000 */ nop -/* 057220 80056620 0007000D */ break 7 -.L80056624: -/* 057224 80056624 2401FFFF */ li $at, -1 -/* 057228 80056628 16610004 */ bne $s3, $at, .L8005663C -/* 05722C 8005662C 3C018000 */ lui $at, 0x8000 -/* 057230 80056630 14410002 */ bne $v0, $at, .L8005663C -/* 057234 80056634 00000000 */ nop -/* 057238 80056638 0006000D */ break 6 -.L8005663C: -/* 05723C 8005663C 02403025 */ move $a2, $s2 -/* 057240 80056640 04410004 */ bgez $v0, .L80056654 -/* 057244 80056644 30450003 */ andi $a1, $v0, 3 -/* 057248 80056648 10A00002 */ beqz $a1, .L80056654 -/* 05724C 8005664C 00000000 */ nop -/* 057250 80056650 24A5FFFC */ addiu $a1, $a1, -4 -.L80056654: -/* 057254 80056654 0C0158B9 */ jal func_800562E4 -/* 057258 80056658 00000000 */ nop -/* 05725C 8005665C 8E820000 */ lw $v0, ($s4) -/* 057260 80056660 3C0F0001 */ lui $t7, (0x00010001 >> 16) # lui $t7, 1 -/* 057264 80056664 35EF0001 */ ori $t7, (0x00010001 & 0xFFFF) # ori $t7, $t7, 1 -/* 057268 80056668 244D0008 */ addiu $t5, $v0, 8 -/* 05726C 8005666C AE8D0000 */ sw $t5, ($s4) -/* 057270 80056670 3C0EBB00 */ lui $t6, 0xbb00 -/* 057274 80056674 AC4E0000 */ sw $t6, ($v0) -/* 057278 80056678 AC4F0004 */ sw $t7, 4($v0) -/* 05727C 8005667C 8FBF003C */ lw $ra, 0x3c($sp) -/* 057280 80056680 8FB40038 */ lw $s4, 0x38($sp) -/* 057284 80056684 8FB30034 */ lw $s3, 0x34($sp) -/* 057288 80056688 8FB20030 */ lw $s2, 0x30($sp) -/* 05728C 8005668C 8FB1002C */ lw $s1, 0x2c($sp) -/* 057290 80056690 8FB00028 */ lw $s0, 0x28($sp) -/* 057294 80056694 03E00008 */ jr $ra -/* 057298 80056698 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/src/common_textures.h b/src/common_textures.h index 957ab4c408..584effd9c2 100644 --- a/src/common_textures.h +++ b/src/common_textures.h @@ -263,7 +263,7 @@ extern s8 D_0D00B958[]; extern s8 D_0D00BD58[]; extern s8 D_0D00C158[]; extern u8 D_0D00C558[]; -extern s8 D_0D00D258[]; +extern u8 D_0D00D258[][4096]; extern s8 D_0D00E258[]; extern s8 D_0D00F258[]; extern s8 D_0D010258[]; @@ -271,7 +271,7 @@ extern s8 D_0D011258[]; extern s8 D_0D012258[]; extern s8 D_0D013258[]; extern s8 D_0D014258[]; -extern s8 D_0D015258[]; +extern u8 D_0D015258[][2048]; extern s8 D_0D015A58[]; extern s8 D_0D016258[]; extern s8 D_0D016A58[]; diff --git a/src/data/common_textures.inc.c b/src/data/common_textures.inc.c index da8748dc64..d74b6fe8d1 100644 --- a/src/data/common_textures.inc.c +++ b/src/data/common_textures.inc.c @@ -2623,64 +2623,58 @@ u8 D_0D00C558[] = { #include "textures/common/132B50_0C558.rgba16.inc.c" }; -// first place -s8 D_0D00D258[] = { - #include "textures/common/132B50_0D258.i4.inc.c" -}; - -// second place -s8 D_0D00E258[] = { - #include "textures/common/132B50_0E258.i4.inc.c" -}; - -// third place -s8 D_0D00F258[] = { - #include "textures/common/132B50_0F258.i4.inc.c" -}; - -// fourth place -s8 D_0D010258[] = { - #include "textures/common/132B50_10258.i4.inc.c" -}; - -// fifth place -s8 D_0D011258[] = { - #include "textures/common/132B50_11258.i4.inc.c" -}; - -// sixth place -s8 D_0D012258[] = { - #include "textures/common/132B50_12258.i4.inc.c" -}; - -// seventh place -s8 D_0D013258[] = { - #include "textures/common/132B50_13258.i4.inc.c" -}; - -// eighth place -s8 D_0D014258[] = { - #include "textures/common/132B50_14258.i4.inc.c" -}; - -// First -s8 D_0D015258[] = { - #include "textures/common/132B50_15258.i4.inc.c" -}; - -// Second -s8 D_0D015A58[] = { - #include "textures/common/132B50_15A58.i4.inc.c" -}; - -// Third -s8 D_0D016258[] = { - #include "textures/common/132B50_16258.i4.inc.c" +u8 D_0D00D258[][4096] = { + // first place + { + #include "textures/common/132B50_0D258.i4.inc.c" + }, + // second place + { + #include "textures/common/132B50_0E258.i4.inc.c" + }, + // third place + { + #include "textures/common/132B50_0F258.i4.inc.c" + }, + // fourth place + { + #include "textures/common/132B50_10258.i4.inc.c" + }, + // fifth place + { + #include "textures/common/132B50_11258.i4.inc.c" + }, + // sixth place + { + #include "textures/common/132B50_12258.i4.inc.c" + }, + // seventh place + { + #include "textures/common/132B50_13258.i4.inc.c" + }, + // eighth place + { + #include "textures/common/132B50_14258.i4.inc.c" + }, }; -// Fourth -s8 D_0D016A58[] = { - #include "textures/common/132B50_16A58.i4.inc.c" +u8 D_0D015258[][2048] = { + // First + { + #include "textures/common/132B50_15258.i4.inc.c" + }, + // Second + { + #include "textures/common/132B50_15A58.i4.inc.c" + }, + // Third + { + #include "textures/common/132B50_16258.i4.inc.c" + }, + // Fourth + { + #include "textures/common/132B50_16A58.i4.inc.c" + }, }; // tlut for 1p, 2p, 3p, 4p diff --git a/src/data/data_800E45C0.c b/src/data/data_800E45C0.c index 91f925ecbe..c0139eb4e6 100644 --- a/src/data/data_800E45C0.c +++ b/src/data/data_800E45C0.c @@ -1,26 +1,23 @@ -#include #include "data_800E45C0.h" -// Lights -Lights1 D_800E45C0 = gdSPDefLights1( - 0x64, 0x00, 0x00, - 0x64, 0x00, 0x00, 0x00, 0x88, 0x00 -); - -Lights1 D_800E45D8 = gdSPDefLights1( - 0x64, 0x64, 0x00, - 0xff, 0xff, 0x00, 0x00, 0x88, 0x00 -); - -Lights1 D_800E45F0 = gdSPDefLights1( - 0x64, 0x64, 0x64, - 0xff, 0xff, 0xff, 0x00, 0x88, 0x00 -); - -Lights1 D_800E4608 = gdSPDefLights1( - 0x64, 0x00, 0x00, - 0x64, 0x00, 0x00, 0x00, 0x88, 0x00 -); +Lights1 D_800E45C0[] = { + gdSPDefLights1( + 0x64, 0x00, 0x00, + 0x64, 0x00, 0x00, 0x00, 0x88, 0x00 + ), + gdSPDefLights1( + 0x64, 0x64, 0x00, + 0xff, 0xff, 0x00, 0x00, 0x88, 0x00 + ), + gdSPDefLights1( + 0x64, 0x64, 0x64, + 0xff, 0xff, 0xff, 0x00, 0x88, 0x00 + ), + gdSPDefLights1( + 0x64, 0x00, 0x00, + 0x64, 0x00, 0x00, 0x00, 0x88, 0x00 + ), +}; Lights1 D_800E4620 = gdSPDefLights1( 0x96, 0xb4, 0xfa, @@ -67,10 +64,10 @@ Lights1 D_800E46E0 = gdSPDefLights1( 0xff, 0xff, 0xff, 0x00, 0x00, 0x78 ); -u32 D_800E46F8[] = { - 0x000000ff, 0x000000ff, 0x000000ff, - 0x000000ff, 0x000000ff, 0x00000000, - 0x000000ff, 0x00000000, 0x00000000, +Vec3u32 D_800E46F8[] = { + {0x000000ff, 0x000000ff, 0x000000ff}, + {0x000000ff, 0x000000ff, 0x00000000}, + {0x000000ff, 0x00000000, 0x00000000}, }; u8 D_800E471C[] = { 0x00, 0x01, 0x02, 0x03, 0x02, 0x01, 0x00 }; diff --git a/src/data/data_800E45C0.h b/src/data/data_800E45C0.h index d28fc0dbe1..2dd9421ab0 100644 --- a/src/data/data_800E45C0.h +++ b/src/data/data_800E45C0.h @@ -1,7 +1,11 @@ #ifndef DATA_800E45C0_H #define DATA_800E45C0_H -extern Lights1 D_800E45C0; +#include + +typedef u32 Vec3u32[3]; + +extern Lights1 D_800E45C0[]; extern Lights1 D_800E45D8; extern Lights1 D_800E45F0; extern Lights1 D_800E4608; @@ -14,7 +18,7 @@ extern Lights1 D_800E4698; extern Lights1 D_800E46B0; extern Lights1 D_800E46C8; extern Lights1 D_800E46E0; -extern u32 D_800E46F8[]; +extern Vec3u32 D_800E46F8[]; extern u8 D_800E471C[]; #endif diff --git a/src/hud_renderer.c b/src/hud_renderer.c index 7bf1b878a9..7e582f356b 100644 --- a/src/hud_renderer.c +++ b/src/hud_renderer.c @@ -20,11 +20,15 @@ #include "common_textures.h" #include "code_8001F980.h" #include "code_80004740.h" +#include "code_80005FD0.h" +#include "code_80057C60.h" +#include "code_8006E9C0.h" #include "hud_renderer.h" #include "code_80071F00.h" #include "code_80091750.h" #include "collision.h" #include "main.h" +#include "menus.h" #include "code_80086E70.h" #include "code_800029B0.h" #include "src/data/data_800E45C0.h" @@ -217,49 +221,20 @@ void func_8004477C(u8 *texture, s32 width, s32 height) { G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); } -#ifdef MIPS_TO_C -//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b void func_80044924(u8 *texture, s32 width, s32 height) { - //gDPLoadTextureBlock(gDisplayListHead++, &image, G_IM_FMT_IA, G_IM_SIZ_4b, width, height, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); - s32 temp_t0; - s32 temp_t3; - s32 var_a0; - - // temp_t3 = ((s32) ((width * height) + 3) >> 2) - 1; - // temp_t0 = width / 16; - - gDPSetTextureImage(gDisplayListHead++, G_IM_FMT_IA, G_IM_SIZ_16b, 1, texture); - gDPSetTile(gDisplayListHead++, G_IM_FMT_IA, G_IM_SIZ_16b, 0, 0x0000, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOLOD); - gDPLoadSync(gDisplayListHead++); - gDPLoadBlock(gDisplayListHead++, G_TX_LOADTILE, 0, (temp_t0 + 0x7FF) / temp_t0, temp_t3, 0); - gDPPipeSync(gDisplayListHead++); - gDPSetTile(gDisplayListHead++, G_IM_FMT_IA, G_IM_SIZ_4b, 0, 0x0000, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOLOD); - gDPSetTileSize(gDisplayListHead++, G_TX_RENDERTILE, 0, 0, 0, 0); - - // // set tile - // //temp_v0_2->words.w0 = 0xF5700000; - // //temp_v0_2->words.w1 = 0x07080200; - - - // // loadblock - // //temp_v0_4->words.w0 = 0xF3000000; - // // if (temp_t3 < 0x7FF) { - // // var_a0 = temp_t3; - // // } else { - // // var_a0 = 0x7FF; - // // } - // //temp_v0_4->words.w1 = ((var_a0 & 0xFFF) << 0xC) | 0x07000000 | (((s32) (temp_t0 + 0x7FF) / temp_t0) & 0xFFF); - - // // set tile - // temp_v0_6->words.w1 = 0x00080200; - // temp_v0_6->words.w0 = ((((s32) ((width >> 1) + 7) >> 3) & 0x1FF) << 9) | 0xF5600000; - // // set tile size - // temp_v0_7->words.w0 = 0xF2000000; - // temp_v0_7->words.w1 = ((((width - 1) * 4) & 0xFFF) << 0xC) | (((height - 1) * 4) & 0xFFF); + // This macro ought to be equivalent to the block of macros below but it doesn't match + // See comment above the `gDPLoadBlock` macro + // gDPLoadTextureBlock_4b(gDisplayListHead++, texture, G_IM_FMT_I, width, height, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); + + gDPSetTextureImage(gDisplayListHead++, G_IM_FMT_IA, G_IM_SIZ_16b, 1, texture); + gDPSetTile(gDisplayListHead++, G_IM_FMT_IA, G_IM_SIZ_16b, 0, G_TX_RENDERTILE, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOLOD); + gDPLoadSync(gDisplayListHead++); + // The last argument to this macro really should be `CALC_DXT_4b(width)` but that creates a massive diff + gDPLoadBlock(gDisplayListHead++, G_TX_LOADTILE, 0, 0, (((width * height) + 3) >> 2) - 1, ((width / 16) + 2047) / (width / 16)); + gDPPipeSync(gDisplayListHead++); + gDPSetTile(gDisplayListHead++, G_IM_FMT_IA, G_IM_SIZ_4b, (((width >> 1) + 7) >> 3), G_TX_RENDERTILE, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOLOD); + gDPSetTileSize(gDisplayListHead++, G_TX_RENDERTILE, 0, 0, (width-1) << G_TEXTURE_IMAGE_FRAC, (height-1) << G_TEXTURE_IMAGE_FRAC); } -#else -GLOBAL_ASM("asm/non_matchings/hud_renderer/func_80044924.s") -#endif UNUSED void func_80044AB8(u8 *texture, s32 width, s32 height) { gDPLoadTextureTile_4b(gDisplayListHead++, texture, G_IM_FMT_IA, width, height, @@ -272,177 +247,52 @@ void func_80044BF8(u8 *texture, s32 width, s32 height) { G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); } -#ifdef MIPS_TO_C -//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b -void func_80044DA0(s8 *image, s32 width, s32 height) { - /* - It seems like we should be using the below macro, but its not quite right - gDPLoadMultiBlock_4b(gDisplayListHead++, image, G_IM_FMT_I, width, height, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); - */ - Gfx *temp_v0; - Gfx *temp_v0_2; - Gfx *temp_v0_3; - Gfx *temp_v0_4; - Gfx *temp_v0_5; - Gfx *temp_v0_6; - Gfx *temp_v0_7; - s32 temp_t0; - s32 temp_t3; - s32 var_a0; - - temp_v0 = gDisplayListHead; - gDisplayListHead = temp_v0 + 8; - temp_v0->words.w0 = 0xFD900000; - temp_v0->words.w1 = (u32) image; - temp_v0_2 = gDisplayListHead; - gDisplayListHead = temp_v0_2 + 8; - temp_v0_2->words.w0 = 0xF5900000; - temp_v0_2->words.w1 = 0x07080200; - temp_v0_3 = gDisplayListHead; - gDisplayListHead = temp_v0_3 + 8; - temp_v0_3->words.w0 = 0xE6000000; - temp_v0_3->words.w1 = 0; - temp_v0_4 = gDisplayListHead; - temp_t3 = ((s32) ((width * height) + 3) >> 2) - 1; - gDisplayListHead = temp_v0_4 + 8; - temp_v0_4->words.w0 = 0xF3000000; - if (temp_t3 < 0x7FF) { - var_a0 = temp_t3; - } else { - var_a0 = 0x7FF; - } - temp_t0 = width / 16; - temp_v0_4->words.w1 = ((var_a0 & 0xFFF) << 0xC) | 0x07000000 | (((s32) (temp_t0 + 0x7FF) / temp_t0) & 0xFFF); - temp_v0_5 = gDisplayListHead; - gDisplayListHead = temp_v0_5 + 8; - temp_v0_5->words.w0 = 0xE7000000; - temp_v0_5->words.w1 = 0; - temp_v0_6 = gDisplayListHead; - gDisplayListHead = temp_v0_6 + 8; - temp_v0_6->words.w1 = 0x00080200; - temp_v0_6->words.w0 = ((((s32) ((width >> 1) + 7) >> 3) & 0x1FF) << 9) | 0xF5800000; - temp_v0_7 = gDisplayListHead; - gDisplayListHead = temp_v0_7 + 8; - temp_v0_7->words.w0 = 0xF2000000; - temp_v0_7->words.w1 = ((((width - 1) * 4) & 0xFFF) << 0xC) | (((height - 1) * 4) & 0xFFF); -} -#else -GLOBAL_ASM("asm/non_matchings/hud_renderer/func_80044DA0.s") -#endif - -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 - - -void func_80044F34(s32 arg0, s32 arg1, s32 arg2) { - s32 temp_t0; - s32 temp_t3; - void *temp_v0; - void *temp_v0_2; - void *temp_v0_3; - void *temp_v0_4; - void *temp_v0_5; - void *temp_v0_6; - void *temp_v0_7; - s32 phi_a0; - - temp_v0 = gDisplayListHead; - gDisplayListHead = temp_v0 + 8; - temp_v0->unk0 = 0xFD900000; - temp_v0->unk4 = arg0; - temp_v0_2 = gDisplayListHead; - gDisplayListHead = temp_v0_2 + 8; - temp_v0_2->unk0 = 0xF5900000; - temp_v0_2->unk4 = 0x7080200; - temp_v0_3 = gDisplayListHead; - gDisplayListHead = temp_v0_3 + 8; - temp_v0_3->unk0 = 0xE6000000; - temp_v0_3->unk4 = 0; - temp_v0_4 = gDisplayListHead; - temp_t3 = (((arg1 * arg2) + 3) >> 2) - 1; - gDisplayListHead = temp_v0_4 + 8; - temp_v0_4->unk0 = 0xF3000000; - if (temp_t3 < 0x7FF) { - phi_a0 = temp_t3; - } else { - phi_a0 = 0x7FF; - } - temp_t0 = arg1 / 0x10; - temp_v0_4->unk4 = ((phi_a0 & 0xFFF) << 0xC) | 0x7000000 | (((temp_t0 + 0x7FF) / temp_t0) & 0xFFF); - temp_v0_5 = gDisplayListHead; - gDisplayListHead = temp_v0_5 + 8; - temp_v0_5->unk0 = 0xE7000000; - temp_v0_5->unk4 = 0; - temp_v0_6 = gDisplayListHead; - gDisplayListHead = temp_v0_6 + 8; - temp_v0_6->unk4 = 0x80200; - temp_v0_6->unk0 = (((((arg1 >> 1) + 7) >> 3) & 0x1FF) << 9) | 0xF5800000; - temp_v0_7 = gDisplayListHead; - gDisplayListHead = temp_v0_7 + 8; - temp_v0_7->unk0 = 0xF2000000; - temp_v0_7->unk4 = ((((arg1 - 1) * 4) & 0xFFF) << 0xC) | (((arg2 - 1) * 4) & 0xFFF); +void func_80044DA0(u8 *image, s32 width, s32 height) { + // This macro ought to be equivalent to the block of macros below but it doesn't match + // See comment above the `gDPLoadBlock` macro + // gDPLoadTextureBlock_4b(gDisplayListHead++, image, G_IM_FMT_I, width, height, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); + + gDPSetTextureImage(gDisplayListHead++, G_IM_FMT_I, G_IM_SIZ_16b, 1, image); + gDPSetTile(gDisplayListHead++, G_IM_FMT_I, G_IM_SIZ_16b, 0, G_TX_RENDERTILE, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOLOD); + gDPLoadSync(gDisplayListHead++); + // The last argument to this macro really should be `CALC_DXT_4b(width)` but that creates a massive diff + gDPLoadBlock(gDisplayListHead++, G_TX_LOADTILE, 0, 0, (((width * height) + 3) >> 2) - 1, ((width / 16) + 2047) / (width / 16)); + gDPPipeSync(gDisplayListHead++); + gDPSetTile(gDisplayListHead++, G_IM_FMT_I, G_IM_SIZ_4b, (((width >> 1) + 7) >> 3), G_TX_RENDERTILE, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOLOD); + gDPSetTileSize(gDisplayListHead++, G_TX_RENDERTILE, 0, 0, (width-1) << G_TEXTURE_IMAGE_FRAC, (height-1) << G_TEXTURE_IMAGE_FRAC); +} + +// Appears to be a complete copy of `func_80044F34`? +void func_80044F34(u8 *image, s32 width, s32 height) { + // This macro ought to be equivalent to the block of macros below but it doesn't match + // See comment above the `gDPLoadBlock` macro + // gDPLoadTextureBlock_4b(gDisplayListHead++, image, G_IM_FMT_I, width, height, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); + + gDPSetTextureImage(gDisplayListHead++, G_IM_FMT_I, G_IM_SIZ_16b, 1, image); + gDPSetTile(gDisplayListHead++, G_IM_FMT_I, G_IM_SIZ_16b, 0, G_TX_RENDERTILE, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOLOD); + gDPLoadSync(gDisplayListHead++); + // The last argument to this macro really should be `CALC_DXT_4b(width)` but that creates a massive diff + gDPLoadBlock(gDisplayListHead++, G_TX_LOADTILE, 0, 0, (((width * height) + 3) >> 2) - 1, ((width / 16) + 2047) / (width / 16)); + gDPPipeSync(gDisplayListHead++); + gDPSetTile(gDisplayListHead++, G_IM_FMT_I, G_IM_SIZ_4b, (((width >> 1) + 7) >> 3), G_TX_RENDERTILE, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOLOD); + gDPSetTileSize(gDisplayListHead++, G_TX_RENDERTILE, 0, 0, (width-1) << G_TEXTURE_IMAGE_FRAC, (height-1) << G_TEXTURE_IMAGE_FRAC); } -#else -GLOBAL_ASM("asm/non_matchings/hud_renderer/func_80044F34.s") -#endif -#ifdef MIPS_TO_C -//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b void func_800450C8(u8 *image, s32 width, s32 height) { - Gfx *temp_v1; - Gfx *temp_v1_2; - Gfx *temp_v1_3; - Gfx *temp_v1_4; - Gfx *temp_v1_5; - Gfx *temp_v1_6; - Gfx *temp_v1_7; - s32 temp_a1; - s32 temp_t0; - s32 temp_t6; - s32 temp_v0; - s32 var_t3; + // This macro ought to be equivalent to the block of macros below but it doesn't match + // See comment above the `gDPLoadBlock` macro + // gDPLoadTextureBlock_4b(gDisplayListHead++, image, G_IM_FMT_I, width, height, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_MIRROR | G_TX_WRAP, G_TX_NOMASK, masks, G_TX_NOLOD, G_TX_NOLOD); + s32 masks = func_80043A54(width); - temp_v0 = func_80043A54(width); - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; - temp_v1->words.w0 = 0xFD900000; - temp_v1->words.w1 = (u32) image; - temp_v1_2 = gDisplayListHead; - temp_t6 = (temp_v0 & 0xF) * 0x10; - gDisplayListHead = temp_v1_2 + 8; - temp_v1_2->words.w0 = 0xF5900000; - temp_v1_2->words.w1 = temp_t6 | 0x07080100; - temp_v1_3 = gDisplayListHead; - gDisplayListHead = temp_v1_3 + 8; - temp_v1_3->words.w0 = 0xE6000000; - temp_v1_3->words.w1 = 0; - temp_v1_4 = gDisplayListHead; - temp_t0 = ((s32) ((width * height) + 3) >> 2) - 1; - gDisplayListHead = temp_v1_4 + 8; - temp_v1_4->words.w0 = 0xF3000000; - if (temp_t0 < 0x7FF) { - var_t3 = temp_t0; - } else { - var_t3 = 0x7FF; - } - temp_a1 = width / 16; - temp_v1_4->words.w1 = ((var_t3 & 0xFFF) << 0xC) | 0x07000000 | (((s32) (temp_a1 + 0x7FF) / temp_a1) & 0xFFF); - temp_v1_5 = gDisplayListHead; - gDisplayListHead = temp_v1_5 + 8; - temp_v1_5->words.w0 = 0xE7000000; - temp_v1_5->words.w1 = 0; - temp_v1_6 = gDisplayListHead; - gDisplayListHead = temp_v1_6 + 8; - temp_v1_6->words.w1 = temp_t6 | 0x80100; - temp_v1_6->words.w0 = ((((s32) ((width >> 1) + 7) >> 3) & 0x1FF) << 9) | 0xF5800000; - temp_v1_7 = gDisplayListHead; - gDisplayListHead = temp_v1_7 + 8; - temp_v1_7->words.w0 = 0xF2000000; - temp_v1_7->words.w1 = ((((width - 1) * 4) & 0xFFF) << 0xC) | (((height - 1) * 4) & 0xFFF); + gDPSetTextureImage(gDisplayListHead++, G_IM_FMT_I, G_IM_SIZ_16b, 1, image); + gDPSetTile(gDisplayListHead++, G_IM_FMT_I, G_IM_SIZ_16b, 0, G_TX_RENDERTILE, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOLOD, G_TX_MIRROR | G_TX_WRAP, masks, G_TX_NOLOD); + gDPLoadSync(gDisplayListHead++); + // The last argument to this macro really should be `CALC_DXT_4b(width)` but that creates a massive diff + gDPLoadBlock(gDisplayListHead++, G_TX_LOADTILE, 0, 0, (((width * height) + 3) >> 2) - 1, ((width / 16) + 2047) / (width / 16)); + gDPPipeSync(gDisplayListHead++); + gDPSetTile(gDisplayListHead++, G_IM_FMT_I, G_IM_SIZ_4b, (((width >> 1) + 7) >> 3), G_TX_RENDERTILE, G_TX_RENDERTILE, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOLOD, G_TX_MIRROR | G_TX_WRAP, masks, G_TX_NOLOD); + gDPSetTileSize(gDisplayListHead++, G_TX_RENDERTILE, 0, 0, (width-1) << G_TEXTURE_IMAGE_FRAC, (height-1) << G_TEXTURE_IMAGE_FRAC); } -#else -GLOBAL_ASM("asm/non_matchings/hud_renderer/func_800450C8.s") -#endif void rsp_load_texture(u8 *texture, s32 width, s32 height) { gDPLoadTextureBlock(gDisplayListHead++, texture, G_IM_FMT_CI, G_IM_SIZ_8b, width, height, 0, @@ -460,163 +310,15 @@ UNUSED void func_80045614(u8 *texture, s32 width, s32 height) { G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); } -#ifdef MIPS_TO_C -//generated by m2c commit 6b6e1390bf30013247343623194964ff13d0c45b UNUSED void func_80045738(u8 *image1, u8 *image2, s32 width, s32 height) { - Gfx *sp4C; - Gfx *sp28; - Gfx *sp24; - Gfx *sp20; - Gfx *sp1C; - s32 spC; - s32 sp4; - s32 sp0; - Gfx *temp_t0; - Gfx *temp_t1; - Gfx *temp_v0; - Gfx *temp_v0_10; - Gfx *temp_v0_11; - Gfx *temp_v0_13; - Gfx *temp_v0_14; - Gfx *temp_v0_15; - Gfx *temp_v0_16; - Gfx *temp_v0_17; - Gfx *temp_v0_2; - Gfx *temp_v0_3; - Gfx *temp_v0_5; - Gfx *temp_v0_6; - Gfx *temp_v0_7; - Gfx *temp_v0_8; - Gfx *temp_v0_9; - s32 temp_a0; - s32 temp_a0_2; - s32 temp_lo; - s32 temp_t5; - s32 temp_t6; - s32 temp_t8; - s32 temp_v0_12; - s32 temp_v0_4; - s32 var_t2; - s32 var_t2_2; - s32 var_t3; - s32 var_t3_2; - s32 var_t4; - s32 var_t4_2; - - temp_t0 = gDisplayListHead; - gDisplayListHead = temp_t0 + 8; - temp_t0->words.w0 = 0xFCFFFFFF; - temp_t0->words.w1 = 0xFFFCF438; - temp_t1 = gDisplayListHead; - gDisplayListHead = temp_t1 + 8; - temp_t1->words.w1 = (u32) image2; - temp_t1->words.w0 = 0xFD900000; - temp_v0 = gDisplayListHead; - gDisplayListHead = temp_v0 + 8; - temp_v0->words.w0 = 0xF5900100; - temp_v0->words.w1 = 0x070C0300; - temp_v0_2 = gDisplayListHead; - gDisplayListHead = temp_v0_2 + 8; - temp_v0_2->words.w0 = 0xE6000000; - temp_v0_2->words.w1 = 0; - temp_v0_3 = gDisplayListHead; - var_t4 = 0x7FF; - gDisplayListHead = temp_v0_3 + 8; - sp4C = temp_v0_3; - temp_v0_3->words.w0 = 0xF3000000; - temp_lo = width * height; - temp_t5 = ((s32) (temp_lo + 1) >> 1) - 1; - spC = temp_lo; - if (temp_t5 < 0x7FF) { - var_t4 = temp_t5; - } - temp_v0_4 = width / 8; - var_t3 = temp_v0_4; - if (temp_v0_4 <= 0) { - var_t3 = 1; - } - if (temp_v0_4 <= 0) { - var_t2 = 1; - } else { - var_t2 = temp_v0_4; - } - sp4C->words.w1 = (((s32) (var_t3 + 0x7FF) / var_t2) & 0xFFF) | 0x07000000 | ((var_t4 & 0xFFF) << 0xC); - temp_v0_5 = gDisplayListHead; - gDisplayListHead = temp_v0_5 + 8; - temp_v0_5->words.w0 = 0xE7000000; - temp_v0_5->words.w1 = 0; - temp_v0_6 = gDisplayListHead; - gDisplayListHead = temp_v0_6 + 8; - temp_v0_6->words.w0 = ((((s32) (width + 7) >> 3) & 0x1FF) << 9) | 0xF5880000 | 0x100; - temp_v0_6->words.w1 = 0x000C0300; - temp_v0_7 = gDisplayListHead; - var_t4_2 = 0x7FF; - gDisplayListHead = temp_v0_7 + 8; - temp_v0_7->words.w0 = 0xF2000000; - temp_t6 = (((width - 1) * 4) & 0xFFF) << 0xC; - temp_t8 = ((height - 1) * 4) & 0xFFF; - sp0 = temp_t8; - sp4 = temp_t6; - temp_v0_7->words.w1 = temp_t6 | temp_t8; - temp_v0_8 = gDisplayListHead; - gDisplayListHead = temp_v0_8 + 8; - temp_v0_8->words.w0 = 0xFD100000; - temp_v0_8->words.w1 = (u32) image1; - temp_v0_9 = gDisplayListHead; - gDisplayListHead = temp_v0_9 + 8; - temp_v0_9->words.w0 = 0xF5100000; - temp_v0_9->words.w1 = 0x070C0300; - temp_v0_10 = gDisplayListHead; - gDisplayListHead = temp_v0_10 + 8; - temp_v0_10->words.w0 = 0xE6000000; - temp_v0_10->words.w1 = 0; - temp_v0_11 = gDisplayListHead; - gDisplayListHead = temp_v0_11 + 8; - temp_v0_11->words.w0 = 0xF3000000; - temp_a0 = spC - 1; - if (temp_a0 < 0x7FF) { - var_t4_2 = temp_a0; - } - temp_a0_2 = width * 2; - temp_v0_12 = temp_a0_2 / 8; - var_t3_2 = temp_v0_12; - if (temp_v0_12 <= 0) { - var_t3_2 = 1; - } - if (temp_v0_12 <= 0) { - var_t2_2 = 1; - } else { - var_t2_2 = temp_v0_12; - } - temp_v0_11->words.w1 = (((s32) (var_t3_2 + 0x7FF) / var_t2_2) & 0xFFF) | 0x07000000 | ((var_t4_2 & 0xFFF) << 0xC); - temp_v0_13 = gDisplayListHead; - gDisplayListHead = temp_v0_13 + 8; - temp_v0_13->words.w0 = 0xE7000000; - temp_v0_13->words.w1 = 0; - temp_v0_14 = gDisplayListHead; - gDisplayListHead = temp_v0_14 + 8; - sp28 = temp_v0_14; - temp_v0_14->words.w1 = 0x000C0300; - temp_v0_14->words.w0 = ((((s32) (temp_a0_2 + 7) >> 3) & 0x1FF) << 9) | 0xF5100000; - temp_v0_15 = gDisplayListHead; - gDisplayListHead = temp_v0_15 + 8; - sp24 = temp_v0_15; - temp_v0_15->words.w0 = 0xF2000000; - temp_v0_15->words.w1 = sp4 | sp0; - temp_v0_16 = gDisplayListHead; - gDisplayListHead = temp_v0_16 + 8; - sp20 = temp_v0_16; - temp_v0_16->words.w0 = ((((s32) (width + 7) >> 3) & 0x1FF) << 9) | 0xF5880000 | 0x100; - sp20->words.w1 = 0x01000000; - temp_v0_17 = gDisplayListHead; - gDisplayListHead = temp_v0_17 + 8; - sp1C = temp_v0_17; - temp_v0_17->words.w0 = 0xF2000000; - sp1C->words.w1 = sp4 | 0x01000000 | sp0; + gDPSetCombineLERP(gDisplayListHead++, 0, 0, 0, TEXEL0, 0, 0, 0, TEXEL1, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED); + + gDPLoadMultiBlock(gDisplayListHead++, image2, 0x100, G_TX_RENDERTILE, G_IM_FMT_I, G_IM_SIZ_8b, width, height, 0, G_TX_MIRROR | G_TX_CLAMP, G_TX_MIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); + gDPLoadTextureBlock(gDisplayListHead++, image1, G_IM_FMT_RGBA, G_IM_SIZ_16b, width, height, 0, G_TX_MIRROR | G_TX_CLAMP, G_TX_MIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); + + gDPSetTile(gDisplayListHead++, G_IM_FMT_I, G_IM_SIZ_8b, (width + 7) >> 3, 0x0100, 1, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOLOD);; + gDPSetTileSize(gDisplayListHead++, 1, 0, 0, (width-1) << G_TEXTURE_IMAGE_FRAC, (height-1) << G_TEXTURE_IMAGE_FRAC); } -#else -GLOBAL_ASM("asm/non_matchings/hud_renderer/func_80045738.s") -#endif void func_80045B2C(Vtx *arg0) { gSPVertex(gDisplayListHead++, arg0, 4, 0); @@ -1810,65 +1512,40 @@ UNUSED void func_8004BB34(void) { } -#ifdef MIPS_TO_C -//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b void func_8004BB3C(s32 arg0, s32 arg1, s32 arg2, s32 arg3, f32 arg4) { - Gfx *temp_a3; - Gfx *temp_a3_2; - Gfx *temp_a3_3; - s16 var_a0; - s16 var_a1; - s32 temp_f18; - s32 temp_f18_2; - s32 temp_t4; - s32 temp_t5; - s32 temp_t9; + s16 t; + s16 s; + s16 temp_t9; s32 var_t0; s32 var_t1; - s32 var_v0; - s32 var_v1; - - temp_f18 = (s32) ((f64) ((f32) (arg2 * 4) * arg4) + 0.5); - var_t0 = temp_f18; - temp_f18_2 = (s32) ((f64) ((f32) (arg3 * 4) * arg4) + 0.5); - var_t1 = temp_f18_2; - temp_t4 = (arg0 * 4) - (temp_f18 / 2); - var_v0 = temp_t4; - temp_t5 = (arg1 * 4) - (temp_f18_2 / 2); - var_v1 = temp_t5; - if (-temp_f18 < temp_t4) { - var_a0 = 0; - if (-temp_f18_2 < temp_t5) { - var_a1 = 0; - if (temp_t4 < 0) { - var_t0 = temp_f18 + temp_t4; - var_v0 = 0; - var_a1 = (s16) (s32) ((f32) (temp_t4 * -8) / arg4); + s32 xl; + s32 yl; + s32 thing0; + s32 thing1; + + var_t0 = (arg2 * 4 * arg4) + 0.5; + var_t1 = (arg3 * 4 * arg4) + 0.5; + xl = (arg0 * 4) - (var_t0 / 2); + yl = (arg1 * 4) - (var_t1 / 2); + if (-var_t0 < xl) { + t = 0; + if (-var_t1 < yl) { + s = 0; + if (xl < 0) { + var_t0 += xl; + s = (-xl * 8) / arg4; + xl = 0; } - if (temp_t5 < 0) { - var_t1 = temp_f18_2 + temp_t5; - var_v1 = 0; - var_a0 = (s16) (s32) ((f32) (temp_t5 * -8) / arg4); + if (yl < 0) { + var_t1 += yl; + t = (-yl * 8) / arg4; + yl = 0; } - temp_a3 = gDisplayListHead; - gDisplayListHead = temp_a3 + 8; - temp_a3->words.w0 = (((var_v0 + var_t0) & 0xFFF) << 0xC) | 0xE4000000 | ((var_v1 + var_t1) & 0xFFF); - temp_a3->words.w1 = ((var_v0 & 0xFFF) << 0xC) | (var_v1 & 0xFFF); - temp_a3_2 = gDisplayListHead; - gDisplayListHead = temp_a3_2 + 8; - temp_a3_2->words.w0 = 0xB3000000; - temp_a3_2->words.w1 = (var_a1 << 0x10) | (var_a0 & 0xFFFF); - temp_a3_3 = gDisplayListHead; - gDisplayListHead = temp_a3_3 + 8; - temp_a3_3->words.w0 = 0xB2000000; - temp_t9 = (s32) ((f64) (1024.0f / arg4) + 0.5) & 0xFFFF; - temp_a3_3->words.w1 = (temp_t9 << 0x10) | temp_t9; + temp_t9 = (1024.0f / arg4) + 0.5; + gSPTextureRectangle(gDisplayListHead++, xl, yl, xl + var_t0, yl + var_t1, 0, s, t, temp_t9, temp_t9); } } } -#else -GLOBAL_ASM("asm/non_matchings/hud_renderer/func_8004BB3C.s") -#endif UNUSED void func_8004BD14(s32 x, s32 y, u32 width, u32 height, s32 alpha, u8 *texture1, u8 *texture2) { gSPDisplayList(gDisplayListHead++, D_0D007F38); @@ -1982,20 +1659,14 @@ void func_8004C6FC(s16 arg0, s16 arg1, s8 *arg2, u32 arg3, u32 arg4) { u32 var_s6; u32 var_t2; - temp_v0 = gDisplayListHead; var_s4 = arg1 - (arg4 >> 1); - gDisplayListHead = temp_v0 + 8; - temp_v0->words.w0 = 0x06000000; - temp_v0->words.w1 = (u32) D_0D007EF8; - temp_v0_2 = gDisplayListHead; + gSPDisplayList(gDisplayListHead++, D_0D007EF8); temp_t8 = arg3 * arg4 * 4; - gDisplayListHead = temp_v0_2 + 8; temp_t3 = temp_t8 >> 0xC; var_s5 = arg2; var_s6 = temp_t8; var_t2 = temp_t3; - temp_v0_2->words.w1 = 0x00504240; - temp_v0_2->words.w0 = 0xB900031D; + gDPSetRenderMode(gDisplayListHead++, G_RM_XLU_SURF, G_RM_XLU_SURF2); if (temp_t8 & 0xFFF) { var_t2 = temp_t3 + 1; } @@ -2017,10 +1688,7 @@ void func_8004C6FC(s16 arg0, s16 arg1, s8 *arg2, u32 arg3, u32 arg4) { var_s4 += var_s0; } while (var_s3 < (s32) var_t2); } - temp_v0_4 = gDisplayListHead; - gDisplayListHead = temp_v0_4 + 8; - temp_v0_4->words.w0 = 0x06000000; - temp_v0_4->words.w1 = (u32) D_0D007EB8; + gSPDisplayList(gDisplayListHead++, D_0D007EB8); } #else GLOBAL_ASM("asm/non_matchings/hud_renderer/func_8004C6FC.s") @@ -2152,7 +1820,7 @@ UNUSED void func_8004D0CC(void) { } -UNUSED Gfx *func_8004D0D4(s32 arg0, s32 arg1, u8 *texture, s32 width, s32 arg4, s32 height) { +UNUSED void func_8004D0D4(s32 arg0, s32 arg1, u8 *texture, s32 width, s32 arg4, s32 height) { s32 var_s0; u8 *img; s32 i; @@ -2250,11 +1918,6 @@ UNUSED void func_8004D654(s32 arg0, s32 arg1, u8 *texture, f32 arg3, s32 arg4, s GLOBAL_ASM("asm/non_matchings/hud_renderer/func_8004D654.s") #endif -extern u16 D_801656B0; -extern s16 D_80165708; -extern s16 D_80165710; -extern f32 D_8018D00C; - void func_8004D7B4(s32 arg0, s32 arg1, u8 *texture, s32 arg3, s32 arg4) { s32 sp5C; f32 temp_f20; @@ -2432,11 +2095,6 @@ void func_8004DF5C(s32 arg0, s32 arg1, u8 *texture, s32 width, s32 arg4, s32 hei } } -extern u16 D_801656B0; -extern s16 D_80165708; -extern s16 D_80165710; -extern f32 D_8018D00C; - void func_8004E06C(s32 arg0, s32 arg1, u8 *texture, s32 arg3, s32 arg4) { f32 temp_f20; s16 temp_s7; @@ -2576,52 +2234,33 @@ void func_8004E78C(s32 playerId) { func_8004CB90(D_8018CA70[playerId].lapX + 0x1C, (s32) D_8018CA70[playerId].lapY, D_800E4570[D_8018CA70[playerId].alsoLapCount]); } -#ifdef MIPS_TO_C -//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b -extern s32 D_80165594; -extern s16 D_8018CF98[]; -static s32 D_800E55F8[8] = { 0x000000FF, 0x000000ED, 0x000000D7, 0x000000BF, 0x000000A2, 0x00000082, 0x00000061, 0x0000003A, }; - void func_8004E800(s32 playerId) { - s16 temp_v1; - struct_8018CA70_entry *temp_v0; - - temp_v0 = &D_8018CA70[playerId]; - if ((u8) temp_v0->unk_81 != 0) { - if (temp_v0->lapCount != 3) { - temp_v1 = D_8018CF98[playerId]; - func_8004A384(temp_v0->slideRankX + temp_v0->rankX, temp_v0->slideRankY + temp_v0->rankY, 0U, temp_v0->rankScaling, 0x000000FF, D_800E55F8[temp_v1], 0, 0x000000FF, (s32) ((temp_v1 << 0xC) + D_0D00D258), D_0D0068F0, 0x00000080, 0x00000040, 0x00000080, 0x00000040); - return; + if (D_8018CA70[playerId].unk_81 != 0) { + if (D_8018CA70[playerId].lapCount != 3) { + func_8004A384(D_8018CA70[playerId].rankX + D_8018CA70[playerId].slideRankX, D_8018CA70[playerId].rankY + D_8018CA70[playerId].slideRankY, 0U, + D_8018CA70[playerId].rankScaling, 0x000000FF, D_800E55F8[D_8018CF98[playerId]], 0, 0x000000FF, D_0D00D258[D_8018CF98[playerId]], + D_0D0068F0, 0x00000080, 0x00000040, 0x00000080, 0x00000040); + } else { + func_8004A384(D_8018CA70[playerId].rankX + D_8018CA70[playerId].slideRankX, D_8018CA70[playerId].rankY + D_8018CA70[playerId].slideRankY, 0U, + D_8018CA70[playerId].rankScaling, 0x000000FF, D_800E55F8[D_80165594], 0, 0x000000FF, D_0D00D258[gGPCurrentRaceRankByPlayerId[playerId]], + D_0D0068F0, 0x00000080, 0x00000040, 0x00000080, 0x00000040); } - func_8004A384(temp_v0->slideRankX + temp_v0->rankX, temp_v0->slideRankY + temp_v0->rankY, 0U, temp_v0->rankScaling, 0x000000FF, D_800E55F8[D_80165594], 0, 0x000000FF, (s32) ((gGPCurrentRaceRankByPlayerId[playerId] << 0xC) + D_0D00D258), D_0D0068F0, 0x00000080, 0x00000040, 0x00000080, 0x00000040); } } -#else -GLOBAL_ASM("asm/non_matchings/hud_renderer/func_8004E800.s") -#endif - -#ifdef MIPS_TO_C -//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b -extern s32 D_80165598; -static s32 D_800E5618[4] = { 0x000000FF, 0x000000D7, 0x000000A2, 0x00000061 }; void func_8004E998(s32 playerId) { - s32 temp_v1; - struct_8018CA70_entry *temp_v0; - - temp_v0 = &D_8018CA70[playerId]; - if ((u8) temp_v0->unk_81 != 0) { - if (temp_v0->lapCount != 3) { - temp_v1 = gGPCurrentRaceRankByPlayerId[playerId]; - func_8004A384(temp_v0->slideRankX + temp_v0->rankX, temp_v0->slideRankY + temp_v0->rankY, 0U, temp_v0->rankScaling, 0x000000FF, D_800E5618[temp_v1], 0, 0x000000FF, (s32) ((temp_v1 << 0xB) + D_0D015258), D_0D006030, 0x00000040, 0x00000040, 0x00000040, 0x00000040); - return; + if (D_8018CA70[playerId].unk_81 != 0) { + if (D_8018CA70[playerId].lapCount != 3) { + func_8004A384(D_8018CA70[playerId].rankX + D_8018CA70[playerId].slideRankX, D_8018CA70[playerId].rankY + D_8018CA70[playerId].slideRankY, 0U, + D_8018CA70[playerId].rankScaling, 0x000000FF, D_800E5618[gGPCurrentRaceRankByPlayerId[playerId]], 0, 0x000000FF, D_0D015258[gGPCurrentRaceRankByPlayerId[playerId]], + D_0D006030, 0x00000040, 0x00000040, 0x00000040, 0x00000040); + } else { + func_8004A384(D_8018CA70[playerId].rankX + D_8018CA70[playerId].slideRankX, D_8018CA70[playerId].rankY + D_8018CA70[playerId].slideRankY, 0U, + D_8018CA70[playerId].rankScaling, 0x000000FF, D_800E5618[D_80165598], 0, 0x000000FF, D_0D015258[gGPCurrentRaceRankByPlayerId[playerId]], + D_0D006030, 0x00000040, 0x00000040, 0x00000040, 0x00000040); } - func_8004A384(temp_v0->slideRankX + temp_v0->rankX, temp_v0->slideRankY + temp_v0->rankY, 0U, temp_v0->rankScaling, 0x000000FF, D_800E5618[D_80165598], 0, 0x000000FF, (s32) ((gGPCurrentRaceRankByPlayerId[playerId] << 0xB) + D_0D015258), D_0D006030, 0x00000040, 0x00000040, 0x00000040, 0x00000040); } } -#else -GLOBAL_ASM("asm/non_matchings/hud_renderer/func_8004E998.s") -#endif void func_8004EB30(UNUSED s32 arg0) { @@ -2649,252 +2288,122 @@ void func_8004EB38(s32 playerId) { } } -extern u16 D_8016579E; -extern f32 D_8018CFEC; -extern f32 D_8018CFF4; -extern u16 D_8018D300; -extern u16 D_8018D308; -extern u16 D_8018D310; - void func_8004ED40(s32 arg0) { func_8004A2F4(D_8018CA70[arg0].speedometerX, D_8018CA70[arg0].speedometerY, 0U, 1.0f, D_8018D300, D_8018D308, D_8018D310, 0xFF, (u8* ) D_0D009958, D_0D0064B0, 0x40, 0x60, 0x40, 0x30); func_8004A258(D_8018CFEC, D_8018CFF4, D_8016579E, 1.0f, (u8* ) D_0D00A558, &D_0D005FF0, 0x40, 0x20, 0x40, 0x20); } -#ifdef MIPS_TO_C -//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b -? func_8004D37C(s32, s32, s32, u16, s32, s32, s32, s32, s32, s32, s32); /* extern */ -? func_8004D4E8(s32, s32, s32, u16, s32, s32, s32, s32, s32, s32, s32); /* extern */ -extern s32 D_8018D240; -extern s16 D_8018D2B0; -extern s16 D_8018D2B8; -extern ? D_8018D2C0; -extern ? D_8018D2D8; -extern s16 D_8018D2F0; -extern s16 D_8018D2F8; -extern u16 D_8018D300; -extern u16 D_8018D308; -extern u16 D_8018D310; - void func_8004EE54(s32 arg0) { - s16 temp_t0; - s16 temp_t0_2; - s16 temp_v1; - s16 temp_v1_2; - s32 temp_t6; - s32 temp_v0; - if (gIsMirrorMode != 0) { - temp_v0 = arg0 * 2; - temp_t0 = D_8018D2B8; - temp_v1 = D_8018D2B0; - func_8004D4E8(*(&D_8018D2C0 + temp_v0) + D_8018D2F0, *(&D_8018D2D8 + temp_v0) + D_8018D2F8, D_8018D240, D_8018D300, (s32) D_8018D308, (s32) D_8018D310, 0x000000FF, (s32) temp_v1, (s32) temp_t0, (s32) temp_v1, (s32) temp_t0); - return; + func_8004D4E8(D_8018D2C0[arg0] + D_8018D2F0, D_8018D2D8[arg0] + D_8018D2F8, (u8 *) D_8018D240, (s32) D_8018D300, (s32) D_8018D308, (s32) D_8018D310, 0x000000FF, (s32) D_8018D2B0, (s32) D_8018D2B8, (s32) D_8018D2B0, (s32) D_8018D2B8); + } else { + func_8004D37C(D_8018D2C0[arg0] + D_8018D2F0, D_8018D2D8[arg0] + D_8018D2F8, (u8 *) D_8018D240, (s32) D_8018D300, (s32) D_8018D308, (s32) D_8018D310, 0x000000FF, (s32) D_8018D2B0, (s32) D_8018D2B8, (s32) D_8018D2B0, (s32) D_8018D2B8); } - temp_t6 = arg0 * 2; - temp_t0_2 = D_8018D2B8; - temp_v1_2 = D_8018D2B0; - func_8004D37C(*(&D_8018D2C0 + temp_t6) + D_8018D2F0, *(&D_8018D2D8 + temp_t6) + D_8018D2F8, D_8018D240, D_8018D300, (s32) D_8018D308, (s32) D_8018D310, 0x000000FF, (s32) temp_v1_2, (s32) temp_t0_2, (s32) temp_v1_2, (s32) temp_t0_2); } -#else -GLOBAL_ASM("asm/non_matchings/hud_renderer/func_8004EE54.s") -#endif - -#ifdef MIPS_TO_C -//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b -? func_8004D37C(?, ?, s32, ?, s32, s32, s32, s32, s32, s32, s32); /* extern */ -extern ? D_8018D248; -static s32 D_800E5548[0]; /* unable to generate initializer */ void func_8004EF9C(s32 arg0) { s16 temp_t0; s16 temp_v0; - s32 *temp_v1; - temp_v1 = &D_800E5548[arg0]; - temp_v0 = temp_v1->unk0; - temp_t0 = temp_v1->unk2; - func_8004D37C(0x104, 0x3C, *(&D_8018D248 + (arg0 * 4)), 0xFF, 0x000000FF, 0x000000FF, 0x000000FF, (s32) temp_v0, (s32) temp_t0, (s32) temp_v0, (s32) temp_t0); + temp_v0 = D_800E5548[arg0 * 2]; + temp_t0 = D_800E5548[arg0 * 2 + 1]; + func_8004D37C(0x00000104, 0x0000003C, D_8018D248[arg0], 0x000000FF, 0x000000FF, 0x000000FF, 0x000000FF, temp_v0, temp_t0, temp_v0, temp_t0); } -#else -GLOBAL_ASM("asm/non_matchings/hud_renderer/func_8004EF9C.s") -#endif - -#ifdef MIPS_TO_C -//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b -extern s16 D_8018D2B0; -extern s16 D_8018D2B8; -extern ? D_8018D2C0; -extern ? D_8018D2D8; -extern s16 D_8018D2E0; -extern s16 D_8018D2E8; -extern s16 D_8018D2F0; -extern s16 D_8018D2F8; -s16 gCurrentCourseId; /* unable to generate initializer */ void func_8004F020(s32 arg0) { f32 var_f0; - f64 var_f16; - s16 temp_v1; - s32 temp_v0; + f32 var_f2; - temp_v0 = arg0 * 2; - temp_v1 = gCurrentCourseId; - var_f0 = (f32) (((*(&D_8018D2D8 + temp_v0) + D_8018D2F8) - ((s16) D_8018D2B8 / 2)) + D_8018D2E8); - switch (temp_v1) { /* irregular */ - case 0: - var_f16 = (f64) var_f0 - 2.0; -block_7: - var_f0 = (f32) var_f16; + var_f2 = ((D_8018D2C0[arg0] + D_8018D2F0) - (D_8018D2B0 / 2)) + D_8018D2E0; + var_f0 = ((D_8018D2D8[arg0] + D_8018D2F8) - (D_8018D2B8 / 2)) + D_8018D2E8; + switch (gCurrentCourseId) { /* irregular */ + case COURSE_MARIO_RACEWAY: + var_f0 = var_f0 - 2.0; break; - case 1: - var_f0 = (f32) ((f64) var_f0 - 16.0); + case COURSE_CHOCO_MOUNTAIN: + var_f0 = var_f0 - 16.0; + break; + case COURSE_KALAMARI_DESERT: + var_f0 = var_f0 + 4.0; break; - case 11: - var_f16 = (f64) var_f0 + 4.0; - goto block_7; } - func_8004CAD0((s32) (f32) (((*(&D_8018D2C0 + temp_v0) + D_8018D2F0) - ((s16) D_8018D2B0 / 2)) + D_8018D2E0), (s32) var_f0, (s32) gTextureMiniMapFinishLine); + func_8004CAD0(var_f2, var_f0, gTextureMiniMapFinishLine); } -#else -GLOBAL_ASM("asm/non_matchings/hud_renderer/func_8004F020.s") -#endif #ifdef MIPS_TO_C -//generated by m2c commit 44f261a363c51a295be8efe3d7ca7f4d2c967e9b on Dec-31-2022 -extern f32 D_8018D2A0; -extern s16 D_8018D2B0; -extern s16 D_8018D2B8; -extern ? D_8018D2C0; -extern ? D_8018D2D8; -extern s16 D_8018D2E0; -extern s16 D_8018D2E8; -extern s16 D_8018D2F0; -extern s16 D_8018D2F8; - +//generated by m2c commit beb457dabfc7a01ec6540a5404a6a05097a13602 on Dec-20-2023 void func_8004F168(s32 arg0, s32 arg1, s32 arg2) { Player *temp_v1; s16 temp_a0; s16 temp_a1; - s32 temp_t0; temp_v1 = &gPlayerOne[arg1]; - temp_t0 = arg0 * 2; - if (temp_v1->sizeScaling & 0x8000) { - temp_a0 = ((*(&D_8018D2C0 + temp_t0) + D_8018D2F0) - ((s16) D_8018D2B0 / 2)) + D_8018D2E0 + (s16) (s32) (temp_v1->pos[0] * D_8018D2A0); - temp_a1 = ((*(&D_8018D2D8 + temp_t0) + D_8018D2F8) - ((s16) D_8018D2B8 / 2)) + D_8018D2E8 + (s32) (temp_v1->pos[2] * D_8018D2A0); + if (temp_v1->type & 0x8000) { + temp_a0 = ((D_8018D2C0[arg0] + D_8018D2F0) - ((s16) D_8018D2B0 / 2)) + D_8018D2E0 + (s16) (s32) (temp_v1->pos[0] * D_8018D2A0); + temp_a1 = ((D_8018D2D8[arg0] + D_8018D2F8) - ((s16) D_8018D2B8 / 2)) + D_8018D2E8 + (s32) (temp_v1->pos[2] * D_8018D2A0); if (arg2 != 8) { if ((gGPCurrentRaceRankByPlayerId[arg1] == 0) && (gModeSelection != 3) && (gModeSelection != 1)) { - func_80046424((s32) temp_a0, (s32) temp_a1, (temp_v1->unk_02C[1] + 0x8000) & 0xFFFF, 1.0f, (s32) gMiniMapKartTextures[arg2], (s32) D_0D005470, 8, 8, 8, 8); + func_80046424((s32) temp_a0, (s32) temp_a1, (temp_v1->unk_02C[1] + 0x8000) & 0xFFFF, 1.0f, (u8 *) gMiniMapKartTextures[arg2], D_0D005470, 8, 8, 8, 8); return; } - func_800463B0((s32) temp_a0, (s32) temp_a1, (temp_v1->unk_02C[1] + 0x8000) & 0xFFFF, 1.0f, (s32) gMiniMapKartTextures[arg2], (s32) D_0D005470, 8, 8, 8, 8); + func_800463B0((s32) temp_a0, (s32) temp_a1, (temp_v1->unk_02C[1] + 0x8000) & 0xFFFF, 1.0f, (u8 *) gMiniMapKartTextures[arg2], D_0D005470, 8, 8, 8, 8); return; } if (gGPCurrentRaceRankByPlayerId[arg1] == 0) { - func_8004C450((s32) temp_a0, (s32) temp_a1, 8U, 8U, (s32) gTextureMiniMapProgressDot); + func_8004C450((s32) temp_a0, (s32) temp_a1, 8U, 8U, (u8 *) gTextureMiniMapProgressDot); return; } - func_8004C364((s32) temp_a0, (s32) temp_a1, 8U, 8U, (s32) gTextureMiniMapProgressDot); + func_8004C364((s32) temp_a0, (s32) temp_a1, 8U, 8U, (u8 *) gTextureMiniMapProgressDot); } } #else GLOBAL_ASM("asm/non_matchings/hud_renderer/func_8004F168.s") #endif -#ifdef MIPS_TO_C -//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b -? func_8004F168(s32, s16, u16); /* extern */ -extern s32 D_8018D158; - +// WTF is up with the gPlayerOne access in this function? void func_8004F3E4(s32 arg0) { - Player *temp_v0_3; - s16 *var_s0_2; - s16 *var_s0_4; - s16 *var_s0_5; - s16 temp_a1; - s16 temp_a1_2; - s16 temp_a1_3; - s16 var_s1; - s16 var_s1_2; - s32 temp_s1; - s32 temp_v0; - s32 var_s0; - s32 var_s0_3; - s32 var_s1_3; - void *temp_v0_2; + s32 temp_a1; + s32 var_s1; + Player *player; - temp_v0 = gModeSelection; - if (temp_v0 != 0) { - var_s1 = 0; - switch (temp_v0) { /* irregular */ - case 1: - var_s0 = 0; - do { - if ((*(var_s0 + gPlayerOne) & 0x100) == 0x100) { - func_8004F168(arg0, var_s1, 8U); - } - var_s1 += 1; - var_s0 += 0xDD8; - } while (var_s1 != (s16) 8U); - func_8004F168(arg0, 0, gPlayerOne->characterId); - return; - case 2: - temp_s1 = gPlayerCountSelection1 - 1; - if (temp_s1 >= 0) { - var_s0_2 = &gGPCurrentRacePlayerIdByRank[temp_s1]; - do { - temp_a1 = *var_s0_2; - func_8004F168(arg0, temp_a1, gPlayerOne[temp_a1].characterId); - var_s0_2 -= 2; - } while ((u32) var_s0_2 >= (u32) gGPCurrentRacePlayerIdByRank); - return; + switch (gModeSelection) { /* irregular */ + case 0: + for (var_s1 = D_8018D158 - 1; var_s1 >= 0; var_s1--) { + temp_a1 = gGPCurrentRacePlayerIdByRank[var_s1]; + if ((gPlayerOne + temp_a1)->type & 0x1000) { + func_8004F168(arg0, temp_a1, 8); } - break; - case 3: - var_s1_2 = 0; - var_s0_3 = 0; - if (gPlayerCountSelection1 > 0) { - do { - temp_v0_2 = var_s0_3 + gPlayerOne; - if (!(temp_v0_2->unk0 & 0x40)) { - func_8004F168(arg0, var_s1_2, temp_v0_2->unk254); - } - var_s1_2 += 1; - var_s0_3 += 0xDD8; - } while (var_s1_2 < gPlayerCountSelection1); + } + for (var_s1 = D_8018D158 - 1; var_s1 >= 0; var_s1--) { + temp_a1 = gGPCurrentRacePlayerIdByRank[var_s1]; + if (((gPlayerOne + temp_a1)->type & 0x1000) != 0x1000) { + func_8004F168(arg0, temp_a1, (gPlayerOne + temp_a1)->characterId); } - break; } - } else { - var_s1_3 = D_8018D158 - 1; - if (var_s1_3 >= 0) { - var_s0_4 = &gGPCurrentRacePlayerIdByRank[var_s1_3]; - do { - temp_a1_2 = *var_s0_4; - if (gPlayerOne[temp_a1_2].sizeScaling & 0x1000) { - func_8004F168(arg0, temp_a1_2, 8U); - } - var_s0_4 -= 2; - } while ((u32) var_s0_4 >= (u32) gGPCurrentRacePlayerIdByRank); - var_s1_3 = D_8018D158 - 1; + break; + case 1: + for (var_s1 = 0; var_s1 < 8; var_s1++) { + if (((gPlayerOne + var_s1)->type & 0x100) == 0x100) { + func_8004F168(arg0, var_s1, 8); + } } - if (var_s1_3 >= 0) { - var_s0_5 = &gGPCurrentRacePlayerIdByRank[var_s1_3]; - do { - temp_a1_3 = *var_s0_5; - temp_v0_3 = &gPlayerOne[temp_a1_3]; - if ((temp_v0_3->sizeScaling & 0x1000) != 0x1000) { - func_8004F168(arg0, temp_a1_3, temp_v0_3->characterId); - } - var_s0_5 -= 2; - } while ((u32) var_s0_5 >= (u32) gGPCurrentRacePlayerIdByRank); + func_8004F168(arg0, 0, gPlayerOne->characterId); + break; + case 2: + for (var_s1 = gPlayerCountSelection1 - 1; var_s1 >=0; var_s1--) { + temp_a1 = gGPCurrentRacePlayerIdByRank[var_s1]; + func_8004F168(arg0, temp_a1, (gPlayerOne + temp_a1)->characterId); } + break; + case 3: + for (var_s1 = 0; var_s1 < gPlayerCountSelection1; var_s1++) { + if (!((gPlayerOne + var_s1)->type & 0x40)) { + func_8004F168(arg0, var_s1, (gPlayerOne + var_s1)->characterId); + } + } + break; } } -#else -GLOBAL_ASM("asm/non_matchings/hud_renderer/func_8004F3E4.s") -#endif s32 func_8004F674(s32 *arg0, s32 arg1) { s32 temp_v0; @@ -2911,31 +2420,25 @@ s32 func_8004F674(s32 *arg0, s32 arg1) { return ret; } -#ifdef MIPS_TO_C -//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b -extern ? D_801657D0; - void func_8004F6D0(s32 arg0) { + s32 stackPadding0; + s32 stackPadding1; s32 sp24; sp24 = arg0; - if (arg0 >= 0x000927BF) { - sp24 = 0x000927BF; - } - D_801657D0.unk0 = func_8004F674(&sp24, 0x0000EA60); - D_801657D0.unk1 = func_8004F674(&sp24, 0x00001770); - D_801657D0.unk3 = func_8004F674(&sp24, 0x000003E8); - D_801657D0.unk4 = func_8004F674(&sp24, 0x00000064); - D_801657D0.unk6 = func_8004F674(&sp24, 0x0000000A); - D_801657D0.unk2 = 0x0A; - D_801657D0.unk5 = 0x0B; - D_801657D0.unk7 = (s8) sp24; + if (arg0 >= 599999) { + sp24 = 599999; + } + D_801657D0[0] = func_8004F674(&sp24, 60000); + D_801657D0[1] = func_8004F674(&sp24, 6000); + D_801657D0[3] = func_8004F674(&sp24, 1000); + D_801657D0[4] = func_8004F674(&sp24, 100); + D_801657D0[6] = func_8004F674(&sp24, 10); + D_801657D0[7] = sp24; + D_801657D0[2] = 10; + D_801657D0[5] = 11; } -#else -GLOBAL_ASM("asm/non_matchings/hud_renderer/func_8004F6D0.s") -#endif -extern s8 D_801657D0[]; void func_8004F774(s32 arg0, s32 arg1) { s32 i; s32 phi_s1 = arg0; @@ -2983,22 +2486,19 @@ void func_8004F9CC(s32 arg0, s32 arg1, s32 arg2) { } #ifdef MIPS_TO_C -//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b +//generated by m2c commit beb457dabfc7a01ec6540a5404a6a05097a13602 on Dec-19-2023 extern s32 D_80165658; extern s8 D_801657E3; -extern s8 D_801657E5; extern s32 D_8018D320; void func_8004FA78(s32 playerId) { s32 *var_s3; - s32 temp_v0; s32 var_s0; struct_8018CA70_entry *temp_s4; struct_8018CA70_entry *var_s1; struct_8018CA70_entry *var_s2; - temp_v0 = gModeSelection; - if ((temp_v0 != 2) && (temp_v0 != 3)) { + if ((gModeSelection != 2) && (gModeSelection != 3)) { temp_s4 = &D_8018CA70[playerId]; if (D_8018D320 == temp_s4->lapCount) { var_s3 = &D_80165658; @@ -3008,16 +2508,16 @@ void func_8004FA78(s32 playerId) { var_s2 = temp_s4; do { if (*var_s3 == 0) { - print_timer((s32) var_s1->lap1CompletionTimeX, temp_s4->timerY + var_s0, (s32) var_s2->lap1Duration); + print_timer((s32) var_s1->lap1CompletionTimeX, temp_s4->timerY + var_s0, (s32) var_s2->lapDurations[0]); } else { - func_8004F9CC((s32) var_s1->lap1CompletionTimeX, temp_s4->timerY + var_s0, (s32) var_s2->lap1Duration); + func_8004F9CC((s32) var_s1->lap1CompletionTimeX, temp_s4->timerY + var_s0, (s32) var_s2->lapDurations[0]); } var_s0 += 0x10; var_s3 += 4; var_s1 += 2; var_s2 += 4; } while (var_s0 != 0x30); - func_8004CB90(temp_s4->totalTimeX - 0x13, temp_s4->timerY + 0x38, (s32) D_0D00BD58); + func_8004CB90(temp_s4->totalTimeX - 0x13, temp_s4->timerY + 0x38, (u8 *) D_0D00BD58); if (D_801657E5 != 0) { func_8004F9CC((s32) temp_s4->totalTimeX, temp_s4->timerY + 0x30, (s32) temp_s4->someTimer); return; @@ -3026,11 +2526,11 @@ void func_8004FA78(s32 playerId) { } } else { if (temp_s4->blinkTimer == 0) { - func_8004CB90(temp_s4->timerX - 0x13, temp_s4->timerY + 8, (s32) D_0D00C158); + func_8004CB90(temp_s4->timerX - 0x13, temp_s4->timerY + 8, (u8 *) D_0D00C158); print_timer((s32) temp_s4->timerX, (s32) temp_s4->timerY, (s32) temp_s4->someTimer); return; } - func_8004CB90(temp_s4->timerX - 0x13, temp_s4->timerY + 8, 0x0D00AD58); + func_8004CB90(temp_s4->timerX - 0x13, temp_s4->timerY + 8, (u8 *)0x0D00AD58); if (D_801657E3 != 0) { func_8004F9CC((s32) temp_s4->timerX, (s32) temp_s4->timerY, (s32) temp_s4->someTimer1); return; @@ -3097,7 +2597,7 @@ void func_8004FDB4(f32 arg0, f32 arg1, s16 arg2, s16 arg3, s16 characterId, s32 } #ifdef MIPS_TO_C -//generated by m2c commit b52d92c2340f6f4ba1aafb464188bb698752fbb0 on Jul-27-2023 +//generated by m2c commit beb457dabfc7a01ec6540a5404a6a05097a13602 on Dec-19-2023 extern s8 D_801657E2; extern ? D_8018D028; extern f32 D_8018D050; @@ -3249,108 +2749,90 @@ void func_800507D8(u16 bombIndex, s32 *arg1, s32 *arg2) { } } -#ifdef MIPS_TO_C -//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b -u32 func_80050644(s32, s32 *, s32 *); /* extern */ -extern s16 D_80164378; - void func_800508C0(void) { s32 sp54; s32 sp50; - u32 sp4C; - s32 sp48; - u16 sp42; - u16 sp40; - u16 sp3E; - s16 var_s0; + s32 sp4C; s32 temp_v1; - s32 var_s1; - s32 var_s2; + s16 var_s0; + s16 stackPadding; u16 var_s0_2; - u16 var_s0_3; - u16 var_s1_2; - u16 var_s2_2; + u16 var_s1; + u16 var_s2; if (gModeSelection == TIME_TRIALS) { - var_s0 = D_80164378; + var_s0 = D_80164378[0]; } else { - var_s0 = *gGPCurrentRacePlayerIdByRank; + var_s0 = gGPCurrentRacePlayerIdByRank[0]; } + sp4C = func_80050644(var_s0, &sp54, &sp50); temp_v1 = gLapCountByPlayerId[var_s0]; - sp4C = func_80050644(var_s0 & 0xFFFF, &sp54, &sp50); if (temp_v1 > 0) { if (temp_v1 == 1) { var_s0_2 = 0; var_s1 = 0; var_s2 = 0x000000FF; } else { - var_s0_2 = 0x00FF; if (temp_v1 == 2) { var_s0_2 = 0x00FF; var_s1 = 0x000000FF; + var_s2 = 0; } else { + var_s0_2 = 0x00FF; var_s1 = 0; + var_s2 = 0; } - var_s2 = 0; - } - sp48 = temp_v1; - func_8004C024(0x0020, 0x0012, 0x0104, var_s0_2 & 0xFFFF, (u16) var_s1, (u16) var_s2, (u16) 0x000000FF); - func_8004C148(0x0124, 0x0012, 0x00CC, var_s0_2 & 0xFFFF, (u16) var_s1, (u16) var_s2, (u16) 0x000000FF); - func_8004C024(0x0020, 0x00DE, 0x0104, var_s0_2 & 0xFFFF, (u16) var_s1, (u16) var_s2, (u16) 0x000000FF); - func_8004C148(0x0020, 0x0012, 0x00CC, var_s0_2 & 0xFFFF, (u16) var_s1, (u16) var_s2, (u16) 0x000000FF); - sp42 = var_s0_2; - sp40 = (u16) var_s1; - sp3E = (u16) var_s2; - } - var_s0_3 = sp42; - var_s1_2 = sp40; - var_s2_2 = sp3E; - switch (temp_v1) { /* switch 1; irregular */ - case 0: /* switch 1 */ - var_s0_3 = 0; - var_s1_2 = 0; - var_s2_2 = 0x00FF; - default: /* switch 1 */ -block_21: - switch (sp4C) { - case 1: - func_8004C024(0x0020, 0x0012, (s16) sp54, var_s0_3 & 0xFFFF, (u16) (s32) var_s1_2, (u16) (s32) var_s2_2, (u16) 0x000000FF); - return; - case 2: - func_8004C024(0x0020, 0x0012, 0x0104, var_s0_3 & 0xFFFF, (u16) (s32) var_s1_2, (u16) (s32) var_s2_2, (u16) 0x000000FF); - func_8004C148(0x0124, 0x0012, (s16) sp50, var_s0_3 & 0xFFFF, (u16) (s32) var_s1_2, (u16) (s32) var_s2_2, (u16) 0x000000FF); - return; - case 3: - func_8004C024(0x0020, 0x0012, 0x0104, var_s0_3 & 0xFFFF, (u16) (s32) var_s1_2, (u16) (s32) var_s2_2, (u16) 0x000000FF); - func_8004C148(0x0124, 0x0012, 0x00CC, var_s0_3 & 0xFFFF, (u16) (s32) var_s1_2, (u16) (s32) var_s2_2, (u16) 0x000000FF); - func_8004C024((s16) (sp54 + 0x20), 0x00DE, (s16) (0x104 - sp54), var_s0_3 & 0xFFFF, (u16) (s32) var_s1_2, (u16) (s32) var_s2_2, (u16) 0x000000FF); - return; - case 4: - func_8004C024(0x0020, 0x0012, 0x0104, var_s0_3 & 0xFFFF, (u16) (s32) var_s1_2, (u16) (s32) var_s2_2, (u16) 0x000000FF); - func_8004C148(0x0124, 0x0012, 0x00CC, var_s0_3 & 0xFFFF, (u16) (s32) var_s1_2, (u16) (s32) var_s2_2, (u16) 0x000000FF); - func_8004C024(0x0020, 0x00DE, 0x0104, var_s0_3 & 0xFFFF, (u16) (s32) var_s1_2, (u16) (s32) var_s2_2, (u16) 0x000000FF); - func_8004C148(0x0020, (s16) (sp50 + 0x12), (s16) (0xCC - sp50), var_s0_3 & 0xFFFF, (u16) (s32) var_s1_2, (u16) (s32) var_s2_2, (u16) 0x000000FF); - /* fallthrough */ - default: - return; } + func_8004C024(0x0020, 0x0012, 0x0104, var_s0_2, var_s1, var_s2, 0x000000FF); + func_8004C148(0x0124, 0x0012, 0x00CC, var_s0_2, var_s1, var_s2, 0x000000FF); + func_8004C024(0x0020, 0x00DE, 0x0104, var_s0_2, var_s1, var_s2, 0x000000FF); + func_8004C148(0x0020, 0x0012, 0x00CC, var_s0_2, var_s1, var_s2, 0x000000FF); + } + if ((temp_v1 < 0) || (temp_v1 >= 3)) return; + switch (temp_v1) { + case 0: + var_s0_2 = 0; + var_s1 = 0; + var_s2 = 0x00FF; + break; + case 1: + var_s0_2 = 0x00FF; + var_s1 = 0x00FF; + var_s2 = 0; + break; + case 2: + var_s0_2 = 0x00FF; + var_s1 = 0; + var_s2 = 0; + break; + default: + break; + } + switch (sp4C) { + case 1: + func_8004C024(0x0020, 0x0012, sp54, var_s0_2, var_s1, var_s2, 0x000000FF); + break; + case 2: + func_8004C024(0x0020, 0x0012, 0x0104, var_s0_2, var_s1, var_s2, 0x000000FF); + func_8004C148(0x0124, 0x0012, sp50, var_s0_2, var_s1, var_s2, 0x000000FF); + break; + case 3: + func_8004C024(0x0020, 0x0012, 0x0104, var_s0_2, var_s1, var_s2, 0x000000FF); + func_8004C148(0x0124, 0x0012, 0x00CC, var_s0_2, var_s1, var_s2, 0x000000FF); + func_8004C024(sp54 + 0x20, 0x00DE, 0x104 - sp54, var_s0_2, var_s1, var_s2, 0x000000FF); + break; + case 4: + func_8004C024(0x0020, 0x0012, 0x0104, var_s0_2, var_s1, var_s2, 0x000000FF); + func_8004C148(0x0124, 0x0012, 0x00CC, var_s0_2, var_s1, var_s2, 0x000000FF); + func_8004C024(0x0020, 0x00DE, 0x0104, var_s0_2, var_s1, var_s2, 0x000000FF); + func_8004C148(0x0020, sp50 + 0x12, 0xCC - sp50, var_s0_2, var_s1, var_s2, 0x000000FF); + break; + case 0: + default: break; - case 1: /* switch 1 */ - var_s0_3 = 0x00FF; - var_s1_2 = 0x00FF; -block_20: - var_s2_2 = 0; - goto block_21; - case 2: /* switch 1 */ - var_s0_3 = 0x00FF; - var_s1_2 = 0; - goto block_20; } } -#else -GLOBAL_ASM("asm/non_matchings/hud_renderer/func_800508C0.s") -#endif - + void func_80050C68(void) { s32 stackPadding0; s32 sp88; @@ -3456,11 +2938,7 @@ GLOBAL_ASM("asm/non_matchings/hud_renderer/func_80050E34.s") #endif #ifdef MIPS_TO_C -//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b -? func_800508C0(); /* extern */ -? func_80050E34(s16, s32); /* extern */ -extern s32 D_80164408; - +//generated by m2c commit beb457dabfc7a01ec6540a5404a6a05097a13602 on Dec-20-2023 void func_800514BC(void) { Gfx *temp_v1; s16 *var_s2; @@ -3469,12 +2947,12 @@ void func_800514BC(void) { s32 var_s1; s32 var_s3; - if (gScreenModeSelection == SCREEN_MODE_1P) { + if (gScreenModeSelection == 0) { func_800508C0(); } var_s3 = 8; var_s1 = 0; - if ((gPlayerCountSelection1 == 2) && (gActiveScreenMode == SCREEN_MODE_2P_SPLITSCREEN_VERTICAL)) { + if ((gPlayerCountSelection1 == 2) && (gActiveScreenMode == 2)) { var_s3 = 0; } var_s0 = var_s3 - 1; @@ -3482,23 +2960,20 @@ void func_800514BC(void) { var_s2 = &gGPCurrentRacePlayerIdByRank[var_s0]; do { temp_a0 = *var_s2; - if ((gPlayerOne[temp_a0].sizeScaling & 0x8000) && ((temp_a0 != 0) || (gPlayerCountSelection1 != 1))) { - func_80050E34(temp_a0, var_s0); + if ((gPlayerOne[temp_a0].type & 0x8000) && ((temp_a0 != 0) || (gPlayerCountSelection1 != 1))) { + func_80050E34((s32) temp_a0, var_s0); } var_s1 += 1; var_s0 -= 1; var_s2 -= 2; } while (var_s1 != var_s3); } - if (gModeSelection == TIME_TRIALS) { - func_80050E34(0, D_80164408); + if (gModeSelection == 1) { + func_80050E34(0, D_80164408[0]); } else if (gPlayerCountSelection1 == 1) { - func_80050E34(0, *gGPCurrentRaceRankByPlayerId); + func_80050E34(0, gGPCurrentRaceRankByPlayerId[0]); } - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; - temp_v1->words.w0 = 0xBB000000; - temp_v1->words.w1 = 0x00010001; + gSPTexture(gDisplayListHead++, 1, 1, 0, G_TX_RENDERTILE, G_OFF); } #else GLOBAL_ASM("asm/non_matchings/hud_renderer/func_800514BC.s") @@ -3543,8 +3018,6 @@ void func_800517C8(void) { gSPTexture(gDisplayListHead++, 1, 1, 0, G_TX_RENDERTILE, G_OFF); } -extern u8 D_8018D228; - void func_800518F8(s32 objectIndex, s16 arg1, s16 arg2) { s32 pad[1]; if (gObjectList[objectIndex].unk_054 & 0x10) { @@ -3558,131 +3031,55 @@ void func_800518F8(s32 objectIndex, s16 arg1, s16 arg2) { } } - -#ifdef MIPS_TO_C -//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b -? func_80044DA0(s32 *, u8, u8); /* extern */ -extern u8 D_8018D228; - void func_800519D4(s32 objectIndex, s16 arg1, s16 arg2) { - Gfx *temp_v0_2; - Gfx *temp_v0_3; - Objects *temp_s0; - u8 temp_v0; - - temp_s0 = &gObjectList[objectIndex]; - if (temp_s0->unk_054 & 0x10) { - temp_v0 = temp_s0->unk_0D5; - if (D_8018D228 != temp_v0) { - D_8018D228 = temp_v0; - func_80044DA0(temp_s0->activeTexture, temp_s0->textureWidth, temp_s0->textureHeight); + if (gObjectList[objectIndex].unk_054 & 0x10) { + if (D_8018D228 != gObjectList[objectIndex].unk_0D5) { + D_8018D228 = gObjectList[objectIndex].unk_0D5; + func_80044DA0(gObjectList[objectIndex].activeTexture, gObjectList[objectIndex].textureWidth, gObjectList[objectIndex].textureHeight); } - func_8004B138(0x000000FF, 0x000000FF, 0x000000FF, (s32) temp_s0->unk_0A0); - func_80042330((s32) arg1, (s32) arg2, 0U, temp_s0->sizeScaling); - temp_v0_2 = gDisplayListHead; - gDisplayListHead = temp_v0_2 + 8; - temp_v0_2->words.w0 = 0x0400103F; - temp_v0_2->words.w1 = (u32) temp_s0->vertex; - temp_v0_3 = gDisplayListHead; - gDisplayListHead = temp_v0_3 + 8; - temp_v0_3->words.w1 = (u32) common_rectangle_display; - temp_v0_3->words.w0 = 0x06000000; + func_8004B138(0x000000FF, 0x000000FF, 0x000000FF, gObjectList[objectIndex].unk_0A0); + func_80042330(arg1, arg2, 0U, gObjectList[objectIndex].sizeScaling); + gSPVertex(gDisplayListHead++, gObjectList[objectIndex].vertex, 4, 0); + gSPDisplayList(gDisplayListHead++, common_rectangle_display); } } -#else -GLOBAL_ASM("asm/non_matchings/hud_renderer/func_800519D4.s") -#endif - -#ifdef MIPS_TO_C -//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b -? func_800518F8(s32, s16, s16); /* extern */ -? func_800519D4(s32, s16, s16); /* extern */ -extern ? D_0D007A60; -extern ? D_8018CC80; -extern s32 D_8018D1F0; -extern s8 D_8018D228; -extern u8 D_8018D230; void func_80051ABC(s16 arg0, s32 arg1) { - Gfx *temp_v1; - s32 *var_s1; - s32 *var_s1_2; - s32 temp_a0; - s32 temp_a0_2; s32 var_s0; - s32 var_s0_2; - Objects *temp_v0; - Objects *temp_v0_2; + s32 objectIndex; + Objects *object; D_8018D228 = 0xFF; - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; - temp_v1->words.w0 = 0x06000000; - temp_v1->words.w1 = (u32) &D_0D007A60; - if (D_8018D230 != 0) { + gSPDisplayList(gDisplayListHead++, D_0D007A60); + if ((u8) D_8018D230 != 0) { func_8004B414(0x000000FF, 0x000000FF, 0x000000FF, 0x000000FF); - var_s0 = 0; - if (D_8018D1F0 > 0) { - var_s1 = (arg1 * 4) + &D_8018CC80; - do { - temp_a0 = *var_s1; - temp_v0 = &gObjectList[temp_a0]; - func_800519D4(temp_a0, temp_v0->unk_09C, (s16) (arg0 - temp_v0->unk_09E)); - var_s0 += 1; - var_s1 += 4; - } while (var_s0 < D_8018D1F0); + for (var_s0 = 0; var_s0 < D_8018D1F0; var_s0++) { + objectIndex = D_8018CC80[arg1 + var_s0]; + object = &gObjectList[objectIndex]; + func_800519D4(objectIndex, object->unk_09C, arg0 - object->unk_09E); } } else { func_8004B6C4(0x000000FF, 0x000000FF, 0x000000FF); - var_s0_2 = 0; - if (D_8018D1F0 > 0) { - var_s1_2 = (arg1 * 4) + &D_8018CC80; - do { - temp_a0_2 = *var_s1_2; - temp_v0_2 = &gObjectList[temp_a0_2]; - func_800518F8(temp_a0_2, temp_v0_2->unk_09C, (s16) (arg0 - temp_v0_2->unk_09E)); - var_s0_2 += 1; - var_s1_2 += 4; - } while (var_s0_2 < D_8018D1F0); + for (var_s0 = 0; var_s0 < D_8018D1F0; var_s0++) { + objectIndex = D_8018CC80[arg1 + var_s0]; + object = &gObjectList[objectIndex]; + func_800518F8(objectIndex, object->unk_09C, arg0 - object->unk_09E); } } } -#else -GLOBAL_ASM("asm/non_matchings/hud_renderer/func_80051ABC.s") -#endif -#ifdef MIPS_TO_C -//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b -? func_800518F8(s32, s16, s16); /* extern */ -? func_800519D4(s32, s16, s16); /* extern */ -extern ? D_0D007A60; -extern ? D_8018CC80; -extern s32 D_8018D1F0; -extern s8 D_8018D228; -extern u8 D_8018D230; -s16 gCurrentCourseId; /* unable to generate initializer */ - -// arg0 = cameraHeight void func_80051C60(s16 arg0, s32 arg1) { - Gfx *temp_v1; - s16 temp_v0; s16 var_s5; - s32 *var_s1; - s32 *var_s1_2; - s32 temp_a0; - s32 temp_a0_2; s32 var_s0; - s32 var_s0_2; - Objects *temp_v0_2; - Objects *temp_v0_3; + s32 objectIndex; + Objects *object; if (D_801658FE == 0) { - temp_v0 = gCurrentCourseId; - if (temp_v0 == 6) { + if (gCurrentCourseId == 6) { var_s5 = arg0; - } else if (temp_v0 == 9) { + } else if (gCurrentCourseId == 9) { var_s5 = arg0 - 0x10; - } else if (temp_v0 == 4) { + } else if (gCurrentCourseId == 4) { var_s5 = arg0 - 0x10; } else { var_s5 = arg0 + 0x10; @@ -3693,41 +3090,23 @@ void func_80051C60(s16 arg0, s32 arg1) { var_s5 = arg0 + 0x20; } D_8018D228 = 0xFF; - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; - temp_v1->words.w0 = 0x06000000; - temp_v1->words.w1 = (u32) &D_0D007A60; - if (D_8018D230 != 0) { + gSPDisplayList(gDisplayListHead++, D_0D007A60); + if ((u8) D_8018D230 != 0) { func_8004B414(0x000000FF, 0x000000FF, 0x000000FF, 0x000000FF); - var_s0 = 0; - if (D_8018D1F0 > 0) { - var_s1 = (arg1 * 4) + &D_8018CC80; - do { - temp_a0 = *var_s1; - temp_v0_2 = &gObjectList[temp_a0]; - func_800519D4(temp_a0, temp_v0_2->unk_09C, (s16) ((s32) (var_s5 - temp_v0_2->unk_09E) / 2)); - var_s0 += 1; - var_s1 += 4; - } while (var_s0 < D_8018D1F0); + for (var_s0 = 0; var_s0 < D_8018D1F0; var_s0++) { + objectIndex = D_8018CC80[arg1 + var_s0]; + object = &gObjectList[objectIndex]; + func_800519D4(objectIndex, object->unk_09C, (var_s5 - object->unk_09E) / 2); } } else { func_8004B6C4(0x000000FF, 0x000000FF, 0x000000FF); - var_s0_2 = 0; - if (D_8018D1F0 > 0) { - var_s1_2 = (arg1 * 4) + &D_8018CC80; - do { - temp_a0_2 = *var_s1_2; - temp_v0_3 = &gObjectList[temp_a0_2]; - func_800518F8(temp_a0_2, temp_v0_3->unk_09C, (s16) ((s32) (var_s5 - temp_v0_3->unk_09E) / 2)); - var_s0_2 += 1; - var_s1_2 += 4; - } while (var_s0_2 < D_8018D1F0); + for (var_s0 = 0; var_s0 < D_8018D1F0; var_s0++) { + objectIndex = D_8018CC80[arg1 + var_s0]; + object = &gObjectList[objectIndex]; + func_800518F8(objectIndex, object->unk_09C, (var_s5 - object->unk_09E) / 2); } } } -#else -GLOBAL_ASM("asm/non_matchings/hud_renderer/func_80051C60.s") -#endif void func_80051EBC(void) { func_80051ABC(240 - D_800DC5EC->cameraHeight, 0); // 28 @@ -3773,162 +3152,45 @@ void func_80052080(void) { func_80051C60(240 - D_800DC5F0->cameraHeight, D_8018D1F0); } -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern ? D_800E45C0; -extern ? D_80165CED; - void func_800520C0(s32 arg0) { - s8 temp_v0; - s8 temp_v0_2; - s8 temp_v0_3; - s8 temp_v0_4; - s8 temp_v0_5; - s8 temp_v0_6; - - if (*(&D_80165CED + (arg0 * 0xE0)) == 0) { - D_800E45C0.unk58 = 0; - temp_v0 = D_800E45C0.unk58; - D_800E45C0.unk59 = -0x78; - D_800E45C0.unk40 = temp_v0; - D_800E45C0.unk28 = temp_v0; - D_800E45C0.unk10 = temp_v0; - temp_v0_2 = D_800E45C0.unk59; - D_800E45C0.unk5A = 0; - D_800E45C0.unk41 = temp_v0_2; - D_800E45C0.unk29 = temp_v0_2; - D_800E45C0.unk11 = temp_v0_2; - temp_v0_3 = D_800E45C0.unk5A; - D_800E45C0.unk42 = temp_v0_3; - D_800E45C0.unk2A = temp_v0_3; - D_800E45C0.unk12 = temp_v0_3; - return; + if (gObjectList[arg0].unk_0D5 == 0) { + D_800E45C0[0].l[0].l.dir[0] = D_800E45C0[1].l[0].l.dir[0] = D_800E45C0[2].l[0].l.dir[0] = D_800E45C0[3].l[0].l.dir[0] = 0; + D_800E45C0[0].l[0].l.dir[1] = D_800E45C0[1].l[0].l.dir[1] = D_800E45C0[2].l[0].l.dir[1] = D_800E45C0[3].l[0].l.dir[1] = -0x78; + D_800E45C0[0].l[0].l.dir[2] = D_800E45C0[1].l[0].l.dir[2] = D_800E45C0[2].l[0].l.dir[2] = D_800E45C0[3].l[0].l.dir[2] = 0; + } else { + D_800E45C0[0].l[0].l.dir[0] = D_800E45C0[1].l[0].l.dir[0] = D_800E45C0[2].l[0].l.dir[0] = D_800E45C0[3].l[0].l.dir[0] = 0x63; + D_800E45C0[0].l[0].l.dir[1] = D_800E45C0[1].l[0].l.dir[1] = D_800E45C0[2].l[0].l.dir[1] = D_800E45C0[3].l[0].l.dir[1] = 0x42; + D_800E45C0[0].l[0].l.dir[2] = D_800E45C0[1].l[0].l.dir[2] = D_800E45C0[2].l[0].l.dir[2] = D_800E45C0[3].l[0].l.dir[2] = 0; } - D_800E45C0.unk58 = 0x63; - temp_v0_4 = D_800E45C0.unk58; - D_800E45C0.unk59 = 0x42; - D_800E45C0.unk40 = temp_v0_4; - D_800E45C0.unk28 = temp_v0_4; - D_800E45C0.unk10 = temp_v0_4; - temp_v0_5 = D_800E45C0.unk59; - D_800E45C0.unk5A = 0; - D_800E45C0.unk41 = temp_v0_5; - D_800E45C0.unk29 = temp_v0_5; - D_800E45C0.unk11 = temp_v0_5; - temp_v0_6 = D_800E45C0.unk5A; - D_800E45C0.unk42 = temp_v0_6; - D_800E45C0.unk2A = temp_v0_6; - D_800E45C0.unk12 = temp_v0_6; } -#else -GLOBAL_ASM("asm/non_matchings/hud_renderer/func_800520C0.s") -#endif - -#ifdef MIPS_TO_C -//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b -//? func_800520C0(s32); /* extern */ -extern Gfx d_course_banshee_boardwalk_dl_7650[]; -extern Gfx d_course_banshee_boardwalk_dl_78C0[]; -extern Gfx d_course_banshee_boardwalk_dl_7978[]; -extern Gfx d_course_banshee_boardwalk_dl_7B38[]; -//extern Gfx D_0D007828; -extern Light D_800E45C0; /* unable to generate initializer */ -extern Light D_800E45C8; /* unable to generate initializer */ -extern Light D_800E45D8; /* unable to generate initializer */ -extern Light D_800E45E0; /* unable to generate initializer */ -extern Light D_800E45F0; /* unable to generate initializer */ -extern Light D_800E45F8; /* unable to generate initializer */ -extern Light D_800E4608; /* unable to generate initializer */ -extern Light D_800E4610; /* unable to generate initializer */ void func_8005217C(s32 arg0) { - s32 sp50; - Objects *sp18; + Objects *object; s32 temp_a3; - Objects *temp_v1; - temp_a3 = *D_80183F28; - temp_v1 = &gObjectList[temp_a3]; - if (temp_v1->state >= 2) { - sp18 = temp_v1; - sp50 = temp_a3; + temp_a3 = D_80183F28[0]; + object = &gObjectList[temp_a3]; + if (object->state >= 2) { if (is_obj_index_flag_unk_054_active(temp_a3, 0x00000010) != 0) { - sp50 = temp_a3; - rsp_set_matrix_transformation(temp_v1->pos, (s16 *) temp_v1->unk_0BE, temp_v1->sizeScaling); - func_800520C0(sp50); + rsp_set_matrix_transformation(object->pos, object->unk_0BE, object->sizeScaling); + func_800520C0(temp_a3); gSPDisplayList(gDisplayListHead++, D_0D007828); - gSPLight(gDisplayListHead++, &D_800E45C0.l[0], LIGHT_1); - gSPLight(gDisplayListHead++, &D_800E45C0.a, LIGHT_2); + gSPLight(gDisplayListHead++, &D_800E45C0[0].l[0], LIGHT_1); + gSPLight(gDisplayListHead++, &D_800E45C0[0].a, LIGHT_2); gSPDisplayList(gDisplayListHead++, d_course_banshee_boardwalk_dl_7B38); - gSPLight(gDisplayListHead++, &D_800E45D8.l[0], LIGHT_1); - gSPLight(gDisplayListHead++, &D_800E45D8.a, LIGHT_2); + gSPLight(gDisplayListHead++, &D_800E45C0[1].l[0], LIGHT_1); + gSPLight(gDisplayListHead++, &D_800E45C0[1].a, LIGHT_2); gSPDisplayList(gDisplayListHead++, d_course_banshee_boardwalk_dl_7978); - gSPLight(gDisplayListHead++, &D_800E45F0.l[0], LIGHT_1); - gSPLight(gDisplayListHead++, &D_800E45F0.a, LIGHT_2); + gSPLight(gDisplayListHead++, &D_800E45C0[2].l[0], LIGHT_1); + gSPLight(gDisplayListHead++, &D_800E45C0[2].a, LIGHT_2); gSPDisplayList(gDisplayListHead++, d_course_banshee_boardwalk_dl_78C0); - gSPLight(gDisplayListHead++, &D_800E4608.l[0], LIGHT_1); - gSPLight(gDisplayListHead++, &D_800E4608.a, LIGHT_2); + gSPLight(gDisplayListHead++, &D_800E45C0[3].l[0], LIGHT_1); + gSPLight(gDisplayListHead++, &D_800E45C0[3].a, LIGHT_2); gSPDisplayList(gDisplayListHead++, d_course_banshee_boardwalk_dl_7650); - - // temp_v0 = gDisplayListHead; - // gDisplayListHead = temp_v0 + 8; - // temp_v0->words.w1 = (u32) &D_0D007828; - // temp_v0->words.w0 = 0x06000000; - // temp_v0_2 = gDisplayListHead; - // gDisplayListHead = temp_v0_2 + 8; - // temp_v0_2->words.w1 = (u32) &D_800E45C8; - // temp_v0_2->words.w0 = 0x03860010; - // temp_v0_3 = gDisplayListHead; - // gDisplayListHead = temp_v0_3 + 8; - // temp_v0_3->words.w1 = (u32) &D_800E45C0; - // temp_v0_3->words.w0 = 0x03880010; - // temp_v0_4 = gDisplayListHead; - // gDisplayListHead = temp_v0_4 + 8; - // temp_v0_4->words.w1 = (u32) &d_course_banshee_boardwalk_dl_7B38; - // temp_v0_4->words.w0 = 0x06000000; - // temp_v0_5 = gDisplayListHead; - // gDisplayListHead = temp_v0_5 + 8; - // temp_v0_5->words.w1 = (u32) &D_800E45E0; - // temp_v0_5->words.w0 = 0x03860010; - // temp_v0_6 = gDisplayListHead; - // gDisplayListHead = temp_v0_6 + 8; - // temp_v0_6->words.w1 = (u32) &D_800E45D8; - // temp_v0_6->words.w0 = 0x03880010; - // temp_v0_7 = gDisplayListHead; - // gDisplayListHead = temp_v0_7 + 8; - // temp_v0_7->words.w1 = (u32) &d_course_banshee_boardwalk_dl_7978; - // temp_v0_7->words.w0 = 0x06000000; - // temp_v0_8 = gDisplayListHead; - // gDisplayListHead = temp_v0_8 + 8; - // temp_v0_8->words.w1 = (u32) &D_800E45F8; - // temp_v0_8->words.w0 = 0x03860010; - // temp_v0_9 = gDisplayListHead; - // gDisplayListHead = temp_v0_9 + 8; - // temp_v0_9->words.w1 = (u32) &D_800E45F0; - // temp_v0_9->words.w0 = 0x03880010; - // temp_v0_10 = gDisplayListHead; - // gDisplayListHead = temp_v0_10 + 8; - // temp_v0_10->words.w1 = (u32) &d_course_banshee_boardwalk_dl_78C0; - // temp_v0_10->words.w0 = 0x06000000; - // temp_v0_11 = gDisplayListHead; - // gDisplayListHead = temp_v0_11 + 8; - // temp_v0_11->words.w1 = (u32) &D_800E4610; - // temp_v0_11->words.w0 = 0x03860010; - // temp_v0_12 = gDisplayListHead; - // gDisplayListHead = temp_v0_12 + 8; - // temp_v0_12->words.w1 = (u32) &D_800E4608; - // temp_v0_12->words.w0 = 0x03880010; - // temp_v0_13 = gDisplayListHead; - // gDisplayListHead = temp_v0_13 + 8; - // temp_v0_13->words.w1 = (u32) &d_course_banshee_boardwalk_dl_7650; - // temp_v0_13->words.w0 = 0x06000000; } } } -#else -GLOBAL_ASM("asm/non_matchings/hud_renderer/func_8005217C.s") -#endif void func_800523B8(s32 objectIndex, s32 arg1, u32 arg2) { UNUSED s32 pad[2]; @@ -3960,56 +3222,51 @@ void func_800524B4(s32 arg0) { } #ifdef MIPS_TO_C -//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b -extern Vec3su D_80183E80; -extern s32 D_8018C3F0; +//generated by m2c commit beb457dabfc7a01ec6540a5404a6a05097a13602 on Dec-20-2023 extern ? D_8018C490; -extern s32 D_8018C630; extern ? D_8018C6A8; -extern s16 D_8018CFB0; extern s16 D_8018CFC8; -extern s16 D_8018CFE8; extern s16 D_8018D000; void func_80052590(s32 cameraId) { Camera *temp_s7; Gfx *temp_v1; + Objects *temp_s0; + Objects *temp_s0_2; + Objects *temp_s0_3; s32 *var_s1; s32 *var_s1_2; s32 temp_v0; s32 temp_v0_2; - Objects *temp_s0; - Objects *temp_s0_2; - Objects *temp_s0_3; temp_s0 = &gObjectList[*D_80183EA0]; temp_s7 = &camera1[cameraId]; - func_80046F60((s32) temp_s0->activeTLUT, (s32) temp_s0->activeTexture, 0x00000020, 0x00000040, 5); - D_80183E80.unk0 = (s16) temp_s0->unk_0B2[0]; - D_80183E80.unk4 = (u16) temp_s0->unk_0B2[2]; - var_s1 = &D_8018C3F0; + func_80046F60(temp_s0->activeTLUT, temp_s0->activeTexture, 0x00000020, 0x00000040, 5); + D_80183E80->unk0 = temp_s0->unk_0B2[0]; + D_80183E80->unk4 = (u16) temp_s0->unk_0B2[2]; + var_s1 = D_8018C3F0; if ((D_8018CFB0 != 0) || (D_8018CFC8 != 0)) { do { temp_v0 = *var_s1; if (temp_v0 != -1) { temp_s0_2 = &gObjectList[temp_v0]; - if ((temp_s0_2->state >= 2) && (gMatrixHudCount <= MTX_HUD_POOL_SIZE_MAX)) { - D_80183E80.unk2 = func_800418AC(temp_s0_2->pos[0], temp_s0_2->pos[2], temp_s7->pos); - func_800431B0(temp_s0_2->pos, &D_80183E80, temp_s0_2->sizeScaling, D_0D0062B0); + if ((temp_s0_2->state >= 2) && (gMatrixHudCount < MTX_HUD_POOL_SIZE_MAX)) { + D_80183E80->unk2 = func_800418AC(temp_s0_2->pos[0], temp_s0_2->pos[2], temp_s7->pos); + func_800431B0(temp_s0_2->pos, D_80183E80, temp_s0_2->sizeScaling, D_0D0062B0); } } var_s1 += 4; } while (var_s1 != &D_8018C490); } if ((D_8018CFE8 != 0) || (D_8018D000 != 0)) { - var_s1_2 = &D_8018C630; + var_s1_2 = D_8018C630; do { temp_v0_2 = *var_s1_2; if (temp_v0_2 != -1) { temp_s0_3 = &gObjectList[temp_v0_2]; - if ((temp_s0_3->state >= 2) && (gMatrixHudCount <= MTX_HUD_POOL_SIZE_MAX)) { - D_80183E80.unk2 = func_800418AC(temp_s0_3->pos[0], temp_s0_3->pos[2], temp_s7->pos); - func_800431B0(temp_s0_3->pos, &D_80183E80, temp_s0_3->sizeScaling, D_0D0062B0); + if ((temp_s0_3->state >= 2) && (gMatrixHudCount < MTX_HUD_POOL_SIZE_MAX)) { + D_80183E80->unk2 = func_800418AC(temp_s0_3->pos[0], temp_s0_3->pos[2], temp_s7->pos); + func_800431B0(temp_s0_3->pos, D_80183E80, temp_s0_3->sizeScaling, D_0D0062B0); } } var_s1_2 += 4; @@ -4051,171 +3308,71 @@ void func_8005285C(s32 arg0) { func_80043500(D_80183E40, D_80183E80, 0.02f, d_course_sherbet_land_dl_ice_block); } -#ifdef MIPS_TO_C -//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b -extern s8 d_course_sherbet_land_ice; -extern ? D_8016582C; -extern s16 D_80183E80; -extern s32 D_8018C3F0; -extern ? D_8018C5F0; -static ? D_800E4620; /* unable to generate initializer */ - void func_800528EC(s32 arg0) { - Gfx *temp_v0; - Gfx *temp_v0_10; - Gfx *temp_v0_12; - Gfx *temp_v0_13; - Gfx *temp_v0_14; - Gfx *temp_v0_15; - Gfx *temp_v0_16; - Gfx *temp_v0_2; - Gfx *temp_v0_3; - Gfx *temp_v0_4; - Gfx *temp_v0_5; - Gfx *temp_v0_6; - Gfx *temp_v0_7; - Gfx *temp_v0_9; - s32 *var_s3; - s32 *var_s3_2; - s32 temp_v0_11; - s32 temp_v0_8; - Objects *temp_v1; - Objects *temp_v1_2; - - temp_v0 = gDisplayListHead; - D_80183E80.unk0 = (s16) D_8016582C.unk0; - D_80183E80.unk2 = (u16) D_8016582C.unk2; - gDisplayListHead = temp_v0 + 8; - D_80183E80.unk4 = (u16) D_8016582C.unk4; - temp_v0->words.w0 = 0x06000000; - temp_v0->words.w1 = (u32) D_0D007B00; - temp_v0_2 = gDisplayListHead; - gDisplayListHead = temp_v0_2 + 8; - temp_v0_2->words.w1 = 0x80000040; - temp_v0_2->words.w0 = 0xBC000002; - temp_v0_3 = gDisplayListHead; - gDisplayListHead = temp_v0_3 + 8; - temp_v0_3->words.w1 = (u32) &D_800E4620.l[0]; - temp_v0_3->words.w0 = 0x03860010; - temp_v0_4 = gDisplayListHead; - gDisplayListHead = temp_v0_4 + 8; - temp_v0_4->words.w1 = (u32) &D_800E4620.a; - temp_v0_4->words.w0 = 0x03880010; - temp_v0_5 = gDisplayListHead; - gDisplayListHead = temp_v0_5 + 8; - temp_v0_5->words.w1 = 0xFF33FFFF; - temp_v0_5->words.w0 = 0xFC121824; - temp_v0_6 = gDisplayListHead; - gDisplayListHead = temp_v0_6 + 8; - temp_v0_6->words.w1 = 0x00003000; - temp_v0_6->words.w0 = 0xB6000000; - temp_v0_7 = gDisplayListHead; - gDisplayListHead = temp_v0_7 + 8; - temp_v0_7->words.w0 = 0xB7000000; - temp_v0_7->words.w1 = 0x00020204; - func_800441E0(&d_course_sherbet_land_ice, 0x00000020, 0x00000020); - var_s3 = &D_8018C3F0; + s32 var_s3; + s32 objectIndex; + Objects *object; + + D_80183E80[0] = D_8016582C[0]; + D_80183E80[1] = D_8016582C[1]; + D_80183E80[2] = D_8016582C[2]; + gSPDisplayList(gDisplayListHead++, D_0D007B00); + gSPNumLights(gDisplayListHead++, 1); + gSPLight(gDisplayListHead++, &D_800E4620.l[0], LIGHT_1); + gSPLight(gDisplayListHead++, &D_800E4620.a, LIGHT_2); + gDPSetCombineMode(gDisplayListHead++, G_CC_MODULATEIA, G_CC_MODULATEIA); + gSPClearGeometryMode(gDisplayListHead++, G_CULL_BOTH); + gSPSetGeometryMode(gDisplayListHead++, G_SHADE | G_LIGHTING | G_SHADING_SMOOTH); + func_800441E0(d_course_sherbet_land_ice, 0x00000020, 0x00000020); if (gPlayerCountSelection1 < 3) { - var_s3_2 = &D_8018C3F0; - do { - temp_v0_8 = *var_s3_2; - if (temp_v0_8 != -1) { - temp_v1 = &gObjectList[temp_v0_8]; - if (temp_v1->state > 0) { - rsp_set_matrix_transformation(temp_v1->pos, &D_80183E80, temp_v1->sizeScaling); - temp_v0_9 = gDisplayListHead; - gDisplayListHead = temp_v0_9 + 8; - temp_v0_9->words.w1 = (u32) D_0D005BD0; - temp_v0_9->words.w0 = 0x04000C2F; - temp_v0_10 = gDisplayListHead; - gDisplayListHead = temp_v0_10 + 8; - temp_v0_10->words.w1 = (u32) D_0D006930; - temp_v0_10->words.w0 = 0x06000000; + for (var_s3 = 0; var_s3 < D_8018C3F0_SIZE; var_s3++) { + objectIndex = D_8018C3F0[var_s3]; + if (objectIndex != -1) { + object = &gObjectList[objectIndex]; + if (object->state > 0) { + rsp_set_matrix_transformation(object->pos, D_80183E80, object->sizeScaling); + gSPVertex(gDisplayListHead++, D_0D005BD0, 3, 0); + gSPDisplayList(gDisplayListHead++, D_0D006930); } } - var_s3_2 += 4; - } while (var_s3_2 != &D_8018C5F0); + } } else { - do { - temp_v0_11 = *var_s3; - if (temp_v0_11 != -1) { - temp_v1_2 = &gObjectList[temp_v0_11]; - if ((temp_v1_2->state > 0) && (arg0 == temp_v1_2->unk_084[7]) && (gMatrixHudCount <= MTX_HUD_POOL_SIZE_MAX)) { - rsp_set_matrix_transformation(temp_v1_2->pos, &D_80183E80, temp_v1_2->sizeScaling); - temp_v0_12 = gDisplayListHead; - gDisplayListHead = temp_v0_12 + 8; - temp_v0_12->words.w1 = (u32) D_0D005BD0; - temp_v0_12->words.w0 = 0x04000C2F; - temp_v0_13 = gDisplayListHead; - gDisplayListHead = temp_v0_13 + 8; - temp_v0_13->words.w1 = (u32) D_0D006930; - temp_v0_13->words.w0 = 0x06000000; + for (var_s3 = 0; var_s3 < D_8018C3F0_SIZE; var_s3++) { + objectIndex = D_8018C3F0[var_s3]; + if (objectIndex != -1) { + object = &gObjectList[objectIndex]; + if ((object->state > 0) && (arg0 == object->unk_084[7]) && (gMatrixHudCount <= MTX_HUD_POOL_SIZE_MAX)) { + rsp_set_matrix_transformation(object->pos, D_80183E80, object->sizeScaling); + gSPVertex(gDisplayListHead++, D_0D005BD0, 3, 0); + gSPDisplayList(gDisplayListHead++, D_0D006930); } } - var_s3 += 4; - } while (var_s3 != &D_8018C5F0); - } - temp_v0_14 = gDisplayListHead; - gDisplayListHead = temp_v0_14 + 8; - temp_v0_14->words.w1 = 0x00002000; - temp_v0_14->words.w0 = 0xB7000000; - temp_v0_15 = gDisplayListHead; - gDisplayListHead = temp_v0_15 + 8; - temp_v0_15->words.w1 = 0x00020000; - temp_v0_15->words.w0 = 0xB6000000; - temp_v0_16 = gDisplayListHead; - gDisplayListHead = temp_v0_16 + 8; - temp_v0_16->words.w0 = 0xBB000000; - temp_v0_16->words.w1 = 0x00010001; + } + } + gSPSetGeometryMode(gDisplayListHead++, G_CULL_BACK); + gSPClearGeometryMode(gDisplayListHead++, G_LIGHTING); + gSPTexture(gDisplayListHead++, 0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF); } -#else -GLOBAL_ASM("asm/non_matchings/hud_renderer/func_800528EC.s") -#endif - -#ifdef MIPS_TO_C -//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b -? func_8005285C(s32); /* extern */ -? func_800528EC(s32); /* extern */ -extern ? D_80165840; -extern s32 D_80183DB8; -static ? D_800E4620; /* unable to generate initializer */ void func_80052C60(s32 arg0) { - Gfx *temp_v0; - Gfx *temp_v0_2; - s32 *var_s1; - s32 temp_s0; - s32 var_s2; + s32 playerId; + s32 objectIndex; - temp_v0 = gDisplayListHead; - gDisplayListHead = temp_v0 + 8; - D_800E4620.unk10 = (s8) D_80165840.unk0; - D_800E4620.unk11 = (s8) D_80165840.unk1; - D_800E4620.unk12 = (s8) D_80165840.unk2; - temp_v0->words.w0 = 0x03860010; - temp_v0->words.w1 = (u32) &D_800E4620.l[0]; - temp_v0_2 = gDisplayListHead; - gDisplayListHead = temp_v0_2 + 8; - temp_v0_2->words.w0 = 0x03880010; - temp_v0_2->words.w1 = (u32) &D_800E4620.a; - var_s1 = &D_80183DB8; - var_s2 = 0; - if (gPlayerCountSelection1 > 0) { - do { - temp_s0 = *var_s1; - if (func_80072320(temp_s0, 4) != 0) { - func_8005285C(var_s2); - } - func_80072320(temp_s0, 0x00000010); - var_s2 += 1; - var_s1 += 4; - } while (var_s2 < gPlayerCountSelection1); + D_800E4620.l[0].l.dir[0] = D_80165840[0]; + D_800E4620.l[0].l.dir[1] = D_80165840[1]; + D_800E4620.l[0].l.dir[2] = D_80165840[2]; + gSPLight(gDisplayListHead++, &D_800E4620.l[0], LIGHT_1); + gSPLight(gDisplayListHead++, &D_800E4620.a, LIGHT_2); + for (playerId = 0; playerId < gPlayerCountSelection1; playerId++) { + objectIndex = D_80183DB8[playerId]; + if (objectIndex) {} + if (func_80072320(objectIndex, 4) != 0) { + func_8005285C(playerId); + } + func_80072320(objectIndex, 0x00000010); } func_800528EC(arg0); } -#else -GLOBAL_ASM("asm/non_matchings/hud_renderer/func_80052C60.s") -#endif void func_80052D70(s32 playerId) { s32 test; @@ -4231,42 +3388,23 @@ void func_80052D70(s32 playerId) { } } -#ifdef MIPS_TO_C -//generated by m2c commit d9d3d6575355663122de59f6b2882d8f174e2355 on Dec-28-2022 -static ? D_800E4620; /* unable to generate initializer */ - void func_80052E30(s32 arg0) { - Gfx *temp_v0; - Gfx *temp_v0_2; s32 var_s0; - temp_v0 = gDisplayListHead; - gDisplayListHead = temp_v0 + 8; - D_800E4620.unk10 = (s8) D_80165840->unk0; - D_800E4620.unk11 = (s8) D_80165840->unk1; - D_800E4620.unk12 = (s8) D_80165840->unk2; - temp_v0->words.w0 = 0x03860010; - temp_v0->words.w1 = (u32) &D_800E4620.l[0]; - temp_v0_2 = gDisplayListHead; - gDisplayListHead = temp_v0_2 + 8; - temp_v0_2->words.w0 = 0x03880010; - temp_v0_2->words.w1 = (u32) &D_800E4620.a; - D_80183E80->unk0 = 0; - D_80183E80->unk2 = 0; - D_80183E80->unk4 = 0; + D_800E4620.l[0].l.dir[0] = D_80165840[0]; + D_800E4620.l[0].l.dir[1] = D_80165840[1]; + D_800E4620.l[0].l.dir[2] = D_80165840[2]; + gSPLight(gDisplayListHead++, &D_800E4620.l[0], LIGHT_1); + gSPLight(gDisplayListHead++, &D_800E4620.a, LIGHT_2); + D_80183E80[0] = 0; + D_80183E80[1] = 0; + D_80183E80[2] = 0; if (gPlayerCount == 1) { - var_s0 = 0; - if (gPlayerCountSelection1 > 0) { - do { - func_80052D70(var_s0); - var_s0 += 1; - } while (var_s0 < gPlayerCountSelection1); + for (var_s0 = 0; var_s0 < gPlayerCountSelection1; var_s0++) { + func_80052D70(var_s0); } } } -#else -GLOBAL_ASM("asm/non_matchings/hud_renderer/func_80052E30.s") -#endif void func_80052F20(s32 cameraId) { s32 stackPadding[2]; @@ -4409,165 +3547,74 @@ void func_800536C8(s32 objectIndex) { } } -#ifdef MIPS_TO_C -//generated by m2c commit b52d92c2340f6f4ba1aafb464188bb698752fbb0 on Jul-27-2023 -? func_800534A4(s32); /* extern */ -extern ? D_8018C5F0; -extern u8 d_course_bowsers_castle_thwomp_side; -Lights1 D_800E4668; /* unable to generate initializer */ - void func_80053870(s32 cameraId) { - s32 sp94; - Camera *sp84; - s32 *sp44; - Gfx *temp_v0_10; - Gfx *temp_v0_11; - Gfx *temp_v0_12; - Gfx *temp_v0_13; - Gfx *temp_v0_14; - Gfx *temp_v0_15; - Gfx *temp_v0_3; - Gfx *temp_v0_4; - Gfx *temp_v0_5; - Gfx *temp_v0_6; - Gfx *temp_v0_7; - Gfx *temp_v0_8; - Gfx *temp_v0_9; - s16 temp_v0_2; - s32 *var_a3; - s32 *var_s0; - s32 *var_s0_2; - s32 *var_s3; - s32 *var_v1; s32 temp_s1; - s32 temp_s1_2; - s32 temp_s1_3; - s32 temp_s1_4; s32 var_s2; - Objects *temp_s0; - Objects *temp_s0_2; - u8 temp_v0; + s32 stackPadding0; + s16 minusone, plusone; + Camera *camera; + Objects *temp_v0; - sp84 = &camera1[cameraId]; + camera = &camera1[cameraId]; if (cameraId == 0) { - var_s0 = D_80183EA0; - var_s2 = 0; - if (gNumActiveThwomps > 0) { - do { - temp_s1 = *var_s0; - set_object_flag_unk_054_false(temp_s1, 0x00070000); - func_800722CC(temp_s1, 0x00000110); - var_s2 += 1; - var_s0 += 4; - } while (var_s2 < gNumActiveThwomps); - sp94 = temp_s1; + for (var_s2 = 0; var_s2 < gNumActiveThwomps; var_s2++) { + temp_s1 = D_80183EA0[var_s2]; + set_object_flag_unk_054_false(temp_s1, 0x00070000); + func_800722CC(temp_s1, 0x00000110); } } - func_800534A4(sp94); - var_s0_2 = D_80183EA0; - if (gNumActiveThwomps > 0) { - do { - temp_s1_2 = *var_s0_2; - temp_v0 = gObjectList[temp_s1_2].unk_0DF; - if (gGamestate != 9) { - temp_v0_2 = D_8018CF68[cameraId]; - if ((temp_v0_2 >= (s16) (temp_v0 - 1)) && ((s16) (temp_v0 + 1) >= temp_v0_2) && (func_8008A140(temp_s1_2, sp84, 0x8000U) != 0)) { - func_800536C8(temp_s1_2); - } - var_v1 = &D_80183EA0[gNumActiveThwomps]; - } else { - func_800536C8(temp_s1_2); - var_v1 = &D_80183EA0[gNumActiveThwomps]; + func_800534A4(temp_s1); + for (var_s2 = 0; var_s2 < gNumActiveThwomps; var_s2++) { + temp_s1 = D_80183EA0[var_s2]; + minusone = gObjectList[temp_s1].unk_0DF - 1; + plusone = gObjectList[temp_s1].unk_0DF + 1; + if (gGamestate != 9) { + if ((D_8018CF68[cameraId] >= minusone) && (plusone >= D_8018CF68[cameraId]) && (func_8008A140(temp_s1, camera, 0x8000U) != 0)) { + func_800536C8(temp_s1); } - var_s0_2 += 4; - } while ((u32) var_s0_2 < (u32) var_v1); - } - temp_v0_3 = gDisplayListHead; - gDisplayListHead = temp_v0_3 + 8; - temp_v0_3->words.w0 = 0x06000000; - temp_v0_3->words.w1 = (u32) D_0D0079C8; - temp_v0_4 = gDisplayListHead; - gDisplayListHead = temp_v0_4 + 8; - temp_v0_4->words.w1 = 0xFF33FFFF; - temp_v0_4->words.w0 = 0xFC121824; - temp_v0_5 = gDisplayListHead; - gDisplayListHead = temp_v0_5 + 8; - temp_v0_5->words.w1 = 0x80000040; - temp_v0_5->words.w0 = 0xBC000002; - temp_v0_6 = gDisplayListHead; - gDisplayListHead = temp_v0_6 + 8; - temp_v0_6->words.w1 = (u32) &D_800E4668.l[0]; - temp_v0_6->words.w0 = 0x03860010; - temp_v0_7 = gDisplayListHead; - gDisplayListHead = temp_v0_7 + 8; - temp_v0_7->words.w1 = (u32) &D_800E4668.a; - temp_v0_7->words.w0 = 0x03880010; - temp_v0_8 = gDisplayListHead; - gDisplayListHead = temp_v0_8 + 8; - temp_v0_8->words.w1 = 0x00003000; - temp_v0_8->words.w0 = 0xB6000000; - temp_v0_9 = gDisplayListHead; - gDisplayListHead = temp_v0_9 + 8; - temp_v0_9->words.w0 = 0xB7000000; - temp_v0_9->words.w1 = 0x00020204; - func_80043D50(&d_course_bowsers_castle_thwomp_side, 0x00000020, 0x00000020); - var_a3 = D_8018C630; - do { - temp_s1_3 = *var_a3; - if (temp_s1_3 != -1) { - temp_s0 = &gObjectList[temp_s1_3]; - if ((temp_s0->state > 0) && (temp_s0->unk_0D5 == 3) && (gMatrixHudCount <= MTX_HUD_POOL_SIZE_MAX)) { - sp44 = var_a3; - rsp_set_matrix_transformation(temp_s0->pos, temp_s0->unk_0B2, temp_s0->sizeScaling); - temp_v0_10 = gDisplayListHead; - gDisplayListHead = temp_v0_10 + 8; - temp_v0_10->words.w0 = 0x04000C2F; - temp_v0_10->words.w1 = (u32) D_0D005C00; - temp_v0_11 = gDisplayListHead; - gDisplayListHead = temp_v0_11 + 8; - temp_v0_11->words.w1 = (u32) D_0D006930; - temp_v0_11->words.w0 = 0x06000000; + } else { + func_800536C8(temp_s1); + } + } + gSPDisplayList(gDisplayListHead++, D_0D0079C8); + gDPSetCombineMode(gDisplayListHead++, G_CC_MODULATEIA, G_CC_MODULATEIA); + gSPNumLights(gDisplayListHead++, 1); + gSPLight(gDisplayListHead++, &D_800E4668.l[0], LIGHT_1); + gSPLight(gDisplayListHead++, &D_800E4668.a, LIGHT_2); + gSPClearGeometryMode(gDisplayListHead++, G_CULL_BOTH); + gSPSetGeometryMode(gDisplayListHead++, G_SHADE | G_LIGHTING | G_SHADING_SMOOTH); + func_80043D50(d_course_bowsers_castle_thwomp_side, 0x00000020, 0x00000020); + for (var_s2 = 0; var_s2 < D_8018C630_SIZE; var_s2++) { + temp_s1 = D_8018C630[var_s2]; + if (temp_s1 != -1) { + temp_v0 = &gObjectList[temp_s1]; + if ((temp_v0->state > 0) && (temp_v0->unk_0D5 == 3) && (gMatrixHudCount <= MTX_HUD_POOL_SIZE_MAX)) { + rsp_set_matrix_transformation(temp_v0->pos, temp_v0->unk_0B2, temp_v0->sizeScaling); + gSPVertex(gDisplayListHead++, D_0D005C00, 3, 0); + gSPDisplayList(gDisplayListHead++, D_0D006930); } } - var_a3 += 4; - } while ((u32) var_a3 < (u32) &D_8018C830); - temp_v0_12 = gDisplayListHead; - gDisplayListHead = temp_v0_12 + 8; - temp_v0_12->words.w1 = 0x00002000; - temp_v0_12->words.w0 = 0xB7000000; - temp_v0_13 = gDisplayListHead; - gDisplayListHead = temp_v0_13 + 8; - temp_v0_13->words.w1 = 0x00020000; - temp_v0_13->words.w0 = 0xB6000000; - temp_v0_14 = gDisplayListHead; - gDisplayListHead = temp_v0_14 + 8; - temp_v0_14->words.w0 = 0xBB000000; - temp_v0_14->words.w1 = 0x00010001; - temp_v0_15 = gDisplayListHead; - gDisplayListHead = temp_v0_15 + 8; - temp_v0_15->words.w0 = 0x06000000; - temp_v0_15->words.w1 = (u32) D_0D007AE0; + } + gSPSetGeometryMode(gDisplayListHead++, G_CULL_BACK); + gSPClearGeometryMode(gDisplayListHead++, G_LIGHTING); + gSPTexture(gDisplayListHead++, 0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF); + gSPDisplayList(gDisplayListHead++, D_0D007AE0); func_800444B0(D_8018D490, 0x00000020, 0x00000020); func_8004B3C8(0); - D_80183E80->unk0 = 0; - D_80183E80->unk4 = 0x8000; - var_s3 = D_8018C3F0; - do { - temp_s1_4 = *var_s3; - if (temp_s1_4 != -1) { - temp_s0_2 = &gObjectList[temp_s1_4]; - if ((temp_s0_2->state >= 2) && (temp_s0_2->unk_0D5 == 2) && (gMatrixHudCount <= MTX_HUD_POOL_SIZE_MAX)) { - func_8004B138(0x000000FF, 0x000000FF, 0x000000FF, (s32) temp_s0_2->unk_0A0); - D_80183E80->unk2 = func_800418AC(temp_s0_2->pos[0], temp_s0_2->pos[2], sp84->pos); - func_800431B0(temp_s0_2->pos, D_80183E80, temp_s0_2->sizeScaling, D_0D005AE0); + D_80183E80[0] = 0; + D_80183E80[2] = 0x8000; + for (var_s2 = 0; var_s2 < D_8018C3F0_SIZE; var_s2++) { + temp_s1 = D_8018C3F0[var_s2]; + if (temp_s1 != -1) { + temp_v0 = &gObjectList[temp_s1]; + if ((temp_v0->state >= 2) && (temp_v0->unk_0D5 == 2) && (gMatrixHudCount <= MTX_HUD_POOL_SIZE_MAX)) { + func_8004B138(0x000000FF, 0x000000FF, 0x000000FF, (s32) temp_v0->unk_0A0); + D_80183E80[1] = func_800418AC(temp_v0->pos[0], temp_v0->pos[2], camera->pos); + func_800431B0(temp_v0->pos, D_80183E80, temp_v0->sizeScaling, D_0D005AE0); } } - var_s3 += 4; - } while (var_s3 != &D_8018C5F0); + } } -#else -GLOBAL_ASM("asm/non_matchings/hud_renderer/func_80053870.s") -#endif void func_80053D74(s32 objectIndex, UNUSED s32 arg1, s32 vertexIndex) { Objects *temp_v0; @@ -4582,10 +3629,6 @@ void func_80053D74(s32 objectIndex, UNUSED s32 arg1, s32 vertexIndex) { } } -extern u8 D_800E52D0[]; -extern u8* D_8018D4BC; -extern u8* D_8018D4C0; - void func_80053E6C(s32 arg0) { s32 var_s1; s32 objectIndex; @@ -4680,11 +3723,6 @@ void func_80054324(s32 objectIndex, s32 cameraId) { } } -extern f32 D_801637C4; -extern s32 D_801637E8; -extern f32 D_801637F0; -extern s32 D_80163814; - // Likely smoke related. void func_80054414(s32 cameraId) { s32 pad[2]; @@ -4808,36 +3846,23 @@ void func_80054AFC(s32 objectIndex, Vec3f arg1) { gSPDisplayList(gDisplayListHead++, common_rectangle_display); } -#ifdef MIPS_TO_C -//generated by m2c commit d9d3d6575355663122de59f6b2882d8f174e2355 on Dec-28-2022 -extern s8 *D_8018D488; - void func_80054BE8(s32 cameraId) { - Camera *temp_s5; - Gfx *temp_v1; - s32 *var_s0; + s32 var_s0; s32 temp_a0; + Camera *camera; - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; - temp_v1->words.w0 = 0x06000000; - temp_v1->words.w1 = (u32) D_0D007AE0; - temp_s5 = &camera1[cameraId]; + camera = &camera1[cameraId]; + gSPDisplayList(gDisplayListHead++, D_0D007AE0); func_800444B0(D_8018D488, 0x00000020, 0x00000020); func_8004B35C(0x000000FF, 0x000000FF, 0, 0x000000FF); - *D_80183E80 = 0; - var_s0 = D_8018C630; - do { - temp_a0 = *var_s0; + D_80183E80[0] = 0; + for (var_s0 = 0; var_s0 < D_8018C630_SIZE; var_s0++) { + temp_a0 = D_8018C630[var_s0]; if ((temp_a0 != -1) && (gObjectList[temp_a0].state >= 2)) { - func_80054AFC(temp_a0, temp_s5->pos); + func_80054AFC(temp_a0, camera->pos); } - var_s0 += 4; - } while (var_s0 != &D_8018C830); + } } -#else -GLOBAL_ASM("asm/non_matchings/hud_renderer/func_80054BE8.s") -#endif void func_80054D00(s32 objectIndex, s32 cameraId) { Camera *camera; @@ -4954,8 +3979,6 @@ void func_800552BC(s32 objectIndex) { } } -extern s8 D_80165908; - void func_80055380(s32 arg0) { s32 i; s32 var_s1; @@ -5240,116 +4263,51 @@ void func_80056188(s32 cameraId) { } } -#ifdef MIPS_TO_C -//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b -struct _struct_D_800E46F8_0xC { - /* 0x0 */ s32 unk0; /* inferred */ - /* 0x4 */ s32 unk4; /* inferred */ - /* 0x8 */ s32 unk8; /* inferred */ -}; /* size = 0xC */ - -extern s32 D_80165860; -extern s32 D_8016586C; -extern s32 D_80165878; -extern f32 D_80183E40; -extern s16 D_80183E80; -static struct _struct_D_800E46F8_0xC D_800E46F8[3] = { - { 0x000000FF, 0x000000FF, 0x000000FF }, - { 0x000000FF, 0x000000FF, 0 }, - { 0x000000FF, 0, 0 }, -}; - void func_800562E4(s32 arg0, s32 arg1, s32 arg2) { - Gfx *temp_v0_2; - Gfx *temp_v0_3; - s32 temp_a0; - s32 temp_a1; - s32 temp_a2; - struct _struct_D_800E46F8_0xC *temp_v0; - - temp_v0 = &D_800E46F8[arg0]; - temp_a0 = temp_v0->unk0; - temp_a1 = temp_v0->unk4; - temp_a2 = temp_v0->unk8; - D_80165860 = temp_a0; - D_8016586C = temp_a1; - D_80165878 = temp_a2; - func_8004B138(temp_a0, temp_a1, temp_a2, arg2); - rsp_set_matrix_transformation(&D_80183E40, &D_80183E80, 0.2f); - func_80044BF8((arg1 << 0xA) + D_0D02AC58, 0x00000020, 0x00000020); - temp_v0_2 = gDisplayListHead; - gDisplayListHead = temp_v0_2 + 8; - temp_v0_2->words.w0 = 0x0400103F; - temp_v0_2->words.w1 = (u32) D_0D005AE0; - temp_v0_3 = gDisplayListHead; - gDisplayListHead = temp_v0_3 + 8; - temp_v0_3->words.w0 = 0x06000000; - temp_v0_3->words.w1 = (u32) common_rectangle_display; + D_80165860 = D_800E46F8[arg0][0]; + D_8016586C = D_800E46F8[arg0][1]; + D_80165878 = D_800E46F8[arg0][2]; + func_8004B138(D_80165860, D_8016586C, D_80165878, arg2); + rsp_set_matrix_transformation(D_80183E40, D_80183E80, 0.2f); + func_80044BF8(D_0D02AC58[arg1], 0x00000020, 0x00000020); + gSPVertex(gDisplayListHead++, D_0D005AE0, 4, 0); + gSPDisplayList(gDisplayListHead++, common_rectangle_display); } -#else -GLOBAL_ASM("asm/non_matchings/hud_renderer/func_800562E4.s") -#endif - -#ifdef MIPS_TO_C -//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b -? func_800562E4(s32, s32, s32); /* extern */ -extern s32 D_801655CC; -extern f32 D_80183E40; -extern s16 D_80183E80; -extern s32 D_8018D400; void func_800563DC(s32 objectIndex, s32 cameraId, s32 arg2) { - Gfx *temp_v0_2; - Gfx *temp_v0_3; - Gfx *temp_v0_6; - f32 temp_f12; - f32 temp_f14; s32 temp_s0; - s32 temp_s0_2; - s32 temp_v0_4; - s32 temp_v0_5; - Objects *temp_v0; + s32 temp_v0; + s32 residue; + Camera *camera; + Objects *object; - temp_v0 = &gObjectList[objectIndex]; - temp_f12 = temp_v0->pos[0]; - temp_f14 = temp_v0->pos[2]; - temp_s0 = D_801655CC & 3; - D_80183E40.unk4 = (f32) ((f64) temp_v0->pos[1] + 1.0); - D_80183E80.unk0 = 0; - D_80183E40.unk0 = temp_f12; - D_80183E40.unk8 = temp_f14; - D_80183E80.unk2 = func_800418AC(temp_f12, temp_f14, camera1[cameraId].pos); - D_80183E80.unk4 = 0x8000; - rsp_set_matrix_transformation(&D_80183E40, &D_80183E80, 0.2f); - temp_v0_2 = gDisplayListHead; - gDisplayListHead = temp_v0_2 + 8; - temp_v0_2->words.w0 = 0x06000000; - temp_v0_2->words.w1 = (u32) D_0D007E98; + camera = &camera1[cameraId]; + object = &gObjectList[objectIndex]; + residue = D_801655CC % 4U; + D_80183E40[0] = object->pos[0]; + D_80183E40[1] = object->pos[1] + 1.0; + D_80183E40[2] = object->pos[2]; + D_80183E80[0] = 0; + D_80183E80[1] = func_800418AC(object->pos[0], object->pos[2], camera->pos); + D_80183E80[2] = 0x8000; + rsp_set_matrix_transformation(D_80183E40, D_80183E80, 0.2f); + gSPDisplayList(gDisplayListHead++, D_0D007E98); func_8004B310(arg2); - draw_rectangle_texture_overlap(D_0D02A858, (temp_s0 << 0xA) + D_0D029858, D_0D005AE0, 0x00000020, 0x00000020, 0x00000020, 0x00000020); - temp_v0_3 = gDisplayListHead; - temp_s0_2 = D_8018D400; - gDisplayListHead = temp_v0_3 + 8; - temp_v0_3->words.w0 = 0x06000000; - temp_v0_3->words.w1 = (u32) D_0D007B00; + draw_rectangle_texture_overlap(D_0D02A858, D_0D029858[residue], D_0D005AE0, 0x00000020, 0x00000020, 0x00000020, 0x00000020); + temp_s0 = D_8018D400; + gSPDisplayList(gDisplayListHead++, D_0D007B00); func_8004B414(0, 0, 0, arg2); - D_80183E80.unk4 = 0; - D_80183E40.unk4 = (f32) ((f64) D_80183E40.unk4 + 4.0); - func_800562E4(temp_s0_2 % 3, temp_s0_2 % 4, arg2); - temp_v0_4 = temp_s0_2 + 1; - D_80183E80.unk4 = 0x6000; - func_800562E4(temp_v0_4 % 3, temp_v0_4 % 4, arg2); - temp_v0_5 = temp_s0_2 + 2; - D_80183E80.unk4 = 0xA000; - func_800562E4(temp_v0_5 % 3, temp_v0_5 % 4, arg2); - temp_v0_6 = gDisplayListHead; - gDisplayListHead = temp_v0_6 + 8; - temp_v0_6->words.w0 = 0xBB000000; - temp_v0_6->words.w1 = 0x00010001; + D_80183E40[1] = D_80183E40[1] + 4.0; + D_80183E80[2] = 0; + func_800562E4(temp_s0 % 3, temp_s0 % 4, arg2); + temp_v0 = temp_s0 + 1; + D_80183E80[2] = 0x6000; + func_800562E4(temp_v0 % 3, temp_v0 % 4, arg2); + temp_v0 = temp_s0 + 2; + D_80183E80[2] = 0xA000; + func_800562E4(temp_v0 % 3, temp_v0 % 4, arg2); + gSPTexture(gDisplayListHead++, 1, 1, 0, G_TX_RENDERTILE, G_OFF); } -#else -GLOBAL_ASM("asm/non_matchings/hud_renderer/func_800563DC.s") -#endif void func_8005669C(s32 objectIndex, UNUSED s32 arg1, s32 arg2) { gSPDisplayList(gDisplayListHead++, D_0D0079E8); @@ -5584,7 +4542,6 @@ void debug_wrap_text(s32 *x, s32 *y) { } } -extern s8 D_800E5628[]; void debug_print_string(s32 *x, s32 *y, char *arg2) { *x += 20; *y += 20; @@ -5598,10 +4555,6 @@ void debug_print_string(s32 *x, s32 *y, char *arg2) { } } -extern s8 D_800E5655[0x15]; //[0x15] = { 0x2B, 0x24, 0x2D, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0x2C, 0x36, 0x3C, 0x2F, 0x3D, 0x28, 0x30, 0x0A, }; - -extern s8 D_801657B8[16]; - void debug_print_number(s32 *x, s32 *y, s32 number, u32 numDigits) { s32 n; diff --git a/src/hud_renderer.h b/src/hud_renderer.h index 57e9c1c653..cc64e566b2 100644 --- a/src/hud_renderer.h +++ b/src/hud_renderer.h @@ -243,6 +243,10 @@ void func_800450C8(u8*, s32, s32); void func_80044F34(u8*, s32, s32); void func_8004D044(s32, s32, u8*, s32, s32, s32, s32, s32, s32, s32, s32); void func_8004D0CC(void); +void func_8004D0D4(s32, s32, u8*, s32, s32, s32); +void func_8004D210(s32, s32, u8*, s32, s32, s32, s32, s32, s32, s32, s32); +void func_8004D37C(s32, s32, u8*, s32, s32, s32, s32, s32, s32, s32, s32); +void func_8004D4E8(s32, s32, u8*, s32, s32, s32, s32, s32, s32, s32, s32); void func_8004DC34(s32, s32, u8*); void func_8004DC6C(s32, s32, u8*); void func_8004DCA4(s32, s32, u8*); @@ -291,6 +295,7 @@ void func_8004EE54(s32); void func_8004EF9C(s32); void func_8004F020(s32); +void func_8004F168(s32, s32, s32); void func_8004F3E4(s32); s32 func_8004F674(s32*, s32); void print_timer(s32, s32, s32); @@ -303,12 +308,15 @@ void func_8004FDB4(f32, f32, s16, s16, s16, s32, s32, s32, s32); void func_80050320(void); s32 func_80050644(u16, s32*, s32*); void func_800507D8(u16, s32*, s32*); +void func_800508C0(void); void func_80050C68(void); void func_80050E34(s32, s32); void func_800514BC(void); void func_80051638(s32); void func_800517C8(void); +void func_800518F8(s32, s16, s16); +void func_800519D4(s32, s16, s16); void func_80051ABC(s16, s32); void func_80051C60(s16, s32); void func_80051EBC(void); @@ -317,13 +325,15 @@ void func_80051F9C(void); void func_80052044(void); void func_80052080(void); +void func_800520C0(s32); void func_8005217C(s32); void func_800523B8(s32, s32, u32); void func_800524B4(s32); void func_800524B4(s32); +void func_80052590(s32); void func_800527D8(s32); void func_8005285C(s32); -void func_80052590(s32); +void func_800528EC(s32); void func_80052C60(s32); void func_80052D70(s32); void func_80052E30(s32); @@ -332,6 +342,7 @@ void func_80052F20(s32); void func_8005309C(s32); void func_8005327C(s32); void func_800532A4(s32); +void func_800534A4(s32); void func_800534E8(s32); void func_800536C8(s32); void func_80053870(s32); @@ -417,15 +428,31 @@ void func_80057B14(s32, s32, char*, u32); void func_80057B80(s32, s32, char*, u32); void func_80057BEC(s32, s32, char*, u32); -extern s32 D_80165860; -extern s32 D_8016586C; -extern s32 D_80165878; -extern s32 D_8016589C; +extern f32 D_801637C4; +extern s32 D_801637E8; +extern f32 D_801637F0; + +extern s32 D_80163814; + +extern u16 D_801656B0; extern u16 D_801656C0; extern s32 D_801655CC; extern u16 D_801656D0; extern u16 D_801656E0; +extern s16 D_80165708; +extern s16 D_80165710; +extern s8 D_801657D0[]; +extern u16 D_8016579E; +extern s8 D_801657B8[16]; + +extern s32 D_80165860; +extern s32 D_8016586C; +extern s32 D_80165878; +extern s32 D_8016589C; + +extern s8 D_80165908; + extern Camera *D_8018CF14; extern s32 D_80183DD8[]; extern Vec3f D_80183E40; @@ -436,12 +463,28 @@ extern Vec3su D_80183E98; extern Collision D_8018C830; extern u8 *D_8018D1E0; +extern f32 D_8018CFEC; +extern f32 D_8018CFF4; +extern f32 D_8018D00C; +extern u8 D_8018D228; +extern f32 D_8018D2A0; +extern s16 D_8018D2C0[]; +extern s16 D_8018D2D8[]; +extern s16 D_8018D2E0; +extern s16 D_8018D2E8; +extern s16 D_8018D2F0; +extern s16 D_8018D2F8; +extern u16 D_8018D300; +extern u16 D_8018D308; +extern u16 D_8018D310; extern s32 D_8018D3E0; // some alpha extern s32 D_8018D3E4; // some red extern s32 D_8018D3E8; // some green extern s32 D_8018D3EC; // some blue extern s32 D_8018D400; +extern u8* D_8018D4BC; +extern u8* D_8018D4C0; // Probably aren't really part of this file, but don't have a better place to put them extern u8 *gPortraitTLUTs[]; @@ -453,8 +496,13 @@ extern Lights1 D_800E4668; extern Lights1 D_800E4680; extern Lights1 D_800E4698; -extern s8 D_800E5670[]; -extern s8 D_800E566A[]; +extern u8 D_800E52D0[]; +extern s32 D_800E55F8[]; +extern s32 D_800E5618[4];// = { 0x000000FF, 0x000000D7, 0x000000A2, 0x00000061 }; +extern s8 D_800E5628[]; +extern s8 D_800E5655[0x15]; //[0x15] = { 0x2B, 0x24, 0x2D, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0x2C, 0x36, 0x3C, 0x2F, 0x3D, 0x28, 0x30, 0x0A, }; +extern s8 D_800E5670[]; +extern s8 D_800E566A[]; extern u8 d_course_bowsers_castle_thwomp_tlut[]; // Some type of pallette?