From 77ac424475eceef32df66a355ed0d5aaf11dac24 Mon Sep 17 00:00:00 2001 From: Agent X <44549182+Agent-11@users.noreply.github.com> Date: Sat, 23 Mar 2024 21:05:26 -0400 Subject: [PATCH] Make some BBH displaylists unlit --- levels/bbh/areas/1/10/model.inc.c | 10 +++++----- levels/bbh/areas/1/11/model.inc.c | 2 +- levels/bbh/areas/1/15/model.inc.c | 4 ++-- levels/bbh/areas/1/21/model.inc.c | 2 +- levels/bbh/areas/1/27/model.inc.c | 4 ++-- levels/bbh/areas/1/30/model.inc.c | 2 +- levels/bbh/areas/1/38/model.inc.c | 2 +- levels/bbh/areas/1/39/model.inc.c | 2 +- levels/bbh/areas/1/4/model.inc.c | 6 +++--- levels/bbh/areas/1/5/model.inc.c | 18 +++++++++--------- levels/bbh/areas/1/6/model.inc.c | 4 ++-- levels/bbh/areas/1/9/model.inc.c | 4 ++-- 12 files changed, 30 insertions(+), 30 deletions(-) diff --git a/levels/bbh/areas/1/10/model.inc.c b/levels/bbh/areas/1/10/model.inc.c index bc8ca9cc..784955fc 100644 --- a/levels/bbh/areas/1/10/model.inc.c +++ b/levels/bbh/areas/1/10/model.inc.c @@ -19,26 +19,26 @@ static const Gfx bbh_seg7_dl_0700B8A8[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, spooky_09006800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPVertex(bbh_seg7_vertex_0700B488, 15, 0), + gsSPVertexNonGlobal(bbh_seg7_vertex_0700B488, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 7, 8, 9, 0x0), gsSP2Triangles( 5, 10, 11, 0x0, 5, 1, 10, 0x0), gsSP1Triangle(12, 13, 14, 0x0), - gsSPVertex(bbh_seg7_vertex_0700B578, 16, 0), + gsSPVertexNonGlobal(bbh_seg7_vertex_0700B578, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), gsSP2Triangles( 7, 4, 8, 0x0, 10, 11, 12, 0x0), gsSP2Triangles(10, 13, 11, 0x0, 14, 13, 15, 0x0), - gsSPVertex(bbh_seg7_vertex_0700B678, 15, 0), + gsSPVertexNonGlobal(bbh_seg7_vertex_0700B678, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), gsSP1Triangle(12, 13, 14, 0x0), - gsSPVertex(bbh_seg7_vertex_0700B768, 14, 0), + gsSPVertexNonGlobal(bbh_seg7_vertex_0700B768, 14, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 1, 5, 0x0, 4, 5, 6, 0x0), gsSP2Triangles( 7, 8, 9, 0x0, 7, 10, 8, 0x0), gsSP2Triangles(11, 10, 12, 0x0, 11, 13, 10, 0x0), - gsSPVertex(bbh_seg7_vertex_0700B848, 6, 0), + gsSPVertexNonGlobal(bbh_seg7_vertex_0700B848, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSPEndDisplayList(), }; diff --git a/levels/bbh/areas/1/11/model.inc.c b/levels/bbh/areas/1/11/model.inc.c index 6d18c0a9..cef6ca89 100644 --- a/levels/bbh/areas/1/11/model.inc.c +++ b/levels/bbh/areas/1/11/model.inc.c @@ -7,7 +7,7 @@ static const Gfx bbh_seg7_dl_0700BB50[] = { gsDPSetTextureImage(G_IM_FMT_IA, G_IM_SIZ_16b, 1, spooky_0900B000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPVertex(bbh_seg7_vertex_0700BA50, 16, 0), + gsSPVertexNonGlobal(bbh_seg7_vertex_0700BA50, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 4, 3, 0x0), gsSP2Triangles( 7, 8, 4, 0x0, 6, 5, 9, 0x0), diff --git a/levels/bbh/areas/1/15/model.inc.c b/levels/bbh/areas/1/15/model.inc.c index 80436ebf..8c94e203 100644 --- a/levels/bbh/areas/1/15/model.inc.c +++ b/levels/bbh/areas/1/15/model.inc.c @@ -10,14 +10,14 @@ static const Gfx bbh_seg7_dl_0700D6F0[] = { gsDPSetTextureImage(G_IM_FMT_IA, G_IM_SIZ_16b, 1, spooky_0900B000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPVertex(bbh_seg7_vertex_0700D500, 16, 0), + gsSPVertexNonGlobal(bbh_seg7_vertex_0700D500, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 6, 3, 0x0), gsSP2Triangles( 7, 8, 6, 0x0, 5, 4, 9, 0x0), gsSP2Triangles( 5, 9, 10, 0x0, 10, 9, 8, 0x0), gsSP2Triangles(10, 8, 7, 0x0, 11, 1, 0, 0x0), gsSP2Triangles( 0, 2, 12, 0x0, 13, 14, 15, 0x0), - gsSPVertex(bbh_seg7_vertex_0700D600, 15, 0), + gsSPVertexNonGlobal(bbh_seg7_vertex_0700D600, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 6, 5, 1, 0x0), gsSP2Triangles( 6, 1, 0, 0x0, 7, 8, 9, 0x0), diff --git a/levels/bbh/areas/1/21/model.inc.c b/levels/bbh/areas/1/21/model.inc.c index 36937e23..bfe47aec 100644 --- a/levels/bbh/areas/1/21/model.inc.c +++ b/levels/bbh/areas/1/21/model.inc.c @@ -7,7 +7,7 @@ static const Gfx bbh_seg7_dl_07012680[] = { gsDPSetTextureImage(G_IM_FMT_IA, G_IM_SIZ_16b, 1, spooky_0900B000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPVertex(bbh_seg7_vertex_07012580, 16, 0), + gsSPVertexNonGlobal(bbh_seg7_vertex_07012580, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), gsSP2Triangles( 7, 9, 10, 0x0, 11, 12, 13, 0x0), diff --git a/levels/bbh/areas/1/27/model.inc.c b/levels/bbh/areas/1/27/model.inc.c index bda1652d..070bd23e 100644 --- a/levels/bbh/areas/1/27/model.inc.c +++ b/levels/bbh/areas/1/27/model.inc.c @@ -10,14 +10,14 @@ static const Gfx bbh_seg7_dl_07015930[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, spooky_09006800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPVertex(bbh_seg7_vertex_07015750, 15, 0), + gsSPVertexNonGlobal(bbh_seg7_vertex_07015750, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0), gsSP2Triangles( 3, 4, 2, 0x0, 4, 0, 2, 0x0), gsSP2Triangles( 5, 6, 7, 0x0, 8, 5, 7, 0x0), gsSP2Triangles( 6, 9, 7, 0x0, 9, 8, 7, 0x0), gsSP2Triangles(10, 11, 12, 0x0, 11, 13, 12, 0x0), gsSP2Triangles(13, 14, 12, 0x0, 14, 10, 12, 0x0), - gsSPVertex(bbh_seg7_vertex_07015840, 15, 0), + gsSPVertexNonGlobal(bbh_seg7_vertex_07015840, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0), gsSP2Triangles( 3, 4, 2, 0x0, 4, 0, 2, 0x0), gsSP2Triangles( 5, 6, 7, 0x0, 8, 5, 7, 0x0), diff --git a/levels/bbh/areas/1/30/model.inc.c b/levels/bbh/areas/1/30/model.inc.c index 291ca900..6497e3ef 100644 --- a/levels/bbh/areas/1/30/model.inc.c +++ b/levels/bbh/areas/1/30/model.inc.c @@ -7,7 +7,7 @@ static const Gfx bbh_seg7_dl_070176E0[] = { gsDPSetTextureImage(G_IM_FMT_IA, G_IM_SIZ_16b, 1, spooky_0900B000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPVertex(bbh_seg7_vertex_070175E0, 16, 0), + gsSPVertexNonGlobal(bbh_seg7_vertex_070175E0, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 4, 3, 0x0), gsSP2Triangles( 7, 8, 4, 0x0, 6, 5, 9, 0x0), diff --git a/levels/bbh/areas/1/38/model.inc.c b/levels/bbh/areas/1/38/model.inc.c index d6f7097d..0790886e 100644 --- a/levels/bbh/areas/1/38/model.inc.c +++ b/levels/bbh/areas/1/38/model.inc.c @@ -21,7 +21,7 @@ static const Gfx bbh_seg7_dl_0701EE90[] = { gsDPSetTextureImage(G_IM_FMT_IA, G_IM_SIZ_16b, 1, spooky_0900B800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPVertex(bbh_seg7_vertex_0701EE08, 4, 0), + gsSPVertexNonGlobal(bbh_seg7_vertex_0701EE08, 4, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSPEndDisplayList(), }; diff --git a/levels/bbh/areas/1/39/model.inc.c b/levels/bbh/areas/1/39/model.inc.c index 70df04cb..91f6a0b4 100644 --- a/levels/bbh/areas/1/39/model.inc.c +++ b/levels/bbh/areas/1/39/model.inc.c @@ -7,7 +7,7 @@ static const Gfx bbh_seg7_dl_0701F018[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, spooky_09006800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPVertex(bbh_seg7_vertex_0701EF58, 12, 0), + gsSPVertexNonGlobal(bbh_seg7_vertex_0701EF58, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 3, 5, 0x0, 4, 6, 3, 0x0), gsSP2Triangles( 7, 8, 9, 0x0, 10, 5, 11, 0x0), diff --git a/levels/bbh/areas/1/4/model.inc.c b/levels/bbh/areas/1/4/model.inc.c index 89a8f615..f42d54f8 100644 --- a/levels/bbh/areas/1/4/model.inc.c +++ b/levels/bbh/areas/1/4/model.inc.c @@ -13,17 +13,17 @@ static const Gfx bbh_seg7_dl_07007EE8[] = { gsDPSetTextureImage(G_IM_FMT_IA, G_IM_SIZ_16b, 1, spooky_0900B800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPVertex(bbh_seg7_vertex_07007C08, 15, 0), + gsSPVertexNonGlobal(bbh_seg7_vertex_07007C08, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), gsSP2Triangles( 7, 10, 8, 0x0, 11, 12, 13, 0x0), gsSP1Triangle(11, 13, 14, 0x0), - gsSPVertex(bbh_seg7_vertex_07007CF8, 15, 0), + gsSPVertexNonGlobal(bbh_seg7_vertex_07007CF8, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 6, 9, 7, 0x0), gsSP2Triangles(10, 11, 12, 0x0, 10, 13, 11, 0x0), gsSP1Triangle( 0, 2, 14, 0x0), - gsSPVertex(bbh_seg7_vertex_07007DE8, 16, 0), + gsSPVertexNonGlobal(bbh_seg7_vertex_07007DE8, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), gsSP2Triangles( 7, 9, 10, 0x0, 11, 12, 13, 0x0), diff --git a/levels/bbh/areas/1/5/model.inc.c b/levels/bbh/areas/1/5/model.inc.c index 94c4293f..efa80a88 100644 --- a/levels/bbh/areas/1/5/model.inc.c +++ b/levels/bbh/areas/1/5/model.inc.c @@ -31,45 +31,45 @@ static const Gfx bbh_seg7_dl_070088E0[] = { gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, spooky_09006800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPVertex(bbh_seg7_vertex_07008040, 16, 0), + gsSPVertexNonGlobal(bbh_seg7_vertex_07008040, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 7, 0, 8, 0x0), gsSP2Triangles( 9, 1, 10, 0x0, 9, 11, 1, 0x0), gsSP2Triangles(12, 13, 14, 0x0, 12, 15, 13, 0x0), - gsSPVertex(bbh_seg7_vertex_07008140, 16, 0), + gsSPVertexNonGlobal(bbh_seg7_vertex_07008140, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 1, 6, 7, 0x0, 1, 7, 8, 0x0), gsSP2Triangles( 9, 10, 11, 0x0, 9, 11, 12, 0x0), gsSP2Triangles(13, 14, 10, 0x0, 13, 10, 15, 0x0), - gsSPVertex(bbh_seg7_vertex_07008240, 15, 0), + gsSPVertexNonGlobal(bbh_seg7_vertex_07008240, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 6, 7, 8, 0x0, 6, 8, 9, 0x0), gsSP2Triangles(10, 11, 12, 0x0, 13, 6, 14, 0x0), - gsSPVertex(bbh_seg7_vertex_07008330, 16, 0), + gsSPVertexNonGlobal(bbh_seg7_vertex_07008330, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 7, 8, 9, 0x0), gsSP2Triangles( 5, 10, 11, 0x0, 5, 11, 12, 0x0), gsSP2Triangles(13, 14, 10, 0x0, 13, 10, 15, 0x0), - gsSPVertex(bbh_seg7_vertex_07008430, 16, 0), + gsSPVertexNonGlobal(bbh_seg7_vertex_07008430, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 7, 8, 9, 0x0), gsSP2Triangles( 5, 2, 10, 0x0, 5, 10, 11, 0x0), gsSP2Triangles(12, 13, 14, 0x0, 12, 14, 15, 0x0), - gsSPVertex(bbh_seg7_vertex_07008530, 15, 0), + gsSPVertexNonGlobal(bbh_seg7_vertex_07008530, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 7, 0, 8, 0x0), gsSP2Triangles( 9, 10, 11, 0x0, 12, 13, 14, 0x0), - gsSPVertex(bbh_seg7_vertex_07008620, 16, 0), + gsSPVertexNonGlobal(bbh_seg7_vertex_07008620, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 2, 5, 0x0, 4, 5, 6, 0x0), gsSP2Triangles( 7, 8, 9, 0x0, 7, 9, 10, 0x0), gsSP2Triangles(11, 12, 13, 0x0, 14, 10, 15, 0x0), - gsSPVertex(bbh_seg7_vertex_07008720, 16, 0), + gsSPVertexNonGlobal(bbh_seg7_vertex_07008720, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 7, 8, 9, 0x0), gsSP2Triangles(10, 11, 5, 0x0, 10, 12, 11, 0x0), gsSP2Triangles(13, 14, 15, 0x0, 13, 11, 14, 0x0), - gsSPVertex(bbh_seg7_vertex_07008820, 12, 0), + gsSPVertexNonGlobal(bbh_seg7_vertex_07008820, 12, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 7, 3, 8, 0x0), gsSP2Triangles( 9, 2, 10, 0x0, 9, 10, 11, 0x0), diff --git a/levels/bbh/areas/1/6/model.inc.c b/levels/bbh/areas/1/6/model.inc.c index e21e328e..dd1776f2 100644 --- a/levels/bbh/areas/1/6/model.inc.c +++ b/levels/bbh/areas/1/6/model.inc.c @@ -10,14 +10,14 @@ static const Gfx bbh_seg7_dl_07008DB8[] = { gsDPSetTextureImage(G_IM_FMT_IA, G_IM_SIZ_16b, 1, spooky_0900B000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPVertex(bbh_seg7_vertex_07008BC8, 16, 0), + gsSPVertexNonGlobal(bbh_seg7_vertex_07008BC8, 16, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 6, 4, 0x0, 7, 6, 3, 0x0), gsSP2Triangles( 7, 8, 6, 0x0, 5, 4, 9, 0x0), gsSP2Triangles( 5, 9, 10, 0x0, 10, 9, 8, 0x0), gsSP2Triangles(10, 8, 7, 0x0, 11, 1, 0, 0x0), gsSP2Triangles( 0, 2, 12, 0x0, 13, 14, 15, 0x0), - gsSPVertex(bbh_seg7_vertex_07008CC8, 15, 0), + gsSPVertexNonGlobal(bbh_seg7_vertex_07008CC8, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 6, 5, 1, 0x0), gsSP2Triangles( 6, 1, 0, 0x0, 7, 8, 9, 0x0), diff --git a/levels/bbh/areas/1/9/model.inc.c b/levels/bbh/areas/1/9/model.inc.c index 576ace3f..8bd745ab 100644 --- a/levels/bbh/areas/1/9/model.inc.c +++ b/levels/bbh/areas/1/9/model.inc.c @@ -10,12 +10,12 @@ static const Gfx bbh_seg7_dl_0700B398[] = { gsDPSetTextureImage(G_IM_FMT_IA, G_IM_SIZ_16b, 1, spooky_0900B800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPVertex(bbh_seg7_vertex_0700B238, 15, 0), + gsSPVertexNonGlobal(bbh_seg7_vertex_0700B238, 15, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), gsSP2Triangles( 7, 9, 10, 0x0, 11, 12, 13, 0x0), gsSP1Triangle(11, 14, 12, 0x0), - gsSPVertex(bbh_seg7_vertex_0700B328, 7, 0), + gsSPVertexNonGlobal(bbh_seg7_vertex_0700B328, 7, 0), gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), gsSP1Triangle( 0, 6, 1, 0x0), gsSPEndDisplayList(),