falso
/
perfect_dark
mirror of https://github.com/n64decomp/perfect_dark.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hudRenderEyespySideRect

This commit is contained in:
Ryan Dwyer 2020-12-15 17:13:09 +10:00
parent 4036f77504
commit 910cadde62
28 changed files with 272 additions and 259 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/game/chr/chr.c
View File

@ -11386,7 +11386,7 @@ glabel var7f1a8980
/* f029aa4: 2401fff9 */ addiu $at,$zero,-7
/* f029aa8: 15010082 */ bne $t0,$at,.L0f029cb4
/* f029aac: ae020004 */ sw $v0,0x4($s0)
/* f029ab0: 0fc59e73 */ jal func0f1679cc
/* f029ab0: 0fc59e73 */ jal gfxAllocateColours
/* f029ab4: 24040001 */ addiu $a0,$zero,0x1
/* f029ab8: 8fb001f0 */ lw $s0,0x1f0($sp)
/* f029abc: 3c0e0700 */ lui $t6,0x700
@ -11437,7 +11437,7 @@ glabel var7f1a8980
/* f029b6c: 00000000 */ nop
/* f029b70: a06e0003 */ sb $t6,0x3($v1)
.L0f029b74:
/* f029b74: 0fc59e59 */ jal func0f167964
/* f029b74: 0fc59e59 */ jal gfxAllocateVertices
/* f029b78: 24040018 */ addiu $a0,$zero,0x18
/* f029b7c: 00408025 */ or $s0,$v0,$zero
/* f029b80: 27a60104 */ addiu $a2,$sp,0x104
@ -11715,7 +11715,7 @@ glabel var7f1a8980
.L0f029f80:
/* f029f80: afa700f4 */ sw $a3,0xf4($sp)
/* f029f84: afaa00f0 */ sw $t2,0xf0($sp)
/* f029f88: 0fc59e73 */ jal func0f1679cc
/* f029f88: 0fc59e73 */ jal gfxAllocateColours
/* f029f8c: afab00ec */ sw $t3,0xec($sp)
/* f029f90: 8fb001f0 */ lw $s0,0x1f0($sp)
/* f029f94: 3c190700 */ lui $t9,0x700
@ -11809,7 +11809,7 @@ glabel var7f1a8980
/* f02a0dc: afa301d8 */ sw $v1,0x1d8($sp)
/* f02a0e0: afa700f4 */ sw $a3,0xf4($sp)
/* f02a0e4: afaa00f0 */ sw $t2,0xf0($sp)
/* f02a0e8: 0fc59e59 */ jal func0f167964
/* f02a0e8: 0fc59e59 */ jal gfxAllocateVertices
/* f02a0ec: afab00ec */ sw $t3,0xec($sp)
/* f02a0f0: 8fa501f8 */ lw $a1,0x1f8($sp)
/* f02a0f4: 24010001 */ addiu $at,$zero,0x1
@ -12159,7 +12159,7 @@ glabel var7f1a8980
/* f02a600: 00000000 */ nop
/* f02a604: 46006086 */ mov.s $f2,$f12
.L0f02a608:
/* f02a608: 0fc59e73 */ jal func0f1679cc
/* f02a608: 0fc59e73 */ jal gfxAllocateColours
/* f02a60c: e7a200ac */ swc1 $f2,0xac($sp)
/* f02a610: 8fb001f0 */ lw $s0,0x1f0($sp)
/* f02a614: 3c0f0708 */ lui $t7,0x708
@ -12186,7 +12186,7 @@ glabel var7f1a8980
/* f02a668: a0660005 */ sb $a2,0x5($v1)
/* f02a66c: a0670002 */ sb $a3,0x2($v1)
/* f02a670: a0670006 */ sb $a3,0x6($v1)
/* f02a674: 0fc59e59 */ jal func0f167964
/* f02a674: 0fc59e59 */ jal gfxAllocateVertices
/* f02a678: a0780003 */ sb $t8,0x3($v1)
/* f02a67c: 87ab0052 */ lh $t3,0x52($sp)
/* f02a680: 02747021 */ addu $t6,$s3,$s4
@ -12322,7 +12322,7 @@ glabel var7f1a8980
.L0f02a880:
/* f02a880: 05010130 */ bgez $t0,.L0f02ad44
/* f02a884: 8fae01f8 */ lw $t6,0x1f8($sp)
/* f02a888: 0fc59e59 */ jal func0f167964
/* f02a888: 0fc59e59 */ jal gfxAllocateVertices
/* f02a88c: 2404000c */ addiu $a0,$zero,0xc
/* f02a890: 8fa80204 */ lw $t0,0x204($sp)
/* f02a894: 2401ffff */ addiu $at,$zero,-1
@ -12360,7 +12360,7 @@ glabel var7f1a8980
/* f02a914: 10000001 */ b .L0f02a91c
/* f02a918: 01c02825 */ or $a1,$t6,$zero
.L0f02a91c:
/* f02a91c: 0fc59e73 */ jal func0f1679cc
/* f02a91c: 0fc59e73 */ jal gfxAllocateColours
/* f02a920: a3a5017f */ sb $a1,0x17f($sp)
/* f02a924: 8fb101f0 */ lw $s1,0x1f0($sp)
/* f02a928: 3c0f0700 */ lui $t7,0x700
@ -12446,7 +12446,7 @@ glabel var7f1a8980
/* f02aa58: 00000000 */ nop
/* f02aa5c: 46006086 */ mov.s $f2,$f12
.L0f02aa60:
/* f02aa60: 0fc59e73 */ jal func0f1679cc
/* f02aa60: 0fc59e73 */ jal gfxAllocateColours
/* f02aa64: e7a20094 */ swc1 $f2,0x94($sp)
/* f02aa68: 8fb101f0 */ lw $s1,0x1f0($sp)
/* f02aa6c: 3c0e0700 */ lui $t6,0x700
@ -12694,7 +12694,7 @@ glabel var7f1a8980
/* f02ae18: a3a6017e */ sb $a2,0x17e($sp)
/* f02ae1c: afa700f4 */ sw $a3,0xf4($sp)
/* f02ae20: afaa00f0 */ sw $t2,0xf0($sp)
/* f02ae24: 0fc59e73 */ jal func0f1679cc
/* f02ae24: 0fc59e73 */ jal gfxAllocateColours
/* f02ae28: afab00ec */ sw $t3,0xec($sp)
/* f02ae2c: 8fb001f0 */ lw $s0,0x1f0($sp)
/* f02ae30: 3c0e0710 */ lui $t6,0x710
@ -12777,7 +12777,7 @@ glabel var7f1a8980
/* f02af50: 240b00ff */ addiu $t3,$zero,0xff
.L0f02af54:
/* f02af54: a06b0012 */ sb $t3,0x12($v1)
/* f02af58: 0fc59e59 */ jal func0f167964
/* f02af58: 0fc59e59 */ jal gfxAllocateVertices
/* f02af5c: a0650013 */ sb $a1,0x13($v1)
/* f02af60: 8fa80204 */ lw $t0,0x204($sp)
/* f02af64: 27b80104 */ addiu $t8,$sp,0x104

2
src/game/dlights.c
View File

@ -3248,7 +3248,7 @@ glabel var7f1a7ddc
/* f004698: 03197021 */ addu $t6,$t8,$t9
/* f00469c: 8dcf0014 */ lw $t7,0x14($t6)
/* f0046a0: 85e40016 */ lh $a0,0x16($t7)
/* f0046a4: 0fc59e73 */ jal func0f1679cc
/* f0046a4: 0fc59e73 */ jal gfxAllocateColours
/* f0046a8: afa40070 */ sw $a0,0x70($sp)
/* f0046ac: 3c07800a */ lui $a3,%hi(g_Rooms)
/* f0046b0: 24e74928 */ addiu $a3,$a3,%lo(g_Rooms)

4
src/game/explosion.c
View File

@ -2925,7 +2925,7 @@ glabel func0f12c654
/* f12c7ac: 8f39b568 */ lw $t9,%lo(var800ab568)($t9)
/* f12c7b0: 24550008 */ addiu $s5,$v0,0x8
/* f12c7b4: 24040001 */ addiu $a0,$zero,0x1
/* f12c7b8: 0fc59e73 */ jal func0f1679cc
/* f12c7b8: 0fc59e73 */ jal gfxAllocateColours
/* f12c7bc: ac590004 */ sw $t9,0x4($v0)
/* f12c7c0: 3c13800a */ lui $s3,%hi(g_Vars)
/* f12c7c4: 26739fc0 */ addiu $s3,$s3,%lo(g_Vars)
@ -3345,7 +3345,7 @@ glabel var7f1b55c4
/* f12cd84: f7b40010 */ sdc1 $f20,0x10($sp)
/* f12cd88: afa600d8 */ sw $a2,0xd8($sp)
/* f12cd8c: afa700dc */ sw $a3,0xdc($sp)
/* f12cd90: 0fc59e59 */ jal func0f167964
/* f12cd90: 0fc59e59 */ jal gfxAllocateVertices
/* f12cd94: 24040004 */ addiu $a0,$zero,0x4
/* f12cd98: 0fc2d5de */ jal currentPlayerGetUnk174c
/* f12cd9c: 00408025 */ or $s0,$v0,$zero

24
src/game/game_006bd0.c
View File

