Rename viGetViewX and viGetViewY to viGetViewWidth and viGetViewHeight

This commit is contained in:
Ryan Dwyer 2020-12-14 23:25:08 +10:00
parent 440e734fe0
commit dededc6675
22 changed files with 152 additions and 158 deletions

View File

@ -14062,7 +14062,7 @@ glabel func0f02bdf8
/* f02c234: 00000000 */ nop
/* f02c238: 00029400 */ sll $s2,$v0,0x10
/* f02c23c: 00127403 */ sra $t6,$s2,0x10
/* f02c240: 0c002f22 */ jal viGetViewX
/* f02c240: 0c002f22 */ jal viGetViewWidth
/* f02c244: 01c09025 */ or $s2,$t6,$zero
/* f02c248: 0052c821 */ addu $t9,$v0,$s2
/* f02c24c: 272cfff0 */ addiu $t4,$t9,-16
@ -14073,7 +14073,7 @@ glabel func0f02bdf8
/* f02c260: 00000000 */ nop
/* f02c264: 00029400 */ sll $s2,$v0,0x10
/* f02c268: 00126c03 */ sra $t5,$s2,0x10
/* f02c26c: 0c002f22 */ jal viGetViewX
/* f02c26c: 0c002f22 */ jal viGetViewWidth
/* f02c270: 01a09025 */ or $s2,$t5,$zero
/* f02c274: 00529821 */ addu $s3,$v0,$s2
/* f02c278: 2673fff0 */ addiu $s3,$s3,-16
@ -14091,7 +14091,7 @@ glabel func0f02bdf8
/* f02c2a0: 00000000 */ nop
/* f02c2a4: 00029400 */ sll $s2,$v0,0x10
/* f02c2a8: 00127c03 */ sra $t7,$s2,0x10
/* f02c2ac: 0c002f26 */ jal viGetViewY
/* f02c2ac: 0c002f26 */ jal viGetViewHeight
/* f02c2b0: 01e09025 */ or $s2,$t7,$zero
/* f02c2b4: 0052c021 */ addu $t8,$v0,$s2
/* f02c2b8: 270efff0 */ addiu $t6,$t8,-16
@ -14102,7 +14102,7 @@ glabel func0f02bdf8
/* f02c2cc: 00000000 */ nop
/* f02c2d0: 00029400 */ sll $s2,$v0,0x10
/* f02c2d4: 0012cc03 */ sra $t9,$s2,0x10
/* f02c2d8: 0c002f26 */ jal viGetViewY
/* f02c2d8: 0c002f26 */ jal viGetViewHeight
/* f02c2dc: 03209025 */ or $s2,$t9,$zero
/* f02c2e0: 0052a021 */ addu $s4,$v0,$s2
/* f02c2e4: 2694fff0 */ addiu $s4,$s4,-16

View File

@ -3974,7 +3974,7 @@ glabel func0f00a490
/* f00a5b8: a7af0040 */ sh $t7,0x40($sp)
/* f00a5bc: 00028c00 */ sll $s1,$v0,0x10
/* f00a5c0: 0011c403 */ sra $t8,$s1,0x10
/* f00a5c4: 0c002f22 */ jal viGetViewX
/* f00a5c4: 0c002f22 */ jal viGetViewWidth
/* f00a5c8: 03008825 */ or $s1,$t8,$zero
/* f00a5cc: 00515821 */ addu $t3,$v0,$s1
/* f00a5d0: 000b6080 */ sll $t4,$t3,0x2
@ -3984,7 +3984,7 @@ glabel func0f00a490
/* f00a5e0: a7ac003e */ sh $t4,0x3e($sp)
/* f00a5e4: 00028c00 */ sll $s1,$v0,0x10
/* f00a5e8: 00116c03 */ sra $t5,$s1,0x10
/* f00a5ec: 0c002f26 */ jal viGetViewY
/* f00a5ec: 0c002f26 */ jal viGetViewHeight
/* f00a5f0: 01a08825 */ or $s1,$t5,$zero
/* f00a5f4: 3c014100 */ lui $at,0x4100
/* f00a5f8: 44811000 */ mtc1 $at,$f2
@ -4370,7 +4370,7 @@ glabel hudRenderGasIfEnabled
/* f00aba4: a7aa009c */ sh $t2,0x9c($sp)
/* f00aba8: 00028c00 */ sll $s1,$v0,0x10
/* f00abac: 00117c03 */ sra $t7,$s1,0x10
/* f00abb0: 0c002f22 */ jal viGetViewX
/* f00abb0: 0c002f22 */ jal viGetViewWidth
/* f00abb4: 01e08825 */ or $s1,$t7,$zero
/* f00abb8: 00516021 */ addu $t4,$v0,$s1
/* f00abbc: 000c6880 */ sll $t5,$t4,0x2
@ -4380,7 +4380,7 @@ glabel hudRenderGasIfEnabled
/* f00abcc: a7ad009a */ sh $t5,0x9a($sp)
/* f00abd0: 00028c00 */ sll $s1,$v0,0x10
/* f00abd4: 0011cc03 */ sra $t9,$s1,0x10
/* f00abd8: 0c002f26 */ jal viGetViewY
/* f00abd8: 0c002f26 */ jal viGetViewHeight
/* f00abdc: 03208825 */ or $s1,$t9,$zero
/* f00abe0: 00517821 */ addu $t7,$v0,$s1
/* f00abe4: 000f7080 */ sll $t6,$t7,0x2

View File

@ -10837,7 +10837,7 @@ glabel var7f1ac764
/* f0a066c: c7b2008c */ lwc1 $f18,0x8c($sp)
/* f0a0670: e6120000 */ swc1 $f18,0x0($s0)
/* f0a0674: c7a40090 */ lwc1 $f4,0x90($sp)
/* f0a0678: 0c002f22 */ jal viGetViewX
/* f0a0678: 0c002f22 */ jal viGetViewWidth
/* f0a067c: e6440000 */ swc1 $f4,0x0($s2)
/* f0a0680: 44824000 */ mtc1 $v0,$f8
/* f0a0684: c6060000 */ lwc1 $f6,0x0($s0)
@ -10845,7 +10845,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 viGetViewY
/* f0a0698: 0c002f26 */ jal viGetViewHeight
/* f0a069c: e6040000 */ swc1 $f4,0x0($s0)
/* f0a06a0: 44823000 */ mtc1 $v0,$f6
/* f0a06a4: c6480000 */ lwc1 $f8,0x0($s2)
@ -18572,7 +18572,7 @@ glabel var7f1aca90
/* f0a726c: 316c0fff */ andi $t4,$t3,0xfff
/* f0a7270: 000c6b00 */ sll $t5,$t4,0xc
/* f0a7274: 032d7025 */ or $t6,$t9,$t5
/* f0a7278: 0c002f22 */ jal viGetViewX
/* f0a7278: 0c002f22 */ jal viGetViewWidth
/* f0a727c: aeae0000 */ sw $t6,0x0($s5)
/* f0a7280: 00029400 */ sll $s2,$v0,0x10
/* f0a7284: 00127c03 */ sra $t7,$s2,0x10
@ -18584,7 +18584,7 @@ glabel var7f1aca90
/* f0a729c: 0120a025 */ or $s4,$t1,$zero
/* f0a72a0: 00028400 */ sll $s0,$v0,0x10
/* f0a72a4: 00104403 */ sra $t0,$s0,0x10
/* f0a72a8: 0c002f26 */ jal viGetViewY
/* f0a72a8: 0c002f26 */ jal viGetViewHeight
/* f0a72ac: 01008025 */ or $s0,$t0,$zero
/* f0a72b0: 00505021 */ addu $t2,$v0,$s0
/* f0a72b4: 448a4000 */ mtc1 $t2,$f8
@ -19271,7 +19271,7 @@ glabel var7f1aca90
/* f0a7c94: 332f0fff */ andi $t7,$t9,0xfff
/* f0a7c98: 000f4b00 */ sll $t1,$t7,0xc
/* f0a7c9c: 01a97025 */ or $t6,$t5,$t1
/* f0a7ca0: 0c002f22 */ jal viGetViewX
/* f0a7ca0: 0c002f22 */ jal viGetViewWidth
/* f0a7ca4: ae2e0000 */ sw $t6,0x0($s1)
/* f0a7ca8: 00029400 */ sll $s2,$v0,0x10
/* f0a7cac: 00126403 */ sra $t4,$s2,0x10
@ -19283,7 +19283,7 @@ glabel var7f1aca90
/* f0a7cc4: 0140a025 */ or $s4,$t2,$zero
/* f0a7cc8: 00028400 */ sll $s0,$v0,0x10
/* f0a7ccc: 00104403 */ sra $t0,$s0,0x10
/* f0a7cd0: 0c002f26 */ jal viGetViewY
/* f0a7cd0: 0c002f26 */ jal viGetViewHeight
/* f0a7cd4: 01008025 */ or $s0,$t0,$zero
/* f0a7cd8: 00505821 */ addu $t3,$v0,$s0
/* f0a7cdc: 448b8000 */ mtc1 $t3,$f16
@ -22110,7 +22110,7 @@ glabel hudRenderAmmo
/* f0aa87c: afa40130 */ sw $a0,0x130($sp)
/* f0aa880: 0c002f44 */ jal viGetViewTop
/* f0aa884: afae012c */ sw $t6,0x12c($sp)
/* f0aa888: 0c002f26 */ jal viGetViewY
/* f0aa888: 0c002f26 */ jal viGetViewHeight
/* f0aa88c: a7a20076 */ sh $v0,0x76($sp)
/* f0aa890: 87af0076 */ lh $t7,0x76($sp)
/* f0aa894: 3c08800a */ lui $t0,%hi(g_Vars)
@ -22289,7 +22289,7 @@ glabel hudRenderAmmo
.L0f0aab04:
/* f0aab04: 0c002f40 */ jal viGetViewLeft
/* f0aab08: 00000000 */ nop
/* f0aab0c: 0c002f22 */ jal viGetViewX
/* f0aab0c: 0c002f22 */ jal viGetViewWidth
/* f0aab10: a7a20076 */ sh $v0,0x76($sp)
/* f0aab14: 87b90076 */ lh $t9,0x76($sp)
/* f0aab18: 3c0f8008 */ lui $t7,%hi(g_ScreenWidthMultiplier)
@ -23014,7 +23014,7 @@ glabel hudRenderAmmo
/* f0ab5a8: afaa0058 */ sw $t2,0x58($sp)
/* f0ab5ac: 0c002f40 */ jal viGetViewLeft
/* f0ab5b0: afaf00a4 */ sw $t7,0xa4($sp)
/* f0ab5b4: 0c002f22 */ jal viGetViewX
/* f0ab5b4: 0c002f22 */ jal viGetViewWidth
/* f0ab5b8: a7a20076 */ sh $v0,0x76($sp)
/* f0ab5bc: 87b80076 */ lh $t8,0x76($sp)
/* f0ab5c0: 3c198008 */ lui $t9,%hi(g_ScreenWidthMultiplier)

