diff options
| author | Colin Noga <Tempus@chronometry.ca> | 2012-03-20 17:03:19 -0500 |
|---|---|---|
| committer | Colin Noga <Tempus@chronometry.ca> | 2012-03-20 17:03:19 -0500 |
| commit | a550f21ec661ddd8771a9c779f2b784209fee1f9 (patch) | |
| tree | b6afe90fa01765019f0aad4e8068970c2ec36ae8 /src/levelspecial.cpp | |
| parent | 58b4ab236f6e4b0b5c4cf8384a3a8be299c86623 (diff) | |
| download | kamek-a550f21ec661ddd8771a9c779f2b784209fee1f9.tar.gz kamek-a550f21ec661ddd8771a9c779f2b784209fee1f9.zip | |
Added challenge star, clown car junk, bowser improvements, some fixes here and there, and a roll your own model sprite for skawo.
Diffstat (limited to 'src/levelspecial.cpp')
| -rw-r--r-- | src/levelspecial.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/levelspecial.cpp b/src/levelspecial.cpp index b5447e9..f57e14a 100644 --- a/src/levelspecial.cpp +++ b/src/levelspecial.cpp @@ -26,8 +26,8 @@ struct EventTable_t { extern EventTable_t *EventTable; -// extern u16 TimeStopFlag; -// extern u32 TimerBranch; +extern u16 TimeStopFlag; +extern u32 TimerBranch; extern u32 AlwaysDrawFlag; extern u32 AlwaysDrawBranch; @@ -62,7 +62,7 @@ fBase_c *FindActorByID(u32 id); bool ResetAfterLevel(void) { // TimeStopFlag = 0; - // TimerBranch = 0x3403FFA4; + TimerBranch = 0x3403FFA4; MarioDescentRate = -4; MarioJumpMax = 3.628; MarioJumpArc = 2.5; @@ -120,9 +120,9 @@ void LevelSpecial_Update(LevelSpecial *self) { // TimeStopFlag = self->effect * 0x100; // break; - // case 2: // Stop Timer - // TimerBranch = 0x7C601B78; - // break; + case 2: // Stop Timer + TimerBranch = 0x7C601B78; + break; case 3: // Mario Gravity @@ -262,9 +262,9 @@ void LevelSpecial_Update(LevelSpecial *self) { // TimeStopFlag = 0; // break; - // case 2: // Stop Timer - // TimerBranch = 0x3403FFA4; - // break; + case 2: // Stop Timer + TimerBranch = 0x3403FFA4; + break; case 3: // Mario Gravity |