diff options
| author | Treeki <treeki@gmail.com> | 2013-02-13 06:04:52 +0100 |
|---|---|---|
| committer | Treeki <treeki@gmail.com> | 2013-02-13 06:04:52 +0100 |
| commit | a9d6e00e80065676a243c9a3033e47009488059d (patch) | |
| tree | b0eb86ac813174258a9963b68d50bab34ad00b13 /src/cutScene.cpp | |
| parent | 2686a59694b209fda5297a7bf8003c3210e9ed29 (diff) | |
| download | kamek-a9d6e00e80065676a243c9a3033e47009488059d.tar.gz kamek-a9d6e00e80065676a243c9a3033e47009488059d.zip | |
add W7 to W8 cutscene
Diffstat (limited to 'src/cutScene.cpp')
| -rw-r--r-- | src/cutScene.cpp | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/src/cutScene.cpp b/src/cutScene.cpp index c872dd7..6cb1e3b 100644 --- a/src/cutScene.cpp +++ b/src/cutScene.cpp @@ -94,13 +94,26 @@ int dScCutScene_c::onExecute() { // we're TOTALLY done! OSReport("playback complete\n"); int nsmbwMovieType = settings & 3; - switch (nsmbwMovieType) { + int newerMovieType = settings >> 28; + + switch (newerMovieType) { case 0: - SaveGame(0, false); - DoSceneChange(WORLD_MAP, 0x80000000, 0); + // OPENING + switch (nsmbwMovieType) { + case 0: + SaveGame(0, false); + DoSceneChange(WORLD_MAP, 0x80000000, 0); + break; + case 1: + StartTitleScreenStage(false, 0); + break; + } break; + case 1: - StartTitleScreenStage(false, 0); + // KAMEK (W7 => W8) + ActivateWipe(WIPE_MARIO); + DoSceneChange(WORLD_MAP, 0x40000000, 0); break; } } else { |