View File

@ -4837,7 +4837,7 @@ Gfx *fadeDraw(Gfx *gdl, u32 r, u32 g, u32 b, f32 frac)
gDPSetCombineMode(gdl++, G_CC_PRIMITIVE, G_CC_PRIMITIVE);
gDPSetPrimColor(gdl++, 0, 0, r, g, b, (s32)(frac * 255));
gDPFillRectangle(gdl++, viGetViewLeft(), viGetViewTop(),
viGetViewLeft() + viGetViewX(), viGetViewTop() + viGetViewY());
viGetViewLeft() + viGetViewWidth(), viGetViewTop() + viGetViewHeight());
gDPPipeSync(gdl++);
gDPSetColorDither(gdl++, G_CD_BAYER);
gDPSetTexturePersp(gdl++, G_TP_PERSP);
@ -11435,8 +11435,8 @@ Gfx *func0f0c07c8(Gfx *gdl)
if (g_Vars.currentplayer->cameramode != CAMERAMODE_EYESPY && g_Vars.currentplayer->mpmenuon) {
s32 a = viGetViewLeft();
s32 b = viGetViewTop();
s32 c = viGetViewLeft() + viGetViewX();
s32 d = viGetViewTop() + viGetViewY();
s32 c = viGetViewLeft() + viGetViewWidth();
s32 d = viGetViewTop() + viGetViewHeight();
gdl = func0f153628(gdl);
gdl = func0f153a34(gdl, a, b, c, d, 160);
@ -11679,8 +11679,8 @@ Gfx *func0f0c07c8(Gfx *gdl)
if (g_Vars.currentplayer->mpmenuon) {
s32 a = viGetViewLeft();
s32 b = viGetViewTop();
s32 c = viGetViewLeft() + viGetViewX();
s32 d = viGetViewTop() + viGetViewY();
s32 c = viGetViewLeft() + viGetViewWidth();
s32 d = viGetViewTop() + viGetViewHeight();
gdl = func0f153628(gdl);
gdl = func0f153a34(gdl, a, b, c, d, 160);

View File

@ -716,7 +716,7 @@ glabel func0f0d78f4
.L0f0d7948:
/* f0d7948: 0c002f44 */ jal viGetViewTop
/* f0d794c: 00000000 */ nop
/* f0d7950: 0c002f22 */ jal viGetViewX
/* f0d7950: 0c002f22 */ jal viGetViewWidth
/* f0d7954: afa20090 */ sw $v0,0x90($sp)
/* f0d7958: 3c188008 */ lui $t8,%hi(g_ScreenWidthMultiplier)
/* f0d795c: 8f18fac0 */ lw $t8,%lo(g_ScreenWidthMultiplier)($t8)
@ -735,7 +735,7 @@ glabel func0f0d78f4
/* f0d798c: 00000000 */ nop
/* f0d7990: 0006000d */ break 0x6
.L0f0d7994:
/* f0d7994: 0c002f26 */ jal viGetViewY
/* f0d7994: 0c002f26 */ jal viGetViewHeight
/* f0d7998: 00000000 */ nop
/* f0d799c: 8fae0090 */ lw $t6,0x90($sp)
/* f0d79a0: 24190001 */ addiu $t9,$zero,0x1
@ -1166,7 +1166,7 @@ glabel func0f0d7f54
.L0f0d7fc0:
/* f0d7fc0: 0c002f44 */ jal viGetViewTop
/* f0d7fc4: 00000000 */ nop
/* f0d7fc8: 0c002f22 */ jal viGetViewX
/* f0d7fc8: 0c002f22 */ jal viGetViewWidth
/* 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 */ nop
/* f0d8004: 0006000d */ break 0x6
.L0f0d8008:
/* f0d8008: 0c002f26 */ jal viGetViewY
/* f0d8008: 0c002f26 */ jal viGetViewHeight
/* f0d800c: 00000000 */ nop
/* f0d8010: 8fae00c8 */ lw $t6,0xc8($sp)
/* f0d8014: 3c0500ff */ lui $a1,0xff
@ -3129,7 +3129,7 @@ glabel func0f0d9ba0
.L0f0d9bf0:
/* f0d9bf0: 0c002f44 */ jal viGetViewTop
/* f0d9bf4: 00000000 */ nop
/* f0d9bf8: 0c002f22 */ jal viGetViewX
/* f0d9bf8: 0c002f22 */ jal viGetViewWidth
/* f0d9bfc: afa20088 */ sw $v0,0x88($sp)
/* f0d9c00: 3c188008 */ lui $t8,%hi(g_ScreenWidthMultiplier)
/* f0d9c04: 8f18fac0 */ lw $t8,%lo(g_ScreenWidthMultiplier)($t8)
@ -3148,7 +3148,7 @@ glabel func0f0d9ba0
/* f0d9c34: 00000000 */ nop
/* f0d9c38: 0006000d */ break 0x6
.L0f0d9c3c:
/* f0d9c3c: 0c002f26 */ jal viGetViewY
/* f0d9c3c: 0c002f26 */ jal viGetViewHeight
/* f0d9c40: 00000000 */ nop
/* f0d9c44: 3c0e8008 */ lui $t6,%hi(g_ScreenWidthMultiplier)
/* f0d9c48: 8dcefac0 */ lw $t6,%lo(g_ScreenWidthMultiplier)($t6)
@ -3642,7 +3642,7 @@ glabel var7f1ade54
.L0f0da330:
/* f0da330: 0c002f44 */ jal viGetViewTop
/* f0da334: 00000000 */ nop
/* f0da338: 0c002f22 */ jal viGetViewX
/* f0da338: 0c002f22 */ jal viGetViewWidth
/* f0da33c: afa200f8 */ sw $v0,0xf8($sp)
/* f0da340: 3c088008 */ lui $t0,%hi(g_ScreenWidthMultiplier)
/* f0da344: 2508fac0 */ addiu $t0,$t0,%lo(g_ScreenWidthMultiplier)
@ -3663,7 +3663,7 @@ glabel var7f1ade54
/* f0da37c: 0006000d */ break 0x6
.L0f0da380:
/* f0da380: afae00f4 */ sw $t6,0xf4($sp)
/* f0da384: 0c002f26 */ jal viGetViewY
/* f0da384: 0c002f26 */ jal viGetViewHeight
/* f0da388: 00000000 */ nop
/* f0da38c: 8fb800f8 */ lw $t8,0xf8($sp)
/* f0da390: 00021843 */ sra $v1,$v0,0x1
@ -5744,7 +5744,7 @@ glabel func0f0dc170
.L0f0dc1c8:
/* f0dc1c8: 0c002f44 */ jal viGetViewTop
/* f0dc1cc: 00000000 */ nop
/* f0dc1d0: 0c002f22 */ jal viGetViewX
/* f0dc1d0: 0c002f22 */ jal viGetViewWidth
/* 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 */ nop
/* f0dc208: 0006000d */ break 0x6
.L0f0dc20c:
/* f0dc20c: 0c002f26 */ jal viGetViewY
/* f0dc20c: 0c002f26 */ jal viGetViewHeight
/* f0dc210: 00000000 */ nop
/* f0dc214: 8fae00a8 */ lw $t6,0xa8($sp)
/* f0dc218: 3c03800a */ lui $v1,%hi(g_Vars+0x284)

View File

@ -126,7 +126,7 @@ glabel hudRenderMissionTimer
.L0f0dcf40:
/* f0dcf40: 0c002f44 */ jal viGetViewTop
/* f0dcf44: 00000000 */ nop
/* f0dcf48: 0c002f26 */ jal viGetViewY
/* f0dcf48: 0c002f26 */ jal viGetViewHeight
/* f0dcf4c: a7a20056 */ sh $v0,0x56($sp)
/* f0dcf50: 3c04800a */ lui $a0,%hi(g_Vars)
/* f0dcf54: 24849fc0 */ addiu $a0,$a0,%lo(g_Vars)
@ -380,7 +380,7 @@ glabel hudRenderMissionTimer
//
// sp84 = viGetViewLeft() / g_ScreenWidthMultiplier;
// top = viGetViewTop();
// viewy = viGetViewY();
// viewy = viGetViewHeight();
// playercount = PLAYERCOUNT();
// playernum = g_Vars.currentplayernum;
//
@ -472,7 +472,7 @@ glabel hudRenderZoomRange
/* f0dd300: 00000000 */ nop
/* f0dd304: 0006000d */ break 0x6
.L0f0dd308:
/* f0dd308: 0c002f22 */ jal viGetViewX
/* f0dd308: 0c002f22 */ jal viGetViewWidth
/* f0dd30c: 00000000 */ nop
/* f0dd310: 8e180000 */ lw $t8,0x0($s0)
/* f0dd314: 0058001a */ div $zero,$v0,$t8
@ -490,7 +490,7 @@ glabel hudRenderZoomRange
/* f0dd340: 0006000d */ break 0x6
.L0f0dd344:
/* f0dd344: afa900b4 */ sw $t1,0xb4($sp)
/* f0dd348: 0c002f26 */ jal viGetViewY
/* f0dd348: 0c002f26 */ jal viGetViewHeight
/* f0dd34c: 00000000 */ nop
/* f0dd350: 3c06800a */ lui $a2,%hi(g_Vars)
/* f0dd354: 3c013f80 */ lui $at,0x3f80
@ -4401,7 +4401,7 @@ glabel var7f1adef4
/* f0e056c: 31e90fff */ andi $t1,$t7,0xfff
/* f0e0570: 0009c300 */ sll $t8,$t1,0xc
/* f0e0574: 01984025 */ or $t0,$t4,$t8
/* f0e0578: 0c002f22 */ jal viGetViewX
/* f0e0578: 0c002f22 */ jal viGetViewWidth
/* f0e057c: ae680000 */ sw $t0,0x0($s3)
/* f0e0580: 0c002f40 */ jal viGetViewLeft
/* f0e0584: a7a20092 */ sh $v0,0x92($sp)
@ -4411,7 +4411,7 @@ glabel var7f1adef4
/* f0e0594: 01608825 */ or $s1,$t3,$zero
/* f0e0598: 00028400 */ sll $s0,$v0,0x10
/* f0e059c: 00105403 */ sra $t2,$s0,0x10
/* f0e05a0: 0c002f26 */ jal viGetViewY
/* f0e05a0: 0c002f26 */ jal viGetViewHeight
/* f0e05a4: 01408025 */ or $s0,$t2,$zero
/* f0e05a8: 87a90092 */ lh $t1,0x92($sp)
/* f0e05ac: 00506821 */ addu $t5,$v0,$s0
@ -4747,7 +4747,7 @@ glabel var7f1adef4
// if (msg->type == HUDMSGTYPE_11) {
// gDPSetScissor(gdl++, 0,
// viGetViewLeft(), viGetViewTop(),
// viGetViewLeft() + viGetViewX(), viGetViewTop() + viGetViewY());
// viGetViewLeft() + viGetViewWidth(), viGetViewTop() + viGetViewHeight());
// }
// }
//

View File

@ -3939,7 +3939,7 @@ glabel var7f1b2948
/* f0f44b4: 00000000 */ nop
/* f0f44b8: 00028c00 */ sll $s1,$v0,0x10
/* f0f44bc: 00117403 */ sra $t6,$s1,0x10
/* f0f44c0: 0c002f22 */ jal viGetViewX
/* f0f44c0: 0c002f22 */ jal viGetViewWidth
/* f0f44c4: 01c08825 */ or $s1,$t6,$zero
/* f0f44c8: 44825000 */ mtc1 $v0,$f10
/* f0f44cc: 3c013f00 */ lui $at,0x3f00
@ -3962,7 +3962,7 @@ glabel var7f1b2948
/* f0f4510: e7a80390 */ swc1 $f8,0x390($sp)
/* f0f4514: 00028c00 */ sll $s1,$v0,0x10
/* f0f4518: 00116403 */ sra $t4,$s1,0x10
/* f0f451c: 0c002f26 */ jal viGetViewY
/* f0f451c: 0c002f26 */ jal viGetViewHeight
/* f0f4520: 01808825 */ or $s1,$t4,$zero
/* f0f4524: 44822000 */ mtc1 $v0,$f4
/* f0f4528: 3c013f00 */ lui $at,0x3f00
@ -5965,7 +5965,7 @@ glabel func0f0f5360
/* f0f6218: 0040a025 */ or $s4,$v0,$zero
/* f0f621c: 00028400 */ sll $s0,$v0,0x10
/* f0f6220: 0010c403 */ sra $t8,$s0,0x10
/* f0f6224: 0c002f22 */ jal viGetViewX
/* f0f6224: 0c002f22 */ jal viGetViewWidth
/* f0f6228: 03008025 */ or $s0,$t8,$zero
/* f0f622c: 3c0f8008 */ lui $t7,%hi(g_ScreenWidthMultiplier)
/* f0f6230: 8deffac0 */ lw $t7,%lo(g_ScreenWidthMultiplier)($t7)
@ -5987,7 +5987,7 @@ glabel func0f0f5360
/* f0f6268: 00000000 */ nop
/* f0f626c: 00028400 */ sll $s0,$v0,0x10
/* f0f6270: 00106c03 */ sra $t5,$s0,0x10
/* f0f6274: 0c002f26 */ jal viGetViewY
/* f0f6274: 0c002f26 */ jal viGetViewHeight
/* f0f6278: 01a08025 */ or $s0,$t5,$zero
/* f0f627c: 8fac0088 */ lw $t4,0x88($sp)
/* f0f6280: 3c08800a */ lui $t0,%hi(var800a2038)
@ -6796,7 +6796,7 @@ glabel func0f0f5360
/* f0f6e58: 31af0fff */ andi $t7,$t5,0xfff
/* f0f6e5c: 000fc300 */ sll $t8,$t7,0xc
/* f0f6e60: 01787025 */ or $t6,$t3,$t8
/* f0f6e64: 0c002f22 */ jal viGetViewX
/* f0f6e64: 0c002f22 */ jal viGetViewWidth
/* f0f6e68: ae6e0000 */ sw $t6,0x0($s3)
/* f0f6e6c: 00028c00 */ sll $s1,$v0,0x10
/* f0f6e70: 00116403 */ sra $t4,$s1,0x10
@ -6808,7 +6808,7 @@ glabel func0f0f5360
/* f0f6e88: 03209025 */ or $s2,$t9,$zero
/* f0f6e8c: 00028400 */ sll $s0,$v0,0x10
/* f0f6e90: 00106c03 */ sra $t5,$s0,0x10
/* f0f6e94: 0c002f26 */ jal viGetViewY
/* f0f6e94: 0c002f26 */ jal viGetViewHeight
/* f0f6e98: 01a08025 */ or $s0,$t5,$zero
/* f0f6e9c: 00507821 */ addu $t7,$v0,$s0
/* f0f6ea0: 448f3000 */ mtc1 $t7,$f6
@ -6858,7 +6858,7 @@ glabel func0f0f5360
/* f0f6f4c: 330c0fff */ andi $t4,$t8,0xfff
/* f0f6f50: 000ccb00 */ sll $t9,$t4,0xc
/* f0f6f54: 01d96825 */ or $t5,$t6,$t9
/* f0f6f58: 0c002f22 */ jal viGetViewX
/* f0f6f58: 0c002f22 */ jal viGetViewWidth
/* f0f6f5c: ae6d0000 */ sw $t5,0x0($s3)
/* f0f6f60: 00028c00 */ sll $s1,$v0,0x10
/* f0f6f64: 00117c03 */ sra $t7,$s1,0x10
@ -6870,7 +6870,7 @@ glabel func0f0f5360
/* f0f6f7c: 01609025 */ or $s2,$t3,$zero
/* f0f6f80: 00028400 */ sll $s0,$v0,0x10
/* f0f6f84: 0010c403 */ sra $t8,$s0,0x10
/* f0f6f88: 0c002f26 */ jal viGetViewY
/* f0f6f88: 0c002f26 */ jal viGetViewHeight
/* f0f6f8c: 03008025 */ or $s0,$t8,$zero
/* f0f6f90: 00506021 */ addu $t4,$v0,$s0
/* f0f6f94: 448c9000 */ mtc1 $t4,$f18
@ -7482,7 +7482,7 @@ glabel var7f1b2990
/* f0f7790: 24430004 */ addiu $v1,$v0,0x4
/* f0f7794: 0c002f40 */ jal viGetViewLeft
/* f0f7798: afa30030 */ sw $v1,0x30($sp)
/* f0f779c: 0c002f22 */ jal viGetViewX
/* f0f779c: 0c002f22 */ jal viGetViewWidth
/* f0f77a0: a7a2001a */ sh $v0,0x1a($sp)
/* f0f77a4: 87af001a */ lh $t7,0x1a($sp)
/* f0f77a8: 3c198008 */ lui $t9,%hi(g_ScreenWidthMultiplier)
@ -7509,7 +7509,7 @@ glabel var7f1b2990
/* f0f77f4: afa7002c */ sw $a3,0x2c($sp)
/* f0f77f8: 0c002f44 */ jal viGetViewTop
/* f0f77fc: 00000000 */ nop
/* f0f7800: 0c002f26 */ jal viGetViewY
/* f0f7800: 0c002f26 */ jal viGetViewHeight
/* f0f7804: a7a2001a */ sh $v0,0x1a($sp)
/* f0f7808: 87ae001a */ lh $t6,0x1a($sp)
/* f0f780c: 004e2021 */ addu $a0,$v0,$t6
@ -8051,7 +8051,7 @@ glabel func0f0f7e98
/* f0f7f8c: 8fa80034 */ lw $t0,0x34($sp)
/* f0f7f90: 0c002f40 */ jal viGetViewLeft
/* f0f7f94: 00000000 */ nop
/* f0f7f98: 0c002f22 */ jal viGetViewX
/* f0f7f98: 0c002f22 */ jal viGetViewWidth
/* f0f7f9c: a7a2002e */ sh $v0,0x2e($sp)
/* f0f7fa0: 87ad002e */ lh $t5,0x2e($sp)
/* f0f7fa4: 3c0f8008 */ lui $t7,%hi(g_ScreenWidthMultiplier)
@ -8086,7 +8086,7 @@ glabel func0f0f7e98
/* f0f8008: 8fbf001c */ lw $ra,0x1c($sp)
/* f0f800c: 0c002f44 */ jal viGetViewTop
/* f0f8010: 00000000 */ nop
/* f0f8014: 0c002f26 */ jal viGetViewY
/* f0f8014: 0c002f26 */ jal viGetViewHeight
/* f0f8018: a7a2002e */ sh $v0,0x2e($sp)
/* f0f801c: 87ad002e */ lh $t5,0x2e($sp)
/* f0f8020: 004d7021 */ addu $t6,$v0,$t5
@ -8807,7 +8807,7 @@ glabel func0f0f86a8
/* f0f8ad0: 00408825 */ or $s1,$v0,$zero
/* f0f8ad4: 00028400 */ sll $s0,$v0,0x10
/* f0f8ad8: 00106c03 */ sra $t5,$s0,0x10
/* f0f8adc: 0c002f22 */ jal viGetViewX
/* f0f8adc: 0c002f22 */ jal viGetViewWidth
/* f0f8ae0: 01a08025 */ or $s0,$t5,$zero
/* f0f8ae4: 3c0a8008 */ lui $t2,%hi(g_ScreenWidthMultiplier)
/* f0f8ae8: 8d4afac0 */ lw $t2,%lo(g_ScreenWidthMultiplier)($t2)
@ -8830,7 +8830,7 @@ glabel func0f0f86a8
/* f0f8b24: 00000000 */ nop
/* f0f8b28: 00028400 */ sll $s0,$v0,0x10
/* f0f8b2c: 00107c03 */ sra $t7,$s0,0x10
/* f0f8b30: 0c002f26 */ jal viGetViewY
/* f0f8b30: 0c002f26 */ jal viGetViewHeight
/* f0f8b34: 01e08025 */ or $s0,$t7,$zero
/* f0f8b38: 3c0e8007 */ lui $t6,%hi(g_MpPlayerNum)
/* f0f8b3c: 8dce1448 */ lw $t6,%lo(g_MpPlayerNum)($t6)
@ -12806,7 +12806,7 @@ glabel var7f1b2afc
/* f0fc248: afb900ec */ sw $t9,0xec($sp)
/* f0fc24c: 00028400 */ sll $s0,$v0,0x10
/* f0fc250: 00105403 */ sra $t2,$s0,0x10
/* f0fc254: 0c002f22 */ jal viGetViewX
/* f0fc254: 0c002f22 */ jal viGetViewWidth
/* f0fc258: 01408025 */ or $s0,$t2,$zero
/* f0fc25c: 3c0b8008 */ lui $t3,%hi(g_ScreenWidthMultiplier)
/* f0fc260: 8d6bfac0 */ lw $t3,%lo(g_ScreenWidthMultiplier)($t3)
@ -12830,7 +12830,7 @@ glabel var7f1b2afc
/* f0fc2a0: 00000000 */ nop
/* f0fc2a4: 00028400 */ sll $s0,$v0,0x10
/* f0fc2a8: 00107c03 */ sra $t7,$s0,0x10
/* f0fc2ac: 0c002f26 */ jal viGetViewY
/* f0fc2ac: 0c002f26 */ jal viGetViewHeight
/* f0fc2b0: 01e08025 */ or $s0,$t7,$zero
/* f0fc2b4: 0050c021 */ addu $t8,$v0,$s0
/* f0fc2b8: 2719fffc */ addiu $t9,$t8,-4
@ -13168,7 +13168,7 @@ glabel var7f1b2afc
/* f0fc780: afa20094 */ sw $v0,0x94($sp)
/* f0fc784: 00028400 */ sll $s0,$v0,0x10
/* f0fc788: 00105403 */ sra $t2,$s0,0x10
/* f0fc78c: 0c002f22 */ jal viGetViewX
/* f0fc78c: 0c002f22 */ jal viGetViewWidth
/* f0fc790: 01408025 */ or $s0,$t2,$zero
/* f0fc794: 3c0d8008 */ lui $t5,%hi(g_ScreenWidthMultiplier)
/* f0fc798: 8dadfac0 */ lw $t5,%lo(g_ScreenWidthMultiplier)($t5)
@ -13190,7 +13190,7 @@ glabel var7f1b2afc
/* f0fc7d0: 00000000 */ nop
/* f0fc7d4: 00028400 */ sll $s0,$v0,0x10
/* f0fc7d8: 00107403 */ sra $t6,$s0,0x10
/* f0fc7dc: 0c002f26 */ jal viGetViewY
/* f0fc7dc: 0c002f26 */ jal viGetViewHeight
/* f0fc7e0: 01c08025 */ or $s0,$t6,$zero
/* f0fc7e4: 8ec7006c */ lw $a3,0x6c($s6)
/* f0fc7e8: 00504821 */ addu $t1,$v0,$s0

View File

@ -1582,7 +1582,7 @@ glabel func0f0ff274
/* f0ff5a4: afa40020 */ sw $a0,0x20($sp)
.L0f0ff5a8:
/* f0ff5a8: afa60048 */ sw $a2,0x48($sp)
/* f0ff5ac: 0c002f22 */ jal viGetViewX
/* f0ff5ac: 0c002f22 */ jal viGetViewWidth
/* f0ff5b0: afa7004c */ sw $a3,0x4c($sp)
/* f0ff5b4: 0c002f40 */ jal viGetViewLeft
/* f0ff5b8: a7a20024 */ sh $v0,0x24($sp)
@ -1622,7 +1622,7 @@ glabel func0f0ff274
/* f0ff634: 0006000d */ break 0x6
.L0f0ff638:
/* f0ff638: 030fc821 */ addu $t9,$t8,$t7
/* f0ff63c: 0c002f26 */ jal viGetViewY
/* f0ff63c: 0c002f26 */ jal viGetViewHeight
/* f0ff640: a4d90000 */ sh $t9,0x0($a2)
/* f0ff644: 0c002f44 */ jal viGetViewTop
/* f0ff648: a7a20024 */ sh $v0,0x24($sp)
@ -1935,7 +1935,7 @@ glabel var7f1b2ce0
/* f0ffa70: afb90010 */ sw $t9,0x10($sp)
/* f0ffa74: 0c002f40 */ jal viGetViewLeft
/* f0ffa78: 00000000 */ nop
/* f0ffa7c: 0c002f22 */ jal viGetViewX
/* f0ffa7c: 0c002f22 */ jal viGetViewWidth
/* f0ffa80: a7a2004e */ sh $v0,0x4e($sp)
/* f0ffa84: 3c038008 */ lui $v1,%hi(g_ScreenWidthMultiplier)
/* f0ffa88: 8c63fac0 */ lw $v1,%lo(g_ScreenWidthMultiplier)($v1)
@ -2138,7 +2138,7 @@ glabel var7f1b2ce0
/* f0ffd50: afb80010 */ sw $t8,0x10($sp)
/* f0ffd54: 0c002f40 */ jal viGetViewLeft
/* f0ffd58: 00000000 */ nop
/* f0ffd5c: 0c002f22 */ jal viGetViewX
/* f0ffd5c: 0c002f22 */ jal viGetViewWidth
/* f0ffd60: a7a2004e */ sh $v0,0x4e($sp)
/* f0ffd64: 3c038008 */ lui $v1,%hi(g_ScreenWidthMultiplier)
/* f0ffd68: 8c63fac0 */ lw $v1,%lo(g_ScreenWidthMultiplier)($v1)
@ -2252,7 +2252,7 @@ glabel var7f1b2ce0
/* f0ffefc: afb90010 */ sw $t9,0x10($sp)
/* f0fff00: 0c002f40 */ jal viGetViewLeft
/* f0fff04: 00000000 */ nop
/* f0fff08: 0c002f22 */ jal viGetViewX
/* f0fff08: 0c002f22 */ jal viGetViewWidth
/* f0fff0c: a7a2004e */ sh $v0,0x4e($sp)
/* f0fff10: 3c038008 */ lui $v1,%hi(g_ScreenWidthMultiplier)
/* f0fff14: 8c63fac0 */ lw $v1,%lo(g_ScreenWidthMultiplier)($v1)
@ -4247,7 +4247,7 @@ glabel func0f100ad0
/* f101bc8: 10000031 */ b .L0f101c90
/* f101bcc: 3c013e80 */ lui $at,0x3e80
.L0f101bd0:
/* f101bd0: 0c002f22 */ jal viGetViewX
/* f101bd0: 0c002f22 */ jal viGetViewWidth
/* f101bd4: 00000000 */ nop
/* f101bd8: 00028c00 */ sll $s1,$v0,0x10
/* f101bdc: 00117c03 */ sra $t7,$s1,0x10
@ -4345,7 +4345,7 @@ glabel func0f100ad0
/* f101d34: 3739ffff */ ori $t9,$t9,0xffff
/* f101d38: adf90000 */ sw $t9,0x0($t7)
/* f101d3c: adee0004 */ sw $t6,0x4($t7)
/* f101d40: 0c002f26 */ jal viGetViewY
/* f101d40: 0c002f26 */ jal viGetViewHeight
/* f101d44: e7a20068 */ swc1 $f2,0x68($sp)
/* f101d48: 0002a400 */ sll $s4,$v0,0x10
/* f101d4c: 00147c03 */ sra $t7,$s4,0x10

View File

@ -915,7 +915,7 @@ glabel var7f1b50c8
.L0f11fabc:
/* f11fabc: 00608825 */ or $s1,$v1,$zero
/* f11fac0: 24630008 */ addiu $v1,$v1,0x8
/* f11fac4: 0c002f22 */ jal viGetViewX
/* f11fac4: 0c002f22 */ jal viGetViewWidth
/* f11fac8: afa306b0 */ sw $v1,0x6b0($sp)
/* f11facc: 0c002f40 */ jal viGetViewLeft
/* f11fad0: a7a2007a */ sh $v0,0x7a($sp)
@ -923,7 +923,7 @@ glabel var7f1b50c8
/* f11fad8: a7a2007c */ sh $v0,0x7c($sp)
/* f11fadc: 00028400 */ sll $s0,$v0,0x10
/* f11fae0: 00106403 */ sra $t4,$s0,0x10
/* f11fae4: 0c002f26 */ jal viGetViewY
/* f11fae4: 0c002f26 */ jal viGetViewHeight
/* f11fae8: 01808025 */ or $s0,$t4,$zero
/* f11faec: 87ad007c */ lh $t5,0x7c($sp)
/* f11faf0: 87ae007a */ lh $t6,0x7a($sp)
@ -7186,9 +7186,9 @@ glabel func0f125948
/* f12595c: afa60030 */ sw $a2,0x30($sp)
/* f125960: 0c002f44 */ jal viGetViewTop
/* f125964: afa20024 */ sw $v0,0x24($sp)
/* f125968: 0c002f22 */ jal viGetViewX
/* f125968: 0c002f22 */ jal viGetViewWidth
/* f12596c: afa20020 */ sw $v0,0x20($sp)
/* f125970: 0c002f26 */ jal viGetViewY
/* f125970: 0c002f26 */ jal viGetViewHeight
/* f125974: afa2001c */ sw $v0,0x1c($sp)
/* f125978: 8fa30024 */ lw $v1,0x24($sp)
/* f12597c: 8fa4002c */ lw $a0,0x2c($sp)
@ -7319,9 +7319,9 @@ glabel var7f1b5108
/* f125b24: afa30128 */ sw $v1,0x128($sp)
/* f125b28: 0c002f44 */ jal viGetViewTop
/* f125b2c: a7a20166 */ sh $v0,0x166($sp)
/* f125b30: 0c002f22 */ jal viGetViewX
/* f125b30: 0c002f22 */ jal viGetViewWidth
/* f125b34: a7a20164 */ sh $v0,0x164($sp)
/* f125b38: 0c002f26 */ jal viGetViewY
/* f125b38: 0c002f26 */ jal viGetViewHeight
/* 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 viGetViewX
/* f1264a0: 0c002f22 */ jal viGetViewWidth
/* f1264a4: 00000000 */ nop
/* 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 viGetViewY
/* f1264d0: 0c002f26 */ jal viGetViewHeight
/* 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 viGetViewX
/* f126a98: 0c002f22 */ jal viGetViewWidth
/* f126a9c: 00000000 */ nop
/* 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 viGetViewY
/* f126ab8: 0c002f26 */ jal viGetViewHeight
/* f126abc: 460a3501 */ sub.s $f20,$f6,$f10
/* f126ac0: 44822000 */ mtc1 $v0,$f4
/* f126ac4: c7aa0198 */ lwc1 $f10,0x198($sp)
@ -8488,9 +8488,9 @@ glabel func0f126c3c
/* f126ca8: 00000000 */ nop
/* f126cac: 0c002f44 */ jal viGetViewTop
/* f126cb0: a7a2005a */ sh $v0,0x5a($sp)
/* f126cb4: 0c002f22 */ jal viGetViewX
/* f126cb4: 0c002f22 */ jal viGetViewWidth
/* f126cb8: a7a20058 */ sh $v0,0x58($sp)
/* f126cbc: 0c002f26 */ jal viGetViewY
/* f126cbc: 0c002f26 */ jal viGetViewHeight
/* 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 viGetViewX
/* f1277e8: 0c002f22 */ jal viGetViewWidth
/* f1277ec: 26100008 */ addiu $s0,$s0,0x8
/* f1277f0: 0c002f40 */ jal viGetViewLeft
/* f1277f4: a7a20022 */ sh $v0,0x22($sp)
/* f1277f8: 0c002f44 */ jal viGetViewTop
/* f1277fc: a7a20024 */ sh $v0,0x24($sp)
/* f127800: 0c002f26 */ jal viGetViewY
/* f127800: 0c002f26 */ jal viGetViewHeight
/* f127804: a7a20026 */ sh $v0,0x26($sp)
/* f127808: 87ae0024 */ lh $t6,0x24($sp)
/* f12780c: 87af0022 */ lh $t7,0x22($sp)

View File

@ -914,7 +914,7 @@ glabel var7f1b57bc
/* f1368c4: 0c002f40 */ jal viGetViewLeft
/* f1368c8: 00008825 */ or $s1,$zero,$zero
/* f1368cc: 44822000 */ mtc1 $v0,$f4
/* f1368d0: 0c002f22 */ jal viGetViewX
/* f1368d0: 0c002f22 */ jal viGetViewWidth
/* f1368d4: 46802520 */ cvt.s.w $f20,$f4
/* f1368d8: 44823000 */ mtc1 $v0,$f6
/* f1368dc: 00000000 */ nop
@ -922,7 +922,7 @@ glabel var7f1b57bc
/* f1368e4: 0c002f44 */ jal viGetViewTop
/* f1368e8: 46144600 */ add.s $f24,$f8,$f20
/* f1368ec: 44825000 */ mtc1 $v0,$f10
/* f1368f0: 0c002f26 */ jal viGetViewY
/* f1368f0: 0c002f26 */ jal viGetViewHeight
/* f1368f4: 468055a0 */ cvt.s.w $f22,$f10
/* f1368f8: 3c13800a */ lui $s3,%hi(g_Vars)
/* f1368fc: 26739fc0 */ addiu $s3,$s3,%lo(g_Vars)

View File

@ -313,12 +313,12 @@ glabel func0f13c780
/* f13c888: 02002825 */ or $a1,$s0,$zero
/* f13c88c: 0c005680 */ jal func00015a00
/* f13c890: 27a600f8 */ addiu $a2,$sp,0xf8
/* f13c894: 0c002f22 */ jal viGetViewX
/* f13c894: 0c002f22 */ jal viGetViewWidth
/* f13c898: 00000000 */ nop
/* f13c89c: 44822000 */ mtc1 $v0,$f4
/* f13c8a0: 00000000 */ nop
/* f13c8a4: 468021a0 */ cvt.s.w $f6,$f4
/* f13c8a8: 0c002f26 */ jal viGetViewY
/* f13c8a8: 0c002f26 */ jal viGetViewHeight
/* f13c8ac: e7a601bc */ swc1 $f6,0x1bc($sp)
/* f13c8b0: 44824000 */ mtc1 $v0,$f8
/* f13c8b4: 00000000 */ nop
@ -1711,7 +1711,7 @@ glabel func0f13d568
/* f13dce0: 46045682 */ mul.s $f26,$f10,$f4
/* f13dce4: 0fc2d60a */ jal currentPlayerGetPerspAspect
/* f13dce8: 00000000 */ nop
/* f13dcec: 0c002f22 */ jal viGetViewX
/* f13dcec: 0c002f22 */ jal viGetViewWidth
/* 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 viGetViewY
/* f13dd10: 0c002f26 */ jal viGetViewHeight
/* f13dd14: 00000000 */ nop
/* f13dd18: 44822000 */ mtc1 $v0,$f4
/* f13dd1c: 3c017f1b */ lui $at,%hi(var7f1b5a08)

View File

@ -699,9 +699,9 @@ glabel hudRenderMotionBlur
/* f142474: afa5007c */ sw $a1,0x7c($sp)
/* f142478: 0c002f44 */ jal viGetViewTop
/* f14247c: 0040b025 */ or $s6,$v0,$zero
/* f142480: 0c002f26 */ jal viGetViewY
/* f142480: 0c002f26 */ jal viGetViewHeight
/* f142484: 00409825 */ or $s3,$v0,$zero
/* f142488: 0c002f22 */ jal viGetViewX
/* f142488: 0c002f22 */ jal viGetViewWidth
/* f14248c: afa2006c */ sw $v0,0x6c($sp)
/* f142490: 0c002f40 */ jal viGetViewLeft
/* f142494: 0040a025 */ or $s4,$v0,$zero
@ -828,8 +828,8 @@ Gfx *hudRenderStatic(Gfx *gdl, u32 arg1, s32 arg2)
{
s32 unk28 = vi2GetUnk28();
s32 top = viGetViewTop();
s32 y = viGetViewY();
s32 x = viGetViewX();
s32 y = viGetViewHeight();
s32 x = viGetViewWidth();
s32 left = viGetViewLeft();
s32 rand = random() & 0xfff00 | 0x80000000;
s32 ypos;
@ -853,8 +853,8 @@ Gfx *hudRenderSlayerRocketLens(Gfx *gdl, u32 colour, u32 alpha)
{
s32 sp7c = viGetUnk28();
s32 viewtop = viGetViewTop();
s32 viewheight = viGetViewY();
s32 viewwidth = viGetViewX();
s32 viewheight = viGetViewHeight();
s32 viewwidth = viGetViewWidth();
s32 y;
s32 viewleft = viGetViewLeft();
f32 angle = 0.52359879016876f;
@ -919,9 +919,9 @@ glabel func0f14298c
/* f1429c8: f7b40028 */ sdc1 $f20,0x28($sp)
/* f1429cc: 0c002f44 */ jal viGetViewTop
/* f1429d0: afa2008c */ sw $v0,0x8c($sp)
/* f1429d4: 0c002f26 */ jal viGetViewY
/* f1429d4: 0c002f26 */ jal viGetViewHeight
/* f1429d8: afa20088 */ sw $v0,0x88($sp)
/* f1429dc: 0c002f22 */ jal viGetViewX
/* f1429dc: 0c002f22 */ jal viGetViewWidth
/* f1429e0: 00408825 */ or $s1,$v0,$zero
/* f1429e4: 0c002f40 */ jal viGetViewLeft
/* f1429e8: afa2007c */ sw $v0,0x7c($sp)
@ -1088,9 +1088,9 @@ glabel func0f142bf0
/* f142c30: f7b40028 */ sdc1 $f20,0x28($sp)
/* f142c34: 0c002f44 */ jal viGetViewTop
/* f142c38: 0040b025 */ or $s6,$v0,$zero
/* f142c3c: 0c002f26 */ jal viGetViewY
/* f142c3c: 0c002f26 */ jal viGetViewHeight
/* f142c40: 0040a825 */ or $s5,$v0,$zero
/* f142c44: 0c002f22 */ jal viGetViewX
/* f142c44: 0c002f22 */ jal viGetViewWidth
/* f142c48: afa20064 */ sw $v0,0x64($sp)
/* f142c4c: 0c002f40 */ jal viGetViewLeft
/* f142c50: 00409825 */ or $s3,$v0,$zero
@ -1258,7 +1258,7 @@ glabel var7f1b5f48
/* f142e54: afa7013c */ sw $a3,0x13c($sp)
/* f142e58: 0c002f44 */ jal viGetViewTop
/* f142e5c: afa2012c */ sw $v0,0x12c($sp)
/* f142e60: 0c002f26 */ jal viGetViewY
/* f142e60: 0c002f26 */ jal viGetViewHeight
/* f142e64: afa20128 */ sw $v0,0x128($sp)
/* f142e68: 44822000 */ mtc1 $v0,$f4
/* f142e6c: 3c013f00 */ lui $at,0x3f00
@ -1269,7 +1269,7 @@ glabel var7f1b5f48
/* f142e80: 461ce200 */ add.s $f8,$f28,$f28
/* f142e84: 461ce602 */ mul.s $f24,$f28,$f28
/* f142e88: 46004287 */ neg.s $f10,$f8
/* f142e8c: 0c002f22 */ jal viGetViewX
/* f142e8c: 0c002f22 */ jal viGetViewWidth
/* f142e90: 46025683 */ div.s $f26,$f10,$f2
/* f142e94: 0c002f40 */ jal viGetViewLeft
/* f142e98: 0040b025 */ or $s6,$v0,$zero
@ -1988,9 +1988,9 @@ glabel var7f1b5f58
/* f1438b0: afb00038 */ sw $s0,0x38($sp)
/* f1438b4: 0c002f44 */ jal viGetViewTop
/* f1438b8: afa20304 */ sw $v0,0x304($sp)
/* f1438bc: 0c002f22 */ jal viGetViewX
/* f1438bc: 0c002f22 */ jal viGetViewWidth
/* f1438c0: afa20300 */ sw $v0,0x300($sp)
/* f1438c4: 0c002f26 */ jal viGetViewY
/* f1438c4: 0c002f26 */ jal viGetViewHeight
/* f1438c8: 00408825 */ or $s1,$v0,$zero
/* f1438cc: 8fae0300 */ lw $t6,0x300($sp)
/* f1438d0: 44806000 */ mtc1 $zero,$f12
@ -5926,8 +5926,8 @@ glabel var7f1b5f58
// char text[256]; // 308
// s32 viewleft = viGetViewLeft(); // 304
// s32 viewtop = viGetViewTop(); // 300
// s32 viewwidth = viGetViewX(); // s1
// s32 viewheight = viGetViewY(); // 2f8
// s32 viewwidth = viGetViewWidth(); // s1
// s32 viewheight = viGetViewHeight(); // 2f8
// s32 viewright = viewleft + viewwidth - 1;
// s32 viewbottom = viewtop + viewheight - 1; // 2f0
// s32 x; // 2ec
@ -6927,9 +6927,9 @@ glabel func0f1472fc
/* f147328: afb00030 */ sw $s0,0x30($sp)
/* f14732c: 0c002ac7 */ jal viGetUnk28
/* f147330: f7b40028 */ sdc1 $f20,0x28($sp)
/* f147334: 0c002f26 */ jal viGetViewY
/* f147334: 0c002f26 */ jal viGetViewHeight
/* f147338: afa2005c */ sw $v0,0x5c($sp)
/* f14733c: 0c002f22 */ jal viGetViewX
/* f14733c: 0c002f22 */ jal viGetViewWidth
/* f147340: 00408025 */ or $s0,$v0,$zero
/* f147344: 0c002f44 */ jal viGetViewTop
/* f147348: 0040b025 */ or $s6,$v0,$zero
@ -7103,9 +7103,9 @@ glabel func0f147578
/* f1475a8: f7b60030 */ sdc1 $f22,0x30($sp)
/* f1475ac: 0c002ac7 */ jal viGetUnk28
/* f1475b0: f7b40028 */ sdc1 $f20,0x28($sp)
/* f1475b4: 0c002f26 */ jal viGetViewY
/* f1475b4: 0c002f26 */ jal viGetViewHeight
/* f1475b8: 0040f025 */ or $s8,$v0,$zero
/* f1475bc: 0c002f22 */ jal viGetViewX
/* f1475bc: 0c002f22 */ jal viGetViewWidth
/* f1475c0: 00409825 */ or $s3,$v0,$zero
/* f1475c4: 0c002f44 */ jal viGetViewTop
/* f1475c8: afa200dc */ sw $v0,0xdc($sp)
@ -7484,9 +7484,9 @@ glabel func0f147578
/* f147b40: afa5008c */ sw $a1,0x8c($sp)
/* f147b44: 0c002f44 */ jal viGetViewTop
/* f147b48: 0040b025 */ or $s6,$v0,$zero
/* f147b4c: 0c002f26 */ jal viGetViewY
/* f147b4c: 0c002f26 */ jal viGetViewHeight
/* f147b50: afa20080 */ sw $v0,0x80($sp)
/* f147b54: 0c002f22 */ jal viGetViewX
/* f147b54: 0c002f22 */ jal viGetViewWidth
/* f147b58: afa2007c */ sw $v0,0x7c($sp)
/* f147b5c: 0c002f40 */ jal viGetViewLeft
/* f147b60: 0040a025 */ or $s4,$v0,$zero
@ -7607,8 +7607,8 @@ Gfx *func0f147cf8(Gfx *gdl)
{
s32 unk28 = viGetUnk28();
s32 top = viGetViewTop();
s32 y = viGetViewY();
s32 x = viGetViewX();
s32 y = viGetViewHeight();
s32 x = viGetViewWidth();
s32 left = viGetViewLeft();
s32 ypos;
@ -7639,8 +7639,8 @@ Gfx *hudRenderHorizonScanner(Gfx *gdl)
{
s32 sp194 = viGetUnk28();
s32 viewtop = viGetViewTop();
s32 viewheight = viGetViewY();
s32 viewwidth = viGetViewX();
s32 viewheight = viGetViewHeight();
s32 viewwidth = viGetViewWidth();
s32 viewleft = viGetViewLeft();
char directiontext[32];
char hertztext[24];
@ -7857,9 +7857,9 @@ glabel func0f14886c
/* f148890: afb20030 */ sw $s2,0x30($sp)
/* f148894: afb1002c */ sw $s1,0x2c($sp)
/* f148898: afb00028 */ sw $s0,0x28($sp)
/* f14889c: 0c002f26 */ jal viGetViewY
/* f14889c: 0c002f26 */ jal viGetViewHeight
/* f1488a0: f7b40020 */ sdc1 $f20,0x20($sp)
/* f1488a4: 0c002f22 */ jal viGetViewX
/* f1488a4: 0c002f22 */ jal viGetViewWidth
/* f1488a8: 00408025 */ or $s0,$v0,$zero
/* f1488ac: 0c002f44 */ jal viGetViewTop
/* f1488b0: afa200a8 */ sw $v0,0xa8($sp)

View File

@ -15294,7 +15294,7 @@ glabel func0f164748
.L0f164808:
/* f164808: 0c002f40 */ jal viGetViewLeft
/* f16480c: 00000000 */ nop
/* f164810: 0c002f22 */ jal viGetViewX
/* f164810: 0c002f22 */ jal viGetViewWidth
/* f164814: a7a20022 */ sh $v0,0x22($sp)
/* f164818: 87ae0022 */ lh $t6,0x22($sp)
/* f16481c: 44801000 */ mtc1 $zero,$f2
@ -15318,7 +15318,7 @@ glabel func0f164748
.L0f164860:
/* f164860: 0c002f44 */ jal viGetViewTop
/* f164864: 00000000 */ nop
/* f164868: 0c002f26 */ jal viGetViewY
/* f164868: 0c002f26 */ jal viGetViewHeight
/* f16486c: a7a20022 */ sh $v0,0x22($sp)
/* f164870: 87b80022 */ lh $t8,0x22($sp)
/* f164874: 44801000 */ mtc1 $zero,$f2

View File

@ -529,8 +529,8 @@ Gfx *fadeRender(Gfx *gdl)
gDPFillRectangle(gdl++,
viGetViewLeft(),
viGetViewTop() + inset,
viGetViewLeft() + viGetViewX() + 1,
viGetViewTop() + viGetViewY() - inset + 2);
viGetViewLeft() + viGetViewWidth() + 1,
viGetViewTop() + viGetViewHeight() - inset + 2);
return func0f153838(gdl);
}
@ -1419,8 +1419,8 @@ Gfx *renderFrame(Gfx *gdl)
gDPSetScissorFrac(gdl++, 0,
viGetViewLeft() * 4.0f, viGetViewTop() * 4.0f,
(viGetViewLeft() + viGetViewX()) * 4.0f,
(viGetViewTop() + viGetViewY()) * 4.0f);
(viGetViewLeft() + viGetViewWidth()) * 4.0f,
(viGetViewTop() + viGetViewHeight()) * 4.0f);
gdl = titleRender(gdl);
gdl = fadeRender(gdl);
@ -1767,8 +1767,8 @@ Gfx *renderFrame(Gfx *gdl)
gDPFillRectangle(gdl++,
viGetViewLeft(),
viGetViewTop(),
viGetViewLeft() + viGetViewX(),
viGetViewTop() + viGetViewY());
viGetViewLeft() + viGetViewWidth(),
viGetViewTop() + viGetViewHeight());
gdl = func0f153838(gdl);
}
@ -1966,8 +1966,8 @@ Gfx *renderFrame(Gfx *gdl)
gdl = func0f153628(gdl);
gdl = func0f153a34(gdl,
viGetViewLeft(), viGetViewTop(),
viGetViewLeft() + viGetViewX(),
viGetViewTop() + viGetViewY(), 0xffffff00 | alpha);
viGetViewLeft() + viGetViewWidth(),
viGetViewTop() + viGetViewHeight(), 0xffffff00 | alpha);
gdl = func0f153780(gdl);
}
}

