Decompile currentPlayerGetScreenHeight

This commit is contained in:
Ryan Dwyer 2020-03-16 20:57:31 +10:00
parent f21f910198
commit 14faafc041
10 changed files with 40 additions and 43 deletions

View File

@ -735,7 +735,7 @@ glabel func0f0d26ac
/* f0d2ae0: 27a50028 */ addiu $a1,$sp,0x28
/* f0d2ae4: 0fc2d602 */ jal func0f0b5808
/* f0d2ae8: 00000000 */ sll $zero,$zero,0x0
/* f0d2aec: 0fc2d5fa */ jal func0f0b57e8
/* f0d2aec: 0fc2d5fa */ jal currentPlayerGetScreenHeight
/* f0d2af0: e7a00024 */ swc1 $f0,0x24($sp)
/* f0d2af4: c7a4002c */ lwc1 $f4,0x2c($sp)
/* f0d2af8: c7a60024 */ lwc1 $f6,0x24($sp)

View File

@ -3152,7 +3152,7 @@ glabel var7f1ad8e4
.L0f0cac00:
/* f0cac00: 0fc2d602 */ jal func0f0b5808
/* f0cac04: 00000000 */ sll $zero,$zero,0x0
/* f0cac08: 0fc2d5fa */ jal func0f0b57e8
/* f0cac08: 0fc2d5fa */ jal currentPlayerGetScreenHeight
/* f0cac0c: e7a00054 */ swc1 $f0,0x54($sp)
/* f0cac10: 3c013f00 */ lui $at,0x3f00
/* f0cac14: 44815000 */ mtc1 $at,$f10
@ -3174,7 +3174,7 @@ glabel var7f1ad8e4
.L0f0cac54:
/* f0cac54: 0fc2d602 */ jal func0f0b5808
/* f0cac58: 00000000 */ sll $zero,$zero,0x0
/* f0cac5c: 0fc2d5fa */ jal func0f0b57e8
/* f0cac5c: 0fc2d5fa */ jal currentPlayerGetScreenHeight
/* f0cac60: e7a00054 */ swc1 $f0,0x54($sp)
/* f0cac64: 3c013f00 */ lui $at,0x3f00
/* f0cac68: 44814000 */ mtc1 $at,$f8

View File

