all sounds done

pmret · Oct 17, 2023 · 19774a9 · 19774a9
1 parent 4d2c055
commit 19774a9
Show file tree

Hide file tree

Showing 216 changed files with 1,166 additions and 1,109 deletions.
diff --git a/include/dead.h b/include/dead.h
@@ -74,7 +74,7 @@
 #define spawn_surface_effects dead_spawn_surface_effects
 #define get_item_entity dead_get_item_entity
 #define gOverrideFlags dead_gOverrideFlags
-#define set_message_msg dead_set_message_msg
+#define set_message_text_var dead_set_message_text_var
 #define gPlayerData dead_gPlayerData
 #define gPartnerPopupProperties dead_gPartnerPopupProperties
 #define increment_status_bar_disabled dead_increment_status_bar_disabled

diff --git a/include/enums.h b/include/enums.h
diff --git a/include/functions.h b/include/functions.h
@@ -948,8 +948,8 @@ s32 get_stored_count(void);
 s32 get_item_empty_count(void);
 void shop_open_item_select_popup(s32 mode);
 void hide_coin_counter(void);
-void set_message_msg(s32 msgID, s32 index);
-void set_message_value(s32 value, s32 index);
+void set_message_text_var(s32 msgID, s32 index);
+void set_message_int_var(s32 value, s32 index);
 s32 store_item(s32 itemID);
 void open_status_bar_short(void);
 void show_immune_bonk(f32 x, f32 y, f32 z, s32, s32, s32);

