fake star coin fix

1 files changed, 6 insertions, 24 deletions

diff --git a/src/fakeStarCoin.cpp b/src/fakeStarCoin.cpp
index 3c01c5c..ae7ac8b 100644
--- a/src/fakeStarCoin.cpp
+++ b/src/fakeStarCoin.cpp
@@ -31,6 +31,7 @@ class daFakeStarCoin : public dEn_c {
 	bool collisionCat7_GroundPound(ActivePhysics *apThis, ActivePhysics *apOther);
 	bool collisionCat7_GroundPoundYoshi(ActivePhysics *apThis, ActivePhysics *apOther);
 	bool collisionCatD_Drill(ActivePhysics *apThis, ActivePhysics *apOther);
+	bool collisionCatA_PenguinMario(ActivePhysics *apThis, ActivePhysics *apOther);
 
 	bool collisionCat1_Fireball_E_Explosion(ActivePhysics *apThis, ActivePhysics *apOther);
 	bool collisionCat2_IceBall_15_YoshiIce(ActivePhysics *apThis, ActivePhysics *apOther);
@@ -60,27 +61,15 @@ bool daFakeStarCoin::collisionCat7_GroundPoundYoshi(ActivePhysics *apThis, Activ
 bool daFakeStarCoin::collisionCatD_Drill(ActivePhysics *apThis, ActivePhysics *apOther) {
 	return collisionCat9_RollingObject(apThis, apOther);
 }
+bool daFakeStarCoin::collisionCatA_PenguinMario(ActivePhysics *apThis, ActivePhysics *apOther) {
+	return collisionCat9_RollingObject(apThis, apOther);
+}
 
 bool daFakeStarCoin::collisionCat1_Fireball_E_Explosion(ActivePhysics *apThis, ActivePhysics *apOther) { 
-	SpawnEffect("Wm_en_explosion", 0, &this->pos, &(S16Vec){0,0,0}, &(Vec){1.0, 1.0, 1.0});
-	SpawnEffect("Wm_en_explosion_smk", 0, &this->pos, &(S16Vec){0,0,0}, &(Vec){3.0, 3.0, 3.0});
-
-	PlaySound(this, SE_OBJ_EMY_FIRE_DISAPP);
-
-	//FIXME changed to dStageActor_c::Delete(u8) from fBase_c::Delete(void)
-	this->Delete(1);
 	return true;
 }
 bool daFakeStarCoin::collisionCat2_IceBall_15_YoshiIce(ActivePhysics *apThis, ActivePhysics *apOther) { 
-	SpawnEffect("Wm_ob_cmnicekira", 0, &this->pos, &(S16Vec){0,0,0}, &(Vec){1.5, 1.5, 1.5});
-	SpawnEffect("Wm_ob_icebreakwt", 0, &this->pos, &(S16Vec){0,0,0}, &(Vec){1.0, 1.0, 1.0});
-	SpawnEffect("Wm_ob_iceattack", 0, &this->pos, &(S16Vec){0,0,0}, &(Vec){1.5, 1.5, 1.5});
-
-	PlaySound(this, SE_OBJ_PNGN_ICE_BREAK);
-
-	//FIXME changed to dStageActor_c::Delete(u8) from fBase_c::Delete(void)
-	this->Delete(1);
-	return false; 
+	return true; 
 }
 bool daFakeStarCoin::collisionCat9_RollingObject(ActivePhysics *apThis, ActivePhysics *apOther) {
 	SpawnEffect("Wm_ob_cmnboxgrain", 0, &this->pos, &(S16Vec){0,0,0}, &(Vec){1.0, 1.0, 1.0});
@@ -93,16 +82,9 @@ bool daFakeStarCoin::collisionCat9_RollingObject(ActivePhysics *apThis, ActivePh
 	return true;
 }
 bool daFakeStarCoin::collisionCat13_Hammer(ActivePhysics *apThis, ActivePhysics *apOther) {
-	return collisionCat9_RollingObject(apThis, apOther);
+	return true;
 }
 bool daFakeStarCoin::collisionCat14_YoshiFire(ActivePhysics *apThis, ActivePhysics *apOther) {
-	SpawnEffect("Wm_en_explosion", 0, &this->pos, &(S16Vec){0,0,0}, &(Vec){1.0, 1.0, 1.0});
-	SpawnEffect("Wm_en_explosion_smk", 0, &this->pos, &(S16Vec){0,0,0}, &(Vec){3.0, 3.0, 3.0});
-
-	PlaySound(this, SE_OBJ_EMY_FIRE_DISAPP);
-
-	//FIXME changed to dStageActor_c::Delete(u8) from fBase_c::Delete(void)
-	this->Delete(1);
 	return true;
 }