@ -2511,19 +2511,19 @@ glabel var7f1a9ec4
/* f062414: 461a9101 */ sub.s $f4,$f18,$f26
/* f062418: 0fc2d602 */ jal func0f0b5808
/* f06241c: e7a400fc */ swc1 $f4,0xfc($sp)
/* f062420: 0fc2d5fa */ jal func0f0b57e8
/* f062420: 0fc2d5fa */ jal currentPlayerGetScreenHeight
/* f062424: 46000506 */ mov.s $f20,$f0
/* f062428: 46180282 */ mul.s $f10,$f0,$f24
/* f06242c: c7a60104 */ lwc1 $f6,0x104($sp)
/* f062430: 46143201 */ sub.s $f8,$f6,$f20
/* f062434: 460a4403 */ div.s $f16,$f8,$f10
/* f062438: 461a8481 */ sub.s $f18,$f16,$f26
/* f06243c: 0fc2d5fa */ jal func0f0b57e8
/* f06243c: 0fc2d5fa */ jal currentPlayerGetScreenHeight
/* f062440: e7b20100 */ swc1 $f18,0x100($sp)
/* f062444: 3c017f1b */ lui $at,%hi(var7f1a9ec4)
/* f062448: c4249ec4 */ lwc1 $f4,%lo(var7f1a9ec4)($at)
/* f06244c: 46040182 */ mul.s $f6,$f0,$f4
/* f062450: 0fc2d5fa */ jal func0f0b57e8
/* f062450: 0fc2d5fa */ jal currentPlayerGetScreenHeight
/* f062454: e7a600f4 */ swc1 $f6,0xf4($sp)
/* f062458: 3c013e00 */ lui $at,0x3e00
/* f06245c: 44814000 */ mtc1 $at,$f8
@ -4830,7 +4830,7 @@ glabel var7f1a9f54
/* f0643e0: 00000000 */ sll $zero,$zero,0x0
/* f0643e4: 0fc2d602 */ jal func0f0b5808
/* f0643e8: e7a00068 */ swc1 $f0,0x68($sp)
/* f0643ec: 0fc2d5fa */ jal func0f0b57e8
/* f0643ec: 0fc2d5fa */ jal currentPlayerGetScreenHeight
/* f0643f0: e7a00034 */ swc1 $f0,0x34($sp)
/* f0643f4: c7a60034 */ lwc1 $f6,0x34($sp)
/* f0643f8: 46060200 */ add.s $f8,$f0,$f6
@ -4847,7 +4847,7 @@ glabel var7f1a9f54
.L0f064424:
/* f064424: 0fc2d602 */ jal func0f0b5808
/* f064428: 00000000 */ sll $zero,$zero,0x0
/* f06442c: 0fc2d5fa */ jal func0f0b57e8
/* f06442c: 0fc2d5fa */ jal currentPlayerGetScreenHeight
/* f064430: e7a00034 */ swc1 $f0,0x34($sp)
/* f064434: 3c017f1b */ lui $at,%hi(var7f1a9f50)
/* f064438: c4329f50 */ lwc1 $f18,%lo(var7f1a9f50)($at)
@ -4856,7 +4856,7 @@ glabel var7f1a9f54
/* f064444: 46062200 */ add.s $f8,$f4,$f6
/* f064448: 0fc2d602 */ jal func0f0b5808
/* f06444c: e7a80068 */ swc1 $f8,0x68($sp)
/* f064450: 0fc2d5fa */ jal func0f0b57e8
/* f064450: 0fc2d5fa */ jal currentPlayerGetScreenHeight
/* f064454: e7a00034 */ swc1 $f0,0x34($sp)
/* f064458: 3c017f1b */ lui $at,%hi(var7f1a9f54)
/* f06445c: c42a9f54 */ lwc1 $f10,%lo(var7f1a9f54)($at)
@ -5541,7 +5541,7 @@ glabel func0f064ce8
.L0f064e3c:
/* f064e3c: 0fc2d602 */ jal func0f0b5808
/* f064e40: 00008825 */ or $s1,$zero,$zero
/* f064e44: 0fc2d5fa */ jal func0f0b57e8
/* f064e44: 0fc2d5fa */ jal currentPlayerGetScreenHeight
/* f064e48: 46000506 */ mov.s $f20,$f0
/* f064e4c: 3c013e00 */ lui $at,0x3e00
/* f064e50: 44812000 */ mtc1 $at,$f4
@ -5550,7 +5550,7 @@ glabel func0f064ce8
/* f064e5c: 46143200 */ add.s $f8,$f6,$f20
/* f064e60: 0fc2d602 */ jal func0f0b5808
/* f064e64: e7a800d0 */ swc1 $f8,0xd0($sp)
/* f064e68: 0fc2d5fa */ jal func0f0b57e8
/* f064e68: 0fc2d5fa */ jal currentPlayerGetScreenHeight
/* f064e6c: 46000506 */ mov.s $f20,$f0
/* f064e70: 3c013f60 */ lui $at,0x3f60
/* f064e74: 44815000 */ mtc1 $at,$f10
@ -5897,7 +5897,7 @@ glabel func0f064ce8
.L0f065358:
/* f065358: 0fc2d602 */ jal func0f0b5808
/* f06535c: 00000000 */ sll $zero,$zero,0x0
/* f065360: 0fc2d5fa */ jal func0f0b57e8
/* f065360: 0fc2d5fa */ jal currentPlayerGetScreenHeight
/* f065364: 46000506 */ mov.s $f20,$f0
/* f065368: 3c013f00 */ lui $at,0x3f00
/* f06536c: 44814000 */ mtc1 $at,$f8

