diff --git a/asm/non_matchings/audio/func_8000232C.s b/asm/non_matchings/audio/func_8000232C.s index 2d94b554..8cf865db 100644 --- a/asm/non_matchings/audio/func_8000232C.s +++ b/asm/non_matchings/audio/func_8000232C.s @@ -55,7 +55,7 @@ glabel func_8000232C /* 003000 80002400 00007812 */ mflo $t7 /* 003004 80002404 01AFC021 */ addu $t8, $t5, $t7 /* 003008 80002408 93040000 */ lbu $a0, ($t8) -/* 00300C 8000240C 0C000664 */ jal musicSetRelativeVolume +/* 00300C 8000240C 0C000664 */ jal set_relative_volume_for_music /* 003010 80002410 00000000 */ nop /* 003014 80002414 92790000 */ lbu $t9, ($s3) /* 003018 80002418 8E020000 */ lw $v0, ($s0) diff --git a/asm/non_matchings/menu/MenuBootLoop.s b/asm/non_matchings/menu/MenuBootLoop.s index 01220f59..6027bf97 100644 --- a/asm/non_matchings/menu/MenuBootLoop.s +++ b/asm/non_matchings/menu/MenuBootLoop.s @@ -19,7 +19,7 @@ glabel menu_boot_loop /* 08924C 8008864C 3C038012 */ lui $v1, %hi(D_80126C18) # $v1, 0x8012 /* 089250 80088650 24010002 */ li $at, 2 /* 089254 80088654 10410030 */ beq $v0, $at, .L80088718 -/* 089258 80088658 3C0C800E */ lui $t4, %hi(D_800DF47C) # $t4, 0x800e +/* 089258 80088658 3C0C800E */ lui $t4, %hi(gMenuDelay) # $t4, 0x800e /* 08925C 8008865C 10000043 */ b .L8008876C /* 089260 80088660 28E1012C */ slti $at, $a3, 0x12c .L80088664: @@ -73,7 +73,7 @@ glabel menu_boot_loop /* 089310 80088710 10000015 */ b .L80088768 /* 089314 80088714 2407012C */ li $a3, 300 .L80088718: -/* 089318 80088718 8D8CF47C */ lw $t4, %lo(D_800DF47C)($t4) +/* 089318 80088718 8D8CF47C */ lw $t4, %lo(gMenuDelay)($t4) /* 08931C 8008871C 00000000 */ nop /* 089320 80088720 1180000C */ beqz $t4, .L80088754 /* 089324 80088724 2407012C */ li $a3, 300 diff --git a/asm/non_matchings/menu/func_80081218.s b/asm/non_matchings/menu/func_80081218.s index 7e12e3cb..672a7f10 100644 --- a/asm/non_matchings/menu/func_80081218.s +++ b/asm/non_matchings/menu/func_80081218.s @@ -78,8 +78,8 @@ glabel func_80081218 /* 081F48 80081348 01C65821 */ addu $t3, $t6, $a2 /* 081F4C 8008134C 0C0078A7 */ jal func_8001E29C /* 081F50 80081350 ADAB0000 */ sw $t3, ($t5) -/* 081F54 80081354 3C038012 */ lui $v1, %hi(D_80126C30) # $v1, 0x8012 -/* 081F58 80081358 24636C30 */ addiu $v1, %lo(D_80126C30) # addiu $v1, $v1, 0x6c30 +/* 081F54 80081354 3C038012 */ lui $v1, %hi(gCheatsAssetData) # $v1, 0x8012 +/* 081F58 80081358 24636C30 */ addiu $v1, %lo(gCheatsAssetData) # addiu $v1, $v1, 0x6c30 /* 081F5C 8008135C AC620000 */ sw $v0, ($v1) /* 081F60 80081360 94580000 */ lhu $t8, ($v0) /* 081F64 80081364 3C018012 */ lui $at, %hi(D_80126C38) # $at, 0x8012 diff --git a/asm/non_matchings/menu/func_80081F4C.s b/asm/non_matchings/menu/func_80081F4C.s index c37ee0f6..e26f14cb 100644 --- a/asm/non_matchings/menu/func_80081F4C.s +++ b/asm/non_matchings/menu/func_80081F4C.s @@ -21,20 +21,20 @@ glabel func_80081F4C /* 082B98 80081F98 AFAE0040 */ sw $t6, 0x40($sp) /* 082B9C 80081F9C 12C70086 */ beq $s6, $a3, .L800821B8 /* 082BA0 80081FA0 00008825 */ move $s1, $zero -/* 082BA4 80081FA4 3C0F8012 */ lui $t7, %hi(D_801263C4) # $t7, 0x8012 -/* 082BA8 80081FA8 8DEF63C4 */ lw $t7, %lo(D_801263C4)($t7) -/* 082BAC 80081FAC 3C18800E */ lui $t8, %hi(D_800DF4BC) # $t8, 0x800e +/* 082BA4 80081FA4 3C0F8012 */ lui $t7, %hi(gIgnorePlayerInput) # $t7, 0x8012 +/* 082BA8 80081FA8 8DEF63C4 */ lw $t7, %lo(gIgnorePlayerInput)($t7) +/* 082BAC 80081FAC 3C18800E */ lui $t8, %hi(gNumberOfActivePlayers) # $t8, 0x800e /* 082BB0 80081FB0 15E0000F */ bnez $t7, .L80081FF0 /* 082BB4 80081FB4 00000000 */ nop -/* 082BB8 80081FB8 8F18F4BC */ lw $t8, %lo(D_800DF4BC)($t8) +/* 082BB8 80081FB8 8F18F4BC */ lw $t8, %lo(gNumberOfActivePlayers)($t8) /* 082BBC 80081FBC 00008025 */ move $s0, $zero /* 082BC0 80081FC0 1B00000B */ blez $t8, .L80081FF0 /* 082BC4 80081FC4 00000000 */ nop .L80081FC8: -/* 082BC8 80081FC8 0C01A955 */ jal func_8006A554 +/* 082BC8 80081FC8 0C01A955 */ jal get_button_inputs_from_player /* 082BCC 80081FCC 02002025 */ move $a0, $s0 -/* 082BD0 80081FD0 3C19800E */ lui $t9, %hi(D_800DF4BC) # $t9, 0x800e -/* 082BD4 80081FD4 8F39F4BC */ lw $t9, %lo(D_800DF4BC)($t9) +/* 082BD0 80081FD0 3C19800E */ lui $t9, %hi(gNumberOfActivePlayers) # $t9, 0x800e +/* 082BD4 80081FD4 8F39F4BC */ lw $t9, %lo(gNumberOfActivePlayers)($t9) /* 082BD8 80081FD8 26100001 */ addiu $s0, $s0, 1 /* 082BDC 80081FDC 0219082A */ slt $at, $s0, $t9 /* 082BE0 80081FE0 1420FFF9 */ bnez $at, .L80081FC8 diff --git a/asm/non_matchings/menu/func_8008377C.s b/asm/non_matchings/menu/func_8008377C.s index e82c97f2..2317e23c 100644 --- a/asm/non_matchings/menu/func_8008377C.s +++ b/asm/non_matchings/menu/func_8008377C.s @@ -95,8 +95,8 @@ glabel func_8008377C /* 0844E4 800838E4 3C18800E */ lui $t8, %hi(D_800DF7A4) # $t8, 0x800e /* 0844E8 800838E8 2718F7A4 */ addiu $t8, %lo(D_800DF7A4) # addiu $t8, $t8, -0x85c /* 0844EC 800838EC 3C148012 */ lui $s4, %hi(D_801263BC) # $s4, 0x8012 -/* 0844F0 800838F0 3C13800E */ lui $s3, %hi(D_800DF45C) # $s3, 0x800e -/* 0844F4 800838F4 2673F45C */ addiu $s3, %lo(D_800DF45C) # addiu $s3, $s3, -0xba4 +/* 0844F0 800838F0 3C13800E */ lui $s3, %hi(gTitleScreenCurrentOption) # $s3, 0x800e +/* 0844F4 800838F4 2673F45C */ addiu $s3, %lo(gTitleScreenCurrentOption) # addiu $s3, $s3, -0xba4 /* 0844F8 800838F8 269463BC */ addiu $s4, %lo(D_801263BC) # addiu $s4, $s4, 0x63bc /* 0844FC 800838FC 01F88021 */ addu $s0, $t7, $t8 /* 084500 80083900 241501FF */ li $s5, 511 diff --git a/asm/non_matchings/menu/func_80084854.s b/asm/non_matchings/menu/func_80084854.s index 98262e89..813324e0 100644 --- a/asm/non_matchings/menu/func_80084854.s +++ b/asm/non_matchings/menu/func_80084854.s @@ -158,8 +158,8 @@ glabel func_80084854 /* 0856A8 80084AA8 00003025 */ move $a2, $zero /* 0856AC 80084AAC 0C0316D6 */ jal func_800C5B58 /* 0856B0 80084AB0 24070007 */ li $a3, 7 -/* 0856B4 80084AB4 3C06800E */ lui $a2, %hi(D_800DFAC0) # $a2, 0x800e -/* 0856B8 80084AB8 8CC6FAC0 */ lw $a2, %lo(D_800DFAC0)($a2) +/* 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 /* 0856C4 80084AC4 240D00FF */ li $t5, 255 @@ -176,8 +176,8 @@ glabel func_80084854 /* 0856F0 80084AF0 02402025 */ move $a0, $s2 /* 0856F4 80084AF4 0C01E2AE */ jal func_80078AB8 /* 0856F8 80084AF8 24070078 */ li $a3, 120 -/* 0856FC 80084AFC 3C06800E */ lui $a2, %hi(D_800DFAC4) # $a2, 0x800e -/* 085700 80084B00 8CC6FAC4 */ lw $a2, %lo(D_800DFAC4)($a2) +/* 0856FC 80084AFC 3C06800E */ lui $a2, %hi(gMusicVolumeSliderValue) # $a2, 0x800e +/* 085700 80084B00 8CC6FAC4 */ lw $a2, %lo(gMusicVolumeSliderValue)($a2) /* 085704 80084B04 240800FF */ li $t0, 255 /* 085708 80084B08 240900FF */ li $t1, 255 /* 08570C 80084B0C 240B00FF */ li $t3, 255 @@ -205,13 +205,13 @@ glabel func_80084854 /* 085764 80084B64 29810005 */ slti $at, $t4, 5 /* 085768 80084B68 10200005 */ beqz $at, .L80084B80 /* 08576C 80084B6C 3C0D800E */ lui $t5, %hi(D_800DFA3C+12) # $t5, 0x800e -/* 085770 80084B70 3C118012 */ lui $s1, %hi(D_80126C46) # $s1, 0x8012 -/* 085774 80084B74 86316C46 */ lh $s1, %lo(D_80126C46)($s1) +/* 085770 80084B70 3C118012 */ lui $s1, %hi(gOptionsMenuItemIndex) # $s1, 0x8012 +/* 085774 80084B74 86316C46 */ lh $s1, %lo(gOptionsMenuItemIndex)($s1) /* 085778 80084B78 1000000E */ b .L80084BB4 /* 08577C 80084B7C 00000000 */ nop .L80084B80: -/* 085780 80084B80 3C028012 */ lui $v0, %hi(D_80126C46) # $v0, 0x8012 -/* 085784 80084B84 84426C46 */ lh $v0, %lo(D_80126C46)($v0) +/* 085780 80084B80 3C028012 */ lui $v0, %hi(gOptionsMenuItemIndex) # $v0, 0x8012 +/* 085784 80084B84 84426C46 */ lh $v0, %lo(gOptionsMenuItemIndex)($v0) /* 085788 80084B88 00000000 */ nop /* 08578C 80084B8C 28410003 */ slti $at, $v0, 3 /* 085790 80084B90 10200004 */ beqz $at, .L80084BA4 diff --git a/asm/non_matchings/menu/func_80086AFC.s b/asm/non_matchings/menu/func_80086AFC.s index cb948fe9..c987aef9 100644 --- a/asm/non_matchings/menu/func_80086AFC.s +++ b/asm/non_matchings/menu/func_80086AFC.s @@ -395,8 +395,8 @@ glabel L80087084 /* 087CB8 800870B8 24010009 */ li $at, 9 /* 087CBC 800870BC 14410042 */ bne $v0, $at, .L800871C8 /* 087CC0 800870C0 240C0001 */ li $t4, 1 -/* 087CC4 800870C4 3C01800E */ lui $at, %hi(D_800DF47C) # $at, 0x800e -/* 087CC8 800870C8 AC2CF47C */ sw $t4, %lo(D_800DF47C)($at) +/* 087CC4 800870C4 3C01800E */ lui $at, %hi(gMenuDelay) # $at, 0x800e +/* 087CC8 800870C8 AC2CF47C */ sw $t4, %lo(gMenuDelay)($at) /* 087CCC 800870CC 90EF0006 */ lbu $t7, 6($a3) /* 087CD0 800870D0 3C018012 */ lui $at, %hi(D_801264D0) # $at, 0x8012 /* 087CD4 800870D4 1000003C */ b .L800871C8 diff --git a/asm/non_matchings/menu/func_800890AC.s b/asm/non_matchings/menu/func_800890AC.s index 3639a67b..f9187011 100644 --- a/asm/non_matchings/menu/func_800890AC.s +++ b/asm/non_matchings/menu/func_800890AC.s @@ -1,9 +1,9 @@ glabel func_800890AC /* 089CAC 800890AC 3C038012 */ lui $v1, %hi(D_801263BC) # $v1, 0x8012 /* 089CB0 800890B0 246363BC */ addiu $v1, %lo(D_801263BC) # addiu $v1, $v1, 0x63bc -/* 089CB4 800890B4 3C09800E */ lui $t1, %hi(D_800DF47C) # $t1, 0x800e +/* 089CB4 800890B4 3C09800E */ lui $t1, %hi(gMenuDelay) # $t1, 0x800e /* 089CB8 800890B8 8C6E0000 */ lw $t6, ($v1) -/* 089CBC 800890BC 2529F47C */ addiu $t1, %lo(D_800DF47C) # addiu $t1, $t1, -0xb84 +/* 089CBC 800890BC 2529F47C */ addiu $t1, %lo(gMenuDelay) # addiu $t1, $t1, -0xb84 /* 089CC0 800890C0 8D220000 */ lw $v0, ($t1) /* 089CC4 800890C4 27BDFFB8 */ addiu $sp, $sp, -0x48 /* 089CC8 800890C8 01C47821 */ addu $t7, $t6, $a0 @@ -17,21 +17,21 @@ glabel func_800890AC /* 089CE8 800890E8 AC780000 */ sw $t8, ($v1) /* 089CEC 800890EC 0C02224E */ jal func_80088938 /* 089CF0 800890F0 AFA40048 */ sw $a0, 0x48($sp) -/* 089CF4 800890F4 3C02800E */ lui $v0, %hi(D_800DF47C) # $v0, 0x800e -/* 089CF8 800890F8 3C09800E */ lui $t1, %hi(D_800DF47C) # $t1, 0x800e -/* 089CFC 800890FC 8C42F47C */ lw $v0, %lo(D_800DF47C)($v0) +/* 089CF4 800890F4 3C02800E */ lui $v0, %hi(gMenuDelay) # $v0, 0x800e +/* 089CF8 800890F8 3C09800E */ lui $t1, %hi(gMenuDelay) # $t1, 0x800e +/* 089CFC 800890FC 8C42F47C */ lw $v0, %lo(gMenuDelay)($v0) /* 089D00 80089100 8FA40048 */ lw $a0, 0x48($sp) -/* 089D04 80089104 2529F47C */ addiu $t1, %lo(D_800DF47C) # addiu $t1, $t1, -0xb84 +/* 089D04 80089104 2529F47C */ addiu $t1, %lo(gMenuDelay) # addiu $t1, $t1, -0xb84 .L80089108: /* 089D08 80089108 14400117 */ bnez $v0, .L80089568 /* 089D0C 8008910C 00446021 */ addu $t4, $v0, $a0 -/* 089D10 80089110 3C038012 */ lui $v1, %hi(D_8012645C) # $v1, 0x8012 -/* 089D14 80089114 3C058012 */ lui $a1, %hi(D_80126464) # $a1, 0x8012 +/* 089D10 80089110 3C038012 */ lui $v1, %hi(gControllersXAxisDirection) # $v1, 0x8012 +/* 089D14 80089114 3C058012 */ lui $a1, %hi(gControllersYAxisDirection) # $a1, 0x8012 /* 089D18 80089118 00003025 */ move $a2, $zero /* 089D1C 8008911C 00003825 */ move $a3, $zero /* 089D20 80089120 00004025 */ move $t0, $zero -/* 089D24 80089124 24A56464 */ addiu $a1, %lo(D_80126464) # addiu $a1, $a1, 0x6464 -/* 089D28 80089128 2463645C */ addiu $v1, %lo(D_8012645C) # addiu $v1, $v1, 0x645c +/* 089D24 80089124 24A56464 */ addiu $a1, %lo(gControllersYAxisDirection) # addiu $a1, $a1, 0x6464 +/* 089D28 80089128 2463645C */ addiu $v1, %lo(gControllersXAxisDirection) # addiu $v1, $v1, 0x645c /* 089D2C 8008912C 00002025 */ move $a0, $zero .L80089130: /* 089D30 80089130 AFA3001C */ sw $v1, 0x1c($sp) @@ -39,7 +39,7 @@ glabel func_800890AC /* 089D38 80089138 AFA50018 */ sw $a1, 0x18($sp) /* 089D3C 8008913C AFA60040 */ sw $a2, 0x40($sp) /* 089D40 80089140 AFA7003C */ sw $a3, 0x3c($sp) -/* 089D44 80089144 0C01A955 */ jal func_8006A554 +/* 089D44 80089144 0C01A955 */ jal get_button_inputs_from_player /* 089D48 80089148 AFA80038 */ sw $t0, 0x38($sp) /* 089D4C 8008914C 8FA3001C */ lw $v1, 0x1c($sp) /* 089D50 80089150 8FA50018 */ lw $a1, 0x18($sp) @@ -93,10 +93,10 @@ glabel func_800890AC /* 089E08 80089208 24180001 */ li $t8, 1 /* 089E0C 8008920C 15E000C0 */ bnez $t7, .L80089510 /* 089E10 80089210 24190001 */ li $t9, 1 -/* 089E14 80089214 3C01800E */ lui $at, %hi(D_800DF47C) # $at, 0x800e +/* 089E14 80089214 3C01800E */ lui $at, %hi(gMenuDelay) # $at, 0x800e /* 089E18 80089218 3C04800E */ lui $a0, %hi(D_800DF774) # $a0, 0x800e /* 089E1C 8008921C AFB80030 */ sw $t8, 0x30($sp) -/* 089E20 80089220 AC39F47C */ sw $t9, %lo(D_800DF47C)($at) +/* 089E20 80089220 AC39F47C */ sw $t9, %lo(gMenuDelay)($at) /* 089E24 80089224 0C030076 */ jal func_800C01D8 /* 089E28 80089228 2484F774 */ addiu $a0, %lo(D_800DF774) # addiu $a0, $a0, -0x88c /* 089E2C 8008922C 100000B9 */ b .L80089514 @@ -125,10 +125,10 @@ glabel func_800890AC /* 089E84 80089284 24180001 */ li $t8, 1 /* 089E88 80089288 240E0001 */ li $t6, 1 /* 089E8C 8008928C 240F0001 */ li $t7, 1 -/* 089E90 80089290 3C01800E */ lui $at, %hi(D_800DF47C) # $at, 0x800e +/* 089E90 80089290 3C01800E */ lui $at, %hi(gMenuDelay) # $at, 0x800e /* 089E94 80089294 3C04800E */ lui $a0, %hi(D_800DF774) # $a0, 0x800e /* 089E98 80089298 AFAE0030 */ sw $t6, 0x30($sp) -/* 089E9C 8008929C AC2FF47C */ sw $t7, %lo(D_800DF47C)($at) +/* 089E9C 8008929C AC2FF47C */ sw $t7, %lo(gMenuDelay)($at) /* 089EA0 800892A0 0C030076 */ jal func_800C01D8 /* 089EA4 800892A4 2484F774 */ addiu $a0, %lo(D_800DF774) # addiu $a0, $a0, -0x88c /* 089EA8 800892A8 3C0A8012 */ lui $t2, %hi(D_801263E0) # $t2, 0x8012 @@ -145,10 +145,10 @@ glabel func_800890AC /* 089ED0 800892D0 254A63E0 */ addiu $t2, %lo(D_801263E0) # addiu $t2, $t2, 0x63e0 /* 089ED4 800892D4 24190001 */ li $t9, 1 /* 089ED8 800892D8 240C0001 */ li $t4, 1 -/* 089EDC 800892DC 3C01800E */ lui $at, %hi(D_800DF47C) # $at, 0x800e +/* 089EDC 800892DC 3C01800E */ lui $at, %hi(gMenuDelay) # $at, 0x800e /* 089EE0 800892E0 3C04800E */ lui $a0, %hi(D_800DF774) # $a0, 0x800e /* 089EE4 800892E4 AFB90030 */ sw $t9, 0x30($sp) -/* 089EE8 800892E8 AC2CF47C */ sw $t4, %lo(D_800DF47C)($at) +/* 089EE8 800892E8 AC2CF47C */ sw $t4, %lo(gMenuDelay)($at) /* 089EEC 800892EC 0C030076 */ jal func_800C01D8 /* 089EF0 800892F0 2484F774 */ addiu $a0, %lo(D_800DF774) # addiu $a0, $a0, -0x88c /* 089EF4 800892F4 3C0A8012 */ lui $t2, %hi(D_801263E0) # $t2, 0x8012 @@ -205,10 +205,10 @@ glabel func_800890AC .L800893A4: /* 089FA4 800893A4 240C0001 */ li $t4, 1 /* 089FA8 800893A8 240D0001 */ li $t5, 1 -/* 089FAC 800893AC 3C01800E */ lui $at, %hi(D_800DF47C) # $at, 0x800e +/* 089FAC 800893AC 3C01800E */ lui $at, %hi(gMenuDelay) # $at, 0x800e /* 089FB0 800893B0 3C04800E */ lui $a0, %hi(D_800DF774) # $a0, 0x800e /* 089FB4 800893B4 AFAC0030 */ sw $t4, 0x30($sp) -/* 089FB8 800893B8 AC2DF47C */ sw $t5, %lo(D_800DF47C)($at) +/* 089FB8 800893B8 AC2DF47C */ sw $t5, %lo(gMenuDelay)($at) /* 089FBC 800893BC 0C030076 */ jal func_800C01D8 /* 089FC0 800893C0 2484F774 */ addiu $a0, %lo(D_800DF774) # addiu $a0, $a0, -0x88c /* 089FC4 800893C4 10000053 */ b .L80089514 diff --git a/asm/non_matchings/menu/func_800896A4.s b/asm/non_matchings/menu/func_800896A4.s index 3b171caf..8d20c5e3 100644 --- a/asm/non_matchings/menu/func_800896A4.s +++ b/asm/non_matchings/menu/func_800896A4.s @@ -68,10 +68,10 @@ glabel func_800896A4 /* 08A3AC 800897AC 240600FF */ li $a2, 255 /* 08A3B0 800897B0 0C0310E1 */ jal set_text_color /* 08A3B4 800897B4 00003825 */ move $a3, $zero -/* 08A3B8 800897B8 3C168012 */ lui $s6, %hi(D_80126C40) # $s6, 0x8012 -/* 08A3BC 800897BC 3C158012 */ lui $s5, %hi(D_80126C42) # $s5, 0x8012 -/* 08A3C0 800897C0 26B56C42 */ addiu $s5, %lo(D_80126C42) # addiu $s5, $s5, 0x6c42 -/* 08A3C4 800897C4 26D66C40 */ addiu $s6, %lo(D_80126C40) # addiu $s6, $s6, 0x6c40 +/* 08A3B8 800897B8 3C168012 */ lui $s6, %hi(gCheatInputCurrentRow) # $s6, 0x8012 +/* 08A3BC 800897BC 3C158012 */ lui $s5, %hi(gCheatInputCurrentColumn) # $s5, 0x8012 +/* 08A3C0 800897C0 26B56C42 */ addiu $s5, %lo(gCheatInputCurrentColumn) # addiu $s5, $s5, 0x6c42 +/* 08A3C4 800897C4 26D66C40 */ addiu $s6, %lo(gCheatInputCurrentRow) # addiu $s6, $s6, 0x6c40 /* 08A3C8 800897C8 0000F025 */ move $fp, $zero /* 08A3CC 800897CC 2414003C */ li $s4, 60 /* 08A3D0 800897D0 24170005 */ li $s7, 5 @@ -79,8 +79,8 @@ glabel func_800896A4 /* 08A3D4 800897D4 00008025 */ move $s0, $zero /* 08A3D8 800897D8 24110040 */ li $s1, 64 .L800897DC: -/* 08A3DC 800897DC 3C0C8012 */ lui $t4, %hi(D_80126C46) # $t4, 0x8012 -/* 08A3E0 800897E0 858C6C46 */ lh $t4, %lo(D_80126C46)($t4) +/* 08A3DC 800897DC 3C0C8012 */ lui $t4, %hi(gOptionsMenuItemIndex) # $t4, 0x8012 +/* 08A3E0 800897E0 858C6C46 */ lh $t4, %lo(gOptionsMenuItemIndex)($t4) /* 08A3E4 800897E4 00000000 */ nop /* 08A3E8 800897E8 16EC0018 */ bne $s7, $t4, .L8008984C /* 08A3EC 800897EC 2A61005B */ slti $at, $s3, 0x5b @@ -147,8 +147,8 @@ glabel func_800896A4 /* 08A4CC 800898CC 0C031110 */ jal draw_text /* 08A4D0 800898D0 02803025 */ move $a2, $s4 .L800898D4: -/* 08A4D4 800898D4 3C0D8012 */ lui $t5, %hi(D_80126C46) # $t5, 0x8012 -/* 08A4D8 800898D8 85AD6C46 */ lh $t5, %lo(D_80126C46)($t5) +/* 08A4D4 800898D4 3C0D8012 */ lui $t5, %hi(gOptionsMenuItemIndex) # $t5, 0x8012 +/* 08A4D8 800898D8 85AD6C46 */ lh $t5, %lo(gOptionsMenuItemIndex)($t5) /* 08A4DC 800898DC 00000000 */ nop /* 08A4E0 800898E0 16ED000E */ bne $s7, $t5, .L8008991C /* 08A4E4 800898E4 00000000 */ nop @@ -208,8 +208,8 @@ glabel func_800896A4 /* 08A5B0 800899B0 26B563E0 */ addiu $s5, %lo(D_801263E0) # addiu $s5, $s5, 0x63e0 /* 08A5B4 800899B4 01AE8821 */ addu $s1, $t5, $t6 .L800899B8: -/* 08A5B8 800899B8 3C0F8012 */ lui $t7, %hi(D_80126C46) # $t7, 0x8012 -/* 08A5BC 800899BC 85EF6C46 */ lh $t7, %lo(D_80126C46)($t7) +/* 08A5B8 800899B8 3C0F8012 */ lui $t7, %hi(gOptionsMenuItemIndex) # $t7, 0x8012 +/* 08A5BC 800899BC 85EF6C46 */ lh $t7, %lo(gOptionsMenuItemIndex)($t7) /* 08A5C0 800899C0 00008025 */ move $s0, $zero /* 08A5C4 800899C4 17CF0006 */ bne $fp, $t7, .L800899E0 /* 08A5C8 800899C8 240400FF */ li $a0, 255 @@ -256,15 +256,15 @@ glabel func_800896A4 /* 08A660 80089A60 24060080 */ li $a2, 128 /* 08A664 80089A64 0C0310F3 */ jal set_text_background_color /* 08A668 80089A68 24070080 */ li $a3, 128 -/* 08A66C 80089A6C 3C028012 */ lui $v0, %hi(D_80126C46) # $v0, 0x8012 -/* 08A670 80089A70 84426C46 */ lh $v0, %lo(D_80126C46)($v0) +/* 08A66C 80089A6C 3C028012 */ lui $v0, %hi(gOptionsMenuItemIndex) # $v0, 0x8012 +/* 08A670 80089A70 84426C46 */ lh $v0, %lo(gOptionsMenuItemIndex)($v0) /* 08A674 80089A74 24010004 */ li $at, 4 /* 08A678 80089A78 14410020 */ bne $v0, $at, .L80089AFC /* 08A67C 80089A7C 3C088012 */ lui $t0, %hi(D_80126C4C) # $t0, 0x8012 /* 08A680 80089A80 85086C4C */ lh $t0, %lo(D_80126C4C)($t0) /* 08A684 80089A84 2401FFFF */ li $at, -1 /* 08A688 80089A88 1501000D */ bne $t0, $at, .L80089AC0 -/* 08A68C 80089A8C 3C028012 */ lui $v0, %hi(D_80126C30) # $v0, 0x8012 +/* 08A68C 80089A8C 3C028012 */ lui $v0, %hi(gCheatsAssetData) # $v0, 0x8012 /* 08A690 80089A90 3C0C800E */ lui $t4, %hi(D_800DF4A0) # $t4, 0x800e /* 08A694 80089A94 8D8CF4A0 */ lw $t4, %lo(D_800DF4A0)($t4) /* 08A698 80089A98 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012 @@ -278,7 +278,7 @@ glabel func_800896A4 /* 08A6B8 80089AB8 10000029 */ b .L80089B60 /* 08A6BC 80089ABC 8EAC0000 */ lw $t4, ($s5) .L80089AC0: -/* 08A6C0 80089AC0 8C426C30 */ lw $v0, %lo(D_80126C30)($v0) +/* 08A6C0 80089AC0 8C426C30 */ lw $v0, %lo(gCheatsAssetData)($v0) /* 08A6C4 80089AC4 00087040 */ sll $t6, $t0, 1 /* 08A6C8 80089AC8 24430002 */ addiu $v1, $v0, 2 /* 08A6CC 80089ACC 006E7821 */ addu $t7, $v1, $t6 diff --git a/asm/non_matchings/menu/func_8008A56C.s b/asm/non_matchings/menu/func_8008A56C.s index 148ded74..efa4c67a 100644 --- a/asm/non_matchings/menu/func_8008A56C.s +++ b/asm/non_matchings/menu/func_8008A56C.s @@ -95,8 +95,8 @@ glabel func_8008A56C /* 08B2D4 8008A6D4 3C198012 */ lui $t9, %hi(D_80126C70) # $t9, 0x8012 /* 08B2D8 8008A6D8 8F396C70 */ lw $t9, %lo(D_80126C70)($t9) /* 08B2DC 8008A6DC 8C6363E0 */ lw $v1, %lo(D_801263E0)($v1) -/* 08B2E0 8008A6E0 3C168012 */ lui $s6, %hi(D_80126C30) # $s6, 0x8012 -/* 08B2E4 8008A6E4 8ED66C30 */ lw $s6, %lo(D_80126C30)($s6) +/* 08B2E0 8008A6E0 3C168012 */ lui $s6, %hi(gCheatsAssetData) # $s6, 0x8012 +/* 08B2E4 8008A6E4 8ED66C30 */ lw $s6, %lo(gCheatsAssetData)($s6) /* 08B2E8 8008A6E8 00791021 */ addu $v0, $v1, $t9 /* 08B2EC 8008A6EC 0062082A */ slt $at, $v1, $v0 /* 08B2F0 8008A6F0 00608025 */ move $s0, $v1 @@ -107,8 +107,8 @@ glabel func_8008A56C /* 08B304 8008A704 00034040 */ sll $t0, $v1, 1 /* 08B308 8008A708 3C098012 */ lui $t1, %hi(D_80126C80) # $t1, 0x8012 /* 08B30C 8008A70C 25296C80 */ addiu $t1, %lo(D_80126C80) # addiu $t1, $t1, 0x6c80 -/* 08B310 8008A710 3C148012 */ lui $s4, %hi(D_80126C46) # $s4, 0x8012 -/* 08B314 8008A714 26946C46 */ addiu $s4, %lo(D_80126C46) # addiu $s4, $s4, 0x6c46 +/* 08B310 8008A710 3C148012 */ lui $s4, %hi(gOptionsMenuItemIndex) # $s4, 0x8012 +/* 08B314 8008A714 26946C46 */ addiu $s4, %lo(gOptionsMenuItemIndex) # addiu $s4, $s4, 0x6c46 /* 08B318 8008A718 01098821 */ addu $s1, $t0, $t1 .L8008A71C: /* 08B31C 8008A71C 868A0000 */ lh $t2, ($s4) @@ -122,11 +122,11 @@ glabel func_8008A56C /* 08B33C 8008A73C 03C03825 */ move $a3, $fp .L8008A740: /* 08B340 8008A740 862D0000 */ lh $t5, ($s1) -/* 08B344 8008A744 3C198012 */ lui $t9, %hi(D_80126C30) # $t9, 0x8012 +/* 08B344 8008A744 3C198012 */ lui $t9, %hi(gCheatsAssetData) # $t9, 0x8012 /* 08B348 8008A748 000D7080 */ sll $t6, $t5, 2 /* 08B34C 8008A74C 02CE7821 */ addu $t7, $s6, $t6 /* 08B350 8008A750 95F80002 */ lhu $t8, 2($t7) -/* 08B354 8008A754 8F396C30 */ lw $t9, %lo(D_80126C30)($t9) +/* 08B354 8008A754 8F396C30 */ lw $t9, %lo(gCheatsAssetData)($t9) /* 08B358 8008A758 AFA00010 */ sw $zero, 0x10($sp) /* 08B35C 8008A75C 02A02025 */ move $a0, $s5 /* 08B360 8008A760 24050030 */ li $a1, 48 @@ -182,10 +182,10 @@ glabel func_8008A56C /* 08B41C 8008A81C 1420FFBF */ bnez $at, .L8008A71C /* 08B420 8008A820 00000000 */ nop .L8008A824: -/* 08B424 8008A824 3C148012 */ lui $s4, %hi(D_80126C46) # $s4, 0x8012 +/* 08B424 8008A824 3C148012 */ lui $s4, %hi(gOptionsMenuItemIndex) # $s4, 0x8012 /* 08B428 8008A828 0202082A */ slt $at, $s0, $v0 /* 08B42C 8008A82C 10200014 */ beqz $at, .L8008A880 -/* 08B430 8008A830 26946C46 */ addiu $s4, %lo(D_80126C46) # addiu $s4, $s4, 0x6c46 +/* 08B430 8008A830 26946C46 */ addiu $s4, %lo(gOptionsMenuItemIndex) # addiu $s4, $s4, 0x6c46 /* 08B434 8008A834 86880000 */ lh $t0, ($s4) /* 08B438 8008A838 240400FF */ li $a0, 255 /* 08B43C 8008A83C 16680006 */ bne $s3, $t0, .L8008A858 diff --git a/asm/non_matchings/menu/func_8008B358.s b/asm/non_matchings/menu/func_8008B358.s index 615aabe3..11abf84d 100644 --- a/asm/non_matchings/menu/func_8008B358.s +++ b/asm/non_matchings/menu/func_8008B358.s @@ -9,19 +9,19 @@ glabel func_8008B358 /* 08BF74 8008B374 AFBE0038 */ sw $fp, 0x38($sp) /* 08BF78 8008B378 AFB60030 */ sw $s6, 0x30($sp) /* 08BF7C 8008B37C AFB1001C */ sw $s1, 0x1c($sp) -/* 08BF80 8008B380 3C108012 */ lui $s0, %hi(players_character_array) # $s0, 0x8012 -/* 08BF84 8008B384 3C128012 */ lui $s2, %hi(D_801263D4) # $s2, 0x8012 +/* 08BF80 8008B380 3C108012 */ lui $s0, %hi(gPlayersCharacterArray) # $s0, 0x8012 +/* 08BF84 8008B384 3C128012 */ lui $s2, %hi(gActivePlayersArray) # $s2, 0x8012 /* 08BF88 8008B388 3C138012 */ lui $s3, %hi(D_801263C0) # $s3, 0x8012 -/* 08BF8C 8008B38C 3C14800E */ lui $s4, %hi(D_800DF4BC) # $s4, 0x800e +/* 08BF8C 8008B38C 3C14800E */ lui $s4, %hi(gNumberOfActivePlayers) # $s4, 0x800e /* 08BF90 8008B390 3C158012 */ lui $s5, %hi(D_801267D8) # $s5, 0x8012 /* 08BF94 8008B394 3C178012 */ lui $s7, %hi(D_801263CC) # $s7, 0x8012 /* 08BF98 8008B398 AFBF003C */ sw $ra, 0x3c($sp) /* 08BF9C 8008B39C 26F763CC */ addiu $s7, %lo(D_801263CC) # addiu $s7, $s7, 0x63cc /* 08BFA0 8008B3A0 26B567D8 */ addiu $s5, %lo(D_801267D8) # addiu $s5, $s5, 0x67d8 -/* 08BFA4 8008B3A4 2694F4BC */ addiu $s4, %lo(D_800DF4BC) # addiu $s4, $s4, -0xb44 +/* 08BFA4 8008B3A4 2694F4BC */ addiu $s4, %lo(gNumberOfActivePlayers) # addiu $s4, $s4, -0xb44 /* 08BFA8 8008B3A8 267363C0 */ addiu $s3, %lo(D_801263C0) # addiu $s3, $s3, 0x63c0 -/* 08BFAC 8008B3AC 265263D4 */ addiu $s2, %lo(D_801263D4) # addiu $s2, $s2, 0x63d4 -/* 08BFB0 8008B3B0 261063E8 */ addiu $s0, %lo(players_character_array) # addiu $s0, $s0, 0x63e8 +/* 08BFAC 8008B3AC 265263D4 */ addiu $s2, %lo(gActivePlayersArray) # addiu $s2, $s2, 0x63d4 +/* 08BFB0 8008B3B0 261063E8 */ addiu $s0, %lo(gPlayersCharacterArray) # addiu $s0, $s0, 0x63e8 /* 08BFB4 8008B3B4 00008825 */ move $s1, $zero /* 08BFB8 8008B3B8 24160001 */ li $s6, 1 /* 08BFBC 8008B3BC 241E000E */ li $fp, 14 @@ -36,8 +36,8 @@ glabel func_8008B358 /* 08BFDC 8008B3DC 1100002A */ beqz $t0, .L8008B488 /* 08BFE0 8008B3E0 02113821 */ addu $a3, $s0, $s1 .L8008B3E4: -/* 08BFE4 8008B3E4 3C098012 */ lui $t1, %hi(D_801263D4) # $t1, 0x8012 -/* 08BFE8 8008B3E8 252963D4 */ addiu $t1, %lo(D_801263D4) # addiu $t1, $t1, 0x63d4 +/* 08BFE4 8008B3E4 3C098012 */ lui $t1, %hi(gActivePlayersArray) # $t1, 0x8012 +/* 08BFE8 8008B3E8 252963D4 */ addiu $t1, %lo(gActivePlayersArray) # addiu $t1, $t1, 0x63d4 /* 08BFEC 8008B3EC 24C60001 */ addiu $a2, $a2, 1 /* 08BFF0 8008B3F0 02C02025 */ move $a0, $s6 /* 08BFF4 8008B3F4 00091821 */ addu $v1, $zero, $t1 diff --git a/asm/non_matchings/menu/func_8008B4C8.s b/asm/non_matchings/menu/func_8008B4C8.s index 94519940..65e33abc 100644 --- a/asm/non_matchings/menu/func_8008B4C8.s +++ b/asm/non_matchings/menu/func_8008B4C8.s @@ -3,7 +3,7 @@ glabel func_8008B4C8 /* 08C0CC 8008B4CC AFB40028 */ sw $s4, 0x28($sp) /* 08C0D0 8008B4D0 AFB1001C */ sw $s1, 0x1c($sp) /* 08C0D4 8008B4D4 AFB00018 */ sw $s0, 0x18($sp) -/* 08C0D8 8008B4D8 3C118012 */ lui $s1, %hi(D_801263D4) # $s1, 0x8012 +/* 08C0D8 8008B4D8 3C118012 */ lui $s1, %hi(gActivePlayersArray) # $s1, 0x8012 /* 08C0DC 8008B4DC 3C148012 */ lui $s4, %hi(D_801267D8) # $s4, 0x8012 /* 08C0E0 8008B4E0 AFBF003C */ sw $ra, 0x3c($sp) /* 08C0E4 8008B4E4 AFBE0038 */ sw $fp, 0x38($sp) @@ -14,7 +14,7 @@ glabel func_8008B4C8 /* 08C0F8 8008B4F8 AFB20020 */ sw $s2, 0x20($sp) /* 08C0FC 8008B4FC 00001025 */ move $v0, $zero /* 08C100 8008B500 269467D8 */ addiu $s4, %lo(D_801267D8) # addiu $s4, $s4, 0x67d8 -/* 08C104 8008B504 263163D4 */ addiu $s1, %lo(D_801263D4) # addiu $s1, $s1, 0x63d4 +/* 08C104 8008B504 263163D4 */ addiu $s1, %lo(gActivePlayersArray) # addiu $s1, $s1, 0x63d4 /* 08C108 8008B508 00008025 */ move $s0, $zero .L8008B50C: /* 08C10C 8008B50C 822E0000 */ lb $t6, ($s1) @@ -33,9 +33,9 @@ glabel func_8008B4C8 /* 08C13C 8008B53C 11000047 */ beqz $t0, .L8008B65C /* 08C140 8008B540 00008025 */ move $s0, $zero /* 08C144 8008B544 24120001 */ li $s2, 1 -/* 08C148 8008B548 3C01800E */ lui $at, %hi(D_800DF47C) # $at, 0x800e +/* 08C148 8008B548 3C01800E */ lui $at, %hi(gMenuDelay) # $at, 0x800e /* 08C14C 8008B54C 0C01BAEA */ jal func_8006EBA8 -/* 08C150 8008B550 AC32F47C */ sw $s2, %lo(D_800DF47C)($at) +/* 08C150 8008B550 AC32F47C */ sw $s2, %lo(gMenuDelay)($at) /* 08C154 8008B554 3C04800E */ lui $a0, %hi(D_800DF774) # $a0, 0x800e /* 08C158 8008B558 0C030076 */ jal func_800C01D8 /* 08C15C 8008B55C 2484F774 */ addiu $a0, %lo(D_800DF774) # addiu $a0, $a0, -0x88c @@ -68,9 +68,9 @@ glabel func_8008B4C8 /* 08C1C0 8008B5C0 0C001223 */ jal func_8000488C /* 08C1C4 8008B5C4 00000000 */ nop .L8008B5C8: -/* 08C1C8 8008B5C8 3C188012 */ lui $t8, %hi(players_character_array) # $t8, 0x8012 +/* 08C1C8 8008B5C8 3C188012 */ lui $t8, %hi(gPlayersCharacterArray) # $t8, 0x8012 /* 08C1CC 8008B5CC 0311C021 */ addu $t8, $t8, $s1 -/* 08C1D0 8008B5D0 831863E8 */ lb $t8, %lo(players_character_array)($t8) +/* 08C1D0 8008B5D0 831863E8 */ lb $t8, %lo(gPlayersCharacterArray)($t8) /* 08C1D4 8008B5D4 3C1E8012 */ lui $fp, %hi(D_801263CC) # $fp, 0x8012 /* 08C1D8 8008B5D8 27DE63CC */ addiu $fp, %lo(D_801263CC) # addiu $fp, $fp, 0x63cc /* 08C1DC 8008B5DC 0018C8C0 */ sll $t9, $t8, 3 @@ -84,8 +84,8 @@ glabel func_8008B4C8 /* 08C1FC 8008B5FC 3089FFFF */ andi $t1, $a0, 0xffff /* 08C200 8008B600 0C000741 */ jal func_80001D04 /* 08C204 8008B604 01202025 */ move $a0, $t1 -/* 08C208 8008B608 3C02800E */ lui $v0, %hi(D_800DF4BC) # $v0, 0x800e -/* 08C20C 8008B60C 8C42F4BC */ lw $v0, %lo(D_800DF4BC)($v0) +/* 08C208 8008B608 3C02800E */ lui $v0, %hi(gNumberOfActivePlayers) # $v0, 0x800e +/* 08C20C 8008B60C 8C42F4BC */ lw $v0, %lo(gNumberOfActivePlayers)($v0) /* 08C210 8008B610 00000000 */ nop /* 08C214 8008B614 28410003 */ slti $at, $v0, 3 /* 08C218 8008B618 1020000C */ beqz $at, .L8008B64C @@ -108,16 +108,16 @@ glabel func_8008B4C8 /* 08C254 8008B654 10000035 */ b .L8008B72C /* 08C258 8008B658 8FBF003C */ lw $ra, 0x3c($sp) .L8008B65C: -/* 08C25C 8008B65C 3C118012 */ lui $s1, %hi(D_801263D4) # $s1, 0x8012 +/* 08C25C 8008B65C 3C118012 */ lui $s1, %hi(gActivePlayersArray) # $s1, 0x8012 /* 08C260 8008B660 3C1E8012 */ lui $fp, %hi(D_801263CC) # $fp, 0x8012 /* 08C264 8008B664 3C178012 */ lui $s7, %hi(D_80126808) # $s7, 0x8012 /* 08C268 8008B668 3C158012 */ lui $s5, %hi(D_801263DC) # $s5, 0x8012 -/* 08C26C 8008B66C 3C13800E */ lui $s3, %hi(D_800DF480) # $s3, 0x800e -/* 08C270 8008B670 2673F480 */ addiu $s3, %lo(D_800DF480) # addiu $s3, $s3, -0xb80 +/* 08C26C 8008B66C 3C13800E */ lui $s3, %hi(gNumberOfReadyPlayers) # $s3, 0x800e +/* 08C270 8008B670 2673F480 */ addiu $s3, %lo(gNumberOfReadyPlayers) # addiu $s3, $s3, -0xb80 /* 08C274 8008B674 26B563DC */ addiu $s5, %lo(D_801263DC) # addiu $s5, $s5, 0x63dc /* 08C278 8008B678 26F76808 */ addiu $s7, %lo(D_80126808) # addiu $s7, $s7, 0x6808 /* 08C27C 8008B67C 27DE63CC */ addiu $fp, %lo(D_801263CC) # addiu $fp, $fp, 0x63cc -/* 08C280 8008B680 263163D4 */ addiu $s1, %lo(D_801263D4) # addiu $s1, $s1, 0x63d4 +/* 08C280 8008B680 263163D4 */ addiu $s1, %lo(gActivePlayersArray) # addiu $s1, $s1, 0x63d4 /* 08C284 8008B684 24160004 */ li $s6, 4 .L8008B688: /* 08C288 8008B688 822D0000 */ lb $t5, ($s1) @@ -132,10 +132,10 @@ glabel func_8008B4C8 /* 08C2AC 8008B6AC 02E22821 */ addu $a1, $s7, $v0 /* 08C2B0 8008B6B0 31F94000 */ andi $t9, $t7, 0x4000 /* 08C2B4 8008B6B4 13200019 */ beqz $t9, .L8008B71C -/* 08C2B8 8008B6B8 3C0A8012 */ lui $t2, %hi(players_character_array) # $t2, 0x8012 +/* 08C2B8 8008B6B8 3C0A8012 */ lui $t2, %hi(gPlayersCharacterArray) # $t2, 0x8012 /* 08C2BC 8008B6BC 8E680000 */ lw $t0, ($s3) /* 08C2C0 8008B6C0 8CA40000 */ lw $a0, ($a1) -/* 08C2C4 8008B6C4 254A63E8 */ addiu $t2, %lo(players_character_array) # addiu $t2, $t2, 0x63e8 +/* 08C2C4 8008B6C4 254A63E8 */ addiu $t2, %lo(gPlayersCharacterArray) # addiu $t2, $t2, 0x63e8 /* 08C2C8 8008B6C8 2509FFFF */ addiu $t1, $t0, -1 /* 08C2CC 8008B6CC A0600000 */ sb $zero, ($v1) /* 08C2D0 8008B6D0 AE690000 */ sw $t1, ($s3) diff --git a/asm/non_matchings/menu/func_8008B758.s b/asm/non_matchings/menu/func_8008B758.s index b2d0d067..dfb66d3d 100644 --- a/asm/non_matchings/menu/func_8008B758.s +++ b/asm/non_matchings/menu/func_8008B758.s @@ -8,15 +8,15 @@ glabel func_8008B758 /* 08C370 8008B770 AFB40030 */ sw $s4, 0x30($sp) /* 08C374 8008B774 AFB3002C */ sw $s3, 0x2c($sp) /* 08C378 8008B778 3C108012 */ lui $s0, %hi(D_801263C0) # $s0, 0x8012 -/* 08C37C 8008B77C 3C168012 */ lui $s6, %hi(players_character_array) # $s6, 0x8012 -/* 08C380 8008B780 3C17800E */ lui $s7, %hi(D_800DF480) # $s7, 0x800e +/* 08C37C 8008B77C 3C168012 */ lui $s6, %hi(gPlayersCharacterArray) # $s6, 0x8012 +/* 08C380 8008B780 3C17800E */ lui $s7, %hi(gNumberOfReadyPlayers) # $s7, 0x800e /* 08C384 8008B784 3C1E8012 */ lui $fp, %hi(D_801263CC) # $fp, 0x8012 /* 08C388 8008B788 AFBF0044 */ sw $ra, 0x44($sp) /* 08C38C 8008B78C AFB20028 */ sw $s2, 0x28($sp) /* 08C390 8008B790 AFB10024 */ sw $s1, 0x24($sp) /* 08C394 8008B794 27DE63CC */ addiu $fp, %lo(D_801263CC) # addiu $fp, $fp, 0x63cc -/* 08C398 8008B798 26F7F480 */ addiu $s7, %lo(D_800DF480) # addiu $s7, $s7, -0xb80 -/* 08C39C 8008B79C 26D663E8 */ addiu $s6, %lo(players_character_array) # addiu $s6, $s6, 0x63e8 +/* 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 /* 08C3A4 8008B7A4 2413000E */ li $s3, 14 /* 08C3A8 8008B7A8 0000A025 */ move $s4, $zero @@ -71,17 +71,17 @@ glabel func_8008B758 /* 08C460 8008B860 30684000 */ andi $t0, $v1, 0x4000 /* 08C464 8008B864 1100003C */ beqz $t0, .L8008B958 /* 08C468 8008B868 30789000 */ andi $t8, $v1, 0x9000 -/* 08C46C 8008B86C 3C09800E */ lui $t1, %hi(D_800DF4BC) # $t1, 0x800e -/* 08C470 8008B870 8D29F4BC */ lw $t1, %lo(D_800DF4BC)($t1) -/* 08C474 8008B874 3C01800E */ lui $at, %hi(D_800DF4BC) # $at, 0x800e +/* 08C46C 8008B86C 3C09800E */ lui $t1, %hi(gNumberOfActivePlayers) # $t1, 0x800e +/* 08C470 8008B870 8D29F4BC */ lw $t1, %lo(gNumberOfActivePlayers)($t1) +/* 08C474 8008B874 3C01800E */ lui $at, %hi(gNumberOfActivePlayers) # $at, 0x800e /* 08C478 8008B878 252AFFFF */ addiu $t2, $t1, -1 -/* 08C47C 8008B87C AC2AF4BC */ sw $t2, %lo(D_800DF4BC)($at) -/* 08C480 8008B880 3C06800E */ lui $a2, %hi(D_800DF4BC) # $a2, 0x800e -/* 08C484 8008B884 8CC6F4BC */ lw $a2, %lo(D_800DF4BC)($a2) -/* 08C488 8008B888 3C018012 */ lui $at, %hi(D_801263D4) # $at, 0x8012 +/* 08C47C 8008B87C AC2AF4BC */ sw $t2, %lo(gNumberOfActivePlayers)($at) +/* 08C480 8008B880 3C06800E */ lui $a2, %hi(gNumberOfActivePlayers) # $a2, 0x800e +/* 08C484 8008B884 8CC6F4BC */ lw $a2, %lo(gNumberOfActivePlayers)($a2) +/* 08C488 8008B888 3C018012 */ lui $at, %hi(gActivePlayersArray) # $at, 0x8012 /* 08C48C 8008B88C 00340821 */ addu $at, $at, $s4 /* 08C490 8008B890 18C00026 */ blez $a2, .L8008B92C -/* 08C494 8008B894 A02063D4 */ sb $zero, %lo(D_801263D4)($at) +/* 08C494 8008B894 A02063D4 */ sb $zero, %lo(gActivePlayersArray)($at) /* 08C498 8008B898 824C0000 */ lb $t4, ($s2) /* 08C49C 8008B89C 8FC50000 */ lw $a1, ($fp) /* 08C4A0 8008B8A0 01930019 */ multu $t4, $s3 @@ -97,8 +97,8 @@ glabel func_8008B758 /* 08C4C8 8008B8C8 00002025 */ move $a0, $zero /* 08C4CC 8008B8CC 1F000017 */ bgtz $t8, .L8008B92C /* 08C4D0 8008B8D0 00001825 */ move $v1, $zero -/* 08C4D4 8008B8D4 3C198012 */ lui $t9, %hi(D_801263D4) # $t9, 0x8012 -/* 08C4D8 8008B8D8 273963D4 */ addiu $t9, %lo(D_801263D4) # addiu $t9, $t9, 0x63d4 +/* 08C4D4 8008B8D4 3C198012 */ lui $t9, %hi(gActivePlayersArray) # $t9, 0x8012 +/* 08C4D8 8008B8D8 273963D4 */ addiu $t9, %lo(gActivePlayersArray) # addiu $t9, $t9, 0x63d4 /* 08C4DC 8008B8DC 00191021 */ addu $v0, $zero, $t9 .L8008B8E0: /* 08C4E0 8008B8E0 80480000 */ lb $t0, ($v0) @@ -127,9 +127,9 @@ glabel func_8008B758 /* 08C530 8008B930 1CC00071 */ bgtz $a2, .L8008BAF8 /* 08C534 8008B934 A24B0000 */ sb $t3, ($s2) /* 08C538 8008B938 240FFFFF */ li $t7, -1 -/* 08C53C 8008B93C 3C01800E */ lui $at, %hi(D_800DF47C) # $at, 0x800e +/* 08C53C 8008B93C 3C01800E */ lui $at, %hi(gMenuDelay) # $at, 0x800e /* 08C540 8008B940 3C04800E */ lui $a0, %hi(D_800DF774) # $a0, 0x800e -/* 08C544 8008B944 AC2FF47C */ sw $t7, %lo(D_800DF47C)($at) +/* 08C544 8008B944 AC2FF47C */ sw $t7, %lo(gMenuDelay)($at) /* 08C548 8008B948 0C030076 */ jal func_800C01D8 /* 08C54C 8008B94C 2484F774 */ addiu $a0, %lo(D_800DF774) # addiu $a0, $a0, -0x88c /* 08C550 8008B950 1000006A */ b .L8008BAFC diff --git a/asm/non_matchings/menu/func_8008BB3C.s b/asm/non_matchings/menu/func_8008BB3C.s index 4af81a87..17d7d60a 100644 --- a/asm/non_matchings/menu/func_8008BB3C.s +++ b/asm/non_matchings/menu/func_8008BB3C.s @@ -62,7 +62,7 @@ glabel func_8008BB3C .L8008BC10: /* 08C810 8008BC10 02C02825 */ move $a1, $s6 /* 08C814 8008BC14 00008825 */ move $s1, $zero -/* 08C818 8008BC18 0C01BE53 */ jal func_8006F94C +/* 08C818 8008BC18 0C01BE53 */ jal get_random_number_from_range /* 08C81C 8008BC1C 00008025 */ move $s0, $zero /* 08C820 8008BC20 00550019 */ multu $v0, $s5 /* 08C824 8008BC24 8E990000 */ lw $t9, ($s4) diff --git a/asm/non_matchings/menu/func_8008C698.s b/asm/non_matchings/menu/func_8008C698.s index 74398cc8..94fd919d 100644 --- a/asm/non_matchings/menu/func_8008C698.s +++ b/asm/non_matchings/menu/func_8008C698.s @@ -1,6 +1,6 @@ glabel func_8008C698 -/* 08D298 8008C698 3C02800E */ lui $v0, %hi(D_800DF47C) # $v0, 0x800e -/* 08D29C 8008C69C 8C42F47C */ lw $v0, %lo(D_800DF47C)($v0) +/* 08D298 8008C698 3C02800E */ lui $v0, %hi(gMenuDelay) # $v0, 0x800e +/* 08D29C 8008C69C 8C42F47C */ lw $v0, %lo(gMenuDelay)($v0) /* 08D2A0 8008C6A0 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 08D2A4 8008C6A4 2841FFEB */ slti $at, $v0, -0x15 /* 08D2A8 8008C6A8 AFBF0014 */ sw $ra, 0x14($sp) diff --git a/asm/non_matchings/menu/func_8008D5F8.s b/asm/non_matchings/menu/func_8008D5F8.s index 2e37b253..a22ef850 100644 --- a/asm/non_matchings/menu/func_8008D5F8.s +++ b/asm/non_matchings/menu/func_8008D5F8.s @@ -2,29 +2,29 @@ glabel func_8008D5F8 /* 08E1F8 8008D5F8 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 08E1FC 8008D5FC AFBF0014 */ sw $ra, 0x14($sp) /* 08E200 8008D600 AFA40028 */ sw $a0, 0x28($sp) -/* 08E204 8008D604 0C01A955 */ jal func_8006A554 +/* 08E204 8008D604 0C01A955 */ jal get_button_inputs_from_player /* 08E208 8008D608 00002025 */ move $a0, $zero -/* 08E20C 8008D60C 3C0E800E */ lui $t6, %hi(D_800DF4BC) # $t6, 0x800e -/* 08E210 8008D610 8DCEF4BC */ lw $t6, %lo(D_800DF4BC)($t6) -/* 08E214 8008D614 3C068012 */ lui $a2, %hi(D_8012645C) # $a2, 0x8012 -/* 08E218 8008D618 3C078012 */ lui $a3, %hi(D_80126464) # $a3, 0x8012 +/* 08E20C 8008D60C 3C0E800E */ lui $t6, %hi(gNumberOfActivePlayers) # $t6, 0x800e +/* 08E210 8008D610 8DCEF4BC */ lw $t6, %lo(gNumberOfActivePlayers)($t6) +/* 08E214 8008D614 3C068012 */ lui $a2, %hi(gControllersXAxisDirection) # $a2, 0x8012 +/* 08E218 8008D618 3C078012 */ lui $a3, %hi(gControllersYAxisDirection) # $a3, 0x8012 /* 08E21C 8008D61C 24080002 */ li $t0, 2 -/* 08E220 8008D620 80C6645C */ lb $a2, %lo(D_8012645C)($a2) -/* 08E224 8008D624 80E76464 */ lb $a3, %lo(D_80126464)($a3) +/* 08E220 8008D620 80C6645C */ lb $a2, %lo(gControllersXAxisDirection)($a2) +/* 08E224 8008D624 80E76464 */ lb $a3, %lo(gControllersYAxisDirection)($a3) /* 08E228 8008D628 150E0011 */ bne $t0, $t6, .L8008D670 /* 08E22C 8008D62C 00401825 */ move $v1, $v0 /* 08E230 8008D630 24040001 */ li $a0, 1 /* 08E234 8008D634 AFA20024 */ sw $v0, 0x24($sp) /* 08E238 8008D638 AFA60020 */ sw $a2, 0x20($sp) -/* 08E23C 8008D63C 0C01A955 */ jal func_8006A554 +/* 08E23C 8008D63C 0C01A955 */ jal get_button_inputs_from_player /* 08E240 8008D640 AFA7001C */ sw $a3, 0x1c($sp) -/* 08E244 8008D644 3C0F8012 */ lui $t7, %hi(D_8012645C+1) # $t7, 0x8012 -/* 08E248 8008D648 3C188012 */ lui $t8, %hi(D_80126464+1) # $t8, 0x8012 +/* 08E244 8008D644 3C0F8012 */ lui $t7, %hi(gControllersXAxisDirection+1) # $t7, 0x8012 +/* 08E248 8008D648 3C188012 */ lui $t8, %hi(gControllersYAxisDirection+1) # $t8, 0x8012 /* 08E24C 8008D64C 8FA30024 */ lw $v1, 0x24($sp) /* 08E250 8008D650 8FA60020 */ lw $a2, 0x20($sp) /* 08E254 8008D654 8FA7001C */ lw $a3, 0x1c($sp) -/* 08E258 8008D658 81EF645D */ lb $t7, %lo(D_8012645C+1)($t7) -/* 08E25C 8008D65C 83186465 */ lb $t8, %lo(D_80126464+1)($t8) +/* 08E258 8008D658 81EF645D */ lb $t7, %lo(gControllersXAxisDirection+1)($t7) +/* 08E25C 8008D65C 83186465 */ lb $t8, %lo(gControllersYAxisDirection+1)($t8) /* 08E260 8008D660 24080002 */ li $t0, 2 /* 08E264 8008D664 00621825 */ or $v1, $v1, $v0 /* 08E268 8008D668 00CF3021 */ addu $a2, $a2, $t7 diff --git a/asm/non_matchings/menu/func_8008D8BC.s b/asm/non_matchings/menu/func_8008D8BC.s index 86385bdc..37f18256 100644 --- a/asm/non_matchings/menu/func_8008D8BC.s +++ b/asm/non_matchings/menu/func_8008D8BC.s @@ -4,23 +4,23 @@ glabel func_8008D8BC /* 08E4C4 8008D8C4 0C01BAA4 */ jal get_settings /* 08E4C8 8008D8C8 AFA40030 */ sw $a0, 0x30($sp) /* 08E4CC 8008D8CC AFA2001C */ sw $v0, 0x1c($sp) -/* 08E4D0 8008D8D0 0C01A955 */ jal func_8006A554 +/* 08E4D0 8008D8D0 0C01A955 */ jal get_button_inputs_from_player /* 08E4D4 8008D8D4 00002025 */ move $a0, $zero -/* 08E4D8 8008D8D8 3C0E800E */ lui $t6, %hi(D_800DF4BC) # $t6, 0x800e -/* 08E4DC 8008D8DC 8DCEF4BC */ lw $t6, %lo(D_800DF4BC)($t6) -/* 08E4E0 8008D8E0 3C058012 */ lui $a1, %hi(D_8012645C) # $a1, 0x8012 -/* 08E4E4 8008D8E4 80A5645C */ lb $a1, %lo(D_8012645C)($a1) +/* 08E4D8 8008D8D8 3C0E800E */ lui $t6, %hi(gNumberOfActivePlayers) # $t6, 0x800e +/* 08E4DC 8008D8DC 8DCEF4BC */ lw $t6, %lo(gNumberOfActivePlayers)($t6) +/* 08E4E0 8008D8E0 3C058012 */ lui $a1, %hi(gControllersXAxisDirection) # $a1, 0x8012 +/* 08E4E4 8008D8E4 80A5645C */ lb $a1, %lo(gControllersXAxisDirection)($a1) /* 08E4E8 8008D8E8 24010002 */ li $at, 2 /* 08E4EC 8008D8EC 15C1000B */ bne $t6, $at, .L8008D91C /* 08E4F0 8008D8F0 00401825 */ move $v1, $v0 /* 08E4F4 8008D8F4 24040001 */ li $a0, 1 /* 08E4F8 8008D8F8 AFA20028 */ sw $v0, 0x28($sp) -/* 08E4FC 8008D8FC 0C01A955 */ jal func_8006A554 +/* 08E4FC 8008D8FC 0C01A955 */ jal get_button_inputs_from_player /* 08E500 8008D900 AFA50024 */ sw $a1, 0x24($sp) -/* 08E504 8008D904 3C0F8012 */ lui $t7, %hi(D_8012645C+1) # $t7, 0x8012 +/* 08E504 8008D904 3C0F8012 */ lui $t7, %hi(gControllersXAxisDirection+1) # $t7, 0x8012 /* 08E508 8008D908 8FA30028 */ lw $v1, 0x28($sp) /* 08E50C 8008D90C 8FA50024 */ lw $a1, 0x24($sp) -/* 08E510 8008D910 81EF645D */ lb $t7, %lo(D_8012645C+1)($t7) +/* 08E510 8008D910 81EF645D */ lb $t7, %lo(gControllersXAxisDirection+1)($t7) /* 08E514 8008D914 00621825 */ or $v1, $v1, $v0 /* 08E518 8008D918 00AF2821 */ addu $a1, $a1, $t7 .L8008D91C: diff --git a/asm/non_matchings/menu/func_8008DC7C.s b/asm/non_matchings/menu/func_8008DC7C.s index ff788565..8b342c0d 100644 --- a/asm/non_matchings/menu/func_8008DC7C.s +++ b/asm/non_matchings/menu/func_8008DC7C.s @@ -2,23 +2,23 @@ glabel func_8008DC7C /* 08E87C 8008DC7C 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 08E880 8008DC80 AFBF0014 */ sw $ra, 0x14($sp) /* 08E884 8008DC84 AFA40020 */ sw $a0, 0x20($sp) -/* 08E888 8008DC88 0C01A955 */ jal func_8006A554 +/* 08E888 8008DC88 0C01A955 */ jal get_button_inputs_from_player /* 08E88C 8008DC8C 00002025 */ move $a0, $zero -/* 08E890 8008DC90 3C0E800E */ lui $t6, %hi(D_800DF4BC) # $t6, 0x800e -/* 08E894 8008DC94 8DCEF4BC */ lw $t6, %lo(D_800DF4BC)($t6) -/* 08E898 8008DC98 3C058012 */ lui $a1, %hi(D_8012645C) # $a1, 0x8012 -/* 08E89C 8008DC9C 80A5645C */ lb $a1, %lo(D_8012645C)($a1) +/* 08E890 8008DC90 3C0E800E */ lui $t6, %hi(gNumberOfActivePlayers) # $t6, 0x800e +/* 08E894 8008DC94 8DCEF4BC */ lw $t6, %lo(gNumberOfActivePlayers)($t6) +/* 08E898 8008DC98 3C058012 */ lui $a1, %hi(gControllersXAxisDirection) # $a1, 0x8012 +/* 08E89C 8008DC9C 80A5645C */ lb $a1, %lo(gControllersXAxisDirection)($a1) /* 08E8A0 8008DCA0 24010002 */ li $at, 2 /* 08E8A4 8008DCA4 15C1000B */ bne $t6, $at, .L8008DCD4 /* 08E8A8 8008DCA8 00401825 */ move $v1, $v0 /* 08E8AC 8008DCAC 24040001 */ li $a0, 1 /* 08E8B0 8008DCB0 AFA2001C */ sw $v0, 0x1c($sp) -/* 08E8B4 8008DCB4 0C01A955 */ jal func_8006A554 +/* 08E8B4 8008DCB4 0C01A955 */ jal get_button_inputs_from_player /* 08E8B8 8008DCB8 AFA50018 */ sw $a1, 0x18($sp) -/* 08E8BC 8008DCBC 3C0F8012 */ lui $t7, %hi(D_8012645C+1) # $t7, 0x8012 +/* 08E8BC 8008DCBC 3C0F8012 */ lui $t7, %hi(gControllersXAxisDirection+1) # $t7, 0x8012 /* 08E8C0 8008DCC0 8FA3001C */ lw $v1, 0x1c($sp) /* 08E8C4 8008DCC4 8FA50018 */ lw $a1, 0x18($sp) -/* 08E8C8 8008DCC8 81EF645D */ lb $t7, %lo(D_8012645C+1)($t7) +/* 08E8C8 8008DCC8 81EF645D */ lb $t7, %lo(gControllersXAxisDirection+1)($t7) /* 08E8CC 8008DCCC 00621825 */ or $v1, $v1, $v0 /* 08E8D0 8008DCD0 00AF2821 */ addu $a1, $a1, $t7 .L8008DCD4: diff --git a/asm/non_matchings/menu/func_8008E4EC.s b/asm/non_matchings/menu/func_8008E4EC.s index 840b3c1f..21b6c103 100644 --- a/asm/non_matchings/menu/func_8008E4EC.s +++ b/asm/non_matchings/menu/func_8008E4EC.s @@ -1,7 +1,7 @@ glabel func_8008E4EC /* 08F0EC 8008E4EC 27BDFF88 */ addiu $sp, $sp, -0x78 -/* 08F0F0 8008E4F0 3C0E8012 */ lui $t6, %hi(D_801263C4) # $t6, 0x8012 -/* 08F0F4 8008E4F4 8DCE63C4 */ lw $t6, %lo(D_801263C4)($t6) +/* 08F0F0 8008E4F0 3C0E8012 */ lui $t6, %hi(gIgnorePlayerInput) # $t6, 0x8012 +/* 08F0F4 8008E4F4 8DCE63C4 */ lw $t6, %lo(gIgnorePlayerInput)($t6) /* 08F0F8 8008E4F8 AFBF003C */ sw $ra, 0x3c($sp) /* 08F0FC 8008E4FC AFBE0038 */ sw $fp, 0x38($sp) /* 08F100 8008E500 AFB70034 */ sw $s7, 0x34($sp) @@ -31,16 +31,16 @@ glabel func_8008E4EC /* 08F15C 8008E55C A620FFFE */ sh $zero, -2($s1) /* 08F160 8008E560 3C128012 */ lui $s2, %hi(D_80126818) # $s2, 0x8012 /* 08F164 8008E564 3C118012 */ lui $s1, %hi(D_80126830) # $s1, 0x8012 -/* 08F168 8008E568 3C148012 */ lui $s4, %hi(D_8012645C) # $s4, 0x8012 -/* 08F16C 8008E56C 3C158012 */ lui $s5, %hi(D_80126464) # $s5, 0x8012 -/* 08F170 8008E570 3C1E800E */ lui $fp, %hi(D_800DF4BC) # $fp, 0x800e +/* 08F168 8008E568 3C148012 */ lui $s4, %hi(gControllersXAxisDirection) # $s4, 0x8012 +/* 08F16C 8008E56C 3C158012 */ lui $s5, %hi(gControllersYAxisDirection) # $s5, 0x8012 +/* 08F170 8008E570 3C1E800E */ lui $fp, %hi(gNumberOfActivePlayers) # $fp, 0x800e /* 08F174 8008E574 3C178012 */ lui $s7, %hi(D_80126830) # $s7, 0x8012 /* 08F178 8008E578 3C168012 */ lui $s6, %hi(D_80126818) # $s6, 0x8012 /* 08F17C 8008E57C 26D66818 */ addiu $s6, %lo(D_80126818) # addiu $s6, $s6, 0x6818 /* 08F180 8008E580 26F76830 */ addiu $s7, %lo(D_80126830) # addiu $s7, $s7, 0x6830 -/* 08F184 8008E584 27DEF4BC */ addiu $fp, %lo(D_800DF4BC) # addiu $fp, $fp, -0xb44 -/* 08F188 8008E588 26B56464 */ addiu $s5, %lo(D_80126464) # addiu $s5, $s5, 0x6464 -/* 08F18C 8008E58C 2694645C */ addiu $s4, %lo(D_8012645C) # addiu $s4, $s4, 0x645c +/* 08F184 8008E584 27DEF4BC */ addiu $fp, %lo(gNumberOfActivePlayers) # addiu $fp, $fp, -0xb44 +/* 08F188 8008E588 26B56464 */ addiu $s5, %lo(gControllersYAxisDirection) # addiu $s5, $s5, 0x6464 +/* 08F18C 8008E58C 2694645C */ addiu $s4, %lo(gControllersXAxisDirection) # addiu $s4, $s4, 0x645c /* 08F190 8008E590 26316830 */ addiu $s1, %lo(D_80126830) # addiu $s1, $s1, 0x6830 /* 08F194 8008E594 26526818 */ addiu $s2, %lo(D_80126818) # addiu $s2, $s2, 0x6818 /* 08F198 8008E598 00009825 */ move $s3, $zero diff --git a/asm/non_matchings/menu/func_8008F00C.s b/asm/non_matchings/menu/func_8008F00C.s index 22ca05ba..b75eb561 100644 --- a/asm/non_matchings/menu/func_8008F00C.s +++ b/asm/non_matchings/menu/func_8008F00C.s @@ -27,7 +27,7 @@ glabel func_8008F00C /* 08FC6C 8008F06C 3C018012 */ lui $at, %hi(D_801269DC) # $at, 0x8012 /* 08FC70 8008F070 24010001 */ li $at, 1 /* 08FC74 8008F074 11C1000B */ beq $t6, $at, .L8008F0A4 -/* 08FC78 8008F078 3C04800E */ lui $a0, %hi(D_800DF4C4) # $a0, 0x800e +/* 08FC78 8008F078 3C04800E */ lui $a0, %hi(gTrackIdForPreview) # $a0, 0x800e /* 08FC7C 8008F07C 10000069 */ b .L8008F224 /* 08FC80 8008F080 8FBF0014 */ lw $ra, 0x14($sp) .L8008F084: @@ -40,11 +40,11 @@ glabel func_8008F00C /* 08FC9C 8008F09C 10000060 */ b .L8008F220 /* 08FCA0 8008F0A0 E42669EC */ swc1 $f6, %lo(D_801269EC)($at) .L8008F0A4: -/* 08FCA4 8008F0A4 8C84F4C4 */ lw $a0, %lo(D_800DF4C4)($a0) +/* 08FCA4 8008F0A4 8C84F4C4 */ lw $a0, %lo(gTrackIdForPreview)($a0) /* 08FCA8 8008F0A8 0C01AC2B */ jal func_8006B0AC /* 08FCAC 8008F0AC 00000000 */ nop -/* 08FCB0 8008F0B0 3C06800E */ lui $a2, %hi(D_800DF4BC) # $a2, 0x800e -/* 08FCB4 8008F0B4 8CC6F4BC */ lw $a2, %lo(D_800DF4BC)($a2) +/* 08FCB0 8008F0B0 3C06800E */ lui $a2, %hi(gNumberOfActivePlayers) # $a2, 0x800e +/* 08FCB4 8008F0B4 8CC6F4BC */ lw $a2, %lo(gNumberOfActivePlayers)($a2) /* 08FCB8 8008F0B8 3C048012 */ lui $a0, %hi(D_801269C4) # $a0, 0x8012 /* 08FCBC 8008F0BC 18C0000B */ blez $a2, .L8008F0EC /* 08FCC0 8008F0C0 24180001 */ li $t8, 1 @@ -60,8 +60,8 @@ glabel func_8008F00C /* 08FCE4 8008F0E4 1420FFFB */ bnez $at, .L8008F0D4 /* 08FCE8 8008F0E8 A062FFFF */ sb $v0, -1($v1) .L8008F0EC: -/* 08FCEC 8008F0EC 3C01800E */ lui $at, %hi(D_800DF480) # $at, 0x800e -/* 08FCF0 8008F0F0 AC20F480 */ sw $zero, %lo(D_800DF480)($at) +/* 08FCEC 8008F0EC 3C01800E */ lui $at, %hi(gNumberOfReadyPlayers) # $at, 0x800e +/* 08FCF0 8008F0F0 AC20F480 */ sw $zero, %lo(gNumberOfReadyPlayers)($at) /* 08FCF4 8008F0F4 3C01800E */ lui $at, %hi(D_800E0980) # $at, 0x800e /* 08FCF8 8008F0F8 3C04800E */ lui $a0, %hi(D_800E07E8) # $a0, 0x800e /* 08FCFC 8008F0FC AC380980 */ sw $t8, %lo(D_800E0980)($at) @@ -140,8 +140,8 @@ glabel func_8008F00C .L8008F220: /* 08FE20 8008F220 8FBF0014 */ lw $ra, 0x14($sp) .L8008F224: -/* 08FE24 8008F224 3C01800E */ lui $at, %hi(D_800DF47C) # $at, 0x800e -/* 08FE28 8008F228 AC20F47C */ sw $zero, %lo(D_800DF47C)($at) +/* 08FE24 8008F224 3C01800E */ lui $at, %hi(gMenuDelay) # $at, 0x800e +/* 08FE28 8008F228 AC20F47C */ sw $zero, %lo(gMenuDelay)($at) /* 08FE2C 8008F22C 03E00008 */ jr $ra /* 08FE30 8008F230 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/non_matchings/menu/func_8008FA54.s b/asm/non_matchings/menu/func_8008FA54.s index 1bc3d5e4..5968b6b2 100644 --- a/asm/non_matchings/menu/func_8008FA54.s +++ b/asm/non_matchings/menu/func_8008FA54.s @@ -36,8 +36,8 @@ glabel func_8008FA54 /* 0906BC 8008FABC 00003025 */ move $a2, $zero /* 0906C0 8008FAC0 0C0310F3 */ jal set_text_background_color /* 0906C4 8008FAC4 00003825 */ move $a3, $zero -/* 0906C8 8008FAC8 3C02800E */ lui $v0, %hi(D_800DF47C) # $v0, 0x800e -/* 0906CC 8008FACC 8C42F47C */ lw $v0, %lo(D_800DF47C)($v0) +/* 0906C8 8008FAC8 3C02800E */ lui $v0, %hi(gMenuDelay) # $v0, 0x800e +/* 0906CC 8008FACC 8C42F47C */ lw $v0, %lo(gMenuDelay)($v0) /* 0906D0 8008FAD0 241100FF */ li $s1, 255 /* 0906D4 8008FAD4 18400008 */ blez $v0, .L8008FAF8 /* 0906D8 8008FAD8 3C098012 */ lui $t1, %hi(D_801269F0) # $t1, 0x8012 diff --git a/asm/non_matchings/menu/func_8008FF1C.s b/asm/non_matchings/menu/func_8008FF1C.s index e5f84456..9d9d8312 100644 --- a/asm/non_matchings/menu/func_8008FF1C.s +++ b/asm/non_matchings/menu/func_8008FF1C.s @@ -15,8 +15,8 @@ glabel func_8008FF1C /* 090B50 8008FF50 AFA20058 */ sw $v0, 0x58($sp) /* 090B54 8008FF54 0C0078A7 */ jal func_8001E29C /* 090B58 8008FF58 2404001A */ li $a0, 26 -/* 090B5C 8008FF5C 3C03800E */ lui $v1, %hi(D_800DF47C) # $v1, 0x800e -/* 090B60 8008FF60 8C63F47C */ lw $v1, %lo(D_800DF47C)($v1) +/* 090B5C 8008FF5C 3C03800E */ lui $v1, %hi(gMenuDelay) # $v1, 0x800e +/* 090B60 8008FF60 8C63F47C */ lw $v1, %lo(gMenuDelay)($v1) /* 090B64 8008FF64 AFA2005C */ sw $v0, 0x5c($sp) /* 090B68 8008FF68 2861FFEA */ slti $at, $v1, -0x16 /* 090B6C 8008FF6C 14200152 */ bnez $at, .L800904B8 @@ -214,10 +214,10 @@ glabel func_8008FF1C /* 090E44 80090244 A20D000E */ sb $t5, 0xe($s0) .L80090248: /* 090E48 80090248 920E000E */ lbu $t6, 0xe($s0) -/* 090E4C 8009024C 3C18800E */ lui $t8, %hi(D_800DF47C) # $t8, 0x800e +/* 090E4C 8009024C 3C18800E */ lui $t8, %hi(gMenuDelay) # $t8, 0x800e /* 090E50 80090250 31CFFF80 */ andi $t7, $t6, 0xff80 /* 090E54 80090254 A20F000E */ sb $t7, 0xe($s0) -/* 090E58 80090258 8F18F47C */ lw $t8, %lo(D_800DF47C)($t8) +/* 090E58 80090258 8F18F47C */ lw $t8, %lo(gMenuDelay)($t8) /* 090E5C 8009025C 2A410005 */ slti $at, $s2, 5 /* 090E60 80090260 17000039 */ bnez $t8, .L80090348 /* 090E64 80090264 00000000 */ nop diff --git a/asm/non_matchings/menu/func_800904E8.s b/asm/non_matchings/menu/func_800904E8.s index 276faded..bf102123 100644 --- a/asm/non_matchings/menu/func_800904E8.s +++ b/asm/non_matchings/menu/func_800904E8.s @@ -162,8 +162,8 @@ glabel func_800904E8 /* 091338 80090738 1440002D */ bnez $v0, .L800907F0 /* 09133C 8009073C 246369DC */ addiu $v1, %lo(D_801269DC) # addiu $v1, $v1, 0x69dc /* 091340 80090740 3C028012 */ lui $v0, %hi(D_801263D0) # $v0, 0x8012 -/* 091344 80090744 3C04800E */ lui $a0, %hi(D_800DF4C4) # $a0, 0x800e -/* 091348 80090748 8C84F4C4 */ lw $a0, %lo(D_800DF4C4)($a0) +/* 091344 80090744 3C04800E */ lui $a0, %hi(gTrackIdForPreview) # $a0, 0x800e +/* 091348 80090748 8C84F4C4 */ lw $a0, %lo(gTrackIdForPreview)($a0) /* 09134C 8009074C 8C4263D0 */ lw $v0, %lo(D_801263D0)($v0) /* 091350 80090750 3C0F8012 */ lui $t7, %hi(D_801269C8) # $t7, 0x8012 /* 091354 80090754 14440008 */ bne $v0, $a0, .L80090778 @@ -187,8 +187,8 @@ glabel func_800904E8 /* 091398 80090798 250869E4 */ addiu $t0, %lo(D_801269E4) # addiu $t0, $t0, 0x69e4 /* 09139C 8009079C 10400014 */ beqz $v0, .L800907F0 /* 0913A0 800907A0 246369DC */ addiu $v1, %lo(D_801269DC) # addiu $v1, $v1, 0x69dc -/* 0913A4 800907A4 3C04800E */ lui $a0, %hi(D_800DF4C4) # $a0, 0x800e -/* 0913A8 800907A8 8C84F4C4 */ lw $a0, %lo(D_800DF4C4)($a0) +/* 0913A4 800907A4 3C04800E */ lui $a0, %hi(gTrackIdForPreview) # $a0, 0x800e +/* 0913A8 800907A8 8C84F4C4 */ lw $a0, %lo(gTrackIdForPreview)($a0) /* 0913AC 800907AC 3C018012 */ lui $at, %hi(D_801263D0) # $at, 0x8012 /* 0913B0 800907B0 3C198012 */ lui $t9, %hi(D_801269C8) # $t9, 0x8012 /* 0913B4 800907B4 8F3969C8 */ lw $t9, %lo(D_801269C8)($t9) diff --git a/asm/non_matchings/menu/func_80090918.s b/asm/non_matchings/menu/func_80090918.s index cb7e8c62..92474c78 100644 --- a/asm/non_matchings/menu/func_80090918.s +++ b/asm/non_matchings/menu/func_80090918.s @@ -1,6 +1,6 @@ glabel func_80090918 -/* 091518 80090918 3C03800E */ lui $v1, %hi(D_800DF47C) # $v1, 0x800e -/* 09151C 8009091C 8C63F47C */ lw $v1, %lo(D_800DF47C)($v1) +/* 091518 80090918 3C03800E */ lui $v1, %hi(gMenuDelay) # $v1, 0x800e +/* 09151C 8009091C 8C63F47C */ lw $v1, %lo(gMenuDelay)($v1) /* 091520 80090920 27BDFFB8 */ addiu $sp, $sp, -0x48 /* 091524 80090924 AFBF001C */ sw $ra, 0x1c($sp) /* 091528 80090928 AFA40048 */ sw $a0, 0x48($sp) @@ -38,8 +38,8 @@ glabel func_80090918 /* 0915A8 800909A8 3C0F800E */ lui $t7, %hi(D_800E1E1C) # $t7, 0x800e /* 0915AC 800909AC 45000004 */ bc1f .L800909C0 .L800909B0: -/* 0915B0 800909B0 3C01800E */ lui $at, %hi(D_800DF47C) # $at, 0x800e -/* 0915B4 800909B4 AC2EF47C */ sw $t6, %lo(D_800DF47C)($at) +/* 0915B0 800909B0 3C01800E */ lui $at, %hi(gMenuDelay) # $at, 0x800e +/* 0915B4 800909B4 AC2EF47C */ sw $t6, %lo(gMenuDelay)($at) /* 0915B8 800909B8 1000000B */ b .L800909E8 /* 0915BC 800909BC 24030001 */ li $v1, 1 .L800909C0: @@ -49,9 +49,9 @@ glabel func_80090918 /* 0915CC 800909CC 2469FFFF */ addiu $t1, $v1, -1 /* 0915D0 800909D0 0C000741 */ jal func_80001D04 /* 0915D4 800909D4 00002825 */ move $a1, $zero -/* 0915D8 800909D8 3C03800E */ lui $v1, %hi(D_800DF47C) # $v1, 0x800e +/* 0915D8 800909D8 3C03800E */ lui $v1, %hi(gMenuDelay) # $v1, 0x800e /* 0915DC 800909DC 3C01800E */ lui $at, %hi(D_800E1E1C) # $at, 0x800e -/* 0915E0 800909E0 8C63F47C */ lw $v1, %lo(D_800DF47C)($v1) +/* 0915E0 800909E0 8C63F47C */ lw $v1, %lo(gMenuDelay)($v1) /* 0915E4 800909E4 AC201E1C */ sw $zero, %lo(D_800E1E1C)($at) .L800909E8: /* 0915E8 800909E8 2469FFFF */ addiu $t1, $v1, -1 @@ -153,8 +153,8 @@ glabel func_80090918 /* 091758 80090B58 0C031CF8 */ jal func_800C73E0 /* 09175C 80090B5C 00000000 */ nop /* 091760 80090B60 14400051 */ bnez $v0, .L80090CA8 -/* 091764 80090B64 3C03800E */ lui $v1, %hi(D_800DF47C) # $v1, 0x800e -/* 091768 80090B68 8C63F47C */ lw $v1, %lo(D_800DF47C)($v1) +/* 091764 80090B64 3C03800E */ lui $v1, %hi(gMenuDelay) # $v1, 0x800e +/* 091768 80090B68 8C63F47C */ lw $v1, %lo(gMenuDelay)($v1) /* 09176C 80090B6C 3C0A8012 */ lui $t2, %hi(D_801269C8) # $t2, 0x8012 /* 091770 80090B70 04610008 */ bgez $v1, .L80090B94 /* 091774 80090B74 254A69C8 */ addiu $t2, %lo(D_801269C8) # addiu $t2, $t2, 0x69c8 @@ -203,9 +203,9 @@ glabel func_80090918 /* 091814 80090C14 2861001F */ slti $at, $v1, 0x1f /* 091818 80090C18 0C01E2AB */ jal func_80078AAC /* 09181C 80090C1C 00002025 */ move $a0, $zero -/* 091820 80090C20 3C03800E */ lui $v1, %hi(D_800DF47C) # $v1, 0x800e +/* 091820 80090C20 3C03800E */ lui $v1, %hi(gMenuDelay) # $v1, 0x800e /* 091824 80090C24 3C01800E */ lui $at, %hi(D_800E097C) # $at, 0x800e -/* 091828 80090C28 8C63F47C */ lw $v1, %lo(D_800DF47C)($v1) +/* 091828 80090C28 8C63F47C */ lw $v1, %lo(gMenuDelay)($v1) /* 09182C 80090C2C AC20097C */ sw $zero, %lo(D_800E097C)($at) /* 091830 80090C30 2861001F */ slti $at, $v1, 0x1f .L80090C34: @@ -264,15 +264,15 @@ glabel func_80090918 /* 0918E8 80090CE8 304E9000 */ andi $t6, $v0, 0x9000 /* 0918EC 80090CEC 11C00012 */ beqz $t6, .L80090D38 /* 0918F0 80090CF0 304D4000 */ andi $t5, $v0, 0x4000 -/* 0918F4 80090CF4 3C02800E */ lui $v0, %hi(D_800DF4C4) # $v0, 0x800e -/* 0918F8 80090CF8 8C42F4C4 */ lw $v0, %lo(D_800DF4C4)($v0) +/* 0918F4 80090CF4 3C02800E */ lui $v0, %hi(gTrackIdForPreview) # $v0, 0x800e +/* 0918F8 80090CF8 8C42F4C4 */ lw $v0, %lo(gTrackIdForPreview)($v0) /* 0918FC 80090CFC 24180001 */ li $t8, 1 /* 091900 80090D00 10620009 */ beq $v1, $v0, .L80090D28 /* 091904 80090D04 2404006A */ li $a0, 106 -/* 091908 80090D08 3C01800E */ lui $at, %hi(D_800DF47C) # $at, 0x800e -/* 09190C 80090D0C AC38F47C */ sw $t8, %lo(D_800DF47C)($at) -/* 091910 80090D10 3C01800E */ lui $at, %hi(D_800DF4D4) # $at, 0x800e -/* 091914 80090D14 AC22F4D4 */ sw $v0, %lo(D_800DF4D4)($at) +/* 091908 80090D08 3C01800E */ lui $at, %hi(gMenuDelay) # $at, 0x800e +/* 09190C 80090D0C AC38F47C */ sw $t8, %lo(gMenuDelay)($at) +/* 091910 80090D10 3C01800E */ lui $at, %hi(gTrackIdToLoad) # $at, 0x800e +/* 091914 80090D14 AC22F4D4 */ sw $v0, %lo(gTrackIdToLoad)($at) /* 091918 80090D18 3C01800E */ lui $at, %hi(D_800E1E1C) # $at, 0x800e /* 09191C 80090D1C 24190001 */ li $t9, 1 /* 091920 80090D20 10000069 */ b .L80090EC8 @@ -293,9 +293,9 @@ glabel func_80090918 /* 091954 80090D54 0C03005C */ jal func_800C0170 /* 091958 80090D58 00000000 */ nop /* 09195C 80090D5C 240FFFFF */ li $t7, -1 -/* 091960 80090D60 3C01800E */ lui $at, %hi(D_800DF47C) # $at, 0x800e +/* 091960 80090D60 3C01800E */ lui $at, %hi(gMenuDelay) # $at, 0x800e /* 091964 80090D64 10000058 */ b .L80090EC8 -/* 091968 80090D68 AC2FF47C */ sw $t7, %lo(D_800DF47C)($at) +/* 091968 80090D68 AC2FF47C */ sw $t7, %lo(gMenuDelay)($at) .L80090D6C: /* 09196C 80090D6C 8D420000 */ lw $v0, ($t2) /* 091970 80090D70 8CE30000 */ lw $v1, ($a3) @@ -375,17 +375,17 @@ glabel func_80090918 /* 091A7C 80090E7C 0002C880 */ sll $t9, $v0, 2 /* 091A80 80090E80 85CE68E8 */ lh $t6, %lo(D_801268E8)($t6) /* 091A84 80090E84 0322C821 */ addu $t9, $t9, $v0 -/* 091A88 80090E88 3C01800E */ lui $at, %hi(D_800DF4C4) # $at, 0x800e +/* 091A88 80090E88 3C01800E */ lui $at, %hi(gTrackIdForPreview) # $at, 0x800e /* 091A8C 80090E8C 0019C980 */ sll $t9, $t9, 6 /* 091A90 80090E90 44999000 */ mtc1 $t9, $f18 -/* 091A94 80090E94 AC2EF4C4 */ sw $t6, %lo(D_800DF4C4)($at) +/* 091A94 80090E94 AC2EF4C4 */ sw $t6, %lo(gTrackIdForPreview)($at) /* 091A98 80090E98 468091A0 */ cvt.s.w $f6, $f18 -/* 091A9C 80090E9C 3C01800E */ lui $at, %hi(D_800DF4C8) # $at, 0x800e +/* 091A9C 80090E9C 3C01800E */ lui $at, %hi(gTrackSelectRow) # $at, 0x800e /* 091AA0 80090EA0 24780001 */ addiu $t8, $v1, 1 /* 091AA4 80090EA4 00007812 */ mflo $t7 /* 091AA8 80090EA8 000F7023 */ negu $t6, $t7 /* 091AAC 80090EAC 448E2000 */ mtc1 $t6, $f4 -/* 091AB0 80090EB0 AC38F4C8 */ sw $t8, %lo(D_800DF4C8)($at) +/* 091AB0 80090EB0 AC38F4C8 */ sw $t8, %lo(gTrackSelectRow)($at) /* 091AB4 80090EB4 468022A0 */ cvt.s.w $f10, $f4 /* 091AB8 80090EB8 3C018012 */ lui $at, %hi(D_801269E8) # $at, 0x8012 /* 091ABC 80090EBC E42669E8 */ swc1 $f6, %lo(D_801269E8)($at) diff --git a/asm/non_matchings/menu/func_80090F30.s b/asm/non_matchings/menu/func_80090F30.s index 997673c0..91a23d47 100644 --- a/asm/non_matchings/menu/func_80090F30.s +++ b/asm/non_matchings/menu/func_80090F30.s @@ -25,11 +25,11 @@ glabel func_80090F30 /* 091B78 80090F78 8E0E0000 */ lw $t6, ($s0) /* 091B7C 80090F7C AFA20070 */ sw $v0, 0x70($sp) /* 091B80 80090F80 15C00003 */ bnez $t6, .L80090F90 -/* 091B84 80090F84 3C18800E */ lui $t8, %hi(D_800DF4BC) # $t8, 0x800e +/* 091B84 80090F84 3C18800E */ lui $t8, %hi(gNumberOfActivePlayers) # $t8, 0x800e /* 091B88 80090F88 240F000C */ li $t7, 12 /* 091B8C 80090F8C AFAF0080 */ sw $t7, 0x80($sp) .L80090F90: -/* 091B90 80090F90 8F18F4BC */ lw $t8, %lo(D_800DF4BC)($t8) +/* 091B90 80090F90 8F18F4BC */ lw $t8, %lo(gNumberOfActivePlayers)($t8) /* 091B94 80090F94 24010002 */ li $at, 2 /* 091B98 80090F98 1701000D */ bne $t8, $at, .L80090FD0 /* 091B9C 80090F9C 00002025 */ move $a0, $zero @@ -55,8 +55,8 @@ glabel func_80090F30 /* 091BE8 80090FE8 24A563A8 */ addiu $a1, %lo(D_801263A8) # addiu $a1, $a1, 0x63a8 /* 091BEC 80090FEC 0C019FCB */ jal func_80067F2C /* 091BF0 80090FF0 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0 -/* 091BF4 80090FF4 3C02800E */ lui $v0, %hi(D_800DF47C) # $v0, 0x800e -/* 091BF8 80090FF8 8C42F47C */ lw $v0, %lo(D_800DF47C)($v0) +/* 091BF4 80090FF4 3C02800E */ lui $v0, %hi(gMenuDelay) # $v0, 0x800e +/* 091BF8 80090FF8 8C42F47C */ lw $v0, %lo(gMenuDelay)($v0) /* 091BFC 80090FFC 3C03800E */ lui $v1, %hi(D_800DF75C) # $v1, 0x800e /* 091C00 80091000 04410029 */ bgez $v0, .L800910A8 /* 091C04 80091004 2463F75C */ addiu $v1, %lo(D_800DF75C) # addiu $v1, $v1, -0x8a4 @@ -100,16 +100,16 @@ glabel func_80090F30 /* 091C8C 8009108C 00000000 */ nop /* 091C90 80091090 3C013F80 */ li $at, 0x3F800000 # 1.000000 /* 091C94 80091094 44813000 */ mtc1 $at, $f6 -/* 091C98 80091098 3C02800E */ lui $v0, %hi(D_800DF47C) # $v0, 0x800e +/* 091C98 80091098 3C02800E */ lui $v0, %hi(gMenuDelay) # $v0, 0x800e /* 091C9C 8009109C 3C01800E */ lui $at, %hi(D_800DF454) # $at, 0x800e -/* 091CA0 800910A0 8C42F47C */ lw $v0, %lo(D_800DF47C)($v0) +/* 091CA0 800910A0 8C42F47C */ lw $v0, %lo(gMenuDelay)($v0) /* 091CA4 800910A4 E426F454 */ swc1 $f6, %lo(D_800DF454)($at) .L800910A8: /* 091CA8 800910A8 2841FFEA */ slti $at, $v0, -0x16 /* 091CAC 800910AC 1420042A */ bnez $at, .L80092158 /* 091CB0 800910B0 2841001F */ slti $at, $v0, 0x1f /* 091CB4 800910B4 10200428 */ beqz $at, .L80092158 -/* 091CB8 800910B8 3C04800E */ lui $a0, %hi(D_800DF4C4) # $a0, 0x800e +/* 091CB8 800910B8 3C04800E */ lui $a0, %hi(gTrackIdForPreview) # $a0, 0x800e /* 091CBC 800910BC 04410006 */ bgez $v0, .L800910D8 /* 091CC0 800910C0 3C1E800E */ lui $fp, %hi(D_800DF764) # $fp, 0x800e /* 091CC4 800910C4 0002C900 */ sll $t9, $v0, 4 @@ -129,11 +129,11 @@ glabel func_80090F30 /* 091CF4 800910F4 00000000 */ nop /* 091CF8 800910F8 AFC00000 */ sw $zero, ($fp) .L800910FC: -/* 091CFC 800910FC 8C84F4C4 */ lw $a0, %lo(D_800DF4C4)($a0) +/* 091CFC 800910FC 8C84F4C4 */ lw $a0, %lo(gTrackIdForPreview)($a0) /* 091D00 80091100 0C01AC3E */ jal func_8006B0F8 /* 091D04 80091104 00000000 */ nop -/* 091D08 80091108 3C04800E */ lui $a0, %hi(D_800DF4C4) # $a0, 0x800e -/* 091D0C 8009110C 8C84F4C4 */ lw $a0, %lo(D_800DF4C4)($a0) +/* 091D08 80091108 3C04800E */ lui $a0, %hi(gTrackIdForPreview) # $a0, 0x800e +/* 091D0C 8009110C 8C84F4C4 */ lw $a0, %lo(gTrackIdForPreview)($a0) /* 091D10 80091110 0C01AF77 */ jal func_8006BDDC /* 091D14 80091114 AFA2007C */ sw $v0, 0x7c($sp) /* 091D18 80091118 00408025 */ move $s0, $v0 @@ -355,9 +355,9 @@ glabel func_80090F30 /* 09204C 8009144C 3C188012 */ lui $t8, %hi(gPlayerSelectVehicle) # $t8, 0x8012 /* 092050 80091450 831869C0 */ lb $t8, %lo(gPlayerSelectVehicle)($t8) /* 092054 80091454 8FAF0070 */ lw $t7, 0x70($sp) -/* 092058 80091458 3C09800E */ lui $t1, %hi(D_800DF4C4) # $t1, 0x800e +/* 092058 80091458 3C09800E */ lui $t1, %hi(gTrackIdForPreview) # $t1, 0x800e /* 09205C 8009145C 0018C880 */ sll $t9, $t8, 2 -/* 092060 80091460 8D29F4C4 */ lw $t1, %lo(D_800DF4C4)($t1) +/* 092060 80091460 8D29F4C4 */ lw $t1, %lo(gTrackIdForPreview)($t1) /* 092064 80091464 01F94021 */ addu $t0, $t7, $t9 /* 092068 80091468 8D0A0030 */ lw $t2, 0x30($t0) /* 09206C 8009146C 00095840 */ sll $t3, $t1, 1 @@ -378,9 +378,9 @@ glabel func_80090F30 /* 0920A8 800914A8 3C188012 */ lui $t8, %hi(gPlayerSelectVehicle) # $t8, 0x8012 /* 0920AC 800914AC 831869C0 */ lb $t8, %lo(gPlayerSelectVehicle)($t8) /* 0920B0 800914B0 8FAE0070 */ lw $t6, 0x70($sp) -/* 0920B4 800914B4 3C09800E */ lui $t1, %hi(D_800DF4C4) # $t1, 0x800e +/* 0920B4 800914B4 3C09800E */ lui $t1, %hi(gTrackIdForPreview) # $t1, 0x800e /* 0920B8 800914B8 00187880 */ sll $t7, $t8, 2 -/* 0920BC 800914BC 8D29F4C4 */ lw $t1, %lo(D_800DF4C4)($t1) +/* 0920BC 800914BC 8D29F4C4 */ lw $t1, %lo(gTrackIdForPreview)($t1) /* 0920C0 800914C0 01CFC821 */ addu $t9, $t6, $t7 /* 0920C4 800914C4 8F280018 */ lw $t0, 0x18($t9) /* 0920C8 800914C8 00095040 */ sll $t2, $t1, 1 @@ -400,9 +400,9 @@ glabel func_80090F30 /* 092100 80091500 3C188012 */ lui $t8, %hi(gPlayerSelectVehicle) # $t8, 0x8012 /* 092104 80091504 831869C0 */ lb $t8, %lo(gPlayerSelectVehicle)($t8) /* 092108 80091508 8FAD0070 */ lw $t5, 0x70($sp) -/* 09210C 8009150C 3C09800E */ lui $t1, %hi(D_800DF4C4) # $t1, 0x800e +/* 09210C 8009150C 3C09800E */ lui $t1, %hi(gTrackIdForPreview) # $t1, 0x800e /* 092110 80091510 00187080 */ sll $t6, $t8, 2 -/* 092114 80091514 8D29F4C4 */ lw $t1, %lo(D_800DF4C4)($t1) +/* 092114 80091514 8D29F4C4 */ lw $t1, %lo(gTrackIdForPreview)($t1) /* 092118 80091518 01AE7821 */ addu $t7, $t5, $t6 /* 09211C 8009151C 8DF9003C */ lw $t9, 0x3c($t7) /* 092120 80091520 00094040 */ sll $t0, $t1, 1 @@ -420,9 +420,9 @@ glabel func_80090F30 /* 092150 80091550 3C0D8012 */ lui $t5, %hi(gPlayerSelectVehicle) # $t5, 0x8012 /* 092154 80091554 81AD69C0 */ lb $t5, %lo(gPlayerSelectVehicle)($t5) /* 092158 80091558 8FB80070 */ lw $t8, 0x70($sp) -/* 09215C 8009155C 3C19800E */ lui $t9, %hi(D_800DF4C4) # $t9, 0x800e +/* 09215C 8009155C 3C19800E */ lui $t9, %hi(gTrackIdForPreview) # $t9, 0x800e /* 092160 80091560 000D7080 */ sll $t6, $t5, 2 -/* 092164 80091564 8F39F4C4 */ lw $t9, %lo(D_800DF4C4)($t9) +/* 092164 80091564 8F39F4C4 */ lw $t9, %lo(gTrackIdForPreview)($t9) /* 092168 80091568 030E7821 */ addu $t7, $t8, $t6 /* 09216C 8009156C 8DE90024 */ lw $t1, 0x24($t7) /* 092170 80091570 00194040 */ sll $t0, $t9, 1 @@ -441,8 +441,8 @@ glabel func_80090F30 /* 0921A4 800915A4 8DAD63E0 */ lw $t5, %lo(D_801263E0)($t5) /* 0921A8 800915A8 2401FFFF */ li $at, -1 /* 0921AC 800915AC 11A10256 */ beq $t5, $at, .L80091F08 -/* 0921B0 800915B0 3C02800E */ lui $v0, %hi(D_800DF4BC) # $v0, 0x800e -/* 0921B4 800915B4 8C42F4BC */ lw $v0, %lo(D_800DF4BC)($v0) +/* 0921B0 800915B0 3C02800E */ lui $v0, %hi(gNumberOfActivePlayers) # $v0, 0x800e +/* 0921B4 800915B4 8C42F4BC */ lw $v0, %lo(gNumberOfActivePlayers)($v0) /* 0921B8 800915B8 24010001 */ li $at, 1 /* 0921BC 800915BC 14410062 */ bne $v0, $at, .L80091748 /* 0921C0 800915C0 24040007 */ li $a0, 7 @@ -544,8 +544,8 @@ glabel func_80090F30 /* 092330 80091730 16A1FFDB */ bne $s5, $at, .L800916A0 /* 092334 80091734 26F70018 */ addiu $s7, $s7, 0x18 .L80091738: -/* 092338 80091738 3C02800E */ lui $v0, %hi(D_800DF4BC) # $v0, 0x800e -/* 09233C 8009173C 8C42F4BC */ lw $v0, %lo(D_800DF4BC)($v0) +/* 092338 80091738 3C02800E */ lui $v0, %hi(gNumberOfActivePlayers) # $v0, 0x800e +/* 09233C 8009173C 8C42F4BC */ lw $v0, %lo(gNumberOfActivePlayers)($v0) /* 092340 80091740 1000004B */ b .L80091870 /* 092344 80091744 28410002 */ slti $at, $v0, 2 .L80091748: @@ -567,8 +567,8 @@ glabel func_80090F30 /* 092384 80091784 18400039 */ blez $v0, .L8009186C /* 092388 80091788 01F98021 */ addu $s0, $t7, $t9 .L8009178C: -/* 09238C 8009178C 3C02800E */ lui $v0, %hi(D_800DF4BC) # $v0, 0x800e -/* 092390 80091790 8C42F4BC */ lw $v0, %lo(D_800DF4BC)($v0) +/* 09238C 8009178C 3C02800E */ lui $v0, %hi(gNumberOfActivePlayers) # $v0, 0x800e +/* 092390 80091790 8C42F4BC */ lw $v0, %lo(gNumberOfActivePlayers)($v0) /* 092394 80091794 24010001 */ li $at, 1 /* 092398 80091798 14410004 */ bne $v0, $at, .L800917AC /* 09239C 8009179C 3C098012 */ lui $t1, %hi(D_801263E0) # $t1, 0x8012 @@ -623,8 +623,8 @@ glabel func_80090F30 /* 092454 80091854 26310004 */ addiu $s1, $s1, 4 /* 092458 80091858 1420FFCC */ bnez $at, .L8009178C /* 09245C 8009185C 26100004 */ addiu $s0, $s0, 4 -/* 092460 80091860 3C02800E */ lui $v0, %hi(D_800DF4BC) # $v0, 0x800e -/* 092464 80091864 8C42F4BC */ lw $v0, %lo(D_800DF4BC)($v0) +/* 092460 80091860 3C02800E */ lui $v0, %hi(gNumberOfActivePlayers) # $v0, 0x800e +/* 092464 80091864 8C42F4BC */ lw $v0, %lo(gNumberOfActivePlayers)($v0) /* 092468 80091868 00000000 */ nop .L8009186C: /* 09246C 8009186C 28410002 */ slti $at, $v0, 2 @@ -673,7 +673,7 @@ glabel func_80090F30 /* 092508 80091908 822D0000 */ lb $t5, ($s1) /* 09250C 8009190C 8FA90070 */ lw $t1, 0x70($sp) /* 092510 80091910 16AD0011 */ bne $s5, $t5, .L80091958 -/* 092514 80091914 3C0A800E */ lui $t2, %hi(D_800DF4C4) # $t2, 0x800e +/* 092514 80091914 3C0A800E */ lui $t2, %hi(gTrackIdForPreview) # $t2, 0x800e /* 092518 80091918 8FD90000 */ lw $t9, ($fp) /* 09251C 8009191C 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012 /* 092520 80091920 8E450004 */ lw $a1, 4($s2) @@ -691,7 +691,7 @@ glabel func_80090F30 /* 092550 80091950 1000002A */ b .L800919FC /* 092554 80091954 00000000 */ nop .L80091958: -/* 092558 80091958 8D4AF4C4 */ lw $t2, %lo(D_800DF4C4)($t2) +/* 092558 80091958 8D4AF4C4 */ lw $t2, %lo(gTrackIdForPreview)($t2) /* 09255C 8009195C 8D280004 */ lw $t0, 4($t1) /* 092560 80091960 000A5880 */ sll $t3, $t2, 2 /* 092564 80091964 010B6021 */ addu $t4, $t0, $t3 @@ -735,8 +735,8 @@ glabel func_80090F30 /* 0925F4 800919F4 0C01E2AE */ jal func_80078AB8 /* 0925F8 800919F8 AFAD001C */ sw $t5, 0x1c($sp) .L800919FC: -/* 0925FC 800919FC 3C02800E */ lui $v0, %hi(D_800DF4BC) # $v0, 0x800e -/* 092600 80091A00 8C42F4BC */ lw $v0, %lo(D_800DF4BC)($v0) +/* 0925FC 800919FC 3C02800E */ lui $v0, %hi(gNumberOfActivePlayers) # $v0, 0x800e +/* 092600 80091A00 8C42F4BC */ lw $v0, %lo(gNumberOfActivePlayers)($v0) /* 092604 80091A04 26940001 */ addiu $s4, $s4, 1 /* 092608 80091A08 0282082A */ slt $at, $s4, $v0 /* 09260C 80091A0C 26310001 */ addiu $s1, $s1, 1 @@ -786,8 +786,8 @@ glabel func_80090F30 /* 0926AC 80091AAC AFA90010 */ sw $t1, 0x10($sp) /* 0926B0 80091AB0 0C01E2AE */ jal func_80078AB8 /* 0926B4 80091AB4 AFAB001C */ sw $t3, 0x1c($sp) -/* 0926B8 80091AB8 3C02800E */ lui $v0, %hi(D_800DF4BC) # $v0, 0x800e -/* 0926BC 80091ABC 8C42F4BC */ lw $v0, %lo(D_800DF4BC)($v0) +/* 0926B8 80091AB8 3C02800E */ lui $v0, %hi(gNumberOfActivePlayers) # $v0, 0x800e +/* 0926BC 80091ABC 8C42F4BC */ lw $v0, %lo(gNumberOfActivePlayers)($v0) /* 0926C0 80091AC0 10000019 */ b .L80091B28 /* 0926C4 80091AC4 00000000 */ nop .L80091AC8: @@ -812,8 +812,8 @@ glabel func_80090F30 /* 092710 80091B10 8CA50648 */ lw $a1, %lo(D_800E0648)($a1) /* 092714 80091B14 0C01E2AE */ jal func_80078AB8 /* 092718 80091B18 AFA9001C */ sw $t1, 0x1c($sp) -/* 09271C 80091B1C 3C02800E */ lui $v0, %hi(D_800DF4BC) # $v0, 0x800e -/* 092720 80091B20 8C42F4BC */ lw $v0, %lo(D_800DF4BC)($v0) +/* 09271C 80091B1C 3C02800E */ lui $v0, %hi(gNumberOfActivePlayers) # $v0, 0x800e +/* 092720 80091B20 8C42F4BC */ lw $v0, %lo(gNumberOfActivePlayers)($v0) /* 092724 80091B24 00000000 */ nop .L80091B28: /* 092728 80091B28 3C11800E */ lui $s1, %hi(D_800E0624) # $s1, 0x800e @@ -873,8 +873,8 @@ glabel func_80090F30 /* 0927F8 80091BF8 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012 /* 0927FC 80091BFC 0C01ECF4 */ jal func_8007B3D0 /* 092800 80091C00 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0 -/* 092804 80091C04 3C0E800E */ lui $t6, %hi(D_800DF4BC) # $t6, 0x800e -/* 092808 80091C08 8DCEF4BC */ lw $t6, %lo(D_800DF4BC)($t6) +/* 092804 80091C04 3C0E800E */ lui $t6, %hi(gNumberOfActivePlayers) # $t6, 0x800e +/* 092808 80091C08 8DCEF4BC */ lw $t6, %lo(gNumberOfActivePlayers)($t6) /* 09280C 80091C0C 8FAF0074 */ lw $t7, 0x74($sp) /* 092810 80091C10 29C10003 */ slti $at, $t6, 3 /* 092814 80091C14 10200022 */ beqz $at, .L80091CA0 @@ -885,9 +885,9 @@ glabel func_80090F30 /* 092828 80091C28 3C01C250 */ li $at, 0xC2500000 # -52.000000 /* 09282C 80091C2C 44814000 */ mtc1 $at, $f8 /* 092830 80091C30 8C590000 */ lw $t9, ($v0) -/* 092834 80091C34 3C09800E */ lui $t1, %hi(D_800DF4BC) # $t1, 0x800e +/* 092834 80091C34 3C09800E */ lui $t1, %hi(gNumberOfActivePlayers) # $t1, 0x800e /* 092838 80091C38 E72800F0 */ swc1 $f8, 0xf0($t9) -/* 09283C 80091C3C 8D29F4BC */ lw $t1, %lo(D_800DF4BC)($t1) +/* 09283C 80091C3C 8D29F4BC */ lw $t1, %lo(gNumberOfActivePlayers)($t1) /* 092840 80091C40 24010001 */ li $at, 1 /* 092844 80091C44 15210009 */ bne $t1, $at, .L80091C6C /* 092848 80091C48 24040007 */ li $a0, 7 @@ -1013,12 +1013,12 @@ glabel func_80090F30 /* 092A14 80091E14 24040001 */ li $a0, 1 /* 092A18 80091E18 0C01EFC7 */ jal func_8007BF1C /* 092A1C 80091E1C 00002025 */ move $a0, $zero -/* 092A20 80091E20 3C15800E */ lui $s5, %hi(D_800E0410) # $s5, 0x800e +/* 092A20 80091E20 3C15800E */ lui $s5, %hi(gMultiplayerSelectedNumberOfRacers) # $s5, 0x800e /* 092A24 80091E24 3C11800E */ lui $s1, %hi(D_800DF4AC) # $s1, 0x800e /* 092A28 80091E28 3C10800E */ lui $s0, %hi(D_800DF4A8) # $s0, 0x800e /* 092A2C 80091E2C 2610F4A8 */ addiu $s0, %lo(D_800DF4A8) # addiu $s0, $s0, -0xb58 /* 092A30 80091E30 2631F4AC */ addiu $s1, %lo(D_800DF4AC) # addiu $s1, $s1, -0xb54 -/* 092A34 80091E34 26B50410 */ addiu $s5, %lo(D_800E0410) # addiu $s5, $s5, 0x410 +/* 092A34 80091E34 26B50410 */ addiu $s5, %lo(gMultiplayerSelectedNumberOfRacers) # addiu $s5, $s5, 0x410 /* 092A38 80091E38 0000A025 */ move $s4, $zero /* 092A3C 80091E3C 241300FF */ li $s3, 255 .L80091E40: @@ -1098,8 +1098,8 @@ glabel func_80090F30 /* 092B50 80091F50 01105821 */ addu $t3, $t0, $s0 /* 092B54 80091F54 E5700010 */ swc1 $f16, 0x10($t3) /* 092B58 80091F58 8FAD0070 */ lw $t5, 0x70($sp) -/* 092B5C 80091F5C 3C18800E */ lui $t8, %hi(D_800DF4C4) # $t8, 0x800e -/* 092B60 80091F60 8F18F4C4 */ lw $t8, %lo(D_800DF4C4)($t8) +/* 092B5C 80091F5C 3C18800E */ lui $t8, %hi(gTrackIdForPreview) # $t8, 0x800e +/* 092B60 80091F60 8F18F4C4 */ lw $t8, %lo(gTrackIdForPreview)($t8) /* 092B64 80091F64 8DAC0004 */ lw $t4, 4($t5) /* 092B68 80091F68 00187880 */ sll $t7, $t8, 2 /* 092B6C 80091F6C 018F7021 */ addu $t6, $t4, $t7 @@ -1122,8 +1122,8 @@ glabel func_80090F30 /* 092BAC 80091FAC E512000C */ swc1 $f18, 0xc($t0) .L80091FB0: /* 092BB0 80091FB0 8FAB0070 */ lw $t3, 0x70($sp) -/* 092BB4 80091FB4 3C18800E */ lui $t8, %hi(D_800DF4C4) # $t8, 0x800e -/* 092BB8 80091FB8 8F18F4C4 */ lw $t8, %lo(D_800DF4C4)($t8) +/* 092BB4 80091FB4 3C18800E */ lui $t8, %hi(gTrackIdForPreview) # $t8, 0x800e +/* 092BB8 80091FB8 8F18F4C4 */ lw $t8, %lo(gTrackIdForPreview)($t8) /* 092BBC 80091FBC 8D6D0004 */ lw $t5, 4($t3) /* 092BC0 80091FC0 00186080 */ sll $t4, $t8, 2 /* 092BC4 80091FC4 01AC7821 */ addu $t7, $t5, $t4 @@ -1148,16 +1148,16 @@ glabel func_80090F30 /* 092C08 80092008 0C01EFC7 */ jal func_8007BF1C /* 092C0C 8009200C 24040001 */ li $a0, 1 .L80092010: -/* 092C10 80092010 3C08800E */ lui $t0, %hi(D_800DF4BC) # $t0, 0x800e -/* 092C14 80092014 8D08F4BC */ lw $t0, %lo(D_800DF4BC)($t0) +/* 092C10 80092010 3C08800E */ lui $t0, %hi(gNumberOfActivePlayers) # $t0, 0x800e +/* 092C14 80092014 8D08F4BC */ lw $t0, %lo(gNumberOfActivePlayers)($t0) /* 092C18 80092018 24010001 */ li $at, 1 /* 092C1C 8009201C 1501001C */ bne $t0, $at, .L80092090 /* 092C20 80092020 3C0B8012 */ lui $t3, %hi(D_801263E0) # $t3, 0x8012 /* 092C24 80092024 8D6B63E0 */ lw $t3, %lo(D_801263E0)($t3) -/* 092C28 80092028 3C04800E */ lui $a0, %hi(D_800DF4C4) # $a0, 0x800e +/* 092C28 80092028 3C04800E */ lui $a0, %hi(gTrackIdForPreview) # $a0, 0x800e /* 092C2C 8009202C 05600018 */ bltz $t3, .L80092090 /* 092C30 80092030 00000000 */ nop -/* 092C34 80092034 8C84F4C4 */ lw $a0, %lo(D_800DF4C4)($a0) +/* 092C34 80092034 8C84F4C4 */ lw $a0, %lo(gTrackIdForPreview)($a0) /* 092C38 80092038 0C024AF8 */ jal func_80092BE0 /* 092C3C 8009203C 00000000 */ nop /* 092C40 80092040 04400013 */ bltz $v0, .L80092090 diff --git a/asm/non_matchings/menu/func_80092188.s b/asm/non_matchings/menu/func_80092188.s index d2b6a55c..ae99fe2a 100644 --- a/asm/non_matchings/menu/func_80092188.s +++ b/asm/non_matchings/menu/func_80092188.s @@ -4,8 +4,8 @@ glabel jpt_800E84F4 .text glabel func_80092188 -/* 092D88 80092188 3C0E800E */ lui $t6, %hi(D_800DF47C) # $t6, 0x800e -/* 092D8C 8009218C 8DCEF47C */ lw $t6, %lo(D_800DF47C)($t6) +/* 092D88 80092188 3C0E800E */ lui $t6, %hi(gMenuDelay) # $t6, 0x800e +/* 092D8C 8009218C 8DCEF47C */ lw $t6, %lo(gMenuDelay)($t6) /* 092D90 80092190 27BDFFA8 */ addiu $sp, $sp, -0x58 /* 092D94 80092194 AFBF001C */ sw $ra, 0x1c($sp) /* 092D98 80092198 AFA40058 */ sw $a0, 0x58($sp) @@ -55,8 +55,8 @@ glabel func_80092188 /* 092E40 80092240 240F0002 */ li $t7, 2 /* 092E44 80092244 AD8F0000 */ sw $t7, ($t4) .L80092248: -/* 092E48 80092248 3C18800E */ lui $t8, %hi(D_800DF4C4) # $t8, 0x800e -/* 092E4C 8009224C 8F18F4C4 */ lw $t8, %lo(D_800DF4C4)($t8) +/* 092E48 80092248 3C18800E */ lui $t8, %hi(gTrackIdForPreview) # $t8, 0x800e +/* 092E4C 8009224C 8F18F4C4 */ lw $t8, %lo(gTrackIdForPreview)($t8) /* 092E50 80092250 3C02800E */ lui $v0, %hi(D_800E0758) # $v0, 0x800e /* 092E54 80092254 0018C840 */ sll $t9, $t8, 1 /* 092E58 80092258 00591021 */ addu $v0, $v0, $t9 @@ -75,8 +75,8 @@ glabel func_80092188 /* 092E8C 8009228C 24C60980 */ addiu $a2, %lo(D_800E0980) # addiu $a2, $a2, 0x980 /* 092E90 80092290 ACC00000 */ sw $zero, ($a2) .L80092294: -/* 092E94 80092294 3C02800E */ lui $v0, %hi(D_800DF47C) # $v0, 0x800e -/* 092E98 80092298 8C42F47C */ lw $v0, %lo(D_800DF47C)($v0) +/* 092E94 80092294 3C02800E */ lui $v0, %hi(gMenuDelay) # $v0, 0x800e +/* 092E98 80092298 8C42F47C */ lw $v0, %lo(gMenuDelay)($v0) /* 092E9C 8009229C 00000000 */ nop /* 092EA0 800922A0 04410037 */ bgez $v0, .L80092380 /* 092EA4 800922A4 24490019 */ addiu $t1, $v0, 0x19 @@ -122,7 +122,7 @@ glabel func_80092188 /* 092F3C 8009233C 3C03800E */ lui $v1, %hi(D_800DF75C) # $v1, 0x800e /* 092F40 80092340 2463F75C */ addiu $v1, %lo(D_800DF75C) # addiu $v1, $v1, -0x8a4 /* 092F44 80092344 8C6E0000 */ lw $t6, ($v1) -/* 092F48 80092348 3C02800E */ lui $v0, %hi(D_800DF47C) # $v0, 0x800e +/* 092F48 80092348 3C02800E */ lui $v0, %hi(gMenuDelay) # $v0, 0x800e /* 092F4C 8009234C 460A8000 */ add.s $f0, $f16, $f10 /* 092F50 80092350 46009102 */ mul.s $f4, $f18, $f0 /* 092F54 80092354 E5C40088 */ swc1 $f4, 0x88($t6) @@ -134,7 +134,7 @@ glabel func_80092188 /* 092F6C 8009236C 8C780000 */ lw $t8, ($v1) /* 092F70 80092370 46008282 */ mul.s $f10, $f16, $f0 /* 092F74 80092374 E70A00C8 */ swc1 $f10, 0xc8($t8) -/* 092F78 80092378 8C42F47C */ lw $v0, %lo(D_800DF47C)($v0) +/* 092F78 80092378 8C42F47C */ lw $v0, %lo(gMenuDelay)($v0) /* 092F7C 8009237C 00000000 */ nop .L80092380: /* 092F80 80092380 18400008 */ blez $v0, .L800923A4 @@ -176,10 +176,10 @@ glabel func_80092188 /* 093000 80092400 0C019A06 */ jal func_80066818 /* 093004 80092404 24050001 */ li $a1, 1 /* 093008 80092408 8FB90030 */ lw $t9, 0x30($sp) -/* 09300C 8009240C 3C04800E */ lui $a0, %hi(D_800DF4C4) # $a0, 0x800e +/* 09300C 8009240C 3C04800E */ lui $a0, %hi(gTrackIdForPreview) # $a0, 0x800e /* 093010 80092410 172001F0 */ bnez $t9, .L80092BD4 /* 093014 80092414 8FBF001C */ lw $ra, 0x1c($sp) -/* 093018 80092418 8C84F4C4 */ lw $a0, %lo(D_800DF4C4)($a0) +/* 093018 80092418 8C84F4C4 */ lw $a0, %lo(gTrackIdForPreview)($a0) /* 09301C 8009241C 0C01AC3E */ jal func_8006B0F8 /* 093020 80092420 00000000 */ nop /* 093024 80092424 3C0C8012 */ lui $t4, %hi(D_801263E0) # $t4, 0x8012 @@ -223,9 +223,9 @@ glabel L8009246C /* 0930AC 800924AC 30784000 */ andi $t8, $v1, 0x4000 /* 0930B0 800924B0 13000006 */ beqz $t8, .L800924CC /* 0930B4 800924B4 3C028012 */ lui $v0, %hi(D_80126838) # $v0, 0x8012 -/* 0930B8 800924B8 3C01800E */ lui $at, %hi(D_800DF47C) # $at, 0x800e +/* 0930B8 800924B8 3C01800E */ lui $at, %hi(gMenuDelay) # $at, 0x800e /* 0930BC 800924BC 240E0001 */ li $t6, 1 -/* 0930C0 800924C0 AC2DF47C */ sw $t5, %lo(D_800DF47C)($at) +/* 0930C0 800924C0 AC2DF47C */ sw $t5, %lo(gMenuDelay)($at) /* 0930C4 800924C4 10000194 */ b .L80092B18 /* 0930C8 800924C8 AFAE003C */ sw $t6, 0x3c($sp) .L800924CC: @@ -251,14 +251,14 @@ glabel L8009246C /* 093114 80092514 10000180 */ b .L80092B18 /* 093118 80092518 AFBF0034 */ sw $ra, 0x34($sp) glabel L8009251C -/* 09311C 8009251C 3C0A800E */ lui $t2, %hi(D_800DF4BC) # $t2, 0x800e -/* 093120 80092520 8D4AF4BC */ lw $t2, %lo(D_800DF4BC)($t2) +/* 09311C 8009251C 3C0A800E */ lui $t2, %hi(gNumberOfActivePlayers) # $t2, 0x800e +/* 093120 80092520 8D4AF4BC */ lw $t2, %lo(gNumberOfActivePlayers)($t2) /* 093124 80092524 00002825 */ move $a1, $zero /* 093128 80092528 19400072 */ blez $t2, .L800926F4 /* 09312C 8009252C 3C088012 */ lui $t0, %hi(D_801267D8) # $t0, 0x8012 /* 093130 80092530 3C0B8012 */ lui $t3, %hi(D_801269C4) # $t3, 0x8012 -/* 093134 80092534 3C09800E */ lui $t1, %hi(D_800DF480) # $t1, 0x800e -/* 093138 80092538 2529F480 */ addiu $t1, %lo(D_800DF480) # addiu $t1, $t1, -0xb80 +/* 093134 80092534 3C09800E */ lui $t1, %hi(gNumberOfReadyPlayers) # $t1, 0x800e +/* 093138 80092538 2529F480 */ addiu $t1, %lo(gNumberOfReadyPlayers) # addiu $t1, $t1, -0xb80 /* 09313C 8009253C 256B69C4 */ addiu $t3, %lo(D_801269C4) # addiu $t3, $t3, 0x69c4 /* 093140 80092540 250867D8 */ addiu $t0, %lo(D_801267D8) # addiu $t0, $t0, 0x67d8 /* 093144 80092544 241F0001 */ li $ra, 1 @@ -279,23 +279,23 @@ glabel L8009251C /* 09317C 8009257C 8FA4004C */ lw $a0, 0x4c($sp) /* 093180 80092580 8FA50040 */ lw $a1, 0x40($sp) /* 093184 80092584 8FA80024 */ lw $t0, 0x24($sp) -/* 093188 80092588 3C09800E */ lui $t1, %hi(D_800DF480) # $t1, 0x800e +/* 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 /* 093198 80092598 256B69C4 */ addiu $t3, %lo(D_801269C4) # addiu $t3, $t3, 0x69c4 -/* 09319C 8009259C 2529F480 */ addiu $t1, %lo(D_800DF480) # addiu $t1, $t1, -0xb80 +/* 09319C 8009259C 2529F480 */ addiu $t1, %lo(gNumberOfReadyPlayers) # addiu $t1, $t1, -0xb80 /* 0931A0 800925A0 240DFFFF */ li $t5, -1 /* 0931A4 800925A4 10400003 */ beqz $v0, .L800925B4 /* 0931A8 800925A8 241F0001 */ li $ra, 1 /* 0931AC 800925AC 10000003 */ b .L800925BC /* 0931B0 800925B0 AD8D0000 */ sw $t5, ($t4) .L800925B4: -/* 0931B4 800925B4 3C01800E */ lui $at, %hi(D_800DF47C) # $at, 0x800e -/* 0931B8 800925B8 AC2DF47C */ sw $t5, %lo(D_800DF47C)($at) +/* 0931B4 800925B4 3C01800E */ lui $at, %hi(gMenuDelay) # $at, 0x800e +/* 0931B8 800925B8 AC2DF47C */ sw $t5, %lo(gMenuDelay)($at) .L800925BC: -/* 0931BC 800925BC 3C0A800E */ lui $t2, %hi(D_800DF4BC) # $t2, 0x800e -/* 0931C0 800925C0 8D4AF4BC */ lw $t2, %lo(D_800DF4BC)($t2) +/* 0931BC 800925BC 3C0A800E */ lui $t2, %hi(gNumberOfActivePlayers) # $t2, 0x800e +/* 0931C0 800925C0 8D4AF4BC */ lw $t2, %lo(gNumberOfActivePlayers)($t2) /* 0931C4 800925C4 10000048 */ b .L800926E8 /* 0931C8 800925C8 24A50001 */ addiu $a1, $a1, 1 .L800925CC: @@ -323,8 +323,8 @@ glabel L8009251C /* 093218 80092618 80580000 */ lb $t8, ($v0) /* 09321C 8009261C 8FAE002C */ lw $t6, 0x2c($sp) /* 093220 80092620 17000030 */ bnez $t8, .L800926E4 -/* 093224 80092624 3C0F800E */ lui $t7, %hi(D_800DF4C4) # $t7, 0x800e -/* 093228 80092628 8DEFF4C4 */ lw $t7, %lo(D_800DF4C4)($t7) +/* 093224 80092624 3C0F800E */ lui $t7, %hi(gTrackIdForPreview) # $t7, 0x800e +/* 093228 80092628 8DEFF4C4 */ lw $t7, %lo(gTrackIdForPreview)($t7) /* 09322C 8009262C 8DD90004 */ lw $t9, 4($t6) /* 093230 80092630 000FC080 */ sll $t8, $t7, 2 /* 093234 80092634 03387021 */ addu $t6, $t9, $t8 @@ -384,8 +384,8 @@ glabel L8009251C /* 0932EC 800926EC 1420FF96 */ bnez $at, .L80092548 /* 0932F0 800926F0 25080004 */ addiu $t0, $t0, 4 .L800926F4: -/* 0932F4 800926F4 3C09800E */ lui $t1, %hi(D_800DF480) # $t1, 0x800e -/* 0932F8 800926F8 2529F480 */ addiu $t1, %lo(D_800DF480) # addiu $t1, $t1, -0xb80 +/* 0932F4 800926F4 3C09800E */ lui $t1, %hi(gNumberOfReadyPlayers) # $t1, 0x800e +/* 0932F8 800926F8 2529F480 */ addiu $t1, %lo(gNumberOfReadyPlayers) # addiu $t1, $t1, -0xb80 /* 0932FC 800926FC 8D2F0000 */ lw $t7, ($t1) /* 093300 80092700 241F0001 */ li $ra, 1 /* 093304 80092704 154F0104 */ bne $t2, $t7, .L80092B18 @@ -420,10 +420,10 @@ glabel L80092740 /* 09336C 8009276C AFAF0038 */ sw $t7, 0x38($sp) .L80092770: /* 093370 80092770 13200009 */ beqz $t9, .L80092798 -/* 093374 80092774 3C09800E */ lui $t1, %hi(D_800DF480) # $t1, 0x800e +/* 093374 80092774 3C09800E */ lui $t1, %hi(gNumberOfReadyPlayers) # $t1, 0x800e /* 093378 80092778 3C0B8012 */ lui $t3, %hi(D_801269C4) # $t3, 0x8012 /* 09337C 8009277C 256B69C4 */ addiu $t3, %lo(D_801269C4) # addiu $t3, $t3, 0x69c4 -/* 093380 80092780 2529F480 */ addiu $t1, %lo(D_800DF480) # addiu $t1, $t1, -0xb80 +/* 093380 80092780 2529F480 */ addiu $t1, %lo(gNumberOfReadyPlayers) # addiu $t1, $t1, -0xb80 /* 093384 80092784 24180001 */ li $t8, 1 /* 093388 80092788 A1600000 */ sb $zero, ($t3) /* 09338C 8009278C AD200000 */ sw $zero, ($t1) @@ -470,7 +470,7 @@ glabel L80092740 /* 093424 80092824 00000000 */ nop .L80092828: /* 093428 80092828 00002025 */ move $a0, $zero -/* 09342C 8009282C 0C01BE53 */ jal func_8006F94C +/* 09342C 8009282C 0C01BE53 */ jal get_random_number_from_range /* 093430 80092830 240500FF */ li $a1, 255 /* 093434 80092834 28410080 */ slti $at, $v0, 0x80 /* 093438 80092838 14200007 */ bnez $at, .L80092858 @@ -495,8 +495,8 @@ glabel L80092740 glabel L8009287C /* 09347C 8009287C 24010002 */ li $at, 2 /* 093480 80092880 1461003E */ bne $v1, $at, .L8009297C -/* 093484 80092884 3C19800E */ lui $t9, %hi(D_800DF4BC) # $t9, 0x800e -/* 093488 80092888 8F39F4BC */ lw $t9, %lo(D_800DF4BC)($t9) +/* 093484 80092884 3C19800E */ lui $t9, %hi(gNumberOfActivePlayers) # $t9, 0x800e +/* 093488 80092888 8F39F4BC */ lw $t9, %lo(gNumberOfActivePlayers)($t9) /* 09348C 8009288C 24010002 */ li $at, 2 /* 093490 80092890 1721003A */ bne $t9, $at, .L8009297C /* 093494 80092894 3C188012 */ lui $t8, %hi(D_801269C8) # $t8, 0x8012 @@ -517,8 +517,8 @@ glabel L8009287C .L800928D0: /* 0934D0 800928D0 13000014 */ beqz $t8, .L80092924 /* 0934D4 800928D4 3C038012 */ lui $v1, %hi(D_80126820) # $v1, 0x8012 -/* 0934D8 800928D8 3C09800E */ lui $t1, %hi(D_800DF480) # $t1, 0x800e -/* 0934DC 800928DC 2529F480 */ addiu $t1, %lo(D_800DF480) # addiu $t1, $t1, -0xb80 +/* 0934D8 800928D8 3C09800E */ lui $t1, %hi(gNumberOfReadyPlayers) # $t1, 0x800e +/* 0934DC 800928DC 2529F480 */ addiu $t1, %lo(gNumberOfReadyPlayers) # addiu $t1, $t1, -0xb80 /* 0934E0 800928E0 8D2E0000 */ lw $t6, ($t1) /* 0934E4 800928E4 8C990000 */ lw $t9, ($a0) /* 0934E8 800928E8 25CFFFFF */ addiu $t7, $t6, -1 @@ -540,9 +540,9 @@ glabel L8009287C /* 093520 80092920 AFAE003C */ sw $t6, 0x3c($sp) .L80092924: /* 093524 80092924 84636820 */ lh $v1, %lo(D_80126820)($v1) -/* 093528 80092928 3C04800E */ lui $a0, %hi(D_800E0410) # $a0, 0x800e +/* 093528 80092928 3C04800E */ lui $a0, %hi(gMultiplayerSelectedNumberOfRacers) # $a0, 0x800e /* 09352C 8009292C 04610008 */ bgez $v1, .L80092950 -/* 093530 80092930 24840410 */ addiu $a0, %lo(D_800E0410) # addiu $a0, $a0, 0x410 +/* 093530 80092930 24840410 */ addiu $a0, %lo(gMultiplayerSelectedNumberOfRacers) # addiu $a0, $a0, 0x410 /* 093534 80092934 8C820000 */ lw $v0, ($a0) /* 093538 80092938 240F0001 */ li $t7, 1 /* 09353C 8009293C 18400004 */ blez $v0, .L80092950 @@ -551,9 +551,9 @@ glabel L8009287C /* 093548 80092948 10000073 */ b .L80092B18 /* 09354C 8009294C AC990000 */ sw $t9, ($a0) .L80092950: -/* 093550 80092950 3C04800E */ lui $a0, %hi(D_800E0410) # $a0, 0x800e +/* 093550 80092950 3C04800E */ lui $a0, %hi(gMultiplayerSelectedNumberOfRacers) # $a0, 0x800e /* 093554 80092954 18600070 */ blez $v1, .L80092B18 -/* 093558 80092958 24840410 */ addiu $a0, %lo(D_800E0410) # addiu $a0, $a0, 0x410 +/* 093558 80092958 24840410 */ addiu $a0, %lo(gMultiplayerSelectedNumberOfRacers) # addiu $a0, $a0, 0x410 /* 09355C 8009295C 8C820000 */ lw $v0, ($a0) /* 093560 80092960 24180001 */ li $t8, 1 /* 093564 80092964 28410002 */ slti $at, $v0, 2 @@ -570,8 +570,8 @@ glabel L8009287C /* 09358C 8009298C 306F9000 */ andi $t7, $v1, 0x9000 /* 093590 80092990 11E00015 */ beqz $t7, .L800929E8 /* 093594 80092994 3C028012 */ lui $v0, %hi(D_801269C8) # $v0, 0x8012 -/* 093598 80092998 3C01800E */ lui $at, %hi(D_800DF47C) # $at, 0x800e -/* 09359C 8009299C AC3FF47C */ sw $ra, %lo(D_800DF47C)($at) +/* 093598 80092998 3C01800E */ lui $at, %hi(gMenuDelay) # $at, 0x800e +/* 09359C 8009299C AC3FF47C */ sw $ra, %lo(gMenuDelay)($at) /* 0935A0 800929A0 0C01E2AB */ jal func_80078AAC /* 0935A4 800929A4 00002025 */ move $a0, $zero /* 0935A8 800929A8 3C01800E */ lui $at, %hi(D_800E097C) # $at, 0x800e @@ -596,7 +596,7 @@ glabel L8009287C /* 0935EC 800929EC 306E4000 */ andi $t6, $v1, 0x4000 /* 0935F0 800929F0 28410004 */ slti $at, $v0, 4 /* 0935F4 800929F4 1420001C */ bnez $at, .L80092A68 -/* 0935F8 800929F8 3C0A800E */ lui $t2, %hi(D_800DF4BC) # $t2, 0x800e +/* 0935F8 800929F8 3C0A800E */ lui $t2, %hi(gNumberOfActivePlayers) # $t2, 0x800e /* 0935FC 800929FC 11C00046 */ beqz $t6, .L80092B18 /* 093600 80092A00 240F0001 */ li $t7, 1 /* 093604 80092A04 24010004 */ li $at, 4 @@ -615,9 +615,9 @@ glabel L8009287C /* 093638 80092A38 24010005 */ li $at, 5 .L80092A3C: /* 09363C 80092A3C 3C028012 */ lui $v0, %hi(D_801269C8) # $v0, 0x8012 -/* 093640 80092A40 3C01800E */ lui $at, %hi(D_800DF47C) # $at, 0x800e +/* 093640 80092A40 3C01800E */ lui $at, %hi(gMenuDelay) # $at, 0x800e /* 093644 80092A44 8C4269C8 */ lw $v0, %lo(D_801269C8)($v0) -/* 093648 80092A48 AC2DF47C */ sw $t5, %lo(D_800DF47C)($at) +/* 093648 80092A48 AC2DF47C */ sw $t5, %lo(gMenuDelay)($at) /* 09364C 80092A4C 24010005 */ li $at, 5 .L80092A50: /* 093650 80092A50 14410032 */ bne $v0, $at, .L80092B1C @@ -627,7 +627,7 @@ glabel L8009287C /* 093660 80092A60 1000002E */ b .L80092B1C /* 093664 80092A64 8FAF003C */ lw $t7, 0x3c($sp) .L80092A68: -/* 093668 80092A68 8D4AF4BC */ lw $t2, %lo(D_800DF4BC)($t2) +/* 093668 80092A68 8D4AF4BC */ lw $t2, %lo(gNumberOfActivePlayers)($t2) /* 09366C 80092A6C 241F0001 */ li $ra, 1 /* 093670 80092A70 17EA0009 */ bne $ra, $t2, .L80092A98 /* 093674 80092A74 24010002 */ li $at, 2 @@ -653,8 +653,8 @@ glabel L8009287C /* 0936BC 80092ABC 00002825 */ move $a1, $zero /* 0936C0 80092AC0 3C088012 */ lui $t0, %hi(D_801267D8) # $t0, 0x8012 /* 0936C4 80092AC4 3C0B8012 */ lui $t3, %hi(D_801269C4) # $t3, 0x8012 -/* 0936C8 80092AC8 3C09800E */ lui $t1, %hi(D_800DF480) # $t1, 0x800e -/* 0936CC 80092ACC 2529F480 */ addiu $t1, %lo(D_800DF480) # addiu $t1, $t1, -0xb80 +/* 0936C8 80092AC8 3C09800E */ lui $t1, %hi(gNumberOfReadyPlayers) # $t1, 0x800e +/* 0936CC 80092ACC 2529F480 */ addiu $t1, %lo(gNumberOfReadyPlayers) # addiu $t1, $t1, -0xb80 /* 0936D0 80092AD0 256B69C4 */ addiu $t3, %lo(D_801269C4) # addiu $t3, $t3, 0x69c4 /* 0936D4 80092AD4 250867D8 */ addiu $t0, %lo(D_801267D8) # addiu $t0, $t0, 0x67d8 .L80092AD8: @@ -704,8 +704,8 @@ glabel L8009287C /* 09376C 80092B6C 808469C0 */ lb $a0, %lo(gPlayerSelectVehicle)($a0) /* 093770 80092B70 0C01B6C5 */ jal func_8006DB14 /* 093774 80092B74 00000000 */ nop -/* 093778 80092B78 3C0E800E */ lui $t6, %hi(D_800DF4BC) # $t6, 0x800e -/* 09377C 80092B7C 8DCEF4BC */ lw $t6, %lo(D_800DF4BC)($t6) +/* 093778 80092B78 3C0E800E */ lui $t6, %hi(gNumberOfActivePlayers) # $t6, 0x800e +/* 09377C 80092B7C 8DCEF4BC */ lw $t6, %lo(gNumberOfActivePlayers)($t6) /* 093780 80092B80 3C0F8012 */ lui $t7, %hi(D_801269C8) # $t7, 0x8012 /* 093784 80092B84 29C10002 */ slti $at, $t6, 2 /* 093788 80092B88 10200006 */ beqz $at, .L80092BA4 @@ -716,13 +716,13 @@ glabel L8009287C /* 09379C 80092B9C 14200005 */ bnez $at, .L80092BB4 /* 0937A0 80092BA0 00000000 */ nop .L80092BA4: -/* 0937A4 80092BA4 0C00392F */ jal func_8000E4BC +/* 0937A4 80092BA4 0C00392F */ jal set_time_trial_enabled /* 0937A8 80092BA8 00002025 */ move $a0, $zero /* 0937AC 80092BAC 10000004 */ b .L80092BC0 /* 0937B0 80092BB0 00000000 */ nop .L80092BB4: /* 0937B4 80092BB4 8C840414 */ lw $a0, %lo(D_800E0414)($a0) -/* 0937B8 80092BB8 0C00392F */ jal func_8000E4BC +/* 0937B8 80092BB8 0C00392F */ jal set_time_trial_enabled /* 0937BC 80092BBC 00000000 */ nop .L80092BC0: /* 0937C0 80092BC0 3C19800E */ lui $t9, %hi(D_800E0418) # $t9, 0x800e diff --git a/asm/non_matchings/menu/func_80092E94.s b/asm/non_matchings/menu/func_80092E94.s index 67565c33..81cd42f9 100644 --- a/asm/non_matchings/menu/func_80092E94.s +++ b/asm/non_matchings/menu/func_80092E94.s @@ -16,8 +16,8 @@ glabel func_80092E94 /* 093ACC 80092ECC 00002825 */ move $a1, $zero /* 093AD0 80092ED0 2405000C */ li $a1, 12 .L80092ED4: -/* 093AD4 80092ED4 3C18800E */ lui $t8, %hi(D_800DF4C4) # $t8, 0x800e -/* 093AD8 80092ED8 8F18F4C4 */ lw $t8, %lo(D_800DF4C4)($t8) +/* 093AD4 80092ED4 3C18800E */ lui $t8, %hi(gTrackIdForPreview) # $t8, 0x800e +/* 093AD8 80092ED8 8F18F4C4 */ lw $t8, %lo(gTrackIdForPreview)($t8) /* 093ADC 80092EDC 8C8F004C */ lw $t7, 0x4c($a0) /* 093AE0 80092EE0 3C128012 */ lui $s2, %hi(D_801263A0) # $s2, 0x8012 /* 093AE4 80092EE4 265263A0 */ addiu $s2, %lo(D_801263A0) # addiu $s2, $s2, 0x63a0 @@ -38,8 +38,8 @@ glabel func_80092E94 /* 093B20 80092F20 24A563A8 */ addiu $a1, %lo(D_801263A8) # addiu $a1, $a1, 0x63a8 /* 093B24 80092F24 0C019FCB */ jal func_80067F2C /* 093B28 80092F28 02402025 */ move $a0, $s2 -/* 093B2C 80092F2C 3C02800E */ lui $v0, %hi(D_800DF47C) # $v0, 0x800e -/* 093B30 80092F30 8C42F47C */ lw $v0, %lo(D_800DF47C)($v0) +/* 093B2C 80092F2C 3C02800E */ lui $v0, %hi(gMenuDelay) # $v0, 0x800e +/* 093B30 80092F30 8C42F47C */ lw $v0, %lo(gMenuDelay)($v0) /* 093B34 80092F34 00000000 */ nop /* 093B38 80092F38 2841FFEC */ slti $at, $v0, -0x14 /* 093B3C 80092F3C 142001AA */ bnez $at, .L800935E8 @@ -96,7 +96,7 @@ glabel func_80092E94 /* 093C08 80093008 8FBF0034 */ lw $ra, 0x34($sp) /* 093C0C 8009300C 16200141 */ bnez $s1, .L80093514 /* 093C10 80093010 00000000 */ nop -/* 093C14 80093014 0C003932 */ jal func_8000E4C8 +/* 093C14 80093014 0C003932 */ jal is_time_trial_enabled /* 093C18 80093018 00000000 */ nop /* 093C1C 8009301C 10400091 */ beqz $v0, .L80093264 /* 093C20 80093020 00000000 */ nop @@ -200,10 +200,10 @@ glabel func_80092E94 /* 093DA4 800931A4 0C031110 */ jal draw_text /* 093DA8 800931A8 02003825 */ move $a3, $s0 /* 093DAC 800931AC 8FA20050 */ lw $v0, 0x50($sp) -/* 093DB0 800931B0 3C0D800E */ lui $t5, %hi(D_800DF4C4) # $t5, 0x800e +/* 093DB0 800931B0 3C0D800E */ lui $t5, %hi(gTrackIdForPreview) # $t5, 0x800e /* 093DB4 800931B4 3C198012 */ lui $t9, %hi(gPlayerSelectVehicle) # $t9, 0x8012 /* 093DB8 800931B8 833969C0 */ lb $t9, %lo(gPlayerSelectVehicle)($t9) -/* 093DBC 800931BC 8DADF4C4 */ lw $t5, %lo(D_800DF4C4)($t5) +/* 093DBC 800931BC 8DADF4C4 */ lw $t5, %lo(gTrackIdForPreview)($t5) /* 093DC0 800931C0 8C4C004C */ lw $t4, 0x4c($v0) /* 093DC4 800931C4 00194880 */ sll $t1, $t9, 2 /* 093DC8 800931C8 018D7021 */ addu $t6, $t4, $t5 @@ -224,8 +224,8 @@ glabel func_80092E94 /* 093E04 80093204 24070080 */ li $a3, 128 /* 093E08 80093208 8FAE0050 */ lw $t6, 0x50($sp) /* 093E0C 8009320C 3C188012 */ lui $t8, %hi(gPlayerSelectVehicle) # $t8, 0x8012 -/* 093E10 80093210 3C0F800E */ lui $t7, %hi(D_800DF4C4) # $t7, 0x800e -/* 093E14 80093214 8DEFF4C4 */ lw $t7, %lo(D_800DF4C4)($t7) +/* 093E10 80093210 3C0F800E */ lui $t7, %hi(gTrackIdForPreview) # $t7, 0x800e +/* 093E14 80093214 8DEFF4C4 */ lw $t7, %lo(gTrackIdForPreview)($t7) /* 093E18 80093218 831869C0 */ lb $t8, %lo(gPlayerSelectVehicle)($t8) /* 093E1C 8009321C 8DCA004C */ lw $t2, 0x4c($t6) /* 093E20 80093220 0018C880 */ sll $t9, $t8, 2 diff --git a/asm/non_matchings/menu/func_80093A40.s b/asm/non_matchings/menu/func_80093A40.s index 4edd49d2..4a7da61e 100644 --- a/asm/non_matchings/menu/func_80093A40.s +++ b/asm/non_matchings/menu/func_80093A40.s @@ -82,28 +82,28 @@ glabel func_80093A40 /* 094770 80093B70 24180002 */ li $t8, 2 /* 094774 80093B74 8DCF0200 */ lw $t7, 0x200($t6) /* 094778 80093B78 ACB80000 */ sw $t8, ($a1) -/* 09477C 80093B7C 3C02800E */ lui $v0, %hi(D_800DF4B8) # $v0, 0x800e +/* 09477C 80093B7C 3C02800E */ lui $v0, %hi(gIsInTracksMode) # $v0, 0x800e /* 094780 80093B80 AE2F0004 */ sw $t7, 4($s1) -/* 094784 80093B84 8C42F4B8 */ lw $v0, %lo(D_800DF4B8)($v0) +/* 094784 80093B84 8C42F4B8 */ lw $v0, %lo(gIsInTracksMode)($v0) /* 094788 80093B88 1000003F */ b .L80093C88 /* 09478C 80093B8C 00000000 */ nop .L80093B90: /* 094790 80093B90 8FB90024 */ lw $t9, 0x24($sp) /* 094794 80093B94 24010008 */ li $at, 8 /* 094798 80093B98 93280048 */ lbu $t0, 0x48($t9) -/* 09479C 80093B9C 3C02800E */ lui $v0, %hi(D_800DF4B8) # $v0, 0x800e +/* 09479C 80093B9C 3C02800E */ lui $v0, %hi(gIsInTracksMode) # $v0, 0x800e /* 0947A0 80093BA0 1900002B */ blez $t0, .L80093C50 /* 0947A4 80093BA4 00000000 */ nop /* 0947A8 80093BA8 12010029 */ beq $s0, $at, .L80093C50 /* 0947AC 80093BAC 32090040 */ andi $t1, $s0, 0x40 /* 0947B0 80093BB0 11200012 */ beqz $t1, .L80093BFC -/* 0947B4 80093BB4 3C02800E */ lui $v0, %hi(D_800DF4B8) # $v0, 0x800e +/* 0947B4 80093BB4 3C02800E */ lui $v0, %hi(gIsInTracksMode) # $v0, 0x800e /* 0947B8 80093BB8 8CC30000 */ lw $v1, ($a2) -/* 0947BC 80093BBC 3C0B800E */ lui $t3, %hi(D_800DF4B8) # $t3, 0x800e +/* 0947BC 80093BBC 3C0B800E */ lui $t3, %hi(gIsInTracksMode) # $t3, 0x800e /* 0947C0 80093BC0 8C6A01FC */ lw $t2, 0x1fc($v1) /* 0947C4 80093BC4 240E0003 */ li $t6, 3 /* 0947C8 80093BC8 AE2A0004 */ sw $t2, 4($s1) -/* 0947CC 80093BCC 8D6BF4B8 */ lw $t3, %lo(D_800DF4B8)($t3) +/* 0947CC 80093BCC 8D6BF4B8 */ lw $t3, %lo(gIsInTracksMode)($t3) /* 0947D0 80093BD0 00000000 */ nop /* 0947D4 80093BD4 15600004 */ bnez $t3, .L80093BE8 /* 0947D8 80093BD8 00000000 */ nop @@ -121,11 +121,11 @@ glabel func_80093A40 /* 0947FC 80093BFC 16000011 */ bnez $s0, .L80093C44 /* 094800 80093C00 24090003 */ li $t1, 3 /* 094804 80093C04 8CC30000 */ lw $v1, ($a2) -/* 094808 80093C08 3C18800E */ lui $t8, %hi(D_800DF4B8) # $t8, 0x800e +/* 094808 80093C08 3C18800E */ lui $t8, %hi(gIsInTracksMode) # $t8, 0x800e /* 09480C 80093C0C 8C6F01F8 */ lw $t7, 0x1f8($v1) /* 094810 80093C10 00000000 */ nop /* 094814 80093C14 AE2F0004 */ sw $t7, 4($s1) -/* 094818 80093C18 8F18F4B8 */ lw $t8, %lo(D_800DF4B8)($t8) +/* 094818 80093C18 8F18F4B8 */ lw $t8, %lo(gIsInTracksMode)($t8) /* 09481C 80093C1C 00000000 */ nop /* 094820 80093C20 17000004 */ bnez $t8, .L80093C34 /* 094824 80093C24 00000000 */ nop @@ -139,11 +139,11 @@ glabel func_80093A40 .L80093C40: /* 094840 80093C40 ACA90000 */ sw $t1, ($a1) .L80093C44: -/* 094844 80093C44 8C42F4B8 */ lw $v0, %lo(D_800DF4B8)($v0) +/* 094844 80093C44 8C42F4B8 */ lw $v0, %lo(gIsInTracksMode)($v0) /* 094848 80093C48 1000000F */ b .L80093C88 /* 09484C 80093C4C 00000000 */ nop .L80093C50: -/* 094850 80093C50 8C42F4B8 */ lw $v0, %lo(D_800DF4B8)($v0) +/* 094850 80093C50 8C42F4B8 */ lw $v0, %lo(gIsInTracksMode)($v0) /* 094854 80093C54 24010008 */ li $at, 8 /* 094858 80093C58 1440000B */ bnez $v0, .L80093C88 /* 09485C 80093C5C 00000000 */ nop @@ -161,8 +161,8 @@ glabel func_80093A40 /* 094888 80093C88 3C03800E */ lui $v1, %hi(D_800DF4A0) # $v1, 0x800e /* 09488C 80093C8C 8C63F4A0 */ lw $v1, %lo(D_800DF4A0)($v1) /* 094890 80093C90 14E2000C */ bne $a3, $v0, .L80093CC4 -/* 094894 80093C94 3C0D800E */ lui $t5, %hi(D_800DF4BC) # $t5, 0x800e -/* 094898 80093C98 8DADF4BC */ lw $t5, %lo(D_800DF4BC)($t5) +/* 094894 80093C94 3C0D800E */ lui $t5, %hi(gNumberOfActivePlayers) # $t5, 0x800e +/* 094898 80093C98 8DADF4BC */ lw $t5, %lo(gNumberOfActivePlayers)($t5) /* 09489C 80093C9C 00000000 */ nop /* 0948A0 80093CA0 14ED0008 */ bne $a3, $t5, .L80093CC4 /* 0948A4 80093CA4 00000000 */ nop @@ -195,12 +195,12 @@ glabel func_80093A40 /* 094904 80093D04 AC206A68 */ sw $zero, %lo(D_80126A68)($at) /* 094908 80093D08 3C018012 */ lui $at, %hi(D_801263BC) # $at, 0x8012 /* 09490C 80093D0C AC2063BC */ sw $zero, %lo(D_801263BC)($at) -/* 094910 80093D10 3C01800E */ lui $at, %hi(D_800DF47C) # $at, 0x800e -/* 094914 80093D14 AC20F47C */ sw $zero, %lo(D_800DF47C)($at) -/* 094918 80093D18 3C018012 */ lui $at, %hi(D_801263C4) # $at, 0x8012 -/* 09491C 80093D1C AC2763C4 */ sw $a3, %lo(D_801263C4)($at) +/* 094910 80093D10 3C01800E */ lui $at, %hi(gMenuDelay) # $at, 0x800e +/* 094914 80093D14 AC20F47C */ sw $zero, %lo(gMenuDelay)($at) +/* 094918 80093D18 3C018012 */ lui $at, %hi(gIgnorePlayerInput) # $at, 0x8012 +/* 09491C 80093D1C AC2763C4 */ sw $a3, %lo(gIgnorePlayerInput)($at) /* 094920 80093D20 3C01800E */ lui $at, %hi(D_800E0988) # $at, 0x800e -/* 094924 80093D24 0C026F97 */ jal func_8009BE5C +/* 094924 80093D24 0C026F97 */ jal reset_controller_sticks /* 094928 80093D28 AC200988 */ sw $zero, %lo(D_800E0988)($at) /* 09492C 80093D2C 8FBF001C */ lw $ra, 0x1c($sp) /* 094930 80093D30 8FB00014 */ lw $s0, 0x14($sp) diff --git a/asm/non_matchings/menu/func_80094170.s b/asm/non_matchings/menu/func_80094170.s index a3e7bc18..6c91eb4b 100644 --- a/asm/non_matchings/menu/func_80094170.s +++ b/asm/non_matchings/menu/func_80094170.s @@ -22,18 +22,18 @@ glabel func_80094170 /* 094DBC 800941BC 3329003F */ andi $t1, $t9, 0x3f /* 094DC0 800941C0 0C026FC8 */ jal func_8009BF20 /* 094DC4 800941C4 AC490000 */ sw $t1, ($v0) -/* 094DC8 800941C8 3C0A8012 */ lui $t2, %hi(D_801263C4) # $t2, 0x8012 -/* 094DCC 800941CC 8D4A63C4 */ lw $t2, %lo(D_801263C4)($t2) +/* 094DC8 800941C8 3C0A8012 */ lui $t2, %hi(gIgnorePlayerInput) # $t2, 0x8012 +/* 094DCC 800941CC 8D4A63C4 */ lw $t2, %lo(gIgnorePlayerInput)($t2) /* 094DD0 800941D0 00001825 */ move $v1, $zero /* 094DD4 800941D4 15400005 */ bnez $t2, .L800941EC /* 094DD8 800941D8 3C04800E */ lui $a0, %hi(D_800E098C) # $a0, 0x800e /* 094DDC 800941DC 8C84098C */ lw $a0, %lo(D_800E098C)($a0) -/* 094DE0 800941E0 0C01A955 */ jal func_8006A554 +/* 094DE0 800941E0 0C01A955 */ jal get_button_inputs_from_player /* 094DE4 800941E4 00000000 */ nop /* 094DE8 800941E8 00401825 */ move $v1, $v0 .L800941EC: -/* 094DEC 800941EC 3C06800E */ lui $a2, %hi(D_800DF47C) # $a2, 0x800e -/* 094DF0 800941F0 24C6F47C */ addiu $a2, %lo(D_800DF47C) # addiu $a2, $a2, -0xb84 +/* 094DEC 800941EC 3C06800E */ lui $a2, %hi(gMenuDelay) # $a2, 0x800e +/* 094DF0 800941F0 24C6F47C */ addiu $a2, %lo(gMenuDelay) # addiu $a2, $a2, -0xb84 /* 094DF4 800941F4 8CC20000 */ lw $v0, ($a2) /* 094DF8 800941F8 3C08800E */ lui $t0, %hi(D_800E0988) # $t0, 0x800e /* 094DFC 800941FC 1440007A */ bnez $v0, .L800943E8 @@ -52,9 +52,9 @@ glabel func_80094170 /* 094E30 80094230 25080988 */ addiu $t0, %lo(D_800E0988) # addiu $t0, $t0, 0x988 /* 094E34 80094234 8D0C0000 */ lw $t4, ($t0) /* 094E38 80094238 24020001 */ li $v0, 1 -/* 094E3C 8009423C 3C06800E */ lui $a2, %hi(D_800DF47C) # $a2, 0x800e +/* 094E3C 8009423C 3C06800E */ lui $a2, %hi(gMenuDelay) # $a2, 0x800e /* 094E40 80094240 144C0003 */ bne $v0, $t4, .L80094250 -/* 094E44 80094244 24C6F47C */ addiu $a2, %lo(D_800DF47C) # addiu $a2, $a2, -0xb84 +/* 094E44 80094244 24C6F47C */ addiu $a2, %lo(gMenuDelay) # addiu $a2, $a2, -0xb84 /* 094E48 80094248 100000CF */ b .L80094588 /* 094E4C 8009424C ACC20000 */ sw $v0, ($a2) .L80094250: @@ -73,9 +73,9 @@ glabel func_80094170 .L8009427C: /* 094E7C 8009427C 3C04800E */ lui $a0, %hi(D_800E098C) # $a0, 0x800e /* 094E80 80094280 8C84098C */ lw $a0, %lo(D_800E098C)($a0) -/* 094E84 80094284 3C0F8012 */ lui $t7, %hi(D_80126464) # $t7, 0x8012 +/* 094E84 80094284 3C0F8012 */ lui $t7, %hi(gControllersYAxisDirection) # $t7, 0x8012 /* 094E88 80094288 01E47821 */ addu $t7, $t7, $a0 -/* 094E8C 8009428C 81EF6464 */ lb $t7, %lo(D_80126464)($t7) +/* 094E8C 8009428C 81EF6464 */ lb $t7, %lo(gControllersYAxisDirection)($t7) /* 094E90 80094290 00057603 */ sra $t6, $a1, 0x18 /* 094E94 80094294 11E00005 */ beqz $t7, .L800942AC /* 094E98 80094298 01C02825 */ move $a1, $t6 @@ -106,11 +106,11 @@ glabel func_80094170 /* 094EF4 800942F4 004B1021 */ addu $v0, $v0, $t3 /* 094EF8 800942F8 8C426A40 */ lw $v0, %lo(D_80126A40)($v0) /* 094EFC 800942FC 8C6C020C */ lw $t4, 0x20c($v1) -/* 094F00 80094300 3C06800E */ lui $a2, %hi(D_800DF47C) # $a2, 0x800e +/* 094F00 80094300 3C06800E */ lui $a2, %hi(gMenuDelay) # $a2, 0x800e /* 094F04 80094304 3C08800E */ lui $t0, %hi(D_800E0988) # $t0, 0x800e /* 094F08 80094308 25080988 */ addiu $t0, %lo(D_800E0988) # addiu $t0, $t0, 0x988 /* 094F0C 8009430C 104C000A */ beq $v0, $t4, .L80094338 -/* 094F10 80094310 24C6F47C */ addiu $a2, %lo(D_800DF47C) # addiu $a2, $a2, -0xb84 +/* 094F10 80094310 24C6F47C */ addiu $a2, %lo(gMenuDelay) # addiu $a2, $a2, -0xb84 /* 094F14 80094314 3C04800E */ lui $a0, %hi(gTrophyRaceWorldId) # $a0, 0x800e /* 094F18 80094318 24840FE8 */ addiu $a0, %lo(gTrophyRaceWorldId) # addiu $a0, $a0, 0xfe8 /* 094F1C 8009431C 8C8D0000 */ lw $t5, ($a0) @@ -133,9 +133,9 @@ glabel func_80094170 /* 094F54 80094354 8C84098C */ lw $a0, %lo(D_800E098C)($a0) /* 094F58 80094358 24E76A68 */ addiu $a3, %lo(D_80126A68) # addiu $a3, $a3, 0x6a68 /* 094F5C 8009435C 8CE20000 */ lw $v0, ($a3) -/* 094F60 80094360 3C038012 */ lui $v1, %hi(D_80126464) # $v1, 0x8012 +/* 094F60 80094360 3C038012 */ lui $v1, %hi(gControllersYAxisDirection) # $v1, 0x8012 /* 094F64 80094364 00641821 */ addu $v1, $v1, $a0 -/* 094F68 80094368 80636464 */ lb $v1, %lo(D_80126464)($v1) +/* 094F68 80094368 80636464 */ lb $v1, %lo(gControllersYAxisDirection)($v1) /* 094F6C 8009436C 00022E00 */ sll $a1, $v0, 0x18 /* 094F70 80094370 0005C603 */ sra $t8, $a1, 0x18 /* 094F74 80094374 04610004 */ bgez $v1, .L80094388 @@ -186,11 +186,11 @@ glabel func_80094170 /* 095014 80094414 3C04800E */ lui $a0, %hi(gTrophyRaceWorldId) # $a0, 0x800e /* 095018 80094418 24840FE8 */ addiu $a0, %lo(gTrophyRaceWorldId) # addiu $a0, $a0, 0xfe8 /* 09501C 8009441C 8C980000 */ lw $t8, ($a0) -/* 095020 80094420 3C19800E */ lui $t9, %hi(D_800DF4B8) # $t9, 0x800e +/* 095020 80094420 3C19800E */ lui $t9, %hi(gIsInTracksMode) # $t9, 0x800e /* 095024 80094424 1300000A */ beqz $t8, .L80094450 /* 095028 80094428 00000000 */ nop /* 09502C 8009442C AC800000 */ sw $zero, ($a0) -/* 095030 80094430 8F39F4B8 */ lw $t9, %lo(D_800DF4B8)($t9) +/* 095030 80094430 8F39F4B8 */ lw $t9, %lo(gIsInTracksMode)($t9) /* 095034 80094434 00000000 */ nop /* 095038 80094438 17200003 */ bnez $t9, .L80094448 /* 09503C 8009443C 00000000 */ nop @@ -221,7 +221,7 @@ glabel func_80094170 /* 095094 80094494 24020001 */ li $v0, 1 .L80094498: /* 095098 80094498 8C6C01F8 */ lw $t4, 0x1f8($v1) -/* 09509C 8009449C 3C0E800E */ lui $t6, %hi(D_800DF4B8) # $t6, 0x800e +/* 09509C 8009449C 3C0E800E */ lui $t6, %hi(gIsInTracksMode) # $t6, 0x800e /* 0950A0 800944A0 104C0005 */ beq $v0, $t4, .L800944B8 /* 0950A4 800944A4 00000000 */ nop /* 0950A8 800944A8 8C6D01FC */ lw $t5, 0x1fc($v1) @@ -229,7 +229,7 @@ glabel func_80094170 /* 0950B0 800944B0 144D0019 */ bne $v0, $t5, .L80094518 /* 0950B4 800944B4 00000000 */ nop .L800944B8: -/* 0950B8 800944B8 8DCEF4B8 */ lw $t6, %lo(D_800DF4B8)($t6) +/* 0950B8 800944B8 8DCEF4B8 */ lw $t6, %lo(gIsInTracksMode)($t6) /* 0950BC 800944BC 00000000 */ nop /* 0950C0 800944C0 15C00013 */ bnez $t6, .L80094510 /* 0950C4 800944C4 00000000 */ nop @@ -292,8 +292,8 @@ glabel func_80094170 .L8009458C: /* 09518C 8009458C 0C024F50 */ jal func_80093D40 /* 095190 80094590 00000000 */ nop -/* 095194 80094594 3C018012 */ lui $at, %hi(D_801263C4) # $at, 0x8012 -/* 095198 80094598 AC2063C4 */ sw $zero, %lo(D_801263C4)($at) +/* 095194 80094594 3C018012 */ lui $at, %hi(gIgnorePlayerInput) # $at, 0x8012 +/* 095198 80094598 AC2063C4 */ sw $zero, %lo(gIgnorePlayerInput)($at) /* 09519C 8009459C 00001025 */ move $v0, $zero .L800945A0: /* 0951A0 800945A0 8FBF0014 */ lw $ra, 0x14($sp) diff --git a/asm/non_matchings/menu/func_80094688.s b/asm/non_matchings/menu/func_80094688.s index 834887a8..dae8e1ba 100644 --- a/asm/non_matchings/menu/func_80094688.s +++ b/asm/non_matchings/menu/func_80094688.s @@ -18,8 +18,8 @@ glabel func_80094688 /* 0952C8 800946C8 00002025 */ move $a0, $zero .L800946CC: /* 0952CC 800946CC 3C018012 */ lui $at, %hi(D_80126A90) # $at, 0x8012 -/* 0952D0 800946D0 3C0F800E */ lui $t7, %hi(D_800DF4BC) # $t7, 0x800e -/* 0952D4 800946D4 8DEFF4BC */ lw $t7, %lo(D_800DF4BC)($t7) +/* 0952D0 800946D0 3C0F800E */ lui $t7, %hi(gNumberOfActivePlayers) # $t7, 0x800e +/* 0952D4 800946D4 8DEFF4BC */ lw $t7, %lo(gNumberOfActivePlayers)($t7) /* 0952D8 800946D8 AC206A90 */ sw $zero, %lo(D_80126A90)($at) /* 0952DC 800946DC 24010001 */ li $at, 1 /* 0952E0 800946E0 15E1003F */ bne $t7, $at, .L800947E0 @@ -102,15 +102,15 @@ glabel func_80094688 /* 0953F8 800947F8 AC2063BC */ sw $zero, %lo(D_801263BC)($at) /* 0953FC 800947FC 3C018012 */ lui $at, %hi(D_801263D8) # $at, 0x8012 /* 095400 80094800 AC2063D8 */ sw $zero, %lo(D_801263D8)($at) -/* 095404 80094804 3C01800E */ lui $at, %hi(D_800DF47C) # $at, 0x800e -/* 095408 80094808 AC20F47C */ sw $zero, %lo(D_800DF47C)($at) +/* 095404 80094804 3C01800E */ lui $at, %hi(gMenuDelay) # $at, 0x800e +/* 095408 80094808 AC20F47C */ sw $zero, %lo(gMenuDelay)($at) /* 09540C 8009480C 3C01800E */ lui $at, %hi(D_800DF460) # $at, 0x800e /* 095410 80094810 AC20F460 */ sw $zero, %lo(D_800DF460)($at) /* 095414 80094814 3C018012 */ lui $at, %hi(D_80126A68) # $at, 0x8012 /* 095418 80094818 AC206A68 */ sw $zero, %lo(D_80126A68)($at) -/* 09541C 8009481C 3C018012 */ lui $at, %hi(D_801263C4) # $at, 0x8012 +/* 09541C 8009481C 3C018012 */ lui $at, %hi(gIgnorePlayerInput) # $at, 0x8012 /* 095420 80094820 240C0001 */ li $t4, 1 -/* 095424 80094824 AC2C63C4 */ sw $t4, %lo(D_801263C4)($at) +/* 095424 80094824 AC2C63C4 */ sw $t4, %lo(gIgnorePlayerInput)($at) /* 095428 80094828 3C018012 */ lui $at, %hi(D_80126C54) # $at, 0x8012 /* 09542C 8009482C 240EFFFF */ li $t6, -1 /* 095430 80094830 AC2E6C54 */ sw $t6, %lo(D_80126C54)($at) @@ -128,8 +128,8 @@ glabel func_80094688 /* 095460 80094860 00000000 */ nop /* 095464 80094864 0C00322D */ jal func_8000C8B4 /* 095468 80094868 240400F0 */ li $a0, 240 -/* 09546C 8009486C 3C018012 */ lui $at, %hi(D_801263C4) # $at, 0x8012 -/* 095470 80094870 AC2263C4 */ sw $v0, %lo(D_801263C4)($at) +/* 09546C 8009486C 3C018012 */ lui $at, %hi(gIgnorePlayerInput) # $at, 0x8012 +/* 095470 80094870 AC2263C4 */ sw $v0, %lo(gIgnorePlayerInput)($at) .L80094874: /* 095474 80094874 3C088012 */ lui $t0, %hi(D_80126C28) # $t0, 0x8012 /* 095478 80094878 81086C28 */ lb $t0, %lo(D_80126C28)($t0) @@ -137,9 +137,9 @@ glabel func_80094688 /* 095480 80094880 11000005 */ beqz $t0, .L80094898 /* 095484 80094884 3C018012 */ lui $at, %hi(D_801263E0) # $at, 0x8012 /* 095488 80094888 AC3963E0 */ sw $t9, %lo(D_801263E0)($at) -/* 09548C 8009488C 3C01800E */ lui $at, %hi(D_800DF47C) # $at, 0x800e +/* 09548C 8009488C 3C01800E */ lui $at, %hi(gMenuDelay) # $at, 0x800e /* 095490 80094890 24090064 */ li $t1, 100 -/* 095494 80094894 AC29F47C */ sw $t1, %lo(D_800DF47C)($at) +/* 095494 80094894 AC29F47C */ sw $t1, %lo(gMenuDelay)($at) .L80094898: /* 095498 80094898 0C01B683 */ jal func_8006DA0C /* 09549C 8009489C 00000000 */ nop @@ -148,7 +148,7 @@ glabel func_80094688 /* 0954A8 800948A8 3C018012 */ lui $at, %hi(D_801263E0) # $at, 0x8012 /* 0954AC 800948AC AC2A63E0 */ sw $t2, %lo(D_801263E0)($at) .L800948B0: -/* 0954B0 800948B0 0C026F97 */ jal func_8009BE5C +/* 0954B0 800948B0 0C026F97 */ jal reset_controller_sticks /* 0954B4 800948B4 00000000 */ nop /* 0954B8 800948B8 8FA40030 */ lw $a0, 0x30($sp) /* 0954BC 800948BC 0C01B638 */ jal func_8006D8E0 @@ -170,9 +170,9 @@ glabel func_80094688 /* 0954FC 800948FC 3C018012 */ lui $at, %hi(D_80126474) # $at, 0x8012 /* 095500 80094900 AC2F6474 */ sw $t7, %lo(D_80126474)($at) /* 095504 80094904 3C018012 */ lui $at, %hi(D_80126478) # $at, 0x8012 -/* 095508 80094908 3C19800E */ lui $t9, %hi(D_800DF4BC) # $t9, 0x800e +/* 095508 80094908 3C19800E */ lui $t9, %hi(gNumberOfActivePlayers) # $t9, 0x800e /* 09550C 8009490C 00184043 */ sra $t0, $t8, 1 -/* 095510 80094910 8F39F4BC */ lw $t9, %lo(D_800DF4BC)($t9) +/* 095510 80094910 8F39F4BC */ lw $t9, %lo(gNumberOfActivePlayers)($t9) /* 095514 80094914 AC286478 */ sw $t0, %lo(D_80126478)($at) /* 095518 80094918 24010001 */ li $at, 1 /* 09551C 8009491C 17210049 */ bne $t9, $at, .L80094A44 diff --git a/asm/non_matchings/menu/func_80094A5C.s b/asm/non_matchings/menu/func_80094A5C.s index 31f49e00..e5cfdde5 100644 --- a/asm/non_matchings/menu/func_80094A5C.s +++ b/asm/non_matchings/menu/func_80094A5C.s @@ -38,7 +38,7 @@ glabel func_80094A5C /* 0956E8 80094AE8 8DAE0000 */ lw $t6, ($t5) /* 0956EC 80094AEC 3C01800E */ lui $at, %hi(D_800E0BEC+20) # $at, 0x800e /* 0956F0 80094AF0 AFA2001C */ sw $v0, 0x1c($sp) -/* 0956F4 80094AF4 0C003932 */ jal func_8000E4C8 +/* 0956F4 80094AF4 0C003932 */ jal is_time_trial_enabled /* 0956F8 80094AF8 AC2E0C00 */ sw $t6, %lo(D_800E0BEC+20)($at) /* 0956FC 80094AFC 3C05800E */ lui $a1, %hi(D_800E0AF0) # $a1, 0x800e /* 095700 80094B00 8FA9001C */ lw $t1, 0x1c($sp) diff --git a/asm/non_matchings/menu/func_80094D28.s b/asm/non_matchings/menu/func_80094D28.s index 59a489f6..68a12f92 100644 --- a/asm/non_matchings/menu/func_80094D28.s +++ b/asm/non_matchings/menu/func_80094D28.s @@ -14,8 +14,8 @@ glabel func_80094D28 /* 09593C 80094D3C AFB0001C */ sw $s0, 0x1c($sp) /* 095940 80094D40 0C01BAA4 */ jal get_settings /* 095944 80094D44 AFA40060 */ sw $a0, 0x60($sp) -/* 095948 80094D48 3C0E800E */ lui $t6, %hi(D_800DF4BC) # $t6, 0x800e -/* 09594C 80094D4C 8DCEF4BC */ lw $t6, %lo(D_800DF4BC)($t6) +/* 095948 80094D48 3C0E800E */ lui $t6, %hi(gNumberOfActivePlayers) # $t6, 0x800e +/* 09594C 80094D4C 8DCEF4BC */ lw $t6, %lo(gNumberOfActivePlayers)($t6) /* 095950 80094D50 24010001 */ li $at, 1 /* 095954 80094D54 15C10006 */ bne $t6, $at, .L80094D70 /* 095958 80094D58 00408025 */ move $s0, $v0 @@ -593,8 +593,8 @@ glabel L80095588 /* 096188 80095588 0C01B683 */ jal func_8006DA0C /* 09618C 8009558C 00000000 */ nop /* 096190 80095590 1440001D */ bnez $v0, .L80095608 -/* 096194 80095594 3C0F800E */ lui $t7, %hi(D_800DF4BC) # $t7, 0x800e -/* 096198 80095598 8DEFF4BC */ lw $t7, %lo(D_800DF4BC)($t7) +/* 096194 80095594 3C0F800E */ lui $t7, %hi(gNumberOfActivePlayers) # $t7, 0x800e +/* 096198 80095598 8DEFF4BC */ lw $t7, %lo(gNumberOfActivePlayers)($t7) /* 09619C 8009559C 24010001 */ li $at, 1 /* 0961A0 800955A0 15E10019 */ bne $t7, $at, .L80095608 /* 0961A4 800955A4 3C0B800E */ lui $t3, %hi(gTrophyRaceWorldId) # $t3, 0x800e diff --git a/asm/non_matchings/menu/func_80095728.s b/asm/non_matchings/menu/func_80095728.s index 4a5db576..8f65af1a 100644 --- a/asm/non_matchings/menu/func_80095728.s +++ b/asm/non_matchings/menu/func_80095728.s @@ -28,7 +28,7 @@ glabel func_80095728 /* 09637C 8009577C 8DCE0300 */ lw $t6, %lo(osTvType)($t6) /* 096380 80095780 AFA2002C */ sw $v0, 0x2c($sp) /* 096384 80095784 15C00006 */ bnez $t6, .L800957A0 -/* 096388 80095788 3C0A800E */ lui $t2, %hi(D_800DF4BC) # $t2, 0x800e +/* 096388 80095788 3C0A800E */ lui $t2, %hi(gNumberOfActivePlayers) # $t2, 0x800e /* 09638C 8009578C 240F001A */ li $t7, 26 /* 096390 80095790 2418000C */ li $t8, 12 /* 096394 80095794 AFAF0038 */ sw $t7, 0x38($sp) @@ -38,7 +38,7 @@ glabel func_80095728 /* 0963A0 800957A0 AFA00038 */ sw $zero, 0x38($sp) /* 0963A4 800957A4 AFA00034 */ sw $zero, 0x34($sp) .L800957A8: -/* 0963A8 800957A8 8D4AF4BC */ lw $t2, %lo(D_800DF4BC)($t2) +/* 0963A8 800957A8 8D4AF4BC */ lw $t2, %lo(gNumberOfActivePlayers)($t2) /* 0963AC 800957AC 0C027B20 */ jal is_in_two_player_adventure /* 0963B0 800957B0 AFAA0030 */ sw $t2, 0x30($sp) /* 0963B4 800957B4 8FAA0030 */ lw $t2, 0x30($sp) @@ -78,8 +78,8 @@ glabel func_80095728 /* 096430 80095830 8FA40064 */ lw $a0, 0x64($sp) /* 096434 80095834 0C025305 */ jal func_80094C14 /* 096438 80095838 00000000 */ nop -/* 09643C 8009583C 3C19800E */ lui $t9, %hi(D_800DF47C) # $t9, 0x800e -/* 096440 80095840 8F39F47C */ lw $t9, %lo(D_800DF47C)($t9) +/* 09643C 8009583C 3C19800E */ lui $t9, %hi(gMenuDelay) # $t9, 0x800e +/* 096440 80095840 8F39F47C */ lw $t9, %lo(gMenuDelay)($t9) /* 096444 80095844 8FAA0030 */ lw $t2, 0x30($sp) /* 096448 80095848 2B210014 */ slti $at, $t9, 0x14 /* 09644C 8009584C 1020000E */ beqz $at, .L80095888 @@ -109,8 +109,8 @@ glabel func_80095728 .L800958A4: /* 0964A4 800958A4 0C026FC8 */ jal func_8009BF20 /* 0964A8 800958A8 AFAA0030 */ sw $t2, 0x30($sp) -/* 0964AC 800958AC 3C0E8012 */ lui $t6, %hi(D_801263C4) # $t6, 0x8012 -/* 0964B0 800958B0 8DCE63C4 */ lw $t6, %lo(D_801263C4)($t6) +/* 0964AC 800958AC 3C0E8012 */ lui $t6, %hi(gIgnorePlayerInput) # $t6, 0x8012 +/* 0964B0 800958B0 8DCE63C4 */ lw $t6, %lo(gIgnorePlayerInput)($t6) /* 0964B4 800958B4 3C098012 */ lui $t1, %hi(D_80126C14) # $t1, 0x8012 /* 0964B8 800958B8 8FAA0030 */ lw $t2, 0x30($sp) /* 0964BC 800958BC 25296C14 */ addiu $t1, %lo(D_80126C14) # addiu $t1, $t1, 0x6c14 @@ -126,7 +126,7 @@ glabel func_80095728 .L800958E4: /* 0964E4 800958E4 AFA30040 */ sw $v1, 0x40($sp) /* 0964E8 800958E8 AFA40048 */ sw $a0, 0x48($sp) -/* 0964EC 800958EC 0C01A955 */ jal func_8006A554 +/* 0964EC 800958EC 0C01A955 */ jal get_button_inputs_from_player /* 0964F0 800958F0 AFAA0030 */ sw $t2, 0x30($sp) /* 0964F4 800958F4 8FA40048 */ lw $a0, 0x48($sp) /* 0964F8 800958F8 8FA30040 */ lw $v1, 0x40($sp) @@ -351,8 +351,8 @@ glabel L80095B34 /* 096834 80095C34 3C013F00 */ lui $at, 0x3f00 /* 096838 80095C38 13200021 */ beqz $t9, .L80095CC0 /* 09683C 80095C3C 24840E4C */ addiu $a0, %lo(D_800E0E4C) # addiu $a0, $a0, 0xe4c -/* 096840 80095C40 3C18800E */ lui $t8, %hi(D_800DF4B8) # $t8, 0x800e -/* 096844 80095C44 8F18F4B8 */ lw $t8, %lo(D_800DF4B8)($t8) +/* 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 /* 096850 80095C50 1700000B */ bnez $t8, .L80095C80 @@ -652,8 +652,8 @@ glabel L80095EC8 /* 096C94 80096094 31430003 */ andi $v1, $t2, 3 /* 096C98 80096098 10600017 */ beqz $v1, .L800960F8 /* 096C9C 8009609C 00604825 */ move $t1, $v1 -/* 096CA0 800960A0 3C0F8012 */ lui $t7, %hi(D_80126464) # $t7, 0x8012 -/* 096CA4 800960A4 25EF6464 */ addiu $t7, %lo(D_80126464) # addiu $t7, $t7, 0x6464 +/* 096CA0 800960A0 3C0F8012 */ lui $t7, %hi(gControllersYAxisDirection) # $t7, 0x8012 +/* 096CA4 800960A4 25EF6464 */ addiu $t7, %lo(gControllersYAxisDirection) # addiu $t7, $t7, 0x6464 /* 096CA8 800960A8 000F2821 */ addu $a1, $zero, $t7 /* 096CAC 800960AC 24070001 */ li $a3, 1 /* 096CB0 800960B0 24060002 */ li $a2, 2 @@ -678,8 +678,8 @@ glabel L80095EC8 /* 096CF0 800960F0 24A50001 */ addiu $a1, $a1, 1 /* 096CF4 800960F4 108A0040 */ beq $a0, $t2, .L800961F8 .L800960F8: -/* 096CF8 800960F8 3C188012 */ lui $t8, %hi(D_80126464) # $t8, 0x8012 -/* 096CFC 800960FC 27186464 */ addiu $t8, %lo(D_80126464) # addiu $t8, $t8, 0x6464 +/* 096CF8 800960F8 3C188012 */ lui $t8, %hi(gControllersYAxisDirection) # $t8, 0x8012 +/* 096CFC 800960FC 27186464 */ addiu $t8, %lo(gControllersYAxisDirection) # addiu $t8, $t8, 0x6464 /* 096D00 80096100 00982821 */ addu $a1, $a0, $t8 /* 096D04 80096104 01584821 */ addu $t1, $t2, $t8 /* 096D08 80096108 24060002 */ li $a2, 2 @@ -802,8 +802,8 @@ glabel L80095EC8 /* 096EA4 800962A4 31430003 */ andi $v1, $t2, 3 /* 096EA8 800962A8 10600019 */ beqz $v1, .L80096310 /* 096EAC 800962AC 00603825 */ move $a3, $v1 -/* 096EB0 800962B0 3C0C8012 */ lui $t4, %hi(D_80126464) # $t4, 0x8012 -/* 096EB4 800962B4 258C6464 */ addiu $t4, %lo(D_80126464) # addiu $t4, $t4, 0x6464 +/* 096EB0 800962B0 3C0C8012 */ lui $t4, %hi(gControllersYAxisDirection) # $t4, 0x8012 +/* 096EB4 800962B4 258C6464 */ addiu $t4, %lo(gControllersYAxisDirection) # addiu $t4, $t4, 0x6464 /* 096EB8 800962B8 000C2821 */ addu $a1, $zero, $t4 .L800962BC: /* 096EBC 800962BC 80A30000 */ lb $v1, ($a1) @@ -830,8 +830,8 @@ glabel L80095EC8 /* 096F08 80096308 24A50001 */ addiu $a1, $a1, 1 /* 096F0C 8009630C 108A004E */ beq $a0, $t2, .L80096448 .L80096310: -/* 096F10 80096310 3C198012 */ lui $t9, %hi(D_80126464) # $t9, 0x8012 -/* 096F14 80096314 27396464 */ addiu $t9, %lo(D_80126464) # addiu $t9, $t9, 0x6464 +/* 096F10 80096310 3C198012 */ lui $t9, %hi(gControllersYAxisDirection) # $t9, 0x8012 +/* 096F14 80096314 27396464 */ addiu $t9, %lo(gControllersYAxisDirection) # addiu $t9, $t9, 0x6464 /* 096F18 80096318 00992821 */ addu $a1, $a0, $t9 /* 096F1C 8009631C 01593821 */ addu $a3, $t2, $t9 .L80096320: @@ -960,12 +960,12 @@ glabel L800964AC /* 0970D4 800964D4 1000008F */ b .L80096714 /* 0970D8 800964D8 AC3863E0 */ sw $t8, %lo(D_801263E0)($at) glabel L800964DC -/* 0970DC 800964DC 3C0D800E */ lui $t5, %hi(D_800DF47C) # $t5, 0x800e -/* 0970E0 800964E0 8DADF47C */ lw $t5, %lo(D_800DF47C)($t5) +/* 0970DC 800964DC 3C0D800E */ lui $t5, %hi(gMenuDelay) # $t5, 0x800e +/* 0970E0 800964E0 8DADF47C */ lw $t5, %lo(gMenuDelay)($t5) /* 0970E4 800964E4 8FB90064 */ lw $t9, 0x64($sp) -/* 0970E8 800964E8 3C01800E */ lui $at, %hi(D_800DF47C) # $at, 0x800e +/* 0970E8 800964E8 3C01800E */ lui $at, %hi(gMenuDelay) # $at, 0x800e /* 0970EC 800964EC 01B96021 */ addu $t4, $t5, $t9 -/* 0970F0 800964F0 AC2CF47C */ sw $t4, %lo(D_800DF47C)($at) +/* 0970F0 800964F0 AC2CF47C */ sw $t4, %lo(gMenuDelay)($at) /* 0970F4 800964F4 2981001F */ slti $at, $t4, 0x1f /* 0970F8 800964F8 14200086 */ bnez $at, .L80096714 /* 0970FC 800964FC 00000000 */ nop @@ -1041,11 +1041,11 @@ glabel L800964DC /* 097200 80096600 8D8C0FE8 */ lw $t4, %lo(gTrophyRaceWorldId)($t4) /* 097204 80096604 240E000A */ li $t6, 10 /* 097208 80096608 11800003 */ beqz $t4, .L80096618 -/* 09720C 8009660C 3C0F800E */ lui $t7, %hi(D_800DF4BC) # $t7, 0x800e +/* 09720C 8009660C 3C0F800E */ lui $t7, %hi(gNumberOfActivePlayers) # $t7, 0x800e /* 097210 80096610 10000040 */ b .L80096714 /* 097214 80096614 AFAE0044 */ sw $t6, 0x44($sp) .L80096618: -/* 097218 80096618 8DEFF4BC */ lw $t7, %lo(D_800DF4BC)($t7) +/* 097218 80096618 8DEFF4BC */ lw $t7, %lo(gNumberOfActivePlayers)($t7) /* 09721C 8009661C 3C068012 */ lui $a2, %hi(D_80126A68) # $a2, 0x8012 /* 097220 80096620 29E10002 */ slti $at, $t7, 2 /* 097224 80096624 14200004 */ bnez $at, .L80096638 @@ -1062,10 +1062,10 @@ glabel L800964DC /* 09724C 8009664C 00791821 */ addu $v1, $v1, $t9 /* 097250 80096650 8C636BF0 */ lw $v1, %lo(D_80126BF0)($v1) /* 097254 80096654 8C4C005C */ lw $t4, 0x5c($v0) -/* 097258 80096658 3C0E800E */ lui $t6, %hi(D_800DF4B8) # $t6, 0x800e +/* 097258 80096658 3C0E800E */ lui $t6, %hi(gIsInTracksMode) # $t6, 0x800e /* 09725C 8009665C 146C001A */ bne $v1, $t4, .L800966C8 /* 097260 80096660 00000000 */ nop -/* 097264 80096664 8DCEF4B8 */ lw $t6, %lo(D_800DF4B8)($t6) +/* 097264 80096664 8DCEF4B8 */ lw $t6, %lo(gIsInTracksMode)($t6) /* 097268 80096668 00000000 */ nop /* 09726C 8009666C 15C00014 */ bnez $t6, .L800966C0 /* 097270 80096670 24190002 */ li $t9, 2 @@ -1115,21 +1115,21 @@ glabel L800964DC .L80096710: /* 097310 80096710 AFAC0044 */ sw $t4, 0x44($sp) .L80096714: -/* 097314 80096714 3C028012 */ lui $v0, %hi(D_801263C4) # $v0, 0x8012 -/* 097318 80096718 8C4263C4 */ lw $v0, %lo(D_801263C4)($v0) +/* 097314 80096714 3C028012 */ lui $v0, %hi(gIgnorePlayerInput) # $v0, 0x8012 +/* 097318 80096718 8C4263C4 */ lw $v0, %lo(gIgnorePlayerInput)($v0) /* 09731C 8009671C 3C0D8012 */ lui $t5, %hi(D_801263A0) # $t5, 0x8012 /* 097320 80096720 1840000B */ blez $v0, .L80096750 /* 097324 80096724 00000000 */ nop /* 097328 80096728 8FAE0064 */ lw $t6, 0x64($sp) -/* 09732C 8009672C 3C018012 */ lui $at, %hi(D_801263C4) # $at, 0x8012 +/* 09732C 8009672C 3C018012 */ lui $at, %hi(gIgnorePlayerInput) # $at, 0x8012 /* 097330 80096730 004E7823 */ subu $t7, $v0, $t6 -/* 097334 80096734 AC2F63C4 */ sw $t7, %lo(D_801263C4)($at) -/* 097338 80096738 3C188012 */ lui $t8, %hi(D_801263C4) # $t8, 0x8012 -/* 09733C 8009673C 8F1863C4 */ lw $t8, %lo(D_801263C4)($t8) -/* 097340 80096740 3C018012 */ lui $at, %hi(D_801263C4) # $at, 0x8012 +/* 097334 80096734 AC2F63C4 */ sw $t7, %lo(gIgnorePlayerInput)($at) +/* 097338 80096738 3C188012 */ lui $t8, %hi(gIgnorePlayerInput) # $t8, 0x8012 +/* 09733C 8009673C 8F1863C4 */ lw $t8, %lo(gIgnorePlayerInput)($t8) +/* 097340 80096740 3C018012 */ lui $at, %hi(gIgnorePlayerInput) # $at, 0x8012 /* 097344 80096744 07010002 */ bgez $t8, .L80096750 /* 097348 80096748 00000000 */ nop -/* 09734C 8009674C AC2063C4 */ sw $zero, %lo(D_801263C4)($at) +/* 09734C 8009674C AC2063C4 */ sw $zero, %lo(gIgnorePlayerInput)($at) .L80096750: /* 097350 80096750 8DAD63A0 */ lw $t5, %lo(D_801263A0)($t5) /* 097354 80096754 8FB90058 */ lw $t9, 0x58($sp) diff --git a/asm/non_matchings/menu/func_80096978.s b/asm/non_matchings/menu/func_80096978.s index 0cc401c5..f346d0e3 100644 --- a/asm/non_matchings/menu/func_80096978.s +++ b/asm/non_matchings/menu/func_80096978.s @@ -87,8 +87,8 @@ glabel func_80096978 /* 0976C0 80096AC0 24060022 */ li $a2, 34 /* 0976C4 80096AC4 240A00FF */ li $t2, 255 /* 0976C8 80096AC8 AE0A0000 */ sw $t2, ($s0) -/* 0976CC 80096ACC 3C02800E */ lui $v0, %hi(D_800DF4BC) # $v0, 0x800e -/* 0976D0 80096AD0 8C42F4BC */ lw $v0, %lo(D_800DF4BC)($v0) +/* 0976CC 80096ACC 3C02800E */ lui $v0, %hi(gNumberOfActivePlayers) # $v0, 0x800e +/* 0976D0 80096AD0 8C42F4BC */ lw $v0, %lo(gNumberOfActivePlayers)($v0) /* 0976D4 80096AD4 240D00A0 */ li $t5, 160 /* 0976D8 80096AD8 244BFFFF */ addiu $t3, $v0, -1 /* 0976DC 80096ADC 000B6140 */ sll $t4, $t3, 5 @@ -150,8 +150,8 @@ glabel func_80096978 /* 0977AC 80096BAC AFA20014 */ sw $v0, 0x14($sp) /* 0977B0 80096BB0 0C01E2AE */ jal func_80078AB8 /* 0977B4 80096BB4 AFA20010 */ sw $v0, 0x10($sp) -/* 0977B8 80096BB8 3C08800E */ lui $t0, %hi(D_800DF4BC) # $t0, 0x800e -/* 0977BC 80096BBC 8D08F4BC */ lw $t0, %lo(D_800DF4BC)($t0) +/* 0977B8 80096BB8 3C08800E */ lui $t0, %hi(gNumberOfActivePlayers) # $t0, 0x800e +/* 0977BC 80096BBC 8D08F4BC */ lw $t0, %lo(gNumberOfActivePlayers)($t0) /* 0977C0 80096BC0 26D60001 */ addiu $s6, $s6, 1 /* 0977C4 80096BC4 02C8082A */ slt $at, $s6, $t0 /* 0977C8 80096BC8 26100018 */ addiu $s0, $s0, 0x18 @@ -178,10 +178,10 @@ glabel func_80096978 /* 097818 80096C18 8FA30098 */ lw $v1, 0x98($sp) /* 09781C 80096C1C 8FA200A4 */ lw $v0, 0xa4($sp) /* 097820 80096C20 24630068 */ addiu $v1, $v1, 0x68 -/* 097824 80096C24 3C0F800E */ lui $t7, %hi(D_800E0BCC) # $t7, 0x800e +/* 097824 80096C24 3C0F800E */ lui $t7, %hi(gRacePlacementsArray) # $t7, 0x800e /* 097828 80096C28 3C014140 */ li $at, 0x41400000 # 12.000000 /* 09782C 80096C2C 240C0068 */ li $t4, 104 -/* 097830 80096C30 25EF0BCC */ addiu $t7, %lo(D_800E0BCC) # addiu $t7, $t7, 0xbcc +/* 097830 80096C30 25EF0BCC */ addiu $t7, %lo(gRacePlacementsArray) # addiu $t7, $t7, 0xbcc /* 097834 80096C34 246E0004 */ addiu $t6, $v1, 4 /* 097838 80096C38 24790002 */ addiu $t9, $v1, 2 /* 09783C 80096C3C 241800FF */ li $t8, 255 @@ -249,8 +249,8 @@ glabel func_80096978 /* 097930 80096D30 3C01800E */ lui $at, %hi(D_800DF4A8) # $at, 0x800e /* 097934 80096D34 A039F4A8 */ sb $t9, %lo(D_800DF4A8)($at) /* 097938 80096D38 3C01800E */ lui $at, %hi(D_800DF4AC) # $at, 0x800e -/* 09793C 80096D3C 3C18800E */ lui $t8, %hi(D_800DF4BC) # $t8, 0x800e -/* 097940 80096D40 8F18F4BC */ lw $t8, %lo(D_800DF4BC)($t8) +/* 09793C 80096D3C 3C18800E */ lui $t8, %hi(gNumberOfActivePlayers) # $t8, 0x800e +/* 097940 80096D40 8F18F4BC */ lw $t8, %lo(gNumberOfActivePlayers)($t8) /* 097944 80096D44 A022F4AC */ sb $v0, %lo(D_800DF4AC)($at) /* 097948 80096D48 3C01800E */ lui $at, %hi(D_800DF4B0) # $at, 0x800e /* 09794C 80096D4C 1B00006E */ blez $t8, .L80096F08 @@ -366,8 +366,8 @@ glabel func_80096978 /* 097AE0 80096EE0 00002025 */ move $a0, $zero /* 097AE4 80096EE4 0C027298 */ jal func_8009CA60 /* 097AE8 80096EE8 A7310018 */ sh $s1, 0x18($t9) -/* 097AEC 80096EEC 3C18800E */ lui $t8, %hi(D_800DF4BC) # $t8, 0x800e -/* 097AF0 80096EF0 8F18F4BC */ lw $t8, %lo(D_800DF4BC)($t8) +/* 097AEC 80096EEC 3C18800E */ lui $t8, %hi(gNumberOfActivePlayers) # $t8, 0x800e +/* 097AF0 80096EF0 8F18F4BC */ lw $t8, %lo(gNumberOfActivePlayers)($t8) /* 097AF4 80096EF4 26D60001 */ addiu $s6, $s6, 1 /* 097AF8 80096EF8 02D8082A */ slt $at, $s6, $t8 /* 097AFC 80096EFC 26940018 */ addiu $s4, $s4, 0x18 diff --git a/asm/non_matchings/menu/func_80097D10.s b/asm/non_matchings/menu/func_80097D10.s index 8cd3513b..6ee1d481 100644 --- a/asm/non_matchings/menu/func_80097D10.s +++ b/asm/non_matchings/menu/func_80097D10.s @@ -9,7 +9,7 @@ glabel func_80097D10 /* 098918 80097D18 AFA40030 */ sw $a0, 0x30($sp) /* 09891C 80097D1C E7B50010 */ swc1 $f21, 0x10($sp) /* 098920 80097D20 E7B40014 */ swc1 $f20, 0x14($sp) -/* 098924 80097D24 0C01A955 */ jal func_8006A554 +/* 098924 80097D24 0C01A955 */ jal get_button_inputs_from_player /* 098928 80097D28 00002025 */ move $a0, $zero /* 09892C 80097D2C 00002025 */ move $a0, $zero /* 098930 80097D30 0C01A967 */ jal func_8006A59C @@ -266,9 +266,9 @@ glabel func_80097D10 /* 098CBC 800980BC 0C000741 */ jal func_80001D04 /* 098CC0 800980C0 A1A00000 */ sb $zero, ($t5) /* 098CC4 800980C4 240E0001 */ li $t6, 1 -/* 098CC8 800980C8 3C018012 */ lui $at, %hi(D_80126C48) # $at, 0x8012 +/* 098CC8 800980C8 3C018012 */ lui $at, %hi(gCheatInputString) # $at, 0x8012 /* 098CCC 800980CC 1000003C */ b .L800981C0 -/* 098CD0 800980D0 AC2E6C48 */ sw $t6, %lo(D_80126C48)($at) +/* 098CD0 800980D0 AC2E6C48 */ sw $t6, %lo(gCheatInputString)($at) /* 098CD4 800980D4 310F4000 */ andi $t7, $t0, 0x4000 .L800980D8: /* 098CD8 800980D8 11E0000E */ beqz $t7, .L80098114 @@ -322,9 +322,9 @@ glabel func_80097D10 /* 098D7C 8009817C 0C000741 */ jal func_80001D04 /* 098D80 80098180 00002825 */ move $a1, $zero /* 098D84 80098184 240D0001 */ li $t5, 1 -/* 098D88 80098188 3C018012 */ lui $at, %hi(D_80126C48) # $at, 0x8012 +/* 098D88 80098188 3C018012 */ lui $at, %hi(gCheatInputString) # $at, 0x8012 /* 098D8C 8009818C 1000000C */ b .L800981C0 -/* 098D90 80098190 AC2D6C48 */ sw $t5, %lo(D_80126C48)($at) +/* 098D90 80098190 AC2D6C48 */ sw $t5, %lo(gCheatInputString)($at) .L80098194: /* 098D94 80098194 11C0000A */ beqz $t6, .L800981C0 /* 098D98 80098198 3C088012 */ lui $t0, %hi(D_80126C74) # $t0, 0x8012 @@ -343,8 +343,8 @@ glabel func_80097D10 /* 098DC4 800981C4 0C025E46 */ jal func_80097918 /* 098DC8 800981C8 00000000 */ nop /* 098DCC 800981CC 8FBF001C */ lw $ra, 0x1c($sp) -/* 098DD0 800981D0 3C028012 */ lui $v0, %hi(D_80126C48) # $v0, 0x8012 -/* 098DD4 800981D4 8C426C48 */ lw $v0, %lo(D_80126C48)($v0) +/* 098DD0 800981D0 3C028012 */ lui $v0, %hi(gCheatInputString) # $v0, 0x8012 +/* 098DD4 800981D4 8C426C48 */ lw $v0, %lo(gCheatInputString)($v0) /* 098DD8 800981D8 C7B50010 */ lwc1 $f21, 0x10($sp) /* 098DDC 800981DC C7B40014 */ lwc1 $f20, 0x14($sp) /* 098DE0 800981E0 03E00008 */ jr $ra diff --git a/asm/non_matchings/menu/func_80098774.s b/asm/non_matchings/menu/func_80098774.s index b68b05d4..29d6694e 100644 --- a/asm/non_matchings/menu/func_80098774.s +++ b/asm/non_matchings/menu/func_80098774.s @@ -57,14 +57,14 @@ glabel func_80098774 /* 099444 80098844 00004025 */ move $t0, $zero /* 099448 80098848 00107140 */ sll $t6, $s0, 5 /* 09944C 8009884C 00107940 */ sll $t7, $s0, 5 -/* 099450 80098850 3C15800E */ lui $s5, %hi(D_800E1004) # $s5, 0x800e +/* 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 /* 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(D_800E1004) # addiu $s5, $s5, 0x1004 +/* 09946C 8009886C 26B51004 */ addiu $s5, %lo(gTrophyRacePointsArray) # addiu $s5, $s5, 0x1004 /* 099470 80098870 00AF5821 */ addu $t3, $a1, $t7 /* 099474 80098874 00AE6021 */ addu $t4, $a1, $t6 /* 099478 80098878 31310003 */ andi $s1, $t1, 3 diff --git a/asm/non_matchings/menu/func_80098EBC.s b/asm/non_matchings/menu/func_80098EBC.s index dbe6e70f..0af63f8f 100644 --- a/asm/non_matchings/menu/func_80098EBC.s +++ b/asm/non_matchings/menu/func_80098EBC.s @@ -18,12 +18,12 @@ glabel func_80098EBC /* 099AF8 80098EF8 8D290FE4 */ lw $t1, %lo(D_800E0FE4)($t1) /* 099AFC 80098EFC 00002025 */ move $a0, $zero /* 099B00 80098F00 19200024 */ blez $t1, .L80098F94 -/* 099B04 80098F04 3C0A800E */ lui $t2, %hi(D_800DF4BC) # $t2, 0x800e +/* 099B04 80098F04 3C0A800E */ lui $t2, %hi(gNumberOfActivePlayers) # $t2, 0x800e /* 099B08 80098F08 3C05800E */ lui $a1, %hi(D_800E1048+64) # $a1, 0x800e /* 099B0C 80098F0C 3C0B8012 */ lui $t3, %hi(D_801263E0) # $t3, 0x8012 /* 099B10 80098F10 3C088012 */ lui $t0, %hi(D_80126420) # $t0, 0x8012 /* 099B14 80098F14 3C078012 */ lui $a3, %hi(D_80126418) # $a3, 0x8012 -/* 099B18 80098F18 8D4AF4BC */ lw $t2, %lo(D_800DF4BC)($t2) +/* 099B18 80098F18 8D4AF4BC */ lw $t2, %lo(gNumberOfActivePlayers)($t2) /* 099B1C 80098F1C 24E76418 */ addiu $a3, %lo(D_80126418) # addiu $a3, $a3, 0x6418 /* 099B20 80098F20 25086420 */ addiu $t0, %lo(D_80126420) # addiu $t0, $t0, 0x6420 /* 099B24 80098F24 256B63E0 */ addiu $t3, %lo(D_801263E0) # addiu $t3, $t3, 0x63e0 diff --git a/asm/non_matchings/menu/func_8009BF20.s b/asm/non_matchings/menu/func_8009BF20.s index 64efc36f..64e04449 100644 --- a/asm/non_matchings/menu/func_8009BF20.s +++ b/asm/non_matchings/menu/func_8009BF20.s @@ -8,20 +8,20 @@ glabel func_8009BF20 /* 09CB38 8009BF38 AFB00018 */ sw $s0, 0x18($sp) /* 09CB3C 8009BF3C AFBE0038 */ sw $fp, 0x38($sp) /* 09CB40 8009BF40 AFB5002C */ sw $s5, 0x2c($sp) -/* 09CB44 8009BF44 3C108012 */ lui $s0, %hi(D_80126454) # $s0, 0x8012 -/* 09CB48 8009BF48 3C118012 */ lui $s1, %hi(D_80126458) # $s1, 0x8012 -/* 09CB4C 8009BF4C 3C128012 */ lui $s2, %hi(D_80126468) # $s2, 0x8012 -/* 09CB50 8009BF50 3C138012 */ lui $s3, %hi(D_8012646C) # $s3, 0x8012 -/* 09CB54 8009BF54 3C168012 */ lui $s6, %hi(D_8012645C) # $s6, 0x8012 -/* 09CB58 8009BF58 3C178012 */ lui $s7, %hi(D_80126464) # $s7, 0x8012 +/* 09CB44 8009BF44 3C108012 */ lui $s0, %hi(gControllersXAxisDelay) # $s0, 0x8012 +/* 09CB48 8009BF48 3C118012 */ lui $s1, %hi(gControllersYAxisDelay) # $s1, 0x8012 +/* 09CB4C 8009BF4C 3C128012 */ lui $s2, %hi(gControllersXAxis) # $s2, 0x8012 +/* 09CB50 8009BF50 3C138012 */ lui $s3, %hi(gControllersYAxis) # $s3, 0x8012 +/* 09CB54 8009BF54 3C168012 */ lui $s6, %hi(gControllersXAxisDirection) # $s6, 0x8012 +/* 09CB58 8009BF58 3C178012 */ lui $s7, %hi(gControllersYAxisDirection) # $s7, 0x8012 /* 09CB5C 8009BF5C AFBF003C */ sw $ra, 0x3c($sp) /* 09CB60 8009BF60 AFB40028 */ sw $s4, 0x28($sp) -/* 09CB64 8009BF64 26F76464 */ addiu $s7, %lo(D_80126464) # addiu $s7, $s7, 0x6464 -/* 09CB68 8009BF68 26D6645C */ addiu $s6, %lo(D_8012645C) # addiu $s6, $s6, 0x645c -/* 09CB6C 8009BF6C 2673646C */ addiu $s3, %lo(D_8012646C) # addiu $s3, $s3, 0x646c -/* 09CB70 8009BF70 26526468 */ addiu $s2, %lo(D_80126468) # addiu $s2, $s2, 0x6468 -/* 09CB74 8009BF74 26316458 */ addiu $s1, %lo(D_80126458) # addiu $s1, $s1, 0x6458 -/* 09CB78 8009BF78 26106454 */ addiu $s0, %lo(D_80126454) # addiu $s0, $s0, 0x6454 +/* 09CB64 8009BF64 26F76464 */ addiu $s7, %lo(gControllersYAxisDirection) # addiu $s7, $s7, 0x6464 +/* 09CB68 8009BF68 26D6645C */ addiu $s6, %lo(gControllersXAxisDirection) # addiu $s6, $s6, 0x645c +/* 09CB6C 8009BF6C 2673646C */ addiu $s3, %lo(gControllersYAxis) # addiu $s3, $s3, 0x646c +/* 09CB70 8009BF70 26526468 */ addiu $s2, %lo(gControllersXAxis) # addiu $s2, $s2, 0x6468 +/* 09CB74 8009BF74 26316458 */ addiu $s1, %lo(gControllersYAxisDelay) # addiu $s1, $s1, 0x6458 +/* 09CB78 8009BF78 26106454 */ addiu $s0, %lo(gControllersXAxisDelay) # addiu $s0, $s0, 0x6454 /* 09CB7C 8009BF7C 0000A825 */ move $s5, $zero /* 09CB80 8009BF80 241EFFFF */ li $fp, -1 .L8009BF84: diff --git a/asm/non_matchings/menu/func_8009D360.s b/asm/non_matchings/menu/func_8009D360.s index e1c6cfaf..76c85dbf 100644 --- a/asm/non_matchings/menu/func_8009D360.s +++ b/asm/non_matchings/menu/func_8009D360.s @@ -45,7 +45,7 @@ glabel func_8009D360 /* 09DFF0 8009D3F0 00002825 */ move $a1, $zero .L8009D3F4: /* 09DFF4 8009D3F4 AFA0002C */ sw $zero, 0x2c($sp) -/* 09DFF8 8009D3F8 0C01A955 */ jal func_8006A554 +/* 09DFF8 8009D3F8 0C01A955 */ jal get_button_inputs_from_player /* 09DFFC 8009D3FC 00002025 */ move $a0, $zero /* 09E000 8009D400 3C018012 */ lui $at, %hi(D_80126504) # $at, 0x8012 /* 09E004 8009D404 3C058012 */ lui $a1, %hi(D_801264E2) # $a1, 0x8012 diff --git a/asm/non_matchings/menu/func_8009DB3C.s b/asm/non_matchings/menu/func_8009DB3C.s index 41c90d02..b7d58aed 100644 --- a/asm/non_matchings/menu/func_8009DB3C.s +++ b/asm/non_matchings/menu/func_8009DB3C.s @@ -63,7 +63,7 @@ glabel func_8009DB3C /* 09E800 8009DC00 0C0313DF */ jal func_800C4F7C /* 09E804 8009DC04 00002825 */ move $a1, $zero /* 09E808 8009DC08 AFA00044 */ sw $zero, 0x44($sp) -/* 09E80C 8009DC0C 0C01A955 */ jal func_8006A554 +/* 09E80C 8009DC0C 0C01A955 */ jal get_button_inputs_from_player /* 09E810 8009DC10 00002025 */ move $a0, $zero /* 09E814 8009DC14 3C018012 */ lui $at, %hi(D_80126504) # $at, 0x8012 /* 09E818 8009DC18 A0206504 */ sb $zero, %lo(D_80126504)($at) @@ -106,7 +106,7 @@ glabel L8009DC60 /* 09E8A8 8009DCA8 00000000 */ nop /* 09E8AC 8009DCAC 1440001B */ bnez $v0, .L8009DD1C /* 09E8B0 8009DCB0 00000000 */ nop -/* 09E8B4 8009DCB4 0C003932 */ jal func_8000E4C8 +/* 09E8B4 8009DCB4 0C003932 */ jal is_time_trial_enabled /* 09E8B8 8009DCB8 00000000 */ nop /* 09E8BC 8009DCBC 10400009 */ beqz $v0, .L8009DCE4 /* 09E8C0 8009DCC0 3C0C800E */ lui $t4, %hi(D_800DF4A0) # $t4, 0x800e @@ -145,28 +145,28 @@ glabel L8009DC60 /* 09E938 8009DD38 00000000 */ nop /* 09E93C 8009DD3C 3C0F8012 */ lui $t7, %hi(D_80126516) # $t7, 0x8012 /* 09E940 8009DD40 81EF6516 */ lb $t7, %lo(D_80126516)($t7) -/* 09E944 8009DD44 3C028012 */ lui $v0, %hi(D_8012645C) # $v0, 0x8012 +/* 09E944 8009DD44 3C028012 */ lui $v0, %hi(gControllersXAxisDirection) # $v0, 0x8012 /* 09E948 8009DD48 15E0001B */ bnez $t7, .L8009DDB8 /* 09E94C 8009DD4C 8FB80040 */ lw $t8, 0x40($sp) -/* 09E950 8009DD50 8042645C */ lb $v0, %lo(D_8012645C)($v0) +/* 09E950 8009DD50 8042645C */ lb $v0, %lo(gControllersXAxisDirection)($v0) /* 09E954 8009DD54 00000000 */ nop /* 09E958 8009DD58 1840000B */ blez $v0, .L8009DD88 /* 09E95C 8009DD5C 00000000 */ nop -/* 09E960 8009DD60 0C003932 */ jal func_8000E4C8 +/* 09E960 8009DD60 0C003932 */ jal is_time_trial_enabled /* 09E964 8009DD64 00000000 */ nop /* 09E968 8009DD68 14400003 */ bnez $v0, .L8009DD78 /* 09E96C 8009DD6C 24040231 */ li $a0, 561 /* 09E970 8009DD70 0C00DAF3 */ jal func_80036BCC /* 09E974 8009DD74 24050001 */ li $a1, 1 .L8009DD78: -/* 09E978 8009DD78 0C00392F */ jal func_8000E4BC +/* 09E978 8009DD78 0C00392F */ jal set_time_trial_enabled /* 09E97C 8009DD7C 24040001 */ li $a0, 1 /* 09E980 8009DD80 1000000D */ b .L8009DDB8 /* 09E984 8009DD84 8FB80040 */ lw $t8, 0x40($sp) .L8009DD88: /* 09E988 8009DD88 0441000B */ bgez $v0, .L8009DDB8 /* 09E98C 8009DD8C 8FB80040 */ lw $t8, 0x40($sp) -/* 09E990 8009DD90 0C003932 */ jal func_8000E4C8 +/* 09E990 8009DD90 0C003932 */ jal is_time_trial_enabled /* 09E994 8009DD94 00000000 */ nop /* 09E998 8009DD98 24010001 */ li $at, 1 /* 09E99C 8009DD9C 14410003 */ bne $v0, $at, .L8009DDAC @@ -174,7 +174,7 @@ glabel L8009DC60 /* 09E9A4 8009DDA4 0C00DAF3 */ jal func_80036BCC /* 09E9A8 8009DDA8 24050001 */ li $a1, 1 .L8009DDAC: -/* 09E9AC 8009DDAC 0C00392F */ jal func_8000E4BC +/* 09E9AC 8009DDAC 0C00392F */ jal set_time_trial_enabled /* 09E9B0 8009DDB0 00002025 */ move $a0, $zero /* 09E9B4 8009DDB4 8FB80040 */ lw $t8, 0x40($sp) .L8009DDB8: diff --git a/asm/non_matchings/menu/func_8009E7E8.s b/asm/non_matchings/menu/func_8009E7E8.s index 9dfc097a..408cace8 100644 --- a/asm/non_matchings/menu/func_8009E7E8.s +++ b/asm/non_matchings/menu/func_8009E7E8.s @@ -12,7 +12,7 @@ glabel func_8009E7E8 /* 09F410 8009E810 0C0313DF */ jal func_800C4F7C /* 09F414 8009E814 00002825 */ move $a1, $zero /* 09F418 8009E818 AFA00024 */ sw $zero, 0x24($sp) -/* 09F41C 8009E81C 0C01A955 */ jal func_8006A554 +/* 09F41C 8009E81C 0C01A955 */ jal get_button_inputs_from_player /* 09F420 8009E820 00002025 */ move $a0, $zero /* 09F424 8009E824 3C0F800E */ lui $t7, %hi(D_800DF4A0) # $t7, 0x800e /* 09F428 8009E828 8DEFF4A0 */ lw $t7, %lo(D_800DF4A0)($t7) @@ -26,8 +26,8 @@ glabel func_8009E7E8 /* 09F448 8009E848 24058000 */ li $a1, -32768 /* 09F44C 8009E84C 0C03145A */ jal func_800C5168 /* 09F450 8009E850 24060006 */ li $a2, 6 -/* 09F454 8009E854 3C038012 */ lui $v1, %hi(D_80126464) # $v1, 0x8012 -/* 09F458 8009E858 80636464 */ lb $v1, %lo(D_80126464)($v1) +/* 09F454 8009E854 3C038012 */ lui $v1, %hi(gControllersYAxisDirection) # $v1, 0x8012 +/* 09F458 8009E858 80636464 */ lb $v1, %lo(gControllersYAxisDirection)($v1) /* 09F45C 8009E85C 00000000 */ nop /* 09F460 8009E860 04610008 */ bgez $v1, .L8009E884 /* 09F464 8009E864 00000000 */ nop diff --git a/asm/non_matchings/menu/menu_23_loop.s b/asm/non_matchings/menu/menu_23_loop.s index e0fb4c48..35b22fbf 100644 --- a/asm/non_matchings/menu/menu_23_loop.s +++ b/asm/non_matchings/menu/menu_23_loop.s @@ -1,7 +1,7 @@ glabel menu_23_loop /* 09B8FC 8009ACFC 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 09B900 8009AD00 3C0E8012 */ lui $t6, %hi(D_801263C4) # $t6, 0x8012 -/* 09B904 8009AD04 8DCE63C4 */ lw $t6, %lo(D_801263C4)($t6) +/* 09B900 8009AD00 3C0E8012 */ lui $t6, %hi(gIgnorePlayerInput) # $t6, 0x8012 +/* 09B904 8009AD04 8DCE63C4 */ lw $t6, %lo(gIgnorePlayerInput)($t6) /* 09B908 8009AD08 AFB20030 */ sw $s2, 0x30($sp) /* 09B90C 8009AD0C AFBF0044 */ sw $ra, 0x44($sp) /* 09B910 8009AD10 AFB60040 */ sw $s6, 0x40($sp) @@ -13,14 +13,14 @@ glabel menu_23_loop /* 09B928 8009AD28 AFA40048 */ sw $a0, 0x48($sp) /* 09B92C 8009AD2C 15C0000E */ bnez $t6, .L8009AD68 /* 09B930 8009AD30 00009025 */ move $s2, $zero -/* 09B934 8009AD34 3C11800E */ lui $s1, %hi(D_800DF4BC) # $s1, 0x800e -/* 09B938 8009AD38 2631F4BC */ addiu $s1, %lo(D_800DF4BC) # addiu $s1, $s1, -0xb44 +/* 09B934 8009AD34 3C11800E */ lui $s1, %hi(gNumberOfActivePlayers) # $s1, 0x800e +/* 09B938 8009AD38 2631F4BC */ addiu $s1, %lo(gNumberOfActivePlayers) # addiu $s1, $s1, -0xb44 /* 09B93C 8009AD3C 8E2F0000 */ lw $t7, ($s1) /* 09B940 8009AD40 00008025 */ move $s0, $zero /* 09B944 8009AD44 19E00008 */ blez $t7, .L8009AD68 /* 09B948 8009AD48 00000000 */ nop .L8009AD4C: -/* 09B94C 8009AD4C 0C01A955 */ jal func_8006A554 +/* 09B94C 8009AD4C 0C01A955 */ jal get_button_inputs_from_player /* 09B950 8009AD50 02002025 */ move $a0, $s0 /* 09B954 8009AD54 8E380000 */ lw $t8, ($s1) /* 09B958 8009AD58 26100001 */ addiu $s0, $s0, 1 @@ -130,8 +130,8 @@ glabel menu_23_loop /* 09BADC 8009AEDC 1691FFEC */ bne $s4, $s1, .L8009AE90 /* 09BAE0 8009AEE0 00117880 */ sll $t7, $s1, 2 .L8009AEE4: -/* 09BAE4 8009AEE4 3C018012 */ lui $at, %hi(D_801263C4) # $at, 0x8012 -/* 09BAE8 8009AEE8 AC2063C4 */ sw $zero, %lo(D_801263C4)($at) +/* 09BAE4 8009AEE4 3C018012 */ lui $at, %hi(gIgnorePlayerInput) # $at, 0x8012 +/* 09BAE8 8009AEE8 AC2063C4 */ sw $zero, %lo(gIgnorePlayerInput)($at) /* 09BAEC 8009AEEC 00001025 */ move $v0, $zero /* 09BAF0 8009AEF0 8FBF0044 */ lw $ra, 0x44($sp) .L8009AEF4: diff --git a/asm/non_matchings/menu/menu_5_init.s b/asm/non_matchings/menu/menu_5_init.s index 1065cc90..d4410016 100644 --- a/asm/non_matchings/menu/menu_5_init.s +++ b/asm/non_matchings/menu/menu_5_init.s @@ -3,13 +3,13 @@ glabel menu_5_init /* 093888 80092C88 AFBF001C */ sw $ra, 0x1c($sp) /* 09388C 80092C8C 0C01BAA4 */ jal get_settings /* 093890 80092C90 AFB00018 */ sw $s0, 0x18($sp) -/* 093894 80092C94 3C01800E */ lui $at, %hi(D_800DF4C4) # $at, 0x800e -/* 093898 80092C98 AC20F4C4 */ sw $zero, %lo(D_800DF4C4)($at) +/* 093894 80092C94 3C01800E */ lui $at, %hi(gTrackIdForPreview) # $at, 0x800e +/* 093898 80092C98 AC20F4C4 */ sw $zero, %lo(gTrackIdForPreview)($at) /* 09389C 80092C9C 3C018012 */ lui $at, %hi(D_801263BC) # $at, 0x8012 /* 0938A0 80092CA0 AC2063BC */ sw $zero, %lo(D_801263BC)($at) -/* 0938A4 80092CA4 3C01800E */ lui $at, %hi(D_800DF47C) # $at, 0x800e +/* 0938A4 80092CA4 3C01800E */ lui $at, %hi(gMenuDelay) # $at, 0x800e /* 0938A8 80092CA8 AFA20024 */ sw $v0, 0x24($sp) -/* 0938AC 80092CAC AC20F47C */ sw $zero, %lo(D_800DF47C)($at) +/* 0938AC 80092CAC AC20F47C */ sw $zero, %lo(gMenuDelay)($at) /* 0938B0 80092CB0 8C4E004C */ lw $t6, 0x4c($v0) /* 0938B4 80092CB4 00000000 */ nop /* 0938B8 80092CB8 81D00002 */ lb $s0, 2($t6) @@ -64,7 +64,7 @@ glabel menu_5_init .L80092D70: /* 093970 80092D70 0C0002F8 */ jal func_80000BE0 /* 093974 80092D74 24040018 */ li $a0, 24 -/* 093978 80092D78 0C0002CD */ jal func_80000B34 +/* 093978 80092D78 0C0002CD */ jal play_music /* 09397C 80092D7C 24040018 */ li $a0, 24 /* 093980 80092D80 0C0002C6 */ jal func_80000B18 /* 093984 80092D84 00000000 */ nop @@ -109,8 +109,8 @@ glabel menu_5_init /* 093A20 80092E20 AC2C0614 */ sw $t4, %lo(D_800E0614)($at) /* 093A24 80092E24 3C018012 */ lui $at, %hi(D_801263BC) # $at, 0x8012 /* 093A28 80092E28 AC2063BC */ sw $zero, %lo(D_801263BC)($at) -/* 093A2C 80092E2C 3C01800E */ lui $at, %hi(D_800DF47C) # $at, 0x800e -/* 093A30 80092E30 AC20F47C */ sw $zero, %lo(D_800DF47C)($at) +/* 093A2C 80092E2C 3C01800E */ lui $at, %hi(gMenuDelay) # $at, 0x800e +/* 093A30 80092E30 AC20F47C */ sw $zero, %lo(gMenuDelay)($at) /* 093A34 80092E34 3C01800E */ lui $at, %hi(D_800E0980) # $at, 0x800e /* 093A38 80092E38 240D001E */ li $t5, 30 /* 093A3C 80092E3C AC2D0980 */ sw $t5, %lo(D_800E0980)($at) diff --git a/asm/non_matchings/menu/menu_5_loop.s b/asm/non_matchings/menu/menu_5_loop.s index 93de4290..18a137a9 100644 --- a/asm/non_matchings/menu/menu_5_loop.s +++ b/asm/non_matchings/menu/menu_5_loop.s @@ -5,8 +5,8 @@ glabel menu_5_loop /* 09420C 8009360C AFBF0014 */ sw $ra, 0x14($sp) /* 094210 80093610 05C10007 */ bgez $t6, .L80093630 /* 094214 80093614 AFA40038 */ sw $a0, 0x38($sp) -/* 094218 80093618 3C02800E */ lui $v0, %hi(D_800DF4C4) # $v0, 0x800e -/* 09421C 8009361C 8C42F4C4 */ lw $v0, %lo(D_800DF4C4)($v0) +/* 094218 80093618 3C02800E */ lui $v0, %hi(gTrackIdForPreview) # $v0, 0x800e +/* 09421C 8009361C 8C42F4C4 */ lw $v0, %lo(gTrackIdForPreview)($v0) /* 094220 80093620 00000000 */ nop /* 094224 80093624 344F0080 */ ori $t7, $v0, 0x80 /* 094228 80093628 100000F4 */ b .L800939FC @@ -14,8 +14,8 @@ glabel menu_5_loop .L80093630: /* 094230 80093630 0C01BAA4 */ jal get_settings /* 094234 80093634 00000000 */ nop -/* 094238 80093638 3C19800E */ lui $t9, %hi(D_800DF4C4) # $t9, 0x800e -/* 09423C 8009363C 8F39F4C4 */ lw $t9, %lo(D_800DF4C4)($t9) +/* 094238 80093638 3C19800E */ lui $t9, %hi(gTrackIdForPreview) # $t9, 0x800e +/* 09423C 8009363C 8F39F4C4 */ lw $t9, %lo(gTrackIdForPreview)($t9) /* 094240 80093640 8C58004C */ lw $t8, 0x4c($v0) /* 094244 80093644 00403025 */ move $a2, $v0 /* 094248 80093648 03194021 */ addu $t0, $t8, $t9 @@ -46,7 +46,7 @@ glabel menu_5_loop /* 0942A4 800936A4 AFAF0028 */ sw $t7, 0x28($sp) .L800936A8: /* 0942A8 800936A8 AFA00020 */ sw $zero, 0x20($sp) -/* 0942AC 800936AC 0C003932 */ jal func_8000E4C8 +/* 0942AC 800936AC 0C003932 */ jal is_time_trial_enabled /* 0942B0 800936B0 AFA60018 */ sw $a2, 0x18($sp) /* 0942B4 800936B4 8FA60018 */ lw $a2, 0x18($sp) /* 0942B8 800936B8 1440000F */ bnez $v0, .L800936F8 @@ -96,8 +96,8 @@ glabel menu_5_loop /* 09435C 8009375C AFA20030 */ sw $v0, 0x30($sp) /* 094360 80093760 0C02393B */ jal func_8008E4EC /* 094364 80093764 AFA3002C */ sw $v1, 0x2c($sp) -/* 094368 80093768 3C06800E */ lui $a2, %hi(D_800DF47C) # $a2, 0x800e -/* 09436C 8009376C 24C6F47C */ addiu $a2, %lo(D_800DF47C) # addiu $a2, $a2, -0xb84 +/* 094368 80093768 3C06800E */ lui $a2, %hi(gMenuDelay) # $a2, 0x800e +/* 09436C 8009376C 24C6F47C */ addiu $a2, %lo(gMenuDelay) # addiu $a2, $a2, -0xb84 /* 094370 80093770 8CC20000 */ lw $v0, ($a2) /* 094374 80093774 8FA30034 */ lw $v1, 0x34($sp) /* 094378 80093778 8FA40030 */ lw $a0, 0x30($sp) @@ -125,8 +125,8 @@ glabel menu_5_loop /* 0943CC 800937CC 240B0001 */ li $t3, 1 /* 0943D0 800937D0 0C030C7B */ jal func_800C31EC /* 0943D4 800937D4 24042710 */ li $a0, 10000 -/* 0943D8 800937D8 3C06800E */ lui $a2, %hi(D_800DF47C) # $a2, 0x800e -/* 0943DC 800937DC 24C6F47C */ addiu $a2, %lo(D_800DF47C) # addiu $a2, $a2, -0xb84 +/* 0943D8 800937D8 3C06800E */ lui $a2, %hi(gMenuDelay) # $a2, 0x800e +/* 0943DC 800937DC 24C6F47C */ addiu $a2, %lo(gMenuDelay) # addiu $a2, $a2, -0xb84 /* 0943E0 800937E0 240B0001 */ li $t3, 1 .L800937E4: /* 0943E4 800937E4 3C04800E */ lui $a0, %hi(D_800DF774) # $a0, 0x800e @@ -161,9 +161,9 @@ glabel menu_5_loop /* 09444C 8009384C 0C030076 */ jal func_800C01D8 /* 094450 80093850 2484F774 */ addiu $a0, %lo(D_800DF774) # addiu $a0, $a0, -0x88c /* 094454 80093854 2418FFFF */ li $t8, -1 -/* 094458 80093858 3C01800E */ lui $at, %hi(D_800DF47C) # $at, 0x800e +/* 094458 80093858 3C01800E */ lui $at, %hi(gMenuDelay) # $at, 0x800e /* 09445C 8009385C 10000064 */ b .L800939F0 -/* 094460 80093860 AC38F47C */ sw $t8, %lo(D_800DF47C)($at) +/* 094460 80093860 AC38F47C */ sw $t8, %lo(gMenuDelay)($at) .L80093864: /* 094464 80093864 10000062 */ b .L800939F0 /* 094468 80093868 AC2063E0 */ sw $zero, %lo(D_801263E0)($at) @@ -181,9 +181,9 @@ glabel menu_5_loop /* 094494 80093894 0C030076 */ jal func_800C01D8 /* 094498 80093898 2484F774 */ addiu $a0, %lo(D_800DF774) # addiu $a0, $a0, -0x88c /* 09449C 8009389C 2419FFFF */ li $t9, -1 -/* 0944A0 800938A0 3C01800E */ lui $at, %hi(D_800DF47C) # $at, 0x800e +/* 0944A0 800938A0 3C01800E */ lui $at, %hi(gMenuDelay) # $at, 0x800e /* 0944A4 800938A4 10000052 */ b .L800939F0 -/* 0944A8 800938A8 AC39F47C */ sw $t9, %lo(D_800DF47C)($at) +/* 0944A8 800938A8 AC39F47C */ sw $t9, %lo(gMenuDelay)($at) .L800938AC: /* 0944AC 800938AC 11200007 */ beqz $t1, .L800938CC /* 0944B0 800938B0 240A0001 */ li $t2, 1 @@ -265,12 +265,12 @@ glabel menu_5_loop .L800939B8: /* 0945B8 800939B8 0C024E83 */ jal func_80093A0C /* 0945BC 800939BC 00000000 */ nop -/* 0945C0 800939C0 3C0C800E */ lui $t4, %hi(D_800DF47C) # $t4, 0x800e -/* 0945C4 800939C4 8D8CF47C */ lw $t4, %lo(D_800DF47C)($t4) -/* 0945C8 800939C8 3C02800E */ lui $v0, %hi(D_800DF4C4) # $v0, 0x800e +/* 0945C0 800939C0 3C0C800E */ lui $t4, %hi(gMenuDelay) # $t4, 0x800e +/* 0945C4 800939C4 8D8CF47C */ lw $t4, %lo(gMenuDelay)($t4) +/* 0945C8 800939C8 3C02800E */ lui $v0, %hi(gTrackIdForPreview) # $v0, 0x800e /* 0945CC 800939CC 19800006 */ blez $t4, .L800939E8 /* 0945D0 800939D0 00000000 */ nop -/* 0945D4 800939D4 8C42F4C4 */ lw $v0, %lo(D_800DF4C4)($v0) +/* 0945D4 800939D4 8C42F4C4 */ lw $v0, %lo(gTrackIdForPreview)($v0) /* 0945D8 800939D8 00000000 */ nop /* 0945DC 800939DC 344D0080 */ ori $t5, $v0, 0x80 /* 0945E0 800939E0 10000006 */ b .L800939FC @@ -279,8 +279,8 @@ glabel menu_5_loop /* 0945E8 800939E8 10000004 */ b .L800939FC /* 0945EC 800939EC 24020103 */ li $v0, 259 .L800939F0: -/* 0945F0 800939F0 3C018012 */ lui $at, %hi(D_801263C4) # $at, 0x8012 -/* 0945F4 800939F4 AC2063C4 */ sw $zero, %lo(D_801263C4)($at) +/* 0945F0 800939F0 3C018012 */ lui $at, %hi(gIgnorePlayerInput) # $at, 0x8012 +/* 0945F4 800939F4 AC2063C4 */ sw $zero, %lo(gIgnorePlayerInput)($at) /* 0945F8 800939F8 00001025 */ move $v0, $zero .L800939FC: /* 0945FC 800939FC 8FBF0014 */ lw $ra, 0x14($sp) diff --git a/asm/non_matchings/menu/menu_audio_options_loop.s b/asm/non_matchings/menu/menu_audio_options_loop.s index 4ba74c0d..9f9f9e51 100644 --- a/asm/non_matchings/menu/menu_audio_options_loop.s +++ b/asm/non_matchings/menu/menu_audio_options_loop.s @@ -2,8 +2,8 @@ glabel menu_audio_options_loop /* 085874 80084C74 3C038012 */ lui $v1, %hi(D_801263BC) # $v1, 0x8012 /* 085878 80084C78 246363BC */ addiu $v1, %lo(D_801263BC) # addiu $v1, $v1, 0x63bc /* 08587C 80084C7C 8C6E0000 */ lw $t6, ($v1) -/* 085880 80084C80 3C09800E */ lui $t1, %hi(D_800DF47C) # $t1, 0x800e -/* 085884 80084C84 2529F47C */ addiu $t1, %lo(D_800DF47C) # addiu $t1, $t1, -0xb84 +/* 085880 80084C80 3C09800E */ lui $t1, %hi(gMenuDelay) # $t1, 0x800e +/* 085884 80084C84 2529F47C */ addiu $t1, %lo(gMenuDelay) # addiu $t1, $t1, -0xb84 /* 085888 80084C88 8D220000 */ lw $v0, ($t1) /* 08588C 80084C8C 27BDFFB8 */ addiu $sp, $sp, -0x48 /* 085890 80084C90 01C47821 */ addu $t7, $t6, $a0 @@ -30,11 +30,11 @@ glabel menu_audio_options_loop /* 0858DC 80084CDC 00000000 */ nop /* 0858E0 80084CE0 0C021215 */ jal func_80084854 /* 0858E4 80084CE4 00000000 */ nop -/* 0858E8 80084CE8 3C09800E */ lui $t1, %hi(D_800DF47C) # $t1, 0x800e -/* 0858EC 80084CEC 2529F47C */ addiu $t1, %lo(D_800DF47C) # addiu $t1, $t1, -0xb84 +/* 0858E8 80084CE8 3C09800E */ lui $t1, %hi(gMenuDelay) # $t1, 0x800e +/* 0858EC 80084CEC 2529F47C */ addiu $t1, %lo(gMenuDelay) # addiu $t1, $t1, -0xb84 .L80084CF0: -/* 0858F0 80084CF0 3C0B8012 */ lui $t3, %hi(D_801263C4) # $t3, 0x8012 -/* 0858F4 80084CF4 8D6B63C4 */ lw $t3, %lo(D_801263C4)($t3) +/* 0858F0 80084CF0 3C0B8012 */ lui $t3, %hi(gIgnorePlayerInput) # $t3, 0x8012 +/* 0858F4 80084CF4 8D6B63C4 */ lw $t3, %lo(gIgnorePlayerInput)($t3) /* 0858F8 80084CF8 00000000 */ nop /* 0858FC 80084CFC 1560012C */ bnez $t3, .L800851B0 /* 085900 80084D00 00000000 */ nop @@ -42,12 +42,12 @@ glabel menu_audio_options_loop /* 085908 80084D08 00004025 */ move $t0, $zero /* 08590C 80084D0C 15800128 */ bnez $t4, .L800851B0 /* 085910 80084D10 00003825 */ move $a3, $zero -/* 085914 80084D14 3C038012 */ lui $v1, %hi(D_8012645C) # $v1, 0x8012 -/* 085918 80084D18 3C058012 */ lui $a1, %hi(D_80126464) # $a1, 0x8012 +/* 085914 80084D14 3C038012 */ lui $v1, %hi(gControllersXAxisDirection) # $v1, 0x8012 +/* 085918 80084D18 3C058012 */ lui $a1, %hi(gControllersYAxisDirection) # $a1, 0x8012 /* 08591C 80084D1C AFA00040 */ sw $zero, 0x40($sp) /* 085920 80084D20 00003025 */ move $a2, $zero -/* 085924 80084D24 24A56464 */ addiu $a1, %lo(D_80126464) # addiu $a1, $a1, 0x6464 -/* 085928 80084D28 2463645C */ addiu $v1, %lo(D_8012645C) # addiu $v1, $v1, 0x645c +/* 085924 80084D24 24A56464 */ addiu $a1, %lo(gControllersYAxisDirection) # addiu $a1, $a1, 0x6464 +/* 085928 80084D28 2463645C */ addiu $v1, %lo(gControllersXAxisDirection) # addiu $v1, $v1, 0x645c /* 08592C 80084D2C 00008025 */ move $s0, $zero .L80084D30: /* 085930 80084D30 02002025 */ move $a0, $s0 @@ -55,7 +55,7 @@ glabel menu_audio_options_loop /* 085938 80084D38 AFA50024 */ sw $a1, 0x24($sp) /* 08593C 80084D3C AFA60034 */ sw $a2, 0x34($sp) /* 085940 80084D40 AFA70038 */ sw $a3, 0x38($sp) -/* 085944 80084D44 0C01A955 */ jal func_8006A554 +/* 085944 80084D44 0C01A955 */ jal get_button_inputs_from_player /* 085948 80084D48 AFA8003C */ sw $t0, 0x3c($sp) /* 08594C 80084D4C 8FAD0040 */ lw $t5, 0x40($sp) /* 085950 80084D50 02002025 */ move $a0, $s0 @@ -97,8 +97,8 @@ glabel menu_audio_options_loop /* 0859D4 80084DD4 03203025 */ move $a2, $t9 /* 0859D8 80084DD8 11400008 */ beqz $t2, .L80084DFC /* 0859DC 80084DDC 01402025 */ move $a0, $t2 -/* 0859E0 80084DE0 3C0C8012 */ lui $t4, %hi(D_80126C46) # $t4, 0x8012 -/* 0859E4 80084DE4 858C6C46 */ lh $t4, %lo(D_80126C46)($t4) +/* 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 /* 0859EC 80084DEC 8C6B0000 */ lw $t3, ($v1) /* 0859F0 80084DF0 258D0001 */ addiu $t5, $t4, 1 @@ -112,9 +112,9 @@ glabel menu_audio_options_loop /* 085A0C 80084E0C 246363E0 */ addiu $v1, %lo(D_801263E0) # addiu $v1, $v1, 0x63e0 /* 085A10 80084E10 2418FFFF */ li $t8, -1 .L80084E14: -/* 085A14 80084E14 3C01800E */ lui $at, %hi(D_800DF47C) # $at, 0x800e +/* 085A14 80084E14 3C01800E */ lui $at, %hi(gMenuDelay) # $at, 0x800e /* 085A18 80084E18 3C04800E */ lui $a0, %hi(D_800DF774) # $a0, 0x800e -/* 085A1C 80084E1C AC38F47C */ sw $t8, %lo(D_800DF47C)($at) +/* 085A1C 80084E1C AC38F47C */ sw $t8, %lo(gMenuDelay)($at) /* 085A20 80084E20 0C030076 */ jal func_800C01D8 /* 085A24 80084E24 2484F774 */ addiu $a0, %lo(D_800DF774) # addiu $a0, $a0, -0x88c /* 085A28 80084E28 3C198012 */ lui $t9, %hi(D_801263D8) # $t9, 0x8012 @@ -129,8 +129,8 @@ glabel menu_audio_options_loop /* 085A48 80084E48 100000AD */ b .L80085100 /* 085A4C 80084E4C AFAA0030 */ sw $t2, 0x30($sp) .L80084E50: -/* 085A50 80084E50 3C028012 */ lui $v0, %hi(D_80126C46) # $v0, 0x8012 -/* 085A54 80084E54 84426C46 */ lh $v0, %lo(D_80126C46)($v0) +/* 085A50 80084E50 3C028012 */ lui $v0, %hi(gOptionsMenuItemIndex) # $v0, 0x8012 +/* 085A54 80084E54 84426C46 */ lh $v0, %lo(gOptionsMenuItemIndex)($v0) /* 085A58 80084E58 04E1000B */ bgez $a3, .L80084E88 /* 085A5C 80084E5C 00000000 */ nop /* 085A60 80084E60 8C6C0000 */ lw $t4, ($v1) @@ -139,8 +139,8 @@ glabel menu_audio_options_loop /* 085A6C 80084E6C 004B082A */ slt $at, $v0, $t3 /* 085A70 80084E70 10200005 */ beqz $at, .L80084E88 /* 085A74 80084E74 240E0001 */ li $t6, 1 -/* 085A78 80084E78 3C018012 */ lui $at, %hi(D_80126C46) # $at, 0x8012 -/* 085A7C 80084E7C A42D6C46 */ sh $t5, %lo(D_80126C46)($at) +/* 085A78 80084E78 3C018012 */ lui $at, %hi(gOptionsMenuItemIndex) # $at, 0x8012 +/* 085A7C 80084E7C A42D6C46 */ sh $t5, %lo(gOptionsMenuItemIndex)($at) /* 085A80 80084E80 1000009F */ b .L80085100 /* 085A84 80084E84 AFAE0030 */ sw $t6, 0x30($sp) .L80084E88: @@ -148,9 +148,9 @@ glabel menu_audio_options_loop /* 085A8C 80084E8C 00000000 */ nop /* 085A90 80084E90 18400006 */ blez $v0, .L80084EAC /* 085A94 80084E94 244FFFFF */ addiu $t7, $v0, -1 -/* 085A98 80084E98 3C018012 */ lui $at, %hi(D_80126C46) # $at, 0x8012 +/* 085A98 80084E98 3C018012 */ lui $at, %hi(gOptionsMenuItemIndex) # $at, 0x8012 /* 085A9C 80084E9C 24180001 */ li $t8, 1 -/* 085AA0 80084EA0 A42F6C46 */ sh $t7, %lo(D_80126C46)($at) +/* 085AA0 80084EA0 A42F6C46 */ sh $t7, %lo(gOptionsMenuItemIndex)($at) /* 085AA4 80084EA4 10000096 */ b .L80085100 /* 085AA8 80084EA8 AFB80030 */ sw $t8, 0x30($sp) .L80084EAC: @@ -201,8 +201,8 @@ glabel menu_audio_options_loop .L80084F48: /* 085B48 80084F48 24010001 */ li $at, 1 /* 085B4C 80084F4C 14410013 */ bne $v0, $at, .L80084F9C -/* 085B50 80084F50 3C03800E */ lui $v1, %hi(D_800DFAC0) # $v1, 0x800e -/* 085B54 80084F54 2463FAC0 */ addiu $v1, %lo(D_800DFAC0) # addiu $v1, $v1, -0x540 +/* 085B50 80084F50 3C03800E */ lui $v1, %hi(gSfxVolumeSliderValue) # $v1, 0x800e +/* 085B54 80084F54 2463FAC0 */ addiu $v1, %lo(gSfxVolumeSliderValue) # addiu $v1, $v1, -0x540 /* 085B58 80084F58 8C6F0000 */ lw $t7, ($v1) /* 085B5C 80084F5C 00000000 */ nop /* 085B60 80084F60 01E61021 */ addu $v0, $t7, $a2 @@ -225,8 +225,8 @@ glabel menu_audio_options_loop .L80084F9C: /* 085B9C 80084F9C 24010002 */ li $at, 2 /* 085BA0 80084FA0 14410057 */ bne $v0, $at, .L80085100 -/* 085BA4 80084FA4 3C03800E */ lui $v1, %hi(D_800DFAC4) # $v1, 0x800e -/* 085BA8 80084FA8 2463FAC4 */ addiu $v1, %lo(D_800DFAC4) # addiu $v1, $v1, -0x53c +/* 085BA4 80084FA4 3C03800E */ lui $v1, %hi(gMusicVolumeSliderValue) # $v1, 0x800e +/* 085BA8 80084FA8 2463FAC4 */ addiu $v1, %lo(gMusicVolumeSliderValue) # addiu $v1, $v1, -0x53c /* 085BAC 80084FAC 8C6A0000 */ lw $t2, ($v1) /* 085BB0 80084FB0 00000000 */ nop /* 085BB4 80084FB4 01461021 */ addu $v0, $t2, $a2 @@ -257,7 +257,7 @@ glabel menu_audio_options_loop /* 085C10 80085010 3C10800E */ lui $s0, %hi(D_800DFABC) # $s0, 0x800e /* 085C14 80085014 2610FABC */ addiu $s0, %lo(D_800DFABC) # addiu $s0, $s0, -0x544 /* 085C18 80085018 92040003 */ lbu $a0, 3($s0) -/* 085C1C 8008501C 0C0002CD */ jal func_80000B34 +/* 085C1C 8008501C 0C0002CD */ jal play_music /* 085C20 80085020 00000000 */ nop /* 085C24 80085024 10000036 */ b .L80085100 /* 085C28 80085028 00000000 */ nop @@ -266,7 +266,7 @@ glabel menu_audio_options_loop /* 085C30 80085030 00000000 */ nop /* 085C34 80085034 0C0002F8 */ jal func_80000BE0 /* 085C38 80085038 24040018 */ li $a0, 24 -/* 085C3C 8008503C 0C0002CD */ jal func_80000B34 +/* 085C3C 8008503C 0C0002CD */ jal play_music /* 085C40 80085040 24040018 */ li $a0, 24 /* 085C44 80085044 0C0002C6 */ jal func_80000B18 /* 085C48 80085048 00000000 */ nop @@ -313,14 +313,14 @@ glabel menu_audio_options_loop /* 085CE0 800850E0 0C0002F8 */ jal func_80000BE0 /* 085CE4 800850E4 24040018 */ li $a0, 24 /* 085CE8 800850E8 92040003 */ lbu $a0, 3($s0) -/* 085CEC 800850EC 0C0002CD */ jal func_80000B34 +/* 085CEC 800850EC 0C0002CD */ jal play_music /* 085CF0 800850F0 00000000 */ nop /* 085CF4 800850F4 8E0B0000 */ lw $t3, ($s0) /* 085CF8 800850F8 3C018012 */ lui $at, %hi(D_801263D8) # $at, 0x8012 /* 085CFC 800850FC AC2B63D8 */ sw $t3, %lo(D_801263D8)($at) .L80085100: -/* 085D00 80085100 3C0D8012 */ lui $t5, %hi(D_80126C46) # $t5, 0x8012 -/* 085D04 80085104 85AD6C46 */ lh $t5, %lo(D_80126C46)($t5) +/* 085D00 80085100 3C0D8012 */ lui $t5, %hi(gOptionsMenuItemIndex) # $t5, 0x8012 +/* 085D04 80085104 85AD6C46 */ lh $t5, %lo(gOptionsMenuItemIndex)($t5) /* 085D08 80085108 24010001 */ li $at, 1 /* 085D0C 8008510C 15A1000B */ bne $t5, $at, .L8008513C /* 085D10 80085110 3C058012 */ lui $a1, %hi(D_801269FC) # $a1, 0x8012 @@ -368,8 +368,8 @@ glabel menu_audio_options_loop /* 085DA8 800851A8 0C000741 */ jal func_80001D04 /* 085DAC 800851AC 00002825 */ move $a1, $zero .L800851B0: -/* 085DB0 800851B0 3C09800E */ lui $t1, %hi(D_800DF47C) # $t1, 0x800e -/* 085DB4 800851B4 2529F47C */ addiu $t1, %lo(D_800DF47C) # addiu $t1, $t1, -0xb84 +/* 085DB0 800851B0 3C09800E */ lui $t1, %hi(gMenuDelay) # $t1, 0x800e +/* 085DB4 800851B4 2529F47C */ addiu $t1, %lo(gMenuDelay) # addiu $t1, $t1, -0xb84 /* 085DB8 800851B8 8D2A0000 */ lw $t2, ($t1) /* 085DBC 800851BC 00001025 */ move $v0, $zero /* 085DC0 800851C0 2941FFE2 */ slti $at, $t2, -0x1e @@ -382,8 +382,8 @@ glabel menu_audio_options_loop /* 085DDC 800851DC 10000003 */ b .L800851EC /* 085DE0 800851E0 00001025 */ move $v0, $zero .L800851E4: -/* 085DE4 800851E4 3C018012 */ lui $at, %hi(D_801263C4) # $at, 0x8012 -/* 085DE8 800851E8 AC2063C4 */ sw $zero, %lo(D_801263C4)($at) +/* 085DE4 800851E4 3C018012 */ lui $at, %hi(gIgnorePlayerInput) # $at, 0x8012 +/* 085DE8 800851E8 AC2063C4 */ sw $zero, %lo(gIgnorePlayerInput)($at) .L800851EC: /* 085DEC 800851EC 8FBF001C */ lw $ra, 0x1c($sp) /* 085DF0 800851F0 8FB00018 */ lw $s0, 0x18($sp) diff --git a/asm/non_matchings/menu/menu_character_select_init.s b/asm/non_matchings/menu/menu_character_select_init.s index 9403ddbd..a90e9aa8 100644 --- a/asm/non_matchings/menu/menu_character_select_init.s +++ b/asm/non_matchings/menu/menu_character_select_init.s @@ -54,19 +54,19 @@ glabel menu_character_select_init /* 08BC88 8008B088 0043082B */ sltu $at, $v0, $v1 /* 08BC8C 8008B08C 1420FFFD */ bnez $at, .L8008B084 /* 08BC90 8008B090 A040FFFF */ sb $zero, -1($v0) -/* 08BC94 8008B094 3C01800E */ lui $at, %hi(D_800DF480) # $at, 0x800e -/* 08BC98 8008B098 AC20F480 */ sw $zero, %lo(D_800DF480)($at) -/* 08BC9C 8008B09C 3C01800E */ lui $at, %hi(D_800DF47C) # $at, 0x800e -/* 08BCA0 8008B0A0 AC20F47C */ sw $zero, %lo(D_800DF47C)($at) +/* 08BC94 8008B094 3C01800E */ lui $at, %hi(gNumberOfReadyPlayers) # $at, 0x800e +/* 08BC98 8008B098 AC20F480 */ sw $zero, %lo(gNumberOfReadyPlayers)($at) +/* 08BC9C 8008B09C 3C01800E */ lui $at, %hi(gMenuDelay) # $at, 0x800e +/* 08BCA0 8008B0A0 AC20F47C */ sw $zero, %lo(gMenuDelay)($at) /* 08BCA4 8008B0A4 3C018012 */ lui $at, %hi(D_801263BC) # $at, 0x8012 /* 08BCA8 8008B0A8 AC2063BC */ sw $zero, %lo(D_801263BC)($at) -/* 08BCAC 8008B0AC 3C088012 */ lui $t0, %hi(D_801263D4) # $t0, 0x8012 +/* 08BCAC 8008B0AC 3C088012 */ lui $t0, %hi(gActivePlayersArray) # $t0, 0x8012 /* 08BCB0 8008B0B0 3C01800E */ lui $at, %hi(D_800DF484) # $at, 0x800e -/* 08BCB4 8008B0B4 250863D4 */ addiu $t0, %lo(D_801263D4) # addiu $t0, $t0, 0x63d4 +/* 08BCB4 8008B0B4 250863D4 */ addiu $t0, %lo(gActivePlayersArray) # addiu $t0, $t0, 0x63d4 /* 08BCB8 8008B0B8 3C128012 */ lui $s2, %hi(D_801263C0) # $s2, 0x8012 -/* 08BCBC 8008B0BC 3C038012 */ lui $v1, %hi(players_character_array) # $v1, 0x8012 +/* 08BCBC 8008B0BC 3C038012 */ lui $v1, %hi(gPlayersCharacterArray) # $v1, 0x8012 /* 08BCC0 8008B0C0 AC20F484 */ sw $zero, %lo(D_800DF484)($at) -/* 08BCC4 8008B0C4 246363E8 */ addiu $v1, %lo(players_character_array) # addiu $v1, $v1, 0x63e8 +/* 08BCC4 8008B0C4 246363E8 */ addiu $v1, %lo(gPlayersCharacterArray) # addiu $v1, $v1, 0x63e8 /* 08BCC8 8008B0C8 265263C0 */ addiu $s2, %lo(D_801263C0) # addiu $s2, $s2, 0x63c0 /* 08BCCC 8008B0CC 00081021 */ addu $v0, $zero, $t0 /* 08BCD0 8008B0D0 00008025 */ move $s0, $zero @@ -110,7 +110,7 @@ glabel menu_character_select_init /* 08BD5C 8008B15C A4600002 */ sh $zero, 2($v1) /* 08BD60 8008B160 A0600001 */ sb $zero, 1($v1) /* 08BD64 8008B164 2404001A */ li $a0, 26 -/* 08BD68 8008B168 0C0002CD */ jal func_80000B34 +/* 08BD68 8008B168 0C0002CD */ jal play_music /* 08BD6C 8008B16C 00008025 */ move $s0, $zero /* 08BD70 8008B170 3C13800E */ lui $s3, %hi(D_800DFDB4) # $s3, 0x800e /* 08BD74 8008B174 2673FDB4 */ addiu $s3, %lo(D_800DFDB4) # addiu $s3, $s3, -0x24c diff --git a/asm/non_matchings/menu/menu_character_select_loop.s b/asm/non_matchings/menu/menu_character_select_loop.s index 49aed4e0..1f0e01d5 100644 --- a/asm/non_matchings/menu/menu_character_select_loop.s +++ b/asm/non_matchings/menu/menu_character_select_loop.s @@ -1,7 +1,7 @@ glabel menu_character_select_loop /* 08C924 8008BD24 27BDFFD0 */ addiu $sp, $sp, -0x30 /* 08C928 8008BD28 AFBF0014 */ sw $ra, 0x14($sp) -/* 08C92C 8008BD2C 0C022C83 */ jal func_8008B20C +/* 08C92C 8008BD2C 0C022C83 */ jal draw_character_select_text /* 08C930 8008BD30 AFA40030 */ sw $a0, 0x30($sp) /* 08C934 8008BD34 8FA40030 */ lw $a0, 0x30($sp) /* 08C938 8008BD38 0C02305A */ jal func_8008C168 @@ -25,29 +25,29 @@ glabel menu_character_select_loop /* 08C978 8008BD78 0044082B */ sltu $at, $v0, $a0 /* 08C97C 8008BD7C 1420FFF8 */ bnez $at, .L8008BD60 /* 08C980 8008BD80 00000000 */ nop -/* 08C984 8008BD84 3C03800E */ lui $v1, %hi(D_800DF47C) # $v1, 0x800e -/* 08C988 8008BD88 3C018012 */ lui $at, %hi(D_801263C4) # $at, 0x8012 -/* 08C98C 8008BD8C 2463F47C */ addiu $v1, %lo(D_800DF47C) # addiu $v1, $v1, -0xb84 -/* 08C990 8008BD90 AC2063C4 */ sw $zero, %lo(D_801263C4)($at) +/* 08C984 8008BD84 3C03800E */ lui $v1, %hi(gMenuDelay) # $v1, 0x800e +/* 08C988 8008BD88 3C018012 */ lui $at, %hi(gIgnorePlayerInput) # $at, 0x8012 +/* 08C98C 8008BD8C 2463F47C */ addiu $v1, %lo(gMenuDelay) # addiu $v1, $v1, -0xb84 +/* 08C990 8008BD90 AC2063C4 */ sw $zero, %lo(gIgnorePlayerInput)($at) /* 08C994 8008BD94 8C620000 */ lw $v0, ($v1) -/* 08C998 8008BD98 3C0F8012 */ lui $t7, %hi(D_801263D4) # $t7, 0x8012 +/* 08C998 8008BD98 3C0F8012 */ lui $t7, %hi(gActivePlayersArray) # $t7, 0x8012 /* 08C99C 8008BD9C 1440001B */ bnez $v0, .L8008BE0C -/* 08C9A0 8008BDA0 3C188012 */ lui $t8, %hi(D_801263D4+1) # $t8, 0x8012 -/* 08C9A4 8008BDA4 3C198012 */ lui $t9, %hi(D_801263D4+2) # $t9, 0x8012 -/* 08C9A8 8008BDA8 3C0C8012 */ lui $t4, %hi(D_801263D4+3) # $t4, 0x8012 -/* 08C9AC 8008BDAC 818C63D7 */ lb $t4, %lo(D_801263D4+3)($t4) -/* 08C9B0 8008BDB0 833963D6 */ lb $t9, %lo(D_801263D4+2)($t9) -/* 08C9B4 8008BDB4 81EF63D4 */ lb $t7, %lo(D_801263D4)($t7) -/* 08C9B8 8008BDB8 831863D5 */ lb $t8, %lo(D_801263D4+1)($t8) +/* 08C9A0 8008BDA0 3C188012 */ lui $t8, %hi(gActivePlayersArray+1) # $t8, 0x8012 +/* 08C9A4 8008BDA4 3C198012 */ lui $t9, %hi(gActivePlayersArray+2) # $t9, 0x8012 +/* 08C9A8 8008BDA8 3C0C8012 */ lui $t4, %hi(gActivePlayersArray+3) # $t4, 0x8012 +/* 08C9AC 8008BDAC 818C63D7 */ lb $t4, %lo(gActivePlayersArray+3)($t4) +/* 08C9B0 8008BDB0 833963D6 */ lb $t9, %lo(gActivePlayersArray+2)($t9) +/* 08C9B4 8008BDB4 81EF63D4 */ lb $t7, %lo(gActivePlayersArray)($t7) +/* 08C9B8 8008BDB8 831863D5 */ lb $t8, %lo(gActivePlayersArray+1)($t8) /* 08C9BC 8008BDBC A3AC0023 */ sb $t4, 0x23($sp) /* 08C9C0 8008BDC0 A3B90022 */ sb $t9, 0x22($sp) /* 08C9C4 8008BDC4 A3AF0020 */ sb $t7, 0x20($sp) /* 08C9C8 8008BDC8 0C022CD6 */ jal func_8008B358 /* 08C9CC 8008BDCC A3B80021 */ sb $t8, 0x21($sp) -/* 08C9D0 8008BDD0 3C0D800E */ lui $t5, %hi(D_800DF4BC) # $t5, 0x800e -/* 08C9D4 8008BDD4 3C0E800E */ lui $t6, %hi(D_800DF480) # $t6, 0x800e -/* 08C9D8 8008BDD8 8DCEF480 */ lw $t6, %lo(D_800DF480)($t6) -/* 08C9DC 8008BDDC 8DADF4BC */ lw $t5, %lo(D_800DF4BC)($t5) +/* 08C9D0 8008BDD0 3C0D800E */ lui $t5, %hi(gNumberOfActivePlayers) # $t5, 0x800e +/* 08C9D4 8008BDD4 3C0E800E */ lui $t6, %hi(gNumberOfReadyPlayers) # $t6, 0x800e +/* 08C9D8 8008BDD8 8DCEF480 */ lw $t6, %lo(gNumberOfReadyPlayers)($t6) +/* 08C9DC 8008BDDC 8DADF4BC */ lw $t5, %lo(gNumberOfActivePlayers)($t5) /* 08C9E0 8008BDE0 00000000 */ nop /* 08C9E4 8008BDE4 15AE0005 */ bne $t5, $t6, .L8008BDFC /* 08C9E8 8008BDE8 00000000 */ nop @@ -82,16 +82,16 @@ glabel menu_character_select_loop .L8008BE54: /* 08CA54 8008BE54 0C02304A */ jal func_8008C128 /* 08CA58 8008BE58 AFAB0024 */ sw $t3, 0x24($sp) -/* 08CA5C 8008BE5C 3C038012 */ lui $v1, %hi(D_801263D4) # $v1, 0x8012 -/* 08CA60 8008BE60 3C078012 */ lui $a3, %hi(players_character_array) # $a3, 0x8012 +/* 08CA5C 8008BE5C 3C038012 */ lui $v1, %hi(gActivePlayersArray) # $v1, 0x8012 +/* 08CA60 8008BE60 3C078012 */ lui $a3, %hi(gPlayersCharacterArray) # $a3, 0x8012 /* 08CA64 8008BE64 3C068012 */ lui $a2, %hi(D_801263CC) # $a2, 0x8012 /* 08CA68 8008BE68 3C058012 */ lui $a1, %hi(gCharacterIdSlots) # $a1, 0x8012 /* 08CA6C 8008BE6C 8FAB0024 */ lw $t3, 0x24($sp) /* 08CA70 8008BE70 00002025 */ move $a0, $zero /* 08CA74 8008BE74 24A563F0 */ addiu $a1, %lo(gCharacterIdSlots) # addiu $a1, $a1, 0x63f0 /* 08CA78 8008BE78 24C663CC */ addiu $a2, %lo(D_801263CC) # addiu $a2, $a2, 0x63cc -/* 08CA7C 8008BE7C 24E763E8 */ addiu $a3, %lo(players_character_array) # addiu $a3, $a3, 0x63e8 -/* 08CA80 8008BE80 246363D4 */ addiu $v1, %lo(D_801263D4) # addiu $v1, $v1, 0x63d4 +/* 08CA7C 8008BE7C 24E763E8 */ addiu $a3, %lo(gPlayersCharacterArray) # addiu $a3, $a3, 0x63e8 +/* 08CA80 8008BE80 246363D4 */ addiu $v1, %lo(gActivePlayersArray) # addiu $v1, $v1, 0x63d4 /* 08CA84 8008BE84 00001025 */ move $v0, $zero /* 08CA88 8008BE88 24090004 */ li $t1, 4 /* 08CA8C 8008BE8C 2408000E */ li $t0, 14 @@ -116,15 +116,15 @@ glabel menu_character_select_loop /* 08CAD0 8008BED0 24630001 */ addiu $v1, $v1, 1 /* 08CAD4 8008BED4 0C022ECF */ jal func_8008BB3C /* 08CAD8 8008BED8 AFAB0024 */ sw $t3, 0x24($sp) -/* 08CADC 8008BEDC 3C048012 */ lui $a0, %hi(D_801263D4) # $a0, 0x8012 +/* 08CADC 8008BEDC 3C048012 */ lui $a0, %hi(gActivePlayersArray) # $a0, 0x8012 /* 08CAE0 8008BEE0 0C01A916 */ jal func_8006A458 -/* 08CAE4 8008BEE4 248463D4 */ addiu $a0, %lo(D_801263D4) # addiu $a0, $a0, 0x63d4 -/* 08CAE8 8008BEE8 3C0C800E */ lui $t4, %hi(D_800DF4BC) # $t4, 0x800e +/* 08CAE4 8008BEE4 248463D4 */ addiu $a0, %lo(gActivePlayersArray) # addiu $a0, $a0, 0x63d4 +/* 08CAE8 8008BEE8 3C0C800E */ lui $t4, %hi(gNumberOfActivePlayers) # $t4, 0x800e /* 08CAEC 8008BEEC 8FAB0024 */ lw $t3, 0x24($sp) -/* 08CAF0 8008BEF0 8D8CF4BC */ lw $t4, %lo(D_800DF4BC)($t4) +/* 08CAF0 8008BEF0 8D8CF4BC */ lw $t4, %lo(gNumberOfActivePlayers)($t4) /* 08CAF4 8008BEF4 240A0001 */ li $t2, 1 -/* 08CAF8 8008BEF8 3C01800E */ lui $at, %hi(D_800DF4B8) # $at, 0x800e -/* 08CAFC 8008BEFC AC2AF4B8 */ sw $t2, %lo(D_800DF4B8)($at) +/* 08CAF8 8008BEF8 3C01800E */ lui $at, %hi(gIsInTracksMode) # $at, 0x800e +/* 08CAFC 8008BEFC AC2AF4B8 */ sw $t2, %lo(gIsInTracksMode)($at) /* 08CB00 8008BF00 016C082A */ slt $at, $t3, $t4 /* 08CB04 8008BF04 14200018 */ bnez $at, .L8008BF68 /* 08CB08 8008BF08 00000000 */ nop @@ -134,12 +134,12 @@ glabel menu_character_select_loop /* 08CB18 8008BF18 2405FFFF */ li $a1, -1 /* 08CB1C 8008BF1C 0C01B8BA */ jal func_8006E2E8 /* 08CB20 8008BF20 00003025 */ move $a2, $zero -/* 08CB24 8008BF24 3C18800E */ lui $t8, %hi(D_800DF4BC) # $t8, 0x800e -/* 08CB28 8008BF28 8F18F4BC */ lw $t8, %lo(D_800DF4BC)($t8) +/* 08CB24 8008BF24 3C18800E */ lui $t8, %hi(gNumberOfActivePlayers) # $t8, 0x800e +/* 08CB28 8008BF28 8F18F4BC */ lw $t8, %lo(gNumberOfActivePlayers)($t8) /* 08CB2C 8008BF2C 240A0001 */ li $t2, 1 /* 08CB30 8008BF30 15580009 */ bne $t2, $t8, .L8008BF58 -/* 08CB34 8008BF34 3C0D800E */ lui $t5, %hi(D_800DF498) # $t5, 0x800e -/* 08CB38 8008BF38 8DADF498 */ lw $t5, %lo(D_800DF498)($t5) +/* 08CB34 8008BF34 3C0D800E */ lui $t5, %hi(gPlayerHasSeenCautionMenu) # $t5, 0x800e +/* 08CB38 8008BF38 8DADF498 */ lw $t5, %lo(gPlayerHasSeenCautionMenu)($t5) /* 08CB3C 8008BF3C 00000000 */ nop /* 08CB40 8008BF40 15A00005 */ bnez $t5, .L8008BF58 /* 08CB44 8008BF44 00000000 */ nop @@ -177,8 +177,8 @@ glabel menu_character_select_loop /* 08CBB8 8008BFB8 0C02304A */ jal func_8008C128 /* 08CBBC 8008BFBC 00000000 */ nop /* 08CBC0 8008BFC0 240A0001 */ li $t2, 1 -/* 08CBC4 8008BFC4 3C01800E */ lui $at, %hi(D_800DF4BC) # $at, 0x800e -/* 08CBC8 8008BFC8 AC2AF4BC */ sw $t2, %lo(D_800DF4BC)($at) +/* 08CBC4 8008BFC4 3C01800E */ lui $at, %hi(gNumberOfActivePlayers) # $at, 0x800e +/* 08CBC8 8008BFC8 AC2AF4BC */ sw $t2, %lo(gNumberOfActivePlayers)($at) /* 08CBCC 8008BFCC 0C0204F4 */ jal menu_init /* 08CBD0 8008BFD0 00002025 */ move $a0, $zero .L8008BFD4: diff --git a/asm/non_matchings/menu/menu_credits_loop.s b/asm/non_matchings/menu/menu_credits_loop.s index edf3e154..b61bca36 100644 --- a/asm/non_matchings/menu/menu_credits_loop.s +++ b/asm/non_matchings/menu/menu_credits_loop.s @@ -26,8 +26,8 @@ glabel menu_credits_loop /* 09BF78 8009B378 24040045 */ li $a0, 69 /* 09BF7C 8009B37C 0C031CFC */ jal func_800C73F0 /* 09BF80 8009B380 AFA20060 */ sw $v0, 0x60($sp) -/* 09BF84 8009B384 3C0E800E */ lui $t6, %hi(D_800DF47C) # $t6, 0x800e -/* 09BF88 8009B388 8DCEF47C */ lw $t6, %lo(D_800DF47C)($t6) +/* 09BF84 8009B384 3C0E800E */ lui $t6, %hi(gMenuDelay) # $t6, 0x800e +/* 09BF88 8009B388 8DCEF47C */ lw $t6, %lo(gMenuDelay)($t6) /* 09BF8C 8009B38C 00000000 */ nop /* 09BF90 8009B390 15C00007 */ bnez $t6, .L8009B3B0 /* 09BF94 8009B394 00000000 */ nop @@ -160,10 +160,10 @@ glabel menu_credits_loop /* 09C170 8009B570 15A0012C */ bnez $t5, .L8009BA24 /* 09C174 8009B574 3C168012 */ lui $s6, %hi(D_80126BC4) # $s6, 0x8012 /* 09C178 8009B578 3C1E800E */ lui $fp, %hi(D_800E17F4) # $fp, 0x800e -/* 09C17C 8009B57C 3C08800E */ lui $t0, %hi(D_800E1938) # $t0, 0x800e +/* 09C17C 8009B57C 3C08800E */ lui $t0, %hi(gCreditsArray) # $t0, 0x800e /* 09C180 8009B580 4481A000 */ mtc1 $at, $f20 /* 09C184 8009B584 AFA0006C */ sw $zero, 0x6c($sp) -/* 09C188 8009B588 25081938 */ addiu $t0, %lo(D_800E1938) # addiu $t0, $t0, 0x1938 +/* 09C188 8009B588 25081938 */ addiu $t0, %lo(gCreditsArray) # addiu $t0, $t0, 0x1938 /* 09C18C 8009B58C 27DE17F4 */ addiu $fp, %lo(D_800E17F4) # addiu $fp, $fp, 0x17f4 /* 09C190 8009B590 26D66BC4 */ addiu $s6, %lo(D_80126BC4) # addiu $s6, $s6, 0x6bc4 /* 09C194 8009B594 24076000 */ li $a3, 24576 @@ -198,10 +198,10 @@ glabel menu_credits_loop /* 09C204 8009B604 8FB8006C */ lw $t8, 0x6c($sp) .L8009B608: /* 09C208 8009B608 AEC00000 */ sw $zero, ($s6) -/* 09C20C 8009B60C 3C018012 */ lui $at, %hi(D_801263C4) # $at, 0x8012 +/* 09C20C 8009B60C 3C018012 */ lui $at, %hi(gIgnorePlayerInput) # $at, 0x8012 /* 09C210 8009B610 AFA90068 */ sw $t1, 0x68($sp) /* 09C214 8009B614 100000FD */ b .L8009BA0C -/* 09C218 8009B618 AC2063C4 */ sw $zero, %lo(D_801263C4)($at) +/* 09C218 8009B618 AC2063C4 */ sw $zero, %lo(gIgnorePlayerInput)($at) .L8009B61C: /* 09C21C 8009B61C 3C01FFFF */ lui $at, (0xFFFF0FFF >> 16) # lui $at, 0xffff .L8009B620: @@ -298,7 +298,7 @@ glabel menu_credits_loop /* 09C360 8009B760 24150002 */ li $s5, 2 /* 09C364 8009B764 862D0000 */ lh $t5, ($s1) /* 09C368 8009B768 2643000E */ addiu $v1, $s2, 0xe -/* 09C36C 8009B76C 3C0F800E */ lui $t7, %hi(D_800E1A94) # $t7, 0x800e +/* 09C36C 8009B76C 3C0F800E */ lui $t7, %hi(gCreditsBestTimesArray) # $t7, 0x800e /* 09C370 8009B770 000D7080 */ sll $t6, $t5, 2 /* 09C374 8009B774 8EC50000 */ lw $a1, ($s6) /* 09C378 8009B778 AE020014 */ sw $v0, 0x14($s0) @@ -307,13 +307,13 @@ glabel menu_credits_loop /* 09C384 8009B784 A603002A */ sh $v1, 0x2a($s0) /* 09C388 8009B788 A2000031 */ sb $zero, 0x31($s0) /* 09C38C 8009B78C 01EE7821 */ addu $t7, $t7, $t6 -/* 09C390 8009B790 8DEF1A94 */ lw $t7, %lo(D_800E1A94)($t7) +/* 09C390 8009B790 8DEF1A94 */ lw $t7, %lo(gCreditsBestTimesArray)($t7) /* 09C394 8009B794 3C19800E */ lui $t9, %hi(D_800E17F4) # $t9, 0x800e /* 09C398 8009B798 83A6005B */ lb $a2, 0x5b($sp) -/* 09C39C 8009B79C 3C08800E */ lui $t0, %hi(D_800E1938) # $t0, 0x800e +/* 09C39C 8009B79C 3C08800E */ lui $t0, %hi(gCreditsArray) # $t0, 0x800e /* 09C3A0 8009B7A0 273917F4 */ addiu $t9, %lo(D_800E17F4) # addiu $t9, $t9, 0x17f4 /* 09C3A4 8009B7A4 0005C040 */ sll $t8, $a1, 1 -/* 09C3A8 8009B7A8 25081938 */ addiu $t0, %lo(D_800E1938) # addiu $t0, $t0, 0x1938 +/* 09C3A8 8009B7A8 25081938 */ addiu $t0, %lo(gCreditsArray) # addiu $t0, $t0, 0x1938 /* 09C3AC 8009B7AC 03192021 */ addu $a0, $t8, $t9 /* 09C3B0 8009B7B0 26730002 */ addiu $s3, $s3, 2 /* 09C3B4 8009B7B4 26100040 */ addiu $s0, $s0, 0x40 @@ -367,11 +367,11 @@ glabel menu_credits_loop /* 09C464 8009B864 00000000 */ nop /* 09C468 8009B868 0C0207D3 */ jal func_80081F4C /* 09C46C 8009B86C 00002025 */ move $a0, $zero -/* 09C470 8009B870 3C08800E */ lui $t0, %hi(D_800E1938) # $t0, 0x800e +/* 09C470 8009B870 3C08800E */ lui $t0, %hi(gCreditsArray) # $t0, 0x800e /* 09C474 8009B874 2C4C0001 */ sltiu $t4, $v0, 1 /* 09C478 8009B878 3C018012 */ lui $at, %hi(D_80126BE0) # $at, 0x8012 /* 09C47C 8009B87C AC2C6BE0 */ sw $t4, %lo(D_80126BE0)($at) -/* 09C480 8009B880 25081938 */ addiu $t0, %lo(D_800E1938) # addiu $t0, $t0, 0x1938 +/* 09C480 8009B880 25081938 */ addiu $t0, %lo(gCreditsArray) # addiu $t0, $t0, 0x1938 /* 09C484 8009B884 10000061 */ b .L8009BA0C /* 09C488 8009B888 24076000 */ li $a3, 24576 .L8009B88C: @@ -463,11 +463,11 @@ glabel menu_credits_loop /* 09C5C4 8009B9C4 00000000 */ nop /* 09C5C8 8009B9C8 0C0207D3 */ jal func_80081F4C /* 09C5CC 8009B9CC 00002025 */ move $a0, $zero -/* 09C5D0 8009B9D0 3C08800E */ lui $t0, %hi(D_800E1938) # $t0, 0x800e +/* 09C5D0 8009B9D0 3C08800E */ lui $t0, %hi(gCreditsArray) # $t0, 0x800e /* 09C5D4 8009B9D4 2C4C0001 */ sltiu $t4, $v0, 1 /* 09C5D8 8009B9D8 3C018012 */ lui $at, %hi(D_80126BE0) # $at, 0x8012 /* 09C5DC 8009B9DC AC2C6BE0 */ sw $t4, %lo(D_80126BE0)($at) -/* 09C5E0 8009B9E0 25081938 */ addiu $t0, %lo(D_800E1938) # addiu $t0, $t0, 0x1938 +/* 09C5E0 8009B9E0 25081938 */ addiu $t0, %lo(gCreditsArray) # addiu $t0, $t0, 0x1938 /* 09C5E4 8009B9E4 10000009 */ b .L8009BA0C /* 09C5E8 8009B9E8 24076000 */ li $a3, 24576 .L8009B9EC: @@ -489,17 +489,17 @@ glabel menu_credits_loop /* 09C61C 8009BA1C 3C068012 */ lui $a2, %hi(D_801263D8) # $a2, 0x8012 /* 09C620 8009BA20 24C663D8 */ addiu $a2, %lo(D_801263D8) # addiu $a2, $a2, 0x63d8 .L8009BA24: -/* 09C624 8009BA24 3C198012 */ lui $t9, %hi(D_801263C4) # $t9, 0x8012 -/* 09C628 8009BA28 8F3963C4 */ lw $t9, %lo(D_801263C4)($t9) +/* 09C624 8009BA24 3C198012 */ lui $t9, %hi(gIgnorePlayerInput) # $t9, 0x8012 +/* 09C628 8009BA28 8F3963C4 */ lw $t9, %lo(gIgnorePlayerInput)($t9) /* 09C62C 8009BA2C 00009025 */ move $s2, $zero /* 09C630 8009BA30 1720000C */ bnez $t9, .L8009BA64 -/* 09C634 8009BA34 3C09800E */ lui $t1, %hi(D_800DF47C) # $t1, 0x800e -/* 09C638 8009BA38 8D29F47C */ lw $t1, %lo(D_800DF47C)($t1) +/* 09C634 8009BA34 3C09800E */ lui $t1, %hi(gMenuDelay) # $t1, 0x800e +/* 09C638 8009BA38 8D29F47C */ lw $t1, %lo(gMenuDelay)($t1) /* 09C63C 8009BA3C 00008025 */ move $s0, $zero /* 09C640 8009BA40 15200008 */ bnez $t1, .L8009BA64 /* 09C644 8009BA44 24110004 */ li $s1, 4 .L8009BA48: -/* 09C648 8009BA48 0C01A955 */ jal func_8006A554 +/* 09C648 8009BA48 0C01A955 */ jal get_button_inputs_from_player /* 09C64C 8009BA4C 02002025 */ move $a0, $s0 /* 09C650 8009BA50 26100001 */ addiu $s0, $s0, 1 /* 09C654 8009BA54 1611FFFC */ bne $s0, $s1, .L8009BA48 @@ -613,11 +613,11 @@ glabel L8009BB9C /* 09C7E4 8009BBE4 AC6E0000 */ sw $t6, ($v1) /* 09C7E8 8009BBE8 03194821 */ addu $t1, $t8, $t9 /* 09C7EC 8009BBEC 812A0000 */ lb $t2, ($t1) -/* 09C7F0 8009BBF0 3C018012 */ lui $at, %hi(D_801263C4) # $at, 0x8012 +/* 09C7F0 8009BBF0 3C018012 */ lui $at, %hi(gIgnorePlayerInput) # $at, 0x8012 /* 09C7F4 8009BBF4 05410004 */ bgez $t2, .L8009BC08 /* 09C7F8 8009BBF8 324C9000 */ andi $t4, $s2, 0x9000 /* 09C7FC 8009BBFC AC600000 */ sw $zero, ($v1) -/* 09C800 8009BC00 AC2063C4 */ sw $zero, %lo(D_801263C4)($at) +/* 09C800 8009BC00 AC2063C4 */ sw $zero, %lo(gIgnorePlayerInput)($at) .L8009BC04: /* 09C804 8009BC04 324C9000 */ andi $t4, $s2, 0x9000 .L8009BC08: @@ -631,9 +631,9 @@ glabel L8009BB9C .L8009BC24: /* 09C824 8009BC24 240E0001 */ li $t6, 1 .L8009BC28: -/* 09C828 8009BC28 3C01800E */ lui $at, %hi(D_800DF47C) # $at, 0x800e +/* 09C828 8009BC28 3C01800E */ lui $at, %hi(gMenuDelay) # $at, 0x800e /* 09C82C 8009BC2C 0C030060 */ jal func_800C0180 -/* 09C830 8009BC30 AC2EF47C */ sw $t6, %lo(D_800DF47C)($at) +/* 09C830 8009BC30 AC2EF47C */ sw $t6, %lo(gMenuDelay)($at) /* 09C834 8009BC34 3C04800E */ lui $a0, %hi(D_800DF774) # $a0, 0x800e /* 09C838 8009BC38 0C030076 */ jal func_800C01D8 /* 09C83C 8009BC3C 2484F774 */ addiu $a0, %lo(D_800DF774) # addiu $a0, $a0, -0x88c @@ -642,17 +642,17 @@ glabel L8009BB9C /* 09C848 8009BC48 0C000326 */ jal func_80000C98 /* 09C84C 8009BC4C 2404FF80 */ li $a0, -128 .L8009BC50: -/* 09C850 8009BC50 3C02800E */ lui $v0, %hi(D_800DF47C) # $v0, 0x800e -/* 09C854 8009BC54 8C42F47C */ lw $v0, %lo(D_800DF47C)($v0) +/* 09C850 8009BC50 3C02800E */ lui $v0, %hi(gMenuDelay) # $v0, 0x800e +/* 09C854 8009BC54 8C42F47C */ lw $v0, %lo(gMenuDelay)($v0) /* 09C858 8009BC58 8FAF0088 */ lw $t7, 0x88($sp) /* 09C85C 8009BC5C 18400015 */ blez $v0, .L8009BCB4 /* 09C860 8009BC60 004FC021 */ addu $t8, $v0, $t7 -/* 09C864 8009BC64 3C01800E */ lui $at, %hi(D_800DF47C) # $at, 0x800e +/* 09C864 8009BC64 3C01800E */ lui $at, %hi(gMenuDelay) # $at, 0x800e /* 09C868 8009BC68 0C031CF8 */ jal func_800C73E0 -/* 09C86C 8009BC6C AC38F47C */ sw $t8, %lo(D_800DF47C)($at) +/* 09C86C 8009BC6C AC38F47C */ sw $t8, %lo(gMenuDelay)($at) /* 09C870 8009BC70 14400010 */ bnez $v0, .L8009BCB4 -/* 09C874 8009BC74 3C19800E */ lui $t9, %hi(D_800DF47C) # $t9, 0x800e -/* 09C878 8009BC78 8F39F47C */ lw $t9, %lo(D_800DF47C)($t9) +/* 09C874 8009BC74 3C19800E */ lui $t9, %hi(gMenuDelay) # $t9, 0x800e +/* 09C878 8009BC78 8F39F47C */ lw $t9, %lo(gMenuDelay)($t9) /* 09C87C 8009BC7C 00000000 */ nop /* 09C880 8009BC80 2B21001F */ slti $at, $t9, 0x1f /* 09C884 8009BC84 1420000C */ bnez $at, .L8009BCB8 diff --git a/asm/non_matchings/menu/menu_file_select_loop.s b/asm/non_matchings/menu/menu_file_select_loop.s index 46efa7ba..5c8c6b9a 100644 --- a/asm/non_matchings/menu/menu_file_select_loop.s +++ b/asm/non_matchings/menu/menu_file_select_loop.s @@ -74,8 +74,8 @@ glabel menu_file_select_loop /* 08EB7C 8008DF7C 246363BC */ addiu $v1, %lo(D_801263BC) # addiu $v1, $v1, 0x63bc /* 08EB80 8008DF80 8FA50048 */ lw $a1, 0x48($sp) /* 08EB84 8008DF84 8C6E0000 */ lw $t6, ($v1) -/* 08EB88 8008DF88 3C06800E */ lui $a2, %hi(D_800DF47C) # $a2, 0x800e -/* 08EB8C 8008DF8C 24C6F47C */ addiu $a2, %lo(D_800DF47C) # addiu $a2, $a2, -0xb84 +/* 08EB88 8008DF88 3C06800E */ lui $a2, %hi(gMenuDelay) # $a2, 0x800e +/* 08EB8C 8008DF8C 24C6F47C */ addiu $a2, %lo(gMenuDelay) # addiu $a2, $a2, -0xb84 /* 08EB90 8008DF90 8CC20000 */ lw $v0, ($a2) /* 08EB94 8008DF94 01C57821 */ addu $t7, $t6, $a1 /* 08EB98 8008DF98 8FA80044 */ lw $t0, 0x44($sp) @@ -99,8 +99,8 @@ glabel menu_file_select_loop /* 08EBD8 8008DFD8 00A02025 */ move $a0, $a1 /* 08EBDC 8008DFDC 0C02335D */ jal func_8008CD74 /* 08EBE0 8008DFE0 AFA80044 */ sw $t0, 0x44($sp) -/* 08EBE4 8008DFE4 3C02800E */ lui $v0, %hi(D_800DF47C) # $v0, 0x800e -/* 08EBE8 8008DFE8 8C42F47C */ lw $v0, %lo(D_800DF47C)($v0) +/* 08EBE4 8008DFE4 3C02800E */ lui $v0, %hi(gMenuDelay) # $v0, 0x800e +/* 08EBE8 8008DFE8 8C42F47C */ lw $v0, %lo(gMenuDelay)($v0) /* 08EBEC 8008DFEC 8FA80044 */ lw $t0, 0x44($sp) /* 08EBF0 8008DFF0 8FA50048 */ lw $a1, 0x48($sp) /* 08EBF4 8008DFF4 00000000 */ nop @@ -133,7 +133,7 @@ glabel menu_file_select_loop /* 08EC54 8008E054 00002025 */ move $a0, $zero /* 08EC58 8008E058 13000048 */ beqz $t8, .L8008E17C /* 08EC5C 8008E05C 00000000 */ nop -/* 08EC60 8008E060 0C01A955 */ jal func_8006A554 +/* 08EC60 8008E060 0C01A955 */ jal get_button_inputs_from_player /* 08EC64 8008E064 AFA80044 */ sw $t0, 0x44($sp) /* 08EC68 8008E068 8FA80044 */ lw $t0, 0x44($sp) /* 08EC6C 8008E06C 30594000 */ andi $t9, $v0, 0x4000 @@ -203,9 +203,9 @@ glabel menu_file_select_loop /* 08ED64 8008E164 0C030076 */ jal func_800C01D8 /* 08ED68 8008E168 2484F774 */ addiu $a0, %lo(D_800DF774) # addiu $a0, $a0, -0x88c /* 08ED6C 8008E16C 240D0001 */ li $t5, 1 -/* 08ED70 8008E170 3C01800E */ lui $at, %hi(D_800DF47C) # $at, 0x800e +/* 08ED70 8008E170 3C01800E */ lui $at, %hi(gMenuDelay) # $at, 0x800e /* 08ED74 8008E174 10000045 */ b .L8008E28C -/* 08ED78 8008E178 AC2DF47C */ sw $t5, %lo(D_800DF47C)($at) +/* 08ED78 8008E178 AC2DF47C */ sw $t5, %lo(gMenuDelay)($at) .L8008E17C: /* 08ED7C 8008E17C 0C02357E */ jal func_8008D5F8 /* 08ED80 8008E180 00A02025 */ move $a0, $a1 @@ -277,11 +277,11 @@ glabel menu_file_select_loop /* 08EE78 8008E278 0C030076 */ jal func_800C01D8 /* 08EE7C 8008E27C 2484F774 */ addiu $a0, %lo(D_800DF774) # addiu $a0, $a0, -0x88c /* 08EE80 8008E280 8FB90040 */ lw $t9, 0x40($sp) -/* 08EE84 8008E284 3C01800E */ lui $at, %hi(D_800DF47C) # $at, 0x800e -/* 08EE88 8008E288 AC39F47C */ sw $t9, %lo(D_800DF47C)($at) +/* 08EE84 8008E284 3C01800E */ lui $at, %hi(gMenuDelay) # $at, 0x800e +/* 08EE88 8008E288 AC39F47C */ sw $t9, %lo(gMenuDelay)($at) .L8008E28C: -/* 08EE8C 8008E28C 3C06800E */ lui $a2, %hi(D_800DF47C) # $a2, 0x800e -/* 08EE90 8008E290 24C6F47C */ addiu $a2, %lo(D_800DF47C) # addiu $a2, $a2, -0xb84 +/* 08EE8C 8008E28C 3C06800E */ lui $a2, %hi(gMenuDelay) # $a2, 0x800e +/* 08EE90 8008E290 24C6F47C */ addiu $a2, %lo(gMenuDelay) # addiu $a2, $a2, -0xb84 /* 08EE94 8008E294 8CC20000 */ lw $v0, ($a2) /* 08EE98 8008E298 00000000 */ nop /* 08EE9C 8008E29C 28410024 */ slti $at, $v0, 0x24 @@ -308,8 +308,8 @@ glabel menu_file_select_loop /* 08EEF0 8008E2F0 272C0001 */ addiu $t4, $t9, 1 /* 08EEF4 8008E2F4 A44C0000 */ sh $t4, ($v0) .L8008E2F8: -/* 08EEF8 8008E2F8 3C0D800E */ lui $t5, %hi(D_800DF4BC) # $t5, 0x800e -/* 08EEFC 8008E2FC 8DADF4BC */ lw $t5, %lo(D_800DF4BC)($t5) +/* 08EEF8 8008E2F8 3C0D800E */ lui $t5, %hi(gNumberOfActivePlayers) # $t5, 0x800e +/* 08EEFC 8008E2FC 8DADF4BC */ lw $t5, %lo(gNumberOfActivePlayers)($t5) /* 08EF00 8008E300 3C02800E */ lui $v0, %hi(gIsInTwoPlayerAdventure) # $v0, 0x800e /* 08EF04 8008E304 39AE0002 */ xori $t6, $t5, 2 /* 08EF08 8008E308 2442F4C0 */ addiu $v0, %lo(gIsInTwoPlayerAdventure) # addiu $v0, $v0, -0xb40 @@ -320,8 +320,8 @@ glabel menu_file_select_loop /* 08EF1C 8008E31C 00000000 */ nop .L8008E320: /* 08EF20 8008E320 24180001 */ li $t8, 1 -/* 08EF24 8008E324 3C01800E */ lui $at, %hi(D_800DF4BC) # $at, 0x800e -/* 08EF28 8008E328 AC38F4BC */ sw $t8, %lo(D_800DF4BC)($at) +/* 08EF24 8008E324 3C01800E */ lui $at, %hi(gNumberOfActivePlayers) # $at, 0x800e +/* 08EF28 8008E328 AC38F4BC */ sw $t8, %lo(gNumberOfActivePlayers)($at) /* 08EF2C 8008E32C 3C01800E */ lui $at, %hi(D_800E0FAC) # $at, 0x800e /* 08EF30 8008E330 24190001 */ li $t9, 1 /* 08EF34 8008E334 0C02390A */ jal func_8008E428 @@ -348,8 +348,8 @@ glabel menu_file_select_loop .L8008E388: /* 08EF88 8008E388 0C0078A7 */ jal func_8001E29C /* 08EF8C 8008E38C 24040019 */ li $a0, 25 -/* 08EF90 8008E390 3C06800E */ lui $a2, %hi(D_800DF4BC) # $a2, 0x800e -/* 08EF94 8008E394 8CC6F4BC */ lw $a2, %lo(D_800DF4BC)($a2) +/* 08EF90 8008E390 3C06800E */ lui $a2, %hi(gNumberOfActivePlayers) # $a2, 0x800e +/* 08EF94 8008E394 8CC6F4BC */ lw $a2, %lo(gNumberOfActivePlayers)($a2) /* 08EF98 8008E398 00402025 */ move $a0, $v0 /* 08EF9C 8008E39C 00002825 */ move $a1, $zero /* 08EFA0 8008E3A0 00003825 */ move $a3, $zero @@ -365,7 +365,7 @@ glabel menu_file_select_loop /* 08EFC4 8008E3C4 3C01800E */ lui $at, %hi(gIsInAdventureTwo) # $at, 0x800e /* 08EFC8 8008E3C8 33190004 */ andi $t9, $t8, 4 /* 08EFCC 8008E3CC 13200005 */ beqz $t9, .L8008E3E4 -/* 08EFD0 8008E3D0 3C02800E */ lui $v0, %hi(D_800DF4BC) # $v0, 0x800e +/* 08EFD0 8008E3D0 3C02800E */ lui $v0, %hi(gNumberOfActivePlayers) # $v0, 0x800e /* 08EFD4 8008E3D4 240C0001 */ li $t4, 1 /* 08EFD8 8008E3D8 3C01800E */ lui $at, %hi(gIsInAdventureTwo) # $at, 0x800e /* 08EFDC 8008E3DC 10000002 */ b .L8008E3E8 @@ -373,7 +373,7 @@ glabel menu_file_select_loop .L8008E3E4: /* 08EFE4 8008E3E4 AC20F494 */ sw $zero, %lo(gIsInAdventureTwo)($at) .L8008E3E8: -/* 08EFE8 8008E3E8 8C42F4BC */ lw $v0, %lo(D_800DF4BC)($v0) +/* 08EFE8 8008E3E8 8C42F4BC */ lw $v0, %lo(gNumberOfActivePlayers)($v0) /* 08EFEC 8008E3EC 1000000B */ b .L8008E41C /* 08EFF0 8008E3F0 8FBF0024 */ lw $ra, 0x24($sp) .L8008E3F4: diff --git a/asm/non_matchings/menu/menu_game_select_init.s b/asm/non_matchings/menu/menu_game_select_init.s index baa726bd..4172263e 100644 --- a/asm/non_matchings/menu/menu_game_select_init.s +++ b/asm/non_matchings/menu/menu_game_select_init.s @@ -1,7 +1,7 @@ glabel menu_game_select_init -/* 08D108 8008C508 3C01800E */ lui $at, %hi(D_800DF47C) # $at, 0x800e +/* 08D108 8008C508 3C01800E */ lui $at, %hi(gMenuDelay) # $at, 0x800e /* 08D10C 8008C50C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 08D110 8008C510 AC20F47C */ sw $zero, %lo(D_800DF47C)($at) +/* 08D110 8008C510 AC20F47C */ sw $zero, %lo(gMenuDelay)($at) /* 08D114 8008C514 3C018012 */ lui $at, %hi(D_801263BC) # $at, 0x8012 /* 08D118 8008C518 AFB40028 */ sw $s4, 0x28($sp) /* 08D11C 8008C51C AC2063BC */ sw $zero, %lo(D_801263BC)($at) @@ -32,7 +32,7 @@ glabel menu_game_select_init /* 08D180 8008C580 24040003 */ li $a0, 3 /* 08D184 8008C584 0C03105C */ jal func_800C4170 /* 08D188 8008C588 24040002 */ li $a0, 2 -/* 08D18C 8008C58C 0C0002CD */ jal func_80000B34 +/* 08D18C 8008C58C 0C0002CD */ jal play_music /* 08D190 8008C590 2404001A */ li $a0, 26 /* 08D194 8008C594 3C13800E */ lui $s3, %hi(D_800DFDB4) # $s3, 0x800e /* 08D198 8008C598 3C128012 */ lui $s2, %hi(D_801263B4) # $s2, 0x8012 diff --git a/asm/non_matchings/menu/menu_game_select_loop.s b/asm/non_matchings/menu/menu_game_select_loop.s index aa7f5057..ccec5ac8 100644 --- a/asm/non_matchings/menu/menu_game_select_loop.s +++ b/asm/non_matchings/menu/menu_game_select_loop.s @@ -25,8 +25,8 @@ glabel menu_game_select_loop /* 08D418 8008C818 8FA40028 */ lw $a0, 0x28($sp) /* 08D41C 8008C81C ACA00000 */ sw $zero, ($a1) .L8008C820: -/* 08D420 8008C820 3C03800E */ lui $v1, %hi(D_800DF47C) # $v1, 0x800e -/* 08D424 8008C824 2463F47C */ addiu $v1, %lo(D_800DF47C) # addiu $v1, $v1, -0xb84 +/* 08D420 8008C820 3C03800E */ lui $v1, %hi(gMenuDelay) # $v1, 0x800e +/* 08D424 8008C824 2463F47C */ addiu $v1, %lo(gMenuDelay) # addiu $v1, $v1, -0xb84 /* 08D428 8008C828 8C620000 */ lw $v0, ($v1) /* 08D42C 8008C82C 00000000 */ nop /* 08D430 8008C830 1040000A */ beqz $v0, .L8008C85C @@ -59,7 +59,7 @@ glabel menu_game_select_loop /* 08D490 8008C890 240C0001 */ li $t4, 1 /* 08D494 8008C894 3C01800E */ lui $at, %hi(gIsInAdventureTwo) # $at, 0x800e /* 08D498 8008C898 0C01B96F */ jal func_8006E5BC -/* 08D49C 8008C89C AC2CF4B8 */ sw $t4, %lo(D_800DF4B8)($at) +/* 08D49C 8008C89C AC2CF4B8 */ sw $t4, %lo(gIsInTracksMode)($at) /* 08D4A0 8008C8A0 2404FFFF */ li $a0, -1 /* 08D4A4 8008C8A4 2405FFFF */ li $a1, -1 /* 08D4A8 8008C8A8 0C01B8BA */ jal func_8006E2E8 @@ -70,8 +70,8 @@ glabel menu_game_select_loop /* 08D4BC 8008C8BC 00001025 */ move $v0, $zero .L8008C8C0: /* 08D4C0 8008C8C0 AC22F494 */ sw $v0, %lo(gIsInAdventureTwo)($at) -/* 08D4C4 8008C8C4 3C01800E */ lui $at, %hi(D_800DF4B8) # $at, 0x800e -/* 08D4C8 8008C8C8 AC20F4B8 */ sw $zero, %lo(D_800DF4B8)($at) +/* 08D4C4 8008C8C4 3C01800E */ lui $at, %hi(gIsInTracksMode) # $at, 0x800e +/* 08D4C8 8008C8C8 AC20F4B8 */ sw $zero, %lo(gIsInTracksMode)($at) /* 08D4CC 8008C8CC 3C018012 */ lui $at, %hi(gPlayerSelectVehicle) # $at, 0x8012 /* 08D4D0 8008C8D0 0C01B6C5 */ jal func_8006DB14 /* 08D4D4 8008C8D4 A02069C0 */ sb $zero, %lo(gPlayerSelectVehicle)($at) @@ -112,8 +112,8 @@ glabel menu_game_select_loop .L8008C954: /* 08D554 8008C954 0C0231A6 */ jal func_8008C698 /* 08D558 8008C958 00000000 */ nop -/* 08D55C 8008C95C 3C0E800E */ lui $t6, %hi(D_800DF47C) # $t6, 0x800e -/* 08D560 8008C960 8DCEF47C */ lw $t6, %lo(D_800DF47C)($t6) +/* 08D55C 8008C95C 3C0E800E */ lui $t6, %hi(gMenuDelay) # $t6, 0x800e +/* 08D560 8008C960 8DCEF47C */ lw $t6, %lo(gMenuDelay)($t6) /* 08D564 8008C964 3C058012 */ lui $a1, %hi(D_801263D8) # $a1, 0x8012 /* 08D568 8008C968 15C00051 */ bnez $t6, .L8008CAB0 /* 08D56C 8008C96C 24A563D8 */ addiu $a1, %lo(D_801263D8) # addiu $a1, $a1, 0x63d8 @@ -121,23 +121,23 @@ glabel menu_game_select_loop /* 08D574 8008C974 00000000 */ nop /* 08D578 8008C978 15E0004D */ bnez $t7, .L8008CAB0 /* 08D57C 8008C97C 00000000 */ nop -/* 08D580 8008C980 0C01A955 */ jal func_8006A554 +/* 08D580 8008C980 0C01A955 */ jal get_button_inputs_from_player /* 08D584 8008C984 00002025 */ move $a0, $zero -/* 08D588 8008C988 3C18800E */ lui $t8, %hi(D_800DF4BC) # $t8, 0x800e -/* 08D58C 8008C98C 8F18F4BC */ lw $t8, %lo(D_800DF4BC)($t8) -/* 08D590 8008C990 3C068012 */ lui $a2, %hi(D_80126464) # $a2, 0x8012 -/* 08D594 8008C994 80C66464 */ lb $a2, %lo(D_80126464)($a2) +/* 08D588 8008C988 3C18800E */ lui $t8, %hi(gNumberOfActivePlayers) # $t8, 0x800e +/* 08D58C 8008C98C 8F18F4BC */ lw $t8, %lo(gNumberOfActivePlayers)($t8) +/* 08D590 8008C990 3C068012 */ lui $a2, %hi(gControllersYAxisDirection) # $a2, 0x8012 +/* 08D594 8008C994 80C66464 */ lb $a2, %lo(gControllersYAxisDirection)($a2) /* 08D598 8008C998 24010002 */ li $at, 2 /* 08D59C 8008C99C 1701000B */ bne $t8, $at, .L8008C9CC /* 08D5A0 8008C9A0 00401825 */ move $v1, $v0 /* 08D5A4 8008C9A4 24040001 */ li $a0, 1 /* 08D5A8 8008C9A8 AFA20024 */ sw $v0, 0x24($sp) -/* 08D5AC 8008C9AC 0C01A955 */ jal func_8006A554 +/* 08D5AC 8008C9AC 0C01A955 */ jal get_button_inputs_from_player /* 08D5B0 8008C9B0 AFA60020 */ sw $a2, 0x20($sp) -/* 08D5B4 8008C9B4 3C198012 */ lui $t9, %hi(D_80126464+1) # $t9, 0x8012 +/* 08D5B4 8008C9B4 3C198012 */ lui $t9, %hi(gControllersYAxisDirection+1) # $t9, 0x8012 /* 08D5B8 8008C9B8 8FA30024 */ lw $v1, 0x24($sp) /* 08D5BC 8008C9BC 8FA60020 */ lw $a2, 0x20($sp) -/* 08D5C0 8008C9C0 83396465 */ lb $t9, %lo(D_80126464+1)($t9) +/* 08D5C0 8008C9C0 83396465 */ lb $t9, %lo(gControllersYAxisDirection+1)($t9) /* 08D5C4 8008C9C4 00621825 */ or $v1, $v1, $v0 /* 08D5C8 8008C9C8 00D93021 */ addu $a2, $a2, $t9 .L8008C9CC: @@ -158,8 +158,8 @@ glabel menu_game_select_loop /* 08D600 8008CA00 0C030076 */ jal func_800C01D8 /* 08D604 8008CA04 2484F774 */ addiu $a0, %lo(D_800DF774) # addiu $a0, $a0, -0x88c /* 08D608 8008CA08 240B0001 */ li $t3, 1 -/* 08D60C 8008CA0C 3C01800E */ lui $at, %hi(D_800DF47C) # $at, 0x800e -/* 08D610 8008CA10 AC2BF47C */ sw $t3, %lo(D_800DF47C)($at) +/* 08D60C 8008CA0C 3C01800E */ lui $at, %hi(gMenuDelay) # $at, 0x800e +/* 08D610 8008CA10 AC2BF47C */ sw $t3, %lo(gMenuDelay)($at) /* 08D614 8008CA14 240400EF */ li $a0, 239 /* 08D618 8008CA18 0C000741 */ jal func_80001D04 /* 08D61C 8008CA1C 00002825 */ move $a1, $zero @@ -171,9 +171,9 @@ glabel menu_game_select_loop /* 08D630 8008CA30 0C030076 */ jal func_800C01D8 /* 08D634 8008CA34 2484F774 */ addiu $a0, %lo(D_800DF774) # addiu $a0, $a0, -0x88c /* 08D638 8008CA38 240DFFFF */ li $t5, -1 -/* 08D63C 8008CA3C 3C01800E */ lui $at, %hi(D_800DF47C) # $at, 0x800e +/* 08D63C 8008CA3C 3C01800E */ lui $at, %hi(gMenuDelay) # $at, 0x800e /* 08D640 8008CA40 1000001B */ b .L8008CAB0 -/* 08D644 8008CA44 AC2DF47C */ sw $t5, %lo(D_800DF47C)($at) +/* 08D644 8008CA44 AC2DF47C */ sw $t5, %lo(gMenuDelay)($at) .L8008CA48: /* 08D648 8008CA48 04C1000F */ bgez $a2, .L8008CA88 /* 08D64C 8008CA4C 3C03800E */ lui $v1, %hi(D_800DF460) # $v1, 0x800e @@ -203,8 +203,8 @@ glabel menu_game_select_loop /* 08D6A8 8008CAA8 0C000741 */ jal func_80001D04 /* 08D6AC 8008CAAC 00002825 */ move $a1, $zero .L8008CAB0: -/* 08D6B0 8008CAB0 3C018012 */ lui $at, %hi(D_801263C4) # $at, 0x8012 -/* 08D6B4 8008CAB4 AC2063C4 */ sw $zero, %lo(D_801263C4)($at) +/* 08D6B0 8008CAB0 3C018012 */ lui $at, %hi(gIgnorePlayerInput) # $at, 0x8012 +/* 08D6B4 8008CAB4 AC2063C4 */ sw $zero, %lo(gIgnorePlayerInput)($at) /* 08D6B8 8008CAB8 00001025 */ move $v0, $zero .L8008CABC: /* 08D6BC 8008CABC 8FBF0014 */ lw $ra, 0x14($sp) diff --git a/asm/non_matchings/menu/menu_ghost_data_init.s b/asm/non_matchings/menu/menu_ghost_data_init.s index ad572cf6..3dccf784 100644 --- a/asm/non_matchings/menu/menu_ghost_data_init.s +++ b/asm/non_matchings/menu/menu_ghost_data_init.s @@ -241,10 +241,10 @@ glabel menu_ghost_data_init /* 09AA14 80099E14 3C018012 */ lui $at, %hi(D_801263E0) # $at, 0x8012 /* 09AA18 80099E18 AC2063E0 */ sw $zero, %lo(D_801263E0)($at) /* 09AA1C 80099E1C 3C018012 */ lui $at, %hi(D_801263D8) # $at, 0x8012 -/* 09AA20 80099E20 3C02800E */ lui $v0, %hi(D_800DF47C) # $v0, 0x800e +/* 09AA20 80099E20 3C02800E */ lui $v0, %hi(gMenuDelay) # $v0, 0x800e /* 09AA24 80099E24 AC2063D8 */ sw $zero, %lo(D_801263D8)($at) /* 09AA28 80099E28 8FB90070 */ lw $t9, 0x70($sp) -/* 09AA2C 80099E2C 2442F47C */ addiu $v0, %lo(D_800DF47C) # addiu $v0, $v0, -0xb84 +/* 09AA2C 80099E2C 2442F47C */ addiu $v0, %lo(gMenuDelay) # addiu $v0, $v0, -0xb84 /* 09AA30 80099E30 AC400000 */ sw $zero, ($v0) /* 09AA34 80099E34 3C018012 */ lui $at, %hi(D_80126498) # $at, 0x8012 /* 09AA38 80099E38 17200006 */ bnez $t9, .L80099E54 diff --git a/asm/non_matchings/menu/menu_ghost_data_loop.s b/asm/non_matchings/menu/menu_ghost_data_loop.s index 8f7b0426..5fe7c8f8 100644 --- a/asm/non_matchings/menu/menu_ghost_data_loop.s +++ b/asm/non_matchings/menu/menu_ghost_data_loop.s @@ -1,9 +1,9 @@ glabel menu_ghost_data_loop /* 09B3D4 8009A7D4 3C038012 */ lui $v1, %hi(D_801263BC) # $v1, 0x8012 /* 09B3D8 8009A7D8 246363BC */ addiu $v1, %lo(D_801263BC) # addiu $v1, $v1, 0x63bc -/* 09B3DC 8009A7DC 3C09800E */ lui $t1, %hi(D_800DF47C) # $t1, 0x800e +/* 09B3DC 8009A7DC 3C09800E */ lui $t1, %hi(gMenuDelay) # $t1, 0x800e /* 09B3E0 8009A7E0 8C6E0000 */ lw $t6, ($v1) -/* 09B3E4 8009A7E4 2529F47C */ addiu $t1, %lo(D_800DF47C) # addiu $t1, $t1, -0xb84 +/* 09B3E4 8009A7E4 2529F47C */ addiu $t1, %lo(gMenuDelay) # addiu $t1, $t1, -0xb84 /* 09B3E8 8009A7E8 8D220000 */ lw $v0, ($t1) /* 09B3EC 8009A7EC 27BDFFB8 */ addiu $sp, $sp, -0x48 /* 09B3F0 8009A7F0 01C47821 */ addu $t7, $t6, $a0 @@ -19,10 +19,10 @@ glabel menu_ghost_data_loop /* 09B418 8009A818 00000000 */ nop /* 09B41C 8009A81C 0C0267A3 */ jal func_80099E8C /* 09B420 8009A820 00000000 */ nop -/* 09B424 8009A824 3C02800E */ lui $v0, %hi(D_800DF47C) # $v0, 0x800e -/* 09B428 8009A828 3C09800E */ lui $t1, %hi(D_800DF47C) # $t1, 0x800e -/* 09B42C 8009A82C 8C42F47C */ lw $v0, %lo(D_800DF47C)($v0) -/* 09B430 8009A830 2529F47C */ addiu $t1, %lo(D_800DF47C) # addiu $t1, $t1, -0xb84 +/* 09B424 8009A824 3C02800E */ lui $v0, %hi(gMenuDelay) # $v0, 0x800e +/* 09B428 8009A828 3C09800E */ lui $t1, %hi(gMenuDelay) # $t1, 0x800e +/* 09B42C 8009A82C 8C42F47C */ lw $v0, %lo(gMenuDelay)($v0) +/* 09B430 8009A830 2529F47C */ addiu $t1, %lo(gMenuDelay) # addiu $t1, $t1, -0xb84 .L8009A834: /* 09B434 8009A834 10400007 */ beqz $v0, .L8009A854 /* 09B438 8009A838 00003825 */ move $a3, $zero @@ -34,25 +34,25 @@ glabel menu_ghost_data_loop .L8009A850: /* 09B450 8009A850 AD2A0000 */ sw $t2, ($t1) .L8009A854: -/* 09B454 8009A854 3C0B8012 */ lui $t3, %hi(D_801263C4) # $t3, 0x8012 -/* 09B458 8009A858 8D6B63C4 */ lw $t3, %lo(D_801263C4)($t3) +/* 09B454 8009A854 3C0B8012 */ lui $t3, %hi(gIgnorePlayerInput) # $t3, 0x8012 +/* 09B458 8009A858 8D6B63C4 */ lw $t3, %lo(gIgnorePlayerInput)($t3) /* 09B45C 8009A85C 00003025 */ move $a2, $zero /* 09B460 8009A860 15600020 */ bnez $t3, .L8009A8E4 /* 09B464 8009A864 00004025 */ move $t0, $zero /* 09B468 8009A868 8D2C0000 */ lw $t4, ($t1) /* 09B46C 8009A86C 00008025 */ move $s0, $zero /* 09B470 8009A870 1580001C */ bnez $t4, .L8009A8E4 -/* 09B474 8009A874 3C038012 */ lui $v1, %hi(D_8012645C) # $v1, 0x8012 -/* 09B478 8009A878 3C058012 */ lui $a1, %hi(D_80126464) # $a1, 0x8012 -/* 09B47C 8009A87C 24A56464 */ addiu $a1, %lo(D_80126464) # addiu $a1, $a1, 0x6464 -/* 09B480 8009A880 2463645C */ addiu $v1, %lo(D_8012645C) # addiu $v1, $v1, 0x645c +/* 09B474 8009A874 3C038012 */ lui $v1, %hi(gControllersXAxisDirection) # $v1, 0x8012 +/* 09B478 8009A878 3C058012 */ lui $a1, %hi(gControllersYAxisDirection) # $a1, 0x8012 +/* 09B47C 8009A87C 24A56464 */ addiu $a1, %lo(gControllersYAxisDirection) # addiu $a1, $a1, 0x6464 +/* 09B480 8009A880 2463645C */ addiu $v1, %lo(gControllersXAxisDirection) # addiu $v1, $v1, 0x645c .L8009A884: /* 09B484 8009A884 02002025 */ move $a0, $s0 /* 09B488 8009A888 AFA30028 */ sw $v1, 0x28($sp) /* 09B48C 8009A88C AFA50024 */ sw $a1, 0x24($sp) /* 09B490 8009A890 AFA6003C */ sw $a2, 0x3c($sp) /* 09B494 8009A894 AFA70040 */ sw $a3, 0x40($sp) -/* 09B498 8009A898 0C01A955 */ jal func_8006A554 +/* 09B498 8009A898 0C01A955 */ jal get_button_inputs_from_player /* 09B49C 8009A89C AFA80038 */ sw $t0, 0x38($sp) /* 09B4A0 8009A8A0 8FA30028 */ lw $v1, 0x28($sp) /* 09B4A4 8009A8A4 8FA50024 */ lw $a1, 0x24($sp) @@ -69,8 +69,8 @@ glabel menu_ghost_data_loop /* 09B4D0 8009A8D0 00CD3021 */ addu $a2, $a2, $t5 /* 09B4D4 8009A8D4 1601FFEB */ bne $s0, $at, .L8009A884 /* 09B4D8 8009A8D8 010E4021 */ addu $t0, $t0, $t6 -/* 09B4DC 8009A8DC 3C09800E */ lui $t1, %hi(D_800DF47C) # $t1, 0x800e -/* 09B4E0 8009A8E0 2529F47C */ addiu $t1, %lo(D_800DF47C) # addiu $t1, $t1, -0xb84 +/* 09B4DC 8009A8DC 3C09800E */ lui $t1, %hi(gMenuDelay) # $t1, 0x800e +/* 09B4E0 8009A8E0 2529F47C */ addiu $t1, %lo(gMenuDelay) # addiu $t1, $t1, -0xb84 .L8009A8E4: /* 09B4E4 8009A8E4 3C068012 */ lui $a2, %hi(D_801263E0) # $a2, 0x8012 /* 09B4E8 8009A8E8 24C663E0 */ addiu $a2, %lo(D_801263E0) # addiu $a2, $a2, 0x63e0 @@ -83,8 +83,8 @@ glabel menu_ghost_data_loop /* 09B504 8009A904 24010002 */ li $at, 2 /* 09B508 8009A908 1041008B */ beq $v0, $at, .L8009AB38 /* 09B50C 8009A90C 30F8D000 */ andi $t8, $a3, 0xd000 -/* 09B510 8009A910 3C02800E */ lui $v0, %hi(D_800DF47C) # $v0, 0x800e -/* 09B514 8009A914 8C42F47C */ lw $v0, %lo(D_800DF47C)($v0) +/* 09B510 8009A910 3C02800E */ lui $v0, %hi(gMenuDelay) # $v0, 0x800e +/* 09B514 8009A914 8C42F47C */ lw $v0, %lo(gMenuDelay)($v0) /* 09B518 8009A918 10000096 */ b .L8009AB74 /* 09B51C 8009A91C 00000000 */ nop .L8009A920: @@ -160,8 +160,8 @@ glabel menu_ghost_data_loop /* 09B620 8009AA20 0C000741 */ jal func_80001D04 /* 09B624 8009AA24 240400EB */ li $a0, 235 .L8009AA28: -/* 09B628 8009AA28 3C02800E */ lui $v0, %hi(D_800DF47C) # $v0, 0x800e -/* 09B62C 8009AA2C 8C42F47C */ lw $v0, %lo(D_800DF47C)($v0) +/* 09B628 8009AA28 3C02800E */ lui $v0, %hi(gMenuDelay) # $v0, 0x800e +/* 09B62C 8009AA2C 8C42F47C */ lw $v0, %lo(gMenuDelay)($v0) /* 09B630 8009AA30 10000050 */ b .L8009AB74 /* 09B634 8009AA34 00000000 */ nop .L8009AA38: @@ -212,9 +212,9 @@ glabel menu_ghost_data_loop /* 09B6D8 8009AAD8 1000000B */ b .L8009AB08 /* 09B6DC 8009AADC 24C663E0 */ addiu $a2, %lo(D_801263E0) # addiu $a2, $a2, 0x63e0 .L8009AAE0: -/* 09B6E0 8009AAE0 3C01800E */ lui $at, %hi(D_800DF47C) # $at, 0x800e +/* 09B6E0 8009AAE0 3C01800E */ lui $at, %hi(gMenuDelay) # $at, 0x800e /* 09B6E4 8009AAE4 3C04800E */ lui $a0, %hi(D_800DF774) # $a0, 0x800e -/* 09B6E8 8009AAE8 AC23F47C */ sw $v1, %lo(D_800DF47C)($at) +/* 09B6E8 8009AAE8 AC23F47C */ sw $v1, %lo(gMenuDelay)($at) /* 09B6EC 8009AAEC 0C030076 */ jal func_800C01D8 /* 09B6F0 8009AAF0 2484F774 */ addiu $a0, %lo(D_800DF774) # addiu $a0, $a0, -0x88c /* 09B6F4 8009AAF4 24040241 */ li $a0, 577 @@ -233,8 +233,8 @@ glabel menu_ghost_data_loop /* 09B720 8009AB20 0C000741 */ jal func_80001D04 /* 09B724 8009AB24 00002825 */ move $a1, $zero .L8009AB28: -/* 09B728 8009AB28 3C02800E */ lui $v0, %hi(D_800DF47C) # $v0, 0x800e -/* 09B72C 8009AB2C 8C42F47C */ lw $v0, %lo(D_800DF47C)($v0) +/* 09B728 8009AB28 3C02800E */ lui $v0, %hi(gMenuDelay) # $v0, 0x800e +/* 09B72C 8009AB2C 8C42F47C */ lw $v0, %lo(gMenuDelay)($v0) /* 09B730 8009AB30 10000010 */ b .L8009AB74 /* 09B734 8009AB34 00000000 */ nop .L8009AB38: @@ -252,12 +252,12 @@ glabel menu_ghost_data_loop /* 09B760 8009AB60 0C000741 */ jal func_80001D04 /* 09B764 8009AB64 00002825 */ move $a1, $zero .L8009AB68: -/* 09B768 8009AB68 3C02800E */ lui $v0, %hi(D_800DF47C) # $v0, 0x800e -/* 09B76C 8009AB6C 8C42F47C */ lw $v0, %lo(D_800DF47C)($v0) +/* 09B768 8009AB68 3C02800E */ lui $v0, %hi(gMenuDelay) # $v0, 0x800e +/* 09B76C 8009AB6C 8C42F47C */ lw $v0, %lo(gMenuDelay)($v0) /* 09B770 8009AB70 00000000 */ nop .L8009AB74: -/* 09B774 8009AB74 3C018012 */ lui $at, %hi(D_801263C4) # $at, 0x8012 -/* 09B778 8009AB78 AC2063C4 */ sw $zero, %lo(D_801263C4)($at) +/* 09B774 8009AB74 3C018012 */ lui $at, %hi(gIgnorePlayerInput) # $at, 0x8012 +/* 09B778 8009AB78 AC2063C4 */ sw $zero, %lo(gIgnorePlayerInput)($at) /* 09B77C 8009AB7C 2841001F */ slti $at, $v0, 0x1f /* 09B780 8009AB80 14200006 */ bnez $at, .L8009AB9C /* 09B784 8009AB84 8FBF001C */ lw $ra, 0x1c($sp) diff --git a/asm/non_matchings/menu/menu_init.s b/asm/non_matchings/menu/menu_init.s index f7aa20ca..cc86d717 100644 --- a/asm/non_matchings/menu/menu_init.s +++ b/asm/non_matchings/menu/menu_init.s @@ -6,12 +6,12 @@ glabel jpt_800E8284 glabel menu_init /* 081FD0 800813D0 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 081FD4 800813D4 AFBF0014 */ sw $ra, 0x14($sp) -/* 081FD8 800813D8 3C01800E */ lui $at, %hi(D_800DF470) # $at, 0x800e -/* 081FDC 800813DC 0C026F97 */ jal func_8009BE5C -/* 081FE0 800813E0 AC24F470 */ sw $a0, %lo(D_800DF470)($at) +/* 081FD8 800813D8 3C01800E */ lui $at, %hi(gCurrentMenuId) # $at, 0x800e +/* 081FDC 800813DC 0C026F97 */ jal reset_controller_sticks +/* 081FE0 800813E0 AC24F470 */ sw $a0, %lo(gCurrentMenuId)($at) /* 081FE4 800813E4 240E0001 */ li $t6, 1 -/* 081FE8 800813E8 3C018012 */ lui $at, %hi(D_801263C4) # $at, 0x8012 -/* 081FEC 800813EC AC2E63C4 */ sw $t6, %lo(D_801263C4)($at) +/* 081FE8 800813E8 3C018012 */ lui $at, %hi(gIgnorePlayerInput) # $at, 0x8012 +/* 081FEC 800813EC AC2E63C4 */ sw $t6, %lo(gIgnorePlayerInput)($at) /* 081FF0 800813F0 3C018012 */ lui $at, %hi(D_801263BC) # $at, 0x8012 /* 081FF4 800813F4 AC2063BC */ sw $zero, %lo(D_801263BC)($at) /* 081FF8 800813F8 3C018012 */ lui $at, %hi(D_801263C8) # $at, 0x8012 @@ -25,8 +25,8 @@ glabel menu_init /* 082018 80081418 AC206810 */ sw $zero, %lo(D_80126810)($at) /* 08201C 8008141C 0C000611 */ jal func_80001844 /* 082020 80081420 AC206814 */ sw $zero, %lo(D_80126814)($at) -/* 082024 80081424 3C0F800E */ lui $t7, %hi(D_800DF470) # $t7, 0x800e -/* 082028 80081428 8DEFF470 */ lw $t7, %lo(D_800DF470)($t7) +/* 082024 80081424 3C0F800E */ lui $t7, %hi(gCurrentMenuId) # $t7, 0x800e +/* 082028 80081428 8DEFF470 */ lw $t7, %lo(gCurrentMenuId)($t7) /* 08202C 8008142C 00000000 */ nop /* 082030 80081430 2DE1001D */ sltiu $at, $t7, 0x1d /* 082034 80081434 10200055 */ beqz $at, .L8008158C diff --git a/asm/non_matchings/menu/menu_logo_screen_loop.s b/asm/non_matchings/menu/menu_logo_screen_loop.s index 8344b789..2ac27a5d 100644 --- a/asm/non_matchings/menu/menu_logo_screen_loop.s +++ b/asm/non_matchings/menu/menu_logo_screen_loop.s @@ -27,16 +27,16 @@ glabel menu_logo_screen_loop /* 0837B0 80082BB0 4604003C */ c.lt.s $f0, $f4 /* 0837B4 80082BB4 AFAF0028 */ sw $t7, 0x28($sp) /* 0837B8 80082BB8 4500000D */ bc1f .L80082BF0 -/* 0837BC 80082BBC 3C18800E */ lui $t8, %hi(D_800DF47C) # $t8, 0x800e -/* 0837C0 80082BC0 8F18F47C */ lw $t8, %lo(D_800DF47C)($t8) +/* 0837BC 80082BBC 3C18800E */ lui $t8, %hi(gMenuDelay) # $t8, 0x800e +/* 0837C0 80082BC0 8F18F47C */ lw $t8, %lo(gMenuDelay)($t8) /* 0837C4 80082BC4 3C04800E */ lui $a0, %hi(D_800E1DE8) # $a0, 0x800e /* 0837C8 80082BC8 1700000A */ bnez $t8, .L80082BF4 /* 0837CC 80082BCC 8FA80030 */ lw $t0, 0x30($sp) /* 0837D0 80082BD0 0C030076 */ jal func_800C01D8 /* 0837D4 80082BD4 24841DE8 */ addiu $a0, %lo(D_800E1DE8) # addiu $a0, $a0, 0x1de8 /* 0837D8 80082BD8 24190001 */ li $t9, 1 -/* 0837DC 80082BDC 3C01800E */ lui $at, %hi(D_800DF47C) # $at, 0x800e -/* 0837E0 80082BE0 AC39F47C */ sw $t9, %lo(D_800DF47C)($at) +/* 0837DC 80082BDC 3C01800E */ lui $at, %hi(gMenuDelay) # $at, 0x800e +/* 0837E0 80082BE0 AC39F47C */ sw $t9, %lo(gMenuDelay)($at) /* 0837E4 80082BE4 3C018012 */ lui $at, %hi(D_80126450) # $at, 0x8012 /* 0837E8 80082BE8 C4206450 */ lwc1 $f0, %lo(D_80126450)($at) /* 0837EC 80082BEC 00000000 */ nop @@ -59,18 +59,18 @@ glabel menu_logo_screen_loop /* 083824 80082C24 C4248390 */ lwc1 $f4, %lo(D_800E8390)($at) /* 083828 80082C28 AFA00028 */ sw $zero, 0x28($sp) /* 08382C 80082C2C 4604003C */ c.lt.s $f0, $f4 -/* 083830 80082C30 3C09800E */ lui $t1, %hi(D_800DF47C) # $t1, 0x800e +/* 083830 80082C30 3C09800E */ lui $t1, %hi(gMenuDelay) # $t1, 0x800e /* 083834 80082C34 4500000E */ bc1f .L80082C70 /* 083838 80082C38 8FAB0030 */ lw $t3, 0x30($sp) -/* 08383C 80082C3C 8D29F47C */ lw $t1, %lo(D_800DF47C)($t1) +/* 08383C 80082C3C 8D29F47C */ lw $t1, %lo(gMenuDelay)($t1) /* 083840 80082C40 3C04800E */ lui $a0, %hi(D_800E1DE8) # $a0, 0x800e /* 083844 80082C44 1520000A */ bnez $t1, .L80082C70 /* 083848 80082C48 8FAB0030 */ lw $t3, 0x30($sp) /* 08384C 80082C4C 0C030076 */ jal func_800C01D8 /* 083850 80082C50 24841DE8 */ addiu $a0, %lo(D_800E1DE8) # addiu $a0, $a0, 0x1de8 /* 083854 80082C54 240A0001 */ li $t2, 1 -/* 083858 80082C58 3C01800E */ lui $at, %hi(D_800DF47C) # $at, 0x800e -/* 08385C 80082C5C AC2AF47C */ sw $t2, %lo(D_800DF47C)($at) +/* 083858 80082C58 3C01800E */ lui $at, %hi(gMenuDelay) # $at, 0x800e +/* 08385C 80082C5C AC2AF47C */ sw $t2, %lo(gMenuDelay)($at) /* 083860 80082C60 3C018012 */ lui $at, %hi(D_80126450) # $at, 0x8012 /* 083864 80082C64 C4206450 */ lwc1 $f0, %lo(D_80126450)($at) /* 083868 80082C68 00000000 */ nop @@ -199,40 +199,40 @@ glabel menu_logo_screen_loop /* 083A40 80082E40 AFA20010 */ sw $v0, 0x10($sp) /* 083A44 80082E44 8FA60028 */ lw $a2, 0x28($sp) /* 083A48 80082E48 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012 -/* 083A4C 80082E4C 3C07800E */ lui $a3, %hi(D_800E1DF0) # $a3, 0x800e +/* 083A4C 80082E4C 3C07800E */ lui $a3, %hi(gRareCopyrightString) # $a3, 0x800e /* 083A50 80082E50 240F000C */ li $t7, 12 /* 083A54 80082E54 24C600D4 */ addiu $a2, $a2, 0xd4 /* 083A58 80082E58 AFA60020 */ sw $a2, 0x20($sp) /* 083A5C 80082E5C AFAF0010 */ sw $t7, 0x10($sp) -/* 083A60 80082E60 24E71DF0 */ addiu $a3, %lo(D_800E1DF0) # addiu $a3, $a3, 0x1df0 +/* 083A60 80082E60 24E71DF0 */ addiu $a3, %lo(gRareCopyrightString) # addiu $a3, $a3, 0x1df0 /* 083A64 80082E64 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0 /* 083A68 80082E68 0C031110 */ jal draw_text /* 083A6C 80082E6C 2405009F */ li $a1, 159 /* 083A70 80082E70 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012 /* 083A74 80082E74 8FA60020 */ lw $a2, 0x20($sp) -/* 083A78 80082E78 3C07800E */ lui $a3, %hi(D_800E1DF0) # $a3, 0x800e +/* 083A78 80082E78 3C07800E */ lui $a3, %hi(gRareCopyrightString) # $a3, 0x800e /* 083A7C 80082E7C 2418000C */ li $t8, 12 /* 083A80 80082E80 AFB80010 */ sw $t8, 0x10($sp) -/* 083A84 80082E84 24E71DF0 */ addiu $a3, %lo(D_800E1DF0) # addiu $a3, $a3, 0x1df0 +/* 083A84 80082E84 24E71DF0 */ addiu $a3, %lo(gRareCopyrightString) # addiu $a3, $a3, 0x1df0 /* 083A88 80082E88 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0 /* 083A8C 80082E8C 0C031110 */ jal draw_text /* 083A90 80082E90 240500A1 */ li $a1, 161 /* 083A94 80082E94 8FA60028 */ lw $a2, 0x28($sp) /* 083A98 80082E98 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012 -/* 083A9C 80082E9C 3C07800E */ lui $a3, %hi(D_800E1DF0) # $a3, 0x800e +/* 083A9C 80082E9C 3C07800E */ lui $a3, %hi(gRareCopyrightString) # $a3, 0x800e /* 083AA0 80082EA0 2419000C */ li $t9, 12 /* 083AA4 80082EA4 AFB90010 */ sw $t9, 0x10($sp) -/* 083AA8 80082EA8 24E71DF0 */ addiu $a3, %lo(D_800E1DF0) # addiu $a3, $a3, 0x1df0 +/* 083AA8 80082EA8 24E71DF0 */ addiu $a3, %lo(gRareCopyrightString) # addiu $a3, $a3, 0x1df0 /* 083AAC 80082EAC 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0 /* 083AB0 80082EB0 24058000 */ li $a1, -32768 /* 083AB4 80082EB4 0C031110 */ jal draw_text /* 083AB8 80082EB8 24C600D3 */ addiu $a2, $a2, 0xd3 /* 083ABC 80082EBC 8FA60028 */ lw $a2, 0x28($sp) /* 083AC0 80082EC0 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012 -/* 083AC4 80082EC4 3C07800E */ lui $a3, %hi(D_800E1DF0) # $a3, 0x800e +/* 083AC4 80082EC4 3C07800E */ lui $a3, %hi(gRareCopyrightString) # $a3, 0x800e /* 083AC8 80082EC8 2408000C */ li $t0, 12 /* 083ACC 80082ECC AFA80010 */ sw $t0, 0x10($sp) -/* 083AD0 80082ED0 24E71DF0 */ addiu $a3, %lo(D_800E1DF0) # addiu $a3, $a3, 0x1df0 +/* 083AD0 80082ED0 24E71DF0 */ addiu $a3, %lo(gRareCopyrightString) # addiu $a3, $a3, 0x1df0 /* 083AD4 80082ED4 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0 /* 083AD8 80082ED8 24058000 */ li $a1, -32768 /* 083ADC 80082EDC 0C031110 */ jal draw_text @@ -279,10 +279,10 @@ glabel menu_logo_screen_loop /* 083B74 80082F74 AFA20010 */ sw $v0, 0x10($sp) /* 083B78 80082F78 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012 /* 083B7C 80082F7C 8FA60020 */ lw $a2, 0x20($sp) -/* 083B80 80082F80 3C07800E */ lui $a3, %hi(D_800E1DF0) # $a3, 0x800e +/* 083B80 80082F80 3C07800E */ lui $a3, %hi(gRareCopyrightString) # $a3, 0x800e /* 083B84 80082F84 240C000C */ li $t4, 12 /* 083B88 80082F88 AFAC0010 */ sw $t4, 0x10($sp) -/* 083B8C 80082F8C 24E71DF0 */ addiu $a3, %lo(D_800E1DF0) # addiu $a3, $a3, 0x1df0 +/* 083B8C 80082F8C 24E71DF0 */ addiu $a3, %lo(gRareCopyrightString) # addiu $a3, $a3, 0x1df0 /* 083B90 80082F90 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0 /* 083B94 80082F94 0C031110 */ jal draw_text /* 083B98 80082F98 24058000 */ li $a1, -32768 diff --git a/asm/non_matchings/menu/menu_magic_codes_list_loop.s b/asm/non_matchings/menu/menu_magic_codes_list_loop.s index 1b1c7cc3..e71fbac2 100644 --- a/asm/non_matchings/menu/menu_magic_codes_list_loop.s +++ b/asm/non_matchings/menu/menu_magic_codes_list_loop.s @@ -1,7 +1,7 @@ glabel menu_magic_codes_list_loop /* 08B528 8008A928 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* 08B52C 8008A92C 3C02800E */ lui $v0, %hi(D_800DF47C) # $v0, 0x800e -/* 08B530 8008A930 8C42F47C */ lw $v0, %lo(D_800DF47C)($v0) +/* 08B52C 8008A92C 3C02800E */ lui $v0, %hi(gMenuDelay) # $v0, 0x800e +/* 08B530 8008A930 8C42F47C */ lw $v0, %lo(gMenuDelay)($v0) /* 08B534 8008A934 AFBF0024 */ sw $ra, 0x24($sp) /* 08B538 8008A938 AFB30020 */ sw $s3, 0x20($sp) /* 08B53C 8008A93C AFB2001C */ sw $s2, 0x1c($sp) @@ -12,17 +12,17 @@ glabel menu_magic_codes_list_loop /* 08B550 8008A950 18400008 */ blez $v0, .L8008A974 /* 08B554 8008A954 00447823 */ subu $t7, $v0, $a0 /* 08B558 8008A958 00447021 */ addu $t6, $v0, $a0 -/* 08B55C 8008A95C 3C01800E */ lui $at, %hi(D_800DF47C) # $at, 0x800e -/* 08B560 8008A960 AC2EF47C */ sw $t6, %lo(D_800DF47C)($at) -/* 08B564 8008A964 3C02800E */ lui $v0, %hi(D_800DF47C) # $v0, 0x800e -/* 08B568 8008A968 8C42F47C */ lw $v0, %lo(D_800DF47C)($v0) +/* 08B55C 8008A95C 3C01800E */ lui $at, %hi(gMenuDelay) # $at, 0x800e +/* 08B560 8008A960 AC2EF47C */ sw $t6, %lo(gMenuDelay)($at) +/* 08B564 8008A964 3C02800E */ lui $v0, %hi(gMenuDelay) # $v0, 0x800e +/* 08B568 8008A968 8C42F47C */ lw $v0, %lo(gMenuDelay)($v0) /* 08B56C 8008A96C 10000006 */ b .L8008A988 /* 08B570 8008A970 00000000 */ nop .L8008A974: -/* 08B574 8008A974 3C01800E */ lui $at, %hi(D_800DF47C) # $at, 0x800e -/* 08B578 8008A978 AC2FF47C */ sw $t7, %lo(D_800DF47C)($at) -/* 08B57C 8008A97C 3C02800E */ lui $v0, %hi(D_800DF47C) # $v0, 0x800e -/* 08B580 8008A980 8C42F47C */ lw $v0, %lo(D_800DF47C)($v0) +/* 08B574 8008A974 3C01800E */ lui $at, %hi(gMenuDelay) # $at, 0x800e +/* 08B578 8008A978 AC2FF47C */ sw $t7, %lo(gMenuDelay)($at) +/* 08B57C 8008A97C 3C02800E */ lui $v0, %hi(gMenuDelay) # $v0, 0x800e +/* 08B580 8008A980 8C42F47C */ lw $v0, %lo(gMenuDelay)($v0) /* 08B584 8008A984 00000000 */ nop .L8008A988: /* 08B588 8008A988 3C038012 */ lui $v1, %hi(D_801263BC) # $v1, 0x8012 @@ -39,26 +39,26 @@ glabel menu_magic_codes_list_loop /* 08B5B4 8008A9B4 0C02295B */ jal func_8008A56C /* 08B5B8 8008A9B8 00000000 */ nop .L8008A9BC: -/* 08B5BC 8008A9BC 3C0A8012 */ lui $t2, %hi(D_801263C4) # $t2, 0x8012 -/* 08B5C0 8008A9C0 8D4A63C4 */ lw $t2, %lo(D_801263C4)($t2) +/* 08B5BC 8008A9BC 3C0A8012 */ lui $t2, %hi(gIgnorePlayerInput) # $t2, 0x8012 +/* 08B5C0 8008A9C0 8D4A63C4 */ lw $t2, %lo(gIgnorePlayerInput)($t2) /* 08B5C4 8008A9C4 00009825 */ move $s3, $zero /* 08B5C8 8008A9C8 00003025 */ move $a2, $zero /* 08B5CC 8008A9CC 1540001B */ bnez $t2, .L8008AA3C /* 08B5D0 8008A9D0 00009025 */ move $s2, $zero -/* 08B5D4 8008A9D4 3C0B800E */ lui $t3, %hi(D_800DF47C) # $t3, 0x800e -/* 08B5D8 8008A9D8 8D6BF47C */ lw $t3, %lo(D_800DF47C)($t3) +/* 08B5D4 8008A9D4 3C0B800E */ lui $t3, %hi(gMenuDelay) # $t3, 0x800e +/* 08B5D8 8008A9D8 8D6BF47C */ lw $t3, %lo(gMenuDelay)($t3) /* 08B5DC 8008A9DC 00008025 */ move $s0, $zero /* 08B5E0 8008A9E0 15600016 */ bnez $t3, .L8008AA3C -/* 08B5E4 8008A9E4 3C038012 */ lui $v1, %hi(D_8012645C) # $v1, 0x8012 -/* 08B5E8 8008A9E8 3C058012 */ lui $a1, %hi(D_80126464) # $a1, 0x8012 -/* 08B5EC 8008A9EC 24A56464 */ addiu $a1, %lo(D_80126464) # addiu $a1, $a1, 0x6464 -/* 08B5F0 8008A9F0 2463645C */ addiu $v1, %lo(D_8012645C) # addiu $v1, $v1, 0x645c +/* 08B5E4 8008A9E4 3C038012 */ lui $v1, %hi(gControllersXAxisDirection) # $v1, 0x8012 +/* 08B5E8 8008A9E8 3C058012 */ lui $a1, %hi(gControllersYAxisDirection) # $a1, 0x8012 +/* 08B5EC 8008A9EC 24A56464 */ addiu $a1, %lo(gControllersYAxisDirection) # addiu $a1, $a1, 0x6464 +/* 08B5F0 8008A9F0 2463645C */ addiu $v1, %lo(gControllersXAxisDirection) # addiu $v1, $v1, 0x645c /* 08B5F4 8008A9F4 24110004 */ li $s1, 4 .L8008A9F8: /* 08B5F8 8008A9F8 02002025 */ move $a0, $s0 /* 08B5FC 8008A9FC AFA30030 */ sw $v1, 0x30($sp) /* 08B600 8008AA00 AFA5002C */ sw $a1, 0x2c($sp) -/* 08B604 8008AA04 0C01A955 */ jal func_8006A554 +/* 08B604 8008AA04 0C01A955 */ jal get_button_inputs_from_player /* 08B608 8008AA08 AFA60050 */ sw $a2, 0x50($sp) /* 08B60C 8008AA0C 8FA30030 */ lw $v1, 0x30($sp) /* 08B610 8008AA10 8FA5002C */ lw $a1, 0x2c($sp) @@ -94,10 +94,10 @@ glabel menu_magic_codes_list_loop /* 08B67C 8008AA7C 1603FFF7 */ bne $s0, $v1, .L8008AA5C /* 08B680 8008AA80 03208825 */ move $s1, $t9 /* 08B684 8008AA84 04C00002 */ bltz $a2, .L8008AA90 -/* 08B688 8008AA88 3C108012 */ lui $s0, %hi(D_80126C46) # $s0, 0x8012 +/* 08B688 8008AA88 3C108012 */ lui $s0, %hi(gOptionsMenuItemIndex) # $s0, 0x8012 /* 08B68C 8008AA8C 18C00048 */ blez $a2, .L8008ABB0 .L8008AA90: -/* 08B690 8008AA90 26106C46 */ addiu $s0, %lo(D_80126C46) # addiu $s0, $s0, 0x6c46 +/* 08B690 8008AA90 26106C46 */ addiu $s0, %lo(gOptionsMenuItemIndex) # addiu $s0, $s0, 0x6c46 /* 08B694 8008AA94 86090000 */ lh $t1, ($s0) /* 08B698 8008AA98 240400EF */ li $a0, 239 /* 08B69C 8008AA9C 10E90044 */ beq $a3, $t1, .L8008ABB0 @@ -170,8 +170,8 @@ glabel menu_magic_codes_list_loop /* 08B7A8 8008ABA8 8FA7003C */ lw $a3, 0x3c($sp) /* 08B7AC 8008ABAC 00000000 */ nop .L8008ABB0: -/* 08B7B0 8008ABB0 3C108012 */ lui $s0, %hi(D_80126C46) # $s0, 0x8012 -/* 08B7B4 8008ABB4 26106C46 */ addiu $s0, %lo(D_80126C46) # addiu $s0, $s0, 0x6c46 +/* 08B7B0 8008ABB0 3C108012 */ lui $s0, %hi(gOptionsMenuItemIndex) # $s0, 0x8012 +/* 08B7B4 8008ABB4 26106C46 */ addiu $s0, %lo(gOptionsMenuItemIndex) # addiu $s0, $s0, 0x6c46 /* 08B7B8 8008ABB8 86020000 */ lh $v0, ($s0) /* 08B7BC 8008ABBC 0641000B */ bgez $s2, .L8008ABEC /* 08B7C0 8008ABC0 00403025 */ move $a2, $v0 @@ -238,18 +238,18 @@ glabel menu_magic_codes_list_loop /* 08B89C 8008AC9C AFB90048 */ sw $t9, 0x48($sp) .L8008ACA0: /* 08B8A0 8008ACA0 8FA90048 */ lw $t1, 0x48($sp) -/* 08B8A4 8008ACA4 3C01800E */ lui $at, %hi(D_800DF47C) # $at, 0x800e +/* 08B8A4 8008ACA4 3C01800E */ lui $at, %hi(gMenuDelay) # $at, 0x800e /* 08B8A8 8008ACA8 11200007 */ beqz $t1, .L8008ACC8 /* 08B8AC 8008ACAC 3C04800E */ lui $a0, %hi(D_800DF774) # $a0, 0x800e -/* 08B8B0 8008ACB0 AC29F47C */ sw $t1, %lo(D_800DF47C)($at) +/* 08B8B0 8008ACB0 AC29F47C */ sw $t1, %lo(gMenuDelay)($at) /* 08B8B4 8008ACB4 0C030076 */ jal func_800C01D8 /* 08B8B8 8008ACB8 2484F774 */ addiu $a0, %lo(D_800DF774) # addiu $a0, $a0, -0x88c /* 08B8BC 8008ACBC 24040241 */ li $a0, 577 /* 08B8C0 8008ACC0 0C000741 */ jal func_80001D04 /* 08B8C4 8008ACC4 00002825 */ move $a1, $zero .L8008ACC8: -/* 08B8C8 8008ACC8 3C0A800E */ lui $t2, %hi(D_800DF47C) # $t2, 0x800e -/* 08B8CC 8008ACCC 8D4AF47C */ lw $t2, %lo(D_800DF47C)($t2) +/* 08B8C8 8008ACC8 3C0A800E */ lui $t2, %hi(gMenuDelay) # $t2, 0x800e +/* 08B8CC 8008ACCC 8D4AF47C */ lw $t2, %lo(gMenuDelay)($t2) /* 08B8D0 8008ACD0 00001025 */ move $v0, $zero /* 08B8D4 8008ACD4 2941FFE2 */ slti $at, $t2, -0x1e /* 08B8D8 8008ACD8 10200007 */ beqz $at, .L8008ACF8 @@ -261,8 +261,8 @@ glabel menu_magic_codes_list_loop /* 08B8F0 8008ACF0 10000003 */ b .L8008AD00 /* 08B8F4 8008ACF4 00001025 */ move $v0, $zero .L8008ACF8: -/* 08B8F8 8008ACF8 3C018012 */ lui $at, %hi(D_801263C4) # $at, 0x8012 -/* 08B8FC 8008ACFC AC2063C4 */ sw $zero, %lo(D_801263C4)($at) +/* 08B8F8 8008ACF8 3C018012 */ lui $at, %hi(gIgnorePlayerInput) # $at, 0x8012 +/* 08B8FC 8008ACFC AC2063C4 */ sw $zero, %lo(gIgnorePlayerInput)($at) .L8008AD00: /* 08B900 8008AD00 8FBF0024 */ lw $ra, 0x24($sp) /* 08B904 8008AD04 8FB00014 */ lw $s0, 0x14($sp) diff --git a/asm/non_matchings/menu/menu_magic_codes_loop.s b/asm/non_matchings/menu/menu_magic_codes_loop.s index 6817a249..117929a9 100644 --- a/asm/non_matchings/menu/menu_magic_codes_loop.s +++ b/asm/non_matchings/menu/menu_magic_codes_loop.s @@ -17,25 +17,25 @@ glabel menu_magic_codes_loop /* 08A914 80089D14 AD6E0000 */ sw $t6, ($t3) /* 08A918 80089D18 AD600000 */ sw $zero, ($t3) .L80089D1C: -/* 08A91C 80089D1C 3C02800E */ lui $v0, %hi(D_800DF47C) # $v0, 0x800e -/* 08A920 80089D20 8C42F47C */ lw $v0, %lo(D_800DF47C)($v0) +/* 08A91C 80089D1C 3C02800E */ lui $v0, %hi(gMenuDelay) # $v0, 0x800e +/* 08A920 80089D20 8C42F47C */ lw $v0, %lo(gMenuDelay)($v0) /* 08A924 80089D24 3C038012 */ lui $v1, %hi(D_801263BC) # $v1, 0x8012 /* 08A928 80089D28 1040000F */ beqz $v0, .L80089D68 /* 08A92C 80089D2C 246363BC */ addiu $v1, %lo(D_801263BC) # addiu $v1, $v1, 0x63bc /* 08A930 80089D30 18400008 */ blez $v0, .L80089D54 /* 08A934 80089D34 0044C823 */ subu $t9, $v0, $a0 /* 08A938 80089D38 0044C021 */ addu $t8, $v0, $a0 -/* 08A93C 80089D3C 3C01800E */ lui $at, %hi(D_800DF47C) # $at, 0x800e -/* 08A940 80089D40 AC38F47C */ sw $t8, %lo(D_800DF47C)($at) -/* 08A944 80089D44 3C02800E */ lui $v0, %hi(D_800DF47C) # $v0, 0x800e -/* 08A948 80089D48 8C42F47C */ lw $v0, %lo(D_800DF47C)($v0) +/* 08A93C 80089D3C 3C01800E */ lui $at, %hi(gMenuDelay) # $at, 0x800e +/* 08A940 80089D40 AC38F47C */ sw $t8, %lo(gMenuDelay)($at) +/* 08A944 80089D44 3C02800E */ lui $v0, %hi(gMenuDelay) # $v0, 0x800e +/* 08A948 80089D48 8C42F47C */ lw $v0, %lo(gMenuDelay)($v0) /* 08A94C 80089D4C 10000007 */ b .L80089D6C /* 08A950 80089D50 8C6E0000 */ lw $t6, ($v1) .L80089D54: -/* 08A954 80089D54 3C01800E */ lui $at, %hi(D_800DF47C) # $at, 0x800e -/* 08A958 80089D58 AC39F47C */ sw $t9, %lo(D_800DF47C)($at) -/* 08A95C 80089D5C 3C02800E */ lui $v0, %hi(D_800DF47C) # $v0, 0x800e -/* 08A960 80089D60 8C42F47C */ lw $v0, %lo(D_800DF47C)($v0) +/* 08A954 80089D54 3C01800E */ lui $at, %hi(gMenuDelay) # $at, 0x800e +/* 08A958 80089D58 AC39F47C */ sw $t9, %lo(gMenuDelay)($at) +/* 08A95C 80089D5C 3C02800E */ lui $v0, %hi(gMenuDelay) # $v0, 0x800e +/* 08A960 80089D60 8C42F47C */ lw $v0, %lo(gMenuDelay)($v0) /* 08A964 80089D64 00000000 */ nop .L80089D68: /* 08A968 80089D68 8C6E0000 */ lw $t6, ($v1) @@ -54,20 +54,20 @@ glabel menu_magic_codes_loop /* 08A998 80089D98 8FA70044 */ lw $a3, 0x44($sp) /* 08A99C 80089D9C 256B63D8 */ addiu $t3, %lo(D_801263D8) # addiu $t3, $t3, 0x63d8 .L80089DA0: -/* 08A9A0 80089DA0 3C198012 */ lui $t9, %hi(D_801263C4) # $t9, 0x8012 -/* 08A9A4 80089DA4 8F3963C4 */ lw $t9, %lo(D_801263C4)($t9) +/* 08A9A0 80089DA0 3C198012 */ lui $t9, %hi(gIgnorePlayerInput) # $t9, 0x8012 +/* 08A9A4 80089DA4 8F3963C4 */ lw $t9, %lo(gIgnorePlayerInput)($t9) /* 08A9A8 80089DA8 00005025 */ move $t2, $zero /* 08A9AC 80089DAC 00004025 */ move $t0, $zero /* 08A9B0 80089DB0 17200025 */ bnez $t9, .L80089E48 /* 08A9B4 80089DB4 00004825 */ move $t1, $zero -/* 08A9B8 80089DB8 3C0E800E */ lui $t6, %hi(D_800DF47C) # $t6, 0x800e -/* 08A9BC 80089DBC 8DCEF47C */ lw $t6, %lo(D_800DF47C)($t6) +/* 08A9B8 80089DB8 3C0E800E */ lui $t6, %hi(gMenuDelay) # $t6, 0x800e +/* 08A9BC 80089DBC 8DCEF47C */ lw $t6, %lo(gMenuDelay)($t6) /* 08A9C0 80089DC0 00003025 */ move $a2, $zero /* 08A9C4 80089DC4 15C00020 */ bnez $t6, .L80089E48 -/* 08A9C8 80089DC8 3C038012 */ lui $v1, %hi(D_8012645C) # $v1, 0x8012 -/* 08A9CC 80089DCC 3C058012 */ lui $a1, %hi(D_80126464) # $a1, 0x8012 -/* 08A9D0 80089DD0 24A56464 */ addiu $a1, %lo(D_80126464) # addiu $a1, $a1, 0x6464 -/* 08A9D4 80089DD4 2463645C */ addiu $v1, %lo(D_8012645C) # addiu $v1, $v1, 0x645c +/* 08A9C8 80089DC8 3C038012 */ lui $v1, %hi(gControllersXAxisDirection) # $v1, 0x8012 +/* 08A9CC 80089DCC 3C058012 */ lui $a1, %hi(gControllersYAxisDirection) # $a1, 0x8012 +/* 08A9D0 80089DD0 24A56464 */ addiu $a1, %lo(gControllersYAxisDirection) # addiu $a1, $a1, 0x6464 +/* 08A9D4 80089DD4 2463645C */ addiu $v1, %lo(gControllersXAxisDirection) # addiu $v1, $v1, 0x645c .L80089DD8: /* 08A9D8 80089DD8 00C02025 */ move $a0, $a2 /* 08A9DC 80089DDC AFA30020 */ sw $v1, 0x20($sp) @@ -76,7 +76,7 @@ glabel menu_magic_codes_loop /* 08A9E8 80089DE8 AFA70044 */ sw $a3, 0x44($sp) /* 08A9EC 80089DEC AFA80054 */ sw $t0, 0x54($sp) /* 08A9F0 80089DF0 AFA90050 */ sw $t1, 0x50($sp) -/* 08A9F4 80089DF4 0C01A955 */ jal func_8006A554 +/* 08A9F4 80089DF4 0C01A955 */ jal get_button_inputs_from_player /* 08A9F8 80089DF8 AFAA0058 */ sw $t2, 0x58($sp) /* 08A9FC 80089DFC 8FA30020 */ lw $v1, 0x20($sp) /* 08AA00 80089E00 8FA5001C */ lw $a1, 0x1c($sp) @@ -98,8 +98,8 @@ glabel menu_magic_codes_loop /* 08AA40 80089E40 3C0B8012 */ lui $t3, %hi(D_801263D8) # $t3, 0x8012 /* 08AA44 80089E44 256B63D8 */ addiu $t3, %lo(D_801263D8) # addiu $t3, $t3, 0x63d8 .L80089E48: -/* 08AA48 80089E48 3C0D8012 */ lui $t5, %hi(D_80126C46) # $t5, 0x8012 -/* 08AA4C 80089E4C 25AD6C46 */ addiu $t5, %lo(D_80126C46) # addiu $t5, $t5, 0x6c46 +/* 08AA48 80089E48 3C0D8012 */ lui $t5, %hi(gOptionsMenuItemIndex) # $t5, 0x8012 +/* 08AA4C 80089E4C 25AD6C46 */ addiu $t5, %lo(gOptionsMenuItemIndex) # addiu $t5, $t5, 0x6c46 /* 08AA50 80089E50 85A20000 */ lh $v0, ($t5) /* 08AA54 80089E54 24010004 */ li $at, 4 /* 08AA58 80089E58 14410009 */ bne $v0, $at, .L80089E80 @@ -116,11 +116,11 @@ glabel menu_magic_codes_loop .L80089E80: /* 08AA80 80089E80 158200CD */ bne $t4, $v0, .L8008A1B8 /* 08AA84 80089E84 241F0006 */ li $ra, 6 -/* 08AA88 80089E88 3C028012 */ lui $v0, %hi(D_80126C42) # $v0, 0x8012 -/* 08AA8C 80089E8C 24426C42 */ addiu $v0, %lo(D_80126C42) # addiu $v0, $v0, 0x6c42 +/* 08AA88 80089E88 3C028012 */ lui $v0, %hi(gCheatInputCurrentColumn) # $v0, 0x8012 +/* 08AA8C 80089E8C 24426C42 */ addiu $v0, %lo(gCheatInputCurrentColumn) # addiu $v0, $v0, 0x6c42 /* 08AA90 80089E90 84430000 */ lh $v1, ($v0) -/* 08AA94 80089E94 3C058012 */ lui $a1, %hi(D_80126C40) # $a1, 0x8012 -/* 08AA98 80089E98 24A56C40 */ addiu $a1, %lo(D_80126C40) # addiu $a1, $a1, 0x6c40 +/* 08AA94 80089E94 3C058012 */ lui $a1, %hi(gCheatInputCurrentRow) # $a1, 0x8012 +/* 08AA98 80089E98 24A56C40 */ addiu $a1, %lo(gCheatInputCurrentRow) # addiu $a1, $a1, 0x6c40 /* 08AA9C 80089E9C 84A40000 */ lh $a0, ($a1) /* 08AAA0 80089EA0 306F000F */ andi $t7, $v1, 0xf /* 08AAA4 80089EA4 000FC100 */ sll $t8, $t7, 4 @@ -193,13 +193,13 @@ glabel menu_magic_codes_loop /* 08AB98 80089F98 AFB9004C */ sw $t9, 0x4c($sp) .L80089F9C: /* 08AB9C 80089F9C 15040005 */ bne $t0, $a0, .L80089FB4 -/* 08ABA0 80089FA0 3C068012 */ lui $a2, %hi(D_80126C44) # $a2, 0x8012 +/* 08ABA0 80089FA0 3C068012 */ lui $a2, %hi(gCheatInputStringLength) # $a2, 0x8012 /* 08ABA4 80089FA4 17E30003 */ bne $ra, $v1, .L80089FB4 /* 08ABA8 80089FA8 240E0001 */ li $t6, 1 /* 08ABAC 80089FAC 10000014 */ b .L8008A000 /* 08ABB0 80089FB0 AFAE0048 */ sw $t6, 0x48($sp) .L80089FB4: -/* 08ABB4 80089FB4 24C66C44 */ addiu $a2, %lo(D_80126C44) # addiu $a2, $a2, 0x6c44 +/* 08ABB4 80089FB4 24C66C44 */ addiu $a2, %lo(gCheatInputStringLength) # addiu $a2, $a2, 0x6c44 /* 08ABB8 80089FB8 84C20000 */ lh $v0, ($a2) /* 08ABBC 80089FBC 240F0001 */ li $t7, 1 /* 08ABC0 80089FC0 28410013 */ slti $at, $v0, 0x13 @@ -219,10 +219,10 @@ glabel menu_magic_codes_loop /* 08ABF8 80089FF8 00380821 */ addu $at, $at, $t8 /* 08ABFC 80089FFC A0206C58 */ sb $zero, %lo(D_80126C58)($at) .L8008A000: -/* 08AC00 8008A000 3C068012 */ lui $a2, %hi(D_80126C44) # $a2, 0x8012 +/* 08AC00 8008A000 3C068012 */ lui $a2, %hi(gCheatInputStringLength) # $a2, 0x8012 /* 08AC04 8008A004 31594000 */ andi $t9, $t2, 0x4000 /* 08AC08 8008A008 13200008 */ beqz $t9, .L8008A02C -/* 08AC0C 8008A00C 24C66C44 */ addiu $a2, %lo(D_80126C44) # addiu $a2, $a2, 0x6c44 +/* 08AC0C 8008A00C 24C66C44 */ addiu $a2, %lo(gCheatInputStringLength) # addiu $a2, $a2, 0x6c44 /* 08AC10 8008A010 84CE0000 */ lh $t6, ($a2) /* 08AC14 8008A014 240F0001 */ li $t7, 1 /* 08AC18 8008A018 19C00003 */ blez $t6, .L8008A028 @@ -243,13 +243,13 @@ glabel menu_magic_codes_loop /* 08AC48 8008A048 8FB90048 */ lw $t9, 0x48($sp) /* 08AC4C 8008A04C 0C000741 */ jal func_80001D04 /* 08AC50 8008A050 AFA70044 */ sw $a3, 0x44($sp) -/* 08AC54 8008A054 3C068012 */ lui $a2, %hi(D_80126C44) # $a2, 0x8012 -/* 08AC58 8008A058 24C66C44 */ addiu $a2, %lo(D_80126C44) # addiu $a2, $a2, 0x6c44 +/* 08AC54 8008A054 3C068012 */ lui $a2, %hi(gCheatInputStringLength) # $a2, 0x8012 +/* 08AC58 8008A058 24C66C44 */ addiu $a2, %lo(gCheatInputStringLength) # addiu $a2, $a2, 0x6c44 /* 08AC5C 8008A05C 84C20000 */ lh $v0, ($a2) /* 08AC60 8008A060 8FA70044 */ lw $a3, 0x44($sp) -/* 08AC64 8008A064 3C0D8012 */ lui $t5, %hi(D_80126C46) # $t5, 0x8012 +/* 08AC64 8008A064 3C0D8012 */ lui $t5, %hi(gOptionsMenuItemIndex) # $t5, 0x8012 /* 08AC68 8008A068 18400007 */ blez $v0, .L8008A088 -/* 08AC6C 8008A06C 25AD6C46 */ addiu $t5, %lo(D_80126C46) # addiu $t5, $t5, 0x6c46 +/* 08AC6C 8008A06C 25AD6C46 */ addiu $t5, %lo(gOptionsMenuItemIndex) # addiu $t5, $t5, 0x6c46 /* 08AC70 8008A070 244FFFFF */ addiu $t7, $v0, -1 /* 08AC74 8008A074 A4CF0000 */ sh $t7, ($a2) /* 08AC78 8008A078 84D80000 */ lh $t8, ($a2) @@ -270,8 +270,8 @@ glabel menu_magic_codes_loop /* 08ACAC 8008A0AC A5A00000 */ sh $zero, ($t5) .L8008A0B0: /* 08ACB0 8008A0B0 3C0B8012 */ lui $t3, %hi(D_80126C4C) # $t3, 0x8012 -/* 08ACB4 8008A0B4 3C098012 */ lui $t1, %hi(D_80126C30) # $t1, 0x8012 -/* 08ACB8 8008A0B8 8D296C30 */ lw $t1, %lo(D_80126C30)($t1) +/* 08ACB4 8008A0B4 3C098012 */ lui $t1, %hi(gCheatsAssetData) # $t1, 0x8012 +/* 08ACB8 8008A0B8 8D296C30 */ lw $t1, %lo(gCheatsAssetData)($t1) /* 08ACBC 8008A0BC 256B6C4C */ addiu $t3, %lo(D_80126C4C) # addiu $t3, $t3, 0x6c4c /* 08ACC0 8008A0C0 A5600000 */ sh $zero, ($t3) /* 08ACC4 8008A0C4 3C0A8012 */ lui $t2, %hi(D_80126C38) # $t2, 0x8012 @@ -448,12 +448,12 @@ glabel menu_magic_codes_loop /* 08AF20 8008A320 AFAF0040 */ sw $t7, 0x40($sp) .L8008A324: /* 08AF24 8008A324 1440000D */ bnez $v0, .L8008A35C -/* 08AF28 8008A328 3C058012 */ lui $a1, %hi(D_80126C40) # $a1, 0x8012 -/* 08AF2C 8008A32C 3C028012 */ lui $v0, %hi(D_80126C42) # $v0, 0x8012 -/* 08AF30 8008A330 3C068012 */ lui $a2, %hi(D_80126C44) # $a2, 0x8012 -/* 08AF34 8008A334 24C66C44 */ addiu $a2, %lo(D_80126C44) # addiu $a2, $a2, 0x6c44 -/* 08AF38 8008A338 24426C42 */ addiu $v0, %lo(D_80126C42) # addiu $v0, $v0, 0x6c42 -/* 08AF3C 8008A33C 24A56C40 */ addiu $a1, %lo(D_80126C40) # addiu $a1, $a1, 0x6c40 +/* 08AF28 8008A328 3C058012 */ lui $a1, %hi(gCheatInputCurrentRow) # $a1, 0x8012 +/* 08AF2C 8008A32C 3C028012 */ lui $v0, %hi(gCheatInputCurrentColumn) # $v0, 0x8012 +/* 08AF30 8008A330 3C068012 */ lui $a2, %hi(gCheatInputStringLength) # $a2, 0x8012 +/* 08AF34 8008A334 24C66C44 */ addiu $a2, %lo(gCheatInputStringLength) # addiu $a2, $a2, 0x6c44 +/* 08AF38 8008A338 24426C42 */ addiu $v0, %lo(gCheatInputCurrentColumn) # addiu $v0, $v0, 0x6c42 +/* 08AF3C 8008A33C 24A56C40 */ addiu $a1, %lo(gCheatInputCurrentRow) # addiu $a1, $a1, 0x6c40 /* 08AF40 8008A340 A4A00000 */ sh $zero, ($a1) /* 08AF44 8008A344 A4400000 */ sh $zero, ($v0) /* 08AF48 8008A348 A4C00000 */ sh $zero, ($a2) @@ -483,7 +483,7 @@ glabel menu_magic_codes_loop /* 08AF98 8008A398 11C0000B */ beqz $t6, .L8008A3C8 /* 08AF9C 8008A39C 8FAF003C */ lw $t7, 0x3c($sp) /* 08AFA0 8008A3A0 05C10003 */ bgez $t6, .L8008A3B0 -/* 08AFA4 8008A3A4 3C01800E */ lui $at, %hi(D_800DF47C) # $at, 0x800e +/* 08AFA4 8008A3A4 3C01800E */ lui $at, %hi(gMenuDelay) # $at, 0x800e /* 08AFA8 8008A3A8 24180001 */ li $t8, 1 /* 08AFAC 8008A3AC AFB8003C */ sw $t8, 0x3c($sp) .L8008A3B0: @@ -491,7 +491,7 @@ glabel menu_magic_codes_loop /* 08AFB4 8008A3B4 3C04800E */ lui $a0, %hi(D_800DF774) # $a0, 0x800e /* 08AFB8 8008A3B8 2484F774 */ addiu $a0, %lo(D_800DF774) # addiu $a0, $a0, -0x88c /* 08AFBC 8008A3BC 0C030076 */ jal func_800C01D8 -/* 08AFC0 8008A3C0 AC39F47C */ sw $t9, %lo(D_800DF47C)($at) +/* 08AFC0 8008A3C0 AC39F47C */ sw $t9, %lo(gMenuDelay)($at) .L8008A3C4: /* 08AFC4 8008A3C4 8FAF003C */ lw $t7, 0x3c($sp) .L8008A3C8: @@ -517,10 +517,10 @@ glabel menu_magic_codes_loop /* 08B00C 8008A40C 0C000741 */ jal func_80001D04 /* 08B010 8008A410 00002825 */ move $a1, $zero .L8008A414: -/* 08B014 8008A414 3C02800E */ lui $v0, %hi(D_800DF47C) # $v0, 0x800e -/* 08B018 8008A418 8C42F47C */ lw $v0, %lo(D_800DF47C)($v0) -/* 08B01C 8008A41C 3C018012 */ lui $at, %hi(D_801263C4) # $at, 0x8012 -/* 08B020 8008A420 AC2063C4 */ sw $zero, %lo(D_801263C4)($at) +/* 08B014 8008A414 3C02800E */ lui $v0, %hi(gMenuDelay) # $v0, 0x800e +/* 08B018 8008A418 8C42F47C */ lw $v0, %lo(gMenuDelay)($v0) +/* 08B01C 8008A41C 3C018012 */ lui $at, %hi(gIgnorePlayerInput) # $at, 0x8012 +/* 08B020 8008A420 AC2063C4 */ sw $zero, %lo(gIgnorePlayerInput)($at) /* 08B024 8008A424 2841FFE2 */ slti $at, $v0, -0x1e /* 08B028 8008A428 14200003 */ bnez $at, .L8008A438 /* 08B02C 8008A42C 2841001F */ slti $at, $v0, 0x1f @@ -529,8 +529,8 @@ glabel menu_magic_codes_loop .L8008A438: /* 08B038 8008A438 0C022932 */ jal func_8008A4C8 /* 08B03C 8008A43C 00000000 */ nop -/* 08B040 8008A440 3C19800E */ lui $t9, %hi(D_800DF47C) # $t9, 0x800e -/* 08B044 8008A444 8F39F47C */ lw $t9, %lo(D_800DF47C)($t9) +/* 08B040 8008A440 3C19800E */ lui $t9, %hi(gMenuDelay) # $t9, 0x800e +/* 08B044 8008A444 8F39F47C */ lw $t9, %lo(gMenuDelay)($t9) /* 08B048 8008A448 3C0F800E */ lui $t7, %hi(gActiveMagicCodes) # $t7, 0x800e /* 08B04C 8008A44C 07210018 */ bgez $t9, .L8008A4B0 /* 08B050 8008A450 00000000 */ nop @@ -542,8 +542,8 @@ glabel menu_magic_codes_loop /* 08B068 8008A468 0C0002CA */ jal func_80000B28 /* 08B06C 8008A46C 00000000 */ nop /* 08B070 8008A470 24180001 */ li $t8, 1 -/* 08B074 8008A474 3C01800E */ lui $at, %hi(D_800E1B4C) # $at, 0x800e -/* 08B078 8008A478 AC381B4C */ sw $t8, %lo(D_800E1B4C)($at) +/* 08B074 8008A474 3C01800E */ lui $at, %hi(gViewingCreditsFromCheat) # $at, 0x800e +/* 08B078 8008A478 AC381B4C */ sw $t8, %lo(gViewingCreditsFromCheat)($at) /* 08B07C 8008A47C 0C0204F4 */ jal menu_init /* 08B080 8008A480 24040019 */ li $a0, 25 /* 08B084 8008A484 3C19800E */ lui $t9, %hi(gActiveMagicCodes) # $t9, 0x800e diff --git a/asm/non_matchings/menu/menu_options_loop.s b/asm/non_matchings/menu/menu_options_loop.s index 456b4539..29eb7201 100644 --- a/asm/non_matchings/menu/menu_options_loop.s +++ b/asm/non_matchings/menu/menu_options_loop.s @@ -2,8 +2,8 @@ glabel menu_options_loop /* 084F5C 8008435C 3C038012 */ lui $v1, %hi(D_801263BC) # $v1, 0x8012 /* 084F60 80084360 246363BC */ addiu $v1, %lo(D_801263BC) # addiu $v1, $v1, 0x63bc /* 084F64 80084364 8C6E0000 */ lw $t6, ($v1) -/* 084F68 80084368 3C09800E */ lui $t1, %hi(D_800DF47C) # $t1, 0x800e -/* 084F6C 8008436C 2529F47C */ addiu $t1, %lo(D_800DF47C) # addiu $t1, $t1, -0xb84 +/* 084F68 80084368 3C09800E */ lui $t1, %hi(gMenuDelay) # $t1, 0x800e +/* 084F6C 8008436C 2529F47C */ addiu $t1, %lo(gMenuDelay) # addiu $t1, $t1, -0xb84 /* 084F70 80084370 8D220000 */ lw $v0, ($t1) /* 084F74 80084374 01C47821 */ addu $t7, $t6, $a0 /* 084F78 80084378 27BDFFB8 */ addiu $sp, $sp, -0x48 @@ -28,11 +28,11 @@ glabel menu_options_loop /* 084FBC 800843BC 00000000 */ nop /* 084FC0 800843C0 0C02106E */ jal func_800841B8 /* 084FC4 800843C4 00000000 */ nop -/* 084FC8 800843C8 3C09800E */ lui $t1, %hi(D_800DF47C) # $t1, 0x800e -/* 084FCC 800843CC 2529F47C */ addiu $t1, %lo(D_800DF47C) # addiu $t1, $t1, -0xb84 +/* 084FC8 800843C8 3C09800E */ lui $t1, %hi(gMenuDelay) # $t1, 0x800e +/* 084FCC 800843CC 2529F47C */ addiu $t1, %lo(gMenuDelay) # addiu $t1, $t1, -0xb84 .L800843D0: -/* 084FD0 800843D0 3C0B8012 */ lui $t3, %hi(D_801263C4) # $t3, 0x8012 -/* 084FD4 800843D4 8D6B63C4 */ lw $t3, %lo(D_801263C4)($t3) +/* 084FD0 800843D0 3C0B8012 */ lui $t3, %hi(gIgnorePlayerInput) # $t3, 0x8012 +/* 084FD4 800843D4 8D6B63C4 */ lw $t3, %lo(gIgnorePlayerInput)($t3) /* 084FD8 800843D8 00003025 */ move $a2, $zero /* 084FDC 800843DC 00003825 */ move $a3, $zero /* 084FE0 800843E0 15600021 */ bnez $t3, .L80084468 @@ -40,17 +40,17 @@ glabel menu_options_loop /* 084FE8 800843E8 8D2C0000 */ lw $t4, ($t1) /* 084FEC 800843EC 00002025 */ move $a0, $zero /* 084FF0 800843F0 1580001D */ bnez $t4, .L80084468 -/* 084FF4 800843F4 3C038012 */ lui $v1, %hi(D_8012645C) # $v1, 0x8012 -/* 084FF8 800843F8 3C058012 */ lui $a1, %hi(D_80126464) # $a1, 0x8012 -/* 084FFC 800843FC 24A56464 */ addiu $a1, %lo(D_80126464) # addiu $a1, $a1, 0x6464 -/* 085000 80084400 2463645C */ addiu $v1, %lo(D_8012645C) # addiu $v1, $v1, 0x645c +/* 084FF4 800843F4 3C038012 */ lui $v1, %hi(gControllersXAxisDirection) # $v1, 0x8012 +/* 084FF8 800843F8 3C058012 */ lui $a1, %hi(gControllersYAxisDirection) # $a1, 0x8012 +/* 084FFC 800843FC 24A56464 */ addiu $a1, %lo(gControllersYAxisDirection) # addiu $a1, $a1, 0x6464 +/* 085000 80084400 2463645C */ addiu $v1, %lo(gControllersXAxisDirection) # addiu $v1, $v1, 0x645c .L80084404: /* 085004 80084404 AFA30020 */ sw $v1, 0x20($sp) /* 085008 80084408 AFA40040 */ sw $a0, 0x40($sp) /* 08500C 8008440C AFA5001C */ sw $a1, 0x1c($sp) /* 085010 80084410 AFA60044 */ sw $a2, 0x44($sp) /* 085014 80084414 AFA70038 */ sw $a3, 0x38($sp) -/* 085018 80084418 0C01A955 */ jal func_8006A554 +/* 085018 80084418 0C01A955 */ jal get_button_inputs_from_player /* 08501C 8008441C AFA80034 */ sw $t0, 0x34($sp) /* 085020 80084420 8FA30020 */ lw $v1, 0x20($sp) /* 085024 80084424 8FA5001C */ lw $a1, 0x1c($sp) @@ -68,8 +68,8 @@ glabel menu_options_loop /* 085054 80084454 00ED3821 */ addu $a3, $a3, $t5 /* 085058 80084458 1481FFEA */ bne $a0, $at, .L80084404 /* 08505C 8008445C 010E4021 */ addu $t0, $t0, $t6 -/* 085060 80084460 3C09800E */ lui $t1, %hi(D_800DF47C) # $t1, 0x800e -/* 085064 80084464 2529F47C */ addiu $t1, %lo(D_800DF47C) # addiu $t1, $t1, -0xb84 +/* 085060 80084460 3C09800E */ lui $t1, %hi(gMenuDelay) # $t1, 0x800e +/* 085064 80084464 2529F47C */ addiu $t1, %lo(gMenuDelay) # addiu $t1, $t1, -0xb84 .L80084468: /* 085068 80084468 30CF4000 */ andi $t7, $a2, 0x4000 /* 08506C 8008446C 15E00008 */ bnez $t7, .L80084490 @@ -85,19 +85,19 @@ glabel menu_options_loop /* 085090 80084490 0C000326 */ jal func_80000C98 /* 085094 80084494 2404FF80 */ li $a0, -128 /* 085098 80084498 2419FFFF */ li $t9, -1 -/* 08509C 8008449C 3C01800E */ lui $at, %hi(D_800DF47C) # $at, 0x800e +/* 08509C 8008449C 3C01800E */ lui $at, %hi(gMenuDelay) # $at, 0x800e /* 0850A0 800844A0 3C04800E */ lui $a0, %hi(D_800DF774) # $a0, 0x800e -/* 0850A4 800844A4 AC39F47C */ sw $t9, %lo(D_800DF47C)($at) +/* 0850A4 800844A4 AC39F47C */ sw $t9, %lo(gMenuDelay)($at) /* 0850A8 800844A8 0C030076 */ jal func_800C01D8 /* 0850AC 800844AC 2484F774 */ addiu $a0, %lo(D_800DF774) # addiu $a0, $a0, -0x88c /* 0850B0 800844B0 24040241 */ li $a0, 577 /* 0850B4 800844B4 0C000741 */ jal func_80001D04 /* 0850B8 800844B8 00002825 */ move $a1, $zero -/* 0850BC 800844BC 3C09800E */ lui $t1, %hi(D_800DF47C) # $t1, 0x800e +/* 0850BC 800844BC 3C09800E */ lui $t1, %hi(gMenuDelay) # $t1, 0x800e /* 0850C0 800844C0 3C06800E */ lui $a2, %hi(D_800DF460) # $a2, 0x800e /* 0850C4 800844C4 24C6F460 */ addiu $a2, %lo(D_800DF460) # addiu $a2, $a2, -0xba0 /* 0850C8 800844C8 1000006B */ b .L80084678 -/* 0850CC 800844CC 2529F47C */ addiu $t1, %lo(D_800DF47C) # addiu $t1, $t1, -0xb84 +/* 0850CC 800844CC 2529F47C */ addiu $t1, %lo(gMenuDelay) # addiu $t1, $t1, -0xb84 .L800844D0: /* 0850D0 800844D0 3C06800E */ lui $a2, %hi(D_800DF460) # $a2, 0x800e /* 0850D4 800844D4 24C6F460 */ addiu $a2, %lo(D_800DF460) # addiu $a2, $a2, -0xba0 @@ -110,11 +110,11 @@ glabel menu_options_loop /* 0850F0 800844F0 240400EF */ li $a0, 239 /* 0850F4 800844F4 0C000741 */ jal func_80001D04 /* 0850F8 800844F8 00002825 */ move $a1, $zero -/* 0850FC 800844FC 3C09800E */ lui $t1, %hi(D_800DF47C) # $t1, 0x800e +/* 0850FC 800844FC 3C09800E */ lui $t1, %hi(gMenuDelay) # $t1, 0x800e /* 085100 80084500 3C06800E */ lui $a2, %hi(D_800DF460) # $a2, 0x800e /* 085104 80084504 24C6F460 */ addiu $a2, %lo(D_800DF460) # addiu $a2, $a2, -0xba0 /* 085108 80084508 1000005B */ b .L80084678 -/* 08510C 8008450C 2529F47C */ addiu $t1, %lo(D_800DF47C) # addiu $t1, $t1, -0xb84 +/* 08510C 8008450C 2529F47C */ addiu $t1, %lo(gMenuDelay) # addiu $t1, $t1, -0xb84 .L80084510: /* 085110 80084510 14400018 */ bnez $v0, .L80084574 /* 085114 80084514 24010001 */ li $at, 1 @@ -138,11 +138,11 @@ glabel menu_options_loop .L80084558: /* 085158 80084558 0C000741 */ jal func_80001D04 /* 08515C 8008455C 00002825 */ move $a1, $zero -/* 085160 80084560 3C09800E */ lui $t1, %hi(D_800DF47C) # $t1, 0x800e +/* 085160 80084560 3C09800E */ lui $t1, %hi(gMenuDelay) # $t1, 0x800e /* 085164 80084564 3C06800E */ lui $a2, %hi(D_800DF460) # $a2, 0x800e /* 085168 80084568 24C6F460 */ addiu $a2, %lo(D_800DF460) # addiu $a2, $a2, -0xba0 /* 08516C 8008456C 10000042 */ b .L80084678 -/* 085170 80084570 2529F47C */ addiu $t1, %lo(D_800DF47C) # addiu $t1, $t1, -0xb84 +/* 085170 80084570 2529F47C */ addiu $t1, %lo(gMenuDelay) # addiu $t1, $t1, -0xb84 .L80084574: /* 085174 80084574 14410028 */ bne $v0, $at, .L80084618 /* 085178 80084578 00000000 */ nop @@ -182,11 +182,11 @@ glabel menu_options_loop /* 0851FC 800845FC 00000000 */ nop /* 085200 80084600 AC2DFA14 */ sw $t5, %lo(D_800DFA10+4)($at) .L80084604: -/* 085204 80084604 3C09800E */ lui $t1, %hi(D_800DF47C) # $t1, 0x800e +/* 085204 80084604 3C09800E */ lui $t1, %hi(gMenuDelay) # $t1, 0x800e /* 085208 80084608 3C06800E */ lui $a2, %hi(D_800DF460) # $a2, 0x800e /* 08520C 8008460C 24C6F460 */ addiu $a2, %lo(D_800DF460) # addiu $a2, $a2, -0xba0 /* 085210 80084610 10000019 */ b .L80084678 -/* 085214 80084614 2529F47C */ addiu $t1, %lo(D_800DF47C) # addiu $t1, $t1, -0xb84 +/* 085214 80084614 2529F47C */ addiu $t1, %lo(gMenuDelay) # addiu $t1, $t1, -0xb84 .L80084618: /* 085218 80084618 05010008 */ bgez $t0, .L8008463C /* 08521C 8008461C 00401825 */ move $v1, $v0 @@ -210,10 +210,10 @@ glabel menu_options_loop /* 08525C 8008465C 240400EB */ li $a0, 235 /* 085260 80084660 0C000741 */ jal func_80001D04 /* 085264 80084664 00002825 */ move $a1, $zero -/* 085268 80084668 3C09800E */ lui $t1, %hi(D_800DF47C) # $t1, 0x800e +/* 085268 80084668 3C09800E */ lui $t1, %hi(gMenuDelay) # $t1, 0x800e /* 08526C 8008466C 3C06800E */ lui $a2, %hi(D_800DF460) # $a2, 0x800e /* 085270 80084670 24C6F460 */ addiu $a2, %lo(D_800DF460) # addiu $a2, $a2, -0xba0 -/* 085274 80084674 2529F47C */ addiu $t1, %lo(D_800DF47C) # addiu $t1, $t1, -0xb84 +/* 085274 80084674 2529F47C */ addiu $t1, %lo(gMenuDelay) # addiu $t1, $t1, -0xb84 .L80084678: /* 085278 80084678 8D220000 */ lw $v0, ($t1) /* 08527C 8008467C 00000000 */ nop @@ -260,8 +260,8 @@ glabel menu_options_loop /* 085314 80084714 10000003 */ b .L80084724 /* 085318 80084718 00001025 */ move $v0, $zero .L8008471C: -/* 08531C 8008471C 3C018012 */ lui $at, %hi(D_801263C4) # $at, 0x8012 -/* 085320 80084720 AC2063C4 */ sw $zero, %lo(D_801263C4)($at) +/* 08531C 8008471C 3C018012 */ lui $at, %hi(gIgnorePlayerInput) # $at, 0x8012 +/* 085320 80084720 AC2063C4 */ sw $zero, %lo(gIgnorePlayerInput)($at) .L80084724: /* 085324 80084724 8FBF0014 */ lw $ra, 0x14($sp) /* 085328 80084728 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/non_matchings/menu/menu_results_loop.s b/asm/non_matchings/menu/menu_results_loop.s index a44dd2cb..81cc13a8 100644 --- a/asm/non_matchings/menu/menu_results_loop.s +++ b/asm/non_matchings/menu/menu_results_loop.s @@ -38,8 +38,8 @@ glabel menu_results_loop /* 097F34 80097334 3C068012 */ lui $a2, %hi(D_801263E0) # $a2, 0x8012 /* 097F38 80097338 24C663E0 */ addiu $a2, %lo(D_801263E0) # addiu $a2, $a2, 0x63e0 .L8009733C: -/* 097F3C 8009733C 3C09800E */ lui $t1, %hi(D_800DF47C) # $t1, 0x800e -/* 097F40 80097340 2529F47C */ addiu $t1, %lo(D_800DF47C) # addiu $t1, $t1, -0xb84 +/* 097F3C 8009733C 3C09800E */ lui $t1, %hi(gMenuDelay) # $t1, 0x800e +/* 097F40 80097340 2529F47C */ addiu $t1, %lo(gMenuDelay) # addiu $t1, $t1, -0xb84 /* 097F44 80097344 8D230000 */ lw $v1, ($t1) /* 097F48 80097348 3C078012 */ lui $a3, %hi(D_801263D8) # $a3, 0x8012 /* 097F4C 8009734C 28610014 */ slti $at, $v1, 0x14 @@ -67,22 +67,22 @@ glabel menu_results_loop /* 097FA4 800973A4 44059000 */ mfc1 $a1, $f18 /* 097FA8 800973A8 0C025A5E */ jal func_80096978 /* 097FAC 800973AC 00000000 */ nop -/* 097FB0 800973B0 3C03800E */ lui $v1, %hi(D_800DF47C) # $v1, 0x800e -/* 097FB4 800973B4 8C63F47C */ lw $v1, %lo(D_800DF47C)($v1) +/* 097FB0 800973B0 3C03800E */ lui $v1, %hi(gMenuDelay) # $v1, 0x800e +/* 097FB4 800973B4 8C63F47C */ lw $v1, %lo(gMenuDelay)($v1) /* 097FB8 800973B8 3C068012 */ lui $a2, %hi(D_801263E0) # $a2, 0x8012 -/* 097FBC 800973BC 3C09800E */ lui $t1, %hi(D_800DF47C) # $t1, 0x800e -/* 097FC0 800973C0 2529F47C */ addiu $t1, %lo(D_800DF47C) # addiu $t1, $t1, -0xb84 +/* 097FBC 800973BC 3C09800E */ lui $t1, %hi(gMenuDelay) # $t1, 0x800e +/* 097FC0 800973C0 2529F47C */ addiu $t1, %lo(gMenuDelay) # addiu $t1, $t1, -0xb84 /* 097FC4 800973C4 24C663E0 */ addiu $a2, %lo(D_801263E0) # addiu $a2, $a2, 0x63e0 /* 097FC8 800973C8 1000000A */ b .L800973F4 /* 097FCC 800973CC 24080001 */ li $t0, 1 .L800973D0: /* 097FD0 800973D0 0C025A5E */ jal func_80096978 /* 097FD4 800973D4 24050000 */ li $a1, 0 -/* 097FD8 800973D8 3C03800E */ lui $v1, %hi(D_800DF47C) # $v1, 0x800e +/* 097FD8 800973D8 3C03800E */ lui $v1, %hi(gMenuDelay) # $v1, 0x800e /* 097FDC 800973DC 3C068012 */ lui $a2, %hi(D_801263E0) # $a2, 0x8012 -/* 097FE0 800973E0 3C09800E */ lui $t1, %hi(D_800DF47C) # $t1, 0x800e -/* 097FE4 800973E4 8C63F47C */ lw $v1, %lo(D_800DF47C)($v1) -/* 097FE8 800973E8 2529F47C */ addiu $t1, %lo(D_800DF47C) # addiu $t1, $t1, -0xb84 +/* 097FE0 800973E0 3C09800E */ lui $t1, %hi(gMenuDelay) # $t1, 0x800e +/* 097FE4 800973E4 8C63F47C */ lw $v1, %lo(gMenuDelay)($v1) +/* 097FE8 800973E8 2529F47C */ addiu $t1, %lo(gMenuDelay) # addiu $t1, $t1, -0xb84 /* 097FEC 800973EC 24C663E0 */ addiu $a2, %lo(D_801263E0) # addiu $a2, $a2, 0x63e0 /* 097FF0 800973F0 24080001 */ li $t0, 1 .L800973F4: @@ -119,9 +119,9 @@ glabel menu_results_loop /* 098068 80097468 0C030076 */ jal func_800C01D8 /* 09806C 8009746C 2484F774 */ addiu $a0, %lo(D_800DF774) # addiu $a0, $a0, -0x88c /* 098070 80097470 24080001 */ li $t0, 1 -/* 098074 80097474 3C01800E */ lui $at, %hi(D_800DF47C) # $at, 0x800e +/* 098074 80097474 3C01800E */ lui $at, %hi(gMenuDelay) # $at, 0x800e /* 098078 80097478 10000050 */ b .L800975BC -/* 09807C 8009747C AC28F47C */ sw $t0, %lo(D_800DF47C)($at) +/* 09807C 8009747C AC28F47C */ sw $t0, %lo(gMenuDelay)($at) .L80097480: /* 098080 80097480 AFAB0024 */ sw $t3, 0x24($sp) /* 098084 80097484 1000004D */ b .L800975BC @@ -280,8 +280,8 @@ glabel menu_results_loop /* 0982A8 800976A8 10000004 */ b .L800976BC /* 0982AC 800976AC 24020104 */ li $v0, 260 .L800976B0: -/* 0982B0 800976B0 3C018012 */ lui $at, %hi(D_801263C4) # $at, 0x8012 -/* 0982B4 800976B4 AC2063C4 */ sw $zero, %lo(D_801263C4)($at) +/* 0982B0 800976B0 3C018012 */ lui $at, %hi(gIgnorePlayerInput) # $at, 0x8012 +/* 0982B4 800976B4 AC2063C4 */ sw $zero, %lo(gIgnorePlayerInput)($at) /* 0982B8 800976B8 00001025 */ move $v0, $zero .L800976BC: /* 0982BC 800976BC 8FBF0014 */ lw $ra, 0x14($sp) diff --git a/asm/non_matchings/menu/menu_save_options_loop.s b/asm/non_matchings/menu/menu_save_options_loop.s index f46cece2..41a0505a 100644 --- a/asm/non_matchings/menu/menu_save_options_loop.s +++ b/asm/non_matchings/menu/menu_save_options_loop.s @@ -11,8 +11,8 @@ glabel menu_save_options_loop /* 088770 80087B70 01C47821 */ addu $t7, $t6, $a0 /* 088774 80087B74 31F8003F */ andi $t8, $t7, 0x3f /* 088778 80087B78 AC780000 */ sw $t8, ($v1) -/* 08877C 80087B7C 3C02800E */ lui $v0, %hi(D_800DF47C) # $v0, 0x800e -/* 088780 80087B80 8C42F47C */ lw $v0, %lo(D_800DF47C)($v0) +/* 08877C 80087B7C 3C02800E */ lui $v0, %hi(gMenuDelay) # $v0, 0x800e +/* 088780 80087B80 8C42F47C */ lw $v0, %lo(gMenuDelay)($v0) /* 088784 80087B84 AFB00018 */ sw $s0, 0x18($sp) /* 088788 80087B88 00808025 */ move $s0, $a0 /* 08878C 80087B8C AFBF002C */ sw $ra, 0x2c($sp) @@ -24,12 +24,12 @@ glabel menu_save_options_loop /* 0887A4 80087BA4 18400005 */ blez $v0, .L80087BBC /* 0887A8 80087BA8 00504023 */ subu $t0, $v0, $s0 /* 0887AC 80087BAC 0044C821 */ addu $t9, $v0, $a0 -/* 0887B0 80087BB0 3C01800E */ lui $at, %hi(D_800DF47C) # $at, 0x800e +/* 0887B0 80087BB0 3C01800E */ lui $at, %hi(gMenuDelay) # $at, 0x800e /* 0887B4 80087BB4 10000003 */ b .L80087BC4 -/* 0887B8 80087BB8 AC39F47C */ sw $t9, %lo(D_800DF47C)($at) +/* 0887B8 80087BB8 AC39F47C */ sw $t9, %lo(gMenuDelay)($at) .L80087BBC: -/* 0887BC 80087BBC 3C01800E */ lui $at, %hi(D_800DF47C) # $at, 0x800e -/* 0887C0 80087BC0 AC28F47C */ sw $t0, %lo(D_800DF47C)($at) +/* 0887BC 80087BBC 3C01800E */ lui $at, %hi(gMenuDelay) # $at, 0x800e +/* 0887C0 80087BC0 AC28F47C */ sw $t0, %lo(gMenuDelay)($at) .L80087BC4: /* 0887C4 80087BC4 3C098012 */ lui $t1, %hi(D_801263E0) # $t1, 0x8012 /* 0887C8 80087BC8 8D2963E0 */ lw $t1, %lo(D_801263E0)($t1) @@ -41,8 +41,8 @@ glabel menu_save_options_loop /* 0887E0 80087BE0 0C021A92 */ jal func_80086A48 /* 0887E4 80087BE4 02002025 */ move $a0, $s0 .L80087BE8: -/* 0887E8 80087BE8 3C02800E */ lui $v0, %hi(D_800DF47C) # $v0, 0x800e -/* 0887EC 80087BEC 8C42F47C */ lw $v0, %lo(D_800DF47C)($v0) +/* 0887E8 80087BE8 3C02800E */ lui $v0, %hi(gMenuDelay) # $v0, 0x800e +/* 0887EC 80087BEC 8C42F47C */ lw $v0, %lo(gMenuDelay)($v0) /* 0887F0 80087BF0 00000000 */ nop /* 0887F4 80087BF4 2841FFED */ slti $at, $v0, -0x13 /* 0887F8 80087BF8 14200008 */ bnez $at, .L80087C1C @@ -51,8 +51,8 @@ glabel menu_save_options_loop /* 088804 80087C04 00000000 */ nop /* 088808 80087C08 0C0216E7 */ jal func_80085B9C /* 08880C 80087C0C 02002025 */ move $a0, $s0 -/* 088810 80087C10 3C02800E */ lui $v0, %hi(D_800DF47C) # $v0, 0x800e -/* 088814 80087C14 8C42F47C */ lw $v0, %lo(D_800DF47C)($v0) +/* 088810 80087C10 3C02800E */ lui $v0, %hi(gMenuDelay) # $v0, 0x800e +/* 088814 80087C14 8C42F47C */ lw $v0, %lo(gMenuDelay)($v0) /* 088818 80087C18 00000000 */ nop .L80087C1C: /* 08881C 80087C1C 10400013 */ beqz $v0, .L80087C6C @@ -78,15 +78,15 @@ glabel menu_save_options_loop /* 088864 80087C64 1000008C */ b .L80087E98 /* 088868 80087C68 00001025 */ move $v0, $zero .L80087C6C: -/* 08886C 80087C6C 3C0B8012 */ lui $t3, %hi(D_801263C4) # $t3, 0x8012 -/* 088870 80087C70 8D6B63C4 */ lw $t3, %lo(D_801263C4)($t3) +/* 08886C 80087C6C 3C0B8012 */ lui $t3, %hi(gIgnorePlayerInput) # $t3, 0x8012 +/* 088870 80087C70 8D6B63C4 */ lw $t3, %lo(gIgnorePlayerInput)($t3) /* 088874 80087C74 0000A025 */ move $s4, $zero /* 088878 80087C78 15600014 */ bnez $t3, .L80087CCC /* 08887C 80087C7C 00009825 */ move $s3, $zero -/* 088880 80087C80 3C118012 */ lui $s1, %hi(D_8012645C) # $s1, 0x8012 -/* 088884 80087C84 3C128012 */ lui $s2, %hi(D_80126464) # $s2, 0x8012 -/* 088888 80087C88 26526464 */ addiu $s2, %lo(D_80126464) # addiu $s2, $s2, 0x6464 -/* 08888C 80087C8C 2631645C */ addiu $s1, %lo(D_8012645C) # addiu $s1, $s1, 0x645c +/* 088880 80087C80 3C118012 */ lui $s1, %hi(gControllersXAxisDirection) # $s1, 0x8012 +/* 088884 80087C84 3C128012 */ lui $s2, %hi(gControllersYAxisDirection) # $s2, 0x8012 +/* 088888 80087C88 26526464 */ addiu $s2, %lo(gControllersYAxisDirection) # addiu $s2, $s2, 0x6464 +/* 08888C 80087C8C 2631645C */ addiu $s1, %lo(gControllersXAxisDirection) # addiu $s1, $s1, 0x645c /* 088890 80087C90 00008025 */ move $s0, $zero .L80087C94: /* 088894 80087C94 822C0000 */ lb $t4, ($s1) @@ -94,7 +94,7 @@ glabel menu_save_options_loop /* 08889C 80087C9C 02002025 */ move $a0, $s0 /* 0888A0 80087CA0 AFA60030 */ sw $a2, 0x30($sp) /* 0888A4 80087CA4 028CA021 */ addu $s4, $s4, $t4 -/* 0888A8 80087CA8 0C01A955 */ jal func_8006A554 +/* 0888A8 80087CA8 0C01A955 */ jal get_button_inputs_from_player /* 0888AC 80087CAC 026D9821 */ addu $s3, $s3, $t5 /* 0888B0 80087CB0 8FA60030 */ lw $a2, 0x30($sp) /* 0888B4 80087CB4 26100001 */ addiu $s0, $s0, 1 @@ -112,9 +112,9 @@ glabel menu_save_options_loop /* 0888E0 80087CE0 2C410008 */ sltiu $at, $v0, 8 /* 0888E4 80087CE4 0C021DCD */ jal func_80087734 /* 0888E8 80087CE8 02602825 */ move $a1, $s3 -/* 0888EC 80087CEC 3C01800E */ lui $at, %hi(D_800DF47C) # $at, 0x800e +/* 0888EC 80087CEC 3C01800E */ lui $at, %hi(gMenuDelay) # $at, 0x800e /* 0888F0 80087CF0 10000066 */ b .L80087E8C -/* 0888F4 80087CF4 AC22F47C */ sw $v0, %lo(D_800DF47C)($at) +/* 0888F4 80087CF4 AC22F47C */ sw $v0, %lo(gMenuDelay)($at) .L80087CF8: /* 0888F8 80087CF8 1020005D */ beqz $at, .L80087E70 /* 0888FC 80087CFC 00027880 */ sll $t7, $v0, 2 @@ -126,9 +126,9 @@ glabel menu_save_options_loop /* 088914 80087D14 00000000 */ nop glabel L80087D18 /* 088918 80087D18 2418FFFF */ li $t8, -1 -/* 08891C 80087D1C 3C01800E */ lui $at, %hi(D_800DF47C) # $at, 0x800e +/* 08891C 80087D1C 3C01800E */ lui $at, %hi(gMenuDelay) # $at, 0x800e /* 088920 80087D20 10000053 */ b .L80087E70 -/* 088924 80087D24 AC38F47C */ sw $t8, %lo(D_800DF47C)($at) +/* 088924 80087D24 AC38F47C */ sw $t8, %lo(gMenuDelay)($at) glabel L80087D28 /* 088928 80087D28 3C108012 */ lui $s0, %hi(D_801263D8) # $s0, 0x8012 /* 08892C 80087D2C 261063D8 */ addiu $s0, %lo(D_801263D8) # addiu $s0, $s0, 0x63d8 @@ -163,9 +163,9 @@ glabel L80087D94 /* 088994 80087D94 00C02025 */ move $a0, $a2 /* 088998 80087D98 0C021D34 */ jal func_800874D0 /* 08899C 80087D9C 02802825 */ move $a1, $s4 -/* 0889A0 80087DA0 3C01800E */ lui $at, %hi(D_800DF47C) # $at, 0x800e +/* 0889A0 80087DA0 3C01800E */ lui $at, %hi(gMenuDelay) # $at, 0x800e /* 0889A4 80087DA4 10000032 */ b .L80087E70 -/* 0889A8 80087DA8 AC22F47C */ sw $v0, %lo(D_800DF47C)($at) +/* 0889A8 80087DA8 AC22F47C */ sw $v0, %lo(gMenuDelay)($at) glabel L80087DAC /* 0889AC 80087DAC 3C018012 */ lui $at, %hi(D_80126BE4) # $at, 0x8012 /* 0889B0 80087DB0 44803000 */ mtc1 $zero, $f6 @@ -188,16 +188,16 @@ glabel L80087DEC /* 0889EC 80087DEC 00C02025 */ move $a0, $a2 /* 0889F0 80087DF0 0C021D79 */ jal func_800875E4 /* 0889F4 80087DF4 02802825 */ move $a1, $s4 -/* 0889F8 80087DF8 3C01800E */ lui $at, %hi(D_800DF47C) # $at, 0x800e +/* 0889F8 80087DF8 3C01800E */ lui $at, %hi(gMenuDelay) # $at, 0x800e /* 0889FC 80087DFC 1000001C */ b .L80087E70 -/* 088A00 80087E00 AC22F47C */ sw $v0, %lo(D_800DF47C)($at) +/* 088A00 80087E00 AC22F47C */ sw $v0, %lo(gMenuDelay)($at) glabel L80087E04 /* 088A04 80087E04 00C02025 */ move $a0, $a2 /* 088A08 80087E08 0C021DB3 */ jal func_800876CC /* 088A0C 80087E0C 02802825 */ move $a1, $s4 -/* 088A10 80087E10 3C01800E */ lui $at, %hi(D_800DF47C) # $at, 0x800e +/* 088A10 80087E10 3C01800E */ lui $at, %hi(gMenuDelay) # $at, 0x800e /* 088A14 80087E14 10000016 */ b .L80087E70 -/* 088A18 80087E18 AC22F47C */ sw $v0, %lo(D_800DF47C)($at) +/* 088A18 80087E18 AC22F47C */ sw $v0, %lo(gMenuDelay)($at) glabel L80087E1C /* 088A1C 80087E1C 3C108012 */ lui $s0, %hi(D_801263D8) # $s0, 0x8012 /* 088A20 80087E20 261063D8 */ addiu $s0, %lo(D_801263D8) # addiu $s0, $s0, 0x63d8 @@ -222,16 +222,16 @@ glabel L80087E1C /* 088A68 80087E68 3C018012 */ lui $at, %hi(D_801263E0) # $at, 0x8012 /* 088A6C 80087E6C AC3963E0 */ sw $t9, %lo(D_801263E0)($at) .L80087E70: -/* 088A70 80087E70 3C08800E */ lui $t0, %hi(D_800DF47C) # $t0, 0x800e -/* 088A74 80087E74 8D08F47C */ lw $t0, %lo(D_800DF47C)($t0) +/* 088A70 80087E70 3C08800E */ lui $t0, %hi(gMenuDelay) # $t0, 0x800e +/* 088A74 80087E74 8D08F47C */ lw $t0, %lo(gMenuDelay)($t0) /* 088A78 80087E78 3C04800E */ lui $a0, %hi(D_800DF774) # $a0, 0x800e /* 088A7C 80087E7C 11000003 */ beqz $t0, .L80087E8C /* 088A80 80087E80 00000000 */ nop /* 088A84 80087E84 0C030076 */ jal func_800C01D8 /* 088A88 80087E88 2484F774 */ addiu $a0, %lo(D_800DF774) # addiu $a0, $a0, -0x88c .L80087E8C: -/* 088A8C 80087E8C 3C018012 */ lui $at, %hi(D_801263C4) # $at, 0x8012 -/* 088A90 80087E90 AC2063C4 */ sw $zero, %lo(D_801263C4)($at) +/* 088A8C 80087E8C 3C018012 */ lui $at, %hi(gIgnorePlayerInput) # $at, 0x8012 +/* 088A90 80087E90 AC2063C4 */ sw $zero, %lo(gIgnorePlayerInput)($at) /* 088A94 80087E94 00001025 */ move $v0, $zero .L80087E98: /* 088A98 80087E98 8FBF002C */ lw $ra, 0x2c($sp) diff --git a/asm/non_matchings/menu/menu_title_screen_init.s b/asm/non_matchings/menu/menu_title_screen_init.s index da45925d..50d08162 100644 --- a/asm/non_matchings/menu/menu_title_screen_init.s +++ b/asm/non_matchings/menu/menu_title_screen_init.s @@ -6,18 +6,18 @@ glabel menu_title_screen_init /* 08414C 8008354C 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 084150 80083550 AC2063BC */ sw $zero, %lo(D_801263BC)($at) /* 084154 80083554 AFBF0014 */ sw $ra, 0x14($sp) -/* 084158 80083558 3C01800E */ lui $at, %hi(D_800DF47C) # $at, 0x800e +/* 084158 80083558 3C01800E */ lui $at, %hi(gMenuDelay) # $at, 0x800e /* 08415C 8008355C 0C027055 */ jal reset_character_id_slots -/* 084160 80083560 AC20F47C */ sw $zero, %lo(D_800DF47C)($at) +/* 084160 80083560 AC20F47C */ sw $zero, %lo(gMenuDelay)($at) /* 084164 80083564 3C01800E */ lui $at, %hi(gSaveFileIndex) # $at, 0x800e /* 084168 80083568 AC20F4CC */ sw $zero, %lo(gSaveFileIndex)($at) -/* 08416C 8008356C 3C01800E */ lui $at, %hi(D_800DF45C) # $at, 0x800e -/* 084170 80083570 AC20F45C */ sw $zero, %lo(D_800DF45C)($at) -/* 084174 80083574 3C01800E */ lui $at, %hi(D_800DF4BC) # $at, 0x800e +/* 08416C 8008356C 3C01800E */ lui $at, %hi(gTitleScreenCurrentOption) # $at, 0x800e +/* 084170 80083570 AC20F45C */ sw $zero, %lo(gTitleScreenCurrentOption)($at) +/* 084174 80083574 3C01800E */ lui $at, %hi(gNumberOfActivePlayers) # $at, 0x800e /* 084178 80083578 240F0004 */ li $t7, 4 /* 08417C 8008357C 0C01A90D */ jal func_8006A434 -/* 084180 80083580 AC2FF4BC */ sw $t7, %lo(D_800DF4BC)($at) -/* 084184 80083584 0C0002CD */ jal func_80000B34 +/* 084180 80083580 AC2FF4BC */ sw $t7, %lo(gNumberOfActivePlayers)($at) +/* 084184 80083584 0C0002CD */ jal play_music /* 084188 80083588 24040001 */ li $a0, 1 /* 08418C 8008358C 0C0006BB */ jal musicGetRelativeVolume /* 084190 80083590 00000000 */ nop @@ -107,7 +107,7 @@ glabel menu_title_screen_init /* 0842D4 800836D4 24040002 */ li $a0, 2 /* 0842D8 800836D8 0C000224 */ jal func_80000890 /* 0842DC 800836DC 00002025 */ move $a0, $zero -/* 0842E0 800836E0 0C00392F */ jal func_8000E4BC +/* 0842E0 800836E0 0C00392F */ jal set_time_trial_enabled /* 0842E4 800836E4 00002025 */ move $a0, $zero /* 0842E8 800836E8 3C018012 */ lui $at, %hi(D_80126864) # $at, 0x8012 /* 0842EC 800836EC AC206864 */ sw $zero, %lo(D_80126864)($at) @@ -143,8 +143,8 @@ glabel menu_title_screen_init /* 084360 80083760 3C018012 */ lui $at, %hi(D_801263D8) # $at, 0x8012 /* 084364 80083764 8FBF0014 */ lw $ra, 0x14($sp) /* 084368 80083768 AC2063D8 */ sw $zero, %lo(D_801263D8)($at) -/* 08436C 8008376C 3C01800E */ lui $at, %hi(D_800DF4B8) # $at, 0x800e -/* 084370 80083770 AC20F4B8 */ sw $zero, %lo(D_800DF4B8)($at) +/* 08436C 8008376C 3C01800E */ lui $at, %hi(gIsInTracksMode) # $at, 0x800e +/* 084370 80083770 AC20F4B8 */ sw $zero, %lo(gIsInTracksMode)($at) /* 084374 80083774 03E00008 */ jr $ra /* 084378 80083778 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/non_matchings/menu/menu_title_screen_loop.s b/asm/non_matchings/menu/menu_title_screen_loop.s index e54dd223..84d7f10c 100644 --- a/asm/non_matchings/menu/menu_title_screen_loop.s +++ b/asm/non_matchings/menu/menu_title_screen_loop.s @@ -23,7 +23,7 @@ glabel menu_title_screen_loop /* 08461C 80083A1C 8D290300 */ lw $t1, %lo(osTvType)($t1) /* 084620 80083A20 8FAB0030 */ lw $t3, 0x30($sp) /* 084624 80083A24 1520000A */ bnez $t1, .L80083A50 -/* 084628 80083A28 3C02800E */ lui $v0, %hi(D_800DF47C) # $v0, 0x800e +/* 084628 80083A28 3C02800E */ lui $v0, %hi(gMenuDelay) # $v0, 0x800e /* 08462C 80083A2C 8FAA0030 */ lw $t2, 0x30($sp) /* 084630 80083A30 3C014248 */ li $at, 0x42480000 # 50.000000 /* 084634 80083A34 448A2000 */ mtc1 $t2, $f4 @@ -42,7 +42,7 @@ glabel menu_title_screen_loop /* 084664 80083A64 46049183 */ div.s $f6, $f18, $f4 /* 084668 80083A68 E7A6001C */ swc1 $f6, 0x1c($sp) .L80083A6C: -/* 08466C 80083A6C 8C42F47C */ lw $v0, %lo(D_800DF47C)($v0) +/* 08466C 80083A6C 8C42F47C */ lw $v0, %lo(gMenuDelay)($v0) /* 084670 80083A70 8FA40030 */ lw $a0, 0x30($sp) /* 084674 80083A74 28410014 */ slti $at, $v0, 0x14 /* 084678 80083A78 10200007 */ beqz $at, .L80083A98 @@ -50,16 +50,16 @@ glabel menu_title_screen_loop /* 084680 80083A80 8FA5001C */ lw $a1, 0x1c($sp) /* 084684 80083A84 0C020DDF */ jal func_8008377C /* 084688 80083A88 00000000 */ nop -/* 08468C 80083A8C 3C02800E */ lui $v0, %hi(D_800DF47C) # $v0, 0x800e -/* 084690 80083A90 8C42F47C */ lw $v0, %lo(D_800DF47C)($v0) +/* 08468C 80083A8C 3C02800E */ lui $v0, %hi(gMenuDelay) # $v0, 0x800e +/* 084690 80083A90 8C42F47C */ lw $v0, %lo(gMenuDelay)($v0) /* 084694 80083A94 00000000 */ nop .L80083A98: /* 084698 80083A98 10400005 */ beqz $v0, .L80083AB0 /* 08469C 80083A9C 3C088012 */ lui $t0, %hi(D_80126864) # $t0, 0x8012 /* 0846A0 80083AA0 8FAC0030 */ lw $t4, 0x30($sp) -/* 0846A4 80083AA4 3C01800E */ lui $at, %hi(D_800DF47C) # $at, 0x800e +/* 0846A4 80083AA4 3C01800E */ lui $at, %hi(gMenuDelay) # $at, 0x800e /* 0846A8 80083AA8 004C6821 */ addu $t5, $v0, $t4 -/* 0846AC 80083AAC AC2DF47C */ sw $t5, %lo(D_800DF47C)($at) +/* 0846AC 80083AAC AC2DF47C */ sw $t5, %lo(gMenuDelay)($at) .L80083AB0: /* 0846B0 80083AB0 25086864 */ addiu $t0, %lo(D_80126864) # addiu $t0, $t0, 0x6864 /* 0846B4 80083AB4 3C028012 */ lui $v0, %hi(D_80126874) # $v0, 0x8012 @@ -81,7 +81,7 @@ glabel menu_title_screen_loop /* 0846F0 80083AF0 84E30000 */ lh $v1, ($a3) /* 0846F4 80083AF4 00003025 */ move $a2, $zero /* 0846F8 80083AF8 1860001D */ blez $v1, .L80083B70 -/* 0846FC 80083AFC 3C02800E */ lui $v0, %hi(D_800DF47C) # $v0, 0x800e +/* 0846FC 80083AFC 3C02800E */ lui $v0, %hi(gMenuDelay) # $v0, 0x800e /* 084700 80083B00 8FAC0030 */ lw $t4, 0x30($sp) /* 084704 80083B04 00000000 */ nop /* 084708 80083B08 006C6823 */ subu $t5, $v1, $t4 @@ -105,15 +105,15 @@ glabel menu_title_screen_loop /* 084750 80083B50 8FA60028 */ lw $a2, 0x28($sp) /* 084754 80083B54 00000000 */ nop .L80083B58: -/* 084758 80083B58 3C02800E */ lui $v0, %hi(D_800DF47C) # $v0, 0x800e -/* 08475C 80083B5C 8C42F47C */ lw $v0, %lo(D_800DF47C)($v0) +/* 084758 80083B58 3C02800E */ lui $v0, %hi(gMenuDelay) # $v0, 0x800e +/* 08475C 80083B5C 8C42F47C */ lw $v0, %lo(gMenuDelay)($v0) /* 084760 80083B60 1C600006 */ bgtz $v1, .L80083B7C /* 084764 80083B64 00000000 */ nop /* 084768 80083B68 10000004 */ b .L80083B7C /* 08476C 80083B6C 24060001 */ li $a2, 1 .L80083B70: /* 084770 80083B70 A4E00000 */ sh $zero, ($a3) -/* 084774 80083B74 8C42F47C */ lw $v0, %lo(D_800DF47C)($v0) +/* 084774 80083B74 8C42F47C */ lw $v0, %lo(gMenuDelay)($v0) /* 084778 80083B78 00000000 */ nop .L80083B7C: /* 08477C 80083B7C 1440003F */ bnez $v0, .L80083C7C @@ -302,7 +302,7 @@ glabel menu_title_screen_loop /* 084A34 80083E34 44048000 */ mfc1 $a0, $f16 /* 084A38 80083E38 44CBF800 */ ctc1 $t3, $31 /* 084A3C 80083E3C 308C00FF */ andi $t4, $a0, 0xff -/* 084A40 80083E40 0C000664 */ jal musicSetRelativeVolume +/* 084A40 80083E40 0C000664 */ jal set_relative_volume_for_music /* 084A44 80083E44 01802025 */ move $a0, $t4 /* 084A48 80083E48 3C038012 */ lui $v1, %hi(D_8012686C) # $v1, 0x8012 /* 084A4C 80083E4C 1000002F */ b .L80083F0C @@ -317,7 +317,7 @@ glabel menu_title_screen_loop /* 084A6C 80083E6C 8C84F760 */ lw $a0, %lo(D_800DF760)($a0) /* 084A70 80083E70 00000000 */ nop /* 084A74 80083E74 00046843 */ sra $t5, $a0, 1 -/* 084A78 80083E78 0C000664 */ jal musicSetRelativeVolume +/* 084A78 80083E78 0C000664 */ jal set_relative_volume_for_music /* 084A7C 80083E7C 31A400FF */ andi $a0, $t5, 0xff /* 084A80 80083E80 3C038012 */ lui $v1, %hi(D_8012686C) # $v1, 0x8012 /* 084A84 80083E84 10000021 */ b .L80083F0C @@ -345,14 +345,14 @@ glabel menu_title_screen_loop /* 084AD8 80083ED8 44043000 */ mfc1 $a0, $f6 /* 084ADC 80083EDC 44D8F800 */ ctc1 $t8, $31 /* 084AE0 80083EE0 309900FF */ andi $t9, $a0, 0xff -/* 084AE4 80083EE4 0C000664 */ jal musicSetRelativeVolume +/* 084AE4 80083EE4 0C000664 */ jal set_relative_volume_for_music /* 084AE8 80083EE8 03202025 */ move $a0, $t9 /* 084AEC 80083EEC 3C038012 */ lui $v1, %hi(D_8012686C) # $v1, 0x8012 /* 084AF0 80083EF0 10000006 */ b .L80083F0C /* 084AF4 80083EF4 2463686C */ addiu $v1, %lo(D_8012686C) # addiu $v1, $v1, 0x686c .L80083EF8: /* 084AF8 80083EF8 9084F763 */ lbu $a0, %lo(D_800DF760+3)($a0) -/* 084AFC 80083EFC 0C000664 */ jal musicSetRelativeVolume +/* 084AFC 80083EFC 0C000664 */ jal set_relative_volume_for_music /* 084B00 80083F00 00000000 */ nop /* 084B04 80083F04 3C038012 */ lui $v1, %hi(D_8012686C) # $v1, 0x8012 /* 084B08 80083F08 2463686C */ addiu $v1, %lo(D_8012686C) # addiu $v1, $v1, 0x686c @@ -360,7 +360,7 @@ glabel menu_title_screen_loop /* 084B0C 80083F0C 8C690000 */ lw $t1, ($v1) /* 084B10 80083F10 3C028012 */ lui $v0, %hi(D_801267D8) # $v0, 0x8012 /* 084B14 80083F14 15200009 */ bnez $t1, .L80083F3C -/* 084B18 80083F18 3C0D800E */ lui $t5, %hi(D_800DF47C) # $t5, 0x800e +/* 084B18 80083F18 3C0D800E */ lui $t5, %hi(gMenuDelay) # $t5, 0x800e /* 084B1C 80083F1C 244267D8 */ addiu $v0, %lo(D_801267D8) # addiu $v0, $v0, 0x67d8 /* 084B20 80083F20 8C4A0010 */ lw $t2, 0x10($v0) /* 084B24 80083F24 240C0001 */ li $t4, 1 @@ -370,7 +370,7 @@ glabel menu_title_screen_loop /* 084B34 80083F34 10000045 */ b .L8008404C /* 084B38 80083F38 AC6C0000 */ sw $t4, ($v1) .L80083F3C: -/* 084B3C 80083F3C 8DADF47C */ lw $t5, %lo(D_800DF47C)($t5) +/* 084B3C 80083F3C 8DADF47C */ lw $t5, %lo(gMenuDelay)($t5) /* 084B40 80083F40 00000000 */ nop /* 084B44 80083F44 15A00041 */ bnez $t5, .L8008404C /* 084B48 80083F48 00000000 */ nop @@ -378,28 +378,28 @@ glabel menu_title_screen_loop /* 084B50 80083F50 00000000 */ nop /* 084B54 80083F54 1440003D */ bnez $v0, .L8008404C /* 084B58 80083F58 3C038012 */ lui $v1, %hi(D_80126838) # $v1, 0x8012 -/* 084B5C 80083F5C 3C02800E */ lui $v0, %hi(D_800DF45C) # $v0, 0x800e -/* 084B60 80083F60 8C42F45C */ lw $v0, %lo(D_800DF45C)($v0) +/* 084B5C 80083F5C 3C02800E */ lui $v0, %hi(gTitleScreenCurrentOption) # $v0, 0x800e +/* 084B60 80083F60 8C42F45C */ lw $v0, %lo(gTitleScreenCurrentOption)($v0) /* 084B64 80083F64 84636838 */ lh $v1, %lo(D_80126838)($v1) /* 084B68 80083F68 00002825 */ move $a1, $zero /* 084B6C 80083F6C 04610008 */ bgez $v1, .L80083F90 /* 084B70 80083F70 00402025 */ move $a0, $v0 /* 084B74 80083F74 1C400006 */ bgtz $v0, .L80083F90 /* 084B78 80083F78 244E0001 */ addiu $t6, $v0, 1 -/* 084B7C 80083F7C 3C01800E */ lui $at, %hi(D_800DF45C) # $at, 0x800e -/* 084B80 80083F80 AC2EF45C */ sw $t6, %lo(D_800DF45C)($at) -/* 084B84 80083F84 3C02800E */ lui $v0, %hi(D_800DF45C) # $v0, 0x800e -/* 084B88 80083F88 8C42F45C */ lw $v0, %lo(D_800DF45C)($v0) +/* 084B7C 80083F7C 3C01800E */ lui $at, %hi(gTitleScreenCurrentOption) # $at, 0x800e +/* 084B80 80083F80 AC2EF45C */ sw $t6, %lo(gTitleScreenCurrentOption)($at) +/* 084B84 80083F84 3C02800E */ lui $v0, %hi(gTitleScreenCurrentOption) # $v0, 0x800e +/* 084B88 80083F88 8C42F45C */ lw $v0, %lo(gTitleScreenCurrentOption)($v0) /* 084B8C 80083F8C 00000000 */ nop .L80083F90: /* 084B90 80083F90 18600008 */ blez $v1, .L80083FB4 /* 084B94 80083F94 00000000 */ nop /* 084B98 80083F98 18400006 */ blez $v0, .L80083FB4 /* 084B9C 80083F9C 244FFFFF */ addiu $t7, $v0, -1 -/* 084BA0 80083FA0 3C01800E */ lui $at, %hi(D_800DF45C) # $at, 0x800e -/* 084BA4 80083FA4 AC2FF45C */ sw $t7, %lo(D_800DF45C)($at) -/* 084BA8 80083FA8 3C02800E */ lui $v0, %hi(D_800DF45C) # $v0, 0x800e -/* 084BAC 80083FAC 8C42F45C */ lw $v0, %lo(D_800DF45C)($v0) +/* 084BA0 80083FA0 3C01800E */ lui $at, %hi(gTitleScreenCurrentOption) # $at, 0x800e +/* 084BA4 80083FA4 AC2FF45C */ sw $t7, %lo(gTitleScreenCurrentOption)($at) +/* 084BA8 80083FA8 3C02800E */ lui $v0, %hi(gTitleScreenCurrentOption) # $v0, 0x800e +/* 084BAC 80083FAC 8C42F45C */ lw $v0, %lo(gTitleScreenCurrentOption)($v0) /* 084BB0 80083FB0 00000000 */ nop .L80083FB4: /* 084BB4 80083FB4 10820003 */ beq $a0, $v0, .L80083FC4 @@ -430,12 +430,12 @@ glabel menu_title_screen_loop /* 084C10 80084010 11C0FFF8 */ beqz $t6, .L80083FF4 /* 084C14 80084014 00000000 */ nop .L80084018: -/* 084C18 80084018 0C022BC0 */ jal func_8008AF00 +/* 084C18 80084018 0C022BC0 */ jal set_active_player_index /* 084C1C 8008401C 00C02025 */ move $a0, $a2 /* 084C20 80084020 240F0001 */ li $t7, 1 -/* 084C24 80084024 3C01800E */ lui $at, %hi(D_800DF47C) # $at, 0x800e +/* 084C24 80084024 3C01800E */ lui $at, %hi(gMenuDelay) # $at, 0x800e /* 084C28 80084028 3C04800E */ lui $a0, %hi(D_800DF774) # $a0, 0x800e -/* 084C2C 8008402C AC2FF47C */ sw $t7, %lo(D_800DF47C)($at) +/* 084C2C 8008402C AC2FF47C */ sw $t7, %lo(gMenuDelay)($at) /* 084C30 80084030 0C030076 */ jal func_800C01D8 /* 084C34 80084034 2484F774 */ addiu $a0, %lo(D_800DF774) # addiu $a0, $a0, -0x88c /* 084C38 80084038 0C03005C */ jal func_800C0170 @@ -444,8 +444,8 @@ glabel menu_title_screen_loop /* 084C44 80084044 0C000741 */ jal func_80001D04 /* 084C48 80084048 00002825 */ move $a1, $zero .L8008404C: -/* 084C4C 8008404C 3C18800E */ lui $t8, %hi(D_800DF47C) # $t8, 0x800e -/* 084C50 80084050 8F18F47C */ lw $t8, %lo(D_800DF47C)($t8) +/* 084C4C 8008404C 3C18800E */ lui $t8, %hi(gMenuDelay) # $t8, 0x800e +/* 084C50 80084050 8F18F47C */ lw $t8, %lo(gMenuDelay)($t8) /* 084C54 80084054 00001025 */ move $v0, $zero /* 084C58 80084058 2B01001F */ slti $at, $t8, 0x1f /* 084C5C 8008405C 14200028 */ bnez $at, .L80084100 @@ -454,8 +454,8 @@ glabel menu_title_screen_loop /* 084C68 80084068 00000000 */ nop /* 084C6C 8008406C 0C030060 */ jal func_800C0180 /* 084C70 80084070 00000000 */ nop -/* 084C74 80084074 3C19800E */ lui $t9, %hi(D_800DF45C) # $t9, 0x800e -/* 084C78 80084078 8F39F45C */ lw $t9, %lo(D_800DF45C)($t9) +/* 084C74 80084074 3C19800E */ lui $t9, %hi(gTitleScreenCurrentOption) # $t9, 0x800e +/* 084C78 80084078 8F39F45C */ lw $t9, %lo(gTitleScreenCurrentOption)($t9) /* 084C7C 8008407C 3C01800E */ lui $at, %hi(D_800DF460) # $at, 0x800e /* 084C80 80084080 17200017 */ bnez $t9, .L800840E0 /* 084C84 80084084 24040027 */ li $a0, 39 @@ -493,8 +493,8 @@ glabel menu_title_screen_loop /* 084CF8 800840F8 10000003 */ b .L80084108 /* 084CFC 800840FC 00001025 */ move $v0, $zero .L80084100: -/* 084D00 80084100 3C018012 */ lui $at, %hi(D_801263C4) # $at, 0x8012 -/* 084D04 80084104 AC2063C4 */ sw $zero, %lo(D_801263C4)($at) +/* 084D00 80084100 3C018012 */ lui $at, %hi(gIgnorePlayerInput) # $at, 0x8012 +/* 084D04 80084104 AC2063C4 */ sw $zero, %lo(gIgnorePlayerInput)($at) .L80084108: /* 084D08 80084108 8FBF0014 */ lw $ra, 0x14($sp) /* 084D0C 8008410C 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/non_matchings/menu/menu_track_select_init.s b/asm/non_matchings/menu/menu_track_select_init.s index 8fe3db72..5058a3e2 100644 --- a/asm/non_matchings/menu/menu_track_select_init.s +++ b/asm/non_matchings/menu/menu_track_select_init.s @@ -492,10 +492,10 @@ glabel menu_track_select_init /* 08FAFC 8008EEFC 000C6840 */ sll $t5, $t4, 1 /* 08FB00 8008EF00 016D7821 */ addu $t7, $t3, $t5 /* 08FB04 8008EF04 85EE0000 */ lh $t6, ($t7) -/* 08FB08 8008EF08 3C03800E */ lui $v1, %hi(D_800DF4C4) # $v1, 0x800e -/* 08FB0C 8008EF0C 3C10800E */ lui $s0, %hi(D_800DF4C8) # $s0, 0x800e -/* 08FB10 8008EF10 2610F4C8 */ addiu $s0, %lo(D_800DF4C8) # addiu $s0, $s0, -0xb38 -/* 08FB14 8008EF14 2463F4C4 */ addiu $v1, %lo(D_800DF4C4) # addiu $v1, $v1, -0xb3c +/* 08FB08 8008EF08 3C03800E */ lui $v1, %hi(gTrackIdForPreview) # $v1, 0x800e +/* 08FB0C 8008EF0C 3C10800E */ lui $s0, %hi(gTrackSelectRow) # $s0, 0x800e +/* 08FB10 8008EF10 2610F4C8 */ addiu $s0, %lo(gTrackSelectRow) # addiu $s0, $s0, -0xb38 +/* 08FB14 8008EF14 2463F4C4 */ addiu $v1, %lo(gTrackIdForPreview) # addiu $v1, $v1, -0xb3c /* 08FB18 8008EF18 24580001 */ addiu $t8, $v0, 1 /* 08FB1C 8008EF1C AE180000 */ sw $t8, ($s0) /* 08FB20 8008EF20 16AE000E */ bne $s5, $t6, .L8008EF5C @@ -529,10 +529,10 @@ glabel menu_track_select_init /* 08FB8C 8008EF8C 24040018 */ li $a0, 24 /* 08FB90 8008EF90 0C000307 */ jal func_80000C1C /* 08FB94 8008EF94 00000000 */ nop -/* 08FB98 8008EF98 0C0002CD */ jal func_80000B34 +/* 08FB98 8008EF98 0C0002CD */ jal play_music /* 08FB9C 8008EF9C 24040018 */ li $a0, 24 /* 08FBA0 8008EFA0 92040003 */ lbu $a0, 3($s0) -/* 08FBA4 8008EFA4 0C000664 */ jal musicSetRelativeVolume +/* 08FBA4 8008EFA4 0C000664 */ jal set_relative_volume_for_music /* 08FBA8 8008EFA8 00000000 */ nop /* 08FBAC 8008EFAC 0C0002C6 */ jal func_80000B18 /* 08FBB0 8008EFB0 00000000 */ nop @@ -541,11 +541,11 @@ glabel menu_track_select_init /* 08FBBC 8008EFBC 3C0C800E */ lui $t4, %hi(D_800E0418) # $t4, 0x800e /* 08FBC0 8008EFC0 8D8C0418 */ lw $t4, %lo(D_800E0418)($t4) /* 08FBC4 8008EFC4 3C01800E */ lui $at, %hi(gIsInAdventureTwo) # $at, 0x800e -/* 08FBC8 8008EFC8 3C0B800E */ lui $t3, %hi(D_800E0410) # $t3, 0x800e -/* 08FBCC 8008EFCC 8D6B0410 */ lw $t3, %lo(D_800E0410)($t3) +/* 08FBC8 8008EFC8 3C0B800E */ lui $t3, %hi(gMultiplayerSelectedNumberOfRacers) # $t3, 0x800e +/* 08FBCC 8008EFCC 8D6B0410 */ lw $t3, %lo(gMultiplayerSelectedNumberOfRacers)($t3) /* 08FBD0 8008EFD0 8FBF0044 */ lw $ra, 0x44($sp) /* 08FBD4 8008EFD4 AC2CF494 */ sw $t4, %lo(gIsInAdventureTwo)($at) -/* 08FBD8 8008EFD8 3C018012 */ lui $at, %hi(D_80126548) # $at, 0x8012 +/* 08FBD8 8008EFD8 3C018012 */ lui $at, %hi(gMultiplayerSelectedNumberOfRacersCopy) # $at, 0x8012 /* 08FBDC 8008EFDC 8FB00020 */ lw $s0, 0x20($sp) /* 08FBE0 8008EFE0 8FB10024 */ lw $s1, 0x24($sp) /* 08FBE4 8008EFE4 8FB20028 */ lw $s2, 0x28($sp) @@ -557,5 +557,5 @@ glabel menu_track_select_init /* 08FBFC 8008EFFC 8FBE0040 */ lw $fp, 0x40($sp) /* 08FC00 8008F000 27BD0080 */ addiu $sp, $sp, 0x80 /* 08FC04 8008F004 03E00008 */ jr $ra -/* 08FC08 8008F008 AC2B6548 */ sw $t3, %lo(D_80126548)($at) +/* 08FC08 8008F008 AC2B6548 */ sw $t3, %lo(gMultiplayerSelectedNumberOfRacersCopy)($at) diff --git a/asm/non_matchings/menu/menu_track_select_loop.s b/asm/non_matchings/menu/menu_track_select_loop.s index 78d77834..4f38c94e 100644 --- a/asm/non_matchings/menu/menu_track_select_loop.s +++ b/asm/non_matchings/menu/menu_track_select_loop.s @@ -13,8 +13,8 @@ glabel menu_track_select_loop /* 08FE60 8008F260 0C031CF8 */ jal func_800C73E0 /* 08FE64 8008F264 AC790000 */ sw $t9, ($v1) /* 08FE68 8008F268 14400011 */ bnez $v0, .L8008F2B0 -/* 08FE6C 8008F26C 3C03800E */ lui $v1, %hi(D_800DF47C) # $v1, 0x800e -/* 08FE70 8008F270 2463F47C */ addiu $v1, %lo(D_800DF47C) # addiu $v1, $v1, -0xb84 +/* 08FE6C 8008F26C 3C03800E */ lui $v1, %hi(gMenuDelay) # $v1, 0x800e +/* 08FE70 8008F270 2463F47C */ addiu $v1, %lo(gMenuDelay) # addiu $v1, $v1, -0xb84 /* 08FE74 8008F274 8C620000 */ lw $v0, ($v1) /* 08FE78 8008F278 00000000 */ nop /* 08FE7C 8008F27C 1040000C */ beqz $v0, .L8008F2B0 @@ -81,7 +81,7 @@ glabel menu_track_select_loop /* 08FF5C 8008F35C 8FAF0020 */ lw $t7, 0x20($sp) /* 08FF60 8008F360 04410005 */ bgez $v0, .L8008F378 /* 08FF64 8008F364 000FC040 */ sll $t8, $t7, 1 -/* 08FF68 8008F368 0C000664 */ jal musicSetRelativeVolume +/* 08FF68 8008F368 0C000664 */ jal set_relative_volume_for_music /* 08FF6C 8008F36C 00002025 */ move $a0, $zero /* 08FF70 8008F370 1000000A */ b .L8008F39C /* 08FF74 8008F374 00000000 */ nop @@ -94,7 +94,7 @@ glabel menu_track_select_loop /* 08FF8C 8008F38C 24020050 */ li $v0, 80 /* 08FF90 8008F390 AC620000 */ sw $v0, ($v1) .L8008F394: -/* 08FF94 8008F394 0C000664 */ jal musicSetRelativeVolume +/* 08FF94 8008F394 0C000664 */ jal set_relative_volume_for_music /* 08FF98 8008F398 304400FF */ andi $a0, $v0, 0xff .L8008F39C: /* 08FF9C 8008F39C 3C028012 */ lui $v0, %hi(D_801267D0) # $v0, 0x8012 @@ -104,8 +104,8 @@ glabel menu_track_select_loop /* 08FFAC 8008F3AC 28410002 */ slti $at, $v0, 2 /* 08FFB0 8008F3B0 0C023D4D */ jal func_8008F534 /* 08FFB4 8008F3B4 00000000 */ nop -/* 08FFB8 8008F3B8 3C02800E */ lui $v0, %hi(D_800DF4BC) # $v0, 0x800e -/* 08FFBC 8008F3BC 8C42F4BC */ lw $v0, %lo(D_800DF4BC)($v0) +/* 08FFB8 8008F3B8 3C02800E */ lui $v0, %hi(gNumberOfActivePlayers) # $v0, 0x800e +/* 08FFBC 8008F3BC 8C42F4BC */ lw $v0, %lo(gNumberOfActivePlayers)($v0) /* 08FFC0 8008F3C0 3C01800E */ lui $at, %hi(D_800DF478) # $at, 0x800e /* 08FFC4 8008F3C4 AC20F478 */ sw $zero, %lo(D_800DF478)($at) /* 08FFC8 8008F3C8 28410003 */ slti $at, $v0, 3 @@ -158,10 +158,10 @@ glabel menu_track_select_loop /* 09006C 8008F46C 00001025 */ move $v0, $zero /* 090070 8008F470 0C023D4D */ jal func_8008F534 /* 090074 8008F474 00000000 */ nop -/* 090078 8008F478 3C0C800E */ lui $t4, %hi(D_800E0410) # $t4, 0x800e -/* 09007C 8008F47C 3C0D8012 */ lui $t5, %hi(D_80126548) # $t5, 0x8012 -/* 090080 8008F480 8DAD6548 */ lw $t5, %lo(D_80126548)($t5) -/* 090084 8008F484 8D8C0410 */ lw $t4, %lo(D_800E0410)($t4) +/* 090078 8008F478 3C0C800E */ lui $t4, %hi(gMultiplayerSelectedNumberOfRacers) # $t4, 0x800e +/* 09007C 8008F47C 3C0D8012 */ lui $t5, %hi(gMultiplayerSelectedNumberOfRacersCopy) # $t5, 0x8012 +/* 090080 8008F480 8DAD6548 */ lw $t5, %lo(gMultiplayerSelectedNumberOfRacersCopy)($t5) +/* 090084 8008F484 8D8C0410 */ lw $t4, %lo(gMultiplayerSelectedNumberOfRacers)($t4) /* 090088 8008F488 00003025 */ move $a2, $zero /* 09008C 8008F48C 118D000D */ beq $t4, $t5, .L8008F4C4 /* 090090 8008F490 3C198012 */ lui $t9, %hi(D_801269C8) # $t9, 0x8012 @@ -183,10 +183,10 @@ glabel menu_track_select_loop /* 0900C8 8008F4C8 24010004 */ li $at, 4 /* 0900CC 8008F4CC 13210007 */ beq $t9, $at, .L8008F4EC /* 0900D0 8008F4D0 3C098012 */ lui $t1, %hi(D_801269CC) # $t1, 0x8012 -/* 0900D4 8008F4D4 3C02800E */ lui $v0, %hi(D_800DF4BC) # $v0, 0x800e +/* 0900D4 8008F4D4 3C02800E */ lui $v0, %hi(gNumberOfActivePlayers) # $v0, 0x800e /* 0900D8 8008F4D8 24080001 */ li $t0, 1 /* 0900DC 8008F4DC 3C01800E */ lui $at, %hi(D_800DF478) # $at, 0x800e -/* 0900E0 8008F4E0 8C42F4BC */ lw $v0, %lo(D_800DF4BC)($v0) +/* 0900E0 8008F4E0 8C42F4BC */ lw $v0, %lo(gNumberOfActivePlayers)($v0) /* 0900E4 8008F4E4 1000000F */ b .L8008F524 /* 0900E8 8008F4E8 AC28F478 */ sw $t0, %lo(D_800DF478)($at) .L8008F4EC: @@ -203,8 +203,8 @@ glabel menu_track_select_loop /* 090114 8008F514 10000003 */ b .L8008F524 /* 090118 8008F518 00001025 */ move $v0, $zero .L8008F51C: -/* 09011C 8008F51C 3C018012 */ lui $at, %hi(D_801263C4) # $at, 0x8012 -/* 090120 8008F520 AC2063C4 */ sw $zero, %lo(D_801263C4)($at) +/* 09011C 8008F51C 3C018012 */ lui $at, %hi(gIgnorePlayerInput) # $at, 0x8012 +/* 090120 8008F520 AC2063C4 */ sw $zero, %lo(gIgnorePlayerInput)($at) .L8008F524: /* 090124 8008F524 8FBF0014 */ lw $ra, 0x14($sp) /* 090128 8008F528 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/non_matchings/menu/menu_trophy_race_rankings_init.s b/asm/non_matchings/menu/menu_trophy_race_rankings_init.s index 07b2a483..5a71003f 100644 --- a/asm/non_matchings/menu/menu_trophy_race_rankings_init.s +++ b/asm/non_matchings/menu/menu_trophy_race_rankings_init.s @@ -8,13 +8,13 @@ glabel menu_trophy_race_rankings_init /* 09963C 80098A3C AFA20040 */ sw $v0, 0x40($sp) /* 099640 80098A40 3C018012 */ lui $at, %hi(D_801263E0) # $at, 0x8012 /* 099644 80098A44 AC2063E0 */ sw $zero, %lo(D_801263E0)($at) -/* 099648 80098A48 3C01800E */ lui $at, %hi(D_800DF47C) # $at, 0x800e -/* 09964C 80098A4C AC20F47C */ sw $zero, %lo(D_800DF47C)($at) +/* 099648 80098A48 3C01800E */ lui $at, %hi(gMenuDelay) # $at, 0x800e +/* 09964C 80098A4C AC20F47C */ sw $zero, %lo(gMenuDelay)($at) /* 099650 80098A50 3C018012 */ lui $at, %hi(D_801263BC) # $at, 0x8012 /* 099654 80098A54 AC2063BC */ sw $zero, %lo(D_801263BC)($at) /* 099658 80098A58 3C018012 */ lui $at, %hi(D_801263D8) # $at, 0x8012 /* 09965C 80098A5C AC2063D8 */ sw $zero, %lo(D_801263D8)($at) -/* 099660 80098A60 0C026F97 */ jal func_8009BE5C +/* 099660 80098A60 0C026F97 */ jal reset_controller_sticks /* 099664 80098A64 AFA2003C */ sw $v0, 0x3c($sp) /* 099668 80098A68 3C04800E */ lui $a0, %hi(D_800E1024) # $a0, 0x800e /* 09966C 80098A6C 0C02719D */ jal func_8009C674 @@ -79,8 +79,8 @@ glabel menu_trophy_race_rankings_init /* 099748 80098B48 AC206A68 */ sw $zero, %lo(D_80126A68)($at) /* 09974C 80098B4C 0C025181 */ jal func_80094604 /* 099750 80098B50 AFA90040 */ sw $t1, 0x40($sp) -/* 099754 80098B54 3C0B800E */ lui $t3, %hi(D_800DF4BC) # $t3, 0x800e -/* 099758 80098B58 256BF4BC */ addiu $t3, %lo(D_800DF4BC) # addiu $t3, $t3, -0xb44 +/* 099754 80098B54 3C0B800E */ lui $t3, %hi(gNumberOfActivePlayers) # $t3, 0x800e +/* 099758 80098B58 256BF4BC */ addiu $t3, %lo(gNumberOfActivePlayers) # addiu $t3, $t3, -0xb44 /* 09975C 80098B5C 8D620000 */ lw $v0, ($t3) /* 099760 80098B60 8FA90040 */ lw $t1, 0x40($sp) /* 099764 80098B64 28410003 */ slti $at, $v0, 3 @@ -96,17 +96,17 @@ glabel menu_trophy_race_rankings_init /* 099788 80098B88 0C027B20 */ jal is_in_two_player_adventure /* 09978C 80098B8C AFA90040 */ sw $t1, 0x40($sp) /* 099790 80098B90 8FA90040 */ lw $t1, 0x40($sp) -/* 099794 80098B94 3C0B800E */ lui $t3, %hi(D_800DF4BC) # $t3, 0x800e +/* 099794 80098B94 3C0B800E */ lui $t3, %hi(gNumberOfActivePlayers) # $t3, 0x800e /* 099798 80098B98 1040000A */ beqz $v0, .L80098BC4 -/* 09979C 80098B9C 256BF4BC */ addiu $t3, %lo(D_800DF4BC) # addiu $t3, $t3, -0xb44 +/* 09979C 80098B9C 256BF4BC */ addiu $t3, %lo(gNumberOfActivePlayers) # addiu $t3, $t3, -0xb44 .L80098BA0: -/* 0997A0 80098BA0 0C027110 */ jal func_8009C440 +/* 0997A0 80098BA0 0C027110 */ jal get_multiplayer_racer_count /* 0997A4 80098BA4 AFA90040 */ sw $t1, 0x40($sp) /* 0997A8 80098BA8 3C0C800E */ lui $t4, %hi(D_800E0FE4) # $t4, 0x800e /* 0997AC 80098BAC 258C0FE4 */ addiu $t4, %lo(D_800E0FE4) # addiu $t4, $t4, 0xfe4 /* 0997B0 80098BB0 8FA90040 */ lw $t1, 0x40($sp) -/* 0997B4 80098BB4 3C0B800E */ lui $t3, %hi(D_800DF4BC) # $t3, 0x800e -/* 0997B8 80098BB8 256BF4BC */ addiu $t3, %lo(D_800DF4BC) # addiu $t3, $t3, -0xb44 +/* 0997B4 80098BB4 3C0B800E */ lui $t3, %hi(gNumberOfActivePlayers) # $t3, 0x800e +/* 0997B8 80098BB8 256BF4BC */ addiu $t3, %lo(gNumberOfActivePlayers) # addiu $t3, $t3, -0xb44 /* 0997BC 80098BBC 10000005 */ b .L80098BD4 /* 0997C0 80098BC0 AD820000 */ sw $v0, ($t4) .L80098BC4: @@ -156,8 +156,8 @@ glabel menu_trophy_race_rankings_init /* 099854 80098C54 3C188012 */ lui $t8, %hi(D_801263F8) # $t8, 0x8012 /* 099858 80098C58 270263F8 */ addiu $v0, $t8, %lo(D_801263F8) /* 09985C 80098C5C 0005C880 */ sll $t9, $a1, 2 -/* 099860 80098C60 3C04800E */ lui $a0, %hi(D_800E1004) # $a0, 0x800e -/* 099864 80098C64 24841004 */ addiu $a0, %lo(D_800E1004) # addiu $a0, $a0, 0x1004 +/* 099860 80098C60 3C04800E */ lui $a0, %hi(gTrophyRacePointsArray) # $a0, 0x800e +/* 099864 80098C64 24841004 */ addiu $a0, %lo(gTrophyRacePointsArray) # addiu $a0, $a0, 0x1004 /* 099868 80098C68 03223021 */ addu $a2, $t9, $v0 /* 09986C 80098C6C 01201825 */ move $v1, $t1 .L80098C70: @@ -266,10 +266,10 @@ glabel menu_trophy_race_rankings_init .L80098DE0: /* 0999E0 80098DE0 0C027B20 */ jal is_in_two_player_adventure /* 0999E4 80098DE4 00000000 */ nop -/* 0999E8 80098DE8 3C0B800E */ lui $t3, %hi(D_800DF4BC) # $t3, 0x800e +/* 0999E8 80098DE8 3C0B800E */ lui $t3, %hi(gNumberOfActivePlayers) # $t3, 0x800e /* 0999EC 80098DEC 3C0C800E */ lui $t4, %hi(D_800E0FE4) # $t4, 0x800e /* 0999F0 80098DF0 258C0FE4 */ addiu $t4, %lo(D_800E0FE4) # addiu $t4, $t4, 0xfe4 -/* 0999F4 80098DF4 256BF4BC */ addiu $t3, %lo(D_800DF4BC) # addiu $t3, $t3, -0xb44 +/* 0999F4 80098DF4 256BF4BC */ addiu $t3, %lo(gNumberOfActivePlayers) # addiu $t3, $t3, -0xb44 /* 0999F8 80098DF8 10400003 */ beqz $v0, .L80098E08 /* 0999FC 80098DFC 240A0001 */ li $t2, 1 /* 099A00 80098E00 10000003 */ b .L80098E10 @@ -305,7 +305,7 @@ glabel menu_trophy_race_rankings_init /* 099A60 80098E60 24040002 */ li $a0, 2 /* 099A64 80098E64 0C0002F8 */ jal func_80000BE0 /* 099A68 80098E68 24040018 */ li $a0, 24 -/* 099A6C 80098E6C 0C0002CD */ jal func_80000B34 +/* 099A6C 80098E6C 0C0002CD */ jal play_music /* 099A70 80098E70 24040018 */ li $a0, 24 /* 099A74 80098E74 0C000326 */ jal func_80000C98 /* 099A78 80098E78 24040100 */ li $a0, 256 diff --git a/asm/non_matchings/menu/menu_trophy_race_rankings_loop.s b/asm/non_matchings/menu/menu_trophy_race_rankings_loop.s index 77a1db0d..1d148431 100644 --- a/asm/non_matchings/menu/menu_trophy_race_rankings_loop.s +++ b/asm/non_matchings/menu/menu_trophy_race_rankings_loop.s @@ -4,8 +4,8 @@ glabel menu_trophy_race_rankings_loop /* 099BDC 80098FDC AFA40050 */ sw $a0, 0x50($sp) /* 099BE0 80098FE0 0C01BAA4 */ jal get_settings /* 099BE4 80098FE4 AFA0003C */ sw $zero, 0x3c($sp) -/* 099BE8 80098FE8 3C05800E */ lui $a1, %hi(D_800DF47C) # $a1, 0x800e -/* 099BEC 80098FEC 24A5F47C */ addiu $a1, %lo(D_800DF47C) # addiu $a1, $a1, -0xb84 +/* 099BE8 80098FE8 3C05800E */ lui $a1, %hi(gMenuDelay) # $a1, 0x800e +/* 099BEC 80098FEC 24A5F47C */ addiu $a1, %lo(gMenuDelay) # addiu $a1, $a1, -0xb84 /* 099BF0 80098FF0 8CA30000 */ lw $v1, ($a1) /* 099BF4 80098FF4 8FA40050 */ lw $a0, 0x50($sp) /* 099BF8 80098FF8 2861FFED */ slti $at, $v1, -0x13 @@ -24,10 +24,10 @@ glabel menu_trophy_race_rankings_loop /* 099C28 80099028 3C028012 */ lui $v0, %hi(D_801263E0) # $v0, 0x8012 /* 099C2C 8009902C 8C4263E0 */ lw $v0, %lo(D_801263E0)($v0) /* 099C30 80099030 8FA40050 */ lw $a0, 0x50($sp) -/* 099C34 80099034 3C05800E */ lui $a1, %hi(D_800DF47C) # $a1, 0x800e +/* 099C34 80099034 3C05800E */ lui $a1, %hi(gMenuDelay) # $a1, 0x800e /* 099C38 80099038 8FAB002C */ lw $t3, 0x2c($sp) /* 099C3C 8009903C 1040000B */ beqz $v0, .L8009906C -/* 099C40 80099040 24A5F47C */ addiu $a1, %lo(D_800DF47C) # addiu $a1, $a1, -0xb84 +/* 099C40 80099040 24A5F47C */ addiu $a1, %lo(gMenuDelay) # addiu $a1, $a1, -0xb84 /* 099C44 80099044 24010001 */ li $at, 1 /* 099C48 80099048 1041001B */ beq $v0, $at, .L800990B8 /* 099C4C 8009904C 24010002 */ li $at, 2 @@ -123,21 +123,21 @@ glabel menu_trophy_race_rankings_loop .L8009919C: /* 099D9C 8009919C 3C068012 */ lui $a2, %hi(D_80126A68) # $a2, 0x8012 /* 099DA0 800991A0 24C66A68 */ addiu $a2, %lo(D_80126A68) # addiu $a2, $a2, 0x6a68 -/* 099DA4 800991A4 3C0D800E */ lui $t5, %hi(D_800DF4BC) # $t5, 0x800e +/* 099DA4 800991A4 3C0D800E */ lui $t5, %hi(gNumberOfActivePlayers) # $t5, 0x800e /* 099DA8 800991A8 8CC20000 */ lw $v0, ($a2) -/* 099DAC 800991AC 8DADF4BC */ lw $t5, %lo(D_800DF4BC)($t5) +/* 099DAC 800991AC 8DADF4BC */ lw $t5, %lo(gNumberOfActivePlayers)($t5) /* 099DB0 800991B0 00004025 */ move $t0, $zero /* 099DB4 800991B4 00002825 */ move $a1, $zero /* 099DB8 800991B8 19A00023 */ blez $t5, .L80099248 /* 099DBC 800991BC AFA20040 */ sw $v0, 0x40($sp) -/* 099DC0 800991C0 3C078012 */ lui $a3, %hi(D_80126464) # $a3, 0x8012 -/* 099DC4 800991C4 24E76464 */ addiu $a3, %lo(D_80126464) # addiu $a3, $a3, 0x6464 +/* 099DC0 800991C0 3C078012 */ lui $a3, %hi(gControllersYAxisDirection) # $a3, 0x8012 +/* 099DC4 800991C4 24E76464 */ addiu $a3, %lo(gControllersYAxisDirection) # addiu $a3, $a3, 0x6464 .L800991C8: /* 099DC8 800991C8 00A02025 */ move $a0, $a1 /* 099DCC 800991CC AFA5004C */ sw $a1, 0x4c($sp) /* 099DD0 800991D0 AFA70020 */ sw $a3, 0x20($sp) /* 099DD4 800991D4 AFA80044 */ sw $t0, 0x44($sp) -/* 099DD8 800991D8 0C01A955 */ jal func_8006A554 +/* 099DD8 800991D8 0C01A955 */ jal get_button_inputs_from_player /* 099DDC 800991DC AFAB002C */ sw $t3, 0x2c($sp) /* 099DE0 800991E0 8FA70020 */ lw $a3, 0x20($sp) /* 099DE4 800991E4 8FA80044 */ lw $t0, 0x44($sp) @@ -154,13 +154,13 @@ glabel menu_trophy_race_rankings_loop /* 099E10 80099210 ACCF0000 */ sw $t7, ($a2) .L80099214: /* 099E14 80099214 18600005 */ blez $v1, .L8009922C -/* 099E18 80099218 3C0D800E */ lui $t5, %hi(D_800DF4BC) # $t5, 0x800e +/* 099E18 80099218 3C0D800E */ lui $t5, %hi(gNumberOfActivePlayers) # $t5, 0x800e /* 099E1C 8009921C 8CD80000 */ lw $t8, ($a2) /* 099E20 80099220 00000000 */ nop /* 099E24 80099224 2719FFFF */ addiu $t9, $t8, -1 /* 099E28 80099228 ACD90000 */ sw $t9, ($a2) .L8009922C: -/* 099E2C 8009922C 8DADF4BC */ lw $t5, %lo(D_800DF4BC)($t5) +/* 099E2C 8009922C 8DADF4BC */ lw $t5, %lo(gNumberOfActivePlayers)($t5) /* 099E30 80099230 24A50001 */ addiu $a1, $a1, 1 /* 099E34 80099234 00AD082A */ slt $at, $a1, $t5 /* 099E38 80099238 1420FFE3 */ bnez $at, .L800991C8 @@ -301,8 +301,8 @@ glabel menu_trophy_race_rankings_loop /* 09A02C 8009942C 24C60001 */ addiu $a2, $a2, 1 /* 09A030 80099430 AFAC0034 */ sw $t4, 0x34($sp) .L80099434: -/* 09A034 80099434 3C0F800E */ lui $t7, %hi(D_800DF4BC) # $t7, 0x800e -/* 09A038 80099438 8DEFF4BC */ lw $t7, %lo(D_800DF4BC)($t7) +/* 09A034 80099434 3C0F800E */ lui $t7, %hi(gNumberOfActivePlayers) # $t7, 0x800e +/* 09A038 80099438 8DEFF4BC */ lw $t7, %lo(gNumberOfActivePlayers)($t7) /* 09A03C 8009943C 3C0A8012 */ lui $t2, %hi(D_80126438) # $t2, 0x8012 /* 09A040 80099440 8FAC0034 */ lw $t4, 0x34($sp) /* 09A044 80099444 24010001 */ li $at, 1 @@ -323,8 +323,8 @@ glabel menu_trophy_race_rankings_loop /* 09A07C 8009947C 2418FFFF */ li $t8, -1 /* 09A080 80099480 0143C821 */ addu $t9, $t2, $v1 /* 09A084 80099484 A3380000 */ sb $t8, ($t9) -/* 09A088 80099488 3C0D800E */ lui $t5, %hi(D_800DF4B8) # $t5, 0x800e -/* 09A08C 8009948C 8DADF4B8 */ lw $t5, %lo(D_800DF4B8)($t5) +/* 09A088 80099488 3C0D800E */ lui $t5, %hi(gIsInTracksMode) # $t5, 0x800e +/* 09A08C 8009948C 8DADF4B8 */ lw $t5, %lo(gIsInTracksMode)($t5) /* 09A090 80099490 24010001 */ li $at, 1 /* 09A094 80099494 15A1000C */ bne $t5, $at, .L800994C8 /* 09A098 80099498 240F0001 */ li $t7, 1 @@ -419,9 +419,9 @@ glabel menu_trophy_race_rankings_loop .L800995E8: /* 09A1E8 800995E8 8FBF001C */ lw $ra, 0x1c($sp) .L800995EC: -/* 09A1EC 800995EC 3C018012 */ lui $at, %hi(D_801263C4) # $at, 0x8012 +/* 09A1EC 800995EC 3C018012 */ lui $at, %hi(gIgnorePlayerInput) # $at, 0x8012 /* 09A1F0 800995F0 8FA2003C */ lw $v0, 0x3c($sp) -/* 09A1F4 800995F4 AC2063C4 */ sw $zero, %lo(D_801263C4)($at) +/* 09A1F4 800995F4 AC2063C4 */ sw $zero, %lo(gIgnorePlayerInput)($at) /* 09A1F8 800995F8 03E00008 */ jr $ra /* 09A1FC 800995FC 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/non_matchings/menu/menu_trophy_race_round_init.s b/asm/non_matchings/menu/menu_trophy_race_round_init.s index 37129511..02fd211e 100644 --- a/asm/non_matchings/menu/menu_trophy_race_round_init.s +++ b/asm/non_matchings/menu/menu_trophy_race_round_init.s @@ -13,7 +13,7 @@ glabel menu_trophy_race_round_init /* 098E98 80098298 8C630FEC */ lw $v1, %lo(D_800E0FEC)($v1) /* 098E9C 8009829C 3C0E800E */ lui $t6, %hi(gTrophyRaceWorldId) # $t6, 0x800e /* 098EA0 800982A0 1460000E */ bnez $v1, .L800982DC -/* 098EA4 800982A4 3C13800E */ lui $s3, %hi(D_800DF4BC) # $s3, 0x800e +/* 098EA4 800982A4 3C13800E */ lui $s3, %hi(gNumberOfActivePlayers) # $s3, 0x800e /* 098EA8 800982A8 00008025 */ move $s0, $zero /* 098EAC 800982AC 02201825 */ move $v1, $s1 /* 098EB0 800982B0 24040008 */ li $a0, 8 @@ -30,7 +30,7 @@ glabel menu_trophy_race_round_init /* 098ED8 800982D8 00000000 */ nop .L800982DC: /* 098EDC 800982DC 8DCE0FE8 */ lw $t6, %lo(gTrophyRaceWorldId)($t6) -/* 098EE0 800982E0 2673F4BC */ addiu $s3, %lo(D_800DF4BC) # addiu $s3, $s3, -0xb44 +/* 098EE0 800982E0 2673F4BC */ addiu $s3, %lo(gNumberOfActivePlayers) # addiu $s3, $s3, -0xb44 /* 098EE4 800982E4 000E7880 */ sll $t7, $t6, 2 /* 098EE8 800982E8 01EE7823 */ subu $t7, $t7, $t6 /* 098EEC 800982EC 000F7840 */ sll $t7, $t7, 1 @@ -70,8 +70,8 @@ glabel menu_trophy_race_round_init /* 098F64 80098364 2405FFFF */ li $a1, -1 /* 098F68 80098368 0C01B8BA */ jal func_8006E2E8 /* 098F6C 8009836C 24060001 */ li $a2, 1 -/* 098F70 80098370 3C01800E */ lui $at, %hi(D_800DF47C) # $at, 0x800e -/* 098F74 80098374 AC20F47C */ sw $zero, %lo(D_800DF47C)($at) +/* 098F70 80098370 3C01800E */ lui $at, %hi(gMenuDelay) # $at, 0x800e +/* 098F74 80098374 AC20F47C */ sw $zero, %lo(gMenuDelay)($at) /* 098F78 80098378 3C01800E */ lui $at, %hi(D_800E0980) # $at, 0x800e /* 098F7C 8009837C 240B000A */ li $t3, 10 /* 098F80 80098380 AC2B0980 */ sw $t3, %lo(D_800E0980)($at) @@ -79,7 +79,7 @@ glabel menu_trophy_race_round_init /* 098F88 80098388 24040002 */ li $a0, 2 /* 098F8C 8009838C 0C0002F8 */ jal func_80000BE0 /* 098F90 80098390 24040018 */ li $a0, 24 -/* 098F94 80098394 0C0002CD */ jal func_80000B34 +/* 098F94 80098394 0C0002CD */ jal play_music /* 098F98 80098398 24040018 */ li $a0, 24 /* 098F9C 8009839C 0C000326 */ jal func_80000C98 /* 098FA0 800983A0 24040100 */ li $a0, 256 diff --git a/asm/non_matchings/menu/menu_trophy_race_round_loop.s b/asm/non_matchings/menu/menu_trophy_race_round_loop.s index 477f101d..bf06c161 100644 --- a/asm/non_matchings/menu/menu_trophy_race_round_loop.s +++ b/asm/non_matchings/menu/menu_trophy_race_round_loop.s @@ -37,8 +37,8 @@ glabel menu_trophy_race_round_loop .L80098628: /* 099228 80098628 ACE00000 */ sw $zero, ($a3) .L8009862C: -/* 09922C 8009862C 3C03800E */ lui $v1, %hi(D_800DF47C) # $v1, 0x800e -/* 099230 80098630 2463F47C */ addiu $v1, %lo(D_800DF47C) # addiu $v1, $v1, -0xb84 +/* 09922C 8009862C 3C03800E */ lui $v1, %hi(gMenuDelay) # $v1, 0x800e +/* 099230 80098630 2463F47C */ addiu $v1, %lo(gMenuDelay) # addiu $v1, $v1, -0xb84 /* 099234 80098634 8C620000 */ lw $v0, ($v1) /* 099238 80098638 8FAD0020 */ lw $t5, 0x20($sp) /* 09923C 8009863C 10400003 */ beqz $v0, .L8009864C @@ -52,11 +52,11 @@ glabel menu_trophy_race_round_loop /* 099258 80098658 8FA40020 */ lw $a0, 0x20($sp) /* 09925C 8009865C 0C0260F0 */ jal func_800983C0 /* 099260 80098660 00000000 */ nop -/* 099264 80098664 3C03800E */ lui $v1, %hi(D_800DF47C) # $v1, 0x800e -/* 099268 80098668 2463F47C */ addiu $v1, %lo(D_800DF47C) # addiu $v1, $v1, -0xb84 +/* 099264 80098664 3C03800E */ lui $v1, %hi(gMenuDelay) # $v1, 0x800e +/* 099268 80098668 2463F47C */ addiu $v1, %lo(gMenuDelay) # addiu $v1, $v1, -0xb84 .L8009866C: -/* 09926C 8009866C 3C0F8012 */ lui $t7, %hi(D_801263C4) # $t7, 0x8012 -/* 099270 80098670 8DEF63C4 */ lw $t7, %lo(D_801263C4)($t7) +/* 09926C 8009866C 3C0F8012 */ lui $t7, %hi(gIgnorePlayerInput) # $t7, 0x8012 +/* 099270 80098670 8DEF63C4 */ lw $t7, %lo(gIgnorePlayerInput)($t7) /* 099274 80098674 00000000 */ nop /* 099278 80098678 15E00014 */ bnez $t7, .L800986CC /* 09927C 8009867C 00000000 */ nop @@ -75,13 +75,13 @@ glabel menu_trophy_race_round_loop /* 0992B0 800986B0 0C030076 */ jal func_800C01D8 /* 0992B4 800986B4 2484F774 */ addiu $a0, %lo(D_800DF774) # addiu $a0, $a0, -0x88c /* 0992B8 800986B8 24090001 */ li $t1, 1 -/* 0992BC 800986BC 3C01800E */ lui $at, %hi(D_800DF47C) # $at, 0x800e -/* 0992C0 800986C0 AC29F47C */ sw $t1, %lo(D_800DF47C)($at) +/* 0992BC 800986BC 3C01800E */ lui $at, %hi(gMenuDelay) # $at, 0x800e +/* 0992C0 800986C0 AC29F47C */ sw $t1, %lo(gMenuDelay)($at) /* 0992C4 800986C4 0C000326 */ jal func_80000C98 /* 0992C8 800986C8 2404FF80 */ li $a0, -128 .L800986CC: -/* 0992CC 800986CC 3C03800E */ lui $v1, %hi(D_800DF47C) # $v1, 0x800e -/* 0992D0 800986D0 2463F47C */ addiu $v1, %lo(D_800DF47C) # addiu $v1, $v1, -0xb84 +/* 0992CC 800986CC 3C03800E */ lui $v1, %hi(gMenuDelay) # $v1, 0x800e +/* 0992D0 800986D0 2463F47C */ addiu $v1, %lo(gMenuDelay) # addiu $v1, $v1, -0xb84 /* 0992D4 800986D4 8C6A0000 */ lw $t2, ($v1) /* 0992D8 800986D8 00001025 */ move $v0, $zero /* 0992DC 800986DC 2941001F */ slti $at, $t2, 0x1f @@ -100,17 +100,17 @@ glabel menu_trophy_race_round_loop /* 099310 80098710 018D7021 */ addu $t6, $t4, $t5 /* 099314 80098714 01CFC021 */ addu $t8, $t6, $t7 /* 099318 80098718 8319FFFA */ lb $t9, -6($t8) -/* 09931C 8009871C 3C01800E */ lui $at, %hi(D_800DF4D4) # $at, 0x800e -/* 099320 80098720 3C02800E */ lui $v0, %hi(D_800DF4BC) # $v0, 0x800e -/* 099324 80098724 AC39F4D4 */ sw $t9, %lo(D_800DF4D4)($at) +/* 09931C 8009871C 3C01800E */ lui $at, %hi(gTrackIdToLoad) # $at, 0x800e +/* 099320 80098720 3C02800E */ lui $v0, %hi(gNumberOfActivePlayers) # $v0, 0x800e +/* 099324 80098724 AC39F4D4 */ sw $t9, %lo(gTrackIdToLoad)($at) /* 099328 80098728 3C01800E */ lui $at, %hi(D_800DF478) # $at, 0x800e /* 09932C 8009872C 24080001 */ li $t0, 1 -/* 099330 80098730 8C42F4BC */ lw $v0, %lo(D_800DF4BC)($v0) +/* 099330 80098730 8C42F4BC */ lw $v0, %lo(gNumberOfActivePlayers)($v0) /* 099334 80098734 10000003 */ b .L80098744 /* 099338 80098738 AC28F478 */ sw $t0, %lo(D_800DF478)($at) .L8009873C: -/* 09933C 8009873C 3C018012 */ lui $at, %hi(D_801263C4) # $at, 0x8012 -/* 099340 80098740 AC2063C4 */ sw $zero, %lo(D_801263C4)($at) +/* 09933C 8009873C 3C018012 */ lui $at, %hi(gIgnorePlayerInput) # $at, 0x8012 +/* 099340 80098740 AC2063C4 */ sw $zero, %lo(gIgnorePlayerInput)($at) .L80098744: /* 099344 80098744 8FBF0014 */ lw $ra, 0x14($sp) /* 099348 80098748 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/non_matchings/unknown_003260/func_80002C00.s b/asm/non_matchings/unknown_003260/func_80002C00.s index d67f7b00..3ee7a3fe 100644 --- a/asm/non_matchings/unknown_003260/func_80002C00.s +++ b/asm/non_matchings/unknown_003260/func_80002C00.s @@ -26,7 +26,7 @@ glabel func_80002C00 /* 003860 80002C60 00002025 */ move $a0, $zero /* 003864 80002C64 11E00005 */ beqz $t7, .L80002C7C /* 003868 80002C68 00000000 */ nop -/* 00386C 80002C6C 0C01BE53 */ jal func_8006F94C +/* 00386C 80002C6C 0C01BE53 */ jal get_random_number_from_range /* 003870 80002C70 24052710 */ li $a1, 10000 /* 003874 80002C74 0C032180 */ jal func_800C8600 /* 003878 80002C78 24445622 */ addiu $a0, $v0, 0x5622 diff --git a/asm/non_matchings/unknown_005740/func_800050D0.s b/asm/non_matchings/unknown_005740/func_800050D0.s index 74510cb2..8fb68109 100644 --- a/asm/non_matchings/unknown_005740/func_800050D0.s +++ b/asm/non_matchings/unknown_005740/func_800050D0.s @@ -36,7 +36,7 @@ glabel func_800050D0 /* 005D58 80005158 8D4A9C3C */ lw $t2, %lo(D_80119C3C)($t2) /* 005D5C 8000515C 00000000 */ nop /* 005D60 80005160 85440000 */ lh $a0, ($t2) -/* 005D64 80005164 0C01A955 */ jal func_8006A554 +/* 005D64 80005164 0C01A955 */ jal get_button_inputs_from_player /* 005D68 80005168 AFA20028 */ sw $v0, 0x28($sp) /* 005D6C 8000516C 3C058012 */ lui $a1, %hi(D_80119C38) # $a1, 0x8012 /* 005D70 80005170 8FA60028 */ lw $a2, 0x28($sp) diff --git a/asm/non_matchings/unknown_005740/func_80005254.s b/asm/non_matchings/unknown_005740/func_80005254.s index c6e6aac3..71bfb23a 100644 --- a/asm/non_matchings/unknown_005740/func_80005254.s +++ b/asm/non_matchings/unknown_005740/func_80005254.s @@ -404,7 +404,7 @@ glabel func_80005254 /* 0063BC 800057BC AFAA003C */ sw $t2, 0x3c($sp) /* 0063C0 800057C0 AFAC005C */ sw $t4, 0x5c($sp) /* 0063C4 800057C4 E7AC0074 */ swc1 $f12, 0x74($sp) -/* 0063C8 800057C8 0C01BE53 */ jal func_8006F94C +/* 0063C8 800057C8 0C01BE53 */ jal get_random_number_from_range /* 0063CC 800057CC E7AE0078 */ swc1 $f14, 0x78($sp) /* 0063D0 800057D0 8FA9007C */ lw $t1, 0x7c($sp) /* 0063D4 800057D4 8FAA003C */ lw $t2, 0x3c($sp) @@ -419,7 +419,7 @@ glabel func_80005254 /* 0063F8 800057F8 AFAA003C */ sw $t2, 0x3c($sp) /* 0063FC 800057FC AFAC005C */ sw $t4, 0x5c($sp) /* 006400 80005800 E7AC0074 */ swc1 $f12, 0x74($sp) -/* 006404 80005804 0C01BE53 */ jal func_8006F94C +/* 006404 80005804 0C01BE53 */ jal get_random_number_from_range /* 006408 80005808 E7AE0078 */ swc1 $f14, 0x78($sp) /* 00640C 8000580C 8E270000 */ lw $a3, ($s1) /* 006410 80005810 8FA9007C */ lw $t1, 0x7c($sp) diff --git a/asm/non_matchings/unknown_00BC20/func_8000B020.s b/asm/non_matchings/unknown_00BC20/func_8000B020.s index 2a284a33..9965a3fe 100644 --- a/asm/non_matchings/unknown_00BC20/func_8000B020.s +++ b/asm/non_matchings/unknown_00BC20/func_8000B020.s @@ -86,12 +86,12 @@ glabel func_8000B020 /* 00BD6C 8000B16C AE020078 */ sw $v0, 0x78($s0) /* 00BD70 8000B170 AE02007C */ sw $v0, 0x7c($s0) /* 00BD74 8000B174 00002025 */ move $a0, $zero -/* 00BD78 8000B178 0C01BE53 */ jal func_8006F94C +/* 00BD78 8000B178 0C01BE53 */ jal get_random_number_from_range /* 00BD7C 8000B17C 240500FF */ li $a1, 255 /* 00BD80 8000B180 A2020072 */ sb $v0, 0x72($s0) /* 00BD84 8000B184 A2000073 */ sb $zero, 0x73($s0) /* 00BD88 8000B188 00002025 */ move $a0, $zero -/* 00BD8C 8000B18C 0C01BE53 */ jal func_8006F94C +/* 00BD8C 8000B18C 0C01BE53 */ jal get_random_number_from_range /* 00BD90 8000B190 240500FF */ li $a1, 255 /* 00BD94 8000B194 A2820000 */ sb $v0, ($s4) .L8000B198: @@ -123,11 +123,11 @@ glabel func_8000B020 .L8000B1FC: /* 00BDFC 8000B1FC A2000000 */ sb $zero, ($s0) /* 00BE00 8000B200 00002025 */ move $a0, $zero -/* 00BE04 8000B204 0C01BE53 */ jal func_8006F94C +/* 00BE04 8000B204 0C01BE53 */ jal get_random_number_from_range /* 00BE08 8000B208 240500FF */ li $a1, 255 /* 00BE0C 8000B20C A2020001 */ sb $v0, 1($s0) /* 00BE10 8000B210 00002025 */ move $a0, $zero -/* 00BE14 8000B214 0C01BE53 */ jal func_8006F94C +/* 00BE14 8000B214 0C01BE53 */ jal get_random_number_from_range /* 00BE18 8000B218 240500FF */ li $a1, 255 /* 00BE1C 8000B21C 26100004 */ addiu $s0, $s0, 4 /* 00BE20 8000B220 A202FFFE */ sb $v0, -2($s0) diff --git a/asm/non_matchings/unknown_00BC20/func_8000CC7C.s b/asm/non_matchings/unknown_00BC20/func_8000CC7C.s index 44025344..6a9f5b53 100644 --- a/asm/non_matchings/unknown_00BC20/func_8000CC7C.s +++ b/asm/non_matchings/unknown_00BC20/func_8000CC7C.s @@ -54,16 +54,16 @@ glabel func_8000CC7C /* 00D918 8000CD18 306E0040 */ andi $t6, $v1, 0x40 /* 00D91C 8000CD1C 11C00005 */ beqz $t6, .L8000CD34 .L8000CD20: -/* 00D920 8000CD20 3C148012 */ lui $s4, %hi(D_8011AEF4) # $s4, 0x8012 +/* 00D920 8000CD20 3C148012 */ lui $s4, %hi(gTimeTrialEnabled) # $s4, 0x8012 /* 00D924 8000CD24 3C018012 */ lui $at, %hi(D_8011AEF5) # $at, 0x8012 -/* 00D928 8000CD28 2694AEF4 */ addiu $s4, %lo(D_8011AEF4) # addiu $s4, $s4, -0x510c +/* 00D928 8000CD28 2694AEF4 */ addiu $s4, %lo(gTimeTrialEnabled) # addiu $s4, $s4, -0x510c /* 00D92C 8000CD2C A020AEF5 */ sb $zero, %lo(D_8011AEF5)($at) /* 00D930 8000CD30 A2800000 */ sb $zero, ($s4) .L8000CD34: -/* 00D934 8000CD34 3C148012 */ lui $s4, %hi(D_8011AEF4) # $s4, 0x8012 -/* 00D938 8000CD38 2694AEF4 */ addiu $s4, %lo(D_8011AEF4) # addiu $s4, $s4, -0x510c +/* 00D934 8000CD34 3C148012 */ lui $s4, %hi(gTimeTrialEnabled) # $s4, 0x8012 +/* 00D938 8000CD38 2694AEF4 */ addiu $s4, %lo(gTimeTrialEnabled) # addiu $s4, $s4, -0x510c /* 00D93C 8000CD3C AFAF0130 */ sw $t7, 0x130($sp) -/* 00D940 8000CD40 0C003932 */ jal func_8000E4C8 +/* 00D940 8000CD40 0C003932 */ jal is_time_trial_enabled /* 00D944 8000CD44 AFA40068 */ sw $a0, 0x68($sp) /* 00D948 8000CD48 1040000C */ beqz $v0, .L8000CD7C /* 00D94C 8000CD4C 00000000 */ nop @@ -275,7 +275,7 @@ glabel func_8000CC7C .L8000D058: /* 00DC58 8000D058 15E10006 */ bne $t7, $at, .L8000D074 /* 00DC5C 8000D05C 8FB80064 */ lw $t8, 0x64($sp) -/* 00DC60 8000D060 0C027110 */ jal func_8009C440 +/* 00DC60 8000D060 0C027110 */ jal get_multiplayer_racer_count /* 00DC64 8000D064 00000000 */ nop /* 00DC68 8000D068 3C018012 */ lui $at, %hi(playerCount) # $at, 0x8012 /* 00DC6C 8000D06C AC22AEF0 */ sw $v0, %lo(playerCount)($at) diff --git a/asm/non_matchings/unknown_00BC20/func_80010994.s b/asm/non_matchings/unknown_00BC20/func_80010994.s index e9c8ed1a..43d9753a 100644 --- a/asm/non_matchings/unknown_00BC20/func_80010994.s +++ b/asm/non_matchings/unknown_00BC20/func_80010994.s @@ -487,7 +487,7 @@ glabel func_80010994 /* 011C8C 8001108C 24100004 */ li $s0, 4 .L80011090: /* 011C90 80011090 02602025 */ move $a0, $s3 -/* 011C94 80011094 0C01A955 */ jal func_8006A554 +/* 011C94 80011094 0C01A955 */ jal get_button_inputs_from_player /* 011C98 80011098 AFA50054 */ sw $a1, 0x54($sp) /* 011C9C 8001109C 8FA50054 */ lw $a1, 0x54($sp) /* 011CA0 800110A0 26730001 */ addiu $s3, $s3, 1 diff --git a/asm/non_matchings/unknown_00BC20/func_80019808.s b/asm/non_matchings/unknown_00BC20/func_80019808.s index 56779858..28486c2f 100644 --- a/asm/non_matchings/unknown_00BC20/func_80019808.s +++ b/asm/non_matchings/unknown_00BC20/func_80019808.s @@ -401,7 +401,7 @@ glabel func_80019808 /* 01A9C4 80019DC4 1420FFED */ bnez $at, .L80019D7C /* 01A9C8 80019DC8 24840004 */ addiu $a0, $a0, 4 .L80019DCC: -/* 01A9CC 80019DCC 0C0002CD */ jal func_80000B34 +/* 01A9CC 80019DCC 0C0002CD */ jal play_music /* 01A9D0 80019DD0 30A400FF */ andi $a0, $a1, 0xff /* 01A9D4 80019DD4 24050004 */ li $a1, 4 /* 01A9D8 80019DD8 00001825 */ move $v1, $zero @@ -776,7 +776,7 @@ glabel func_80019808 /* 01AF10 8001A310 00008025 */ move $s0, $zero .L8001A314: /* 01AF14 8001A314 02002025 */ move $a0, $s0 -/* 01AF18 8001A318 0C01A955 */ jal func_8006A554 +/* 01AF18 8001A318 0C01A955 */ jal get_button_inputs_from_player /* 01AF1C 8001A31C AFA50094 */ sw $a1, 0x94($sp) /* 01AF20 8001A320 8FA50094 */ lw $a1, 0x94($sp) /* 01AF24 8001A324 26100001 */ addiu $s0, $s0, 1 @@ -1092,7 +1092,7 @@ glabel func_80019808 /* 01B390 8001A790 02802025 */ move $a0, $s4 .L8001A794: /* 01B394 8001A794 3C018012 */ lui $at, %hi(D_8011ADB4) # $at, 0x8012 -/* 01B398 8001A798 0C0270F2 */ jal func_8009C3C8 +/* 01B398 8001A798 0C0270F2 */ jal get_number_of_active_players /* 01B39C 8001A79C AC35ADB4 */ sw $s5, %lo(D_8011ADB4)($at) /* 01B3A0 8001A7A0 14540004 */ bne $v0, $s4, .L8001A7B4 /* 01B3A4 8001A7A4 8FBF0034 */ lw $ra, 0x34($sp) diff --git a/asm/non_matchings/unknown_00BC20/func_8001A8F4.s b/asm/non_matchings/unknown_00BC20/func_8001A8F4.s index 4f113de3..021b6cdb 100644 --- a/asm/non_matchings/unknown_00BC20/func_8001A8F4.s +++ b/asm/non_matchings/unknown_00BC20/func_8001A8F4.s @@ -322,7 +322,7 @@ glabel func_8001A8F4 /* 01B9A4 8001ADA4 0C02AC75 */ jal func_800AB1D4 /* 01B9A8 8001ADA8 24040001 */ li $a0, 1 .L8001ADAC: -/* 01B9AC 8001ADAC 0C01A955 */ jal func_8006A554 +/* 01B9AC 8001ADAC 0C01A955 */ jal get_button_inputs_from_player /* 01B9B0 8001ADB0 00002025 */ move $a0, $zero /* 01B9B4 8001ADB4 0C01BAA4 */ jal get_settings /* 01B9B8 8001ADB8 30508000 */ andi $s0, $v0, 0x8000 diff --git a/asm/non_matchings/unknown_00BC20/func_8001AE64.s b/asm/non_matchings/unknown_00BC20/func_8001AE64.s index 1de67a21..7a488318 100644 --- a/asm/non_matchings/unknown_00BC20/func_8001AE64.s +++ b/asm/non_matchings/unknown_00BC20/func_8001AE64.s @@ -40,7 +40,7 @@ glabel func_8001AE64 /* 01BAF8 8001AEF8 AFA90050 */ sw $t1, 0x50($sp) /* 01BAFC 8001AEFC AFAA002C */ sw $t2, 0x2c($sp) /* 01BB00 8001AF00 AFAC0024 */ sw $t4, 0x24($sp) -/* 01BB04 8001AF04 0C0270F2 */ jal func_8009C3C8 +/* 01BB04 8001AF04 0C0270F2 */ jal get_number_of_active_players /* 01BB08 8001AF08 AFAD004C */ sw $t5, 0x4c($sp) /* 01BB0C 8001AF0C 8FA70038 */ lw $a3, 0x38($sp) /* 01BB10 8001AF10 8FA80030 */ lw $t0, 0x30($sp) diff --git a/asm/non_matchings/unknown_00BC20/func_8001F23C.s b/asm/non_matchings/unknown_00BC20/func_8001F23C.s index 67d984df..a3b50f53 100644 --- a/asm/non_matchings/unknown_00BC20/func_8001F23C.s +++ b/asm/non_matchings/unknown_00BC20/func_8001F23C.s @@ -32,8 +32,8 @@ glabel func_8001F23C /* 01FEB4 8001F2B4 844C0048 */ lh $t4, 0x48($v0) /* 01FEB8 8001F2B8 2401000C */ li $at, 12 /* 01FEBC 8001F2BC 15810009 */ bne $t4, $at, .L8001F2E4 -/* 01FEC0 8001F2C0 3C0D8012 */ lui $t5, %hi(D_8011AEF4) # $t5, 0x8012 -/* 01FEC4 8001F2C4 91ADAEF4 */ lbu $t5, %lo(D_8011AEF4)($t5) +/* 01FEC0 8001F2C0 3C0D8012 */ lui $t5, %hi(gTimeTrialEnabled) # $t5, 0x8012 +/* 01FEC4 8001F2C4 91ADAEF4 */ lbu $t5, %lo(gTimeTrialEnabled)($t5) /* 01FEC8 8001F2C8 00000000 */ nop /* 01FECC 8001F2CC 11A00005 */ beqz $t5, .L8001F2E4 /* 01FED0 8001F2D0 00000000 */ nop diff --git a/asm/non_matchings/unknown_00BC20/func_8001F460.s b/asm/non_matchings/unknown_00BC20/func_8001F460.s index 585f2357..22fba985 100644 --- a/asm/non_matchings/unknown_00BC20/func_8001F460.s +++ b/asm/non_matchings/unknown_00BC20/func_8001F460.s @@ -77,7 +77,7 @@ glabel func_8001F460 /* 020150 8001F550 03004025 */ move $t0, $t8 .L8001F554: /* 020154 8001F554 02002025 */ move $a0, $s0 -/* 020158 8001F558 0C01A955 */ jal func_8006A554 +/* 020158 8001F558 0C01A955 */ jal get_button_inputs_from_player /* 02015C 8001F55C AFA80174 */ sw $t0, 0x174($sp) /* 020160 8001F560 8FA80174 */ lw $t0, 0x174($sp) /* 020164 8001F564 26100001 */ addiu $s0, $s0, 1 @@ -146,7 +146,7 @@ glabel func_8001F460 /* 020250 8001F650 00000000 */ nop /* 020254 8001F654 10620006 */ beq $v1, $v0, .L8001F670 /* 020258 8001F658 2419FFFE */ li $t9, -2 -/* 02025C 8001F65C 0C0002CD */ jal func_80000B34 +/* 02025C 8001F65C 0C0002CD */ jal play_music /* 020260 8001F660 306400FF */ andi $a0, $v1, 0xff /* 020264 8001F664 0C0002C6 */ jal func_80000B18 /* 020268 8001F668 00000000 */ nop diff --git a/asm/non_matchings/unknown_032760/func_80033DD0.s b/asm/non_matchings/unknown_032760/func_80033DD0.s index 02f8cb2e..f01632ce 100644 --- a/asm/non_matchings/unknown_032760/func_80033DD0.s +++ b/asm/non_matchings/unknown_032760/func_80033DD0.s @@ -40,7 +40,7 @@ glabel func_80033DD0 /* 034A64 80033E64 240E000A */ li $t6, 10 /* 034A68 80033E68 A46D0006 */ sh $t5, 6($v1) /* 034A6C 80033E6C A46E0004 */ sh $t6, 4($v1) -/* 034A70 80033E70 0C0270F2 */ jal func_8009C3C8 +/* 034A70 80033E70 0C0270F2 */ jal get_number_of_active_players /* 034A74 80033E74 AC6C0000 */ sw $t4, ($v1) /* 034A78 80033E78 8FA30028 */ lw $v1, 0x28($sp) /* 034A7C 80033E7C 28410002 */ slti $at, $v0, 2 @@ -58,7 +58,7 @@ glabel func_80033DD0 /* 034AAC 80033EAC 00003025 */ move $a2, $zero .L80033EB0: /* 034AB0 80033EB0 2445FFFF */ addiu $a1, $v0, -1 -/* 034AB4 80033EB4 0C01BE53 */ jal func_8006F94C +/* 034AB4 80033EB4 0C01BE53 */ jal get_random_number_from_range /* 034AB8 80033EB8 AFA30028 */ sw $v1, 0x28($sp) /* 034ABC 80033EBC 8FA30028 */ lw $v1, 0x28($sp) /* 034AC0 80033EC0 00403025 */ move $a2, $v0 diff --git a/asm/non_matchings/unknown_032760/func_800357D4.s b/asm/non_matchings/unknown_032760/func_800357D4.s index f1701739..3165fa24 100644 --- a/asm/non_matchings/unknown_032760/func_800357D4.s +++ b/asm/non_matchings/unknown_032760/func_800357D4.s @@ -20,7 +20,7 @@ glabel func_800357D4 /* 03641C 8003581C 00002025 */ move $a0, $zero /* 036420 80035820 14580012 */ bne $v0, $t8, .L8003586C /* 036424 80035824 8FAC0020 */ lw $t4, 0x20($sp) -/* 036428 80035828 0C01A955 */ jal func_8006A554 +/* 036428 80035828 0C01A955 */ jal get_button_inputs_from_player /* 03642C 8003582C AFA2001C */ sw $v0, 0x1c($sp) /* 036430 80035830 8FA5001C */ lw $a1, 0x1c($sp) /* 036434 80035834 30592000 */ andi $t9, $v0, 0x2000 diff --git a/asm/non_matchings/unknown_032760/func_800361E0.s b/asm/non_matchings/unknown_032760/func_800361E0.s index ac2666b8..d8b2f934 100644 --- a/asm/non_matchings/unknown_032760/func_800361E0.s +++ b/asm/non_matchings/unknown_032760/func_800361E0.s @@ -128,7 +128,7 @@ glabel func_800361E0 /* 036F9C 8003639C AE0C007C */ sw $t4, 0x7c($s0) /* 036FA0 800363A0 AFA3005C */ sw $v1, 0x5c($sp) .L800363A4: -/* 036FA4 800363A4 0C01A955 */ jal func_8006A554 +/* 036FA4 800363A4 0C01A955 */ jal get_button_inputs_from_player /* 036FA8 800363A8 00002025 */ move $a0, $zero /* 036FAC 800363AC 8E0D0078 */ lw $t5, 0x78($s0) /* 036FB0 800363B0 8FA3005C */ lw $v1, 0x5c($sp) @@ -196,7 +196,7 @@ glabel func_800361E0 /* 03709C 8003649C 240700FF */ li $a3, 255 /* 0370A0 800364A0 0C0004BA */ jal func_800012E8 /* 0370A4 800364A4 00000000 */ nop -/* 0370A8 800364A8 0C0002CD */ jal func_80000B34 +/* 0370A8 800364A8 0C0002CD */ jal play_music /* 0370AC 800364AC 24040024 */ li $a0, 36 /* 0370B0 800364B0 8FB90064 */ lw $t9, 0x64($sp) /* 0370B4 800364B4 00000000 */ nop @@ -479,7 +479,7 @@ glabel func_800361E0 /* 0374B8 800368B8 24010003 */ li $at, 3 /* 0374BC 800368BC 1461002A */ bne $v1, $at, .L80036968 /* 0374C0 800368C0 240B0004 */ li $t3, 4 -/* 0374C4 800368C4 0C003932 */ jal func_8000E4C8 +/* 0374C4 800368C4 0C003932 */ jal is_time_trial_enabled /* 0374C8 800368C8 AE0B0078 */ sw $t3, 0x78($s0) /* 0374CC 800368CC 10400006 */ beqz $v0, .L800368E8 /* 0374D0 800368D0 24040143 */ li $a0, 323 @@ -506,7 +506,7 @@ glabel func_800361E0 /* 03751C 8003691C 8FAF004C */ lw $t7, 0x4c($sp) /* 037520 80036920 00000000 */ nop /* 037524 80036924 91E40052 */ lbu $a0, 0x52($t7) -/* 037528 80036928 0C0002CD */ jal func_80000B34 +/* 037528 80036928 0C0002CD */ jal play_music /* 03752C 8003692C 00000000 */ nop /* 037530 80036930 8FB8004C */ lw $t8, 0x4c($sp) /* 037534 80036934 00000000 */ nop diff --git a/asm/non_matchings/unknown_032760/func_80036C30.s b/asm/non_matchings/unknown_032760/func_80036C30.s index 795ea304..c964abab 100644 --- a/asm/non_matchings/unknown_032760/func_80036C30.s +++ b/asm/non_matchings/unknown_032760/func_80036C30.s @@ -62,15 +62,15 @@ glabel func_80036C30 /* 037904 80036D04 00000000 */ nop /* 037908 80036D08 15A0000E */ bnez $t5, .L80036D44 /* 03790C 80036D0C 00002025 */ move $a0, $zero -/* 037910 80036D10 0C01BE53 */ jal func_8006F94C +/* 037910 80036D10 0C01BE53 */ jal get_random_number_from_range /* 037914 80036D14 3C050001 */ lui $a1, 1 /* 037918 80036D18 A60200FE */ sh $v0, 0xfe($s0) /* 03791C 80036D1C 00002025 */ move $a0, $zero -/* 037920 80036D20 0C01BE53 */ jal func_8006F94C +/* 037920 80036D20 0C01BE53 */ jal get_random_number_from_range /* 037924 80036D24 3C050001 */ lui $a1, 1 /* 037928 80036D28 A6020102 */ sh $v0, 0x102($s0) /* 03792C 80036D2C 00002025 */ move $a0, $zero -/* 037930 80036D30 0C01BE53 */ jal func_8006F94C +/* 037930 80036D30 0C01BE53 */ jal get_random_number_from_range /* 037934 80036D34 3C050001 */ lui $a1, 1 /* 037938 80036D38 A6020106 */ sh $v0, 0x106($s0) /* 03793C 80036D3C 10000005 */ b .L80036D54 diff --git a/asm/non_matchings/unknown_032760/func_800370D4.s b/asm/non_matchings/unknown_032760/func_800370D4.s index 4617731f..e308df3b 100644 --- a/asm/non_matchings/unknown_032760/func_800370D4.s +++ b/asm/non_matchings/unknown_032760/func_800370D4.s @@ -51,7 +51,7 @@ glabel func_800370D4 .L80037188: /* 037D88 80037188 00002025 */ move $a0, $zero /* 037D8C 8003718C 24050007 */ li $a1, 7 -/* 037D90 80037190 0C01BE53 */ jal func_8006F94C +/* 037D90 80037190 0C01BE53 */ jal get_random_number_from_range /* 037D94 80037194 E7A00068 */ swc1 $f0, 0x68($sp) /* 037D98 80037198 14400037 */ bnez $v0, .L80037278 /* 037D9C 8003719C 3C013F80 */ li $at, 0x3F800000 # 1.000000 @@ -62,7 +62,7 @@ glabel func_800370D4 /* 037DB0 800371B0 00000000 */ nop /* 037DB4 800371B4 45000031 */ bc1f .L8003727C /* 037DB8 800371B8 8FA50074 */ lw $a1, 0x74($sp) -/* 037DBC 800371BC 0C01BE53 */ jal func_8006F94C +/* 037DBC 800371BC 0C01BE53 */ jal get_random_number_from_range /* 037DC0 800371C0 240500FF */ li $a1, 255 /* 037DC4 800371C4 444FF800 */ cfc1 $t7, $31 /* 037DC8 800371C8 C6080118 */ lwc1 $f8, 0x118($s0) @@ -74,7 +74,7 @@ glabel func_800370D4 /* 037DE0 800371E0 00002025 */ move $a0, $zero /* 037DE4 800371E4 44052000 */ mfc1 $a1, $f4 /* 037DE8 800371E8 44CFF800 */ ctc1 $t7, $31 -/* 037DEC 800371EC 0C01BE53 */ jal func_8006F94C +/* 037DEC 800371EC 0C01BE53 */ jal get_random_number_from_range /* 037DF0 800371F0 00000000 */ nop /* 037DF4 800371F4 C6200010 */ lwc1 $f0, 0x10($s1) /* 037DF8 800371F8 C60A010C */ lwc1 $f10, 0x10c($s0) diff --git a/asm/non_matchings/unknown_032760/func_80037594.s b/asm/non_matchings/unknown_032760/func_80037594.s index 41fca3f5..d4d628dc 100644 --- a/asm/non_matchings/unknown_032760/func_80037594.s +++ b/asm/non_matchings/unknown_032760/func_80037594.s @@ -24,7 +24,7 @@ glabel func_80037594 /* 0381E8 800375E8 A4C00018 */ sh $zero, 0x18($a2) /* 0381EC 800375EC AFA60018 */ sw $a2, 0x18($sp) /* 0381F0 800375F0 00002025 */ move $a0, $zero -/* 0381F4 800375F4 0C01BE53 */ jal func_8006F94C +/* 0381F4 800375F4 0C01BE53 */ jal get_random_number_from_range /* 0381F8 800375F8 2405001E */ li $a1, 30 /* 0381FC 800375FC 8FA60018 */ lw $a2, 0x18($sp) /* 038200 80037600 00000000 */ nop diff --git a/asm/non_matchings/unknown_032760/func_80037A18.s b/asm/non_matchings/unknown_032760/func_80037A18.s index e296b239..78024cd3 100644 --- a/asm/non_matchings/unknown_032760/func_80037A18.s +++ b/asm/non_matchings/unknown_032760/func_80037A18.s @@ -122,7 +122,7 @@ glabel func_80037A18 /* 0387D4 80037BD4 00000000 */ nop /* 0387D8 80037BD8 11000008 */ beqz $t0, .L80037BFC /* 0387DC 80037BDC 00000000 */ nop -/* 0387E0 80037BE0 0C01A955 */ jal func_8006A554 +/* 0387E0 80037BE0 0C01A955 */ jal get_button_inputs_from_player /* 0387E4 80037BE4 AFA7002C */ sw $a3, 0x2c($sp) /* 0387E8 80037BE8 8FA7002C */ lw $a3, 0x2c($sp) /* 0387EC 80037BEC 30490001 */ andi $t1, $v0, 1 diff --git a/asm/non_matchings/unknown_032760/func_8003833C.s b/asm/non_matchings/unknown_032760/func_8003833C.s index fcbb2397..d768009c 100644 --- a/asm/non_matchings/unknown_032760/func_8003833C.s +++ b/asm/non_matchings/unknown_032760/func_8003833C.s @@ -80,7 +80,7 @@ glabel func_8003833C /* 039058 80038458 02002025 */ move $a0, $s0 .L8003845C: /* 03905C 8003845C A3A3004F */ sb $v1, 0x4f($sp) -/* 039060 80038460 0C0270A0 */ jal func_8009C280 +/* 039060 80038460 0C0270A0 */ jal get_player_character /* 039064 80038464 AFA50070 */ sw $a1, 0x70($sp) /* 039068 80038468 8FA50070 */ lw $a1, 0x70($sp) /* 03906C 8003846C 93A3004F */ lbu $v1, 0x4f($sp) diff --git a/asm/non_matchings/unknown_032760/func_800388D4.s b/asm/non_matchings/unknown_032760/func_800388D4.s index ca21960f..61930f45 100644 --- a/asm/non_matchings/unknown_032760/func_800388D4.s +++ b/asm/non_matchings/unknown_032760/func_800388D4.s @@ -40,7 +40,7 @@ glabel func_800388D4 /* 039564 80038964 00000000 */ nop /* 039568 80038968 1081000D */ beq $a0, $at, .L800389A0 /* 03956C 8003896C 8FBF0014 */ lw $ra, 0x14($sp) -/* 039570 80038970 0C01A955 */ jal func_8006A554 +/* 039570 80038970 0C01A955 */ jal get_button_inputs_from_player /* 039574 80038974 AFA50018 */ sw $a1, 0x18($sp) /* 039578 80038978 8FA50018 */ lw $a1, 0x18($sp) /* 03957C 8003897C 304F2000 */ andi $t7, $v0, 0x2000 diff --git a/asm/non_matchings/unknown_032760/func_80038B74.s b/asm/non_matchings/unknown_032760/func_80038B74.s index 5888aa3a..dc4f57e3 100644 --- a/asm/non_matchings/unknown_032760/func_80038B74.s +++ b/asm/non_matchings/unknown_032760/func_80038B74.s @@ -11,7 +11,7 @@ glabel func_80038B74 /* 039798 80038B98 00002025 */ move $a0, $zero /* 03979C 80038B9C 81C50055 */ lb $a1, 0x55($t6) /* 0397A0 80038BA0 AFA60018 */ sw $a2, 0x18($sp) -/* 0397A4 80038BA4 0C01BE53 */ jal func_8006F94C +/* 0397A4 80038BA4 0C01BE53 */ jal get_random_number_from_range /* 0397A8 80038BA8 24A5FFFF */ addiu $a1, $a1, -1 /* 0397AC 80038BAC 8FA4001C */ lw $a0, 0x1c($sp) /* 0397B0 80038BB0 8FA60018 */ lw $a2, 0x18($sp) diff --git a/asm/non_matchings/unknown_032760/func_80038BF4.s b/asm/non_matchings/unknown_032760/func_80038BF4.s index 2368f037..4e2576d2 100644 --- a/asm/non_matchings/unknown_032760/func_80038BF4.s +++ b/asm/non_matchings/unknown_032760/func_80038BF4.s @@ -80,7 +80,7 @@ glabel func_80038BF4 /* 03991C 80038D1C 00000000 */ nop /* 039920 80038D20 1320000A */ beqz $t9, .L80038D4C /* 039924 80038D24 8FBF002C */ lw $ra, 0x2c($sp) -/* 039928 80038D28 0C0270F2 */ jal func_8009C3C8 +/* 039928 80038D28 0C0270F2 */ jal get_number_of_active_players /* 03992C 80038D2C 00000000 */ nop /* 039930 80038D30 28410002 */ slti $at, $v0, 2 /* 039934 80038D34 10200004 */ beqz $at, .L80038D48 diff --git a/asm/non_matchings/unknown_032760/func_80039330.s b/asm/non_matchings/unknown_032760/func_80039330.s index c7a5784d..36a194e8 100644 --- a/asm/non_matchings/unknown_032760/func_80039330.s +++ b/asm/non_matchings/unknown_032760/func_80039330.s @@ -98,7 +98,7 @@ glabel func_80039330 /* 03A054 80039454 460A9300 */ add.s $f12, $f18, $f10 /* 03A058 80039458 E7A0009C */ swc1 $f0, 0x9c($sp) .L8003945C: -/* 03A05C 8003945C 0C01A955 */ jal func_8006A554 +/* 03A05C 8003945C 0C01A955 */ jal get_button_inputs_from_player /* 03A060 80039460 00002025 */ move $a0, $zero /* 03A064 80039464 8E190078 */ lw $t9, 0x78($s0) /* 03A068 80039468 00003025 */ move $a2, $zero @@ -191,7 +191,7 @@ glabel func_80039330 /* 03A1A4 800395A4 AFA60084 */ sw $a2, 0x84($sp) /* 03A1A8 800395A8 0C0002F8 */ jal func_80000BE0 /* 03A1AC 800395AC 24040018 */ li $a0, 24 -/* 03A1B0 800395B0 0C0002CD */ jal func_80000B34 +/* 03A1B0 800395B0 0C0002CD */ jal play_music /* 03A1B4 800395B4 24040020 */ li $a0, 32 /* 03A1B8 800395B8 8FAA0090 */ lw $t2, 0x90($sp) /* 03A1BC 800395BC 8FA60084 */ lw $a2, 0x84($sp) @@ -666,7 +666,7 @@ glabel L80039BB8 /* 03A870 80039C70 8FAA0064 */ lw $t2, 0x64($sp) /* 03A874 80039C74 00000000 */ nop /* 03A878 80039C78 91440052 */ lbu $a0, 0x52($t2) -/* 03A87C 80039C7C 0C0002CD */ jal func_80000B34 +/* 03A87C 80039C7C 0C0002CD */ jal play_music /* 03A880 80039C80 00000000 */ nop /* 03A884 80039C84 8FAB0064 */ lw $t3, 0x64($sp) /* 03A888 80039C88 00000000 */ nop @@ -1140,7 +1140,7 @@ glabel L8003A268 /* 03AF60 8003A360 8FAE0064 */ lw $t6, 0x64($sp) /* 03AF64 8003A364 00000000 */ nop /* 03AF68 8003A368 91C40052 */ lbu $a0, 0x52($t6) -/* 03AF6C 8003A36C 0C0002CD */ jal func_80000B34 +/* 03AF6C 8003A36C 0C0002CD */ jal play_music /* 03AF70 8003A370 00000000 */ nop /* 03AF74 8003A374 8FAF0064 */ lw $t7, 0x64($sp) /* 03AF78 8003A378 00000000 */ nop @@ -1580,7 +1580,7 @@ glabel L8003A5AC /* 03B5DC 8003A9DC 24040258 */ li $a0, 600 /* 03B5E0 8003A9E0 14600006 */ bnez $v1, .L8003A9FC /* 03B5E4 8003A9E4 00000000 */ nop -/* 03B5E8 8003A9E8 0C01BE53 */ jal func_8006F94C +/* 03B5E8 8003A9E8 0C01BE53 */ jal get_random_number_from_range /* 03B5EC 8003A9EC 24050384 */ li $a1, 900 /* 03B5F0 8003A9F0 AE220030 */ sw $v0, 0x30($s1) /* 03B5F4 8003A9F4 AE20002C */ sw $zero, 0x2c($s1) @@ -1605,7 +1605,7 @@ glabel L8003A5AC /* 03B63C 8003AA3C 240D0001 */ li $t5, 1 /* 03B640 8003AA40 A22D0036 */ sb $t5, 0x36($s1) /* 03B644 8003AA44 24040258 */ li $a0, 600 -/* 03B648 8003AA48 0C01BE53 */ jal func_8006F94C +/* 03B648 8003AA48 0C01BE53 */ jal get_random_number_from_range /* 03B64C 8003AA4C 24050384 */ li $a1, 900 /* 03B650 8003AA50 10000027 */ b .L8003AAF0 /* 03B654 8003AA54 AE22002C */ sw $v0, 0x2c($s1) diff --git a/asm/non_matchings/unknown_032760/func_8003D5A0.s b/asm/non_matchings/unknown_032760/func_8003D5A0.s index d9adafde..135a2b54 100644 --- a/asm/non_matchings/unknown_032760/func_8003D5A0.s +++ b/asm/non_matchings/unknown_032760/func_8003D5A0.s @@ -390,7 +390,7 @@ glabel func_8003D5A0 /* 03E748 8003DB48 00000000 */ nop /* 03E74C 8003DB4C AC4D007C */ sw $t5, 0x7c($v0) .L8003DB50: -/* 03E750 8003DB50 0C0270F2 */ jal func_8009C3C8 +/* 03E750 8003DB50 0C0270F2 */ jal get_number_of_active_players /* 03E754 8003DB54 AFA90030 */ sw $t1, 0x30($sp) /* 03E758 8003DB58 8FA90030 */ lw $t1, 0x30($sp) /* 03E75C 8003DB5C 28410002 */ slti $at, $v0, 2 diff --git a/asm/non_matchings/unknown_032760/func_8003E140.s b/asm/non_matchings/unknown_032760/func_8003E140.s index 2679a43a..df5dee01 100644 --- a/asm/non_matchings/unknown_032760/func_8003E140.s +++ b/asm/non_matchings/unknown_032760/func_8003E140.s @@ -216,7 +216,7 @@ glabel func_8003E140 /* 03F034 8003E434 358D0001 */ ori $t5, $t4, 1 /* 03F038 8003E438 A06D0209 */ sb $t5, 0x209($v1) /* 03F03C 8003E43C A06B0173 */ sb $t3, 0x173($v1) -/* 03F040 8003E440 0C0270F2 */ jal func_8009C3C8 +/* 03F040 8003E440 0C0270F2 */ jal get_number_of_active_players /* 03F044 8003E444 A3A6002E */ sb $a2, 0x2e($sp) /* 03F048 8003E448 8FA30038 */ lw $v1, 0x38($sp) /* 03F04C 8003E44C 83A6002E */ lb $a2, 0x2e($sp) diff --git a/asm/non_matchings/unknown_032760/func_8003EDD8.s b/asm/non_matchings/unknown_032760/func_8003EDD8.s index 70c5ced4..24efb196 100644 --- a/asm/non_matchings/unknown_032760/func_8003EDD8.s +++ b/asm/non_matchings/unknown_032760/func_8003EDD8.s @@ -189,7 +189,7 @@ glabel func_8003EDD8 /* 03FC80 8003F080 02202825 */ move $a1, $s1 /* 03FC84 8003F084 0C00FC3E */ jal func_8003F0F8 /* 03FC88 8003F088 24060136 */ li $a2, 310 -/* 03FC8C 8003F08C 0C0270F2 */ jal func_8009C3C8 +/* 03FC8C 8003F08C 0C0270F2 */ jal get_number_of_active_players /* 03FC90 8003F090 00000000 */ nop /* 03FC94 8003F094 28410003 */ slti $at, $v0, 3 /* 03FC98 8003F098 10200009 */ beqz $at, .L8003F0C0 diff --git a/asm/non_matchings/unknown_032760/func_80040C54.s b/asm/non_matchings/unknown_032760/func_80040C54.s index 288c77aa..89d95d0b 100644 --- a/asm/non_matchings/unknown_032760/func_80040C54.s +++ b/asm/non_matchings/unknown_032760/func_80040C54.s @@ -705,7 +705,7 @@ glabel L8004153C /* 042268 80041668 14200009 */ bnez $at, .L80041690 /* 04226C 8004166C 24040001 */ li $a0, 1 /* 042270 80041670 AFA8003C */ sw $t0, 0x3c($sp) -/* 042274 80041674 0C01BE53 */ jal func_8006F94C +/* 042274 80041674 0C01BE53 */ jal get_random_number_from_range /* 042278 80041678 E7B0007C */ swc1 $f16, 0x7c($sp) /* 04227C 8004167C 00021C00 */ sll $v1, $v0, 0x10 /* 042280 80041680 00035C03 */ sra $t3, $v1, 0x10 @@ -750,7 +750,7 @@ glabel L8004153C /* 042314 80041714 A10B00FD */ sb $t3, 0xfd($t0) .L80041718: /* 042318 80041718 AFA8003C */ sw $t0, 0x3c($sp) -/* 04231C 8004171C 0C01BE53 */ jal func_8006F94C +/* 04231C 8004171C 0C01BE53 */ jal get_random_number_from_range /* 042320 80041720 E7B0007C */ swc1 $f16, 0x7c($sp) /* 042324 80041724 8FA8003C */ lw $t0, 0x3c($sp) /* 042328 80041728 C7B0007C */ lwc1 $f16, 0x7c($sp) diff --git a/asm/non_matchings/unknown_032760/func_800422F0.s b/asm/non_matchings/unknown_032760/func_800422F0.s index e1e5cb25..631b2b45 100644 --- a/asm/non_matchings/unknown_032760/func_800422F0.s +++ b/asm/non_matchings/unknown_032760/func_800422F0.s @@ -158,13 +158,13 @@ glabel L80042378 /* 043108 80042508 24050048 */ li $a1, 72 /* 04310C 8004250C 0541000D */ bgez $t2, .L80042544 /* 043110 80042510 24040028 */ li $a0, 40 -/* 043114 80042514 0C01BE53 */ jal func_8006F94C +/* 043114 80042514 0C01BE53 */ jal get_random_number_from_range /* 043118 80042518 AFAB0104 */ sw $t3, 0x104($sp) /* 04311C 8004251C 44829000 */ mtc1 $v0, $f18 /* 043120 80042520 2404C000 */ li $a0, -16384 /* 043124 80042524 46809120 */ cvt.s.w $f4, $f18 /* 043128 80042528 24054000 */ li $a1, 16384 -/* 04312C 8004252C 0C01BE53 */ jal func_8006F94C +/* 04312C 8004252C 0C01BE53 */ jal get_random_number_from_range /* 043130 80042530 E604001C */ swc1 $f4, 0x1c($s0) /* 043134 80042534 862C0000 */ lh $t4, ($s1) /* 043138 80042538 00000000 */ nop @@ -285,7 +285,7 @@ glabel L800426B8 /* 0432D8 800426D8 00002025 */ move $a0, $zero /* 0432DC 800426DC 04610006 */ bgez $v1, .L800426F8 /* 0432E0 800426E0 2405012C */ li $a1, 300 -/* 0432E4 800426E4 0C01BE53 */ jal func_8006F94C +/* 0432E4 800426E4 0C01BE53 */ jal get_random_number_from_range /* 0432E8 800426E8 A2000014 */ sb $zero, 0x14($s0) /* 0432EC 800426EC A2000018 */ sb $zero, 0x18($s0) /* 0432F0 800426F0 82030018 */ lb $v1, 0x18($s0) diff --git a/asm/non_matchings/unknown_043920/func_80042D20.s b/asm/non_matchings/unknown_043920/func_80042D20.s index 62b5b94d..35c098f0 100644 --- a/asm/non_matchings/unknown_043920/func_80042D20.s +++ b/asm/non_matchings/unknown_043920/func_80042D20.s @@ -369,7 +369,7 @@ glabel func_80042D20 /* 043E14 80043214 24050002 */ li $a1, 2 /* 043E18 80043218 AFA9005C */ sw $t1, 0x5c($sp) /* 043E1C 8004321C A7AC0034 */ sh $t4, 0x34($sp) -/* 043E20 80043220 0C01BE53 */ jal func_8006F94C +/* 043E20 80043220 0C01BE53 */ jal get_random_number_from_range /* 043E24 80043224 A7AD0078 */ sh $t5, 0x78($sp) /* 043E28 80043228 8FA9005C */ lw $t1, 0x5c($sp) /* 043E2C 8004322C 87AC0034 */ lh $t4, 0x34($sp) diff --git a/asm/non_matchings/unknown_043920/func_8004447C.s b/asm/non_matchings/unknown_043920/func_8004447C.s index 4f3d2469..f95e1ad2 100644 --- a/asm/non_matchings/unknown_043920/func_8004447C.s +++ b/asm/non_matchings/unknown_043920/func_8004447C.s @@ -160,7 +160,7 @@ glabel func_8004447C /* 0452A8 800446A8 00000000 */ nop glabel L800446AC /* 0452AC 800446AC 00002025 */ move $a0, $zero -/* 0452B0 800446B0 0C01BE53 */ jal func_8006F94C +/* 0452B0 800446B0 0C01BE53 */ jal get_random_number_from_range /* 0452B4 800446B4 24050009 */ li $a1, 9 /* 0452B8 800446B8 820E0173 */ lb $t6, 0x173($s0) /* 0452BC 800446BC 8FAD0038 */ lw $t5, 0x38($sp) diff --git a/asm/non_matchings/unknown_043920/func_8004DE38.s b/asm/non_matchings/unknown_043920/func_8004DE38.s index 552ccad2..ba48582a 100644 --- a/asm/non_matchings/unknown_043920/func_8004DE38.s +++ b/asm/non_matchings/unknown_043920/func_8004DE38.s @@ -285,7 +285,7 @@ glabel func_8004DE38 /* 04EDE0 8004E1E0 E4460000 */ swc1 $f6, ($v0) .L8004E1E4: /* 04EDE4 8004E1E4 2404FFC4 */ li $a0, -60 -/* 04EDE8 8004E1E8 0C01BE53 */ jal func_8006F94C +/* 04EDE8 8004E1E8 0C01BE53 */ jal get_random_number_from_range /* 04EDEC 8004E1EC 2405003C */ li $a1, 60 /* 04EDF0 8004E1F0 244E0078 */ addiu $t6, $v0, 0x78 /* 04EDF4 8004E1F4 A60E01C6 */ sh $t6, 0x1c6($s0) @@ -611,7 +611,7 @@ glabel func_8004DE38 /* 04F2B0 8004E6B0 AC22D538 */ sw $v0, %lo(D_8011D538)($at) /* 04F2B4 8004E6B4 8FA400AC */ lw $a0, 0xac($sp) /* 04F2B8 8004E6B8 3C018012 */ lui $at, %hi(D_8011D528) # $at, 0x8012 -/* 04F2BC 8004E6BC 0C01A955 */ jal func_8006A554 +/* 04F2BC 8004E6BC 0C01A955 */ jal get_button_inputs_from_player /* 04F2C0 8004E6C0 AC22D528 */ sw $v0, %lo(D_8011D528)($at) /* 04F2C4 8004E6C4 8FA400AC */ lw $a0, 0xac($sp) /* 04F2C8 8004E6C8 3C018012 */ lui $at, %hi(D_8011D52C) # $at, 0x8012 @@ -728,7 +728,7 @@ glabel func_8004DE38 /* 04F460 8004E860 00CC082A */ slt $at, $a2, $t4 /* 04F464 8004E864 10200004 */ beqz $at, .L8004E878 /* 04F468 8004E868 00000000 */ nop -/* 04F46C 8004E86C 0C01BE53 */ jal func_8006F94C +/* 04F46C 8004E86C 0C01BE53 */ jal get_random_number_from_range /* 04F470 8004E870 24050050 */ li $a1, 80 /* 04F474 8004E874 A20201D1 */ sb $v0, 0x1d1($s0) .L8004E878: diff --git a/asm/non_matchings/unknown_043920/func_8004F7F4.s b/asm/non_matchings/unknown_043920/func_8004F7F4.s index 2526df9f..b2c9ef7e 100644 --- a/asm/non_matchings/unknown_043920/func_8004F7F4.s +++ b/asm/non_matchings/unknown_043920/func_8004F7F4.s @@ -987,7 +987,7 @@ glabel func_8004F7F4 /* 051208 80050608 3C0140C0 */ lui $at, 0x40c0 /* 05120C 8005060C 4500000A */ bc1f .L80050638 /* 051210 80050610 00000000 */ nop -/* 051214 80050614 0C01BE53 */ jal func_8006F94C +/* 051214 80050614 0C01BE53 */ jal get_random_number_from_range /* 051218 80050618 24050001 */ li $a1, 1 /* 05121C 8005061C 10400020 */ beqz $v0, .L800506A0 /* 051220 80050620 00000000 */ nop @@ -1015,7 +1015,7 @@ glabel func_8004F7F4 /* 051274 80050674 00002025 */ move $a0, $zero /* 051278 80050678 45000009 */ bc1f .L800506A0 /* 05127C 8005067C 00000000 */ nop -/* 051280 80050680 0C01BE53 */ jal func_8006F94C +/* 051280 80050680 0C01BE53 */ jal get_random_number_from_range /* 051284 80050684 24050001 */ li $a1, 1 /* 051288 80050688 10400005 */ beqz $v0, .L800506A0 /* 05128C 8005068C 00000000 */ nop diff --git a/asm/non_matchings/unknown_043920/func_80050A28.s b/asm/non_matchings/unknown_043920/func_80050A28.s index ed0ea437..dc017cb1 100644 --- a/asm/non_matchings/unknown_043920/func_80050A28.s +++ b/asm/non_matchings/unknown_043920/func_80050A28.s @@ -253,7 +253,7 @@ glabel func_80050A28 /* 05192C 80050D2C 2B010002 */ slti $at, $t8, 2 /* 051930 80050D30 10200007 */ beqz $at, .L80050D50 /* 051934 80050D34 24050019 */ li $a1, 25 -/* 051938 80050D38 0C01BE53 */ jal func_8006F94C +/* 051938 80050D38 0C01BE53 */ jal get_random_number_from_range /* 05193C 80050D3C AFA70078 */ sw $a3, 0x78($sp) /* 051940 80050D40 A20201D1 */ sb $v0, 0x1d1($s0) /* 051944 80050D44 3C088012 */ lui $t0, %hi(D_8011D528) # $t0, 0x8012 diff --git a/asm/non_matchings/unknown_043920/func_800521C4.s b/asm/non_matchings/unknown_043920/func_800521C4.s index 4eaa3846..2435a474 100644 --- a/asm/non_matchings/unknown_043920/func_800521C4.s +++ b/asm/non_matchings/unknown_043920/func_800521C4.s @@ -95,7 +95,7 @@ glabel func_800521C4 /* 052F28 80052328 24052800 */ li $a1, 10240 /* 052F2C 8005232C 01852823 */ subu $a1, $t4, $a1 .L80052330: -/* 052F30 80052330 0C01BE53 */ jal func_8006F94C +/* 052F30 80052330 0C01BE53 */ jal get_random_number_from_range /* 052F34 80052334 00052023 */ negu $a0, $a1 /* 052F38 80052338 A602016C */ sh $v0, 0x16c($s0) .L8005233C: diff --git a/asm/non_matchings/unknown_043920/func_800570B8.s b/asm/non_matchings/unknown_043920/func_800570B8.s index b3055b5f..eccd6912 100644 --- a/asm/non_matchings/unknown_043920/func_800570B8.s +++ b/asm/non_matchings/unknown_043920/func_800570B8.s @@ -40,7 +40,7 @@ glabel func_800570B8 /* 057D48 80057148 8FBF002C */ lw $ra, 0x2c($sp) /* 057D4C 8005714C 16010005 */ bne $s0, $at, .L80057164 /* 057D50 80057150 00002025 */ move $a0, $zero -/* 057D54 80057154 0C01BE53 */ jal func_8006F94C +/* 057D54 80057154 0C01BE53 */ jal get_random_number_from_range /* 057D58 80057158 24050001 */ li $a1, 1 /* 057D5C 8005715C 1040002A */ beqz $v0, .L80057208 /* 057D60 80057160 8FBF002C */ lw $ra, 0x2c($sp) @@ -51,7 +51,7 @@ glabel func_800570B8 /* 057D70 80057170 2631FFFF */ addiu $s1, $s1, -1 /* 057D74 80057174 02202825 */ move $a1, $s1 /* 057D78 80057178 00002025 */ move $a0, $zero -/* 057D7C 8005717C 0C01BE53 */ jal func_8006F94C +/* 057D7C 8005717C 0C01BE53 */ jal get_random_number_from_range /* 057D80 80057180 026B9821 */ addu $s3, $s3, $t3 /* 057D84 80057184 2410000C */ li $s0, 12 /* 057D88 80057188 00500019 */ multu $v0, $s0 @@ -64,7 +64,7 @@ glabel func_800570B8 /* 057DA4 800571A4 146D0009 */ bne $v1, $t5, .L800571CC /* 057DA8 800571A8 00002025 */ move $a0, $zero .L800571AC: -/* 057DAC 800571AC 0C01BE53 */ jal func_8006F94C +/* 057DAC 800571AC 0C01BE53 */ jal get_random_number_from_range /* 057DB0 800571B0 02202825 */ move $a1, $s1 /* 057DB4 800571B4 00500019 */ multu $v0, $s0 /* 057DB8 800571B8 964F0028 */ lhu $t7, 0x28($s2) diff --git a/asm/non_matchings/unknown_043920/func_8005A6F0.s b/asm/non_matchings/unknown_043920/func_8005A6F0.s index 6ad63a63..b3551f04 100644 --- a/asm/non_matchings/unknown_043920/func_8005A6F0.s +++ b/asm/non_matchings/unknown_043920/func_8005A6F0.s @@ -58,7 +58,7 @@ glabel func_8005A6F0 /* 05B354 8005A754 00000000 */ nop /* 05B358 8005A758 13200005 */ beqz $t9, .L8005A770 /* 05B35C 8005A75C 2404FFC4 */ li $a0, -60 -/* 05B360 8005A760 0C01BE53 */ jal func_8006F94C +/* 05B360 8005A760 0C01BE53 */ jal get_random_number_from_range /* 05B364 8005A764 2405003C */ li $a1, 60 /* 05B368 8005A768 244D0078 */ addiu $t5, $v0, 0x78 /* 05B36C 8005A76C A60D01C6 */ sh $t5, 0x1c6($s0) diff --git a/asm/non_matchings/unknown_05CEF0/func_8005CA84.s b/asm/non_matchings/unknown_05CEF0/func_8005CA84.s index a5efc383..6dc70e1f 100644 --- a/asm/non_matchings/unknown_05CEF0/func_8005CA84.s +++ b/asm/non_matchings/unknown_05CEF0/func_8005CA84.s @@ -6,7 +6,7 @@ glabel func_8005CA84 /* 05D694 8005CA94 AFA60028 */ sw $a2, 0x28($sp) /* 05D698 8005CA98 AFA7002C */ sw $a3, 0x2c($sp) /* 05D69C 8005CA9C 00002025 */ move $a0, $zero -/* 05D6A0 8005CAA0 0C01BE53 */ jal func_8006F94C +/* 05D6A0 8005CAA0 0C01BE53 */ jal get_random_number_from_range /* 05D6A4 8005CAA4 24050001 */ li $a1, 1 /* 05D6A8 8005CAA8 8FA8002C */ lw $t0, 0x2c($sp) /* 05D6AC 8005CAAC 00021E00 */ sll $v1, $v0, 0x18 diff --git a/asm/non_matchings/unknown_05CEF0/func_8005CB04.s b/asm/non_matchings/unknown_05CEF0/func_8005CB04.s index 3e085dfa..18971d49 100644 --- a/asm/non_matchings/unknown_05CEF0/func_8005CB04.s +++ b/asm/non_matchings/unknown_05CEF0/func_8005CB04.s @@ -4,7 +4,7 @@ glabel func_8005CB04 /* 05D70C 8005CB0C 00803025 */ move $a2, $a0 /* 05D710 8005CB10 AFA60018 */ sw $a2, 0x18($sp) /* 05D714 8005CB14 00002025 */ move $a0, $zero -/* 05D718 8005CB18 0C01BE53 */ jal func_8006F94C +/* 05D718 8005CB18 0C01BE53 */ jal get_random_number_from_range /* 05D71C 8005CB1C 24050001 */ li $a1, 1 /* 05D720 8005CB20 8FA60018 */ lw $a2, 0x18($sp) /* 05D724 8005CB24 00021E00 */ sll $v1, $v0, 0x18 diff --git a/asm/non_matchings/unknown_05CEF0/func_8005CB68.s b/asm/non_matchings/unknown_05CEF0/func_8005CB68.s index c0dcb0d6..a8da3b01 100644 --- a/asm/non_matchings/unknown_05CEF0/func_8005CB68.s +++ b/asm/non_matchings/unknown_05CEF0/func_8005CB68.s @@ -49,7 +49,7 @@ glabel func_8005CB68 /* 05D81C 8005CC1C 2404003E */ li $a0, 62 /* 05D820 8005CC20 2404003D */ li $a0, 61 /* 05D824 8005CC24 AFA90038 */ sw $t1, 0x38($sp) -/* 05D828 8005CC28 0C0002CD */ jal func_80000B34 +/* 05D828 8005CC28 0C0002CD */ jal play_music /* 05D82C 8005CC2C AFAA0044 */ sw $t2, 0x44($sp) /* 05D830 8005CC30 8FA90038 */ lw $t1, 0x38($sp) /* 05D834 8005CC34 8FAA0044 */ lw $t2, 0x44($sp) @@ -57,7 +57,7 @@ glabel func_8005CB68 /* 05D83C 8005CC3C 91430048 */ lbu $v1, 0x48($t2) .L8005CC40: /* 05D840 8005CC40 AFA90038 */ sw $t1, 0x38($sp) -/* 05D844 8005CC44 0C0002CD */ jal func_80000B34 +/* 05D844 8005CC44 0C0002CD */ jal play_music /* 05D848 8005CC48 AFAA0044 */ sw $t2, 0x44($sp) /* 05D84C 8005CC4C 8FA90038 */ lw $t1, 0x38($sp) /* 05D850 8005CC50 8FAA0044 */ lw $t2, 0x44($sp) diff --git a/asm/non_matchings/unknown_05DCD0/func_8005E204.s b/asm/non_matchings/unknown_05DCD0/func_8005E204.s index 239a0430..287e4881 100644 --- a/asm/non_matchings/unknown_05DCD0/func_8005E204.s +++ b/asm/non_matchings/unknown_05DCD0/func_8005E204.s @@ -140,7 +140,7 @@ glabel func_8005E204 /* 05F024 8005E424 000C6900 */ sll $t5, $t4, 4 /* 05F028 8005E428 01AC6823 */ subu $t5, $t5, $t4 /* 05F02C 8005E42C 000D6880 */ sll $t5, $t5, 2 -/* 05F030 8005E430 0C01BE53 */ jal func_8006F94C +/* 05F030 8005E430 0C01BE53 */ jal get_random_number_from_range /* 05F034 8005E434 AC4D007C */ sw $t5, 0x7c($v0) /* 05F038 8005E438 8E05000C */ lw $a1, 0xc($s0) /* 05F03C 8005E43C 8E060010 */ lw $a2, 0x10($s0) diff --git a/asm/non_matchings/unknown_066AA0/func_8006B250.s b/asm/non_matchings/unknown_066AA0/func_8006B250.s index aa58ec1e..b16c5b14 100644 --- a/asm/non_matchings/unknown_066AA0/func_8006B250.s +++ b/asm/non_matchings/unknown_066AA0/func_8006B250.s @@ -562,7 +562,7 @@ glabel func_8006B250 /* 06C65C 8006BA5C 00000000 */ nop /* 06C660 8006BA60 15600007 */ bnez $t3, .L8006BA80 /* 06C664 8006BA64 8FA40070 */ lw $a0, 0x70($sp) -/* 06C668 8006BA68 0C003932 */ jal func_8000E4C8 +/* 06C668 8006BA68 0C003932 */ jal is_time_trial_enabled /* 06C66C 8006BA6C 00000000 */ nop /* 06C670 8006BA70 10400002 */ beqz $v0, .L8006BA7C /* 06C674 8006BA74 24190064 */ li $t9, 100 diff --git a/asm/non_matchings/unknown_066AA0/func_8006CCF0.s b/asm/non_matchings/unknown_066AA0/func_8006CCF0.s index ac4028c8..54a26fcf 100644 --- a/asm/non_matchings/unknown_066AA0/func_8006CCF0.s +++ b/asm/non_matchings/unknown_066AA0/func_8006CCF0.s @@ -27,7 +27,7 @@ glabel func_8006CCF0 /* 06D92C 8006CD2C 0C01A94A */ jal func_8006A528 /* 06D930 8006CD30 00000000 */ nop /* 06D934 8006CD34 8FA40044 */ lw $a0, 0x44($sp) -/* 06D938 8006CD38 0C01A955 */ jal func_8006A554 +/* 06D938 8006CD38 0C01A955 */ jal get_button_inputs_from_player /* 06D93C 8006CD3C 02028025 */ or $s0, $s0, $v0 /* 06D940 8006CD40 8FB90044 */ lw $t9, 0x44($sp) /* 06D944 8006CD44 8FAF004C */ lw $t7, 0x4c($sp) diff --git a/asm/non_matchings/unknown_07B870/func_8007EF80.s b/asm/non_matchings/unknown_07B870/func_8007EF80.s index 55fe6366..46d4b2b6 100644 --- a/asm/non_matchings/unknown_07B870/func_8007EF80.s +++ b/asm/non_matchings/unknown_07B870/func_8007EF80.s @@ -14,7 +14,7 @@ glabel func_8007EF80 /* 07FBB0 8007EFB0 00414824 */ and $t1, $v0, $at /* 07FBB4 8007EFB4 1520000E */ bnez $t1, .L8007EFF0 /* 07FBB8 8007EFB8 00002025 */ move $a0, $zero -/* 07FBBC 8007EFBC 0C01BE53 */ jal func_8006F94C +/* 07FBBC 8007EFBC 0C01BE53 */ jal get_random_number_from_range /* 07FBC0 8007EFC0 240503E8 */ li $a1, 1000 /* 07FBC4 8007EFC4 284103DA */ slti $at, $v0, 0x3da /* 07FBC8 8007EFC8 14200082 */ bnez $at, .L8007F1D4 diff --git a/asm/non_matchings/unknown_09F8F0/func_8009F034.s b/asm/non_matchings/unknown_09F8F0/func_8009F034.s index 7a0cb2dd..face1667 100644 --- a/asm/non_matchings/unknown_09F8F0/func_8009F034.s +++ b/asm/non_matchings/unknown_09F8F0/func_8009F034.s @@ -120,7 +120,7 @@ glabel func_8009F034 /* 09FD88 8009F188 A0207189 */ sb $zero, %lo(D_80127189)($at) /* 09FD8C 8009F18C 3C018012 */ lui $at, %hi(D_80126D4C) # $at, 0x8012 /* 09FD90 8009F190 AC396D4C */ sw $t9, %lo(D_80126D4C)($at) -/* 09FD94 8009F194 0C01BE53 */ jal func_8006F94C +/* 09FD94 8009F194 0C01BE53 */ jal get_random_number_from_range /* 09FD98 8009F198 24050168 */ li $a1, 360 /* 09FD9C 8009F19C 3C018012 */ lui $at, %hi(D_80126D50) # $at, 0x8012 /* 09FDA0 8009F1A0 0C003856 */ jal func_8000E158 diff --git a/asm/non_matchings/unknown_09F8F0/func_800A01A0.s b/asm/non_matchings/unknown_09F8F0/func_800A01A0.s index b616f3cd..b2567c2d 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A01A0.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A01A0.s @@ -132,7 +132,7 @@ glabel func_800A01A0 /* 0A0F8C 800A038C 00000000 */ nop /* 0A0F90 800A0390 3C048012 */ lui $a0, %hi(D_80126D10) # $a0, 0x8012 /* 0A0F94 800A0394 8C846D10 */ lw $a0, %lo(D_80126D10)($a0) -/* 0A0F98 800A0398 0C01A955 */ jal func_8006A554 +/* 0A0F98 800A0398 0C01A955 */ jal get_button_inputs_from_player /* 0A0F9C 800A039C 00000000 */ nop /* 0A0FA0 800A03A0 30590004 */ andi $t9, $v0, 4 /* 0A0FA4 800A03A4 13200059 */ beqz $t9, .L800A050C @@ -180,7 +180,7 @@ glabel func_800A01A0 /* 0A1044 800A0444 A02027B8 */ sb $zero, %lo(D_800E27B8)($at) .L800A0448: /* 0A1048 800A0448 8C846D10 */ lw $a0, %lo(D_80126D10)($a0) -/* 0A104C 800A044C 0C01A955 */ jal func_8006A554 +/* 0A104C 800A044C 0C01A955 */ jal get_button_inputs_from_player /* 0A1050 800A0450 00000000 */ nop /* 0A1054 800A0454 30480004 */ andi $t0, $v0, 4 /* 0A1058 800A0458 1100002C */ beqz $t0, .L800A050C @@ -233,7 +233,7 @@ glabel func_800A01A0 .L800A050C: /* 0A110C 800A050C 3C048012 */ lui $a0, %hi(D_80126D10) # $a0, 0x8012 /* 0A1110 800A0510 8C846D10 */ lw $a0, %lo(D_80126D10)($a0) -/* 0A1114 800A0514 0C01A955 */ jal func_8006A554 +/* 0A1114 800A0514 0C01A955 */ jal get_button_inputs_from_player /* 0A1118 800A0518 00000000 */ nop /* 0A111C 800A051C 3C068012 */ lui $a2, %hi(D_80126CD0) # $a2, 0x8012 /* 0A1120 800A0520 30490001 */ andi $t1, $v0, 1 @@ -297,7 +297,7 @@ glabel func_800A01A0 /* 0A11FC 800A05FC A0430012 */ sb $v1, 0x12($v0) /* 0A1200 800A0600 0C0004BA */ jal func_800012E8 /* 0A1204 800A0604 00000000 */ nop -/* 0A1208 800A0608 0C0002CD */ jal func_80000B34 +/* 0A1208 800A0608 0C0002CD */ jal play_music /* 0A120C 800A060C 2404001E */ li $a0, 30 /* 0A1210 800A0610 0C000C63 */ jal func_8000318C /* 0A1214 800A0614 2404000C */ li $a0, 12 diff --git a/asm/non_matchings/unknown_09F8F0/func_800A277C.s b/asm/non_matchings/unknown_09F8F0/func_800A277C.s index 8014fca5..9d0925f7 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A277C.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A277C.s @@ -630,7 +630,7 @@ glabel func_800A277C /* 0A3C68 800A3068 26106D64 */ addiu $s0, %lo(D_80126D64) # addiu $s0, $s0, 0x6d64 /* 0A3C6C 800A306C 92050000 */ lbu $a1, ($s0) /* 0A3C70 800A3070 00002025 */ move $a0, $zero -/* 0A3C74 800A3074 0C01BE53 */ jal func_8006F94C +/* 0A3C74 800A3074 0C01BE53 */ jal get_random_number_from_range /* 0A3C78 800A3078 24A50002 */ addiu $a1, $a1, 2 /* 0A3C7C 800A307C 3C118012 */ lui $s1, %hi(D_80126D48) # $s1, 0x8012 /* 0A3C80 800A3080 26316D48 */ addiu $s1, %lo(D_80126D48) # addiu $s1, $s1, 0x6d48 @@ -642,7 +642,7 @@ glabel func_800A277C .L800A3098: /* 0A3C98 800A3098 92050000 */ lbu $a1, ($s0) /* 0A3C9C 800A309C 00002025 */ move $a0, $zero -/* 0A3CA0 800A30A0 0C01BE53 */ jal func_8006F94C +/* 0A3CA0 800A30A0 0C01BE53 */ jal get_random_number_from_range /* 0A3CA4 800A30A4 24A50002 */ addiu $a1, $a1, 2 /* 0A3CA8 800A30A8 962C0000 */ lhu $t4, ($s1) /* 0A3CAC 800A30AC 2443014B */ addiu $v1, $v0, 0x14b @@ -779,7 +779,7 @@ glabel func_800A277C /* 0A3EA0 800A32A0 00002025 */ move $a0, $zero /* 0A3EA4 800A32A4 15E00018 */ bnez $t7, .L800A3308 /* 0A3EA8 800A32A8 00000000 */ nop -/* 0A3EAC 800A32AC 0C01BE53 */ jal func_8006F94C +/* 0A3EAC 800A32AC 0C01BE53 */ jal get_random_number_from_range /* 0A3EB0 800A32B0 24050002 */ li $a1, 2 /* 0A3EB4 800A32B4 962A0000 */ lhu $t2, ($s1) /* 0A3EB8 800A32B8 24430147 */ addiu $v1, $v0, 0x147 @@ -788,7 +788,7 @@ glabel func_800A277C /* 0A3EC4 800A32C4 3064FFFF */ andi $a0, $v1, 0xffff .L800A32C8: /* 0A3EC8 800A32C8 00002025 */ move $a0, $zero -/* 0A3ECC 800A32CC 0C01BE53 */ jal func_8006F94C +/* 0A3ECC 800A32CC 0C01BE53 */ jal get_random_number_from_range /* 0A3ED0 800A32D0 24050002 */ li $a1, 2 /* 0A3ED4 800A32D4 96390000 */ lhu $t9, ($s1) /* 0A3ED8 800A32D8 24430147 */ addiu $v1, $v0, 0x147 @@ -801,7 +801,7 @@ glabel func_800A277C /* 0A3EF0 800A32F0 0C000741 */ jal func_80001D04 /* 0A3EF4 800A32F4 24A56D40 */ addiu $a1, %lo(D_80126D40) # addiu $a1, $a1, 0x6d40 /* 0A3EF8 800A32F8 24040078 */ li $a0, 120 -/* 0A3EFC 800A32FC 0C01BE53 */ jal func_8006F94C +/* 0A3EFC 800A32FC 0C01BE53 */ jal get_random_number_from_range /* 0A3F00 800A3300 240504B0 */ li $a1, 1200 /* 0A3F04 800A3304 AE020000 */ sw $v0, ($s0) .L800A3308: diff --git a/asm/non_matchings/unknown_09F8F0/func_800A3CE4.s b/asm/non_matchings/unknown_09F8F0/func_800A3CE4.s index 1719d7b1..e67528c8 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A3CE4.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A3CE4.s @@ -93,7 +93,7 @@ glabel func_800A3CE4 /* 0A4A44 800A3E44 27A40038 */ addiu $a0, $sp, 0x38 /* 0A4A48 800A3E48 8FA50038 */ lw $a1, 0x38($sp) /* 0A4A4C 800A3E4C AFA20044 */ sw $v0, 0x44($sp) -/* 0A4A50 800A3E50 0C01BE53 */ jal func_8006F94C +/* 0A4A50 800A3E50 0C01BE53 */ jal get_random_number_from_range /* 0A4A54 800A3E54 24040001 */ li $a0, 1 /* 0A4A58 800A3E58 8FAE0044 */ lw $t6, 0x44($sp) /* 0A4A5C 800A3E5C 00027880 */ sll $t7, $v0, 2 @@ -106,14 +106,14 @@ glabel func_800A3CE4 /* 0A4A78 800A3E78 00000000 */ nop /* 0A4A7C 800A3E7C 172000AF */ bnez $t9, .L800A413C /* 0A4A80 800A3E80 00000000 */ nop -/* 0A4A84 800A3E84 0C01BE53 */ jal func_8006F94C +/* 0A4A84 800A3E84 0C01BE53 */ jal get_random_number_from_range /* 0A4A88 800A3E88 AFA80040 */ sw $t0, 0x40($sp) /* 0A4A8C 800A3E8C 8FA80040 */ lw $t0, 0x40($sp) /* 0A4A90 800A3E90 28410060 */ slti $at, $v0, 0x60 /* 0A4A94 800A3E94 142000A9 */ bnez $at, .L800A413C /* 0A4A98 800A3E98 00002025 */ move $a0, $zero /* 0A4A9C 800A3E9C 24050007 */ li $a1, 7 -/* 0A4AA0 800A3EA0 0C01BE53 */ jal func_8006F94C +/* 0A4AA0 800A3EA0 0C01BE53 */ jal get_random_number_from_range /* 0A4AA4 800A3EA4 AFA80040 */ sw $t0, 0x40($sp) /* 0A4AA8 800A3EA8 44822000 */ mtc1 $v0, $f4 /* 0A4AAC 800A3EAC 3C013FE0 */ li $at, 0x3FE00000 # 1.750000 @@ -132,7 +132,7 @@ glabel func_800A3CE4 /* 0A4AE0 800A3EE0 24050007 */ li $a1, 7 /* 0A4AE4 800A3EE4 46322181 */ sub.d $f6, $f4, $f18 /* 0A4AE8 800A3EE8 46203220 */ cvt.s.d $f8, $f6 -/* 0A4AEC 800A3EEC 0C01BE53 */ jal func_8006F94C +/* 0A4AEC 800A3EEC 0C01BE53 */ jal get_random_number_from_range /* 0A4AF0 800A3EF0 E7A8004C */ swc1 $f8, 0x4c($sp) /* 0A4AF4 800A3EF4 00025980 */ sll $t3, $v0, 6 /* 0A4AF8 800A3EF8 01625823 */ subu $t3, $t3, $v0 @@ -222,7 +222,7 @@ glabel func_800A3CE4 /* 0A4C44 800A4044 28410002 */ slti $at, $v0, 2 /* 0A4C48 800A4048 14200006 */ bnez $at, .L800A4064 /* 0A4C4C 800A404C 3C013F80 */ lui $at, 0x3f80 -/* 0A4C50 800A4050 0C0002CD */ jal func_80000B34 +/* 0A4C50 800A4050 0C0002CD */ jal play_music /* 0A4C54 800A4054 00002025 */ move $a0, $zero /* 0A4C58 800A4058 10000006 */ b .L800A4074 /* 0A4C5C 800A405C 24040016 */ li $a0, 22 diff --git a/asm/non_matchings/unknown_09F8F0/func_800A497C.s b/asm/non_matchings/unknown_09F8F0/func_800A497C.s index 2c5e1df6..d61936d4 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A497C.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A497C.s @@ -24,7 +24,7 @@ glabel func_800A497C .L800A49D4: /* 0A55D4 800A49D4 0C0002F8 */ jal func_80000BE0 /* 0A55D8 800A49D8 AFA7002C */ sw $a3, 0x2c($sp) -/* 0A55DC 800A49DC 0C0002CD */ jal func_80000B34 +/* 0A55DC 800A49DC 0C0002CD */ jal play_music /* 0A55E0 800A49E0 24040019 */ li $a0, 25 /* 0A55E4 800A49E4 24040016 */ li $a0, 22 /* 0A55E8 800A49E8 0C000741 */ jal func_80001D04 diff --git a/asm/non_matchings/unknown_09F8F0/func_800A5A64.s b/asm/non_matchings/unknown_09F8F0/func_800A5A64.s index 27c36e53..3da8be46 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A5A64.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A5A64.s @@ -54,7 +54,7 @@ glabel func_800A5A64 /* 0A6728 800A5B28 24E76D6C */ addiu $a3, %lo(D_80126D6C) # addiu $a3, $a3, 0x6d6c /* 0A672C 800A5B2C 14400009 */ bnez $v0, .L800A5B54 /* 0A6730 800A5B30 24040001 */ li $a0, 1 -/* 0A6734 800A5B34 0C01BE53 */ jal func_8006F94C +/* 0A6734 800A5B34 0C01BE53 */ jal get_random_number_from_range /* 0A6738 800A5B38 2405000A */ li $a1, 10 /* 0A673C 800A5B3C 3C038012 */ lui $v1, %hi(D_80126D38) # $v1, 0x8012 /* 0A6740 800A5B40 3C068012 */ lui $a2, %hi(D_80126D40) # $a2, 0x8012 @@ -68,7 +68,7 @@ glabel func_800A5A64 /* 0A675C 800A5B5C 0C000741 */ jal func_80001D04 /* 0A6760 800A5B60 00C02825 */ move $a1, $a2 /* 0A6764 800A5B64 24040001 */ li $a0, 1 -/* 0A6768 800A5B68 0C01BE53 */ jal func_8006F94C +/* 0A6768 800A5B68 0C01BE53 */ jal get_random_number_from_range /* 0A676C 800A5B6C 240501E0 */ li $a1, 480 /* 0A6770 800A5B70 244C0078 */ addiu $t4, $v0, 0x78 /* 0A6774 800A5B74 3C018012 */ lui $at, %hi(D_80126D6C) # $at, 0x8012 diff --git a/asm/non_matchings/unknown_09F8F0/func_800AB4A8.s b/asm/non_matchings/unknown_09F8F0/func_800AB4A8.s index 317bc1df..01ccdc0e 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800AB4A8.s +++ b/asm/non_matchings/unknown_09F8F0/func_800AB4A8.s @@ -115,27 +115,27 @@ glabel func_800AB4A8 /* 0AC260 800AB660 00008025 */ move $s0, $zero .L800AB664: /* 0AC264 800AB664 8EA50018 */ lw $a1, 0x18($s5) -/* 0AC268 800AB668 0C01BE53 */ jal func_8006F94C +/* 0AC268 800AB668 0C01BE53 */ jal get_random_number_from_range /* 0AC26C 800AB66C 00002025 */ move $a0, $zero /* 0AC270 800AB670 8E4F0000 */ lw $t7, ($s2) /* 0AC274 800AB674 00002025 */ move $a0, $zero /* 0AC278 800AB678 01F0C021 */ addu $t8, $t7, $s0 /* 0AC27C 800AB67C AF020000 */ sw $v0, ($t8) /* 0AC280 800AB680 8EA5001C */ lw $a1, 0x1c($s5) -/* 0AC284 800AB684 0C01BE53 */ jal func_8006F94C +/* 0AC284 800AB684 0C01BE53 */ jal get_random_number_from_range /* 0AC288 800AB688 00000000 */ nop /* 0AC28C 800AB68C 8E590000 */ lw $t9, ($s2) /* 0AC290 800AB690 00002025 */ move $a0, $zero /* 0AC294 800AB694 03304821 */ addu $t1, $t9, $s0 /* 0AC298 800AB698 AD220004 */ sw $v0, 4($t1) /* 0AC29C 800AB69C 8EA50020 */ lw $a1, 0x20($s5) -/* 0AC2A0 800AB6A0 0C01BE53 */ jal func_8006F94C +/* 0AC2A0 800AB6A0 0C01BE53 */ jal get_random_number_from_range /* 0AC2A4 800AB6A4 00000000 */ nop /* 0AC2A8 800AB6A8 8E4A0000 */ lw $t2, ($s2) /* 0AC2AC 800AB6AC 00002025 */ move $a0, $zero /* 0AC2B0 800AB6B0 01505821 */ addu $t3, $t2, $s0 /* 0AC2B4 800AB6B4 AD620008 */ sw $v0, 8($t3) -/* 0AC2B8 800AB6B8 0C01BE53 */ jal func_8006F94C +/* 0AC2B8 800AB6B8 0C01BE53 */ jal get_random_number_from_range /* 0AC2BC 800AB6BC 24050020 */ li $a1, 32 /* 0AC2C0 800AB6C0 8E4F0000 */ lw $t7, ($s2) /* 0AC2C4 800AB6C4 244C0005 */ addiu $t4, $v0, 5 @@ -144,7 +144,7 @@ glabel func_800AB4A8 /* 0AC2D0 800AB6D0 01F0C021 */ addu $t8, $t7, $s0 /* 0AC2D4 800AB6D4 A30E000C */ sb $t6, 0xc($t8) /* 0AC2D8 800AB6D8 00002025 */ move $a0, $zero -/* 0AC2DC 800AB6DC 0C01BE53 */ jal func_8006F94C +/* 0AC2DC 800AB6DC 0C01BE53 */ jal get_random_number_from_range /* 0AC2E0 800AB6E0 24050020 */ li $a1, 32 /* 0AC2E4 800AB6E4 8E4B0000 */ lw $t3, ($s2) /* 0AC2E8 800AB6E8 24590005 */ addiu $t9, $v0, 5 @@ -153,7 +153,7 @@ glabel func_800AB4A8 /* 0AC2F4 800AB6F4 01706821 */ addu $t5, $t3, $s0 /* 0AC2F8 800AB6F8 A1AA000D */ sb $t2, 0xd($t5) /* 0AC2FC 800AB6FC 00002025 */ move $a0, $zero -/* 0AC300 800AB700 0C01BE53 */ jal func_8006F94C +/* 0AC300 800AB700 0C01BE53 */ jal get_random_number_from_range /* 0AC304 800AB704 24050020 */ li $a1, 32 /* 0AC308 800AB708 8E580000 */ lw $t8, ($s2) /* 0AC30C 800AB70C 244C0005 */ addiu $t4, $v0, 5 @@ -163,7 +163,7 @@ glabel func_800AB4A8 /* 0AC31C 800AB71C A12E000E */ sb $t6, 0xe($t1) /* 0AC320 800AB720 8EA50004 */ lw $a1, 4($s5) /* 0AC324 800AB724 00002025 */ move $a0, $zero -/* 0AC328 800AB728 0C01BE53 */ jal func_8006F94C +/* 0AC328 800AB728 0C01BE53 */ jal get_random_number_from_range /* 0AC32C 800AB72C 24A5FFFF */ addiu $a1, $a1, -1 /* 0AC330 800AB730 8E590000 */ lw $t9, ($s2) /* 0AC334 800AB734 26310001 */ addiu $s1, $s1, 1 diff --git a/asm/non_matchings/unknown_09F8F0/func_800AD658.s b/asm/non_matchings/unknown_09F8F0/func_800AD658.s index bfc038c8..67fb4ee8 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800AD658.s +++ b/asm/non_matchings/unknown_09F8F0/func_800AD658.s @@ -56,7 +56,7 @@ glabel func_800AD658 .L800AD728: /* 0AE328 800AD728 062000A0 */ bltz $s1, .L800AD9AC /* 0AE32C 800AD72C 2404E000 */ li $a0, -8192 -/* 0AE330 800AD730 0C01BE53 */ jal func_8006F94C +/* 0AE330 800AD730 0C01BE53 */ jal get_random_number_from_range /* 0AE334 800AD734 24052000 */ li $a1, 8192 /* 0AE338 800AD738 8FB80050 */ lw $t8, 0x50($sp) /* 0AE33C 800AD73C 34018000 */ li $at, 32768 @@ -65,7 +65,7 @@ glabel func_800AD658 /* 0AE348 800AD748 00594021 */ addu $t0, $v0, $t9 /* 0AE34C 800AD74C 01014821 */ addu $t1, $t0, $at /* 0AE350 800AD750 AFA9006C */ sw $t1, 0x6c($sp) -/* 0AE354 800AD754 0C01BE53 */ jal func_8006F94C +/* 0AE354 800AD754 0C01BE53 */ jal get_random_number_from_range /* 0AE358 800AD758 240501F4 */ li $a1, 500 /* 0AE35C 800AD75C 44822000 */ mtc1 $v0, $f4 /* 0AE360 800AD760 87B0006E */ lh $s0, 0x6e($sp) @@ -209,7 +209,7 @@ glabel func_800AD658 /* 0AE570 800AD970 AFAD0030 */ sw $t5, 0x30($sp) /* 0AE574 800AD974 24040080 */ li $a0, 128 /* 0AE578 800AD978 E6080010 */ swc1 $f8, 0x10($s0) -/* 0AE57C 800AD97C 0C01BE53 */ jal func_8006F94C +/* 0AE57C 800AD97C 0C01BE53 */ jal get_random_number_from_range /* 0AE580 800AD980 E60A0014 */ swc1 $f10, 0x14($s0) /* 0AE584 800AD984 3C04800E */ lui $a0, %hi(D_800E2C84) # $a0, 0x800e /* 0AE588 800AD988 24842C84 */ addiu $a0, %lo(D_800E2C84) # addiu $a0, $a0, 0x2c84 diff --git a/asm/non_matchings/unknown_09F8F0/func_800ADAB8.s b/asm/non_matchings/unknown_09F8F0/func_800ADAB8.s index 1bf38850..e844ccbd 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800ADAB8.s +++ b/asm/non_matchings/unknown_09F8F0/func_800ADAB8.s @@ -56,7 +56,7 @@ glabel func_800ADAB8 /* 0AE780 800ADB80 3C01800E */ lui $at, %hi(D_800E2C80) # $at, 0x800e /* 0AE784 800ADB84 AC2D2C80 */ sw $t5, %lo(D_800E2C80)($at) /* 0AE788 800ADB88 24040384 */ li $a0, 900 -/* 0AE78C 800ADB8C 0C01BE53 */ jal func_8006F94C +/* 0AE78C 800ADB8C 0C01BE53 */ jal get_random_number_from_range /* 0AE790 800ADB90 24050474 */ li $a1, 1140 /* 0AE794 800ADB94 3C0E800E */ lui $t6, %hi(D_800E2C60) # $t6, 0x800e /* 0AE798 800ADB98 8DCE2C60 */ lw $t6, %lo(D_800E2C60)($t6) diff --git a/asm/non_matchings/unknown_0AEE70/func_800B0010.s b/asm/non_matchings/unknown_0AEE70/func_800B0010.s index d4eb9ed1..4c71c256 100644 --- a/asm/non_matchings/unknown_0AEE70/func_800B0010.s +++ b/asm/non_matchings/unknown_0AEE70/func_800B0010.s @@ -48,7 +48,7 @@ glabel func_800B0010 /* 0B0C94 800B0094 30680200 */ andi $t0, $v1, 0x200 /* 0B0C98 800B0098 8E250074 */ lw $a1, 0x74($s1) /* 0B0C9C 800B009C AFB8003C */ sw $t8, 0x3c($sp) -/* 0B0CA0 800B00A0 0C01BE53 */ jal func_8006F94C +/* 0B0CA0 800B00A0 0C01BE53 */ jal get_random_number_from_range /* 0B0CA4 800B00A4 00052023 */ negu $a0, $a1 /* 0B0CA8 800B00A8 44822000 */ mtc1 $v0, $f4 /* 0B0CAC 800B00AC 3C01800F */ lui $at, %hi(D_800E8B98 + 4) # $at, 0x800f @@ -69,7 +69,7 @@ glabel func_800B0010 /* 0B0CE4 800B00E4 30690400 */ andi $t1, $v1, 0x400 /* 0B0CE8 800B00E8 8E250078 */ lw $a1, 0x78($s1) /* 0B0CEC 800B00EC AFA3003C */ sw $v1, 0x3c($sp) -/* 0B0CF0 800B00F0 0C01BE53 */ jal func_8006F94C +/* 0B0CF0 800B00F0 0C01BE53 */ jal get_random_number_from_range /* 0B0CF4 800B00F4 00052023 */ negu $a0, $a1 /* 0B0CF8 800B00F8 44825000 */ mtc1 $v0, $f10 /* 0B0CFC 800B00FC 3C01800F */ lui $at, %hi(D_800E8BA0 + 4) # $at, 0x800f @@ -89,7 +89,7 @@ glabel func_800B0010 /* 0B0D30 800B0130 11200011 */ beqz $t1, .L800B0178 /* 0B0D34 800B0134 00000000 */ nop /* 0B0D38 800B0138 8E25007C */ lw $a1, 0x7c($s1) -/* 0B0D3C 800B013C 0C01BE53 */ jal func_8006F94C +/* 0B0D3C 800B013C 0C01BE53 */ jal get_random_number_from_range /* 0B0D40 800B0140 00052023 */ negu $a0, $a1 /* 0B0D44 800B0144 44828000 */ mtc1 $v0, $f16 /* 0B0D48 800B0148 3C01800F */ lui $at, %hi(D_800E8BA8 + 4) # $at, 0x800f @@ -178,7 +178,7 @@ glabel func_800B0010 /* 0B0E84 800B0284 30680060 */ andi $t0, $v1, 0x60 /* 0B0E88 800B0288 8E250070 */ lw $a1, 0x70($s1) /* 0B0E8C 800B028C AFA3003C */ sw $v1, 0x3c($sp) -/* 0B0E90 800B0290 0C01BE53 */ jal func_8006F94C +/* 0B0E90 800B0290 0C01BE53 */ jal get_random_number_from_range /* 0B0E94 800B0294 00052023 */ negu $a0, $a1 /* 0B0E98 800B0298 44828000 */ mtc1 $v0, $f16 /* 0B0E9C 800B029C 3C01800F */ lui $at, %hi(D_800E8BB0 + 4) # $at, 0x800f @@ -204,7 +204,7 @@ glabel func_800B0010 /* 0B0EE8 800B02E8 A7AA0028 */ sh $t2, 0x28($sp) /* 0B0EEC 800B02EC 8625006A */ lh $a1, 0x6a($s1) /* 0B0EF0 800B02F0 AFA3003C */ sw $v1, 0x3c($sp) -/* 0B0EF4 800B02F4 0C01BE53 */ jal func_8006F94C +/* 0B0EF4 800B02F4 0C01BE53 */ jal get_random_number_from_range /* 0B0EF8 800B02F8 00052023 */ negu $a0, $a1 /* 0B0EFC 800B02FC 87AC0028 */ lh $t4, 0x28($sp) /* 0B0F00 800B0300 8FA3003C */ lw $v1, 0x3c($sp) @@ -217,7 +217,7 @@ glabel func_800B0010 /* 0B0F18 800B0318 13000008 */ beqz $t8, .L800B033C /* 0B0F1C 800B031C A7AF002A */ sh $t7, 0x2a($sp) /* 0B0F20 800B0320 8625006C */ lh $a1, 0x6c($s1) -/* 0B0F24 800B0324 0C01BE53 */ jal func_8006F94C +/* 0B0F24 800B0324 0C01BE53 */ jal get_random_number_from_range /* 0B0F28 800B0328 00052023 */ negu $a0, $a1 /* 0B0F2C 800B032C 87B9002A */ lh $t9, 0x2a($sp) /* 0B0F30 800B0330 00000000 */ nop diff --git a/asm/non_matchings/unknown_0AEE70/func_800B03C0.s b/asm/non_matchings/unknown_0AEE70/func_800B03C0.s index 28eda078..6c866488 100644 --- a/asm/non_matchings/unknown_0AEE70/func_800B03C0.s +++ b/asm/non_matchings/unknown_0AEE70/func_800B03C0.s @@ -39,7 +39,7 @@ glabel func_800B03C0 /* 0B1038 800B0438 8CE50094 */ lw $a1, 0x94($a3) /* 0B103C 800B043C AFA7004C */ sw $a3, 0x4c($sp) /* 0B1040 800B0440 AFA60048 */ sw $a2, 0x48($sp) -/* 0B1044 800B0444 0C01BE53 */ jal func_8006F94C +/* 0B1044 800B0444 0C01BE53 */ jal get_random_number_from_range /* 0B1048 800B0448 00052023 */ negu $a0, $a1 /* 0B104C 800B044C 44823000 */ mtc1 $v0, $f6 /* 0B1050 800B0450 3C01800F */ lui $at, %hi(D_800E8BB8 + 4) # $at, 0x800f @@ -78,7 +78,7 @@ glabel func_800B03C0 /* 0B10D0 800B04D0 AFA7004C */ sw $a3, 0x4c($sp) /* 0B10D4 800B04D4 AFA60048 */ sw $a2, 0x48($sp) /* 0B10D8 800B04D8 AFA3003C */ sw $v1, 0x3c($sp) -/* 0B10DC 800B04DC 0C01BE53 */ jal func_8006F94C +/* 0B10DC 800B04DC 0C01BE53 */ jal get_random_number_from_range /* 0B10E0 800B04E0 00052023 */ negu $a0, $a1 /* 0B10E4 800B04E4 44823000 */ mtc1 $v0, $f6 /* 0B10E8 800B04E8 3C01800F */ lui $at, %hi(D_800E8BC0 + 4) # $at, 0x800f @@ -107,7 +107,7 @@ glabel func_800B03C0 /* 0B1140 800B0540 AFA7004C */ sw $a3, 0x4c($sp) /* 0B1144 800B0544 AFA60048 */ sw $a2, 0x48($sp) /* 0B1148 800B0548 AFA3003C */ sw $v1, 0x3c($sp) -/* 0B114C 800B054C 0C01BE53 */ jal func_8006F94C +/* 0B114C 800B054C 0C01BE53 */ jal get_random_number_from_range /* 0B1150 800B0550 00052023 */ negu $a0, $a1 /* 0B1154 800B0554 87AF0028 */ lh $t7, 0x28($sp) /* 0B1158 800B0558 8FA3003C */ lw $v1, 0x3c($sp) @@ -121,7 +121,7 @@ glabel func_800B03C0 /* 0B1174 800B0574 11000008 */ beqz $t0, .L800B0598 /* 0B1178 800B0578 A7B9002A */ sh $t9, 0x2a($sp) /* 0B117C 800B057C 84E50066 */ lh $a1, 0x66($a3) -/* 0B1180 800B0580 0C01BE53 */ jal func_8006F94C +/* 0B1180 800B0580 0C01BE53 */ jal get_random_number_from_range /* 0B1184 800B0584 00052023 */ negu $a0, $a1 /* 0B1188 800B0588 87A9002A */ lh $t1, 0x2a($sp) /* 0B118C 800B058C 00000000 */ nop diff --git a/asm/non_matchings/unknown_0AEE70/func_800B1130.s b/asm/non_matchings/unknown_0AEE70/func_800B1130.s index 8ec0b69c..52bf916d 100644 --- a/asm/non_matchings/unknown_0AEE70/func_800B1130.s +++ b/asm/non_matchings/unknown_0AEE70/func_800B1130.s @@ -88,7 +88,7 @@ glabel func_800B1130 /* 0B1E50 800B1250 E7B00024 */ swc1 $f16, 0x24($sp) /* 0B1E54 800B1254 AFA80028 */ sw $t0, 0x28($sp) /* 0B1E58 800B1258 AFA70038 */ sw $a3, 0x38($sp) -/* 0B1E5C 800B125C 0C01BE53 */ jal func_8006F94C +/* 0B1E5C 800B125C 0C01BE53 */ jal get_random_number_from_range /* 0B1E60 800B1260 00052023 */ negu $a0, $a1 /* 0B1E64 800B1264 44829000 */ mtc1 $v0, $f18 /* 0B1E68 800B1268 3C01800F */ lui $at, %hi(D_800E8BC8 + 4) # $at, 0x800f @@ -118,7 +118,7 @@ glabel func_800B1130 /* 0B1EC4 800B12C4 E7B00024 */ swc1 $f16, 0x24($sp) /* 0B1EC8 800B12C8 AFA80028 */ sw $t0, 0x28($sp) /* 0B1ECC 800B12CC AFA70038 */ sw $a3, 0x38($sp) -/* 0B1ED0 800B12D0 0C01BE53 */ jal func_8006F94C +/* 0B1ED0 800B12D0 0C01BE53 */ jal get_random_number_from_range /* 0B1ED4 800B12D4 00052023 */ negu $a0, $a1 /* 0B1ED8 800B12D8 44829000 */ mtc1 $v0, $f18 /* 0B1EDC 800B12DC 3C01800F */ lui $at, %hi(D_800E8BD0 + 4) # $at, 0x800f @@ -170,7 +170,7 @@ glabel func_800B1130 /* 0B1F88 800B1388 84E5000A */ lh $a1, 0xa($a3) /* 0B1F8C 800B138C AFA80028 */ sw $t0, 0x28($sp) /* 0B1F90 800B1390 AFA70038 */ sw $a3, 0x38($sp) -/* 0B1F94 800B1394 0C01BE53 */ jal func_8006F94C +/* 0B1F94 800B1394 0C01BE53 */ jal get_random_number_from_range /* 0B1F98 800B1398 00052023 */ negu $a0, $a1 /* 0B1F9C 800B139C 8FA70038 */ lw $a3, 0x38($sp) /* 0B1FA0 800B13A0 8FA60044 */ lw $a2, 0x44($sp) @@ -256,7 +256,7 @@ glabel func_800B1130 /* 0B20D0 800B14D0 92250098 */ lbu $a1, 0x98($s1) /* 0B20D4 800B14D4 AFA70038 */ sw $a3, 0x38($sp) /* 0B20D8 800B14D8 AFB9003C */ sw $t9, 0x3c($sp) -/* 0B20DC 800B14DC 0C01BE53 */ jal func_8006F94C +/* 0B20DC 800B14DC 0C01BE53 */ jal get_random_number_from_range /* 0B20E0 800B14E0 00052023 */ negu $a0, $a1 /* 0B20E4 800B14E4 920B006C */ lbu $t3, 0x6c($s0) /* 0B20E8 800B14E8 8FA3003C */ lw $v1, 0x3c($sp) @@ -271,7 +271,7 @@ glabel func_800B1130 /* 0B2108 800B1508 92250099 */ lbu $a1, 0x99($s1) /* 0B210C 800B150C AFA70038 */ sw $a3, 0x38($sp) /* 0B2110 800B1510 AFA3003C */ sw $v1, 0x3c($sp) -/* 0B2114 800B1514 0C01BE53 */ jal func_8006F94C +/* 0B2114 800B1514 0C01BE53 */ jal get_random_number_from_range /* 0B2118 800B1518 00052023 */ negu $a0, $a1 /* 0B211C 800B151C 920F006D */ lbu $t7, 0x6d($s0) /* 0B2120 800B1520 8FA3003C */ lw $v1, 0x3c($sp) @@ -286,7 +286,7 @@ glabel func_800B1130 /* 0B2140 800B1540 9225009A */ lbu $a1, 0x9a($s1) /* 0B2144 800B1544 AFA70038 */ sw $a3, 0x38($sp) /* 0B2148 800B1548 AFA3003C */ sw $v1, 0x3c($sp) -/* 0B214C 800B154C 0C01BE53 */ jal func_8006F94C +/* 0B214C 800B154C 0C01BE53 */ jal get_random_number_from_range /* 0B2150 800B1550 00052023 */ negu $a0, $a1 /* 0B2154 800B1554 9219006E */ lbu $t9, 0x6e($s0) /* 0B2158 800B1558 8FA3003C */ lw $v1, 0x3c($sp) @@ -300,7 +300,7 @@ glabel func_800B1130 /* 0B2174 800B1574 00000000 */ nop /* 0B2178 800B1578 9225009B */ lbu $a1, 0x9b($s1) /* 0B217C 800B157C AFA70038 */ sw $a3, 0x38($sp) -/* 0B2180 800B1580 0C01BE53 */ jal func_8006F94C +/* 0B2180 800B1580 0C01BE53 */ jal get_random_number_from_range /* 0B2184 800B1584 00052023 */ negu $a0, $a1 /* 0B2188 800B1588 920C006F */ lbu $t4, 0x6f($s0) /* 0B218C 800B158C 8FA60044 */ lw $a2, 0x44($sp) @@ -418,7 +418,7 @@ glabel func_800B1130 /* 0B2328 800B1728 8E0F0044 */ lw $t7, 0x44($s0) /* 0B232C 800B172C 00002025 */ move $a0, $zero /* 0B2330 800B1730 85E50000 */ lh $a1, ($t7) -/* 0B2334 800B1734 0C01BE53 */ jal func_8006F94C +/* 0B2334 800B1734 0C01BE53 */ jal get_random_number_from_range /* 0B2338 800B1738 24A5FFFF */ addiu $a1, $a1, -1 /* 0B233C 800B173C 8E180040 */ lw $t8, 0x40($s0) /* 0B2340 800B1740 8FA60044 */ lw $a2, 0x44($sp) @@ -502,7 +502,7 @@ glabel func_800B1130 /* 0B245C 800B185C 95E50012 */ lhu $a1, 0x12($t7) /* 0B2460 800B1860 00000000 */ nop /* 0B2464 800B1864 00057203 */ sra $t6, $a1, 8 -/* 0B2468 800B1868 0C01BE53 */ jal func_8006F94C +/* 0B2468 800B1868 0C01BE53 */ jal get_random_number_from_range /* 0B246C 800B186C 25C5FFFF */ addiu $a1, $t6, -1 /* 0B2470 800B1870 8E190040 */ lw $t9, 0x40($s0) /* 0B2474 800B1874 8FA60044 */ lw $a2, 0x44($sp) @@ -607,7 +607,7 @@ glabel func_800B1130 /* 0B25DC 800B19DC 30791000 */ andi $t9, $v1, 0x1000 /* 0B25E0 800B19E0 86250080 */ lh $a1, 0x80($s1) /* 0B25E4 800B19E4 AFAD003C */ sw $t5, 0x3c($sp) -/* 0B25E8 800B19E8 0C01BE53 */ jal func_8006F94C +/* 0B25E8 800B19E8 0C01BE53 */ jal get_random_number_from_range /* 0B25EC 800B19EC 00052023 */ negu $a0, $a1 /* 0B25F0 800B19F0 860E0000 */ lh $t6, ($s0) /* 0B25F4 800B19F4 8FA3003C */ lw $v1, 0x3c($sp) @@ -620,7 +620,7 @@ glabel func_800B1130 /* 0B260C 800B1A0C 306C2000 */ andi $t4, $v1, 0x2000 /* 0B2610 800B1A10 86250082 */ lh $a1, 0x82($s1) /* 0B2614 800B1A14 AFA3003C */ sw $v1, 0x3c($sp) -/* 0B2618 800B1A18 0C01BE53 */ jal func_8006F94C +/* 0B2618 800B1A18 0C01BE53 */ jal get_random_number_from_range /* 0B261C 800B1A1C 00052023 */ negu $a0, $a1 /* 0B2620 800B1A20 860A0002 */ lh $t2, 2($s0) /* 0B2624 800B1A24 8FA3003C */ lw $v1, 0x3c($sp) @@ -632,7 +632,7 @@ glabel func_800B1130 /* 0B2638 800B1A38 11800008 */ beqz $t4, .L800B1A5C /* 0B263C 800B1A3C 00000000 */ nop /* 0B2640 800B1A40 86250084 */ lh $a1, 0x84($s1) -/* 0B2644 800B1A44 0C01BE53 */ jal func_8006F94C +/* 0B2644 800B1A44 0C01BE53 */ jal get_random_number_from_range /* 0B2648 800B1A48 00052023 */ negu $a0, $a1 /* 0B264C 800B1A4C 860D0004 */ lh $t5, 4($s0) /* 0B2650 800B1A50 8FA60044 */ lw $a2, 0x44($sp) @@ -658,7 +658,7 @@ glabel func_800B1130 /* 0B269C 800B1A9C 306F8000 */ andi $t7, $v1, 0x8000 /* 0B26A0 800B1AA0 86250086 */ lh $a1, 0x86($s1) /* 0B26A4 800B1AA4 AFAA003C */ sw $t2, 0x3c($sp) -/* 0B26A8 800B1AA8 0C01BE53 */ jal func_8006F94C +/* 0B26A8 800B1AA8 0C01BE53 */ jal get_random_number_from_range /* 0B26AC 800B1AAC 00052023 */ negu $a0, $a1 /* 0B26B0 800B1AB0 860C0062 */ lh $t4, 0x62($s0) /* 0B26B4 800B1AB4 8FA3003C */ lw $v1, 0x3c($sp) @@ -671,7 +671,7 @@ glabel func_800B1130 /* 0B26CC 800B1ACC 0003CBC0 */ sll $t9, $v1, 0xf /* 0B26D0 800B1AD0 86250088 */ lh $a1, 0x88($s1) /* 0B26D4 800B1AD4 AFA3003C */ sw $v1, 0x3c($sp) -/* 0B26D8 800B1AD8 0C01BE53 */ jal func_8006F94C +/* 0B26D8 800B1AD8 0C01BE53 */ jal get_random_number_from_range /* 0B26DC 800B1ADC 00052023 */ negu $a0, $a1 /* 0B26E0 800B1AE0 860E0064 */ lh $t6, 0x64($s0) /* 0B26E4 800B1AE4 8FA3003C */ lw $v1, 0x3c($sp) @@ -683,7 +683,7 @@ glabel func_800B1130 /* 0B26F8 800B1AF8 07210009 */ bgez $t9, .L800B1B20 /* 0B26FC 800B1AFC 8FA50040 */ lw $a1, 0x40($sp) /* 0B2700 800B1B00 8625008A */ lh $a1, 0x8a($s1) -/* 0B2704 800B1B04 0C01BE53 */ jal func_8006F94C +/* 0B2704 800B1B04 0C01BE53 */ jal get_random_number_from_range /* 0B2708 800B1B08 00052023 */ negu $a0, $a1 /* 0B270C 800B1B0C 860A0066 */ lh $t2, 0x66($s0) /* 0B2710 800B1B10 8FA60044 */ lw $a2, 0x44($sp) diff --git a/asm/non_matchings/unknown_0B8920/func_800B82B4.s b/asm/non_matchings/unknown_0B8920/func_800B82B4.s index 6408d34a..4555f49e 100644 --- a/asm/non_matchings/unknown_0B8920/func_800B82B4.s +++ b/asm/non_matchings/unknown_0B8920/func_800B82B4.s @@ -254,14 +254,14 @@ glabel func_800B82B4 .L800B8650: /* 0B9250 800B8650 8E850020 */ lw $a1, 0x20($s4) /* 0B9254 800B8654 00002025 */ move $a0, $zero -/* 0B9258 800B8658 0C01BE53 */ jal func_8006F94C +/* 0B9258 800B8658 0C01BE53 */ jal get_random_number_from_range /* 0B925C 800B865C 24A5FFFF */ addiu $a1, $a1, -1 /* 0B9260 800B8660 8FD80000 */ lw $t8, ($fp) /* 0B9264 800B8664 00002025 */ move $a0, $zero /* 0B9268 800B8668 0316C821 */ addu $t9, $t8, $s6 /* 0B926C 800B866C A7220000 */ sh $v0, ($t9) /* 0B9270 800B8670 8E850020 */ lw $a1, 0x20($s4) -/* 0B9274 800B8674 0C01BE53 */ jal func_8006F94C +/* 0B9274 800B8674 0C01BE53 */ jal get_random_number_from_range /* 0B9278 800B8678 24A5FFFF */ addiu $a1, $a1, -1 /* 0B927C 800B867C 8FCA0000 */ lw $t2, ($fp) /* 0B9280 800B8680 26100001 */ addiu $s0, $s0, 1 diff --git a/asm/non_matchings/unknown_0B8920/func_800C3564.s b/asm/non_matchings/unknown_0B8920/func_800C3564.s index 7e06b8be..8497e347 100644 --- a/asm/non_matchings/unknown_0B8920/func_800C3564.s +++ b/asm/non_matchings/unknown_0B8920/func_800C3564.s @@ -178,7 +178,7 @@ glabel func_800C3564 .L800C37F0: /* 0C43F0 800C37F0 1640FFC7 */ bnez $s2, .L800C3710 /* 0C43F4 800C37F4 00000000 */ nop -/* 0C43F8 800C37F8 0C01A955 */ jal func_8006A554 +/* 0C43F8 800C37F8 0C01A955 */ jal get_button_inputs_from_player /* 0C43FC 800C37FC 00002025 */ move $a0, $zero /* 0C4400 800C3800 3C0B8013 */ lui $t3, %hi(D_8012A787) # $t3, 0x8013 /* 0C4404 800C3804 816BA787 */ lb $t3, %lo(D_8012A787)($t3) diff --git a/asm/unknown_070110/func_8006F94C.s b/asm/unknown_070110/get_random_number_from_range.s similarity index 97% rename from asm/unknown_070110/func_8006F94C.s rename to asm/unknown_070110/get_random_number_from_range.s index e52277dc..fb8040d8 100644 --- a/asm/unknown_070110/func_8006F94C.s +++ b/asm/unknown_070110/get_random_number_from_range.s @@ -1,4 +1,4 @@ -glabel func_8006F94C +glabel get_random_number_from_range /* 07054C 8006F94C 3C08800E */ lui $t0, %hi(D_800DD434) # $t0, 0x800e /* 070550 8006F950 8D08D434 */ lw $t0, %lo(D_800DD434)($t0) /* 070554 8006F954 3C01800E */ lui $at, %hi(D_800DD434) # $at, 0x800e diff --git a/asm/unknown_070110/rng.s b/asm/unknown_070110/rng.s index bc781836..e76a1f9a 100644 --- a/asm/unknown_070110/rng.s +++ b/asm/unknown_070110/rng.s @@ -23,13 +23,13 @@ glabel get_rng_seed /* 070548 8006F948 8C42D434 */ lw $v0, %lo(D_800DD434)($v0) /* - * func_8006F94C(start, end) = Gets a random number within a range. + * get_random_number_from_range(start, end) = Gets a random number within a range. * Start is inclusive, end is exclusive; also changes the RNG seed. * - * func_8006F94C(0, 5) will return a number from 0 to 4. - * func_8006F94C(20, 30) will return a number from 20 to 29. + * get_random_number_from_range(0, 5) will return a number from 0 to 4. + * get_random_number_from_range(20, 30) will return a number from 20 to 29. */ -glabel func_8006F94C +glabel get_random_number_from_range /* 07054C 8006F94C 3C08800E */ lui $t0, %hi(D_800DD434) # $t0, 0x800e /* 070550 8006F950 8D08D434 */ lw $t0, %lo(D_800DD434)($t0) /* 070554 8006F954 3C01800E */ lui $at, %hi(D_800DD434) # $at, 0x800e diff --git a/src/audio.c b/src/audio.c index 97808d63..a8a1fb2f 100644 --- a/src/audio.c +++ b/src/audio.c @@ -215,7 +215,7 @@ void audio_init(u32 arg0){ return; } -void musicSetRelativeVolume(u8); +void set_relative_volume_for_music(u8); void func_80004A60(u8, u16); @@ -224,7 +224,7 @@ void func_80000890(u8 arg0){ D_80115F78 = arg0; if(D_80115F78 == 0){ D_800DC66C = 256; - musicSetRelativeVolume(musicRelativeVolume); + set_relative_volume_for_music(musicRelativeVolume); func_80004A60(0,D_800DC66C*128-1); func_80004A60(1,D_800DC66C*128-1); func_80004A60(2,D_800DC66C*128-1); @@ -279,7 +279,7 @@ void func_80000B28(void) { void func_800022BC(u8, ALCSPlayer*); -void func_80000B34(u8 arg0) { +void play_music(u8 arg0) { if (D_800DC648 == 0 && musicVolumeSliderPercentage != 0) { D_80115D04 = arg0; musicRelativeVolume = 0x7F; @@ -327,7 +327,7 @@ void func_80000CBC(void) { D_80115D38 = 0; D_80115D3C = 0; D_800DC650 = 1.0f; - musicSetRelativeVolume(musicRelativeVolume); + set_relative_volume_for_music(musicRelativeVolume); } void func_80001D04(u16,void*); @@ -346,7 +346,7 @@ void func_80000D00(u8 arg0){ D_80115D3C = 0; D_800DC650 = 1.0f; } - musicSetRelativeVolume(musicRelativeVolume); + set_relative_volume_for_music(musicRelativeVolume); }else if(D_80115D3C < 0) { D_80115D38 -= arg0; @@ -356,7 +356,7 @@ void func_80000D00(u8 arg0){ D_80115D3C = 0; D_800DC650 = 0.0f; } - musicSetRelativeVolume(musicRelativeVolume); + set_relative_volume_for_music(musicRelativeVolume); } if(D_800DC658 > 0){ @@ -641,7 +641,7 @@ void func_80001878(u8 arg0) { if (arg0 != D_800DC640) { D_800DC640 = arg0; if (arg0) { - func_80000B34(D_80115D04); + play_music(D_80115D04); } else { func_80001844(); } @@ -681,7 +681,7 @@ u8 func_80001980(void) { } -void musicSetRelativeVolume(u8 vol){ +void set_relative_volume_for_music(u8 vol){ f32 normalized_vol; musicRelativeVolume = vol; @@ -890,7 +890,7 @@ void func_8000232C(ALCSPlayer* seqp, void* ptr, u8* arg2, ALCSeq* seq){ alCSPSetSeq(seqp, seq); alCSPPlay(seqp); if(seqp == gMusicPlayer){ - musicSetRelativeVolume(*((u8*)((*arg2)*3 + D_80115D1C->unk0))); + set_relative_volume_for_music(*((u8*)((*arg2)*3 + D_80115D1C->unk0))); }else{ } diff --git a/src/menu.c b/src/menu.c index 5bc2152d..331f7b25 100644 --- a/src/menu.c +++ b/src/menu.c @@ -8,6 +8,44 @@ #include "structs.h" #include "fast3d.h" +/** + * @file Contains all the code used for every menu in the game. + */ + +#define CHEAT(index) 1 << index + +typedef enum Cheats { + CHEAT_CONTROL_TT = CHEAT(0), + CHEAT_CONTROL_DRUMSTICK = CHEAT(1), + CHEAT_MIRRORED_TRACKS = CHEAT(2), + CHEAT_HIGH_SPEED_RACING = CHEAT(3), + CHEAT_BIG_CHARACTERS = CHEAT(4), + CHEAT_SMALL_CHARACTERS = CHEAT(5), + CHEAT_MUSIC_MENU = CHEAT(6), + CHEAT_START_WITH_10_BANANAS = CHEAT(7), + CHEAT_HORN_CHEAT = CHEAT(8), + CHEAT_PRINT_COORDS = CHEAT(9), + CHEAT_DISPLAY_CREDITS = CHEAT(10), + CHEAT_DISABLE_WEAPONS = CHEAT(11), + CHEAT_DISABLE_BANANAS = CHEAT(12), + CHEAT_BANANAS_REDUCE_SPEED = CHEAT(13), + CHEAT_NO_LIMIT_TO_BANANAS = CHEAT(14), + CHEAT_ALL_BALLOONS_ARE_RED = CHEAT(15), + CHEAT_ALL_BALLOONS_ARE_GREEN = CHEAT(16), + CHEAT_ALL_BALLOONS_ARE_BLUE = CHEAT(17), + CHEAT_ALL_BALLOONS_ARE_YELLOW = CHEAT(18), + CHEAT_ALL_BALLOONS_ARE_RAINBOW = CHEAT(19), + CHEAT_MAXIMUM_POWER_UP = CHEAT(20), + CHEAT_TURN_OFF_ZIPPERS = CHEAT(21), + CHEAT_SELECT_SAME_PLAYER = CHEAT(22), + CHEAT_FOUR_WHEEL_DRIVER = CHEAT(23), + CHEAT_TWO_PLAYER_ADVENTURE = CHEAT(24), + CHEAT_ULTIMATE_AI = CHEAT(25), + CHEAT_FREE_BALLOON = CHEAT(26), + CHEAT_EPC_LOCK_UP_DISPLAY = CHEAT(27), + CHEAT_ROM_CHECKSUM = CHEAT(28) +} Cheats; + typedef enum MENU_ID { MENU_TITLE, MENU_LOGOS, @@ -60,16 +98,23 @@ s8 D_801263B4; s32 D_801263B8; s32 D_801263BC; s32 D_801263C0; -s32 D_801263C4; +s32 gIgnorePlayerInput; s32 D_801263C8; -s32 D_801263CC; + +/* Size: 0xE bytes. */ +typedef struct unk801263CC { + u8 pad0[0xC]; + s16 unkC; +} unk801263CC; +unk801263CC (*D_801263CC)[8]; + s32 D_801263D0; -s8 D_801263D4[4]; +s8 gActivePlayersArray[4]; s32 D_801263D8; s8 D_801263DC[4]; s32 D_801263E0; s32 D_801263E4; -s8 players_character_array[8]; +s8 gPlayersCharacterArray[8]; // -1 = Non active player, or character id if >= 0 s8 gCharacterIdSlots[8]; s32 D_801263F8[8]; u8 D_80126418[8]; @@ -81,13 +126,13 @@ s32 D_80126434; s32 D_80126438[4]; s64 D_80126448; f32 D_80126450; -u8 D_80126454[4]; -u8 D_80126458[4]; -s8 D_8012645C[4]; -MenuElement *D_80126460; -s8 D_80126464[4]; -u8 D_80126468[4]; -u8 D_8012646C[4]; +u8 gControllersXAxisDelay[4]; +u8 gControllersYAxisDelay[4]; +s8 gControllersXAxisDirection[4]; // X axis (-1 = left, 1 = right) for controller +MenuElement **D_80126460; +s8 gControllersYAxisDirection[4]; // Y axis (-1 = down, 1 = up) for controller +u8 gControllersXAxis[4]; +u8 gControllersYAxis[4]; s32 D_80126470; s32 D_80126474; s32 D_80126478; @@ -131,7 +176,7 @@ Settings *D_80126530[4]; s8 D_80126540; s8 D_80126541; s32 D_80126544; -s32 D_80126548; +s32 gMultiplayerSelectedNumberOfRacersCopy; // Saved version gMultiplayerSelectedNumberOfRacers? u32* D_80126550[67]; // lookup table? s32 D_8012665C; s32 D_80126660; @@ -257,15 +302,15 @@ s32 D_80126C20; s32 D_80126C24; s32 D_80126C28; s32 *D_80126C2C; -u16 (*D_80126C30)[30]; // Cheat table. +u16 (*gCheatsAssetData)[30]; // Cheat table. s32 D_80126C34; s32 D_80126C38; s32 D_80126C3C; -u16 D_80126C40; -u16 D_80126C42; -u16 D_80126C44; -s16 D_80126C46; -s32 D_80126C48; +u16 gCheatInputCurrentRow; +u16 gCheatInputCurrentColumn; +u16 gCheatInputStringLength; +s16 gOptionsMenuItemIndex; +char *gCheatInputString; s16 D_80126C4C; f32 D_80126C50; s8 D_80126C54; @@ -288,22 +333,22 @@ s32 D_80126CC0; s8 D_800DF450 = 0; f32 D_800DF454 = 1.0f; s32 D_800DF458 = 1; -s32 D_800DF45C = 0; // Currently unknown, might be a different type. +s32 gTitleScreenCurrentOption = 0; // 0 = "Start", 1 = "Options" s32 D_800DF460 = 0; s32 D_800DF464 = 4; // Currently unknown, might be a different type. s32 D_800DF468 = 0; s32 D_800DF46C = 0; -s32 D_800DF470 = 0; // Currently unknown, might be a different type. +s32 gCurrentMenuId = 0; // Currently unknown, might be a different type. s32 D_800DF474 = 0; // Currently unknown, might be a different type. s32 D_800DF478 = 0; // Currently unknown, might be a different type. -s32 D_800DF47C = 0; // Currently unknown, might be a different type. -s32 D_800DF480 = 0; +s32 gMenuDelay = 0; // Currently unknown, might be a different type. +s32 gNumberOfReadyPlayers = 0; s32 D_800DF484 = 0; // Currently unknown, might be a different type. s32 D_800DF488 = 0; s32 D_800DF48C = 0; // Currently unknown, might be a different type. s32 D_800DF490 = 0; // Currently unknown, might be a different type. s32 gIsInAdventureTwo = 0; -s32 D_800DF498 = 0; +s32 gPlayerHasSeenCautionMenu = 0; s32 D_800DF49C = 0; // Currently unknown, might be a different type. unk800DF4A0 *D_800DF4A0 = NULL; @@ -312,23 +357,24 @@ u8 D_800DF4A4 = 0xFF; u8 D_800DF4A8 = 0xFF; u8 D_800DF4AC = 0xFF; -s32 D_800DF4B0 = 0; // Currently unknown, might be a different type. -s32 D_800DF4B4 = 0; // Currently unknown, might be a different type. -s32 D_800DF4B8 = 1; -s32 D_800DF4BC = 1; // Number of active players? +s32 D_800DF4B0 = 0; +s32 D_800DF4B4 = 0; +s32 gIsInTracksMode = 1; +s32 gNumberOfActivePlayers = 1; s32 gIsInTwoPlayerAdventure = 0; -s32 D_800DF4C4 = 0; // Currently unknown, might be a different type. -s32 D_800DF4C8 = 0; -s32 gSaveFileIndex = 0; +s32 gTrackIdForPreview = 0; +s32 gTrackSelectRow = 0; // 1 = Dino Domain, 2 = Sherbet Island, etc. +s32 gSaveFileIndex = 0; +s32 D_800DF4D0 = 0; // Unused? +s32 gTrackIdToLoad = 0; +s8 D_800DF4D8 = 1; +s8 D_800DF4DC = 0; +s8 D_800DF4E0 = 0; -s32 D_800DF4D0 = 0; // Currently unknown, might be a different type. -s32 D_800DF4D4 = 0; -s8 D_800DF4D8 = 1; -s8 D_800DF4DC = 0; -s8 D_800DF4E0 = 0; s8 D_800DF4E4[4] = { 0, 0, 0, 0 }; + s32 D_800DF4E8 = 0; // Currently unknown, might be a different type. s8 D_800DF4EC = 0; @@ -393,6 +439,7 @@ s32 D_800DF7AC = 0; // Currently unknown, might be a different type. // Version text shown on the title screen? See 1:15 in https://www.youtube.com/watch?v=OHSCLcA74ao. char gVersionDisplayText[20] = "VERSION XXXXXXXX"; +// "Diddy Kong Racing" logo texture indices? s16 D_800DF7C4[12] = { 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, @@ -457,8 +504,9 @@ unk800DFA3C D_800DFA3C[8] = { s32 D_800DFABC = 0; // Currently unknown, might be a different type. -s32 D_800DFAC0 = 0x100; -s32 D_800DFAC4 = 0x100; +s32 gSfxVolumeSliderValue = 256; // Value from 0 to 256 +s32 gMusicVolumeSliderValue = 256; // Value from 0 to 256 + s32 D_800DFAC8 = 0; // Unsure about typing here. @@ -694,7 +742,9 @@ u16 D_800E03FC[10] = { 0x002D, 0x0019 }; -s32 D_800E0410 = 0; +// Either 0 (2 racers), 1 (4 racers), or 2 (6 racers) +s32 gMultiplayerSelectedNumberOfRacers = 0; + s32 D_800E0414 = 0; s32 D_800E0418 = 0; @@ -984,8 +1034,8 @@ char gSixthPlace[4] = "6TH"; char gSeventhPlace[4] = "7TH"; char gEighthPlace[4] = "8TH"; -char *D_800E0BCC[8] = { - gFirstPlace, gSecondPlace, gThirdPlace, gFourthPlace, +char *gRacePlacementsArray[8] = { + gFirstPlace, gSecondPlace, gThirdPlace, gFourthPlace, gFifthPlace, gSixthPlace, gSeventhPlace, gEighthPlace }; @@ -1066,8 +1116,8 @@ u32 D_800E0FF4[4] = { 0x01FFFFFF, 0x0012FFFF, 0x81FFFFFF, 0x00120000 }; -// Number of points to award in trophy race for each place? -s32 D_800E1004[8] = { +// Number of points to award in trophy race for each place. +s32 gTrophyRacePointsArray[8] = { 9, 7, 5, 3, 1, 0, 0, 0 }; @@ -1087,42 +1137,42 @@ MenuElement D_800E1048[9][3] = { }, { { 32, -192, 32, 48, 32, 288, 255, 255, 255, 0, 255, 0, 0, 0, gFirstPlace, 0, 0, 0, 0 }, - { 130, -172, 130, 68, 130, 308, 255, 255, 255, 0, 255, 0, 4, 2, &D_800E1004[0], 0, 0, 0, 0 }, + { 130, -172, 130, 68, 130, 308, 255, 255, 255, 0, 255, 0, 4, 2, &gTrophyRacePointsArray[0], 0, 0, 0, 0 }, { 64, -150, 64, 90, 64, 330, 255, 255, 255, 0, 255, 0, 0, 3, &D_800E0A50, 0, 0, 0, 0 } }, { { 32, -150, 32, 90, 32, 330, 255, 255, 255, 0, 255, 0, 0, 0, gSecondPlace, 0, 0, 0, 0 }, - { 130, -130, 130, 110, 130, 350, 255, 192, 255, 0, 255, 0, 4, 2, &D_800E1004[1], 0, 0, 0, 0 }, + { 130, -130, 130, 110, 130, 350, 255, 192, 255, 0, 255, 0, 4, 2, &gTrophyRacePointsArray[1], 0, 0, 0, 0 }, { 64, -108, 64, 132, 64, 372, 255, 255, 255, 0, 255, 0, 0, 3, &D_800E0A50, 0, 0, 0, 0 } }, { { 32, -108, 32, 132, 32, 372, 255, 255, 255, 0, 255, 0, 0, 0, gThirdPlace, 0, 0, 0, 0 }, - { 130, -88, 130, 152, 130, 392, 255, 128, 255, 0, 255, 0, 4, 2, &D_800E1004[2], 0, 0, 0, 0 }, + { 130, -88, 130, 152, 130, 392, 255, 128, 255, 0, 255, 0, 4, 2, &gTrophyRacePointsArray[2], 0, 0, 0, 0 }, { 64, -66, 64, 174, 64, 414, 255, 255, 255, 0, 255, 0, 0, 3, &D_800E0A50, 0, 0, 0, 0 } }, { { 32, -66, 32, 174, 32, 414, 255, 255, 255, 0, 255, 0, 0, 0, gFourthPlace, 0, 0, 0, 0 }, - { 130, -46, 130, 194, 130, 434, 255, 64, 255, 0, 255, 0, 4, 2, &D_800E1004[3], 0, 0, 0, 0 }, + { 130, -46, 130, 194, 130, 434, 255, 64, 255, 0, 255, 0, 4, 2, &gTrophyRacePointsArray[3], 0, 0, 0, 0 }, { 220, 288, 220, 48, 220, -192, 255, 255, 255, 0, 255, 0, 0, 3, &D_800E0A50, 0, 0, 0, 0 } }, { { 188, 288, 188, 48, 188, -192, 255, 255, 255, 0, 255, 0, 0, 0, gFifthPlace, 0, 0, 0, 0 }, - { 286, 308, 286, 68, 286, -172, 255, 255, 255, 0, 255, 0, 4, 2, &D_800E1004[4], 0, 0, 0, 0 }, + { 286, 308, 286, 68, 286, -172, 255, 255, 255, 0, 255, 0, 4, 2, &gTrophyRacePointsArray[4], 0, 0, 0, 0 }, { 220, 330, 220, 90, 220, -160, 255, 255, 255, 0, 255, 0, 0, 3, &D_800E0A50, 0, 0, 0, 0 } }, { { 188, 330, 188, 90, 188, -150, 255, 255, 255, 0, 255, 0, 0, 0, gSixthPlace, 0, 0, 0, 0 }, - { 286, 350, 286, 110, 286, -130, 255, 192, 255, 0, 255, 0, 4, 2, &D_800E1004[5], 0, 0, 0, 0 }, + { 286, 350, 286, 110, 286, -130, 255, 192, 255, 0, 255, 0, 4, 2, &gTrophyRacePointsArray[5], 0, 0, 0, 0 }, { 220, 372, 220, 132, 220, -108, 255, 255, 255, 0, 255, 0, 0, 3, &D_800E0A50, 0, 0, 0, 0 } }, { { 188, 372, 188, 132, 188, -108, 255, 255, 255, 0, 255, 0, 0, 0, gSeventhPlace, 0, 0, 0, 0 }, - { 286, 392, 286, 152, 286, -88, 255, 128, 255, 0, 255, 0, 4, 2, &D_800E1004[6], 0, 0, 0, 0 }, + { 286, 392, 286, 152, 286, -88, 255, 128, 255, 0, 255, 0, 4, 2, &gTrophyRacePointsArray[6], 0, 0, 0, 0 }, { 220, 414, 220, 174, 220, -66, 255, 255, 255, 0, 255, 0, 0, 3, &D_800E0A50, 0, 0, 0, 0 } }, { { 188, 414, 188, 174, 188, -66, 255, 255, 255, 0, 255, 0, 0, 0, gEighthPlace, 0, 0, 0, 0 }, - { 286, 434, 286, 194, 286, -46, 255, 64, 255, 0, 255, 0, 4, 2, &D_800E1004[7], 0, 0, 0, 0 }, + { 286, 434, 286, 194, 286, -46, 255, 64, 255, 0, 255, 0, 4, 2, &gTrophyRacePointsArray[7], 0, 0, 0, 0 }, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, 0, 0, 0, 0 } }, }; @@ -1323,7 +1373,7 @@ u16 D_800E18FC[30] = { }; // List of amazing people. -char *D_800E1938[87] = { +char *gCreditsArray[87] = { "CREDITS", "Software Director", "R.Harrison", "Software Engineers", "P.Mountain", "J.Pegg", "R.Gale", @@ -1351,7 +1401,7 @@ char *D_800E1938[87] = { }; // Developer's best times for each track -char *D_800E1A94[20] = { +char *gCreditsBestTimesArray[20] = { /***** Dino Domain *****/ "0:53:43", "1:21:55", "0:54:13", "1:22:48", /** Snowflake Mountain */ "1:04:11", "1:13:51", "1:25:01", "0:55:05", /**** Sherbet Island ***/ "1:37:63", "1:56:60", "0:57:81", "1:28:01", @@ -1359,22 +1409,39 @@ char *D_800E1A94[20] = { /*** Future Fun Land ***/ "2:00:38", "2:05:68", "1:52:96", "1:55:00" }; -char *D_800E1AE4[5] = { +char *gCreditsLastMessageArray[5] = { "THE END?", "TO BE CONTINUED ...", // Appears after beating the first wizpig race. "THE END", // Appears after beating the second wizpig race. "NO CHEAT", "THIS TIME.", // Appears if you use the "WHODIDTHIS" cheat. }; -s32 D_800E1AF8[21] = { - 0x00000010, 0x00000020, 0x00000040, 0x00000080, - 0x00000100, 0x00000400, 0x00000800, 0x00001000, - 0x00002000, 0x00004000, 0x00008000, 0x00010000, - 0x00020000, 0x00040000, 0x00080000, 0x00100000, - 0x00200000, 0x00400000, 0x00800000, 0x01000000, - 0x02000000 +// Cheats that are shown in the credits. +s32 gCheatsInCreditsArray[21] = { + CHEAT_BIG_CHARACTERS, + CHEAT_SMALL_CHARACTERS, + CHEAT_MUSIC_MENU, + CHEAT_START_WITH_10_BANANAS, + CHEAT_HORN_CHEAT, + CHEAT_DISPLAY_CREDITS, + CHEAT_DISABLE_WEAPONS, + CHEAT_DISABLE_BANANAS, + CHEAT_BANANAS_REDUCE_SPEED, + CHEAT_NO_LIMIT_TO_BANANAS, + CHEAT_ALL_BALLOONS_ARE_RED, + CHEAT_ALL_BALLOONS_ARE_GREEN, + CHEAT_ALL_BALLOONS_ARE_BLUE, + CHEAT_ALL_BALLOONS_ARE_YELLOW, + CHEAT_ALL_BALLOONS_ARE_RAINBOW, + CHEAT_MAXIMUM_POWER_UP, + CHEAT_TURN_OFF_ZIPPERS, + CHEAT_SELECT_SAME_PLAYER, + CHEAT_FOUR_WHEEL_DRIVER, + CHEAT_TWO_PLAYER_ADVENTURE, + CHEAT_ULTIMATE_AI }; +#define NUMBER_CHEATS_IN_CREDITS sizeof(gCheatsInCreditsArray) / sizeof(s32) -s32 D_800E1B4C = 0; // Set to 1 if viewing credits from "WHODIDTHIS" cheat +s32 gViewingCreditsFromCheat = 0; // Set to 1 if viewing credits from "WHODIDTHIS" cheat MenuElement D_800E1B50[9] = { { 480, 104, 160, 104, -160, 104, 255, 0, 255, 48, 255, 0, 4, 0, NULL, 0, 0, 0, 0 }, @@ -1462,7 +1529,7 @@ s16 D_800E1DE8[4] = { 0, 0, 0x78, -1 }; -char D_800E1DF0[24] = "(C) COPYRIGHT RARE 1997"; +char gRareCopyrightString[24] = "(C) COPYRIGHT RARE 1997"; s16 D_800E1E08[4] = { 0, 0, 0x34, -1 @@ -1521,7 +1588,7 @@ void func_800660EC(f32 arg0); void func_8009C508(s32 arg0); void *func_80070C9C(s32, u32); void func_800C4170(s32 arg0); -void func_80000B34(s32 arg0); +void play_music(s32 arg0); GLOBAL_ASM("asm/non_matchings/menu/func_8007F900.s") @@ -1555,7 +1622,7 @@ void func_800813C0(void) { } #ifdef NON_MATCHING -void func_8009BE5C(void); +void reset_controller_sticks(void); void menu_logos_screen_init(void); void menu_title_screen_init(void); void menu_options_init(void); @@ -1579,9 +1646,9 @@ void menu_caution_init(void); // Almost close to matching. void menu_init(u32 menuId) { - D_800DF470 = menuId; - func_8009BE5C(); - D_801263C4 = 1; + gCurrentMenuId = menuId; + reset_controller_sticks(); + gIgnorePlayerInput = 1; D_801263BC = 0; D_801263C8 = 0; D_80126828 = 0; @@ -1590,7 +1657,7 @@ void menu_init(u32 menuId) { D_80126810 = 0; D_80126814 = 0; // This creates an extra lui func_80001844(); - switch(D_800DF470) { + switch(gCurrentMenuId) { case MENU_LOGOS: menu_logos_screen_init(); break; @@ -1658,6 +1725,9 @@ void menu_init(u32 menuId) { GLOBAL_ASM("asm/non_matchings/menu/menu_init.s") #endif +/** + * Runs every frame. Calls the loop function of the current menu id + */ s32 menu_loop(Gfx **arg0, s32 **arg1, s32 **arg2, s32 **arg3, s32 arg4) { s32 sp1C; @@ -1666,7 +1736,7 @@ s32 menu_loop(Gfx **arg0, s32 **arg1, s32 **arg2, s32 **arg3, s32 arg4) { D_801263AC = *arg2; D_801263B0 = *arg3; func_8009BF20(); - switch (D_800DF470) { + switch (gCurrentMenuId) { case MENU_LOGOS: sp1C = menu_logo_screen_loop(arg4); break; @@ -1873,7 +1943,7 @@ void func_800829F8(s32 arg0, s32 arg1) { } void menu_logos_screen_init(void) { - D_800DF47C = 0; + gMenuDelay = 0; D_80126450 = 16.0f; func_80077B5C(0, 0, 0); if (osTvType == 0) { @@ -1915,7 +1985,7 @@ GLOBAL_ASM("asm/non_matchings/menu/func_8008377C.s") GLOBAL_ASM("asm/non_matchings/menu/menu_title_screen_loop.s") void func_80084118(void) { - func_8009C4A8((s16 *)D_800DF7C4); + func_8009C4A8(D_800DF7C4); func_80000BE0(0x10); func_800660D0(); func_800C422C(2); @@ -1924,12 +1994,12 @@ void func_80084118(void) { void menu_options_init(void) { D_801263BC = 0; - D_800DF47C = 0; + gMenuDelay = 0; func_800C01D8(D_800DF77C); func_800C4170(2); set_text_font(2); func_80000BE0(0x18); - func_80000B34(0x18); + play_music(0x18); func_80000B18(); } @@ -1981,40 +2051,40 @@ s32 menu_options_loop(s32 arg0) { D_801263BC = (D_801263BC + arg0) & 0x3F; - if (D_800DF47C != 0) { - if (D_800DF47C > 0) { - D_800DF47C += arg0; + if (gMenuDelay != 0) { + if (gMenuDelay > 0) { + gMenuDelay += arg0; } else { - D_800DF47C -= arg0; + gMenuDelay -= arg0; } } - if (D_800DF47C >= -0x13 && D_800DF47C < 0x23) { + if (gMenuDelay >= -0x13 && gMenuDelay < 0x23) { func_800841B8(arg0); } buttonsPressed = 0; analogX = 0; analogY = 0; - if (D_801263C4 == 0 && D_800DF47C == 0) { + if (gIgnorePlayerInput == 0 && gMenuDelay == 0) { // Get input from all 4 controllers. s32 i; for (i = 0; i < 4; i++) { - analogY += D_80126464[i]; // Y axis (-1 = down, 1 = up) for controller - analogX += D_8012645C[i]; // X axis (-1 = left, 1 = right) for controller - buttonsPressed |= func_8006A554(i); // Button presses for controller + analogY += gControllersYAxisDirection[i]; // Y axis (-1 = down, 1 = up) for controller + analogX += gControllersXAxisDirection[i]; // X axis (-1 = left, 1 = right) for controller + buttonsPressed |= get_button_inputs_from_player(i); // Button presses for controller } } if ((buttonsPressed & 0x4000) || ((buttonsPressed & 0x9000) && D_800DF460 == 5)) { // Leave the option menu func_80000C98(-0x80, D_800DF460, analogX); - D_800DF47C = -1; + gMenuDelay = -1; func_800C01D8(D_800DF774); func_80001D04(0x241, 0); } else if ((buttonsPressed & 0x9000) && D_800DF460 >= 2) { // Go to a sub-menu - D_800DF47C = 0x1F; + gMenuDelay = 0x1F; func_80001D04(0xEF, 0); } else if (D_800DF460 == 0 && analogX != 0) { // Change language @@ -2058,7 +2128,7 @@ s32 menu_options_loop(s32 arg0) { } } - if (D_800DF47C >= 0x1F) { + if (gMenuDelay >= 0x1F) { // Change screen to a sub-menu switch(D_800DF460) { case 2: @@ -2075,14 +2145,14 @@ s32 menu_options_loop(s32 arg0) { return 0; } } - if (D_800DF47C < -0x1E) { + if (gMenuDelay < -0x1E) { // Change screen back to the title screen. func_80000B28(); func_80084734(); menu_init(MENU_TITLE); return 0; } - D_801263C4 = 0; + gIgnorePlayerInput = 0; return 0; } #endif @@ -2095,9 +2165,9 @@ void func_80084734(void) { void func_8009C8A4(s16 *arg0); void menu_audio_options_init(void) { - D_80126C46 = 0; + gOptionsMenuItemIndex = 0; D_801263BC = 0; - D_800DF47C = 0; + gMenuDelay = 0; D_801269FC = 0; D_801263D8 = -1; func_8009C674(D_800DFA2C); @@ -2105,9 +2175,9 @@ void menu_audio_options_init(void) { func_8008E4B0(); func_800C01D8(D_800DF77C); func_8007FFEC(2); - D_800DFAC4 = musicGetVolSliderPercentage(); - D_800DFAC0 = sfxGetVolumeSlider(); - if (gActiveMagicCodes & 0x40) { // Check if "JUKEBOX" cheat is active + gMusicVolumeSliderValue = musicGetVolSliderPercentage(); + gSfxVolumeSliderValue = sfxGetVolumeSlider(); + if (gActiveMagicCodes & CHEAT_MUSIC_MENU) { // Check if "JUKEBOX" cheat is active D_800DFA3C[6].unkC = D_801269E0; D_800DFA3C[3].unk2 = 0xD4; func_80000BE0(0x20); @@ -2141,17 +2211,17 @@ s32 menu_audio_options_loop(s32 arg0) { sp30 = 0; D_801263BC = (s32) ((D_801263BC + arg0) & 0x3F); - if (D_800DF47C != 0) { - if (D_800DF47C > 0) { - D_800DF47C += arg0; + if (gMenuDelay != 0) { + if (gMenuDelay > 0) { + gMenuDelay += arg0; } else { - D_800DF47C -= arg0; + gMenuDelay -= arg0; } } - if (D_800DF47C >= -0x13 && D_800DF47C < 0x14) { + if (gMenuDelay >= -0x13 && gMenuDelay < 0x14) { func_80084854(); } - if (D_801263C4 == 0 && D_800DF47C == 0) { + if (gIgnorePlayerInput == 0 && gMenuDelay == 0) { sp40 = 0; phi_a2 = 0; phi_a3 = 0; @@ -2159,10 +2229,10 @@ s32 menu_audio_options_loop(s32 arg0) { phi_s0 = 0; while(phi_s0 != 4) { - sp40 |= func_8006A554(phi_s0); + sp40 |= get_button_inputs_from_player(phi_s0); phi_a2 += func_8006A59C(phi_s0); - phi_a3 += D_80126464[phi_s0]; - phi_t0 += D_8012645C[phi_s0]; + phi_a3 += gControllersYAxisDirection[phi_s0]; + phi_t0 += gControllersXAxisDirection[phi_s0]; phi_s0++; } @@ -2178,20 +2248,20 @@ s32 menu_audio_options_loop(s32 arg0) { } } - if (((sp40 & 0x9000) && (D_801263E0 == D_80126C46 + 1)) || (sp40 & 0x4000)) { - D_800DF47C = -1; + if (((sp40 & 0x9000) && (D_801263E0 == gOptionsMenuItemIndex + 1)) || (sp40 & 0x4000)) { + gMenuDelay = -1; func_800C01D8(D_800DF774); if (D_801263D8 >= 0) { func_80000C98(-0x80); } sp30 = 3; - } else if (phi_a3 < 0 && D_80126C46 < D_801263E0 - 1) { - D_80126C46++; + } else if (phi_a3 < 0 && gOptionsMenuItemIndex < D_801263E0 - 1) { + gOptionsMenuItemIndex++; sp30 = 1; - } else if (phi_a3 > 0 && D_80126C46 > 0) { - D_80126C46--; + } else if (phi_a3 > 0 && gOptionsMenuItemIndex > 0) { + gOptionsMenuItemIndex--; sp30 = 1; - } else if (D_80126C46 == 0 && phi_t0 != 0) { + } else if (gOptionsMenuItemIndex == 0 && phi_t0 != 0) { if (phi_t0 < 0) { D_800DFAC8--; } else { @@ -2206,37 +2276,37 @@ s32 menu_audio_options_loop(s32 arg0) { func_80065BD0(D_800DFAC8); sp30 = 1; } else if ((phi_a2 >> 2) != 0) { - if(D_80126C46 == 2) { - D_800DFAC0 += (phi_a2 >> 2); - if (D_800DFAC0 < 0) { - D_800DFAC0 = 0; - } else if (D_800DFAC0 >= 0x101) { - D_800DFAC0 = 0x100; + if(gOptionsMenuItemIndex == 2) { + gSfxVolumeSliderValue += (phi_a2 >> 2); + if (gSfxVolumeSliderValue < 0) { + gSfxVolumeSliderValue = 0; + } else if (gSfxVolumeSliderValue >= 0x101) { + gSfxVolumeSliderValue = 0x100; } - sfxSetVolumeSlider(D_800DFAC0); - } else if(D_80126C46 == 1) { - D_800DFAC4 += (phi_a2 >> 2); - if (D_800DFAC4 < 0) { - D_800DFAC4 = 0; + sfxSetVolumeSlider(gSfxVolumeSliderValue); + } else if(gOptionsMenuItemIndex == 1) { + gMusicVolumeSliderValue += (phi_a2 >> 2); + if (gMusicVolumeSliderValue < 0) { + gMusicVolumeSliderValue = 0; } else { - if (D_800DFAC4 >= 0x101) { - D_800DFAC4 = 0x100; + if (gMusicVolumeSliderValue >= 0x101) { + gMusicVolumeSliderValue = 0x100; } } - func_80001A3C(D_800DFAC4); + func_80001A3C(gMusicVolumeSliderValue); if (!musicIsPlaying()) { if (D_801263D8 >= 0) { func_80000B28(); - func_80000B34((u8)D_800DFABC); + play_music((u8)D_800DFABC); } else { func_80000B28(); func_80000BE0(0x18); - func_80000B34(0x18); + play_music(0x18); func_80000B18(); } } } - } else if (D_801263E0 >= 5 && D_80126C46 == 1) { + } else if (D_801263E0 >= 5 && gOptionsMenuItemIndex == 1) { if (phi_t0 < 0 && D_800DFABC > 0) { D_800DFABC--; sp30 = 1; @@ -2247,12 +2317,12 @@ s32 menu_audio_options_loop(s32 arg0) { if (sp40 & 0x9000) { func_80000B28(); func_80000BE0(0x18); - func_80000B34((u8)D_800DFABC); + play_music((u8)D_800DFABC); D_801263D8 = D_800DFABC; } } - if (D_80126C46 == 1 && D_801269FC == 0) { + if (gOptionsMenuItemIndex == 1 && D_801269FC == 0) { func_80001D04(0x19B, &D_801269FC); } else if (D_801269FC != 0) { func_8000488C(D_801269FC); @@ -2266,12 +2336,12 @@ s32 menu_audio_options_loop(s32 arg0) { func_80001D04(0xEB, 0); } } - if (D_800DF47C < -0x1E) { + if (gMenuDelay < -0x1E) { func_800851FC(); menu_init(0xC); return 0; } - D_801263C4 = 0; + gIgnorePlayerInput = 0; return 0; } @@ -2283,7 +2353,7 @@ void func_800851FC(void) { } if (D_801263D8 >= 0) { func_80000BE0(0x18); - func_80000B34(0x18); + play_music(0x18); func_80000C98(0x100); func_80000B18(); } @@ -2296,9 +2366,9 @@ void menu_save_options_init(void) { D_80126A10 = 0; D_80126A18 = 1; D_80126A1C = 1; - D_80126C46 = 0; + gOptionsMenuItemIndex = 0; D_801263BC = 0; - D_800DF47C = 0; + gMenuDelay = 0; D_801263E0 = 1; D_801263D8 = 0; D_80126A64 = (s32)func_80070C9C(0x800, 0xFFFFFFFF); @@ -2432,19 +2502,15 @@ s32 func_800874D0(s32 arg0, s32 arg1) { func_80001D04(0x241, NULL); sp1C = -1; } - } else { - if (arg0 & 0x9000) { - func_80001D04(0xEF, NULL); - D_801263E0 = 4; - } else { - if ((arg1 < 0) && (D_80126BD4 > 0)) { - func_80001D04(0xEB, NULL); - D_80126BD4 = (s32) (D_80126BD4 - 1); - } else if ((arg1 > 0) && (D_80126BD4 < (D_80126A08 - 1))) { - func_80001D04(0xEB, NULL); - D_80126BD4 = (s32) (D_80126BD4 + 1); - } - } + } else if (arg0 & 0x9000) { + func_80001D04(0xEF, NULL); + D_801263E0 = 4; + } else if ((arg1 < 0) && (D_80126BD4 > 0)) { + func_80001D04(0xEB, NULL); + D_80126BD4 = (s32) (D_80126BD4 - 1); + } else if ((arg1 > 0) && (D_80126BD4 < (D_80126A08 - 1))) { + func_80001D04(0xEB, NULL); + D_80126BD4 = (s32) (D_80126BD4 + 1); } return sp1C; } @@ -2453,20 +2519,17 @@ s32 func_800875E4(s32 arg0, s32 arg1) { if (arg0 & 0x4000) { func_80001D04(0x241, NULL); D_801263E0 = 3; - } else { - if (arg0 & 0x9000) { - func_80001D04(0xEF, NULL); - D_801263E0 = 6; - } else { - if ((arg1 < 0) && (D_80126BE4 > 0)) { - func_80001D04(0xEB, NULL); - D_80126BE4 = (s32) (D_80126BE4 - 1); - } else if ((arg1 > 0) && (D_80126BE4 < D_80126A00 - 1)) { - func_80001D04(0xEB, NULL); - D_80126BE4 = (s32) (D_80126BE4 + 1); - } - } + } else if (arg0 & 0x9000) { + func_80001D04(0xEF, NULL); + D_801263E0 = 6; + } else if ((arg1 < 0) && (D_80126BE4 > 0)) { + func_80001D04(0xEB, NULL); + D_80126BE4 = (s32) (D_80126BE4 - 1); + } else if ((arg1 > 0) && (D_80126BE4 < D_80126A00 - 1)) { + func_80001D04(0xEB, NULL); + D_80126BE4 = (s32) (D_80126BE4 + 1); } + return 0; } @@ -2558,7 +2621,7 @@ s32 menu_boot_loop(s32 arg0) { } break; case 2: - if (D_800DF47C && func_800C018C(arg0, 0x12C) == 0) { + if (gMenuDelay && func_800C018C(arg0, 0x12C) == 0) { func_800C01D8(&D_800DF76C, arg0); } sp2C = func_800890AC(arg0); @@ -2602,12 +2665,12 @@ void func_800887E8(void) { D_80126A68 = -1; func_8007F900(get_language()); if (func_80087F14(&D_80126A68, 0) == 0) { - D_800DF47C = 0; + gMenuDelay = 0; } else if (func_8008832C() == 0) { - D_800DF47C = 0x14; + gMenuDelay = 0x14; } if (D_80126BC8 == 0 && D_800DFD94 == 0) { - D_800DF47C = 0x14; + gMenuDelay = 0x14; } D_800DF460 = 0; D_801263D8 = 0; @@ -2631,15 +2694,15 @@ void func_800895A4(void) { } void menu_magic_codes_init(void) { - D_80126C40 = 0; - D_80126C42 = 0; - D_80126C46 = 0; - D_80126C44 = 0; + gCheatInputCurrentRow = 0; + gCheatInputCurrentColumn = 0; + gOptionsMenuItemIndex = 0; + gCheatInputStringLength = 0; D_80126470 = 0; D_80126C4C = -1; D_80126C58[0] = 0; D_801263BC = 0; - D_800DF47C = 0; + gMenuDelay = 0; D_801263D8 = 0; D_801263E0 = 0; func_800C01D8(D_800DF77C); @@ -2658,9 +2721,9 @@ void func_8008A4C8(void) { void menu_magic_codes_list_init(void) { D_801263BC = 0; - D_800DF47C = 0; + gMenuDelay = 0; D_801263E0 = 0; - D_80126C46 = (u16)0; + gOptionsMenuItemIndex = (u16)0; func_800C4170(2); func_8009C6D4(0x3F); func_8008E4B0(); @@ -2676,10 +2739,8 @@ void menu_magic_codes_list_init(void) { GLOBAL_ASM("asm/non_matchings/menu/func_8008A56C.s") void func_8008A8F8(s32 arg0, s32 arg1, s32 arg2) { - if (arg0 & arg1) { - if (arg0 & gActiveMagicCodes) { - gActiveMagicCodes &= ~arg2; - } + if ((arg0 & arg1) && (arg0 & gActiveMagicCodes)) { + gActiveMagicCodes &= ~arg2; } } @@ -2690,7 +2751,7 @@ GLOBAL_ASM("asm/non_matchings/menu/menu_magic_codes_list_loop.s") extern s16 D_80126C80[0x1E]; // Array of shorts of the unlocked cheat's bit ids. void func_8008AD1C(void); void func_8008A56C(void); -s32 func_8006A554(s32 arg0); +s32 get_button_inputs_from_player(s32 arg0); s32 menu_magic_codes_list_loop(s32 arg0) { s32 temp_t0; @@ -2705,27 +2766,27 @@ s32 menu_magic_codes_list_loop(s32 arg0) { s8 *temp, *temp2; sp48 = 0; - if (D_800DF47C != 0) { - if (D_800DF47C > 0) { - D_800DF47C += arg0; + if (gMenuDelay != 0) { + if (gMenuDelay > 0) { + gMenuDelay += arg0; } else { - D_800DF47C -= arg0; + gMenuDelay -= arg0; } } D_801263BC = (D_801263BC + arg0) & 0x3F; - if (D_800DF47C >= -0x13 && D_800DF47C < 0x14) { + if (gMenuDelay >= -0x13 && gMenuDelay < 0x14) { func_8008A56C(); } phi_s3 = 0; phi_a2 = 0; phi_s2 = 0; - if (D_801263C4 == 0 && D_800DF47C == 0) { + if (!gIgnorePlayerInput && gMenuDelay == 0) { phi_s0 = 0; - temp = (s8*)&D_80126464; - temp2 = (s8*)&D_8012645C; + temp = (s8*)&gControllersYAxisDirection; + temp2 = (s8*)&gControllersXAxisDirection; while(phi_s0 < 4) { - phi_s3 |= func_8006A554(phi_s0); + phi_s3 |= get_button_inputs_from_player(phi_s0); phi_a2 += *temp; phi_s2 += *temp2; temp++; @@ -2746,9 +2807,9 @@ s32 menu_magic_codes_list_loop(s32 arg0) { phi_s0++; } - if (((phi_a2 < 0) || (phi_a2 > 0)) && (phi_a3_2 != D_80126C46)) { + if (((phi_a2 < 0) || (phi_a2 > 0)) && (phi_a3_2 != gOptionsMenuItemIndex)) { func_80001D04(0xEF, NULL); - phi_s1 = 1 << D_80126C80[D_80126C46]; + phi_s1 = 1 << D_80126C80[gOptionsMenuItemIndex]; gActiveMagicCodes ^= phi_s1; // Toggle active cheats? func_8008A8F8(phi_s1, 0x10, 0x20); // func_8008A8F8() = Clear flags? func_8008A8F8(phi_s1, 0x20, 0x10); @@ -2763,48 +2824,48 @@ s32 menu_magic_codes_list_loop(s32 arg0) { func_8008A8F8(phi_s1, 0x80000, 0x78000); } - phi_a2 = D_80126C46; + phi_a2 = gOptionsMenuItemIndex; if (phi_s2 < 0) { - D_80126C46++; - if (phi_a3_2 < D_80126C46) { - D_80126C46 = phi_a3_2; + gOptionsMenuItemIndex++; + if (phi_a3_2 < gOptionsMenuItemIndex) { + gOptionsMenuItemIndex = phi_a3_2; } } if (phi_s2 > 0) { - D_80126C46--; - if ((s32) D_80126C46 < 0) { - D_80126C46 = 0; + gOptionsMenuItemIndex--; + if ((s32) gOptionsMenuItemIndex < 0) { + gOptionsMenuItemIndex = 0; } } - if (D_80126C46 < D_801263E0) { - D_801263E0 = D_80126C46; - } else if (D_80126C46 >= (D_801263E0 + D_80126C70)) { - D_801263E0 = (D_80126C46 - D_80126C70) + 1; + if (gOptionsMenuItemIndex < D_801263E0) { + D_801263E0 = gOptionsMenuItemIndex; + } else if (gOptionsMenuItemIndex >= (D_801263E0 + D_80126C70)) { + D_801263E0 = (gOptionsMenuItemIndex - D_80126C70) + 1; } - if (D_80126C46 != phi_a2) { + if (gOptionsMenuItemIndex != phi_a2) { func_80001D04(0xEB, NULL); } - if ((phi_s3 & 0x9000) && (phi_a3_2 == D_80126C46)) { + if ((phi_s3 & 0x9000) && (phi_a3_2 == gOptionsMenuItemIndex)) { sp48 = -1; } if (phi_s3 & 0x4000) { sp48 = -1; } if (sp48 != 0) { - D_800DF47C = sp48; + gMenuDelay = sp48; func_800C01D8(D_800DF774); func_80001D04(0x241, NULL); } - if (D_800DF47C < -0x1E) { + if (gMenuDelay < -0x1E) { func_8008AD1C(); menu_init(0xA); return 0; } - D_801263C4 = 0; + gIgnorePlayerInput = 0; return 0; } #endif @@ -2832,32 +2893,41 @@ void func_8008AEB4(s32 arg0, s32 *arg1) { } } -void func_8008AF00(s32 arg0) { +/** + * Sets the player who controls the menus. + * 0 = controller 1, 1 = controller 2, 2 = controller 3, 3 = controller 4 + */ +void set_active_player_index(s32 controllerIndex) { s32 i; - D_800DF4BC = 1; + gNumberOfActivePlayers = 1; for (i = 0; i < 8; i++) { - players_character_array[i] = (i == arg0) ? 1 : -1; + gPlayersCharacterArray[i] = (i == controllerIndex) ? 1 : -1; } for(i = 0; i < 4; i++) { - D_801263D4[i] = (i == arg0) ? 1 : 0; + gActivePlayersArray[i] = (i == controllerIndex) ? 1 : 0; } } GLOBAL_ASM("asm/non_matchings/menu/menu_character_select_init.s") -void func_8008B20C(s32 arg0) { +/** + * Draws the "Player Select" and "OK?" text in the character select menu. + */ +void draw_character_select_text(s32 arg0) { s32 yPos; - if (D_800DF47C >= -0x16 && D_800DF47C < 0x17) { + if (gMenuDelay >= -0x16 && gMenuDelay < 0x17) { set_text_font(2); // Set font to the Big Yellow Text set_text_background_color(0, 0, 0, 0); set_text_color(0, 0, 0, 0xFF, 0x80); - draw_text(&D_801263A0, 0xA1, 0x23, D_800DF4A0->unk21C, 0xC); // Draw "Player Select" text drop shadow + // Draw "Player Select" text drop shadow + draw_text(&D_801263A0, 0xA1, 0x23, D_800DF4A0->unk21C, 0xC); set_text_color(0xFF, 0xFF, 0xFF, 0, 0xFF); - draw_text(&D_801263A0, 0xA0, 0x20, D_800DF4A0->unk21C, 0xC); // Draw "Player Select" text - if (D_800DF480 == D_800DF4BC && D_800DF4BC > 0) { + // Draw "Player Select" text + draw_text(&D_801263A0, 0xA0, 0x20, D_800DF4A0->unk21C, 0xC); + if (gNumberOfReadyPlayers == gNumberOfActivePlayers && gNumberOfActivePlayers > 0) { yPos = 0xD0; if (osTvType == 0) { yPos = 0xEA; @@ -2877,14 +2947,6 @@ GLOBAL_ASM("asm/non_matchings/menu/func_8008BB3C.s") #if 1 GLOBAL_ASM("asm/non_matchings/menu/menu_character_select_loop.s") #else - -/* Size: 0xE bytes. */ -typedef struct unk801263CC { - u8 pad0[0xC]; - s16 unkC; -} unk801263CC; - -extern unk801263CC *D_801263CC[8]; // unknown number of entries void func_8008C128(void); @@ -2892,9 +2954,9 @@ s32 menu_character_select_loop(s32 arg0) { s32 i; s32 phi_a0; s32 phi_t3; - s8 temp[4]; + s8 activePlayers[4]; - func_8008B20C(arg0); + draw_character_select_text(arg0); func_8008C168(arg0); func_8008E4EC(); @@ -2903,22 +2965,22 @@ s32 menu_character_select_loop(s32 arg0) { D_801263DC[i] = 2; } } - D_801263C4 = 0; - if (D_800DF47C == 0) { + gIgnorePlayerInput = 0; + if (gMenuDelay == 0) { // Issue: this loop unrolls weirdly. for (i = 0; i < 4; i++) { - temp[i] = D_801263D4[i]; + activePlayers[i] = gActivePlayersArray[i]; } func_8008B358(); - if (D_800DF480 == D_800DF4BC) { - func_8008B4C8(); + if (gNumberOfReadyPlayers == gNumberOfActivePlayers) { + func_8008B4C8(); // Cancel/Confirm selected character? } else { - func_8008B758(temp); + func_8008B758(activePlayers); // Move and select characters? } return 0; // This return needs to be here. - } else if (D_800DF47C > 0) { - D_800DF47C += arg0; - if (D_800DF47C >= 0x1F) { + } else if (gMenuDelay > 0) { + gMenuDelay += arg0; + if (gMenuDelay >= 0x1F) { phi_t3 = 0; if (D_800DFFD0 == 0) { phi_t3++; @@ -2928,22 +2990,22 @@ s32 menu_character_select_loop(s32 arg0) { } func_8008C128(); - // Regalloc issue: D_801263D4 and phi_a0 need to switch registers. + // Regalloc issue: gActivePlayersArray and phi_a0 need to switch registers. phi_a0 = 0; for(i = 0; i < 4; i++) { - if (D_801263D4[i]) { - gCharacterIdSlots[phi_a0] = (*D_801263CC)[players_character_array[i]].unkC; + if (gActivePlayersArray[i]) { + gCharacterIdSlots[phi_a0] = (*D_801263CC)[gPlayersCharacterArray[i]].unkC; phi_a0++; } } func_8008BB3C(phi_a0); - func_8006A458(D_801263D4); + func_8006A458(gActivePlayersArray); - D_800DF4B8 = 1; - if (phi_t3 >= D_800DF4BC) { + gIsInTracksMode = 1; + if (phi_t3 >= gNumberOfActivePlayers) { func_80000B18(); func_8006E2E8(0x27, -1, 0); - if (D_800DF4BC == 1 && D_800DF498 == 0) { + if (gNumberOfActivePlayers == 1 && !gPlayerHasSeenCautionMenu) { menu_init(MENU_CAUTION); } else { menu_init(MENU_GAME_SELECT); @@ -2955,12 +3017,12 @@ s32 menu_character_select_loop(s32 arg0) { menu_init(MENU_TRACK_SELECT); } } - } else if (D_800DF47C < 0) { - D_800DF47C -= arg0; - if (D_800DF47C < -0x1E) { + } else if (gMenuDelay < 0) { + gMenuDelay -= arg0; + if (gMenuDelay < -0x1E) { func_80000B28(); func_8008C128(); - D_800DF4BC = 1; + gNumberOfActivePlayers = 1; menu_init(MENU_TITLE); } } @@ -2978,10 +3040,11 @@ void func_8008BFE8(s32 arg0, s8 *arg1, s32 arg2, u16 arg3, u16 arg4) { someBool = 1; while (someBool && j < arg2 && arg1[j] != -1) { someBool = 0; - if ((get_filtered_cheats() & 0x400000) == 0) { + // Run this block if the DOUBLEVISION cheat isn't active. + if (!(get_filtered_cheats() & CHEAT_SELECT_SAME_PLAYER)) { i = 0; while(i < 4 && !someBool){ - if (i != arg0 && players_character_array[i] == arg1[j]) { + if (i != arg0 && gPlayersCharacterArray[i] == arg1[j]) { someBool = 1; } i++; @@ -2992,7 +3055,7 @@ void func_8008BFE8(s32 arg0, s8 *arg1, s32 arg2, u16 arg3, u16 arg4) { } } if (!someBool) { - players_character_array[arg0] = arg1[j]; + gPlayersCharacterArray[arg0] = arg1[j]; func_80001D04(arg3, NULL); return; } @@ -3010,11 +3073,11 @@ void func_8008C128(void) { GLOBAL_ASM("asm/non_matchings/menu/func_8008C168.s") void menu_caution_init(void) { - D_801263C4 = 0x3C; - D_800DF47C = 0; + gIgnorePlayerInput = 0x3C; + gMenuDelay = 0; func_800C4170(2); func_800C01D8(D_800DF77C); - D_800DF498 = 1; + gPlayerHasSeenCautionMenu = 1; } void func_8008C4E8(void); @@ -3022,28 +3085,23 @@ void func_8008C4E8(void); void draw_menu_element(s32, MenuElement*, f32); s32 menu_caution_loop(s32 arg0) { - if (D_800DF47C != 0) { - D_800DF47C += arg0; - } else { - if (D_801263C4 <= 0) { - if (func_8006A554(0) & 0xD000) { - func_80001D04(0xEF, NULL); - D_800DF47C = 1; - func_800C01D8(D_800DF774); - } - } + if (gMenuDelay != 0) { + gMenuDelay += arg0; + } else if (gIgnorePlayerInput <= 0 && get_button_inputs_from_player(0) & 0xD000) { + func_80001D04(0xEF, NULL); + gMenuDelay = 1; + func_800C01D8(D_800DF774); } - if (D_800DF47C < 0x14) { + if (gMenuDelay < 0x14) { draw_menu_element(1, D_800DFFD8, 1.0f); } - if (D_800DF47C >= 0x1F) { + if (gMenuDelay >= 0x1F) { func_8008C4E8(); menu_init(MENU_GAME_SELECT); } - if (D_801263C4 > 0) { - D_801263C4 = (s32) (D_801263C4 - arg0); + if (gIgnorePlayerInput > 0) { + gIgnorePlayerInput -= arg0; } - return 0; } @@ -3052,10 +3110,16 @@ void func_8008C4E8(void) { } #ifdef NON_MATCHING -void menu_game_select_init(void) { - s32 i, j; - D_800DF47C = 0; +typedef struct unk80126460 { + MenuElement unk0; + MenuElement unk20; +} unk80126460; + +void menu_game_select_init(void) { + s32 i, j, index; + + gMenuDelay = 0; D_801263BC = 0; D_800DF460 = 0; D_801263E0 = 2; @@ -3066,7 +3130,7 @@ void menu_game_select_init(void) { func_8009C6D4(0x43); func_8007FFEC(3); func_800C4170(2); - func_80000B34(0x1A); + play_music(0x1A); for(i = 0; i < 10; i++) { if (i != D_801263B4) { @@ -3087,7 +3151,7 @@ void menu_game_select_init(void) { // This loop doesn't match. for(i = 0; i <= D_801263E0; i++) { - D_80126460[i].texture = D_80126550[67]; + ((unk80126460*)D_80126460 + i + 1)->unk0.texture = D_80126550[67]; } } #else @@ -3109,7 +3173,7 @@ void func_8008C698(s32 arg0) { s32 i; s32 filterAlpha; - if (D_800DF47C >= -21 && D_800DF47C < 22) { + if (gMenuDelay >= -21 && gMenuDelay < 22) { fade = D_801263BC * 8; fade = fade; if (fade >= 0x100) { @@ -3159,7 +3223,7 @@ void menu_file_select_init(void) { func_8006EBA8(); D_801263D8 = 1; gSaveFileIndex = 0; - D_800DF47C = 0; + gMenuDelay = 0; D_801263E0 = 0; D_801263BC = 0; D_80126484 = 0; @@ -3167,7 +3231,7 @@ void menu_file_select_init(void) { D_80126CC0 = 0; func_800C01D8(D_800DF77C); func_800C4170(2); - func_80000B34(0x1A); + play_music(0x1A); for(i = 0; i < 10; i++) { if (i != D_801263B4) { func_80001114(D_800DFDB4[i][0]); @@ -3206,11 +3270,11 @@ void func_8008DC7C(s32 arg0) { s32 phi_v1; s32 phi_v1_2; - phi_v1 = func_8006A554(0); - temp_a1 = D_8012645C; - if (D_800DF4BC == 2) { - phi_v1 = phi_v1 | func_8006A554(1); - temp_a1 += D_8012645C+1; + phi_v1 = get_button_inputs_from_player(0); + temp_a1 = gControllersXAxisDirection; + if (gNumberOfActivePlayers == 2) { + phi_v1 = phi_v1 | get_button_inputs_from_player(1); + temp_a1 += gControllersXAxisDirection+1; } if (D_80126494 == 0) { @@ -3292,40 +3356,12 @@ void func_8008E4B0(void) { } GLOBAL_ASM("asm/non_matchings/menu/func_8008E4EC.s") - - - -#if 1 GLOBAL_ASM("asm/non_matchings/menu/menu_track_select_init.s") -#else -extern u32 D_800E0418; -void menu_track_select_init(void){ - u32 sp_7c; - u32 sp_78; - Settings *settings; - - func_800C4170(2); - get_settings(); - func_8006B224(&sp_7c, &sp_78); - func_8001E29C(26); - if(D_800DF488){ - D_801269C8 = 0; - D_801269CC = 0; - D_800E0414 = 0; - D_800E0418 = 0; - D_800DF488 = 0; - } - func_8007A520(); -} -#endif - GLOBAL_ASM("asm/non_matchings/menu/func_8008F00C.s") -#if 1 -GLOBAL_ASM("asm/non_matchings/menu/menu_track_select_loop.s") -#else - -// Close to done with this function. Just a regalloc issue remains. :/ +#ifdef NON_MATCHING + +// Close to done with this function. Just a regalloc issue remains. void func_8008F534(void); void func_8008FF1C(s32 arg0); @@ -3336,7 +3372,7 @@ void func_80090F30(s32 arg0); void func_80092188(s32 arg0); void func_8008E4EC(void); s32 func_800C73E0(void); -void musicSetRelativeVolume(u8 arg0); +void set_relative_volume_for_music(u8 arg0); s32 menu_track_select_loop(s32 arg0) { s32 phi_a2; @@ -3345,13 +3381,11 @@ s32 menu_track_select_loop(s32 arg0) { settings = get_settings(); D_801263BC = (D_801263BC + arg0) & 0x3F; - if (func_800C73E0() == 0) { - if (D_800DF47C != 0) { - if (D_800DF47C < 0) { - D_800DF47C -= arg0; - } else { - D_800DF47C += arg0; - } + if (func_800C73E0() == 0 && gMenuDelay != 0) { + if (gMenuDelay < 0) { + gMenuDelay -= arg0; + } else { + gMenuDelay += arg0; } } func_8008E4EC(); @@ -3372,18 +3406,18 @@ s32 menu_track_select_loop(s32 arg0) { } if (D_800DF760 < 0) { - musicSetRelativeVolume(0); + set_relative_volume_for_music(0); } else { D_800DF760 += arg0 * 2; if (D_800DF760 >= 0x51) { D_800DF760 = 0x50; } - musicSetRelativeVolume((u8)D_800DF760); + set_relative_volume_for_music((u8)D_800DF760); } if (D_801267D0 < 0) { func_8008F534(); D_800DF478 = 0; - if (D_800DF4BC >= 3 || D_800DF4BC == 2 && (gActiveMagicCodes << 7) >= 0) { + if (gNumberOfActivePlayers >= 3 || gNumberOfActivePlayers == 2 && (gActiveMagicCodes << 7) >= 0) { phi_a2 = 0; if (is_drumstick_unlocked()) { phi_a2 = 1; @@ -3402,7 +3436,7 @@ s32 menu_track_select_loop(s32 arg0) { } if (D_801267D0 >= 2) { func_8008F534(); - if (D_80126548 != D_800E0410) { + if (gMultiplayerSelectedNumberOfRacersCopy != gMultiplayerSelectedNumberOfRacers) { // regalloc issue with the for loop. for(i = 0; i < 8; i++) { settings->racers[i].starting_position = i; @@ -3410,7 +3444,7 @@ s32 menu_track_select_loop(s32 arg0) { } if (D_801269C8 != 4) { D_800DF478 = 1; - return D_800DF4BC; + return gNumberOfActivePlayers; } gTrophyRaceWorldId = D_801269CC + 1; D_800DF450 = 0; @@ -3418,9 +3452,11 @@ s32 menu_track_select_loop(s32 arg0) { menu_init(MENU_TROPHY_RACE_ROUND); return 0; } - D_801263C4 = 0; + gIgnorePlayerInput = 0; return 0; } +#else +GLOBAL_ASM("asm/non_matchings/menu/menu_track_select_loop.s") #endif void func_8008F534(void) { @@ -3506,9 +3542,9 @@ void menu_5_init(void) { Settings *settings; settings = get_settings(); - D_800DF4C4 = 0; + gTrackIdForPreview = 0; D_801263BC = 0; - D_800DF47C = 0; + gMenuDelay = 0; temp_s0 = settings->unk4C->unk2; gPlayerSelectVehicle = func_8006B0AC(temp_s0); temp_v0_2 = func_8006B14C(temp_s0); @@ -3527,7 +3563,7 @@ block_7: func_80000FDC(D_800E0758[temp_s0] & 0xFFFF, 0, 0x3F000000); } func_80000BE0(0x18); - func_80000B34(0x18); + play_music(0x18); func_80000B18(); D_801263E0 = 0; func_8009C674(&D_800E0FB4); @@ -3543,7 +3579,7 @@ block_7: D_800E0614 = (s32) D_80126550.unk178; func_800C01D8(D_800DF77C); D_801263BC = 0; - D_800DF47C = 0; + gMenuDelay = 0; D_800E0980 = 0x1E; func_800C4170(2); func_8006E2E8(temp_s0, -1, 1); @@ -3619,7 +3655,7 @@ void func_80094C14(s32 arg0) { case 1: if (func_8000C8B4(0x12C, &D_80126A94) < D_801263D8) { func_80000BE0(0x18); - func_80000B34(0x18); + play_music(0x18); func_80000C98(0x100); } break; @@ -3671,7 +3707,7 @@ void menu_11_init(void) { D_80126C14 = 3; - for (i = 0; i < D_800DF4BC; i++) { + for (i = 0; i < gNumberOfActivePlayers; i++) { temp_a2 = settings->racers[i].starting_position; if (temp_a2 < 4) { placements = settings->racers[i].placements; @@ -3682,9 +3718,9 @@ void menu_11_init(void) { D_801263E0 = -1; D_801263BC = 0; D_801263D8 = 0; - D_800DF47C = 0; + gMenuDelay = 0; D_80126A68 = 0; - D_801263C4 = 1; + gIgnorePlayerInput = 1; D_800E0988 = 0; func_8009C674(D_800E0A24); func_8009C8A4(D_800E0A40); @@ -3692,7 +3728,7 @@ void menu_11_init(void) { func_800C4170(2); func_800C01D8(D_800DF77C); func_80000BE0(0x18); - func_80000B34(0x18); + play_music(0x18); func_80000C98(0x80); } @@ -3800,7 +3836,7 @@ void func_80097874(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 *arg4, s32 arg5, D_80126C78 = arg6; D_800E0FA0 = 0; D_80126C50 = (f32) *D_80126C6C; - D_80126C48 = 0; + gCheatInputString = NULL; D_80126C3C = 0; D_80126C34 = 0; func_800C4170(2); @@ -3823,7 +3859,7 @@ void func_80098208(void) { settings->unk4C->unkF = 0; settings->unk4C->unk1 = 0; D_800DF450 = 1; - func_8000E4BC(0); + set_time_trial_enabled(0); } extern s32 D_800E0980; @@ -3852,18 +3888,18 @@ void menu_trophy_race_round_init(void) { temp = (temp + 1) & 3; } - for(i = 0; i < D_800DF4BC; i++){ + for(i = 0; i < gNumberOfActivePlayers; i++){ gPlayerSelectVehicle[i] = func_8006B0AC(temp); } func_8006DB14(func_8006B0AC(temp)); func_8006E2E8(temp, -1, 1); - D_800DF47C = 0; + gMenuDelay = 0; D_800E0980 = 10; func_800C4170(2); func_80000BE0(0x18); - func_80000B34(0x18); + play_music(0x18); func_80000C98(0x100); } #endif @@ -3923,7 +3959,7 @@ void func_80098EBC(s32 arg0) { for (i = 0; i < D_800E0FE4; i++) { fade = 0xFF; - if (D_800DF4BC < 3 && ((D_801263E0 == 0 && D_80126418[i]) || (D_801263E0 != 0 && D_80126420[i]))) { + if (gNumberOfActivePlayers < 3 && ((D_801263E0 == 0 && D_80126418[i]) || (D_801263E0 != 0 && D_80126420[i]))) { fade = (test >> 1) + 0x80; } @@ -3991,7 +4027,7 @@ void menu_23_init(void) { func_80094604(); } func_8006E2E8(D_801267EC[0], D_801267EC[1], D_801267EC[2]); - D_800DF47C = 0; + gMenuDelay = 0; D_801263E0 = 0; } @@ -4004,13 +4040,13 @@ void func_8009AF18(void) { } void menu_credits_init(void) { - s32 phi_v1; - s32 phi_a0; - u16 *temp; + s32 cheat; + s32 cheatIndex; + u16 *cheatOffsets; Settings *settings; settings = get_settings(); - D_800DF47C = 0; + gMenuDelay = 0; D_80126BC4 = 0; D_80126BCC = 0; D_801263E0 = 0; @@ -4035,33 +4071,35 @@ void menu_credits_init(void) { func_800C4170(2); func_80000BE0(0x18); D_800E18F8 = (u16)0x1000; - if (D_800E1B4C) { - func_80000B34(8); - D_800E1938[84] = D_800E1AE4[2]; - D_800E1938[85] = D_800E1AE4[3]; - D_800E1938[86] = D_800E1AE4[4]; - D_800E1B4C = 0; + if (gViewingCreditsFromCheat) { + play_music(8); + gCreditsArray[84] = gCreditsLastMessageArray[2]; // "THE END" + gCreditsArray[85] = gCreditsLastMessageArray[3]; // "NO CHEAT" + gCreditsArray[86] = gCreditsLastMessageArray[4]; // "THIS TIME." + gViewingCreditsFromCheat = 0; } else { if (settings->bosses & 0x20) { - func_80000B34(0x25); - D_800E1938[84] = D_800E1AE4[1]; + play_music(0x25); + gCreditsArray[84] = gCreditsLastMessageArray[1]; // "TO BE CONTINUED ..." D_800E18F8 = (u16)0x61F4; D_80126BCC = 9; } else { - func_80000B34(8); - D_800E1938[84] = D_800E1AE4[0]; - } - phi_v1 = D_800E1AF8[func_8006F94C(0, 0x14, &D_800E1938)]; - phi_a0 = -1; - while(phi_v1 != 0) { - phi_v1 >>= 1; - phi_a0++; + play_music(8); + gCreditsArray[84] = gCreditsLastMessageArray[0]; // "THE END?" } - // I don't know why this works. Please clean it up if you can! - temp = *D_80126C30 + 1; - D_800E1938[85] = (char*)(*D_80126C30) + (temp)[(phi_a0 << 1) + 1]; - D_800E1938[86] = (char*)(*D_80126C30) + (temp)[(phi_a0 << 1)]; + cheat = gCheatsInCreditsArray[get_random_number_from_range(0, NUMBER_CHEATS_IN_CREDITS - 1)]; + cheatIndex = -1; + while(cheat != 0) { + cheat >>= 1; + cheatIndex++; + } + + // The first u16 of gCheatsAssetData is the total number of cheats. + // After that is the offsets to the cheat strings. + cheatOffsets = *gCheatsAssetData + 1; + gCreditsArray[85] = (char*)(*gCheatsAssetData) + (cheatOffsets)[(cheatIndex << 1) + 1]; // Cheat name + gCreditsArray[86] = (char*)(*gCheatsAssetData) + (cheatOffsets)[(cheatIndex << 1)]; // Cheat code } func_80000B18(); func_800C0170(); @@ -4136,38 +4174,45 @@ void func_8009BE54() { } -void func_8009BE5C(void) { +void reset_controller_sticks(void) { s32 i; for(i = 0; i < 4; i++) { - D_8012645C[i] = 0; - D_80126464[i] = 0; - D_80126454[i] = 0; - D_80126458[i] = 0; - D_80126468[i] = 0; - D_8012646C[i] = 0; + gControllersXAxisDirection[i] = 0; + gControllersYAxisDirection[i] = 0; + gControllersXAxisDelay[i] = 0; + gControllersYAxisDelay[i] = 0; + gControllersXAxis[i] = 0; + gControllersYAxis[i] = 0; } } GLOBAL_ASM("asm/non_matchings/menu/func_8009BF20.s") /** - * Reset the character slot indices from 0 to 7. + * Reset the character id number slots to the default. */ void reset_character_id_slots(void) { s32 i; - D_800DF4C8 = 1; + gTrackSelectRow = 1; // 1 = Dino Domain for(i = 0; i < 8; i++) { gCharacterIdSlots[i] = i; } } +/** + * Returns the value from gSaveFileIndex + */ s32 get_save_file_index(void) { return gSaveFileIndex; } -s32 func_8009C1B0(void) { +/** + * Returns the track id that should be loaded. The value depends + * on if whether you are playing in adventure or tracks mode. + */ +s32 get_track_id_to_load(void) { Settings *settings = get_settings(); - if (D_800DF4B8 == 0 && D_800DF478 == 0) { + if (!gIsInTracksMode && D_800DF478 == 0) { if (settings->newGame) { return 0; } else { @@ -4175,7 +4220,7 @@ s32 func_8009C1B0(void) { } } D_800DF478 = 0; - return D_800DF4D4; + return gTrackIdToLoad; } /** @@ -4212,25 +4257,31 @@ s8* func_8009C274(void) { return D_801263DC; } -s8 func_8009C280(s32 arg0) { - if (arg0 < 0 || arg0 >= 4) { +/** + * Returns the character Id from a controller index. + */ +s8 get_player_character(s32 controllerIndex) { + if (controllerIndex < 0 || controllerIndex >= 4) { return -1; } - if (D_801263D4[arg0] == 0) { + if (gActivePlayersArray[controllerIndex] == 0) { return -1; } - return players_character_array[arg0]; + return gPlayersCharacterArray[controllerIndex]; } -void func_8009C2C4(s32 arg0) { - D_800DF4B8 = arg0; +/** + * Sets the value of gIsInTracksMode, which determines if the player is in tracks mode or not. + */ +void enable_tracks_mode(s32 boolean) { + gIsInTracksMode = boolean; } /** * Returns if the player is playing in the tracks mode instead of adventure. */ s32 is_in_tracks_mode(void) { - return D_800DF4B8; + return gIsInTracksMode; } /** @@ -4241,29 +4292,40 @@ void set_magic_code_flags(s32 flags) { gUnlockedMagicCodes |= flags; } +#define CHEATS_ALLOWED_IN_ADVENTURE_AND_TIME_TRIAL (CHEAT_CONTROL_TT | CHEAT_CONTROL_DRUMSTICK | \ + CHEAT_BIG_CHARACTERS | CHEAT_SMALL_CHARACTERS | CHEAT_HORN_CHEAT | CHEAT_SELECT_SAME_PLAYER | \ + CHEAT_TWO_PLAYER_ADVENTURE | CHEAT_ULTIMATE_AI | CHEAT_EPC_LOCK_UP_DISPLAY | CHEAT_ROM_CHECKSUM) \ + +// Remember that ~ means NOT. So the challenge maps only allow cheats NOT included here. +#define CHEATS_ALLOWED_IN_CHALLENGES ~(CHEAT_START_WITH_10_BANANAS | CHEAT_DISABLE_BANANAS | \ + CHEAT_DISABLE_WEAPONS | CHEAT_ALL_BALLOONS_ARE_RED | CHEAT_ALL_BALLOONS_ARE_GREEN | \ + CHEAT_ALL_BALLOONS_ARE_BLUE | CHEAT_ALL_BALLOONS_ARE_YELLOW | CHEAT_ALL_BALLOONS_ARE_RAINBOW) + /** - * Filters active cheats based on different conditions. + * Filters active cheats based on different conditions. Also enables mirroring for Adventure 2. */ s32 get_filtered_cheats(void) { s32 cheats = gActiveMagicCodes; - if (D_800DF4B8 == 0 || func_8000E4C8() != 0) { - cheats &= 0x1B400133; + if (!gIsInTracksMode || is_time_trial_enabled()) { + cheats &= CHEATS_ALLOWED_IN_ADVENTURE_AND_TIME_TRIAL; } if (!func_8006B240()) { - cheats &= ~4; // Clears MIRRORED_TRACKS cheat + cheats &= ~CHEAT_MIRRORED_TRACKS; // Disable mirroring } - if ((func_8006B14C(get_settings()->courseId) & 0x40) != 0) { - // Clears START_WITH_10_BANANAS, DISABLE_WEAPONS, DISABLE_BANANAS, and BALLOON cheats. - cheats &= ~0xF9880; + if (func_8006B14C(get_settings()->courseId) & 0x40) { + cheats &= CHEATS_ALLOWED_IN_CHALLENGES; } if (gIsInAdventureTwo && func_8006B240()) { - cheats |= 4; // Sets MIRRORED_TRACKS cheat + cheats |= CHEAT_MIRRORED_TRACKS; // Enable mirroring } return cheats; } -s32 func_8009C3C8(void) { - return D_800DF4BC; +/** + * Returns the value in gNumberOfActivePlayers. + */ +s32 get_number_of_active_players(void) { + return gNumberOfActivePlayers; } typedef struct unk8006BDB0 { @@ -4273,22 +4335,26 @@ typedef struct unk8006BDB0 { s32 func_8009C3D8(void) { unk8006BDB0 *temp = (unk8006BDB0*)func_8006BDB0(); - if (gIsInTwoPlayerAdventure && D_800DF4B8 == 0) { + if (gIsInTwoPlayerAdventure && !gIsInTracksMode) { if (temp->unk4C == 0 || (temp->unk4C & 0x40) != 0) { return 2; } } - return D_800DF4BC; + return gNumberOfActivePlayers; } -s32 func_8009C440(void) { - if (D_800DF4B8 == 0) { - return 6; +/** + * Returns the number of racers for a multiplayer match. + */ +s32 get_multiplayer_racer_count(void) { + if (!gIsInTracksMode) { + return 6; // Two player adventure is fixed at 6 racers } if (gTrophyRaceWorldId) { - return 6; + return 6; // Trophy race is fixed at 6 racers } - return (D_800E0410 + 1) << 1; // Doesn't match with multiply. + // gMultiplayerSelectedNumberOfRacers is either 0 (2 racers), 1 (4 racers), or 2 (6 racers) + return (gMultiplayerSelectedNumberOfRacers + 1) << 1; // Doesn't match with multiply. } Settings** func_8009C490(void) { @@ -4366,7 +4432,7 @@ void func_8009C8A4(s16 *arg0) { } } -s32 func_8006F94C(s32, s32); +s32 get_random_number_from_range(s32, s32); void func_8009C904(s32 arg0) { if (D_800DF75C == NULL) { D_800DF75C = func_80070C9C(sizeof(unk800DF510) * 18, 0xFF0000FF); @@ -4381,9 +4447,9 @@ void func_8009C904(s32 arg0) { D_800DF75C[arg0].unk14 = D_800DF510[arg0].unk14; D_800DF75C[arg0].unk8 = D_800DF510[arg0].unk8; D_800DF75C[arg0].unk18 = D_800DF510[arg0].unk18; - D_800DF75C[arg0].unk1A = func_8006F94C(0, 0xFFFF); - D_800DF75C[arg0].unk1B = func_8006F94C(0, 0xFFFF); - D_800DF75C[arg0].unk1C = func_8006F94C(0, 0xFFFF); + D_800DF75C[arg0].unk1A = get_random_number_from_range(0, 0xFFFF); + D_800DF75C[arg0].unk1B = get_random_number_from_range(0, 0xFFFF); + D_800DF75C[arg0].unk1C = get_random_number_from_range(0, 0xFFFF); D_800DF75C[arg0].unk1D = D_800DF510[arg0].unk1D; } @@ -4408,7 +4474,7 @@ void func_8009CFB0(void) { if (D_800DF4E0 != 0) { D_800DF4E0 = 0; func_800C5620(1); - func_8009BE5C(); + reset_controller_sticks(); } } @@ -4437,10 +4503,10 @@ void func_8009D1B8(s32 arg0, s32 arg1, s32 arg2) { } void func_8009D26C(void) { - if (D_80126464[0] < 0) { + if (gControllersYAxisDirection[0] < 0) { D_801264D8 = D_801264D8 + 1; func_80001D04(0xB2, NULL); - } else if (D_80126464[0] > 0) { + } else if (gControllersYAxisDirection[0] > 0) { D_801264D8 = D_801264D8 - 1; func_80001D04(0xB2, NULL); } @@ -4472,12 +4538,12 @@ GLOBAL_ASM("asm/non_matchings/menu/func_8009D360.s") s32 func_8009D9F4(void) { s32 state; - s32 temp_v0; + s32 playerInput; func_800C4EDC(1, 0x18, 0x10, 0xB8, 0x87); func_800C4F7C(1, 0); state = 0; - temp_v0 = func_8006A554(0); + playerInput = get_button_inputs_from_player(0); D_80126504 = 0; D_800DF4DC = 0; func_800C5168(1, -0x8000, 6, D_800DF4A0->unkC4, 1, 4); @@ -4486,7 +4552,7 @@ s32 func_8009D9F4(void) { func_8009D1B8(D_800DF4A0->unk5C, 0x14, 0); func_8009D1B8(D_800DF4A0->unkCC, 0x14, 1); func_8009D26C(); - if (temp_v0 & 0x8000) { + if (playerInput & 0x8000) { func_80001D04(0xEF, NULL); switch(D_80126516) { case 0: diff --git a/src/menu.h b/src/menu.h index a55e3ebe..c282714d 100644 --- a/src/menu.h +++ b/src/menu.h @@ -7,22 +7,22 @@ extern s8 D_800DF450; extern f32 D_800DF454; extern s32 D_800DF458; -extern s32 D_800DF45C; +extern s32 gTitleScreenCurrentOption; extern s32 D_800DF460; extern s32 D_800DF464; extern s32 D_800DF468; extern s32 D_800DF46C; -extern s32 D_800DF470; +extern s32 gCurrentMenuId; extern s32 D_800DF474; extern s32 D_800DF478; -extern s32 D_800DF47C; -extern s32 D_800DF480; +extern s32 gMenuDelay; +extern s32 gNumberOfReadyPlayers; extern s32 D_800DF484; extern s32 D_800DF488; extern s32 D_800DF48C; extern s32 D_800DF490; extern s32 gIsInAdventureTwo; -extern s32 D_800DF498; +extern s32 gPlayerHasSeenCautionMenu; extern s32 D_800DF49C; typedef struct unk800DF4A0 { @@ -58,15 +58,15 @@ extern u8 D_800DF4AC; extern s32 D_800DF4B0; extern s32 D_800DF4B4; -extern s32 D_800DF4B8; -extern s32 D_800DF4BC; +extern s32 gIsInTracksMode; +extern s32 gNumberOfActivePlayers; extern s32 gIsInTwoPlayerAdventure; -extern s32 D_800DF4C4; -extern s32 D_800DF4C8; +extern s32 gTrackIdForPreview; +extern s32 gTrackSelectRow; extern s32 gSaveFileIndex; extern s32 D_800DF4D0; -extern s32 D_800DF4D4; +extern s32 gTrackIdToLoad; extern s8 D_800DF4D8; extern s8 D_800DF4DC; extern s8 D_800DF4E0; @@ -178,8 +178,8 @@ extern unk800DFA3C D_800DFA3C[8]; extern s32 D_800DFABC; -extern s32 D_800DFAC0; -extern s32 D_800DFAC4; +extern s32 gSfxVolumeSliderValue; +extern s32 gMusicVolumeSliderValue; extern s32 D_800DFAC8; // Unsure about typing here. @@ -275,7 +275,7 @@ extern u16 D_800E03CC[24]; extern u16 D_800E03FC[10]; -extern s32 D_800E0410; +extern s32 gMultiplayerSelectedNumberOfRacers; extern s32 D_800E0414; extern s32 D_800E0418; @@ -405,7 +405,7 @@ extern char gSixthPlace[4]; extern char gSeventhPlace[4]; extern char gEighthPlace[4]; -extern char *D_800E0BCC[8]; +extern char *gRacePlacementsArray[8]; MenuElement D_800E0BEC[8]; @@ -440,7 +440,7 @@ extern s32 D_800E0FF0; extern u32 D_800E0FF4[4]; // Number of points to award in trophy race for each place? -extern s32 D_800E1004[8]; +extern s32 gTrophyRacePointsArray[8]; extern s16 D_800E1024[14]; @@ -490,17 +490,17 @@ extern u16 D_800E18F8; extern u16 D_800E18FC[30]; // Credits text look-up table -extern char *D_800E1938[87]; +extern char *gCreditsArray[87]; // Credits text look-up table (time trials time sheet) -extern char *D_800E1A94[20]; +extern char *gCreditsBestTimesArray[20]; // Another credits text look-up table -extern char *D_800E1AE4[5]; +extern char *gCreditsLastMessageArray[5]; -extern s32 D_800E1AF8[21]; +extern s32 gCheatsInCreditsArray[21]; -extern s32 D_800E1B4C; +extern s32 gViewingCreditsFromCheat; MenuElement D_800E1B50[9]; @@ -530,7 +530,7 @@ extern s16 D_800E1DC8[16]; extern s16 D_800E1DE8[4]; -extern char D_800E1DF0[24]; +extern char gRareCopyrightString[24]; extern s16 D_800E1E08[4]; diff --git a/src/unknown_00BC20.c b/src/unknown_00BC20.c index 6c82a2d2..e354ac33 100644 --- a/src/unknown_00BC20.c +++ b/src/unknown_00BC20.c @@ -222,7 +222,7 @@ Player *(*playerStructArray_Ptr)[8]; s32 *D_8011AEE8; s32 *D_8011AEEC; s32 playerCount; -u8 D_8011AEF4; +u8 gTimeTrialEnabled; u8 D_8011AEF5; u8 D_8011AEF6; u8 D_8011AEF7; @@ -389,7 +389,7 @@ void func_8000BF8C(void) { func_8000C2D8(&D_8011AD6C[D_8011AD70[65]], (D_8011AD70[66] - D_8011AD70[65]) * 4); objPtrList = (Player**)func_80070C9C(0x800, 0xFFFF); D_8011ADC4 = 0; - D_8011AEF4 = 0; + gTimeTrialEnabled = 0; D_8011AEF5 = 0; D_8011ADA8 = 2.0f; func_8000C460(); @@ -619,12 +619,12 @@ void func_8000E1EC(Player *arg0, s32 arg1) { GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8000E2B4.s") -void func_8000E4BC(s32 arg0) { - D_8011AEF4 = arg0; +void set_time_trial_enabled(s32 arg0) { + gTimeTrialEnabled = arg0; } -u8 func_8000E4C8() { - return D_8011AEF4; +u8 is_time_trial_enabled() { + return gTimeTrialEnabled; } u8 func_8000E4D8(void){ diff --git a/src/unknown_0348C0.c b/src/unknown_0348C0.c index 95a12030..da35e695 100644 --- a/src/unknown_0348C0.c +++ b/src/unknown_0348C0.c @@ -853,12 +853,12 @@ void func_8004203C(Player *arg0, unk8004203C_arg1 *arg1) { } void func_80042090(Player *arg0, s32 arg1) { - if (arg0->unk78 >= func_8006F94C(0, 0x400)) { + if (arg0->unk78 >= get_random_number_from_range(0, 0x400)) { arg0->unk74 = 1; } else { arg0->unk74 = 0; } - if (func_8009C3C8() < 2) { + if (get_number_of_active_players() < 2) { func_800AFC3C(arg0, arg1); } } diff --git a/src/unknown_043920.c b/src/unknown_043920.c index 51f19eeb..0a25f612 100644 --- a/src/unknown_043920.c +++ b/src/unknown_043920.c @@ -201,7 +201,7 @@ GLOBAL_ASM("asm/non_matchings/unknown_043920/func_80043ECC.s") GLOBAL_ASM("asm/non_matchings/unknown_043920/func_80044170.s") s32 func_80044450(s32 arg0) { - return func_8006F94C(0, 99) < arg0; + return get_random_number_from_range(0, 99) < arg0; } GLOBAL_ASM("asm/non_matchings/unknown_043920/func_8004447C.s") diff --git a/src/unknown_066AA0.c b/src/unknown_066AA0.c index 53590b5e..7a66abe3 100644 --- a/src/unknown_066AA0.c +++ b/src/unknown_066AA0.c @@ -930,7 +930,7 @@ u16 func_8006A528(s32 arg0) { return D_80121110[D_80121150[arg0]].unk0; } -u16 func_8006A554(s32 arg0) { +u16 get_button_inputs_from_player(s32 arg0) { return D_80121140[D_80121150[arg0]]; } diff --git a/src/unknown_06B2B0.c b/src/unknown_06B2B0.c index 298d7b7a..ad4a994f 100644 --- a/src/unknown_06B2B0.c +++ b/src/unknown_06B2B0.c @@ -467,7 +467,7 @@ void func_8006B250(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4) { } else { D_800DD318 = (u8)0; } - if (D_80121168->race_type == 0 && sp48 == 0 && func_8000E4C8(arg4) != 0) { + if (D_80121168->race_type == 0 && sp48 == 0 && is_time_trial_enabled(arg4) != 0) { arg4 = 0x64; } func_8001E450(arg4); @@ -521,7 +521,7 @@ void func_8006B250(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4) { void func_8006BD10(f32 arg0) { if (D_80121168->music != 0) { func_800012E8(); - func_80000B34(D_80121168->music); + play_music(D_80121168->music); func_800014BC(arg0); func_80001074(D_80121168->instruments); } @@ -784,7 +784,7 @@ GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006C60C.s") void func_8006CAE4(s32 arg0, s32 arg1, s32 arg2) { D_80123500 = arg0 - 1; if (arg1 == -1) { - D_801234F4 = func_8009C1B0(); + D_801234F4 = get_track_id_to_load(); } else { D_801234F4 = arg1; } @@ -993,7 +993,7 @@ GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006E3BC.s") void func_8006E5BC(void) { s32 i, j; - gSettingsPtr->playerCount = func_8009C3C8(); + gSettingsPtr->playerCount = get_number_of_active_players(); for (i = 0; i < 8; i++) { gSettingsPtr->racers[i].best_times = 0; gSettingsPtr->racers[i].character = get_character_id_from_slot(i); diff --git a/tools/python/score.py b/tools/python/score.py index 2249171e..9e6d78cf 100644 --- a/tools/python/score.py +++ b/tools/python/score.py @@ -30,7 +30,7 @@ for folder in ASM_FOLDERS: BUILD_DIRECTORY = './build/us_1.0' SRC_DIRECTORY = './src' LIB_SRC_DIRECTORY = './lib/src' -FUNCTION_REGEX = r'(\/[*][*!]+\n(?:.*\n)+?\s*[*]\/\n)?(void|s64|s32|s16|s8|u64|u32|u16|u8|f32|f64)(?:\s|[*])*?([0-9A-Za-z_]+)\s*[(][^)]*[)]\s*{' +FUNCTION_REGEX = r'(?:(\/[*][*!][*]*\n(?:[^/]*\n)+?\s*[*]\/\n)(?:\s*)*?)?(void|s64|s32|s16|s8|u64|u32|u16|u8|f32|f64)(?:\s|[*])*?([0-9A-Za-z_]+)\s*[(][^)]*[)]\s*{' GLOBAL_ASM_REGEX = r'GLOBAL_ASM[(]".*(?=\/)\/([^.]+).s"[)]' WIP_REGEX = r'#if(?:.|\n)*?(GLOBAL_ASM[(][^)]*[)])(.|\n)*?#endif'