diff --git a/src/23680.c b/src/23680.c
@@ -716,7 +716,7 @@ void basic_ai_found_player_jump_init(Evt* script, MobileAISettings* npcAISetting
     Enemy* enemy = script->owner1.enemy;
     Npc* npc = get_npc_unsafe(enemy->npcID);
 
-    ai_enemy_play_sound(npc, SOUND_03E1, 0);
+    ai_enemy_play_sound(npc, SOUND_AI_FOUND_PLAYER_JUMP, 0);
     npc->curAnim = enemy->animList[ENEMY_ANIM_INDEX_JUMP];
     npc->jumpVel = 10.0f;
     npc->jumpScale = 2.5f;
@@ -814,7 +814,7 @@ void basic_ai_chase(Evt* script, MobileAISettings* aiSettings, EnemyDetectVolume
     npc_move_heading(npc, npc->moveSpeed, npc->yaw);
 
     if (npc->moveSpeed > 8.0 && !(gGameStatusPtr->frameCounter % 5)) {
-        ai_enemy_play_sound(npc, SOUND_20C1, 0);
+        ai_enemy_play_sound(npc, SOUND_SMALL_NPC_STEP, 0);
     }
 
     if (npc->duration > 0) {

diff --git a/src/8a860_len_3f30.c b/src/8a860_len_3f30.c
@@ -1357,7 +1357,7 @@ void popup_menu_draw_menu_contents(s32* userData, s32 baseX, s32 baseY, s32 widt
                     } else {
                         msgPal = MSG_PAL_STANDARD;
                     }
-                    set_message_value(gPopupMenu->userIndex[t] + 1, 0);
+                    set_message_int_var(gPopupMenu->userIndex[t] + 1, 0);
                     draw_msg(MSG_Menus_00CD, x + 8, y, PopupMenu_Alpha, msgPal, DRAW_MSG_STYLE_MENU);
                     break;
                 case POPUP_MENU_READ_POSTCARD:

diff --git a/src/battle/actors.yaml b/src/battle/actors.yaml
@@ -189,8 +189,8 @@
     level: 10
     nameMsg: MSG_EnemyName_Cleft
     tattleMsg: MSG_EnemyTattle_Cleft
-    walkSound: [ SOUND_20D0, SOUND_20D0 ]
-    flySound: [ SOUND_20D0, SOUND_20D0 ]
+    walkSound: [ SOUND_CLEFT_STEP, SOUND_CLEFT_STEP ]
+    flySound: [ SOUND_CLEFT_STEP, SOUND_CLEFT_STEP ]
     jumpSound: SOUND_ACTOR_JUMP
     hurtSound: SOUND_ACTOR_HURT
     stepDelay: [ 30, 30 ]
@@ -211,8 +211,8 @@
     level: 9
     nameMsg: MSG_EnemyName_Bandit
     tattleMsg: MSG_EnemyTattle_Bandit
-    walkSound: [ SOUND_20C1, SOUND_20C1 ]
-    flySound: [ SOUND_20C1, SOUND_20C1 ]
+    walkSound: [ SOUND_SMALL_NPC_STEP, SOUND_SMALL_NPC_STEP ]
+    flySound: [ SOUND_SMALL_NPC_STEP, SOUND_SMALL_NPC_STEP ]
     jumpSound: SOUND_ACTOR_JUMP
     hurtSound: SOUND_ACTOR_HURT
     stepDelay: [ 30, 30 ]
@@ -321,8 +321,8 @@
     level: 15
     nameMsg: MSG_EnemyName_HyperCleft
     tattleMsg: MSG_EnemyTattle_HyperCleft
-    walkSound: [ SOUND_20D0, SOUND_20D0 ]
-    flySound: [ SOUND_20D0, SOUND_20D0 ]
+    walkSound: [ SOUND_CLEFT_STEP, SOUND_CLEFT_STEP ]
+    flySound: [ SOUND_CLEFT_STEP, SOUND_CLEFT_STEP ]
     jumpSound: SOUND_ACTOR_JUMP
     hurtSound: SOUND_ACTOR_HURT
     stepDelay: [ 30, 30 ]
@@ -332,8 +332,8 @@
     level: 13
     nameMsg: MSG_EnemyName_Clubba
     tattleMsg: MSG_EnemyTattle_Clubba
-    walkSound: [ SOUND_20C4, SOUND_20C4 ]
-    flySound: [ SOUND_20C4, SOUND_20C4 ]
+    walkSound: [ SOUND_CLUBBA_STEP, SOUND_CLUBBA_STEP ]
+    flySound: [ SOUND_CLUBBA_STEP, SOUND_CLUBBA_STEP ]
     jumpSound: SOUND_ACTOR_JUMP
     hurtSound: SOUND_ACTOR_HURT
     stepDelay: [ 30, 30 ]
@@ -377,7 +377,7 @@
     nameMsg: MSG_EnemyName_MediGuy
     tattleMsg: MSG_EnemyTattle_MediGuy
     walkSound: [ SOUND_NONE, SOUND_NONE ]
-    flySound: [ SOUND_SHYGUY_FLY, SOUND_NONE ]
+    flySound: [ SOUND_SHY_GUY_FLY, SOUND_NONE ]
     jumpSound: SOUND_ACTOR_JUMP
     hurtSound: SOUND_ACTOR_HURT
     stepDelay: [ 30, 30 ]
@@ -431,8 +431,8 @@
     level: 16
     nameMsg: MSG_EnemyName_MBush
     tattleMsg: MSG_EnemyTattle_MBush
-    walkSound: [ SOUND_20C6, SOUND_20C6 ]
-    flySound: [ SOUND_20C6, SOUND_20C6 ]
+    walkSound: [ SOUND_MBUSH_STEP, SOUND_MBUSH_STEP ]
+    flySound: [ SOUND_MBUSH_STEP, SOUND_MBUSH_STEP ]
     jumpSound: SOUND_ACTOR_JUMP
     hurtSound: SOUND_ACTOR_HURT
     stepDelay: [ 30, 30 ]
@@ -497,7 +497,7 @@
     level: 17
     nameMsg: MSG_EnemyName_PutridPiranha
     tattleMsg: MSG_EnemyTattle_PutridPiranha
-    walkSound: [ SOUND_03CE, SOUND_03CE ]
+    walkSound: [ SOUND_PIRANHA_STEP, SOUND_PIRANHA_STEP ]
     flySound: [ SOUND_NONE, SOUND_NONE ]
     jumpSound: SOUND_NONE
     hurtSound: SOUND_NONE
@@ -596,8 +596,8 @@
     level: 22
     nameMsg: MSG_EnemyName_Gulpit
     tattleMsg: MSG_EnemyTattle_Gulpit
-    walkSound: [ SOUND_20C4, SOUND_20C4 ]
-    flySound: [ SOUND_20C4, SOUND_20C4 ]
+    walkSound: [ SOUND_CLUBBA_STEP, SOUND_CLUBBA_STEP ]
+    flySound: [ SOUND_CLUBBA_STEP, SOUND_CLUBBA_STEP ]
     jumpSound: SOUND_ACTOR_JUMP
     hurtSound: SOUND_ACTOR_HURT
     stepDelay: [ 30, 30 ]
@@ -618,8 +618,8 @@
     level: 23
     nameMsg: MSG_EnemyName_WhiteClubba
     tattleMsg: MSG_EnemyTattle_WhiteClubba
-    walkSound: [ SOUND_20C4, SOUND_20C4 ]
-    flySound: [ SOUND_20C4, SOUND_20C4 ]
+    walkSound: [ SOUND_CLUBBA_STEP, SOUND_CLUBBA_STEP ]
+    flySound: [ SOUND_CLUBBA_STEP, SOUND_CLUBBA_STEP ]
     jumpSound: SOUND_ACTOR_JUMP
     hurtSound: SOUND_ACTOR_HURT
     stepDelay: [ 30, 30 ]
@@ -629,7 +629,7 @@
     level: 22
     nameMsg: MSG_EnemyName_FrostPiranha
     tattleMsg: MSG_EnemyTattle_FrostPiranha
-    walkSound: [ SOUND_03CE, SOUND_03CE ]
+    walkSound: [ SOUND_PIRANHA_STEP, SOUND_PIRANHA_STEP ]
     flySound: [ SOUND_NONE, SOUND_NONE ]
     jumpSound: SOUND_NONE
     hurtSound: SOUND_ACTOR_HURT
@@ -772,8 +772,8 @@
     level: 25
     nameMsg: MSG_EnemyName_BonyBeetle
     tattleMsg: MSG_EnemyTattle_BonyBeetle
-    walkSound: [ SOUND_20CD, SOUND_20CD ]
-    flySound: [ SOUND_20CD, SOUND_20CD ]
+    walkSound: [ SOUND_BONY_BEETLE_STEP, SOUND_BONY_BEETLE_STEP ]
+    flySound: [ SOUND_BONY_BEETLE_STEP, SOUND_BONY_BEETLE_STEP ]
     jumpSound: SOUND_ACTOR_JUMP
     hurtSound: SOUND_ACTOR_HURT
     stepDelay: [ 30, 30 ]
@@ -1499,7 +1499,7 @@
     level: 41
     nameMsg: MSG_EnemyName_JrTroopa
     tattleMsg: MSG_NONE
-    walkSound: [ SOUND_20C1, SOUND_20C1 ]
+    walkSound: [ SOUND_SMALL_NPC_STEP, SOUND_SMALL_NPC_STEP ]
     flySound: [ SOUND_ACTOR_FLIGHT, SOUND_ACTOR_FLIGHT ]
     jumpSound: SOUND_ACTOR_JUMP
     hurtSound: SOUND_ACTOR_HURT
@@ -1510,7 +1510,7 @@
     level: 44
     nameMsg: MSG_EnemyName_JrTroopa
     tattleMsg: MSG_EnemyTattle_JrTroopa1
-    walkSound: [ SOUND_20C1, SOUND_20C1 ]
+    walkSound: [ SOUND_SMALL_NPC_STEP, SOUND_SMALL_NPC_STEP ]
     flySound: [ SOUND_ACTOR_FLIGHT, SOUND_ACTOR_FLIGHT ]
     jumpSound: SOUND_ACTOR_JUMP
     hurtSound: SOUND_ACTOR_HURT
@@ -1521,7 +1521,7 @@
     level: 52
     nameMsg: MSG_EnemyName_JrTroopa
     tattleMsg: MSG_EnemyTattle_JrTroopa2
-    walkSound: [ SOUND_20C1, SOUND_20C1 ]
+    walkSound: [ SOUND_SMALL_NPC_STEP, SOUND_SMALL_NPC_STEP ]
     flySound: [ SOUND_ACTOR_FLIGHT, SOUND_ACTOR_FLIGHT ]
     jumpSound: SOUND_ACTOR_JUMP
     hurtSound: SOUND_ACTOR_HURT
@@ -1532,7 +1532,7 @@
     level: 59
     nameMsg: MSG_EnemyName_JrTroopa
     tattleMsg: MSG_EnemyTattle_JrTroopa3
-    walkSound: [ SOUND_20C1, SOUND_20C1 ]
+    walkSound: [ SOUND_SMALL_NPC_STEP, SOUND_SMALL_NPC_STEP ]
     flySound: [ SOUND_ACTOR_FLIGHT, SOUND_ACTOR_FLIGHT ]
     jumpSound: SOUND_ACTOR_JUMP
     hurtSound: SOUND_ACTOR_HURT
@@ -1543,7 +1543,7 @@
     level: 65
     nameMsg: MSG_EnemyName_JrTroopa
     tattleMsg: MSG_EnemyTattle_JrTroopa4
-    walkSound: [ SOUND_20C1, SOUND_20C1 ]
+    walkSound: [ SOUND_SMALL_NPC_STEP, SOUND_SMALL_NPC_STEP ]
     flySound: [ SOUND_ACTOR_FLIGHT, SOUND_ACTOR_FLIGHT ]
     jumpSound: SOUND_ACTOR_JUMP
     hurtSound: SOUND_ACTOR_HURT
@@ -1554,7 +1554,7 @@
     level: 74
     nameMsg: MSG_EnemyName_JrTroopa
     tattleMsg: MSG_EnemyTattle_JrTroopa5
-    walkSound: [ SOUND_20C1, SOUND_20C1 ]
+    walkSound: [ SOUND_SMALL_NPC_STEP, SOUND_SMALL_NPC_STEP ]
     flySound: [ SOUND_ACTOR_FLIGHT, SOUND_ACTOR_FLIGHT ]
     jumpSound: SOUND_ACTOR_JUMP
     hurtSound: SOUND_ACTOR_HURT
@@ -1565,7 +1565,7 @@
     level: 74
     nameMsg: MSG_EnemyName_JrTroopa
     tattleMsg: MSG_EnemyTattle_JrTroopa5
-    walkSound: [ SOUND_20C1, SOUND_20C1 ]
+    walkSound: [ SOUND_SMALL_NPC_STEP, SOUND_SMALL_NPC_STEP ]
     flySound: [ SOUND_ACTOR_FLIGHT, SOUND_ACTOR_FLIGHT ]
     jumpSound: SOUND_ACTOR_JUMP
     hurtSound: SOUND_ACTOR_HURT
@@ -1576,7 +1576,7 @@
     level: 74
     nameMsg: MSG_EnemyName_JrTroopa
     tattleMsg: MSG_EnemyTattle_JrTroopa5
-    walkSound: [ SOUND_20C1, SOUND_20C1 ]
+    walkSound: [ SOUND_SMALL_NPC_STEP, SOUND_SMALL_NPC_STEP ]
     flySound: [ SOUND_ACTOR_FLIGHT, SOUND_ACTOR_FLIGHT ]
     jumpSound: SOUND_ACTOR_JUMP
     hurtSound: SOUND_ACTOR_HURT
@@ -1609,7 +1609,7 @@
     level: 49
     nameMsg: MSG_EnemyName_GoombaKing
     tattleMsg: MSG_EnemyTattle_GoombaKing
-    walkSound: [ SOUND_HEAVY_NPC_FOOSTEP, SOUND_HEAVY_NPC_FOOSTEP ]
+    walkSound: [ SOUND_HEAVY_NPC_STEP_A, SOUND_HEAVY_NPC_STEP_A ]
     flySound: [ SOUND_NONE, SOUND_NONE ]
     jumpSound: SOUND_NONE
     hurtSound: SOUND_ACTOR_HURT
@@ -1766,7 +1766,7 @@
     nameMsg: MSG_EnemyName_Buzzar
     tattleMsg: MSG_EnemyTattle_Buzzar
     walkSound: [ SOUND_NONE, SOUND_NONE ]
-    flySound: [ SOUND_20EF, SOUND_20EF ]
+    flySound: [ SOUND_BUZZAR_FLAP, SOUND_BUZZAR_FLAP ]
     jumpSound: SOUND_NONE
     hurtSound: SOUND_NONE
     stepDelay: [ -14, -14 ]
@@ -1798,7 +1798,7 @@
     level: 70
     nameMsg: MSG_EnemyName_TubbaBlubba
     tattleMsg: MSG_EnemyTattle_TubbaBlubba
-    walkSound: [ SOUND_20F6, SOUND_20F6 ]
+    walkSound: [ SOUND_HEAVY_NPC_STEP_C, SOUND_HEAVY_NPC_STEP_C ]
     flySound: [ SOUND_NONE, SOUND_NONE ]
     jumpSound: SOUND_NONE
     hurtSound: SOUND_NONE
@@ -1809,7 +1809,7 @@
     level: 0
     nameMsg: MSG_EnemyName_TubbaBlubba
     tattleMsg: MSG_EnemyTattle_TubbaBlubbaInvincible
-    walkSound: [ SOUND_20F6, SOUND_20F6 ]
+    walkSound: [ SOUND_HEAVY_NPC_STEP_C, SOUND_HEAVY_NPC_STEP_C ]
     flySound: [ SOUND_NONE, SOUND_NONE ]
     jumpSound: SOUND_NONE
     hurtSound: SOUND_NONE
@@ -1831,7 +1831,7 @@
     level: 0
     nameMsg: MSG_EnemyName_StiltGuy
     tattleMsg: MSG_EnemyTattle_StiltGuy
-    walkSound: [ SOUND_2066, SOUND_2066 ]
+    walkSound: [ SOUND_STILT_GUY_STEP, SOUND_STILT_GUY_STEP ]
     flySound: [ SOUND_NONE, SOUND_NONE ]
     jumpSound: SOUND_NONE
     hurtSound: SOUND_ACTOR_HURT
@@ -2041,7 +2041,7 @@
     level: 55
     nameMsg: MSG_EnemyName_KentCKoopa
     tattleMsg: MSG_EnemyTattle_KentCKoopa
-    walkSound: [ SOUND_HEAVY_NPC_FOOSTEP, SOUND_HEAVY_NPC_FOOSTEP ]
+    walkSound: [ SOUND_HEAVY_NPC_STEP_A, SOUND_HEAVY_NPC_STEP_A ]
     flySound: [ SOUND_NONE, SOUND_NONE ]
     jumpSound: SOUND_NONE
     hurtSound: SOUND_NONE

diff --git a/src/battle/area/arn/actor/tubbas_heart.c b/src/battle/area/arn/actor/tubbas_heart.c
@@ -525,7 +525,7 @@ EvtScript N(EVS_Move_Charge) = {
     EVT_END_IF
     EVT_PLAY_EFFECT(EFFECT_GATHER_MAGIC, 1, LVar0, LVar1, LVar2, LVar3, 60, 0)
     EVT_PLAY_EFFECT(EFFECT_ENERGY_IN_OUT, 6, LVar0, LVar1, LVar2, LVar3, 60, 0)
-    EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20F7)
+    EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_TUBBAS_HEART_CHARGE)
     EVT_WAIT(60)
     EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
     EVT_CALL(MoveBattleCamOver, 20)
@@ -589,7 +589,7 @@ EvtScript N(EVS_Attack_DarkSwarm) = {
         EVT_CALL(SetActorVar, ACTOR_SELF, AVAR_ChargedEffectID, 0)
         EVT_CALL(SetIdleAnimations, ACTOR_SELF, PRT_MAIN, EVT_PTR(N(DefaultAnims)))
     EVT_END_IF
-    EVT_CALL(PlaySound, SOUND_20F9)
+    EVT_CALL(PlaySound, SOUND_TUBBAS_HEART_SWARM_ATTACK)
     EVT_CALL(SetGoalToTarget, ACTOR_SELF)
     EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_10)
     EVT_SWITCH(LVarA)
@@ -611,7 +611,7 @@ EvtScript N(EVS_Attack_DarkSwarm) = {
     EVT_PLAY_EFFECT(EFFECT_TUBBA_HEART_ATTACK, 0, LVar0, LVar1, LVar2, EVT_FLOAT(1.0), 200, 0)
     EVT_THREAD
         EVT_WAIT(160)
-        EVT_CALL(PlaySound, SOUND_20FC)
+        EVT_CALL(PlaySound, SOUND_TUBBAS_HEART_SWARM_VANISH)
     EVT_END_THREAD
     EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, FALSE)
     EVT_CALL(SetAnimation, ACTOR_PLAYER, 0, ANIM_Mario1_Flail)
@@ -630,7 +630,7 @@ EvtScript N(EVS_Attack_DarkSwarm) = {
     EVT_WAIT(22)
     EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
     EVT_CALL(MoveBattleCamOver, 10)
-    EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_20FB)
+    EVT_CALL(PlaySoundAtActor, ACTOR_PLAYER, SOUND_TUBBAS_HEART_SWARM_DISPERSE)
     EVT_CALL(UseIdleAnimation, ACTOR_PLAYER, TRUE)
     EVT_WAIT(2)
     EVT_CALL(SetGoalToTarget, ACTOR_SELF)

diff --git a/src/battle/area/flo2/actor/huff_n_puff.c b/src/battle/area/flo2/actor/huff_n_puff.c
@@ -1647,7 +1647,7 @@ EvtScript N(EVS_Move_HealOrSlam) = {
     EVT_CALL(SetAnimation, ACTOR_SELF, PRT_ARMS, ANIM_HuffNPuff_Anim19)
     EVT_THREAD
         EVT_WAIT(5)
-        EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_206D)
+        EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_RECOVER_HEART)
         EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEART_BOUNCE)
     EVT_END_THREAD
     EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
