diff --git a/asm/non_matchings/menu/func_80081218.s b/asm/non_matchings/menu/func_80081218.s index 4b518dd1..55f1d538 100644 --- a/asm/non_matchings/menu/func_80081218.s +++ b/asm/non_matchings/menu/func_80081218.s @@ -87,9 +87,9 @@ glabel func_80081218 /* 081F6C 8008136C 2405FFFF */ li $a1, -1 /* 081F70 80081370 0C01C327 */ jal allocate_from_main_pool_safe /* 081F74 80081374 AC386C38 */ sw $t8, %lo(D_80126C38)($at) -/* 081F78 80081378 3C01800E */ lui $at, %hi(D_800DF4A0) # $at, 0x800e -/* 081F7C 8008137C AC22F4A0 */ sw $v0, %lo(D_800DF4A0)($at) -/* 081F80 80081380 0C01FE40 */ jal func_8007F900 +/* 081F78 80081378 3C01800E */ lui $at, %hi(gMenuText) # $at, 0x800e +/* 081F7C 8008137C AC22F4A0 */ sw $v0, %lo(gMenuText)($at) +/* 081F80 80081380 0C01FE40 */ jal load_menu_text /* 081F84 80081384 00002025 */ move $a0, $zero /* 081F88 80081388 3C028012 */ lui $v0, %hi(D_80126550) # $v0, 0x8012 /* 081F8C 8008138C 3C038012 */ lui $v1, %hi(D_80126750) # $v1, 0x8012 diff --git a/asm/non_matchings/menu/func_8008377C.s b/asm/non_matchings/menu/func_8008377C.s index c05c791b..f2059977 100644 --- a/asm/non_matchings/menu/func_8008377C.s +++ b/asm/non_matchings/menu/func_8008377C.s @@ -88,12 +88,12 @@ glabel func_8008377C /* 0844C8 800838C8 00003025 */ move $a2, $zero /* 0844CC 800838CC 0C0310F3 */ jal set_text_background_color /* 0844D0 800838D0 00003825 */ move $a3, $zero -/* 0844D4 800838D4 3C0E800E */ lui $t6, %hi(D_800DF7A4) # $t6, 0x800e -/* 0844D8 800838D8 8DCEF7A4 */ lw $t6, %lo(D_800DF7A4)($t6) +/* 0844D4 800838D4 3C0E800E */ lui $t6, %hi(gTitleMenuStrings) # $t6, 0x800e +/* 0844D8 800838D8 8DCEF7A4 */ lw $t6, %lo(gTitleMenuStrings)($t6) /* 0844DC 800838DC 00117880 */ sll $t7, $s1, 2 /* 0844E0 800838E0 11C00035 */ beqz $t6, .L800839B8 -/* 0844E4 800838E4 3C18800E */ lui $t8, %hi(D_800DF7A4) # $t8, 0x800e -/* 0844E8 800838E8 2718F7A4 */ addiu $t8, %lo(D_800DF7A4) # addiu $t8, $t8, -0x85c +/* 0844E4 800838E4 3C18800E */ lui $t8, %hi(gTitleMenuStrings) # $t8, 0x800e +/* 0844E8 800838E8 2718F7A4 */ addiu $t8, %lo(gTitleMenuStrings) # addiu $t8, $t8, -0x85c /* 0844EC 800838EC 3C148012 */ lui $s4, %hi(D_801263BC) # $s4, 0x8012 /* 0844F0 800838F0 3C13800E */ lui $s3, %hi(gTitleScreenCurrentOption) # $s3, 0x800e /* 0844F4 800838F4 2673F45C */ addiu $s3, %lo(gTitleScreenCurrentOption) # addiu $s3, $s3, -0xba4 diff --git a/asm/non_matchings/menu/func_80084854.s b/asm/non_matchings/menu/func_80084854.s index 612abf22..f1f8caa1 100644 --- a/asm/non_matchings/menu/func_80084854.s +++ b/asm/non_matchings/menu/func_80084854.s @@ -1,7 +1,7 @@ glabel func_80084854 /* 085454 80084854 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* 085458 80084858 3C058012 */ lui $a1, %hi(D_801269E0) # $a1, 0x8012 -/* 08545C 8008485C 24A569E0 */ addiu $a1, %lo(D_801269E0) # addiu $a1, $a1, 0x69e0 +/* 085458 80084858 3C058012 */ lui $a1, %hi(gMusicTestString) # $a1, 0x8012 +/* 08545C 8008485C 24A569E0 */ addiu $a1, %lo(gMusicTestString) # addiu $a1, $a1, 0x69e0 /* 085460 80084860 8CA30000 */ lw $v1, ($a1) /* 085464 80084864 AFBF003C */ sw $ra, 0x3c($sp) /* 085468 80084868 AFB30038 */ sw $s3, 0x38($sp) @@ -57,7 +57,7 @@ glabel func_80084854 /* 085520 80084920 8CAB0000 */ lw $t3, ($a1) /* 085524 80084924 3C058012 */ lui $a1, %hi(D_801263A8) # $a1, 0x8012 /* 085528 80084928 01716021 */ addu $t4, $t3, $s1 -/* 08552C 8008492C 3C198012 */ lui $t9, %hi(D_801269D0) # $t9, 0x8012 +/* 08552C 8008492C 3C198012 */ lui $t9, %hi(gAudioOutputStrings) # $t9, 0x8012 /* 085530 80084930 24A563A8 */ addiu $a1, %lo(D_801263A8) # addiu $a1, $a1, 0x63a8 /* 085534 80084934 02402025 */ move $a0, $s2 /* 085538 80084938 00004812 */ mflo $t1 @@ -75,12 +75,12 @@ glabel func_80084854 /* 085568 80084968 01CD9823 */ subu $s3, $t6, $t5 .L8008496C: /* 08556C 8008496C 8DEFFAC8 */ lw $t7, %lo(D_800DFAC8)($t7) -/* 085570 80084970 3C01800E */ lui $at, %hi(D_800DFA3C+12) # $at, 0x800e +/* 085570 80084970 3C01800E */ lui $at, %hi(gAudioMenuStrings+12) # $at, 0x800e /* 085574 80084974 000FC080 */ sll $t8, $t7, 2 /* 085578 80084978 0338C821 */ addu $t9, $t9, $t8 -/* 08557C 8008497C 8F3969D0 */ lw $t9, %lo(D_801269D0)($t9) +/* 08557C 8008497C 8F3969D0 */ lw $t9, %lo(gAudioOutputStrings)($t9) /* 085580 80084980 0C019FCB */ jal func_80067F2C -/* 085584 80084984 AC39FA48 */ sw $t9, %lo(D_800DFA3C+12)($at) +/* 085584 80084984 AC39FA48 */ sw $t9, %lo(gAudioMenuStrings+12)($at) /* 085588 80084988 3C088000 */ lui $t0, %hi(osTvType) # $t0, 0x8000 /* 08558C 8008498C 8D080300 */ lw $t0, %lo(osTvType)($t0) /* 085590 80084990 3C11FFC0 */ lui $s1, (0xFFC040FF >> 16) # lui $s1, 0xffc0 @@ -204,7 +204,7 @@ glabel func_80084854 /* 085760 80084B60 00001825 */ move $v1, $zero /* 085764 80084B64 29810005 */ slti $at, $t4, 5 /* 085768 80084B68 10200005 */ beqz $at, .L80084B80 -/* 08576C 80084B6C 3C0D800E */ lui $t5, %hi(D_800DFA3C+12) # $t5, 0x800e +/* 08576C 80084B6C 3C0D800E */ lui $t5, %hi(gAudioMenuStrings+12) # $t5, 0x800e /* 085770 80084B70 3C118012 */ lui $s1, %hi(gOptionsMenuItemIndex) # $s1, 0x8012 /* 085774 80084B74 86316C46 */ lh $s1, %lo(gOptionsMenuItemIndex)($s1) /* 085778 80084B78 1000000E */ b .L80084BB4 @@ -225,11 +225,11 @@ glabel func_80084854 /* 0857AC 80084BAC 10000001 */ b .L80084BB4 /* 0857B0 80084BB0 24110006 */ li $s1, 6 .L80084BB4: -/* 0857B4 80084BB4 8DADFA48 */ lw $t5, %lo(D_800DFA3C+12)($t5) +/* 0857B4 80084BB4 8DADFA48 */ lw $t5, %lo(gAudioMenuStrings+12)($t5) /* 0857B8 80084BB8 00037100 */ sll $t6, $v1, 4 /* 0857BC 80084BBC 11A00026 */ beqz $t5, .L80084C58 -/* 0857C0 80084BC0 3C0F800E */ lui $t7, %hi(D_800DFA3C) # $t7, 0x800e -/* 0857C4 80084BC4 25EFFA3C */ addiu $t7, %lo(D_800DFA3C) # addiu $t7, $t7, -0x5c4 +/* 0857C0 80084BC0 3C0F800E */ lui $t7, %hi(gAudioMenuStrings) # $t7, 0x800e +/* 0857C4 80084BC4 25EFFA3C */ addiu $t7, %lo(gAudioMenuStrings) # addiu $t7, $t7, -0x5c4 /* 0857C8 80084BC8 0011C100 */ sll $t8, $s1, 4 /* 0857CC 80084BCC 030FC821 */ addu $t9, $t8, $t7 /* 0857D0 80084BD0 AFB90040 */ sw $t9, 0x40($sp) diff --git a/asm/non_matchings/menu/func_800853D0.s b/asm/non_matchings/menu/func_800853D0.s index 0f10b255..e6982d9a 100644 --- a/asm/non_matchings/menu/func_800853D0.s +++ b/asm/non_matchings/menu/func_800853D0.s @@ -88,22 +88,22 @@ glabel L8008541C /* 086108 80085508 10000006 */ b .L80085524 /* 08610C 8008550C AFAE0070 */ sw $t6, 0x70($sp) .L80085510: -/* 086110 80085510 3C0F800E */ lui $t7, %hi(D_800E03B0) # $t7, 0x800e +/* 086110 80085510 3C0F800E */ lui $t7, %hi(gFilenames) # $t7, 0x800e /* 086114 80085514 01E37821 */ addu $t7, $t7, $v1 -/* 086118 80085518 8DEF03B0 */ lw $t7, %lo(D_800E03B0)($t7) +/* 086118 80085518 8DEF03B0 */ lw $t7, %lo(gFilenames)($t7) /* 08611C 8008551C 00000000 */ nop /* 086120 80085520 AFAF0064 */ sw $t7, 0x64($sp) .L80085524: -/* 086124 80085524 3C18800E */ lui $t8, %hi(D_800DF4A0) # $t8, 0x800e -/* 086128 80085528 8F18F4A0 */ lw $t8, %lo(D_800DF4A0)($t8) +/* 086124 80085524 3C18800E */ lui $t8, %hi(gMenuText) # $t8, 0x800e +/* 086128 80085528 8F18F4A0 */ lw $t8, %lo(gMenuText)($t8) /* 08612C 8008552C 00000000 */ nop /* 086130 80085530 8F1901DC */ lw $t9, 0x1dc($t8) /* 086134 80085534 100000C8 */ b .L80085858 /* 086138 80085538 AFB90060 */ sw $t9, 0x60($sp) glabel L8008553C /* 08613C 8008553C 3C0A800E */ lui $t2, %hi(D_800DFC20) # $t2, 0x800e -/* 086140 80085540 3C03800E */ lui $v1, %hi(D_800DF4A0) # $v1, 0x800e -/* 086144 80085544 8C63F4A0 */ lw $v1, %lo(D_800DF4A0)($v1) +/* 086140 80085540 3C03800E */ lui $v1, %hi(gMenuText) # $v1, 0x800e +/* 086144 80085544 8C63F4A0 */ lw $v1, %lo(gMenuText)($v1) /* 086148 80085548 254AFC20 */ addiu $t2, %lo(D_800DFC20) # addiu $t2, $t2, -0x3e0 /* 08614C 8008554C AFAA0068 */ sw $t2, 0x68($sp) /* 086150 80085550 8C6B01E0 */ lw $t3, 0x1e0($v1) @@ -160,8 +160,8 @@ glabel L80085574 /* 086210 80085610 A0400005 */ sb $zero, 5($v0) /* 086214 80085614 A04B0003 */ sb $t3, 3($v0) /* 086218 80085618 920E0006 */ lbu $t6, 6($s0) -/* 08621C 8008561C 3C0D800E */ lui $t5, %hi(D_800DF4A0) # $t5, 0x800e -/* 086220 80085620 8DADF4A0 */ lw $t5, %lo(D_800DF4A0)($t5) +/* 08621C 8008561C 3C0D800E */ lui $t5, %hi(gMenuText) # $t5, 0x800e +/* 086220 80085620 8DADF4A0 */ lw $t5, %lo(gMenuText)($t5) /* 086224 80085624 000E7880 */ sll $t7, $t6, 2 /* 086228 80085628 01AFC021 */ addu $t8, $t5, $t7 /* 08622C 8008562C 8F190158 */ lw $t9, 0x158($t8) @@ -196,9 +196,9 @@ glabel L80085690 /* 086294 80085694 25ADFC20 */ addiu $t5, %lo(D_800DFC20) # addiu $t5, $t5, -0x3e0 /* 086298 80085698 AFAD0068 */ sw $t5, 0x68($sp) /* 08629C 8008569C 92020006 */ lbu $v0, 6($s0) -/* 0862A0 800856A0 3C19800E */ lui $t9, %hi(D_800DF4A0) # $t9, 0x800e +/* 0862A0 800856A0 3C19800E */ lui $t9, %hi(gMenuText) # $t9, 0x800e /* 0862A4 800856A4 8E180008 */ lw $t8, 8($s0) -/* 0862A8 800856A8 8F39F4A0 */ lw $t9, %lo(D_800DF4A0)($t9) +/* 0862A8 800856A8 8F39F4A0 */ lw $t9, %lo(gMenuText)($t9) /* 0862AC 800856AC 00025080 */ sll $t2, $v0, 2 /* 0862B0 800856B0 3C09800E */ lui $t1, %hi(D_800DFACC) # $t1, 0x800e /* 0862B4 800856B4 00027880 */ sll $t7, $v0, 2 @@ -214,8 +214,8 @@ glabel L80085690 glabel L800856DC /* 0862DC 800856DC 3C0E800E */ lui $t6, %hi(D_800DFC30) # $t6, 0x800e /* 0862E0 800856E0 25CEFC30 */ addiu $t6, %lo(D_800DFC30) # addiu $t6, $t6, -0x3d0 -/* 0862E4 800856E4 3C03800E */ lui $v1, %hi(D_800DF4A0) # $v1, 0x800e -/* 0862E8 800856E8 8C63F4A0 */ lw $v1, %lo(D_800DF4A0)($v1) +/* 0862E4 800856E4 3C03800E */ lui $v1, %hi(gMenuText) # $v1, 0x800e +/* 0862E8 800856E8 8C63F4A0 */ lw $v1, %lo(gMenuText)($v1) /* 0862EC 800856EC AFAE0068 */ sw $t6, 0x68($sp) /* 0862F0 800856F0 92020006 */ lbu $v0, 6($s0) /* 0862F4 800856F4 8C6F01E4 */ lw $t7, 0x1e4($v1) @@ -236,9 +236,9 @@ glabel L80085728 /* 08632C 8008572C 256BFC40 */ addiu $t3, %lo(D_800DFC40) # addiu $t3, $t3, -0x3c0 /* 086330 80085730 AFAB0068 */ sw $t3, 0x68($sp) /* 086334 80085734 92020006 */ lbu $v0, 6($s0) -/* 086338 80085738 3C0D800E */ lui $t5, %hi(D_800DF4A0) # $t5, 0x800e +/* 086338 80085738 3C0D800E */ lui $t5, %hi(gMenuText) # $t5, 0x800e /* 08633C 8008573C 8E0E0008 */ lw $t6, 8($s0) -/* 086340 80085740 8DADF4A0 */ lw $t5, %lo(D_800DF4A0)($t5) +/* 086340 80085740 8DADF4A0 */ lw $t5, %lo(gMenuText)($t5) /* 086344 80085744 00027880 */ sll $t7, $v0, 2 /* 086348 80085748 3C09800E */ lui $t1, %hi(D_800DFACC) # $t1, 0x800e /* 08634C 8008574C 00026080 */ sll $t4, $v0, 2 @@ -254,8 +254,8 @@ glabel L80085728 glabel L80085774 /* 086374 80085774 3C0A800E */ lui $t2, %hi(D_800DFC50) # $t2, 0x800e /* 086378 80085778 254AFC50 */ addiu $t2, %lo(D_800DFC50) # addiu $t2, $t2, -0x3b0 -/* 08637C 8008577C 3C03800E */ lui $v1, %hi(D_800DF4A0) # $v1, 0x800e -/* 086380 80085780 8C63F4A0 */ lw $v1, %lo(D_800DF4A0)($v1) +/* 08637C 8008577C 3C03800E */ lui $v1, %hi(gMenuText) # $v1, 0x800e +/* 086380 80085780 8C63F4A0 */ lw $v1, %lo(gMenuText)($v1) /* 086384 80085784 AFAA0068 */ sw $t2, 0x68($sp) /* 086388 80085788 92020006 */ lbu $v0, 6($s0) /* 08638C 8008578C 8C6C01E8 */ lw $t4, 0x1e8($v1) @@ -273,8 +273,8 @@ glabel L80085774 /* 0863BC 800857BC AFAF0060 */ sw $t7, 0x60($sp) glabel L800857C0 /* 0863C0 800857C0 3C18800E */ lui $t8, %hi(D_800DFC30) # $t8, 0x800e -/* 0863C4 800857C4 3C19800E */ lui $t9, %hi(D_800DF4A0) # $t9, 0x800e -/* 0863C8 800857C8 8F39F4A0 */ lw $t9, %lo(D_800DF4A0)($t9) +/* 0863C4 800857C4 3C19800E */ lui $t9, %hi(gMenuText) # $t9, 0x800e +/* 0863C8 800857C8 8F39F4A0 */ lw $t9, %lo(gMenuText)($t9) /* 0863CC 800857CC 2718FC30 */ addiu $t8, %lo(D_800DFC30) # addiu $t8, $t8, -0x3d0 /* 0863D0 800857D0 AFB80068 */ sw $t8, 0x68($sp) /* 0863D4 800857D4 8F2A01EC */ lw $t2, 0x1ec($t9) @@ -286,8 +286,8 @@ glabel L800857C0 /* 0863EC 800857EC AFAA0064 */ sw $t2, 0x64($sp) glabel L800857F0 /* 0863F0 800857F0 3C0B800E */ lui $t3, %hi(D_800DFC10) # $t3, 0x800e -/* 0863F4 800857F4 3C03800E */ lui $v1, %hi(D_800DF4A0) # $v1, 0x800e -/* 0863F8 800857F8 8C63F4A0 */ lw $v1, %lo(D_800DF4A0)($v1) +/* 0863F4 800857F4 3C03800E */ lui $v1, %hi(gMenuText) # $v1, 0x800e +/* 0863F8 800857F8 8C63F4A0 */ lw $v1, %lo(gMenuText)($v1) /* 0863FC 800857FC 256BFC10 */ addiu $t3, %lo(D_800DFC10) # addiu $t3, $t3, -0x3f0 /* 086400 80085800 AFAB0068 */ sw $t3, 0x68($sp) /* 086404 80085804 8C6C02D4 */ lw $t4, 0x2d4($v1) @@ -302,8 +302,8 @@ glabel L800857F0 .L80085828: glabel L80085828 /* 086428 80085828 3C0D800E */ lui $t5, %hi(D_800DFC60) # $t5, 0x800e -/* 08642C 8008582C 3C0F800E */ lui $t7, %hi(D_800DF4A0) # $t7, 0x800e -/* 086430 80085830 8DEFF4A0 */ lw $t7, %lo(D_800DF4A0)($t7) +/* 08642C 8008582C 3C0F800E */ lui $t7, %hi(gMenuText) # $t7, 0x800e +/* 086430 80085830 8DEFF4A0 */ lw $t7, %lo(gMenuText)($t7) /* 086434 80085834 25ADFC60 */ addiu $t5, %lo(D_800DFC60) # addiu $t5, $t5, -0x3a0 /* 086438 80085838 AFAD0068 */ sw $t5, 0x68($sp) /* 08643C 8008583C 8DF80144 */ lw $t8, 0x144($t7) diff --git a/asm/non_matchings/menu/func_80085B9C.s b/asm/non_matchings/menu/func_80085B9C.s index 224fc97a..b3d1480b 100644 --- a/asm/non_matchings/menu/func_80085B9C.s +++ b/asm/non_matchings/menu/func_80085B9C.s @@ -75,8 +75,8 @@ glabel L80085C30 /* 08688C 80085C8C 00003025 */ move $a2, $zero /* 086890 80085C90 0C0310E1 */ jal set_text_color /* 086894 80085C94 240700FF */ li $a3, 255 -/* 086898 80085C98 3C19800E */ lui $t9, %hi(D_800DF4A0) # $t9, 0x800e -/* 08689C 80085C9C 8F39F4A0 */ lw $t9, %lo(D_800DF4A0)($t9) +/* 086898 80085C98 3C19800E */ lui $t9, %hi(gMenuText) # $t9, 0x800e +/* 08689C 80085C9C 8F39F4A0 */ lw $t9, %lo(gMenuText)($t9) /* 0868A0 80085CA0 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012 /* 0868A4 80085CA4 240A000C */ li $t2, 12 /* 0868A8 80085CA8 8F270294 */ lw $a3, 0x294($t9) @@ -92,8 +92,8 @@ glabel L80085C30 /* 0868D0 80085CD0 240600FF */ li $a2, 255 /* 0868D4 80085CD4 0C0310E1 */ jal set_text_color /* 0868D8 80085CD8 00003825 */ move $a3, $zero -/* 0868DC 80085CDC 3C0C800E */ lui $t4, %hi(D_800DF4A0) # $t4, 0x800e -/* 0868E0 80085CE0 8D8CF4A0 */ lw $t4, %lo(D_800DF4A0)($t4) +/* 0868DC 80085CDC 3C0C800E */ lui $t4, %hi(gMenuText) # $t4, 0x800e +/* 0868E0 80085CE0 8D8CF4A0 */ lw $t4, %lo(gMenuText)($t4) /* 0868E4 80085CE4 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012 /* 0868E8 80085CE8 240D000C */ li $t5, 12 /* 0868EC 80085CEC 8D870294 */ lw $a3, 0x294($t4) @@ -323,8 +323,8 @@ glabel L80085C30 /* 086C34 80086034 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012 /* 086C38 80086038 11400009 */ beqz $t2, .L80086060 /* 086C3C 8008603C 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0 -/* 086C40 80086040 3C19800E */ lui $t9, %hi(D_800DF4A0) # $t9, 0x800e -/* 086C44 80086044 8F39F4A0 */ lw $t9, %lo(D_800DF4A0)($t9) +/* 086C40 80086040 3C19800E */ lui $t9, %hi(gMenuText) # $t9, 0x800e +/* 086C44 80086044 8F39F4A0 */ lw $t9, %lo(gMenuText)($t9) /* 086C48 80086048 240B000C */ li $t3, 12 /* 086C4C 8008604C 8F2701F0 */ lw $a3, 0x1f0($t9) /* 086C50 80086050 AFAB0010 */ sw $t3, 0x10($sp) diff --git a/asm/non_matchings/menu/func_80086AFC.s b/asm/non_matchings/menu/func_80086AFC.s index c987aef9..cef7c622 100644 --- a/asm/non_matchings/menu/func_80086AFC.s +++ b/asm/non_matchings/menu/func_80086AFC.s @@ -193,7 +193,7 @@ glabel L80086D54 /* 0879C4 80086DC4 25296BE4 */ addiu $t1, %lo(D_80126BE4) # addiu $t1, $t1, 0x6be4 /* 0879C8 80086DC8 1180000B */ beqz $t4, .L80086DF8 /* 0879CC 80086DCC 25086A04 */ addiu $t0, %lo(D_80126A04) # addiu $t0, $t0, 0x6a04 -/* 0879D0 80086DD0 0C027B18 */ jal func_8009EC60 +/* 0879D0 80086DD0 0C027B18 */ jal is_adventure_two_unlocked /* 0879D4 80086DD4 AFA60028 */ sw $a2, 0x28($sp) /* 0879D8 80086DD8 8FA60028 */ lw $a2, 0x28($sp) /* 0879DC 80086DDC 3C088012 */ lui $t0, %hi(D_80126A04) # $t0, 0x8012 diff --git a/asm/non_matchings/menu/func_800871D8.s b/asm/non_matchings/menu/func_800871D8.s index feee927c..67692e3c 100644 --- a/asm/non_matchings/menu/func_800871D8.s +++ b/asm/non_matchings/menu/func_800871D8.s @@ -97,8 +97,8 @@ glabel func_800871D8 /* 087F44 80087344 240700FF */ li $a3, 255 /* 087F48 80087348 0C031400 */ jal func_800C5000 /* 087F4C 8008734C AFA00010 */ sw $zero, 0x10($sp) -/* 087F50 80087350 3C02800E */ lui $v0, %hi(D_800DF4A0) # $v0, 0x800e -/* 087F54 80087354 8C42F4A0 */ lw $v0, %lo(D_800DF4A0)($v0) +/* 087F50 80087350 3C02800E */ lui $v0, %hi(gMenuText) # $v0, 0x800e +/* 087F54 80087354 8C42F4A0 */ lw $v0, %lo(gMenuText)($v0) /* 087F58 80087358 8E830000 */ lw $v1, ($s4) /* 087F5C 8008735C 3C0D800E */ lui $t5, %hi(D_800DFB8C) # $t5, 0x800e /* 087F60 80087360 25ADFB8C */ addiu $t5, %lo(D_800DFB8C) # addiu $t5, $t5, -0x474 diff --git a/asm/non_matchings/menu/func_8008832C.s b/asm/non_matchings/menu/func_8008832C.s index 9ef27196..832f43c6 100644 --- a/asm/non_matchings/menu/func_8008832C.s +++ b/asm/non_matchings/menu/func_8008832C.s @@ -10,12 +10,12 @@ glabel func_8008832C /* 088F4C 8008834C 3C118012 */ lui $s1, %hi(D_80126A3C) # $s1, 0x8012 /* 088F50 80088350 3C0C8012 */ lui $t4, %hi(D_80126A60) # $t4, 0x8012 /* 088F54 80088354 3C0B8012 */ lui $t3, %hi(D_80126A38) # $t3, 0x8012 -/* 088F58 80088358 3C09800E */ lui $t1, %hi(D_800DF4A0) # $t1, 0x800e +/* 088F58 80088358 3C09800E */ lui $t1, %hi(gMenuText) # $t1, 0x800e /* 088F5C 8008835C 3C08800E */ lui $t0, %hi(D_800DFCB4) # $t0, 0x800e /* 088F60 80088360 00001025 */ move $v0, $zero /* 088F64 80088364 ACE00000 */ sw $zero, ($a3) /* 088F68 80088368 2508FCB4 */ addiu $t0, %lo(D_800DFCB4) # addiu $t0, $t0, -0x34c -/* 088F6C 8008836C 2529F4A0 */ addiu $t1, %lo(D_800DF4A0) # addiu $t1, $t1, -0xb60 +/* 088F6C 8008836C 2529F4A0 */ addiu $t1, %lo(gMenuText) # addiu $t1, $t1, -0xb60 /* 088F70 80088370 256B6A38 */ addiu $t3, %lo(D_80126A38) # addiu $t3, $t3, 0x6a38 /* 088F74 80088374 258C6A60 */ addiu $t4, %lo(D_80126A60) # addiu $t4, $t4, 0x6a60 /* 088F78 80088378 26316A3C */ addiu $s1, %lo(D_80126A3C) # addiu $s1, $s1, 0x6a3c diff --git a/asm/non_matchings/menu/func_80088938.s b/asm/non_matchings/menu/func_80088938.s index 9d8bedc2..70ad8cb5 100644 --- a/asm/non_matchings/menu/func_80088938.s +++ b/asm/non_matchings/menu/func_80088938.s @@ -49,8 +49,8 @@ glabel func_80088938 /* 0895EC 800889EC 00003025 */ move $a2, $zero /* 0895F0 800889F0 0C0310E1 */ jal set_text_color /* 0895F4 800889F4 240700FF */ li $a3, 255 -/* 0895F8 800889F8 3C17800E */ lui $s7, %hi(D_800DF4A0) # $s7, 0x800e -/* 0895FC 800889FC 26F7F4A0 */ addiu $s7, %lo(D_800DF4A0) # addiu $s7, $s7, -0xb60 +/* 0895F8 800889F8 3C17800E */ lui $s7, %hi(gMenuText) # $s7, 0x800e +/* 0895FC 800889FC 26F7F4A0 */ addiu $s7, %lo(gMenuText) # addiu $s7, $s7, -0xb60 /* 089600 80088A00 8EE90000 */ lw $t1, ($s7) /* 089604 80088A04 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012 /* 089608 80088A08 240A000C */ li $t2, 12 diff --git a/asm/non_matchings/menu/func_800896A4.s b/asm/non_matchings/menu/func_800896A4.s index 8d20c5e3..85e94cef 100644 --- a/asm/non_matchings/menu/func_800896A4.s +++ b/asm/non_matchings/menu/func_800896A4.s @@ -31,8 +31,8 @@ glabel func_800896A4 /* 08A318 80089718 00003025 */ move $a2, $zero /* 08A31C 8008971C 0C0310E1 */ jal set_text_color /* 08A320 80089720 240700FF */ li $a3, 255 -/* 08A324 80089724 3C0F800E */ lui $t7, %hi(D_800DF4A0) # $t7, 0x800e -/* 08A328 80089728 8DEFF4A0 */ lw $t7, %lo(D_800DF4A0)($t7) +/* 08A324 80089724 3C0F800E */ lui $t7, %hi(gMenuText) # $t7, 0x800e +/* 08A328 80089728 8DEFF4A0 */ lw $t7, %lo(gMenuText)($t7) /* 08A32C 8008972C 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012 /* 08A330 80089730 2418000C */ li $t8, 12 /* 08A334 80089734 8DE70044 */ lw $a3, 0x44($t7) @@ -48,8 +48,8 @@ glabel func_800896A4 /* 08A35C 8008975C 240600FF */ li $a2, 255 /* 08A360 80089760 0C0310E1 */ jal set_text_color /* 08A364 80089764 00003825 */ move $a3, $zero -/* 08A368 80089768 3C09800E */ lui $t1, %hi(D_800DF4A0) # $t1, 0x800e -/* 08A36C 8008976C 8D29F4A0 */ lw $t1, %lo(D_800DF4A0)($t1) +/* 08A368 80089768 3C09800E */ lui $t1, %hi(gMenuText) # $t1, 0x800e +/* 08A36C 8008976C 8D29F4A0 */ lw $t1, %lo(gMenuText)($t1) /* 08A370 80089770 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012 /* 08A374 80089774 240A000C */ li $t2, 12 /* 08A378 80089778 8D270044 */ lw $a3, 0x44($t1) @@ -198,12 +198,12 @@ glabel func_800896A4 /* 08A58C 8008998C 24140010 */ li $s4, 16 /* 08A590 80089990 24140018 */ li $s4, 24 .L80089994: -/* 08A594 80089994 3C0C800E */ lui $t4, %hi(D_800DFDA0) # $t4, 0x800e -/* 08A598 80089998 8D8CFDA0 */ lw $t4, %lo(D_800DFDA0)($t4) +/* 08A594 80089994 3C0C800E */ lui $t4, %hi(gMagicCodeMenuStrings) # $t4, 0x800e +/* 08A598 80089998 8D8CFDA0 */ lw $t4, %lo(gMagicCodeMenuStrings)($t4) /* 08A59C 8008999C 001E6880 */ sll $t5, $fp, 2 /* 08A5A0 800899A0 11800022 */ beqz $t4, .L80089A2C -/* 08A5A4 800899A4 3C0E800E */ lui $t6, %hi(D_800DFDA0) # $t6, 0x800e -/* 08A5A8 800899A8 25CEFDA0 */ addiu $t6, %lo(D_800DFDA0) # addiu $t6, $t6, -0x260 +/* 08A5A4 800899A4 3C0E800E */ lui $t6, %hi(gMagicCodeMenuStrings) # $t6, 0x800e +/* 08A5A8 800899A8 25CEFDA0 */ addiu $t6, %lo(gMagicCodeMenuStrings) # addiu $t6, $t6, -0x260 /* 08A5AC 800899AC 3C158012 */ lui $s5, %hi(D_801263E0) # $s5, 0x8012 /* 08A5B0 800899B0 26B563E0 */ addiu $s5, %lo(D_801263E0) # addiu $s5, $s5, 0x63e0 /* 08A5B4 800899B4 01AE8821 */ addu $s1, $t5, $t6 @@ -265,8 +265,8 @@ glabel func_800896A4 /* 08A684 80089A84 2401FFFF */ li $at, -1 /* 08A688 80089A88 1501000D */ bne $t0, $at, .L80089AC0 /* 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) +/* 08A690 80089A90 3C0C800E */ lui $t4, %hi(gMenuText) # $t4, 0x800e +/* 08A694 80089A94 8D8CF4A0 */ lw $t4, %lo(gMenuText)($t4) /* 08A698 80089A98 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012 /* 08A69C 80089A9C 240D000C */ li $t5, 12 /* 08A6A0 80089AA0 8D870048 */ lw $a3, 0x48($t4) @@ -310,8 +310,8 @@ glabel func_800896A4 .L80089B30: /* 08A730 80089B30 1441000A */ bne $v0, $at, .L80089B5C /* 08A734 80089B34 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012 -/* 08A738 80089B38 3C0A800E */ lui $t2, %hi(D_800DF4A0) # $t2, 0x800e -/* 08A73C 80089B3C 8D4AF4A0 */ lw $t2, %lo(D_800DF4A0)($t2) +/* 08A738 80089B38 3C0A800E */ lui $t2, %hi(gMenuText) # $t2, 0x800e +/* 08A73C 80089B3C 8D4AF4A0 */ lw $t2, %lo(gMenuText)($t2) /* 08A740 80089B40 240B000C */ li $t3, 12 /* 08A744 80089B44 8D47004C */ lw $a3, 0x4c($t2) /* 08A748 80089B48 AFAB0010 */ sw $t3, 0x10($sp) @@ -376,8 +376,8 @@ glabel func_800896A4 /* 08A818 80089C18 240700FF */ li $a3, 255 /* 08A81C 80089C1C 0C031400 */ jal func_800C5000 /* 08A820 80089C20 AFB00010 */ sw $s0, 0x10($sp) -/* 08A824 80089C24 3C09800E */ lui $t1, %hi(D_800DF4A0) # $t1, 0x800e -/* 08A828 80089C28 8D29F4A0 */ lw $t1, %lo(D_800DF4A0)($t1) +/* 08A824 80089C24 3C09800E */ lui $t1, %hi(gMenuText) # $t1, 0x800e +/* 08A828 80089C28 8D29F4A0 */ lw $t1, %lo(gMenuText)($t1) /* 08A82C 80089C2C 240B0001 */ li $t3, 1 /* 08A830 80089C30 01315021 */ addu $t2, $t1, $s1 /* 08A834 80089C34 8D470250 */ lw $a3, 0x250($t2) diff --git a/asm/non_matchings/menu/func_8008A56C.s b/asm/non_matchings/menu/func_8008A56C.s index e4e166dd..f47d573d 100644 --- a/asm/non_matchings/menu/func_8008A56C.s +++ b/asm/non_matchings/menu/func_8008A56C.s @@ -25,8 +25,8 @@ glabel func_8008A56C /* 08B1C8 8008A5C8 00003025 */ move $a2, $zero /* 08B1CC 8008A5CC 0C0310E1 */ jal set_text_color /* 08B1D0 8008A5D0 240700FF */ li $a3, 255 -/* 08B1D4 8008A5D4 3C17800E */ lui $s7, %hi(D_800DF4A0) # $s7, 0x800e -/* 08B1D8 8008A5D8 26F7F4A0 */ addiu $s7, %lo(D_800DF4A0) # addiu $s7, $s7, -0xb60 +/* 08B1D4 8008A5D4 3C17800E */ lui $s7, %hi(gMenuText) # $s7, 0x800e +/* 08B1D8 8008A5D8 26F7F4A0 */ addiu $s7, %lo(gMenuText) # addiu $s7, $s7, -0xb60 /* 08B1DC 8008A5DC 8EEF0000 */ lw $t7, ($s7) /* 08B1E0 8008A5E0 3C158012 */ lui $s5, %hi(D_801263A0) # $s5, 0x8012 /* 08B1E4 8008A5E4 26B563A0 */ addiu $s5, %lo(D_801263A0) # addiu $s5, $s5, 0x63a0 diff --git a/asm/non_matchings/menu/func_80090918.s b/asm/non_matchings/menu/func_80090918.s index cc9aaac1..98607ead 100644 --- a/asm/non_matchings/menu/func_80090918.s +++ b/asm/non_matchings/menu/func_80090918.s @@ -211,7 +211,7 @@ glabel func_80090918 .L80090C34: /* 091834 80090C34 14200013 */ bnez $at, .L80090C84 /* 091838 80090C38 2861FFE2 */ slti $at, $v1, -0x1e -/* 09183C 80090C3C 0C027B18 */ jal func_8009EC60 +/* 09183C 80090C3C 0C027B18 */ jal is_adventure_two_unlocked /* 091840 80090C40 00000000 */ nop /* 091844 80090C44 10400008 */ beqz $v0, .L80090C68 /* 091848 80090C48 3C188012 */ lui $t8, %hi(D_801269C8) # $t8, 0x8012 diff --git a/asm/non_matchings/menu/func_80090F30.s b/asm/non_matchings/menu/func_80090F30.s index aded1ab9..1efa1b8a 100644 --- a/asm/non_matchings/menu/func_80090F30.s +++ b/asm/non_matchings/menu/func_80090F30.s @@ -186,18 +186,18 @@ glabel func_80090F30 /* 091DD0 800911D0 24010004 */ li $at, 4 /* 091DD4 800911D4 1701006F */ bne $t8, $at, .L80091394 /* 091DD8 800911D8 00000000 */ nop -/* 091DDC 800911DC 0C027B18 */ jal func_8009EC60 +/* 091DDC 800911DC 0C027B18 */ jal is_adventure_two_unlocked /* 091DE0 800911E0 00000000 */ nop /* 091DE4 800911E4 1040006B */ beqz $v0, .L80091394 .L800911E8: -/* 091DE8 800911E8 3C19800E */ lui $t9, %hi(D_800DF4A0) # $t9, 0x800e -/* 091DEC 800911EC 8F39F4A0 */ lw $t9, %lo(D_800DF4A0)($t9) +/* 091DE8 800911E8 3C19800E */ lui $t9, %hi(gMenuText) # $t9, 0x800e +/* 091DEC 800911EC 8F39F4A0 */ lw $t9, %lo(gMenuText)($t9) /* 091DF0 800911F0 00002825 */ move $a1, $zero /* 091DF4 800911F4 8F240248 */ lw $a0, 0x248($t9) /* 091DF8 800911F8 0C031368 */ jal func_800C4DA0 /* 091DFC 800911FC 00003025 */ move $a2, $zero -/* 091E00 80091200 3C08800E */ lui $t0, %hi(D_800DF4A0) # $t0, 0x800e -/* 091E04 80091204 8D08F4A0 */ lw $t0, %lo(D_800DF4A0)($t0) +/* 091E00 80091200 3C08800E */ lui $t0, %hi(gMenuText) # $t0, 0x800e +/* 091E04 80091204 8D08F4A0 */ lw $t0, %lo(gMenuText)($t0) /* 091E08 80091208 0040A025 */ move $s4, $v0 /* 091E0C 8009120C 8D04024C */ lw $a0, 0x24c($t0) /* 091E10 80091210 00002825 */ move $a1, $zero @@ -285,8 +285,8 @@ glabel func_80090F30 /* 091F3C 8009133C 0C0310E1 */ jal set_text_color /* 091F40 80091340 AFAE0010 */ sw $t6, 0x10($sp) .L80091344: -/* 091F44 80091344 3C0F800E */ lui $t7, %hi(D_800DF4A0) # $t7, 0x800e -/* 091F48 80091348 8DEFF4A0 */ lw $t7, %lo(D_800DF4A0)($t7) +/* 091F44 80091344 3C0F800E */ lui $t7, %hi(gMenuText) # $t7, 0x800e +/* 091F48 80091348 8DEFF4A0 */ lw $t7, %lo(gMenuText)($t7) /* 091F4C 8009134C 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012 /* 091F50 80091350 01F1C021 */ addu $t8, $t7, $s1 /* 091F54 80091354 8F070248 */ lw $a3, 0x248($t8) @@ -321,8 +321,8 @@ glabel func_80090F30 /* 091FC4 800913C4 24070060 */ li $a3, 96 /* 091FC8 800913C8 0C0310E1 */ jal set_text_color /* 091FCC 800913CC AFAA0010 */ sw $t2, 0x10($sp) -/* 091FD0 800913D0 3C09800E */ lui $t1, %hi(D_800DF4A0) # $t1, 0x800e -/* 091FD4 800913D4 8D29F4A0 */ lw $t1, %lo(D_800DF4A0)($t1) +/* 091FD0 800913D0 3C09800E */ lui $t1, %hi(gMenuText) # $t1, 0x800e +/* 091FD4 800913D4 8D29F4A0 */ lw $t1, %lo(gMenuText)($t1) /* 091FD8 800913D8 8FB00080 */ lw $s0, 0x80($sp) /* 091FDC 800913DC 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012 /* 091FE0 800913E0 240B0008 */ li $t3, 8 @@ -333,8 +333,8 @@ glabel func_80090F30 /* 091FF4 800913F4 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0 /* 091FF8 800913F8 0C031110 */ jal draw_text /* 091FFC 800913FC 24050038 */ li $a1, 56 -/* 092000 80091400 3C0C800E */ lui $t4, %hi(D_800DF4A0) # $t4, 0x800e -/* 092004 80091404 8D8CF4A0 */ lw $t4, %lo(D_800DF4A0)($t4) +/* 092000 80091400 3C0C800E */ lui $t4, %hi(gMenuText) # $t4, 0x800e +/* 092004 80091404 8D8CF4A0 */ lw $t4, %lo(gMenuText)($t4) /* 092008 80091408 8FB20080 */ lw $s2, 0x80($sp) /* 09200C 8009140C 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012 /* 092010 80091410 240D0008 */ li $t5, 8 @@ -915,10 +915,10 @@ glabel func_80090F30 .L80091C9C: /* 09289C 80091C9C 8FAC0074 */ lw $t4, 0x74($sp) .L80091CA0: -/* 0928A0 80091CA0 3C0D800E */ lui $t5, %hi(D_800DF4A0) # $t5, 0x800e +/* 0928A0 80091CA0 3C0D800E */ lui $t5, %hi(gMenuText) # $t5, 0x800e /* 0928A4 80091CA4 11800098 */ beqz $t4, .L80091F08 /* 0928A8 80091CA8 00000000 */ nop -/* 0928AC 80091CAC 8DADF4A0 */ lw $t5, %lo(D_800DF4A0)($t5) +/* 0928AC 80091CAC 8DADF4A0 */ lw $t5, %lo(gMenuText)($t5) /* 0928B0 80091CB0 00002825 */ move $a1, $zero /* 0928B4 80091CB4 8DA40220 */ lw $a0, 0x220($t5) /* 0928B8 80091CB8 0C031368 */ jal func_800C4DA0 @@ -968,8 +968,8 @@ glabel func_80090F30 /* 092960 80091D60 240700FF */ li $a3, 255 /* 092964 80091D64 864F000E */ lh $t7, 0xe($s2) /* 092968 80091D68 864E0002 */ lh $t6, 2($s2) -/* 09296C 80091D6C 3C0A800E */ lui $t2, %hi(D_800DF4A0) # $t2, 0x800e -/* 092970 80091D70 8D4AF4A0 */ lw $t2, %lo(D_800DF4A0)($t2) +/* 09296C 80091D6C 3C0A800E */ lui $t2, %hi(gMenuText) # $t2, 0x800e +/* 092970 80091D70 8D4AF4A0 */ lw $t2, %lo(gMenuText)($t2) /* 092974 80091D74 864D000C */ lh $t5, 0xc($s2) /* 092978 80091D78 86580000 */ lh $t8, ($s2) /* 09297C 80091D7C 8FA90080 */ lw $t1, 0x80($sp) @@ -993,8 +993,8 @@ glabel func_80090F30 /* 0929C4 80091DC4 00003825 */ move $a3, $zero /* 0929C8 80091DC8 8658000E */ lh $t8, 0xe($s2) /* 0929CC 80091DCC 864F0002 */ lh $t7, 2($s2) -/* 0929D0 80091DD0 3C09800E */ lui $t1, %hi(D_800DF4A0) # $t1, 0x800e -/* 0929D4 80091DD4 8D29F4A0 */ lw $t1, %lo(D_800DF4A0)($t1) +/* 0929D0 80091DD0 3C09800E */ lui $t1, %hi(gMenuText) # $t1, 0x800e +/* 0929D4 80091DD4 8D29F4A0 */ lw $t1, %lo(gMenuText)($t1) /* 0929D8 80091DD8 864C000C */ lh $t4, 0xc($s2) /* 0929DC 80091DDC 864D0000 */ lh $t5, ($s2) /* 0929E0 80091DE0 8FB90080 */ lw $t9, 0x80($sp) @@ -1108,7 +1108,7 @@ glabel func_80090F30 /* 092B78 80091F78 33290002 */ andi $t1, $t9, 2 /* 092B7C 80091F7C 15200004 */ bnez $t1, .L80091F90 /* 092B80 80091F80 00000000 */ nop -/* 092B84 80091F84 0C027B18 */ jal func_8009EC60 +/* 092B84 80091F84 0C027B18 */ jal is_adventure_two_unlocked /* 092B88 80091F88 00000000 */ nop /* 092B8C 80091F8C 10400008 */ beqz $v0, .L80091FB0 .L80091F90: @@ -1132,7 +1132,7 @@ glabel func_80090F30 /* 092BD0 80091FD0 31D90004 */ andi $t9, $t6, 4 /* 092BD4 80091FD4 17200004 */ bnez $t9, .L80091FE8 /* 092BD8 80091FD8 00000000 */ nop -/* 092BDC 80091FDC 0C027B18 */ jal func_8009EC60 +/* 092BDC 80091FDC 0C027B18 */ jal is_adventure_two_unlocked /* 092BE0 80091FE0 00000000 */ nop /* 092BE4 80091FE4 10400008 */ beqz $v0, .L80092008 .L80091FE8: diff --git a/asm/non_matchings/menu/func_80092188.s b/asm/non_matchings/menu/func_80092188.s index ae99fe2a..43aea1ce 100644 --- a/asm/non_matchings/menu/func_80092188.s +++ b/asm/non_matchings/menu/func_80092188.s @@ -274,7 +274,7 @@ glabel L8009251C /* 093168 80092568 01651021 */ addu $v0, $t3, $a1 /* 09316C 8009256C AFA4004C */ sw $a0, 0x4c($sp) /* 093170 80092570 AFA50040 */ sw $a1, 0x40($sp) -/* 093174 80092574 0C027B18 */ jal func_8009EC60 +/* 093174 80092574 0C027B18 */ jal is_adventure_two_unlocked /* 093178 80092578 AFA80024 */ sw $t0, 0x24($sp) /* 09317C 8009257C 8FA4004C */ lw $a0, 0x4c($sp) /* 093180 80092580 8FA50040 */ lw $a1, 0x40($sp) @@ -602,7 +602,7 @@ glabel L8009287C /* 093604 80092A04 24010004 */ li $at, 4 /* 093608 80092A08 1441000C */ bne $v0, $at, .L80092A3C /* 09360C 80092A0C AFAF003C */ sw $t7, 0x3c($sp) -/* 093610 80092A10 0C027B18 */ jal func_8009EC60 +/* 093610 80092A10 0C027B18 */ jal is_adventure_two_unlocked /* 093614 80092A14 00000000 */ nop /* 093618 80092A18 3C0C8012 */ lui $t4, %hi(D_801263E0) # $t4, 0x8012 /* 09361C 80092A1C 258C63E0 */ addiu $t4, %lo(D_801263E0) # addiu $t4, $t4, 0x63e0 diff --git a/asm/non_matchings/menu/func_80092E94.s b/asm/non_matchings/menu/func_80092E94.s index a8465f7c..331f7b15 100644 --- a/asm/non_matchings/menu/func_80092E94.s +++ b/asm/non_matchings/menu/func_80092E94.s @@ -130,8 +130,8 @@ glabel func_80092E94 /* 093C8C 8009308C 24060040 */ li $a2, 64 /* 093C90 80093090 0C0310E1 */ jal set_text_color /* 093C94 80093094 24070060 */ li $a3, 96 -/* 093C98 80093098 3C0C800E */ lui $t4, %hi(D_800DF4A0) # $t4, 0x800e -/* 093C9C 8009309C 8D8CF4A0 */ lw $t4, %lo(D_800DF4A0)($t4) +/* 093C98 80093098 3C0C800E */ lui $t4, %hi(gMenuText) # $t4, 0x800e +/* 093C9C 8009309C 8D8CF4A0 */ lw $t4, %lo(gMenuText)($t4) /* 093CA0 800930A0 8FB00060 */ lw $s0, 0x60($sp) /* 093CA4 800930A4 240D000C */ li $t5, 12 /* 093CA8 800930A8 8D870024 */ lw $a3, 0x24($t4) @@ -141,8 +141,8 @@ glabel func_80092E94 /* 093CB8 800930B8 02402025 */ move $a0, $s2 /* 093CBC 800930BC 0C031110 */ jal draw_text /* 093CC0 800930C0 24050058 */ li $a1, 88 -/* 093CC4 800930C4 3C0E800E */ lui $t6, %hi(D_800DF4A0) # $t6, 0x800e -/* 093CC8 800930C8 8DCEF4A0 */ lw $t6, %lo(D_800DF4A0)($t6) +/* 093CC4 800930C4 3C0E800E */ lui $t6, %hi(gMenuText) # $t6, 0x800e +/* 093CC8 800930C8 8DCEF4A0 */ lw $t6, %lo(gMenuText)($t6) /* 093CCC 800930CC 8FA60060 */ lw $a2, 0x60($sp) /* 093CD0 800930D0 8DC70028 */ lw $a3, 0x28($t6) /* 093CD4 800930D4 240F000C */ li $t7, 12 @@ -447,8 +447,8 @@ glabel func_80092E94 /* 094160 80093560 24010002 */ li $at, 2 /* 094164 80093564 1441000A */ bne $v0, $at, .L80093590 /* 094168 80093568 02402025 */ move $a0, $s2 -/* 09416C 8009356C 3C19800E */ lui $t9, %hi(D_800DF4A0) # $t9, 0x800e -/* 094170 80093570 8F39F4A0 */ lw $t9, %lo(D_800DF4A0)($t9) +/* 09416C 8009356C 3C19800E */ lui $t9, %hi(gMenuText) # $t9, 0x800e +/* 094170 80093570 8F39F4A0 */ lw $t9, %lo(gMenuText)($t9) /* 094174 80093574 2409000C */ li $t1, 12 /* 094178 80093578 8F270034 */ lw $a3, 0x34($t9) /* 09417C 8009357C AFA90010 */ sw $t1, 0x10($sp) @@ -457,8 +457,8 @@ glabel func_80092E94 /* 094188 80093588 02003025 */ move $a2, $s0 /* 09418C 8009358C 26110020 */ addiu $s1, $s0, 0x20 .L80093590: -/* 094190 80093590 3C0E800E */ lui $t6, %hi(D_800DF4A0) # $t6, 0x800e -/* 094194 80093594 8DCEF4A0 */ lw $t6, %lo(D_800DF4A0)($t6) +/* 094190 80093590 3C0E800E */ lui $t6, %hi(gMenuText) # $t6, 0x800e +/* 094194 80093594 8DCEF4A0 */ lw $t6, %lo(gMenuText)($t6) /* 094198 80093598 240A000C */ li $t2, 12 /* 09419C 8009359C 8DC7002C */ lw $a3, 0x2c($t6) /* 0941A0 800935A0 AFAA0010 */ sw $t2, 0x10($sp) @@ -471,8 +471,8 @@ glabel func_80092E94 /* 0941BC 800935BC 24010002 */ li $at, 2 /* 0941C0 800935C0 10410009 */ beq $v0, $at, .L800935E8 /* 0941C4 800935C4 02402025 */ move $a0, $s2 -/* 0941C8 800935C8 3C0F800E */ lui $t7, %hi(D_800DF4A0) # $t7, 0x800e -/* 0941CC 800935CC 8DEFF4A0 */ lw $t7, %lo(D_800DF4A0)($t7) +/* 0941C8 800935C8 3C0F800E */ lui $t7, %hi(gMenuText) # $t7, 0x800e +/* 0941CC 800935CC 8DEFF4A0 */ lw $t7, %lo(gMenuText)($t7) /* 0941D0 800935D0 240B000C */ li $t3, 12 /* 0941D4 800935D4 8DE70034 */ lw $a3, 0x34($t7) /* 0941D8 800935D8 AFAB0010 */ sw $t3, 0x10($sp) diff --git a/asm/non_matchings/menu/func_80093A40.s b/asm/non_matchings/menu/func_80093A40.s index 96c83f1a..fffeab85 100644 --- a/asm/non_matchings/menu/func_80093A40.s +++ b/asm/non_matchings/menu/func_80093A40.s @@ -44,8 +44,8 @@ glabel func_80093A40 /* 0946DC 80093ADC 24A50984 */ addiu $a1, %lo(D_800E0984) # addiu $a1, $a1, 0x984 /* 0946E0 80093AE0 AE200000 */ sw $zero, ($s1) .L80093AE4: -/* 0946E4 80093AE4 3C06800E */ lui $a2, %hi(D_800DF4A0) # $a2, 0x800e -/* 0946E8 80093AE8 24C6F4A0 */ addiu $a2, %lo(D_800DF4A0) # addiu $a2, $a2, -0xb60 +/* 0946E4 80093AE4 3C06800E */ lui $a2, %hi(gMenuText) # $a2, 0x800e +/* 0946E8 80093AE8 24C6F4A0 */ addiu $a2, %lo(gMenuText) # addiu $a2, $a2, -0xb60 /* 0946EC 80093AEC 8CC30000 */ lw $v1, ($a2) /* 0946F0 80093AF0 3C118012 */ lui $s1, %hi(D_80126A40) # $s1, 0x8012 /* 0946F4 80093AF4 8C690188 */ lw $t1, 0x188($v1) @@ -64,8 +64,8 @@ glabel func_80093A40 /* 094728 80093B28 8FAC0024 */ lw $t4, 0x24($sp) /* 09472C 80093B2C 3C05800E */ lui $a1, %hi(D_800E0984) # $a1, 0x800e /* 094730 80093B30 918D0048 */ lbu $t5, 0x48($t4) -/* 094734 80093B34 3C06800E */ lui $a2, %hi(D_800DF4A0) # $a2, 0x800e -/* 094738 80093B38 24C6F4A0 */ addiu $a2, %lo(D_800DF4A0) # addiu $a2, $a2, -0xb60 +/* 094734 80093B34 3C06800E */ lui $a2, %hi(gMenuText) # $a2, 0x800e +/* 094738 80093B38 24C6F4A0 */ addiu $a2, %lo(gMenuText) # addiu $a2, $a2, -0xb60 /* 09473C 80093B3C 24A50984 */ addiu $a1, %lo(D_800E0984) # addiu $a1, $a1, 0x984 /* 094740 80093B40 24070001 */ li $a3, 1 /* 094744 80093B44 15A00012 */ bnez $t5, .L80093B90 @@ -73,8 +73,8 @@ glabel func_80093A40 /* 09474C 80093B4C 0C008D07 */ jal func_8002341C /* 094750 80093B50 00000000 */ nop /* 094754 80093B54 3C05800E */ lui $a1, %hi(D_800E0984) # $a1, 0x800e -/* 094758 80093B58 3C06800E */ lui $a2, %hi(D_800DF4A0) # $a2, 0x800e -/* 09475C 80093B5C 24C6F4A0 */ addiu $a2, %lo(D_800DF4A0) # addiu $a2, $a2, -0xb60 +/* 094758 80093B58 3C06800E */ lui $a2, %hi(gMenuText) # $a2, 0x800e +/* 09475C 80093B5C 24C6F4A0 */ addiu $a2, %lo(gMenuText) # addiu $a2, $a2, -0xb60 /* 094760 80093B60 24A50984 */ addiu $a1, %lo(D_800E0984) # addiu $a1, $a1, 0x984 /* 094764 80093B64 1040000A */ beqz $v0, .L80093B90 /* 094768 80093B68 24070001 */ li $a3, 1 @@ -158,8 +158,8 @@ glabel func_80093A40 /* 094880 80093C80 ACAC0000 */ sw $t4, ($a1) /* 094884 80093C84 AE2B0008 */ sw $t3, 8($s1) .L80093C88: -/* 094888 80093C88 3C03800E */ lui $v1, %hi(D_800DF4A0) # $v1, 0x800e -/* 09488C 80093C8C 8C63F4A0 */ lw $v1, %lo(D_800DF4A0)($v1) +/* 094888 80093C88 3C03800E */ lui $v1, %hi(gMenuText) # $v1, 0x800e +/* 09488C 80093C8C 8C63F4A0 */ lw $v1, %lo(gMenuText)($v1) /* 094890 80093C90 14E2000C */ bne $a3, $v0, .L80093CC4 /* 094894 80093C94 3C0D800E */ lui $t5, %hi(gNumberOfActivePlayers) # $t5, 0x800e /* 094898 80093C98 8DADF4BC */ lw $t5, %lo(gNumberOfActivePlayers)($t5) diff --git a/asm/non_matchings/menu/func_80093D40.s b/asm/non_matchings/menu/func_80093D40.s index 80b46488..90831a7d 100644 --- a/asm/non_matchings/menu/func_80093D40.s +++ b/asm/non_matchings/menu/func_80093D40.s @@ -121,8 +121,8 @@ glabel func_80093D40 /* 094B04 80093F04 24040007 */ li $a0, 7 /* 094B08 80093F08 1120000F */ beqz $t1, .L80093F48 /* 094B0C 80093F0C 24058000 */ li $a1, -32768 -/* 094B10 80093F10 3C0A800E */ lui $t2, %hi(D_800DF4A0) # $t2, 0x800e -/* 094B14 80093F14 8D4AF4A0 */ lw $t2, %lo(D_800DF4A0)($t2) +/* 094B10 80093F10 3C0A800E */ lui $t2, %hi(gMenuText) # $t2, 0x800e +/* 094B14 80093F14 8D4AF4A0 */ lw $t2, %lo(gMenuText)($t2) /* 094B18 80093F18 2611FFE6 */ addiu $s1, $s0, -0x1a /* 094B1C 80093F1C 8D470208 */ lw $a3, 0x208($t2) /* 094B20 80093F20 240B0001 */ li $t3, 1 @@ -136,8 +136,8 @@ glabel func_80093D40 /* 094B40 80093F40 1000000C */ b .L80093F74 /* 094B44 80093F44 8E580000 */ lw $t8, ($s2) .L80093F48: -/* 094B48 80093F48 3C0D800E */ lui $t5, %hi(D_800DF4A0) # $t5, 0x800e -/* 094B4C 80093F4C 8DADF4A0 */ lw $t5, %lo(D_800DF4A0)($t5) +/* 094B48 80093F48 3C0D800E */ lui $t5, %hi(gMenuText) # $t5, 0x800e +/* 094B4C 80093F4C 8DADF4A0 */ lw $t5, %lo(gMenuText)($t5) /* 094B50 80093F50 2611FFE6 */ addiu $s1, $s0, -0x1a /* 094B54 80093F54 8DA70210 */ lw $a3, 0x210($t5) /* 094B58 80093F58 240E0001 */ li $t6, 1 @@ -170,8 +170,8 @@ glabel func_80093D40 /* 094BBC 80093FBC 0C031400 */ jal func_800C5000 /* 094BC0 80093FC0 AFA00010 */ sw $zero, 0x10($sp) .L80093FC4: -/* 094BC4 80093FC4 3C0A800E */ lui $t2, %hi(D_800DF4A0) # $t2, 0x800e -/* 094BC8 80093FC8 8D4AF4A0 */ lw $t2, %lo(D_800DF4A0)($t2) +/* 094BC4 80093FC4 3C0A800E */ lui $t2, %hi(gMenuText) # $t2, 0x800e +/* 094BC8 80093FC8 8D4AF4A0 */ lw $t2, %lo(gMenuText)($t2) /* 094BCC 80093FCC 240B0001 */ li $t3, 1 /* 094BD0 80093FD0 8D470218 */ lw $a3, 0x218($t2) /* 094BD4 80093FD4 240C000C */ li $t4, 12 @@ -204,8 +204,8 @@ glabel func_80093D40 /* 094C3C 8009403C 0C031400 */ jal func_800C5000 /* 094C40 80094040 AFA00010 */ sw $zero, 0x10($sp) .L80094044: -/* 094C44 80094044 3C18800E */ lui $t8, %hi(D_800DF4A0) # $t8, 0x800e -/* 094C48 80094048 8F18F4A0 */ lw $t8, %lo(D_800DF4A0)($t8) +/* 094C44 80094044 3C18800E */ lui $t8, %hi(gMenuText) # $t8, 0x800e +/* 094C48 80094048 8F18F4A0 */ lw $t8, %lo(gMenuText)($t8) /* 094C4C 8009404C 24190001 */ li $t9, 1 /* 094C50 80094050 8F070154 */ lw $a3, 0x154($t8) /* 094C54 80094054 2409000C */ li $t1, 12 @@ -218,8 +218,8 @@ glabel func_80093D40 /* 094C70 80094070 10000035 */ b .L80094148 /* 094C74 80094074 00000000 */ nop .L80094078: -/* 094C78 80094078 3C0A800E */ lui $t2, %hi(D_800DF4A0) # $t2, 0x800e -/* 094C7C 8009407C 8D4AF4A0 */ lw $t2, %lo(D_800DF4A0)($t2) +/* 094C78 80094078 3C0A800E */ lui $t2, %hi(gMenuText) # $t2, 0x800e +/* 094C7C 8009407C 8D4AF4A0 */ lw $t2, %lo(gMenuText)($t2) /* 094C80 80094080 8E2B0000 */ lw $t3, ($s1) /* 094C84 80094084 8D470214 */ lw $a3, 0x214($t2) /* 094C88 80094088 240D000C */ li $t5, 12 diff --git a/asm/non_matchings/menu/func_80094170.s b/asm/non_matchings/menu/func_80094170.s index 5b79568f..08ef6b31 100644 --- a/asm/non_matchings/menu/func_80094170.s +++ b/asm/non_matchings/menu/func_80094170.s @@ -99,8 +99,8 @@ glabel func_80094170 /* 094ED8 800942D8 3C078012 */ lui $a3, %hi(D_80126A68) # $a3, 0x8012 /* 094EDC 800942DC 24E76A68 */ addiu $a3, %lo(D_80126A68) # addiu $a3, $a3, 0x6a68 /* 094EE0 800942E0 8CEA0000 */ lw $t2, ($a3) -/* 094EE4 800942E4 3C03800E */ lui $v1, %hi(D_800DF4A0) # $v1, 0x800e -/* 094EE8 800942E8 8C63F4A0 */ lw $v1, %lo(D_800DF4A0)($v1) +/* 094EE4 800942E4 3C03800E */ lui $v1, %hi(gMenuText) # $v1, 0x800e +/* 094EE8 800942E8 8C63F4A0 */ lw $v1, %lo(gMenuText)($v1) /* 094EEC 800942EC 3C028012 */ lui $v0, %hi(D_80126A40) # $v0, 0x8012 /* 094EF0 800942F0 000A5880 */ sll $t3, $t2, 2 /* 094EF4 800942F4 004B1021 */ addu $v0, $v0, $t3 @@ -205,8 +205,8 @@ glabel func_80094170 .L80094458: /* 095058 80094458 24E76A68 */ addiu $a3, %lo(D_80126A68) # addiu $a3, $a3, 0x6a68 /* 09505C 8009445C 8CE90000 */ lw $t1, ($a3) -/* 095060 80094460 3C03800E */ lui $v1, %hi(D_800DF4A0) # $v1, 0x800e -/* 095064 80094464 8C63F4A0 */ lw $v1, %lo(D_800DF4A0)($v1) +/* 095060 80094460 3C03800E */ lui $v1, %hi(gMenuText) # $v1, 0x800e +/* 095064 80094464 8C63F4A0 */ lw $v1, %lo(gMenuText)($v1) /* 095068 80094468 3C028012 */ lui $v0, %hi(D_80126A40) # $v0, 0x8012 /* 09506C 8009446C 00095080 */ sll $t2, $t1, 2 /* 095070 80094470 004A1021 */ addu $v0, $v0, $t2 diff --git a/asm/non_matchings/menu/func_80094688.s b/asm/non_matchings/menu/func_80094688.s index d16b90b5..0e6efc0b 100644 --- a/asm/non_matchings/menu/func_80094688.s +++ b/asm/non_matchings/menu/func_80094688.s @@ -33,8 +33,8 @@ glabel func_80094688 /* 095300 80094700 24060001 */ li $a2, 1 /* 095304 80094704 14460011 */ bne $v0, $a2, .L8009474C /* 095308 80094708 3C048012 */ lui $a0, %hi(D_80126C14) # $a0, 0x8012 -/* 09530C 8009470C 3C02800E */ lui $v0, %hi(D_800DF4A0) # $v0, 0x800e -/* 095310 80094710 8C42F4A0 */ lw $v0, %lo(D_800DF4A0)($v0) +/* 09530C 8009470C 3C02800E */ lui $v0, %hi(gMenuText) # $v0, 0x800e +/* 095310 80094710 8C42F4A0 */ lw $v0, %lo(gMenuText)($v0) /* 095314 80094714 3C058012 */ lui $a1, %hi(D_80126BF0) # $a1, 0x8012 /* 095318 80094718 8C59005C */ lw $t9, 0x5c($v0) /* 09531C 8009471C 24A56BF0 */ addiu $a1, %lo(D_80126BF0) # addiu $a1, $a1, 0x6bf0 @@ -53,8 +53,8 @@ glabel func_80094688 /* 09534C 8009474C 8FAB0030 */ lw $t3, 0x30($sp) /* 095350 80094750 00000000 */ nop /* 095354 80094754 1560000A */ bnez $t3, .L80094780 -/* 095358 80094758 3C02800E */ lui $v0, %hi(D_800DF4A0) # $v0, 0x800e -/* 09535C 8009475C 8C42F4A0 */ lw $v0, %lo(D_800DF4A0)($v0) +/* 095358 80094758 3C02800E */ lui $v0, %hi(gMenuText) # $v0, 0x800e +/* 09535C 8009475C 8C42F4A0 */ lw $v0, %lo(gMenuText)($v0) /* 095360 80094760 3C048012 */ lui $a0, %hi(D_80126C14) # $a0, 0x8012 /* 095364 80094764 8C4C005C */ lw $t4, 0x5c($v0) /* 095368 80094768 3C058012 */ lui $a1, %hi(D_80126BF0) # $a1, 0x8012 @@ -67,9 +67,9 @@ glabel func_80094688 /* 095380 80094780 3C048012 */ lui $a0, %hi(D_80126C14) # $a0, 0x8012 /* 095384 80094784 24846C14 */ addiu $a0, %lo(D_80126C14) # addiu $a0, $a0, 0x6c14 /* 095388 80094788 AC800000 */ sw $zero, ($a0) -/* 09538C 8009478C 3C02800E */ lui $v0, %hi(D_800DF4A0) # $v0, 0x800e +/* 09538C 8009478C 3C02800E */ lui $v0, %hi(gMenuText) # $v0, 0x800e /* 095390 80094790 3C058012 */ lui $a1, %hi(D_80126BF0) # $a1, 0x8012 -/* 095394 80094794 8C42F4A0 */ lw $v0, %lo(D_800DF4A0)($v0) +/* 095394 80094794 8C42F4A0 */ lw $v0, %lo(gMenuText)($v0) /* 095398 80094798 24A56BF0 */ addiu $a1, %lo(D_80126BF0) # addiu $a1, $a1, 0x6bf0 .L8009479C: /* 09539C 8009479C 8C830000 */ lw $v1, ($a0) diff --git a/asm/non_matchings/menu/func_80094D28.s b/asm/non_matchings/menu/func_80094D28.s index 68a12f92..87e63951 100644 --- a/asm/non_matchings/menu/func_80094D28.s +++ b/asm/non_matchings/menu/func_80094D28.s @@ -419,8 +419,8 @@ glabel L800951CC /* 095F00 80095300 3C028012 */ lui $v0, %hi(D_80126C1C) # $v0, 0x8012 /* 095F04 80095304 1300000E */ beqz $t8, .L80095340 /* 095F08 80095308 24426C1C */ addiu $v0, %lo(D_80126C1C) # addiu $v0, $v0, 0x6c1c -/* 095F0C 8009530C 3C0F800E */ lui $t7, %hi(D_800DF4A0) # $t7, 0x800e -/* 095F10 80095310 8DEFF4A0 */ lw $t7, %lo(D_800DF4A0)($t7) +/* 095F0C 8009530C 3C0F800E */ lui $t7, %hi(gMenuText) # $t7, 0x800e +/* 095F10 80095310 8DEFF4A0 */ lw $t7, %lo(gMenuText)($t7) /* 095F14 80095314 240B0001 */ li $t3, 1 /* 095F18 80095318 8DE701F0 */ lw $a3, 0x1f0($t7) /* 095F1C 8009531C 240C000C */ li $t4, 12 @@ -474,8 +474,8 @@ glabel L800951CC /* 095FD0 800953D0 2652FFE8 */ addiu $s2, $s2, -0x18 /* 095FD4 800953D4 1180003E */ beqz $t4, .L800954D0 /* 095FD8 800953D8 3C0F8012 */ lui $t7, %hi(D_80126C14) # $t7, 0x8012 -/* 095FDC 800953DC 3C0D800E */ lui $t5, %hi(D_800DF4A0) # $t5, 0x800e -/* 095FE0 800953E0 8DADF4A0 */ lw $t5, %lo(D_800DF4A0)($t5) +/* 095FDC 800953DC 3C0D800E */ lui $t5, %hi(gMenuText) # $t5, 0x800e +/* 095FE0 800953E0 8DADF4A0 */ lw $t5, %lo(gMenuText)($t5) /* 095FE4 800953E4 240E0001 */ li $t6, 1 /* 095FE8 800953E8 8DA70210 */ lw $a3, 0x210($t5) /* 095FEC 800953EC 240A000C */ li $t2, 12 @@ -500,8 +500,8 @@ glabel L800951CC /* 096034 80095434 240600FF */ li $a2, 255 /* 096038 80095438 0C031400 */ jal func_800C5000 /* 09603C 8009543C 240700FF */ li $a3, 255 -/* 096040 80095440 3C0F800E */ lui $t7, %hi(D_800DF4A0) # $t7, 0x800e -/* 096044 80095444 8DEFF4A0 */ lw $t7, %lo(D_800DF4A0)($t7) +/* 096040 80095440 3C0F800E */ lui $t7, %hi(gMenuText) # $t7, 0x800e +/* 096044 80095444 8DEFF4A0 */ lw $t7, %lo(gMenuText)($t7) /* 096048 80095448 240B0001 */ li $t3, 1 /* 09604C 8009544C 8DE70218 */ lw $a3, 0x218($t7) /* 096050 80095450 240C000C */ li $t4, 12 @@ -524,8 +524,8 @@ glabel L800951CC /* 096090 80095490 240700FF */ li $a3, 255 /* 096094 80095494 0C031400 */ jal func_800C5000 /* 096098 80095498 AFB00010 */ sw $s0, 0x10($sp) -/* 09609C 8009549C 3C0A800E */ lui $t2, %hi(D_800DF4A0) # $t2, 0x800e -/* 0960A0 800954A0 8D4AF4A0 */ lw $t2, %lo(D_800DF4A0)($t2) +/* 09609C 8009549C 3C0A800E */ lui $t2, %hi(gMenuText) # $t2, 0x800e +/* 0960A0 800954A0 8D4AF4A0 */ lw $t2, %lo(gMenuText)($t2) /* 0960A4 800954A4 24190001 */ li $t9, 1 /* 0960A8 800954A8 8D470154 */ lw $a3, 0x154($t2) /* 0960AC 800954AC 2418000C */ li $t8, 12 diff --git a/asm/non_matchings/menu/func_80095728.s b/asm/non_matchings/menu/func_80095728.s index 57ac868b..8504b0d4 100644 --- a/asm/non_matchings/menu/func_80095728.s +++ b/asm/non_matchings/menu/func_80095728.s @@ -57,8 +57,8 @@ glabel func_80095728 /* 0963E4 800957E4 3C018012 */ lui $at, %hi(D_80126A90) # $at, 0x8012 /* 0963E8 800957E8 3C098012 */ lui $t1, %hi(D_80126C14) # $t1, 0x8012 /* 0963EC 800957EC 25296C14 */ addiu $t1, %lo(D_80126C14) # addiu $t1, $t1, 0x6c14 -/* 0963F0 800957F0 3C02800E */ lui $v0, %hi(D_800DF4A0) # $v0, 0x800e -/* 0963F4 800957F4 8C42F4A0 */ lw $v0, %lo(D_800DF4A0)($v0) +/* 0963F0 800957F0 3C02800E */ lui $v0, %hi(gMenuText) # $v0, 0x800e +/* 0963F4 800957F4 8C42F4A0 */ lw $v0, %lo(gMenuText)($v0) /* 0963F8 800957F8 8D230000 */ lw $v1, ($t1) /* 0963FC 800957FC 3C0D8012 */ lui $t5, %hi(D_80126BF0) # $t5, 0x8012 /* 096400 80095800 8C4E006C */ lw $t6, 0x6c($v0) @@ -573,8 +573,8 @@ glabel L80095EC8 .L80095F7C: /* 096B7C 80095F7C 3C068012 */ lui $a2, %hi(D_80126A68) # $a2, 0x8012 /* 096B80 80095F80 24C66A68 */ addiu $a2, %lo(D_80126A68) # addiu $a2, $a2, 0x6a68 -/* 096B84 80095F84 3C18800E */ lui $t8, %hi(D_800DF4A0) # $t8, 0x800e -/* 096B88 80095F88 8F18F4A0 */ lw $t8, %lo(D_800DF4A0)($t8) +/* 096B84 80095F84 3C18800E */ lui $t8, %hi(gMenuText) # $t8, 0x800e +/* 096B88 80095F88 8F18F4A0 */ lw $t8, %lo(gMenuText)($t8) /* 096B8C 80095F8C 8CCD0000 */ lw $t5, ($a2) /* 096B90 80095F90 8F190070 */ lw $t9, 0x70($t8) /* 096B94 80095F94 3C018012 */ lui $at, %hi(D_80126BF0) # $at, 0x8012 @@ -762,8 +762,8 @@ glabel L80095EC8 /* 096E10 80096210 3C068012 */ lui $a2, %hi(D_80126A68) # $a2, 0x8012 /* 096E14 80096214 24C66A68 */ addiu $a2, %lo(D_80126A68) # addiu $a2, $a2, 0x6a68 /* 096E18 80096218 8CCE0000 */ lw $t6, ($a2) -/* 096E1C 8009621C 3C02800E */ lui $v0, %hi(D_800DF4A0) # $v0, 0x800e -/* 096E20 80096220 8C42F4A0 */ lw $v0, %lo(D_800DF4A0)($v0) +/* 096E1C 8009621C 3C02800E */ lui $v0, %hi(gMenuText) # $v0, 0x800e +/* 096E20 80096220 8C42F4A0 */ lw $v0, %lo(gMenuText)($v0) /* 096E24 80096224 240C0001 */ li $t4, 1 /* 096E28 80096228 3C038012 */ lui $v1, %hi(D_80126BF0) # $v1, 0x8012 /* 096E2C 8009622C 000E7880 */ sll $t7, $t6, 2 @@ -1055,8 +1055,8 @@ glabel L800964DC /* 097234 80096634 AFB80044 */ sw $t8, 0x44($sp) .L80096638: /* 097238 80096638 8CCD0000 */ lw $t5, ($a2) -/* 09723C 8009663C 3C02800E */ lui $v0, %hi(D_800DF4A0) # $v0, 0x800e -/* 097240 80096640 8C42F4A0 */ lw $v0, %lo(D_800DF4A0)($v0) +/* 09723C 8009663C 3C02800E */ lui $v0, %hi(gMenuText) # $v0, 0x800e +/* 097240 80096640 8C42F4A0 */ lw $v0, %lo(gMenuText)($v0) /* 097244 80096644 3C038012 */ lui $v1, %hi(D_80126BF0) # $v1, 0x8012 /* 097248 80096648 000DC880 */ sll $t9, $t5, 2 /* 09724C 8009664C 00791821 */ addu $v1, $v1, $t9 diff --git a/asm/non_matchings/menu/func_80096978.s b/asm/non_matchings/menu/func_80096978.s index ea0a7e0f..268b7a2d 100644 --- a/asm/non_matchings/menu/func_80096978.s +++ b/asm/non_matchings/menu/func_80096978.s @@ -75,8 +75,8 @@ glabel func_80096978 /* 097690 80096A90 00003825 */ move $a3, $zero /* 097694 80096A94 0C0310E1 */ jal set_text_color /* 097698 80096A98 AFB90010 */ sw $t9, 0x10($sp) -/* 09769C 80096A9C 3C08800E */ lui $t0, %hi(D_800DF4A0) # $t0, 0x800e -/* 0976A0 80096AA0 8D08F4A0 */ lw $t0, %lo(D_800DF4A0)($t0) +/* 09769C 80096A9C 3C08800E */ lui $t0, %hi(gMenuText) # $t0, 0x800e +/* 0976A0 80096AA0 8D08F4A0 */ lw $t0, %lo(gMenuText)($t0) /* 0976A4 80096AA4 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012 /* 0976A8 80096AA8 2409000C */ li $t1, 12 /* 0976AC 80096AAC 8D070084 */ lw $a3, 0x84($t0) @@ -456,8 +456,8 @@ glabel func_80096978 /* 097C40 80097040 8FB900A8 */ lw $t9, 0xa8($sp) /* 097C44 80097044 11400055 */ beqz $t2, .L8009719C /* 097C48 80097048 0000B025 */ move $s6, $zero -/* 097C4C 8009704C 3C0B800E */ lui $t3, %hi(D_800DF4A0) # $t3, 0x800e -/* 097C50 80097050 8D6BF4A0 */ lw $t3, %lo(D_800DF4A0)($t3) +/* 097C4C 8009704C 3C0B800E */ lui $t3, %hi(gMenuText) # $t3, 0x800e +/* 097C50 80097050 8D6BF4A0 */ lw $t3, %lo(gMenuText)($t3) /* 097C54 80097054 272DFFE8 */ addiu $t5, $t9, -0x18 /* 097C58 80097058 AFAD00A8 */ sw $t5, 0xa8($sp) /* 097C5C 8009705C 8D670210 */ lw $a3, 0x210($t3) @@ -494,8 +494,8 @@ glabel func_80096978 /* 097CD4 800970D4 0C031400 */ jal func_800C5000 /* 097CD8 800970D8 AFA00010 */ sw $zero, 0x10($sp) .L800970DC: -/* 097CDC 800970DC 3C0A800E */ lui $t2, %hi(D_800DF4A0) # $t2, 0x800e -/* 097CE0 800970E0 8D4AF4A0 */ lw $t2, %lo(D_800DF4A0)($t2) +/* 097CDC 800970DC 3C0A800E */ lui $t2, %hi(gMenuText) # $t2, 0x800e +/* 097CE0 800970E0 8D4AF4A0 */ lw $t2, %lo(gMenuText)($t2) /* 097CE4 800970E4 8FA600A8 */ lw $a2, 0xa8($sp) /* 097CE8 800970E8 8D470218 */ lw $a3, 0x218($t2) /* 097CEC 800970EC 24190001 */ li $t9, 1 @@ -530,8 +530,8 @@ glabel func_80096978 /* 097D5C 8009715C 0C031400 */ jal func_800C5000 /* 097D60 80097160 AFA00010 */ sw $zero, 0x10($sp) .L80097164: -/* 097D64 80097164 3C18800E */ lui $t8, %hi(D_800DF4A0) # $t8, 0x800e -/* 097D68 80097168 8F18F4A0 */ lw $t8, %lo(D_800DF4A0)($t8) +/* 097D64 80097164 3C18800E */ lui $t8, %hi(gMenuText) # $t8, 0x800e +/* 097D68 80097168 8F18F4A0 */ lw $t8, %lo(gMenuText)($t8) /* 097D6C 8009716C 8FA600A8 */ lw $a2, 0xa8($sp) /* 097D70 80097170 8F070154 */ lw $a3, 0x154($t8) /* 097D74 80097174 24090001 */ li $t1, 1 diff --git a/asm/non_matchings/menu/func_80097918.s b/asm/non_matchings/menu/func_80097918.s index 2a0064c3..547a4587 100644 --- a/asm/non_matchings/menu/func_80097918.s +++ b/asm/non_matchings/menu/func_80097918.s @@ -51,8 +51,8 @@ glabel func_80097918 /* 0985DC 800979DC 00003025 */ move $a2, $zero /* 0985E0 800979E0 0C0310E1 */ jal set_text_color /* 0985E4 800979E4 240700FF */ li $a3, 255 -/* 0985E8 800979E8 3C11800E */ lui $s1, %hi(D_800DF4A0) # $s1, 0x800e -/* 0985EC 800979EC 2631F4A0 */ addiu $s1, %lo(D_800DF4A0) # addiu $s1, $s1, -0xb60 +/* 0985E8 800979E8 3C11800E */ lui $s1, %hi(gMenuText) # $s1, 0x800e +/* 0985EC 800979EC 2631F4A0 */ addiu $s1, %lo(gMenuText) # addiu $s1, $s1, -0xb60 /* 0985F0 800979F0 3C10800E */ lui $s0, %hi(D_800E0F90) # $s0, 0x800e /* 0985F4 800979F4 8E2A0000 */ lw $t2, ($s1) /* 0985F8 800979F8 26100F90 */ addiu $s0, %lo(D_800E0F90) # addiu $s0, $s0, 0xf90 diff --git a/asm/non_matchings/menu/func_80098774.s b/asm/non_matchings/menu/func_80098774.s index 29d6694e..9b0dc7af 100644 --- a/asm/non_matchings/menu/func_80098774.s +++ b/asm/non_matchings/menu/func_80098774.s @@ -12,15 +12,15 @@ glabel func_80098774 /* 09939C 8009879C AFB00018 */ sw $s0, 0x18($sp) /* 0993A0 800987A0 12C00007 */ beqz $s6, .L800987C0 /* 0993A4 800987A4 3C05800E */ lui $a1, %hi(D_800E1048) # $a1, 0x800e -/* 0993A8 800987A8 3C0E800E */ lui $t6, %hi(D_800DF4A0) # $t6, 0x800e -/* 0993AC 800987AC 8DCEF4A0 */ lw $t6, %lo(D_800DF4A0)($t6) +/* 0993A8 800987A8 3C0E800E */ lui $t6, %hi(gMenuText) # $t6, 0x800e +/* 0993AC 800987AC 8DCEF4A0 */ lw $t6, %lo(gMenuText)($t6) /* 0993B0 800987B0 00000000 */ nop /* 0993B4 800987B4 8DC30084 */ lw $v1, 0x84($t6) /* 0993B8 800987B8 10000006 */ b .L800987D4 /* 0993BC 800987BC 00000000 */ nop .L800987C0: -/* 0993C0 800987C0 3C0F800E */ lui $t7, %hi(D_800DF4A0) # $t7, 0x800e -/* 0993C4 800987C4 8DEFF4A0 */ lw $t7, %lo(D_800DF4A0)($t7) +/* 0993C0 800987C0 3C0F800E */ lui $t7, %hi(gMenuText) # $t7, 0x800e +/* 0993C4 800987C4 8DEFF4A0 */ lw $t7, %lo(gMenuText)($t7) /* 0993C8 800987C8 00000000 */ nop /* 0993CC 800987CC 8DE3007C */ lw $v1, 0x7c($t7) /* 0993D0 800987D0 00000000 */ nop diff --git a/asm/non_matchings/menu/func_80099E8C.s b/asm/non_matchings/menu/func_80099E8C.s index 1d1e9c75..32857299 100644 --- a/asm/non_matchings/menu/func_80099E8C.s +++ b/asm/non_matchings/menu/func_80099E8C.s @@ -48,8 +48,8 @@ glabel func_80099E8C /* 09AB28 80099F28 00003025 */ move $a2, $zero /* 09AB2C 80099F2C 0C0310E1 */ jal set_text_color /* 09AB30 80099F30 240700FF */ li $a3, 255 -/* 09AB34 80099F34 3C09800E */ lui $t1, %hi(D_800DF4A0) # $t1, 0x800e -/* 09AB38 80099F38 8D29F4A0 */ lw $t1, %lo(D_800DF4A0)($t1) +/* 09AB34 80099F34 3C09800E */ lui $t1, %hi(gMenuText) # $t1, 0x800e +/* 09AB38 80099F38 8D29F4A0 */ lw $t1, %lo(gMenuText)($t1) /* 09AB3C 80099F3C 240A000C */ li $t2, 12 /* 09AB40 80099F40 8D270148 */ lw $a3, 0x148($t1) /* 09AB44 80099F44 AFAA0010 */ sw $t2, 0x10($sp) @@ -64,8 +64,8 @@ glabel func_80099E8C /* 09AB68 80099F68 240600FF */ li $a2, 255 /* 09AB6C 80099F6C 0C0310E1 */ jal set_text_color /* 09AB70 80099F70 00003825 */ move $a3, $zero -/* 09AB74 80099F74 3C0C800E */ lui $t4, %hi(D_800DF4A0) # $t4, 0x800e -/* 09AB78 80099F78 8D8CF4A0 */ lw $t4, %lo(D_800DF4A0)($t4) +/* 09AB74 80099F74 3C0C800E */ lui $t4, %hi(gMenuText) # $t4, 0x800e +/* 09AB78 80099F78 8D8CF4A0 */ lw $t4, %lo(gMenuText)($t4) /* 09AB7C 80099F7C 240D000C */ li $t5, 12 /* 09AB80 80099F80 8D870148 */ lw $a3, 0x148($t4) /* 09AB84 80099F84 AFAD0010 */ sw $t5, 0x10($sp) @@ -85,8 +85,8 @@ glabel func_80099E8C /* 09ABBC 80099FBC 240600FF */ li $a2, 255 /* 09ABC0 80099FC0 0C0310E1 */ jal set_text_color /* 09ABC4 80099FC4 00003825 */ move $a3, $zero -/* 09ABC8 80099FC8 3C18800E */ lui $t8, %hi(D_800DF4A0) # $t8, 0x800e -/* 09ABCC 80099FCC 8F18F4A0 */ lw $t8, %lo(D_800DF4A0)($t8) +/* 09ABC8 80099FC8 3C18800E */ lui $t8, %hi(gMenuText) # $t8, 0x800e +/* 09ABCC 80099FCC 8F18F4A0 */ lw $t8, %lo(gMenuText)($t8) /* 09ABD0 80099FD0 8FA600D0 */ lw $a2, 0xd0($sp) /* 09ABD4 80099FD4 2419000C */ li $t9, 12 /* 09ABD8 80099FD8 8F07014C */ lw $a3, 0x14c($t8) @@ -488,8 +488,8 @@ glabel func_80099E8C /* 09B1CC 8009A5CC 0C031400 */ jal func_800C5000 /* 09B1D0 8009A5D0 AFA00010 */ sw $zero, 0x10($sp) .L8009A5D4: -/* 09B1D4 8009A5D4 3C19800E */ lui $t9, %hi(D_800DF4A0) # $t9, 0x800e -/* 09B1D8 8009A5D8 8F39F4A0 */ lw $t9, %lo(D_800DF4A0)($t9) +/* 09B1D4 8009A5D4 3C19800E */ lui $t9, %hi(gMenuText) # $t9, 0x800e +/* 09B1D8 8009A5D8 8F39F4A0 */ lw $t9, %lo(gMenuText)($t9) /* 09B1DC 8009A5DC 24090001 */ li $t1, 1 /* 09B1E0 8009A5E0 8F270150 */ lw $a3, 0x150($t9) /* 09B1E4 8009A5E4 240A000C */ li $t2, 12 @@ -523,8 +523,8 @@ glabel func_80099E8C /* 09B250 8009A650 0C031400 */ jal func_800C5000 /* 09B254 8009A654 AFA00010 */ sw $zero, 0x10($sp) .L8009A658: -/* 09B258 8009A658 3C18800E */ lui $t8, %hi(D_800DF4A0) # $t8, 0x800e -/* 09B25C 8009A65C 8F18F4A0 */ lw $t8, %lo(D_800DF4A0)($t8) +/* 09B258 8009A658 3C18800E */ lui $t8, %hi(gMenuText) # $t8, 0x800e +/* 09B25C 8009A65C 8F18F4A0 */ lw $t8, %lo(gMenuText)($t8) /* 09B260 8009A660 240E0001 */ li $t6, 1 /* 09B264 8009A664 8F070154 */ lw $a3, 0x154($t8) /* 09B268 8009A668 2419000C */ li $t9, 12 diff --git a/asm/non_matchings/menu/func_8009D360.s b/asm/non_matchings/menu/func_8009D360.s index fdad74de..87ad7b53 100644 --- a/asm/non_matchings/menu/func_8009D360.s +++ b/asm/non_matchings/menu/func_8009D360.s @@ -65,8 +65,8 @@ glabel func_8009D360 /* 09E03C 8009D43C 1000006D */ b .L8009D5F4 /* 09E040 8009D440 24AD0008 */ addiu $t5, $a1, 8 .L8009D444: -/* 09E044 8009D444 3C08800E */ lui $t0, %hi(D_800DF4A0) # $t0, 0x800e -/* 09E048 8009D448 8D08F4A0 */ lw $t0, %lo(D_800DF4A0)($t0) +/* 09E044 8009D444 3C08800E */ lui $t0, %hi(gMenuText) # $t0, 0x800e +/* 09E048 8009D448 8D08F4A0 */ lw $t0, %lo(gMenuText)($t0) /* 09E04C 8009D44C 24090001 */ li $t1, 1 /* 09E050 8009D450 8D0700A0 */ lw $a3, 0xa0($t0) /* 09E054 8009D454 240A0004 */ li $t2, 4 @@ -76,8 +76,8 @@ glabel func_8009D360 /* 09E064 8009D464 24058000 */ li $a1, -32768 /* 09E068 8009D468 0C03145A */ jal func_800C5168 /* 09E06C 8009D46C 24060006 */ li $a2, 6 -/* 09E070 8009D470 3C0C800E */ lui $t4, %hi(D_800DF4A0) # $t4, 0x800e -/* 09E074 8009D474 8D8CF4A0 */ lw $t4, %lo(D_800DF4A0)($t4) +/* 09E070 8009D470 3C0C800E */ lui $t4, %hi(gMenuText) # $t4, 0x800e +/* 09E074 8009D474 8D8CF4A0 */ lw $t4, %lo(gMenuText)($t4) /* 09E078 8009D478 240B001E */ li $t3, 30 /* 09E07C 8009D47C 3C018012 */ lui $at, %hi(D_8012650E) # $at, 0x8012 /* 09E080 8009D480 A02B650E */ sb $t3, %lo(D_8012650E)($at) @@ -85,20 +85,20 @@ glabel func_8009D360 /* 09E088 8009D488 24050014 */ li $a1, 20 /* 09E08C 8009D48C 0C02746E */ jal func_8009D1B8 /* 09E090 8009D490 00003025 */ move $a2, $zero -/* 09E094 8009D494 3C0D800E */ lui $t5, %hi(D_800DF4A0) # $t5, 0x800e -/* 09E098 8009D498 8DADF4A0 */ lw $t5, %lo(D_800DF4A0)($t5) +/* 09E094 8009D494 3C0D800E */ lui $t5, %hi(gMenuText) # $t5, 0x800e +/* 09E098 8009D498 8DADF4A0 */ lw $t5, %lo(gMenuText)($t5) /* 09E09C 8009D49C 24050014 */ li $a1, 20 /* 09E0A0 8009D4A0 8DA400A8 */ lw $a0, 0xa8($t5) /* 09E0A4 8009D4A4 0C02746E */ jal func_8009D1B8 /* 09E0A8 8009D4A8 24060001 */ li $a2, 1 -/* 09E0AC 8009D4AC 3C0E800E */ lui $t6, %hi(D_800DF4A0) # $t6, 0x800e -/* 09E0B0 8009D4B0 8DCEF4A0 */ lw $t6, %lo(D_800DF4A0)($t6) +/* 09E0AC 8009D4AC 3C0E800E */ lui $t6, %hi(gMenuText) # $t6, 0x800e +/* 09E0B0 8009D4B0 8DCEF4A0 */ lw $t6, %lo(gMenuText)($t6) /* 09E0B4 8009D4B4 24050014 */ li $a1, 20 /* 09E0B8 8009D4B8 8DC400AC */ lw $a0, 0xac($t6) /* 09E0BC 8009D4BC 0C02746E */ jal func_8009D1B8 /* 09E0C0 8009D4C0 24060002 */ li $a2, 2 -/* 09E0C4 8009D4C4 3C0F800E */ lui $t7, %hi(D_800DF4A0) # $t7, 0x800e -/* 09E0C8 8009D4C8 8DEFF4A0 */ lw $t7, %lo(D_800DF4A0)($t7) +/* 09E0C4 8009D4C4 3C0F800E */ lui $t7, %hi(gMenuText) # $t7, 0x800e +/* 09E0C8 8009D4C8 8DEFF4A0 */ lw $t7, %lo(gMenuText)($t7) /* 09E0CC 8009D4CC 24050014 */ li $a1, 20 /* 09E0D0 8009D4D0 8DE400B0 */ lw $a0, 0xb0($t7) /* 09E0D4 8009D4D4 0C02746E */ jal func_8009D1B8 @@ -108,8 +108,8 @@ glabel func_8009D360 /* 09E0E4 8009D4E4 10000043 */ b .L8009D5F4 /* 09E0E8 8009D4E8 24AD0008 */ addiu $t5, $a1, 8 .L8009D4EC: -/* 09E0EC 8009D4EC 3C18800E */ lui $t8, %hi(D_800DF4A0) # $t8, 0x800e -/* 09E0F0 8009D4F0 8F18F4A0 */ lw $t8, %lo(D_800DF4A0)($t8) +/* 09E0EC 8009D4EC 3C18800E */ lui $t8, %hi(gMenuText) # $t8, 0x800e +/* 09E0F0 8009D4F0 8F18F4A0 */ lw $t8, %lo(gMenuText)($t8) /* 09E0F4 8009D4F4 24190001 */ li $t9, 1 /* 09E0F8 8009D4F8 8F0700B4 */ lw $a3, 0xb4($t8) /* 09E0FC 8009D4FC 24080004 */ li $t0, 4 @@ -127,8 +127,8 @@ glabel func_8009D360 /* 09E12C 8009D52C 306B0001 */ andi $t3, $v1, 1 /* 09E130 8009D530 1160000C */ beqz $t3, .L8009D564 /* 09E134 8009D534 306C0008 */ andi $t4, $v1, 8 -/* 09E138 8009D538 3C0D800E */ lui $t5, %hi(D_800DF4A0) # $t5, 0x800e -/* 09E13C 8009D53C 8DADF4A0 */ lw $t5, %lo(D_800DF4A0)($t5) +/* 09E138 8009D538 3C0D800E */ lui $t5, %hi(gMenuText) # $t5, 0x800e +/* 09E13C 8009D53C 8DADF4A0 */ lw $t5, %lo(gMenuText)($t5) /* 09E140 8009D540 A02CF4EC */ sb $t4, %lo(D_800DF4EC)($at) /* 09E144 8009D544 8DA400B8 */ lw $a0, 0xb8($t5) /* 09E148 8009D548 24050014 */ li $a1, 20 @@ -142,8 +142,8 @@ glabel func_8009D360 /* 09E164 8009D564 306F0002 */ andi $t7, $v1, 2 /* 09E168 8009D568 11E0000D */ beqz $t7, .L8009D5A0 /* 09E16C 8009D56C 30780010 */ andi $t8, $v1, 0x10 -/* 09E170 8009D570 3C19800E */ lui $t9, %hi(D_800DF4A0) # $t9, 0x800e -/* 09E174 8009D574 8F39F4A0 */ lw $t9, %lo(D_800DF4A0)($t9) +/* 09E170 8009D570 3C19800E */ lui $t9, %hi(gMenuText) # $t9, 0x800e +/* 09E174 8009D574 8F39F4A0 */ lw $t9, %lo(gMenuText)($t9) /* 09E178 8009D578 3C01800E */ lui $at, %hi(D_800DF4EC) # $at, 0x800e /* 09E17C 8009D57C A038F4EC */ sb $t8, %lo(D_800DF4EC)($at) /* 09E180 8009D580 8F2400BC */ lw $a0, 0xbc($t9) @@ -158,8 +158,8 @@ glabel func_8009D360 /* 09E1A0 8009D5A0 30690004 */ andi $t1, $v1, 4 /* 09E1A4 8009D5A4 11200009 */ beqz $t1, .L8009D5CC /* 09E1A8 8009D5A8 306A0020 */ andi $t2, $v1, 0x20 -/* 09E1AC 8009D5AC 3C0B800E */ lui $t3, %hi(D_800DF4A0) # $t3, 0x800e -/* 09E1B0 8009D5B0 8D6BF4A0 */ lw $t3, %lo(D_800DF4A0)($t3) +/* 09E1AC 8009D5AC 3C0B800E */ lui $t3, %hi(gMenuText) # $t3, 0x800e +/* 09E1B0 8009D5B0 8D6BF4A0 */ lw $t3, %lo(gMenuText)($t3) /* 09E1B4 8009D5B4 3C01800E */ lui $at, %hi(D_800DF4EC) # $at, 0x800e /* 09E1B8 8009D5B8 A02AF4EC */ sb $t2, %lo(D_800DF4EC)($at) /* 09E1BC 8009D5BC 8D6400C0 */ lw $a0, 0xc0($t3) @@ -167,8 +167,8 @@ glabel func_8009D360 /* 09E1C4 8009D5C4 0C02746E */ jal func_8009D1B8 /* 09E1C8 8009D5C8 24060002 */ li $a2, 2 .L8009D5CC: -/* 09E1CC 8009D5CC 3C0C800E */ lui $t4, %hi(D_800DF4A0) # $t4, 0x800e -/* 09E1D0 8009D5D0 8D8CF4A0 */ lw $t4, %lo(D_800DF4A0)($t4) +/* 09E1CC 8009D5CC 3C0C800E */ lui $t4, %hi(gMenuText) # $t4, 0x800e +/* 09E1D0 8009D5D0 8D8CF4A0 */ lw $t4, %lo(gMenuText)($t4) /* 09E1D4 8009D5D4 24050014 */ li $a1, 20 /* 09E1D8 8009D5D8 8D8400B0 */ lw $a0, 0xb0($t4) /* 09E1DC 8009D5DC 0C02746E */ jal func_8009D1B8 @@ -197,8 +197,8 @@ glabel L8009D618 /* 09E230 8009D630 100000EC */ b .L8009D9E4 /* 09E234 8009D634 A022F4D8 */ sb $v0, %lo(D_800DF4D8)($at) glabel L8009D638 -/* 09E238 8009D638 3C0E800E */ lui $t6, %hi(D_800DF4A0) # $t6, 0x800e -/* 09E23C 8009D63C 8DCEF4A0 */ lw $t6, %lo(D_800DF4A0)($t6) +/* 09E238 8009D638 3C0E800E */ lui $t6, %hi(gMenuText) # $t6, 0x800e +/* 09E23C 8009D63C 8DCEF4A0 */ lw $t6, %lo(gMenuText)($t6) /* 09E240 8009D640 3C01800E */ lui $at, %hi(D_800DF4DC) # $at, 0x800e /* 09E244 8009D644 A020F4DC */ sb $zero, %lo(D_800DF4DC)($at) /* 09E248 8009D648 8DC70090 */ lw $a3, 0x90($t6) @@ -210,8 +210,8 @@ glabel L8009D638 /* 09E260 8009D660 24058000 */ li $a1, -32768 /* 09E264 8009D664 0C03145A */ jal func_800C5168 /* 09E268 8009D668 24060006 */ li $a2, 6 -/* 09E26C 8009D66C 3C08800E */ lui $t0, %hi(D_800DF4A0) # $t0, 0x800e -/* 09E270 8009D670 8D08F4A0 */ lw $t0, %lo(D_800DF4A0)($t0) +/* 09E26C 8009D66C 3C08800E */ lui $t0, %hi(gMenuText) # $t0, 0x800e +/* 09E270 8009D670 8D08F4A0 */ lw $t0, %lo(gMenuText)($t0) /* 09E274 8009D674 2419001E */ li $t9, 30 /* 09E278 8009D678 3C018012 */ lui $at, %hi(D_8012650E) # $at, 0x8012 /* 09E27C 8009D67C A039650E */ sb $t9, %lo(D_8012650E)($at) @@ -220,20 +220,20 @@ glabel L8009D638 /* 09E288 8009D688 0C02746E */ jal func_8009D1B8 /* 09E28C 8009D68C 00003025 */ move $a2, $zero /* 09E290 8009D690 8FA90024 */ lw $t1, 0x24($sp) -/* 09E294 8009D694 3C0C800E */ lui $t4, %hi(D_800DF4A0) # $t4, 0x800e +/* 09E294 8009D694 3C0C800E */ lui $t4, %hi(gMenuText) # $t4, 0x800e /* 09E298 8009D698 952A0014 */ lhu $t2, 0x14($t1) /* 09E29C 8009D69C 00000000 */ nop /* 09E2A0 8009D6A0 314B0007 */ andi $t3, $t2, 7 /* 09E2A4 8009D6A4 11600006 */ beqz $t3, .L8009D6C0 /* 09E2A8 8009D6A8 00000000 */ nop -/* 09E2AC 8009D6AC 8D8CF4A0 */ lw $t4, %lo(D_800DF4A0)($t4) +/* 09E2AC 8009D6AC 8D8CF4A0 */ lw $t4, %lo(gMenuText)($t4) /* 09E2B0 8009D6B0 24050014 */ li $a1, 20 /* 09E2B4 8009D6B4 8D84009C */ lw $a0, 0x9c($t4) /* 09E2B8 8009D6B8 0C02746E */ jal func_8009D1B8 /* 09E2BC 8009D6BC 24060001 */ li $a2, 1 .L8009D6C0: -/* 09E2C0 8009D6C0 3C0D800E */ lui $t5, %hi(D_800DF4A0) # $t5, 0x800e -/* 09E2C4 8009D6C4 8DADF4A0 */ lw $t5, %lo(D_800DF4A0)($t5) +/* 09E2C0 8009D6C0 3C0D800E */ lui $t5, %hi(gMenuText) # $t5, 0x800e +/* 09E2C4 8009D6C4 8DADF4A0 */ lw $t5, %lo(gMenuText)($t5) /* 09E2C8 8009D6C8 24050014 */ li $a1, 20 /* 09E2CC 8009D6CC 8DA40014 */ lw $a0, 0x14($t5) /* 09E2D0 8009D6D0 0C02746E */ jal func_8009D1B8 diff --git a/asm/non_matchings/menu/func_8009DB3C.s b/asm/non_matchings/menu/func_8009DB3C.s index 431b9d5e..e8892f01 100644 --- a/asm/non_matchings/menu/func_8009DB3C.s +++ b/asm/non_matchings/menu/func_8009DB3C.s @@ -85,8 +85,8 @@ glabel func_8009DB3C /* 09E858 8009DC58 01E00008 */ jr $t7 /* 09E85C 8009DC5C 00000000 */ nop glabel L8009DC60 -/* 09E860 8009DC60 3C18800E */ lui $t8, %hi(D_800DF4A0) # $t8, 0x800e -/* 09E864 8009DC64 8F18F4A0 */ lw $t8, %lo(D_800DF4A0)($t8) +/* 09E860 8009DC60 3C18800E */ lui $t8, %hi(gMenuText) # $t8, 0x800e +/* 09E864 8009DC64 8F18F4A0 */ lw $t8, %lo(gMenuText)($t8) /* 09E868 8009DC68 24190001 */ li $t9, 1 /* 09E86C 8009DC6C 8F070090 */ lw $a3, 0x90($t8) /* 09E870 8009DC70 24090004 */ li $t1, 4 @@ -96,8 +96,8 @@ glabel L8009DC60 /* 09E880 8009DC80 24058000 */ li $a1, -32768 /* 09E884 8009DC84 0C03145A */ jal func_800C5168 /* 09E888 8009DC88 24060006 */ li $a2, 6 -/* 09E88C 8009DC8C 3C0A800E */ lui $t2, %hi(D_800DF4A0) # $t2, 0x800e -/* 09E890 8009DC90 8D4AF4A0 */ lw $t2, %lo(D_800DF4A0)($t2) +/* 09E88C 8009DC8C 3C0A800E */ lui $t2, %hi(gMenuText) # $t2, 0x800e +/* 09E890 8009DC90 8D4AF4A0 */ lw $t2, %lo(gMenuText)($t2) /* 09E894 8009DC94 24050014 */ li $a1, 20 /* 09E898 8009DC98 8D44011C */ lw $a0, 0x11c($t2) /* 09E89C 8009DC9C 0C02746E */ jal func_8009D1B8 @@ -109,9 +109,9 @@ glabel L8009DC60 /* 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 -/* 09E8C4 8009DCC4 3C0B800E */ lui $t3, %hi(D_800DF4A0) # $t3, 0x800e -/* 09E8C8 8009DCC8 8D6BF4A0 */ lw $t3, %lo(D_800DF4A0)($t3) +/* 09E8C0 8009DCC0 3C0C800E */ lui $t4, %hi(gMenuText) # $t4, 0x800e +/* 09E8C4 8009DCC4 3C0B800E */ lui $t3, %hi(gMenuText) # $t3, 0x800e +/* 09E8C8 8009DCC8 8D6BF4A0 */ lw $t3, %lo(gMenuText)($t3) /* 09E8CC 8009DCCC 24050014 */ li $a1, 20 /* 09E8D0 8009DCD0 8D640104 */ lw $a0, 0x104($t3) /* 09E8D4 8009DCD4 0C02746E */ jal func_8009D1B8 @@ -119,7 +119,7 @@ glabel L8009DC60 /* 09E8DC 8009DCDC 10000006 */ b .L8009DCF8 /* 09E8E0 8009DCE0 00000000 */ nop .L8009DCE4: -/* 09E8E4 8009DCE4 8D8CF4A0 */ lw $t4, %lo(D_800DF4A0)($t4) +/* 09E8E4 8009DCE4 8D8CF4A0 */ lw $t4, %lo(gMenuText)($t4) /* 09E8E8 8009DCE8 24050014 */ li $a1, 20 /* 09E8EC 8009DCEC 8D840108 */ lw $a0, 0x108($t4) /* 09E8F0 8009DCF0 0C02746E */ jal func_8009D1B8 @@ -128,15 +128,15 @@ glabel L8009DC60 /* 09E8F8 8009DCF8 0C006DE0 */ jal func_8001B780 /* 09E8FC 8009DCFC 00000000 */ nop /* 09E900 8009DD00 10400006 */ beqz $v0, .L8009DD1C -/* 09E904 8009DD04 3C0D800E */ lui $t5, %hi(D_800DF4A0) # $t5, 0x800e -/* 09E908 8009DD08 8DADF4A0 */ lw $t5, %lo(D_800DF4A0)($t5) +/* 09E904 8009DD04 3C0D800E */ lui $t5, %hi(gMenuText) # $t5, 0x800e +/* 09E908 8009DD08 8DADF4A0 */ lw $t5, %lo(gMenuText)($t5) /* 09E90C 8009DD0C 24050014 */ li $a1, 20 /* 09E910 8009DD10 8DA4006C */ lw $a0, 0x6c($t5) /* 09E914 8009DD14 0C02746E */ jal func_8009D1B8 /* 09E918 8009DD18 24060001 */ li $a2, 1 .L8009DD1C: -/* 09E91C 8009DD1C 3C0E800E */ lui $t6, %hi(D_800DF4A0) # $t6, 0x800e -/* 09E920 8009DD20 8DCEF4A0 */ lw $t6, %lo(D_800DF4A0)($t6) +/* 09E91C 8009DD1C 3C0E800E */ lui $t6, %hi(gMenuText) # $t6, 0x800e +/* 09E920 8009DD20 8DCEF4A0 */ lw $t6, %lo(gMenuText)($t6) /* 09E924 8009DD24 24050014 */ li $a1, 20 /* 09E928 8009DD28 8DC40014 */ lw $a0, 0x14($t6) /* 09E92C 8009DD2C 0C02746E */ jal func_8009D1B8 @@ -335,8 +335,8 @@ glabel L8009DFB0 /* 09EBE4 8009DFE4 100000E6 */ b .L8009E380 /* 09EBE8 8009DFE8 24010001 */ li $at, 1 glabel L8009DFEC -/* 09EBEC 8009DFEC 3C02800E */ lui $v0, %hi(D_800DF4A0) # $v0, 0x800e -/* 09EBF0 8009DFF0 8C42F4A0 */ lw $v0, %lo(D_800DF4A0)($v0) +/* 09EBEC 8009DFEC 3C02800E */ lui $v0, %hi(gMenuText) # $v0, 0x800e +/* 09EBF0 8009DFF0 8C42F4A0 */ lw $v0, %lo(gMenuText)($v0) /* 09EBF4 8009DFF4 240300D0 */ li $v1, 208 /* 09EBF8 8009DFF8 8C4E00D0 */ lw $t6, 0xd0($v0) /* 09EBFC 8009DFFC 00000000 */ nop @@ -355,8 +355,8 @@ glabel L8009DFEC /* 09EC2C 8009E02C 0C03145A */ jal func_800C5168 /* 09EC30 8009E030 AFA60020 */ sw $a2, 0x20($sp) /* 09EC34 8009E034 8FA30024 */ lw $v1, 0x24($sp) -/* 09EC38 8009E038 3C18800E */ lui $t8, %hi(D_800DF4A0) # $t8, 0x800e -/* 09EC3C 8009E03C 8F18F4A0 */ lw $t8, %lo(D_800DF4A0)($t8) +/* 09EC38 8009E038 3C18800E */ lui $t8, %hi(gMenuText) # $t8, 0x800e +/* 09EC3C 8009E03C 8F18F4A0 */ lw $t8, %lo(gMenuText)($t8) /* 09EC40 8009E040 24630004 */ addiu $v1, $v1, 4 /* 09EC44 8009E044 0303C821 */ addu $t9, $t8, $v1 /* 09EC48 8009E048 8FA60020 */ lw $a2, 0x20($sp) @@ -382,8 +382,8 @@ glabel L8009DFEC /* 09EC90 8009E090 100000BB */ b .L8009E380 /* 09EC94 8009E094 24010001 */ li $at, 1 glabel L8009E098 -/* 09EC98 8009E098 3C0D800E */ lui $t5, %hi(D_800DF4A0) # $t5, 0x800e -/* 09EC9C 8009E09C 8DADF4A0 */ lw $t5, %lo(D_800DF4A0)($t5) +/* 09EC98 8009E098 3C0D800E */ lui $t5, %hi(gMenuText) # $t5, 0x800e +/* 09EC9C 8009E09C 8DADF4A0 */ lw $t5, %lo(gMenuText)($t5) /* 09ECA0 8009E0A0 240F0001 */ li $t7, 1 /* 09ECA4 8009E0A4 8DA7027C */ lw $a3, 0x27c($t5) /* 09ECA8 8009E0A8 24180004 */ li $t8, 4 @@ -393,8 +393,8 @@ glabel L8009E098 /* 09ECB8 8009E0B8 24058000 */ li $a1, -32768 /* 09ECBC 8009E0BC 0C03145A */ jal func_800C5168 /* 09ECC0 8009E0C0 24060022 */ li $a2, 34 -/* 09ECC4 8009E0C4 3C19800E */ lui $t9, %hi(D_800DF4A0) # $t9, 0x800e -/* 09ECC8 8009E0C8 8F39F4A0 */ lw $t9, %lo(D_800DF4A0)($t9) +/* 09ECC4 8009E0C4 3C19800E */ lui $t9, %hi(gMenuText) # $t9, 0x800e +/* 09ECC8 8009E0C8 8F39F4A0 */ lw $t9, %lo(gMenuText)($t9) /* 09ECCC 8009E0CC 24090001 */ li $t1, 1 /* 09ECD0 8009E0D0 8F270280 */ lw $a3, 0x280($t9) /* 09ECD4 8009E0D4 240A0004 */ li $t2, 4 @@ -404,8 +404,8 @@ glabel L8009E098 /* 09ECE4 8009E0E4 24058000 */ li $a1, -32768 /* 09ECE8 8009E0E8 0C03145A */ jal func_800C5168 /* 09ECEC 8009E0EC 24060032 */ li $a2, 50 -/* 09ECF0 8009E0F0 3C0C800E */ lui $t4, %hi(D_800DF4A0) # $t4, 0x800e -/* 09ECF4 8009E0F4 8D8CF4A0 */ lw $t4, %lo(D_800DF4A0)($t4) +/* 09ECF0 8009E0F0 3C0C800E */ lui $t4, %hi(gMenuText) # $t4, 0x800e +/* 09ECF4 8009E0F4 8D8CF4A0 */ lw $t4, %lo(gMenuText)($t4) /* 09ECF8 8009E0F8 240E0001 */ li $t6, 1 /* 09ECFC 8009E0FC 8D870288 */ lw $a3, 0x288($t4) /* 09ED00 8009E100 240B0004 */ li $t3, 4 @@ -448,8 +448,8 @@ glabel L8009E098 /* 09ED8C 8009E18C 1000007C */ b .L8009E380 /* 09ED90 8009E190 24010001 */ li $at, 1 glabel L8009E194 -/* 09ED94 8009E194 3C0C800E */ lui $t4, %hi(D_800DF4A0) # $t4, 0x800e -/* 09ED98 8009E198 8D8CF4A0 */ lw $t4, %lo(D_800DF4A0)($t4) +/* 09ED94 8009E194 3C0C800E */ lui $t4, %hi(gMenuText) # $t4, 0x800e +/* 09ED98 8009E198 8D8CF4A0 */ lw $t4, %lo(gMenuText)($t4) /* 09ED9C 8009E19C 240E0001 */ li $t6, 1 /* 09EDA0 8009E1A0 8D87027C */ lw $a3, 0x27c($t4) /* 09EDA4 8009E1A4 240B0004 */ li $t3, 4 @@ -459,8 +459,8 @@ glabel L8009E194 /* 09EDB4 8009E1B4 24058000 */ li $a1, -32768 /* 09EDB8 8009E1B8 0C03145A */ jal func_800C5168 /* 09EDBC 8009E1BC 24060022 */ li $a2, 34 -/* 09EDC0 8009E1C0 3C0D800E */ lui $t5, %hi(D_800DF4A0) # $t5, 0x800e -/* 09EDC4 8009E1C4 8DADF4A0 */ lw $t5, %lo(D_800DF4A0)($t5) +/* 09EDC0 8009E1C0 3C0D800E */ lui $t5, %hi(gMenuText) # $t5, 0x800e +/* 09EDC4 8009E1C4 8DADF4A0 */ lw $t5, %lo(gMenuText)($t5) /* 09EDC8 8009E1C8 240F0001 */ li $t7, 1 /* 09EDCC 8009E1CC 8DA70284 */ lw $a3, 0x284($t5) /* 09EDD0 8009E1D0 24180004 */ li $t8, 4 @@ -470,8 +470,8 @@ glabel L8009E194 /* 09EDE0 8009E1E0 24058000 */ li $a1, -32768 /* 09EDE4 8009E1E4 0C03145A */ jal func_800C5168 /* 09EDE8 8009E1E8 24060032 */ li $a2, 50 -/* 09EDEC 8009E1EC 3C19800E */ lui $t9, %hi(D_800DF4A0) # $t9, 0x800e -/* 09EDF0 8009E1F0 8F39F4A0 */ lw $t9, %lo(D_800DF4A0)($t9) +/* 09EDEC 8009E1EC 3C19800E */ lui $t9, %hi(gMenuText) # $t9, 0x800e +/* 09EDF0 8009E1F0 8F39F4A0 */ lw $t9, %lo(gMenuText)($t9) /* 09EDF4 8009E1F4 24090001 */ li $t1, 1 /* 09EDF8 8009E1F8 8F270288 */ lw $a3, 0x288($t9) /* 09EDFC 8009E1FC 240A0004 */ li $t2, 4 @@ -492,8 +492,8 @@ glabel L8009E194 /* 09EE34 8009E234 10000052 */ b .L8009E380 /* 09EE38 8009E238 24010001 */ li $at, 1 glabel L8009E23C -/* 09EE3C 8009E23C 3C0B800E */ lui $t3, %hi(D_800DF4A0) # $t3, 0x800e -/* 09EE40 8009E240 8D6BF4A0 */ lw $t3, %lo(D_800DF4A0)($t3) +/* 09EE3C 8009E23C 3C0B800E */ lui $t3, %hi(gMenuText) # $t3, 0x800e +/* 09EE40 8009E240 8D6BF4A0 */ lw $t3, %lo(gMenuText)($t3) /* 09EE44 8009E244 240D0001 */ li $t5, 1 /* 09EE48 8009E248 8D6701F0 */ lw $a3, 0x1f0($t3) /* 09EE4C 8009E24C 240F0004 */ li $t7, 4 @@ -592,8 +592,8 @@ glabel L8009E37C /* 09EF90 8009E390 24010003 */ li $at, 3 /* 09EF94 8009E394 1461000A */ bne $v1, $at, .L8009E3C0 .L8009E398: -/* 09EF98 8009E398 3C0E800E */ lui $t6, %hi(D_800DF4A0) # $t6, 0x800e -/* 09EF9C 8009E39C 8DCEF4A0 */ lw $t6, %lo(D_800DF4A0)($t6) +/* 09EF98 8009E398 3C0E800E */ lui $t6, %hi(gMenuText) # $t6, 0x800e +/* 09EF9C 8009E39C 8DCEF4A0 */ lw $t6, %lo(gMenuText)($t6) /* 09EFA0 8009E3A0 240B0001 */ li $t3, 1 /* 09EFA4 8009E3A4 8DC70100 */ lw $a3, 0x100($t6) /* 09EFA8 8009E3A8 240D0004 */ li $t5, 4 diff --git a/asm/non_matchings/menu/func_8009E7E8.s b/asm/non_matchings/menu/func_8009E7E8.s index d0aebfc0..8de973f4 100644 --- a/asm/non_matchings/menu/func_8009E7E8.s +++ b/asm/non_matchings/menu/func_8009E7E8.s @@ -14,8 +14,8 @@ glabel func_8009E7E8 /* 09F418 8009E818 AFA00024 */ sw $zero, 0x24($sp) /* 09F41C 8009E81C 0C01A955 */ jal get_buttons_pressed_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) +/* 09F424 8009E824 3C0F800E */ lui $t7, %hi(gMenuText) # $t7, 0x800e +/* 09F428 8009E828 8DEFF4A0 */ lw $t7, %lo(gMenuText)($t7) /* 09F42C 8009E82C AFA20020 */ sw $v0, 0x20($sp) /* 09F430 8009E830 8DE70118 */ lw $a3, 0x118($t7) /* 09F434 8009E834 24180001 */ li $t8, 1 @@ -66,8 +66,8 @@ glabel func_8009E7E8 .L8009E8DC: /* 09F4DC 8009E8DC 0C027446 */ jal func_8009D118 /* 09F4E0 8009E8E0 2C440001 */ sltiu $a0, $v0, 1 -/* 09F4E4 8009E8E4 3C0D800E */ lui $t5, %hi(D_800DF4A0) # $t5, 0x800e -/* 09F4E8 8009E8E8 8DADF4A0 */ lw $t5, %lo(D_800DF4A0)($t5) +/* 09F4E4 8009E8E4 3C0D800E */ lui $t5, %hi(gMenuText) # $t5, 0x800e +/* 09F4E8 8009E8E8 8DADF4A0 */ lw $t5, %lo(gMenuText)($t5) /* 09F4EC 8009E8EC 240E0001 */ li $t6, 1 /* 09F4F0 8009E8F0 8DA702D0 */ lw $a3, 0x2d0($t5) /* 09F4F4 8009E8F4 240F0004 */ li $t7, 4 @@ -84,8 +84,8 @@ glabel func_8009E7E8 /* 09F520 8009E920 38980001 */ xori $t8, $a0, 1 /* 09F524 8009E924 0C027446 */ jal func_8009D118 /* 09F528 8009E928 2F040001 */ sltiu $a0, $t8, 1 -/* 09F52C 8009E92C 3C19800E */ lui $t9, %hi(D_800DF4A0) # $t9, 0x800e -/* 09F530 8009E930 8F39F4A0 */ lw $t9, %lo(D_800DF4A0)($t9) +/* 09F52C 8009E92C 3C19800E */ lui $t9, %hi(gMenuText) # $t9, 0x800e +/* 09F530 8009E930 8F39F4A0 */ lw $t9, %lo(gMenuText)($t9) /* 09F534 8009E934 24080001 */ li $t0, 1 /* 09F538 8009E938 8F2700CC */ lw $a3, 0xcc($t9) /* 09F53C 8009E93C 24090004 */ li $t1, 4 diff --git a/asm/non_matchings/menu/func_8007F900.s b/asm/non_matchings/menu/load_menu_text.s similarity index 85% rename from asm/non_matchings/menu/func_8007F900.s rename to asm/non_matchings/menu/load_menu_text.s index c9169f6b..ece35e70 100644 --- a/asm/non_matchings/menu/func_8007F900.s +++ b/asm/non_matchings/menu/load_menu_text.s @@ -1,6 +1,6 @@ -glabel func_8007F900 -/* 080500 8007F900 3C09800E */ lui $t1, %hi(D_800DF49C) # $t1, 0x800e -/* 080504 8007F904 2529F49C */ addiu $t1, %lo(D_800DF49C) # addiu $t1, $t1, -0xb64 +glabel load_menu_text +/* 080500 8007F900 3C09800E */ lui $t1, %hi(gMenuTextLangTable) # $t1, 0x800e +/* 080504 8007F904 2529F49C */ addiu $t1, %lo(gMenuTextLangTable) # addiu $t1, $t1, -0xb64 /* 080508 8007F908 8D230000 */ lw $v1, ($t1) /* 08050C 8007F90C 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 080510 8007F910 AFBF0014 */ sw $ra, 0x14($sp) @@ -9,15 +9,15 @@ glabel func_8007F900 /* 08051C 8007F91C 24040009 */ li $a0, 9 /* 080520 8007F920 0C01DB16 */ jal load_asset_section_from_rom /* 080524 8007F924 AFA50018 */ sw $a1, 0x18($sp) -/* 080528 8007F928 3C09800E */ lui $t1, %hi(D_800DF49C) # $t1, 0x800e -/* 08052C 8007F92C 2529F49C */ addiu $t1, %lo(D_800DF49C) # addiu $t1, $t1, -0xb64 +/* 080528 8007F928 3C09800E */ lui $t1, %hi(gMenuTextLangTable) # $t1, 0x800e +/* 08052C 8007F92C 2529F49C */ addiu $t1, %lo(gMenuTextLangTable) # addiu $t1, $t1, -0xb64 /* 080530 8007F930 8FA50018 */ lw $a1, 0x18($sp) /* 080534 8007F934 AD220000 */ sw $v0, ($t1) /* 080538 8007F938 00401825 */ move $v1, $v0 .L8007F93C: /* 08053C 8007F93C 24010001 */ li $at, 1 /* 080540 8007F940 10A1000B */ beq $a1, $at, .L8007F970 -/* 080544 8007F944 3C08800E */ lui $t0, %hi(D_800DF4A0) # $t0, 0x800e +/* 080544 8007F944 3C08800E */ lui $t0, %hi(gMenuText) # $t0, 0x800e /* 080548 8007F948 24010002 */ li $at, 2 /* 08054C 8007F94C 10A1000A */ beq $a1, $at, .L8007F978 /* 080550 8007F950 24060002 */ li $a2, 2 @@ -35,7 +35,7 @@ glabel func_8007F900 .L8007F978: /* 080578 8007F978 00067080 */ sll $t6, $a2, 2 /* 08057C 8007F97C 006E1021 */ addu $v0, $v1, $t6 -/* 080580 8007F980 2508F4A0 */ addiu $t0, %lo(D_800DF4A0) # addiu $t0, $t0, -0xb60 +/* 080580 8007F980 2508F4A0 */ addiu $t0, %lo(gMenuText) # addiu $t0, $t0, -0xb60 /* 080584 8007F984 8C470004 */ lw $a3, 4($v0) /* 080588 8007F988 8C460000 */ lw $a2, ($v0) /* 08058C 8007F98C 8D050000 */ lw $a1, ($t0) @@ -44,12 +44,12 @@ glabel func_8007F900 /* 080598 8007F998 8FBF0014 */ lw $ra, 0x14($sp) /* 08059C 8007F99C 0C01DB9A */ jal load_asset_to_address /* 0805A0 8007F9A0 24040008 */ li $a0, 8 -/* 0805A4 8007F9A4 3C09800E */ lui $t1, %hi(D_800DF49C) # $t1, 0x800e -/* 0805A8 8007F9A8 2529F49C */ addiu $t1, %lo(D_800DF49C) # addiu $t1, $t1, -0xb64 +/* 0805A4 8007F9A4 3C09800E */ lui $t1, %hi(gMenuTextLangTable) # $t1, 0x800e +/* 0805A8 8007F9A8 2529F49C */ addiu $t1, %lo(gMenuTextLangTable) # addiu $t1, $t1, -0xb64 /* 0805AC 8007F9AC 8D2F0000 */ lw $t7, ($t1) -/* 0805B0 8007F9B0 3C08800E */ lui $t0, %hi(D_800DF4A0) # $t0, 0x800e +/* 0805B0 8007F9B0 3C08800E */ lui $t0, %hi(gMenuText) # $t0, 0x800e /* 0805B4 8007F9B4 8DF80000 */ lw $t8, ($t7) -/* 0805B8 8007F9B8 2508F4A0 */ addiu $t0, %lo(D_800DF4A0) # addiu $t0, $t0, -0xb60 +/* 0805B8 8007F9B8 2508F4A0 */ addiu $t0, %lo(gMenuText) # addiu $t0, $t0, -0xb60 /* 0805BC 8007F9BC 1B000014 */ blez $t8, .L8007FA10 /* 0805C0 8007F9C0 00003025 */ move $a2, $zero /* 0805C4 8007F9C4 00001825 */ move $v1, $zero @@ -76,24 +76,24 @@ glabel func_8007F900 /* 08060C 8007FA0C 00000000 */ nop .L8007FA10: /* 080610 8007FA10 8D040000 */ lw $a0, ($t0) -/* 080614 8007FA14 3C058012 */ lui $a1, %hi(D_801269D0) # $a1, 0x8012 +/* 080614 8007FA14 3C058012 */ lui $a1, %hi(gAudioOutputStrings) # $a1, 0x8012 /* 080618 8007FA18 8C8C0000 */ lw $t4, ($a0) -/* 08061C 8007FA1C 24A569D0 */ addiu $a1, %lo(D_801269D0) # addiu $a1, $a1, 0x69d0 +/* 08061C 8007FA1C 24A569D0 */ addiu $a1, %lo(gAudioOutputStrings) # addiu $a1, $a1, 0x69d0 /* 080620 8007FA20 ACAC0000 */ sw $t4, ($a1) /* 080624 8007FA24 8C8D0004 */ lw $t5, 4($a0) -/* 080628 8007FA28 3C02800E */ lui $v0, %hi(D_800DFA3C) # $v0, 0x800e +/* 080628 8007FA28 3C02800E */ lui $v0, %hi(gAudioMenuStrings) # $v0, 0x800e /* 08062C 8007FA2C ACAD0004 */ sw $t5, 4($a1) /* 080630 8007FA30 8C8E0008 */ lw $t6, 8($a0) -/* 080634 8007FA34 2442FA3C */ addiu $v0, %lo(D_800DFA3C) # addiu $v0, $v0, -0x5c4 +/* 080634 8007FA34 2442FA3C */ addiu $v0, %lo(gAudioMenuStrings) # addiu $v0, $v0, -0x5c4 /* 080638 8007FA38 ACAE0008 */ sw $t6, 8($a1) /* 08063C 8007FA3C 8C8F000C */ lw $t7, 0xc($a0) -/* 080640 8007FA40 3C018012 */ lui $at, %hi(D_801269E0) # $at, 0x8012 +/* 080640 8007FA40 3C018012 */ lui $at, %hi(gMusicTestString) # $at, 0x8012 /* 080644 8007FA44 AC4F001C */ sw $t7, 0x1c($v0) /* 080648 8007FA48 8C980010 */ lw $t8, 0x10($a0) -/* 08064C 8007FA4C 3C03800E */ lui $v1, %hi(D_800DFDA0) # $v1, 0x800e +/* 08064C 8007FA4C 3C03800E */ lui $v1, %hi(gMagicCodeMenuStrings) # $v1, 0x800e /* 080650 8007FA50 AC58002C */ sw $t8, 0x2c($v0) /* 080654 8007FA54 8C990014 */ lw $t9, 0x14($a0) -/* 080658 8007FA58 2463FDA0 */ addiu $v1, %lo(D_800DFDA0) # addiu $v1, $v1, -0x260 +/* 080658 8007FA58 2463FDA0 */ addiu $v1, %lo(gMagicCodeMenuStrings) # addiu $v1, $v1, -0x260 /* 08065C 8007FA5C AC59003C */ sw $t9, 0x3c($v0) /* 080660 8007FA60 8C8A0018 */ lw $t2, 0x18($a0) /* 080664 8007FA64 3C07800E */ lui $a3, %hi(D_800E0BEC) # $a3, 0x800e @@ -103,7 +103,7 @@ glabel func_8007F900 /* 080674 8007FA74 AC4B005C */ sw $t3, 0x5c($v0) /* 080678 8007FA78 8C8C001C */ lw $t4, 0x1c($a0) /* 08067C 8007FA7C 3C09800E */ lui $t1, %hi(D_800E0CEC) # $t1, 0x800e -/* 080680 8007FA80 AC2C69E0 */ sw $t4, %lo(D_801269E0)($at) +/* 080680 8007FA80 AC2C69E0 */ sw $t4, %lo(gMusicTestString)($at) /* 080684 8007FA84 8C8D0038 */ lw $t5, 0x38($a0) /* 080688 8007FA88 25290CEC */ addiu $t1, %lo(D_800E0CEC) # addiu $t1, $t1, 0xcec /* 08068C 8007FA8C AC6D0000 */ sw $t5, ($v1) @@ -114,10 +114,10 @@ glabel func_8007F900 /* 0806A0 8007FAA0 24C60E4C */ addiu $a2, %lo(D_800E0E4C) # addiu $a2, $a2, 0xe4c /* 0806A4 8007FAA4 AC6F0008 */ sw $t7, 8($v1) /* 0806A8 8007FAA8 8C980014 */ lw $t8, 0x14($a0) -/* 0806AC 8007FAAC 3C02800E */ lui $v0, %hi(D_800DFA10) # $v0, 0x800e +/* 0806AC 8007FAAC 3C02800E */ lui $v0, %hi(gOptionMenuStrings) # $v0, 0x800e /* 0806B0 8007FAB0 AC78000C */ sw $t8, 0xc($v1) /* 0806B4 8007FAB4 8C990074 */ lw $t9, 0x74($a0) -/* 0806B8 8007FAB8 2442FA10 */ addiu $v0, %lo(D_800DFA10) # addiu $v0, $v0, -0x5f0 +/* 0806B8 8007FAB8 2442FA10 */ addiu $v0, %lo(gOptionMenuStrings) # addiu $v0, $v0, -0x5f0 /* 0806BC 8007FABC ACF90034 */ sw $t9, 0x34($a3) /* 0806C0 8007FAC0 8C8A0078 */ lw $t2, 0x78($a0) /* 0806C4 8007FAC4 3C010200 */ lui $at, 0x200 @@ -157,10 +157,10 @@ glabel func_8007F900 /* 080748 8007FB48 AC4F0004 */ sw $t7, 4($v0) .L8007FB4C: /* 08074C 8007FB4C 8C980018 */ lw $t8, 0x18($a0) -/* 080750 8007FB50 3C06800E */ lui $a2, %hi(D_800E03B0) # $a2, 0x800e +/* 080750 8007FB50 3C06800E */ lui $a2, %hi(gFilenames) # $a2, 0x800e /* 080754 8007FB54 AC580008 */ sw $t8, 8($v0) /* 080758 8007FB58 8C990294 */ lw $t9, 0x294($a0) -/* 08075C 8007FB5C 24C603B0 */ addiu $a2, %lo(D_800E03B0) # addiu $a2, $a2, 0x3b0 +/* 08075C 8007FB5C 24C603B0 */ addiu $a2, %lo(gFilenames) # addiu $a2, $a2, 0x3b0 /* 080760 8007FB60 AC59000C */ sw $t9, 0xc($v0) /* 080764 8007FB64 8C8A0044 */ lw $t2, 0x44($a0) /* 080768 8007FB68 3C07800E */ lui $a3, %hi(D_800DFAE4) # $a3, 0x800e @@ -244,10 +244,10 @@ glabel func_8007F900 /* 0808A0 8007FCA0 00000000 */ nop /* 0808A4 8007FCA4 AC6C0010 */ sw $t4, 0x10($v1) /* 0808A8 8007FCA8 8C8D0168 */ lw $t5, 0x168($a0) -/* 0808AC 8007FCAC 3C03800E */ lui $v1, %hi(D_800E0278) # $v1, 0x800e +/* 0808AC 8007FCAC 3C03800E */ lui $v1, %hi(gGameSelectTextElemsWithAdv2) # $v1, 0x800e /* 0808B0 8007FCB0 ACAD0000 */ sw $t5, ($a1) /* 0808B4 8007FCB4 8C8E02E0 */ lw $t6, 0x2e0($a0) -/* 0808B8 8007FCB8 24630278 */ addiu $v1, %lo(D_800E0278) # addiu $v1, $v1, 0x278 +/* 0808B8 8007FCB8 24630278 */ addiu $v1, %lo(gGameSelectTextElemsWithAdv2) # addiu $v1, $v1, 0x278 /* 0808BC 8007FCBC ACAE0004 */ sw $t6, 4($a1) /* 0808C0 8007FCC0 8C8F005C */ lw $t7, 0x5c($a0) /* 0808C4 8007FCC4 00000000 */ nop @@ -256,10 +256,10 @@ glabel func_8007F900 /* 0808D0 8007FCD0 00000000 */ nop /* 0808D4 8007FCD4 ACB80010 */ sw $t8, 0x10($a1) /* 0808D8 8007FCD8 8C990264 */ lw $t9, 0x264($a0) -/* 0808DC 8007FCDC 3C05800E */ lui $a1, %hi(D_800E0198) # $a1, 0x800e +/* 0808DC 8007FCDC 3C05800E */ lui $a1, %hi(gGameSelectTextElemsNoAdv2) # $a1, 0x800e /* 0808E0 8007FCE0 ACD90000 */ sw $t9, ($a2) /* 0808E4 8007FCE4 8C8A0268 */ lw $t2, 0x268($a0) -/* 0808E8 8007FCE8 24A50198 */ addiu $a1, %lo(D_800E0198) # addiu $a1, $a1, 0x198 +/* 0808E8 8007FCE8 24A50198 */ addiu $a1, %lo(gGameSelectTextElemsNoAdv2) # addiu $a1, $a1, 0x198 /* 0808EC 8007FCEC ACCA0004 */ sw $t2, 4($a2) /* 0808F0 8007FCF0 8C8B026C */ lw $t3, 0x26c($a0) /* 0808F4 8007FCF4 00000000 */ nop @@ -268,10 +268,10 @@ glabel func_8007F900 /* 080900 8007FD00 00000000 */ nop /* 080904 8007FD04 ACCC0010 */ sw $t4, 0x10($a2) /* 080908 8007FD08 8C8D0270 */ lw $t5, 0x270($a0) -/* 08090C 8007FD0C 3C06800E */ lui $a2, %hi(D_800DF7A4) # $a2, 0x800e +/* 08090C 8007FD0C 3C06800E */ lui $a2, %hi(gTitleMenuStrings) # $a2, 0x800e /* 080910 8007FD10 ACED0000 */ sw $t5, ($a3) /* 080914 8007FD14 8C8E0274 */ lw $t6, 0x274($a0) -/* 080918 8007FD18 24C6F7A4 */ addiu $a2, %lo(D_800DF7A4) # addiu $a2, $a2, -0x85c +/* 080918 8007FD18 24C6F7A4 */ addiu $a2, %lo(gTitleMenuStrings) # addiu $a2, $a2, -0x85c /* 08091C 8007FD1C ACEE0004 */ sw $t6, 4($a3) /* 080920 8007FD20 8C8F0278 */ lw $t7, 0x278($a0) /* 080924 8007FD24 00000000 */ nop @@ -389,31 +389,31 @@ glabel func_8007F900 /* 080AD8 8007FED8 24630A14 */ addiu $v1, %lo(D_800E0A14) # addiu $v1, $v1, 0xa14 /* 080ADC 8007FEDC AC4A0008 */ sw $t2, 8($v0) /* 080AE0 8007FEE0 8C8B027C */ lw $t3, 0x27c($a0) -/* 080AE4 8007FEE4 3C05800E */ lui $a1, %hi(D_800DFFD8) # $a1, 0x800e +/* 080AE4 8007FEE4 3C05800E */ lui $a1, %hi(gCautionMenuTextElements) # $a1, 0x800e /* 080AE8 8007FEE8 AC6B0000 */ sw $t3, ($v1) /* 080AEC 8007FEEC 8C8C0284 */ lw $t4, 0x284($a0) -/* 080AF0 8007FEF0 24A5FFD8 */ addiu $a1, %lo(D_800DFFD8) # addiu $a1, $a1, -0x28 +/* 080AF0 8007FEF0 24A5FFD8 */ addiu $a1, %lo(gCautionMenuTextElements) # addiu $a1, $a1, -0x28 /* 080AF4 8007FEF4 AC6C0004 */ sw $t4, 4($v1) /* 080AF8 8007FEF8 8C8E0288 */ lw $t6, 0x288($a0) -/* 080AFC 8007FEFC 3C01800E */ lui $at, %hi(D_800DFFD8+84) # $at, 0x800e +/* 080AFC 8007FEFC 3C01800E */ lui $at, %hi(gCautionMenuTextElements+84) # $at, 0x800e /* 080B00 8007FF00 AC6E0008 */ sw $t6, 8($v1) /* 080B04 8007FF04 8C8D0260 */ lw $t5, 0x260($a0) /* 080B08 8007FF08 2482000C */ addiu $v0, $a0, 0xc /* 080B0C 8007FF0C ACAD0014 */ sw $t5, 0x14($a1) /* 080B10 8007FF10 8C8F0260 */ lw $t7, 0x260($a0) -/* 080B14 8007FF14 3C03800E */ lui $v1, %hi(D_800DFFD8+96) # $v1, 0x800e +/* 080B14 8007FF14 3C03800E */ lui $v1, %hi(gCautionMenuTextElements+96) # $v1, 0x800e /* 080B18 8007FF18 ACAF0034 */ sw $t7, 0x34($a1) /* 080B1C 8007FF1C 8C980298 */ lw $t8, 0x298($a0) -/* 080B20 8007FF20 24630038 */ addiu $v1, %lo(D_800DFFD8+96) # addiu $v1, $v1, 0x38 -/* 080B24 8007FF24 AC38002C */ sw $t8, %lo(D_800DFFD8+84)($at) +/* 080B20 8007FF20 24630038 */ addiu $v1, %lo(gCautionMenuTextElements+96) # addiu $v1, $v1, 0x38 +/* 080B24 8007FF24 AC38002C */ sw $t8, %lo(gCautionMenuTextElements+84)($at) /* 080B28 8007FF28 8C99029C */ lw $t9, 0x29c($a0) -/* 080B2C 8007FF2C 3C01800E */ lui $at, %hi(D_800DFFD8+116) # $at, 0x800e -/* 080B30 8007FF30 AC39004C */ sw $t9, %lo(D_800DFFD8+116)($at) +/* 080B2C 8007FF2C 3C01800E */ lui $at, %hi(gCautionMenuTextElements+116) # $at, 0x800e +/* 080B30 8007FF30 AC39004C */ sw $t9, %lo(gCautionMenuTextElements+116)($at) /* 080B34 8007FF34 8C8A02A0 */ lw $t2, 0x2a0($a0) -/* 080B38 8007FF38 3C04800E */ lui $a0, %hi(D_800DFFD8+352) # $a0, 0x800e -/* 080B3C 8007FF3C 3C01800E */ lui $at, %hi(D_800DFFD8+148) # $at, 0x800e -/* 080B40 8007FF40 24840138 */ addiu $a0, %lo(D_800DFFD8+352) # addiu $a0, $a0, 0x138 -/* 080B44 8007FF44 AC2A006C */ sw $t2, %lo(D_800DFFD8+148)($at) +/* 080B38 8007FF38 3C04800E */ lui $a0, %hi(gCautionMenuTextElements+352) # $a0, 0x800e +/* 080B3C 8007FF3C 3C01800E */ lui $at, %hi(gCautionMenuTextElements+148) # $at, 0x800e +/* 080B40 8007FF40 24840138 */ addiu $a0, %lo(gCautionMenuTextElements+352) # addiu $a0, $a0, 0x138 +/* 080B44 8007FF44 AC2A006C */ sw $t2, %lo(gCautionMenuTextElements+148)($at) .L8007FF48: /* 080B48 8007FF48 8C4B0298 */ lw $t3, 0x298($v0) /* 080B4C 8007FF4C 24630080 */ addiu $v1, $v1, 0x80 diff --git a/asm/non_matchings/menu/menu_5_init.s b/asm/non_matchings/menu/menu_5_init.s deleted file mode 100644 index 281378af..00000000 --- a/asm/non_matchings/menu/menu_5_init.s +++ /dev/null @@ -1,140 +0,0 @@ -glabel menu_5_init -/* 093884 80092C84 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 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(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(gMenuDelay) # $at, 0x800e -/* 0938A8 80092CA8 AFA20024 */ sw $v0, 0x24($sp) -/* 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) -/* 0938BC 80092CBC 0C01AC2B */ jal func_8006B0AC -/* 0938C0 80092CC0 02002025 */ move $a0, $s0 -/* 0938C4 80092CC4 3C018012 */ lui $at, %hi(gPlayerSelectVehicle) # $at, 0x8012 -/* 0938C8 80092CC8 A02269C0 */ sb $v0, %lo(gPlayerSelectVehicle)($at) -/* 0938CC 80092CCC 0C01AC53 */ jal func_8006B14C -/* 0938D0 80092CD0 02002025 */ move $a0, $s0 -/* 0938D4 80092CD4 24010005 */ li $at, 5 -/* 0938D8 80092CD8 1041000F */ beq $v0, $at, .L80092D18 -/* 0938DC 80092CDC 00106040 */ sll $t4, $s0, 1 -/* 0938E0 80092CE0 24010008 */ li $at, 8 -/* 0938E4 80092CE4 1041000C */ beq $v0, $at, .L80092D18 -/* 0938E8 80092CE8 304F0040 */ andi $t7, $v0, 0x40 -/* 0938EC 80092CEC 15E00017 */ bnez $t7, .L80092D4C -/* 0938F0 80092CF0 00107040 */ sll $t6, $s0, 1 -/* 0938F4 80092CF4 8FB80024 */ lw $t8, 0x24($sp) -/* 0938F8 80092CF8 00104080 */ sll $t0, $s0, 2 -/* 0938FC 80092CFC 8F190004 */ lw $t9, 4($t8) -/* 093900 80092D00 00000000 */ nop -/* 093904 80092D04 03284821 */ addu $t1, $t9, $t0 -/* 093908 80092D08 8D2A0000 */ lw $t2, ($t1) -/* 09390C 80092D0C 00000000 */ nop -/* 093910 80092D10 314B0002 */ andi $t3, $t2, 2 -/* 093914 80092D14 1560000D */ bnez $t3, .L80092D4C -.L80092D18: -/* 093918 80092D18 3C02800E */ lui $v0, %hi(D_800E0758) # $v0, 0x800e -/* 09391C 80092D1C 004C1021 */ addu $v0, $v0, $t4 -/* 093920 80092D20 84420758 */ lh $v0, %lo(D_800E0758)($v0) -/* 093924 80092D24 2401FFFF */ li $at, -1 -/* 093928 80092D28 10410004 */ beq $v0, $at, .L80092D3C -/* 09392C 80092D2C 3044FFFF */ andi $a0, $v0, 0xffff -/* 093930 80092D30 00002825 */ move $a1, $zero -/* 093934 80092D34 0C0003F7 */ jal func_80000FDC -/* 093938 80092D38 3C063F80 */ lui $a2, 0x3f80 -.L80092D3C: -/* 09393C 80092D3C 240DFFFF */ li $t5, -1 -/* 093940 80092D40 3C018012 */ lui $at, %hi(D_801263E0) # $at, 0x8012 -/* 093944 80092D44 10000044 */ b .L80092E58 -/* 093948 80092D48 AC2D63E0 */ sw $t5, %lo(D_801263E0)($at) -.L80092D4C: -/* 09394C 80092D4C 3C02800E */ lui $v0, %hi(D_800E0758) # $v0, 0x800e -/* 093950 80092D50 004E1021 */ addu $v0, $v0, $t6 -/* 093954 80092D54 84420758 */ lh $v0, %lo(D_800E0758)($v0) -/* 093958 80092D58 2401FFFF */ li $at, -1 -/* 09395C 80092D5C 10410004 */ beq $v0, $at, .L80092D70 -/* 093960 80092D60 3044FFFF */ andi $a0, $v0, 0xffff -/* 093964 80092D64 00002825 */ move $a1, $zero -/* 093968 80092D68 0C0003F7 */ jal func_80000FDC -/* 09396C 80092D6C 3C063F00 */ lui $a2, 0x3f00 -.L80092D70: -/* 093970 80092D70 0C0002F8 */ jal func_80000BE0 -/* 093974 80092D74 24040018 */ li $a0, 24 -/* 093978 80092D78 0C0002CD */ jal play_music -/* 09397C 80092D7C 24040018 */ li $a0, 24 -/* 093980 80092D80 0C0002C6 */ jal func_80000B18 -/* 093984 80092D84 00000000 */ nop -/* 093988 80092D88 3C018012 */ lui $at, %hi(D_801263E0) # $at, 0x8012 -/* 09398C 80092D8C 3C04800E */ lui $a0, %hi(D_800E0FB4) # $a0, 0x800e -/* 093990 80092D90 AC2063E0 */ sw $zero, %lo(D_801263E0)($at) -/* 093994 80092D94 0C02719D */ jal func_8009C674 -/* 093998 80092D98 24840FB4 */ addiu $a0, %lo(D_800E0FB4) # addiu $a0, $a0, 0xfb4 -/* 09399C 80092D9C 3C04800E */ lui $a0, %hi(D_800E0FD8) # $a0, 0x800e -/* 0939A0 80092DA0 0C027229 */ jal func_8009C8A4 -/* 0939A4 80092DA4 24840FD8 */ addiu $a0, %lo(D_800E0FD8) # addiu $a0, $a0, 0xfd8 -/* 0939A8 80092DA8 0C023917 */ jal func_8008E45C -/* 0939AC 80092DAC 00000000 */ nop -/* 0939B0 80092DB0 3C028012 */ lui $v0, %hi(D_80126550) # $v0, 0x8012 -/* 0939B4 80092DB4 24426550 */ addiu $v0, %lo(D_80126550) # addiu $v0, $v0, 0x6550 -/* 0939B8 80092DB8 8C4F007C */ lw $t7, 0x7c($v0) -/* 0939BC 80092DBC 3C01800E */ lui $at, %hi(D_800E04D4) # $at, 0x800e -/* 0939C0 80092DC0 AC2F04D4 */ sw $t7, %lo(D_800E04D4)($at) -/* 0939C4 80092DC4 8C580078 */ lw $t8, 0x78($v0) -/* 0939C8 80092DC8 3C01800E */ lui $at, %hi(D_800E04E4) # $at, 0x800e -/* 0939CC 80092DCC AC3804E4 */ sw $t8, %lo(D_800E04E4)($at) -/* 0939D0 80092DD0 8C590084 */ lw $t9, 0x84($v0) -/* 0939D4 80092DD4 3C01800E */ lui $at, %hi(D_800E04F4) # $at, 0x800e -/* 0939D8 80092DD8 AC3904F4 */ sw $t9, %lo(D_800E04F4)($at) -/* 0939DC 80092DDC 8C480080 */ lw $t0, 0x80($v0) -/* 0939E0 80092DE0 3C01800E */ lui $at, %hi(D_800E0504) # $at, 0x800e -/* 0939E4 80092DE4 AC280504 */ sw $t0, %lo(D_800E0504)($at) -/* 0939E8 80092DE8 8C49008C */ lw $t1, 0x8c($v0) -/* 0939EC 80092DEC 3C01800E */ lui $at, %hi(D_800E0514) # $at, 0x800e -/* 0939F0 80092DF0 AC290514 */ sw $t1, %lo(D_800E0514)($at) -/* 0939F4 80092DF4 8C4A0088 */ lw $t2, 0x88($v0) -/* 0939F8 80092DF8 3C01800E */ lui $at, %hi(D_800E0524) # $at, 0x800e -/* 0939FC 80092DFC AC2A0524 */ sw $t2, %lo(D_800E0524)($at) -/* 093A00 80092E00 8C4B00C0 */ lw $t3, 0xc0($v0) -/* 093A04 80092E04 3C01800E */ lui $at, %hi(D_800E05B4) # $at, 0x800e -/* 093A08 80092E08 AC2B05B4 */ sw $t3, %lo(D_800E05B4)($at) -/* 093A0C 80092E0C 8C4C0178 */ lw $t4, 0x178($v0) -/* 093A10 80092E10 3C01800E */ lui $at, %hi(D_800E0614) # $at, 0x800e -/* 093A14 80092E14 3C04800E */ lui $a0, %hi(D_800DF77C) # $a0, 0x800e -/* 093A18 80092E18 2484F77C */ addiu $a0, %lo(D_800DF77C) # addiu $a0, $a0, -0x884 -/* 093A1C 80092E1C 0C030076 */ jal func_800C01D8 -/* 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(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) -/* 093A40 80092E40 0C03105C */ jal func_800C4170 -/* 093A44 80092E44 24040002 */ li $a0, 2 -/* 093A48 80092E48 02002025 */ move $a0, $s0 -/* 093A4C 80092E4C 2405FFFF */ li $a1, -1 -/* 093A50 80092E50 0C01B8BA */ jal load_level_for_menu -/* 093A54 80092E54 24060001 */ li $a2, 1 -.L80092E58: -/* 093A58 80092E58 0C031525 */ jal func_800C5494 -/* 093A5C 80092E5C 24040007 */ li $a0, 7 -/* 093A60 80092E60 0C01AC53 */ jal func_8006B14C -/* 093A64 80092E64 02002025 */ move $a0, $s0 -/* 093A68 80092E68 304E0040 */ andi $t6, $v0, 0x40 -/* 093A6C 80092E6C 11C00006 */ beqz $t6, .L80092E88 -/* 093A70 80092E70 8FBF001C */ lw $ra, 0x1c($sp) -/* 093A74 80092E74 0C01AC64 */ jal func_8006B190 -/* 093A78 80092E78 02002025 */ move $a0, $s0 -/* 093A7C 80092E7C 0C030C7B */ jal func_800C31EC -/* 093A80 80092E80 2444003B */ addiu $a0, $v0, 0x3b -/* 093A84 80092E84 8FBF001C */ lw $ra, 0x1c($sp) -.L80092E88: -/* 093A88 80092E88 8FB00018 */ lw $s0, 0x18($sp) -/* 093A8C 80092E8C 03E00008 */ jr $ra -/* 093A90 80092E90 27BD0028 */ addiu $sp, $sp, 0x28 - diff --git a/asm/non_matchings/menu/menu_character_select_init.s b/asm/non_matchings/menu/menu_character_select_init.s deleted file mode 100644 index a90e9aa8..00000000 --- a/asm/non_matchings/menu/menu_character_select_init.s +++ /dev/null @@ -1,156 +0,0 @@ -glabel menu_character_select_init -/* 08BBCC 8008AFCC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 08BBD0 8008AFD0 AFBF002C */ sw $ra, 0x2c($sp) -/* 08BBD4 8008AFD4 AFB1001C */ sw $s1, 0x1c($sp) -/* 08BBD8 8008AFD8 AFB40028 */ sw $s4, 0x28($sp) -/* 08BBDC 8008AFDC AFB30024 */ sw $s3, 0x24($sp) -/* 08BBE0 8008AFE0 AFB20020 */ sw $s2, 0x20($sp) -/* 08BBE4 8008AFE4 AFB00018 */ sw $s0, 0x18($sp) -/* 08BBE8 8008AFE8 0C01A90D */ jal func_8006A434 -/* 08BBEC 8008AFEC 00008825 */ move $s1, $zero -/* 08BBF0 8008AFF0 0C027B34 */ jal is_drumstick_unlocked -/* 08BBF4 8008AFF4 00000000 */ nop -/* 08BBF8 8008AFF8 10400010 */ beqz $v0, .L8008B03C -/* 08BBFC 8008AFFC 00000000 */ nop -/* 08BC00 8008B000 0C027B2E */ jal is_tt_unlocked -/* 08BC04 8008B004 00000000 */ nop -/* 08BC08 8008B008 10400007 */ beqz $v0, .L8008B028 -/* 08BC0C 8008B00C 3C078012 */ lui $a3, %hi(D_801263CC) # $a3, 0x8012 -/* 08BC10 8008B010 3C078012 */ lui $a3, %hi(D_801263CC) # $a3, 0x8012 -/* 08BC14 8008B014 3C0E800E */ lui $t6, %hi(D_800DFF40) # $t6, 0x800e -/* 08BC18 8008B018 24E763CC */ addiu $a3, %lo(D_801263CC) # addiu $a3, $a3, 0x63cc -/* 08BC1C 8008B01C 25CEFF40 */ addiu $t6, %lo(D_800DFF40) # addiu $t6, $t6, -0xc0 -/* 08BC20 8008B020 10000014 */ b .L8008B074 -/* 08BC24 8008B024 ACEE0000 */ sw $t6, ($a3) -.L8008B028: -/* 08BC28 8008B028 3C0F800E */ lui $t7, %hi(D_800DFE40) # $t7, 0x800e -/* 08BC2C 8008B02C 24E763CC */ addiu $a3, %lo(D_801263CC) # addiu $a3, $a3, 0x63cc -/* 08BC30 8008B030 25EFFE40 */ addiu $t7, %lo(D_800DFE40) # addiu $t7, $t7, -0x1c0 -/* 08BC34 8008B034 1000000F */ b .L8008B074 -/* 08BC38 8008B038 ACEF0000 */ sw $t7, ($a3) -.L8008B03C: -/* 08BC3C 8008B03C 0C027B2E */ jal is_tt_unlocked -/* 08BC40 8008B040 00000000 */ nop -/* 08BC44 8008B044 10400006 */ beqz $v0, .L8008B060 -/* 08BC48 8008B048 3C078012 */ lui $a3, %hi(D_801263CC) # $a3, 0x8012 -/* 08BC4C 8008B04C 3C18800E */ lui $t8, %hi(D_800DFEC0) # $t8, 0x800e -/* 08BC50 8008B050 24E763CC */ addiu $a3, %lo(D_801263CC) # addiu $a3, $a3, 0x63cc -/* 08BC54 8008B054 2718FEC0 */ addiu $t8, %lo(D_800DFEC0) # addiu $t8, $t8, -0x140 -/* 08BC58 8008B058 10000006 */ b .L8008B074 -/* 08BC5C 8008B05C ACF80000 */ sw $t8, ($a3) -.L8008B060: -/* 08BC60 8008B060 3C078012 */ lui $a3, %hi(D_801263CC) # $a3, 0x8012 -/* 08BC64 8008B064 3C19800E */ lui $t9, %hi(D_800DFDD0) # $t9, 0x800e -/* 08BC68 8008B068 24E763CC */ addiu $a3, %lo(D_801263CC) # addiu $a3, $a3, 0x63cc -/* 08BC6C 8008B06C 2739FDD0 */ addiu $t9, %lo(D_800DFDD0) # addiu $t9, $t9, -0x230 -/* 08BC70 8008B070 ACF90000 */ sw $t9, ($a3) -.L8008B074: -/* 08BC74 8008B074 3C028012 */ lui $v0, %hi(D_801263DC) # $v0, 0x8012 -/* 08BC78 8008B078 3C038012 */ lui $v1, %hi(D_801263E0) # $v1, 0x8012 -/* 08BC7C 8008B07C 246363E0 */ addiu $v1, %lo(D_801263E0) # addiu $v1, $v1, 0x63e0 -/* 08BC80 8008B080 244263DC */ addiu $v0, %lo(D_801263DC) # addiu $v0, $v0, 0x63dc -.L8008B084: -/* 08BC84 8008B084 24420001 */ addiu $v0, $v0, 1 -/* 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(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(gActivePlayersArray) # $t0, 0x8012 -/* 08BCB0 8008B0B0 3C01800E */ lui $at, %hi(D_800DF484) # $at, 0x800e -/* 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(gPlayersCharacterArray) # $v1, 0x8012 -/* 08BCC0 8008B0C0 AC20F484 */ sw $zero, %lo(D_800DF484)($at) -/* 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 -/* 08BCD4 8008B0D4 24060001 */ li $a2, 1 -/* 08BCD8 8008B0D8 2405007F */ li $a1, 127 -/* 08BCDC 8008B0DC 2404000E */ li $a0, 14 -.L8008B0E0: -/* 08BCE0 8008B0E0 80490000 */ lb $t1, ($v0) -/* 08BCE4 8008B0E4 00705821 */ addu $t3, $v1, $s0 -/* 08BCE8 8008B0E8 1120000B */ beqz $t1, .L8008B118 -/* 08BCEC 8008B0EC 00000000 */ nop -/* 08BCF0 8008B0F0 816C0000 */ lb $t4, ($t3) -/* 08BCF4 8008B0F4 8CEA0000 */ lw $t2, ($a3) -/* 08BCF8 8008B0F8 01840019 */ multu $t4, $a0 -/* 08BCFC 8008B0FC 00C08825 */ move $s1, $a2 -/* 08BD00 8008B100 00006812 */ mflo $t5 -/* 08BD04 8008B104 014D7021 */ addu $t6, $t2, $t5 -/* 08BD08 8008B108 85CF000C */ lh $t7, 0xc($t6) -/* 08BD0C 8008B10C A6450002 */ sh $a1, 2($s2) -/* 08BD10 8008B110 A2460001 */ sb $a2, 1($s2) -/* 08BD14 8008B114 A24F0000 */ sb $t7, ($s2) -.L8008B118: -/* 08BD18 8008B118 26100001 */ addiu $s0, $s0, 1 -/* 08BD1C 8008B11C 2A010004 */ slti $at, $s0, 4 -/* 08BD20 8008B120 10200003 */ beqz $at, .L8008B130 -/* 08BD24 8008B124 24420001 */ addiu $v0, $v0, 1 -/* 08BD28 8008B128 1220FFED */ beqz $s1, .L8008B0E0 -/* 08BD2C 8008B12C 00000000 */ nop -.L8008B130: -/* 08BD30 8008B130 3C028012 */ lui $v0, %hi(D_801263B4) # $v0, 0x8012 -/* 08BD34 8008B134 3C038012 */ lui $v1, %hi(D_801263B8) # $v1, 0x8012 -/* 08BD38 8008B138 246363B8 */ addiu $v1, %lo(D_801263B8) # addiu $v1, $v1, 0x63b8 -/* 08BD3C 8008B13C 244263B4 */ addiu $v0, %lo(D_801263B4) # addiu $v0, $v0, 0x63b4 -/* 08BD40 8008B140 2405FFFF */ li $a1, -1 -/* 08BD44 8008B144 3C128012 */ lui $s2, %hi(D_801263C0) # $s2, 0x8012 -/* 08BD48 8008B148 265263C0 */ addiu $s2, %lo(D_801263C0) # addiu $s2, $s2, 0x63c0 -/* 08BD4C 8008B14C A0450000 */ sb $a1, ($v0) -/* 08BD50 8008B150 A4400002 */ sh $zero, 2($v0) -/* 08BD54 8008B154 A0400001 */ sb $zero, 1($v0) -/* 08BD58 8008B158 A0650000 */ sb $a1, ($v1) -/* 08BD5C 8008B15C A4600002 */ sh $zero, 2($v1) -/* 08BD60 8008B160 A0600001 */ sb $zero, 1($v1) -/* 08BD64 8008B164 2404001A */ li $a0, 26 -/* 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 -/* 08BD78 8008B178 2414000A */ li $s4, 10 -.L8008B17C: -/* 08BD7C 8008B17C 82580000 */ lb $t8, ($s2) -/* 08BD80 8008B180 0010C840 */ sll $t9, $s0, 1 -/* 08BD84 8008B184 12180007 */ beq $s0, $t8, .L8008B1A4 -/* 08BD88 8008B188 02798821 */ addu $s1, $s3, $t9 -/* 08BD8C 8008B18C 92240000 */ lbu $a0, ($s1) -/* 08BD90 8008B190 0C000445 */ jal func_80001114 -/* 08BD94 8008B194 00000000 */ nop -/* 08BD98 8008B198 92240001 */ lbu $a0, 1($s1) -/* 08BD9C 8008B19C 0C000445 */ jal func_80001114 -/* 08BDA0 8008B1A0 00000000 */ nop -.L8008B1A4: -/* 08BDA4 8008B1A4 26100001 */ addiu $s0, $s0, 1 -/* 08BDA8 8008B1A8 1614FFF4 */ bne $s0, $s4, .L8008B17C -/* 08BDAC 8008B1AC 00000000 */ nop -/* 08BDB0 8008B1B0 0C000445 */ jal func_80001114 -/* 08BDB4 8008B1B4 24040006 */ li $a0, 6 -/* 08BDB8 8008B1B8 0C0002C6 */ jal func_80000B18 -/* 08BDBC 8008B1BC 00000000 */ nop -/* 08BDC0 8008B1C0 3C04800E */ lui $a0, %hi(D_800DFDC8) # $a0, 0x800e -/* 08BDC4 8008B1C4 0C02719D */ jal func_8009C674 -/* 08BDC8 8008B1C8 2484FDC8 */ addiu $a0, %lo(D_800DFDC8) # addiu $a0, $a0, -0x238 -/* 08BDCC 8008B1CC 3C04800E */ lui $a0, %hi(D_800DFDCC) # $a0, 0x800e -/* 08BDD0 8008B1D0 0C027229 */ jal func_8009C8A4 -/* 08BDD4 8008B1D4 2484FDCC */ addiu $a0, %lo(D_800DFDCC) # addiu $a0, $a0, -0x234 -/* 08BDD8 8008B1D8 3C04800E */ lui $a0, %hi(D_800DF77C) # $a0, 0x800e -/* 08BDDC 8008B1DC 0C030076 */ jal func_800C01D8 -/* 08BDE0 8008B1E0 2484F77C */ addiu $a0, %lo(D_800DF77C) # addiu $a0, $a0, -0x884 -/* 08BDE4 8008B1E4 0C03105C */ jal func_800C4170 -/* 08BDE8 8008B1E8 24040002 */ li $a0, 2 -/* 08BDEC 8008B1EC 8FBF002C */ lw $ra, 0x2c($sp) -/* 08BDF0 8008B1F0 8FB00018 */ lw $s0, 0x18($sp) -/* 08BDF4 8008B1F4 8FB1001C */ lw $s1, 0x1c($sp) -/* 08BDF8 8008B1F8 8FB20020 */ lw $s2, 0x20($sp) -/* 08BDFC 8008B1FC 8FB30024 */ lw $s3, 0x24($sp) -/* 08BE00 8008B200 8FB40028 */ lw $s4, 0x28($sp) -/* 08BE04 8008B204 03E00008 */ jr $ra -/* 08BE08 8008B208 27BD0030 */ addiu $sp, $sp, 0x30 - diff --git a/asm/non_matchings/menu/menu_game_select_init.s b/asm/non_matchings/menu/menu_game_select_init.s index 4172263e..eb66887b 100644 --- a/asm/non_matchings/menu/menu_game_select_init.s +++ b/asm/non_matchings/menu/menu_game_select_init.s @@ -59,22 +59,22 @@ glabel menu_game_select_init /* 08D1E4 8008C5E4 24040006 */ li $a0, 6 /* 08D1E8 8008C5E8 0C0002C6 */ jal func_80000B18 /* 08D1EC 8008C5EC 00000000 */ nop -/* 08D1F0 8008C5F0 0C027B18 */ jal func_8009EC60 +/* 08D1F0 8008C5F0 0C027B18 */ jal is_adventure_two_unlocked /* 08D1F4 8008C5F4 00000000 */ nop /* 08D1F8 8008C5F8 10400009 */ beqz $v0, .L8008C620 /* 08D1FC 8008C5FC 3C038012 */ lui $v1, %hi(D_80126460) # $v1, 0x8012 /* 08D200 8008C600 3C038012 */ lui $v1, %hi(D_80126460) # $v1, 0x8012 -/* 08D204 8008C604 3C08800E */ lui $t0, %hi(D_800E0278) # $t0, 0x800e +/* 08D204 8008C604 3C08800E */ lui $t0, %hi(gGameSelectTextElemsWithAdv2) # $t0, 0x800e /* 08D208 8008C608 24636460 */ addiu $v1, %lo(D_80126460) # addiu $v1, $v1, 0x6460 -/* 08D20C 8008C60C 25080278 */ addiu $t0, %lo(D_800E0278) # addiu $t0, $t0, 0x278 +/* 08D20C 8008C60C 25080278 */ addiu $t0, %lo(gGameSelectTextElemsWithAdv2) # addiu $t0, $t0, 0x278 /* 08D210 8008C610 24090002 */ li $t1, 2 /* 08D214 8008C614 AC680000 */ sw $t0, ($v1) /* 08D218 8008C618 10000007 */ b .L8008C638 /* 08D21C 8008C61C AE890000 */ sw $t1, ($s4) .L8008C620: -/* 08D220 8008C620 3C0A800E */ lui $t2, %hi(D_800E0198) # $t2, 0x800e +/* 08D220 8008C620 3C0A800E */ lui $t2, %hi(gGameSelectTextElemsNoAdv2) # $t2, 0x800e /* 08D224 8008C624 24636460 */ addiu $v1, %lo(D_80126460) # addiu $v1, $v1, 0x6460 -/* 08D228 8008C628 254A0198 */ addiu $t2, %lo(D_800E0198) # addiu $t2, $t2, 0x198 +/* 08D228 8008C628 254A0198 */ addiu $t2, %lo(gGameSelectTextElemsNoAdv2) # addiu $t2, $t2, 0x198 /* 08D22C 8008C62C 240B0001 */ li $t3, 1 /* 08D230 8008C630 AC6A0000 */ sw $t2, ($v1) /* 08D234 8008C634 AE8B0000 */ sw $t3, ($s4) diff --git a/asm/non_matchings/menu/menu_options_loop.s b/asm/non_matchings/menu/menu_options_loop.s index 041f504d..540584d8 100644 --- a/asm/non_matchings/menu/menu_options_loop.s +++ b/asm/non_matchings/menu/menu_options_loop.s @@ -161,12 +161,12 @@ glabel menu_options_loop /* 0851AC 800845AC 3C050200 */ lui $a1, 0x200 /* 0851B0 800845B0 0C030ABD */ jal func_800C2AF4 /* 0851B4 800845B4 00002025 */ move $a0, $zero -/* 0851B8 800845B8 3C0B800E */ lui $t3, %hi(D_800DF4A0) # $t3, 0x800e -/* 0851BC 800845BC 8D6BF4A0 */ lw $t3, %lo(D_800DF4A0)($t3) -/* 0851C0 800845C0 3C01800E */ lui $at, %hi(D_800DFA10+4) # $at, 0x800e +/* 0851B8 800845B8 3C0B800E */ lui $t3, %hi(gMenuText) # $t3, 0x800e +/* 0851BC 800845BC 8D6BF4A0 */ lw $t3, %lo(gMenuText)($t3) +/* 0851C0 800845C0 3C01800E */ lui $at, %hi(gOptionMenuStrings+4) # $at, 0x800e /* 0851C4 800845C4 8D6A02DC */ lw $t2, 0x2dc($t3) /* 0851C8 800845C8 1000000E */ b .L80084604 -/* 0851CC 800845CC AC2AFA14 */ sw $t2, %lo(D_800DFA10+4)($at) +/* 0851CC 800845CC AC2AFA14 */ sw $t2, %lo(gOptionMenuStrings+4)($at) .L800845D0: /* 0851D0 800845D0 0C000741 */ jal func_80001D04 /* 0851D4 800845D4 00002825 */ move $a1, $zero @@ -175,12 +175,12 @@ glabel menu_options_loop /* 0851E0 800845E0 3C050200 */ lui $a1, 0x200 /* 0851E4 800845E4 0C030ABD */ jal func_800C2AF4 /* 0851E8 800845E8 24040001 */ li $a0, 1 -/* 0851EC 800845EC 3C0C800E */ lui $t4, %hi(D_800DF4A0) # $t4, 0x800e -/* 0851F0 800845F0 8D8CF4A0 */ lw $t4, %lo(D_800DF4A0)($t4) -/* 0851F4 800845F4 3C01800E */ lui $at, %hi(D_800DFA10+4) # $at, 0x800e +/* 0851EC 800845EC 3C0C800E */ lui $t4, %hi(gMenuText) # $t4, 0x800e +/* 0851F0 800845F0 8D8CF4A0 */ lw $t4, %lo(gMenuText)($t4) +/* 0851F4 800845F4 3C01800E */ lui $at, %hi(gOptionMenuStrings+4) # $at, 0x800e /* 0851F8 800845F8 8D8D02D8 */ lw $t5, 0x2d8($t4) /* 0851FC 800845FC 00000000 */ nop -/* 085200 80084600 AC2DFA14 */ sw $t5, %lo(D_800DFA10+4)($at) +/* 085200 80084600 AC2DFA14 */ sw $t5, %lo(gOptionMenuStrings+4)($at) .L80084604: /* 085204 80084604 3C09800E */ lui $t1, %hi(gMenuDelay) # $t1, 0x800e /* 085208 80084608 3C06800E */ lui $a2, %hi(D_800DF460) # $a2, 0x800e diff --git a/asm/non_matchings/menu/menu_results_loop.s b/asm/non_matchings/menu/menu_results_loop.s index 4feb2725..7cfd358d 100644 --- a/asm/non_matchings/menu/menu_results_loop.s +++ b/asm/non_matchings/menu/menu_results_loop.s @@ -163,8 +163,8 @@ glabel menu_results_loop /* 098100 80097500 3C068012 */ lui $a2, %hi(D_80126A68) # $a2, 0x8012 /* 098104 80097504 24C66A68 */ addiu $a2, %lo(D_80126A68) # addiu $a2, $a2, 0x6a68 /* 098108 80097508 8CCA0000 */ lw $t2, ($a2) -/* 09810C 8009750C 3C0D800E */ lui $t5, %hi(D_800DF4A0) # $t5, 0x800e -/* 098110 80097510 8DADF4A0 */ lw $t5, %lo(D_800DF4A0)($t5) +/* 09810C 8009750C 3C0D800E */ lui $t5, %hi(gMenuText) # $t5, 0x800e +/* 098110 80097510 8DADF4A0 */ lw $t5, %lo(gMenuText)($t5) /* 098114 80097514 3C0C8012 */ lui $t4, %hi(D_80126BF0) # $t4, 0x8012 /* 098118 80097518 000A5880 */ sll $t3, $t2, 2 /* 09811C 8009751C AFA80020 */ sw $t0, 0x20($sp) @@ -253,8 +253,8 @@ glabel menu_results_loop /* 098244 80097644 3C068012 */ lui $a2, %hi(D_80126A68) # $a2, 0x8012 /* 098248 80097648 24C66A68 */ addiu $a2, %lo(D_80126A68) # addiu $a2, $a2, 0x6a68 /* 09824C 8009764C 8CCB0000 */ lw $t3, ($a2) -/* 098250 80097650 3C03800E */ lui $v1, %hi(D_800DF4A0) # $v1, 0x800e -/* 098254 80097654 8C63F4A0 */ lw $v1, %lo(D_800DF4A0)($v1) +/* 098250 80097650 3C03800E */ lui $v1, %hi(gMenuText) # $v1, 0x800e +/* 098254 80097654 8C63F4A0 */ lw $v1, %lo(gMenuText)($v1) /* 098258 80097658 3C028012 */ lui $v0, %hi(D_80126BF0) # $v0, 0x8012 /* 09825C 8009765C 000B6880 */ sll $t5, $t3, 2 /* 098260 80097660 004D1021 */ addu $v0, $v0, $t5 diff --git a/asm/non_matchings/menu/menu_title_screen_init.s b/asm/non_matchings/menu/menu_title_screen_init.s deleted file mode 100644 index e1440dab..00000000 --- a/asm/non_matchings/menu/menu_title_screen_init.s +++ /dev/null @@ -1,150 +0,0 @@ -glabel menu_title_screen_init -/* 08413C 8008353C 240E0001 */ li $t6, 1 -/* 084140 80083540 3C01800E */ lui $at, %hi(D_800DF488) # $at, 0x800e -/* 084144 80083544 AC2EF488 */ sw $t6, %lo(D_800DF488)($at) -/* 084148 80083548 3C018012 */ lui $at, %hi(D_801263BC) # $at, 0x8012 -/* 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(gMenuDelay) # $at, 0x800e -/* 08415C 8008355C 0C027055 */ jal reset_character_id_slots -/* 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(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(gNumberOfActivePlayers)($at) -/* 084184 80083584 0C0002CD */ jal play_music -/* 084188 80083588 24040001 */ li $a0, 1 -/* 08418C 8008358C 0C0006BB */ jal musicGetRelativeVolume -/* 084190 80083590 00000000 */ nop -/* 084194 80083594 3C03800E */ lui $v1, %hi(D_800DF458) # $v1, 0x800e -/* 084198 80083598 3C01800E */ lui $at, %hi(D_800DF760) # $at, 0x800e -/* 08419C 8008359C AC22F760 */ sw $v0, %lo(D_800DF760)($at) -/* 0841A0 800835A0 2463F458 */ addiu $v1, %lo(D_800DF458) # addiu $v1, $v1, -0xba8 -/* 0841A4 800835A4 8C780000 */ lw $t8, ($v1) -/* 0841A8 800835A8 3C018012 */ lui $at, %hi(D_8012686C) # $at, 0x8012 -/* 0841AC 800835AC 13000005 */ beqz $t8, .L800835C4 -/* 0841B0 800835B0 24190001 */ li $t9, 1 -/* 0841B4 800835B4 AC20686C */ sw $zero, %lo(D_8012686C)($at) -/* 0841B8 800835B8 10000004 */ b .L800835CC -/* 0841BC 800835BC AC600000 */ sw $zero, ($v1) -/* 0841C0 800835C0 24190001 */ li $t9, 1 -.L800835C4: -/* 0841C4 800835C4 3C018012 */ lui $at, %hi(D_8012686C) # $at, 0x8012 -/* 0841C8 800835C8 AC39686C */ sw $t9, %lo(D_8012686C)($at) -.L800835CC: -/* 0841CC 800835CC 44802000 */ mtc1 $zero, $f4 -/* 0841D0 800835D0 3C018012 */ lui $at, %hi(D_80126870) # $at, 0x8012 -/* 0841D4 800835D4 E4246870 */ swc1 $f4, %lo(D_80126870)($at) -/* 0841D8 800835D8 3C018012 */ lui $at, %hi(D_801263E0) # $at, 0x8012 -/* 0841DC 800835DC 3C04800E */ lui $a0, %hi(D_800DF7C4) # $a0, 0x800e -/* 0841E0 800835E0 AC2063E0 */ sw $zero, %lo(D_801263E0)($at) -/* 0841E4 800835E4 0C02719D */ jal func_8009C674 -/* 0841E8 800835E8 2484F7C4 */ addiu $a0, %lo(D_800DF7C4) # addiu $a0, $a0, -0x83c -/* 0841EC 800835EC 3C08800E */ lui $t0, %hi(D_800DF7C4) # $t0, 0x800e -/* 0841F0 800835F0 8508F7C4 */ lh $t0, %lo(D_800DF7C4)($t0) -/* 0841F4 800835F4 3C048012 */ lui $a0, %hi(D_80126550) # $a0, 0x8012 -/* 0841F8 800835F8 24846550 */ addiu $a0, %lo(D_80126550) # addiu $a0, $a0, 0x6550 -/* 0841FC 800835FC 3C0C800E */ lui $t4, %hi(D_800DF7C4+2) # $t4, 0x800e -/* 084200 80083600 00084880 */ sll $t1, $t0, 2 -/* 084204 80083604 858CF7C6 */ lh $t4, %lo(D_800DF7C4+2)($t4) -/* 084208 80083608 00895021 */ addu $t2, $a0, $t1 -/* 08420C 8008360C 8D4B0000 */ lw $t3, ($t2) -/* 084210 80083610 3C01800E */ lui $at, %hi(D_800DF7DC) # $at, 0x800e -/* 084214 80083614 3C18800E */ lui $t8, %hi(D_800DF7C4+4) # $t8, 0x800e -/* 084218 80083618 000C6880 */ sll $t5, $t4, 2 -/* 08421C 8008361C 8718F7C8 */ lh $t8, %lo(D_800DF7C4+4)($t8) -/* 084220 80083620 008D7021 */ addu $t6, $a0, $t5 -/* 084224 80083624 AC2BF7DC */ sw $t3, %lo(D_800DF7DC)($at) -/* 084228 80083628 8DCF0000 */ lw $t7, ($t6) -/* 08422C 8008362C 3C01800E */ lui $at, %hi(D_800DF7DC+16) # $at, 0x800e -/* 084230 80083630 0018C880 */ sll $t9, $t8, 2 -/* 084234 80083634 00994021 */ addu $t0, $a0, $t9 -/* 084238 80083638 AC2FF7E4 */ sw $t7, %lo(D_800DF7DC+8)($at) -/* 08423C 8008363C 8D090000 */ lw $t1, ($t0) -/* 084240 80083640 3C03800E */ lui $v1, %hi(D_800DF7DC+24) # $v1, 0x800e -/* 084244 80083644 3C02800E */ lui $v0, %hi(D_800DF7C4+6) # $v0, 0x800e -/* 084248 80083648 3C05800E */ lui $a1, %hi(D_800DF7C4+22) # $a1, 0x800e -/* 08424C 8008364C 24A5F7DA */ addiu $a1, %lo(D_800DF7C4+22) # addiu $a1, $a1, -0x826 -/* 084250 80083650 2442F7CA */ addiu $v0, %lo(D_800DF7C4+6) # addiu $v0, $v0, -0x836 -/* 084254 80083654 2463F7F4 */ addiu $v1, %lo(D_800DF7DC+24) # addiu $v1, $v1, -0x80c -/* 084258 80083658 AC29F7EC */ sw $t1, %lo(D_800DF7DC+16)($at) -.L8008365C: -/* 08425C 8008365C 844A0000 */ lh $t2, ($v0) -/* 084260 80083660 844E0002 */ lh $t6, 2($v0) -/* 084264 80083664 000A5880 */ sll $t3, $t2, 2 -/* 084268 80083668 008B6021 */ addu $t4, $a0, $t3 -/* 08426C 8008366C 8D8D0000 */ lw $t5, ($t4) -/* 084270 80083670 844C0006 */ lh $t4, 6($v0) -/* 084274 80083674 84480004 */ lh $t0, 4($v0) -/* 084278 80083678 000E7880 */ sll $t7, $t6, 2 -/* 08427C 8008367C AC6D0000 */ sw $t5, ($v1) -/* 084280 80083680 008FC021 */ addu $t8, $a0, $t7 -/* 084284 80083684 000C6880 */ sll $t5, $t4, 2 -/* 084288 80083688 00084880 */ sll $t1, $t0, 2 -/* 08428C 8008368C 8F190000 */ lw $t9, ($t8) -/* 084290 80083690 00895021 */ addu $t2, $a0, $t1 -/* 084294 80083694 008D7021 */ addu $t6, $a0, $t5 -/* 084298 80083698 8DCF0000 */ lw $t7, ($t6) -/* 08429C 8008369C 8D4B0000 */ lw $t3, ($t2) -/* 0842A0 800836A0 24420008 */ addiu $v0, $v0, 8 -/* 0842A4 800836A4 24630020 */ addiu $v1, $v1, 0x20 -/* 0842A8 800836A8 AC79FFE8 */ sw $t9, -0x18($v1) -/* 0842AC 800836AC AC6FFFF8 */ sw $t7, -8($v1) -/* 0842B0 800836B0 1445FFEA */ bne $v0, $a1, .L8008365C -/* 0842B4 800836B4 AC6BFFF0 */ sw $t3, -0x10($v1) -/* 0842B8 800836B8 0C0002F8 */ jal func_80000BE0 -/* 0842BC 800836BC 2404001B */ li $a0, 27 -/* 0842C0 800836C0 0C019830 */ jal func_800660C0 -/* 0842C4 800836C4 00000000 */ nop -/* 0842C8 800836C8 0C0310BB */ jal set_text_font -/* 0842CC 800836CC 00002025 */ move $a0, $zero -/* 0842D0 800836D0 0C03105C */ jal func_800C4170 -/* 0842D4 800836D4 24040002 */ li $a0, 2 -/* 0842D8 800836D8 0C000224 */ jal func_80000890 -/* 0842DC 800836DC 00002025 */ move $a0, $zero -/* 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) -/* 0842F0 800836F0 0C0078A7 */ jal get_misc_asset -/* 0842F4 800836F4 24040042 */ li $a0, 66 -/* 0842F8 800836F8 3C048012 */ lui $a0, %hi(D_80126874) # $a0, 0x8012 -/* 0842FC 800836FC 24846874 */ addiu $a0, %lo(D_80126874) # addiu $a0, $a0, 0x6874 -/* 084300 80083700 AC820000 */ sw $v0, ($a0) -/* 084304 80083704 80450001 */ lb $a1, 1($v0) -/* 084308 80083708 3C068012 */ lui $a2, %hi(D_80126868) # $a2, 0x8012 -/* 08430C 8008370C 24C66868 */ addiu $a2, %lo(D_80126868) # addiu $a2, $a2, 0x6868 -/* 084310 80083710 2401FFFE */ li $at, -2 -/* 084314 80083714 00401825 */ move $v1, $v0 -/* 084318 80083718 14A10004 */ bne $a1, $at, .L8008372C -/* 08431C 8008371C A4C00000 */ sh $zero, ($a2) -/* 084320 80083720 24180258 */ li $t8, 600 -/* 084324 80083724 00002825 */ move $a1, $zero -/* 084328 80083728 A4D80000 */ sh $t8, ($a2) -.L8008372C: -/* 08432C 8008372C 80640000 */ lb $a0, ($v1) -/* 084330 80083730 80660002 */ lb $a2, 2($v1) -/* 084334 80083734 0C01B8BA */ jal load_level_for_menu -/* 084338 80083738 00000000 */ nop -/* 08433C 8008373C 44803000 */ mtc1 $zero, $f6 -/* 084340 80083740 3C018012 */ lui $at, %hi(D_801268D8) # $at, 0x8012 -/* 084344 80083744 E42668D8 */ swc1 $f6, %lo(D_801268D8)($at) -/* 084348 80083748 3C018012 */ lui $at, %hi(D_801268E0) # $at, 0x8012 -/* 08434C 8008374C AC2068E0 */ sw $zero, %lo(D_801268E0)($at) -/* 084350 80083750 3C018012 */ lui $at, %hi(D_801268DC) # $at, 0x8012 -/* 084354 80083754 AC2068DC */ sw $zero, %lo(D_801268DC)($at) -/* 084358 80083758 3C01800E */ lui $at, %hi(D_800DF9F4) # $at, 0x800e -/* 08435C 8008375C AC20F9F4 */ sw $zero, %lo(D_800DF9F4)($at) -/* 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(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_track_select_init.s b/asm/non_matchings/menu/menu_track_select_init.s index c5829c0e..67ec1bc1 100644 --- a/asm/non_matchings/menu/menu_track_select_init.s +++ b/asm/non_matchings/menu/menu_track_select_init.s @@ -458,7 +458,7 @@ glabel menu_track_select_init /* 08FA7C 8008EE7C 00000000 */ nop /* 08FA80 8008EE80 A64C0000 */ sh $t4, ($s2) .L8008EE84: -/* 08FA84 8008EE84 0C027B18 */ jal func_8009EC60 +/* 08FA84 8008EE84 0C027B18 */ jal is_adventure_two_unlocked /* 08FA88 8008EE88 00000000 */ nop /* 08FA8C 8008EE8C 10400008 */ beqz $v0, .L8008EEB0 /* 08FA90 8008EE90 00000000 */ nop 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 704cc619..fb3df0c1 100644 --- a/asm/non_matchings/menu/menu_trophy_race_rankings_init.s +++ b/asm/non_matchings/menu/menu_trophy_race_rankings_init.s @@ -53,8 +53,8 @@ glabel menu_trophy_race_rankings_init /* 0996E8 80098AE8 28410004 */ slti $at, $v0, 4 /* 0996EC 80098AEC 1020000D */ beqz $at, .L80098B24 /* 0996F0 80098AF0 3C038012 */ lui $v1, %hi(D_80126BF0) # $v1, 0x8012 -/* 0996F4 80098AF4 3C02800E */ lui $v0, %hi(D_800DF4A0) # $v0, 0x800e -/* 0996F8 80098AF8 8C42F4A0 */ lw $v0, %lo(D_800DF4A0)($v0) +/* 0996F4 80098AF4 3C02800E */ lui $v0, %hi(gMenuText) # $v0, 0x800e +/* 0996F8 80098AF8 8C42F4A0 */ lw $v0, %lo(gMenuText)($v0) /* 0996FC 80098AFC 3C038012 */ lui $v1, %hi(D_80126BF0) # $v1, 0x8012 /* 099700 80098B00 8C4F0188 */ lw $t7, 0x188($v0) /* 099704 80098B04 24636BF0 */ addiu $v1, %lo(D_80126BF0) # addiu $v1, $v1, 0x6bf0 @@ -66,8 +66,8 @@ glabel menu_trophy_race_rankings_init /* 09971C 80098B1C 10000009 */ b .L80098B44 /* 099720 80098B20 AC396C14 */ sw $t9, %lo(D_80126C14)($at) .L80098B24: -/* 099724 80098B24 3C0D800E */ lui $t5, %hi(D_800DF4A0) # $t5, 0x800e -/* 099728 80098B28 8DADF4A0 */ lw $t5, %lo(D_800DF4A0)($t5) +/* 099724 80098B24 3C0D800E */ lui $t5, %hi(gMenuText) # $t5, 0x800e +/* 099728 80098B28 8DADF4A0 */ lw $t5, %lo(gMenuText)($t5) /* 09972C 80098B2C 24636BF0 */ addiu $v1, %lo(D_80126BF0) # addiu $v1, $v1, 0x6bf0 /* 099730 80098B30 8DAE0244 */ lw $t6, 0x244($t5) /* 099734 80098B34 240F0001 */ li $t7, 1 diff --git a/asm/non_matchings/menu/render_file_select_menu.s b/asm/non_matchings/menu/render_file_select_menu.s index 3332690b..94fded8f 100644 --- a/asm/non_matchings/menu/render_file_select_menu.s +++ b/asm/non_matchings/menu/render_file_select_menu.s @@ -217,8 +217,8 @@ glabel render_file_select_menu /* 08DCA0 8008D0A0 240600FF */ li $a2, 255 /* 08DCA4 8008D0A4 0C0310E1 */ jal set_text_color /* 08DCA8 8008D0A8 24070040 */ li $a3, 64 -/* 08DCAC 8008D0AC 3C09800E */ lui $t1, %hi(D_800DF4A0) # $t1, 0x800e -/* 08DCB0 8008D0B0 8D29F4A0 */ lw $t1, %lo(D_800DF4A0)($t1) +/* 08DCAC 8008D0AC 3C09800E */ lui $t1, %hi(gMenuText) # $t1, 0x800e +/* 08DCB0 8008D0B0 8D29F4A0 */ lw $t1, %lo(gMenuText)($t1) /* 08DCB4 8008D0B4 8698000A */ lh $t8, 0xa($s4) /* 08DCB8 8008D0B8 86190002 */ lh $t9, 2($s0) /* 08DCBC 8008D0BC 868E0008 */ lh $t6, 8($s4) @@ -360,9 +360,9 @@ glabel render_file_select_menu /* 08DEB4 8008D2B4 922D0001 */ lbu $t5, 1($s1) /* 08DEB8 8008D2B8 00137080 */ sll $t6, $s3, 2 /* 08DEBC 8008D2BC 15A00005 */ bnez $t5, .L8008D2D4 -/* 08DEC0 8008D2C0 3C04800E */ lui $a0, %hi(D_800E03B0) # $a0, 0x800e +/* 08DEC0 8008D2C0 3C04800E */ lui $a0, %hi(gFilenames) # $a0, 0x800e /* 08DEC4 8008D2C4 008E2021 */ addu $a0, $a0, $t6 -/* 08DEC8 8008D2C8 8C8403B0 */ lw $a0, %lo(D_800E03B0)($a0) +/* 08DEC8 8008D2C8 8C8403B0 */ lw $a0, %lo(gFilenames)($a0) /* 08DECC 8008D2CC 0C025DF4 */ jal trim_filename_string /* 08DED0 8008D2D0 02A02825 */ move $a1, $s5 .L8008D2D4: @@ -397,8 +397,8 @@ glabel render_file_select_menu /* 08DF40 8008D340 00003025 */ move $a2, $zero /* 08DF44 8008D344 0C0310E1 */ jal set_text_color /* 08DF48 8008D348 240700FF */ li $a3, 255 -/* 08DF4C 8008D34C 3C0E800E */ lui $t6, %hi(D_800DF4A0) # $t6, 0x800e -/* 08DF50 8008D350 8DCEF4A0 */ lw $t6, %lo(D_800DF4A0)($t6) +/* 08DF4C 8008D34C 3C0E800E */ lui $t6, %hi(gMenuText) # $t6, 0x800e +/* 08DF50 8008D350 8DCEF4A0 */ lw $t6, %lo(gMenuText)($t6) /* 08DF54 8008D354 240F0004 */ li $t7, 4 /* 08DF58 8008D358 8DC70130 */ lw $a3, 0x130($t6) /* 08DF5C 8008D35C AFAF0010 */ sw $t7, 0x10($sp) @@ -413,8 +413,8 @@ glabel render_file_select_menu /* 08DF80 8008D380 240600FF */ li $a2, 255 /* 08DF84 8008D384 0C0310E1 */ jal set_text_color /* 08DF88 8008D388 00003825 */ move $a3, $zero -/* 08DF8C 8008D38C 3C19800E */ lui $t9, %hi(D_800DF4A0) # $t9, 0x800e -/* 08DF90 8008D390 8F39F4A0 */ lw $t9, %lo(D_800DF4A0)($t9) +/* 08DF8C 8008D38C 3C19800E */ lui $t9, %hi(gMenuText) # $t9, 0x800e +/* 08DF90 8008D390 8F39F4A0 */ lw $t9, %lo(gMenuText)($t9) /* 08DF94 8008D394 24080004 */ li $t0, 4 /* 08DF98 8008D398 8F270130 */ lw $a3, 0x130($t9) /* 08DF9C 8008D39C AFA80010 */ sw $t0, 0x10($sp) @@ -441,8 +441,8 @@ glabel render_file_select_menu /* 08DFF0 8008D3F0 00000000 */ nop /* 08DFF4 8008D3F4 0C0310BB */ jal set_text_font /* 08DFF8 8008D3F8 00002025 */ move $a0, $zero -/* 08DFFC 8008D3FC 3C0B800E */ lui $t3, %hi(D_800DF4A0) # $t3, 0x800e -/* 08E000 8008D400 8D6BF4A0 */ lw $t3, %lo(D_800DF4A0)($t3) +/* 08DFFC 8008D3FC 3C0B800E */ lui $t3, %hi(gMenuText) # $t3, 0x800e +/* 08E000 8008D400 8D6BF4A0 */ lw $t3, %lo(gMenuText)($t3) /* 08E004 8008D404 240C000C */ li $t4, 12 /* 08E008 8008D408 8D670134 */ lw $a3, 0x134($t3) /* 08E00C 8008D40C AFAC0010 */ sw $t4, 0x10($sp) @@ -457,8 +457,8 @@ glabel render_file_select_menu /* 08E02C 8008D42C 02E02025 */ move $a0, $s7 /* 08E030 8008D430 0C0310BB */ jal set_text_font /* 08E034 8008D434 00002025 */ move $a0, $zero -/* 08E038 8008D438 3C0D800E */ lui $t5, %hi(D_800DF4A0) # $t5, 0x800e -/* 08E03C 8008D43C 8DADF4A0 */ lw $t5, %lo(D_800DF4A0)($t5) +/* 08E038 8008D438 3C0D800E */ lui $t5, %hi(gMenuText) # $t5, 0x800e +/* 08E03C 8008D43C 8DADF4A0 */ lw $t5, %lo(gMenuText)($t5) /* 08E040 8008D440 240E000C */ li $t6, 12 /* 08E044 8008D444 8DA70138 */ lw $a3, 0x138($t5) /* 08E048 8008D448 AFAE0010 */ sw $t6, 0x10($sp) @@ -489,8 +489,8 @@ glabel render_file_select_menu /* 08E0A4 8008D4A4 240500A0 */ li $a1, 160 /* 08E0A8 8008D4A8 0C0310BB */ jal set_text_font /* 08E0AC 8008D4AC 00002025 */ move $a0, $zero -/* 08E0B0 8008D4B0 3C08800E */ lui $t0, %hi(D_800DF4A0) # $t0, 0x800e -/* 08E0B4 8008D4B4 8D08F4A0 */ lw $t0, %lo(D_800DF4A0)($t0) +/* 08E0B0 8008D4B0 3C08800E */ lui $t0, %hi(gMenuText) # $t0, 0x800e +/* 08E0B4 8008D4B4 8D08F4A0 */ lw $t0, %lo(gMenuText)($t0) /* 08E0B8 8008D4B8 2409000C */ li $t1, 12 /* 08E0BC 8008D4BC 8D07013C */ lw $a3, 0x13c($t0) /* 08E0C0 8008D4C0 AFA90010 */ sw $t1, 0x10($sp) @@ -525,8 +525,8 @@ glabel render_file_select_menu /* 08E12C 8008D52C 0C0310E1 */ jal set_text_color /* 08E130 8008D530 240600FF */ li $a2, 255 .L8008D534: -/* 08E134 8008D534 3C0E800E */ lui $t6, %hi(D_800DF4A0) # $t6, 0x800e -/* 08E138 8008D538 8DCEF4A0 */ lw $t6, %lo(D_800DF4A0)($t6) +/* 08E134 8008D534 3C0E800E */ lui $t6, %hi(gMenuText) # $t6, 0x800e +/* 08E138 8008D538 8DCEF4A0 */ lw $t6, %lo(gMenuText)($t6) /* 08E13C 8008D53C 240F000C */ li $t7, 12 /* 08E140 8008D540 8DC70140 */ lw $a3, 0x140($t6) /* 08E144 8008D544 AFAF0010 */ sw $t7, 0x10($sp) @@ -556,8 +556,8 @@ glabel render_file_select_menu /* 08E1A0 8008D5A0 0C0310E1 */ jal set_text_color /* 08E1A4 8008D5A4 00003825 */ move $a3, $zero .L8008D5A8: -/* 08E1A8 8008D5A8 3C09800E */ lui $t1, %hi(D_800DF4A0) # $t1, 0x800e -/* 08E1AC 8008D5AC 8D29F4A0 */ lw $t1, %lo(D_800DF4A0)($t1) +/* 08E1A8 8008D5A8 3C09800E */ lui $t1, %hi(gMenuText) # $t1, 0x800e +/* 08E1AC 8008D5AC 8D29F4A0 */ lw $t1, %lo(gMenuText)($t1) /* 08E1B0 8008D5B0 240A000C */ li $t2, 12 /* 08E1B4 8008D5B4 8D270144 */ lw $a3, 0x144($t1) /* 08E1B8 8008D5B8 AFAA0010 */ sw $t2, 0x10($sp) diff --git a/asm/non_matchings/unknown_032760/func_80039330.s b/asm/non_matchings/unknown_032760/func_80039330.s index 9a2ebc73..8139b4b4 100644 --- a/asm/non_matchings/unknown_032760/func_80039330.s +++ b/asm/non_matchings/unknown_032760/func_80039330.s @@ -721,7 +721,7 @@ glabel L80039BB8 /* 03A940 80039D40 818D01D6 */ lb $t5, 0x1d6($t4) /* 03A944 80039D44 2408000F */ li $t0, 15 /* 03A948 80039D48 11A20011 */ beq $t5, $v0, .L80039D90 -/* 03A94C 80039D4C 3C04800E */ lui $a0, %hi(D_800E0198+157) # $a0, 0x800e +/* 03A94C 80039D4C 3C04800E */ lui $a0, %hi(gGameSelectTextElemsNoAdv2+157) # $a0, 0x800e /* 03A950 80039D50 344E0080 */ ori $t6, $v0, 0x80 /* 03A954 80039D54 44804000 */ mtc1 $zero, $f8 /* 03A958 80039D58 A06E0000 */ sb $t6, ($v1) @@ -732,7 +732,7 @@ glabel L80039BB8 /* 03A96C 80039D6C 24050001 */ li $a1, 1 /* 03A970 80039D70 830401D6 */ lb $a0, 0x1d6($t8) /* 03A974 80039D74 00000000 */ nop -/* 03A978 80039D78 24840235 */ addiu $a0, %lo(D_800E0198+157) # addiu $a0, $a0, 0x235 +/* 03A978 80039D78 24840235 */ addiu $a0, %lo(gGameSelectTextElemsNoAdv2+157) # addiu $a0, $a0, 0x235 /* 03A97C 80039D7C 3099FFFF */ andi $t9, $a0, 0xffff /* 03A980 80039D80 0C00EB0F */ jal func_8003AC3C /* 03A984 80039D84 03202025 */ move $a0, $t9 diff --git a/src/fade_transition.h b/src/fade_transition.h index 03cda451..f03ae1f3 100644 --- a/src/fade_transition.h +++ b/src/fade_transition.h @@ -13,6 +13,7 @@ #define FADE_COLOR(red, green, blue) red, green, blue #define FADE_COLOR_BLACK FADE_COLOR(0, 0, 0) +#define FADE_COLOR_WHITE FADE_COLOR(255, 255, 255) #define FADE_TRANSITION(type, color, duration, unk6) { type, color, duration, unk6 } diff --git a/src/menu.c b/src/menu.c index 2b0d2868..2d195cc4 100644 --- a/src/menu.c +++ b/src/menu.c @@ -6,6 +6,7 @@ #include "fade_transition.h" #include +#include "asset_sections.h" #include "types.h" #include "macros.h" #include "structs.h" @@ -21,6 +22,13 @@ // The bss section needs to stay above the data section! // Otherwise the bss variables will get reordered, which is bad. + +typedef struct unk801263C0 { + s8 unk0; + s8 unk1; + s16 unk2; +} unk801263C0; + unk800DFC10 *D_80126390; unk800DFC10 *D_80126394; s32 D_80126398; @@ -30,10 +38,11 @@ s32 D_801263A4; s32 *D_801263A8; s32 *D_801263AC; s32 *D_801263B0; -s8 D_801263B4; -s32 D_801263B8; +unk801263C0 D_801263B4; +unk801263C0 D_801263B8; s32 D_801263BC; -s32 D_801263C0; +unk801263C0 D_801263C0; + s32 gIgnorePlayerInput; s32 D_801263C8; @@ -148,7 +157,7 @@ s32 D_80126820; s32 D_80126824; s8 D_80126828; s32 D_8012682C; -s32 D_80126830; +s16 D_80126830; s32 D_80126834; s16 D_80126838; s16 D_8012683A; @@ -163,12 +172,12 @@ s32 D_80126858; s32 D_8012685C; s32 D_80126860; s32 D_80126864; -s32 D_80126868; +s16 D_80126868; s32 D_8012686C; -s32 D_80126870; -s32 D_80126874; +f32 D_80126870; +s8 *D_80126874; s32 D_80126878[24]; -s32 D_801268D8; +f32 D_801268D8; s32 D_801268DC; s32 D_801268E0; s32 D_801268E4; @@ -182,9 +191,9 @@ s8 gPlayerSelectVehicle[4]; // Unknown number of entries. s32 D_801269C4; s32 D_801269C8; s32 D_801269CC; -s32 D_801269D0[3]; +s32 gAudioOutputStrings[3]; s32 D_801269DC; -u32 *D_801269E0; +u32 *gMusicTestString; s32 D_801269E4; s32 D_801269E8; s32 D_801269EC; @@ -296,9 +305,9 @@ 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 gPlayerHasSeenCautionMenu = 0; -s32 D_800DF49C = 0; // Currently unknown, might be a different type. +s32 *gMenuTextLangTable = NULL; -char **D_800DF4A0 = NULL; +char **gMenuText = NULL; u8 D_800DF4A4 = 0xFF; u8 D_800DF4A8 = 0xFF; @@ -363,21 +372,18 @@ s32 D_800DF768 = 1; FadeTransition D_800DF76C = FADE_TRANSITION(0, FADE_COLOR_BLACK, 10, -1); FadeTransition D_800DF774 = FADE_TRANSITION(0, FADE_COLOR_BLACK, 18, -1); +FadeTransition D_800DF77C = FADE_TRANSITION(0x80, FADE_COLOR_BLACK, 18, 0); -u16 D_800DF77C[12] = { - 0x8000, 0x0000, 0x0012, 0x0000, - 0x00FF, 0xFFFF, 0x0012, 0xFFFF, - 0x80FF, 0xFFFF, 0x0012, 0x0000 -}; +// These two are unused? +FadeTransition D_800DF784 = FADE_TRANSITION(0, FADE_COLOR_WHITE, 18, -1); +FadeTransition D_800DF78C = FADE_TRANSITION(0x80, FADE_COLOR_WHITE, 18, 0); s32 D_800DF794 = 4; s32 D_800DF798 = 0; s32 D_800DF79C = 0; s32 D_800DF7A0 = 0; -s32 D_800DF7A4 = 0; -s32 D_800DF7A8 = 0; // Currently unknown, might be a different type. -s32 D_800DF7AC = 0; // Currently unknown, might be a different type. +char *gTitleMenuStrings[3] = {0, 0, 0}; // Version text shown on the title screen? See 1:15 in https://www.youtube.com/watch?v=OHSCLcA74ao. char gVersionDisplayText[20] = "VERSION XXXXXXXX"; @@ -426,7 +432,7 @@ u16 D_800DF9F8[12] = { 0x00FF, 0xFF33, 0x0000, 0x0F78 }; -char *D_800DFA10[7] = { +char *gOptionMenuStrings[7] = { NULL, NULL, NULL, NULL, NULL, NULL, NULL }; @@ -434,7 +440,7 @@ s16 D_800DFA2C[8] = { 0x3D, 0x3C, 0x3F, 0x3E, 0x44, -1, -1, 0 }; -unk800DFA3C D_800DFA3C[8] = { +unk800DFA3C gAudioMenuStrings[8] = { { 160, 80, 0xFF, 0xFF, 0xFF, 0, 0xFF, 0, 0, 12, NULL }, { 160, 104, 0xFF, 0xFF, 0xFF, 0, 0xFF, 0, 0, 12, NULL }, { 160, 144, 0xFF, 0xFF, 0xFF, 0, 0xFF, 0, 0, 12, NULL }, @@ -545,7 +551,7 @@ s32 gShowControllerPakMenu = FALSE; s32 gActiveMagicCodes = 0; s32 gUnlockedMagicCodes = 0; -s32 D_800DFDA0[5] = { 0, 0, 0, 0, 0 }; +s32 gMagicCodeMenuStrings[5] = { 0, 0, 0, 0, 0 }; u8 D_800DFDB4[10][2] = { { 0x0F, 0x64 }, @@ -614,7 +620,7 @@ s32 D_800DFF40[36] = { s32 D_800DFFD0 = 0; s32 D_800DFFD4 = -1; -MenuElement D_800DFFD8[14] = { +MenuElement gCautionMenuTextElements[14] = { { 161, 35, 161, 35, 161, 35, 0, 0, 0, 255, 128, 2, 12, 0, NULL, 0, 0, 0, 0 }, { 160, 32, 160, 32, 160, 32, 255, 255, 255, 0, 255, 2, 12, 0, NULL, 0, 0, 0, 0 }, { 160, 72, 160, 68, 160, 72, 255, 255, 255, 0, 255, 0, 12, 0, NULL, 0, 0, 0, 0 }, @@ -631,7 +637,7 @@ MenuElement D_800DFFD8[14] = { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, 0, 0, 0, 0 } }; -MenuElement D_800E0198[7] = { +MenuElement gGameSelectTextElemsNoAdv2[7] = { { 161, 35, 161, 35, 161, 35, 0, 0, 0, 255, 128, 2, 12, 0, NULL, 0, 0, 0, 0 }, { 160, 32, 160, 32, 160, 32, 255, 255, 255, 0, 255, 2, 12, 0, NULL, 0, 0, 0, 0 }, { -96, 39, -96, 39, -96, 39, 176, 224, 192, 255, 255, 0, 0, 7, NULL, 192, 44, 4, 4 }, @@ -641,7 +647,7 @@ MenuElement D_800E0198[7] = { { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, 0, 0, 0, 0 } }; -MenuElement D_800E0278[9] = { +MenuElement gGameSelectTextElemsWithAdv2[9] = { { 161, 35, 161, 35, 161, 35, 0, 0, 0, 255, 128, 2, 12, 0, NULL, 0, 0, 0, 0 }, { 160, 32, 160, 32, 160, 32, 255, 255, 255, 0, 255, 2, 12, 0, NULL, 0, 0, 0, 0 }, { -112, 55, -112, 55, -112, 55, 176, 224, 192, 255, 255, 0, 0, 7, NULL, 224, 44, 4, 4 }, @@ -661,7 +667,7 @@ s16 D_800E03A4[6] = { 0x00, 0x0B, 0x0C, 0x0A, -1, 0 }; -char *D_800E03B0[3] = { +char *gFilenames[3] = { NULL, NULL, NULL }; @@ -1540,14 +1546,171 @@ void func_8009C508(s32 arg0); void *allocate_from_main_pool_safe(s32, u32); void func_800C4170(s32 arg0); void play_music(s32 arg0); -void func_800C01D8(s32); +void func_800C01D8(FadeTransition*); void render_textured_rectangle(Gfx **dlist, DrawTexture *arg1, s32 arg2, s32 arg3, u8 red, u8 green, u8 blue, u8 alpha); void func_8007B3D0(Gfx **dlist); void func_8009BD5C(void); void load_level_for_menu(s32, s32, s32); void func_8008CACC(void); +void reset_character_id_slots(void); +void func_80000FDC(s32, s32, f32); -GLOBAL_ASM("asm/non_matchings/menu/func_8007F900.s") +#ifdef NON_MATCHING + +// Should be functionally equivalent? +void load_menu_text(s32 language) { + s32 start, langIndex, i, j; + + if (gMenuTextLangTable == NULL) { + gMenuTextLangTable = load_asset_section_from_rom(ASSET_MENU_TEXT_TABLE); + } + + switch(language) { + case JAPANESE: + langIndex = 4; + break; + case GERMAN: + langIndex = 3; + break; + case FRENCH: + langIndex = 2; + break; + default: // English + langIndex = 1; + break; + } + + start = gMenuTextLangTable[langIndex]; + if (gMenuText != NULL) { + load_asset_to_address(ASSET_MENU_TEXT, gMenuText, start, gMenuTextLangTable[langIndex + 1] - start); + // Fill up the lookup table with proper RAM addresses + for (i = 0; i < gMenuTextLangTable[0]; i++) { + if ((s32)gMenuText[i] == -1) { + gMenuText[i] = NULL; + } else { + gMenuText[i] = &((u8*)gMenuText)[(s32)gMenuText[i]]; + } + } + gAudioOutputStrings[0] = gMenuText[0]; // STEREO + gAudioOutputStrings[1] = gMenuText[1]; // MONO + gAudioOutputStrings[2] = gMenuText[2]; // HEADPHONES + gAudioMenuStrings[1].unkC = gMenuText[3]; // SFX VOLUME + gAudioMenuStrings[2].unkC = gMenuText[4]; // MUSIC VOLUME + gAudioMenuStrings[3].unkC = gMenuText[5]; // RETURN + gAudioMenuStrings[4].unkC = gMenuText[6]; // AUDIO OPTIONS + gAudioMenuStrings[5].unkC = gMenuText[6]; // AUDIO OPTIONS + gMusicTestString = gMenuText[7]; // MUSIC TEST 00 + gMagicCodeMenuStrings[0] = gMenuText[14]; // ENTER CODE + gMagicCodeMenuStrings[1] = gMenuText[15]; // CLEAR ALL CODES + gMagicCodeMenuStrings[2] = gMenuText[16]; // CODE LIST + gMagicCodeMenuStrings[3] = gMenuText[5]; // RETURN + D_800E0BEC[1].asciiText = gMenuText[29]; // LAP TIMES + D_800E0BEC[2].asciiText = gMenuText[30]; // OVERALL TIME + D_800E0CEC[8].asciiText = gMenuText[31]; // RACE ORDER + D_800E0CEC[9].asciiText = gMenuText[31]; // RACE ORDER + D_800E0E4C[0].asciiText = gMenuText[32]; // RECORD TIMES + D_800E0E4C[1].asciiText = gMenuText[32]; // RECORD TIMES + D_800E0E4C[2].asciiText = gMenuText[9]; // BEST TIME + D_800E0E4C[5].asciiText = gMenuText[10]; // BEST LAP + gOptionMenuStrings[0] = gMenuText[34]; // ENGLISH + if (D_80126448 & 0x2000000) { + gOptionMenuStrings[1] = gMenuText[182]; // SUBTITLES ON + } else { + gOptionMenuStrings[1] = gMenuText[183]; // SUBTITLES OFF + } + gOptionMenuStrings[2] = gMenuText[6]; // AUDIO OPTIONS + gOptionMenuStrings[3] = gMenuText[165]; // SAVE OPTIONS + gOptionMenuStrings[4] = gMenuText[17]; // MAGIC CODES + gOptionMenuStrings[5] = gMenuText[5]; // RETURN + gFilenames[0] = gMenuText[72]; // GAME A + gFilenames[1] = gMenuText[73]; // GAME B + gFilenames[2] = gMenuText[74]; // GAME C + D_800DFAE4[0] = gMenuText[90]; // CONTROLLER PAK ~ + D_800DFAE4[1] = gMenuText[91]; // IS NOT PRESENT. + D_800DFAE4[3] = gMenuText[85]; // CANCEL + D_800DFAFC[0] = gMenuText[90]; // CONTROLLER PAK ~ + D_800DFAFC[1] = gMenuText[93]; // CONTAINS CORRUPT DATA. + D_800DFAFC[3] = gMenuText[94]; // ATTEMPT TO REPAIR + D_800DFAFC[4] = gMenuText[85]; // CANCEL + D_800DFB14[0] = gMenuText[90]; // CONTROLLER PAK ~ + D_800DFB14[1] = gMenuText[95]; // IRREPARABLY DAMAGED. + D_800DFB14[3] = gMenuText[96]; // REFORMAT PAK + D_800DFB14[4] = gMenuText[85]; // CANCEL + D_800DFB2C[0] = gMenuText[90]; // CONTROLLER PAK ~ + D_800DFB2C[1] = gMenuText[97]; // FULL. + D_800DFB2C[3] = gMenuText[98]; // CONTINUE + D_800DFB40[0] = gMenuText[90]; // CONTROLLER PAK ~ + D_800DFB40[1] = gMenuText[99]; // DIFFERENT CONTROLLER + D_800DFB40[2] = gMenuText[100]; // PAK IS INSERTED. + D_800DFB40[4] = gMenuText[85]; // CANCEL + D_800DFB5C[0] = gMenuText[90]; // CONTROLLER PAK ~ + D_800DFB5C[1] = gMenuText[102]; // CANNOT STORE ANY + D_800DFB5C[2] = gMenuText[103]; // MORE GHOSTS. + D_800DFB5C[4] = gMenuText[98]; // CONTINUE + D_800DFB74[0] = gMenuText[90]; // CONTROLLER PAK ~ + D_800DFB74[1] = gMenuText[184]; // CORRUPT DATA. + D_800DFB74[3] = gMenuText[23]; // TRY AGAIN + D_800DFB74[4] = gMenuText[85]; // CANCEL + D_800DFB8C[0] = gMenuText[153]; // Rumble Pak Detected + D_800DFB8C[1] = gMenuText[154]; // Insert any Controller Paks + D_800DFB8C[2] = gMenuText[155]; // you wish to use now! + D_800DFB8C[4] = gMenuText[98]; // CONTINUE + D_800DFBA4[0] = gMenuText[156]; // If you wish to use any + D_800DFBA4[1] = gMenuText[157]; // Rumble Paks then please + D_800DFBA4[2] = gMenuText[158]; // insert them now. + D_800DFBA4[4] = gMenuText[98]; // CONTINUE + D_800DFBBC[0] = gMenuText[104]; // SORRY, BUT YOU + D_800DFBBC[1] = gMenuText[105]; // CAN'T LOAD GAMES + D_800DFBBC[2] = gMenuText[106]; // FOR THE SECOND + D_800DFBBC[3] = gMenuText[107]; // ADVENTURE UNTIL + D_800DFBBC[4] = gMenuText[108]; // YOU HAVE COMPLETED + D_800DFBBC[5] = gMenuText[109]; // THE FIRST. + D_800DFBBC[7] = gMenuText[98]; // CONTINUE + gTitleMenuStrings[0] = gMenuText[137]; // START + gTitleMenuStrings[1] = gMenuText[36]; // OPTIONS + gGameSelectTextElemsNoAdv2[0].asciiText = gMenuText[76]; // GAME SELECT + gGameSelectTextElemsNoAdv2[1].asciiText = gMenuText[76]; // GAME SELECT + gGameSelectTextElemsNoAdv2[3].asciiText = gMenuText[142]; // ADVENTURE + gGameSelectTextElemsNoAdv2[5].asciiText = gMenuText[144]; // TRACKS + gGameSelectTextElemsWithAdv2[0].asciiText = gMenuText[76]; // GAME SELECT + gGameSelectTextElemsWithAdv2[1].asciiText = gMenuText[76]; // GAME SELECT + gGameSelectTextElemsWithAdv2[3].asciiText = gMenuText[142]; // ADVENTURE + gGameSelectTextElemsWithAdv2[5].asciiText = gMenuText[143]; // ADVENTURE TWO + gGameSelectTextElemsWithAdv2[7].asciiText = gMenuText[144]; // TRACKS + D_800E09B0[0] = gMenuText[69]; // BAD CONTROLLER PAK + D_800E09C4[0] = gMenuText[68]; // CONTROLLER PAK FULL + D_800E09D8[0] = gMenuText[67]; // NO CONTROLLER PAK + D_800E09EC[4] = 0; + D_800E09EC[5] = 0; + D_800E09EC[0] = gMenuText[184]; // CORRUPT DATA. + for (i = 0; i < 2; i++) { + D_800E09B0[i + 1] = gMenuText[177 + i]; + D_800E09C4[i + 1] = gMenuText[177 + i]; + D_800E09D8[i + 1] = gMenuText[177 + i]; + D_800E09EC[i + 1] = gMenuText[177 + i]; + } + j = 0; + while (D_800E09EC[j] != 0) { + j++; + } + D_800E09EC[j] = gMenuText[185]; // TRY AGAIN! + D_800E0A04[0] = gMenuText[159]; // If you wish to use + D_800E0A04[1] = gMenuText[160]; // the Controller Pak + D_800E0A04[2] = gMenuText[162]; // insert it now! + D_800E0A14[0] = gMenuText[159]; // If you wish to use + D_800E0A14[1] = gMenuText[161]; // the Rumble Pak + D_800E0A14[2] = gMenuText[162]; // insert it now! + gCautionMenuTextElements[0].asciiText = gMenuText[152]; // CAUTION + gCautionMenuTextElements[1].asciiText = gMenuText[152]; // CAUTION + for(i = 2; i < 13; i++) { + // Caution message lines starting from gMenuText[166] + gCautionMenuTextElements[i].asciiText = gMenuText[166 + (i - 2)]; + } + } +} +#else +GLOBAL_ASM("asm/non_matchings/menu/load_menu_text.s") +#endif void func_8007FF88(void) { if (D_800E1DAC[0] != NULL) { @@ -1887,7 +2050,7 @@ void func_800829F8(s32 arg0, s32 arg1) { D_800DF46C += arg1; if (D_800DF46C & 0x10) { - func_8007F900(get_language()); + load_menu_text(get_language()); set_text_font(0); set_text_color(255, 255, 255, 0, 0xFF); set_text_background_color(0, 0, 0, 0); @@ -1895,7 +2058,7 @@ void func_800829F8(s32 arg0, s32 arg1) { if (osTvType == 0) { temp = 0xEA; } - draw_text(arg0, -0x8000, temp, D_800DF4A0[151], 0xC); + draw_text(arg0, -0x8000, temp, gMenuText[151], 0xC); } } @@ -1933,11 +2096,61 @@ void func_80082FAC(void) { if ((D_80126448 & 0x2000000) == 0) { func_800C2AF4(0); } - func_8007F900(get_language()); + load_menu_text(get_language()); } GLOBAL_ASM("asm/non_matchings/menu/func_80083098.s") -GLOBAL_ASM("asm/non_matchings/menu/menu_title_screen_init.s") + +void menu_title_screen_init(void) { + s32 i; + s32 temp; + s8 *tempArr; + + D_800DF488 = 1; + D_801263BC = 0; + gMenuDelay = 0; + reset_character_id_slots(); + gSaveFileIndex = 0; + gTitleScreenCurrentOption = 0; + gNumberOfActivePlayers = 4; + func_8006A434(); + play_music(1); + D_800DF760 = musicGetRelativeVolume(); + if (D_800DF458 != 0) { + D_8012686C = 0; + D_800DF458 = 0; + } else { + D_8012686C = 1; + } + D_80126870 = 0; + D_801263E0 = 0; + func_8009C674(D_800DF7C4); + for(i = 0; i < 11; i++) { + D_800DF7DC[i].texture = D_80126550[D_800DF7C4[i]]; + } + func_80000BE0(0x1B); + func_800660C0(); + set_text_font(0); + func_800C4170(2); + func_80000890(0); + set_time_trial_enabled(FALSE); + D_80126864 = 0; + D_80126874 = get_misc_asset(0x42); + temp = D_80126874[1]; + D_80126868 = 0; + if (temp == -2) { + temp = 0; + D_80126868 = 0x258; + } + load_level_for_menu(D_80126874[0], temp, D_80126874[2]); + D_801268D8 = 0; + D_801268E0 = 0; + D_801268DC = 0; + D_800DF9F4 = 0; + D_801263D8 = 0; + gIsInTracksMode = FALSE; +} + GLOBAL_ASM("asm/non_matchings/menu/func_8008377C.s") GLOBAL_ASM("asm/non_matchings/menu/menu_title_screen_loop.s") @@ -1952,7 +2165,7 @@ void func_80084118(void) { void menu_options_init(void) { D_801263BC = 0; gMenuDelay = 0; - func_800C01D8(D_800DF77C); + func_800C01D8(&D_800DF77C); func_800C4170(2); set_text_font(2); func_80000BE0(0x18); @@ -1968,16 +2181,16 @@ void func_800841B8(s32 arg0) { set_text_font(2); set_text_background_color(0, 0, 0, 0); set_text_color(0, 0, 0, 0xFF, 0x80); - draw_text(&D_801263A0, 0xA1, 0x23, D_800DF4A0[36], 0xC); + draw_text(&D_801263A0, 0xA1, 0x23, gMenuText[36], 0xC); set_text_color(255, 255, 255, 0, 0xFF); - draw_text(&D_801263A0, 0xA0, 0x20, D_800DF4A0[36], 0xC); + draw_text(&D_801263A0, 0xA0, 0x20, gMenuText[36], 0xC); phi_s1 = 0; phi_s2 = 0x4C; set_text_font(0); - while(D_800DFA10[phi_s1] != NULL) { + while(gOptionMenuStrings[phi_s1] != NULL) { if (phi_s1 == D_800DF460) { phi_a3 = D_801263BC * 8; if (D_801263BC >= 0x20) { @@ -1987,7 +2200,7 @@ void func_800841B8(s32 arg0) { phi_a3 = 0; } set_text_color(255, 255, 255, phi_a3, 0xFF); - draw_text(&D_801263A0, -0x8000, phi_s2, D_800DFA10[phi_s1], 0xC); + draw_text(&D_801263A0, -0x8000, phi_s2, gOptionMenuStrings[phi_s1], 0xC); phi_s1++; phi_s2 += 0x1C; @@ -2058,12 +2271,12 @@ s32 menu_options_loop(s32 arg0) { func_80001D04(0xEB, 0); func_8009EABC(0, 0x2000000); func_800C2AF4(0); - D_800DFA10[1] = D_800DF4A0[183]; + gOptionMenuStrings[1] = gMenuText[183]; } else { func_80001D04(0xEB, 0); func_8009EA78(0, 0x2000000); func_800C2AF4(1); - D_800DFA10[1] = D_800DF4A0[182]; + gOptionMenuStrings[1] = gMenuText[182]; } } else { // Move up & down the list @@ -2130,18 +2343,18 @@ void menu_audio_options_init(void) { func_8009C674(D_800DFA2C); func_8009C8A4(&D_800DFA2C[6]); func_8008E4B0(); - func_800C01D8(D_800DF77C); + func_800C01D8(&D_800DF77C); func_8007FFEC(2); 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; + gAudioMenuStrings[6].unkC = gMusicTestString; + gAudioMenuStrings[3].unk2 = 0xD4; func_80000BE0(0x20); D_801263E0 = 5; } else { - D_800DFA3C[6].unkC = NULL; - D_800DFA3C[3].unk2 = 0xC0; + gAudioMenuStrings[6].unkC = NULL; + gAudioMenuStrings[3].unk2 = 0xC0; D_801263E0 = 4; } func_800C4170(2); @@ -2349,7 +2562,7 @@ void menu_save_options_init(void) { D_800DFC60.unk0 = D_80126550[70]; func_8008E4B0(); func_8006EBA8(); - func_800C01D8(D_800DF77C); + func_800C01D8(&D_800DF77C); } GLOBAL_ASM("asm/non_matchings/menu/func_800853D0.s") @@ -2522,7 +2735,7 @@ GLOBAL_ASM("asm/non_matchings/menu/func_8008832C.s") void menu_boot_init(void) { s32 i; - func_800C01D8(D_800DF77C); + func_800C01D8(&D_800DF77C); func_80077B34(0, 0, 0); func_8009C674(&D_800DF7C4); @@ -2631,7 +2844,7 @@ void func_800887E8(void) { D_801263E0 = 0; D_801263BC = 0; D_80126A68 = -1; - func_8007F900(get_language()); + load_menu_text(get_language()); if (func_80087F14(&D_80126A68, 0) == 0) { gMenuDelay = 0; } else if (func_8008832C() == 0) { @@ -2673,7 +2886,7 @@ void menu_magic_codes_init(void) { gMenuDelay = 0; D_801263D8 = 0; D_801263E0 = 0; - func_800C01D8(D_800DF77C); + func_800C01D8(&D_800DF77C); func_800C4EDC(7, 0x32, 0x32, 0x10E, 0x84); func_800C4FBC(7, 0, 0, 0, 0x80); func_800C5494(7); @@ -2695,7 +2908,7 @@ void menu_magic_codes_list_init(void) { func_800C4170(2); func_8009C6D4(0x3F); func_8008E4B0(); - func_800C01D8(D_800DF77C); + func_800C01D8(&D_800DF77C); if (osTvType == TV_TYPE_PAL) { D_80126C70 = 0xB; } else { @@ -2879,10 +3092,63 @@ void set_active_player_index(s32 controllerIndex) { } } -GLOBAL_ASM("asm/non_matchings/menu/menu_character_select_init.s") +void menu_character_select_init(void) { + s32 breakTheLoop; + s32 i; + u8 *temp; + + breakTheLoop = FALSE; + func_8006A434(); + if (is_drumstick_unlocked()) { + if (is_tt_unlocked()) { + D_801263CC = D_800DFF40; + } else { + D_801263CC = D_800DFE40; + } + } else if (is_tt_unlocked()) { + D_801263CC = D_800DFEC0; + } else { + D_801263CC = D_800DFDD0; + } + for (i = 0; i < 4; i++) { + D_801263DC[i] = 0; + } + gNumberOfReadyPlayers = 0; + gMenuDelay = 0; + D_801263BC = 0; + D_800DF484 = 0; + for(i = 0; (i < 4) && (!breakTheLoop); i++) { + if (gActivePlayersArray[i] != 0) { + breakTheLoop = TRUE; + D_801263C0.unk0 = (*D_801263CC)[gPlayersCharacterArray[i]].unkC; + D_801263C0.unk2 = 0x7F; + D_801263C0.unk1 = 1; + } + } + D_801263B4.unk0 = -1; + D_801263B4.unk2 = 0; + D_801263B4.unk1 = 0; + D_801263B8.unk0 = -1; + D_801263B8.unk2 = 0; + D_801263B8.unk1 = 0; + play_music(0x1A); + for(i = 0; i < 10; i++) { + temp = D_800DFDB4[i]; + if (i != D_801263C0.unk0) { + func_80001114(temp[0]); + func_80001114(temp[1]); + } + } + func_80001114(6); + func_80000B18(); + func_8009C674(D_800DFDC8); + func_8009C8A4(D_800DFDCC); + func_800C01D8(&D_800DF77C); + func_800C4170(2); +} /** - * Draws the "Object Select" and "OK?" text in the character select menu. + * Draws the "Player Select" and "OK?" text in the character select menu. */ void draw_character_select_text(s32 arg0) { s32 yPos; @@ -2890,11 +3156,11 @@ void draw_character_select_text(s32 arg0) { 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 "Object Select" text drop shadow - draw_text(&D_801263A0, 0xA1, 0x23, D_800DF4A0[135], 0xC); + // Draw "Player Select" text drop shadow + draw_text(&D_801263A0, 0xA1, 0x23, gMenuText[135], 0xC); set_text_color(255, 255, 255, 0, 0xFF); - // Draw "Object Select" text - draw_text(&D_801263A0, 0xA0, 0x20, D_800DF4A0[135], 0xC); + // Draw "Player Select" text + draw_text(&D_801263A0, 0xA0, 0x20, gMenuText[135], 0xC); if (gNumberOfReadyPlayers == gNumberOfActivePlayers && gNumberOfActivePlayers > 0) { yPos = 0xD0; if (osTvType == 0) { @@ -3044,7 +3310,7 @@ void menu_caution_init(void) { gIgnorePlayerInput = 0x3C; gMenuDelay = 0; func_800C4170(2); - func_800C01D8(D_800DF77C); + func_800C01D8(&D_800DF77C); gPlayerHasSeenCautionMenu = 1; } @@ -3061,7 +3327,7 @@ s32 menu_caution_loop(s32 arg0) { func_800C01D8(&D_800DF774); } if (gMenuDelay < 0x14) { - draw_menu_element(1, D_800DFFD8, 1.0f); + draw_menu_element(1, gCautionMenuTextElements, 1.0f); } if (gMenuDelay >= 0x1F) { func_8008C4E8(); @@ -3080,18 +3346,17 @@ void func_8008C4E8(void) { #ifdef NON_MATCHING typedef struct unk80126460 { - MenuElement unk0; - MenuElement unk20; + MenuElement elem[2]; } unk80126460; void menu_game_select_init(void) { - s32 i, j, index; + s32 i; gMenuDelay = 0; D_801263BC = 0; D_800DF460 = 0; D_801263E0 = 2; - func_800C01D8(D_800DF77C); + func_800C01D8(&D_800DF77C); func_8006EBA8(); func_8001B790(); D_801263D8 = 1; @@ -3101,7 +3366,7 @@ void menu_game_select_init(void) { play_music(0x1A); for(i = 0; i < 10; i++) { - if (i != D_801263B4) { + if (i != D_801263B4.unk0) { func_80001114(D_800DFDB4[i][0]); func_80001114(D_800DFDB4[i][1]); } @@ -3109,17 +3374,18 @@ void menu_game_select_init(void) { func_80001114(6); func_80000B18(); - if (func_8009EC60()) { - D_80126460 = D_800E0278; + if (is_adventure_two_unlocked()) { + D_80126460 = gGameSelectTextElemsWithAdv2; D_801263E0 = 2; } else { - D_80126460 = D_800E0198; + D_80126460 = gGameSelectTextElemsNoAdv2; D_801263E0 = 1; } // This loop doesn't match. for(i = 0; i <= D_801263E0; i++) { - ((unk80126460*)D_80126460 + i + 1)->unk0.texture = D_80126550[67]; + u8 temp = i; // How do I make this a `mov`? + (&((unk80126460*)D_80126460)[temp] + 1)->elem[0].texture = D_80126550[67]; } } #else @@ -3294,11 +3560,11 @@ void menu_file_select_init(void) { D_80126484 = 0; D_80126488 = 0; D_80126CC0 = 0; - func_800C01D8(D_800DF77C); + func_800C01D8(&D_800DF77C); func_800C4170(2); play_music(0x1A); for(i = 0; i < 10; i++) { - if (i != D_801263B4) { + if (i != D_801263B4.unk0) { func_80001114(D_800DFDB4[i][0]); func_80001114(D_800DFDB4[i][1]); } @@ -3383,7 +3649,7 @@ void render_file_select_menu(s32 arg0) { func_8007BF1C(1); } else { set_text_color(255, 255, 255, 64, 255); - draw_text(&D_801263A0, D_800E03FC[4] + D_800E03CC[i].unk0, D_800E03FC[5] + D_800E03CC[i].unk2 + y, D_800DF4A0[75], 0xC); + draw_text(&D_801263A0, D_800E03FC[4] + D_800E03CC[i].unk0, D_800E03FC[5] + D_800E03CC[i].unk2 + y, gMenuText[75], 0xC); } } } @@ -3416,7 +3682,7 @@ void render_file_select_menu(s32 arg0) { if (D_80126CC0 == 0 || i != gSaveFileIndex) { trim_filename_string(D_801264A0[i].name, tempName); if (D_801264A0[i].unk1 == 0) { - trim_filename_string(D_800E03B0[i], tempName); + trim_filename_string(gFilenames[i], tempName); } if (tempName != NULL) { draw_text(&D_801263A0, D_800E03FC[0] + D_800E03CC[i].unk0, D_800E03FC[1] + D_800E03CC[i].unk2 + y, tempName, 0xC); @@ -3425,18 +3691,18 @@ void render_file_select_menu(s32 arg0) { } set_text_font(2); set_text_color(0, 0, 0, 255, 128); - draw_text(&D_801263A0, 0xA1, 0x13, D_800DF4A0[76], 4); + draw_text(&D_801263A0, 0xA1, 0x13, gMenuText[76], 4); set_text_color(255, 255, 255, 0, 255); - draw_text(&D_801263A0, 0xA0, 0x10, D_800DF4A0[76], 4); + draw_text(&D_801263A0, 0xA0, 0x10, gMenuText[76], 4); set_text_color(255, 255, 255, 0, 255); y += 0xBB; if (D_80126484 != 0) { if (D_80126494 == 0) { set_text_font(0); - draw_text(&D_801263A0, 0xA0, y, D_800DF4A0[77], 0xC); + draw_text(&D_801263A0, 0xA0, y, gMenuText[77], 0xC); } else if (D_80126494 == 1) { set_text_font(0); - draw_text(&D_801263A0, 0xA0, y, D_800DF4A0[78], 0xC); + draw_text(&D_801263A0, 0xA0, y, gMenuText[78], 0xC); } else { draw_text(&D_801263A0, 0xA0, y, &D_800E8234, 0xC); } @@ -3445,7 +3711,7 @@ void render_file_select_menu(s32 arg0) { if (D_80126488 != 0) { if (D_80126494 == 0) { set_text_font(0); - draw_text(&D_801263A0, 0xA0, y, D_800DF4A0[79], 0xC); + draw_text(&D_801263A0, 0xA0, y, gMenuText[79], 0xC); } else { draw_text(&D_801263A0, 0xA0, y, &D_800E8238, 0xC); } @@ -3455,13 +3721,13 @@ void render_file_select_menu(s32 arg0) { if (D_801263E0 == 1) { set_text_color(255, 255, 255, phi_v0_2, 255); } - draw_text(&D_801263A0, 0x5A, y, D_800DF4A0[80], 0xC); + draw_text(&D_801263A0, 0x5A, y, gMenuText[80], 0xC); if (D_801263E0 == 2) { set_text_color(255, 255, 255, phi_v0_2, 255); } else { set_text_color(255, 255, 255, 0, 255); } - draw_text(&D_801263A0, 0xE6, y, D_800DF4A0[81], 0xC); + draw_text(&D_801263A0, 0xE6, y, gMenuText[81], 0xC); return; } } @@ -3754,78 +4020,180 @@ s32 func_80092BE0(s32 arg0) { return temp; } -#if 1 -GLOBAL_ASM("asm/non_matchings/menu/menu_5_init.s") -#else - -extern s16 D_800E0758[8]; // Unknown number of entries. - void menu_5_init(void) { - s32 temp_v0_2; - s8 temp_s0; Settings *settings; - + s32 result; + s32 s0; + s32 temp; + settings = get_settings(); gTrackIdForPreview = 0; D_801263BC = 0; gMenuDelay = 0; - temp_s0 = settings->unk4C->unk2; - gPlayerSelectVehicle = func_8006B0AC(temp_s0); - temp_v0_2 = func_8006B14C(temp_s0); - if (temp_v0_2 != 5) { - if (temp_v0_2 != 8) { - if ((temp_v0_2 & 0x40) == 0) { - if ((*(settings->courseFlagsPtr + (temp_s0 * 4)) & 2) == 0) { -block_4: - if (D_800E0758[temp_s0] != -1) { - func_80000FDC(D_800E0758[temp_s0] & 0xFFFF, 0, 0x3F800000); - } - D_801263E0 = -1; - } else { -block_7: - if (D_800E0758[temp_s0] != -1) { - func_80000FDC(D_800E0758[temp_s0] & 0xFFFF, 0, 0x3F000000); - } - func_80000BE0(0x18); - play_music(0x18); - func_80000B18(); - D_801263E0 = 0; - func_8009C674(&D_800E0FB4); - func_8009C8A4(&D_800E0FD8); - func_8008E45C(); - D_800E04D4 = (s32) D_80126550.unk7C; - D_800E04E4 = (s32) D_80126550.unk78; - D_800E04F4 = (s32) D_80126550.unk84; - D_800E0504 = (s32) D_80126550.unk80; - D_800E0514 = (s32) D_80126550.unk8C; - D_800E0524 = (s32) D_80126550.unk88; - D_800E05B4 = (s32) D_80126550.unkC0; - D_800E0614 = (s32) D_80126550.unk178; - func_800C01D8(D_800DF77C); - D_801263BC = 0; - gMenuDelay = 0; - D_800E0980 = 0x1E; - func_800C4170(2); - load_level_for_menu(temp_s0, -1, 1); - } - } else { - goto block_7; - } - } else { - goto block_4; + s0 = settings->unk4C->unk2; + gPlayerSelectVehicle[0] = func_8006B0AC(s0); + result = func_8006B14C(s0); + if ((result == 5) || (result == 8) || (!(result & 0x40) && (!(settings->courseFlagsPtr[s0] & 2)))) { + temp = D_800E0758[s0]; + if (temp != -1) { + func_80000FDC(temp & 0xFFFF, 0, 1.0f); } + D_801263E0 = -1; } else { - goto block_4; + temp = D_800E0758[s0]; + if (temp != -1) { + func_80000FDC(temp & 0xFFFF, 0, 0.5f); + } + func_80000BE0(0x18); + play_music(0x18); + func_80000B18(); + D_801263E0 = 0; + func_8009C674(&D_800E0FB4); + func_8009C8A4(&D_800E0FD8); + func_8008E45C(); + D_800E04D4.unk0 = D_80126550[31]; + D_800E04E4.unk0 = D_80126550[30]; + D_800E04F4.unk0 = D_80126550[33]; + D_800E0504.unk0 = D_80126550[32]; + D_800E0514.unk0 = D_80126550[35]; + D_800E0524.unk0 = D_80126550[34]; + D_800E05B4.unk0 = D_80126550[48]; + D_800E0614.unk0 = D_80126550[94]; + func_800C01D8(&D_800DF77C); + D_801263BC = 0; + gMenuDelay = 0; + D_800E0980 = 0x1E; + func_800C4170(2); + load_level_for_menu(s0, -1, 1); } func_800C5494(7); - if (func_8006B14C(temp_s0) & 0x40) { - func_800C31EC(func_8006B190(temp_s0) + 0x3B); + if (func_8006B14C(s0) & 0x40) { + func_800C31EC(func_8006B190(s0) + 0x3B); } } -#endif GLOBAL_ASM("asm/non_matchings/menu/func_80092E94.s") + + +#ifdef NON_MATCHING + +void func_80093A0C(void); + +// Regalloc issues +s32 menu_5_loop(s32 arg0) { + s32 temp0; + s32 vehicle2; + s32 sp30; + s32 vehicle; + s32 sp28; + s32 sp24; + s32 sp20; + s32 sp1C; + Settings *settings; + + if (D_801263E0 < 0) { + return gTrackIdForPreview | 0x80; + } + settings = get_settings(); + sp24 = ((Settings4C*)((u8*)settings->unk4C + gTrackIdForPreview))->unk2; + sp28 = FALSE; + temp0 = settings->courseFlagsPtr[sp24]; + sp1C = 0; + if (temp0 & 2) { + sp1C = 1; + } + if (temp0 & 4) { + sp1C = 2; + } + if (func_8006B14C(sp24) & 0x40) { + sp28 = TRUE; + } + sp20 = FALSE; + if (!is_time_trial_enabled()) { + if (sp1C == 1) { + if (settings->worldId == 5 || (settings->bosses & (1 << settings->worldId))) { + sp20 = TRUE; + } + } + } + D_801263BC = (D_801263BC + arg0) & 0x3F; + func_80092E94(arg0, sp1C, sp20); + if (sp1C < 2) { + gPlayerSelectVehicle[0] = func_8006B0AC(sp24); + } + vehicle = gPlayerSelectVehicle[0]; + sp30 = func_8006B0F8(sp24); + vehicle2 = vehicle; + func_8008E4EC(); + if (gMenuDelay == 0) { + if ((D_801263E0 != 0) || sp20 || sp28) { + if (D_801267D8[0] & 0x9000) { + if (sp28) { + func_800C31EC(0x2710); + } + gMenuDelay = 1; + func_800C01D8(&D_800DF774); + func_80001D04(0xEF, NULL); + } else if (D_801267D8[0] & 0x4000) { + func_80001D04(0x241, NULL); + if (sp20 || sp28) { + if (sp28) { + func_800C31EC(0x2710); + } + func_800C01D8(&D_800DF774); + gMenuDelay = -1; + } else { + D_801263E0 = 0; + } + } + } else { + if (D_801267D8[0] & 0x4000) { + func_80001D04(0x241, NULL); + func_800C01D8(&D_800DF774); + gMenuDelay = -1; + } else if (D_801267D8[0] & 0x9000) { + D_801263E0 = 1; + func_80001D04(0x131, NULL); + } else if (sp1C >= 2) { + if (D_80126830 > 0) { + do { + vehicle--; + } while(!((1 << vehicle) & sp30) && (vehicle >= 0)); + } + if (D_80126830 < 0) { + do { + vehicle++; + } while(!((1 << vehicle) & sp30) && (vehicle < 3)); + } + if ((vehicle < 0) || (vehicle >= 3)) { + vehicle = vehicle2; + } + if (vehicle != vehicle2) { + func_80001D04(0xEB, NULL); + gPlayerSelectVehicle[0] = vehicle; + } + } + } + } else { + if (gMenuDelay < 0) { + gMenuDelay = gMenuDelay - arg0; + } else { + gMenuDelay = gMenuDelay + arg0; + } + if ((gMenuDelay >= 0x1F) || (gMenuDelay < -0x1E)) { + func_80093A0C(); + if (gMenuDelay > 0) { + return gTrackIdForPreview | 0x80; + } + return 0x103; + } + } + gIgnorePlayerInput = 0; + return 0; +} +#else GLOBAL_ASM("asm/non_matchings/menu/menu_5_loop.s") +#endif void func_80093A0C(void) { func_8009C4A8((s16*)&D_800E0FB4); @@ -3925,9 +4293,9 @@ void menu_11_init(void) { s8 temp_a2; settings = get_settings(); - D_80126BF0[0] = (s32) D_800DF4A0[24]; - D_80126BF0[1] = (s32) D_800DF4A0[23]; - D_80126BF0[2] = (s32) D_800DF4A0[28]; + D_80126BF0[0] = (s32) gMenuText[24]; + D_80126BF0[1] = (s32) gMenuText[23]; + D_80126BF0[2] = (s32) gMenuText[28]; D_80126C14 = 3; @@ -3950,7 +4318,7 @@ void menu_11_init(void) { func_8009C8A4(D_800E0A40); func_80094604(); func_800C4170(2); - func_800C01D8(D_800DF77C); + func_800C01D8(&D_800DF77C); func_80000BE0(0x18); play_music(0x18); func_80000C98(0x80); @@ -4150,11 +4518,11 @@ void func_800983C0(s32 arg0) { set_text_font(2); set_text_color(0, 0, 0, 0xFF, 0x80); draw_text(&D_801263A0, 0xA1, 0x23, sp28, 0xC); - draw_text(&D_801263A0, 0xA1, 0x43, D_800DF4A0[70], 0xC); + draw_text(&D_801263A0, 0xA1, 0x43, gMenuText[70], 0xC); set_text_color(255, 255, 255, 0, 0xFF); draw_text(&D_801263A0, 0xA0, 0x20, sp28, 0xC); - draw_text(&D_801263A0, 0xA0, 0x40, D_800DF4A0[70], 0xC); - draw_text(&D_801263A0, 0xA0, sp2C + 0xB0, D_800DF4A0[138 + D_800E0FEC], 0xC); + draw_text(&D_801263A0, 0xA0, 0x40, gMenuText[70], 0xC); + draw_text(&D_801263A0, 0xA0, sp2C + 0xB0, gMenuText[138 + D_800E0FEC], 0xC); draw_text(&D_801263A0, 0xA0, sp2C + 0xD0, sp24, 0xC); } @@ -4773,11 +5141,11 @@ s32 func_8009D9F4(void) { playerInput = get_buttons_pressed_from_player(0); D_80126504 = 0; D_800DF4DC = 0; - func_800C5168(1, -0x8000, 6, D_800DF4A0[49], 1, 4); - func_800C5168(1, -0x8000, 0x14, D_800DF4A0[50], 1, 4); + func_800C5168(1, -0x8000, 6, gMenuText[49], 1, 4); + func_800C5168(1, -0x8000, 0x14, gMenuText[50], 1, 4); D_8012650E = 0x32; - func_8009D1B8(D_800DF4A0[23], 0x14, 0); - func_8009D1B8(D_800DF4A0[51], 0x14, 1); + func_8009D1B8(gMenuText[23], 0x14, 0); + func_8009D1B8(gMenuText[51], 0x14, 1); func_8009D26C(); if (playerInput & A_BUTTON) { func_80001D04(0xEF, NULL); @@ -4882,11 +5250,11 @@ void set_language(s32 language) { D_80126448 &= ~0xC; D_80126448 |= langFlag; - func_8007F900(); + load_menu_text(language); func_8006ECE0(); } -s32 func_8009EC60(void) { +s32 is_adventure_two_unlocked(void) { return D_80126448 & 1; } diff --git a/src/menu.h b/src/menu.h index a5e6da47..29894923 100644 --- a/src/menu.h +++ b/src/menu.h @@ -96,9 +96,9 @@ extern s32 D_800DF48C; extern s32 D_800DF490; extern s32 gIsInAdventureTwo; extern s32 gPlayerHasSeenCautionMenu; -extern s32 D_800DF49C; +extern s32 *gMenuTextLangTable; -extern char **D_800DF4A0; +extern char **gMenuText; extern u8 D_800DF4A4; extern u8 D_800DF4A8; @@ -154,16 +154,12 @@ extern s32 D_800DF760; extern s32 D_800DF764; extern s32 D_800DF768; -extern u16 D_800DF77C[12]; - extern s32 D_800DF794; extern s32 D_800DF798; extern s32 D_800DF79C; extern s32 D_800DF7A0; -extern s32 D_800DF7A4; -extern s32 D_800DF7A8; -extern s32 D_800DF7AC; +extern char *gTitleMenuStrings[3]; // Version text shown on the title screen? See 1:15 in https://www.youtube.com/watch?v=OHSCLcA74ao. extern char gVersionDisplayText[20]; @@ -194,7 +190,7 @@ extern s32 D_800DF9F4; extern u16 D_800DF9F8[12]; -extern char *D_800DFA10[7]; +extern char *gOptionMenuStrings[7]; extern s16 D_800DFA2C[8]; @@ -212,7 +208,7 @@ typedef struct unk800DFA3C { u32* unkC; } unk800DFA3C; -extern unk800DFA3C D_800DFA3C[8]; +extern unk800DFA3C gAudioMenuStrings[8]; extern s32 D_800DFABC; @@ -275,7 +271,7 @@ extern s32 gShowControllerPakMenu; extern s32 gActiveMagicCodes; extern s32 gUnlockedMagicCodes; -extern s32 D_800DFDA0[5]; +extern s32 gMagicCodeMenuStrings[5]; extern u8 D_800DFDB4[10][2]; @@ -297,11 +293,11 @@ extern s32 D_800DFF40[36]; extern s32 D_800DFFD0; extern s32 D_800DFFD4; -extern MenuElement D_800DFFD8[14]; +extern MenuElement gCautionMenuTextElements[14]; -extern MenuElement D_800E0198[7]; +extern MenuElement gGameSelectTextElemsNoAdv2[7]; -extern MenuElement D_800E0278[9]; +extern MenuElement gGameSelectTextElemsWithAdv2[9]; extern s16 D_800E0398[6];