diff options
| author | Treeki <treeki@gmail.com> | 2013-04-30 17:34:09 +0200 |
|---|---|---|
| committer | Treeki <treeki@gmail.com> | 2013-04-30 17:34:51 +0200 |
| commit | 46f7334790a5cef5fb167698e2d11c8bb680b6e9 (patch) | |
| tree | e2c7410ad9379ec9f6abc9214dc9172f1539157b /src/sceneGlue.cpp | |
| parent | 7f8d7800a9e6636c72604e80e3b6258ca1f0830f (diff) | |
| download | kamek-46f7334790a5cef5fb167698e2d11c8bb680b6e9.tar.gz kamek-46f7334790a5cef5fb167698e2d11c8bb680b6e9.zip | |
changes to palace dude and message box, and removal of cutscenes
Diffstat (limited to '')
| -rw-r--r-- | src/sceneGlue.cpp | 33 |
1 files changed, 24 insertions, 9 deletions
diff --git a/src/sceneGlue.cpp b/src/sceneGlue.cpp index 3e2167a..fef5ad9 100644 --- a/src/sceneGlue.cpp +++ b/src/sceneGlue.cpp @@ -5,18 +5,33 @@ extern char CurrentLevel, CurrentWorld; extern u8 MaybeFinishingLevel[2]; extern "C" void ExitStageReal(int scene, int sceneParams, int powerupStoreType, int wipe); + extern "C" void ExitStageWrapper(int scene, int sceneParams, int powerupStoreType, int wipe) { - if (scene == WORLD_MAP && powerupStoreType == BEAT_LEVEL) { - if (CurrentWorld == 6 && CurrentLevel == STAGE_DOOMSHIP) { - if (MaybeFinishingLevel[0] == 6 && MaybeFinishingLevel[1] == STAGE_DOOMSHIP) { - // We're done with 7-38 - ExitStage(MOVIE, 0x10000000, powerupStoreType, wipe); - return; - } - } - } + // TO RE-ENABLE CUTSCENES, UNCOMMENT THIS + // if (scene == WORLD_MAP && powerupStoreType == BEAT_LEVEL) { + // if (CurrentWorld == 6 && CurrentLevel == STAGE_DOOMSHIP) { + // if (MaybeFinishingLevel[0] == 6 && MaybeFinishingLevel[1] == STAGE_DOOMSHIP) { + // // We're done with 7-38 + // ExitStage(MOVIE, 0x10000000, powerupStoreType, wipe); + // return; + // } + // } + // } ExitStageReal(scene, sceneParams, powerupStoreType, wipe); } +extern "C" void EnterOpeningLevel() { + DontShowPreGame = true; + RESTART_CRSIN_LevelStartStruct.purpose = 0; + RESTART_CRSIN_LevelStartStruct.world1 = 1; + RESTART_CRSIN_LevelStartStruct.world2 = 1; + RESTART_CRSIN_LevelStartStruct.level1 = 40; + RESTART_CRSIN_LevelStartStruct.level2 = 40; + RESTART_CRSIN_LevelStartStruct.areaMaybe = 0; + RESTART_CRSIN_LevelStartStruct.entrance = 0xFF; + RESTART_CRSIN_LevelStartStruct.unk4 = 0; // load replay + DoSceneChange(RESTART_CRSIN, 0, 0); +} + |