View File

@ -839,7 +839,7 @@ glabel scenarioHtbCallback18
/* f1807b4: 8fbf003c */ lw $ra,0x3c($sp)
/* f1807b8: 0c002f40 */ jal viGetViewLeft
/* f1807bc: 00000000 */ nop
/* f1807c0: 0c002f22 */ jal viGetViewX
/* f1807c0: 0c002f22 */ jal viGetViewWidth
/* f1807c4: a7a2004a */ sh $v0,0x4a($sp)
/* f1807c8: 87af004a */ lh $t7,0x4a($sp)
/* f1807cc: 04410003 */ bgez $v0,.L0f1807dc
@ -2557,7 +2557,7 @@ glabel scenarioKohCallback18
/* f1826b4: 8fbf003c */ lw $ra,0x3c($sp)
/* f1826b8: 0c002f40 */ jal viGetViewLeft
/* f1826bc: 00000000 */ nop
/* f1826c0: 0c002f22 */ jal viGetViewX
/* f1826c0: 0c002f22 */ jal viGetViewWidth
/* f1826c4: a7a2004e */ sh $v0,0x4e($sp)
/* f1826c8: 87aa004e */ lh $t2,0x4e($sp)
/* f1826cc: 04410003 */ bgez $v0,.L0f1826dc
@ -3726,12 +3726,12 @@ glabel scenarioHtmCallback18
/* f183a04: afa2005c */ sw $v0,0x5c($sp)
/* f183a08: 00028c00 */ sll $s1,$v0,0x10
/* f183a0c: 00115403 */ sra $t2,$s1,0x10
/* f183a10: 0c002f22 */ jal viGetViewX
/* f183a10: 0c002f22 */ jal viGetViewWidth
/* f183a14: 01408825 */ or $s1,$t2,$zero
/* f183a18: 00515821 */ addu $t3,$v0,$s1
/* f183a1c: 0c002f44 */ jal viGetViewTop
/* f183a20: afab0058 */ sw $t3,0x58($sp)
/* f183a24: 0c002f22 */ jal viGetViewX
/* f183a24: 0c002f22 */ jal viGetViewWidth
/* f183a28: afa20054 */ sw $v0,0x54($sp)
/* f183a2c: 8fac005c */ lw $t4,0x5c($sp)
/* f183a30: 8fad0058 */ lw $t5,0x58($sp)
@ -4842,7 +4842,7 @@ glabel scenarioPacCallback18
/* f184a6c: 01ac1823 */ subu $v1,$t5,$t4
/* f184a70: 0c002f40 */ jal viGetViewLeft
/* f184a74: afa300a0 */ sw $v1,0xa0($sp)
/* f184a78: 0c002f22 */ jal viGetViewX
/* f184a78: 0c002f22 */ jal viGetViewWidth
/* f184a7c: a7a20046 */ sh $v0,0x46($sp)
/* f184a80: 87b80046 */ lh $t8,0x46($sp)
/* f184a84: 8fa300a0 */ lw $v1,0xa0($sp)
@ -5746,13 +5746,13 @@ glabel func0f185774
/* f185a38: ac640004 */ sw $a0,0x4($v1)
/* f185a3c: 0c002f40 */ jal viGetViewLeft
/* f185a40: afa50030 */ sw $a1,0x30($sp)
/* f185a44: 0c002f22 */ jal viGetViewX
/* f185a44: 0c002f22 */ jal viGetViewWidth
/* f185a48: afa2002c */ sw $v0,0x2c($sp)
/* f185a4c: 8fa6002c */ lw $a2,0x2c($sp)
/* f185a50: 00463821 */ addu $a3,$v0,$a2
/* f185a54: 0c002f44 */ jal viGetViewTop
/* f185a58: afa70028 */ sw $a3,0x28($sp)
/* f185a5c: 0c002f26 */ jal viGetViewY
/* f185a5c: 0c002f26 */ jal viGetViewHeight
/* f185a60: afa20024 */ sw $v0,0x24($sp)
/* f185a64: 8faf0018 */ lw $t7,0x18($sp)
/* f185a68: 3c09800a */ lui $t1,%hi(g_Vars)

