diff --git a/src/game/filemgr.c b/src/game/filemgr.c index e8e5f1ef6..60a5c5547 100644 --- a/src/game/filemgr.c +++ b/src/game/filemgr.c @@ -3298,104 +3298,23 @@ s32 filemgrMainMenuDialog(s32 operation, struct menudialogdef *dialogdef, union return 0; } -#if VERSION == VERSION_PAL_FINAL -GLOBAL_ASM( -glabel filemgrConsiderPushingFileSelectDialog -/* f10d268: 3c0e8007 */ lui $t6,0x8007 -/* f10d26c: 8dce1728 */ lw $t6,0x1728($t6) -/* f10d270: 3c18800a */ lui $t8,0x800a -/* f10d274: 2718e5a0 */ addiu $t8,$t8,-6752 -/* f10d278: 000e78c0 */ sll $t7,$t6,0x3 -/* f10d27c: 01ee7823 */ subu $t7,$t7,$t6 -/* f10d280: 000f7880 */ sll $t7,$t7,0x2 -/* f10d284: 01ee7821 */ addu $t7,$t7,$t6 -/* f10d288: 000f78c0 */ sll $t7,$t7,0x3 -/* f10d28c: 01ee7823 */ subu $t7,$t7,$t6 -/* f10d290: 000f7900 */ sll $t7,$t7,0x4 -/* f10d294: 01f81021 */ addu $v0,$t7,$t8 -/* f10d298: 9059083c */ lbu $t9,0x83c($v0) -/* f10d29c: 27bdffe8 */ addiu $sp,$sp,-24 -/* f10d2a0: afbf0014 */ sw $ra,0x14($sp) -/* f10d2a4: 1720000f */ bnez $t9,.PF0f10d2e4 -/* f10d2a8: 3c048007 */ lui $a0,0x8007 -/* f10d2ac: a040083b */ sb $zero,0x83b($v0) -/* f10d2b0: 2484527c */ addiu $a0,$a0,0x527c -/* f10d2b4: 0fc3e29d */ jal menuPushRootDialog -/* f10d2b8: 24050006 */ li $a1,0x6 -/* f10d2bc: 3c08800a */ lui $t0,0x800a -/* f10d2c0: 9508a992 */ lhu $t0,-0x566e($t0) -/* f10d2c4: 3c048007 */ lui $a0,0x8007 -/* f10d2c8: 29010006 */ slti $at,$t0,0x6 -/* f10d2cc: 14200003 */ bnez $at,.PF0f10d2dc -/* f10d2d0: 00000000 */ nop -/* f10d2d4: 0fc3cda8 */ jal menuPushDialog -/* f10d2d8: 24844810 */ addiu $a0,$a0,0x4810 -.PF0f10d2dc: -/* f10d2dc: 10000002 */ b .PF0f10d2e8 -/* f10d2e0: 24020001 */ li $v0,0x1 -.PF0f10d2e4: -/* f10d2e4: 00001025 */ move $v0,$zero -.PF0f10d2e8: -/* f10d2e8: 8fbf0014 */ lw $ra,0x14($sp) -/* f10d2ec: 27bd0018 */ addiu $sp,$sp,0x18 -/* f10d2f0: 03e00008 */ jr $ra -/* f10d2f4: 00000000 */ nop -); -#elif VERSION == VERSION_PAL_BETA -GLOBAL_ASM( -glabel filemgrConsiderPushingFileSelectDialog -/* f10cfc8: 3c0e8007 */ lui $t6,0x8007 -/* f10cfcc: 8dce3118 */ lw $t6,0x3118($t6) -/* f10cfd0: 3c18800a */ lui $t8,0x800a -/* f10cfd4: 27182530 */ addiu $t8,$t8,0x2530 -/* f10cfd8: 000e78c0 */ sll $t7,$t6,0x3 -/* f10cfdc: 01ee7823 */ subu $t7,$t7,$t6 -/* f10cfe0: 000f7880 */ sll $t7,$t7,0x2 -/* f10cfe4: 01ee7821 */ addu $t7,$t7,$t6 -/* f10cfe8: 000f78c0 */ sll $t7,$t7,0x3 -/* f10cfec: 01ee7823 */ subu $t7,$t7,$t6 -/* f10cff0: 000f7900 */ sll $t7,$t7,0x4 -/* f10cff4: 01f81021 */ addu $v0,$t7,$t8 -/* f10cff8: 9059083c */ lbu $t9,0x83c($v0) -/* f10cffc: 27bdffe8 */ addiu $sp,$sp,-24 -/* f10d000: afbf0014 */ sw $ra,0x14($sp) -/* f10d004: 1720000f */ bnez $t9,.PB0f10d044 -/* f10d008: 3c048007 */ lui $a0,0x8007 -/* f10d00c: a040083b */ sb $zero,0x83b($v0) -/* f10d010: 24846b8c */ addiu $a0,$a0,0x6b8c -/* f10d014: 0fc3e223 */ jal menuPushRootDialog -/* f10d018: 24050006 */ li $a1,0x6 -/* f10d01c: 3c08800a */ lui $t0,0x800a -/* f10d020: 9508e952 */ lhu $t0,-0x16ae($t0) -/* f10d024: 3c048007 */ lui $a0,0x8007 -/* f10d028: 29010006 */ slti $at,$t0,0x6 -/* f10d02c: 14200003 */ bnez $at,.PB0f10d03c -/* f10d030: 00000000 */ nop -/* f10d034: 0fc3cd2e */ jal menuPushDialog -/* f10d038: 24846120 */ addiu $a0,$a0,0x6120 -.PB0f10d03c: -/* f10d03c: 10000002 */ b .PB0f10d048 -/* f10d040: 24020001 */ li $v0,0x1 -.PB0f10d044: -/* f10d044: 00001025 */ move $v0,$zero -.PB0f10d048: -/* f10d048: 8fbf0014 */ lw $ra,0x14($sp) -/* f10d04c: 27bd0018 */ addiu $sp,$sp,0x18 -/* f10d050: 03e00008 */ jr $ra -/* f10d054: 00000000 */ nop -); -#else bool filemgrConsiderPushingFileSelectDialog(void) { if (g_Menus[g_MpPlayerNum].openinhibit == 0) { g_Menus[g_MpPlayerNum].playernum = 0; menuPushRootDialog(&g_FilemgrFileSelectMenuDialog, MENUROOT_FILEMGR); + +#if PAL + if (g_Vars.language >= 6) { + menuPushDialog(&g_ChooseLanguageMenuDialog); + } +#endif + return true; } return false; } -#endif void bootmenuReset(void) {