vrmiguel
/
sm64pc
mirror of https://github.com/sm64pc/sm64pc.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/Render96/Render96ex

This commit is contained in:
NoHomoBoi 2020-08-11 19:44:24 -05:00
parent b2025d9532 8ca700982d
commit 3f30bf7036
8 changed files with 2538 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
levels/intro/blue.rgba16.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 114 B

BIN
levels/intro/darkerblue.rgba16.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 114 B

BIN
levels/intro/grey.rgba16.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 114 B

12
levels/intro/header.h
View File

@ -10,7 +10,17 @@ extern const GeoLayout intro_geo_0003B8[];
extern const GeoLayout intro_geo_000414[]; extern const GeoLayout intro_geo_000414[];
// leveldata // leveldata
extern const Gfx intro_seg7_dl_0700B3A0[]; extern Vtx titletest_test_mesh_vtx_0[133];
extern Gfx titletest_test_mesh_tri_0[];
extern Vtx titletest_test_mesh_vtx_1[407];
extern Gfx titletest_test_mesh_tri_1[];
extern Vtx titletest_test_mesh_vtx_2[183];
extern Gfx titletest_test_mesh_tri_2[];
extern Vtx titletest_test_mesh_vtx_3[568];
extern Gfx titletest_test_mesh_tri_3[];
extern Gfx titletest_test_mesh[];
extern const Gfx intro_seg7_dl_0700C6A0[]; extern const Gfx intro_seg7_dl_0700C6A0[];
extern const f32 intro_seg7_table_0700C790[]; extern const f32 intro_seg7_table_0700C790[];
extern const f32 intro_seg7_table_0700C880[]; extern const f32 intro_seg7_table_0700C880[];

2541
levels/intro/leveldata.c
View File

File diff suppressed because it is too large Load Diff

BIN
levels/intro/white.rgba16.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 112 B

2
src/game/segment7.h
View File

@ -24,7 +24,7 @@ extern const u8 eu_course_strings_de_table[];
#endif #endif
// from intro_segment7 // from intro_segment7
extern Gfx *intro_seg7_dl_0700B3A0; extern Gfx *titletest_test_mesh;
extern Gfx *intro_seg7_dl_0700C6A0; extern Gfx *intro_seg7_dl_0700C6A0;
extern f32 intro_seg7_table_0700C790[]; extern f32 intro_seg7_table_0700C790[];
extern f32 intro_seg7_table_0700C880[]; extern f32 intro_seg7_table_0700C880[];

4
src/menu/intro_geo.c
View File

@ -112,7 +112,7 @@ Gfx *geo_title_screen(s32 sp50, struct GraphNode *sp54, UNUSED void *context) {
} }
guScale(scaleMat, scaleX, scaleY, scaleZ); guScale(scaleMat, scaleX, scaleY, scaleZ);
gSPMatrix(displayListIter++, scaleMat, G_MTX_MODELVIEW | G_MTX_MUL | G_MTX_PUSH); gSPMatrix(displayListIter++, scaleMat, G_MTX_MODELVIEW | G_MTX_MUL | G_MTX_PUSH);
gSPDisplayList(displayListIter++, &intro_seg7_dl_0700B3A0); gSPDisplayList(displayListIter++, &titletest_test_mesh);
gSPPopMatrix(displayListIter++, G_MTX_MODELVIEW); gSPPopMatrix(displayListIter++, G_MTX_MODELVIEW);
gSPEndDisplayList(displayListIter); gSPEndDisplayList(displayListIter);
gTitleZoomCounter++; gTitleZoomCounter++;
@ -142,7 +142,7 @@ Gfx *geo_fade_transition(s32 sp40, struct GraphNode *sp44, UNUSED void *context)
if (0) { if (0) {
} }
} }
gSPDisplayList(displayListIter++, &intro_seg7_dl_0700C6A0); //gSPDisplayList(displayListIter++, &intro_seg7_dl_0700C6A0);
gSPEndDisplayList(displayListIter); gSPEndDisplayList(displayListIter);
if (gTitleZoomCounter >= 0x13) { if (gTitleZoomCounter >= 0x13) {
gTitleFadeCounter += 0x1a; gTitleFadeCounter += 0x1a;