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

Adventure 2 30% (#414)

Browse Source 
* struct sizeofs

* snowblal struct is become dead

* Some debug string relocation

* printf

* Floaties

* rename four unused particle funcs

* Particle cleanup part 1

* oh god I'm actually starting to understand this system

* am straight blasting

* Update particles.c

* more

* l

* Label camera.c

* Update game.c

* Fix warnings

* Fix names in the memory pool

* menu time

* more

* menu :))))

* finished with the inits

* youre gonna love this

* Update README.md
This commit is contained in:
Fazana
2023-10-06 14:40:45 +01:00
committed by GitHub
parent 027cba8f99
commit 2149dedfd4
52 changed files with 1860 additions and 2161 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+5 -5
View File
@@ -144,14 +144,14 @@ As of October 4th, 2023, this is our current score:
We are collecting silver coins in Crescent Island. (0/8 silver coins)
=====================================================================
ADVENTURE TWO (Cleanup & Documentation)
-------------------------- 28.44% Complete --------------------------
# Documented functions: 624
# Undocumented remaining: 946
-------------------------- 30.06% Complete --------------------------
# Documented functions: 656
# Undocumented remaining: 914
---------------------------- Game Status ----------------------------
Balloons: 14/47, Keys: 1/4, Trophies: 1/5
Balloons: 15/47, Keys: 1/4, Trophies: 1/5
T.T. Amulets: 1/4, Wizpig Amulets: 1/4
---------------------------------------------------------------------
We are racing in Walrus Cove. (Lap 3/3)
We are racing in Snowball Valley. (Lap 3/3)
=====================================================================
```
<!-- README_SCORE_END -->
asm/entrypoint.s
+2 -2
View File
@@ -21,10 +21,10 @@ glabel entrypoint
/* 00101C 8000041C 1520FFFC */ bnez $t1, .L80000410
/* 001020 80000420 21080008 */ addi $t0, $t0, 8
/* 001024 80000424 3C0A8006 */ lui $t2, %hi(main) # $t2, 0x8006
/* 001028 80000428 3C1D8012 */ lui $sp, %hi(gActiveCameraStack) # $sp, 0x8012
/* 001028 80000428 3C1D8012 */ lui $sp, %hi(gCameraSegment) # $sp, 0x8012
/* 00102C 8000042C 254A5D40 */ addiu $t2, %lo(main) # addiu $t2, $t2, 0x5d40
/* 001030 80000430 01400008 */ jr $t2
/* 001034 80000434 27BD0AC0 */ addiu $sp, %lo(gActiveCameraStack) # addiu $sp, $sp, 0xac0
/* 001034 80000434 27BD0AC0 */ addiu $sp, %lo(gCameraSegment) # addiu $sp, $sp, 0xac0
/* 001038 80000438 00000000 */ nop
/* 00103C 8000043C 00000000 */ nop
/* 001040 80000440 00000000 */ nop
asm/non_matchings/camera/func_80065EA0.s
+10 -10
View File
@@ -6,14 +6,14 @@ glabel D_800E709C
glabel func_80065EA0
/* 066AA0 80065EA0 3C048012 */ lui $a0, %hi(D_80120DA0) # $a0, 0x8012
/* 066AA4 80065EA4 24030001 */ li $v1, 1
/* 066AA8 80065EA8 3C0F8012 */ lui $t7, %hi(D_80120D70) # $t7, 0x8012
/* 066AAC 80065EAC 25EF0D70 */ addiu $t7, %lo(D_80120D70) # addiu $t7, $t7, 0xd70
/* 066AA8 80065EA8 3C0F8012 */ lui $t7, %hi(gModelMatrixF) # $t7, 0x8012
/* 066AAC 80065EAC 25EF0D70 */ addiu $t7, %lo(gModelMatrixF) # addiu $t7, $t7, 0xd70
/* 066AB0 80065EB0 00037080 */ sll $t6, $v1, 2
/* 066AB4 80065EB4 24840DA0 */ addiu $a0, %lo(D_80120DA0) # addiu $a0, $a0, 0xda0
/* 066AB8 80065EB8 01CF1021 */ addu $v0, $t6, $t7
/* 066ABC 80065EBC 0003C980 */ sll $t9, $v1, 6
/* 066AC0 80065EC0 3C018012 */ lui $at, %hi(D_80120D70) # $at, 0x8012
/* 066AC4 80065EC4 AC240D70 */ sw $a0, %lo(D_80120D70)($at)
/* 066AC0 80065EC0 3C018012 */ lui $at, %hi(gModelMatrixF) # $at, 0x8012
/* 066AC4 80065EC4 AC240D70 */ sw $a0, %lo(gModelMatrixF)($at)
/* 066AC8 80065EC8 00994021 */ addu $t0, $a0, $t9
/* 066ACC 80065ECC 27BDFFC8 */ addiu $sp, $sp, -0x38
/* 066AD0 80065ED0 AC480000 */ sw $t0, ($v0)
@@ -53,10 +53,10 @@ glabel func_80065EA0
/* 066B54 80065F54 3C018012 */ lui $at, %hi(gCutsceneCameraActive) # $at, 0x8012
/* 066B58 80065F58 A0200D14 */ sb $zero, %lo(gCutsceneCameraActive)($at)
/* 066B5C 80065F5C AE200000 */ sw $zero, ($s1)
/* 066B60 80065F60 3C018012 */ lui $at, %hi(D_80120D1C) # $at, 0x8012
/* 066B64 80065F64 AC200D1C */ sw $zero, %lo(D_80120D1C)($at)
/* 066B68 80065F68 3C018012 */ lui $at, %hi(D_80120D20) # $at, 0x8012
/* 066B6C 80065F6C AC200D20 */ sw $zero, %lo(D_80120D20)($at)
/* 066B60 80065F60 3C018012 */ lui $at, %hi(gModelMatrixStackPos) # $at, 0x8012
/* 066B64 80065F64 AC200D1C */ sw $zero, %lo(gModelMatrixStackPos)($at)
/* 066B68 80065F68 3C018012 */ lui $at, %hi(gCameraMatrixPos) # $at, 0x8012
/* 066B6C 80065F6C AC200D20 */ sw $zero, %lo(gCameraMatrixPos)($at)
/* 066B70 80065F70 3C018012 */ lui $at, %hi(gNumberOfViewports) # $at, 0x8012
/* 066B74 80065F74 AC200CE0 */ sw $zero, %lo(gNumberOfViewports)($at)
/* 066B78 80065F78 3C018012 */ lui $at, %hi(D_80120D0C) # $at, 0x8012
@@ -106,8 +106,8 @@ glabel func_80065EA0
/* 066C1C 8006601C E7A60014 */ swc1 $f6, 0x14($sp)
/* 066C20 80066020 0C033248 */ jal guPerspectiveF
/* 066C24 80066024 E7A80018 */ swc1 $f8, 0x18($sp)
/* 066C28 80066028 3C058012 */ lui $a1, %hi(gPerspectiveMatrixS) # $a1, 0x8012
/* 066C2C 8006602C 24A50FE0 */ addiu $a1, %lo(gPerspectiveMatrixS) # addiu $a1, $a1, 0xfe0
/* 066C28 80066028 3C058012 */ lui $a1, %hi(gProjectionMatrixS) # $a1, 0x8012
/* 066C2C 8006602C 24A50FE0 */ addiu $a1, %lo(gProjectionMatrixS) # addiu $a1, $a1, 0xfe0
/* 066C30 80066030 0C01BE1C */ jal f32_matrix_to_s16_matrix
/* 066C34 80066034 02002025 */ move $a0, $s0
/* 066C38 80066038 3C014270 */ li $at, 0x42700000 # 60.000000
asm/non_matchings/game_ui/func_800AA600.s
+1 -1
View File
@@ -608,7 +608,7 @@ glabel func_800AA600
/* 0ABAEC 800AAEEC 0C02ABF4 */ jal func_800AAFD0
/* 0ABAF0 800AAEF0 00000000 */ nop
/* 0ABAF4 800AAEF4 3C048012 */ lui $a0, %hi(gHUDCurrDisplayList) # $a0, 0x8012
/* 0ABAF8 800AAEF8 0C01A690 */ jal func_80069A40
/* 0ABAF8 800AAEF8 0C01A690 */ jal apply_matrix_from_stack
/* 0ABAFC 800AAEFC 24846CFC */ addiu $a0, %lo(gHUDCurrDisplayList) # addiu $a0, $a0, 0x6cfc
.L800AAF00:
/* 0ABB00 800AAF00 86080006 */ lh $t0, 6($s0)
asm/non_matchings/menu/func_80081218.s
+2 -2
View File
@@ -91,10 +91,10 @@ glabel func_80081218
/* 081F7C 8008137C AC22F4A0 */ sw $v0, %lo(gMenuText)($at)
/* 081F80 80081380 0C01FE40 */ jal load_menu_text
/* 081F84 80081384 00002025 */ move $a0, $zero
/* 081F88 80081388 3C028012 */ lui $v0, %hi(D_80126550) # $v0, 0x8012
/* 081F88 80081388 3C028012 */ lui $v0, %hi(gMenuTextures) # $v0, 0x8012
/* 081F8C 8008138C 3C038012 */ lui $v1, %hi(D_80126750) # $v1, 0x8012
/* 081F90 80081390 24636750 */ addiu $v1, %lo(D_80126750) # addiu $v1, $v1, 0x6750
/* 081F94 80081394 24426550 */ addiu $v0, %lo(D_80126550) # addiu $v0, $v0, 0x6550
/* 081F94 80081394 24426550 */ addiu $v0, %lo(gMenuTextures) # addiu $v0, $v0, 0x6550
.L80081398:
/* 081F98 80081398 24420010 */ addiu $v0, $v0, 0x10
/* 081F9C 8008139C AC40FFF0 */ sw $zero, -0x10($v0)
asm/non_matchings/menu/func_80084854.s
+6 -6
View File
@@ -91,8 +91,8 @@ glabel func_80084854
.L800849A4:
/* 0855A4 800849A4 24100071 */ li $s0, 113
.L800849A8:
/* 0855A8 800849A8 3C0D8012 */ lui $t5, %hi(D_80126550) # $t5, 0x8012
/* 0855AC 800849AC 8DAD6660 */ lw $t5, %lo(D_80126550 + 0x110)($t5)
/* 0855A8 800849A8 3C0D8012 */ lui $t5, %hi(gMenuTextures) # $t5, 0x8012
/* 0855AC 800849AC 8DAD6660 */ lw $t5, %lo(gMenuTextures + 0x110)($t5)
/* 0855B0 800849B0 24090078 */ li $t1, 120
/* 0855B4 800849B4 240B000E */ li $t3, 14
/* 0855B8 800849B8 240A0006 */ li $t2, 6
@@ -107,8 +107,8 @@ glabel func_80084854
/* 0855DC 800849DC AFB1001C */ sw $s1, 0x1c($sp)
/* 0855E0 800849E0 0C020160 */ jal func_80080580
/* 0855E4 800849E4 AFAD0020 */ sw $t5, 0x20($sp)
/* 0855E8 800849E8 3C088012 */ lui $t0, %hi(D_80126550) # $t0, 0x8012
/* 0855EC 800849EC 8D086660 */ lw $t0, %lo(D_80126550 + 0x110)($t0)
/* 0855E8 800849E8 3C088012 */ lui $t0, %hi(gMenuTextures) # $t0, 0x8012
/* 0855EC 800849EC 8D086660 */ lw $t0, %lo(gMenuTextures + 0x110)($t0)
/* 0855F0 800849F0 240E0050 */ li $t6, 80
/* 0855F4 800849F4 240F000E */ li $t7, 14
/* 0855F8 800849F8 24180006 */ li $t8, 6
@@ -199,8 +199,8 @@ glabel func_80084854
/* 08574C 80084B4C 00003025 */ move $a2, $zero
/* 085750 80084B50 0C0310F3 */ jal set_text_background_colour
/* 085754 80084B54 00003825 */ move $a3, $zero
/* 085758 80084B58 3C0C8012 */ lui $t4, %hi(D_801263E0) # $t4, 0x8012
/* 08575C 80084B5C 8D8C63E0 */ lw $t4, %lo(D_801263E0)($t4)
/* 085758 80084B58 3C0C8012 */ lui $t4, %hi(gMenuOptionCount) # $t4, 0x8012
/* 08575C 80084B5C 8D8C63E0 */ lw $t4, %lo(gMenuOptionCount)($t4)
/* 085760 80084B60 00001825 */ move $v1, $zero
/* 085764 80084B64 29810005 */ slti $at, $t4, 5
/* 085768 80084B68 10200005 */ beqz $at, .L80084B80
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(gSavefileData)($v0)
/* 08603C 8008543C 3C088012 */ lui $t0, %hi(D_80126550) # $t0, 0x8012
/* 08603C 8008543C 3C088012 */ lui $t0, %hi(gMenuTextures) # $t0, 0x8012
/* 086040 80085440 904B004B */ lbu $t3, 0x4b($v0)
/* 086044 80085444 8D08665C */ lw $t0, %lo(D_80126550 + 0x10C)($t0)
/* 086044 80085444 8D08665C */ lw $t0, %lo(gMenuTextures + 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_80126550) # $t0, 0x8012
/* 086154 80085554 3C088012 */ lui $t0, %hi(gMenuTextures) # $t0, 0x8012
/* 086158 80085558 AFAB0064 */ sw $t3, 0x64($sp)
/* 08615C 8008555C 8C6C01DC */ lw $t4, 0x1dc($v1)
/* 086160 80085560 8D08665C */ lw $t0, %lo(D_80126550 + 0x10C)($t0)
/* 086160 80085560 8D08665C */ lw $t0, %lo(gMenuTextures + 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_80126550) # $t0, 0x8012
/* 086190 80085590 3C088012 */ lui $t0, %hi(gMenuTextures) # $t0, 0x8012
/* 086194 80085594 012F4821 */ addu $t1, $t1, $t7
/* 086198 80085598 AFA50064 */ sw $a1, 0x64($sp)
/* 08619C 8008559C 8D086660 */ lw $t0, %lo(D_80126550 + 0x110)($t0)
/* 08619C 8008559C 8D086660 */ lw $t0, %lo(gMenuTextures + 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_80126550) # $t0, 0x8012
/* 0862C4 800856C4 3C088012 */ lui $t0, %hi(gMenuTextures) # $t0, 0x8012
/* 0862C8 800856C8 012F4821 */ addu $t1, $t1, $t7
/* 0862CC 800856CC 8D086660 */ lw $t0, %lo(D_80126550 + 0x110)($t0)
/* 0862CC 800856CC 8D086660 */ lw $t0, %lo(gMenuTextures + 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_80126550) # $t0, 0x8012
/* 086310 80085710 3C088012 */ lui $t0, %hi(gMenuTextures) # $t0, 0x8012
/* 086314 80085714 012D4821 */ addu $t1, $t1, $t5
/* 086318 80085718 8D086660 */ lw $t0, %lo(D_80126550 + 0x110)($t0)
/* 086318 80085718 8D086660 */ lw $t0, %lo(gMenuTextures + 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_80126550) # $t0, 0x8012
/* 08635C 8008575C 3C088012 */ lui $t0, %hi(gMenuTextures) # $t0, 0x8012
/* 086360 80085760 012C4821 */ addu $t1, $t1, $t4
/* 086364 80085764 8D086660 */ lw $t0, %lo(D_80126550 + 0x110)($t0)
/* 086364 80085764 8D086660 */ lw $t0, %lo(gMenuTextures + 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_80126550) # $t0, 0x8012
/* 0863A8 800857A8 3C088012 */ lui $t0, %hi(gMenuTextures) # $t0, 0x8012
/* 0863AC 800857AC 012B4821 */ addu $t1, $t1, $t3
/* 0863B0 800857B0 8D086660 */ lw $t0, %lo(D_80126550 + 0x110)($t0)
/* 0863B0 800857B0 8D086660 */ lw $t0, %lo(gMenuTextures + 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_80126550) # $t0, 0x8012
/* 0863DC 800857DC 8D086664 */ lw $t0, %lo(D_80126550 + 0x114)($t0)
/* 0863D8 800857D8 3C088012 */ lui $t0, %hi(gMenuTextures) # $t0, 0x8012
/* 0863DC 800857DC 8D086664 */ lw $t0, %lo(gMenuTextures + 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_80126550) # $t0, 0x8012
/* 086408 80085808 3C088012 */ lui $t0, %hi(gMenuTextures) # $t0, 0x8012
/* 08640C 8008580C AFAC0064 */ sw $t4, 0x64($sp)
/* 086410 80085810 8C6E01DC */ lw $t6, 0x1dc($v1)
/* 086414 80085814 8D08665C */ lw $t0, %lo(D_80126550 + 0x10C)($t0)
/* 086414 80085814 8D08665C */ lw $t0, %lo(gMenuTextures + 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_80126550) # $t0, 0x8012
/* 086440 80085840 3C088012 */ lui $t0, %hi(gMenuTextures) # $t0, 0x8012
/* 086444 80085844 3C098080 */ lui $t1, (0x808080FF >> 16) # lui $t1, 0x8080
/* 086448 80085848 8D086664 */ lw $t0, %lo(D_80126550 + 0x114)($t0)
/* 086448 80085848 8D086664 */ lw $t0, %lo(gMenuTextures + 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_80085B9C.s
+2 -2
View File
@@ -13,8 +13,8 @@ glabel func_80085B9C
/* 0867B4 80085BB4 AFB00028 */ sw $s0, 0x28($sp)
/* 0867B8 80085BB8 0C01E948 */ jal get_video_width_and_height_as_s32
/* 0867BC 80085BBC AFA40068 */ sw $a0, 0x68($sp)
/* 0867C0 80085BC0 3C038012 */ lui $v1, %hi(D_801263E0) # $v1, 0x8012
/* 0867C4 80085BC4 8C6363E0 */ lw $v1, %lo(D_801263E0)($v1)
/* 0867C0 80085BC0 3C038012 */ lui $v1, %hi(gMenuOptionCount) # $v1, 0x8012
/* 0867C4 80085BC4 8C6363E0 */ lw $v1, %lo(gMenuOptionCount)($v1)
/* 0867C8 80085BC8 3C01800F */ lui $at, %hi(jpt_800E83E0) # $at, 0x800f
/* 0867CC 80085BCC 306E0007 */ andi $t6, $v1, 7
/* 0867D0 80085BD0 000E7080 */ sll $t6, $t6, 2
asm/non_matchings/menu/func_800871D8.s
+2 -2
View File
@@ -186,8 +186,8 @@ glabel func_800871D8
/* 088090 80087490 1620FFF0 */ bnez $s1, .L80087454
/* 088094 80087494 26520010 */ addiu $s2, $s2, 0x10
.L80087498:
/* 088098 80087498 3C028012 */ lui $v0, %hi(D_801263E0) # $v0, 0x8012
/* 08809C 8008749C 244263E0 */ addiu $v0, %lo(D_801263E0) # addiu $v0, $v0, 0x63e0
/* 088098 80087498 3C028012 */ lui $v0, %hi(gMenuOptionCount) # $v0, 0x8012
/* 08809C 8008749C 244263E0 */ addiu $v0, %lo(gMenuOptionCount) # addiu $v0, $v0, 0x63e0
/* 0880A0 800874A0 8C490000 */ lw $t1, ($v0)
/* 0880A4 800874A4 8FBF0034 */ lw $ra, 0x34($sp)
/* 0880A8 800874A8 8FB0001C */ lw $s0, 0x1c($sp)
asm/non_matchings/menu/func_80087734.s
+6 -6
View File
@@ -21,8 +21,8 @@ glabel func_80087734
/* 08835C 8008775C 240F01FF */ li $t7, 511
/* 088360 80087760 01EE3023 */ subu $a2, $t7, $t6
.L80087764:
/* 088364 80087764 3C098012 */ lui $t1, %hi(D_801263E0) # $t1, 0x8012
/* 088368 80087768 252963E0 */ addiu $t1, %lo(D_801263E0) # addiu $t1, $t1, 0x63e0
/* 088364 80087764 3C098012 */ lui $t1, %hi(gMenuOptionCount) # $t1, 0x8012
/* 088368 80087768 252963E0 */ addiu $t1, %lo(gMenuOptionCount) # addiu $t1, $t1, 0x63e0
/* 08836C 8008776C 3C058012 */ lui $a1, %hi(D_80126A74) # $a1, 0x8012
/* 088370 80087770 8D280000 */ lw $t0, ($t1)
/* 088374 80087774 24A56A74 */ addiu $a1, %lo(D_80126A74) # addiu $a1, $a1, 0x6a74
@@ -72,8 +72,8 @@ glabel func_80087734
/* 088410 80087810 00002825 */ move $a1, $zero
/* 088414 80087814 0C000741 */ jal play_sound_global
/* 088418 80087818 AFA8001C */ sw $t0, 0x1c($sp)
/* 08841C 8008781C 3C098012 */ lui $t1, %hi(D_801263E0) # $t1, 0x8012
/* 088420 80087820 252963E0 */ addiu $t1, %lo(D_801263E0) # addiu $t1, $t1, 0x63e0
/* 08841C 8008781C 3C098012 */ lui $t1, %hi(gMenuOptionCount) # $t1, 0x8012
/* 088420 80087820 252963E0 */ addiu $t1, %lo(gMenuOptionCount) # addiu $t1, $t1, 0x63e0
/* 088424 80087824 8D380000 */ lw $t8, ($t1)
/* 088428 80087828 8FA8001C */ lw $t0, 0x1c($sp)
/* 08842C 8008782C 2401FFF7 */ li $at, -9
@@ -200,8 +200,8 @@ glabel L800879BC
/* 0885CC 800879CC 240400EF */ li $a0, 239
/* 0885D0 800879D0 0C000741 */ jal play_sound_global
/* 0885D4 800879D4 AFA8001C */ sw $t0, 0x1c($sp)
/* 0885D8 800879D8 3C098012 */ lui $t1, %hi(D_801263E0) # $t1, 0x8012
/* 0885DC 800879DC 252963E0 */ addiu $t1, %lo(D_801263E0) # addiu $t1, $t1, 0x63e0
/* 0885D8 800879D8 3C098012 */ lui $t1, %hi(gMenuOptionCount) # $t1, 0x8012
/* 0885DC 800879DC 252963E0 */ addiu $t1, %lo(gMenuOptionCount) # addiu $t1, $t1, 0x63e0
/* 0885E0 800879E0 8D2E0000 */ lw $t6, ($t1)
/* 0885E4 800879E4 2401FFF7 */ li $at, -9
/* 0885E8 800879E8 01C17824 */ and $t7, $t6, $at
asm/non_matchings/menu/func_8008B758.s
+4 -4
View File
@@ -7,7 +7,7 @@ glabel func_8008B758
/* 08C36C 8008B76C AFB50034 */ sw $s5, 0x34($sp)
/* 08C370 8008B770 AFB40030 */ sw $s4, 0x30($sp)
/* 08C374 8008B774 AFB3002C */ sw $s3, 0x2c($sp)
/* 08C378 8008B778 3C108012 */ lui $s0, %hi(D_801263C0) # $s0, 0x8012
/* 08C378 8008B778 3C108012 */ lui $s0, %hi(gMenuCurrentCharacter) # $s0, 0x8012
/* 08C37C 8008B77C 3C168012 */ lui $s6, %hi(gPlayersCharacterArray) # $s6, 0x8012
/* 08C380 8008B780 3C17800E */ lui $s7, %hi(gNumberOfReadyPlayers) # $s7, 0x800e
/* 08C384 8008B784 3C1E8012 */ lui $fp, %hi(gCurrCharacterSelectData) # $fp, 0x8012
@@ -17,7 +17,7 @@ glabel func_8008B758
/* 08C394 8008B794 27DE63CC */ addiu $fp, %lo(gCurrCharacterSelectData) # addiu $fp, $fp, 0x63cc
/* 08C398 8008B798 26F7F480 */ addiu $s7, %lo(gNumberOfReadyPlayers) # addiu $s7, $s7, -0xb80
/* 08C39C 8008B79C 26D663E8 */ addiu $s6, %lo(gPlayersCharacterArray) # addiu $s6, $s6, 0x63e8
/* 08C3A0 8008B7A0 261063C0 */ addiu $s0, %lo(D_801263C0) # addiu $s0, $s0, 0x63c0
/* 08C3A0 8008B7A0 261063C0 */ addiu $s0, %lo(gMenuCurrentCharacter) # addiu $s0, $s0, 0x63c0
/* 08C3A4 8008B7A4 2413000E */ li $s3, 14
/* 08C3A8 8008B7A8 0000A025 */ move $s4, $zero
/* 08C3AC 8008B7AC 24150014 */ li $s5, 20
@@ -85,8 +85,8 @@ glabel func_8008B758
/* 08C498 8008B898 824C0000 */ lb $t4, ($s2)
/* 08C49C 8008B89C 8FC50000 */ lw $a1, ($fp)
/* 08C4A0 8008B8A0 01930019 */ multu $t4, $s3
/* 08C4A4 8008B8A4 3C0B8012 */ lui $t3, %hi(D_801263B4) # $t3, 0x8012
/* 08C4A8 8008B8A8 816B63B4 */ lb $t3, %lo(D_801263B4)($t3)
/* 08C4A4 8008B8A4 3C0B8012 */ lui $t3, %hi(gMenuSelectedCharacter) # $t3, 0x8012
/* 08C4A8 8008B8A8 816B63B4 */ lb $t3, %lo(gMenuSelectedCharacter)($t3)
/* 08C4AC 8008B8AC 00007012 */ mflo $t6
/* 08C4B0 8008B8B0 00AE6821 */ addu $t5, $a1, $t6
/* 08C4B4 8008B8B4 85AF000C */ lh $t7, 0xc($t5)
asm/non_matchings/menu/func_80092188.s
+16 -16
View File
@@ -11,8 +11,8 @@ glabel func_80092188
/* 092D98 80092198 AFA40058 */ sw $a0, 0x58($sp)
/* 092D9C 8009219C 0C01BAA4 */ jal get_settings
/* 092DA0 800921A0 AFAE0030 */ sw $t6, 0x30($sp)
/* 092DA4 800921A4 3C06800E */ lui $a2, %hi(D_800E0980) # $a2, 0x800e
/* 092DA8 800921A8 24C60980 */ addiu $a2, %lo(D_800E0980) # addiu $a2, $a2, 0x980
/* 092DA4 800921A4 3C06800E */ lui $a2, %hi(gTrackNameVoiceDelay) # $a2, 0x800e
/* 092DA8 800921A8 24C60980 */ addiu $a2, %lo(gTrackNameVoiceDelay) # addiu $a2, $a2, 0x980
/* 092DAC 800921AC 8CC30000 */ lw $v1, ($a2)
/* 092DB0 800921B0 AFA2002C */ sw $v0, 0x2c($sp)
/* 092DB4 800921B4 10600005 */ beqz $v1, .L800921CC
@@ -25,8 +25,8 @@ glabel func_80092188
/* 092DCC 800921CC 8C4269C8 */ lw $v0, %lo(D_801269C8)($v0)
/* 092DD0 800921D0 24010005 */ li $at, 5
/* 092DD4 800921D4 14410011 */ bne $v0, $at, .L8009221C
/* 092DD8 800921D8 3C0C8012 */ lui $t4, %hi(D_801263E0) # $t4, 0x8012
/* 092DDC 800921DC 258C63E0 */ addiu $t4, %lo(D_801263E0) # addiu $t4, $t4, 0x63e0
/* 092DD8 800921D8 3C0C8012 */ lui $t4, %hi(gMenuOptionCount) # $t4, 0x8012
/* 092DDC 800921DC 258C63E0 */ addiu $t4, %lo(gMenuOptionCount) # addiu $t4, $t4, 0x63e0
/* 092DE0 800921E0 8D990000 */ lw $t9, ($t4)
/* 092DE4 800921E4 24010002 */ li $at, 2
/* 092DE8 800921E8 1321000C */ beq $t9, $at, .L8009221C
@@ -39,14 +39,14 @@ glabel func_80092188
/* 092E04 80092204 0C030C7B */ jal func_800C31EC
/* 092E08 80092208 2484003C */ addiu $a0, $a0, 0x3c
/* 092E0C 8009220C 3C028012 */ lui $v0, %hi(D_801269C8) # $v0, 0x8012
/* 092E10 80092210 3C06800E */ lui $a2, %hi(D_800E0980) # $a2, 0x800e
/* 092E10 80092210 3C06800E */ lui $a2, %hi(gTrackNameVoiceDelay) # $a2, 0x800e
/* 092E14 80092214 8C4269C8 */ lw $v0, %lo(D_801269C8)($v0)
/* 092E18 80092218 24C60980 */ addiu $a2, %lo(D_800E0980) # addiu $a2, $a2, 0x980
/* 092E18 80092218 24C60980 */ addiu $a2, %lo(gTrackNameVoiceDelay) # addiu $a2, $a2, 0x980
.L8009221C:
/* 092E1C 8009221C 3C0C8012 */ lui $t4, %hi(D_801263E0) # $t4, 0x8012
/* 092E1C 8009221C 3C0C8012 */ lui $t4, %hi(gMenuOptionCount) # $t4, 0x8012
/* 092E20 80092220 24010004 */ li $at, 4
/* 092E24 80092224 14410008 */ bne $v0, $at, .L80092248
/* 092E28 80092228 258C63E0 */ addiu $t4, %lo(D_801263E0) # addiu $t4, $t4, 0x63e0
/* 092E28 80092228 258C63E0 */ addiu $t4, %lo(gMenuOptionCount) # addiu $t4, $t4, 0x63e0
/* 092E2C 8009222C 8D830000 */ lw $v1, ($t4)
/* 092E30 80092230 240DFFFF */ li $t5, -1
/* 092E34 80092234 11A30004 */ beq $t5, $v1, .L80092248
@@ -71,8 +71,8 @@ glabel func_80092188
/* 092E7C 8009227C 00000000 */ nop
/* 092E80 80092280 0C000741 */ jal play_sound_global
/* 092E84 80092284 00002825 */ move $a1, $zero
/* 092E88 80092288 3C06800E */ lui $a2, %hi(D_800E0980) # $a2, 0x800e
/* 092E8C 8009228C 24C60980 */ addiu $a2, %lo(D_800E0980) # addiu $a2, $a2, 0x980
/* 092E88 80092288 3C06800E */ lui $a2, %hi(gTrackNameVoiceDelay) # $a2, 0x800e
/* 092E8C 8009228C 24C60980 */ addiu $a2, %lo(gTrackNameVoiceDelay) # addiu $a2, $a2, 0x980
/* 092E90 80092290 ACC00000 */ sw $zero, ($a2)
.L80092294:
/* 092E94 80092294 3C02800E */ lui $v0, %hi(gMenuDelay) # $v0, 0x800e
@@ -182,8 +182,8 @@ glabel func_80092188
/* 093018 80092418 8C84F4C4 */ lw $a0, %lo(gTrackIdForPreview)($a0)
/* 09301C 8009241C 0C01AC3E */ jal get_map_available_vehicles
/* 093020 80092420 00000000 */ nop
/* 093024 80092424 3C0C8012 */ lui $t4, %hi(D_801263E0) # $t4, 0x8012
/* 093028 80092428 258C63E0 */ addiu $t4, %lo(D_801263E0) # addiu $t4, $t4, 0x63e0
/* 093024 80092424 3C0C8012 */ lui $t4, %hi(gMenuOptionCount) # $t4, 0x8012
/* 093028 80092428 258C63E0 */ addiu $t4, %lo(gMenuOptionCount) # addiu $t4, $t4, 0x63e0
/* 09302C 8009242C 8D830000 */ lw $v1, ($t4)
/* 093030 80092430 240DFFFF */ li $t5, -1
/* 093034 80092434 246F0001 */ addiu $t7, $v1, 1
@@ -281,8 +281,8 @@ glabel L8009251C
/* 093184 80092584 8FA80024 */ lw $t0, 0x24($sp)
/* 093188 80092588 3C09800E */ lui $t1, %hi(gNumberOfReadyPlayers) # $t1, 0x800e
/* 09318C 8009258C 3C0B8012 */ lui $t3, %hi(D_801269C4) # $t3, 0x8012
/* 093190 80092590 3C0C8012 */ lui $t4, %hi(D_801263E0) # $t4, 0x8012
/* 093194 80092594 258C63E0 */ addiu $t4, %lo(D_801263E0) # addiu $t4, $t4, 0x63e0
/* 093190 80092590 3C0C8012 */ lui $t4, %hi(gMenuOptionCount) # $t4, 0x8012
/* 093194 80092594 258C63E0 */ addiu $t4, %lo(gMenuOptionCount) # addiu $t4, $t4, 0x63e0
/* 093198 80092598 256B69C4 */ addiu $t3, %lo(D_801269C4) # addiu $t3, $t3, 0x69c4
/* 09319C 8009259C 2529F480 */ addiu $t1, %lo(gNumberOfReadyPlayers) # addiu $t1, $t1, -0xb80
/* 0931A0 800925A0 240DFFFF */ li $t5, -1
@@ -604,8 +604,8 @@ glabel L8009287C
/* 09360C 80092A0C AFAF003C */ sw $t7, 0x3c($sp)
/* 093610 80092A10 0C027B18 */ jal is_adventure_two_unlocked
/* 093614 80092A14 00000000 */ nop
/* 093618 80092A18 3C0C8012 */ lui $t4, %hi(D_801263E0) # $t4, 0x8012
/* 09361C 80092A1C 258C63E0 */ addiu $t4, %lo(D_801263E0) # addiu $t4, $t4, 0x63e0
/* 093618 80092A18 3C0C8012 */ lui $t4, %hi(gMenuOptionCount) # $t4, 0x8012
/* 09361C 80092A1C 258C63E0 */ addiu $t4, %lo(gMenuOptionCount) # addiu $t4, $t4, 0x63e0
/* 093620 80092A20 10400006 */ beqz $v0, .L80092A3C
/* 093624 80092A24 240DFFFF */ li $t5, -1
/* 093628 80092A28 AD8D0000 */ sw $t5, ($t4)
asm/non_matchings/menu/func_80094D28.s
+12 -12
View File
@@ -30,7 +30,7 @@ glabel func_80094D28
/* 095978 80094D78 24050001 */ li $a1, 1
/* 09597C 80094D7C 3C138012 */ lui $s3, %hi(gOptionBlinkTimer) # $s3, 0x8012
/* 095980 80094D80 8E7363BC */ lw $s3, %lo(gOptionBlinkTimer)($s3)
/* 095984 80094D84 3C198012 */ lui $t9, %hi(D_801263E0) # $t9, 0x8012
/* 095984 80094D84 3C198012 */ lui $t9, %hi(gMenuOptionCount) # $t9, 0x8012
/* 095988 80094D88 001378C0 */ sll $t7, $s3, 3
/* 09598C 80094D8C 29E10100 */ slti $at, $t7, 0x100
/* 095990 80094D90 14200003 */ bnez $at, .L80094DA0
@@ -38,7 +38,7 @@ glabel func_80094D28
/* 095998 80094D98 241801FF */ li $t8, 511
/* 09599C 80094D9C 03139823 */ subu $s3, $t8, $s3
.L80094DA0:
/* 0959A0 80094DA0 8F3963E0 */ lw $t9, %lo(D_801263E0)($t9)
/* 0959A0 80094DA0 8F3963E0 */ lw $t9, %lo(gMenuOptionCount)($t9)
/* 0959A4 80094DA4 00000000 */ nop
/* 0959A8 80094DA8 272AFFFF */ addiu $t2, $t9, -1
/* 0959AC 80094DAC 2D410006 */ sltiu $at, $t2, 6
@@ -356,7 +356,7 @@ glabel L800951CC
.L80095220:
/* 095E20 80095220 3C0D8012 */ lui $t5, %hi(D_80126C1C) # $t5, 0x8012
/* 095E24 80095224 8DAD6C1C */ lw $t5, %lo(D_80126C1C)($t5)
/* 095E28 80095228 3C108012 */ lui $s0, %hi(D_80126C14) # $s0, 0x8012
/* 095E28 80095228 3C108012 */ lui $s0, %hi(gResultOptionCount) # $s0, 0x8012
/* 095E2C 8009522C 11A00005 */ beqz $t5, .L80095244
/* 095E30 80095230 00000000 */ nop
/* 095E34 80095234 3C108012 */ lui $s0, %hi(D_80126C24) # $s0, 0x8012
@@ -364,7 +364,7 @@ glabel L800951CC
/* 095E3C 8009523C 10000004 */ b .L80095250
/* 095E40 80095240 2A010005 */ slti $at, $s0, 5
.L80095244:
/* 095E44 80095244 8E106C14 */ lw $s0, %lo(D_80126C14)($s0)
/* 095E44 80095244 8E106C14 */ lw $s0, %lo(gResultOptionCount)($s0)
/* 095E48 80095248 00000000 */ nop
.L8009524C:
/* 095E4C 8009524C 2A010005 */ slti $at, $s0, 5
@@ -473,7 +473,7 @@ glabel L800951CC
/* 095FCC 800953CC 8E2C0000 */ lw $t4, ($s1)
/* 095FD0 800953D0 2652FFE8 */ addiu $s2, $s2, -0x18
/* 095FD4 800953D4 1180003E */ beqz $t4, .L800954D0
/* 095FD8 800953D8 3C0F8012 */ lui $t7, %hi(D_80126C14) # $t7, 0x8012
/* 095FD8 800953D8 3C0F8012 */ lui $t7, %hi(gResultOptionCount) # $t7, 0x8012
/* 095FDC 800953DC 3C0D800E */ lui $t5, %hi(gMenuText) # $t5, 0x800e
/* 095FE0 800953E0 8DADF4A0 */ lw $t5, %lo(gMenuText)($t5)
/* 095FE4 800953E4 240E0001 */ li $t6, 1
@@ -538,12 +538,12 @@ glabel L800951CC
/* 0960C8 800954C8 1000002D */ b .L80095580
/* 0960CC 800954CC 00000000 */ nop
.L800954D0:
/* 0960D0 800954D0 8DEF6C14 */ lw $t7, %lo(D_80126C14)($t7)
/* 0960D0 800954D0 8DEF6C14 */ lw $t7, %lo(gResultOptionCount)($t7)
/* 0960D4 800954D4 2412000C */ li $s2, 12
/* 0960D8 800954D8 19E00029 */ blez $t7, .L80095580
/* 0960DC 800954DC 00008025 */ move $s0, $zero
/* 0960E0 800954E0 3C118012 */ lui $s1, %hi(D_80126BF0) # $s1, 0x8012
/* 0960E4 800954E4 26316BF0 */ addiu $s1, %lo(D_80126BF0) # addiu $s1, $s1, 0x6bf0
/* 0960E0 800954E0 3C118012 */ lui $s1, %hi(gResultOptionText) # $s1, 0x8012
/* 0960E4 800954E4 26316BF0 */ addiu $s1, %lo(gResultOptionText) # addiu $s1, $s1, 0x6bf0
.L800954E8:
/* 0960E8 800954E8 3C0B8012 */ lui $t3, %hi(gMenuOption) # $t3, 0x8012
/* 0960EC 800954EC 8D6B6A68 */ lw $t3, %lo(gMenuOption)($t3)
@@ -577,8 +577,8 @@ glabel L800951CC
/* 096154 80095554 240500A0 */ li $a1, 160
/* 096158 80095558 0C03145A */ jal render_dialogue_text
/* 09615C 8009555C 02403025 */ move $a2, $s2
/* 096160 80095560 3C188012 */ lui $t8, %hi(D_80126C14) # $t8, 0x8012
/* 096164 80095564 8F186C14 */ lw $t8, %lo(D_80126C14)($t8)
/* 096160 80095560 3C188012 */ lui $t8, %hi(gResultOptionCount) # $t8, 0x8012
/* 096164 80095564 8F186C14 */ lw $t8, %lo(gResultOptionCount)($t8)
/* 096168 80095568 8FB90050 */ lw $t9, 0x50($sp)
/* 09616C 8009556C 26100001 */ addiu $s0, $s0, 1
/* 096170 80095570 0218082A */ slt $at, $s0, $t8
@@ -608,12 +608,12 @@ glabel L80095588
/* 0961C4 800955C4 8D8C0300 */ lw $t4, %lo(osTvType)($t4)
/* 0961C8 800955C8 3C01800F */ lui $at, %hi(D_800E8520) # $at, 0x800f
/* 0961CC 800955CC 15800004 */ bnez $t4, .L800955E0
/* 0961D0 800955D0 3C0D8012 */ lui $t5, %hi(D_801263E0) # $t5, 0x8012
/* 0961D0 800955D0 3C0D8012 */ lui $t5, %hi(gMenuOptionCount) # $t5, 0x8012
/* 0961D4 800955D4 C4328520 */ lwc1 $f18, %lo(D_800E8520)($at)
/* 0961D8 800955D8 3C01800E */ lui $at, %hi(D_800DF454) # $at, 0x800e
/* 0961DC 800955DC E432F454 */ swc1 $f18, %lo(D_800DF454)($at)
.L800955E0:
/* 0961E0 800955E0 8DAD63E0 */ lw $t5, %lo(D_801263E0)($t5)
/* 0961E0 800955E0 8DAD63E0 */ lw $t5, %lo(gMenuOptionCount)($t5)
/* 0961E4 800955E4 00000000 */ nop
/* 0961E8 800955E8 19A00004 */ blez $t5, .L800955FC
/* 0961EC 800955EC 3C013F80 */ lui $at, 0x3f80
asm/non_matchings/menu/func_80095728.s
+46 -46
View File
@@ -55,14 +55,14 @@ glabel func_80095728
/* 0963DC 800957DC 8FAA0030 */ lw $t2, 0x30($sp)
/* 0963E0 800957E0 10400010 */ beqz $v0, .L80095824
/* 0963E4 800957E4 3C018012 */ lui $at, %hi(D_80126A90) # $at, 0x8012
/* 0963E8 800957E8 3C098012 */ lui $t1, %hi(D_80126C14) # $t1, 0x8012
/* 0963EC 800957EC 25296C14 */ addiu $t1, %lo(D_80126C14) # addiu $t1, $t1, 0x6c14
/* 0963E8 800957E8 3C098012 */ lui $t1, %hi(gResultOptionCount) # $t1, 0x8012
/* 0963EC 800957EC 25296C14 */ addiu $t1, %lo(gResultOptionCount) # addiu $t1, $t1, 0x6c14
/* 0963F0 800957F0 3C02800E */ lui $v0, %hi(gMenuText) # $v0, 0x800e
/* 0963F4 800957F4 8C42F4A0 */ lw $v0, %lo(gMenuText)($v0)
/* 0963F8 800957F8 8D230000 */ lw $v1, ($t1)
/* 0963FC 800957FC 3C0D8012 */ lui $t5, %hi(D_80126BF0) # $t5, 0x8012
/* 0963FC 800957FC 3C0D8012 */ lui $t5, %hi(gResultOptionText) # $t5, 0x8012
/* 096400 80095800 8C4E006C */ lw $t6, 0x6c($v0)
/* 096404 80095804 25AD6BF0 */ addiu $t5, %lo(D_80126BF0) # addiu $t5, $t5, 0x6bf0
/* 096404 80095804 25AD6BF0 */ addiu $t5, %lo(gResultOptionText) # addiu $t5, $t5, 0x6bf0
/* 096408 80095808 00036080 */ sll $t4, $v1, 2
/* 09640C 8009580C 018D2021 */ addu $a0, $t4, $t5
/* 096410 80095810 AC8EFFFC */ sw $t6, -4($a0)
@@ -111,9 +111,9 @@ glabel func_80095728
/* 0964A8 800958A8 AFAA0030 */ sw $t2, 0x30($sp)
/* 0964AC 800958AC 3C0E8012 */ lui $t6, %hi(gIgnorePlayerInputTime) # $t6, 0x8012
/* 0964B0 800958B0 8DCE63C4 */ lw $t6, %lo(gIgnorePlayerInputTime)($t6)
/* 0964B4 800958B4 3C098012 */ lui $t1, %hi(D_80126C14) # $t1, 0x8012
/* 0964B4 800958B4 3C098012 */ lui $t1, %hi(gResultOptionCount) # $t1, 0x8012
/* 0964B8 800958B8 8FAA0030 */ lw $t2, 0x30($sp)
/* 0964BC 800958BC 25296C14 */ addiu $t1, %lo(D_80126C14) # addiu $t1, $t1, 0x6c14
/* 0964BC 800958BC 25296C14 */ addiu $t1, %lo(gResultOptionCount) # addiu $t1, $t1, 0x6c14
/* 0964C0 800958C0 15C00014 */ bnez $t6, .L80095914
/* 0964C4 800958C4 00001825 */ move $v1, $zero
/* 0964C8 800958C8 3C0F8012 */ lui $t7, %hi(D_80126C54) # $t7, 0x8012
@@ -131,14 +131,14 @@ glabel func_80095728
/* 0964F4 800958F4 8FA40048 */ lw $a0, 0x48($sp)
/* 0964F8 800958F8 8FA30040 */ lw $v1, 0x40($sp)
/* 0964FC 800958FC 8FAA0030 */ lw $t2, 0x30($sp)
/* 096500 80095900 3C098012 */ lui $t1, %hi(D_80126C14) # $t1, 0x8012
/* 096500 80095900 3C098012 */ lui $t1, %hi(gResultOptionCount) # $t1, 0x8012
/* 096504 80095904 24840001 */ addiu $a0, $a0, 1
/* 096508 80095908 25296C14 */ addiu $t1, %lo(D_80126C14) # addiu $t1, $t1, 0x6c14
/* 096508 80095908 25296C14 */ addiu $t1, %lo(gResultOptionCount) # addiu $t1, $t1, 0x6c14
/* 09650C 8009590C 148AFFF5 */ bne $a0, $t2, .L800958E4
/* 096510 80095910 00621825 */ or $v1, $v1, $v0
.L80095914:
/* 096514 80095914 3C068012 */ lui $a2, %hi(D_801263E0) # $a2, 0x8012
/* 096518 80095918 24C663E0 */ addiu $a2, %lo(D_801263E0) # addiu $a2, $a2, 0x63e0
/* 096514 80095914 3C068012 */ lui $a2, %hi(gMenuOptionCount) # $a2, 0x8012
/* 096518 80095918 24C663E0 */ addiu $a2, %lo(gMenuOptionCount) # addiu $a2, $a2, 0x63e0
/* 09651C 8009591C 8CD80000 */ lw $t8, ($a2)
/* 096520 80095920 00000000 */ nop
/* 096524 80095924 2F010009 */ sltiu $at, $t8, 9
@@ -228,9 +228,9 @@ glabel L80095964
/* 096658 80095A58 30580040 */ andi $t8, $v0, 0x40
/* 09665C 80095A5C 13000004 */ beqz $t8, .L80095A70
/* 096660 80095A60 24190006 */ li $t9, 6
/* 096664 80095A64 3C018012 */ lui $at, %hi(D_801263E0) # $at, 0x8012
/* 096664 80095A64 3C018012 */ lui $at, %hi(gMenuOptionCount) # $at, 0x8012
/* 096668 80095A68 1000032A */ b .L80096714
/* 09666C 80095A6C AC3963E0 */ sw $t9, %lo(D_801263E0)($at)
/* 09666C 80095A6C AC3963E0 */ sw $t9, %lo(gMenuOptionCount)($at)
.L80095A70:
/* 096670 80095A70 8FA3002C */ lw $v1, 0x2c($sp)
/* 096674 80095A74 3C04800E */ lui $a0, %hi(D_800E0BEC) # $a0, 0x800e
@@ -251,9 +251,9 @@ glabel L80095964
/* 0966B0 80095AB0 0C020795 */ jal func_80081E54
/* 0966B4 80095AB4 AFAE0014 */ sw $t6, 0x14($sp)
/* 0966B8 80095AB8 240F0003 */ li $t7, 3
/* 0966BC 80095ABC 3C018012 */ lui $at, %hi(D_801263E0) # $at, 0x8012
/* 0966BC 80095ABC 3C018012 */ lui $at, %hi(gMenuOptionCount) # $at, 0x8012
/* 0966C0 80095AC0 10000314 */ b .L80096714
/* 0966C4 80095AC4 AC2F63E0 */ sw $t7, %lo(D_801263E0)($at)
/* 0966C4 80095AC4 AC2F63E0 */ sw $t7, %lo(gMenuOptionCount)($at)
.L80095AC8:
/* 0966C8 80095AC8 80780114 */ lb $t8, 0x114($v1)
/* 0966CC 80095ACC 44810000 */ mtc1 $at, $f0
@@ -279,9 +279,9 @@ glabel L80095964
/* 09671C 80095B1C 0C020795 */ jal func_80081E54
/* 096720 80095B20 AFB80010 */ sw $t8, 0x10($sp)
/* 096724 80095B24 24060002 */ li $a2, 2
/* 096728 80095B28 3C018012 */ lui $at, %hi(D_801263E0) # $at, 0x8012
/* 096728 80095B28 3C018012 */ lui $at, %hi(gMenuOptionCount) # $at, 0x8012
/* 09672C 80095B2C 100002F9 */ b .L80096714
/* 096730 80095B30 AC2663E0 */ sw $a2, %lo(D_801263E0)($at)
/* 096730 80095B30 AC2663E0 */ sw $a2, %lo(gMenuOptionCount)($at)
glabel L80095B34
/* 096734 80095B34 8FA40064 */ lw $a0, 0x64($sp)
/* 096738 80095B38 0C0207D3 */ jal func_80081F4C
@@ -298,9 +298,9 @@ glabel L80095B34
/* 096764 80095B64 0C030076 */ jal transition_begin
/* 096768 80095B68 2484F774 */ addiu $a0, %lo(sMenuTransitionFadeIn) # addiu $a0, $a0, -0x88c
/* 09676C 80095B6C 240D0008 */ li $t5, 8
/* 096770 80095B70 3C018012 */ lui $at, %hi(D_801263E0) # $at, 0x8012
/* 096770 80095B70 3C018012 */ lui $at, %hi(gMenuOptionCount) # $at, 0x8012
/* 096774 80095B74 100002E7 */ b .L80096714
/* 096778 80095B78 AC2D63E0 */ sw $t5, %lo(D_801263E0)($at)
/* 096778 80095B78 AC2D63E0 */ sw $t5, %lo(gMenuOptionCount)($at)
.L80095B7C:
/* 09677C 80095B7C 80EE0117 */ lb $t6, 0x117($a3)
/* 096780 80095B80 3C013F00 */ lui $at, 0x3f00
@@ -354,9 +354,9 @@ glabel L80095B34
/* 096840 80095C40 3C18800E */ lui $t8, %hi(gIsInTracksMode) # $t8, 0x800e
/* 096844 80095C44 8F18F4B8 */ lw $t8, %lo(gIsInTracksMode)($t8)
/* 096848 80095C48 240E0004 */ li $t6, 4
/* 09684C 80095C4C 3C018012 */ lui $at, %hi(D_801263E0) # $at, 0x8012
/* 09684C 80095C4C 3C018012 */ lui $at, %hi(gMenuOptionCount) # $at, 0x8012
/* 096850 80095C50 1700000B */ bnez $t8, .L80095C80
/* 096854 80095C54 AC2E63E0 */ sw $t6, %lo(D_801263E0)($at)
/* 096854 80095C54 AC2E63E0 */ sw $t6, %lo(gMenuOptionCount)($at)
/* 096858 80095C58 3C0D800E */ lui $t5, %hi(D_800E0FAC) # $t5, 0x800e
/* 09685C 80095C5C 8DAD0FAC */ lw $t5, %lo(D_800E0FAC)($t5)
/* 096860 80095C60 3C05800E */ lui $a1, %hi(D_800E0FA8) # $a1, 0x800e
@@ -395,18 +395,18 @@ glabel L80095B34
/* 0968DC 80095CDC 0C020795 */ jal func_80081E54
/* 0968E0 80095CE0 AFB80014 */ sw $t8, 0x14($sp)
/* 0968E4 80095CE4 24030005 */ li $v1, 5
/* 0968E8 80095CE8 3C018012 */ lui $at, %hi(D_801263E0) # $at, 0x8012
/* 0968E8 80095CE8 3C018012 */ lui $at, %hi(gMenuOptionCount) # $at, 0x8012
/* 0968EC 80095CEC 10000289 */ b .L80096714
/* 0968F0 80095CF0 AC2363E0 */ sw $v1, %lo(D_801263E0)($at)
/* 0968F0 80095CF0 AC2363E0 */ sw $v1, %lo(gMenuOptionCount)($at)
.L80095CF4:
/* 0968F4 80095CF4 44810000 */ mtc1 $at, $f0
/* 0968F8 80095CF8 8FAF0038 */ lw $t7, 0x38($sp)
/* 0968FC 80095CFC 8FAC0034 */ lw $t4, 0x34($sp)
/* 096900 80095D00 3C018012 */ lui $at, %hi(D_801263E0) # $at, 0x8012
/* 096900 80095D00 3C018012 */ lui $at, %hi(gMenuOptionCount) # $at, 0x8012
/* 096904 80095D04 3C04800E */ lui $a0, %hi(D_800E0CEC) # $a0, 0x800e
/* 096908 80095D08 44050000 */ mfc1 $a1, $f0
/* 09690C 80095D0C 44070000 */ mfc1 $a3, $f0
/* 096910 80095D10 AC2D63E0 */ sw $t5, %lo(D_801263E0)($at)
/* 096910 80095D10 AC2D63E0 */ sw $t5, %lo(gMenuOptionCount)($at)
/* 096914 80095D14 24840CEC */ addiu $a0, %lo(D_800E0CEC) # addiu $a0, $a0, 0xcec
/* 096918 80095D18 3C064170 */ lui $a2, 0x4170
/* 09691C 80095D1C AFAF0010 */ sw $t7, 0x10($sp)
@@ -420,9 +420,9 @@ glabel L80095D30
/* 096938 80095D38 00000000 */ nop
/* 09693C 80095D3C 10400275 */ beqz $v0, .L80096714
/* 096940 80095D40 24190006 */ li $t9, 6
/* 096944 80095D44 3C018012 */ lui $at, %hi(D_801263E0) # $at, 0x8012
/* 096944 80095D44 3C018012 */ lui $at, %hi(gMenuOptionCount) # $at, 0x8012
/* 096948 80095D48 10000272 */ b .L80096714
/* 09694C 80095D4C AC3963E0 */ sw $t9, %lo(D_801263E0)($at)
/* 09694C 80095D4C AC3963E0 */ sw $t9, %lo(gMenuOptionCount)($at)
glabel L80095D50
/* 096950 80095D50 8FA40064 */ lw $a0, 0x64($sp)
/* 096954 80095D54 0C025F44 */ jal menu_enter_filename_loop
@@ -509,18 +509,18 @@ glabel L80095D50
/* 096A90 80095E90 0C020795 */ jal func_80081E54
/* 096A94 80095E94 AFAC0014 */ sw $t4, 0x14($sp)
/* 096A98 80095E98 24030005 */ li $v1, 5
/* 096A9C 80095E9C 3C018012 */ lui $at, %hi(D_801263E0) # $at, 0x8012
/* 096A9C 80095E9C 3C018012 */ lui $at, %hi(gMenuOptionCount) # $at, 0x8012
/* 096AA0 80095EA0 1000021C */ b .L80096714
/* 096AA4 80095EA4 AC2363E0 */ sw $v1, %lo(D_801263E0)($at)
/* 096AA4 80095EA4 AC2363E0 */ sw $v1, %lo(gMenuOptionCount)($at)
glabel L80095EA8
/* 096AA8 80095EA8 8FA40064 */ lw $a0, 0x64($sp)
/* 096AAC 80095EAC 0C0207D3 */ jal func_80081F4C
/* 096AB0 80095EB0 00000000 */ nop
/* 096AB4 80095EB4 10400217 */ beqz $v0, .L80096714
/* 096AB8 80095EB8 240E0006 */ li $t6, 6
/* 096ABC 80095EBC 3C018012 */ lui $at, %hi(D_801263E0) # $at, 0x8012
/* 096ABC 80095EBC 3C018012 */ lui $at, %hi(gMenuOptionCount) # $at, 0x8012
/* 096AC0 80095EC0 10000214 */ b .L80096714
/* 096AC4 80095EC4 AC2E63E0 */ sw $t6, %lo(D_801263E0)($at)
/* 096AC4 80095EC4 AC2E63E0 */ sw $t6, %lo(gMenuOptionCount)($at)
glabel L80095EC8
/* 096AC8 80095EC8 3C058012 */ lui $a1, %hi(D_80126A98) # $a1, 0x8012
/* 096ACC 80095ECC 24A56A98 */ addiu $a1, %lo(D_80126A98) # addiu $a1, $a1, 0x6a98
@@ -547,9 +547,9 @@ glabel L80095EC8
/* 096B1C 80095F1C 0C00025A */ jal adjust_audio_volume
/* 096B20 80095F20 24040002 */ li $a0, 2
/* 096B24 80095F24 8FAD0054 */ lw $t5, 0x54($sp)
/* 096B28 80095F28 3C098012 */ lui $t1, %hi(D_80126C14) # $t1, 0x8012
/* 096B28 80095F28 3C098012 */ lui $t1, %hi(gResultOptionCount) # $t1, 0x8012
/* 096B2C 80095F2C 11A00006 */ beqz $t5, .L80095F48
/* 096B30 80095F30 25296C14 */ addiu $t1, %lo(D_80126C14) # addiu $t1, $t1, 0x6c14
/* 096B30 80095F30 25296C14 */ addiu $t1, %lo(gResultOptionCount) # addiu $t1, $t1, 0x6c14
/* 096B34 80095F34 0C025589 */ jal func_80095624
/* 096B38 80095F38 01A02025 */ move $a0, $t5
/* 096B3C 80095F3C 240C0001 */ li $t4, 1
@@ -565,9 +565,9 @@ glabel L80095EC8
/* 096B60 80095F60 00000000 */ nop
/* 096B64 80095F64 0C025589 */ jal func_80095624
/* 096B68 80095F68 24040008 */ li $a0, 8
/* 096B6C 80095F6C 3C098012 */ lui $t1, %hi(D_80126C14) # $t1, 0x8012
/* 096B6C 80095F6C 3C098012 */ lui $t1, %hi(gResultOptionCount) # $t1, 0x8012
/* 096B70 80095F70 10000002 */ b .L80095F7C
/* 096B74 80095F74 25296C14 */ addiu $t1, %lo(D_80126C14) # addiu $t1, $t1, 0x6c14
/* 096B74 80095F74 25296C14 */ addiu $t1, %lo(gResultOptionCount) # addiu $t1, $t1, 0x6c14
.L80095F78:
/* 096B78 80095F78 AC800000 */ sw $zero, ($a0)
.L80095F7C:
@@ -577,10 +577,10 @@ glabel L80095EC8
/* 096B88 80095F88 8F18F4A0 */ lw $t8, %lo(gMenuText)($t8)
/* 096B8C 80095F8C 8CCD0000 */ lw $t5, ($a2)
/* 096B90 80095F90 8F190070 */ lw $t9, 0x70($t8)
/* 096B94 80095F94 3C018012 */ lui $at, %hi(D_80126BF0) # $at, 0x8012
/* 096B94 80095F94 3C018012 */ lui $at, %hi(gResultOptionText) # $at, 0x8012
/* 096B98 80095F98 000D6080 */ sll $t4, $t5, 2
/* 096B9C 80095F9C 002C0821 */ addu $at, $at, $t4
/* 096BA0 80095FA0 AC396BF0 */ sw $t9, %lo(D_80126BF0)($at)
/* 096BA0 80095FA0 AC396BF0 */ sw $t9, %lo(gResultOptionText)($at)
/* 096BA4 80095FA4 8D2E0000 */ lw $t6, ($t1)
/* 096BA8 80095FA8 ACC00000 */ sw $zero, ($a2)
/* 096BAC 80095FAC 25CFFFFF */ addiu $t7, $t6, -1
@@ -632,9 +632,9 @@ glabel L80095EC8
/* 096C50 80096050 0C030076 */ jal transition_begin
/* 096C54 80096054 2484F774 */ addiu $a0, %lo(sMenuTransitionFadeIn) # addiu $a0, $a0, -0x88c
/* 096C58 80096058 240D0008 */ li $t5, 8
/* 096C5C 8009605C 3C018012 */ lui $at, %hi(D_801263E0) # $at, 0x8012
/* 096C5C 8009605C 3C018012 */ lui $at, %hi(gMenuOptionCount) # $at, 0x8012
/* 096C60 80096060 100000FC */ b .L80096454
/* 096C64 80096064 AC2D63E0 */ sw $t5, %lo(D_801263E0)($at)
/* 096C64 80096064 AC2D63E0 */ sw $t5, %lo(gMenuOptionCount)($at)
.L80096068:
/* 096C68 80096068 AFB90054 */ sw $t9, 0x54($sp)
/* 096C6C 8009606C 100000F9 */ b .L80096454
@@ -765,11 +765,11 @@ glabel L80095EC8
/* 096E1C 8009621C 3C02800E */ lui $v0, %hi(gMenuText) # $v0, 0x800e
/* 096E20 80096220 8C42F4A0 */ lw $v0, %lo(gMenuText)($v0)
/* 096E24 80096224 240C0001 */ li $t4, 1
/* 096E28 80096228 3C038012 */ lui $v1, %hi(D_80126BF0) # $v1, 0x8012
/* 096E28 80096228 3C038012 */ lui $v1, %hi(gResultOptionText) # $v1, 0x8012
/* 096E2C 8009622C 000E7880 */ sll $t7, $t6, 2
/* 096E30 80096230 AFAC0050 */ sw $t4, 0x50($sp)
/* 096E34 80096234 006F1821 */ addu $v1, $v1, $t7
/* 096E38 80096238 8C636BF0 */ lw $v1, %lo(D_80126BF0)($v1)
/* 096E38 80096238 8C636BF0 */ lw $v1, %lo(gResultOptionText)($v1)
/* 096E3C 8009623C 8C58006C */ lw $t8, 0x6c($v0)
/* 096E40 80096240 24070001 */ li $a3, 1
/* 096E44 80096244 14780003 */ bne $v1, $t8, .L80096254
@@ -790,9 +790,9 @@ glabel L80095EC8
/* 096E78 80096278 0C030076 */ jal transition_begin
/* 096E7C 8009627C 2484F774 */ addiu $a0, %lo(sMenuTransitionFadeIn) # addiu $a0, $a0, -0x88c
/* 096E80 80096280 24190008 */ li $t9, 8
/* 096E84 80096284 3C018012 */ lui $at, %hi(D_801263E0) # $at, 0x8012
/* 096E84 80096284 3C018012 */ lui $at, %hi(gMenuOptionCount) # $at, 0x8012
/* 096E88 80096288 10000072 */ b .L80096454
/* 096E8C 8009628C AC3963E0 */ sw $t9, %lo(D_801263E0)($at)
/* 096E8C 8009628C AC3963E0 */ sw $t9, %lo(gMenuOptionCount)($at)
.L80096290:
/* 096E90 80096290 24C66A68 */ addiu $a2, %lo(gMenuOption) # addiu $a2, $a2, 0x6a68
/* 096E94 80096294 8CC20000 */ lw $v0, ($a2)
@@ -956,9 +956,9 @@ glabel L800964AC
/* 0970C4 800964C4 0C030076 */ jal transition_begin
/* 0970C8 800964C8 2484F774 */ addiu $a0, %lo(sMenuTransitionFadeIn) # addiu $a0, $a0, -0x88c
/* 0970CC 800964CC 24180008 */ li $t8, 8
/* 0970D0 800964D0 3C018012 */ lui $at, %hi(D_801263E0) # $at, 0x8012
/* 0970D0 800964D0 3C018012 */ lui $at, %hi(gMenuOptionCount) # $at, 0x8012
/* 0970D4 800964D4 1000008F */ b .L80096714
/* 0970D8 800964D8 AC3863E0 */ sw $t8, %lo(D_801263E0)($at)
/* 0970D8 800964D8 AC3863E0 */ sw $t8, %lo(gMenuOptionCount)($at)
glabel L800964DC
/* 0970DC 800964DC 3C0D800E */ lui $t5, %hi(gMenuDelay) # $t5, 0x800e
/* 0970E0 800964E0 8DADF47C */ lw $t5, %lo(gMenuDelay)($t5)
@@ -1057,10 +1057,10 @@ glabel L800964DC
/* 097238 80096638 8CCD0000 */ lw $t5, ($a2)
/* 09723C 8009663C 3C02800E */ lui $v0, %hi(gMenuText) # $v0, 0x800e
/* 097240 80096640 8C42F4A0 */ lw $v0, %lo(gMenuText)($v0)
/* 097244 80096644 3C038012 */ lui $v1, %hi(D_80126BF0) # $v1, 0x8012
/* 097244 80096644 3C038012 */ lui $v1, %hi(gResultOptionText) # $v1, 0x8012
/* 097248 80096648 000DC880 */ sll $t9, $t5, 2
/* 09724C 8009664C 00791821 */ addu $v1, $v1, $t9
/* 097250 80096650 8C636BF0 */ lw $v1, %lo(D_80126BF0)($v1)
/* 097250 80096650 8C636BF0 */ lw $v1, %lo(gResultOptionText)($v1)
/* 097254 80096654 8C4C005C */ lw $t4, 0x5c($v0)
/* 097258 80096658 3C0E800E */ lui $t6, %hi(gIsInTracksMode) # $t6, 0x800e
/* 09725C 8009665C 146C001A */ bne $v1, $t4, .L800966C8
asm/non_matchings/menu/func_80096978.s
+8 -8
View File
@@ -100,9 +100,9 @@ glabel func_80096978
/* 0976F4 80096AF4 44819000 */ mtc1 $at, $f18
/* 0976F8 80096AF8 24190036 */ li $t9, 54
/* 0976FC 80096AFC 46149102 */ mul.s $f4, $f18, $f20
/* 097700 80096B00 3C12800E */ lui $s2, %hi(D_800E0AF0) # $s2, 0x800e
/* 097700 80096B00 3C12800E */ lui $s2, %hi(gRacerPortraits) # $s2, 0x800e
/* 097704 80096B04 8FB00084 */ lw $s0, 0x84($sp)
/* 097708 80096B08 26520AF0 */ addiu $s2, %lo(D_800E0AF0) # addiu $s2, $s2, 0xaf0
/* 097708 80096B08 26520AF0 */ addiu $s2, %lo(gRacerPortraits) # addiu $s2, $s2, 0xaf0
/* 09770C 80096B0C 444FF800 */ cfc1 $t7, $31
/* 097710 80096B10 2413017F */ li $s3, 383
/* 097714 80096B14 35E10003 */ ori $at, $t7, 3
@@ -403,11 +403,11 @@ glabel func_80096978
/* 097B70 80096F70 AFA90078 */ sw $t1, 0x78($sp)
/* 097B74 80096F74 1420FF41 */ bnez $at, .L80096C7C
/* 097B78 80096F78 AFB900A0 */ sw $t9, 0xa0($sp)
/* 097B7C 80096F7C 3C0D8012 */ lui $t5, %hi(D_801263E0) # $t5, 0x8012
/* 097B80 80096F80 8DAD63E0 */ lw $t5, %lo(D_801263E0)($t5)
/* 097B84 80096F84 3C118012 */ lui $s1, %hi(D_80126C14) # $s1, 0x8012
/* 097B7C 80096F7C 3C0D8012 */ lui $t5, %hi(gMenuOptionCount) # $t5, 0x8012
/* 097B80 80096F80 8DAD63E0 */ lw $t5, %lo(gMenuOptionCount)($t5)
/* 097B84 80096F84 3C118012 */ lui $s1, %hi(gResultOptionCount) # $s1, 0x8012
/* 097B88 80096F88 19A000B7 */ blez $t5, .L80097268
/* 097B8C 80096F8C 26316C14 */ addiu $s1, %lo(D_80126C14) # addiu $s1, $s1, 0x6c14
/* 097B8C 80096F8C 26316C14 */ addiu $s1, %lo(gResultOptionCount) # addiu $s1, $s1, 0x6c14
/* 097B90 80096F90 8E2B0000 */ lw $t3, ($s1)
/* 097B94 80096F94 24040007 */ li $a0, 7
/* 097B98 80096F98 000B60C0 */ sll $t4, $t3, 3
@@ -549,10 +549,10 @@ glabel func_80096978
/* 097DA0 800971A0 240A000C */ li $t2, 12
/* 097DA4 800971A4 1B20002E */ blez $t9, .L80097260
/* 097DA8 800971A8 AFAA00A8 */ sw $t2, 0xa8($sp)
/* 097DAC 800971AC 3C108012 */ lui $s0, %hi(D_80126BF0) # $s0, 0x8012
/* 097DAC 800971AC 3C108012 */ lui $s0, %hi(gResultOptionText) # $s0, 0x8012
/* 097DB0 800971B0 3C128012 */ lui $s2, %hi(gMenuOption) # $s2, 0x8012
/* 097DB4 800971B4 26526A68 */ addiu $s2, %lo(gMenuOption) # addiu $s2, $s2, 0x6a68
/* 097DB8 800971B8 26106BF0 */ addiu $s0, %lo(D_80126BF0) # addiu $s0, $s0, 0x6bf0
/* 097DB8 800971B8 26106BF0 */ addiu $s0, %lo(gResultOptionText) # addiu $s0, $s0, 0x6bf0
/* 097DBC 800971BC AFA200A0 */ sw $v0, 0xa0($sp)
.L800971C0:
/* 097DC0 800971C0 8E4D0000 */ lw $t5, ($s2)
asm/non_matchings/menu/func_80098774.s
+4 -4
View File
@@ -28,8 +28,8 @@ glabel func_80098774
/* 0993D4 800987D4 24A51048 */ addiu $a1, %lo(D_800E1048) # addiu $a1, $a1, 0x1048
/* 0993D8 800987D8 ACA30014 */ sw $v1, 0x14($a1)
/* 0993DC 800987DC ACA30034 */ sw $v1, 0x34($a1)
/* 0993E0 800987E0 3C09800E */ lui $t1, %hi(D_800E0FE4) # $t1, 0x800e
/* 0993E4 800987E4 8D290FE4 */ lw $t1, %lo(D_800E0FE4)($t1)
/* 0993E0 800987E0 3C09800E */ lui $t1, %hi(gRankingPlayerCount) # $t1, 0x800e
/* 0993E4 800987E4 8D290FE4 */ lw $t1, %lo(gRankingPlayerCount)($t1)
/* 0993E8 800987E8 3C198000 */ lui $t9, %hi(osTvType) # $t9, 0x8000
/* 0993EC 800987EC 8F390300 */ lw $t9, %lo(osTvType)($t9)
/* 0993F0 800987F0 2528FFFF */ addiu $t0, $t1, -1
@@ -60,8 +60,8 @@ glabel func_80098774
/* 099450 80098850 3C15800E */ lui $s5, %hi(gTrophyRacePointsArray) # $s5, 0x800e
/* 099454 80098854 3C148012 */ lui $s4, %hi(D_80126428) # $s4, 0x8012
/* 099458 80098858 3C138012 */ lui $s3, %hi(D_80126430) # $s3, 0x8012
/* 09945C 8009885C 3C0D800E */ lui $t5, %hi(D_800E0AF0) # $t5, 0x800e
/* 099460 80098860 25AD0AF0 */ addiu $t5, %lo(D_800E0AF0) # addiu $t5, $t5, 0xaf0
/* 09945C 8009885C 3C0D800E */ lui $t5, %hi(gRacerPortraits) # $t5, 0x800e
/* 099460 80098860 25AD0AF0 */ addiu $t5, %lo(gRacerPortraits) # addiu $t5, $t5, 0xaf0
/* 099464 80098864 26736430 */ addiu $s3, %lo(D_80126430) # addiu $s3, $s3, 0x6430
/* 099468 80098868 26946428 */ addiu $s4, %lo(D_80126428) # addiu $s4, $s4, 0x6428
/* 09946C 8009886C 26B51004 */ addiu $s5, %lo(gTrophyRacePointsArray) # addiu $s5, $s5, 0x1004
asm/non_matchings/menu/func_80099E8C.s
+4 -4
View File
@@ -287,13 +287,13 @@ glabel func_80099E8C
/* 09AEBC 8009A2BC 0C031110 */ jal draw_text
/* 09AEC0 8009A2C0 01323021 */ addu $a2, $t1, $s2
/* 09AEC4 8009A2C4 8FAB0074 */ lw $t3, 0x74($sp)
/* 09AEC8 8009A2C8 3C05800E */ lui $a1, %hi(D_800E0AF0) # $a1, 0x800e
/* 09AEC8 8009A2C8 3C05800E */ lui $a1, %hi(gRacerPortraits) # $a1, 0x800e
/* 09AECC 8009A2CC 916C0000 */ lbu $t4, ($t3)
/* 09AED0 8009A2D0 86260004 */ lh $a2, 4($s1)
/* 09AED4 8009A2D4 000C6880 */ sll $t5, $t4, 2
/* 09AED8 8009A2D8 862E0006 */ lh $t6, 6($s1)
/* 09AEDC 8009A2DC 00AD2821 */ addu $a1, $a1, $t5
/* 09AEE0 8009A2E0 8CA50AF0 */ lw $a1, %lo(D_800E0AF0)($a1)
/* 09AEE0 8009A2E0 8CA50AF0 */ lw $a1, %lo(gRacerPortraits)($a1)
/* 09AEE4 8009A2E4 240F00FF */ li $t7, 255
/* 09AEE8 8009A2E8 241800FF */ li $t8, 255
/* 09AEEC 8009A2EC 241900FF */ li $t9, 255
@@ -430,9 +430,9 @@ glabel func_80099E8C
/* 09B0EC 8009A4EC 1DC0FEF0 */ bgtz $t6, .L8009A0B0
/* 09B0F0 8009A4F0 00000000 */ nop
.L8009A4F4:
/* 09B0F4 8009A4F4 3C108012 */ lui $s0, %hi(D_801263E0) # $s0, 0x8012
/* 09B0F4 8009A4F4 3C108012 */ lui $s0, %hi(gMenuOptionCount) # $s0, 0x8012
/* 09B0F8 8009A4F8 8FB900D8 */ lw $t9, 0xd8($sp)
/* 09B0FC 8009A4FC 261063E0 */ addiu $s0, %lo(D_801263E0) # addiu $s0, $s0, 0x63e0
/* 09B0FC 8009A4FC 261063E0 */ addiu $s0, %lo(gMenuOptionCount) # addiu $s0, $s0, 0x63e0
/* 09B100 8009A500 8E0A0000 */ lw $t2, ($s0)
/* 09B104 8009A504 332900FF */ andi $t1, $t9, 0xff
/* 09B108 8009A508 19400063 */ blez $t2, .L8009A698
asm/non_matchings/menu/func_8009C6D4.s
+8 -8
View File
@@ -64,11 +64,11 @@ glabel func_8009C6D4
/* 09D3BC 8009C7BC 0C01EB9D */ jal load_texture
/* 09D3C0 8009C7C0 AFA70038 */ sw $a3, 0x38($sp)
/* 09D3C4 8009C7C4 8FA70038 */ lw $a3, 0x38($sp)
/* 09D3C8 8009C7C8 3C018012 */ lui $at, %hi(D_80126550) # $at, 0x8012
/* 09D3C8 8009C7C8 3C018012 */ lui $at, %hi(gMenuTextures) # $at, 0x8012
/* 09D3CC 8009C7CC 00075880 */ sll $t3, $a3, 2
/* 09D3D0 8009C7D0 002B0821 */ addu $at, $at, $t3
/* 09D3D4 8009C7D4 10000027 */ b .L8009C874
/* 09D3D8 8009C7D8 AC226550 */ sw $v0, %lo(D_80126550)($at)
/* 09D3D8 8009C7D8 AC226550 */ sw $v0, %lo(gMenuTextures)($at)
.L8009C7DC:
/* 09D3DC 8009C7DC 1180000B */ beqz $t4, .L8009C80C
/* 09D3E0 8009C7E0 304E4000 */ andi $t6, $v0, 0x4000
@@ -77,11 +77,11 @@ glabel func_8009C6D4
/* 09D3EC 8009C7EC 0C01F04B */ jal func_8007C12C
/* 09D3F0 8009C7F0 AFA70038 */ sw $a3, 0x38($sp)
/* 09D3F4 8009C7F4 8FA70038 */ lw $a3, 0x38($sp)
/* 09D3F8 8009C7F8 3C018012 */ lui $at, %hi(D_80126550) # $at, 0x8012
/* 09D3F8 8009C7F8 3C018012 */ lui $at, %hi(gMenuTextures) # $at, 0x8012
/* 09D3FC 8009C7FC 00076880 */ sll $t5, $a3, 2
/* 09D400 8009C800 002D0821 */ addu $at, $at, $t5
/* 09D404 8009C804 1000001B */ b .L8009C874
/* 09D408 8009C808 AC226550 */ sw $v0, %lo(D_80126550)($at)
/* 09D408 8009C808 AC226550 */ sw $v0, %lo(gMenuTextures)($at)
.L8009C80C:
/* 09D40C 8009C80C 11C00011 */ beqz $t6, .L8009C854
/* 09D410 8009C810 30443FFF */ andi $a0, $v0, 0x3fff
@@ -96,20 +96,20 @@ glabel func_8009C6D4
/* 09D434 8009C834 0C003A95 */ jal spawn_object
/* 09D438 8009C838 AFA70038 */ sw $a3, 0x38($sp)
/* 09D43C 8009C83C 8FA70038 */ lw $a3, 0x38($sp)
/* 09D440 8009C840 3C018012 */ lui $at, %hi(D_80126550) # $at, 0x8012
/* 09D440 8009C840 3C018012 */ lui $at, %hi(gMenuTextures) # $at, 0x8012
/* 09D444 8009C844 0007C880 */ sll $t9, $a3, 2
/* 09D448 8009C848 00390821 */ addu $at, $at, $t9
/* 09D44C 8009C84C 10000009 */ b .L8009C874
/* 09D450 8009C850 AC226550 */ sw $v0, %lo(D_80126550)($at)
/* 09D450 8009C850 AC226550 */ sw $v0, %lo(gMenuTextures)($at)
.L8009C854:
/* 09D454 8009C854 00002825 */ move $a1, $zero
/* 09D458 8009C858 0C017E67 */ jal func_8005F99C
/* 09D45C 8009C85C AFA70038 */ sw $a3, 0x38($sp)
/* 09D460 8009C860 8FA70038 */ lw $a3, 0x38($sp)
/* 09D464 8009C864 3C018012 */ lui $at, %hi(D_80126550) # $at, 0x8012
/* 09D464 8009C864 3C018012 */ lui $at, %hi(gMenuTextures) # $at, 0x8012
/* 09D468 8009C868 00074880 */ sll $t1, $a3, 2
/* 09D46C 8009C86C 00290821 */ addu $at, $at, $t1
/* 09D470 8009C870 AC226550 */ sw $v0, %lo(D_80126550)($at)
/* 09D470 8009C870 AC226550 */ sw $v0, %lo(gMenuTextures)($at)
.L8009C874:
/* 09D474 8009C874 8FAB0024 */ lw $t3, 0x24($sp)
/* 09D478 8009C878 240A0001 */ li $t2, 1
asm/non_matchings/menu/func_8009CA60.s
+5 -5
View File
@@ -9,10 +9,10 @@ glabel func_8009CA60
/* 09D67C 8009CA7C AFA40060 */ sw $a0, 0x60($sp)
/* 09D680 8009CA80 00687821 */ addu $t7, $v1, $t0
/* 09D684 8009CA84 85E50006 */ lh $a1, 6($t7)
/* 09D688 8009CA88 3C0A8012 */ lui $t2, %hi(D_80126550) # $t2, 0x8012
/* 09D688 8009CA88 3C0A8012 */ lui $t2, %hi(gMenuTextures) # $t2, 0x8012
/* 09D68C 8009CA8C 0005C080 */ sll $t8, $a1, 2
/* 09D690 8009CA90 01585021 */ addu $t2, $t2, $t8
/* 09D694 8009CA94 8D4A6550 */ lw $t2, %lo(D_80126550)($t2)
/* 09D694 8009CA94 8D4A6550 */ lw $t2, %lo(gMenuTextures)($t2)
/* 09D698 8009CA98 3C19800E */ lui $t9, %hi(gAssetsMenuElementIds) # $t9, 0x800e
/* 09D69C 8009CA9C 114000B4 */ beqz $t2, .L8009CD70
/* 09D6A0 8009CAA0 8FBF0024 */ lw $ra, 0x24($sp)
@@ -173,18 +173,18 @@ glabel func_8009CA60
/* 09D8F8 8009CCF8 256BF75C */ addiu $t3, %lo(gMenuImageStack) # addiu $t3, $t3, -0x8a4
/* 09D8FC 8009CCFC 8FA8002C */ lw $t0, 0x2c($sp)
/* 09D900 8009CD00 8D6E0000 */ lw $t6, ($t3)
/* 09D904 8009CD04 3C028012 */ lui $v0, %hi(D_80126550) # $v0, 0x8012
/* 09D904 8009CD04 3C028012 */ lui $v0, %hi(gMenuTextures) # $v0, 0x8012
/* 09D908 8009CD08 01C87821 */ addu $t7, $t6, $t0
/* 09D90C 8009CD0C 85EC0006 */ lh $t4, 6($t7)
/* 09D910 8009CD10 00000000 */ nop
/* 09D914 8009CD14 000CC880 */ sll $t9, $t4, 2
/* 09D918 8009CD18 00591021 */ addu $v0, $v0, $t9
/* 09D91C 8009CD1C 8C426550 */ lw $v0, %lo(D_80126550)($v0)
/* 09D91C 8009CD1C 8C426550 */ lw $v0, %lo(gMenuTextures)($v0)
/* 09D920 8009CD20 00000000 */ nop
/* 09D924 8009CD24 8C440000 */ lw $a0, ($v0)
/* 09D928 8009CD28 0C02735F */ jal render_track_selection_viewport_border
/* 09D92C 8009CD2C 00000000 */ nop
/* 09D930 8009CD30 0C01A690 */ jal func_80069A40
/* 09D930 8009CD30 0C01A690 */ jal apply_matrix_from_stack
/* 09D934 8009CD34 02002025 */ move $a0, $s0
/* 09D938 8009CD38 3C0D800E */ lui $t5, %hi(sMenuGuiOpacity) # $t5, 0x800e
/* 09D93C 8009CD3C 8DADF764 */ lw $t5, %lo(sMenuGuiOpacity)($t5)
asm/non_matchings/menu/menu_audio_options_loop.s
+4 -4
View File
@@ -78,7 +78,7 @@ glabel menu_audio_options_loop
/* 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(D_801263E0) # $v1, 0x8012
/* 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)
@@ -99,17 +99,17 @@ glabel menu_audio_options_loop
/* 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(D_801263E0) # addiu $v1, $v1, 0x63e0
/* 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(D_801263E0) # $v1, 0x8012
/* 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(D_801263E0) # addiu $v1, $v1, 0x63e0
/* 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

Some files were not shown because too many files have changed in this diff Show More