izzy/Diddy-Kong-Racing
0
0
Fork 0
mirror of https://github.com/izzy2lost/Diddy-Kong-Racing.git synced 2026-06-19 01:16:26 -07:00
Code Issues Packages Projects Releases Wiki Activity

Matched func_8008F00C, and started work on some var identification (#253)

Browse Source 
* Matched func_8008F00C, and started work on somem var identification and two more funcs

* Remove WIP funcs

Co-authored-by: Ryan Myers <foldor@gmail.com>
This commit is contained in:
Ryan Myers
2022-10-20 18:41:10 -04:00
committed by GitHub
co-authored by Ryan Myers
parent 028cfd01bb
commit 60604cc762
7 changed files with 1694 additions and 1748 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/non_matchings/menu/func_80084854.s
+280 -280
View File
File diff suppressed because it is too large Load Diff
asm/non_matchings/menu/func_800853D0.s
+20 -20
View File
@@ -32,9 +32,9 @@ glabel L8008541C
/* 086030 80085430 00035080 */ sll $t2, $v1, 2
/* 086034 80085434 004A1021 */ addu $v0, $v0, $t2
/* 086038 80085438 8C426530 */ lw $v0, %lo(D_80126530)($v0)
/* 08603C 8008543C 3C088012 */ lui $t0, %hi(D_8012665C) # $t0, 0x8012
/* 08603C 8008543C 3C088012 */ lui $t0, %hi(D_80126550) # $t0, 0x8012
/* 086040 80085440 904B004B */ lbu $t3, 0x4b($v0)
/* 086044 80085444 8D08665C */ lw $t0, %lo(D_8012665C)($t0)
/* 086044 80085444 8D08665C */ lw $t0, %lo(D_80126550 + 0x10C)($t0)
/* 086048 80085448 3C09B0E0 */ lui $t1, (0xB0E0C0FF >> 16) # lui $t1, 0xb0e0
/* 08604C 8008544C 3529C0FF */ ori $t1, (0xB0E0C0FF & 0xFFFF) # ori $t1, $t1, 0xc0ff
/* 086050 80085450 1560002F */ bnez $t3, .L80085510
@@ -107,10 +107,10 @@ glabel L8008553C
/* 086148 80085548 254AFC20 */ addiu $t2, %lo(D_800DFC20) # addiu $t2, $t2, -0x3e0
/* 08614C 8008554C AFAA0068 */ sw $t2, 0x68($sp)
/* 086150 80085550 8C6B01E0 */ lw $t3, 0x1e0($v1)
/* 086154 80085554 3C088012 */ lui $t0, %hi(D_8012665C) # $t0, 0x8012
/* 086154 80085554 3C088012 */ lui $t0, %hi(D_80126550) # $t0, 0x8012
/* 086158 80085558 AFAB0064 */ sw $t3, 0x64($sp)
/* 08615C 8008555C 8C6C01DC */ lw $t4, 0x1dc($v1)
/* 086160 80085560 8D08665C */ lw $t0, %lo(D_8012665C)($t0)
/* 086160 80085560 8D08665C */ lw $t0, %lo(D_80126550 + 0x10C)($t0)
/* 086164 80085564 3C09B0E0 */ lui $t1, (0xB0E0C0FF >> 16) # lui $t1, 0xb0e0
/* 086168 80085568 3529C0FF */ ori $t1, (0xB0E0C0FF & 0xFFFF) # ori $t1, $t1, 0xc0ff
/* 08616C 8008556C 100000BA */ b .L80085858
@@ -123,10 +123,10 @@ glabel L80085574
/* 086184 80085584 27A50050 */ addiu $a1, $sp, 0x50
/* 086188 80085588 3C09800E */ lui $t1, %hi(D_800DFACC) # $t1, 0x800e
/* 08618C 8008558C 000E7880 */ sll $t7, $t6, 2
/* 086190 80085590 3C088012 */ lui $t0, %hi(D_80126660) # $t0, 0x8012
/* 086190 80085590 3C088012 */ lui $t0, %hi(D_80126550) # $t0, 0x8012
/* 086194 80085594 012F4821 */ addu $t1, $t1, $t7
/* 086198 80085598 AFA50064 */ sw $a1, 0x64($sp)
/* 08619C 8008559C 8D086660 */ lw $t0, %lo(D_80126660)($t0)
/* 08619C 8008559C 8D086660 */ lw $t0, %lo(D_80126550 + 0x110)($t0)
/* 0861A0 800855A0 8D29FACC */ lw $t1, %lo(D_800DFACC)($t1)
/* 0861A4 800855A4 86040004 */ lh $a0, 4($s0)
/* 0861A8 800855A8 24060003 */ li $a2, 3
@@ -205,9 +205,9 @@ glabel L80085690
/* 0862B8 800856B8 AFB80064 */ sw $t8, 0x64($sp)
/* 0862BC 800856BC 032A5821 */ addu $t3, $t9, $t2
/* 0862C0 800856C0 8D6C0158 */ lw $t4, 0x158($t3)
/* 0862C4 800856C4 3C088012 */ lui $t0, %hi(D_80126660) # $t0, 0x8012
/* 0862C4 800856C4 3C088012 */ lui $t0, %hi(D_80126550) # $t0, 0x8012
/* 0862C8 800856C8 012F4821 */ addu $t1, $t1, $t7
/* 0862CC 800856CC 8D086660 */ lw $t0, %lo(D_80126660)($t0)
/* 0862CC 800856CC 8D086660 */ lw $t0, %lo(D_80126550 + 0x110)($t0)
/* 0862D0 800856D0 8D29FACC */ lw $t1, %lo(D_800DFACC)($t1)
/* 0862D4 800856D4 10000060 */ b .L80085858
/* 0862D8 800856D8 AFAC0060 */ sw $t4, 0x60($sp)
@@ -225,9 +225,9 @@ glabel L800856DC
/* 086304 80085704 00026880 */ sll $t5, $v0, 2
/* 086308 80085708 AFAF0064 */ sw $t7, 0x64($sp)
/* 08630C 8008570C 8F2A0158 */ lw $t2, 0x158($t9)
/* 086310 80085710 3C088012 */ lui $t0, %hi(D_80126660) # $t0, 0x8012
/* 086310 80085710 3C088012 */ lui $t0, %hi(D_80126550) # $t0, 0x8012
/* 086314 80085714 012D4821 */ addu $t1, $t1, $t5
/* 086318 80085718 8D086660 */ lw $t0, %lo(D_80126660)($t0)
/* 086318 80085718 8D086660 */ lw $t0, %lo(D_80126550 + 0x110)($t0)
/* 08631C 8008571C 8D29FACC */ lw $t1, %lo(D_800DFACC)($t1)
/* 086320 80085720 1000004D */ b .L80085858
/* 086324 80085724 AFAA0060 */ sw $t2, 0x60($sp)
@@ -245,9 +245,9 @@ glabel L80085728
/* 086350 80085750 AFAE0064 */ sw $t6, 0x64($sp)
/* 086354 80085754 01AFC021 */ addu $t8, $t5, $t7
/* 086358 80085758 8F190158 */ lw $t9, 0x158($t8)
/* 08635C 8008575C 3C088012 */ lui $t0, %hi(D_80126660) # $t0, 0x8012
/* 08635C 8008575C 3C088012 */ lui $t0, %hi(D_80126550) # $t0, 0x8012
/* 086360 80085760 012C4821 */ addu $t1, $t1, $t4
/* 086364 80085764 8D086660 */ lw $t0, %lo(D_80126660)($t0)
/* 086364 80085764 8D086660 */ lw $t0, %lo(D_80126550 + 0x110)($t0)
/* 086368 80085768 8D29FACC */ lw $t1, %lo(D_800DFACC)($t1)
/* 08636C 8008576C 1000003A */ b .L80085858
/* 086370 80085770 AFB90060 */ sw $t9, 0x60($sp)
@@ -265,9 +265,9 @@ glabel L80085774
/* 08639C 8008579C 00025880 */ sll $t3, $v0, 2
/* 0863A0 800857A0 AFAC0064 */ sw $t4, 0x64($sp)
/* 0863A4 800857A4 8DAF0158 */ lw $t7, 0x158($t5)
/* 0863A8 800857A8 3C088012 */ lui $t0, %hi(D_80126660) # $t0, 0x8012
/* 0863A8 800857A8 3C088012 */ lui $t0, %hi(D_80126550) # $t0, 0x8012
/* 0863AC 800857AC 012B4821 */ addu $t1, $t1, $t3
/* 0863B0 800857B0 8D086660 */ lw $t0, %lo(D_80126660)($t0)
/* 0863B0 800857B0 8D086660 */ lw $t0, %lo(D_80126550 + 0x110)($t0)
/* 0863B4 800857B4 8D29FACC */ lw $t1, %lo(D_800DFACC)($t1)
/* 0863B8 800857B8 10000027 */ b .L80085858
/* 0863BC 800857BC AFAF0060 */ sw $t7, 0x60($sp)
@@ -278,8 +278,8 @@ glabel L800857C0
/* 0863CC 800857CC 2718FC30 */ addiu $t8, %lo(D_800DFC30) # addiu $t8, $t8, -0x3d0
/* 0863D0 800857D0 AFB80068 */ sw $t8, 0x68($sp)
/* 0863D4 800857D4 8F2A01EC */ lw $t2, 0x1ec($t9)
/* 0863D8 800857D8 3C088012 */ lui $t0, %hi(D_80126664) # $t0, 0x8012
/* 0863DC 800857DC 8D086664 */ lw $t0, %lo(D_80126664)($t0)
/* 0863D8 800857D8 3C088012 */ lui $t0, %hi(D_80126550) # $t0, 0x8012
/* 0863DC 800857DC 8D086664 */ lw $t0, %lo(D_80126550 + 0x114)($t0)
/* 0863E0 800857E0 2409FFFF */ li $t1, -1
/* 0863E4 800857E4 AFA00060 */ sw $zero, 0x60($sp)
/* 0863E8 800857E8 1000001B */ b .L80085858
@@ -291,10 +291,10 @@ glabel L800857F0
/* 0863FC 800857FC 256BFC10 */ addiu $t3, %lo(D_800DFC10) # addiu $t3, $t3, -0x3f0
/* 086400 80085800 AFAB0068 */ sw $t3, 0x68($sp)
/* 086404 80085804 8C6C02D4 */ lw $t4, 0x2d4($v1)
/* 086408 80085808 3C088012 */ lui $t0, %hi(D_8012665C) # $t0, 0x8012
/* 086408 80085808 3C088012 */ lui $t0, %hi(D_80126550) # $t0, 0x8012
/* 08640C 8008580C AFAC0064 */ sw $t4, 0x64($sp)
/* 086410 80085810 8C6E01DC */ lw $t6, 0x1dc($v1)
/* 086414 80085814 8D08665C */ lw $t0, %lo(D_8012665C)($t0)
/* 086414 80085814 8D08665C */ lw $t0, %lo(D_80126550 + 0x10C)($t0)
/* 086418 80085818 3C09B0E0 */ lui $t1, (0xB0E0C0FF >> 16) # lui $t1, 0xb0e0
/* 08641C 8008581C 3529C0FF */ ori $t1, (0xB0E0C0FF & 0xFFFF) # ori $t1, $t1, 0xc0ff
/* 086420 80085820 1000000D */ b .L80085858
@@ -307,9 +307,9 @@ glabel L80085828
/* 086434 80085834 25ADFC60 */ addiu $t5, %lo(D_800DFC60) # addiu $t5, $t5, -0x3a0
/* 086438 80085838 AFAD0068 */ sw $t5, 0x68($sp)
/* 08643C 8008583C 8DF80144 */ lw $t8, 0x144($t7)
/* 086440 80085840 3C088012 */ lui $t0, %hi(D_80126664) # $t0, 0x8012
/* 086440 80085840 3C088012 */ lui $t0, %hi(D_80126550) # $t0, 0x8012
/* 086444 80085844 3C098080 */ lui $t1, (0x808080FF >> 16) # lui $t1, 0x8080
/* 086448 80085848 8D086664 */ lw $t0, %lo(D_80126664)($t0)
/* 086448 80085848 8D086664 */ lw $t0, %lo(D_80126550 + 0x114)($t0)
/* 08644C 8008584C 352980FF */ ori $t1, (0x808080FF & 0xFFFF) # ori $t1, $t1, 0x80ff
/* 086450 80085850 AFA00060 */ sw $zero, 0x60($sp)
/* 086454 80085854 AFB80064 */ sw $t8, 0x64($sp)
asm/non_matchings/menu/func_8008F00C.s
-147
View File
@@ -1,147 +0,0 @@
glabel func_8008F00C
/* 08FC0C 8008F00C 3C058012 */ lui $a1, %hi(D_801267D0) # $a1, 0x8012
/* 08FC10 8008F010 24A567D0 */ addiu $a1, %lo(D_801267D0) # addiu $a1, $a1, 0x67d0
/* 08FC14 8008F014 8CA20000 */ lw $v0, ($a1)
/* 08FC18 8008F018 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 08FC1C 8008F01C 2401FFFF */ li $at, -1
/* 08FC20 8008F020 AFBF0014 */ sw $ra, 0x14($sp)
/* 08FC24 8008F024 10410009 */ beq $v0, $at, .L8008F04C
/* 08FC28 8008F028 AFA40018 */ sw $a0, 0x18($sp)
/* 08FC2C 8008F02C 10400007 */ beqz $v0, .L8008F04C
/* 08FC30 8008F030 24010001 */ li $at, 1
/* 08FC34 8008F034 14410005 */ bne $v0, $at, .L8008F04C
/* 08FC38 8008F038 3C04800E */ lui $a0, %hi(D_800E07E8) # $a0, 0x800e
/* 08FC3C 8008F03C 0C02712A */ jal func_8009C4A8
/* 08FC40 8008F040 248407E8 */ addiu $a0, %lo(D_800E07E8) # addiu $a0, $a0, 0x7e8
/* 08FC44 8008F044 3C058012 */ lui $a1, %hi(D_801267D0) # $a1, 0x8012
/* 08FC48 8008F048 24A567D0 */ addiu $a1, %lo(D_801267D0) # addiu $a1, $a1, 0x67d0
.L8008F04C:
/* 08FC4C 8008F04C 8FAE0018 */ lw $t6, 0x18($sp)
/* 08FC50 8008F050 00000000 */ nop
/* 08FC54 8008F054 05C00072 */ bltz $t6, .L8008F220
/* 08FC58 8008F058 ACAE0000 */ sw $t6, ($a1)
/* 08FC5C 8008F05C 29C10002 */ slti $at, $t6, 2
/* 08FC60 8008F060 10200070 */ beqz $at, .L8008F224
/* 08FC64 8008F064 8FBF0014 */ lw $ra, 0x14($sp)
/* 08FC68 8008F068 11C00006 */ beqz $t6, .L8008F084
/* 08FC6C 8008F06C 3C018012 */ lui $at, %hi(D_801269DC) # $at, 0x8012
/* 08FC70 8008F070 24010001 */ li $at, 1
/* 08FC74 8008F074 11C1000B */ beq $t6, $at, .L8008F0A4
/* 08FC78 8008F078 3C04800E */ lui $a0, %hi(gTrackIdForPreview) # $a0, 0x800e
/* 08FC7C 8008F07C 10000069 */ b .L8008F224
/* 08FC80 8008F080 8FBF0014 */ lw $ra, 0x14($sp)
.L8008F084:
/* 08FC84 8008F084 C42469DC */ lwc1 $f4, %lo(D_801269DC)($at)
/* 08FC88 8008F088 3C018012 */ lui $at, %hi(D_801269E8) # $at, 0x8012
/* 08FC8C 8008F08C E42469E8 */ swc1 $f4, %lo(D_801269E8)($at)
/* 08FC90 8008F090 3C018012 */ lui $at, %hi(D_801269E4) # $at, 0x8012
/* 08FC94 8008F094 C42669E4 */ lwc1 $f6, %lo(D_801269E4)($at)
/* 08FC98 8008F098 3C018012 */ lui $at, %hi(D_801269EC) # $at, 0x8012
/* 08FC9C 8008F09C 10000060 */ b .L8008F220
/* 08FCA0 8008F0A0 E42669EC */ swc1 $f6, %lo(D_801269EC)($at)
.L8008F0A4:
/* 08FCA4 8008F0A4 8C84F4C4 */ lw $a0, %lo(gTrackIdForPreview)($a0)
/* 08FCA8 8008F0A8 0C01AC2B */ jal func_8006B0AC
/* 08FCAC 8008F0AC 00000000 */ nop
/* 08FCB0 8008F0B0 3C06800E */ lui $a2, %hi(gNumberOfActivePlayers) # $a2, 0x800e
/* 08FCB4 8008F0B4 8CC6F4BC */ lw $a2, %lo(gNumberOfActivePlayers)($a2)
/* 08FCB8 8008F0B8 3C048012 */ lui $a0, %hi(D_801269C4) # $a0, 0x8012
/* 08FCBC 8008F0BC 18C0000B */ blez $a2, .L8008F0EC
/* 08FCC0 8008F0C0 24180001 */ li $t8, 1
/* 08FCC4 8008F0C4 3C0F8012 */ lui $t7, %hi(gPlayerSelectVehicle) # $t7, 0x8012
/* 08FCC8 8008F0C8 25E369C0 */ addiu $v1, $t7, %lo(gPlayerSelectVehicle)
/* 08FCCC 8008F0CC 00C32821 */ addu $a1, $a2, $v1
/* 08FCD0 8008F0D0 248469C4 */ addiu $a0, %lo(D_801269C4) # addiu $a0, $a0, 0x69c4
.L8008F0D4:
/* 08FCD4 8008F0D4 24630001 */ addiu $v1, $v1, 1
/* 08FCD8 8008F0D8 0065082B */ sltu $at, $v1, $a1
/* 08FCDC 8008F0DC 24840001 */ addiu $a0, $a0, 1
/* 08FCE0 8008F0E0 A080FFFF */ sb $zero, -1($a0)
/* 08FCE4 8008F0E4 1420FFFB */ bnez $at, .L8008F0D4
/* 08FCE8 8008F0E8 A062FFFF */ sb $v0, -1($v1)
.L8008F0EC:
/* 08FCEC 8008F0EC 3C01800E */ lui $at, %hi(gNumberOfReadyPlayers) # $at, 0x800e
/* 08FCF0 8008F0F0 AC20F480 */ sw $zero, %lo(gNumberOfReadyPlayers)($at)
/* 08FCF4 8008F0F4 3C01800E */ lui $at, %hi(D_800E0980) # $at, 0x800e
/* 08FCF8 8008F0F8 3C04800E */ lui $a0, %hi(D_800E07E8) # $a0, 0x800e
/* 08FCFC 8008F0FC AC380980 */ sw $t8, %lo(D_800E0980)($at)
/* 08FD00 8008F100 0C02719D */ jal func_8009C674
/* 08FD04 8008F104 248407E8 */ addiu $a0, %lo(D_800E07E8) # addiu $a0, $a0, 0x7e8
/* 08FD08 8008F108 3C04800E */ lui $a0, %hi(D_800E0830) # $a0, 0x800e
/* 08FD0C 8008F10C 0C027229 */ jal allocate_menu_images
/* 08FD10 8008F110 24840830 */ addiu $a0, %lo(D_800E0830) # addiu $a0, $a0, 0x830
/* 08FD14 8008F114 0C023917 */ jal assign_vehicle_icon_textures
/* 08FD18 8008F118 00000000 */ nop
/* 08FD1C 8008F11C 3C028012 */ lui $v0, %hi(D_80126550) # $v0, 0x8012
/* 08FD20 8008F120 24426550 */ addiu $v0, %lo(D_80126550) # addiu $v0, $v0, 0x6550
/* 08FD24 8008F124 3C03800E */ lui $v1, %hi(gRaceSelectionTTOn) # $v1, 0x800e
/* 08FD28 8008F128 3C04800E */ lui $a0, %hi(gRaceSelectionTTOff) # $a0, 0x800e
/* 08FD2C 8008F12C 8C590090 */ lw $t9, 0x90($v0)
/* 08FD30 8008F130 8C480094 */ lw $t0, 0x94($v0)
/* 08FD34 8008F134 8C490098 */ lw $t1, 0x98($v0)
/* 08FD38 8008F138 8C4A009C */ lw $t2, 0x9c($v0)
/* 08FD3C 8008F13C 248404BC */ addiu $a0, %lo(gRaceSelectionTTOff) # addiu $a0, $a0, 0x4bc
/* 08FD40 8008F140 246304A4 */ addiu $v1, %lo(gRaceSelectionTTOn) # addiu $v1, $v1, 0x4a4
/* 08FD44 8008F144 8C4B007C */ lw $t3, 0x7c($v0)
/* 08FD48 8008F148 3C01800E */ lui $at, %hi(gRaceSelectionCarOptHighlight) # $at, 0x800e
/* 08FD4C 8008F14C AC790000 */ sw $t9, ($v1)
/* 08FD50 8008F150 AC680008 */ sw $t0, 8($v1)
/* 08FD54 8008F154 AC890000 */ sw $t1, ($a0)
/* 08FD58 8008F158 AC8A0008 */ sw $t2, 8($a0)
/* 08FD5C 8008F15C AC2B04D4 */ sw $t3, %lo(gRaceSelectionCarOptHighlight)($at)
/* 08FD60 8008F160 8C4C0078 */ lw $t4, 0x78($v0)
/* 08FD64 8008F164 3C01800E */ lui $at, %hi(gRaceSelectionCarOpt) # $at, 0x800e
/* 08FD68 8008F168 AC2C04E4 */ sw $t4, %lo(gRaceSelectionCarOpt)($at)
/* 08FD6C 8008F16C 8C4D0084 */ lw $t5, 0x84($v0)
/* 08FD70 8008F170 3C01800E */ lui $at, %hi(gRaceSelectionHoverOptHighlight) # $at, 0x800e
/* 08FD74 8008F174 AC2D04F4 */ sw $t5, %lo(gRaceSelectionHoverOptHighlight)($at)
/* 08FD78 8008F178 8C4E0080 */ lw $t6, 0x80($v0)
/* 08FD7C 8008F17C 3C01800E */ lui $at, %hi(gRaceSelectionHoverOpt) # $at, 0x800e
/* 08FD80 8008F180 AC2E0504 */ sw $t6, %lo(gRaceSelectionHoverOpt)($at)
/* 08FD84 8008F184 8C4F008C */ lw $t7, 0x8c($v0)
/* 08FD88 8008F188 3C01800E */ lui $at, %hi(gRaceSelectionPlaneOptHighlight) # $at, 0x800e
/* 08FD8C 8008F18C AC2F0514 */ sw $t7, %lo(gRaceSelectionPlaneOptHighlight)($at)
/* 08FD90 8008F190 8C580088 */ lw $t8, 0x88($v0)
/* 08FD94 8008F194 3C01800E */ lui $at, %hi(gRaceSelectionPlaneOpt) # $at, 0x800e
/* 08FD98 8008F198 AC380524 */ sw $t8, %lo(gRaceSelectionPlaneOpt)($at)
/* 08FD9C 8008F19C 8C5900A0 */ lw $t9, 0xa0($v0)
/* 08FDA0 8008F1A0 3C01800E */ lui $at, %hi(gRaceSelectionTTOnOptHighlight) # $at, 0x800e
/* 08FDA4 8008F1A4 AC390534 */ sw $t9, %lo(gRaceSelectionTTOnOptHighlight)($at)
/* 08FDA8 8008F1A8 8C4800A8 */ lw $t0, 0xa8($v0)
/* 08FDAC 8008F1AC 3C01800E */ lui $at, %hi(gRaceSelectionTTOffOptHighlight) # $at, 0x800e
/* 08FDB0 8008F1B0 AC280544 */ sw $t0, %lo(gRaceSelectionTTOffOptHighlight)($at)
/* 08FDB4 8008F1B4 8C4900A4 */ lw $t1, 0xa4($v0)
/* 08FDB8 8008F1B8 3C01800E */ lui $at, %hi(gRaceSelectionTTOnOpt) # $at, 0x800e
/* 08FDBC 8008F1BC AC290554 */ sw $t1, %lo(gRaceSelectionTTOnOpt)($at)
/* 08FDC0 8008F1C0 8C4A00AC */ lw $t2, 0xac($v0)
/* 08FDC4 8008F1C4 3C01800E */ lui $at, %hi(gRaceSelectionTTOffOpt) # $at, 0x800e
/* 08FDC8 8008F1C8 AC2A0564 */ sw $t2, %lo(gRaceSelectionTTOffOpt)($at)
/* 08FDCC 8008F1CC 8C4B00B0 */ lw $t3, 0xb0($v0)
/* 08FDD0 8008F1D0 3C01800E */ lui $at, %hi(gRaceSelectionPlayer1Texture) # $at, 0x800e
/* 08FDD4 8008F1D4 AC2B0574 */ sw $t3, %lo(gRaceSelectionPlayer1Texture)($at)
/* 08FDD8 8008F1D8 8C4C00B4 */ lw $t4, 0xb4($v0)
/* 08FDDC 8008F1DC 3C01800E */ lui $at, %hi(gRaceSelectionPlayer2Texture) # $at, 0x800e
/* 08FDE0 8008F1E0 AC2C0584 */ sw $t4, %lo(gRaceSelectionPlayer2Texture)($at)
/* 08FDE4 8008F1E4 8C4D00B8 */ lw $t5, 0xb8($v0)
/* 08FDE8 8008F1E8 3C01800E */ lui $at, %hi(gRaceSelectionPlayer3Texture) # $at, 0x800e
/* 08FDEC 8008F1EC AC2D0594 */ sw $t5, %lo(gRaceSelectionPlayer3Texture)($at)
/* 08FDF0 8008F1F0 8C4E00BC */ lw $t6, 0xbc($v0)
/* 08FDF4 8008F1F4 3C01800E */ lui $at, %hi(gRaceSelectionPlayer4Texture) # $at, 0x800e
/* 08FDF8 8008F1F8 AC2E05A4 */ sw $t6, %lo(gRaceSelectionPlayer4Texture)($at)
/* 08FDFC 8008F1FC 8C4F00C0 */ lw $t7, 0xc0($v0)
/* 08FE00 8008F200 3C01800E */ lui $at, %hi(gRaceSelectionVehicleTitleTexture) # $at, 0x800e
/* 08FE04 8008F204 AC2F05B4 */ sw $t7, %lo(gRaceSelectionVehicleTitleTexture)($at)
/* 08FE08 8008F208 8C5800C4 */ lw $t8, 0xc4($v0)
/* 08FE0C 8008F20C 3C01800E */ lui $at, %hi(gRaceSelectionTTTitleTexture) # $at, 0x800e
/* 08FE10 8008F210 AC3805C4 */ sw $t8, %lo(gRaceSelectionTTTitleTexture)($at)
/* 08FE14 8008F214 8C590178 */ lw $t9, 0x178($v0)
/* 08FE18 8008F218 3C01800E */ lui $at, %hi(gRaceSelectionTTTexture) # $at, 0x800e
/* 08FE1C 8008F21C AC390614 */ sw $t9, %lo(gRaceSelectionTTTexture)($at)
.L8008F220:
/* 08FE20 8008F220 8FBF0014 */ lw $ra, 0x14($sp)
.L8008F224:
/* 08FE24 8008F224 3C01800E */ lui $at, %hi(gMenuDelay) # $at, 0x800e
/* 08FE28 8008F228 AC20F47C */ sw $zero, %lo(gMenuDelay)($at)
/* 08FE2C 8008F22C 03E00008 */ jr $ra
/* 08FE30 8008F230 27BD0018 */ addiu $sp, $sp, 0x18
asm/non_matchings/menu/render_track_select_setup_ui.s
+1253 -1253
View File
File diff suppressed because it is too large Load Diff
src/font.c
+8 -8
View File
@@ -320,7 +320,7 @@ void func_800C45A4(Gfx **dlist, DialogueBoxBackground *arg1, char *text, Alignme
}
newTempX = xpos + xAlignmentDiff - 1;
newTempY = (ypos + fontData->unk22 - 1);
gDkrDmaDisplayList((*dlist)++, (u32)(((char *) dDialogueBoxDrawModes[1]) - 0x80000000), 2);
gDkrDmaDisplayList((*dlist)++, OS_K0_TO_PHYSICAL(dDialogueBoxDrawModes[1]), 2);
gDPFillRectangle((*dlist)++, xpos + arg1->x1, ypos + arg1->y1, newTempX + arg1->x1,
newTempY + arg1->y1);
gDPPipeSync((*dlist)++);
@@ -328,7 +328,7 @@ void func_800C45A4(Gfx **dlist, DialogueBoxBackground *arg1, char *text, Alignme
gDPSetPrimColor((*dlist)++, textureLry, 0, 255, 255, 255, arg1->opacity);
gDPSetEnvColor((*dlist)++, arg1->textColourR, arg1->textColourG, arg1->textColourB,
arg1->textColourA);
gDkrDmaDisplayList((*dlist)++, (u32)(((char *) dDialogueBoxDrawModes[0]) - 0x80000000), 2);
gDkrDmaDisplayList((*dlist)++, OS_K0_TO_PHYSICAL(dDialogueBoxDrawModes[0]), 2);
gDPPipeSync((*dlist)++);
xpos += arg1->unk20;
ypos += arg1->unk22;
@@ -339,20 +339,20 @@ void func_800C45A4(Gfx **dlist, DialogueBoxBackground *arg1, char *text, Alignme
var_t0 = 0;
if ((curChar < 0x21) || (curChar >= 0x80)) {
switch (curChar) {
case ' ':
case ' ': // Space
xpos += fontData->unk24;
break;
case '\n':
case '\n': // Line Feed
xpos = arg1->unk20;
ypos += fontData->unk22;
break;
case '\t':
case '\t': // Tab
xpos += fontData->unk26 - ((xpos - arg1->unk20) % fontData->unk26);
break;
case '\v':
case '\v': // VT - Vertical Tab
ypos += fontData->unk22;
break;
case '\r':
case '\r': // Carriage Return
xpos = arg1->unk20;
break;
default:
@@ -360,7 +360,7 @@ void func_800C45A4(Gfx **dlist, DialogueBoxBackground *arg1, char *text, Alignme
break;
}
} else {
curChar -= 0x20;
curChar -= 0x20; // Convert lower case to upper case ASCII
textureIndex = fontData->unk100[curChar].unk0;
if (textureIndex != 0xFF) {
newData = 1;
src/menu.c
+78 -28
View File
@@ -55,7 +55,7 @@ s32 gIgnorePlayerInput;
UNUSED s32 sUnused_801263C8; // Set to 0 in menu_init, and never again.
CharacterSelectData (*gCurrCharacterSelectData)[8]; //Some sort of character list? Cares if T.T. and Drumstick are unlocked
s32 D_801263D0;
s32 D_801263D0; //Compared for equality to gTrackIdForPreview
s8 gActivePlayersArray[4];
s32 D_801263D8;
s8 D_801263DC[4];
@@ -141,12 +141,8 @@ s8 D_80126540;
s8 D_80126541;
s32 D_80126544;
s32 gMultiplayerSelectedNumberOfRacersCopy; // Saved version gMultiplayerSelectedNumberOfRacers?
TextureHeader *D_80126550[67]; // lookup table? TEXTURES
TextureHeader *D_8012665C;
TextureHeader *D_80126660;
TextureHeader *D_80126664;
s32 D_80126668[58];
u8 D_80126750[128];
TextureHeader *D_80126550[128]; // lookup table? TEXTURES
u8 D_80126750[128]; // Seems to be a boolean for "This texture exists" for the above array.
s32 D_801267D0;
s32 D_801267D4;
s32 D_801267D8[3];
@@ -186,12 +182,14 @@ f32 D_801268D8;
s32 D_801268DC;
s32 D_801268E0;
s32 D_801268E4;
s32 D_801268E8[12];
s32 D_80126918[3];
s16 D_801268E8[24]; // Probably a struct?
s16 D_80126918;
UNUSED s32 D_8012691C;
UNUSED s32 D_80126920;
s32 D_80126924;
s32 D_80126928;
s32 D_8012692C;
s32 D_80126930[36];
unk80126930 D_80126930[9];
s8 gPlayerSelectVehicle[4]; // Unknown number of entries.
u8 D_801269C4[4];
s32 D_801269C8;
@@ -200,8 +198,8 @@ char *gAudioOutputStrings[3];
f32 D_801269DC;
char *gMusicTestString;
f32 D_801269E4;
s32 D_801269E8;
s32 D_801269EC;
f32 D_801269E8;
f32 D_801269EC;
s32 D_801269F0;
s32 D_801269F4;
s32 D_801269F8;
@@ -748,11 +746,8 @@ DrawTexture gRaceSelectionPlayer3Texture[2] = { { NULL, 0, 0 }, { NULL, 0, 0 } }
DrawTexture gRaceSelectionPlayer4Texture[2] = { { NULL, 0, 0 }, { NULL, 0, 0 } };
DrawTexture gRaceSelectionVehicleTitleTexture[2] = { { NULL, 0, 0 }, { NULL, 0, 0 } };
DrawTexture gRaceSelectionTTTitleTexture[2] = { { NULL, 0, 0 }, { NULL, 0, 0 } };
// These are probably structs
s32 D_800E05D4[8] = { 0, 0xFFD0, 0, 0xFFF0, 0, 0x10, 0, 0 };
s32 D_800E05F4[8] = { 0, 0xFFD0, 0, 0xFFF0, 0, 0x10, 0, 0 };
DrawTexture D_800E05D4[4] = { { NULL, 0, -48 }, { NULL, 0, -16 }, { NULL, 0, 16 }, { NULL, 0, 0 } };
DrawTexture D_800E05F4[4] = { { NULL, 0, -48 }, { NULL, 0, -16 }, { NULL, 0, 16 }, { NULL, 0, 0 } };
DrawTexture gRaceSelectionTTTexture[2] = { { NULL, -16, -16 }, { NULL, 0, 0 } };
DrawTexture *gRaceSelectionImages[9] = {
@@ -902,9 +897,9 @@ s16 D_800E0840[148] = {
0xFF20, 0xFF00, 0x0000, 0x0000
};
s32 D_800E0968 = 0;
Vertex *D_800E0968 = NULL;
s32 D_800E096C = 0;
s32 *D_800E0970 = NULL;
unk800E0970 *D_800E0970 = NULL;
s32 D_800E0974 = 0;
const f32 D_800E7D04[1] = { 0.5f }; // .rodata
f32 *D_800E0978 = D_800E7D04; // .data
@@ -2106,7 +2101,7 @@ void draw_menu_elements(s32 arg0, MenuElement *elem, f32 arg2) {
if (arg0 != 4) {
func_80067F2C(&sMenuCurrDisplayList, &sMenuCurrHudMat);
while (elem->unk14_a.element != NULL) {
if (&D_80126850 != elem->unk14_a.element) {
if (elem->unk14_a.element != &D_80126850) {
if (arg0 == 0) {
tempX = elem->center - elem->left;
tempX *= arg2;
@@ -2123,7 +2118,7 @@ void draw_menu_elements(s32 arg0, MenuElement *elem, f32 arg2) {
xPos = tempX + elem->center;
tempY = elem->bottom - elem->middle;
tempY *= arg2;
yPos = tempY + elem->middle;
yPos = (tempY & 0xFFFFFFFFFFFFFFFFu) + elem->middle;
}
switch (elem->elementType) {
case 0:
@@ -2164,7 +2159,6 @@ void draw_menu_elements(s32 arg0, MenuElement *elem, f32 arg2) {
elem->textAlignFlags);
break;
case 3:
s5 = TRUE;
render_textured_rectangle(
&sMenuCurrDisplayList,
elem->unk14_a.texture,
@@ -2174,9 +2168,9 @@ void draw_menu_elements(s32 arg0, MenuElement *elem, f32 arg2) {
elem->filterGreen,
elem->filterBlue,
elem->opacity);
s5 = TRUE;
break;
case 4:
s5 = TRUE;
render_texture_rectangle_scaled(
&sMenuCurrDisplayList,
elem->unk14_a.element,
@@ -2186,6 +2180,7 @@ void draw_menu_elements(s32 arg0, MenuElement *elem, f32 arg2) {
elem->backgroundGreen / 256.0f,
(elem->filterRed << 24) | (elem->filterGreen << 16) | (elem->filterBlue << 8) | elem->opacity,
elem->textAlignFlags);
s5 = TRUE;
break;
case 5:
if (s5) {
@@ -5499,7 +5494,62 @@ UNUSED s32 func_8008E790(void) {
}
GLOBAL_ASM("asm/non_matchings/menu/menu_track_select_init.s")
GLOBAL_ASM("asm/non_matchings/menu/func_8008F00C.s")
void func_8008F00C(s32 arg0) {
s32 temp_v0_2;
s32 i;
s32 temp;
if ((D_801267D0 != -1) && (D_801267D0 != 0) && (D_801267D0 == 1)) {
func_8009C4A8(D_800E07E8);
}
D_801267D0 = arg0;
temp = D_801267D0;
if ((temp >= 0) && (temp < 2)) {
switch (D_801267D0) {
case 0:
D_801269E8 = D_801269DC;
D_801269EC = D_801269E4;
break;
case 1:
temp_v0_2 = func_8006B0AC(gTrackIdForPreview);
for (i = 0; i < gNumberOfActivePlayers; i++) {
D_801269C4[i] = 0;
gPlayerSelectVehicle[i] = temp_v0_2;
}
gNumberOfReadyPlayers = 0;
D_800E0980 = 1;
func_8009C674(D_800E07E8);
allocate_menu_images(D_800E0830);
assign_vehicle_icon_textures();
gRaceSelectionTTOn[0].texture = D_80126550[TEXTURE_ICON_TIMETRIAL_ON_TOP];
gRaceSelectionTTOn[1].texture = D_80126550[TEXTURE_ICON_TIMETRIAL_ON_BOTTOM];
gRaceSelectionTTOff[0].texture = D_80126550[TEXTURE_ICON_TIMETRIAL_OFF_TOP];
gRaceSelectionTTOff[1].texture = D_80126550[TEXTURE_ICON_TIMETRIAL_OFF_BOTTOM];
gRaceSelectionCarOptHighlight[0].texture = D_80126550[TEXTURE_ICON_VEHICLE_SELECT_CAR_HIGHLIGHT];
gRaceSelectionCarOpt[0].texture = D_80126550[TEXTURE_ICON_VEHICLE_SELECT_CAR];
gRaceSelectionHoverOptHighlight[0].texture = D_80126550[TEXTURE_ICON_VEHICLE_SELECT_HOVERCRAFT_HIGHLIGHT];
gRaceSelectionHoverOpt[0].texture = D_80126550[TEXTURE_ICON_VEHICLE_SELECT_HOVERCRAFT];
gRaceSelectionPlaneOptHighlight[0].texture = D_80126550[TEXTURE_ICON_VEHICLE_SELECT_PLANE_HIGHLIGHT];
gRaceSelectionPlaneOpt[0].texture = D_80126550[TEXTURE_ICON_VEHICLE_SELECT_PLANE];
gRaceSelectionTTOnOptHighlight[0].texture = D_80126550[TEXTURE_ICON_TIMETRIAL_OPT_ON];
gRaceSelectionTTOffOptHighlight[0].texture = D_80126550[TEXTURE_ICON_TIMETRIAL_OPT_ON_HIGHLIGHT];
gRaceSelectionTTOnOpt[0].texture = D_80126550[TEXTURE_ICON_TIMETRIAL_OPT_OFF];
gRaceSelectionTTOffOpt[0].texture = D_80126550[TEXTURE_ICON_TIMETRIAL_OPT_OFF_HIGHLIGHT];
gRaceSelectionPlayer1Texture[0].texture = D_80126550[TEXTURE_ICON_PLAYER_1];
gRaceSelectionPlayer2Texture[0].texture = D_80126550[TEXTURE_ICON_PLAYER_2];
gRaceSelectionPlayer3Texture[0].texture = D_80126550[TEXTURE_ICON_PLAYER_3];
gRaceSelectionPlayer4Texture[0].texture = D_80126550[TEXTURE_ICON_PLAYER_4];
gRaceSelectionVehicleTitleTexture[0].texture = D_80126550[TEXTURE_ICON_VEHICLE_TITLE];
gRaceSelectionTTTitleTexture[0].texture = D_80126550[TEXTURE_ICON_TT_TITLE];
gRaceSelectionTTTexture[0].texture = D_80126550[TEXTURE_ICON_TT_HEAD];
break;
}
}
gMenuDelay = 0;
}
s32 menu_track_select_loop(s32 updateRate) {
s32 cutsceneId;
@@ -5693,7 +5743,7 @@ void render_track_select_setup_ui(s32 updateRate) {
s4 += 0xC;
}
func_80080580(&sMenuCurrDisplayList, -(s4 >> 1), 0x78 - D_800E0700.y, s4, D_800E0700.height,
D_800E0700.borderWidth, D_800E0700.borderHeight, sMenuGuiOpacity + 0xB0E0C000, D_8012665C);
D_800E0700.borderWidth, D_800E0700.borderHeight, sMenuGuiOpacity + 0xB0E0C000, D_80126550[43]);
func_80080E6C();
set_text_font(ASSET_FONTS_FUNFONT);
s7 = D_800E0700.colourMax + D_800E0700.y + sp80;
@@ -5840,7 +5890,7 @@ void render_track_select_setup_ui(s32 updateRate) {
} else {
s4 = gTwoPlayerRacerCountMenu.width;
}
func_80080580(&sMenuCurrDisplayList, -(s4 >> 1), 0x78 - gTwoPlayerRacerCountMenu.y, s4, gTwoPlayerRacerCountMenu.height, gTwoPlayerRacerCountMenu.textPos[0], gTwoPlayerRacerCountMenu.textPos[1], 0xB0E0C0FF, D_8012665C);
func_80080580(&sMenuCurrDisplayList, -(s4 >> 1), 0x78 - gTwoPlayerRacerCountMenu.y, s4, gTwoPlayerRacerCountMenu.height, gTwoPlayerRacerCountMenu.textPos[0], gTwoPlayerRacerCountMenu.textPos[1], 0xB0E0C0FF, D_80126550[43]);
func_80080E6C();
set_text_font(ASSET_FONTS_FUNFONT);
set_text_colour(0, 0, 0, 0xFF, 0x80);
@@ -7112,7 +7162,7 @@ s32 menu_ghost_data_loop(s32 updateRate) {
gOptionBlinkTimer = (gOptionBlinkTimer + updateRate) & 0x3F;
if ((gMenuDelay >= -19) && (gMenuDelay < 20)) {
if ((gMenuDelay > -20) && (gMenuDelay < 20)) {
func_80099E8C(updateRate);
}
@@ -7128,7 +7178,7 @@ s32 menu_ghost_data_loop(s32 updateRate) {
xStick = 0;
yStick = 0;
if (!gIgnorePlayerInput && gMenuDelay == 0) {
for (i = 0; i < 4; i++) {
for (i = 0; i < MAXCONTROLLERS; i++) {
pressedButtons |= get_buttons_pressed_from_player(i);
xStick += gControllersXAxisDirection[i];
yStick += gControllersYAxisDirection[i];
src/menu.h
+55 -12
View File
@@ -221,6 +221,15 @@ typedef struct unk800861C8 {
u32 fileSize; // Game Data File Size
} unk800861C8;
/* Size: 0x10 bytes */
typedef struct unk800E0970 {
s8 unk0;
s8 unk1;
s8 unk2;
s8 unk3;
s8 pad4[12];
} unk800E0970;
/* Unknown size */
typedef struct unk80069D20 {
s16 unk0;
@@ -243,6 +252,23 @@ typedef struct TitleScreenDemos {
s8 cutsceneId;
} TitleScreenDemos;
/* Size 0x10 bytes */
typedef struct unk80126930 {
/* 0x00 */ char *levelName;
/* 0x04 */ char *unk4;
/* 0x08 */ s16 xPos;
/* 0x0A */ s16 yPos;
/* 0x0C */ u8 pad;
/* 0x0D */ u8 colour;
union {
struct {
/* 0x0E */ u8 copyViewPort;
/* 0x0F */ u8 imageId;
};
/* 0x0E */ u16 unkE;
};
} unk80126930;
extern s8 D_800DF450;
extern f32 D_800DF454;
extern s32 D_800DF458;
@@ -427,17 +453,13 @@ extern DrawTexture gRaceSelectionPlayer3Texture[2];
extern DrawTexture gRaceSelectionPlayer4Texture[2];
extern DrawTexture gRaceSelectionVehicleTitleTexture[2];
extern DrawTexture gRaceSelectionTTTitleTexture[2];
// These are probably structs
extern s32 D_800E05D4[8];
extern s32 D_800E05F4[8];
extern DrawTexture D_800E05D4[4];
extern DrawTexture D_800E05F4[4];
extern DrawTexture gRaceSelectionTTTexture[2];
extern DrawTexture *gRaceSelectionImages[9];
extern DrawTexture *D_800E0648[6];
extern DrawTexture *D_800E0660[6];
extern DrawTexture *gMenuSelectionArrows[4];
@@ -469,9 +491,9 @@ extern s16 D_800E0830[8];
extern s16 D_800E0840[148];
extern s32 D_800E0968;
extern Vertex *D_800E0968;
extern s32 D_800E096C;
extern s32 *D_800E0970;
extern unk800E0970 *D_800E0970;
extern s32 D_800E0974;
extern f32* D_800E0978;
extern s32 D_800E097C;
@@ -655,9 +677,6 @@ extern DrawTexture D_800DFC30[2];
extern DrawTexture D_800DFC40[2];
extern DrawTexture D_800DFC50[2];
extern DrawTexture D_800DFC60[2];
extern TextureHeader *D_8012665C;
extern TextureHeader *D_80126660;
extern TextureHeader *D_80126664;
extern Gfx *sMenuCurrDisplayList;
extern Mtx *sMenuCurrHudMat;
extern const char D_800E8208[];
@@ -673,6 +692,26 @@ extern SavefileInfo gSavefileInfo[4];
extern s8 gControllersXAxisDirection[4];
extern s8 gControllersYAxisDirection[4];
extern TextureHeader *D_80126550[128];
extern s32 D_801267D0;
extern u8 D_801269C4[4];
extern f32 D_801269DC;
extern f32 D_801269E4;
extern f32 D_801269E8;
extern f32 D_801269EC;
extern s8 gPlayerSelectVehicle[4];
extern s16 D_80126918;
extern s32 D_801263D8;
extern s32 D_80126480;
//extern s32 D_801268E8[12];
extern s16 D_80126918;
extern s32 D_80126924;
extern s32 D_80126928;
extern s32 D_8012692C;
extern unk80126930 D_80126930[9];
extern s32 D_801269F0;
extern s32 D_801269F4;
extern s32 D_801269F8;
s32 get_random_number_from_range(s32, s32); // No file to pull from yet.
@@ -827,6 +866,7 @@ s32 func_8008D5F8(s32 updateRate);
void func_8008C168(s32 updateRate);
void func_8008C698(s32 updateRate);
void func_80083098(f32);
void func_8008F00C(s32);
// Non Matching functions below here
void load_menu_text(s32 language); // Non Matching
@@ -874,10 +914,13 @@ void func_80099E8C(s32 updateRate);
void func_80092E94(UNUSED s32 updateRate, s32 arg1, s32 arg2);
s32 func_800998E0(s32 arg0);
void func_80081218(void);
void func_80080580(Gfx **arg0, s16 arg1, s16 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, void *arg8);
void func_80080580(Gfx **arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, void *arg8);
void func_800853D0(unk800861C8 *arg0, s32 arg1, s32 arg2);
void render_enter_filename_ui(UNUSED s32 unused);
void func_8008D8BC(s32 updateRate);
void func_8008FA54(s32 arg0, s32 arg1, s8 *arg2, s8 *arg3, s32 arg4, s32 arg5, s32 arg6, DrawTexture *arg7, s32 arg8);
//Possible names
//void func_8008FA54(s32 xPos, s32 yPos, char *levelName, char *arg3, s32 colour, s32 imageId, s32 copyViewPort, DrawTexture *arg7, s32 arg8);
s32 func_80095728(Gfx **gfx, Mtx **mtx, VertexList **vtx, s32 updateRate);
typedef enum MenuTextures {