@@ -2380,15 +2380,15 @@ EvtScript N(EVS_Attack_GroupSlam) = {
     EVT_CALL(SetBattleCamOffsetZ, 5)
     EVT_CALL(MoveBattleCamOver, 30)
     EVT_WAIT(30)
-    EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03B3)
+    EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HUFF_N_PUFF_REAR_UP)
     EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_HuffNPuff_Anim1A)
     EVT_CALL(SetAnimation, ACTOR_SELF, PRT_FACE, ANIM_HuffNPuff_Anim1B)
     EVT_CALL(SetAnimation, ACTOR_SELF, PRT_ARMS, ANIM_HuffNPuff_Anim1C)
     EVT_WAIT(8)
     EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_HuffNPuff_Anim1D)
     EVT_CALL(SetAnimation, ACTOR_SELF, PRT_FACE, ANIM_HuffNPuff_Anim1E)
     EVT_CALL(SetAnimation, ACTOR_SELF, PRT_ARMS, ANIM_HuffNPuff_Anim1F)
-    EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20B6)
+    EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HUFF_N_PUFF_JIGGLE)
     EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_ScaleX, LVar0)
     EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_ScaleY, LVar1)
     EVT_SET(LVarF, 0)
@@ -2402,7 +2402,7 @@ EvtScript N(EVS_Attack_GroupSlam) = {
         EVT_ADD(LVarF, 1)
         EVT_WAIT(1)
     EVT_END_LOOP
-    EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20B6)
+    EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HUFF_N_PUFF_JIGGLE)
     EVT_LOOP(20)
         EVT_CALL(N(CosInterpMinMax), LVarF, LVar2, EVT_FLOAT(1.0), EVT_FLOAT(1.2), 10, 0, 0)
         EVT_CALL(N(CosInterpMinMax), LVarF, LVar3, EVT_FLOAT(1.0), EVT_FLOAT(0.8), 10, 0, 0)
