diff options
| -rwxr-xr-x | include/game.h | 8 | ||||
| -rw-r--r-- | kamek_pal.x | 3 | ||||
| -rwxr-xr-x | src/meteor.cpp | 6 | ||||
| -rw-r--r-- | src/shyguy.cpp | 11 |
4 files changed, 16 insertions, 12 deletions
diff --git a/include/game.h b/include/game.h index 6412f5e..d4d345d 100755 --- a/include/game.h +++ b/include/game.h @@ -1524,10 +1524,10 @@ class StandOnTopCollider : public BasicCollider { float rightSize, float leftSize,
s16 rotation, u8 unk_45, Vec2 *scale = 0);
- void init(dStageActor_c *owner,
- Vec2 *fields4C_50, float topYOffset,
- float rightSize, float leftSize,
- s16 rotation, u8 unk_45, Vec2 *scale = 0);
+ // void init(dStageActor_c *owner,
+ // Vec2 *fields4C_50, float topYOffset,
+ // float rightSize, float leftSize,
+ // s16 rotation, u8 unk_45, Vec2 *scale = 0);
void setLeftAndRight(float left, float right);
void setLeftAndRightScaled(float left, float right, float scaleFactor);
diff --git a/kamek_pal.x b/kamek_pal.x index 6225b5c..8d5499d 100644 --- a/kamek_pal.x +++ b/kamek_pal.x @@ -33,7 +33,8 @@ SECTIONS { __dt__13BasicColliderFv = 0x800DAEF0; - addToList = 0x800DAF70; + addToList__13BasicColliderFv = 0x800DAF70; + __ct__21RideableActorColliderFv = 0x800DB540; init__21RideableActorColliderFP13dStageActor_cP7Point2dP7Point2d = 0x800DB590; init__21RideableActorColliderFP13dStageActor_cffff = 0x800DB620; diff --git a/src/meteor.cpp b/src/meteor.cpp index 85b1358..c7d9220 100755 --- a/src/meteor.cpp +++ b/src/meteor.cpp @@ -55,15 +55,15 @@ int dMeteor::onCreate() { // Other settings this->spinDir = this->settings & 0x1; - this->spinSpeed = ((this->settings >> 16) & 0xFF) * 4; + this->spinSpeed = ((this->settings >> 16) & 0xFF) * 80; // Setup Physics - MakeItRound.baseSetup(this, &spinningPhysicsCallback, 0, 0, 1, 1); + MakeItRound.baseSetup(this, &spinningPhysicsCallback, 0, 0, 1, 0); MakeItRound.x = 0.0; MakeItRound.y = 0.0; - MakeItRound.diameter = 160.0 * sca; + MakeItRound.diameter = 16.0 * sca; MakeItRound.isRound = 1; MakeItRound.update(); diff --git a/src/shyguy.cpp b/src/shyguy.cpp index 9955404..0104f96 100644 --- a/src/shyguy.cpp +++ b/src/shyguy.cpp @@ -72,7 +72,7 @@ class daShyGuy : public dEn_c { dStageActor_c *spikeA; dStageActor_c *spikeB; - RideableActorCollider giantRider; + StandOnTopCollider giantRider; ActivePhysics Chuckles; ActivePhysics Knuckles; ActivePhysics balloonPhysics; @@ -143,7 +143,7 @@ daShyGuy *daShyGuy::build() { extern "C" int SomeStrangeModification(dStageActor_c* actor); extern "C" void DoStuffAndMarkDead(dStageActor_c *actor, Vec vector, float unk); extern "C" int SmoothRotation(short* rot, u16 amt, int unk2); - extern "C" void addToList(RideableActorCollider *self); + // extern "C" void addToList(StandOnTopCollider *self); CREATE_STATE(daShyGuy, Walk); @@ -556,8 +556,11 @@ int daShyGuy::onCreate() { HitMeBaby.xDistToEdge = 28.0; HitMeBaby.yDistToEdge = 24.0; - giantRider.init(this, -19.5f, 18.0f, 19.5f, 18.0f); - addToList(&giantRider); + // giantRider.init(this, -19.5f, 18.0f, 19.5f, 18.0f); + + giantRider.init(this, 0.0f, 0.0f, 24.0f, 0.0f, 28.0f, 0, 0); + // addToList(&giantRider); + giantRider.addToList(); giantRider.update(); } |