Skip to content

Commit 320ce65

Browse files
authored
fix typo SOUND_STONE_CHOMP_STEP (#1240)
1 parent bb936b7 commit 320ce65

File tree

2 files changed

+18
-18
lines changed

2 files changed

+18
-18
lines changed

include/enums.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1310,7 +1310,7 @@ enum SoundIDs {
13101310
SOUND_LULLABY = 0x000003F4,
13111311
SOUND_BUBBLES_RISING = 0x000003F5, // unused
13121312
SOUND_DRIP = 0x000003F6,
1313-
STONE_STONE_CHOMP_STEP = 0x000003F9,
1313+
SOUND_STONE_CHOMP_STEP = 0x000003F9,
13141314
SOUND_THROW = 0x000003FA,
13151315
SOUND_PLAYER_COLLAPSE = 0x000003FB,
13161316
SOUND_LUCKY = 0x000003FC,

src/battle/common/actor/stone_chomp.inc.c

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -293,26 +293,26 @@ EvtScript N(EVS_Chomp_HopToPos) = {
293293
IfLt(LVar4, 30)
294294
Call(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
295295
Call(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE)
296-
Call(PlaySoundAtActor, ACTOR_SELF, STONE_STONE_CHOMP_STEP)
296+
Call(PlaySoundAtActor, ACTOR_SELF, SOUND_STONE_CHOMP_STEP)
297297
Else
298298
Set(LVar4, LVar3)
299299
Add(LVar3, 30)
300300
Call(SetGoalPos, ACTOR_SELF, LVar3, LVar1, LVar2)
301301
Call(JumpToGoal, ACTOR_SELF, 0, FALSE, TRUE, FALSE)
302-
Call(PlaySoundAtActor, ACTOR_SELF, STONE_STONE_CHOMP_STEP)
302+
Call(PlaySoundAtActor, ACTOR_SELF, SOUND_STONE_CHOMP_STEP)
303303
EndIf
304304
Else
305305
Set(LVar4, LVar3)
306306
Sub(LVar4, LVar0)
307307
IfLt(LVar4, 30)
308308
Call(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
309309
Call(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE)
310-
Call(PlaySoundAtActor, ACTOR_SELF, STONE_STONE_CHOMP_STEP)
310+
Call(PlaySoundAtActor, ACTOR_SELF, SOUND_STONE_CHOMP_STEP)
311311
Else
312312
Sub(LVar3, 30)
313313
Call(SetGoalPos, ACTOR_SELF, LVar3, LVar1, LVar2)
314314
Call(JumpToGoal, ACTOR_SELF, 0, FALSE, TRUE, FALSE)
315-
Call(PlaySoundAtActor, ACTOR_SELF, STONE_STONE_CHOMP_STEP)
315+
Call(PlaySoundAtActor, ACTOR_SELF, SOUND_STONE_CHOMP_STEP)
316316
EndIf
317317
EndIf
318318
Goto(0)
@@ -528,21 +528,21 @@ EvtScript N(EVS_HandleEvent) = {
528528
Call(SetActorJumpGravity, ACTOR_SELF, Float(1.4))
529529
Call(AddGoalPos, ACTOR_SELF, 30, 0, 0)
530530
Call(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE)
531-
Call(PlaySoundAtActor, ACTOR_SELF, STONE_STONE_CHOMP_STEP)
531+
Call(PlaySoundAtActor, ACTOR_SELF, SOUND_STONE_CHOMP_STEP)
532532
Call(AddGoalPos, ACTOR_SELF, 15, 0, 0)
533533
Call(JumpToGoal, ACTOR_SELF, 8, FALSE, TRUE, FALSE)
534-
Call(PlaySoundAtActor, ACTOR_SELF, STONE_STONE_CHOMP_STEP)
534+
Call(PlaySoundAtActor, ACTOR_SELF, SOUND_STONE_CHOMP_STEP)
535535
Call(AddGoalPos, ACTOR_SELF, 5, 0, 0)
536536
Call(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE)
537-
Call(PlaySoundAtActor, ACTOR_SELF, STONE_STONE_CHOMP_STEP)
537+
Call(PlaySoundAtActor, ACTOR_SELF, SOUND_STONE_CHOMP_STEP)
538538
Call(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE)
539-
Call(PlaySoundAtActor, ACTOR_SELF, STONE_STONE_CHOMP_STEP)
539+
Call(PlaySoundAtActor, ACTOR_SELF, SOUND_STONE_CHOMP_STEP)
540540
SetConst(LVar0, PRT_MAIN)
541541
SetConst(LVar1, ANIM_StoneChomp_SlowBite)
542542
ExecWait(N(EVS_Chomp_HopHome))
543543
Call(SetActorJumpGravity, ACTOR_SELF, Float(1.6))
544544
Call(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE)
545-
Call(PlaySoundAtActor, ACTOR_SELF, STONE_STONE_CHOMP_STEP)
545+
Call(PlaySoundAtActor, ACTOR_SELF, SOUND_STONE_CHOMP_STEP)
546546
Thread
547547
Call(ShakeCam, CAM_BATTLE, 0, 1, Float(0.5))
548548
EndThread
@@ -655,7 +655,7 @@ EvtScript N(EVS_TakeTurn) = {
655655
Add(LVar0, 45)
656656
Call(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
657657
Call(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE)
658-
Call(PlaySoundAtActor, ACTOR_SELF, STONE_STONE_CHOMP_STEP)
658+
Call(PlaySoundAtActor, ACTOR_SELF, SOUND_STONE_CHOMP_STEP)
659659
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_StoneChomp_SlowBite)
660660
Wait(15)
661661
Call(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_HURT)
@@ -672,7 +672,7 @@ EvtScript N(EVS_TakeTurn) = {
672672
Call(SetActorJumpGravity, ACTOR_SELF, Float(1.8))
673673
Call(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
674674
Call(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE)
675-
Call(PlaySoundAtActor, ACTOR_SELF, STONE_STONE_CHOMP_STEP)
675+
Call(PlaySoundAtActor, ACTOR_SELF, SOUND_STONE_CHOMP_STEP)
676676
IfEq(LVarA, HIT_RESULT_LUCKY)
677677
Call(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0)
678678
EndIf
@@ -681,11 +681,11 @@ EvtScript N(EVS_TakeTurn) = {
681681
Sub(LVar0, 25)
682682
Call(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
683683
Call(JumpToGoal, ACTOR_SELF, 6, FALSE, TRUE, FALSE)
684-
Call(PlaySoundAtActor, ACTOR_SELF, STONE_STONE_CHOMP_STEP)
684+
Call(PlaySoundAtActor, ACTOR_SELF, SOUND_STONE_CHOMP_STEP)
685685
Sub(LVar0, 15)
686686
Call(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
687687
Call(JumpToGoal, ACTOR_SELF, 4, FALSE, TRUE, FALSE)
688-
Call(PlaySoundAtActor, ACTOR_SELF, STONE_STONE_CHOMP_STEP)
688+
Call(PlaySoundAtActor, ACTOR_SELF, SOUND_STONE_CHOMP_STEP)
689689
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_StoneChomp_Bite)
690690
Wait(20)
691691
Call(UseBattleCamPreset, BTL_CAM_DEFAULT)
@@ -734,18 +734,18 @@ EvtScript N(EVS_TakeTurn) = {
734734
Call(SetActorJumpGravity, ACTOR_SELF, Float(1.8))
735735
Call(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
736736
Call(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE)
737-
Call(PlaySoundAtActor, ACTOR_SELF, STONE_STONE_CHOMP_STEP)
737+
Call(PlaySoundAtActor, ACTOR_SELF, SOUND_STONE_CHOMP_STEP)
738738
Add(LVar0, 30)
739739
Call(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
740740
Call(JumpToGoal, ACTOR_SELF, 8, FALSE, TRUE, FALSE)
741-
Call(PlaySoundAtActor, ACTOR_SELF, STONE_STONE_CHOMP_STEP)
741+
Call(PlaySoundAtActor, ACTOR_SELF, SOUND_STONE_CHOMP_STEP)
742742
Add(LVar0, 20)
743743
Call(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
744744
Call(JumpToGoal, ACTOR_SELF, 6, FALSE, TRUE, FALSE)
745-
Call(PlaySoundAtActor, ACTOR_SELF, STONE_STONE_CHOMP_STEP)
745+
Call(PlaySoundAtActor, ACTOR_SELF, SOUND_STONE_CHOMP_STEP)
746746
Sub(LVar0, 10)
747747
Call(JumpToGoal, ACTOR_SELF, 4, FALSE, TRUE, FALSE)
748-
Call(PlaySoundAtActor, ACTOR_SELF, STONE_STONE_CHOMP_STEP)
748+
Call(PlaySoundAtActor, ACTOR_SELF, SOUND_STONE_CHOMP_STEP)
749749
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_StoneChomp_Idle)
750750
Wait(8)
751751
Call(YieldTurn)

0 commit comments

Comments
 (0)