View File

@ -1099,7 +1099,7 @@ glabel objectiveCheckHolograph
/* f096284: 8e31000c */ lw $s1,0xc($s1)
/* f096288: 0fc2d602 */ jal func0f0b5808
/* f09628c: 00000000 */ sll $zero,$zero,0x0
/* f096290: 0fc2d5fa */ jal func0f0b57e8
/* f096290: 0fc2d5fa */ jal currentPlayerGetScreenHeight
/* f096294: 46000506 */ mov.s $f20,$f0
/* f096298: 46140480 */ add.s $f18,$f0,$f20
/* f09629c: c7b0007c */ lwc1 $f16,0x7c($sp)
@ -1116,7 +1116,7 @@ glabel objectiveCheckHolograph
/* f0962c8: 8e31000c */ lw $s1,0xc($s1)
/* f0962cc: 0fc2d602 */ jal func0f0b5808
/* f0962d0: 00000000 */ sll $zero,$zero,0x0
/* f0962d4: 0fc2d5fa */ jal func0f0b57e8
/* f0962d4: 0fc2d5fa */ jal currentPlayerGetScreenHeight
/* f0962d8: 46000506 */ mov.s $f20,$f0
/* f0962dc: 46140200 */ add.s $f8,$f0,$f20
/* f0962e0: c7a60074 */ lwc1 $f6,0x74($sp)

View File

@ -63,8 +63,8 @@ const u32 var7f1ab82c[] = {0x3e8e38e4};
//
// if (func0f0b57f8() < fStack56 && fStack56 < currentPlayerGetScreenWidth() + func0f0b57f8() &&
// func0f0b57f8() < fStack64 && fStack64 < currentPlayerGetScreenWidth() + func0f0b57f8() &&
// func0f0b5808() < fStack52 && fStack52 < func0f0b57e8() + func0f0b5808() &&
// func0f0b5808() < fStack60 && fStack60 < func0f0b57e8() + func0f0b5808()) {
// func0f0b5808() < fStack52 && fStack52 < currentPlayerGetScreenHeight() + func0f0b5808() &&
// func0f0b5808() < fStack60 && fStack60 < currentPlayerGetScreenHeight() + func0f0b5808()) {
// criteria->status = OBJECTIVE_COMPLETE;
//
// if (g_Vars.stagenum == STAGE_CITRAINING) {

View File