@ -242,7 +242,7 @@ glabel func0f006c80
/* f006e04: e7b20064 */ swc1 $f18,0x64($sp)
/* f006e08: 46005183 */ div.s $f6,$f10,$f0
/* f006e0c: e7a40068 */ swc1 $f4,0x68($sp)
/* f006e10: 0fc59e59 */ jal func0f167964
/* f006e10: 0fc59e59 */ jal gfxAllocateVertices
/* f006e14: e7a6006c */ swc1 $f6,0x6c($sp)
/* f006e18: 3c038006 */ lui $v1,%hi(var80061644)
/* f006e1c: 24631644 */ addiu $v1,$v1,%lo(var80061644)
@ -827,7 +827,7 @@ glabel func0f006c80
/* f007704: 00000000 */ nop
/* f007708: a438cb00 */ sh $t8,%lo(var8009cb00)($at)
/* f00770c: 3c01800a */ lui $at,%hi(var8009cb04)
/* f007710: 0fc59e59 */ jal func0f167964
/* f007710: 0fc59e59 */ jal gfxAllocateVertices
/* f007714: ac20cb04 */ sw $zero,%lo(var8009cb04)($at)
/* f007718: c7b200b0 */ lwc1 $f18,0xb0($sp)
/* f00771c: c6440000 */ lwc1 $f4,0x0($s2)
@ -1208,7 +1208,7 @@ glabel func0f006c80
/* f007ce0: 860f0046 */ lh $t7,0x46($s0)
/* f007ce4: 24040001 */ addiu $a0,$zero,0x1
/* f007ce8: 01eec021 */ addu $t8,$t7,$t6
/* f007cec: 0fc59e73 */ jal func0f1679cc
/* f007cec: 0fc59e73 */ jal gfxAllocateColours
/* f007cf0: a6180046 */ sh $t8,0x46($s0)
/* f007cf4: 3c19ff00 */ lui $t9,0xff00
/* f007cf8: 3739007f */ ori $t9,$t9,0x7f
@ -1300,7 +1300,7 @@ glabel func0f006c80
/* f007e50: 3c01800a */ lui $at,%hi(var8009cb04)
/* f007e54: afa20150 */ sw $v0,0x150($sp)
/* f007e58: ac2fcb04 */ sw $t7,%lo(var8009cb04)($at)
/* f007e5c: 0fc59e59 */ jal func0f167964
/* f007e5c: 0fc59e59 */ jal gfxAllocateVertices
/* f007e60: 24040006 */ addiu $a0,$zero,0x6
/* f007e64: c7b200b0 */ lwc1 $f18,0xb0($sp)
/* f007e68: c6440000 */ lwc1 $f4,0x0($s2)
@ -1785,7 +1785,7 @@ glabel func0f008558
/* f0085b8: ae200000 */ sw $zero,0x0($s1)
/* f0085bc: 3c01800a */ lui $at,%hi(var8009cb04)
/* f0085c0: ac20cb04 */ sw $zero,%lo(var8009cb04)($at)
/* f0085c4: 0fc59e59 */ jal func0f167964
/* f0085c4: 0fc59e59 */ jal gfxAllocateVertices
/* f0085c8: 24040006 */ addiu $a0,$zero,0x6
/* f0085cc: 3c128006 */ lui $s2,%hi(var80061644)
/* f0085d0: 26521644 */ addiu $s2,$s2,%lo(var80061644)
@ -2248,7 +2248,7 @@ glabel func0f008558
/* f008cc4: 3c01800a */ lui $at,%hi(var8009cb04)
/* f008cc8: afa200a8 */ sw $v0,0xa8($sp)
/* f008ccc: ac2fcb04 */ sw $t7,%lo(var8009cb04)($at)
/* f008cd0: 0fc59e59 */ jal func0f167964
/* f008cd0: 0fc59e59 */ jal gfxAllocateVertices
/* f008cd4: 24040006 */ addiu $a0,$zero,0x6
/* f008cd8: c7a4005c */ lwc1 $f4,0x5c($sp)
/* f008cdc: c6460000 */ lwc1 $f6,0x0($s2)
@ -2960,7 +2960,7 @@ glabel func0f009504
/* f009758: 3c0d0008 */ lui $t5,0x8
/* f00975c: 24040001 */ addiu $a0,$zero,0x1
/* f009760: ad4d0004 */ sw $t5,0x4($t2)
/* f009764: 0fc59e59 */ jal func0f167964
/* f009764: 0fc59e59 */ jal gfxAllocateVertices
/* f009768: ad4c0000 */ sw $t4,0x0($t2)
/* f00976c: a4400004 */ sh $zero,0x4($v0)
/* f009770: 84430004 */ lh $v1,0x4($v0)
@ -3026,7 +3026,7 @@ glabel func0f009818
/* f009848: 0fc0252f */ jal func0f0094bc
/* f00984c: e4241644 */ swc1 $f4,%lo(var80061644)($at)
/* f009850: afa20038 */ sw $v0,0x38($sp)
/* f009854: 0fc59e73 */ jal func0f1679cc
/* f009854: 0fc59e73 */ jal gfxAllocateColours
/* f009858: 24040002 */ addiu $a0,$zero,0x2
/* f00985c: 8fae0038 */ lw $t6,0x38($sp)
/* f009860: 240fff00 */ addiu $t7,$zero,-256
@ -3955,10 +3955,10 @@ glabel func0f00a490
/* f00a56c: 8e02000c */ lw $v0,0xc($s0)
/* f00a570: 524000e6 */ beqzl $s2,.L0f00a90c
/* f00a574: 8fb80050 */ lw $t8,0x50($sp)
/* f00a578: 0fc59e73 */ jal func0f1679cc
/* f00a578: 0fc59e73 */ jal gfxAllocateColours
/* f00a57c: 24040001 */ addiu $a0,$zero,0x1
/* f00a580: afa20048 */ sw $v0,0x48($sp)
/* f00a584: 0fc59e59 */ jal func0f167964
/* f00a584: 0fc59e59 */ jal gfxAllocateVertices
/* f00a588: 24040004 */ addiu $a0,$zero,0x4
/* f00a58c: 0c002f40 */ jal viGetViewLeft
/* f00a590: 00408025 */ or $s0,$v0,$zero
@ -4351,10 +4351,10 @@ glabel hudRenderGasIfEnabled
.L0f00ab5c:
/* f00ab5c: 5220017d */ beqzl $s1,.L0f00b154
/* f00ab60: 8fad00ec */ lw $t5,0xec($sp)
/* f00ab64: 0fc59e73 */ jal func0f1679cc
/* f00ab64: 0fc59e73 */ jal gfxAllocateColours
/* f00ab68: 24040001 */ addiu $a0,$zero,0x1
/* f00ab6c: afa200a4 */ sw $v0,0xa4($sp)
/* f00ab70: 0fc59e59 */ jal func0f167964
/* f00ab70: 0fc59e59 */ jal gfxAllocateVertices
/* f00ab74: 24040008 */ addiu $a0,$zero,0x8
/* f00ab78: 0c002f40 */ jal viGetViewLeft
/* f00ab7c: 00408025 */ or $s0,$v0,$zero

18
src/game/game_0abe70.c
View File

@ -497,7 +497,7 @@ glabel func0f0ac4b8
/* f0ac4d4: afa600f8 */ sw $a2,0xf8($sp)
/* f0ac4d8: afa700fc */ sw $a3,0xfc($sp)
/* f0ac4dc: 24040002 */ addiu $a0,$zero,0x2
/* f0ac4e0: 0fc59e73 */ jal func0f1679cc
/* f0ac4e0: 0fc59e73 */ jal gfxAllocateColours
/* f0ac4e4: 26101bb0 */ addiu $s0,$s0,7088
/* f0ac4e8: 0fc2d5be */ jal currentPlayerGetMatrix
/* f0ac4ec: afa200c4 */ sw $v0,0xc4($sp)
@ -735,7 +735,7 @@ glabel func0f0ac4b8
/* f0ac84c: e7a000d8 */ swc1 $f0,0xd8($sp)
/* f0ac850: e7a600d4 */ swc1 $f6,0xd4($sp)
.L0f0ac854:
/* f0ac854: 0fc59e59 */ jal func0f167964
/* f0ac854: 0fc59e59 */ jal gfxAllocateVertices
/* f0ac858: 24040004 */ addiu $a0,$zero,0x4
/* f0ac85c: 0fc59e66 */ jal func0f167998
/* f0ac860: 00408025 */ or $s0,$v0,$zero
@ -1031,7 +1031,7 @@ glabel var7f1accf4
/* f0acbbc: 80ac0000 */ lb $t4,0x0($a1)
/* f0acbc0: 058203f9 */ bltzl $t4,.L0f0adba8
/* f0acbc4: 8fbf002c */ lw $ra,0x2c($sp)
/* f0acbc8: 0fc59e73 */ jal func0f1679cc
/* f0acbc8: 0fc59e73 */ jal gfxAllocateColours
/* f0acbcc: 24040001 */ addiu $a0,$zero,0x1
/* f0acbd0: 3c09800a */ lui $t1,%hi(g_Vars+0x284)
/* f0acbd4: 8d29a244 */ lw $t1,%lo(g_Vars+0x284)($t1)
@ -1355,12 +1355,12 @@ glabel var7f1accf4
/* f0ad090: 822b0001 */ lb $t3,0x1($s1)
/* f0ad094: 15610005 */ bne $t3,$at,.L0f0ad0ac
/* f0ad098: 00000000 */ nop
/* f0ad09c: 0fc59e59 */ jal func0f167964
/* f0ad09c: 0fc59e59 */ jal gfxAllocateVertices
/* f0ad0a0: 24040008 */ addiu $a0,$zero,0x8
/* f0ad0a4: 10000004 */ b .L0f0ad0b8
/* f0ad0a8: 00408025 */ or $s0,$v0,$zero
.L0f0ad0ac:
/* f0ad0ac: 0fc59e59 */ jal func0f167964
/* f0ad0ac: 0fc59e59 */ jal gfxAllocateVertices
/* f0ad0b0: 24040004 */ addiu $a0,$zero,0x4
/* f0ad0b4: 00408025 */ or $s0,$v0,$zero
.L0f0ad0b8:
@ -3742,7 +3742,7 @@ glabel var7f1acd8c
/* f0af468: e7ae00f0 */ swc1 $f14,0xf0($sp)
/* f0af46c: e7a800dc */ swc1 $f8,0xdc($sp)
/* f0af470: e7b600e0 */ swc1 $f22,0xe0($sp)
/* f0af474: 0fc59e73 */ jal func0f1679cc
/* f0af474: 0fc59e73 */ jal gfxAllocateColours
/* f0af478: e7b800e4 */ swc1 $f24,0xe4($sp)
/* f0af47c: 3c0eff00 */ lui $t6,0xff00
/* f0af480: 3c0fff00 */ lui $t7,0xff00
@ -3967,7 +3967,7 @@ glabel var7f1acd8c
/* f0af7b8: 24040004 */ addiu $a0,$zero,0x4
/* f0af7bc: e7ae00cc */ swc1 $f14,0xcc($sp)
/* f0af7c0: e7b000c8 */ swc1 $f16,0xc8($sp)
/* f0af7c4: 0fc59e59 */ jal func0f167964
/* f0af7c4: 0fc59e59 */ jal gfxAllocateVertices
/* f0af7c8: e7b200c4 */ swc1 $f18,0xc4($sp)
/* f0af7cc: c7ae00cc */ lwc1 $f14,0xcc($sp)
/* f0af7d0: c7b000c8 */ lwc1 $f16,0xc8($sp)
@ -4401,7 +4401,7 @@ glabel var7f1acd90
/* f0afe50: 27a600bc */ addiu $a2,$sp,0xbc
/* f0afe54: 0c0011e4 */ jal scaleTo1
/* f0afe58: e7a400bc */ swc1 $f4,0xbc($sp)
/* f0afe5c: 0fc59e73 */ jal func0f1679cc
/* f0afe5c: 0fc59e73 */ jal gfxAllocateColours
/* f0afe60: 24040002 */ addiu $a0,$zero,0x2
/* f0afe64: 3c0aff00 */ lui $t2,0xff00
/* f0afe68: 3c0bff00 */ lui $t3,0xff00
@ -4418,7 +4418,7 @@ glabel var7f1acd90
/* f0afe94: 0c012d20 */ jal osVirtualToPhysical
/* f0afe98: ae2e0000 */ sw $t6,0x0($s1)
/* f0afe9c: ae220004 */ sw $v0,0x4($s1)
/* f0afea0: 0fc59e59 */ jal func0f167964
/* f0afea0: 0fc59e59 */ jal gfxAllocateVertices
/* f0afea4: 24040006 */ addiu $a0,$zero,0x6
/* f0afea8: a0400007 */ sb $zero,0x7($v0)
/* f0afeac: a0400013 */ sb $zero,0x13($v0)

