From 8ca700982dc70315bad46d0f3eb9f3f78485d09a Mon Sep 17 00:00:00 2001 From: blameitontherobot <63158504+blameitontherobot@users.noreply.github.com> Date: Tue, 11 Aug 2020 23:33:16 +0100 Subject: [PATCH] Custom Title Screen Logo still wip, just adds the words "render96" with a subtitle of "super mario 64" --- levels/intro/blue.rgba16.png | Bin 0 -> 114 bytes levels/intro/darkerblue.rgba16.png | Bin 0 -> 114 bytes levels/intro/grey.rgba16.png | Bin 0 -> 114 bytes levels/intro/header.h | 12 +- levels/intro/leveldata.c | 2541 +++++++++++++++++++++++++++- levels/intro/white.rgba16.png | Bin 0 -> 112 bytes src/game/segment7.h | 2 +- src/menu/intro_geo.c | 4 +- 8 files changed, 2538 insertions(+), 21 deletions(-) create mode 100644 levels/intro/blue.rgba16.png create mode 100644 levels/intro/darkerblue.rgba16.png create mode 100644 levels/intro/grey.rgba16.png create mode 100644 levels/intro/white.rgba16.png diff --git a/levels/intro/blue.rgba16.png b/levels/intro/blue.rgba16.png new file mode 100644 index 0000000000000000000000000000000000000000..d4c3840e4a48cbdbb38f9ba65a330019702da72e GIT binary patch literal 114 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9EFZXnDkGR4^uD5&D; z;uvBfn4BW;`~Un#rUNdGaT~4$GD}Ff9ZoReahRF-;4&k_`o&BpC7RquK=llsu6{1- HoD!Mv&(j2C8T9boFyt I=akR{0GMeW=>Px# literal 0 HcmV?d00001 diff --git a/levels/intro/grey.rgba16.png b/levels/intro/grey.rgba16.png new file mode 100644 index 0000000000000000000000000000000000000000..fefd340b6d0e9e1f6c9678b5d8f63d4a163af1af GIT binary patch literal 114 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9EFZXnDkGR4^uD5&D; z;uvBfn4FW7^XI$+W5OZ_{fO5q7C;$fc8$B=!BMMmL@q##f=gQu&X%Q~lo FCIHjB8C?JX literal 0 HcmV?d00001 diff --git a/src/game/segment7.h b/src/game/segment7.h index 6692ac6b..14fc0390 100644 --- a/src/game/segment7.h +++ b/src/game/segment7.h @@ -24,7 +24,7 @@ extern const u8 eu_course_strings_de_table[]; #endif // from intro_segment7 -extern Gfx *intro_seg7_dl_0700B3A0; +extern Gfx *titletest_test_mesh; extern Gfx *intro_seg7_dl_0700C6A0; extern f32 intro_seg7_table_0700C790[]; extern f32 intro_seg7_table_0700C880[]; diff --git a/src/menu/intro_geo.c b/src/menu/intro_geo.c index 37c6752a..1d3be071 100644 --- a/src/menu/intro_geo.c +++ b/src/menu/intro_geo.c @@ -112,7 +112,7 @@ Gfx *geo_title_screen(s32 sp50, struct GraphNode *sp54, UNUSED void *context) { } guScale(scaleMat, scaleX, scaleY, scaleZ); 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); gSPEndDisplayList(displayListIter); gTitleZoomCounter++; @@ -142,7 +142,7 @@ Gfx *geo_fade_transition(s32 sp40, struct GraphNode *sp44, UNUSED void *context) if (0) { } } - gSPDisplayList(displayListIter++, &intro_seg7_dl_0700C6A0); + //gSPDisplayList(displayListIter++, &intro_seg7_dl_0700C6A0); gSPEndDisplayList(displayListIter); if (gTitleZoomCounter >= 0x13) { gTitleFadeCounter += 0x1a;