diff --git a/src/game/bondmove.c b/src/game/bondmove.c index 32c9dd8a6..8c5d36dae 100644 --- a/src/game/bondmove.c +++ b/src/game/bondmove.c @@ -3108,7 +3108,7 @@ glabel var7f1ad8e4 /* f0cab54: 8de7171c */ lw $a3,0x171c($t7) /* f0cab58: 0fc2d5fe */ jal func0f0b57f8 /* f0cab5c: 00000000 */ sll $zero,$zero,0x0 -/* f0cab60: 0fc2d5f6 */ jal func0f0b57d8 +/* f0cab60: 0fc2d5f6 */ jal currentPlayerGetScreenWidth /* f0cab64: e7a00054 */ swc1 $f0,0x54($sp) /* f0cab68: 3c013f00 */ lui $at,0x3f00 /* f0cab6c: 44818000 */ mtc1 $at,$f16 @@ -3130,7 +3130,7 @@ glabel var7f1ad8e4 .L0f0cabac: /* f0cabac: 0fc2d5fe */ jal func0f0b57f8 /* f0cabb0: 00000000 */ sll $zero,$zero,0x0 -/* f0cabb4: 0fc2d5f6 */ jal func0f0b57d8 +/* f0cabb4: 0fc2d5f6 */ jal currentPlayerGetScreenWidth /* f0cabb8: e7a00054 */ swc1 $f0,0x54($sp) /* f0cabbc: 3c013f00 */ lui $at,0x3f00 /* f0cabc0: 44819000 */ mtc1 $at,$f18 diff --git a/src/game/game_0601b0.c b/src/game/game_0601b0.c index 2e8965723..02c6f627b 100644 --- a/src/game/game_0601b0.c +++ b/src/game/game_0601b0.c @@ -2502,7 +2502,7 @@ glabel var7f1a9ec4 /* f0623f0: 27a50104 */ addiu $a1,$sp,0x104 /* f0623f4: 0fc2d5fe */ jal func0f0b57f8 /* f0623f8: 00000000 */ sll $zero,$zero,0x0 -/* f0623fc: 0fc2d5f6 */ jal func0f0b57d8 +/* f0623fc: 0fc2d5f6 */ jal currentPlayerGetScreenWidth /* f062400: 46000506 */ mov.s $f20,$f0 /* f062404: 46180402 */ mul.s $f16,$f0,$f24 /* f062408: c7a80108 */ lwc1 $f8,0x108($sp) @@ -4838,7 +4838,7 @@ glabel var7f1a9f54 /* f064400: e7a80064 */ swc1 $f8,0x64($sp) /* f064404: 0fc2d5fe */ jal func0f0b57f8 /* f064408: e7a00060 */ swc1 $f0,0x60($sp) -/* f06440c: 0fc2d5f6 */ jal func0f0b57d8 +/* f06440c: 0fc2d5f6 */ jal currentPlayerGetScreenWidth /* f064410: e7a00034 */ swc1 $f0,0x34($sp) /* f064414: c7aa0034 */ lwc1 $f10,0x34($sp) /* f064418: 460a0400 */ add.s $f16,$f0,$f10 @@ -4865,7 +4865,7 @@ glabel var7f1a9f54 /* f064468: 46128100 */ add.s $f4,$f16,$f18 /* f06446c: 0fc2d5fe */ jal func0f0b57f8 /* f064470: e7a40064 */ swc1 $f4,0x64($sp) -/* f064474: 0fc2d5f6 */ jal func0f0b57d8 +/* f064474: 0fc2d5f6 */ jal currentPlayerGetScreenWidth /* f064478: e7a00034 */ swc1 $f0,0x34($sp) /* f06447c: 3c013e80 */ lui $at,0x3e80 /* f064480: 44813000 */ mtc1 $at,$f6 @@ -4874,7 +4874,7 @@ glabel var7f1a9f54 /* f06448c: 460a4400 */ add.s $f16,$f8,$f10 /* f064490: 0fc2d5fe */ jal func0f0b57f8 /* f064494: e7b00060 */ swc1 $f16,0x60($sp) -/* f064498: 0fc2d5f6 */ jal func0f0b57d8 +/* f064498: 0fc2d5f6 */ jal currentPlayerGetScreenWidth /* f06449c: e7a00034 */ swc1 $f0,0x34($sp) /* f0644a0: 3c013f40 */ lui $at,0x3f40 /* f0644a4: 44819000 */ mtc1 $at,$f18 @@ -4993,7 +4993,7 @@ glabel var7f1a9f54 /* f06465c: 460a0002 */ mul.s $f0,$f0,$f10 /* f064660: 00000000 */ sll $zero,$zero,0x0 .L0f064664: -/* f064664: 0fc2d5f6 */ jal func0f0b57d8 +/* f064664: 0fc2d5f6 */ jal currentPlayerGetScreenWidth /* f064668: e7a00048 */ swc1 $f0,0x48($sp) /* f06466c: 0fc2d5fe */ jal func0f0b57f8 /* f064670: e7a0002c */ swc1 $f0,0x2c($sp) @@ -5018,7 +5018,7 @@ glabel var7f1a9f54 .L0f0646bc: /* f0646bc: 10400029 */ beqz $v0,.L0f064764 /* f0646c0: 00000000 */ sll $zero,$zero,0x0 -/* f0646c4: 0fc2d5f6 */ jal func0f0b57d8 +/* f0646c4: 0fc2d5f6 */ jal currentPlayerGetScreenWidth /* f0646c8: 00000000 */ sll $zero,$zero,0x0 /* f0646cc: 0fc2d5fe */ jal func0f0b57f8 /* f0646d0: e7a00024 */ swc1 $f0,0x24($sp) @@ -5160,7 +5160,7 @@ glabel var7f1a9f54 .L0f0648bc: /* f0648bc: e5200000 */ swc1 $f0,0x0($t1) .L0f0648c0: -/* f0648c0: 0fc2d5f6 */ jal func0f0b57d8 +/* f0648c0: 0fc2d5f6 */ jal currentPlayerGetScreenWidth /* f0648c4: 00000000 */ sll $zero,$zero,0x0 /* f0648c8: 0fc2d5fe */ jal func0f0b57f8 /* f0648cc: e7a0002c */ swc1 $f0,0x2c($sp) @@ -5174,7 +5174,7 @@ glabel var7f1a9f54 /* f0648ec: 00000000 */ sll $zero,$zero,0x0 /* f0648f0: 45000013 */ bc1f .L0f064940 /* f0648f4: 00000000 */ sll $zero,$zero,0x0 -/* f0648f8: 0fc2d5f6 */ jal func0f0b57d8 +/* f0648f8: 0fc2d5f6 */ jal currentPlayerGetScreenWidth /* f0648fc: 00000000 */ sll $zero,$zero,0x0 /* f064900: 0fc2d5fe */ jal func0f0b57f8 /* f064904: e7a00024 */ swc1 $f0,0x24($sp) @@ -5193,7 +5193,7 @@ glabel var7f1a9f54 /* f064938: 10000032 */ beqz $zero,.L0f064a04 /* f06493c: e7a80058 */ swc1 $f8,0x58($sp) .L0f064940: -/* f064940: 0fc2d5f6 */ jal func0f0b57d8 +/* f064940: 0fc2d5f6 */ jal currentPlayerGetScreenWidth /* f064944: 00000000 */ sll $zero,$zero,0x0 /* f064948: 0fc2d5fe */ jal func0f0b57f8 /* f06494c: e7a0002c */ swc1 $f0,0x2c($sp) @@ -5207,7 +5207,7 @@ glabel var7f1a9f54 /* f06496c: 00000000 */ sll $zero,$zero,0x0 /* f064970: 45000013 */ bc1f .L0f0649c0 /* f064974: 00000000 */ sll $zero,$zero,0x0 -/* f064978: 0fc2d5f6 */ jal func0f0b57d8 +/* f064978: 0fc2d5f6 */ jal currentPlayerGetScreenWidth /* f06497c: 00000000 */ sll $zero,$zero,0x0 /* f064980: 0fc2d5fe */ jal func0f0b57f8 /* f064984: e7a0002c */ swc1 $f0,0x2c($sp) @@ -5228,7 +5228,7 @@ glabel var7f1a9f54 .L0f0649c0: /* f0649c0: 0fc2d5fe */ jal func0f0b57f8 /* f0649c4: 00000000 */ sll $zero,$zero,0x0 -/* f0649c8: 0fc2d5f6 */ jal func0f0b57d8 +/* f0649c8: 0fc2d5f6 */ jal currentPlayerGetScreenWidth /* f0649cc: e7a00034 */ swc1 $f0,0x34($sp) /* f0649d0: 3c013f00 */ lui $at,0x3f00 /* f0649d4: 44813000 */ mtc1 $at,$f6 @@ -5559,7 +5559,7 @@ glabel func0f064ce8 /* f064e80: 46148480 */ add.s $f18,$f16,$f20 /* f064e84: 0fc2d5fe */ jal func0f0b57f8 /* f064e88: e7b200cc */ swc1 $f18,0xcc($sp) -/* f064e8c: 0fc2d5f6 */ jal func0f0b57d8 +/* f064e8c: 0fc2d5f6 */ jal currentPlayerGetScreenWidth /* f064e90: 46000506 */ mov.s $f20,$f0 /* f064e94: 3c013e00 */ lui $at,0x3e00 /* f064e98: 44812000 */ mtc1 $at,$f4 @@ -5568,7 +5568,7 @@ glabel func0f064ce8 /* f064ea4: 46143200 */ add.s $f8,$f6,$f20 /* f064ea8: 0fc2d5fe */ jal func0f0b57f8 /* f064eac: e7a800c8 */ swc1 $f8,0xc8($sp) -/* f064eb0: 0fc2d5f6 */ jal func0f0b57d8 +/* f064eb0: 0fc2d5f6 */ jal currentPlayerGetScreenWidth /* f064eb4: 46000506 */ mov.s $f20,$f0 /* f064eb8: 3c013f60 */ lui $at,0x3f60 /* f064ebc: 44815000 */ mtc1 $at,$f10 @@ -5922,7 +5922,7 @@ glabel func0f064ce8 .L0f0653b4: /* f0653b4: 0fc2d5fe */ jal func0f0b57f8 /* f0653b8: 00000000 */ sll $zero,$zero,0x0 -/* f0653bc: 0fc2d5f6 */ jal func0f0b57d8 +/* f0653bc: 0fc2d5f6 */ jal currentPlayerGetScreenWidth /* f0653c0: 46000506 */ mov.s $f20,$f0 /* f0653c4: 3c013f00 */ lui $at,0x3f00 /* f0653c8: 44813000 */ mtc1 $at,$f6 diff --git a/src/game/game_095320.c b/src/game/game_095320.c index a649540b8..9db87c91f 100644 --- a/src/game/game_095320.c +++ b/src/game/game_095320.c @@ -1065,7 +1065,7 @@ glabel objectiveCheckHolograph /* f0961fc: 8e31000c */ lw $s1,0xc($s1) /* f096200: 0fc2d5fe */ jal func0f0b57f8 /* f096204: 00000000 */ sll $zero,$zero,0x0 -/* f096208: 0fc2d5f6 */ jal func0f0b57d8 +/* f096208: 0fc2d5f6 */ jal currentPlayerGetScreenWidth /* f09620c: 46000506 */ mov.s $f20,$f0 /* f096210: 46140480 */ add.s $f18,$f0,$f20 /* f096214: c7b00078 */ lwc1 $f16,0x78($sp) @@ -1082,7 +1082,7 @@ glabel objectiveCheckHolograph /* f096240: 8e31000c */ lw $s1,0xc($s1) /* f096244: 0fc2d5fe */ jal func0f0b57f8 /* f096248: 00000000 */ sll $zero,$zero,0x0 -/* f09624c: 0fc2d5f6 */ jal func0f0b57d8 +/* f09624c: 0fc2d5f6 */ jal currentPlayerGetScreenWidth /* f096250: 46000506 */ mov.s $f20,$f0 /* f096254: 46140200 */ add.s $f8,$f0,$f20 /* f096258: c7a60070 */ lwc1 $f6,0x70($sp) diff --git a/src/game/game_096360.c b/src/game/game_096360.c index e6209a242..b4f55b63c 100644 --- a/src/game/game_096360.c +++ b/src/game/game_096360.c @@ -61,8 +61,8 @@ const u32 var7f1ab82c[] = {0x3e8e38e4}; // if (pass && func0f0899dc(obj->prop, a, b, c)) { // func0f06803c(a, b, c, &fStack56); // -// if (func0f0b57f8() < fStack56 && fStack56 < func0f0b57d8() + func0f0b57f8() && -// func0f0b57f8() < fStack64 && fStack64 < func0f0b57d8() + func0f0b57f8() && +// if (func0f0b57f8() < fStack56 && fStack56 < currentPlayerGetScreenWidth() + func0f0b57f8() && +// func0f0b57f8() < fStack64 && fStack64 < currentPlayerGetScreenWidth() + func0f0b57f8() && // func0f0b5808() < fStack52 && fStack52 < func0f0b57e8() + func0f0b5808() && // func0f0b5808() < fStack60 && fStack60 < func0f0b57e8() + func0f0b5808()) { // criteria->status = OBJECTIVE_COMPLETE; diff --git a/src/game/game_097ba0.c b/src/game/game_097ba0.c index e00a6db95..db609b1b4 100644 --- a/src/game/game_097ba0.c +++ b/src/game/game_097ba0.c @@ -10594,7 +10594,7 @@ glabel var7f1ac764 /* f0a03d4: f7b40010 */ sdc1 $f20,0x10($sp) /* f0a03d8: e7ac00e0 */ swc1 $f12,0xe0($sp) /* f0a03dc: e7ae00e4 */ swc1 $f14,0xe4($sp) -/* f0a03e0: 0fc2d5f6 */ jal func0f0b57d8 +/* f0a03e0: 0fc2d5f6 */ jal currentPlayerGetScreenWidth /* f0a03e4: afa700ec */ sw $a3,0xec($sp) /* f0a03e8: 0fc2d5fa */ jal func0f0b57e8 /* f0a03ec: 46000706 */ mov.s $f28,$f0 @@ -11329,7 +11329,7 @@ glabel func0f0a0cb0 /* f0a0e58: 44801000 */ mtc1 $zero,$f2 /* f0a0e5c: 00000000 */ sll $zero,$zero,0x0 .L0f0a0e60: -/* f0a0e60: 0fc2d5f6 */ jal func0f0b57d8 +/* f0a0e60: 0fc2d5f6 */ jal currentPlayerGetScreenWidth /* f0a0e64: e7a20034 */ swc1 $f2,0x34($sp) /* f0a0e68: 0c002f06 */ jal func0000bc18 /* f0a0e6c: e7a0001c */ swc1 $f0,0x1c($sp) @@ -17096,11 +17096,11 @@ glabel var7f1aca70 /* f0a5a7c: 46068480 */ add.s $f18,$f16,$f6 /* f0a5a80: e7b2027c */ swc1 $f18,0x27c($sp) .L0f0a5a84: -/* f0a5a84: 0fc2d5f6 */ jal func0f0b57d8 +/* f0a5a84: 0fc2d5f6 */ jal currentPlayerGetScreenWidth /* f0a5a88: 00000000 */ sll $zero,$zero,0x0 /* f0a5a8c: 0fc2d5fe */ jal func0f0b57f8 /* f0a5a90: e7a00060 */ swc1 $f0,0x60($sp) -/* f0a5a94: 0fc2d5f6 */ jal func0f0b57d8 +/* f0a5a94: 0fc2d5f6 */ jal currentPlayerGetScreenWidth /* f0a5a98: e7a00064 */ swc1 $f0,0x64($sp) /* f0a5a9c: 3c013f00 */ lui $at,0x3f00 /* f0a5aa0: 44811000 */ mtc1 $at,$f2 diff --git a/src/game/game_0b3350.c b/src/game/game_0b3350.c index c01d964ec..4086724e9 100644 --- a/src/game/game_0b3350.c +++ b/src/game/game_0b3350.c @@ -2446,13 +2446,10 @@ u32 currentPlayerGetLodScaleZU32(void) return g_Vars.currentplayer->c_lodscalezu32; } -GLOBAL_ASM( -glabel func0f0b57d8 -/* f0b57d8: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) -/* f0b57dc: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) -/* f0b57e0: 03e00008 */ jr $ra -/* f0b57e4: c5c01704 */ lwc1 $f0,0x1704($t6) -); +f32 currentPlayerGetScreenWidth(void) +{ + return g_Vars.currentplayer->c_screenwidth; +} GLOBAL_ASM( glabel func0f0b57e8 diff --git a/src/game/game_0b63b0.c b/src/game/game_0b63b0.c index babd03fdd..4d44be7d9 100644 --- a/src/game/game_0b63b0.c +++ b/src/game/game_0b63b0.c @@ -11085,7 +11085,7 @@ glabel var7f1ad6ec /* f0c02a0: 46083502 */ mul.s $f20,$f6,$f8 /* f0c02a4: 0fc2d5fe */ jal func0f0b57f8 /* f0c02a8: 00000000 */ sll $zero,$zero,0x0 -/* f0c02ac: 0fc2d5f6 */ jal func0f0b57d8 +/* f0c02ac: 0fc2d5f6 */ jal currentPlayerGetScreenWidth /* f0c02b0: e7a00050 */ swc1 $f0,0x50($sp) /* f0c02b4: 46140402 */ mul.s $f16,$f0,$f20 /* f0c02b8: c7a40050 */ lwc1 $f4,0x50($sp) @@ -11110,7 +11110,7 @@ glabel var7f1ad6ec /* f0c0304: 46140482 */ mul.s $f18,$f0,$f20 /* f0c0308: c7aa0050 */ lwc1 $f10,0x50($sp) /* f0c030c: 460a9180 */ add.s $f6,$f18,$f10 -/* f0c0310: 0fc2d5f6 */ jal func0f0b57d8 +/* f0c0310: 0fc2d5f6 */ jal currentPlayerGetScreenWidth /* f0c0314: e7a60094 */ swc1 $f6,0x94($sp) /* f0c0318: 8e030284 */ lw $v1,0x284($s0) /* f0c031c: 24040064 */ addiu $a0,$zero,0x64 diff --git a/src/game/game_11f000.c b/src/game/game_11f000.c index 791e04af8..132f811ab 100644 --- a/src/game/game_11f000.c +++ b/src/game/game_11f000.c @@ -1045,7 +1045,7 @@ glabel var7f1b50c8 /* f11fcb4: 02203025 */ or $a2,$s1,$zero /* f11fcb8: 0fc47c00 */ jal func0f11f000 /* f11fcbc: 46006386 */ mov.s $f14,$f12 -/* f11fcc0: 0fc2d5f6 */ jal func0f0b57d8 +/* f11fcc0: 0fc2d5f6 */ jal currentPlayerGetScreenWidth /* f11fcc4: 00000000 */ sll $zero,$zero,0x0 /* f11fcc8: 3c017f1b */ lui $at,%hi(var7f1b5000) /* f11fccc: c43c5000 */ lwc1 $f28,%lo(var7f1b5000)($at) @@ -1059,7 +1059,7 @@ glabel var7f1b50c8 /* f11fcec: 461c0381 */ sub.s $f14,$f0,$f28 /* f11fcf0: 0fc47c00 */ jal func0f11f000 /* f11fcf4: 27a6068c */ addiu $a2,$sp,0x68c -/* f11fcf8: 0fc2d5f6 */ jal func0f0b57d8 +/* f11fcf8: 0fc2d5f6 */ jal currentPlayerGetScreenWidth /* f11fcfc: 00000000 */ sll $zero,$zero,0x0 /* f11fd00: 0fc2d5fa */ jal func0f0b57e8 /* f11fd04: 46000586 */ mov.s $f22,$f0 @@ -1155,7 +1155,7 @@ glabel var7f1b50c8 /* f11fe64: 46068203 */ div.s $f8,$f16,$f6 /* f11fe68: 46004282 */ mul.s $f10,$f8,$f0 /* f11fe6c: 46165100 */ add.s $f4,$f10,$f22 -/* f11fe70: 0fc2d5f6 */ jal func0f0b57d8 +/* f11fe70: 0fc2d5f6 */ jal currentPlayerGetScreenWidth /* f11fe74: e7a40548 */ swc1 $f4,0x548($sp) /* f11fe78: 27b00650 */ addiu $s0,$sp,0x650 /* f11fe7c: 02003025 */ or $a2,$s0,$zero @@ -1187,7 +1187,7 @@ glabel var7f1b50c8 /* f11fedc: 8faf0530 */ lw $t7,0x530($sp) /* f11fee0: 0fc2d5fe */ jal func0f0b57f8 /* f11fee4: 00000000 */ sll $zero,$zero,0x0 -/* f11fee8: 0fc2d5f6 */ jal func0f0b57d8 +/* f11fee8: 0fc2d5f6 */ jal currentPlayerGetScreenWidth /* f11feec: 46000586 */ mov.s $f22,$f0 /* f11fef0: c7a206a8 */ lwc1 $f2,0x6a8($sp) /* f11fef4: c7b0069c */ lwc1 $f16,0x69c($sp) @@ -1218,7 +1218,7 @@ glabel var7f1b50c8 /* f11ff54: 8fb90538 */ lw $t9,0x538($sp) /* f11ff58: 0fc2d5fe */ jal func0f0b57f8 /* f11ff5c: 00000000 */ sll $zero,$zero,0x0 -/* f11ff60: 0fc2d5f6 */ jal func0f0b57d8 +/* f11ff60: 0fc2d5f6 */ jal currentPlayerGetScreenWidth /* f11ff64: 46000586 */ mov.s $f22,$f0 /* f11ff68: c7b00690 */ lwc1 $f16,0x690($sp) /* f11ff6c: c7a60684 */ lwc1 $f6,0x684($sp) @@ -2199,7 +2199,7 @@ glabel var7f1b50c8 /* f120e98: 00000000 */ sll $zero,$zero,0x0 /* f120e9c: 0fc2d5fe */ jal func0f0b57f8 /* f120ea0: 46000506 */ mov.s $f20,$f0 -/* f120ea4: 0fc2d5f6 */ jal func0f0b57d8 +/* f120ea4: 0fc2d5f6 */ jal currentPlayerGetScreenWidth /* f120ea8: 46000586 */ mov.s $f22,$f0 /* f120eac: 46160200 */ add.s $f8,$f0,$f22 /* f120eb0: 461aa382 */ mul.s $f14,$f20,$f26 @@ -3637,7 +3637,7 @@ glabel var7f1b50c8 /* f1224cc: 00000000 */ sll $zero,$zero,0x0 /* f1224d0: 0fc2d5fe */ jal func0f0b57f8 /* f1224d4: 46000506 */ mov.s $f20,$f0 -/* f1224d8: 0fc2d5f6 */ jal func0f0b57d8 +/* f1224d8: 0fc2d5f6 */ jal currentPlayerGetScreenWidth /* f1224dc: 46000586 */ mov.s $f22,$f0 /* f1224e0: 46160200 */ add.s $f8,$f0,$f22 /* f1224e4: 461aa382 */ mul.s $f14,$f20,$f26 @@ -3706,7 +3706,7 @@ glabel var7f1b50c8 /* f1225dc: 461a0182 */ mul.s $f6,$f0,$f26 /* f1225e0: 0fc2d5fe */ jal func0f0b57f8 /* f1225e4: e7a600c0 */ swc1 $f6,0xc0($sp) -/* f1225e8: 0fc2d5f6 */ jal func0f0b57d8 +/* f1225e8: 0fc2d5f6 */ jal currentPlayerGetScreenWidth /* f1225ec: 46000506 */ mov.s $f20,$f0 /* f1225f0: 46140280 */ add.s $f10,$f0,$f20 /* f1225f4: 3c013f80 */ lui $at,0x3f80 @@ -3721,7 +3721,7 @@ glabel var7f1b50c8 /* f122618: 461a0202 */ mul.s $f8,$f0,$f26 /* f12261c: 0fc2d5fe */ jal func0f0b57f8 /* f122620: e7a8012c */ swc1 $f8,0x12c($sp) -/* f122624: 0fc2d5f6 */ jal func0f0b57d8 +/* f122624: 0fc2d5f6 */ jal currentPlayerGetScreenWidth /* f122628: 46000506 */ mov.s $f20,$f0 /* f12262c: 46140100 */ add.s $f4,$f0,$f20 /* f122630: 3c013f80 */ lui $at,0x3f80 @@ -3767,7 +3767,7 @@ glabel var7f1b50c8 /* f1226c8: 461a0202 */ mul.s $f8,$f0,$f26 /* f1226cc: 0fc2d5fe */ jal func0f0b57f8 /* f1226d0: e7a800c0 */ swc1 $f8,0xc0($sp) -/* f1226d4: 0fc2d5f6 */ jal func0f0b57d8 +/* f1226d4: 0fc2d5f6 */ jal currentPlayerGetScreenWidth /* f1226d8: 46000506 */ mov.s $f20,$f0 /* f1226dc: 46140280 */ add.s $f10,$f0,$f20 /* f1226e0: 3c013f80 */ lui $at,0x3f80 @@ -3782,7 +3782,7 @@ glabel var7f1b50c8 /* f122704: 461a0102 */ mul.s $f4,$f0,$f26 /* f122708: 0fc2d5fe */ jal func0f0b57f8 /* f12270c: e7a4012c */ swc1 $f4,0x12c($sp) -/* f122710: 0fc2d5f6 */ jal func0f0b57d8 +/* f122710: 0fc2d5f6 */ jal currentPlayerGetScreenWidth /* f122714: 46000506 */ mov.s $f20,$f0 /* f122718: 46140180 */ add.s $f6,$f0,$f20 /* f12271c: 3c013f80 */ lui $at,0x3f80 @@ -4043,9 +4043,9 @@ glabel var7f1b50dc /* f122ab0: 46009102 */ mul.s $f4,$f18,$f0 /* f122ab4: e7aa0050 */ swc1 $f10,0x50($sp) /* f122ab8: 46022202 */ mul.s $f8,$f4,$f2 -/* f122abc: 0fc2d5f6 */ jal func0f0b57d8 +/* f122abc: 0fc2d5f6 */ jal currentPlayerGetScreenWidth /* f122ac0: e7a80054 */ swc1 $f8,0x54($sp) -/* f122ac4: 0fc2d5f6 */ jal func0f0b57d8 +/* f122ac4: 0fc2d5f6 */ jal currentPlayerGetScreenWidth /* f122ac8: 46000506 */ mov.s $f20,$f0 /* f122acc: 0fc2d5fe */ jal func0f0b57f8 /* f122ad0: e7a00030 */ swc1 $f0,0x30($sp) @@ -5744,7 +5744,7 @@ glabel var7f1b5104 /* f1243e0: 10000010 */ beqz $zero,.L0f124424 /* f1243e4: e7a401bc */ swc1 $f4,0x1bc($sp) .L0f1243e8: -/* f1243e8: 0fc2d5f6 */ jal func0f0b57d8 +/* f1243e8: 0fc2d5f6 */ jal currentPlayerGetScreenWidth /* f1243ec: 00000000 */ sll $zero,$zero,0x0 /* f1243f0: 8fae04dc */ lw $t6,0x4dc($sp) /* f1243f4: 8fb804e0 */ lw $t8,0x4e0($sp) @@ -5825,7 +5825,7 @@ glabel var7f1b5104 /* f124510: ac850000 */ sw $a1,0x0($a0) /* f124514: 0fc2d5fe */ jal func0f0b57f8 /* f124518: afa401b0 */ sw $a0,0x1b0($sp) -/* f12451c: 0fc2d5f6 */ jal func0f0b57d8 +/* f12451c: 0fc2d5f6 */ jal currentPlayerGetScreenWidth /* f124520: e7a0005c */ swc1 $f0,0x5c($sp) /* f124524: c7a6005c */ lwc1 $f6,0x5c($sp) /* f124528: 3c013e80 */ lui $at,0x3e80 @@ -5869,7 +5869,7 @@ glabel var7f1b5104 /* f1245c0: afa401a0 */ sw $a0,0x1a0($sp) /* f1245c4: 0fc2d5fe */ jal func0f0b57f8 /* f1245c8: 26100008 */ addiu $s0,$s0,0x8 -/* f1245cc: 0fc2d5f6 */ jal func0f0b57d8 +/* f1245cc: 0fc2d5f6 */ jal currentPlayerGetScreenWidth /* f1245d0: e7a0005c */ swc1 $f0,0x5c($sp) /* f1245d4: c7a4005c */ lwc1 $f4,0x5c($sp) /* f1245d8: 3c013e80 */ lui $at,0x3e80 @@ -5904,7 +5904,7 @@ glabel var7f1b5104 /* f124648: 1000000e */ beqz $zero,.L0f124684 /* f12464c: c42e5100 */ lwc1 $f14,%lo(var7f1b5100)($at) .L0f124650: -/* f124650: 0fc2d5f6 */ jal func0f0b57d8 +/* f124650: 0fc2d5f6 */ jal currentPlayerGetScreenWidth /* f124654: 00000000 */ sll $zero,$zero,0x0 /* f124658: 8fb804dc */ lw $t8,0x4dc($sp) /* f12465c: 8faf04e0 */ lw $t7,0x4e0($sp) @@ -6004,7 +6004,7 @@ glabel var7f1b5104 /* f1247c4: afa40184 */ sw $a0,0x184($sp) /* f1247c8: 0fc2d5fe */ jal func0f0b57f8 /* f1247cc: 26100008 */ addiu $s0,$s0,0x8 -/* f1247d0: 0fc2d5f6 */ jal func0f0b57d8 +/* f1247d0: 0fc2d5f6 */ jal currentPlayerGetScreenWidth /* f1247d4: e7a0005c */ swc1 $f0,0x5c($sp) /* f1247d8: c7a6005c */ lwc1 $f6,0x5c($sp) /* f1247dc: 3c013e80 */ lui $at,0x3e80 @@ -7205,7 +7205,7 @@ glabel func0f125948 /* f1259ac: 00b8082a */ slt $at,$a1,$t8 /* f1259b0: 50200017 */ beqzl $at,.L0f125a10 /* f1259b4: 8fbf0014 */ lw $ra,0x14($sp) -/* f1259b8: 0fc2d5f6 */ jal func0f0b57d8 +/* f1259b8: 0fc2d5f6 */ jal currentPlayerGetScreenWidth /* f1259bc: 00000000 */ sll $zero,$zero,0x0 /* f1259c0: 4600010d */ trunc.w.s $f4,$f0 /* f1259c4: 8fa90030 */ lw $t1,0x30($sp) diff --git a/src/include/game/game_0b3350.h b/src/include/game/game_0b3350.h index 06d1d4b3d..3dc7e8583 100644 --- a/src/include/game/game_0b3350.h +++ b/src/include/game/game_0b3350.h @@ -42,7 +42,7 @@ u32 currentPlayerGetUnk174c(void); void currentPlayerSetUnk175c(u32 value); u32 currentPlayerGetUnk175c(void); f32 currentPlayerGetLodScaleZ(void); -f32 func0f0b57d8(void); +f32 currentPlayerGetScreenWidth(void); f32 func0f0b57e8(void); f32 func0f0b57f8(void); f32 func0f0b5808(void);