4
src/game/game_0d4690.c
View File

@ -497,10 +497,10 @@ glabel func0f0d4d0c
/* f0d4d18: afa5004c */ sw $a1,0x4c($sp)
/* f0d4d1c: afa60050 */ sw $a2,0x50($sp)
/* f0d4d20: afa70054 */ sw $a3,0x54($sp)
/* f0d4d24: 0fc59e73 */ jal func0f1679cc
/* f0d4d24: 0fc59e73 */ jal gfxAllocateColours
/* f0d4d28: 24040002 */ addiu $a0,$zero,0x2
/* f0d4d2c: afa20044 */ sw $v0,0x44($sp)
/* f0d4d30: 0fc59e59 */ jal func0f167964
/* f0d4d30: 0fc59e59 */ jal gfxAllocateVertices
/* f0d4d34: 24040004 */ addiu $a0,$zero,0x4
/* f0d4d38: 3c013f80 */ lui $at,0x3f80
/* f0d4d3c: 44819000 */ mtc1 $at,$f18

4
src/game/game_0d5a90.c
View File

@ -346,10 +346,10 @@ glabel func0f0d5d8c
/* f0d5dbc: afb3002c */ sw $s3,0x2c($sp)
/* f0d5dc0: afb20028 */ sw $s2,0x28($sp)
/* f0d5dc4: afa70434 */ sw $a3,0x434($sp)
/* f0d5dc8: 0fc59e59 */ jal func0f167964
/* f0d5dc8: 0fc59e59 */ jal gfxAllocateVertices
/* f0d5dcc: 24040038 */ addiu $a0,$zero,0x38
/* f0d5dd0: afa20184 */ sw $v0,0x184($sp)
/* f0d5dd4: 0fc59e73 */ jal func0f1679cc
/* f0d5dd4: 0fc59e73 */ jal gfxAllocateColours
/* f0d5dd8: 24040038 */ addiu $a0,$zero,0x38
/* f0d5ddc: 8fb20184 */ lw $s2,0x184($sp)
/* f0d5de0: 3c047f1b */ lui $a0,%hi(var7f1adbf0)

8
src/game/game_0d7070.c
View File

@ -2951,10 +2951,10 @@ glabel func0f0d9948
/* f0d995c: 00a08025 */ or $s0,$a1,$zero
/* f0d9960: 24040003 */ addiu $a0,$zero,0x3
/* f0d9964: afa60048 */ sw $a2,0x48($sp)
/* f0d9968: 0fc59e59 */ jal func0f167964
/* f0d9968: 0fc59e59 */ jal gfxAllocateVertices
/* f0d996c: afa7004c */ sw $a3,0x4c($sp)
/* f0d9970: 24040002 */ addiu $a0,$zero,0x2
/* f0d9974: 0fc59e73 */ jal func0f1679cc
/* f0d9974: 0fc59e73 */ jal gfxAllocateColours
/* f0d9978: afa20024 */ sw $v0,0x24($sp)
/* f0d997c: 8fa7004c */ lw $a3,0x4c($sp)
/* f0d9980: 8fa50024 */ lw $a1,0x24($sp)
@ -5811,10 +5811,10 @@ glabel func0f0dc170
/* f0dc2bc: 340fff60 */ dli $t7,0xff60
/* f0dc2c0: afaf0070 */ sw $t7,0x70($sp)
.L0f0dc2c4:
/* f0dc2c4: 0fc59e59 */ jal func0f167964
/* f0dc2c4: 0fc59e59 */ jal gfxAllocateVertices
/* f0dc2c8: 24040008 */ addiu $a0,$zero,0x8
/* f0dc2cc: 24040002 */ addiu $a0,$zero,0x2
/* f0dc2d0: 0fc59e73 */ jal func0f1679cc
/* f0dc2d0: 0fc59e73 */ jal gfxAllocateColours
/* f0dc2d4: afa2008c */ sw $v0,0x8c($sp)
/* f0dc2d8: 02002025 */ or $a0,$s0,$zero
/* f0dc2dc: 0fc351e7 */ jal func0f0d479c

40
src/game/game_0e0770.c
View File

