diff options
| author | robojumper <robojumper@gmail.com> | 2025-09-13 10:05:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-09-13 10:05:32 +0200 |
| commit | 800c2850ece5962dc7d3d767d5564e6d5ead5161 (patch) | |
| tree | 58eacce24d46720fa0a2eda335142f11875d2253 /src/d/d_sc_title.cpp | |
| parent | 342f867df2825eb5d76bea7e2a85cba1cdd60c80 (diff) | |
| parent | 14585831b28578475462b7c27e7583ee25de7387 (diff) | |
Merge pull request #234 from robojumper/d_lyt_game_over
d_lyt_game_over almost OK
Diffstat (limited to 'src/d/d_sc_title.cpp')
| -rw-r--r-- | src/d/d_sc_title.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/d/d_sc_title.cpp b/src/d/d_sc_title.cpp index 91cede66..3206a5a7 100644 --- a/src/d/d_sc_title.cpp +++ b/src/d/d_sc_title.cpp @@ -2,6 +2,7 @@ #include "common.h" #include "d/d_dvd_unk.h" +#include "d/d_fader.h" #include "d/d_heap.h" #include "d/d_message.h" #include "d/d_pad.h" @@ -24,11 +25,10 @@ SPECIAL_BASE_PROFILE(TITLE, dScTitle_c, fProfile::TITLE, 0, 0); dScTitle_c *dScTitle_c::sInstance; bool dScTitle_c::sPreventEmptyFilesTitle; -extern "C" { -u8 lbl_80575785; -u8 lbl_80575786; -u8 lbl_80575787; -} + +u8 dScTitle_c::lbl_80575785; +u8 dScTitle_c::lbl_80575786; +u8 dScTitle_c::lbl_80575787; static u16 sModulesToLoad[] = { // ??? not sure what these correspond to @@ -159,11 +159,11 @@ void dScTitle_c::loadTitleScreen(u32 params) { params = 2; } TITLE_SCREEN_CHANGE = params; - setRootActor(fProfile::TITLE, params, 0, 0); + setRootActor(fProfile::TITLE, params, dFader_c::FADER_BLACK, dFader_c::FADER_BLACK); if (checkAllSaveFilesEmpty() == true) { - actuallyTriggerEntrance("F000", 0, 26, 55, 0, 0, 0, 15, -1); + actuallyTriggerEntrance("F000", 0, 26, 55, 0, 0, dFader_c::FADER_BLACK, 15, -1); } else { - actuallyTriggerEntrance("F000", 0, 28, 48, 0, 0, 0, 15, -1); + actuallyTriggerEntrance("F000", 0, 28, 48, 0, 0, dFader_c::FADER_BLACK, 15, -1); } fn_80362150(ENEMY_SOUND_MGR, 30); } |