diff --git a/src/game/chr/chr.c b/src/game/chr/chr.c index 399cdbf4d..465b3b3cd 100644 --- a/src/game/chr/chr.c +++ b/src/game/chr/chr.c @@ -15096,7 +15096,7 @@ glabel func0f02bdf8 /* f02c568: 02208025 */ or $s0,$s1,$zero /* f02c56c: ac800004 */ sw $zero,0x4($a0) /* f02c570: ac990000 */ sw $t9,0x0($a0) -/* f02c574: 0c002ef1 */ jal func0000bbc4 +/* f02c574: 0c002ef1 */ jal viGetBufX /* f02c578: 26310008 */ addiu $s1,$s1,0x8 /* f02c57c: 244cffff */ addiu $t4,$v0,-1 /* f02c580: 318d0fff */ andi $t5,$t4,0xfff diff --git a/src/game/game_0dcdb0.c b/src/game/game_0dcdb0.c index cf18eb156..9dea9e541 100644 --- a/src/game/game_0dcdb0.c +++ b/src/game/game_0dcdb0.c @@ -3830,7 +3830,7 @@ glabel var7f1adef4 /* f0dfe1c: 330f0fff */ andi $t7,$t8,0xfff /* f0dfe20: 000fcb00 */ sll $t9,$t7,0xc /* f0dfe24: 03214025 */ or $t0,$t9,$at -/* f0dfe28: 0c002ef5 */ jal func0000bbd4 +/* f0dfe28: 0c002ef5 */ jal viGetBufY /* f0dfe2c: ae280000 */ sw $t0,0x0($s1) /* f0dfe30: 8fa900e8 */ lw $t1,0xe8($sp) /* f0dfe34: 960b001c */ lhu $t3,0x1c($s0) diff --git a/src/game/game_0e5ce0.c b/src/game/game_0e5ce0.c index 40f12d2cb..09d48c045 100644 --- a/src/game/game_0e5ce0.c +++ b/src/game/game_0e5ce0.c @@ -4706,47 +4706,47 @@ glabel menuRenderItemCustom /* f0e6490: 00000000 */ sll $zero,$zero,0x0 /* f0e6494: afc00000 */ sw $zero,0x0($s8) .L0f0e6498: -/* f0e6498: 0c002ef1 */ jal func0000bbc4 +/* f0e6498: 0c002ef1 */ jal viGetBufX /* f0e649c: a7a500ee */ sh $a1,0xee($sp) /* f0e64a0: 3c0a8007 */ lui $t2,%hi(var80071190) /* f0e64a4: 8d4a1190 */ lw $t2,%lo(var80071190)($t2) /* f0e64a8: 004a082a */ slt $at,$v0,$t2 /* f0e64ac: 10200005 */ beqz $at,.L0f0e64c4 /* f0e64b0: 00000000 */ sll $zero,$zero,0x0 -/* f0e64b4: 0c002ef1 */ jal func0000bbc4 +/* f0e64b4: 0c002ef1 */ jal viGetBufX /* f0e64b8: 00000000 */ sll $zero,$zero,0x0 /* f0e64bc: 3c018007 */ lui $at,%hi(var80071190) /* f0e64c0: ac221190 */ sw $v0,%lo(var80071190)($at) .L0f0e64c4: -/* f0e64c4: 0c002ef1 */ jal func0000bbc4 +/* f0e64c4: 0c002ef1 */ jal viGetBufX /* f0e64c8: 00000000 */ sll $zero,$zero,0x0 /* f0e64cc: 8eeb0000 */ lw $t3,0x0($s7) /* f0e64d0: 004b082a */ slt $at,$v0,$t3 /* f0e64d4: 10200004 */ beqz $at,.L0f0e64e8 /* f0e64d8: 00000000 */ sll $zero,$zero,0x0 -/* f0e64dc: 0c002ef1 */ jal func0000bbc4 +/* f0e64dc: 0c002ef1 */ jal viGetBufX /* f0e64e0: 00000000 */ sll $zero,$zero,0x0 /* f0e64e4: aee20000 */ sw $v0,0x0($s7) .L0f0e64e8: -/* f0e64e8: 0c002ef5 */ jal func0000bbd4 +/* f0e64e8: 0c002ef5 */ jal viGetBufY /* f0e64ec: 00000000 */ sll $zero,$zero,0x0 /* f0e64f0: 3c0c8007 */ lui $t4,%hi(var80071198) /* f0e64f4: 8d8c1198 */ lw $t4,%lo(var80071198)($t4) /* f0e64f8: 004c082a */ slt $at,$v0,$t4 /* f0e64fc: 10200005 */ beqz $at,.L0f0e6514 /* f0e6500: 00000000 */ sll $zero,$zero,0x0 -/* f0e6504: 0c002ef5 */ jal func0000bbd4 +/* f0e6504: 0c002ef5 */ jal viGetBufY /* f0e6508: 00000000 */ sll $zero,$zero,0x0 /* f0e650c: 3c018007 */ lui $at,%hi(var80071198) /* f0e6510: ac221198 */ sw $v0,%lo(var80071198)($at) .L0f0e6514: -/* f0e6514: 0c002ef5 */ jal func0000bbd4 +/* f0e6514: 0c002ef5 */ jal viGetBufY /* f0e6518: 00000000 */ sll $zero,$zero,0x0 /* f0e651c: 8fc30000 */ lw $v1,0x0($s8) /* f0e6520: 0043082a */ slt $at,$v0,$v1 /* f0e6524: 10200005 */ beqz $at,.L0f0e653c /* f0e6528: 00000000 */ sll $zero,$zero,0x0 -/* f0e652c: 0c002ef5 */ jal func0000bbd4 +/* f0e652c: 0c002ef5 */ jal viGetBufY /* f0e6530: 00000000 */ sll $zero,$zero,0x0 /* f0e6534: afc20000 */ sw $v0,0x0($s8) /* f0e6538: 00401825 */ or $v1,$v0,$zero @@ -5537,47 +5537,47 @@ glabel menuRenderItemCustom /* f0e70a4: 00000000 */ sll $zero,$zero,0x0 /* f0e70a8: afc00000 */ sw $zero,0x0($s8) .L0f0e70ac: -/* f0e70ac: 0c002ef1 */ jal func0000bbc4 +/* f0e70ac: 0c002ef1 */ jal viGetBufX /* f0e70b0: 00000000 */ sll $zero,$zero,0x0 /* f0e70b4: 3c0e8007 */ lui $t6,%hi(var80071190) /* f0e70b8: 8dce1190 */ lw $t6,%lo(var80071190)($t6) /* f0e70bc: 004e082a */ slt $at,$v0,$t6 /* f0e70c0: 10200005 */ beqz $at,.L0f0e70d8 /* f0e70c4: 00000000 */ sll $zero,$zero,0x0 -/* f0e70c8: 0c002ef1 */ jal func0000bbc4 +/* f0e70c8: 0c002ef1 */ jal viGetBufX /* f0e70cc: 00000000 */ sll $zero,$zero,0x0 /* f0e70d0: 3c018007 */ lui $at,%hi(var80071190) /* f0e70d4: ac221190 */ sw $v0,%lo(var80071190)($at) .L0f0e70d8: -/* f0e70d8: 0c002ef1 */ jal func0000bbc4 +/* f0e70d8: 0c002ef1 */ jal viGetBufX /* f0e70dc: 00000000 */ sll $zero,$zero,0x0 /* f0e70e0: 8eef0000 */ lw $t7,0x0($s7) /* f0e70e4: 004f082a */ slt $at,$v0,$t7 /* f0e70e8: 10200004 */ beqz $at,.L0f0e70fc /* f0e70ec: 00000000 */ sll $zero,$zero,0x0 -/* f0e70f0: 0c002ef1 */ jal func0000bbc4 +/* f0e70f0: 0c002ef1 */ jal viGetBufX /* f0e70f4: 00000000 */ sll $zero,$zero,0x0 /* f0e70f8: aee20000 */ sw $v0,0x0($s7) .L0f0e70fc: -/* f0e70fc: 0c002ef5 */ jal func0000bbd4 +/* f0e70fc: 0c002ef5 */ jal viGetBufY /* f0e7100: 00000000 */ sll $zero,$zero,0x0 /* f0e7104: 3c188007 */ lui $t8,%hi(var80071198) /* f0e7108: 8f181198 */ lw $t8,%lo(var80071198)($t8) /* f0e710c: 0058082a */ slt $at,$v0,$t8 /* f0e7110: 10200005 */ beqz $at,.L0f0e7128 /* f0e7114: 00000000 */ sll $zero,$zero,0x0 -/* f0e7118: 0c002ef5 */ jal func0000bbd4 +/* f0e7118: 0c002ef5 */ jal viGetBufY /* f0e711c: 00000000 */ sll $zero,$zero,0x0 /* f0e7120: 3c018007 */ lui $at,%hi(var80071198) /* f0e7124: ac221198 */ sw $v0,%lo(var80071198)($at) .L0f0e7128: -/* f0e7128: 0c002ef5 */ jal func0000bbd4 +/* f0e7128: 0c002ef5 */ jal viGetBufY /* f0e712c: 00000000 */ sll $zero,$zero,0x0 /* f0e7130: 8fc30000 */ lw $v1,0x0($s8) /* f0e7134: 0043082a */ slt $at,$v0,$v1 /* f0e7138: 10200005 */ beqz $at,.L0f0e7150 /* f0e713c: 00000000 */ sll $zero,$zero,0x0 -/* f0e7140: 0c002ef5 */ jal func0000bbd4 +/* f0e7140: 0c002ef5 */ jal viGetBufY /* f0e7144: 00000000 */ sll $zero,$zero,0x0 /* f0e7148: afc20000 */ sw $v0,0x0($s8) /* f0e714c: 00401825 */ or $v1,$v0,$zero @@ -12597,43 +12597,43 @@ glabel menuRenderItemMarquee /* f0ed7b4: 00000000 */ sll $zero,$zero,0x0 /* f0ed7b8: aca00000 */ sw $zero,0x0($a1) .L0f0ed7bc: -/* f0ed7bc: 0c002ef1 */ jal func0000bbc4 +/* f0ed7bc: 0c002ef1 */ jal viGetBufX /* f0ed7c0: 00000000 */ sll $zero,$zero,0x0 /* f0ed7c4: 3c198007 */ lui $t9,%hi(var80071190) /* f0ed7c8: 8f391190 */ lw $t9,%lo(var80071190)($t9) /* f0ed7cc: 0059082a */ slt $at,$v0,$t9 /* f0ed7d0: 10200005 */ beqz $at,.L0f0ed7e8 /* f0ed7d4: 00000000 */ sll $zero,$zero,0x0 -/* f0ed7d8: 0c002ef1 */ jal func0000bbc4 +/* f0ed7d8: 0c002ef1 */ jal viGetBufX /* f0ed7dc: 00000000 */ sll $zero,$zero,0x0 /* f0ed7e0: 3c018007 */ lui $at,%hi(var80071190) /* f0ed7e4: ac221190 */ sw $v0,%lo(var80071190)($at) .L0f0ed7e8: -/* f0ed7e8: 0c002ef1 */ jal func0000bbc4 +/* f0ed7e8: 0c002ef1 */ jal viGetBufX /* f0ed7ec: 00000000 */ sll $zero,$zero,0x0 /* f0ed7f0: 3c088007 */ lui $t0,%hi(var80071194) /* f0ed7f4: 8d081194 */ lw $t0,%lo(var80071194)($t0) /* f0ed7f8: 0048082a */ slt $at,$v0,$t0 /* f0ed7fc: 10200005 */ beqz $at,.L0f0ed814 /* f0ed800: 00000000 */ sll $zero,$zero,0x0 -/* f0ed804: 0c002ef1 */ jal func0000bbc4 +/* f0ed804: 0c002ef1 */ jal viGetBufX /* f0ed808: 00000000 */ sll $zero,$zero,0x0 /* f0ed80c: 3c018007 */ lui $at,%hi(var80071194) /* f0ed810: ac221194 */ sw $v0,%lo(var80071194)($at) .L0f0ed814: -/* f0ed814: 0c002ef5 */ jal func0000bbd4 +/* f0ed814: 0c002ef5 */ jal viGetBufY /* f0ed818: 00000000 */ sll $zero,$zero,0x0 /* f0ed81c: 3c098007 */ lui $t1,%hi(var80071198) /* f0ed820: 8d291198 */ lw $t1,%lo(var80071198)($t1) /* f0ed824: 0049082a */ slt $at,$v0,$t1 /* f0ed828: 10200005 */ beqz $at,.L0f0ed840 /* f0ed82c: 00000000 */ sll $zero,$zero,0x0 -/* f0ed830: 0c002ef5 */ jal func0000bbd4 +/* f0ed830: 0c002ef5 */ jal viGetBufY /* f0ed834: 00000000 */ sll $zero,$zero,0x0 /* f0ed838: 3c018007 */ lui $at,%hi(var80071198) /* f0ed83c: ac221198 */ sw $v0,%lo(var80071198)($at) .L0f0ed840: -/* f0ed840: 0c002ef5 */ jal func0000bbd4 +/* f0ed840: 0c002ef5 */ jal viGetBufY /* f0ed844: 00000000 */ sll $zero,$zero,0x0 /* f0ed848: 3c068007 */ lui $a2,%hi(var8007119c) /* f0ed84c: 24c6119c */ addiu $a2,$a2,%lo(var8007119c) @@ -12641,7 +12641,7 @@ glabel menuRenderItemMarquee /* f0ed854: 0045082a */ slt $at,$v0,$a1 /* f0ed858: 10200009 */ beqz $at,.L0f0ed880 /* f0ed85c: 00000000 */ sll $zero,$zero,0x0 -/* f0ed860: 0c002ef5 */ jal func0000bbd4 +/* f0ed860: 0c002ef5 */ jal viGetBufY /* f0ed864: 00000000 */ sll $zero,$zero,0x0 /* f0ed868: 3c018007 */ lui $at,%hi(var8007119c) /* f0ed86c: ac22119c */ sw $v0,%lo(var8007119c)($at) @@ -13198,43 +13198,43 @@ glabel menuRenderItemRanking /* f0ee04c: 00000000 */ sll $zero,$zero,0x0 /* f0ee050: ae200000 */ sw $zero,0x0($s1) .L0f0ee054: -/* f0ee054: 0c002ef1 */ jal func0000bbc4 +/* f0ee054: 0c002ef1 */ jal viGetBufX /* f0ee058: 00000000 */ sll $zero,$zero,0x0 /* f0ee05c: 8e4c0000 */ lw $t4,0x0($s2) /* f0ee060: 004c082a */ slt $at,$v0,$t4 /* f0ee064: 10200004 */ beqz $at,.L0f0ee078 /* f0ee068: 00000000 */ sll $zero,$zero,0x0 -/* f0ee06c: 0c002ef1 */ jal func0000bbc4 +/* f0ee06c: 0c002ef1 */ jal viGetBufX /* f0ee070: 00000000 */ sll $zero,$zero,0x0 /* f0ee074: ae420000 */ sw $v0,0x0($s2) .L0f0ee078: -/* f0ee078: 0c002ef1 */ jal func0000bbc4 +/* f0ee078: 0c002ef1 */ jal viGetBufX /* f0ee07c: 00000000 */ sll $zero,$zero,0x0 /* f0ee080: 8e0b0000 */ lw $t3,0x0($s0) /* f0ee084: 004b082a */ slt $at,$v0,$t3 /* f0ee088: 10200004 */ beqz $at,.L0f0ee09c /* f0ee08c: 00000000 */ sll $zero,$zero,0x0 -/* f0ee090: 0c002ef1 */ jal func0000bbc4 +/* f0ee090: 0c002ef1 */ jal viGetBufX /* f0ee094: 00000000 */ sll $zero,$zero,0x0 /* f0ee098: ae020000 */ sw $v0,0x0($s0) .L0f0ee09c: -/* f0ee09c: 0c002ef5 */ jal func0000bbd4 +/* f0ee09c: 0c002ef5 */ jal viGetBufY /* f0ee0a0: 00000000 */ sll $zero,$zero,0x0 /* f0ee0a4: 8e6d0000 */ lw $t5,0x0($s3) /* f0ee0a8: 004d082a */ slt $at,$v0,$t5 /* f0ee0ac: 10200004 */ beqz $at,.L0f0ee0c0 /* f0ee0b0: 00000000 */ sll $zero,$zero,0x0 -/* f0ee0b4: 0c002ef5 */ jal func0000bbd4 +/* f0ee0b4: 0c002ef5 */ jal viGetBufY /* f0ee0b8: 00000000 */ sll $zero,$zero,0x0 /* f0ee0bc: ae620000 */ sw $v0,0x0($s3) .L0f0ee0c0: -/* f0ee0c0: 0c002ef5 */ jal func0000bbd4 +/* f0ee0c0: 0c002ef5 */ jal viGetBufY /* f0ee0c4: 00000000 */ sll $zero,$zero,0x0 /* f0ee0c8: 8e240000 */ lw $a0,0x0($s1) /* f0ee0cc: 0044082a */ slt $at,$v0,$a0 /* f0ee0d0: 50200006 */ beqzl $at,.L0f0ee0ec /* f0ee0d4: 8e430000 */ lw $v1,0x0($s2) -/* f0ee0d8: 0c002ef5 */ jal func0000bbd4 +/* f0ee0d8: 0c002ef5 */ jal viGetBufY /* f0ee0dc: 00000000 */ sll $zero,$zero,0x0 /* f0ee0e0: ae220000 */ sw $v0,0x0($s1) /* f0ee0e4: 00402025 */ or $a0,$v0,$zero @@ -14121,48 +14121,48 @@ glabel menuRenderItemPlayerStats /* f0eedec: 00000000 */ sll $zero,$zero,0x0 /* f0eedf0: acc00000 */ sw $zero,0x0($a2) .L0f0eedf4: -/* f0eedf4: 0c002ef1 */ jal func0000bbc4 +/* f0eedf4: 0c002ef1 */ jal viGetBufX /* f0eedf8: 00000000 */ sll $zero,$zero,0x0 /* f0eedfc: 8e0b0000 */ lw $t3,0x0($s0) /* f0eee00: 004b082a */ slt $at,$v0,$t3 /* f0eee04: 10200004 */ beqz $at,.L0f0eee18 /* f0eee08: 00000000 */ sll $zero,$zero,0x0 -/* f0eee0c: 0c002ef1 */ jal func0000bbc4 +/* f0eee0c: 0c002ef1 */ jal viGetBufX /* f0eee10: 00000000 */ sll $zero,$zero,0x0 /* f0eee14: ae020000 */ sw $v0,0x0($s0) .L0f0eee18: -/* f0eee18: 0c002ef1 */ jal func0000bbc4 +/* f0eee18: 0c002ef1 */ jal viGetBufX /* f0eee1c: 00000000 */ sll $zero,$zero,0x0 /* f0eee20: 3c198007 */ lui $t9,%hi(var80071194) /* f0eee24: 8f391194 */ lw $t9,%lo(var80071194)($t9) /* f0eee28: 0059082a */ slt $at,$v0,$t9 /* f0eee2c: 10200005 */ beqz $at,.L0f0eee44 /* f0eee30: 00000000 */ sll $zero,$zero,0x0 -/* f0eee34: 0c002ef1 */ jal func0000bbc4 +/* f0eee34: 0c002ef1 */ jal viGetBufX /* f0eee38: 00000000 */ sll $zero,$zero,0x0 /* f0eee3c: 3c018007 */ lui $at,%hi(var80071194) /* f0eee40: ac221194 */ sw $v0,%lo(var80071194)($at) .L0f0eee44: -/* f0eee44: 0c002ef5 */ jal func0000bbd4 +/* f0eee44: 0c002ef5 */ jal viGetBufY /* f0eee48: 00000000 */ sll $zero,$zero,0x0 /* f0eee4c: 3c0c8007 */ lui $t4,%hi(var80071198) /* f0eee50: 8d8c1198 */ lw $t4,%lo(var80071198)($t4) /* f0eee54: 004c082a */ slt $at,$v0,$t4 /* f0eee58: 10200005 */ beqz $at,.L0f0eee70 /* f0eee5c: 00000000 */ sll $zero,$zero,0x0 -/* f0eee60: 0c002ef5 */ jal func0000bbd4 +/* f0eee60: 0c002ef5 */ jal viGetBufY /* f0eee64: 00000000 */ sll $zero,$zero,0x0 /* f0eee68: 3c018007 */ lui $at,%hi(var80071198) /* f0eee6c: ac221198 */ sw $v0,%lo(var80071198)($at) .L0f0eee70: -/* f0eee70: 0c002ef5 */ jal func0000bbd4 +/* f0eee70: 0c002ef5 */ jal viGetBufY /* f0eee74: 00000000 */ sll $zero,$zero,0x0 /* f0eee78: 3c058007 */ lui $a1,%hi(var8007119c) /* f0eee7c: 8ca5119c */ lw $a1,%lo(var8007119c)($a1) /* f0eee80: 0045082a */ slt $at,$v0,$a1 /* f0eee84: 10200007 */ beqz $at,.L0f0eeea4 /* f0eee88: 00000000 */ sll $zero,$zero,0x0 -/* f0eee8c: 0c002ef5 */ jal func0000bbd4 +/* f0eee8c: 0c002ef5 */ jal viGetBufY /* f0eee90: 00000000 */ sll $zero,$zero,0x0 /* f0eee94: 3c018007 */ lui $at,%hi(var8007119c) /* f0eee98: ac22119c */ sw $v0,%lo(var8007119c)($at) diff --git a/src/game/game_0f09f0.c b/src/game/game_0f09f0.c index 79e82792b..60f49288d 100644 --- a/src/game/game_0f09f0.c +++ b/src/game/game_0f09f0.c @@ -5402,43 +5402,43 @@ glabel func0f0f50fc /* f0f51b0: 00000000 */ sll $zero,$zero,0x0 /* f0f51b4: ace00000 */ sw $zero,0x0($a3) .L0f0f51b8: -/* f0f51b8: 0c002ef1 */ jal func0000bbc4 +/* f0f51b8: 0c002ef1 */ jal viGetBufX /* f0f51bc: afa40018 */ sw $a0,0x18($sp) /* f0f51c0: 3c188007 */ lui $t8,%hi(var80071190) /* f0f51c4: 8f181190 */ lw $t8,%lo(var80071190)($t8) /* f0f51c8: 0058082a */ slt $at,$v0,$t8 /* f0f51cc: 10200005 */ beqz $at,.L0f0f51e4 /* f0f51d0: 00000000 */ sll $zero,$zero,0x0 -/* f0f51d4: 0c002ef1 */ jal func0000bbc4 +/* f0f51d4: 0c002ef1 */ jal viGetBufX /* f0f51d8: 00000000 */ sll $zero,$zero,0x0 /* f0f51dc: 3c018007 */ lui $at,%hi(var80071190) /* f0f51e0: ac221190 */ sw $v0,%lo(var80071190)($at) .L0f0f51e4: -/* f0f51e4: 0c002ef1 */ jal func0000bbc4 +/* f0f51e4: 0c002ef1 */ jal viGetBufX /* f0f51e8: 00000000 */ sll $zero,$zero,0x0 /* f0f51ec: 3c198007 */ lui $t9,%hi(var80071194) /* f0f51f0: 8f391194 */ lw $t9,%lo(var80071194)($t9) /* f0f51f4: 0059082a */ slt $at,$v0,$t9 /* f0f51f8: 10200005 */ beqz $at,.L0f0f5210 /* f0f51fc: 00000000 */ sll $zero,$zero,0x0 -/* f0f5200: 0c002ef1 */ jal func0000bbc4 +/* f0f5200: 0c002ef1 */ jal viGetBufX /* f0f5204: 00000000 */ sll $zero,$zero,0x0 /* f0f5208: 3c018007 */ lui $at,%hi(var80071194) /* f0f520c: ac221194 */ sw $v0,%lo(var80071194)($at) .L0f0f5210: -/* f0f5210: 0c002ef5 */ jal func0000bbd4 +/* f0f5210: 0c002ef5 */ jal viGetBufY /* f0f5214: 00000000 */ sll $zero,$zero,0x0 /* f0f5218: 3c098007 */ lui $t1,%hi(var80071198) /* f0f521c: 8d291198 */ lw $t1,%lo(var80071198)($t1) /* f0f5220: 0049082a */ slt $at,$v0,$t1 /* f0f5224: 10200005 */ beqz $at,.L0f0f523c /* f0f5228: 00000000 */ sll $zero,$zero,0x0 -/* f0f522c: 0c002ef5 */ jal func0000bbd4 +/* f0f522c: 0c002ef5 */ jal viGetBufY /* f0f5230: 00000000 */ sll $zero,$zero,0x0 /* f0f5234: 3c018007 */ lui $at,%hi(var80071198) /* f0f5238: ac221198 */ sw $v0,%lo(var80071198)($at) .L0f0f523c: -/* f0f523c: 0c002ef5 */ jal func0000bbd4 +/* f0f523c: 0c002ef5 */ jal viGetBufY /* f0f5240: 00000000 */ sll $zero,$zero,0x0 /* f0f5244: 3c078007 */ lui $a3,%hi(var8007119c) /* f0f5248: 24e7119c */ addiu $a3,$a3,%lo(var8007119c) @@ -5446,7 +5446,7 @@ glabel func0f0f50fc /* f0f5250: 0043082a */ slt $at,$v0,$v1 /* f0f5254: 10200009 */ beqz $at,.L0f0f527c /* f0f5258: 00000000 */ sll $zero,$zero,0x0 -/* f0f525c: 0c002ef5 */ jal func0000bbd4 +/* f0f525c: 0c002ef5 */ jal viGetBufY /* f0f5260: 00000000 */ sll $zero,$zero,0x0 /* f0f5264: 3c018007 */ lui $at,%hi(var8007119c) /* f0f5268: ac22119c */ sw $v0,%lo(var8007119c)($at) diff --git a/src/game/game_176080.c b/src/game/game_176080.c index 48f9d055e..8d5c65d63 100644 --- a/src/game/game_176080.c +++ b/src/game/game_176080.c @@ -512,7 +512,7 @@ glabel func0f1766b4 /* f176734: 02008825 */ or $s1,$s0,$zero /* f176738: ac600004 */ sw $zero,0x4($v1) /* f17673c: ac760000 */ sw $s6,0x0($v1) -/* f176740: 0c002ef1 */ jal func0000bbc4 +/* f176740: 0c002ef1 */ jal viGetBufX /* f176744: 26100008 */ addiu $s0,$s0,0x8 /* f176748: 2459ffff */ addiu $t9,$v0,-1 /* f17674c: 33280fff */ andi $t0,$t9,0xfff @@ -759,7 +759,7 @@ glabel func0f1766b4 /* f176b04: 02008825 */ or $s1,$s0,$zero /* f176b08: ac8b0000 */ sw $t3,0x0($a0) /* f176b0c: ac800004 */ sw $zero,0x4($a0) -/* f176b10: 0c002ef1 */ jal func0000bbc4 +/* f176b10: 0c002ef1 */ jal viGetBufX /* f176b14: 26100008 */ addiu $s0,$s0,0x8 /* f176b18: 244cffff */ addiu $t4,$v0,-1 /* f176b1c: 318d0fff */ andi $t5,$t4,0xfff diff --git a/src/include/lib/lib_09660.h b/src/include/lib/lib_09660.h index df96959c9..517692a59 100644 --- a/src/include/lib/lib_09660.h +++ b/src/include/lib/lib_09660.h @@ -36,8 +36,8 @@ u32 func0000b280(void); u32 func0000b2c4(void); u32 func0000b330(void); void func0000bba0(s16 arg0, s16 arg1); -u32 func0000bbc4(void); -u32 func0000bbd4(void); +s16 viGetBufX(void); +s16 viGetBufY(void); void func0000bbe4(s16 arg0, s16 arg1); s16 func0000bc08(void); s16 func0000bc18(void); diff --git a/src/lib/lib_09660.c b/src/lib/lib_09660.c index debe36bb7..6c7091c8f 100644 --- a/src/lib/lib_09660.c +++ b/src/lib/lib_09660.c @@ -2721,21 +2721,15 @@ glabel func0000bba0 /* bbc0: a525001a */ sh $a1,0x1a($t1) ); -GLOBAL_ASM( -glabel func0000bbc4 -/* 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) -); +s16 viGetBufX(void) +{ + return g_ViData->bufx; +} -GLOBAL_ASM( -glabel func0000bbd4 -/* 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) -); +s16 viGetBufY(void) +{ + return g_ViData->bufy; +} GLOBAL_ASM( glabel func0000bbe4