@@ -2511,7 +2511,7 @@ EvtScript N(EVS_Attack_GroupSlam) = {
         EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_ScaleX, LVar0)
         EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_ScaleY, LVar1)
         EVT_SET(LVarF, 0)
-        EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20B7)
+        EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HUFF_N_PUFF_WOBBLE)
         EVT_LOOP(20)
             EVT_CALL(N(CosInterpMinMax), LVarF, LVar2, EVT_FLOAT(1.0), EVT_FLOAT(1.5), 10, 0, 0)
             EVT_CALL(N(CosInterpMinMax), LVarF, LVar3, EVT_FLOAT(1.0), EVT_FLOAT(0.5), 10, 0, 0)
@@ -2522,7 +2522,7 @@ EvtScript N(EVS_Attack_GroupSlam) = {
             EVT_ADD(LVarF, 1)
             EVT_WAIT(1)
         EVT_END_LOOP
-        EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20B7)
+        EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HUFF_N_PUFF_WOBBLE)
         EVT_LOOP(20)
             EVT_CALL(N(CosInterpMinMax), LVarF, LVar2, EVT_FLOAT(1.0), EVT_FLOAT(1.2), 10, 0, 0)
             EVT_CALL(N(CosInterpMinMax), LVarF, LVar3, EVT_FLOAT(1.0), EVT_FLOAT(0.8), 10, 0, 0)

