diff --git a/asm/non_matchings/menu/DrawMenuText.s b/asm/non_matchings/menu/draw_menu_element.s similarity index 98% rename from asm/non_matchings/menu/DrawMenuText.s rename to asm/non_matchings/menu/draw_menu_element.s index a6dacb4d..c44e8178 100644 --- a/asm/non_matchings/menu/DrawMenuText.s +++ b/asm/non_matchings/menu/draw_menu_element.s @@ -3,7 +3,7 @@ glabel jpt_800E836C .word L800823E8, L80082454, L800824B8, L80082524, L8008256C, L80082608, L80082760, L800827C0 .text -glabel DrawMenuText +glabel draw_menu_element /* 082DEC 800821EC 27BDFF90 */ addiu $sp, $sp, -0x70 /* 082DF0 800821F0 E7B4003C */ swc1 $f20, 0x3c($sp) /* 082DF4 800821F4 4486A000 */ mtc1 $a2, $f20 @@ -141,17 +141,17 @@ glabel L800823E8 /* 082FEC 800823EC 8605001A */ lh $a1, 0x1a($s0) /* 082FF0 800823F0 8606001C */ lh $a2, 0x1c($s0) /* 082FF4 800823F4 8607001E */ lh $a3, 0x1e($s0) -/* 082FF8 800823F8 0C0310F3 */ jal func_800C43CC +/* 082FF8 800823F8 0C0310F3 */ jal set_text_background_color /* 082FFC 800823FC 00000000 */ nop /* 083000 80082400 920D0010 */ lbu $t5, 0x10($s0) /* 083004 80082404 9204000C */ lbu $a0, 0xc($s0) /* 083008 80082408 9205000D */ lbu $a1, 0xd($s0) /* 08300C 8008240C 9206000E */ lbu $a2, 0xe($s0) /* 083010 80082410 9207000F */ lbu $a3, 0xf($s0) -/* 083014 80082414 0C0310E1 */ jal func_800C4384 +/* 083014 80082414 0C0310E1 */ jal set_text_color /* 083018 80082418 AFAD0010 */ sw $t5, 0x10($sp) /* 08301C 8008241C 92040011 */ lbu $a0, 0x11($s0) -/* 083020 80082420 0C0310BB */ jal func_800C42EC +/* 083020 80082420 0C0310BB */ jal set_text_font /* 083024 80082424 00000000 */ nop /* 083028 80082428 8FCE0000 */ lw $t6, ($fp) /* 08302C 8008242C 920F0012 */ lbu $t7, 0x12($s0) @@ -159,7 +159,7 @@ glabel L800823E8 /* 083034 80082434 02C02025 */ move $a0, $s6 /* 083038 80082438 02402825 */ move $a1, $s2 /* 08303C 8008243C 026E3021 */ addu $a2, $s3, $t6 -/* 083040 80082440 0C031110 */ jal func_800C4440 +/* 083040 80082440 0C031110 */ jal draw_text /* 083044 80082444 AFAF0010 */ sw $t7, 0x10($sp) /* 083048 80082448 8FA40070 */ lw $a0, 0x70($sp) /* 08304C 8008244C 100000F7 */ b .L8008282C diff --git a/asm/non_matchings/menu/func_80081F4C.s b/asm/non_matchings/menu/func_80081F4C.s index d0ab7e35..c37ee0f6 100644 --- a/asm/non_matchings/menu/func_80081F4C.s +++ b/asm/non_matchings/menu/func_80081F4C.s @@ -169,7 +169,7 @@ glabel func_80081F4C /* 082DA0 800821A0 3C05800E */ lui $a1, %hi(D_800DF798) # $a1, 0x800e /* 082DA4 800821A4 8CA5F798 */ lw $a1, %lo(D_800DF798)($a1) /* 082DA8 800821A8 4406A000 */ mfc1 $a2, $f20 -/* 082DAC 800821AC 0C02087B */ jal DrawMenuText +/* 082DAC 800821AC 0C02087B */ jal draw_menu_element /* 082DB0 800821B0 00E02025 */ move $a0, $a3 /* 082DB4 800821B4 AFA00040 */ sw $zero, 0x40($sp) .L800821B8: diff --git a/asm/non_matchings/menu/func_80083098.s b/asm/non_matchings/menu/func_80083098.s index 880ebdde..e9f7b04b 100644 --- a/asm/non_matchings/menu/func_80083098.s +++ b/asm/non_matchings/menu/func_80083098.s @@ -29,12 +29,12 @@ glabel func_80083098 /* 083D04 80083104 000E7080 */ sll $t6, $t6, 2 /* 083D08 80083108 01CF9821 */ addu $s3, $t6, $t7 /* 083D0C 8008310C E4660000 */ swc1 $f6, ($v1) -/* 083D10 80083110 0C0310BB */ jal func_800C42EC +/* 083D10 80083110 0C0310BB */ jal set_text_font /* 083D14 80083114 24040002 */ li $a0, 2 /* 083D18 80083118 00002025 */ move $a0, $zero /* 083D1C 8008311C 00002825 */ move $a1, $zero /* 083D20 80083120 00003025 */ move $a2, $zero -/* 083D24 80083124 0C0310F3 */ jal func_800C43CC +/* 083D24 80083124 0C0310F3 */ jal set_text_background_color /* 083D28 80083128 00003825 */ move $a3, $zero /* 083D2C 8008312C 3C12800E */ lui $s2, %hi(D_800DF9F4) # $s2, 0x800e /* 083D30 80083130 2652F9F4 */ addiu $s2, %lo(D_800DF9F4) # addiu $s2, $s2, -0x60c @@ -59,14 +59,14 @@ glabel func_80083098 /* 083D78 80083178 90450001 */ lbu $a1, 1($v0) /* 083D7C 8008317C 90460002 */ lbu $a2, 2($v0) /* 083D80 80083180 90470003 */ lbu $a3, 3($v0) -/* 083D84 80083184 0C0310E1 */ jal func_800C4384 +/* 083D84 80083184 0C0310E1 */ jal set_text_color /* 083D88 80083188 AFB90010 */ sw $t9, 0x10($sp) /* 083D8C 8008318C 86050004 */ lh $a1, 4($s0) /* 083D90 80083190 86060006 */ lh $a2, 6($s0) /* 083D94 80083194 8E070000 */ lw $a3, ($s0) /* 083D98 80083198 2409000C */ li $t1, 12 /* 083D9C 8008319C AFA90010 */ sw $t1, 0x10($sp) -/* 083DA0 800831A0 0C031110 */ jal func_800C4440 +/* 083DA0 800831A0 0C031110 */ jal draw_text /* 083DA4 800831A4 02C02025 */ move $a0, $s6 /* 083DA8 800831A8 8E0A0008 */ lw $t2, 8($s0) /* 083DAC 800831AC 00000000 */ nop @@ -288,14 +288,14 @@ glabel func_80083098 .L800834E8: /* 0840E8 800834E8 240D00FF */ li $t5, 255 /* 0840EC 800834EC AFAD0010 */ sw $t5, 0x10($sp) -/* 0840F0 800834F0 0C0310E1 */ jal func_800C4384 +/* 0840F0 800834F0 0C0310E1 */ jal set_text_color /* 0840F4 800834F4 240400FF */ li $a0, 255 /* 0840F8 800834F8 8FA50068 */ lw $a1, 0x68($sp) /* 0840FC 800834FC 8FA60064 */ lw $a2, 0x64($sp) /* 084100 80083500 8FA70058 */ lw $a3, 0x58($sp) /* 084104 80083504 240E000C */ li $t6, 12 /* 084108 80083508 AFAE0010 */ sw $t6, 0x10($sp) -/* 08410C 8008350C 0C031110 */ jal func_800C4440 +/* 08410C 8008350C 0C031110 */ jal draw_text /* 084110 80083510 02C02025 */ move $a0, $s6 .L80083514: /* 084114 80083514 8FBF003C */ lw $ra, 0x3c($sp) diff --git a/asm/non_matchings/menu/func_8008377C.s b/asm/non_matchings/menu/func_8008377C.s index e9d28308..e82c97f2 100644 --- a/asm/non_matchings/menu/func_8008377C.s +++ b/asm/non_matchings/menu/func_8008377C.s @@ -81,12 +81,12 @@ glabel func_8008377C /* 0844B0 800838B0 10000001 */ b .L800838B8 /* 0844B4 800838B4 241200DA */ li $s2, 218 .L800838B8: -/* 0844B8 800838B8 0C0310BB */ jal func_800C42EC +/* 0844B8 800838B8 0C0310BB */ jal set_text_font /* 0844BC 800838BC 00002025 */ move $a0, $zero /* 0844C0 800838C0 00002025 */ move $a0, $zero /* 0844C4 800838C4 00002825 */ move $a1, $zero /* 0844C8 800838C8 00003025 */ move $a2, $zero -/* 0844CC 800838CC 0C0310F3 */ jal func_800C43CC +/* 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) @@ -119,14 +119,14 @@ glabel func_8008377C .L8008393C: /* 08453C 8008393C 8EEA0000 */ lw $t2, ($s7) /* 084540 80083940 240600FF */ li $a2, 255 -/* 084544 80083944 0C0310E1 */ jal func_800C4384 +/* 084544 80083944 0C0310E1 */ jal set_text_color /* 084548 80083948 AFAA0010 */ sw $t2, 0x10($sp) /* 08454C 8008394C 8E070000 */ lw $a3, ($s0) /* 084550 80083950 240B000C */ li $t3, 12 /* 084554 80083954 AFAB0010 */ sw $t3, 0x10($sp) /* 084558 80083958 02C02025 */ move $a0, $s6 /* 08455C 8008395C 24058000 */ li $a1, -32768 -/* 084560 80083960 0C031110 */ jal func_800C4440 +/* 084560 80083960 0C031110 */ jal draw_text /* 084564 80083964 02403025 */ move $a2, $s2 /* 084568 80083968 8E0C0004 */ lw $t4, 4($s0) /* 08456C 8008396C 26520010 */ addiu $s2, $s2, 0x10 diff --git a/asm/non_matchings/menu/func_80084854.s b/asm/non_matchings/menu/func_80084854.s index 6fa2ee02..98262e89 100644 --- a/asm/non_matchings/menu/func_80084854.s +++ b/asm/non_matchings/menu/func_80084854.s @@ -197,7 +197,7 @@ glabel func_80084854 /* 085744 80084B44 00002025 */ move $a0, $zero /* 085748 80084B48 00002825 */ move $a1, $zero /* 08574C 80084B4C 00003025 */ move $a2, $zero -/* 085750 80084B50 0C0310F3 */ jal func_800C43CC +/* 085750 80084B50 0C0310F3 */ jal set_text_background_color /* 085754 80084B54 00003825 */ move $a3, $zero /* 085758 80084B58 3C0C8012 */ lui $t4, %hi(D_801263E0) # $t4, 0x8012 /* 08575C 80084B5C 8D8C63E0 */ lw $t4, %lo(D_801263E0)($t4) @@ -236,7 +236,7 @@ glabel func_80084854 /* 0857D4 80084BD4 01CF8021 */ addu $s0, $t6, $t7 .L80084BD8: /* 0857D8 80084BD8 92040009 */ lbu $a0, 9($s0) -/* 0857DC 80084BDC 0C0310BB */ jal func_800C42EC +/* 0857DC 80084BDC 0C0310BB */ jal set_text_font /* 0857E0 80084BE0 00000000 */ nop /* 0857E4 80084BE4 8FA80040 */ lw $t0, 0x40($sp) /* 0857E8 80084BE8 240400FF */ li $a0, 255 @@ -245,7 +245,7 @@ glabel func_80084854 /* 0857F4 80084BF4 240900FF */ li $t1, 255 /* 0857F8 80084BF8 AFA90010 */ sw $t1, 0x10($sp) /* 0857FC 80084BFC 240600FF */ li $a2, 255 -/* 085800 80084C00 0C0310E1 */ jal func_800C4384 +/* 085800 80084C00 0C0310E1 */ jal set_text_color /* 085804 80084C04 02603825 */ move $a3, $s3 /* 085808 80084C08 10000009 */ b .L80084C30 /* 08580C 80084C0C 860A000A */ lh $t2, 0xa($s0) @@ -255,7 +255,7 @@ glabel func_80084854 /* 085818 80084C18 92050005 */ lbu $a1, 5($s0) /* 08581C 80084C1C 92060006 */ lbu $a2, 6($s0) /* 085820 80084C20 92070007 */ lbu $a3, 7($s0) -/* 085824 80084C24 0C0310E1 */ jal func_800C4384 +/* 085824 80084C24 0C0310E1 */ jal set_text_color /* 085828 80084C28 AFAB0010 */ sw $t3, 0x10($sp) /* 08582C 80084C2C 860A000A */ lh $t2, 0xa($s0) .L80084C30: @@ -263,7 +263,7 @@ glabel func_80084854 /* 085834 80084C34 86060002 */ lh $a2, 2($s0) /* 085838 80084C38 8E07000C */ lw $a3, 0xc($s0) /* 08583C 80084C3C 02402025 */ move $a0, $s2 -/* 085840 80084C40 0C031110 */ jal func_800C4440 +/* 085840 80084C40 0C031110 */ jal draw_text /* 085844 80084C44 AFAA0010 */ sw $t2, 0x10($sp) /* 085848 80084C48 8E0C001C */ lw $t4, 0x1c($s0) /* 08584C 80084C4C 26100010 */ addiu $s0, $s0, 0x10 diff --git a/asm/non_matchings/menu/func_800853D0.s b/asm/non_matchings/menu/func_800853D0.s index ec269e2c..d0047b0b 100644 --- a/asm/non_matchings/menu/func_800853D0.s +++ b/asm/non_matchings/menu/func_800853D0.s @@ -43,7 +43,7 @@ glabel L8008541C /* 08605C 8008545C AFA9006C */ sw $t1, 0x6c($sp) /* 086060 80085460 AFA8004C */ sw $t0, 0x4c($sp) /* 086064 80085464 27A50050 */ addiu $a1, $sp, 0x50 -/* 086068 80085468 0C025DBE */ jal func_800976F8 +/* 086068 80085468 0C025DBE */ jal decompress_filename_string /* 08606C 8008546C 24060003 */ li $a2, 3 /* 086070 80085470 27A40050 */ addiu $a0, $sp, 0x50 /* 086074 80085474 0C025DF4 */ jal func_800977D0 @@ -131,7 +131,7 @@ glabel L80085574 /* 0861A4 800855A4 86040004 */ lh $a0, 4($s0) /* 0861A8 800855A8 24060003 */ li $a2, 3 /* 0861AC 800855AC AFA8004C */ sw $t0, 0x4c($sp) -/* 0861B0 800855B0 0C025DBE */ jal func_800976F8 +/* 0861B0 800855B0 0C025DBE */ jal decompress_filename_string /* 0861B4 800855B4 AFA9006C */ sw $t1, 0x6c($sp) /* 0861B8 800855B8 3C06800E */ lui $a2, %hi(D_800E1E10) # $a2, 0x800e /* 0861BC 800855BC 8CC61E10 */ lw $a2, %lo(D_800E1E10)($a2) @@ -450,14 +450,14 @@ glabel L80085828 /* 086654 80085A54 00000000 */ nop /* 086658 80085A58 11A00026 */ beqz $t5, .L80085AF4 /* 08665C 80085A5C 8FAB0064 */ lw $t3, 0x64($sp) -/* 086660 80085A60 0C0310BB */ jal func_800C42EC +/* 086660 80085A60 0C0310BB */ jal set_text_font /* 086664 80085A64 00002025 */ move $a0, $zero /* 086668 80085A68 240F0080 */ li $t7, 128 /* 08666C 80085A6C AFAF0010 */ sw $t7, 0x10($sp) /* 086670 80085A70 00002025 */ move $a0, $zero /* 086674 80085A74 00002825 */ move $a1, $zero /* 086678 80085A78 00003025 */ move $a2, $zero -/* 08667C 80085A7C 0C0310E1 */ jal func_800C4384 +/* 08667C 80085A7C 0C0310E1 */ jal set_text_color /* 086680 80085A80 240700FF */ li $a3, 255 /* 086684 80085A84 8FA50084 */ lw $a1, 0x84($sp) /* 086688 80085A88 8FA60088 */ lw $a2, 0x88($sp) @@ -467,14 +467,14 @@ glabel L80085828 /* 086698 80085A98 AFB80010 */ sw $t8, 0x10($sp) /* 08669C 80085A9C 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0 /* 0866A0 80085AA0 24A50051 */ addiu $a1, $a1, 0x51 -/* 0866A4 80085AA4 0C031110 */ jal func_800C4440 +/* 0866A4 80085AA4 0C031110 */ jal draw_text /* 0866A8 80085AA8 24C60001 */ addiu $a2, $a2, 1 /* 0866AC 80085AAC 240A00FF */ li $t2, 255 /* 0866B0 80085AB0 AFAA0010 */ sw $t2, 0x10($sp) /* 0866B4 80085AB4 240400FF */ li $a0, 255 /* 0866B8 80085AB8 24050040 */ li $a1, 64 /* 0866BC 80085ABC 240600FF */ li $a2, 255 -/* 0866C0 80085AC0 0C0310E1 */ jal func_800C4384 +/* 0866C0 80085AC0 0C0310E1 */ jal set_text_color /* 0866C4 80085AC4 24070040 */ li $a3, 64 /* 0866C8 80085AC8 8FA50084 */ lw $a1, 0x84($sp) /* 0866CC 80085ACC 8FA60088 */ lw $a2, 0x88($sp) @@ -484,21 +484,21 @@ glabel L80085828 /* 0866DC 80085ADC AFB90010 */ sw $t9, 0x10($sp) /* 0866E0 80085AE0 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0 /* 0866E4 80085AE4 24A5004F */ addiu $a1, $a1, 0x4f -/* 0866E8 80085AE8 0C031110 */ jal func_800C4440 +/* 0866E8 80085AE8 0C031110 */ jal draw_text /* 0866EC 80085AEC 24C6FFFF */ addiu $a2, $a2, -1 /* 0866F0 80085AF0 8FAB0064 */ lw $t3, 0x64($sp) .L80085AF4: /* 0866F4 80085AF4 8FB00084 */ lw $s0, 0x84($sp) /* 0866F8 80085AF8 11600024 */ beqz $t3, .L80085B8C /* 0866FC 80085AFC 24040001 */ li $a0, 1 -/* 086700 80085B00 0C0310BB */ jal func_800C42EC +/* 086700 80085B00 0C0310BB */ jal set_text_font /* 086704 80085B04 2610004F */ addiu $s0, $s0, 0x4f /* 086708 80085B08 240C00A0 */ li $t4, 160 /* 08670C 80085B0C AFAC0010 */ sw $t4, 0x10($sp) /* 086710 80085B10 00002025 */ move $a0, $zero /* 086714 80085B14 00002825 */ move $a1, $zero /* 086718 80085B18 00003025 */ move $a2, $zero -/* 08671C 80085B1C 0C0310E1 */ jal func_800C4384 +/* 08671C 80085B1C 0C0310E1 */ jal set_text_color /* 086720 80085B20 240700FF */ li $a3, 255 /* 086724 80085B24 8FA50084 */ lw $a1, 0x84($sp) /* 086728 80085B28 8FA60088 */ lw $a2, 0x88($sp) @@ -508,14 +508,14 @@ glabel L80085828 /* 086738 80085B38 AFAE0010 */ sw $t6, 0x10($sp) /* 08673C 80085B3C 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0 /* 086740 80085B40 24A50050 */ addiu $a1, $a1, 0x50 -/* 086744 80085B44 0C031110 */ jal func_800C4440 +/* 086744 80085B44 0C031110 */ jal draw_text /* 086748 80085B48 24C60030 */ addiu $a2, $a2, 0x30 /* 08674C 80085B4C 240D00FF */ li $t5, 255 /* 086750 80085B50 AFAD0010 */ sw $t5, 0x10($sp) /* 086754 80085B54 240400FF */ li $a0, 255 /* 086758 80085B58 240500FF */ li $a1, 255 /* 08675C 80085B5C 240600FF */ li $a2, 255 -/* 086760 80085B60 0C0310E1 */ jal func_800C4384 +/* 086760 80085B60 0C0310E1 */ jal set_text_color /* 086764 80085B64 240700FF */ li $a3, 255 /* 086768 80085B68 8FA60088 */ lw $a2, 0x88($sp) /* 08676C 80085B6C 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012 @@ -524,7 +524,7 @@ glabel L80085828 /* 086778 80085B78 AFAF0010 */ sw $t7, 0x10($sp) /* 08677C 80085B7C 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0 /* 086780 80085B80 02002825 */ move $a1, $s0 -/* 086784 80085B84 0C031110 */ jal func_800C4440 +/* 086784 80085B84 0C031110 */ jal draw_text /* 086788 80085B88 24C6002F */ addiu $a2, $a2, 0x2f .L80085B8C: /* 08678C 80085B8C 8FBF0034 */ lw $ra, 0x34($sp) diff --git a/asm/non_matchings/menu/func_80085B9C.s b/asm/non_matchings/menu/func_80085B9C.s index 79792860..5538b43d 100644 --- a/asm/non_matchings/menu/func_80085B9C.s +++ b/asm/non_matchings/menu/func_80085B9C.s @@ -64,16 +64,16 @@ glabel L80085C30 /* 086860 80085C60 00002025 */ move $a0, $zero /* 086864 80085C64 00002825 */ move $a1, $zero /* 086868 80085C68 00003025 */ move $a2, $zero -/* 08686C 80085C6C 0C0310F3 */ jal func_800C43CC +/* 08686C 80085C6C 0C0310F3 */ jal set_text_background_color /* 086870 80085C70 00003825 */ move $a3, $zero -/* 086874 80085C74 0C0310BB */ jal func_800C42EC +/* 086874 80085C74 0C0310BB */ jal set_text_font /* 086878 80085C78 24040002 */ li $a0, 2 /* 08687C 80085C7C 24180080 */ li $t8, 128 /* 086880 80085C80 AFB80010 */ sw $t8, 0x10($sp) /* 086884 80085C84 00002025 */ move $a0, $zero /* 086888 80085C88 00002825 */ move $a1, $zero /* 08688C 80085C8C 00003025 */ move $a2, $zero -/* 086890 80085C90 0C0310E1 */ jal func_800C4384 +/* 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) @@ -83,14 +83,14 @@ glabel L80085C30 /* 0868AC 80085CAC AFAA0010 */ sw $t2, 0x10($sp) /* 0868B0 80085CB0 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0 /* 0868B4 80085CB4 240500A1 */ li $a1, 161 -/* 0868B8 80085CB8 0C031110 */ jal func_800C4440 +/* 0868B8 80085CB8 0C031110 */ jal draw_text /* 0868BC 80085CBC 24060023 */ li $a2, 35 /* 0868C0 80085CC0 240B00FF */ li $t3, 255 /* 0868C4 80085CC4 AFAB0010 */ sw $t3, 0x10($sp) /* 0868C8 80085CC8 240400FF */ li $a0, 255 /* 0868CC 80085CCC 240500FF */ li $a1, 255 /* 0868D0 80085CD0 240600FF */ li $a2, 255 -/* 0868D4 80085CD4 0C0310E1 */ jal func_800C4384 +/* 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) @@ -100,7 +100,7 @@ glabel L80085C30 /* 0868F0 80085CF0 AFAD0010 */ sw $t5, 0x10($sp) /* 0868F4 80085CF4 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0 /* 0868F8 80085CF8 240500A0 */ li $a1, 160 -/* 0868FC 80085CFC 0C031110 */ jal func_800C4440 +/* 0868FC 80085CFC 0C031110 */ jal draw_text /* 086900 80085D00 24060020 */ li $a2, 32 /* 086904 80085D04 8FAE004C */ lw $t6, 0x4c($sp) /* 086908 80085D08 3C0F8000 */ lui $t7, %hi(osTvType) # $t7, 0x8000 @@ -298,14 +298,14 @@ glabel L80085C30 /* 086BD8 80085FD8 1E00FFF5 */ bgtz $s0, .L80085FB0 /* 086BDC 80085FDC 00000000 */ nop .L80085FE0: -/* 086BE0 80085FE0 0C0310BB */ jal func_800C42EC +/* 086BE0 80085FE0 0C0310BB */ jal set_text_font /* 086BE4 80085FE4 24040002 */ li $a0, 2 /* 086BE8 80085FE8 240E00FF */ li $t6, 255 /* 086BEC 80085FEC AFAE0010 */ sw $t6, 0x10($sp) /* 086BF0 80085FF0 240400FF */ li $a0, 255 /* 086BF4 80085FF4 240500FF */ li $a1, 255 /* 086BF8 80085FF8 240600FF */ li $a2, 255 -/* 086BFC 80085FFC 0C0310E1 */ jal func_800C4384 +/* 086BFC 80085FFC 0C0310E1 */ jal set_text_color /* 086C00 80086000 00003825 */ move $a3, $zero /* 086C04 80086004 8FAF0044 */ lw $t7, 0x44($sp) /* 086C08 80086008 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012 @@ -316,7 +316,7 @@ glabel L80085C30 /* 086C1C 8008601C AFB80010 */ sw $t8, 0x10($sp) /* 086C20 80086020 24E78208 */ addiu $a3, %lo(D_800E8208) # addiu $a3, $a3, -0x7df8 /* 086C24 80086024 240500A0 */ li $a1, 160 -/* 086C28 80086028 0C031110 */ jal func_800C4440 +/* 086C28 80086028 0C031110 */ jal draw_text /* 086C2C 8008602C 24060080 */ li $a2, 128 .L80086030: /* 086C30 80086030 8FAA0048 */ lw $t2, 0x48($sp) @@ -329,7 +329,7 @@ glabel L80085C30 /* 086C4C 8008604C 8F2701F0 */ lw $a3, 0x1f0($t9) /* 086C50 80086050 AFAB0010 */ sw $t3, 0x10($sp) /* 086C54 80086054 240500A0 */ li $a1, 160 -/* 086C58 80086058 0C031110 */ jal func_800C4440 +/* 086C58 80086058 0C031110 */ jal draw_text /* 086C5C 8008605C 24060080 */ li $a2, 128 .L80086060: /* 086C60 80086060 8FAD0040 */ lw $t5, 0x40($sp) diff --git a/asm/non_matchings/menu/func_80088938.s b/asm/non_matchings/menu/func_80088938.s index 94602b05..fbcffa09 100644 --- a/asm/non_matchings/menu/func_80088938.s +++ b/asm/non_matchings/menu/func_80088938.s @@ -13,7 +13,7 @@ glabel func_80088938 /* 089564 80088964 00002025 */ move $a0, $zero /* 089568 80088968 00002825 */ move $a1, $zero /* 08956C 8008896C 00003025 */ move $a2, $zero -/* 089570 80088970 0C0310F3 */ jal func_800C43CC +/* 089570 80088970 0C0310F3 */ jal set_text_background_color /* 089574 80088974 00003825 */ move $a3, $zero /* 089578 80088978 3C168012 */ lui $s6, %hi(D_801263BC) # $s6, 0x8012 /* 08957C 8008897C 8ED663BC */ lw $s6, %lo(D_801263BC)($s6) @@ -31,7 +31,7 @@ glabel func_80088938 /* 0895A8 800889A8 3C19800E */ lui $t9, %hi(D_800DFD94) # $t9, 0x800e /* 0895AC 800889AC 3C05800E */ lui $a1, %hi(D_800DFCB4) # $a1, 0x800e /* 0895B0 800889B0 24A5FCB4 */ addiu $a1, %lo(D_800DFCB4) # addiu $a1, $a1, -0x34c -/* 0895B4 800889B4 0C02087B */ jal DrawMenuText +/* 0895B4 800889B4 0C02087B */ jal draw_menu_element /* 0895B8 800889B8 3C063F80 */ lui $a2, 0x3f80 /* 0895BC 800889BC 100001B1 */ b .L80089084 /* 0895C0 800889C0 8FBF0044 */ lw $ra, 0x44($sp) @@ -40,14 +40,14 @@ glabel func_80088938 /* 0895C8 800889C8 00000000 */ nop /* 0895CC 800889CC 132001AD */ beqz $t9, .L80089084 /* 0895D0 800889D0 8FBF0044 */ lw $ra, 0x44($sp) -/* 0895D4 800889D4 0C0310BB */ jal func_800C42EC +/* 0895D4 800889D4 0C0310BB */ jal set_text_font /* 0895D8 800889D8 24040002 */ li $a0, 2 /* 0895DC 800889DC 24080080 */ li $t0, 128 /* 0895E0 800889E0 AFA80010 */ sw $t0, 0x10($sp) /* 0895E4 800889E4 00002025 */ move $a0, $zero /* 0895E8 800889E8 00002825 */ move $a1, $zero /* 0895EC 800889EC 00003025 */ move $a2, $zero -/* 0895F0 800889F0 0C0310E1 */ jal func_800C4384 +/* 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 @@ -58,14 +58,14 @@ glabel func_80088938 /* 089610 80088A10 AFAA0010 */ sw $t2, 0x10($sp) /* 089614 80088A14 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0 /* 089618 80088A18 240500A1 */ li $a1, 161 -/* 08961C 80088A1C 0C031110 */ jal func_800C4440 +/* 08961C 80088A1C 0C031110 */ jal draw_text /* 089620 80088A20 24060021 */ li $a2, 33 /* 089624 80088A24 240B00FF */ li $t3, 255 /* 089628 80088A28 AFAB0010 */ sw $t3, 0x10($sp) /* 08962C 80088A2C 240400FF */ li $a0, 255 /* 089630 80088A30 240500FF */ li $a1, 255 /* 089634 80088A34 240600FF */ li $a2, 255 -/* 089638 80088A38 0C0310E1 */ jal func_800C4384 +/* 089638 80088A38 0C0310E1 */ jal set_text_color /* 08963C 80088A3C 00003825 */ move $a3, $zero /* 089640 80088A40 8EEC0000 */ lw $t4, ($s7) /* 089644 80088A44 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012 @@ -74,7 +74,7 @@ glabel func_80088938 /* 089650 80088A50 AFAD0010 */ sw $t5, 0x10($sp) /* 089654 80088A54 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0 /* 089658 80088A58 240500A0 */ li $a1, 160 -/* 08965C 80088A5C 0C031110 */ jal func_800C4440 +/* 08965C 80088A5C 0C031110 */ jal draw_text /* 089660 80088A60 2406001E */ li $a2, 30 /* 089664 80088A64 24150030 */ li $s5, 48 /* 089668 80088A68 0C031525 */ jal func_800C5494 @@ -327,7 +327,7 @@ glabel func_80088938 /* 089A24 80088E24 1000001F */ b .L80088EA4 /* 089A28 80088E28 00000000 */ nop .L80088E2C: -/* 089A2C 80088E2C 0C0310BB */ jal func_800C42EC +/* 089A2C 80088E2C 0C0310BB */ jal set_text_font /* 089A30 80088E30 00002025 */ move $a0, $zero /* 089A34 80088E34 3C0F800E */ lui $t7, %hi(D_800DF460) # $t7, 0x800e /* 089A38 80088E38 8DEFF460 */ lw $t7, %lo(D_800DF460)($t7) @@ -339,7 +339,7 @@ glabel func_80088938 /* 089A50 80088E50 240400FF */ li $a0, 255 /* 089A54 80088E54 240500FF */ li $a1, 255 /* 089A58 80088E58 240600FF */ li $a2, 255 -/* 089A5C 80088E5C 0C0310E1 */ jal func_800C4384 +/* 089A5C 80088E5C 0C0310E1 */ jal set_text_color /* 089A60 80088E60 02C03825 */ move $a3, $s6 /* 089A64 80088E64 10000007 */ b .L80088E84 /* 089A68 80088E68 8EE90000 */ lw $t1, ($s7) @@ -347,7 +347,7 @@ glabel func_80088938 /* 089A6C 80088E6C 240800FF */ li $t0, 255 /* 089A70 80088E70 AFA80010 */ sw $t0, 0x10($sp) /* 089A74 80088E74 240600FF */ li $a2, 255 -/* 089A78 80088E78 0C0310E1 */ jal func_800C4384 +/* 089A78 80088E78 0C0310E1 */ jal set_text_color /* 089A7C 80088E7C 00003825 */ move $a3, $zero /* 089A80 80088E80 8EE90000 */ lw $t1, ($s7) .L80088E84: @@ -357,7 +357,7 @@ glabel func_80088938 /* 089A90 80088E90 AFAB0010 */ sw $t3, 0x10($sp) /* 089A94 80088E94 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0 /* 089A98 80088E98 24058000 */ li $a1, -32768 -/* 089A9C 80088E9C 0C031110 */ jal func_800C4440 +/* 089A9C 80088E9C 0C031110 */ jal draw_text /* 089AA0 80088EA0 02A03025 */ move $a2, $s5 .L80088EA4: /* 089AA4 80088EA4 3C138012 */ lui $s3, %hi(D_801263E0) # $s3, 0x8012 @@ -474,9 +474,9 @@ glabel func_80088938 /* 089C40 80089040 241900FF */ li $t9, 255 /* 089C44 80089044 AFB90010 */ sw $t9, 0x10($sp) /* 089C48 80089048 240600FF */ li $a2, 255 -/* 089C4C 8008904C 0C0310E1 */ jal func_800C4384 +/* 089C4C 8008904C 0C0310E1 */ jal set_text_color /* 089C50 80089050 00003825 */ move $a3, $zero -/* 089C54 80089054 0C0310BB */ jal func_800C42EC +/* 089C54 80089054 0C0310BB */ jal set_text_font /* 089C58 80089058 24040002 */ li $a0, 2 /* 089C5C 8008905C 8EE80000 */ lw $t0, ($s7) /* 089C60 80089060 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012 @@ -485,7 +485,7 @@ glabel func_80088938 /* 089C6C 8008906C AFA90010 */ sw $t1, 0x10($sp) /* 089C70 80089070 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0 /* 089C74 80089074 240500A0 */ li $a1, 160 -/* 089C78 80089078 0C031110 */ jal func_800C4440 +/* 089C78 80089078 0C031110 */ jal draw_text /* 089C7C 8008907C 24060080 */ li $a2, 128 .L80089080: /* 089C80 80089080 8FBF0044 */ lw $ra, 0x44($sp) diff --git a/asm/non_matchings/menu/func_800896A4.s b/asm/non_matchings/menu/func_800896A4.s index f1665db4..3b171caf 100644 --- a/asm/non_matchings/menu/func_800896A4.s +++ b/asm/non_matchings/menu/func_800896A4.s @@ -14,7 +14,7 @@ glabel func_800896A4 /* 08A2D4 800896D4 00002025 */ move $a0, $zero /* 08A2D8 800896D8 00002825 */ move $a1, $zero /* 08A2DC 800896DC 00003025 */ move $a2, $zero -/* 08A2E0 800896E0 0C0310F3 */ jal func_800C43CC +/* 08A2E0 800896E0 0C0310F3 */ jal set_text_background_color /* 08A2E4 800896E4 00003825 */ move $a3, $zero /* 08A2E8 800896E8 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012 /* 08A2EC 800896EC 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0 @@ -22,14 +22,14 @@ glabel func_800896A4 /* 08A2F4 800896F4 00003025 */ move $a2, $zero /* 08A2F8 800896F8 0C0316D6 */ jal func_800C5B58 /* 08A2FC 800896FC 24070007 */ li $a3, 7 -/* 08A300 80089700 0C0310BB */ jal func_800C42EC +/* 08A300 80089700 0C0310BB */ jal set_text_font /* 08A304 80089704 24040002 */ li $a0, 2 /* 08A308 80089708 240E0080 */ li $t6, 128 /* 08A30C 8008970C AFAE0010 */ sw $t6, 0x10($sp) /* 08A310 80089710 00002025 */ move $a0, $zero /* 08A314 80089714 00002825 */ move $a1, $zero /* 08A318 80089718 00003025 */ move $a2, $zero -/* 08A31C 8008971C 0C0310E1 */ jal func_800C4384 +/* 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) @@ -39,14 +39,14 @@ glabel func_800896A4 /* 08A338 80089738 AFB80010 */ sw $t8, 0x10($sp) /* 08A33C 8008973C 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0 /* 08A340 80089740 240500A1 */ li $a1, 161 -/* 08A344 80089744 0C031110 */ jal func_800C4440 +/* 08A344 80089744 0C031110 */ jal draw_text /* 08A348 80089748 24060023 */ li $a2, 35 /* 08A34C 8008974C 241900FF */ li $t9, 255 /* 08A350 80089750 AFB90010 */ sw $t9, 0x10($sp) /* 08A354 80089754 240400FF */ li $a0, 255 /* 08A358 80089758 240500FF */ li $a1, 255 /* 08A35C 8008975C 240600FF */ li $a2, 255 -/* 08A360 80089760 0C0310E1 */ jal func_800C4384 +/* 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) @@ -56,17 +56,17 @@ glabel func_800896A4 /* 08A37C 8008977C AFAA0010 */ sw $t2, 0x10($sp) /* 08A380 80089780 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0 /* 08A384 80089784 240500A0 */ li $a1, 160 -/* 08A388 80089788 0C031110 */ jal func_800C4440 +/* 08A388 80089788 0C031110 */ jal draw_text /* 08A38C 8008978C 24060020 */ li $a2, 32 /* 08A390 80089790 24130041 */ li $s3, 65 -/* 08A394 80089794 0C0310BB */ jal func_800C42EC +/* 08A394 80089794 0C0310BB */ jal set_text_font /* 08A398 80089798 00002025 */ move $a0, $zero /* 08A39C 8008979C 240B00FF */ li $t3, 255 /* 08A3A0 800897A0 AFAB0010 */ sw $t3, 0x10($sp) /* 08A3A4 800897A4 240400FF */ li $a0, 255 /* 08A3A8 800897A8 240500FF */ li $a1, 255 /* 08A3AC 800897AC 240600FF */ li $a2, 255 -/* 08A3B0 800897B0 0C0310E1 */ jal func_800C4384 +/* 08A3B0 800897B0 0C0310E1 */ jal set_text_color /* 08A3B4 800897B4 00003825 */ move $a3, $zero /* 08A3B8 800897B8 3C168012 */ lui $s6, %hi(D_80126C40) # $s6, 0x8012 /* 08A3BC 800897BC 3C158012 */ lui $s5, %hi(D_80126C42) # $s5, 0x8012 @@ -105,7 +105,7 @@ glabel func_800896A4 /* 08A434 80089834 240900FF */ li $t1, 255 /* 08A438 80089838 27270080 */ addiu $a3, $t9, 0x80 /* 08A43C 8008983C AFA90010 */ sw $t1, 0x10($sp) -/* 08A440 80089840 0C0310E1 */ jal func_800C4384 +/* 08A440 80089840 0C0310E1 */ jal set_text_color /* 08A444 80089844 240600C0 */ li $a2, 192 .L80089848: /* 08A448 80089848 2A61005B */ slti $at, $s3, 0x5b @@ -119,7 +119,7 @@ glabel func_800896A4 /* 08A464 80089864 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0 /* 08A468 80089868 02202825 */ move $a1, $s1 /* 08A46C 8008986C 02803025 */ move $a2, $s4 -/* 08A470 80089870 0C031110 */ jal func_800C4440 +/* 08A470 80089870 0C031110 */ jal draw_text /* 08A474 80089874 27A7005C */ addiu $a3, $sp, 0x5c /* 08A478 80089878 10000016 */ b .L800898D4 /* 08A47C 8008987C 00000000 */ nop @@ -133,7 +133,7 @@ glabel func_800896A4 /* 08A498 80089898 24E78210 */ addiu $a3, %lo(D_800E8210) # addiu $a3, $a3, -0x7df0 /* 08A49C 8008989C 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0 /* 08A4A0 800898A0 02202825 */ move $a1, $s1 -/* 08A4A4 800898A4 0C031110 */ jal func_800C4440 +/* 08A4A4 800898A4 0C031110 */ jal draw_text /* 08A4A8 800898A8 02803025 */ move $a2, $s4 /* 08A4AC 800898AC 10000009 */ b .L800898D4 /* 08A4B0 800898B0 00000000 */ nop @@ -144,7 +144,7 @@ glabel func_800896A4 /* 08A4C0 800898C0 24E78214 */ addiu $a3, %lo(D_800E8214) # addiu $a3, $a3, -0x7dec /* 08A4C4 800898C4 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0 /* 08A4C8 800898C8 02202825 */ move $a1, $s1 -/* 08A4CC 800898CC 0C031110 */ jal func_800C4440 +/* 08A4CC 800898CC 0C031110 */ jal draw_text /* 08A4D0 800898D0 02803025 */ move $a2, $s4 .L800898D4: /* 08A4D4 800898D4 3C0D8012 */ lui $t5, %hi(D_80126C46) # $t5, 0x8012 @@ -163,7 +163,7 @@ glabel func_800896A4 /* 08A508 80089908 241800FF */ li $t8, 255 /* 08A50C 8008990C AFB80010 */ sw $t8, 0x10($sp) /* 08A510 80089910 240600FF */ li $a2, 255 -/* 08A514 80089914 0C0310E1 */ jal func_800C4384 +/* 08A514 80089914 0C0310E1 */ jal set_text_color /* 08A518 80089918 00003825 */ move $a3, $zero .L8008991C: /* 08A51C 8008991C 26730001 */ addiu $s3, $s3, 1 @@ -187,7 +187,7 @@ glabel func_800896A4 /* 08A564 80089964 240A01FF */ li $t2, 511 /* 08A568 80089968 01499023 */ subu $s2, $t2, $t1 .L8008996C: -/* 08A56C 8008996C 0C0310BB */ jal func_800C42EC +/* 08A56C 8008996C 0C0310BB */ jal set_text_font /* 08A570 80089970 00002025 */ move $a0, $zero /* 08A574 80089974 3C168000 */ lui $s6, %hi(osTvType) # $s6, 0x8000 /* 08A578 80089978 26D60300 */ addiu $s6, %lo(osTvType) # addiu $s6, $s6, 0x300 @@ -224,7 +224,7 @@ glabel func_800896A4 /* 08A5E4 800899E4 AFB90010 */ sw $t9, 0x10($sp) /* 08A5E8 800899E8 240500FF */ li $a1, 255 /* 08A5EC 800899EC 240600FF */ li $a2, 255 -/* 08A5F0 800899F0 0C0310E1 */ jal func_800C4384 +/* 08A5F0 800899F0 0C0310E1 */ jal set_text_color /* 08A5F4 800899F4 02003825 */ move $a3, $s0 /* 08A5F8 800899F8 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012 /* 08A5FC 800899FC 8E270000 */ lw $a3, ($s1) @@ -232,7 +232,7 @@ glabel func_800896A4 /* 08A604 80089A04 AFA90010 */ sw $t1, 0x10($sp) /* 08A608 80089A08 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0 /* 08A60C 80089A0C 24058000 */ li $a1, -32768 -/* 08A610 80089A10 0C031110 */ jal func_800C4440 +/* 08A610 80089A10 0C031110 */ jal draw_text /* 08A614 80089A14 02603025 */ move $a2, $s3 /* 08A618 80089A18 8E2A0004 */ lw $t2, 4($s1) /* 08A61C 80089A1C 27DE0001 */ addiu $fp, $fp, 1 @@ -242,19 +242,19 @@ glabel func_800896A4 .L80089A2C: /* 08A62C 80089A2C 3C158012 */ lui $s5, %hi(D_801263E0) # $s5, 0x8012 /* 08A630 80089A30 26B563E0 */ addiu $s5, %lo(D_801263E0) # addiu $s5, $s5, 0x63e0 -/* 08A634 80089A34 0C0310BB */ jal func_800C42EC +/* 08A634 80089A34 0C0310BB */ jal set_text_font /* 08A638 80089A38 00002025 */ move $a0, $zero /* 08A63C 80089A3C 240B00FF */ li $t3, 255 /* 08A640 80089A40 AFAB0010 */ sw $t3, 0x10($sp) /* 08A644 80089A44 240400FF */ li $a0, 255 /* 08A648 80089A48 240500FF */ li $a1, 255 /* 08A64C 80089A4C 24060080 */ li $a2, 128 -/* 08A650 80089A50 0C0310E1 */ jal func_800C4384 +/* 08A650 80089A50 0C0310E1 */ jal set_text_color /* 08A654 80089A54 24070080 */ li $a3, 128 /* 08A658 80089A58 00002025 */ move $a0, $zero /* 08A65C 80089A5C 00002825 */ move $a1, $zero /* 08A660 80089A60 24060080 */ li $a2, 128 -/* 08A664 80089A64 0C0310F3 */ jal func_800C43CC +/* 08A664 80089A64 0C0310F3 */ jal set_text_background_color /* 08A668 80089A68 24070080 */ li $a3, 128 /* 08A66C 80089A6C 3C028012 */ lui $v0, %hi(D_80126C46) # $v0, 0x8012 /* 08A670 80089A70 84426C46 */ lh $v0, %lo(D_80126C46)($v0) @@ -273,7 +273,7 @@ glabel func_800896A4 /* 08A6A4 80089AA4 AFAD0010 */ sw $t5, 0x10($sp) /* 08A6A8 80089AA8 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0 /* 08A6AC 80089AAC 24058000 */ li $a1, -32768 -/* 08A6B0 80089AB0 0C031110 */ jal func_800C4440 +/* 08A6B0 80089AB0 0C031110 */ jal draw_text /* 08A6B4 80089AB4 24060090 */ li $a2, 144 /* 08A6B8 80089AB8 10000029 */ b .L80089B60 /* 08A6BC 80089ABC 8EAC0000 */ lw $t4, ($s5) @@ -289,7 +289,7 @@ glabel func_800896A4 /* 08A6E0 80089AE0 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0 /* 08A6E4 80089AE4 24058000 */ li $a1, -32768 /* 08A6E8 80089AE8 24060090 */ li $a2, 144 -/* 08A6EC 80089AEC 0C031110 */ jal func_800C4440 +/* 08A6EC 80089AEC 0C031110 */ jal draw_text /* 08A6F0 80089AF0 03023821 */ addu $a3, $t8, $v0 /* 08A6F4 80089AF4 1000001A */ b .L80089B60 /* 08A6F8 80089AF8 8EAC0000 */ lw $t4, ($s5) @@ -303,7 +303,7 @@ glabel func_800896A4 /* 08A714 80089B14 24E76C58 */ addiu $a3, %lo(D_80126C58) # addiu $a3, $a3, 0x6c58 /* 08A718 80089B18 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0 /* 08A71C 80089B1C 24058000 */ li $a1, -32768 -/* 08A720 80089B20 0C031110 */ jal func_800C4440 +/* 08A720 80089B20 0C031110 */ jal draw_text /* 08A724 80089B24 24060090 */ li $a2, 144 /* 08A728 80089B28 1000000D */ b .L80089B60 /* 08A72C 80089B2C 8EAC0000 */ lw $t4, ($s5) @@ -317,7 +317,7 @@ glabel func_800896A4 /* 08A748 80089B48 AFAB0010 */ sw $t3, 0x10($sp) /* 08A74C 80089B4C 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0 /* 08A750 80089B50 24058000 */ li $a1, -32768 -/* 08A754 80089B54 0C031110 */ jal func_800C4440 +/* 08A754 80089B54 0C031110 */ jal draw_text /* 08A758 80089B58 24060090 */ li $a2, 144 .L80089B5C: /* 08A75C 80089B5C 8EAC0000 */ lw $t4, ($s5) @@ -405,7 +405,7 @@ glabel func_800896A4 /* 08A884 80089C84 0C0316D6 */ jal func_800C5B58 /* 08A888 80089C88 24070006 */ li $a3, 6 .L80089C8C: -/* 08A88C 80089C8C 0C0270C3 */ jal func_8009C30C +/* 08A88C 80089C8C 0C0270C3 */ jal get_filtered_cheats /* 08A890 80089C90 00000000 */ nop /* 08A894 80089C94 000268C0 */ sll $t5, $v0, 3 /* 08A898 80089C98 05A10004 */ bgez $t5, .L80089CAC diff --git a/asm/non_matchings/menu/func_8008A56C.s b/asm/non_matchings/menu/func_8008A56C.s index 57718a23..148ded74 100644 --- a/asm/non_matchings/menu/func_8008A56C.s +++ b/asm/non_matchings/menu/func_8008A56C.s @@ -14,16 +14,16 @@ glabel func_8008A56C /* 08B19C 8008A59C 00002025 */ move $a0, $zero /* 08B1A0 8008A5A0 00002825 */ move $a1, $zero /* 08B1A4 8008A5A4 00003025 */ move $a2, $zero -/* 08B1A8 8008A5A8 0C0310F3 */ jal func_800C43CC +/* 08B1A8 8008A5A8 0C0310F3 */ jal set_text_background_color /* 08B1AC 8008A5AC 00003825 */ move $a3, $zero -/* 08B1B0 8008A5B0 0C0310BB */ jal func_800C42EC +/* 08B1B0 8008A5B0 0C0310BB */ jal set_text_font /* 08B1B4 8008A5B4 24040002 */ li $a0, 2 /* 08B1B8 8008A5B8 240E0080 */ li $t6, 128 /* 08B1BC 8008A5BC AFAE0010 */ sw $t6, 0x10($sp) /* 08B1C0 8008A5C0 00002025 */ move $a0, $zero /* 08B1C4 8008A5C4 00002825 */ move $a1, $zero /* 08B1C8 8008A5C8 00003025 */ move $a2, $zero -/* 08B1CC 8008A5CC 0C0310E1 */ jal func_800C4384 +/* 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 @@ -35,14 +35,14 @@ glabel func_8008A56C /* 08B1F0 8008A5F0 AFB80010 */ sw $t8, 0x10($sp) /* 08B1F4 8008A5F4 02A02025 */ move $a0, $s5 /* 08B1F8 8008A5F8 240500A1 */ li $a1, 161 -/* 08B1FC 8008A5FC 0C031110 */ jal func_800C4440 +/* 08B1FC 8008A5FC 0C031110 */ jal draw_text /* 08B200 8008A600 24060023 */ li $a2, 35 /* 08B204 8008A604 241900FF */ li $t9, 255 /* 08B208 8008A608 AFB90010 */ sw $t9, 0x10($sp) /* 08B20C 8008A60C 240400FF */ li $a0, 255 /* 08B210 8008A610 240500FF */ li $a1, 255 /* 08B214 8008A614 240600FF */ li $a2, 255 -/* 08B218 8008A618 0C0310E1 */ jal func_800C4384 +/* 08B218 8008A618 0C0310E1 */ jal set_text_color /* 08B21C 8008A61C 00003825 */ move $a3, $zero /* 08B220 8008A620 8EE80000 */ lw $t0, ($s7) /* 08B224 8008A624 2409000C */ li $t1, 12 @@ -50,7 +50,7 @@ glabel func_8008A56C /* 08B22C 8008A62C AFA90010 */ sw $t1, 0x10($sp) /* 08B230 8008A630 02A02025 */ move $a0, $s5 /* 08B234 8008A634 240500A0 */ li $a1, 160 -/* 08B238 8008A638 0C031110 */ jal func_800C4440 +/* 08B238 8008A638 0C031110 */ jal draw_text /* 08B23C 8008A63C 24060020 */ li $a2, 32 /* 08B240 8008A640 3C03800E */ lui $v1, %hi(gUnlockedMagicCodes) # $v1, 0x800e /* 08B244 8008A644 3C048012 */ lui $a0, %hi(D_80126C80) # $a0, 0x8012 @@ -82,14 +82,14 @@ glabel func_8008A56C /* 08B2A4 8008A6A4 240F01FF */ li $t7, 511 /* 08B2A8 8008A6A8 01EEF023 */ subu $fp, $t7, $t6 .L8008A6AC: -/* 08B2AC 8008A6AC 0C0310BB */ jal func_800C42EC +/* 08B2AC 8008A6AC 0C0310BB */ jal set_text_font /* 08B2B0 8008A6B0 00002025 */ move $a0, $zero /* 08B2B4 8008A6B4 241800FF */ li $t8, 255 /* 08B2B8 8008A6B8 AFB80010 */ sw $t8, 0x10($sp) /* 08B2BC 8008A6BC 240400FF */ li $a0, 255 /* 08B2C0 8008A6C0 240500FF */ li $a1, 255 /* 08B2C4 8008A6C4 240600FF */ li $a2, 255 -/* 08B2C8 8008A6C8 0C0310E1 */ jal func_800C4384 +/* 08B2C8 8008A6C8 0C0310E1 */ jal set_text_color /* 08B2CC 8008A6CC 00003825 */ move $a3, $zero /* 08B2D0 8008A6D0 3C038012 */ lui $v1, %hi(D_801263E0) # $v1, 0x8012 /* 08B2D4 8008A6D4 3C198012 */ lui $t9, %hi(D_80126C70) # $t9, 0x8012 @@ -118,7 +118,7 @@ glabel func_8008A56C /* 08B32C 8008A72C 240B00FF */ li $t3, 255 /* 08B330 8008A730 AFAB0010 */ sw $t3, 0x10($sp) /* 08B334 8008A734 240600FF */ li $a2, 255 -/* 08B338 8008A738 0C0310E1 */ jal func_800C4384 +/* 08B338 8008A738 0C0310E1 */ jal set_text_color /* 08B33C 8008A73C 03C03825 */ move $a3, $fp .L8008A740: /* 08B340 8008A740 862D0000 */ lh $t5, ($s1) @@ -131,7 +131,7 @@ glabel func_8008A56C /* 08B35C 8008A75C 02A02025 */ move $a0, $s5 /* 08B360 8008A760 24050030 */ li $a1, 48 /* 08B364 8008A764 02403025 */ move $a2, $s2 -/* 08B368 8008A768 0C031110 */ jal func_800C4440 +/* 08B368 8008A768 0C031110 */ jal draw_text /* 08B36C 8008A76C 03193821 */ addu $a3, $t8, $t9 /* 08B370 8008A770 86280000 */ lh $t0, ($s1) /* 08B374 8008A774 3C0B800E */ lui $t3, %hi(gActiveMagicCodes) # $t3, 0x800e @@ -146,7 +146,7 @@ glabel func_8008A56C /* 08B398 8008A798 8DA70054 */ lw $a3, 0x54($t5) /* 08B39C 8008A79C AFA00010 */ sw $zero, 0x10($sp) /* 08B3A0 8008A7A0 24050100 */ li $a1, 256 -/* 08B3A4 8008A7A4 0C031110 */ jal func_800C4440 +/* 08B3A4 8008A7A4 0C031110 */ jal draw_text /* 08B3A8 8008A7A8 02403025 */ move $a2, $s2 /* 08B3AC 8008A7AC 10000008 */ b .L8008A7D0 /* 08B3B0 8008A7B0 868F0000 */ lh $t7, ($s4) @@ -155,7 +155,7 @@ glabel func_8008A56C /* 08B3B8 8008A7B8 24050100 */ li $a1, 256 /* 08B3BC 8008A7BC 8DC70058 */ lw $a3, 0x58($t6) /* 08B3C0 8008A7C0 AFA00010 */ sw $zero, 0x10($sp) -/* 08B3C4 8008A7C4 0C031110 */ jal func_800C4440 +/* 08B3C4 8008A7C4 0C031110 */ jal draw_text /* 08B3C8 8008A7C8 02403025 */ move $a2, $s2 /* 08B3CC 8008A7CC 868F0000 */ lh $t7, ($s4) .L8008A7D0: @@ -165,7 +165,7 @@ glabel func_8008A56C /* 08B3DC 8008A7DC 241800FF */ li $t8, 255 /* 08B3E0 8008A7E0 AFB80010 */ sw $t8, 0x10($sp) /* 08B3E4 8008A7E4 240600FF */ li $a2, 255 -/* 08B3E8 8008A7E8 0C0310E1 */ jal func_800C4384 +/* 08B3E8 8008A7E8 0C0310E1 */ jal set_text_color /* 08B3EC 8008A7EC 00003825 */ move $a3, $zero .L8008A7F0: /* 08B3F0 8008A7F0 3C198012 */ lui $t9, %hi(D_801263E0) # $t9, 0x8012 @@ -193,7 +193,7 @@ glabel func_8008A56C /* 08B444 8008A844 240A00FF */ li $t2, 255 /* 08B448 8008A848 AFAA0010 */ sw $t2, 0x10($sp) /* 08B44C 8008A84C 240600FF */ li $a2, 255 -/* 08B450 8008A850 0C0310E1 */ jal func_800C4384 +/* 08B450 8008A850 0C0310E1 */ jal set_text_color /* 08B454 8008A854 03C03825 */ move $a3, $fp .L8008A858: /* 08B458 8008A858 8EEB0000 */ lw $t3, ($s7) @@ -202,7 +202,7 @@ glabel func_8008A56C /* 08B464 8008A864 AFAC0010 */ sw $t4, 0x10($sp) /* 08B468 8008A868 02A02025 */ move $a0, $s5 /* 08B46C 8008A86C 24058000 */ li $a1, -32768 -/* 08B470 8008A870 0C031110 */ jal func_800C4440 +/* 08B470 8008A870 0C031110 */ jal draw_text /* 08B474 8008A874 02403025 */ move $a2, $s2 /* 08B478 8008A878 10000014 */ b .L8008A8CC /* 08B47C 8008A87C 8FBF004C */ lw $ra, 0x4c($sp) diff --git a/asm/non_matchings/menu/func_8008BB3C.s b/asm/non_matchings/menu/func_8008BB3C.s index 07d178cc..4af81a87 100644 --- a/asm/non_matchings/menu/func_8008BB3C.s +++ b/asm/non_matchings/menu/func_8008BB3C.s @@ -22,11 +22,11 @@ glabel func_8008BB3C /* 08C788 8008BB88 26D60001 */ addiu $s6, $s6, 1 .L8008BB8C: /* 08C78C 8008BB8C 10200017 */ beqz $at, .L8008BBEC -/* 08C790 8008BB90 3C188012 */ lui $t8, %hi(D_801263F0) # $t8, 0x8012 +/* 08C790 8008BB90 3C188012 */ lui $t8, %hi(gCharacterIdSlots) # $t8, 0x8012 /* 08C794 8008BB94 1A00000F */ blez $s0, .L8008BBD4 /* 08C798 8008BB98 00008825 */ move $s1, $zero -/* 08C79C 8008BB9C 3C0E8012 */ lui $t6, %hi(D_801263F0) # $t6, 0x8012 -/* 08C7A0 8008BBA0 25CE63F0 */ addiu $t6, %lo(D_801263F0) # addiu $t6, $t6, 0x63f0 +/* 08C79C 8008BB9C 3C0E8012 */ lui $t6, %hi(gCharacterIdSlots) # $t6, 0x8012 +/* 08C7A0 8008BBA0 25CE63F0 */ addiu $t6, %lo(gCharacterIdSlots) # addiu $t6, $t6, 0x63f0 /* 08C7A4 8008BBA4 000E9821 */ addu $s3, $zero, $t6 /* 08C7A8 8008BBA8 020E1021 */ addu $v0, $s0, $t6 /* 08C7AC 8008BBAC 24030009 */ li $v1, 9 @@ -44,15 +44,15 @@ glabel func_8008BB3C .L8008BBD4: /* 08C7D4 8008BBD4 16200005 */ bnez $s1, .L8008BBEC /* 08C7D8 8008BBD8 24030009 */ li $v1, 9 -/* 08C7DC 8008BBDC 3C018012 */ lui $at, %hi(D_801263F0) # $at, 0x8012 +/* 08C7DC 8008BBDC 3C018012 */ lui $at, %hi(gCharacterIdSlots) # $at, 0x8012 /* 08C7E0 8008BBE0 00300821 */ addu $at, $at, $s0 -/* 08C7E4 8008BBE4 A02363F0 */ sb $v1, %lo(D_801263F0)($at) +/* 08C7E4 8008BBE4 A02363F0 */ sb $v1, %lo(gCharacterIdSlots)($at) /* 08C7E8 8008BBE8 26100001 */ addiu $s0, $s0, 1 .L8008BBEC: /* 08C7EC 8008BBEC 2A010008 */ slti $at, $s0, 8 /* 08C7F0 8008BBF0 10200042 */ beqz $at, .L8008BCFC /* 08C7F4 8008BBF4 02009025 */ move $s2, $s0 -/* 08C7F8 8008BBF8 271863F0 */ addiu $t8, %lo(D_801263F0) # addiu $t8, $t8, 0x63f0 +/* 08C7F8 8008BBF8 271863F0 */ addiu $t8, %lo(gCharacterIdSlots) # addiu $t8, $t8, 0x63f0 /* 08C7FC 8008BBFC 3C148012 */ lui $s4, %hi(D_801263CC) # $s4, 0x8012 /* 08C800 8008BC00 269463CC */ addiu $s4, %lo(D_801263CC) # addiu $s4, $s4, 0x63cc /* 08C804 8008BC04 02189821 */ addu $s3, $s0, $t8 @@ -74,8 +74,8 @@ glabel func_8008BB3C /* 08C83C 8008BC3C A26A0000 */ sb $t2, ($s3) /* 08C840 8008BC40 10A0000D */ beqz $a1, .L8008BC78 /* 08C844 8008BC44 00A02025 */ move $a0, $a1 -/* 08C848 8008BC48 3C0B8012 */ lui $t3, %hi(D_801263F0) # $t3, 0x8012 -/* 08C84C 8008BC4C 256B63F0 */ addiu $t3, %lo(D_801263F0) # addiu $t3, $t3, 0x63f0 +/* 08C848 8008BC48 3C0B8012 */ lui $t3, %hi(gCharacterIdSlots) # $t3, 0x8012 +/* 08C84C 8008BC4C 256B63F0 */ addiu $t3, %lo(gCharacterIdSlots) # addiu $t3, $t3, 0x63f0 /* 08C850 8008BC50 82630000 */ lb $v1, ($s3) /* 08C854 8008BC54 020B1021 */ addu $v0, $s0, $t3 .L8008BC58: @@ -89,8 +89,8 @@ glabel func_8008BB3C /* 08C870 8008BC70 24420001 */ addiu $v0, $v0, 1 /* 08C874 8008BC74 1212001B */ beq $s0, $s2, .L8008BCE4 .L8008BC78: -/* 08C878 8008BC78 3C0D8012 */ lui $t5, %hi(D_801263F0) # $t5, 0x8012 -/* 08C87C 8008BC7C 25AD63F0 */ addiu $t5, %lo(D_801263F0) # addiu $t5, $t5, 0x63f0 +/* 08C878 8008BC78 3C0D8012 */ lui $t5, %hi(gCharacterIdSlots) # $t5, 0x8012 +/* 08C87C 8008BC7C 25AD63F0 */ addiu $t5, %lo(gCharacterIdSlots) # addiu $t5, $t5, 0x63f0 /* 08C880 8008BC80 82630000 */ lb $v1, ($s3) /* 08C884 8008BC84 020D1021 */ addu $v0, $s0, $t5 /* 08C888 8008BC88 024D2021 */ addu $a0, $s2, $t5 diff --git a/asm/non_matchings/menu/func_8008C698.s b/asm/non_matchings/menu/func_8008C698.s index 416fd651..74398cc8 100644 --- a/asm/non_matchings/menu/func_8008C698.s +++ b/asm/non_matchings/menu/func_8008C698.s @@ -69,7 +69,7 @@ glabel func_8008C698 .L8008C790: /* 08D390 8008C790 8CE50000 */ lw $a1, ($a3) /* 08D394 8008C794 24040001 */ li $a0, 1 -/* 08D398 8008C798 0C02087B */ jal DrawMenuText +/* 08D398 8008C798 0C02087B */ jal draw_menu_element /* 08D39C 8008C79C 3C063F80 */ lui $a2, 0x3f80 /* 08D3A0 8008C7A0 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012 /* 08D3A4 8008C7A4 0C0202F2 */ jal func_80080BC8 diff --git a/asm/non_matchings/menu/func_8008CD74.s b/asm/non_matchings/menu/func_8008CD74.s index 28fa2c83..222a3b76 100644 --- a/asm/non_matchings/menu/func_8008CD74.s +++ b/asm/non_matchings/menu/func_8008CD74.s @@ -79,12 +79,12 @@ glabel func_8008CD74 /* 08DA94 8008CE94 00000000 */ nop /* 08DA98 8008CE98 15C00097 */ bnez $t6, .L8008D0F8 /* 08DA9C 8008CE9C 00000000 */ nop -/* 08DAA0 8008CEA0 0C0310BB */ jal func_800C42EC +/* 08DAA0 8008CEA0 0C0310BB */ jal set_text_font /* 08DAA4 8008CEA4 24040002 */ li $a0, 2 /* 08DAA8 8008CEA8 00002025 */ move $a0, $zero /* 08DAAC 8008CEAC 00002825 */ move $a1, $zero /* 08DAB0 8008CEB0 00003025 */ move $a2, $zero -/* 08DAB4 8008CEB4 0C0310F3 */ jal func_800C43CC +/* 08DAB4 8008CEB4 0C0310F3 */ jal set_text_background_color /* 08DAB8 8008CEB8 00003825 */ move $a3, $zero /* 08DABC 8008CEBC 3C118012 */ lui $s1, %hi(D_801264A0) # $s1, 0x8012 /* 08DAC0 8008CEC0 3C10800E */ lui $s0, %hi(D_800E03CC) # $s0, 0x800e @@ -215,7 +215,7 @@ glabel func_8008CD74 /* 08DC98 8008D098 240D00FF */ li $t5, 255 /* 08DC9C 8008D09C AFAD0010 */ sw $t5, 0x10($sp) /* 08DCA0 8008D0A0 240600FF */ li $a2, 255 -/* 08DCA4 8008D0A4 0C0310E1 */ jal func_800C4384 +/* 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) @@ -229,7 +229,7 @@ glabel func_8008CD74 /* 08DCD0 8008D0D0 01163021 */ addu $a2, $t0, $s6 /* 08DCD4 8008D0D4 AFAA0010 */ sw $t2, 0x10($sp) /* 08DCD8 8008D0D8 02E02025 */ move $a0, $s7 -/* 08DCDC 8008D0DC 0C031110 */ jal func_800C4440 +/* 08DCDC 8008D0DC 0C031110 */ jal draw_text /* 08DCE0 8008D0E0 01CF2821 */ addu $a1, $t6, $t7 .L8008D0E4: /* 08DCE4 8008D0E4 3C0B800E */ lui $t3, %hi(D_800E03FC) # $t3, 0x800e @@ -250,19 +250,19 @@ glabel func_8008CD74 /* 08DD1C 8008D11C 01AC1023 */ subu $v0, $t5, $t4 .L8008D120: /* 08DD20 8008D120 00002025 */ move $a0, $zero -/* 08DD24 8008D124 0C0310BB */ jal func_800C42EC +/* 08DD24 8008D124 0C0310BB */ jal set_text_font /* 08DD28 8008D128 AFA2007C */ sw $v0, 0x7c($sp) /* 08DD2C 8008D12C 00002025 */ move $a0, $zero /* 08DD30 8008D130 00002825 */ move $a1, $zero /* 08DD34 8008D134 00003025 */ move $a2, $zero -/* 08DD38 8008D138 0C0310F3 */ jal func_800C43CC +/* 08DD38 8008D138 0C0310F3 */ jal set_text_background_color /* 08DD3C 8008D13C 00003825 */ move $a3, $zero /* 08DD40 8008D140 240E00FF */ li $t6, 255 /* 08DD44 8008D144 AFAE0010 */ sw $t6, 0x10($sp) /* 08DD48 8008D148 240400FF */ li $a0, 255 /* 08DD4C 8008D14C 240500FF */ li $a1, 255 /* 08DD50 8008D150 240600FF */ li $a2, 255 -/* 08DD54 8008D154 0C0310E1 */ jal func_800C4384 +/* 08DD54 8008D154 0C0310E1 */ jal set_text_color /* 08DD58 8008D158 00003825 */ move $a3, $zero /* 08DD5C 8008D15C 00009825 */ move $s3, $zero /* 08DD60 8008D160 27B50064 */ addiu $s5, $sp, 0x64 @@ -381,21 +381,21 @@ glabel func_8008CD74 /* 08DF04 8008D304 01763021 */ addu $a2, $t3, $s6 /* 08DF08 8008D308 AFAC0010 */ sw $t4, 0x10($sp) /* 08DF0C 8008D30C 02A03825 */ move $a3, $s5 -/* 08DF10 8008D310 0C031110 */ jal func_800C4440 +/* 08DF10 8008D310 0C031110 */ jal draw_text /* 08DF14 8008D314 03282821 */ addu $a1, $t9, $t0 .L8008D318: /* 08DF18 8008D318 26730001 */ addiu $s3, $s3, 1 /* 08DF1C 8008D31C 24010003 */ li $at, 3 /* 08DF20 8008D320 1661FF90 */ bne $s3, $at, .L8008D164 /* 08DF24 8008D324 00000000 */ nop -/* 08DF28 8008D328 0C0310BB */ jal func_800C42EC +/* 08DF28 8008D328 0C0310BB */ jal set_text_font /* 08DF2C 8008D32C 24040002 */ li $a0, 2 /* 08DF30 8008D330 240D0080 */ li $t5, 128 /* 08DF34 8008D334 AFAD0010 */ sw $t5, 0x10($sp) /* 08DF38 8008D338 00002025 */ move $a0, $zero /* 08DF3C 8008D33C 00002825 */ move $a1, $zero /* 08DF40 8008D340 00003025 */ move $a2, $zero -/* 08DF44 8008D344 0C0310E1 */ jal func_800C4384 +/* 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) @@ -404,14 +404,14 @@ glabel func_8008CD74 /* 08DF5C 8008D35C AFAF0010 */ sw $t7, 0x10($sp) /* 08DF60 8008D360 02E02025 */ move $a0, $s7 /* 08DF64 8008D364 240500A1 */ li $a1, 161 -/* 08DF68 8008D368 0C031110 */ jal func_800C4440 +/* 08DF68 8008D368 0C031110 */ jal draw_text /* 08DF6C 8008D36C 24060013 */ li $a2, 19 /* 08DF70 8008D370 241800FF */ li $t8, 255 /* 08DF74 8008D374 AFB80010 */ sw $t8, 0x10($sp) /* 08DF78 8008D378 240400FF */ li $a0, 255 /* 08DF7C 8008D37C 240500FF */ li $a1, 255 /* 08DF80 8008D380 240600FF */ li $a2, 255 -/* 08DF84 8008D384 0C0310E1 */ jal func_800C4384 +/* 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) @@ -420,14 +420,14 @@ glabel func_8008CD74 /* 08DF9C 8008D39C AFA80010 */ sw $t0, 0x10($sp) /* 08DFA0 8008D3A0 02E02025 */ move $a0, $s7 /* 08DFA4 8008D3A4 240500A0 */ li $a1, 160 -/* 08DFA8 8008D3A8 0C031110 */ jal func_800C4440 +/* 08DFA8 8008D3A8 0C031110 */ jal draw_text /* 08DFAC 8008D3AC 24060010 */ li $a2, 16 /* 08DFB0 8008D3B0 240900FF */ li $t1, 255 /* 08DFB4 8008D3B4 AFA90010 */ sw $t1, 0x10($sp) /* 08DFB8 8008D3B8 240400FF */ li $a0, 255 /* 08DFBC 8008D3BC 240500FF */ li $a1, 255 /* 08DFC0 8008D3C0 240600FF */ li $a2, 255 -/* 08DFC4 8008D3C4 0C0310E1 */ jal func_800C4384 +/* 08DFC4 8008D3C4 0C0310E1 */ jal set_text_color /* 08DFC8 8008D3C8 00003825 */ move $a3, $zero /* 08DFCC 8008D3CC 3C0A8012 */ lui $t2, %hi(D_80126484) # $t2, 0x8012 /* 08DFD0 8008D3D0 8D4A6484 */ lw $t2, %lo(D_80126484)($t2) @@ -439,7 +439,7 @@ glabel func_8008CD74 /* 08DFE8 8008D3E8 24010001 */ li $at, 1 /* 08DFEC 8008D3EC 1440000E */ bnez $v0, .L8008D428 /* 08DFF0 8008D3F0 00000000 */ nop -/* 08DFF4 8008D3F4 0C0310BB */ jal func_800C42EC +/* 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) @@ -448,14 +448,14 @@ glabel func_8008CD74 /* 08E00C 8008D40C AFAC0010 */ sw $t4, 0x10($sp) /* 08E010 8008D410 02E02025 */ move $a0, $s7 /* 08E014 8008D414 240500A0 */ li $a1, 160 -/* 08E018 8008D418 0C031110 */ jal func_800C4440 +/* 08E018 8008D418 0C031110 */ jal draw_text /* 08E01C 8008D41C 02C03025 */ move $a2, $s6 /* 08E020 8008D420 1000006B */ b .L8008D5D0 /* 08E024 8008D424 8FBF0054 */ lw $ra, 0x54($sp) .L8008D428: /* 08E028 8008D428 1441000E */ bne $v0, $at, .L8008D464 /* 08E02C 8008D42C 02E02025 */ move $a0, $s7 -/* 08E030 8008D430 0C0310BB */ jal func_800C42EC +/* 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) @@ -464,7 +464,7 @@ glabel func_8008CD74 /* 08E048 8008D448 AFAE0010 */ sw $t6, 0x10($sp) /* 08E04C 8008D44C 02E02025 */ move $a0, $s7 /* 08E050 8008D450 240500A0 */ li $a1, 160 -/* 08E054 8008D454 0C031110 */ jal func_800C4440 +/* 08E054 8008D454 0C031110 */ jal draw_text /* 08E058 8008D458 02C03025 */ move $a2, $s6 /* 08E05C 8008D45C 1000005C */ b .L8008D5D0 /* 08E060 8008D460 8FBF0054 */ lw $ra, 0x54($sp) @@ -474,7 +474,7 @@ glabel func_8008CD74 /* 08E06C 8008D46C AFAF0010 */ sw $t7, 0x10($sp) /* 08E070 8008D470 24E78234 */ addiu $a3, %lo(D_800E8234) # addiu $a3, $a3, -0x7dcc /* 08E074 8008D474 240500A0 */ li $a1, 160 -/* 08E078 8008D478 0C031110 */ jal func_800C4440 +/* 08E078 8008D478 0C031110 */ jal draw_text /* 08E07C 8008D47C 02C03025 */ move $a2, $s6 /* 08E080 8008D480 10000053 */ b .L8008D5D0 /* 08E084 8008D484 8FBF0054 */ lw $ra, 0x54($sp) @@ -487,7 +487,7 @@ glabel func_8008CD74 /* 08E09C 8008D49C 02E02025 */ move $a0, $s7 /* 08E0A0 8008D4A0 1720000E */ bnez $t9, .L8008D4DC /* 08E0A4 8008D4A4 240500A0 */ li $a1, 160 -/* 08E0A8 8008D4A8 0C0310BB */ jal func_800C42EC +/* 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) @@ -496,7 +496,7 @@ glabel func_8008CD74 /* 08E0C0 8008D4C0 AFA90010 */ sw $t1, 0x10($sp) /* 08E0C4 8008D4C4 02E02025 */ move $a0, $s7 /* 08E0C8 8008D4C8 240500A0 */ li $a1, 160 -/* 08E0CC 8008D4CC 0C031110 */ jal func_800C4440 +/* 08E0CC 8008D4CC 0C031110 */ jal draw_text /* 08E0D0 8008D4D0 02C03025 */ move $a2, $s6 /* 08E0D4 8008D4D4 1000003E */ b .L8008D5D0 /* 08E0D8 8008D4D8 8FBF0054 */ lw $ra, 0x54($sp) @@ -505,7 +505,7 @@ glabel func_8008CD74 /* 08E0E0 8008D4E0 240A000C */ li $t2, 12 /* 08E0E4 8008D4E4 AFAA0010 */ sw $t2, 0x10($sp) /* 08E0E8 8008D4E8 24E78238 */ addiu $a3, %lo(D_800E8238) # addiu $a3, $a3, -0x7dc8 -/* 08E0EC 8008D4EC 0C031110 */ jal func_800C4440 +/* 08E0EC 8008D4EC 0C031110 */ jal draw_text /* 08E0F0 8008D4F0 02C03025 */ move $a2, $s6 /* 08E0F4 8008D4F4 10000036 */ b .L8008D5D0 /* 08E0F8 8008D4F8 8FBF0054 */ lw $ra, 0x54($sp) @@ -522,7 +522,7 @@ glabel func_8008CD74 /* 08E120 8008D520 240D00FF */ li $t5, 255 /* 08E124 8008D524 AFAD0010 */ sw $t5, 0x10($sp) /* 08E128 8008D528 240500FF */ li $a1, 255 -/* 08E12C 8008D52C 0C0310E1 */ jal func_800C4384 +/* 08E12C 8008D52C 0C0310E1 */ jal set_text_color /* 08E130 8008D530 240600FF */ li $a2, 255 .L8008D534: /* 08E134 8008D534 3C0E800E */ lui $t6, %hi(D_800DF4A0) # $t6, 0x800e @@ -532,7 +532,7 @@ glabel func_8008CD74 /* 08E144 8008D544 AFAF0010 */ sw $t7, 0x10($sp) /* 08E148 8008D548 02E02025 */ move $a0, $s7 /* 08E14C 8008D54C 2405005A */ li $a1, 90 -/* 08E150 8008D550 0C031110 */ jal func_800C4440 +/* 08E150 8008D550 0C031110 */ jal draw_text /* 08E154 8008D554 02C03025 */ move $a2, $s6 /* 08E158 8008D558 3C188012 */ lui $t8, %hi(D_801263E0) # $t8, 0x8012 /* 08E15C 8008D55C 8F1863E0 */ lw $t8, %lo(D_801263E0)($t8) @@ -544,7 +544,7 @@ glabel func_8008CD74 /* 08E174 8008D574 AFB90010 */ sw $t9, 0x10($sp) /* 08E178 8008D578 240400FF */ li $a0, 255 /* 08E17C 8008D57C 240500FF */ li $a1, 255 -/* 08E180 8008D580 0C0310E1 */ jal func_800C4384 +/* 08E180 8008D580 0C0310E1 */ jal set_text_color /* 08E184 8008D584 240600FF */ li $a2, 255 /* 08E188 8008D588 10000007 */ b .L8008D5A8 /* 08E18C 8008D58C 00000000 */ nop @@ -553,7 +553,7 @@ glabel func_8008CD74 /* 08E194 8008D594 AFA80010 */ sw $t0, 0x10($sp) /* 08E198 8008D598 240500FF */ li $a1, 255 /* 08E19C 8008D59C 240600FF */ li $a2, 255 -/* 08E1A0 8008D5A0 0C0310E1 */ jal func_800C4384 +/* 08E1A0 8008D5A0 0C0310E1 */ jal set_text_color /* 08E1A4 8008D5A4 00003825 */ move $a3, $zero .L8008D5A8: /* 08E1A8 8008D5A8 3C09800E */ lui $t1, %hi(D_800DF4A0) # $t1, 0x800e @@ -563,7 +563,7 @@ glabel func_8008CD74 /* 08E1B8 8008D5B8 AFAA0010 */ sw $t2, 0x10($sp) /* 08E1BC 8008D5BC 02E02025 */ move $a0, $s7 /* 08E1C0 8008D5C0 240500E6 */ li $a1, 230 -/* 08E1C4 8008D5C4 0C031110 */ jal func_800C4440 +/* 08E1C4 8008D5C4 0C031110 */ jal draw_text /* 08E1C8 8008D5C8 02C03025 */ move $a2, $s6 /* 08E1CC 8008D5CC 8FBF0054 */ lw $ra, 0x54($sp) .L8008D5D0: diff --git a/asm/non_matchings/menu/func_8008F00C.s b/asm/non_matchings/menu/func_8008F00C.s index 23eb4373..22ca05ba 100644 --- a/asm/non_matchings/menu/func_8008F00C.s +++ b/asm/non_matchings/menu/func_8008F00C.s @@ -48,8 +48,8 @@ glabel func_8008F00C /* 08FCB8 8008F0B8 3C048012 */ lui $a0, %hi(D_801269C4) # $a0, 0x8012 /* 08FCBC 8008F0BC 18C0000B */ blez $a2, .L8008F0EC /* 08FCC0 8008F0C0 24180001 */ li $t8, 1 -/* 08FCC4 8008F0C4 3C0F8012 */ lui $t7, %hi(gPlayerVehicle) # $t7, 0x8012 -/* 08FCC8 8008F0C8 25E369C0 */ addiu $v1, $t7, %lo(gPlayerVehicle) +/* 08FCC4 8008F0C4 3C0F8012 */ lui $t7, %hi(gPlayerSelectVehicle) # $t7, 0x8012 +/* 08FCC8 8008F0C8 25E369C0 */ addiu $v1, $t7, %lo(gPlayerSelectVehicle) /* 08FCCC 8008F0CC 00C32821 */ addu $a1, $a2, $v1 /* 08FCD0 8008F0D0 248469C4 */ addiu $a0, %lo(D_801269C4) # addiu $a0, $a0, 0x69c4 .L8008F0D4: diff --git a/asm/non_matchings/menu/func_8008FA54.s b/asm/non_matchings/menu/func_8008FA54.s index 17603d31..1bc3d5e4 100644 --- a/asm/non_matchings/menu/func_8008FA54.s +++ b/asm/non_matchings/menu/func_8008FA54.s @@ -29,12 +29,12 @@ glabel func_8008FA54 /* 0906A4 8008FAA4 2402000C */ li $v0, 12 .L8008FAA8: /* 0906A8 8008FAA8 24040002 */ li $a0, 2 -/* 0906AC 8008FAAC 0C0310BB */ jal func_800C42EC +/* 0906AC 8008FAAC 0C0310BB */ jal set_text_font /* 0906B0 8008FAB0 AFA2006C */ sw $v0, 0x6c($sp) /* 0906B4 8008FAB4 00002025 */ move $a0, $zero /* 0906B8 8008FAB8 00002825 */ move $a1, $zero /* 0906BC 8008FABC 00003025 */ move $a2, $zero -/* 0906C0 8008FAC0 0C0310F3 */ jal func_800C43CC +/* 0906C0 8008FAC0 0C0310F3 */ jal set_text_background_color /* 0906C4 8008FAC4 00003825 */ move $a3, $zero /* 0906C8 8008FAC8 3C02800E */ lui $v0, %hi(D_800DF47C) # $v0, 0x800e /* 0906CC 8008FACC 8C42F47C */ lw $v0, %lo(D_800DF47C)($v0) @@ -71,7 +71,7 @@ glabel func_8008FA54 /* 090740 8008FB40 26210001 */ addiu $at, $s1, 1 /* 090744 8008FB44 00015043 */ sra $t2, $at, 1 .L8008FB48: -/* 090748 8008FB48 0C0310E1 */ jal func_800C4384 +/* 090748 8008FB48 0C0310E1 */ jal set_text_color /* 09074C 8008FB4C AFAA0010 */ sw $t2, 0x10($sp) /* 090750 8008FB50 8FAB006C */ lw $t3, 0x6c($sp) /* 090754 8008FB54 3C138012 */ lui $s3, %hi(D_801263A0) # $s3, 0x8012 @@ -82,20 +82,20 @@ glabel func_8008FA54 /* 090768 8008FB68 AFAC0010 */ sw $t4, 0x10($sp) /* 09076C 8008FB6C 02602025 */ move $a0, $s3 /* 090770 8008FB70 240500A1 */ li $a1, 161 -/* 090774 8008FB74 0C031110 */ jal func_800C4440 +/* 090774 8008FB74 0C031110 */ jal draw_text /* 090778 8008FB78 02403825 */ move $a3, $s2 /* 09077C 8008FB7C 240400FF */ li $a0, 255 /* 090780 8008FB80 240500FF */ li $a1, 255 /* 090784 8008FB84 240600FF */ li $a2, 255 /* 090788 8008FB88 00003825 */ move $a3, $zero -/* 09078C 8008FB8C 0C0310E1 */ jal func_800C4384 +/* 09078C 8008FB8C 0C0310E1 */ jal set_text_color /* 090790 8008FB90 AFB10010 */ sw $s1, 0x10($sp) /* 090794 8008FB94 240D000C */ li $t5, 12 /* 090798 8008FB98 AFAD0010 */ sw $t5, 0x10($sp) /* 09079C 8008FB9C 02602025 */ move $a0, $s3 /* 0907A0 8008FBA0 240500A0 */ li $a1, 160 /* 0907A4 8008FBA4 2606FFA8 */ addiu $a2, $s0, -0x58 -/* 0907A8 8008FBA8 0C031110 */ jal func_800C4440 +/* 0907A8 8008FBA8 0C031110 */ jal draw_text /* 0907AC 8008FBAC 02403825 */ move $a3, $s2 /* 0907B0 8008FBB0 3C018012 */ lui $at, %hi(D_801269F0) # $at, 0x8012 /* 0907B4 8008FBB4 AC3269F0 */ sw $s2, %lo(D_801269F0)($at) @@ -108,7 +108,7 @@ glabel func_8008FA54 /* 0907CC 8008FBCC 240500FF */ li $a1, 255 /* 0907D0 8008FBD0 240600FF */ li $a2, 255 /* 0907D4 8008FBD4 00003825 */ move $a3, $zero -/* 0907D8 8008FBD8 0C0310E1 */ jal func_800C4384 +/* 0907D8 8008FBD8 0C0310E1 */ jal set_text_color /* 0907DC 8008FBDC AFB10010 */ sw $s1, 0x10($sp) /* 0907E0 8008FBE0 8FAE006C */ lw $t6, 0x6c($sp) /* 0907E4 8008FBE4 8FA7008C */ lw $a3, 0x8c($sp) @@ -117,7 +117,7 @@ glabel func_8008FA54 /* 0907F0 8008FBF0 24C60058 */ addiu $a2, $a2, 0x58 /* 0907F4 8008FBF4 AFAF0010 */ sw $t7, 0x10($sp) /* 0907F8 8008FBF8 02602025 */ move $a0, $s3 -/* 0907FC 8008FBFC 0C031110 */ jal func_800C4440 +/* 0907FC 8008FBFC 0C031110 */ jal draw_text /* 090800 8008FC00 02802825 */ move $a1, $s4 /* 090804 8008FC04 8FB00090 */ lw $s0, 0x90($sp) /* 090808 8008FC08 3C028012 */ lui $v0, %hi(D_80126480) # $v0, 0x8012 diff --git a/asm/non_matchings/menu/func_8008FF1C.s b/asm/non_matchings/menu/func_8008FF1C.s index 72129030..e5f84456 100644 --- a/asm/non_matchings/menu/func_8008FF1C.s +++ b/asm/non_matchings/menu/func_8008FF1C.s @@ -335,11 +335,11 @@ glabel func_8008FF1C /* 091000 80090400 3C018012 */ lui $at, %hi(D_801269F0) # $at, 0x8012 /* 091004 80090404 3C108012 */ lui $s0, %hi(D_80126930) # $s0, 0x8012 /* 091008 80090408 3C14800E */ lui $s4, %hi(D_800E05F4) # $s4, 0x800e -/* 09100C 8009040C 3C138012 */ lui $s3, %hi(gPlayerVehicle) # $s3, 0x8012 +/* 09100C 8009040C 3C138012 */ lui $s3, %hi(gPlayerSelectVehicle) # $s3, 0x8012 /* 091010 80090410 3C12800E */ lui $s2, %hi(D_800E05D4) # $s2, 0x800e /* 091014 80090414 AC2069F0 */ sw $zero, %lo(D_801269F0)($at) /* 091018 80090418 265205D4 */ addiu $s2, %lo(D_800E05D4) # addiu $s2, $s2, 0x5d4 -/* 09101C 8009041C 267369C0 */ addiu $s3, %lo(gPlayerVehicle) # addiu $s3, $s3, 0x69c0 +/* 09101C 8009041C 267369C0 */ addiu $s3, %lo(gPlayerSelectVehicle) # addiu $s3, $s3, 0x69c0 /* 091020 80090420 269405F4 */ addiu $s4, %lo(D_800E05F4) # addiu $s4, $s4, 0x5f4 /* 091024 80090424 26106930 */ addiu $s0, %lo(D_80126930) # addiu $s0, $s0, 0x6930 /* 091028 80090428 AFA0007C */ sw $zero, 0x7c($sp) diff --git a/asm/non_matchings/menu/func_80090F30.s b/asm/non_matchings/menu/func_80090F30.s index ab55b1b9..997673c0 100644 --- a/asm/non_matchings/menu/func_80090F30.s +++ b/asm/non_matchings/menu/func_80090F30.s @@ -137,19 +137,19 @@ glabel func_80090F30 /* 091D10 80091110 0C01AF77 */ jal func_8006BDDC /* 091D14 80091114 AFA2007C */ sw $v0, 0x7c($sp) /* 091D18 80091118 00408025 */ move $s0, $v0 -/* 091D1C 8009111C 0C0310BB */ jal func_800C42EC +/* 091D1C 8009111C 0C0310BB */ jal set_text_font /* 091D20 80091120 24040002 */ li $a0, 2 /* 091D24 80091124 8FCB0000 */ lw $t3, ($fp) /* 091D28 80091128 240400C0 */ li $a0, 192 /* 091D2C 8009112C 240500C0 */ li $a1, 192 /* 091D30 80091130 240600FF */ li $a2, 255 /* 091D34 80091134 00003825 */ move $a3, $zero -/* 091D38 80091138 0C0310E1 */ jal func_800C4384 +/* 091D38 80091138 0C0310E1 */ jal set_text_color /* 091D3C 8009113C AFAB0010 */ sw $t3, 0x10($sp) /* 091D40 80091140 00002025 */ move $a0, $zero /* 091D44 80091144 00002825 */ move $a1, $zero /* 091D48 80091148 00003025 */ move $a2, $zero -/* 091D4C 8009114C 0C0310F3 */ jal func_800C43CC +/* 091D4C 8009114C 0C0310F3 */ jal set_text_background_color /* 091D50 80091150 00003825 */ move $a3, $zero /* 091D54 80091154 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012 /* 091D58 80091158 240C000C */ li $t4, 12 @@ -157,7 +157,7 @@ glabel func_80090F30 /* 091D60 80091160 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0 /* 091D64 80091164 24058000 */ li $a1, -32768 /* 091D68 80091168 2406002B */ li $a2, 43 -/* 091D6C 8009116C 0C031110 */ jal func_800C4440 +/* 091D6C 8009116C 0C031110 */ jal draw_text /* 091D70 80091170 02003825 */ move $a3, $s0 /* 091D74 80091174 3C068012 */ lui $a2, %hi(D_801263BC) # $a2, 0x8012 /* 091D78 80091178 8CC663BC */ lw $a2, %lo(D_801263BC)($a2) @@ -242,7 +242,7 @@ glabel func_80090F30 /* 091EA0 800912A0 AFAD0018 */ sw $t5, 0x18($sp) /* 091EA4 800912A4 0C02039B */ jal func_80080E6C /* 091EA8 800912A8 00000000 */ nop -/* 091EAC 800912AC 0C0310BB */ jal func_800C42EC +/* 091EAC 800912AC 0C0310BB */ jal set_text_font /* 091EB0 800912B0 00002025 */ move $a0, $zero /* 091EB4 800912B4 8619000E */ lh $t9, 0xe($s0) /* 091EB8 800912B8 86080002 */ lh $t0, 2($s0) @@ -267,7 +267,7 @@ glabel func_80090F30 /* 091EFC 800912FC AFAC0010 */ sw $t4, 0x10($sp) /* 091F00 80091300 00002825 */ move $a1, $zero /* 091F04 80091304 00003025 */ move $a2, $zero -/* 091F08 80091308 0C0310E1 */ jal func_800C4384 +/* 091F08 80091308 0C0310E1 */ jal set_text_color /* 091F0C 8009130C 240700FF */ li $a3, 255 /* 091F10 80091310 1000000C */ b .L80091344 /* 091F14 80091314 00000000 */ nop @@ -282,7 +282,7 @@ glabel func_80090F30 /* 091F30 80091330 8FCE0000 */ lw $t6, ($fp) /* 091F34 80091334 240600FF */ li $a2, 255 /* 091F38 80091338 02A03825 */ move $a3, $s5 -/* 091F3C 8009133C 0C0310E1 */ jal func_800C4384 +/* 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 @@ -294,7 +294,7 @@ glabel func_80090F30 /* 091F5C 8009135C AFB90010 */ sw $t9, 0x10($sp) /* 091F60 80091360 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0 /* 091F64 80091364 02532823 */ subu $a1, $s2, $s3 -/* 091F68 80091368 0C031110 */ jal func_800C4440 +/* 091F68 80091368 0C031110 */ jal draw_text /* 091F6C 8009136C 02003025 */ move $a2, $s0 /* 091F70 80091370 26730002 */ addiu $s3, $s3, 2 /* 091F74 80091374 24010004 */ li $at, 4 @@ -312,14 +312,14 @@ glabel func_80090F30 /* 091FA0 800913A0 29010004 */ slti $at, $t0, 4 /* 091FA4 800913A4 102002D8 */ beqz $at, .L80091F08 /* 091FA8 800913A8 00000000 */ nop -/* 091FAC 800913AC 0C0310BB */ jal func_800C42EC +/* 091FAC 800913AC 0C0310BB */ jal set_text_font /* 091FB0 800913B0 00002025 */ move $a0, $zero /* 091FB4 800913B4 8FCA0000 */ lw $t2, ($fp) /* 091FB8 800913B8 240400FF */ li $a0, 255 /* 091FBC 800913BC 24050040 */ li $a1, 64 /* 091FC0 800913C0 24060040 */ li $a2, 64 /* 091FC4 800913C4 24070060 */ li $a3, 96 -/* 091FC8 800913C8 0C0310E1 */ jal func_800C4384 +/* 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) @@ -331,7 +331,7 @@ glabel func_80090F30 /* 091FEC 800913EC 02003025 */ move $a2, $s0 /* 091FF0 800913F0 AFAB0010 */ sw $t3, 0x10($sp) /* 091FF4 800913F4 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0 -/* 091FF8 800913F8 0C031110 */ jal func_800C4440 +/* 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) @@ -343,17 +343,17 @@ glabel func_80090F30 /* 09201C 8009141C 02403025 */ move $a2, $s2 /* 092020 80091420 AFAD0010 */ sw $t5, 0x10($sp) /* 092024 80091424 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0 -/* 092028 80091428 0C031110 */ jal func_800C4440 +/* 092028 80091428 0C031110 */ jal draw_text /* 09202C 8009142C 24050038 */ li $a1, 56 /* 092030 80091430 8FCE0000 */ lw $t6, ($fp) /* 092034 80091434 240400FF */ li $a0, 255 /* 092038 80091438 24050080 */ li $a1, 128 /* 09203C 8009143C 240600FF */ li $a2, 255 /* 092040 80091440 24070060 */ li $a3, 96 -/* 092044 80091444 0C0310E1 */ jal func_800C4384 +/* 092044 80091444 0C0310E1 */ jal set_text_color /* 092048 80091448 AFAE0010 */ sw $t6, 0x10($sp) -/* 09204C 8009144C 3C188012 */ lui $t8, %hi(gPlayerVehicle) # $t8, 0x8012 -/* 092050 80091450 831869C0 */ lb $t8, %lo(gPlayerVehicle)($t8) +/* 09204C 8009144C 3C188012 */ lui $t8, %hi(gPlayerSelectVehicle) # $t8, 0x8012 +/* 092050 80091450 831869C0 */ lb $t8, %lo(gPlayerSelectVehicle)($t8) /* 092054 80091454 8FAF0070 */ lw $t7, 0x70($sp) /* 092058 80091458 3C09800E */ lui $t1, %hi(D_800DF4C4) # $t1, 0x800e /* 09205C 8009145C 0018C880 */ sll $t9, $t8, 2 @@ -365,7 +365,7 @@ glabel func_80090F30 /* 092074 80091474 27B10078 */ addiu $s1, $sp, 0x78 /* 092078 80091478 95840000 */ lhu $a0, ($t4) /* 09207C 8009147C 02202825 */ move $a1, $s1 -/* 092080 80091480 0C025DBE */ jal func_800976F8 +/* 092080 80091480 0C025DBE */ jal decompress_filename_string /* 092084 80091484 24060003 */ li $a2, 3 /* 092088 80091488 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012 /* 09208C 8009148C 240D000C */ li $t5, 12 @@ -373,10 +373,10 @@ glabel func_80090F30 /* 092094 80091494 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0 /* 092098 80091498 240500FA */ li $a1, 250 /* 09209C 8009149C 02003025 */ move $a2, $s0 -/* 0920A0 800914A0 0C031110 */ jal func_800C4440 +/* 0920A0 800914A0 0C031110 */ jal draw_text /* 0920A4 800914A4 02203825 */ move $a3, $s1 -/* 0920A8 800914A8 3C188012 */ lui $t8, %hi(gPlayerVehicle) # $t8, 0x8012 -/* 0920AC 800914AC 831869C0 */ lb $t8, %lo(gPlayerVehicle)($t8) +/* 0920A8 800914A8 3C188012 */ lui $t8, %hi(gPlayerSelectVehicle) # $t8, 0x8012 +/* 0920AC 800914AC 831869C0 */ lb $t8, %lo(gPlayerSelectVehicle)($t8) /* 0920B0 800914B0 8FAE0070 */ lw $t6, 0x70($sp) /* 0920B4 800914B4 3C09800E */ lui $t1, %hi(D_800DF4C4) # $t1, 0x800e /* 0920B8 800914B8 00187880 */ sll $t7, $t8, 2 @@ -387,7 +387,7 @@ glabel func_80090F30 /* 0920CC 800914CC 010A5821 */ addu $t3, $t0, $t2 /* 0920D0 800914D0 95640000 */ lhu $a0, ($t3) /* 0920D4 800914D4 02202825 */ move $a1, $s1 -/* 0920D8 800914D8 0C025DBE */ jal func_800976F8 +/* 0920D8 800914D8 0C025DBE */ jal decompress_filename_string /* 0920DC 800914DC 24060003 */ li $a2, 3 /* 0920E0 800914E0 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012 /* 0920E4 800914E4 240C000C */ li $t4, 12 @@ -395,10 +395,10 @@ glabel func_80090F30 /* 0920EC 800914EC 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0 /* 0920F0 800914F0 240500FA */ li $a1, 250 /* 0920F4 800914F4 02403025 */ move $a2, $s2 -/* 0920F8 800914F8 0C031110 */ jal func_800C4440 +/* 0920F8 800914F8 0C031110 */ jal draw_text /* 0920FC 800914FC 02203825 */ move $a3, $s1 -/* 092100 80091500 3C188012 */ lui $t8, %hi(gPlayerVehicle) # $t8, 0x8012 -/* 092104 80091504 831869C0 */ lb $t8, %lo(gPlayerVehicle)($t8) +/* 092100 80091500 3C188012 */ lui $t8, %hi(gPlayerSelectVehicle) # $t8, 0x8012 +/* 092104 80091504 831869C0 */ lb $t8, %lo(gPlayerSelectVehicle)($t8) /* 092108 80091508 8FAD0070 */ lw $t5, 0x70($sp) /* 09210C 8009150C 3C09800E */ lui $t1, %hi(D_800DF4C4) # $t1, 0x800e /* 092110 80091510 00187080 */ sll $t6, $t8, 2 @@ -417,8 +417,8 @@ glabel func_80090F30 /* 092144 80091544 24060035 */ li $a2, 53 /* 092148 80091548 0C020600 */ jal func_80081800 /* 09214C 8009154C 24070080 */ li $a3, 128 -/* 092150 80091550 3C0D8012 */ lui $t5, %hi(gPlayerVehicle) # $t5, 0x8012 -/* 092154 80091554 81AD69C0 */ lb $t5, %lo(gPlayerVehicle)($t5) +/* 092150 80091550 3C0D8012 */ lui $t5, %hi(gPlayerSelectVehicle) # $t5, 0x8012 +/* 092154 80091554 81AD69C0 */ lb $t5, %lo(gPlayerSelectVehicle)($t5) /* 092158 80091558 8FB80070 */ lw $t8, 0x70($sp) /* 09215C 8009155C 3C19800E */ lui $t9, %hi(D_800DF4C4) # $t9, 0x800e /* 092160 80091560 000D7080 */ sll $t6, $t5, 2 @@ -664,10 +664,10 @@ glabel func_80090F30 /* 0924E8 800918E8 258C06B0 */ addiu $t4, %lo(D_800E06B0) # addiu $t4, $t4, 0x6b0 /* 0924EC 800918EC 254A0624 */ addiu $t2, %lo(D_800E0624) # addiu $t2, $t2, 0x624 /* 0924F0 800918F0 00094080 */ sll $t0, $t1, 2 -/* 0924F4 800918F4 3C118012 */ lui $s1, %hi(gPlayerVehicle) # $s1, 0x8012 +/* 0924F4 800918F4 3C118012 */ lui $s1, %hi(gPlayerSelectVehicle) # $s1, 0x8012 /* 0924F8 800918F8 00135840 */ sll $t3, $s3, 1 /* 0924FC 800918FC 016C8021 */ addu $s0, $t3, $t4 -/* 092500 80091900 263169C0 */ addiu $s1, %lo(gPlayerVehicle) # addiu $s1, $s1, 0x69c0 +/* 092500 80091900 263169C0 */ addiu $s1, %lo(gPlayerSelectVehicle) # addiu $s1, $s1, 0x69c0 /* 092504 80091904 010A9021 */ addu $s2, $t0, $t2 .L80091908: /* 092508 80091908 822D0000 */ lb $t5, ($s1) @@ -750,8 +750,8 @@ glabel func_80090F30 /* 092624 80091A24 8FAF007C */ lw $t7, 0x7c($sp) /* 092628 80091A28 8FB00080 */ lw $s0, 0x80($sp) .L80091A2C: -/* 09262C 80091A2C 3C038012 */ lui $v1, %hi(gPlayerVehicle) # $v1, 0x8012 -/* 092630 80091A30 806369C0 */ lb $v1, %lo(gPlayerVehicle)($v1) +/* 09262C 80091A2C 3C038012 */ lui $v1, %hi(gPlayerSelectVehicle) # $v1, 0x8012 +/* 092630 80091A30 806369C0 */ lb $v1, %lo(gPlayerSelectVehicle)($v1) /* 092634 80091A34 24010002 */ li $at, 2 /* 092638 80091A38 2610008B */ addiu $s0, $s0, 0x8b /* 09263C 80091A3C 24160003 */ li $s6, 3 @@ -821,10 +821,10 @@ glabel func_80090F30 /* 092730 80091B30 14410031 */ bne $v0, $at, .L80091BF8 /* 092734 80091B34 26310624 */ addiu $s1, %lo(D_800E0624) # addiu $s1, $s1, 0x624 /* 092738 80091B38 8FAA0074 */ lw $t2, 0x74($sp) -/* 09273C 80091B3C 3C088012 */ lui $t0, %hi(gPlayerVehicle) # $t0, 0x8012 +/* 09273C 80091B3C 3C088012 */ lui $t0, %hi(gPlayerSelectVehicle) # $t0, 0x8012 /* 092740 80091B40 1540002D */ bnez $t2, .L80091BF8 /* 092744 80091B44 00000000 */ nop -/* 092748 80091B48 810869C0 */ lb $t0, %lo(gPlayerVehicle)($t0) +/* 092748 80091B48 810869C0 */ lb $t0, %lo(gPlayerSelectVehicle)($t0) /* 09274C 80091B4C 8FD90000 */ lw $t9, ($fp) /* 092750 80091B50 01160019 */ multu $t0, $s6 /* 092754 80091B54 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012 @@ -844,8 +844,8 @@ glabel func_80090F30 /* 09278C 80091B8C AFB80010 */ sw $t8, 0x10($sp) /* 092790 80091B90 0C01E2AE */ jal func_80078AB8 /* 092794 80091B94 AFB9001C */ sw $t9, 0x1c($sp) -/* 092798 80091B98 3C028012 */ lui $v0, %hi(gPlayerVehicle+1) # $v0, 0x8012 -/* 09279C 80091B9C 804269C1 */ lb $v0, %lo(gPlayerVehicle+1)($v0) +/* 092798 80091B98 3C028012 */ lui $v0, %hi(gPlayerSelectVehicle+1) # $v0, 0x8012 +/* 09279C 80091B9C 804269C1 */ lb $v0, %lo(gPlayerSelectVehicle+1)($v0) /* 0927A0 80091BA0 24010002 */ li $at, 2 /* 0927A4 80091BA4 14410002 */ bne $v0, $at, .L80091BB0 /* 0927A8 80091BA8 00000000 */ nop @@ -957,14 +957,14 @@ glabel func_80090F30 /* 092934 80091D34 AFAA0018 */ sw $t2, 0x18($sp) /* 092938 80091D38 0C02039B */ jal func_80080E6C /* 09293C 80091D3C 00000000 */ nop -/* 092940 80091D40 0C0310BB */ jal func_800C42EC +/* 092940 80091D40 0C0310BB */ jal set_text_font /* 092944 80091D44 00002025 */ move $a0, $zero /* 092948 80091D48 240C0080 */ li $t4, 128 /* 09294C 80091D4C AFAC0010 */ sw $t4, 0x10($sp) /* 092950 80091D50 00002025 */ move $a0, $zero /* 092954 80091D54 00002825 */ move $a1, $zero /* 092958 80091D58 00003025 */ move $a2, $zero -/* 09295C 80091D5C 0C0310E1 */ jal func_800C4384 +/* 09295C 80091D5C 0C0310E1 */ jal set_text_color /* 092960 80091D60 240700FF */ li $a3, 255 /* 092964 80091D64 864F000E */ lh $t7, 0xe($s2) /* 092968 80091D68 864E0002 */ lh $t6, 2($s2) @@ -982,14 +982,14 @@ glabel func_80090F30 /* 092998 80091D98 24C60001 */ addiu $a2, $a2, 1 /* 09299C 80091D9C 24A50001 */ addiu $a1, $a1, 1 /* 0929A0 80091DA0 AFA80010 */ sw $t0, 0x10($sp) -/* 0929A4 80091DA4 0C031110 */ jal func_800C4440 +/* 0929A4 80091DA4 0C031110 */ jal draw_text /* 0929A8 80091DA8 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0 /* 0929AC 80091DAC 240B00FF */ li $t3, 255 /* 0929B0 80091DB0 AFAB0010 */ sw $t3, 0x10($sp) /* 0929B4 80091DB4 240400FF */ li $a0, 255 /* 0929B8 80091DB8 240500FF */ li $a1, 255 /* 0929BC 80091DBC 240600FF */ li $a2, 255 -/* 0929C0 80091DC0 0C0310E1 */ jal func_800C4384 +/* 0929C0 80091DC0 0C0310E1 */ jal set_text_color /* 0929C4 80091DC4 00003825 */ move $a3, $zero /* 0929C8 80091DC8 8658000E */ lh $t8, 0xe($s2) /* 0929CC 80091DCC 864F0002 */ lh $t7, 2($s2) @@ -1007,7 +1007,7 @@ glabel func_80090F30 /* 0929FC 80091DFC 24C6FFFF */ addiu $a2, $a2, -1 /* 092A00 80091E00 24A5FFFF */ addiu $a1, $a1, -1 /* 092A04 80091E04 AFAA0010 */ sw $t2, 0x10($sp) -/* 092A08 80091E08 0C031110 */ jal func_800C4440 +/* 092A08 80091E08 0C031110 */ jal draw_text /* 092A0C 80091E0C 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0 /* 092A10 80091E10 0C01A142 */ jal func_80068508 /* 092A14 80091E14 24040001 */ li $a0, 1 @@ -1205,14 +1205,14 @@ glabel func_80090F30 /* 092CDC 800920DC 1441001D */ bne $v0, $at, .L80092154 /* 092CE0 800920E0 240C00FF */ li $t4, 255 .L800920E4: -/* 092CE4 800920E4 0C0310BB */ jal func_800C42EC +/* 092CE4 800920E4 0C0310BB */ jal set_text_font /* 092CE8 800920E8 24040002 */ li $a0, 2 /* 092CEC 800920EC 8FCA0000 */ lw $t2, ($fp) /* 092CF0 800920F0 240400FF */ li $a0, 255 /* 092CF4 800920F4 240500FF */ li $a1, 255 /* 092CF8 800920F8 240600FF */ li $a2, 255 /* 092CFC 800920FC 00003825 */ move $a3, $zero -/* 092D00 80092100 0C0310E1 */ jal func_800C4384 +/* 092D00 80092100 0C0310E1 */ jal set_text_color /* 092D04 80092104 AFAA0010 */ sw $t2, 0x10($sp) /* 092D08 80092108 3C088012 */ lui $t0, %hi(D_801269C8) # $t0, 0x8012 /* 092D0C 8009210C 8D0869C8 */ lw $t0, %lo(D_801269C8)($t0) @@ -1231,7 +1231,7 @@ glabel func_80090F30 /* 092D3C 8009213C AFAD0010 */ sw $t5, 0x10($sp) /* 092D40 80092140 24E7823C */ addiu $a3, %lo(D_800E823C) # addiu $a3, $a3, -0x7dc4 /* 092D44 80092144 240500A0 */ li $a1, 160 -/* 092D48 80092148 0C031110 */ jal func_800C4440 +/* 092D48 80092148 0C031110 */ jal draw_text /* 092D4C 8009214C 24C600AC */ addiu $a2, $a2, 0xac .L80092150: /* 092D50 80092150 240C00FF */ li $t4, 255 diff --git a/asm/non_matchings/menu/func_80092188.s b/asm/non_matchings/menu/func_80092188.s index 1fa5d86b..d2b6a55c 100644 --- a/asm/non_matchings/menu/func_80092188.s +++ b/asm/non_matchings/menu/func_80092188.s @@ -329,10 +329,10 @@ glabel L8009251C /* 093230 80092630 000FC080 */ sll $t8, $t7, 2 /* 093234 80092634 03387021 */ addu $t6, $t9, $t8 /* 093238 80092638 8DCF0000 */ lw $t7, ($t6) -/* 09323C 8009263C 3C188012 */ lui $t8, %hi(gPlayerVehicle) # $t8, 0x8012 +/* 09323C 8009263C 3C188012 */ lui $t8, %hi(gPlayerSelectVehicle) # $t8, 0x8012 /* 093240 80092640 31F90002 */ andi $t9, $t7, 2 /* 093244 80092644 13200027 */ beqz $t9, .L800926E4 -/* 093248 80092648 271869C0 */ addiu $t8, %lo(gPlayerVehicle) # addiu $t8, $t8, 0x69c0 +/* 093248 80092648 271869C0 */ addiu $t8, %lo(gPlayerSelectVehicle) # addiu $t8, $t8, 0x69c0 /* 09324C 8009264C 00057040 */ sll $t6, $a1, 1 /* 093250 80092650 3C068012 */ lui $a2, %hi(D_80126830) # $a2, 0x8012 /* 093254 80092654 00B81821 */ addu $v1, $a1, $t8 @@ -700,8 +700,8 @@ glabel L8009287C /* 093760 80092B60 0C000741 */ jal func_80001D04 /* 093764 80092B64 00002825 */ move $a1, $zero .L80092B68: -/* 093768 80092B68 3C048012 */ lui $a0, %hi(gPlayerVehicle) # $a0, 0x8012 -/* 09376C 80092B6C 808469C0 */ lb $a0, %lo(gPlayerVehicle)($a0) +/* 093768 80092B68 3C048012 */ lui $a0, %hi(gPlayerSelectVehicle) # $a0, 0x8012 +/* 09376C 80092B6C 808469C0 */ lb $a0, %lo(gPlayerSelectVehicle)($a0) /* 093770 80092B70 0C01B6C5 */ jal func_8006DB14 /* 093774 80092B74 00000000 */ nop /* 093778 80092B78 3C0E800E */ lui $t6, %hi(D_800DF4BC) # $t6, 0x800e diff --git a/asm/non_matchings/menu/func_80092E94.s b/asm/non_matchings/menu/func_80092E94.s index ce229fb0..67565c33 100644 --- a/asm/non_matchings/menu/func_80092E94.s +++ b/asm/non_matchings/menu/func_80092E94.s @@ -53,40 +53,40 @@ glabel func_80092E94 /* 093B5C 80092F5C 0C01AF77 */ jal func_8006BDDC /* 093B60 80092F60 AFA2005C */ sw $v0, 0x5c($sp) /* 093B64 80092F64 00408025 */ move $s0, $v0 -/* 093B68 80092F68 0C0310BB */ jal func_800C42EC +/* 093B68 80092F68 0C0310BB */ jal set_text_font /* 093B6C 80092F6C 24040002 */ li $a0, 2 /* 093B70 80092F70 00002025 */ move $a0, $zero /* 093B74 80092F74 00002825 */ move $a1, $zero /* 093B78 80092F78 00003025 */ move $a2, $zero -/* 093B7C 80092F7C 0C0310F3 */ jal func_800C43CC +/* 093B7C 80092F7C 0C0310F3 */ jal set_text_background_color /* 093B80 80092F80 00003825 */ move $a3, $zero /* 093B84 80092F84 240C0080 */ li $t4, 128 /* 093B88 80092F88 AFAC0010 */ sw $t4, 0x10($sp) /* 093B8C 80092F8C 00002025 */ move $a0, $zero /* 093B90 80092F90 00002825 */ move $a1, $zero /* 093B94 80092F94 00003025 */ move $a2, $zero -/* 093B98 80092F98 0C0310E1 */ jal func_800C4384 +/* 093B98 80092F98 0C0310E1 */ jal set_text_color /* 093B9C 80092F9C 240700FF */ li $a3, 255 /* 093BA0 80092FA0 240D000C */ li $t5, 12 /* 093BA4 80092FA4 AFAD0010 */ sw $t5, 0x10($sp) /* 093BA8 80092FA8 02402025 */ move $a0, $s2 /* 093BAC 80092FAC 240500A1 */ li $a1, 161 /* 093BB0 80092FB0 2406002E */ li $a2, 46 -/* 093BB4 80092FB4 0C031110 */ jal func_800C4440 +/* 093BB4 80092FB4 0C031110 */ jal draw_text /* 093BB8 80092FB8 02003825 */ move $a3, $s0 /* 093BBC 80092FBC 240E00FF */ li $t6, 255 /* 093BC0 80092FC0 AFAE0010 */ sw $t6, 0x10($sp) /* 093BC4 80092FC4 240400FF */ li $a0, 255 /* 093BC8 80092FC8 240500FF */ li $a1, 255 /* 093BCC 80092FCC 240600FF */ li $a2, 255 -/* 093BD0 80092FD0 0C0310E1 */ jal func_800C4384 +/* 093BD0 80092FD0 0C0310E1 */ jal set_text_color /* 093BD4 80092FD4 00003825 */ move $a3, $zero /* 093BD8 80092FD8 240F000C */ li $t7, 12 /* 093BDC 80092FDC AFAF0010 */ sw $t7, 0x10($sp) /* 093BE0 80092FE0 02402025 */ move $a0, $s2 /* 093BE4 80092FE4 240500A0 */ li $a1, 160 /* 093BE8 80092FE8 2406002B */ li $a2, 43 -/* 093BEC 80092FEC 0C031110 */ jal func_800C4440 +/* 093BEC 80092FEC 0C031110 */ jal draw_text /* 093BF0 80092FF0 02003825 */ move $a3, $s0 /* 093BF4 80092FF4 8FA40058 */ lw $a0, 0x58($sp) /* 093BF8 80092FF8 0C01AC53 */ jal func_8006B14C @@ -121,14 +121,14 @@ glabel func_80092E94 /* 093C6C 8009306C 0C01E2AE */ jal func_80078AB8 /* 093C70 80093070 24E7007A */ addiu $a3, $a3, 0x7a .L80093074: -/* 093C74 80093074 0C0310BB */ jal func_800C42EC +/* 093C74 80093074 0C0310BB */ jal set_text_font /* 093C78 80093078 00002025 */ move $a0, $zero /* 093C7C 8009307C 240B00FF */ li $t3, 255 /* 093C80 80093080 AFAB0010 */ sw $t3, 0x10($sp) /* 093C84 80093084 240400FF */ li $a0, 255 /* 093C88 80093088 24050040 */ li $a1, 64 /* 093C8C 8009308C 24060040 */ li $a2, 64 -/* 093C90 80093090 0C0310E1 */ jal func_800C4384 +/* 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) @@ -139,7 +139,7 @@ glabel func_80092E94 /* 093CB0 800930B0 02003025 */ move $a2, $s0 /* 093CB4 800930B4 AFAD0010 */ sw $t5, 0x10($sp) /* 093CB8 800930B8 02402025 */ move $a0, $s2 -/* 093CBC 800930BC 0C031110 */ jal func_800C4440 +/* 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) @@ -150,17 +150,17 @@ glabel func_80092E94 /* 093CDC 800930DC AFA60040 */ sw $a2, 0x40($sp) /* 093CE0 800930E0 AFAF0010 */ sw $t7, 0x10($sp) /* 093CE4 800930E4 02402025 */ move $a0, $s2 -/* 093CE8 800930E8 0C031110 */ jal func_800C4440 +/* 093CE8 800930E8 0C031110 */ jal draw_text /* 093CEC 800930EC 24050058 */ li $a1, 88 /* 093CF0 800930F0 241800FF */ li $t8, 255 /* 093CF4 800930F4 AFB80010 */ sw $t8, 0x10($sp) /* 093CF8 800930F8 240400FF */ li $a0, 255 /* 093CFC 800930FC 24050080 */ li $a1, 128 /* 093D00 80093100 240600FF */ li $a2, 255 -/* 093D04 80093104 0C0310E1 */ jal func_800C4384 +/* 093D04 80093104 0C0310E1 */ jal set_text_color /* 093D08 80093108 24070060 */ li $a3, 96 -/* 093D0C 8009310C 3C098012 */ lui $t1, %hi(gPlayerVehicle) # $t1, 0x8012 -/* 093D10 80093110 812969C0 */ lb $t1, %lo(gPlayerVehicle)($t1) +/* 093D0C 8009310C 3C098012 */ lui $t1, %hi(gPlayerSelectVehicle) # $t1, 0x8012 +/* 093D10 80093110 812969C0 */ lb $t1, %lo(gPlayerSelectVehicle)($t1) /* 093D14 80093114 8FA80050 */ lw $t0, 0x50($sp) /* 093D18 80093118 00095080 */ sll $t2, $t1, 2 /* 093D1C 8009311C 8FB10058 */ lw $s1, 0x58($sp) @@ -171,17 +171,17 @@ glabel func_80092E94 /* 093D30 80093130 95A40000 */ lhu $a0, ($t5) /* 093D34 80093134 03208825 */ move $s1, $t9 /* 093D38 80093138 27A50054 */ addiu $a1, $sp, 0x54 -/* 093D3C 8009313C 0C025DBE */ jal func_800976F8 +/* 093D3C 8009313C 0C025DBE */ jal decompress_filename_string /* 093D40 80093140 24060003 */ li $a2, 3 /* 093D44 80093144 240E000C */ li $t6, 12 /* 093D48 80093148 AFAE0010 */ sw $t6, 0x10($sp) /* 093D4C 8009314C 02402025 */ move $a0, $s2 /* 093D50 80093150 24050102 */ li $a1, 258 /* 093D54 80093154 02003025 */ move $a2, $s0 -/* 093D58 80093158 0C031110 */ jal func_800C4440 +/* 093D58 80093158 0C031110 */ jal draw_text /* 093D5C 8009315C 27A70054 */ addiu $a3, $sp, 0x54 -/* 093D60 80093160 3C188012 */ lui $t8, %hi(gPlayerVehicle) # $t8, 0x8012 -/* 093D64 80093164 831869C0 */ lb $t8, %lo(gPlayerVehicle)($t8) +/* 093D60 80093160 3C188012 */ lui $t8, %hi(gPlayerSelectVehicle) # $t8, 0x8012 +/* 093D64 80093164 831869C0 */ lb $t8, %lo(gPlayerSelectVehicle)($t8) /* 093D68 80093168 8FAF0050 */ lw $t7, 0x50($sp) /* 093D6C 8009316C 0018C880 */ sll $t9, $t8, 2 /* 093D70 80093170 01F94821 */ addu $t1, $t7, $t9 @@ -190,19 +190,19 @@ glabel func_80092E94 /* 093D7C 8009317C 01115021 */ addu $t2, $t0, $s1 /* 093D80 80093180 95440000 */ lhu $a0, ($t2) /* 093D84 80093184 02002825 */ move $a1, $s0 -/* 093D88 80093188 0C025DBE */ jal func_800976F8 +/* 093D88 80093188 0C025DBE */ jal decompress_filename_string /* 093D8C 8009318C 24060003 */ li $a2, 3 /* 093D90 80093190 8FA60040 */ lw $a2, 0x40($sp) /* 093D94 80093194 240B000C */ li $t3, 12 /* 093D98 80093198 AFAB0010 */ sw $t3, 0x10($sp) /* 093D9C 8009319C 02402025 */ move $a0, $s2 /* 093DA0 800931A0 24050102 */ li $a1, 258 -/* 093DA4 800931A4 0C031110 */ jal func_800C4440 +/* 093DA4 800931A4 0C031110 */ jal draw_text /* 093DA8 800931A8 02003825 */ move $a3, $s0 /* 093DAC 800931AC 8FA20050 */ lw $v0, 0x50($sp) /* 093DB0 800931B0 3C0D800E */ lui $t5, %hi(D_800DF4C4) # $t5, 0x800e -/* 093DB4 800931B4 3C198012 */ lui $t9, %hi(gPlayerVehicle) # $t9, 0x8012 -/* 093DB8 800931B8 833969C0 */ lb $t9, %lo(gPlayerVehicle)($t9) +/* 093DB4 800931B4 3C198012 */ lui $t9, %hi(gPlayerSelectVehicle) # $t9, 0x8012 +/* 093DB8 800931B8 833969C0 */ lb $t9, %lo(gPlayerSelectVehicle)($t9) /* 093DBC 800931BC 8DADF4C4 */ lw $t5, %lo(D_800DF4C4)($t5) /* 093DC0 800931C0 8C4C004C */ lw $t4, 0x4c($v0) /* 093DC4 800931C4 00194880 */ sll $t1, $t9, 2 @@ -223,10 +223,10 @@ glabel func_80092E94 /* 093E00 80093200 0C020600 */ jal func_80081800 /* 093E04 80093204 24070080 */ li $a3, 128 /* 093E08 80093208 8FAE0050 */ lw $t6, 0x50($sp) -/* 093E0C 8009320C 3C188012 */ lui $t8, %hi(gPlayerVehicle) # $t8, 0x8012 +/* 093E0C 8009320C 3C188012 */ lui $t8, %hi(gPlayerSelectVehicle) # $t8, 0x8012 /* 093E10 80093210 3C0F800E */ lui $t7, %hi(D_800DF4C4) # $t7, 0x800e /* 093E14 80093214 8DEFF4C4 */ lw $t7, %lo(D_800DF4C4)($t7) -/* 093E18 80093218 831869C0 */ lb $t8, %lo(gPlayerVehicle)($t8) +/* 093E18 80093218 831869C0 */ lb $t8, %lo(gPlayerSelectVehicle)($t8) /* 093E1C 8009321C 8DCA004C */ lw $t2, 0x4c($t6) /* 093E20 80093220 0018C880 */ sll $t9, $t8, 2 /* 093E24 80093224 014F5821 */ addu $t3, $t2, $t7 @@ -313,8 +313,8 @@ glabel func_80092E94 /* 093F58 80093358 01EB6024 */ and $t4, $t7, $t3 /* 093F5C 8009335C 11800025 */ beqz $t4, .L800933F4 /* 093F60 80093360 00104080 */ sll $t0, $s0, 2 -/* 093F64 80093364 3C198012 */ lui $t9, %hi(gPlayerVehicle) # $t9, 0x8012 -/* 093F68 80093368 833969C0 */ lb $t9, %lo(gPlayerVehicle)($t9) +/* 093F64 80093364 3C198012 */ lui $t9, %hi(gPlayerSelectVehicle) # $t9, 0x8012 +/* 093F68 80093368 833969C0 */ lb $t9, %lo(gPlayerSelectVehicle)($t9) /* 093F6C 8009336C 01104023 */ subu $t0, $t0, $s0 /* 093F70 80093370 3C18800E */ lui $t8, %hi(D_800E0624) # $t8, 0x800e /* 093F74 80093374 27180624 */ addiu $t8, %lo(D_800E0624) # addiu $t8, $t8, 0x624 @@ -355,8 +355,8 @@ glabel func_80092E94 /* 093FF8 800933F8 24010003 */ li $at, 3 /* 093FFC 800933FC 1601FFC8 */ bne $s0, $at, .L80093320 /* 094000 80093400 8FAE007C */ lw $t6, 0x7c($sp) -/* 094004 80093404 3C028012 */ lui $v0, %hi(gPlayerVehicle) # $v0, 0x8012 -/* 094008 80093408 804269C0 */ lb $v0, %lo(gPlayerVehicle)($v0) +/* 094004 80093404 3C028012 */ lui $v0, %hi(gPlayerSelectVehicle) # $v0, 0x8012 +/* 094008 80093408 804269C0 */ lb $v0, %lo(gPlayerSelectVehicle)($v0) /* 09400C 8009340C 8FB10040 */ lw $s1, 0x40($sp) /* 094010 80093410 24010002 */ li $at, 2 /* 094014 80093414 14410002 */ bne $v0, $at, .L80093420 @@ -399,19 +399,19 @@ glabel func_80092E94 /* 0940A4 800934A4 00000000 */ nop /* 0940A8 800934A8 11800050 */ beqz $t4, .L800935EC /* 0940AC 800934AC 8FBF0034 */ lw $ra, 0x34($sp) -/* 0940B0 800934B0 0C0310BB */ jal func_800C42EC +/* 0940B0 800934B0 0C0310BB */ jal set_text_font /* 0940B4 800934B4 24040002 */ li $a0, 2 /* 0940B8 800934B8 00002025 */ move $a0, $zero /* 0940BC 800934BC 00002825 */ move $a1, $zero /* 0940C0 800934C0 00003025 */ move $a2, $zero -/* 0940C4 800934C4 0C0310F3 */ jal func_800C43CC +/* 0940C4 800934C4 0C0310F3 */ jal set_text_background_color /* 0940C8 800934C8 00003825 */ move $a3, $zero /* 0940CC 800934CC 240800FF */ li $t0, 255 /* 0940D0 800934D0 AFA80010 */ sw $t0, 0x10($sp) /* 0940D4 800934D4 240400FF */ li $a0, 255 /* 0940D8 800934D8 240500FF */ li $a1, 255 /* 0940DC 800934DC 240600FF */ li $a2, 255 -/* 0940E0 800934E0 0C0310E1 */ jal func_800C4384 +/* 0940E0 800934E0 0C0310E1 */ jal set_text_color /* 0940E4 800934E4 00003825 */ move $a3, $zero /* 0940E8 800934E8 8FA60060 */ lw $a2, 0x60($sp) /* 0940EC 800934EC 3C07800F */ lui $a3, %hi(D_800E8240) # $a3, 0x800f @@ -420,29 +420,29 @@ glabel func_80092E94 /* 0940F8 800934F8 24E78240 */ addiu $a3, %lo(D_800E8240) # addiu $a3, $a3, -0x7dc0 /* 0940FC 800934FC 02402025 */ move $a0, $s2 /* 094100 80093500 240500A0 */ li $a1, 160 -/* 094104 80093504 0C031110 */ jal func_800C4440 +/* 094104 80093504 0C031110 */ jal draw_text /* 094108 80093508 24C600AC */ addiu $a2, $a2, 0xac /* 09410C 8009350C 10000037 */ b .L800935EC /* 094110 80093510 8FBF0034 */ lw $ra, 0x34($sp) .L80093514: -/* 094114 80093514 0C0310BB */ jal func_800C42EC +/* 094114 80093514 0C0310BB */ jal set_text_font /* 094118 80093518 24040002 */ li $a0, 2 /* 09411C 8009351C 00002025 */ move $a0, $zero /* 094120 80093520 00002825 */ move $a1, $zero /* 094124 80093524 00003025 */ move $a2, $zero -/* 094128 80093528 0C0310F3 */ jal func_800C43CC +/* 094128 80093528 0C0310F3 */ jal set_text_background_color /* 09412C 8009352C 00003825 */ move $a3, $zero /* 094130 80093530 241800FF */ li $t8, 255 /* 094134 80093534 AFB80010 */ sw $t8, 0x10($sp) /* 094138 80093538 240400FF */ li $a0, 255 /* 09413C 8009353C 240500FF */ li $a1, 255 /* 094140 80093540 240600FF */ li $a2, 255 -/* 094144 80093544 0C0310E1 */ jal func_800C4384 +/* 094144 80093544 0C0310E1 */ jal set_text_color /* 094148 80093548 00003825 */ move $a3, $zero /* 09414C 8009354C 8FB00060 */ lw $s0, 0x60($sp) /* 094150 80093550 00000000 */ nop /* 094154 80093554 261000B0 */ addiu $s0, $s0, 0xb0 -/* 094158 80093558 0C027AC8 */ jal func_8009EB20 +/* 094158 80093558 0C027AC8 */ jal get_language /* 09415C 8009355C 02008825 */ move $s1, $s0 /* 094160 80093560 24010002 */ li $at, 2 /* 094164 80093564 1441000A */ bne $v0, $at, .L80093590 @@ -453,7 +453,7 @@ glabel func_80092E94 /* 094178 80093578 8F270034 */ lw $a3, 0x34($t9) /* 09417C 8009357C AFA90010 */ sw $t1, 0x10($sp) /* 094180 80093580 240500A0 */ li $a1, 160 -/* 094184 80093584 0C031110 */ jal func_800C4440 +/* 094184 80093584 0C031110 */ jal draw_text /* 094188 80093588 02003025 */ move $a2, $s0 /* 09418C 8009358C 26110020 */ addiu $s1, $s0, 0x20 .L80093590: @@ -464,9 +464,9 @@ glabel func_80092E94 /* 0941A0 800935A0 AFAA0010 */ sw $t2, 0x10($sp) /* 0941A4 800935A4 02402025 */ move $a0, $s2 /* 0941A8 800935A8 240500A0 */ li $a1, 160 -/* 0941AC 800935AC 0C031110 */ jal func_800C4440 +/* 0941AC 800935AC 0C031110 */ jal draw_text /* 0941B0 800935B0 02203025 */ move $a2, $s1 -/* 0941B4 800935B4 0C027AC8 */ jal func_8009EB20 +/* 0941B4 800935B4 0C027AC8 */ jal get_language /* 0941B8 800935B8 26310020 */ addiu $s1, $s1, 0x20 /* 0941BC 800935BC 24010002 */ li $at, 2 /* 0941C0 800935C0 10410009 */ beq $v0, $at, .L800935E8 @@ -477,7 +477,7 @@ glabel func_80092E94 /* 0941D4 800935D4 8DE70034 */ lw $a3, 0x34($t7) /* 0941D8 800935D8 AFAB0010 */ sw $t3, 0x10($sp) /* 0941DC 800935DC 240500A0 */ li $a1, 160 -/* 0941E0 800935E0 0C031110 */ jal func_800C4440 +/* 0941E0 800935E0 0C031110 */ jal draw_text /* 0941E4 800935E4 02203025 */ move $a2, $s1 .L800935E8: /* 0941E8 800935E8 8FBF0034 */ lw $ra, 0x34($sp) diff --git a/asm/non_matchings/menu/func_80095728.s b/asm/non_matchings/menu/func_80095728.s index 115ce018..4a5db576 100644 --- a/asm/non_matchings/menu/func_80095728.s +++ b/asm/non_matchings/menu/func_80095728.s @@ -306,8 +306,8 @@ glabel L80095B34 /* 096780 80095B80 3C013F00 */ lui $at, 0x3f00 /* 096784 80095B84 11C0005B */ beqz $t6, .L80095CF4 /* 096788 80095B88 240D0003 */ li $t5, 3 -/* 09678C 80095B8C 3C0F8012 */ lui $t7, %hi(gPlayerVehicle) # $t7, 0x8012 -/* 096790 80095B90 81EF69C0 */ lb $t7, %lo(gPlayerVehicle)($t7) +/* 09678C 80095B8C 3C0F8012 */ lui $t7, %hi(gPlayerSelectVehicle) # $t7, 0x8012 +/* 096790 80095B90 81EF69C0 */ lb $t7, %lo(gPlayerSelectVehicle)($t7) /* 096794 80095B94 90EC0049 */ lbu $t4, 0x49($a3) /* 096798 80095B98 000FC080 */ sll $t8, $t7, 2 /* 09679C 80095B9C 00F81021 */ addu $v0, $a3, $t8 @@ -329,11 +329,11 @@ glabel L80095B34 /* 0967DC 80095BDC 95E40000 */ lhu $a0, ($t7) /* 0967E0 80095BE0 3C058012 */ lui $a1, %hi(D_80126390) # $a1, 0x8012 /* 0967E4 80095BE4 24A56390 */ addiu $a1, %lo(D_80126390) # addiu $a1, $a1, 0x6390 -/* 0967E8 80095BE8 0C025DBE */ jal func_800976F8 +/* 0967E8 80095BE8 0C025DBE */ jal decompress_filename_string /* 0967EC 80095BEC 24060003 */ li $a2, 3 -/* 0967F0 80095BF0 3C0C8012 */ lui $t4, %hi(gPlayerVehicle) # $t4, 0x8012 +/* 0967F0 80095BF0 3C0C8012 */ lui $t4, %hi(gPlayerSelectVehicle) # $t4, 0x8012 /* 0967F4 80095BF4 8FA2002C */ lw $v0, 0x2c($sp) -/* 0967F8 80095BF8 818C69C0 */ lb $t4, %lo(gPlayerVehicle)($t4) +/* 0967F8 80095BF8 818C69C0 */ lb $t4, %lo(gPlayerSelectVehicle)($t4) /* 0967FC 80095BFC 90580049 */ lbu $t8, 0x49($v0) /* 096800 80095C00 000CC880 */ sll $t9, $t4, 2 /* 096804 80095C04 00597021 */ addu $t6, $v0, $t9 @@ -343,7 +343,7 @@ glabel L80095B34 /* 096814 80095C14 95840000 */ lhu $a0, ($t4) /* 096818 80095C18 3C058012 */ lui $a1, %hi(D_80126394) # $a1, 0x8012 /* 09681C 80095C1C 24A56394 */ addiu $a1, %lo(D_80126394) # addiu $a1, $a1, 0x6394 -/* 096820 80095C20 0C025DBE */ jal func_800976F8 +/* 096820 80095C20 0C025DBE */ jal decompress_filename_string /* 096824 80095C24 24060003 */ li $a2, 3 /* 096828 80095C28 8FA2002C */ lw $v0, 0x2c($sp) /* 09682C 80095C2C 3C04800E */ lui $a0, %hi(D_800E0E4C) # $a0, 0x800e @@ -363,7 +363,7 @@ glabel L80095B34 /* 096864 80095C64 11A00006 */ beqz $t5, .L80095C80 /* 096868 80095C68 24A50FA8 */ addiu $a1, %lo(D_800E0FA8) # addiu $a1, $a1, 0xfa8 /* 09686C 80095C6C 8C440050 */ lw $a0, 0x50($v0) -/* 096870 80095C70 0C025DBE */ jal func_800976F8 +/* 096870 80095C70 0C025DBE */ jal decompress_filename_string /* 096874 80095C74 24060003 */ li $a2, 3 /* 096878 80095C78 3C01800E */ lui $at, %hi(D_800E0FAC) # $at, 0x800e /* 09687C 80095C7C AC200FAC */ sw $zero, %lo(D_800E0FAC)($at) @@ -436,10 +436,10 @@ glabel L80095D50 /* 096974 80095D74 3058007F */ andi $t8, $v0, 0x7f /* 096978 80095D78 1300001F */ beqz $t8, .L80095DF8 /* 09697C 80095D7C 304E0080 */ andi $t6, $v0, 0x80 -/* 096980 80095D80 0C025DD1 */ jal func_80097744 +/* 096980 80095D80 0C025DD1 */ jal compress_filename_string /* 096984 80095D84 24050003 */ li $a1, 3 -/* 096988 80095D88 3C078012 */ lui $a3, %hi(gPlayerVehicle) # $a3, 0x8012 -/* 09698C 80095D8C 24E769C0 */ addiu $a3, %lo(gPlayerVehicle) # addiu $a3, $a3, 0x69c0 +/* 096988 80095D88 3C078012 */ lui $a3, %hi(gPlayerSelectVehicle) # $a3, 0x8012 +/* 09698C 80095D8C 24E769C0 */ addiu $a3, %lo(gPlayerSelectVehicle) # addiu $a3, $a3, 0x69c0 /* 096990 80095D90 80ED0000 */ lb $t5, ($a3) /* 096994 80095D94 8FA3002C */ lw $v1, 0x2c($sp) /* 096998 80095D98 000D7880 */ sll $t7, $t5, 2 @@ -459,7 +459,7 @@ glabel L80095D50 /* 0969D0 80095DD0 95E40000 */ lhu $a0, ($t7) /* 0969D4 80095DD4 3C058012 */ lui $a1, %hi(D_80126394) # $a1, 0x8012 /* 0969D8 80095DD8 24A56394 */ addiu $a1, %lo(D_80126394) # addiu $a1, $a1, 0x6394 -/* 0969DC 80095DDC 0C025DBE */ jal func_800976F8 +/* 0969DC 80095DDC 0C025DBE */ jal decompress_filename_string /* 0969E0 80095DE0 24060003 */ li $a2, 3 /* 0969E4 80095DE4 8FAC002C */ lw $t4, 0x2c($sp) /* 0969E8 80095DE8 00000000 */ nop @@ -470,10 +470,10 @@ glabel L80095D50 /* 0969F8 80095DF8 11C0001B */ beqz $t6, .L80095E68 /* 0969FC 80095DFC 3C04800E */ lui $a0, %hi(D_800E0FA8) # $a0, 0x800e /* 096A00 80095E00 24840FA8 */ addiu $a0, %lo(D_800E0FA8) # addiu $a0, $a0, 0xfa8 -/* 096A04 80095E04 0C025DD1 */ jal func_80097744 +/* 096A04 80095E04 0C025DD1 */ jal compress_filename_string /* 096A08 80095E08 24050003 */ li $a1, 3 -/* 096A0C 80095E0C 3C078012 */ lui $a3, %hi(gPlayerVehicle) # $a3, 0x8012 -/* 096A10 80095E10 24E769C0 */ addiu $a3, %lo(gPlayerVehicle) # addiu $a3, $a3, 0x69c0 +/* 096A0C 80095E0C 3C078012 */ lui $a3, %hi(gPlayerSelectVehicle) # $a3, 0x8012 +/* 096A10 80095E10 24E769C0 */ addiu $a3, %lo(gPlayerSelectVehicle) # addiu $a3, $a3, 0x69c0 /* 096A14 80095E14 80F80000 */ lb $t8, ($a3) /* 096A18 80095E18 8FA3002C */ lw $v1, 0x2c($sp) /* 096A1C 80095E1C 0018C880 */ sll $t9, $t8, 2 @@ -493,7 +493,7 @@ glabel L80095D50 /* 096A54 80095E54 97240000 */ lhu $a0, ($t9) /* 096A58 80095E58 3C058012 */ lui $a1, %hi(D_80126390) # $a1, 0x8012 /* 096A5C 80095E5C 24A56390 */ addiu $a1, %lo(D_80126390) # addiu $a1, $a1, 0x6390 -/* 096A60 80095E60 0C025DBE */ jal func_800976F8 +/* 096A60 80095E60 0C025DBE */ jal decompress_filename_string /* 096A64 80095E64 24060003 */ li $a2, 3 .L80095E68: /* 096A68 80095E68 3C013F00 */ li $at, 0x3F000000 # 0.500000 diff --git a/asm/non_matchings/menu/func_80096978.s b/asm/non_matchings/menu/func_80096978.s index a2234df3..0cc401c5 100644 --- a/asm/non_matchings/menu/func_80096978.s +++ b/asm/non_matchings/menu/func_80096978.s @@ -61,19 +61,19 @@ glabel func_80096978 /* 097658 80096A58 46005424 */ cvt.w.s $f16, $f10 /* 09765C 80096A5C 44188000 */ mfc1 $t8, $f16 /* 097660 80096A60 44CFF800 */ ctc1 $t7, $31 -/* 097664 80096A64 0C0310BB */ jal func_800C42EC +/* 097664 80096A64 0C0310BB */ jal set_text_font /* 097668 80096A68 AE180000 */ sw $t8, ($s0) /* 09766C 80096A6C 00002025 */ move $a0, $zero /* 097670 80096A70 00002825 */ move $a1, $zero /* 097674 80096A74 00003025 */ move $a2, $zero -/* 097678 80096A78 0C0310F3 */ jal func_800C43CC +/* 097678 80096A78 0C0310F3 */ jal set_text_background_color /* 09767C 80096A7C 00003825 */ move $a3, $zero /* 097680 80096A80 8E190000 */ lw $t9, ($s0) /* 097684 80096A84 240400FF */ li $a0, 255 /* 097688 80096A88 240500FF */ li $a1, 255 /* 09768C 80096A8C 240600FF */ li $a2, 255 /* 097690 80096A90 00003825 */ move $a3, $zero -/* 097694 80096A94 0C0310E1 */ jal func_800C4384 +/* 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) @@ -83,7 +83,7 @@ glabel func_80096978 /* 0976B0 80096AB0 AFA90010 */ sw $t1, 0x10($sp) /* 0976B4 80096AB4 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0 /* 0976B8 80096AB8 24058000 */ li $a1, -32768 -/* 0976BC 80096ABC 0C031110 */ jal func_800C4440 +/* 0976BC 80096ABC 0C031110 */ jal draw_text /* 0976C0 80096AC0 24060022 */ li $a2, 34 /* 0976C4 80096AC4 240A00FF */ li $t2, 255 /* 0976C8 80096AC8 AE0A0000 */ sw $t2, ($s0) @@ -173,7 +173,7 @@ glabel func_80096978 /* 097804 80096C04 440A8000 */ mfc1 $t2, $f16 /* 097808 80096C08 44C9F800 */ ctc1 $t1, $31 /* 09780C 80096C0C 014B6821 */ addu $t5, $t2, $t3 -/* 097810 80096C10 0C0310BB */ jal func_800C42EC +/* 097810 80096C10 0C0310BB */ jal set_text_font /* 097814 80096C14 AFAD00A4 */ sw $t5, 0xa4($sp) /* 097818 80096C18 8FA30098 */ lw $v1, 0x98($sp) /* 09781C 80096C1C 8FA200A4 */ lw $v0, 0xa4($sp) @@ -208,7 +208,7 @@ glabel func_80096978 /* 09788C 80096C8C 00002825 */ move $a1, $zero /* 097890 80096C90 00003025 */ move $a2, $zero /* 097894 80096C94 240700FF */ li $a3, 255 -/* 097898 80096C98 0C0310E1 */ jal func_800C4384 +/* 097898 80096C98 0C0310E1 */ jal set_text_color /* 09789C 80096C9C 0000B025 */ move $s6, $zero /* 0978A0 80096CA0 8FAB0078 */ lw $t3, 0x78($sp) /* 0978A4 80096CA4 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012 @@ -217,14 +217,14 @@ glabel func_80096978 /* 0978B0 80096CB0 240D000C */ li $t5, 12 /* 0978B4 80096CB4 8D670000 */ lw $a3, ($t3) /* 0978B8 80096CB8 AFAD0010 */ sw $t5, 0x10($sp) -/* 0978BC 80096CBC 0C031110 */ jal func_800C4440 +/* 0978BC 80096CBC 0C031110 */ jal draw_text /* 0978C0 80096CC0 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0 /* 0978C4 80096CC4 240C00FF */ li $t4, 255 /* 0978C8 80096CC8 AFAC0010 */ sw $t4, 0x10($sp) /* 0978CC 80096CCC 240400FF */ li $a0, 255 /* 0978D0 80096CD0 240500FF */ li $a1, 255 /* 0978D4 80096CD4 240600C0 */ li $a2, 192 -/* 0978D8 80096CD8 0C0310E1 */ jal func_800C4384 +/* 0978D8 80096CD8 0C0310E1 */ jal set_text_color /* 0978DC 80096CDC 24070060 */ li $a3, 96 /* 0978E0 80096CE0 8FAE0078 */ lw $t6, 0x78($sp) /* 0978E4 80096CE4 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012 @@ -233,7 +233,7 @@ glabel func_80096978 /* 0978F0 80096CF0 240F000C */ li $t7, 12 /* 0978F4 80096CF4 8DC70000 */ lw $a3, ($t6) /* 0978F8 80096CF8 AFAF0010 */ sw $t7, 0x10($sp) -/* 0978FC 80096CFC 0C031110 */ jal func_800C4440 +/* 0978FC 80096CFC 0C031110 */ jal draw_text /* 097900 80096D00 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0 /* 097904 80096D04 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012 /* 097908 80096D08 0C01ECF4 */ jal func_8007B3D0 diff --git a/asm/non_matchings/menu/func_80097918.s b/asm/non_matchings/menu/func_80097918.s index f82f0684..2b5fee77 100644 --- a/asm/non_matchings/menu/func_80097918.s +++ b/asm/non_matchings/menu/func_80097918.s @@ -40,16 +40,16 @@ glabel func_80097918 /* 0985B0 800979B0 00002825 */ move $a1, $zero /* 0985B4 800979B4 00003025 */ move $a2, $zero /* 0985B8 800979B8 00003825 */ move $a3, $zero -/* 0985BC 800979BC 0C0310F3 */ jal func_800C43CC +/* 0985BC 800979BC 0C0310F3 */ jal set_text_background_color /* 0985C0 800979C0 AFA2005C */ sw $v0, 0x5c($sp) -/* 0985C4 800979C4 0C0310BB */ jal func_800C42EC +/* 0985C4 800979C4 0C0310BB */ jal set_text_font /* 0985C8 800979C8 00002025 */ move $a0, $zero /* 0985CC 800979CC 24090080 */ li $t1, 128 /* 0985D0 800979D0 AFA90010 */ sw $t1, 0x10($sp) /* 0985D4 800979D4 00002025 */ move $a0, $zero /* 0985D8 800979D8 00002825 */ move $a1, $zero /* 0985DC 800979DC 00003025 */ move $a2, $zero -/* 0985E0 800979E0 0C0310E1 */ jal func_800C4384 +/* 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 @@ -64,14 +64,14 @@ glabel func_80097918 /* 098610 80097A10 AFAB0010 */ sw $t3, 0x10($sp) /* 098614 80097A14 02602025 */ move $a0, $s3 /* 098618 80097A18 240500A2 */ li $a1, 162 -/* 09861C 80097A1C 0C031110 */ jal func_800C4440 +/* 09861C 80097A1C 0C031110 */ jal draw_text /* 098620 80097A20 24C6FFEA */ addiu $a2, $a2, -0x16 /* 098624 80097A24 240C00FF */ li $t4, 255 /* 098628 80097A28 AFAC0010 */ sw $t4, 0x10($sp) /* 09862C 80097A2C 240400FF */ li $a0, 255 /* 098630 80097A30 24050080 */ li $a1, 128 /* 098634 80097A34 240600FF */ li $a2, 255 -/* 098638 80097A38 0C0310E1 */ jal func_800C4384 +/* 098638 80097A38 0C0310E1 */ jal set_text_color /* 09863C 80097A3C 24070060 */ li $a3, 96 /* 098640 80097A40 8E2D0000 */ lw $t5, ($s1) /* 098644 80097A44 8E060000 */ lw $a2, ($s0) @@ -80,9 +80,9 @@ glabel func_80097918 /* 098650 80097A50 AFAE0010 */ sw $t6, 0x10($sp) /* 098654 80097A54 02602025 */ move $a0, $s3 /* 098658 80097A58 240500A0 */ li $a1, 160 -/* 09865C 80097A5C 0C031110 */ jal func_800C4440 +/* 09865C 80097A5C 0C031110 */ jal draw_text /* 098660 80097A60 24C6FFE8 */ addiu $a2, $a2, -0x18 -/* 098664 80097A64 3C1E800E */ lui $fp, %hi(D_800E0F6C) # $fp, 0x800e +/* 098664 80097A64 3C1E800E */ lui $fp, %hi(gFileNameValidChars) # $fp, 0x800e /* 098668 80097A68 3C178012 */ lui $s7, %hi(D_80126C6C) # $s7, 0x8012 /* 09866C 80097A6C 3C14800E */ lui $s4, %hi(D_800E0F8C) # $s4, 0x800e /* 098670 80097A70 8E120000 */ lw $s2, ($s0) @@ -91,7 +91,7 @@ glabel func_80097918 /* 09867C 80097A7C AFA00060 */ sw $zero, 0x60($sp) /* 098680 80097A80 26940F8C */ addiu $s4, %lo(D_800E0F8C) # addiu $s4, $s4, 0xf8c /* 098684 80097A84 26F76C6C */ addiu $s7, %lo(D_80126C6C) # addiu $s7, $s7, 0x6c6c -/* 098688 80097A88 27DE0F6C */ addiu $fp, %lo(D_800E0F6C) # addiu $fp, $fp, 0xf6c +/* 098688 80097A88 27DE0F6C */ addiu $fp, %lo(gFileNameValidChars) # addiu $fp, $fp, 0xf6c .L80097A8C: /* 09868C 80097A8C 8FAF0060 */ lw $t7, 0x60($sp) /* 098690 80097A90 00608825 */ move $s1, $v1 @@ -132,18 +132,18 @@ glabel func_80097918 /* 098708 80097B08 240400FF */ li $a0, 255 /* 09870C 80097B0C 240500FF */ li $a1, 255 /* 098710 80097B10 240600FF */ li $a2, 255 -/* 098714 80097B14 0C0310E1 */ jal func_800C4384 +/* 098714 80097B14 0C0310E1 */ jal set_text_color /* 098718 80097B18 00003825 */ move $a3, $zero /* 09871C 80097B1C 10000004 */ b .L80097B30 /* 098720 80097B20 2A01001C */ slti $at, $s0, 0x1c .L80097B24: -/* 098724 80097B24 0C0310E1 */ jal func_800C4384 +/* 098724 80097B24 0C0310E1 */ jal set_text_color /* 098728 80097B28 AFA90010 */ sw $t1, 0x10($sp) /* 09872C 80097B2C 2A01001C */ slti $at, $s0, 0x1c .L80097B30: /* 098730 80097B30 1020000F */ beqz $at, .L80097B70 /* 098734 80097B34 00000000 */ nop -/* 098738 80097B38 0C0310BB */ jal func_800C42EC +/* 098738 80097B38 0C0310BB */ jal set_text_font /* 09873C 80097B3C 24040002 */ li $a0, 2 /* 098740 80097B40 03D05021 */ addu $t2, $fp, $s0 /* 098744 80097B44 914B0000 */ lbu $t3, ($t2) @@ -153,12 +153,12 @@ glabel func_80097918 /* 098754 80097B54 02202825 */ move $a1, $s1 /* 098758 80097B58 02403025 */ move $a2, $s2 /* 09875C 80097B5C 02803825 */ move $a3, $s4 -/* 098760 80097B60 0C031110 */ jal func_800C4440 +/* 098760 80097B60 0C031110 */ jal draw_text /* 098764 80097B64 A28B0000 */ sb $t3, ($s4) /* 098768 80097B68 10000024 */ b .L80097BFC /* 09876C 80097B6C 02358821 */ addu $s1, $s1, $s5 .L80097B70: -/* 098770 80097B70 0C0310BB */ jal func_800C42EC +/* 098770 80097B70 0C0310BB */ jal set_text_font /* 098774 80097B74 00002025 */ move $a0, $zero /* 098778 80097B78 2401001C */ li $at, 28 /* 09877C 80097B7C 1601000A */ bne $s0, $at, .L80097BA8 @@ -168,7 +168,7 @@ glabel func_80097918 /* 09878C 80097B8C AFAD0010 */ sw $t5, 0x10($sp) /* 098790 80097B90 24E78244 */ addiu $a3, %lo(D_800E8244) # addiu $a3, $a3, -0x7dbc /* 098794 80097B94 02202825 */ move $a1, $s1 -/* 098798 80097B98 0C031110 */ jal func_800C4440 +/* 098798 80097B98 0C031110 */ jal draw_text /* 09879C 80097B9C 02403025 */ move $a2, $s2 /* 0987A0 80097BA0 10000016 */ b .L80097BFC /* 0987A4 80097BA4 02358821 */ addu $s1, $s1, $s5 @@ -182,7 +182,7 @@ glabel func_80097918 /* 0987C0 80097BC0 24E78248 */ addiu $a3, %lo(D_800E8248) # addiu $a3, $a3, -0x7db8 /* 0987C4 80097BC4 02602025 */ move $a0, $s3 /* 0987C8 80097BC8 02202825 */ move $a1, $s1 -/* 0987CC 80097BCC 0C031110 */ jal func_800C4440 +/* 0987CC 80097BCC 0C031110 */ jal draw_text /* 0987D0 80097BD0 02403025 */ move $a2, $s2 /* 0987D4 80097BD4 10000009 */ b .L80097BFC /* 0987D8 80097BD8 02358821 */ addu $s1, $s1, $s5 @@ -192,7 +192,7 @@ glabel func_80097918 /* 0987E4 80097BE4 AFAF0010 */ sw $t7, 0x10($sp) /* 0987E8 80097BE8 24E7824C */ addiu $a3, %lo(D_800E824C) # addiu $a3, $a3, -0x7db4 /* 0987EC 80097BEC 02202825 */ move $a1, $s1 -/* 0987F0 80097BF0 0C031110 */ jal func_800C4440 +/* 0987F0 80097BF0 0C031110 */ jal draw_text /* 0987F4 80097BF4 02403025 */ move $a2, $s2 /* 0987F8 80097BF8 02358821 */ addu $s1, $s1, $s5 .L80097BFC: @@ -219,14 +219,14 @@ glabel func_80097918 /* 098844 80097C44 12000026 */ beqz $s0, .L80097CE0 /* 098848 80097C48 3C04800E */ lui $a0, %hi(D_800E0F9C) # $a0, 0x800e /* 09884C 80097C4C 8C840F9C */ lw $a0, %lo(D_800E0F9C)($a0) -/* 098850 80097C50 0C0310BB */ jal func_800C42EC +/* 098850 80097C50 0C0310BB */ jal set_text_font /* 098854 80097C54 00000000 */ nop /* 098858 80097C58 24080080 */ li $t0, 128 /* 09885C 80097C5C AFA80010 */ sw $t0, 0x10($sp) /* 098860 80097C60 00002025 */ move $a0, $zero /* 098864 80097C64 00002825 */ move $a1, $zero /* 098868 80097C68 00003025 */ move $a2, $zero -/* 09886C 80097C6C 0C0310E1 */ jal func_800C4384 +/* 09886C 80097C6C 0C0310E1 */ jal set_text_color /* 098870 80097C70 240700FF */ li $a3, 255 /* 098874 80097C74 3C11800E */ lui $s1, %hi(D_800E0F94) # $s1, 0x800e /* 098878 80097C78 3C12800E */ lui $s2, %hi(D_800E0F98) # $s2, 0x800e @@ -239,21 +239,21 @@ glabel func_80097918 /* 098894 80097C94 02602025 */ move $a0, $s3 /* 098898 80097C98 02003825 */ move $a3, $s0 /* 09889C 80097C9C 24A50001 */ addiu $a1, $a1, 1 -/* 0988A0 80097CA0 0C031110 */ jal func_800C4440 +/* 0988A0 80097CA0 0C031110 */ jal draw_text /* 0988A4 80097CA4 24C60003 */ addiu $a2, $a2, 3 /* 0988A8 80097CA8 240A00FF */ li $t2, 255 /* 0988AC 80097CAC AFAA0010 */ sw $t2, 0x10($sp) /* 0988B0 80097CB0 240400FF */ li $a0, 255 /* 0988B4 80097CB4 240500FF */ li $a1, 255 /* 0988B8 80097CB8 240600FF */ li $a2, 255 -/* 0988BC 80097CBC 0C0310E1 */ jal func_800C4384 +/* 0988BC 80097CBC 0C0310E1 */ jal set_text_color /* 0988C0 80097CC0 00003825 */ move $a3, $zero /* 0988C4 80097CC4 8E250000 */ lw $a1, ($s1) /* 0988C8 80097CC8 8E460000 */ lw $a2, ($s2) /* 0988CC 80097CCC 240B000C */ li $t3, 12 /* 0988D0 80097CD0 AFAB0010 */ sw $t3, 0x10($sp) /* 0988D4 80097CD4 02602025 */ move $a0, $s3 -/* 0988D8 80097CD8 0C031110 */ jal func_800C4440 +/* 0988D8 80097CD8 0C031110 */ jal draw_text /* 0988DC 80097CDC 02003825 */ move $a3, $s0 .L80097CE0: /* 0988E0 80097CE0 8FBF0044 */ lw $ra, 0x44($sp) diff --git a/asm/non_matchings/menu/func_80097D10.s b/asm/non_matchings/menu/func_80097D10.s index b502be80..8cd3513b 100644 --- a/asm/non_matchings/menu/func_80097D10.s +++ b/asm/non_matchings/menu/func_80097D10.s @@ -186,10 +186,10 @@ glabel func_80097D10 /* 098B94 80097F94 2921001D */ slti $at, $t1, 0x1d /* 098B98 80097F98 1020001D */ beqz $at, .L80098010 /* 098B9C 80097F9C 25086C74 */ addiu $t0, %lo(D_80126C74) # addiu $t0, $t0, 0x6c74 -/* 098BA0 80097FA0 3C18800E */ lui $t8, %hi(D_800E0F6C) # $t8, 0x800e +/* 098BA0 80097FA0 3C18800E */ lui $t8, %hi(gFileNameValidChars) # $t8, 0x800e /* 098BA4 80097FA4 8D190000 */ lw $t9, ($t0) /* 098BA8 80097FA8 0309C021 */ addu $t8, $t8, $t1 -/* 098BAC 80097FAC 93180F6C */ lbu $t8, %lo(D_800E0F6C)($t8) +/* 098BAC 80097FAC 93180F6C */ lbu $t8, %lo(gFileNameValidChars)($t8) /* 098BB0 80097FB0 03225021 */ addu $t2, $t9, $v0 /* 098BB4 80097FB4 A1580000 */ sb $t8, ($t2) /* 098BB8 80097FB8 8C6B0000 */ lw $t3, ($v1) diff --git a/asm/non_matchings/menu/func_80098EBC.s b/asm/non_matchings/menu/func_80098EBC.s index 7b2f7b44..dbe6e70f 100644 --- a/asm/non_matchings/menu/func_80098EBC.s +++ b/asm/non_matchings/menu/func_80098EBC.s @@ -70,7 +70,7 @@ glabel func_80098EBC .L80098FB4: /* 099BB4 80098FB4 3C05800E */ lui $a1, %hi(D_800E1048) # $a1, 0x800e /* 099BB8 80098FB8 24A51048 */ addiu $a1, %lo(D_800E1048) # addiu $a1, $a1, 0x1048 -/* 099BBC 80098FBC 0C02087B */ jal DrawMenuText +/* 099BBC 80098FBC 0C02087B */ jal draw_menu_element /* 099BC0 80098FC0 3C063F80 */ lui $a2, 0x3f80 .L80098FC4: /* 099BC4 80098FC4 8FBF0014 */ lw $ra, 0x14($sp) diff --git a/asm/non_matchings/menu/func_80099E8C.s b/asm/non_matchings/menu/func_80099E8C.s index 775f6c0c..7ea87bc9 100644 --- a/asm/non_matchings/menu/func_80099E8C.s +++ b/asm/non_matchings/menu/func_80099E8C.s @@ -34,19 +34,19 @@ glabel func_80099E8C /* 09AAF4 80099EF4 AFA000D0 */ sw $zero, 0xd0($sp) .L80099EF8: /* 09AAF8 80099EF8 8F1863D8 */ lw $t8, %lo(D_801263D8)($t8) -/* 09AAFC 80099EFC 0C0310BB */ jal func_800C42EC +/* 09AAFC 80099EFC 0C0310BB */ jal set_text_font /* 09AB00 80099F00 AFB800E4 */ sw $t8, 0xe4($sp) /* 09AB04 80099F04 00002025 */ move $a0, $zero /* 09AB08 80099F08 00002825 */ move $a1, $zero /* 09AB0C 80099F0C 00003025 */ move $a2, $zero -/* 09AB10 80099F10 0C0310F3 */ jal func_800C43CC +/* 09AB10 80099F10 0C0310F3 */ jal set_text_background_color /* 09AB14 80099F14 00003825 */ move $a3, $zero /* 09AB18 80099F18 24190080 */ li $t9, 128 /* 09AB1C 80099F1C AFB90010 */ sw $t9, 0x10($sp) /* 09AB20 80099F20 00002025 */ move $a0, $zero /* 09AB24 80099F24 00002825 */ move $a1, $zero /* 09AB28 80099F28 00003025 */ move $a2, $zero -/* 09AB2C 80099F2C 0C0310E1 */ jal func_800C4384 +/* 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) @@ -55,14 +55,14 @@ glabel func_80099E8C /* 09AB44 80099F44 AFAA0010 */ sw $t2, 0x10($sp) /* 09AB48 80099F48 02E02025 */ move $a0, $s7 /* 09AB4C 80099F4C 240500A1 */ li $a1, 161 -/* 09AB50 80099F50 0C031110 */ jal func_800C4440 +/* 09AB50 80099F50 0C031110 */ jal draw_text /* 09AB54 80099F54 24060023 */ li $a2, 35 /* 09AB58 80099F58 240B00FF */ li $t3, 255 /* 09AB5C 80099F5C AFAB0010 */ sw $t3, 0x10($sp) /* 09AB60 80099F60 240400FF */ li $a0, 255 /* 09AB64 80099F64 240500FF */ li $a1, 255 /* 09AB68 80099F68 240600FF */ li $a2, 255 -/* 09AB6C 80099F6C 0C0310E1 */ jal func_800C4384 +/* 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) @@ -71,7 +71,7 @@ glabel func_80099E8C /* 09AB84 80099F84 AFAD0010 */ sw $t5, 0x10($sp) /* 09AB88 80099F88 02E02025 */ move $a0, $s7 /* 09AB8C 80099F8C 240500A0 */ li $a1, 160 -/* 09AB90 80099F90 0C031110 */ jal func_800C4440 +/* 09AB90 80099F90 0C031110 */ jal draw_text /* 09AB94 80099F94 24060020 */ li $a2, 32 /* 09AB98 80099F98 3C0E8012 */ lui $t6, %hi(D_801264D4) # $t6, 0x8012 /* 09AB9C 80099F9C 8DCE64D4 */ lw $t6, %lo(D_801264D4)($t6) @@ -83,7 +83,7 @@ glabel func_80099E8C /* 09ABB4 80099FB4 240400FF */ li $a0, 255 /* 09ABB8 80099FB8 240500FF */ li $a1, 255 /* 09ABBC 80099FBC 240600FF */ li $a2, 255 -/* 09ABC0 80099FC0 0C0310E1 */ jal func_800C4384 +/* 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) @@ -93,7 +93,7 @@ glabel func_80099E8C /* 09ABDC 80099FDC AFB90010 */ sw $t9, 0x10($sp) /* 09ABE0 80099FE0 02E02025 */ move $a0, $s7 /* 09ABE4 80099FE4 240500A0 */ li $a1, 160 -/* 09ABE8 80099FE8 0C031110 */ jal func_800C4440 +/* 09ABE8 80099FE8 0C031110 */ jal draw_text /* 09ABEC 80099FEC 24C60078 */ addiu $a2, $a2, 0x78 /* 09ABF0 80099FF0 100001ED */ b .L8009A7A8 /* 09ABF4 80099FF4 8FBF005C */ lw $ra, 0x5c($sp) @@ -111,7 +111,7 @@ glabel func_80099E8C /* 09AC1C 8009A01C 2401FF00 */ li $at, -256 /* 09AC20 8009A020 00416025 */ or $t4, $v0, $at /* 09AC24 8009A024 AFAC00D8 */ sw $t4, 0xd8($sp) -/* 09AC28 8009A028 0C0310BB */ jal func_800C42EC +/* 09AC28 8009A028 0C0310BB */ jal set_text_font /* 09AC2C 8009A02C 24040001 */ li $a0, 1 /* 09AC30 8009A030 3C0D8012 */ lui $t5, %hi(D_801264D4) # $t5, 0x8012 /* 09AC34 8009A034 8FA200E4 */ lw $v0, 0xe4($sp) @@ -249,7 +249,7 @@ glabel func_80099E8C /* 09AE28 8009A228 00002025 */ move $a0, $zero /* 09AE2C 8009A22C 00002825 */ move $a1, $zero /* 09AE30 8009A230 00003025 */ move $a2, $zero -/* 09AE34 8009A234 0C0310E1 */ jal func_800C4384 +/* 09AE34 8009A234 0C0310E1 */ jal set_text_color /* 09AE38 8009A238 240700FF */ li $a3, 255 /* 09AE3C 8009A23C 00105040 */ sll $t2, $s0, 1 .L8009A240: @@ -265,7 +265,7 @@ glabel func_80099E8C /* 09AE64 8009A264 AFB80010 */ sw $t8, 0x10($sp) /* 09AE68 8009A268 02E02025 */ move $a0, $s7 /* 09AE6C 8009A26C 02603825 */ move $a3, $s3 -/* 09AE70 8009A270 0C031110 */ jal func_800C4440 +/* 09AE70 8009A270 0C031110 */ jal draw_text /* 09AE74 8009A274 01CF3021 */ addu $a2, $t6, $t7 /* 09AE78 8009A278 26100001 */ addiu $s0, $s0, 1 /* 09AE7C 8009A27C 1616FFF0 */ bne $s0, $s6, .L8009A240 @@ -275,7 +275,7 @@ glabel func_80099E8C /* 09AE8C 8009A28C 240400C8 */ li $a0, 200 /* 09AE90 8009A290 240500E4 */ li $a1, 228 /* 09AE94 8009A294 24060050 */ li $a2, 80 -/* 09AE98 8009A298 0C0310E1 */ jal func_800C4384 +/* 09AE98 8009A298 0C0310E1 */ jal set_text_color /* 09AE9C 8009A29C 240700FF */ li $a3, 255 /* 09AEA0 8009A2A0 86250000 */ lh $a1, ($s1) /* 09AEA4 8009A2A4 86290002 */ lh $t1, 2($s1) @@ -284,7 +284,7 @@ glabel func_80099E8C /* 09AEB0 8009A2B0 02E02025 */ move $a0, $s7 /* 09AEB4 8009A2B4 02603825 */ move $a3, $s3 /* 09AEB8 8009A2B8 24A50028 */ addiu $a1, $a1, 0x28 -/* 09AEBC 8009A2BC 0C031110 */ jal func_800C4440 +/* 09AEBC 8009A2BC 0C031110 */ jal draw_text /* 09AEC0 8009A2C0 01323021 */ addu $a2, $t1, $s2 /* 09AEC4 8009A2C4 8FAB0074 */ lw $t3, 0x74($sp) /* 09AEC8 8009A2C8 3C05800E */ lui $a1, %hi(D_800E0AF0) # $a1, 0x800e diff --git a/asm/non_matchings/menu/menu_5_init.s b/asm/non_matchings/menu/menu_5_init.s index df4450fa..1065cc90 100644 --- a/asm/non_matchings/menu/menu_5_init.s +++ b/asm/non_matchings/menu/menu_5_init.s @@ -15,8 +15,8 @@ glabel menu_5_init /* 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(gPlayerVehicle) # $at, 0x8012 -/* 0938C8 80092CC8 A02269C0 */ sb $v0, %lo(gPlayerVehicle)($at) +/* 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 diff --git a/asm/non_matchings/menu/menu_5_loop.s b/asm/non_matchings/menu/menu_5_loop.s index d93da4bd..93de4290 100644 --- a/asm/non_matchings/menu/menu_5_loop.s +++ b/asm/non_matchings/menu/menu_5_loop.s @@ -84,11 +84,11 @@ glabel menu_5_loop /* 094330 80093730 00000000 */ nop /* 094334 80093734 0C01AC2B */ jal func_8006B0AC /* 094338 80093738 00000000 */ nop -/* 09433C 8009373C 3C018012 */ lui $at, %hi(gPlayerVehicle) # $at, 0x8012 -/* 094340 80093740 A02269C0 */ sb $v0, %lo(gPlayerVehicle)($at) +/* 09433C 8009373C 3C018012 */ lui $at, %hi(gPlayerSelectVehicle) # $at, 0x8012 +/* 094340 80093740 A02269C0 */ sb $v0, %lo(gPlayerSelectVehicle)($at) .L80093744: -/* 094344 80093744 3C038012 */ lui $v1, %hi(gPlayerVehicle) # $v1, 0x8012 -/* 094348 80093748 806369C0 */ lb $v1, %lo(gPlayerVehicle)($v1) +/* 094344 80093744 3C038012 */ lui $v1, %hi(gPlayerSelectVehicle) # $v1, 0x8012 +/* 094348 80093748 806369C0 */ lb $v1, %lo(gPlayerSelectVehicle)($v1) /* 09434C 8009374C 8FA40024 */ lw $a0, 0x24($sp) /* 094350 80093750 0C01AC3E */ jal func_8006B0F8 /* 094354 80093754 AFA30034 */ sw $v1, 0x34($sp) @@ -238,9 +238,9 @@ glabel menu_5_loop /* 094558 80093958 0C000741 */ jal func_80001D04 /* 09455C 8009395C AFA30034 */ sw $v1, 0x34($sp) /* 094560 80093960 8FA30034 */ lw $v1, 0x34($sp) -/* 094564 80093964 3C018012 */ lui $at, %hi(gPlayerVehicle) # $at, 0x8012 +/* 094564 80093964 3C018012 */ lui $at, %hi(gPlayerSelectVehicle) # $at, 0x8012 /* 094568 80093968 10000021 */ b .L800939F0 -/* 09456C 8009396C A02369C0 */ sb $v1, %lo(gPlayerVehicle)($at) +/* 09456C 8009396C A02369C0 */ sb $v1, %lo(gPlayerSelectVehicle)($at) .L80093970: /* 094570 80093970 04410007 */ bgez $v0, .L80093990 /* 094574 80093974 8FAA0038 */ lw $t2, 0x38($sp) diff --git a/asm/non_matchings/menu/menu_character_select_loop.s b/asm/non_matchings/menu/menu_character_select_loop.s index b22ccee3..49aed4e0 100644 --- a/asm/non_matchings/menu/menu_character_select_loop.s +++ b/asm/non_matchings/menu/menu_character_select_loop.s @@ -85,10 +85,10 @@ glabel menu_character_select_loop /* 08CA5C 8008BE5C 3C038012 */ lui $v1, %hi(D_801263D4) # $v1, 0x8012 /* 08CA60 8008BE60 3C078012 */ lui $a3, %hi(players_character_array) # $a3, 0x8012 /* 08CA64 8008BE64 3C068012 */ lui $a2, %hi(D_801263CC) # $a2, 0x8012 -/* 08CA68 8008BE68 3C058012 */ lui $a1, %hi(D_801263F0) # $a1, 0x8012 +/* 08CA68 8008BE68 3C058012 */ lui $a1, %hi(gCharacterIdSlots) # $a1, 0x8012 /* 08CA6C 8008BE6C 8FAB0024 */ lw $t3, 0x24($sp) /* 08CA70 8008BE70 00002025 */ move $a0, $zero -/* 08CA74 8008BE74 24A563F0 */ addiu $a1, %lo(D_801263F0) # addiu $a1, $a1, 0x63f0 +/* 08CA74 8008BE74 24A563F0 */ addiu $a1, %lo(gCharacterIdSlots) # addiu $a1, $a1, 0x63f0 /* 08CA78 8008BE78 24C663CC */ addiu $a2, %lo(D_801263CC) # addiu $a2, $a2, 0x63cc /* 08CA7C 8008BE7C 24E763E8 */ addiu $a3, %lo(players_character_array) # addiu $a3, $a3, 0x63e8 /* 08CA80 8008BE80 246363D4 */ addiu $v1, %lo(D_801263D4) # addiu $v1, $v1, 0x63d4 diff --git a/asm/non_matchings/menu/menu_file_select_loop.s b/asm/non_matchings/menu/menu_file_select_loop.s index ee42ef38..46efa7ba 100644 --- a/asm/non_matchings/menu/menu_file_select_loop.s +++ b/asm/non_matchings/menu/menu_file_select_loop.s @@ -54,7 +54,7 @@ glabel menu_file_select_loop /* 08EB34 8008DF34 8C640050 */ lw $a0, 0x50($v1) /* 08EB38 8008DF38 AFA80044 */ sw $t0, 0x44($sp) /* 08EB3C 8008DF3C AFA7002C */ sw $a3, 0x2c($sp) -/* 08EB40 8008DF40 0C025DBE */ jal func_800976F8 +/* 08EB40 8008DF40 0C025DBE */ jal decompress_filename_string /* 08EB44 8008DF44 AFA20030 */ sw $v0, 0x30($sp) /* 08EB48 8008DF48 8FA20030 */ lw $v0, 0x30($sp) /* 08EB4C 8008DF4C 8FA7002C */ lw $a3, 0x2c($sp) @@ -189,7 +189,7 @@ glabel menu_file_select_loop .L8008E130: /* 08ED30 8008E130 A0590001 */ sb $t9, 1($v0) /* 08ED34 8008E134 A4400002 */ sh $zero, 2($v0) -/* 08ED38 8008E138 0C025DD1 */ jal func_80097744 +/* 08ED38 8008E138 0C025DD1 */ jal compress_filename_string /* 08ED3C 8008E13C 24050003 */ li $a1, 3 /* 08ED40 8008E140 8FAC0038 */ lw $t4, 0x38($sp) /* 08ED44 8008E144 3C04800E */ lui $a0, %hi(gSaveFileIndex) # $a0, 0x800e diff --git a/asm/non_matchings/menu/menu_game_select_loop.s b/asm/non_matchings/menu/menu_game_select_loop.s index cacef127..aa7f5057 100644 --- a/asm/non_matchings/menu/menu_game_select_loop.s +++ b/asm/non_matchings/menu/menu_game_select_loop.s @@ -72,9 +72,9 @@ glabel menu_game_select_loop /* 08D4C0 8008C8C0 AC22F494 */ sw $v0, %lo(gIsInAdventureTwo)($at) /* 08D4C4 8008C8C4 3C01800E */ lui $at, %hi(D_800DF4B8) # $at, 0x800e /* 08D4C8 8008C8C8 AC20F4B8 */ sw $zero, %lo(D_800DF4B8)($at) -/* 08D4CC 8008C8CC 3C018012 */ lui $at, %hi(gPlayerVehicle) # $at, 0x8012 +/* 08D4CC 8008C8CC 3C018012 */ lui $at, %hi(gPlayerSelectVehicle) # $at, 0x8012 /* 08D4D0 8008C8D0 0C01B6C5 */ jal func_8006DB14 -/* 08D4D4 8008C8D4 A02069C0 */ sb $zero, %lo(gPlayerVehicle)($at) +/* 08D4D4 8008C8D4 A02069C0 */ sb $zero, %lo(gPlayerSelectVehicle)($at) /* 08D4D8 8008C8D8 0C0204F4 */ jal menu_init /* 08D4DC 8008C8DC 24040006 */ li $a0, 6 /* 08D4E0 8008C8E0 10000076 */ b .L8008CABC diff --git a/asm/non_matchings/menu/menu_logo_screen_loop.s b/asm/non_matchings/menu/menu_logo_screen_loop.s index c790829c..8344b789 100644 --- a/asm/non_matchings/menu/menu_logo_screen_loop.s +++ b/asm/non_matchings/menu/menu_logo_screen_loop.s @@ -118,12 +118,12 @@ glabel menu_logo_screen_loop /* 083904 80082D04 00000000 */ nop /* 083908 80082D08 450000A5 */ bc1f .L80082FA0 /* 08390C 80082D0C 8FBF001C */ lw $ra, 0x1c($sp) -/* 083910 80082D10 0C0310BB */ jal func_800C42EC +/* 083910 80082D10 0C0310BB */ jal set_text_font /* 083914 80082D14 24040001 */ li $a0, 1 /* 083918 80082D18 00002025 */ move $a0, $zero /* 08391C 80082D1C 00002825 */ move $a1, $zero /* 083920 80082D20 00003025 */ move $a2, $zero -/* 083924 80082D24 0C0310F3 */ jal func_800C43CC +/* 083924 80082D24 0C0310F3 */ jal set_text_background_color /* 083928 80082D28 00003825 */ move $a3, $zero /* 08392C 80082D2C 3C014020 */ li $at, 0x40200000 # 2.500000 /* 083930 80082D30 44816800 */ mtc1 $at, $f13 @@ -195,7 +195,7 @@ glabel menu_logo_screen_loop /* 083A30 80082E30 240500FF */ li $a1, 255 /* 083A34 80082E34 00003025 */ move $a2, $zero /* 083A38 80082E38 240700FF */ li $a3, 255 -/* 083A3C 80082E3C 0C0310E1 */ jal func_800C4384 +/* 083A3C 80082E3C 0C0310E1 */ jal set_text_color /* 083A40 80082E40 AFA20010 */ sw $v0, 0x10($sp) /* 083A44 80082E44 8FA60028 */ lw $a2, 0x28($sp) /* 083A48 80082E48 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012 @@ -206,7 +206,7 @@ glabel menu_logo_screen_loop /* 083A5C 80082E5C AFAF0010 */ sw $t7, 0x10($sp) /* 083A60 80082E60 24E71DF0 */ addiu $a3, %lo(D_800E1DF0) # addiu $a3, $a3, 0x1df0 /* 083A64 80082E64 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0 -/* 083A68 80082E68 0C031110 */ jal func_800C4440 +/* 083A68 80082E68 0C031110 */ jal draw_text /* 083A6C 80082E6C 2405009F */ li $a1, 159 /* 083A70 80082E70 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012 /* 083A74 80082E74 8FA60020 */ lw $a2, 0x20($sp) @@ -215,7 +215,7 @@ glabel menu_logo_screen_loop /* 083A80 80082E80 AFB80010 */ sw $t8, 0x10($sp) /* 083A84 80082E84 24E71DF0 */ addiu $a3, %lo(D_800E1DF0) # addiu $a3, $a3, 0x1df0 /* 083A88 80082E88 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0 -/* 083A8C 80082E8C 0C031110 */ jal func_800C4440 +/* 083A8C 80082E8C 0C031110 */ jal draw_text /* 083A90 80082E90 240500A1 */ li $a1, 161 /* 083A94 80082E94 8FA60028 */ lw $a2, 0x28($sp) /* 083A98 80082E98 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012 @@ -225,7 +225,7 @@ glabel menu_logo_screen_loop /* 083AA8 80082EA8 24E71DF0 */ addiu $a3, %lo(D_800E1DF0) # addiu $a3, $a3, 0x1df0 /* 083AAC 80082EAC 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0 /* 083AB0 80082EB0 24058000 */ li $a1, -32768 -/* 083AB4 80082EB4 0C031110 */ jal func_800C4440 +/* 083AB4 80082EB4 0C031110 */ jal draw_text /* 083AB8 80082EB8 24C600D3 */ addiu $a2, $a2, 0xd3 /* 083ABC 80082EBC 8FA60028 */ lw $a2, 0x28($sp) /* 083AC0 80082EC0 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012 @@ -235,7 +235,7 @@ glabel menu_logo_screen_loop /* 083AD0 80082ED0 24E71DF0 */ addiu $a3, %lo(D_800E1DF0) # addiu $a3, $a3, 0x1df0 /* 083AD4 80082ED4 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0 /* 083AD8 80082ED8 24058000 */ li $a1, -32768 -/* 083ADC 80082EDC 0C031110 */ jal func_800C4440 +/* 083ADC 80082EDC 0C031110 */ jal draw_text /* 083AE0 80082EE0 24C600D5 */ addiu $a2, $a2, 0xd5 /* 083AE4 80082EE4 3C018012 */ lui $at, %hi(D_80126450) # $at, 0x8012 /* 083AE8 80082EE8 C4286450 */ lwc1 $f8, %lo(D_80126450)($at) @@ -275,7 +275,7 @@ glabel menu_logo_screen_loop /* 083B64 80082F64 240500FF */ li $a1, 255 /* 083B68 80082F68 240600FF */ li $a2, 255 /* 083B6C 80082F6C 240700FF */ li $a3, 255 -/* 083B70 80082F70 0C0310E1 */ jal func_800C4384 +/* 083B70 80082F70 0C0310E1 */ jal set_text_color /* 083B74 80082F74 AFA20010 */ sw $v0, 0x10($sp) /* 083B78 80082F78 3C048012 */ lui $a0, %hi(D_801263A0) # $a0, 0x8012 /* 083B7C 80082F7C 8FA60020 */ lw $a2, 0x20($sp) @@ -284,7 +284,7 @@ glabel menu_logo_screen_loop /* 083B88 80082F88 AFAC0010 */ sw $t4, 0x10($sp) /* 083B8C 80082F8C 24E71DF0 */ addiu $a3, %lo(D_800E1DF0) # addiu $a3, $a3, 0x1df0 /* 083B90 80082F90 248463A0 */ addiu $a0, %lo(D_801263A0) # addiu $a0, $a0, 0x63a0 -/* 083B94 80082F94 0C031110 */ jal func_800C4440 +/* 083B94 80082F94 0C031110 */ jal draw_text /* 083B98 80082F98 24058000 */ li $a1, -32768 /* 083B9C 80082F9C 8FBF001C */ lw $ra, 0x1c($sp) .L80082FA0: diff --git a/asm/non_matchings/menu/menu_options_loop.s b/asm/non_matchings/menu/menu_options_loop.s index a7a4139f..456b4539 100644 --- a/asm/non_matchings/menu/menu_options_loop.s +++ b/asm/non_matchings/menu/menu_options_loop.s @@ -120,7 +120,7 @@ glabel menu_options_loop /* 085114 80084514 24010001 */ li $at, 1 /* 085118 80084518 10E00016 */ beqz $a3, .L80084574 /* 08511C 8008451C 00000000 */ nop -/* 085120 80084520 0C027AC8 */ jal func_8009EB20 +/* 085120 80084520 0C027AC8 */ jal get_language /* 085124 80084524 00000000 */ nop /* 085128 80084528 000267C3 */ sra $t4, $v0, 0x1f /* 08512C 8008452C 15800007 */ bnez $t4, .L8008454C diff --git a/asm/non_matchings/menu/menu_title_screen_init.s b/asm/non_matchings/menu/menu_title_screen_init.s index ac0502f7..da45925d 100644 --- a/asm/non_matchings/menu/menu_title_screen_init.s +++ b/asm/non_matchings/menu/menu_title_screen_init.s @@ -7,7 +7,7 @@ glabel menu_title_screen_init /* 084150 80083550 AC2063BC */ sw $zero, %lo(D_801263BC)($at) /* 084154 80083554 AFBF0014 */ sw $ra, 0x14($sp) /* 084158 80083558 3C01800E */ lui $at, %hi(D_800DF47C) # $at, 0x800e -/* 08415C 8008355C 0C027055 */ jal func_8009C154 +/* 08415C 8008355C 0C027055 */ jal reset_character_id_slots /* 084160 80083560 AC20F47C */ sw $zero, %lo(D_800DF47C)($at) /* 084164 80083564 3C01800E */ lui $at, %hi(gSaveFileIndex) # $at, 0x800e /* 084168 80083568 AC20F4CC */ sw $zero, %lo(gSaveFileIndex)($at) @@ -101,7 +101,7 @@ glabel menu_title_screen_init /* 0842BC 800836BC 2404001B */ li $a0, 27 /* 0842C0 800836C0 0C019830 */ jal func_800660C0 /* 0842C4 800836C4 00000000 */ nop -/* 0842C8 800836C8 0C0310BB */ jal func_800C42EC +/* 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 diff --git a/asm/non_matchings/menu/menu_trophy_race_rankings_loop.s b/asm/non_matchings/menu/menu_trophy_race_rankings_loop.s index 43e2907f..77a1db0d 100644 --- a/asm/non_matchings/menu/menu_trophy_race_rankings_loop.s +++ b/asm/non_matchings/menu/menu_trophy_race_rankings_loop.s @@ -68,7 +68,7 @@ glabel menu_trophy_race_rankings_loop /* 099CD0 800990D0 AC2F63E0 */ sw $t7, %lo(D_801263E0)($at) /* 099CD4 800990D4 24A51048 */ addiu $a1, %lo(D_800E1048) # addiu $a1, $a1, 0x1048 /* 099CD8 800990D8 24040001 */ li $a0, 1 -/* 099CDC 800990DC 0C02087B */ jal DrawMenuText +/* 099CDC 800990DC 0C02087B */ jal draw_menu_element /* 099CE0 800990E0 3C063F80 */ lui $a2, 0x3f80 /* 099CE4 800990E4 10000141 */ b .L800995EC /* 099CE8 800990E8 8FBF001C */ lw $ra, 0x1c($sp) diff --git a/asm/non_matchings/menu/menu_trophy_race_round_init.s b/asm/non_matchings/menu/menu_trophy_race_round_init.s index 5bf33fa2..37129511 100644 --- a/asm/non_matchings/menu/menu_trophy_race_round_init.s +++ b/asm/non_matchings/menu/menu_trophy_race_round_init.s @@ -50,8 +50,8 @@ glabel menu_trophy_race_round_init /* 098F1C 8009831C 8E690000 */ lw $t1, ($s3) /* 098F20 80098320 00008825 */ move $s1, $zero /* 098F24 80098324 1920000A */ blez $t1, .L80098350 -/* 098F28 80098328 3C128012 */ lui $s2, %hi(gPlayerVehicle) # $s2, 0x8012 -/* 098F2C 8009832C 265269C0 */ addiu $s2, %lo(gPlayerVehicle) # addiu $s2, $s2, 0x69c0 +/* 098F28 80098328 3C128012 */ lui $s2, %hi(gPlayerSelectVehicle) # $s2, 0x8012 +/* 098F2C 8009832C 265269C0 */ addiu $s2, %lo(gPlayerSelectVehicle) # addiu $s2, $s2, 0x69c0 .L80098330: /* 098F30 80098330 0C01AC2B */ jal func_8006B0AC /* 098F34 80098334 02002025 */ move $a0, $s0 diff --git a/asm/non_matchings/unknown_005740/func_800090C0.s b/asm/non_matchings/unknown_005740/func_800090C0.s index 9109d33e..23b18851 100644 --- a/asm/non_matchings/unknown_005740/func_800090C0.s +++ b/asm/non_matchings/unknown_005740/func_800090C0.s @@ -118,7 +118,7 @@ glabel func_800090C0 .L80009278: /* 009E78 80009278 24630040 */ addiu $v1, $v1, 0x40 .L8000927C: -/* 009E7C 8000927C 0C0270C3 */ jal func_8009C30C +/* 009E7C 8000927C 0C0270C3 */ jal get_filtered_cheats /* 009E80 80009280 AFA30020 */ sw $v1, 0x20($sp) /* 009E84 80009284 8FA30020 */ lw $v1, 0x20($sp) /* 009E88 80009288 30490004 */ andi $t1, $v0, 4 diff --git a/asm/non_matchings/unknown_00BC20/func_8000CC7C.s b/asm/non_matchings/unknown_00BC20/func_8000CC7C.s index 75b28cfb..44025344 100644 --- a/asm/non_matchings/unknown_00BC20/func_8000CC7C.s +++ b/asm/non_matchings/unknown_00BC20/func_8000CC7C.s @@ -664,7 +664,7 @@ glabel func_8000CC7C /* 00E19C 8000D59C 10400006 */ beqz $v0, .L8000D5B8 /* 00E1A0 8000D5A0 00002025 */ move $a0, $zero .L8000D5A4: -/* 00E1A4 8000D5A4 0C027094 */ jal func_8009C250 +/* 00E1A4 8000D5A4 0C027094 */ jal get_player_selected_vehicle /* 00E1A8 8000D5A8 AFA60054 */ sw $a2, 0x54($sp) /* 00E1AC 8000D5AC 8FA60054 */ lw $a2, 0x54($sp) /* 00E1B0 8000D5B0 1000000B */ b .L8000D5E0 @@ -676,7 +676,7 @@ glabel func_8000CC7C /* 00E1C4 8000D5C4 14200006 */ bnez $at, .L8000D5E0 /* 00E1C8 8000D5C8 00000000 */ nop /* 00E1CC 8000D5CC 86C4000E */ lh $a0, 0xe($s6) -/* 00E1D0 8000D5D0 0C027094 */ jal func_8009C250 +/* 00E1D0 8000D5D0 0C027094 */ jal get_player_selected_vehicle /* 00E1D4 8000D5D4 AFA60054 */ sw $a2, 0x54($sp) /* 00E1D8 8000D5D8 8FA60054 */ lw $a2, 0x54($sp) /* 00E1DC 8000D5DC 0040F025 */ move $fp, $v0 @@ -878,7 +878,7 @@ glabel func_8000CC7C .L8000D8A4: /* 00E4A4 8000D8A4 A2600185 */ sb $zero, 0x185($s3) .L8000D8A8: -/* 00E4A8 8000D8A8 0C0270C3 */ jal func_8009C30C +/* 00E4A8 8000D8A8 0C0270C3 */ jal get_filtered_cheats /* 00E4AC 8000D8AC 00000000 */ nop /* 00E4B0 8000D8B0 304E0080 */ andi $t6, $v0, 0x80 /* 00E4B4 8000D8B4 11C0000B */ beqz $t6, .L8000D8E4 @@ -1235,7 +1235,7 @@ glabel L8000D98C /* 00E9C4 8000DDC4 1420FFEE */ bnez $at, .L8000DD80 /* 00E9C8 8000DDC8 24630004 */ addiu $v1, $v1, 4 .L8000DDCC: -/* 00E9CC 8000DDCC 0C0270C3 */ jal func_8009C30C +/* 00E9CC 8000DDCC 0C0270C3 */ jal get_filtered_cheats /* 00E9D0 8000DDD0 00000000 */ nop /* 00E9D4 8000DDD4 30590010 */ andi $t9, $v0, 0x10 /* 00E9D8 8000DDD8 13200006 */ beqz $t9, .L8000DDF4 @@ -1246,7 +1246,7 @@ glabel L8000D98C /* 00E9EC 8000DDEC 460A4402 */ mul.s $f16, $f8, $f10 /* 00E9F0 8000DDF0 E6300008 */ swc1 $f16, 8($s1) .L8000DDF4: -/* 00E9F4 8000DDF4 0C0270C3 */ jal func_8009C30C +/* 00E9F4 8000DDF4 0C0270C3 */ jal get_filtered_cheats /* 00E9F8 8000DDF8 00000000 */ nop /* 00E9FC 8000DDFC 304F0020 */ andi $t7, $v0, 0x20 /* 00EA00 8000DE00 11E00006 */ beqz $t7, .L8000DE1C diff --git a/asm/non_matchings/unknown_00BC20/func_8000E2B4.s b/asm/non_matchings/unknown_00BC20/func_8000E2B4.s index 489c085f..954b8248 100644 --- a/asm/non_matchings/unknown_00BC20/func_8000E2B4.s +++ b/asm/non_matchings/unknown_00BC20/func_8000E2B4.s @@ -102,7 +102,7 @@ glabel func_8000E2B4 /* 00F01C 8000E41C A4600000 */ sh $zero, ($v1) /* 00F020 8000E420 AC600118 */ sw $zero, 0x118($v1) /* 00F024 8000E424 A0690003 */ sb $t1, 3($v1) -/* 00F028 8000E428 0C0270C3 */ jal func_8009C30C +/* 00F028 8000E428 0C0270C3 */ jal get_filtered_cheats /* 00F02C 8000E42C AFA2003C */ sw $v0, 0x3c($sp) /* 00F030 8000E430 8FA4003C */ lw $a0, 0x3c($sp) /* 00F034 8000E434 30480010 */ andi $t0, $v0, 0x10 @@ -114,7 +114,7 @@ glabel func_8000E2B4 /* 00F04C 8000E44C 46062202 */ mul.s $f8, $f4, $f6 /* 00F050 8000E450 E4880008 */ swc1 $f8, 8($a0) .L8000E454: -/* 00F054 8000E454 0C0270C3 */ jal func_8009C30C +/* 00F054 8000E454 0C0270C3 */ jal get_filtered_cheats /* 00F058 8000E458 AFA4003C */ sw $a0, 0x3c($sp) /* 00F05C 8000E45C 8FA4003C */ lw $a0, 0x3c($sp) /* 00F060 8000E460 304A0020 */ andi $t2, $v0, 0x20 diff --git a/asm/non_matchings/unknown_00BC20/func_8000EA54.s b/asm/non_matchings/unknown_00BC20/func_8000EA54.s index 380ac789..967e7a0c 100644 --- a/asm/non_matchings/unknown_00BC20/func_8000EA54.s +++ b/asm/non_matchings/unknown_00BC20/func_8000EA54.s @@ -182,7 +182,7 @@ glabel L8000ECD8 /* 00F8EC 8000ECEC 1000003D */ b .L8000EDE4 /* 00F8F0 8000ECF0 8FAF002C */ lw $t7, 0x2c($sp) glabel L8000ECF4 -/* 00F8F4 8000ECF4 0C02708A */ jal func_8009C228 +/* 00F8F4 8000ECF4 0C02708A */ jal get_character_id_from_slot /* 00F8F8 8000ECF8 00002025 */ move $a0, $zero /* 00F8FC 8000ECFC A242003A */ sb $v0, 0x3a($s2) /* 00F900 8000ED00 8FA7006C */ lw $a3, 0x6c($sp) diff --git a/asm/non_matchings/unknown_0255E0/func_80024D54.s b/asm/non_matchings/unknown_0255E0/func_80024D54.s index d209319f..92ebe797 100644 --- a/asm/non_matchings/unknown_0255E0/func_80024D54.s +++ b/asm/non_matchings/unknown_0255E0/func_80024D54.s @@ -155,7 +155,7 @@ glabel func_80024D54 /* 025B94 80024F94 0C01FBE0 */ jal func_8007EF80 /* 025B98 80024F98 00000000 */ nop .L80024F9C: -/* 025B9C 80024F9C 0C0270C3 */ jal func_8009C30C +/* 025B9C 80024F9C 0C0270C3 */ jal get_filtered_cheats /* 025BA0 80024FA0 A3A00083 */ sb $zero, 0x83($sp) /* 025BA4 80024FA4 304B0004 */ andi $t3, $v0, 4 /* 025BA8 80024FA8 11600003 */ beqz $t3, .L80024FB8 @@ -452,7 +452,7 @@ glabel func_80024D54 /* 026000 80025400 02402825 */ move $a1, $s2 /* 026004 80025404 0C02B288 */ jal func_800ACA20 /* 026008 80025408 00403825 */ move $a3, $v0 -/* 02600C 8002540C 0C0310BB */ jal func_800C42EC +/* 02600C 8002540C 0C0310BB */ jal set_text_font /* 026010 80025410 00002025 */ move $a0, $zero /* 026014 80025414 3C198000 */ lui $t9, %hi(osTvType) # $t9, 0x8000 /* 026018 80025418 8F390300 */ lw $t9, %lo(osTvType)($t9) @@ -467,7 +467,7 @@ glabel func_80024D54 /* 026038 80025438 2406007D */ li $a2, 125 .L8002543C: /* 02603C 8002543C 24E75DF0 */ addiu $a3, %lo(D_800E5DF0) # addiu $a3, $a3, 0x5df0 -/* 026040 80025440 0C031110 */ jal func_800C4440 +/* 026040 80025440 0C031110 */ jal draw_text /* 026044 80025444 AFA00010 */ sw $zero, 0x10($sp) /* 026048 80025448 10000006 */ b .L80025464 /* 02604C 8002544C 00000000 */ nop diff --git a/asm/non_matchings/unknown_0255E0/func_8002E234.s b/asm/non_matchings/unknown_0255E0/func_8002E234.s index e6d4a0d5..969ef5e9 100644 --- a/asm/non_matchings/unknown_0255E0/func_8002E234.s +++ b/asm/non_matchings/unknown_0255E0/func_8002E234.s @@ -32,7 +32,7 @@ glabel func_8002E234 /* 02EE88 8002E288 0080A825 */ move $s5, $a0 /* 02EE8C 8002E28C 164F000F */ bne $s2, $t7, .L8002E2CC /* 02EE90 8002E290 00A0B025 */ move $s6, $a1 -/* 02EE94 8002E294 0C0270C3 */ jal func_8009C30C +/* 02EE94 8002E294 0C0270C3 */ jal get_filtered_cheats /* 02EE98 8002E298 E7B2006C */ swc1 $f18, 0x6c($sp) /* 02EE9C 8002E29C C7B2006C */ lwc1 $f18, 0x6c($sp) /* 02EEA0 8002E2A0 30580010 */ andi $t8, $v0, 0x10 diff --git a/asm/non_matchings/unknown_032760/func_8003588C.s b/asm/non_matchings/unknown_032760/func_8003588C.s index b5467400..d9385931 100644 --- a/asm/non_matchings/unknown_032760/func_8003588C.s +++ b/asm/non_matchings/unknown_032760/func_8003588C.s @@ -45,7 +45,7 @@ glabel func_8003588C /* 036530 80035930 8C98004C */ lw $t8, 0x4c($a0) /* 036534 80035934 00000000 */ nop /* 036538 80035938 A3000012 */ sb $zero, 0x12($t8) -/* 03653C 8003593C 0C0270C3 */ jal func_8009C30C +/* 03653C 8003593C 0C0270C3 */ jal get_filtered_cheats /* 036540 80035940 AFA40018 */ sw $a0, 0x18($sp) /* 036544 80035944 8FA40018 */ lw $a0, 0x18($sp) /* 036548 80035948 0002CA80 */ sll $t9, $v0, 0xa diff --git a/asm/non_matchings/unknown_032760/func_80035AE8.s b/asm/non_matchings/unknown_032760/func_80035AE8.s index 3cf6a451..21b2a999 100644 --- a/asm/non_matchings/unknown_032760/func_80035AE8.s +++ b/asm/non_matchings/unknown_032760/func_80035AE8.s @@ -81,7 +81,7 @@ glabel func_80035AE8 /* 036814 80035C14 8C8F004C */ lw $t7, 0x4c($a0) /* 036818 80035C18 00000000 */ nop /* 03681C 80035C1C A1EE0017 */ sb $t6, 0x17($t7) -/* 036820 80035C20 0C0270C3 */ jal func_8009C30C +/* 036820 80035C20 0C0270C3 */ jal get_filtered_cheats /* 036824 80035C24 AFA40018 */ sw $a0, 0x18($sp) /* 036828 80035C28 8FA40018 */ lw $a0, 0x18($sp) /* 03682C 80035C2C 0002C280 */ sll $t8, $v0, 0xa diff --git a/asm/non_matchings/unknown_032760/func_8003DFCC.s b/asm/non_matchings/unknown_032760/func_8003DFCC.s index ac739e76..0c5b1181 100644 --- a/asm/non_matchings/unknown_032760/func_8003DFCC.s +++ b/asm/non_matchings/unknown_032760/func_8003DFCC.s @@ -11,7 +11,7 @@ glabel func_8003DFCC /* 03EBF0 8003DFF0 24080014 */ li $t0, 20 /* 03EBF4 8003DFF4 A1280010 */ sb $t0, 0x10($t1) /* 03EBF8 8003DFF8 AFA5001C */ sw $a1, 0x1c($sp) -/* 03EBFC 8003DFFC 0C0270C3 */ jal func_8009C30C +/* 03EBFC 8003DFFC 0C0270C3 */ jal get_filtered_cheats /* 03EC00 8003E000 AFA40018 */ sw $a0, 0x18($sp) /* 03EC04 8003E004 8FA40018 */ lw $a0, 0x18($sp) /* 03EC08 8003E008 8FA5001C */ lw $a1, 0x1c($sp) @@ -88,7 +88,7 @@ glabel func_8003DFCC /* 03ED04 8003E104 A4400004 */ sh $zero, 4($v0) /* 03ED08 8003E108 E4500000 */ swc1 $f16, ($v0) /* 03ED0C 8003E10C AC80007C */ sw $zero, 0x7c($a0) -/* 03ED10 8003E110 0C0270C3 */ jal func_8009C30C +/* 03ED10 8003E110 0C0270C3 */ jal get_filtered_cheats /* 03ED14 8003E114 AFA40018 */ sw $a0, 0x18($sp) /* 03ED18 8003E118 8FA40018 */ lw $a0, 0x18($sp) /* 03ED1C 8003E11C 30480800 */ andi $t0, $v0, 0x800 diff --git a/asm/non_matchings/unknown_032760/func_8003E140.s b/asm/non_matchings/unknown_032760/func_8003E140.s index 0d1d01ac..2679a43a 100644 --- a/asm/non_matchings/unknown_032760/func_8003E140.s +++ b/asm/non_matchings/unknown_032760/func_8003E140.s @@ -181,7 +181,7 @@ glabel func_8003E140 /* 03EFB4 8003E3B4 240C0003 */ li $t4, 3 .L8003E3B8: /* 03EFB8 8003E3B8 A3AC002D */ sb $t4, 0x2d($sp) -/* 03EFBC 8003E3BC 0C0270C3 */ jal func_8009C30C +/* 03EFBC 8003E3BC 0C0270C3 */ jal get_filtered_cheats /* 03EFC0 8003E3C0 AFA30038 */ sw $v1, 0x38($sp) /* 03EFC4 8003E3C4 8FA30038 */ lw $v1, 0x38($sp) /* 03EFC8 8003E3C8 00026AC0 */ sll $t5, $v0, 0xb diff --git a/asm/non_matchings/unknown_043920/func_8004DE38.s b/asm/non_matchings/unknown_043920/func_8004DE38.s index f77b566a..552ccad2 100644 --- a/asm/non_matchings/unknown_043920/func_8004DE38.s +++ b/asm/non_matchings/unknown_043920/func_8004DE38.s @@ -228,7 +228,7 @@ glabel func_8004DE38 /* 04ED0C 8004E10C 00002025 */ move $a0, $zero /* 04ED10 8004E110 14600015 */ bnez $v1, .L8004E168 /* 04ED14 8004E114 00002025 */ move $a0, $zero -/* 04ED18 8004E118 0C0270C3 */ jal func_8009C30C +/* 04ED18 8004E118 0C0270C3 */ jal get_filtered_cheats /* 04ED1C 8004E11C 00000000 */ nop /* 04ED20 8004E120 304C0200 */ andi $t4, $v0, 0x200 /* 04ED24 8004E124 1180000F */ beqz $t4, .L8004E164 @@ -591,7 +591,7 @@ glabel func_8004DE38 /* 04F264 8004E664 0C01A967 */ jal func_8006A59C /* 04F268 8004E668 AFA600AC */ sw $a2, 0xac($sp) /* 04F26C 8004E66C 3C018012 */ lui $at, %hi(D_8011D534) # $at, 0x8012 -/* 04F270 8004E670 0C0270C3 */ jal func_8009C30C +/* 04F270 8004E670 0C0270C3 */ jal get_filtered_cheats /* 04F274 8004E674 AC22D534 */ sw $v0, %lo(D_8011D534)($at) /* 04F278 8004E678 8FA600AC */ lw $a2, 0xac($sp) /* 04F27C 8004E67C 30480004 */ andi $t0, $v0, 4 @@ -1682,7 +1682,7 @@ glabel L8004ED88 /* 050210 8004F610 00000000 */ nop /* 050214 8004F614 45010006 */ bc1t .L8004F630 /* 050218 8004F618 00000000 */ nop -/* 05021C 8004F61C 0C0270C3 */ jal func_8009C30C +/* 05021C 8004F61C 0C0270C3 */ jal get_filtered_cheats /* 050220 8004F620 00000000 */ nop /* 050224 8004F624 30580004 */ andi $t8, $v0, 4 /* 050228 8004F628 13000007 */ beqz $t8, .L8004F648 diff --git a/asm/non_matchings/unknown_043920/func_80050A28.s b/asm/non_matchings/unknown_043920/func_80050A28.s index 91c53c2a..ed0ea437 100644 --- a/asm/non_matchings/unknown_043920/func_80050A28.s +++ b/asm/non_matchings/unknown_043920/func_80050A28.s @@ -763,7 +763,7 @@ glabel func_80050A28 /* 05206C 8005146C AFA90064 */ sw $t1, 0x64($sp) /* 052070 80051470 E7A20048 */ swc1 $f2, 0x48($sp) /* 052074 80051474 E7AE0044 */ swc1 $f14, 0x44($sp) -/* 052078 80051478 0C0270C3 */ jal func_8009C30C +/* 052078 80051478 0C0270C3 */ jal get_filtered_cheats /* 05207C 8005147C E7B00040 */ swc1 $f16, 0x40($sp) /* 052080 80051480 8FA50028 */ lw $a1, 0x28($sp) /* 052084 80051484 8FA60070 */ lw $a2, 0x70($sp) diff --git a/asm/non_matchings/unknown_043920/func_80057220.s b/asm/non_matchings/unknown_043920/func_80057220.s index fe486e59..7dedf5f2 100644 --- a/asm/non_matchings/unknown_043920/func_80057220.s +++ b/asm/non_matchings/unknown_043920/func_80057220.s @@ -226,7 +226,7 @@ glabel func_80057220 /* 05813C 8005753C 00000000 */ nop /* 058140 80057540 45000009 */ bc1f .L80057568 /* 058144 80057544 00000000 */ nop -/* 058148 80057548 0C0270C3 */ jal func_8009C30C +/* 058148 80057548 0C0270C3 */ jal get_filtered_cheats /* 05814C 8005754C E7A20034 */ swc1 $f2, 0x34($sp) /* 058150 80057550 C7A20034 */ lwc1 $f2, 0x34($sp) /* 058154 80057554 30594000 */ andi $t9, $v0, 0x4000 @@ -235,7 +235,7 @@ glabel func_80057220 /* 058160 80057560 44811000 */ mtc1 $at, $f2 /* 058164 80057564 00000000 */ nop .L80057568: -/* 058168 80057568 0C0270C3 */ jal func_8009C30C +/* 058168 80057568 0C0270C3 */ jal get_filtered_cheats /* 05816C 8005756C E7A20034 */ swc1 $f2, 0x34($sp) /* 058170 80057570 C7A20034 */ lwc1 $f2, 0x34($sp) /* 058174 80057574 30482000 */ andi $t0, $v0, 0x2000 diff --git a/asm/non_matchings/unknown_043920/func_800576E0.s b/asm/non_matchings/unknown_043920/func_800576E0.s index 41c0a950..3aa4f8f6 100644 --- a/asm/non_matchings/unknown_043920/func_800576E0.s +++ b/asm/non_matchings/unknown_043920/func_800576E0.s @@ -20,7 +20,7 @@ glabel func_800576E0 /* 058328 80057728 E7B70020 */ swc1 $f23, 0x20($sp) /* 05832C 8005772C E7B60024 */ swc1 $f22, 0x24($sp) /* 058330 80057730 E7B50018 */ swc1 $f21, 0x18($sp) -/* 058334 80057734 0C0270C3 */ jal func_8009C30C +/* 058334 80057734 0C0270C3 */ jal get_filtered_cheats /* 058338 80057738 E7B4001C */ swc1 $f20, 0x1c($sp) /* 05833C 8005773C 304E0080 */ andi $t6, $v0, 0x80 /* 058340 80057740 15C00088 */ bnez $t6, .L80057964 diff --git a/asm/non_matchings/unknown_066AA0/func_80066610.s b/asm/non_matchings/unknown_066AA0/func_80066610.s index 93b4942d..ac22b253 100644 --- a/asm/non_matchings/unknown_066AA0/func_80066610.s +++ b/asm/non_matchings/unknown_066AA0/func_80066610.s @@ -111,7 +111,7 @@ glabel func_80066610 /* 067398 80066798 000F4080 */ sll $t0, $t7, 2 /* 06739C 8006679C 010F4021 */ addu $t0, $t0, $t7 /* 0673A0 800667A0 02C89821 */ addu $s3, $s6, $t0 -/* 0673A4 800667A4 0C0270C3 */ jal func_8009C30C +/* 0673A4 800667A4 0C0270C3 */ jal get_filtered_cheats /* 0673A8 800667A8 2673000A */ addiu $s3, $s3, 0xa /* 0673AC 800667AC 30490004 */ andi $t1, $v0, 4 /* 0673B0 800667B0 11200002 */ beqz $t1, .L800667BC diff --git a/asm/non_matchings/unknown_066AA0/func_80068158.s b/asm/non_matchings/unknown_066AA0/func_80068158.s index 04c58b7d..9bf203a1 100644 --- a/asm/non_matchings/unknown_066AA0/func_80068158.s +++ b/asm/non_matchings/unknown_066AA0/func_80068158.s @@ -4,7 +4,7 @@ glabel func_80068158 /* 068D60 80068160 AFA40018 */ sw $a0, 0x18($sp) /* 068D64 80068164 AFA60020 */ sw $a2, 0x20($sp) /* 068D68 80068168 AFA70024 */ sw $a3, 0x24($sp) -/* 068D6C 8006816C 0C0270C3 */ jal func_8009C30C +/* 068D6C 8006816C 0C0270C3 */ jal get_filtered_cheats /* 068D70 80068170 AFA5001C */ sw $a1, 0x1c($sp) /* 068D74 80068174 8FA5001C */ lw $a1, 0x1c($sp) /* 068D78 80068178 8FA80018 */ lw $t0, 0x18($sp) diff --git a/asm/non_matchings/unknown_066AA0/func_8006BDDC.s b/asm/non_matchings/unknown_066AA0/func_8006BDDC.s index 58a10294..fe82ec3a 100644 --- a/asm/non_matchings/unknown_066AA0/func_8006BDDC.s +++ b/asm/non_matchings/unknown_066AA0/func_8006BDDC.s @@ -19,7 +19,7 @@ glabel func_8006BDDC /* 06CA18 8006BE18 01F8C821 */ addu $t9, $t7, $t8 /* 06CA1C 8006BE1C 8F240000 */ lw $a0, ($t9) /* 06CA20 8006BE20 A3A3001B */ sb $v1, 0x1b($sp) -/* 06CA24 8006BE24 0C027AC8 */ jal func_8009EB20 +/* 06CA24 8006BE24 0C027AC8 */ jal get_language /* 06CA28 8006BE28 AFA4001C */ sw $a0, 0x1c($sp) /* 06CA2C 8006BE2C 93A3001B */ lbu $v1, 0x1b($sp) /* 06CA30 8006BE30 8FA4001C */ lw $a0, 0x1c($sp) diff --git a/asm/non_matchings/unknown_066AA0/func_8006BFC8.s b/asm/non_matchings/unknown_066AA0/func_8006BFC8.s index e2c6e835..ca7e1f2f 100644 --- a/asm/non_matchings/unknown_066AA0/func_8006BFC8.s +++ b/asm/non_matchings/unknown_066AA0/func_8006BFC8.s @@ -44,7 +44,7 @@ glabel func_8006BFC8 /* 06CC60 8006C060 020D7821 */ addu $t7, $s0, $t5 .L8006C064: /* 06CC64 8006C064 81F00000 */ lb $s0, ($t7) -/* 06CC68 8006C068 0C0270C3 */ jal func_8009C30C +/* 06CC68 8006C068 0C0270C3 */ jal get_filtered_cheats /* 06CC6C 8006C06C 00000000 */ nop /* 06CC70 8006C070 00027180 */ sll $t6, $v0, 6 /* 06CC74 8006C074 05C10002 */ bgez $t6, .L8006C080 diff --git a/asm/non_matchings/unknown_066AA0/func_8006DCF8.s b/asm/non_matchings/unknown_066AA0/func_8006DCF8.s index 58b39c09..c5e49188 100644 --- a/asm/non_matchings/unknown_066AA0/func_8006DCF8.s +++ b/asm/non_matchings/unknown_066AA0/func_8006DCF8.s @@ -322,7 +322,7 @@ glabel L8006E0E0 /* 06EDA8 8006E1A8 3C0B8012 */ lui $t3, %hi(D_80123508) # $t3, 0x8012 /* 06EDAC 8006E1AC 256B3508 */ addiu $t3, %lo(D_80123508) # addiu $t3, $t3, 0x3508 /* 06EDB0 8006E1B0 00002025 */ move $a0, $zero -/* 06EDB4 8006E1B4 0C027094 */ jal func_8009C250 +/* 06EDB4 8006E1B4 0C027094 */ jal get_player_selected_vehicle /* 06EDB8 8006E1B8 AD6C0000 */ sw $t4, ($t3) /* 06EDBC 8006E1BC 3C108012 */ lui $s0, %hi(gSettingsPtr) # $s0, 0x8012 /* 06EDC0 8006E1C0 26103510 */ addiu $s0, %lo(gSettingsPtr) # addiu $s0, $s0, 0x3510 diff --git a/asm/non_matchings/unknown_066AA0/func_8006E3BC.s b/asm/non_matchings/unknown_066AA0/func_8006E3BC.s index 6d9709a7..9c7258cd 100644 --- a/asm/non_matchings/unknown_066AA0/func_8006E3BC.s +++ b/asm/non_matchings/unknown_066AA0/func_8006E3BC.s @@ -3,7 +3,7 @@ glabel func_8006E3BC /* 06EFC0 8006E3C0 AFBF0014 */ sw $ra, 0x14($sp) /* 06EFC4 8006E3C4 0C01A9AC */ jal func_8006A6B0 /* 06EFC8 8006E3C8 00000000 */ nop -/* 06EFCC 8006E3CC 0C027055 */ jal func_8009C154 +/* 06EFCC 8006E3CC 0C027055 */ jal reset_character_id_slots /* 06EFD0 8006E3D0 00000000 */ nop /* 06EFD4 8006E3D4 27A40018 */ addiu $a0, $sp, 0x18 /* 06EFD8 8006E3D8 0C01AC89 */ jal func_8006B224 diff --git a/asm/non_matchings/unknown_072E50/func_80075E60.s b/asm/non_matchings/unknown_072E50/func_80075E60.s index bf60232a..c56637b6 100644 --- a/asm/non_matchings/unknown_072E50/func_80075E60.s +++ b/asm/non_matchings/unknown_072E50/func_80075E60.s @@ -43,7 +43,7 @@ glabel func_80075E60 /* 076B00 80075F00 1000008D */ b .L80076138 /* 076B04 80075F04 03201025 */ move $v0, $t9 .L80075F08: -/* 076B08 80075F08 0C027AC8 */ jal func_8009EB20 +/* 076B08 80075F08 0C027AC8 */ jal get_language /* 076B0C 80075F0C 00000000 */ nop /* 076B10 80075F10 24010003 */ li $at, 3 /* 076B14 80075F14 8FA90068 */ lw $t1, 0x68($sp) diff --git a/asm/non_matchings/unknown_072E50/func_800764E8.s b/asm/non_matchings/unknown_072E50/func_800764E8.s index fdb635e9..60d935d0 100644 --- a/asm/non_matchings/unknown_072E50/func_800764E8.s +++ b/asm/non_matchings/unknown_072E50/func_800764E8.s @@ -13,7 +13,7 @@ glabel func_800764E8 /* 077114 80076514 27A5002C */ addiu $a1, $sp, 0x2c /* 077118 80076518 0C01DA8E */ jal func_80076A38 /* 07711C 8007651C 24060004 */ li $a2, 4 -/* 077120 80076520 0C027AC8 */ jal func_8009EB20 +/* 077120 80076520 0C027AC8 */ jal get_language /* 077124 80076524 00000000 */ nop /* 077128 80076528 24010003 */ li $at, 3 /* 07712C 8007652C 14410004 */ bne $v0, $at, .L80076540 diff --git a/asm/non_matchings/unknown_072E50/func_800766D4.s b/asm/non_matchings/unknown_072E50/func_800766D4.s index 78a6cbb2..abd8d9db 100644 --- a/asm/non_matchings/unknown_072E50/func_800766D4.s +++ b/asm/non_matchings/unknown_072E50/func_800766D4.s @@ -30,7 +30,7 @@ glabel func_800766D4 /* 07733C 8007673C 27A5003C */ addiu $a1, $sp, 0x3c /* 077340 80076740 0C01DA8E */ jal func_80076A38 /* 077344 80076744 24060004 */ li $a2, 4 -/* 077348 80076748 0C027AC8 */ jal func_8009EB20 +/* 077348 80076748 0C027AC8 */ jal get_language /* 07734C 8007674C 00000000 */ nop /* 077350 80076750 24010003 */ li $at, 3 /* 077354 80076754 14410005 */ bne $v0, $at, .L8007676C diff --git a/asm/non_matchings/unknown_09F8F0/func_800A0EB4.s b/asm/non_matchings/unknown_09F8F0/func_800A0EB4.s index db1eea20..54dd4cca 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A0EB4.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A0EB4.s @@ -83,7 +83,7 @@ glabel L800A0FAC /* 0A1BC0 800A0FC0 A6090006 */ sh $t1, 6($s0) /* 0A1BC4 800A0FC4 A6000000 */ sh $zero, ($s0) .L800A0FC8: -/* 0A1BC8 800A0FC8 0C0270C3 */ jal func_8009C30C +/* 0A1BC8 800A0FC8 0C0270C3 */ jal get_filtered_cheats /* 0A1BCC 800A0FCC 00000000 */ nop /* 0A1BD0 800A0FD0 304A0004 */ andi $t2, $v0, 4 /* 0A1BD4 800A0FD4 1140000C */ beqz $t2, .L800A1008 @@ -184,7 +184,7 @@ glabel L800A0FAC /* 0A1D40 800A1140 26100420 */ addiu $s0, $s0, 0x420 /* 0A1D44 800A1144 A6000000 */ sh $zero, ($s0) /* 0A1D48 800A1148 A6000002 */ sh $zero, 2($s0) -/* 0A1D4C 800A114C 0C0270C3 */ jal func_8009C30C +/* 0A1D4C 800A114C 0C0270C3 */ jal get_filtered_cheats /* 0A1D50 800A1150 A60D0006 */ sh $t5, 6($s0) /* 0A1D54 800A1154 304C0004 */ andi $t4, $v0, 4 /* 0A1D58 800A1158 1180000C */ beqz $t4, .L800A118C diff --git a/asm/non_matchings/unknown_09F8F0/func_800A277C.s b/asm/non_matchings/unknown_09F8F0/func_800A277C.s index f59a9926..8014fca5 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A277C.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A277C.s @@ -933,14 +933,14 @@ glabel func_800A277C .L800A34D8: /* 0A40D8 800A34D8 0C031059 */ jal func_800C4164 /* 0A40DC 800A34DC 24040001 */ li $a0, 1 -/* 0A40E0 800A34E0 0C0310BB */ jal func_800C42EC +/* 0A40E0 800A34E0 0C0310BB */ jal set_text_font /* 0A40E4 800A34E4 00002025 */ move $a0, $zero /* 0A40E8 800A34E8 240E00FF */ li $t6, 255 /* 0A40EC 800A34EC AFAE0010 */ sw $t6, 0x10($sp) /* 0A40F0 800A34F0 00002025 */ move $a0, $zero /* 0A40F4 800A34F4 00002825 */ move $a1, $zero /* 0A40F8 800A34F8 00003025 */ move $a2, $zero -/* 0A40FC 800A34FC 0C0310E1 */ jal func_800C4384 +/* 0A40FC 800A34FC 0C0310E1 */ jal set_text_color /* 0A4100 800A3500 240700FF */ li $a3, 255 /* 0A4104 800A3504 3C108012 */ lui $s0, %hi(D_8012718C) # $s0, 0x8012 /* 0A4108 800A3508 3C118012 */ lui $s1, %hi(D_80126D24) # $s1, 0x8012 @@ -959,7 +959,7 @@ glabel func_800A277C /* 0A413C 800A353C 24A50001 */ addiu $a1, $a1, 1 /* 0A4140 800A3540 AFB80010 */ sw $t8, 0x10($sp) /* 0A4144 800A3544 02402025 */ move $a0, $s2 -/* 0A4148 800A3548 0C031110 */ jal func_800C4440 +/* 0A4148 800A3548 0C031110 */ jal draw_text /* 0A414C 800A354C 24C60001 */ addiu $a2, $a2, 1 /* 0A4150 800A3550 8E0F0000 */ lw $t7, ($s0) /* 0A4154 800A3554 8E2A0000 */ lw $t2, ($s1) @@ -974,7 +974,7 @@ glabel func_800A277C /* 0A4178 800A3578 24A50001 */ addiu $a1, $a1, 1 /* 0A417C 800A357C AFAB0010 */ sw $t3, 0x10($sp) /* 0A4180 800A3580 02402025 */ move $a0, $s2 -/* 0A4184 800A3584 0C031110 */ jal func_800C4440 +/* 0A4184 800A3584 0C031110 */ jal draw_text /* 0A4188 800A3588 24C6000F */ addiu $a2, $a2, 0xf /* 0A418C 800A358C 8E0C0000 */ lw $t4, ($s0) /* 0A4190 800A3590 8E2D0000 */ lw $t5, ($s1) @@ -989,7 +989,7 @@ glabel func_800A277C /* 0A41B4 800A35B4 24A50001 */ addiu $a1, $a1, 1 /* 0A41B8 800A35B8 AFAA0010 */ sw $t2, 0x10($sp) /* 0A41BC 800A35BC 02402025 */ move $a0, $s2 -/* 0A41C0 800A35C0 0C031110 */ jal func_800C4440 +/* 0A41C0 800A35C0 0C031110 */ jal draw_text /* 0A41C4 800A35C4 24C6001D */ addiu $a2, $a2, 0x1d /* 0A41C8 800A35C8 3C028012 */ lui $v0, %hi(D_80127194) # $v0, 0x8012 /* 0A41CC 800A35CC 8C427194 */ lw $v0, %lo(D_80127194)($v0) @@ -998,7 +998,7 @@ glabel func_800A277C /* 0A41D8 800A35D8 90440010 */ lbu $a0, 0x10($v0) /* 0A41DC 800A35DC 90450011 */ lbu $a1, 0x11($v0) /* 0A41E0 800A35E0 90460012 */ lbu $a2, 0x12($v0) -/* 0A41E4 800A35E4 0C0310E1 */ jal func_800C4384 +/* 0A41E4 800A35E4 0C0310E1 */ jal set_text_color /* 0A41E8 800A35E8 AFAE0010 */ sw $t6, 0x10($sp) /* 0A41EC 800A35EC 8E190000 */ lw $t9, ($s0) /* 0A41F0 800A35F0 8E2B0000 */ lw $t3, ($s1) @@ -1011,7 +1011,7 @@ glabel func_800A277C /* 0A420C 800A360C 032B6021 */ addu $t4, $t9, $t3 /* 0A4210 800A3610 AFB80010 */ sw $t8, 0x10($sp) /* 0A4214 800A3614 02402025 */ move $a0, $s2 -/* 0A4218 800A3618 0C031110 */ jal func_800C4440 +/* 0A4218 800A3618 0C031110 */ jal draw_text /* 0A421C 800A361C 018D2821 */ addu $a1, $t4, $t5 /* 0A4220 800A3620 8E0F0000 */ lw $t7, ($s0) /* 0A4224 800A3624 8E2A0000 */ lw $t2, ($s1) @@ -1025,7 +1025,7 @@ glabel func_800A277C /* 0A4244 800A3644 AFAB0010 */ sw $t3, 0x10($sp) /* 0A4248 800A3648 02402025 */ move $a0, $s2 /* 0A424C 800A364C 24C6000E */ addiu $a2, $a2, 0xe -/* 0A4250 800A3650 0C031110 */ jal func_800C4440 +/* 0A4250 800A3650 0C031110 */ jal draw_text /* 0A4254 800A3654 01D92821 */ addu $a1, $t6, $t9 /* 0A4258 800A3658 8E0C0000 */ lw $t4, ($s0) /* 0A425C 800A365C 8E2D0000 */ lw $t5, ($s1) @@ -1039,7 +1039,7 @@ glabel func_800A277C /* 0A427C 800A367C AFAA0010 */ sw $t2, 0x10($sp) /* 0A4280 800A3680 02402025 */ move $a0, $s2 /* 0A4284 800A3684 24C6001C */ addiu $a2, $a2, 0x1c -/* 0A4288 800A3688 0C031110 */ jal func_800C4440 +/* 0A4288 800A3688 0C031110 */ jal draw_text /* 0A428C 800A368C 030F2821 */ addu $a1, $t8, $t7 /* 0A4290 800A3690 3C048012 */ lui $a0, %hi(D_80127194) # $a0, 0x8012 /* 0A4294 800A3694 8C847194 */ lw $a0, %lo(D_80127194)($a0) diff --git a/asm/non_matchings/unknown_09F8F0/func_800A5F18.s b/asm/non_matchings/unknown_09F8F0/func_800A5F18.s index b3e64648..9d397c1c 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A5F18.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A5F18.s @@ -59,7 +59,7 @@ glabel func_800A5F18 /* 0A6BD0 800A5FD0 1440009D */ bnez $v0, .L800A6248 /* 0A6BD4 800A5FD4 8FBF001C */ lw $ra, 0x1c($sp) .L800A5FD8: -/* 0A6BD8 800A5FD8 0C0310BB */ jal func_800C42EC +/* 0A6BD8 800A5FD8 0C0310BB */ jal set_text_font /* 0A6BDC 800A5FDC 00002025 */ move $a0, $zero /* 0A6BE0 800A5FE0 8FB90028 */ lw $t9, 0x28($sp) /* 0A6BE4 800A5FE4 8FB80024 */ lw $t8, 0x24($sp) @@ -72,7 +72,7 @@ glabel func_800A5F18 /* 0A6C00 800A6000 240400FF */ li $a0, 255 /* 0A6C04 800A6004 240500FF */ li $a1, 255 /* 0A6C08 800A6008 240600FF */ li $a2, 255 -/* 0A6C0C 800A600C 0C0310E1 */ jal func_800C4384 +/* 0A6C0C 800A600C 0C0310E1 */ jal set_text_color /* 0A6C10 800A6010 00003825 */ move $a3, $zero /* 0A6C14 800A6014 3C028012 */ lui $v0, %hi(D_80126CDC) # $v0, 0x8012 /* 0A6C18 800A6018 8C426CDC */ lw $v0, %lo(D_80126CDC)($v0) @@ -102,7 +102,7 @@ glabel func_800A5F18 /* 0A6C78 800A6078 460084A4 */ cvt.w.s $f18, $f16 /* 0A6C7C 800A607C 44069000 */ mfc1 $a2, $f18 /* 0A6C80 800A6080 44CBF800 */ ctc1 $t3, $31 -/* 0A6C84 800A6084 0C031110 */ jal func_800C4440 +/* 0A6C84 800A6084 0C031110 */ jal draw_text /* 0A6C88 800A6088 00000000 */ nop /* 0A6C8C 800A608C 444CF800 */ cfc1 $t4, $31 /* 0A6C90 800A6090 3C028012 */ lui $v0, %hi(D_80126CDC) # $v0, 0x8012 @@ -157,7 +157,7 @@ glabel func_800A5F18 /* 0A6D54 800A6154 460042A4 */ cvt.w.s $f10, $f8 /* 0A6D58 800A6158 44065000 */ mfc1 $a2, $f10 /* 0A6D5C 800A615C 44D8F800 */ ctc1 $t8, $31 -/* 0A6D60 800A6160 0C031110 */ jal func_800C4440 +/* 0A6D60 800A6160 0C031110 */ jal draw_text /* 0A6D64 800A6164 00000000 */ nop /* 0A6D68 800A6168 4448F800 */ cfc1 $t0, $31 /* 0A6D6C 800A616C 3C028012 */ lui $v0, %hi(D_80126CDC) # $v0, 0x8012 @@ -213,7 +213,7 @@ glabel func_800A5F18 /* 0A6E30 800A6230 460021A4 */ cvt.w.s $f6, $f4 /* 0A6E34 800A6234 44063000 */ mfc1 $a2, $f6 /* 0A6E38 800A6238 44CDF800 */ ctc1 $t5, $31 -/* 0A6E3C 800A623C 0C031110 */ jal func_800C4440 +/* 0A6E3C 800A623C 0C031110 */ jal draw_text /* 0A6E40 800A6240 00000000 */ nop /* 0A6E44 800A6244 8FBF001C */ lw $ra, 0x1c($sp) .L800A6248: diff --git a/asm/non_matchings/unknown_09F8F0/func_800A8474.s b/asm/non_matchings/unknown_09F8F0/func_800A8474.s index c9775500..ca8a937e 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A8474.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A8474.s @@ -1617,7 +1617,7 @@ glabel func_800A8474 /* 0AA7F8 800A9BF8 86390004 */ lh $t9, 4($s1) /* 0AA7FC 800A9BFC A7A00122 */ sh $zero, 0x122($sp) /* 0AA800 800A9C00 00195023 */ negu $t2, $t9 -/* 0AA804 800A9C04 0C0270C3 */ jal func_8009C30C +/* 0AA804 800A9C04 0C0270C3 */ jal get_filtered_cheats /* 0AA808 800A9C08 A7AA0124 */ sh $t2, 0x124($sp) /* 0AA80C 800A9C0C 304B0004 */ andi $t3, $v0, 4 /* 0AA810 800A9C10 1160000B */ beqz $t3, .L800A9C40 @@ -1972,7 +1972,7 @@ glabel func_800A8474 /* 0AAD54 800AA154 00007012 */ mflo $t6 /* 0AAD58 800AA158 018E6823 */ subu $t5, $t4, $t6 /* 0AAD5C 800AA15C A5ED01E4 */ sh $t5, 0x1e4($t7) -/* 0AAD60 800AA160 0C0270C3 */ jal func_8009C30C +/* 0AAD60 800AA160 0C0270C3 */ jal get_filtered_cheats /* 0AAD64 800AA164 AFA50148 */ sw $a1, 0x148($sp) /* 0AAD68 800AA168 8FA50148 */ lw $a1, 0x148($sp) /* 0AAD6C 800AA16C 304B0004 */ andi $t3, $v0, 4 diff --git a/asm/non_matchings/unknown_09F8F0/func_800AA3EC.s b/asm/non_matchings/unknown_09F8F0/func_800AA3EC.s index da13bfc7..8ca45429 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800AA3EC.s +++ b/asm/non_matchings/unknown_09F8F0/func_800AA3EC.s @@ -41,7 +41,7 @@ glabel func_800AA3EC /* 0AB088 800AA488 46805120 */ cvt.s.w $f4, $f10 /* 0AB08C 800AA48C 00000000 */ nop /* 0AB090 800AA490 46048083 */ div.s $f2, $f16, $f4 -/* 0AB094 800AA494 0C0270C3 */ jal func_8009C30C +/* 0AB094 800AA494 0C0270C3 */ jal get_filtered_cheats /* 0AB098 800AA498 E7A2001C */ swc1 $f2, 0x1c($sp) /* 0AB09C 800AA49C 8FA5002C */ lw $a1, 0x2c($sp) /* 0AB0A0 800AA4A0 C7A00020 */ lwc1 $f0, 0x20($sp) diff --git a/asm/non_matchings/unknown_0AEE70/func_800B6FC4.s b/asm/non_matchings/unknown_0AEE70/func_800B6FC4.s index 114215e1..01a5203b 100644 --- a/asm/non_matchings/unknown_0AEE70/func_800B6FC4.s +++ b/asm/non_matchings/unknown_0AEE70/func_800B6FC4.s @@ -38,7 +38,7 @@ glabel func_800B6FC4 /* 0B7C50 800B7050 02202825 */ move $a1, $s1 /* 0B7C54 800B7054 0C0322EC */ jal osRecvMesg /* 0B7C58 800B7058 24060001 */ li $a2, 1 -/* 0B7C5C 800B705C 0C0270C3 */ jal func_8009C30C +/* 0B7C5C 800B705C 0C0270C3 */ jal get_filtered_cheats /* 0B7C60 800B7060 00000000 */ nop /* 0B7C64 800B7064 00527024 */ and $t6, $v0, $s2 /* 0B7C68 800B7068 11C0FFF9 */ beqz $t6, .L800B7050 diff --git a/asm/non_matchings/unknown_0AEE70/func_800B7460.s b/asm/non_matchings/unknown_0AEE70/func_800B7460.s index 2d14f015..ed86ee21 100644 --- a/asm/non_matchings/unknown_0AEE70/func_800B7460.s +++ b/asm/non_matchings/unknown_0AEE70/func_800B7460.s @@ -3,7 +3,7 @@ glabel func_800B7460 /* 0B8064 800B7464 AFBF001C */ sw $ra, 0x1c($sp) /* 0B8068 800B7468 AFA409F0 */ sw $a0, 0x9f0($sp) /* 0B806C 800B746C AFA509F4 */ sw $a1, 0x9f4($sp) -/* 0B8070 800B7470 0C0270C3 */ jal func_8009C30C +/* 0B8070 800B7470 0C0270C3 */ jal get_filtered_cheats /* 0B8074 800B7474 AFA609F8 */ sw $a2, 0x9f8($sp) /* 0B8078 800B7478 00027100 */ sll $t6, $v0, 4 /* 0B807C 800B747C 05C1008A */ bgez $t6, .L800B76A8 diff --git a/asm/non_matchings/unknown_0B8920/func_800C31EC.s b/asm/non_matchings/unknown_0B8920/func_800C31EC.s index cae54898..ab417459 100644 --- a/asm/non_matchings/unknown_0B8920/func_800C31EC.s +++ b/asm/non_matchings/unknown_0B8920/func_800C31EC.s @@ -13,7 +13,7 @@ glabel func_800C31EC /* 0C3E18 800C3218 008F082A */ slt $at, $a0, $t7 /* 0C3E1C 800C321C 10200072 */ beqz $at, .L800C33E8 /* 0C3E20 800C3220 24190001 */ li $t9, 1 -/* 0C3E24 800C3224 0C027AC8 */ jal func_8009EB20 +/* 0C3E24 800C3224 0C027AC8 */ jal get_language /* 0C3E28 800C3228 00000000 */ nop /* 0C3E2C 800C322C 24010001 */ li $at, 1 /* 0C3E30 800C3230 10410008 */ beq $v0, $at, .L800C3254 diff --git a/asm/non_matchings/unknown_0B8920/func_800C42EC.s b/asm/non_matchings/unknown_0B8920/set_text_font.s similarity index 98% rename from asm/non_matchings/unknown_0B8920/func_800C42EC.s rename to asm/non_matchings/unknown_0B8920/set_text_font.s index 4c151632..5ef00c27 100644 --- a/asm/non_matchings/unknown_0B8920/func_800C42EC.s +++ b/asm/non_matchings/unknown_0B8920/set_text_font.s @@ -1,4 +1,4 @@ -glabel func_800C42EC +glabel set_text_font /* 0C4EEC 800C42EC 3C0E8013 */ lui $t6, %hi(D_8012A7E0) # $t6, 0x8013 /* 0C4EF0 800C42F0 8DCEA7E0 */ lw $t6, %lo(D_8012A7E0)($t6) /* 0C4EF4 800C42F4 3C0F8013 */ lui $t7, %hi(D_8012A7E8) # $t7, 0x8013 diff --git a/src/menu.c b/src/menu.c index 2806f9df..5bc2152d 100644 --- a/src/menu.c +++ b/src/menu.c @@ -70,7 +70,7 @@ s8 D_801263DC[4]; s32 D_801263E0; s32 D_801263E4; s8 players_character_array[8]; -s8 D_801263F0[8]; +s8 gCharacterIdSlots[8]; s32 D_801263F8[8]; u8 D_80126418[8]; u8 D_80126420[8]; @@ -186,13 +186,13 @@ s32 D_80126924; s32 D_80126928; s32 D_8012692C; s32 D_80126930[36]; -s8 gPlayerVehicle[4]; // Unknown number of entries. +s8 gPlayerSelectVehicle[4]; // Unknown number of entries. s32 D_801269C4; s32 D_801269C8; s32 D_801269CC; s32 D_801269D0[3]; s32 D_801269DC; -u32* D_801269E0; +u32 *D_801269E0; s32 D_801269E4; s32 D_801269E8; s32 D_801269EC; @@ -227,7 +227,7 @@ s32 D_80126A90; s32 D_80126A94; s32 D_80126A98; s32 D_80126A9C; -s32* D_80126AA0[16]; +s32 *D_80126AA0[16]; s32 D_80126AE0[16]; s32 D_80126B20[16]; s32 D_80126B60[4]; @@ -306,7 +306,7 @@ s32 gIsInAdventureTwo = 0; s32 D_800DF498 = 0; s32 D_800DF49C = 0; // Currently unknown, might be a different type. -unk800DF4A0* D_800DF4A0 = NULL; +unk800DF4A0 *D_800DF4A0 = NULL; u8 D_800DF4A4 = 0xFF; u8 D_800DF4A8 = 0xFF; @@ -485,7 +485,7 @@ s32 D_800DFBBC[8] = { 0, 0, 0, 0, 0, 0, 0, 0 }; s32 D_800DFBDC = 0; // Unused? -s32* D_800DFBE0[10] = { +s32 *D_800DFBE0[10] = { D_800DFAE4, D_800DFAFC, D_800DFB14, D_800DFB2C, D_800DFB40, D_800DFB5C, D_800DFB8C, D_800DFBA4, D_800DFB74, D_800DFBBC @@ -897,7 +897,7 @@ s32 D_800E096C = 0; s32 D_800E0970 = 0; s32 D_800E0974 = 0; const f32 D_800E7D04[1] = { 0.5f }; // .rodata -f32* D_800E0978 = D_800E7D04; // .data +f32 *D_800E0978 = D_800E7D04; // .data s32 D_800E097C = 0; s32 D_800E0980 = 0; s32 D_800E0984 = 0; @@ -947,7 +947,7 @@ unk800DFC10 D_800E0AC0 = { NULL, 0, 0, NULL, 0 }; unk800DFC10 D_800E0AD0 = { NULL, 0, 0, NULL, 0 }; unk800DFC10 D_800E0AE0 = { NULL, 0, 0, NULL, 0 }; -unk800DFC10* D_800E0AF0[10] = { +unk800DFC10 *D_800E0AF0[10] = { &D_800E0A50, &D_800E0A60, &D_800E0A70, &D_800E0A80, &D_800E0A90, &D_800E0AA0, &D_800E0AB0, &D_800E0AC0, &D_800E0AD0, &D_800E0AE0 @@ -1030,7 +1030,8 @@ MenuElement D_800E0E4C[9] = { }; // Valid characters for name input. Must be u8, not char. -u8 D_800E0F6C[32] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ.? "; +// The length of the array must be a power of two. +u8 gFileNameValidChars[32] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ.? "; s32 D_800E0F8C = 0; s32 D_800E0F90 = 192; @@ -1147,7 +1148,7 @@ s16 D_800E13A8[138] = { 0x006C, 0x00CE }; -s16* D_800E14BC[32] = { +s16 *D_800E14BC[32] = { NULL, NULL, NULL, NULL, &D_800E13A8[126], &D_800E13A8[90], &D_800E13A8[126], &D_800E13A8[24], NULL, NULL , &D_800E13A8[72], &D_800E13A8[90], @@ -1514,7 +1515,7 @@ Settings *get_settings(void); void func_8009C4A8(s16 *arg0); void func_8009C674(s16 *arg0); void func_8008E4B0(void); -s8* func_8001E29C(s32 arg0); +s8 *func_8001E29C(s32 arg0); void func_80001D04(s32, s32*); void func_800660EC(f32 arg0); void func_8009C508(s32 arg0); @@ -1823,7 +1824,7 @@ void func_80081E54(s32 arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4, s32 arg5) { GLOBAL_ASM("asm/non_matchings/menu/func_80081F4C.s") -GLOBAL_ASM("asm/non_matchings/menu/DrawMenuText.s") +GLOBAL_ASM("asm/non_matchings/menu/draw_menu_element.s") void func_800828B8(void) { s32 i; @@ -1859,15 +1860,15 @@ void func_800829F8(s32 arg0, s32 arg1) { D_800DF46C += arg1; if (D_800DF46C & 0x10) { - func_8007F900(func_8009EB20()); - func_800C42EC(0); - func_800C4384(0xFF, 0xFF, 0xFF, 0, 0xFF); - func_800C43CC(0, 0, 0, 0); + func_8007F900(get_language()); + set_text_font(0); + set_text_color(0xFF, 0xFF, 0xFF, 0, 0xFF); + set_text_background_color(0, 0, 0, 0); temp = 0xD0; if (osTvType == 0) { temp = 0xEA; } - func_800C4440(arg0, -0x8000, temp, D_800DF4A0->unk25C, 0xC); + draw_text(arg0, -0x8000, temp, D_800DF4A0->unk25C, 0xC); } } @@ -1905,7 +1906,7 @@ void func_80082FAC(void) { if ((D_80126448 & 0x2000000) == 0) { func_800C2AF4(0); } - func_8007F900(func_8009EB20()); + func_8007F900(get_language()); } GLOBAL_ASM("asm/non_matchings/menu/func_80083098.s") @@ -1914,7 +1915,7 @@ GLOBAL_ASM("asm/non_matchings/menu/func_8008377C.s") GLOBAL_ASM("asm/non_matchings/menu/menu_title_screen_loop.s") void func_80084118(void) { - func_8009C4A8((s16*)D_800DF7C4); + func_8009C4A8((s16 *)D_800DF7C4); func_80000BE0(0x10); func_800660D0(); func_800C422C(2); @@ -1926,7 +1927,7 @@ void menu_options_init(void) { D_800DF47C = 0; func_800C01D8(D_800DF77C); func_800C4170(2); - func_800C42EC(2); + set_text_font(2); func_80000BE0(0x18); func_80000B34(0x18); func_80000B18(); @@ -1937,17 +1938,17 @@ void func_800841B8(s32 arg0) { s32 phi_a3; s32 phi_s2; - func_800C42EC(2); - func_800C43CC(0, 0, 0, 0); - func_800C4384(0, 0, 0, 0xFF, 0x80); - func_800C4440(&D_801263A0, 0xA1, 0x23, D_800DF4A0->unk90, 0xC); - func_800C4384(0xFF, 0xFF, 0xFF, 0, 0xFF); - func_800C4440(&D_801263A0, 0xA0, 0x20, D_800DF4A0->unk90, 0xC); + 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->unk90, 0xC); + set_text_color(0xFF, 0xFF, 0xFF, 0, 0xFF); + draw_text(&D_801263A0, 0xA0, 0x20, D_800DF4A0->unk90, 0xC); phi_s1 = 0; phi_s2 = 0x4C; - func_800C42EC(0); + set_text_font(0); while(D_800DFA10[phi_s1] != NULL) { if (phi_s1 == D_800DF460) { @@ -1958,8 +1959,8 @@ void func_800841B8(s32 arg0) { } else { phi_a3 = 0; } - func_800C4384(0xFF, 0xFF, 0xFF, phi_a3, 0xFF); - func_800C4440(&D_801263A0, -0x8000, phi_s2, D_800DFA10[phi_s1], 0xC); + set_text_color(0xFF, 0xFF, 0xFF, phi_a3, 0xFF); + draw_text(&D_801263A0, -0x8000, phi_s2, D_800DFA10[phi_s1], 0xC); phi_s1++; phi_s2 += 0x1C; @@ -2017,7 +2018,7 @@ s32 menu_options_loop(s32 arg0) { func_80001D04(0xEF, 0); } else if (D_800DF460 == 0 && analogX != 0) { // Change language - s32 temp_v0 = func_8009EB20(); + s32 temp_v0 = get_language(); if ((temp_v0 >> 0x1F) == 0 && temp_v0 == 0) { set_language(2); // Sets language to french } else { @@ -2599,7 +2600,7 @@ void func_800887E8(void) { D_801263E0 = 0; D_801263BC = 0; D_80126A68 = -1; - func_8007F900(func_8009EB20()); + func_8007F900(get_language()); if (func_80087F14(&D_80126A68, 0) == 0) { D_800DF47C = 0; } else if (func_8008832C() == 0) { @@ -2848,20 +2849,20 @@ void func_8008AF00(s32 arg0) { GLOBAL_ASM("asm/non_matchings/menu/menu_character_select_init.s") void func_8008B20C(s32 arg0) { - s32 temp; + s32 yPos; if (D_800DF47C >= -0x16 && D_800DF47C < 0x17) { - func_800C42EC(2); - func_800C43CC(0, 0, 0, 0); - func_800C4384(0, 0, 0, 0xFF, 0x80); - func_800C4440(&D_801263A0, 0xA1, 0x23, D_800DF4A0->unk21C, 0xC); - func_800C4384(0xFF, 0xFF, 0xFF, 0, 0xFF); - func_800C4440(&D_801263A0, 0xA0, 0x20, D_800DF4A0->unk21C, 0xC); + set_text_font(2); // Set font to the Big Yellow Text + set_text_background_color(0, 0, 0, 0); + set_text_color(0, 0, 0, 0xFF, 0x80); + draw_text(&D_801263A0, 0xA1, 0x23, D_800DF4A0->unk21C, 0xC); // Draw "Player Select" text drop shadow + set_text_color(0xFF, 0xFF, 0xFF, 0, 0xFF); + draw_text(&D_801263A0, 0xA0, 0x20, D_800DF4A0->unk21C, 0xC); // Draw "Player Select" text if (D_800DF480 == D_800DF4BC && D_800DF4BC > 0) { - temp = 0xD0; + yPos = 0xD0; if (osTvType == 0) { - temp = 0xEA; + yPos = 0xEA; } - func_800C4440(&D_801263A0, 0xA0, temp, D_800E8230 /* "OK?" */, 0xC); + draw_text(&D_801263A0, 0xA0, yPos, D_800E8230 /* "OK?" */, 0xC); } func_8007B3D0(&D_801263A0); func_800660EC(40.0f); @@ -2931,7 +2932,7 @@ s32 menu_character_select_loop(s32 arg0) { phi_a0 = 0; for(i = 0; i < 4; i++) { if (D_801263D4[i]) { - D_801263F0[phi_a0] = (*D_801263CC)[players_character_array[i]].unkC; + gCharacterIdSlots[phi_a0] = (*D_801263CC)[players_character_array[i]].unkC; phi_a0++; } } @@ -2977,7 +2978,7 @@ void func_8008BFE8(s32 arg0, s8 *arg1, s32 arg2, u16 arg3, u16 arg4) { someBool = 1; while (someBool && j < arg2 && arg1[j] != -1) { someBool = 0; - if ((func_8009C30C() & 0x400000) == 0) { + if ((get_filtered_cheats() & 0x400000) == 0) { i = 0; while(i < 4 && !someBool){ if (i != arg0 && players_character_array[i] == arg1[j]) { @@ -3018,7 +3019,7 @@ void menu_caution_init(void) { void func_8008C4E8(void); -void DrawMenuText(s32, MenuElement*, f32); +void draw_menu_element(s32, MenuElement*, f32); s32 menu_caution_loop(s32 arg0) { if (D_800DF47C != 0) { @@ -3033,7 +3034,7 @@ s32 menu_caution_loop(s32 arg0) { } } if (D_800DF47C < 0x14) { - DrawMenuText(1, D_800DFFD8, 1.0f); + draw_menu_element(1, D_800DFFD8, 1.0f); } if (D_800DF47C >= 0x1F) { func_8008C4E8(); @@ -3132,7 +3133,7 @@ void func_8008C698(s32 arg0) { D_800DF7A0 = 0; } - DrawMenuText(1, (MenuElement*)*D_80126460, 1.0f); + draw_menu_element(1, (MenuElement*)*D_80126460, 1.0f); func_80080BC8(&D_801263A0); } } @@ -3467,7 +3468,7 @@ s32 func_80092BE0(s32 arg0) { s32 index; s32 temp; - trackIdArray = (s8*)func_8001E29C(0x1C); + trackIdArray = (s8 *)func_8001E29C(0x1C); index = 0; temp = -1; @@ -3509,7 +3510,7 @@ void menu_5_init(void) { D_801263BC = 0; D_800DF47C = 0; temp_s0 = settings->unk4C->unk2; - gPlayerVehicle = func_8006B0AC(temp_s0); + gPlayerSelectVehicle = func_8006B0AC(temp_s0); temp_v0_2 = func_8006B14C(temp_s0); if (temp_v0_2 != 5) { if (temp_v0_2 != 8) { @@ -3641,7 +3642,7 @@ void func_80096790(void) { temp2 = (s8*)func_8006BDB0(); func_8009C4A8(D_800E0A24); - temp = *temp2 - 1; // temp is $v1, when it should be $v0! + temp = *temp2 - 1; if (D_80126BB8) { func_8009C508(D_800E0710[temp * 3]); @@ -3703,19 +3704,25 @@ void func_800976CC(void) { func_800C422C(2); } -void func_800976F8(u32 arg0, char *output, s32 length) { +/** + * Takes in a compressed filename integer, and decompresses it to a string. + * Each character takes up 5 bits, so up to 6 chars can fit in the integer. + */ +void decompress_filename_string(u32 compressedFilename, char *output, s32 length) { s32 index; - output[length] = 0; // Set null terminator - index = length - 1; - while(index >= 0){ + output[length] = '\0'; // Set null terminator at the end + for(index = length - 1; index >= 0; ) { index--; - // D_800E0F6C[0x20] = "ABCDEFGHIJKLMNOPQRSTYVWXYZ.? " = valid ascii chars for name input. - output[index + 1] = D_800E0F6C[arg0 & 0x1F]; - arg0 = arg0 >> 5; + output[index + 1] = gFileNameValidChars[compressedFilename & (sizeof(gFileNameValidChars) - 1)]; + compressedFilename /= sizeof(gFileNameValidChars); // compressedFilename >>= 5; } } -s32 func_80097744(unsigned char *arg0, s32 arg1) { +/** + * Takes in a string, and compresses it into an integer. + * Each character takes up 5 bits, so up to 6 chars can fit in the integer. + */ +s32 compress_filename_string(unsigned char *filename, s32 length) { s32 i; u32 output; u8 processingChars; @@ -3725,8 +3732,8 @@ s32 func_80097744(unsigned char *arg0, s32 arg1) { output = 0; processingChars = 1; - for (i = 0; i < arg1; i++) { - if (arg0[i] == '\0') { + for (i = 0; i < length; i++) { + if (filename[i] == '\0') { processingChars = 0; } @@ -3734,19 +3741,19 @@ s32 func_80097744(unsigned char *arg0, s32 arg1) { currentChar = ' '; charIndex = 0; } else { - currentChar = arg0[i]; + currentChar = filename[i]; charIndex = 0; } - while (currentChar != D_800E0F6C[charIndex]) { + while (currentChar != gFileNameValidChars[charIndex]) { charIndex++; - if (charIndex >= 0x1F) { + if (charIndex >= (s32)(sizeof(gFileNameValidChars) - 1)) { break; } } - output <<= 5; - output |= charIndex & 0x1F; + output *= sizeof(gFileNameValidChars); // output <<= 5; + output |= charIndex & (sizeof(gFileNameValidChars) - 1); } return output; @@ -3846,7 +3853,7 @@ void menu_trophy_race_round_init(void) { } for(i = 0; i < D_800DF4BC; i++){ - gPlayerVehicle[i] = func_8006B0AC(temp); + gPlayerSelectVehicle[i] = func_8006B0AC(temp); } func_8006DB14(func_8006B0AC(temp)); @@ -3876,16 +3883,16 @@ void func_800983C0(s32 arg0) { sp28 = func_8006BDDC(func_8006B1D4(gTrophyRaceWorldId)); sp24 = func_8006BDDC(sp20[((gTrophyRaceWorldId - 1) * 6) + D_800E0FEC]); - func_800C43CC(0, 0, 0, 0); - func_800C42EC(2); - func_800C4384(0, 0, 0, 0xFF, 0x80); - func_800C4440(&D_801263A0, 0xA1, 0x23, sp28, 0xC); - func_800C4440(&D_801263A0, 0xA1, 0x43, D_800DF4A0->unk118, 0xC); - func_800C4384(0xFF, 0xFF, 0xFF, 0, 0xFF); - func_800C4440(&D_801263A0, 0xA0, 0x20, sp28, 0xC); - func_800C4440(&D_801263A0, 0xA0, 0x40, D_800DF4A0->unk118, 0xC); - func_800C4440(&D_801263A0, 0xA0, sp2C + 0xB0, D_800DF4A0->unk228[D_800E0FEC], 0xC); - func_800C4440(&D_801263A0, 0xA0, sp2C + 0xD0, sp24, 0xC); + set_text_background_color(0, 0, 0, 0); + 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->unk118, 0xC); + set_text_color(0xFF, 0xFF, 0xFF, 0, 0xFF); + draw_text(&D_801263A0, 0xA0, 0x20, sp28, 0xC); + draw_text(&D_801263A0, 0xA0, 0x40, D_800DF4A0->unk118, 0xC); + draw_text(&D_801263A0, 0xA0, sp2C + 0xB0, D_800DF4A0->unk228[D_800E0FEC], 0xC); + draw_text(&D_801263A0, 0xA0, sp2C + 0xD0, sp24, 0xC); } GLOBAL_ASM("asm/non_matchings/menu/menu_trophy_race_round_loop.s") @@ -3926,7 +3933,7 @@ void func_80098EBC(s32 arg0) { } if (D_801263E0 == 2 || D_801263E0 == 3) { - DrawMenuText(1, &D_800E1048, 1.0f); + draw_menu_element(1, &D_800E1048, 1.0f); } } #endif @@ -4143,11 +4150,14 @@ void func_8009BE5C(void) { GLOBAL_ASM("asm/non_matchings/menu/func_8009BF20.s") -void func_8009C154(void) { +/** + * Reset the character slot indices from 0 to 7. + */ +void reset_character_id_slots(void) { s32 i; D_800DF4C8 = 1; for(i = 0; i < 8; i++) { - D_801263F0[i] = i; + gCharacterIdSlots[i] = i; } } @@ -4168,21 +4178,34 @@ s32 func_8009C1B0(void) { return D_800DF4D4; } -s8 func_8009C228(s32 arg0) { - return D_801263F0[arg0]; +/** + * Gets the character id from a slot index. Slot should be a value within [0,7] + */ +s8 get_character_id_from_slot(s32 slot) { + return gCharacterIdSlots[slot]; } -// Unused duplicate of func_8009C228()? -s8 func_8009C23C(s32 arg0) { - return D_801263F0[arg0]; +/** + * Unused duplicate of get_character_id_from_slot() + */ +s8 get_character_id_from_slot_unused(s32 slot) { + return gCharacterIdSlots[slot]; } -s8 func_8009C250(s32 arg0) { - return gPlayerVehicle[arg0]; +/** + * Gets the selected vehicle index for a player. + * 0 = Car, 1 = Hovercraft, 2 = Plane + */ +s8 get_player_selected_vehicle(s32 playerNum) { + return gPlayerSelectVehicle[playerNum]; } -void func_8009C264(s32 arg0, s32 arg1) { - gPlayerVehicle[arg0] = arg1; +/** + * Sets the selected vehicle index for a player. + * 0 = Car, 1 = Hovercraft, 2 = Plane + */ +void set_player_selected_vehicle(s32 playerNum, s32 index) { + gPlayerSelectVehicle[playerNum] = index; } s8* func_8009C274(void) { @@ -4203,16 +4226,25 @@ void func_8009C2C4(s32 arg0) { D_800DF4B8 = arg0; } +/** + * Returns if the player is playing in the tracks mode instead of adventure. + */ s32 is_in_tracks_mode(void) { return D_800DF4B8; } +/** + * Sets the active & unlocked magic code flags. + */ void set_magic_code_flags(s32 flags) { gActiveMagicCodes |= flags; gUnlockedMagicCodes |= flags; } -s32 func_8009C30C(void) { +/** + * Filters active cheats based on different conditions. + */ +s32 get_filtered_cheats(void) { s32 cheats = gActiveMagicCodes; if (D_800DF4B8 == 0 || func_8000E4C8() != 0) { cheats &= 0x1B400133; @@ -4514,39 +4546,48 @@ s64 func_8009EB08(void) { return D_80126448; } -s32 func_8009EB20(void) { - s32 val = 0; +/** + * Returns the current language being used by the game. + * 0 = English, 1 = German, 2 = French, 3 = Japanese + */ +s32 get_language(void) { + s32 language = 0; // English switch(D_80126448 & 0xC) { - case 4: - val = 1; + case 4: // German + language = 1; break; - case 8: - val = 2; + case 8: // French + language = 2; break; - case 12: - val = 3; + case 12: // "Japanese" + language = 3; break; } - return val; + return language; } +/** + * Sets the language used by the game. Even though German is not selectable in the US version, it is + * still fully intact. Japanese is not properly implemented in the US 1.0 version of the game. If you + * tried to switch to it, all you would see is the word "Japanese" used everywhere as a placeholder. + */ void set_language(s32 language) { - s64 sp18 = 0; // English + s64 langFlag = 0; // English switch(language) { case 1: // German - sp18 = 4; + langFlag = 4; break; case 2: // French - sp18 = 8; + langFlag = 8; break; - case 3: // Japanese - sp18 = 12; + case 3: // "Japanese" + langFlag = 12; break; } - D_80126448 &= 0xFFFFFFFFFFFFFFF3; - D_80126448 |= sp18; + D_80126448 &= ~0xC; + D_80126448 |= langFlag; func_8007F900(); func_8006ECE0(); diff --git a/src/menu.h b/src/menu.h index fd91e5c9..a55e3ebe 100644 --- a/src/menu.h +++ b/src/menu.h @@ -414,7 +414,7 @@ MenuElement D_800E0CEC[11]; MenuElement D_800E0E4C[9]; // Valid characters for name input. Must be u8, not char. -extern u8 D_800E0F6C[32]; +extern u8 gFileNameValidChars[32]; extern s32 D_800E0F8C; extern s32 D_800E0F90; diff --git a/src/unknown_0348C0.c b/src/unknown_0348C0.c index 21551a45..95a12030 100644 --- a/src/unknown_0348C0.c +++ b/src/unknown_0348C0.c @@ -701,7 +701,7 @@ void func_8003D534(Player *arg0, s32 arg1) { arg0->unk4C->unk10 = 0x1E; arg0->unk7C.half.upper = 0x14; arg0->unk7C.half.lower = 0x10; - if (func_8009C30C() & 0x1000) { + if (get_filtered_cheats() & 0x1000) { particlePtrList_addObject(arg0); } } diff --git a/src/unknown_043920.c b/src/unknown_043920.c index 7c710334..51f19eeb 100644 --- a/src/unknown_043920.c +++ b/src/unknown_043920.c @@ -450,7 +450,7 @@ typedef struct unk80056930 { void func_80057048(unk800570A4_2 *arg0, s32 arg1); void func_80056930(unk800570A4_2 *arg0, unk80056930 *arg1) { - if ((func_8009C30C() & 0x100) != 0) { + if ((get_filtered_cheats() & 0x100) != 0) { func_800570B8(arg0, 0x162, 8, 0x82); } else { func_80057048(arg0, arg1->unk3 + 0x156); diff --git a/src/unknown_06B2B0.c b/src/unknown_06B2B0.c index b998ec18..298d7b7a 100644 --- a/src/unknown_06B2B0.c +++ b/src/unknown_06B2B0.c @@ -601,7 +601,7 @@ void func_8006BFC8(s8 *arg0) { phi_s0 = arg0[phi_s0]; - if ((func_8009C30C() << 6) < 0) { + if ((get_filtered_cheats() << 6) < 0) { phi_s0 = 9; } if (func_8006DA0C() == 1) { @@ -996,7 +996,7 @@ void func_8006E5BC(void) { gSettingsPtr->playerCount = func_8009C3C8(); for (i = 0; i < 8; i++) { gSettingsPtr->racers[i].best_times = 0; - gSettingsPtr->racers[i].character = func_8009C228(i); + gSettingsPtr->racers[i].character = get_character_id_from_slot(i); if (gSettingsPtr->playerCount >= 2) { gSettingsPtr->racers[i].starting_position = i; } else if (is_in_two_player_adventure()) { diff --git a/src/unknown_0C4800.c b/src/unknown_0C4800.c index fc62a4a7..bea95c22 100644 --- a/src/unknown_0C4800.c +++ b/src/unknown_0C4800.c @@ -246,9 +246,9 @@ void func_800C4164(s32 arg0) { GLOBAL_ASM("asm/non_matchings/unknown_0B8920/func_800C4170.s") GLOBAL_ASM("asm/non_matchings/unknown_0B8920/func_800C422C.s") -GLOBAL_ASM("asm/non_matchings/unknown_0B8920/func_800C42EC.s") +GLOBAL_ASM("asm/non_matchings/unknown_0B8920/set_text_font.s") -void func_800C4384(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4) { +void set_text_color(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4) { (*D_8012A7E8)[0].unk14 = arg0; (*D_8012A7E8)[0].unk15 = arg1; (*D_8012A7E8)[0].unk16 = arg2; @@ -256,7 +256,7 @@ void func_800C4384(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4) { (*D_8012A7E8)[0].unk1C = arg4; } -void func_800C43CC(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4) { +void set_text_background_color(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4) { (*D_8012A7E8)[0].unk18 = arg0; (*D_8012A7E8)[0].unk19 = arg1; (*D_8012A7E8)[0].unk1A = arg2; @@ -270,7 +270,7 @@ void func_800C4404(s32 arg0, s32 arg1, s32 arg2) { func_800C45A4(arg0, *D_8012A7E8, arg1, arg2, 1.0f); } -void func_800C4440(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4) { +void draw_text(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4) { unk8012A7E8 *temp = &(*D_8012A7E8)[0]; temp->unk0 = (arg1 == -0x8000) ? temp->unkC >> 1 : arg1; temp->unk2 = (arg2 == -0x8000) ? temp->unkE >> 1 : arg2;