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

Identify and label a few things (#250)

Browse Source 
* Squashed commit of the following:

commit 3ab4716110
Author: Fazana <52551480+FazanaJ@users.noreply.github.com>
Date:   Mon May 23 23:11:46 2022 +0100

    Mostly misc labelling, but also weather too (#232)

    * bit more labelling

    * identify some weather stuff

    * Update sound_ids.h

    * yum

    * more random identification

    * last weather stuff for now

    * Update README.md

    * Update README.md

    * Fix non equivalent

* I found the 60fps button

* match func_80052B64

* match racer_attack_handler

* match func_80048C7C

* buncha function declaring

* e

* tweak

* match func_8004DE38

oh man oh man

* Small bit of labelling

* Merge remote-tracking branch 'upstream/master' into the-many-against-the-few

* Update README.md

* Fix monumentally poor bout of misinformation in the readme

we wouldn't want to mislead the readers, would we?

* github please

* Update README.md

* requested changes

kinda funny because I knew this struct existed, and knew it was used for this, but never made the connection lol

* Update objects.c

* match racer_enter_door

A nice easy one after the pure hellscape of the last few days :)

* names

* renames

* match func_8005250C

* heehee

* Update racer.c

* identify some misc asset calls

* identify some surface types

* match func_8005492C

* Delete func_8005492C.s

* match func_80052D7C

* move some enums

* label all existing misc asset calls

granted I know what almost none of them are lmao, buut will make things slightly easier in the long run

* Update README.md

* requested changes

pain

* Update README.md

* just a bit of labelling

* labbel

* more

* Update structs.h

* file select

* file struct

* Update menu.c

* multiplayer box

* texture naming

* realised why there's 3 indices lol

* rounding

* Update menu.c

* identify textures

* pain

* fix non equiv

* Update src/menu.c

Co-authored-by: Ryan Myers <ryan.p.myers@gmail.com>

* Update src/unknown_078050.c

Co-authored-by: Ryan Myers <ryan.p.myers@gmail.com>

* Update src/menu.c

Co-authored-by: Ryan Myers <ryan.p.myers@gmail.com>

Co-authored-by: Ryan Myers <ryan.p.myers@gmail.com>
This commit is contained in:
Fazana
2022-10-03 18:48:25 +01:00
committed by GitHub
co-authored by Ryan Myers
parent c8710bc97a
commit 0458aa3f06
30 changed files with 547 additions and 358 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/non_matchings/game/func_8006DCF8.s
+16 -16
View File
@@ -5,8 +5,8 @@ glabel jpt_800E71D8
.text
glabel func_8006DCF8
/* 06E8F8 8006DCF8 3C018012 */ lui $at, %hi(gIsPaused) # $at, 0x8012
/* 06E8FC 8006DCFC 3C0E8012 */ lui $t6, %hi(D_80123514) # $t6, 0x8012
/* 06E900 8006DD00 81CE3514 */ lb $t6, %lo(D_80123514)($t6)
/* 06E8FC 8006DCFC 3C0E8012 */ lui $t6, %hi(gIsLoading) # $t6, 0x8012
/* 06E900 8006DD00 81CE3514 */ lb $t6, %lo(gIsLoading)($t6)
/* 06E904 8006DD04 27BDFFD0 */ addiu $sp, $sp, -0x30
/* 06E908 8006DD08 A0203515 */ sb $zero, %lo(gIsPaused)($at)
/* 06E90C 8006DD0C 3C018012 */ lui $at, %hi(D_80123516) # $at, 0x8012
@@ -78,10 +78,10 @@ glabel func_8006DCF8
/* 06EA08 8006DE08 0C01AC2B */ jal func_8006B0AC
/* 06EA0C 8006DE0C AD040000 */ sw $a0, ($t0)
/* 06EA10 8006DE10 3C098012 */ lui $t1, %hi(D_80123504) # $t1, 0x8012
/* 06EA14 8006DE14 3C0A8012 */ lui $t2, %hi(D_80123518) # $t2, 0x8012
/* 06EA14 8006DE14 3C0A8012 */ lui $t2, %hi(gLevelDefaultVehicleID) # $t2, 0x8012
/* 06EA18 8006DE18 3C0B8012 */ lui $t3, %hi(D_80123508) # $t3, 0x8012
/* 06EA1C 8006DE1C 256B3508 */ addiu $t3, %lo(D_80123508) # addiu $t3, $t3, 0x3508
/* 06EA20 8006DE20 254A3518 */ addiu $t2, %lo(D_80123518) # addiu $t2, $t2, 0x3518
/* 06EA20 8006DE20 254A3518 */ addiu $t2, %lo(gLevelDefaultVehicleID) # addiu $t2, $t2, 0x3518
/* 06EA24 8006DE24 25293504 */ addiu $t1, %lo(D_80123504) # addiu $t1, $t1, 0x3504
/* 06EA28 8006DE28 24180064 */ li $t8, 100
/* 06EA2C 8006DE2C AD420000 */ sw $v0, ($t2)
@@ -153,8 +153,8 @@ glabel L8006DF00
/* 06EB28 8006DF28 3C018012 */ lui $at, %hi(sRenderContext) # $at, 0x8012
/* 06EB2C 8006DF2C AC2034EC */ sw $zero, %lo(sRenderContext)($at)
/* 06EB30 8006DF30 3C038012 */ lui $v1, %hi(D_80123500) # $v1, 0x8012
/* 06EB34 8006DF34 3C0A8012 */ lui $t2, %hi(D_80123518) # $t2, 0x8012
/* 06EB38 8006DF38 254A3518 */ addiu $t2, %lo(D_80123518) # addiu $t2, $t2, 0x3518
/* 06EB34 8006DF34 3C0A8012 */ lui $t2, %hi(gLevelDefaultVehicleID) # $t2, 0x8012
/* 06EB38 8006DF38 254A3518 */ addiu $t2, %lo(gLevelDefaultVehicleID) # addiu $t2, $t2, 0x3518
/* 06EB3C 8006DF3C 24633500 */ addiu $v1, %lo(D_80123500) # addiu $v1, $v1, 0x3500
/* 06EB40 8006DF40 8C650000 */ lw $a1, ($v1)
/* 06EB44 8006DF44 8D470000 */ lw $a3, ($t2)
@@ -187,7 +187,7 @@ glabel L8006DF70
/* 06EBAC 8006DFAC 80A2000F */ lb $v0, 0xf($a1)
/* 06EBB0 8006DFB0 80A30001 */ lb $v1, 1($a1)
/* 06EBB4 8006DFB4 04400002 */ bltz $v0, .L8006DFC0
/* 06EBB8 8006DFB8 3C0A8012 */ lui $t2, %hi(D_80123518) # $t2, 0x8012
/* 06EBB8 8006DFB8 3C0A8012 */ lui $t2, %hi(gLevelDefaultVehicleID) # $t2, 0x8012
/* 06EBBC 8006DFBC AD220000 */ sw $v0, ($t1)
.L8006DFC0:
/* 06EBC0 8006DFC0 00A36021 */ addu $t4, $a1, $v1
@@ -197,7 +197,7 @@ glabel L8006DF70
/* 06EBD0 8006DFD0 24633500 */ addiu $v1, %lo(D_80123500) # addiu $v1, $v1, 0x3500
/* 06EBD4 8006DFD4 AD620000 */ sw $v0, ($t3)
.L8006DFD8:
/* 06EBD8 8006DFD8 254A3518 */ addiu $t2, %lo(D_80123518) # addiu $t2, $t2, 0x3518
/* 06EBD8 8006DFD8 254A3518 */ addiu $t2, %lo(gLevelDefaultVehicleID) # addiu $t2, $t2, 0x3518
/* 06EBDC 8006DFDC 8D470000 */ lw $a3, ($t2)
/* 06EBE0 8006DFE0 8D040000 */ lw $a0, ($t0)
/* 06EBE4 8006DFE4 8C650000 */ lw $a1, ($v1)
@@ -216,8 +216,8 @@ glabel L8006E00C
/* 06EC14 8006E014 3C038012 */ lui $v1, %hi(D_80123500) # $v1, 0x8012
/* 06EC18 8006E018 3C088012 */ lui $t0, %hi(D_801234F4) # $t0, 0x8012
/* 06EC1C 8006E01C 3C098012 */ lui $t1, %hi(D_80123504) # $t1, 0x8012
/* 06EC20 8006E020 3C0A8012 */ lui $t2, %hi(D_80123518) # $t2, 0x8012
/* 06EC24 8006E024 254A3518 */ addiu $t2, %lo(D_80123518) # addiu $t2, $t2, 0x3518
/* 06EC20 8006E020 3C0A8012 */ lui $t2, %hi(gLevelDefaultVehicleID) # $t2, 0x8012
/* 06EC24 8006E024 254A3518 */ addiu $t2, %lo(gLevelDefaultVehicleID) # addiu $t2, $t2, 0x3518
/* 06EC28 8006E028 25293504 */ addiu $t1, %lo(D_80123504) # addiu $t1, $t1, 0x3504
/* 06EC2C 8006E02C 250834F4 */ addiu $t0, %lo(D_801234F4) # addiu $t0, $t0, 0x34f4
/* 06EC30 8006E030 24633500 */ addiu $v1, %lo(D_80123500) # addiu $v1, $v1, 0x3500
@@ -255,8 +255,8 @@ glabel L8006E054
/* 06ECAC 8006E0AC 25293504 */ addiu $t1, %lo(D_80123504) # addiu $t1, $t1, 0x3504
/* 06ECB0 8006E0B0 250834F4 */ addiu $t0, %lo(D_801234F4) # addiu $t0, $t0, 0x34f4
/* 06ECB4 8006E0B4 24633500 */ addiu $v1, %lo(D_80123500) # addiu $v1, $v1, 0x3500
/* 06ECB8 8006E0B8 3C0A8012 */ lui $t2, %hi(D_80123518) # $t2, 0x8012
/* 06ECBC 8006E0BC 254A3518 */ addiu $t2, %lo(D_80123518) # addiu $t2, $t2, 0x3518
/* 06ECB8 8006E0B8 3C0A8012 */ lui $t2, %hi(gLevelDefaultVehicleID) # $t2, 0x8012
/* 06ECBC 8006E0BC 254A3518 */ addiu $t2, %lo(gLevelDefaultVehicleID) # addiu $t2, $t2, 0x3518
/* 06ECC0 8006E0C0 8C650000 */ lw $a1, ($v1)
/* 06ECC4 8006E0C4 8D040000 */ lw $a0, ($t0)
/* 06ECC8 8006E0C8 8D260000 */ lw $a2, ($t1)
@@ -342,9 +342,9 @@ glabel L8006E0E0
/* 06EDF8 8006E1F8 00403825 */ move $a3, $v0
/* 06EDFC 8006E1FC 3C188012 */ lui $t8, %hi(D_8012351C) # $t8, 0x8012
/* 06EE00 8006E200 8F18351C */ lw $t8, %lo(D_8012351C)($t8)
/* 06EE04 8006E204 3C0A8012 */ lui $t2, %hi(D_80123518) # $t2, 0x8012
/* 06EE04 8006E204 3C0A8012 */ lui $t2, %hi(gLevelDefaultVehicleID) # $t2, 0x8012
/* 06EE08 8006E208 3C018012 */ lui $at, %hi(D_801234FC) # $at, 0x8012
/* 06EE0C 8006E20C 254A3518 */ addiu $t2, %lo(D_80123518) # addiu $t2, $t2, 0x3518
/* 06EE0C 8006E20C 254A3518 */ addiu $t2, %lo(gLevelDefaultVehicleID) # addiu $t2, $t2, 0x3518
/* 06EE10 8006E210 AC2034FC */ sw $zero, %lo(D_801234FC)($at)
/* 06EE14 8006E214 10000030 */ b .L8006E2D8
/* 06EE18 8006E218 AD580000 */ sw $t8, ($t2)
@@ -371,9 +371,9 @@ glabel L8006E0E0
/* 06EE68 8006E268 AE180000 */ sw $t8, ($s0)
/* 06EE6C 8006E26C AC400004 */ sw $zero, 4($v0)
/* 06EE70 8006E270 AC590000 */ sw $t9, ($v0)
/* 06EE74 8006E274 3C0A8012 */ lui $t2, %hi(D_80123518) # $t2, 0x8012
/* 06EE74 8006E274 3C0A8012 */ lui $t2, %hi(gLevelDefaultVehicleID) # $t2, 0x8012
/* 06EE78 8006E278 3C018012 */ lui $at, %hi(sRenderContext) # $at, 0x8012
/* 06EE7C 8006E27C 254A3518 */ addiu $t2, %lo(D_80123518) # addiu $t2, $t2, 0x3518
/* 06EE7C 8006E27C 254A3518 */ addiu $t2, %lo(gLevelDefaultVehicleID) # addiu $t2, $t2, 0x3518
/* 06EE80 8006E280 AC2034EC */ sw $zero, %lo(sRenderContext)($at)
/* 06EE84 8006E284 8D460000 */ lw $a2, ($t2)
/* 06EE88 8006E288 8FA4002C */ lw $a0, 0x2c($sp)
asm/non_matchings/game/load_level.s
+1 -1
View File
@@ -433,7 +433,7 @@ glabel load_level
/* 06C484 8006B884 00000000 */ nop
/* 06C488 8006B888 19A00006 */ blez $t5, .L8006B8A4
/* 06C48C 8006B88C 00000000 */ nop
/* 06C490 8006B890 0C01B6CB */ jal func_8006DB2C
/* 06C490 8006B890 0C01B6CB */ jal get_level_default_vehicle
/* 06C494 8006B894 00000000 */ nop
/* 06C498 8006B898 3C01800E */ lui $at, %hi(D_800DD314) # $at, 0x800e
/* 06C49C 8006B89C 8FA30040 */ lw $v1, 0x40($sp)
asm/non_matchings/menu/func_80084854.s
+2 -2
View File
@@ -160,8 +160,8 @@ glabel func_80084854
/* 0856B0 80084AB0 24070007 */ li $a3, 7
/* 0856B4 80084AB4 3C06800E */ lui $a2, %hi(gSfxVolumeSliderValue) # $a2, 0x800e
/* 0856B8 80084AB8 8CC6FAC0 */ lw $a2, %lo(gSfxVolumeSliderValue)($a2)
/* 0856BC 80084ABC 3C10800E */ lui $s0, %hi(D_800E042C) # $s0, 0x800e
/* 0856C0 80084AC0 2610042C */ addiu $s0, %lo(D_800E042C) # addiu $s0, $s0, 0x42c
/* 0856BC 80084ABC 3C10800E */ lui $s0, %hi(gMenuSelectionArrowLeft) # $s0, 0x800e
/* 0856C0 80084AC0 2610042C */ addiu $s0, %lo(gMenuSelectionArrowLeft) # addiu $s0, $s0, 0x42c
/* 0856C4 80084AC4 240D00FF */ li $t5, 255
/* 0856C8 80084AC8 240E00FF */ li $t6, 255
/* 0856CC 80084ACC 240F00FF */ li $t7, 255
asm/non_matchings/menu/func_80085B9C.s
+2 -2
View File
@@ -109,14 +109,14 @@ glabel L80085C30
/* 086914 80085D14 8DEF0300 */ lw $t7, %lo(osTvType)($t7)
/* 086918 80085D18 00009025 */ move $s2, $zero
/* 08691C 80085D1C 15E00003 */ bnez $t7, .L80085D2C
/* 086920 80085D20 3C11800E */ lui $s1, %hi(D_800E043C) # $s1, 0x800e
/* 086920 80085D20 3C11800E */ lui $s1, %hi(gMenuSelectionArrowDown) # $s1, 0x800e
/* 086924 80085D24 10000002 */ b .L80085D30
/* 086928 80085D28 24100084 */ li $s0, 132
.L80085D2C:
/* 08692C 80085D2C 24100078 */ li $s0, 120
.L80085D30:
/* 086930 80085D30 8F1863BC */ lw $t8, %lo(D_801263BC)($t8)
/* 086934 80085D34 2631043C */ addiu $s1, %lo(D_800E043C) # addiu $s1, $s1, 0x43c
/* 086934 80085D34 2631043C */ addiu $s1, %lo(gMenuSelectionArrowDown) # addiu $s1, $s1, 0x43c
/* 086938 80085D38 3319001F */ andi $t9, $t8, 0x1f
/* 08693C 80085D3C 00195043 */ sra $t2, $t9, 1
/* 086940 80085D40 020A8021 */ addu $s0, $s0, $t2
asm/non_matchings/menu/func_8008F00C.s
+25 -25
View File
@@ -70,52 +70,52 @@ glabel func_8008F00C
/* 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 func_8008E45C
/* 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(D_800E04A4) # $v1, 0x800e
/* 08FD28 8008F128 3C04800E */ lui $a0, %hi(D_800E04BC) # $a0, 0x800e
/* 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(D_800E04BC) # addiu $a0, $a0, 0x4bc
/* 08FD40 8008F140 246304A4 */ addiu $v1, %lo(D_800E04A4) # addiu $v1, $v1, 0x4a4
/* 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(D_800E04D4) # $at, 0x800e
/* 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(D_800E04D4)($at)
/* 08FD5C 8008F15C AC2B04D4 */ sw $t3, %lo(gRaceSelectionCarOptHighlight)($at)
/* 08FD60 8008F160 8C4C0078 */ lw $t4, 0x78($v0)
/* 08FD64 8008F164 3C01800E */ lui $at, %hi(D_800E04E4) # $at, 0x800e
/* 08FD68 8008F168 AC2C04E4 */ sw $t4, %lo(D_800E04E4)($at)
/* 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(D_800E04F4) # $at, 0x800e
/* 08FD74 8008F174 AC2D04F4 */ sw $t5, %lo(D_800E04F4)($at)
/* 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(D_800E0504) # $at, 0x800e
/* 08FD80 8008F180 AC2E0504 */ sw $t6, %lo(D_800E0504)($at)
/* 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(D_800E0514) # $at, 0x800e
/* 08FD8C 8008F18C AC2F0514 */ sw $t7, %lo(D_800E0514)($at)
/* 08FD88 8008F188 3C01800E */ lui $at, %hi(gRaceSelectioPlaneOptHighlight) # $at, 0x800e
/* 08FD8C 8008F18C AC2F0514 */ sw $t7, %lo(gRaceSelectioPlaneOptHighlight)($at)
/* 08FD90 8008F190 8C580088 */ lw $t8, 0x88($v0)
/* 08FD94 8008F194 3C01800E */ lui $at, %hi(D_800E0524) # $at, 0x800e
/* 08FD98 8008F198 AC380524 */ sw $t8, %lo(D_800E0524)($at)
/* 08FD94 8008F194 3C01800E */ lui $at, %hi(gRaceSelectioPlaneOpt) # $at, 0x800e
/* 08FD98 8008F198 AC380524 */ sw $t8, %lo(gRaceSelectioPlaneOpt)($at)
/* 08FD9C 8008F19C 8C5900A0 */ lw $t9, 0xa0($v0)
/* 08FDA0 8008F1A0 3C01800E */ lui $at, %hi(D_800E0534) # $at, 0x800e
/* 08FDA4 8008F1A4 AC390534 */ sw $t9, %lo(D_800E0534)($at)
/* 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(D_800E0544) # $at, 0x800e
/* 08FDB0 8008F1B0 AC280544 */ sw $t0, %lo(D_800E0544)($at)
/* 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(D_800E0554) # $at, 0x800e
/* 08FDBC 8008F1BC AC290554 */ sw $t1, %lo(D_800E0554)($at)
/* 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(D_800E0564) # $at, 0x800e
/* 08FDC8 8008F1C8 AC2A0564 */ sw $t2, %lo(D_800E0564)($at)
/* 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(D_800E0574) # $at, 0x800e
/* 08FDD4 8008F1D4 AC2B0574 */ sw $t3, %lo(D_800E0574)($at)
asm/non_matchings/menu/func_8008FA54.s
+2 -2
View File
@@ -280,8 +280,8 @@ glabel func_8008FA54
/* 090A54 8008FE54 032A8021 */ addu $s0, $t9, $t2
/* 090A58 8008FE58 860B0000 */ lh $t3, ($s0)
/* 090A5C 8008FE5C 860C0002 */ lh $t4, 2($s0)
/* 090A60 8008FE60 3C08800E */ lui $t0, %hi(D_800E0678) # $t0, 0x800e
/* 090A64 8008FE64 25080678 */ addiu $t0, %lo(D_800E0678) # addiu $t0, $t0, 0x678
/* 090A60 8008FE60 3C08800E */ lui $t0, %hi(gMenuSelectionArrows) # $t0, 0x800e
/* 090A64 8008FE64 25080678 */ addiu $t0, %lo(gMenuSelectionArrows) # addiu $t0, $t0, 0x678
/* 090A68 8008FE68 0011C080 */ sll $t8, $s1, 2
/* 090A6C 8008FE6C 03089021 */ addu $s2, $t8, $t0
/* 090A70 8008FE70 8E450000 */ lw $a1, ($s2)
asm/non_matchings/menu/func_800904E8.s
+1 -1
View File
@@ -200,7 +200,7 @@ glabel func_800904E8
/* 0913CC 800907CC 3C018012 */ lui $at, %hi(D_801269F8) # $at, 0x8012
/* 0913D0 800907D0 0C01AC2B */ jal func_8006B0AC
/* 0913D4 800907D4 AC2B69F8 */ sw $t3, %lo(D_801269F8)($at)
/* 0913D8 800907D8 0C01B6C5 */ jal func_8006DB14
/* 0913D8 800907D8 0C01B6C5 */ jal set_level_default_vehicle
/* 0913DC 800907DC 00402025 */ move $a0, $v0
/* 0913E0 800907E0 3C038012 */ lui $v1, %hi(D_801269DC) # $v1, 0x8012
/* 0913E4 800907E4 3C088012 */ lui $t0, %hi(D_801269E4) # $t0, 0x8012
asm/non_matchings/menu/func_80092188.s
+1 -1
View File
@@ -702,7 +702,7 @@ glabel L8009287C
.L80092B68:
/* 093768 80092B68 3C048012 */ lui $a0, %hi(gPlayerSelectVehicle) # $a0, 0x8012
/* 09376C 80092B6C 808469C0 */ lb $a0, %lo(gPlayerSelectVehicle)($a0)
/* 093770 80092B70 0C01B6C5 */ jal func_8006DB14
/* 093770 80092B70 0C01B6C5 */ jal set_level_default_vehicle
/* 093774 80092B74 00000000 */ nop
/* 093778 80092B78 3C0E800E */ lui $t6, %hi(gNumberOfActivePlayers) # $t6, 0x800e
/* 09377C 80092B7C 8DCEF4BC */ lw $t6, %lo(gNumberOfActivePlayers)($t6)
asm/non_matchings/menu/func_80092E94.s
+4 -4
View File
@@ -316,8 +316,8 @@ glabel func_80092E94
/* 093F64 80093364 3C198012 */ lui $t9, %hi(gPlayerSelectVehicle) # $t9, 0x8012
/* 093F68 80093368 833969C0 */ lb $t9, %lo(gPlayerSelectVehicle)($t9)
/* 093F6C 8009336C 01104023 */ subu $t0, $t0, $s0
/* 093F70 80093370 3C18800E */ lui $t8, %hi(D_800E0624) # $t8, 0x800e
/* 093F74 80093374 27180624 */ addiu $t8, %lo(D_800E0624) # addiu $t8, $t8, 0x624
/* 093F70 80093370 3C18800E */ lui $t8, %hi(gRaceSelectionImages) # $t8, 0x800e
/* 093F74 80093374 27180624 */ addiu $t8, %lo(gRaceSelectionImages) # addiu $t8, $t8, 0x624
/* 093F78 80093378 00086880 */ sll $t5, $t0, 2
/* 093F7C 8009337C 16190010 */ bne $s0, $t9, .L800933C0
/* 093F80 80093380 01B81821 */ addu $v1, $t5, $t8
@@ -366,9 +366,9 @@ glabel func_80092E94
/* 094020 80093420 00026880 */ sll $t5, $v0, 2
/* 094024 80093424 01A26823 */ subu $t5, $t5, $v0
/* 094028 80093428 000DC080 */ sll $t8, $t5, 2
/* 09402C 8009342C 3C05800E */ lui $a1, %hi(D_800E0624) # $a1, 0x800e
/* 09402C 8009342C 3C05800E */ lui $a1, %hi(gRaceSelectionImages) # $a1, 0x800e
/* 094030 80093430 00B82821 */ addu $a1, $a1, $t8
/* 094034 80093434 8CA50624 */ lw $a1, %lo(D_800E0624)($a1)
/* 094034 80093434 8CA50624 */ lw $a1, %lo(gRaceSelectionImages)($a1)
/* 094038 80093438 241900FF */ li $t9, 255
/* 09403C 8009343C 240900FF */ li $t1, 255
/* 094040 80093440 240E00FF */ li $t6, 255
asm/non_matchings/menu/func_80094A5C.s
+1 -1
View File
@@ -21,7 +21,7 @@ glabel func_80094A5C
/* 0956A4 80094AA4 3C04800E */ lui $a0, %hi(D_800E0A40) # $a0, 0x800e
/* 0956A8 80094AA8 0C027229 */ jal allocate_menu_images
/* 0956AC 80094AAC 24840A40 */ addiu $a0, %lo(D_800E0A40) # addiu $a0, $a0, 0xa40
/* 0956B0 80094AB0 0C025181 */ jal func_80094604
/* 0956B0 80094AB0 0C025181 */ jal assign_racer_portrait_textures
/* 0956B4 80094AB4 00000000 */ nop
/* 0956B8 80094AB8 0C01BAA4 */ jal get_settings
/* 0956BC 80094ABC 00000000 */ nop
asm/non_matchings/menu/func_80099E8C.s
+10 -10
View File
@@ -314,16 +314,16 @@ glabel func_80099E8C
/* 09AF28 8009A328 240FFFFF */ li $t7, -1
/* 09AF2C 8009A32C 24010002 */ li $at, 2
/* 09AF30 8009A330 10410007 */ beq $v0, $at, .L8009A350
/* 09AF34 8009A334 3C05800E */ lui $a1, %hi(D_800E048C) # $a1, 0x800e
/* 09AF38 8009A338 3C05800E */ lui $a1, %hi(D_800E045C) # $a1, 0x800e
/* 09AF34 8009A334 3C05800E */ lui $a1, %hi(gRaceSelectionPlaneTex) # $a1, 0x800e
/* 09AF38 8009A338 3C05800E */ lui $a1, %hi(gRaceSelectionCarTex) # $a1, 0x800e
/* 09AF3C 8009A33C 10000005 */ b .L8009A354
/* 09AF40 8009A340 24A5045C */ addiu $a1, %lo(D_800E045C) # addiu $a1, $a1, 0x45c
/* 09AF40 8009A340 24A5045C */ addiu $a1, %lo(gRaceSelectionCarTex) # addiu $a1, $a1, 0x45c
.L8009A344:
/* 09AF44 8009A344 3C05800E */ lui $a1, %hi(D_800E0474) # $a1, 0x800e
/* 09AF44 8009A344 3C05800E */ lui $a1, %hi(gRaceSelectionHoverTex) # $a1, 0x800e
/* 09AF48 8009A348 10000002 */ b .L8009A354
/* 09AF4C 8009A34C 24A50474 */ addiu $a1, %lo(D_800E0474) # addiu $a1, $a1, 0x474
/* 09AF4C 8009A34C 24A50474 */ addiu $a1, %lo(gRaceSelectionHoverTex) # addiu $a1, $a1, 0x474
.L8009A350:
/* 09AF50 8009A350 24A5048C */ addiu $a1, %lo(D_800E048C) # addiu $a1, $a1, 0x48c
/* 09AF50 8009A350 24A5048C */ addiu $a1, %lo(gRaceSelectionPlaneTex) # addiu $a1, $a1, 0x48c
.L8009A354:
/* 09AF54 8009A354 862B0008 */ lh $t3, 8($s1)
/* 09AF58 8009A358 862D000A */ lh $t5, 0xa($s1)
@@ -551,8 +551,8 @@ glabel func_80099E8C
/* 09B2B8 8009A6B8 244C0003 */ addiu $t4, $v0, 3
/* 09B2BC 8009A6BC 018B082A */ slt $at, $t4, $t3
/* 09B2C0 8009A6C0 1020001C */ beqz $at, .L8009A734
/* 09B2C4 8009A6C4 3C10800E */ lui $s0, %hi(D_800E043C) # $s0, 0x800e
/* 09B2C8 8009A6C8 2610043C */ addiu $s0, %lo(D_800E043C) # addiu $s0, $s0, 0x43c
/* 09B2C4 8009A6C4 3C10800E */ lui $s0, %hi(gMenuSelectionArrowDown) # $s0, 0x800e
/* 09B2C8 8009A6C8 2610043C */ addiu $s0, %lo(gMenuSelectionArrowDown) # addiu $s0, $s0, 0x43c
/* 09B2CC 8009A6CC 240D0080 */ li $t5, 128
/* 09B2D0 8009A6D0 AFAD001C */ sw $t5, 0x1c($sp)
/* 09B2D4 8009A6D4 02002825 */ move $a1, $s0
@@ -581,8 +581,8 @@ glabel func_80099E8C
/* 09B330 8009A730 00000000 */ nop
.L8009A734:
/* 09B334 8009A734 18400019 */ blez $v0, .L8009A79C
/* 09B338 8009A738 3C10800E */ lui $s0, %hi(D_800E041C) # $s0, 0x800e
/* 09B33C 8009A73C 2610041C */ addiu $s0, %lo(D_800E041C) # addiu $s0, $s0, 0x41c
/* 09B338 8009A738 3C10800E */ lui $s0, %hi(gMenuSelectionArrowUp) # $s0, 0x800e
/* 09B33C 8009A73C 2610041C */ addiu $s0, %lo(gMenuSelectionArrowUp) # addiu $s0, $s0, 0x41c
/* 09B340 8009A740 24090080 */ li $t1, 128
/* 09B344 8009A744 AFA9001C */ sw $t1, 0x1c($sp)
/* 09B348 8009A748 02002825 */ move $a1, $s0
asm/non_matchings/menu/menu_credits_loop.s
+2 -2
View File
@@ -50,7 +50,7 @@ glabel menu_credits_loop
/* 09BFD4 8009B3D4 AFB90010 */ sw $t9, 0x10($sp)
/* 09BFD8 8009B3D8 24050026 */ li $a1, 38
/* 09BFDC 8009B3DC 24060140 */ li $a2, 320
/* 09BFE0 8009B3E0 0C026C79 */ jal func_8009B1E4
/* 09BFE0 8009B3E0 0C026C79 */ jal render_credits_fade
/* 09BFE4 8009B3E4 240700BA */ li $a3, 186
/* 09BFE8 8009B3E8 10000008 */ b .L8009B40C
/* 09BFEC 8009B3EC 00000000 */ nop
@@ -60,7 +60,7 @@ glabel menu_credits_loop
/* 09BFF8 8009B3F8 24060140 */ li $a2, 320
/* 09BFFC 8009B3FC 000950C0 */ sll $t2, $t1, 3
/* 09C000 8009B400 AFAA0010 */ sw $t2, 0x10($sp)
/* 09C004 8009B404 0C026C79 */ jal func_8009B1E4
/* 09C004 8009B404 0C026C79 */ jal render_credits_fade
/* 09C008 8009B408 2407009C */ li $a3, 156
.L8009B40C:
/* 09C00C 8009B40C 3C068012 */ lui $a2, %hi(D_801263D8) # $a2, 0x8012
asm/non_matchings/menu/menu_ghost_data_init.s
+2 -2
View File
@@ -230,9 +230,9 @@ glabel menu_ghost_data_init
/* 09A9E8 80099DE8 8FAF0048 */ lw $t7, 0x48($sp)
/* 09A9EC 80099DEC AC980040 */ sw $t8, 0x40($a0)
/* 09A9F0 80099DF0 00F6C021 */ addu $t8, $a3, $s6
/* 09A9F4 80099DF4 0C023917 */ jal func_8008E45C
/* 09A9F4 80099DF4 0C023917 */ jal assign_vehicle_icon_textures
/* 09A9F8 80099DF8 AF0F0018 */ sw $t7, 0x18($t8)
/* 09A9FC 80099DFC 0C025181 */ jal func_80094604
/* 09A9FC 80099DFC 0C025181 */ jal assign_racer_portrait_textures
/* 09AA00 80099E00 00000000 */ nop
/* 09AA04 80099E04 0C02392C */ jal func_8008E4B0
/* 09AA08 80099E08 00000000 */ nop
asm/non_matchings/menu/menu_trophy_race_rankings_init.s
+1 -1
View File
@@ -77,7 +77,7 @@ glabel menu_trophy_race_rankings_init
.L80098B44:
/* 099744 80098B44 3C018012 */ lui $at, %hi(D_80126A68) # $at, 0x8012
/* 099748 80098B48 AC206A68 */ sw $zero, %lo(D_80126A68)($at)
/* 09974C 80098B4C 0C025181 */ jal func_80094604
/* 09974C 80098B4C 0C025181 */ jal assign_racer_portrait_textures
/* 099750 80098B50 AFA90040 */ sw $t1, 0x40($sp)
/* 099754 80098B54 3C0B800E */ lui $t3, %hi(gNumberOfActivePlayers) # $t3, 0x800e
/* 099758 80098B58 256BF4BC */ addiu $t3, %lo(gNumberOfActivePlayers) # addiu $t3, $t3, -0xb44
asm/non_matchings/menu/menu_trophy_race_round_init.s
+1 -1
View File
@@ -64,7 +64,7 @@ glabel menu_trophy_race_round_init
.L80098350:
/* 098F50 80098350 0C01AC2B */ jal func_8006B0AC
/* 098F54 80098354 02002025 */ move $a0, $s0
/* 098F58 80098358 0C01B6C5 */ jal func_8006DB14
/* 098F58 80098358 0C01B6C5 */ jal set_level_default_vehicle
/* 098F5C 8009835C 00402025 */ move $a0, $v0
/* 098F60 80098360 02002025 */ move $a0, $s0
/* 098F64 80098364 2405FFFF */ li $a1, -1
asm/non_matchings/menu/render_file_select_menu.s
+8 -8
View File
@@ -27,14 +27,14 @@ glabel render_file_select_menu
/* 08D9D0 8008CDD0 0C019FCB */ jal func_80067F2C
/* 08D9D4 8008CDD4 02E02025 */ move $a0, $s7
/* 08D9D8 8008CDD8 3C118012 */ lui $s1, %hi(gSavefileInfo) # $s1, 0x8012
/* 08D9DC 8008CDDC 3C10800E */ lui $s0, %hi(D_800E03CC) # $s0, 0x800e
/* 08D9DC 8008CDDC 3C10800E */ lui $s0, %hi(gFileSelectButtons) # $s0, 0x800e
/* 08D9E0 8008CDE0 3C158012 */ lui $s5, %hi(D_80126550) # $s5, 0x8012
/* 08D9E4 8008CDE4 3C13B0E0 */ lui $s3, (0xB0E0C0FF >> 16) # lui $s3, 0xb0e0
/* 08D9E8 8008CDE8 3C12800E */ lui $s2, %hi(gIsInAdventureTwo) # $s2, 0x800e
/* 08D9EC 8008CDEC 2652F494 */ addiu $s2, %lo(gIsInAdventureTwo) # addiu $s2, $s2, -0xb6c
/* 08D9F0 8008CDF0 3673C0FF */ ori $s3, (0xB0E0C0FF & 0xFFFF) # ori $s3, $s3, 0xc0ff
/* 08D9F4 8008CDF4 26B56550 */ addiu $s5, %lo(D_80126550) # addiu $s5, $s5, 0x6550
/* 08D9F8 8008CDF8 261003CC */ addiu $s0, %lo(D_800E03CC) # addiu $s0, $s0, 0x3cc
/* 08D9F8 8008CDF8 261003CC */ addiu $s0, %lo(gFileSelectButtons) # addiu $s0, $s0, 0x3cc
/* 08D9FC 8008CDFC 263164A0 */ addiu $s1, %lo(gSavefileInfo) # addiu $s1, $s1, 0x64a0
/* 08DA00 8008CE00 24140078 */ li $s4, 120
.L8008CE04:
@@ -87,12 +87,12 @@ glabel render_file_select_menu
/* 08DAB4 8008CEB4 0C0310F3 */ jal set_text_background_colour
/* 08DAB8 8008CEB8 00003825 */ move $a3, $zero
/* 08DABC 8008CEBC 3C118012 */ lui $s1, %hi(gSavefileInfo) # $s1, 0x8012
/* 08DAC0 8008CEC0 3C10800E */ lui $s0, %hi(D_800E03CC) # $s0, 0x800e
/* 08DAC0 8008CEC0 3C10800E */ lui $s0, %hi(gFileSelectButtons) # $s0, 0x800e
/* 08DAC4 8008CEC4 3C14800E */ lui $s4, %hi(D_800E03FC) # $s4, 0x800e
/* 08DAC8 8008CEC8 3C13800E */ lui $s3, %hi(gMenuImageStack) # $s3, 0x800e
/* 08DACC 8008CECC 2673F75C */ addiu $s3, %lo(gMenuImageStack) # addiu $s3, $s3, -0x8a4
/* 08DAD0 8008CED0 269403FC */ addiu $s4, %lo(D_800E03FC) # addiu $s4, $s4, 0x3fc
/* 08DAD4 8008CED4 261003CC */ addiu $s0, %lo(D_800E03CC) # addiu $s0, $s0, 0x3cc
/* 08DAD4 8008CED4 261003CC */ addiu $s0, %lo(gFileSelectButtons) # addiu $s0, $s0, 0x3cc
/* 08DAD8 8008CED8 263164A0 */ addiu $s1, %lo(gSavefileInfo) # addiu $s1, $s1, 0x64a0
/* 08DADC 8008CEDC 2415000A */ li $s5, 10
.L8008CEE0:
@@ -316,8 +316,8 @@ glabel render_file_select_menu
.L8008D210:
/* 08DE10 8008D210 12400018 */ beqz $s2, .L8008D274
/* 08DE14 8008D214 02E02025 */ move $a0, $s7
/* 08DE18 8008D218 3C0D800E */ lui $t5, %hi(D_800E03CC) # $t5, 0x800e
/* 08DE1C 8008D21C 25AD03CC */ addiu $t5, %lo(D_800E03CC) # addiu $t5, $t5, 0x3cc
/* 08DE18 8008D218 3C0D800E */ lui $t5, %hi(gFileSelectButtons) # $t5, 0x800e
/* 08DE1C 8008D21C 25AD03CC */ addiu $t5, %lo(gFileSelectButtons) # addiu $t5, $t5, 0x3cc
/* 08DE20 8008D220 00136100 */ sll $t4, $s3, 4
/* 08DE24 8008D224 018D8021 */ addu $s0, $t4, $t5
/* 08DE28 8008D228 8FA2007C */ lw $v0, 0x7c($sp)
@@ -368,8 +368,8 @@ glabel render_file_select_menu
.L8008D2D4:
/* 08DED4 8008D2D4 12A00010 */ beqz $s5, .L8008D318
/* 08DED8 8008D2D8 02E02025 */ move $a0, $s7
/* 08DEDC 8008D2DC 3C18800E */ lui $t8, %hi(D_800E03CC) # $t8, 0x800e
/* 08DEE0 8008D2E0 271803CC */ addiu $t8, %lo(D_800E03CC) # addiu $t8, $t8, 0x3cc
/* 08DEDC 8008D2DC 3C18800E */ lui $t8, %hi(gFileSelectButtons) # $t8, 0x800e
/* 08DEE0 8008D2E0 271803CC */ addiu $t8, %lo(gFileSelectButtons) # addiu $t8, $t8, 0x3cc
/* 08DEE4 8008D2E4 00137900 */ sll $t7, $s3, 4
/* 08DEE8 8008D2E8 01F88021 */ addu $s0, $t7, $t8
/* 08DEEC 8008D2EC 860A0002 */ lh $t2, 2($s0)
asm/non_matchings/menu/render_magic_codes_list_menu_text.s
+2 -2
View File
@@ -212,7 +212,7 @@ glabel render_magic_codes_list_menu_text
/* 08B488 8008A888 02A02025 */ move $a0, $s5
/* 08B48C 8008A88C 31AE0008 */ andi $t6, $t5, 8
/* 08B490 8008A890 11C0000D */ beqz $t6, .L8008A8C8
/* 08B494 8008A894 3C05800E */ lui $a1, %hi(D_800E043C) # $a1, 0x800e
/* 08B494 8008A894 3C05800E */ lui $a1, %hi(gMenuSelectionArrowDown) # $a1, 0x800e
/* 08B498 8008A898 240F00FF */ li $t7, 255
/* 08B49C 8008A89C 241800FF */ li $t8, 255
/* 08B4A0 8008A8A0 241900FF */ li $t9, 255
@@ -221,7 +221,7 @@ glabel render_magic_codes_list_menu_text
/* 08B4AC 8008A8AC AFB90018 */ sw $t9, 0x18($sp)
/* 08B4B0 8008A8B0 AFB80014 */ sw $t8, 0x14($sp)
/* 08B4B4 8008A8B4 AFAF0010 */ sw $t7, 0x10($sp)
/* 08B4B8 8008A8B8 24A5043C */ addiu $a1, %lo(D_800E043C) # addiu $a1, $a1, 0x43c
/* 08B4B8 8008A8B8 24A5043C */ addiu $a1, %lo(gMenuSelectionArrowDown) # addiu $a1, $a1, 0x43c
/* 08B4BC 8008A8BC 240600A0 */ li $a2, 160
/* 08B4C0 8008A8C0 0C01E2AE */ jal render_textured_rectangle
/* 08B4C4 8008A8C4 26470008 */ addiu $a3, $s2, 8
asm/non_matchings/menu/render_track_select_setup_ui.s
+8 -8
View File
@@ -659,10 +659,10 @@ glabel render_track_select_setup_ui
/* 0924D4 800918D4 0000A025 */ move $s4, $zero
/* 0924D8 800918D8 00154880 */ sll $t1, $s5, 2
/* 0924DC 800918DC 01354823 */ subu $t1, $t1, $s5
/* 0924E0 800918E0 3C0A800E */ lui $t2, %hi(D_800E0624) # $t2, 0x800e
/* 0924E0 800918E0 3C0A800E */ lui $t2, %hi(gRaceSelectionImages) # $t2, 0x800e
/* 0924E4 800918E4 3C0C800E */ lui $t4, %hi(D_800E06B0) # $t4, 0x800e
/* 0924E8 800918E8 258C06B0 */ addiu $t4, %lo(D_800E06B0) # addiu $t4, $t4, 0x6b0
/* 0924EC 800918EC 254A0624 */ addiu $t2, %lo(D_800E0624) # addiu $t2, $t2, 0x624
/* 0924EC 800918EC 254A0624 */ addiu $t2, %lo(gRaceSelectionImages) # addiu $t2, $t2, 0x624
/* 0924F0 800918F0 00094080 */ sll $t0, $t1, 2
/* 0924F4 800918F4 3C118012 */ lui $s1, %hi(gPlayerSelectVehicle) # $s1, 0x8012
/* 0924F8 800918F8 00135840 */ sll $t3, $s3, 1
@@ -767,8 +767,8 @@ glabel render_track_select_setup_ui
/* 092660 80091A60 17000019 */ bnez $t8, .L80091AC8
/* 092664 80091A64 00000000 */ nop
/* 092668 80091A68 00760019 */ multu $v1, $s6
/* 09266C 80091A6C 3C11800E */ lui $s1, %hi(D_800E0624) # $s1, 0x800e
/* 092670 80091A70 26310624 */ addiu $s1, %lo(D_800E0624) # addiu $s1, $s1, 0x624
/* 09266C 80091A6C 3C11800E */ lui $s1, %hi(gRaceSelectionImages) # $s1, 0x800e
/* 092670 80091A70 26310624 */ addiu $s1, %lo(gRaceSelectionImages) # addiu $s1, $s1, 0x624
/* 092674 80091A74 8FCB0000 */ lw $t3, ($fp)
/* 092678 80091A78 3C048012 */ lui $a0, %hi(sMenuCurrDisplayList) # $a0, 0x8012
/* 09267C 80091A7C 240900FF */ li $t1, 255
@@ -816,10 +816,10 @@ glabel render_track_select_setup_ui
/* 092720 80091B20 8C42F4BC */ lw $v0, %lo(gNumberOfActivePlayers)($v0)
/* 092724 80091B24 00000000 */ nop
.L80091B28:
/* 092728 80091B28 3C11800E */ lui $s1, %hi(D_800E0624) # $s1, 0x800e
/* 092728 80091B28 3C11800E */ lui $s1, %hi(gRaceSelectionImages) # $s1, 0x800e
/* 09272C 80091B2C 24010002 */ li $at, 2
/* 092730 80091B30 14410031 */ bne $v0, $at, .L80091BF8
/* 092734 80091B34 26310624 */ addiu $s1, %lo(D_800E0624) # addiu $s1, $s1, 0x624
/* 092734 80091B34 26310624 */ addiu $s1, %lo(gRaceSelectionImages) # addiu $s1, $s1, 0x624
/* 092738 80091B38 8FAA0074 */ lw $t2, 0x74($sp)
/* 09273C 80091B3C 3C088012 */ lui $t0, %hi(gPlayerSelectVehicle) # $t0, 0x8012
/* 092740 80091B40 1540002D */ bnez $t2, .L80091BF8
@@ -923,8 +923,8 @@ glabel render_track_select_setup_ui
/* 0928B4 80091CB4 8DA40220 */ lw $a0, 0x220($t5)
/* 0928B8 80091CB8 0C031368 */ jal func_800C4DA0
/* 0928BC 80091CBC 00003025 */ move $a2, $zero
/* 0928C0 80091CC0 3C12800E */ lui $s2, %hi(D_800E06E4) # $s2, 0x800e
/* 0928C4 80091CC4 265206E4 */ addiu $s2, %lo(D_800E06E4) # addiu $s2, $s2, 0x6e4
/* 0928C0 80091CC0 3C12800E */ lui $s2, %hi(gTwoPlayerRacerCountMenu) # $s2, 0x800e
/* 0928C4 80091CC4 265206E4 */ addiu $s2, %lo(gTwoPlayerRacerCountMenu) # addiu $s2, $s2, 0x6e4
/* 0928C8 80091CC8 86430004 */ lh $v1, 4($s2)
/* 0928CC 80091CCC 3C048012 */ lui $a0, %hi(sMenuCurrDisplayList) # $a0, 0x8012
/* 0928D0 80091CD0 2478FFF4 */ addiu $t8, $v1, -0xc
asm/non_matchings/objects/func_8000E2B4.s
+1 -1
View File
@@ -47,7 +47,7 @@ glabel func_8000E2B4
/* 00EF44 8000E344 8463C802 */ lh $v1, %lo(D_800DC7B8+0x4A)/*-0x37fe*/($v1)
/* 00EF48 8000E348 00000000 */ nop
.L8000E34C:
/* 00EF4C 8000E34C 0C01B6C5 */ jal func_8006DB14
/* 00EF4C 8000E34C 0C01B6C5 */ jal set_level_default_vehicle
/* 00EF50 8000E350 A7A30022 */ sh $v1, 0x22($sp)
/* 00EF54 8000E354 87A30022 */ lh $v1, 0x22($sp)
/* 00EF58 8000E358 93AD002D */ lbu $t5, 0x2d($sp)
include/structs.h
+3 -3
View File
@@ -25,11 +25,11 @@ typedef struct Vec3f {
/* Size: 0x20 bytes */
typedef struct MenuElement {
// Element Position
/* 0x00 */ s16 left;
/* 0x00 */ s16 left; // Where the element spawns on entry.
/* 0x02 */ s16 top;
/* 0x04 */ s16 center;
/* 0x04 */ s16 center; // Value of where the element moves to after entry
/* 0x06 */ s16 middle;
/* 0x08 */ s16 right;
/* 0x08 */ s16 right; // Value of where the element moves to after exit
/* 0x0A */ s16 bottom;
// Element Color/Transparency
/* 0x0C */ u8 filterRed;

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