print_n_panic/Microtransactions64
0
0
Fork 0
mirror of https://github.com/Print-and-Panic/Microtransactions64.git synced 2026-01-21 10:17:19 -08:00
Code Issues Packages Projects Releases Wiki Activity

Mat Stack Fix

Browse Source 
* Implemented new lightweight CPU/RDP profiler
* Added RSP profiling to the lightweight profiler
* Added CPU audio to lightweight profiler
* Changed lingering manual light struct definitions to gdSPDefLights1, made a dummy light for Koopa's pink shorts
* Ran script to convert all light commands to lightcolor commands
* Added define guards for the profiler
* Wrote function for setting up global light direction in the frame
* Moved camera matrix into projection stack
* Corrected cameraToObject for the new matrix stack (fixes culling and sound)
* Fixed billboarding with new matrix stack
* Fixed shadows with new matrix stack
* Fixed some areas where the game was previously extracting the camera matrix from various matrices
* Restored vanilla light and env map directions under new matrix stack
* Fix goddard crash
* Fix geo_process_level_of_detail
* Remove 'construct_float' from 'geo_process_level_of_detail'
* Removed some accidentally added files
* Removed unnecessary matrix multiplications in geo_process_object
* Added fixlights script to build system for fixing custom assets and added option to disable it if needed
* Fixed visual debug with new matstack and cleaned up visual debug code
* Fixed handling of WORLD_SCALE in view matrix so it doesn't get cancelled out
* Fixed clip planes not scaling based on WORLD_SCALE

Co-authored-by: Mr-Wiseguy <mrwiseguyromhacking@gmail.com>
Co-authored-by: Arceveti <arceveti@gmail.com>
Co-authored-by: thecozies <collinpferguson@gmail.com>
This commit is contained in:
Reonu
2022-07-19 14:04:54 +01:00
committed by GitHub
parent 1820b146c0
commit 5a9b5a9751
441 changed files with 3271 additions and 7508 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
levels/bbh/areas/1/1/model.inc.c
View File

