mirror/perfect-dark
1
0
Fork 0
mirror of https://gitlab.com/ryandwyer/perfect-dark synced 2026-07-11 14:08:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Decompile texSelect

Browse Source
This commit is contained in:
Ryan Dwyer
2022-04-17 13:48:31 +10:00
parent 4bc38da09a
commit 2c01a9a557
36 changed files with 584 additions and 1288 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/activemenu.c
+6 -6
View File
@@ -2841,7 +2841,7 @@ glabel amRender
/* f1017b8: 27a40148 */ addiu $a0,$sp,0x148
/* f1017bc: 00002825 */ move $a1,$zero
/* f1017c0: 24060002 */ li $a2,0x2
/* f1017c4: 0fc2d290 */ jal tex0f0b39c0
/* f1017c4: 0fc2d290 */ jal texSelect
/* f1017c8: 00003825 */ move $a3,$zero
/* f1017cc: 8fac0148 */ lw $t4,0x148($sp)
/* f1017d0: 3c0eb900 */ lui $t6,0xb900
@@ -3750,7 +3750,7 @@ glabel amRender
/* f1014d4: 27a401d8 */ addiu $a0,$sp,0x1d8
/* f1014d8: 00002825 */ move $a1,$zero
/* f1014dc: 24060002 */ li $a2,0x2
/* f1014e0: 0fc2cfb8 */ jal tex0f0b39c0
/* f1014e0: 0fc2cfb8 */ jal texSelect
/* f1014e4: 00003825 */ move $a3,$zero
/* f1014e8: 8faf01d8 */ lw $t7,0x1d8($sp)
/* f1014ec: 3c19b900 */ lui $t9,0xb900
@@ -5329,7 +5329,7 @@ glabel amRender
/* f1012f4: 27a401d8 */ addiu $a0,$sp,0x1d8
/* f1012f8: 00002825 */ move $a1,$zero
/* f1012fc: 24060002 */ li $a2,0x2
/* f101300: 0fc2cf74 */ jal tex0f0b39c0
/* f101300: 0fc2cf74 */ jal texSelect
/* f101304: 00003825 */ move $a3,$zero
/* f101308: 8faf01d8 */ lw $t7,0x1d8($sp)
/* f10130c: 3c19b900 */ lui $t9,0xb900
@@ -6918,7 +6918,7 @@ glabel amRender
/* f100d74: 27a401d8 */ addiu $a0,$sp,0x1d8
/* f100d78: 00002825 */ or $a1,$zero,$zero
/* f100d7c: 24060002 */ addiu $a2,$zero,0x2
/* f100d80: 0fc2ce70 */ jal tex0f0b39c0
/* f100d80: 0fc2ce70 */ jal texSelect
/* f100d84: 00003825 */ or $a3,$zero,$zero
/* f100d88: 8fb901d8 */ lw $t9,0x1d8($sp)
/* f100d8c: 3c0fb900 */ lui $t7,0xb900
@@ -8507,7 +8507,7 @@ glabel amRender
/* f0fced8: 27a401b0 */ addiu $a0,$sp,0x1b0
/* f0fcedc: 00002825 */ or $a1,$zero,$zero
/* f0fcee0: 24060002 */ addiu $a2,$zero,0x2
/* f0fcee4: 0fc2c5c8 */ jal tex0f0b39c0
/* f0fcee4: 0fc2c5c8 */ jal texSelect
/* f0fcee8: 00003825 */ or $a3,$zero,$zero
/* f0fceec: 8fb901b0 */ lw $t9,0x1b0($sp)
/* f0fcef0: 3c0fb900 */ lui $t7,0xb900
@@ -9806,7 +9806,7 @@ glabel amRender
// gDPSetCombineMode(gdl++, G_CC_MODULATEI, G_CC_MODULATEI);
// gSPClearGeometryMode(gdl++, G_CULL_BOTH);
//
// tex0f0b39c0(&gdl, NULL, 2, 0, 2, 1, NULL);
// texSelect(&gdl, NULL, 2, 0, 2, 1, NULL);
//
// gDPSetRenderMode(gdl++, G_RM_XLU_SURF, G_RM_XLU_SURF2);
//
src/game/bg.c
+1 -1
View File
@@ -2487,7 +2487,7 @@ Gfx *bgRenderSceneInXray(Gfx *gdl)
gDPSetRenderMode(gdl++, G_RM_AA_XLU_SURF, G_RM_AA_XLU_SURF2);
gSPMatrix(gdl++, osVirtualToPhysical(camGetUnk1758()), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION);
tex0f0b39c0(&gdl, NULL, 2, 0, 2, 1, NULL);
texSelect(&gdl, NULL, 2, 0, 2, 1, NULL);
gDPSetRenderMode(gdl++, G_RM_AA_XLU_SURF, G_RM_AA_XLU_SURF2);
src/game/camdraw.c
+2 -5
View File
@@ -22,10 +22,7 @@
struct var800a45a0 *var800a45a0;
u32 var800a45a4;
u32 var800a45a8;
u32 var800a45ac;
u32 var800a45b0;
u32 var800a45b4;
struct texturething var800a45a8;
u32 var800a45b8;
u32 var800a45bc;
@@ -2080,7 +2077,7 @@ Gfx *func0f14c870(Gfx *gdl, struct textureconfig *tconfig, f32 *arg2, f32 arg3,
gDPSetTextureConvert(gdl++, G_TC_FILT);
gDPSetCombineMode(gdl++, G_CC_MODULATEI, G_CC_MODULATEI);
tex0f0b39c0(&gdl, tconfig, 1, 0, 2, 1, &var800a45a8);
texSelect(&gdl, tconfig, 1, 0, 2, 1, &var800a45a8);
gDPSetCycleType(gdl++, G_CYC_1CYCLE);
gDPSetCombineMode(gdl++, G_CC_DECALRGBA, G_CC_DECALRGBA);
src/game/chr.c
+3 -3
View File
@@ -6787,7 +6787,7 @@ glabel var7f1a9ba0pf
/* f029df4: 24060004 */ li $a2,0x4
/* f029df8: 24070001 */ li $a3,0x1
/* f029dfc: afa00018 */ sw $zero,0x18($sp)
/* f029e00: 0fc2cfb8 */ jal tex0f0b39c0
/* f029e00: 0fc2cfb8 */ jal texSelect
/* f029e04: e7ae016c */ swc1 $f14,0x16c($sp)
/* f029e08: 8fa80204 */ lw $t0,0x204($sp)
/* f029e0c: c7ae016c */ lwc1 $f14,0x16c($sp)
@@ -8949,7 +8949,7 @@ glabel var7f1a9ba0pf
/* f029da0: 24060004 */ li $a2,0x4
/* f029da4: 24070001 */ li $a3,0x1
/* f029da8: afa00018 */ sw $zero,0x18($sp)
/* f029dac: 0fc2cf74 */ jal tex0f0b39c0
/* f029dac: 0fc2cf74 */ jal texSelect
/* f029db0: e7ae016c */ swc1 $f14,0x16c($sp)
/* f029db4: 8fa80204 */ lw $t0,0x204($sp)
/* f029db8: c7ae016c */ lwc1 $f14,0x16c($sp)
@@ -11105,7 +11105,7 @@ glabel var7f1a8980
/* f029cd0: 24060004 */ addiu $a2,$zero,0x4
/* f029cd4: 24070001 */ addiu $a3,$zero,0x1
/* f029cd8: afa00018 */ sw $zero,0x18($sp)
/* f029cdc: 0fc2ce70 */ jal tex0f0b39c0
/* f029cdc: 0fc2ce70 */ jal texSelect
/* f029ce0: e7ae016c */ swc1 $f14,0x16c($sp)
/* f029ce4: 8fa80204 */ lw $t0,0x204($sp)
/* f029ce8: c7ae016c */ lwc1 $f14,0x16c($sp)
src/game/credits.c
+2 -2
View File
@@ -206,7 +206,7 @@ Gfx *creditsRenderBackgroundLayer(Gfx *gdl, u8 type, u8 layernum, f32 arg3, u32
gDPSetCombineMode(gdl++, G_CC_MODULATEI, G_CC_MODULATEI);
gSPClearGeometryMode(gdl++, G_CULL_BOTH);
tex0f0b39c0(&gdl, &g_TexGeneralConfigs[g_CreditsBgTypes[type].texturenum], 1, 1, 2, 1, NULL);
texSelect(&gdl, &g_TexGeneralConfigs[g_CreditsBgTypes[type].texturenum], 1, 1, 2, 1, NULL);
gDPSetRenderMode(gdl++, G_RM_XLU_SURF, G_RM_XLU_SURF2);
@@ -2397,7 +2397,7 @@ glabel var7f1b5850
/* f139590: 24140001 */ addiu $s4,$zero,0x1
/* f139594: 00006812 */ mflo $t5
/* f139598: 01ae2821 */ addu $a1,$t5,$t6
/* f13959c: 0fc2ce70 */ jal tex0f0b39c0
/* f13959c: 0fc2ce70 */ jal texSelect
/* f1395a0: 00000000 */ nop
/* f1395a4: 8fb90118 */ lw $t9,0x118($sp)
/* f1395a8: 3c09ba00 */ lui $t1,0xba00
src/game/filemgr.c
+2 -2
View File
@@ -2263,7 +2263,7 @@ Gfx *filemgrRenderPerfectHeadThumbnail(Gfx *gdl, struct menuitemrenderdata *rend
gDPSetTextureLOD(gdl++, G_TL_TILE);
gDPSetTextureConvert(gdl++, G_TC_FILT);
tex0f0b39c0(&gdl, texture, 1, 0, 2, 1, NULL);
texSelect(&gdl, texture, 1, 0, 2, 1, NULL);
gDPSetCycleType(gdl++, G_CYC_1CYCLE);
gDPSetTextureFilter(gdl++, G_TF_POINT);
@@ -3148,7 +3148,7 @@ s32 filemgrChooseAgentListMenuHandler(s32 operation, struct menuitem *item, unio
gDPSetTextureLOD(gdl++, G_TL_TILE);
gDPSetTextureConvert(gdl++, G_TC_FILT);
tex0f0b39c0(&gdl, &g_TexGeneralConfigs[texturenum], 2, 0, 2, 1, NULL);
texSelect(&gdl, &g_TexGeneralConfigs[texturenum], 2, 0, 2, 1, NULL);
gDPSetCycleType(gdl++, G_CYC_1CYCLE);
gDPSetTextureFilter(gdl++, G_TF_POINT);
src/game/game_13c510.c
+1 -1
View File
@@ -1105,7 +1105,7 @@ Gfx *func0f13d40c(Gfx *gdl)
{
struct stagetableentry *stage = stageGetCurrent();
tex0f0b39c0(&gdl, &g_TexLightGlareConfigs[stage->light_type], 4, 0, 2, 1, NULL);
texSelect(&gdl, &g_TexLightGlareConfigs[stage->light_type], 4, 0, 2, 1, NULL);
gDPSetCycleType(gdl++, G_CYC_1CYCLE);
gDPSetRenderMode(gdl++, G_RM_CLD_SURF, G_RM_CLD_SURF2);
src/game/gunfx.c
+8 -8
View File
@@ -629,7 +629,7 @@ glabel var7f1acc68
/* f0acb18: 8fa500f4 */ lw $a1,0xf4($sp)
/* f0acb1c: 27a400f0 */ addiu $a0,$sp,0xf0
/* f0acb20: 24060004 */ addiu $a2,$zero,0x4
/* f0acb24: 0fc2ce70 */ jal tex0f0b39c0
/* f0acb24: 0fc2ce70 */ jal texSelect
/* f0acb28: 24070001 */ addiu $a3,$zero,0x1
/* f0acb2c: 8fae00f0 */ lw $t6,0xf0($sp)
/* f0acb30: 3c0d0430 */ lui $t5,0x430
@@ -1729,7 +1729,7 @@ glabel var7f1accf4
/* f0ada94: 02202025 */ or $a0,$s1,$zero
/* f0ada98: 24060004 */ addiu $a2,$zero,0x4
/* f0ada9c: 8fa70198 */ lw $a3,0x198($sp)
/* f0adaa0: 0fc2ce70 */ jal tex0f0b39c0
/* f0adaa0: 0fc2ce70 */ jal texSelect
/* f0adaa4: afa00018 */ sw $zero,0x18($sp)
/* f0adaa8: 8fac0190 */ lw $t4,0x190($sp)
/* f0adaac: 3c0e0470 */ lui $t6,0x470
@@ -1758,7 +1758,7 @@ glabel var7f1accf4
/* f0adb08: 8fa70198 */ lw $a3,0x198($sp)
/* f0adb0c: 8fa500ec */ lw $a1,0xec($sp)
/* f0adb10: 02202025 */ or $a0,$s1,$zero
/* f0adb14: 0fc2ce70 */ jal tex0f0b39c0
/* f0adb14: 0fc2ce70 */ jal texSelect
/* f0adb18: 24060004 */ addiu $a2,$zero,0x4
/* f0adb1c: 8fac0190 */ lw $t4,0x190($sp)
/* f0adb20: 3c0eb100 */ lui $t6,0xb100
@@ -1774,7 +1774,7 @@ glabel var7f1accf4
/* f0adb44: 240d0001 */ addiu $t5,$zero,0x1
/* f0adb48: afad0014 */ sw $t5,0x14($sp)
/* f0adb4c: afaa0010 */ sw $t2,0x10($sp)
/* f0adb50: 0fc2ce70 */ jal tex0f0b39c0
/* f0adb50: 0fc2ce70 */ jal texSelect
/* f0adb54: afa00018 */ sw $zero,0x18($sp)
/* f0adb58: 8fb80190 */ lw $t8,0x190($sp)
/* f0adb5c: 3c190430 */ lui $t9,0x430
@@ -4203,7 +4203,7 @@ glabel var7f1acd8c
/* f0af6f8: afaf0010 */ sw $t7,0x10($sp)
/* f0af6fc: afb80014 */ sw $t8,0x14($sp)
/* f0af700: afa00018 */ sw $zero,0x18($sp)
/* f0af704: 0fc2ce70 */ jal tex0f0b39c0
/* f0af704: 0fc2ce70 */ jal texSelect
/* f0af708: 24a50030 */ addiu $a1,$a1,0x0030
/* f0af70c: 44800000 */ mtc1 $zero,$f0
/* f0af710: c7aa00dc */ lwc1 $f10,0xdc($sp)
@@ -4558,7 +4558,7 @@ glabel var7f1acd8c
// }
// }
//
// tex0f0b39c0(&gdl, &g_TexGeneralConfigs[4], 4, 0, 2, 1, NULL);
// texSelect(&gdl, &g_TexGeneralConfigs[4], 4, 0, 2, 1, NULL);
//
// // 724
// if (rot.f[0] == 0 && rot.f[2] == 0) {
@@ -4746,7 +4746,7 @@ glabel var7f1acd90
/* f0afc08: 27a401e8 */ addiu $a0,$sp,0x1e8
/* f0afc0c: 24060004 */ addiu $a2,$zero,0x4
/* f0afc10: 00003825 */ or $a3,$zero,$zero
/* f0afc14: 0fc2ce70 */ jal tex0f0b39c0
/* f0afc14: 0fc2ce70 */ jal texSelect
/* f0afc18: 24a50024 */ addiu $a1,$a1,0x0024
/* f0afc1c: 0c00566c */ jal mtx4LoadIdentity
/* f0afc20: 27a4014c */ addiu $a0,$sp,0x14c
@@ -5181,7 +5181,7 @@ glabel var7f1acd90
// gDPSetCombineMode(gdl++, G_CC_BLENDIA, G_CC_BLENDIA);
// gSPClearGeometryMode(gdl++, G_CULL_BOTH);
//
// tex0f0b39c0(&gdl, &g_TexGeneralConfigs[3], 4, 0, 2, 1, NULL);
// texSelect(&gdl, &g_TexGeneralConfigs[3], 4, 0, 2, 1, NULL);
// mtx4LoadIdentity(&sp14c);
//
// mtx00015be0(camGetMatrix1740(), &sp14c);
src/game/mainmenu.c
+6 -6
View File
@@ -2693,7 +2693,7 @@ glabel var7f1b2dfc
/* f104d1c: afa00018 */ sw $zero,0x18($sp)
/* f104d20: 02002025 */ or $a0,$s0,$zero
/* f104d24: 24060002 */ addiu $a2,$zero,0x2
/* f104d28: 0fc2ce70 */ jal tex0f0b39c0
/* f104d28: 0fc2ce70 */ jal texSelect
/* f104d2c: 00003825 */ or $a3,$zero,$zero
/* f104d30: 8faf0138 */ lw $t7,0x138($sp)
/* f104d34: 8faa0134 */ lw $t2,0x134($sp)
@@ -2826,7 +2826,7 @@ glabel var7f1b2dfc
/* f104f28: 00003825 */ or $a3,$zero,$zero
/* f104f2c: afa00018 */ sw $zero,0x18($sp)
/* f104f30: afaa0134 */ sw $t2,0x134($sp)
/* f104f34: 0fc2ce70 */ jal tex0f0b39c0
/* f104f34: 0fc2ce70 */ jal texSelect
/* f104f38: 24a501b0 */ addiu $a1,$a1,0x1b0
/* f104f3c: 8fb80138 */ lw $t8,0x138($sp)
/* f104f40: 8faa0134 */ lw $t2,0x134($sp)
@@ -2990,7 +2990,7 @@ glabel var7f1b2dfc
/* f1051a0: afae0010 */ sw $t6,0x10($sp)
/* f1051a4: afa00018 */ sw $zero,0x18($sp)
/* f1051a8: afaa0134 */ sw $t2,0x134($sp)
/* f1051ac: 0fc2ce70 */ jal tex0f0b39c0
/* f1051ac: 0fc2ce70 */ jal texSelect
/* f1051b0: 24a50198 */ addiu $a1,$a1,0x198
/* f1051b4: 8fb90138 */ lw $t9,0x138($sp)
/* f1051b8: 8faa0134 */ lw $t2,0x134($sp)
@@ -3696,7 +3696,7 @@ glabel var7f1ad0fcnb
/* f100b1c: afa00018 */ sw $zero,0x18($sp)
/* f100b20: 02002025 */ or $a0,$s0,$zero
/* f100b24: 24060001 */ addiu $a2,$zero,0x1
/* f100b28: 0fc2c5c8 */ jal tex0f0b39c0
/* f100b28: 0fc2c5c8 */ jal texSelect
/* f100b2c: 00003825 */ or $a3,$zero,$zero
/* f100b30: 8faf0130 */ lw $t7,0x130($sp)
/* f100b34: 8faa012c */ lw $t2,0x12c($sp)
@@ -3815,7 +3815,7 @@ glabel var7f1ad0fcnb
/* f100cf0: 00003825 */ or $a3,$zero,$zero
/* f100cf4: afa00018 */ sw $zero,0x18($sp)
/* f100cf8: afaa012c */ sw $t2,0x12c($sp)
/* f100cfc: 0fc2c5c8 */ jal tex0f0b39c0
/* f100cfc: 0fc2c5c8 */ jal texSelect
/* f100d00: 24a501b0 */ addiu $a1,$a1,0x1b0
/* f100d04: 8fae0130 */ lw $t6,0x130($sp)
/* f100d08: 8faa012c */ lw $t2,0x12c($sp)
@@ -3965,7 +3965,7 @@ glabel var7f1ad0fcnb
/* f100f30: afaf0010 */ sw $t7,0x10($sp)
/* f100f34: afa00018 */ sw $zero,0x18($sp)
/* f100f38: afaa012c */ sw $t2,0x12c($sp)
/* f100f3c: 0fc2c5c8 */ jal tex0f0b39c0
/* f100f3c: 0fc2c5c8 */ jal texSelect
/* f100f40: 24a50198 */ addiu $a1,$a1,0x198
/* f100f44: 8fae0130 */ lw $t6,0x130($sp)
/* f100f48: 8faa012c */ lw $t2,0x12c($sp)
src/game/menu.c
+24 -24
View File
@@ -5543,7 +5543,7 @@ glabel var7f1b3658jf
/* f0f5c14: afa00018 */ sw $zero,0x18($sp)
/* f0f5c18: 00002825 */ move $a1,$zero
/* f0f5c1c: 24060002 */ li $a2,0x2
/* f0f5c20: 0fc2d290 */ jal tex0f0b39c0
/* f0f5c20: 0fc2d290 */ jal texSelect
/* f0f5c24: 00003825 */ move $a3,$zero
/* f0f5c28: 8fae0440 */ lw $t6,0x440($sp)
/* f0f5c2c: 3c18b900 */ lui $t8,0xb900
@@ -5562,7 +5562,7 @@ glabel var7f1b3658jf
/* f0f5c60: 02002025 */ move $a0,$s0
/* f0f5c64: 00002825 */ move $a1,$zero
/* f0f5c68: 24060002 */ li $a2,0x2
/* f0f5c6c: 0fc2d290 */ jal tex0f0b39c0
/* f0f5c6c: 0fc2d290 */ jal texSelect
/* f0f5c70: 00003825 */ move $a3,$zero
/* f0f5c74: 8faf0440 */ lw $t7,0x440($sp)
/* f0f5c78: 3c190600 */ lui $t9,0x600
@@ -7149,7 +7149,7 @@ glabel var7f1b3c40pf
/* f0f56b4: afa00018 */ sw $zero,0x18($sp)
/* f0f56b8: 00002825 */ move $a1,$zero
/* f0f56bc: 24060002 */ li $a2,0x2
/* f0f56c0: 0fc2cfb8 */ jal tex0f0b39c0
/* f0f56c0: 0fc2cfb8 */ jal texSelect
/* f0f56c4: 00003825 */ move $a3,$zero
/* f0f56c8: 8fb90440 */ lw $t9,0x440($sp)
/* f0f56cc: 3c09b900 */ lui $t1,0xb900
@@ -7168,7 +7168,7 @@ glabel var7f1b3c40pf
/* f0f5700: 02002025 */ move $a0,$s0
/* f0f5704: 00002825 */ move $a1,$zero
/* f0f5708: 24060002 */ li $a2,0x2
/* f0f570c: 0fc2cfb8 */ jal tex0f0b39c0
/* f0f570c: 0fc2cfb8 */ jal texSelect
/* f0f5710: 00003825 */ move $a3,$zero
/* f0f5714: 8fac0440 */ lw $t4,0x440($sp)
/* f0f5718: 3c0f0600 */ lui $t7,0x600
@@ -8755,7 +8755,7 @@ glabel var7f1b3c40pf
/* f0f54cc: afa00018 */ sw $zero,0x18($sp)
/* f0f54d0: 00002825 */ move $a1,$zero
/* f0f54d4: 24060002 */ li $a2,0x2
/* f0f54d8: 0fc2cf74 */ jal tex0f0b39c0
/* f0f54d8: 0fc2cf74 */ jal texSelect
/* f0f54dc: 00003825 */ move $a3,$zero
/* f0f54e0: 8fb90440 */ lw $t9,0x440($sp)
/* f0f54e4: 3c09b900 */ lui $t1,0xb900
@@ -8774,7 +8774,7 @@ glabel var7f1b3c40pf
/* f0f5518: 02002025 */ move $a0,$s0
/* f0f551c: 00002825 */ move $a1,$zero
/* f0f5520: 24060002 */ li $a2,0x2
/* f0f5524: 0fc2cf74 */ jal tex0f0b39c0
/* f0f5524: 0fc2cf74 */ jal texSelect
/* f0f5528: 00003825 */ move $a3,$zero
/* f0f552c: 8fac0440 */ lw $t4,0x440($sp)
/* f0f5530: 3c0f0600 */ lui $t7,0x600
@@ -10364,7 +10364,7 @@ glabel var7f1b2948
/* f0f4f70: afa00018 */ sw $zero,0x18($sp)
/* f0f4f74: 00002825 */ or $a1,$zero,$zero
/* f0f4f78: 24060002 */ addiu $a2,$zero,0x2
/* f0f4f7c: 0fc2ce70 */ jal tex0f0b39c0
/* f0f4f7c: 0fc2ce70 */ jal texSelect
/* f0f4f80: 00003825 */ or $a3,$zero,$zero
/* f0f4f84: 8fad0440 */ lw $t5,0x440($sp)
/* f0f4f88: 3c0cb900 */ lui $t4,0xb900
@@ -10383,7 +10383,7 @@ glabel var7f1b2948
/* f0f4fbc: 02002025 */ or $a0,$s0,$zero
/* f0f4fc0: 00002825 */ or $a1,$zero,$zero
/* f0f4fc4: 24060002 */ addiu $a2,$zero,0x2
/* f0f4fc8: 0fc2ce70 */ jal tex0f0b39c0
/* f0f4fc8: 0fc2ce70 */ jal texSelect
/* f0f4fcc: 00003825 */ or $a3,$zero,$zero
/* f0f4fd0: 8fb90440 */ lw $t9,0x440($sp)
/* f0f4fd4: 3c0d0600 */ lui $t5,0x600
@@ -11998,7 +11998,7 @@ glabel var7f1b2948
/* f0f1b14: afa00018 */ sw $zero,0x18($sp)
/* f0f1b18: 00002825 */ or $a1,$zero,$zero
/* f0f1b1c: 24060002 */ addiu $a2,$zero,0x2
/* f0f1b20: 0fc2c5c8 */ jal tex0f0b39c0
/* f0f1b20: 0fc2c5c8 */ jal texSelect
/* f0f1b24: 00003825 */ or $a3,$zero,$zero
/* f0f1b28: 8faa0468 */ lw $t2,0x468($sp)
/* f0f1b2c: 3c0bb900 */ lui $t3,0xb900
@@ -12017,7 +12017,7 @@ glabel var7f1b2948
/* f0f1b60: 02002025 */ or $a0,$s0,$zero
/* f0f1b64: 00002825 */ or $a1,$zero,$zero
/* f0f1b68: 24060002 */ addiu $a2,$zero,0x2
/* f0f1b6c: 0fc2c5c8 */ jal tex0f0b39c0
/* f0f1b6c: 0fc2c5c8 */ jal texSelect
/* f0f1b70: 00003825 */ or $a3,$zero,$zero
/* f0f1b74: 8fac0468 */ lw $t4,0x468($sp)
/* f0f1b78: 3c0a0600 */ lui $t2,0x600
@@ -12621,11 +12621,11 @@ glabel var7f1b2948
// gSPClearGeometryMode(gdl++, G_CULL_BOTH);
// gDPSetTextureFilter(gdl++, G_TF_BILERP);
//
// tex0f0b39c0(&gdl, NULL, 2, 0, 2, 1, NULL);
// texSelect(&gdl, NULL, 2, 0, 2, 1, NULL);
//
// gDPSetRenderMode(gdl++, G_RM_XLU_SURF, G_RM_XLU_SURF2);
//
// tex0f0b39c0(&gdl, NULL, 2, 0, 2, 1, NULL);
// texSelect(&gdl, NULL, 2, 0, 2, 1, NULL);
//
// gSPDisplayList(gdl++, var800613a0);
// }
@@ -21263,26 +21263,26 @@ void menuReset(void)
g_MenuData.unk5d5_01 = false;
tex0f0b3988(&g_TexGeneralConfigs[1]);
tex0f0b3988(&g_TexGeneralConfigs[6]);
tex0f0b3988(&g_TexGeneralConfigs[51]);
tex0f0b3988(&g_TexGeneralConfigs[52]);
tex0f0b3988(&g_TexGeneralConfigs[53]);
tex0f0b3988(&g_TexGeneralConfigs[54]);
tex0f0b3988(&g_TexGeneralConfigs[55]);
texLoadFromConfig(&g_TexGeneralConfigs[1]);
texLoadFromConfig(&g_TexGeneralConfigs[6]);
texLoadFromConfig(&g_TexGeneralConfigs[51]);
texLoadFromConfig(&g_TexGeneralConfigs[52]);
texLoadFromConfig(&g_TexGeneralConfigs[53]);
texLoadFromConfig(&g_TexGeneralConfigs[54]);
texLoadFromConfig(&g_TexGeneralConfigs[55]);
if (g_Vars.stagenum == STAGE_CITRAINING) {
for (i = 12; i < 34; i++) {
tex0f0b3988(&g_TexGeneralConfigs[i]);
texLoadFromConfig(&g_TexGeneralConfigs[i]);
}
tex0f0b3988(&g_TexGeneralConfigs[34]);
tex0f0b3988(&g_TexGeneralConfigs[36]);
tex0f0b3988(&g_TexGeneralConfigs[35]);
texLoadFromConfig(&g_TexGeneralConfigs[34]);
texLoadFromConfig(&g_TexGeneralConfigs[36]);
texLoadFromConfig(&g_TexGeneralConfigs[35]);
}
if (g_Vars.mplayerisrunning) {
tex0f0b3988(&g_TexGeneralConfigs[35]);
texLoadFromConfig(&g_TexGeneralConfigs[35]);
}
for (i = 0; i < 4; i++) {
src/game/menugfx.c
+13 -13
View File
@@ -1659,7 +1659,7 @@ glabel var7f1adf18
/* f0e10f4: 27a40118 */ addiu $a0,$sp,0x118
/* f0e10f8: 24060002 */ addiu $a2,$zero,0x2
/* f0e10fc: 00003825 */ or $a3,$zero,$zero
/* f0e1100: 0fc2ce70 */ jal tex0f0b39c0
/* f0e1100: 0fc2ce70 */ jal texSelect
/* f0e1104: 24a50048 */ addiu $a1,$a1,0x0048
/* f0e1108: 2406000a */ addiu $a2,$zero,0xa
/* f0e110c: 02060019 */ multu $s0,$a2
@@ -2060,7 +2060,7 @@ glabel var7f1adf18
// gSPClearGeometryMode(gdl++, G_CULL_BOTH);
// gDPSetTextureFilter(gdl++, G_TF_BILERP);
//
// tex0f0b39c0(&gdl, &g_TexGeneralConfigs[6], 2, 0, 2, 1, NULL);
// texSelect(&gdl, &g_TexGeneralConfigs[6], 2, 0, 2, 1, NULL);
//
// gDPSetRenderMode(gdl++, G_RM_XLU_SURF, G_RM_XLU_SURF2);
//
@@ -2219,7 +2219,7 @@ glabel menugfx0f0e1668
/* f0e1760: 27a40078 */ addiu $a0,$sp,0x78
/* f0e1764: 00002825 */ or $a1,$zero,$zero
/* f0e1768: 24060002 */ addiu $a2,$zero,0x2
/* f0e176c: 0fc2ce70 */ jal tex0f0b39c0
/* f0e176c: 0fc2ce70 */ jal texSelect
/* f0e1770: 00003825 */ or $a3,$zero,$zero
/* f0e1774: 8fac007c */ lw $t4,0x7c($sp)
/* f0e1778: 2408000a */ addiu $t0,$zero,0xa
@@ -2363,7 +2363,7 @@ Gfx *menugfxDrawListGroupHeader(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, s32 x3
gSPClearGeometryMode(gdl++, G_CULL_BOTH);
gDPSetTextureFilter(gdl++, G_TF_BILERP);
tex0f0b39c0(&gdl, NULL, 2, 0, 2, 1, NULL);
texSelect(&gdl, NULL, 2, 0, 2, 1, NULL);
gDPSetRenderMode(gdl++, G_RM_XLU_SURF, G_RM_XLU_SURF2);
@@ -2501,7 +2501,7 @@ glabel menugfxDrawListGroupHeader
/* f0dee88: 27a40090 */ addiu $a0,$sp,0x90
/* f0dee8c: 00002825 */ or $a1,$zero,$zero
/* f0dee90: 24060002 */ addiu $a2,$zero,0x2
/* f0dee94: 0fc2c5c8 */ jal tex0f0b39c0
/* f0dee94: 0fc2c5c8 */ jal texSelect
/* f0dee98: 00003825 */ or $a3,$zero,$zero
/* f0dee9c: 8fab0094 */ lw $t3,0x94($sp)
/* f0deea0: 2404000a */ addiu $a0,$zero,0xa
@@ -2759,7 +2759,7 @@ glabel menugfxRenderGradient
/* f0e1de0: 27a40060 */ addiu $a0,$sp,0x60
/* f0e1de4: 00002825 */ or $a1,$zero,$zero
/* f0e1de8: 24060002 */ addiu $a2,$zero,0x2
/* f0e1dec: 0fc2ce70 */ jal tex0f0b39c0
/* f0e1dec: 0fc2ce70 */ jal texSelect
/* f0e1df0: 00003825 */ or $a3,$zero,$zero
/* f0e1df4: 8fb90060 */ lw $t9,0x60($sp)
/* f0e1df8: 8fab0070 */ lw $t3,0x70($sp)
@@ -2889,7 +2889,7 @@ glabel menugfxRenderGradient
// gSPClearGeometryMode(gdl++, G_CULL_BOTH);
// gDPSetTextureFilter(gdl++, G_TF_BILERP);
//
// tex0f0b39c0(&gdl, NULL, 2, 0, 2, 1, NULL);
// texSelect(&gdl, NULL, 2, 0, 2, 1, NULL);
//
// gDPSetRenderMode(gdl++, G_RM_XLU_SURF, G_RM_XLU_SURF2);
//
@@ -2960,7 +2960,7 @@ Gfx *menugfxRenderSlider(Gfx *gdl, s32 x1, s32 y1, s32 x2, s32 y2, s32 markerx,
gSPClearGeometryMode(gdl++, G_CULL_BOTH);
gDPSetTextureFilter(gdl++, G_TF_BILERP);
tex0f0b39c0(&gdl, NULL, 2, 0, 2, 1, NULL);
texSelect(&gdl, NULL, 2, 0, 2, 1, NULL);
gDPSetRenderMode(gdl++, G_RM_AA_XLU_SURF, G_RM_AA_XLU_SURF2);
gDPSetRenderMode(gdl++, G_RM_XLU_SURF, G_RM_XLU_SURF2);
@@ -3050,7 +3050,7 @@ Gfx *menugfx0f0e2498(Gfx *gdl)
gDPSetCombineMode(gdl++, G_CC_MODULATEI, G_CC_MODULATEI);
gSPClearGeometryMode(gdl++, G_CULL_BOTH)
tex0f0b39c0(&gdl, 0, 2, 0, 2, 1, NULL);
texSelect(&gdl, 0, 2, 0, 2, 1, NULL);
gDPSetRenderMode(gdl++, G_RM_XLU_SURF, G_RM_XLU_SURF2);
@@ -3617,7 +3617,7 @@ Gfx *menugfxDrawCarouselChevron(Gfx *gdl, s32 x, s32 y, s32 size, s32 direction,
gDPSetCombineMode(gdl++, G_CC_MODULATEI, G_CC_MODULATEI);
gSPClearGeometryMode(gdl++, G_CULL_BOTH);
tex0f0b39c0(&gdl, NULL, 2, 0, 2, 1, NULL);
texSelect(&gdl, NULL, 2, 0, 2, 1, NULL);
gDPSetRenderMode(gdl++, G_RM_XLU_SURF, G_RM_XLU_SURF2);
@@ -3701,7 +3701,7 @@ Gfx *menugfxDrawDialogChevron(Gfx *gdl, s32 x, s32 y, s32 size, s32 direction, u
gDPSetCombineMode(gdl++, G_CC_MODULATEI, G_CC_MODULATEI);
gSPClearGeometryMode(gdl++, G_CULL_BOTH);
tex0f0b39c0(&gdl, NULL, 2, 0, 2, 1, NULL);
texSelect(&gdl, NULL, 2, 0, 2, 1, NULL);
gDPSetRenderMode(gdl++, G_RM_AA_XLU_SURF, G_RM_AA_XLU_SURF2);
@@ -4872,7 +4872,7 @@ glabel var7f1adf90
/* f0e5570: 24070001 */ addiu $a3,$zero,0x1
/* f0e5574: afa00018 */ sw $zero,0x18($sp)
/* f0e5578: afa20150 */ sw $v0,0x150($sp)
/* f0e557c: 0fc2ce70 */ jal tex0f0b39c0
/* f0e557c: 0fc2ce70 */ jal texSelect
/* f0e5580: 24a5000c */ addiu $a1,$a1,0x000c
/* f0e5584: 8fb80150 */ lw $t8,0x150($sp)
/* f0e5588: 3c09ba00 */ lui $t1,0xba00
@@ -5757,7 +5757,7 @@ glabel var7f1adf90
/* f0e5570: 24070001 */ addiu $a3,$zero,0x1
/* f0e5574: afa00018 */ sw $zero,0x18($sp)
/* f0e5578: afa20150 */ sw $v0,0x150($sp)
/* f0e557c: 0fc2ce70 */ jal tex0f0b39c0
/* f0e557c: 0fc2ce70 */ jal texSelect
/* f0e5580: 24a5000c */ addiu $a1,$a1,0x000c
/* f0e5584: 8fb80150 */ lw $t8,0x150($sp)
/* f0e5588: 3c09ba00 */ lui $t1,0xba00
src/game/menuitem.c
+3 -3
View File
@@ -10564,7 +10564,7 @@ Gfx *menuitemControllerRenderTexture(Gfx *gdl, s32 x, s32 y, s32 texturenum, u32
gDPSetTextureLOD(gdl++, G_TL_TILE);
gDPSetTextureConvert(gdl++, G_TC_FILT);
tex0f0b39c0(&gdl, &g_TexGeneralConfigs[texturenum], 2, 0, 2, 1, NULL);
texSelect(&gdl, &g_TexGeneralConfigs[texturenum], 2, 0, 2, 1, NULL);
gDPSetCycleType(gdl++, G_CYC_1CYCLE);
gDPSetTextureFilter(gdl++, G_TF_POINT);
@@ -10703,7 +10703,7 @@ glabel menuitemControllerRenderLines
/* f0f05d8: 00003825 */ move $a3,$zero
/* f0f05dc: 24060002 */ li $a2,0x2
/* f0f05e0: 27a40050 */ addiu $a0,$sp,0x50
/* f0f05e4: 0fc2d290 */ jal tex0f0b39c0
/* f0f05e4: 0fc2d290 */ jal texSelect
/* f0f05e8: 24a50294 */ addiu $a1,$a1,0x294
/* f0f05ec: 8fb90050 */ lw $t9,0x50($sp)
/* f0f05f0: 3c0dba00 */ lui $t5,0xba00
@@ -10905,7 +10905,7 @@ Gfx *menuitemControllerRenderLines(Gfx *gdl, struct menurendercontext *context,
gDPSetTextureLOD(gdl++, G_TL_TILE);
gDPSetTextureConvert(gdl++, G_TC_FILT);
tex0f0b39c0(&gdl, &g_TexGeneralConfigs[55], 2, 0, 2, 1, NULL);
texSelect(&gdl, &g_TexGeneralConfigs[55], 2, 0, 2, 1, NULL);
gDPSetCycleType(gdl++, G_CYC_1CYCLE);
gDPSetTextureFilter(gdl++, G_TF_POINT);
src/game/mplayer/ingame.c
+1 -1
View File
@@ -605,7 +605,7 @@ s32 mpAwardsMenuHandler(s32 operation, struct menuitem *item, union handlerdata
gDPSetTextureConvert(gdl++, G_TC_FILT);
gDPSetTextureFilter(gdl++, G_TF_POINT);
tex0f0b39c0(&gdl, &g_TexGeneralConfigs[35], 2, 0, 2, 1, NULL);
texSelect(&gdl, &g_TexGeneralConfigs[35], 2, 0, 2, 1, NULL);
gDPSetCycleType(gdl++, G_CYC_1CYCLE);
gDPSetCombineMode(gdl++, G_CC_DECALRGBA, G_CC_DECALRGBA);
src/game/mplayer/setup.c
+3 -3
View File
@@ -695,7 +695,7 @@ s32 mpChallengesListHandler(s32 operation, struct menuitem *item, union handlerd
gDPSetTextureLOD(gdl++, G_TL_TILE);
gDPSetTextureConvert(gdl++, G_TC_FILT);
tex0f0b39c0(&gdl, &g_TexGeneralConfigs[35], 2, 0, 2, 1, NULL);
texSelect(&gdl, &g_TexGeneralConfigs[35], 2, 0, 2, 1, NULL);
gDPSetCycleType(gdl++, G_CYC_1CYCLE);
gDPSetTextureFilter(gdl++, G_TF_POINT);
@@ -928,7 +928,7 @@ s32 mpMedalMenuHandler(s32 operation, struct menuitem *item, union handlerdata *
gDPSetTextureConvert(gdl++, G_TC_FILT);
gDPSetTextureFilter(gdl++, G_TF_POINT);
tex0f0b39c0(&gdl, &g_TexGeneralConfigs[35], 2, 0, 2, 1, NULL);
texSelect(&gdl, &g_TexGeneralConfigs[35], 2, 0, 2, 1, NULL);
gDPSetCycleType(gdl++, G_CYC_1CYCLE);
gDPSetCombineMode(gdl++, G_CC_DECALRGBA, G_CC_DECALRGBA);
@@ -3071,7 +3071,7 @@ s32 mpChallengesListMenuHandler(s32 operation, struct menuitem *item, union hand
gDPSetTextureLOD(gdl++, G_TL_TILE);
gDPSetTextureConvert(gdl++, G_TC_FILT);
tex0f0b39c0(&gdl, &g_TexGeneralConfigs[35], 2, 0, 2, 1, NULL);
texSelect(&gdl, &g_TexGeneralConfigs[35], 2, 0, 2, 1, NULL);
gDPSetCycleType(gdl++, G_CYC_1CYCLE);
gDPSetTextureFilter(gdl++, G_TF_POINT);
src/game/nbomb.c
+8 -8
View File
@@ -638,7 +638,7 @@ glabel var7f1a7ee8
/* f0074ac: 27a40150 */ addiu $a0,$sp,0x150
/* f0074b0: 24060002 */ addiu $a2,$zero,0x2
/* f0074b4: 24070001 */ addiu $a3,$zero,0x1
/* f0074b8: 0fc2ce70 */ jal tex0f0b39c0
/* f0074b8: 0fc2ce70 */ jal texSelect
/* f0074bc: 24a50078 */ addiu $a1,$a1,0x0078
/* f0074c0: 8fb90150 */ lw $t9,0x150($sp)
/* f0074c4: 3c07e700 */ lui $a3,0xe700
@@ -769,7 +769,7 @@ glabel var7f1a7ee8
/* f0076b8: 24180001 */ addiu $t8,$zero,0x1
/* f0076bc: afb80014 */ sw $t8,0x14($sp)
/* f0076c0: afae0010 */ sw $t6,0x10($sp)
/* f0076c4: 0fc2ce70 */ jal tex0f0b39c0
/* f0076c4: 0fc2ce70 */ jal texSelect
/* f0076c8: afa00018 */ sw $zero,0x18($sp)
/* f0076cc: 8fb90150 */ lw $t9,0x150($sp)
/* f0076d0: 3c014500 */ lui $at,0x4500
@@ -2806,7 +2806,7 @@ Gfx *nbombCreateGdl(void)
gdl = gdlstart = gfxAllocate(gdlsizes[index]);
tex0f0b39c0(&gdl, &g_TexGeneralConfigs[0x0a], 2, 1, 2, 1, NULL);
texSelect(&gdl, &g_TexGeneralConfigs[0x0a], 2, 1, 2, 1, NULL);
gDPPipeSync(gdl++);
gDPSetCycleType(gdl++, G_CYC_1CYCLE);
@@ -4095,7 +4095,7 @@ glabel nbombRenderOverlay
/* f00a6f4: afa00018 */ sw $zero,0x18($sp)
/* f00a6f8: a7a8005e */ sh $t0,0x5e($sp)
/* f00a6fc: a7a9003c */ sh $t1,0x3c($sp)
/* f00a700: 0fc2ce70 */ jal tex0f0b39c0
/* f00a700: 0fc2ce70 */ jal texSelect
/* f00a704: 24a50078 */ addiu $a1,$a1,0x0078
/* f00a708: 8fae0080 */ lw $t6,0x80($sp)
/* f00a70c: 87a8005e */ lh $t0,0x5e($sp)
@@ -4406,7 +4406,7 @@ glabel nbombRenderOverlay
/* f00a6f4: afa00018 */ sw $zero,0x18($sp)
/* f00a6f8: a7a8005e */ sh $t0,0x5e($sp)
/* f00a6fc: a7a9003c */ sh $t1,0x3c($sp)
/* f00a700: 0fc2ce70 */ jal tex0f0b39c0
/* f00a700: 0fc2ce70 */ jal texSelect
/* f00a704: 24a50078 */ addiu $a1,$a1,0x0078
/* f00a708: 8fae0080 */ lw $t6,0x80($sp)
/* f00a70c: 87a8005e */ lh $t0,0x5e($sp)
@@ -4626,7 +4626,7 @@ glabel nbombRenderOverlay
//
// gdl = func0f0d479c(gdl);
//
// tex0f0b39c0(&gdl, &g_TexGeneralConfigs[10], 2, 1, 2, 1, NULL);
// texSelect(&gdl, &g_TexGeneralConfigs[10], 2, 1, 2, 1, NULL);
//
// gDPPipeSync(gdl++);
// gDPSetCycleType(gdl++, G_CYC_1CYCLE);
@@ -5027,7 +5027,7 @@ glabel var7f1a7f5c
/* f00ae1c: afa00018 */ sw $zero,0x18($sp)
/* f00ae20: a7a80072 */ sh $t0,0x72($sp)
/* f00ae24: a7a900fa */ sh $t1,0xfa($sp)
/* f00ae28: 0fc2ce70 */ jal tex0f0b39c0
/* f00ae28: 0fc2ce70 */ jal texSelect
/* f00ae2c: 24a50048 */ addiu $a1,$a1,0x0048
/* f00ae30: 8fb80110 */ lw $t8,0x110($sp)
/* f00ae34: 87a80072 */ lh $t0,0x72($sp)
@@ -5387,7 +5387,7 @@ const u32 var7f1a7eac[] = {0x00000090};
//
// gdl = func0f0d479c(gdl);
//
// tex0f0b39c0(&gdl, &g_TexGeneralConfigs[6], 4, 1, 2, 1, NULL);
// texSelect(&gdl, &g_TexGeneralConfigs[6], 4, 1, 2, 1, NULL);
//
// gDPPipeSync(gdl++);
// gDPSetCycleType(gdl++, G_CYC_1CYCLE);
src/game/player.c
+1 -1
View File
@@ -5196,7 +5196,7 @@ Gfx *playerRenderShield(Gfx *gdl)
}
f20 = 1 - g_Vars.currentplayer->shieldshowtime * (1.0f / 60.0f);
tex0f0b39c0(&gdl, &g_TexShieldConfigs[0], 4, 1, 2, 1, NULL);
texSelect(&gdl, &g_TexShieldConfigs[0], 4, 1, 2, 1, NULL);
gDPSetCycleType(gdl++, G_CYC_2CYCLE);
gDPSetRenderMode(gdl++, G_RM_PASS, G_RM_CLD_SURF2);
src/game/propobj.c
+4 -4
View File
@@ -52025,7 +52025,7 @@ glabel var7f1aa824
/* f0808ac: afae0014 */ sw $t6,0x14($sp)
/* f0808b0: afaf0010 */ sw $t7,0x10($sp)
/* f0808b4: 8fa700c8 */ lw $a3,0xc8($sp)
/* f0808b8: 0fc2ce70 */ jal tex0f0b39c0
/* f0808b8: 0fc2ce70 */ jal texSelect
/* f0808bc: 8fa600cc */ lw $a2,0xcc($sp)
/* f0808c0: 8fb000c4 */ lw $s0,0xc4($sp)
/* f0808c4: 3c190102 */ lui $t9,0x102
@@ -52375,7 +52375,7 @@ glabel var7f1aa824
// // Render the image
// gSPSetGeometryMode(gdl++, G_CULL_BACK);
//
// tex0f0b39c0(&gdl, tconfig, arg5, arg4, 2, 1, NULL);
// texSelect(&gdl, tconfig, arg5, arg4, 2, 1, NULL);
//
// gSPMatrix(gdl++, osVirtualToPhysical(model->matrices), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
//
@@ -52590,9 +52590,9 @@ Gfx *gfxRenderRadialShadow(Gfx *gdl, f32 x, f32 y, f32 z, f32 angle, f32 radius,
vertices[3].unk08 = 0;
vertices[3].unk0a = tconfig->height * 32 - 1;
tex0f0b39c0(&gdl, tconfig, 4, 1, 2, 1, NULL);
texSelect(&gdl, tconfig, 4, 1, 2, 1, NULL);
} else {
tex0f0b39c0(&gdl, NULL, 1, 1, 2, 1, NULL);
texSelect(&gdl, NULL, 1, 1, 2, 1, NULL);
}
gSPSetGeometryMode(gdl++, G_CULL_BACK);
src/game/radar.c
+1 -1
View File
@@ -77,7 +77,7 @@ Gfx *radarRenderBackground(Gfx *gdl, struct textureconfig *tconfig, s32 arg2, s3
spa8[0] = arg4 * g_ScaleX;
spa8[1] = arg4;
tex0f0b39c0(&gdl, tconfig, 2, 0, 0, 1, NULL);
texSelect(&gdl, tconfig, 2, 0, 0, 1, NULL);
func0f0b278c(&gdl, spb0, spa8, tconfig->width, tconfig->height,
0, 0, 1, 0, 0xff, 0, 40, tconfig->level > 0, 0);
src/game/savebuffer.c
+2 -2
View File
@@ -146,9 +146,9 @@ Gfx *func0f0d4a3c(Gfx *gdl, s32 arg1)
gDPPipeSync(gdl++);
if (arg1 == 0) {
tex0f0b39c0(&gdl, &g_TexGeneralConfigs[6], 2, 0, 2, 1, NULL);
texSelect(&gdl, &g_TexGeneralConfigs[6], 2, 0, 2, 1, NULL);
} else if (arg1 == 1) {
tex0f0b39c0(&gdl, &g_TexGeneralConfigs[11], 2, 0, 2, 1, NULL);
texSelect(&gdl, &g_TexGeneralConfigs[11], 2, 0, 2, 1, NULL);
}
gDPPipeSync(gdl++);
src/game/shards.c
+4 -4
View File
@@ -810,9 +810,9 @@ Gfx *shardsRenderGlass(Gfx *gdl)
s32 j;
if (g_Vars.currentplayer->visionmode == VISIONMODE_XRAY) {
tex0f0b39c0(&gdl, NULL, 2, 1, 2, 1, NULL);
texSelect(&gdl, NULL, 2, 1, 2, 1, NULL);
} else {
tex0f0b39c0(&gdl, &g_TexShardConfigs[1], 2, 1, 2, 1, NULL);
texSelect(&gdl, &g_TexShardConfigs[1], 2, 1, 2, 1, NULL);
}
gSPTexture(gdl++, 0x0d80, 0x0d80, 2, G_TX_RENDERTILE, G_ON);
@@ -966,7 +966,7 @@ glabel shardsRenderGlass
/* f14c6b8: 00002825 */ or $a1,$zero,$zero
/* f14c6bc: 24060002 */ addiu $a2,$zero,0x2
/* f14c6c0: 24070001 */ addiu $a3,$zero,0x1
/* f14c6c4: 0fc2c5c8 */ jal tex0f0b39c0
/* f14c6c4: 0fc2c5c8 */ jal texSelect
/* f14c6c8: afa00018 */ sw $zero,0x18($sp)
/* f14c6cc: 1000000b */ beqz $zero,.NB0f14c6fc
/* f14c6d0: 8fab0138 */ lw $t3,0x138($sp)
@@ -978,7 +978,7 @@ glabel shardsRenderGlass
/* f14c6e4: afa90010 */ sw $t1,0x10($sp)
/* f14c6e8: 24070001 */ addiu $a3,$zero,0x1
/* f14c6ec: afa00018 */ sw $zero,0x18($sp)
/* f14c6f0: 0fc2c5c8 */ jal tex0f0b39c0
/* f14c6f0: 0fc2c5c8 */ jal texSelect
/* f14c6f4: 24a5000c */ addiu $a1,$a1,0xc
/* f14c6f8: 8fab0138 */ lw $t3,0x138($sp)
.NB0f14c6fc:
src/game/sight.c
+2 -2
View File
@@ -5579,7 +5579,7 @@ glabel sightRenderClassic
/* f0d97b0: 448f3000 */ mtc1 $t7,$f6
/* f0d97b4: afa00010 */ sw $zero,0x10($sp)
/* f0d97b8: 46803220 */ cvt.s.w $f8,$f6
/* f0d97bc: 0fc2ce70 */ jal tex0f0b39c0
/* f0d97bc: 0fc2ce70 */ jal texSelect
/* f0d97c0: e7a800c0 */ swc1 $f8,0xc0($sp)
/* f0d97c4: 92190005 */ lbu $t9,0x5($s0)
/* f0d97c8: 92070004 */ lbu $a3,0x4($s0)
@@ -5715,7 +5715,7 @@ glabel sightRenderClassic
// spbc[0] = (tconfig->width >> 1) * (f32)g_ScaleX;
// spbc[1] = tconfig->height >> 1;
//
// tex0f0b39c0(&gdl, tconfig, 2, 0, 0, 1, NULL);
// texSelect(&gdl, tconfig, 2, 0, 0, 1, NULL);
//
// func0f0b278c(&gdl, spc4, spbc, tconfig->width, tconfig->height,
// 0, 0, 1, 0xff, 0xff, 0xff, 0x7f, tconfig->level > 0, 0);
src/game/sky.c
+13 -13
View File
@@ -2209,7 +2209,7 @@ glabel var7f1b50c8
/* f12118c: afad0010 */ sw $t5,0x10($sp)
/* f121190: 24060001 */ addiu $a2,$zero,0x1
/* f121194: 00003825 */ or $a3,$zero,$zero
/* f121198: 0fc2ce70 */ jal tex0f0b39c0
/* f121198: 0fc2ce70 */ jal texSelect
/* f12119c: 01792821 */ addu $a1,$t3,$t9
/* f1211a0: 8fb806b0 */ lw $t8,0x6b0($sp)
/* f1211a4: 3c0eb900 */ lui $t6,0xb900
@@ -3397,7 +3397,7 @@ glabel var7f1b50c8
/* f1223c8: 27a406b0 */ addiu $a0,$sp,0x6b0
/* f1223cc: 24060001 */ addiu $a2,$zero,0x1
/* f1223d0: 00003825 */ or $a3,$zero,$zero
/* f1223d4: 0fc2ce70 */ jal tex0f0b39c0
/* f1223d4: 0fc2ce70 */ jal texSelect
/* f1223d8: 01f82821 */ addu $a1,$t7,$t8
/* f1223dc: 8fa206b0 */ lw $v0,0x6b0($sp)
/* f1223e0: 3c0bfb00 */ lui $t3,0xfb00
@@ -4332,7 +4332,7 @@ glabel var7f1b50c8
// } else {
// gDPPipeSync(gdl++);
//
// tex0f0b39c0(&gdl, &g_TexWaterConfigs[env->water_type], 1, 0, 2, 1, NULL);
// texSelect(&gdl, &g_TexWaterConfigs[env->water_type], 1, 0, 2, 1, NULL);
//
// gDPSetRenderMode(gdl++, G_RM_OPA_SURF, G_RM_OPA_SURF2);
//
@@ -4739,7 +4739,7 @@ glabel var7f1b50c8
//
// gDPPipeSync(gdl++);
//
// tex0f0b39c0(&gdl, &g_TexWaterConfigs[env->unk18], 1, 0, 2, 1, NULL);
// texSelect(&gdl, &g_TexWaterConfigs[env->unk18], 1, 0, 2, 1, NULL);
//
// gDPSetEnvColor(gdl++, env->sky_r, env->sky_g, env->sky_b, 0xff);
// gDPSetCombineLERP(gdl++,
@@ -8252,7 +8252,7 @@ Gfx *skyRenderSuns(Gfx *gdl, bool xray)
g_SunFlareTimers240[i] += g_Vars.lvupdate240;
tex0f0b39c0(&gdl, &g_TexLightGlareConfigs[5], 4, 0, 2, 1, NULL);
texSelect(&gdl, &g_TexLightGlareConfigs[5], 4, 0, 2, 1, NULL);
gDPSetCycleType(gdl++, G_CYC_1CYCLE);
gDPSetColorDither(gdl++, G_CD_DISABLE);
@@ -8409,7 +8409,7 @@ glabel var7f1b511c
/* f126fe0: 24a50048 */ addiu $a1,$a1,0x48
/* f126fe4: 460ae101 */ sub.s $f4,$f28,$f10
/* f126fe8: 46142182 */ mul.s $f6,$f4,$f20
/* f126fec: 0fc2cfb8 */ jal tex0f0b39c0
/* f126fec: 0fc2cfb8 */ jal texSelect
/* f126ff0: e7a6012c */ swc1 $f6,0x12c($sp)
/* f126ff4: 8fa90198 */ lw $t1,0x198($sp)
/* f126ff8: 3c10ba00 */ lui $s0,0xba00
@@ -8566,7 +8566,7 @@ glabel var7f1b511c
/* f127254: 24060004 */ li $a2,0x4
/* f127258: 00003825 */ move $a3,$zero
/* f12725c: afa00018 */ sw $zero,0x18($sp)
/* f127260: 0fc2cfb8 */ jal tex0f0b39c0
/* f127260: 0fc2cfb8 */ jal texSelect
/* f127264: 24a5000c */ addiu $a1,$a1,0xc
/* f127268: 8fab0198 */ lw $t3,0x198($sp)
/* f12726c: 3c0fba00 */ lui $t7,0xba00
@@ -8988,7 +8988,7 @@ glabel var7f1b511c
/* f1279f0: 24a50048 */ addiu $a1,$a1,0x48
/* f1279f4: 460ae101 */ sub.s $f4,$f28,$f10
/* f1279f8: 46142182 */ mul.s $f6,$f4,$f20
/* f1279fc: 0fc2cf74 */ jal tex0f0b39c0
/* f1279fc: 0fc2cf74 */ jal texSelect
/* f127a00: e7a6012c */ swc1 $f6,0x12c($sp)
/* f127a04: 8fa90198 */ lw $t1,0x198($sp)
/* f127a08: 3c10ba00 */ lui $s0,0xba00
@@ -9145,7 +9145,7 @@ glabel var7f1b511c
/* f127c64: 24060004 */ li $a2,0x4
/* f127c68: 00003825 */ move $a3,$zero
/* f127c6c: afa00018 */ sw $zero,0x18($sp)
/* f127c70: 0fc2cf74 */ jal tex0f0b39c0
/* f127c70: 0fc2cf74 */ jal texSelect
/* f127c74: 24a5000c */ addiu $a1,$a1,0xc
/* f127c78: 8fab0198 */ lw $t3,0x198($sp)
/* f127c7c: 3c0fba00 */ lui $t7,0xba00
@@ -9574,7 +9574,7 @@ glabel var7f1b511c
/* f126514: 24a50048 */ addiu $a1,$a1,0x48
/* f126518: 460ae101 */ sub.s $f4,$f28,$f10
/* f12651c: 46142182 */ mul.s $f6,$f4,$f20
/* f126520: 0fc2ce70 */ jal tex0f0b39c0
/* f126520: 0fc2ce70 */ jal texSelect
/* f126524: e7a60124 */ swc1 $f6,0x124($sp)
/* f126528: 8faa0190 */ lw $t2,0x190($sp)
/* f12652c: 3c11ba00 */ lui $s1,0xba00
@@ -9729,7 +9729,7 @@ glabel var7f1b511c
/* f126780: 24060004 */ addiu $a2,$zero,0x4
/* f126784: 00003825 */ or $a3,$zero,$zero
/* f126788: afa00018 */ sw $zero,0x18($sp)
/* f12678c: 0fc2ce70 */ jal tex0f0b39c0
/* f12678c: 0fc2ce70 */ jal texSelect
/* f126790: 24a5000c */ addiu $a1,$a1,0xc
/* f126794: 8fa90190 */ lw $t1,0x190($sp)
/* f126798: 3c0eba00 */ lui $t6,0xba00
@@ -10083,7 +10083,7 @@ glabel var7f1b511c
// sp124 = (y - viGetViewHeight() * 0.5f) * 0.01f;
//
// // Render the sun
// tex0f0b39c0(&gdl, &g_TexLightGlareConfigs[6], 4, 0, 2, 1, NULL);
// texSelect(&gdl, &g_TexLightGlareConfigs[6], 4, 0, 2, 1, NULL);
//
// gDPSetCycleType(gdl++, G_CYC_1CYCLE);
// gDPSetColorDither(gdl++, G_CD_BAYER);
@@ -10111,7 +10111,7 @@ glabel var7f1b511c
// func0f0b2150(&gdl, sp17c, sp174, g_TexLightGlareConfigs[6].width, g_TexLightGlareConfigs[6].height, 0, 1, 1, 1, 0, 1);
//
// // Render the artifacts
// tex0f0b39c0(&gdl, &g_TexLightGlareConfigs[1], 4, 0, 2, 1, NULL);
// texSelect(&gdl, &g_TexLightGlareConfigs[1], 4, 0, 2, 1, NULL);
//
// gDPSetCycleType(gdl++, G_CYC_1CYCLE);
// gDPSetColorDither(gdl++, G_CD_BAYER);
src/game/sparks.c
+1 -1
View File
@@ -331,7 +331,7 @@ Gfx *sparksRender(Gfx *gdl)
axis = ABS(g_Vars.currentplayer->cam_look.z) > ABS(g_Vars.currentplayer->cam_look.x) ? 2 : 0;
}
tex0f0b39c0(&gdl, &g_TexSparkConfigs[0], 4, 0, 2, 1, NULL);
texSelect(&gdl, &g_TexSparkConfigs[0], 4, 0, 2, 1, NULL);
gDPSetCycleType(gdl++, G_CYC_1CYCLE);
gDPSetColorDither(gdl++, G_CD_DISABLE);
src/game/tex.c
+367 -1117
View File
File diff suppressed because it is too large Load Diff
src/game/texdecompress.c
+50 -8
View File
@@ -23,7 +23,7 @@ u32 var800ab54c;
u32 g_TexBase;
u8 *g_TextureConfigSegment;
s32 g_TexNumConfigs;
u32 *g_TexWords;
struct texloadthing **g_TexWords;
struct textureconfig *g_TexWallhitConfigs;
Gfx *g_TexGdl1;
Gfx *g_TexGdl2;
@@ -62,11 +62,53 @@ s32 g_TexFormatChannelSizes[] = { 256, 32, 256, 32, 256, 16, 8, 256, 16, 256, 16
s32 g_TexFormatBitsPerPixel[] = { 32, 16, 24, 15, 16, 8, 4, 8, 4, 16, 16, 16, 16 };
// Mapping to GBI format
s32 g_TexFormatGbiMappings[] = { G_IM_FMT_RGBA, G_IM_FMT_RGBA, G_IM_FMT_RGBA, G_IM_FMT_RGBA, G_IM_FMT_IA, G_IM_FMT_IA, G_IM_FMT_IA, G_IM_FMT_I, G_IM_FMT_I, G_IM_FMT_CI, G_IM_FMT_CI, G_IM_FMT_CI, G_IM_FMT_CI };
s32 g_TexFormatGbiMappings[] = {
G_IM_FMT_RGBA,
G_IM_FMT_RGBA,
G_IM_FMT_RGBA,
G_IM_FMT_RGBA,
G_IM_FMT_IA,
G_IM_FMT_IA,
G_IM_FMT_IA,
G_IM_FMT_I,
G_IM_FMT_I,
G_IM_FMT_CI,
G_IM_FMT_CI,
G_IM_FMT_CI,
G_IM_FMT_CI,
};
s32 var800842bc[] = { 3, 2, 3, 2, 2, 1, 0, 1, 0, 1, 0, 1, 0 };
s32 g_TexFormatDepths[] = {
G_IM_SIZ_32b,
G_IM_SIZ_16b,
G_IM_SIZ_32b,
G_IM_SIZ_16b,
G_IM_SIZ_16b,
G_IM_SIZ_8b,
G_IM_SIZ_4b,
G_IM_SIZ_8b,
G_IM_SIZ_4b,
G_IM_SIZ_8b,
G_IM_SIZ_4b,
G_IM_SIZ_8b,
G_IM_SIZ_4b,
};
s32 var800842f0[] = { 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x8000, 0x8000, 0xc000, 0xc000 };
s32 g_TexFormatLutModes[] = {
G_TT_NONE,
G_TT_NONE,
G_TT_NONE,
G_TT_NONE,
G_TT_NONE,
G_TT_NONE,
G_TT_NONE,
G_TT_NONE,
G_TT_NONE,
G_TT_RGBA16,
G_TT_RGBA16,
G_TT_IA16,
G_TT_IA16,
};
void func0f16e810(u32 arg0)
{
@@ -159,8 +201,8 @@ s32 texInflateZlib(u8 *src, u8 *dst, s32 arg2, s32 forcenumimages, struct textur
arg4->unk0c->height = height;
arg4->unk0c->unk0a = numcolours - 1;
arg4->unk0c->gbiformat = g_TexFormatGbiMappings[format];
arg4->unk0c->unk0b_06 = var800842bc[format];
arg4->unk0c->unk0c_00 = var800842f0[format] >> 14;
arg4->unk0c->depth = g_TexFormatDepths[format];
arg4->unk0c->lutmodeindex = g_TexFormatLutModes[format] >> G_MDSFT_TEXTLUT;
} else if (writetocache) {
g_TexCacheItems[g_TexCacheCount].widths[j - 1] = width;
g_TexCacheItems[g_TexCacheCount].heights[j - 1] = height;
@@ -1333,8 +1375,8 @@ s32 texInflateNonZlib(u8 *src, u8 *dst, s32 arg2, s32 forcenumimages, struct tex
arg4->unk0c->width = width;
arg4->unk0c->height = height;
arg4->unk0c->gbiformat = g_TexFormatGbiMappings[format];
arg4->unk0c->unk0b_06 = var800842bc[format];
arg4->unk0c->unk0c_00 = var800842f0[format] >> 14;
arg4->unk0c->depth = g_TexFormatDepths[format];
arg4->unk0c->lutmodeindex = g_TexFormatLutModes[format] >> G_MDSFT_TEXTLUT;
} else if (writetocache) {
g_TexCacheItems[g_TexCacheCount].widths[i - 1] = width;
g_TexCacheItems[g_TexCacheCount].heights[i - 1] = height;
src/game/texreset.c
+7 -7
View File
@@ -91,31 +91,31 @@ void texReset(void)
if (IS4MB() && stage != STAGE_TITLE && stage != STAGE_CITRAINING && stage != STAGE_4MBMENU) {
for (i = 0; i < ARRAYCOUNT(g_TcWallhitConfigs); i++) {
tex0f0b3988(&g_TexWallhitConfigs[i]);
texLoadFromConfig(&g_TexWallhitConfigs[i]);
}
for (i = 0; i < ARRAYCOUNT(g_TcBeamConfigs); i++) {
tex0f0b3988(&g_TexBeamConfigs[i]);
texLoadFromConfig(&g_TexBeamConfigs[i]);
}
for (i = 0; i < ARRAYCOUNT(g_TcWaterConfigs); i++) {
tex0f0b3988(&g_TexWaterConfigs[i]);
texLoadFromConfig(&g_TexWaterConfigs[i]);
}
for (i = 0; i < ARRAYCOUNT(g_TcGroup06Configs); i++) {
tex0f0b3988(&g_TexShadowConfigs[i]);
texLoadFromConfig(&g_TexShadowConfigs[i]);
}
for (i = 0; i < ARRAYCOUNT(g_TcShieldConfigs); i++) {
tex0f0b3988(&g_TexShieldConfigs[i]);
texLoadFromConfig(&g_TexShieldConfigs[i]);
}
for (i = 0; i < ARRAYCOUNT(g_TcRadarConfigs); i++) {
tex0f0b3988(&g_TexRadarConfigs[i]);
texLoadFromConfig(&g_TexRadarConfigs[i]);
}
for (i = 0; i < ARRAYCOUNT(g_TcSparkConfigs); i++) {
tex0f0b3988(&g_TexSparkConfigs[i]);
texLoadFromConfig(&g_TexSparkConfigs[i]);
}
}
}
src/game/title.c
+6 -6
View File
@@ -533,7 +533,7 @@ glabel var7f1a84fcjf
/* f0169fc: 27a40130 */ addiu $a0,$sp,0x130
/* f016a00: 24060001 */ li $a2,0x1
/* f016a04: 00003825 */ move $a3,$zero
/* f016a08: 0fc2d290 */ jal tex0f0b39c0
/* f016a08: 0fc2d290 */ jal texSelect
/* f016a0c: 24a50234 */ addiu $a1,$a1,0x234
/* f016a10: 8fab0130 */ lw $t3,0x130($sp)
/* f016a14: 3c0eba00 */ lui $t6,0xba00
@@ -652,7 +652,7 @@ glabel var7f1a84fcjf
/* f016bd4: 27a40130 */ addiu $a0,$sp,0x130
/* f016bd8: 24060001 */ li $a2,0x1
/* f016bdc: 00003825 */ move $a3,$zero
/* f016be0: 0fc2d290 */ jal tex0f0b39c0
/* f016be0: 0fc2d290 */ jal texSelect
/* f016be4: 24a5024c */ addiu $a1,$a1,0x24c
/* f016be8: 8fb80130 */ lw $t8,0x130($sp)
/* f016bec: 3c0eba00 */ lui $t6,0xba00
@@ -1057,7 +1057,7 @@ glabel var7f1aa08cnb
/* f0169f8: 27a40128 */ addiu $a0,$sp,0x128
/* f0169fc: 24060001 */ li $a2,0x1
/* f016a00: 00003825 */ move $a3,$zero
/* f016a04: 0fc2cf74 */ jal tex0f0b39c0
/* f016a04: 0fc2cf74 */ jal texSelect
/* f016a08: 24a50234 */ addiu $a1,$a1,0x234
/* f016a0c: 8fab0128 */ lw $t3,0x128($sp)
/* f016a10: 3c0eba00 */ lui $t6,0xba00
@@ -1176,7 +1176,7 @@ glabel var7f1aa08cnb
/* f016bd0: 27a40128 */ addiu $a0,$sp,0x128
/* f016bd4: 24060001 */ li $a2,0x1
/* f016bd8: 00003825 */ move $a3,$zero
/* f016bdc: 0fc2cf74 */ jal tex0f0b39c0
/* f016bdc: 0fc2cf74 */ jal texSelect
/* f016be0: 24a5024c */ addiu $a1,$a1,0x24c
/* f016be4: 8fb80128 */ lw $t8,0x128($sp)
/* f016be8: 3c0eba00 */ lui $t6,0xba00
@@ -1381,7 +1381,7 @@ Gfx *titleRenderLegal(Gfx *gdl)
gDPSetTextureLOD(gdl++, G_TL_TILE);
gDPSetTextureConvert(gdl++, G_TC_FILT);
tex0f0b39c0(&gdl, &g_TexGeneralConfigs[47], 1, 0, 2, 1, 0);
texSelect(&gdl, &g_TexGeneralConfigs[47], 1, 0, 2, 1, 0);
gDPSetCycleType(gdl++, G_CYC_1CYCLE);
gDPSetCombineMode(gdl++, G_CC_DECALRGBA, G_CC_DECALRGBA);
@@ -1404,7 +1404,7 @@ Gfx *titleRenderLegal(Gfx *gdl)
gDPSetTextureLOD(gdl++, G_TL_TILE);
gDPSetTextureConvert(gdl++, G_TC_FILT);
tex0f0b39c0(&gdl, &g_TexGeneralConfigs[49], 1, 0, 2, 1, 0);
texSelect(&gdl, &g_TexGeneralConfigs[49], 1, 0, 2, 1, 0);
gDPSetCycleType(gdl++, G_CYC_1CYCLE);
gDPSetCombineMode(gdl++, G_CC_DECALRGBA, G_CC_DECALRGBA);
src/game/trainingmenus.c
+3 -3
View File
@@ -165,7 +165,7 @@ s32 frWeaponListMenuHandler(s32 operation, struct menuitem *item, union handlerd
gDPSetTextureConvert(gdl++, G_TC_FILT);
gDPSetTextureFilter(gdl++, G_TF_POINT);
tex0f0b39c0(&gdl, &g_TexGeneralConfigs[35], 2, 0, 2, 1, NULL);
texSelect(&gdl, &g_TexGeneralConfigs[35], 2, 0, 2, 1, NULL);
gDPSetCycleType(gdl++, G_CYC_1CYCLE);
gDPSetCombineMode(gdl++, G_CC_DECALRGBA, G_CC_DECALRGBA);
@@ -627,7 +627,7 @@ s32 frScoringMenuHandler(s32 operation, struct menuitem *item, union handlerdata
gDPSetTextureConvert(gdl++, G_TC_FILT);
gDPSetTextureFilter(gdl++, G_TF_POINT);
tex0f0b39c0(&gdl, tconfig, 2, 0, 2, 1, NULL);
texSelect(&gdl, tconfig, 2, 0, 2, 1, NULL);
gDPSetCycleType(gdl++, G_CYC_1CYCLE);
gDPSetCombineMode(gdl++, G_CC_DECALRGBA, G_CC_DECALRGBA);
@@ -1860,7 +1860,7 @@ s32 ciHangarTitleMenuHandler(s32 operation, struct menuitem *item, union handler
gDPSetTextureLOD(gdl++, G_TL_TILE);
gDPSetTextureConvert(gdl++, G_TC_FILT);
tex0f0b39c0(&gdl, &g_TexGeneralConfigs[texturenum], 1, 0, 2, 1, NULL);
texSelect(&gdl, &g_TexGeneralConfigs[texturenum], 1, 0, 2, 1, NULL);
gDPSetCycleType(gdl++, G_CYC_1CYCLE);
gDPSetCombineMode(gdl++, G_CC_DECALRGBA, G_CC_DECALRGBA);
src/game/wallhit.c
+3 -3
View File
@@ -5462,7 +5462,7 @@ Gfx *wallhitRenderBgHitsLayer1(s32 roomnum, Gfx *gdl)
}
if (hit->texturenum != prevtexturenum || hit->unk6b != prev6b) {
tex0f0b39c0(&gdl, &g_TexWallhitConfigs[hit->texturenum], 2, hit->unk6b, 2, 1, NULL);
texSelect(&gdl, &g_TexWallhitConfigs[hit->texturenum], 2, hit->unk6b, 2, 1, NULL);
prevtexturenum = hit->texturenum;
prev6b = hit->unk6b;
@@ -5520,7 +5520,7 @@ Gfx *wallhitRenderBgHitsLayer2(s32 roomnum, Gfx *gdl)
hit->unk6b = 1;
if (hit->texturenum != prevtexturenum || hit->unk6b != prev6b) {
tex0f0b39c0(&gdl, &g_TexWallhitConfigs[hit->texturenum], 2, hit->unk6b, 2, 1, NULL);
texSelect(&gdl, &g_TexWallhitConfigs[hit->texturenum], 2, hit->unk6b, 2, 1, NULL);
prevtexturenum = hit->texturenum;
prev6b = hit->unk6b;
@@ -5607,7 +5607,7 @@ Gfx *wallhitRenderPropHits(Gfx *gdl, struct prop *prop, bool withalpha)
}
if (prevtexturenum != hit->texturenum || prev6b != hit->unk6b) {
tex0f0b39c0(&gdl, &g_TexWallhitConfigs[hit->texturenum], 2, hit->unk6b, 2, 1, NULL);
texSelect(&gdl, &g_TexWallhitConfigs[hit->texturenum], 2, hit->unk6b, 2, 1, NULL);
prevtexturenum = hit->texturenum;
prev6b = hit->unk6b;
src/game/weather.c
+5 -5
View File
@@ -56,7 +56,7 @@ Gfx *weatherRender(Gfx *gdl)
gSPDisplayList(gdl++, &var80061380);
if (weather->type == WEATHERTYPE_SNOW) {
tex0f0b39c0(&gdl, &g_TexGeneralConfigs[1], 2, 1, 2, 1, NULL);
texSelect(&gdl, &g_TexGeneralConfigs[1], 2, 1, 2, 1, NULL);
gDPSetCycleType(gdl++, G_CYC_1CYCLE);
gDPSetColorDither(gdl++, G_CD_NOISE);
@@ -886,7 +886,7 @@ glabel var7f1b5780
/* f132f6c: 24060002 */ addiu $a2,$zero,0x2
/* f132f70: 24070001 */ addiu $a3,$zero,0x1
/* f132f74: afa00018 */ sw $zero,0x18($sp)
/* f132f78: 0fc2ce70 */ jal tex0f0b39c0
/* f132f78: 0fc2ce70 */ jal texSelect
/* f132f7c: 24a5000c */ addiu $a1,$a1,0x000c
/* f132f80: 8fab0de8 */ lw $t3,0xde8($sp)
/* f132f84: 3c0dba00 */ lui $t5,0xba00
@@ -2576,7 +2576,7 @@ u32 var8007f0fc = 22000;
// spdb0[i] = 0;
// }
//
// tex0f0b39c0(&gdl, &g_TexGeneralConfigs[1], 2, 1, 2, 1, NULL);
// texSelect(&gdl, &g_TexGeneralConfigs[1], 2, 1, 2, 1, NULL);
//
// gDPSetCycleType(gdl++, G_CYC_1CYCLE);
// gDPSetColorDither(gdl++, G_CD_DISABLE);
@@ -3134,7 +3134,7 @@ glabel var7f1b5790
/* f134720: 24060004 */ addiu $a2,$zero,0x4
/* f134724: afa00018 */ sw $zero,0x18($sp)
/* f134728: afa01268 */ sw $zero,0x1268($sp)
/* f13472c: 0fc2ce70 */ jal tex0f0b39c0
/* f13472c: 0fc2ce70 */ jal texSelect
/* f134730: 00003825 */ or $a3,$zero,$zero
/* f134734: 8fb81398 */ lw $t8,0x1398($sp)
/* f134738: 8fa81268 */ lw $t0,0x1268($sp)
@@ -4622,7 +4622,7 @@ u32 var8007f110 = 0xffffff7f;
// s7 = 0;
// sp1268 = 0;
//
// tex0f0b39c0(&gdl, &g_TexGeneralConfigs[0], 4, 0, 2, 1, NULL);
// texSelect(&gdl, &g_TexGeneralConfigs[0], 4, 0, 2, 1, NULL);
//
// gDPSetCycleType(gdl++, G_CYC_1CYCLE);
// gDPSetColorDither(gdl++, G_CD_DISABLE);
src/include/bss.h
+1 -1
View File
@@ -264,7 +264,7 @@ extern u8 *var800ab540;
extern u32 var800ab544;
extern s32 var800ab548;
extern s32 g_TexNumConfigs;
extern u32 *g_TexWords;
extern struct texloadthing **g_TexWords;
extern struct textureconfig *g_TexWallhitConfigs;
extern Gfx *g_TexGdl1;
extern Gfx *g_TexGdl2;
src/include/game/surface.h
+3 -3
View File
@@ -10,11 +10,11 @@ void surface0f173a08(void);
bool surface0f173a44(u32 value);
bool surface0f173a70(s32 index, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9, s32 arg10);
bool surface0f173b8c(s32 index, s32 arg1, s32 arg2, s32 arg3, s32 arg4);
u32 surface0f173c10(void);
u32 surface0f173cb8(void);
s32 surface0f173c10(struct texloadthing *arg0, s32 arg1);
s32 surface0f173cb8(struct texloadthing *arg0, s32 arg1);
u32 surface0f173d60(void);
u32 surface0f173e10(void);
u32 surface0f173e50(void);
void surface0f173e50(struct texloadthing *arg0, s32 *arg1, s32 *arg2);
s32 surface0f173f18(s32 arg0);
u32 surface0f173f48(u32 arg0);
u32 surface0f173f78(void);
src/include/game/tex.h
+7 -7
View File
@@ -6,13 +6,13 @@
void texInit(void);
s32 tex0f0b3350(s32 value);
s32 tex0f0b33f8(s32 arg0, s32 arg1, s32 arg2);
s32 tex0f0b3468(s32 arg0, s32 arg1, s32 arg2);
s32 tex0f0b34d8(s32 arg0, s32 arg1, s32 arg2);
s32 tex0f0b3548(s32 arg0, s32 arg1, s32 arg2);
s32 texGetMask(s32 value);
s32 tex0f0b33f8(s32 width, s32 height, s32 lod);
s32 tex0f0b3468(s32 width, s32 height, s32 lod);
s32 tex0f0b34d8(s32 width, s32 height, s32 lod);
s32 tex0f0b3548(s32 width, s32 height, s32 lod);
void texSetRenderMode(Gfx **gdlptr, s32 arg1, s32 numcycles, s32 arg3);
void tex0f0b3988(struct textureconfig *config);
void tex0f0b39c0(Gfx **gdl, struct textureconfig *arg1, u32 arg2, u32 arg3, u32 arg4, s32 arg5, u32 *arg6);
void texLoadFromConfig(struct textureconfig *config);
void texSelect(Gfx **gdl, struct textureconfig *tconfig, u32 arg2, s32 arg3, u32 arg4, bool arg5, struct texturething *arg6);
#endif
src/include/gbiex.h
+7
View File
@@ -94,6 +94,13 @@
#define gDPTri1(pkt, x1, y1, z1) \
gDPTri4(pkt, x1, y1, z1, 0, 0, 0, 0, 0, 0, 0, 0, 0)
#define gDPLoadTLUT06(pkt, a, b, c, d) \
{ \
Gfx *_g = (Gfx *)pkt; \
_g->words.w0 = _SHIFTL(G_LOADTLUT, 24, 8) | _SHIFTL((a), 14, 10) | _SHIFTL((b), 2, 10); \
_g->words.w1 = _SHIFTL(0x06, 24, 8) | _SHIFTL((c), 14, 10) | _SHIFTL((d), 2, 10); \
}
/**
* Like gDPSetPrimColor, but is useful when the input colour is already in
* RGBA format. It avoids unnecessary bitshifting and masking.
src/include/types.h
+13 -13
View File
@@ -6725,19 +6725,19 @@ struct texturething {
};
struct texloadthing {
u16 texturenum : 12;
u16 unk00_0c : 4;
u32 unk04;
u8 width;
u8 height;
u8 unk0a;
u8 unk0b_00 : 3;
u8 gbiformat : 3;
u8 unk0b_06 : 2;
u32 unk0c_00 : 2;
u32 unk0c_02 : 1;
u32 unk0c_03 : 1;
u32 unk0c_04 : 24;
/*0x00*/ u16 texturenum : 12;
/*0x00*/ u16 unk00_0c : 4;
/*0x04*/ u32 unk04;
/*0x08*/ u8 width;
/*0x09*/ u8 height;
/*0x0a*/ u8 unk0a;
/*0x0b*/ u8 unk0b_00 : 3;
/*0x0b*/ u8 gbiformat : 3;
/*0x0b*/ u8 depth : 2;
/*0x0c*/ u32 lutmodeindex : 2;
/*0x0c*/ u32 unk0c_02 : 1;
/*0x0c*/ u32 unk0c_03 : 1;
/*0x0c*/ u32 unk0c_04 : 24;
};
struct texcacheitem {
src/lib/model.c
+1 -1
View File
@@ -5828,7 +5828,7 @@ glabel modelRenderNodeType16
void model000216cc(struct modelrenderdata *renderdata, struct textureconfig *tconfig, s32 arg2)
{
tex0f0b39c0(&renderdata->gdl, tconfig, arg2, renderdata->zbufferenabled, 2, 1, NULL);
texSelect(&renderdata->gdl, tconfig, arg2, renderdata->zbufferenabled, 2, 1, NULL);
}
GLOBAL_ASM(