From 201d4f6085822cbb28eccfce17880c1e50314e4c Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Mon, 15 Jun 2020 19:03:13 +1000 Subject: [PATCH] Decompile viGetX and viGetY --- src/game/chr/chr.c | 14 +++--- src/game/game_015470.c | 2 +- src/game/game_01afc0.c | 6 +-- src/game/game_097ba0.c | 8 ++-- src/game/game_0b2150.c | 4 +- src/game/game_0d4690.c | 20 ++++----- src/game/game_0d7070.c | 12 ++--- src/game/game_0dcdb0.c | 40 ++++++++--------- src/game/game_0e0770.c | 24 +++++----- src/game/game_0e5ce0.c | 26 +++++------ src/game/game_0f09f0.c | 90 ++++++++++++++++++------------------- src/game/game_0fd660.c | 4 +- src/game/game_102240.c | 8 ++-- src/game/game_107fb0.c | 40 ++++++++--------- src/game/game_1371b0.c | 8 ++-- src/game/game_13c510.c | 2 +- src/game/game_141820.c | 74 +++++++++++++++--------------- src/game/game_1531a0.c | 8 ++-- src/game/game_157db0.c | 4 +- src/game/game_167ae0.c | 4 +- src/game/game_176080.c | 12 ++--- src/game/game_179060.c | 8 ++-- src/game/game_17f930.c | 12 ++--- src/game/game_19c990.c | 8 ++-- src/game/game_1a3340.c | 88 ++++++++++++++++++------------------ src/game/mplayer.c | 12 ++--- src/game/title.c | 42 ++++++++--------- src/include/lib/lib_09660.h | 4 +- src/lib/lib_09660.c | 50 +++++++++------------ src/lib/lib_0c000.c | 6 +-- 30 files changed, 317 insertions(+), 323 deletions(-) diff --git a/src/game/chr/chr.c b/src/game/chr/chr.c index 465b3b3cd..d84b5adfa 100644 --- a/src/game/chr/chr.c +++ b/src/game/chr/chr.c @@ -14820,7 +14820,7 @@ glabel func0f02bdf8 /* f02c160: 00000000 */ sll $zero,$zero,0x0 /* f02c164: e7b400cc */ swc1 $f20,0xcc($sp) .L0f02c168: -/* f02c168: 0c002f02 */ jal func0000bc08 +/* f02c168: 0c002f02 */ jal viGetX /* f02c16c: 00000000 */ sll $zero,$zero,0x0 /* f02c170: 44828000 */ mtc1 $v0,$f16 /* f02c174: c7a400cc */ lwc1 $f4,0xcc($sp) @@ -14829,7 +14829,7 @@ glabel func0f02bdf8 /* f02c180: 00000000 */ sll $zero,$zero,0x0 /* f02c184: 45020008 */ bc1fl .L0f02c1a8 /* f02c188: c7a000d0 */ lwc1 $f0,0xd0($sp) -/* f02c18c: 0c002f02 */ jal func0000bc08 +/* f02c18c: 0c002f02 */ jal viGetX /* f02c190: 00000000 */ sll $zero,$zero,0x0 /* f02c194: 44823000 */ mtc1 $v0,$f6 /* f02c198: 00000000 */ sll $zero,$zero,0x0 @@ -14843,7 +14843,7 @@ glabel func0f02bdf8 /* f02c1b4: 00000000 */ sll $zero,$zero,0x0 /* f02c1b8: e7b400d0 */ swc1 $f20,0xd0($sp) .L0f02c1bc: -/* f02c1bc: 0c002f06 */ jal func0000bc18 +/* f02c1bc: 0c002f06 */ jal viGetY /* f02c1c0: 00000000 */ sll $zero,$zero,0x0 /* f02c1c4: 44825000 */ mtc1 $v0,$f10 /* f02c1c8: c7a000d0 */ lwc1 $f0,0xd0($sp) @@ -14852,7 +14852,7 @@ glabel func0f02bdf8 /* f02c1d4: 00000000 */ sll $zero,$zero,0x0 /* f02c1d8: 45020007 */ bc1fl .L0f02c1f8 /* f02c1dc: c7a400cc */ lwc1 $f4,0xcc($sp) -/* f02c1e0: 0c002f06 */ jal func0000bc18 +/* f02c1e0: 0c002f06 */ jal viGetY /* f02c1e4: 00000000 */ sll $zero,$zero,0x0 /* f02c1e8: 44829000 */ mtc1 $v0,$f18 /* f02c1ec: 00000000 */ sll $zero,$zero,0x0 @@ -14941,7 +14941,7 @@ glabel func0f02bdf8 /* f02c324: 02209025 */ or $s2,$s1,$zero /* f02c328: ac6e0000 */ sw $t6,0x0($v1) /* f02c32c: ac600004 */ sw $zero,0x4($v1) -/* f02c330: 0c002f02 */ jal func0000bc08 +/* f02c330: 0c002f02 */ jal viGetX /* f02c334: 26310008 */ addiu $s1,$s1,0x8 /* f02c338: 2459ffff */ addiu $t9,$v0,-1 /* f02c33c: 332c0fff */ andi $t4,$t9,0xfff @@ -15110,11 +15110,11 @@ glabel func0f02bdf8 /* f02c5a0: 02209825 */ or $s3,$s1,$zero /* f02c5a4: 3c0eed00 */ lui $t6,0xed00 /* f02c5a8: ae6e0000 */ sw $t6,0x0($s3) -/* f02c5ac: 0c002f02 */ jal func0000bc08 +/* f02c5ac: 0c002f02 */ jal viGetX /* f02c5b0: 26310008 */ addiu $s1,$s1,0x8 /* f02c5b4: 00029400 */ sll $s2,$v0,0x10 /* f02c5b8: 0012cc03 */ sra $t9,$s2,0x10 -/* f02c5bc: 0c002f06 */ jal func0000bc18 +/* f02c5bc: 0c002f06 */ jal viGetY /* f02c5c0: 03209025 */ or $s2,$t9,$zero /* f02c5c4: 44825000 */ mtc1 $v0,$f10 /* f02c5c8: 44923000 */ mtc1 $s2,$f6 diff --git a/src/game/game_015470.c b/src/game/game_015470.c index 0d1726693..adf0ef95a 100644 --- a/src/game/game_015470.c +++ b/src/game/game_015470.c @@ -173,7 +173,7 @@ glabel func0f0155f0 /* f015660: ac590000 */ sw $t9,0x0($v0) /* f015664: 26100008 */ addiu $s0,$s0,0x8 /* f015668: afb000fc */ sw $s0,0xfc($sp) -/* f01566c: 0c002f02 */ jal func0000bc08 +/* f01566c: 0c002f02 */ jal viGetX /* f015670: 26100008 */ addiu $s0,$s0,0x8 /* f015674: 244fffff */ addiu $t7,$v0,-1 /* f015678: 8fae00fc */ lw $t6,0xfc($sp) diff --git a/src/game/game_01afc0.c b/src/game/game_01afc0.c index ac5e7f440..8fdb90b5e 100644 --- a/src/game/game_01afc0.c +++ b/src/game/game_01afc0.c @@ -24,7 +24,7 @@ glabel func0f01afc0 /* f01afdc: ac8e0000 */ sw $t6,0x0($a0) /* f01afe0: 24900008 */ addiu $s0,$a0,0x8 /* f01afe4: afb00030 */ sw $s0,0x30($sp) -/* f01afe8: 0c002f02 */ jal func0000bc08 +/* f01afe8: 0c002f02 */ jal viGetX /* f01afec: 26100008 */ addiu $s0,$s0,0x8 /* f01aff0: 2458ffff */ addiu $t8,$v0,-1 /* f01aff4: 8fa90030 */ lw $t1,0x30($sp) @@ -45,9 +45,9 @@ glabel func0f01afc0 /* f01b030: ac6c0004 */ sw $t4,0x4($v1) /* f01b034: 26100008 */ addiu $s0,$s0,0x8 /* f01b038: afb00028 */ sw $s0,0x28($sp) -/* f01b03c: 0c002f02 */ jal func0000bc08 +/* f01b03c: 0c002f02 */ jal viGetX /* f01b040: 26100008 */ addiu $s0,$s0,0x8 -/* f01b044: 0c002f06 */ jal func0000bc18 +/* f01b044: 0c002f06 */ jal viGetY /* f01b048: a7a20022 */ sh $v0,0x22($sp) /* f01b04c: 87b90022 */ lh $t9,0x22($sp) /* f01b050: 244dffff */ addiu $t5,$v0,-1 diff --git a/src/game/game_097ba0.c b/src/game/game_097ba0.c index 88626bc2e..f1295de12 100644 --- a/src/game/game_097ba0.c +++ b/src/game/game_097ba0.c @@ -11486,7 +11486,7 @@ glabel func0f0a0cb0 .L0f0a0e60: /* f0a0e60: 0fc2d5f6 */ jal currentPlayerGetScreenWidth /* f0a0e64: e7a20034 */ swc1 $f2,0x34($sp) -/* f0a0e68: 0c002f06 */ jal func0000bc18 +/* f0a0e68: 0c002f06 */ jal viGetY /* f0a0e6c: e7a0001c */ swc1 $f0,0x1c($sp) /* f0a0e70: 0fc2d60a */ jal currentPlayerGetPerspAspect /* f0a0e74: a7a20022 */ sh $v0,0x22($sp) @@ -11544,7 +11544,7 @@ glabel func0f0a0cb0 .L0f0a0f38: /* f0a0f38: 0fc2d5fa */ jal currentPlayerGetScreenHeight /* f0a0f3c: e7a20034 */ swc1 $f2,0x34($sp) -/* f0a0f40: 0c002f06 */ jal func0000bc18 +/* f0a0f40: 0c002f06 */ jal viGetY /* f0a0f44: e7a0001c */ swc1 $f0,0x1c($sp) /* f0a0f48: c7a20034 */ lwc1 $f2,0x34($sp) /* f0a0f4c: c7aa0038 */ lwc1 $f10,0x38($sp) @@ -21631,11 +21631,11 @@ glabel func0f0a9b68 /* f0a9ca8: 8fa40060 */ lw $a0,0x60($sp) /* f0a9cac: 0fc54e16 */ jal func0f153858 /* f0a9cb0: afad0010 */ sw $t5,0x10($sp) -/* f0a9cb4: 0c002f02 */ jal func0000bc08 +/* f0a9cb4: 0c002f02 */ jal viGetX /* f0a9cb8: afa20060 */ sw $v0,0x60($sp) /* f0a9cbc: 00028400 */ sll $s0,$v0,0x10 /* f0a9cc0: 00107403 */ sra $t6,$s0,0x10 -/* f0a9cc4: 0c002f06 */ jal func0000bc18 +/* f0a9cc4: 0c002f06 */ jal viGetY /* f0a9cc8: 01c08025 */ or $s0,$t6,$zero /* f0a9ccc: 3c0f8008 */ lui $t7,%hi(var8007fb00) /* f0a9cd0: 3c188008 */ lui $t8,%hi(var8007fafc) diff --git a/src/game/game_0b2150.c b/src/game/game_0b2150.c index fb2eaa0cd..e62ca84b2 100644 --- a/src/game/game_0b2150.c +++ b/src/game/game_0b2150.c @@ -214,10 +214,10 @@ glabel func0f0b2150 /* f0b23e8: afaa0048 */ sw $t2,0x48($sp) /* f0b23ec: afab0044 */ sw $t3,0x44($sp) /* f0b23f0: afac0040 */ sw $t4,0x40($sp) -/* f0b23f4: 0c002f02 */ jal func0000bc08 +/* f0b23f4: 0c002f02 */ jal viGetX /* f0b23f8: afad003c */ sw $t5,0x3c($sp) /* f0b23fc: 00021880 */ sll $v1,$v0,0x2 -/* f0b2400: 0c002f06 */ jal func0000bc18 +/* f0b2400: 0c002f06 */ jal viGetY /* f0b2404: afa30028 */ sw $v1,0x28($sp) /* f0b2408: 8fa30028 */ lw $v1,0x28($sp) /* f0b240c: 8fac0040 */ lw $t4,0x40($sp) diff --git a/src/game/game_0d4690.c b/src/game/game_0d4690.c index d7c54ac81..a3c870add 100644 --- a/src/game/game_0d4690.c +++ b/src/game/game_0d4690.c @@ -58,7 +58,7 @@ glabel func0f0d4690 /* f0d46b0: 44804000 */ mtc1 $zero,$f8 /* f0d46b4: e7a4001c */ swc1 $f4,0x1c($sp) /* f0d46b8: e7a60020 */ swc1 $f6,0x20($sp) -/* f0d46bc: 0c002f02 */ jal func0000bc08 +/* f0d46bc: 0c002f02 */ jal viGetX /* f0d46c0: e7a80024 */ swc1 $f8,0x24($sp) /* f0d46c4: 44828000 */ mtc1 $v0,$f16 /* f0d46c8: 3c013f00 */ lui $at,0x3f00 @@ -67,7 +67,7 @@ glabel func0f0d4690 /* f0d46d4: 44813000 */ mtc1 $at,$f6 /* f0d46d8: 46125101 */ sub.s $f4,$f10,$f18 /* f0d46dc: 46062202 */ mul.s $f8,$f4,$f6 -/* f0d46e0: 0c002f06 */ jal func0000bc18 +/* f0d46e0: 0c002f06 */ jal viGetY /* f0d46e4: e7a8001c */ swc1 $f8,0x1c($sp) /* f0d46e8: 44828000 */ mtc1 $v0,$f16 /* f0d46ec: 3c013f00 */ lui $at,0x3f00 @@ -141,13 +141,13 @@ glabel func0f0d479c /* f0d47d8: 8fa50050 */ lw $a1,0x50($sp) /* f0d47dc: 0c00566c */ jal func000159b0 /* f0d47e0: 02002025 */ or $a0,$s0,$zero -/* f0d47e4: 0c002f02 */ jal func0000bc08 +/* f0d47e4: 0c002f02 */ jal viGetX /* f0d47e8: 00000000 */ sll $zero,$zero,0x0 -/* f0d47ec: 0c002f02 */ jal func0000bc08 +/* f0d47ec: 0c002f02 */ jal viGetX /* f0d47f0: a7a20034 */ sh $v0,0x34($sp) -/* f0d47f4: 0c002f06 */ jal func0000bc18 +/* f0d47f4: 0c002f06 */ jal viGetY /* f0d47f8: a7a20036 */ sh $v0,0x36($sp) -/* f0d47fc: 0c002f06 */ jal func0000bc18 +/* f0d47fc: 0c002f06 */ jal viGetY /* f0d4800: a7a20038 */ sh $v0,0x38($sp) /* f0d4804: 87ae0034 */ lh $t6,0x34($sp) /* f0d4808: 87af0036 */ lh $t7,0x36($sp) @@ -218,11 +218,11 @@ glabel func0f0d479c /* f0d490c: 00402025 */ or $a0,$v0,$zero /* f0d4910: 1040001c */ beqz $v0,.L0f0d4984 /* f0d4914: ae020000 */ sw $v0,0x0($s0) -/* f0d4918: 0c002f02 */ jal func0000bc08 +/* f0d4918: 0c002f02 */ jal viGetX /* f0d491c: 00000000 */ sll $zero,$zero,0x0 /* f0d4920: 8e0c0000 */ lw $t4,0x0($s0) /* f0d4924: 00025840 */ sll $t3,$v0,0x1 -/* f0d4928: 0c002f06 */ jal func0000bc18 +/* f0d4928: 0c002f06 */ jal viGetY /* f0d492c: a58b0000 */ sh $t3,0x0($t4) /* f0d4930: 8e0e0000 */ lw $t6,0x0($s0) /* f0d4934: 00026840 */ sll $t5,$v0,0x1 @@ -231,11 +231,11 @@ glabel func0f0d479c /* f0d4940: 8e180000 */ lw $t8,0x0($s0) /* f0d4944: a70f0004 */ sh $t7,0x4($t8) /* f0d4948: 8e190000 */ lw $t9,0x0($s0) -/* f0d494c: 0c002f02 */ jal func0000bc08 +/* f0d494c: 0c002f02 */ jal viGetX /* f0d4950: a7200006 */ sh $zero,0x6($t9) /* f0d4954: 8e090000 */ lw $t1,0x0($s0) /* f0d4958: 00024040 */ sll $t0,$v0,0x1 -/* f0d495c: 0c002f06 */ jal func0000bc18 +/* f0d495c: 0c002f06 */ jal viGetY /* f0d4960: a5280008 */ sh $t0,0x8($t1) /* f0d4964: 8e0b0000 */ lw $t3,0x0($s0) /* f0d4968: 00025040 */ sll $t2,$v0,0x1 diff --git a/src/game/game_0d7070.c b/src/game/game_0d7070.c index 9821457be..3a16adac3 100644 --- a/src/game/game_0d7070.c +++ b/src/game/game_0d7070.c @@ -1068,9 +1068,9 @@ glabel func0f0d78f4 /* f0d7e58: 27af004c */ addiu $t7,$sp,0x4c /* f0d7e5c: 2498002f */ addiu $t8,$a0,0x2f /* f0d7e60: b9e10002 */ swr $at,0x2($t7) -/* f0d7e64: 0c002f02 */ jal func0000bc08 +/* f0d7e64: 0c002f02 */ jal viGetX /* f0d7e68: a3b8004c */ sb $t8,0x4c($sp) -/* f0d7e6c: 0c002f06 */ jal func0000bc18 +/* f0d7e6c: 0c002f06 */ jal viGetY /* f0d7e70: a7a20040 */ sh $v0,0x40($sp) /* f0d7e74: 3c0f8008 */ lui $t7,%hi(var8007fb00) /* f0d7e78: 8deffb00 */ lw $t7,%lo(var8007fb00)($t7) @@ -1098,9 +1098,9 @@ glabel func0f0d78f4 .L0f0d7ed0: /* f0d7ed0: 0fc5b9f1 */ jal langGet /* f0d7ed4: 00000000 */ sll $zero,$zero,0x0 -/* f0d7ed8: 0c002f02 */ jal func0000bc08 +/* f0d7ed8: 0c002f02 */ jal viGetX /* f0d7edc: afa20048 */ sw $v0,0x48($sp) -/* f0d7ee0: 0c002f06 */ jal func0000bc18 +/* f0d7ee0: 0c002f06 */ jal viGetY /* f0d7ee4: a7a20040 */ sh $v0,0x40($sp) /* f0d7ee8: 3c198008 */ lui $t9,%hi(var8007fb08) /* f0d7eec: 8f39fb08 */ lw $t9,%lo(var8007fb08)($t9) @@ -2429,9 +2429,9 @@ glabel var7f1ade50 /* f0d91c0: 240459b7 */ addiu $a0,$zero,0x59b7 /* f0d91c4: 0fc5b9f1 */ jal langGet /* f0d91c8: afa30090 */ sw $v1,0x90($sp) -/* f0d91cc: 0c002f02 */ jal func0000bc08 +/* f0d91cc: 0c002f02 */ jal viGetX /* f0d91d0: 00409025 */ or $s2,$v0,$zero -/* f0d91d4: 0c002f06 */ jal func0000bc18 +/* f0d91d4: 0c002f06 */ jal viGetY /* f0d91d8: a7a20060 */ sh $v0,0x60($sp) /* f0d91dc: 3c0c8008 */ lui $t4,%hi(var8007fb08) /* f0d91e0: 3c0d8008 */ lui $t5,%hi(var8007fb04) diff --git a/src/game/game_0dcdb0.c b/src/game/game_0dcdb0.c index 9dea9e541..871d37087 100644 --- a/src/game/game_0dcdb0.c +++ b/src/game/game_0dcdb0.c @@ -336,9 +336,9 @@ glabel func0f0dcef4 /* f0dd230: 03195821 */ addu $t3,$t8,$t9 /* f0dd234: 256c0003 */ addiu $t4,$t3,0x3 /* f0dd238: afac008c */ sw $t4,0x8c($sp) -/* f0dd23c: 0c002f02 */ jal func0000bc08 +/* f0dd23c: 0c002f02 */ jal viGetX /* f0dd240: afa70088 */ sw $a3,0x88($sp) -/* f0dd244: 0c002f06 */ jal func0000bc18 +/* f0dd244: 0c002f06 */ jal viGetY /* f0dd248: a7a20042 */ sh $v0,0x42($sp) /* f0dd24c: 3c0d8008 */ lui $t5,%hi(var8007fb00) /* f0dd250: 3c0e8008 */ lui $t6,%hi(var8007fafc) @@ -590,9 +590,9 @@ glabel func0f0dd2ac /* f0dd5c4: 27a60074 */ addiu $a2,$sp,0x74 /* f0dd5c8: 0fc54e39 */ jal func0f1538e4 /* f0dd5cc: 27a70068 */ addiu $a3,$sp,0x68 -/* f0dd5d0: 0c002f02 */ jal func0000bc08 +/* f0dd5d0: 0c002f02 */ jal viGetX /* f0dd5d4: afa200c0 */ sw $v0,0xc0($sp) -/* f0dd5d8: 0c002f06 */ jal func0000bc18 +/* f0dd5d8: 0c002f06 */ jal viGetY /* f0dd5dc: a7a2004c */ sh $v0,0x4c($sp) /* f0dd5e0: 8fa300c4 */ lw $v1,0xc4($sp) /* f0dd5e4: 240100ff */ addiu $at,$zero,0xff @@ -656,9 +656,9 @@ glabel func0f0dd2ac /* f0dd6cc: 27a60074 */ addiu $a2,$sp,0x74 /* f0dd6d0: 0fc54e39 */ jal func0f1538e4 /* f0dd6d4: 27a70068 */ addiu $a3,$sp,0x68 -/* f0dd6d8: 0c002f02 */ jal func0000bc08 +/* f0dd6d8: 0c002f02 */ jal viGetX /* f0dd6dc: afa200c0 */ sw $v0,0xc0($sp) -/* f0dd6e0: 0c002f06 */ jal func0000bc18 +/* f0dd6e0: 0c002f06 */ jal viGetY /* f0dd6e4: a7a2004c */ sh $v0,0x4c($sp) /* f0dd6e8: 3c098008 */ lui $t1,%hi(var8007fb00) /* f0dd6ec: 3c0a8008 */ lui $t2,%hi(var8007fafc) @@ -719,9 +719,9 @@ glabel func0f0dd2ac /* f0dd7c8: 27a60074 */ addiu $a2,$sp,0x74 /* f0dd7cc: 0fc54e39 */ jal func0f1538e4 /* f0dd7d0: 27a70068 */ addiu $a3,$sp,0x68 -/* f0dd7d4: 0c002f02 */ jal func0000bc08 +/* f0dd7d4: 0c002f02 */ jal viGetX /* f0dd7d8: afa200c0 */ sw $v0,0xc0($sp) -/* f0dd7dc: 0c002f06 */ jal func0000bc18 +/* f0dd7dc: 0c002f06 */ jal viGetY /* f0dd7e0: a7a2004c */ sh $v0,0x4c($sp) /* f0dd7e4: 3c0a8008 */ lui $t2,%hi(var8007fb00) /* f0dd7e8: 3c0b8008 */ lui $t3,%hi(var8007fafc) @@ -3963,11 +3963,11 @@ glabel var7f1adef4 /* f0e0014: 2706fffd */ addiu $a2,$t8,-3 /* f0e0018: 0fc37612 */ jal func0f0dd848 /* f0e001c: 25c5fffd */ addiu $a1,$t6,-3 -/* f0e0020: 0c002f02 */ jal func0000bc08 +/* f0e0020: 0c002f02 */ jal viGetX /* f0e0024: 00409025 */ or $s2,$v0,$zero /* f0e0028: 00028c00 */ sll $s1,$v0,0x10 /* f0e002c: 00115403 */ sra $t2,$s1,0x10 -/* f0e0030: 0c002f06 */ jal func0000bc18 +/* f0e0030: 0c002f06 */ jal viGetY /* f0e0034: 01408825 */ or $s1,$t2,$zero /* f0e0038: 8e080008 */ lw $t0,0x8($s0) /* f0e003c: 02402025 */ or $a0,$s2,$zero @@ -3994,11 +3994,11 @@ glabel var7f1adef4 /* f0e008c: afb80010 */ sw $t8,0x10($sp) /* f0e0090: 0fc54e8d */ jal func0f153a34 /* f0e0094: 01c53821 */ addu $a3,$t6,$a1 -/* f0e0098: 0c002f02 */ jal func0000bc08 +/* f0e0098: 0c002f02 */ jal viGetX /* f0e009c: 00409025 */ or $s2,$v0,$zero /* f0e00a0: 00028c00 */ sll $s1,$v0,0x10 /* f0e00a4: 00114c03 */ sra $t1,$s1,0x10 -/* f0e00a8: 0c002f06 */ jal func0000bc18 +/* f0e00a8: 0c002f06 */ jal viGetY /* f0e00ac: 01208825 */ or $s1,$t1,$zero /* f0e00b0: 8e0b0008 */ lw $t3,0x8($s0) /* f0e00b4: 02402025 */ or $a0,$s2,$zero @@ -4066,11 +4066,11 @@ glabel var7f1adef4 /* f0e019c: 02402025 */ or $a0,$s2,$zero /* f0e01a0: 0fc37612 */ jal func0f0dd848 /* f0e01a4: 2566fffd */ addiu $a2,$t3,-3 -/* f0e01a8: 0c002f02 */ jal func0000bc08 +/* f0e01a8: 0c002f02 */ jal viGetX /* f0e01ac: 00409025 */ or $s2,$v0,$zero /* f0e01b0: 00028c00 */ sll $s1,$v0,0x10 /* f0e01b4: 00116c03 */ sra $t5,$s1,0x10 -/* f0e01b8: 0c002f06 */ jal func0000bc18 +/* f0e01b8: 0c002f06 */ jal viGetY /* f0e01bc: 01a08825 */ or $s1,$t5,$zero /* f0e01c0: 8e190008 */ lw $t9,0x8($s0) /* f0e01c4: 02402025 */ or $a0,$s2,$zero @@ -4099,11 +4099,11 @@ glabel var7f1adef4 /* f0e021c: 02402025 */ or $a0,$s2,$zero /* f0e0220: 0fc54e8d */ jal func0f153a34 /* f0e0224: 01253821 */ addu $a3,$t1,$a1 -/* f0e0228: 0c002f02 */ jal func0000bc08 +/* f0e0228: 0c002f02 */ jal viGetX /* f0e022c: 00409025 */ or $s2,$v0,$zero /* f0e0230: 00028c00 */ sll $s1,$v0,0x10 /* f0e0234: 00116403 */ sra $t4,$s1,0x10 -/* f0e0238: 0c002f06 */ jal func0000bc18 +/* f0e0238: 0c002f06 */ jal viGetY /* f0e023c: 01808825 */ or $s1,$t4,$zero /* f0e0240: 8e0e0008 */ lw $t6,0x8($s0) /* f0e0244: 02402025 */ or $a0,$s2,$zero @@ -4231,11 +4231,11 @@ glabel var7f1adef4 /* f0e0410: 2565fffd */ addiu $a1,$t3,-3 /* f0e0414: 0fc37612 */ jal func0f0dd848 /* f0e0418: 2586fffd */ addiu $a2,$t4,-3 -/* f0e041c: 0c002f02 */ jal func0000bc08 +/* f0e041c: 0c002f02 */ jal viGetX /* f0e0420: 00409025 */ or $s2,$v0,$zero /* f0e0424: 00028c00 */ sll $s1,$v0,0x10 /* f0e0428: 00114c03 */ sra $t1,$s1,0x10 -/* f0e042c: 0c002f06 */ jal func0000bc18 +/* f0e042c: 0c002f06 */ jal viGetY /* f0e0430: 01208825 */ or $s1,$t1,$zero /* f0e0434: 8e180008 */ lw $t8,0x8($s0) /* f0e0438: 02402025 */ or $a0,$s2,$zero @@ -4261,11 +4261,11 @@ glabel var7f1adef4 /* f0e0484: afac0010 */ sw $t4,0x10($sp) /* f0e0488: 0fc54e8d */ jal func0f153a34 /* f0e048c: 01653821 */ addu $a3,$t3,$a1 -/* f0e0490: 0c002f02 */ jal func0000bc08 +/* f0e0490: 0c002f02 */ jal viGetX /* f0e0494: 00409025 */ or $s2,$v0,$zero /* f0e0498: 00028c00 */ sll $s1,$v0,0x10 /* f0e049c: 0011cc03 */ sra $t9,$s1,0x10 -/* f0e04a0: 0c002f06 */ jal func0000bc18 +/* f0e04a0: 0c002f06 */ jal viGetY /* f0e04a4: 03208825 */ or $s1,$t9,$zero /* f0e04a8: 8e0f0008 */ lw $t7,0x8($s0) /* f0e04ac: 02402025 */ or $a0,$s2,$zero diff --git a/src/game/game_0e0770.c b/src/game/game_0e0770.c index 409a23749..b62658d68 100644 --- a/src/game/game_0e0770.c +++ b/src/game/game_0e0770.c @@ -80,7 +80,7 @@ glabel func0f0e0770 /* f0e0794: afb1001c */ sw $s1,0x1c($sp) /* f0e0798: 0c002acb */ jal func0000ab2c /* f0e079c: afb00018 */ sw $s0,0x18($sp) -/* f0e07a0: 0c002f02 */ jal func0000bc08 +/* f0e07a0: 0c002f02 */ jal viGetX /* f0e07a4: 00408025 */ or $s0,$v0,$zero /* f0e07a8: 3c0e8007 */ lui $t6,%hi(g_HiResActive) /* f0e07ac: 8dce06c8 */ lw $t6,%lo(g_HiResActive)($t6) @@ -228,9 +228,9 @@ glabel func0f0e0998 /* f0e09b8: afa60090 */ sw $a2,0x90($sp) /* f0e09bc: 15c10013 */ bne $t6,$at,.L0f0e0a0c /* f0e09c0: afa70094 */ sw $a3,0x94($sp) -/* f0e09c4: 0c002f02 */ jal func0000bc08 +/* f0e09c4: 0c002f02 */ jal viGetX /* f0e09c8: 00000000 */ sll $zero,$zero,0x0 -/* f0e09cc: 0c002f06 */ jal func0000bc18 +/* f0e09cc: 0c002f06 */ jal viGetY /* f0e09d0: a7a20030 */ sh $v0,0x30($sp) /* f0e09d4: 240f00ff */ addiu $t7,$zero,0xff /* f0e09d8: 241800ff */ addiu $t8,$zero,0xff @@ -4238,7 +4238,7 @@ glabel func0f0e4190 /* f0e4594: afb00028 */ sw $s0,0x28($sp) /* f0e4598: 3c01800a */ lui $at,%hi(var8009de98) /* f0e459c: 00808025 */ or $s0,$a0,$zero -/* f0e45a0: 0c002f06 */ jal func0000bc18 +/* f0e45a0: 0c002f06 */ jal viGetY /* f0e45a4: ac20de98 */ sw $zero,%lo(var8009de98)($at) /* f0e45a8: 04410003 */ bgez $v0,.L0f0e45b8 /* f0e45ac: 00027043 */ sra $t6,$v0,0x1 @@ -4260,9 +4260,9 @@ glabel func0f0e4190 /* f0e45e8: 350886a0 */ ori $t0,$t0,0x86a0 /* f0e45ec: 3c01800a */ lui $at,%hi(var8009de94) /* f0e45f0: 00408025 */ or $s0,$v0,$zero -/* f0e45f4: 0c002f06 */ jal func0000bc18 +/* f0e45f4: 0c002f06 */ jal viGetY /* f0e45f8: ac28de94 */ sw $t0,%lo(var8009de94)($at) -/* f0e45fc: 0c002f06 */ jal func0000bc18 +/* f0e45fc: 0c002f06 */ jal viGetY /* f0e4600: a7a20034 */ sh $v0,0x34($sp) /* f0e4604: 87a60034 */ lh $a2,0x34($sp) /* f0e4608: 3c0300ff */ lui $v1,0xff @@ -4278,9 +4278,9 @@ glabel func0f0e4190 /* f0e4630: 240707d0 */ addiu $a3,$zero,0x7d0 /* f0e4634: 0fc35343 */ jal func0f0d4d0c /* f0e4638: 24c6000a */ addiu $a2,$a2,0xa -/* f0e463c: 0c002f06 */ jal func0000bc18 +/* f0e463c: 0c002f06 */ jal viGetY /* f0e4640: 00408025 */ or $s0,$v0,$zero -/* f0e4644: 0c002f06 */ jal func0000bc18 +/* f0e4644: 0c002f06 */ jal viGetY /* f0e4648: a7a20034 */ sh $v0,0x34($sp) /* f0e464c: 87a60034 */ lh $a2,0x34($sp) /* f0e4650: 3c03ffff */ lui $v1,0xffff @@ -5225,11 +5225,11 @@ glabel func0f0e5000 /* f0e5454: afb3001c */ sw $s3,0x1c($sp) /* f0e5458: 0fc35343 */ jal func0f0d4d0c /* f0e545c: afb20150 */ sw $s2,0x150($sp) -/* f0e5460: 0c002f06 */ jal func0000bc18 +/* f0e5460: 0c002f06 */ jal viGetY /* f0e5464: afa20150 */ sw $v0,0x150($sp) /* f0e5468: 00028400 */ sll $s0,$v0,0x10 /* f0e546c: 00107403 */ sra $t6,$s0,0x10 -/* f0e5470: 0c002f06 */ jal func0000bc18 +/* f0e5470: 0c002f06 */ jal viGetY /* f0e5474: 01c08025 */ or $s0,$t6,$zero /* f0e5478: 3c039090 */ lui $v1,0x9090 /* f0e547c: 3463907f */ ori $v1,$v1,0x907f @@ -5260,11 +5260,11 @@ glabel func0f0e5000 /* f0e54dc: 240707d0 */ addiu $a3,$zero,0x7d0 /* f0e54e0: 0fc35343 */ jal func0f0d4d0c /* f0e54e4: afb20150 */ sw $s2,0x150($sp) -/* f0e54e8: 0c002f06 */ jal func0000bc18 +/* f0e54e8: 0c002f06 */ jal viGetY /* f0e54ec: afa20150 */ sw $v0,0x150($sp) /* f0e54f0: 00028400 */ sll $s0,$v0,0x10 /* f0e54f4: 00105c03 */ sra $t3,$s0,0x10 -/* f0e54f8: 0c002f06 */ jal func0000bc18 +/* f0e54f8: 0c002f06 */ jal viGetY /* f0e54fc: 01608025 */ or $s0,$t3,$zero /* f0e5500: 3c036200 */ lui $v1,0x6200 /* f0e5504: 3463947f */ ori $v1,$v1,0x947f diff --git a/src/game/game_0e5ce0.c b/src/game/game_0e5ce0.c index 09d48c045..9fa0384e7 100644 --- a/src/game/game_0e5ce0.c +++ b/src/game/game_0e5ce0.c @@ -5405,7 +5405,7 @@ glabel menuRenderItemCustom /* f0e6ecc: afa40094 */ sw $a0,0x94($sp) .L0f0e6ed0: /* f0e6ed0: afa50090 */ sw $a1,0x90($sp) -/* f0e6ed4: 0c002f02 */ jal func0000bc08 +/* f0e6ed4: 0c002f02 */ jal viGetX /* f0e6ed8: afa7008c */ sw $a3,0x8c($sp) /* f0e6edc: 3c0a8008 */ lui $t2,%hi(var8007fac0) /* f0e6ee0: 8d4afac0 */ lw $t2,%lo(var8007fac0)($t2) @@ -5429,7 +5429,7 @@ glabel menuRenderItemCustom /* f0e6f20: 50200014 */ beqzl $at,.L0f0e6f74 /* f0e6f24: afa40094 */ sw $a0,0x94($sp) /* f0e6f28: afa50090 */ sw $a1,0x90($sp) -/* f0e6f2c: 0c002f02 */ jal func0000bc08 +/* f0e6f2c: 0c002f02 */ jal viGetX /* f0e6f30: afa7008c */ sw $a3,0x8c($sp) /* f0e6f34: 3c198008 */ lui $t9,%hi(var8007fac0) /* f0e6f38: 8f39fac0 */ lw $t9,%lo(var8007fac0)($t9) @@ -5451,7 +5451,7 @@ glabel menuRenderItemCustom /* f0e6f70: afa40094 */ sw $a0,0x94($sp) .L0f0e6f74: /* f0e6f74: afa50090 */ sw $a1,0x90($sp) -/* f0e6f78: 0c002f02 */ jal func0000bc08 +/* f0e6f78: 0c002f02 */ jal viGetX /* f0e6f7c: afa7008c */ sw $a3,0x8c($sp) /* f0e6f80: 3c0b8008 */ lui $t3,%hi(var8007fac0) /* f0e6f84: 8d6bfac0 */ lw $t3,%lo(var8007fac0)($t3) @@ -5475,7 +5475,7 @@ glabel menuRenderItemCustom /* f0e6fc4: 50200014 */ beqzl $at,.L0f0e7018 /* f0e6fc8: 02401025 */ or $v0,$s2,$zero /* f0e6fcc: afa40094 */ sw $a0,0x94($sp) -/* f0e6fd0: 0c002f02 */ jal func0000bc08 +/* f0e6fd0: 0c002f02 */ jal viGetX /* f0e6fd4: afa50090 */ sw $a1,0x90($sp) /* f0e6fd8: 3c0e8008 */ lui $t6,%hi(var8007fac0) /* f0e6fdc: 8dcefac0 */ lw $t6,%lo(var8007fac0)($t6) @@ -5838,7 +5838,7 @@ glabel menuRenderItemCustom /* f0e7500: 01ee5021 */ addu $t2,$t7,$t6 /* f0e7504: 0fc5b9f1 */ jal langGet /* f0e7508: afaa012c */ sw $t2,0x12c($sp) -/* f0e750c: 0c002f06 */ jal func0000bc18 +/* f0e750c: 0c002f06 */ jal viGetY /* f0e7510: 00409825 */ or $s3,$v0,$zero /* f0e7514: 8fad00e8 */ lw $t5,0xe8($sp) /* f0e7518: 8fb800f4 */ lw $t8,0xf4($sp) @@ -15087,11 +15087,11 @@ glabel func0f0efbb4 /* f0efc88: afa80094 */ sw $t0,0x94($sp) /* f0efc8c: 0fc5b9f1 */ jal langGet /* f0efc90: 94840074 */ lhu $a0,0x74($a0) -/* f0efc94: 0c002f02 */ jal func0000bc08 +/* f0efc94: 0c002f02 */ jal viGetX /* f0efc98: 00409025 */ or $s2,$v0,$zero /* f0efc9c: 00028400 */ sll $s0,$v0,0x10 /* f0efca0: 00105403 */ sra $t2,$s0,0x10 -/* f0efca4: 0c002f06 */ jal func0000bc18 +/* f0efca4: 0c002f06 */ jal viGetY /* f0efca8: 01408025 */ or $s0,$t2,$zero /* f0efcac: 3c0b8008 */ lui $t3,%hi(var8007fb08) /* f0efcb0: 3c0c8008 */ lui $t4,%hi(var8007fb04) @@ -15156,11 +15156,11 @@ glabel func0f0efbb4 .L0f0efd84: /* f0efd84: 0fc5b9f1 */ jal langGet /* f0efd88: 00000000 */ sll $zero,$zero,0x0 -/* f0efd8c: 0c002f02 */ jal func0000bc08 +/* f0efd8c: 0c002f02 */ jal viGetX /* f0efd90: 00409025 */ or $s2,$v0,$zero /* f0efd94: 00028400 */ sll $s0,$v0,0x10 /* f0efd98: 00104c03 */ sra $t1,$s0,0x10 -/* f0efd9c: 0c002f06 */ jal func0000bc18 +/* f0efd9c: 0c002f06 */ jal viGetY /* f0efda0: 01208025 */ or $s0,$t1,$zero /* f0efda4: 3c0a8008 */ lui $t2,%hi(var8007fb08) /* f0efda8: 3c0b8008 */ lui $t3,%hi(var8007fb04) @@ -15534,9 +15534,9 @@ glabel menuRenderItemController /* f0f0314: afa90090 */ sw $t1,0x90($sp) /* f0f0318: 844b0002 */ lh $t3,0x2($v0) /* f0f031c: 256a0002 */ addiu $t2,$t3,0x2 -/* f0f0320: 0c002f02 */ jal func0000bc08 +/* f0f0320: 0c002f02 */ jal viGetX /* f0f0324: afaa008c */ sw $t2,0x8c($sp) -/* f0f0328: 0c002f06 */ jal func0000bc18 +/* f0f0328: 0c002f06 */ jal viGetY /* f0f032c: a7a20048 */ sh $v0,0x48($sp) /* f0f0330: 3c0c8008 */ lui $t4,%hi(var8007fb10) /* f0f0334: 3c0d8008 */ lui $t5,%hi(var8007fb0c) @@ -15654,9 +15654,9 @@ glabel menuRenderItemController /* f0f04f0: afa200a0 */ sw $v0,0xa0($sp) /* f0f04f4: 0fc5b9f1 */ jal langGet /* f0f04f8: 240454d8 */ addiu $a0,$zero,0x54d8 -/* f0f04fc: 0c002f02 */ jal func0000bc08 +/* f0f04fc: 0c002f02 */ jal viGetX /* f0f0500: 00408025 */ or $s0,$v0,$zero -/* f0f0504: 0c002f06 */ jal func0000bc18 +/* f0f0504: 0c002f06 */ jal viGetY /* f0f0508: a7a20048 */ sh $v0,0x48($sp) /* f0f050c: 3c098008 */ lui $t1,%hi(var8007fb10) /* f0f0510: 3c0b8008 */ lui $t3,%hi(var8007fb0c) diff --git a/src/game/game_0f09f0.c b/src/game/game_0f09f0.c index 60f49288d..fa560a02e 100644 --- a/src/game/game_0f09f0.c +++ b/src/game/game_0f09f0.c @@ -771,11 +771,11 @@ glabel func0f0f0ce8 /* f0f1064: afa60084 */ sw $a2,0x84($sp) /* f0f1068: 0fc5b9f1 */ jal langGet /* f0f106c: afa30044 */ sw $v1,0x44($sp) -/* f0f1070: 0c002f02 */ jal func0000bc08 +/* f0f1070: 0c002f02 */ jal viGetX /* f0f1074: afa2004c */ sw $v0,0x4c($sp) /* f0f1078: 00028400 */ sll $s0,$v0,0x10 /* f0f107c: 00107403 */ sra $t6,$s0,0x10 -/* f0f1080: 0c002f02 */ jal func0000bc08 +/* f0f1080: 0c002f02 */ jal viGetX /* f0f1084: 01c08025 */ or $s0,$t6,$zero /* f0f1088: 8fb90064 */ lw $t9,0x64($sp) /* f0f108c: 8fb80060 */ lw $t8,0x60($sp) @@ -808,11 +808,11 @@ glabel func0f0f0ce8 /* f0f10f4: afa60084 */ sw $a2,0x84($sp) /* f0f10f8: 0fc5b9f1 */ jal langGet /* f0f10fc: 240451ef */ addiu $a0,$zero,0x51ef -/* f0f1100: 0c002f02 */ jal func0000bc08 +/* f0f1100: 0c002f02 */ jal viGetX /* f0f1104: afa2004c */ sw $v0,0x4c($sp) /* f0f1108: 00028400 */ sll $s0,$v0,0x10 /* f0f110c: 00107403 */ sra $t6,$s0,0x10 -/* f0f1110: 0c002f02 */ jal func0000bc08 +/* f0f1110: 0c002f02 */ jal viGetX /* f0f1114: 01c08025 */ or $s0,$t6,$zero /* f0f1118: 8fb90064 */ lw $t9,0x64($sp) /* f0f111c: 8fb80060 */ lw $t8,0x60($sp) @@ -844,11 +844,11 @@ glabel func0f0f0ce8 /* f0f1180: 95e40000 */ lhu $a0,0x0($t7) /* f0f1184: 0fc5b9f1 */ jal langGet /* f0f1188: afa60084 */ sw $a2,0x84($sp) -/* f0f118c: 0c002f02 */ jal func0000bc08 +/* f0f118c: 0c002f02 */ jal viGetX /* f0f1190: afa2004c */ sw $v0,0x4c($sp) /* f0f1194: 00028400 */ sll $s0,$v0,0x10 /* f0f1198: 00107403 */ sra $t6,$s0,0x10 -/* f0f119c: 0c002f02 */ jal func0000bc08 +/* f0f119c: 0c002f02 */ jal viGetX /* f0f11a0: 01c08025 */ or $s0,$t6,$zero /* f0f11a4: 8fb90064 */ lw $t9,0x64($sp) /* f0f11a8: 8fb80060 */ lw $t8,0x60($sp) @@ -881,11 +881,11 @@ glabel func0f0f0ce8 /* f0f1210: afa60084 */ sw $a2,0x84($sp) /* f0f1214: 0fc5b9f1 */ jal langGet /* f0f1218: 240451ef */ addiu $a0,$zero,0x51ef -/* f0f121c: 0c002f02 */ jal func0000bc08 +/* f0f121c: 0c002f02 */ jal viGetX /* f0f1220: afa2004c */ sw $v0,0x4c($sp) /* f0f1224: 00028400 */ sll $s0,$v0,0x10 /* f0f1228: 00107c03 */ sra $t7,$s0,0x10 -/* f0f122c: 0c002f02 */ jal func0000bc08 +/* f0f122c: 0c002f02 */ jal viGetX /* f0f1230: 01e08025 */ or $s0,$t7,$zero /* f0f1234: 8fae0064 */ lw $t6,0x64($sp) /* f0f1238: 8fb90060 */ lw $t9,0x60($sp) @@ -920,11 +920,11 @@ glabel func0f0f0ce8 /* f0f12a8: 01ac7821 */ addu $t7,$t5,$t4 /* f0f12ac: 25eefff9 */ addiu $t6,$t7,-7 /* f0f12b0: afae0088 */ sw $t6,0x88($sp) -/* f0f12b4: 0c002f02 */ jal func0000bc08 +/* f0f12b4: 0c002f02 */ jal viGetX /* f0f12b8: afa60084 */ sw $a2,0x84($sp) /* f0f12bc: 00028400 */ sll $s0,$v0,0x10 /* f0f12c0: 0010cc03 */ sra $t9,$s0,0x10 -/* f0f12c4: 0c002f02 */ jal func0000bc08 +/* f0f12c4: 0c002f02 */ jal viGetX /* f0f12c8: 03208025 */ or $s0,$t9,$zero /* f0f12cc: 3c188008 */ lui $t8,%hi(var8007fb08) /* f0f12d0: 3c0b8008 */ lui $t3,%hi(var8007fb04) @@ -3036,7 +3036,7 @@ glabel menuPushDialog /* f0f305c: 028b3021 */ addu $a2,$s4,$t3 /* f0f3060: 0fc3cb3d */ jal func0f0f2cf4 /* f0f3064: 00000000 */ sll $zero,$zero,0x0 -/* f0f3068: 0c002f02 */ jal func0000bc08 +/* f0f3068: 0c002f02 */ jal viGetX /* f0f306c: 00000000 */ sll $zero,$zero,0x0 /* f0f3070: 8e0c001c */ lw $t4,0x1c($s0) /* f0f3074: 004c6823 */ subu $t5,$v0,$t4 @@ -3045,7 +3045,7 @@ glabel menuPushDialog /* f0f3080: 25a10001 */ addiu $at,$t5,0x1 /* f0f3084: 00017043 */ sra $t6,$at,0x1 .L0f0f3088: -/* f0f3088: 0c002f06 */ jal func0000bc18 +/* f0f3088: 0c002f06 */ jal viGetY /* f0f308c: ae0e002c */ sw $t6,0x2c($s0) /* f0f3090: 8e0f0020 */ lw $t7,0x20($s0) /* f0f3094: 004fc023 */ subu $t8,$v0,$t7 @@ -3103,7 +3103,7 @@ glabel menuPushDialog /* f0f315c: 0fc3cb3d */ jal func0f0f2cf4 /* f0f3160: 00000000 */ sll $zero,$zero,0x0 /* f0f3164: ae130014 */ sw $s3,0x14($s0) -/* f0f3168: 0c002f06 */ jal func0000bc18 +/* f0f3168: 0c002f06 */ jal viGetY /* f0f316c: ae13002c */ sw $s3,0x2c($s0) /* f0f3170: 8e180020 */ lw $t8,0x20($s0) /* f0f3174: a200003c */ sb $zero,0x3c($s0) @@ -3181,8 +3181,8 @@ glabel menuPushDialog // // func0f0f2cf4(dialog, frame, &g_MenuStack[g_MpPlayerNum]); // -// frame->unk2c = (func0000bc08() - frame->unk1c) / 2; -// frame->unk30 = (func0000bc18() - frame->unk20) / 2; +// frame->unk2c = (viGetX() - frame->unk1c) / 2; +// frame->unk30 = (viGetY() - frame->unk20) / 2; // // g_MenuStack[g_MpPlayerNum].unke40 |= 0x80; // sibling = dialog->nextsibling; @@ -3203,7 +3203,7 @@ glabel menuPushDialog // // frame->unk14 = -320; // frame->unk2c = -320; -// frame->unk18 = (func0000bc18() - frame->unk20) / 2; +// frame->unk18 = (viGetY() - frame->unk20) / 2; // frame->unk30 = frame->unk18; // frame->unk3c = 0; // @@ -5044,7 +5044,7 @@ glabel var7f1b2948 /* f0f4c74: c4680038 */ lwc1 $f8,0x38($v1) /* f0f4c78: 0fc2d341 */ jal func0f0b4d04 /* f0f4c7c: e7a800d8 */ swc1 $f8,0xd8($sp) -/* f0f4c80: 0c002f02 */ jal func0000bc08 +/* f0f4c80: 0c002f02 */ jal viGetX /* f0f4c84: 00000000 */ sll $zero,$zero,0x0 /* f0f4c88: c7a400c8 */ lwc1 $f4,0xc8($sp) /* f0f4c8c: 3c198008 */ lui $t9,%hi(var8007fac0) @@ -5072,7 +5072,7 @@ glabel var7f1b2948 /* f0f4cd8: 3c01800a */ lui $at,%hi(var8009de98) /* f0f4cdc: 00005812 */ mflo $t3 /* f0f4ce0: ac2bde98 */ sw $t3,%lo(var8009de98)($at) -/* f0f4ce4: 0c002f06 */ jal func0000bc18 +/* f0f4ce4: 0c002f06 */ jal viGetY /* f0f4ce8: 00000000 */ sll $zero,$zero,0x0 /* f0f4cec: c7aa00cc */ lwc1 $f10,0xcc($sp) /* f0f4cf0: 4600520d */ trunc.w.s $f8,$f10 @@ -6137,7 +6137,7 @@ glabel func0f0f5360 /* f0f5c34: 24630003 */ addiu $v1,$v1,0x3 /* f0f5c38: 24a50003 */ addiu $a1,$a1,0x3 /* f0f5c3c: afa501cc */ sw $a1,0x1cc($sp) -/* f0f5c40: 0c002f06 */ jal func0000bc18 +/* f0f5c40: 0c002f06 */ jal viGetY /* f0f5c44: afa301d0 */ sw $v1,0x1d0($sp) /* f0f5c48: 8faf01bc */ lw $t7,0x1bc($sp) /* f0f5c4c: 3c118008 */ lui $s1,%hi(var8007fb10) @@ -6162,7 +6162,7 @@ glabel func0f0f5360 /* f0f5c98: afae001c */ sw $t6,0x1c($sp) /* f0f5c9c: afa201e8 */ sw $v0,0x1e8($sp) /* f0f5ca0: afb201d0 */ sw $s2,0x1d0($sp) -/* f0f5ca4: 0c002f06 */ jal func0000bc18 +/* f0f5ca4: 0c002f06 */ jal viGetY /* f0f5ca8: afb001cc */ sw $s0,0x1cc($sp) /* f0f5cac: 8e2b0000 */ lw $t3,0x0($s1) /* f0f5cb0: 8e6c0000 */ lw $t4,0x0($s3) @@ -6196,7 +6196,7 @@ glabel func0f0f5360 /* f0f5d1c: 8fa30088 */ lw $v1,0x88($sp) /* f0f5d20: afb001cc */ sw $s0,0x1cc($sp) /* f0f5d24: 2463fff7 */ addiu $v1,$v1,-9 -/* f0f5d28: 0c002f06 */ jal func0000bc18 +/* f0f5d28: 0c002f06 */ jal viGetY /* f0f5d2c: afa301d0 */ sw $v1,0x1d0($sp) /* f0f5d30: 3c0f8007 */ lui $t7,%hi(g_MpPlayerNum) /* f0f5d34: 8def1448 */ lw $t7,%lo(g_MpPlayerNum)($t7) @@ -7689,7 +7689,7 @@ glabel func0f0f5360 /* f0f7324: afa301d0 */ sw $v1,0x1d0($sp) /* f0f7328: afae01cc */ sw $t6,0x1cc($sp) .L0f0f732c: -/* f0f732c: 0c002f06 */ jal func0000bc18 +/* f0f732c: 0c002f06 */ jal viGetY /* f0f7330: 00000000 */ sll $zero,$zero,0x0 /* f0f7334: 8e4b0000 */ lw $t3,0x0($s2) /* f0f7338: 8e780000 */ lw $t8,0x0($s3) @@ -7750,7 +7750,7 @@ glabel func0f0f5360 /* f0f740c: afa301d0 */ sw $v1,0x1d0($sp) /* f0f7410: afad01cc */ sw $t5,0x1cc($sp) .L0f0f7414: -/* f0f7414: 0c002f06 */ jal func0000bc18 +/* f0f7414: 0c002f06 */ jal viGetY /* f0f7418: 00000000 */ sll $zero,$zero,0x0 /* f0f741c: 8e590000 */ lw $t9,0x0($s2) /* f0f7420: 8e6e0000 */ lw $t6,0x0($s3) @@ -9199,7 +9199,7 @@ glabel func0f0f86a8 /* f0f8710: 14410056 */ bne $v0,$at,.L0f0f886c /* f0f8714: 3c0d8007 */ lui $t5,%hi(var800714e0) .L0f0f8718: -/* f0f8718: 0c002f02 */ jal func0000bc08 +/* f0f8718: 0c002f02 */ jal viGetX /* f0f871c: 00000000 */ sll $zero,$zero,0x0 /* f0f8720: 3c0e8008 */ lui $t6,%hi(var8007fac0) /* f0f8724: 8dcefac0 */ lw $t6,%lo(var8007fac0)($t6) @@ -9239,7 +9239,7 @@ glabel func0f0f86a8 .L0f0f87a4: /* f0f87a4: 3c01800a */ lui $at,%hi(var8009de98) /* f0f87a8: 01b8c823 */ subu $t9,$t5,$t8 -/* f0f87ac: 0c002f06 */ jal func0000bc18 +/* f0f87ac: 0c002f06 */ jal viGetY /* f0f87b0: ac39de98 */ sw $t9,%lo(var8009de98)($at) /* f0f87b4: 3c0b8007 */ lui $t3,%hi(g_MpPlayerNum) /* f0f87b8: 8d6b1448 */ lw $t3,%lo(g_MpPlayerNum)($t3) @@ -12650,9 +12650,9 @@ glabel var7f1b2af4 /* f0fb65c: 0fc54df7 */ jal func0f1537dc /* f0fb660: 00000000 */ sll $zero,$zero,0x0 /* f0fb664: afa20070 */ sw $v0,0x70($sp) -/* f0fb668: 0c002f02 */ jal func0000bc08 +/* f0fb668: 0c002f02 */ jal viGetX /* f0fb66c: 24500008 */ addiu $s0,$v0,0x8 -/* f0fb670: 0c002f06 */ jal func0000bc18 +/* f0fb670: 0c002f06 */ jal viGetY /* f0fb674: a7a2003a */ sh $v0,0x3a($sp) /* f0fb678: 87ae003a */ lh $t6,0x3a($sp) /* f0fb67c: 304b03ff */ andi $t3,$v0,0x3ff @@ -12681,9 +12681,9 @@ glabel var7f1b2af4 /* f0fb6d8: 0fc54df7 */ jal func0f1537dc /* f0fb6dc: 240500ff */ addiu $a1,$zero,0xff /* f0fb6e0: afa20068 */ sw $v0,0x68($sp) -/* f0fb6e4: 0c002f02 */ jal func0000bc08 +/* f0fb6e4: 0c002f02 */ jal viGetX /* f0fb6e8: 24500008 */ addiu $s0,$v0,0x8 -/* f0fb6ec: 0c002f06 */ jal func0000bc18 +/* f0fb6ec: 0c002f06 */ jal viGetY /* f0fb6f0: a7a2003a */ sh $v0,0x3a($sp) /* f0fb6f4: 87ac003a */ lh $t4,0x3a($sp) /* f0fb6f8: 304903ff */ andi $t1,$v0,0x3ff @@ -12755,9 +12755,9 @@ glabel var7f1b2af4 /* f0fb7f4: 0fc54df7 */ jal func0f1537dc /* f0fb7f8: ac480004 */ sw $t0,0x4($v0) /* f0fb7fc: afa2005c */ sw $v0,0x5c($sp) -/* f0fb800: 0c002f02 */ jal func0000bc08 +/* f0fb800: 0c002f02 */ jal viGetX /* f0fb804: 24500008 */ addiu $s0,$v0,0x8 -/* f0fb808: 0c002f06 */ jal func0000bc18 +/* f0fb808: 0c002f06 */ jal viGetY /* f0fb80c: a7a2003a */ sh $v0,0x3a($sp) /* f0fb810: 87ae003a */ lh $t6,0x3a($sp) /* f0fb814: 304903ff */ andi $t1,$v0,0x3ff @@ -12831,9 +12831,9 @@ glabel var7f1b2af4 /* f0fb918: 0fc54df7 */ jal func0f1537dc /* f0fb91c: 01802825 */ or $a1,$t4,$zero /* f0fb920: afa2004c */ sw $v0,0x4c($sp) -/* f0fb924: 0c002f02 */ jal func0000bc08 +/* f0fb924: 0c002f02 */ jal viGetX /* f0fb928: 24500008 */ addiu $s0,$v0,0x8 -/* f0fb92c: 0c002f06 */ jal func0000bc18 +/* f0fb92c: 0c002f06 */ jal viGetY /* f0fb930: a7a2003a */ sh $v0,0x3a($sp) /* f0fb934: 87b9003a */ lh $t9,0x3a($sp) /* f0fb938: 304f03ff */ andi $t7,$v0,0x3ff @@ -12932,9 +12932,9 @@ glabel var7f1b2af4 /* f0fba9c: 0fc54df7 */ jal func0f1537dc /* f0fbaa0: 03202825 */ or $a1,$t9,$zero /* f0fbaa4: afa2003c */ sw $v0,0x3c($sp) -/* f0fbaa8: 0c002f02 */ jal func0000bc08 +/* f0fbaa8: 0c002f02 */ jal viGetX /* f0fbaac: 24500008 */ addiu $s0,$v0,0x8 -/* f0fbab0: 0c002f06 */ jal func0000bc18 +/* f0fbab0: 0c002f06 */ jal viGetY /* f0fbab4: a7a2003a */ sh $v0,0x3a($sp) /* f0fbab8: 87aa003a */ lh $t2,0x3a($sp) /* f0fbabc: 304803ff */ andi $t0,$v0,0x3ff @@ -12951,9 +12951,9 @@ glabel var7f1b2af4 /* f0fbae8: ac600004 */ sw $zero,0x4($v1) /* f0fbaec: 10000026 */ beqz $zero,.L0f0fbb88 /* f0fbaf0: 00408025 */ or $s0,$v0,$zero -/* f0fbaf4: 0c002f02 */ jal func0000bc08 +/* f0fbaf4: 0c002f02 */ jal viGetX /* f0fbaf8: 00000000 */ sll $zero,$zero,0x0 -/* f0fbafc: 0c002f06 */ jal func0000bc18 +/* f0fbafc: 0c002f06 */ jal viGetY /* f0fbb00: a7a20038 */ sh $v0,0x38($sp) /* f0fbb04: 3c198f00 */ lui $t9,0x8f00 /* f0fbb08: 373900ff */ ori $t9,$t9,0xff @@ -12970,9 +12970,9 @@ glabel var7f1b2af4 /* f0fbb34: afa20010 */ sw $v0,0x10($sp) /* f0fbb38: 10000013 */ beqz $zero,.L0f0fbb88 /* f0fbb3c: 00408025 */ or $s0,$v0,$zero -/* f0fbb40: 0c002f02 */ jal func0000bc08 +/* f0fbb40: 0c002f02 */ jal viGetX /* f0fbb44: 00000000 */ sll $zero,$zero,0x0 -/* f0fbb48: 0c002f06 */ jal func0000bc18 +/* f0fbb48: 0c002f06 */ jal viGetY /* f0fbb4c: a7a20038 */ sh $v0,0x38($sp) /* f0fbb50: 3c033f3f */ lui $v1,0x3f3f /* f0fbb54: 3c087f00 */ lui $t0,0x7f00 @@ -13691,11 +13691,11 @@ glabel var7f1b2afc /* f0fc5a4: 25f80002 */ addiu $t8,$t7,0x2 /* f0fc5a8: afb800ac */ sw $t8,0xac($sp) .L0f0fc5ac: -/* f0fc5ac: 0c002f02 */ jal func0000bc08 +/* f0fc5ac: 0c002f02 */ jal viGetX /* f0fc5b0: 00000000 */ sll $zero,$zero,0x0 /* f0fc5b4: 00028400 */ sll $s0,$v0,0x10 /* f0fc5b8: 0010cc03 */ sra $t9,$s0,0x10 -/* f0fc5bc: 0c002f06 */ jal func0000bc18 +/* f0fc5bc: 0c002f06 */ jal viGetY /* f0fc5c0: 03208025 */ or $s0,$t9,$zero /* f0fc5c4: 922b0017 */ lbu $t3,0x17($s1) /* f0fc5c8: 3c0c8008 */ lui $t4,%hi(var8007fb10) @@ -13750,11 +13750,11 @@ glabel var7f1b2afc /* f0fc688: 922c0017 */ lbu $t4,0x17($s1) /* f0fc68c: 01821825 */ or $v1,$t4,$v0 .L0f0fc690: -/* f0fc690: 0c002f02 */ jal func0000bc08 +/* f0fc690: 0c002f02 */ jal viGetX /* f0fc694: afa300a4 */ sw $v1,0xa4($sp) /* f0fc698: 00028400 */ sll $s0,$v0,0x10 /* f0fc69c: 00105403 */ sra $t2,$s0,0x10 -/* f0fc6a0: 0c002f06 */ jal func0000bc18 +/* f0fc6a0: 0c002f06 */ jal viGetY /* f0fc6a4: 01408025 */ or $s0,$t2,$zero /* f0fc6a8: 3c0b8008 */ lui $t3,%hi(var8007fb10) /* f0fc6ac: 3c0d8008 */ lui $t5,%hi(var8007fb0c) @@ -14657,7 +14657,7 @@ glabel func0f0fd494 /* f0fd4cc: 27a40024 */ addiu $a0,$sp,0x24 /* f0fd4d0: 0fc2d341 */ jal func0f0b4d04 /* f0fd4d4: 27a50030 */ addiu $a1,$sp,0x30 -/* f0fd4d8: 0c002f02 */ jal func0000bc08 +/* f0fd4d8: 0c002f02 */ jal viGetX /* f0fd4dc: 00000000 */ sll $zero,$zero,0x0 /* f0fd4e0: c7a40030 */ lwc1 $f4,0x30($sp) /* f0fd4e4: 4600218d */ trunc.w.s $f6,$f4 @@ -14668,7 +14668,7 @@ glabel func0f0fd494 /* f0fd4f8: 00014843 */ sra $t1,$at,0x1 .L0f0fd4fc: /* f0fd4fc: 01095023 */ subu $t2,$t0,$t1 -/* f0fd500: 0c002f06 */ jal func0000bc18 +/* f0fd500: 0c002f06 */ jal viGetY /* f0fd504: ae0a0670 */ sw $t2,0x670($s0) /* f0fd508: c7a80034 */ lwc1 $f8,0x34($sp) /* f0fd50c: 920f05d5 */ lbu $t7,0x5d5($s0) diff --git a/src/game/game_0fd660.c b/src/game/game_0fd660.c index 1b929b527..e8dc65caf 100644 --- a/src/game/game_0fd660.c +++ b/src/game/game_0fd660.c @@ -448,9 +448,9 @@ glabel var7f1b2cd8 /* f0fdbdc: 25ee0001 */ addiu $t6,$t7,0x1 /* f0fdbe0: 0fc54d8a */ jal func0f153628 /* f0fdbe4: afae0088 */ sw $t6,0x88($sp) -/* f0fdbe8: 0c002f02 */ jal func0000bc08 +/* f0fdbe8: 0c002f02 */ jal viGetX /* f0fdbec: afa20094 */ sw $v0,0x94($sp) -/* f0fdbf0: 0c002f06 */ jal func0000bc18 +/* f0fdbf0: 0c002f06 */ jal viGetY /* f0fdbf4: a7a2005c */ sh $v0,0x5c($sp) /* f0fdbf8: 8fb80058 */ lw $t8,0x58($sp) /* f0fdbfc: 3c198008 */ lui $t9,%hi(var8007fb10) diff --git a/src/game/game_102240.c b/src/game/game_102240.c index a74776058..580355e6d 100644 --- a/src/game/game_102240.c +++ b/src/game/game_102240.c @@ -2765,11 +2765,11 @@ glabel var7f1b2dfc /* f105480: 24a52d50 */ addiu $a1,$a1,%lo(var7f1b2d50) /* f105484: 0c004c89 */ jal strcat /* f105488: 27a400f0 */ addiu $a0,$sp,0xf0 -/* f10548c: 0c002f02 */ jal func0000bc08 +/* f10548c: 0c002f02 */ jal viGetX /* f105490: 00000000 */ sll $zero,$zero,0x0 /* f105494: 00028400 */ sll $s0,$v0,0x10 /* f105498: 00107c03 */ sra $t7,$s0,0x10 -/* f10549c: 0c002f06 */ jal func0000bc18 +/* f10549c: 0c002f06 */ jal viGetY /* f1054a0: 01e08025 */ or $s0,$t7,$zero /* f1054a4: 3c0e8008 */ lui $t6,%hi(var8007fb18) /* f1054a8: 3c198008 */ lui $t9,%hi(var8007fb14) @@ -2796,11 +2796,11 @@ glabel var7f1b2dfc /* f1054fc: 27a400f0 */ addiu $a0,$sp,0xf0 /* f105500: 0c004c4c */ jal strcpy /* f105504: 00402825 */ or $a1,$v0,$zero -/* f105508: 0c002f02 */ jal func0000bc08 +/* f105508: 0c002f02 */ jal viGetX /* f10550c: 00000000 */ sll $zero,$zero,0x0 /* f105510: 00028400 */ sll $s0,$v0,0x10 /* f105514: 00107403 */ sra $t6,$s0,0x10 -/* f105518: 0c002f06 */ jal func0000bc18 +/* f105518: 0c002f06 */ jal viGetY /* f10551c: 01c08025 */ or $s0,$t6,$zero /* f105520: 3c198008 */ lui $t9,%hi(var8007fb10) /* f105524: 3c188008 */ lui $t8,%hi(var8007fb0c) diff --git a/src/game/game_107fb0.c b/src/game/game_107fb0.c index 9cc861a61..43543935b 100644 --- a/src/game/game_107fb0.c +++ b/src/game/game_107fb0.c @@ -3270,9 +3270,9 @@ glabel var7f1b37a8 /* f10ac9c: 01202825 */ or $a1,$t1,$zero /* f10aca0: 0fc42034 */ jal func0f1080d0 /* f10aca4: 24c6ffff */ addiu $a2,$a2,-1 -/* f10aca8: 0c002f02 */ jal func0000bc08 +/* f10aca8: 0c002f02 */ jal viGetX /* f10acac: 00000000 */ sll $zero,$zero,0x0 -/* f10acb0: 0c002f06 */ jal func0000bc18 +/* f10acb0: 0c002f06 */ jal viGetY /* f10acb4: a7a20044 */ sh $v0,0x44($sp) /* f10acb8: 3c0c8008 */ lui $t4,%hi(var8007fb10) /* f10acbc: 3c0d8008 */ lui $t5,%hi(var8007fb0c) @@ -3766,9 +3766,9 @@ glabel var7f1b37f8 /* f10b310: afab0154 */ sw $t3,0x154($sp) /* f10b314: 8e0c0004 */ lw $t4,0x4($s0) /* f10b318: 258d0001 */ addiu $t5,$t4,0x1 -/* f10b31c: 0c002f02 */ jal func0000bc08 +/* f10b31c: 0c002f02 */ jal viGetX /* f10b320: afad0150 */ sw $t5,0x150($sp) -/* f10b324: 0c002f06 */ jal func0000bc18 +/* f10b324: 0c002f06 */ jal viGetY /* f10b328: a7a20050 */ sh $v0,0x50($sp) /* f10b32c: 3c0e8008 */ lui $t6,%hi(var8007fb10) /* f10b330: 3c0f8008 */ lui $t7,%hi(var8007fb0c) @@ -3854,9 +3854,9 @@ glabel var7f1b37f8 /* f10b468: afa80154 */ sw $t0,0x154($sp) /* f10b46c: 8e0a0004 */ lw $t2,0x4($s0) /* f10b470: 254b0001 */ addiu $t3,$t2,0x1 -/* f10b474: 0c002f02 */ jal func0000bc08 +/* f10b474: 0c002f02 */ jal viGetX /* f10b478: afab0150 */ sw $t3,0x150($sp) -/* f10b47c: 0c002f06 */ jal func0000bc18 +/* f10b47c: 0c002f06 */ jal viGetY /* f10b480: a7a20050 */ sh $v0,0x50($sp) /* f10b484: 3c098008 */ lui $t1,%hi(var8007fb10) /* f10b488: 3c0c8008 */ lui $t4,%hi(var8007fb0c) @@ -3883,9 +3883,9 @@ glabel var7f1b37f8 /* f10b4dc: afb90154 */ sw $t9,0x154($sp) /* f10b4e0: 8e080004 */ lw $t0,0x4($s0) /* f10b4e4: 250a0001 */ addiu $t2,$t0,0x1 -/* f10b4e8: 0c002f02 */ jal func0000bc08 +/* f10b4e8: 0c002f02 */ jal viGetX /* f10b4ec: afaa0150 */ sw $t2,0x150($sp) -/* f10b4f0: 0c002f06 */ jal func0000bc18 +/* f10b4f0: 0c002f06 */ jal viGetY /* f10b4f4: a7a20050 */ sh $v0,0x50($sp) /* f10b4f8: 3c0b8008 */ lui $t3,%hi(var8007fb10) /* f10b4fc: 3c098008 */ lui $t1,%hi(var8007fb0c) @@ -3926,9 +3926,9 @@ glabel var7f1b37f8 /* f10b588: afa90154 */ sw $t1,0x154($sp) /* f10b58c: 8e0c0004 */ lw $t4,0x4($s0) /* f10b590: 258d0001 */ addiu $t5,$t4,0x1 -/* f10b594: 0c002f02 */ jal func0000bc08 +/* f10b594: 0c002f02 */ jal viGetX /* f10b598: afad0150 */ sw $t5,0x150($sp) -/* f10b59c: 0c002f06 */ jal func0000bc18 +/* f10b59c: 0c002f06 */ jal viGetY /* f10b5a0: a7a20050 */ sh $v0,0x50($sp) /* f10b5a4: 3c0e8008 */ lui $t6,%hi(var8007fb10) /* f10b5a8: 3c0f8008 */ lui $t7,%hi(var8007fb0c) @@ -4818,11 +4818,11 @@ glabel var7f1b385c /* f10c350: 00000000 */ sll $zero,$zero,0x0 /* f10c354: 0fc5b9f1 */ jal langGet /* f10c358: 24045793 */ addiu $a0,$zero,0x5793 -/* f10c35c: 0c002f02 */ jal func0000bc08 +/* f10c35c: 0c002f02 */ jal viGetX /* f10c360: afa20058 */ sw $v0,0x58($sp) /* f10c364: 00028400 */ sll $s0,$v0,0x10 /* f10c368: 00106403 */ sra $t4,$s0,0x10 -/* f10c36c: 0c002f06 */ jal func0000bc18 +/* f10c36c: 0c002f06 */ jal viGetY /* f10c370: 01808025 */ or $s0,$t4,$zero /* f10c374: 3c0b8008 */ lui $t3,%hi(var8007fb18) /* f10c378: 3c188008 */ lui $t8,%hi(var8007fb14) @@ -4847,11 +4847,11 @@ glabel var7f1b385c .L0f10c3c4: /* f10c3c4: 114000c6 */ beqz $t2,.L0f10c6e0 /* f10c3c8: 00000000 */ sll $zero,$zero,0x0 -/* f10c3cc: 0c002f02 */ jal func0000bc08 +/* f10c3cc: 0c002f02 */ jal viGetX /* f10c3d0: 00000000 */ sll $zero,$zero,0x0 /* f10c3d4: 00028400 */ sll $s0,$v0,0x10 /* f10c3d8: 00107403 */ sra $t6,$s0,0x10 -/* f10c3dc: 0c002f06 */ jal func0000bc18 +/* f10c3dc: 0c002f06 */ jal viGetY /* f10c3e0: 01c08025 */ or $s0,$t6,$zero /* f10c3e4: 3c0f8008 */ lui $t7,%hi(var8007fb18) /* f10c3e8: 3c0c8008 */ lui $t4,%hi(var8007fb14) @@ -4917,11 +4917,11 @@ glabel var7f1b385c /* f10c4d0: 24a53514 */ addiu $a1,$a1,%lo(var7f1b3514) /* f10c4d4: 0c004c89 */ jal strcat /* f10c4d8: 27a4009c */ addiu $a0,$sp,0x9c -/* f10c4dc: 0c002f02 */ jal func0000bc08 +/* f10c4dc: 0c002f02 */ jal viGetX /* f10c4e0: 00000000 */ sll $zero,$zero,0x0 /* f10c4e4: 00028400 */ sll $s0,$v0,0x10 /* f10c4e8: 0010cc03 */ sra $t9,$s0,0x10 -/* f10c4ec: 0c002f06 */ jal func0000bc18 +/* f10c4ec: 0c002f06 */ jal viGetY /* f10c4f0: 03208025 */ or $s0,$t9,$zero /* f10c4f4: 3c0e8008 */ lui $t6,%hi(var8007fb10) /* f10c4f8: 3c0f8008 */ lui $t7,%hi(var8007fb0c) @@ -4987,11 +4987,11 @@ glabel var7f1b385c /* f10c5e0: afa00014 */ sw $zero,0x14($sp) /* f10c5e4: 0fc55cbe */ jal textMeasure /* f10c5e8: afb90010 */ sw $t9,0x10($sp) -/* f10c5ec: 0c002f02 */ jal func0000bc08 +/* f10c5ec: 0c002f02 */ jal viGetX /* f10c5f0: 00000000 */ sll $zero,$zero,0x0 /* f10c5f4: 00028400 */ sll $s0,$v0,0x10 /* f10c5f8: 00107403 */ sra $t6,$s0,0x10 -/* f10c5fc: 0c002f06 */ jal func0000bc18 +/* f10c5fc: 0c002f06 */ jal viGetY /* f10c600: 01c08025 */ or $s0,$t6,$zero /* f10c604: 3c0f8008 */ lui $t7,%hi(var8007fb10) /* f10c608: 3c0c8008 */ lui $t4,%hi(var8007fb0c) @@ -5023,11 +5023,11 @@ glabel var7f1b385c /* f10c670: 27a4009c */ addiu $a0,$sp,0x9c /* f10c674: 0c004dad */ jal sprintf /* f10c678: 8fa60100 */ lw $a2,0x100($sp) -/* f10c67c: 0c002f02 */ jal func0000bc08 +/* f10c67c: 0c002f02 */ jal viGetX /* f10c680: 00000000 */ sll $zero,$zero,0x0 /* f10c684: 00028400 */ sll $s0,$v0,0x10 /* f10c688: 00106403 */ sra $t4,$s0,0x10 -/* f10c68c: 0c002f06 */ jal func0000bc18 +/* f10c68c: 0c002f06 */ jal viGetY /* f10c690: 01808025 */ or $s0,$t4,$zero /* f10c694: 3c0b8008 */ lui $t3,%hi(var8007fb08) /* f10c698: 3c188008 */ lui $t8,%hi(var8007fb04) diff --git a/src/game/game_1371b0.c b/src/game/game_1371b0.c index 234071a57..245b4a6bb 100644 --- a/src/game/game_1371b0.c +++ b/src/game/game_1371b0.c @@ -1388,9 +1388,9 @@ glabel func0f1384b4 /* f1384d8: 0fc54df7 */ jal func0f1537dc /* f1384dc: 02002025 */ or $a0,$s0,$zero /* f1384e0: afa20028 */ sw $v0,0x28($sp) -/* f1384e4: 0c002f02 */ jal func0000bc08 +/* f1384e4: 0c002f02 */ jal viGetX /* f1384e8: 24500008 */ addiu $s0,$v0,0x8 -/* f1384ec: 0c002f06 */ jal func0000bc18 +/* f1384ec: 0c002f06 */ jal viGetY /* f1384f0: a7a20026 */ sh $v0,0x26($sp) /* f1384f4: 87a90026 */ lh $t1,0x26($sp) /* f1384f8: 305803ff */ andi $t8,$v0,0x3ff @@ -4587,9 +4587,9 @@ glabel var7f1b5948 /* f13b0b0: 35ef0078 */ ori $t7,$t7,0x78 /* f13b0b4: afa20048 */ sw $v0,0x48($sp) /* f13b0b8: ac4f0000 */ sw $t7,0x0($v0) -/* f13b0bc: 0c002f02 */ jal func0000bc08 +/* f13b0bc: 0c002f02 */ jal viGetX /* f13b0c0: 24500008 */ addiu $s0,$v0,0x8 -/* f13b0c4: 0c002f06 */ jal func0000bc18 +/* f13b0c4: 0c002f06 */ jal viGetY /* f13b0c8: a7a20036 */ sh $v0,0x36($sp) /* f13b0cc: 2458ffe2 */ addiu $t8,$v0,-30 /* f13b0d0: 44982000 */ mtc1 $t8,$f4 diff --git a/src/game/game_13c510.c b/src/game/game_13c510.c index 32f079d4c..be175d606 100644 --- a/src/game/game_13c510.c +++ b/src/game/game_13c510.c @@ -1013,7 +1013,7 @@ glabel func0f13c780 /* f13d2e4: 0fc4f15d */ jal func0f13c574 /* f13d2e8: 4600b306 */ mov.s $f12,$f22 /* f13d2ec: 00025883 */ sra $t3,$v0,0x2 -/* f13d2f0: 0c002f02 */ jal func0000bc08 +/* f13d2f0: 0c002f02 */ jal viGetX /* f13d2f4: a60b0004 */ sh $t3,0x4($s0) /* f13d2f8: 00540019 */ multu $v0,$s4 /* f13d2fc: 8fce0000 */ lw $t6,0x0($s8) diff --git a/src/game/game_141820.c b/src/game/game_141820.c index 9d506ad7c..e8081eae0 100644 --- a/src/game/game_141820.c +++ b/src/game/game_141820.c @@ -113,7 +113,7 @@ glabel func0f141820 /* f14186c: afa5001c */ sw $a1,0x1c($sp) /* f141870: afa60020 */ sw $a2,0x20($sp) /* f141874: afa70024 */ sw $a3,0x24($sp) -/* f141878: 0c002f02 */ jal func0000bc08 +/* f141878: 0c002f02 */ jal viGetX /* f14187c: afa40018 */ sw $a0,0x18($sp) /* f141880: 8fa40018 */ lw $a0,0x18($sp) /* f141884: 3c0ee700 */ lui $t6,0xe700 @@ -169,7 +169,7 @@ glabel func0f141820 /* f141948: afa5001c */ sw $a1,0x1c($sp) /* f14194c: afa60020 */ sw $a2,0x20($sp) /* f141950: afa70024 */ sw $a3,0x24($sp) -/* f141954: 0c002f02 */ jal func0000bc08 +/* f141954: 0c002f02 */ jal viGetX /* f141958: afa40018 */ sw $a0,0x18($sp) /* f14195c: 8fa40018 */ lw $a0,0x18($sp) /* f141960: 3c0ee700 */ lui $t6,0xe700 @@ -277,7 +277,7 @@ glabel func0f141ab0 .L0f141ae4: /* f141ae4: afa60070 */ sw $a2,0x70($sp) /* f141ae8: afa6002c */ sw $a2,0x2c($sp) -/* f141aec: 0c002f02 */ jal func0000bc08 +/* f141aec: 0c002f02 */ jal viGetX /* f141af0: afa40080 */ sw $a0,0x80($sp) /* f141af4: 8fa40080 */ lw $a0,0x80($sp) /* f141af8: 3c0efd10 */ lui $t6,0xfd10 @@ -370,7 +370,7 @@ glabel func0f141ab0 /* f141c50: 00f83821 */ addu $a3,$a3,$t8 /* f141c54: afa70098 */ sw $a3,0x98($sp) /* f141c58: afa90028 */ sw $t1,0x28($sp) -/* f141c5c: 0c002f02 */ jal func0000bc08 +/* f141c5c: 0c002f02 */ jal viGetX /* f141c60: afa40080 */ sw $a0,0x80($sp) /* f141c64: 8fa40080 */ lw $a0,0x80($sp) /* f141c68: 3c19fd10 */ lui $t9,0xfd10 @@ -438,7 +438,7 @@ glabel func0f141ab0 /* f141d5c: 10000058 */ beqz $zero,.L0f141ec0 /* f141d60: 24840008 */ addiu $a0,$a0,0x8 .L0f141d64: -/* f141d64: 0c002f02 */ jal func0000bc08 +/* f141d64: 0c002f02 */ jal viGetX /* f141d68: afa40080 */ sw $a0,0x80($sp) /* f141d6c: 8fa40080 */ lw $a0,0x80($sp) /* f141d70: 3c19fd10 */ lui $t9,0xfd10 @@ -3091,11 +3091,11 @@ glabel hudRenderEyespyUi /* f144444: 27a602e8 */ addiu $a2,$sp,0x2e8 /* f144448: 0fc54e16 */ jal func0f153858 /* f14444c: 27a702dc */ addiu $a3,$sp,0x2dc -/* f144450: 0c002f02 */ jal func0000bc08 +/* f144450: 0c002f02 */ jal viGetX /* f144454: 0040a825 */ or $s5,$v0,$zero /* f144458: 00028400 */ sll $s0,$v0,0x10 /* f14445c: 0010cc03 */ sra $t9,$s0,0x10 -/* f144460: 0c002f06 */ jal func0000bc18 +/* f144460: 0c002f06 */ jal viGetY /* f144464: 03208025 */ or $s0,$t9,$zero /* f144468: 3c0e8008 */ lui $t6,%hi(var8007fb08) /* f14446c: 3c0f8008 */ lui $t7,%hi(var8007fb04) @@ -3160,11 +3160,11 @@ glabel hudRenderEyespyUi /* f144558: afb102e8 */ sw $s1,0x2e8($sp) /* f14455c: 0fc54e16 */ jal func0f153858 /* f144560: afa302ec */ sw $v1,0x2ec($sp) -/* f144564: 0c002f02 */ jal func0000bc08 +/* f144564: 0c002f02 */ jal viGetX /* f144568: 0040a825 */ or $s5,$v0,$zero /* f14456c: 00028400 */ sll $s0,$v0,0x10 /* f144570: 0010cc03 */ sra $t9,$s0,0x10 -/* f144574: 0c002f06 */ jal func0000bc18 +/* f144574: 0c002f06 */ jal viGetY /* f144578: 03208025 */ or $s0,$t9,$zero /* f14457c: 3c0e8008 */ lui $t6,%hi(var8007fb08) /* f144580: 3c0f8008 */ lui $t7,%hi(var8007fb04) @@ -3225,11 +3225,11 @@ glabel hudRenderEyespyUi /* f14465c: afb102e8 */ sw $s1,0x2e8($sp) /* f144660: 0fc54e16 */ jal func0f153858 /* f144664: afa302ec */ sw $v1,0x2ec($sp) -/* f144668: 0c002f02 */ jal func0000bc08 +/* f144668: 0c002f02 */ jal viGetX /* f14466c: 0040a825 */ or $s5,$v0,$zero /* f144670: 00028400 */ sll $s0,$v0,0x10 /* f144674: 00107403 */ sra $t6,$s0,0x10 -/* f144678: 0c002f06 */ jal func0000bc18 +/* f144678: 0c002f06 */ jal viGetY /* f14467c: 01c08025 */ or $s0,$t6,$zero /* f144680: 3c0f8008 */ lui $t7,%hi(var8007fb08) /* f144684: 3c188008 */ lui $t8,%hi(var8007fb04) @@ -3290,11 +3290,11 @@ glabel hudRenderEyespyUi /* f144760: afb102e8 */ sw $s1,0x2e8($sp) /* f144764: 0fc54e16 */ jal func0f153858 /* f144768: afa302ec */ sw $v1,0x2ec($sp) -/* f14476c: 0c002f02 */ jal func0000bc08 +/* f14476c: 0c002f02 */ jal viGetX /* f144770: 0040a825 */ or $s5,$v0,$zero /* f144774: 00028400 */ sll $s0,$v0,0x10 /* f144778: 00107c03 */ sra $t7,$s0,0x10 -/* f14477c: 0c002f06 */ jal func0000bc18 +/* f14477c: 0c002f06 */ jal viGetY /* f144780: 01e08025 */ or $s0,$t7,$zero /* f144784: 3c188008 */ lui $t8,%hi(var8007fb08) /* f144788: 3c198008 */ lui $t9,%hi(var8007fb04) @@ -3368,11 +3368,11 @@ glabel hudRenderEyespyUi /* f144888: 27a702dc */ addiu $a3,$sp,0x2dc /* f14488c: 0fc54e16 */ jal func0f153858 /* f144890: afa302ec */ sw $v1,0x2ec($sp) -/* f144894: 0c002f02 */ jal func0000bc08 +/* f144894: 0c002f02 */ jal viGetX /* f144898: 0040a825 */ or $s5,$v0,$zero /* f14489c: 00028400 */ sll $s0,$v0,0x10 /* f1448a0: 0010cc03 */ sra $t9,$s0,0x10 -/* f1448a4: 0c002f06 */ jal func0000bc18 +/* f1448a4: 0c002f06 */ jal viGetY /* f1448a8: 03208025 */ or $s0,$t9,$zero /* f1448ac: 3c0e8008 */ lui $t6,%hi(var8007fb08) /* f1448b0: 3c0f8008 */ lui $t7,%hi(var8007fb04) @@ -3476,11 +3476,11 @@ glabel hudRenderEyespyUi /* f144a1c: 27a702dc */ addiu $a3,$sp,0x2dc /* f144a20: 0fc54e16 */ jal func0f153858 /* f144a24: afa302ec */ sw $v1,0x2ec($sp) -/* f144a28: 0c002f02 */ jal func0000bc08 +/* f144a28: 0c002f02 */ jal viGetX /* f144a2c: 0040a825 */ or $s5,$v0,$zero /* f144a30: 00028400 */ sll $s0,$v0,0x10 /* f144a34: 00107403 */ sra $t6,$s0,0x10 -/* f144a38: 0c002f06 */ jal func0000bc18 +/* f144a38: 0c002f06 */ jal viGetY /* f144a3c: 01c08025 */ or $s0,$t6,$zero /* f144a40: 3c0f8008 */ lui $t7,%hi(var8007fb08) /* f144a44: 3c188008 */ lui $t8,%hi(var8007fb04) @@ -3559,11 +3559,11 @@ glabel hudRenderEyespyUi /* f144b60: 27a702dc */ addiu $a3,$sp,0x2dc /* f144b64: 0fc54e16 */ jal func0f153858 /* f144b68: afa302ec */ sw $v1,0x2ec($sp) -/* f144b6c: 0c002f02 */ jal func0000bc08 +/* f144b6c: 0c002f02 */ jal viGetX /* f144b70: 0040a825 */ or $s5,$v0,$zero /* f144b74: 00028400 */ sll $s0,$v0,0x10 /* f144b78: 0010c403 */ sra $t8,$s0,0x10 -/* f144b7c: 0c002f06 */ jal func0000bc18 +/* f144b7c: 0c002f06 */ jal viGetY /* f144b80: 03008025 */ or $s0,$t8,$zero /* f144b84: 3c198008 */ lui $t9,%hi(var8007fb08) /* f144b88: 3c0f8008 */ lui $t7,%hi(var8007fb04) @@ -3642,11 +3642,11 @@ glabel hudRenderEyespyUi /* f144ca0: 27a702dc */ addiu $a3,$sp,0x2dc /* f144ca4: 0fc54e16 */ jal func0f153858 /* f144ca8: afa302ec */ sw $v1,0x2ec($sp) -/* f144cac: 0c002f02 */ jal func0000bc08 +/* f144cac: 0c002f02 */ jal viGetX /* f144cb0: 0040a825 */ or $s5,$v0,$zero /* f144cb4: 00028400 */ sll $s0,$v0,0x10 /* f144cb8: 0010c403 */ sra $t8,$s0,0x10 -/* f144cbc: 0c002f06 */ jal func0000bc18 +/* f144cbc: 0c002f06 */ jal viGetY /* f144cc0: 03008025 */ or $s0,$t8,$zero /* f144cc4: 3c198008 */ lui $t9,%hi(var8007fb08) /* f144cc8: 3c0e8008 */ lui $t6,%hi(var8007fb04) @@ -3720,11 +3720,11 @@ glabel hudRenderEyespyUi /* f144dcc: 27a702dc */ addiu $a3,$sp,0x2dc /* f144dd0: 0fc54e16 */ jal func0f153858 /* f144dd4: afa302ec */ sw $v1,0x2ec($sp) -/* f144dd8: 0c002f02 */ jal func0000bc08 +/* f144dd8: 0c002f02 */ jal viGetX /* f144ddc: 0040a825 */ or $s5,$v0,$zero /* f144de0: 00028400 */ sll $s0,$v0,0x10 /* f144de4: 0010c403 */ sra $t8,$s0,0x10 -/* f144de8: 0c002f06 */ jal func0000bc18 +/* f144de8: 0c002f06 */ jal viGetY /* f144dec: 03008025 */ or $s0,$t8,$zero /* f144df0: 3c198008 */ lui $t9,%hi(var8007fb08) /* f144df4: 3c0f8008 */ lui $t7,%hi(var8007fb04) @@ -3834,11 +3834,11 @@ glabel hudRenderEyespyUi /* f144f74: 27a702dc */ addiu $a3,$sp,0x2dc /* f144f78: 0fc54e16 */ jal func0f153858 /* f144f7c: afa302ec */ sw $v1,0x2ec($sp) -/* f144f80: 0c002f02 */ jal func0000bc08 +/* f144f80: 0c002f02 */ jal viGetX /* f144f84: 0040a825 */ or $s5,$v0,$zero /* f144f88: 00028400 */ sll $s0,$v0,0x10 /* f144f8c: 0010cc03 */ sra $t9,$s0,0x10 -/* f144f90: 0c002f06 */ jal func0000bc18 +/* f144f90: 0c002f06 */ jal viGetY /* f144f94: 03208025 */ or $s0,$t9,$zero /* f144f98: 3c0e8008 */ lui $t6,%hi(var8007fb08) /* f144f9c: 3c188008 */ lui $t8,%hi(var8007fb04) @@ -3945,11 +3945,11 @@ glabel hudRenderEyespyUi /* f145118: afa802e8 */ sw $t0,0x2e8($sp) /* f14511c: 0fc54e16 */ jal func0f153858 /* f145120: afa302ec */ sw $v1,0x2ec($sp) -/* f145124: 0c002f02 */ jal func0000bc08 +/* f145124: 0c002f02 */ jal viGetX /* f145128: 0040a825 */ or $s5,$v0,$zero /* f14512c: 00028400 */ sll $s0,$v0,0x10 /* f145130: 00107c03 */ sra $t7,$s0,0x10 -/* f145134: 0c002f06 */ jal func0000bc18 +/* f145134: 0c002f06 */ jal viGetY /* f145138: 01e08025 */ or $s0,$t7,$zero /* f14513c: 3c198008 */ lui $t9,%hi(var8007fb08) /* f145140: 3c0e8008 */ lui $t6,%hi(var8007fb04) @@ -7300,11 +7300,11 @@ glabel hudRenderHorizonScanner .L0f148288: /* f148288: 8fb80074 */ lw $t8,0x74($sp) /* f14828c: 270efff9 */ addiu $t6,$t8,-7 -/* f148290: 0c002f02 */ jal func0000bc08 +/* f148290: 0c002f02 */ jal viGetX /* f148294: afae00f0 */ sw $t6,0xf0($sp) /* f148298: 00028400 */ sll $s0,$v0,0x10 /* f14829c: 00107c03 */ sra $t7,$s0,0x10 -/* f1482a0: 0c002f06 */ jal func0000bc18 +/* f1482a0: 0c002f06 */ jal viGetY /* f1482a4: 01e08025 */ or $s0,$t7,$zero /* f1482a8: 3c098008 */ lui $t1,%hi(var8007fb08) /* f1482ac: 3c0a8008 */ lui $t2,%hi(var8007fb04) @@ -7339,11 +7339,11 @@ glabel hudRenderHorizonScanner /* f14831c: 24a55f20 */ addiu $a1,$a1,%lo(var7f1b5f20) /* f148320: 0c004c89 */ jal strcat /* f148324: 27a40100 */ addiu $a0,$sp,0x100 -/* f148328: 0c002f02 */ jal func0000bc08 +/* f148328: 0c002f02 */ jal viGetX /* f14832c: 00000000 */ sll $zero,$zero,0x0 /* f148330: 00028400 */ sll $s0,$v0,0x10 /* f148334: 00106c03 */ sra $t5,$s0,0x10 -/* f148338: 0c002f06 */ jal func0000bc18 +/* f148338: 0c002f06 */ jal viGetY /* f14833c: 01a08025 */ or $s0,$t5,$zero /* f148340: 3c198008 */ lui $t9,%hi(var8007fb08) /* f148344: 3c188008 */ lui $t8,%hi(var8007fb04) @@ -7377,11 +7377,11 @@ glabel hudRenderHorizonScanner /* f1483b4: afa300f4 */ sw $v1,0xf4($sp) /* f1483b8: afa400f0 */ sw $a0,0xf0($sp) /* f1483bc: afa40068 */ sw $a0,0x68($sp) -/* f1483c0: 0c002f02 */ jal func0000bc08 +/* f1483c0: 0c002f02 */ jal viGetX /* f1483c4: afa30070 */ sw $v1,0x70($sp) /* f1483c8: 00028400 */ sll $s0,$v0,0x10 /* f1483cc: 00105c03 */ sra $t3,$s0,0x10 -/* f1483d0: 0c002f06 */ jal func0000bc18 +/* f1483d0: 0c002f06 */ jal viGetY /* f1483d4: 01608025 */ or $s0,$t3,$zero /* f1483d8: 3c0c8008 */ lui $t4,%hi(var8007fb08) /* f1483dc: 3c0d8008 */ lui $t5,%hi(var8007fb04) @@ -7425,11 +7425,11 @@ glabel hudRenderHorizonScanner /* f148470: afad00f4 */ sw $t5,0xf4($sp) /* f148474: afb900f0 */ sw $t9,0xf0($sp) .L0f148478: -/* f148478: 0c002f02 */ jal func0000bc08 +/* f148478: 0c002f02 */ jal viGetX /* f14847c: 00000000 */ sll $zero,$zero,0x0 /* f148480: 00028400 */ sll $s0,$v0,0x10 /* f148484: 0010c403 */ sra $t8,$s0,0x10 -/* f148488: 0c002f06 */ jal func0000bc18 +/* f148488: 0c002f06 */ jal viGetY /* f14848c: 03008025 */ or $s0,$t8,$zero /* f148490: 3c0e8008 */ lui $t6,%hi(var8007fb08) /* f148494: 3c0f8008 */ lui $t7,%hi(var8007fb04) @@ -7469,11 +7469,11 @@ glabel hudRenderHorizonScanner /* f148518: afaf00f4 */ sw $t7,0xf4($sp) /* f14851c: afa900f0 */ sw $t1,0xf0($sp) .L0f148520: -/* f148520: 0c002f02 */ jal func0000bc08 +/* f148520: 0c002f02 */ jal viGetX /* f148524: 00000000 */ sll $zero,$zero,0x0 /* f148528: 00028400 */ sll $s0,$v0,0x10 /* f14852c: 00105403 */ sra $t2,$s0,0x10 -/* f148530: 0c002f06 */ jal func0000bc18 +/* f148530: 0c002f06 */ jal viGetY /* f148534: 01408025 */ or $s0,$t2,$zero /* f148538: 3c0b8008 */ lui $t3,%hi(var8007fb08) /* f14853c: 3c0c8008 */ lui $t4,%hi(var8007fb04) diff --git a/src/game/game_1531a0.c b/src/game/game_1531a0.c index fb7d52576..3536528ad 100644 --- a/src/game/game_1531a0.c +++ b/src/game/game_1531a0.c @@ -2677,14 +2677,14 @@ glabel func0f15568c /* f155764: 8e590000 */ lw $t9,0x0($s2) /* f155768: 5b200221 */ blezl $t9,.L0f155ff0 /* f15576c: 92380003 */ lbu $t8,0x3($s1) -/* f155770: 0c002f02 */ jal func0000bc08 +/* f155770: 0c002f02 */ jal viGetX /* f155774: afaa0090 */ sw $t2,0x90($sp) /* f155778: 8e4e0000 */ lw $t6,0x0($s2) /* f15577c: 8faa0090 */ lw $t2,0x90($sp) /* f155780: 004e082a */ slt $at,$v0,$t6 /* f155784: 5420021a */ bnezl $at,.L0f155ff0 /* f155788: 92380003 */ lbu $t8,0x3($s1) -/* f15578c: 0c002f06 */ jal func0000bc18 +/* f15578c: 0c002f06 */ jal viGetY /* f155790: afaa0090 */ sw $t2,0x90($sp) /* f155794: 8faa0090 */ lw $t2,0x90($sp) /* f155798: 822f0001 */ lb $t7,0x1($s1) @@ -3820,13 +3820,13 @@ glabel func0f156790 /* f15681c: 01986823 */ subu $t5,$t4,$t8 /* f156820: 19a00071 */ blez $t5,.L0f1569e8 /* f156824: acad0000 */ sw $t5,0x0($a1) -/* f156828: 0c002f02 */ jal func0000bc08 +/* f156828: 0c002f02 */ jal viGetX /* f15682c: 00000000 */ sll $zero,$zero,0x0 /* f156830: 8e2b0000 */ lw $t3,0x0($s1) /* f156834: 004b082a */ slt $at,$v0,$t3 /* f156838: 1420006b */ bnez $at,.L0f1569e8 /* f15683c: 00000000 */ sll $zero,$zero,0x0 -/* f156840: 0c002f06 */ jal func0000bc18 +/* f156840: 0c002f06 */ jal viGetY /* f156844: 00000000 */ sll $zero,$zero,0x0 /* f156848: 8faf0038 */ lw $t7,0x38($sp) /* f15684c: 82590001 */ lb $t9,0x1($s2) diff --git a/src/game/game_157db0.c b/src/game/game_157db0.c index 0041fb75c..c878344b0 100644 --- a/src/game/game_157db0.c +++ b/src/game/game_157db0.c @@ -15578,12 +15578,12 @@ glabel func0f164748 /* f16474c: afb00018 */ sw $s0,0x18($sp) /* f164750: afbf001c */ sw $ra,0x1c($sp) /* f164754: 3c10800a */ lui $s0,%hi(g_Vars+0x284) -/* f164758: 0c002f02 */ jal func0000bc08 +/* f164758: 0c002f02 */ jal viGetX /* f16475c: 8e10a244 */ lw $s0,%lo(g_Vars+0x284)($s0) /* f164760: 44822000 */ mtc1 $v0,$f4 /* f164764: 00000000 */ sll $zero,$zero,0x0 /* f164768: 468021a0 */ cvt.s.w $f6,$f4 -/* f16476c: 0c002f06 */ jal func0000bc18 +/* f16476c: 0c002f06 */ jal viGetY /* f164770: e7a60030 */ swc1 $f6,0x30($sp) /* f164774: 44824000 */ mtc1 $v0,$f8 /* f164778: 00000000 */ sll $zero,$zero,0x0 diff --git a/src/game/game_167ae0.c b/src/game/game_167ae0.c index 570368ec5..bf38ba72a 100644 --- a/src/game/game_167ae0.c +++ b/src/game/game_167ae0.c @@ -3373,11 +3373,11 @@ glabel var7f1b7868 .L0f16b030: /* f16b030: 3c0bed00 */ lui $t3,0xed00 /* f16b034: ae0b0000 */ sw $t3,0x0($s0) -/* f16b038: 0c002f02 */ jal func0000bc08 +/* f16b038: 0c002f02 */ jal viGetX /* f16b03c: 26520008 */ addiu $s2,$s2,0x8 /* f16b040: 00028c00 */ sll $s1,$v0,0x10 /* f16b044: 0011cc03 */ sra $t9,$s1,0x10 -/* f16b048: 0c002f06 */ jal func0000bc18 +/* f16b048: 0c002f06 */ jal viGetY /* f16b04c: 03208825 */ or $s1,$t9,$zero /* f16b050: 44829000 */ mtc1 $v0,$f18 /* f16b054: 44914000 */ mtc1 $s1,$f8 diff --git a/src/game/game_176080.c b/src/game/game_176080.c index 8d5c65d63..6ae39ba69 100644 --- a/src/game/game_176080.c +++ b/src/game/game_176080.c @@ -295,7 +295,7 @@ glabel func0f1763f4 /* f176424: ac600004 */ sw $zero,0x4($v1) /* f176428: 02002825 */ or $a1,$s0,$zero /* f17642c: afa5003c */ sw $a1,0x3c($sp) -/* f176430: 0c002f02 */ jal func0000bc08 +/* f176430: 0c002f02 */ jal viGetX /* f176434: 26100008 */ addiu $s0,$s0,0x8 /* f176438: 8fa5003c */ lw $a1,0x3c($sp) /* f17643c: 2458ffff */ addiu $t8,$v0,-1 @@ -666,7 +666,7 @@ glabel func0f1766b4 /* f176998: 8fae0044 */ lw $t6,0x44($sp) /* f17699c: 1180004a */ beqz $t4,.L0f176ac8 /* f1769a0: 00146840 */ sll $t5,$s4,0x1 -/* f1769a4: 0c002f02 */ jal func0000bc08 +/* f1769a4: 0c002f02 */ jal viGetX /* f1769a8: 01ae9021 */ addu $s2,$t5,$t6 /* f1769ac: 962f000c */ lhu $t7,0xc($s1) /* f1769b0: 8fa8004c */ lw $t0,0x4c($sp) @@ -689,13 +689,13 @@ glabel func0f1766b4 /* f1769f4: acb70000 */ sw $s7,0x0($a1) /* f1769f8: 3c09f300 */ lui $t1,0xf300 /* f1769fc: ae690000 */ sw $t1,0x0($s3) -/* f176a00: 0c002f02 */ jal func0000bc08 +/* f176a00: 0c002f02 */ jal viGetX /* f176a04: 26100008 */ addiu $s0,$s0,0x8 /* f176a08: 244affff */ addiu $t2,$v0,-1 /* f176a0c: 294107ff */ slti $at,$t2,0x7ff /* f176a10: 10200005 */ beqz $at,.L0f176a28 /* f176a14: 240507ff */ addiu $a1,$zero,0x7ff -/* f176a18: 0c002f02 */ jal func0000bc08 +/* f176a18: 0c002f02 */ jal viGetX /* f176a1c: 00000000 */ sll $zero,$zero,0x0 /* f176a20: 10000001 */ beqz $zero,.L0f176a28 /* f176a24: 2445ffff */ addiu $a1,$v0,-1 @@ -773,11 +773,11 @@ glabel func0f1766b4 /* f176b3c: 02009025 */ or $s2,$s0,$zero /* f176b40: 3c18ed00 */ lui $t8,0xed00 /* f176b44: ae580000 */ sw $t8,0x0($s2) -/* f176b48: 0c002f02 */ jal func0000bc08 +/* f176b48: 0c002f02 */ jal viGetX /* f176b4c: 26100008 */ addiu $s0,$s0,0x8 /* f176b50: 00028c00 */ sll $s1,$v0,0x10 /* f176b54: 0011cc03 */ sra $t9,$s1,0x10 -/* f176b58: 0c002f06 */ jal func0000bc18 +/* f176b58: 0c002f06 */ jal viGetY /* f176b5c: 03208825 */ or $s1,$t9,$zero /* f176b60: 44822000 */ mtc1 $v0,$f4 /* f176b64: 44918000 */ mtc1 $s1,$f16 diff --git a/src/game/game_179060.c b/src/game/game_179060.c index 063bfb911..1017bf5b5 100644 --- a/src/game/game_179060.c +++ b/src/game/game_179060.c @@ -1149,11 +1149,11 @@ glabel menuhandler0017a20c /* f17a2cc: 8c841448 */ lw $a0,%lo(g_MpPlayerNum)($a0) /* f17a2d0: 0fc670df */ jal mpChallengeGetNameWithArg /* f17a2d4: 8fa500bc */ lw $a1,0xbc($sp) -/* f17a2d8: 0c002f02 */ jal func0000bc08 +/* f17a2d8: 0c002f02 */ jal viGetX /* f17a2dc: 00408025 */ or $s0,$v0,$zero /* f17a2e0: 00029400 */ sll $s2,$v0,0x10 /* f17a2e4: 00127403 */ sra $t6,$s2,0x10 -/* f17a2e8: 0c002f06 */ jal func0000bc18 +/* f17a2e8: 0c002f06 */ jal viGetY /* f17a2ec: 01c09025 */ or $s2,$t6,$zero /* f17a2f0: 3c0f8008 */ lui $t7,%hi(var8007fb10) /* f17a2f4: 3c188008 */ lui $t8,%hi(var8007fb0c) @@ -5431,11 +5431,11 @@ glabel var7f1b8288 /* f17e660: afa200b4 */ sw $v0,0xb4($sp) /* f17e664: 0fc66dbe */ jal mpGetChallengeNameBySlot /* f17e668: 8ec40004 */ lw $a0,0x4($s6) -/* f17e66c: 0c002f02 */ jal func0000bc08 +/* f17e66c: 0c002f02 */ jal viGetX /* f17e670: 00408825 */ or $s1,$v0,$zero /* f17e674: 00029400 */ sll $s2,$v0,0x10 /* f17e678: 0012c403 */ sra $t8,$s2,0x10 -/* f17e67c: 0c002f06 */ jal func0000bc18 +/* f17e67c: 0c002f06 */ jal viGetY /* f17e680: 03009025 */ or $s2,$t8,$zero /* f17e684: 3c198008 */ lui $t9,%hi(var8007fb10) /* f17e688: 3c0c8008 */ lui $t4,%hi(var8007fb0c) diff --git a/src/game/game_17f930.c b/src/game/game_17f930.c index fa8ca6c02..0ded2e491 100644 --- a/src/game/game_17f930.c +++ b/src/game/game_17f930.c @@ -964,9 +964,9 @@ glabel scenarioHtbCallback18 /* f1808d0: afa50090 */ sw $a1,0x90($sp) /* f1808d4: 0fc54e64 */ jal func0f153990 /* f1808d8: 02002025 */ or $a0,$s0,$zero -/* f1808dc: 0c002f02 */ jal func0000bc08 +/* f1808dc: 0c002f02 */ jal viGetX /* f1808e0: 00408025 */ or $s0,$v0,$zero -/* f1808e4: 0c002f06 */ jal func0000bc18 +/* f1808e4: 0c002f06 */ jal viGetY /* f1808e8: a7a20048 */ sh $v0,0x48($sp) /* f1808ec: 3c0f8008 */ lui $t7,%hi(var8007fb00) /* f1808f0: 3c188008 */ lui $t8,%hi(var8007fafc) @@ -2730,9 +2730,9 @@ glabel scenarioKohCallback18 /* f182878: afa50098 */ sw $a1,0x98($sp) /* f18287c: 0fc54e64 */ jal func0f153990 /* f182880: 02002025 */ or $a0,$s0,$zero -/* f182884: 0c002f02 */ jal func0000bc08 +/* f182884: 0c002f02 */ jal viGetX /* f182888: 00408025 */ or $s0,$v0,$zero -/* f18288c: 0c002f06 */ jal func0000bc18 +/* f18288c: 0c002f06 */ jal viGetY /* f182890: a7a2004c */ sh $v0,0x4c($sp) /* f182894: 3c0d8008 */ lui $t5,%hi(var8007fb00) /* f182898: 3c0e8008 */ lui $t6,%hi(var8007fafc) @@ -4968,9 +4968,9 @@ glabel scenarioPacCallback18 /* f184b88: afa5008c */ sw $a1,0x8c($sp) /* f184b8c: 0fc54e64 */ jal func0f153990 /* f184b90: 02002025 */ or $a0,$s0,$zero -/* f184b94: 0c002f02 */ jal func0000bc08 +/* f184b94: 0c002f02 */ jal viGetX /* f184b98: 00408025 */ or $s0,$v0,$zero -/* f184b9c: 0c002f06 */ jal func0000bc18 +/* f184b9c: 0c002f06 */ jal viGetY /* f184ba0: a7a20044 */ sh $v0,0x44($sp) /* f184ba4: 3c0b8008 */ lui $t3,%hi(var8007fb00) /* f184ba8: 3c0d8008 */ lui $t5,%hi(var8007fafc) diff --git a/src/game/game_19c990.c b/src/game/game_19c990.c index 8aaca10e5..84cd9b405 100644 --- a/src/game/game_19c990.c +++ b/src/game/game_19c990.c @@ -5663,9 +5663,9 @@ glabel func0f1a2d88 /* f1a2df8: 27a70060 */ addiu $a3,$sp,0x60 /* f1a2dfc: 0fc54e16 */ jal func0f153858 /* f1a2e00: afab0058 */ sw $t3,0x58($sp) -/* f1a2e04: 0c002f02 */ jal func0000bc08 +/* f1a2e04: 0c002f02 */ jal viGetX /* f1a2e08: 00408025 */ or $s0,$v0,$zero -/* f1a2e0c: 0c002f06 */ jal func0000bc18 +/* f1a2e0c: 0c002f06 */ jal viGetY /* f1a2e10: a7a2004c */ sh $v0,0x4c($sp) /* f1a2e14: 93a30083 */ lbu $v1,0x83($sp) /* f1a2e18: 8fb8007c */ lw $t8,0x7c($sp) @@ -5720,9 +5720,9 @@ glabel func0f1a2d88 /* f1a2edc: 27a60058 */ addiu $a2,$sp,0x58 /* f1a2ee0: 0fc54e16 */ jal func0f153858 /* f1a2ee4: 27a70060 */ addiu $a3,$sp,0x60 -/* f1a2ee8: 0c002f02 */ jal func0000bc08 +/* f1a2ee8: 0c002f02 */ jal viGetX /* f1a2eec: 00408025 */ or $s0,$v0,$zero -/* f1a2ef0: 0c002f06 */ jal func0000bc18 +/* f1a2ef0: 0c002f06 */ jal viGetY /* f1a2ef4: a7a2004c */ sh $v0,0x4c($sp) /* f1a2ef8: 3c0a8008 */ lui $t2,%hi(var8007fb08) /* f1a2efc: 3c0c8008 */ lui $t4,%hi(var8007fb04) diff --git a/src/game/game_1a3340.c b/src/game/game_1a3340.c index 09bb1b864..2492aa69a 100644 --- a/src/game/game_1a3340.c +++ b/src/game/game_1a3340.c @@ -224,9 +224,9 @@ glabel var7f1b9940 /* f1a35e8: afa2009c */ sw $v0,0x9c($sp) /* f1a35ec: 0fc28857 */ jal weaponGetName /* f1a35f0: 8fa40090 */ lw $a0,0x90($sp) -/* f1a35f4: 0c002f02 */ jal func0000bc08 +/* f1a35f4: 0c002f02 */ jal viGetX /* f1a35f8: afa20044 */ sw $v0,0x44($sp) -/* f1a35fc: 0c002f06 */ jal func0000bc18 +/* f1a35fc: 0c002f06 */ jal viGetY /* f1a3600: a7a2003e */ sh $v0,0x3e($sp) /* f1a3604: 3c198008 */ lui $t9,%hi(var8007fb10) /* f1a3608: 3c0e8008 */ lui $t6,%hi(var8007fb0c) @@ -1540,9 +1540,9 @@ glabel menuhandler001a44c0 /* f1a4d04: 27a60150 */ addiu $a2,$sp,0x150 /* f1a4d08: 0fc54e16 */ jal func0f153858 /* f1a4d0c: 27a7014c */ addiu $a3,$sp,0x14c -/* f1a4d10: 0c002f02 */ jal func0000bc08 +/* f1a4d10: 0c002f02 */ jal viGetX /* f1a4d14: afa2015c */ sw $v0,0x15c($sp) -/* f1a4d18: 0c002f06 */ jal func0000bc18 +/* f1a4d18: 0c002f06 */ jal viGetY /* f1a4d1c: a7a20044 */ sh $v0,0x44($sp) /* f1a4d20: 3c0d8008 */ lui $t5,%hi(var8007fb10) /* f1a4d24: 3c198008 */ lui $t9,%hi(var8007fb0c) @@ -1581,9 +1581,9 @@ glabel menuhandler001a44c0 /* f1a4da8: 27a60150 */ addiu $a2,$sp,0x150 /* f1a4dac: 0fc54e16 */ jal func0f153858 /* f1a4db0: 27a7014c */ addiu $a3,$sp,0x14c -/* f1a4db4: 0c002f02 */ jal func0000bc08 +/* f1a4db4: 0c002f02 */ jal viGetX /* f1a4db8: afa2015c */ sw $v0,0x15c($sp) -/* f1a4dbc: 0c002f06 */ jal func0000bc18 +/* f1a4dbc: 0c002f06 */ jal viGetY /* f1a4dc0: a7a20044 */ sh $v0,0x44($sp) /* f1a4dc4: 3c0c8008 */ lui $t4,%hi(var8007fb10) /* f1a4dc8: 3c188008 */ lui $t8,%hi(var8007fb0c) @@ -1638,9 +1638,9 @@ glabel menuhandler001a44c0 /* f1a4e8c: 27a60150 */ addiu $a2,$sp,0x150 /* f1a4e90: 0fc54e16 */ jal func0f153858 /* f1a4e94: 27a7014c */ addiu $a3,$sp,0x14c -/* f1a4e98: 0c002f02 */ jal func0000bc08 +/* f1a4e98: 0c002f02 */ jal viGetX /* f1a4e9c: afa2015c */ sw $v0,0x15c($sp) -/* f1a4ea0: 0c002f06 */ jal func0000bc18 +/* f1a4ea0: 0c002f06 */ jal viGetY /* f1a4ea4: a7a20044 */ sh $v0,0x44($sp) /* f1a4ea8: 3c0f8008 */ lui $t7,%hi(var8007fb10) /* f1a4eac: 3c0d8008 */ lui $t5,%hi(var8007fb0c) @@ -1680,9 +1680,9 @@ glabel menuhandler001a44c0 /* f1a4f34: 27a60150 */ addiu $a2,$sp,0x150 /* f1a4f38: 0fc54e16 */ jal func0f153858 /* f1a4f3c: 27a7014c */ addiu $a3,$sp,0x14c -/* f1a4f40: 0c002f02 */ jal func0000bc08 +/* f1a4f40: 0c002f02 */ jal viGetX /* f1a4f44: afa2015c */ sw $v0,0x15c($sp) -/* f1a4f48: 0c002f06 */ jal func0000bc18 +/* f1a4f48: 0c002f06 */ jal viGetY /* f1a4f4c: a7a20044 */ sh $v0,0x44($sp) /* f1a4f50: 3c0c8008 */ lui $t4,%hi(var8007fb10) /* f1a4f54: 3c188008 */ lui $t8,%hi(var8007fb0c) @@ -1721,9 +1721,9 @@ glabel menuhandler001a44c0 /* f1a4fd8: 27a60150 */ addiu $a2,$sp,0x150 /* f1a4fdc: 0fc54e16 */ jal func0f153858 /* f1a4fe0: 27a7014c */ addiu $a3,$sp,0x14c -/* f1a4fe4: 0c002f02 */ jal func0000bc08 +/* f1a4fe4: 0c002f02 */ jal viGetX /* f1a4fe8: afa2015c */ sw $v0,0x15c($sp) -/* f1a4fec: 0c002f06 */ jal func0000bc18 +/* f1a4fec: 0c002f06 */ jal viGetY /* f1a4ff0: a7a20044 */ sh $v0,0x44($sp) /* f1a4ff4: 3c0d8008 */ lui $t5,%hi(var8007fb10) /* f1a4ff8: 3c198008 */ lui $t9,%hi(var8007fb0c) @@ -1778,9 +1778,9 @@ glabel menuhandler001a44c0 /* f1a50bc: 27a60150 */ addiu $a2,$sp,0x150 /* f1a50c0: 0fc54e16 */ jal func0f153858 /* f1a50c4: 27a7014c */ addiu $a3,$sp,0x14c -/* f1a50c8: 0c002f02 */ jal func0000bc08 +/* f1a50c8: 0c002f02 */ jal viGetX /* f1a50cc: afa2015c */ sw $v0,0x15c($sp) -/* f1a50d0: 0c002f06 */ jal func0000bc18 +/* f1a50d0: 0c002f06 */ jal viGetY /* f1a50d4: a7a20044 */ sh $v0,0x44($sp) /* f1a50d8: 3c0e8008 */ lui $t6,%hi(var8007fb10) /* f1a50dc: 3c0c8008 */ lui $t4,%hi(var8007fb0c) @@ -1820,9 +1820,9 @@ glabel menuhandler001a44c0 /* f1a5164: 27a60150 */ addiu $a2,$sp,0x150 /* f1a5168: 0fc54e16 */ jal func0f153858 /* f1a516c: 27a7014c */ addiu $a3,$sp,0x14c -/* f1a5170: 0c002f02 */ jal func0000bc08 +/* f1a5170: 0c002f02 */ jal viGetX /* f1a5174: afa2015c */ sw $v0,0x15c($sp) -/* f1a5178: 0c002f06 */ jal func0000bc18 +/* f1a5178: 0c002f06 */ jal viGetY /* f1a517c: a7a20044 */ sh $v0,0x44($sp) /* f1a5180: 3c0d8008 */ lui $t5,%hi(var8007fb10) /* f1a5184: 3c198008 */ lui $t9,%hi(var8007fb0c) @@ -1861,9 +1861,9 @@ glabel menuhandler001a44c0 /* f1a5208: 27a60150 */ addiu $a2,$sp,0x150 /* f1a520c: 0fc54e16 */ jal func0f153858 /* f1a5210: 27a7014c */ addiu $a3,$sp,0x14c -/* f1a5214: 0c002f02 */ jal func0000bc08 +/* f1a5214: 0c002f02 */ jal viGetX /* f1a5218: afa2015c */ sw $v0,0x15c($sp) -/* f1a521c: 0c002f06 */ jal func0000bc18 +/* f1a521c: 0c002f06 */ jal viGetY /* f1a5220: a7a20044 */ sh $v0,0x44($sp) /* f1a5224: 3c0c8008 */ lui $t4,%hi(var8007fb10) /* f1a5228: 3c188008 */ lui $t8,%hi(var8007fb0c) @@ -1917,9 +1917,9 @@ glabel menuhandler001a44c0 /* f1a52e8: 27a60150 */ addiu $a2,$sp,0x150 /* f1a52ec: 0fc54e16 */ jal func0f153858 /* f1a52f0: 27a7014c */ addiu $a3,$sp,0x14c -/* f1a52f4: 0c002f02 */ jal func0000bc08 +/* f1a52f4: 0c002f02 */ jal viGetX /* f1a52f8: afa2015c */ sw $v0,0x15c($sp) -/* f1a52fc: 0c002f06 */ jal func0000bc18 +/* f1a52fc: 0c002f06 */ jal viGetY /* f1a5300: a7a20044 */ sh $v0,0x44($sp) /* f1a5304: 3c0f8008 */ lui $t7,%hi(var8007fb10) /* f1a5308: 3c0d8008 */ lui $t5,%hi(var8007fb0c) @@ -1959,9 +1959,9 @@ glabel menuhandler001a44c0 /* f1a5390: 27a60150 */ addiu $a2,$sp,0x150 /* f1a5394: 0fc54e16 */ jal func0f153858 /* f1a5398: 27a7014c */ addiu $a3,$sp,0x14c -/* f1a539c: 0c002f02 */ jal func0000bc08 +/* f1a539c: 0c002f02 */ jal viGetX /* f1a53a0: afa2015c */ sw $v0,0x15c($sp) -/* f1a53a4: 0c002f06 */ jal func0000bc18 +/* f1a53a4: 0c002f06 */ jal viGetY /* f1a53a8: a7a20044 */ sh $v0,0x44($sp) /* f1a53ac: 3c0c8008 */ lui $t4,%hi(var8007fb10) /* f1a53b0: 3c188008 */ lui $t8,%hi(var8007fb0c) @@ -2002,9 +2002,9 @@ glabel menuhandler001a44c0 /* f1a543c: 27a60150 */ addiu $a2,$sp,0x150 /* f1a5440: 0fc54e16 */ jal func0f153858 /* f1a5444: 27a7014c */ addiu $a3,$sp,0x14c -/* f1a5448: 0c002f02 */ jal func0000bc08 +/* f1a5448: 0c002f02 */ jal viGetX /* f1a544c: afa2015c */ sw $v0,0x15c($sp) -/* f1a5450: 0c002f06 */ jal func0000bc18 +/* f1a5450: 0c002f06 */ jal viGetY /* f1a5454: a7a20044 */ sh $v0,0x44($sp) /* f1a5458: 3c198008 */ lui $t9,%hi(var8007fb10) /* f1a545c: 3c0e8008 */ lui $t6,%hi(var8007fb0c) @@ -2056,9 +2056,9 @@ glabel menuhandler001a44c0 /* f1a5514: 27a60150 */ addiu $a2,$sp,0x150 /* f1a5518: 0fc54e16 */ jal func0f153858 /* f1a551c: 27a7014c */ addiu $a3,$sp,0x14c -/* f1a5520: 0c002f02 */ jal func0000bc08 +/* f1a5520: 0c002f02 */ jal viGetX /* f1a5524: afa2015c */ sw $v0,0x15c($sp) -/* f1a5528: 0c002f06 */ jal func0000bc18 +/* f1a5528: 0c002f06 */ jal viGetY /* f1a552c: a7a20044 */ sh $v0,0x44($sp) /* f1a5530: 3c0e8008 */ lui $t6,%hi(var8007fb10) /* f1a5534: 3c0c8008 */ lui $t4,%hi(var8007fb0c) @@ -2097,9 +2097,9 @@ glabel menuhandler001a44c0 /* f1a55b8: 27a60150 */ addiu $a2,$sp,0x150 /* f1a55bc: 0fc54e16 */ jal func0f153858 /* f1a55c0: 27a7014c */ addiu $a3,$sp,0x14c -/* f1a55c4: 0c002f02 */ jal func0000bc08 +/* f1a55c4: 0c002f02 */ jal viGetX /* f1a55c8: afa2015c */ sw $v0,0x15c($sp) -/* f1a55cc: 0c002f06 */ jal func0000bc18 +/* f1a55cc: 0c002f06 */ jal viGetY /* f1a55d0: a7a20044 */ sh $v0,0x44($sp) /* f1a55d4: 3c0f8008 */ lui $t7,%hi(var8007fb10) /* f1a55d8: 3c0d8008 */ lui $t5,%hi(var8007fb0c) @@ -2157,9 +2157,9 @@ glabel menuhandler001a44c0 /* f1a56a8: 27a60150 */ addiu $a2,$sp,0x150 /* f1a56ac: 0fc54e16 */ jal func0f153858 /* f1a56b0: 27a7014c */ addiu $a3,$sp,0x14c -/* f1a56b4: 0c002f02 */ jal func0000bc08 +/* f1a56b4: 0c002f02 */ jal viGetX /* f1a56b8: afa2015c */ sw $v0,0x15c($sp) -/* f1a56bc: 0c002f06 */ jal func0000bc18 +/* f1a56bc: 0c002f06 */ jal viGetY /* f1a56c0: a7a20044 */ sh $v0,0x44($sp) /* f1a56c4: 3c198008 */ lui $t9,%hi(var8007fb10) /* f1a56c8: 3c0c8008 */ lui $t4,%hi(var8007fb0c) @@ -2198,9 +2198,9 @@ glabel menuhandler001a44c0 /* f1a574c: 27a60150 */ addiu $a2,$sp,0x150 /* f1a5750: 0fc54e16 */ jal func0f153858 /* f1a5754: 27a7014c */ addiu $a3,$sp,0x14c -/* f1a5758: 0c002f02 */ jal func0000bc08 +/* f1a5758: 0c002f02 */ jal viGetX /* f1a575c: afa2015c */ sw $v0,0x15c($sp) -/* f1a5760: 0c002f06 */ jal func0000bc18 +/* f1a5760: 0c002f06 */ jal viGetY /* f1a5764: a7a20044 */ sh $v0,0x44($sp) /* f1a5768: 3c188008 */ lui $t8,%hi(var8007fb10) /* f1a576c: 3c0f8008 */ lui $t7,%hi(var8007fb0c) @@ -2239,9 +2239,9 @@ glabel menuhandler001a44c0 /* f1a57f0: 27a60150 */ addiu $a2,$sp,0x150 /* f1a57f4: 0fc54e16 */ jal func0f153858 /* f1a57f8: 27a7014c */ addiu $a3,$sp,0x14c -/* f1a57fc: 0c002f02 */ jal func0000bc08 +/* f1a57fc: 0c002f02 */ jal viGetX /* f1a5800: afa2015c */ sw $v0,0x15c($sp) -/* f1a5804: 0c002f06 */ jal func0000bc18 +/* f1a5804: 0c002f06 */ jal viGetY /* f1a5808: a7a20044 */ sh $v0,0x44($sp) /* f1a580c: 3c198008 */ lui $t9,%hi(var8007fb00) /* f1a5810: 3c0c8008 */ lui $t4,%hi(var8007fafc) @@ -2286,9 +2286,9 @@ glabel menuhandler001a44c0 /* f1a58ac: 27a60150 */ addiu $a2,$sp,0x150 /* f1a58b0: 0fc54e16 */ jal func0f153858 /* f1a58b4: 27a7014c */ addiu $a3,$sp,0x14c -/* f1a58b8: 0c002f02 */ jal func0000bc08 +/* f1a58b8: 0c002f02 */ jal viGetX /* f1a58bc: afa2015c */ sw $v0,0x15c($sp) -/* f1a58c0: 0c002f06 */ jal func0000bc18 +/* f1a58c0: 0c002f06 */ jal viGetY /* f1a58c4: a7a20044 */ sh $v0,0x44($sp) /* f1a58c8: 3c0c8008 */ lui $t4,%hi(var8007fb00) /* f1a58cc: 3c0e8008 */ lui $t6,%hi(var8007fafc) @@ -2333,9 +2333,9 @@ glabel menuhandler001a44c0 /* f1a5968: 27a60150 */ addiu $a2,$sp,0x150 /* f1a596c: 0fc54e16 */ jal func0f153858 /* f1a5970: 27a7014c */ addiu $a3,$sp,0x14c -/* f1a5974: 0c002f02 */ jal func0000bc08 +/* f1a5974: 0c002f02 */ jal viGetX /* f1a5978: afa2015c */ sw $v0,0x15c($sp) -/* f1a597c: 0c002f06 */ jal func0000bc18 +/* f1a597c: 0c002f06 */ jal viGetY /* f1a5980: a7a20044 */ sh $v0,0x44($sp) /* f1a5984: 3c0e8008 */ lui $t6,%hi(var8007fb00) /* f1a5988: 3c188008 */ lui $t8,%hi(var8007fafc) @@ -2380,9 +2380,9 @@ glabel menuhandler001a44c0 /* f1a5a24: 27a60150 */ addiu $a2,$sp,0x150 /* f1a5a28: 0fc54e16 */ jal func0f153858 /* f1a5a2c: 27a7014c */ addiu $a3,$sp,0x14c -/* f1a5a30: 0c002f02 */ jal func0000bc08 +/* f1a5a30: 0c002f02 */ jal viGetX /* f1a5a34: afa2015c */ sw $v0,0x15c($sp) -/* f1a5a38: 0c002f06 */ jal func0000bc18 +/* f1a5a38: 0c002f06 */ jal viGetY /* f1a5a3c: a7a20044 */ sh $v0,0x44($sp) /* f1a5a40: 3c188008 */ lui $t8,%hi(var8007fb00) /* f1a5a44: 3c0f8008 */ lui $t7,%hi(var8007fafc) @@ -3936,9 +3936,9 @@ glabel menuhandler001a6ea4 .L0f1a7220: /* f1a7220: 8e0a0004 */ lw $t2,0x4($s0) /* f1a7224: 25580008 */ addiu $t8,$t2,0x8 -/* f1a7228: 0c002f02 */ jal func0000bc08 +/* f1a7228: 0c002f02 */ jal viGetX /* f1a722c: afb80098 */ sw $t8,0x98($sp) -/* f1a7230: 0c002f06 */ jal func0000bc18 +/* f1a7230: 0c002f06 */ jal viGetY /* f1a7234: a7a20044 */ sh $v0,0x44($sp) /* f1a7238: 3c0f8008 */ lui $t7,%hi(var8007fb18) /* f1a723c: 3c198008 */ lui $t9,%hi(var8007fb14) @@ -3990,9 +3990,9 @@ glabel menuhandler001a6ea4 .L0f1a72f0: /* f1a72f0: 8e0a0004 */ lw $t2,0x4($s0) /* f1a72f4: 25580019 */ addiu $t8,$t2,0x19 -/* f1a72f8: 0c002f02 */ jal func0000bc08 +/* f1a72f8: 0c002f02 */ jal viGetX /* f1a72fc: afb80098 */ sw $t8,0x98($sp) -/* f1a7300: 0c002f06 */ jal func0000bc18 +/* f1a7300: 0c002f06 */ jal viGetY /* f1a7304: a7a20044 */ sh $v0,0x44($sp) /* f1a7308: 3c0f8008 */ lui $t7,%hi(var8007fb10) /* f1a730c: 3c198008 */ lui $t9,%hi(var8007fb0c) diff --git a/src/game/mplayer.c b/src/game/mplayer.c index 9eab6ac6d..b455233f4 100644 --- a/src/game/mplayer.c +++ b/src/game/mplayer.c @@ -2382,9 +2382,9 @@ glabel func0f18973c /* f1898a8: 00015843 */ sra $t3,$at,0x1 .L0f1898ac: /* f1898ac: 012b6023 */ subu $t4,$t1,$t3 -/* f1898b0: 0c002f02 */ jal func0000bc08 +/* f1898b0: 0c002f02 */ jal viGetX /* f1898b4: afac0094 */ sw $t4,0x94($sp) -/* f1898b8: 0c002f02 */ jal func0000bc08 +/* f1898b8: 0c002f02 */ jal viGetX /* f1898bc: a7a20040 */ sh $v0,0x40($sp) /* f1898c0: 8faf0054 */ lw $t7,0x54($sp) /* f1898c4: 3c0d8008 */ lui $t5,%hi(var8007fb18) @@ -2516,9 +2516,9 @@ glabel func0f18973c /* f189aa4: 00017043 */ sra $t6,$at,0x1 .L0f189aa8: /* f189aa8: 018e7823 */ subu $t7,$t4,$t6 -/* f189aac: 0c002f02 */ jal func0000bc08 +/* f189aac: 0c002f02 */ jal viGetX /* f189ab0: afaf0094 */ sw $t7,0x94($sp) -/* f189ab4: 0c002f02 */ jal func0000bc08 +/* f189ab4: 0c002f02 */ jal viGetX /* f189ab8: a7a20040 */ sh $v0,0x40($sp) /* f189abc: 3c188008 */ lui $t8,%hi(var8007fb10) /* f189ac0: 3c198008 */ lui $t9,%hi(var8007fb0c) @@ -2604,9 +2604,9 @@ glabel func0f18973c .L0f189bf8: /* f189bf8: 01f94023 */ subu $t0,$t7,$t9 /* f189bfc: afa80094 */ sw $t0,0x94($sp) -/* f189c00: 0c002f02 */ jal func0000bc08 +/* f189c00: 0c002f02 */ jal viGetX /* f189c04: afaa0090 */ sw $t2,0x90($sp) -/* f189c08: 0c002f02 */ jal func0000bc08 +/* f189c08: 0c002f02 */ jal viGetX /* f189c0c: a7a20040 */ sh $v0,0x40($sp) /* f189c10: 3c098008 */ lui $t1,%hi(var8007fb10) /* f189c14: 3c0b8008 */ lui $t3,%hi(var8007fb0c) diff --git a/src/game/title.c b/src/game/title.c index a66ef0221..e063e2ffe 100644 --- a/src/game/title.c +++ b/src/game/title.c @@ -515,9 +515,9 @@ glabel func0f0165f0 /* f016684: 00017043 */ sra $t6,$at,0x1 .L0f016688: /* f016688: 01eec023 */ subu $t8,$t7,$t6 -/* f01668c: 0c002f02 */ jal func0000bc08 +/* f01668c: 0c002f02 */ jal viGetX /* f016690: afb80040 */ sw $t8,0x40($sp) -/* f016694: 0c002f06 */ jal func0000bc18 +/* f016694: 0c002f06 */ jal viGetY /* f016698: a7a2003c */ sh $v0,0x3c($sp) /* f01669c: 8fb90068 */ lw $t9,0x68($sp) /* f0166a0: 8fa9006c */ lw $t1,0x6c($sp) @@ -668,7 +668,7 @@ glabel var7f1a83e4 /* f01687c: 24010004 */ addiu $at,$zero,0x4 /* f016880: 0fc54de0 */ jal func0f153780 /* f016884: 8fa40128 */ lw $a0,0x128($sp) -/* f016888: 0c002f02 */ jal func0000bc08 +/* f016888: 0c002f02 */ jal viGetX /* f01688c: afa20128 */ sw $v0,0x128($sp) /* f016890: 86060002 */ lh $a2,0x2($s0) /* f016894: 3c0c7f7f */ lui $t4,0x7f7f @@ -930,11 +930,11 @@ glabel var7f1a83e4 /* f016c88: afad00d8 */ sw $t5,0xd8($sp) /* f016c8c: 0fc5b9f1 */ jal langGet /* f016c90: 9604000a */ lhu $a0,0xa($s0) -/* f016c94: 0c002f02 */ jal func0000bc08 +/* f016c94: 0c002f02 */ jal viGetX /* f016c98: 00409825 */ or $s3,$v0,$zero /* f016c9c: 0002a400 */ sll $s4,$v0,0x10 /* f016ca0: 0014c403 */ sra $t8,$s4,0x10 -/* f016ca4: 0c002f06 */ jal func0000bc18 +/* f016ca4: 0c002f06 */ jal viGetY /* f016ca8: 0300a025 */ or $s4,$t8,$zero /* f016cac: 8fa40128 */ lw $a0,0x128($sp) /* f016cb0: 27a500dc */ addiu $a1,$sp,0xdc @@ -3392,11 +3392,11 @@ glabel func0f018ebc /* f018fc4: 0006000d */ break 0x6 .L0f018fc8: /* f018fc8: a3aa0080 */ sb $t2,0x80($sp) -/* f018fcc: 0c002f02 */ jal func0000bc08 +/* f018fcc: 0c002f02 */ jal viGetX /* f018fd0: 00000000 */ sll $zero,$zero,0x0 /* f018fd4: 00029c00 */ sll $s3,$v0,0x10 /* f018fd8: 00135c03 */ sra $t3,$s3,0x10 -/* f018fdc: 0c002f06 */ jal func0000bc18 +/* f018fdc: 0c002f06 */ jal viGetY /* f018fe0: 01609825 */ or $s3,$t3,$zero /* f018fe4: 3c017f7f */ lui $at,0x7f7f /* f018fe8: 3421ffff */ ori $at,$at,0xffff @@ -4527,9 +4527,9 @@ glabel titleRenderNoController /* f01a5ac: 25aefff4 */ addiu $t6,$t5,-12 /* f01a5b0: 11e0001c */ beqz $t7,.L0f01a624 /* f01a5b4: afae0058 */ sw $t6,0x58($sp) -/* f01a5b8: 0c002f02 */ jal func0000bc08 +/* f01a5b8: 0c002f02 */ jal viGetX /* f01a5bc: 00000000 */ sll $zero,$zero,0x0 -/* f01a5c0: 0c002f06 */ jal func0000bc18 +/* f01a5c0: 0c002f06 */ jal viGetY /* f01a5c4: a7a20048 */ sh $v0,0x48($sp) /* f01a5c8: 3c198008 */ lui $t9,%hi(var8007fb20) /* f01a5cc: 3c188008 */ lui $t8,%hi(var8007fb1c) @@ -4555,9 +4555,9 @@ glabel titleRenderNoController /* f01a61c: 10000018 */ beqz $zero,.L0f01a680 /* f01a620: 00408025 */ or $s0,$v0,$zero .L0f01a624: -/* f01a624: 0c002f02 */ jal func0000bc08 +/* f01a624: 0c002f02 */ jal viGetX /* f01a628: 00000000 */ sll $zero,$zero,0x0 -/* f01a62c: 0c002f06 */ jal func0000bc18 +/* f01a62c: 0c002f06 */ jal viGetY /* f01a630: a7a20048 */ sh $v0,0x48($sp) /* f01a634: 3c0a8008 */ lui $t2,%hi(var8007fb20) /* f01a638: 3c0c8008 */ lui $t4,%hi(var8007fb1c) @@ -4612,9 +4612,9 @@ glabel titleRenderNoController /* f01a6f4: 25cf000c */ addiu $t7,$t6,0xc /* f01a6f8: 1320001c */ beqz $t9,.L0f01a76c /* f01a6fc: afaf0058 */ sw $t7,0x58($sp) -/* f01a700: 0c002f02 */ jal func0000bc08 +/* f01a700: 0c002f02 */ jal viGetX /* f01a704: 00000000 */ sll $zero,$zero,0x0 -/* f01a708: 0c002f06 */ jal func0000bc18 +/* f01a708: 0c002f06 */ jal viGetY /* f01a70c: a7a20048 */ sh $v0,0x48($sp) /* f01a710: 3c088008 */ lui $t0,%hi(var8007fb20) /* f01a714: 3c188008 */ lui $t8,%hi(var8007fb1c) @@ -4640,9 +4640,9 @@ glabel titleRenderNoController /* f01a764: 10000018 */ beqz $zero,.L0f01a7c8 /* f01a768: 00408025 */ or $s0,$v0,$zero .L0f01a76c: -/* f01a76c: 0c002f02 */ jal func0000bc08 +/* f01a76c: 0c002f02 */ jal viGetX /* f01a770: 00000000 */ sll $zero,$zero,0x0 -/* f01a774: 0c002f06 */ jal func0000bc18 +/* f01a774: 0c002f06 */ jal viGetY /* f01a778: a7a20048 */ sh $v0,0x48($sp) /* f01a77c: 3c0a8008 */ lui $t2,%hi(var8007fb20) /* f01a780: 3c0d8008 */ lui $t5,%hi(var8007fb1c) @@ -4673,7 +4673,7 @@ glabel titleRenderNoController /* f01a7e0: 00000000 */ sll $zero,$zero,0x0 ); -// Mismatch because goal uses an implicit stack address for func0000bc08's +// Mismatch because goal uses an implicit stack address for viGetX's // return value while mine uses s0, or multiple stack addresses. // // Each time func000bc08 is called, goal puts the result in sp72 to preserve it @@ -4706,10 +4706,10 @@ glabel titleRenderNoController // // if (g_LanguageId != LANGUAGE_ENGLISH) { // gdl = textRender(gdl, &x, &y, text, var8007fb20, var8007fb1c, -// -1, 0x008000ff, func0000bc08(), func0000bc18(), 0, 0); +// -1, 0x008000ff, viGetX(), viGetY(), 0, 0); // } else { // gdl = textRenderWhite(gdl, &x, &y, text, var8007fb20, var8007fb1c, -// -1, func0000bc08(), func0000bc18(), 0, 0); +// -1, viGetX(), viGetY(), 0, 0); // } // // // Second line @@ -4721,10 +4721,10 @@ glabel titleRenderNoController // // if (g_LanguageId != LANGUAGE_ENGLISH) { // gdl = textRender(gdl, &x, &y, text, var8007fb20, var8007fb1c, -// -1, 0x008000ff, func0000bc08(), func0000bc18(), 0, 0); +// -1, 0x008000ff, viGetX(), viGetY(), 0, 0); // } else { -// s16 a = func0000bc08(); -// s16 b = func0000bc18(); +// s16 a = viGetX(); +// s16 b = viGetY(); // gdl = textRenderWhite(gdl, &x, &y, text, var8007fb20, var8007fb1c, // -1, a, b, 0, 0); // } diff --git a/src/include/lib/lib_09660.h b/src/include/lib/lib_09660.h index 517692a59..a4195eb8f 100644 --- a/src/include/lib/lib_09660.h +++ b/src/include/lib/lib_09660.h @@ -39,8 +39,8 @@ void func0000bba0(s16 arg0, s16 arg1); s16 viGetBufX(void); s16 viGetBufY(void); void func0000bbe4(s16 arg0, s16 arg1); -s16 func0000bc08(void); -s16 func0000bc18(void); +s16 viGetX(void); +s16 viGetY(void); void func0000bc28(s16 arg0, s16 arg1); s16 viGetViewX(void); s16 viGetViewY(void); diff --git a/src/lib/lib_09660.c b/src/lib/lib_09660.c index 6c7091c8f..a9e333e33 100644 --- a/src/lib/lib_09660.c +++ b/src/lib/lib_09660.c @@ -2129,9 +2129,9 @@ glabel func0000b330 /* b354: ac780000 */ sw $t8,0x0($v1) /* b358: 24660008 */ addiu $a2,$v1,0x8 /* b35c: afa600a8 */ sw $a2,0xa8($sp) -/* b360: 0c002f02 */ jal func0000bc08 +/* b360: 0c002f02 */ jal viGetX /* b364: afa300a0 */ sw $v1,0xa0($sp) -/* b368: 0c002f06 */ jal func0000bc18 +/* b368: 0c002f06 */ jal viGetY /* b36c: a7a20056 */ sh $v0,0x56($sp) /* b370: 44822000 */ mtc1 $v0,$f4 /* b374: 87af0056 */ lh $t7,0x56($sp) @@ -2219,7 +2219,7 @@ glabel func0000b330 /* b4a4: 8fa600a8 */ lw $a2,0xa8($sp) /* b4a8: afa60098 */ sw $a2,0x98($sp) /* b4ac: 24c60008 */ addiu $a2,$a2,0x8 -/* b4b0: 0c002f02 */ jal func0000bc08 +/* b4b0: 0c002f02 */ jal viGetX /* b4b4: afa600a8 */ sw $a2,0xa8($sp) /* b4b8: 0c002f44 */ jal viGetViewTop /* b4bc: a7a20056 */ sh $v0,0x56($sp) @@ -2247,7 +2247,7 @@ glabel func0000b330 /* b510: afa600a8 */ sw $a2,0xa8($sp) /* b514: 0c002f44 */ jal viGetViewTop /* b518: a7a20042 */ sh $v0,0x42($sp) -/* b51c: 0c002f06 */ jal func0000bc18 +/* b51c: 0c002f06 */ jal viGetY /* b520: a7a20056 */ sh $v0,0x56($sp) /* b524: 87b80056 */ lh $t8,0x56($sp) /* b528: 87ad0042 */ lh $t5,0x42($sp) @@ -2258,9 +2258,9 @@ glabel func0000b330 /* b53c: 8fbf0014 */ lw $ra,0x14($sp) /* b540: afa60090 */ sw $a2,0x90($sp) /* b544: 24c60008 */ addiu $a2,$a2,0x8 -/* b548: 0c002f02 */ jal func0000bc08 +/* b548: 0c002f02 */ jal viGetX /* b54c: afa600a8 */ sw $a2,0xa8($sp) -/* b550: 0c002f06 */ jal func0000bc18 +/* b550: 0c002f06 */ jal viGetY /* b554: a7a20056 */ sh $v0,0x56($sp) /* b558: 87b90056 */ lh $t9,0x56($sp) /* b55c: 244effff */ addiu $t6,$v0,-1 @@ -2372,7 +2372,7 @@ glabel func0000b330 /* b6d0: 24c60008 */ addiu $a2,$a2,0x8 /* b6d4: afa600a8 */ sw $a2,0xa8($sp) /* b6d8: afa4007c */ sw $a0,0x7c($sp) -/* b6dc: 0c002f02 */ jal func0000bc08 +/* b6dc: 0c002f02 */ jal viGetX /* b6e0: afac0084 */ sw $t4,0x84($sp) /* b6e4: 3c18800a */ lui $t8,%hi(g_Vars+0x64) /* b6e8: 8f18a024 */ lw $t8,%lo(g_Vars+0x64)($t8) @@ -2398,7 +2398,7 @@ glabel func0000b330 /* b738: 24c60008 */ addiu $a2,$a2,0x8 .L0000b73c: /* b73c: afa600a8 */ sw $a2,0xa8($sp) -/* b740: 0c002f06 */ jal func0000bc18 +/* b740: 0c002f06 */ jal viGetY /* b744: afac0084 */ sw $t4,0x84($sp) /* b748: 8fac0084 */ lw $t4,0x84($sp) /* b74c: 3c0b800a */ lui $t3,%hi(g_Vars) @@ -2416,9 +2416,9 @@ glabel func0000b330 /* b77c: afa60074 */ sw $a2,0x74($sp) /* b780: 24c60008 */ addiu $a2,$a2,0x8 /* b784: afa600a8 */ sw $a2,0xa8($sp) -/* b788: 0c002f02 */ jal func0000bc08 +/* b788: 0c002f02 */ jal viGetX /* b78c: afa5002c */ sw $a1,0x2c($sp) -/* b790: 0c002f06 */ jal func0000bc18 +/* b790: 0c002f06 */ jal viGetY /* b794: a7a20056 */ sh $v0,0x56($sp) /* b798: 87ad0056 */ lh $t5,0x56($sp) /* b79c: 2459ffff */ addiu $t9,$v0,-1 @@ -2450,7 +2450,7 @@ glabel func0000b330 .L0000b804: /* b804: 24c60008 */ addiu $a2,$a2,0x8 /* b808: afa600a8 */ sw $a2,0xa8($sp) -/* b80c: 0c002f02 */ jal func0000bc08 +/* b80c: 0c002f02 */ jal viGetX /* b810: afa4006c */ sw $a0,0x6c($sp) /* b814: 8fae0080 */ lw $t6,0x80($sp) /* b818: 3c0b800a */ lui $t3,%hi(g_Vars) @@ -2596,7 +2596,7 @@ glabel func0000b330 /* ba00: 24c60008 */ addiu $a2,$a2,0x8 /* ba04: afa600a8 */ sw $a2,0xa8($sp) /* ba08: afa50064 */ sw $a1,0x64($sp) -/* ba0c: 0c002f06 */ jal func0000bc18 +/* ba0c: 0c002f06 */ jal viGetY /* ba10: afac001c */ sw $t4,0x1c($sp) /* ba14: 8fac001c */ lw $t4,0x1c($sp) /* ba18: 8fa50064 */ lw $a1,0x64($sp) @@ -2664,9 +2664,9 @@ glabel func0000b330 /* baf4: afa6005c */ sw $a2,0x5c($sp) /* baf8: 24c60008 */ addiu $a2,$a2,0x8 /* bafc: afa600a8 */ sw $a2,0xa8($sp) -/* bb00: 0c002f02 */ jal func0000bc08 +/* bb00: 0c002f02 */ jal viGetX /* bb04: afac001c */ sw $t4,0x1c($sp) -/* bb08: 0c002f06 */ jal func0000bc18 +/* bb08: 0c002f06 */ jal viGetY /* bb0c: a7a20056 */ sh $v0,0x56($sp) /* bb10: 87b80056 */ lh $t8,0x56($sp) /* bb14: 244effff */ addiu $t6,$v0,-1 @@ -2744,21 +2744,15 @@ glabel func0000bbe4 /* bc04: a5250006 */ sh $a1,0x6($t1) ); -GLOBAL_ASM( -glabel func0000bc08 -/* bc08: 3c0e8006 */ lui $t6,%hi(g_ViData) -/* bc0c: 8dced594 */ lw $t6,%lo(g_ViData)($t6) -/* bc10: 03e00008 */ jr $ra -/* bc14: 85c20004 */ lh $v0,0x4($t6) -); +s16 viGetX(void) +{ + return g_ViData->x; +} -GLOBAL_ASM( -glabel func0000bc18 -/* bc18: 3c0e8006 */ lui $t6,%hi(g_ViData) -/* bc1c: 8dced594 */ lw $t6,%lo(g_ViData)($t6) -/* bc20: 03e00008 */ jr $ra -/* bc24: 85c20006 */ lh $v0,0x6($t6) -); +s16 viGetY(void) +{ + return g_ViData->y; +} GLOBAL_ASM( glabel func0000bc28 diff --git a/src/lib/lib_0c000.c b/src/lib/lib_0c000.c index 4407de601..4b0dea8d7 100644 --- a/src/lib/lib_0c000.c +++ b/src/lib/lib_0c000.c @@ -1062,7 +1062,7 @@ glabel func0000cdc8 /* cdcc: afbf0014 */ sw $ra,0x14($sp) /* cdd0: afa40018 */ sw $a0,0x18($sp) /* cdd4: afa5001c */ sw $a1,0x1c($sp) -/* cdd8: 0c002f02 */ jal func0000bc08 +/* cdd8: 0c002f02 */ jal viGetX /* cddc: afa60020 */ sw $a2,0x20($sp) /* cde0: 93a30023 */ lbu $v1,0x23($sp) /* cde4: 8fa50018 */ lw $a1,0x18($sp) @@ -1192,7 +1192,7 @@ glabel func0000cf54 /* cf80: afb20020 */ sw $s2,0x20($sp) /* cf84: afb1001c */ sw $s1,0x1c($sp) /* cf88: afb00018 */ sw $s0,0x18($sp) -/* cf8c: 0c002f02 */ jal func0000bc08 +/* cf8c: 0c002f02 */ jal viGetX /* cf90: ac2ed998 */ sw $t6,%lo(var8005d998)($at) /* cf94: 2450fff3 */ addiu $s0,$v0,-13 /* cf98: 06010003 */ bgez $s0,.L0000cfa8 @@ -1200,7 +1200,7 @@ glabel func0000cf54 /* cfa0: 26010003 */ addiu $at,$s0,0x3 /* cfa4: 00017883 */ sra $t7,$at,0x2 .L0000cfa8: -/* cfa8: 0c002f06 */ jal func0000bc18 +/* cfa8: 0c002f06 */ jal viGetY /* cfac: 01e08025 */ or $s0,$t7,$zero /* cfb0: 2443fff6 */ addiu $v1,$v0,-10 /* cfb4: 24010007 */ addiu $at,$zero,0x7