Skip to content

Commit

Permalink
128 left
Browse files Browse the repository at this point in the history
  • Loading branch information
HailSanta authored and HailSanta committed Oct 15, 2023
1 parent 84185a1 commit 4d2c055
Show file tree
Hide file tree
Showing 109 changed files with 552 additions and 548 deletions.
266 changes: 135 additions & 131 deletions include/enums.h
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/audio/sfx_player.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ s32 CUSTOM_ECHO_PARAMS_3[] = {

AlUnkGemini D_80078370[] = {
{
.sound1 = SOUND_034A,
.sound1 = SOUND_SHORT_CLAP,
.sound2 = SOUND_LRAW_CHEERING,
.flags = 1
}
Expand Down
16 changes: 8 additions & 8 deletions src/battle/actors.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -541,8 +541,8 @@
level: 19
nameMsg: MSG_EnemyName_Bzzap
tattleMsg: MSG_EnemyTattle_Bzzap
walkSound: [ SOUND_0357, SOUND_NONE ]
flySound: [ SOUND_0357, SOUND_NONE ]
walkSound: [ SOUND_BZZAP_BUZZ, SOUND_NONE ]
flySound: [ SOUND_BZZAP_BUZZ, SOUND_NONE ]
jumpSound: SOUND_ACTOR_JUMP
hurtSound: SOUND_ACTOR_HURT
stepDelay: [ 30, 30 ]
Expand Down Expand Up @@ -750,7 +750,7 @@
level: 23
nameMsg: MSG_EnemyName_AlbinoDino
tattleMsg: MSG_EnemyTattle_AlbinoDino
walkSound: [ SOUND_030B, SOUND_02FD ]
walkSound: [ SOUND_ALBINO_DINO_STEP_A, SOUND_ALBINO_DINO_STEP_B ]
flySound: [ SOUND_NONE, SOUND_NONE ]
jumpSound: SOUND_ACTOR_JUMP
hurtSound: SOUND_ACTOR_HURT
Expand Down Expand Up @@ -1609,7 +1609,7 @@
level: 49
nameMsg: MSG_EnemyName_GoombaKing
tattleMsg: MSG_EnemyTattle_GoombaKing
walkSound: [ SOUND_20EC, SOUND_20EC ]
walkSound: [ SOUND_HEAVY_NPC_FOOSTEP, SOUND_HEAVY_NPC_FOOSTEP ]
flySound: [ SOUND_NONE, SOUND_NONE ]
jumpSound: SOUND_NONE
hurtSound: SOUND_ACTOR_HURT
Expand Down Expand Up @@ -1688,7 +1688,7 @@
level: 0
nameMsg: MSG_EnemyName_FakeBowser
tattleMsg: MSG_EnemyTattle_FakeBowser
walkSound: [ SOUND_03EA, SOUND_03EA ]
walkSound: [ SOUND_FAKE_BOWSER_STEP, SOUND_FAKE_BOWSER_STEP ]
flySound: [ SOUND_NONE, SOUND_NONE ]
jumpSound: SOUND_NONE
hurtSound: SOUND_NONE
Expand Down Expand Up @@ -1875,7 +1875,7 @@
level: 0
nameMsg: MSG_EnemyName_GeneralGuy
tattleMsg: MSG_EnemyTattle_GeneralGuy
walkSound: [ SOUND_037E, SOUND_037E ]
walkSound: [ SOUND_TOY_TANK_STEP, SOUND_TOY_TANK_STEP ]
flySound: [ SOUND_NONE, SOUND_NONE ]
jumpSound: SOUND_NONE
hurtSound: SOUND_ACTOR_HURT
Expand Down Expand Up @@ -1952,7 +1952,7 @@
level: 42
nameMsg: MSG_EnemyName_BigLanternGhost
tattleMsg: MSG_EnemyTattle_BigLanternGhost
walkSound: [ SOUND_037D, SOUND_037D ]
walkSound: [ SOUND_LANTERN_GHOST_STEP, SOUND_LANTERN_GHOST_STEP ]
flySound: [ SOUND_NONE, SOUND_NONE ]
jumpSound: SOUND_NONE
hurtSound: SOUND_NONE
Expand Down Expand Up @@ -2041,7 +2041,7 @@
level: 55
nameMsg: MSG_EnemyName_KentCKoopa
tattleMsg: MSG_EnemyTattle_KentCKoopa
walkSound: [ SOUND_20EC, SOUND_20EC ]
walkSound: [ SOUND_HEAVY_NPC_FOOSTEP, SOUND_HEAVY_NPC_FOOSTEP ]
flySound: [ SOUND_NONE, SOUND_NONE ]
jumpSound: SOUND_NONE
hurtSound: SOUND_NONE
Expand Down
8 changes: 4 additions & 4 deletions src/battle/area/arn/actor/tubba_blubba.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ EvtScript N(EVS_Attack_SlamFist) = {
EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleTubba_Anim15)
EVT_WAIT(8)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_035E)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_NPC_SWIPE)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleTubba_Anim16)
EVT_WAIT(20)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleTubba_Anim17)
Expand All @@ -306,7 +306,7 @@ EvtScript N(EVS_Attack_SlamFist) = {
EVT_CALL(StartRumble, BTL_RUMBLE_LONG)
EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(15.0))
EVT_END_THREAD
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20EA)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_NPC_LANDING)
EVT_END_IF
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_10)
EVT_SWITCH(LVarA)
Expand Down Expand Up @@ -395,7 +395,7 @@ EvtScript N(EVS_Attack_BodySlam) = {
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.0))
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 23, FALSE, TRUE, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20EA)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_NPC_LANDING)
EVT_PLAY_EFFECT(EFFECT_SHOCKWAVE, 0, LVar0, 0, LVar2, 0)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleTubba_Anim0D)
EVT_THREAD
Expand Down Expand Up @@ -443,7 +443,7 @@ EvtScript N(EVS_Attack_BodySlam) = {
EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar5)
EVT_IF_NOT_FLAG(LVar5, STATUS_FLAG_SHRINK)
EVT_CALL(SetDamageSource, DMG_SRC_CRUSH)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20EA)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_NPC_LANDING)
EVT_END_IF
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVarF, 0, 0, 0, DMG_BODY_SLAM, BS_FLAGS1_SP_EVT_ACTIVE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Expand Down
10 changes: 5 additions & 5 deletions src/battle/area/dgb/actor/tubba_blubba.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,7 @@ EvtScript N(EVS_Attack_SlamFist) = {
EVT_CALL(RunToGoal, ACTOR_SELF, 0, FALSE)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleTubba_Anim15)
EVT_WAIT(8)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_035E)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_NPC_SWIPE)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleTubba_Anim16)
EVT_WAIT(20)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleTubba_Anim17)
Expand All @@ -432,7 +432,7 @@ EvtScript N(EVS_Attack_SlamFist) = {
EVT_CALL(StartRumble, BTL_RUMBLE_LONG)
EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(15.0))
EVT_END_THREAD
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20EA)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_NPC_LANDING)
EVT_END_IF
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVarA, 0, 0, 1, BS_FLAGS1_10)
EVT_SWITCH(LVarA)
Expand Down Expand Up @@ -518,7 +518,7 @@ EvtScript N(EVS_Attack_BodySlam) = {
EVT_CALL(SetActorJumpGravity, ACTOR_SELF, EVT_FLOAT(1.0))
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 23, FALSE, TRUE, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20EA)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_NPC_LANDING)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleTubba_Anim12)
EVT_THREAD
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Expand Down Expand Up @@ -561,12 +561,12 @@ EvtScript N(EVS_Attack_BodySlam) = {
EVT_CALL(JumpToGoal, ACTOR_SELF, 16, FALSE, TRUE, FALSE)
EVT_END_SWITCH
EVT_WAIT(2)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20EA)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_NPC_LANDING)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar5)
EVT_IF_NOT_FLAG(LVar5, STATUS_FLAG_SHRINK)
EVT_CALL(SetDamageSource, DMG_SRC_CRUSH)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20EA)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_NPC_LANDING)
EVT_END_IF
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_BODY_SLAM, BS_FLAGS1_SP_EVT_ACTIVE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_ENEMY_APPROACH)
Expand Down
8 changes: 4 additions & 4 deletions src/battle/area/dig/actor/tubba_blubba.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ EvtScript N(EVS_Attack_SlamFist) = {
EVT_THREAD
EVT_CALL(ShakeCam, CAM_BATTLE, 0, 5, EVT_FLOAT(15.0))
EVT_END_THREAD
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20EA)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_NPC_LANDING)
EVT_END_IF
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10)
EVT_SWITCH(LVar0)
Expand Down Expand Up @@ -367,7 +367,7 @@ EvtScript N(EVS_Attack_BodySlam) = {
EVT_CALL(PlaySound, SOUND_ACTOR_JUMP)
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_CALL(JumpToGoal, ACTOR_SELF, 23, FALSE, TRUE, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20EA)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_NPC_LANDING)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_BattleTubba_Anim12)
EVT_THREAD
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
Expand Down Expand Up @@ -408,12 +408,12 @@ EvtScript N(EVS_Attack_BodySlam) = {
EVT_CALL(JumpToGoal, ACTOR_SELF, 16, FALSE, TRUE, FALSE)
EVT_END_SWITCH
EVT_WAIT(2)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20EA)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_NPC_LANDING)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
EVT_CALL(GetStatusFlags, ACTOR_SELF, LVar5)
EVT_IF_NOT_FLAG(LVar5, STATUS_FLAG_SHRINK)
EVT_CALL(SetDamageSource, DMG_SRC_CRUSH)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20EA)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_NPC_LANDING)
EVT_END_IF
EVT_CALL(EnemyDamageTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_NO_CONTACT, 0, 0, DMG_BODY_SLAM, BS_FLAGS1_SP_EVT_ACTIVE)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
Expand Down
20 changes: 10 additions & 10 deletions src/battle/area/flo2/actor/huff_n_puff.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1605,7 +1605,7 @@ EvtScript N(EVS_Move_HealOrSlam) = {
EVT_END_IF
EVT_END_IF
EVT_CALL(UseIdleAnimation, ACTOR_SELF, FALSE)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03B0)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HUFF_N_PUFF_INHALE)
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)
Expand Down Expand Up @@ -1640,7 +1640,7 @@ EvtScript N(EVS_Move_HealOrSlam) = {
EVT_GOTO(0)
EVT_END_IF
EVT_CALL(RemoveEffect, LVar8)
EVT_CALL(StopSound, SOUND_03B0)
EVT_CALL(StopSound, SOUND_HUFF_N_PUFF_INHALE)
EVT_CALL(StopSound, SOUND_BIG_POWER_UP)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_HuffNPuff_Anim17)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_FACE, ANIM_HuffNPuff_Anim18)
Expand Down Expand Up @@ -1715,7 +1715,7 @@ EvtScript N(EVS_Move_HurricaneBreath) = {
EVT_GOTO(1)
EVT_END_IF
EVT_END_THREAD
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_03B0)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HUFF_N_PUFF_INHALE)
EVT_THREAD
EVT_WAIT(15)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_BIG_POWER_UP)
Expand All @@ -1728,15 +1728,15 @@ EvtScript N(EVS_Move_HurricaneBreath) = {
EVT_CALL(SetBattleCamOffsetZ, 20)
EVT_CALL(MoveBattleCamOver, 180)
EVT_WAIT(90)
EVT_CALL(StopSound, SOUND_03B0)
EVT_CALL(StopSound, SOUND_HUFF_N_PUFF_INHALE)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_HuffNPuff_Anim1D)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_FACE, ANIM_HuffNPuff_Anim1D)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_ARMS, ANIM_HuffNPuff_Anim1E)
EVT_WAIT(60)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_MAIN, ANIM_HuffNPuff_Anim20)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_FACE, ANIM_HuffNPuff_Anim21)
EVT_CALL(SetAnimation, ACTOR_SELF, PRT_ARMS, ANIM_HuffNPuff_Anim22)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_035D)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_WIND_LOOP)
EVT_CALL(UseBattleCamPreset, BTL_CAM_DEFAULT)
EVT_CALL(MoveBattleCamOver, 15)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10)
Expand Down Expand Up @@ -1802,7 +1802,7 @@ EvtScript N(EVS_Move_HurricaneBreath) = {
EVT_WAIT(LVar0)
EVT_END_LOOP
EVT_WAIT(20)
EVT_CALL(StopSound, SOUND_035D)
EVT_CALL(StopSound, SOUND_HEAVY_WIND_LOOP)
EVT_IF_EQ(LVarA, HIT_RESULT_LUCKY)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, DAMAGE_TYPE_TRIGGER_LUCKY, 0, 0, 0)
EVT_END_IF
Expand Down Expand Up @@ -1955,7 +1955,7 @@ EvtScript N(EVS_Move_HurricaneBreath) = {
EVT_WAIT(110)
EVT_SET(LVar1, 0)
EVT_END_IF
EVT_CALL(StopSound, SOUND_035D)
EVT_CALL(StopSound, SOUND_HEAVY_WIND_LOOP)
EVT_WAIT(2)
EVT_CALL(SetTargetActor, ACTOR_SELF, ACTOR_PLAYER)
EVT_CALL(SetGoalToTarget, ACTOR_SELF)
Expand Down Expand Up @@ -2237,7 +2237,7 @@ EvtScript N(EVS_Attack_DirectLightning) = {
EVT_END_IF
EVT_END_THREAD
EVT_CALL(StopSound, SOUND_CHARGE_LIGHTNING)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_035B)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HUFF_N_PUFF_FIRE_LIGHTNING)
EVT_CALL(EnemyTestTarget, ACTOR_SELF, LVar0, 0, 0, 1, BS_FLAGS1_10)
EVT_SWITCH(LVar0)
EVT_CASE_EQ(HIT_RESULT_LUCKY)
Expand Down Expand Up @@ -2485,7 +2485,7 @@ EvtScript N(EVS_Attack_GroupSlam) = {
EVT_CALL(SetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY, SOUND_NONE, SOUND_NONE)
EVT_THREAD
EVT_WAIT(3)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20E9)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_NPC_FALLING)
EVT_END_THREAD
EVT_CALL(GetActorPos, ACTOR_SELF, LVar1, LVar2, LVar3)
EVT_CALL(GetActorVar, ACTOR_SELF, AVAR_ScaleY, LVar4)
Expand All @@ -2494,7 +2494,7 @@ EvtScript N(EVS_Attack_GroupSlam) = {
EVT_CALL(SetGoalPos, ACTOR_SELF, LVar1, LVar4, LVar3)
EVT_CALL(FlyToGoal, ACTOR_SELF, 20, 0, EASING_CUBIC_IN)
EVT_CALL(ResetActorSounds, ACTOR_SELF, ACTOR_SOUND_FLY)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_20EA)
EVT_CALL(PlaySoundAtActor, ACTOR_SELF, SOUND_HEAVY_NPC_LANDING)
EVT_CALL(GetActorPos, ACTOR_SELF, LVar0, LVar1, LVar2)
EVT_PLAY_EFFECT(EFFECT_SHOCKWAVE, 3, LVar0, 0, LVar2, 0)
EVT_THREAD
Expand Down
6 changes: 3 additions & 3 deletions src/battle/area/hos/actor/magikoopa.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1591,7 +1591,7 @@ EvtScript N(EVS_Move_TryBoostAttack) = {
EVT_WAIT(5)
EVT_THREAD
EVT_WAIT(10)
EVT_CALL(PlaySoundAtActor, LVar8, SOUND_02DD)
EVT_CALL(PlaySoundAtActor, LVar8, SOUND_MAGIKOOPA_POWER_UP)
EVT_END_THREAD
EVT_THREAD
EVT_CALL(FreezeBattleState, TRUE)
Expand Down Expand Up @@ -1704,7 +1704,7 @@ EvtScript N(EVS_Move_TryBoostDefense) = {
EVT_WAIT(5)
EVT_THREAD
EVT_WAIT(10)
EVT_CALL(PlaySoundAtActor, LVar8, SOUND_02DD)
EVT_CALL(PlaySoundAtActor, LVar8, SOUND_MAGIKOOPA_POWER_UP)
EVT_END_THREAD
EVT_THREAD
EVT_CALL(FreezeBattleState, TRUE)
Expand Down Expand Up @@ -1935,7 +1935,7 @@ EvtScript N(EVS_Move_TryTransparent) = {
EVT_WAIT(5)
EVT_THREAD
EVT_WAIT(10)
EVT_CALL(PlaySoundAtActor, LVar8, SOUND_02DB)
EVT_CALL(PlaySoundAtActor, LVar8, SOUND_MAGIKOOPA_VANISH)
EVT_END_THREAD
EVT_THREAD
EVT_CALL(FreezeBattleState, TRUE)
Expand Down
Loading

0 comments on commit 4d2c055

Please sign in to comment.