Skip to content

fix typo: Renamed STONE_STONE_CHOMP_STEP TO SOUND_STONE_CHOMP_STEP #1240

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bates64 merged 3 commits into from
Jul 6, 2025
Merged

fix typo: Renamed STONE_STONE_CHOMP_STEP TO SOUND_STONE_CHOMP_STEP #1240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c67a25f
fix typo: Renamed STONE_STONE_CHOMP_STEP TO SOUND_STONE_CHOMP_STEP
Kriti-dev07 Jul 6, 2025
ba1bda8
updated all references and fixed ','
Kriti-dev07 Jul 6, 2025
00d8473
added missing fix to enum.h
Kriti-dev07 Jul 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/enums.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1310,7 +1310,7 @@ enum SoundIDs {
SOUND_LULLABY = 0x000003F4,
SOUND_BUBBLES_RISING = 0x000003F5, // unused
SOUND_DRIP = 0x000003F6,
STONE_STONE_CHOMP_STEP = 0x000003F9,
SOUND_STONE_CHOMP_STEP = 0x000003F9,
SOUND_THROW = 0x000003FA,
SOUND_PLAYER_COLLAPSE = 0x000003FB,
SOUND_LUCKY = 0x000003FC,
Expand Down
34 changes: 17 additions & 17 deletions src/battle/common/actor/stone_chomp.inc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,26 +293,26 @@ EvtScript N(EVS_Chomp_HopToPos) = {
IfLt(LVar4, 30)
Call(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Call(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE)
Call(PlaySoundAtActor, ACTOR_SELF, STONE_STONE_CHOMP_STEP)
Call(PlaySoundAtActor, ACTOR_SELF, SOUND_STONE_CHOMP_STEP)
Else
Set(LVar4, LVar3)
Add(LVar3, 30)
Call(SetGoalPos, ACTOR_SELF, LVar3, LVar1, LVar2)
Call(JumpToGoal, ACTOR_SELF, 0, FALSE, TRUE, FALSE)
Call(PlaySoundAtActor, ACTOR_SELF, STONE_STONE_CHOMP_STEP)
Call(PlaySoundAtActor, ACTOR_SELF, SOUND_STONE_CHOMP_STEP)
EndIf
Else
Set(LVar4, LVar3)
Sub(LVar4, LVar0)
IfLt(LVar4, 30)
Call(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Call(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE)
Call(PlaySoundAtActor, ACTOR_SELF, STONE_STONE_CHOMP_STEP)
Call(PlaySoundAtActor, ACTOR_SELF, SOUND_STONE_CHOMP_STEP)
Else
Sub(LVar3, 30)
Call(SetGoalPos, ACTOR_SELF, LVar3, LVar1, LVar2)
Call(JumpToGoal, ACTOR_SELF, 0, FALSE, TRUE, FALSE)
Call(PlaySoundAtActor, ACTOR_SELF, STONE_STONE_CHOMP_STEP)
Call(PlaySoundAtActor, ACTOR_SELF, SOUND_STONE_CHOMP_STEP)
EndIf
EndIf
Goto(0)
Expand Down Expand Up @@ -528,21 +528,21 @@ EvtScript N(EVS_HandleEvent) = {
Call(SetActorJumpGravity, ACTOR_SELF, Float(1.4))
Call(AddGoalPos, ACTOR_SELF, 30, 0, 0)
Call(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE)
Call(PlaySoundAtActor, ACTOR_SELF, STONE_STONE_CHOMP_STEP)
Call(PlaySoundAtActor, ACTOR_SELF, SOUND_STONE_CHOMP_STEP)
Call(AddGoalPos, ACTOR_SELF, 15, 0, 0)
Call(JumpToGoal, ACTOR_SELF, 8, FALSE, TRUE, FALSE)
Call(PlaySoundAtActor, ACTOR_SELF, STONE_STONE_CHOMP_STEP)
Call(PlaySoundAtActor, ACTOR_SELF, SOUND_STONE_CHOMP_STEP)
Call(AddGoalPos, ACTOR_SELF, 5, 0, 0)
Call(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE)
Call(PlaySoundAtActor, ACTOR_SELF, STONE_STONE_CHOMP_STEP)
Call(PlaySoundAtActor, ACTOR_SELF, SOUND_STONE_CHOMP_STEP)
Call(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE)
Call(PlaySoundAtActor, ACTOR_SELF, STONE_STONE_CHOMP_STEP)
Call(PlaySoundAtActor, ACTOR_SELF, SOUND_STONE_CHOMP_STEP)
SetConst(LVar0, PRT_MAIN)
SetConst(LVar1, ANIM_StoneChomp_SlowBite)
ExecWait(N(EVS_Chomp_HopHome))
Call(SetActorJumpGravity, ACTOR_SELF, Float(1.6))
Call(JumpToGoal, ACTOR_SELF, 5, FALSE, TRUE, FALSE)
Call(PlaySoundAtActor, ACTOR_SELF, STONE_STONE_CHOMP_STEP)
Call(PlaySoundAtActor, ACTOR_SELF, SOUND_STONE_CHOMP_STEP)
Thread
Call(ShakeCam, CAM_BATTLE, 0, 1, Float(0.5))
EndThread
Expand Down Expand Up @@ -655,7 +655,7 @@ EvtScript N(EVS_TakeTurn) = {
Add(LVar0, 45)
Call(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Call(JumpToGoal, ACTOR_SELF, 15, FALSE, TRUE, FALSE)
Call(PlaySoundAtActor, ACTOR_SELF, STONE_STONE_CHOMP_STEP)
Call(PlaySoundAtActor, ACTOR_SELF, SOUND_STONE_CHOMP_STEP)
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_StoneChomp_SlowBite)
Wait(15)
Call(PlaySoundAtActor, ACTOR_SELF, SOUND_ACTOR_HURT)
Expand All @@ -672,7 +672,7 @@ EvtScript N(EVS_TakeTurn) = {
Call(SetActorJumpGravity, ACTOR_SELF, Float(1.8))
Call(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Call(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE)
Call(PlaySoundAtActor, ACTOR_SELF, STONE_STONE_CHOMP_STEP)
Call(PlaySoundAtActor, ACTOR_SELF, SOUND_STONE_CHOMP_STEP)
IfEq(LVarA, HIT_RESULT_LUCKY)
Call(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0)
EndIf
Expand All @@ -681,11 +681,11 @@ EvtScript N(EVS_TakeTurn) = {
Sub(LVar0, 25)
Call(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Call(JumpToGoal, ACTOR_SELF, 6, FALSE, TRUE, FALSE)
Call(PlaySoundAtActor, ACTOR_SELF, STONE_STONE_CHOMP_STEP)
Call(PlaySoundAtActor, ACTOR_SELF, SOUND_STONE_CHOMP_STEP)
Sub(LVar0, 15)
Call(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Call(JumpToGoal, ACTOR_SELF, 4, FALSE, TRUE, FALSE)
Call(PlaySoundAtActor, ACTOR_SELF, STONE_STONE_CHOMP_STEP)
Call(PlaySoundAtActor, ACTOR_SELF, SOUND_STONE_CHOMP_STEP)
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_StoneChomp_Bite)
Wait(20)
Call(UseBattleCamPreset, BTL_CAM_DEFAULT)
Expand Down Expand Up @@ -734,18 +734,18 @@ EvtScript N(EVS_TakeTurn) = {
Call(SetActorJumpGravity, ACTOR_SELF, Float(1.8))
Call(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Call(JumpToGoal, ACTOR_SELF, 10, FALSE, TRUE, FALSE)
Call(PlaySoundAtActor, ACTOR_SELF, STONE_STONE_CHOMP_STEP)
Call(PlaySoundAtActor, ACTOR_SELF, SOUND_STONE_CHOMP_STEP)
Add(LVar0, 30)
Call(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Call(JumpToGoal, ACTOR_SELF, 8, FALSE, TRUE, FALSE)
Call(PlaySoundAtActor, ACTOR_SELF, STONE_STONE_CHOMP_STEP)
Call(PlaySoundAtActor, ACTOR_SELF, SOUND_STONE_CHOMP_STEP)
Add(LVar0, 20)
Call(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Call(JumpToGoal, ACTOR_SELF, 6, FALSE, TRUE, FALSE)
Call(PlaySoundAtActor, ACTOR_SELF, STONE_STONE_CHOMP_STEP)
Call(PlaySoundAtActor, ACTOR_SELF, SOUND_STONE_CHOMP_STEP)
Sub(LVar0, 10)
Call(JumpToGoal, ACTOR_SELF, 4, FALSE, TRUE, FALSE)
Call(PlaySoundAtActor, ACTOR_SELF, STONE_STONE_CHOMP_STEP)
Call(PlaySoundAtActor, ACTOR_SELF, SOUND_STONE_CHOMP_STEP)
Call(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_StoneChomp_Idle)
Wait(8)
Call(YieldTurn)
Expand Down