summaryrefslogtreecommitdiff
path: root/src/shyguy.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/shyguy.cpp')
-rw-r--r--src/shyguy.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/shyguy.cpp b/src/shyguy.cpp
index f65ed17..8f311de 100644
--- a/src/shyguy.cpp
+++ b/src/shyguy.cpp
@@ -1050,15 +1050,13 @@ void daShyGuy::updateModelMatrices() {
// Spike State
///////////////
void daShyGuy::beginState_Spike() {
- this->timer = 0;
+ this->timer = 80;
spikeTurn = 0;
}
void daShyGuy::executeState_Spike() {
if (this->timer == 0) { bindAnimChr_and_setUpdateRate("c18_OB_IDLE_R", 1, 0.0, 1.0); }
- this->timer = this->timer + 1;
-
if (this->timer < 120) {
// Always face Mario
u8 facing = dSprite_c__getXDirectionOfFurthestPlayerRelativeToVEC3(this, this->pos);
@@ -1162,6 +1160,9 @@ void daShyGuy::updateModelMatrices() {
this->timer = 0;
}
}
+
+ this->timer = this->timer + 1;
+
}
void daShyGuy::endState_Spike() {
}