diff options
| author | Colin Noga <Tempus@chronometry.ca> | 2012-12-13 23:46:52 -0600 |
|---|---|---|
| committer | Colin Noga <Tempus@chronometry.ca> | 2012-12-13 23:46:52 -0600 |
| commit | aba4844daf75a1301586a40f2842c5e981d8b402 (patch) | |
| tree | 344ac9e3f277a3c072872947bdf1d94c46fdfd29 /src | |
| parent | b11c616d45fe24fbcc1bc5fbdbf8a5ffcca2ce8c (diff) | |
| download | kamek-aba4844daf75a1301586a40f2842c5e981d8b402.tar.gz kamek-aba4844daf75a1301586a40f2842c5e981d8b402.zip | |
No bubbles added to special event sprite.
Diffstat (limited to 'src')
| -rw-r--r-- | src/bossPlayerClown.cpp | 2 | ||||
| -rw-r--r-- | src/levelspecial.cpp | 18 |
2 files changed, 17 insertions, 3 deletions
diff --git a/src/bossPlayerClown.cpp b/src/bossPlayerClown.cpp index c760214..c213872 100644 --- a/src/bossPlayerClown.cpp +++ b/src/bossPlayerClown.cpp @@ -21,8 +21,6 @@ extern "C" int PClownCarDraw(dEn_c *clown); extern "C" void PClownCarMove(dEn_c *clown); - - const char* PCCarcNameList [] = { "koopaJr_clown_ply", NULL diff --git a/src/levelspecial.cpp b/src/levelspecial.cpp index 25e2130..35dc05a 100644 --- a/src/levelspecial.cpp +++ b/src/levelspecial.cpp @@ -47,7 +47,7 @@ extern u32 GameTimer; float GlobalSizeFloatModifications [] = {1, 0.25, 0.5, 0.75, 1.25, 1.5, 1.75, 2, 2.5, 3, 4, 5, 6, 7, 8, 10 }; float GlobalRiderFloatModifications [] = {1, 0.6, 0.7, 0.9, 1, 1, 1, 1.1, 1.25, 1.5, 2, 2.5, 3, 3.5, 4, 5}; - +bool NoMichaelBuble = false; void LevelSpecial_Update(LevelSpecial *self); bool ResetAfterLevel(); @@ -58,6 +58,14 @@ bool ResetAfterLevel(); fBase_c *FindActorByID(u32 id); +extern "C" void dAcPy_vf294(void *Mario, dStateBase_c *state, u32 unk); +void MarioStateChanger(void *Mario, dStateBase_c *state, u32 unk) { + OSReport("State: %p, %s", state, state->getName()); + + if ((strcmp(state->getName(), "dAcPy_c::StateID_Balloon") == 0) && (NoMichaelBuble)) { return; } + + dAcPy_vf294(Mario, state, unk); +} bool ResetAfterLevel(void) { // TimeStopFlag = 0; @@ -179,6 +187,10 @@ void LevelSpecial_Update(LevelSpecial *self) { ZOrderOn = 1; break; + case 8: + NoMichaelBuble = true; + break; + default: break; } @@ -230,6 +242,10 @@ void LevelSpecial_Update(LevelSpecial *self) { ZOrderOn = 0; break; + case 8: + NoMichaelBuble = false; + break; + default: break; } |