From 396707d0a3822a9ca0e314519ab00d9b52a2dd7f Mon Sep 17 00:00:00 2001 From: David Date: Sat, 7 Oct 2023 05:00:34 -0500 Subject: [PATCH] Decompiled 11 functions --- .../fade_transition/func_800C0B00.s | 414 ----------------- asm/non_matchings/game_ui/func_800A1248.s | 134 ------ asm/non_matchings/game_ui/func_800A14F0.s | 331 -------------- asm/non_matchings/game_ui/func_800A19A4.s | 165 ------- asm/non_matchings/game_ui/func_800A4C44.s | 210 --------- asm/non_matchings/game_ui/func_800A5F18.s | 223 ---------- asm/non_matchings/game_ui/func_800A6E30.s | 243 ---------- asm/non_matchings/game_ui/func_800A718C.s | 190 -------- asm/non_matchings/game_ui/func_800A7FBC.s | 270 ------------ .../menu/menu_audio_options_loop.s | 392 ---------------- .../object_functions/obj_loop_effectbox.s | 201 --------- src/controller.c | 4 +- src/controller.h | 4 +- src/fade_transition.c | 72 ++- src/fade_transition.h | 2 +- src/game_ui.c | 417 +++++++++++++++++- src/game_ui.h | 119 +++-- src/menu.c | 233 +++++----- src/object_functions.c | 85 ++-- 19 files changed, 733 insertions(+), 2976 deletions(-) delete mode 100644 asm/non_matchings/fade_transition/func_800C0B00.s delete mode 100644 asm/non_matchings/game_ui/func_800A1248.s delete mode 100644 asm/non_matchings/game_ui/func_800A14F0.s delete mode 100644 asm/non_matchings/game_ui/func_800A19A4.s delete mode 100644 asm/non_matchings/game_ui/func_800A4C44.s delete mode 100644 asm/non_matchings/game_ui/func_800A5F18.s delete mode 100644 asm/non_matchings/game_ui/func_800A6E30.s delete mode 100644 asm/non_matchings/game_ui/func_800A718C.s delete mode 100644 asm/non_matchings/game_ui/func_800A7FBC.s delete mode 100644 asm/non_matchings/menu/menu_audio_options_loop.s delete mode 100644 asm/non_matchings/object_functions/obj_loop_effectbox.s diff --git a/asm/non_matchings/fade_transition/func_800C0B00.s b/asm/non_matchings/fade_transition/func_800C0B00.s deleted file mode 100644 index b416dc97..00000000 --- a/asm/non_matchings/fade_transition/func_800C0B00.s +++ /dev/null @@ -1,414 +0,0 @@ -glabel func_800C0B00 -/* 0C1700 800C0B00 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 0C1704 800C0B04 00051880 */ sll $v1, $a1, 2 -/* 0C1708 800C0B08 00054880 */ sll $t1, $a1, 2 -/* 0C170C 800C0B0C 01254823 */ subu $t1, $t1, $a1 -/* 0C1710 800C0B10 00651821 */ addu $v1, $v1, $a1 -/* 0C1714 800C0B14 AFB00018 */ sw $s0, 0x18($sp) -/* 0C1718 800C0B18 00031840 */ sll $v1, $v1, 1 -/* 0C171C 800C0B1C 00094880 */ sll $t1, $t1, 2 -/* 0C1720 800C0B20 00064100 */ sll $t0, $a2, 4 -/* 0C1724 800C0B24 00A08025 */ move $s0, $a1 -/* 0C1728 800C0B28 00687021 */ addu $t6, $v1, $t0 -/* 0C172C 800C0B2C 0009C080 */ sll $t8, $t1, 2 -/* 0C1730 800C0B30 AFBF0024 */ sw $ra, 0x24($sp) -/* 0C1734 800C0B34 AFB20020 */ sw $s2, 0x20($sp) -/* 0C1738 800C0B38 AFB1001C */ sw $s1, 0x1c($sp) -/* 0C173C 800C0B3C AFA40050 */ sw $a0, 0x50($sp) -/* 0C1740 800C0B40 0309C023 */ subu $t8, $t8, $t1 -/* 0C1744 800C0B44 000E7840 */ sll $t7, $t6, 1 -/* 0C1748 800C0B48 3C05FFFF */ lui $a1, (0xFFFF00FF >> 16) # lui $a1, 0xffff -/* 0C174C 800C0B4C 00C08825 */ move $s1, $a2 -/* 0C1750 800C0B50 00E09025 */ move $s2, $a3 -/* 0C1754 800C0B54 34A500FF */ ori $a1, (0xFFFF00FF & 0xFFFF) # ori $a1, $a1, 0xff -/* 0C1758 800C0B58 01F82021 */ addu $a0, $t7, $t8 -/* 0C175C 800C0B5C AFA8002C */ sw $t0, 0x2c($sp) -/* 0C1760 800C0B60 AFA90028 */ sw $t1, 0x28($sp) -/* 0C1764 800C0B64 0C01C327 */ jal allocate_from_main_pool_safe -/* 0C1768 800C0B68 AFA30030 */ sw $v1, 0x30($sp) -/* 0C176C 800C0B6C 8FA30030 */ lw $v1, 0x30($sp) -/* 0C1770 800C0B70 3C04800E */ lui $a0, %hi(sTransitionVtx) # $a0, 0x800e -/* 0C1774 800C0B74 248431C0 */ addiu $a0, %lo(sTransitionVtx) # addiu $a0, $a0, 0x31c0 -/* 0C1778 800C0B78 AC820000 */ sw $v0, ($a0) -/* 0C177C 800C0B7C 3C01800E */ lui $at, %hi(sTransitionVtx+4) # $at, 0x800e -/* 0C1780 800C0B80 00436021 */ addu $t4, $v0, $v1 -/* 0C1784 800C0B84 AC2C31C4 */ sw $t4, %lo(sTransitionVtx+4)($at) -/* 0C1788 800C0B88 8C8D0004 */ lw $t5, 4($a0) -/* 0C178C 800C0B8C 3C05800E */ lui $a1, %hi(sTransitionTris) # $a1, 0x800e -/* 0C1790 800C0B90 3C01800E */ lui $at, %hi(sTransitionTris+4) # $at, 0x800e -/* 0C1794 800C0B94 01A37021 */ addu $t6, $t5, $v1 -/* 0C1798 800C0B98 24A531C8 */ addiu $a1, %lo(sTransitionTris) # addiu $a1, $a1, 0x31c8 -/* 0C179C 800C0B9C AC2E31C8 */ sw $t6, %lo(sTransitionTris)($at) -/* 0C17A0 800C0BA0 8FA8002C */ lw $t0, 0x2c($sp) -/* 0C17A4 800C0BA4 8CAF0000 */ lw $t7, ($a1) -/* 0C17A8 800C0BA8 3C068013 */ lui $a2, %hi(D_8012A770) # $a2, 0x8013 -/* 0C17AC 800C0BAC 01E8C021 */ addu $t8, $t7, $t0 -/* 0C17B0 800C0BB0 AC3831CC */ sw $t8, %lo(sTransitionTris+4)($at) -/* 0C17B4 800C0BB4 8CB90004 */ lw $t9, 4($a1) -/* 0C17B8 800C0BB8 3C018013 */ lui $at, %hi(D_8012A770) # $at, 0x8013 -/* 0C17BC 800C0BBC 03286021 */ addu $t4, $t9, $t0 -/* 0C17C0 800C0BC0 24C6A770 */ addiu $a2, %lo(D_8012A770) # addiu $a2, $a2, -0x5890 -/* 0C17C4 800C0BC4 AC2CA770 */ sw $t4, %lo(D_8012A770)($at) -/* 0C17C8 800C0BC8 8FA90028 */ lw $t1, 0x28($sp) -/* 0C17CC 800C0BCC 8CCD0000 */ lw $t5, ($a2) -/* 0C17D0 800C0BD0 3C0B8013 */ lui $t3, %hi(D_8012A774) # $t3, 0x8013 -/* 0C17D4 800C0BD4 3C018013 */ lui $at, %hi(D_8012A774) # $at, 0x8013 -/* 0C17D8 800C0BD8 01A97021 */ addu $t6, $t5, $t1 -/* 0C17DC 800C0BDC 256BA774 */ addiu $t3, %lo(D_8012A774) # addiu $t3, $t3, -0x588c -/* 0C17E0 800C0BE0 AC2EA774 */ sw $t6, %lo(D_8012A774)($at) -/* 0C17E4 800C0BE4 8D6F0000 */ lw $t7, ($t3) -/* 0C17E8 800C0BE8 8FB90050 */ lw $t9, 0x50($sp) -/* 0C17EC 800C0BEC 3C018013 */ lui $at, %hi(D_8012A778) # $at, 0x8013 -/* 0C17F0 800C0BF0 01E9C021 */ addu $t8, $t7, $t1 -/* 0C17F4 800C0BF4 AC38A778 */ sw $t8, %lo(D_8012A778)($at) -/* 0C17F8 800C0BF8 932C0000 */ lbu $t4, ($t9) -/* 0C17FC 800C0BFC 8FA20060 */ lw $v0, 0x60($sp) -/* 0C1800 800C0C00 318D0080 */ andi $t5, $t4, 0x80 -/* 0C1804 800C0C04 11A00008 */ beqz $t5, .L800C0C28 -/* 0C1808 800C0C08 3C09800E */ lui $t1, %hi(sTransitionFadeTimer) # $t1, 0x800e -/* 0C180C 800C0C0C 8FAE0064 */ lw $t6, 0x64($sp) -/* 0C1810 800C0C10 AFA20064 */ sw $v0, 0x64($sp) -/* 0C1814 800C0C14 8FA20068 */ lw $v0, 0x68($sp) -/* 0C1818 800C0C18 8FAF006C */ lw $t7, 0x6c($sp) -/* 0C181C 800C0C1C AFAE0060 */ sw $t6, 0x60($sp) -/* 0C1820 800C0C20 AFA2006C */ sw $v0, 0x6c($sp) -/* 0C1824 800C0C24 AFAF0068 */ sw $t7, 0x68($sp) -.L800C0C28: -/* 0C1828 800C0C28 1A00008C */ blez $s0, .L800C0E5C -/* 0C182C 800C0C2C 00005025 */ move $t2, $zero -/* 0C1830 800C0C30 3C038013 */ lui $v1, %hi(D_8012A778) # $v1, 0x8013 -/* 0C1834 800C0C34 8FA40060 */ lw $a0, 0x60($sp) -/* 0C1838 800C0C38 8FA70068 */ lw $a3, 0x68($sp) -/* 0C183C 800C0C3C 8FA50064 */ lw $a1, 0x64($sp) -/* 0C1840 800C0C40 8FA8006C */ lw $t0, 0x6c($sp) -/* 0C1844 800C0C44 2463A778 */ addiu $v1, %lo(D_8012A778) # addiu $v1, $v1, -0x5888 -/* 0C1848 800C0C48 00001025 */ move $v0, $zero -/* 0C184C 800C0C4C 252931B0 */ addiu $t1, %lo(sTransitionFadeTimer) # addiu $t1, $t1, 0x31b0 -.L800C0C50: -/* 0C1850 800C0C50 90980000 */ lbu $t8, ($a0) -/* 0C1854 800C0C54 8CCE0000 */ lw $t6, ($a2) -/* 0C1858 800C0C58 0018C840 */ sll $t9, $t8, 1 -/* 0C185C 800C0C5C 02596021 */ addu $t4, $s2, $t9 -/* 0C1860 800C0C60 858D0000 */ lh $t5, ($t4) -/* 0C1864 800C0C64 01C27821 */ addu $t7, $t6, $v0 -/* 0C1868 800C0C68 448D2000 */ mtc1 $t5, $f4 -/* 0C186C 800C0C6C 3C014F80 */ li $at, 0x4F800000 # 4294967296.000000 -/* 0C1870 800C0C70 468021A0 */ cvt.s.w $f6, $f4 -/* 0C1874 800C0C74 E5E60000 */ swc1 $f6, ($t7) -/* 0C1878 800C0C78 90980000 */ lbu $t8, ($a0) -/* 0C187C 800C0C7C 8CCE0000 */ lw $t6, ($a2) -/* 0C1880 800C0C80 0018C840 */ sll $t9, $t8, 1 -/* 0C1884 800C0C84 02596021 */ addu $t4, $s2, $t9 -/* 0C1888 800C0C88 858D0002 */ lh $t5, 2($t4) -/* 0C188C 800C0C8C 01C27821 */ addu $t7, $t6, $v0 -/* 0C1890 800C0C90 448D4000 */ mtc1 $t5, $f8 -/* 0C1894 800C0C94 00000000 */ nop -/* 0C1898 800C0C98 468042A0 */ cvt.s.w $f10, $f8 -/* 0C189C 800C0C9C E5EA0004 */ swc1 $f10, 4($t7) -/* 0C18A0 800C0CA0 90F80000 */ lbu $t8, ($a3) -/* 0C18A4 800C0CA4 00000000 */ nop -/* 0C18A8 800C0CA8 44988000 */ mtc1 $t8, $f16 -/* 0C18AC 800C0CAC 07010004 */ bgez $t8, .L800C0CC0 -/* 0C18B0 800C0CB0 468084A0 */ cvt.s.w $f18, $f16 -/* 0C18B4 800C0CB4 44812000 */ mtc1 $at, $f4 -/* 0C18B8 800C0CB8 00000000 */ nop -/* 0C18BC 800C0CBC 46049480 */ add.s $f18, $f18, $f4 -.L800C0CC0: -/* 0C18C0 800C0CC0 8CD90000 */ lw $t9, ($a2) -/* 0C18C4 800C0CC4 3C014F80 */ li $at, 0x4F800000 # 4294967296.000000 -/* 0C18C8 800C0CC8 03226021 */ addu $t4, $t9, $v0 -/* 0C18CC 800C0CCC E5920008 */ swc1 $f18, 8($t4) -/* 0C18D0 800C0CD0 90AD0000 */ lbu $t5, ($a1) -/* 0C18D4 800C0CD4 8C790000 */ lw $t9, ($v1) -/* 0C18D8 800C0CD8 000D7040 */ sll $t6, $t5, 1 -/* 0C18DC 800C0CDC 024E7821 */ addu $t7, $s2, $t6 -/* 0C18E0 800C0CE0 85F80000 */ lh $t8, ($t7) -/* 0C18E4 800C0CE4 03226021 */ addu $t4, $t9, $v0 -/* 0C18E8 800C0CE8 44983000 */ mtc1 $t8, $f6 -/* 0C18EC 800C0CEC 00000000 */ nop -/* 0C18F0 800C0CF0 46803220 */ cvt.s.w $f8, $f6 -/* 0C18F4 800C0CF4 E5880000 */ swc1 $f8, ($t4) -/* 0C18F8 800C0CF8 90AD0000 */ lbu $t5, ($a1) -/* 0C18FC 800C0CFC 8C790000 */ lw $t9, ($v1) -/* 0C1900 800C0D00 000D7040 */ sll $t6, $t5, 1 -/* 0C1904 800C0D04 024E7821 */ addu $t7, $s2, $t6 -/* 0C1908 800C0D08 85F80002 */ lh $t8, 2($t7) -/* 0C190C 800C0D0C 03226021 */ addu $t4, $t9, $v0 -/* 0C1910 800C0D10 44985000 */ mtc1 $t8, $f10 -/* 0C1914 800C0D14 00000000 */ nop -/* 0C1918 800C0D18 46805420 */ cvt.s.w $f16, $f10 -/* 0C191C 800C0D1C E5900004 */ swc1 $f16, 4($t4) -/* 0C1920 800C0D20 910D0000 */ lbu $t5, ($t0) -/* 0C1924 800C0D24 00000000 */ nop -/* 0C1928 800C0D28 448D2000 */ mtc1 $t5, $f4 -/* 0C192C 800C0D2C 05A10004 */ bgez $t5, .L800C0D40 -/* 0C1930 800C0D30 468024A0 */ cvt.s.w $f18, $f4 -/* 0C1934 800C0D34 44813000 */ mtc1 $at, $f6 -/* 0C1938 800C0D38 00000000 */ nop -/* 0C193C 800C0D3C 46069480 */ add.s $f18, $f18, $f6 -.L800C0D40: -/* 0C1940 800C0D40 8C6E0000 */ lw $t6, ($v1) -/* 0C1944 800C0D44 3C014F80 */ li $at, 0x4F800000 # 4294967296.000000 -/* 0C1948 800C0D48 01C27821 */ addu $t7, $t6, $v0 -/* 0C194C 800C0D4C E5F20008 */ swc1 $f18, 8($t7) -/* 0C1950 800C0D50 8CCC0000 */ lw $t4, ($a2) -/* 0C1954 800C0D54 8C780000 */ lw $t8, ($v1) -/* 0C1958 800C0D58 952E0000 */ lhu $t6, ($t1) -/* 0C195C 800C0D5C 01826821 */ addu $t5, $t4, $v0 -/* 0C1960 800C0D60 0302C821 */ addu $t9, $t8, $v0 -/* 0C1964 800C0D64 C7280000 */ lwc1 $f8, ($t9) -/* 0C1968 800C0D68 C5AA0000 */ lwc1 $f10, ($t5) -/* 0C196C 800C0D6C 448E2000 */ mtc1 $t6, $f4 -/* 0C1970 800C0D70 460A4401 */ sub.s $f16, $f8, $f10 -/* 0C1974 800C0D74 05C10004 */ bgez $t6, .L800C0D88 -/* 0C1978 800C0D78 468021A0 */ cvt.s.w $f6, $f4 -/* 0C197C 800C0D7C 44819000 */ mtc1 $at, $f18 -/* 0C1980 800C0D80 00000000 */ nop -/* 0C1984 800C0D84 46123180 */ add.s $f6, $f6, $f18 -.L800C0D88: -/* 0C1988 800C0D88 00000000 */ nop -/* 0C198C 800C0D8C 46068203 */ div.s $f8, $f16, $f6 -/* 0C1990 800C0D90 8D6F0000 */ lw $t7, ($t3) -/* 0C1994 800C0D94 3C014F80 */ li $at, 0x4F800000 # 4294967296.000000 -/* 0C1998 800C0D98 01E2C021 */ addu $t8, $t7, $v0 -/* 0C199C 800C0D9C E7080000 */ swc1 $f8, ($t8) -/* 0C19A0 800C0DA0 8CCD0000 */ lw $t5, ($a2) -/* 0C19A4 800C0DA4 8C790000 */ lw $t9, ($v1) -/* 0C19A8 800C0DA8 952F0000 */ lhu $t7, ($t1) -/* 0C19AC 800C0DAC 01A27021 */ addu $t6, $t5, $v0 -/* 0C19B0 800C0DB0 03226021 */ addu $t4, $t9, $v0 -/* 0C19B4 800C0DB4 C58A0004 */ lwc1 $f10, 4($t4) -/* 0C19B8 800C0DB8 C5C40004 */ lwc1 $f4, 4($t6) -/* 0C19BC 800C0DBC 448F8000 */ mtc1 $t7, $f16 -/* 0C19C0 800C0DC0 46045481 */ sub.s $f18, $f10, $f4 -/* 0C19C4 800C0DC4 05E10004 */ bgez $t7, .L800C0DD8 -/* 0C19C8 800C0DC8 468081A0 */ cvt.s.w $f6, $f16 -/* 0C19CC 800C0DCC 44814000 */ mtc1 $at, $f8 -/* 0C19D0 800C0DD0 00000000 */ nop -/* 0C19D4 800C0DD4 46083180 */ add.s $f6, $f6, $f8 -.L800C0DD8: -/* 0C19D8 800C0DD8 00000000 */ nop -/* 0C19DC 800C0DDC 46069283 */ div.s $f10, $f18, $f6 -/* 0C19E0 800C0DE0 8D780000 */ lw $t8, ($t3) -/* 0C19E4 800C0DE4 3C014F80 */ li $at, 0x4F800000 # 4294967296.000000 -/* 0C19E8 800C0DE8 0302C821 */ addu $t9, $t8, $v0 -/* 0C19EC 800C0DEC E72A0004 */ swc1 $f10, 4($t9) -/* 0C19F0 800C0DF0 8CCE0000 */ lw $t6, ($a2) -/* 0C19F4 800C0DF4 8C6C0000 */ lw $t4, ($v1) -/* 0C19F8 800C0DF8 95380000 */ lhu $t8, ($t1) -/* 0C19FC 800C0DFC 01C27821 */ addu $t7, $t6, $v0 -/* 0C1A00 800C0E00 01826821 */ addu $t5, $t4, $v0 -/* 0C1A04 800C0E04 C5A40008 */ lwc1 $f4, 8($t5) -/* 0C1A08 800C0E08 C5F00008 */ lwc1 $f16, 8($t7) -/* 0C1A0C 800C0E0C 44989000 */ mtc1 $t8, $f18 -/* 0C1A10 800C0E10 46102201 */ sub.s $f8, $f4, $f16 -/* 0C1A14 800C0E14 07010004 */ bgez $t8, .L800C0E28 -/* 0C1A18 800C0E18 468091A0 */ cvt.s.w $f6, $f18 -/* 0C1A1C 800C0E1C 44815000 */ mtc1 $at, $f10 -/* 0C1A20 800C0E20 00000000 */ nop -/* 0C1A24 800C0E24 460A3180 */ add.s $f6, $f6, $f10 -.L800C0E28: -/* 0C1A28 800C0E28 00000000 */ nop -/* 0C1A2C 800C0E2C 46064103 */ div.s $f4, $f8, $f6 -/* 0C1A30 800C0E30 8D790000 */ lw $t9, ($t3) -/* 0C1A34 800C0E34 254A0001 */ addiu $t2, $t2, 1 -/* 0C1A38 800C0E38 03226021 */ addu $t4, $t9, $v0 -/* 0C1A3C 800C0E3C 2442000C */ addiu $v0, $v0, 0xc -/* 0C1A40 800C0E40 24840001 */ addiu $a0, $a0, 1 -/* 0C1A44 800C0E44 24E70001 */ addiu $a3, $a3, 1 -/* 0C1A48 800C0E48 24A50001 */ addiu $a1, $a1, 1 -/* 0C1A4C 800C0E4C 25080001 */ addiu $t0, $t0, 1 -/* 0C1A50 800C0E50 1550FF7F */ bne $t2, $s0, .L800C0C50 -/* 0C1A54 800C0E54 E5840008 */ swc1 $f4, 8($t4) -/* 0C1A58 800C0E58 00005025 */ move $t2, $zero -.L800C0E5C: -/* 0C1A5C 800C0E5C 3C088013 */ lui $t0, %hi(gCurFadeBlue) # $t0, 0x8013 -/* 0C1A60 800C0E60 3C078013 */ lui $a3, %hi(gCurFadeGreen) # $a3, 0x8013 -/* 0C1A64 800C0E64 3C068013 */ lui $a2, %hi(gCurFadeRed) # $a2, 0x8013 -/* 0C1A68 800C0E68 24C6A734 */ addiu $a2, %lo(gCurFadeRed) # addiu $a2, $a2, -0x58cc -/* 0C1A6C 800C0E6C 24E7A735 */ addiu $a3, %lo(gCurFadeGreen) # addiu $a3, $a3, -0x58cb -/* 0C1A70 800C0E70 2508A736 */ addiu $t0, %lo(gCurFadeBlue) # addiu $t0, $t0, -0x58ca -/* 0C1A74 800C0E74 2404FFF0 */ li $a0, -16 -.L800C0E78: -/* 0C1A78 800C0E78 1A000065 */ blez $s0, .L800C1010 -/* 0C1A7C 800C0E7C 00002825 */ move $a1, $zero -/* 0C1A80 800C0E80 3C0E800E */ lui $t6, %hi(sTransitionVtx) # $t6, 0x800e -/* 0C1A84 800C0E84 25CE31C0 */ addiu $t6, %lo(sTransitionVtx) # addiu $t6, $t6, 0x31c0 -/* 0C1A88 800C0E88 000A6880 */ sll $t5, $t2, 2 -/* 0C1A8C 800C0E8C 320B0003 */ andi $t3, $s0, 3 -/* 0C1A90 800C0E90 11600017 */ beqz $t3, .L800C0EF0 -/* 0C1A94 800C0E94 01AE1821 */ addu $v1, $t5, $t6 -/* 0C1A98 800C0E98 00001025 */ move $v0, $zero -/* 0C1A9C 800C0E9C 000210C0 */ sll $v0, $v0, 3 -/* 0C1AA0 800C0EA0 01604825 */ move $t1, $t3 -.L800C0EA4: -/* 0C1AA4 800C0EA4 8C6F0000 */ lw $t7, ($v1) -/* 0C1AA8 800C0EA8 24A50001 */ addiu $a1, $a1, 1 -/* 0C1AAC 800C0EAC 01E2C021 */ addu $t8, $t7, $v0 -/* 0C1AB0 800C0EB0 A7040004 */ sh $a0, 4($t8) -/* 0C1AB4 800C0EB4 8C6C0000 */ lw $t4, ($v1) -/* 0C1AB8 800C0EB8 90D90000 */ lbu $t9, ($a2) -/* 0C1ABC 800C0EBC 01826821 */ addu $t5, $t4, $v0 -/* 0C1AC0 800C0EC0 A1B90006 */ sb $t9, 6($t5) -/* 0C1AC4 800C0EC4 8C6F0000 */ lw $t7, ($v1) -/* 0C1AC8 800C0EC8 90EE0000 */ lbu $t6, ($a3) -/* 0C1ACC 800C0ECC 01E2C021 */ addu $t8, $t7, $v0 -/* 0C1AD0 800C0ED0 A30E0007 */ sb $t6, 7($t8) -/* 0C1AD4 800C0ED4 8C790000 */ lw $t9, ($v1) -/* 0C1AD8 800C0ED8 910C0000 */ lbu $t4, ($t0) -/* 0C1ADC 800C0EDC 03226821 */ addu $t5, $t9, $v0 -/* 0C1AE0 800C0EE0 2442000A */ addiu $v0, $v0, 0xa -/* 0C1AE4 800C0EE4 1525FFEF */ bne $t1, $a1, .L800C0EA4 -/* 0C1AE8 800C0EE8 A1AC0008 */ sb $t4, 8($t5) -/* 0C1AEC 800C0EEC 10B00048 */ beq $a1, $s0, .L800C1010 -.L800C0EF0: -/* 0C1AF0 800C0EF0 00051080 */ sll $v0, $a1, 2 -/* 0C1AF4 800C0EF4 00104880 */ sll $t1, $s0, 2 -/* 0C1AF8 800C0EF8 01304821 */ addu $t1, $t1, $s0 -/* 0C1AFC 800C0EFC 00451021 */ addu $v0, $v0, $a1 -/* 0C1B00 800C0F00 00021040 */ sll $v0, $v0, 1 -/* 0C1B04 800C0F04 00094840 */ sll $t1, $t1, 1 -.L800C0F08: -/* 0C1B08 800C0F08 8C6F0000 */ lw $t7, ($v1) -/* 0C1B0C 800C0F0C 00000000 */ nop -/* 0C1B10 800C0F10 01E27021 */ addu $t6, $t7, $v0 -/* 0C1B14 800C0F14 A5C40004 */ sh $a0, 4($t6) -/* 0C1B18 800C0F18 8C790000 */ lw $t9, ($v1) -/* 0C1B1C 800C0F1C 90D80000 */ lbu $t8, ($a2) -/* 0C1B20 800C0F20 03226021 */ addu $t4, $t9, $v0 -/* 0C1B24 800C0F24 A1980006 */ sb $t8, 6($t4) -/* 0C1B28 800C0F28 8C6F0000 */ lw $t7, ($v1) -/* 0C1B2C 800C0F2C 90ED0000 */ lbu $t5, ($a3) -/* 0C1B30 800C0F30 01E27021 */ addu $t6, $t7, $v0 -/* 0C1B34 800C0F34 A1CD0007 */ sb $t5, 7($t6) -/* 0C1B38 800C0F38 8C780000 */ lw $t8, ($v1) -/* 0C1B3C 800C0F3C 91190000 */ lbu $t9, ($t0) -/* 0C1B40 800C0F40 03026021 */ addu $t4, $t8, $v0 -/* 0C1B44 800C0F44 A1990008 */ sb $t9, 8($t4) -/* 0C1B48 800C0F48 8C6F0000 */ lw $t7, ($v1) -/* 0C1B4C 800C0F4C 00000000 */ nop -/* 0C1B50 800C0F50 01E26821 */ addu $t5, $t7, $v0 -/* 0C1B54 800C0F54 A5A4000E */ sh $a0, 0xe($t5) -/* 0C1B58 800C0F58 8C780000 */ lw $t8, ($v1) -/* 0C1B5C 800C0F5C 90CE0000 */ lbu $t6, ($a2) -/* 0C1B60 800C0F60 0302C821 */ addu $t9, $t8, $v0 -/* 0C1B64 800C0F64 A32E0010 */ sb $t6, 0x10($t9) -/* 0C1B68 800C0F68 8C6F0000 */ lw $t7, ($v1) -/* 0C1B6C 800C0F6C 90EC0000 */ lbu $t4, ($a3) -/* 0C1B70 800C0F70 01E26821 */ addu $t5, $t7, $v0 -/* 0C1B74 800C0F74 A1AC0011 */ sb $t4, 0x11($t5) -/* 0C1B78 800C0F78 8C6E0000 */ lw $t6, ($v1) -/* 0C1B7C 800C0F7C 91180000 */ lbu $t8, ($t0) -/* 0C1B80 800C0F80 01C2C821 */ addu $t9, $t6, $v0 -/* 0C1B84 800C0F84 A3380012 */ sb $t8, 0x12($t9) -/* 0C1B88 800C0F88 8C6F0000 */ lw $t7, ($v1) -/* 0C1B8C 800C0F8C 00000000 */ nop -/* 0C1B90 800C0F90 01E26021 */ addu $t4, $t7, $v0 -/* 0C1B94 800C0F94 A5840018 */ sh $a0, 0x18($t4) -/* 0C1B98 800C0F98 8C6E0000 */ lw $t6, ($v1) -/* 0C1B9C 800C0F9C 90CD0000 */ lbu $t5, ($a2) -/* 0C1BA0 800C0FA0 01C2C021 */ addu $t8, $t6, $v0 -/* 0C1BA4 800C0FA4 A30D001A */ sb $t5, 0x1a($t8) -/* 0C1BA8 800C0FA8 8C6F0000 */ lw $t7, ($v1) -/* 0C1BAC 800C0FAC 90F90000 */ lbu $t9, ($a3) -/* 0C1BB0 800C0FB0 01E26021 */ addu $t4, $t7, $v0 -/* 0C1BB4 800C0FB4 A199001B */ sb $t9, 0x1b($t4) -/* 0C1BB8 800C0FB8 8C6D0000 */ lw $t5, ($v1) -/* 0C1BBC 800C0FBC 910E0000 */ lbu $t6, ($t0) -/* 0C1BC0 800C0FC0 01A2C021 */ addu $t8, $t5, $v0 -/* 0C1BC4 800C0FC4 A30E001C */ sb $t6, 0x1c($t8) -/* 0C1BC8 800C0FC8 8C6F0000 */ lw $t7, ($v1) -/* 0C1BCC 800C0FCC 00000000 */ nop -/* 0C1BD0 800C0FD0 01E2C821 */ addu $t9, $t7, $v0 -/* 0C1BD4 800C0FD4 A7240022 */ sh $a0, 0x22($t9) -/* 0C1BD8 800C0FD8 8C6D0000 */ lw $t5, ($v1) -/* 0C1BDC 800C0FDC 90CC0000 */ lbu $t4, ($a2) -/* 0C1BE0 800C0FE0 01A27021 */ addu $t6, $t5, $v0 -/* 0C1BE4 800C0FE4 A1CC0024 */ sb $t4, 0x24($t6) -/* 0C1BE8 800C0FE8 8C6F0000 */ lw $t7, ($v1) -/* 0C1BEC 800C0FEC 90F80000 */ lbu $t8, ($a3) -/* 0C1BF0 800C0FF0 01E2C821 */ addu $t9, $t7, $v0 -/* 0C1BF4 800C0FF4 A3380025 */ sb $t8, 0x25($t9) -/* 0C1BF8 800C0FF8 8C6C0000 */ lw $t4, ($v1) -/* 0C1BFC 800C0FFC 910D0000 */ lbu $t5, ($t0) -/* 0C1C00 800C1000 01827021 */ addu $t6, $t4, $v0 -/* 0C1C04 800C1004 24420028 */ addiu $v0, $v0, 0x28 -/* 0C1C08 800C1008 1449FFBF */ bne $v0, $t1, .L800C0F08 -/* 0C1C0C 800C100C A1CD0026 */ sb $t5, 0x26($t6) -.L800C1010: -/* 0C1C10 800C1010 254A0001 */ addiu $t2, $t2, 1 -/* 0C1C14 800C1014 29410002 */ slti $at, $t2, 2 -/* 0C1C18 800C1018 1420FF97 */ bnez $at, .L800C0E78 -/* 0C1C1C 800C101C 00000000 */ nop -/* 0C1C20 800C1020 8FA70070 */ lw $a3, 0x70($sp) -/* 0C1C24 800C1024 00005025 */ move $t2, $zero -/* 0C1C28 800C1028 24080002 */ li $t0, 2 -/* 0C1C2C 800C102C 24060040 */ li $a2, 64 -.L800C1030: -/* 0C1C30 800C1030 1A200031 */ blez $s1, .L800C10F8 -/* 0C1C34 800C1034 00002825 */ move $a1, $zero -/* 0C1C38 800C1038 3C18800E */ lui $t8, %hi(sTransitionTris) # $t8, 0x800e -/* 0C1C3C 800C103C 271831C8 */ addiu $t8, %lo(sTransitionTris) # addiu $t8, $t8, 0x31c8 -/* 0C1C40 800C1040 000A7880 */ sll $t7, $t2, 2 -/* 0C1C44 800C1044 01F81821 */ addu $v1, $t7, $t8 -/* 0C1C48 800C1048 00001025 */ move $v0, $zero -/* 0C1C4C 800C104C 00E02025 */ move $a0, $a3 -.L800C1050: -/* 0C1C50 800C1050 8C790000 */ lw $t9, ($v1) -/* 0C1C54 800C1054 24A50001 */ addiu $a1, $a1, 1 -/* 0C1C58 800C1058 03226021 */ addu $t4, $t9, $v0 -/* 0C1C5C 800C105C A1860000 */ sb $a2, ($t4) -/* 0C1C60 800C1060 8C6E0000 */ lw $t6, ($v1) -/* 0C1C64 800C1064 908D0000 */ lbu $t5, ($a0) -/* 0C1C68 800C1068 01C27821 */ addu $t7, $t6, $v0 -/* 0C1C6C 800C106C A1ED0001 */ sb $t5, 1($t7) -/* 0C1C70 800C1070 8C780000 */ lw $t8, ($v1) -/* 0C1C74 800C1074 24840003 */ addiu $a0, $a0, 3 -/* 0C1C78 800C1078 0302C821 */ addu $t9, $t8, $v0 -/* 0C1C7C 800C107C A7200004 */ sh $zero, 4($t9) -/* 0C1C80 800C1080 8C6C0000 */ lw $t4, ($v1) -/* 0C1C84 800C1084 00000000 */ nop -/* 0C1C88 800C1088 01827021 */ addu $t6, $t4, $v0 -/* 0C1C8C 800C108C A5C00006 */ sh $zero, 6($t6) -/* 0C1C90 800C1090 8C6F0000 */ lw $t7, ($v1) -/* 0C1C94 800C1094 908DFFFE */ lbu $t5, -2($a0) -/* 0C1C98 800C1098 01E2C021 */ addu $t8, $t7, $v0 -/* 0C1C9C 800C109C A30D0002 */ sb $t5, 2($t8) -/* 0C1CA0 800C10A0 8C790000 */ lw $t9, ($v1) -/* 0C1CA4 800C10A4 00000000 */ nop -/* 0C1CA8 800C10A8 03226021 */ addu $t4, $t9, $v0 -/* 0C1CAC 800C10AC A5800008 */ sh $zero, 8($t4) -/* 0C1CB0 800C10B0 8C6E0000 */ lw $t6, ($v1) -/* 0C1CB4 800C10B4 00000000 */ nop -/* 0C1CB8 800C10B8 01C27821 */ addu $t7, $t6, $v0 -/* 0C1CBC 800C10BC A5E0000A */ sh $zero, 0xa($t7) -/* 0C1CC0 800C10C0 8C780000 */ lw $t8, ($v1) -/* 0C1CC4 800C10C4 908DFFFF */ lbu $t5, -1($a0) -/* 0C1CC8 800C10C8 0302C821 */ addu $t9, $t8, $v0 -/* 0C1CCC 800C10CC A32D0003 */ sb $t5, 3($t9) -/* 0C1CD0 800C10D0 8C6C0000 */ lw $t4, ($v1) -/* 0C1CD4 800C10D4 00000000 */ nop -/* 0C1CD8 800C10D8 01827021 */ addu $t6, $t4, $v0 -/* 0C1CDC 800C10DC A5C0000C */ sh $zero, 0xc($t6) -/* 0C1CE0 800C10E0 8C6F0000 */ lw $t7, ($v1) -/* 0C1CE4 800C10E4 00000000 */ nop -/* 0C1CE8 800C10E8 01E2C021 */ addu $t8, $t7, $v0 -/* 0C1CEC 800C10EC 24420010 */ addiu $v0, $v0, 0x10 -/* 0C1CF0 800C10F0 14B1FFD7 */ bne $a1, $s1, .L800C1050 -/* 0C1CF4 800C10F4 A700000E */ sh $zero, 0xe($t8) -.L800C10F8: -/* 0C1CF8 800C10F8 254A0001 */ addiu $t2, $t2, 1 -/* 0C1CFC 800C10FC 1548FFCC */ bne $t2, $t0, .L800C1030 -/* 0C1D00 800C1100 00000000 */ nop -/* 0C1D04 800C1104 240D0001 */ li $t5, 1 -/* 0C1D08 800C1108 3C01800E */ lui $at, %hi(sTransitionStatus) # $at, 0x800e -/* 0C1D0C 800C110C AC2D31AC */ sw $t5, %lo(sTransitionStatus)($at) -/* 0C1D10 800C1110 3C018013 */ lui $at, %hi(D_8012A77C) # $at, 0x8013 -/* 0C1D14 800C1114 8FBF0024 */ lw $ra, 0x24($sp) -/* 0C1D18 800C1118 AC30A77C */ sw $s0, %lo(D_8012A77C)($at) -/* 0C1D1C 800C111C 8FB00018 */ lw $s0, 0x18($sp) -/* 0C1D20 800C1120 8FB1001C */ lw $s1, 0x1c($sp) -/* 0C1D24 800C1124 8FB20020 */ lw $s2, 0x20($sp) -/* 0C1D28 800C1128 03E00008 */ jr $ra -/* 0C1D2C 800C112C 27BD0050 */ addiu $sp, $sp, 0x50 - diff --git a/asm/non_matchings/game_ui/func_800A1248.s b/asm/non_matchings/game_ui/func_800A1248.s deleted file mode 100644 index dd55a809..00000000 --- a/asm/non_matchings/game_ui/func_800A1248.s +++ /dev/null @@ -1,134 +0,0 @@ -.late_rodata -glabel D_800E8718 -.float 275.0 - -.text -glabel func_800A1248 -/* 0A1E48 800A1248 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 0A1E4C 800A124C AFBF002C */ sw $ra, 0x2c($sp) -/* 0A1E50 800A1250 AFB30028 */ sw $s3, 0x28($sp) -/* 0A1E54 800A1254 AFB20024 */ sw $s2, 0x24($sp) -/* 0A1E58 800A1258 AFB10020 */ sw $s1, 0x20($sp) -/* 0A1E5C 800A125C AFB0001C */ sw $s0, 0x1c($sp) -/* 0A1E60 800A1260 E7B50010 */ swc1 $f21, 0x10($sp) -/* 0A1E64 800A1264 E7B40014 */ swc1 $f20, 0x14($sp) -/* 0A1E68 800A1268 AFA5004C */ sw $a1, 0x4c($sp) -/* 0A1E6C 800A126C AFA60050 */ sw $a2, 0x50($sp) -/* 0A1E70 800A1270 8CA70064 */ lw $a3, 0x64($a1) -/* 0A1E74 800A1274 00808025 */ move $s0, $a0 -/* 0A1E78 800A1278 27A4003C */ addiu $a0, $sp, 0x3c -/* 0A1E7C 800A127C 0C006E9D */ jal get_racer_objects -/* 0A1E80 800A1280 AFA70044 */ sw $a3, 0x44($sp) -/* 0A1E84 800A1284 00409025 */ move $s2, $v0 -/* 0A1E88 800A1288 0C01A142 */ jal func_80068508 -/* 0A1E8C 800A128C 24040001 */ li $a0, 1 -/* 0A1E90 800A1290 8FA50050 */ lw $a1, 0x50($sp) -/* 0A1E94 800A1294 0C028F39 */ jal render_race_start -/* 0A1E98 800A1298 02002025 */ move $a0, $s0 -/* 0A1E9C 800A129C 3C028012 */ lui $v0, %hi(gNumActivePlayers) # $v0, 0x8012 -/* 0A1EA0 800A12A0 90426D37 */ lbu $v0, %lo(gNumActivePlayers)($v0) -/* 0A1EA4 800A12A4 8FA70044 */ lw $a3, 0x44($sp) -/* 0A1EA8 800A12A8 24130001 */ li $s3, 1 -/* 0A1EAC 800A12AC 10530007 */ beq $v0, $s3, .L800A12CC -/* 0A1EB0 800A12B0 24010003 */ li $at, 3 -/* 0A1EB4 800A12B4 10410041 */ beq $v0, $at, .L800A13BC -/* 0A1EB8 800A12B8 24010004 */ li $at, 4 -/* 0A1EBC 800A12BC 1041003F */ beq $v0, $at, .L800A13BC -/* 0A1EC0 800A12C0 00000000 */ nop -/* 0A1EC4 800A12C4 10000040 */ b .L800A13C8 -/* 0A1EC8 800A12C8 8FA8004C */ lw $t0, 0x4c($sp) -.L800A12CC: -/* 0A1ECC 800A12CC 8FAF003C */ lw $t7, 0x3c($sp) -/* 0A1ED0 800A12D0 00008825 */ move $s1, $zero -/* 0A1ED4 800A12D4 19E00029 */ blez $t7, .L800A137C -/* 0A1ED8 800A12D8 02408025 */ move $s0, $s2 -/* 0A1EDC 800A12DC 3C01425C */ li $at, 0x425C0000 # 55.000000 -/* 0A1EE0 800A12E0 3C128012 */ lui $s2, %hi(gCurrentHud) # $s2, 0x8012 -/* 0A1EE4 800A12E4 4481A000 */ mtc1 $at, $f20 -/* 0A1EE8 800A12E8 26526CDC */ addiu $s2, %lo(gCurrentHud) # addiu $s2, $s2, 0x6cdc -.L800A12EC: -/* 0A1EEC 800A12EC 8E180000 */ lw $t8, ($s0) -/* 0A1EF0 800A12F0 00000000 */ nop -/* 0A1EF4 800A12F4 8F040064 */ lw $a0, 0x64($t8) -/* 0A1EF8 800A12F8 0C02917C */ jal render_treasure_hud -/* 0A1EFC 800A12FC 00000000 */ nop -/* 0A1F00 800A1300 1633000D */ bne $s1, $s3, .L800A1338 -/* 0A1F04 800A1304 00000000 */ nop -/* 0A1F08 800A1308 8E420000 */ lw $v0, ($s2) -/* 0A1F0C 800A130C 00000000 */ nop -/* 0A1F10 800A1310 C444064C */ lwc1 $f4, 0x64c($v0) -/* 0A1F14 800A1314 00000000 */ nop -/* 0A1F18 800A1318 46142180 */ add.s $f6, $f4, $f20 -/* 0A1F1C 800A131C E446064C */ swc1 $f6, 0x64c($v0) -/* 0A1F20 800A1320 8E420000 */ lw $v0, ($s2) -/* 0A1F24 800A1324 00000000 */ nop -/* 0A1F28 800A1328 C448040C */ lwc1 $f8, 0x40c($v0) -/* 0A1F2C 800A132C 00000000 */ nop -/* 0A1F30 800A1330 46144280 */ add.s $f10, $f8, $f20 -/* 0A1F34 800A1334 E44A040C */ swc1 $f10, 0x40c($v0) -.L800A1338: -/* 0A1F38 800A1338 8E420000 */ lw $v0, ($s2) -/* 0A1F3C 800A133C 26310001 */ addiu $s1, $s1, 1 -/* 0A1F40 800A1340 C450064C */ lwc1 $f16, 0x64c($v0) -/* 0A1F44 800A1344 26100004 */ addiu $s0, $s0, 4 -/* 0A1F48 800A1348 46148480 */ add.s $f18, $f16, $f20 -/* 0A1F4C 800A134C E452064C */ swc1 $f18, 0x64c($v0) -/* 0A1F50 800A1350 8E420000 */ lw $v0, ($s2) -/* 0A1F54 800A1354 00000000 */ nop -/* 0A1F58 800A1358 C444040C */ lwc1 $f4, 0x40c($v0) -/* 0A1F5C 800A135C 00000000 */ nop -/* 0A1F60 800A1360 46142180 */ add.s $f6, $f4, $f20 -/* 0A1F64 800A1364 E446040C */ swc1 $f6, 0x40c($v0) -/* 0A1F68 800A1368 8FB9003C */ lw $t9, 0x3c($sp) -/* 0A1F6C 800A136C 00000000 */ nop -/* 0A1F70 800A1370 0239082A */ slt $at, $s1, $t9 -/* 0A1F74 800A1374 1420FFDD */ bnez $at, .L800A12EC -/* 0A1F78 800A1378 00000000 */ nop -.L800A137C: -/* 0A1F7C 800A137C 3C128012 */ lui $s2, %hi(gCurrentHud) # $s2, 0x8012 -/* 0A1F80 800A1380 26526CDC */ addiu $s2, %lo(gCurrentHud) # addiu $s2, $s2, 0x6cdc -/* 0A1F84 800A1384 8E420000 */ lw $v0, ($s2) -/* 0A1F88 800A1388 3C01800F */ lui $at, %hi(D_800E8718) # $at, 0x800f -/* 0A1F8C 800A138C C4208718 */ lwc1 $f0, %lo(D_800E8718)($at) -/* 0A1F90 800A1390 C448064C */ lwc1 $f8, 0x64c($v0) -/* 0A1F94 800A1394 00000000 */ nop -/* 0A1F98 800A1398 46004281 */ sub.s $f10, $f8, $f0 -/* 0A1F9C 800A139C E44A064C */ swc1 $f10, 0x64c($v0) -/* 0A1FA0 800A13A0 8E420000 */ lw $v0, ($s2) -/* 0A1FA4 800A13A4 00000000 */ nop -/* 0A1FA8 800A13A8 C450040C */ lwc1 $f16, 0x40c($v0) -/* 0A1FAC 800A13AC 00000000 */ nop -/* 0A1FB0 800A13B0 46008481 */ sub.s $f18, $f16, $f0 -/* 0A1FB4 800A13B4 10000003 */ b .L800A13C4 -/* 0A1FB8 800A13B8 E452040C */ swc1 $f18, 0x40c($v0) -.L800A13BC: -/* 0A1FBC 800A13BC 0C02917C */ jal render_treasure_hud -/* 0A1FC0 800A13C0 00E02025 */ move $a0, $a3 -.L800A13C4: -/* 0A1FC4 800A13C4 8FA8004C */ lw $t0, 0x4c($sp) -.L800A13C8: -/* 0A1FC8 800A13C8 3C048012 */ lui $a0, %hi(gHUDCurrDisplayList) # $a0, 0x8012 -/* 0A1FCC 800A13CC 8D070064 */ lw $a3, 0x64($t0) -/* 0A1FD0 800A13D0 24846CFC */ addiu $a0, %lo(gHUDCurrDisplayList) # addiu $a0, $a0, 0x6cfc -/* 0A1FD4 800A13D4 0C01ECF4 */ jal reset_render_settings -/* 0A1FD8 800A13D8 AFA70044 */ sw $a3, 0x44($sp) -/* 0A1FDC 800A13DC 8FA40044 */ lw $a0, 0x44($sp) -/* 0A1FE0 800A13E0 8FA50050 */ lw $a1, 0x50($sp) -/* 0A1FE4 800A13E4 0C029055 */ jal render_racer_bananas -/* 0A1FE8 800A13E8 00000000 */ nop -/* 0A1FEC 800A13EC 8FA4004C */ lw $a0, 0x4c($sp) -/* 0A1FF0 800A13F0 8FA50050 */ lw $a1, 0x50($sp) -/* 0A1FF4 800A13F4 0C029D48 */ jal render_weapon_hud -/* 0A1FF8 800A13F8 00000000 */ nop -/* 0A1FFC 800A13FC 0C01A142 */ jal func_80068508 -/* 0A2000 800A1400 00002025 */ move $a0, $zero -/* 0A2004 800A1404 8FBF002C */ lw $ra, 0x2c($sp) -/* 0A2008 800A1408 C7B50010 */ lwc1 $f21, 0x10($sp) -/* 0A200C 800A140C C7B40014 */ lwc1 $f20, 0x14($sp) -/* 0A2010 800A1410 8FB0001C */ lw $s0, 0x1c($sp) -/* 0A2014 800A1414 8FB10020 */ lw $s1, 0x20($sp) -/* 0A2018 800A1418 8FB20024 */ lw $s2, 0x24($sp) -/* 0A201C 800A141C 8FB30028 */ lw $s3, 0x28($sp) -/* 0A2020 800A1420 03E00008 */ jr $ra -/* 0A2024 800A1424 27BD0048 */ addiu $sp, $sp, 0x48 - diff --git a/asm/non_matchings/game_ui/func_800A14F0.s b/asm/non_matchings/game_ui/func_800A14F0.s deleted file mode 100644 index ce7e4f27..00000000 --- a/asm/non_matchings/game_ui/func_800A14F0.s +++ /dev/null @@ -1,331 +0,0 @@ -.late_rodata -glabel D_800E8720 -.double 66.0 -glabel D_800E8728 -.double 66.0 - -.text -glabel func_800A14F0 -/* 0A20F0 800A14F0 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* 0A20F4 800A14F4 AFBF0014 */ sw $ra, 0x14($sp) -/* 0A20F8 800A14F8 AFA40060 */ sw $a0, 0x60($sp) -/* 0A20FC 800A14FC AFA50064 */ sw $a1, 0x64($sp) -/* 0A2100 800A1500 0C006E9D */ jal get_racer_objects -/* 0A2104 800A1504 27A40050 */ addiu $a0, $sp, 0x50 -/* 0A2108 800A1508 3C0E8012 */ lui $t6, %hi(gNumActivePlayers) # $t6, 0x8012 -/* 0A210C 800A150C 91CE6D37 */ lbu $t6, %lo(gNumActivePlayers)($t6) -/* 0A2110 800A1510 8FAB0060 */ lw $t3, 0x60($sp) -/* 0A2114 800A1514 240C0002 */ li $t4, 2 -/* 0A2118 800A1518 158E005C */ bne $t4, $t6, .L800A168C -/* 0A211C 800A151C 00405025 */ move $t2, $v0 -/* 0A2120 800A1520 8FAF0050 */ lw $t7, 0x50($sp) -/* 0A2124 800A1524 00003025 */ move $a2, $zero -/* 0A2128 800A1528 19E00056 */ blez $t7, .L800A1684 -/* 0A212C 800A152C 00003825 */ move $a3, $zero -/* 0A2130 800A1530 31E30003 */ andi $v1, $t7, 3 -/* 0A2134 800A1534 10600017 */ beqz $v1, .L800A1594 -/* 0A2138 800A1538 00604825 */ move $t1, $v1 -/* 0A213C 800A153C 0000C080 */ sll $t8, $zero, 2 -/* 0A2140 800A1540 00582821 */ addu $a1, $v0, $t8 -/* 0A2144 800A1544 2408FFFF */ li $t0, -1 -.L800A1548: -/* 0A2148 800A1548 8CB90000 */ lw $t9, ($a1) -/* 0A214C 800A154C 24E70001 */ addiu $a3, $a3, 1 -/* 0A2150 800A1550 8F230064 */ lw $v1, 0x64($t9) -/* 0A2154 800A1554 00000000 */ nop -/* 0A2158 800A1558 846D0000 */ lh $t5, ($v1) -/* 0A215C 800A155C 00000000 */ nop -/* 0A2160 800A1560 110D0006 */ beq $t0, $t5, .L800A157C -/* 0A2164 800A1564 00000000 */ nop -/* 0A2168 800A1568 806E01D8 */ lb $t6, 0x1d8($v1) -/* 0A216C 800A156C 00000000 */ nop -/* 0A2170 800A1570 11C00002 */ beqz $t6, .L800A157C -/* 0A2174 800A1574 00000000 */ nop -/* 0A2178 800A1578 24C60001 */ addiu $a2, $a2, 1 -.L800A157C: -/* 0A217C 800A157C 1527FFF2 */ bne $t1, $a3, .L800A1548 -/* 0A2180 800A1580 24A50004 */ addiu $a1, $a1, 4 -/* 0A2184 800A1584 8FAF0050 */ lw $t7, 0x50($sp) -/* 0A2188 800A1588 00000000 */ nop -/* 0A218C 800A158C 10EF003D */ beq $a3, $t7, .L800A1684 -/* 0A2190 800A1590 00000000 */ nop -.L800A1594: -/* 0A2194 800A1594 8FB80050 */ lw $t8, 0x50($sp) -/* 0A2198 800A1598 00076880 */ sll $t5, $a3, 2 -/* 0A219C 800A159C 0018C880 */ sll $t9, $t8, 2 -/* 0A21A0 800A15A0 03224821 */ addu $t1, $t9, $v0 -/* 0A21A4 800A15A4 004D2821 */ addu $a1, $v0, $t5 -/* 0A21A8 800A15A8 2408FFFF */ li $t0, -1 -.L800A15AC: -/* 0A21AC 800A15AC 8CAE0000 */ lw $t6, ($a1) -/* 0A21B0 800A15B0 00000000 */ nop -/* 0A21B4 800A15B4 8DC30064 */ lw $v1, 0x64($t6) -/* 0A21B8 800A15B8 00000000 */ nop -/* 0A21BC 800A15BC 846F0000 */ lh $t7, ($v1) -/* 0A21C0 800A15C0 00000000 */ nop -/* 0A21C4 800A15C4 110F0006 */ beq $t0, $t7, .L800A15E0 -/* 0A21C8 800A15C8 00000000 */ nop -/* 0A21CC 800A15CC 807801D8 */ lb $t8, 0x1d8($v1) -/* 0A21D0 800A15D0 00000000 */ nop -/* 0A21D4 800A15D4 13000002 */ beqz $t8, .L800A15E0 -/* 0A21D8 800A15D8 00000000 */ nop -/* 0A21DC 800A15DC 24C60001 */ addiu $a2, $a2, 1 -.L800A15E0: -/* 0A21E0 800A15E0 8CB90004 */ lw $t9, 4($a1) -/* 0A21E4 800A15E4 00000000 */ nop -/* 0A21E8 800A15E8 8F240064 */ lw $a0, 0x64($t9) -/* 0A21EC 800A15EC 00000000 */ nop -/* 0A21F0 800A15F0 848D0000 */ lh $t5, ($a0) -/* 0A21F4 800A15F4 00000000 */ nop -/* 0A21F8 800A15F8 110D0006 */ beq $t0, $t5, .L800A1614 -/* 0A21FC 800A15FC 00000000 */ nop -/* 0A2200 800A1600 808E01D8 */ lb $t6, 0x1d8($a0) -/* 0A2204 800A1604 00000000 */ nop -/* 0A2208 800A1608 11C00002 */ beqz $t6, .L800A1614 -/* 0A220C 800A160C 00000000 */ nop -/* 0A2210 800A1610 24C60001 */ addiu $a2, $a2, 1 -.L800A1614: -/* 0A2214 800A1614 8CAF0008 */ lw $t7, 8($a1) -/* 0A2218 800A1618 00000000 */ nop -/* 0A221C 800A161C 8DE40064 */ lw $a0, 0x64($t7) -/* 0A2220 800A1620 00000000 */ nop -/* 0A2224 800A1624 84980000 */ lh $t8, ($a0) -/* 0A2228 800A1628 00000000 */ nop -/* 0A222C 800A162C 11180006 */ beq $t0, $t8, .L800A1648 -/* 0A2230 800A1630 00000000 */ nop -/* 0A2234 800A1634 809901D8 */ lb $t9, 0x1d8($a0) -/* 0A2238 800A1638 00000000 */ nop -/* 0A223C 800A163C 13200002 */ beqz $t9, .L800A1648 -/* 0A2240 800A1640 00000000 */ nop -/* 0A2244 800A1644 24C60001 */ addiu $a2, $a2, 1 -.L800A1648: -/* 0A2248 800A1648 8CAD000C */ lw $t5, 0xc($a1) -/* 0A224C 800A164C 24A50010 */ addiu $a1, $a1, 0x10 -/* 0A2250 800A1650 8DA40064 */ lw $a0, 0x64($t5) -/* 0A2254 800A1654 00000000 */ nop -/* 0A2258 800A1658 848E0000 */ lh $t6, ($a0) -/* 0A225C 800A165C 00000000 */ nop -/* 0A2260 800A1660 110E0006 */ beq $t0, $t6, .L800A167C -/* 0A2264 800A1664 00000000 */ nop -/* 0A2268 800A1668 808F01D8 */ lb $t7, 0x1d8($a0) -/* 0A226C 800A166C 00000000 */ nop -/* 0A2270 800A1670 11E00002 */ beqz $t7, .L800A167C -/* 0A2274 800A1674 00000000 */ nop -/* 0A2278 800A1678 24C60001 */ addiu $a2, $a2, 1 -.L800A167C: -/* 0A227C 800A167C 14A9FFCB */ bne $a1, $t1, .L800A15AC -/* 0A2280 800A1680 00000000 */ nop -.L800A1684: -/* 0A2284 800A1684 10CC00C4 */ beq $a2, $t4, .L800A1998 -/* 0A2288 800A1688 8FBF0014 */ lw $ra, 0x14($sp) -.L800A168C: -/* 0A228C 800A168C 11600004 */ beqz $t3, .L800A16A0 -/* 0A2290 800A1690 24040001 */ li $a0, 1 -/* 0A2294 800A1694 8D690064 */ lw $t1, 0x64($t3) -/* 0A2298 800A1698 10000006 */ b .L800A16B4 -/* 0A229C 800A169C 8FB90050 */ lw $t9, 0x50($sp) -.L800A16A0: -/* 0A22A0 800A16A0 8C580000 */ lw $t8, ($v0) -/* 0A22A4 800A16A4 00000000 */ nop -/* 0A22A8 800A16A8 8F090064 */ lw $t1, 0x64($t8) -/* 0A22AC 800A16AC 00000000 */ nop -/* 0A22B0 800A16B0 8FB90050 */ lw $t9, 0x50($sp) -.L800A16B4: -/* 0A22B4 800A16B4 24010004 */ li $at, 4 -/* 0A22B8 800A16B8 172100B6 */ bne $t9, $at, .L800A1994 -/* 0A22BC 800A16BC 00003825 */ move $a3, $zero -/* 0A22C0 800A16C0 AFA90054 */ sw $t1, 0x54($sp) -/* 0A22C4 800A16C4 0C01A142 */ jal func_80068508 -/* 0A22C8 800A16C8 AFAA005C */ sw $t2, 0x5c($sp) -/* 0A22CC 800A16CC 444DF800 */ cfc1 $t5, $31 -/* 0A22D0 800A16D0 3C068012 */ lui $a2, %hi(gCurrentHud) # $a2, 0x8012 -/* 0A22D4 800A16D4 24C66CDC */ addiu $a2, %lo(gCurrentHud) # addiu $a2, $a2, 0x6cdc -/* 0A22D8 800A16D8 8CC20000 */ lw $v0, ($a2) -/* 0A22DC 800A16DC 35A10003 */ ori $at, $t5, 3 -/* 0A22E0 800A16E0 38210002 */ xori $at, $at, 2 -/* 0A22E4 800A16E4 44C1F800 */ ctc1 $at, $31 -/* 0A22E8 800A16E8 C444064C */ lwc1 $f4, 0x64c($v0) -/* 0A22EC 800A16EC 8FA90054 */ lw $t1, 0x54($sp) -/* 0A22F0 800A16F0 460021A4 */ cvt.w.s $f6, $f4 -/* 0A22F4 800A16F4 8FA8005C */ lw $t0, 0x5c($sp) -/* 0A22F8 800A16F8 44CDF800 */ ctc1 $t5, $31 -/* 0A22FC 800A16FC 44193000 */ mfc1 $t9, $f6 -/* 0A2300 800A1700 00003825 */ move $a3, $zero -/* 0A2304 800A1704 444FF800 */ cfc1 $t7, $31 -/* 0A2308 800A1708 AFB90044 */ sw $t9, 0x44($sp) -/* 0A230C 800A170C 35E10003 */ ori $at, $t7, 3 -/* 0A2310 800A1710 38210002 */ xori $at, $at, 2 -/* 0A2314 800A1714 44C1F800 */ ctc1 $at, $31 -/* 0A2318 800A1718 C4480650 */ lwc1 $f8, 0x650($v0) -/* 0A231C 800A171C 44998000 */ mtc1 $t9, $f16 -/* 0A2320 800A1720 460042A4 */ cvt.w.s $f10, $f8 -/* 0A2324 800A1724 35A10003 */ ori $at, $t5, 3 -/* 0A2328 800A1728 44CFF800 */ ctc1 $t7, $31 -/* 0A232C 800A172C 440F5000 */ mfc1 $t7, $f10 -/* 0A2330 800A1730 468083A0 */ cvt.s.w $f14, $f16 -/* 0A2334 800A1734 AFAF003C */ sw $t7, 0x3c($sp) -/* 0A2338 800A1738 C452066C */ lwc1 $f18, 0x66c($v0) -/* 0A233C 800A173C 38210002 */ xori $at, $at, 2 -/* 0A2340 800A1740 460E9101 */ sub.s $f4, $f18, $f14 -/* 0A2344 800A1744 448F4000 */ mtc1 $t7, $f8 -/* 0A2348 800A1748 44C1F800 */ ctc1 $at, $31 -/* 0A234C 800A174C 00000000 */ nop -/* 0A2350 800A1750 460021A4 */ cvt.w.s $f6, $f4 -/* 0A2354 800A1754 44CDF800 */ ctc1 $t5, $31 -/* 0A2358 800A1758 440E3000 */ mfc1 $t6, $f6 -/* 0A235C 800A175C 468042A0 */ cvt.s.w $f10, $f8 -/* 0A2360 800A1760 AFAE0040 */ sw $t6, 0x40($sp) -/* 0A2364 800A1764 448E3000 */ mtc1 $t6, $f6 -/* 0A2368 800A1768 E7AA001C */ swc1 $f10, 0x1c($sp) -/* 0A236C 800A176C C4500670 */ lwc1 $f16, 0x670($v0) -/* 0A2370 800A1770 00000000 */ nop -/* 0A2374 800A1774 460A8481 */ sub.s $f18, $f16, $f10 -/* 0A2378 800A1778 4458F800 */ cfc1 $t8, $31 -/* 0A237C 800A177C 00000000 */ nop -/* 0A2380 800A1780 37010003 */ ori $at, $t8, 3 -/* 0A2384 800A1784 38210002 */ xori $at, $at, 2 -/* 0A2388 800A1788 44C1F800 */ ctc1 $at, $31 -/* 0A238C 800A178C 3C01425C */ li $at, 0x425C0000 # 55.000000 -/* 0A2390 800A1790 46009124 */ cvt.w.s $f4, $f18 -/* 0A2394 800A1794 44811000 */ mtc1 $at, $f2 -/* 0A2398 800A1798 3C01800F */ lui $at, %hi(D_800E8720 + 4) # $at, 0x800f -/* 0A239C 800A179C 44192000 */ mfc1 $t9, $f4 -/* 0A23A0 800A17A0 44D8F800 */ ctc1 $t8, $31 -/* 0A23A4 800A17A4 C4218720 */ lwc1 $f1, %lo(D_800E8720)($at) -/* 0A23A8 800A17A8 C4208724 */ lwc1 $f0, %lo(D_800E8720 + 4)($at) -/* 0A23AC 800A17AC AFB90038 */ sw $t9, 0x38($sp) -/* 0A23B0 800A17B0 46803320 */ cvt.s.w $f12, $f6 -.L800A17B4: -/* 0A23B4 800A17B4 8D0D0000 */ lw $t5, ($t0) -/* 0A23B8 800A17B8 3C038012 */ lui $v1, %hi(gNumActivePlayers) # $v1, 0x8012 -/* 0A23BC 800A17BC 90636D37 */ lbu $v1, %lo(gNumActivePlayers)($v1) -/* 0A23C0 800A17C0 8DA20064 */ lw $v0, 0x64($t5) -/* 0A23C4 800A17C4 28610003 */ slti $at, $v1, 3 -/* 0A23C8 800A17C8 14200006 */ bnez $at, .L800A17E4 -/* 0A23CC 800A17CC 00402025 */ move $a0, $v0 -/* 0A23D0 800A17D0 844F0000 */ lh $t7, ($v0) -/* 0A23D4 800A17D4 85380000 */ lh $t8, ($t1) -/* 0A23D8 800A17D8 00000000 */ nop -/* 0A23DC 800A17DC 15F80017 */ bne $t7, $t8, .L800A183C -/* 0A23E0 800A17E0 2419FFFE */ li $t9, -2 -.L800A17E4: -/* 0A23E4 800A17E4 8FA50064 */ lw $a1, 0x64($sp) -/* 0A23E8 800A17E8 AFA7002C */ sw $a3, 0x2c($sp) -/* 0A23EC 800A17EC AFA80028 */ sw $t0, 0x28($sp) -/* 0A23F0 800A17F0 AFA90054 */ sw $t1, 0x54($sp) -/* 0A23F4 800A17F4 E7AC0018 */ swc1 $f12, 0x18($sp) -/* 0A23F8 800A17F8 0C028669 */ jal func_800A19A4 -/* 0A23FC 800A17FC E7AE0020 */ swc1 $f14, 0x20($sp) -/* 0A2400 800A1800 3C01800F */ lui $at, %hi(D_800E8728 + 4) # $at, 0x800f -/* 0A2404 800A1804 C4218728 */ lwc1 $f1, %lo(D_800E8728)($at) -/* 0A2408 800A1808 C420872C */ lwc1 $f0, %lo(D_800E8728 + 4)($at) -/* 0A240C 800A180C 3C01425C */ li $at, 0x425C0000 # 55.000000 -/* 0A2410 800A1810 3C038012 */ lui $v1, %hi(gNumActivePlayers) # $v1, 0x8012 -/* 0A2414 800A1814 3C068012 */ lui $a2, %hi(gCurrentHud) # $a2, 0x8012 -/* 0A2418 800A1818 90636D37 */ lbu $v1, %lo(gNumActivePlayers)($v1) -/* 0A241C 800A181C 44811000 */ mtc1 $at, $f2 -/* 0A2420 800A1820 8FA7002C */ lw $a3, 0x2c($sp) -/* 0A2424 800A1824 8FA80028 */ lw $t0, 0x28($sp) -/* 0A2428 800A1828 8FA90054 */ lw $t1, 0x54($sp) -/* 0A242C 800A182C C7AC0018 */ lwc1 $f12, 0x18($sp) -/* 0A2430 800A1830 C7AE0020 */ lwc1 $f14, 0x20($sp) -/* 0A2434 800A1834 24C66CDC */ addiu $a2, %lo(gCurrentHud) # addiu $a2, $a2, 0x6cdc -/* 0A2438 800A1838 2419FFFE */ li $t9, -2 -.L800A183C: -/* 0A243C 800A183C 3C01800E */ lui $at, %hi(D_800E2834) # $at, 0x800e -/* 0A2440 800A1840 AC392834 */ sw $t9, %lo(D_800E2834)($at) -/* 0A2444 800A1844 8CC20000 */ lw $v0, ($a2) -/* 0A2448 800A1848 24010001 */ li $at, 1 -/* 0A244C 800A184C 1461000A */ bne $v1, $at, .L800A1878 -/* 0A2450 800A1850 24E70004 */ addiu $a3, $a3, 4 -/* 0A2454 800A1854 3C014288 */ li $at, 0x42880000 # 68.000000 -/* 0A2458 800A1858 44818000 */ mtc1 $at, $f16 -/* 0A245C 800A185C C448064C */ lwc1 $f8, 0x64c($v0) -/* 0A2460 800A1860 00000000 */ nop -/* 0A2464 800A1864 46104280 */ add.s $f10, $f8, $f16 -/* 0A2468 800A1868 E44A064C */ swc1 $f10, 0x64c($v0) -/* 0A246C 800A186C 8CC20000 */ lw $v0, ($a2) -/* 0A2470 800A1870 1000002B */ b .L800A1920 -/* 0A2474 800A1874 C452064C */ lwc1 $f18, 0x64c($v0) -.L800A1878: -/* 0A2478 800A1878 24010002 */ li $at, 2 -/* 0A247C 800A187C 14610027 */ bne $v1, $at, .L800A191C -/* 0A2480 800A1880 3C0E8000 */ lui $t6, %hi(osTvType) # $t6, 0x8000 -/* 0A2484 800A1884 E44E064C */ swc1 $f14, 0x64c($v0) -/* 0A2488 800A1888 8DCE0300 */ lw $t6, %lo(osTvType)($t6) -/* 0A248C 800A188C 00000000 */ nop -/* 0A2490 800A1890 15C00014 */ bnez $t6, .L800A18E4 -/* 0A2494 800A1894 00000000 */ nop -/* 0A2498 800A1898 8CC20000 */ lw $v0, ($a2) -/* 0A249C 800A189C 00000000 */ nop -/* 0A24A0 800A18A0 C4520650 */ lwc1 $f18, 0x650($v0) -/* 0A24A4 800A18A4 00000000 */ nop -/* 0A24A8 800A18A8 46009121 */ cvt.d.s $f4, $f18 -/* 0A24AC 800A18AC 46202180 */ add.d $f6, $f4, $f0 -/* 0A24B0 800A18B0 46203220 */ cvt.s.d $f8, $f6 -/* 0A24B4 800A18B4 E4480650 */ swc1 $f8, 0x650($v0) -/* 0A24B8 800A18B8 8CC20000 */ lw $v0, ($a2) -/* 0A24BC 800A18BC 00000000 */ nop -/* 0A24C0 800A18C0 C4500670 */ lwc1 $f16, 0x670($v0) -/* 0A24C4 800A18C4 00000000 */ nop -/* 0A24C8 800A18C8 460082A1 */ cvt.d.s $f10, $f16 -/* 0A24CC 800A18CC 46205480 */ add.d $f18, $f10, $f0 -/* 0A24D0 800A18D0 46209120 */ cvt.s.d $f4, $f18 -/* 0A24D4 800A18D4 E4440670 */ swc1 $f4, 0x670($v0) -/* 0A24D8 800A18D8 8CC20000 */ lw $v0, ($a2) -/* 0A24DC 800A18DC 10000010 */ b .L800A1920 -/* 0A24E0 800A18E0 C452064C */ lwc1 $f18, 0x64c($v0) -.L800A18E4: -/* 0A24E4 800A18E4 8CC20000 */ lw $v0, ($a2) -/* 0A24E8 800A18E8 00000000 */ nop -/* 0A24EC 800A18EC C4460650 */ lwc1 $f6, 0x650($v0) -/* 0A24F0 800A18F0 00000000 */ nop -/* 0A24F4 800A18F4 46023200 */ add.s $f8, $f6, $f2 -/* 0A24F8 800A18F8 E4480650 */ swc1 $f8, 0x650($v0) -/* 0A24FC 800A18FC 8CC20000 */ lw $v0, ($a2) -/* 0A2500 800A1900 00000000 */ nop -/* 0A2504 800A1904 C4500670 */ lwc1 $f16, 0x670($v0) -/* 0A2508 800A1908 00000000 */ nop -/* 0A250C 800A190C 46028280 */ add.s $f10, $f16, $f2 -/* 0A2510 800A1910 E44A0670 */ swc1 $f10, 0x670($v0) -/* 0A2514 800A1914 8CC20000 */ lw $v0, ($a2) -/* 0A2518 800A1918 00000000 */ nop -.L800A191C: -/* 0A251C 800A191C C452064C */ lwc1 $f18, 0x64c($v0) -.L800A1920: -/* 0A2520 800A1920 24010010 */ li $at, 16 -/* 0A2524 800A1924 460C9100 */ add.s $f4, $f18, $f12 -/* 0A2528 800A1928 25080004 */ addiu $t0, $t0, 4 -/* 0A252C 800A192C 14E1FFA1 */ bne $a3, $at, .L800A17B4 -/* 0A2530 800A1930 E444066C */ swc1 $f4, 0x66c($v0) -/* 0A2534 800A1934 8CCD0000 */ lw $t5, ($a2) -/* 0A2538 800A1938 00002025 */ move $a0, $zero -/* 0A253C 800A193C E5AE064C */ swc1 $f14, 0x64c($t5) -/* 0A2540 800A1940 8FB80040 */ lw $t8, 0x40($sp) -/* 0A2544 800A1944 8FAF0044 */ lw $t7, 0x44($sp) -/* 0A2548 800A1948 8CCE0000 */ lw $t6, ($a2) -/* 0A254C 800A194C 01F8C821 */ addu $t9, $t7, $t8 -/* 0A2550 800A1950 44993000 */ mtc1 $t9, $f6 -/* 0A2554 800A1954 00000000 */ nop -/* 0A2558 800A1958 46803220 */ cvt.s.w $f8, $f6 -/* 0A255C 800A195C E5C8066C */ swc1 $f8, 0x66c($t6) -/* 0A2560 800A1960 8CCD0000 */ lw $t5, ($a2) -/* 0A2564 800A1964 C7B0001C */ lwc1 $f16, 0x1c($sp) -/* 0A2568 800A1968 00000000 */ nop -/* 0A256C 800A196C E5B00650 */ swc1 $f16, 0x650($t5) -/* 0A2570 800A1970 8FB80038 */ lw $t8, 0x38($sp) -/* 0A2574 800A1974 8FAF003C */ lw $t7, 0x3c($sp) -/* 0A2578 800A1978 8CCE0000 */ lw $t6, ($a2) -/* 0A257C 800A197C 01F8C821 */ addu $t9, $t7, $t8 -/* 0A2580 800A1980 44995000 */ mtc1 $t9, $f10 -/* 0A2584 800A1984 00000000 */ nop -/* 0A2588 800A1988 468054A0 */ cvt.s.w $f18, $f10 -/* 0A258C 800A198C 0C01A142 */ jal func_80068508 -/* 0A2590 800A1990 E5D20670 */ swc1 $f18, 0x670($t6) -.L800A1994: -/* 0A2594 800A1994 8FBF0014 */ lw $ra, 0x14($sp) -.L800A1998: -/* 0A2598 800A1998 27BD0060 */ addiu $sp, $sp, 0x60 -/* 0A259C 800A199C 03E00008 */ jr $ra -/* 0A25A0 800A19A0 00000000 */ nop - diff --git a/asm/non_matchings/game_ui/func_800A19A4.s b/asm/non_matchings/game_ui/func_800A19A4.s deleted file mode 100644 index 1fa66c69..00000000 --- a/asm/non_matchings/game_ui/func_800A19A4.s +++ /dev/null @@ -1,165 +0,0 @@ -glabel func_800A19A4 -/* 0A25A4 800A19A4 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 0A25A8 800A19A8 AFB20028 */ sw $s2, 0x28($sp) -/* 0A25AC 800A19AC 444EF800 */ cfc1 $t6, $31 -/* 0A25B0 800A19B0 3C128012 */ lui $s2, %hi(gCurrentHud) # $s2, 0x8012 -/* 0A25B4 800A19B4 26526CDC */ addiu $s2, %lo(gCurrentHud) # addiu $s2, $s2, 0x6cdc -/* 0A25B8 800A19B8 8E420000 */ lw $v0, ($s2) -/* 0A25BC 800A19BC 35C10003 */ ori $at, $t6, 3 -/* 0A25C0 800A19C0 AFBF003C */ sw $ra, 0x3c($sp) -/* 0A25C4 800A19C4 AFB60038 */ sw $s6, 0x38($sp) -/* 0A25C8 800A19C8 AFB50034 */ sw $s5, 0x34($sp) -/* 0A25CC 800A19CC AFB40030 */ sw $s4, 0x30($sp) -/* 0A25D0 800A19D0 AFB3002C */ sw $s3, 0x2c($sp) -/* 0A25D4 800A19D4 AFB10024 */ sw $s1, 0x24($sp) -/* 0A25D8 800A19D8 AFB00020 */ sw $s0, 0x20($sp) -/* 0A25DC 800A19DC E7B50018 */ swc1 $f21, 0x18($sp) -/* 0A25E0 800A19E0 E7B4001C */ swc1 $f20, 0x1c($sp) -/* 0A25E4 800A19E4 AFA50054 */ sw $a1, 0x54($sp) -/* 0A25E8 800A19E8 38210002 */ xori $at, $at, 2 -/* 0A25EC 800A19EC 44C1F800 */ ctc1 $at, $31 -/* 0A25F0 800A19F0 C444066C */ lwc1 $f4, 0x66c($v0) -/* 0A25F4 800A19F4 3C038012 */ lui $v1, %hi(gNumActivePlayers) # $v1, 0x8012 -/* 0A25F8 800A19F8 460021A4 */ cvt.w.s $f6, $f4 -/* 0A25FC 800A19FC 3C018012 */ lui $at, %hi(D_80126CD5) # $at, 0x8012 -/* 0A2600 800A1A00 440F3000 */ mfc1 $t7, $f6 -/* 0A2604 800A1A04 24080001 */ li $t0, 1 -/* 0A2608 800A1A08 AFAF0040 */ sw $t7, 0x40($sp) -/* 0A260C 800A1A0C 80980003 */ lb $t8, 3($a0) -/* 0A2610 800A1A10 44CEF800 */ ctc1 $t6, $31 -/* 0A2614 800A1A14 27190038 */ addiu $t9, $t8, 0x38 -/* 0A2618 800A1A18 A4590646 */ sh $t9, 0x646($v0) -/* 0A261C 800A1A1C 90636D37 */ lbu $v1, %lo(gNumActivePlayers)($v1) -/* 0A2620 800A1A20 A0286CD5 */ sb $t0, %lo(D_80126CD5)($at) -/* 0A2624 800A1A24 28610003 */ slti $at, $v1, 3 -/* 0A2628 800A1A28 14200008 */ bnez $at, .L800A1A4C -/* 0A262C 800A1A2C 00809825 */ move $s3, $a0 -/* 0A2630 800A1A30 24110003 */ li $s1, 3 -/* 0A2634 800A1A34 1623000F */ bne $s1, $v1, .L800A1A74 -/* 0A2638 800A1A38 00000000 */ nop -/* 0A263C 800A1A3C 84890000 */ lh $t1, ($a0) -/* 0A2640 800A1A40 2401FFFF */ li $at, -1 -/* 0A2644 800A1A44 1521000B */ bne $t1, $at, .L800A1A74 -/* 0A2648 800A1A48 00000000 */ nop -.L800A1A4C: -/* 0A264C 800A1A4C 8E470000 */ lw $a3, ($s2) -/* 0A2650 800A1A50 3C148012 */ lui $s4, %hi(gHUDCurrDisplayList) # $s4, 0x8012 -/* 0A2654 800A1A54 3C158012 */ lui $s5, %hi(gHUDCurrMatrix) # $s5, 0x8012 -/* 0A2658 800A1A58 3C168012 */ lui $s6, %hi(gHUDCurrVertex) # $s6, 0x8012 -/* 0A265C 800A1A5C 26C66D04 */ addiu $a2, $s6, %lo(gHUDCurrVertex) -/* 0A2660 800A1A60 26A56D00 */ addiu $a1, $s5, %lo(gHUDCurrMatrix) -/* 0A2664 800A1A64 26846CFC */ addiu $a0, $s4, %lo(gHUDCurrDisplayList) -/* 0A2668 800A1A68 24110003 */ li $s1, 3 -/* 0A266C 800A1A6C 0C02A980 */ jal func_800AA600 -/* 0A2670 800A1A70 24E70640 */ addiu $a3, $a3, 0x640 -.L800A1A74: -/* 0A2674 800A1A74 8E4A0000 */ lw $t2, ($s2) -/* 0A2678 800A1A78 3C148012 */ lui $s4, %hi(gHUDCurrDisplayList) # $s4, 0x8012 -/* 0A267C 800A1A7C 8142067A */ lb $v0, 0x67a($t2) -/* 0A2680 800A1A80 3C158012 */ lui $s5, %hi(gHUDCurrMatrix) # $s5, 0x8012 -/* 0A2684 800A1A84 3C168012 */ lui $s6, %hi(gHUDCurrVertex) # $s6, 0x8012 -/* 0A2688 800A1A88 26D66D04 */ addiu $s6, %lo(gHUDCurrVertex) # addiu $s6, $s6, 0x6d04 -/* 0A268C 800A1A8C 26B56D00 */ addiu $s5, %lo(gHUDCurrMatrix) # addiu $s5, $s5, 0x6d00 -/* 0A2690 800A1A90 04410005 */ bgez $v0, .L800A1AA8 -/* 0A2694 800A1A94 26946CFC */ addiu $s4, %lo(gHUDCurrDisplayList) # addiu $s4, $s4, 0x6cfc -/* 0A2698 800A1A98 00025840 */ sll $t3, $v0, 1 -/* 0A269C 800A1A9C 256C0100 */ addiu $t4, $t3, 0x100 -/* 0A26A0 800A1AA0 10000005 */ b .L800A1AB8 -/* 0A26A4 800A1AA4 AFAC0044 */ sw $t4, 0x44($sp) -.L800A1AA8: -/* 0A26A8 800A1AA8 00026840 */ sll $t5, $v0, 1 -/* 0A26AC 800A1AAC 240E00FF */ li $t6, 255 -/* 0A26B0 800A1AB0 01CD7823 */ subu $t7, $t6, $t5 -/* 0A26B4 800A1AB4 AFAF0044 */ sw $t7, 0x44($sp) -.L800A1AB8: -/* 0A26B8 800A1AB8 8FB80044 */ lw $t8, 0x44($sp) -/* 0A26BC 800A1ABC 241900FE */ li $t9, 254 -/* 0A26C0 800A1AC0 2B0100FF */ slti $at, $t8, 0xff -/* 0A26C4 800A1AC4 14200002 */ bnez $at, .L800A1AD0 -/* 0A26C8 800A1AC8 00000000 */ nop -/* 0A26CC 800A1ACC AFB90044 */ sw $t9, 0x44($sp) -.L800A1AD0: -/* 0A26D0 800A1AD0 82680193 */ lb $t0, 0x193($s3) -/* 0A26D4 800A1AD4 00008025 */ move $s0, $zero -/* 0A26D8 800A1AD8 19000016 */ blez $t0, .L800A1B34 -/* 0A26DC 800A1ADC 3C014140 */ li $at, 0x41400000 # 12.000000 -/* 0A26E0 800A1AE0 4481A000 */ mtc1 $at, $f20 -/* 0A26E4 800A1AE4 00000000 */ nop -.L800A1AE8: -/* 0A26E8 800A1AE8 8E470000 */ lw $a3, ($s2) -/* 0A26EC 800A1AEC 02802025 */ move $a0, $s4 -/* 0A26F0 800A1AF0 02A02825 */ move $a1, $s5 -/* 0A26F4 800A1AF4 02C03025 */ move $a2, $s6 -/* 0A26F8 800A1AF8 0C02A980 */ jal func_800AA600 -/* 0A26FC 800A1AFC 24E70660 */ addiu $a3, $a3, 0x660 -/* 0A2700 800A1B00 8E420000 */ lw $v0, ($s2) -/* 0A2704 800A1B04 26100001 */ addiu $s0, $s0, 1 -/* 0A2708 800A1B08 C448066C */ lwc1 $f8, 0x66c($v0) -/* 0A270C 800A1B0C 00000000 */ nop -/* 0A2710 800A1B10 46144280 */ add.s $f10, $f8, $f20 -/* 0A2714 800A1B14 E44A066C */ swc1 $f10, 0x66c($v0) -/* 0A2718 800A1B18 82690193 */ lb $t1, 0x193($s3) -/* 0A271C 800A1B1C 00000000 */ nop -/* 0A2720 800A1B20 0209082A */ slt $at, $s0, $t1 -/* 0A2724 800A1B24 10200004 */ beqz $at, .L800A1B38 -/* 0A2728 800A1B28 3C014140 */ lui $at, 0x4140 -/* 0A272C 800A1B2C 1611FFEE */ bne $s0, $s1, .L800A1AE8 -/* 0A2730 800A1B30 00000000 */ nop -.L800A1B34: -/* 0A2734 800A1B34 3C014140 */ li $at, 0x41400000 # 12.000000 -.L800A1B38: -/* 0A2738 800A1B38 8FAA0044 */ lw $t2, 0x44($sp) -/* 0A273C 800A1B3C 4481A000 */ mtc1 $at, $f20 -/* 0A2740 800A1B40 2401FF00 */ li $at, -256 -/* 0A2744 800A1B44 01415825 */ or $t3, $t2, $at -/* 0A2748 800A1B48 3C01800E */ lui $at, %hi(D_800E2834) # $at, 0x800e -/* 0A274C 800A1B4C AC2B2834 */ sw $t3, %lo(D_800E2834)($at) -/* 0A2750 800A1B50 826C01CF */ lb $t4, 0x1cf($s3) -/* 0A2754 800A1B54 02008825 */ move $s1, $s0 -/* 0A2758 800A1B58 19800017 */ blez $t4, .L800A1BB8 -/* 0A275C 800A1B5C 00008025 */ move $s0, $zero -/* 0A2760 800A1B60 2A210003 */ slti $at, $s1, 3 -/* 0A2764 800A1B64 10200015 */ beqz $at, .L800A1BBC -/* 0A2768 800A1B68 8FAD0040 */ lw $t5, 0x40($sp) -.L800A1B6C: -/* 0A276C 800A1B6C 8E470000 */ lw $a3, ($s2) -/* 0A2770 800A1B70 02802025 */ move $a0, $s4 -/* 0A2774 800A1B74 02A02825 */ move $a1, $s5 -/* 0A2778 800A1B78 02C03025 */ move $a2, $s6 -/* 0A277C 800A1B7C 0C02A980 */ jal func_800AA600 -/* 0A2780 800A1B80 24E70660 */ addiu $a3, $a3, 0x660 -/* 0A2784 800A1B84 8E420000 */ lw $v0, ($s2) -/* 0A2788 800A1B88 26100001 */ addiu $s0, $s0, 1 -/* 0A278C 800A1B8C C450066C */ lwc1 $f16, 0x66c($v0) -/* 0A2790 800A1B90 26310001 */ addiu $s1, $s1, 1 -/* 0A2794 800A1B94 46148480 */ add.s $f18, $f16, $f20 -/* 0A2798 800A1B98 E452066C */ swc1 $f18, 0x66c($v0) -/* 0A279C 800A1B9C 826E01CF */ lb $t6, 0x1cf($s3) -/* 0A27A0 800A1BA0 00000000 */ nop -/* 0A27A4 800A1BA4 020E082A */ slt $at, $s0, $t6 -/* 0A27A8 800A1BA8 10200003 */ beqz $at, .L800A1BB8 -/* 0A27AC 800A1BAC 2A210003 */ slti $at, $s1, 3 -/* 0A27B0 800A1BB0 1420FFEE */ bnez $at, .L800A1B6C -/* 0A27B4 800A1BB4 00000000 */ nop -.L800A1BB8: -/* 0A27B8 800A1BB8 8FAD0040 */ lw $t5, 0x40($sp) -.L800A1BBC: -/* 0A27BC 800A1BBC 8E4F0000 */ lw $t7, ($s2) -/* 0A27C0 800A1BC0 448D2000 */ mtc1 $t5, $f4 -/* 0A27C4 800A1BC4 3C018012 */ lui $at, %hi(D_80126CD5) # $at, 0x8012 -/* 0A27C8 800A1BC8 468021A0 */ cvt.s.w $f6, $f4 -/* 0A27CC 800A1BCC E5E6066C */ swc1 $f6, 0x66c($t7) -/* 0A27D0 800A1BD0 8FBF003C */ lw $ra, 0x3c($sp) -/* 0A27D4 800A1BD4 8FB60038 */ lw $s6, 0x38($sp) -/* 0A27D8 800A1BD8 8FB50034 */ lw $s5, 0x34($sp) -/* 0A27DC 800A1BDC 8FB40030 */ lw $s4, 0x30($sp) -/* 0A27E0 800A1BE0 8FB3002C */ lw $s3, 0x2c($sp) -/* 0A27E4 800A1BE4 8FB20028 */ lw $s2, 0x28($sp) -/* 0A27E8 800A1BE8 8FB10024 */ lw $s1, 0x24($sp) -/* 0A27EC 800A1BEC 8FB00020 */ lw $s0, 0x20($sp) -/* 0A27F0 800A1BF0 C7B4001C */ lwc1 $f20, 0x1c($sp) -/* 0A27F4 800A1BF4 C7B50018 */ lwc1 $f21, 0x18($sp) -/* 0A27F8 800A1BF8 A0206CD5 */ sb $zero, %lo(D_80126CD5)($at) -/* 0A27FC 800A1BFC 03E00008 */ jr $ra -/* 0A2800 800A1C00 27BD0050 */ addiu $sp, $sp, 0x50 - diff --git a/asm/non_matchings/game_ui/func_800A4C44.s b/asm/non_matchings/game_ui/func_800A4C44.s deleted file mode 100644 index 4d7cd048..00000000 --- a/asm/non_matchings/game_ui/func_800A4C44.s +++ /dev/null @@ -1,210 +0,0 @@ -glabel func_800A4C44 -/* 0A5844 800A4C44 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 0A5848 800A4C48 AFBF0014 */ sw $ra, 0x14($sp) -/* 0A584C 800A4C4C AFA5003C */ sw $a1, 0x3c($sp) -/* 0A5850 800A4C50 808E01D8 */ lb $t6, 0x1d8($a0) -/* 0A5854 800A4C54 00000000 */ nop -/* 0A5858 800A4C58 15C000BA */ bnez $t6, .L800A4F44 -/* 0A585C 800A4C5C 8FBF0014 */ lw $ra, 0x14($sp) -/* 0A5860 800A4C60 848301AE */ lh $v1, 0x1ae($a0) -/* 0A5864 800A4C64 0C0044E7 */ jal func_8001139C -/* 0A5868 800A4C68 AFA30034 */ sw $v1, 0x34($sp) -/* 0A586C 800A4C6C 8FA30034 */ lw $v1, 0x34($sp) -/* 0A5870 800A4C70 1040001B */ beqz $v0, .L800A4CE0 -/* 0A5874 800A4C74 00000000 */ nop -/* 0A5878 800A4C78 0C01AF66 */ jal get_current_level_race_type -/* 0A587C 800A4C7C 00000000 */ nop -/* 0A5880 800A4C80 24010008 */ li $at, 8 -/* 0A5884 800A4C84 10410005 */ beq $v0, $at, .L800A4C9C -/* 0A5888 800A4C88 00000000 */ nop -/* 0A588C 800A4C8C 0C008D07 */ jal is_taj_challenge -/* 0A5890 800A4C90 00000000 */ nop -/* 0A5894 800A4C94 10400003 */ beqz $v0, .L800A4CA4 -/* 0A5898 800A4C98 00000000 */ nop -.L800A4C9C: -/* 0A589C 800A4C9C 10000010 */ b .L800A4CE0 -/* 0A58A0 800A4CA0 24030002 */ li $v1, 2 -.L800A4CA4: -/* 0A58A4 800A4CA4 0C01BAA4 */ jal get_settings -/* 0A58A8 800A4CA8 00000000 */ nop -/* 0A58AC 800A4CAC 3C0F8012 */ lui $t7, %hi(D_80126D10) # $t7, 0x8012 -/* 0A58B0 800A4CB0 8DEF6D10 */ lw $t7, %lo(D_80126D10)($t7) -/* 0A58B4 800A4CB4 3C088012 */ lui $t0, %hi(gCurrentHud) # $t0, 0x8012 -/* 0A58B8 800A4CB8 000FC080 */ sll $t8, $t7, 2 -/* 0A58BC 800A4CBC 030FC023 */ subu $t8, $t8, $t7 -/* 0A58C0 800A4CC0 0018C0C0 */ sll $t8, $t8, 3 -/* 0A58C4 800A4CC4 25086CDC */ addiu $t0, %lo(gCurrentHud) # addiu $t0, $t0, 0x6cdc -/* 0A58C8 800A4CC8 0058C821 */ addu $t9, $v0, $t8 -/* 0A58CC 800A4CCC 8323005A */ lb $v1, 0x5a($t9) -/* 0A58D0 800A4CD0 8D090000 */ lw $t1, ($t0) -/* 0A58D4 800A4CD4 00000000 */ nop -/* 0A58D8 800A4CD8 A5230018 */ sh $v1, 0x18($t1) -/* 0A58DC 800A4CDC 24630001 */ addiu $v1, $v1, 1 -.L800A4CE0: -/* 0A58E0 800A4CE0 3C0A8012 */ lui $t2, %hi(gHUDNumPlayers) # $t2, 0x8012 -/* 0A58E4 800A4CE4 8D4A6D0C */ lw $t2, %lo(gHUDNumPlayers)($t2) -/* 0A58E8 800A4CE8 3C088012 */ lui $t0, %hi(gCurrentHud) # $t0, 0x8012 -/* 0A58EC 800A4CEC 29410002 */ slti $at, $t2, 2 -/* 0A58F0 800A4CF0 10200017 */ beqz $at, .L800A4D50 -/* 0A58F4 800A4CF4 25086CDC */ addiu $t0, %lo(gCurrentHud) # addiu $t0, $t0, 0x6cdc -/* 0A58F8 800A4CF8 28610004 */ slti $at, $v1, 4 -/* 0A58FC 800A4CFC 10200005 */ beqz $at, .L800A4D14 -/* 0A5900 800A4D00 3C048012 */ lui $a0, %hi(gHUDCurrDisplayList) # $a0, 0x8012 -/* 0A5904 800A4D04 8D0C0000 */ lw $t4, ($t0) -/* 0A5908 800A4D08 246BFFFF */ addiu $t3, $v1, -1 -/* 0A590C 800A4D0C 10000004 */ b .L800A4D20 -/* 0A5910 800A4D10 A58B0038 */ sh $t3, 0x38($t4) -.L800A4D14: -/* 0A5914 800A4D14 8D0E0000 */ lw $t6, ($t0) -/* 0A5918 800A4D18 240D0003 */ li $t5, 3 -/* 0A591C 800A4D1C A5CD0038 */ sh $t5, 0x38($t6) -.L800A4D20: -/* 0A5920 800A4D20 8D070000 */ lw $a3, ($t0) -/* 0A5924 800A4D24 3C058012 */ lui $a1, %hi(gHUDCurrMatrix) # $a1, 0x8012 -/* 0A5928 800A4D28 3C068012 */ lui $a2, %hi(gHUDCurrVertex) # $a2, 0x8012 -/* 0A592C 800A4D2C 24C66D04 */ addiu $a2, %lo(gHUDCurrVertex) # addiu $a2, $a2, 0x6d04 -/* 0A5930 800A4D30 24A56D00 */ addiu $a1, %lo(gHUDCurrMatrix) # addiu $a1, $a1, 0x6d00 -/* 0A5934 800A4D34 24846CFC */ addiu $a0, %lo(gHUDCurrDisplayList) # addiu $a0, $a0, 0x6cfc -/* 0A5938 800A4D38 AFA30034 */ sw $v1, 0x34($sp) -/* 0A593C 800A4D3C 0C02A980 */ jal func_800AA600 -/* 0A5940 800A4D40 24E70020 */ addiu $a3, $a3, 0x20 -/* 0A5944 800A4D44 3C088012 */ lui $t0, %hi(gCurrentHud) # $t0, 0x8012 -/* 0A5948 800A4D48 8FA30034 */ lw $v1, 0x34($sp) -/* 0A594C 800A4D4C 25086CDC */ addiu $t0, %lo(gCurrentHud) # addiu $t0, $t0, 0x6cdc -.L800A4D50: -/* 0A5950 800A4D50 8D0F0000 */ lw $t7, ($t0) -/* 0A5954 800A4D54 3C014300 */ li $at, 0x43000000 # 128.000000 -/* 0A5958 800A4D58 81F8001B */ lb $t8, 0x1b($t7) -/* 0A595C 800A4D5C 44813000 */ mtc1 $at, $f6 -/* 0A5960 800A4D60 27190081 */ addiu $t9, $t8, 0x81 -/* 0A5964 800A4D64 44992000 */ mtc1 $t9, $f4 -/* 0A5968 800A4D68 246CFFFF */ addiu $t4, $v1, -1 -/* 0A596C 800A4D6C 46802020 */ cvt.s.w $f0, $f4 -/* 0A5970 800A4D70 AFAC001C */ sw $t4, 0x1c($sp) -/* 0A5974 800A4D74 46060002 */ mul.s $f0, $f0, $f6 -/* 0A5978 800A4D78 4449F800 */ cfc1 $t1, $31 -/* 0A597C 800A4D7C 00000000 */ nop -/* 0A5980 800A4D80 35210003 */ ori $at, $t1, 3 -/* 0A5984 800A4D84 38210002 */ xori $at, $at, 2 -/* 0A5988 800A4D88 44C1F800 */ ctc1 $at, $31 -/* 0A598C 800A4D8C 00000000 */ nop -/* 0A5990 800A4D90 46000224 */ cvt.w.s $f8, $f0 -/* 0A5994 800A4D94 44044000 */ mfc1 $a0, $f8 -/* 0A5998 800A4D98 44C9F800 */ ctc1 $t1, $31 -/* 0A599C 800A4D9C 00045400 */ sll $t2, $a0, 0x10 -/* 0A59A0 800A4DA0 0C01C1F1 */ jal sins_f -/* 0A59A4 800A4DA4 000A2403 */ sra $a0, $t2, 0x10 -/* 0A59A8 800A4DA8 3C088012 */ lui $t0, %hi(gCurrentHud) # $t0, 0x8012 -/* 0A59AC 800A4DAC 25086CDC */ addiu $t0, %lo(gCurrentHud) # addiu $t0, $t0, 0x6cdc -/* 0A59B0 800A4DB0 8D020000 */ lw $v0, ($t0) -/* 0A59B4 800A4DB4 3C0142FE */ li $at, 0x42FE0000 # 127.000000 -/* 0A59B8 800A4DB8 804D001C */ lb $t5, 0x1c($v0) -/* 0A59BC 800A4DBC 44819000 */ mtc1 $at, $f18 -/* 0A59C0 800A4DC0 448D5000 */ mtc1 $t5, $f10 -/* 0A59C4 800A4DC4 3C013FE0 */ li $at, 0x3FE00000 # 1.750000 -/* 0A59C8 800A4DC8 46805420 */ cvt.s.w $f16, $f10 -/* 0A59CC 800A4DCC 44814800 */ mtc1 $at, $f9 -/* 0A59D0 800A4DD0 44804000 */ mtc1 $zero, $f8 -/* 0A59D4 800A4DD4 46128103 */ div.s $f4, $f16, $f18 -/* 0A59D8 800A4DD8 460002A1 */ cvt.d.s $f10, $f0 -/* 0A59DC 800A4DDC 462A4402 */ mul.d $f16, $f8, $f10 -/* 0A59E0 800A4DE0 3C013FF0 */ li $at, 0x3FF00000 # 1.875000 -/* 0A59E4 800A4DE4 44819800 */ mtc1 $at, $f19 -/* 0A59E8 800A4DE8 44809000 */ mtc1 $zero, $f18 -/* 0A59EC 800A4DEC 3C0141C0 */ li $at, 0x41C00000 # 24.000000 -/* 0A59F0 800A4DF0 3C048012 */ lui $a0, %hi(gHUDCurrDisplayList) # $a0, 0x8012 -/* 0A59F4 800A4DF4 3C058012 */ lui $a1, %hi(gHUDCurrMatrix) # $a1, 0x8012 -/* 0A59F8 800A4DF8 3C068012 */ lui $a2, %hi(gHUDCurrVertex) # $a2, 0x8012 -/* 0A59FC 800A4DFC 24C66D04 */ addiu $a2, %lo(gHUDCurrVertex) # addiu $a2, $a2, 0x6d04 -/* 0A5A00 800A4E00 24A56D00 */ addiu $a1, %lo(gHUDCurrMatrix) # addiu $a1, $a1, 0x6d00 -/* 0A5A04 800A4E04 460021A1 */ cvt.d.s $f6, $f4 -/* 0A5A08 800A4E08 46309100 */ add.d $f4, $f18, $f16 -/* 0A5A0C 800A4E0C 44819000 */ mtc1 $at, $f18 -/* 0A5A10 800A4E10 46243200 */ add.d $f8, $f6, $f4 -/* 0A5A14 800A4E14 24846CFC */ addiu $a0, %lo(gHUDCurrDisplayList) # addiu $a0, $a0, 0x6cfc -/* 0A5A18 800A4E18 462042A0 */ cvt.s.d $f10, $f8 -/* 0A5A1C 800A4E1C E44A0008 */ swc1 $f10, 8($v0) -/* 0A5A20 800A4E20 8D020000 */ lw $v0, ($t0) -/* 0A5A24 800A4E24 00000000 */ nop -/* 0A5A28 800A4E28 C442000C */ lwc1 $f2, 0xc($v0) -/* 0A5A2C 800A4E2C 00000000 */ nop -/* 0A5A30 800A4E30 E7A20030 */ swc1 $f2, 0x30($sp) -/* 0A5A34 800A4E34 C4500008 */ lwc1 $f16, 8($v0) -/* 0A5A38 800A4E38 00000000 */ nop -/* 0A5A3C 800A4E3C 46109182 */ mul.s $f6, $f18, $f16 -/* 0A5A40 800A4E40 46061101 */ sub.s $f4, $f2, $f6 -/* 0A5A44 800A4E44 E444000C */ swc1 $f4, 0xc($v0) -/* 0A5A48 800A4E48 8D070000 */ lw $a3, ($t0) -/* 0A5A4C 800A4E4C 0C02A980 */ jal func_800AA600 -/* 0A5A50 800A4E50 00000000 */ nop -/* 0A5A54 800A4E54 3C088012 */ lui $t0, %hi(gCurrentHud) # $t0, 0x8012 -/* 0A5A58 800A4E58 25086CDC */ addiu $t0, %lo(gCurrentHud) # addiu $t0, $t0, 0x6cdc -/* 0A5A5C 800A4E5C 8D0E0000 */ lw $t6, ($t0) -/* 0A5A60 800A4E60 C7A80030 */ lwc1 $f8, 0x30($sp) -/* 0A5A64 800A4E64 2405007F */ li $a1, 127 -/* 0A5A68 800A4E68 E5C8000C */ swc1 $f8, 0xc($t6) -/* 0A5A6C 800A4E6C 8D020000 */ lw $v0, ($t0) -/* 0A5A70 800A4E70 8FA4003C */ lw $a0, 0x3c($sp) -/* 0A5A74 800A4E74 804F001A */ lb $t7, 0x1a($v0) -/* 0A5A78 800A4E78 0004C100 */ sll $t8, $a0, 4 -/* 0A5A7C 800A4E7C 11E0000D */ beqz $t7, .L800A4EB4 -/* 0A5A80 800A4E80 00000000 */ nop -/* 0A5A84 800A4E84 8043001B */ lb $v1, 0x1b($v0) -/* 0A5A88 800A4E88 00B8C823 */ subu $t9, $a1, $t8 -/* 0A5A8C 800A4E8C 0079082A */ slt $at, $v1, $t9 -/* 0A5A90 800A4E90 10200005 */ beqz $at, .L800A4EA8 -/* 0A5A94 800A4E94 00784821 */ addu $t1, $v1, $t8 -/* 0A5A98 800A4E98 A049001B */ sb $t1, 0x1b($v0) -/* 0A5A9C 800A4E9C 8D020000 */ lw $v0, ($t0) -/* 0A5AA0 800A4EA0 10000005 */ b .L800A4EB8 -/* 0A5AA4 800A4EA4 8FA4001C */ lw $a0, 0x1c($sp) -.L800A4EA8: -/* 0A5AA8 800A4EA8 A045001B */ sb $a1, 0x1b($v0) -/* 0A5AAC 800A4EAC 8D020000 */ lw $v0, ($t0) -/* 0A5AB0 800A4EB0 00000000 */ nop -.L800A4EB4: -/* 0A5AB4 800A4EB4 8FA4001C */ lw $a0, 0x1c($sp) -.L800A4EB8: -/* 0A5AB8 800A4EB8 844A0018 */ lh $t2, 0x18($v0) -/* 0A5ABC 800A4EBC 2405007F */ li $a1, 127 -/* 0A5AC0 800A4EC0 108A0013 */ beq $a0, $t2, .L800A4F10 -/* 0A5AC4 800A4EC4 00000000 */ nop -/* 0A5AC8 800A4EC8 804B001A */ lb $t3, 0x1a($v0) -/* 0A5ACC 800A4ECC 240DFF81 */ li $t5, -127 -/* 0A5AD0 800A4ED0 11600009 */ beqz $t3, .L800A4EF8 -/* 0A5AD4 800A4ED4 00000000 */ nop -/* 0A5AD8 800A4ED8 8043001B */ lb $v1, 0x1b($v0) -/* 0A5ADC 800A4EDC 00000000 */ nop -/* 0A5AE0 800A4EE0 18600005 */ blez $v1, .L800A4EF8 -/* 0A5AE4 800A4EE4 00036023 */ negu $t4, $v1 -/* 0A5AE8 800A4EE8 A04C001B */ sb $t4, 0x1b($v0) -/* 0A5AEC 800A4EEC 8D020000 */ lw $v0, ($t0) -/* 0A5AF0 800A4EF0 10000008 */ b .L800A4F14 -/* 0A5AF4 800A4EF4 A4440018 */ sh $a0, 0x18($v0) -.L800A4EF8: -/* 0A5AF8 800A4EF8 A04D001B */ sb $t5, 0x1b($v0) -/* 0A5AFC 800A4EFC 8D0F0000 */ lw $t7, ($t0) -/* 0A5B00 800A4F00 240E0001 */ li $t6, 1 -/* 0A5B04 800A4F04 A1EE001A */ sb $t6, 0x1a($t7) -/* 0A5B08 800A4F08 8D020000 */ lw $v0, ($t0) -/* 0A5B0C 800A4F0C 00000000 */ nop -.L800A4F10: -/* 0A5B10 800A4F10 A4440018 */ sh $a0, 0x18($v0) -.L800A4F14: -/* 0A5B14 800A4F14 8D020000 */ lw $v0, ($t0) -/* 0A5B18 800A4F18 00000000 */ nop -/* 0A5B1C 800A4F1C 8058001A */ lb $t8, 0x1a($v0) -/* 0A5B20 800A4F20 00000000 */ nop -/* 0A5B24 800A4F24 13000007 */ beqz $t8, .L800A4F44 -/* 0A5B28 800A4F28 8FBF0014 */ lw $ra, 0x14($sp) -/* 0A5B2C 800A4F2C 8059001B */ lb $t9, 0x1b($v0) -/* 0A5B30 800A4F30 00000000 */ nop -/* 0A5B34 800A4F34 14B90003 */ bne $a1, $t9, .L800A4F44 -/* 0A5B38 800A4F38 8FBF0014 */ lw $ra, 0x14($sp) -/* 0A5B3C 800A4F3C A040001A */ sb $zero, 0x1a($v0) -/* 0A5B40 800A4F40 8FBF0014 */ lw $ra, 0x14($sp) -.L800A4F44: -/* 0A5B44 800A4F44 27BD0038 */ addiu $sp, $sp, 0x38 -/* 0A5B48 800A4F48 03E00008 */ jr $ra -/* 0A5B4C 800A4F4C 00000000 */ nop - diff --git a/asm/non_matchings/game_ui/func_800A5F18.s b/asm/non_matchings/game_ui/func_800A5F18.s deleted file mode 100644 index 65ce6517..00000000 --- a/asm/non_matchings/game_ui/func_800A5F18.s +++ /dev/null @@ -1,223 +0,0 @@ -.rdata -glabel D_800E8688 -.asciz "RACE" -.ascii "\0\0\0" # padding -glabel D_800E8690 -.asciz "LAP" -glabel D_800E8694 -.asciz "DID NOT FINISH" -.ascii "\0" # padding - -.text -glabel func_800A5F18 -/* 0A6B18 800A5F18 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 0A6B1C 800A5F1C 3C078012 */ lui $a3, %hi(gCurrentHud) # $a3, 0x8012 -/* 0A6B20 800A5F20 8CE76CDC */ lw $a3, %lo(gCurrentHud)($a3) -/* 0A6B24 800A5F24 AFA40028 */ sw $a0, 0x28($sp) -/* 0A6B28 800A5F28 AFBF001C */ sw $ra, 0x1c($sp) -/* 0A6B2C 800A5F2C 3C048012 */ lui $a0, %hi(gHUDCurrDisplayList) # $a0, 0x8012 -/* 0A6B30 800A5F30 3C058012 */ lui $a1, %hi(gHUDCurrMatrix) # $a1, 0x8012 -/* 0A6B34 800A5F34 3C068012 */ lui $a2, %hi(gHUDCurrVertex) # $a2, 0x8012 -/* 0A6B38 800A5F38 24C66D04 */ addiu $a2, %lo(gHUDCurrVertex) # addiu $a2, $a2, 0x6d04 -/* 0A6B3C 800A5F3C 24A56D00 */ addiu $a1, %lo(gHUDCurrMatrix) # addiu $a1, $a1, 0x6d00 -/* 0A6B40 800A5F40 24846CFC */ addiu $a0, %lo(gHUDCurrDisplayList) # addiu $a0, $a0, 0x6cfc -/* 0A6B44 800A5F44 0C02A980 */ jal func_800AA600 -/* 0A6B48 800A5F48 24E705E0 */ addiu $a3, $a3, 0x5e0 -/* 0A6B4C 800A5F4C 3C078012 */ lui $a3, %hi(gCurrentHud) # $a3, 0x8012 -/* 0A6B50 800A5F50 8CE76CDC */ lw $a3, %lo(gCurrentHud)($a3) -/* 0A6B54 800A5F54 3C048012 */ lui $a0, %hi(gHUDCurrDisplayList) # $a0, 0x8012 -/* 0A6B58 800A5F58 3C058012 */ lui $a1, %hi(gHUDCurrMatrix) # $a1, 0x8012 -/* 0A6B5C 800A5F5C 3C068012 */ lui $a2, %hi(gHUDCurrVertex) # $a2, 0x8012 -/* 0A6B60 800A5F60 24C66D04 */ addiu $a2, %lo(gHUDCurrVertex) # addiu $a2, $a2, 0x6d04 -/* 0A6B64 800A5F64 24A56D00 */ addiu $a1, %lo(gHUDCurrMatrix) # addiu $a1, $a1, 0x6d00 -/* 0A6B68 800A5F68 24846CFC */ addiu $a0, %lo(gHUDCurrDisplayList) # addiu $a0, $a0, 0x6cfc -/* 0A6B6C 800A5F6C 0C02A980 */ jal func_800AA600 -/* 0A6B70 800A5F70 24E70600 */ addiu $a3, $a3, 0x600 -/* 0A6B74 800A5F74 0C01AF66 */ jal get_current_level_race_type -/* 0A6B78 800A5F78 00000000 */ nop -/* 0A6B7C 800A5F7C 304E0040 */ andi $t6, $v0, 0x40 -/* 0A6B80 800A5F80 15C000B1 */ bnez $t6, .L800A6248 -/* 0A6B84 800A5F84 8FBF001C */ lw $ra, 0x1c($sp) -/* 0A6B88 800A5F88 0C027B20 */ jal is_in_two_player_adventure -/* 0A6B8C 800A5F8C 00000000 */ nop -/* 0A6B90 800A5F90 144000AD */ bnez $v0, .L800A6248 -/* 0A6B94 800A5F94 8FBF001C */ lw $ra, 0x1c($sp) -/* 0A6B98 800A5F98 0C006E9D */ jal get_racer_objects -/* 0A6B9C 800A5F9C 27A40024 */ addiu $a0, $sp, 0x24 -/* 0A6BA0 800A5FA0 3C0F8012 */ lui $t7, %hi(gNumActivePlayers) # $t7, 0x8012 -/* 0A6BA4 800A5FA4 91EF6D37 */ lbu $t7, %lo(gNumActivePlayers)($t7) -/* 0A6BA8 800A5FA8 00000000 */ nop -/* 0A6BAC 800A5FAC 29E10002 */ slti $at, $t7, 2 -/* 0A6BB0 800A5FB0 142000A5 */ bnez $at, .L800A6248 -/* 0A6BB4 800A5FB4 8FBF001C */ lw $ra, 0x1c($sp) -/* 0A6BB8 800A5FB8 0C027B20 */ jal is_in_two_player_adventure -/* 0A6BBC 800A5FBC 00000000 */ nop -/* 0A6BC0 800A5FC0 10400005 */ beqz $v0, .L800A5FD8 -/* 0A6BC4 800A5FC4 00000000 */ nop -/* 0A6BC8 800A5FC8 0C01BAAC */ jal is_postrace_viewport_active -/* 0A6BCC 800A5FCC 00000000 */ nop -/* 0A6BD0 800A5FD0 1440009D */ bnez $v0, .L800A6248 -/* 0A6BD4 800A5FD4 8FBF001C */ lw $ra, 0x1c($sp) -.L800A5FD8: -/* 0A6BD8 800A5FD8 0C0310BB */ jal set_text_font -/* 0A6BDC 800A5FDC 00002025 */ move $a0, $zero -/* 0A6BE0 800A5FE0 8FB90028 */ lw $t9, 0x28($sp) -/* 0A6BE4 800A5FE4 8FB80024 */ lw $t8, 0x24($sp) -/* 0A6BE8 800A5FE8 872801AC */ lh $t0, 0x1ac($t9) -/* 0A6BEC 800A5FEC 3C028012 */ lui $v0, %hi(gCurrentHud) # $v0, 0x8012 -/* 0A6BF0 800A5FF0 13080078 */ beq $t8, $t0, .L800A61D4 -/* 0A6BF4 800A5FF4 3C01420C */ li $at, 0x420C0000 # 35.000000 -/* 0A6BF8 800A5FF8 240900FF */ li $t1, 255 -/* 0A6BFC 800A5FFC AFA90010 */ sw $t1, 0x10($sp) -/* 0A6C00 800A6000 240400FF */ li $a0, 255 -/* 0A6C04 800A6004 240500FF */ li $a1, 255 -/* 0A6C08 800A6008 240600FF */ li $a2, 255 -/* 0A6C0C 800A600C 0C0310E1 */ jal set_text_colour -/* 0A6C10 800A6010 00003825 */ move $a3, $zero -/* 0A6C14 800A6014 3C028012 */ lui $v0, %hi(gCurrentHud) # $v0, 0x8012 -/* 0A6C18 800A6018 8C426CDC */ lw $v0, %lo(gCurrentHud)($v0) -/* 0A6C1C 800A601C 3C014220 */ li $at, 0x42200000 # 40.000000 -/* 0A6C20 800A6020 44813000 */ mtc1 $at, $f6 -/* 0A6C24 800A6024 C444016C */ lwc1 $f4, 0x16c($v0) -/* 0A6C28 800A6028 C4500170 */ lwc1 $f16, 0x170($v0) -/* 0A6C2C 800A602C 46062201 */ sub.s $f8, $f4, $f6 -/* 0A6C30 800A6030 3C048012 */ lui $a0, %hi(gHUDCurrDisplayList) # $a0, 0x8012 -/* 0A6C34 800A6034 444AF800 */ cfc1 $t2, $31 -/* 0A6C38 800A6038 3C07800F */ lui $a3, %hi(D_800E8688) # $a3, 0x800f -/* 0A6C3C 800A603C 35410003 */ ori $at, $t2, 3 -/* 0A6C40 800A6040 38210002 */ xori $at, $at, 2 -/* 0A6C44 800A6044 44C1F800 */ ctc1 $at, $31 -/* 0A6C48 800A6048 24E78688 */ addiu $a3, %lo(D_800E8688) # addiu $a3, $a3, -0x7978 -/* 0A6C4C 800A604C 460042A4 */ cvt.w.s $f10, $f8 -/* 0A6C50 800A6050 24846CFC */ addiu $a0, %lo(gHUDCurrDisplayList) # addiu $a0, $a0, 0x6cfc -/* 0A6C54 800A6054 44CAF800 */ ctc1 $t2, $31 -/* 0A6C58 800A6058 44055000 */ mfc1 $a1, $f10 -/* 0A6C5C 800A605C AFA00010 */ sw $zero, 0x10($sp) -/* 0A6C60 800A6060 444BF800 */ cfc1 $t3, $31 -/* 0A6C64 800A6064 00000000 */ nop -/* 0A6C68 800A6068 35610003 */ ori $at, $t3, 3 -/* 0A6C6C 800A606C 38210002 */ xori $at, $at, 2 -/* 0A6C70 800A6070 44C1F800 */ ctc1 $at, $31 -/* 0A6C74 800A6074 00000000 */ nop -/* 0A6C78 800A6078 460084A4 */ cvt.w.s $f18, $f16 -/* 0A6C7C 800A607C 44069000 */ mfc1 $a2, $f18 -/* 0A6C80 800A6080 44CBF800 */ ctc1 $t3, $31 -/* 0A6C84 800A6084 0C031110 */ jal draw_text -/* 0A6C88 800A6088 00000000 */ nop -/* 0A6C8C 800A608C 444CF800 */ cfc1 $t4, $31 -/* 0A6C90 800A6090 3C028012 */ lui $v0, %hi(gCurrentHud) # $v0, 0x8012 -/* 0A6C94 800A6094 8C426CDC */ lw $v0, %lo(gCurrentHud)($v0) -/* 0A6C98 800A6098 35810003 */ ori $at, $t4, 3 -/* 0A6C9C 800A609C 38210002 */ xori $at, $at, 2 -/* 0A6CA0 800A60A0 44C1F800 */ ctc1 $at, $31 -/* 0A6CA4 800A60A4 C444016C */ lwc1 $f4, 0x16c($v0) -/* 0A6CA8 800A60A8 C4480170 */ lwc1 $f8, 0x170($v0) -/* 0A6CAC 800A60AC 460021A4 */ cvt.w.s $f6, $f4 -/* 0A6CB0 800A60B0 804E017C */ lb $t6, 0x17c($v0) -/* 0A6CB4 800A60B4 44CCF800 */ ctc1 $t4, $31 -/* 0A6CB8 800A60B8 8046017A */ lb $a2, 0x17a($v0) -/* 0A6CBC 800A60BC 8047017B */ lb $a3, 0x17b($v0) -/* 0A6CC0 800A60C0 444DF800 */ cfc1 $t5, $31 -/* 0A6CC4 800A60C4 44043000 */ mfc1 $a0, $f6 -/* 0A6CC8 800A60C8 35A10003 */ ori $at, $t5, 3 -/* 0A6CCC 800A60CC 38210002 */ xori $at, $at, 2 -/* 0A6CD0 800A60D0 44C1F800 */ ctc1 $at, $31 -/* 0A6CD4 800A60D4 240F0001 */ li $t7, 1 -/* 0A6CD8 800A60D8 460042A4 */ cvt.w.s $f10, $f8 -/* 0A6CDC 800A60DC AFAF0014 */ sw $t7, 0x14($sp) -/* 0A6CE0 800A60E0 44055000 */ mfc1 $a1, $f10 -/* 0A6CE4 800A60E4 44CDF800 */ ctc1 $t5, $31 -/* 0A6CE8 800A60E8 0C029FEF */ jal func_800A7FBC -/* 0A6CEC 800A60EC AFAE0010 */ sw $t6, 0x10($sp) -/* 0A6CF0 800A60F0 3C028012 */ lui $v0, %hi(gCurrentHud) # $v0, 0x8012 -/* 0A6CF4 800A60F4 8C426CDC */ lw $v0, %lo(gCurrentHud)($v0) -/* 0A6CF8 800A60F8 3C014220 */ li $at, 0x42200000 # 40.000000 -/* 0A6CFC 800A60FC 44819000 */ mtc1 $at, $f18 -/* 0A6D00 800A6100 C45002EC */ lwc1 $f16, 0x2ec($v0) -/* 0A6D04 800A6104 C44802F0 */ lwc1 $f8, 0x2f0($v0) -/* 0A6D08 800A6108 46128101 */ sub.s $f4, $f16, $f18 -/* 0A6D0C 800A610C 3C048012 */ lui $a0, %hi(gHUDCurrDisplayList) # $a0, 0x8012 -/* 0A6D10 800A6110 4459F800 */ cfc1 $t9, $31 -/* 0A6D14 800A6114 3C07800F */ lui $a3, %hi(D_800E8690) # $a3, 0x800f -/* 0A6D18 800A6118 37210003 */ ori $at, $t9, 3 -/* 0A6D1C 800A611C 38210002 */ xori $at, $at, 2 -/* 0A6D20 800A6120 44C1F800 */ ctc1 $at, $31 -/* 0A6D24 800A6124 24E78690 */ addiu $a3, %lo(D_800E8690) # addiu $a3, $a3, -0x7970 -/* 0A6D28 800A6128 460021A4 */ cvt.w.s $f6, $f4 -/* 0A6D2C 800A612C 24846CFC */ addiu $a0, %lo(gHUDCurrDisplayList) # addiu $a0, $a0, 0x6cfc -/* 0A6D30 800A6130 44D9F800 */ ctc1 $t9, $31 -/* 0A6D34 800A6134 44053000 */ mfc1 $a1, $f6 -/* 0A6D38 800A6138 AFA00010 */ sw $zero, 0x10($sp) -/* 0A6D3C 800A613C 4458F800 */ cfc1 $t8, $31 -/* 0A6D40 800A6140 00000000 */ nop -/* 0A6D44 800A6144 37010003 */ ori $at, $t8, 3 -/* 0A6D48 800A6148 38210002 */ xori $at, $at, 2 -/* 0A6D4C 800A614C 44C1F800 */ ctc1 $at, $31 -/* 0A6D50 800A6150 00000000 */ nop -/* 0A6D54 800A6154 460042A4 */ cvt.w.s $f10, $f8 -/* 0A6D58 800A6158 44065000 */ mfc1 $a2, $f10 -/* 0A6D5C 800A615C 44D8F800 */ ctc1 $t8, $31 -/* 0A6D60 800A6160 0C031110 */ jal draw_text -/* 0A6D64 800A6164 00000000 */ nop -/* 0A6D68 800A6168 4448F800 */ cfc1 $t0, $31 -/* 0A6D6C 800A616C 3C028012 */ lui $v0, %hi(gCurrentHud) # $v0, 0x8012 -/* 0A6D70 800A6170 8C426CDC */ lw $v0, %lo(gCurrentHud)($v0) -/* 0A6D74 800A6174 35010003 */ ori $at, $t0, 3 -/* 0A6D78 800A6178 38210002 */ xori $at, $at, 2 -/* 0A6D7C 800A617C 44C1F800 */ ctc1 $at, $31 -/* 0A6D80 800A6180 C45002EC */ lwc1 $f16, 0x2ec($v0) -/* 0A6D84 800A6184 C44402F0 */ lwc1 $f4, 0x2f0($v0) -/* 0A6D88 800A6188 460084A4 */ cvt.w.s $f18, $f16 -/* 0A6D8C 800A618C 804A02FC */ lb $t2, 0x2fc($v0) -/* 0A6D90 800A6190 44C8F800 */ ctc1 $t0, $31 -/* 0A6D94 800A6194 804602FA */ lb $a2, 0x2fa($v0) -/* 0A6D98 800A6198 804702FB */ lb $a3, 0x2fb($v0) -/* 0A6D9C 800A619C 4449F800 */ cfc1 $t1, $31 -/* 0A6DA0 800A61A0 44049000 */ mfc1 $a0, $f18 -/* 0A6DA4 800A61A4 35210003 */ ori $at, $t1, 3 -/* 0A6DA8 800A61A8 38210002 */ xori $at, $at, 2 -/* 0A6DAC 800A61AC 44C1F800 */ ctc1 $at, $31 -/* 0A6DB0 800A61B0 240B0001 */ li $t3, 1 -/* 0A6DB4 800A61B4 460021A4 */ cvt.w.s $f6, $f4 -/* 0A6DB8 800A61B8 AFAB0014 */ sw $t3, 0x14($sp) -/* 0A6DBC 800A61BC 44053000 */ mfc1 $a1, $f6 -/* 0A6DC0 800A61C0 44C9F800 */ ctc1 $t1, $31 -/* 0A6DC4 800A61C4 0C029FEF */ jal func_800A7FBC -/* 0A6DC8 800A61C8 AFAA0010 */ sw $t2, 0x10($sp) -/* 0A6DCC 800A61CC 1000001E */ b .L800A6248 -/* 0A6DD0 800A61D0 8FBF001C */ lw $ra, 0x1c($sp) -.L800A61D4: -/* 0A6DD4 800A61D4 8C426CDC */ lw $v0, %lo(gCurrentHud)($v0) -/* 0A6DD8 800A61D8 44815000 */ mtc1 $at, $f10 -/* 0A6DDC 800A61DC C448016C */ lwc1 $f8, 0x16c($v0) -/* 0A6DE0 800A61E0 C4440170 */ lwc1 $f4, 0x170($v0) -/* 0A6DE4 800A61E4 460A4401 */ sub.s $f16, $f8, $f10 -/* 0A6DE8 800A61E8 3C048012 */ lui $a0, %hi(gHUDCurrDisplayList) # $a0, 0x8012 -/* 0A6DEC 800A61EC 444CF800 */ cfc1 $t4, $31 -/* 0A6DF0 800A61F0 3C07800F */ lui $a3, %hi(D_800E8694) # $a3, 0x800f -/* 0A6DF4 800A61F4 35810003 */ ori $at, $t4, 3 -/* 0A6DF8 800A61F8 38210002 */ xori $at, $at, 2 -/* 0A6DFC 800A61FC 44C1F800 */ ctc1 $at, $31 -/* 0A6E00 800A6200 24E78694 */ addiu $a3, %lo(D_800E8694) # addiu $a3, $a3, -0x796c -/* 0A6E04 800A6204 460084A4 */ cvt.w.s $f18, $f16 -/* 0A6E08 800A6208 24846CFC */ addiu $a0, %lo(gHUDCurrDisplayList) # addiu $a0, $a0, 0x6cfc -/* 0A6E0C 800A620C 44CCF800 */ ctc1 $t4, $31 -/* 0A6E10 800A6210 44059000 */ mfc1 $a1, $f18 -/* 0A6E14 800A6214 AFA00010 */ sw $zero, 0x10($sp) -/* 0A6E18 800A6218 444DF800 */ cfc1 $t5, $31 -/* 0A6E1C 800A621C 00000000 */ nop -/* 0A6E20 800A6220 35A10003 */ ori $at, $t5, 3 -/* 0A6E24 800A6224 38210002 */ xori $at, $at, 2 -/* 0A6E28 800A6228 44C1F800 */ ctc1 $at, $31 -/* 0A6E2C 800A622C 00000000 */ nop -/* 0A6E30 800A6230 460021A4 */ cvt.w.s $f6, $f4 -/* 0A6E34 800A6234 44063000 */ mfc1 $a2, $f6 -/* 0A6E38 800A6238 44CDF800 */ ctc1 $t5, $31 -/* 0A6E3C 800A623C 0C031110 */ jal draw_text -/* 0A6E40 800A6240 00000000 */ nop -/* 0A6E44 800A6244 8FBF001C */ lw $ra, 0x1c($sp) -.L800A6248: -/* 0A6E48 800A6248 27BD0028 */ addiu $sp, $sp, 0x28 -/* 0A6E4C 800A624C 03E00008 */ jr $ra -/* 0A6E50 800A6250 00000000 */ nop - diff --git a/asm/non_matchings/game_ui/func_800A6E30.s b/asm/non_matchings/game_ui/func_800A6E30.s deleted file mode 100644 index b45815a2..00000000 --- a/asm/non_matchings/game_ui/func_800A6E30.s +++ /dev/null @@ -1,243 +0,0 @@ -.late_rodata -glabel jpt_800E8768 -.word L800A6E70, L800A6F3C, L800A7014, L800A70D4, L800A7158 - -.text -glabel func_800A6E30 -/* 0A7A30 800A6E30 3C088012 */ lui $t0, %hi(gCurrentHud) # $t0, 0x8012 -/* 0A7A34 800A6E34 25086CDC */ addiu $t0, %lo(gCurrentHud) # addiu $t0, $t0, 0x6cdc -/* 0A7A38 800A6E38 8D020000 */ lw $v0, ($t0) -/* 0A7A3C 800A6E3C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 0A7A40 800A6E40 AFBF0014 */ sw $ra, 0x14($sp) -/* 0A7A44 800A6E44 904E01DA */ lbu $t6, 0x1da($v0) -/* 0A7A48 800A6E48 00803025 */ move $a2, $a0 -/* 0A7A4C 800A6E4C 2DC10005 */ sltiu $at, $t6, 5 -/* 0A7A50 800A6E50 102000CA */ beqz $at, .L800A717C -/* 0A7A54 800A6E54 000E7080 */ sll $t6, $t6, 2 -/* 0A7A58 800A6E58 3C01800F */ lui $at, %hi(jpt_800E8768) # $at, 0x800f -/* 0A7A5C 800A6E5C 002E0821 */ addu $at, $at, $t6 -/* 0A7A60 800A6E60 8C2E8768 */ lw $t6, %lo(jpt_800E8768)($at) -/* 0A7A64 800A6E64 00000000 */ nop -/* 0A7A68 800A6E68 01C00008 */ jr $t6 -/* 0A7A6C 800A6E6C 00000000 */ nop -glabel L800A6E70 -/* 0A7A70 800A6E70 3C03800E */ lui $v1, %hi(D_800E2770) # $v1, 0x800e -/* 0A7A74 800A6E74 24632770 */ addiu $v1, %lo(D_800E2770) # addiu $v1, $v1, 0x2770 -/* 0A7A78 800A6E78 240F007F */ li $t7, 127 -/* 0A7A7C 800A6E7C A06F0002 */ sb $t7, 2($v1) -/* 0A7A80 800A6E80 A0600003 */ sb $zero, 3($v1) -/* 0A7A84 800A6E84 84D80000 */ lh $t8, ($a2) -/* 0A7A88 800A6E88 AFA60018 */ sw $a2, 0x18($sp) -/* 0A7A8C 800A6E8C 24040016 */ li $a0, 22 -/* 0A7A90 800A6E90 00002825 */ move $a1, $zero -/* 0A7A94 800A6E94 0C000741 */ jal play_sound_global -/* 0A7A98 800A6E98 A078000C */ sb $t8, 0xc($v1) -/* 0A7A9C 800A6E9C 3C038012 */ lui $v1, %hi(gHUDNumPlayers) # $v1, 0x8012 -/* 0A7AA0 800A6EA0 8C636D0C */ lw $v1, %lo(gHUDNumPlayers)($v1) -/* 0A7AA4 800A6EA4 8FA60018 */ lw $a2, 0x18($sp) -/* 0A7AA8 800A6EA8 3C088012 */ lui $t0, %hi(gCurrentHud) # $t0, 0x8012 -/* 0A7AAC 800A6EAC 10600003 */ beqz $v1, .L800A6EBC -/* 0A7AB0 800A6EB0 25086CDC */ addiu $t0, %lo(gCurrentHud) # addiu $t0, $t0, 0x6cdc -/* 0A7AB4 800A6EB4 24010001 */ li $at, 1 -/* 0A7AB8 800A6EB8 14610008 */ bne $v1, $at, .L800A6EDC -.L800A6EBC: -/* 0A7ABC 800A6EBC 3C01C348 */ li $at, 0xC3480000 # -200.000000 -/* 0A7AC0 800A6EC0 44812000 */ mtc1 $at, $f4 -/* 0A7AC4 800A6EC4 8D190000 */ lw $t9, ($t0) -/* 0A7AC8 800A6EC8 00000000 */ nop -/* 0A7ACC 800A6ECC E72401CC */ swc1 $f4, 0x1cc($t9) -/* 0A7AD0 800A6ED0 8D090000 */ lw $t1, ($t0) -/* 0A7AD4 800A6ED4 10000015 */ b .L800A6F2C -/* 0A7AD8 800A6ED8 A12001DD */ sb $zero, 0x1dd($t1) -.L800A6EDC: -/* 0A7ADC 800A6EDC 84C20000 */ lh $v0, ($a2) -/* 0A7AE0 800A6EE0 24010002 */ li $at, 2 -/* 0A7AE4 800A6EE4 10400003 */ beqz $v0, .L800A6EF4 -/* 0A7AE8 800A6EE8 240AFFB0 */ li $t2, -80 -/* 0A7AEC 800A6EEC 14410008 */ bne $v0, $at, .L800A6F10 -/* 0A7AF0 800A6EF0 240D0050 */ li $t5, 80 -.L800A6EF4: -/* 0A7AF4 800A6EF4 8D0B0000 */ lw $t3, ($t0) -/* 0A7AF8 800A6EF8 3C01C348 */ li $at, 0xC3480000 # -200.000000 -/* 0A7AFC 800A6EFC A16A01DD */ sb $t2, 0x1dd($t3) -/* 0A7B00 800A6F00 8D0C0000 */ lw $t4, ($t0) -/* 0A7B04 800A6F04 44813000 */ mtc1 $at, $f6 -/* 0A7B08 800A6F08 10000008 */ b .L800A6F2C -/* 0A7B0C 800A6F0C E58601CC */ swc1 $f6, 0x1cc($t4) -.L800A6F10: -/* 0A7B10 800A6F10 8D0E0000 */ lw $t6, ($t0) -/* 0A7B14 800A6F14 3C01C220 */ li $at, 0xC2200000 # -40.000000 -/* 0A7B18 800A6F18 A1CD01DD */ sb $t5, 0x1dd($t6) -/* 0A7B1C 800A6F1C 8D0F0000 */ lw $t7, ($t0) -/* 0A7B20 800A6F20 44814000 */ mtc1 $at, $f8 -/* 0A7B24 800A6F24 00000000 */ nop -/* 0A7B28 800A6F28 E5E801CC */ swc1 $f8, 0x1cc($t7) -.L800A6F2C: -/* 0A7B2C 800A6F2C 8D190000 */ lw $t9, ($t0) -/* 0A7B30 800A6F30 24180001 */ li $t8, 1 -/* 0A7B34 800A6F34 10000091 */ b .L800A717C -/* 0A7B38 800A6F38 A33801DA */ sb $t8, 0x1da($t9) -glabel L800A6F3C -/* 0A7B3C 800A6F3C 00051880 */ sll $v1, $a1, 2 -/* 0A7B40 800A6F40 00651823 */ subu $v1, $v1, $a1 -/* 0A7B44 800A6F44 804401DD */ lb $a0, 0x1dd($v0) -/* 0A7B48 800A6F48 00031880 */ sll $v1, $v1, 2 -/* 0A7B4C 800A6F4C 00651821 */ addu $v1, $v1, $a1 -/* 0A7B50 800A6F50 00834823 */ subu $t1, $a0, $v1 -/* 0A7B54 800A6F54 44895000 */ mtc1 $t1, $f10 -/* 0A7B58 800A6F58 C44001CC */ lwc1 $f0, 0x1cc($v0) -/* 0A7B5C 800A6F5C 46805420 */ cvt.s.w $f16, $f10 -/* 0A7B60 800A6F60 4610003C */ c.lt.s $f0, $f16 -/* 0A7B64 800A6F64 00000000 */ nop -/* 0A7B68 800A6F68 45000007 */ bc1f .L800A6F88 -/* 0A7B6C 800A6F6C 00000000 */ nop -/* 0A7B70 800A6F70 44839000 */ mtc1 $v1, $f18 -/* 0A7B74 800A6F74 00000000 */ nop -/* 0A7B78 800A6F78 46809120 */ cvt.s.w $f4, $f18 -/* 0A7B7C 800A6F7C 46040180 */ add.s $f6, $f0, $f4 -/* 0A7B80 800A6F80 10000019 */ b .L800A6FE8 -/* 0A7B84 800A6F84 E44601CC */ swc1 $f6, 0x1cc($v0) -.L800A6F88: -/* 0A7B88 800A6F88 44844000 */ mtc1 $a0, $f8 -/* 0A7B8C 800A6F8C 240A0002 */ li $t2, 2 -/* 0A7B90 800A6F90 468042A0 */ cvt.s.w $f10, $f8 -/* 0A7B94 800A6F94 240CFF88 */ li $t4, -120 -/* 0A7B98 800A6F98 3C0E8012 */ lui $t6, %hi(gHUDVoiceSoundMask) # $t6, 0x8012 -/* 0A7B9C 800A6F9C E44A01CC */ swc1 $f10, 0x1cc($v0) -/* 0A7BA0 800A6FA0 8D0B0000 */ lw $t3, ($t0) -/* 0A7BA4 800A6FA4 3C0F8012 */ lui $t7, %hi(D_80126D71) # $t7, 0x8012 -/* 0A7BA8 800A6FA8 A16A01DA */ sb $t2, 0x1da($t3) -/* 0A7BAC 800A6FAC 8D0D0000 */ lw $t5, ($t0) -/* 0A7BB0 800A6FB0 00000000 */ nop -/* 0A7BB4 800A6FB4 A1AC01DB */ sb $t4, 0x1db($t5) -/* 0A7BB8 800A6FB8 8DCE6D40 */ lw $t6, %lo(gHUDVoiceSoundMask)($t6) -/* 0A7BBC 800A6FBC 00000000 */ nop -/* 0A7BC0 800A6FC0 15C00009 */ bnez $t6, .L800A6FE8 -/* 0A7BC4 800A6FC4 00000000 */ nop -/* 0A7BC8 800A6FC8 91EF6D71 */ lbu $t7, %lo(D_80126D71)($t7) -/* 0A7BCC 800A6FCC 00000000 */ nop -/* 0A7BD0 800A6FD0 15E00005 */ bnez $t7, .L800A6FE8 -/* 0A7BD4 800A6FD4 00000000 */ nop -/* 0A7BD8 800A6FD8 0C029B6D */ jal play_time_trial_end_message -/* 0A7BDC 800A6FDC 00C02025 */ move $a0, $a2 -/* 0A7BE0 800A6FE0 3C088012 */ lui $t0, %hi(gCurrentHud) # $t0, 0x8012 -/* 0A7BE4 800A6FE4 25086CDC */ addiu $t0, %lo(gCurrentHud) # addiu $t0, $t0, 0x6cdc -.L800A6FE8: -/* 0A7BE8 800A6FE8 8D070000 */ lw $a3, ($t0) -/* 0A7BEC 800A6FEC 3C048012 */ lui $a0, %hi(gHUDCurrDisplayList) # $a0, 0x8012 -/* 0A7BF0 800A6FF0 3C058012 */ lui $a1, %hi(gHUDCurrMatrix) # $a1, 0x8012 -/* 0A7BF4 800A6FF4 3C068012 */ lui $a2, %hi(gHUDCurrVertex) # $a2, 0x8012 -/* 0A7BF8 800A6FF8 24C66D04 */ addiu $a2, %lo(gHUDCurrVertex) # addiu $a2, $a2, 0x6d04 -/* 0A7BFC 800A6FFC 24A56D00 */ addiu $a1, %lo(gHUDCurrMatrix) # addiu $a1, $a1, 0x6d00 -/* 0A7C00 800A7000 24846CFC */ addiu $a0, %lo(gHUDCurrDisplayList) # addiu $a0, $a0, 0x6cfc -/* 0A7C04 800A7004 0C02A980 */ jal func_800AA600 -/* 0A7C08 800A7008 24E701C0 */ addiu $a3, $a3, 0x1c0 -/* 0A7C0C 800A700C 1000005C */ b .L800A7180 -/* 0A7C10 800A7010 8FBF0014 */ lw $ra, 0x14($sp) -glabel L800A7014 -/* 0A7C14 800A7014 805801DB */ lb $t8, 0x1db($v0) -/* 0A7C18 800A7018 240A0003 */ li $t2, 3 -/* 0A7C1C 800A701C 0305C821 */ addu $t9, $t8, $a1 -/* 0A7C20 800A7020 A05901DB */ sb $t9, 0x1db($v0) -/* 0A7C24 800A7024 8D020000 */ lw $v0, ($t0) -/* 0A7C28 800A7028 3C038012 */ lui $v1, %hi(gHUDNumPlayers) # $v1, 0x8012 -/* 0A7C2C 800A702C 804901DB */ lb $t1, 0x1db($v0) -/* 0A7C30 800A7030 24040016 */ li $a0, 22 -/* 0A7C34 800A7034 29210078 */ slti $at, $t1, 0x78 -/* 0A7C38 800A7038 1420001C */ bnez $at, .L800A70AC -/* 0A7C3C 800A703C 00000000 */ nop -/* 0A7C40 800A7040 A04A01DA */ sb $t2, 0x1da($v0) -/* 0A7C44 800A7044 8C636D0C */ lw $v1, %lo(gHUDNumPlayers)($v1) -/* 0A7C48 800A7048 24010001 */ li $at, 1 -/* 0A7C4C 800A704C 10600003 */ beqz $v1, .L800A705C -/* 0A7C50 800A7050 240B0038 */ li $t3, 56 -/* 0A7C54 800A7054 14610004 */ bne $v1, $at, .L800A7068 -/* 0A7C58 800A7058 00000000 */ nop -.L800A705C: -/* 0A7C5C 800A705C 8D0C0000 */ lw $t4, ($t0) -/* 0A7C60 800A7060 1000000D */ b .L800A7098 -/* 0A7C64 800A7064 A18B01DD */ sb $t3, 0x1dd($t4) -.L800A7068: -/* 0A7C68 800A7068 84C20000 */ lh $v0, ($a2) -/* 0A7C6C 800A706C 24010002 */ li $at, 2 -/* 0A7C70 800A7070 10400003 */ beqz $v0, .L800A7080 -/* 0A7C74 800A7074 240D0038 */ li $t5, 56 -/* 0A7C78 800A7078 14410004 */ bne $v0, $at, .L800A708C -/* 0A7C7C 800A707C 00000000 */ nop -.L800A7080: -/* 0A7C80 800A7080 8D0E0000 */ lw $t6, ($t0) -/* 0A7C84 800A7084 10000004 */ b .L800A7098 -/* 0A7C88 800A7088 A1CD01DD */ sb $t5, 0x1dd($t6) -.L800A708C: -/* 0A7C8C 800A708C 8D180000 */ lw $t8, ($t0) -/* 0A7C90 800A7090 240FFFD8 */ li $t7, -40 -/* 0A7C94 800A7094 A30F01DD */ sb $t7, 0x1dd($t8) -.L800A7098: -/* 0A7C98 800A7098 0C000741 */ jal play_sound_global -/* 0A7C9C 800A709C 00002825 */ move $a1, $zero -/* 0A7CA0 800A70A0 3C028012 */ lui $v0, %hi(gCurrentHud) # $v0, 0x8012 -/* 0A7CA4 800A70A4 8C426CDC */ lw $v0, %lo(gCurrentHud)($v0) -/* 0A7CA8 800A70A8 00000000 */ nop -.L800A70AC: -/* 0A7CAC 800A70AC 3C048012 */ lui $a0, %hi(gHUDCurrDisplayList) # $a0, 0x8012 -/* 0A7CB0 800A70B0 3C058012 */ lui $a1, %hi(gHUDCurrMatrix) # $a1, 0x8012 -/* 0A7CB4 800A70B4 3C068012 */ lui $a2, %hi(gHUDCurrVertex) # $a2, 0x8012 -/* 0A7CB8 800A70B8 24C66D04 */ addiu $a2, %lo(gHUDCurrVertex) # addiu $a2, $a2, 0x6d04 -/* 0A7CBC 800A70BC 24A56D00 */ addiu $a1, %lo(gHUDCurrMatrix) # addiu $a1, $a1, 0x6d00 -/* 0A7CC0 800A70C0 24846CFC */ addiu $a0, %lo(gHUDCurrDisplayList) # addiu $a0, $a0, 0x6cfc -/* 0A7CC4 800A70C4 0C02A980 */ jal func_800AA600 -/* 0A7CC8 800A70C8 244701C0 */ addiu $a3, $v0, 0x1c0 -/* 0A7CCC 800A70CC 1000002C */ b .L800A7180 -/* 0A7CD0 800A70D0 8FBF0014 */ lw $ra, 0x14($sp) -glabel L800A70D4 -/* 0A7CD4 800A70D4 0005C880 */ sll $t9, $a1, 2 -/* 0A7CD8 800A70D8 0325C823 */ subu $t9, $t9, $a1 -/* 0A7CDC 800A70DC 0019C880 */ sll $t9, $t9, 2 -/* 0A7CE0 800A70E0 0325C821 */ addu $t9, $t9, $a1 -/* 0A7CE4 800A70E4 44999000 */ mtc1 $t9, $f18 -/* 0A7CE8 800A70E8 C45001CC */ lwc1 $f16, 0x1cc($v0) -/* 0A7CEC 800A70EC 46809120 */ cvt.s.w $f4, $f18 -/* 0A7CF0 800A70F0 3C058012 */ lui $a1, %hi(gHUDCurrMatrix) # $a1, 0x8012 -/* 0A7CF4 800A70F4 3C048012 */ lui $a0, %hi(gHUDCurrDisplayList) # $a0, 0x8012 -/* 0A7CF8 800A70F8 46048181 */ sub.s $f6, $f16, $f4 -/* 0A7CFC 800A70FC 3C068012 */ lui $a2, %hi(gHUDCurrVertex) # $a2, 0x8012 -/* 0A7D00 800A7100 E44601CC */ swc1 $f6, 0x1cc($v0) -/* 0A7D04 800A7104 8D020000 */ lw $v0, ($t0) -/* 0A7D08 800A7108 240A0004 */ li $t2, 4 -/* 0A7D0C 800A710C 804901DD */ lb $t1, 0x1dd($v0) -/* 0A7D10 800A7110 C44801CC */ lwc1 $f8, 0x1cc($v0) -/* 0A7D14 800A7114 44895000 */ mtc1 $t1, $f10 -/* 0A7D18 800A7118 24C66D04 */ addiu $a2, %lo(gHUDCurrVertex) # addiu $a2, $a2, 0x6d04 -/* 0A7D1C 800A711C 468054A0 */ cvt.s.w $f18, $f10 -/* 0A7D20 800A7120 24846CFC */ addiu $a0, %lo(gHUDCurrDisplayList) # addiu $a0, $a0, 0x6cfc -/* 0A7D24 800A7124 24A56D00 */ addiu $a1, %lo(gHUDCurrMatrix) # addiu $a1, $a1, 0x6d00 -/* 0A7D28 800A7128 4612403C */ c.lt.s $f8, $f18 -/* 0A7D2C 800A712C 00000000 */ nop -/* 0A7D30 800A7130 45000005 */ bc1f .L800A7148 -/* 0A7D34 800A7134 00000000 */ nop -/* 0A7D38 800A7138 A04A01DA */ sb $t2, 0x1da($v0) -/* 0A7D3C 800A713C 3C028012 */ lui $v0, %hi(gCurrentHud) # $v0, 0x8012 -/* 0A7D40 800A7140 8C426CDC */ lw $v0, %lo(gCurrentHud)($v0) -/* 0A7D44 800A7144 00000000 */ nop -.L800A7148: -/* 0A7D48 800A7148 0C02A980 */ jal func_800AA600 -/* 0A7D4C 800A714C 244701C0 */ addiu $a3, $v0, 0x1c0 -/* 0A7D50 800A7150 1000000B */ b .L800A7180 -/* 0A7D54 800A7154 8FBF0014 */ lw $ra, 0x14($sp) -glabel L800A7158 -/* 0A7D58 800A7158 3C03800E */ lui $v1, %hi(D_800E2770) # $v1, 0x800e -/* 0A7D5C 800A715C 24632770 */ addiu $v1, %lo(D_800E2770) # addiu $v1, $v1, 0x2770 -/* 0A7D60 800A7160 240BFFFF */ li $t3, -1 -/* 0A7D64 800A7164 A06B0003 */ sb $t3, 3($v1) -/* 0A7D68 800A7168 240C0005 */ li $t4, 5 -/* 0A7D6C 800A716C A04C01DA */ sb $t4, 0x1da($v0) -/* 0A7D70 800A7170 8D0D0000 */ lw $t5, ($t0) -/* 0A7D74 800A7174 00000000 */ nop -/* 0A7D78 800A7178 A1A001DB */ sb $zero, 0x1db($t5) -.L800A717C: -/* 0A7D7C 800A717C 8FBF0014 */ lw $ra, 0x14($sp) -.L800A7180: -/* 0A7D80 800A7180 27BD0018 */ addiu $sp, $sp, 0x18 -/* 0A7D84 800A7184 03E00008 */ jr $ra -/* 0A7D88 800A7188 00000000 */ nop - diff --git a/asm/non_matchings/game_ui/func_800A718C.s b/asm/non_matchings/game_ui/func_800A718C.s deleted file mode 100644 index 23d481d4..00000000 --- a/asm/non_matchings/game_ui/func_800A718C.s +++ /dev/null @@ -1,190 +0,0 @@ -glabel func_800A718C -/* 0A7D8C 800A718C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 0A7D90 800A7190 AFBF0014 */ sw $ra, 0x14($sp) -/* 0A7D94 800A7194 0C01BAA4 */ jal get_settings -/* 0A7D98 800A7198 AFA40030 */ sw $a0, 0x30($sp) -/* 0A7D9C 800A719C 3C0E8000 */ lui $t6, %hi(osTvType) # $t6, 0x8000 -/* 0A7DA0 800A71A0 8DCE0300 */ lw $t6, %lo(osTvType)($t6) -/* 0A7DA4 800A71A4 00402025 */ move $a0, $v0 -/* 0A7DA8 800A71A8 15C00003 */ bnez $t6, .L800A71B8 -/* 0A7DAC 800A71AC 240F0286 */ li $t7, 646 -/* 0A7DB0 800A71B0 10000003 */ b .L800A71C0 -/* 0A7DB4 800A71B4 AFAF0020 */ sw $t7, 0x20($sp) -.L800A71B8: -/* 0A7DB8 800A71B8 24180348 */ li $t8, 840 -/* 0A7DBC 800A71BC AFB80020 */ sw $t8, 0x20($sp) -.L800A71C0: -/* 0A7DC0 800A71C0 8C590010 */ lw $t9, 0x10($v0) -/* 0A7DC4 800A71C4 00000000 */ nop -/* 0A7DC8 800A71C8 332A0004 */ andi $t2, $t9, 4 -/* 0A7DCC 800A71CC 11400004 */ beqz $t2, .L800A71E0 -/* 0A7DD0 800A71D0 3C0C8012 */ lui $t4, %hi(gCurrentHud) # $t4, 0x8012 -/* 0A7DD4 800A71D4 8D8C6CDC */ lw $t4, %lo(gCurrentHud)($t4) -/* 0A7DD8 800A71D8 240B0045 */ li $t3, 69 -/* 0A7DDC 800A71DC A58B0266 */ sh $t3, 0x266($t4) -.L800A71E0: -/* 0A7DE0 800A71E0 0C007910 */ jal func_8001E440 -/* 0A7DE4 800A71E4 AFA4001C */ sw $a0, 0x1c($sp) -/* 0A7DE8 800A71E8 8FA4001C */ lw $a0, 0x1c($sp) -/* 0A7DEC 800A71EC 2401000A */ li $at, 10 -/* 0A7DF0 800A71F0 1441000D */ bne $v0, $at, .L800A7228 -/* 0A7DF4 800A71F4 00000000 */ nop -/* 0A7DF8 800A71F8 0C006B95 */ jal func_8001AE54 -/* 0A7DFC 800A71FC AFA4001C */ sw $a0, 0x1c($sp) -/* 0A7E00 800A7200 8FAD0020 */ lw $t5, 0x20($sp) -/* 0A7E04 800A7204 8FA4001C */ lw $a0, 0x1c($sp) -/* 0A7E08 800A7208 004D082B */ sltu $at, $v0, $t5 -/* 0A7E0C 800A720C 10200006 */ beqz $at, .L800A7228 -/* 0A7E10 800A7210 00000000 */ nop -/* 0A7E14 800A7214 8C8E0000 */ lw $t6, ($a0) -/* 0A7E18 800A7218 00000000 */ nop -/* 0A7E1C 800A721C 85C30000 */ lh $v1, ($t6) -/* 0A7E20 800A7220 1000001D */ b .L800A7298 -/* 0A7E24 800A7224 2463FFFF */ addiu $v1, $v1, -1 -.L800A7228: -/* 0A7E28 800A7228 8C8F0000 */ lw $t7, ($a0) -/* 0A7E2C 800A722C 00000000 */ nop -/* 0A7E30 800A7230 85E30000 */ lh $v1, ($t7) -/* 0A7E34 800A7234 0C007910 */ jal func_8001E440 -/* 0A7E38 800A7238 AFA3002C */ sw $v1, 0x2c($sp) -/* 0A7E3C 800A723C 8FA3002C */ lw $v1, 0x2c($sp) -/* 0A7E40 800A7240 2401000A */ li $at, 10 -/* 0A7E44 800A7244 14410014 */ bne $v0, $at, .L800A7298 -/* 0A7E48 800A7248 00000000 */ nop -/* 0A7E4C 800A724C 0C006B95 */ jal func_8001AE54 -/* 0A7E50 800A7250 AFA3002C */ sw $v1, 0x2c($sp) -/* 0A7E54 800A7254 8FB80020 */ lw $t8, 0x20($sp) -/* 0A7E58 800A7258 8FA3002C */ lw $v1, 0x2c($sp) -/* 0A7E5C 800A725C 27190008 */ addiu $t9, $t8, 8 -/* 0A7E60 800A7260 0059082B */ sltu $at, $v0, $t9 -/* 0A7E64 800A7264 1020000C */ beqz $at, .L800A7298 -/* 0A7E68 800A7268 00000000 */ nop -/* 0A7E6C 800A726C 3C058012 */ lui $a1, %hi(D_80126D44) # $a1, 0x8012 -/* 0A7E70 800A7270 24A56D44 */ addiu $a1, %lo(D_80126D44) # addiu $a1, $a1, 0x6d44 -/* 0A7E74 800A7274 8CAA0000 */ lw $t2, ($a1) -/* 0A7E78 800A7278 00000000 */ nop -/* 0A7E7C 800A727C 15400006 */ bnez $t2, .L800A7298 -/* 0A7E80 800A7280 00000000 */ nop -/* 0A7E84 800A7284 240400FE */ li $a0, 254 -/* 0A7E88 800A7288 0C000741 */ jal play_sound_global -/* 0A7E8C 800A728C AFA3002C */ sw $v1, 0x2c($sp) -/* 0A7E90 800A7290 8FA3002C */ lw $v1, 0x2c($sp) -/* 0A7E94 800A7294 00000000 */ nop -.L800A7298: -/* 0A7E98 800A7298 04610002 */ bgez $v1, .L800A72A4 -/* 0A7E9C 800A729C 2409000A */ li $t1, 10 -/* 0A7EA0 800A72A0 00001825 */ move $v1, $zero -.L800A72A4: -/* 0A7EA4 800A72A4 0069001A */ div $zero, $v1, $t1 -/* 0A7EA8 800A72A8 15200002 */ bnez $t1, .L800A72B4 -/* 0A7EAC 800A72AC 00000000 */ nop -/* 0A7EB0 800A72B0 0007000D */ break 7 -.L800A72B4: -/* 0A7EB4 800A72B4 2401FFFF */ li $at, -1 -/* 0A7EB8 800A72B8 15210004 */ bne $t1, $at, .L800A72CC -/* 0A7EBC 800A72BC 3C018000 */ lui $at, 0x8000 -/* 0A7EC0 800A72C0 14610002 */ bne $v1, $at, .L800A72CC -/* 0A7EC4 800A72C4 00000000 */ nop -/* 0A7EC8 800A72C8 0006000D */ break 6 -.L800A72CC: -/* 0A7ECC 800A72CC 00001012 */ mflo $v0 -/* 0A7ED0 800A72D0 1040001D */ beqz $v0, .L800A7348 -/* 0A7ED4 800A72D4 00000000 */ nop -/* 0A7ED8 800A72D8 0069001A */ div $zero, $v1, $t1 -/* 0A7EDC 800A72DC 3C088012 */ lui $t0, %hi(gCurrentHud) # $t0, 0x8012 -/* 0A7EE0 800A72E0 25086CDC */ addiu $t0, %lo(gCurrentHud) # addiu $t0, $t0, 0x6cdc -/* 0A7EE4 800A72E4 8D0B0000 */ lw $t3, ($t0) -/* 0A7EE8 800A72E8 3C048012 */ lui $a0, %hi(gHUDCurrDisplayList) # $a0, 0x8012 -/* 0A7EEC 800A72EC A56202B8 */ sh $v0, 0x2b8($t3) -/* 0A7EF0 800A72F0 8D0D0000 */ lw $t5, ($t0) -/* 0A7EF4 800A72F4 15200002 */ bnez $t1, .L800A7300 -/* 0A7EF8 800A72F8 00000000 */ nop -/* 0A7EFC 800A72FC 0007000D */ break 7 -.L800A7300: -/* 0A7F00 800A7300 2401FFFF */ li $at, -1 -/* 0A7F04 800A7304 15210004 */ bne $t1, $at, .L800A7318 -/* 0A7F08 800A7308 3C018000 */ lui $at, 0x8000 -/* 0A7F0C 800A730C 14610002 */ bne $v1, $at, .L800A7318 -/* 0A7F10 800A7310 00000000 */ nop -/* 0A7F14 800A7314 0006000D */ break 6 -.L800A7318: -/* 0A7F18 800A7318 3C058012 */ lui $a1, %hi(gHUDCurrMatrix) # $a1, 0x8012 -/* 0A7F1C 800A731C 3C068012 */ lui $a2, %hi(gHUDCurrVertex) # $a2, 0x8012 -/* 0A7F20 800A7320 24C66D04 */ addiu $a2, %lo(gHUDCurrVertex) # addiu $a2, $a2, 0x6d04 -/* 0A7F24 800A7324 24A56D00 */ addiu $a1, %lo(gHUDCurrMatrix) # addiu $a1, $a1, 0x6d00 -/* 0A7F28 800A7328 24846CFC */ addiu $a0, %lo(gHUDCurrDisplayList) # addiu $a0, $a0, 0x6cfc -/* 0A7F2C 800A732C 00006010 */ mfhi $t4 -/* 0A7F30 800A7330 A5AC02D8 */ sh $t4, 0x2d8($t5) -/* 0A7F34 800A7334 8D070000 */ lw $a3, ($t0) -/* 0A7F38 800A7338 0C02A980 */ jal func_800AA600 -/* 0A7F3C 800A733C 24E702C0 */ addiu $a3, $a3, 0x2c0 -/* 0A7F40 800A7340 10000010 */ b .L800A7384 -/* 0A7F44 800A7344 00000000 */ nop -.L800A7348: -/* 0A7F48 800A7348 0069001A */ div $zero, $v1, $t1 -/* 0A7F4C 800A734C 3C0F8012 */ lui $t7, %hi(gCurrentHud) # $t7, 0x8012 -/* 0A7F50 800A7350 8DEF6CDC */ lw $t7, %lo(gCurrentHud)($t7) -/* 0A7F54 800A7354 15200002 */ bnez $t1, .L800A7360 -/* 0A7F58 800A7358 00000000 */ nop -/* 0A7F5C 800A735C 0007000D */ break 7 -.L800A7360: -/* 0A7F60 800A7360 2401FFFF */ li $at, -1 -/* 0A7F64 800A7364 15210004 */ bne $t1, $at, .L800A7378 -/* 0A7F68 800A7368 3C018000 */ lui $at, 0x8000 -/* 0A7F6C 800A736C 14610002 */ bne $v1, $at, .L800A7378 -/* 0A7F70 800A7370 00000000 */ nop -/* 0A7F74 800A7374 0006000D */ break 6 -.L800A7378: -/* 0A7F78 800A7378 00007010 */ mfhi $t6 -/* 0A7F7C 800A737C A5EE02B8 */ sh $t6, 0x2b8($t7) -/* 0A7F80 800A7380 00000000 */ nop -.L800A7384: -/* 0A7F84 800A7384 3C078012 */ lui $a3, %hi(gCurrentHud) # $a3, 0x8012 -/* 0A7F88 800A7388 8CE76CDC */ lw $a3, %lo(gCurrentHud)($a3) -/* 0A7F8C 800A738C 3C048012 */ lui $a0, %hi(gHUDCurrDisplayList) # $a0, 0x8012 -/* 0A7F90 800A7390 3C058012 */ lui $a1, %hi(gHUDCurrMatrix) # $a1, 0x8012 -/* 0A7F94 800A7394 3C068012 */ lui $a2, %hi(gHUDCurrVertex) # $a2, 0x8012 -/* 0A7F98 800A7398 24C66D04 */ addiu $a2, %lo(gHUDCurrVertex) # addiu $a2, $a2, 0x6d04 -/* 0A7F9C 800A739C 24A56D00 */ addiu $a1, %lo(gHUDCurrMatrix) # addiu $a1, $a1, 0x6d00 -/* 0A7FA0 800A73A0 24846CFC */ addiu $a0, %lo(gHUDCurrDisplayList) # addiu $a0, $a0, 0x6cfc -/* 0A7FA4 800A73A4 0C02A980 */ jal func_800AA600 -/* 0A7FA8 800A73A8 24E702A0 */ addiu $a3, $a3, 0x2a0 -/* 0A7FAC 800A73AC 0C019826 */ jal set_viewport_tv_type -/* 0A7FB0 800A73B0 24040001 */ li $a0, 1 -/* 0A7FB4 800A73B4 3C188000 */ lui $t8, %hi(osTvType) # $t8, 0x8000 -/* 0A7FB8 800A73B8 8F180300 */ lw $t8, %lo(osTvType)($t8) -/* 0A7FBC 800A73BC 00000000 */ nop -/* 0A7FC0 800A73C0 17000003 */ bnez $t8, .L800A73D0 -/* 0A7FC4 800A73C4 00000000 */ nop -/* 0A7FC8 800A73C8 0C01EFC7 */ jal func_8007BF1C -/* 0A7FCC 800A73CC 24040001 */ li $a0, 1 -.L800A73D0: -/* 0A7FD0 800A73D0 3C078012 */ lui $a3, %hi(gCurrentHud) # $a3, 0x8012 -/* 0A7FD4 800A73D4 8CE76CDC */ lw $a3, %lo(gCurrentHud)($a3) -/* 0A7FD8 800A73D8 3C048012 */ lui $a0, %hi(gHUDCurrDisplayList) # $a0, 0x8012 -/* 0A7FDC 800A73DC 3C058012 */ lui $a1, %hi(gHUDCurrMatrix) # $a1, 0x8012 -/* 0A7FE0 800A73E0 3C068012 */ lui $a2, %hi(gHUDCurrVertex) # $a2, 0x8012 -/* 0A7FE4 800A73E4 24C66D04 */ addiu $a2, %lo(gHUDCurrVertex) # addiu $a2, $a2, 0x6d04 -/* 0A7FE8 800A73E8 24A56D00 */ addiu $a1, %lo(gHUDCurrMatrix) # addiu $a1, $a1, 0x6d00 -/* 0A7FEC 800A73EC 24846CFC */ addiu $a0, %lo(gHUDCurrDisplayList) # addiu $a0, $a0, 0x6cfc -/* 0A7FF0 800A73F0 0C02A980 */ jal func_800AA600 -/* 0A7FF4 800A73F4 24E70260 */ addiu $a3, $a3, 0x260 -/* 0A7FF8 800A73F8 0C01EFC7 */ jal func_8007BF1C -/* 0A7FFC 800A73FC 00002025 */ move $a0, $zero -/* 0A8000 800A7400 0C019826 */ jal set_viewport_tv_type -/* 0A8004 800A7404 00002025 */ move $a0, $zero -/* 0A8008 800A7408 3C078012 */ lui $a3, %hi(gCurrentHud) # $a3, 0x8012 -/* 0A800C 800A740C 8CE76CDC */ lw $a3, %lo(gCurrentHud)($a3) -/* 0A8010 800A7410 3C048012 */ lui $a0, %hi(gHUDCurrDisplayList) # $a0, 0x8012 -/* 0A8014 800A7414 3C058012 */ lui $a1, %hi(gHUDCurrMatrix) # $a1, 0x8012 -/* 0A8018 800A7418 3C068012 */ lui $a2, %hi(gHUDCurrVertex) # $a2, 0x8012 -/* 0A801C 800A741C 24C66D04 */ addiu $a2, %lo(gHUDCurrVertex) # addiu $a2, $a2, 0x6d04 -/* 0A8020 800A7420 24A56D00 */ addiu $a1, %lo(gHUDCurrMatrix) # addiu $a1, $a1, 0x6d00 -/* 0A8024 800A7424 24846CFC */ addiu $a0, %lo(gHUDCurrDisplayList) # addiu $a0, $a0, 0x6cfc -/* 0A8028 800A7428 0C02A980 */ jal func_800AA600 -/* 0A802C 800A742C 24E70280 */ addiu $a3, $a3, 0x280 -/* 0A8030 800A7430 8FBF0014 */ lw $ra, 0x14($sp) -/* 0A8034 800A7434 27BD0030 */ addiu $sp, $sp, 0x30 -/* 0A8038 800A7438 03E00008 */ jr $ra -/* 0A803C 800A743C 00000000 */ nop - diff --git a/asm/non_matchings/game_ui/func_800A7FBC.s b/asm/non_matchings/game_ui/func_800A7FBC.s deleted file mode 100644 index 6e8264c8..00000000 --- a/asm/non_matchings/game_ui/func_800A7FBC.s +++ /dev/null @@ -1,270 +0,0 @@ -glabel func_800A7FBC -/* 0A8BBC 800A7FBC 27BDFF80 */ addiu $sp, $sp, -0x80 -/* 0A8BC0 800A7FC0 44842000 */ mtc1 $a0, $f4 -/* 0A8BC4 800A7FC4 44854000 */ mtc1 $a1, $f8 -/* 0A8BC8 800A7FC8 3C013F80 */ li $at, 0x3F800000 # 1.000000 -/* 0A8BCC 800A7FCC 468021A0 */ cvt.s.w $f6, $f4 -/* 0A8BD0 800A7FD0 44818000 */ mtc1 $at, $f16 -/* 0A8BD4 800A7FD4 44809000 */ mtc1 $zero, $f18 -/* 0A8BD8 800A7FD8 468042A0 */ cvt.s.w $f10, $f8 -/* 0A8BDC 800A7FDC 8FAE0094 */ lw $t6, 0x94($sp) -/* 0A8BE0 800A7FE0 AFBF0034 */ sw $ra, 0x34($sp) -/* 0A8BE4 800A7FE4 AFB50030 */ sw $s5, 0x30($sp) -/* 0A8BE8 800A7FE8 AFB4002C */ sw $s4, 0x2c($sp) -/* 0A8BEC 800A7FEC AFB30028 */ sw $s3, 0x28($sp) -/* 0A8BF0 800A7FF0 AFB20024 */ sw $s2, 0x24($sp) -/* 0A8BF4 800A7FF4 AFB10020 */ sw $s1, 0x20($sp) -/* 0A8BF8 800A7FF8 AFB0001C */ sw $s0, 0x1c($sp) -/* 0A8BFC 800A7FFC E7B50010 */ swc1 $f21, 0x10($sp) -/* 0A8C00 800A8000 E7B40014 */ swc1 $f20, 0x14($sp) -/* 0A8C04 800A8004 AFA60088 */ sw $a2, 0x88($sp) -/* 0A8C08 800A8008 AFA7008C */ sw $a3, 0x8c($sp) -/* 0A8C0C 800A800C E7A6006C */ swc1 $f6, 0x6c($sp) -/* 0A8C10 800A8010 E7AA0070 */ swc1 $f10, 0x70($sp) -/* 0A8C14 800A8014 A7A00064 */ sh $zero, 0x64($sp) -/* 0A8C18 800A8018 A7A00062 */ sh $zero, 0x62($sp) -/* 0A8C1C 800A801C A7A00060 */ sh $zero, 0x60($sp) -/* 0A8C20 800A8020 E7B00068 */ swc1 $f16, 0x68($sp) -/* 0A8C24 800A8024 15C0000A */ bnez $t6, .L800A8050 -/* 0A8C28 800A8028 E7B20074 */ swc1 $f18, 0x74($sp) -/* 0A8C2C 800A802C 240F000A */ li $t7, 10 -/* 0A8C30 800A8030 2418000B */ li $t8, 11 -/* 0A8C34 800A8034 2402000B */ li $v0, 11 -/* 0A8C38 800A8038 2403000A */ li $v1, 10 -/* 0A8C3C 800A803C AFAF0054 */ sw $t7, 0x54($sp) -/* 0A8C40 800A8040 24080002 */ li $t0, 2 -/* 0A8C44 800A8044 24140009 */ li $s4, 9 -/* 0A8C48 800A8048 10000009 */ b .L800A8070 -/* 0A8C4C 800A804C AFB80048 */ sw $t8, 0x48($sp) -.L800A8050: -/* 0A8C50 800A8050 24190007 */ li $t9, 7 -/* 0A8C54 800A8054 2409000C */ li $t1, 12 -/* 0A8C58 800A8058 2402000A */ li $v0, 10 -/* 0A8C5C 800A805C 24030008 */ li $v1, 8 -/* 0A8C60 800A8060 AFB90054 */ sw $t9, 0x54($sp) -/* 0A8C64 800A8064 00004025 */ move $t0, $zero -/* 0A8C68 800A8068 2414000A */ li $s4, 10 -/* 0A8C6C 800A806C AFA90048 */ sw $t1, 0x48($sp) -.L800A8070: -/* 0A8C70 800A8070 8FAA0088 */ lw $t2, 0x88($sp) -/* 0A8C74 800A8074 2415000A */ li $s5, 10 -/* 0A8C78 800A8078 0155001A */ div $zero, $t2, $s5 -/* 0A8C7C 800A807C 3C108012 */ lui $s0, %hi(gHUDCurrDisplayList) # $s0, 0x8012 -/* 0A8C80 800A8080 3C118012 */ lui $s1, %hi(gHUDCurrMatrix) # $s1, 0x8012 -/* 0A8C84 800A8084 3C128012 */ lui $s2, %hi(gHUDCurrVertex) # $s2, 0x8012 -/* 0A8C88 800A8088 26526D04 */ addiu $s2, %lo(gHUDCurrVertex) # addiu $s2, $s2, 0x6d04 -/* 0A8C8C 800A808C 26316D00 */ addiu $s1, %lo(gHUDCurrMatrix) # addiu $s1, $s1, 0x6d00 -/* 0A8C90 800A8090 26106CFC */ addiu $s0, %lo(gHUDCurrDisplayList) # addiu $s0, $s0, 0x6cfc -/* 0A8C94 800A8094 27B30060 */ addiu $s3, $sp, 0x60 -/* 0A8C98 800A8098 A7B40066 */ sh $s4, 0x66($sp) -/* 0A8C9C 800A809C 16A00002 */ bnez $s5, .L800A80A8 -/* 0A8CA0 800A80A0 00000000 */ nop -/* 0A8CA4 800A80A4 0007000D */ break 7 -.L800A80A8: -/* 0A8CA8 800A80A8 2401FFFF */ li $at, -1 -/* 0A8CAC 800A80AC 16A10004 */ bne $s5, $at, .L800A80C0 -/* 0A8CB0 800A80B0 3C018000 */ lui $at, 0x8000 -/* 0A8CB4 800A80B4 15410002 */ bne $t2, $at, .L800A80C0 -/* 0A8CB8 800A80B8 00000000 */ nop -/* 0A8CBC 800A80BC 0006000D */ break 6 -.L800A80C0: -/* 0A8CC0 800A80C0 02603825 */ move $a3, $s3 -/* 0A8CC4 800A80C4 02002025 */ move $a0, $s0 -/* 0A8CC8 800A80C8 02202825 */ move $a1, $s1 -/* 0A8CCC 800A80CC 02403025 */ move $a2, $s2 -/* 0A8CD0 800A80D0 AFA2005C */ sw $v0, 0x5c($sp) -/* 0A8CD4 800A80D4 AFA30058 */ sw $v1, 0x58($sp) -/* 0A8CD8 800A80D8 AFA80050 */ sw $t0, 0x50($sp) -/* 0A8CDC 800A80DC 00005812 */ mflo $t3 -/* 0A8CE0 800A80E0 A7AB0078 */ sh $t3, 0x78($sp) -/* 0A8CE4 800A80E4 0C02A980 */ jal func_800AA600 -/* 0A8CE8 800A80E8 00000000 */ nop -/* 0A8CEC 800A80EC 8FAC0088 */ lw $t4, 0x88($sp) -/* 0A8CF0 800A80F0 8FA2005C */ lw $v0, 0x5c($sp) -/* 0A8CF4 800A80F4 0195001A */ div $zero, $t4, $s5 -/* 0A8CF8 800A80F8 44822000 */ mtc1 $v0, $f4 -/* 0A8CFC 800A80FC C7A6006C */ lwc1 $f6, 0x6c($sp) -/* 0A8D00 800A8100 46802020 */ cvt.s.w $f0, $f4 -/* 0A8D04 800A8104 8FA30058 */ lw $v1, 0x58($sp) -/* 0A8D08 800A8108 8FA80050 */ lw $t0, 0x50($sp) -/* 0A8D0C 800A810C 46003200 */ add.s $f8, $f6, $f0 -/* 0A8D10 800A8110 E7A00044 */ swc1 $f0, 0x44($sp) -/* 0A8D14 800A8114 E7A8006C */ swc1 $f8, 0x6c($sp) -/* 0A8D18 800A8118 16A00002 */ bnez $s5, .L800A8124 -/* 0A8D1C 800A811C 00000000 */ nop -/* 0A8D20 800A8120 0007000D */ break 7 -.L800A8124: -/* 0A8D24 800A8124 2401FFFF */ li $at, -1 -/* 0A8D28 800A8128 16A10004 */ bne $s5, $at, .L800A813C -/* 0A8D2C 800A812C 3C018000 */ lui $at, 0x8000 -/* 0A8D30 800A8130 15810002 */ bne $t4, $at, .L800A813C -/* 0A8D34 800A8134 00000000 */ nop -/* 0A8D38 800A8138 0006000D */ break 6 -.L800A813C: -/* 0A8D3C 800A813C 02002025 */ move $a0, $s0 -/* 0A8D40 800A8140 02202825 */ move $a1, $s1 -/* 0A8D44 800A8144 02403025 */ move $a2, $s2 -/* 0A8D48 800A8148 02603825 */ move $a3, $s3 -/* 0A8D4C 800A814C 00006810 */ mfhi $t5 -/* 0A8D50 800A8150 A7AD0078 */ sh $t5, 0x78($sp) -/* 0A8D54 800A8154 0C02A980 */ jal func_800AA600 -/* 0A8D58 800A8158 00000000 */ nop -/* 0A8D5C 800A815C 8FA30058 */ lw $v1, 0x58($sp) -/* 0A8D60 800A8160 8FA80050 */ lw $t0, 0x50($sp) -/* 0A8D64 800A8164 44835000 */ mtc1 $v1, $f10 -/* 0A8D68 800A8168 44882000 */ mtc1 $t0, $f4 -/* 0A8D6C 800A816C 46805020 */ cvt.s.w $f0, $f10 -/* 0A8D70 800A8170 C7B0006C */ lwc1 $f16, 0x6c($sp) -/* 0A8D74 800A8174 C7A60070 */ lwc1 $f6, 0x70($sp) -/* 0A8D78 800A8178 46802520 */ cvt.s.w $f20, $f4 -/* 0A8D7C 800A817C 8FAE0048 */ lw $t6, 0x48($sp) -/* 0A8D80 800A8180 A7A00078 */ sh $zero, 0x78($sp) -/* 0A8D84 800A8184 46008480 */ add.s $f18, $f16, $f0 -/* 0A8D88 800A8188 E7A00040 */ swc1 $f0, 0x40($sp) -/* 0A8D8C 800A818C 46143200 */ add.s $f8, $f6, $f20 -/* 0A8D90 800A8190 E7B2006C */ swc1 $f18, 0x6c($sp) -/* 0A8D94 800A8194 E7A80070 */ swc1 $f8, 0x70($sp) -/* 0A8D98 800A8198 02002025 */ move $a0, $s0 -/* 0A8D9C 800A819C 02202825 */ move $a1, $s1 -/* 0A8DA0 800A81A0 02403025 */ move $a2, $s2 -/* 0A8DA4 800A81A4 02603825 */ move $a3, $s3 -/* 0A8DA8 800A81A8 0C02A980 */ jal func_800AA600 -/* 0A8DAC 800A81AC A7AE0066 */ sh $t6, 0x66($sp) -/* 0A8DB0 800A81B0 8FB8008C */ lw $t8, 0x8c($sp) -/* 0A8DB4 800A81B4 8FAF0054 */ lw $t7, 0x54($sp) -/* 0A8DB8 800A81B8 0315001A */ div $zero, $t8, $s5 -/* 0A8DBC 800A81BC 448F5000 */ mtc1 $t7, $f10 -/* 0A8DC0 800A81C0 C7B0006C */ lwc1 $f16, 0x6c($sp) -/* 0A8DC4 800A81C4 46805020 */ cvt.s.w $f0, $f10 -/* 0A8DC8 800A81C8 C7A40070 */ lwc1 $f4, 0x70($sp) -/* 0A8DCC 800A81CC A7B40066 */ sh $s4, 0x66($sp) -/* 0A8DD0 800A81D0 46008480 */ add.s $f18, $f16, $f0 -/* 0A8DD4 800A81D4 E7A00038 */ swc1 $f0, 0x38($sp) -/* 0A8DD8 800A81D8 46142181 */ sub.s $f6, $f4, $f20 -/* 0A8DDC 800A81DC E7B2006C */ swc1 $f18, 0x6c($sp) -/* 0A8DE0 800A81E0 E7A60070 */ swc1 $f6, 0x70($sp) -/* 0A8DE4 800A81E4 16A00002 */ bnez $s5, .L800A81F0 -/* 0A8DE8 800A81E8 00000000 */ nop -/* 0A8DEC 800A81EC 0007000D */ break 7 -.L800A81F0: -/* 0A8DF0 800A81F0 2401FFFF */ li $at, -1 -/* 0A8DF4 800A81F4 16A10004 */ bne $s5, $at, .L800A8208 -/* 0A8DF8 800A81F8 3C018000 */ lui $at, 0x8000 -/* 0A8DFC 800A81FC 17010002 */ bne $t8, $at, .L800A8208 -/* 0A8E00 800A8200 00000000 */ nop -/* 0A8E04 800A8204 0006000D */ break 6 -.L800A8208: -/* 0A8E08 800A8208 02002025 */ move $a0, $s0 -/* 0A8E0C 800A820C 02202825 */ move $a1, $s1 -/* 0A8E10 800A8210 02403025 */ move $a2, $s2 -/* 0A8E14 800A8214 02603825 */ move $a3, $s3 -/* 0A8E18 800A8218 0000C812 */ mflo $t9 -/* 0A8E1C 800A821C A7B90078 */ sh $t9, 0x78($sp) -/* 0A8E20 800A8220 0C02A980 */ jal func_800AA600 -/* 0A8E24 800A8224 00000000 */ nop -/* 0A8E28 800A8228 8FA9008C */ lw $t1, 0x8c($sp) -/* 0A8E2C 800A822C C7A8006C */ lwc1 $f8, 0x6c($sp) -/* 0A8E30 800A8230 0135001A */ div $zero, $t1, $s5 -/* 0A8E34 800A8234 C7AA0044 */ lwc1 $f10, 0x44($sp) -/* 0A8E38 800A8238 02002025 */ move $a0, $s0 -/* 0A8E3C 800A823C 460A4400 */ add.s $f16, $f8, $f10 -/* 0A8E40 800A8240 02202825 */ move $a1, $s1 -/* 0A8E44 800A8244 E7B0006C */ swc1 $f16, 0x6c($sp) -/* 0A8E48 800A8248 16A00002 */ bnez $s5, .L800A8254 -/* 0A8E4C 800A824C 00000000 */ nop -/* 0A8E50 800A8250 0007000D */ break 7 -.L800A8254: -/* 0A8E54 800A8254 2401FFFF */ li $at, -1 -/* 0A8E58 800A8258 16A10004 */ bne $s5, $at, .L800A826C -/* 0A8E5C 800A825C 3C018000 */ lui $at, 0x8000 -/* 0A8E60 800A8260 15210002 */ bne $t1, $at, .L800A826C -/* 0A8E64 800A8264 00000000 */ nop -/* 0A8E68 800A8268 0006000D */ break 6 -.L800A826C: -/* 0A8E6C 800A826C 02403025 */ move $a2, $s2 -/* 0A8E70 800A8270 02603825 */ move $a3, $s3 -/* 0A8E74 800A8274 00005010 */ mfhi $t2 -/* 0A8E78 800A8278 A7AA0078 */ sh $t2, 0x78($sp) -/* 0A8E7C 800A827C 0C02A980 */ jal func_800AA600 -/* 0A8E80 800A8280 00000000 */ nop -/* 0A8E84 800A8284 C7B2006C */ lwc1 $f18, 0x6c($sp) -/* 0A8E88 800A8288 C7A40040 */ lwc1 $f4, 0x40($sp) -/* 0A8E8C 800A828C C7A80070 */ lwc1 $f8, 0x70($sp) -/* 0A8E90 800A8290 8FAB0048 */ lw $t3, 0x48($sp) -/* 0A8E94 800A8294 46049180 */ add.s $f6, $f18, $f4 -/* 0A8E98 800A8298 A7A00078 */ sh $zero, 0x78($sp) -/* 0A8E9C 800A829C 46144280 */ add.s $f10, $f8, $f20 -/* 0A8EA0 800A82A0 E7A6006C */ swc1 $f6, 0x6c($sp) -/* 0A8EA4 800A82A4 E7AA0070 */ swc1 $f10, 0x70($sp) -/* 0A8EA8 800A82A8 02002025 */ move $a0, $s0 -/* 0A8EAC 800A82AC 02202825 */ move $a1, $s1 -/* 0A8EB0 800A82B0 02403025 */ move $a2, $s2 -/* 0A8EB4 800A82B4 02603825 */ move $a3, $s3 -/* 0A8EB8 800A82B8 0C02A980 */ jal func_800AA600 -/* 0A8EBC 800A82BC A7AB0066 */ sh $t3, 0x66($sp) -/* 0A8EC0 800A82C0 8FAC0090 */ lw $t4, 0x90($sp) -/* 0A8EC4 800A82C4 C7B0006C */ lwc1 $f16, 0x6c($sp) -/* 0A8EC8 800A82C8 0195001A */ div $zero, $t4, $s5 -/* 0A8ECC 800A82CC C7B20038 */ lwc1 $f18, 0x38($sp) -/* 0A8ED0 800A82D0 C7A60070 */ lwc1 $f6, 0x70($sp) -/* 0A8ED4 800A82D4 46128100 */ add.s $f4, $f16, $f18 -/* 0A8ED8 800A82D8 A7B40066 */ sh $s4, 0x66($sp) -/* 0A8EDC 800A82DC 46143201 */ sub.s $f8, $f6, $f20 -/* 0A8EE0 800A82E0 E7A4006C */ swc1 $f4, 0x6c($sp) -/* 0A8EE4 800A82E4 E7A80070 */ swc1 $f8, 0x70($sp) -/* 0A8EE8 800A82E8 16A00002 */ bnez $s5, .L800A82F4 -/* 0A8EEC 800A82EC 00000000 */ nop -/* 0A8EF0 800A82F0 0007000D */ break 7 -.L800A82F4: -/* 0A8EF4 800A82F4 2401FFFF */ li $at, -1 -/* 0A8EF8 800A82F8 16A10004 */ bne $s5, $at, .L800A830C -/* 0A8EFC 800A82FC 3C018000 */ lui $at, 0x8000 -/* 0A8F00 800A8300 15810002 */ bne $t4, $at, .L800A830C -/* 0A8F04 800A8304 00000000 */ nop -/* 0A8F08 800A8308 0006000D */ break 6 -.L800A830C: -/* 0A8F0C 800A830C 02002025 */ move $a0, $s0 -/* 0A8F10 800A8310 02202825 */ move $a1, $s1 -/* 0A8F14 800A8314 02403025 */ move $a2, $s2 -/* 0A8F18 800A8318 02603825 */ move $a3, $s3 -/* 0A8F1C 800A831C 00006812 */ mflo $t5 -/* 0A8F20 800A8320 A7AD0078 */ sh $t5, 0x78($sp) -/* 0A8F24 800A8324 0C02A980 */ jal func_800AA600 -/* 0A8F28 800A8328 00000000 */ nop -/* 0A8F2C 800A832C 8FAE0090 */ lw $t6, 0x90($sp) -/* 0A8F30 800A8330 C7AA006C */ lwc1 $f10, 0x6c($sp) -/* 0A8F34 800A8334 01D5001A */ div $zero, $t6, $s5 -/* 0A8F38 800A8338 C7B00044 */ lwc1 $f16, 0x44($sp) -/* 0A8F3C 800A833C 02002025 */ move $a0, $s0 -/* 0A8F40 800A8340 46105480 */ add.s $f18, $f10, $f16 -/* 0A8F44 800A8344 02202825 */ move $a1, $s1 -/* 0A8F48 800A8348 E7B2006C */ swc1 $f18, 0x6c($sp) -/* 0A8F4C 800A834C 16A00002 */ bnez $s5, .L800A8358 -/* 0A8F50 800A8350 00000000 */ nop -/* 0A8F54 800A8354 0007000D */ break 7 -.L800A8358: -/* 0A8F58 800A8358 2401FFFF */ li $at, -1 -/* 0A8F5C 800A835C 16A10004 */ bne $s5, $at, .L800A8370 -/* 0A8F60 800A8360 3C018000 */ lui $at, 0x8000 -/* 0A8F64 800A8364 15C10002 */ bne $t6, $at, .L800A8370 -/* 0A8F68 800A8368 00000000 */ nop -/* 0A8F6C 800A836C 0006000D */ break 6 -.L800A8370: -/* 0A8F70 800A8370 02403025 */ move $a2, $s2 -/* 0A8F74 800A8374 02603825 */ move $a3, $s3 -/* 0A8F78 800A8378 00007810 */ mfhi $t7 -/* 0A8F7C 800A837C A7AF0078 */ sh $t7, 0x78($sp) -/* 0A8F80 800A8380 0C02A980 */ jal func_800AA600 -/* 0A8F84 800A8384 00000000 */ nop -/* 0A8F88 800A8388 8FBF0034 */ lw $ra, 0x34($sp) -/* 0A8F8C 800A838C C7B50010 */ lwc1 $f21, 0x10($sp) -/* 0A8F90 800A8390 C7B40014 */ lwc1 $f20, 0x14($sp) -/* 0A8F94 800A8394 8FB0001C */ lw $s0, 0x1c($sp) -/* 0A8F98 800A8398 8FB10020 */ lw $s1, 0x20($sp) -/* 0A8F9C 800A839C 8FB20024 */ lw $s2, 0x24($sp) -/* 0A8FA0 800A83A0 8FB30028 */ lw $s3, 0x28($sp) -/* 0A8FA4 800A83A4 8FB4002C */ lw $s4, 0x2c($sp) -/* 0A8FA8 800A83A8 8FB50030 */ lw $s5, 0x30($sp) -/* 0A8FAC 800A83AC 03E00008 */ jr $ra -/* 0A8FB0 800A83B0 27BD0080 */ addiu $sp, $sp, 0x80 - diff --git a/asm/non_matchings/menu/menu_audio_options_loop.s b/asm/non_matchings/menu/menu_audio_options_loop.s deleted file mode 100644 index 3ac098a6..00000000 --- a/asm/non_matchings/menu/menu_audio_options_loop.s +++ /dev/null @@ -1,392 +0,0 @@ -glabel menu_audio_options_loop -/* 085874 80084C74 3C038012 */ lui $v1, %hi(gOptionBlinkTimer) # $v1, 0x8012 -/* 085878 80084C78 246363BC */ addiu $v1, %lo(gOptionBlinkTimer) # addiu $v1, $v1, 0x63bc -/* 08587C 80084C7C 8C6E0000 */ lw $t6, ($v1) -/* 085880 80084C80 3C09800E */ lui $t1, %hi(gMenuDelay) # $t1, 0x800e -/* 085884 80084C84 2529F47C */ addiu $t1, %lo(gMenuDelay) # addiu $t1, $t1, -0xb84 -/* 085888 80084C88 8D220000 */ lw $v0, ($t1) -/* 08588C 80084C8C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 085890 80084C90 01C47821 */ addu $t7, $t6, $a0 -/* 085894 80084C94 31F8003F */ andi $t8, $t7, 0x3f -/* 085898 80084C98 AFBF001C */ sw $ra, 0x1c($sp) -/* 08589C 80084C9C AFB00018 */ sw $s0, 0x18($sp) -/* 0858A0 80084CA0 AFA00030 */ sw $zero, 0x30($sp) -/* 0858A4 80084CA4 10400009 */ beqz $v0, .L80084CCC -/* 0858A8 80084CA8 AC780000 */ sw $t8, ($v1) -/* 0858AC 80084CAC 18400005 */ blez $v0, .L80084CC4 -/* 0858B0 80084CB0 00445023 */ subu $t2, $v0, $a0 -/* 0858B4 80084CB4 0044C821 */ addu $t9, $v0, $a0 -/* 0858B8 80084CB8 AD390000 */ sw $t9, ($t1) -/* 0858BC 80084CBC 10000003 */ b .L80084CCC -/* 0858C0 80084CC0 03201025 */ move $v0, $t9 -.L80084CC4: -/* 0858C4 80084CC4 AD2A0000 */ sw $t2, ($t1) -/* 0858C8 80084CC8 01401025 */ move $v0, $t2 -.L80084CCC: -/* 0858CC 80084CCC 2841FFED */ slti $at, $v0, -0x13 -/* 0858D0 80084CD0 14200007 */ bnez $at, .L80084CF0 -/* 0858D4 80084CD4 28410014 */ slti $at, $v0, 0x14 -/* 0858D8 80084CD8 10200005 */ beqz $at, .L80084CF0 -/* 0858DC 80084CDC 00000000 */ nop -/* 0858E0 80084CE0 0C021215 */ jal func_80084854 -/* 0858E4 80084CE4 00000000 */ nop -/* 0858E8 80084CE8 3C09800E */ lui $t1, %hi(gMenuDelay) # $t1, 0x800e -/* 0858EC 80084CEC 2529F47C */ addiu $t1, %lo(gMenuDelay) # addiu $t1, $t1, -0xb84 -.L80084CF0: -/* 0858F0 80084CF0 3C0B8012 */ lui $t3, %hi(gIgnorePlayerInputTime) # $t3, 0x8012 -/* 0858F4 80084CF4 8D6B63C4 */ lw $t3, %lo(gIgnorePlayerInputTime)($t3) -/* 0858F8 80084CF8 00000000 */ nop -/* 0858FC 80084CFC 1560012C */ bnez $t3, .L800851B0 -/* 085900 80084D00 00000000 */ nop -/* 085904 80084D04 8D2C0000 */ lw $t4, ($t1) -/* 085908 80084D08 00004025 */ move $t0, $zero -/* 08590C 80084D0C 15800128 */ bnez $t4, .L800851B0 -/* 085910 80084D10 00003825 */ move $a3, $zero -/* 085914 80084D14 3C038012 */ lui $v1, %hi(gControllersXAxisDirection) # $v1, 0x8012 -/* 085918 80084D18 3C058012 */ lui $a1, %hi(gControllersYAxisDirection) # $a1, 0x8012 -/* 08591C 80084D1C AFA00040 */ sw $zero, 0x40($sp) -/* 085920 80084D20 00003025 */ move $a2, $zero -/* 085924 80084D24 24A56464 */ addiu $a1, %lo(gControllersYAxisDirection) # addiu $a1, $a1, 0x6464 -/* 085928 80084D28 2463645C */ addiu $v1, %lo(gControllersXAxisDirection) # addiu $v1, $v1, 0x645c -/* 08592C 80084D2C 00008025 */ move $s0, $zero -.L80084D30: -/* 085930 80084D30 02002025 */ move $a0, $s0 -/* 085934 80084D34 AFA30028 */ sw $v1, 0x28($sp) -/* 085938 80084D38 AFA50024 */ sw $a1, 0x24($sp) -/* 08593C 80084D3C AFA60034 */ sw $a2, 0x34($sp) -/* 085940 80084D40 AFA70038 */ sw $a3, 0x38($sp) -/* 085944 80084D44 0C01A955 */ jal get_buttons_pressed_from_player -/* 085948 80084D48 AFA8003C */ sw $t0, 0x3c($sp) -/* 08594C 80084D4C 8FAD0040 */ lw $t5, 0x40($sp) -/* 085950 80084D50 02002025 */ move $a0, $s0 -/* 085954 80084D54 01A27025 */ or $t6, $t5, $v0 -/* 085958 80084D58 0C01A967 */ jal clamp_joystick_x_axis -/* 08595C 80084D5C AFAE0040 */ sw $t6, 0x40($sp) -/* 085960 80084D60 8FA30028 */ lw $v1, 0x28($sp) -/* 085964 80084D64 8FA50024 */ lw $a1, 0x24($sp) -/* 085968 80084D68 8FA60034 */ lw $a2, 0x34($sp) -/* 08596C 80084D6C 8FA70038 */ lw $a3, 0x38($sp) -/* 085970 80084D70 8FA8003C */ lw $t0, 0x3c($sp) -/* 085974 80084D74 806F0000 */ lb $t7, ($v1) -/* 085978 80084D78 80B80000 */ lb $t8, ($a1) -/* 08597C 80084D7C 26100001 */ addiu $s0, $s0, 1 -/* 085980 80084D80 24010004 */ li $at, 4 -/* 085984 80084D84 24630001 */ addiu $v1, $v1, 1 -/* 085988 80084D88 24A50001 */ addiu $a1, $a1, 1 -/* 08598C 80084D8C 00C23021 */ addu $a2, $a2, $v0 -/* 085990 80084D90 010F4021 */ addu $t0, $t0, $t7 -/* 085994 80084D94 1601FFE6 */ bne $s0, $at, .L80084D30 -/* 085998 80084D98 00F83821 */ addu $a3, $a3, $t8 -/* 08599C 80084D9C 04C10006 */ bgez $a2, .L80084DB8 -/* 0859A0 80084DA0 3C038012 */ lui $v1, %hi(gMenuOptionCount) # $v1, 0x8012 -/* 0859A4 80084DA4 24C60018 */ addiu $a2, $a2, 0x18 -/* 0859A8 80084DA8 18C00008 */ blez $a2, .L80084DCC -/* 0859AC 80084DAC 8FA40040 */ lw $a0, 0x40($sp) -/* 0859B0 80084DB0 10000005 */ b .L80084DC8 -/* 0859B4 80084DB4 00003025 */ move $a2, $zero -.L80084DB8: -/* 0859B8 80084DB8 24C6FFE8 */ addiu $a2, $a2, -0x18 -/* 0859BC 80084DBC 04C10003 */ bgez $a2, .L80084DCC -/* 0859C0 80084DC0 8FA40040 */ lw $a0, 0x40($sp) -/* 0859C4 80084DC4 00003025 */ move $a2, $zero -.L80084DC8: -/* 0859C8 80084DC8 8FA40040 */ lw $a0, 0x40($sp) -.L80084DCC: -/* 0859CC 80084DCC 0006C883 */ sra $t9, $a2, 2 -/* 0859D0 80084DD0 308A9000 */ andi $t2, $a0, 0x9000 -/* 0859D4 80084DD4 03203025 */ move $a2, $t9 -/* 0859D8 80084DD8 11400008 */ beqz $t2, .L80084DFC -/* 0859DC 80084DDC 01402025 */ move $a0, $t2 -/* 0859E0 80084DE0 3C0C8012 */ lui $t4, %hi(gOptionsMenuItemIndex) # $t4, 0x8012 -/* 0859E4 80084DE4 858C6C46 */ lh $t4, %lo(gOptionsMenuItemIndex)($t4) -/* 0859E8 80084DE8 246363E0 */ addiu $v1, %lo(gMenuOptionCount) # addiu $v1, $v1, 0x63e0 -/* 0859EC 80084DEC 8C6B0000 */ lw $t3, ($v1) -/* 0859F0 80084DF0 258D0001 */ addiu $t5, $t4, 1 -/* 0859F4 80084DF4 116D0007 */ beq $t3, $t5, .L80084E14 -/* 0859F8 80084DF8 2418FFFF */ li $t8, -1 -.L80084DFC: -/* 0859FC 80084DFC 8FAE0040 */ lw $t6, 0x40($sp) -/* 085A00 80084E00 3C038012 */ lui $v1, %hi(gMenuOptionCount) # $v1, 0x8012 -/* 085A04 80084E04 31CF4000 */ andi $t7, $t6, 0x4000 -/* 085A08 80084E08 11E00011 */ beqz $t7, .L80084E50 -/* 085A0C 80084E0C 246363E0 */ addiu $v1, %lo(gMenuOptionCount) # addiu $v1, $v1, 0x63e0 -/* 085A10 80084E10 2418FFFF */ li $t8, -1 -.L80084E14: -/* 085A14 80084E14 3C01800E */ lui $at, %hi(gMenuDelay) # $at, 0x800e -/* 085A18 80084E18 3C04800E */ lui $a0, %hi(sMenuTransitionFadeIn) # $a0, 0x800e -/* 085A1C 80084E1C AC38F47C */ sw $t8, %lo(gMenuDelay)($at) -/* 085A20 80084E20 0C030076 */ jal transition_begin -/* 085A24 80084E24 2484F774 */ addiu $a0, %lo(sMenuTransitionFadeIn) # addiu $a0, $a0, -0x88c -/* 085A28 80084E28 3C198012 */ lui $t9, %hi(gOpacityDecayTimer) # $t9, 0x8012 -/* 085A2C 80084E2C 8F3963D8 */ lw $t9, %lo(gOpacityDecayTimer)($t9) -/* 085A30 80084E30 00000000 */ nop -/* 085A34 80084E34 07200004 */ bltz $t9, .L80084E48 -/* 085A38 80084E38 240A0003 */ li $t2, 3 -/* 085A3C 80084E3C 0C000326 */ jal set_music_fade_timer -/* 085A40 80084E40 2404FF80 */ li $a0, -128 -/* 085A44 80084E44 240A0003 */ li $t2, 3 -.L80084E48: -/* 085A48 80084E48 100000AD */ b .L80085100 -/* 085A4C 80084E4C AFAA0030 */ sw $t2, 0x30($sp) -.L80084E50: -/* 085A50 80084E50 3C028012 */ lui $v0, %hi(gOptionsMenuItemIndex) # $v0, 0x8012 -/* 085A54 80084E54 84426C46 */ lh $v0, %lo(gOptionsMenuItemIndex)($v0) -/* 085A58 80084E58 04E1000B */ bgez $a3, .L80084E88 -/* 085A5C 80084E5C 00000000 */ nop -/* 085A60 80084E60 8C6C0000 */ lw $t4, ($v1) -/* 085A64 80084E64 244D0001 */ addiu $t5, $v0, 1 -/* 085A68 80084E68 258BFFFF */ addiu $t3, $t4, -1 -/* 085A6C 80084E6C 004B082A */ slt $at, $v0, $t3 -/* 085A70 80084E70 10200005 */ beqz $at, .L80084E88 -/* 085A74 80084E74 240E0001 */ li $t6, 1 -/* 085A78 80084E78 3C018012 */ lui $at, %hi(gOptionsMenuItemIndex) # $at, 0x8012 -/* 085A7C 80084E7C A42D6C46 */ sh $t5, %lo(gOptionsMenuItemIndex)($at) -/* 085A80 80084E80 1000009F */ b .L80085100 -/* 085A84 80084E84 AFAE0030 */ sw $t6, 0x30($sp) -.L80084E88: -/* 085A88 80084E88 18E00008 */ blez $a3, .L80084EAC -/* 085A8C 80084E8C 00000000 */ nop -/* 085A90 80084E90 18400006 */ blez $v0, .L80084EAC -/* 085A94 80084E94 244FFFFF */ addiu $t7, $v0, -1 -/* 085A98 80084E98 3C018012 */ lui $at, %hi(gOptionsMenuItemIndex) # $at, 0x8012 -/* 085A9C 80084E9C 24180001 */ li $t8, 1 -/* 085AA0 80084EA0 A42F6C46 */ sh $t7, %lo(gOptionsMenuItemIndex)($at) -/* 085AA4 80084EA4 10000096 */ b .L80085100 -/* 085AA8 80084EA8 AFB80030 */ sw $t8, 0x30($sp) -.L80084EAC: -/* 085AAC 80084EAC 14400021 */ bnez $v0, .L80084F34 -/* 085AB0 80084EB0 00000000 */ nop -/* 085AB4 80084EB4 1100001F */ beqz $t0, .L80084F34 -/* 085AB8 80084EB8 00000000 */ nop -/* 085ABC 80084EBC 05010008 */ bgez $t0, .L80084EE0 -/* 085AC0 80084EC0 3C02800E */ lui $v0, %hi(D_800DFAC8) # $v0, 0x800e -/* 085AC4 80084EC4 3C02800E */ lui $v0, %hi(D_800DFAC8) # $v0, 0x800e -/* 085AC8 80084EC8 2442FAC8 */ addiu $v0, %lo(D_800DFAC8) # addiu $v0, $v0, -0x538 -/* 085ACC 80084ECC 8C590000 */ lw $t9, ($v0) -/* 085AD0 80084ED0 00000000 */ nop -/* 085AD4 80084ED4 272AFFFF */ addiu $t2, $t9, -1 -/* 085AD8 80084ED8 10000006 */ b .L80084EF4 -/* 085ADC 80084EDC AC4A0000 */ sw $t2, ($v0) -.L80084EE0: -/* 085AE0 80084EE0 2442FAC8 */ addiu $v0, %lo(D_800DFAC8) # addiu $v0, $v0, -0x538 -/* 085AE4 80084EE4 8C4C0000 */ lw $t4, ($v0) -/* 085AE8 80084EE8 00000000 */ nop -/* 085AEC 80084EEC 258B0001 */ addiu $t3, $t4, 1 -/* 085AF0 80084EF0 AC4B0000 */ sw $t3, ($v0) -.L80084EF4: -/* 085AF4 80084EF4 8C440000 */ lw $a0, ($v0) -/* 085AF8 80084EF8 00000000 */ nop -/* 085AFC 80084EFC 04810004 */ bgez $a0, .L80084F10 -/* 085B00 80084F00 28810003 */ slti $at, $a0, 3 -/* 085B04 80084F04 24040002 */ li $a0, 2 -/* 085B08 80084F08 AC440000 */ sw $a0, ($v0) -/* 085B0C 80084F0C 28810003 */ slti $at, $a0, 3 -.L80084F10: -/* 085B10 80084F10 14200003 */ bnez $at, .L80084F20 -/* 085B14 80084F14 00000000 */ nop -/* 085B18 80084F18 AC400000 */ sw $zero, ($v0) -/* 085B1C 80084F1C 00002025 */ move $a0, $zero -.L80084F20: -/* 085B20 80084F20 0C0196F4 */ jal set_stereo_pan_mode -/* 085B24 80084F24 00000000 */ nop -/* 085B28 80084F28 240E0001 */ li $t6, 1 -/* 085B2C 80084F2C 10000074 */ b .L80085100 -/* 085B30 80084F30 AFAE0030 */ sw $t6, 0x30($sp) -.L80084F34: -/* 085B34 80084F34 10C00047 */ beqz $a2, .L80085054 -/* 085B38 80084F38 24010001 */ li $at, 1 -/* 085B3C 80084F3C 10410002 */ beq $v0, $at, .L80084F48 -/* 085B40 80084F40 24010002 */ li $at, 2 -/* 085B44 80084F44 14410043 */ bne $v0, $at, .L80085054 -.L80084F48: -/* 085B48 80084F48 24010001 */ li $at, 1 -/* 085B4C 80084F4C 14410013 */ bne $v0, $at, .L80084F9C -/* 085B50 80084F50 3C03800E */ lui $v1, %hi(gSfxVolumeSliderValue) # $v1, 0x800e -/* 085B54 80084F54 2463FAC0 */ addiu $v1, %lo(gSfxVolumeSliderValue) # addiu $v1, $v1, -0x540 -/* 085B58 80084F58 8C6F0000 */ lw $t7, ($v1) -/* 085B5C 80084F5C 00000000 */ nop -/* 085B60 80084F60 01E61021 */ addu $v0, $t7, $a2 -/* 085B64 80084F64 04410004 */ bgez $v0, .L80084F78 -/* 085B68 80084F68 AC620000 */ sw $v0, ($v1) -/* 085B6C 80084F6C AC600000 */ sw $zero, ($v1) -/* 085B70 80084F70 10000006 */ b .L80084F8C -/* 085B74 80084F74 00001025 */ move $v0, $zero -.L80084F78: -/* 085B78 80084F78 28410101 */ slti $at, $v0, 0x101 -/* 085B7C 80084F7C 14200003 */ bnez $at, .L80084F8C -/* 085B80 80084F80 00000000 */ nop -/* 085B84 80084F84 24020100 */ li $v0, 256 -/* 085B88 80084F88 AC620000 */ sw $v0, ($v1) -.L80084F8C: -/* 085B8C 80084F8C 0C000C58 */ jal set_sfx_volume_slider -/* 085B90 80084F90 00402025 */ move $a0, $v0 -/* 085B94 80084F94 1000005A */ b .L80085100 -/* 085B98 80084F98 00000000 */ nop -.L80084F9C: -/* 085B9C 80084F9C 24010002 */ li $at, 2 -/* 085BA0 80084FA0 14410057 */ bne $v0, $at, .L80085100 -/* 085BA4 80084FA4 3C03800E */ lui $v1, %hi(gMusicVolumeSliderValue) # $v1, 0x800e -/* 085BA8 80084FA8 2463FAC4 */ addiu $v1, %lo(gMusicVolumeSliderValue) # addiu $v1, $v1, -0x53c -/* 085BAC 80084FAC 8C6A0000 */ lw $t2, ($v1) -/* 085BB0 80084FB0 00000000 */ nop -/* 085BB4 80084FB4 01461021 */ addu $v0, $t2, $a2 -/* 085BB8 80084FB8 04410004 */ bgez $v0, .L80084FCC -/* 085BBC 80084FBC AC620000 */ sw $v0, ($v1) -/* 085BC0 80084FC0 AC600000 */ sw $zero, ($v1) -/* 085BC4 80084FC4 10000006 */ b .L80084FE0 -/* 085BC8 80084FC8 00001025 */ move $v0, $zero -.L80084FCC: -/* 085BCC 80084FCC 28410101 */ slti $at, $v0, 0x101 -/* 085BD0 80084FD0 14200003 */ bnez $at, .L80084FE0 -/* 085BD4 80084FD4 00000000 */ nop -/* 085BD8 80084FD8 24020100 */ li $v0, 256 -/* 085BDC 80084FDC AC620000 */ sw $v0, ($v1) -.L80084FE0: -/* 085BE0 80084FE0 0C00068F */ jal set_music_volume_slider -/* 085BE4 80084FE4 00402025 */ move $a0, $v0 -/* 085BE8 80084FE8 0C000572 */ jal music_is_playing -/* 085BEC 80084FEC 00000000 */ nop -/* 085BF0 80084FF0 14400043 */ bnez $v0, .L80085100 -/* 085BF4 80084FF4 3C0D8012 */ lui $t5, %hi(gOpacityDecayTimer) # $t5, 0x8012 -/* 085BF8 80084FF8 8DAD63D8 */ lw $t5, %lo(gOpacityDecayTimer)($t5) -/* 085BFC 80084FFC 00000000 */ nop -/* 085C00 80085000 05A0000A */ bltz $t5, .L8008502C -/* 085C04 80085004 00000000 */ nop -/* 085C08 80085008 0C0002CA */ jal func_80000B28 -/* 085C0C 8008500C 00000000 */ nop -/* 085C10 80085010 3C10800E */ lui $s0, %hi(D_800DFABC) # $s0, 0x800e -/* 085C14 80085014 2610FABC */ addiu $s0, %lo(D_800DFABC) # addiu $s0, $s0, -0x544 -/* 085C18 80085018 92040003 */ lbu $a0, 3($s0) -/* 085C1C 8008501C 0C0002CD */ jal play_music -/* 085C20 80085020 00000000 */ nop -/* 085C24 80085024 10000036 */ b .L80085100 -/* 085C28 80085028 00000000 */ nop -.L8008502C: -/* 085C2C 8008502C 0C0002CA */ jal func_80000B28 -/* 085C30 80085030 00000000 */ nop -/* 085C34 80085034 0C0002F8 */ jal set_music_player_voice_limit -/* 085C38 80085038 24040018 */ li $a0, 24 -/* 085C3C 8008503C 0C0002CD */ jal play_music -/* 085C40 80085040 24040018 */ li $a0, 24 -/* 085C44 80085044 0C0002C6 */ jal func_80000B18 -/* 085C48 80085048 00000000 */ nop -/* 085C4C 8008504C 1000002C */ b .L80085100 -/* 085C50 80085050 00000000 */ nop -.L80085054: -/* 085C54 80085054 8C6E0000 */ lw $t6, ($v1) -/* 085C58 80085058 00000000 */ nop -/* 085C5C 8008505C 29C10005 */ slti $at, $t6, 5 -/* 085C60 80085060 14200027 */ bnez $at, .L80085100 -/* 085C64 80085064 24010003 */ li $at, 3 -/* 085C68 80085068 14410025 */ bne $v0, $at, .L80085100 -/* 085C6C 8008506C 00000000 */ nop -/* 085C70 80085070 05010009 */ bgez $t0, .L80085098 -/* 085C74 80085074 3C10800E */ lui $s0, %hi(D_800DFABC) # $s0, 0x800e -/* 085C78 80085078 2610FABC */ addiu $s0, %lo(D_800DFABC) # addiu $s0, $s0, -0x544 -/* 085C7C 8008507C 8E030000 */ lw $v1, ($s0) -/* 085C80 80085080 24180001 */ li $t8, 1 -/* 085C84 80085084 18600004 */ blez $v1, .L80085098 -/* 085C88 80085088 246FFFFF */ addiu $t7, $v1, -1 -/* 085C8C 8008508C AE0F0000 */ sw $t7, ($s0) -/* 085C90 80085090 1000000F */ b .L800850D0 -/* 085C94 80085094 AFB80030 */ sw $t8, 0x30($sp) -.L80085098: -/* 085C98 80085098 3C10800E */ lui $s0, %hi(D_800DFABC) # $s0, 0x800e -/* 085C9C 8008509C 1900000C */ blez $t0, .L800850D0 -/* 085CA0 800850A0 2610FABC */ addiu $s0, %lo(D_800DFABC) # addiu $s0, $s0, -0x544 -/* 085CA4 800850A4 0C000844 */ jal ALSeqFile_80115CF8_GetSeqCount -/* 085CA8 800850A8 AFA40028 */ sw $a0, 0x28($sp) -/* 085CAC 800850AC 8E030000 */ lw $v1, ($s0) -/* 085CB0 800850B0 2459FFFF */ addiu $t9, $v0, -1 -/* 085CB4 800850B4 8FA40028 */ lw $a0, 0x28($sp) -/* 085CB8 800850B8 0079082A */ slt $at, $v1, $t9 -/* 085CBC 800850BC 10200004 */ beqz $at, .L800850D0 -/* 085CC0 800850C0 246A0001 */ addiu $t2, $v1, 1 -/* 085CC4 800850C4 240C0001 */ li $t4, 1 -/* 085CC8 800850C8 AE0A0000 */ sw $t2, ($s0) -/* 085CCC 800850CC AFAC0030 */ sw $t4, 0x30($sp) -.L800850D0: -/* 085CD0 800850D0 1080000B */ beqz $a0, .L80085100 -/* 085CD4 800850D4 00000000 */ nop -/* 085CD8 800850D8 0C0002CA */ jal func_80000B28 -/* 085CDC 800850DC 00000000 */ nop -/* 085CE0 800850E0 0C0002F8 */ jal set_music_player_voice_limit -/* 085CE4 800850E4 24040018 */ li $a0, 24 -/* 085CE8 800850E8 92040003 */ lbu $a0, 3($s0) -/* 085CEC 800850EC 0C0002CD */ jal play_music -/* 085CF0 800850F0 00000000 */ nop -/* 085CF4 800850F4 8E0B0000 */ lw $t3, ($s0) -/* 085CF8 800850F8 3C018012 */ lui $at, %hi(gOpacityDecayTimer) # $at, 0x8012 -/* 085CFC 800850FC AC2B63D8 */ sw $t3, %lo(gOpacityDecayTimer)($at) -.L80085100: -/* 085D00 80085100 3C0D8012 */ lui $t5, %hi(gOptionsMenuItemIndex) # $t5, 0x8012 -/* 085D04 80085104 85AD6C46 */ lh $t5, %lo(gOptionsMenuItemIndex)($t5) -/* 085D08 80085108 24010001 */ li $at, 1 -/* 085D0C 8008510C 15A1000B */ bne $t5, $at, .L8008513C -/* 085D10 80085110 3C058012 */ lui $a1, %hi(D_801269FC) # $a1, 0x8012 -/* 085D14 80085114 3C058012 */ lui $a1, %hi(D_801269FC) # $a1, 0x8012 -/* 085D18 80085118 24A569FC */ addiu $a1, %lo(D_801269FC) # addiu $a1, $a1, 0x69fc -/* 085D1C 8008511C 8CAE0000 */ lw $t6, ($a1) -/* 085D20 80085120 00000000 */ nop -/* 085D24 80085124 15C0000D */ bnez $t6, .L8008515C -/* 085D28 80085128 8FAF0030 */ lw $t7, 0x30($sp) -/* 085D2C 8008512C 0C000741 */ jal play_sound_global -/* 085D30 80085130 2404019B */ li $a0, 411 -/* 085D34 80085134 10000009 */ b .L8008515C -/* 085D38 80085138 8FAF0030 */ lw $t7, 0x30($sp) -.L8008513C: -/* 085D3C 8008513C 24A569FC */ addiu $a1, %lo(D_801269FC) # addiu $a1, $a1, 0x69fc -/* 085D40 80085140 8CA40000 */ lw $a0, ($a1) -/* 085D44 80085144 00000000 */ nop -/* 085D48 80085148 10800004 */ beqz $a0, .L8008515C -/* 085D4C 8008514C 8FAF0030 */ lw $t7, 0x30($sp) -/* 085D50 80085150 0C001223 */ jal func_8000488C -/* 085D54 80085154 00000000 */ nop -/* 085D58 80085158 8FAF0030 */ lw $t7, 0x30($sp) -.L8008515C: -/* 085D5C 8008515C 24010003 */ li $at, 3 -/* 085D60 80085160 15E10005 */ bne $t7, $at, .L80085178 -/* 085D64 80085164 24040241 */ li $a0, 577 -/* 085D68 80085168 0C000741 */ jal play_sound_global -/* 085D6C 8008516C 00002825 */ move $a1, $zero -/* 085D70 80085170 1000000F */ b .L800851B0 -/* 085D74 80085174 00000000 */ nop -.L80085178: -/* 085D78 80085178 8FB80030 */ lw $t8, 0x30($sp) -/* 085D7C 8008517C 24010002 */ li $at, 2 -/* 085D80 80085180 17010005 */ bne $t8, $at, .L80085198 -/* 085D84 80085184 240400EF */ li $a0, 239 -/* 085D88 80085188 0C000741 */ jal play_sound_global -/* 085D8C 8008518C 00002825 */ move $a1, $zero -/* 085D90 80085190 10000007 */ b .L800851B0 -/* 085D94 80085194 00000000 */ nop -.L80085198: -/* 085D98 80085198 8FB90030 */ lw $t9, 0x30($sp) -/* 085D9C 8008519C 24010001 */ li $at, 1 -/* 085DA0 800851A0 17210003 */ bne $t9, $at, .L800851B0 -/* 085DA4 800851A4 240400EB */ li $a0, 235 -/* 085DA8 800851A8 0C000741 */ jal play_sound_global -/* 085DAC 800851AC 00002825 */ move $a1, $zero -.L800851B0: -/* 085DB0 800851B0 3C09800E */ lui $t1, %hi(gMenuDelay) # $t1, 0x800e -/* 085DB4 800851B4 2529F47C */ addiu $t1, %lo(gMenuDelay) # addiu $t1, $t1, -0xb84 -/* 085DB8 800851B8 8D2A0000 */ lw $t2, ($t1) -/* 085DBC 800851BC 00001025 */ move $v0, $zero -/* 085DC0 800851C0 2941FFE2 */ slti $at, $t2, -0x1e -/* 085DC4 800851C4 10200007 */ beqz $at, .L800851E4 -/* 085DC8 800851C8 00000000 */ nop -/* 085DCC 800851CC 0C02147F */ jal func_800851FC -/* 085DD0 800851D0 00000000 */ nop -/* 085DD4 800851D4 0C0204F4 */ jal menu_init -/* 085DD8 800851D8 2404000C */ li $a0, 12 -/* 085DDC 800851DC 10000003 */ b .L800851EC -/* 085DE0 800851E0 00001025 */ move $v0, $zero -.L800851E4: -/* 085DE4 800851E4 3C018012 */ lui $at, %hi(gIgnorePlayerInputTime) # $at, 0x8012 -/* 085DE8 800851E8 AC2063C4 */ sw $zero, %lo(gIgnorePlayerInputTime)($at) -.L800851EC: -/* 085DEC 800851EC 8FBF001C */ lw $ra, 0x1c($sp) -/* 085DF0 800851F0 8FB00018 */ lw $s0, 0x18($sp) -/* 085DF4 800851F4 03E00008 */ jr $ra -/* 085DF8 800851F8 27BD0048 */ addiu $sp, $sp, 0x48 - diff --git a/asm/non_matchings/object_functions/obj_loop_effectbox.s b/asm/non_matchings/object_functions/obj_loop_effectbox.s deleted file mode 100644 index 38c9779f..00000000 --- a/asm/non_matchings/object_functions/obj_loop_effectbox.s +++ /dev/null @@ -1,201 +0,0 @@ -glabel obj_loop_effectbox -/* 035774 80034B74 27BDFF68 */ addiu $sp, $sp, -0x98 -/* 035778 80034B78 AFBF004C */ sw $ra, 0x4c($sp) -/* 03577C 80034B7C AFB00048 */ sw $s0, 0x48($sp) -/* 035780 80034B80 E7BF0040 */ swc1 $f31, 0x40($sp) -/* 035784 80034B84 E7BE0044 */ swc1 $f30, 0x44($sp) -/* 035788 80034B88 E7BD0038 */ swc1 $f29, 0x38($sp) -/* 03578C 80034B8C E7BC003C */ swc1 $f28, 0x3c($sp) -/* 035790 80034B90 E7BB0030 */ swc1 $f27, 0x30($sp) -/* 035794 80034B94 E7BA0034 */ swc1 $f26, 0x34($sp) -/* 035798 80034B98 E7B90028 */ swc1 $f25, 0x28($sp) -/* 03579C 80034B9C E7B8002C */ swc1 $f24, 0x2c($sp) -/* 0357A0 80034BA0 E7B70020 */ swc1 $f23, 0x20($sp) -/* 0357A4 80034BA4 E7B60024 */ swc1 $f22, 0x24($sp) -/* 0357A8 80034BA8 E7B50018 */ swc1 $f21, 0x18($sp) -/* 0357AC 80034BAC E7B4001C */ swc1 $f20, 0x1c($sp) -/* 0357B0 80034BB0 AFA5009C */ sw $a1, 0x9c($sp) -/* 0357B4 80034BB4 8C90003C */ lw $s0, 0x3c($a0) -/* 0357B8 80034BB8 00803025 */ move $a2, $a0 -/* 0357BC 80034BBC AFA60098 */ sw $a2, 0x98($sp) -/* 0357C0 80034BC0 0C006E9D */ jal get_racer_objects -/* 0357C4 80034BC4 27A4008C */ addiu $a0, $sp, 0x8c -/* 0357C8 80034BC8 AFA20094 */ sw $v0, 0x94($sp) -/* 0357CC 80034BCC 9204000B */ lbu $a0, 0xb($s0) -/* 0357D0 80034BD0 00000000 */ nop -/* 0357D4 80034BD4 00047200 */ sll $t6, $a0, 8 -/* 0357D8 80034BD8 000E2023 */ negu $a0, $t6 -/* 0357DC 80034BDC 00047C00 */ sll $t7, $a0, 0x10 -/* 0357E0 80034BE0 0C01C1FE */ jal coss_f -/* 0357E4 80034BE4 000F2403 */ sra $a0, $t7, 0x10 -/* 0357E8 80034BE8 9204000B */ lbu $a0, 0xb($s0) -/* 0357EC 80034BEC 46000506 */ mov.s $f20, $f0 -/* 0357F0 80034BF0 0004CA00 */ sll $t9, $a0, 8 -/* 0357F4 80034BF4 00192023 */ negu $a0, $t9 -/* 0357F8 80034BF8 00044400 */ sll $t0, $a0, 0x10 -/* 0357FC 80034BFC 0C01C1F1 */ jal sins_f -/* 035800 80034C00 00082403 */ sra $a0, $t0, 0x10 -/* 035804 80034C04 920A0008 */ lbu $t2, 8($s0) -/* 035808 80034C08 24020003 */ li $v0, 3 -/* 03580C 80034C0C 01420019 */ multu $t2, $v0 -/* 035810 80034C10 920C0009 */ lbu $t4, 9($s0) -/* 035814 80034C14 920E000A */ lbu $t6, 0xa($s0) -/* 035818 80034C18 8FB8008C */ lw $t8, 0x8c($sp) -/* 03581C 80034C1C 8FA60098 */ lw $a2, 0x98($sp) -/* 035820 80034C20 8FA50094 */ lw $a1, 0x94($sp) -/* 035824 80034C24 00002025 */ move $a0, $zero -/* 035828 80034C28 3C014000 */ li $at, 0x40000000 # 2.000000 -/* 03582C 80034C2C 24070001 */ li $a3, 1 -/* 035830 80034C30 00005812 */ mflo $t3 -/* 035834 80034C34 448B2000 */ mtc1 $t3, $f4 -/* 035838 80034C38 00000000 */ nop -/* 03583C 80034C3C 01820019 */ multu $t4, $v0 -/* 035840 80034C40 468025A0 */ cvt.s.w $f22, $f4 -/* 035844 80034C44 00006812 */ mflo $t5 -/* 035848 80034C48 448D3000 */ mtc1 $t5, $f6 -/* 03584C 80034C4C 00000000 */ nop -/* 035850 80034C50 01C20019 */ multu $t6, $v0 -/* 035854 80034C54 468034A0 */ cvt.s.w $f18, $f6 -/* 035858 80034C58 00007812 */ mflo $t7 -/* 03585C 80034C5C 448F4000 */ mtc1 $t7, $f8 -/* 035860 80034C60 1B000073 */ blez $t8, .L80034E30 -/* 035864 80034C64 46804620 */ cvt.s.w $f24, $f8 -/* 035868 80034C68 4481F000 */ mtc1 $at, $f30 -/* 03586C 80034C6C 3C013FF0 */ li $at, 0x3FF00000 # 1.875000 -/* 035870 80034C70 4481D800 */ mtc1 $at, $f27 -/* 035874 80034C74 4480D000 */ mtc1 $zero, $f26 -/* 035878 80034C78 46009707 */ neg.s $f28, $f18 -.L80034C7C: -/* 03587C 80034C7C 8CA30000 */ lw $v1, ($a1) -/* 035880 80034C80 C4C4000C */ lwc1 $f4, 0xc($a2) -/* 035884 80034C84 C4C80010 */ lwc1 $f8, 0x10($a2) -/* 035888 80034C88 C46A000C */ lwc1 $f10, 0xc($v1) -/* 03588C 80034C8C C4660010 */ lwc1 $f6, 0x10($v1) -/* 035890 80034C90 46045381 */ sub.s $f14, $f10, $f4 -/* 035894 80034C94 C4C40014 */ lwc1 $f4, 0x14($a2) -/* 035898 80034C98 46083081 */ sub.s $f2, $f6, $f8 -/* 03589C 80034C9C C46A0014 */ lwc1 $f10, 0x14($v1) -/* 0358A0 80034CA0 4602E03C */ c.lt.s $f28, $f2 -/* 0358A4 80034CA4 46045301 */ sub.s $f12, $f10, $f4 -/* 0358A8 80034CA8 4500005E */ bc1f .L80034E24 -/* 0358AC 80034CAC 8FAD008C */ lw $t5, 0x8c($sp) -/* 0358B0 80034CB0 4612103C */ c.lt.s $f2, $f18 -/* 0358B4 80034CB4 00000000 */ nop -/* 0358B8 80034CB8 4500005A */ bc1f .L80034E24 -/* 0358BC 80034CBC 8FAD008C */ lw $t5, 0x8c($sp) -/* 0358C0 80034CC0 46147182 */ mul.s $f6, $f14, $f20 -/* 0358C4 80034CC4 4600B287 */ neg.s $f10, $f22 -/* 0358C8 80034CC8 46006202 */ mul.s $f8, $f12, $f0 -/* 0358CC 80034CCC 46083400 */ add.s $f16, $f6, $f8 -/* 0358D0 80034CD0 4610503C */ c.lt.s $f10, $f16 -/* 0358D4 80034CD4 00000000 */ nop -/* 0358D8 80034CD8 45000052 */ bc1f .L80034E24 -/* 0358DC 80034CDC 8FAD008C */ lw $t5, 0x8c($sp) -/* 0358E0 80034CE0 4616803C */ c.lt.s $f16, $f22 -/* 0358E4 80034CE4 00000000 */ nop -/* 0358E8 80034CE8 4500004E */ bc1f .L80034E24 -/* 0358EC 80034CEC 8FAD008C */ lw $t5, 0x8c($sp) -/* 0358F0 80034CF0 46007107 */ neg.s $f4, $f14 -/* 0358F4 80034CF4 46002182 */ mul.s $f6, $f4, $f0 -/* 0358F8 80034CF8 4600C287 */ neg.s $f10, $f24 -/* 0358FC 80034CFC 46146202 */ mul.s $f8, $f12, $f20 -/* 035900 80034D00 46083300 */ add.s $f12, $f6, $f8 -/* 035904 80034D04 460C503C */ c.lt.s $f10, $f12 -/* 035908 80034D08 00000000 */ nop -/* 03590C 80034D0C 45000045 */ bc1f .L80034E24 -/* 035910 80034D10 8FAD008C */ lw $t5, 0x8c($sp) -/* 035914 80034D14 4618603C */ c.lt.s $f12, $f24 -/* 035918 80034D18 00000000 */ nop -/* 03591C 80034D1C 45000040 */ bc1f .L80034E20 -/* 035920 80034D20 00000000 */ nop -/* 035924 80034D24 461E9303 */ div.s $f12, $f18, $f30 -/* 035928 80034D28 8C620064 */ lw $v0, 0x64($v1) -/* 03592C 80034D2C 9219000C */ lbu $t9, 0xc($s0) -/* 035930 80034D30 00000000 */ nop -/* 035934 80034D34 A05901FE */ sb $t9, 0x1fe($v0) -/* 035938 80034D38 9208000D */ lbu $t0, 0xd($s0) -/* 03593C 80034D3C 332900FF */ andi $t1, $t9, 0xff -/* 035940 80034D40 A04801FF */ sb $t0, 0x1ff($v0) -/* 035944 80034D44 4602603C */ c.lt.s $f12, $f2 -/* 035948 80034D48 00000000 */ nop -/* 03594C 80034D4C 45000035 */ bc1f .L80034E24 -/* 035950 80034D50 8FAD008C */ lw $t5, 0x8c($sp) -/* 035954 80034D54 14E90033 */ bne $a3, $t1, .L80034E24 -/* 035958 80034D58 8FAD008C */ lw $t5, 0x8c($sp) -/* 03595C 80034D5C 460C1101 */ sub.s $f4, $f2, $f12 -/* 035960 80034D60 310A00FF */ andi $t2, $t0, 0xff -/* 035964 80034D64 460C2183 */ div.s $f6, $f4, $f12 -/* 035968 80034D68 448A2000 */ mtc1 $t2, $f4 -/* 03596C 80034D6C 3C014F80 */ li $at, 0x4F800000 # 4294967296.000000 -/* 035970 80034D70 46003221 */ cvt.d.s $f8, $f6 -/* 035974 80034D74 4628D281 */ sub.d $f10, $f26, $f8 -/* 035978 80034D78 462050A0 */ cvt.s.d $f2, $f10 -/* 03597C 80034D7C 05410004 */ bgez $t2, .L80034D90 -/* 035980 80034D80 468021A0 */ cvt.s.w $f6, $f4 -/* 035984 80034D84 44814000 */ mtc1 $at, $f8 -/* 035988 80034D88 00000000 */ nop -/* 03598C 80034D8C 46083180 */ add.s $f6, $f6, $f8 -.L80034D90: -/* 035990 80034D90 46023282 */ mul.s $f10, $f6, $f2 -/* 035994 80034D94 240C0001 */ li $t4, 1 -/* 035998 80034D98 3C014F00 */ li $at, 0x4F000000 # 2147483648.000000 -/* 03599C 80034D9C 444BF800 */ cfc1 $t3, $31 -/* 0359A0 80034DA0 44CCF800 */ ctc1 $t4, $31 -/* 0359A4 80034DA4 00000000 */ nop -/* 0359A8 80034DA8 46005124 */ cvt.w.s $f4, $f10 -/* 0359AC 80034DAC 444CF800 */ cfc1 $t4, $31 -/* 0359B0 80034DB0 00000000 */ nop -/* 0359B4 80034DB4 318C0078 */ andi $t4, $t4, 0x78 -/* 0359B8 80034DB8 11800012 */ beqz $t4, .L80034E04 -/* 0359BC 80034DBC 00000000 */ nop -/* 0359C0 80034DC0 44812000 */ mtc1 $at, $f4 -/* 0359C4 80034DC4 240C0001 */ li $t4, 1 -/* 0359C8 80034DC8 46045101 */ sub.s $f4, $f10, $f4 -/* 0359CC 80034DCC 3C018000 */ lui $at, 0x8000 -/* 0359D0 80034DD0 44CCF800 */ ctc1 $t4, $31 -/* 0359D4 80034DD4 00000000 */ nop -/* 0359D8 80034DD8 46002124 */ cvt.w.s $f4, $f4 -/* 0359DC 80034DDC 444CF800 */ cfc1 $t4, $31 -/* 0359E0 80034DE0 00000000 */ nop -/* 0359E4 80034DE4 318C0078 */ andi $t4, $t4, 0x78 -/* 0359E8 80034DE8 15800004 */ bnez $t4, .L80034DFC -/* 0359EC 80034DEC 00000000 */ nop -/* 0359F0 80034DF0 440C2000 */ mfc1 $t4, $f4 -/* 0359F4 80034DF4 10000007 */ b .L80034E14 -/* 0359F8 80034DF8 01816025 */ or $t4, $t4, $at -.L80034DFC: -/* 0359FC 80034DFC 10000005 */ b .L80034E14 -/* 035A00 80034E00 240CFFFF */ li $t4, -1 -.L80034E04: -/* 035A04 80034E04 440C2000 */ mfc1 $t4, $f4 -/* 035A08 80034E08 00000000 */ nop -/* 035A0C 80034E0C 0580FFFB */ bltz $t4, .L80034DFC -/* 035A10 80034E10 00000000 */ nop -.L80034E14: -/* 035A14 80034E14 44CBF800 */ ctc1 $t3, $31 -/* 035A18 80034E18 A04C01FF */ sb $t4, 0x1ff($v0) -/* 035A1C 80034E1C 00000000 */ nop -.L80034E20: -/* 035A20 80034E20 8FAD008C */ lw $t5, 0x8c($sp) -.L80034E24: -/* 035A24 80034E24 24840001 */ addiu $a0, $a0, 1 -/* 035A28 80034E28 148DFF94 */ bne $a0, $t5, .L80034C7C -/* 035A2C 80034E2C 24A50004 */ addiu $a1, $a1, 4 -.L80034E30: -/* 035A30 80034E30 8FBF004C */ lw $ra, 0x4c($sp) -/* 035A34 80034E34 C7B50018 */ lwc1 $f21, 0x18($sp) -/* 035A38 80034E38 C7B4001C */ lwc1 $f20, 0x1c($sp) -/* 035A3C 80034E3C C7B70020 */ lwc1 $f23, 0x20($sp) -/* 035A40 80034E40 C7B60024 */ lwc1 $f22, 0x24($sp) -/* 035A44 80034E44 C7B90028 */ lwc1 $f25, 0x28($sp) -/* 035A48 80034E48 C7B8002C */ lwc1 $f24, 0x2c($sp) -/* 035A4C 80034E4C C7BB0030 */ lwc1 $f27, 0x30($sp) -/* 035A50 80034E50 C7BA0034 */ lwc1 $f26, 0x34($sp) -/* 035A54 80034E54 C7BD0038 */ lwc1 $f29, 0x38($sp) -/* 035A58 80034E58 C7BC003C */ lwc1 $f28, 0x3c($sp) -/* 035A5C 80034E5C C7BF0040 */ lwc1 $f31, 0x40($sp) -/* 035A60 80034E60 C7BE0044 */ lwc1 $f30, 0x44($sp) -/* 035A64 80034E64 8FB00048 */ lw $s0, 0x48($sp) -/* 035A68 80034E68 03E00008 */ jr $ra -/* 035A6C 80034E6C 27BD0098 */ addiu $sp, $sp, 0x98 - diff --git a/src/controller.c b/src/controller.c index 4b3ea1b3..f0c15baf 100644 --- a/src/controller.c +++ b/src/controller.c @@ -196,7 +196,7 @@ u16 get_buttons_released_from_player(s32 player) { * Clamps the X joystick axis of the selected player to 70 and returns it. * Official name: joyGetStickX */ -s8 clamp_joystick_x_axis(s32 player) { +s32 clamp_joystick_x_axis(s32 player) { return clamp_joystick(gControllerCurrData[sPlayerID[player]].stick_x); } @@ -204,7 +204,7 @@ s8 clamp_joystick_x_axis(s32 player) { * Clamps the Y joystick axis of the selected player to 70 and returns it. * Official name: joyGetStickY */ -s8 clamp_joystick_y_axis(s32 player) { +s32 clamp_joystick_y_axis(s32 player) { return clamp_joystick(gControllerCurrData[sPlayerID[player]].stick_y); } diff --git a/src/controller.h b/src/controller.h index f898ade6..f1939722 100644 --- a/src/controller.h +++ b/src/controller.h @@ -22,8 +22,8 @@ void swap_player_1_and_2_ids(void); u16 get_buttons_held_from_player(s32 player); u32 get_buttons_pressed_from_player(s32 player); u16 get_buttons_released_from_player(s32 player); -s8 clamp_joystick_x_axis(s32 player); -s8 clamp_joystick_y_axis(s32 player); +s32 clamp_joystick_x_axis(s32 player); +s32 clamp_joystick_y_axis(s32 player); s8 clamp_joystick(s8 stickMag); void disable_button_mask(void); diff --git a/src/fade_transition.c b/src/fade_transition.c index f8c5eba7..f2022904 100644 --- a/src/fade_transition.c +++ b/src/fade_transition.c @@ -23,7 +23,7 @@ u16 sTransitionFlags = 0; u16 D_800E31B8 = 0; s8 D_800E31BC = 0; Vertex *sTransitionVtx[2] = { NULL, NULL }; -TriangleList *sTransitionTris[2] = { NULL, NULL }; +Triangle *sTransitionTris[2] = { NULL, NULL }; s32 sTransitionTaskNum = 0; Gfx dTransitionFadeSettings[] = { @@ -460,7 +460,75 @@ void render_fade_fullscreen(Gfx **dList, UNUSED MatrixS **mats, UNUSED Vertex ** reset_render_settings(dList); } -GLOBAL_ASM("asm/non_matchings/fade_transition/func_800C0B00.s") +void func_800C0B00(FadeTransition *transition, s32 numVerts, s32 numTris, s16 *arg3, u8 *arg4, u8 *arg5, u8 *arg6, u8 *arg7, u8 *arg8) { + s32 temp; + u8 *swap; + s32 sizeVerts; + s32 sizeTris; + s32 i; + s32 j; + + j = numVerts; + sizeVerts = j * 10; + sizeTris = numTris * 16; + i = (j * 12); + + sTransitionVtx[0] = allocate_from_main_pool_safe(((sizeVerts + sizeTris) * 2) + (i * 3), 0xFFFF00FF); + sTransitionVtx[1] = sTransitionVtx[0] + j; + sTransitionTris[0] = (Triangle*)(sTransitionVtx[1] + j); + sTransitionTris[1] = (Triangle*)(((u8 *) sTransitionTris[0]) + sizeTris); + D_8012A770 = (f32 *) (((u8 *) sTransitionTris[1]) + sizeTris); + D_8012A774 = (f32 *) (((u8 *) D_8012A770) + i); + D_8012A778 = (f32 *) (((u8 *) D_8012A774) + i); + if (transition->type & 0x80) { + swap = arg4; + arg4 = arg5; + arg5 = swap; + swap = arg6; + arg6 = arg7; + arg7 = swap; + } + + for (i = 0; i < numVerts; i++) { + D_8012A770[(i * 3) + 0] = arg3[arg4[i]]; + D_8012A770[(i * 3) + 1] = arg3[arg4[i] + 1]; + D_8012A770[(i * 3) + 2] = arg6[i]; + D_8012A778[(i * 3) + 0] = arg3[arg5[i]]; + D_8012A778[(i * 3) + 1] = arg3[arg5[i] + 1]; + D_8012A778[(i * 3) + 2] = arg7[i]; + D_8012A774[(i * 3) + 0] = (D_8012A778[(i * 3) + 0] - D_8012A770[(i * 3) + 0]) / sTransitionFadeTimer; + D_8012A774[(i * 3) + 1] = (D_8012A778[(i * 3) + 1] - D_8012A770[(i * 3) + 1]) / sTransitionFadeTimer; + D_8012A774[(i * 3) + 2] = (D_8012A778[(i * 3) + 2] - D_8012A770[(i * 3) + 2]) / sTransitionFadeTimer; + } + + for (i = 0; i < 2; i++) { + for (j = 0; j < numVerts; j++) { + sTransitionVtx[i][j].z = -16; + sTransitionVtx[i][j].r = gCurFadeRed; + sTransitionVtx[i][j].g = gCurFadeGreen; + sTransitionVtx[i][j].b = gCurFadeBlue; + } + } + + for (i = 0; i < 2; i++) { + for (j = 0; j < numTris; j++) { + sTransitionTris[i][j].flags = 0x40; + sTransitionTris[i][j].vi0 = arg8[(j * 3) + 0]; + sTransitionTris[i][j].uv0.u = 0; + sTransitionTris[i][j].uv0.v = 0; + sTransitionTris[i][j].vi1 = arg8[(j * 3) + 1]; + sTransitionTris[i][j].uv1.u = 0; + sTransitionTris[i][j].uv1.v = 0; + sTransitionTris[i][j].vi2 = arg8[(j * 3) + 2]; + sTransitionTris[i][j].uv2.u = 0; + sTransitionTris[i][j].uv2.v = 0; + } + } + + sTransitionStatus = 1; + D_8012A77C = numVerts; +} + void func_800C1130(s32 updateRate) { s32 i; diff --git a/src/fade_transition.h b/src/fade_transition.h index 6e1543c0..2c729c4d 100644 --- a/src/fade_transition.h +++ b/src/fade_transition.h @@ -60,10 +60,10 @@ void func_800C27A0(s32 updateRate); s32 transition_begin(FadeTransition *transition); void render_fade_circle(Gfx **dList, MatrixS **mats, Vertex **verts); void func_800C1130(s32 updateRate); +void func_800C0B00(FadeTransition *transition, s32 numVerts, s32 numTris, s16 *arg3, u8 *arg4, u8 *arg5, u8 *arg6, u8 *arg7, u8 *arg8); void render_fade_waves(Gfx **dlist, UNUSED MatrixS **mats, UNUSED Vertex **verts); //Non Matching void func_800C1EE8(s32); //Non Matching -void func_800C0B00(FadeTransition *transition, s32, s32, s16*, s8*, s8*, s8*, s8*, s8*); //Non Matching void func_800C15D4(FadeTransition *transition); //Non Matching #endif diff --git a/src/game_ui.c b/src/game_ui.c index e45eeb13..970043ed 100644 --- a/src/game_ui.c +++ b/src/game_ui.c @@ -769,7 +769,44 @@ void render_course_indicator_arrows(Object_Racer *racer, s32 updateRate) { } } -GLOBAL_ASM("asm/non_matchings/game_ui/func_800A1248.s") +// Renders the HUD for Smokey Castle +void func_800A1248(s32 arg0, Object *obj, s32 updateRate) { + Object_Racer *racer; + Object **racers; + s32 numRacers; + s32 i; + + racer = &obj->unk64->racer; + racers = get_racer_objects(&numRacers); + func_80068508(1); + render_race_start(arg0, updateRate); + switch (gNumActivePlayers) { + case 1: + for (i = 0; i < numRacers; i++) { + racer = &racers[i]->unk64->racer; + render_treasure_hud(racer); + if (i == 1) { + gCurrentHud->unk64C += 55.0f; + gCurrentHud->unk40C += 55.0f; + } + gCurrentHud->unk64C += 55.0f; + gCurrentHud->unk40C += 55.0f; + } + if (1) {} // Fakematch + gCurrentHud->unk64C -= 275.0f; + gCurrentHud->unk40C -= 275.0f; + break; + case 3: + case 4: + render_treasure_hud(racer); + break; + } + racer = &obj->unk64->racer; + reset_render_settings(&gHUDCurrDisplayList); + render_racer_bananas(racer, updateRate); + render_weapon_hud(obj, updateRate); + func_80068508(0); +} /** * The Egg Collector challenge mode displays the icons of each player and their score. @@ -792,8 +829,107 @@ void render_hud_challenge_eggs(s32 arg0, Object *arg1, s32 updateRate) { } } -GLOBAL_ASM("asm/non_matchings/game_ui/func_800A14F0.s") -GLOBAL_ASM("asm/non_matchings/game_ui/func_800A19A4.s") +void func_800A14F0(Object *racerObj, s32 updateRate) { + Object **racers; + s32 i; + Object_Racer *racer; + s32 numRacers; + s32 numOfFinishedPlayers; + Object_Racer *curRacer; + s32 sp44; + s32 sp40; + s32 sp3C; + s32 sp38; + + racers = get_racer_objects(&numRacers); + if (gNumActivePlayers == 2) { + numOfFinishedPlayers = 0; + for(i = 0; i < numRacers; i++) { + curRacer = &racers[i]->unk64->racer; + if(curRacer->playerIndex != -1 && curRacer->raceFinished) { + numOfFinishedPlayers++; + } + } + if (numOfFinishedPlayers == 2) { + return; + } + } + if (racerObj != NULL) { + racer = &racerObj->unk64->racer; + } else { + racer = &racers[0]->unk64->racer; + } + if (numRacers == 4) { + func_80068508(1); + sp44 = (s32) gCurrentHud->unk64C; + sp3C = (s32) gCurrentHud->unk650; + sp40 = (s32) (gCurrentHud->unk66C - sp44); + sp38 = (s32) (gCurrentHud->unk670 - sp3C); + for(i = 0; i < 4; i++) { + curRacer = &racers[i]->unk64->racer; + if (((s32) gNumActivePlayers < 3) || (racer->playerIndex == curRacer->playerIndex)) { + func_800A19A4(curRacer, updateRate); + } + D_800E2834 = -2; + if (gNumActivePlayers == 1) { + gCurrentHud->unk64C += 68.0f; + } else if (gNumActivePlayers == 2) { + gCurrentHud->unk64C = sp44; + if (osTvType == 0) { + gCurrentHud->unk650 = (f32) ((f64) gCurrentHud->unk650 + 66.0); + gCurrentHud->unk670 = (f32) ((f64) gCurrentHud->unk670 + 66.0); + } else { + gCurrentHud->unk650 += 55.0f; + gCurrentHud->unk670 += 55.0f; + } + } + gCurrentHud->unk66C = gCurrentHud->unk64C + sp40; + } + gCurrentHud->unk64C = sp44; + gCurrentHud->unk66C = sp44 + sp40; + gCurrentHud->unk650 = sp3C; + gCurrentHud->unk670 = sp3C + sp38; + func_80068508(0); + } +} + + +void func_800A19A4(Object_Racer *racer, s32 updateRate) { + s32 i; + s32 var_s1; + s32 sp44; + s32 sp40; + s32 i2; + + sp40 = (s32) gCurrentHud->unk66C; + gCurrentHud->unk646 = racer->characterId + 56; + D_80126CD5 = 1; + if (((s32) gNumActivePlayers < 3) || ((gNumActivePlayers == 3) && (racer->playerIndex == -1))) { + func_800AA600(&gHUDCurrDisplayList, &gHUDCurrMatrix, &gHUDCurrVertex, &gCurrentHud->unk640); + } + if (gCurrentHud->unk67A < 0) { + sp44 = (gCurrentHud->unk67A * 2) + 256; + } else { + sp44 = 255 - (gCurrentHud->unk67A * 2); + } + if (sp44 > 254) { + sp44 = 254; + } + for (i = 0; (i < racer->lap) && (i < 3); i++) { + func_800AA600(&gHUDCurrDisplayList, &gHUDCurrMatrix, &gHUDCurrVertex, &gCurrentHud->unk660); + gCurrentHud->unk66C += 12.0f; + } + D_800E2834 = sp44 | ~0xFF; + i2 = i; + for (i = 0; (i < racer->eggHudCounter) && (i2 < 3); i++) { + func_800AA600(&gHUDCurrDisplayList, &gHUDCurrMatrix, &gHUDCurrVertex, &gCurrentHud->unk660); + i2++; + gCurrentHud->unk66C += 12.0f; + } + gCurrentHud->unk66C = (f32) sp40; + D_80126CD5 = 0; +} + void func_800A1C04(s32 arg0, Object *obj, s32 updateRate) { Object **racerObjs; @@ -1569,7 +1705,64 @@ void render_race_finish_position(Object_64 *obj, s32 updateRate) { UNUSED void func_800A4C34(UNUSED s32 arg0, UNUSED s32 arg1, UNUSED s32 arg2) {} -GLOBAL_ASM("asm/non_matchings/game_ui/func_800A4C44.s") +void func_800A4C44(Object_Racer *racer, s32 updateRate) { + s32 sp34; + f32 prevCurrHudUnkC; + f32 temp; + s32 sp1C; + Settings *settings; + + if (!racer->raceFinished) { + sp34 = racer->unk1AE; + if (func_8001139C() != 0) { + if ((get_current_level_race_type() == 8) || (is_taj_challenge())) { + sp34 = 2; + } else { + settings = get_settings(); + sp34 = settings->racers[D_80126D10].starting_position; + gCurrentHud->unk18 = sp34; + sp34++; + } + } + if (gHUDNumPlayers < 2) { + if (sp34 < 4) { + gCurrentHud->unk38 = sp34 - 1; + } else { + gCurrentHud->unk38 = 3; + } + func_800AA600(&gHUDCurrDisplayList, &gHUDCurrMatrix, &gHUDCurrVertex, &gCurrentHud->unk20); + } + temp = (gCurrentHud->unk1B + 129); + temp *= 128.0f; + temp = sins_f(temp); + sp1C = sp34 - 1; + gCurrentHud->unk8 = (gCurrentHud->unk1C / 127.0f) + (1.0 + (0.5 * temp)); + prevCurrHudUnkC = gCurrentHud->unkC; + gCurrentHud->unkC -= (24.0f * gCurrentHud->unk8); + func_800AA600(&gHUDCurrDisplayList, &gHUDCurrMatrix, &gHUDCurrVertex, &gCurrentHud->unk0); + gCurrentHud->unkC = prevCurrHudUnkC; + if (gCurrentHud->unk1A != 0) { + if (gCurrentHud->unk1B < (127 - (updateRate * 16))) { + gCurrentHud->unk1B += (updateRate * 16); + } else { + gCurrentHud->unk1B = 127; + } + } + if (sp1C != gCurrentHud->unk18) { + if ((gCurrentHud->unk1A != 0) && (gCurrentHud->unk1B > 0)) { + gCurrentHud->unk1B = -gCurrentHud->unk1B; + } else { + gCurrentHud->unk1B = -127; + gCurrentHud->unk1A = 1; + } + } + gCurrentHud->unk18 = sp1C; + if ((gCurrentHud->unk1A != 0) && (gCurrentHud->unk1B == 127)) { + gCurrentHud->unk1A = 0; + } + } +} + /** * Displays the current lap number onscreen. @@ -1832,7 +2025,28 @@ void render_wrong_way_text(Object_Racer *obj, s32 updateRate) { func_8007BF1C(FALSE); } -GLOBAL_ASM("asm/non_matchings/game_ui/func_800A5F18.s") +void func_800A5F18(Object_Racer* racer) { + s32 sp24; + + func_800AA600(&gHUDCurrDisplayList, &gHUDCurrMatrix, &gHUDCurrVertex, &gCurrentHud->unk5E0); + func_800AA600(&gHUDCurrDisplayList, &gHUDCurrMatrix, &gHUDCurrVertex, &gCurrentHud->unk600); + if (!(get_current_level_race_type() & 0x40) && (is_in_two_player_adventure() == 0)) { + get_racer_objects(&sp24); + if (((s32) gNumActivePlayers >= 2) && ((is_in_two_player_adventure() == 0) || (is_postrace_viewport_active() == 0))) { + set_text_font(0); + if (sp24 != racer->unk1AC) { + set_text_colour(255, 255, 255, 0, 255); + draw_text(&gHUDCurrDisplayList, (s32) (gCurrentHud->unk16C - 40.0f), (s32) gCurrentHud->unk170, "RACE", ALIGN_TOP_LEFT); + func_800A7FBC((s32) gCurrentHud->unk16C, (s32) gCurrentHud->unk170, (s32) (s8) gCurrentHud->unk17A, (s32) (s8) gCurrentHud->unk17B, (s32) (s8) gCurrentHud->unk17C, 1); + draw_text(&gHUDCurrDisplayList, (s32) (gCurrentHud->unk2EC - 40.0f), (s32) gCurrentHud->unk2F0, "LAP", ALIGN_TOP_LEFT); + func_800A7FBC((s32) gCurrentHud->unk2EC, (s32) gCurrentHud->unk2F0, (s32) (s8) gCurrentHud->unk2FA, (s32) (s8) gCurrentHud->unk2FB, (s32) (s8) gCurrentHud->unk2FC, 1); + } else { + draw_text(&gHUDCurrDisplayList, (s32) (gCurrentHud->unk16C - 35.0f), (s32) gCurrentHud->unk170, "DID NOT FINISH", ALIGN_TOP_LEFT); + } + } + } +} + GLOBAL_ASM("asm/non_matchings/game_ui/func_800A6254.s") /** @@ -1851,8 +2065,130 @@ void play_time_trial_end_message(s16 *playerID) { } } -GLOBAL_ASM("asm/non_matchings/game_ui/func_800A6E30.s") -GLOBAL_ASM("asm/non_matchings/game_ui/func_800A718C.s") +void func_800A6E30(Object_Racer *racer, s32 updateRate) { + s32 temp; + + switch (gCurrentHud->unk1DA) { + case 0: + D_800E2770->unk2 = 0x7F; + D_800E2770->unk3 = 0; + D_800E2770->unkC = (s8) racer->playerIndex; + play_sound_global(0x16U, NULL); + if ((gHUDNumPlayers == 0) || (gHUDNumPlayers == 1)) { + gCurrentHud->unk1CC = -200.0f; + gCurrentHud->unk1DD = 0; + } else { + if ((racer->playerIndex == 0) || (racer->playerIndex == 2)) { + gCurrentHud->unk1DD = -0x50U; + gCurrentHud->unk1CC = -200.0f; + } else { + gCurrentHud->unk1DD = 0x50; + gCurrentHud->unk1CC = -40.0f; + } + } + gCurrentHud->unk1DA = 1; + return; + case 1: + temp = (updateRate * 13); + if (gCurrentHud->unk1CC < (gCurrentHud->unk1DD - temp)) { + gCurrentHud->unk1CC += temp; + } else { + gCurrentHud->unk1CC = gCurrentHud->unk1DD; + gCurrentHud->unk1DA = 2; + gCurrentHud->unk1DB = -0x78U; + if ((gHUDVoiceSoundMask == 0) && (D_80126D71 == 0)) { + play_time_trial_end_message(&racer->playerIndex); + } + } + func_800AA600(&gHUDCurrDisplayList, &gHUDCurrMatrix, &gHUDCurrVertex, &gCurrentHud->unk1C0); + return; + case 2: + gCurrentHud->unk1DB = (s8) gCurrentHud->unk1DB + updateRate; + if ((s8) gCurrentHud->unk1DB >= 0x78) { + gCurrentHud->unk1DA = 3; + if ((gHUDNumPlayers == 0) || (gHUDNumPlayers == 1)) { + gCurrentHud->unk1DD = 0x38; + } else { + if ((racer->playerIndex == 0) || (racer->playerIndex == 2)) { + gCurrentHud->unk1DD = 0x38; + } else { + gCurrentHud->unk1DD = -0x28U; + } + } + play_sound_global(0x16U, NULL); + } + func_800AA600(&gHUDCurrDisplayList, &gHUDCurrMatrix, &gHUDCurrVertex, &gCurrentHud->unk1C0); + return; + case 3: + gCurrentHud->unk1CC -= updateRate * 13; + if (gCurrentHud->unk1CC < gCurrentHud->unk1DD) { + gCurrentHud->unk1DA = 4; + } + func_800AA600(&gHUDCurrDisplayList, &gHUDCurrMatrix, &gHUDCurrVertex, &gCurrentHud->unk1C0); + return; + case 4: + D_800E2770->unk3 = -1; + gCurrentHud->unk1DA = 5; + gCurrentHud->unk1DB = 0; + /* fallthrough */ + default: + return; + } +} + + +void func_800A718C(Object_64 *arg0) { + s32 sp2C; + s32 div; + s32 pad; + u32 sp20; + Settings *settings; + + settings = get_settings(); + if (osTvType == 0) { + sp20 = 0x286; + } else { + sp20 = 0x348; + } + if (settings->cutsceneFlags & 4) { + gCurrentHud->unk266 = 0x45; + } + if ((func_8001E440() == 10) && (func_8001AE54() < sp20)) { + sp2C = *settings->balloonsPtr - 1; + } else { + sp2C = *settings->balloonsPtr; + sp2C = (s32) sp2C; + sp2C = sp2C; + if (func_8001E440() == 0xA) { + sp2C = (s32) sp2C; + if ((func_8001AE54() < (u32) (sp20 + 8)) && (D_80126D44 == 0)) { + sp2C = (s32) sp2C; + play_sound_global(0xFEU, &D_80126D44); + } + } + } + if (sp2C < 0) { + sp2C = 0; + } + div = sp2C / 10; + if (div != 0) { + gCurrentHud->unk2B8 = (s16) div; + gCurrentHud->unk2D8 = (s16) (sp2C % 10); + func_800AA600(&gHUDCurrDisplayList, &gHUDCurrMatrix, &gHUDCurrVertex, &gCurrentHud->unk2C0); + } else { + gCurrentHud->unk2B8 = (s16) (sp2C % 10); + } + func_800AA600(&gHUDCurrDisplayList, &gHUDCurrMatrix, &gHUDCurrVertex, &gCurrentHud->unk2A0); + set_viewport_tv_type(1); + if (osTvType == 0) { + func_8007BF1C(1); + } + func_800AA600(&gHUDCurrDisplayList, &gHUDCurrMatrix, &gHUDCurrVertex, &gCurrentHud->unk260); + func_8007BF1C(0); + set_viewport_tv_type(0); + func_800AA600(&gHUDCurrDisplayList, &gHUDCurrMatrix, &gHUDCurrVertex, &gCurrentHud->unk280); +} + /** * Unused function that plays whichever T.T voice line is passed through. @@ -2059,7 +2395,72 @@ void render_race_time(Object_Racer *racer, s32 updateRate) { } } -GLOBAL_ASM("asm/non_matchings/game_ui/func_800A7FBC.s") +void func_800A7FBC(s32 arg0, s32 arg1, s32 minutes, s32 seconds, s32 hundredths, s32 someBool) { + s32 pad; + unk80126CDC_entry entry2; + s32 unk14; + s32 unk10; + s32 unkC; + s32 unk8; + s32 var_s4; + s32 unk0; + + entry2.unkC = arg0; + entry2.unk10 = arg1; + entry2.unk4 = 0; + entry2.unk2 = 0; + entry2.unk0 = 0; + entry2.unk8 = 1.0f; + entry2.unk14 = 0.0f; + if (!someBool) { + unk14 = 11; + unk10 = 10; + unkC = 10; + unk8 = 2; + var_s4 = 9; + unk0 = 11; + } else { + unk14 = 10; + unk10 = 8; + unkC = 7; + unk8 = 0; + var_s4 = 10; + unk0 = 12; + } + entry2.unk6 = var_s4; + entry2.unk18 = minutes / 10; + func_800AA600(&gHUDCurrDisplayList, &gHUDCurrMatrix, &gHUDCurrVertex, (unk80126CDC** ) &entry2); + entry2.unkC += unk14; + entry2.unk18 = minutes % 10; + func_800AA600(&gHUDCurrDisplayList, &gHUDCurrMatrix, &gHUDCurrVertex, (unk80126CDC** ) &entry2); + entry2.unk18 = 0; + entry2.unkC += unk10; + entry2.unk10 += unk8; + entry2.unk6 = unk0; + func_800AA600(&gHUDCurrDisplayList, &gHUDCurrMatrix, &gHUDCurrVertex, (unk80126CDC** ) &entry2); + entry2.unk6 = var_s4; + entry2.unkC += unkC; + entry2.unk10 -= unk8; + entry2.unk18 = seconds / 10; + func_800AA600(&gHUDCurrDisplayList, &gHUDCurrMatrix, &gHUDCurrVertex, (unk80126CDC** ) &entry2); + entry2.unkC += unk14; + entry2.unk18 = seconds % 10; + func_800AA600(&gHUDCurrDisplayList, &gHUDCurrMatrix, &gHUDCurrVertex, (unk80126CDC** ) &entry2); + entry2.unk18 = 0; + entry2.unkC += unk10; + entry2.unk10 += unk8; + entry2.unk6 = (s16) unk0; + func_800AA600(&gHUDCurrDisplayList, &gHUDCurrMatrix, &gHUDCurrVertex, (unk80126CDC** ) &entry2); + entry2.unk6 = var_s4; + entry2.unkC += unkC; + entry2.unk10 -= unk8; + entry2.unk18 = hundredths / 10; + func_800AA600(&gHUDCurrDisplayList, &gHUDCurrMatrix, &gHUDCurrVertex, (unk80126CDC** ) &entry2); + entry2.unkC += unk14; + entry2.unk18 = hundredths % 10; + func_800AA600(&gHUDCurrDisplayList, &gHUDCurrMatrix, &gHUDCurrVertex, (unk80126CDC** ) &entry2); +} + /** * Loads the minimap sprite from the level data, then sets the global colours for the minimap. diff --git a/src/game_ui.h b/src/game_ui.h index d839f7ff..c361ff17 100644 --- a/src/game_ui.h +++ b/src/game_ui.h @@ -71,12 +71,37 @@ typedef struct { f32 unkC; } IndicatorArrow; +// Used in func_800A7FBC +typedef struct unk80126CDC_entry { + s16 unk0; + s16 unk2; + s16 unk4; + s16 unk6; + f32 unk8; + f32 unkC; + f32 unk10; + f32 unk14; + s16 unk18; +} unk80126CDC_entry; + // Size: 0x760 typedef struct unk80126CDC { struct unk80126CDC *unk0; u8 unk4[0x2]; s16 unk6; - u8 unk8[0x38]; + f32 unk8; + f32 unkC; + u8 pad10[0x8]; + s16 unk18; + s8 unk1A; + s8 unk1B; + s8 unk1C; + s8 unk1D; + u8 pad1E[0x2]; + struct unk80126CDC *unk20; + u8 pad24[0x14]; + s16 unk38; + u8 pad3A[0x6]; struct unk80126CDC *unk40; s16 unk44; s16 unk46; @@ -92,7 +117,7 @@ typedef struct unk80126CDC { s8 unk5E; s8 unk5F; struct unk80126CDC *unk60; - s8 unk64[4]; + s8 unk64[0x4]; u8 unk68[0x18]; struct unk80126CDC *unk80; u8 unk84[0x14]; @@ -128,22 +153,36 @@ typedef struct unk80126CDC { u8 unk134[0x4]; s16 unk138; u8 unk13A[0x6]; - struct unk80126CDC * unk140; + struct unk80126CDC *unk140; u8 unk144[0x16]; s8 unk15A; s8 unk15B; u8 pad[0x10]; f32 unk16C; f32 unk170; - u8 unk174[0xC]; + u8 pad174[6]; + s8 unk17A; + s8 unk17B; + s8 unk17C; + u8 pad17D[3]; struct unk80126CDC *unk180; u8 unk184[0x8]; f32 unk18C; u8 pad190[0xA]; s8 unk19A[1]; - u8 pad19C[4]; + u8 pad19B; + u8 pad19C[0x4]; struct unk80126CDC *unk1A0; - u8 pad1A4[0x3C]; + u8 pad1A4[0x1C]; + struct unk80126CDC *unk1C0; + u8 pad1C4[0x8]; + f32 unk1CC; + u8 pad1D0[0xA]; + s8 unk1DA; + s8 unk1DB; + s8 unk1DC; + s8 unk1DD; + u8 pad1DE[0x2]; struct unk80126CDC *unk1E0; s16 unk1E4; s16 unk1E6; @@ -153,7 +192,7 @@ typedef struct unk80126CDC { u8 pad1F4[0xC]; struct unk80126CDC *unk200; u8 unk204[0x14]; - s16 unk218; + s16 unk218; s8 unk21A; s8 unk21B; u8 pad21C[0x4]; @@ -161,6 +200,7 @@ typedef struct unk80126CDC { u8 pad224[0x2]; s16 unk226; u8 pad228[0x2]; + u8 pad22A[0x2]; f32 unk22C; f32 unk230; f32 unk234; @@ -169,12 +209,31 @@ typedef struct unk80126CDC { u8 unk244[0x8]; f32 unk24C; f32 unk250; - u8 unk254[0x98]; + u8 pad254[0xC]; + struct unk80126CDC *unk260; + u8 pad264[0x2]; + s16 unk266; + u8 pad268[0x18]; + struct unk80126CDC *unk280; + u8 pad284[0x1C]; + struct unk80126CDC *unk2A0; + u8 pad2A4[0x14]; + s16 unk2B8; + u8 pad2BA[0x6]; + struct unk80126CDC *unk2C0; + u8 pad2C4[0x14]; + s16 unk2D8; + u8 pad2DA[0x12]; f32 unk2EC; f32 unk2F0; - u8 unk2F4[0xC]; + u8 unk2F4[0x6]; + s8 unk2FA; + s8 unk2FB; + s8 unk2FC; + u8 pad2FD[3]; s16 unk300; u8 unk302[0xC]; + u8 pad30E[0x2]; f32 unk310; u8 unk314[0xC]; s16 unk320; @@ -207,13 +266,14 @@ typedef struct unk80126CDC { s8 unk39B; s32 unk39C; struct unk80126CDC *unk3A0; - u8 pad304[8]; + u8 pad304[0x8]; f32 unk3AC; u8 unk3B0[0xC]; s8 unk3BC; - s8 unk3BD[2]; + s8 unk3BD[0x2]; + u8 pad3BF; struct unk80126CDC *unk3C0; - s8 unk3C4[8]; + s8 unk3C4[0x8]; f32 unk3CC; u8 unk3D0[0xA]; s8 unk3DA; @@ -223,7 +283,7 @@ typedef struct unk80126CDC { s8 unk3DE; s8 unk3DF; struct unk80126CDC *unk3E0; - u8 unk3E4[8]; + u8 unk3E4[0x8]; f32 unk3EC; u8 unk3F0[0xC]; s8 unk3FC; @@ -242,24 +302,27 @@ typedef struct unk80126CDC { s16 unk444; u8 unk446[0xA]; f32 unk450; - s8 unk454[4]; + s8 unk454[0x4]; u8 unk458; u8 unk459; u8 unk45A[0x6]; struct unk80126CDC *unk460; - u8 unk462[0x8]; + u8 unk464[0x6]; + u8 pad46A[0x2]; f32 unk46C; u8 unk470[0xA]; - s8 unk47A[4]; + s8 unk47A[0x4]; u8 unk47E; u8 unk47F; struct unk80126CDC *unk480; - u8 unk482[0x6]; + u8 unk484[0x4]; + u8 pad488[0x4]; f32 unk48C; u8 unk490[0xC]; s8 unk49C; s8 unk49D; s8 unk49E[0x21]; + u8 pad4BF; struct unk80126CDC *unk4C0; s16 unk4C4; u8 unk4C6[0x1A]; @@ -278,13 +341,17 @@ typedef struct unk80126CDC { struct unk80126CDC *unk5A0; u8 unk5A4[0x1C]; struct unk80126CDC *unk5C0; - u8 unk5C1[0xC]; + u8 unk5C4[0xC]; f32 unk5D0; u8 unk5D4[0x6]; s8 unk5DA; s8 unk5DB; s8 unk5DC; - u8 unk5DD[0x43]; + u8 unk5DD[0x3]; + struct unk80126CDC *unk5E0; + u8 unk5E4[0x1C]; + struct unk80126CDC *unk600; + u8 unk604[0x1C]; struct unk80126CDC *unk620; u8 unk624[0x14]; s16 unk638; @@ -297,7 +364,9 @@ typedef struct unk80126CDC { u8 unk648[0x4]; f32 unk64C; f32 unk650; - u8 unk654[0x18]; + u8 unk654[0xC]; + struct unk80126CDC *unk660; + u8 unk664[0x8]; f32 unk66C; f32 unk670; u8 unk674[0x6]; @@ -406,18 +475,18 @@ void func_800A36CC(u8, u8, u8, u8, u8); void func_800A0BD4(s32 updateRate); void func_800A47A0(Object_Racer *racer, s32 updateRate); void func_800A7A60(Object *racerObj); +void func_800A6E30(Object_Racer *racer, s32 updateRate); +void func_800A19A4(Object_Racer *racer, s32 updateRate); +void func_800A14F0(Object *racerObj, s32 updateRate); +void func_800A4C44(Object_Racer *racer, s32 updateRate); +void func_800A1248(s32 arg0, Object *obj, s32 updateRate); // Non Matching -void func_800A14F0(Object *, s32); -void func_800A4C44(Object_Racer *racer, s32 updateRate); void func_800A718C(Object_64 *obj); void func_800AA600(Gfx **dList, MatrixS **mtx, Vertex **vtxList, unk80126CDC **arg3); void func_800A7FBC(s32, s32, s32 minutes, s32 seconds, s32 hundredths, s32); -void func_800A1248(s32, Object*, s32); void func_800A277C(s32, Object*, s32); void func_800A6254(Object_64* obj, s32 updateRate); -void func_800A6E30(Object_64* obj, s32 updateRate); -void func_800A19A4(Object_Racer* racer, s32 updateRate); void func_800A1E48(Object*, s32); void render_treasure_hud(Object_Racer*); void func_800AA3EC(f32, f32, f32, f32, f32); diff --git a/src/menu.c b/src/menu.c index 8d09a685..757f7844 100644 --- a/src/menu.c +++ b/src/menu.c @@ -3064,154 +3064,149 @@ void menu_audio_options_init(void) { GLOBAL_ASM("asm/non_matchings/menu/func_80084854.s") -#ifdef NON_EQUIVALENT - -// Almost matching, should be functionally equivalent -s32 menu_audio_options_loop(s32 arg0) { - s32 buttonInputs; +s32 menu_audio_options_loop(s32 updateRate) { + s32 i; + u32 buttonsPressed; + s32 sp3C; + s32 sp38; + s32 sp34; s32 sp30; - s32 phi_a2; - s32 contY; - s32 contX; - s32 i; sp30 = 0; - gOptionBlinkTimer = (s32)((gOptionBlinkTimer + arg0) & 0x3F); + gOptionBlinkTimer = (gOptionBlinkTimer + updateRate) & 0x3F; if (gMenuDelay != 0) { if (gMenuDelay > 0) { - gMenuDelay += arg0; + gMenuDelay += updateRate; } else { - gMenuDelay -= arg0; + gMenuDelay -= updateRate; } } - if (gMenuDelay >= -0x13 && gMenuDelay < 0x14) { + if ((gMenuDelay > -20) && (gMenuDelay < 20)) { func_80084854(); } - if (gIgnorePlayerInputTime == 0 && gMenuDelay == 0) { - buttonInputs = 0; - contX = 0; - contY = 0; - phi_a2 = 0; - - // Check all 4 controllers for inputs - for (i = 0; i < 4; i++) { - buttonInputs |= get_buttons_pressed_from_player(i); - phi_a2 += clamp_joystick_x_axis(i); - contY += gControllersYAxisDirection[i]; - contX += gControllersXAxisDirection[i]; - } - - if (phi_a2 < 0) { - phi_a2 += 0x18; - if (phi_a2 > 0) { - phi_a2 = 0; + if (gIgnorePlayerInputTime == 0) { + sp3C = 0; + sp38 = 0; + if (gMenuDelay == 0) { + buttonsPressed = 0; + sp34 = 0; + for(i = 0; i < 4; i++) { + buttonsPressed |= get_buttons_pressed_from_player(i); + sp34 += clamp_joystick_x_axis(i); + sp3C += gControllersXAxisDirection[i]; + sp38 += gControllersYAxisDirection[i]; } - } else { - phi_a2 -= 0x18; - if (phi_a2 < 0) { - phi_a2 = 0; - } - } - - if (((buttonInputs & (A_BUTTON | START_BUTTON)) && (gMenuOptionCount == gOptionsMenuItemIndex + 1)) || (buttonInputs & B_BUTTON)) { - gMenuDelay = -1; - transition_begin(&sMenuTransitionFadeIn); - if (gOpacityDecayTimer >= 0) { - set_music_fade_timer(-0x80); - } - sp30 = 3; - } else if (contY < 0 && gOptionsMenuItemIndex < gMenuOptionCount - 1) { - gOptionsMenuItemIndex++; - sp30 = 1; - } else if (contY > 0 && gOptionsMenuItemIndex > 0) { - gOptionsMenuItemIndex--; - sp30 = 1; - } else if (gOptionsMenuItemIndex == 0 && contX != 0) { - if (contX < 0) { - D_800DFAC8--; + if (sp34 < 0) { + sp34 += 24; + if (sp34 > 0) { + sp34 = 0; + } } else { - D_800DFAC8++; - } - if (D_800DFAC8 < 0) { - D_800DFAC8 = 2; - } - if (D_800DFAC8 > 2) { - D_800DFAC8 = 0; - } - set_stereo_pan_mode(D_800DFAC8); - sp30 = 1; - } else if (((phi_a2 >> 2) != 0) && ((gOptionsMenuItemIndex == 1) || (gOptionsMenuItemIndex == 2))) { - if (gOptionsMenuItemIndex == 1) { - gSfxVolumeSliderValue += (phi_a2 >> 2); - if (gSfxVolumeSliderValue < 0) { - gSfxVolumeSliderValue = 0; - } else if (gSfxVolumeSliderValue >= 0x101) { - gSfxVolumeSliderValue = 0x100; + sp34 -= 24; + if (sp34 < 0) { + sp34 = 0; } - set_sfx_volume_slider(gSfxVolumeSliderValue); - } else if (gOptionsMenuItemIndex == 2) { - gMusicVolumeSliderValue += (phi_a2 >> 2); - if (gMusicVolumeSliderValue < 0) { - gMusicVolumeSliderValue = 0; + } + sp34 >>= 2; + if (((buttonsPressed & (A_BUTTON | START_BUTTON)) && (gMenuOptionCount == gOptionsMenuItemIndex + 1)) || (buttonsPressed & B_BUTTON)) { + gMenuDelay = -1; + transition_begin(&sMenuTransitionFadeIn); + if (gOpacityDecayTimer >= 0) { + set_music_fade_timer(-0x80); + + } + sp30 = 3; + } else if ((sp38 < 0) && (gOptionsMenuItemIndex < (gMenuOptionCount - 1))) { + gOptionsMenuItemIndex += 1; + sp30 = 1; + } else if ((sp38 > 0) && (gOptionsMenuItemIndex > 0)) { + gOptionsMenuItemIndex -= 1; + sp30 = 1; + } else if ((gOptionsMenuItemIndex == 0) && (sp3C != 0)) { + if (sp3C < 0) { + + D_800DFAC8 -= 1; } else { - if (gMusicVolumeSliderValue >= 0x101) { - gMusicVolumeSliderValue = 0x100; + D_800DFAC8 += 1; + } + if (D_800DFAC8 < 0) { + D_800DFAC8 = 2; + } + if (!(D_800DFAC8 < 3)) { + D_800DFAC8 = 0; + } + set_stereo_pan_mode(D_800DFAC8); + sp30 = 1; + } else if (sp34 && ((gOptionsMenuItemIndex == 1) || (gOptionsMenuItemIndex == 2))) { + if (gOptionsMenuItemIndex == 1) { + gSfxVolumeSliderValue += sp34; + if (gSfxVolumeSliderValue < 0) { + gSfxVolumeSliderValue = 0; + } else if (gSfxVolumeSliderValue > 256) { + gSfxVolumeSliderValue = 256; + } + set_sfx_volume_slider(gSfxVolumeSliderValue); + } else if (gOptionsMenuItemIndex == 2) { + gMusicVolumeSliderValue += sp34; + if (gMusicVolumeSliderValue < 0) { + gMusicVolumeSliderValue = 0; + } else if (gMusicVolumeSliderValue > 256) { + gMusicVolumeSliderValue = 256; + } + set_music_volume_slider(gMusicVolumeSliderValue); + if (music_is_playing() == 0) { + if (gOpacityDecayTimer >= 0) { + func_80000B28(); + play_music(D_800DFABC); + } else { + func_80000B28(); + set_music_player_voice_limit(0x18U); + play_music(0x18U); + func_80000B18(); + } } } - set_music_volume_slider(gMusicVolumeSliderValue); - if (!music_is_playing()) { - if (gOpacityDecayTimer >= 0) { - func_80000B28(); - play_music((u8)D_800DFABC); - } else { - func_80000B28(); - set_music_player_voice_limit(0x18); - play_music(SEQUENCE_MAIN_MENU); - func_80000B18(); + } else if ((gMenuOptionCount >= 5) && (gOptionsMenuItemIndex == 3)) { + if ((sp3C < 0) && (D_800DFABC > 0)) { + D_800DFABC -= 1; + sp30 = 1; + } else if (sp3C > 0) { + if (D_800DFABC < (ALSeqFile_80115CF8_GetSeqCount() - 1)) { + D_800DFABC += 1; + sp30 = 1; } } + if ((buttonsPressed & (A_BUTTON | START_BUTTON))) { + func_80000B28(); + set_music_player_voice_limit(0x18U); + play_music(D_800DFABC); + gOpacityDecayTimer = D_800DFABC; + } } - } else if (gMenuOptionCount >= 5 && gOptionsMenuItemIndex == 3) { - if (contX < 0 && D_800DFABC > 0) { - D_800DFABC--; - sp30 = 1; - } else if (contX > 0 && D_800DFABC < (ALSeqFile_80115CF8_GetSeqCount() - 1)) { - D_800DFABC++; - sp30 = 1; + if (gOptionsMenuItemIndex == 1) { + if (D_801269FC == NULL) { + play_sound_global(0x19BU, (s32* ) &D_801269FC); + } + } else if (D_801269FC != NULL) { + func_8000488C((u8* ) D_801269FC); } - if (buttonInputs & (A_BUTTON | START_BUTTON)) { - func_80000B28(); - set_music_player_voice_limit(0x18); - play_music((u8)D_800DFABC); - gOpacityDecayTimer = D_800DFABC; + if (sp30 == 3) { + play_sound_global(0x241U, NULL); + } else if (sp30 == 2) { + play_sound_global(0xEFU, NULL); + } else if (sp30 == 1) { + play_sound_global(0xEBU, NULL); } } - - if (gOptionsMenuItemIndex == 1 && D_801269FC == NULL) { - play_sound_global(SOUND_VOICE_DIDDY_POSITIVE5, &D_801269FC); - } else if (D_801269FC != NULL) { - func_8000488C(&D_801269FC); - } - - if (sp30 == 3) { - play_sound_global(SOUND_MENU_BACK3, NULL); - } else if (sp30 == 2) { - play_sound_global(SOUND_SELECT2, NULL); - } else if (sp30 == 1) { - play_sound_global(SOUND_MENU_PICK2, NULL); - } } - if (gMenuDelay < -30) { + if (gMenuDelay < -0x1E) { func_800851FC(); - menu_init(0xC); + menu_init(0xCU); return 0; } gIgnorePlayerInputTime = 0; return 0; } -#else -GLOBAL_ASM("asm/non_matchings/menu/menu_audio_options_loop.s") -#endif void func_800851FC(void) { if (D_801269FC != NULL) { diff --git a/src/object_functions.c b/src/object_functions.c index 09b3c677..280fc8e7 100644 --- a/src/object_functions.c +++ b/src/object_functions.c @@ -535,58 +535,55 @@ void obj_loop_torch_mist(Object *obj, s32 updateRate) { void obj_init_effectbox(UNUSED Object *obj, UNUSED LevelObjectEntry_EffectBox *entry) { } -#ifdef NON_MATCHING -// Has regalloc issues - -void obj_loop_effectbox(Object *obj, UNUSED s32 updateRate) { - Object **objList; - Object_EffectBox *curObj64; - s32 numberOfObjects; - LevelObjectEntry_EffectBox *level_entry; +void obj_loop_effectbox(Object *effectBoxObj, s32 arg1) { + Object **racers; + LevelObjectEntry_EffectBox *effectBoxEntry; + s32 numRacers; + Object *curRacerObj; + Object_Racer *curRacer; + f32 sinAngle; + f32 zDiff; + f32 yExtentsHalf; + f32 xDiff; + f32 yExtents; + f32 cosAngle; + f32 xExtents; + f32 zExtents; + f32 yDiff; s32 i; - f32 diffX; - f32 diffY; - f32 diffZ; - f32 temp0; - f32 temp1; - f32 temp2; - f32 temp3; - f32 temp4; - f32 temp5; - level_entry = &obj->segment.level_entry->effectBox; - objList = get_racer_objects(&numberOfObjects); - temp0 = coss_f((level_entry->unkB << 8) * -1); - temp1 = sins_f((level_entry->unkB << 8) * -1); - temp2 = level_entry->unk8 * 3; - temp3 = level_entry->unk9 * 3; - temp4 = level_entry->unkA * 3; - for (i = 0; i < numberOfObjects; i++) - { - diffX = objList[i]->segment.trans.x_position - obj->segment.trans.x_position; - diffY = objList[i]->segment.trans.y_position - obj->segment.trans.y_position; - diffZ = objList[i]->segment.trans.z_position - obj->segment.trans.z_position; - if ((-temp3 < diffY) && (diffY < temp3)) { - temp5 = (diffX * temp0) + (diffZ * temp1); - if ((-temp2 < temp5) && (temp5 < temp2)) { - temp5 = (-diffX * temp1) + (diffZ * temp0); - if ((-temp4 < temp5) && (temp5 < temp4)) { - curObj64 = &objList[i]->unk64->effect_box; - curObj64->unk1FE = level_entry->unkC; - curObj64->unk1FF = level_entry->unkD; - temp5 = temp3 / 2; - if ((temp5 < diffY) && (curObj64->unk1FE == 1)) { - temp5 = (1.0 - ((diffY - temp5) / temp5)); - curObj64->unk1FF *= temp5; + effectBoxEntry = (LevelObjectEntry_EffectBox *)effectBoxObj->segment.level_entry; + racers = get_racer_objects(&numRacers); + cosAngle = coss_f(-(effectBoxEntry->unkB * 256)); + sinAngle = sins_f(-(effectBoxEntry->unkB * 256)); + xExtents = (f32) (effectBoxEntry->unk8 * 3); + yExtents = (f32) (effectBoxEntry->unk9 * 3); + zExtents = (f32) (effectBoxEntry->unkA * 3); + for(i = 0; i < numRacers; i++) { + curRacerObj = racers[i]; + xDiff = curRacerObj->segment.trans.x_position - effectBoxObj->segment.trans.x_position; + yDiff = curRacerObj->segment.trans.y_position - effectBoxObj->segment.trans.y_position; + zDiff = curRacerObj->segment.trans.z_position - effectBoxObj->segment.trans.z_position; + if ((-yExtents < yDiff) && (yDiff < yExtents)) { + yExtentsHalf = (xDiff * cosAngle) + (zDiff * sinAngle); + if ((-xExtents < yExtentsHalf) && (yExtentsHalf < xExtents)) { + zDiff = (-xDiff * sinAngle) + (zDiff * cosAngle); + if ((-zExtents < zDiff) && (zDiff < zExtents)) { + yExtentsHalf = yExtents / 2; + curRacer = &curRacerObj->unk64->racer; + curRacer->unk1FE = effectBoxEntry->unkC; + curRacer->unk1FF = effectBoxEntry->unkD; + if ((yExtentsHalf < yDiff) && (curRacer->unk1FE == 1)) { + xDiff = (yDiff - yExtentsHalf) / yExtentsHalf; + yDiff = (1.0 - xDiff); + curRacer->unk1FF *= yDiff; } } } } } } -#else -GLOBAL_ASM("asm/non_matchings/object_functions/obj_loop_effectbox.s") -#endif + /** * Trophy Cabinet loop behaviour.