mirror/SpaghettiKart
1
0
Fork 0
mirror of https://github.com/HarbourMasters/SpaghettiKart synced 2026-08-08 19:03:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

continued

Browse Source
This commit is contained in:
MegaMech
2024-12-31 18:04:45 -07:00
parent 3cdffe421b
commit f9c661c590
10 changed files with 845 additions and 853 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/non_matchings/menu_items/add_ui_item.s
+2 -2
View File
@@ -524,8 +524,8 @@ glabel L8009ECAC
glabel L8009ECD4
/* 09F8D4 8009ECD4 0C01BB91 */ jal load_mario_kart_64_logo
/* 09F8D8 8009ECD8 00000000 */ nop
/* 09F8DC 8009ECDC 3C028019 */ lui $v0, %hi(gMenuTextureBufferIndex) # $v0, 0x8019
/* 09F8E0 8009ECE0 2442E110 */ addiu $v0, %lo(gMenuTextureBufferIndex) # addiu $v0, $v0, -0x1ef0
/* 09F8DC 8009ECDC 3C028019 */ lui $v0, %hi(sMenuTextureBufferIndex) # $v0, 0x8019
/* 09F8E0 8009ECE0 2442E110 */ addiu $v0, %lo(sMenuTextureBufferIndex) # addiu $v0, $v0, -0x1ef0
/* 09F8E4 8009ECE4 8C590000 */ lw $t9, ($v0)
/* 09F8E8 8009ECE8 3C010001 */ lui $at, 1
/* 09F8EC 8009ECEC 3C040200 */ lui $a0, %hi(seg2_copyright_1996_texture) # $a0, 0x200
asm/non_matchings/menu_items/func_800A1FB0.s
+38 -38
View File
@@ -79,8 +79,8 @@ glabel func_800A1FB0
/* 0A2C1C 800A201C 0C02637E */ jal draw_box
/* 0A2C20 800A2020 24070140 */ li $a3, 320
/* 0A2C24 800A2024 AE020000 */ sw $v0, ($s0)
/* 0A2C28 800A2028 3C038019 */ lui $v1, %hi(D_8018EDEC) # $v1, 0x8019
/* 0A2C2C 800A202C 8063EDEC */ lb $v1, %lo(D_8018EDEC)($v1)
/* 0A2C28 800A2028 3C038019 */ lui $v1, %hi(gSubMenuSelection) # $v1, 0x8019
/* 0A2C2C 800A202C 8063EDEC */ lb $v1, %lo(gSubMenuSelection)($v1)
/* 0A2C30 800A2030 2478FFEB */ addiu $t8, $v1, -0x15
/* 0A2C34 800A2034 2F010033 */ sltiu $at, $t8, 0x33
/* 0A2C38 800A2038 10200310 */ beqz $at, .L800A2C7C
@@ -112,8 +112,8 @@ glabel L800A2054
/* 0A2C98 800A2098 E7B40010 */ swc1 $f20, 0x10($sp)
/* 0A2C9C 800A209C 0C024CC9 */ jal print_text_mode_1
/* 0A2CA0 800A20A0 E7B60014 */ swc1 $f22, 0x14($sp)
/* 0A2CA4 800A20A4 3C048019 */ lui $a0, %hi(D_8018EDEC) # $a0, 0x8019
/* 0A2CA8 800A20A8 8084EDEC */ lb $a0, %lo(D_8018EDEC)($a0)
/* 0A2CA4 800A20A4 3C048019 */ lui $a0, %hi(gSubMenuSelection) # $a0, 0x8019
/* 0A2CA8 800A20A8 8084EDEC */ lb $a0, %lo(gSubMenuSelection)($a0)
/* 0A2CAC 800A20AC 26310004 */ addiu $s1, $s1, 4
/* 0A2CB0 800A20B0 24190032 */ li $t9, 50
/* 0A2CB4 800A20B4 2484FFEB */ addiu $a0, $a0, -0x15
@@ -139,9 +139,9 @@ glabel L800A2054
/* 0A2D00 800A2100 E7B60010 */ swc1 $f22, 0x10($sp)
/* 0A2D04 800A2104 0C024DBB */ jal print_text1_center_mode_1
/* 0A2D08 800A2108 E7B60014 */ swc1 $f22, 0x14($sp)
/* 0A2D0C 800A210C 3C038019 */ lui $v1, %hi(D_8018EDEC) # $v1, 0x8019
/* 0A2D0C 800A210C 3C038019 */ lui $v1, %hi(gSubMenuSelection) # $v1, 0x8019
/* 0A2D10 800A2110 100002DA */ b .L800A2C7C
/* 0A2D14 800A2114 8063EDEC */ lb $v1, %lo(D_8018EDEC)($v1)
/* 0A2D14 800A2114 8063EDEC */ lb $v1, %lo(gSubMenuSelection)($v1)
glabel L800A2118
/* 0A2D18 800A2118 0C024C36 */ jal set_text_color
/* 0A2D1C 800A211C 24040003 */ li $a0, 3
@@ -164,8 +164,8 @@ glabel L800A2118
/* 0A2D5C 800A215C 0232082B */ sltu $at, $s1, $s2
/* 0A2D60 800A2160 1420FFF6 */ bnez $at, .L800A213C
/* 0A2D64 800A2164 26100014 */ addiu $s0, $s0, 0x14
/* 0A2D68 800A2168 3C048019 */ lui $a0, %hi(D_8018EDEC) # $a0, 0x8019
/* 0A2D6C 800A216C 8084EDEC */ lb $a0, %lo(D_8018EDEC)($a0)
/* 0A2D68 800A2168 3C048019 */ lui $a0, %hi(gSubMenuSelection) # $a0, 0x8019
/* 0A2D6C 800A216C 8084EDEC */ lb $a0, %lo(gSubMenuSelection)($a0)
/* 0A2D70 800A2170 3C11800E */ lui $s1, %hi(D_800E7840) # $s1, 0x800e
/* 0A2D74 800A2174 26317840 */ addiu $s1, %lo(D_800E7840) # addiu $s1, $s1, 0x7840
/* 0A2D78 800A2178 00009025 */ move $s2, $zero
@@ -182,8 +182,8 @@ glabel L800A2118
/* 0A2DA0 800A21A0 E7B60010 */ swc1 $f22, 0x10($sp)
/* 0A2DA4 800A21A4 0C024CC9 */ jal print_text_mode_1
/* 0A2DA8 800A21A8 E7B60014 */ swc1 $f22, 0x14($sp)
/* 0A2DAC 800A21AC 3C038019 */ lui $v1, %hi(D_8018EDEC) # $v1, 0x8019
/* 0A2DB0 800A21B0 8063EDEC */ lb $v1, %lo(D_8018EDEC)($v1)
/* 0A2DAC 800A21AC 3C038019 */ lui $v1, %hi(gSubMenuSelection) # $v1, 0x8019
/* 0A2DB0 800A21B0 8063EDEC */ lb $v1, %lo(gSubMenuSelection)($v1)
/* 0A2DB4 800A21B4 26310004 */ addiu $s1, $s1, 4
/* 0A2DB8 800A21B8 24010002 */ li $at, 2
/* 0A2DBC 800A21BC 2464FFE2 */ addiu $a0, $v1, -0x1e
@@ -218,14 +218,14 @@ glabel L800A21E4
/* 0A2E24 800A2224 26310004 */ addiu $s1, $s1, 4
/* 0A2E28 800A2228 1632FFF7 */ bne $s1, $s2, .L800A2208
/* 0A2E2C 800A222C 26100014 */ addiu $s0, $s0, 0x14
/* 0A2E30 800A2230 3C038019 */ lui $v1, %hi(D_8018EDEC) # $v1, 0x8019
/* 0A2E30 800A2230 3C038019 */ lui $v1, %hi(gSubMenuSelection) # $v1, 0x8019
/* 0A2E34 800A2234 10000291 */ b .L800A2C7C
/* 0A2E38 800A2238 8063EDEC */ lb $v1, %lo(D_8018EDEC)($v1)
/* 0A2E38 800A2238 8063EDEC */ lb $v1, %lo(gSubMenuSelection)($v1)
glabel L800A223C
/* 0A2E3C 800A223C 0C024C36 */ jal set_text_color
/* 0A2E40 800A2240 24040002 */ li $a0, 2
/* 0A2E44 800A2244 3C028019 */ lui $v0, %hi(D_8018EDEC) # $v0, 0x8019
/* 0A2E48 800A2248 8042EDEC */ lb $v0, %lo(D_8018EDEC)($v0)
/* 0A2E44 800A2244 3C028019 */ lui $v0, %hi(gSubMenuSelection) # $v0, 0x8019
/* 0A2E48 800A2248 8042EDEC */ lb $v0, %lo(gSubMenuSelection)($v0)
/* 0A2E4C 800A224C 3C0D800E */ lui $t5, %hi(D_800E78D0) # $t5, 0x800e
/* 0A2E50 800A2250 25AD78D0 */ addiu $t5, %lo(D_800E78D0) # addiu $t5, $t5, 0x78d0
/* 0A2E54 800A2254 2442FFD6 */ addiu $v0, $v0, -0x2a
@@ -248,14 +248,14 @@ glabel L800A223C
/* 0A2E94 800A2294 26100014 */ addiu $s0, $s0, 0x14
/* 0A2E98 800A2298 1612FFF7 */ bne $s0, $s2, .L800A2278
/* 0A2E9C 800A229C 26310004 */ addiu $s1, $s1, 4
/* 0A2EA0 800A22A0 3C038019 */ lui $v1, %hi(D_8018EDEC) # $v1, 0x8019
/* 0A2EA0 800A22A0 3C038019 */ lui $v1, %hi(gSubMenuSelection) # $v1, 0x8019
/* 0A2EA4 800A22A4 10000275 */ b .L800A2C7C
/* 0A2EA8 800A22A8 8063EDEC */ lb $v1, %lo(D_8018EDEC)($v1)
/* 0A2EA8 800A22A8 8063EDEC */ lb $v1, %lo(gSubMenuSelection)($v1)
glabel L800A22AC
/* 0A2EAC 800A22AC 0C024C36 */ jal set_text_color
/* 0A2EB0 800A22B0 24040002 */ li $a0, 2
/* 0A2EB4 800A22B4 3C028019 */ lui $v0, %hi(D_8018EDEC) # $v0, 0x8019
/* 0A2EB8 800A22B8 8042EDEC */ lb $v0, %lo(D_8018EDEC)($v0)
/* 0A2EB4 800A22B4 3C028019 */ lui $v0, %hi(gSubMenuSelection) # $v0, 0x8019
/* 0A2EB8 800A22B8 8042EDEC */ lb $v0, %lo(gSubMenuSelection)($v0)
/* 0A2EBC 800A22BC 3C18800E */ lui $t8, %hi(D_800E7890) # $t8, 0x800e
/* 0A2EC0 800A22C0 27187890 */ addiu $t8, %lo(D_800E7890) # addiu $t8, $t8, 0x7890
/* 0A2EC4 800A22C4 244EFFCC */ addiu $t6, $v0, -0x34
@@ -276,14 +276,14 @@ glabel L800A22AC
/* 0A2EFC 800A22FC 26100014 */ addiu $s0, $s0, 0x14
/* 0A2F00 800A2300 1612FFF7 */ bne $s0, $s2, .L800A22E0
/* 0A2F04 800A2304 26310004 */ addiu $s1, $s1, 4
/* 0A2F08 800A2308 3C038019 */ lui $v1, %hi(D_8018EDEC) # $v1, 0x8019
/* 0A2F08 800A2308 3C038019 */ lui $v1, %hi(gSubMenuSelection) # $v1, 0x8019
/* 0A2F0C 800A230C 1000025B */ b .L800A2C7C
/* 0A2F10 800A2310 8063EDEC */ lb $v1, %lo(D_8018EDEC)($v1)
/* 0A2F10 800A2310 8063EDEC */ lb $v1, %lo(gSubMenuSelection)($v1)
glabel L800A2314
/* 0A2F14 800A2314 0C024C36 */ jal set_text_color
/* 0A2F18 800A2318 24040002 */ li $a0, 2
/* 0A2F1C 800A231C 3C028019 */ lui $v0, %hi(D_8018EDEC) # $v0, 0x8019
/* 0A2F20 800A2320 8042EDEC */ lb $v0, %lo(D_8018EDEC)($v0)
/* 0A2F1C 800A231C 3C028019 */ lui $v0, %hi(gSubMenuSelection) # $v0, 0x8019
/* 0A2F20 800A2320 8042EDEC */ lb $v0, %lo(gSubMenuSelection)($v0)
/* 0A2F24 800A2324 3C09800E */ lui $t1, %hi(D_800E7900) # $t1, 0x800e
/* 0A2F28 800A2328 25297900 */ addiu $t1, %lo(D_800E7900) # addiu $t1, $t1, 0x7900
/* 0A2F2C 800A232C 2442FFBF */ addiu $v0, $v0, -0x41
@@ -306,9 +306,9 @@ glabel L800A2314
/* 0A2F6C 800A236C 26100014 */ addiu $s0, $s0, 0x14
/* 0A2F70 800A2370 1612FFF7 */ bne $s0, $s2, .L800A2350
/* 0A2F74 800A2374 26310004 */ addiu $s1, $s1, 4
/* 0A2F78 800A2378 3C038019 */ lui $v1, %hi(D_8018EDEC) # $v1, 0x8019
/* 0A2F78 800A2378 3C038019 */ lui $v1, %hi(gSubMenuSelection) # $v1, 0x8019
/* 0A2F7C 800A237C 1000023F */ b .L800A2C7C
/* 0A2F80 800A2380 8063EDEC */ lb $v1, %lo(D_8018EDEC)($v1)
/* 0A2F80 800A2380 8063EDEC */ lb $v1, %lo(gSubMenuSelection)($v1)
glabel L800A2384
/* 0A2F84 800A2384 0C024C36 */ jal set_text_color
/* 0A2F88 800A2388 24040003 */ li $a0, 3
@@ -330,9 +330,9 @@ glabel L800A2384
/* 0A2FC4 800A23C4 26310004 */ addiu $s1, $s1, 4
/* 0A2FC8 800A23C8 1632FFF7 */ bne $s1, $s2, .L800A23A8
/* 0A2FCC 800A23CC 26100014 */ addiu $s0, $s0, 0x14
/* 0A2FD0 800A23D0 3C038019 */ lui $v1, %hi(D_8018EDEC) # $v1, 0x8019
/* 0A2FD0 800A23D0 3C038019 */ lui $v1, %hi(gSubMenuSelection) # $v1, 0x8019
/* 0A2FD4 800A23D4 10000229 */ b .L800A2C7C
/* 0A2FD8 800A23D8 8063EDEC */ lb $v1, %lo(D_8018EDEC)($v1)
/* 0A2FD8 800A23D8 8063EDEC */ lb $v1, %lo(gSubMenuSelection)($v1)
glabel L800A23DC
/* 0A2FDC 800A23DC 24010028 */ li $at, 40
/* 0A2FE0 800A23E0 1061000B */ beq $v1, $at, .L800A2410
@@ -404,14 +404,14 @@ glabel L800A23DC
/* 0A30D4 800A24D4 8FB80078 */ lw $t8, 0x78($sp)
/* 0A30D8 800A24D8 1278000F */ beq $s3, $t8, .L800A2518
/* 0A30DC 800A24DC 00000000 */ nop
/* 0A30E0 800A24E0 3C198019 */ lui $t9, %hi(D_8018EDEC) # $t9, 0x8019
/* 0A30E4 800A24E4 8339EDEC */ lb $t9, %lo(D_8018EDEC)($t9)
/* 0A30E0 800A24E0 3C198019 */ lui $t9, %hi(gSubMenuSelection) # $t9, 0x8019
/* 0A30E4 800A24E4 8339EDEC */ lb $t9, %lo(gSubMenuSelection)($t9)
/* 0A30E8 800A24E8 02002825 */ move $a1, $s0
/* 0A30EC 800A24EC 24060001 */ li $a2, 1
/* 0A30F0 800A24F0 0C024870 */ jal text_rainbow_effect
/* 0A30F4 800A24F4 03352023 */ subu $a0, $t9, $s5
/* 0A30F8 800A24F8 3C088019 */ lui $t0, %hi(D_8018EDEC) # $t0, 0x8019
/* 0A30FC 800A24FC 8108EDEC */ lb $t0, %lo(D_8018EDEC)($t0)
/* 0A30F8 800A24F8 3C088019 */ lui $t0, %hi(gSubMenuSelection) # $t0, 0x8019
/* 0A30FC 800A24FC 8108EDEC */ lb $t0, %lo(gSubMenuSelection)($t0)
/* 0A3100 800A2500 01154823 */ subu $t1, $t0, $s5
/* 0A3104 800A2504 5609001C */ bnel $s0, $t1, .L800A2578
/* 0A3108 800A2508 26110001 */ addiu $s1, $s0, 1
@@ -527,9 +527,9 @@ glabel L800A23DC
/* 0A3290 800A2690 AFB80088 */ sw $t8, 0x88($sp)
/* 0A3294 800A2694 1661FF83 */ bne $s3, $at, .L800A24A4
/* 0A3298 800A2698 26D60089 */ addiu $s6, $s6, 0x89
/* 0A329C 800A269C 3C038019 */ lui $v1, %hi(D_8018EDEC) # $v1, 0x8019
/* 0A329C 800A269C 3C038019 */ lui $v1, %hi(gSubMenuSelection) # $v1, 0x8019
/* 0A32A0 800A26A0 10000176 */ b .L800A2C7C
/* 0A32A4 800A26A4 8063EDEC */ lb $v1, %lo(D_8018EDEC)($v1)
/* 0A32A4 800A26A4 8063EDEC */ lb $v1, %lo(gSubMenuSelection)($v1)
glabel L800A26A8
/* 0A32A8 800A26A8 0C024C36 */ jal set_text_color
/* 0A32AC 800A26AC 24040002 */ li $a0, 2
@@ -725,8 +725,8 @@ glabel L800A26A8
/* 0A3560 800A2960 00009025 */ move $s2, $zero
/* 0A3564 800A2964 2411006E */ li $s1, 110
.L800A2968:
/* 0A3568 800A2968 3C048019 */ lui $a0, %hi(D_8018EDEC) # $a0, 0x8019
/* 0A356C 800A296C 8084EDEC */ lb $a0, %lo(D_8018EDEC)($a0)
/* 0A3568 800A2968 3C048019 */ lui $a0, %hi(gSubMenuSelection) # $a0, 0x8019
/* 0A356C 800A296C 8084EDEC */ lb $a0, %lo(gSubMenuSelection)($a0)
/* 0A3570 800A2970 240F00D2 */ li $t7, 210
/* 0A3574 800A2974 02002825 */ move $a1, $s0
/* 0A3578 800A2978 2484FFC8 */ addiu $a0, $a0, -0x38
@@ -749,9 +749,9 @@ glabel L800A26A8
/* 0A35B8 800A29B8 26310032 */ addiu $s1, $s1, 0x32
/* 0A35BC 800A29BC 1641FFEA */ bne $s2, $at, .L800A2968
/* 0A35C0 800A29C0 26730004 */ addiu $s3, $s3, 4
/* 0A35C4 800A29C4 3C038019 */ lui $v1, %hi(D_8018EDEC) # $v1, 0x8019
/* 0A35C4 800A29C4 3C038019 */ lui $v1, %hi(gSubMenuSelection) # $v1, 0x8019
/* 0A35C8 800A29C8 100000AC */ b .L800A2C7C
/* 0A35CC 800A29CC 8063EDEC */ lb $v1, %lo(D_8018EDEC)($v1)
/* 0A35CC 800A29CC 8063EDEC */ lb $v1, %lo(gSubMenuSelection)($v1)
glabel L800A29D0
/* 0A35D0 800A29D0 2475FFC6 */ addiu $s5, $v1, -0x3a
/* 0A35D4 800A29D4 06A10003 */ bgez $s5, .L800A29E4
@@ -938,8 +938,8 @@ glabel L800A29D0
/* 0A3868 800A2C68 AFA90088 */ sw $t1, 0x88($sp)
/* 0A386C 800A2C6C 1661FF81 */ bne $s3, $at, .L800A2A74
/* 0A3870 800A2C70 26D60089 */ addiu $s6, $s6, 0x89
/* 0A3874 800A2C74 3C038019 */ lui $v1, %hi(D_8018EDEC) # $v1, 0x8019
/* 0A3878 800A2C78 8063EDEC */ lb $v1, %lo(D_8018EDEC)($v1)
/* 0A3874 800A2C74 3C038019 */ lui $v1, %hi(gSubMenuSelection) # $v1, 0x8019
/* 0A3878 800A2C78 8063EDEC */ lb $v1, %lo(gSubMenuSelection)($v1)
.L800A2C7C:
glabel L800A2C7C
/* 0A387C 800A2C7C 246FFFD8 */ addiu $t7, $v1, -0x28
asm/non_matchings/menu_items/func_800AB314.s
+10 -10
View File
@@ -20,10 +20,10 @@ glabel func_800AB314
/* 0ABF58 800AB358 AC62FFFC */ sw $v0, -4($v1)
/* 0ABF5C 800AB35C 3C0E800E */ lui $t6, %hi(gModeSelection) # $t6, 0x800e
/* 0ABF60 800AB360 8DCEC53C */ lw $t6, %lo(gModeSelection)($t6)
/* 0ABF64 800AB364 3C0F8019 */ lui $t7, %hi(D_8018EDEC) # $t7, 0x8019
/* 0ABF64 800AB364 3C0F8019 */ lui $t7, %hi(gSubMenuSelection) # $t7, 0x8019
/* 0ABF68 800AB368 51C00053 */ beql $t6, $zero, .L800AB4B8
/* 0ABF6C 800AB36C 8CC20004 */ lw $v0, 4($a2)
/* 0ABF70 800AB370 81EFEDEC */ lb $t7, %lo(D_8018EDEC)($t7)
/* 0ABF70 800AB370 81EFEDEC */ lb $t7, %lo(gSubMenuSelection)($t7)
/* 0ABF74 800AB374 24040001 */ li $a0, 1
/* 0ABF78 800AB378 24030003 */ li $v1, 3
/* 0ABF7C 800AB37C 108F003A */ beq $a0, $t7, .L800AB468
@@ -124,10 +124,10 @@ glabel func_800AB314
/* 0AC0CC 800AB4CC 3C038019 */ lui $v1, %hi(gCupSelection) # $v1, 0x8019
/* 0AC0D0 800AB4D0 24010002 */ li $at, 2
/* 0AC0D4 800AB4D4 1041005C */ beq $v0, $at, .L800AB648
/* 0AC0D8 800AB4D8 3C0D8019 */ lui $t5, %hi(D_8018EDEC) # 0x8019
/* 0AC0D8 800AB4D8 3C0D8019 */ lui $t5, %hi(gSubMenuSelection) # 0x8019
/* 0AC0DC 800AB4DC 24030003 */ li $v1, 3
/* 0AC0E0 800AB4E0 1043006A */ beq $v0, $v1, .L800AB68C
/* 0AC0E4 800AB4E4 3C198019 */ lui $t9, %hi(D_8018EDEC) # 0x8019
/* 0AC0E4 800AB4E4 3C198019 */ lui $t9, %hi(gSubMenuSelection) # 0x8019
/* 0AC0E8 800AB4E8 1000006F */ b .L800AB6A8
/* 0AC0EC 800AB4EC 00000000 */ nop
/* 0AC0F0 800AB4F0 8CD9001C */ lw $t9, 0x1c($a2)
@@ -163,8 +163,8 @@ glabel func_800AB314
/* 0AC158 800AB558 000A5880 */ sll $t3, $t2, 2
/* 0AC15C 800AB55C ACCB001C */ sw $t3, 0x1c($a2)
.L800AB560:
/* 0AC160 800AB560 3C0C8019 */ lui $t4, %hi(D_8018EDEC) # $t4, 0x8019
/* 0AC164 800AB564 818CEDEC */ lb $t4, %lo(D_8018EDEC)($t4)
/* 0AC160 800AB560 3C0C8019 */ lui $t4, %hi(gSubMenuSelection) # $t4, 0x8019
/* 0AC164 800AB564 818CEDEC */ lb $t4, %lo(gSubMenuSelection)($t4)
/* 0AC168 800AB568 24030003 */ li $v1, 3
/* 0AC16C 800AB56C 240D0002 */ li $t5, 2
/* 0AC170 800AB570 146C0003 */ bne $v1, $t4, .L800AB580
@@ -219,8 +219,8 @@ glabel func_800AB314
/* 0AC21C 800AB61C 10000022 */ b .L800AB6A8
/* 0AC220 800AB620 ACCA001C */ sw $t2, 0x1c($a2)
.L800AB624:
/* 0AC224 800AB624 3C0B8019 */ lui $t3, %hi(D_8018EDEC) # $t3, 0x8019
/* 0AC228 800AB628 816BEDEC */ lb $t3, %lo(D_8018EDEC)($t3)
/* 0AC224 800AB624 3C0B8019 */ lui $t3, %hi(gSubMenuSelection) # $t3, 0x8019
/* 0AC228 800AB628 816BEDEC */ lb $t3, %lo(gSubMenuSelection)($t3)
/* 0AC22C 800AB62C 24030003 */ li $v1, 3
/* 0AC230 800AB630 146B0003 */ bne $v1, $t3, .L800AB640
/* 0AC234 800AB634 240C0002 */ li $t4, 2
@@ -239,7 +239,7 @@ glabel func_800AB314
/* 0AC260 800AB660 ACC30004 */ sw $v1, 4($a2)
/* 0AC264 800AB664 ACC00020 */ sw $zero, 0x20($a2)
.L800AB668:
/* 0AC268 800AB668 81ADEDEC */ lb $t5, %lo(D_8018EDEC)($t5) # -0x1214($t5)
/* 0AC268 800AB668 81ADEDEC */ lb $t5, %lo(gSubMenuSelection)($t5) # -0x1214($t5)
/* 0AC26C 800AB66C 24030003 */ li $v1, 3
/* 0AC270 800AB670 106D0004 */ beq $v1, $t5, .L800AB684
/* 0AC274 800AB674 00000000 */ nop
@@ -250,7 +250,7 @@ glabel func_800AB314
/* 0AC284 800AB684 10000008 */ b .L800AB6A8
/* 0AC288 800AB688 8CC20004 */ lw $v0, 4($a2)
.L800AB68C:
/* 0AC28C 800AB68C 8339EDEC */ lb $t9, %lo(D_8018EDEC)($t9) # -0x1214($t9)
/* 0AC28C 800AB68C 8339EDEC */ lb $t9, %lo(gSubMenuSelection)($t9) # -0x1214($t9)
/* 0AC290 800AB690 10790005 */ beq $v1, $t9, .L800AB6A8
/* 0AC294 800AB694 00000000 */ nop
/* 0AC298 800AB698 ACC00004 */ sw $zero, 4($a2)
asm/non_matchings/menu_items/render_menus.s
+10 -10
View File
@@ -309,7 +309,7 @@ glabel L8009F874
/* 0A0484 8009F884 00057400 */ sll $t6, $a1, 0x10
/* 0A0488 8009F888 00046400 */ sll $t4, $a0, 0x10
/* 0A048C 8009F88C 000C2403 */ sra $a0, $t4, 0x10
/* 0A0490 8009F890 0C013235 */ jal func_8004C8D4
/* 0A0490 8009F890 0C013235 */ jal render_game_logo
/* 0A0494 8009F894 000E2C03 */ sra $a1, $t6, 0x10
/* 0A0498 8009F898 3C050200 */ lui $a1, %hi(seg2_copyright_1996_texture) # $a1, 0x200
/* 0A049C 8009F89C 24A545E8 */ addiu $a1, %lo(seg2_copyright_1996_texture) # addiu $a1, $a1, 0x45e8
@@ -920,7 +920,7 @@ glabel L800A00FC
.L800A0170:
/* 0A0D70 800A0170 24C600BF */ addiu $a2, $a2, 0xbf
.L800A0174:
/* 0A0D74 800A0174 0C028474 */ jal func_800A11D0
/* 0A0D74 800A0174 0C028474 */ jal render_cursor_player
/* 0A0D78 800A0178 02202025 */ move $a0, $s1
/* 0A0D7C 800A017C 100001D2 */ b .L800A08C8
/* 0A0D80 800A0180 8FBF0034 */ lw $ra, 0x34($sp)
@@ -1054,7 +1054,7 @@ glabel L800A02DC
/* 0A0F54 800A0354 1000015C */ b .L800A08C8
/* 0A0F58 800A0358 8FBF0034 */ lw $ra, 0x34($sp)
glabel L800A035C
/* 0A0F5C 800A035C 0C02A385 */ jal func_800A8E14
/* 0A0F5C 800A035C 0C02A385 */ jal render_battle_introduction
/* 0A0F60 800A0360 02202025 */ move $a0, $s1
/* 0A0F64 800A0364 10000158 */ b .L800A08C8
/* 0A0F68 800A0368 8FBF0034 */ lw $ra, 0x34($sp)
@@ -1311,7 +1311,7 @@ glabel L800A0694
/* 0A1300 800A0700 AFAE0010 */ sw $t6, 0x10($sp)
/* 0A1304 800A0704 02202025 */ move $a0, $s1
/* 0A1308 800A0708 8FA500A8 */ lw $a1, 0xa8($sp)
/* 0A130C 800A070C 0C028474 */ jal func_800A11D0
/* 0A130C 800A070C 0C028474 */ jal render_cursor_player
/* 0A1310 800A0710 240600FF */ li $a2, 255
/* 0A1314 800A0714 1000006C */ b .L800A08C8
/* 0A1318 800A0718 8FBF0034 */ lw $ra, 0x34($sp)
@@ -1326,7 +1326,7 @@ glabel L800A072C
/* 0A1334 800A0734 10000064 */ b .L800A08C8
/* 0A1338 800A0738 8FBF0034 */ lw $ra, 0x34($sp)
glabel L800A073C
/* 0A133C 800A073C 0C029289 */ jal func_800A4A24
/* 0A133C 800A073C 0C029289 */ jal render_menu_item_announce_ghost
/* 0A1340 800A0740 02202025 */ move $a0, $s1
/* 0A1344 800A0744 10000060 */ b .L800A08C8
/* 0A1348 800A0748 8FBF0034 */ lw $ra, 0x34($sp)
@@ -1336,22 +1336,22 @@ glabel L800A074C
/* 0A1354 800A0754 1000005C */ b .L800A08C8
/* 0A1358 800A0758 8FBF0034 */ lw $ra, 0x34($sp)
glabel L800A075C
/* 0A135C 800A075C 0C0295CE */ jal func_800A5738
/* 0A135C 800A075C 0C0295CE */ jal render_menu_item_end_course_option
/* 0A1360 800A0760 02202025 */ move $a0, $s1
/* 0A1364 800A0764 10000058 */ b .L800A08C8
/* 0A1368 800A0768 8FBF0034 */ lw $ra, 0x34($sp)
glabel L800A076C
/* 0A136C 800A076C 0C028649 */ jal func_800A1924
/* 0A136C 800A076C 0C028649 */ jal render_menu_item_data_course_image
/* 0A1370 800A0770 02202025 */ move $a0, $s1
/* 0A1374 800A0774 10000054 */ b .L800A08C8
/* 0A1378 800A0778 8FBF0034 */ lw $ra, 0x34($sp)
glabel L800A077C
/* 0A137C 800A077C 0C028688 */ jal func_800A1A20
/* 0A137C 800A077C 0C028688 */ jal render_menu_item_data_course_info
/* 0A1380 800A0780 02202025 */ move $a0, $s1
/* 0A1384 800A0784 10000050 */ b .L800A08C8
/* 0A1388 800A0788 8FBF0034 */ lw $ra, 0x34($sp)
glabel L800A078C
/* 0A138C 800A078C 0C0286F8 */ jal func_800A1BE0
/* 0A138C 800A078C 0C0286F8 */ jal menu_item_data_course_selectable
/* 0A1390 800A0790 02202025 */ move $a0, $s1
/* 0A1394 800A0794 1000004C */ b .L800A08C8
/* 0A1398 800A0798 8FBF0034 */ lw $ra, 0x34($sp)
@@ -1439,7 +1439,7 @@ glabel L800A084C
/* 0A14B4 800A08B4 10000004 */ b .L800A08C8
/* 0A14B8 800A08B8 8FBF0034 */ lw $ra, 0x34($sp)
glabel L800A08BC
/* 0A14BC 800A08BC 0C029DE4 */ jal func_800A7790
/* 0A14BC 800A08BC 0C029DE4 */ jal menu_item_credits_render
/* 0A14C0 800A08C0 02202025 */ move $a0, $s1
.L800A08C4:
glabel L800A08C4
src/menu_items.c
+677 -685
View File
File diff suppressed because it is too large Load Diff
src/menu_items.h
+9 -9
View File
@@ -264,16 +264,16 @@ void func_800A0DFC(void);
void func_800A0EB8(MenuItem*, s32);
void func_800A0FA4(MenuItem*, s32);
void func_800A10CC(MenuItem*);
void func_800A11D0(MenuItem*, s32, s32);
void render_cursor_player(MenuItem*, s32, s32);
void func_800A12BC(MenuItem*, MenuTexture*);
void func_800A1350(MenuItem*);
void func_800A143C(MenuItem*, s32);
void func_800A1500(MenuItem*);
void func_800A15EC(MenuItem*);
void func_800A1780(MenuItem*);
void func_800A1924(MenuItem*);
void func_800A1A20(MenuItem*);
void func_800A1BE0(MenuItem*);
void render_menu_item_data_course_image(MenuItem*);
void render_menu_item_data_course_info(MenuItem*);
void menu_item_data_course_selectable(MenuItem*);
void func_800A1DE0(MenuItem*);
void func_800A1F30(MenuItem*);
void func_800A1FB0(MenuItem*);
@@ -287,14 +287,14 @@ void func_800A3C84(MenuItem*);
void func_800A3E60(MenuItem*);
void func_800A4550(s32, s32, s32);
void render_lap_times(s32, s32, s32);
void func_800A4A24(MenuItem*);
void render_menu_item_announce_ghost(MenuItem*);
void render_pause_menu(MenuItem*);
void render_pause_menu_time_trials(MenuItem*);
void render_pause_menu_versus(MenuItem*);
void render_pause_grand_prix(MenuItem*);
void render_pause_battle(MenuItem*);
void func_800A54EC(void);
void func_800A5738(MenuItem*);
void render_menu_item_end_course_option(MenuItem*);
void func_800A6034(MenuItem*);
void func_800A6154(MenuItem*);
void func_800A638C(MenuItem*);
@@ -310,7 +310,7 @@ void func_800A72FC(MenuItem*);
void func_800A7448(MenuItem*);
void func_800A75A0(MenuItem*);
void func_800A761C(MenuItem*);
void func_800A7790(MenuItem*);
void menu_item_credits_render(MenuItem*);
void convert_number_to_ascii(s32, char*);
void write_dashes(char*);
void get_time_record_minutes(s32, char*);
@@ -327,7 +327,7 @@ void func_800A874C(MenuItem*);
void func_800A890C(s32, MenuItem*);
void func_800A8A98(MenuItem*);
void func_800A8CA4(MenuItem*);
void func_800A8E14(MenuItem*);
void render_battle_introduction(MenuItem*);
void func_800A8EC0(MenuItem*);
void func_800A8F48(MenuItem*);
void func_800A90D4(s32, MenuItem*);
@@ -436,7 +436,7 @@ extern MenuItem gMenuItems[MENU_ITEMS_MAX];
extern struct_8018DEE0_entry D_8018DEE0[D_8018DEE0_SIZE];
extern struct_8018E060_entry D_8018E060[];
extern struct_8018E0E8_entry D_8018E0E8[D_8018E0E8_SIZE];
extern s32 gMenuTextureBufferIndex;
extern s32 sMenuTextureBufferIndex;
extern struct_8018E118_entry sMenuTextureMap[TEXTURE_MAP_MAX];
extern s32 sMenuTextureEntries;
extern Gfx* sGfxPtr;
src/menus.c
+94 -94
View File
@@ -33,7 +33,7 @@ f32 gIntroModelPosZ;
s32 D_8018EDE0;
s8 gCharacterGridSelections[4]; // map from player id to current grid position
s8 D_8018EDE8[4]; // map player id to isCharSelected on CSS
s8 D_8018EDEC;
s8 gSubMenuSelection;
s8 gMainMenuSelectionDepth;
s8 D_8018EDEE; // grid screen state?
s8 gDebugMenuSelection;
@@ -77,7 +77,7 @@ s8 D_800E86B0[4][3] = { { 0, 0, 0 }, { 0, 0, 0 }, { 0, 0, 0 }, { 0, 0, 0 } };
s8 gNextDemoId = 0;
s8 gControllerPakSelectedTableRow = 0;
s8 D_800E86C4[12] = { 0, 0, 1, 2, 3, 4, 5, 6, 0, 0, 0, 0 };
s8 D_800E86D0[16] = { 0 }; // this doesn't make a lot of sense...
s8 gControllerPakScrollDirection[16] = { 0 }; // this doesn't make a lot of sense...
s8 unref_800E86E0[4] = { 0, 0, 0, 1 };
u32 sVIGammaOffDitherOn = OS_VI_GAMMA_OFF | OS_VI_DITHER_FILTER_ON;
@@ -230,14 +230,14 @@ void options_menu_act(struct Controller* controller, u16 arg1) {
if (!func_800B4520()) {
sp38 = find_menu_items_dupe(0xF0);
sp30 = (struct_8018EE10_entry*) gSomeDLBuffer;
switch (D_8018EDEC) {
switch (gSubMenuSelection) {
case 0x15:
case 0x16:
case 0x17:
case 0x18: {
sp2C = false;
if ((btnAndStick & D_JPAD) && (D_8018EDEC < 0x18)) {
D_8018EDEC += 1;
if ((btnAndStick & D_JPAD) && (gSubMenuSelection < 0x18)) {
gSubMenuSelection += 1;
play_sound2(SOUND_MENU_CURSOR_MOVE);
if (sp38->paramf < 4.2) {
sp38->paramf += 4.0;
@@ -245,8 +245,8 @@ void options_menu_act(struct Controller* controller, u16 arg1) {
sp38->subState = 1;
sp2C = true;
}
if ((btnAndStick & U_JPAD) && (D_8018EDEC >= 0x16)) {
D_8018EDEC -= 1;
if ((btnAndStick & U_JPAD) && (gSubMenuSelection >= 0x16)) {
gSubMenuSelection -= 1;
play_sound2(SOUND_MENU_CURSOR_MOVE);
if (sp38->paramf < 4.2) {
sp38->paramf += 4.0;
@@ -272,7 +272,7 @@ void options_menu_act(struct Controller* controller, u16 arg1) {
return;
}
if (btnAndStick & A_BUTTON) {
switch (D_8018EDEC) {
switch (gSubMenuSelection) {
case 0x16:
if (gSoundMode < 3) {
gSoundMode += 1;
@@ -298,7 +298,7 @@ void options_menu_act(struct Controller* controller, u16 arg1) {
case 0x17:
switch (controller_pak_2_status()) {
case PFS_INVALID_DATA:
D_8018EDEC = 0x2B;
gSubMenuSelection = 0x2B;
play_sound2(SOUND_MENU_FILE_NOT_FOUND);
return;
case PFS_NO_ERROR:
@@ -306,7 +306,7 @@ void options_menu_act(struct Controller* controller, u16 arg1) {
sp2C = controller_pak_1_status();
switch (sp2C) {
case PFS_INVALID_DATA:
D_8018EDEC = 0x46;
gSubMenuSelection = 0x46;
sp38->state = 0;
play_sound2(SOUND_MENU_SELECT);
break;
@@ -314,52 +314,52 @@ void options_menu_act(struct Controller* controller, u16 arg1) {
func_800B6708();
break;
case PFS_NO_PAK_INSERTED:
D_8018EDEC = 0x34;
gSubMenuSelection = 0x34;
play_sound2(SOUND_MENU_FILE_NOT_FOUND);
break;
case PFS_FILE_OVERFLOW:
D_8018EDEC = 0x37;
gSubMenuSelection = 0x37;
play_sound2(SOUND_MENU_FILE_NOT_FOUND);
break;
case PFS_PAK_BAD_READ:
case 3:
default:
D_8018EDEC = 0x35;
gSubMenuSelection = 0x35;
play_sound2(SOUND_MENU_FILE_NOT_FOUND);
break;
}
if (sp2C == PFS_INVALID_DATA && !sp30[0].ghostDataSaved &&
!sp30[1].ghostDataSaved) {
D_8018EDEC = 0x2A;
gSubMenuSelection = 0x2A;
play_sound2(SOUND_MENU_FILE_NOT_FOUND);
return;
}
if (sp2C == PFS_NO_ERROR) {
if (sp30[0].ghostDataSaved) {
D_8018EDEC = 0x28;
gSubMenuSelection = 0x28;
play_sound2(SOUND_MENU_SELECT);
} else if (sp30[1].ghostDataSaved) {
D_8018EDEC = 0x29;
gSubMenuSelection = 0x29;
play_sound2(SOUND_MENU_SELECT);
} else {
D_8018EDEC = 0x2A;
gSubMenuSelection = 0x2A;
play_sound2(SOUND_MENU_FILE_NOT_FOUND);
}
}
// else return?
return;
case PFS_NO_PAK_INSERTED:
D_8018EDEC = 0x2C;
gSubMenuSelection = 0x2C;
play_sound2(SOUND_MENU_FILE_NOT_FOUND);
return;
case PFS_PAK_BAD_READ:
default:
D_8018EDEC = 0x2D;
gSubMenuSelection = 0x2D;
play_sound2(SOUND_MENU_FILE_NOT_FOUND);
return;
}
case 0x18: {
D_8018EDEC = 0x1E;
gSubMenuSelection = 0x1E;
play_sound2(SOUND_MENU_SELECT);
return;
}
@@ -375,16 +375,16 @@ void options_menu_act(struct Controller* controller, u16 arg1) {
}
case 0x1E:
case 0x1F: {
if ((btnAndStick & D_JPAD) && (D_8018EDEC < 0x1F)) {
D_8018EDEC += 1;
if ((btnAndStick & D_JPAD) && (gSubMenuSelection < 0x1F)) {
gSubMenuSelection += 1;
play_sound2(SOUND_MENU_CURSOR_MOVE);
if (sp38->paramf < 4.2) {
sp38->paramf += 4.0;
}
sp38->subState = 1;
}
if ((btnAndStick & U_JPAD) && (D_8018EDEC >= 0x1F)) {
D_8018EDEC -= 1;
if ((btnAndStick & U_JPAD) && (gSubMenuSelection >= 0x1F)) {
gSubMenuSelection -= 1;
play_sound2(SOUND_MENU_CURSOR_MOVE);
if (sp38->paramf < 4.2) {
sp38->paramf += 4.0;
@@ -392,18 +392,18 @@ void options_menu_act(struct Controller* controller, u16 arg1) {
sp38->subState = -1;
}
if (btnAndStick & B_BUTTON) {
D_8018EDEC = 0x18;
gSubMenuSelection = 0x18;
play_sound2(SOUND_MENU_GO_BACK);
return;
}
if (btnAndStick & A_BUTTON) {
switch (D_8018EDEC) {
switch (gSubMenuSelection) {
case 0x1E:
D_8018EDEC = 0x18;
gSubMenuSelection = 0x18;
play_sound2(SOUND_MENU_GO_BACK);
break;
case 0x1F:
D_8018EDEC = 0x20;
gSubMenuSelection = 0x20;
func_800B46D0();
D_800DC5AC = 0;
play_sound2(SOUND_MENU_EXPLOSION);
@@ -414,23 +414,23 @@ void options_menu_act(struct Controller* controller, u16 arg1) {
}
case 0x20: {
if (btnAndStick & (A_BUTTON | B_BUTTON | START_BUTTON)) {
D_8018EDEC = 0x18;
gSubMenuSelection = 0x18;
play_sound2(SOUND_MENU_GO_BACK);
}
break;
}
case 0x28:
case 0x29: {
if ((btnAndStick & D_JPAD) && (D_8018EDEC < 0x29) && (sp30[1].ghostDataSaved)) {
D_8018EDEC += 1;
if ((btnAndStick & D_JPAD) && (gSubMenuSelection < 0x29) && (sp30[1].ghostDataSaved)) {
gSubMenuSelection += 1;
play_sound2(SOUND_MENU_CURSOR_MOVE);
if (sp38->paramf < 4.2) {
sp38->paramf += 4.0;
}
sp38->subState = 1;
}
if ((btnAndStick & U_JPAD) && (D_8018EDEC >= 0x29) && sp30[0].ghostDataSaved) {
D_8018EDEC -= 1;
if ((btnAndStick & U_JPAD) && (gSubMenuSelection >= 0x29) && sp30[0].ghostDataSaved) {
gSubMenuSelection -= 1;
play_sound2(SOUND_MENU_CURSOR_MOVE);
if (sp38->paramf < 4.2) {
sp38->paramf += 4.0;
@@ -438,16 +438,16 @@ void options_menu_act(struct Controller* controller, u16 arg1) {
sp38->subState = -1;
}
if (btnAndStick & B_BUTTON) {
D_8018EDEC = 0x17;
gSubMenuSelection = 0x17;
play_sound2(SOUND_MENU_GO_BACK);
return;
}
if (btnAndStick & A_BUTTON) {
sp38->param2 = D_8018EDEC - 0x28;
sp38->param2 = gSubMenuSelection - 0x28;
if (sp30[sp38->param2].courseIndex == D_8018EE10[1].courseIndex && D_8018EE10[1].ghostDataSaved) {
D_8018EDEC = 0x33;
gSubMenuSelection = 0x33;
} else {
D_8018EDEC = 0x32;
gSubMenuSelection = 0x32;
}
play_sound2(SOUND_MENU_SELECT);
}
@@ -456,18 +456,18 @@ void options_menu_act(struct Controller* controller, u16 arg1) {
case 0x32:
case 0x33: {
// bit of a fake match, but if it works it works?
if ((sp30[sp38->param2].courseIndex != ((0, (D_8018EE10 + (D_8018EDEC - 0x32))->courseIndex))) ||
((D_8018EE10 + (D_8018EDEC - 0x32))->ghostDataSaved == 0)) {
if ((btnAndStick & D_JPAD) && (D_8018EDEC < 0x33)) {
D_8018EDEC += 1;
if ((sp30[sp38->param2].courseIndex != ((0, (D_8018EE10 + (gSubMenuSelection - 0x32))->courseIndex))) ||
((D_8018EE10 + (gSubMenuSelection - 0x32))->ghostDataSaved == 0)) {
if ((btnAndStick & D_JPAD) && (gSubMenuSelection < 0x33)) {
gSubMenuSelection += 1;
play_sound2(SOUND_MENU_CURSOR_MOVE);
if (sp38->paramf < 4.2) {
sp38->paramf += 4.0;
}
sp38->subState = 1;
}
if ((btnAndStick & U_JPAD) && (D_8018EDEC >= 0x33)) {
D_8018EDEC -= 1;
if ((btnAndStick & U_JPAD) && (gSubMenuSelection >= 0x33)) {
gSubMenuSelection -= 1;
play_sound2(SOUND_MENU_CURSOR_MOVE);
if (sp38->paramf < 4.2) {
sp38->paramf += 4.0;
@@ -476,14 +476,14 @@ void options_menu_act(struct Controller* controller, u16 arg1) {
}
}
if (btnAndStick & B_BUTTON) {
D_8018EDEC = sp38->param2 + 0x28;
gSubMenuSelection = sp38->param2 + 0x28;
play_sound2(SOUND_MENU_GO_BACK);
} else if (btnAndStick & A_BUTTON) {
sp38->param1 = D_8018EDEC - 0x32;
sp38->param1 = gSubMenuSelection - 0x32;
if (D_8018EE10[(sp38->param1)].ghostDataSaved) {
D_8018EDEC = 0x38;
gSubMenuSelection = 0x38;
} else {
D_8018EDEC = 0x3A;
gSubMenuSelection = 0x3A;
sp38->state = 0;
}
play_sound2(SOUND_MENU_SELECT);
@@ -501,23 +501,23 @@ void options_menu_act(struct Controller* controller, u16 arg1) {
case 0x41:
case 0x42: {
if (btnAndStick & (A_BUTTON | B_BUTTON | START_BUTTON)) {
D_8018EDEC = 0x17;
gSubMenuSelection = 0x17;
play_sound2(SOUND_MENU_GO_BACK);
}
break;
}
case 0x38:
case 0x39: {
if ((btnAndStick & R_JPAD) && D_8018EDEC < 0x39) {
D_8018EDEC += 1;
if ((btnAndStick & R_JPAD) && gSubMenuSelection < 0x39) {
gSubMenuSelection += 1;
play_sound2(SOUND_MENU_CURSOR_MOVE);
if (sp38->paramf < 4.2) {
sp38->paramf += 4.0;
}
sp38->subState = 1;
}
if ((btnAndStick & L_JPAD) && D_8018EDEC >= 0x39) {
D_8018EDEC -= 1;
if ((btnAndStick & L_JPAD) && gSubMenuSelection >= 0x39) {
gSubMenuSelection -= 1;
play_sound2(SOUND_MENU_CURSOR_MOVE);
if (sp38->paramf < 4.2) {
sp38->paramf += 4.0;
@@ -525,16 +525,16 @@ void options_menu_act(struct Controller* controller, u16 arg1) {
sp38->subState = -1;
}
if (btnAndStick & B_BUTTON) {
D_8018EDEC = sp38->param1 + 0x32;
gSubMenuSelection = sp38->param1 + 0x32;
play_sound2(SOUND_MENU_GO_BACK);
return;
}
if (btnAndStick & A_BUTTON) {
if (D_8018EDEC == 0x38) {
D_8018EDEC = 0x17;
if (gSubMenuSelection == 0x38) {
gSubMenuSelection = 0x17;
play_sound2(SOUND_MENU_GO_BACK);
} else {
D_8018EDEC = 0x3A;
gSubMenuSelection = 0x3A;
play_sound2(SOUND_MENU_SELECT);
sp38->state = 0;
}
@@ -547,7 +547,7 @@ void options_menu_act(struct Controller* controller, u16 arg1) {
sp38->state += 1;
}
if (sp38->state >= 3) {
D_8018EDEC = 0x3B;
gSubMenuSelection = 0x3B;
}
break;
}
@@ -557,7 +557,7 @@ void options_menu_act(struct Controller* controller, u16 arg1) {
res = func_800B65F4(sp38->param2, sp38->param1);
}
if (res != 0) {
D_8018EDEC = 0x42;
gSubMenuSelection = 0x42;
play_sound2(SOUND_MENU_FILE_NOT_FOUND);
return;
}
@@ -567,11 +567,11 @@ void options_menu_act(struct Controller* controller, u16 arg1) {
res = func_800B6178(sp38->param1);
}
if (res != 0) {
D_8018EDEC = 0x41;
gSubMenuSelection = 0x41;
play_sound2(SOUND_MENU_FILE_NOT_FOUND);
return;
}
D_8018EDEC = 0x3C;
gSubMenuSelection = 0x3C;
D_8018EE10[sp38->param1].courseIndex = (sp30 + sp38->param2)->courseIndex;
func_800B6088(sp38->param1);
break;
@@ -581,18 +581,18 @@ void options_menu_act(struct Controller* controller, u16 arg1) {
sp38->state += 1;
}
if (sp38->state >= 3) {
D_8018EDEC = 0x47;
gSubMenuSelection = 0x47;
}
break;
}
case 0x47: {
if (func_800B6A68()) {
D_8018EDEC = 0x36;
gSubMenuSelection = 0x36;
play_sound2(SOUND_MENU_FILE_NOT_FOUND);
} else if (sp30[0].ghostDataSaved) {
D_8018EDEC = 0x28;
gSubMenuSelection = 0x28;
} else {
D_8018EDEC = 0x29;
gSubMenuSelection = 0x29;
}
break;
}
@@ -612,7 +612,7 @@ void data_menu_act(struct Controller* controller, UNUSED u16 arg1) {
}
if (func_800B4520() == 0) {
if (D_8018EDEC == 1) {
if (gSubMenuSelection == 1) {
// If DPad/Stick down pressed, move selection down if not already in bottom row
if ((buttonAndStickPress & 0x400) != 0) {
if ((gTimeTrialDataCourseIndex % 4) != 3) {
@@ -654,8 +654,8 @@ void data_menu_act(struct Controller* controller, UNUSED u16 arg1) {
play_sound2(SOUND_MENU_OK_CLICKED);
}
}
// If D_8018EDEC != 1 and A pressed, go to main menu
// (Will D_8018EDEC ever not equal 1 when entering the data menu?)
// If gSubMenuSelection != 1 and A pressed, go to main menu
// (Will gSubMenuSelection ever not equal 1 when entering the data menu?)
else if ((buttonAndStickPress & 0x8000) != 0) {
func_8009E258();
play_sound2(SOUND_MENU_OK_CLICKED);
@@ -676,7 +676,7 @@ void course_data_menu_act(struct Controller* controller, UNUSED u16 arg1) {
}
if (!func_800B4520()) {
switch (D_8018EDEC) {
switch (gSubMenuSelection) {
case 0x0B: {
if ((btnAndStick & L_JPAD) && (gTimeTrialDataCourseIndex > 0)) {
gTimeTrialDataCourseIndex -= 1;
@@ -743,7 +743,7 @@ void course_data_menu_act(struct Controller* controller, UNUSED u16 arg1) {
func_8009E208();
play_sound2(SOUND_MENU_GO_BACK);
} else {
D_8018EDEC = 0x0C;
gSubMenuSelection = 0x0C;
D_8018EDF9 = 0;
play_sound2(SOUND_MENU_SELECT);
}
@@ -771,7 +771,7 @@ void course_data_menu_act(struct Controller* controller, UNUSED u16 arg1) {
}
if (btnAndStick & B_BUTTON) {
D_8018EDEC = 0xB;
gSubMenuSelection = 0xB;
play_sound2(SOUND_MENU_GO_BACK);
} else if (btnAndStick & A_BUTTON) {
if (D_8018EDF9 != 0) {
@@ -788,11 +788,11 @@ void course_data_menu_act(struct Controller* controller, UNUSED u16 arg1) {
res = func_800B639C(gTimeTrialDataCourseIndex);
if (res >= 0) {
if (func_800B69BC(res) != 0) {
D_8018EDEC = 0x0D;
gSubMenuSelection = 0x0D;
play_sound2(SOUND_MENU_FILE_NOT_FOUND);
} else {
play_sound2(SOUND_MENU_EXPLOSION);
D_8018EDEC = 0x0B;
gSubMenuSelection = 0x0B;
}
}
break;
@@ -800,18 +800,18 @@ void course_data_menu_act(struct Controller* controller, UNUSED u16 arg1) {
}
if (!(res + 1)) {
D_8018EDEC = 0xB;
gSubMenuSelection = 0xB;
}
} else {
play_sound2(SOUND_MENU_GO_BACK);
D_8018EDEC = 0xB;
gSubMenuSelection = 0xB;
}
}
break;
}
case 0x0D: {
if (btnAndStick & (A_BUTTON | B_BUTTON | START_BUTTON)) {
D_8018EDEC = 0xB;
gSubMenuSelection = 0xB;
}
break;
}
@@ -891,18 +891,18 @@ void controller_pak_menu_act(struct Controller* controller, UNUSED u16 arg1) {
return;
}
} else if ((buttonAndStickPress & 0x4000) != 0) {
if (D_800E86D0[0] == 0) {
if (gControllerPakScrollDirection[0] == 0) {
gControllerPakMenuSelection = CONTROLLER_PAK_MENU_SELECT_RECORD;
play_sound2(SOUND_MENU_GO_BACK);
return;
}
} else if ((buttonAndStickPress & 0x800) != 0) {
if (D_800E86D0[0] == 0) {
if (gControllerPakScrollDirection[0] == 0) {
--gControllerPakSelectedTableRow;
if (gControllerPakSelectedTableRow < 0) {
gControllerPakSelectedTableRow = 0;
if (D_800E86C4[gControllerPakSelectedTableRow + 2] != 1) {
D_800E86D0[0] = 2;
gControllerPakScrollDirection[0] = 2;
play_sound2(SOUND_MENU_CURSOR_MOVE);
return;
}
@@ -911,12 +911,12 @@ void controller_pak_menu_act(struct Controller* controller, UNUSED u16 arg1) {
return;
}
}
} else if (((buttonAndStickPress & 0x400) != 0) && (D_800E86D0[0] == 0)) {
} else if (((buttonAndStickPress & 0x400) != 0) && (gControllerPakScrollDirection[0] == 0)) {
++gControllerPakSelectedTableRow;
if (gControllerPakSelectedTableRow >= CONTROLLER_PAK_MENU_TABLE_GAME_DATA) {
gControllerPakSelectedTableRow = CONTROLLER_PAK_MENU_QUIT;
if (D_800E86C4[gControllerPakSelectedTableRow + 2] != 0x10) {
D_800E86D0[0] = 1;
gControllerPakScrollDirection[0] = 1;
play_sound2(SOUND_MENU_CURSOR_MOVE);
return;
}
@@ -1694,7 +1694,7 @@ void course_select_menu_act(struct Controller* arg0, u16 arg1) {
}
if (func_800B4520() == 0) {
switch (D_8018EDEC) {
switch (gSubMenuSelection) {
case 1:
if ((buttonAndStickPress & R_JPAD) != 0) {
// if (GetCupIndex() < SPECIAL_CUP) {
@@ -1719,10 +1719,10 @@ void course_select_menu_act(struct Controller* arg0, u16 arg1) {
play_sound2(SOUND_MENU_GO_BACK);
} else if ((buttonAndStickPress & A_BUTTON) != 0) {
if (gModeSelection != GRAND_PRIX) {
D_8018EDEC = 2;
gSubMenuSelection = 2;
play_sound2(SOUND_MENU_SELECT);
} else {
D_8018EDEC = 3;
gSubMenuSelection = 3;
play_sound2(SOUND_MENU_SELECT);
//! @todo SetCourse() to course one;
SetCupCursorPosition(COURSE_ONE);
@@ -1751,8 +1751,8 @@ void course_select_menu_act(struct Controller* arg0, u16 arg1) {
gCurrentCourseId = gCupCourseOrder[gCupSelection][gCourseIndexInCup];
SetCourseFromCup();
if ((buttonAndStickPress & B_BUTTON) != 0) {
if (D_8018EDEC == 2) {
D_8018EDEC = 1;
if (gSubMenuSelection == 2) {
gSubMenuSelection = 1;
} else {
func_8009E208();
}
@@ -1761,7 +1761,7 @@ void course_select_menu_act(struct Controller* arg0, u16 arg1) {
return;
}
if ((buttonAndStickPress & A_BUTTON) != 0) {
D_8018EDEC = 3;
gSubMenuSelection = 3;
play_sound2(SOUND_MENU_SELECT);
func_800B44AC();
gMenuTimingCounter = 0;
@@ -1775,13 +1775,13 @@ void course_select_menu_act(struct Controller* arg0, u16 arg1) {
if ((buttonAndStickPress & B_BUTTON) != 0) {
switch (gModeSelection) {
case GRAND_PRIX:
D_8018EDEC = 1;
gSubMenuSelection = 1;
break;
case BATTLE:
D_8018EDEC = 4;
gSubMenuSelection = 4;
break;
default:
D_8018EDEC = 2;
gSubMenuSelection = 2;
break;
}
@@ -1819,13 +1819,13 @@ void load_menu_states(s32 menuSelection) {
switch (menuSelection) {
case 5:
D_8018EDEC = 21;
gSubMenuSelection = 21;
break;
case 6:
D_8018EDEC = 1;
gSubMenuSelection = 1;
break;
case 7:
D_8018EDEC = 11;
gSubMenuSelection = 11;
break;
case 8:
func_800CA008(0, 0);
@@ -1953,13 +1953,13 @@ void load_menu_states(s32 menuSelection) {
CourseManager_SetCup(GetBattleCup());
// gCupSelection = BATTLE_CUP;
D_800DC540 = 4;
D_8018EDEC = 4;
gSubMenuSelection = 4;
} else {
if (GetCup() == GetBattleCup()) {
CourseManager_SetCup(GetMushroomCup());
// gCupSelection = MUSHROOM_CUP;
}
D_8018EDEC = 1;
gSubMenuSelection = 1;
}
if (gGamestate != 0) {
func_800CA008(0, 0);
src/menus.h
+3 -3
View File
@@ -4,7 +4,7 @@
#include <common_structs.h>
#include <defines.h>
// D_8018EDEC is position on options screen?
// gSubMenuSelection is position on options screen?
enum MenuOptionsCursorPositions { MENU_OPTIONS_CSRPOS_SOUNDMODE = 0x16 };
// needs to be a union (or array...?) to go into rodata as a const
@@ -48,7 +48,7 @@ extern s32 D_8018EDE0;
extern s8 gCharacterGridSelections[];
extern s8 D_8018EDE8[];
extern s8 D_8018EDEC;
extern s8 gSubMenuSelection;
extern s8 gMainMenuSelectionDepth;
extern s8 D_8018EDEE;
extern s8 gDebugMenuSelection;
@@ -83,7 +83,7 @@ extern s8 D_800E86B0[4][3];
extern s8 gNextDemoId;
extern s8 gControllerPakSelectedTableRow;
extern s8 D_800E86C4[];
extern s8 D_800E86D0[];
extern s8 gControllerPakScrollDirection[];
extern s8 unref_800E86E0[];
extern u32 sVIGammaOffDitherOn;
src/render_objects.c
+1 -1
View File
@@ -1930,7 +1930,7 @@ void render_texture_tile_rgba32_block(s16 x, s16 y, u8* texture, u32 width, u32
GLOBAL_ASM("asm/non_matchings/render_objects/render_texture_tile_rgba32_block.s")
#endif
void func_8004C8D4(s16 arg0, s16 arg1) {
void render_game_logo(s16 arg0, s16 arg1) {
render_texture_tile_rgba32_block(arg0, arg1, gTextureLogoMarioKart64, 0x100, 0x80);
}
src/render_objects.h
+1 -1
View File
@@ -221,7 +221,7 @@ void draw_hud_2d_texture(s32, s32, u32, u32, u8*);
void func_8004C450(s32, s32, u32, u32, u8*);
void func_8004C53C(s32, s32, u32, u32, u8*);
void func_8004C628(s32, s32, u32, u32, u8*);
void func_8004C8D4(s16, s16);
void render_game_logo(s16, s16);
void func_8004C91C(s32, s32, u8*, s32, s32, s32);
void func_8004C9D8(s32, s32, s32, u8*, s32, s32, s32, s32);
void func_8004CA58(s32, s32, f32, u8*, s32, s32);