@ -246,10 +246,10 @@ glabel func0f0e0998
/* f0e0a04: 100000a9 */ b .L0f0e0cac
/* f0e0a08: 8fbf002c */ lw $ra,0x2c($sp)
.L0f0e0a0c:
/* f0e0a0c: 0fc59e73 */ jal func0f1679cc
/* f0e0a0c: 0fc59e73 */ jal gfxAllocateColours
/* f0e0a10: 24040001 */ addiu $a0,$zero,0x1
/* f0e0a14: afa20084 */ sw $v0,0x84($sp)
/* f0e0a18: 0fc59e59 */ jal func0f167964
/* f0e0a18: 0fc59e59 */ jal gfxAllocateVertices
/* f0e0a1c: 24040004 */ addiu $a0,$zero,0x4
/* f0e0a20: 02001825 */ or $v1,$s0,$zero
/* f0e0a24: afa20080 */ sw $v0,0x80($sp)
@ -641,10 +641,10 @@ glabel func0f0e0dac
/* f0e1008: f7b80038 */ sdc1 $f24,0x38($sp)
/* f0e100c: f7b60030 */ sdc1 $f22,0x30($sp)
/* f0e1010: f7b40028 */ sdc1 $f20,0x28($sp)
/* f0e1014: 0fc59e73 */ jal func0f1679cc
/* f0e1014: 0fc59e73 */ jal gfxAllocateColours
/* f0e1018: 24040004 */ addiu $a0,$zero,0x4
/* f0e101c: afa20110 */ sw $v0,0x110($sp)
/* f0e1020: 0fc59e59 */ jal func0f167964
/* f0e1020: 0fc59e59 */ jal gfxAllocateVertices
/* f0e1024: 24040008 */ addiu $a0,$zero,0x8
/* f0e1028: 8fae0118 */ lw $t6,0x118($sp)
/* f0e102c: 3c18e700 */ lui $t8,0xe700
@ -1075,10 +1075,10 @@ glabel func0f0e1668
/* f0e167c: afa5007c */ sw $a1,0x7c($sp)
/* f0e1680: afa60080 */ sw $a2,0x80($sp)
/* f0e1684: afa70084 */ sw $a3,0x84($sp)
/* f0e1688: 0fc59e73 */ jal func0f1679cc
/* f0e1688: 0fc59e73 */ jal gfxAllocateColours
/* f0e168c: 24040003 */ addiu $a0,$zero,0x3
/* f0e1690: 00408825 */ or $s1,$v0,$zero
/* f0e1694: 0fc59e59 */ jal func0f167964
/* f0e1694: 0fc59e59 */ jal gfxAllocateVertices
/* f0e1698: 24040006 */ addiu $a0,$zero,0x6
/* f0e169c: 8fae0078 */ lw $t6,0x78($sp)
/* f0e16a0: 3c18e700 */ lui $t8,0xe700
@ -1266,10 +1266,10 @@ glabel func0f0e194c
/* f0e1960: afa5006c */ sw $a1,0x6c($sp)
/* f0e1964: afa60070 */ sw $a2,0x70($sp)
/* f0e1968: afa70074 */ sw $a3,0x74($sp)
/* f0e196c: 0fc59e73 */ jal func0f1679cc
/* f0e196c: 0fc59e73 */ jal gfxAllocateColours
/* f0e1970: 24040007 */ addiu $a0,$zero,0x7
/* f0e1974: 00408825 */ or $s1,$v0,$zero
/* f0e1978: 0fc59e59 */ jal func0f167964
/* f0e1978: 0fc59e59 */ jal gfxAllocateVertices
/* f0e197c: 24040009 */ addiu $a0,$zero,0x9
/* f0e1980: 8fae0068 */ lw $t6,0x68($sp)
/* f0e1984: 3c18e700 */ lui $t8,0xe700
@ -1502,10 +1502,10 @@ glabel func0f0e1ce8
/* f0e1cfc: afa50064 */ sw $a1,0x64($sp)
/* f0e1d00: afa60068 */ sw $a2,0x68($sp)
/* f0e1d04: afa7006c */ sw $a3,0x6c($sp)
/* f0e1d08: 0fc59e73 */ jal func0f1679cc
/* f0e1d08: 0fc59e73 */ jal gfxAllocateColours
/* f0e1d0c: 24040003 */ addiu $a0,$zero,0x3
/* f0e1d10: 00408825 */ or $s1,$v0,$zero
/* f0e1d14: 0fc59e59 */ jal func0f167964
/* f0e1d14: 0fc59e59 */ jal gfxAllocateVertices
/* f0e1d18: 24040006 */ addiu $a0,$zero,0x6
/* f0e1d1c: 8fae0060 */ lw $t6,0x60($sp)
/* f0e1d20: 3c18e700 */ lui $t8,0xe700
@ -1685,10 +1685,10 @@ glabel func0f0e1fac
/* f0e1fc0: afa50064 */ sw $a1,0x64($sp)
/* f0e1fc4: afa60068 */ sw $a2,0x68($sp)
/* f0e1fc8: afa7006c */ sw $a3,0x6c($sp)
/* f0e1fcc: 0fc59e73 */ jal func0f1679cc
/* f0e1fcc: 0fc59e73 */ jal gfxAllocateColours
/* f0e1fd0: 24040003 */ addiu $a0,$zero,0x3
/* f0e1fd4: 00408825 */ or $s1,$v0,$zero
/* f0e1fd8: 0fc59e59 */ jal func0f167964
/* f0e1fd8: 0fc59e59 */ jal gfxAllocateVertices
/* f0e1fdc: 24040006 */ addiu $a0,$zero,0x6
/* f0e1fe0: 8fae0060 */ lw $t6,0x60($sp)
/* f0e1fe4: 3c18e700 */ lui $t8,0xe700
@ -1955,10 +1955,10 @@ glabel func0f0e258c
/* f0e259c: afa50034 */ sw $a1,0x34($sp)
/* f0e25a0: afa60038 */ sw $a2,0x38($sp)
/* f0e25a4: afa7003c */ sw $a3,0x3c($sp)
/* f0e25a8: 0fc59e73 */ jal func0f1679cc
/* f0e25a8: 0fc59e73 */ jal gfxAllocateColours
/* f0e25ac: 24040002 */ addiu $a0,$zero,0x2
/* f0e25b0: afa20028 */ sw $v0,0x28($sp)
/* f0e25b4: 0fc59e59 */ jal func0f167964
/* f0e25b4: 0fc59e59 */ jal gfxAllocateVertices
/* f0e25b8: 24040004 */ addiu $a0,$zero,0x4
/* f0e25bc: 8fae0034 */ lw $t6,0x34($sp)
/* f0e25c0: 2407000a */ addiu $a3,$zero,0xa
@ -2704,10 +2704,10 @@ glabel menuRenderCarouselArrow
/* f0e30f0: a7a90056 */ sh $t1,0x56($sp)
/* f0e30f4: a7aa0054 */ sh $t2,0x54($sp)
/* f0e30f8: a7ab0052 */ sh $t3,0x52($sp)
/* f0e30fc: 0fc59e73 */ jal func0f1679cc
/* f0e30fc: 0fc59e73 */ jal gfxAllocateColours
/* f0e3100: a7ac0050 */ sh $t4,0x50($sp)
/* f0e3104: afa20058 */ sw $v0,0x58($sp)
/* f0e3108: 0fc59e59 */ jal func0f167964
/* f0e3108: 0fc59e59 */ jal gfxAllocateVertices
/* f0e310c: 24040003 */ addiu $a0,$zero,0x3
/* f0e3110: 8fae0060 */ lw $t6,0x60($sp)
/* f0e3114: 87a90056 */ lh $t1,0x56($sp)
@ -2975,10 +2975,10 @@ glabel func0f0e3324
/* f0e34f4: a7a90056 */ sh $t1,0x56($sp)
/* f0e34f8: a7aa0054 */ sh $t2,0x54($sp)
/* f0e34fc: a7ab005a */ sh $t3,0x5a($sp)
/* f0e3500: 0fc59e73 */ jal func0f1679cc
/* f0e3500: 0fc59e73 */ jal gfxAllocateColours
/* f0e3504: a7ac0058 */ sh $t4,0x58($sp)
/* f0e3508: afa20060 */ sw $v0,0x60($sp)
/* f0e350c: 0fc59e59 */ jal func0f167964
/* f0e350c: 0fc59e59 */ jal gfxAllocateVertices
/* f0e3510: 24040004 */ addiu $a0,$zero,0x4
/* f0e3514: 8fb80068 */ lw $t8,0x68($sp)
/* f0e3518: 87a90056 */ lh $t1,0x56($sp)
@ -5215,7 +5215,7 @@ glabel func0f0e5000
/* f0e56dc: 0c012d20 */ jal osVirtualToPhysical
/* f0e56e0: ae0f0000 */ sw $t7,0x0($s0)
/* f0e56e4: ae020004 */ sw $v0,0x4($s0)
/* f0e56e8: 0fc59e73 */ jal func0f1679cc
/* f0e56e8: 0fc59e73 */ jal gfxAllocateColours
/* f0e56ec: 24040014 */ addiu $a0,$zero,0x14
/* f0e56f0: 8fb800f0 */ lw $t8,0xf0($sp)
/* f0e56f4: 00408025 */ or $s0,$v0,$zero
@ -5459,7 +5459,7 @@ glabel func0f0e5000
/* f0e5a5c: 2652ffff */ addiu $s2,$s2,-1
/* f0e5a60: 5020008b */ beqzl $at,.L0f0e5c90
/* f0e5a64: 2652ffff */ addiu $s2,$s2,-1
/* f0e5a68: 0fc59e59 */ jal func0f167964
/* f0e5a68: 0fc59e59 */ jal gfxAllocateVertices
/* f0e5a6c: 24040005 */ addiu $a0,$zero,0x5
/* f0e5a70: c7aa00b8 */ lwc1 $f10,0xb8($sp)
/* f0e5a74: 4600c007 */ neg.s $f0,$f24

4
src/game/game_0fd660.c
View File

@ -3206,10 +3206,10 @@ glabel func0f100ad0
/* f100c90: 0fc351e7 */ jal func0f0d479c
/* f100c94: 8fa401d8 */ lw $a0,0x1d8($sp)
/* f100c98: afa201d8 */ sw $v0,0x1d8($sp)
/* f100c9c: 0fc59e73 */ jal func0f1679cc
/* f100c9c: 0fc59e73 */ jal gfxAllocateColours
/* f100ca0: 24040002 */ addiu $a0,$zero,0x2
/* f100ca4: 0040a825 */ or $s5,$v0,$zero
/* f100ca8: 0fc59e59 */ jal func0f167964
/* f100ca8: 0fc59e59 */ jal gfxAllocateVertices
/* f100cac: 24040008 */ addiu $a0,$zero,0x8
/* f100cb0: 8fae01d8 */ lw $t6,0x1d8($sp)
/* f100cb4: 3c18e700 */ lui $t8,0xe700

4
src/game/game_12f6c0.c
View File

@ -975,7 +975,7 @@ glabel func0f130044
/* f1304a4: 018d9021 */ addu $s2,$t4,$t5
/* f1304a8: 0000b025 */ or $s6,$zero,$zero
/* f1304ac: 26750018 */ addiu $s5,$s3,0x18
/* f1304b0: 0fc59e73 */ jal func0f1679cc
/* f1304b0: 0fc59e73 */ jal gfxAllocateColours
/* f1304b4: e7b00138 */ swc1 $f16,0x138($sp)
/* f1304b8: 3c10800a */ lui $s0,%hi(g_Vars+0x284)
/* f1304bc: 8e10a244 */ lw $s0,%lo(g_Vars+0x284)($s0)
@ -1401,7 +1401,7 @@ glabel func0f130044
/* f130ac8: 8e2f0018 */ lw $t7,0x18($s1)
/* f130acc: 51e00140 */ beqzl $t7,.L0f130fd0
/* f130ad0: 26b50001 */ addiu $s5,$s5,0x1
/* f130ad4: 0fc59e59 */ jal func0f167964
/* f130ad4: 0fc59e59 */ jal gfxAllocateVertices
/* f130ad8: 24040003 */ addiu $a0,$zero,0x3
/* f130adc: 00408025 */ or $s0,$v0,$zero
/* f130ae0: 00002025 */ or $a0,$zero,$zero

12
src/game/game_1371b0.c
View File