View File

@ -1372,7 +1372,7 @@ glabel func0f18f874
/* f18fa0c: afa6003c */ sw $a2,0x3c($sp)
/* f18fa10: 00028400 */ sll $s0,$v0,0x10
/* f18fa14: 00105c03 */ sra $t3,$s0,0x10
/* f18fa18: 0c002f22 */ jal viGetViewX
/* f18fa18: 0c002f22 */ jal viGetViewWidth
/* f18fa1c: 01608025 */ or $s0,$t3,$zero
/* f18fa20: 3c0d8008 */ lui $t5,%hi(g_ScreenWidthMultiplier)
/* f18fa24: 8dadfac0 */ lw $t5,%lo(g_ScreenWidthMultiplier)($t5)

View File

@ -2176,7 +2176,7 @@ glabel func0f18973c
/* f1897c0: 00402825 */ or $a1,$v0,$zero
/* f1897c4: 0c002f40 */ jal viGetViewLeft
/* f1897c8: 00000000 */ nop
/* f1897cc: 0c002f22 */ jal viGetViewX
/* f1897cc: 0c002f22 */ jal viGetViewWidth
/* f1897d0: a7a20042 */ sh $v0,0x42($sp)
/* f1897d4: 87a80042 */ lh $t0,0x42($sp)
/* f1897d8: 3c0a800a */ lui $t2,%hi(g_Vars+0x288)
@ -2209,7 +2209,7 @@ glabel func0f18973c
.L0f189840:
/* f189840: 0c002f44 */ jal viGetViewTop
/* f189844: 00000000 */ nop
/* f189848: 0c002f26 */ jal viGetViewY
/* f189848: 0c002f26 */ jal viGetViewHeight
/* f18984c: a7a20042 */ sh $v0,0x42($sp)
/* f189850: 87b80042 */ lh $t8,0x42($sp)
/* f189854: 04410003 */ bgez $v0,.L0f189864
@ -2333,7 +2333,7 @@ glabel func0f18973c
/* f189a10: 00402825 */ or $a1,$v0,$zero
/* f189a14: 0c002f40 */ jal viGetViewLeft
/* f189a18: 00000000 */ nop
/* f189a1c: 0c002f22 */ jal viGetViewX
/* f189a1c: 0c002f22 */ jal viGetViewWidth
/* f189a20: a7a20042 */ sh $v0,0x42($sp)
/* f189a24: 87b80042 */ lh $t8,0x42($sp)
/* f189a28: 04410003 */ bgez $v0,.L0f189a38
@ -2344,7 +2344,7 @@ glabel func0f18973c
/* f189a38: 01f8c821 */ addu $t9,$t7,$t8
/* f189a3c: 0c002f44 */ jal viGetViewTop
/* f189a40: afb90094 */ sw $t9,0x94($sp)
/* f189a44: 0c002f26 */ jal viGetViewY
/* f189a44: 0c002f26 */ jal viGetViewHeight
/* f189a48: a7a20042 */ sh $v0,0x42($sp)
/* f189a4c: 87aa0042 */ lh $t2,0x42($sp)
/* f189a50: 3c0b8008 */ lui $t3,%hi(var8007fb0c)
@ -2405,7 +2405,7 @@ glabel func0f18973c
/* f189b24: 00000000 */ nop
/* f189b28: 0c002f44 */ jal viGetViewTop
/* f189b2c: 00000000 */ nop
/* f189b30: 0c002f26 */ jal viGetViewY
/* f189b30: 0c002f26 */ jal viGetViewHeight
/* f189b34: a7a20042 */ sh $v0,0x42($sp)
/* f189b38: 87ae0042 */ lh $t6,0x42($sp)
/* f189b3c: 8fb80098 */ lw $t8,0x98($sp)
@ -2419,7 +2419,7 @@ glabel func0f18973c
/* f189b58: 27280002 */ addiu $t0,$t9,0x2
/* f189b5c: 0c002f40 */ jal viGetViewLeft
/* f189b60: afa8004c */ sw $t0,0x4c($sp)
/* f189b64: 0c002f22 */ jal viGetViewX
/* f189b64: 0c002f22 */ jal viGetViewWidth
/* f189b68: a7a20042 */ sh $v0,0x42($sp)
/* f189b6c: 87a90042 */ lh $t1,0x42($sp)
/* f189b70: 3c0d800a */ lui $t5,%hi(g_Vars+0x284)

