From 8f27d69b568bb0e3416f159d679ba832765a497f Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Mon, 15 Jun 2020 18:56:31 +1000 Subject: [PATCH] Decompile viGetViewX, viGetViewY, viGetViewTop and viGetViewLeft --- src/game/chr/chr.c | 24 +-- src/game/data/data_000000.c | 55 ++++--- src/game/game_006bd0.c | 24 +-- src/game/game_097ba0.c | 42 +++--- src/game/game_0b63b0.c | 28 ++-- src/game/game_0d7070.c | 40 ++--- src/game/game_0dcdb0.c | 26 ++-- src/game/game_0f09f0.c | 100 ++++++------- src/game/game_0fd660.c | 44 +++--- src/game/game_11f000.c | 56 +++---- src/game/game_135c70.c | 8 +- src/game/game_13c510.c | 12 +- src/game/game_141820.c | 104 ++++++------- src/game/game_157db0.c | 12 +- src/game/game_167ae0.c | 44 +++--- src/game/game_17f930.c | 36 ++--- src/game/game_18e5a0.c | 6 +- src/game/game_19c990.c | 26 ++-- src/game/mplayer.c | 26 ++-- src/game/propobj.c | 8 +- src/game/title.c | 14 +- src/include/game/data/data_000000.h | 4 +- src/include/lib/lib_09660.h | 8 +- src/include/types.h | 18 +++ src/lib/lib_09660.c | 222 ++++++++++++++-------------- 25 files changed, 503 insertions(+), 484 deletions(-) diff --git a/src/game/chr/chr.c b/src/game/chr/chr.c index c33b2ef98..a6bb03b22 100644 --- a/src/game/chr/chr.c +++ b/src/game/chr/chr.c @@ -14865,60 +14865,60 @@ glabel func0f02bdf8 /* f02c204: 44144000 */ mfc1 $s4,$f8 /* f02c208: 44133000 */ mfc1 $s3,$f6 /* f02c20c: 2694fff8 */ addiu $s4,$s4,-8 -/* f02c210: 0c002f40 */ jal viGetLeft +/* f02c210: 0c002f40 */ jal viGetViewLeft /* f02c214: 2673fff8 */ addiu $s3,$s3,-8 /* f02c218: 0262082a */ slt $at,$s3,$v0 /* f02c21c: 10200004 */ beqz $at,.L0f02c230 /* f02c220: 00000000 */ sll $zero,$zero,0x0 -/* f02c224: 0c002f40 */ jal viGetLeft +/* f02c224: 0c002f40 */ jal viGetViewLeft /* f02c228: 00000000 */ sll $zero,$zero,0x0 /* f02c22c: 00409825 */ or $s3,$v0,$zero .L0f02c230: -/* f02c230: 0c002f40 */ jal viGetLeft +/* f02c230: 0c002f40 */ jal viGetViewLeft /* f02c234: 00000000 */ sll $zero,$zero,0x0 /* f02c238: 00029400 */ sll $s2,$v0,0x10 /* f02c23c: 00127403 */ sra $t6,$s2,0x10 -/* f02c240: 0c002f22 */ jal viGetWidth +/* f02c240: 0c002f22 */ jal viGetViewX /* f02c244: 01c09025 */ or $s2,$t6,$zero /* f02c248: 0052c821 */ addu $t9,$v0,$s2 /* f02c24c: 272cfff0 */ addiu $t4,$t9,-16 /* f02c250: 0193082a */ slt $at,$t4,$s3 /* f02c254: 10200009 */ beqz $at,.L0f02c27c /* f02c258: 00000000 */ sll $zero,$zero,0x0 -/* f02c25c: 0c002f40 */ jal viGetLeft +/* f02c25c: 0c002f40 */ jal viGetViewLeft /* f02c260: 00000000 */ sll $zero,$zero,0x0 /* f02c264: 00029400 */ sll $s2,$v0,0x10 /* f02c268: 00126c03 */ sra $t5,$s2,0x10 -/* f02c26c: 0c002f22 */ jal viGetWidth +/* f02c26c: 0c002f22 */ jal viGetViewX /* f02c270: 01a09025 */ or $s2,$t5,$zero /* f02c274: 00529821 */ addu $s3,$v0,$s2 /* f02c278: 2673fff0 */ addiu $s3,$s3,-16 .L0f02c27c: -/* f02c27c: 0c002f44 */ jal viGetTop +/* f02c27c: 0c002f44 */ jal viGetViewTop /* f02c280: 00000000 */ sll $zero,$zero,0x0 /* f02c284: 0282082a */ slt $at,$s4,$v0 /* f02c288: 10200004 */ beqz $at,.L0f02c29c /* f02c28c: 00000000 */ sll $zero,$zero,0x0 -/* f02c290: 0c002f44 */ jal viGetTop +/* f02c290: 0c002f44 */ jal viGetViewTop /* f02c294: 00000000 */ sll $zero,$zero,0x0 /* f02c298: 0040a025 */ or $s4,$v0,$zero .L0f02c29c: -/* f02c29c: 0c002f44 */ jal viGetTop +/* f02c29c: 0c002f44 */ jal viGetViewTop /* f02c2a0: 00000000 */ sll $zero,$zero,0x0 /* f02c2a4: 00029400 */ sll $s2,$v0,0x10 /* f02c2a8: 00127c03 */ sra $t7,$s2,0x10 -/* f02c2ac: 0c002f26 */ jal viGetHeight +/* f02c2ac: 0c002f26 */ jal viGetViewY /* f02c2b0: 01e09025 */ or $s2,$t7,$zero /* f02c2b4: 0052c021 */ addu $t8,$v0,$s2 /* f02c2b8: 270efff0 */ addiu $t6,$t8,-16 /* f02c2bc: 01d4082a */ slt $at,$t6,$s4 /* f02c2c0: 5020000a */ beqzl $at,.L0f02c2ec /* f02c2c4: 3c0cff10 */ lui $t4,0xff10 -/* f02c2c8: 0c002f44 */ jal viGetTop +/* f02c2c8: 0c002f44 */ jal viGetViewTop /* f02c2cc: 00000000 */ sll $zero,$zero,0x0 /* f02c2d0: 00029400 */ sll $s2,$v0,0x10 /* f02c2d4: 0012cc03 */ sra $t9,$s2,0x10 -/* f02c2d8: 0c002f26 */ jal viGetHeight +/* f02c2d8: 0c002f26 */ jal viGetViewY /* f02c2dc: 03209025 */ or $s2,$t9,$zero /* f02c2e0: 0052a021 */ addu $s4,$v0,$s2 /* f02c2e4: 2694fff0 */ addiu $s4,$s4,-16 diff --git a/src/game/data/data_000000.c b/src/game/data/data_000000.c index 9d630c1d2..8d3d410af 100644 --- a/src/game/data/data_000000.c +++ b/src/game/data/data_000000.c @@ -3423,32 +3423,39 @@ u32 var8005d520 = 0x00000000; u32 var8005d524 = 0x00000000; u32 var8005d528 = 0x00000000; u32 var8005d52c = 0x00000000; -u32 var8005d530 = 0x00000000; -u32 var8005d534 = 0x014000dc; -u32 var8005d538 = 0x42700000; -u32 var8005d53c = 0x3fba2e8c; -u32 var8005d540 = 0x41f00000; -u32 var8005d544 = 0x461c4000; -u32 var8005d548 = 0x014000dc; -u32 var8005d54c = 0x014000dc; -u32 var8005d550 = 0x00000000; -u32 var8005d554 = 0x00000001; -u32 var8005d558 = 0x00000000; -u32 var8005d55c = 0x00000000; -u32 var8005d560 = 0x014000dc; -u32 var8005d564 = 0x42700000; -u32 var8005d568 = 0x3fba2e8c; -u32 var8005d56c = 0x41f00000; -u32 var8005d570 = 0x461c4000; -u32 var8005d574 = 0x014000dc; -u32 var8005d578 = 0x014000dc; -u32 var8005d57c = 0x00000000; -u32 var8005d580 = 0x00000001; -u32 var8005d584 = 0x00000000; + +struct rend_vidat var8005d530 = { + NULL, + 320, 220, // x and y + 60, // fovy + 1.4545454978943f, // aspect + 30, // znear + 10000, // zfar + 320, 220, // bufx and bufy + 320, 220, // viewx and viewy + 0, 0, // viewleft and viewtop + true, // usezbuf + 0, +}; + +struct rend_vidat var8005d55c = { + NULL, + 320, 220, // x and y + 60, // fovy + 1.4545454978943f, // aspect + 30, // znear + 10000, // zfar + 320, 220, // bufx and bufy + 320, 220, // viewx and viewy + 0, 0, // viewleft and viewtop + true, // usezbuf + 0, +}; + u32 var8005d588 = 0x00000000; u32 var8005d58c = 0x00000000; -u32 var8005d590 = (u32) &var8005d530; -u32 var8005d594 = (u32) &var8005d530; +struct rend_vidat *var8005d590 = &var8005d530; +struct rend_vidat *g_ViData = &var8005d530; u32 var8005d598 = 0x00000001; u32 var8005d59c = 0x00000000; u32 var8005d5a0 = 0x00000000; diff --git a/src/game/game_006bd0.c b/src/game/game_006bd0.c index 174f859e5..1bce4602c 100644 --- a/src/game/game_006bd0.c +++ b/src/game/game_006bd0.c @@ -3961,31 +3961,31 @@ glabel func0f00a490 /* f00a580: afa20048 */ sw $v0,0x48($sp) /* f00a584: 0fc59e59 */ jal func0f167964 /* f00a588: 24040004 */ addiu $a0,$zero,0x4 -/* f00a58c: 0c002f40 */ jal viGetLeft +/* f00a58c: 0c002f40 */ jal viGetViewLeft /* f00a590: 00408025 */ or $s0,$v0,$zero /* f00a594: 00027080 */ sll $t6,$v0,0x2 /* f00a598: 01c27021 */ addu $t6,$t6,$v0 /* f00a59c: 000e7040 */ sll $t6,$t6,0x1 -/* f00a5a0: 0c002f44 */ jal viGetTop +/* f00a5a0: 0c002f44 */ jal viGetViewTop /* f00a5a4: a7ae0042 */ sh $t6,0x42($sp) /* f00a5a8: 00027880 */ sll $t7,$v0,0x2 /* f00a5ac: 01e27821 */ addu $t7,$t7,$v0 /* f00a5b0: 000f7840 */ sll $t7,$t7,0x1 -/* f00a5b4: 0c002f40 */ jal viGetLeft +/* f00a5b4: 0c002f40 */ jal viGetViewLeft /* f00a5b8: a7af0040 */ sh $t7,0x40($sp) /* f00a5bc: 00028c00 */ sll $s1,$v0,0x10 /* f00a5c0: 0011c403 */ sra $t8,$s1,0x10 -/* f00a5c4: 0c002f22 */ jal viGetWidth +/* f00a5c4: 0c002f22 */ jal viGetViewX /* f00a5c8: 03008825 */ or $s1,$t8,$zero /* f00a5cc: 00515821 */ addu $t3,$v0,$s1 /* f00a5d0: 000b6080 */ sll $t4,$t3,0x2 /* f00a5d4: 018b6021 */ addu $t4,$t4,$t3 /* f00a5d8: 000c6040 */ sll $t4,$t4,0x1 -/* f00a5dc: 0c002f44 */ jal viGetTop +/* f00a5dc: 0c002f44 */ jal viGetViewTop /* f00a5e0: a7ac003e */ sh $t4,0x3e($sp) /* f00a5e4: 00028c00 */ sll $s1,$v0,0x10 /* f00a5e8: 00116c03 */ sra $t5,$s1,0x10 -/* f00a5ec: 0c002f26 */ jal viGetHeight +/* f00a5ec: 0c002f26 */ jal viGetViewY /* f00a5f0: 01a08825 */ or $s1,$t5,$zero /* f00a5f4: 3c014100 */ lui $at,0x4100 /* f00a5f8: 44811000 */ mtc1 $at,$f2 @@ -4357,31 +4357,31 @@ glabel hudRenderGasIfEnabled /* f00ab6c: afa200a4 */ sw $v0,0xa4($sp) /* f00ab70: 0fc59e59 */ jal func0f167964 /* f00ab74: 24040008 */ addiu $a0,$zero,0x8 -/* f00ab78: 0c002f40 */ jal viGetLeft +/* f00ab78: 0c002f40 */ jal viGetViewLeft /* f00ab7c: 00408025 */ or $s0,$v0,$zero /* f00ab80: 0002c080 */ sll $t8,$v0,0x2 /* f00ab84: 0302c021 */ addu $t8,$t8,$v0 /* f00ab88: 0018c040 */ sll $t8,$t8,0x1 -/* f00ab8c: 0c002f44 */ jal viGetTop +/* f00ab8c: 0c002f44 */ jal viGetViewTop /* f00ab90: a7b8009e */ sh $t8,0x9e($sp) /* f00ab94: 00025080 */ sll $t2,$v0,0x2 /* f00ab98: 01425021 */ addu $t2,$t2,$v0 /* f00ab9c: 000a5040 */ sll $t2,$t2,0x1 -/* f00aba0: 0c002f40 */ jal viGetLeft +/* f00aba0: 0c002f40 */ jal viGetViewLeft /* f00aba4: a7aa009c */ sh $t2,0x9c($sp) /* f00aba8: 00028c00 */ sll $s1,$v0,0x10 /* f00abac: 00117c03 */ sra $t7,$s1,0x10 -/* f00abb0: 0c002f22 */ jal viGetWidth +/* f00abb0: 0c002f22 */ jal viGetViewX /* f00abb4: 01e08825 */ or $s1,$t7,$zero /* f00abb8: 00516021 */ addu $t4,$v0,$s1 /* f00abbc: 000c6880 */ sll $t5,$t4,0x2 /* f00abc0: 01ac6821 */ addu $t5,$t5,$t4 /* f00abc4: 000d6840 */ sll $t5,$t5,0x1 -/* f00abc8: 0c002f44 */ jal viGetTop +/* f00abc8: 0c002f44 */ jal viGetViewTop /* f00abcc: a7ad009a */ sh $t5,0x9a($sp) /* f00abd0: 00028c00 */ sll $s1,$v0,0x10 /* f00abd4: 0011cc03 */ sra $t9,$s1,0x10 -/* f00abd8: 0c002f26 */ jal viGetHeight +/* f00abd8: 0c002f26 */ jal viGetViewY /* f00abdc: 03208825 */ or $s1,$t9,$zero /* f00abe0: 00517821 */ addu $t7,$v0,$s1 /* f00abe4: 000f7080 */ sll $t6,$t7,0x2 diff --git a/src/game/game_097ba0.c b/src/game/game_097ba0.c index 3a1f90f80..88626bc2e 100644 --- a/src/game/game_097ba0.c +++ b/src/game/game_097ba0.c @@ -10922,7 +10922,7 @@ glabel var7f1ac764 /* f0a066c: c7b2008c */ lwc1 $f18,0x8c($sp) /* f0a0670: e6120000 */ swc1 $f18,0x0($s0) /* f0a0674: c7a40090 */ lwc1 $f4,0x90($sp) -/* f0a0678: 0c002f22 */ jal viGetWidth +/* f0a0678: 0c002f22 */ jal viGetViewX /* f0a067c: e6440000 */ swc1 $f4,0x0($s2) /* f0a0680: 44824000 */ mtc1 $v0,$f8 /* f0a0684: c6060000 */ lwc1 $f6,0x0($s0) @@ -10930,7 +10930,7 @@ glabel var7f1ac764 /* f0a068c: 460a3003 */ div.s $f0,$f6,$f10 /* f0a0690: 46000480 */ add.s $f18,$f0,$f0 /* f0a0694: 46149101 */ sub.s $f4,$f18,$f20 -/* f0a0698: 0c002f26 */ jal viGetHeight +/* f0a0698: 0c002f26 */ jal viGetViewY /* f0a069c: e6040000 */ swc1 $f4,0x0($s0) /* f0a06a0: 44823000 */ mtc1 $v0,$f6 /* f0a06a4: c6480000 */ lwc1 $f8,0x0($s2) @@ -18885,11 +18885,11 @@ glabel var7f1aca90 /* f0a7208: 00402025 */ or $a0,$v0,$zero /* f0a720c: 244e0008 */ addiu $t6,$v0,0x8 /* f0a7210: afae014c */ sw $t6,0x14c($sp) -/* f0a7214: 0c002f40 */ jal viGetLeft +/* f0a7214: 0c002f40 */ jal viGetViewLeft /* f0a7218: 0040a825 */ or $s5,$v0,$zero /* f0a721c: 00028400 */ sll $s0,$v0,0x10 /* f0a7220: 00107c03 */ sra $t7,$s0,0x10 -/* f0a7224: 0c002f44 */ jal viGetTop +/* f0a7224: 0c002f44 */ jal viGetViewTop /* f0a7228: 01e08025 */ or $s0,$t7,$zero /* f0a722c: 44822000 */ mtc1 $v0,$f4 /* f0a7230: 44908000 */ mtc1 $s0,$f16 @@ -18910,19 +18910,19 @@ glabel var7f1aca90 /* f0a726c: 316c0fff */ andi $t4,$t3,0xfff /* f0a7270: 000c6b00 */ sll $t5,$t4,0xc /* f0a7274: 032d7025 */ or $t6,$t9,$t5 -/* f0a7278: 0c002f22 */ jal viGetWidth +/* f0a7278: 0c002f22 */ jal viGetViewX /* f0a727c: aeae0000 */ sw $t6,0x0($s5) /* f0a7280: 00029400 */ sll $s2,$v0,0x10 /* f0a7284: 00127c03 */ sra $t7,$s2,0x10 -/* f0a7288: 0c002f40 */ jal viGetLeft +/* f0a7288: 0c002f40 */ jal viGetViewLeft /* f0a728c: 01e09025 */ or $s2,$t7,$zero /* f0a7290: 0002a400 */ sll $s4,$v0,0x10 /* f0a7294: 00144c03 */ sra $t1,$s4,0x10 -/* f0a7298: 0c002f44 */ jal viGetTop +/* f0a7298: 0c002f44 */ jal viGetViewTop /* f0a729c: 0120a025 */ or $s4,$t1,$zero /* f0a72a0: 00028400 */ sll $s0,$v0,0x10 /* f0a72a4: 00104403 */ sra $t0,$s0,0x10 -/* f0a72a8: 0c002f26 */ jal viGetHeight +/* f0a72a8: 0c002f26 */ jal viGetViewY /* f0a72ac: 01008025 */ or $s0,$t0,$zero /* f0a72b0: 00505021 */ addu $t2,$v0,$s0 /* f0a72b4: 448a4000 */ mtc1 $t2,$f8 @@ -19584,11 +19584,11 @@ glabel var7f1aca90 /* f0a7c30: 00402025 */ or $a0,$v0,$zero /* f0a7c34: 244e0008 */ addiu $t6,$v0,0x8 /* f0a7c38: afae014c */ sw $t6,0x14c($sp) -/* f0a7c3c: 0c002f40 */ jal viGetLeft +/* f0a7c3c: 0c002f40 */ jal viGetViewLeft /* f0a7c40: 00408825 */ or $s1,$v0,$zero /* f0a7c44: 00028400 */ sll $s0,$v0,0x10 /* f0a7c48: 00106403 */ sra $t4,$s0,0x10 -/* f0a7c4c: 0c002f44 */ jal viGetTop +/* f0a7c4c: 0c002f44 */ jal viGetViewTop /* f0a7c50: 01808025 */ or $s0,$t4,$zero /* f0a7c54: 44824000 */ mtc1 $v0,$f8 /* f0a7c58: 44902000 */ mtc1 $s0,$f4 @@ -19609,19 +19609,19 @@ glabel var7f1aca90 /* f0a7c94: 332f0fff */ andi $t7,$t9,0xfff /* f0a7c98: 000f4b00 */ sll $t1,$t7,0xc /* f0a7c9c: 01a97025 */ or $t6,$t5,$t1 -/* f0a7ca0: 0c002f22 */ jal viGetWidth +/* f0a7ca0: 0c002f22 */ jal viGetViewX /* f0a7ca4: ae2e0000 */ sw $t6,0x0($s1) /* f0a7ca8: 00029400 */ sll $s2,$v0,0x10 /* f0a7cac: 00126403 */ sra $t4,$s2,0x10 -/* f0a7cb0: 0c002f40 */ jal viGetLeft +/* f0a7cb0: 0c002f40 */ jal viGetViewLeft /* f0a7cb4: 01809025 */ or $s2,$t4,$zero /* f0a7cb8: 0002a400 */ sll $s4,$v0,0x10 /* f0a7cbc: 00145403 */ sra $t2,$s4,0x10 -/* f0a7cc0: 0c002f44 */ jal viGetTop +/* f0a7cc0: 0c002f44 */ jal viGetViewTop /* f0a7cc4: 0140a025 */ or $s4,$t2,$zero /* f0a7cc8: 00028400 */ sll $s0,$v0,0x10 /* f0a7ccc: 00104403 */ sra $t0,$s0,0x10 -/* f0a7cd0: 0c002f26 */ jal viGetHeight +/* f0a7cd0: 0c002f26 */ jal viGetViewY /* f0a7cd4: 01008025 */ or $s0,$t0,$zero /* f0a7cd8: 00505821 */ addu $t3,$v0,$s0 /* f0a7cdc: 448b8000 */ mtc1 $t3,$f16 @@ -22458,9 +22458,9 @@ glabel hudRenderAmmo /* f0aa874: 27bdfed0 */ addiu $sp,$sp,-304 /* f0aa878: afbf0034 */ sw $ra,0x34($sp) /* f0aa87c: afa40130 */ sw $a0,0x130($sp) -/* f0aa880: 0c002f44 */ jal viGetTop +/* f0aa880: 0c002f44 */ jal viGetViewTop /* f0aa884: afae012c */ sw $t6,0x12c($sp) -/* f0aa888: 0c002f26 */ jal viGetHeight +/* f0aa888: 0c002f26 */ jal viGetViewY /* f0aa88c: a7a20076 */ sh $v0,0x76($sp) /* f0aa890: 87af0076 */ lh $t7,0x76($sp) /* f0aa894: 3c08800a */ lui $t0,%hi(g_Vars) @@ -22637,9 +22637,9 @@ glabel hudRenderAmmo /* f0aaafc: 8fb800e8 */ lw $t8,0xe8($sp) /* f0aab00: afb800f0 */ sw $t8,0xf0($sp) .L0f0aab04: -/* f0aab04: 0c002f40 */ jal viGetLeft +/* f0aab04: 0c002f40 */ jal viGetViewLeft /* f0aab08: 00000000 */ sll $zero,$zero,0x0 -/* f0aab0c: 0c002f22 */ jal viGetWidth +/* f0aab0c: 0c002f22 */ jal viGetViewX /* f0aab10: a7a20076 */ sh $v0,0x76($sp) /* f0aab14: 87b90076 */ lh $t9,0x76($sp) /* f0aab18: 3c0f8008 */ lui $t7,%hi(var8007fac0) @@ -23233,7 +23233,7 @@ glabel hudRenderAmmo /* f0ab3bc: 8faf005c */ lw $t7,0x5c($sp) /* f0ab3c0: afae0050 */ sw $t6,0x50($sp) /* f0ab3c4: afa40054 */ sw $a0,0x54($sp) -/* f0ab3c8: 0c002f40 */ jal viGetLeft +/* f0ab3c8: 0c002f40 */ jal viGetViewLeft /* f0ab3cc: afaa0058 */ sw $t2,0x58($sp) /* f0ab3d0: 3c0e8008 */ lui $t6,%hi(var8007fac0) /* f0ab3d4: 8dcefac0 */ lw $t6,%lo(var8007fac0)($t6) @@ -23362,9 +23362,9 @@ glabel hudRenderAmmo /* f0ab5a0: 00197080 */ sll $t6,$t9,0x2 /* f0ab5a4: afae0050 */ sw $t6,0x50($sp) /* f0ab5a8: afaa0058 */ sw $t2,0x58($sp) -/* f0ab5ac: 0c002f40 */ jal viGetLeft +/* f0ab5ac: 0c002f40 */ jal viGetViewLeft /* f0ab5b0: afaf00a4 */ sw $t7,0xa4($sp) -/* f0ab5b4: 0c002f22 */ jal viGetWidth +/* f0ab5b4: 0c002f22 */ jal viGetViewX /* f0ab5b8: a7a20076 */ sh $v0,0x76($sp) /* f0ab5bc: 87b80076 */ lh $t8,0x76($sp) /* f0ab5c0: 3c198008 */ lui $t9,%hi(var8007fac0) diff --git a/src/game/game_0b63b0.c b/src/game/game_0b63b0.c index cecbd46b9..b4d9d8faa 100644 --- a/src/game/game_0b63b0.c +++ b/src/game/game_0b63b0.c @@ -5501,13 +5501,13 @@ glabel fadeDraw /* f0bb1dc: ac6f0004 */ sw $t7,0x4($v1) /* f0bb1e0: 26100008 */ addiu $s0,$s0,0x8 /* f0bb1e4: afb0003c */ sw $s0,0x3c($sp) -/* f0bb1e8: 0c002f22 */ jal viGetWidth +/* f0bb1e8: 0c002f22 */ jal viGetViewX /* f0bb1ec: 26100008 */ addiu $s0,$s0,0x8 -/* f0bb1f0: 0c002f40 */ jal viGetLeft +/* f0bb1f0: 0c002f40 */ jal viGetViewLeft /* f0bb1f4: a7a20026 */ sh $v0,0x26($sp) -/* f0bb1f8: 0c002f44 */ jal viGetTop +/* f0bb1f8: 0c002f44 */ jal viGetViewTop /* f0bb1fc: a7a20028 */ sh $v0,0x28($sp) -/* f0bb200: 0c002f26 */ jal viGetHeight +/* f0bb200: 0c002f26 */ jal viGetViewY /* f0bb204: a7a2002a */ sh $v0,0x2a($sp) /* f0bb208: 87ab002a */ lh $t3,0x2a($sp) /* f0bb20c: 87ad0028 */ lh $t5,0x28($sp) @@ -5522,9 +5522,9 @@ glabel fadeDraw /* f0bb230: 01c17825 */ or $t7,$t6,$at /* f0bb234: 00194b80 */ sll $t1,$t9,0xe /* f0bb238: 01e96825 */ or $t5,$t7,$t1 -/* f0bb23c: 0c002f40 */ jal viGetLeft +/* f0bb23c: 0c002f40 */ jal viGetViewLeft /* f0bb240: af0d0000 */ sw $t5,0x0($t8) -/* f0bb244: 0c002f44 */ jal viGetTop +/* f0bb244: 0c002f44 */ jal viGetViewTop /* f0bb248: a7a2002a */ sh $v0,0x2a($sp) /* f0bb24c: 87ab002a */ lh $t3,0x2a($sp) /* f0bb250: 8faf003c */ lw $t7,0x3c($sp) @@ -12754,10 +12754,10 @@ Gfx *func0f0c07c8(Gfx *gdl) // Draw menu if (g_Vars.currentplayer->cameramode != CAMERAMODE_EYESPY && g_Vars.currentplayer->mpmenuon) { - s32 a = viGetLeft(); - s32 b = viGetTop(); - s32 c = viGetLeft() + viGetWidth(); - s32 d = viGetTop() + viGetHeight(); + s32 a = viGetViewLeft(); + s32 b = viGetViewTop(); + s32 c = viGetViewLeft() + viGetViewX(); + s32 d = viGetViewTop() + viGetViewY(); gdl = func0f153628(gdl); gdl = func0f153a34(gdl, a, b, c, d, 160); @@ -12998,10 +12998,10 @@ Gfx *func0f0c07c8(Gfx *gdl) } if (g_Vars.currentplayer->mpmenuon) { - s32 a = viGetLeft(); - s32 b = viGetTop(); - s32 c = viGetLeft() + viGetWidth(); - s32 d = viGetTop() + viGetHeight(); + s32 a = viGetViewLeft(); + s32 b = viGetViewTop(); + s32 c = viGetViewLeft() + viGetViewX(); + s32 d = viGetViewTop() + viGetViewY(); gdl = func0f153628(gdl); gdl = func0f153a34(gdl, a, b, c, d, 160); diff --git a/src/game/game_0d7070.c b/src/game/game_0d7070.c index ec9f0b0a3..9821457be 100644 --- a/src/game/game_0d7070.c +++ b/src/game/game_0d7070.c @@ -696,7 +696,7 @@ glabel func0f0d78f4 /* f0d78fc: afa40098 */ sw $a0,0x98($sp) /* f0d7900: afa5009c */ sw $a1,0x9c($sp) /* f0d7904: afa600a0 */ sw $a2,0xa0($sp) -/* f0d7908: 0c002f40 */ jal viGetLeft +/* f0d7908: 0c002f40 */ jal viGetViewLeft /* f0d790c: afa700a4 */ sw $a3,0xa4($sp) /* f0d7910: 3c0e8008 */ lui $t6,%hi(var8007fac0) /* f0d7914: 8dcefac0 */ lw $t6,%lo(var8007fac0)($t6) @@ -714,9 +714,9 @@ glabel func0f0d78f4 /* f0d7940: 00000000 */ sll $zero,$zero,0x0 /* f0d7944: 0006000d */ break 0x6 .L0f0d7948: -/* f0d7948: 0c002f44 */ jal viGetTop +/* f0d7948: 0c002f44 */ jal viGetViewTop /* f0d794c: 00000000 */ sll $zero,$zero,0x0 -/* f0d7950: 0c002f22 */ jal viGetWidth +/* f0d7950: 0c002f22 */ jal viGetViewX /* f0d7954: afa20090 */ sw $v0,0x90($sp) /* f0d7958: 3c188008 */ lui $t8,%hi(var8007fac0) /* f0d795c: 8f18fac0 */ lw $t8,%lo(var8007fac0)($t8) @@ -735,7 +735,7 @@ glabel func0f0d78f4 /* f0d798c: 00000000 */ sll $zero,$zero,0x0 /* f0d7990: 0006000d */ break 0x6 .L0f0d7994: -/* f0d7994: 0c002f26 */ jal viGetHeight +/* f0d7994: 0c002f26 */ jal viGetViewY /* f0d7998: 00000000 */ sll $zero,$zero,0x0 /* f0d799c: 8fae0090 */ lw $t6,0x90($sp) /* f0d79a0: 24190001 */ addiu $t9,$zero,0x1 @@ -1144,7 +1144,7 @@ glabel func0f0d7f54 /* f0d7f6c: 00c09025 */ or $s2,$a2,$zero /* f0d7f70: 00e09825 */ or $s3,$a3,$zero /* f0d7f74: afb00014 */ sw $s0,0x14($sp) -/* f0d7f78: 0c002f40 */ jal viGetLeft +/* f0d7f78: 0c002f40 */ jal viGetViewLeft /* f0d7f7c: afa400d0 */ sw $a0,0xd0($sp) /* f0d7f80: 3c108008 */ lui $s0,%hi(var8007fac0) /* f0d7f84: 2610fac0 */ addiu $s0,$s0,%lo(var8007fac0) @@ -1164,9 +1164,9 @@ glabel func0f0d7f54 /* f0d7fb8: 00000000 */ sll $zero,$zero,0x0 /* f0d7fbc: 0006000d */ break 0x6 .L0f0d7fc0: -/* f0d7fc0: 0c002f44 */ jal viGetTop +/* f0d7fc0: 0c002f44 */ jal viGetViewTop /* f0d7fc4: 00000000 */ sll $zero,$zero,0x0 -/* f0d7fc8: 0c002f22 */ jal viGetWidth +/* f0d7fc8: 0c002f22 */ jal viGetViewX /* f0d7fcc: afa200c8 */ sw $v0,0xc8($sp) /* f0d7fd0: 8e180000 */ lw $t8,0x0($s0) /* f0d7fd4: 8fa400d0 */ lw $a0,0xd0($sp) @@ -1184,7 +1184,7 @@ glabel func0f0d7f54 /* f0d8000: 00000000 */ sll $zero,$zero,0x0 /* f0d8004: 0006000d */ break 0x6 .L0f0d8008: -/* f0d8008: 0c002f26 */ jal viGetHeight +/* f0d8008: 0c002f26 */ jal viGetViewY /* f0d800c: 00000000 */ sll $zero,$zero,0x0 /* f0d8010: 8fae00c8 */ lw $t6,0xc8($sp) /* f0d8014: 3c0500ff */ lui $a1,0xff @@ -3108,7 +3108,7 @@ glabel func0f0d9ba0 /* f0d9ba0: 27bdff70 */ addiu $sp,$sp,-144 /* f0d9ba4: afbf001c */ sw $ra,0x1c($sp) /* f0d9ba8: afa40090 */ sw $a0,0x90($sp) -/* f0d9bac: 0c002f40 */ jal viGetLeft +/* f0d9bac: 0c002f40 */ jal viGetViewLeft /* f0d9bb0: afa50094 */ sw $a1,0x94($sp) /* f0d9bb4: 3c0e8008 */ lui $t6,%hi(var8007fac0) /* f0d9bb8: 8dcefac0 */ lw $t6,%lo(var8007fac0)($t6) @@ -3127,9 +3127,9 @@ glabel func0f0d9ba0 /* f0d9be8: 00000000 */ sll $zero,$zero,0x0 /* f0d9bec: 0006000d */ break 0x6 .L0f0d9bf0: -/* f0d9bf0: 0c002f44 */ jal viGetTop +/* f0d9bf0: 0c002f44 */ jal viGetViewTop /* f0d9bf4: 00000000 */ sll $zero,$zero,0x0 -/* f0d9bf8: 0c002f22 */ jal viGetWidth +/* f0d9bf8: 0c002f22 */ jal viGetViewX /* f0d9bfc: afa20088 */ sw $v0,0x88($sp) /* f0d9c00: 3c188008 */ lui $t8,%hi(var8007fac0) /* f0d9c04: 8f18fac0 */ lw $t8,%lo(var8007fac0)($t8) @@ -3148,7 +3148,7 @@ glabel func0f0d9ba0 /* f0d9c34: 00000000 */ sll $zero,$zero,0x0 /* f0d9c38: 0006000d */ break 0x6 .L0f0d9c3c: -/* f0d9c3c: 0c002f26 */ jal viGetHeight +/* f0d9c3c: 0c002f26 */ jal viGetViewY /* f0d9c40: 00000000 */ sll $zero,$zero,0x0 /* f0d9c44: 3c0e8008 */ lui $t6,%hi(var8007fac0) /* f0d9c48: 8dcefac0 */ lw $t6,%lo(var8007fac0)($t6) @@ -3620,7 +3620,7 @@ glabel var7f1ade54 /* f0da2dc: 27bdff00 */ addiu $sp,$sp,-256 /* f0da2e0: afbf0014 */ sw $ra,0x14($sp) /* f0da2e4: afa50104 */ sw $a1,0x104($sp) -/* f0da2e8: 0c002f40 */ jal viGetLeft +/* f0da2e8: 0c002f40 */ jal viGetViewLeft /* f0da2ec: afa40100 */ sw $a0,0x100($sp) /* f0da2f0: 3c088008 */ lui $t0,%hi(var8007fac0) /* f0da2f4: 2508fac0 */ addiu $t0,$t0,%lo(var8007fac0) @@ -3640,9 +3640,9 @@ glabel var7f1ade54 /* f0da328: 00000000 */ sll $zero,$zero,0x0 /* f0da32c: 0006000d */ break 0x6 .L0f0da330: -/* f0da330: 0c002f44 */ jal viGetTop +/* f0da330: 0c002f44 */ jal viGetViewTop /* f0da334: 00000000 */ sll $zero,$zero,0x0 -/* f0da338: 0c002f22 */ jal viGetWidth +/* f0da338: 0c002f22 */ jal viGetViewX /* f0da33c: afa200f8 */ sw $v0,0xf8($sp) /* f0da340: 3c088008 */ lui $t0,%hi(var8007fac0) /* f0da344: 2508fac0 */ addiu $t0,$t0,%lo(var8007fac0) @@ -3663,7 +3663,7 @@ glabel var7f1ade54 /* f0da37c: 0006000d */ break 0x6 .L0f0da380: /* f0da380: afae00f4 */ sw $t6,0xf4($sp) -/* f0da384: 0c002f26 */ jal viGetHeight +/* f0da384: 0c002f26 */ jal viGetViewY /* f0da388: 00000000 */ sll $zero,$zero,0x0 /* f0da38c: 8fb800f8 */ lw $t8,0xf8($sp) /* f0da390: 00021843 */ sra $v1,$v0,0x1 @@ -5723,7 +5723,7 @@ glabel func0f0dc170 /* f0dc178: afb00014 */ sw $s0,0x14($sp) /* f0dc17c: 00808025 */ or $s0,$a0,$zero /* f0dc180: afb10018 */ sw $s1,0x18($sp) -/* f0dc184: 0c002f40 */ jal viGetLeft +/* f0dc184: 0c002f40 */ jal viGetViewLeft /* f0dc188: afa500b4 */ sw $a1,0xb4($sp) /* f0dc18c: 3c118008 */ lui $s1,%hi(var8007fac0) /* f0dc190: 2631fac0 */ addiu $s1,$s1,%lo(var8007fac0) @@ -5742,9 +5742,9 @@ glabel func0f0dc170 /* f0dc1c0: 00000000 */ sll $zero,$zero,0x0 /* f0dc1c4: 0006000d */ break 0x6 .L0f0dc1c8: -/* f0dc1c8: 0c002f44 */ jal viGetTop +/* f0dc1c8: 0c002f44 */ jal viGetViewTop /* f0dc1cc: 00000000 */ sll $zero,$zero,0x0 -/* f0dc1d0: 0c002f22 */ jal viGetWidth +/* f0dc1d0: 0c002f22 */ jal viGetViewX /* f0dc1d4: afa200a8 */ sw $v0,0xa8($sp) /* f0dc1d8: 8e380000 */ lw $t8,0x0($s1) /* f0dc1dc: 0058001a */ div $zero,$v0,$t8 @@ -5761,7 +5761,7 @@ glabel func0f0dc170 /* f0dc204: 00000000 */ sll $zero,$zero,0x0 /* f0dc208: 0006000d */ break 0x6 .L0f0dc20c: -/* f0dc20c: 0c002f26 */ jal viGetHeight +/* f0dc20c: 0c002f26 */ jal viGetViewY /* f0dc210: 00000000 */ sll $zero,$zero,0x0 /* f0dc214: 8fae00a8 */ lw $t6,0xa8($sp) /* f0dc218: 3c03800a */ lui $v1,%hi(g_Vars+0x284) diff --git a/src/game/game_0dcdb0.c b/src/game/game_0dcdb0.c index a4860cb79..cf18eb156 100644 --- a/src/game/game_0dcdb0.c +++ b/src/game/game_0dcdb0.c @@ -108,7 +108,7 @@ glabel func0f0dcef4 /* f0dcef4: 27bdff70 */ addiu $sp,$sp,-144 /* f0dcef8: afbf0034 */ sw $ra,0x34($sp) /* f0dcefc: afa40090 */ sw $a0,0x90($sp) -/* f0dcf00: 0c002f40 */ jal viGetLeft +/* f0dcf00: 0c002f40 */ jal viGetViewLeft /* f0dcf04: afa50094 */ sw $a1,0x94($sp) /* f0dcf08: 3c0e8008 */ lui $t6,%hi(var8007fac0) /* f0dcf0c: 8dcefac0 */ lw $t6,%lo(var8007fac0)($t6) @@ -126,9 +126,9 @@ glabel func0f0dcef4 /* f0dcf38: 00000000 */ sll $zero,$zero,0x0 /* f0dcf3c: 0006000d */ break 0x6 .L0f0dcf40: -/* f0dcf40: 0c002f44 */ jal viGetTop +/* f0dcf40: 0c002f44 */ jal viGetViewTop /* f0dcf44: 00000000 */ sll $zero,$zero,0x0 -/* f0dcf48: 0c002f26 */ jal viGetHeight +/* f0dcf48: 0c002f26 */ jal viGetViewY /* f0dcf4c: a7a20056 */ sh $v0,0x56($sp) /* f0dcf50: 3c04800a */ lui $a0,%hi(g_Vars) /* f0dcf54: 24849fc0 */ addiu $a0,$a0,%lo(g_Vars) @@ -373,9 +373,9 @@ glabel func0f0dd2ac /* f0dd2b0: afbf003c */ sw $ra,0x3c($sp) /* f0dd2b4: afb00038 */ sw $s0,0x38($sp) /* f0dd2b8: afa400c0 */ sw $a0,0xc0($sp) -/* f0dd2bc: 0c002f44 */ jal viGetTop +/* f0dd2bc: 0c002f44 */ jal viGetViewTop /* f0dd2c0: afa500c4 */ sw $a1,0xc4($sp) -/* f0dd2c4: 0c002f40 */ jal viGetLeft +/* f0dd2c4: 0c002f40 */ jal viGetViewLeft /* f0dd2c8: afa200bc */ sw $v0,0xbc($sp) /* f0dd2cc: 3c108008 */ lui $s0,%hi(var8007fac0) /* f0dd2d0: 2610fac0 */ addiu $s0,$s0,%lo(var8007fac0) @@ -394,7 +394,7 @@ glabel func0f0dd2ac /* f0dd300: 00000000 */ sll $zero,$zero,0x0 /* f0dd304: 0006000d */ break 0x6 .L0f0dd308: -/* f0dd308: 0c002f22 */ jal viGetWidth +/* f0dd308: 0c002f22 */ jal viGetViewX /* f0dd30c: 00000000 */ sll $zero,$zero,0x0 /* f0dd310: 8e180000 */ lw $t8,0x0($s0) /* f0dd314: 0058001a */ div $zero,$v0,$t8 @@ -412,7 +412,7 @@ glabel func0f0dd2ac /* f0dd340: 0006000d */ break 0x6 .L0f0dd344: /* f0dd344: afa900b4 */ sw $t1,0xb4($sp) -/* f0dd348: 0c002f26 */ jal viGetHeight +/* f0dd348: 0c002f26 */ jal viGetViewY /* f0dd34c: 00000000 */ sll $zero,$zero,0x0 /* f0dd350: 3c06800a */ lui $a2,%hi(g_Vars) /* f0dd354: 3c013f80 */ lui $at,0x3f80 @@ -4299,12 +4299,12 @@ glabel var7f1adef4 /* f0e050c: 15010039 */ bne $t0,$at,.L0f0e05f4 /* f0e0510: 00000000 */ sll $zero,$zero,0x0 /* f0e0514: afb2009c */ sw $s2,0x9c($sp) -/* f0e0518: 0c002f40 */ jal viGetLeft +/* f0e0518: 0c002f40 */ jal viGetViewLeft /* f0e051c: 26520008 */ addiu $s2,$s2,0x8 /* f0e0520: 00028400 */ sll $s0,$v0,0x10 /* f0e0524: 00105c03 */ sra $t3,$s0,0x10 /* f0e0528: 01608025 */ or $s0,$t3,$zero -/* f0e052c: 0c002f44 */ jal viGetTop +/* f0e052c: 0c002f44 */ jal viGetViewTop /* f0e0530: 8fb3009c */ lw $s3,0x9c($sp) /* f0e0534: 44829000 */ mtc1 $v0,$f18 /* f0e0538: 44905000 */ mtc1 $s0,$f10 @@ -4323,17 +4323,17 @@ glabel var7f1adef4 /* f0e056c: 31e90fff */ andi $t1,$t7,0xfff /* f0e0570: 0009c300 */ sll $t8,$t1,0xc /* f0e0574: 01984025 */ or $t0,$t4,$t8 -/* f0e0578: 0c002f22 */ jal viGetWidth +/* f0e0578: 0c002f22 */ jal viGetViewX /* f0e057c: ae680000 */ sw $t0,0x0($s3) -/* f0e0580: 0c002f40 */ jal viGetLeft +/* f0e0580: 0c002f40 */ jal viGetViewLeft /* f0e0584: a7a20092 */ sh $v0,0x92($sp) /* f0e0588: 00028c00 */ sll $s1,$v0,0x10 /* f0e058c: 00115c03 */ sra $t3,$s1,0x10 -/* f0e0590: 0c002f44 */ jal viGetTop +/* f0e0590: 0c002f44 */ jal viGetViewTop /* f0e0594: 01608825 */ or $s1,$t3,$zero /* f0e0598: 00028400 */ sll $s0,$v0,0x10 /* f0e059c: 00105403 */ sra $t2,$s0,0x10 -/* f0e05a0: 0c002f26 */ jal viGetHeight +/* f0e05a0: 0c002f26 */ jal viGetViewY /* f0e05a4: 01408025 */ or $s0,$t2,$zero /* f0e05a8: 87a90092 */ lh $t1,0x92($sp) /* f0e05ac: 00506821 */ addu $t5,$v0,$s0 diff --git a/src/game/game_0f09f0.c b/src/game/game_0f09f0.c index 52b1a1bf4..79e82792b 100644 --- a/src/game/game_0f09f0.c +++ b/src/game/game_0f09f0.c @@ -4509,11 +4509,11 @@ glabel var7f1b2948 /* f0f44a8: 1000002a */ beqz $zero,.L0f0f4554 /* f0f44ac: e7a60394 */ swc1 $f6,0x394($sp) .L0f0f44b0: -/* f0f44b0: 0c002f40 */ jal viGetLeft +/* f0f44b0: 0c002f40 */ jal viGetViewLeft /* f0f44b4: 00000000 */ sll $zero,$zero,0x0 /* f0f44b8: 00028c00 */ sll $s1,$v0,0x10 /* f0f44bc: 00117403 */ sra $t6,$s1,0x10 -/* f0f44c0: 0c002f22 */ jal viGetWidth +/* f0f44c0: 0c002f22 */ jal viGetViewX /* f0f44c4: 01c08825 */ or $s1,$t6,$zero /* f0f44c8: 44825000 */ mtc1 $v0,$f10 /* f0f44cc: 3c013f00 */ lui $at,0x3f00 @@ -4532,11 +4532,11 @@ glabel var7f1b2948 /* f0f4500: 46805120 */ cvt.s.w $f4,$f10 /* f0f4504: 46044280 */ add.s $f10,$f8,$f4 /* f0f4508: 460a3200 */ add.s $f8,$f6,$f10 -/* f0f450c: 0c002f44 */ jal viGetTop +/* f0f450c: 0c002f44 */ jal viGetViewTop /* f0f4510: e7a80390 */ swc1 $f8,0x390($sp) /* f0f4514: 00028c00 */ sll $s1,$v0,0x10 /* f0f4518: 00116403 */ sra $t4,$s1,0x10 -/* f0f451c: 0c002f26 */ jal viGetHeight +/* f0f451c: 0c002f26 */ jal viGetViewY /* f0f4520: 01808825 */ or $s1,$t4,$zero /* f0f4524: 44822000 */ mtc1 $v0,$f4 /* f0f4528: 3c013f00 */ lui $at,0x3f00 @@ -6516,7 +6516,7 @@ glabel func0f0f5360 /* f0f61c8: 8fa201e8 */ lw $v0,0x1e8($sp) .L0f0f61cc: /* f0f61cc: 01835821 */ addu $t3,$t4,$v1 -/* f0f61d0: 0c002f40 */ jal viGetLeft +/* f0f61d0: 0c002f40 */ jal viGetViewLeft /* f0f61d4: afab0088 */ sw $t3,0x88($sp) /* f0f61d8: 3c0e8008 */ lui $t6,%hi(var8007fac0) /* f0f61dc: 8dcefac0 */ lw $t6,%lo(var8007fac0)($t6) @@ -6533,13 +6533,13 @@ glabel func0f0f5360 /* f0f6204: 00000000 */ sll $zero,$zero,0x0 /* f0f6208: 0006000d */ break 0x6 .L0f0f620c: -/* f0f620c: 0c002f44 */ jal viGetTop +/* f0f620c: 0c002f44 */ jal viGetViewTop /* f0f6210: 00000000 */ sll $zero,$zero,0x0 -/* f0f6214: 0c002f40 */ jal viGetLeft +/* f0f6214: 0c002f40 */ jal viGetViewLeft /* f0f6218: 0040a025 */ or $s4,$v0,$zero /* f0f621c: 00028400 */ sll $s0,$v0,0x10 /* f0f6220: 0010c403 */ sra $t8,$s0,0x10 -/* f0f6224: 0c002f22 */ jal viGetWidth +/* f0f6224: 0c002f22 */ jal viGetViewX /* f0f6228: 03008025 */ or $s0,$t8,$zero /* f0f622c: 3c0f8008 */ lui $t7,%hi(var8007fac0) /* f0f6230: 8deffac0 */ lw $t7,%lo(var8007fac0)($t7) @@ -6557,11 +6557,11 @@ glabel func0f0f5360 /* f0f625c: 00000000 */ sll $zero,$zero,0x0 /* f0f6260: 0006000d */ break 0x6 .L0f0f6264: -/* f0f6264: 0c002f44 */ jal viGetTop +/* f0f6264: 0c002f44 */ jal viGetViewTop /* f0f6268: 00000000 */ sll $zero,$zero,0x0 /* f0f626c: 00028400 */ sll $s0,$v0,0x10 /* f0f6270: 00106c03 */ sra $t5,$s0,0x10 -/* f0f6274: 0c002f26 */ jal viGetHeight +/* f0f6274: 0c002f26 */ jal viGetViewY /* f0f6278: 01a08025 */ or $s0,$t5,$zero /* f0f627c: 8fac0088 */ lw $t4,0x88($sp) /* f0f6280: 3c08800a */ lui $t0,%hi(var800a2038) @@ -7345,11 +7345,11 @@ glabel func0f0f5360 .L0f0f6df8: /* f0f6df8: 00809825 */ or $s3,$a0,$zero /* f0f6dfc: 24840008 */ addiu $a0,$a0,0x8 -/* f0f6e00: 0c002f40 */ jal viGetLeft +/* f0f6e00: 0c002f40 */ jal viGetViewLeft /* f0f6e04: afa401e8 */ sw $a0,0x1e8($sp) /* f0f6e08: 00028400 */ sll $s0,$v0,0x10 /* f0f6e0c: 00107c03 */ sra $t7,$s0,0x10 -/* f0f6e10: 0c002f44 */ jal viGetTop +/* f0f6e10: 0c002f44 */ jal viGetViewTop /* f0f6e14: 01e08025 */ or $s0,$t7,$zero /* f0f6e18: 44829000 */ mtc1 $v0,$f18 /* f0f6e1c: 44905000 */ mtc1 $s0,$f10 @@ -7370,19 +7370,19 @@ glabel func0f0f5360 /* f0f6e58: 31af0fff */ andi $t7,$t5,0xfff /* f0f6e5c: 000fc300 */ sll $t8,$t7,0xc /* f0f6e60: 01787025 */ or $t6,$t3,$t8 -/* f0f6e64: 0c002f22 */ jal viGetWidth +/* f0f6e64: 0c002f22 */ jal viGetViewX /* f0f6e68: ae6e0000 */ sw $t6,0x0($s3) /* f0f6e6c: 00028c00 */ sll $s1,$v0,0x10 /* f0f6e70: 00116403 */ sra $t4,$s1,0x10 -/* f0f6e74: 0c002f40 */ jal viGetLeft +/* f0f6e74: 0c002f40 */ jal viGetViewLeft /* f0f6e78: 01808825 */ or $s1,$t4,$zero /* f0f6e7c: 00029400 */ sll $s2,$v0,0x10 /* f0f6e80: 0012cc03 */ sra $t9,$s2,0x10 -/* f0f6e84: 0c002f44 */ jal viGetTop +/* f0f6e84: 0c002f44 */ jal viGetViewTop /* f0f6e88: 03209025 */ or $s2,$t9,$zero /* f0f6e8c: 00028400 */ sll $s0,$v0,0x10 /* f0f6e90: 00106c03 */ sra $t5,$s0,0x10 -/* f0f6e94: 0c002f26 */ jal viGetHeight +/* f0f6e94: 0c002f26 */ jal viGetViewY /* f0f6e98: 01a08025 */ or $s0,$t5,$zero /* f0f6e9c: 00507821 */ addu $t7,$v0,$s0 /* f0f6ea0: 448f3000 */ mtc1 $t7,$f6 @@ -7407,11 +7407,11 @@ glabel func0f0f5360 /* f0f6eec: ae780004 */ sw $t8,0x4($s3) /* f0f6ef0: 24840008 */ addiu $a0,$a0,0x8 .L0f0f6ef4: -/* f0f6ef4: 0c002f40 */ jal viGetLeft +/* f0f6ef4: 0c002f40 */ jal viGetViewLeft /* f0f6ef8: afa401e8 */ sw $a0,0x1e8($sp) /* f0f6efc: 00028400 */ sll $s0,$v0,0x10 /* f0f6f00: 00106403 */ sra $t4,$s0,0x10 -/* f0f6f04: 0c002f44 */ jal viGetTop +/* f0f6f04: 0c002f44 */ jal viGetViewTop /* f0f6f08: 01808025 */ or $s0,$t4,$zero /* f0f6f0c: 44825000 */ mtc1 $v0,$f10 /* f0f6f10: 44903000 */ mtc1 $s0,$f6 @@ -7432,19 +7432,19 @@ glabel func0f0f5360 /* f0f6f4c: 330c0fff */ andi $t4,$t8,0xfff /* f0f6f50: 000ccb00 */ sll $t9,$t4,0xc /* f0f6f54: 01d96825 */ or $t5,$t6,$t9 -/* f0f6f58: 0c002f22 */ jal viGetWidth +/* f0f6f58: 0c002f22 */ jal viGetViewX /* f0f6f5c: ae6d0000 */ sw $t5,0x0($s3) /* f0f6f60: 00028c00 */ sll $s1,$v0,0x10 /* f0f6f64: 00117c03 */ sra $t7,$s1,0x10 -/* f0f6f68: 0c002f40 */ jal viGetLeft +/* f0f6f68: 0c002f40 */ jal viGetViewLeft /* f0f6f6c: 01e08825 */ or $s1,$t7,$zero /* f0f6f70: 00029400 */ sll $s2,$v0,0x10 /* f0f6f74: 00125c03 */ sra $t3,$s2,0x10 -/* f0f6f78: 0c002f44 */ jal viGetTop +/* f0f6f78: 0c002f44 */ jal viGetViewTop /* f0f6f7c: 01609025 */ or $s2,$t3,$zero /* f0f6f80: 00028400 */ sll $s0,$v0,0x10 /* f0f6f84: 0010c403 */ sra $t8,$s0,0x10 -/* f0f6f88: 0c002f26 */ jal viGetHeight +/* f0f6f88: 0c002f26 */ jal viGetViewY /* f0f6f8c: 03008025 */ or $s0,$t8,$zero /* f0f6f90: 00506021 */ addu $t4,$v0,$s0 /* f0f6f94: 448c9000 */ mtc1 $t4,$f18 @@ -8030,7 +8030,7 @@ glabel var7f1b2990 /* f0f7730: afa40038 */ sw $a0,0x38($sp) /* f0f7734: afa5003c */ sw $a1,0x3c($sp) /* f0f7738: afa60040 */ sw $a2,0x40($sp) -/* f0f773c: 0c002f40 */ jal viGetLeft +/* f0f773c: 0c002f40 */ jal viGetViewLeft /* f0f7740: afa70044 */ sw $a3,0x44($sp) /* f0f7744: 3c0e8008 */ lui $t6,%hi(var8007fac0) /* f0f7748: 8dcefac0 */ lw $t6,%lo(var8007fac0)($t6) @@ -8051,12 +8051,12 @@ glabel var7f1b2990 /* f0f7780: 0006000d */ break 0x6 .L0f0f7784: /* f0f7784: afa60034 */ sw $a2,0x34($sp) -/* f0f7788: 0c002f44 */ jal viGetTop +/* f0f7788: 0c002f44 */ jal viGetViewTop /* f0f778c: 00000000 */ sll $zero,$zero,0x0 /* f0f7790: 24430004 */ addiu $v1,$v0,0x4 -/* f0f7794: 0c002f40 */ jal viGetLeft +/* f0f7794: 0c002f40 */ jal viGetViewLeft /* f0f7798: afa30030 */ sw $v1,0x30($sp) -/* f0f779c: 0c002f22 */ jal viGetWidth +/* f0f779c: 0c002f22 */ jal viGetViewX /* f0f77a0: a7a2001a */ sh $v0,0x1a($sp) /* f0f77a4: 87af001a */ lh $t7,0x1a($sp) /* f0f77a8: 3c198008 */ lui $t9,%hi(var8007fac0) @@ -8081,9 +8081,9 @@ glabel var7f1b2990 /* f0f77f0: 0006000d */ break 0x6 .L0f0f77f4: /* f0f77f4: afa7002c */ sw $a3,0x2c($sp) -/* f0f77f8: 0c002f44 */ jal viGetTop +/* f0f77f8: 0c002f44 */ jal viGetViewTop /* f0f77fc: 00000000 */ sll $zero,$zero,0x0 -/* f0f7800: 0c002f26 */ jal viGetHeight +/* f0f7800: 0c002f26 */ jal viGetViewY /* f0f7804: a7a2001a */ sh $v0,0x1a($sp) /* f0f7808: 87ae001a */ lh $t6,0x1a($sp) /* f0f780c: 004e2021 */ addu $a0,$v0,$t6 @@ -8623,9 +8623,9 @@ glabel func0f0f7e98 .L0f0f7f88: /* f0f7f88: 59800017 */ blezl $t4,.L0f0f7fe8 /* f0f7f8c: 8fa80034 */ lw $t0,0x34($sp) -/* f0f7f90: 0c002f40 */ jal viGetLeft +/* f0f7f90: 0c002f40 */ jal viGetViewLeft /* f0f7f94: 00000000 */ sll $zero,$zero,0x0 -/* f0f7f98: 0c002f22 */ jal viGetWidth +/* f0f7f98: 0c002f22 */ jal viGetViewX /* f0f7f9c: a7a2002e */ sh $v0,0x2e($sp) /* f0f7fa0: 87ad002e */ lh $t5,0x2e($sp) /* f0f7fa4: 3c0f8008 */ lui $t7,%hi(var8007fac0) @@ -8658,9 +8658,9 @@ glabel func0f0f7e98 .L0f0f8004: /* f0f8004: 5980000a */ blezl $t4,.L0f0f8030 /* f0f8008: 8fbf001c */ lw $ra,0x1c($sp) -/* f0f800c: 0c002f44 */ jal viGetTop +/* f0f800c: 0c002f44 */ jal viGetViewTop /* f0f8010: 00000000 */ sll $zero,$zero,0x0 -/* f0f8014: 0c002f26 */ jal viGetHeight +/* f0f8014: 0c002f26 */ jal viGetViewY /* f0f8018: a7a2002e */ sh $v0,0x2e($sp) /* f0f801c: 87ad002e */ lh $t5,0x2e($sp) /* f0f8020: 004d7021 */ addu $t6,$v0,$t5 @@ -9433,7 +9433,7 @@ glabel func0f0f86a8 /* f0f8a7c: 10000047 */ beqz $zero,.L0f0f8b9c /* f0f8a80: afa20098 */ sw $v0,0x98($sp) .L0f0f8a84: -/* f0f8a84: 0c002f40 */ jal viGetLeft +/* f0f8a84: 0c002f40 */ jal viGetViewLeft /* f0f8a88: 00000000 */ sll $zero,$zero,0x0 /* f0f8a8c: 3c188008 */ lui $t8,%hi(var8007fac0) /* f0f8a90: 8f18fac0 */ lw $t8,%lo(var8007fac0)($t8) @@ -9451,13 +9451,13 @@ glabel func0f0f86a8 /* f0f8abc: 00000000 */ sll $zero,$zero,0x0 /* f0f8ac0: 0006000d */ break 0x6 .L0f0f8ac4: -/* f0f8ac4: 0c002f44 */ jal viGetTop +/* f0f8ac4: 0c002f44 */ jal viGetViewTop /* f0f8ac8: 00000000 */ sll $zero,$zero,0x0 -/* f0f8acc: 0c002f40 */ jal viGetLeft +/* f0f8acc: 0c002f40 */ jal viGetViewLeft /* f0f8ad0: 00408825 */ or $s1,$v0,$zero /* f0f8ad4: 00028400 */ sll $s0,$v0,0x10 /* f0f8ad8: 00106c03 */ sra $t5,$s0,0x10 -/* f0f8adc: 0c002f22 */ jal viGetWidth +/* f0f8adc: 0c002f22 */ jal viGetViewX /* f0f8ae0: 01a08025 */ or $s0,$t5,$zero /* f0f8ae4: 3c0a8008 */ lui $t2,%hi(var8007fac0) /* f0f8ae8: 8d4afac0 */ lw $t2,%lo(var8007fac0)($t2) @@ -9476,11 +9476,11 @@ glabel func0f0f86a8 /* f0f8b18: 00000000 */ sll $zero,$zero,0x0 /* f0f8b1c: 0006000d */ break 0x6 .L0f0f8b20: -/* f0f8b20: 0c002f44 */ jal viGetTop +/* f0f8b20: 0c002f44 */ jal viGetViewTop /* f0f8b24: 00000000 */ sll $zero,$zero,0x0 /* f0f8b28: 00028400 */ sll $s0,$v0,0x10 /* f0f8b2c: 00107c03 */ sra $t7,$s0,0x10 -/* f0f8b30: 0c002f26 */ jal viGetHeight +/* f0f8b30: 0c002f26 */ jal viGetViewY /* f0f8b34: 01e08025 */ or $s0,$t7,$zero /* f0f8b38: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum) /* f0f8b3c: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6) @@ -13430,7 +13430,7 @@ glabel var7f1b2afc /* f0fc1ec: 54610148 */ bnel $v1,$at,.L0f0fc710 /* f0fc1f0: 02a01025 */ or $v0,$s5,$zero .L0f0fc1f4: -/* f0fc1f4: 0c002f40 */ jal viGetLeft +/* f0fc1f4: 0c002f40 */ jal viGetViewLeft /* f0fc1f8: 00000000 */ sll $zero,$zero,0x0 /* f0fc1fc: 3c0e8008 */ lui $t6,%hi(var8007fac0) /* f0fc200: 8dcefac0 */ lw $t6,%lo(var8007fac0)($t6) @@ -13449,14 +13449,14 @@ glabel var7f1b2afc /* f0fc230: 0006000d */ break 0x6 .L0f0fc234: /* f0fc234: afb800f0 */ sw $t8,0xf0($sp) -/* f0fc238: 0c002f44 */ jal viGetTop +/* f0fc238: 0c002f44 */ jal viGetViewTop /* f0fc23c: 00000000 */ sll $zero,$zero,0x0 /* f0fc240: 24590004 */ addiu $t9,$v0,0x4 -/* f0fc244: 0c002f40 */ jal viGetLeft +/* f0fc244: 0c002f40 */ jal viGetViewLeft /* f0fc248: afb900ec */ sw $t9,0xec($sp) /* f0fc24c: 00028400 */ sll $s0,$v0,0x10 /* f0fc250: 00105403 */ sra $t2,$s0,0x10 -/* f0fc254: 0c002f22 */ jal viGetWidth +/* f0fc254: 0c002f22 */ jal viGetViewX /* f0fc258: 01408025 */ or $s0,$t2,$zero /* f0fc25c: 3c0b8008 */ lui $t3,%hi(var8007fac0) /* f0fc260: 8d6bfac0 */ lw $t3,%lo(var8007fac0)($t3) @@ -13476,11 +13476,11 @@ glabel var7f1b2afc /* f0fc294: 0006000d */ break 0x6 .L0f0fc298: /* f0fc298: afae00e8 */ sw $t6,0xe8($sp) -/* f0fc29c: 0c002f44 */ jal viGetTop +/* f0fc29c: 0c002f44 */ jal viGetViewTop /* f0fc2a0: 00000000 */ sll $zero,$zero,0x0 /* f0fc2a4: 00028400 */ sll $s0,$v0,0x10 /* f0fc2a8: 00107c03 */ sra $t7,$s0,0x10 -/* f0fc2ac: 0c002f26 */ jal viGetHeight +/* f0fc2ac: 0c002f26 */ jal viGetViewY /* f0fc2b0: 01e08025 */ or $s0,$t7,$zero /* f0fc2b4: 0050c021 */ addu $t8,$v0,$s0 /* f0fc2b8: 2719fffc */ addiu $t9,$t8,-4 @@ -13794,7 +13794,7 @@ glabel var7f1b2afc /* f0fc728: 2401ffff */ addiu $at,$zero,-1 /* f0fc72c: 130100a1 */ beq $t8,$at,.L0f0fc9b4 /* f0fc730: 00000000 */ sll $zero,$zero,0x0 -/* f0fc734: 0c002f40 */ jal viGetLeft +/* f0fc734: 0c002f40 */ jal viGetViewLeft /* f0fc738: 00000000 */ sll $zero,$zero,0x0 /* f0fc73c: 3c198008 */ lui $t9,%hi(var8007fac0) /* f0fc740: 8f39fac0 */ lw $t9,%lo(var8007fac0)($t9) @@ -13812,13 +13812,13 @@ glabel var7f1b2afc /* f0fc76c: 00000000 */ sll $zero,$zero,0x0 /* f0fc770: 0006000d */ break 0x6 .L0f0fc774: -/* f0fc774: 0c002f44 */ jal viGetTop +/* f0fc774: 0c002f44 */ jal viGetViewTop /* f0fc778: 00000000 */ sll $zero,$zero,0x0 -/* f0fc77c: 0c002f40 */ jal viGetLeft +/* f0fc77c: 0c002f40 */ jal viGetViewLeft /* f0fc780: afa20094 */ sw $v0,0x94($sp) /* f0fc784: 00028400 */ sll $s0,$v0,0x10 /* f0fc788: 00105403 */ sra $t2,$s0,0x10 -/* f0fc78c: 0c002f22 */ jal viGetWidth +/* f0fc78c: 0c002f22 */ jal viGetViewX /* f0fc790: 01408025 */ or $s0,$t2,$zero /* f0fc794: 3c0d8008 */ lui $t5,%hi(var8007fac0) /* f0fc798: 8dadfac0 */ lw $t5,%lo(var8007fac0)($t5) @@ -13836,11 +13836,11 @@ glabel var7f1b2afc /* f0fc7c4: 00000000 */ sll $zero,$zero,0x0 /* f0fc7c8: 0006000d */ break 0x6 .L0f0fc7cc: -/* f0fc7cc: 0c002f44 */ jal viGetTop +/* f0fc7cc: 0c002f44 */ jal viGetViewTop /* f0fc7d0: 00000000 */ sll $zero,$zero,0x0 /* f0fc7d4: 00028400 */ sll $s0,$v0,0x10 /* f0fc7d8: 00107403 */ sra $t6,$s0,0x10 -/* f0fc7dc: 0c002f26 */ jal viGetHeight +/* f0fc7dc: 0c002f26 */ jal viGetViewY /* f0fc7e0: 01c08025 */ or $s0,$t6,$zero /* f0fc7e4: 8ec7006c */ lw $a3,0x6c($s6) /* f0fc7e8: 00504821 */ addu $t1,$v0,$s0 diff --git a/src/game/game_0fd660.c b/src/game/game_0fd660.c index 2bb225d2d..1b929b527 100644 --- a/src/game/game_0fd660.c +++ b/src/game/game_0fd660.c @@ -1584,9 +1584,9 @@ glabel func0f0ff274 /* f0ff5a4: afa40020 */ sw $a0,0x20($sp) .L0f0ff5a8: /* f0ff5a8: afa60048 */ sw $a2,0x48($sp) -/* f0ff5ac: 0c002f22 */ jal viGetWidth +/* f0ff5ac: 0c002f22 */ jal viGetViewX /* f0ff5b0: afa7004c */ sw $a3,0x4c($sp) -/* f0ff5b4: 0c002f40 */ jal viGetLeft +/* f0ff5b4: 0c002f40 */ jal viGetViewLeft /* f0ff5b8: a7a20024 */ sh $v0,0x24($sp) /* f0ff5bc: 3c038008 */ lui $v1,%hi(var8007fac0) /* f0ff5c0: 8c63fac0 */ lw $v1,%lo(var8007fac0)($v1) @@ -1624,9 +1624,9 @@ glabel func0f0ff274 /* f0ff634: 0006000d */ break 0x6 .L0f0ff638: /* f0ff638: 030fc821 */ addu $t9,$t8,$t7 -/* f0ff63c: 0c002f26 */ jal viGetHeight +/* f0ff63c: 0c002f26 */ jal viGetViewY /* f0ff640: a4d90000 */ sh $t9,0x0($a2) -/* f0ff644: 0c002f44 */ jal viGetTop +/* f0ff644: 0c002f44 */ jal viGetViewTop /* f0ff648: a7a20024 */ sh $v0,0x24($sp) /* f0ff64c: 8fa7004c */ lw $a3,0x4c($sp) /* f0ff650: 87af0024 */ lh $t7,0x24($sp) @@ -1935,9 +1935,9 @@ glabel var7f1b2ce0 /* f0ffa68: afa00014 */ sw $zero,0x14($sp) /* f0ffa6c: 0fc55cbe */ jal textMeasure /* f0ffa70: afb90010 */ sw $t9,0x10($sp) -/* f0ffa74: 0c002f40 */ jal viGetLeft +/* f0ffa74: 0c002f40 */ jal viGetViewLeft /* f0ffa78: 00000000 */ sll $zero,$zero,0x0 -/* f0ffa7c: 0c002f22 */ jal viGetWidth +/* f0ffa7c: 0c002f22 */ jal viGetViewX /* f0ffa80: a7a2004e */ sh $v0,0x4e($sp) /* f0ffa84: 3c038008 */ lui $v1,%hi(var8007fac0) /* f0ffa88: 8c63fac0 */ lw $v1,%lo(var8007fac0)($v1) @@ -2023,13 +2023,13 @@ glabel var7f1b2ce0 /* f0ffba4: 29e10002 */ slti $at,$t7,0x2 /* f0ffba8: 14200006 */ bnez $at,.L0f0ffbc4 /* f0ffbac: 00000000 */ sll $zero,$zero,0x0 -/* f0ffbb0: 0c002f44 */ jal viGetTop +/* f0ffbb0: 0c002f44 */ jal viGetViewTop /* f0ffbb4: 00000000 */ sll $zero,$zero,0x0 /* f0ffbb8: 24590005 */ addiu $t9,$v0,0x5 /* f0ffbbc: 10000005 */ beqz $zero,.L0f0ffbd4 /* f0ffbc0: afb90090 */ sw $t9,0x90($sp) .L0f0ffbc4: -/* f0ffbc4: 0c002f44 */ jal viGetTop +/* f0ffbc4: 0c002f44 */ jal viGetViewTop /* f0ffbc8: 00000000 */ sll $zero,$zero,0x0 /* f0ffbcc: 244b000a */ addiu $t3,$v0,0xa /* f0ffbd0: afab0090 */ sw $t3,0x90($sp) @@ -2037,7 +2037,7 @@ glabel var7f1b2ce0 /* f0ffbd4: 8fb80074 */ lw $t8,0x74($sp) /* f0ffbd8: 13000012 */ beqz $t8,.L0f0ffc24 /* f0ffbdc: 00000000 */ sll $zero,$zero,0x0 -/* f0ffbe0: 0c002f40 */ jal viGetLeft +/* f0ffbe0: 0c002f40 */ jal viGetViewLeft /* f0ffbe4: 00000000 */ sll $zero,$zero,0x0 /* f0ffbe8: 3c0c8008 */ lui $t4,%hi(var8007fac0) /* f0ffbec: 8d8cfac0 */ lw $t4,%lo(var8007fac0)($t4) @@ -2138,9 +2138,9 @@ glabel var7f1b2ce0 /* f0ffd48: afa00014 */ sw $zero,0x14($sp) /* f0ffd4c: 0fc55cbe */ jal textMeasure /* f0ffd50: afb80010 */ sw $t8,0x10($sp) -/* f0ffd54: 0c002f40 */ jal viGetLeft +/* f0ffd54: 0c002f40 */ jal viGetViewLeft /* f0ffd58: 00000000 */ sll $zero,$zero,0x0 -/* f0ffd5c: 0c002f22 */ jal viGetWidth +/* f0ffd5c: 0c002f22 */ jal viGetViewX /* f0ffd60: a7a2004e */ sh $v0,0x4e($sp) /* f0ffd64: 3c038008 */ lui $v1,%hi(var8007fac0) /* f0ffd68: 8c63fac0 */ lw $v1,%lo(var8007fac0)($v1) @@ -2191,7 +2191,7 @@ glabel var7f1b2ce0 /* f0ffe0c: 01edc821 */ addu $t9,$t7,$t5 /* f0ffe10: 13000012 */ beqz $t8,.L0f0ffe5c /* f0ffe14: afb90094 */ sw $t9,0x94($sp) -/* f0ffe18: 0c002f40 */ jal viGetLeft +/* f0ffe18: 0c002f40 */ jal viGetViewLeft /* f0ffe1c: 00000000 */ sll $zero,$zero,0x0 /* f0ffe20: 3c0c8008 */ lui $t4,%hi(var8007fac0) /* f0ffe24: 8d8cfac0 */ lw $t4,%lo(var8007fac0)($t4) @@ -2252,9 +2252,9 @@ glabel var7f1b2ce0 /* f0ffef4: afa00014 */ sw $zero,0x14($sp) /* f0ffef8: 0fc55cbe */ jal textMeasure /* f0ffefc: afb90010 */ sw $t9,0x10($sp) -/* f0fff00: 0c002f40 */ jal viGetLeft +/* f0fff00: 0c002f40 */ jal viGetViewLeft /* f0fff04: 00000000 */ sll $zero,$zero,0x0 -/* f0fff08: 0c002f22 */ jal viGetWidth +/* f0fff08: 0c002f22 */ jal viGetViewX /* f0fff0c: a7a2004e */ sh $v0,0x4e($sp) /* f0fff10: 3c038008 */ lui $v1,%hi(var8007fac0) /* f0fff14: 8c63fac0 */ lw $v1,%lo(var8007fac0)($v1) @@ -2342,13 +2342,13 @@ glabel var7f1b2ce0 /* f10003c: 29e10002 */ slti $at,$t7,0x2 /* f100040: 14200006 */ bnez $at,.L0f10005c /* f100044: 00000000 */ sll $zero,$zero,0x0 -/* f100048: 0c002f44 */ jal viGetTop +/* f100048: 0c002f44 */ jal viGetViewTop /* f10004c: 00000000 */ sll $zero,$zero,0x0 /* f100050: 24590005 */ addiu $t9,$v0,0x5 /* f100054: 10000005 */ beqz $zero,.L0f10006c /* f100058: afb90090 */ sw $t9,0x90($sp) .L0f10005c: -/* f10005c: 0c002f44 */ jal viGetTop +/* f10005c: 0c002f44 */ jal viGetViewTop /* f100060: 00000000 */ sll $zero,$zero,0x0 /* f100064: 2458000a */ addiu $t8,$v0,0xa /* f100068: afb80090 */ sw $t8,0x90($sp) @@ -2356,7 +2356,7 @@ glabel var7f1b2ce0 /* f10006c: 8fad0074 */ lw $t5,0x74($sp) /* f100070: 11a00012 */ beqz $t5,.L0f1000bc /* f100074: 00000000 */ sll $zero,$zero,0x0 -/* f100078: 0c002f40 */ jal viGetLeft +/* f100078: 0c002f40 */ jal viGetViewLeft /* f10007c: 00000000 */ sll $zero,$zero,0x0 /* f100080: 3c0c8008 */ lui $t4,%hi(var8007fac0) /* f100084: 8d8cfac0 */ lw $t4,%lo(var8007fac0)($t4) @@ -4226,7 +4226,7 @@ glabel func0f100ad0 /* f101b74: 00000000 */ sll $zero,$zero,0x0 /* f101b78: 10400015 */ beqz $v0,.L0f101bd0 /* f101b7c: 00000000 */ sll $zero,$zero,0x0 -/* f101b80: 0c002f40 */ jal viGetLeft +/* f101b80: 0c002f40 */ jal viGetViewLeft /* f101b84: 00000000 */ sll $zero,$zero,0x0 /* f101b88: 3c188008 */ lui $t8,%hi(var8007fac0) /* f101b8c: 8f18fac0 */ lw $t8,%lo(var8007fac0)($t8) @@ -4249,11 +4249,11 @@ glabel func0f100ad0 /* f101bc8: 10000031 */ beqz $zero,.L0f101c90 /* f101bcc: 3c013e80 */ lui $at,0x3e80 .L0f101bd0: -/* f101bd0: 0c002f22 */ jal viGetWidth +/* f101bd0: 0c002f22 */ jal viGetViewX /* f101bd4: 00000000 */ sll $zero,$zero,0x0 /* f101bd8: 00028c00 */ sll $s1,$v0,0x10 /* f101bdc: 00117c03 */ sra $t7,$s1,0x10 -/* f101be0: 0c002f40 */ jal viGetLeft +/* f101be0: 0c002f40 */ jal viGetViewLeft /* f101be4: 01e08825 */ or $s1,$t7,$zero /* f101be8: 3c038008 */ lui $v1,%hi(var8007fac0) /* f101bec: 8c63fac0 */ lw $v1,%lo(var8007fac0)($v1) @@ -4347,11 +4347,11 @@ glabel func0f100ad0 /* f101d34: 3739ffff */ ori $t9,$t9,0xffff /* f101d38: adf90000 */ sw $t9,0x0($t7) /* f101d3c: adee0004 */ sw $t6,0x4($t7) -/* f101d40: 0c002f26 */ jal viGetHeight +/* f101d40: 0c002f26 */ jal viGetViewY /* f101d44: e7a20068 */ swc1 $f2,0x68($sp) /* f101d48: 0002a400 */ sll $s4,$v0,0x10 /* f101d4c: 00147c03 */ sra $t7,$s4,0x10 -/* f101d50: 0c002f44 */ jal viGetTop +/* f101d50: 0c002f44 */ jal viGetViewTop /* f101d54: 01e0a025 */ or $s4,$t7,$zero /* f101d58: 3c04800a */ lui $a0,%hi(g_Vars) /* f101d5c: 24849fc0 */ addiu $a0,$a0,%lo(g_Vars) diff --git a/src/game/game_11f000.c b/src/game/game_11f000.c index bb69c276a..71f800bdb 100644 --- a/src/game/game_11f000.c +++ b/src/game/game_11f000.c @@ -915,15 +915,15 @@ glabel var7f1b50c8 .L0f11fabc: /* f11fabc: 00608825 */ or $s1,$v1,$zero /* f11fac0: 24630008 */ addiu $v1,$v1,0x8 -/* f11fac4: 0c002f22 */ jal viGetWidth +/* f11fac4: 0c002f22 */ jal viGetViewX /* f11fac8: afa306b0 */ sw $v1,0x6b0($sp) -/* f11facc: 0c002f40 */ jal viGetLeft +/* f11facc: 0c002f40 */ jal viGetViewLeft /* f11fad0: a7a2007a */ sh $v0,0x7a($sp) -/* f11fad4: 0c002f44 */ jal viGetTop +/* f11fad4: 0c002f44 */ jal viGetViewTop /* f11fad8: a7a2007c */ sh $v0,0x7c($sp) /* f11fadc: 00028400 */ sll $s0,$v0,0x10 /* f11fae0: 00106403 */ sra $t4,$s0,0x10 -/* f11fae4: 0c002f26 */ jal viGetHeight +/* f11fae4: 0c002f26 */ jal viGetViewY /* f11fae8: 01808025 */ or $s0,$t4,$zero /* f11faec: 87ad007c */ lh $t5,0x7c($sp) /* f11faf0: 87ae007a */ lh $t6,0x7a($sp) @@ -938,11 +938,11 @@ glabel var7f1b50c8 /* f11fb14: 01a17025 */ or $t6,$t5,$at /* f11fb18: 00194b80 */ sll $t1,$t9,0xe /* f11fb1c: 01c97825 */ or $t7,$t6,$t1 -/* f11fb20: 0c002f40 */ jal viGetLeft +/* f11fb20: 0c002f40 */ jal viGetViewLeft /* f11fb24: ae2f0000 */ sw $t7,0x0($s1) /* f11fb28: 00028400 */ sll $s0,$v0,0x10 /* f11fb2c: 0010c403 */ sra $t8,$s0,0x10 -/* f11fb30: 0c002f44 */ jal viGetTop +/* f11fb30: 0c002f44 */ jal viGetViewTop /* f11fb34: 03008025 */ or $s0,$t8,$zero /* f11fb38: 305903ff */ andi $t9,$v0,0x3ff /* f11fb3c: 320b03ff */ andi $t3,$s0,0x3ff @@ -7182,13 +7182,13 @@ glabel func0f125948 /* f12594c: afbf0014 */ sw $ra,0x14($sp) /* f125950: afa40028 */ sw $a0,0x28($sp) /* f125954: afa5002c */ sw $a1,0x2c($sp) -/* f125958: 0c002f40 */ jal viGetLeft +/* f125958: 0c002f40 */ jal viGetViewLeft /* f12595c: afa60030 */ sw $a2,0x30($sp) -/* f125960: 0c002f44 */ jal viGetTop +/* f125960: 0c002f44 */ jal viGetViewTop /* f125964: afa20024 */ sw $v0,0x24($sp) -/* f125968: 0c002f22 */ jal viGetWidth +/* f125968: 0c002f22 */ jal viGetViewX /* f12596c: afa20020 */ sw $v0,0x20($sp) -/* f125970: 0c002f26 */ jal viGetHeight +/* f125970: 0c002f26 */ jal viGetViewY /* f125974: afa2001c */ sw $v0,0x1c($sp) /* f125978: 8fa30024 */ lw $v1,0x24($sp) /* f12597c: 8fa4002c */ lw $a0,0x2c($sp) @@ -7315,13 +7315,13 @@ glabel var7f1b5108 /* f125b18: 00000000 */ sll $zero,$zero,0x0 /* f125b1c: 24030002 */ addiu $v1,$zero,0x2 .L0f125b20: -/* f125b20: 0c002f40 */ jal viGetLeft +/* f125b20: 0c002f40 */ jal viGetViewLeft /* f125b24: afa30128 */ sw $v1,0x128($sp) -/* f125b28: 0c002f44 */ jal viGetTop +/* f125b28: 0c002f44 */ jal viGetViewTop /* f125b2c: a7a20166 */ sh $v0,0x166($sp) -/* f125b30: 0c002f22 */ jal viGetWidth +/* f125b30: 0c002f22 */ jal viGetViewX /* f125b34: a7a20164 */ sh $v0,0x164($sp) -/* f125b38: 0c002f26 */ jal viGetHeight +/* f125b38: 0c002f26 */ jal viGetViewY /* f125b3c: a7a20162 */ sh $v0,0x162($sp) /* f125b40: 87a80162 */ lh $t0,0x162($sp) /* f125b44: 44824000 */ mtc1 $v0,$f8 @@ -7957,7 +7957,7 @@ glabel var7f1b511c /* f126498: 24100001 */ addiu $s0,$zero,0x1 /* f12649c: 24100002 */ addiu $s0,$zero,0x2 .L0f1264a0: -/* f1264a0: 0c002f22 */ jal viGetWidth +/* f1264a0: 0c002f22 */ jal viGetViewX /* f1264a4: 00000000 */ sll $zero,$zero,0x0 /* f1264a8: 44822000 */ mtc1 $v0,$f4 /* f1264ac: 3c017f1b */ lui $at,%hi(var7f1b510c) @@ -7969,7 +7969,7 @@ glabel var7f1b511c /* f1264c4: 461e3202 */ mul.s $f8,$f6,$f30 /* f1264c8: 4608d281 */ sub.s $f10,$f26,$f8 /* f1264cc: 46145102 */ mul.s $f4,$f10,$f20 -/* f1264d0: 0c002f26 */ jal viGetHeight +/* f1264d0: 0c002f26 */ jal viGetViewY /* f1264d4: e7a40128 */ swc1 $f4,0x128($sp) /* f1264d8: 44823000 */ mtc1 $v0,$f6 /* f1264dc: 3c16800b */ lui $s6,%hi(var800ab5a0) @@ -8346,7 +8346,7 @@ glabel var7f1b511c /* f126a8c: 26310004 */ addiu $s1,$s1,0x4 /* f126a90: 1614ff9d */ bne $s0,$s4,.L0f126908 /* f126a94: 26520004 */ addiu $s2,$s2,0x4 -/* f126a98: 0c002f22 */ jal viGetWidth +/* f126a98: 0c002f22 */ jal viGetViewX /* f126a9c: 00000000 */ sll $zero,$zero,0x0 /* f126aa0: 44822000 */ mtc1 $v0,$f4 /* f126aa4: 3c013f00 */ lui $at,0x3f00 @@ -8354,7 +8354,7 @@ glabel var7f1b511c /* f126aac: 46802220 */ cvt.s.w $f8,$f4 /* f126ab0: c7aa0194 */ lwc1 $f10,0x194($sp) /* f126ab4: 46184182 */ mul.s $f6,$f8,$f24 -/* f126ab8: 0c002f26 */ jal viGetHeight +/* f126ab8: 0c002f26 */ jal viGetViewY /* f126abc: 460a3501 */ sub.s $f20,$f6,$f10 /* f126ac0: 44822000 */ mtc1 $v0,$f4 /* f126ac4: c7aa0198 */ lwc1 $f10,0x198($sp) @@ -8484,13 +8484,13 @@ glabel func0f126c3c /* f126c98: 00000000 */ sll $zero,$zero,0x0 /* f126c9c: 4502004e */ bc1fl .L0f126dd8 /* f126ca0: 8fbf0024 */ lw $ra,0x24($sp) -/* f126ca4: 0c002f40 */ jal viGetLeft +/* f126ca4: 0c002f40 */ jal viGetViewLeft /* f126ca8: 00000000 */ sll $zero,$zero,0x0 -/* f126cac: 0c002f44 */ jal viGetTop +/* f126cac: 0c002f44 */ jal viGetViewTop /* f126cb0: a7a2005a */ sh $v0,0x5a($sp) -/* f126cb4: 0c002f22 */ jal viGetWidth +/* f126cb4: 0c002f22 */ jal viGetViewX /* f126cb8: a7a20058 */ sh $v0,0x58($sp) -/* f126cbc: 0c002f26 */ jal viGetHeight +/* f126cbc: 0c002f26 */ jal viGetViewY /* f126cc0: a7a20056 */ sh $v0,0x56($sp) /* f126cc4: 87ae0056 */ lh $t6,0x56($sp) /* f126cc8: c7a60064 */ lwc1 $f6,0x64($sp) @@ -9281,13 +9281,13 @@ glabel var7f1b5140 /* f1277dc: 032dc025 */ or $t8,$t9,$t5 /* f1277e0: ac580004 */ sw $t8,0x4($v0) /* f1277e4: afb00038 */ sw $s0,0x38($sp) -/* f1277e8: 0c002f22 */ jal viGetWidth +/* f1277e8: 0c002f22 */ jal viGetViewX /* f1277ec: 26100008 */ addiu $s0,$s0,0x8 -/* f1277f0: 0c002f40 */ jal viGetLeft +/* f1277f0: 0c002f40 */ jal viGetViewLeft /* f1277f4: a7a20022 */ sh $v0,0x22($sp) -/* f1277f8: 0c002f44 */ jal viGetTop +/* f1277f8: 0c002f44 */ jal viGetViewTop /* f1277fc: a7a20024 */ sh $v0,0x24($sp) -/* f127800: 0c002f26 */ jal viGetHeight +/* f127800: 0c002f26 */ jal viGetViewY /* f127804: a7a20026 */ sh $v0,0x26($sp) /* f127808: 87ae0024 */ lh $t6,0x24($sp) /* f12780c: 87af0022 */ lh $t7,0x22($sp) @@ -9302,9 +9302,9 @@ glabel var7f1b5140 /* f127830: 8fb90038 */ lw $t9,0x38($sp) /* f127834: 01a17025 */ or $t6,$t5,$at /* f127838: 01d87825 */ or $t7,$t6,$t8 -/* f12783c: 0c002f40 */ jal viGetLeft +/* f12783c: 0c002f40 */ jal viGetViewLeft /* f127840: af2f0000 */ sw $t7,0x0($t9) -/* f127844: 0c002f44 */ jal viGetTop +/* f127844: 0c002f44 */ jal viGetViewTop /* f127848: a7a20026 */ sh $v0,0x26($sp) /* f12784c: 87b80026 */ lh $t8,0x26($sp) /* f127850: 304d03ff */ andi $t5,$v0,0x3ff diff --git a/src/game/game_135c70.c b/src/game/game_135c70.c index 0f1ce34af..7d9650dd1 100644 --- a/src/game/game_135c70.c +++ b/src/game/game_135c70.c @@ -911,18 +911,18 @@ glabel var7f1b57bc /* f1368b8: f7b80028 */ sdc1 $f24,0x28($sp) /* f1368bc: f7b60020 */ sdc1 $f22,0x20($sp) /* f1368c0: f7b40018 */ sdc1 $f20,0x18($sp) -/* f1368c4: 0c002f40 */ jal viGetLeft +/* f1368c4: 0c002f40 */ jal viGetViewLeft /* f1368c8: 00008825 */ or $s1,$zero,$zero /* f1368cc: 44822000 */ mtc1 $v0,$f4 -/* f1368d0: 0c002f22 */ jal viGetWidth +/* f1368d0: 0c002f22 */ jal viGetViewX /* f1368d4: 46802520 */ cvt.s.w $f20,$f4 /* f1368d8: 44823000 */ mtc1 $v0,$f6 /* f1368dc: 00000000 */ sll $zero,$zero,0x0 /* f1368e0: 46803220 */ cvt.s.w $f8,$f6 -/* f1368e4: 0c002f44 */ jal viGetTop +/* f1368e4: 0c002f44 */ jal viGetViewTop /* f1368e8: 46144600 */ add.s $f24,$f8,$f20 /* f1368ec: 44825000 */ mtc1 $v0,$f10 -/* f1368f0: 0c002f26 */ jal viGetHeight +/* f1368f0: 0c002f26 */ jal viGetViewY /* f1368f4: 468055a0 */ cvt.s.w $f22,$f10 /* f1368f8: 3c13800a */ lui $s3,%hi(g_Vars) /* f1368fc: 26739fc0 */ addiu $s3,$s3,%lo(g_Vars) diff --git a/src/game/game_13c510.c b/src/game/game_13c510.c index 7469d0408..32f079d4c 100644 --- a/src/game/game_13c510.c +++ b/src/game/game_13c510.c @@ -313,20 +313,20 @@ glabel func0f13c780 /* f13c888: 02002825 */ or $a1,$s0,$zero /* f13c88c: 0c005680 */ jal func00015a00 /* f13c890: 27a600f8 */ addiu $a2,$sp,0xf8 -/* f13c894: 0c002f22 */ jal viGetWidth +/* f13c894: 0c002f22 */ jal viGetViewX /* f13c898: 00000000 */ sll $zero,$zero,0x0 /* f13c89c: 44822000 */ mtc1 $v0,$f4 /* f13c8a0: 00000000 */ sll $zero,$zero,0x0 /* f13c8a4: 468021a0 */ cvt.s.w $f6,$f4 -/* f13c8a8: 0c002f26 */ jal viGetHeight +/* f13c8a8: 0c002f26 */ jal viGetViewY /* f13c8ac: e7a601bc */ swc1 $f6,0x1bc($sp) /* f13c8b0: 44824000 */ mtc1 $v0,$f8 /* f13c8b4: 00000000 */ sll $zero,$zero,0x0 /* f13c8b8: 468042a0 */ cvt.s.w $f10,$f8 -/* f13c8bc: 0c002f40 */ jal viGetLeft +/* f13c8bc: 0c002f40 */ jal viGetViewLeft /* f13c8c0: e7aa01b8 */ swc1 $f10,0x1b8($sp) /* f13c8c4: 44822000 */ mtc1 $v0,$f4 -/* f13c8c8: 0c002f44 */ jal viGetTop +/* f13c8c8: 0c002f44 */ jal viGetViewTop /* f13c8cc: 468027a0 */ cvt.s.w $f30,$f4 /* f13c8d0: 8fae01c0 */ lw $t6,0x1c0($sp) /* f13c8d4: 44823000 */ mtc1 $v0,$f6 @@ -1711,7 +1711,7 @@ glabel func0f13d568 /* f13dce0: 46045682 */ mul.s $f26,$f10,$f4 /* f13dce4: 0fc2d60a */ jal currentPlayerGetPerspAspect /* f13dce8: 00000000 */ sll $zero,$zero,0x0 -/* f13dcec: 0c002f22 */ jal viGetWidth +/* f13dcec: 0c002f22 */ jal viGetViewX /* f13dcf0: 46000506 */ mov.s $f20,$f0 /* f13dcf4: 44824000 */ mtc1 $v0,$f8 /* f13dcf8: 3c017f1b */ lui $at,%hi(var7f1b5a04) @@ -1720,7 +1720,7 @@ glabel func0f13d568 /* f13dd04: 46109182 */ mul.s $f6,$f18,$f16 /* f13dd08: 46143283 */ div.s $f10,$f6,$f20 /* f13dd0c: 460ac602 */ mul.s $f24,$f24,$f10 -/* f13dd10: 0c002f26 */ jal viGetHeight +/* f13dd10: 0c002f26 */ jal viGetViewY /* f13dd14: 00000000 */ sll $zero,$zero,0x0 /* f13dd18: 44822000 */ mtc1 $v0,$f4 /* f13dd1c: 3c017f1b */ lui $at,%hi(var7f1b5a08) diff --git a/src/game/game_141820.c b/src/game/game_141820.c index 02e27f57c..b8cc4f9be 100644 --- a/src/game/game_141820.c +++ b/src/game/game_141820.c @@ -916,13 +916,13 @@ glabel func0f142438 /* f14246c: f7b40028 */ sdc1 $f20,0x28($sp) /* f142470: 0c002acb */ jal func0000ab2c /* f142474: afa5007c */ sw $a1,0x7c($sp) -/* f142478: 0c002f44 */ jal viGetTop +/* f142478: 0c002f44 */ jal viGetViewTop /* f14247c: 0040b025 */ or $s6,$v0,$zero -/* f142480: 0c002f26 */ jal viGetHeight +/* f142480: 0c002f26 */ jal viGetViewY /* f142484: 00409825 */ or $s3,$v0,$zero -/* f142488: 0c002f22 */ jal viGetWidth +/* f142488: 0c002f22 */ jal viGetViewX /* f14248c: afa2006c */ sw $v0,0x6c($sp) -/* f142490: 0c002f40 */ jal viGetLeft +/* f142490: 0c002f40 */ jal viGetViewLeft /* f142494: 0040a025 */ or $s4,$v0,$zero /* f142498: 3c038008 */ lui $v1,%hi(var8007f848) /* f14249c: 2463f848 */ addiu $v1,$v1,%lo(var8007f848) @@ -1056,13 +1056,13 @@ glabel func0f142644 /* f142670: afb3003c */ sw $s3,0x3c($sp) /* f142674: 0c002acb */ jal func0000ab2c /* f142678: f7b40028 */ sdc1 $f20,0x28($sp) -/* f14267c: 0c002f44 */ jal viGetTop +/* f14267c: 0c002f44 */ jal viGetViewTop /* f142680: 00000000 */ sll $zero,$zero,0x0 -/* f142684: 0c002f26 */ jal viGetHeight +/* f142684: 0c002f26 */ jal viGetViewY /* f142688: 00409825 */ or $s3,$v0,$zero -/* f14268c: 0c002f22 */ jal viGetWidth +/* f14268c: 0c002f22 */ jal viGetViewX /* f142690: afa20054 */ sw $v0,0x54($sp) -/* f142694: 0c002f40 */ jal viGetLeft +/* f142694: 0c002f40 */ jal viGetViewLeft /* f142698: 0040a825 */ or $s5,$v0,$zero /* f14269c: 0c004b70 */ jal random /* f1426a0: 0040b025 */ or $s6,$v0,$zero @@ -1143,13 +1143,13 @@ glabel func0f142774 /* f1427b0: f7b60030 */ sdc1 $f22,0x30($sp) /* f1427b4: 0c002ac7 */ jal func0000ab1c /* f1427b8: f7b40028 */ sdc1 $f20,0x28($sp) -/* f1427bc: 0c002f44 */ jal viGetTop +/* f1427bc: 0c002f44 */ jal viGetViewTop /* f1427c0: afa2007c */ sw $v0,0x7c($sp) -/* f1427c4: 0c002f26 */ jal viGetHeight +/* f1427c4: 0c002f26 */ jal viGetViewY /* f1427c8: 0040b825 */ or $s7,$v0,$zero -/* f1427cc: 0c002f22 */ jal viGetWidth +/* f1427cc: 0c002f22 */ jal viGetViewX /* f1427d0: 00408825 */ or $s1,$v0,$zero -/* f1427d4: 0c002f40 */ jal viGetLeft +/* f1427d4: 0c002f40 */ jal viGetViewLeft /* f1427d8: 0040f025 */ or $s8,$v0,$zero /* f1427dc: 3c017f1b */ lui $at,%hi(var7f1b5f2c) /* f1427e0: c4365f2c */ lwc1 $f22,%lo(var7f1b5f2c)($at) @@ -1287,13 +1287,13 @@ glabel func0f14298c /* f1429c0: afb10034 */ sw $s1,0x34($sp) /* f1429c4: 0c002ac7 */ jal func0000ab1c /* f1429c8: f7b40028 */ sdc1 $f20,0x28($sp) -/* f1429cc: 0c002f44 */ jal viGetTop +/* f1429cc: 0c002f44 */ jal viGetViewTop /* f1429d0: afa2008c */ sw $v0,0x8c($sp) -/* f1429d4: 0c002f26 */ jal viGetHeight +/* f1429d4: 0c002f26 */ jal viGetViewY /* f1429d8: afa20088 */ sw $v0,0x88($sp) -/* f1429dc: 0c002f22 */ jal viGetWidth +/* f1429dc: 0c002f22 */ jal viGetViewX /* f1429e0: 00408825 */ or $s1,$v0,$zero -/* f1429e4: 0c002f40 */ jal viGetLeft +/* f1429e4: 0c002f40 */ jal viGetViewLeft /* f1429e8: afa2007c */ sw $v0,0x7c($sp) /* f1429ec: 3c018006 */ lui $at,0x8006 /* f1429f0: c4241630 */ lwc1 $f4,0x1630($at) @@ -1456,13 +1456,13 @@ glabel func0f142bf0 /* f142c28: f7b60030 */ sdc1 $f22,0x30($sp) /* f142c2c: 0c002acb */ jal func0000ab2c /* f142c30: f7b40028 */ sdc1 $f20,0x28($sp) -/* f142c34: 0c002f44 */ jal viGetTop +/* f142c34: 0c002f44 */ jal viGetViewTop /* f142c38: 0040b025 */ or $s6,$v0,$zero -/* f142c3c: 0c002f26 */ jal viGetHeight +/* f142c3c: 0c002f26 */ jal viGetViewY /* f142c40: 0040a825 */ or $s5,$v0,$zero -/* f142c44: 0c002f22 */ jal viGetWidth +/* f142c44: 0c002f22 */ jal viGetViewX /* f142c48: afa20064 */ sw $v0,0x64($sp) -/* f142c4c: 0c002f40 */ jal viGetLeft +/* f142c4c: 0c002f40 */ jal viGetViewLeft /* f142c50: 00409825 */ or $s3,$v0,$zero /* f142c54: 3c038008 */ lui $v1,%hi(var8007f840) /* f142c58: 2463f840 */ addiu $v1,$v1,%lo(var8007f840) @@ -1609,9 +1609,9 @@ glabel hudRenderEyespyView /* f142e4c: f7b40028 */ sdc1 $f20,0x28($sp) /* f142e50: 0c002ac7 */ jal func0000ab1c /* f142e54: afa7013c */ sw $a3,0x13c($sp) -/* f142e58: 0c002f44 */ jal viGetTop +/* f142e58: 0c002f44 */ jal viGetViewTop /* f142e5c: afa2012c */ sw $v0,0x12c($sp) -/* f142e60: 0c002f26 */ jal viGetHeight +/* f142e60: 0c002f26 */ jal viGetViewY /* f142e64: afa20128 */ sw $v0,0x128($sp) /* f142e68: 44822000 */ mtc1 $v0,$f4 /* f142e6c: 3c013f00 */ lui $at,0x3f00 @@ -1622,9 +1622,9 @@ glabel hudRenderEyespyView /* f142e80: 461ce200 */ add.s $f8,$f28,$f28 /* f142e84: 461ce602 */ mul.s $f24,$f28,$f28 /* f142e88: 46004287 */ neg.s $f10,$f8 -/* f142e8c: 0c002f22 */ jal viGetWidth +/* f142e8c: 0c002f22 */ jal viGetViewX /* f142e90: 46025683 */ div.s $f26,$f10,$f2 -/* f142e94: 0c002f40 */ jal viGetLeft +/* f142e94: 0c002f40 */ jal viGetViewLeft /* f142e98: 0040b025 */ or $s6,$v0,$zero /* f142e9c: 3c038008 */ lui $v1,%hi(var8007f840) /* f142ea0: 2463f840 */ addiu $v1,$v1,%lo(var8007f840) @@ -2308,13 +2308,13 @@ glabel hudRenderEyespyUi /* f1438a0: afb30044 */ sw $s3,0x44($sp) /* f1438a4: afb20040 */ sw $s2,0x40($sp) /* f1438a8: afb1003c */ sw $s1,0x3c($sp) -/* f1438ac: 0c002f40 */ jal viGetLeft +/* f1438ac: 0c002f40 */ jal viGetViewLeft /* f1438b0: afb00038 */ sw $s0,0x38($sp) -/* f1438b4: 0c002f44 */ jal viGetTop +/* f1438b4: 0c002f44 */ jal viGetViewTop /* f1438b8: afa20304 */ sw $v0,0x304($sp) -/* f1438bc: 0c002f22 */ jal viGetWidth +/* f1438bc: 0c002f22 */ jal viGetViewX /* f1438c0: afa20300 */ sw $v0,0x300($sp) -/* f1438c4: 0c002f26 */ jal viGetHeight +/* f1438c4: 0c002f26 */ jal viGetViewY /* f1438c8: 00408825 */ or $s1,$v0,$zero /* f1438cc: 8fae0300 */ lw $t6,0x300($sp) /* f1438d0: 44806000 */ mtc1 $zero,$f12 @@ -6242,13 +6242,13 @@ glabel func0f1472fc /* f147328: afb00030 */ sw $s0,0x30($sp) /* f14732c: 0c002ac7 */ jal func0000ab1c /* f147330: f7b40028 */ sdc1 $f20,0x28($sp) -/* f147334: 0c002f26 */ jal viGetHeight +/* f147334: 0c002f26 */ jal viGetViewY /* f147338: afa2005c */ sw $v0,0x5c($sp) -/* f14733c: 0c002f22 */ jal viGetWidth +/* f14733c: 0c002f22 */ jal viGetViewX /* f147340: 00408025 */ or $s0,$v0,$zero -/* f147344: 0c002f44 */ jal viGetTop +/* f147344: 0c002f44 */ jal viGetViewTop /* f147348: 0040b025 */ or $s6,$v0,$zero -/* f14734c: 0c002f40 */ jal viGetLeft +/* f14734c: 0c002f40 */ jal viGetViewLeft /* f147350: 00409825 */ or $s3,$v0,$zero /* f147354: 3c038008 */ lui $v1,%hi(var8007f840) /* f147358: 2463f840 */ addiu $v1,$v1,%lo(var8007f840) @@ -6418,13 +6418,13 @@ glabel func0f147578 /* f1475a8: f7b60030 */ sdc1 $f22,0x30($sp) /* f1475ac: 0c002ac7 */ jal func0000ab1c /* f1475b0: f7b40028 */ sdc1 $f20,0x28($sp) -/* f1475b4: 0c002f26 */ jal viGetHeight +/* f1475b4: 0c002f26 */ jal viGetViewY /* f1475b8: 0040f025 */ or $s8,$v0,$zero -/* f1475bc: 0c002f22 */ jal viGetWidth +/* f1475bc: 0c002f22 */ jal viGetViewX /* f1475c0: 00409825 */ or $s3,$v0,$zero -/* f1475c4: 0c002f44 */ jal viGetTop +/* f1475c4: 0c002f44 */ jal viGetViewTop /* f1475c8: afa200dc */ sw $v0,0xdc($sp) -/* f1475cc: 0c002f40 */ jal viGetLeft +/* f1475cc: 0c002f40 */ jal viGetViewLeft /* f1475d0: 00408025 */ or $s0,$v0,$zero /* f1475d4: 3c038008 */ lui $v1,%hi(var8007f84c) /* f1475d8: 8c63f84c */ lw $v1,%lo(var8007f84c)($v1) @@ -6797,13 +6797,13 @@ glabel func0f147578 /* f147b38: f7b40028 */ sdc1 $f20,0x28($sp) /* f147b3c: 0c002ac7 */ jal func0000ab1c /* f147b40: afa5008c */ sw $a1,0x8c($sp) -/* f147b44: 0c002f44 */ jal viGetTop +/* f147b44: 0c002f44 */ jal viGetViewTop /* f147b48: 0040b025 */ or $s6,$v0,$zero -/* f147b4c: 0c002f26 */ jal viGetHeight +/* f147b4c: 0c002f26 */ jal viGetViewY /* f147b50: afa20080 */ sw $v0,0x80($sp) -/* f147b54: 0c002f22 */ jal viGetWidth +/* f147b54: 0c002f22 */ jal viGetViewX /* f147b58: afa2007c */ sw $v0,0x7c($sp) -/* f147b5c: 0c002f40 */ jal viGetLeft +/* f147b5c: 0c002f40 */ jal viGetViewLeft /* f147b60: 0040a025 */ or $s4,$v0,$zero /* f147b64: 3c038008 */ lui $v1,%hi(var8007f840) /* f147b68: 2463f840 */ addiu $v1,$v1,%lo(var8007f840) @@ -6928,13 +6928,13 @@ glabel func0f147cf8 /* f147d18: afb0002c */ sw $s0,0x2c($sp) /* f147d1c: 0c002ac7 */ jal func0000ab1c /* f147d20: f7b40020 */ sdc1 $f20,0x20($sp) -/* f147d24: 0c002f44 */ jal viGetTop +/* f147d24: 0c002f44 */ jal viGetViewTop /* f147d28: 0040a825 */ or $s5,$v0,$zero -/* f147d2c: 0c002f26 */ jal viGetHeight +/* f147d2c: 0c002f26 */ jal viGetViewY /* f147d30: afa20050 */ sw $v0,0x50($sp) -/* f147d34: 0c002f22 */ jal viGetWidth +/* f147d34: 0c002f22 */ jal viGetViewX /* f147d38: afa2004c */ sw $v0,0x4c($sp) -/* f147d3c: 0c002f40 */ jal viGetLeft +/* f147d3c: 0c002f40 */ jal viGetViewLeft /* f147d40: 00409825 */ or $s3,$v0,$zero /* f147d44: 3c038008 */ lui $v1,%hi(var8007f840) /* f147d48: 2463f840 */ addiu $v1,$v1,%lo(var8007f840) @@ -7009,13 +7009,13 @@ glabel hudRenderHorizonScanner /* f147e3c: f7b60040 */ sdc1 $f22,0x40($sp) /* f147e40: 0c002ac7 */ jal func0000ab1c /* f147e44: f7b40038 */ sdc1 $f20,0x38($sp) -/* f147e48: 0c002f44 */ jal viGetTop +/* f147e48: 0c002f44 */ jal viGetViewTop /* f147e4c: afa20194 */ sw $v0,0x194($sp) -/* f147e50: 0c002f26 */ jal viGetHeight +/* f147e50: 0c002f26 */ jal viGetViewY /* f147e54: afa20190 */ sw $v0,0x190($sp) -/* f147e58: 0c002f22 */ jal viGetWidth +/* f147e58: 0c002f22 */ jal viGetViewX /* f147e5c: afa2018c */ sw $v0,0x18c($sp) -/* f147e60: 0c002f40 */ jal viGetLeft +/* f147e60: 0c002f40 */ jal viGetViewLeft /* f147e64: afa20188 */ sw $v0,0x188($sp) /* f147e68: 3c10800a */ lui $s0,%hi(g_Vars) /* f147e6c: 26109fc0 */ addiu $s0,$s0,%lo(g_Vars) @@ -7716,13 +7716,13 @@ glabel func0f14886c /* f148890: afb20030 */ sw $s2,0x30($sp) /* f148894: afb1002c */ sw $s1,0x2c($sp) /* f148898: afb00028 */ sw $s0,0x28($sp) -/* f14889c: 0c002f26 */ jal viGetHeight +/* f14889c: 0c002f26 */ jal viGetViewY /* f1488a0: f7b40020 */ sdc1 $f20,0x20($sp) -/* f1488a4: 0c002f22 */ jal viGetWidth +/* f1488a4: 0c002f22 */ jal viGetViewX /* f1488a8: 00408025 */ or $s0,$v0,$zero -/* f1488ac: 0c002f44 */ jal viGetTop +/* f1488ac: 0c002f44 */ jal viGetViewTop /* f1488b0: afa200a8 */ sw $v0,0xa8($sp) -/* f1488b4: 0c002f40 */ jal viGetLeft +/* f1488b4: 0c002f40 */ jal viGetViewLeft /* f1488b8: 00408825 */ or $s1,$v0,$zero /* f1488bc: 24090003 */ addiu $t1,$zero,0x3 /* f1488c0: 8fa600a8 */ lw $a2,0xa8($sp) diff --git a/src/game/game_157db0.c b/src/game/game_157db0.c index 37a616656..0041fb75c 100644 --- a/src/game/game_157db0.c +++ b/src/game/game_157db0.c @@ -15588,7 +15588,7 @@ glabel func0f164748 /* f164774: 44824000 */ mtc1 $v0,$f8 /* f164778: 00000000 */ sll $zero,$zero,0x0 /* f16477c: 468042a0 */ cvt.s.w $f10,$f8 -/* f164780: 0c002f40 */ jal viGetLeft +/* f164780: 0c002f40 */ jal viGetViewLeft /* f164784: e7aa0028 */ swc1 $f10,0x28($sp) /* f164788: 44828000 */ mtc1 $v0,$f16 /* f16478c: 44801000 */ mtc1 $zero,$f2 @@ -15607,7 +15607,7 @@ glabel func0f164748 /* f1647bc: 00000000 */ sll $zero,$zero,0x0 /* f1647c0: e6001794 */ swc1 $f0,0x1794($s0) .L0f1647c4: -/* f1647c4: 0c002f44 */ jal viGetTop +/* f1647c4: 0c002f44 */ jal viGetViewTop /* f1647c8: 00000000 */ sll $zero,$zero,0x0 /* f1647cc: 44822000 */ mtc1 $v0,$f4 /* f1647d0: 44801000 */ mtc1 $zero,$f2 @@ -15626,9 +15626,9 @@ glabel func0f164748 /* f164800: 00000000 */ sll $zero,$zero,0x0 /* f164804: e6001798 */ swc1 $f0,0x1798($s0) .L0f164808: -/* f164808: 0c002f40 */ jal viGetLeft +/* f164808: 0c002f40 */ jal viGetViewLeft /* f16480c: 00000000 */ sll $zero,$zero,0x0 -/* f164810: 0c002f22 */ jal viGetWidth +/* f164810: 0c002f22 */ jal viGetViewX /* f164814: a7a20022 */ sh $v0,0x22($sp) /* f164818: 87ae0022 */ lh $t6,0x22($sp) /* f16481c: 44801000 */ mtc1 $zero,$f2 @@ -15650,9 +15650,9 @@ glabel func0f164748 /* f164858: 00000000 */ sll $zero,$zero,0x0 /* f16485c: e60a179c */ swc1 $f10,0x179c($s0) .L0f164860: -/* f164860: 0c002f44 */ jal viGetTop +/* f164860: 0c002f44 */ jal viGetViewTop /* f164864: 00000000 */ sll $zero,$zero,0x0 -/* f164868: 0c002f26 */ jal viGetHeight +/* f164868: 0c002f26 */ jal viGetViewY /* f16486c: a7a20022 */ sh $v0,0x22($sp) /* f164870: 87b80022 */ lh $t8,0x22($sp) /* f164874: 44801000 */ mtc1 $zero,$f2 diff --git a/src/game/game_167ae0.c b/src/game/game_167ae0.c index 05fd90305..570368ec5 100644 --- a/src/game/game_167ae0.c +++ b/src/game/game_167ae0.c @@ -528,10 +528,10 @@ Gfx *fadeRender(Gfx *gdl) gDPSetPrimColor(gdl++, 0, 0, colour); gDPFillRectangle(gdl++, - viGetLeft(), - viGetTop() + inset, - viGetLeft() + viGetWidth() + 1, - viGetTop() + viGetHeight() - inset + 2); + viGetViewLeft(), + viGetViewTop() + inset, + viGetViewLeft() + viGetViewX() + 1, + viGetViewTop() + viGetViewY() - inset + 2); return func0f153838(gdl); } @@ -1463,11 +1463,11 @@ glabel var7f1b7868 /* f169450: 0c002c74 */ jal func0000b1d0 /* f169454: 00402025 */ or $a0,$v0,$zero /* f169458: 0040a025 */ or $s4,$v0,$zero -/* f16945c: 0c002f40 */ jal viGetLeft +/* f16945c: 0c002f40 */ jal viGetViewLeft /* f169460: 24520008 */ addiu $s2,$v0,0x8 /* f169464: 00028c00 */ sll $s1,$v0,0x10 /* f169468: 00116c03 */ sra $t5,$s1,0x10 -/* f16946c: 0c002f44 */ jal viGetTop +/* f16946c: 0c002f44 */ jal viGetViewTop /* f169470: 01a08825 */ or $s1,$t5,$zero /* f169474: 44822000 */ mtc1 $v0,$f4 /* f169478: 44918000 */ mtc1 $s1,$f16 @@ -1488,17 +1488,17 @@ glabel var7f1b7868 /* f1694b4: 316c0fff */ andi $t4,$t3,0xfff /* f1694b8: 000c6b00 */ sll $t5,$t4,0xc /* f1694bc: 032d7025 */ or $t6,$t9,$t5 -/* f1694c0: 0c002f22 */ jal viGetWidth +/* f1694c0: 0c002f22 */ jal viGetViewX /* f1694c4: ae8e0000 */ sw $t6,0x0($s4) -/* f1694c8: 0c002f40 */ jal viGetLeft +/* f1694c8: 0c002f40 */ jal viGetViewLeft /* f1694cc: a7a2008a */ sh $v0,0x8a($sp) /* f1694d0: 00028400 */ sll $s0,$v0,0x10 /* f1694d4: 00107c03 */ sra $t7,$s0,0x10 -/* f1694d8: 0c002f44 */ jal viGetTop +/* f1694d8: 0c002f44 */ jal viGetViewTop /* f1694dc: 01e08025 */ or $s0,$t7,$zero /* f1694e0: 00028c00 */ sll $s1,$v0,0x10 /* f1694e4: 0011c403 */ sra $t8,$s1,0x10 -/* f1694e8: 0c002f26 */ jal viGetHeight +/* f1694e8: 0c002f26 */ jal viGetViewY /* f1694ec: 03008825 */ or $s1,$t8,$zero /* f1694f0: 87ad008a */ lh $t5,0x8a($sp) /* f1694f4: 00515021 */ addu $t2,$v0,$s1 @@ -2610,17 +2610,17 @@ glabel var7f1b7868 /* f16a524: acad0004 */ sw $t5,0x4($a1) /* f16a528: 44ccf800 */ ctc1 $t4,$31 /* f16a52c: afb200a8 */ sw $s2,0xa8($sp) -/* f16a530: 0c002f22 */ jal viGetWidth +/* f16a530: 0c002f22 */ jal viGetViewX /* f16a534: 26520008 */ addiu $s2,$s2,0x8 -/* f16a538: 0c002f40 */ jal viGetLeft +/* f16a538: 0c002f40 */ jal viGetViewLeft /* f16a53c: a7a2008a */ sh $v0,0x8a($sp) /* f16a540: 00028400 */ sll $s0,$v0,0x10 /* f16a544: 00107c03 */ sra $t7,$s0,0x10 -/* f16a548: 0c002f44 */ jal viGetTop +/* f16a548: 0c002f44 */ jal viGetViewTop /* f16a54c: 01e08025 */ or $s0,$t7,$zero /* f16a550: 00028c00 */ sll $s1,$v0,0x10 /* f16a554: 00115c03 */ sra $t3,$s1,0x10 -/* f16a558: 0c002f26 */ jal viGetHeight +/* f16a558: 0c002f26 */ jal viGetViewY /* f16a55c: 01608825 */ or $s1,$t3,$zero /* f16a560: 87ae008a */ lh $t6,0x8a($sp) /* f16a564: 0051c821 */ addu $t9,$v0,$s1 @@ -2633,11 +2633,11 @@ glabel var7f1b7868 /* f16a580: 03016025 */ or $t4,$t8,$at /* f16a584: 000f5b80 */ sll $t3,$t7,0xe /* f16a588: 018bc825 */ or $t9,$t4,$t3 -/* f16a58c: 0c002f40 */ jal viGetLeft +/* f16a58c: 0c002f40 */ jal viGetViewLeft /* f16a590: ad590000 */ sw $t9,0x0($t2) /* f16a594: 00028c00 */ sll $s1,$v0,0x10 /* f16a598: 0011c403 */ sra $t8,$s1,0x10 -/* f16a59c: 0c002f44 */ jal viGetTop +/* f16a59c: 0c002f44 */ jal viGetViewTop /* f16a5a0: 03008825 */ or $s1,$t8,$zero /* f16a5a4: 304e03ff */ andi $t6,$v0,0x3ff /* f16a5a8: 322f03ff */ andi $t7,$s1,0x3ff @@ -3151,19 +3151,19 @@ glabel var7f1b7868 /* f16acf0: 00000000 */ sll $zero,$zero,0x0 /* f16acf4: 0fc54d8a */ jal func0f153628 /* f16acf8: 02402025 */ or $a0,$s2,$zero -/* f16acfc: 0c002f40 */ jal viGetLeft +/* f16acfc: 0c002f40 */ jal viGetViewLeft /* f16ad00: 00409025 */ or $s2,$v0,$zero -/* f16ad04: 0c002f44 */ jal viGetTop +/* f16ad04: 0c002f44 */ jal viGetViewTop /* f16ad08: a7a2006e */ sh $v0,0x6e($sp) -/* f16ad0c: 0c002f40 */ jal viGetLeft +/* f16ad0c: 0c002f40 */ jal viGetViewLeft /* f16ad10: a7a20070 */ sh $v0,0x70($sp) -/* f16ad14: 0c002f22 */ jal viGetWidth +/* f16ad14: 0c002f22 */ jal viGetViewX /* f16ad18: a7a20072 */ sh $v0,0x72($sp) -/* f16ad1c: 0c002f44 */ jal viGetTop +/* f16ad1c: 0c002f44 */ jal viGetViewTop /* f16ad20: a7a2008a */ sh $v0,0x8a($sp) /* f16ad24: 00028400 */ sll $s0,$v0,0x10 /* f16ad28: 00105403 */ sra $t2,$s0,0x10 -/* f16ad2c: 0c002f26 */ jal viGetHeight +/* f16ad2c: 0c002f26 */ jal viGetViewY /* f16ad30: 01408025 */ or $s0,$t2,$zero /* f16ad34: 87ae008a */ lh $t6,0x8a($sp) /* f16ad38: 87b80072 */ lh $t8,0x72($sp) diff --git a/src/game/game_17f930.c b/src/game/game_17f930.c index 0a6db41df..fa8ca6c02 100644 --- a/src/game/game_17f930.c +++ b/src/game/game_17f930.c @@ -887,9 +887,9 @@ glabel scenarioHtbCallback18 /* f1807ac: 00808025 */ or $s0,$a0,$zero /* f1807b0: 50400067 */ beqzl $v0,.L0f180950 /* f1807b4: 8fbf003c */ lw $ra,0x3c($sp) -/* f1807b8: 0c002f40 */ jal viGetLeft +/* f1807b8: 0c002f40 */ jal viGetViewLeft /* f1807bc: 00000000 */ sll $zero,$zero,0x0 -/* f1807c0: 0c002f22 */ jal viGetWidth +/* f1807c0: 0c002f22 */ jal viGetViewX /* f1807c4: a7a2004a */ sh $v0,0x4a($sp) /* f1807c8: 87af004a */ lh $t7,0x4a($sp) /* f1807cc: 04410003 */ bgez $v0,.L0f1807dc @@ -898,7 +898,7 @@ glabel scenarioHtbCallback18 /* f1807d8: 00017043 */ sra $t6,$at,0x1 .L0f1807dc: /* f1807dc: 01cf2821 */ addu $a1,$t6,$t7 -/* f1807e0: 0c002f44 */ jal viGetTop +/* f1807e0: 0c002f44 */ jal viGetViewTop /* f1807e4: afa50090 */ sw $a1,0x90($sp) /* f1807e8: 3c19800a */ lui $t9,%hi(g_Vars+0x288) /* f1807ec: 8f39a248 */ lw $t9,%lo(g_Vars+0x288)($t9) @@ -2605,9 +2605,9 @@ glabel scenarioKohCallback18 /* f1826ac: 84790008 */ lh $t9,0x8($v1) /* f1826b0: 57200091 */ bnezl $t9,.L0f1828f8 /* f1826b4: 8fbf003c */ lw $ra,0x3c($sp) -/* f1826b8: 0c002f40 */ jal viGetLeft +/* f1826b8: 0c002f40 */ jal viGetViewLeft /* f1826bc: 00000000 */ sll $zero,$zero,0x0 -/* f1826c0: 0c002f22 */ jal viGetWidth +/* f1826c0: 0c002f22 */ jal viGetViewX /* f1826c4: a7a2004e */ sh $v0,0x4e($sp) /* f1826c8: 87aa004e */ lh $t2,0x4e($sp) /* f1826cc: 04410003 */ bgez $v0,.L0f1826dc @@ -2616,7 +2616,7 @@ glabel scenarioKohCallback18 /* f1826d8: 00014843 */ sra $t1,$at,0x1 .L0f1826dc: /* f1826dc: 012a2821 */ addu $a1,$t1,$t2 -/* f1826e0: 0c002f44 */ jal viGetTop +/* f1826e0: 0c002f44 */ jal viGetViewTop /* f1826e4: afa50098 */ sw $a1,0x98($sp) /* f1826e8: 3c04800a */ lui $a0,%hi(g_Vars+0x484) /* f1826ec: 8c84a444 */ lw $a0,%lo(g_Vars+0x484)($a0) @@ -3770,18 +3770,18 @@ glabel scenarioHtmCallback18 /* f1839ec: 8529c1e0 */ lh $t1,%lo(g_ScenarioData+0xd0)($t1) /* f1839f0: 5449006b */ bnel $v0,$t1,.L0f183ba0 /* f1839f4: 8fbf001c */ lw $ra,0x1c($sp) -/* f1839f8: 0c002f40 */ jal viGetLeft +/* f1839f8: 0c002f40 */ jal viGetViewLeft /* f1839fc: 00000000 */ sll $zero,$zero,0x0 -/* f183a00: 0c002f40 */ jal viGetLeft +/* f183a00: 0c002f40 */ jal viGetViewLeft /* f183a04: afa2005c */ sw $v0,0x5c($sp) /* f183a08: 00028c00 */ sll $s1,$v0,0x10 /* f183a0c: 00115403 */ sra $t2,$s1,0x10 -/* f183a10: 0c002f22 */ jal viGetWidth +/* f183a10: 0c002f22 */ jal viGetViewX /* f183a14: 01408825 */ or $s1,$t2,$zero /* f183a18: 00515821 */ addu $t3,$v0,$s1 -/* f183a1c: 0c002f44 */ jal viGetTop +/* f183a1c: 0c002f44 */ jal viGetViewTop /* f183a20: afab0058 */ sw $t3,0x58($sp) -/* f183a24: 0c002f22 */ jal viGetWidth +/* f183a24: 0c002f22 */ jal viGetViewX /* f183a28: afa20054 */ sw $v0,0x54($sp) /* f183a2c: 8fac005c */ lw $t4,0x5c($sp) /* f183a30: 8fad0058 */ lw $t5,0x58($sp) @@ -4890,9 +4890,9 @@ glabel scenarioPacCallback18 /* f184a64: 958cc112 */ lhu $t4,%lo(g_ScenarioData+0x2)($t4) /* f184a68: 240d3840 */ addiu $t5,$zero,0x3840 /* f184a6c: 01ac1823 */ subu $v1,$t5,$t4 -/* f184a70: 0c002f40 */ jal viGetLeft +/* f184a70: 0c002f40 */ jal viGetViewLeft /* f184a74: afa300a0 */ sw $v1,0xa0($sp) -/* f184a78: 0c002f22 */ jal viGetWidth +/* f184a78: 0c002f22 */ jal viGetViewX /* f184a7c: a7a20046 */ sh $v0,0x46($sp) /* f184a80: 87b80046 */ lh $t8,0x46($sp) /* f184a84: 8fa300a0 */ lw $v1,0xa0($sp) @@ -4902,7 +4902,7 @@ glabel scenarioPacCallback18 /* f184a94: 00017843 */ sra $t7,$at,0x1 .L0f184a98: /* f184a98: 01f82821 */ addu $a1,$t7,$t8 -/* f184a9c: 0c002f44 */ jal viGetTop +/* f184a9c: 0c002f44 */ jal viGetViewTop /* f184aa0: afa5008c */ sw $a1,0x8c($sp) /* f184aa4: 8fa300a0 */ lw $v1,0xa0($sp) /* f184aa8: 2446000a */ addiu $a2,$v0,0xa @@ -5835,15 +5835,15 @@ glabel func0f185774 /* f185a30: ac6e0000 */ sw $t6,0x0($v1) /* f185a34: 24650008 */ addiu $a1,$v1,0x8 /* f185a38: ac640004 */ sw $a0,0x4($v1) -/* f185a3c: 0c002f40 */ jal viGetLeft +/* f185a3c: 0c002f40 */ jal viGetViewLeft /* f185a40: afa50030 */ sw $a1,0x30($sp) -/* f185a44: 0c002f22 */ jal viGetWidth +/* f185a44: 0c002f22 */ jal viGetViewX /* f185a48: afa2002c */ sw $v0,0x2c($sp) /* f185a4c: 8fa6002c */ lw $a2,0x2c($sp) /* f185a50: 00463821 */ addu $a3,$v0,$a2 -/* f185a54: 0c002f44 */ jal viGetTop +/* f185a54: 0c002f44 */ jal viGetViewTop /* f185a58: afa70028 */ sw $a3,0x28($sp) -/* f185a5c: 0c002f26 */ jal viGetHeight +/* f185a5c: 0c002f26 */ jal viGetViewY /* f185a60: afa20024 */ sw $v0,0x24($sp) /* f185a64: 8faf0018 */ lw $t7,0x18($sp) /* f185a68: 3c09800a */ lui $t1,%hi(g_Vars) diff --git a/src/game/game_18e5a0.c b/src/game/game_18e5a0.c index 12efc47eb..ee894a352 100644 --- a/src/game/game_18e5a0.c +++ b/src/game/game_18e5a0.c @@ -1368,11 +1368,11 @@ glabel func0f18f874 /* f18fa00: 3c018008 */ lui $at,%hi(var8007fac0) /* f18fa04: ac22fac0 */ sw $v0,%lo(var8007fac0)($at) .L0f18fa08: -/* f18fa08: 0c002f40 */ jal viGetLeft +/* f18fa08: 0c002f40 */ jal viGetViewLeft /* f18fa0c: afa6003c */ sw $a2,0x3c($sp) /* f18fa10: 00028400 */ sll $s0,$v0,0x10 /* f18fa14: 00105c03 */ sra $t3,$s0,0x10 -/* f18fa18: 0c002f22 */ jal viGetWidth +/* f18fa18: 0c002f22 */ jal viGetViewX /* f18fa1c: 01608025 */ or $s0,$t3,$zero /* f18fa20: 3c0d8008 */ lui $t5,%hi(var8007fac0) /* f18fa24: 8dadfac0 */ lw $t5,%lo(var8007fac0)($t5) @@ -1445,7 +1445,7 @@ glabel func0f18f874 /* f18fb14: 25aefff9 */ addiu $t6,$t5,-7 /* f18fb18: ae2e0000 */ sw $t6,0x0($s1) .L0f18fb1c: -/* f18fb1c: 0c002f44 */ jal viGetTop +/* f18fb1c: 0c002f44 */ jal viGetViewTop /* f18fb20: 00000000 */ sll $zero,$zero,0x0 /* f18fb24: 8faf003c */ lw $t7,0x3c($sp) /* f18fb28: 3c10800b */ lui $s0,%hi(var800acc74) diff --git a/src/game/game_19c990.c b/src/game/game_19c990.c index 22378c2ad..8aaca10e5 100644 --- a/src/game/game_19c990.c +++ b/src/game/game_19c990.c @@ -5763,7 +5763,7 @@ glabel var7f1b97cc /* f1a2f64: afbf0024 */ sw $ra,0x24($sp) /* f1a2f68: 240e00a0 */ addiu $t6,$zero,0xa0 /* f1a2f6c: afa40158 */ sw $a0,0x158($sp) -/* f1a2f70: 0c002f22 */ jal viGetWidth +/* f1a2f70: 0c002f22 */ jal viGetViewX /* f1a2f74: afae004c */ sw $t6,0x4c($sp) /* f1a2f78: 28410191 */ slti $at,$v0,0x191 /* f1a2f7c: 14200005 */ bnez $at,.L0f1a2f94 @@ -5812,9 +5812,9 @@ glabel var7f1b97cc /* f1a3018: afa20054 */ sw $v0,0x54($sp) /* f1a301c: 0fc68ab4 */ jal frGetHudMiddleSubtext /* f1a3020: 27a40058 */ addiu $a0,$sp,0x58 -/* f1a3024: 0c002f22 */ jal viGetWidth +/* f1a3024: 0c002f22 */ jal viGetViewX /* f1a3028: afa20050 */ sw $v0,0x50($sp) -/* f1a302c: 0c002f44 */ jal viGetTop +/* f1a302c: 0c002f44 */ jal viGetViewTop /* f1a3030: a7a2003c */ sh $v0,0x3c($sp) /* f1a3034: 8fad0050 */ lw $t5,0x50($sp) /* f1a3038: 00021c00 */ sll $v1,$v0,0x10 @@ -5852,9 +5852,9 @@ glabel var7f1b97cc /* f1a30a8: 27a400d8 */ addiu $a0,$sp,0xd8 /* f1a30ac: 0fc68a09 */ jal frGetGoalScoreText /* f1a30b0: 27a40058 */ addiu $a0,$sp,0x58 -/* f1a30b4: 0c002f40 */ jal viGetLeft +/* f1a30b4: 0c002f40 */ jal viGetViewLeft /* f1a30b8: 00000000 */ sll $zero,$zero,0x0 -/* f1a30bc: 0c002f44 */ jal viGetTop +/* f1a30bc: 0c002f44 */ jal viGetViewTop /* f1a30c0: a7a2003c */ sh $v0,0x3c($sp) /* f1a30c4: 87b8003c */ lh $t8,0x3c($sp) /* f1a30c8: 3c014282 */ lui $at,0x4282 @@ -5885,9 +5885,9 @@ glabel var7f1b97cc /* f1a312c: 27a50058 */ addiu $a1,$sp,0x58 /* f1a3130: 10400019 */ beqz $v0,.L0f1a3198 /* f1a3134: 00000000 */ sll $zero,$zero,0x0 -/* f1a3138: 0c002f40 */ jal viGetLeft +/* f1a3138: 0c002f40 */ jal viGetViewLeft /* f1a313c: 00000000 */ sll $zero,$zero,0x0 -/* f1a3140: 0c002f44 */ jal viGetTop +/* f1a3140: 0c002f44 */ jal viGetViewTop /* f1a3144: a7a2003c */ sh $v0,0x3c($sp) /* f1a3148: 87ad003c */ lh $t5,0x3c($sp) /* f1a314c: c7aa002c */ lwc1 $f10,0x2c($sp) @@ -5920,11 +5920,11 @@ glabel var7f1b97cc /* f1a31b4: 44050000 */ mfc1 $a1,$f0 /* f1a31b8: 0fc68a4f */ jal frGetMinAccuracy /* f1a31bc: 27a40058 */ addiu $a0,$sp,0x58 -/* f1a31c0: 0c002f40 */ jal viGetLeft +/* f1a31c0: 0c002f40 */ jal viGetViewLeft /* f1a31c4: afa20054 */ sw $v0,0x54($sp) -/* f1a31c8: 0c002f22 */ jal viGetWidth +/* f1a31c8: 0c002f22 */ jal viGetViewX /* f1a31cc: a7a20036 */ sh $v0,0x36($sp) -/* f1a31d0: 0c002f44 */ jal viGetTop +/* f1a31d0: 0c002f44 */ jal viGetViewTop /* f1a31d4: a7a2003c */ sh $v0,0x3c($sp) /* f1a31d8: 8fac0054 */ lw $t4,0x54($sp) /* f1a31dc: 00021c00 */ sll $v1,$v0,0x10 @@ -5982,11 +5982,11 @@ glabel var7f1b97cc /* f1a32a0: c42697cc */ lwc1 $f6,%lo(var7f1b97cc)($at) /* f1a32a4: e7a60048 */ swc1 $f6,0x48($sp) .L0f1a32a8: -/* f1a32a8: 0c002f40 */ jal viGetLeft +/* f1a32a8: 0c002f40 */ jal viGetViewLeft /* f1a32ac: 00000000 */ sll $zero,$zero,0x0 -/* f1a32b0: 0c002f22 */ jal viGetWidth +/* f1a32b0: 0c002f22 */ jal viGetViewX /* f1a32b4: a7a20036 */ sh $v0,0x36($sp) -/* f1a32b8: 0c002f44 */ jal viGetTop +/* f1a32b8: 0c002f44 */ jal viGetViewTop /* f1a32bc: a7a2003c */ sh $v0,0x3c($sp) /* f1a32c0: 87ac003c */ lh $t4,0x3c($sp) /* f1a32c4: 87ad0036 */ lh $t5,0x36($sp) diff --git a/src/game/mplayer.c b/src/game/mplayer.c index 3749cf438..9eab6ac6d 100644 --- a/src/game/mplayer.c +++ b/src/game/mplayer.c @@ -2318,9 +2318,9 @@ glabel func0f18973c /* f1897b8: 27a4005c */ addiu $a0,$sp,0x5c /* f1897bc: 0c004c4c */ jal strcpy /* f1897c0: 00402825 */ or $a1,$v0,$zero -/* f1897c4: 0c002f40 */ jal viGetLeft +/* f1897c4: 0c002f40 */ jal viGetViewLeft /* f1897c8: 00000000 */ sll $zero,$zero,0x0 -/* f1897cc: 0c002f22 */ jal viGetWidth +/* f1897cc: 0c002f22 */ jal viGetViewX /* f1897d0: a7a20042 */ sh $v0,0x42($sp) /* f1897d4: 87a80042 */ lh $t0,0x42($sp) /* f1897d8: 3c0a800a */ lui $t2,%hi(g_Vars+0x288) @@ -2345,15 +2345,15 @@ glabel func0f18973c /* f189820: 8dade4f8 */ lw $t5,%lo(g_MenuStack+0x4f8)($t5) /* f189824: 11a00006 */ beqz $t5,.L0f189840 /* f189828: 00000000 */ sll $zero,$zero,0x0 -/* f18982c: 0c002f44 */ jal viGetTop +/* f18982c: 0c002f44 */ jal viGetViewTop /* f189830: 00000000 */ sll $zero,$zero,0x0 /* f189834: 244e000a */ addiu $t6,$v0,0xa /* f189838: 1000000c */ beqz $zero,.L0f18986c /* f18983c: afae0090 */ sw $t6,0x90($sp) .L0f189840: -/* f189840: 0c002f44 */ jal viGetTop +/* f189840: 0c002f44 */ jal viGetViewTop /* f189844: 00000000 */ sll $zero,$zero,0x0 -/* f189848: 0c002f26 */ jal viGetHeight +/* f189848: 0c002f26 */ jal viGetViewY /* f18984c: a7a20042 */ sh $v0,0x42($sp) /* f189850: 87b80042 */ lh $t8,0x42($sp) /* f189854: 04410003 */ bgez $v0,.L0f189864 @@ -2475,9 +2475,9 @@ glabel func0f18973c /* f189a08: 27a4005c */ addiu $a0,$sp,0x5c /* f189a0c: 0c004c4c */ jal strcpy /* f189a10: 00402825 */ or $a1,$v0,$zero -/* f189a14: 0c002f40 */ jal viGetLeft +/* f189a14: 0c002f40 */ jal viGetViewLeft /* f189a18: 00000000 */ sll $zero,$zero,0x0 -/* f189a1c: 0c002f22 */ jal viGetWidth +/* f189a1c: 0c002f22 */ jal viGetViewX /* f189a20: a7a20042 */ sh $v0,0x42($sp) /* f189a24: 87b80042 */ lh $t8,0x42($sp) /* f189a28: 04410003 */ bgez $v0,.L0f189a38 @@ -2486,9 +2486,9 @@ glabel func0f18973c /* f189a34: 00017843 */ sra $t7,$at,0x1 .L0f189a38: /* f189a38: 01f8c821 */ addu $t9,$t7,$t8 -/* f189a3c: 0c002f44 */ jal viGetTop +/* f189a3c: 0c002f44 */ jal viGetViewTop /* f189a40: afb90094 */ sw $t9,0x94($sp) -/* f189a44: 0c002f26 */ jal viGetHeight +/* f189a44: 0c002f26 */ jal viGetViewY /* f189a48: a7a20042 */ sh $v0,0x42($sp) /* f189a4c: 87aa0042 */ lh $t2,0x42($sp) /* f189a50: 3c0b8008 */ lui $t3,%hi(var8007fb0c) @@ -2547,9 +2547,9 @@ glabel func0f18973c /* f189b1c: 8d6d1c0c */ lw $t5,0x1c0c($t3) /* f189b20: 19a00051 */ blez $t5,.L0f189c68 /* f189b24: 00000000 */ sll $zero,$zero,0x0 -/* f189b28: 0c002f44 */ jal viGetTop +/* f189b28: 0c002f44 */ jal viGetViewTop /* f189b2c: 00000000 */ sll $zero,$zero,0x0 -/* f189b30: 0c002f26 */ jal viGetHeight +/* f189b30: 0c002f26 */ jal viGetViewY /* f189b34: a7a20042 */ sh $v0,0x42($sp) /* f189b38: 87ae0042 */ lh $t6,0x42($sp) /* f189b3c: 8fb80098 */ lw $t8,0x98($sp) @@ -2561,9 +2561,9 @@ glabel func0f18973c /* f189b50: 018e7821 */ addu $t7,$t4,$t6 /* f189b54: 01f8c821 */ addu $t9,$t7,$t8 /* f189b58: 27280002 */ addiu $t0,$t9,0x2 -/* f189b5c: 0c002f40 */ jal viGetLeft +/* f189b5c: 0c002f40 */ jal viGetViewLeft /* f189b60: afa8004c */ sw $t0,0x4c($sp) -/* f189b64: 0c002f22 */ jal viGetWidth +/* f189b64: 0c002f22 */ jal viGetViewX /* f189b68: a7a20042 */ sh $v0,0x42($sp) /* f189b6c: 87a90042 */ lh $t1,0x42($sp) /* f189b70: 3c0d800a */ lui $t5,%hi(g_Vars+0x284) diff --git a/src/game/propobj.c b/src/game/propobj.c index 01e1cf637..ee9702d5f 100644 --- a/src/game/propobj.c +++ b/src/game/propobj.c @@ -47312,16 +47312,16 @@ glabel var7f1ab1a8 /* f0908d0: afa40060 */ sw $a0,0x60($sp) /* f0908d4: 3c018007 */ lui $at,0x8007 /* f0908d8: c424990c */ lwc1 $f4,-0x66f4($at) -/* f0908dc: 0c002f40 */ jal viGetLeft +/* f0908dc: 0c002f40 */ jal viGetViewLeft /* f0908e0: e7a4004c */ swc1 $f4,0x4c($sp) -/* f0908e4: 0c002f22 */ jal viGetWidth +/* f0908e4: 0c002f22 */ jal viGetViewX /* f0908e8: a7a20036 */ sh $v0,0x36($sp) /* f0908ec: 87b80036 */ lh $t8,0x36($sp) /* f0908f0: 00027843 */ sra $t7,$v0,0x1 /* f0908f4: 01f8c821 */ addu $t9,$t7,$t8 -/* f0908f8: 0c002f44 */ jal viGetTop +/* f0908f8: 0c002f44 */ jal viGetViewTop /* f0908fc: afb90044 */ sw $t9,0x44($sp) -/* f090900: 0c002f26 */ jal viGetHeight +/* f090900: 0c002f26 */ jal viGetViewY /* f090904: a7a20036 */ sh $v0,0x36($sp) /* f090908: 87a90036 */ lh $t1,0x36($sp) /* f09090c: 3c06800a */ lui $a2,%hi(g_Vars) diff --git a/src/game/title.c b/src/game/title.c index bdb5105c4..a66ef0221 100644 --- a/src/game/title.c +++ b/src/game/title.c @@ -3452,8 +3452,8 @@ Gfx *titleRenderRarePresents(Gfx *gdl) gdl = func0f01afc0(gdl); gdl = func0f153628(gdl); - sp84 = viGetLeft() + 50; - sp80 = viGetTop() + viGetHeight() - 80; + sp84 = viGetViewLeft() + 50; + sp80 = viGetViewTop() + viGetViewY() - 80; var80062868 = 0; @@ -3461,8 +3461,8 @@ Gfx *titleRenderRarePresents(Gfx *gdl) gdl = func0f018ebc(gdl, &sp84, &sp80, L_OPTIONS(5), g_TitleTimer, &sp76); // "earth:" if (g_TitleTimer > 70) { - sp84 = viGetLeft() + 50; - sp80 = viGetTop() + viGetHeight() - 60; + sp84 = viGetViewLeft() + 50; + sp80 = viGetViewTop() + viGetViewY() - 60; gdl = func0f018ebc(gdl, &sp84, &sp80, L_OPTIONS(6), g_TitleTimer - 100, &sp76); // " prehistory" } } else { @@ -3494,9 +3494,9 @@ Gfx *titleRenderRarePresents(Gfx *gdl) f32 tmp2 = ((g_TitleTimer - 222.0f) / 78.0f); u32 stack; - gdl = func0f153a34(gdl, viGetLeft(), viGetTop(), - viGetLeft() + viGetWidth(), - viGetTop() + viGetHeight(), + gdl = func0f153a34(gdl, viGetViewLeft(), viGetViewTop(), + viGetViewLeft() + viGetViewX(), + viGetViewTop() + viGetViewY(), 255.0f * tmp2); } diff --git a/src/include/game/data/data_000000.h b/src/include/game/data/data_000000.h index b2f767b16..6c4fd50dc 100644 --- a/src/include/game/data/data_000000.h +++ b/src/include/game/data/data_000000.h @@ -74,9 +74,9 @@ extern u32 var8005d3b8; extern u32 var8005d4c0; extern u32 var8005d4e8; extern u32 var8005d520; -extern u32 var8005d530; +extern struct rend_vidat var8005d530; extern u32 var8005d588; -extern u32 var8005d594; +extern struct rend_vidat *g_ViData; extern u32 var8005d59c; extern u32 var8005d5b4; extern u32 var8005d5b8; diff --git a/src/include/lib/lib_09660.h b/src/include/lib/lib_09660.h index 2b443cb2c..ae55ff319 100644 --- a/src/include/lib/lib_09660.h +++ b/src/include/lib/lib_09660.h @@ -42,11 +42,11 @@ void func0000bbe4(s16 arg0, s16 arg1); s16 func0000bc08(void); s16 func0000bc18(void); void func0000bc28(s16 arg0, s16 arg1); -s16 viGetWidth(void); -s16 viGetHeight(void); +s16 viGetViewX(void); +s16 viGetViewY(void); void func0000bca8(s16 arg0, s16 arg1); -s16 viGetLeft(void); -s16 viGetTop(void); +s16 viGetViewLeft(void); +s16 viGetViewTop(void); void func0000bd20(bool arg0); void func0000bd30(f32 fovy); void func0000bd7c(f32 arg0); diff --git a/src/include/types.h b/src/include/types.h index 777cbf9c4..1cfe77d78 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -5968,4 +5968,22 @@ struct objticksp476 { /*0x3c*/ u32 unk3c; }; +struct rend_vidat { + /*0x00*/ void *unk00; + /*0x04*/ u16 x; + /*0x06*/ u16 y; + /*0x08*/ f32 fovy; + /*0x0c*/ f32 aspect; + /*0x10*/ f32 znear; + /*0x14*/ f32 zfar; + /*0x18*/ u16 bufx; + /*0x1a*/ u16 bufy; + /*0x1c*/ s16 viewx; + /*0x1e*/ s16 viewy; + /*0x20*/ s16 viewleft; + /*0x22*/ s16 viewtop; + /*0x24*/ bool usezbuf; + /*0x28*/ u32 unk28; +}; + #endif diff --git a/src/lib/lib_09660.c b/src/lib/lib_09660.c index 3db7d69b3..809150688 100644 --- a/src/lib/lib_09660.c +++ b/src/lib/lib_09660.c @@ -391,14 +391,14 @@ glabel func00009ab0 /* 9ae8: 3c018006 */ lui $at,%hi(var8005d590) /* 9aec: ac39d590 */ sw $t9,%lo(var8005d590)($at) /* 9af0: 90680000 */ lbu $t0,0x0($v1) -/* 9af4: 3c018006 */ lui $at,%hi(var8005d594) +/* 9af4: 3c018006 */ lui $at,%hi(g_ViData) /* 9af8: 3c0b8009 */ lui $t3,%hi(g_Is4Mb) /* 9afc: 01050019 */ multu $t0,$a1 /* 9b00: 916b0af0 */ lbu $t3,%lo(g_Is4Mb)($t3) /* 9b04: 240200dc */ addiu $v0,$zero,0xdc /* 9b08: 00004812 */ mflo $t1 /* 9b0c: 00895021 */ addu $t2,$a0,$t1 -/* 9b10: ac2ad594 */ sw $t2,%lo(var8005d594)($at) +/* 9b10: ac2ad594 */ sw $t2,%lo(g_ViData)($at) /* 9b14: 3c018006 */ lui $at,%hi(var8005d588) /* 9b18: ac20d588 */ sw $zero,%lo(var8005d588)($at) /* 9b1c: 3c018006 */ lui $at,%hi(var8005d58c) @@ -448,10 +448,10 @@ glabel func00009b50 /* 9bb4: 8d08d590 */ lw $t0,%lo(var8005d590)($t0) /* 9bb8: 8f190000 */ lw $t9,0x0($t8) /* 9bbc: 3c098009 */ lui $t1,%hi(var80092874+0x3) -/* 9bc0: 3c0d8006 */ lui $t5,%hi(var8005d594) +/* 9bc0: 3c0d8006 */ lui $t5,%hi(g_ViData) /* 9bc4: ad190028 */ sw $t9,0x28($t0) /* 9bc8: 91292877 */ lbu $t1,%lo(var80092874+0x3)($t1) -/* 9bcc: 8dadd594 */ lw $t5,%lo(var8005d594)($t5) +/* 9bcc: 8dadd594 */ lw $t5,%lo(g_ViData)($t5) /* 9bd0: 240e0001 */ addiu $t6,$zero,0x1 /* 9bd4: 00095080 */ sll $t2,$t1,0x2 /* 9bd8: 004a5821 */ addu $t3,$v0,$t2 @@ -643,10 +643,10 @@ glabel func00009c3c /* 9e50: 00994821 */ addu $t1,$a0,$t9 /* 9e54: 8d2a0000 */ lw $t2,0x0($t1) /* 9e58: 3c0c8009 */ lui $t4,%hi(var80092874+0x3) -/* 9e5c: 3c188006 */ lui $t8,%hi(var8005d594) +/* 9e5c: 3c188006 */ lui $t8,%hi(g_ViData) /* 9e60: ad6a0028 */ sw $t2,0x28($t3) /* 9e64: 918c2877 */ lbu $t4,%lo(var80092874+0x3)($t4) -/* 9e68: 8f18d594 */ lw $t8,%lo(var8005d594)($t8) +/* 9e68: 8f18d594 */ lw $t8,%lo(g_ViData)($t8) /* 9e6c: 00001825 */ or $v1,$zero,$zero /* 9e70: 000c6880 */ sll $t5,$t4,0x2 /* 9e74: 008d7021 */ addu $t6,$a0,$t5 @@ -780,10 +780,10 @@ glabel func00009ed4 GLOBAL_ASM( glabel func0000a044 -/* a044: 3c098006 */ lui $t1,%hi(var8005d594) +/* a044: 3c098006 */ lui $t1,%hi(g_ViData) /* a048: 3c0e8006 */ lui $t6,%hi(var8005d590) /* a04c: 8dced590 */ lw $t6,%lo(var8005d590)($t6) -/* a050: 8d29d594 */ lw $t1,%lo(var8005d594)($t1) +/* a050: 8d29d594 */ lw $t1,%lo(g_ViData)($t1) /* a054: 27bdffe8 */ addiu $sp,$sp,-24 /* a058: afbf0014 */ sw $ra,0x14($sp) /* a05c: 91cf0000 */ lbu $t7,0x0($t6) @@ -806,8 +806,8 @@ glabel func0000a044 /* a09c: 00000000 */ sll $zero,$zero,0x0 /* a0a0: 0c012338 */ jal func00048ce0 /* a0a4: 24040001 */ addiu $a0,$zero,0x1 -/* a0a8: 3c098006 */ lui $t1,%hi(var8005d594) -/* a0ac: 8d29d594 */ lw $t1,%lo(var8005d594)($t1) +/* a0a8: 3c098006 */ lui $t1,%hi(g_ViData) +/* a0ac: 8d29d594 */ lw $t1,%lo(g_ViData)($t1) /* a0b0: 91230000 */ lbu $v1,0x0($t1) .L0000a0b4: /* a0b4: 85380004 */ lh $t8,0x4($t1) @@ -1420,8 +1420,8 @@ glabel func0000a044 /* a954: 3c028009 */ lui $v0,%hi(var80092874+0x2) /* a958: 24422876 */ addiu $v0,$v0,%lo(var80092874+0x2) /* a95c: 90590000 */ lbu $t9,0x0($v0) -/* a960: 3c048006 */ lui $a0,%hi(var8005d594) -/* a964: 8c84d594 */ lw $a0,%lo(var8005d594)($a0) +/* a960: 3c048006 */ lui $a0,%hi(g_ViData) +/* a964: 8c84d594 */ lw $a0,%lo(g_ViData)($a0) /* a968: 272f0001 */ addiu $t7,$t9,0x1 /* a96c: 3c038009 */ lui $v1,%hi(var80092874+0x3) /* a970: 2408002c */ addiu $t0,$zero,0x2c @@ -1447,28 +1447,28 @@ glabel func0000a044 /* a9b8: 03080019 */ multu $t8,$t0 /* a9bc: a06f0000 */ sb $t7,0x0($v1) /* a9c0: 3c018006 */ lui $at,%hi(var8005d590) -/* a9c4: 3c058006 */ lui $a1,%hi(var8005d594) +/* a9c4: 3c058006 */ lui $a1,%hi(g_ViData) /* a9c8: 2406002c */ addiu $a2,$zero,0x2c /* a9cc: 00007012 */ mflo $t6 /* a9d0: 00eec821 */ addu $t9,$a3,$t6 /* a9d4: ac39d590 */ sw $t9,%lo(var8005d590)($at) /* a9d8: 906f0000 */ lbu $t7,0x0($v1) -/* a9dc: 3c018006 */ lui $at,%hi(var8005d594) +/* a9dc: 3c018006 */ lui $at,%hi(g_ViData) /* a9e0: 01e80019 */ multu $t7,$t0 /* a9e4: 0000c012 */ mflo $t8 /* a9e8: 00f87021 */ addu $t6,$a3,$t8 -/* a9ec: ac2ed594 */ sw $t6,%lo(var8005d594)($at) +/* a9ec: ac2ed594 */ sw $t6,%lo(g_ViData)($at) /* a9f0: 0c012c5c */ jal alCopy -/* a9f4: 8ca5d594 */ lw $a1,%lo(var8005d594)($a1) +/* a9f4: 8ca5d594 */ lw $a1,%lo(g_ViData)($a1) /* a9f8: 3c038009 */ lui $v1,%hi(var80092874+0x3) /* a9fc: 24632877 */ addiu $v1,$v1,%lo(var80092874+0x3) /* aa00: 90790000 */ lbu $t9,0x0($v1) /* aa04: 3c18800a */ lui $t8,%hi(var8009cac0) -/* aa08: 3c0e8006 */ lui $t6,%hi(var8005d594) +/* aa08: 3c0e8006 */ lui $t6,%hi(g_ViData) /* aa0c: 00197880 */ sll $t7,$t9,0x2 /* aa10: 030fc021 */ addu $t8,$t8,$t7 /* aa14: 8f18cac0 */ lw $t8,%lo(var8009cac0)($t8) -/* aa18: 8dced594 */ lw $t6,%lo(var8005d594)($t6) +/* aa18: 8dced594 */ lw $t6,%lo(g_ViData)($t6) /* aa1c: 3c028006 */ lui $v0,%hi(var8005d59c) /* aa20: 2442d59c */ addiu $v0,$v0,%lo(var8005d59c) /* aa24: add80028 */ sw $t8,0x28($t6) @@ -1517,8 +1517,8 @@ glabel func0000aa50 GLOBAL_ASM( glabel func0000aab0 -/* aab0: 3c058006 */ lui $a1,%hi(var8005d594) -/* aab4: 24a5d594 */ addiu $a1,$a1,%lo(var8005d594) +/* aab0: 3c058006 */ lui $a1,%hi(g_ViData) +/* aab4: 24a5d594 */ addiu $a1,$a1,%lo(g_ViData) /* aab8: 8cae0000 */ lw $t6,0x0($a1) /* aabc: 00041840 */ sll $v1,$a0,0x1 /* aac0: 3c027005 */ lui $v0,%hi(var700526d0) @@ -1548,8 +1548,8 @@ glabel func0000aab0 GLOBAL_ASM( glabel func0000ab1c -/* ab1c: 3c0e8006 */ lui $t6,%hi(var8005d594) -/* ab20: 8dced594 */ lw $t6,%lo(var8005d594)($t6) +/* ab1c: 3c0e8006 */ lui $t6,%hi(g_ViData) +/* ab20: 8dced594 */ lw $t6,%lo(g_ViData)($t6) /* ab24: 03e00008 */ jr $ra /* ab28: 8dc20028 */ lw $v0,0x28($t6) ); @@ -1560,8 +1560,8 @@ glabel func0000ab2c /* ab30: 8dced590 */ lw $t6,%lo(var8005d590)($t6) /* ab34: 03e00008 */ jr $ra /* ab38: 8dc20028 */ lw $v0,0x28($t6) -/* ab3c: 3c0e8006 */ lui $t6,%hi(var8005d594) -/* ab40: 8dced594 */ lw $t6,%lo(var8005d594)($t6) +/* ab3c: 3c0e8006 */ lui $t6,%hi(g_ViData) +/* ab40: 8dced594 */ lw $t6,%lo(g_ViData)($t6) /* ab44: 03e00008 */ jr $ra /* ab48: adc40028 */ sw $a0,0x28($t6) ); @@ -1587,8 +1587,8 @@ glabel func0000ab6c GLOBAL_ASM( glabel func0000ab78 -/* ab78: 3c028006 */ lui $v0,%hi(var8005d594) -/* ab7c: 8c42d594 */ lw $v0,%lo(var8005d594)($v0) +/* ab78: 3c028006 */ lui $v0,%hi(g_ViData) +/* ab7c: 8c42d594 */ lw $v0,%lo(g_ViData)($v0) /* ab80: 27bdfeb0 */ addiu $sp,$sp,-336 /* ab84: afbf002c */ sw $ra,0x2c($sp) /* ab88: afb00028 */ sw $s0,0x28($sp) @@ -1673,8 +1673,8 @@ glabel func0000aca4 /* acb4: afa5008c */ sw $a1,0x8c($sp) /* acb8: 0fc59e66 */ jal func0f167998 /* acbc: afa60090 */ sw $a2,0x90($sp) -/* acc0: 3c038006 */ lui $v1,%hi(var8005d594) -/* acc4: 8c63d594 */ lw $v1,%lo(var8005d594)($v1) +/* acc0: 3c038006 */ lui $v1,%hi(g_ViData) +/* acc4: 8c63d594 */ lw $v1,%lo(g_ViData)($v1) /* acc8: afa20040 */ sw $v0,0x40($sp) /* accc: 3c013f80 */ lui $at,0x3f80 /* acd0: 44814000 */ mtc1 $at,$f8 @@ -1716,8 +1716,8 @@ glabel func0000aca4 GLOBAL_ASM( glabel func0000ad5c -/* ad5c: 3c088006 */ lui $t0,%hi(var8005d594) -/* ad60: 2508d594 */ addiu $t0,$t0,%lo(var8005d594) +/* ad5c: 3c088006 */ lui $t0,%hi(g_ViData) +/* ad60: 2508d594 */ addiu $t0,$t0,%lo(g_ViData) /* ad64: 8d0e0000 */ lw $t6,0x0($t0) /* ad68: 27bdffd0 */ addiu $sp,$sp,-48 /* ad6c: 3c028009 */ lui $v0,%hi(var80092874+0x3) @@ -1768,10 +1768,10 @@ glabel func0000ad5c /* ae20: 01e15021 */ addu $t2,$t7,$at /* ae24: 0fc59e66 */ jal func0f167998 /* ae28: ac8a0004 */ sw $t2,0x4($a0) -/* ae2c: 3c088006 */ lui $t0,%hi(var8005d594) +/* ae2c: 3c088006 */ lui $t0,%hi(g_ViData) /* ae30: 3c018009 */ lui $at,%hi(var80092870) /* ae34: ac222870 */ sw $v0,%lo(var80092870)($at) -/* ae38: 2508d594 */ addiu $t0,$t0,%lo(var8005d594) +/* ae38: 2508d594 */ addiu $t0,$t0,%lo(g_ViData) /* ae3c: 8d030000 */ lw $v1,0x0($t0) /* ae40: 3c013f80 */ lui $at,0x3f80 /* ae44: 44814000 */ mtc1 $at,$f8 @@ -1825,8 +1825,8 @@ glabel func0000ad5c GLOBAL_ASM( glabel func0000af00 -/* af00: 3c088006 */ lui $t0,%hi(var8005d594) -/* af04: 2508d594 */ addiu $t0,$t0,%lo(var8005d594) +/* af00: 3c088006 */ lui $t0,%hi(g_ViData) +/* af04: 2508d594 */ addiu $t0,$t0,%lo(g_ViData) /* af08: 8d0e0000 */ lw $t6,0x0($t0) /* af0c: 27bdffd0 */ addiu $sp,$sp,-48 /* af10: 3c028009 */ lui $v0,%hi(var80092874+0x3) @@ -1894,10 +1894,10 @@ glabel func0000af00 /* b008: 01c15821 */ addu $t3,$t6,$at /* b00c: 0fc59e66 */ jal func0f167998 /* b010: ac8b0004 */ sw $t3,0x4($a0) -/* b014: 3c088006 */ lui $t0,%hi(var8005d594) +/* b014: 3c088006 */ lui $t0,%hi(g_ViData) /* b018: 3c018009 */ lui $at,%hi(var80092870) /* b01c: ac222870 */ sw $v0,%lo(var80092870)($at) -/* b020: 2508d594 */ addiu $t0,$t0,%lo(var8005d594) +/* b020: 2508d594 */ addiu $t0,$t0,%lo(g_ViData) /* b024: 8d030000 */ lw $v1,0x0($t0) /* b028: 3c013f80 */ lui $at,0x3f80 /* b02c: 44814000 */ mtc1 $at,$f8 @@ -1958,8 +1958,8 @@ glabel func0000b0e8 /* b0f8: afa50084 */ sw $a1,0x84($sp) /* b0fc: 0fc59e66 */ jal func0f167998 /* b100: afa60088 */ sw $a2,0x88($sp) -/* b104: 3c038006 */ lui $v1,%hi(var8005d594) -/* b108: 8c63d594 */ lw $v1,%lo(var8005d594)($v1) +/* b104: 3c038006 */ lui $v1,%hi(g_ViData) +/* b108: 8c63d594 */ lw $v1,%lo(g_ViData)($v1) /* b10c: afa2003c */ sw $v0,0x3c($sp) /* b110: 3c013f80 */ lui $at,0x3f80 /* b114: c4640010 */ lwc1 $f4,0x10($v1) @@ -2023,12 +2023,12 @@ glabel func0000b1d0 /* b1dc: 00000000 */ sll $zero,$zero,0x0 /* b1e0: 3c0e8006 */ lui $t6,%hi(var8005d598) /* b1e4: 8dced598 */ lw $t6,%lo(var8005d598)($t6) -/* b1e8: 3c058006 */ lui $a1,%hi(var8005d594) -/* b1ec: 24a5d594 */ addiu $a1,$a1,%lo(var8005d594) +/* b1e8: 3c058006 */ lui $a1,%hi(g_ViData) +/* b1ec: 24a5d594 */ addiu $a1,$a1,%lo(g_ViData) /* b1f0: 51c00012 */ beqzl $t6,.L0000b23c /* b1f4: 8cad0000 */ lw $t5,0x0($a1) -/* b1f8: 3c058006 */ lui $a1,%hi(var8005d594) -/* b1fc: 24a5d594 */ addiu $a1,$a1,%lo(var8005d594) +/* b1f8: 3c058006 */ lui $a1,%hi(g_ViData) +/* b1fc: 24a5d594 */ addiu $a1,$a1,%lo(g_ViData) /* b200: 8caf0000 */ lw $t7,0x0($a1) /* b204: 3c01ff10 */ lui $at,0xff10 /* b208: 24440008 */ addiu $a0,$v0,0x8 @@ -2067,8 +2067,8 @@ glabel func0000b1d0 GLOBAL_ASM( glabel func0000b280 -/* b280: 3c0e8006 */ lui $t6,%hi(var8005d594) -/* b284: 8dced594 */ lw $t6,%lo(var8005d594)($t6) +/* b280: 3c0e8006 */ lui $t6,%hi(g_ViData) +/* b284: 8dced594 */ lw $t6,%lo(g_ViData)($t6) /* b288: 27bdffe8 */ addiu $sp,$sp,-24 /* b28c: afbf0014 */ sw $ra,0x14($sp) /* b290: 8dcf0024 */ lw $t7,0x24($t6) @@ -2094,8 +2094,8 @@ glabel func0000b2c4 /* b2cc: 3c0f0030 */ lui $t7,0x30 /* b2d0: ac8f0004 */ sw $t7,0x4($a0) /* b2d4: ac8e0000 */ sw $t6,0x0($a0) -/* b2d8: 3c068006 */ lui $a2,%hi(var8005d594) -/* b2dc: 8cc6d594 */ lw $a2,%lo(var8005d594)($a2) +/* b2d8: 3c068006 */ lui $a2,%hi(g_ViData) +/* b2dc: 8cc6d594 */ lw $a2,%lo(g_ViData)($a2) /* b2e0: 24850008 */ addiu $a1,$a0,0x8 /* b2e4: 3c01f600 */ lui $at,0xf600 /* b2e8: 84d80018 */ lh $t8,0x18($a2) @@ -2216,7 +2216,7 @@ glabel func0000b330 /* b490: 55c0004e */ bnezl $t6,.L0000b5cc /* b494: 8d6d0290 */ lw $t5,0x290($t3) .L0000b498: -/* b498: 0c002f44 */ jal viGetTop +/* b498: 0c002f44 */ jal viGetViewTop /* b49c: afa600a8 */ sw $a2,0xa8($sp) /* b4a0: 1840001a */ blez $v0,.L0000b50c /* b4a4: 8fa600a8 */ lw $a2,0xa8($sp) @@ -2224,7 +2224,7 @@ glabel func0000b330 /* b4ac: 24c60008 */ addiu $a2,$a2,0x8 /* b4b0: 0c002f02 */ jal func0000bc08 /* b4b4: afa600a8 */ sw $a2,0xa8($sp) -/* b4b8: 0c002f44 */ jal viGetTop +/* b4b8: 0c002f44 */ jal viGetViewTop /* b4bc: a7a20056 */ sh $v0,0x56($sp) /* b4c0: 87ae0056 */ lh $t6,0x56($sp) /* b4c4: 244fffff */ addiu $t7,$v0,-1 @@ -2246,9 +2246,9 @@ glabel func0000b330 /* b504: ac600004 */ sw $zero,0x4($v1) /* b508: 24c60008 */ addiu $a2,$a2,0x8 .L0000b50c: -/* b50c: 0c002f26 */ jal viGetHeight +/* b50c: 0c002f26 */ jal viGetViewY /* b510: afa600a8 */ sw $a2,0xa8($sp) -/* b514: 0c002f44 */ jal viGetTop +/* b514: 0c002f44 */ jal viGetViewTop /* b518: a7a20042 */ sh $v0,0x42($sp) /* b51c: 0c002f06 */ jal func0000bc18 /* b520: a7a20056 */ sh $v0,0x56($sp) @@ -2276,9 +2276,9 @@ glabel func0000b330 /* b578: 8fae0090 */ lw $t6,0x90($sp) /* b57c: 000fc380 */ sll $t8,$t7,0xe /* b580: 01b8c825 */ or $t9,$t5,$t8 -/* b584: 0c002f44 */ jal viGetTop +/* b584: 0c002f44 */ jal viGetViewTop /* b588: add90000 */ sw $t9,0x0($t6) -/* b58c: 0c002f26 */ jal viGetHeight +/* b58c: 0c002f26 */ jal viGetViewY /* b590: a7a20056 */ sh $v0,0x56($sp) /* b594: 87af0056 */ lh $t7,0x56($sp) /* b598: 8fa600a8 */ lw $a2,0xa8($sp) @@ -2713,8 +2713,8 @@ glabel func0000b330 GLOBAL_ASM( glabel func0000bba0 -/* bba0: 3c028006 */ lui $v0,%hi(var8005d594) -/* bba4: 2442d594 */ addiu $v0,$v0,%lo(var8005d594) +/* bba0: 3c028006 */ lui $v0,%hi(g_ViData) +/* bba4: 2442d594 */ addiu $v0,$v0,%lo(g_ViData) /* bba8: 8c480000 */ lw $t0,0x0($v0) /* bbac: afa40000 */ sw $a0,0x0($sp) /* bbb0: afa50004 */ sw $a1,0x4($sp) @@ -2726,24 +2726,24 @@ glabel func0000bba0 GLOBAL_ASM( glabel func0000bbc4 -/* bbc4: 3c0e8006 */ lui $t6,%hi(var8005d594) -/* bbc8: 8dced594 */ lw $t6,%lo(var8005d594)($t6) +/* bbc4: 3c0e8006 */ lui $t6,%hi(g_ViData) +/* bbc8: 8dced594 */ lw $t6,%lo(g_ViData)($t6) /* bbcc: 03e00008 */ jr $ra /* bbd0: 85c20018 */ lh $v0,0x18($t6) ); GLOBAL_ASM( glabel func0000bbd4 -/* bbd4: 3c0e8006 */ lui $t6,%hi(var8005d594) -/* bbd8: 8dced594 */ lw $t6,%lo(var8005d594)($t6) +/* bbd4: 3c0e8006 */ lui $t6,%hi(g_ViData) +/* bbd8: 8dced594 */ lw $t6,%lo(g_ViData)($t6) /* bbdc: 03e00008 */ jr $ra /* bbe0: 85c2001a */ lh $v0,0x1a($t6) ); GLOBAL_ASM( glabel func0000bbe4 -/* bbe4: 3c028006 */ lui $v0,%hi(var8005d594) -/* bbe8: 2442d594 */ addiu $v0,$v0,%lo(var8005d594) +/* bbe4: 3c028006 */ lui $v0,%hi(g_ViData) +/* bbe8: 2442d594 */ addiu $v0,$v0,%lo(g_ViData) /* bbec: 8c480000 */ lw $t0,0x0($v0) /* bbf0: afa40000 */ sw $a0,0x0($sp) /* bbf4: afa50004 */ sw $a1,0x4($sp) @@ -2755,24 +2755,24 @@ glabel func0000bbe4 GLOBAL_ASM( glabel func0000bc08 -/* bc08: 3c0e8006 */ lui $t6,%hi(var8005d594) -/* bc0c: 8dced594 */ lw $t6,%lo(var8005d594)($t6) +/* 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) ); GLOBAL_ASM( glabel func0000bc18 -/* bc18: 3c0e8006 */ lui $t6,%hi(var8005d594) -/* bc1c: 8dced594 */ lw $t6,%lo(var8005d594)($t6) +/* 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) ); GLOBAL_ASM( glabel func0000bc28 -/* bc28: 3c038006 */ lui $v1,%hi(var8005d594) -/* bc2c: 2463d594 */ addiu $v1,$v1,%lo(var8005d594) +/* bc28: 3c038006 */ lui $v1,%hi(g_ViData) +/* bc2c: 2463d594 */ addiu $v1,$v1,%lo(g_ViData) /* bc30: 27bdffe8 */ addiu $sp,$sp,-24 /* bc34: 8c680000 */ lw $t0,0x0($v1) /* bc38: afbf0014 */ sw $ra,0x14($sp) @@ -2797,26 +2797,26 @@ glabel func0000bc28 /* bc84: 00000000 */ sll $zero,$zero,0x0 ); -GLOBAL_ASM( -glabel viGetWidth -/* bc88: 3c0e8006 */ lui $t6,%hi(var8005d594) -/* bc8c: 8dced594 */ lw $t6,%lo(var8005d594)($t6) -/* bc90: 03e00008 */ jr $ra -/* bc94: 85c2001c */ lh $v0,0x1c($t6) -); +/** + * This is actually the width. + */ +s16 viGetViewX(void) +{ + return g_ViData->viewx; +} -GLOBAL_ASM( -glabel viGetHeight -/* bc98: 3c0e8006 */ lui $t6,%hi(var8005d594) -/* bc9c: 8dced594 */ lw $t6,%lo(var8005d594)($t6) -/* bca0: 03e00008 */ jr $ra -/* bca4: 85c2001e */ lh $v0,0x1e($t6) -); +/** + * This is actually the height. + */ +s16 viGetViewY(void) +{ + return g_ViData->viewy; +} GLOBAL_ASM( glabel func0000bca8 -/* bca8: 3c038006 */ lui $v1,%hi(var8005d594) -/* bcac: 2463d594 */ addiu $v1,$v1,%lo(var8005d594) +/* bca8: 3c038006 */ lui $v1,%hi(g_ViData) +/* bcac: 2463d594 */ addiu $v1,$v1,%lo(g_ViData) /* bcb0: 27bdffe8 */ addiu $sp,$sp,-24 /* bcb4: 8c680000 */ lw $t0,0x0($v1) /* bcb8: afbf0014 */ sw $ra,0x14($sp) @@ -2839,26 +2839,20 @@ glabel func0000bca8 /* bcfc: 00000000 */ sll $zero,$zero,0x0 ); -GLOBAL_ASM( -glabel viGetLeft -/* bd00: 3c0e8006 */ lui $t6,%hi(var8005d594) -/* bd04: 8dced594 */ lw $t6,%lo(var8005d594)($t6) -/* bd08: 03e00008 */ jr $ra -/* bd0c: 85c20020 */ lh $v0,0x20($t6) -); +s16 viGetViewLeft(void) +{ + return g_ViData->viewleft; +} -GLOBAL_ASM( -glabel viGetTop -/* bd10: 3c0e8006 */ lui $t6,%hi(var8005d594) -/* bd14: 8dced594 */ lw $t6,%lo(var8005d594)($t6) -/* bd18: 03e00008 */ jr $ra -/* bd1c: 85c20022 */ lh $v0,0x22($t6) -); +s16 viGetViewTop(void) +{ + return g_ViData->viewtop; +} GLOBAL_ASM( glabel func0000bd20 -/* bd20: 3c0e8006 */ lui $t6,%hi(var8005d594) -/* bd24: 8dced594 */ lw $t6,%lo(var8005d594)($t6) +/* bd20: 3c0e8006 */ lui $t6,%hi(g_ViData) +/* bd24: 8dced594 */ lw $t6,%lo(g_ViData)($t6) /* bd28: 03e00008 */ jr $ra /* bd2c: adc40024 */ sw $a0,0x24($t6) ); @@ -2866,8 +2860,8 @@ glabel func0000bd20 GLOBAL_ASM( glabel func0000bd30 /* bd30: 27bdffe8 */ addiu $sp,$sp,-24 -/* bd34: 3c038006 */ lui $v1,%hi(var8005d594) -/* bd38: 2463d594 */ addiu $v1,$v1,%lo(var8005d594) +/* bd34: 3c038006 */ lui $v1,%hi(g_ViData) +/* bd38: 2463d594 */ addiu $v1,$v1,%lo(g_ViData) /* bd3c: e7ac0018 */ swc1 $f12,0x18($sp) /* bd40: c7a40018 */ lwc1 $f4,0x18($sp) /* bd44: 8c6e0000 */ lw $t6,0x0($v1) @@ -2889,8 +2883,8 @@ glabel func0000bd30 GLOBAL_ASM( glabel func0000bd7c /* bd7c: 27bdffe8 */ addiu $sp,$sp,-24 -/* bd80: 3c038006 */ lui $v1,%hi(var8005d594) -/* bd84: 2463d594 */ addiu $v1,$v1,%lo(var8005d594) +/* bd80: 3c038006 */ lui $v1,%hi(g_ViData) +/* bd84: 2463d594 */ addiu $v1,$v1,%lo(g_ViData) /* bd88: e7ac0018 */ swc1 $f12,0x18($sp) /* bd8c: c7a40018 */ lwc1 $f4,0x18($sp) /* bd90: 8c6e0000 */ lw $t6,0x0($v1) @@ -2911,8 +2905,8 @@ glabel func0000bd7c GLOBAL_ASM( glabel func0000bdc8 -/* bdc8: 3c0e8006 */ lui $t6,%hi(var8005d594) -/* bdcc: 8dced594 */ lw $t6,%lo(var8005d594)($t6) +/* bdc8: 3c0e8006 */ lui $t6,%hi(g_ViData) +/* bdcc: 8dced594 */ lw $t6,%lo(g_ViData)($t6) /* bdd0: 03e00008 */ jr $ra /* bdd4: c5c0000c */ lwc1 $f0,0xc($t6) ); @@ -2920,8 +2914,8 @@ glabel func0000bdc8 GLOBAL_ASM( glabel func0000bdd8 /* bdd8: 27bdffe8 */ addiu $sp,$sp,-24 -/* bddc: 3c038006 */ lui $v1,%hi(var8005d594) -/* bde0: 2463d594 */ addiu $v1,$v1,%lo(var8005d594) +/* bddc: 3c038006 */ lui $v1,%hi(g_ViData) +/* bde0: 2463d594 */ addiu $v1,$v1,%lo(g_ViData) /* bde4: e7ac0018 */ swc1 $f12,0x18($sp) /* bde8: c7a40018 */ lwc1 $f4,0x18($sp) /* bdec: 8c680000 */ lw $t0,0x0($v1) @@ -2945,8 +2939,8 @@ glabel func0000bdd8 /* be34: 46804320 */ cvt.s.w $f12,$f8 /* be38: 0fc2d256 */ jal currentPlayerSetScreenSize /* be3c: 468053a0 */ cvt.s.w $f14,$f10 -/* be40: 3c038006 */ lui $v1,%hi(var8005d594) -/* be44: 2463d594 */ addiu $v1,$v1,%lo(var8005d594) +/* be40: 3c038006 */ lui $v1,%hi(g_ViData) +/* be44: 2463d594 */ addiu $v1,$v1,%lo(g_ViData) /* be48: 8c620000 */ lw $v0,0x0($v1) /* be4c: c44c0010 */ lwc1 $f12,0x10($v0) /* be50: c44e0008 */ lwc1 $f14,0x8($v0) @@ -2962,8 +2956,8 @@ glabel func0000bdd8 GLOBAL_ASM( glabel func0000be74 -/* be74: 3c0e8006 */ lui $t6,%hi(var8005d594) -/* be78: 8dced594 */ lw $t6,%lo(var8005d594)($t6) +/* be74: 3c0e8006 */ lui $t6,%hi(g_ViData) +/* be78: 8dced594 */ lw $t6,%lo(g_ViData)($t6) /* be7c: 03e00008 */ jr $ra /* be80: c5c00008 */ lwc1 $f0,0x8($t6) ); @@ -2971,8 +2965,8 @@ glabel func0000be74 GLOBAL_ASM( glabel func0000be84 /* be84: 27bdffe8 */ addiu $sp,$sp,-24 -/* be88: 3c038006 */ lui $v1,%hi(var8005d594) -/* be8c: 2463d594 */ addiu $v1,$v1,%lo(var8005d594) +/* be88: 3c038006 */ lui $v1,%hi(g_ViData) +/* be8c: 2463d594 */ addiu $v1,$v1,%lo(g_ViData) /* be90: e7ac0018 */ swc1 $f12,0x18($sp) /* be94: c7a40018 */ lwc1 $f4,0x18($sp) /* be98: 8c6e0000 */ lw $t6,0x0($v1) @@ -2997,8 +2991,8 @@ glabel func0000be84 GLOBAL_ASM( glabel func0000bee0 -/* bee0: 3c028006 */ lui $v0,%hi(var8005d594) -/* bee4: 2442d594 */ addiu $v0,$v0,%lo(var8005d594) +/* bee0: 3c028006 */ lui $v0,%hi(g_ViData) +/* bee4: 2442d594 */ addiu $v0,$v0,%lo(g_ViData) /* bee8: 8c4e0000 */ lw $t6,0x0($v0) /* beec: c5c40010 */ lwc1 $f4,0x10($t6) /* bef0: e4840000 */ swc1 $f4,0x0($a0)