@ -785,10 +785,10 @@ glabel func0f137b4c
/* f137c68: 358c031d */ ori $t4,$t4,0x31d
/* f137c6c: 24040003 */ addiu $a0,$zero,0x3
/* f137c70: af2c0000 */ sw $t4,0x0($t9)
/* f137c74: 0fc59e73 */ jal func0f1679cc
/* f137c74: 0fc59e73 */ jal gfxAllocateColours
/* f137c78: af2d0004 */ sw $t5,0x4($t9)
/* f137c7c: afa20078 */ sw $v0,0x78($sp)
/* f137c80: 0fc59e59 */ jal func0f167964
/* f137c80: 0fc59e59 */ jal gfxAllocateVertices
/* f137c84: 24040009 */ addiu $a0,$zero,0x9
/* f137c88: 860e0004 */ lh $t6,0x4($s0)
/* f137c8c: c7a8008c */ lwc1 $f8,0x8c($sp)
@ -1415,10 +1415,10 @@ glabel func0f1384b4
/* f138548: afbf001c */ sw $ra,0x1c($sp)
/* f13854c: 24040002 */ addiu $a0,$zero,0x2
/* f138550: afa50034 */ sw $a1,0x34($sp)
/* f138554: 0fc59e73 */ jal func0f1679cc
/* f138554: 0fc59e73 */ jal gfxAllocateColours
/* f138558: afa60038 */ sw $a2,0x38($sp)
/* f13855c: 24040004 */ addiu $a0,$zero,0x4
/* f138560: 0fc59e59 */ jal func0f167964
/* f138560: 0fc59e59 */ jal gfxAllocateVertices
/* f138564: afa20028 */ sw $v0,0x28($sp)
/* f138568: 8fa50034 */ lw $a1,0x34($sp)
/* f13856c: afa2002c */ sw $v0,0x2c($sp)
@ -2392,7 +2392,7 @@ glabel var7f1b5850
/* f1392f4: 24a5f46c */ addiu $a1,$a1,%lo(var8007f46c)
/* f1392f8: 0c0036cc */ jal func0000db30
/* f1392fc: 248457c8 */ addiu $a0,$a0,%lo(var7f1b57c8)
/* f139300: 0fc59e73 */ jal func0f1679cc
/* f139300: 0fc59e73 */ jal gfxAllocateColours
/* f139304: 2404003c */ addiu $a0,$zero,0x3c
/* f139308: 3c01437f */ lui $at,0x437f
/* f13930c: 3c13800a */ lui $s3,%hi(var800a4170)
@ -2671,7 +2671,7 @@ glabel var7f1b5850
/* f139718: 00000000 */ nop
/* f13971c: 4600e606 */ mov.s $f24,$f28
.L0f139720:
/* f139720: 0fc59e59 */ jal func0f167964
/* f139720: 0fc59e59 */ jal gfxAllocateVertices
/* f139724: 24040004 */ addiu $a0,$zero,0x4
/* f139728: 4616d280 */ add.s $f10,$f26,$f22
/* f13972c: c7a800d4 */ lwc1 $f8,0xd4($sp)

198
src/game/game_141820.c
View File