@ -10596,7 +10596,7 @@ glabel var7f1ac764
/* f0a03dc: e7ae00e4 */ swc1 $f14,0xe4($sp)
/* f0a03e0: 0fc2d5f6 */ jal currentPlayerGetScreenWidth
/* f0a03e4: afa700ec */ sw $a3,0xec($sp)
/* f0a03e8: 0fc2d5fa */ jal func0f0b57e8
/* f0a03e8: 0fc2d5fa */ jal currentPlayerGetScreenHeight
/* f0a03ec: 46000706 */ mov.s $f28,$f0
/* f0a03f0: 3c0f8007 */ lui $t7,%hi(var800701b8)
/* f0a03f4: 25ef01b8 */ addiu $t7,$t7,%lo(var800701b8)
@ -11387,7 +11387,7 @@ glabel func0f0a0cb0
/* f0a0f30: 44801000 */ mtc1 $zero,$f2
/* f0a0f34: 00000000 */ sll $zero,$zero,0x0
.L0f0a0f38:
/* f0a0f38: 0fc2d5fa */ jal func0f0b57e8
/* f0a0f38: 0fc2d5fa */ jal currentPlayerGetScreenHeight
/* f0a0f3c: e7a20034 */ swc1 $f2,0x34($sp)
/* f0a0f40: 0c002f06 */ jal func0000bc18
/* f0a0f44: e7a0001c */ swc1 $f0,0x1c($sp)
@ -17120,7 +17120,7 @@ glabel var7f1aca70
/* f0a5ad8: 46105103 */ div.s $f4,$f10,$f16
/* f0a5adc: 0fc2d602 */ jal func0f0b5808
/* f0a5ae0: e604076c */ swc1 $f4,0x76c($s0)
/* f0a5ae4: 0fc2d5fa */ jal func0f0b57e8
/* f0a5ae4: 0fc2d5fa */ jal currentPlayerGetScreenHeight
/* f0a5ae8: e7a00064 */ swc1 $f0,0x64($sp)
/* f0a5aec: 3c013f00 */ lui $at,0x3f00
/* f0a5af0: 44813000 */ mtc1 $at,$f6
@ -17133,11 +17133,11 @@ glabel var7f1aca70
/* f0a5b0c: 00000000 */ sll $zero,$zero,0x0
/* f0a5b10: 4500001a */ bc1f .L0f0a5b7c
/* f0a5b14: 00000000 */ sll $zero,$zero,0x0
/* f0a5b18: 0fc2d5fa */ jal func0f0b57e8
/* f0a5b18: 0fc2d5fa */ jal currentPlayerGetScreenHeight
/* f0a5b1c: 00000000 */ sll $zero,$zero,0x0
/* f0a5b20: 0fc2d602 */ jal func0f0b5808
/* f0a5b24: e7a00060 */ swc1 $f0,0x60($sp)
/* f0a5b28: 0fc2d5fa */ jal func0f0b57e8
/* f0a5b28: 0fc2d5fa */ jal currentPlayerGetScreenHeight
/* f0a5b2c: e7a00064 */ swc1 $f0,0x64($sp)
/* f0a5b30: 3c013f00 */ lui $at,0x3f00
/* f0a5b34: 44819000 */ mtc1 $at,$f18
@ -17159,11 +17159,11 @@ glabel var7f1aca70
/* f0a5b74: 10000019 */ beqz $zero,.L0f0a5bdc
/* f0a5b78: e6100770 */ swc1 $f16,0x770($s0)
.L0f0a5b7c:
/* f0a5b7c: 0fc2d5fa */ jal func0f0b57e8
/* f0a5b7c: 0fc2d5fa */ jal currentPlayerGetScreenHeight
/* f0a5b80: 00000000 */ sll $zero,$zero,0x0
/* f0a5b84: 0fc2d602 */ jal func0f0b5808
/* f0a5b88: e7a00060 */ swc1 $f0,0x60($sp)
/* f0a5b8c: 0fc2d5fa */ jal func0f0b57e8
/* f0a5b8c: 0fc2d5fa */ jal currentPlayerGetScreenHeight
/* f0a5b90: e7a00064 */ swc1 $f0,0x64($sp)
/* f0a5b94: 3c013f00 */ lui $at,0x3f00
/* f0a5b98: 44814000 */ mtc1 $at,$f8

View File

