Small fixes

8 files changed, 24 insertions, 19 deletions

diff --git a/src/boss.cpp b/src/boss.cpp
index e90dd2c..98d1669 100644
--- a/src/boss.cpp
+++ b/src/boss.cpp
@@ -3,6 +3,9 @@
 
 
 void DamagePlayer(dEn_c *actor, ActivePhysics *apThis, ActivePhysics *apOther) {
+
+	OSReport("Damage Player\n");
+
 	actor->dEn_c::playerCollision(apThis, apOther);
 	actor->_vf220(apOther->owner);
 
@@ -12,10 +15,13 @@ void DamagePlayer(dEn_c *actor, ActivePhysics *apThis, ActivePhysics *apOther) {
 	if(apOther->owner->which_player < 4) {
 		actor->counter_504[apOther->owner->which_player] = 0;
 	}	
+	OSReport("Player is good and hurt\n");
 }
 
 
 void SetupKameck(daBoss *actor, daKameckDemo *Kameck) {
+
+	OSReport("Stop BGM Music\n");
 	// Stop the BGM Music
 	StopBGMMusic();
 
@@ -24,39 +30,47 @@ void SetupKameck(daBoss *actor, daKameckDemo *Kameck) {
 	WLClass::instance->_4 = 4;
 	WLClass::instance->_8 = 0;
 
+	OSReport("Enter Demo Mode\n");
 	MakeMarioEnterDemoMode();
 
 	// Make sure to use the correct position
 	Vec pos = (Vec){actor->pos.x - 124.0, actor->pos.y + 104.0, 3564.0};
 	S16Vec rot = (S16Vec){0, 0, 0};
 
+	OSReport("Make Kameck\n");
 	// Create And use Kameck
-	Kameck = (daKameckDemo*)actor->createChild(KAMECK_FOR_CASTLE_DEMO, (dStageActor_c*)actor, 0, &pos, &rot, 0);
-	Kameck->doStateChange(&daKameckDemo::StateID_DemoWait);	
+	actor->Kameck = (daKameckDemo*)actor->createChild(KAMECK_FOR_CASTLE_DEMO, (dStageActor_c*)actor, 0, &pos, &rot, 0);
+	actor->Kameck->doStateChange(&daKameckDemo::StateID_DemoWait);	
+
+	OSReport("Kameck at %x\n", actor->Kameck);
 }
 
 
 void CleanupKameck(daBoss *actor, daKameckDemo *Kameck) {
 		// Clean up the flags and Kameck
+		OSReport("Cleaning up ALL the Kamecks!\n");
 		dStage32C_c::instance->freezeMarioBossFlag = 0;
 		WLClass::instance->_8 = 1;
 
+		OSReport("Fixing ALL the BGMs and Demo Modes!\n");
 		MakeMarioExitDemoMode();
 		StartBGMMusic();
 
-		Kameck->Delete(1);
+		actor->Kameck->Delete(1);
+		OSReport("KAMEX DELETZORS\n");
 }
 
 
 bool GrowBoss(daBoss *actor, daKameckDemo *Kameck, float initialScale, float endScale, float yPosModifier, int timer) {
-	if (timer == 130) { Kameck->doStateChange(&daKameckDemo::StateID_DemoSt); }
-	if (timer == 400) { Kameck->doStateChange(&daKameckDemo::StateID_DemoSt2); }
+	if (timer == 130) { OSReport("Timer = 130 - Kameck = %x\n", Kameck); actor->Kameck->doStateChange(&daKameckDemo::StateID_DemoSt); }
+	if (timer == 400) { OSReport("Timer = 400 - Kameck = %x\n", Kameck); actor->Kameck->doStateChange(&daKameckDemo::StateID_DemoSt2); }
 
 	float scaleSpeed, yPosScaling;
 
-	if (timer == 150) { PlaySound(actor, SE_BOSS_IGGY_WANWAN_TO_L); }
+	if (timer == 150) { PlaySound(actor, SE_BOSS_IGGY_WANWAN_TO_L); OSReport("Timer = 150\n"); }
 	
 	if ((timer > 150) && (timer < 230)) {
+		OSReport("Timer = %d\n", timer);
 		scaleSpeed = (endScale -initialScale) / 80.0;
 	
 		float modifier;
@@ -68,6 +82,7 @@ bool GrowBoss(daBoss *actor, daKameckDemo *Kameck, float initialScale, float end
 	}
 
 	if (timer == 360) { 
+		OSReport("Timer = 360 - Make Effects\n");
 		Vec tempPos = (Vec){actor->pos.x - 40.0, actor->pos.y + 120.0, 3564.0};
 		SpawnEffect("Wm_ob_greencoinkira", 0, &tempPos, &(S16Vec){0,0,0}, &(Vec){1.0, 1.0, 1.0});
 		SpawnEffect("Wm_mr_yoshiicehit_a", 0, &tempPos, &(S16Vec){0,0,0}, &(Vec){1.0, 1.0, 1.0});
@@ -78,7 +93,7 @@ bool GrowBoss(daBoss *actor, daKameckDemo *Kameck, float initialScale, float end
 		SpawnEffect("Wm_ob_keyget01_c", 0, &tempPos, &(S16Vec){0,0,0}, &(Vec){1.0, 1.0, 1.0});
 	}
 
-	if (timer > 420) { return true; }
+	if (timer > 420) { return true; OSReport("Timer = 420, returning true\n"); }
 	return false;
 }
 
diff --git a/src/boss.h b/src/boss.h
index 784c5fa..9c961f6 100644
--- a/src/boss.h
+++ b/src/boss.h
@@ -31,6 +31,8 @@ class daBoss : public dEn_c {
 public:
 	u32 timer;
 	char dying;
+
+	daKameckDemo *Kameck;
 };
 
 
diff --git a/src/bossBalboaWrench.cpp b/src/bossBalboaWrench.cpp
index f19e852..c74ef8f 100644
--- a/src/bossBalboaWrench.cpp
+++ b/src/bossBalboaWrench.cpp
@@ -29,8 +29,6 @@ class daBalboa_c : public daBoss {
 	int isBigBoss;
 	char isRevenging;
 	int spinner;
-
-	daKameckDemo *Kameck;
 	
 	static daBalboa_c *build();
 
diff --git a/src/bossFuzzyBear.cpp b/src/bossFuzzyBear.cpp
index 55b907e..8eaba1d 100644
--- a/src/bossFuzzyBear.cpp
+++ b/src/bossFuzzyBear.cpp
@@ -34,8 +34,6 @@ class daFuzzyBear_c : public daBoss {
 	char roly;
 	char isInvulnerable;
 	
-	daKameckDemo *Kameck;
-
 	static daFuzzyBear_c *build();
 
 	void bindAnimChr_and_setUpdateRate(const char* name, int unk, float unk2, float rate);
diff --git a/src/bossPodouble.cpp b/src/bossPodouble.cpp
index e79f20a..266d2c7 100644
--- a/src/bossPodouble.cpp
+++ b/src/bossPodouble.cpp
@@ -44,8 +44,6 @@ class daPodouble : public daBoss {
 	char isInvulnerable;
 	int countdown;
 
-	daKameckDemo *Kameck;
-
 	static daPodouble *build();
 
 	// void spriteCollision(ActivePhysics *apThis, ActivePhysics *apOther);
diff --git a/src/bossRamboo.cpp b/src/bossRamboo.cpp
index ff14fdc..8569432 100644
--- a/src/bossRamboo.cpp
+++ b/src/bossRamboo.cpp
@@ -34,8 +34,6 @@ class daRamboo_c : public daBoss {
 
 	u64 eventFlag;
 
-	daKameckDemo *Kameck;
-
 	static daRamboo_c *build();
 
 	void bindAnimChr_and_setUpdateRates(const char* name, m3d::anmChr_c animationChr, m3d::mdl_c model, float rate);
diff --git a/src/bossThwompaDomp.cpp b/src/bossThwompaDomp.cpp
index b19045e..98ca361 100644
--- a/src/bossThwompaDomp.cpp
+++ b/src/bossThwompaDomp.cpp
@@ -45,8 +45,6 @@ class daEnMegaDosun_c : public daBoss {
 	bool isOutofScreen;
 	Vec OutOfScreenPosition;
 
-	daKameckDemo *Kameck;
-
 	void setupBodyModel();
 
 	void playerCollision(ActivePhysics *apThis, ActivePhysics *apOther);
diff --git a/src/bossTopman.cpp b/src/bossTopman.cpp
index 625e957..e17c2b1 100644
--- a/src/bossTopman.cpp
+++ b/src/bossTopman.cpp
@@ -29,8 +29,6 @@ class daDreidel : public daBoss {
 
 	float dying;
 
-	daKameckDemo *Kameck;
-
 	static daDreidel *build();
 
 	void bindAnimChr_and_setUpdateRate(const char* name, int unk, float unk2, float rate);