View File

@ -47325,14 +47325,14 @@ glabel var7f1ab1a8
/* f0908d8: c424990c */ lwc1 $f4,%lo(g_CountdownTimerValue)($at)
/* f0908dc: 0c002f40 */ jal viGetViewLeft
/* f0908e0: e7a4004c */ swc1 $f4,0x4c($sp)
/* f0908e4: 0c002f22 */ jal viGetViewX
/* f0908e4: 0c002f22 */ jal viGetViewWidth
/* 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 viGetViewTop
/* f0908fc: afb90044 */ sw $t9,0x44($sp)
/* f090900: 0c002f26 */ jal viGetViewY
/* f090900: 0c002f26 */ jal viGetViewHeight
/* f090904: a7a20036 */ sh $v0,0x36($sp)
/* f090908: 87a90036 */ lh $t1,0x36($sp)
/* f09090c: 3c06800a */ lui $a2,%hi(g_Vars)

View File

@ -3453,7 +3453,7 @@ Gfx *titleRenderRarePresents(Gfx *gdl)
gdl = func0f153628(gdl);
sp84 = viGetViewLeft() + 50;
sp80 = viGetViewTop() + viGetViewY() - 80;
sp80 = viGetViewTop() + viGetViewHeight() - 80;
var80062868 = 0;
@ -3462,7 +3462,7 @@ Gfx *titleRenderRarePresents(Gfx *gdl)
if (g_TitleTimer > 70) {
sp84 = viGetViewLeft() + 50;
sp80 = viGetViewTop() + viGetViewY() - 60;
sp80 = viGetViewTop() + viGetViewHeight() - 60;
gdl = func0f018ebc(gdl, &sp84, &sp80, L_OPTIONS(6), g_TitleTimer - 100, &sp76); // " prehistory"
}
} else {
@ -3495,8 +3495,8 @@ Gfx *titleRenderRarePresents(Gfx *gdl)
u32 stack;
gdl = func0f153a34(gdl, viGetViewLeft(), viGetViewTop(),
viGetViewLeft() + viGetViewX(),
viGetViewTop() + viGetViewY(),
viGetViewLeft() + viGetViewWidth(),
viGetViewTop() + viGetViewHeight(),
255.0f * tmp2);
}

