diff options
Diffstat (limited to '')
| -rwxr-xr-x | include/game.h | 6 | ||||
| -rw-r--r-- | kamek_pal.x | 2 | ||||
| -rw-r--r-- | src/bossBridgeBowser.cpp | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/include/game.h b/include/game.h index de7d46d..33fb184 100755 --- a/include/game.h +++ b/include/game.h @@ -2164,11 +2164,11 @@ public: };
-class daBossKoopaDemo_c : public dEn_c {
+class daBossKoopa_c : public dEn_c {
public:
- USING_STATES(daBossKoopaDemo_c);
- REF_NINTENDO_STATE(Struggle);
+ USING_STATES(daBossKoopa_c);
+ REF_NINTENDO_STATE(Fall);
};
class daNeedles : public dEn_c {
diff --git a/kamek_pal.x b/kamek_pal.x index 7196da3..95f5487 100644 --- a/kamek_pal.x +++ b/kamek_pal.x @@ -101,7 +101,7 @@ SECTIONS { StateID_DemoSt__12daKameckDemo = 0x80999C44; StateID_DemoWait__12daKameckDemo = 0x80999C84; - StateID_Struggle__17daBossKoopaDemo_c = 0x80B8BFAC; + StateID_Fall__13daBossKoopa_c = 0x80B8BFAC; StateID_DemoWait__9daNeedles = 0x8099CF8C; StateID_DemoAwake__9daNeedles = 0x8099CFD0; diff --git a/src/bossBridgeBowser.cpp b/src/bossBridgeBowser.cpp index d0f505a..c507e6c 100644 --- a/src/bossBridgeBowser.cpp +++ b/src/bossBridgeBowser.cpp @@ -42,9 +42,9 @@ void BowserDoomSpriteCollision(dEn_c *bowser, ActivePhysics *apThis, ActivePhysi BowserDamageEnd(bowser); // daBossKoopaDemo_c *BowserDemo = (daBossKoopaDemo_c*)FindActorByType(BOSS_KOOPA_DEMO, 0); - daBossKoopaDemo_c *BowserDemo = (daBossKoopaDemo_c*)bowser; - OSReport("Koopa Controller: %x", BowserDemo); - BowserDemo->doStateChange(&daBossKoopaDemo_c::StateID_Struggle); + daBossKoopa_c *BowserDemo = (daBossKoopa_c*)bowser; + OSReport("Koopa Controller: %x", BowserClass); + BowserClass->doStateChange(&daBossKoopa_c::StateID_Fall); dFlagMgr_c::instance->set(3, 0, true, false, false); HP = 2; |