@@ -1,14 +1,6 @@
// 0x07004800 - 0x07004818
static const Lights1 bbh_seg7_lights_07004800 = gdSPDefLights1(
0x20, 0x20, 0x20,
0x50, 0x50, 0x50, 0x28, 0x28, 0x28
);
// 0x07004818 - 0x07004830
static const Lights1 bbh_seg7_lights_07004818 = gdSPDefLights1(
0x66, 0x66, 0x66,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x07004830 - 0x07004920
static const Vtx bbh_seg7_vertex_07004830[] = {
@@ -731,8 +723,8 @@ static const Gfx bbh_seg7_dl_07006AF0[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, spooky_09008800),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&bbh_seg7_lights_07004800.l, 1),
gsSPLight(&bbh_seg7_lights_07004800.a, 2),
gsSPLightColor(LIGHT_1, 0x505050ff),
gsSPLightColor(LIGHT_2, 0x202020ff),
gsSPVertex(bbh_seg7_vertex_07004830, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0),
@@ -742,8 +734,8 @@ static const Gfx bbh_seg7_dl_07006AF0[] = {
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 7, 8, 0x0, 6, 8, 9, 0x0),
gsSP1Triangle( 0, 10, 1, 0x0),
gsSPLight(&bbh_seg7_lights_07004818.l, 1),
gsSPLight(&bbh_seg7_lights_07004818.a, 2),
gsSPLightColor(LIGHT_1, 0xffffffff),
gsSPLightColor(LIGHT_2, 0x666666ff),
gsSPVertex(bbh_seg7_vertex_070049D0, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 4, 0x0),
gsSP2Triangles( 2, 4, 0, 0x0, 4, 3, 5, 0x0),

16
levels/bbh/areas/1/12/model.inc.c
View File

@@ -1,14 +1,6 @@
// 0x0700BC68 - 0x0700BC80
static const Lights1 bbh_seg7_lights_0700BC68 = gdSPDefLights1(
0x20, 0x20, 0x20,
0x50, 0x50, 0x50, 0x28, 0x28, 0x28
);
// 0x0700BC80 - 0x0700BC98
static const Lights1 bbh_seg7_lights_0700BC80 = gdSPDefLights1(
0x66, 0x66, 0x66,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x0700BC98 - 0x0700BD18
static const Vtx bbh_seg7_vertex_0700BC98[] = {
@@ -323,13 +315,13 @@ static const Gfx bbh_seg7_dl_0700CB58[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, spooky_09008800),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&bbh_seg7_lights_0700BC68.l, 1),
gsSPLight(&bbh_seg7_lights_0700BC68.a, 2),
gsSPLightColor(LIGHT_1, 0x505050ff),
gsSPLightColor(LIGHT_2, 0x202020ff),
gsSPVertex(bbh_seg7_vertex_0700BC98, 8, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0),
gsSPLight(&bbh_seg7_lights_0700BC80.l, 1),
gsSPLight(&bbh_seg7_lights_0700BC80.a, 2),
gsSPLightColor(LIGHT_1, 0xffffffff),
gsSPLightColor(LIGHT_2, 0x666666ff),
gsSPVertex(bbh_seg7_vertex_0700BD18, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 4, 0x0),
gsSP2Triangles( 2, 5, 3, 0x0, 6, 7, 8, 0x0),

8
levels/bbh/areas/1/14/model.inc.c
View File

@@ -1,8 +1,4 @@
// 0x0700D350 - 0x0700D368
static const Lights1 bbh_seg7_lights_0700D350 = gdSPDefLights1(
0x3f, 0x51, 0x66,
0x9e, 0xcc, 0xff, 0x28, 0x28, 0x28
);
// 0x0700D368 - 0x0700D428
static const Vtx bbh_seg7_vertex_0700D368[] = {
@@ -25,8 +21,8 @@ static const Gfx bbh_seg7_dl_0700D428[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, spooky_09006000),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&bbh_seg7_lights_0700D350.l, 1),
gsSPLight(&bbh_seg7_lights_0700D350.a, 2),
gsSPLightColor(LIGHT_1, 0x9eccffff),
gsSPLightColor(LIGHT_2, 0x3f5166ff),
gsSPVertex(bbh_seg7_vertex_0700D368, 12, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0),

24
levels/bbh/areas/1/16/model.inc.c
View File

@@ -1,20 +1,8 @@
// 0x0700D850 - 0x0700D868
static const Lights1 bbh_seg7_lights_0700D850 = gdSPDefLights1(
0x20, 0x20, 0x20,
0x50, 0x50, 0x50, 0x28, 0x28, 0x28
);
// 0x0700D868 - 0x0700D880
static const Lights1 bbh_seg7_lights_0700D868 = gdSPDefLights1(
0x3c, 0x3c, 0x3c,
0x96, 0x96, 0x96, 0x28, 0x28, 0x28
);
// 0x0700D880 - 0x0700D898
static const Lights1 bbh_seg7_lights_0700D880 = gdSPDefLights1(
0x66, 0x66, 0x66,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x0700D898 - 0x0700D918
static const Vtx bbh_seg7_vertex_0700D898[] = {
@@ -473,19 +461,19 @@ static const Gfx bbh_seg7_dl_0700EE98[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, spooky_09008800),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&bbh_seg7_lights_0700D850.l, 1),
gsSPLight(&bbh_seg7_lights_0700D850.a, 2),
gsSPLightColor(LIGHT_1, 0x505050ff),
gsSPLightColor(LIGHT_2, 0x202020ff),
gsSPVertex(bbh_seg7_vertex_0700D898, 8, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0),
gsSPLight(&bbh_seg7_lights_0700D868.l, 1),
gsSPLight(&bbh_seg7_lights_0700D868.a, 2),
gsSPLightColor(LIGHT_1, 0x969696ff),
gsSPLightColor(LIGHT_2, 0x3c3c3cff),
gsSPVertex(bbh_seg7_vertex_0700D918, 10, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 4, 0x0),
gsSP2Triangles( 0, 5, 3, 0x0, 0, 2, 5, 0x0),
gsSP2Triangles( 6, 7, 8, 0x0, 6, 9, 7, 0x0),
gsSPLight(&bbh_seg7_lights_0700D880.l, 1),
gsSPLight(&bbh_seg7_lights_0700D880.a, 2),
gsSPLightColor(LIGHT_1, 0xffffffff),
gsSPLightColor(LIGHT_2, 0x666666ff),
gsSPVertex(bbh_seg7_vertex_0700D9B8, 14, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 4, 0x0),
gsSP2Triangles( 4, 5, 0, 0x0, 0, 2, 3, 0x0),

48
levels/bbh/areas/1/18/model.inc.c
View File

@@ -1,26 +1,10 @@
// 0x0700F8B8 - 0x0700F8D0
static const Lights1 bbh_seg7_lights_0700F8B8 = gdSPDefLights1(
0x65, 0x65, 0x38,
0xfe, 0xfe, 0x8c, 0x28, 0x28, 0x28
);
// 0x0700F8D0 - 0x0700F8E8
static const Lights1 bbh_seg7_lights_0700F8D0 = gdSPDefLights1(
0x20, 0x20, 0x20,
0x50, 0x50, 0x50, 0x28, 0x28, 0x28
);
// 0x0700F8E8 - 0x0700F900
static const Lights1 bbh_seg7_lights_0700F8E8 = gdSPDefLights1(
0x66, 0x66, 0x66,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x0700F900 - 0x0700F918
static const Lights1 bbh_seg7_lights_0700F900 = gdSPDefLights1(
0x33, 0x2c, 0x20,
0x80, 0x70, 0x52, 0x28, 0x28, 0x28
);
// 0x0700F918 - 0x0700F9F8
static const Vtx bbh_seg7_vertex_0700F918[] = {
@@ -394,8 +378,8 @@ static const Gfx bbh_seg7_dl_07010A48[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, spooky_09008800),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&bbh_seg7_lights_0700F8B8.l, 1),
gsSPLight(&bbh_seg7_lights_0700F8B8.a, 2),
gsSPLightColor(LIGHT_1, 0xfefe8cff),
gsSPLightColor(LIGHT_2, 0x656538ff),
gsSPVertex(bbh_seg7_vertex_0700F918, 14, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 5, 6, 3, 0x0, 5, 7, 8, 0x0),
@@ -404,13 +388,13 @@ static const Gfx bbh_seg7_dl_07010A48[] = {
gsSPVertex(bbh_seg7_vertex_0700F9F8, 7, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP1Triangle( 0, 6, 1, 0x0),
gsSPLight(&bbh_seg7_lights_0700F8D0.l, 1),
gsSPLight(&bbh_seg7_lights_0700F8D0.a, 2),
gsSPLightColor(LIGHT_1, 0x505050ff),
gsSPLightColor(LIGHT_2, 0x202020ff),
gsSPVertex(bbh_seg7_vertex_0700FA68, 8, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0),
gsSPLight(&bbh_seg7_lights_0700F8E8.l, 1),
gsSPLight(&bbh_seg7_lights_0700F8E8.a, 2),
gsSPLightColor(LIGHT_1, 0xffffffff),
gsSPLightColor(LIGHT_2, 0x666666ff),
gsSPVertex(bbh_seg7_vertex_0700FAE8, 12, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0),
@@ -423,18 +407,18 @@ static const Gfx bbh_seg7_dl_07010B58[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, spooky_09003800),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&bbh_seg7_lights_0700F8B8.l, 1),
gsSPLight(&bbh_seg7_lights_0700F8B8.a, 2),
gsSPLightColor(LIGHT_1, 0xfefe8cff),
gsSPLightColor(LIGHT_2, 0x656538ff),
gsSPVertex(bbh_seg7_vertex_0700FBA8, 4, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0),
gsSPLight(&bbh_seg7_lights_0700F8E8.l, 1),
gsSPLight(&bbh_seg7_lights_0700F8E8.a, 2),
gsSPLightColor(LIGHT_1, 0xffffffff),
gsSPLightColor(LIGHT_2, 0x666666ff),
gsSPVertex(bbh_seg7_vertex_0700FBE8, 12, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0),
gsSP2Triangles( 8, 9, 10, 0x0, 8, 10, 11, 0x0),
gsSPLight(&bbh_seg7_lights_0700F900.l, 1),
gsSPLight(&bbh_seg7_lights_0700F900.a, 2),
gsSPLightColor(LIGHT_1, 0x807052ff),
gsSPLightColor(LIGHT_2, 0x332c20ff),
gsSPVertex(bbh_seg7_vertex_0700FCA8, 12, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0),
@@ -447,14 +431,14 @@ static const Gfx bbh_seg7_dl_07010C30[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bbh_seg7_texture_07000000),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&bbh_seg7_lights_0700F8B8.l, 1),
gsSPLight(&bbh_seg7_lights_0700F8B8.a, 2),
gsSPLightColor(LIGHT_1, 0xfefe8cff),
gsSPLightColor(LIGHT_2, 0x656538ff),
gsSPVertex(bbh_seg7_vertex_0700FD68, 12, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0),
gsSP2Triangles( 8, 9, 10, 0x0, 8, 10, 11, 0x0),
gsSPLight(&bbh_seg7_lights_0700F8E8.l, 1),
gsSPLight(&bbh_seg7_lights_0700F8E8.a, 2),
gsSPLightColor(LIGHT_1, 0xffffffff),
gsSPLightColor(LIGHT_2, 0x666666ff),
gsSPVertex(bbh_seg7_vertex_0700FE28, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 4, 0x0),
gsSP2Triangles( 0, 5, 3, 0x0, 0, 4, 1, 0x0),

8
levels/bbh/areas/1/19/model.inc.c
View File

@@ -1,8 +1,4 @@
// 0x07011228 - 0x07011240
static const Lights1 bbh_seg7_lights_07011228 = gdSPDefLights1(
0x66, 0x66, 0x66,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x07011240 - 0x070112C0
static const Vtx bbh_seg7_vertex_07011240[] = {
@@ -252,8 +248,8 @@ static const Gfx bbh_seg7_dl_07011DF0[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, spooky_0900A000),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&bbh_seg7_lights_07011228.l, 1),
gsSPLight(&bbh_seg7_lights_07011228.a, 2),
gsSPLightColor(LIGHT_1, 0xffffffff),
gsSPLightColor(LIGHT_2, 0x666666ff),
gsSPVertex(bbh_seg7_vertex_07011240, 8, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0),

8
levels/bbh/areas/1/20/model.inc.c
View File

@@ -1,8 +1,4 @@
// 0x07012318 - 0x07012330
static const Lights1 bbh_seg7_lights_07012318 = gdSPDefLights1(
0x66, 0x66, 0x66,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x07012330 - 0x07012430
static const Vtx bbh_seg7_vertex_07012330[] = {
@@ -37,8 +33,8 @@ static const Gfx bbh_seg7_dl_07012470[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bbh_seg7_texture_07000000),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&bbh_seg7_lights_07012318.l, 1),
gsSPLight(&bbh_seg7_lights_07012318.a, 2),
gsSPLightColor(LIGHT_1, 0xffffffff),
gsSPLightColor(LIGHT_2, 0x666666ff),
gsSPVertex(bbh_seg7_vertex_07012330, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 3, 5, 6, 0x0, 3, 6, 2, 0x0),

16
levels/bbh/areas/1/22/model.inc.c
View File

@@ -1,14 +1,6 @@
// 0x07012758 - 0x07012770
static const Lights1 bbh_seg7_lights_07012758 = gdSPDefLights1(
0x3c, 0x3c, 0x3c,
0x96, 0x96, 0x96, 0x28, 0x28, 0x28
);
// 0x07012770 - 0x07012788
static const Lights1 bbh_seg7_lights_07012770 = gdSPDefLights1(
0x66, 0x66, 0x66,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x07012788 - 0x070127C8
static const Vtx bbh_seg7_vertex_07012788[] = {
@@ -303,8 +295,8 @@ static const Gfx bbh_seg7_dl_07013508[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, spooky_0900A000),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&bbh_seg7_lights_07012758.l, 1),
gsSPLight(&bbh_seg7_lights_07012758.a, 2),
gsSPLightColor(LIGHT_1, 0x969696ff),
gsSPLightColor(LIGHT_2, 0x3c3c3cff),
gsSPVertex(bbh_seg7_vertex_07012788, 4, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSPEndDisplayList(),
@@ -315,8 +307,8 @@ static const Gfx bbh_seg7_dl_07013550[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, spooky_09008800),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&bbh_seg7_lights_07012770.l, 1),
gsSPLight(&bbh_seg7_lights_07012770.a, 2),
gsSPLightColor(LIGHT_1, 0xffffffff),
gsSPLightColor(LIGHT_2, 0x666666ff),
gsSPVertex(bbh_seg7_vertex_070127C8, 8, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0),

24
levels/bbh/areas/1/24/model.inc.c
View File

@@ -1,14 +1,6 @@
// 0x07013C58 - 0x07013C70
static const Lights1 bbh_seg7_lights_07013C58 = gdSPDefLights1(
0x20, 0x20, 0x20,
0x50, 0x50, 0x50, 0x28, 0x28, 0x28
);
// 0x07013C70 - 0x07013C88
static const Lights1 bbh_seg7_lights_07013C70 = gdSPDefLights1(
0x66, 0x66, 0x66,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x07013C88 - 0x07013D08
static const Vtx bbh_seg7_vertex_07013C88[] = {
@@ -321,13 +313,13 @@ static const Gfx bbh_seg7_dl_07014B28[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, spooky_09008800),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&bbh_seg7_lights_07013C58.l, 1),
gsSPLight(&bbh_seg7_lights_07013C58.a, 2),
gsSPLightColor(LIGHT_1, 0x505050ff),
gsSPLightColor(LIGHT_2, 0x202020ff),
gsSPVertex(bbh_seg7_vertex_07013C88, 8, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0),
gsSPLight(&bbh_seg7_lights_07013C70.l, 1),
gsSPLight(&bbh_seg7_lights_07013C70.a, 2),
gsSPLightColor(LIGHT_1, 0xffffffff),
gsSPLightColor(LIGHT_2, 0x666666ff),
gsSPVertex(bbh_seg7_vertex_07013D08, 12, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0),
@@ -340,8 +332,8 @@ static const Gfx bbh_seg7_dl_07014BC8[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, spooky_0900A000),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&bbh_seg7_lights_07013C58.l, 1),
gsSPLight(&bbh_seg7_lights_07013C58.a, 2),
gsSPLightColor(LIGHT_1, 0x505050ff),
gsSPLightColor(LIGHT_2, 0x202020ff),
gsSPVertex(bbh_seg7_vertex_07013DC8, 4, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSPEndDisplayList(),
@@ -352,8 +344,8 @@ static const Gfx bbh_seg7_dl_07014C10[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, spooky_09004800),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&bbh_seg7_lights_07013C70.l, 1),
gsSPLight(&bbh_seg7_lights_07013C70.a, 2),
gsSPLightColor(LIGHT_1, 0xffffffff),
gsSPLightColor(LIGHT_2, 0x666666ff),
gsSPVertex(bbh_seg7_vertex_07013E08, 4, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0),
gsSPEndDisplayList(),

8
levels/bbh/areas/1/28/model.inc.c
View File

@@ -1,8 +1,4 @@
// 0x07015A90 - 0x07015AA8
static const Lights1 bbh_seg7_lights_07015A90 = gdSPDefLights1(
0x66, 0x66, 0x66,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x07015AA8 - 0x07015B98
static const Vtx bbh_seg7_vertex_07015AA8[] = {
@@ -394,8 +390,8 @@ static const Gfx bbh_seg7_dl_07016D38[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, spooky_09004800),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&bbh_seg7_lights_07015A90.l, 1),
gsSPLight(&bbh_seg7_lights_07015A90.a, 2),
gsSPLightColor(LIGHT_1, 0xffffffff),
gsSPLightColor(LIGHT_2, 0x666666ff),
gsSPVertex(bbh_seg7_vertex_07015AA8, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0),

8
levels/bbh/areas/1/29/model.inc.c
View File

@@ -1,8 +1,4 @@
// 0x07017480 - 0x07017498
static const Lights1 bbh_seg7_lights_07017480 = gdSPDefLights1(
0x66, 0x66, 0x66,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x07017498 - 0x07017518
static const Vtx bbh_seg7_vertex_07017498[] = {
@@ -21,8 +17,8 @@ static const Gfx bbh_seg7_dl_07017518[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, spooky_09006000),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&bbh_seg7_lights_07017480.l, 1),
gsSPLight(&bbh_seg7_lights_07017480.a, 2),
gsSPLightColor(LIGHT_1, 0xffffffff),
gsSPLightColor(LIGHT_2, 0x666666ff),
gsSPVertex(bbh_seg7_vertex_07017498, 8, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0),

16
levels/bbh/areas/1/3/model.inc.c
View File

@@ -1,14 +1,6 @@
// 0x070079B0 - 0x070079C8
static const Lights1 bbh_seg7_lights_070079B0 = gdSPDefLights1(
0x3f, 0x51, 0x66,
0x9e, 0xcc, 0xff, 0x28, 0x28, 0x28
);
// 0x070079C8 - 0x070079E0
static const Lights1 bbh_seg7_lights_070079C8 = gdSPDefLights1(
0x66, 0x66, 0x66,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x070079E0 - 0x07007AA0
static const Vtx bbh_seg7_vertex_070079E0[] = {
@@ -39,8 +31,8 @@ static const Gfx bbh_seg7_dl_07007AE0[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, spooky_09006000),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&bbh_seg7_lights_070079B0.l, 1),
gsSPLight(&bbh_seg7_lights_070079B0.a, 2),
gsSPLightColor(LIGHT_1, 0x9eccffff),
gsSPLightColor(LIGHT_2, 0x3f5166ff),
gsSPVertex(bbh_seg7_vertex_070079E0, 12, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0),
@@ -53,8 +45,8 @@ static const Gfx bbh_seg7_dl_07007B48[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bbh_seg7_texture_07001000),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&bbh_seg7_lights_070079C8.l, 1),
gsSPLight(&bbh_seg7_lights_070079C8.a, 2),
gsSPLightColor(LIGHT_1, 0xffffffff),
gsSPLightColor(LIGHT_2, 0x666666ff),
gsSPVertex(bbh_seg7_vertex_07007AA0, 4, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0),
gsSPEndDisplayList(),

16
levels/bbh/areas/1/31/model.inc.c
View File

@@ -1,14 +1,6 @@
// 0x070177F8 - 0x07017810
static const Lights1 bbh_seg7_lights_070177F8 = gdSPDefLights1(
0x66, 0x66, 0x66,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x07017810 - 0x07017828
static const Lights1 bbh_seg7_lights_07017810 = gdSPDefLights1(
0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x28, 0x28, 0x28
);
// 0x07017828 - 0x07017918
static const Vtx bbh_seg7_vertex_07017828[] = {
@@ -623,8 +615,8 @@ static const Gfx bbh_seg7_dl_070195A8[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, spooky_0900A000),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&bbh_seg7_lights_070177F8.l, 1),
gsSPLight(&bbh_seg7_lights_070177F8.a, 2),
gsSPLightColor(LIGHT_1, 0xffffffff),
gsSPLightColor(LIGHT_2, 0x666666ff),
gsSPVertex(bbh_seg7_vertex_07017828, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0),
@@ -836,8 +828,8 @@ static const Gfx bbh_seg7_dl_07019E60[] = {
// 0x07019EA8 - 0x07019EF8
static const Gfx bbh_seg7_dl_07019EA8[] = {
gsSPLight(&bbh_seg7_lights_07017810.l, 1),
gsSPLight(&bbh_seg7_lights_07017810.a, 2),
gsSPLightColor(LIGHT_1, 0xff),
gsSPLightColor(LIGHT_2, 0xff),
gsSPVertex(bbh_seg7_vertex_07019508, 10, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0),
gsSP2Triangles( 4, 1, 5, 0x0, 6, 7, 2, 0x0),

16
levels/bbh/areas/1/33/model.inc.c
View File

@@ -1,14 +1,6 @@
// 0x0701A0F0 - 0x0701A108
static const Lights1 bbh_seg7_lights_0701A0F0 = gdSPDefLights1(
0x20, 0x20, 0x20,
0x50, 0x50, 0x50, 0x28, 0x28, 0x28
);
// 0x0701A108 - 0x0701A120
static const Lights1 bbh_seg7_lights_0701A108 = gdSPDefLights1(
0x66, 0x66, 0x66,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x0701A120 - 0x0701A160
static const Vtx bbh_seg7_vertex_0701A120[] = {
@@ -119,8 +111,8 @@ static const Gfx bbh_seg7_dl_0701A620[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, spooky_0900A000),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&bbh_seg7_lights_0701A0F0.l, 1),
gsSPLight(&bbh_seg7_lights_0701A0F0.a, 2),
gsSPLightColor(LIGHT_1, 0x505050ff),
gsSPLightColor(LIGHT_2, 0x202020ff),
gsSPVertex(bbh_seg7_vertex_0701A120, 4, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0),
gsSPEndDisplayList(),
@@ -131,8 +123,8 @@ static const Gfx bbh_seg7_dl_0701A668[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, spooky_09008800),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&bbh_seg7_lights_0701A108.l, 1),
gsSPLight(&bbh_seg7_lights_0701A108.a, 2),
gsSPLightColor(LIGHT_1, 0xffffffff),
gsSPLightColor(LIGHT_2, 0x666666ff),
gsSPVertex(bbh_seg7_vertex_0701A160, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0),

24
levels/bbh/areas/1/34/model.inc.c
View File

@@ -1,20 +1,8 @@
// 0x0701A920 - 0x0701A938
static const Lights1 bbh_seg7_lights_0701A920 = gdSPDefLights1(
0x10, 0x11, 0x16,
0x2a, 0x2c, 0x37, 0x28, 0x28, 0x28
);
// 0x0701A938 - 0x0701A950
static const Lights1 bbh_seg7_lights_0701A938 = gdSPDefLights1(
0x3c, 0x3c, 0x3c,
0x96, 0x96, 0x96, 0x28, 0x28, 0x28
);
// 0x0701A950 - 0x0701A968
static const Lights1 bbh_seg7_lights_0701A950 = gdSPDefLights1(
0x66, 0x66, 0x66,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x0701A968 - 0x0701A9C8
static const Vtx bbh_seg7_vertex_0701A968[] = {
@@ -229,8 +217,8 @@ static const Gfx bbh_seg7_dl_0701B328[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, spooky_09004800),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&bbh_seg7_lights_0701A920.l, 1),
gsSPLight(&bbh_seg7_lights_0701A920.a, 2),
gsSPLightColor(LIGHT_1, 0x2a2c37ff),
gsSPLightColor(LIGHT_2, 0x101116ff),
gsSPVertex(bbh_seg7_vertex_0701A968, 6, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 1, 4, 5, 0x0, 1, 5, 2, 0x0),
@@ -242,12 +230,12 @@ static const Gfx bbh_seg7_dl_0701B380[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, spooky_09008800),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&bbh_seg7_lights_0701A938.l, 1),
gsSPLight(&bbh_seg7_lights_0701A938.a, 2),
gsSPLightColor(LIGHT_1, 0x969696ff),
gsSPLightColor(LIGHT_2, 0x3c3c3cff),
gsSPVertex(bbh_seg7_vertex_0701A9C8, 4, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0),
gsSPLight(&bbh_seg7_lights_0701A950.l, 1),
gsSPLight(&bbh_seg7_lights_0701A950.a, 2),
gsSPLightColor(LIGHT_1, 0xffffffff),
gsSPLightColor(LIGHT_2, 0x666666ff),
gsSPVertex(bbh_seg7_vertex_0701AA08, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0),

80
levels/bbh/areas/1/35/model.inc.c
View File

@@ -1,44 +1,16 @@
// 0x0701B7A8 - 0x0701B7C0
static const Lights1 bbh_seg7_lights_0701B7A8 = gdSPDefLights1(
0x24, 0x11, 0x0b,
0x5a, 0x2c, 0x1d, 0x28, 0x28, 0x28
);
// 0x0701B7C0 - 0x0701B7D8
static const Lights1 bbh_seg7_lights_0701B7C0 = gdSPDefLights1(
0x20, 0x20, 0x20,
0x50, 0x50, 0x50, 0x28, 0x28, 0x28
);
// 0x0701B7D8 - 0x0701B7F0
static const Lights1 bbh_seg7_lights_0701B7D8 = gdSPDefLights1(
0x3c, 0x3c, 0x3c,
0x96, 0x96, 0x96, 0x28, 0x28, 0x28
);
// 0x0701B7F0 - 0x0701B808
static const Lights1 bbh_seg7_lights_0701B7F0 = gdSPDefLights1(
0x66, 0x66, 0x66,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x0701B808 - 0x0701B820
static const Lights1 bbh_seg7_lights_0701B808 = gdSPDefLights1(
0x24, 0x07, 0x00,
0x5a, 0x13, 0x00, 0x28, 0x28, 0x28
);
// 0x0701B820 - 0x0701B838
static const Lights1 bbh_seg7_lights_0701B820 = gdSPDefLights1(
0x44, 0x1c, 0x0c,
0xaa, 0x46, 0x1e, 0x28, 0x28, 0x28
);
// 0x0701B838 - 0x0701B850
static const Lights1 bbh_seg7_lights_0701B838 = gdSPDefLights1(
0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x28, 0x28, 0x28
);
// 0x0701B850 - 0x0701B940
static const Vtx bbh_seg7_vertex_0701B850[] = {
@@ -736,8 +708,8 @@ static const Gfx bbh_seg7_dl_0701D9C0[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, spooky_09004800),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&bbh_seg7_lights_0701B7A8.l, 1),
gsSPLight(&bbh_seg7_lights_0701B7A8.a, 2),
gsSPLightColor(LIGHT_1, 0x5a2c1dff),
gsSPLightColor(LIGHT_2, 0x24110bff),
gsSPVertex(bbh_seg7_vertex_0701B850, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0),
@@ -754,8 +726,8 @@ static const Gfx bbh_seg7_dl_0701DA50[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, spooky_0900A000),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&bbh_seg7_lights_0701B7C0.l, 1),
gsSPLight(&bbh_seg7_lights_0701B7C0.a, 2),
gsSPLightColor(LIGHT_1, 0x505050ff),
gsSPLightColor(LIGHT_2, 0x202020ff),
gsSPVertex(bbh_seg7_vertex_0701B9B0, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 4, 6, 7, 0x0, 4, 8, 9, 0x0),
@@ -775,15 +747,15 @@ static const Gfx bbh_seg7_dl_0701DB20[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, spooky_09008800),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&bbh_seg7_lights_0701B7D8.l, 1),
gsSPLight(&bbh_seg7_lights_0701B7D8.a, 2),
gsSPLightColor(LIGHT_1, 0x969696ff),
gsSPLightColor(LIGHT_2, 0x3c3c3cff),
gsSPVertex(bbh_seg7_vertex_0701BAF0, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 4, 6, 5, 0x0, 7, 8, 9, 0x0),
gsSP2Triangles( 7, 9, 10, 0x0, 11, 12, 13, 0x0),
gsSP2Triangles(11, 13, 14, 0x0, 0, 15, 1, 0x0),
gsSPLight(&bbh_seg7_lights_0701B7F0.l, 1),
gsSPLight(&bbh_seg7_lights_0701B7F0.a, 2),
gsSPLightColor(LIGHT_1, 0xffffffff),
gsSPLightColor(LIGHT_2, 0x666666ff),
gsSPVertex(bbh_seg7_vertex_0701BBF0, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0),
@@ -797,15 +769,15 @@ static const Gfx bbh_seg7_dl_0701DBF0[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, spooky_09003800),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&bbh_seg7_lights_0701B7A8.l, 1),
gsSPLight(&bbh_seg7_lights_0701B7A8.a, 2),
gsSPLightColor(LIGHT_1, 0x5a2c1dff),
gsSPLightColor(LIGHT_2, 0x24110bff),
gsSPVertex(bbh_seg7_vertex_0701BCF0, 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),
gsSP2Triangles(12, 14, 13, 0x0, 0, 15, 1, 0x0),
gsSPLight(&bbh_seg7_lights_0701B808.l, 1),
gsSPLight(&bbh_seg7_lights_0701B808.a, 2),
gsSPLightColor(LIGHT_1, 0x5a1300ff),
gsSPLightColor(LIGHT_2, 0x240700ff),
gsSPVertex(bbh_seg7_vertex_0701BDF0, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 4, 6, 5, 0x0, 7, 8, 9, 0x0),
@@ -851,8 +823,8 @@ static const Gfx bbh_seg7_dl_0701DBF0[] = {
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0),
gsSP2Triangles(10, 11, 12, 0x0, 10, 12, 13, 0x0),
gsSPLight(&bbh_seg7_lights_0701B7F0.l, 1),
gsSPLight(&bbh_seg7_lights_0701B7F0.a, 2),
gsSPLightColor(LIGHT_1, 0xffffffff),
gsSPLightColor(LIGHT_2, 0x666666ff),
gsSPVertex(bbh_seg7_vertex_0701C730, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0),
@@ -862,8 +834,8 @@ static const Gfx bbh_seg7_dl_0701DBF0[] = {
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 7, 8, 0x0, 6, 8, 9, 0x0),
gsSP1Triangle( 0, 2, 10, 0x0),
gsSPLight(&bbh_seg7_lights_0701B820.l, 1),
gsSPLight(&bbh_seg7_lights_0701B820.a, 2),
gsSPLightColor(LIGHT_1, 0xaa461eff),
gsSPLightColor(LIGHT_2, 0x441c0cff),
gsSPVertex(bbh_seg7_vertex_0701C8D0, 12, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0),
@@ -876,8 +848,8 @@ static const Gfx bbh_seg7_dl_0701DFA0[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, spooky_09005000),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&bbh_seg7_lights_0701B7C0.l, 1),
gsSPLight(&bbh_seg7_lights_0701B7C0.a, 2),
gsSPLightColor(LIGHT_1, 0x505050ff),
gsSPLightColor(LIGHT_2, 0x202020ff),
gsSPVertex(bbh_seg7_vertex_0701C990, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0),
@@ -920,8 +892,8 @@ static const Gfx bbh_seg7_dl_0701E188[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bbh_seg7_texture_07000000),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 64 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&bbh_seg7_lights_0701B7F0.l, 1),
gsSPLight(&bbh_seg7_lights_0701B7F0.a, 2),
gsSPLightColor(LIGHT_1, 0xffffffff),
gsSPLightColor(LIGHT_2, 0x666666ff),
gsSPVertex(bbh_seg7_vertex_0701D030, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 3, 6, 4, 0x0, 7, 3, 8, 0x0),
@@ -936,13 +908,13 @@ static const Gfx bbh_seg7_dl_0701E210[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, spooky_09007000),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 64 * 32 - 1, CALC_DXT(64, G_IM_SIZ_16b_BYTES)),
gsSPLight(&bbh_seg7_lights_0701B7D8.l, 1),
gsSPLight(&bbh_seg7_lights_0701B7D8.a, 2),
gsSPLightColor(LIGHT_1, 0x969696ff),
gsSPLightColor(LIGHT_2, 0x3c3c3cff),
gsSPVertex(bbh_seg7_vertex_0701D130, 8, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0),
gsSPLight(&bbh_seg7_lights_0701B7F0.l, 1),
gsSPLight(&bbh_seg7_lights_0701B7F0.a, 2),
gsSPLightColor(LIGHT_1, 0xffffffff),
gsSPLightColor(LIGHT_2, 0x666666ff),
gsSPVertex(bbh_seg7_vertex_0701D1B0, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 6, 7, 8, 0x0, 3, 9, 4, 0x0),
@@ -996,8 +968,8 @@ static const Gfx bbh_seg7_dl_0701E430[] = {
// 0x0701E4B0 - 0x0701E4E0
static const Gfx bbh_seg7_dl_0701E4B0[] = {
gsSPLight(&bbh_seg7_lights_0701B838.l, 1),
gsSPLight(&bbh_seg7_lights_0701B838.a, 2),
gsSPLightColor(LIGHT_1, 0xff),
gsSPLightColor(LIGHT_2, 0xff),
gsSPVertex(bbh_seg7_vertex_0701D980, 4, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0),
gsSPEndDisplayList(),

8
levels/bbh/areas/1/36/model.inc.c
View File

@@ -1,8 +1,4 @@
// 0x0701E5D8 - 0x0701E5F0
static const Lights1 bbh_seg7_lights_0701E5D8 = gdSPDefLights1(
0x7f, 0x7f, 0x7f,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x0701E5F0 - 0x0701E6E0
static const Vtx bbh_seg7_vertex_0701E5F0[] = {
@@ -55,8 +51,8 @@ static const Gfx bbh_seg7_dl_0701E810[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, bbh_seg7_texture_07001800),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&bbh_seg7_lights_0701E5D8.l, 1),
gsSPLight(&bbh_seg7_lights_0701E5D8.a, 2),
gsSPLightColor(LIGHT_1, 0xffffffff),
gsSPLightColor(LIGHT_2, 0x7f7f7fff),
gsSPVertex(bbh_seg7_vertex_0701E5F0, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0),

16
levels/bbh/areas/1/37/model.inc.c
View File

@@ -1,14 +1,6 @@
// 0x0701E948 - 0x0701E960
static const Lights1 bbh_seg7_lights_0701E948 = gdSPDefLights1(
0x24, 0x11, 0x0b,
0x5a, 0x2c, 0x1d, 0x28, 0x28, 0x28
);
// 0x0701E960 - 0x0701E978
static const Lights1 bbh_seg7_lights_0701E960 = gdSPDefLights1(
0x3c, 0x3c, 0x3c,
0x96, 0x96, 0x96, 0x28, 0x28, 0x28
);
// 0x0701E978 - 0x0701E9F8
static const Vtx bbh_seg7_vertex_0701E978[] = {
@@ -73,13 +65,13 @@ static const Gfx bbh_seg7_dl_0701EC18[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, spooky_09006000),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&bbh_seg7_lights_0701E948.l, 1),
gsSPLight(&bbh_seg7_lights_0701E948.a, 2),
gsSPLightColor(LIGHT_1, 0x5a2c1dff),
gsSPLightColor(LIGHT_2, 0x24110bff),
gsSPVertex(bbh_seg7_vertex_0701E978, 8, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0),
gsSPLight(&bbh_seg7_lights_0701E960.l, 1),
gsSPLight(&bbh_seg7_lights_0701E960.a, 2),
gsSPLightColor(LIGHT_1, 0x969696ff),
gsSPLightColor(LIGHT_2, 0x3c3c3cff),
gsSPVertex(bbh_seg7_vertex_0701E9F8, 15, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0),

24
levels/bbh/areas/1/7/model.inc.c
View File

@@ -1,20 +1,8 @@
// 0x07008F18 - 0x07008F30
static const Lights1 bbh_seg7_lights_07008F18 = gdSPDefLights1(
0x20, 0x20, 0x20,
0x50, 0x50, 0x50, 0x28, 0x28, 0x28
);
// 0x07008F30 - 0x07008F48
static const Lights1 bbh_seg7_lights_07008F30 = gdSPDefLights1(
0x3c, 0x3c, 0x3c,
0x96, 0x96, 0x96, 0x28, 0x28, 0x28
);
// 0x07008F48 - 0x07008F60
static const Lights1 bbh_seg7_lights_07008F48 = gdSPDefLights1(
0x66, 0x66, 0x66,
0xff, 0xff, 0xff, 0x28, 0x28, 0x28
);
// 0x07008F60 - 0x07008FE0
static const Vtx bbh_seg7_vertex_07008F60[] = {
@@ -531,21 +519,21 @@ static const Gfx bbh_seg7_dl_0700A800[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, spooky_09008800),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&bbh_seg7_lights_07008F18.l, 1),
gsSPLight(&bbh_seg7_lights_07008F18.a, 2),
gsSPLightColor(LIGHT_1, 0x505050ff),
gsSPLightColor(LIGHT_2, 0x202020ff),
gsSPVertex(bbh_seg7_vertex_07008F60, 8, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0),
gsSPLight(&bbh_seg7_lights_07008F30.l, 1),
gsSPLight(&bbh_seg7_lights_07008F30.a, 2),
gsSPLightColor(LIGHT_1, 0x969696ff),
gsSPLightColor(LIGHT_2, 0x3c3c3cff),
gsSPVertex(bbh_seg7_vertex_07008FE0, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 4, 0x0),
gsSP2Triangles( 9, 10, 8, 0x0, 10, 0, 8, 0x0),
gsSP2Triangles( 0, 2, 11, 0x0, 12, 5, 13, 0x0),
gsSP2Triangles( 7, 14, 8, 0x0, 12, 13, 15, 0x0),
gsSPLight(&bbh_seg7_lights_07008F48.l, 1),
gsSPLight(&bbh_seg7_lights_07008F48.a, 2),
gsSPLightColor(LIGHT_1, 0xffffffff),
gsSPLightColor(LIGHT_2, 0x666666ff),
gsSPVertex(bbh_seg7_vertex_070090E0, 16, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0),
gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0),

8
levels/bbh/areas/1/8/model.inc.c
View File

@@ -1,8 +1,4 @@
// 0x0700B0D8 - 0x0700B0F0
static const Lights1 bbh_seg7_lights_0700B0D8 = gdSPDefLights1(
0x3f, 0x51, 0x66,
0x9e, 0xcc, 0xff, 0x28, 0x28, 0x28
);
// 0x0700B0F0 - 0x0700B170
static const Vtx bbh_seg7_vertex_0700B0F0[] = {
@@ -21,8 +17,8 @@ static const Gfx bbh_seg7_dl_0700B170[] = {
gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, spooky_09006000),
gsDPLoadSync(),
gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)),
gsSPLight(&bbh_seg7_lights_0700B0D8.l, 1),
gsSPLight(&bbh_seg7_lights_0700B0D8.a, 2),
gsSPLightColor(LIGHT_1, 0x9eccffff),
gsSPLightColor(LIGHT_2, 0x3f5166ff),
gsSPVertex(bbh_seg7_vertex_0700B0F0, 8, 0),
gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0),
gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0),

Some files were not shown because too many files have changed in this diff Show More