@ -2451,13 +2451,10 @@ f32 currentPlayerGetScreenWidth(void)
return g_Vars.currentplayer->c_screenwidth;
}
GLOBAL_ASM(
glabel func0f0b57e8
/* f0b57e8: 3c0e800a */ lui $t6,%hi(g_Vars+0x284)
/* f0b57ec: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6)
/* f0b57f0: 03e00008 */ jr $ra
/* f0b57f4: c5c01708 */ lwc1 $f0,0x1708($t6)
);
f32 currentPlayerGetScreenHeight(void)
{
return g_Vars.currentplayer->c_screenheight;
}
GLOBAL_ASM(
glabel func0f0b57f8

View File

@ -11105,7 +11105,7 @@ glabel var7f1ad6ec
/* f0c02f0: 46048502 */ mul.s $f20,$f16,$f4
/* f0c02f4: 0fc2d602 */ jal func0f0b5808
/* f0c02f8: 00000000 */ sll $zero,$zero,0x0
/* f0c02fc: 0fc2d5fa */ jal func0f0b57e8
/* f0c02fc: 0fc2d5fa */ jal currentPlayerGetScreenHeight
/* f0c0300: e7a00050 */ swc1 $f0,0x50($sp)
/* f0c0304: 46140482 */ mul.s $f18,$f0,$f20
/* f0c0308: c7aa0050 */ lwc1 $f10,0x50($sp)
@ -11162,7 +11162,7 @@ glabel var7f1ad6ec
/* f0c03c4: 46102282 */ mul.s $f10,$f4,$f16
/* f0c03c8: 460a3200 */ add.s $f8,$f6,$f10
/* f0c03cc: 46080482 */ mul.s $f18,$f0,$f8
/* f0c03d0: 0fc2d5fa */ jal func0f0b57e8
/* f0c03d0: 0fc2d5fa */ jal currentPlayerGetScreenHeight
/* f0c03d4: e7b20088 */ swc1 $f18,0x88($sp)
/* f0c03d8: 8e030284 */ lw $v1,0x284($s0)
/* f0c03dc: 24040064 */ addiu $a0,$zero,0x64

View File

@ -1053,7 +1053,7 @@ glabel var7f1b50c8
/* f11fcd4: 27a60698 */ addiu $a2,$sp,0x698
/* f11fcd8: 0fc47c00 */ jal func0f11f000
/* f11fcdc: 461c0301 */ sub.s $f12,$f0,$f28
/* f11fce0: 0fc2d5fa */ jal func0f0b57e8
/* f11fce0: 0fc2d5fa */ jal currentPlayerGetScreenHeight
/* f11fce4: 00000000 */ sll $zero,$zero,0x0
/* f11fce8: 44806000 */ mtc1 $zero,$f12
/* f11fcec: 461c0381 */ sub.s $f14,$f0,$f28
@ -1061,7 +1061,7 @@ glabel var7f1b50c8
/* f11fcf4: 27a6068c */ addiu $a2,$sp,0x68c
/* f11fcf8: 0fc2d5f6 */ jal currentPlayerGetScreenWidth
/* f11fcfc: 00000000 */ sll $zero,$zero,0x0
/* f11fd00: 0fc2d5fa */ jal func0f0b57e8
/* f11fd00: 0fc2d5fa */ jal currentPlayerGetScreenHeight
/* f11fd04: 46000586 */ mov.s $f22,$f0
/* f11fd08: 461cb301 */ sub.s $f12,$f22,$f28
/* f11fd0c: 27a60680 */ addiu $a2,$sp,0x680
@ -1109,7 +1109,7 @@ glabel var7f1b50c8
/* f11fdb4: 44805000 */ mtc1 $zero,$f10
/* f11fdb8: 0fc2d602 */ jal func0f0b5808
/* f11fdbc: 00000000 */ sll $zero,$zero,0x0
/* f11fdc0: 0fc2d5fa */ jal func0f0b57e8
/* f11fdc0: 0fc2d5fa */ jal currentPlayerGetScreenHeight
/* f11fdc4: 46000586 */ mov.s $f22,$f0
/* f11fdc8: c7a206a8 */ lwc1 $f2,0x6a8($sp)
/* f11fdcc: c7b00690 */ lwc1 $f16,0x690($sp)
@ -1147,7 +1147,7 @@ glabel var7f1b50c8
/* f11fe44: 44803000 */ mtc1 $zero,$f6
/* f11fe48: 0fc2d602 */ jal func0f0b5808
/* f11fe4c: 00000000 */ sll $zero,$zero,0x0
/* f11fe50: 0fc2d5fa */ jal func0f0b57e8
/* f11fe50: 0fc2d5fa */ jal currentPlayerGetScreenHeight
/* f11fe54: 46000586 */ mov.s $f22,$f0
/* f11fe58: c7b0069c */ lwc1 $f16,0x69c($sp)
/* f11fe5c: c7a40684 */ lwc1 $f4,0x684($sp)
@ -1225,7 +1225,7 @@ glabel var7f1b50c8
/* f11ff70: 46068201 */ sub.s $f8,$f16,$f6
/* f11ff74: 46088283 */ div.s $f10,$f16,$f8
/* f11ff78: 46005102 */ mul.s $f4,$f10,$f0
/* f11ff7c: 0fc2d5fa */ jal func0f0b57e8
/* f11ff7c: 0fc2d5fa */ jal currentPlayerGetScreenHeight
/* f11ff80: 46162500 */ add.s $f20,$f4,$f22
/* f11ff84: 27b00668 */ addiu $s0,$sp,0x668
/* f11ff88: 02003025 */ or $a2,$s0,$zero
@ -2215,7 +2215,7 @@ glabel var7f1b50c8
/* f120ed8: e6000028 */ swc1 $f0,0x28($s0)
/* f120edc: 0fc2d602 */ jal func0f0b5808
/* f120ee0: 46000506 */ mov.s $f20,$f0
/* f120ee4: 0fc2d5fa */ jal func0f0b57e8
/* f120ee4: 0fc2d5fa */ jal currentPlayerGetScreenHeight
/* f120ee8: 46000586 */ mov.s $f22,$f0
/* f120eec: 46160200 */ add.s $f8,$f0,$f22
/* f120ef0: 461aa382 */ mul.s $f14,$f20,$f26
@ -2238,7 +2238,7 @@ glabel var7f1b50c8
/* f120f34: 8fae0064 */ lw $t6,0x64($sp)
/* f120f38: 0fc2d602 */ jal func0f0b5808
/* f120f3c: 00000000 */ sll $zero,$zero,0x0
/* f120f40: 0fc2d5fa */ jal func0f0b57e8
/* f120f40: 0fc2d5fa */ jal currentPlayerGetScreenHeight
/* f120f44: 46000506 */ mov.s $f20,$f0
/* f120f48: 46140180 */ add.s $f6,$f0,$f20
/* f120f4c: c602002c */ lwc1 $f2,0x2c($s0)
@ -3653,7 +3653,7 @@ glabel var7f1b50c8
/* f12250c: e6000028 */ swc1 $f0,0x28($s0)
/* f122510: 0fc2d602 */ jal func0f0b5808
/* f122514: 46000506 */ mov.s $f20,$f0
/* f122518: 0fc2d5fa */ jal func0f0b57e8
/* f122518: 0fc2d5fa */ jal currentPlayerGetScreenHeight
/* f12251c: 46000586 */ mov.s $f22,$f0
/* f122520: 46160200 */ add.s $f8,$f0,$f22
/* f122524: 461aa382 */ mul.s $f14,$f20,$f26
@ -4059,9 +4059,9 @@ glabel var7f1b50dc
/* f122af0: 46125100 */ add.s $f4,$f10,$f18
/* f122af4: 46064282 */ mul.s $f10,$f8,$f6
/* f122af8: 460a2480 */ add.s $f18,$f4,$f10
/* f122afc: 0fc2d5fa */ jal func0f0b57e8
/* f122afc: 0fc2d5fa */ jal currentPlayerGetScreenHeight
/* f122b00: e7b20038 */ swc1 $f18,0x38($sp)
/* f122b04: 0fc2d5fa */ jal func0f0b57e8
/* f122b04: 0fc2d5fa */ jal currentPlayerGetScreenHeight
/* f122b08: 46000506 */ mov.s $f20,$f0
/* f122b0c: 0fc2d602 */ jal func0f0b5808
/* f122b10: e7a00030 */ swc1 $f0,0x30($sp)

View File

@ -43,7 +43,7 @@ void currentPlayerSetUnk175c(u32 value);
u32 currentPlayerGetUnk175c(void);
f32 currentPlayerGetLodScaleZ(void);
f32 currentPlayerGetScreenWidth(void);
f32 func0f0b57e8(void);
f32 currentPlayerGetScreenHeight(void);
f32 func0f0b57f8(void);
f32 func0f0b5808(void);
u32 func0f0b5828(void);