From 92df3fc923d53ef30d5ab714f96ac6c0216a2c07 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Mon, 16 Mar 2020 20:59:57 +1000 Subject: [PATCH] Decompile currentPlayerGetScreenTop --- src/game/bondbike.c | 2 +- src/game/bondmove.c | 4 ++-- src/game/game_0601b0.c | 16 ++++++++-------- src/game/game_095320.c | 8 ++++---- src/game/game_096360.c | 4 ++-- src/game/game_097ba0.c | 12 ++++++------ src/game/game_0b3350.c | 11 ++++++----- src/game/game_0b63b0.c | 2 +- src/game/game_11f000.c | 28 ++++++++++++++-------------- src/include/game/game_0b3350.h | 2 +- 10 files changed, 45 insertions(+), 44 deletions(-) diff --git a/src/game/bondbike.c b/src/game/bondbike.c index 867cbb352..beae913ba 100644 --- a/src/game/bondbike.c +++ b/src/game/bondbike.c @@ -733,7 +733,7 @@ glabel func0f0d26ac /* f0d2ad8: 27a40030 */ addiu $a0,$sp,0x30 /* f0d2adc: 0fc2d341 */ jal func0f0b4d04 /* f0d2ae0: 27a50028 */ addiu $a1,$sp,0x28 -/* f0d2ae4: 0fc2d602 */ jal func0f0b5808 +/* f0d2ae4: 0fc2d602 */ jal currentPlayerGetScreenTop /* f0d2ae8: 00000000 */ sll $zero,$zero,0x0 /* f0d2aec: 0fc2d5fa */ jal currentPlayerGetScreenHeight /* f0d2af0: e7a00024 */ swc1 $f0,0x24($sp) diff --git a/src/game/bondmove.c b/src/game/bondmove.c index 862ecd889..1b342754f 100644 --- a/src/game/bondmove.c +++ b/src/game/bondmove.c @@ -3150,7 +3150,7 @@ glabel var7f1ad8e4 /* f0cabf8: 00000000 */ sll $zero,$zero,0x0 /* f0cabfc: e7a001f8 */ swc1 $f0,0x1f8($sp) .L0f0cac00: -/* f0cac00: 0fc2d602 */ jal func0f0b5808 +/* f0cac00: 0fc2d602 */ jal currentPlayerGetScreenTop /* f0cac04: 00000000 */ sll $zero,$zero,0x0 /* f0cac08: 0fc2d5fa */ jal currentPlayerGetScreenHeight /* f0cac0c: e7a00054 */ swc1 $f0,0x54($sp) @@ -3172,7 +3172,7 @@ glabel var7f1ad8e4 /* f0cac4c: 10000016 */ beqz $zero,.L0f0caca8 /* f0cac50: e7a601f0 */ swc1 $f6,0x1f0($sp) .L0f0cac54: -/* f0cac54: 0fc2d602 */ jal func0f0b5808 +/* f0cac54: 0fc2d602 */ jal currentPlayerGetScreenTop /* f0cac58: 00000000 */ sll $zero,$zero,0x0 /* f0cac5c: 0fc2d5fa */ jal currentPlayerGetScreenHeight /* f0cac60: e7a00054 */ swc1 $f0,0x54($sp) diff --git a/src/game/game_0601b0.c b/src/game/game_0601b0.c index 33313d284..09b0cef69 100644 --- a/src/game/game_0601b0.c +++ b/src/game/game_0601b0.c @@ -2509,7 +2509,7 @@ glabel var7f1a9ec4 /* f06240c: 46144281 */ sub.s $f10,$f8,$f20 /* f062410: 46105483 */ div.s $f18,$f10,$f16 /* f062414: 461a9101 */ sub.s $f4,$f18,$f26 -/* f062418: 0fc2d602 */ jal func0f0b5808 +/* f062418: 0fc2d602 */ jal currentPlayerGetScreenTop /* f06241c: e7a400fc */ swc1 $f4,0xfc($sp) /* f062420: 0fc2d5fa */ jal currentPlayerGetScreenHeight /* f062424: 46000506 */ mov.s $f20,$f0 @@ -4826,9 +4826,9 @@ glabel var7f1a9f54 .L0f0643d4: /* f0643d4: 10600013 */ beqz $v1,.L0f064424 /* f0643d8: 00000000 */ sll $zero,$zero,0x0 -/* f0643dc: 0fc2d602 */ jal func0f0b5808 +/* f0643dc: 0fc2d602 */ jal currentPlayerGetScreenTop /* f0643e0: 00000000 */ sll $zero,$zero,0x0 -/* f0643e4: 0fc2d602 */ jal func0f0b5808 +/* f0643e4: 0fc2d602 */ jal currentPlayerGetScreenTop /* f0643e8: e7a00068 */ swc1 $f0,0x68($sp) /* f0643ec: 0fc2d5fa */ jal currentPlayerGetScreenHeight /* f0643f0: e7a00034 */ swc1 $f0,0x34($sp) @@ -4845,7 +4845,7 @@ glabel var7f1a9f54 /* f06441c: 10000026 */ beqz $zero,.L0f0644b8 /* f064420: e7b0005c */ swc1 $f16,0x5c($sp) .L0f064424: -/* f064424: 0fc2d602 */ jal func0f0b5808 +/* f064424: 0fc2d602 */ jal currentPlayerGetScreenTop /* f064428: 00000000 */ sll $zero,$zero,0x0 /* f06442c: 0fc2d5fa */ jal currentPlayerGetScreenHeight /* f064430: e7a00034 */ swc1 $f0,0x34($sp) @@ -4854,7 +4854,7 @@ glabel var7f1a9f54 /* f06443c: c7a60034 */ lwc1 $f6,0x34($sp) /* f064440: 46120102 */ mul.s $f4,$f0,$f18 /* f064444: 46062200 */ add.s $f8,$f4,$f6 -/* f064448: 0fc2d602 */ jal func0f0b5808 +/* f064448: 0fc2d602 */ jal currentPlayerGetScreenTop /* f06444c: e7a80068 */ swc1 $f8,0x68($sp) /* f064450: 0fc2d5fa */ jal currentPlayerGetScreenHeight /* f064454: e7a00034 */ swc1 $f0,0x34($sp) @@ -5539,7 +5539,7 @@ glabel func0f064ce8 /* f064e34: 054000da */ bltz $t2,.L0f0651a0 /* f064e38: 00000000 */ sll $zero,$zero,0x0 .L0f064e3c: -/* f064e3c: 0fc2d602 */ jal func0f0b5808 +/* f064e3c: 0fc2d602 */ jal currentPlayerGetScreenTop /* f064e40: 00008825 */ or $s1,$zero,$zero /* f064e44: 0fc2d5fa */ jal currentPlayerGetScreenHeight /* f064e48: 46000506 */ mov.s $f20,$f0 @@ -5548,7 +5548,7 @@ glabel func0f064ce8 /* f064e54: 00000000 */ sll $zero,$zero,0x0 /* f064e58: 46040182 */ mul.s $f6,$f0,$f4 /* f064e5c: 46143200 */ add.s $f8,$f6,$f20 -/* f064e60: 0fc2d602 */ jal func0f0b5808 +/* f064e60: 0fc2d602 */ jal currentPlayerGetScreenTop /* f064e64: e7a800d0 */ swc1 $f8,0xd0($sp) /* f064e68: 0fc2d5fa */ jal currentPlayerGetScreenHeight /* f064e6c: 46000506 */ mov.s $f20,$f0 @@ -5895,7 +5895,7 @@ glabel func0f064ce8 /* f065350: 11800012 */ beqz $t4,.L0f06539c /* f065354: 00000000 */ sll $zero,$zero,0x0 .L0f065358: -/* f065358: 0fc2d602 */ jal func0f0b5808 +/* f065358: 0fc2d602 */ jal currentPlayerGetScreenTop /* f06535c: 00000000 */ sll $zero,$zero,0x0 /* f065360: 0fc2d5fa */ jal currentPlayerGetScreenHeight /* f065364: 46000506 */ mov.s $f20,$f0 diff --git a/src/game/game_095320.c b/src/game/game_095320.c index 19915e052..689586320 100644 --- a/src/game/game_095320.c +++ b/src/game/game_095320.c @@ -1090,14 +1090,14 @@ glabel objectiveCheckHolograph /* f096260: 00000000 */ sll $zero,$zero,0x0 /* f096264: 4502002e */ bc1fl .L0f096320 /* f096268: 8e31000c */ lw $s1,0xc($s1) -/* f09626c: 0fc2d602 */ jal func0f0b5808 +/* f09626c: 0fc2d602 */ jal currentPlayerGetScreenTop /* f096270: 00000000 */ sll $zero,$zero,0x0 /* f096274: c7aa007c */ lwc1 $f10,0x7c($sp) /* f096278: 460a003c */ c.lt.s $f0,$f10 /* f09627c: 00000000 */ sll $zero,$zero,0x0 /* f096280: 45020027 */ bc1fl .L0f096320 /* f096284: 8e31000c */ lw $s1,0xc($s1) -/* f096288: 0fc2d602 */ jal func0f0b5808 +/* f096288: 0fc2d602 */ jal currentPlayerGetScreenTop /* f09628c: 00000000 */ sll $zero,$zero,0x0 /* f096290: 0fc2d5fa */ jal currentPlayerGetScreenHeight /* f096294: 46000506 */ mov.s $f20,$f0 @@ -1107,14 +1107,14 @@ glabel objectiveCheckHolograph /* f0962a4: 00000000 */ sll $zero,$zero,0x0 /* f0962a8: 4502001d */ bc1fl .L0f096320 /* f0962ac: 8e31000c */ lw $s1,0xc($s1) -/* f0962b0: 0fc2d602 */ jal func0f0b5808 +/* f0962b0: 0fc2d602 */ jal currentPlayerGetScreenTop /* f0962b4: 00000000 */ sll $zero,$zero,0x0 /* f0962b8: c7a40074 */ lwc1 $f4,0x74($sp) /* f0962bc: 4604003c */ c.lt.s $f0,$f4 /* f0962c0: 00000000 */ sll $zero,$zero,0x0 /* f0962c4: 45020016 */ bc1fl .L0f096320 /* f0962c8: 8e31000c */ lw $s1,0xc($s1) -/* f0962cc: 0fc2d602 */ jal func0f0b5808 +/* f0962cc: 0fc2d602 */ jal currentPlayerGetScreenTop /* f0962d0: 00000000 */ sll $zero,$zero,0x0 /* f0962d4: 0fc2d5fa */ jal currentPlayerGetScreenHeight /* f0962d8: 46000506 */ mov.s $f20,$f0 diff --git a/src/game/game_096360.c b/src/game/game_096360.c index 2a4803bf6..cb7a776e7 100644 --- a/src/game/game_096360.c +++ b/src/game/game_096360.c @@ -63,8 +63,8 @@ const u32 var7f1ab82c[] = {0x3e8e38e4}; // // if (currentPlayerGetScreenLeft() < fStack56 && fStack56 < currentPlayerGetScreenWidth() + currentPlayerGetScreenLeft() && // currentPlayerGetScreenLeft() < fStack64 && fStack64 < currentPlayerGetScreenWidth() + currentPlayerGetScreenLeft() && -// func0f0b5808() < fStack52 && fStack52 < currentPlayerGetScreenHeight() + func0f0b5808() && -// func0f0b5808() < fStack60 && fStack60 < currentPlayerGetScreenHeight() + func0f0b5808()) { +// currentPlayerGetScreenTop() < fStack52 && fStack52 < currentPlayerGetScreenHeight() + currentPlayerGetScreenTop() && +// currentPlayerGetScreenTop() < fStack60 && fStack60 < currentPlayerGetScreenHeight() + currentPlayerGetScreenTop()) { // criteria->status = OBJECTIVE_COMPLETE; // // if (g_Vars.stagenum == STAGE_CITRAINING) { diff --git a/src/game/game_097ba0.c b/src/game/game_097ba0.c index d3d2832f0..50c8e3a17 100644 --- a/src/game/game_097ba0.c +++ b/src/game/game_097ba0.c @@ -10953,7 +10953,7 @@ glabel var7f1ac764 /* f0a091c: e7b00070 */ swc1 $f16,0x70($sp) /* f0a0920: c6a61660 */ lwc1 $f6,0x1660($s5) /* f0a0924: 46003480 */ add.s $f18,$f6,$f0 -/* f0a0928: 0fc2d602 */ jal func0f0b5808 +/* f0a0928: 0fc2d602 */ jal currentPlayerGetScreenTop /* f0a092c: e6b21660 */ swc1 $f18,0x1660($s5) /* f0a0930: c6a81664 */ lwc1 $f8,0x1664($s5) /* f0a0934: 3c017f1b */ lui $at,%hi(var7f1ac764) @@ -11013,7 +11013,7 @@ glabel var7f1ac764 /* f0a09f4: 00000000 */ sll $zero,$zero,0x0 /* f0a09f8: c6320ccc */ lwc1 $f18,0xccc($s1) /* f0a09fc: 46009200 */ add.s $f8,$f18,$f0 -/* f0a0a00: 0fc2d602 */ jal func0f0b5808 +/* f0a0a00: 0fc2d602 */ jal currentPlayerGetScreenTop /* f0a0a04: e6280ccc */ swc1 $f8,0xccc($s1) /* f0a0a08: c62a0cd0 */ lwc1 $f10,0xcd0($s1) /* f0a0a0c: 26730001 */ addiu $s3,$s3,0x1 @@ -11062,7 +11062,7 @@ glabel var7f1ac764 /* f0a0ab0: e6a41678 */ swc1 $f4,0x1678($s5) /* f0a0ab4: c6a61674 */ lwc1 $f6,0x1674($s5) /* f0a0ab8: 46003480 */ add.s $f18,$f6,$f0 -/* f0a0abc: 0fc2d602 */ jal func0f0b5808 +/* f0a0abc: 0fc2d602 */ jal currentPlayerGetScreenTop /* f0a0ac0: e6b21674 */ swc1 $f18,0x1674($s5) /* f0a0ac4: c6a81678 */ lwc1 $f8,0x1678($s5) /* f0a0ac8: 27b000c8 */ addiu $s0,$sp,0xc8 @@ -17118,7 +17118,7 @@ glabel var7f1aca70 /* f0a5ad0: 00000000 */ sll $zero,$zero,0x0 /* f0a5ad4: 46020402 */ mul.s $f16,$f0,$f2 /* f0a5ad8: 46105103 */ div.s $f4,$f10,$f16 -/* f0a5adc: 0fc2d602 */ jal func0f0b5808 +/* f0a5adc: 0fc2d602 */ jal currentPlayerGetScreenTop /* f0a5ae0: e604076c */ swc1 $f4,0x76c($s0) /* f0a5ae4: 0fc2d5fa */ jal currentPlayerGetScreenHeight /* f0a5ae8: e7a00064 */ swc1 $f0,0x64($sp) @@ -17135,7 +17135,7 @@ glabel var7f1aca70 /* f0a5b14: 00000000 */ sll $zero,$zero,0x0 /* f0a5b18: 0fc2d5fa */ jal currentPlayerGetScreenHeight /* f0a5b1c: 00000000 */ sll $zero,$zero,0x0 -/* f0a5b20: 0fc2d602 */ jal func0f0b5808 +/* f0a5b20: 0fc2d602 */ jal currentPlayerGetScreenTop /* f0a5b24: e7a00060 */ swc1 $f0,0x60($sp) /* f0a5b28: 0fc2d5fa */ jal currentPlayerGetScreenHeight /* f0a5b2c: e7a00064 */ swc1 $f0,0x64($sp) @@ -17161,7 +17161,7 @@ glabel var7f1aca70 .L0f0a5b7c: /* f0a5b7c: 0fc2d5fa */ jal currentPlayerGetScreenHeight /* f0a5b80: 00000000 */ sll $zero,$zero,0x0 -/* f0a5b84: 0fc2d602 */ jal func0f0b5808 +/* f0a5b84: 0fc2d602 */ jal currentPlayerGetScreenTop /* f0a5b88: e7a00060 */ swc1 $f0,0x60($sp) /* f0a5b8c: 0fc2d5fa */ jal currentPlayerGetScreenHeight /* f0a5b90: e7a00064 */ swc1 $f0,0x64($sp) diff --git a/src/game/game_0b3350.c b/src/game/game_0b3350.c index 71d6eae58..962fa26f5 100644 --- a/src/game/game_0b3350.c +++ b/src/game/game_0b3350.c @@ -2461,12 +2461,13 @@ f32 currentPlayerGetScreenLeft(void) return g_Vars.currentplayer->c_screenleft; } +f32 currentPlayerGetScreenTop(void) +{ + return g_Vars.currentplayer->c_screentop; +} + GLOBAL_ASM( -glabel func0f0b5808 -/* f0b5808: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) -/* f0b580c: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) -/* f0b5810: 03e00008 */ jr $ra -/* f0b5814: c5c01710 */ lwc1 $f0,0x1710($t6) +glabel func0f0b5818 /* f0b5818: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) /* f0b581c: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0b5820: 03e00008 */ jr $ra diff --git a/src/game/game_0b63b0.c b/src/game/game_0b63b0.c index 970b8a5dd..d156ad7d2 100644 --- a/src/game/game_0b63b0.c +++ b/src/game/game_0b63b0.c @@ -11103,7 +11103,7 @@ glabel var7f1ad6ec /* f0c02e8: 44812000 */ mtc1 $at,$f4 /* f0c02ec: 46080400 */ add.s $f16,$f0,$f8 /* f0c02f0: 46048502 */ mul.s $f20,$f16,$f4 -/* f0c02f4: 0fc2d602 */ jal func0f0b5808 +/* f0c02f4: 0fc2d602 */ jal currentPlayerGetScreenTop /* f0c02f8: 00000000 */ sll $zero,$zero,0x0 /* f0c02fc: 0fc2d5fa */ jal currentPlayerGetScreenHeight /* f0c0300: e7a00050 */ swc1 $f0,0x50($sp) diff --git a/src/game/game_11f000.c b/src/game/game_11f000.c index 610bad0a9..4c3cfb456 100644 --- a/src/game/game_11f000.c +++ b/src/game/game_11f000.c @@ -33,7 +33,7 @@ glabel func0f11f000 /* f11f01c: afa20024 */ sw $v0,0x24($sp) /* f11f020: c7a40028 */ lwc1 $f4,0x28($sp) /* f11f024: 46040180 */ add.s $f6,$f0,$f4 -/* f11f028: 0fc2d602 */ jal func0f0b5808 +/* f11f028: 0fc2d602 */ jal currentPlayerGetScreenTop /* f11f02c: e7a6001c */ swc1 $f6,0x1c($sp) /* f11f030: 0fc595f3 */ jal func0f1657cc /* f11f034: e7a00018 */ swc1 $f0,0x18($sp) @@ -1107,7 +1107,7 @@ glabel var7f1b50c8 /* f11fdac: 8fad0530 */ lw $t5,0x530($sp) /* f11fdb0: 514d001f */ beql $t2,$t5,.L0f11fe30 /* f11fdb4: 44805000 */ mtc1 $zero,$f10 -/* f11fdb8: 0fc2d602 */ jal func0f0b5808 +/* f11fdb8: 0fc2d602 */ jal currentPlayerGetScreenTop /* f11fdbc: 00000000 */ sll $zero,$zero,0x0 /* f11fdc0: 0fc2d5fa */ jal currentPlayerGetScreenHeight /* f11fdc4: 46000586 */ mov.s $f22,$f0 @@ -1145,7 +1145,7 @@ glabel var7f1b50c8 /* f11fe3c: 8fac052c */ lw $t4,0x52c($sp) /* f11fe40: 51cc0021 */ beql $t6,$t4,.L0f11fec8 /* f11fe44: 44803000 */ mtc1 $zero,$f6 -/* f11fe48: 0fc2d602 */ jal func0f0b5808 +/* f11fe48: 0fc2d602 */ jal currentPlayerGetScreenTop /* f11fe4c: 00000000 */ sll $zero,$zero,0x0 /* f11fe50: 0fc2d5fa */ jal currentPlayerGetScreenHeight /* f11fe54: 46000586 */ mov.s $f22,$f0 @@ -2211,9 +2211,9 @@ glabel var7f1b50c8 /* f120ec8: 44063000 */ mfc1 $a2,$f6 /* f120ecc: 0fc47cf4 */ jal func0f11f3d0 /* f120ed0: 00000000 */ sll $zero,$zero,0x0 -/* f120ed4: 0fc2d602 */ jal func0f0b5808 +/* f120ed4: 0fc2d602 */ jal currentPlayerGetScreenTop /* f120ed8: e6000028 */ swc1 $f0,0x28($s0) -/* f120edc: 0fc2d602 */ jal func0f0b5808 +/* f120edc: 0fc2d602 */ jal currentPlayerGetScreenTop /* f120ee0: 46000506 */ mov.s $f20,$f0 /* f120ee4: 0fc2d5fa */ jal currentPlayerGetScreenHeight /* f120ee8: 46000586 */ mov.s $f22,$f0 @@ -2227,7 +2227,7 @@ glabel var7f1b50c8 /* f120f08: 44063000 */ mfc1 $a2,$f6 /* f120f0c: 0fc47cf4 */ jal func0f11f3d0 /* f120f10: 00000000 */ sll $zero,$zero,0x0 -/* f120f14: 0fc2d602 */ jal func0f0b5808 +/* f120f14: 0fc2d602 */ jal currentPlayerGetScreenTop /* f120f18: e600002c */ swc1 $f0,0x2c($s0) /* f120f1c: 461a0202 */ mul.s $f8,$f0,$f26 /* f120f20: c604002c */ lwc1 $f4,0x2c($s0) @@ -2236,7 +2236,7 @@ glabel var7f1b50c8 /* f120f2c: 00000000 */ sll $zero,$zero,0x0 /* f120f30: 45020010 */ bc1fl .L0f120f74 /* f120f34: 8fae0064 */ lw $t6,0x64($sp) -/* f120f38: 0fc2d602 */ jal func0f0b5808 +/* f120f38: 0fc2d602 */ jal currentPlayerGetScreenTop /* f120f3c: 00000000 */ sll $zero,$zero,0x0 /* f120f40: 0fc2d5fa */ jal currentPlayerGetScreenHeight /* f120f44: 46000506 */ mov.s $f20,$f0 @@ -3649,9 +3649,9 @@ glabel var7f1b50c8 /* f1224fc: 44063000 */ mfc1 $a2,$f6 /* f122500: 0fc47cf4 */ jal func0f11f3d0 /* f122504: 00000000 */ sll $zero,$zero,0x0 -/* f122508: 0fc2d602 */ jal func0f0b5808 +/* f122508: 0fc2d602 */ jal currentPlayerGetScreenTop /* f12250c: e6000028 */ swc1 $f0,0x28($s0) -/* f122510: 0fc2d602 */ jal func0f0b5808 +/* f122510: 0fc2d602 */ jal currentPlayerGetScreenTop /* f122514: 46000506 */ mov.s $f20,$f0 /* f122518: 0fc2d5fa */ jal currentPlayerGetScreenHeight /* f12251c: 46000586 */ mov.s $f22,$f0 @@ -3701,7 +3701,7 @@ glabel var7f1b50c8 /* f1225c8: 0fc2d5fe */ jal currentPlayerGetScreenLeft /* f1225cc: 00000000 */ sll $zero,$zero,0x0 /* f1225d0: 461a0102 */ mul.s $f4,$f0,$f26 -/* f1225d4: 0fc2d602 */ jal func0f0b5808 +/* f1225d4: 0fc2d602 */ jal currentPlayerGetScreenTop /* f1225d8: e7a400bc */ swc1 $f4,0xbc($sp) /* f1225dc: 461a0182 */ mul.s $f6,$f0,$f26 /* f1225e0: 0fc2d5fe */ jal currentPlayerGetScreenLeft @@ -3713,7 +3713,7 @@ glabel var7f1b50c8 /* f1225f8: 44812000 */ mtc1 $at,$f4 /* f1225fc: 461a5202 */ mul.s $f8,$f10,$f26 /* f122600: 46044181 */ sub.s $f6,$f8,$f4 -/* f122604: 0fc2d602 */ jal func0f0b5808 +/* f122604: 0fc2d602 */ jal currentPlayerGetScreenTop /* f122608: e7a600f4 */ swc1 $f6,0xf4($sp) /* f12260c: 461a0282 */ mul.s $f10,$f0,$f26 /* f122610: 0fc2d5fe */ jal currentPlayerGetScreenLeft @@ -3762,7 +3762,7 @@ glabel var7f1b50c8 /* f1226b4: 0fc2d5fe */ jal currentPlayerGetScreenLeft /* f1226b8: 00000000 */ sll $zero,$zero,0x0 /* f1226bc: 461a0182 */ mul.s $f6,$f0,$f26 -/* f1226c0: 0fc2d602 */ jal func0f0b5808 +/* f1226c0: 0fc2d602 */ jal currentPlayerGetScreenTop /* f1226c4: e7a600bc */ swc1 $f6,0xbc($sp) /* f1226c8: 461a0202 */ mul.s $f8,$f0,$f26 /* f1226cc: 0fc2d5fe */ jal currentPlayerGetScreenLeft @@ -3774,7 +3774,7 @@ glabel var7f1b50c8 /* f1226e4: 44813000 */ mtc1 $at,$f6 /* f1226e8: 461a5102 */ mul.s $f4,$f10,$f26 /* f1226ec: 46062201 */ sub.s $f8,$f4,$f6 -/* f1226f0: 0fc2d602 */ jal func0f0b5808 +/* f1226f0: 0fc2d602 */ jal currentPlayerGetScreenTop /* f1226f4: e7a800f4 */ swc1 $f8,0xf4($sp) /* f1226f8: 461a0282 */ mul.s $f10,$f0,$f26 /* f1226fc: 0fc2d5fe */ jal currentPlayerGetScreenLeft @@ -4063,7 +4063,7 @@ glabel var7f1b50dc /* f122b00: e7b20038 */ swc1 $f18,0x38($sp) /* f122b04: 0fc2d5fa */ jal currentPlayerGetScreenHeight /* f122b08: 46000506 */ mov.s $f20,$f0 -/* f122b0c: 0fc2d602 */ jal func0f0b5808 +/* f122b0c: 0fc2d602 */ jal currentPlayerGetScreenTop /* f122b10: e7a00030 */ swc1 $f0,0x30($sp) /* f122b14: 3c017f1b */ lui $at,%hi(var7f1b50d4) /* f122b18: c43050d4 */ lwc1 $f16,%lo(var7f1b50d4)($at) diff --git a/src/include/game/game_0b3350.h b/src/include/game/game_0b3350.h index c4a3c3c80..993ec9628 100644 --- a/src/include/game/game_0b3350.h +++ b/src/include/game/game_0b3350.h @@ -45,7 +45,7 @@ f32 currentPlayerGetLodScaleZ(void); f32 currentPlayerGetScreenWidth(void); f32 currentPlayerGetScreenHeight(void); f32 currentPlayerGetScreenLeft(void); -f32 func0f0b5808(void); +f32 currentPlayerGetScreenTop(void); u32 func0f0b5828(void); u32 func0f0b5838(void); u32 func0f0b5b9c(void);