diff --git a/src/game/game_015470.c b/src/game/game_015470.c index 317263f4a..5ba6fa832 100644 --- a/src/game/game_015470.c +++ b/src/game/game_015470.c @@ -6746,7 +6746,7 @@ glabel func0f01b160 /* f01b2f4: 00000000 */ sll $zero,$zero,0x0 /* f01b2f8: 8cee0288 */ lw $t6,0x288($a3) /* f01b2fc: 0000f025 */ or $s8,$zero,$zero -/* f01b300: 0fc549c4 */ jal func0f152710 +/* f01b300: 0fc549c4 */ jal optionsGetControlMode /* f01b304: 8dc40070 */ lw $a0,0x70($t6) /* f01b308: 3c0f800a */ lui $t7,0x800a /* f01b30c: 8defa248 */ lw $t7,-0x5db8($t7) diff --git a/src/game/game_066310.c b/src/game/game_066310.c index 22124df3d..3b5853939 100644 --- a/src/game/game_066310.c +++ b/src/game/game_066310.c @@ -38656,7 +38656,7 @@ glabel func0f087668 /* f08770c: 2c460001 */ sltiu $a2,$v0,0x1 /* f087710: 54c0000f */ bnezl $a2,.L0f087750 /* f087714: 8fac0034 */ lw $t4,0x34($sp) -/* f087718: 0fc54bcd */ jal func0f152f34 +/* f087718: 0fc54bcd */ jal optionsGetScreenSplit /* f08771c: afa8002c */ sw $t0,0x2c($sp) /* f087720: 24040001 */ addiu $a0,$zero,0x1 /* f087724: 00821826 */ xor $v1,$a0,$v0 @@ -39218,7 +39218,7 @@ glabel func0f087e40 /* f087ed0: 2c470001 */ sltiu $a3,$v0,0x1 /* f087ed4: 54e0000e */ bnezl $a3,.L0f087f10 /* f087ed8: 8fab0028 */ lw $t3,0x28($sp) -/* f087edc: 0fc54bcd */ jal func0f152f34 +/* f087edc: 0fc54bcd */ jal optionsGetScreenSplit /* f087ee0: 00000000 */ sll $zero,$zero,0x0 /* f087ee4: 24040001 */ addiu $a0,$zero,0x1 /* f087ee8: 00821826 */ xor $v1,$a0,$v0 @@ -39650,7 +39650,7 @@ glabel func0f08841c /* f0884b0: 2c430001 */ sltiu $v1,$v0,0x1 /* f0884b4: 54600010 */ bnezl $v1,.L0f0884f8 /* f0884b8: 8fac0028 */ lw $t4,0x28($sp) -/* f0884bc: 0fc54bcd */ jal func0f152f34 +/* f0884bc: 0fc54bcd */ jal optionsGetScreenSplit /* f0884c0: 00000000 */ sll $zero,$zero,0x0 /* f0884c4: 24050001 */ addiu $a1,$zero,0x1 /* f0884c8: 00a22026 */ xor $a0,$a1,$v0 @@ -40359,7 +40359,7 @@ glabel func0f088840 /* f088eb8: 24010002 */ addiu $at,$zero,0x2 /* f088ebc: 1441000a */ bne $v0,$at,.L0f088ee8 /* f088ec0: 00000000 */ sll $zero,$zero,0x0 -/* f088ec4: 0fc54bcd */ jal func0f152f34 +/* f088ec4: 0fc54bcd */ jal optionsGetScreenSplit /* f088ec8: 00000000 */ sll $zero,$zero,0x0 /* f088ecc: 24010001 */ addiu $at,$zero,0x1 /* f088ed0: 10410009 */ beq $v0,$at,.L0f088ef8 @@ -49196,7 +49196,7 @@ glabel func0f0908b8 /* f090998: 24010001 */ addiu $at,$zero,0x1 /* f09099c: 1301000a */ beq $t8,$at,.L0f0909c8 /* f0909a0: 00000000 */ sll $zero,$zero,0x0 -/* f0909a4: 0fc54bcd */ jal func0f152f34 +/* f0909a4: 0fc54bcd */ jal optionsGetScreenSplit /* f0909a8: 00000000 */ sll $zero,$zero,0x0 /* f0909ac: 3c06800a */ lui $a2,%hi(g_Vars) /* f0909b0: 24010001 */ addiu $at,$zero,0x1 diff --git a/src/game/game_097a50.c b/src/game/game_097a50.c index f21cbe194..985a92377 100644 --- a/src/game/game_097a50.c +++ b/src/game/game_097a50.c @@ -877,7 +877,7 @@ glabel func0f097ba0 /* f097bc4: 27a60028 */ addiu $a2,$sp,0x28 /* f097bc8: 3c0e800a */ lui $t6,0x800a /* f097bcc: 8dcea248 */ lw $t6,-0x5db8($t6) -/* f097bd0: 0fc549c4 */ jal func0f152710 +/* f097bd0: 0fc549c4 */ jal optionsGetControlMode /* f097bd4: 8dc40070 */ lw $a0,0x70($t6) /* f097bd8: 28410004 */ slti $at,$v0,0x4 /* f097bdc: 1420003f */ bnez $at,.L0f097cdc @@ -18377,7 +18377,7 @@ glabel func0f0a7138 /* f0a7318: 91581bfc */ lbu $t8,0x1bfc($t2) /* f0a731c: 53000016 */ beqzl $t8,.L0f0a7378 /* f0a7320: 8e2b006c */ lw $t3,0x6c($s1) -/* f0a7324: 0fc54bc7 */ jal func0f152f1c +/* f0a7324: 0fc54bc7 */ jal optionsGetScreenRatio /* f0a7328: 00000000 */ sll $zero,$zero,0x0 /* f0a732c: 24010001 */ addiu $at,$zero,0x1 /* f0a7330: 14410008 */ bne $v0,$at,.L0f0a7354 @@ -22283,7 +22283,7 @@ glabel func0f0aa86c /* f0aaa04: 24010001 */ addiu $at,$zero,0x1 /* f0aaa08: 51c10009 */ beql $t6,$at,.L0f0aaa30 /* f0aaa0c: 8fb80128 */ lw $t8,0x128($sp) -/* f0aaa10: 0fc54bcd */ jal func0f152f34 +/* f0aaa10: 0fc54bcd */ jal optionsGetScreenSplit /* f0aaa14: 00000000 */ sll $zero,$zero,0x0 /* f0aaa18: 24010001 */ addiu $at,$zero,0x1 /* f0aaa1c: 10410007 */ beq $v0,$at,.L0f0aaa3c @@ -22380,7 +22380,7 @@ glabel func0f0aa86c /* f0aab60: 24010002 */ addiu $at,$zero,0x2 /* f0aab64: 1701000f */ bne $t8,$at,.L0f0aaba4 /* f0aab68: afaf0100 */ sw $t7,0x100($sp) -/* f0aab6c: 0fc54bcd */ jal func0f152f34 +/* f0aab6c: 0fc54bcd */ jal optionsGetScreenSplit /* f0aab70: 00000000 */ sll $zero,$zero,0x0 /* f0aab74: 24070001 */ addiu $a3,$zero,0x1 /* f0aab78: 10e20004 */ beq $a3,$v0,.L0f0aab8c @@ -22974,7 +22974,7 @@ glabel func0f0aa86c /* f0ab41c: 55e10015 */ bnel $t7,$at,.L0f0ab474 /* f0ab420: 8fae0124 */ lw $t6,0x124($sp) /* f0ab424: afa40054 */ sw $a0,0x54($sp) -/* f0ab428: 0fc54bcd */ jal func0f152f34 +/* f0ab428: 0fc54bcd */ jal optionsGetScreenSplit /* f0ab42c: afaa0058 */ sw $t2,0x58($sp) /* f0ab430: 24010001 */ addiu $at,$zero,0x1 /* f0ab434: 8fa40054 */ lw $a0,0x54($sp) @@ -23106,7 +23106,7 @@ glabel func0f0aa86c /* f0ab60c: 24010002 */ addiu $at,$zero,0x2 /* f0ab610: 15c10011 */ bne $t6,$at,.L0f0ab658 /* f0ab614: afb90100 */ sw $t9,0x100($sp) -/* f0ab618: 0fc54bcd */ jal func0f152f34 +/* f0ab618: 0fc54bcd */ jal optionsGetScreenSplit /* f0ab61c: afaa0058 */ sw $t2,0x58($sp) /* f0ab620: 24010001 */ addiu $at,$zero,0x1 /* f0ab624: 10410006 */ beq $v0,$at,.L0f0ab640 diff --git a/src/game/game_0b0420.c b/src/game/game_0b0420.c index c9065e13e..ade4f1692 100644 --- a/src/game/game_0b0420.c +++ b/src/game/game_0b0420.c @@ -1245,7 +1245,7 @@ glabel func0f0b131c /* f0b13a8: 01265021 */ addu $t2,$t1,$a2 /* f0b13ac: 55410046 */ bnel $t2,$at,.L0f0b14c8 /* f0b13b0: 8fbf0014 */ lw $ra,0x14($sp) -/* f0b13b4: 0fc54bcd */ jal func0f152f34 +/* f0b13b4: 0fc54bcd */ jal optionsGetScreenSplit /* f0b13b8: e7a2001c */ swc1 $f2,0x1c($sp) /* f0b13bc: 3c05800a */ lui $a1,%hi(g_Vars) /* f0b13c0: 24010001 */ addiu $at,$zero,0x1 @@ -1303,7 +1303,7 @@ glabel func0f0b131c /* f0b1478: 03264021 */ addu $t0,$t9,$a2 /* f0b147c: 55010012 */ bnel $t0,$at,.L0f0b14c8 /* f0b1480: 8fbf0014 */ lw $ra,0x14($sp) -/* f0b1484: 0fc54bcd */ jal func0f152f34 +/* f0b1484: 0fc54bcd */ jal optionsGetScreenSplit /* f0b1488: e7a2001c */ swc1 $f2,0x1c($sp) /* f0b148c: 3c05800a */ lui $a1,%hi(g_Vars) /* f0b1490: 24010001 */ addiu $at,$zero,0x1 diff --git a/src/game/game_0b28d0.c b/src/game/game_0b28d0.c index 026c98af9..b81ab9e88 100644 --- a/src/game/game_0b28d0.c +++ b/src/game/game_0b28d0.c @@ -11407,7 +11407,7 @@ glabel func0f0bc554 /* f0bc698: 01656021 */ addu $t4,$t3,$a1 /* f0bc69c: 1581002b */ bne $t4,$at,.L0f0bc74c /* f0bc6a0: 3c198007 */ lui $t9,0x8007 -/* f0bc6a4: 0fc54bcd */ jal func0f152f34 +/* f0bc6a4: 0fc54bcd */ jal optionsGetScreenSplit /* f0bc6a8: 00000000 */ sll $zero,$zero,0x0 /* f0bc6ac: 3c06800a */ lui $a2,%hi(g_Vars) /* f0bc6b0: 24010001 */ addiu $at,$zero,0x1 @@ -11601,7 +11601,7 @@ glabel func0f0bc7ac /* f0bc940: 2c4c0001 */ sltiu $t4,$v0,0x1 /* f0bc944: 11800042 */ beqz $t4,.L0f0bca50 /* f0bc948: 00000000 */ sll $zero,$zero,0x0 -/* f0bc94c: 0fc54bcd */ jal func0f152f34 +/* f0bc94c: 0fc54bcd */ jal optionsGetScreenSplit /* f0bc950: 00000000 */ sll $zero,$zero,0x0 /* f0bc954: 24030001 */ addiu $v1,$zero,0x1 /* f0bc958: 3c0b800a */ lui $t3,%hi(g_Vars) @@ -11801,7 +11801,7 @@ glabel func0f0bcaa0 /* f0bcc0c: 5541001a */ bnel $t2,$at,.L0f0bcc78 /* f0bcc10: 8cc2028c */ lw $v0,0x28c($a2) /* f0bcc14: a7a4001e */ sh $a0,0x1e($sp) -/* f0bcc18: 0fc54bcd */ jal func0f152f34 +/* f0bcc18: 0fc54bcd */ jal optionsGetScreenSplit /* f0bcc1c: a7a8001c */ sh $t0,0x1c($sp) /* f0bcc20: 3c06800a */ lui $a2,%hi(g_Vars) /* f0bcc24: 24090001 */ addiu $t1,$zero,0x1 @@ -11995,7 +11995,7 @@ glabel func0f0bce24 /* f0bcecc: 000e7080 */ sll $t6,$t6,0x2 /* f0bced0: 00ce3021 */ addu $a2,$a2,$t6 /* f0bced4: 84c605da */ lh $a2,0x5da($a2) -/* f0bced8: 0fc54bcd */ jal func0f152f34 +/* f0bced8: 0fc54bcd */ jal optionsGetScreenSplit /* f0bcedc: a7a6001e */ sh $a2,0x1e($sp) /* f0bcee0: 3c07800a */ lui $a3,%hi(g_Vars) /* f0bcee4: 24090001 */ addiu $t1,$zero,0x1 @@ -12073,7 +12073,7 @@ glabel func0f0bce24 /* f0bcfd4: 8cea028c */ lw $t2,0x28c($a3) /* f0bcfd8: 552a0020 */ bnel $t1,$t2,.L0f0bd05c /* f0bcfdc: 8ce2028c */ lw $v0,0x28c($a3) -/* f0bcfe0: 0fc54bcd */ jal func0f152f34 +/* f0bcfe0: 0fc54bcd */ jal optionsGetScreenSplit /* f0bcfe4: a7a6001e */ sh $a2,0x1e($sp) /* f0bcfe8: 3c07800a */ lui $a3,%hi(g_Vars) /* f0bcfec: 24090001 */ addiu $t1,$zero,0x1 @@ -12142,7 +12142,7 @@ glabel func0f0bce24 /* f0bd0d0: 8d8c0764 */ lw $t4,0x764($t4) /* f0bd0d4: 11800038 */ beqz $t4,.L0f0bd1b8 /* f0bd0d8: 00000000 */ sll $zero,$zero,0x0 -/* f0bd0dc: 0fc54a46 */ jal func0f152918 +/* f0bd0dc: 0fc54a46 */ jal optionsGetCutsceneSubtitles /* f0bd0e0: 00000000 */ sll $zero,$zero,0x0 /* f0bd0e4: 3c07800a */ lui $a3,%hi(g_Vars) /* f0bd0e8: 10400033 */ beqz $v0,.L0f0bd1b8 @@ -12235,7 +12235,7 @@ glabel func0f0bce24 /* f0bd234: 8dcedfc0 */ lw $t6,-0x2040($t6) /* f0bd238: 15c00037 */ bnez $t6,.L0f0bd318 /* f0bd23c: 00000000 */ sll $zero,$zero,0x0 -/* f0bd240: 0fc54a46 */ jal func0f152918 +/* f0bd240: 0fc54a46 */ jal optionsGetCutsceneSubtitles /* f0bd244: 00000000 */ sll $zero,$zero,0x0 /* f0bd248: 3c07800a */ lui $a3,%hi(g_Vars) /* f0bd24c: 10400004 */ beqz $v0,.L0f0bd260 @@ -12787,7 +12787,7 @@ glabel func0f0bd904 /* f0bd9f8: 0fc54c77 */ jal func0f1531dc /* f0bd9fc: 00002025 */ or $a0,$zero,$zero .L0f0bda00: -/* f0bda00: 0fc54bc7 */ jal func0f152f1c +/* f0bda00: 0fc54bc7 */ jal optionsGetScreenRatio /* f0bda04: 00000000 */ sll $zero,$zero,0x0 /* f0bda08: 24010001 */ addiu $at,$zero,0x1 /* f0bda0c: 14410008 */ bne $v0,$at,.L0f0bda30 @@ -13498,7 +13498,7 @@ glabel func0f0bd904 /* f0be46c: 8faa02e0 */ lw $t2,0x2e0($sp) /* f0be470: 8e690288 */ lw $t1,0x288($s3) /* f0be474: 8e340048 */ lw $s4,0x48($s1) -/* f0be478: 0fc549c4 */ jal func0f152710 +/* f0be478: 0fc549c4 */ jal optionsGetControlMode /* f0be47c: 8d240070 */ lw $a0,0x70($t1) /* f0be480: 8e6a0288 */ lw $t2,0x288($s3) /* f0be484: 00408025 */ or $s0,$v0,$zero diff --git a/src/game/game_0c79f0.c b/src/game/game_0c79f0.c index eee13a8f3..046e01b97 100644 --- a/src/game/game_0c79f0.c +++ b/src/game/game_0c79f0.c @@ -1445,7 +1445,7 @@ glabel func0f0c8b90 /* f0c8bc8: afa7026c */ sw $a3,0x26c($sp) /* f0c8bcc: 00a08825 */ or $s1,$a1,$zero /* f0c8bd0: 00c0b025 */ or $s6,$a2,$zero -/* f0c8bd4: 0fc549c4 */ jal func0f152710 +/* f0c8bd4: 0fc549c4 */ jal optionsGetControlMode /* f0c8bd8: 8dc40070 */ lw $a0,0x70($t6) /* f0c8bdc: afa201b0 */ sw $v0,0x1b0($sp) /* f0c8be0: 0fc2866a */ jal getCurrentPlayerWeaponId diff --git a/src/game/game_0cf150.c b/src/game/game_0cf150.c index 6adc2f258..301701b24 100644 --- a/src/game/game_0cf150.c +++ b/src/game/game_0cf150.c @@ -1746,7 +1746,7 @@ glabel func0f0d0928 /* f0d09e4: 8f040070 */ lw $a0,0x70($t8) /* f0d09e8: a3bf00c2 */ sb $ra,0xc2($sp) /* f0d09ec: a7a800bc */ sh $t0,0xbc($sp) -/* f0d09f0: 0fc549c4 */ jal func0f152710 +/* f0d09f0: 0fc549c4 */ jal optionsGetControlMode /* f0d09f4: a3a700c0 */ sb $a3,0xc0($sp) /* f0d09f8: 44808000 */ mtc1 $zero,$f16 /* f0d09fc: 3c09800a */ lui $t1,%hi(g_Vars) diff --git a/src/game/game_0d1fe0.c b/src/game/game_0d1fe0.c index 40dd003de..7d513c965 100644 --- a/src/game/game_0d1fe0.c +++ b/src/game/game_0d1fe0.c @@ -528,25 +528,25 @@ glabel func0f0d26ac /* f0d26dc: 3c08800a */ lui $t0,0x800a /* f0d26e0: 8d08a248 */ lw $t0,-0x5db8($t0) /* f0d26e4: a3a2005b */ sb $v0,0x5b($sp) -/* f0d26e8: 0fc549c4 */ jal func0f152710 +/* f0d26e8: 0fc549c4 */ jal optionsGetControlMode /* f0d26ec: 8d040070 */ lw $a0,0x70($t0) /* f0d26f0: 24010001 */ addiu $at,$zero,0x1 /* f0d26f4: 10410012 */ beq $v0,$at,.L0f0d2740 /* f0d26f8: 3c09800a */ lui $t1,0x800a /* f0d26fc: 8d29a248 */ lw $t1,-0x5db8($t1) -/* f0d2700: 0fc549c4 */ jal func0f152710 +/* f0d2700: 0fc549c4 */ jal optionsGetControlMode /* f0d2704: 8d240070 */ lw $a0,0x70($t1) /* f0d2708: 24010003 */ addiu $at,$zero,0x3 /* f0d270c: 1041000c */ beq $v0,$at,.L0f0d2740 /* f0d2710: 3c0a800a */ lui $t2,0x800a /* f0d2714: 8d4aa248 */ lw $t2,-0x5db8($t2) -/* f0d2718: 0fc549c4 */ jal func0f152710 +/* f0d2718: 0fc549c4 */ jal optionsGetControlMode /* f0d271c: 8d440070 */ lw $a0,0x70($t2) /* f0d2720: 24010002 */ addiu $at,$zero,0x2 /* f0d2724: 10410006 */ beq $v0,$at,.L0f0d2740 /* f0d2728: 3c0b800a */ lui $t3,0x800a /* f0d272c: 8d6ba248 */ lw $t3,-0x5db8($t3) -/* f0d2730: 0fc549c4 */ jal func0f152710 +/* f0d2730: 0fc549c4 */ jal optionsGetControlMode /* f0d2734: 8d640070 */ lw $a0,0x70($t3) /* f0d2738: 14400011 */ bnez $v0,.L0f0d2780 /* f0d273c: 8fa70060 */ lw $a3,0x60($sp) diff --git a/src/game/game_0dcdb0.c b/src/game/game_0dcdb0.c index 87e6a3e52..c5ae64554 100644 --- a/src/game/game_0dcdb0.c +++ b/src/game/game_0dcdb0.c @@ -4456,7 +4456,7 @@ glabel func0f0dcef4 /* f0dcfec: afa70080 */ sw $a3,0x80($sp) /* f0dcff0: afa80048 */ sw $t0,0x48($sp) /* f0dcff4: afa9004c */ sw $t1,0x4c($sp) -/* f0dcff8: 0fc54bcd */ jal func0f152f34 +/* f0dcff8: 0fc54bcd */ jal optionsGetScreenSplit /* f0dcffc: afaa0044 */ sw $t2,0x44($sp) /* f0dd000: 24050001 */ addiu $a1,$zero,0x1 /* f0dd004: 8fa60050 */ lw $a2,0x50($sp) @@ -4489,7 +4489,7 @@ glabel func0f0dcef4 /* f0dd068: afa70080 */ sw $a3,0x80($sp) /* f0dd06c: afa80048 */ sw $t0,0x48($sp) /* f0dd070: afa9004c */ sw $t1,0x4c($sp) -/* f0dd074: 0fc54bcd */ jal func0f152f34 +/* f0dd074: 0fc54bcd */ jal optionsGetScreenSplit /* f0dd078: afaa0044 */ sw $t2,0x44($sp) /* f0dd07c: 24050001 */ addiu $a1,$zero,0x1 /* f0dd080: 8fa60050 */ lw $a2,0x50($sp) @@ -4524,7 +4524,7 @@ glabel func0f0dcef4 /* f0dd0e8: 10b8000b */ beq $a1,$t8,.L0f0dd118 /* f0dd0ec: 00000000 */ sll $zero,$zero,0x0 /* f0dd0f0: afa3003c */ sw $v1,0x3c($sp) -/* f0dd0f4: 0fc54bcd */ jal func0f152f34 +/* f0dd0f4: 0fc54bcd */ jal optionsGetScreenSplit /* f0dd0f8: afa70080 */ sw $a3,0x80($sp) /* f0dd0fc: 24050001 */ addiu $a1,$zero,0x1 /* f0dd100: 8fa3003c */ lw $v1,0x3c($sp) @@ -4565,7 +4565,7 @@ glabel func0f0dcef4 /* f0dd174: 54610013 */ bnel $v1,$at,.L0f0dd1c4 /* f0dd178: 28610003 */ slti $at,$v1,0x3 /* f0dd17c: afa3003c */ sw $v1,0x3c($sp) -/* f0dd180: 0fc54bcd */ jal func0f152f34 +/* f0dd180: 0fc54bcd */ jal optionsGetScreenSplit /* f0dd184: afa70080 */ sw $a3,0x80($sp) /* f0dd188: 24050001 */ addiu $a1,$zero,0x1 /* f0dd18c: 8fa3003c */ lw $v1,0x3c($sp) @@ -4756,7 +4756,7 @@ glabel func0f0dd2ac /* f0dd428: 24010001 */ addiu $at,$zero,0x1 /* f0dd42c: 1141000a */ beq $t2,$at,.L0f0dd458 /* f0dd430: 00000000 */ sll $zero,$zero,0x0 -/* f0dd434: 0fc54bcd */ jal func0f152f34 +/* f0dd434: 0fc54bcd */ jal optionsGetScreenSplit /* f0dd438: 00000000 */ sll $zero,$zero,0x0 /* f0dd43c: 3c06800a */ lui $a2,%hi(g_Vars) /* f0dd440: 24010001 */ addiu $at,$zero,0x1 @@ -5285,7 +5285,7 @@ glabel func0f0ddb1c /* f0ddbec: 8cf80000 */ lw $t8,0x0($a3) /* f0ddbf0: afa70020 */ sw $a3,0x20($sp) /* f0ddbf4: afa80018 */ sw $t0,0x18($sp) -/* f0ddbf8: 0fc54bcd */ jal func0f152f34 +/* f0ddbf8: 0fc54bcd */ jal optionsGetScreenSplit /* f0ddbfc: afaa001c */ sw $t2,0x1c($sp) /* f0ddc00: 3c06800a */ lui $a2,%hi(g_Vars) /* f0ddc04: 24010001 */ addiu $at,$zero,0x1 @@ -5722,14 +5722,14 @@ glabel func0f0de160 /* f0de1bc: 8defa26c */ lw $t7,-0x5d94($t7) /* f0de1c0: 166f0007 */ bne $s3,$t7,.L0f0de1e0 /* f0de1c4: 00000000 */ sll $zero,$zero,0x0 -/* f0de1c8: 0fc54a46 */ jal func0f152918 +/* f0de1c8: 0fc54a46 */ jal optionsGetCutsceneSubtitles /* f0de1cc: 00000000 */ sll $zero,$zero,0x0 /* f0de1d0: 10400162 */ beqz $v0,.L0f0de75c /* f0de1d4: 2418000b */ addiu $t8,$zero,0xb /* f0de1d8: 10000005 */ beqz $zero,.L0f0de1f0 /* f0de1dc: afb804c4 */ sw $t8,0x4c4($sp) .L0f0de1e0: -/* f0de1e0: 0fc54a43 */ jal func0f15290c +/* f0de1e0: 0fc54a43 */ jal optionsGetInGameSubtitles /* f0de1e4: 00000000 */ sll $zero,$zero,0x0 /* f0de1e8: 5040015d */ beqzl $v0,.L0f0de760 /* f0de1ec: 8fbf006c */ lw $ra,0x6c($sp) @@ -6286,7 +6286,7 @@ glabel func0f0de7fc /* f0de9a0: 8fa30038 */ lw $v1,0x38($sp) /* f0de9a4: afa40018 */ sw $a0,0x18($sp) /* f0de9a8: afab0024 */ sw $t3,0x24($sp) -/* f0de9ac: 0fc54bcd */ jal func0f152f34 +/* f0de9ac: 0fc54bcd */ jal optionsGetScreenSplit /* f0de9b0: afac002c */ sw $t4,0x2c($sp) /* f0de9b4: 241f0001 */ addiu $ra,$zero,0x1 /* f0de9b8: 8fa40018 */ lw $a0,0x18($sp) @@ -6373,7 +6373,7 @@ glabel func0f0de7fc /* f0deacc: 01e67021 */ addu $t6,$t7,$a2 /* f0dead0: 15c10029 */ bne $t6,$at,.L0f0deb78 /* f0dead4: 00000000 */ sll $zero,$zero,0x0 -/* f0dead8: 0fc54bcd */ jal func0f152f34 +/* f0dead8: 0fc54bcd */ jal optionsGetScreenSplit /* f0deadc: afa90034 */ sw $t1,0x34($sp) /* f0deae0: 3c038009 */ lui $v1,%hi(var80090af0) /* f0deae4: 241f0001 */ addiu $ra,$zero,0x1 @@ -6562,7 +6562,7 @@ glabel func0f0de7fc /* f0ded64: 13f9000c */ beq $ra,$t9,.L0f0ded98 /* f0ded68: 00000000 */ sll $zero,$zero,0x0 /* f0ded6c: afa40030 */ sw $a0,0x30($sp) -/* f0ded70: 0fc54bcd */ jal func0f152f34 +/* f0ded70: 0fc54bcd */ jal optionsGetScreenSplit /* f0ded74: afa90034 */ sw $t1,0x34($sp) /* f0ded78: 241f0001 */ addiu $ra,$zero,0x1 /* f0ded7c: 8fa40030 */ lw $a0,0x30($sp) @@ -6675,7 +6675,7 @@ glabel func0f0deebc /* f0deee0: afa70204 */ sw $a3,0x204($sp) /* f0deee4: 14b10005 */ bne $a1,$s1,.L0f0deefc /* f0deee8: 00004825 */ or $t1,$zero,$zero -/* f0deeec: 0fc54a43 */ jal func0f15290c +/* f0deeec: 0fc54a43 */ jal optionsGetInGameSubtitles /* f0deef0: afa001ec */ sw $zero,0x1ec($sp) /* f0deef4: 10400115 */ beqz $v0,.L0f0df34c /* f0deef8: 8fa901ec */ lw $t1,0x1ec($sp) diff --git a/src/game/game_0f09f0.c b/src/game/game_0f09f0.c index 71cad6f9a..24a5fa18e 100644 --- a/src/game/game_0f09f0.c +++ b/src/game/game_0f09f0.c @@ -7997,7 +7997,7 @@ glabel func0f0f74a8 /* f0f7534: 55800014 */ bnezl $t4,.L0f0f7588 /* f0f7538: 8fbf0014 */ lw $ra,0x14($sp) /* f0f753c: 8c6d0288 */ lw $t5,0x288($v1) -/* f0f7540: 0fc549c4 */ jal func0f152710 +/* f0f7540: 0fc549c4 */ jal optionsGetControlMode /* f0f7544: 8da40070 */ lw $a0,0x70($t5) /* f0f7548: 24010006 */ addiu $at,$zero,0x6 /* f0f754c: 10410008 */ beq $v0,$at,.L0f0f7570 @@ -8626,7 +8626,7 @@ glabel func0f0f7728 /* f0f7ddc: 01eac021 */ addu $t8,$t7,$t2 /* f0f7de0: 5701002a */ bnel $t8,$at,.L0f0f7e8c /* f0f7de4: 8fbf0014 */ lw $ra,0x14($sp) -/* f0f7de8: 0fc54bcd */ jal func0f152f34 +/* f0f7de8: 0fc54bcd */ jal optionsGetScreenSplit /* f0f7dec: 00000000 */ sll $zero,$zero,0x0 /* f0f7df0: 24080001 */ addiu $t0,$zero,0x1 /* f0f7df4: 3c0d800a */ lui $t5,%hi(var8009e000) @@ -13933,7 +13933,7 @@ glabel func0f0fbc30 /* f0fc8d4: 01485821 */ addu $t3,$t2,$t0 /* f0fc8d8: 55610013 */ bnel $t3,$at,.L0f0fc928 /* f0fc8dc: 8ecf006c */ lw $t7,0x6c($s6) -/* f0fc8e0: 0fc54bcd */ jal func0f152f34 +/* f0fc8e0: 0fc54bcd */ jal optionsGetScreenSplit /* f0fc8e4: afa9008c */ sw $t1,0x8c($sp) /* f0fc8e8: 24010001 */ addiu $at,$zero,0x1 /* f0fc8ec: 10410006 */ beq $v0,$at,.L0f0fc908 @@ -16952,7 +16952,7 @@ glabel func0f0ff0bc /* f0ff248: 2f020001 */ sltiu $v0,$t8,0x1 /* f0ff24c: 50400006 */ beqzl $v0,.L0f0ff268 /* f0ff250: 8fbf0014 */ lw $ra,0x14($sp) -/* f0ff254: 0fc54bcd */ jal func0f152f34 +/* f0ff254: 0fc54bcd */ jal optionsGetScreenSplit /* f0ff258: 00000000 */ sll $zero,$zero,0x0 /* f0ff25c: 38590001 */ xori $t9,$v0,0x1 /* f0ff260: 2f220001 */ sltiu $v0,$t9,0x1 @@ -17250,7 +17250,7 @@ glabel func0f0ff274 /* f0ff67c: 1481000b */ bne $a0,$at,.L0f0ff6ac /* f0ff680: a4ee0000 */ sh $t6,0x0($a3) /* f0ff684: afa40020 */ sw $a0,0x20($sp) -/* f0ff688: 0fc54bcd */ jal func0f152f34 +/* f0ff688: 0fc54bcd */ jal optionsGetScreenSplit /* f0ff68c: afa60048 */ sw $a2,0x48($sp) /* f0ff690: 24030001 */ addiu $v1,$zero,0x1 /* f0ff694: 8fa40020 */ lw $a0,0x20($sp) @@ -17422,7 +17422,7 @@ glabel func0f0ff7bc /* f0ff8c8: 0305c821 */ addu $t9,$t8,$a1 /* f0ff8cc: 17210013 */ bne $t9,$at,.L0f0ff91c /* f0ff8d0: 00000000 */ sll $zero,$zero,0x0 -/* f0ff8d4: 0fc54bcd */ jal func0f152f34 +/* f0ff8d4: 0fc54bcd */ jal optionsGetScreenSplit /* f0ff8d8: 00000000 */ sll $zero,$zero,0x0 /* f0ff8dc: 24010001 */ addiu $at,$zero,0x1 /* f0ff8e0: 10410024 */ beq $v0,$at,.L0f0ff974 @@ -19727,7 +19727,7 @@ glabel func0f100ad0 /* f101a3c: 01e67021 */ addu $t6,$t7,$a2 /* f101a40: 15c10011 */ bne $t6,$at,.L0f101a88 /* f101a44: 00000000 */ sll $zero,$zero,0x0 -/* f101a48: 0fc54bcd */ jal func0f152f34 +/* f101a48: 0fc54bcd */ jal optionsGetScreenSplit /* f101a4c: 00000000 */ sll $zero,$zero,0x0 /* f101a50: 24010001 */ addiu $at,$zero,0x1 /* f101a54: 10410021 */ beq $v0,$at,.L0f101adc diff --git a/src/game/game_102240.c b/src/game/game_102240.c index e6338f565..e213efb4d 100644 --- a/src/game/game_102240.c +++ b/src/game/game_102240.c @@ -262,7 +262,7 @@ glabel func0f102330 /* f102404: 10000030 */ beqz $zero,.L0f1024c8 /* f102408: acca0008 */ sw $t2,0x8($a2) /* f10240c: 00e02025 */ or $a0,$a3,$zero -/* f102410: 0fc549cb */ jal func0f15272c +/* f102410: 0fc549cb */ jal optionsSetControlMode /* f102414: 8cc50000 */ lw $a1,0x0($a2) /* f102418: 3c02800a */ lui $v0,%hi(g_Vars) /* f10241c: 24429fc0 */ addiu $v0,$v0,%lo(g_Vars) @@ -272,7 +272,7 @@ glabel func0f102330 /* f10242c: ac4c0458 */ sw $t4,0x458($v0) /* f102430: 00e02025 */ or $a0,$a3,$zero /* f102434: afa60028 */ sw $a2,0x28($sp) -/* f102438: 0fc549c4 */ jal func0f152710 +/* f102438: 0fc549c4 */ jal optionsGetControlMode /* f10243c: afa7002c */ sw $a3,0x2c($sp) /* f102440: 8fa60028 */ lw $a2,0x28($sp) /* f102444: 8fa7002c */ lw $a3,0x2c($sp) @@ -527,7 +527,7 @@ glabel menuhandlerScreenSize /* f1027c8: 1000000f */ beqz $zero,.L0f102808 /* f1027cc: 8fbf0014 */ lw $ra,0x14($sp) .L0f1027d0: -/* f1027d0: 0fc54bc4 */ jal func0f152f10 +/* f1027d0: 0fc54bc4 */ jal optionsSetScreenMode /* f1027d4: 8cc40000 */ lw $a0,0x0($a2) /* f1027d8: 3c02800a */ lui $v0,%hi(g_Vars) /* f1027dc: 24429fc0 */ addiu $v0,$v0,%lo(g_Vars) @@ -584,7 +584,7 @@ glabel menuhandlerScreenRatio /* f102880: 1000000f */ beqz $zero,.L0f1028c0 /* f102884: 8fbf0014 */ lw $ra,0x14($sp) .L0f102888: -/* f102888: 0fc54bca */ jal func0f152f28 +/* f102888: 0fc54bca */ jal optionsSetScreenRatio /* f10288c: 8cc40000 */ lw $a0,0x0($a2) /* f102890: 3c02800a */ lui $v0,%hi(g_Vars) /* f102894: 24429fc0 */ addiu $v0,$v0,%lo(g_Vars) @@ -593,7 +593,7 @@ glabel menuhandlerScreenRatio /* f1028a0: 10000005 */ beqz $zero,.L0f1028b8 /* f1028a4: ac4d0458 */ sw $t5,0x458($v0) .L0f1028a8: -/* f1028a8: 0fc54bc7 */ jal func0f152f1c +/* f1028a8: 0fc54bc7 */ jal optionsGetScreenRatio /* f1028ac: afa60028 */ sw $a2,0x28($sp) /* f1028b0: 8fa60028 */ lw $a2,0x28($sp) /* f1028b4: acc20000 */ sw $v0,0x0($a2) @@ -641,13 +641,13 @@ glabel menuhandlerScreenSplit /* f102938: 1000003e */ beqz $zero,.L0f102a34 /* f10293c: 8fbf0014 */ lw $ra,0x14($sp) .L0f102940: -/* f102940: 0fc54bcd */ jal func0f152f34 +/* f102940: 0fc54bcd */ jal optionsGetScreenSplit /* f102944: afa60040 */ sw $a2,0x40($sp) /* f102948: 8fa60040 */ lw $a2,0x40($sp) /* f10294c: 8cc30000 */ lw $v1,0x0($a2) /* f102950: 50430037 */ beql $v0,$v1,.L0f102a30 /* f102954: 00001025 */ or $v0,$zero,$zero -/* f102958: 0fc54bd0 */ jal func0f152f40 +/* f102958: 0fc54bd0 */ jal optionsSetScreenSplit /* f10295c: 306400ff */ andi $a0,$v1,0xff /* f102960: 3c02800a */ lui $v0,%hi(g_Vars) /* f102964: 24429fc0 */ addiu $v0,$v0,%lo(g_Vars) @@ -701,7 +701,7 @@ glabel menuhandlerScreenSplit /* f102a14: 10000005 */ beqz $zero,.L0f102a2c /* f102a18: ac2d1448 */ sw $t5,0x1448($at) .L0f102a1c: -/* f102a1c: 0fc54bcd */ jal func0f152f34 +/* f102a1c: 0fc54bcd */ jal optionsGetScreenSplit /* f102a20: afa60040 */ sw $a2,0x40($sp) /* f102a24: 8fa60040 */ lw $a2,0x40($sp) /* f102a28: acc20000 */ sw $v0,0x0($a2) @@ -767,12 +767,12 @@ glabel menuhandlerInGameSubtitles /* f102b6c: 24010008 */ addiu $at,$zero,0x8 /* f102b70: 5481000d */ bnel $a0,$at,.L0f102ba8 /* f102b74: 00001025 */ or $v0,$zero,$zero -/* f102b78: 0fc54a43 */ jal func0f15290c +/* f102b78: 0fc54a43 */ jal optionsGetInGameSubtitles /* f102b7c: 00000000 */ sll $zero,$zero,0x0 /* f102b80: 1000000a */ beqz $zero,.L0f102bac /* f102b84: 8fbf0014 */ lw $ra,0x14($sp) .L0f102b88: -/* f102b88: 0fc54b44 */ jal func0f152d10 +/* f102b88: 0fc54b44 */ jal optionsSetInGameSubtitles /* f102b8c: 8cc40000 */ lw $a0,0x0($a2) /* f102b90: 3c02800a */ lui $v0,%hi(g_Vars) /* f102b94: 24429fc0 */ addiu $v0,$v0,%lo(g_Vars) @@ -798,12 +798,12 @@ glabel menuhandlerCutsceneSubtitles /* f102bcc: 24010008 */ addiu $at,$zero,0x8 /* f102bd0: 5481000d */ bnel $a0,$at,.L0f102c08 /* f102bd4: 00001025 */ or $v0,$zero,$zero -/* f102bd8: 0fc54a46 */ jal func0f152918 +/* f102bd8: 0fc54a46 */ jal optionsGetCutsceneSubtitles /* f102bdc: 00000000 */ sll $zero,$zero,0x0 /* f102be0: 1000000a */ beqz $zero,.L0f102c0c /* f102be4: 8fbf0014 */ lw $ra,0x14($sp) .L0f102be8: -/* f102be8: 0fc54b47 */ jal func0f152d1c +/* f102be8: 0fc54b47 */ jal optionsSetCutsceneSubtitles /* f102bec: 8cc40000 */ lw $a0,0x0($a2) /* f102bf0: 3c02800a */ lui $v0,%hi(g_Vars) /* f102bf4: 24429fc0 */ addiu $v0,$v0,%lo(g_Vars) diff --git a/src/game/game_10ccd0.c b/src/game/game_10ccd0.c index 4ee559524..4e461f804 100644 --- a/src/game/game_10ccd0.c +++ b/src/game/game_10ccd0.c @@ -2437,7 +2437,7 @@ glabel func0f10ecb4 /* f10ed78: 14400011 */ bnez $v0,.L0f10edc0 /* f10ed7c: 00000000 */ sll $zero,$zero,0x0 .L0f10ed80: -/* f10ed80: 0fc54bcd */ jal func0f152f34 +/* f10ed80: 0fc54bcd */ jal optionsGetScreenSplit /* f10ed84: 00000000 */ sll $zero,$zero,0x0 /* f10ed88: 24010001 */ addiu $at,$zero,0x1 /* f10ed8c: 14410007 */ bne $v0,$at,.L0f10edac @@ -2455,7 +2455,7 @@ glabel func0f10ecb4 /* f10edb8: 10000011 */ beqz $zero,.L0f10ee00 /* f10edbc: 00000000 */ sll $zero,$zero,0x0 .L0f10edc0: -/* f10edc0: 0fc54bcd */ jal func0f152f34 +/* f10edc0: 0fc54bcd */ jal optionsGetScreenSplit /* f10edc4: 00000000 */ sll $zero,$zero,0x0 /* f10edc8: 24010001 */ addiu $at,$zero,0x1 /* f10edcc: 14410007 */ bne $v0,$at,.L0f10edec @@ -2605,7 +2605,7 @@ glabel func0f10ef10 /* f10efcc: 14400011 */ bnez $v0,.L0f10f014 /* f10efd0: 00000000 */ sll $zero,$zero,0x0 .L0f10efd4: -/* f10efd4: 0fc54bcd */ jal func0f152f34 +/* f10efd4: 0fc54bcd */ jal optionsGetScreenSplit /* f10efd8: 00000000 */ sll $zero,$zero,0x0 /* f10efdc: 24010001 */ addiu $at,$zero,0x1 /* f10efe0: 14410007 */ bne $v0,$at,.L0f10f000 @@ -2623,7 +2623,7 @@ glabel func0f10ef10 /* f10f00c: 1000000f */ beqz $zero,.L0f10f04c /* f10f010: 00000000 */ sll $zero,$zero,0x0 .L0f10f014: -/* f10f014: 0fc54bcd */ jal func0f152f34 +/* f10f014: 0fc54bcd */ jal optionsGetScreenSplit /* f10f018: 00000000 */ sll $zero,$zero,0x0 /* f10f01c: 24010001 */ addiu $at,$zero,0x1 /* f10f020: 14410007 */ bne $v0,$at,.L0f10f040 @@ -2662,7 +2662,7 @@ glabel func0f10ef10 /* f10f098: 14400011 */ bnez $v0,.L0f10f0e0 /* f10f09c: 00000000 */ sll $zero,$zero,0x0 .L0f10f0a0: -/* f10f0a0: 0fc54bcd */ jal func0f152f34 +/* f10f0a0: 0fc54bcd */ jal optionsGetScreenSplit /* f10f0a4: 00000000 */ sll $zero,$zero,0x0 /* f10f0a8: 24010001 */ addiu $at,$zero,0x1 /* f10f0ac: 14410007 */ bne $v0,$at,.L0f10f0cc @@ -2680,7 +2680,7 @@ glabel func0f10ef10 /* f10f0d8: 10000010 */ beqz $zero,.L0f10f11c /* f10f0dc: 8fbf0014 */ lw $ra,0x14($sp) .L0f10f0e0: -/* f10f0e0: 0fc54bcd */ jal func0f152f34 +/* f10f0e0: 0fc54bcd */ jal optionsGetScreenSplit /* f10f0e4: 00000000 */ sll $zero,$zero,0x0 /* f10f0e8: 24010001 */ addiu $at,$zero,0x1 /* f10f0ec: 14410007 */ bne $v0,$at,.L0f10f10c @@ -2926,12 +2926,12 @@ glabel func0f10f204 /* f10f4a4: 2404000b */ addiu $a0,$zero,0xb /* f10f4a8: 0fc47961 */ jal func0f11e584 /* f10f4ac: 02002825 */ or $a1,$s0,$zero -/* f10f4b0: 0fc54b44 */ jal func0f152d10 +/* f10f4b0: 0fc54b44 */ jal optionsSetInGameSubtitles /* f10f4b4: 00402025 */ or $a0,$v0,$zero /* f10f4b8: 24040014 */ addiu $a0,$zero,0x14 /* f10f4bc: 0fc47961 */ jal func0f11e584 /* f10f4c0: 02002825 */ or $a1,$s0,$zero -/* f10f4c4: 0fc54b47 */ jal func0f152d1c +/* f10f4c4: 0fc54b47 */ jal optionsSetCutsceneSubtitles /* f10f4c8: 00402025 */ or $a0,$v0,$zero /* f10f4cc: 24040021 */ addiu $a0,$zero,0x21 /* f10f4d0: 0fc47961 */ jal func0f11e584 @@ -2971,9 +2971,9 @@ glabel func0f10f204 /* f10f54c: 24010001 */ addiu $at,$zero,0x1 /* f10f550: 55410008 */ bnel $t2,$at,.L0f10f574 /* f10f554: 24040019 */ addiu $a0,$zero,0x19 -/* f10f558: 0fc54bd0 */ jal func0f152f40 +/* f10f558: 0fc54bd0 */ jal optionsSetScreenSplit /* f10f55c: 00002025 */ or $a0,$zero,$zero -/* f10f560: 0fc54bca */ jal func0f152f28 +/* f10f560: 0fc54bca */ jal optionsSetScreenRatio /* f10f564: 00002025 */ or $a0,$zero,$zero /* f10f568: 1000000c */ beqz $zero,.L0f10f59c /* f10f56c: 24040008 */ addiu $a0,$zero,0x8 @@ -2981,12 +2981,12 @@ glabel func0f10f204 .L0f10f574: /* f10f574: 0fc47961 */ jal func0f11e584 /* f10f578: 02002825 */ or $a1,$s0,$zero -/* f10f57c: 0fc54bd0 */ jal func0f152f40 +/* f10f57c: 0fc54bd0 */ jal optionsSetScreenSplit /* f10f580: 304400ff */ andi $a0,$v0,0xff /* f10f584: 24040007 */ addiu $a0,$zero,0x7 /* f10f588: 0fc47961 */ jal func0f11e584 /* f10f58c: 02002825 */ or $a1,$s0,$zero -/* f10f590: 0fc54bca */ jal func0f152f28 +/* f10f590: 0fc54bca */ jal optionsSetScreenRatio /* f10f594: 00402025 */ or $a0,$v0,$zero /* f10f598: 24040008 */ addiu $a0,$zero,0x8 .L0f10f59c: @@ -2994,7 +2994,7 @@ glabel func0f10f204 /* f10f5a0: 02002825 */ or $a1,$s0,$zero /* f10f5a4: 10400005 */ beqz $v0,.L0f10f5bc /* f10f5a8: 24040006 */ addiu $a0,$zero,0x6 -/* f10f5ac: 0fc54bc4 */ jal func0f152f10 +/* f10f5ac: 0fc54bc4 */ jal optionsSetScreenMode /* f10f5b0: 24040002 */ addiu $a0,$zero,0x2 /* f10f5b4: 1000000c */ beqz $zero,.L0f10f5e8 /* f10f5b8: 2404001f */ addiu $a0,$zero,0x1f @@ -3003,12 +3003,12 @@ glabel func0f10f204 /* f10f5c0: 02002825 */ or $a1,$s0,$zero /* f10f5c4: 10400005 */ beqz $v0,.L0f10f5dc /* f10f5c8: 00000000 */ sll $zero,$zero,0x0 -/* f10f5cc: 0fc54bc4 */ jal func0f152f10 +/* f10f5cc: 0fc54bc4 */ jal optionsSetScreenMode /* f10f5d0: 24040001 */ addiu $a0,$zero,0x1 /* f10f5d4: 10000004 */ beqz $zero,.L0f10f5e8 /* f10f5d8: 2404001f */ addiu $a0,$zero,0x1f .L0f10f5dc: -/* f10f5dc: 0fc54bc4 */ jal func0f152f10 +/* f10f5dc: 0fc54bc4 */ jal optionsSetScreenMode /* f10f5e0: 00002025 */ or $a0,$zero,$zero /* f10f5e4: 2404001f */ addiu $a0,$zero,0x1f .L0f10f5e8: @@ -3114,10 +3114,10 @@ glabel func0f10f698 /* f10f734: 0c003ce3 */ jal func0000f38c /* f10f738: 24040001 */ addiu $a0,$zero,0x1 /* f10f73c: 02202025 */ or $a0,$s1,$zero -/* f10f740: 0fc549cb */ jal func0f15272c +/* f10f740: 0fc549cb */ jal optionsSetControlMode /* f10f744: 00002825 */ or $a1,$zero,$zero /* f10f748: 02002025 */ or $a0,$s0,$zero -/* f10f74c: 0fc549cb */ jal func0f15272c +/* f10f74c: 0fc549cb */ jal optionsSetControlMode /* f10f750: 00002825 */ or $a1,$zero,$zero /* f10f754: 8fb00028 */ lw $s0,0x28($sp) /* f10f758: 26100014 */ addiu $s0,$s0,0x14 @@ -3468,13 +3468,13 @@ glabel func0f10fac8 /* f10fc78: 0fc354fe */ jal func0f0d53f8 /* f10fc7c: 24050003 */ addiu $a1,$zero,0x3 /* f10fc80: 02202025 */ or $a0,$s1,$zero -/* f10fc84: 0fc549cb */ jal func0f15272c +/* f10fc84: 0fc549cb */ jal optionsSetControlMode /* f10fc88: 00402825 */ or $a1,$v0,$zero /* f10fc8c: 02802025 */ or $a0,$s4,$zero /* f10fc90: 0fc354fe */ jal func0f0d53f8 /* f10fc94: 24050003 */ addiu $a1,$zero,0x3 /* f10fc98: 02402025 */ or $a0,$s2,$zero -/* f10fc9c: 0fc549cb */ jal func0f15272c +/* f10fc9c: 0fc549cb */ jal optionsSetControlMode /* f10fca0: 00402825 */ or $a1,$v0,$zero /* f10fca4: 3c10800a */ lui $s0,0x800a /* f10fca8: 3c11800a */ lui $s1,0x800a @@ -3805,26 +3805,26 @@ glabel func0f10feac /* f110164: 02002825 */ or $a1,$s0,$zero /* f110168: 0fc4794c */ jal func0f11e530 /* f11016c: 00403025 */ or $a2,$v0,$zero -/* f110170: 0fc54bcd */ jal func0f152f34 +/* f110170: 0fc54bcd */ jal optionsGetScreenSplit /* f110174: 00000000 */ sll $zero,$zero,0x0 /* f110178: 24040019 */ addiu $a0,$zero,0x19 /* f11017c: 02002825 */ or $a1,$s0,$zero /* f110180: 0fc4794c */ jal func0f11e530 /* f110184: 00403025 */ or $a2,$v0,$zero -/* f110188: 0fc54bc7 */ jal func0f152f1c +/* f110188: 0fc54bc7 */ jal optionsGetScreenRatio /* f11018c: 00000000 */ sll $zero,$zero,0x0 /* f110190: 24040007 */ addiu $a0,$zero,0x7 /* f110194: 02002825 */ or $a1,$s0,$zero /* f110198: 0fc4794c */ jal func0f11e530 /* f11019c: 00403025 */ or $a2,$v0,$zero -/* f1101a0: 0fc54bc1 */ jal func0f152f04 +/* f1101a0: 0fc54bc1 */ jal optionsGetScreenMode /* f1101a4: 00000000 */ sll $zero,$zero,0x0 /* f1101a8: 00523026 */ xor $a2,$v0,$s2 /* f1101ac: 2cc60001 */ sltiu $a2,$a2,0x1 /* f1101b0: 24040006 */ addiu $a0,$zero,0x6 /* f1101b4: 0fc4794c */ jal func0f11e530 /* f1101b8: 02002825 */ or $a1,$s0,$zero -/* f1101bc: 0fc54bc1 */ jal func0f152f04 +/* f1101bc: 0fc54bc1 */ jal optionsGetScreenMode /* f1101c0: 00000000 */ sll $zero,$zero,0x0 /* f1101c4: 24150002 */ addiu $s5,$zero,0x2 /* f1101c8: 00553026 */ xor $a2,$v0,$s5 @@ -3839,13 +3839,13 @@ glabel func0f10feac /* f1101ec: 02583026 */ xor $a2,$s2,$t8 /* f1101f0: 0fc4794c */ jal func0f11e530 /* f1101f4: 2cc60001 */ sltiu $a2,$a2,0x1 -/* f1101f8: 0fc54a43 */ jal func0f15290c +/* f1101f8: 0fc54a43 */ jal optionsGetInGameSubtitles /* f1101fc: 00000000 */ sll $zero,$zero,0x0 /* f110200: 2404000b */ addiu $a0,$zero,0xb /* f110204: 02002825 */ or $a1,$s0,$zero /* f110208: 0fc4794c */ jal func0f11e530 /* f11020c: 00403025 */ or $a2,$v0,$zero -/* f110210: 0fc54a46 */ jal func0f152918 +/* f110210: 0fc54a46 */ jal optionsGetCutsceneSubtitles /* f110214: 00000000 */ sll $zero,$zero,0x0 /* f110218: 24040014 */ addiu $a0,$zero,0x14 /* f11021c: 02002825 */ or $a1,$s0,$zero @@ -3873,7 +3873,7 @@ glabel func0f10feac /* f110274: 02002825 */ or $a1,$s0,$zero /* f110278: 0fc4794c */ jal func0f11e530 /* f11027c: 00403025 */ or $a2,$v0,$zero -/* f110280: 0fc54bc1 */ jal func0f152f04 +/* f110280: 0fc54bc1 */ jal optionsGetScreenMode /* f110284: 00000000 */ sll $zero,$zero,0x0 /* f110288: 50400002 */ beqzl $v0,.L0f110294 /* f11028c: 8e990450 */ lw $t9,0x450($s4) @@ -3962,13 +3962,13 @@ glabel func0f10feac /* f1103d0: 02802025 */ or $a0,$s4,$zero /* f1103d4: 0fc354be */ jal func0f0d52f8 /* f1103d8: 24060002 */ addiu $a2,$zero,0x2 -/* f1103dc: 0fc549c4 */ jal func0f152710 +/* f1103dc: 0fc549c4 */ jal optionsGetControlMode /* f1103e0: 02602025 */ or $a0,$s3,$zero /* f1103e4: 02802025 */ or $a0,$s4,$zero /* f1103e8: 00402825 */ or $a1,$v0,$zero /* f1103ec: 0fc354be */ jal func0f0d52f8 /* f1103f0: 24060003 */ addiu $a2,$zero,0x3 -/* f1103f4: 0fc549c4 */ jal func0f152710 +/* f1103f4: 0fc549c4 */ jal optionsGetControlMode /* f1103f8: 02202025 */ or $a0,$s1,$zero /* f1103fc: 02802025 */ or $a0,$s4,$zero /* f110400: 00402825 */ or $a1,$v0,$zero diff --git a/src/game/game_129900.c b/src/game/game_129900.c index 461ab6774..32603a1f1 100644 --- a/src/game/game_129900.c +++ b/src/game/game_129900.c @@ -29663,7 +29663,7 @@ glabel func0f143888 /* f143934: 10000e65 */ beqz $zero,.L0f1472cc /* f143938: 02a01025 */ or $v0,$s5,$zero .L0f14393c: -/* f14393c: 0fc54bcd */ jal func0f152f34 +/* f14393c: 0fc54bcd */ jal optionsGetScreenSplit /* f143940: e7ac02bc */ swc1 $f12,0x2bc($sp) /* f143944: 44800000 */ mtc1 $zero,$f0 /* f143948: 24010001 */ addiu $at,$zero,0x1 @@ -34392,7 +34392,7 @@ glabel func0f147e24 /* f147f48: 240f0002 */ addiu $t7,$zero,0x2 /* f147f4c: afaf00ac */ sw $t7,0xac($sp) .L0f147f50: -/* f147f50: 0fc54bcd */ jal func0f152f34 +/* f147f50: 0fc54bcd */ jal optionsGetScreenSplit /* f147f54: 00000000 */ sll $zero,$zero,0x0 /* f147f58: 24060001 */ addiu $a2,$zero,0x1 /* f147f5c: 54c20020 */ bnel $a2,$v0,.L0f147fe0 diff --git a/src/game/game_152710.c b/src/game/game_152710.c index b7c18d429..9130d1814 100644 --- a/src/game/game_152710.c +++ b/src/game/game_152710.c @@ -8,7 +8,7 @@ #include "game/game_16cfa0.h" GLOBAL_ASM( -glabel func0f152710 +glabel optionsGetControlMode /* f152710: 00047080 */ sll $t6,$a0,0x2 /* f152714: 01c47021 */ addu $t6,$t6,$a0 /* f152718: 000e7140 */ sll $t6,$t6,0x5 @@ -19,7 +19,7 @@ glabel func0f152710 ); GLOBAL_ASM( -glabel func0f15272c +glabel optionsSetControlMode /* f15272c: 00047080 */ sll $t6,$a0,0x2 /* f152730: 01c47021 */ addu $t6,$t6,$a0 /* f152734: 000e7140 */ sll $t6,$t6,0x5 @@ -107,14 +107,14 @@ s32 optionsGetShowMissionTime(s32 optionsindex) } GLOBAL_ASM( -glabel func0f15290c +glabel optionsGetInGameSubtitles /* f15290c: 3c028008 */ lui $v0,0x8008 /* f152910: 03e00008 */ jr $ra /* f152914: 9042fa90 */ lbu $v0,-0x570($v0) ); GLOBAL_ASM( -glabel func0f152918 +glabel optionsGetCutsceneSubtitles /* f152918: 3c028008 */ lui $v0,0x8008 /* f15291c: 03e00008 */ jr $ra /* f152920: 9042fa94 */ lbu $v0,-0x56c($v0) @@ -225,14 +225,14 @@ void optionsSetShowMissionTime(s32 optionsindex, bool enable) } GLOBAL_ASM( -glabel func0f152d10 +glabel optionsSetInGameSubtitles /* f152d10: 3c018008 */ lui $at,0x8008 /* f152d14: 03e00008 */ jr $ra /* f152d18: a024fa90 */ sb $a0,-0x570($at) ); GLOBAL_ASM( -glabel func0f152d1c +glabel optionsSetCutsceneSubtitles /* f152d1c: 3c018008 */ lui $at,0x8008 /* f152d20: 03e00008 */ jr $ra /* f152d24: a024fa94 */ sb $a0,-0x56c($at) @@ -359,42 +359,42 @@ glabel func0f152d80 ); GLOBAL_ASM( -glabel func0f152f04 +glabel optionsGetScreenMode /* f152f04: 3c028008 */ lui $v0,0x8008 /* f152f08: 03e00008 */ jr $ra /* f152f0c: 8c42fab0 */ lw $v0,-0x550($v0) ); GLOBAL_ASM( -glabel func0f152f10 +glabel optionsSetScreenMode /* f152f10: 3c018008 */ lui $at,0x8008 /* f152f14: 03e00008 */ jr $ra /* f152f18: ac24fab0 */ sw $a0,-0x550($at) ); GLOBAL_ASM( -glabel func0f152f1c +glabel optionsGetScreenRatio /* f152f1c: 3c028008 */ lui $v0,0x8008 /* f152f20: 03e00008 */ jr $ra /* f152f24: 8c42fab4 */ lw $v0,-0x54c($v0) ); GLOBAL_ASM( -glabel func0f152f28 +glabel optionsSetScreenRatio /* f152f28: 3c018008 */ lui $at,0x8008 /* f152f2c: 03e00008 */ jr $ra /* f152f30: ac24fab4 */ sw $a0,-0x54c($at) ); GLOBAL_ASM( -glabel func0f152f34 +glabel optionsGetScreenSplit /* f152f34: 3c028008 */ lui $v0,0x8008 /* f152f38: 03e00008 */ jr $ra /* f152f3c: 9042fab8 */ lbu $v0,-0x548($v0) ); GLOBAL_ASM( -glabel func0f152f40 +glabel optionsSetScreenSplit /* f152f40: 3c018008 */ lui $at,0x8008 /* f152f44: afa40000 */ sw $a0,0x0($sp) /* f152f48: 03e00008 */ jr $ra diff --git a/src/game/game_176080.c b/src/game/game_176080.c index 4ce35dbe4..cdff04868 100644 --- a/src/game/game_176080.c +++ b/src/game/game_176080.c @@ -241,7 +241,7 @@ glabel func0f1762ac /* f176380: 11a10008 */ beq $t5,$at,.L0f1763a4 /* f176384: 00000000 */ sll $zero,$zero,0x0 /* f176388: afa6003c */ sw $a2,0x3c($sp) -/* f17638c: 0fc54bcd */ jal func0f152f34 +/* f17638c: 0fc54bcd */ jal optionsGetScreenSplit /* f176390: afa70040 */ sw $a3,0x40($sp) /* f176394: 24010001 */ addiu $at,$zero,0x1 /* f176398: 8fa6003c */ lw $a2,0x3c($sp) diff --git a/src/game/game_176d70.c b/src/game/game_176d70.c index 2259bffc0..5d1b10d9e 100644 --- a/src/game/game_176d70.c +++ b/src/game/game_176d70.c @@ -2879,7 +2879,7 @@ glabel func0f178dbc /* f178e8c: 10000012 */ beqz $zero,.L0f178ed8 /* f178e90: 24c61448 */ addiu $a2,$a2,%lo(g_MenuStackDepth) .L0f178e94: -/* f178e94: 0fc54bcd */ jal func0f152f34 +/* f178e94: 0fc54bcd */ jal optionsGetScreenSplit /* f178e98: 00000000 */ sll $zero,$zero,0x0 /* f178e9c: 24010001 */ addiu $at,$zero,0x1 /* f178ea0: 14410008 */ bne $v0,$at,.L0f178ec4 @@ -3380,14 +3380,14 @@ glabel menuhandlerMpControlStyle .L0f179530: /* f179530: 3c048007 */ lui $a0,0x8007 /* f179534: 8c841448 */ lw $a0,0x1448($a0) -/* f179538: 0fc549cb */ jal func0f15272c +/* f179538: 0fc549cb */ jal optionsSetControlMode /* f17953c: 8cc50000 */ lw $a1,0x0($a2) /* f179540: 10000008 */ beqz $zero,.L0f179564 /* f179544: 00001025 */ or $v0,$zero,$zero .L0f179548: /* f179548: 3c048007 */ lui $a0,0x8007 /* f17954c: 8c841448 */ lw $a0,0x1448($a0) -/* f179550: 0fc549c4 */ jal func0f152710 +/* f179550: 0fc549c4 */ jal optionsGetControlMode /* f179554: afa60030 */ sw $a2,0x30($sp) /* f179558: 8fa60030 */ lw $a2,0x30($sp) /* f17955c: acc20000 */ sw $v0,0x0($a2) diff --git a/src/game/game_187770.c b/src/game/game_187770.c index b1984d03b..0e0a58c1c 100644 --- a/src/game/game_187770.c +++ b/src/game/game_187770.c @@ -9758,7 +9758,7 @@ glabel func0f18f874 /* f18fa7c: 24010001 */ addiu $at,$zero,0x1 /* f18fa80: 50410008 */ beql $v0,$at,.L0f18faa4 /* f18fa84: 8fb90078 */ lw $t9,0x78($sp) -/* f18fa88: 0fc54bcd */ jal func0f152f34 +/* f18fa88: 0fc54bcd */ jal optionsGetScreenSplit /* f18fa8c: 00000000 */ sll $zero,$zero,0x0 /* f18fa90: 24010001 */ addiu $at,$zero,0x1 /* f18fa94: 1441000f */ bne $v0,$at,.L0f18fad4 @@ -9819,7 +9819,7 @@ glabel func0f18f874 /* f18fb58: 10000023 */ beqz $zero,.L0f18fbe8 /* f18fb5c: ae0b0000 */ sw $t3,0x0($s0) .L0f18fb60: -/* f18fb60: 0fc54bcd */ jal func0f152f34 +/* f18fb60: 0fc54bcd */ jal optionsGetScreenSplit /* f18fb64: 00000000 */ sll $zero,$zero,0x0 /* f18fb68: 24010001 */ addiu $at,$zero,0x1 /* f18fb6c: 1041001e */ beq $v0,$at,.L0f18fbe8 diff --git a/src/game/game_1a3340.c b/src/game/game_1a3340.c index 3f190ef44..fb4ca7758 100644 --- a/src/game/game_1a3340.c +++ b/src/game/game_1a3340.c @@ -3240,7 +3240,7 @@ glabel menudialog001a5f48 /* f1a6050: ac600dc0 */ sw $zero,0xdc0($v1) /* f1a6054: afa50044 */ sw $a1,0x44($sp) /* f1a6058: e7ac0030 */ swc1 $f12,0x30($sp) -/* f1a605c: 0fc54bc7 */ jal func0f152f1c +/* f1a605c: 0fc54bc7 */ jal optionsGetScreenRatio /* f1a6060: e7ae0038 */ swc1 $f14,0x38($sp) /* f1a6064: 24010001 */ addiu $at,$zero,0x1 /* f1a6068: 8fa50044 */ lw $a1,0x44($sp) @@ -3649,7 +3649,7 @@ glabel menudialog001a6548 /* f1a65e4: 00290821 */ addu $at,$at,$t1 /* f1a65e8: 0fc41652 */ jal func0f105948 /* f1a65ec: ac24ee28 */ sw $a0,-0x11d8($at) -/* f1a65f0: 0fc54bc7 */ jal func0f152f1c +/* f1a65f0: 0fc54bc7 */ jal optionsGetScreenRatio /* f1a65f4: 00000000 */ sll $zero,$zero,0x0 /* f1a65f8: 24010001 */ addiu $at,$zero,0x1 /* f1a65fc: 14410012 */ bne $v0,$at,.L0f1a6648 diff --git a/src/include/game/game_152710.h b/src/include/game/game_152710.h index e3c1da756..510f53ef3 100644 --- a/src/include/game/game_152710.h +++ b/src/include/game/game_152710.h @@ -3,8 +3,8 @@ #include #include "types.h" -u32 func0f152710(void); -u32 func0f15272c(void); +u32 optionsGetControlMode(void); +u32 optionsSetControlMode(void); u32 func0f152748(void); u32 func0f152764(void); s32 optionsGetForwardPitch(s32 optionsindex); @@ -18,8 +18,8 @@ s32 optionsGetAlwaysShowTarget(s32 optionsindex); s32 optionsGetShowZoomRange(s32 optionsindex); s32 optionsGetPaintball(s32 optionsindex); s32 optionsGetShowMissionTime(s32 optionsindex); -u32 func0f15290c(void); -u32 func0f152918(void); +u32 optionsGetInGameSubtitles(void); +u32 optionsGetCutsceneSubtitles(void); s32 optionsGetHeadRoll(s32 optionsindex); void optionsSetForwardPitch(s32 optionsindex, bool enable); @@ -33,16 +33,16 @@ void optionsSetAlwaysShowTarget(s32 optionsindex, bool enable); void optionsSetShowZoomRange(s32 optionsindex, bool enable); void optionsSetPaintball(s32 optionsindex, bool enable); void optionsSetShowMissionTime(s32 optionsindex, bool enable); -u32 func0f152d10(void); -u32 func0f152d1c(void); +u32 optionsSetInGameSubtitles(void); +u32 optionsSetCutsceneSubtitles(void); void optionsSetHeadRoll(s32 optionsindex, bool enable); u32 func0f152d80(void); -u32 func0f152f04(void); -u32 func0f152f10(void); -u32 func0f152f1c(void); -u32 func0f152f28(void); -u32 func0f152f34(void); -u32 func0f152f40(void); +u32 optionsGetScreenMode(void); +u32 optionsSetScreenMode(void); +u32 optionsGetScreenRatio(void); +u32 optionsSetScreenRatio(void); +u32 optionsGetScreenSplit(void); +u32 optionsSetScreenSplit(void); u32 func0f152f50(void); void func0f152f70(u32 arg0); diff --git a/src/library/library_09660.c b/src/library/library_09660.c index c33c83b7e..29ee57e3e 100644 --- a/src/library/library_09660.c +++ b/src/library/library_09660.c @@ -2529,7 +2529,7 @@ glabel func0000b330 /* b954: 5721004e */ bnel $t9,$at,.L0000ba90 /* b958: 8d6f006c */ lw $t7,0x6c($t3) /* b95c: afa600a8 */ sw $a2,0xa8($sp) -/* b960: 0fc54bcd */ jal func0f152f34 +/* b960: 0fc54bcd */ jal optionsGetScreenSplit /* b964: afac001c */ sw $t4,0x1c($sp) /* b968: 3c0b800a */ lui $t3,%hi(g_Vars) /* b96c: 24010001 */ addiu $at,$zero,0x1