diff options
| author | Colin Noga <Tempus@chronometry.ca> | 2013-05-30 17:04:54 -0500 |
|---|---|---|
| committer | Colin Noga <Tempus@chronometry.ca> | 2013-05-30 17:04:54 -0500 |
| commit | 93f359bfe69f70e164b3b0dade0a57bfd9069717 (patch) | |
| tree | 629b7c4443b3c09c7f2d87b3f0467e39b7d4bf11 | |
| parent | 8d41849c5ee92913cc49f14c4f82f6e39b5467db (diff) | |
| download | kamek-93f359bfe69f70e164b3b0dade0a57bfd9069717.tar.gz kamek-93f359bfe69f70e164b3b0dade0a57bfd9069717.zip | |
shy guy fix, and minor hard mode tweak
| -rw-r--r-- | src/hardMode.s | 2 | ||||
| -rw-r--r-- | src/shyguy.cpp | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/hardMode.s b/src/hardMode.s index 95b6f80..aa51357 100644 --- a/src/hardMode.s +++ b/src/hardMode.s @@ -24,7 +24,7 @@ TimerAdjustments: cmpwi r10, 0 beq NoTimerAdjust - li r10, 300 + li r10, 250 slwi r10, r10, 0xC cmp r3, r10 blt NoTimerAdjust diff --git a/src/shyguy.cpp b/src/shyguy.cpp index 7e3889d..32928c0 100644 --- a/src/shyguy.cpp +++ b/src/shyguy.cpp @@ -491,7 +491,7 @@ int daShyGuy::onCreate() { this->type = this->settings >> 28 & 0xF; int baln = this->settings >> 24 & 0xF; - // this->distance = this->settings >> 12 & 0xF; + this->distance = this->settings >> 12 & 0xF; stillFalling = 0; @@ -1375,6 +1375,9 @@ bool daShyGuy::willWalkOntoSuitableGround() { SpawnEffect("Wm_en_explosion_ln", 0, &(Vec){this->pos.x, this->pos.y - 32.0, 0}, &(S16Vec){0,0,0}, &(Vec){1.0, 1.0, 1.0}); PlaySound(this, SE_PLY_BALLOON_BRAKE); + if (this->type != 8) + this-distance == 0; + type = 0; } void daShyGuy::executeState_BalloonDrop() { |