falso
/
papermario
mirror of https://github.com/pmret/papermario.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix typo SOUND_STONE_CHOMP_STEP (#1240)

This commit is contained in:
KRITI MITTAL 2025-07-07 02:24:42 +05:30 committed by GitHub
parent bb936b7fd7
commit 320ce6595d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/enums.h
View File

@ -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,

34
src/battle/common/actor/stone_chomp.inc.c
View File

@ -293,13 +293,13 @@ 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)
@ -307,12 +307,12 @@ 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
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)
@ -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
@ -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)
@ -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
@ -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)
@ -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)