@ -26,6 +26,7 @@
#include "lib/lib_16110.h"
#include "lib/lib_4a360.h"
#include "types.h"
#include "gbiex.h"
s32 var8007f840 = 0x00000000;
u8 var8007f844 = 0;
@ -1639,141 +1640,44 @@ glabel var7f1b5f48
/* f143674: 27bd0130 */ addiu $sp,$sp,0x130
);
GLOBAL_ASM(
glabel hudRenderEyespySideBar
/* f143678: 27bdffd8 */ addiu $sp,$sp,-40
/* f14367c: afb00018 */ sw $s0,0x18($sp)
/* f143680: 00808025 */ or $s0,$a0,$zero
/* f143684: afbf001c */ sw $ra,0x1c($sp)
/* f143688: afa60030 */ sw $a2,0x30($sp)
/* f14368c: afa70034 */ sw $a3,0x34($sp)
/* f143690: 24040004 */ addiu $a0,$zero,0x4
/* f143694: 0fc59e59 */ jal func0f167964
/* f143698: afa5002c */ sw $a1,0x2c($sp)
/* f14369c: 24040002 */ addiu $a0,$zero,0x2
/* f1436a0: 0fc59e73 */ jal func0f1679cc
/* f1436a4: afa20024 */ sw $v0,0x24($sp)
/* f1436a8: 8fa5002c */ lw $a1,0x2c($sp)
/* f1436ac: 3c014120 */ lui $at,0x4120
/* f1436b0: 44810000 */ mtc1 $at,$f0
/* f1436b4: 8cae0000 */ lw $t6,0x0($a1)
/* f1436b8: 8fa30024 */ lw $v1,0x24($sp)
/* f1436bc: 2407fff6 */ addiu $a3,$zero,-10
/* f1436c0: 448e2000 */ mtc1 $t6,$f4
/* f1436c4: 24080004 */ addiu $t0,$zero,0x4
/* f1436c8: 468021a0 */ cvt.s.w $f6,$f4
/* f1436cc: 46003202 */ mul.s $f8,$f6,$f0
/* f1436d0: 4600428d */ trunc.w.s $f10,$f8
/* f1436d4: 44185000 */ mfc1 $t8,$f10
/* f1436d8: 00000000 */ nop
/* f1436dc: a4780000 */ sh $t8,0x0($v1)
/* f1436e0: 8cb90004 */ lw $t9,0x4($a1)
/* f1436e4: a4670004 */ sh $a3,0x4($v1)
/* f1436e8: 44998000 */ mtc1 $t9,$f16
/* f1436ec: 00000000 */ nop
/* f1436f0: 468084a0 */ cvt.s.w $f18,$f16
/* f1436f4: 46009102 */ mul.s $f4,$f18,$f0
/* f1436f8: 4600218d */ trunc.w.s $f6,$f4
/* f1436fc: 440a3000 */ mfc1 $t2,$f6
/* f143700: 00000000 */ nop
/* f143704: a46a0002 */ sh $t2,0x2($v1)
/* f143708: 8cab0008 */ lw $t3,0x8($a1)
/* f14370c: 448b4000 */ mtc1 $t3,$f8
/* f143710: 00000000 */ nop
/* f143714: 468042a0 */ cvt.s.w $f10,$f8
/* f143718: 46005402 */ mul.s $f16,$f10,$f0
/* f14371c: 4600848d */ trunc.w.s $f18,$f16
/* f143720: 440d9000 */ mfc1 $t5,$f18
/* f143724: 00000000 */ nop
/* f143728: a46d000c */ sh $t5,0xc($v1)
/* f14372c: 8cae000c */ lw $t6,0xc($a1)
/* f143730: a4670010 */ sh $a3,0x10($v1)
/* f143734: 448e2000 */ mtc1 $t6,$f4
/* f143738: 00000000 */ nop
/* f14373c: 468021a0 */ cvt.s.w $f6,$f4
/* f143740: 46003202 */ mul.s $f8,$f6,$f0
/* f143744: 4600428d */ trunc.w.s $f10,$f8
/* f143748: 44185000 */ mfc1 $t8,$f10
/* f14374c: 00000000 */ nop
/* f143750: a478000e */ sh $t8,0xe($v1)
/* f143754: 8cb90010 */ lw $t9,0x10($a1)
/* f143758: 44998000 */ mtc1 $t9,$f16
/* f14375c: 00000000 */ nop
/* f143760: 468084a0 */ cvt.s.w $f18,$f16
/* f143764: 46009102 */ mul.s $f4,$f18,$f0
/* f143768: 4600218d */ trunc.w.s $f6,$f4
/* f14376c: 440a3000 */ mfc1 $t2,$f6
/* f143770: 00000000 */ nop
/* f143774: a46a0018 */ sh $t2,0x18($v1)
/* f143778: 8cab0014 */ lw $t3,0x14($a1)
/* f14377c: a467001c */ sh $a3,0x1c($v1)
/* f143780: 448b4000 */ mtc1 $t3,$f8
/* f143784: 00000000 */ nop
/* f143788: 468042a0 */ cvt.s.w $f10,$f8
/* f14378c: 46005402 */ mul.s $f16,$f10,$f0
/* f143790: 4600848d */ trunc.w.s $f18,$f16
/* f143794: 440d9000 */ mfc1 $t5,$f18
/* f143798: 00000000 */ nop
/* f14379c: a46d001a */ sh $t5,0x1a($v1)
/* f1437a0: 8cae0018 */ lw $t6,0x18($a1)
/* f1437a4: 448e2000 */ mtc1 $t6,$f4
/* f1437a8: 00000000 */ nop
/* f1437ac: 468021a0 */ cvt.s.w $f6,$f4
/* f1437b0: 46003202 */ mul.s $f8,$f6,$f0
/* f1437b4: 4600428d */ trunc.w.s $f10,$f8
/* f1437b8: 44185000 */ mfc1 $t8,$f10
/* f1437bc: 00000000 */ nop
/* f1437c0: a4780024 */ sh $t8,0x24($v1)
/* f1437c4: 8cb9001c */ lw $t9,0x1c($a1)
/* f1437c8: a4670028 */ sh $a3,0x28($v1)
/* f1437cc: 02002825 */ or $a1,$s0,$zero
/* f1437d0: 44998000 */ mtc1 $t9,$f16
/* f1437d4: 26100008 */ addiu $s0,$s0,0x8
/* f1437d8: 02003025 */ or $a2,$s0,$zero
/* f1437dc: 468084a0 */ cvt.s.w $f18,$f16
/* f1437e0: 26100008 */ addiu $s0,$s0,0x8
/* f1437e4: 46009102 */ mul.s $f4,$f18,$f0
/* f1437e8: 4600218d */ trunc.w.s $f6,$f4
/* f1437ec: 440a3000 */ mfc1 $t2,$f6
/* f1437f0: 00000000 */ nop
/* f1437f4: a46a0026 */ sh $t2,0x26($v1)
/* f1437f8: 93ad0037 */ lbu $t5,0x37($sp)
/* f1437fc: 93ab0033 */ lbu $t3,0x33($sp)
/* f143800: 93b8003b */ lbu $t8,0x3b($sp)
/* f143804: 000d7400 */ sll $t6,$t5,0x10
/* f143808: 000b6600 */ sll $t4,$t3,0x18
/* f14380c: 018e7825 */ or $t7,$t4,$t6
/* f143810: 0018ca00 */ sll $t9,$t8,0x8
/* f143814: 01f92025 */ or $a0,$t7,$t9
/* f143818: 348900ff */ ori $t1,$a0,0xff
/* f14381c: ac490000 */ sw $t1,0x0($v0)
/* f143820: 93aa003f */ lbu $t2,0x3f($sp)
/* f143824: 3c0d0704 */ lui $t5,0x704
/* f143828: 35ad0008 */ ori $t5,$t5,0x8
/* f14382c: 008a5825 */ or $t3,$a0,$t2
/* f143830: ac4b0004 */ sw $t3,0x4($v0)
/* f143834: a0600007 */ sb $zero,0x7($v1)
/* f143838: a0600013 */ sb $zero,0x13($v1)
/* f14383c: a068001f */ sb $t0,0x1f($v1)
/* f143840: a068002b */ sb $t0,0x2b($v1)
/* f143844: aca20004 */ sw $v0,0x4($a1)
/* f143848: acad0000 */ sw $t5,0x0($a1)
/* f14384c: 3c0c0430 */ lui $t4,0x430
/* f143850: 358c0030 */ ori $t4,$t4,0x30
/* f143854: acc30004 */ sw $v1,0x4($a2)
/* f143858: accc0000 */ sw $t4,0x0($a2)
/* f14385c: 02001825 */ or $v1,$s0,$zero
/* f143860: 3c0eb100 */ lui $t6,0xb100
/* f143864: 35ce0032 */ ori $t6,$t6,0x32
/* f143868: 24182010 */ addiu $t8,$zero,0x2010
/* f14386c: ac780004 */ sw $t8,0x4($v1)
/* f143870: ac6e0000 */ sw $t6,0x0($v1)
/* f143874: 8fbf001c */ lw $ra,0x1c($sp)
/* f143878: 26020008 */ addiu $v0,$s0,0x8
/* f14387c: 8fb00018 */ lw $s0,0x18($sp)
/* f143880: 03e00008 */ jr $ra
/* f143884: 27bd0028 */ addiu $sp,$sp,0x28
);
Gfx *hudRenderEyespySideRect(Gfx *gdl, s32 *points, u8 r, u8 g, u8 b, u8 alpha)
{
struct gfxvtx *vertices = gfxAllocateVertices(4);
u32 *colours = gfxAllocateColours(2);
vertices[0].x = points[0] * 10.0f;
vertices[0].y = points[1] * 10.0f;
vertices[0].z = -10;
vertices[1].x = points[2] * 10.0f;
vertices[1].y = points[3] * 10.0f;
vertices[1].z = -10;
vertices[2].x = points[4] * 10.0f;
vertices[2].y = points[5] * 10.0f;
vertices[2].z = -10;
vertices[3].x = points[6] * 10.0f;
vertices[3].y = points[7] * 10.0f;
vertices[3].z = -10;
colours[0] = r << 0x18 | g << 0x10 | b << 8 | 0xff;
colours[1] = r << 0x18 | g << 0x10 | b << 8 | alpha;
vertices[0].s = 0;
vertices[1].s = 0;
vertices[2].s = 4;
vertices[3].s = 4;
gDPSetColorArray(gdl++, colours, 2);
gDPSetVerticeArray(gdl++, vertices, 4);
if (colours);
gDPTri2(gdl++, 0, 1, 2, 0, 2, 3);
return gdl;
}
const char var7f1b5de4[] = "%s %s%5.2f";
const char var7f1b5df0[] = "";
@ -5523,7 +5427,7 @@ glabel var7f1b5f58
/* f146fe4: 14600006 */ bnez $v1,.L0f147000
/* f146fe8: 00000000 */ nop
/* f146fec: afa00010 */ sw $zero,0x10($sp)
/* f146ff0: 0fc50d9e */ jal hudRenderEyespySideBar
/* f146ff0: 0fc50d9e */ jal hudRenderEyespySideRect
/* f146ff4: afa20014 */ sw $v0,0x14($sp)
/* f146ff8: 10000017 */ b .L0f147058
/* f146ffc: 0040a825 */ or $s5,$v0,$zero
@ -5537,7 +5441,7 @@ glabel var7f1b5f58
/* f147018: 27a50224 */ addiu $a1,$sp,0x224
/* f14701c: 24060010 */ addiu $a2,$zero,0x10
/* f147020: 326700ff */ andi $a3,$s3,0xff
/* f147024: 0fc50d9e */ jal hudRenderEyespySideBar
/* f147024: 0fc50d9e */ jal hudRenderEyespySideRect
/* f147028: afa20014 */ sw $v0,0x14($sp)
/* f14702c: 1000000a */ b .L0f147058
/* f147030: 0040a825 */ or $s5,$v0,$zero
@ -5548,7 +5452,7 @@ glabel var7f1b5f58
/* f147040: 27a50224 */ addiu $a1,$sp,0x224
/* f147044: 326600ff */ andi $a2,$s3,0xff
/* f147048: afa00010 */ sw $zero,0x10($sp)
/* f14704c: 0fc50d9e */ jal hudRenderEyespySideBar
/* f14704c: 0fc50d9e */ jal hudRenderEyespySideRect
/* f147050: afa20014 */ sw $v0,0x14($sp)
/* f147054: 0040a825 */ or $s5,$v0,$zero
.L0f147058:
@ -5679,7 +5583,7 @@ glabel var7f1b5f58
/* f147234: 14600006 */ bnez $v1,.L0f147250
/* f147238: 00000000 */ nop
/* f14723c: afa00010 */ sw $zero,0x10($sp)
/* f147240: 0fc50d9e */ jal hudRenderEyespySideBar
/* f147240: 0fc50d9e */ jal hudRenderEyespySideRect
/* f147244: afa20014 */ sw $v0,0x14($sp)
/* f147248: 10000017 */ b .L0f1472a8
/* f14724c: 0040a825 */ or $s5,$v0,$zero
@ -5693,7 +5597,7 @@ glabel var7f1b5f58
/* f147268: 27a50224 */ addiu $a1,$sp,0x224
/* f14726c: 24060010 */ addiu $a2,$zero,0x10
/* f147270: 326700ff */ andi $a3,$s3,0xff
/* f147274: 0fc50d9e */ jal hudRenderEyespySideBar
/* f147274: 0fc50d9e */ jal hudRenderEyespySideRect
/* f147278: afa20014 */ sw $v0,0x14($sp)
/* f14727c: 1000000a */ b .L0f1472a8
/* f147280: 0040a825 */ or $s5,$v0,$zero
@ -5704,7 +5608,7 @@ glabel var7f1b5f58
/* f147290: 27a50224 */ addiu $a1,$sp,0x224
/* f147294: 326600ff */ andi $a2,$s3,0xff
/* f147298: afa00010 */ sw $zero,0x10($sp)
/* f14729c: 0fc50d9e */ jal hudRenderEyespySideBar
/* f14729c: 0fc50d9e */ jal hudRenderEyespySideRect
/* f1472a0: afa20014 */ sw $v0,0x14($sp)
/* f1472a4: 0040a825 */ or $s5,$v0,$zero
.L0f1472a8:
@ -6660,13 +6564,13 @@ glabel var7f1b5f58
//
// // 6fec
// if (g_Vars.currentplayer->eyespy->mode == EYESPYMODE_CAMSPY) {
// gdl = hudRenderEyespySideBar(gdl, points, 0, brightness, 0, alpha);
// gdl = hudRenderEyespySideRect(gdl, points, 0, brightness, 0, alpha);
// } else if (g_Vars.currentplayer->eyespy->mode == EYESPYMODE_DRUGSPY) {
// // 7014
// gdl = hudRenderEyespySideBar(gdl, points, 0x10, brightness, brightness * 3, alpha);
// gdl = hudRenderEyespySideRect(gdl, points, 0x10, brightness, brightness * 3, alpha);
// } else {
// // 7080
// gdl = hudRenderEyespySideBar(gdl, points, brightness, brightness >> 2, 0, alpha);
// gdl = hudRenderEyespySideRect(gdl, points, brightness, brightness >> 2, 0, alpha);
// }
//
// y += barheight;
@ -6714,11 +6618,11 @@ glabel var7f1b5f58
//
// if (g_Vars.currentplayer->eyespy->mode == EYESPYMODE_CAMSPY) {
// // 7240
// gdl = hudRenderEyespySideBar(gdl, points, 0, brightness, 0, alpha);
// gdl = hudRenderEyespySideRect(gdl, points, 0, brightness, 0, alpha);
// } else if (g_Vars.currentplayer->eyespy->mode == EYESPYMODE_DRUGSPY) {
// gdl = hudRenderEyespySideBar(gdl, points, 0x10, brightness, brightness * 3, alpha);
// gdl = hudRenderEyespySideRect(gdl, points, 0x10, brightness, brightness * 3, alpha);
// } else {
// gdl = hudRenderEyespySideBar(gdl, points, brightness, brightness >> 2, 0, alpha);
// gdl = hudRenderEyespySideRect(gdl, points, brightness, brightness >> 2, 0, alpha);
// }
//
// y += barheight;

4
src/game/game_150820.c
View File

@ -1347,7 +1347,7 @@ glabel func0f151780
/* f151bcc: 00000000 */ nop
.L0f151bd0:
/* f151bd0: 44caf800 */ ctc1 $t2,$31
/* f151bd4: 0fc59e73 */ jal func0f1679cc
/* f151bd4: 0fc59e73 */ jal gfxAllocateColours
/* f151bd8: 00000000 */ nop
/* f151bdc: 8e4b0000 */ lw $t3,0x0($s2)
/* f151be0: 00403025 */ or $a2,$v0,$zero
@ -1888,7 +1888,7 @@ glabel func0f151ed0
/* f1523c4: 00000000 */ nop
.L0f1523c8:
/* f1523c8: 44cef800 */ ctc1 $t6,$31
/* f1523cc: 0fc59e73 */ jal func0f1679cc
/* f1523cc: 0fc59e73 */ jal gfxAllocateColours
/* f1523d0: 00000000 */ nop
/* f1523d4: 8e4f0000 */ lw $t7,0x0($s2)
/* f1523d8: 00403025 */ or $a2,$v0,$zero

4
src/game/game_1531a0.c
View File

