diff options
| author | Colin Noga <Tempus@chronometry.ca> | 2012-06-14 18:39:21 -0500 |
|---|---|---|
| committer | Colin Noga <Tempus@chronometry.ca> | 2012-06-14 18:39:21 -0500 |
| commit | fd286ae035b52d3d78e234d9f91b6610ae30def6 (patch) | |
| tree | de8aaa44473de7207857267a292064df7ee55512 /src/bossCaptainBowser.cpp | |
| parent | 5051883b9911a11baca51f6157ccf11028dca9f5 (diff) | |
| download | kamek-fd286ae035b52d3d78e234d9f91b6610ae30def6.tar.gz kamek-fd286ae035b52d3d78e234d9f91b6610ae30def6.zip | |
Added a summer sun build chain, updated Bowser boss
Diffstat (limited to '')
| -rw-r--r-- | src/bossCaptainBowser.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/bossCaptainBowser.cpp b/src/bossCaptainBowser.cpp index c894ecd..a8602c2 100644 --- a/src/bossCaptainBowser.cpp +++ b/src/bossCaptainBowser.cpp @@ -7,7 +7,7 @@ extern "C" void *BowserExitDemoState(void *, unsigned int); extern "C" void *ForceMarioExitDemoMode(void *, unsigned int); -extern "C" void *ShakeScreen(void *, unsigned int, unsigned int, unsigned int); +extern "C" void *ShakeScreen(void *, unsigned int, unsigned int, unsigned int, unsigned int); extern "C" void *StageScreen; @@ -419,16 +419,15 @@ int daCaptainBowser::onDraw() { this->chrAnimation.setCurrentFrame(0.0); } // Screen Rumble - // if ((this->timer > 180) && (this->timer < 420)) { - if (this->timer == 180) { + if ((this->timer > 180) && (this->timer < 420)) { + // if (this->timer == 180) { // Do Rumbly - 807CD3AC pos.x = ClassWithCameraInfo::instance->screenCentreX; pos.y = ClassWithCameraInfo::instance->screenCentreY; - ShakeScreen(StageScreen, 5, 1, 0); - OSReport("Shit Happens"); - PlaySound(this, SE_BOSS_KOOPA_RUMBLE1); // 0x5D4 + ShakeScreen(StageScreen, 2, 1, 0, 0); + PlaySoundAsync(this, SE_BOSS_KOOPA_RUMBLE1); // 0x5D4 // Stage80::instance->ShakeScreen(self, 5, 1, 0); } @@ -451,7 +450,8 @@ int daCaptainBowser::onDraw() { } if (this->chrAnimation.getCurrentFrame() > 53.0) { - effect.spawn("Wm_ko_shout", 0, &(Vec){pos.x-186.0, pos.y+144.0, pos.z}, &(S16Vec){0,0,0x7000}, &(Vec){1.0, 1.0, 1.0}); + ShakeScreen(StageScreen, 2, 2, 0, 0); + effect.spawn("Wm_ko_shout", 0, &(Vec){pos.x-182.0, pos.y+132.0, pos.z}, &(S16Vec){0,0,0x7000}, &(Vec){1.0, 1.0, 1.0}); } } |