View File

@ -5411,7 +5411,7 @@ Gfx *frRenderHud(Gfx *gdl)
s32 alpha = 0xa0;
f32 mult;
if (viGetViewX() > 400) {
if (viGetViewWidth() > 400) {
mult = 2;
} else {
mult = 1;
@ -5431,7 +5431,7 @@ Gfx *frRenderHud(Gfx *gdl)
red = frFormatTime(string1);
exists = frGetHudMiddleSubtext(string2);
gdl = frRenderHudElement(gdl, viGetViewX() >> 1, viGetViewTop() + 12,
gdl = frRenderHudElement(gdl, viGetViewWidth() >> 1, viGetViewTop() + 12,
string1, exists ? string2 : NULL,
red ? 0xff000000 | 0xa0 : 0x00ff0000 | 0xa0,
alpha);
@ -5451,7 +5451,7 @@ Gfx *frRenderHud(Gfx *gdl)
if (g_FrData.goalaccuracy > 0) {
red = frGetMinAccuracy(string2, frGetAccuracy(string1));
gdl = frRenderHudElement(gdl, viGetViewLeft() + viGetViewX() - 70.0f * mult, viGetViewTop() + 12,
gdl = frRenderHudElement(gdl, viGetViewLeft() + viGetViewWidth() - 70.0f * mult, viGetViewTop() + 12,
string1, string2,
red ? 0xff000000 | 0xa0 : 0x00ff0000 | 0xa0,
alpha);
@ -5463,7 +5463,7 @@ Gfx *frRenderHud(Gfx *gdl)
mult = 2.4;
}
gdl = frRenderHudElement(gdl, viGetViewLeft() + viGetViewX() - 70.0f * mult, viGetViewTop() + 12,
gdl = frRenderHudElement(gdl, viGetViewLeft() + viGetViewWidth() - 70.0f * mult, viGetViewTop() + 12,
string1, string2, 0x00ff00a0, alpha);
}

View File

@ -42,8 +42,8 @@ void viSetXY(s16 x, s16 y);
s16 viGetX(void);
s16 viGetY(void);
void viSetViewSize(s16 x, s16 y);
s16 viGetViewX(void);
s16 viGetViewY(void);
s16 viGetViewWidth(void);
s16 viGetViewHeight(void);
void viSetViewPosition(s16 left, s16 top);
s16 viGetViewLeft(void);
s16 viGetViewTop(void);

View File

@ -2212,7 +2212,7 @@ glabel func0000b330
/* b504: ac600004 */ sw $zero,0x4($v1)
/* b508: 24c60008 */ addiu $a2,$a2,0x8
.L0000b50c:
/* b50c: 0c002f26 */ jal viGetViewY
/* b50c: 0c002f26 */ jal viGetViewHeight
/* b510: afa600a8 */ sw $a2,0xa8($sp)
/* b514: 0c002f44 */ jal viGetViewTop
/* b518: a7a20042 */ sh $v0,0x42($sp)
@ -2244,7 +2244,7 @@ glabel func0000b330
/* b580: 01b8c825 */ or $t9,$t5,$t8
/* b584: 0c002f44 */ jal viGetViewTop
/* b588: add90000 */ sw $t9,0x0($t6)
/* b58c: 0c002f26 */ jal viGetViewY
/* b58c: 0c002f26 */ jal viGetViewHeight
/* b590: a7a20056 */ sh $v0,0x56($sp)
/* b594: 87af0056 */ lh $t7,0x56($sp)
/* b598: 8fa600a8 */ lw $a2,0xa8($sp)
@ -2718,18 +2718,12 @@ void viSetViewSize(s16 x, s16 y)
currentPlayerSetCameraScale();
}
/**
* This is actually the width.
*/
s16 viGetViewX(void)
s16 viGetViewWidth(void)
{
return g_ViData->viewx;
}
/**
* This is actually the height.
*/
s16 viGetViewY(void)
s16 viGetViewHeight(void)
{
return g_ViData->viewy;
}