a bunch of sprite fixes mixed into one commit, in traditional Newer fashion

1 files changed, 2 insertions, 3 deletions

diff --git a/src/bossRamboo.cpp b/src/bossRamboo.cpp
index f2af942..a2b34f0 100644
--- a/src/bossRamboo.cpp
+++ b/src/bossRamboo.cpp
@@ -78,7 +78,6 @@ void daRamboo_c::playerCollision(ActivePhysics *apThis, ActivePhysics *apOther)
 }
 bool daRamboo_c::collisionCat1_Fireball_E_Explosion(ActivePhysics *apThis, ActivePhysics *apOther) { 
 	SpawnEffect("Wm_en_obakedoor_sm", 0, &apOther->owner->pos, &(S16Vec){0,0,0}, &(Vec){0.5, 0.5, 0.5});
-	this->pos.x += 6.0;
 	return true;
 }
 bool daRamboo_c::collisionCat2_IceBall_15_YoshiIce(ActivePhysics *apThis, ActivePhysics *apOther) {
@@ -98,7 +97,7 @@ bool daRamboo_c::collisionCat9_RollingObject(ActivePhysics *apThis, ActivePhysic
 	return false;
 }
 bool daRamboo_c::collisionCat13_Hammer(ActivePhysics *apThis, ActivePhysics *apOther) {
-	return true;
+	return collisionCat1_Fireball_E_Explosion(apThis, apOther);
 }
 bool daRamboo_c::collisionCat7_GroundPound(ActivePhysics *apThis, ActivePhysics *apOther) {
 	DamagePlayer(this, apThis, apOther);
@@ -186,7 +185,7 @@ int daRamboo_c::onCreate() {
 	HitMeBaby.category1 = 0x3;
 	HitMeBaby.category2 = 0x0;
 	HitMeBaby.bitfield1 = 0x4F;
-	HitMeBaby.bitfield2 = 0x222;
+	HitMeBaby.bitfield2 = 0x80222;
 	HitMeBaby.unkShort1C = 0;
 	HitMeBaby.callback = &dEn_c::collisionCallback;