1 files changed, 23 insertions, 15 deletions

diff --git a/src/bossBalboaWrench.cpp b/src/bossBalboaWrench.cpp
index e1e39fa..1cea253 100644
--- a/src/bossBalboaWrench.cpp
+++ b/src/bossBalboaWrench.cpp
@@ -37,12 +37,12 @@ class daBalboa_c : public daBoss {
 	void bindAnimChr_and_setUpdateRate(const char* name, int unk, float unk2, float rate);
 
 	void playerCollision(ActivePhysics *apThis, ActivePhysics *apOther);
-	void collisionCat1_Fireball_E_Explosion(ActivePhysics *apThis, ActivePhysics *apOther);
+	bool collisionCat1_Fireball_E_Explosion(ActivePhysics *apThis, ActivePhysics *apOther);
 	bool collisionCat2_IceBall_15_YoshiIce(ActivePhysics *apThis, ActivePhysics *apOther);
-	void collisionCat9_RollingObject(ActivePhysics *apThis, ActivePhysics *apOther);
-	void collisionCat13_Hammer(ActivePhysics *apThis, ActivePhysics *apOther);
-	void collisionCat7_GroundPound(ActivePhysics *apThis, ActivePhysics *apOther);
-	void collisionCatA_PenguinMario(ActivePhysics *apThis, ActivePhysics *apOther);
+	bool collisionCat9_RollingObject(ActivePhysics *apThis, ActivePhysics *apOther);
+	bool collisionCat13_Hammer(ActivePhysics *apThis, ActivePhysics *apOther);
+	bool collisionCat7_GroundPound(ActivePhysics *apThis, ActivePhysics *apOther);
+	bool collisionCatA_PenguinMario(ActivePhysics *apThis, ActivePhysics *apOther);
 
 	void addScoreWhenHit(void *other);
 	
@@ -118,7 +118,7 @@ daBalboa_c *daBalboa_c::build() {
 		this->counter_504[apOther->owner->which_player] = 0;
 	}
 
-	void daBalboa_c::collisionCat7_GroundPound(ActivePhysics *apThis, ActivePhysics *apOther) { 
+	bool daBalboa_c::collisionCat7_GroundPound(ActivePhysics *apThis, ActivePhysics *apOther) { 
 
 		dActor_c *block = apOther->owner;
 		dEn_c *mario = (dEn_c*)block;
@@ -134,10 +134,7 @@ daBalboa_c *daBalboa_c::build() {
 		mario->doSpriteMovement();
 		mario->doSpriteMovement();
 
-		if (isRevenging) { 
-			return;
-		}
-		else {
+		if (!isRevenging) {
 			this->damage -= 1;
 			
 			apOther->someFlagByte |= 2;
@@ -147,13 +144,24 @@ daBalboa_c *daBalboa_c::build() {
 			doStateChange(&StateID_Damage);
 		}
 
+		return true;
 	}
 
-	void daBalboa_c::collisionCat1_Fireball_E_Explosion(ActivePhysics *apThis, ActivePhysics *apOther) { }
-	bool daBalboa_c::collisionCat2_IceBall_15_YoshiIce(ActivePhysics *apThis, ActivePhysics *apOther) { return false; }
-	void daBalboa_c::collisionCat9_RollingObject(ActivePhysics *apThis, ActivePhysics *apOther) { }
-	void daBalboa_c::collisionCat13_Hammer(ActivePhysics *apThis, ActivePhysics *apOther) { }
-	void daBalboa_c::collisionCatA_PenguinMario(ActivePhysics *apThis, ActivePhysics *apOther) { }
+	bool daBalboa_c::collisionCat1_Fireball_E_Explosion(ActivePhysics *apThis, ActivePhysics *apOther) {
+		return true;
+	}
+	bool daBalboa_c::collisionCat2_IceBall_15_YoshiIce(ActivePhysics *apThis, ActivePhysics *apOther) {
+		return false;
+	}
+	bool daBalboa_c::collisionCat9_RollingObject(ActivePhysics *apThis, ActivePhysics *apOther) {
+		return true;
+	}
+	bool daBalboa_c::collisionCat13_Hammer(ActivePhysics *apThis, ActivePhysics *apOther) {
+		return true;
+	}
+	bool daBalboa_c::collisionCatA_PenguinMario(ActivePhysics *apThis, ActivePhysics *apOther) {
+		return true;
+	}
 
 
 void daBalboa_c::setupModels() {