@ -1979,10 +1979,10 @@ glabel func0f154f38
/* f155160: a7b80038 */ sh $t8,0x38($sp)
/* f155164: 0007c180 */ sll $t8,$a3,0x6
/* f155168: 27190001 */ addiu $t9,$t8,0x1
/* f15516c: 0fc59e59 */ jal func0f167964
/* f15516c: 0fc59e59 */ jal gfxAllocateVertices
/* f155170: a7b90030 */ sh $t9,0x30($sp)
/* f155174: 24040001 */ addiu $a0,$zero,0x1
/* f155178: 0fc59e73 */ jal func0f1679cc
/* f155178: 0fc59e73 */ jal gfxAllocateColours
/* f15517c: afa2002c */ sw $v0,0x2c($sp)
/* f155180: 8fa3002c */ lw $v1,0x2c($sp)
/* f155184: 3c0dff00 */ lui $t5,0xff00

4
src/game/game_157db0.c
View File

@ -337,10 +337,10 @@ glabel func0f158184
/* f15819c: 00a08825 */ or $s1,$a1,$zero
/* f1581a0: 59c00090 */ blezl $t6,.L0f1583e4
/* f1581a4: a620024a */ sh $zero,0x24a($s1)
/* f1581a8: 0fc59e59 */ jal func0f167964
/* f1581a8: 0fc59e59 */ jal gfxAllocateVertices
/* f1581ac: 84a40248 */ lh $a0,0x248($a1)
/* f1581b0: 86240248 */ lh $a0,0x248($s1)
/* f1581b4: 0fc59e73 */ jal func0f1679cc
/* f1581b4: 0fc59e73 */ jal gfxAllocateColours
/* f1581b8: afa20024 */ sw $v0,0x24($sp)
/* f1581bc: 86280248 */ lh $t0,0x248($s1)
/* f1581c0: 8faa0024 */ lw $t2,0x24($sp)

4
src/game/game_166e40.c
View File

