couple of fixes to shyguy sounds and animations

2 files changed, 9 insertions, 0 deletions

diff --git a/src/shyguy.cpp b/src/shyguy.cpp
index ced7a41..1e89a8a 100644
--- a/src/shyguy.cpp
+++ b/src/shyguy.cpp
@@ -333,10 +333,14 @@ daShyGuy *daShyGuy::build() {
 		}
 
 		if (this->damage > 1) {
+			nw4r::snd::SoundHandle handle;
+			PlaySoundWithFunctionB4(SoundRelatedClass, &handle, SE_EMY_DOWN, 1);
 			doStateChange(&StateID_DieSmoke);
 			this->_vf14C();		
 		}
 		else {
+			nw4r::snd::SoundHandle handle;
+			PlaySoundWithFunctionB4(SoundRelatedClass, &handle, SE_EMY_KURIBO_L_DAMAGE_01, 1);
 			doStateChange(stateVar);
 		}
 		return true;
@@ -364,6 +368,7 @@ daShyGuy *daShyGuy::build() {
 		struct DoSomethingCool my_struct = { 0, this->pos, {1.2, 1.5, 1.5}, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 };
 	    this->frzMgr.Create_ICEACTORs( (void*)&my_struct, 1 );
 	    __destroy_arr( (void*)&my_struct, sub_80024C20, 0x3C, 1 );
+	    chrAnimation.setUpdateRate(0.0f);
 	    return true;
 	}
 
diff --git a/src/shyguyGiants.cpp b/src/shyguyGiants.cpp
index dc474f6..a617e88 100644
--- a/src/shyguyGiants.cpp
+++ b/src/shyguyGiants.cpp
@@ -92,6 +92,7 @@ class daShyGuyGiant : public dEn_c {
 	void _vf260(void *other); // AcPy/PlBase? plays the SE_EMY_FUMU_%d sounds based on some value
 	void _vf264(dStageActor_c *other); // if other is player or yoshi, do Wm_en_hit and a few other things
 	void _vf268(void *other); // AcPy/PlBase? plays the SE_EMY_DOWN_SPIN_%d sounds based on some value
+	void _vf278(void *other); // AcPy/PlBase? plays the SE_EMY_YOSHI_FUMU_%d sounds based on some value
 
 	USING_STATES(daShyGuyGiant);
 	DECLARE_STATE(RealWalk);
@@ -160,6 +161,9 @@ daShyGuyGiant *daShyGuyGiant::build() {
 			}
 		} 
 	}			
+void daShyGuyGiant::_vf278(void *other) {
+	PlaySound(this, SE_EMY_HANACHAN_STOMP);
+}
 
 	void daShyGuyGiant::bouncePlayerWhenJumpedOn(void *player) {
 		bouncePlayer(player, 5.0f);