summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreeki <treeki@gmail.com>2013-01-13 22:09:15 +0100
committerTreeki <treeki@gmail.com>2013-01-13 22:09:15 +0100
commit27e79e27f08806559be022b320755a0dbde1c8c7 (patch)
tree22e4ee690508449a7b818813cfea77c957b18a69
parent9a2d38b4a90ad6cba22a48b8b79e308fb3531b20 (diff)
downloadkamek-27e79e27f08806559be022b320755a0dbde1c8c7.tar.gz
kamek-27e79e27f08806559be022b320755a0dbde1c8c7.zip
I hereby declare that Tempus is a butt
Diffstat (limited to '')
-rw-r--r--levelspecial.yaml2
-rw-r--r--src/levelspecial.cpp7
2 files changed, 6 insertions, 3 deletions
diff --git a/levelspecial.yaml b/levelspecial.yaml
index a156960..58a6ced 100644
--- a/levelspecial.yaml
+++ b/levelspecial.yaml
@@ -17,7 +17,7 @@ hooks:
type: branch_insn
branch_type: b
src_addr_pal: 0x809259E0
- target_func: 'ResetAfterLevel(void)'
+ target_func: 'ResetAfterLevel(bool)'
- name: LevelSpecial_MemFix
type: patch
diff --git a/src/levelspecial.cpp b/src/levelspecial.cpp
index 35dc05a..d302cdd 100644
--- a/src/levelspecial.cpp
+++ b/src/levelspecial.cpp
@@ -67,7 +67,7 @@ void MarioStateChanger(void *Mario, dStateBase_c *state, u32 unk) {
dAcPy_vf294(Mario, state, unk);
}
-bool ResetAfterLevel(void) {
+bool ResetAfterLevel(bool didItWork) {
// TimeStopFlag = 0;
MarioDescentRate = -4;
MarioJumpMax = 3.628;
@@ -82,7 +82,10 @@ bool ResetAfterLevel(void) {
AlwaysDrawBranch = 0x7C0802A6;
ZOrderOn = 0;
GlobalStarsCollected = 0;
- return true;
+ NoMichaelBuble = false;
+ for (int i = 0; i < 4; i++)
+ Player_Flags[i] &= ~4;
+ return didItWork;
}
bool LevelSpecial_Create(LevelSpecial *self) {