@ -495,7 +495,7 @@ glabel func0f16793c
);
GLOBAL_ASM(
glabel func0f167964
glabel gfxAllocateVertices
/* f167964: 3c06800b */ lui $a2,%hi(var800aa59c)
/* f167968: 24c6a59c */ addiu $a2,$a2,%lo(var800aa59c)
/* f16796c: 8cc20000 */ lw $v0,0x0($a2)
@ -533,7 +533,7 @@ glabel func0f1679b0
);
GLOBAL_ASM(
glabel func0f1679cc
glabel gfxAllocateColours
/* f1679cc: 3c06800b */ lui $a2,%hi(var800aa59c)
/* f1679d0: 24c6a59c */ addiu $a2,$a2,%lo(var800aa59c)
/* f1679d4: 00047080 */ sll $t6,$a0,0x2

12
src/game/propobj.c
View File

@ -29205,10 +29205,10 @@ glabel var7f1aa824
/* f07fc34: 31cf00ff */ andi $t7,$t6,0xff
/* f07fc38: 55e10359 */ bnel $t7,$at,.L0f0809a0
/* f07fc3c: 8fbf004c */ lw $ra,0x4c($sp)
/* f07fc40: 0fc59e59 */ jal func0f167964
/* f07fc40: 0fc59e59 */ jal gfxAllocateVertices
/* f07fc44: 24040004 */ addiu $a0,$zero,0x4
/* f07fc48: afa200b4 */ sw $v0,0xb4($sp)
/* f07fc4c: 0fc59e73 */ jal func0f1679cc
/* f07fc4c: 0fc59e73 */ jal gfxAllocateColours
/* f07fc50: 24040001 */ addiu $a0,$zero,0x1
/* f07fc54: 8fb800c4 */ lw $t8,0xc4($sp)
/* f07fc58: afa200b0 */ sw $v0,0xb0($sp)
@ -30541,10 +30541,10 @@ glabel func0f080f8c
/* f080fa0: afa50104 */ sw $a1,0x104($sp)
/* f080fa4: afa60108 */ sw $a2,0x108($sp)
/* f080fa8: afa7010c */ sw $a3,0x10c($sp)
/* f080fac: 0fc59e59 */ jal func0f167964
/* f080fac: 0fc59e59 */ jal gfxAllocateVertices
/* f080fb0: 24040004 */ addiu $a0,$zero,0x4
/* f080fb4: 00408025 */ or $s0,$v0,$zero
/* f080fb8: 0fc59e73 */ jal func0f1679cc
/* f080fb8: 0fc59e73 */ jal gfxAllocateColours
/* f080fbc: 24040001 */ addiu $a0,$zero,0x1
/* f080fc0: 8fae0118 */ lw $t6,0x118($sp)
/* f080fc4: 3c11800b */ lui $s1,%hi(var800ab588)
@ -31026,7 +31026,7 @@ glabel var7f1aa82c
/* f08169c: 37380007 */ ori $t8,$t9,0x7
/* f0816a0: 3b090007 */ xori $t1,$t8,0x7
/* f0816a4: afa90054 */ sw $t1,0x54($sp)
/* f0816a8: 0fc59e73 */ jal func0f1679cc
/* f0816a8: 0fc59e73 */ jal gfxAllocateColours
/* f0816ac: 94c40016 */ lhu $a0,0x16($a2)
/* f0816b0: 8fa60060 */ lw $a2,0x60($sp)
/* f0816b4: 8fa8007c */ lw $t0,0x7c($sp)
@ -44281,7 +44281,7 @@ glabel func0f08d3dc
/* f08d418: 8e040018 */ lw $a0,0x18($s0)
/* f08d41c: 8fb90028 */ lw $t9,0x28($sp)
/* f08d420: afa20024 */ sw $v0,0x24($sp)
/* f08d424: 0fc59e59 */ jal func0f167964
/* f08d424: 0fc59e59 */ jal gfxAllocateVertices
/* f08d428: 87240010 */ lh $a0,0x10($t9)
/* f08d42c: 8fa30028 */ lw $v1,0x28($sp)
/* f08d430: 8fa80024 */ lw $t0,0x24($sp)

4
src/game/smoke.c
View File

@ -44,10 +44,10 @@ glabel func0f12d3f0
/* f12d404: afb00014 */ sw $s0,0x14($sp)
/* f12d408: afa500bc */ sw $a1,0xbc($sp)
/* f12d40c: afa700c4 */ sw $a3,0xc4($sp)
/* f12d410: 0fc59e59 */ jal func0f167964
/* f12d410: 0fc59e59 */ jal gfxAllocateVertices
/* f12d414: 24040004 */ addiu $a0,$zero,0x4
/* f12d418: 24040001 */ addiu $a0,$zero,0x1
/* f12d41c: 0fc59e73 */ jal func0f1679cc
/* f12d41c: 0fc59e73 */ jal gfxAllocateColours
/* f12d420: afa200b4 */ sw $v0,0xb4($sp)
/* f12d424: 0fc2d5de */ jal currentPlayerGetUnk174c
/* f12d428: 00408025 */ or $s0,$v0,$zero

4
src/game/title.c
View File

@ -3063,10 +3063,10 @@ glabel var7f1a8468
/* f018a68: ac590000 */ sw $t9,0x0($v0)
/* f018a6c: ac400004 */ sw $zero,0x4($v0)
.L0f018a70:
/* f018a70: 0fc59e59 */ jal func0f167964
/* f018a70: 0fc59e59 */ jal gfxAllocateVertices
/* f018a74: 8fa400dc */ lw $a0,0xdc($sp)
/* f018a78: afa20044 */ sw $v0,0x44($sp)
/* f018a7c: 0fc59e73 */ jal func0f1679cc
/* f018a7c: 0fc59e73 */ jal gfxAllocateColours
/* f018a80: 8fa400d8 */ lw $a0,0xd8($sp)
/* f018a84: 3c013f80 */ lui $at,0x3f80
/* f018a88: 44812000 */ mtc1 $at,$f4

8
src/game/wallhit.c
View File

@ -1166,7 +1166,7 @@ glabel var7f1b5d18
/* f13efa0: 3c017f1b */ lui $at,%hi(var7f1b5d14)
/* f13efa4: c4305d14 */ lwc1 $f16,%lo(var7f1b5d14)($at)
/* f13efa8: 24040004 */ addiu $a0,$zero,0x4
/* f13efac: 0fc59e59 */ jal func0f167964
/* f13efac: 0fc59e59 */ jal gfxAllocateVertices
/* f13efb0: 46109580 */ add.s $f22,$f18,$f16
/* f13efb4: ae220064 */ sw $v0,0x64($s1)
/* f13efb8: c7d00008 */ lwc1 $f16,0x8($s8)
@ -3057,7 +3057,7 @@ glabel func0f1408a8
/* f140a4c: 9212006a */ lbu $s2,0x6a($s0)
/* f140a50: 9213006b */ lbu $s3,0x6b($s0)
.L0f140a54:
/* f140a54: 0fc59e73 */ jal func0f1679cc
/* f140a54: 0fc59e73 */ jal gfxAllocateColours
/* f140a58: 24040004 */ addiu $a0,$zero,0x4
/* f140a5c: 8e010040 */ lw $at,0x40($s0)
/* f140a60: 3c0a070c */ lui $t2,0x70c
@ -3238,7 +3238,7 @@ glabel func0f140b7c
/* f140cf0: 9212006a */ lbu $s2,0x6a($s0)
/* f140cf4: 9213006b */ lbu $s3,0x6b($s0)
.L0f140cf8:
/* f140cf8: 0fc59e73 */ jal func0f1679cc
/* f140cf8: 0fc59e73 */ jal gfxAllocateColours
/* f140cfc: 24040004 */ addiu $a0,$zero,0x4
/* f140d00: 8e010040 */ lw $at,0x40($s0)
/* f140d04: 3c0c070c */ lui $t4,0x70c
@ -3475,7 +3475,7 @@ glabel func0f140e20
/* f14105c: 9216006a */ lbu $s6,0x6a($s0)
/* f141060: 9217006b */ lbu $s7,0x6b($s0)
.L0f141064:
/* f141064: 0fc59e73 */ jal func0f1679cc
/* f141064: 0fc59e73 */ jal gfxAllocateColours
/* f141068: 24040004 */ addiu $a0,$zero,0x4
/* f14106c: 8e010040 */ lw $at,0x40($s0)
/* f141070: 3c18070c */ lui $t8,0x70c

8
src/game/weather.c
View File

@ -3036,7 +3036,7 @@ glabel var7f1b5780
/* f133c3c: 26d64928 */ addiu $s6,$s6,%lo(g_Rooms)
/* f133c40: 2415008c */ addiu $s5,$zero,0x8c
/* f133c44: c7b40c84 */ lwc1 $f20,0xc84($sp)
/* f133c48: 0fc59e73 */ jal func0f1679cc
/* f133c48: 0fc59e73 */ jal gfxAllocateColours
/* f133c4c: 24040002 */ addiu $a0,$zero,0x2
/* f133c50: 3c0d8008 */ lui $t5,%hi(var8007f0e4)
/* f133c54: 8dadf0e4 */ lw $t5,%lo(var8007f0e4)($t5)
@ -3116,7 +3116,7 @@ glabel var7f1b5780
/* f133d78: 0019c880 */ sll $t9,$t9,0x2
/* f133d7c: 15600004 */ bnez $t3,.L0f133d90
/* f133d80: afb9008c */ sw $t9,0x8c($sp)
/* f133d84: 0fc59e59 */ jal func0f167964
/* f133d84: 0fc59e59 */ jal gfxAllocateVertices
/* f133d88: 2404000c */ addiu $a0,$zero,0xc
/* f133d8c: afa20210 */ sw $v0,0x210($sp)
.L0f133d90:
@ -4463,7 +4463,7 @@ glabel var7f1b5790
/* f135140: 26310004 */ addiu $s1,$s1,0x4
/* f135144: 1420ffdf */ bnez $at,.L0f1350c4
/* f135148: e600fffc */ swc1 $f0,-0x4($s0)
/* f13514c: 0fc59e73 */ jal func0f1679cc
/* f13514c: 0fc59e73 */ jal gfxAllocateColours
/* f135150: 24040010 */ addiu $a0,$zero,0x10
/* f135154: 00408025 */ or $s0,$v0,$zero
/* f135158: 240310ef */ addiu $v1,$zero,0x10ef
@ -4568,7 +4568,7 @@ glabel var7f1b5790
/* f1352d4: 0019c880 */ sll $t9,$t9,0x2
/* f1352d8: 17000004 */ bnez $t8,.L0f1352ec
/* f1352dc: afb90080 */ sw $t9,0x80($sp)
/* f1352e0: 0fc59e59 */ jal func0f167964
/* f1352e0: 0fc59e59 */ jal gfxAllocateVertices
/* f1352e4: 24040008 */ addiu $a0,$zero,0x8
/* f1352e8: afa20214 */ sw $v0,0x214($sp)
.L0f1352ec:

9
src/include/PR/gbi.h
View File

@ -3163,15 +3163,6 @@ typedef union {
_SHIFTL(b, 8, 8) | _SHIFTL(a, 0, 8)); \
}
#define gDPSetPrimColorViaWord(pkt, m, l, rgba) \
{ \
Gfx *_g = (Gfx *)(pkt); \
\
_g->words.w0 = (_SHIFTL(G_SETPRIMCOLOR, 24, 8) | \
_SHIFTL(m, 8, 8) | _SHIFTL(l, 0, 8)); \
_g->words.w1 = (rgba); \
}
#define gsDPSetPrimColor(m, l, r, g, b, a) \
{{ \
(_SHIFTL(G_SETPRIMCOLOR, 24, 8) | _SHIFTL(m, 8, 8) | \

2
src/include/game/game_141820.h
View File

@ -15,7 +15,7 @@ Gfx *func0f14298c(Gfx *gdl, u32 arg1, u32 arg2);
Gfx *func0f142bf0(Gfx *gdl, u32 colour, s32 alpha, f32 arg3, f32 arg4);
u32 func0f142d74(void);
Gfx *hudRenderEyespyView(Gfx *gdl, s32 arg1, u32 arg2, u32 arg3, u32 arg4, u32 arg5);
Gfx *hudRenderEyespySideBar(Gfx *gdl, s32 *points, u8 r, u8 g, u8 b, u8 alpha);
Gfx *hudRenderEyespySideRect(Gfx *gdl, s32 *points, u8 r, u8 g, u8 b, u8 alpha);
Gfx *hudRenderEyespyUi(Gfx *gdl);
Gfx *func0f1472fc(Gfx *gdl);
Gfx *func0f147578(Gfx *gdl);

4
src/include/game/game_166e40.h
View File

@ -20,10 +20,10 @@ void func0f1672f0(u8 arg0);
void func0f167330(void);
void func0f167350(void);
Gfx *func0f16793c(void);
u32 func0f167964(void);
struct gfxvtx *gfxAllocateVertices(s32 count);
u32 func0f167998(void);
u32 func0f1679b0(void);
u32 func0f1679cc(void);
u32 *gfxAllocateColours(s32 count);
struct model0c *func0f1679f4(s32 arg0);
void func0f167a18(void);

107
src/include/gbiex.h Normal file
View File

@ -0,0 +1,107 @@
#ifndef _IN_GBIEX_H
#define _IN_GBIEX_H
#include <ultra64.h>
#include "types.h"
/**
* 04 rsp_uc05_vertex
*
* upper word
* 00F00000 number of points
* 000FFFFF number of bytes to grab
*
* lower word
* 0f000000 segment
* 00ffffff offset in point table
*/
#define gDPSetVerticeArray(pkt, ptr, numvertices) \
{ \
Gfx *_g = (Gfx *)(pkt); \
\
_g->words.w0 = (_SHIFTL(0x04, 24, 8) \
| _SHIFTL(numvertices - 1, 20, 4) \
| _SHIFTL(numvertices * sizeof(struct gfxvtx), 0, 20)); \
_g->words.w1 = (unsigned int)(ptr); \
}
/**
* 07 rsp_color
* This PD-specific command declares offset to RGBA data
*
* upper word
* 00FF0000 number of bytes to grab, -4
* 0000FFFF number of bytes to grab
*
* lower word
* 0f000000 segment
* 00ffffff address or offset in file
*/
#define gDPSetColorArray(pkt, ptr, numcolors) \
{ \
Gfx *_g = (Gfx *)(pkt); \
\
_g->words.w0 = (_SHIFTL(0x07, 24, 8) \
| _SHIFTL((numcolors - 1) * 4, 16, 8) \
| _SHIFTL(numcolors * 4, 0, 16)); \
_g->words.w1 = (unsigned int)(ptr); \
}
/**
* B1 rsp_tri4
* Draws up to four triangles at a time.
* Expects values from 0-F, corresponding with # points declared by vertex command.
* Triangles with all points set to 0 are not drawn.
*
* upper word
* 0000F000 z4
* 00000F00 z3
* 000000F0 z2
* 0000000F z1
*
* lower word
* f0000000 y4
* 0f000000 x4
* 00f00000 y3
* 000f0000 x3
* 0000f000 y2
* 00000f00 x2
* 000000f0 y1
* 0000000f x1
*/
#define gDPTri4(pkt, x1, y1, z1, x2, y2, z2, x3, y3, z3, x4, y4, z4) \
{ \
Gfx *_g = (Gfx *)(pkt); \
\
_g->words.w0 = (_SHIFTL(0xb1, 24, 8) \
| _SHIFTL(z4, 12, 4) \
| _SHIFTL(z3, 8, 4) \
| _SHIFTL(z2, 4, 4) \
| _SHIFTL(z1, 0, 4)); \
_g->words.w1 = (_SHIFTL(y4, 28, 4) \
| _SHIFTL(x4, 24, 4) \
| _SHIFTL(y3, 20, 4) \
| _SHIFTL(x3, 16, 4) \
| _SHIFTL(y2, 12, 4) \
| _SHIFTL(x2, 8, 4) \
| _SHIFTL(y1, 4, 4) \
| _SHIFTL(x1, 0, 4)); \
}
#define gDPTri2(pkt, x1, y1, z1, x2, y2, z2) \
gDPTri4(pkt, x1, y1, z1, x2, y2, z2, 0, 0, 0, 0, 0, 0)
/**
* Like gDPSetPrimColor, but is useful when the input colour is already in
* RGBA format. It avoids unnecessary bitshifting and masking.
*/
#define gDPSetPrimColorViaWord(pkt, m, l, rgba) \
{ \
Gfx *_g = (Gfx *)(pkt); \
\
_g->words.w0 = (_SHIFTL(G_SETPRIMCOLOR, 24, 8) \
| _SHIFTL(m, 8, 8) \
| _SHIFTL(l, 0, 8)); \
_g->words.w1 = (rgba); \
}
#endif

11
src/include/types.h
View File

@ -2,6 +2,7 @@
#define _IN_TYPES_H
#include <ultra64.h>
#include "constants.h"
#include "gbiex.h"
#define bool s32
#define ubool u32
@ -6646,4 +6647,14 @@ struct textureconfig {
u8 t;
};
struct gfxvtx {
/*0x00*/ s16 x;
/*0x02*/ s16 y;
/*0x04*/ s16 z;
/*0x06*/ u8 flags;
/*0x07*/ u8 s;
/*0x08*/ u8 t;
/*0x0a*/ u16 unk0a;
};
#endif

2
src/lib/lib_1a500.c
View File

@ -8094,7 +8094,7 @@ glabel var70054454
/* 21af8: 0320f809 */ jalr $t9
/* 21afc: e7a80098 */ swc1 $f8,0x98($sp)
/* 21b00: 00408025 */ or $s0,$v0,$zero
/* 21b04: 0fc59e73 */ jal func0f1679cc
/* 21b04: 0fc59e73 */ jal gfxAllocateColours
/* 21b08: 24040001 */ addiu $a0,$zero,0x1
/* 21b0c: 27a30084 */ addiu $v1,$sp,0x84
/* 21b10: afa20078 */ sw $v0,0x78($sp)