From 2f4f77da40ff0fc8a6658217a918826d294ba1e0 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Mon, 16 Mar 2020 20:54:26 +1000 Subject: [PATCH] Decompile currentPlayerGetLodScaleZ --- src/game/game_01e250.c | 2 +- src/game/game_0b3350.c | 11 ++++++----- src/game/game_129900.c | 2 +- src/game/game_157db0.c | 2 +- src/game/propobj.c | 4 ++-- src/include/game/game_0b3350.h | 2 +- src/lib/lib_1a500.c | 2 +- 7 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/game/game_01e250.c b/src/game/game_01e250.c index c70fb19d0..2b179bfea 100644 --- a/src/game/game_01e250.c +++ b/src/game/game_01e250.c @@ -6406,7 +6406,7 @@ glabel var7f1a87d8 /* f023fdc: 3c03800a */ lui $v1,%hi(g_Vars+0x284) /* f023fe0: 8c63a244 */ lw $v1,%lo(g_Vars+0x284)($v1) /* f023fe4: 24631bb0 */ addiu $v1,$v1,7088 -/* f023fe8: 0fc2d5ee */ jal func0f0b57b8 +/* f023fe8: 0fc2d5ee */ jal currentPlayerGetLodScaleZ /* f023fec: afa30124 */ sw $v1,0x124($sp) /* f023ff0: 3c09800a */ lui $t1,%hi(g_Vars+0x318) /* f023ff4: 8d29a2d8 */ lw $t1,%lo(g_Vars+0x318)($t1) diff --git a/src/game/game_0b3350.c b/src/game/game_0b3350.c index a7360d683..b0be10200 100644 --- a/src/game/game_0b3350.c +++ b/src/game/game_0b3350.c @@ -2436,12 +2436,13 @@ u32 currentPlayerGetUnk175c(void) return g_Vars.currentplayer->unk175c; } +f32 currentPlayerGetLodScaleZ(void) +{ + return g_Vars.currentplayer->c_lodscalez; +} + GLOBAL_ASM( -glabel func0f0b57b8 -/* f0b57b8: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) -/* f0b57bc: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) -/* f0b57c0: 03e00008 */ jr $ra -/* f0b57c4: c5c01774 */ lwc1 $f0,0x1774($t6) +glabel func0f0b57c8 /* f0b57c8: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) /* f0b57cc: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) /* f0b57d0: 03e00008 */ jr $ra diff --git a/src/game/game_129900.c b/src/game/game_129900.c index 82848dbed..7d2eb1121 100644 --- a/src/game/game_129900.c +++ b/src/game/game_129900.c @@ -439,7 +439,7 @@ glabel var7f1b5584 .L0f129fcc: /* f129fcc: 16e7003f */ bne $s7,$a3,.L0f12a0cc /* f129fd0: 00000000 */ sll $zero,$zero,0x0 -/* f129fd4: 0fc2d5ee */ jal func0f0b57b8 +/* f129fd4: 0fc2d5ee */ jal currentPlayerGetLodScaleZ /* f129fd8: afaa0158 */ sw $t2,0x158($sp) /* f129fdc: 3c02800a */ lui $v0,%hi(g_Vars+0x284) /* f129fe0: 8fa30164 */ lw $v1,0x164($sp) diff --git a/src/game/game_157db0.c b/src/game/game_157db0.c index b287e61bb..9575dd4b4 100644 --- a/src/game/game_157db0.c +++ b/src/game/game_157db0.c @@ -12672,7 +12672,7 @@ glabel func0f162d9c /* f162e60: 8ecd17a4 */ lw $t5,0x17a4($s6) /* f162e64: 55a0000a */ bnezl $t5,.L0f162e90 /* f162e68: 3c01c3fa */ lui $at,0xc3fa -/* f162e6c: 0fc2d5ee */ jal func0f0b57b8 +/* f162e6c: 0fc2d5ee */ jal currentPlayerGetLodScaleZ /* f162e70: 00000000 */ sll $zero,$zero,0x0 /* f162e74: 3c01c3fa */ lui $at,0xc3fa /* f162e78: 44814000 */ mtc1 $at,$f8 diff --git a/src/game/propobj.c b/src/game/propobj.c index 6f7f72244..71e5691a3 100644 --- a/src/game/propobj.c +++ b/src/game/propobj.c @@ -46730,7 +46730,7 @@ glabel func0f08e6bc /* f08e6f8: 45020022 */ bc1fl .L0f08e784 /* f08e6fc: 8fbf0014 */ lw $ra,0x14($sp) /* f08e700: afa20018 */ sw $v0,0x18($sp) -/* f08e704: 0fc2d5ee */ jal func0f0b57b8 +/* f08e704: 0fc2d5ee */ jal currentPlayerGetLodScaleZ /* f08e708: e7b0001c */ swc1 $f16,0x1c($sp) /* f08e70c: 8fa30018 */ lw $v1,0x18($sp) /* f08e710: 8faf0020 */ lw $t7,0x20($sp) @@ -46819,7 +46819,7 @@ glabel func0f08e794 /* f08e840: 45020016 */ bc1fl .L0f08e89c /* f08e844: 8fbf0014 */ lw $ra,0x14($sp) /* f08e848: afa30030 */ sw $v1,0x30($sp) -/* f08e84c: 0fc2d5ee */ jal func0f0b57b8 +/* f08e84c: 0fc2d5ee */ jal currentPlayerGetLodScaleZ /* f08e850: e7ac0020 */ swc1 $f12,0x20($sp) /* f08e854: 8fa30030 */ lw $v1,0x30($sp) /* f08e858: c7ac0020 */ lwc1 $f12,0x20($sp) diff --git a/src/include/game/game_0b3350.h b/src/include/game/game_0b3350.h index baed7c4e4..06d1d4b3d 100644 --- a/src/include/game/game_0b3350.h +++ b/src/include/game/game_0b3350.h @@ -41,7 +41,7 @@ void currentPlayerSetUnk174c(u32 value); u32 currentPlayerGetUnk174c(void); void currentPlayerSetUnk175c(u32 value); u32 currentPlayerGetUnk175c(void); -u32 func0f0b57b8(void); +f32 currentPlayerGetLodScaleZ(void); f32 func0f0b57d8(void); f32 func0f0b57e8(void); f32 func0f0b57f8(void); diff --git a/src/lib/lib_1a500.c b/src/lib/lib_1a500.c index ec806daf0..34aa19e63 100644 --- a/src/lib/lib_1a500.c +++ b/src/lib/lib_1a500.c @@ -2769,7 +2769,7 @@ glabel func0001c664 /* 1c6b8: 10000011 */ beqz $zero,.L0001c700 /* 1c6bc: 8fa2002c */ lw $v0,0x2c($sp) .L0001c6c0: -/* 1c6c0: 0fc2d5ee */ jal func0f0b57b8 +/* 1c6c0: 0fc2d5ee */ jal currentPlayerGetLodScaleZ /* 1c6c4: afa30024 */ sw $v1,0x24($sp) /* 1c6c8: 3c018006 */ lui $at,0x8006 /* 1c6cc: 8fa30024 */ lw $v1,0x24($sp)