diff --git a/src/battle/area/flo2/actor/spike.c b/src/battle/area/flo2/actor/spike.c
@@ -294,7 +294,7 @@ EvtScript N(EVS_Attack_SpinyToss) = {
         EVT_SETF(LVar3, EVT_FLOAT(1.0))
     EVT_END_IF
     EVT_PLAY_EFFECT(EFFECT_ENERGY_IN_OUT, 0, LVar0, LVar1, LVar2, LVar3, 30, 0)
-    EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_LAKILESTER_SUMMON_SPINY)
+    EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_SPIKE_SUMMON_SPINY)
     EVT_THREAD
         EVT_LOOP(15)
             EVT_CALL(SetActorDispOffset, ACTOR_SELF, 1, 0, 0)
@@ -315,7 +315,7 @@ EvtScript N(EVS_Attack_SpinyToss) = {
     EVT_WAIT(10)
     EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleLakilester_ThrowSpiny)
     EVT_WAIT(3)
-    EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_SPINY_BALL, SOUND_LAKILESTER_THROW_SPINY)
+    EVT_CALL(PlaySoundAtPart, ACTOR_SELF, PRT_SPINY_BALL, SOUND_SPIKE_THROW_SPINY)
     EVT_CALL(SetPartSounds, ACTOR_SELF, PRT_SPINY_BALL, ACTOR_SOUND_JUMP, SOUND_NONE, SOUND_NONE)
     EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10)
     EVT_SWITCH(LVar0)