diff options
| author | Treeki <treeki@gmail.com> | 2013-07-04 01:15:15 +0200 |
|---|---|---|
| committer | Treeki <treeki@gmail.com> | 2013-07-04 01:15:15 +0200 |
| commit | d55debf80b417793ce924ec977ed3a16413fd5d6 (patch) | |
| tree | edc9e60c3b24cc90eeaaa416e6225401b3815afe | |
| parent | 75002c45dea66ccc8291a87a1f670b72d8c7b16d (diff) | |
| download | kamek-d55debf80b417793ce924ec977ed3a16413fd5d6.tar.gz kamek-d55debf80b417793ce924ec977ed3a16413fd5d6.zip | |
ending dead players fix
Diffstat (limited to '')
| -rw-r--r-- | src/bossCaptainBowser.cpp | 4 | ||||
| -rw-r--r-- | src/prolog.S | 2 | ||||
| -rw-r--r-- | src/randomcrap.S | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/src/bossCaptainBowser.cpp b/src/bossCaptainBowser.cpp index 9e163b1..6915ccf 100644 --- a/src/bossCaptainBowser.cpp +++ b/src/bossCaptainBowser.cpp @@ -1020,6 +1020,10 @@ void daCaptainBowser::executeState_PanToExit() { DontShowPreGame = true; ExitStage(RESTART_CRSIN, 0, BEAT_LEVEL, MARIO_WIPE); exitedFlag = true; + + for (int i = 0; i < 4; i++) + if (Player_Lives[i] == 0) + Player_Lives[i] = 5; } } } diff --git a/src/prolog.S b/src/prolog.S index 83abdc6..8608300 100644 --- a/src/prolog.S +++ b/src/prolog.S @@ -61,7 +61,7 @@ startLoop: .data PMsg: - .string "Newer Super Mario Bros. Wii - Hacks by Treeki and Tempus 2009-2013\nNewer v1.0.0\n.ctors: %p - %p\n" + .string "Newer Super Mario Bros. Wii - Hacks by Treeki and Tempus 2009-2013\nNewer v1.0.2\n.ctors: %p - %p\n" PMsg2: .string "%d inits called\n" diff --git a/src/randomcrap.S b/src/randomcrap.S index 1e09766..4b8d830 100644 --- a/src/randomcrap.S +++ b/src/randomcrap.S @@ -595,7 +595,7 @@ ReplaceExceptionOccurred: #.long CRAPPYALLOC .data NewExceptionOccurred: -.string "Whoops! Newer 1.0.0 has crashed.\nPlease take a screenshot of the info below\nand send it to newer@newerteam.com.\nYou can scroll through this report using the D-Pad.\n" +.string "Whoops! Newer 1.0.2 has crashed.\nPlease take a screenshot of the info below\nand send it to newer@newerteam.com.\nYou can scroll through this report using the D-Pad.\n" UniLogStr: .string "[ULog] returning %8x to: %x > %x > %x > %x > %x > %x\n" #WillAlloc: .string "[AH] Will allocate %x bytes aligned by %x\n" #Alloced: .string "[AH] Allocated %p\n" |